From 08f3b57ab324aea55e7a92ecbe961be60df4983d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Mon, 1 Jul 2019 17:40:44 +0300
Subject: [PATCH 0001/1854] py: Manual fixlets of code formatting

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 coredump/criu_coredump/coredump.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index bc53a7705..68dc16bf2 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -645,8 +645,7 @@ class coredump_generator:
                 ppid = self.pstree[pid]["ppid"]
                 return self._get_page(ppid, page_no)
             else:
-                with open(self._imgs_dir + "/" + "pages-" + str(pages_id) +
-                          ".img") as f:
+                with open(self._imgs_dir + "/pages-%s.img" % pages_id) as f:
                     f.seek(off * PAGESIZE)
                     return f.read(PAGESIZE)
 

From 3eed47223b255c092f3aba31b68a9acefa9be523 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 1 Sep 2019 12:23:39 +0100
Subject: [PATCH 0002/1854] files-reg: Drop clear_ghost_files() prototype

The function clear_ghost_files() has been removed in commit
b11eeea "restore: auto-unlink for ghost files (v2)".

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/include/files-reg.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h
index 7a22d4d82..016d76a9f 100644
--- a/criu/include/files-reg.h
+++ b/criu/include/files-reg.h
@@ -30,7 +30,6 @@ extern int open_reg_by_id(u32 id);
 extern int open_reg_fd(struct file_desc *);
 extern int open_path(struct file_desc *, int (*open_cb)(int ns_root_fd,
 			struct reg_file_info *, void *), void *arg);
-extern void clear_ghost_files(void);
 
 extern const struct fdtype_ops regfile_dump_ops;
 extern int do_open_reg_noseek_flags(int ns_root_fd, struct reg_file_info *rfi, void *arg);

From 8ea953f18b8534be883de3638369e4804771d086 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Tue, 13 Aug 2019 22:11:04 +0100
Subject: [PATCH 0003/1854] cr-dump: Remove redundant if-statement

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/cr-dump.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 9273fc0a5..fcbe816e8 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -782,8 +782,6 @@ static int dump_task_core_all(struct parasite_ctl *ctl,
 
 	img = img_from_set(cr_imgset, CR_FD_CORE);
 	ret = pb_write_one(img, core, PB_CORE);
-	if (ret < 0)
-		goto err;
 
 err:
 	pr_info("----------------------------------------\n");

From 0d8e2477e928a1301c0611de233aed6879fdc13b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 10 Sep 2019 06:50:58 -0700
Subject: [PATCH 0004/1854] arch/x86: push correct eip on the stack before
 lretq

Right now we use pushq, but it pushes sign-extended value, so if the
parasite code is placed higher that 2Gb, we will see something like
this:

   0xf7efd5b0:	pushq  $0x23
   0xf7efd5b2:	pushq  $0xfffffffff7efd5b9
=> 0xf7efd5b7:	lretq

Actually we want to push 0xf7efd5b9 instead of 0xfffffffff7efd5b9.

Fixes: #398

Cc: Dmitry Safonov <dima@arista.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
Acked-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/x86/src/lib/include/uapi/asm/sigframe.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
index 51ca023f7..486c0c8e0 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
@@ -194,7 +194,9 @@ void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
 #define ARCH_RT_SIGRETURN_COMPAT(new_sp)				\
 	asm volatile(							\
 		"pushq $"__stringify(USER32_CS)"		\n"	\
-		"pushq $1f					\n"	\
+		"xor %%rax, %%rax				\n"	\
+		"movl $1f, %%eax				\n"	\
+		"pushq   %%rax					\n"	\
 		"lretq						\n"	\
 		"1:						\n"	\
 		".code32					\n"	\

From 3e9dc1c7f5537a860a7332b93e056e7058162578 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 11 Sep 2019 11:13:51 +0100
Subject: [PATCH 0005/1854] compel/x86: Don't use pushq for a label

`pushq` sign-extends the value. Which is a bummer as the label's address
may be higher that 2Gb, which means that the sign-bit will be set.

As it long-jumps with ia32 selector, %r11 can be scratched.
Use %r11 register as a temporary to push the 32-bit address.

Complements: a9a760278c1a ("arch/x86: push correct eip on the stack
before lretq")
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Reported-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/x86/plugins/std/parasite-head.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compel/arch/x86/plugins/std/parasite-head.S b/compel/arch/x86/plugins/std/parasite-head.S
index a988de9d4..465cd887b 100644
--- a/compel/arch/x86/plugins/std/parasite-head.S
+++ b/compel/arch/x86/plugins/std/parasite-head.S
@@ -25,7 +25,9 @@ ENTRY(__export_parasite_head_start_compat)
 .code64
 	PARASITE_ENTRY 0
 	pushq	$__USER32_CS
-	pushq	$2f
+	xor	%r11, %r11
+	movl	$2f, %r11d
+	pushq   %r11
 	lretq
 2:
 .code32

From ad7e82a30f813b8b902026467434cc2e7421452e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Mon, 9 Sep 2019 21:57:33 +0100
Subject: [PATCH 0006/1854] scripts: Drop Fedora 28/rawhide fix

This change was introduced with c75cb2b and it is no longer necessary.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 scripts/build/Dockerfile.fedora.tmpl | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 280ce1cdd..b1127c9b2 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -30,12 +30,6 @@ RUN dnf install -y \
 	rubygem-asciidoctor \
 	kmod
 
-# Replace coreutils-single with "traditional" coreutils
-# to fix the following error on Fedora 28/rawhide while
-# running under QEMU:
-# > sh: /usr/bin/sort: /usr/bin/coreutils: bad interpreter: No such file or directory
-RUN dnf install -y --allowerasing coreutils
-
 RUN ln -sf python3 /usr/bin/python
 ENV PYTHON=python3
 

From 2f337652ad5c40f7a420fdd9a7c57767af4ba8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20C=C5=82api=C5=84ski?= <mclapinski@google.com>
Date: Thu, 8 Aug 2019 18:49:13 +0200
Subject: [PATCH 0007/1854] Add new command line option: --cgroup-yard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of creating cgroup yard in CRIU, now we can create it externally
and pass it to CRIU. Useful if somebody doesn't want to grant
CAP_SYS_ADMIN to CRIU.

Signed-off-by: Michał Cłapiński <mclapinski@google.com>
---
 Documentation/criu.txt    |  36 ++++++++++++--
 criu/cgroup.c             | 101 +++++++++++++++++++++++++-------------
 criu/config.c             |   4 ++
 criu/cr-service.c         |   3 ++
 criu/crtools.c            |   4 ++
 criu/image.c              |   2 +-
 criu/include/cr_options.h |   1 +
 images/rpc.proto          |   1 +
 lib/c/criu.c              |  13 +++++
 lib/c/criu.h              |   1 +
 10 files changed, 126 insertions(+), 40 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 94fc5428a..28913a7fb 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -266,10 +266,33 @@ For example, the command line for the above example should look like this:
     discovered automatically (usually via */proc*). This option is
     useful when one needs *criu* to skip some controllers.
 
-*--cgroup-props-ignore-default*::
-    When combined with *--cgroup-props*, makes *criu* substitute
-    a predefined controller property with the new one shipped. If the option
-    is not used, the predefined properties are merged with the provided ones.
+*--cgroup-yard* 'path'::
+    Instead of trying to mount cgroups in CRIU, provide a path to a directory
+    with already created cgroup yard. Useful if you don't want to grant
+    CAP_SYS_ADMIN to CRIU. For every cgroup mount there should be exactly one
+    directory. If there is only one controller in this mount, the dir's name
+    should be just the name of the controller. If there are multiple controllers
+    comounted, the directory name should have them be separated by a comma.
++
+For example, if */proc/cgroups* looks like this:
++
+----------
+#subsys_name hierarchy num_cgroups enabled
+cpu          1         1           1
+devices      2         2           1
+freezer      2         2           1
+----------
++
+then you can create the cgroup yard by the following commands:
++
+----------
+mkdir private_yard
+cd private_yard
+mkdir cpu
+mount -t cgroup -o cpu none cpu
+mkdir devices,freezer
+mount -t cgroup -o devices,freezer none devices,freezer
+----------
 
 *--tcp-established*::
     Checkpoint established TCP connections.
@@ -442,6 +465,11 @@ The 'mode' may be one of the following:
 
     *ignore*::: Don't deal with cgroups and pretend that they don't exist.
 
+*--cgroup-yard* 'path'::
+    Instead of trying to mount cgroups in CRIU, provide a path to a directory
+    with already created cgroup yard. For more information look in the *dump*
+    section.
+
 *--cgroup-root* ['controller'*:*]/'newroot'::
     Change the root cgroup the controller will be installed into. No controller
     means that root is the default for all controllers not specified.
diff --git a/criu/cgroup.c b/criu/cgroup.c
index 332c79fb9..9f3aef10d 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -549,8 +549,9 @@ static int collect_cgroups(struct list_head *ctls)
 	int fd = -1;
 
 	list_for_each_entry(cc, ctls, l) {
-		char path[PATH_MAX], mopts[1024], *root;
+		char path[PATH_MAX], *root;
 		char prefix[] = ".criu.cgmounts.XXXXXX";
+		const char namestr[] = "name=";
 		struct cg_controller *cg;
 		struct cg_root_opt *o;
 
@@ -568,7 +569,7 @@ static int collect_cgroups(struct list_head *ctls)
 
 		if (!current_controller) {
 			/* only allow "fake" controllers to be created this way */
-			if (!strstartswith(cc->name, "name=")) {
+			if (!strstartswith(cc->name, namestr)) {
 				pr_err("controller %s not found\n", cc->name);
 				return -1;
 			} else {
@@ -586,26 +587,45 @@ static int collect_cgroups(struct list_head *ctls)
 		if (!opts.manage_cgroups)
 			continue;
 
-		if (strstartswith(cc->name, "name="))
-			snprintf(mopts, sizeof(mopts), "none,%s", cc->name);
-		else
-			snprintf(mopts, sizeof(mopts), "%s", cc->name);
+		if (opts.cgroup_yard) {
+			char dir_path[PATH_MAX];
+			int off;
+			
+			off = snprintf(dir_path, PATH_MAX, "%s/", opts.cgroup_yard);
+			if (strstartswith(cc->name, namestr))
+				snprintf(dir_path + off, PATH_MAX, "%s", cc->name + strlen(namestr));
+			else
+				snprintf(dir_path + off, PATH_MAX, "%s", cc->name);
 
-		if (mkdtemp(prefix) == NULL) {
-			pr_perror("can't make dir for cg mounts");
-			return -1;
+			fd = open(dir_path, O_RDONLY | O_DIRECTORY, 0);
+			if (fd < 0) {
+				pr_perror("couldn't open %s", dir_path);
+				return -1;
+			}
+		} else {
+			char mopts[1024];
+
+			if (strstartswith(cc->name, namestr))
+				snprintf(mopts, sizeof(mopts), "none,%s", cc->name);
+			else
+				snprintf(mopts, sizeof(mopts), "%s", cc->name);
+
+			if (mkdtemp(prefix) == NULL) {
+				pr_perror("can't make dir for cg mounts");
+				return -1;
+			}
+
+			if (mount("none", prefix, "cgroup", 0, mopts) < 0) {
+				pr_perror("couldn't mount %s", mopts);
+				rmdir(prefix);
+				return -1;
+			}
+
+			fd = open_detach_mount(prefix);
+			if (fd < 0)
+				return -1;
 		}
 
-		if (mount("none", prefix, "cgroup", 0, mopts) < 0) {
-			pr_perror("couldn't mount %s", mopts);
-			rmdir(prefix);
-			return -1;
-		}
-
-		fd = open_detach_mount(prefix);
-		if (fd < 0)
-			return -1;
-
 		path_pref_len = snprintf(path, PATH_MAX, "/proc/self/fd/%d", fd);
 
 		root = cc->path;
@@ -620,6 +640,7 @@ static int collect_cgroups(struct list_head *ctls)
 		snprintf(path + path_pref_len, PATH_MAX - path_pref_len, "%s", root);
 
 		ret = ftw(path, add_cgroup, 4);
+
 		if (ret < 0)
 			pr_perror("failed walking %s for empty cgroups", path);
 
@@ -1167,10 +1188,12 @@ void fini_cgroup(void)
 		return;
 
 	close_service_fd(CGROUP_YARD);
-	if (umount2(cg_yard, MNT_DETACH))
-		pr_perror("Unable to umount %s", cg_yard);
-	if (rmdir(cg_yard))
-		pr_perror("Unable to remove %s", cg_yard);
+	if (!opts.cgroup_yard) {
+		if (umount2(cg_yard, MNT_DETACH))
+			pr_perror("Unable to umount %s", cg_yard);
+		if (rmdir(cg_yard))
+			pr_perror("Unable to remove %s", cg_yard);
+	}
 	xfree(cg_yard);
 	cg_yard = NULL;
 }
@@ -1652,20 +1675,28 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 	pr_info("Preparing cgroups yard (cgroups restore mode %#x)\n",
 		opts.manage_cgroups);
 
-	off = sprintf(paux, ".criu.cgyard.XXXXXX");
-	if (mkdtemp(paux) == NULL) {
-		pr_perror("Can't make temp cgyard dir");
-		return -1;
-	}
+	if (opts.cgroup_yard) {
+		off = sprintf(paux, "%s", opts.cgroup_yard);
 
-	cg_yard = xstrdup(paux);
-	if (!cg_yard) {
-		rmdir(paux);
-		return -1;
-	}
+		cg_yard = xstrdup(paux);
+		if (!cg_yard)
+			return -1;
+	} else {
+		off = sprintf(paux, ".criu.cgyard.XXXXXX");
+		if (mkdtemp(paux) == NULL) {
+			pr_perror("Can't make temp cgyard dir");
+			return -1;
+		}
 
-	if (make_yard(cg_yard))
-		goto err;
+		cg_yard = xstrdup(paux);
+		if (!cg_yard) {
+			rmdir(paux);
+			return -1;
+		}
+
+		if (make_yard(cg_yard))
+			goto err;
+	}
 
 	pr_debug("Opening %s as cg yard\n", cg_yard);
 	i = open(cg_yard, O_DIRECTORY);
diff --git a/criu/config.c b/criu/config.c
index 39aa071c9..cdea91f02 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -516,6 +516,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		{ "tls-key",			required_argument,	0, 1095},
 		BOOL_OPT("tls", &opts.tls),
 		{"tls-no-cn-verify",		no_argument,		&opts.tls_no_cn_verify, true},
+		{ "cgroup-yard",		required_argument,	0, 1096 },
 		{ },
 	};
 
@@ -814,6 +815,9 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		case 1095:
 			SET_CHAR_OPTS(tls_key, optarg);
 			break;
+		case 1096:
+			SET_CHAR_OPTS(cgroup_yard, optarg);
+			break;
 		case 'V':
 			pr_msg("Version: %s\n", CRIU_VERSION);
 			if (strcmp(CRIU_GITID, "0"))
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 0938db02b..95ba2e5ce 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -608,6 +608,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 			goto err;
 	}
 
+	if (req->cgroup_yard)
+		SET_CHAR_OPTS(cgroup_yard, req->cgroup_yard);
+
 	if (req->tls_cacert)
 		SET_CHAR_OPTS(tls_cacert, req->tls_cacert);
 	if (req->tls_cacrl)
diff --git a/criu/crtools.c b/criu/crtools.c
index a94875684..0799a564c 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -366,6 +366,10 @@ usage:
 "  --cgroup-dump-controller NAME\n"
 "                        define cgroup controller to be dumped\n"
 "                        and skip anything else present in system\n"
+"  --cgroup-yard PATH\n"
+"                        instead of trying to mount cgroups in CRIU, provide\n"
+"                        a path to a directory with already created cgroup yard.\n"
+"                        Useful if you don't want to grant CAP_SYS_ADMIN to CRIU\n"
 "  --lsm-profile TYPE:NAME\n"
 "                        Specify an LSM profile to be used during restore.\n"
 "                        The type can be either 'apparmor' or 'selinux'.\n"
diff --git a/criu/image.c b/criu/image.c
index 2eb926929..0225788b0 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -190,7 +190,7 @@ int prepare_inventory(InventoryEntry *he)
 		struct dmp_info d;
 	} crt = { .i.pid = &pid };
 
-	pr_info("Perparing image inventory (version %u)\n", CRTOOLS_IMAGES_V1);
+	pr_info("Preparing image inventory (version %u)\n", CRTOOLS_IMAGES_V1);
 
 	he->img_version = CRTOOLS_IMAGES_V1_1;
 	he->fdinfo_per_id = true;
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 82f76ad94..da7c10d69 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -106,6 +106,7 @@ struct cr_options {
 	char			*cgroup_props;
 	char			*cgroup_props_file;
 	struct list_head	new_cgroup_roots;
+	char			*cgroup_yard;
 	bool			autodetect_ext_mounts;
 	int			enable_external_sharing;
 	int			enable_external_masters;
diff --git a/images/rpc.proto b/images/rpc.proto
index 15e677a77..c402259ac 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -120,6 +120,7 @@ message criu_opts {
 	optional string			tls_key			= 57;
 	optional bool			tls			= 58;
 	optional bool			tls_no_cn_verify	= 59;
+	optional string			cgroup_yard		= 60;
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 17d5c3983..14ddff26d 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -987,6 +987,19 @@ int criu_local_add_cg_dump_controller(criu_opts *opts, const char *name)
 	return 0;
 }
 
+int criu_local_add_cg_yard(criu_opts *opts, const char *path)
+{
+	char *new;
+
+	new = strdup(path);
+	if (!new)
+		return -ENOMEM;
+
+	free(opts->rpc->cgroup_yard);
+	opts->rpc->cgroup_yard = new;
+	return 0;
+}
+
 int criu_add_skip_mnt(const char *mnt)
 {
 	return criu_local_add_skip_mnt(global_opts, mnt);
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 76f3547fc..cb37c5291 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -207,6 +207,7 @@ int criu_local_add_irmap_path(criu_opts *opts, const char *path);
 int criu_local_add_cg_props(criu_opts *opts, const char *stream);
 int criu_local_add_cg_props_file(criu_opts *opts, const char *path);
 int criu_local_add_cg_dump_controller(criu_opts *opts, const char *name);
+int criu_local_add_cg_yard(criu_opts *opts, const char *path);
 int criu_local_add_inherit_fd(criu_opts *opts, int fd, const char *key);
 int criu_local_add_external(criu_opts *opts, const char *key);
 int criu_local_set_page_server_address_port(criu_opts *opts, const char *address, int port);

From cf0080505ac3b3194f664d77edccccfa47bf450a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20C=C5=82api=C5=84ski?= <mclapinski@google.com>
Date: Wed, 14 Aug 2019 21:13:34 +0200
Subject: [PATCH 0008/1854] test: implement test for new --cgroup-yard option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Cłapiński <mclapinski@google.com>
---
 test/zdtm.py                      |  4 +-
 test/zdtm/static/Makefile         |  3 +-
 test/zdtm/static/cgroup_yard.c    |  1 +
 test/zdtm/static/cgroup_yard.desc |  7 ++++
 test/zdtm/static/cgroup_yard.hook | 70 +++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 3 deletions(-)
 create mode 120000 test/zdtm/static/cgroup_yard.c
 create mode 100644 test/zdtm/static/cgroup_yard.desc
 create mode 100755 test/zdtm/static/cgroup_yard.hook

diff --git a/test/zdtm.py b/test/zdtm.py
index 0153c6058..f0a102413 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2018,7 +2018,7 @@ def print_sep(title, sep="=", width=80):
 
 def print_error(line):
     line = line.rstrip()
-    print(line)
+    print(line.encode('utf-8'))
     if line.endswith('>'):  # combine pie output
         return True
     return False
@@ -2028,7 +2028,7 @@ def grep_errors(fname):
     first = True
     print_next = False
     before = []
-    with open(fname) as fd:
+    with open(fname, errors='replace') as fd:
         for l in fd:
             before.append(l)
             if len(before) > 5:
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index d8279d6f8..a38482f44 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -319,7 +319,8 @@ TST_DIR		=				\
 		cgroup03			\
 		cgroup04			\
 		cgroup_ifpriomap		\
-		cgroup_stray		\
+		cgroup_stray			\
+		cgroup_yard			\
 		unlink_fstat04			\
 		unlink_fstat041			\
 		mntns_remap			\
diff --git a/test/zdtm/static/cgroup_yard.c b/test/zdtm/static/cgroup_yard.c
new file mode 120000
index 000000000..f3683c2b4
--- /dev/null
+++ b/test/zdtm/static/cgroup_yard.c
@@ -0,0 +1 @@
+cgroup00.c
\ No newline at end of file
diff --git a/test/zdtm/static/cgroup_yard.desc b/test/zdtm/static/cgroup_yard.desc
new file mode 100644
index 000000000..8736d6780
--- /dev/null
+++ b/test/zdtm/static/cgroup_yard.desc
@@ -0,0 +1,7 @@
+{
+'flavor': 'h',
+'flags': 'suid',
+# We create the external cgroup yard in working directory during --pre-dump
+# hook. We have to go up a few directories to find the yard.
+'opts': '--manage-cgroups --cgroup-yard ../../../../../../external_yard'
+}
diff --git a/test/zdtm/static/cgroup_yard.hook b/test/zdtm/static/cgroup_yard.hook
new file mode 100755
index 000000000..7ae53342c
--- /dev/null
+++ b/test/zdtm/static/cgroup_yard.hook
@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import subprocess
+import tempfile
+
+yard = "external_yard"
+
+if sys.argv[1] == "--pre-dump":
+	'''
+	Create external cgroup yard to be passed to CRIU via --cgroup-yard
+	'''
+	os.mkdir(yard)
+	with open("/proc/self/cgroup") as f:
+		for line in f:
+			cgr = line.split(":")[1]
+
+			if cgr == "":
+				continue
+
+			if cgr.startswith("name="):
+				ctrl = cgr[len("name="):]
+				opts = "none," + cgr
+			else:
+				ctrl = cgr
+				opts = cgr
+
+			os.mkdir(yard + "/" + ctrl)
+			subprocess.check_call(["mount", "-t", "cgroup", "none", yard + "/" + ctrl, "-o", opts])
+
+if sys.argv[1] == "--post-restore":
+	'''
+	Clean up the cgroup yard created during `--pre-dump`
+	'''
+	with open("/proc/self/cgroup") as f:
+		for line in f:
+			cgr = line.split(":")[1]
+
+			if cgr == "":
+				continue
+
+			if cgr.startswith("name="):
+				ctrl = cgr[len("name="):]
+			else:
+				ctrl = cgr
+
+			subprocess.check_call(["umount", yard + "/" + ctrl])
+			os.rmdir(yard + "/" + ctrl)
+	os.rmdir(yard)
+
+if sys.argv[1] in ["--pre-restore", "--clean"]:
+	'''
+	Clean up the leftover cgroups created by the test
+	'''
+	tname = tempfile.mkdtemp()
+	subprocess.call(["mount", "-t", "cgroup", "none", tname, "-o", "none,name=zdtmtst"])
+
+	try:
+		os.rmdir(os.path.join(tname, "subcg00", "subsubcg"))
+	except:
+		pass
+
+	try:
+		os.rmdir(os.path.join(tname, "subcg00"))
+	except:
+		pass
+
+	subprocess.call(["umount", tname])
+	os.rmdir(tname)

From 4f24786b36058ab82e669fd5686cc9f5cfc573db Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 14 Sep 2019 13:47:06 +0100
Subject: [PATCH 0009/1854] travis: Install missing diffutils dependency

The following tests fail in Fedora rawhide because /usr/bin/diff
is missing.

 * zdtm/static/bridge(ns)
 * zdtm/static/cr_veth(uns)
 * zdtm/static/macvlan(ns)
 * zdtm/static/netns(uns)
 * zdtm/static/netns-nf(ns)
 * zdtm/static/sit(ns)

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 scripts/build/Dockerfile.fedora.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index b1127c9b2..0500a8fc5 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -3,6 +3,7 @@ ARG ENV1=FOOBAR
 
 RUN dnf install -y \
 	ccache \
+	diffutils \
 	findutils \
 	gcc \
 	git \

From 8bdc60d50e5b990aa8debd06785175da3e0ba34a Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 14 Sep 2019 10:26:22 +0300
Subject: [PATCH 0010/1854] arch/x86: fpu_state->fpu_state_ia32.xsave hast to
 be 64-byte aligned

Before the 5.2 kernel, only fpu_state->fpu_state_64.xsave has to be
64-byte aligned. But staring with the 5.2 kernel, the same is required
for pu_state->fpu_state_ia32.xsave.

The behavior was changed in:
c2ff9e9a3d9d ("x86/fpu: Merge the two code paths in __fpu__restore_sig()")

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/x86/src/lib/include/uapi/asm/fpu.h | 8 ++++++--
 criu/arch/x86/sigframe.c                       | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index 509f4488b..4ff531fb9 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -263,7 +263,7 @@ struct xsave_struct_ia32 {
 		struct ymmh_struct	ymmh;
 		uint8_t			extended_state_area[EXTENDED_STATE_AREA_SIZE];
 	};
-} __aligned(FXSAVE_ALIGN_BYTES);
+};
 
 typedef struct {
 	/*
@@ -309,7 +309,11 @@ typedef struct {
 typedef struct {
 	union {
 		fpu_state_64_t			fpu_state_64;
-		fpu_state_ia32_t		fpu_state_ia32;
+		struct {
+			/* fpu_state_ia32->xsave has to be 64-byte aligned. */
+			uint32_t		__pad[2];
+			fpu_state_ia32_t	fpu_state_ia32;
+		};
 	};
 
 	uint8_t has_fpu;
diff --git a/criu/arch/x86/sigframe.c b/criu/arch/x86/sigframe.c
index 11b0d640d..33ba14387 100644
--- a/criu/arch/x86/sigframe.c
+++ b/criu/arch/x86/sigframe.c
@@ -28,8 +28,14 @@ int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
 
 		sigframe->native.uc.uc_mcontext.fpstate = (uint64_t)addr;
 	} else if (!sigframe->is_native) {
+		unsigned long addr = (unsigned long)(void *)&fpu_state->fpu_state_ia32.xsave;
 		sigframe->compat.uc.uc_mcontext.fpstate =
 			(uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;
+		if ((addr % 64ul)) {
+			pr_err("Unaligned address passed: %lx (native %d)\n",
+			       addr, sigframe->is_native);
+			return -1;
+		}
 	}
 
 	return 0;

From a9f974b4951a261063187f0536c01c7f84e5fe56 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 15 Sep 2019 06:58:15 +0100
Subject: [PATCH 0011/1854] Introduce flush_early_log_to_stderr destructor

Prior log initialisation CRIU preserves all (early) log messages in a
buffer. In case of error the content of the content of this buffer
needs to be printed out (flushed).

Suggested-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/crtools.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 0799a564c..4625446ad 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -47,6 +47,13 @@
 #include "setproctitle.h"
 #include "sysctl.h"
 
+void flush_early_log_to_stderr() __attribute__((destructor));
+
+void flush_early_log_to_stderr(void)
+{
+	flush_early_log_buffer(STDERR_FILENO);
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 	int ret = -1;
@@ -95,10 +102,8 @@ int main(int argc, char *argv[], char *envp[])
 		return cr_service_work(atoi(argv[2]));
 	}
 
-	if (check_options()) {
-		flush_early_log_buffer(STDERR_FILENO);
+	if (check_options())
 		return 1;
-	}
 
 	if (opts.imgs_dir == NULL)
 		SET_CHAR_OPTS(imgs_dir, ".");

From 813bfbeb4f26611f8fd431c6fd65104cbad789d1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 15 Sep 2019 07:03:57 +0100
Subject: [PATCH 0012/1854] Convert pr_msg() error messages to pr_err()

Print error messages to stderr (instead of stdout).

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/config.c     |  4 ++--
 criu/cr-check.c   |  2 +-
 criu/crtools.c    | 22 +++++++++++-----------
 criu/proc_parse.c |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index cdea91f02..2ad2fd43c 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -835,10 +835,10 @@ int parse_options(int argc, char **argv, bool *usage_error,
 
 bad_arg:
 	if (idx < 0) /* short option */
-		pr_msg("Error: invalid argument for -%c: %s\n",
+		pr_err("invalid argument for -%c: %s\n",
 				opt, optarg);
 	else /* long option */
-		pr_msg("Error: invalid argument for --%s: %s\n",
+		pr_err("invalid argument for --%s: %s\n",
 				long_opts[idx].name, optarg);
 	return 1;
 }
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 75a665cfb..729b2dc38 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -62,7 +62,7 @@ static int check_tty(void)
 	int ret = -1;
 
 	if (ARRAY_SIZE(t.c_cc) < TERMIOS_NCC) {
-		pr_msg("struct termios has %d @c_cc while "
+		pr_err("struct termios has %d @c_cc while "
 			"at least %d expected.\n",
 			(int)ARRAY_SIZE(t.c_cc),
 			TERMIOS_NCC);
diff --git a/criu/crtools.c b/criu/crtools.c
index 4625446ad..5740b806d 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -112,7 +112,7 @@ int main(int argc, char *argv[], char *envp[])
 		SET_CHAR_OPTS(work_dir, opts.imgs_dir);
 
 	if (optind >= argc) {
-		pr_msg("Error: command is required\n");
+		pr_err("command is required\n");
 		goto usage;
 	}
 
@@ -120,17 +120,17 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (has_exec_cmd) {
 		if (!has_sub_command) {
-			pr_msg("Error: --exec-cmd requires a command\n");
+			pr_err("--exec-cmd requires a command\n");
 			goto usage;
 		}
 
 		if (strcmp(argv[optind], "restore")) {
-			pr_msg("Error: --exec-cmd is available for the restore command only\n");
+			pr_err("--exec-cmd is available for the restore command only\n");
 			goto usage;
 		}
 
 		if (opts.restore_detach) {
-			pr_msg("Error: --restore-detached and --exec-cmd cannot be used together\n");
+			pr_err("--restore-detached and --exec-cmd cannot be used together\n");
 			goto usage;
 		}
 
@@ -142,7 +142,7 @@ int main(int argc, char *argv[], char *envp[])
 	} else {
 		/* No subcommands except for cpuinfo and restore --exec-cmd */
 		if (strcmp(argv[optind], "cpuinfo") && has_sub_command) {
-			pr_msg("Error: excessive parameter%s for command %s\n",
+			pr_err("excessive parameter%s for command %s\n",
 				(argc - optind) > 2 ? "s" : "", argv[optind]);
 			goto usage;
 		}
@@ -241,7 +241,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (!strcmp(argv[optind], "cpuinfo")) {
 		if (!argv[optind + 1]) {
-			pr_msg("Error: cpuinfo requires an action: dump or check\n");
+			pr_err("cpuinfo requires an action: dump or check\n");
 			goto usage;
 		}
 		if (!strcmp(argv[optind + 1], "dump"))
@@ -251,17 +251,17 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	if (!strcmp(argv[optind], "exec")) {
-		pr_msg("The \"exec\" action is deprecated by the Compel library.\n");
+		pr_err("The \"exec\" action is deprecated by the Compel library.\n");
 		return -1;
 	}
 
 	if (!strcmp(argv[optind], "show")) {
-		pr_msg("The \"show\" action is deprecated by the CRIT utility.\n");
-		pr_msg("To view an image use the \"crit decode -i $name --pretty\" command.\n");
+		pr_err("The \"show\" action is deprecated by the CRIT utility.\n");
+		pr_err("To view an image use the \"crit decode -i $name --pretty\" command.\n");
 		return -1;
 	}
 
-	pr_msg("Error: unknown command: %s\n", argv[optind]);
+	pr_err("unknown command: %s\n", argv[optind]);
 usage:
 	pr_msg("\n"
 "Usage:\n"
@@ -455,6 +455,6 @@ usage:
 	return 0;
 
 opt_pid_missing:
-	pr_msg("Error: pid not specified\n");
+	pr_err("pid not specified\n");
 	return 1;
 }
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 0e8b6f209..97f82ee01 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -932,7 +932,7 @@ int prepare_loginuid(unsigned int value, unsigned int loglevel)
 
 	if (write(fd, buf, 11) < 0) {
 		print_on_level(loglevel,
-			"Write %s to /proc/self/loginuid failed: %s",
+			"Write %s to /proc/self/loginuid failed: %s\n",
 			buf, strerror(errno));
 		ret = -1;
 	}

From db40ef5be671dbd78f42bd868a5377e62707c3de Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 15 Sep 2019 11:49:27 -0700
Subject: [PATCH 0013/1854] test/cgroup_yard: always clean up a test cgroup
 yard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Right now it is cleaned up from a post-restore hook,
but zdtm.py can be executed with the norst option:
$ zdtm.py run -t zdtm/static/cgroup_yard --norst
...
OSError: [Errno 17] File exists: 'external_yard'

Cc: Michał Cłapiński <mclapinski@google.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/cgroup_yard.hook | 39 ++++++++-----------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/test/zdtm/static/cgroup_yard.hook b/test/zdtm/static/cgroup_yard.hook
index 7ae53342c..cc3971707 100755
--- a/test/zdtm/static/cgroup_yard.hook
+++ b/test/zdtm/static/cgroup_yard.hook
@@ -12,6 +12,7 @@ if sys.argv[1] == "--pre-dump":
 	Create external cgroup yard to be passed to CRIU via --cgroup-yard
 	'''
 	os.mkdir(yard)
+	subprocess.check_call(["mount", "-t", "tmpfs", "zdtm_yard", yard])
 	with open("/proc/self/cgroup") as f:
 		for line in f:
 			cgr = line.split(":")[1]
@@ -29,26 +30,6 @@ if sys.argv[1] == "--pre-dump":
 			os.mkdir(yard + "/" + ctrl)
 			subprocess.check_call(["mount", "-t", "cgroup", "none", yard + "/" + ctrl, "-o", opts])
 
-if sys.argv[1] == "--post-restore":
-	'''
-	Clean up the cgroup yard created during `--pre-dump`
-	'''
-	with open("/proc/self/cgroup") as f:
-		for line in f:
-			cgr = line.split(":")[1]
-
-			if cgr == "":
-				continue
-
-			if cgr.startswith("name="):
-				ctrl = cgr[len("name="):]
-			else:
-				ctrl = cgr
-
-			subprocess.check_call(["umount", yard + "/" + ctrl])
-			os.rmdir(yard + "/" + ctrl)
-	os.rmdir(yard)
-
 if sys.argv[1] in ["--pre-restore", "--clean"]:
 	'''
 	Clean up the leftover cgroups created by the test
@@ -56,15 +37,15 @@ if sys.argv[1] in ["--pre-restore", "--clean"]:
 	tname = tempfile.mkdtemp()
 	subprocess.call(["mount", "-t", "cgroup", "none", tname, "-o", "none,name=zdtmtst"])
 
-	try:
-		os.rmdir(os.path.join(tname, "subcg00", "subsubcg"))
-	except:
-		pass
-
-	try:
-		os.rmdir(os.path.join(tname, "subcg00"))
-	except:
-		pass
+	for cg in [os.path.join(tname, "subcg00", "subsubcg"),
+			os.path.join(tname, "subcg00")]:
+		if os.access(cg, os.F_OK):
+			os.rmdir(cg)
 
 	subprocess.call(["umount", tname])
 	os.rmdir(tname)
+
+if sys.argv[1] == "--clean":
+	if os.access(yard, os.F_OK):
+		subprocess.call(["umount", "-l", yard])
+		os.rmdir(yard)

From f44939317f60288874bdc7b8544442a59db0d024 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 19 Sep 2019 23:37:57 +0300
Subject: [PATCH 0014/1854] zdtm/cgroup_yard: create a test cgroup yard from
 the post-start hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Right now, it is created from the pre-dump hook, but
if the --snap option is set, the test fails:
$ python test/zdtm.py run -t zdtm/static/cgroup_yard -f h --snap --iter 3
...
Running zdtm/static/cgroup_yard.hook(--pre-dump)
Traceback (most recent call last):
  File zdtm/static/cgroup_yard.hook, line 14, in <module>
    os.mkdir(yard)
OSError: [Errno 17] File exists: 'external_yard'

Cc: Michał Cłapiński <mclapinski@google.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/cgroup_yard.hook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/cgroup_yard.hook b/test/zdtm/static/cgroup_yard.hook
index cc3971707..072b9d38d 100755
--- a/test/zdtm/static/cgroup_yard.hook
+++ b/test/zdtm/static/cgroup_yard.hook
@@ -7,7 +7,7 @@ import tempfile
 
 yard = "external_yard"
 
-if sys.argv[1] == "--pre-dump":
+if sys.argv[1] == "--post-start":
 	'''
 	Create external cgroup yard to be passed to CRIU via --cgroup-yard
 	'''

From b47ef26eac1777396ede638af0d6951a3fc52a1e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sat, 21 Sep 2019 13:35:18 +0300
Subject: [PATCH 0015/1854] cgroup: fixup nits

1) s/\s*$//
2) fix snprintf out of bound access

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cgroup.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 9f3aef10d..1be8be234 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -590,12 +590,12 @@ static int collect_cgroups(struct list_head *ctls)
 		if (opts.cgroup_yard) {
 			char dir_path[PATH_MAX];
 			int off;
-			
+
 			off = snprintf(dir_path, PATH_MAX, "%s/", opts.cgroup_yard);
 			if (strstartswith(cc->name, namestr))
-				snprintf(dir_path + off, PATH_MAX, "%s", cc->name + strlen(namestr));
+				snprintf(dir_path + off, PATH_MAX - off, "%s", cc->name + strlen(namestr));
 			else
-				snprintf(dir_path + off, PATH_MAX, "%s", cc->name);
+				snprintf(dir_path + off, PATH_MAX - off, "%s", cc->name);
 
 			fd = open(dir_path, O_RDONLY | O_DIRECTORY, 0);
 			if (fd < 0) {

From 3f1c4a17ad18fca3f95c0f51c5c42fedbb403b89 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 24 Sep 2019 23:36:29 +0300
Subject: [PATCH 0016/1854] pipe: print pipe_id as unsigned to generate an
 external pipe name

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/pipes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/pipes.c b/criu/pipes.c
index fd1a7e6bb..cb5da71de 100644
--- a/criu/pipes.c
+++ b/criu/pipes.c
@@ -282,8 +282,8 @@ static char *pipe_d_name(struct file_desc *d, char *buf, size_t s)
 	struct pipe_info *pi;
 
 	pi = container_of(d, struct pipe_info, d);
-	if (snprintf(buf, s, "pipe:[%d]", pi->pe->pipe_id) >= s) {
-		pr_err("Not enough room for pipe %d identifier string\n",
+	if (snprintf(buf, s, "pipe:[%u]", pi->pe->pipe_id) >= s) {
+		pr_err("Not enough room for pipe %u identifier string\n",
 				pi->pe->pipe_id);
 		return NULL;
 	}

From b84f481b55442433f46b5ea4b91a32dd8cffc502 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 24 Sep 2019 23:48:15 +0300
Subject: [PATCH 0017/1854] unix: print inode numbers as unsigned int

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sk-unix.c | 60 +++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index f0620e676..f43aa2124 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -130,7 +130,7 @@ static struct unix_sk_listen_icon *lookup_unix_listen_icons(unsigned int peer_in
 
 static void show_one_unix(char *act, const struct unix_sk_desc *sk)
 {
-	pr_debug("\t%s: ino %d peer_ino %d family %4d type %4d state %2d name %s\n",
+	pr_debug("\t%s: ino %u peer_ino %u family %4d type %4d state %2d name %s\n",
 		act, sk->sd.ino, sk->peer_ino, sk->sd.family, sk->type, sk->state, sk->name);
 
 	if (sk->nr_icons) {
@@ -143,7 +143,7 @@ static void show_one_unix(char *act, const struct unix_sk_desc *sk)
 
 static void show_one_unix_img(const char *act, const UnixSkEntry *e)
 {
-	pr_info("\t%s: id %#x ino %d peer %d type %d state %d name %d bytes\n",
+	pr_info("\t%s: id %#x ino %u peer %u type %d state %d name %d bytes\n",
 		act, e->id, e->ino, e->peer, e->type, e->state, (int)e->name.len);
 }
 
@@ -426,7 +426,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 	if (ue->peer) {
 		peer = (struct unix_sk_desc *)lookup_socket(ue->peer, PF_UNIX, 0);
 		if (IS_ERR_OR_NULL(peer)) {
-			pr_err("Unix socket %d without peer %d\n",
+			pr_err("Unix socket %u without peer %u\n",
 					ue->ino, ue->peer);
 			goto err;
 		}
@@ -437,7 +437,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 		 */
 		if (peer->peer_ino != ue->ino) {
 			if (!peer->name) {
-				pr_err("Unix socket %d with unreachable peer %d (%d)\n",
+				pr_err("Unix socket %u with unreachable peer %u (%u)\n",
 				       ue->ino, ue->peer, peer->peer_ino);
 				goto err;
 			}
@@ -513,7 +513,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 
 		ue->peer = e->sk_desc->sd.ino;
 
-		pr_debug("\t\tFixed inflight socket %d peer %d)\n",
+		pr_debug("\t\tFixed inflight socket %u peer %u)\n",
 				ue->ino, ue->peer);
 	}
 dump:
@@ -1383,7 +1383,7 @@ static int keep_deleted(struct unix_sk_info *ui)
 {
 	int fd = open(ui->name, O_PATH);
 	if (fd < 0) {
-		pr_perror("ghost: Can't open id %#x ino %d addr %s",
+		pr_perror("ghost: Can't open id %#x ino %u addr %s",
 			  ui->ue->id, ui->ue->ino, ui->name);
 		return -1;
 	}
@@ -1409,7 +1409,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	int ret;
 
 	if (ui->ue->name.len >= UNIX_PATH_MAX) {
-		pr_err("ghost: Too long name for socket id %#x ino %d name %s\n",
+		pr_err("ghost: Too long name for socket id %#x ino %u name %s\n",
 		       ui->ue->id, ui->ue->ino, ui->name);
 		return -ENOSPC;
 	}
@@ -1424,14 +1424,14 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 		ret = access(path, R_OK | W_OK | X_OK);
 		if (ret == 0) {
 			ui->ghost_dir_pos = pos - path;
-			pr_debug("ghost: socket id %#x ino %d name %s detected F_OK %s\n",
+			pr_debug("ghost: socket id %#x ino %u name %s detected F_OK %s\n",
 				 ui->ue->id, ui->ue->ino, ui->name, path);
 			break;
 		}
 
 		if (errno != ENOENT) {
 			ret = -errno;
-			pr_perror("ghost: Can't access %s for socket id %#x ino %d name %s",
+			pr_perror("ghost: Can't access %s for socket id %#x ino %u name %s",
 				  path, ui->ue->id, ui->ue->ino, ui->name);
 			return ret;
 		}
@@ -1441,7 +1441,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	path[ui->ue->name.len] = '\0';
 
 	pos = dirname(path);
-	pr_debug("ghost: socket id %#x ino %d name %s creating %s\n",
+	pr_debug("ghost: socket id %#x ino %u name %s creating %s\n",
 		 ui->ue->id, ui->ue->ino, ui->name, pos);
 	ret = mkdirpat(AT_FDCWD, pos, 0755);
 	if (ret) {
@@ -1471,15 +1471,15 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 			 * clean it up.
 			 */
 			if (unlinkat(AT_FDCWD, path_parked, 0) == 0)
-				pr_debug("ghost: Unlinked stale socket id %#x ino %d name %s\n",
+				pr_debug("ghost: Unlinked stale socket id %#x ino %u name %s\n",
 					 ui->ue->id, ui->ue->ino, path_parked);
 			if (rename(ui->name, path_parked)) {
 				ret = -errno;
-				pr_perror("ghost: Can't rename id %#x ino %d addr %s -> %s",
+				pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
 					  ui->ue->id, ui->ue->ino, ui->name, path_parked);
 				return ret;
 			}
-			pr_debug("ghost: id %#x ino %d renamed %s -> %s\n",
+			pr_debug("ghost: id %#x ino %u renamed %s -> %s\n",
 				 ui->ue->id, ui->ue->ino, ui->name, path_parked);
 			renamed = true;
 			ret = bind(sk, (struct sockaddr *)&addr,
@@ -1487,7 +1487,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 		}
 		if (ret < 0) {
 			ret = -errno;
-			pr_perror("ghost: Can't bind on socket id %#x ino %d addr %s",
+			pr_perror("ghost: Can't bind on socket id %#x ino %u addr %s",
 				  ui->ue->id, ui->ue->ino, ui->name);
 			return ret;
 		}
@@ -1499,7 +1499,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 
 	ret = keep_deleted(ui);
 	if (ret < 0) {
-		pr_err("ghost: Can't save socket %#x ino %d addr %s into fdstore\n",
+		pr_err("ghost: Can't save socket %#x ino %u addr %s into fdstore\n",
 		       ui->ue->id, ui->ue->ino, ui->name);
 		return -EIO;
 	}
@@ -1511,7 +1511,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	ret = unlinkat(AT_FDCWD, ui->name, 0);
 	if (ret < 0) {
 		ret = -errno;
-		pr_perror("ghost: Can't unlink socket %#x ino %d addr %s",
+		pr_perror("ghost: Can't unlink socket %#x ino %u addr %s",
 			  ui->ue->id, ui->ue->ino, ui->name);
 		return ret;
 	}
@@ -1519,12 +1519,12 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	if (renamed) {
 		if (rename(path_parked, ui->name)) {
 			ret = -errno;
-			pr_perror("ghost: Can't rename id %#x ino %d addr %s -> %s",
+			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
 				  ui->ue->id, ui->ue->ino, path_parked, ui->name);
 			return ret;
 		}
 
-		pr_debug("ghost: id %#x ino %d renamed %s -> %s\n",
+		pr_debug("ghost: id %#x ino %u renamed %s -> %s\n",
 			 ui->ue->id, ui->ue->ino, path_parked,  ui->name);
 	}
 
@@ -1542,11 +1542,11 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 		     pos = strrchr(path, '/')) {
 			*pos = '\0';
 			if (rmdir(path)) {
-				pr_perror("ghost: Can't remove directory %s on id %#x ino %d",
+				pr_perror("ghost: Can't remove directory %s on id %#x ino %u",
 					  path, ui->ue->id, ui->ue->ino);
 				return -1;
 			}
-			pr_debug("ghost: Removed %s on id %#x ino %d\n",
+			pr_debug("ghost: Removed %s on id %#x ino %u\n",
 				 path, ui->ue->id, ui->ue->ino);
 		}
 	}
@@ -1594,13 +1594,13 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
 	mutex_lock(mutex_ghost);
 
 	if (ui->flags & USK_GHOST_FDSTORE) {
-		pr_debug("ghost: bind id %#x ino %d addr %s\n",
+		pr_debug("ghost: bind id %#x ino %u addr %s\n",
 			 ui->ue->id, ui->ue->ino, ui->name);
 		ret = bind_on_deleted(sk, ui);
 		if (ret)
 			errno = -ret;
 	} else {
-		pr_debug("bind id %#x ino %d addr %s\n",
+		pr_debug("bind id %#x ino %u addr %s\n",
 			 ui->ue->id, ui->ue->ino, ui->name);
 		ret = bind(sk, (struct sockaddr *)&addr,
 			   sizeof(addr.sun_family) + ui->ue->name.len);
@@ -1608,7 +1608,7 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
 			goto done;
 	}
 	if (ret < 0) {
-		pr_perror("Can't bind id %#x ino %d addr %s",
+		pr_perror("Can't bind id %#x ino %u addr %s",
 			  ui->ue->id, ui->ue->ino, ui->name);
 		goto done;
 	}
@@ -1654,7 +1654,7 @@ static int post_open_interconnected_master(struct unix_sk_info *ui)
 
 static void pr_info_opening(const char *prefix, struct unix_sk_info *ui, struct fdinfo_list_entry *fle)
 {
-	pr_info("Opening %s (stage %d id %#x ino %d peer %d)\n",
+	pr_info("Opening %s (stage %d id %#x ino %u peer %u)\n",
 		prefix, fle->stage, ui->ue->id, ui->ue->ino, ui->ue->peer);
 }
 
@@ -1950,7 +1950,7 @@ static char *socket_d_name(struct file_desc *d, char *buf, size_t s)
 
 	ui = container_of(d, struct unix_sk_info, d);
 
-	if (snprintf(buf, s, "socket:[%d]", ui->ue->ino) >= s) {
+	if (snprintf(buf, s, "socket:[%u]", ui->ue->ino) >= s) {
 		pr_err("Not enough room for unixsk %d identifier string\n",
 				ui->ue->ino);
 		return NULL;
@@ -1981,14 +1981,14 @@ static int unlink_sk(struct unix_sk_info *ui)
 
 	ret = unlinkat(AT_FDCWD, ui->name, 0) ? -1 : 0;
 	if (ret < 0 && errno != ENOENT) {
-		pr_warn("Can't unlink socket %d peer %d (name %s dir %s)\n",
+		pr_warn("Can't unlink socket %u peer %u (name %s dir %s)\n",
 			ui->ue->ino, ui->ue->peer,
 			ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-",
 			ui->name_dir ? ui->name_dir : "-");
 		ret = -errno;
 		goto out;
 	} else if (ret == 0) {
-		pr_debug("Unlinked socket %d peer %d (name %s dir %s)\n",
+		pr_debug("Unlinked socket %u peer %u (name %s dir %s)\n",
 			 ui->ue->ino, ui->ue->peer,
 			 ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-",
 			 ui->name_dir ? ui->name_dir : "-");
@@ -2065,7 +2065,7 @@ int unix_prepare_root_shared(void)
 		char tp_name[32];
 		char st_name[32];
 
-		pr_debug("ghost: id %#x type %s state %s ino %d peer %d address %s\n",
+		pr_debug("ghost: id %#x type %s state %s ino %u peer %u address %s\n",
 			 ui->ue->id, __socket_type_name(ui->ue->type, tp_name),
 			 __tcp_state_name(ui->ue->state, st_name),
 			 ui->ue->ino, ui->peer ? ui->peer->ue->ino : 0,
@@ -2113,7 +2113,7 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 		uname = "-";
 	}
 
-	pr_info(" `- Got id %#x ino %d type %s state %s peer %d (name %s%.*s dir %s)\n",
+	pr_info(" `- Got id %#x ino %u type %s state %s peer %u (name %s%.*s dir %s)\n",
 		ui->ue->id, ui->ue->ino, ___socket_type_name(ui->ue->type),
 		___tcp_state_name(ui->ue->state), ui->ue->peer, prefix, ulen,
 		uname, ui->name_dir ? ui->name_dir : "-");
@@ -2128,7 +2128,7 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 
 	if (ui->ue->deleted) {
 		if (!ui->name || !ui->ue->name.len || !ui->name[0]) {
-			pr_err("No name present, ino %d\n", ui->ue->ino);
+			pr_err("No name present, ino %u\n", ui->ue->ino);
 			return -1;
 		}
 

From 578597299a82f0aea0ef7a3063e6dc6ea6fccb33 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Mon, 30 Sep 2019 20:57:08 +0000
Subject: [PATCH 0018/1854] Cleanup do_full_int80()

1) Instead of tampering with the nr argument, do_full_int80() returns
the value of the system call. It also avoids copying all registers back
into the syscall_args32 argument after the syscall.

2) Additionally, the registers r12-r15 were added in the list of
clobbers as kernels older than v4.4 do not preserve these.

3) Further, GCC uses a 128-byte red-zone as defined in the x86_64 ABI
optimizing away the correct position of the %rsp register in
leaf-functions. We now avoid tampering with the red-zone, fixing a
SIGSEGV when running mmap_bug_test() in debug mode (DEBUG=1).

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/arch/x86/crtools.c            |  6 ++--
 criu/arch/x86/include/asm/compat.h | 51 ++++++++++++++++++++----------
 criu/arch/x86/kerndat.c            |  4 +--
 criu/arch/x86/restorer.c           |  3 +-
 criu/arch/x86/sigaction_compat.c   |  6 +---
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index efc23e5fe..e4073c27b 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -590,8 +590,7 @@ static int get_robust_list32(pid_t pid, uintptr_t head, uintptr_t len)
 		.arg2	= (uint32_t)len,
 	};
 
-	do_full_int80(&s);
-	return (int)s.nr;
+	return do_full_int80(&s);
 }
 
 static int set_robust_list32(uint32_t head, uint32_t len)
@@ -602,8 +601,7 @@ static int set_robust_list32(uint32_t head, uint32_t len)
 		.arg1	= len,
 	};
 
-	do_full_int80(&s);
-	return (int)s.nr;
+	return do_full_int80(&s);
 }
 
 int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info)
diff --git a/criu/arch/x86/include/asm/compat.h b/criu/arch/x86/include/asm/compat.h
index cd1ae472d..acd552fb3 100644
--- a/criu/arch/x86/include/asm/compat.h
+++ b/criu/arch/x86/include/asm/compat.h
@@ -38,26 +38,45 @@ struct syscall_args32 {
 	uint32_t nr, arg0, arg1, arg2, arg3, arg4, arg5;
 };
 
-static inline void do_full_int80(struct syscall_args32 *args)
+static inline uint32_t do_full_int80(struct syscall_args32 *args)
 {
 	/*
-	 * r8-r11 registers are cleared during returning to userspace
-	 * from syscall - that's x86_64 ABI to avoid leaking kernel
-	 * pointers.
+	 * Kernel older than v4.4 do not preserve r8-r15 registers when
+	 * invoking int80, so we need to preserve them.
 	 *
-	 * Other than that - we can't use %rbp in clobbers as GCC's inline
-	 * assembly doesn't allow to do so. So, here is explicitly saving
-	 * %rbp before syscall and restoring it's value afterward.
+	 * Additionally, %rbp is used as the 6th syscall argument, and we need
+	 * to preserve its value when returning from the syscall to avoid
+	 * upsetting GCC. However, we can't use %rbp in the GCC asm clobbers
+	 * due to a GCC limitation. Instead, we explicitly save %rbp on the
+	 * stack before invoking the syscall and restore its value afterward.
+	 *
+	 * Further, GCC may not adjust the %rsp pointer when allocating the
+	 * args and ret variables because 1) do_full_int80() is a leaf
+	 * function, and 2) the local variables (args and ret) are in the
+	 * 128-byte red-zone as defined in the x86_64 ABI. To use the stack
+	 * when preserving %rbp, we must either tell GCC to a) mark the
+	 * function as non-leaf, or b) move away from the red-zone when using
+	 * the stack. It seems that there is no easy way to do a), so we'll go
+	 * with b).
+	 * Note 1: Another workaround would have been to add %rsp in the list
+	 * of clobbers, but this was deprecated in GCC 9.
+	 * Note 2: This red-zone bug only manifests when compiling CRIU with
+	 * DEBUG=1.
 	 */
-	asm volatile ("pushq %%rbp\n\t"
-			"mov %6, %%ebp\n\t"
-			"int $0x80\n\t"
-			"mov %%ebp, %6\n\t"
-			"popq %%rbp\n\t"
-		      : "+a" (args->nr),
-			"+b" (args->arg0), "+c" (args->arg1), "+d" (args->arg2),
-			"+S" (args->arg3), "+D" (args->arg4), "+g" (args->arg5)
-			: : "r8", "r9", "r10", "r11");
+	uint32_t ret;
+
+	asm volatile ("sub $128, %%rsp\n\t"
+		      "pushq %%rbp\n\t"
+		      "mov %7, %%ebp\n\t"
+		      "int $0x80\n\t"
+		      "popq %%rbp\n\t"
+		      "add $128, %%rsp\n\t"
+		      : "=a" (ret)
+		      : "a" (args->nr),
+			"b" (args->arg0), "c" (args->arg1), "d" (args->arg2),
+			"S" (args->arg3), "D" (args->arg4), "g" (args->arg5)
+		      : "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15");
+	return ret;
 }
 
 #ifndef CR_NOGLIBC
diff --git a/criu/arch/x86/kerndat.c b/criu/arch/x86/kerndat.c
index f7593251b..94c954e1e 100644
--- a/criu/arch/x86/kerndat.c
+++ b/criu/arch/x86/kerndat.c
@@ -75,9 +75,7 @@ void *mmap_ia32(void *addr, size_t len, int prot,
 	s.arg4  = fildes;
 	s.arg5  = (uint32_t)off;
 
-	do_full_int80(&s);
-
-	return (void *)(uintptr_t)s.nr;
+	return (void *)(uintptr_t)do_full_int80(&s);
 }
 
 /*
diff --git a/criu/arch/x86/restorer.c b/criu/arch/x86/restorer.c
index 2d335d5e1..b2c3b3668 100644
--- a/criu/arch/x86/restorer.c
+++ b/criu/arch/x86/restorer.c
@@ -54,8 +54,7 @@ int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 		.arg1	= len,
 	};
 
-	do_full_int80(&s);
-	return (int)s.nr;
+	return do_full_int80(&s);
 }
 
 static int prepare_stack32(void **stack32)
diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c
index b38ba8011..f467da490 100644
--- a/criu/arch/x86/sigaction_compat.c
+++ b/criu/arch/x86/sigaction_compat.c
@@ -28,7 +28,6 @@ extern char restore_rt_sigaction;
  */
 int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
 {
-	int ret;
 	struct syscall_args32 arg = {};
 	unsigned long act_stack = (unsigned long)stack32;
 
@@ -49,8 +48,5 @@ int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
 	arg.arg2	= 0;					/* oldact */
 	arg.arg3	= (uint32_t)sizeof(act->rt_sa_mask);	/* sigsetsize */
 
-	do_full_int80(&arg);
-	asm volatile ("\t movl %%eax,%0\n" : "=r"(ret));
-	return ret;
+	return do_full_int80(&arg);
 }
-

From 576a99f492b1f55050d4fde8560efe454ab887bc Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 4 Oct 2019 16:32:48 +0100
Subject: [PATCH 0019/1854] restorer/inotify: Don't overflow PIE stack

PATH_MAX == 4096; PATH_MAX*8 == 32k; RESTORE_STACK_SIZE == 32k.

Fixes: a3cdf948699c6 ("inotify: cleanup auxiliary events from queue")
Cc: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Cc: Andrei Vagin <avagin@gmail.com>
Co-debugged-with: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/pie/restorer.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 390c0e1a9..dab58add6 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1320,21 +1320,23 @@ static int fd_poll(int inotify_fd)
 }
 
 /*
- * note: Actually kernel may want even more space for one event (see
- * round_event_name_len), so using buffer of EVENT_BUFF_SIZE size may fail.
- * To be on the safe side - take a bigger buffer, and these also allows to
- * read more events in one syscall.
+ * In the worst case buf size should be:
+ *   sizeof(struct inotify_event) * 2 + PATH_MAX
+ * See round_event_name_len() in kernel.
  */
-#define EVENT_BUFF_SIZE ((sizeof(struct inotify_event) + PATH_MAX))
+#define EVENT_BUFF_SIZE ((sizeof(struct inotify_event) * 2 + PATH_MAX))
 
 /*
  * Read all available events from inotify queue
  */
 static int cleanup_inotify_events(int inotify_fd)
 {
-	char buf[EVENT_BUFF_SIZE * 8];
+	char buf[EVENT_BUFF_SIZE * 3];
 	int ret;
 
+	/* Limit buf to be lesser than half of restorer's stack */
+	BUILD_BUG_ON(ARRAY_SIZE(buf) >= RESTORE_STACK_SIZE/2);
+
 	while (1) {
 		ret = fd_poll(inotify_fd);
 		if (ret < 0) {

From 20d4920a8bf74d1eceebc076bcc00889ba40e9f7 Mon Sep 17 00:00:00 2001
From: Abhishek Dubey <dubeyabhishek777@gmail.com>
Date: Thu, 3 Oct 2019 19:39:18 +0530
Subject: [PATCH 0020/1854] Adding --pre-dump-mode option

Two modes of pre-dump algorithm:
    1) splicing memory by parasite
        --pre-dump-mode=splice (default)
    2) using process_vm_readv syscall
        --pre-dump-mode=read

Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Documentation/criu.txt    |  6 ++++++
 criu/config.c             | 10 ++++++++++
 criu/cr-service.c         | 13 +++++++++++++
 criu/crtools.c            |  2 ++
 criu/include/cr_options.h |  7 +++++++
 criu/mem.c                | 13 ++++++++++++-
 images/rpc.proto          |  6 ++++++
 lib/c/criu.c              | 15 +++++++++++++++
 lib/c/criu.h              |  7 +++++++
 test/zdtm.py              |  9 ++++++++-
 10 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 28913a7fb..2729bc95a 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -156,6 +156,12 @@ In addition, *page-server* options may be specified.
     Turn on memory changes tracker in the kernel. If the option is
     not passed the memory tracker get turned on implicitly.
 
+*--pre-dump-mode*='mode'::
+    There are two 'mode' to operate pre-dump algorithm. The 'splice' mode
+    is parasite based, whereas 'read' mode is based on process_vm_readv
+    syscall. The 'read' mode incurs reduced frozen time and reduced
+    memory pressure as compared to 'splice' mode. Default is 'splice' mode.
+
 *dump*
 ~~~~~~
 Performs a checkpoint procedure.
diff --git a/criu/config.c b/criu/config.c
index 2ad2fd43c..e5d42efe4 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -276,6 +276,7 @@ void init_opts(void)
 	opts.empty_ns = 0;
 	opts.status_fd = -1;
 	opts.log_level = DEFAULT_LOGLEVEL;
+	opts.pre_dump_mode = PRE_DUMP_SPLICE;
 }
 
 bool deprecated_ok(char *what)
@@ -517,6 +518,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		BOOL_OPT("tls", &opts.tls),
 		{"tls-no-cn-verify",		no_argument,		&opts.tls_no_cn_verify, true},
 		{ "cgroup-yard",		required_argument,	0, 1096 },
+		{ "pre-dump-mode",		required_argument,	0, 1097},
 		{ },
 	};
 
@@ -818,6 +820,14 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		case 1096:
 			SET_CHAR_OPTS(cgroup_yard, optarg);
 			break;
+		case 1097:
+			if (!strcmp("read", optarg)) {
+				opts.pre_dump_mode = PRE_DUMP_READ;
+			} else if (strcmp("splice", optarg)) {
+				pr_err("Unable to parse value of --pre-dump-mode\n");
+				return 1;
+			}
+			break;
 		case 'V':
 			pr_msg("Version: %s\n", CRIU_VERSION);
 			if (strcmp(CRIU_GITID, "0"))
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 95ba2e5ce..392e9ac50 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -473,6 +473,19 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		opts.lazy_pages = req->lazy_pages;
 	}
 
+	if (req->has_pre_dump_mode) {
+		switch (req->pre_dump_mode) {
+			case CRIU_PRE_DUMP_MODE__SPLICE:
+				opts.pre_dump_mode = PRE_DUMP_SPLICE;
+				break;
+			case CRIU_PRE_DUMP_MODE__READ:
+				opts.pre_dump_mode = PRE_DUMP_READ;
+				break;
+			default:
+				goto err;
+		}
+	}
+
 	if (req->ps) {
 		opts.port = (short)req->ps->port;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index 5740b806d..700fad994 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -428,6 +428,8 @@ usage:
 "                        pages images of previous dump\n"
 "                        when used on restore, as soon as page is restored, it\n"
 "                        will be punched from the image\n"
+"  --pre-dump-mode       splice - parasite based pre-dumping (default)\n"
+"                        read   - process_vm_readv syscall based pre-dumping\n"
 "\n"
 "Page/Service server options:\n"
 "  --address ADDR        address of server or service\n"
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index da7c10d69..2c1451e86 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -38,6 +38,12 @@ struct cg_root_opt {
 	char *newroot;
 };
 
+/*
+ * Pre-dump variants
+ */
+#define PRE_DUMP_SPLICE		1		/* Pre-dump using parasite */
+#define PRE_DUMP_READ			2		/* Pre-dump using process_vm_readv syscall */
+
 /*
  * Cgroup management options.
  */
@@ -81,6 +87,7 @@ struct cr_options {
 	int			evasive_devices;
 	int			link_remap_ok;
 	int			log_file_per_pid;
+	int			pre_dump_mode;
 	bool			swrk_restore;
 	char			*output;
 	char			*root;
diff --git a/criu/mem.c b/criu/mem.c
index de66a6210..911b9d21c 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -482,7 +482,18 @@ static int __parasite_dump_pages_seized(struct pstree_item *item,
 	if (mdc->lazy)
 		memcpy(pargs_iovs(args), pp->iovs,
 		       sizeof(struct iovec) * pp->nr_iovs);
-	ret = drain_pages(pp, ctl, args);
+
+	/*
+	 * Faking drain_pages for pre-dump here. Actual drain_pages for pre-dump
+	 * will happen after task unfreezing in cr_pre_dump_finish(). This is
+	 * actual optimization which reduces time for which process was frozen
+	 * during pre-dump.
+	 */
+	if (mdc->pre_dump && opts.pre_dump_mode == PRE_DUMP_READ)
+		ret = 0;
+	else
+		ret = drain_pages(pp, ctl, args);
+
 	if (!ret && !mdc->pre_dump)
 		ret = xfer_pages(pp, &xfer);
 	if (ret)
diff --git a/images/rpc.proto b/images/rpc.proto
index c402259ac..fc2f1bce2 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -47,6 +47,11 @@ enum criu_cg_mode {
 	DEFAULT = 6;
 };
 
+enum criu_pre_dump_mode {
+	SPLICE = 	1;
+	READ =		2;
+};
+
 message criu_opts {
 	required int32			images_dir_fd	= 1;
 	optional int32			pid		= 2; /* if not set on dump, will dump requesting process */
@@ -121,6 +126,7 @@ message criu_opts {
 	optional bool			tls			= 58;
 	optional bool			tls_no_cn_verify	= 59;
 	optional string			cgroup_yard		= 60;
+	optional criu_pre_dump_mode	pre_dump_mode		= 61 [default = SPLICE];
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 14ddff26d..fffb9fd9c 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -336,6 +336,21 @@ int criu_set_parent_images(const char *path)
 	return criu_local_set_parent_images(global_opts, path);
 }
 
+int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode)
+{
+	opts->rpc->has_pre_dump_mode = true;
+	if (mode == CRIU_PRE_DUMP_SPLICE || mode == CRIU_PRE_DUMP_READ) {
+		opts->rpc->pre_dump_mode = mode;
+		return 0;
+	}
+	return -1;
+}
+
+int criu_set_pre_dump_mode(enum criu_pre_dump_mode mode)
+{
+	return criu_local_set_pre_dump_mode(global_opts, mode);
+}
+
 void criu_local_set_track_mem(criu_opts *opts, bool track_mem)
 {
 	opts->rpc->has_track_mem = true;
diff --git a/lib/c/criu.h b/lib/c/criu.h
index cb37c5291..22db0fdcf 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -43,6 +43,11 @@ enum criu_cg_mode {
 	CRIU_CG_MODE_DEFAULT,
 };
 
+enum criu_pre_dump_mode {
+	CRIU_PRE_DUMP_SPLICE =	1,
+	CRIU_PRE_DUMP_READ =	2
+};
+
 int criu_set_service_address(const char *path);
 void criu_set_service_fd(int fd);
 int criu_set_service_binary(const char *path);
@@ -95,6 +100,7 @@ int criu_add_irmap_path(const char *path);
 int criu_add_inherit_fd(int fd, const char *key);
 int criu_add_external(const char *key);
 int criu_set_page_server_address_port(const char *address, int port);
+int criu_set_pre_dump_mode(enum criu_pre_dump_mode mode);
 
 /*
  * The criu_notify_arg_t na argument is an opaque
@@ -211,6 +217,7 @@ int criu_local_add_cg_yard(criu_opts *opts, const char *path);
 int criu_local_add_inherit_fd(criu_opts *opts, int fd, const char *key);
 int criu_local_add_external(criu_opts *opts, const char *key);
 int criu_local_set_page_server_address_port(criu_opts *opts, const char *address, int port);
+int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode);
 
 void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_notify_arg_t na));
 
diff --git a/test/zdtm.py b/test/zdtm.py
index f0a102413..3c0cee667 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1019,6 +1019,7 @@ class criu:
         self.__tls = self.__tls_options() if opts['tls'] else []
         self.__criu_bin = opts['criu_bin']
         self.__crit_bin = opts['crit_bin']
+        self.__pre_dump_mode = opts['pre_dump_mode']
 
     def fini(self):
         if self.__lazy_migrate:
@@ -1249,6 +1250,8 @@ class criu:
             a_opts += ['--leave-stopped']
         if self.__empty_ns:
             a_opts += ['--empty-ns', 'net']
+        if self.__pre_dump_mode:
+            a_opts += ["--pre-dump-mode", "%s" % self.__pre_dump_mode]
 
         nowait = False
         if self.__lazy_migrate and action == "dump":
@@ -1835,7 +1838,7 @@ class Launcher:
               'sat', 'script', 'rpc', 'lazy_pages', 'join_ns', 'dedup', 'sbs',
               'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate',
-              'tls', 'criu_bin', 'crit_bin')
+              'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
         if self.__use_log:
@@ -2482,6 +2485,10 @@ rp.add_argument("--criu-bin",
 rp.add_argument("--crit-bin",
                 help="Path to crit binary",
                 default='../crit/crit')
+rp.add_argument("--pre-dump-mode",
+                help="Use splice or read mode of pre-dumping",
+                choices=['splice', 'read'],
+                default='splice')
 
 lp = sp.add_parser("list", help="List tests")
 lp.set_defaults(action=list_tests)

From e0ea21ad5ecafadad653f46a0ed8cbef69c7b883 Mon Sep 17 00:00:00 2001
From: Abhishek Dubey <dubeyabhishek777@gmail.com>
Date: Thu, 3 Oct 2019 19:39:19 +0530
Subject: [PATCH 0021/1854] Handling iov generation for non-PROT_READ regions

Skip iov-generation for regions not having
PROT_READ, since process_vm_readv syscall
can't process them during "read" pre-dump.
Handle random order of "read" & "splice"
pre-dumps.

Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c         |  5 ++++
 criu/mem.c             | 56 ++++++++++++++++++++++++++++++++++++++++--
 images/inventory.proto |  1 +
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index fcbe816e8..dd5b62dd0 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1485,6 +1485,9 @@ static int cr_pre_dump_finish(int status)
 	if (ret)
 		goto err;
 
+	he.has_pre_dump_mode = true;
+	he.pre_dump_mode = opts.pre_dump_mode;
+
 	pstree_switch_state(root_item, TASK_ALIVE);
 
 	timing_stop(TIME_FROZEN);
@@ -1914,6 +1917,8 @@ int cr_dump_tasks(pid_t pid)
 	if (ret)
 		goto err;
 
+	he.has_pre_dump_mode = false;
+
 	ret = write_img_inventory(&he);
 	if (ret)
 		goto err;
diff --git a/criu/mem.c b/criu/mem.c
index 911b9d21c..a5de23755 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -351,7 +351,8 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma,
 			     struct page_pipe *pp, struct page_xfer *xfer,
 			     struct parasite_dump_pages_args *args,
 			     struct parasite_ctl *ctl, pmc_t *pmc,
-			     bool has_parent, bool pre_dump)
+			     bool has_parent, bool pre_dump,
+			     int parent_predump_mode)
 {
 	u64 off = 0;
 	u64 *map;
@@ -361,6 +362,52 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma,
 				!vma_area_is(vma, VMA_ANON_SHARED))
 		return 0;
 
+	/*
+	 * To facilitate any combination of pre-dump modes to run after
+	 * one another, we need to take extra care as discussed below.
+	 *
+	 * The SPLICE mode pre-dump, processes all type of memory regions,
+	 * whereas READ mode pre-dump skips processing those memory regions
+	 * which lacks PROT_READ flag.
+	 *
+	 * Now on mixing pre-dump modes:
+	 * 	If SPLICE mode follows SPLICE mode	: no issue
+	 *		-> everything dumped both the times
+	 *
+	 * 	If READ mode follows READ mode		: no issue
+	 *		-> non-PROT_READ skipped both the time
+	 *
+	 * 	If READ mode follows SPLICE mode   	: no issue
+	 *		-> everything dumped at first,
+	 *		   the non-PROT_READ skipped later
+	 *
+	 * 	If SPLICE mode follows READ mode   	: Need special care
+	 *
+	 * If READ pre-dump happens first, then it has skipped processing
+	 * non-PROT_READ regions. Following SPLICE pre-dump expects pagemap
+	 * entries for all mappings in parent pagemap, but last READ mode
+	 * pre-dump cycle has skipped processing & pagemap generation for
+	 * non-PROT_READ regions. So SPLICE mode throws error of missing
+	 * pagemap entry for encountered non-PROT_READ mapping.
+	 *
+	 * To resolve this, the pre-dump-mode is stored in current pre-dump's
+	 * inventoy file. This pre-dump mode is read back from this file
+	 * (present in parent pre-dump dir) as parent-pre-dump-mode during
+	 * next pre-dump.
+	 *
+	 * If parent-pre-dump-mode and next-pre-dump-mode are in READ-mode ->
+	 * SPLICE-mode order, then SPLICE mode doesn't expect mappings for
+	 * non-PROT_READ regions in parent-image and marks "has_parent=false".
+	 */
+
+	if (!(vma->e->prot & PROT_READ)) {
+		if (opts.pre_dump_mode == PRE_DUMP_READ && pre_dump)
+			return 0;
+		if ((parent_predump_mode == PRE_DUMP_READ &&
+			opts.pre_dump_mode == PRE_DUMP_SPLICE) || !pre_dump)
+			has_parent = false;
+	}
+
 	if (vma_entry_is(vma->e, VMA_AREA_AIORING)) {
 		if (pre_dump)
 			return 0;
@@ -406,6 +453,7 @@ static int __parasite_dump_pages_seized(struct pstree_item *item,
 	unsigned long pmc_size;
 	int possible_pid_reuse = 0;
 	bool has_parent;
+	int parent_predump_mode = -1;
 
 	pr_info("\n");
 	pr_info("Dumping pages (type: %d pid: %d)\n", CR_FD_PAGES, item->pid->real);
@@ -472,9 +520,13 @@ static int __parasite_dump_pages_seized(struct pstree_item *item,
 	 */
 	args->off = 0;
 	has_parent = !!xfer.parent && !possible_pid_reuse;
+	if(mdc->parent_ie)
+		parent_predump_mode = mdc->parent_ie->pre_dump_mode;
+
 	list_for_each_entry(vma_area, &vma_area_list->h, list) {
 		ret = generate_vma_iovs(item, vma_area, pp, &xfer, args, ctl,
-					&pmc, has_parent, mdc->pre_dump);
+					&pmc, has_parent, mdc->pre_dump,
+					parent_predump_mode);
 		if (ret < 0)
 			goto out_xfer;
 	}
diff --git a/images/inventory.proto b/images/inventory.proto
index 7bc2b0c02..d1438e8c8 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -16,4 +16,5 @@ message inventory_entry {
 	optional uint32			root_cg_set	= 5;
 	optional lsmtype		lsmtype		= 6;
 	optional uint64			dump_uptime	= 8;
+	optional uint32			pre_dump_mode	= 9;
 }

From 29b63e9a720ec3e996de3bdbeccde5d7c0cb46e3 Mon Sep 17 00:00:00 2001
From: Abhishek Dubey <dubeyabhishek777@gmail.com>
Date: Thu, 3 Oct 2019 19:39:20 +0530
Subject: [PATCH 0022/1854] Skip adding PROT_READ to non-PROT_READ mappings

"read" mode pre-dump may fail even after
adding PROT_READ flag. Adding PROT_READ
works when dumping statically. See added
comment for details.

Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/mem.c | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/criu/mem.c b/criu/mem.c
index a5de23755..4e110c9e9 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -591,13 +591,47 @@ int parasite_dump_pages_seized(struct pstree_item *item,
 	 * able to read the memory contents.
 	 *
 	 * Afterwards -- reprotect memory back.
+	 *
+	 * This step is required for "splice" mode pre-dump and dump.
+	 * Skip this step for "read" mode pre-dump.
+	 * "read" mode pre-dump delegates processing of non-PROT_READ
+	 * regions to dump stage. Adding PROT_READ works fine for
+	 * static processing (target process frozen during pre-dump)
+	 * and fails for dynamic as explained below.
+	 *
+	 * Consider following sequence of instances to reason, why
+	 * not to add PROT_READ in "read" mode pre-dump ?
+	 *
+	 *	CRIU- "read" pre-dump		    Target Process
+	 *
+	 *					1. Creates mapping M
+	 *					   without PROT_READ
+	 * 2. CRIU freezes target
+	 *    process
+	 * 3. Collect the mappings
+	 * 4. Add PROT_READ to M
+	 *    (non-PROT_READ region)
+	 * 5. CRIU unfreezes target
+	 *    process
+	 *					6. Add flag PROT_READ
+	 *					   to mapping M
+	 *					7. Revoke flag PROT_READ
+	 *					   from mapping M
+	 * 8. process_vm_readv tries
+	 *    to copy mapping M
+	 *    (believing M have
+	 *     PROT_READ flag)
+	 * 9. syscall fails to copy
+	 *    data from M
 	 */
 
-	pargs->add_prot = PROT_READ;
-	ret = compel_rpc_call_sync(PARASITE_CMD_MPROTECT_VMAS, ctl);
-	if (ret) {
-		pr_err("Can't dump unprotect vmas with parasite\n");
-		return ret;
+	if (!mdc->pre_dump || opts.pre_dump_mode == PRE_DUMP_SPLICE) {
+		pargs->add_prot = PROT_READ;
+		ret = compel_rpc_call_sync(PARASITE_CMD_MPROTECT_VMAS, ctl);
+		if (ret) {
+			pr_err("Can't dump unprotect vmas with parasite\n");
+			return ret;
+		}
 	}
 
 	if (fault_injected(FI_DUMP_PAGES)) {
@@ -612,10 +646,12 @@ int parasite_dump_pages_seized(struct pstree_item *item,
 		return ret;
 	}
 
-	pargs->add_prot = 0;
-	if (compel_rpc_call_sync(PARASITE_CMD_MPROTECT_VMAS, ctl)) {
-		pr_err("Can't rollback unprotected vmas with parasite\n");
-		ret = -1;
+	if (!mdc->pre_dump || opts.pre_dump_mode == PRE_DUMP_SPLICE) {
+		pargs->add_prot = 0;
+		if (compel_rpc_call_sync(PARASITE_CMD_MPROTECT_VMAS, ctl)) {
+			pr_err("Can't rollback unprotected vmas with parasite\n");
+			ret = -1;
+		}
 	}
 
 	return ret;

From 4c774afc18e8af458eeb03ea021ba52d0af4b32c Mon Sep 17 00:00:00 2001
From: Abhishek Dubey <dubeyabhishek777@gmail.com>
Date: Thu, 3 Oct 2019 19:39:21 +0530
Subject: [PATCH 0023/1854] Adding cnt_sub for stats manipulation

adding cnt_sub function (complement of cnt_add).
cnt_sub is utilized to decrement stats counter
according to skipped page count during "read"
mode pre-dump.

Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/stats.h |  1 +
 criu/stats.c         | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/criu/include/stats.h b/criu/include/stats.h
index bab9a0507..5d408b7b1 100644
--- a/criu/include/stats.h
+++ b/criu/include/stats.h
@@ -45,6 +45,7 @@ enum {
 };
 
 extern void cnt_add(int c, unsigned long val);
+extern void cnt_sub(int c, unsigned long val);
 
 #define DUMP_STATS	1
 #define RESTORE_STATS	2
diff --git a/criu/stats.c b/criu/stats.c
index 7410b5ced..cb528011a 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -41,6 +41,18 @@ void cnt_add(int c, unsigned long val)
 		BUG();
 }
 
+void cnt_sub(int c, unsigned long val)
+{
+	if (dstats != NULL) {
+		BUG_ON(c >= DUMP_CNT_NR_STATS);
+		dstats->counts[c] -= val;
+	} else if (rstats != NULL) {
+		BUG_ON(c >= RESTORE_CNT_NR_STATS);
+		atomic_sub(val, &rstats->counts[c]);
+	} else
+		BUG();
+}
+
 static void timeval_accumulate(const struct timeval *from, const struct timeval *to,
 		struct timeval *res)
 {

From 98608b90de0f853b1c8a6e15b312320e1441c359 Mon Sep 17 00:00:00 2001
From: Abhishek Dubey <dubeyabhishek777@gmail.com>
Date: Thu, 3 Oct 2019 19:39:22 +0530
Subject: [PATCH 0024/1854] read mode pre-dump implementation

Pre-dump using the process_vm_readv syscall.
During frozen state, only iovecs will be
generated and draining of memory happens
after the task is unfrozen. Pre-dumping of
shared memory remains unmodified.

Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c           |   7 +-
 criu/include/page-xfer.h |   4 +
 criu/page-xfer.c         | 389 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 399 insertions(+), 1 deletion(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index dd5b62dd0..ff05e38d7 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1513,7 +1513,12 @@ static int cr_pre_dump_finish(int status)
 			goto err;
 
 		mem_pp = dmpi(item)->mem_pp;
-		ret = page_xfer_dump_pages(&xfer, mem_pp);
+
+		if (opts.pre_dump_mode == PRE_DUMP_READ)
+			ret = page_xfer_predump_pages(item->pid->real,
+							&xfer, mem_pp);
+		else
+			ret = page_xfer_dump_pages(&xfer, mem_pp);
 
 		xfer.close(&xfer);
 
diff --git a/criu/include/page-xfer.h b/criu/include/page-xfer.h
index fa72273ea..98061e2d3 100644
--- a/criu/include/page-xfer.h
+++ b/criu/include/page-xfer.h
@@ -9,6 +9,9 @@ struct ps_info {
 
 extern int cr_page_server(bool daemon_mode, bool lazy_dump, int cfd);
 
+/* User buffer for read-mode pre-dump*/
+#define BUFFER_SIZE (PIPE_MAX_SIZE << PAGE_SHIFT)
+
 /*
  * page_xfer -- transfer pages into image file.
  * Two images backends are implemented -- local image file
@@ -48,6 +51,7 @@ struct page_xfer {
 extern int open_page_xfer(struct page_xfer *xfer, int fd_type, unsigned long id);
 struct page_pipe;
 extern int page_xfer_dump_pages(struct page_xfer *, struct page_pipe *);
+extern int page_xfer_predump_pages(int pid, struct page_xfer *, struct page_pipe *);
 extern int connect_to_page_server_to_send(void);
 extern int connect_to_page_server_to_recv(int epfd);
 extern int disconnect_from_page_server(void);
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 75e135c66..8709df745 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -6,6 +6,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/mman.h>
 
 #undef LOG_PREFIX
 #define LOG_PREFIX "page-xfer: "
@@ -480,6 +481,394 @@ static inline u32 ppb_xfer_flags(struct page_xfer *xfer, struct page_pipe_buf *p
 		return PE_PRESENT;
 }
 
+/*
+ * Optimized pre-dump algorithm
+ * ==============================
+ *
+ * Note: Please refer man(2) page of process_vm_readv syscall.
+ *
+ * The following discussion covers the possibly faulty-iov
+ * locations in an iovec, which hinders process_vm_readv from
+ * dumping the entire iovec in a single invocation.
+ *
+ * Memory layout of target process:
+ *
+ * Pages: A        B        C
+ *	  +--------+--------+--------+--------+--------+--------+
+ *	  |||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ *	  +--------+--------+--------+--------+--------+--------+
+ *
+ * Single "iov" representation: {starting_address, length_in_bytes}
+ * An iovec is array of iov-s.
+ *
+ * NOTE: For easy representation and discussion purpose, we carry
+ *	 out further discussion at "page granularity".
+ *	 length_in_bytes will represent page count in iov instead
+ *	 of byte count. Same assumption applies for the syscall's
+ *	 return value. Instead of returning the number of bytes
+ *	 read, it returns a page count.
+ *
+ * For above memory mapping, generated iovec: {A,1}{B,1}{C,4}
+ *
+ * This iovec remains unmodified once generated. At the same
+ * time some of memory regions listed in iovec may get modified
+ * (unmap/change protection) by the target process while syscall
+ * is trying to dump iovec regions.
+ *
+ * Case 1:
+ *	A is unmapped, {A,1} become faulty iov
+ *
+ *      A        B        C
+ *      +--------+--------+--------+--------+--------+--------+
+ *      |        ||||||||||||||||||||||||||||||||||||||||||||||
+ *      +--------+--------+--------+--------+--------+--------+
+ *      ^        ^
+ *      |        |
+ *      start    |
+ *      (1)      |
+ *               start
+ *               (2)
+ *
+ *	process_vm_readv will return -1. Increment start pointer(2),
+ *	syscall will process {B,1}{C,4} in one go and copy 5 pages
+ *	to userbuf from iov-B and iov-C.
+ *
+ * Case 2:
+ *	B is unmapped, {B,1} become faulty iov
+ *
+ *      A        B        C
+ *      +--------+--------+--------+--------+--------+--------+
+ *      |||||||||         |||||||||||||||||||||||||||||||||||||
+ *      +--------+--------+--------+--------+--------+--------+
+ *      ^                 ^
+ *      |                 |
+ *      start             |
+ *      (1)               |
+ *                        start
+ *                        (2)
+ *
+ *	process_vm_readv will return 1, i.e. page A copied to
+ *	userbuf successfully and syscall stopped, since B got
+ *	unmapped.
+ *
+ *	Increment the start pointer to C(2) and invoke syscall.
+ *	Userbuf contains 5 pages overall from iov-A and iov-C.
+ *
+ * Case 3:
+ *	This case deals with partial unmapping of iov representing
+ *	more than one pagesize region.
+ *
+ *	Syscall can't process such faulty iov as whole. So we
+ *	process such regions part-by-part and form new sub-iovs
+ *	in aux_iov from successfully processed pages.
+ *
+ *
+ *	Part 3.1:
+ *		First page of C is unmapped
+ *
+ *      A        B        C
+ *      +--------+--------+--------+--------+--------+--------+
+ *      ||||||||||||||||||         ||||||||||||||||||||||||||||
+ *      +--------+--------+--------+--------+--------+--------+
+ *      ^                          ^
+ *      |                          |
+ *      start                      |
+ *      (1)                        |
+ *                                 dummy
+ *                                 (2)
+ *
+ *	process_vm_readv will return 2, i.e. pages A and B copied.
+ *	We identify length of iov-C is more than 1 page, that is
+ *	where this case differs from Case 2.
+ *
+ *	dummy-iov is introduced(2) as: {C+1,3}. dummy-iov can be
+ *	directly placed at next page to failing page. This will copy
+ *	remaining 3 pages from iov-C to userbuf. Finally create
+ *	modified iov entry in aux_iov. Complete aux_iov look like:
+ *
+ *	aux_iov: {A,1}{B,1}{C+1,3}*
+ *
+ *
+ *	Part 3.2:
+ *		In between page of C is unmapped, let's say third
+ *
+ *      A        B        C
+ *      +--------+--------+--------+--------+--------+--------+
+ *      ||||||||||||||||||||||||||||||||||||         ||||||||||
+ *      +--------+--------+--------+--------+--------+--------+
+ *      ^                                            ^
+ *      |                 |-----------------|        |
+ *      start              partial_read_bytes        |
+ *      (1)                                          |
+ *                                                   dummy
+ *                                                   (2)
+ *
+ *	process_vm_readv will return 4, i.e. pages A and B copied
+ *	completely and first two pages of C are also copied.
+ *
+ *	Since, iov-C is not processed completely, we need to find
+ *	"partial_read_byte" count to place out dummy-iov for
+ *	remainig processing of iov-C. This function is performed by
+ *	analyze_iov function.
+ *
+ *	dummy-iov will be(2): {C+3,1}. dummy-iov will be placed
+ *	next to first failing address to process remaining iov-C.
+ *	New entries in aux_iov will look like:
+ *
+ *	aux_iov: {A,1}{B,1}{C,2}*{C+3,1}*
+ */
+
+unsigned long handle_faulty_iov(int pid, struct iovec* riov,
+				unsigned long faulty_index,
+				struct iovec *bufvec, struct iovec* aux_iov,
+				unsigned long* aux_len,
+				unsigned long partial_read_bytes)
+{
+	/* Handling Case 2*/
+	if (riov[faulty_index].iov_len == PAGE_SIZE) {
+		cnt_sub(CNT_PAGES_WRITTEN, 1);
+		return 0;
+	}
+
+	struct iovec dummy;
+	ssize_t bytes_read;
+	unsigned long offset = 0;
+	unsigned long final_read_cnt = 0;
+
+	/* Handling Case 3-Part 3.2*/
+	offset = (partial_read_bytes)? partial_read_bytes : PAGE_SIZE;
+
+	dummy.iov_base = riov[faulty_index].iov_base + offset;
+	dummy.iov_len = riov[faulty_index].iov_len - offset;
+
+	if (!partial_read_bytes)
+		cnt_sub(CNT_PAGES_WRITTEN, 1);
+
+	while (dummy.iov_len) {
+
+		bytes_read = process_vm_readv(pid, bufvec, 1, &dummy, 1, 0);
+
+		if(bytes_read == -1) {
+			/* Handling faulty page read in faulty iov */
+			cnt_sub(CNT_PAGES_WRITTEN, 1);
+			dummy.iov_base += PAGE_SIZE;
+			dummy.iov_len -= PAGE_SIZE;
+			continue;
+		}
+
+		/* If aux-iov can merge and expand or new entry required */
+		if (aux_iov[(*aux_len)-1].iov_base +
+			aux_iov[(*aux_len)-1].iov_len == dummy.iov_base)
+			aux_iov[(*aux_len)-1].iov_len += bytes_read;
+		else {
+			aux_iov[*aux_len].iov_base = dummy.iov_base;
+			aux_iov[*aux_len].iov_len = bytes_read;
+			(*aux_len) += 1;
+		}
+
+		dummy.iov_base += bytes_read;
+		dummy.iov_len -= bytes_read;
+		bufvec->iov_base += bytes_read;
+		bufvec->iov_len -= bytes_read;
+		final_read_cnt += bytes_read;
+	}
+
+	return final_read_cnt;
+}
+
+/*
+ * This function will position start pointer to the latest
+ * successfully read iov in iovec. In case of partial read it
+ * returns partial_read_bytes, otherwise 0.
+ */
+static unsigned long analyze_iov(ssize_t bytes_read, struct iovec* riov,
+				 unsigned long *index, struct iovec *aux_iov,
+				 unsigned long *aux_len)
+{
+	ssize_t processed_bytes = 0;
+	unsigned long partial_read_bytes = 0;
+
+	/* correlating iovs with read bytes */
+	while (processed_bytes < bytes_read) {
+
+		processed_bytes += riov[*index].iov_len;
+		aux_iov[*aux_len].iov_base = riov[*index].iov_base;
+		aux_iov[*aux_len].iov_len = riov[*index].iov_len;
+
+		(*aux_len) += 1;
+		(*index) += 1;
+	}
+
+	/* handling partially processed faulty iov*/
+	if (processed_bytes - bytes_read) {
+
+		(*index) -= 1;
+
+		partial_read_bytes = riov[*index].iov_len
+					- (processed_bytes - bytes_read);
+		aux_iov[*aux_len-1].iov_len = partial_read_bytes;
+	}
+
+	return partial_read_bytes;
+}
+
+/*
+ * This function iterates over complete ppb->iov entries and pass
+ * them to process_vm_readv syscall.
+ *
+ * Since process_vm_readv returns count of successfully read bytes.
+ * It does not point to iovec entry associated to last successful
+ * byte read. The correlation between bytes read and corresponding
+ * iovec is setup through analyze_iov function.
+ *
+ * If all iovecs are not processed in one go, it means there exists
+ * some faulty iov entry(memory mapping modified after it was grabbed)
+ * in iovec. process_vm_readv syscall stops at such faulty iov and
+ * skip processing further any entry in iovec. This is handled by
+ * handle_faulty_iov function.
+ */
+static long fill_userbuf(int pid, struct page_pipe_buf *ppb,
+				  struct iovec *bufvec,
+				  struct iovec* aux_iov,
+				  unsigned long *aux_len)
+{
+	struct iovec *riov = ppb->iov;
+	ssize_t bytes_read;
+	unsigned long total_read = 0;
+	unsigned long start = 0;
+	unsigned long partial_read_bytes = 0;
+
+	while (start < ppb->nr_segs) {
+
+		bytes_read = process_vm_readv(pid, bufvec, 1, &riov[start],
+						   ppb->nr_segs - start, 0);
+
+		if (bytes_read == -1) {
+			/* Handling Case 1*/
+			if (riov[start].iov_len == PAGE_SIZE) {
+				cnt_sub(CNT_PAGES_WRITTEN, 1);
+				start += 1;
+				continue;
+			} else if (errno == ESRCH) {
+				pr_debug("Target process PID:%d not found\n", pid);
+				return ESRCH;
+			}
+		}
+
+		partial_read_bytes = 0;
+
+		if (bytes_read > 0) {
+			partial_read_bytes = analyze_iov(bytes_read, riov,
+							 &start, aux_iov,
+							 aux_len);
+			bufvec->iov_base += bytes_read;
+			bufvec->iov_len -= bytes_read;
+			total_read += bytes_read;
+		}
+
+		/*
+		 * If all iovs not processed in one go,
+		 * it means some iov in between has failed.
+		 */
+		if (start < ppb->nr_segs)
+			total_read += handle_faulty_iov(pid, riov, start, bufvec,
+							aux_iov, aux_len,
+							partial_read_bytes);
+
+		start += 1;
+	}
+
+	return total_read;
+}
+
+/*
+ * This function is similar to page_xfer_dump_pages, instead it uses
+ * auxiliary_iov array for pagemap generation.
+ *
+ * The entries of ppb->iov may mismatch with actual process mappings
+ * present at time of pre-dump. Such entries need to be adjusted as per
+ * the pages read by process_vm_readv syscall. These adjusted entries
+ * along with unmodified entries are present in aux_iov array.
+ */
+
+int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
+				     struct page_pipe *pp)
+{
+	struct page_pipe_buf *ppb;
+	unsigned int cur_hole = 0, i;
+	unsigned long ret, bytes_read;
+	struct iovec bufvec;
+
+	struct iovec aux_iov[PIPE_MAX_SIZE];
+	unsigned long aux_len;
+
+	char *userbuf = mmap(NULL, BUFFER_SIZE, PROT_READ | PROT_WRITE,
+						MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+
+	if (userbuf == MAP_FAILED) {
+		pr_perror("Unable to mmap a buffer");
+		return -1;
+	}
+
+	list_for_each_entry(ppb, &pp->bufs, l) {
+
+		aux_len = 0;
+		bufvec.iov_len = BUFFER_SIZE;
+		bufvec.iov_base = userbuf;
+
+		bytes_read = fill_userbuf(pid, ppb, &bufvec, aux_iov, &aux_len);
+
+		if (bytes_read == ESRCH) {
+			munmap(userbuf, BUFFER_SIZE);
+			return -1;
+		}
+
+		bufvec.iov_base = userbuf;
+		bufvec.iov_len = bytes_read;
+		ret = vmsplice(ppb->p[1], &bufvec, 1, SPLICE_F_NONBLOCK);
+
+		if (ret == -1 || ret != bytes_read) {
+			pr_err("vmsplice: Failed to splice user buffer to pipe %ld\n", ret);
+			munmap(userbuf, BUFFER_SIZE);
+			return -1;
+		}
+
+		/* generating pagemap */
+		for (i = 0; i < aux_len; i++) {
+
+			struct iovec iov = aux_iov[i];
+			u32 flags;
+
+			ret = dump_holes(xfer, pp, &cur_hole, iov.iov_base);
+			if (ret) {
+				munmap(userbuf, BUFFER_SIZE);
+				return ret;
+			}
+
+			BUG_ON(iov.iov_base < (void *)xfer->offset);
+			iov.iov_base -= xfer->offset;
+			pr_debug("\t p %p [%u]\n", iov.iov_base,
+				(unsigned int)(iov.iov_len / PAGE_SIZE));
+
+			flags = ppb_xfer_flags(xfer, ppb);
+
+			if (xfer->write_pagemap(xfer, &iov, flags)) {
+				munmap(userbuf, BUFFER_SIZE);
+				return -1;
+			}
+
+			if (xfer->write_pages(xfer, ppb->p[0], iov.iov_len)) {
+				munmap(userbuf, BUFFER_SIZE);
+				return -1;
+			}
+		}
+
+	}
+
+	munmap(userbuf, BUFFER_SIZE);
+	return dump_holes(xfer, pp, &cur_hole, NULL);
+}
+
 int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp)
 {
 	struct page_pipe_buf *ppb;

From befbbd9bba013533a05547c9b3702a256904190c Mon Sep 17 00:00:00 2001
From: Abhishek Dubey <dubeyabhishek777@gmail.com>
Date: Thu, 3 Oct 2019 19:39:23 +0530
Subject: [PATCH 0025/1854] Refactor time accounting macros

refactoring time macros as per read mode
pre-dump design.

Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c   | 7 +++++--
 criu/page-xfer.c | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index ff05e38d7..f72373d22 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1514,11 +1514,14 @@ static int cr_pre_dump_finish(int status)
 
 		mem_pp = dmpi(item)->mem_pp;
 
-		if (opts.pre_dump_mode == PRE_DUMP_READ)
+		if (opts.pre_dump_mode == PRE_DUMP_READ) {
+			timing_stop(TIME_MEMWRITE);
 			ret = page_xfer_predump_pages(item->pid->real,
 							&xfer, mem_pp);
-		else
+		}
+		else {
 			ret = page_xfer_dump_pages(&xfer, mem_pp);
+		}
 
 		xfer.close(&xfer);
 
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 8709df745..4d2d046ef 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -812,6 +812,8 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 
 	list_for_each_entry(ppb, &pp->bufs, l) {
 
+		timing_start(TIME_MEMDUMP);
+
 		aux_len = 0;
 		bufvec.iov_len = BUFFER_SIZE;
 		bufvec.iov_base = userbuf;
@@ -833,6 +835,9 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 			return -1;
 		}
 
+		timing_stop(TIME_MEMDUMP);
+		timing_start(TIME_MEMWRITE);
+
 		/* generating pagemap */
 		for (i = 0; i < aux_len; i++) {
 
@@ -863,9 +868,12 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 			}
 		}
 
+		timing_stop(TIME_MEMWRITE);
 	}
 
 	munmap(userbuf, BUFFER_SIZE);
+	timing_start(TIME_MEMWRITE);
+
 	return dump_holes(xfer, pp, &cur_hole, NULL);
 }
 

From d30557699616d27bed6e2e1fd6bbdf45a8c99d7f Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 4 Oct 2019 19:36:37 +0300
Subject: [PATCH 0026/1854] zdtm: handle --pre-dump-mode in the rpc mode

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 3c0cee667..571962241 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -912,6 +912,13 @@ class criu_rpc:
             if arg == '--prev-images-dir':
                 criu.opts.parent_img = args.pop(0)
                 continue
+            if arg == '--pre-dump-mode':
+                key = args.pop(0)
+                mode = crpc.rpc.READ
+                if key == "splice":
+                    mode = crpc.rpc.SPLICE
+                criu.opts.pre_dump_mode = mode
+                continue
             if arg == '--track-mem':
                 criu.opts.track_mem = True
                 continue
@@ -929,7 +936,7 @@ class criu_rpc:
                 inhfd.key = key
                 continue
 
-            raise test_fail_exc('RPC for %s required' % arg)
+            raise test_fail_exc('RPC for %s(%s) required' % (arg, args.pop(0)))
 
     @staticmethod
     def run(action,

From 7c97cc7eb26c7232ca286e5ad4322c3be2bdcfca Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 4 Oct 2019 20:02:07 +0300
Subject: [PATCH 0027/1854] lib/c: fix a compile time error

lib/c/criu.c:343:30: error: implicit conversion from enumeration type
'enum criu_pre_dump_mode' to different enumeration type 'CriuPreDumpMode'
(aka 'enum _CriuPreDumpMode') [-Werror,-Wenum-conversion

                opts->rpc->pre_dump_mode = mode;
                                         ~ ^~~~

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 lib/c/criu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index fffb9fd9c..1d0a235f4 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -340,7 +340,7 @@ int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode)
 {
 	opts->rpc->has_pre_dump_mode = true;
 	if (mode == CRIU_PRE_DUMP_SPLICE || mode == CRIU_PRE_DUMP_READ) {
-		opts->rpc->pre_dump_mode = mode;
+		opts->rpc->pre_dump_mode = (CriuPreDumpMode)mode;
 		return 0;
 	}
 	return -1;

From 6b264f591f42e0ee3e1ceee103d5c557184829d5 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 5 Oct 2019 22:46:02 +0300
Subject: [PATCH 0028/1854] criu: use atomic_add instead of atomic_sub

atomic_sub isn't defined for all platforms.

Reported-by: Mr Jenkins
Cc: Abhishek Dubey <dubeyabhishek777@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/stats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/stats.c b/criu/stats.c
index cb528011a..891c37800 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -48,7 +48,7 @@ void cnt_sub(int c, unsigned long val)
 		dstats->counts[c] -= val;
 	} else if (rstats != NULL) {
 		BUG_ON(c >= RESTORE_CNT_NR_STATS);
-		atomic_sub(val, &rstats->counts[c]);
+		atomic_add(-val, &rstats->counts[c]);
 	} else
 		BUG();
 }

From 3efe44382fef816ea274ed1833adc1abfa4b4f06 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 6 Oct 2019 01:01:50 +0300
Subject: [PATCH 0029/1854] image: avoid name conflicts in image files

Conflict register for file "sk-opts.proto": READ is already defined in
file "rpc.proto". Please fix the conflict by adding package name on the
proto file, or use different name for the duplication.  Note: enum
values appear as siblings of the enum type instead of children of it.

https://github.com/checkpoint-restore/criu/issues/815
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-service.c | 2 +-
 images/rpc.proto  | 2 +-
 test/zdtm.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 392e9ac50..a70f99d71 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -478,7 +478,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 			case CRIU_PRE_DUMP_MODE__SPLICE:
 				opts.pre_dump_mode = PRE_DUMP_SPLICE;
 				break;
-			case CRIU_PRE_DUMP_MODE__READ:
+			case CRIU_PRE_DUMP_MODE__VM_READ:
 				opts.pre_dump_mode = PRE_DUMP_READ;
 				break;
 			default:
diff --git a/images/rpc.proto b/images/rpc.proto
index fc2f1bce2..df1b5aed2 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -49,7 +49,7 @@ enum criu_cg_mode {
 
 enum criu_pre_dump_mode {
 	SPLICE = 	1;
-	READ =		2;
+	VM_READ =	2;
 };
 
 message criu_opts {
diff --git a/test/zdtm.py b/test/zdtm.py
index 571962241..6d3fddfad 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -914,7 +914,7 @@ class criu_rpc:
                 continue
             if arg == '--pre-dump-mode':
                 key = args.pop(0)
-                mode = crpc.rpc.READ
+                mode = crpc.rpc.VM_READ
                 if key == "splice":
                     mode = crpc.rpc.SPLICE
                 criu.opts.pre_dump_mode = mode

From 71c2a9dc73f679df93f2c749fed39088616a7b16 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Tue, 1 Oct 2019 20:56:26 +0000
Subject: [PATCH 0030/1854] Guard against empty file lock status

The lock status string may be empty. This can happen when the owner of
the lock is invisible from our PID namespace. This unfortunate behavior
is fixed in kernels v4.19 and up (see commit 1cf8e5de40)

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/proc_parse.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 97f82ee01..d67392a12 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1669,17 +1669,27 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 		if (fdinfo_field(str, "lock")) {
 			struct file_lock *fl;
 			struct fdinfo_common *fdinfo = arg;
+			char *flock_status = str+sizeof("lock:\t")-1;
 
 			if (type != FD_TYPES__UND)
 				continue;
 
+			/*
+			 * The lock status can be empty when the owner of the
+			 * lock is invisible from our PID namespace.
+			 * This unfortunate behavior is fixed in kernels v4.19
+			 * and up (see commit 1cf8e5de40).
+			 */
+			if (flock_status[0] == '\0')
+				continue;
+
 			fl = alloc_file_lock();
 			if (!fl) {
 				pr_perror("Alloc file lock failed!");
 				goto out;
 			}
 
-			if (parse_file_lock_buf(str + 6, fl, 0)) {
+			if (parse_file_lock_buf(flock_status, fl, 0)) {
 				xfree(fl);
 				goto parse_err;
 			}

From 5a92f100b88e25981d7d51b3f4db374297fcff3c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 28 Sep 2019 06:59:45 +0100
Subject: [PATCH 0031/1854] page-pipe: Resize up to PIPE_MAX_SIZE

When performing pre-dump we continuously increase the page-pipe size to
fit the max amount memory pages in the pipe's buffer. However, we never
actually set the pipe's buffer size to max. By doing so, we can reduce
the number of pipe-s necessary for pre-dump and improve the performance
as shown in the example below.

For example, let's consider the following process:

	#include <stdio.h>
	#include <stdlib.h>
	#include <unistd.h>

	void main(void)
	{
		int i = 0;
		void *cache = calloc(1, 1024 * 1024 * 1024);
		while(1) {
			printf("%d\n", i++);
			sleep(1);
		}
	}

stats-dump before this change:

	frozen_time: 123538
	memdump_time: 95344
	memwrite_time: 11980078
	pages_scanned: 262721
	pages_written: 262169
	page_pipes: 513
	page_pipe_bufs: 519

stats-dump after this change:

	frozen_time: 83287
	memdump_time: 54587
	memwrite_time: 12547466
	pages_scanned: 262721
	pages_written: 262169
	page_pipes: 257
	page_pipe_bufs: 263

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/page-pipe.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index a8216962d..439c180e4 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -54,8 +54,12 @@ static inline int ppb_resize_pipe(struct page_pipe_buf *ppb)
 	if (ppb->pages_in + ppb->pipe_off < ppb->pipe_size)
 		return 0;
 
-	if (new_size > PIPE_MAX_SIZE)
-		return 1;
+	if (new_size > PIPE_MAX_SIZE) {
+		if (ppb->pipe_size < PIPE_MAX_SIZE)
+			ppb->pipe_size = PIPE_MAX_SIZE;
+		else
+			return 1;
+	}
 
 	ret = __ppb_resize_pipe(ppb, new_size);
 	if (ret < 0)

From f65b17e976633ad4d4a10dae96e3279157d8e77f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 30 Apr 2019 11:35:26 +0300
Subject: [PATCH 0032/1854] cgroup: fix cg_yard leak on error path in
 prepare_cgroup_sfd

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cgroup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 1be8be234..a66fc960e 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1730,11 +1730,11 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 			pr_debug("\tMaking controller dir %s (%s)\n", paux, opt);
 			if (mkdir(paux, 0700)) {
 				pr_perror("\tCan't make controller dir %s", paux);
-				return -1;
+				goto err;
 			}
 			if (mount("none", paux, "cgroup", 0, opt) < 0) {
 				pr_perror("\tCan't mount controller dir %s", paux);
-				return -1;
+				goto err;
 			}
 		}
 

From e56401ed3c187150c8b95cb5fd69e0d637c5515c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 14 Sep 2019 12:47:14 +0100
Subject: [PATCH 0033/1854] image-desc: Remove CR_FD_FILE_LOCKS_PID

The support for per-pid images with locks has been dropped with
commit d040219 ("locks: Drop support for per-pid images with locks")
and CR_FD_FILE_LOCKS_PID is not used.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/image-desc.c         | 5 -----
 criu/include/image-desc.h | 1 -
 2 files changed, 6 deletions(-)

diff --git a/criu/image-desc.c b/criu/image-desc.c
index 053e7af21..81cd07484 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -112,9 +112,4 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 		.magic	= IRMAP_CACHE_MAGIC,
 		.oflags = O_SERVICE | O_FORCE_LOCAL,
 	},
-
-	[CR_FD_FILE_LOCKS_PID] = {
-		.fmt	= "filelocks-%u.img",
-		.magic	= FILE_LOCKS_MAGIC,
-	},
 };
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 3135f56b4..fea80a719 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -79,7 +79,6 @@ enum {
 	CR_FD_RLIMIT,
 	CR_FD_ITIMERS,
 	CR_FD_POSIX_TIMERS,
-	CR_FD_FILE_LOCKS_PID,
 
 	CR_FD_IRMAP_CACHE,
 	CR_FD_CPUINFO,

From 477c3a4b0b7a246808afb2f12d0553db14dd74a6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Tue, 8 Oct 2019 21:37:22 +0100
Subject: [PATCH 0034/1854] service: Use space on stack for msg buffer

RPC messages are have fairly small size and using space on the stack
might be a better option. This change follows the pattern used with
do_pb_read_one() and pb_write_one().

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/cr-service.c       | 56 +++++++++++++++++++++++------------------
 criu/include/protobuf.h |  7 ++++++
 criu/protobuf.c         |  7 ------
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index a70f99d71..549b3368b 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -27,6 +27,7 @@
 #include "cr-service.h"
 #include "cr-service-const.h"
 #include "page-xfer.h"
+#include "protobuf.h"
 #include "net.h"
 #include "mount.h"
 #include "filesystems.h"
@@ -49,18 +50,21 @@ unsigned int service_sk_ino = -1;
 
 static int recv_criu_msg(int socket_fd, CriuReq **req)
 {
-	unsigned char *buf;
-	int len;
+	u8 local[PB_PKOBJ_LOCAL_SIZE];
+	void *buf = (void *)&local;
+	int len, exit_code = -1;
 
 	len = recv(socket_fd, NULL, 0, MSG_TRUNC | MSG_PEEK);
 	if (len == -1) {
 		pr_perror("Can't read request");
-		return -1;
+		goto err;
 	}
 
-	buf = xmalloc(len);
-	if (!buf)
-		return -ENOMEM;
+	if (len > sizeof(local)) {
+		buf = xmalloc(len);
+		if (!buf)
+			return -ENOMEM;
+	}
 
 	len = recv(socket_fd, buf, len, MSG_TRUNC);
 	if (len == -1) {
@@ -80,43 +84,47 @@ static int recv_criu_msg(int socket_fd, CriuReq **req)
 		goto err;
 	}
 
-	xfree(buf);
-	return 0;
+	exit_code = 0;
 err:
-	xfree(buf);
-	return -1;
+	if (buf != (void *)&local)
+		xfree(buf);
+	return exit_code;
 }
 
 static int send_criu_msg_with_fd(int socket_fd, CriuResp *msg, int fd)
 {
-	unsigned char *buf;
-	int len, ret;
+	u8 local[PB_PKOBJ_LOCAL_SIZE];
+	void *buf = (void *)&local;
+	int len, exit_code = -1;
 
 	len = criu_resp__get_packed_size(msg);
 
-	buf = xmalloc(len);
-	if (!buf)
-		return -ENOMEM;
+	if (len > sizeof(local)) {
+		buf = xmalloc(len);
+		if (!buf)
+			return -ENOMEM;
+	}
 
 	if (criu_resp__pack(msg, buf) != len) {
 		pr_perror("Failed packing response");
 		goto err;
 	}
 
-	if (fd >= 0) {
-		ret = send_fds(socket_fd, NULL, 0, &fd, 1, buf, len);
-	} else
-		ret = write(socket_fd, buf, len);
-	if (ret < 0) {
+	if (fd >= 0)
+		exit_code = send_fds(socket_fd, NULL, 0, &fd, 1, buf, len);
+	else
+		exit_code = write(socket_fd, buf, len);
+
+	if (exit_code < 0) {
 		pr_perror("Can't send response");
 		goto err;
 	}
 
-	xfree(buf);
-	return 0;
+	exit_code = 0;
 err:
-	xfree(buf);
-	return -1;
+	if (buf != (void *)&local)
+		xfree(buf);
+	return exit_code;
 }
 
 static int send_criu_msg(int socket_fd, CriuResp *msg)
diff --git a/criu/include/protobuf.h b/criu/include/protobuf.h
index fb7489e9d..0b6d8c150 100644
--- a/criu/include/protobuf.h
+++ b/criu/include/protobuf.h
@@ -52,4 +52,11 @@ static inline int collect_images(struct collect_image_info **array, unsigned siz
 	return 0;
 }
 
+/*
+ * To speed up reading of packed objects
+ * by providing space on stack, this should
+ * be more than enough for most objects.
+ */
+#define PB_PKOBJ_LOCAL_SIZE	1024
+
 #endif /* __CR_PROTOBUF_H__ */
diff --git a/criu/protobuf.c b/criu/protobuf.c
index 8eb73e019..e68d42b5c 100644
--- a/criu/protobuf.c
+++ b/criu/protobuf.c
@@ -20,13 +20,6 @@
 #include "protobuf.h"
 #include "util.h"
 
-/*
- * To speed up reading of packed objects
- * by providing space on stack, this should
- * be more than enough for most objects.
- */
-#define PB_PKOBJ_LOCAL_SIZE	1024
-
 static char *image_name(struct cr_img *img)
 {
 	int fd = img->_x.fd;

From f8125b8bef7bf5a7bbaea5e6e1d29578c45bf53d Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra1@in.ibm.com>
Date: Fri, 13 Sep 2019 18:47:33 +0000
Subject: [PATCH 0035/1854] Couple of fixes to build and run libcriu tests

libcriu tests are currently broken. This patch fixes couple of
issues to allow the building and running libcriu tests.

1. lib/c/criu.h got updated to include version.h which is present
at "criu/include", but the command to compile libcriu tests is not
specifying "criu/include" in the path to be searched for header
files. This resulted in compilation error.
This can be fixed by adding "-I ../../../../../criu/criu/include"
however it causes more problems as "criu/include/fcntl.h" would now
hide system defined fcntl.h
Solution is to use "-iquote ../../../../../criu/criu/include"
which applies only to the quote form of include directive.

2. Secondly, libcriu.so major version got updated to 2 but
libcriu/run.sh still assumes verion 1. Instead of just updating the
version in libcriu/run.sh to 2, this patch updates the libcriu/Makefile
to use "CRIU_SO_VERSION_MAJOR" so that future changes to major version
of libcriu won't cause same problem again.

Signed-off-by: Ashutosh Mehra <asmehra1@in.ibm.com>
---
 test/others/libcriu/Makefile | 14 ++++++++++++--
 test/others/libcriu/run.sh   |  5 ++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/others/libcriu/Makefile b/test/others/libcriu/Makefile
index 5289ed15a..226396e6a 100644
--- a/test/others/libcriu/Makefile
+++ b/test/others/libcriu/Makefile
@@ -1,3 +1,5 @@
+include ../../../../criu/Makefile.versions
+
 TESTS += test_sub 
 TESTS += test_self
 TESTS += test_notify
@@ -19,8 +21,16 @@ endef
 $(foreach t, $(TESTS), $(eval $(call genb, $(t))))
 
 %.o: %.c
-	gcc -c $^ -I../../../../criu/lib/c/ -I../../../../criu/images/ -o $@ -Werror
+	gcc -c $^ -iquote ../../../../criu/criu/include -I../../../../criu/lib/c/ -I../../../../criu/images/ -o $@ -Werror
 
-clean:
+clean: libcriu_clean
 	rm -rf $(TESTS) $(TESTS:%=%.o) lib.o
 .PHONY: clean
+
+libcriu_clean:
+	rm -f libcriu.so.${CRIU_SO_VERSION_MAJOR}
+.PHONY: libcriu_clean
+
+libcriu:
+	ln -s ../../../../criu/lib/c/libcriu.so libcriu.so.${CRIU_SO_VERSION_MAJOR}
+.PHONY: libcriu
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index a99b91e52..5f692db31 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -5,14 +5,13 @@ source ../env.sh || exit 1
 
 echo "== Clean"
 make clean
+make libcriu
 rm -rf wdir
-rm -f ./libcriu.so.1
 
 echo "== Prepare"
 mkdir -p wdir/i/
 
 echo "== Run tests"
-ln -s ../../../../criu/lib/c/libcriu.so libcriu.so.1
 export LD_LIBRARY_PATH=.
 export PATH="`dirname ${BASH_SOURCE[0]}`/../../:$PATH"
 
@@ -40,6 +39,6 @@ run_test test_iters
 run_test test_errno
 
 echo "== Tests done"
-unlink libcriu.so.1
+make libcriu_clean
 [ $RESULT -eq 0 ] && echo "Success" || echo "FAIL"
 exit $RESULT

From 321f82662129f516573cedba10b4fbbfc12f9f5a Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra1@in.ibm.com>
Date: Mon, 16 Sep 2019 06:49:07 +0000
Subject: [PATCH 0036/1854] Enable libcriu testing in travis jobs

Updated scripts/travis/travis-tests to run libcriu test.

Signed-off-by: Ashutosh Mehra <asmehra1@in.ibm.com>
---
 scripts/travis/travis-tests | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 980d74734..b2ebe969b 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -161,6 +161,9 @@ ip net add test
 ./test/zdtm.py run -t zdtm/static/env00 -k always
 ./test/crit-recode.py
 
+# libcriu testing
+make -C test/others/libcriu run
+
 make -C test/others/shell-job
 
 if ! [ -x "$(command -v flake8)" ]; then

From 00ce121fd55e5947d477be4601169e8676a2bbbf Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra1@in.ibm.com>
Date: Mon, 23 Sep 2019 08:36:12 +0000
Subject: [PATCH 0037/1854] Add `criu` to PATH env variable in libcriu tests

PATH is pointing to incorrect location for `criu` executable
causing libcriu tests to fail when running in travis.
Also added statements to display log file contents on failure
to help in debugging.

Signed-off-by: Ashutosh Mehra <asmehra1@in.ibm.com>
---
 test/others/libcriu/run.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 5f692db31..bd92f8544 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -13,7 +13,7 @@ mkdir -p wdir/i/
 
 echo "== Run tests"
 export LD_LIBRARY_PATH=.
-export PATH="`dirname ${BASH_SOURCE[0]}`/../../:$PATH"
+export PATH="`dirname ${BASH_SOURCE[0]}`/../../../criu:$PATH"
 
 RESULT=0
 
@@ -21,6 +21,19 @@ function run_test {
 	echo "== Build $1"
 	if ! make $1; then
 		echo "FAIL build $1"
+		echo "** Output of $1/test.log"
+		cat wdir/i/$1/test.log
+		echo "---------------"
+		if [ -f wdir/i/$1/dump.log ]; then
+			echo "** Contents of dump.log"
+			cat wdir/i/$1/dump.log
+			echo "---------------"
+		fi
+		if [ -f wdir/i/$1/restore.log ]; then
+			echo "** Contents of restore.log"
+			cat wdir/i/$1/restore.log
+			echo "---------------"
+		fi
 		RESULT=1;
 	else
 		echo "== Test $1"

From 19a24df53c2dba3b2e2457c99965edf43819818d Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Tue, 1 Oct 2019 00:29:14 +0100
Subject: [PATCH 0038/1854] early-log: Print warnings only if the buffer is
 full

I don't see many issues with early-log, so we probably don't
need the warning when it was used. Note that after
commit 74731d9 ("zdtm: make grep_errors also grep warnings")
also warnings are grepped by zdtm.py (and I believe that was
an improvement) which prints some bothering lines:

> =[log]=> dump/zdtm/static/inotify00/38/1/dump.log
> ------------------------ grep Error ------------------------
> (00.000000) Will allow link remaps on FS
> (00.000034) Warn  (criu/log.c:203): The early log isn't empty
> ------------------------ ERROR OVER ------------------------

Instead of decreasing loglevel of the message, improve it by
reporting a real issue.

Cc: Adrian Reber <adrian@lisas.de>
Cc: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Cc: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/log.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/log.c b/criu/log.c
index 8bdf83534..0ee113b91 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -199,8 +199,8 @@ void flush_early_log_buffer(int fd)
 		}
 		pos += hdr->len;
 	}
-	if (early_log_buf_off)
-		pr_warn("The early log isn't empty\n");
+	if (early_log_buf_off == EARLY_LOG_BUF_LEN)
+		pr_warn("The early log buffer is full, some messages may have been lost\n");
 	early_log_buf_off = 0;
 }
 

From 1a28dee52b63eca5adc48c1d6f1dda8d532a0e8e Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 24 Oct 2019 19:39:39 +0000
Subject: [PATCH 0039/1854] Action scripts should be invoked with normal signal
 behavior

Signal masks propagate through execve, so we need to clear them before
invoking the action scripts as it may want to handle SIGCHLD, or SIGSEGV.

Signed-off-by: Nicolas Viennot <nicolas.viennot@twosigma.com>
---
 criu/util.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/criu/util.c b/criu/util.c
index 028f604bb..e47e109ae 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -536,7 +536,7 @@ int cr_system_userns(int in, int out, int err, char *cmd,
 	sigemptyset(&blockmask);
 	sigaddset(&blockmask, SIGCHLD);
 	if (sigprocmask(SIG_BLOCK, &blockmask, &oldmask) == -1) {
-		pr_perror("Can not set mask of blocked signals");
+		pr_perror("Cannot set mask of blocked signals");
 		return -1;
 	}
 
@@ -545,6 +545,12 @@ int cr_system_userns(int in, int out, int err, char *cmd,
 		pr_perror("fork() failed");
 		goto out;
 	} else if (pid == 0) {
+		sigemptyset(&blockmask);
+		if (sigprocmask(SIG_SETMASK, &blockmask, NULL) == -1) {
+			pr_perror("Cannot clear blocked signals");
+			goto out_chld;
+		}
+
 		if (userns_pid > 0) {
 			if (switch_ns(userns_pid, &user_ns_desc, NULL))
 				goto out_chld;

From 3861b334b252ff65acf2c827b5d85cab21de086a Mon Sep 17 00:00:00 2001
From: Sergey Bronnikov <estetus@gmail.com>
Date: Sun, 3 Nov 2019 13:08:09 +0300
Subject: [PATCH 0040/1854] Fix broken web-links

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 16e8452b5..558e87160 100644
--- a/README.md
+++ b/README.md
@@ -63,8 +63,8 @@ Linux kernel supporting checkpoint and restore for all the features it provides.
 looking for contributors of all kinds -- feedback, bug reports, testing, coding, writing, etc.
 Here are some useful hints to get involved.
 
-* We have both -- [very simple](https://checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) and [more sophisticated](https://checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+feature%22) coding tasks;
-* CRIU does need [extensive testing](https://checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
+* We have both -- [very simple](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) and [more sophisticated](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+feature%22) coding tasks;
+* CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
 * Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
 * Feedback is expected on the github issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
 * For historical reasons we do not accept PRs, instead [patches are welcome](http://criu.org/How_to_submit_patches);

From a7c625938eb1d472341770699469ca6ddb4d91b1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Oct 2019 15:17:40 +0100
Subject: [PATCH 0041/1854] travis: start to use aarch64 hardware

With the newly introduced aarch64 at Travis it is possible for the CRIU
test-cases to switch to aarch64.

Travis uses unprivileged LXD containers on aarch64 which blocks many of
the kernel interfaces CRIU needs. So for now this only tests building
CRIU natively on aarch64 instead of using the Docker+QEMU combination.

All tests based on Docker are not working on aarch64 is there currently
seems to be a problem with Docker on aarch64. Maybe because of the
nesting of Docker in LXD.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                     | 11 ++++--
 scripts/build/Dockerfile.alpine |  2 +-
 scripts/build/Dockerfile.centos |  1 +
 scripts/build/Makefile          |  4 +--
 scripts/travis/travis-tests     | 63 +++++++++++++++++++++------------
 5 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 82ba9fbc8..4cde9c4fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,9 @@ env:
   - TR_ARCH=x86_64
   - TR_ARCH=x86_64      CLANG=1
   - TR_ARCH=armv7hf
-  - TR_ARCH=aarch64
   - TR_ARCH=ppc64le
   - TR_ARCH=s390x
   - TR_ARCH=armv7hf     CLANG=1
-  - TR_ARCH=aarch64     CLANG=1
   - TR_ARCH=ppc64le     CLANG=1
   - TR_ARCH=alpine      CLANG=1
   - TR_ARCH=docker-test
@@ -27,6 +25,15 @@ env:
   - TR_ARCH=centos
   - TR_ARCH=podman-test
 matrix:
+  include:
+    - os: linux
+      arch: arm64
+      env: TR_ARCH=local
+      dist: bionic
+    - os: linux
+      arch: arm64
+      env: TR_ARCH=local CLANG=1
+      dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=fedora-rawhide
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index c71a3901f..70fdf480a 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -42,5 +42,5 @@ RUN apk add \
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
 
-RUN pip install protobuf ipaddress junit_xml
+RUN pip install protobuf ipaddress junit_xml flake8
 RUN make -C test/zdtm
diff --git a/scripts/build/Dockerfile.centos b/scripts/build/Dockerfile.centos
index 2ce40b179..213be694f 100644
--- a/scripts/build/Dockerfile.centos
+++ b/scripts/build/Dockerfile.centos
@@ -23,6 +23,7 @@ RUN yum install -y \
 	protobuf-devel \
 	protobuf-python \
 	python \
+	python-flake8 \
 	python-ipaddress \
 	python2-future \
 	python2-junit_xml \
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index bb2e9ca9d..3d4d91cd5 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,5 +1,5 @@
-QEMU_ARCHES := armv7hf aarch64 ppc64le s390x fedora-rawhide-aarch64 # require qemu
-ARCHES := $(QEMU_ARCHES) x86_64 fedora-asan fedora-rawhide centos
+QEMU_ARCHES := armv7hf ppc64le s390x fedora-rawhide-aarch64 # require qemu
+ARCHES := $(QEMU_ARCHES) aarch64 x86_64 fedora-asan fedora-rawhide centos
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index b2ebe969b..1f6b19130 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -1,17 +1,31 @@
 #!/bin/sh
 set -x -e
 
-TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev
+TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev python-future
 		libgnutls28-dev libgnutls30 libprotobuf-dev protobuf-compiler
-		libcap-dev libnl-3-dev gcc-multilib gdb bash python-protobuf
-		libnet-dev util-linux asciidoctor libnl-route-3-dev"
+		libcap-dev libnl-3-dev gdb bash python-protobuf python-yaml
+		libnet-dev util-linux asciidoctor libnl-route-3-dev
+		python-junit.xml python-ipaddress time ccache flake8
+		libbsd-dev"
+
+X86_64_PKGS="gcc-multilib"
+
+UNAME_M=`uname -m`
+
+if [ "$UNAME_M" != "x86_64" ]; then
+	# For Travis only x86_64 seems to be baremetal. Other
+	# architectures are running in unprivileged LXD containers.
+	# That seems to block most of CRIU's interfaces.
+	SKIP_TRAVIS_TEST=1
+fi
 
 travis_prep () {
 	[ -n "$SKIP_TRAVIS_PREP" ] && return
 
 	cd ../../
 
-	service apport stop
+	# This can fail on aarch64 travis
+	service apport stop || :
 
 	CC=gcc
 	# clang support
@@ -43,24 +57,41 @@ travis_prep () {
 		sed -i '/security/ d' /etc/apt/sources.list
 	fi
 
+
+	# Do not install x86_64 specific packages on other architectures
+	if [ "$UNAME_M" = "x86_64" ]; then
+		TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS"
+	fi
+
 	apt-get update -qq
 	apt-get install -qq --no-install-recommends $TRAVIS_PKGS
-	# travis is based on 14.04 and that does not have python
-	# packages for future and ipaddress (16.04 has those packages)
-	pip install junit-xml future ipaddress
 	chmod a+x $HOME
 }
 
 travis_prep
 
-ulimit -c unlimited
-echo "|`pwd`/test/abrt.sh %P %p %s %e" > /proc/sys/kernel/core_pattern
-
 export GCOV
+$CC --version
 time make CC="$CC" -j4
 
+./criu/criu -v4 cpuinfo dump || :
+./criu/criu -v4 cpuinfo check || :
+
+make lint
+
+# Check that help output fits into 80 columns
+WIDTH=$(./criu/criu --help | wc --max-line-length)
+if [ "$WIDTH" -gt 80 ]; then
+	echo "criu --help output does not obey 80 characters line width!"
+	exit 1
+fi
+
 [ -n "$SKIP_TRAVIS_TEST" ] && return
 
+ulimit -c unlimited
+
+echo "|`pwd`/test/abrt.sh %P %p %s %e" > /proc/sys/kernel/core_pattern
+
 if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	# Dirty hack to keep both ia32 & x86_64 shared libs on a machine:
 	# headers are probably not compatible, so apt-get doesn't allow
@@ -165,15 +196,3 @@ ip net add test
 make -C test/others/libcriu run
 
 make -C test/others/shell-job
-
-if ! [ -x "$(command -v flake8)" ]; then
-	pip install flake8
-fi
-make lint
-
-# Check that help output fits into 80 columns
-WIDTH=$(./criu/criu --help | wc --max-line-length)
-if [ "$WIDTH" -gt 80 ]; then
-	echo "criu --help output does not obey 80 characters line width!"
-	exit 1
-fi

From c4006c0034ef2162693d9dd619d025c240affc78 Mon Sep 17 00:00:00 2001
From: Vitaly Ostrosablin <vostrosablin@virtuozzo.com>
Date: Fri, 1 Nov 2019 09:00:23 +0000
Subject: [PATCH 0042/1854] test/static:conntracks: Support nftables

Update test to support both iptables and nft to create conntrack rules.

Signed-off-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/conntracks | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/conntracks b/test/zdtm/static/conntracks
index a30e0e268..26220f97c 100755
--- a/test/zdtm/static/conntracks
+++ b/test/zdtm/static/conntracks
@@ -23,7 +23,7 @@ do_or_fail()
 		fail "$failmsg: $output"
 }
 
-do_start()
+do_start_ipt()
 {
 	[ -f "$statefile" ] && die "state file $statefile aleady exists"
 
@@ -35,7 +35,7 @@ do_start()
 		iptables -L \> "$statefile"
 }
 
-do_stop()
+do_stop_ipt()
 {
 	do_or_fail "can't compare the iptables" \
 		iptables -L \| diff -u "$statefile" -
@@ -45,6 +45,38 @@ do_stop()
 	echo "PASS" > $outfile
 }
 
+do_start_nft()
+{
+	[ -f "$statefile" ] && die "state file $statefile aleady exists"
+
+	do_or_fail "can't install a state match" \
+		nft add rule filter INPUT \
+		ct state related,established accept
+
+	do_or_fail "can't list the loaded nftables" \
+		nft list ruleset \> "$statefile"
+}
+
+do_stop_nft()
+{
+	do_or_fail "can't compare the nftables" \
+		nft list ruleset \| diff -u "$statefile" -
+
+	rm -f "$statefile"
+
+	echo "PASS" > $outfile
+}
+
+do_start()
+{
+	[ -x "$(command -v nft)" ] && do_start_nft || do_start_ipt
+}
+
+do_stop()
+{
+	[ -x "$(command -v nft)" ] && do_stop_nft || do_stop_ipt
+}
+
 tmpargs="$(../lib/parseargs.sh --name=$0 \
 		--flags-req=statefile,outfile \
 		--flags-opt="start,stop" -- "$@")" ||

From 389bcfef3e8f4be35464da9f94681e6573d6d1d9 Mon Sep 17 00:00:00 2001
From: Nidhi Gupta <itsnidhi16@gmail.com>
Date: Fri, 18 Oct 2019 20:09:15 +0530
Subject: [PATCH 0043/1854] test/java: Add FileRead Tests

Signed-off-by: Nidhi Gupta <itsnidhi16@gmail.com>
---
 test/javaTests/README.md                      |  33 ++
 test/javaTests/pom.xml                        |  47 ++
 .../criu/java/tests/CheckpointRestore.java    | 450 ++++++++++++++++++
 .../src/org/criu/java/tests/FileRead.java     | 175 +++++++
 .../src/org/criu/java/tests/Helper.java       |  99 ++++
 .../src/org/criu/java/tests/ImgFilter.java    |  11 +
 test/javaTests/test.xml                       |  13 +
 7 files changed, 828 insertions(+)
 create mode 100644 test/javaTests/README.md
 create mode 100644 test/javaTests/pom.xml
 create mode 100644 test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/FileRead.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/Helper.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/ImgFilter.java
 create mode 100644 test/javaTests/test.xml

diff --git a/test/javaTests/README.md b/test/javaTests/README.md
new file mode 100644
index 000000000..cb779285e
--- /dev/null
+++ b/test/javaTests/README.md
@@ -0,0 +1,33 @@
+# JavaTests
+
+Java Functional tests checks the Java File based APIs and Memory mapping APIs by placing the process in various states before checkpointing and validates if these resources are still accessible after restore. It also validates if the file contents are in expected states.
+
+Tests are to be run by a user having following capabilities:  
+CAP_DAC_OVERRIDE  
+CAP_CHOWN  
+CAP_SETPCAP  
+CAP_SETGID  
+CAP_AUDIT_CONTROL  
+CAP_DAC_READ_SEARCH  
+CAP_NET_ADMIN  
+CAP_SYS_ADMIN  
+CAP_SYS_CHROOT  
+CAP_SYS_PTRACE  
+CAP_FOWNER  
+CAP_KILL  
+CAP_FSETID  
+CAP_SYS_RESOURCE  
+CAP_SETUID
+
+## File-based Java APIs
+
+Here we test the File-Based Java APIs by checkpointing the application in the following scenarios and verifying the contents of the file after restore:
+- Reading and writing in the same file. (FileRead.java)
+
+### Prerequisites for running the tests:
+- Maven
+
+### To run the tests:
+- In the javaTests folder run the command ```sudo mvn test```
+- To keep the img files and logs from previous failures, between different runs of the test, use the ```-DneverCleanFailures=true ``` option in the maven command
+as ```sudo mvn -DneverCleanFailures=true test```
diff --git a/test/javaTests/pom.xml b/test/javaTests/pom.xml
new file mode 100644
index 000000000..faae44d1b
--- /dev/null
+++ b/test/javaTests/pom.xml
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>criu</groupId>
+	<artifactId>criu-javaTests</artifactId>
+	<version>1</version>
+	<name>criu-javaTests</name>
+	<build>
+		<!-- Source directory configuration -->
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<!-- Following plugin executes the testng tests -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.14.1</version>
+				<configuration>
+					<!-- Suite testng xml file to consider for test execution -->
+					<suiteXmlFiles>
+						<suiteXmlFile>test.xml</suiteXmlFile>
+					</suiteXmlFiles>
+				</configuration>
+			</plugin>
+			<!-- Compiler plugin configures the java version to be used for compiling
+				the code -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- Dependency libraries to include for compilation -->
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>6.3.1</version>
+		</dependency>
+	</dependencies>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+</project>
diff --git a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
new file mode 100644
index 000000000..968488191
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
@@ -0,0 +1,450 @@
+package org.criu.java.tests;
+
+import org.testng.Assert;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import java.io.*;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CheckpointRestore {
+	private MappedByteBuffer mappedByteBuffer = null;
+	private String testName = "";
+	private String logFolder = Helper.LOG_FOLDER + "/";
+	private String outputFolder = Helper.OUTPUT_FOLDER_NAME + "/";
+
+	/**
+	 * Create CRlog and output directory if they don't exist.
+	 * Delete directories containing .img files from failed Checkpoint-Restore if 'neverCleanFailures' property is not set to true.
+	 *
+	 * @throws IOException
+	 */
+	@BeforeSuite
+	void suiteSetup() throws IOException {
+		System.out.println("Tests are to be run as a privileged user having capabilities mentioned in ReadMe");
+		boolean neverCleanFailures = Boolean.getBoolean("neverCleanFailures");
+		Path logDir = Paths.get(logFolder);
+		Path outputDir = Paths.get(outputFolder);
+		if (!Files.exists(logDir)) {
+			System.out.println("Logs directory does not exist, creating it");
+			Files.createDirectory(logDir);
+		}
+		if (!Files.exists(outputDir)) {
+			System.out.println("Output directory does not exist, creating it");
+			Files.createDirectory(outputDir);
+		}
+		/*
+		 * Delete the directories containing the img files from failed Checkpoint-Restore.
+		 */
+		if (!neverCleanFailures) {
+			File output = new File(outputFolder);
+			String[] name = output.list();
+			for (int i = 0; null != name && i < name.length; i++) {
+				File testFolder = new File(outputFolder + name[i]);
+				if (testFolder.isDirectory()) {
+					String[] list = testFolder.list();
+					File file;
+					if (null != list) {
+						for (int j = 0; j < list.length; j++) {
+							file = new File(outputFolder + name[i] + "/" + list[j]);
+							if (!file.isDirectory()) {
+								Files.delete(file.toPath());
+							}
+						}
+					}
+				}
+				Files.delete(testFolder.toPath());
+			}
+		}
+	}
+
+	/**
+	 * Create the output folder for the test in case it does not exist
+	 *
+	 * @param testName Name of the java test
+	 * @throws IOException
+	 */
+	private void testSetup(String testName) throws IOException {
+		Path testFolderPath = Paths.get(outputFolder + testName + "/");
+		if (!Files.exists(testFolderPath)) {
+			System.out.println("Test Folder does not exist creating it");
+			Files.createDirectory(testFolderPath);
+		}
+	}
+
+	/**
+	 * Read the pid of process from the pid file of test
+	 *
+	 * @param name Name of the java test
+	 * @return pid Process id of the java test process
+	 * @throws IOException
+	 */
+	private String getPid(String name) throws IOException {
+		name = outputFolder + testName + "/" + name + Helper.PID_APPEND;
+		File pidfile = new File(name);
+		BufferedReader pidReader = new BufferedReader(new FileReader(pidfile));
+		String pid = pidReader.readLine();
+		pidReader.close();
+		return pid;
+	}
+
+	/**
+	 * @param testName      Name of the java test
+	 * @param checkpointOpt Additional options for checkpoint
+	 * @param restoreOpt    Additional options for restore
+	 * @throws Exception
+	 */
+	@Test
+	@Parameters({"testname", "checkpointOpt", "restoreOpt"})
+	public void runtest(String testName, String checkpointOpt, String restoreOpt) throws Exception {
+		this.testName = testName;
+		String name = Helper.PACKAGE_NAME + "." + testName;
+		String pid;
+		int exitCode;
+
+		System.out.println("======= Testing " + testName + " ========");
+
+		testSetup(testName);
+
+		File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+		if (f.exists()) {
+			f.delete();
+		}
+
+		/*
+		 * Create a new file that will be mapped to memory and used to communicate between
+		 * this process and the java test process.
+		 */
+		boolean newFile = f.createNewFile();
+		Assert.assertTrue(newFile, "Unable to create a new file to be mapped");
+
+		/*
+		 * MappedByteBuffer communicates between this process and java process called.
+		 */
+		FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+		mappedByteBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+		mappedByteBuffer.clear();
+		channel.close();
+
+		/*
+		 * Put MappedByteBuffer in Init state
+		 */
+		mappedByteBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_INIT);
+
+		/*
+		 * Run the test as a separate process
+		 */
+		System.out.println("Starting the java Test");
+		ProcessBuilder builder = new ProcessBuilder("java", "-cp", "target/classes", name);
+		Process process = builder.start();
+
+		char currentState = mappedByteBuffer.getChar(Helper.MAPPED_INDEX);
+		/*
+		 * Loop until the test process changes the state of MappedByteBuffer from init state
+		 */
+		while (Helper.STATE_INIT == currentState) {
+			currentState = mappedByteBuffer.getChar(Helper.MAPPED_INDEX);
+		}
+
+		/*
+		 * If Mapped Buffer is in Helper.STATE_FAIL state before checkpointing then an exception must
+		 * have occurred in the test.
+		 */
+		while (Helper.STATE_FAIL == currentState) {
+			try {
+				/*
+				 * We exit the test process with exit code 5 in case of an exception
+				 */
+				exitCode = process.exitValue();
+				/*
+				 * Reaching here implies that .exitValue() has not thrown an exception, so the process has
+				 * exited, We now check the exitCode.
+				 */
+				if (5 == exitCode) {
+					Assert.fail(testName + ": Exception occurred while running the test: check the log file for details.");
+				} else {
+					Assert.fail(testName + ": ERROR: Unexpected value of exit code: " + exitCode + ", expected: 5");
+				}
+			} catch (IllegalThreadStateException e) {
+				/*
+				 * Do nothing, as an Exception is expected if the process has not exited
+				 * and we try to get its exitValue.
+				 */
+			}
+
+			currentState = mappedByteBuffer.getChar(Helper.MAPPED_INDEX);
+		}
+
+		/*
+		 * Mapped Buffer state should be Helper.STATE_CHECKPOINT for checkpointing or Helper.STATE_END if some error occurs in test
+		 */
+		if (Helper.STATE_END != currentState) {
+			Assert.assertEquals(currentState, Helper.STATE_CHECKPOINT, testName + ": ERROR: Error occurred while running the test: test is not in the excepted 'waiting to be checkpointed state': " + currentState);
+		} else {
+			Assert.fail(testName + ": ERROR: Error took place in the test check the log file for more details");
+		}
+		/*
+		 * Reaching here implies that MappedByteBuffer is in To Be Checkpointed state.
+		 * Get the pid of the test process
+		 */
+
+		pid = getPid(testName);
+		try {
+			/*
+			 * Checkpoint the process
+			 */
+			checkpoint(pid, checkpointOpt);
+
+		} catch (Exception e) {
+			/*
+			 * If exception occurs put the MappedByteBuffer to Helper.STATE_TERMINATE-Terminate state.
+			 * On reading the terminate state, the test process terminates, else it
+			 * may go on looping.
+			 */
+			mappedByteBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_TERMINATE);
+			Assert.fail(testName + ": Exception occurred while during checkpointing" + e, e);
+		}
+
+		/*
+		 * The process has been checkpointed successfully, now restoring the process.
+		 */
+		try {
+			/*
+			 * Restore the process
+			 */
+			restore(restoreOpt);
+		} catch (Exception e) {
+			mappedByteBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_TERMINATE);
+			Assert.fail(testName + ": Exception occurred while restoring the test" + e, e);
+		}
+
+		/*
+		 * Wait for test process to finish
+		 */
+		currentState = mappedByteBuffer.getChar(Helper.MAPPED_INDEX);
+		while (Helper.STATE_RESTORE == currentState) {
+			currentState = mappedByteBuffer.getChar(Helper.MAPPED_INDEX);
+		}
+
+		/*
+		 * If a test passes it puts the MappedByteBuffer to Helper.STATE_PASS-Pass state,
+		 * On failing to Helper.STATE_FAIL-Fail state, and if our Buffer is in Helper.STATE_TERMINATE state
+		 * its because the checkpoint-restore of test process failed.
+		 */
+
+		Assert.assertNotEquals(currentState, Helper.STATE_TERMINATE, testName + ": ERROR: Checkpoint-Restore failed");
+		Assert.assertNotEquals(currentState, Helper.STATE_FAIL, testName + ": ERROR: Test Failed, Check Log for details");
+		Assert.assertEquals(currentState, Helper.STATE_PASS, testName + " ERROR: Unexpected State of Mapped Buffer");
+		System.out.println("-----" + "PASS" + "-----");
+
+	}
+
+	/**
+	 * Remove .img files, dump.log, restore.log, stats-dump and stats-restore files from Log Directory
+	 *
+	 * @throws IOException
+	 */
+	@AfterTest
+	void cleanup() throws IOException {
+		int i;
+		String currentPath = System.getProperty("user.dir");
+		currentPath = currentPath + "/" + logFolder;
+		File deleteFile;
+		File dir = new File(currentPath);
+		String[] imgFiles = dir.list(new ImgFilter());
+		if (null != imgFiles) {
+			for (i = 0; i < imgFiles.length; i++) {
+				deleteFile = new File(currentPath + imgFiles[i]);
+				Files.delete(deleteFile.toPath());
+			}
+		}
+
+		boolean exists = Files.exists(Paths.get(currentPath + "dump.log"));
+		if (exists) {
+			Files.delete(Paths.get(currentPath + "dump.log"));
+		}
+
+		exists = Files.exists(Paths.get(currentPath + "restore.log"));
+		if (exists) {
+			Files.delete(Paths.get(currentPath + "restore.log"));
+		}
+
+		exists = Files.exists(Paths.get(currentPath + "stats-dump"));
+		if (exists) {
+			Files.delete(Paths.get(currentPath + "stats-dump"));
+		}
+
+		exists = Files.exists(Paths.get(currentPath + "stats-restore"));
+		if (exists) {
+			Files.delete(Paths.get(currentPath + "stats-restore"));
+		}
+	}
+
+	/**
+	 * Copy .img files, dump.log, restore.log, stats-dump and stats-restore files from Log Directory if they exist
+	 * to another folder.
+	 *
+	 * @throws IOException
+	 */
+	String copyFiles() throws IOException {
+		String currentPath = System.getProperty("user.dir");
+		String folderSuffix = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+		String fromPath = currentPath + "/" + logFolder;
+		File fromDir = new File(fromPath);
+		Path fromFile, toFile;
+		boolean exists;
+		String toPath = currentPath + "/" + outputFolder + testName + folderSuffix + "/";
+		Path dirPath = Paths.get(toPath);
+		Files.createDirectory(dirPath);
+
+		String[] imgFiles = fromDir.list(new ImgFilter());
+		if (null != imgFiles) {
+			for (int i = 0; i < imgFiles.length; i++) {
+				fromFile = Paths.get(fromPath + imgFiles[i]);
+				toFile = Paths.get(toPath + imgFiles[i]);
+				Files.copy(fromFile, toFile);
+			}
+		}
+
+		fromFile = Paths.get(fromPath + "dump.log");
+		exists = Files.exists(fromFile);
+		if (exists) {
+			toFile = Paths.get(toPath + "dump.log");
+			Files.copy(fromFile, toFile);
+		}
+
+		fromFile = Paths.get(fromPath + "restore.log");
+		exists = Files.exists(fromFile);
+		if (exists) {
+			toFile = Paths.get(toPath + "restore.log");
+			Files.copy(fromFile, toFile);
+		}
+
+		fromFile = Paths.get(fromPath + "stats-dump");
+		exists = Files.exists(fromFile);
+		if (exists) {
+			toFile = Paths.get(toPath + "stats-dump");
+			Files.copy(fromFile, toFile);
+		}
+
+		fromFile = Paths.get(fromPath + "stats-restore");
+		exists = Files.exists(fromFile);
+		if (exists) {
+			toFile = Paths.get(toPath + "stats-restore");
+			Files.copy(fromFile, toFile);
+		}
+
+		return folderSuffix;
+	}
+
+	/**
+	 * Checkpoint the process, if process has not been checkpointed correctly
+	 * copy the .img, log and stats files, puts MappedBuffer to 'terminate' state and mark
+	 * test as failed
+	 *
+	 * @param pid           Pid of process to be checkpointed
+	 * @param checkpointOpt Additional options for checkpoint
+	 * @throws IOException
+	 * @throws InterruptedException
+	 */
+	private void checkpoint(String pid, String checkpointOpt) throws IOException, InterruptedException {
+		ProcessBuilder builder;
+		System.out.println("Checkpointing process " + pid);
+		String command = "../../criu/criu dump --shell-job -t " + pid + " -vvv -D " + logFolder + " -o dump.log";
+		if (0 == checkpointOpt.length()) {
+			String[] cmd = command.split(" ");
+			builder = new ProcessBuilder(cmd);
+		} else {
+			command = command + " " + checkpointOpt;
+			String[] cmd = command.split(" ");
+			builder = new ProcessBuilder(cmd);
+		}
+		Process process = builder.start();
+		BufferedReader stdError = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+		int exitCode = process.waitFor();
+
+		if (0 != exitCode) {
+			/*
+			 * Print the error stream
+			 */
+			String line = stdError.readLine();
+			while (null != line) {
+				System.out.println(line);
+				line = stdError.readLine();
+			}
+
+			mappedByteBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_TERMINATE);
+			/*
+			 * If checkpoint fails copy the img files, dump.log, stats-dump, stats-restore
+			 */
+			String folderSuffix = copyFiles();
+
+			Assert.fail(testName + ": ERROR: Error during checkpoint: exitCode of checkpoint process was not zero.\nFor more details check dump.log in " + outputFolder + testName + folderSuffix);
+			return;
+		}
+
+		System.out.println("Checkpoint success");
+		process.destroy();
+
+	}
+
+	/**
+	 * Restore the process, if process has been restored correctly put Mapped Buffer to
+	 * 'restored' state, else copy the .img, log and stats files and put MappedBuffer to 'terminate'
+	 * state and mark test as failed
+	 *
+	 * @param restoreOpt Additional options for restore
+	 * @throws IOException
+	 * @throws InterruptedException
+	 */
+	private void restore(String restoreOpt) throws IOException, InterruptedException {
+		ProcessBuilder builder;
+		System.out.println("Restoring process");
+		String command = "../../criu/criu restore -d -vvv --shell-job -D " + logFolder + " -o restore.log";
+		if (0 == restoreOpt.length()) {
+			String[] cmd = command.split(" ");
+			builder = new ProcessBuilder(cmd);
+		} else {
+			command = command + " " + restoreOpt;
+			String[] cmd = command.split(" ");
+			builder = new ProcessBuilder(cmd);
+		}
+
+		Process process = builder.start();
+		BufferedReader stdError = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+		int exitCode = process.waitFor();
+
+		if (0 != exitCode) {
+			/*
+			 * Print the error stream
+			 */
+			String line = stdError.readLine();
+			while (null != line) {
+				System.out.println(line);
+				line = stdError.readLine();
+			}
+			mappedByteBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_TERMINATE);
+			/*
+			 * If restore fails copy img files, dump.log, restore.log, stats-dump, stats-restore
+			 */
+			String folderSuffix = copyFiles();
+			Assert.fail(testName + ": ERROR: Error during restore: exitCode of restore process was not zero.\nFor more details check restore.log in " + outputFolder + testName + folderSuffix);
+
+			return;
+		} else {
+			System.out.println("Restore success");
+			mappedByteBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_RESTORE);
+		}
+		process.destroy();
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/FileRead.java b/test/javaTests/src/org/criu/java/tests/FileRead.java
new file mode 100644
index 000000000..d94a14112
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/FileRead.java
@@ -0,0 +1,175 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class FileRead {
+	private static String TESTNAME = "FileRead";
+
+	/**
+	 * @param i int value denoting the line number.
+	 * @return The line as a string.
+	 */
+	private static String getLine(int i) {
+		return "Line No: " + i + "\n";
+	}
+
+	/**
+	 * Write in a file, line by line, and read it, checkpoint and restore
+	 * and then continue to read and write the file.
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null;
+		Logger logger = null;
+		int wi, ri = 0;
+		try {
+			File file = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/FileRead_write.txt");
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			int val = Helper.init(TESTNAME, pid, logger);
+			if (0 != val) {
+				logger.log(Level.SEVERE, "Helper.init returned a non-zero code.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+			FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			/*
+			 * Mapped Byte Buffer should be in init state at the beginning of test
+			 */
+			if ('I' != b.getChar(Helper.MAPPED_INDEX)) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			logger.log(Level.INFO, "Checking existence of file to be read and written to.");
+			if (file.exists()) {
+				file.delete();
+			}
+			boolean newFile = file.createNewFile();
+			if (!newFile) {
+				logger.log(Level.SEVERE, "Cannot create a new file to read and write to.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			BufferedWriter brw = new BufferedWriter(new FileWriter(file));
+			BufferedReader brr = new BufferedReader(new FileReader(file));
+
+			logger.log(Level.INFO, "Start writing the lines in file");
+
+			for (wi = 1; wi <= 5; wi++) {
+				brw.write(getLine(wi));
+			}
+
+			brw.flush();
+			String s = "Line No: 0";
+			int i;
+
+			for (i = 0; i < 50; i++) {
+				brw.write(getLine(wi));
+				brw.flush();
+				wi++;
+				s = brr.readLine();
+				ri = Integer.parseInt(s.replaceAll("[\\D]", ""));
+			}
+
+			wi--;
+			logger.log(Level.INFO, "Going to checkpoint");
+
+			/*
+			 * Checkpoint and wait for restore
+			 */
+			Helper.checkpointAndWait(b, logger);
+			logger.log(Level.INFO, "Test has been restored!");
+
+			brw.flush();
+
+			try {
+				s = brr.readLine();
+
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Error: Buffered Reader is not reading file");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (null == s || s.isEmpty()) {
+				logger.log(Level.SEVERE, "Error: Error while reading lines after restore: Line read is null");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			int readLineNo = Integer.parseInt(s.replaceAll("[\\D]", ""));
+			if (ri + 1 != readLineNo) {
+				logger.log(Level.SEVERE, "Error: Not reading at correct line");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			String ch = brr.readLine();
+			while (null != ch && !ch.isEmpty()) {
+				s = ch;
+				ch = brr.readLine();
+			}
+
+			readLineNo = Integer.parseInt(s.replaceAll("[\\D]", ""));
+
+			if (readLineNo != wi) {
+				logger.log(Level.SEVERE, "Error: Data written has been lost");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			try {
+				brw.write(getLine(wi + 1));
+				brw.flush();
+			} catch (IOException e) {
+				logger.log(Level.SEVERE, "Error: cannot write file after restore");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			s = brr.readLine();
+			readLineNo = Integer.parseInt(s.replaceAll("[\\D]", ""));
+
+			if (readLineNo != wi + 1) {
+				logger.log(Level.SEVERE, "Error: Data not written correctly");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "File is being read and written to correctly after restore!");
+			logger.log(Level.INFO, Helper.PASS_MESSAGE);
+			brw.close();
+			brr.close();
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			System.exit(0);
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (null != b) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/Helper.java b/test/javaTests/src/org/criu/java/tests/Helper.java
new file mode 100644
index 000000000..d608fba47
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/Helper.java
@@ -0,0 +1,99 @@
+package org.criu.java.tests;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.MappedByteBuffer;
+import java.util.logging.FileHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+class Helper {
+	static String MEMORY_MAPPED_FILE_NAME = "output/file";
+	static String PASS_MESSAGE = "Test was a Success!!!";
+	static String OUTPUT_FOLDER_NAME = "output";
+	static String PACKAGE_NAME = "org.criu.java.tests";
+	static String PID_APPEND = ".pid";
+	static String SOURCE_FOLDER = "src/org/criu/java/tests";
+	static String LOG_FOLDER = "CRlogs";
+	static int MAPPED_REGION_SIZE = 100;
+	static int MAPPED_INDEX = 1;
+	static char STATE_RESTORE = 'R';
+	static char STATE_CHECKPOINT = 'C';
+	static char STATE_INIT = 'I';
+	static char STATE_TERMINATE = 'T';
+	static char STATE_END = 'E';
+	static char STATE_FAIL = 'F';
+	static char STATE_PASS = 'P';
+
+	/**
+	 * Create a new log file and pidfile and write
+	 * the pid to the pidFile.
+	 *
+	 * @param testName Name of the java test
+	 * @param pid Pid of the java test process
+	 * @param logger
+	 * @return 0 or 1 denoting whether the function was successful or not.
+	 * @throws IOException
+	 */
+	static int init(String testName, String pid, Logger logger) throws IOException {
+		File pidfile = new File(OUTPUT_FOLDER_NAME + "/" + testName + "/" + testName + PID_APPEND);
+
+		FileHandler handler = new FileHandler(Helper.OUTPUT_FOLDER_NAME + "/" + testName + "/" + testName + ".log", false);
+		handler.setFormatter(new SimpleFormatter());
+		handler.setLevel(Level.FINE);
+		logger.addHandler(handler);
+		logger.setLevel(Level.FINE);
+
+		/*
+		 * Create a pid file and write the process's pid into it.
+		 */
+		if (pidfile.exists()) {
+			pidfile.delete();
+		}
+		boolean newFile = pidfile.createNewFile();
+		if (!newFile) {
+			logger.log(Level.SEVERE, "Cannot create new pid file.");
+			return 1;
+		}
+		BufferedWriter pidWriter = new BufferedWriter(new FileWriter(pidfile));
+		pidWriter.write(pid + "\n");
+		pidWriter.close();
+		return 0;
+	}
+
+	/**
+	 * Put the Mapped Buffer to 'Ready to be checkpointed' state and wait for restore.
+	 *
+	 * @param b      The MappedByteBuffer from the calling process.
+	 * @param logger The Logger from the calling process.
+	 */
+	static void checkpointAndWait(MappedByteBuffer b, Logger logger) {
+		b.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+		char c = b.getChar(Helper.MAPPED_INDEX);
+		/*
+		 * Loop while MappedByteBuffer is in 'To be checkpointed' state
+		 */
+		while (Helper.STATE_CHECKPOINT == c) {
+			c = b.getChar(Helper.MAPPED_INDEX);
+		}
+		/*
+		 * Test is in 'T' state if some error or exception occurs during checkpoint or restore.
+		 */
+		if (Helper.STATE_TERMINATE == c) {
+			logger.log(Level.SEVERE, "Error during checkpoint-restore, Test terminated");
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			System.exit(1);
+		}
+		/*
+		 * The expected state of MappedByteBuffer is Helper.STATE_RESTORE-restored state.
+		 */
+		if (Helper.STATE_RESTORE != c) {
+			logger.log(Level.INFO, "Error: Test state is not the expected Restored state");
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			System.exit(1);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/ImgFilter.java b/test/javaTests/src/org/criu/java/tests/ImgFilter.java
new file mode 100644
index 000000000..97087c2cc
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/ImgFilter.java
@@ -0,0 +1,11 @@
+package org.criu.java.tests;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+class ImgFilter implements FilenameFilter {
+	@Override
+	public boolean accept(File dir, String fileName) {
+		return (fileName.endsWith(".img"));
+	}
+}
diff --git a/test/javaTests/test.xml b/test/javaTests/test.xml
new file mode 100644
index 000000000..8ff67c5e0
--- /dev/null
+++ b/test/javaTests/test.xml
@@ -0,0 +1,13 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name = "Suite1">
+	<parameter name="checkpointOpt" value=""/>
+	<parameter name="restoreOpt" value=""/>
+	<test name = "test1-FileRead">
+		<parameter name="testname" value="FileRead"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+</suite>

From 9325339e64e0485e981e880ae460729cd9b9b648 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 18:31:58 +0000
Subject: [PATCH 0044/1854] travis: Disallow failures on ia32

It seems pretty stable and hasn't add many false-positives during last
months. While can reveal some issues for compatible C/R code.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4cde9c4fb..7a0c29a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,8 +40,6 @@ matrix:
     - env: TR_ARCH=fedora-rawhide-aarch64
     - env: TR_ARCH=s390x
     - env: TR_ARCH=local       GCOV=1
-    - env: TR_ARCH=local       COMPAT_TEST=y
-    - env: TR_ARCH=local       CLANG=1 COMPAT_TEST=y
 script:
   - sudo make CCACHE=1 -C scripts/travis $TR_ARCH
 after_success:

From d804f70a680b0ba7410e3845aa8179d8ab5c4219 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 7 Feb 2019 15:17:48 +0300
Subject: [PATCH 0045/1854] mount: remove useless check in populate_mnt_ns

The path:

restore_root_task
 prepare_namespace_before_tasks
  mntns_maybe_create_roots

is always called before the path below:

retore_root_task
 fork_with_pid
  restore_task_with_children
   prepare_namespace
    prepare_mnt_ns
     populate_mnt_ns

So (!!mnt_roots) == (root_ns_mask & CLONE_NEWNS) in populate_mnt_ns, but
in prepare_mnt_ns we've already checked that it is true, so there is no
need in these check - remove it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 486d01719..802295778 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3139,15 +3139,12 @@ static int populate_mnt_ns(void)
 	struct ns_id *nsid;
 	int ret;
 
-	if (mnt_roots) {
-		/* mnt_roots is a tmpfs mount and it's private */
-		root_yard_mp = mnt_entry_alloc();
-		if (!root_yard_mp)
-			return -1;
+	root_yard_mp = mnt_entry_alloc();
+	if (!root_yard_mp)
+		return -1;
 
-		root_yard_mp->mountpoint = mnt_roots;
-		root_yard_mp->mounted = true;
-	}
+	root_yard_mp->mountpoint = mnt_roots;
+	root_yard_mp->mounted = true;
 
 	pms = mnt_build_tree(mntinfo, root_yard_mp);
 	if (!pms)

From 71dff54aa474efa105043cd86cc38103c3c21859 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 7 Feb 2019 15:17:49 +0300
Subject: [PATCH 0046/1854] ns: make rst_new_ns_id static

It's never used outside of namespaces.c

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/namespaces.h | 1 -
 criu/namespaces.c         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index 287abb3c8..a9a970a9b 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -166,7 +166,6 @@ extern int restore_ns(int rst, struct ns_desc *nd);
 
 extern int dump_task_ns_ids(struct pstree_item *);
 extern int predump_task_ns_ids(struct pstree_item *);
-extern struct ns_id *rst_new_ns_id(unsigned int id, pid_t pid, struct ns_desc *nd, enum ns_type t);
 extern int rst_add_ns_id(unsigned int id, struct pstree_item *, struct ns_desc *nd);
 extern struct ns_id *lookup_ns_by_id(unsigned int id, struct ns_desc *nd);
 
diff --git a/criu/namespaces.c b/criu/namespaces.c
index a228737ee..57f6bdfef 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -290,7 +290,7 @@ static void nsid_add(struct ns_id *ns, struct ns_desc *nd, unsigned int id, pid_
 	pr_info("Add %s ns %d pid %d\n", nd->str, ns->id, ns->ns_pid);
 }
 
-struct ns_id *rst_new_ns_id(unsigned int id, pid_t pid,
+static struct ns_id *rst_new_ns_id(unsigned int id, pid_t pid,
 		struct ns_desc *nd, enum ns_type type)
 {
 	struct ns_id *nsid;

From 7be7260261a1f94b111b9390a2b39179e87d7d8b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 7 Feb 2019 15:17:50 +0300
Subject: [PATCH 0047/1854] ns/restore/image: do not read namespace images for
 non-namespaced case

Images for mount and net namespaces are empty if ns does not belong to
us, thus we don't need to collect on restore.

By adding these checks we will eliminate suspicious messages in logs
about lack of images:

./test/zdtm.py run -k always -f h -t zdtm/static/env00

env00/54/2/restore.log:(00.000332) No mountpoints-5.img image
env00/54/2/restore.log:(00.000342) No netns-2.img image

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 5 +++++
 criu/net.c   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/criu/mount.c b/criu/mount.c
index 802295778..fdaaa7b31 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2989,6 +2989,11 @@ int read_mnt_ns_img(void)
 	struct mount_info *pms = NULL;
 	struct ns_id *nsid;
 
+	if (!(root_ns_mask & CLONE_NEWNS)) {
+		mntinfo = NULL;
+		return 0;
+	}
+
 	for (nsid = ns_ids; nsid != NULL; nsid = nsid->next) {
 		if (nsid->nd != &mnt_ns_desc)
 			continue;
diff --git a/criu/net.c b/criu/net.c
index 44b0ce224..9825db10f 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2057,6 +2057,9 @@ int read_net_ns_img(void)
 {
 	struct ns_id *ns;
 
+	if (!(root_ns_mask & CLONE_NEWNET))
+		return 0;
+
 	for (ns = ns_ids; ns != NULL; ns = ns->next) {
 		struct cr_img *img;
 		int ret;

From 35adc08598f78e9845388f235ffe0917d7606779 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 7 Feb 2019 15:17:51 +0300
Subject: [PATCH 0048/1854] mount: rework mount tree build step on restore

Build each mntns mount tree alone just after reading mounts for it from
image. These additional step before merging everything to a single mount
tree allows us to have pointers to each mntns root mount at hand, also
it allows us to remove extra complication from mnt_build_tree.

Teach collect_mnt_from_image return a tail pointer, so we can merge
lists together later after building each tree.

Add separate merge_mount_trees helper to create joint mount tree for all
mntns'es and simplify mnt_build_ids_tree.

I don't see any place where we use mntinfo_tree on restore, so save the
real root of mntns mounts tree in it, instead of root_yard_mp, will need
it in next patches for checking restore of these trees.

v2: prepend children to the root_yard in merge_mount_trees so that the
order in merged tree persists

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 131 +++++++++++++++++++++++++--------------------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index fdaaa7b31..49708ffd5 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -330,7 +330,7 @@ static bool mounts_equal(struct mount_info *a, struct mount_info *b)
  */
 static char *mnt_roots;
 
-static struct mount_info *mnt_build_ids_tree(struct mount_info *list, struct mount_info *yard_mount)
+static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
 {
 	struct mount_info *m, *root = NULL;
 
@@ -351,41 +351,14 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list, struct mou
 
 		if (!parent) {
 			/* Only a root mount can be without parent */
-			if (root == NULL && m->is_ns_root) {
+			if (!root && m->is_ns_root) {
 				root = m;
-				if (!yard_mount)
-					continue;
+				continue;
 			}
 
-			if (!root) {
-				pr_err("No parent found for mountpoint %d (@%s)\n",
-					m->mnt_id, m->mountpoint);
-				return NULL;
-			}
-
-			pr_debug("Mountpoint %d (@%s) w/o parent %d\n",
-				 m->mnt_id, m->mountpoint, m->parent_mnt_id);
-
-			if (!mounts_sb_equal(root, m) ||
-			    strcmp(root->root, m->root)) {
-				pr_err("Nested mount namespaces with different "
-				       "roots %d (@%s %s) %d (@%s %s) are not supported yet\n",
-				       root->mnt_id, root->mountpoint, root->root,
-				       m->mnt_id, m->mountpoint, m->root);
-				return NULL;
-			}
-
-			/* Mount all namespace roots into the roots yard. */
-			parent = yard_mount;
-			if (unlikely(!yard_mount)) {
-				pr_err("Nested mount %d (@%s %s) w/o root insertion detected\n",
-				       m->mnt_id, m->mountpoint, m->root);
-				return NULL;
-			}
-
-			pr_debug("Mountpoint %d (@%s) get parent %d (@%s)\n",
-				 m->mnt_id, m->mountpoint,
-				 parent->mnt_id, parent->mountpoint);
+			pr_err("No parent found for mountpoint %d (@%s)\n",
+				m->mnt_id, m->mountpoint);
+			return NULL;
 		}
 
 		m->parent = parent;
@@ -397,9 +370,6 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list, struct mou
 		return NULL;
 	}
 
-	if (yard_mount)
-		return yard_mount;
-
 	return root;
 }
 
@@ -997,8 +967,7 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 	return 0;
 }
 
-static struct mount_info *mnt_build_tree(struct mount_info *list,
-					 struct mount_info *root_mp)
+static struct mount_info *mnt_build_tree(struct mount_info *list)
 {
 	struct mount_info *tree;
 
@@ -1007,7 +976,7 @@ static struct mount_info *mnt_build_tree(struct mount_info *list,
 	 */
 
 	pr_info("Building mountpoints tree\n");
-	tree = mnt_build_ids_tree(list, root_mp);
+	tree = mnt_build_ids_tree(list);
 	if (!tree)
 		return NULL;
 
@@ -1690,7 +1659,7 @@ struct mount_info *collect_mntinfo(struct ns_id *ns, bool for_dump)
 		return NULL;
 	}
 
-	ns->mnt.mntinfo_tree = mnt_build_tree(pm, NULL);
+	ns->mnt.mntinfo_tree = mnt_build_tree(pm);
 	if (ns->mnt.mntinfo_tree == NULL)
 		goto err;
 
@@ -2881,7 +2850,7 @@ static int get_mp_mountpoint(char *mountpoint, struct mount_info *mi, char *root
 	return 0;
 }
 
-static int collect_mnt_from_image(struct mount_info **pms, struct ns_id *nsid)
+static int collect_mnt_from_image(struct mount_info **head, struct mount_info **tail, struct ns_id *nsid)
 {
 	MntEntry *me = NULL;
 	int ret, root_len = 1;
@@ -2909,8 +2878,10 @@ static int collect_mnt_from_image(struct mount_info **pms, struct ns_id *nsid)
 			goto err;
 
 		pm->nsid = nsid;
-		pm->next = *pms;
-		*pms = pm;
+		pm->next = *head;
+		*head = pm;
+		if (!*tail)
+			*tail = pm;
 
 		pm->mnt_id		= me->mnt_id;
 		pm->parent_mnt_id	= me->parent_mnt_id;
@@ -2995,11 +2966,20 @@ int read_mnt_ns_img(void)
 	}
 
 	for (nsid = ns_ids; nsid != NULL; nsid = nsid->next) {
+		struct mount_info *head = NULL, *tail = NULL;
+
 		if (nsid->nd != &mnt_ns_desc)
 			continue;
 
-		if (collect_mnt_from_image(&pms, nsid))
+		if (collect_mnt_from_image(&head, &tail, nsid))
 			return -1;
+
+		nsid->mnt.mntinfo_tree = mnt_build_tree(head);
+		if (!nsid->mnt.mntinfo_tree)
+			return -1;
+
+		tail->next = pms;
+		pms = head;
 	}
 
 	mntinfo = pms;
@@ -3101,6 +3081,40 @@ void fini_restore_mntns(void)
 	}
 }
 
+static int merge_mount_trees(struct mount_info *root_yard)
+{
+	struct mount_info *first = NULL;
+	struct ns_id *nsid;
+
+	/* Merge mount trees together under root_yard */
+	for (nsid = ns_ids; nsid; nsid = nsid->next) {
+		struct mount_info *root;
+
+		if (nsid->nd != &mnt_ns_desc)
+			continue;
+
+		root = nsid->mnt.mntinfo_tree;
+
+		if (!first)
+			first = root;
+		else if (!mounts_sb_equal(root, first) ||
+			 strcmp(root->root, first->root)) {
+			pr_err("Nested mount namespaces with different "
+			       "roots %d (@%s %s) %d (@%s %s) are not supported yet\n",
+			       root->mnt_id, root->mountpoint, root->root,
+			       first->mnt_id, first->mountpoint, first->root);
+			return -1;
+		}
+
+		pr_debug("Mountpoint %d (@%s) moved to the root yard\n",
+			 root->mnt_id, root->mountpoint);
+		root->parent = root_yard;
+		list_add(&root->siblings, &root_yard->children);
+	}
+
+	return 0;
+}
+
 /*
  * All nested mount namespaces are restore as sub-trees of the root namespace.
  */
@@ -3140,8 +3154,6 @@ static int populate_roots_yard(void)
 
 static int populate_mnt_ns(void)
 {
-	struct mount_info *pms;
-	struct ns_id *nsid;
 	int ret;
 
 	root_yard_mp = mnt_entry_alloc();
@@ -3151,40 +3163,27 @@ static int populate_mnt_ns(void)
 	root_yard_mp->mountpoint = mnt_roots;
 	root_yard_mp->mounted = true;
 
-	pms = mnt_build_tree(mntinfo, root_yard_mp);
-	if (!pms)
+	if (merge_mount_trees(root_yard_mp))
 		return -1;
 
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 	if (!opts.has_binfmt_misc && !list_empty(&binfmt_misc_list)) {
 		/* Add to mount tree. Generic code will mount it later */
-		ret = add_cr_time_mount(pms, "binfmt_misc", BINFMT_MISC_HOME, 0);
+		ret = add_cr_time_mount(root_yard_mp, "binfmt_misc", BINFMT_MISC_HOME, 0);
 		if (ret)
 			return -1;
 	}
 #endif
 
-	if (resolve_shared_mounts(mntinfo, pms->master_id))
+	if (resolve_shared_mounts(mntinfo, 0))
 		return -1;
 
-	for (nsid = ns_ids; nsid; nsid = nsid->next) {
-		if (nsid->nd != &mnt_ns_desc)
-			continue;
-
-		/*
-		 * Make trees of all namespaces look the
-		 * same, so that manual paths resolution
-		 * works on them.
-		 */
-		nsid->mnt.mntinfo_tree = pms;
-	}
-
 	if (validate_mounts(mntinfo, false))
 		return -1;
 
-	mnt_tree_for_each(pms, set_is_overmounted);
+	mnt_tree_for_each(root_yard_mp, set_is_overmounted);
 
-	if (find_remap_mounts(pms))
+	if (find_remap_mounts(root_yard_mp))
 		return -1;
 
 	if (populate_roots_yard())
@@ -3193,8 +3192,8 @@ static int populate_mnt_ns(void)
 	if (mount_clean_path())
 		return -1;
 
-	ret = mnt_tree_for_each(pms, do_mount_one);
-	mnt_tree_for_each(pms, do_close_one);
+	ret = mnt_tree_for_each(root_yard_mp, do_mount_one);
+	mnt_tree_for_each(root_yard_mp, do_close_one);
 
 	if (ret == 0 && fixup_remap_mounts())
 		return -1;

From f3cca97d80c77a6f2b9702edc8225ea8bb6034e5 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 27 Jun 2019 12:43:40 +0300
Subject: [PATCH 0049/1854] mount: make mnt_resort_siblings nonrecursive and
 reuse friendly

Add mnt_subtree_next DFS-next search to remove recursion.

v5: add these patch, remove recursion from sorting helpers
v6: rip out butifull yet unused step-part of nfs-next algorithm

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 57 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 49708ffd5..974af6eb2 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -385,13 +385,12 @@ static unsigned int mnt_depth(struct mount_info *m)
 	return depth;
 }
 
-static void mnt_resort_siblings(struct mount_info *tree)
+static void __mnt_resort_children(struct mount_info *parent)
 {
-	struct mount_info *m, *p;
 	LIST_HEAD(list);
 
 	/*
-	 * Put siblings of each node in an order they can be (u)mounted
+	 * Put children mounts in an order they can be (u)mounted
 	 * I.e. if we have mounts on foo/bar/, foo/bar/foobar/ and foo/
 	 * we should put them in the foo/bar/foobar/, foo/bar/, foo/ order.
 	 * Otherwise we will not be able to (u)mount them in a sequence.
@@ -403,11 +402,12 @@ static void mnt_resort_siblings(struct mount_info *tree)
 	 * to contain hundreds (or more) elements.
 	 */
 
-	pr_info("\tResorting siblings on %d\n", tree->mnt_id);
-	while (!list_empty(&tree->children)) {
+	pr_info("\tResorting children of %d in mount order\n", parent->mnt_id);
+	while (!list_empty(&parent->children)) {
+		struct mount_info *m, *p;
 		unsigned int depth;
 
-		m = list_first_entry(&tree->children, struct mount_info, siblings);
+		m = list_first_entry(&parent->children, struct mount_info, siblings);
 		list_del(&m->siblings);
 
 		depth = mnt_depth(m);
@@ -416,10 +416,31 @@ static void mnt_resort_siblings(struct mount_info *tree)
 				break;
 
 		list_add_tail(&m->siblings, &p->siblings);
-		mnt_resort_siblings(m);
 	}
 
-	list_splice(&list, &tree->children);
+	list_splice(&list, &parent->children);
+}
+
+static struct mount_info *mnt_subtree_next(struct mount_info *mi,
+					   struct mount_info *root);
+
+static void resort_siblings(struct mount_info *root,
+			    void (*resort_children)(struct mount_info *)) {
+	struct mount_info *mi = root;
+	while (1) {
+		/*
+		 * Explanation: sorting the children of the tree like these is
+		 * safe and does not break the tree search in mnt_subtree_next
+		 * (DFS-next search), as we sort children before calling next
+		 * on parent and thus before DFS-next ever touches them, so
+		 * from the perspective of DFS-next all children look like they
+		 * are already sorted.
+		 */
+		resort_children(mi);
+		mi = mnt_subtree_next(mi, root);
+		if (!mi)
+			break;
+	}
 }
 
 static void mnt_tree_show(struct mount_info *tree, int off)
@@ -980,7 +1001,7 @@ static struct mount_info *mnt_build_tree(struct mount_info *list)
 	if (!tree)
 		return NULL;
 
-	mnt_resort_siblings(tree);
+	resort_siblings(tree, __mnt_resort_children);
 	pr_info("Done:\n");
 	mnt_tree_show(tree, 0);
 	return tree;
@@ -3821,3 +3842,21 @@ int remount_readonly_mounts(void)
 	 */
 	return call_helper_process(ns_remount_readonly_mounts, NULL);
 }
+
+static struct mount_info *mnt_subtree_next(struct mount_info *mi,
+					   struct mount_info *root)
+{
+	if (!list_empty(&mi->children))
+		return list_entry(mi->children.next,
+				  struct mount_info, siblings);
+
+	while (mi->parent && mi != root) {
+		if (mi->siblings.next == &mi->parent->children)
+			mi = mi->parent;
+		else
+			return list_entry(mi->siblings.next,
+					  struct mount_info, siblings);
+	}
+
+	return NULL;
+}

From 2b4e653361ec0c3b827fb4af4e0b8848fb9a26f0 Mon Sep 17 00:00:00 2001
From: Nidhi Gupta <itsnidhi16@gmail.com>
Date: Tue, 5 Nov 2019 15:19:25 +0530
Subject: [PATCH 0050/1854] Run java functional tests on travis

Signed-off-by: Nidhi Gupta <itsnidhi16@gmail.com>
---
 .travis.yml                            |  2 ++
 scripts/build/Dockerfile.openj9-alpine | 33 ++++++++++++++++++++++++++
 scripts/build/Dockerfile.openj9-ubuntu | 30 +++++++++++++++++++++++
 scripts/travis/Makefile                |  3 +++
 scripts/travis/openj9-test.sh          | 22 +++++++++++++++++
 5 files changed, 90 insertions(+)
 create mode 100644 scripts/build/Dockerfile.openj9-alpine
 create mode 100644 scripts/build/Dockerfile.openj9-ubuntu
 create mode 100755 scripts/travis/openj9-test.sh

diff --git a/.travis.yml b/.travis.yml
index 7a0c29a55..6e854540b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ env:
   - TR_ARCH=fedora-rawhide-aarch64
   - TR_ARCH=centos
   - TR_ARCH=podman-test
+  - TR_ARCH=openj9-test
+
 matrix:
   include:
     - os: linux
diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
new file mode 100644
index 000000000..654e7bf31
--- /dev/null
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -0,0 +1,33 @@
+FROM adoptopenjdk/openjdk8-openj9:alpine
+
+RUN apk update && apk add \
+	bash \
+	build-base \
+	ccache \
+	coreutils \
+	git \
+	gnutls-dev \
+	libaio-dev \
+	libcap-dev \
+	libnet-dev \
+	libnl3-dev \
+	pkgconfig \
+	protobuf-c-dev \
+	protobuf-dev \
+	python \
+	sudo \
+	maven \
+	py-yaml \
+	py-pip \
+	py2-future \
+	ip6tables \
+	iptables \
+	bash
+
+COPY . /criu
+WORKDIR /criu
+
+RUN make
+
+ENTRYPOINT mvn -f test/javaTests/pom.xml test
+
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
new file mode 100644
index 000000000..13d9080ff
--- /dev/null
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -0,0 +1,30 @@
+FROM adoptopenjdk/openjdk8-openj9:latest
+
+RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-compiler \
+	libprotobuf-c-dev \
+	libaio-dev \
+	python-future \
+	libprotobuf-dev \
+	protobuf-compiler \
+	libcap-dev \
+	libnl-3-dev \
+	gdb \
+	bash \
+	python-protobuf \
+	python-yaml \
+	libnet-dev \
+	libnl-route-3-dev \
+	libbsd-dev \
+	make \
+	git \
+	pkg-config \
+	gcc \
+	maven
+
+COPY . /criu
+WORKDIR /criu
+
+RUN make
+
+ENTRYPOINT mvn -f test/javaTests/pom.xml test
+
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index baddd6eb1..c6b67935b 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -41,5 +41,8 @@ docker-test:
 podman-test:
 	./podman-test.sh
 
+openj9-test:
+	./openj9-test.sh
+
 %:
 	$(MAKE) -C ../build $@$(target-suffix)
diff --git a/scripts/travis/openj9-test.sh b/scripts/travis/openj9-test.sh
new file mode 100755
index 000000000..968f064f8
--- /dev/null
+++ b/scripts/travis/openj9-test.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+cd ../..
+
+failures=""
+
+docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
+docker run --rm --privileged criu-openj9-ubuntu-test:latest
+if [ $? -ne 0 ]; then
+	failures=`echo "$failures ubuntu"`
+fi
+
+docker build -t criu-openj9-alpine-test:latest -f scripts/build/Dockerfile.openj9-alpine .
+docker run --rm --privileged criu-openj9-alpine-test:latest
+if [ $? -ne 0 ]; then
+	failures=`echo "$failures alpine"`
+fi
+
+if [ -n "$failures" ]; then
+	echo "Tests failed on $failures"
+	exit 1
+fi

From 62953d4334b0294ac90e0ec088267fa99daf9f92 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 4 Nov 2019 08:52:55 +0100
Subject: [PATCH 0051/1854] travis: fix copy paste error from previous commit

In my previous commit I copied a line with a return into the main script
body. bash can only return from functions. This changes return to exit.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/travis-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 1f6b19130..07311511c 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -86,7 +86,7 @@ if [ "$WIDTH" -gt 80 ]; then
 	exit 1
 fi
 
-[ -n "$SKIP_TRAVIS_TEST" ] && return
+[ -n "$SKIP_TRAVIS_TEST" ] && exit 0
 
 ulimit -c unlimited
 

From 6be414bb2be1e8be13b996f60977ecc44b765a2e Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 4 Nov 2019 08:54:22 +0100
Subject: [PATCH 0052/1854] travis: Do not run privileged containers in LXD

Travis uses unprivileged containers for aarch64 in LXD. Docker with
'--privileged' fails in such situation. This changes the travis setup
to only start docker with '--privileged' if running on x86_64.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/Makefile | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index c6b67935b..80c7b9230 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -13,6 +13,9 @@ endif
 
 TARGETS := alpine fedora-rawhide centos
 ZDTM_OPTIONS :=
+UNAME := $(shell uname -m)
+
+export UNAME
 
 alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap
 
@@ -23,17 +26,29 @@ define DOCKER_JSON
 endef
 
 export DOCKER_JSON
-$(TARGETS):
-	echo "$$DOCKER_JSON" > /etc/docker/daemon.json
-	systemctl restart docker
-	$(MAKE) -C ../build $@$(target-suffix)
-	docker run --env-file docker.env --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ scripts/travis/travis-tests
 
-fedora-asan:
-	echo "$$DOCKER_JSON" > /etc/docker/daemon.json
-	systemctl restart docker
+ifeq ($(UNAME),x86_64)
+	CONTAINER_OPTS := --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run
+else
+	CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
+endif
+
+restart-docker:
+	if [ "$$UNAME" = "x86_64" ]; then \
+		echo "$$DOCKER_JSON" > /etc/docker/daemon.json; \
+		cat /etc/docker/daemon.json; \
+		systemctl status docker; \
+		systemctl restart docker; \
+		systemctl status docker; \
+	fi
+
+$(TARGETS): restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS)
+	docker run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/travis/travis-tests
+
+fedora-asan: restart-docker
+	$(MAKE) -C ../build $@$(target-suffix)
+	docker run -it $(CONTAINER_OPTS) criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS)
 
 docker-test:
 	./docker-test.sh

From 075f1beaf7d36cb9ea5030e1faab9661c33290ab Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 4 Nov 2019 08:56:15 +0100
Subject: [PATCH 0053/1854] Makefile hack for travis aarch64/armv8l

For CRIU's compile only tests for armv7hf on Travis we are using
'setarch linux32' which returns armv8l on Travis aarch64.

This adds a path in the Makefile to treat armv8l just as armv7hf during
compile. This enables us to run armv7hf compile tests on Travis aarch64
hardware. Much faster. Maybe not entirely correct, but probably good
enough for compile testing in an armv7hf container.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0140330e1..f827e7baa 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,6 @@ endif
 # Architecture specific options.
 ifeq ($(ARCH),arm)
         ARMV		:= $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
-        DEFINES		:= -DCONFIG_ARMV$(ARMV) -DCONFIG_VDSO_32
 
         ifeq ($(ARMV),6)
                 USERCFLAGS += -march=armv6
@@ -45,6 +44,16 @@ ifeq ($(ARCH),arm)
                 USERCFLAGS += -march=armv7-a
         endif
 
+        ifeq ($(ARMV),8)
+                # Running 'setarch linux32 uname -m' returns armv8l on travis aarch64.
+                # This tells CRIU to handle armv8l just as armv7hf. Right now this is
+                # only used for compile testing. No further verification of armv8l exists.
+                USERCFLAGS += -march=armv7-a
+                ARMV := 7
+        endif
+
+        DEFINES		:= -DCONFIG_ARMV$(ARMV) -DCONFIG_VDSO_32
+
         PROTOUFIX	:= y
 	# For simplicity - compile code in Arm mode without interwork.
 	# We could choose Thumb mode as default instead - but a dirty

From eab8cf0775ed5569bb22795a86817dae06cf0005 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 4 Nov 2019 08:58:54 +0100
Subject: [PATCH 0054/1854] travis: switch all arm related tests to real
 hardware

This switches all arm related tests (32bit and 64bit) to the aarch64
systems Travis provides. For arm32 we are running in a armv7hf container
on aarch64 with 'setarch linux32'.

The main changes are that docker on Travis aarch64 cannot use
'--privileged' as Travis is using unprivileged LXD containers to setup
the testing environment.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                                   | 50 +++++++++++++++----
 scripts/build/Dockerfile.armv7hf.hdr          |  4 +-
 scripts/build/Dockerfile.armv7hf.tmpl         |  2 +-
 .../Dockerfile.fedora-rawhide-aarch64.hdr     |  3 --
 .../Dockerfile.fedora-rawhide-aarch64.tmpl    |  1 -
 scripts/build/Dockerfile.linux32.tmpl         | 47 +++++++++++++++++
 scripts/build/Makefile                        |  4 +-
 scripts/travis/Makefile                       |  2 +
 scripts/travis/podman-test.sh                 |  2 +-
 9 files changed, 93 insertions(+), 22 deletions(-)
 delete mode 100644 scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr
 delete mode 120000 scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl
 create mode 100644 scripts/build/Dockerfile.linux32.tmpl

diff --git a/.travis.yml b/.travis.yml
index 6e854540b..85b6b6e07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: c
 sudo: required
-dist: xenial
+dist: bionic
 cache: ccache
 services:
   - docker
@@ -9,21 +9,12 @@ env:
   - TR_ARCH=local       CLANG=1
   - TR_ARCH=local       COMPAT_TEST=y
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
-  - TR_ARCH=alpine
-  - TR_ARCH=fedora-asan
   - TR_ARCH=x86_64
   - TR_ARCH=x86_64      CLANG=1
-  - TR_ARCH=armv7hf
   - TR_ARCH=ppc64le
   - TR_ARCH=s390x
-  - TR_ARCH=armv7hf     CLANG=1
   - TR_ARCH=ppc64le     CLANG=1
-  - TR_ARCH=alpine      CLANG=1
   - TR_ARCH=docker-test
-  - TR_ARCH=fedora-rawhide
-  - TR_ARCH=fedora-rawhide-aarch64
-  - TR_ARCH=centos
-  - TR_ARCH=podman-test
   - TR_ARCH=openj9-test
 
 matrix:
@@ -36,10 +27,47 @@ matrix:
       arch: arm64
       env: TR_ARCH=local CLANG=1
       dist: bionic
+    - os: linux
+      arch: arm64
+      # This runs on aarch64 with 'setarch linux32'
+      env: TR_ARCH=armv7hf
+      dist: bionic
+    - os: linux
+      arch: arm64
+      # This runs on aarch64 with 'setarch linux32'
+      env: TR_ARCH=armv7hf     CLANG=1
+      dist: bionic
+    - os: linux
+      arch: arm64
+      env: TR_ARCH=fedora-rawhide
+      dist: bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=fedora-rawhide
+      dist: xenial # test hangs on bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=podman-test
+      dist: bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=alpine      CLANG=1
+      dist: xenial # test hangs on bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=alpine
+      dist: xenial # test hangs on bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=centos
+      dist: xenial # test hangs on bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=fedora-asan
+      dist: xenial # test hangs on bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=fedora-rawhide
-    - env: TR_ARCH=fedora-rawhide-aarch64
     - env: TR_ARCH=s390x
     - env: TR_ARCH=local       GCOV=1
 script:
diff --git a/scripts/build/Dockerfile.armv7hf.hdr b/scripts/build/Dockerfile.armv7hf.hdr
index d453d6df7..7c66474e5 100644
--- a/scripts/build/Dockerfile.armv7hf.hdr
+++ b/scripts/build/Dockerfile.armv7hf.hdr
@@ -1,3 +1 @@
-FROM arm32v7/ubuntu:xenial
-
-COPY scripts/build/qemu-user-static/usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
+FROM arm32v7/ubuntu:bionic
diff --git a/scripts/build/Dockerfile.armv7hf.tmpl b/scripts/build/Dockerfile.armv7hf.tmpl
index cb804790e..7bc6d9cde 120000
--- a/scripts/build/Dockerfile.armv7hf.tmpl
+++ b/scripts/build/Dockerfile.armv7hf.tmpl
@@ -1 +1 @@
-Dockerfile.tmpl
\ No newline at end of file
+Dockerfile.linux32.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr b/scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr
deleted file mode 100644
index 82f29e336..000000000
--- a/scripts/build/Dockerfile.fedora-rawhide-aarch64.hdr
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM arm64v8/fedora:rawhide
-
-COPY scripts/build/qemu-user-static/usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
diff --git a/scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl b/scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl
deleted file mode 120000
index e4c40309c..000000000
--- a/scripts/build/Dockerfile.fedora-rawhide-aarch64.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.fedora.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
new file mode 100644
index 000000000..5d3fe5139
--- /dev/null
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -0,0 +1,47 @@
+ARG CC=gcc
+ARG ENV1=FOOBAR
+
+RUN apt-get update && apt-get install -y \
+	ccache \
+	libnet-dev \
+	libnl-route-3-dev \
+	$CC \
+	bsdmainutils \
+	build-essential \
+	git-core \
+	iptables \
+	libaio-dev \
+	libcap-dev \
+	libgnutls28-dev \
+	libgnutls30 \
+	libnl-3-dev \
+	libprotobuf-c-dev \
+	libprotobuf-dev \
+	libselinux-dev \
+	pkg-config \
+	protobuf-c-compiler \
+	protobuf-compiler \
+	python-minimal \
+	python-future
+
+COPY . /criu
+WORKDIR /criu
+ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
+
+RUN uname -m && setarch linux32 uname -m && setarch --list
+
+RUN mv .ccache /tmp && make mrproper && ccache -s && \
+	date && \
+# Check single object build
+	setarch linux32 make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
+# Compile criu
+	setarch linux32 make -j $(nproc) CC="$CC" && \
+	date && \
+# Check that "make mrproper" works
+	setarch linux32 make mrproper && ! git clean -ndx --exclude=scripts/build \
+	--exclude=.config --exclude=test | grep .
+
+# Compile tests
+RUN date && setarch linux32 make -j $(nproc) CC="$CC" -C test/zdtm && date
+
+#RUN make test/compel/handle_binary && ./test/compel/handle_binary
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 3d4d91cd5..d7ad82aec 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,5 +1,5 @@
-QEMU_ARCHES := armv7hf ppc64le s390x fedora-rawhide-aarch64 # require qemu
-ARCHES := $(QEMU_ARCHES) aarch64 x86_64 fedora-asan fedora-rawhide centos
+QEMU_ARCHES := ppc64le s390x # require qemu
+ARCHES := $(QEMU_ARCHES) aarch64 x86_64 fedora-asan fedora-rawhide centos armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index 80c7b9230..373171149 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -28,6 +28,8 @@ endef
 export DOCKER_JSON
 
 ifeq ($(UNAME),x86_64)
+	# On anything besides x86_64 Travis is running unprivileged LXD
+	# containers which do not support running docker with '--privileged'.
 	CONTAINER_OPTS := --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run
 else
 	CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh
index 9bd1f3d8b..eafdc73be 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/travis/podman-test.sh
@@ -11,7 +11,7 @@ apt-get install -qq \
 
 apt-get update -qq
 
-apt-get install -qqy podman
+apt-get install -qqy podman containernetworking-plugins
 
 export SKIP_TRAVIS_TEST=1
 

From fe668075ad2afe1021f8ff86d774eccb7bd1bef7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 13 Nov 2019 08:38:16 +0100
Subject: [PATCH 0055/1854] travis: switch pcp64le and s390x to real hardware

Now that Travis also supports ppc64le and s390x we can remove all qemu
based docker emulation from our test setup. This now runs ppc64le and
s390x tests on real hardware (LXD containers).

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                           | 17 +++++++++----
 scripts/build/Dockerfile.aarch64.hdr  |  3 ---
 scripts/build/Dockerfile.aarch64.tmpl |  1 -
 scripts/build/Dockerfile.ppc64le.hdr  |  5 ----
 scripts/build/Dockerfile.ppc64le.tmpl |  1 -
 scripts/build/Dockerfile.s390x.hdr    |  6 -----
 scripts/build/Dockerfile.s390x.tmpl   |  1 -
 scripts/build/Makefile                | 21 +---------------
 scripts/build/binfmt_misc             | 13 ----------
 scripts/build/extract-deb-pkg         | 36 ---------------------------
 scripts/travis/travis-tests           |  7 ------
 11 files changed, 13 insertions(+), 98 deletions(-)
 delete mode 100644 scripts/build/Dockerfile.aarch64.hdr
 delete mode 120000 scripts/build/Dockerfile.aarch64.tmpl
 delete mode 100644 scripts/build/Dockerfile.ppc64le.hdr
 delete mode 120000 scripts/build/Dockerfile.ppc64le.tmpl
 delete mode 100644 scripts/build/Dockerfile.s390x.hdr
 delete mode 120000 scripts/build/Dockerfile.s390x.tmpl
 delete mode 100755 scripts/build/binfmt_misc
 delete mode 100755 scripts/build/extract-deb-pkg

diff --git a/.travis.yml b/.travis.yml
index 85b6b6e07..3c760d08a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,22 @@ env:
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
   - TR_ARCH=x86_64
   - TR_ARCH=x86_64      CLANG=1
-  - TR_ARCH=ppc64le
-  - TR_ARCH=s390x
-  - TR_ARCH=ppc64le     CLANG=1
   - TR_ARCH=docker-test
   - TR_ARCH=openj9-test
-
 matrix:
   include:
+    - os: linux
+      arch: ppc64le
+      env: TR_ARCH=local
+      dist: bionic
+    - os: linux
+      arch: ppc64le
+      env: TR_ARCH=local CLANG=1
+      dist: bionic
+    - os: linux
+      arch: s390x
+      env: TR_ARCH=local
+      dist: bionic
     - os: linux
       arch: arm64
       env: TR_ARCH=local
@@ -68,7 +76,6 @@ matrix:
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=fedora-rawhide
-    - env: TR_ARCH=s390x
     - env: TR_ARCH=local       GCOV=1
 script:
   - sudo make CCACHE=1 -C scripts/travis $TR_ARCH
diff --git a/scripts/build/Dockerfile.aarch64.hdr b/scripts/build/Dockerfile.aarch64.hdr
deleted file mode 100644
index c90c98088..000000000
--- a/scripts/build/Dockerfile.aarch64.hdr
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM arm64v8/ubuntu:xenial
-
-COPY scripts/build/qemu-user-static/usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
diff --git a/scripts/build/Dockerfile.aarch64.tmpl b/scripts/build/Dockerfile.aarch64.tmpl
deleted file mode 120000
index cb804790e..000000000
--- a/scripts/build/Dockerfile.aarch64.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64le.hdr b/scripts/build/Dockerfile.ppc64le.hdr
deleted file mode 100644
index ba65901c2..000000000
--- a/scripts/build/Dockerfile.ppc64le.hdr
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM ppc64le/ubuntu:xenial
-
-ENV QEMU_CPU POWER8
-COPY scripts/build/qemu-user-static/usr/bin/qemu-ppc64le-static /usr/bin/qemu-ppc64le-static
-RUN sed -i '/security/ d' /etc/apt/sources.list
diff --git a/scripts/build/Dockerfile.ppc64le.tmpl b/scripts/build/Dockerfile.ppc64le.tmpl
deleted file mode 120000
index cb804790e..000000000
--- a/scripts/build/Dockerfile.ppc64le.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.s390x.hdr b/scripts/build/Dockerfile.s390x.hdr
deleted file mode 100644
index e02097f62..000000000
--- a/scripts/build/Dockerfile.s390x.hdr
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM s390x/debian:latest
-
-ENV QEMU_CPU z900
-COPY scripts/build/qemu-user-static/usr/bin/qemu-s390x-static /usr/bin/qemu-s390x-static
-# The security repository does not seem to exist anymore
-RUN sed -i '/security/ d' /etc/apt/sources.list
diff --git a/scripts/build/Dockerfile.s390x.tmpl b/scripts/build/Dockerfile.s390x.tmpl
deleted file mode 120000
index cb804790e..000000000
--- a/scripts/build/Dockerfile.s390x.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.tmpl
\ No newline at end of file
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index d7ad82aec..a7c78e8bd 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,5 +1,4 @@
-QEMU_ARCHES := ppc64le s390x # require qemu
-ARCHES := $(QEMU_ARCHES) aarch64 x86_64 fedora-asan fedora-rawhide centos armv7hf
+ARCHES := x86_64 fedora-asan fedora-rawhide centos armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
@@ -16,15 +15,6 @@ $(foreach arch,$(ARCHES),$(eval $(call ARCH_DEP,$(arch))))
 Dockerfile.%: Dockerfile.%.hdr Dockerfile.%.tmpl
 	cat $^ > $@
 
-qemu-user-static:
-	./extract-deb-pkg qemu-user-static
-
-binfmt_misc:
-	./binfmt_misc
-.PHONY: binfmt_misc
-
-$(QEMU_ARCHES): qemu-user-static binfmt_misc
-
 $(TARGETS):
 	mkdir -p $(HOME)/.ccache
 	mv $(HOME)/.ccache ../../
@@ -42,12 +32,3 @@ $(foreach t,$(TARGETS),$(eval $(call CLANG_DEP,$(t))))
 %-clang:	DB_ENV=--build-arg ENV1=CCACHE_CPP2
 s390x-clang:	DB_CC=--build-arg CC=clang-3.8
 .PHONY: $(TARGETS_CLANG)
-
-clean:
-	rm -rf qemu-user-static
-	for ARCH in $(ARCHES); do \
-		FILE=/proc/sys/fs/binfmt_misc/$$ARCH; \
-		test -f $$FILE && echo -1 > $$FILE; \
-		rm -f Dockerfile.$$ARCH; \
-	done
-.PHONY: clean
diff --git a/scripts/build/binfmt_misc b/scripts/build/binfmt_misc
deleted file mode 100755
index bf2a2ecad..000000000
--- a/scripts/build/binfmt_misc
+++ /dev/null
@@ -1,13 +0,0 @@
-set -e -x
-
-test -f /proc/sys/fs/binfmt_misc/armv7hf ||
-	echo ':armv7hf:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register;
-
-test -f /proc/sys/fs/binfmt_misc/aarch64 ||
-	echo ':aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64-static:' > /proc/sys/fs/binfmt_misc/register
-
-test -f /proc/sys/fs/binfmt_misc/ppc64le ||
-	echo ':ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xfc\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00:/usr/bin/qemu-ppc64le-static:' > /proc/sys/fs/binfmt_misc/register
-
-test -f /proc/sys/fs/binfmt_misc/s390x ||
-	echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:' > /proc/sys/fs/binfmt_misc/register
diff --git a/scripts/build/extract-deb-pkg b/scripts/build/extract-deb-pkg
deleted file mode 100755
index 44457bc5a..000000000
--- a/scripts/build/extract-deb-pkg
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-set -o pipefail
-MIRROR="https://mirrors.kernel.org/ubuntu"
-PKGS="$MIRROR/dists/bionic/universe/binary-amd64/Packages.gz"
-
-if [ $# -ne 1 ]; then
-	echo "Usage: $0 package-name" 1>&2
-	exit 1
-fi
-
-if [ -d "$1" ]; then
-	echo "Directory $1 already exists -- exiting"
-	exit 0
-fi
-
-if ! pkg=$(curl -sSL "$PKGS" | zgrep "Filename.*$1" | awk '{ print $2 }'); then
-	echo "ERROR: no packages matching $1" 1>&2
-	exit 1
-fi
-
-if [ "$(wc -w <<< "$pkg")" -gt 1 ]; then
-	echo "$pkg" 1>&2
-	echo "ERROR: more than one match for $1" 1>&2
-	exit 1
-fi
-
-mkdir "$1"
-cd "$1"
-
-wget "$MIRROR/$pkg"
-pkg=$(basename "$pkg")
-ar vx "$pkg"
-tar xJvf data.tar.xz
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 07311511c..bc97fd455 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -51,13 +51,6 @@ travis_prep () {
 		CC="ccache $CC"
 	fi
 
-	# The /etc/apt/sources.list in the current trusty image for ppc64le is
-	# broken and needs to be fixed
-	if [ "$TR_ARCH" = "ppc64le" ] ; then
-		sed -i '/security/ d' /etc/apt/sources.list
-	fi
-
-
 	# Do not install x86_64 specific packages on other architectures
 	if [ "$UNAME_M" = "x86_64" ]; then
 		TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS"

From ea018e9a9c78353b8f5532a2e5a36a0d1c5e8769 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 13 Nov 2019 13:25:30 +0100
Subject: [PATCH 0056/1854] travis: remove group from .travis.yml

Tests are successful even after removing 'group:' from .travis.yml.
Apparently it is not necessary.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3c760d08a..f6f71be48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,4 +82,3 @@ script:
 after_success:
   - ccache -s
   - make -C scripts/travis after_success
-group: deprecated-2017Q2

From ef277068de3f6f89f394b9f63a3870eddde8c998 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:34 +0000
Subject: [PATCH 0057/1854] lib/ptrace: Allow PTRACE_PEEKDATA with errno != 0

>From man ptrace:
> On error, all requests return -1, and errno is set appropriately.
> Since the value returned by a successful PTRACE_PEEK* request may be
> -1, the caller must clear errno before the call, and then check
> it afterward to determine whether or not an error occurred.

FWIW: if ptrace_peek_area() is called with (errno != 0) it may
false-fail if the data is (-1).

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/ptrace.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/compel/src/lib/ptrace.c b/compel/src/lib/ptrace.c
index 9142bac42..715e564df 100644
--- a/compel/src/lib/ptrace.c
+++ b/compel/src/lib/ptrace.c
@@ -34,14 +34,20 @@ int ptrace_suspend_seccomp(pid_t pid)
 int ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes)
 {
 	unsigned long w;
+	int old_errno = errno;
+
 	if (bytes & (sizeof(long) - 1))
 		return -1;
+
+	errno = 0;
 	for (w = 0; w < bytes / sizeof(long); w++) {
 		unsigned long *d = dst, *a = addr;
+
 		d[w] = ptrace(PTRACE_PEEKDATA, pid, a + w, NULL);
 		if (d[w] == -1U && errno)
 			goto err;
 	}
+	errno = old_errno;
 	return 0;
 err:
 	return -2;

From a93117ede1e58db68246f775c00bc21683954c39 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:35 +0000
Subject: [PATCH 0058/1854] lib/ptrace: Be more elaborate about failures

Also, don't use the magic -2 => return errno on failure.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/ptrace.c | 46 ++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/compel/src/lib/ptrace.c b/compel/src/lib/ptrace.c
index 715e564df..4c3530c85 100644
--- a/compel/src/lib/ptrace.c
+++ b/compel/src/lib/ptrace.c
@@ -36,50 +36,72 @@ int ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes)
 	unsigned long w;
 	int old_errno = errno;
 
-	if (bytes & (sizeof(long) - 1))
+	if (bytes & (sizeof(long) - 1)) {
+		pr_err("Peek request with non-word size %ld\n", bytes);
 		return -1;
+	}
 
 	errno = 0;
 	for (w = 0; w < bytes / sizeof(long); w++) {
 		unsigned long *d = dst, *a = addr;
 
 		d[w] = ptrace(PTRACE_PEEKDATA, pid, a + w, NULL);
-		if (d[w] == -1U && errno)
+		if (d[w] == -1U && errno) {
+			pr_perror("PEEKDATA failed");
 			goto err;
+		}
 	}
 	errno = old_errno;
 	return 0;
 err:
-	return -2;
+	return -errno;
 }
 
 int ptrace_poke_area(pid_t pid, void *src, void *addr, long bytes)
 {
 	unsigned long w;
-	if (bytes & (sizeof(long) - 1))
+
+	if (bytes & (sizeof(long) - 1)) {
+		pr_err("Poke request with non-word size %ld\n", bytes);
 		return -1;
+	}
+
 	for (w = 0; w < bytes / sizeof(long); w++) {
 		unsigned long *s = src, *a = addr;
-		if (ptrace(PTRACE_POKEDATA, pid, a + w, s[w]))
+
+		if (ptrace(PTRACE_POKEDATA, pid, a + w, s[w])) {
+			pr_perror("POKEDATA failed");
 			goto err;
+		}
 	}
 	return 0;
 err:
-	return -2;
+	return -errno;
 }
 
 /* don't swap big space, it might overflow the stack */
 int ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes)
 {
 	void *t = alloca(bytes);
+	int err;
 
-	if (ptrace_peek_area(pid, t, dst, bytes))
-		return -1;
+	err = ptrace_peek_area(pid, t, dst, bytes);
+	if (err)
+		return err;
 
-	if (ptrace_poke_area(pid, src, dst, bytes)) {
-		if (ptrace_poke_area(pid, t, dst, bytes))
-			return -2;
-		return -1;
+	err = ptrace_poke_area(pid, src, dst, bytes);
+	if (err) {
+		int err2;
+
+		pr_err("Can't poke %d @ %p from %p sized %ld\n",
+			pid, dst, src, bytes);
+
+		err2 = ptrace_poke_area(pid, t, dst, bytes);
+		if (err2) {
+			pr_err("Can't restore the original data with poke\n");
+			return err2;
+		}
+		return err;
 	}
 
 	memcpy(src, t, bytes);

From c8f16bfacb82b98841a9de49f5f9a15254d7b95f Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:36 +0000
Subject: [PATCH 0059/1854] compel/infect: Warn if close() failed on memfd

As a preparation for __must_check on compel_syscall(), check it on
close() too - maybe not as useful as with other syscalls, but why not.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/infect.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index f0bcaf334..f726a9895 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -718,14 +718,25 @@ static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size)
 	return 0;
 }
 
+static void parasite_memfd_close(struct parasite_ctl *ctl, int fd)
+{
+	bool __maybe_unused compat = !compel_mode_native(ctl);
+	long ret;
+	int err;
+
+	err = compel_syscall(ctl, __NR(close, compat), &ret, fd, 0, 0, 0, 0, 0);
+	if (err || ret)
+		pr_err("Can't close memfd\n");
+}
+
 static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 {
 	void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE;
+	bool __maybe_unused compat_task = !compel_mode_native(ctl);
 	uint8_t orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME;
 	pid_t pid = ctl->rpid;
 	long sret = -ENOSYS;
 	int ret, fd, lfd;
-	bool __maybe_unused compat_task = !compel_mode_native(ctl);
 
 	if (ctl->ictx.flags & INFECT_NO_MEMFD)
 		return 1;
@@ -741,10 +752,9 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 			     (unsigned long)where, 0, 0, 0, 0, 0);
 
 	if (ptrace_poke_area(pid, orig_code, where, sizeof(orig_code))) {
-		fd = (int)(long)sret;
+		fd = (int)sret;
 		if (fd >= 0)
-			compel_syscall(ctl, __NR(close, compat_task), &sret,
-					fd, 0, 0, 0, 0, 0);
+			parasite_memfd_close(ctl, fd);
 		pr_err("Can't restore memfd args (pid: %d)\n", pid);
 		return -1;
 	}
@@ -752,7 +762,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 	if (ret < 0)
 		return ret;
 
-	fd = (int)(long)sret;
+	fd = (int)sret;
 	if (fd == -ENOSYS)
 		return 1;
 	if (fd < 0) {
@@ -787,7 +797,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 		goto err_curef;
 	}
 
-	compel_syscall(ctl, __NR(close, compat_task), &sret, fd, 0, 0, 0, 0, 0);
+	parasite_memfd_close(ctl, fd);
 	close(lfd);
 
 	pr_info("Set up parasite blob using memfd\n");
@@ -796,7 +806,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 err_curef:
 	close(lfd);
 err_cure:
-	compel_syscall(ctl, __NR(close, compat_task), &sret, fd, 0, 0, 0, 0, 0);
+	parasite_memfd_close(ctl, fd);
 	return -1;
 }
 

From ee449e27c6979291660772db9724474a55d83b12 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:37 +0000
Subject: [PATCH 0060/1854] compel: Mark compat argument of __NR() as used

And remove __maybe_unused work-around.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/aarch64/src/lib/include/syscall.h               | 2 +-
 compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h | 2 +-
 compel/arch/arm/src/lib/include/syscall.h                   | 2 +-
 compel/arch/arm/src/lib/include/uapi/asm/infect-types.h     | 2 +-
 compel/arch/ppc64/src/lib/include/syscall.h                 | 2 +-
 compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h   | 2 +-
 compel/arch/s390/src/lib/include/uapi/asm/infect-types.h    | 2 +-
 compel/src/lib/infect.c                                     | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/syscall.h b/compel/arch/aarch64/src/lib/include/syscall.h
index e2ec1272e..30290667a 100644
--- a/compel/arch/aarch64/src/lib/include/syscall.h
+++ b/compel/arch/aarch64/src/lib/include/syscall.h
@@ -1,4 +1,4 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 #endif
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index 4662f7689..7a33baa8e 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -27,6 +27,6 @@ typedef struct user_fpsimd_state	user_fpregs_struct_t;
 
 #define ARCH_SI_TRAP		TRAP_BRKPT
 
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/arm/src/lib/include/syscall.h b/compel/arch/arm/src/lib/include/syscall.h
index e2ec1272e..30290667a 100644
--- a/compel/arch/arm/src/lib/include/syscall.h
+++ b/compel/arch/arm/src/lib/include/syscall.h
@@ -1,4 +1,4 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 #endif
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
index b8286d404..69222b251 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
@@ -61,6 +61,6 @@ struct user_vfp_exc {
 
 #define ARCH_SI_TRAP		TRAP_BRKPT
 
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/ppc64/src/lib/include/syscall.h b/compel/arch/ppc64/src/lib/include/syscall.h
index e2ec1272e..30290667a 100644
--- a/compel/arch/ppc64/src/lib/include/syscall.h
+++ b/compel/arch/ppc64/src/lib/include/syscall.h
@@ -1,4 +1,4 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 #endif
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
index 89fc4aa3c..126fa2ea3 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
@@ -81,6 +81,6 @@ typedef struct {
 
 #define ARCH_SI_TRAP TRAP_BRKPT
 
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
index fddf65d3b..8171d3395 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
@@ -73,7 +73,7 @@ typedef struct {
 
 #define user_regs_native(pregs)		true
 
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 
 struct mmap_arg_struct {
 	unsigned long addr;
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index f726a9895..656cc030d 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -720,7 +720,7 @@ static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size)
 
 static void parasite_memfd_close(struct parasite_ctl *ctl, int fd)
 {
-	bool __maybe_unused compat = !compel_mode_native(ctl);
+	bool compat = !compel_mode_native(ctl);
 	long ret;
 	int err;
 
@@ -732,7 +732,7 @@ static void parasite_memfd_close(struct parasite_ctl *ctl, int fd)
 static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 {
 	void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE;
-	bool __maybe_unused compat_task = !compel_mode_native(ctl);
+	bool compat_task = !compel_mode_native(ctl);
 	uint8_t orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME;
 	pid_t pid = ctl->rpid;
 	long sret = -ENOSYS;

From 71738565780552b93fad5dcd42ecfcb4e972471f Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:38 +0000
Subject: [PATCH 0061/1854] lib/infect: Check if compel succeed in executing
 munmap

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/s390/src/lib/infect.c |  4 +++-
 compel/src/lib/infect.c           | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 00e9c36d2..7e7d24ce2 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -453,8 +453,10 @@ void *remote_mmap(struct parasite_ctl *ctl,
 	if (ptrace_poke_area(pid, &arg_struct, where, sizeof(arg_struct))) {
 		pr_err("Can't restore mmap args (pid: %d)\n", pid);
 		if (map != 0) {
-			compel_syscall(ctl, __NR_munmap, NULL, map,
+			err = compel_syscall(ctl, __NR_munmap, NULL, map,
 					     length, 0, 0, 0, 0);
+			if (err)
+				pr_err("Can't munmap %d\n", err);
 			map = 0;
 		}
 	}
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 656cc030d..8b377e7d2 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1303,6 +1303,7 @@ int compel_stop_daemon(struct parasite_ctl *ctl)
 int compel_cure_remote(struct parasite_ctl *ctl)
 {
 	long ret;
+	int err;
 
 	if (compel_stop_daemon(ctl))
 		return -1;
@@ -1310,9 +1311,12 @@ int compel_cure_remote(struct parasite_ctl *ctl)
 	if (!ctl->remote_map)
 		return 0;
 
-	compel_syscall(ctl, __NR(munmap, !compel_mode_native(ctl)), &ret,
-			(unsigned long)ctl->remote_map, ctl->map_length,
-			0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR(munmap, !compel_mode_native(ctl)), &ret,
+			     (unsigned long)ctl->remote_map, ctl->map_length,
+			     0, 0, 0, 0);
+	if (err)
+		return err;
+
 	if (ret) {
 		pr_err("munmap for remote map %p, %lu returned %lu\n",
 				ctl->remote_map, ctl->map_length, ret);

From b5a83623b0327c19a2b9e6da28c434f28e33f7c3 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:39 +0000
Subject: [PATCH 0062/1854] cr-dump: Try to cure remote on err-pathes

On daemon stop or threads dump failures it's still desired to remove
parasite from the remote (if possible). Try best and keep hopeing.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index f72373d22..56724f9a5 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1385,16 +1385,20 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 
 	ret = compel_stop_daemon(parasite_ctl);
 	if (ret) {
-		pr_err("Can't cure (pid: %d) from parasite\n", pid);
-		goto err;
+		pr_err("Can't stop daemon in parasite (pid: %d)\n", pid);
+		goto err_cure;
 	}
 
 	ret = dump_task_threads(parasite_ctl, item);
 	if (ret) {
 		pr_err("Can't dump threads\n");
-		goto err;
+		goto err_cure;
 	}
 
+	/*
+	 * On failure local map will be cured in cr_dump_finish()
+	 * for lazy pages.
+	 */
 	if (opts.lazy_pages)
 		ret = compel_cure_remote(parasite_ctl);
 	else
@@ -1427,7 +1431,9 @@ err:
 err_cure:
 	close_cr_imgset(&cr_imgset);
 err_cure_imgset:
-	compel_cure(parasite_ctl);
+	ret = compel_cure(parasite_ctl);
+	if (ret)
+		pr_err("Can't cure (pid: %d) from parasite\n", pid);
 	goto err;
 }
 

From 1038a0ae44971129b3720c4351b788913e7be8f2 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:40 +0000
Subject: [PATCH 0063/1854] cr-dump: Warn if unmapping local memfd failed

Probably, not the worst that could happen, but still unexpected.
Preparing the ground to make compel_cure*() functions __must_check.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 56724f9a5..4b5a01cfd 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1537,7 +1537,8 @@ static int cr_pre_dump_finish(int status)
 		timing_stop(TIME_MEMWRITE);
 
 		destroy_page_pipe(mem_pp);
-		compel_cure_local(ctl);
+		if (compel_cure_local(ctl))
+			pr_err("Can't cure local: something happened with mapping?\n");
 	}
 
 	free_pstree(root_item);
@@ -1664,7 +1665,8 @@ static int cr_lazy_mem_dump(void)
 	for_each_pstree_item(item) {
 		if (item->pid->state != TASK_DEAD) {
 			destroy_page_pipe(dmpi(item)->mem_pp);
-			compel_cure_local(dmpi(item)->parasite_ctl);
+			if (compel_cure_local(dmpi(item)->parasite_ctl))
+				pr_err("Can't cure local: something happened with mapping?\n");
 		}
 	}
 

From abe48f8c3618113035c3e5ff76747b0342b6c7e7 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:41 +0000
Subject: [PATCH 0064/1854] cr-restore: Warn if restorer can't be unmapped

Too late to stop restore: it's already printed that restore was
successful. Oh, well warn aloud about infection.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index b4530f8e5..25b820132 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1952,6 +1952,7 @@ static void finalize_restore(void)
 	for_each_pstree_item(item) {
 		pid_t pid = item->pid->real;
 		struct parasite_ctl *ctl;
+		unsigned long restorer_addr;
 
 		if (!task_alive(item))
 			continue;
@@ -1961,7 +1962,9 @@ static void finalize_restore(void)
 		if (ctl == NULL)
 			continue;
 
-		compel_unmap(ctl, (unsigned long)rsti(item)->munmap_restorer);
+		restorer_addr = (unsigned long)rsti(item)->munmap_restorer;
+		if (compel_unmap(ctl, restorer_addr))
+			pr_err("Failed to unmap restorer from %d\n", pid);
 
 		xfree(ctl);
 

From bd17ee85882033ead401a89e1eb21b18c7cb2afb Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:42 +0000
Subject: [PATCH 0065/1854] parasite-syscall: Log if can't cure on failed
 infection

Maybe expected, hopefully never happens - let's warn in any case.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/parasite-syscall.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index b9788a4c2..e5a8194e5 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -565,7 +565,8 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 	parasite_ensure_args_size(aio_rings_args_size(vma_area_list));
 
 	if (compel_infect(ctl, item->nr_threads, parasite_args_size) < 0) {
-		compel_cure(ctl);
+		if (compel_cure(ctl))
+			pr_warn("Can't cure failed infection\n");
 		return NULL;
 	}
 

From c21c0aea1bd11b9d5c99803a7413314e0d6a0866 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:43 +0000
Subject: [PATCH 0066/1854] compel/infect: Detach but fail compel_resume_task()

Unknown state means that the task in the end may be not in wanted state.
Return err code.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/infect.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 8b377e7d2..3fad85ed3 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -313,6 +313,8 @@ err:
 
 int compel_resume_task(pid_t pid, int orig_st, int st)
 {
+	int ret = 0;
+
 	pr_debug("\tUnseizing %d into %d\n", pid, st);
 
 	if (st == COMPEL_TASK_DEAD) {
@@ -335,15 +337,17 @@ int compel_resume_task(pid_t pid, int orig_st, int st)
 		 */
 		if (orig_st == COMPEL_TASK_STOPPED)
 			kill(pid, SIGSTOP);
-	} else
+	} else {
 		pr_err("Unknown final state %d\n", st);
+		ret = -1;
+	}
 
 	if (ptrace(PTRACE_DETACH, pid, NULL, NULL)) {
 		pr_perror("Unable to detach from %d", pid);
 		return -1;
 	}
 
-	return 0;
+	return ret;
 }
 
 static int gen_parasite_saddr(struct sockaddr_un *saddr, int key)

From 56bc4189e47c3f356c6f407544f5a88768bd4f00 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:44 +0000
Subject: [PATCH 0067/1854] criu: Kill tasks even when the network is unlocked

Currently if anything fails after network has been unlocked tasks aren't
killed. Which doesn't work anyway: any stage sets `ret` and nothing
later gets called. Which means the tasks aren't resumed properly.
Furthermore, functions like catch_tasks() and compel_stop_on_syscall()
return failure on the first error.

Let's do the cleanup even when the network is unlocked.
If we want to keep the mess and ignore failures - a cli option should be
introduced for that (and existing code should be reworked with decisions
what is critical and what can be ignored).

Move "Restore finished successfully" message accordingly where
everything is evidently good.

While at here, any late failure will result not only in cleanup but in
criu returning error code.

Which in result makes tests to fail in such case:
> ======================= Run zdtm/static/inotify04 in ns ========================
> Start test
> ./inotify04 --pidfile=inotify04.pid --outfile=inotify04.out --dirname=inotify04.test
> Run criu dump
> =[log]=> dump/zdtm/static/inotify04/84/1/dump.log
> ------------------------ grep Error ------------------------
> (00.119763) fsnotify: 			openable (inode match) as zdtm/static/inotify04.test/inotify-testfile
> (00.119766) fsnotify: 	Dumping /zdtm/static/inotify04.test/inotify-testfile as path for handle
> (00.119769) fsnotify: id 0x00000b flags 0x000800
> (00.119787) 88 fdinfo 5: pos:                0 flags:             4000/0
> (00.119796) Warn  (criu/fsnotify.c:336): fsnotify: The 0x00000c inotify events will be dropped
> ------------------------ ERROR OVER ------------------------
> Run criu restore
> =[log]=> dump/zdtm/static/inotify04/84/1/restore.log
> ------------------------ grep Error ------------------------
> (00.391582) 123 was stopped
> (00.391667) 106 was trapped
> (00.391674) 106 (native) is going to execute the syscall 11, required is 11
> (00.391697) 106 was stopped
> (00.391720) Error (compel/src/lib/infect.c:1439): Task 123 is in unexpected state: b7f
> (00.391736) Error (compel/src/lib/infect.c:1447): Task stopped with 11: Segmentation fault
> ------------------------ ERROR OVER ------------------------
> 5: Old maps lost: set([])
> 5: New maps appeared: set([u'10000-1a000 rwxp', u'1a000-24000 rw-p'])
> ############### Test zdtm/static/inotify04 FAIL at maps compare ################
> Send the 9 signal to  106
> Wait for zdtm/static/inotify04(106) to die for 0.100000
> ======================= Test zdtm/static/inotify04 PASS ========================

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c | 50 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 25b820132..05a25835a 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1974,7 +1974,7 @@ static void finalize_restore(void)
 	}
 }
 
-static void finalize_restore_detach(int status)
+static int finalize_restore_detach(void)
 {
 	struct pstree_item *item;
 
@@ -1988,16 +1988,21 @@ static void finalize_restore_detach(int status)
 		for (i = 0; i < item->nr_threads; i++) {
 			pid = item->threads[i].real;
 			if (pid < 0) {
-				BUG_ON(status >= 0);
-				break;
+				pr_err("pstree item has unvalid pid %d\n", pid);
+				continue;
 			}
 
-			if (arch_set_thread_regs_nosigrt(&item->threads[i]))
+			if (arch_set_thread_regs_nosigrt(&item->threads[i])) {
 				pr_perror("Restoring regs for %d failed", pid);
-			if (ptrace(PTRACE_DETACH, pid, NULL, 0))
-				pr_perror("Unable to execute %d", pid);
+				return -1;
+			}
+			if (ptrace(PTRACE_DETACH, pid, NULL, 0)) {
+				pr_perror("Unable to detach %d", pid);
+				return -1;
+			}
 		}
 	}
+	return 0;
 }
 
 static void ignore_kids(void)
@@ -2255,32 +2260,37 @@ skip_ns_bouncing:
 
 	/*
 	 * -------------------------------------------------------------
-	 * Below this line nothing should fail, because network is unlocked
+	 * Network is unlocked. If something fails below - we lose data
+	 * or a connection.
 	 */
 	attach_to_tasks(root_seized);
 
-	ret = restore_switch_stage(CR_STATE_RESTORE_CREDS);
-	BUG_ON(ret);
+	if (restore_switch_stage(CR_STATE_RESTORE_CREDS))
+		goto out_kill_network_unlocked;
 
 	timing_stop(TIME_RESTORE);
 
-	ret = catch_tasks(root_seized, &flag);
+	if (catch_tasks(root_seized, &flag)) {
+		pr_err("Can't catch all tasks\n");
+		goto out_kill_network_unlocked;
+	}
 
 	if (lazy_pages_finish_restore())
-		goto out_kill;
+		goto out_kill_network_unlocked;
 
-	pr_info("Restore finished successfully. Resuming tasks.\n");
 	__restore_switch_stage(CR_STATE_COMPLETE);
 
-	if (ret == 0)
-		ret = compel_stop_on_syscall(task_entries->nr_threads,
-			__NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag);
+	ret = compel_stop_on_syscall(task_entries->nr_threads,
+		__NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag);
+	if (ret) {
+		pr_err("Can't stop all tasks on rt_sigreturn\n");
+		goto out_kill_network_unlocked;
+	}
 
 	if (clear_breakpoints())
 		pr_err("Unable to flush breakpoints\n");
 
-	if (ret == 0)
-		finalize_restore();
+	finalize_restore();
 
 	ret = run_scripts(ACT_PRE_RESUME);
 	if (ret)
@@ -2292,8 +2302,10 @@ skip_ns_bouncing:
 	fini_cgroup();
 
 	/* Detaches from processes and they continue run through sigreturn. */
-	finalize_restore_detach(ret);
+	if (finalize_restore_detach())
+		goto out_kill_network_unlocked;
 
+	pr_info("Restore finished successfully. Tasks resumed.\n");
 	write_stats(RESTORE_STATS);
 
 	ret = run_scripts(ACT_POST_RESUME);
@@ -2305,6 +2317,8 @@ skip_ns_bouncing:
 
 	return 0;
 
+out_kill_network_unlocked:
+	pr_err("Killing processes because of failure on restore.\nThe Network was unlocked so some data or a connection may have been lost.\n");
 out_kill:
 	/*
 	 * The processes can be killed only when all of them have been created,

From 1c0716924bbc1128c478388b70904438a5934e73 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Sat, 9 Nov 2019 22:20:45 +0000
Subject: [PATCH 0068/1854] compel/criu: Add __must_check

All those compel functions can fail by various reasons.
It may be status of the system, interruption by user or anything else.
It's really desired to handle as many PIE related errors as possible
otherwise it's hard to analyze statuses of parasite/restorer
and the C/R process.

At least warning for logs should be produced or even C/R stopped.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/include/uapi/cpu.h                |  2 +-
 compel/include/uapi/infect-rpc.h         |  6 ++--
 compel/include/uapi/infect-util.h        |  5 ++-
 compel/include/uapi/infect.h             | 39 +++++++++++++-----------
 compel/include/uapi/ptrace.h             |  7 +++--
 compel/include/uapi/sigframe-common.h    |  5 +--
 compel/plugins/include/uapi/plugin-fds.h |  2 +-
 compel/plugins/include/uapi/std/infect.h |  8 +++--
 compel/plugins/include/uapi/std/log.h    |  1 +
 criu/seize.c                             |  2 +-
 include/common/compiler.h                | 27 ++++++++++++++++
 11 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/compel/include/uapi/cpu.h b/compel/include/uapi/cpu.h
index 6f827d447..72c8a516c 100644
--- a/compel/include/uapi/cpu.h
+++ b/compel/include/uapi/cpu.h
@@ -6,7 +6,7 @@
 
 #include <compel/asm/cpu.h>
 
-extern int compel_cpuid(compel_cpuinfo_t *info);
+extern int /* TODO: __must_check */ compel_cpuid(compel_cpuinfo_t *info);
 extern bool compel_cpu_has_feature(unsigned int feature);
 extern bool compel_fpu_has_feature(unsigned int feature);
 extern uint32_t compel_fpu_feature_size(unsigned int feature);
diff --git a/compel/include/uapi/infect-rpc.h b/compel/include/uapi/infect-rpc.h
index 0176c1142..180dedf1f 100644
--- a/compel/include/uapi/infect-rpc.h
+++ b/compel/include/uapi/infect-rpc.h
@@ -6,9 +6,9 @@
 #include <stdint.h>
 
 struct parasite_ctl;
-extern int compel_rpc_sync(unsigned int cmd, struct parasite_ctl *ctl);
-extern int compel_rpc_call(unsigned int cmd, struct parasite_ctl *ctl);
-extern int compel_rpc_call_sync(unsigned int cmd, struct parasite_ctl *ctl);
+extern int __must_check compel_rpc_sync(unsigned int cmd, struct parasite_ctl *ctl);
+extern int __must_check compel_rpc_call(unsigned int cmd, struct parasite_ctl *ctl);
+extern int __must_check compel_rpc_call_sync(unsigned int cmd, struct parasite_ctl *ctl);
 extern int compel_rpc_sock(struct parasite_ctl *ctl);
 
 #define PARASITE_USER_CMDS	64
diff --git a/compel/include/uapi/infect-util.h b/compel/include/uapi/infect-util.h
index 7307ba57a..4e32d13dc 100644
--- a/compel/include/uapi/infect-util.h
+++ b/compel/include/uapi/infect-util.h
@@ -1,6 +1,9 @@
 #ifndef __COMPEL_INFECT_UTIL_H__
 #define __COMPEL_INFECT_UTIL_H__
+
+#include "common/compiler.h"
+
 struct parasite_ctl;
-extern int compel_util_send_fd(struct parasite_ctl *ctl, int fd);
+extern int __must_check compel_util_send_fd(struct parasite_ctl *ctl, int fd);
 extern int compel_util_recv_fd(struct parasite_ctl *ctl, int *pfd);
 #endif
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 08beaffcd..dd672bc1c 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -13,7 +13,7 @@
 
 #define PARASITE_START_AREA_MIN	(4096)
 
-extern int compel_interrupt_task(int pid);
+extern int __must_check compel_interrupt_task(int pid);
 
 struct seize_task_status {
 	unsigned long long	sigpnd;
@@ -23,27 +23,28 @@ struct seize_task_status {
 	int			seccomp_mode;
 };
 
-extern int compel_wait_task(int pid, int ppid,
+extern int __must_check compel_wait_task(int pid, int ppid,
 		int (*get_status)(int pid, struct seize_task_status *, void *data),
 		void (*free_status)(int pid, struct seize_task_status *, void *data),
 		struct seize_task_status *st, void *data);
 
-extern int compel_stop_task(int pid);
+extern int __must_check compel_stop_task(int pid);
 extern int compel_resume_task(pid_t pid, int orig_state, int state);
 
 struct parasite_ctl;
 struct parasite_thread_ctl;
 
-extern struct parasite_ctl *compel_prepare(int pid);
-extern struct parasite_ctl *compel_prepare_noctx(int pid);
-extern int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size);
-extern struct parasite_thread_ctl *compel_prepare_thread(struct parasite_ctl *ctl, int pid);
+extern struct parasite_ctl __must_check *compel_prepare(int pid);
+extern struct parasite_ctl __must_check *compel_prepare_noctx(int pid);
+extern int __must_check compel_infect(struct parasite_ctl *ctl,
+		unsigned long nr_threads, unsigned long args_size);
+extern struct parasite_thread_ctl __must_check *compel_prepare_thread(struct parasite_ctl *ctl, int pid);
 extern void compel_release_thread(struct parasite_thread_ctl *);
 
-extern int compel_stop_daemon(struct parasite_ctl *ctl);
-extern int compel_cure_remote(struct parasite_ctl *ctl);
-extern int compel_cure_local(struct parasite_ctl *ctl);
-extern int compel_cure(struct parasite_ctl *ctl);
+extern int __must_check compel_stop_daemon(struct parasite_ctl *ctl);
+extern int __must_check compel_cure_remote(struct parasite_ctl *ctl);
+extern int __must_check compel_cure_local(struct parasite_ctl *ctl);
+extern int __must_check compel_cure(struct parasite_ctl *ctl);
 
 #define PARASITE_ARG_SIZE_MIN	( 1 << 12)
 
@@ -58,15 +59,16 @@ extern int compel_cure(struct parasite_ctl *ctl);
 extern void *compel_parasite_args_p(struct parasite_ctl *ctl);
 extern void *compel_parasite_args_s(struct parasite_ctl *ctl, unsigned long args_size);
 
-extern int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
+extern int __must_check compel_syscall(struct parasite_ctl *ctl,
+		int nr, long *ret,
 		unsigned long arg1,
 		unsigned long arg2,
 		unsigned long arg3,
 		unsigned long arg4,
 		unsigned long arg5,
 		unsigned long arg6);
-extern int compel_run_in_thread(struct parasite_thread_ctl *tctl, unsigned int cmd);
-extern int compel_run_at(struct parasite_ctl *ctl, unsigned long ip, user_regs_struct_t *ret_regs);
+extern int __must_check compel_run_in_thread(struct parasite_thread_ctl *tctl, unsigned int cmd);
+extern int __must_check compel_run_at(struct parasite_ctl *ctl, unsigned long ip, user_regs_struct_t *ret_regs);
 
 /*
  * The PTRACE_SYSCALL will trap task twice -- on
@@ -80,12 +82,13 @@ enum trace_flags {
 	TRACE_EXIT,
 };
 
-extern int compel_stop_on_syscall(int tasks, int sys_nr,
+extern int __must_check compel_stop_on_syscall(int tasks, int sys_nr,
 		int sys_nr_compat, enum trace_flags trace);
 
-extern int compel_stop_pie(pid_t pid, void *addr, enum trace_flags *tf, bool no_bp);
+extern int __must_check compel_stop_pie(pid_t pid, void *addr,
+		enum trace_flags *tf, bool no_bp);
 
-extern int compel_unmap(struct parasite_ctl *ctl, unsigned long addr);
+extern int __must_check compel_unmap(struct parasite_ctl *ctl, unsigned long addr);
 
 extern int compel_mode_native(struct parasite_ctl *ctl);
 
@@ -159,7 +162,7 @@ struct parasite_blob_desc {
 
 extern struct parasite_blob_desc *compel_parasite_blob_desc(struct parasite_ctl *);
 
-extern int compel_get_thread_regs(struct parasite_thread_ctl *, save_regs_t, void *);
+extern int __must_check compel_get_thread_regs(struct parasite_thread_ctl *, save_regs_t, void *);
 
 extern void compel_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs);
 
diff --git a/compel/include/uapi/ptrace.h b/compel/include/uapi/ptrace.h
index 4df00b6e1..13eed7232 100644
--- a/compel/include/uapi/ptrace.h
+++ b/compel/include/uapi/ptrace.h
@@ -1,6 +1,7 @@
 #ifndef UAPI_COMPEL_PTRACE_H__
 #define UAPI_COMPEL_PTRACE_H__
 
+#include "common/compiler.h"
 /*
  * We'd want to include both sys/ptrace.h and linux/ptrace.h,
  * hoping that most definitions come from either one or another.
@@ -75,8 +76,8 @@ typedef struct {
 
 extern int ptrace_suspend_seccomp(pid_t pid);
 
-extern int ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes);
-extern int ptrace_poke_area(pid_t pid, void *src, void *addr, long bytes);
-extern int ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes);
+extern int __must_check ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes);
+extern int __must_check ptrace_poke_area(pid_t pid, void *src, void *addr, long bytes);
+extern int __must_check ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes);
 
 #endif /* UAPI_COMPEL_PTRACE_H__ */
diff --git a/compel/include/uapi/sigframe-common.h b/compel/include/uapi/sigframe-common.h
index fc93c5480..177bf4c48 100644
--- a/compel/include/uapi/sigframe-common.h
+++ b/compel/include/uapi/sigframe-common.h
@@ -8,6 +8,7 @@
 # error "Direct inclusion is forbidden, use <compel/asm/sigframe.h> instead"
 #endif
 
+#include "common/compiler.h"
 #include <signal.h>
 #include <compel/plugins/std/asm/syscall-types.h>
 
@@ -56,7 +57,7 @@ struct rt_ucontext {
 	unsigned long		uc_regspace[128] __attribute__((aligned(8)));
 };
 
-extern int sigreturn_prep_fpu_frame(struct rt_sigframe *frame,
-				    struct rt_sigframe *rframe);
+extern int __must_check sigreturn_prep_fpu_frame(struct rt_sigframe *frame,
+						 struct rt_sigframe *rframe);
 
 #endif /* UAPI_COMPEL_SIGFRAME_COMMON_H__ */
diff --git a/compel/plugins/include/uapi/plugin-fds.h b/compel/plugins/include/uapi/plugin-fds.h
index cececb21d..e995b4b66 100644
--- a/compel/plugins/include/uapi/plugin-fds.h
+++ b/compel/plugins/include/uapi/plugin-fds.h
@@ -1,7 +1,7 @@
 #ifndef COMPEL_PLUGIN_STD_STD_H__
 #define COMPEL_PLUGIN_STD_STD_H__
 
-extern int fds_send_fd(int fd);
+extern int __must_check fds_send_fd(int fd);
 extern int fds_recv_fd(void);
 
 #endif /* COMPEL_PLUGIN_STD_STD_H__ */
diff --git a/compel/plugins/include/uapi/std/infect.h b/compel/plugins/include/uapi/std/infect.h
index 800df2509..1e784f8b4 100644
--- a/compel/plugins/include/uapi/std/infect.h
+++ b/compel/plugins/include/uapi/std/infect.h
@@ -1,14 +1,16 @@
 #ifndef COMPEL_PLUGIN_STD_INFECT_H__
 #define COMPEL_PLUGIN_STD_INFECT_H__
 
+#include "common/compiler.h"
+
 extern int parasite_get_rpc_sock(void);
-extern int parasite_service(unsigned int cmd, void *args);
+extern int __must_check parasite_service(unsigned int cmd, void *args);
 
 /*
  * Must be supplied by user plugins.
  */
-extern int parasite_daemon_cmd(int cmd, void *args);
-extern int parasite_trap_cmd(int cmd, void *args);
+extern int __must_check parasite_daemon_cmd(int cmd, void *args);
+extern int __must_check parasite_trap_cmd(int cmd, void *args);
 extern void parasite_cleanup(void);
 
 /*
diff --git a/compel/plugins/include/uapi/std/log.h b/compel/plugins/include/uapi/std/log.h
index f21b6df0d..91462c85b 100644
--- a/compel/plugins/include/uapi/std/log.h
+++ b/compel/plugins/include/uapi/std/log.h
@@ -2,6 +2,7 @@
 #define COMPEL_PLUGIN_STD_LOG_H__
 
 #include "compel/loglevels.h"
+#include "common/compiler.h"
 
 #define STD_LOG_SIMPLE_CHUNK	256
 
diff --git a/criu/seize.c b/criu/seize.c
index cce8911b9..e1e6b8195 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -483,7 +483,7 @@ static int collect_children(struct pstree_item *item)
 
 		if (!opts.freeze_cgroup)
 			/* fails when meets a zombie */
-			compel_interrupt_task(pid);
+			__ignore_value(compel_interrupt_task(pid));
 
 		ret = compel_wait_task(pid, item->pid->real, parse_pid_status, NULL, &creds.s, NULL);
 		if (ret < 0) {
diff --git a/include/common/compiler.h b/include/common/compiler.h
index fc8abcfef..1d431a529 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -22,6 +22,7 @@
 #define __used			__attribute__((__used__))
 #define __maybe_unused		__attribute__((unused))
 #define __always_unused		__attribute__((unused))
+#define __must_check		__attribute__((__warn_unused_result__))
 
 #define __section(S)		__attribute__ ((__section__(#S)))
 
@@ -99,4 +100,30 @@
 
 #define is_log2(v)		(((v) & ((v) - 1)) == 0)
 
+/*
+ * Use "__ignore_value" to avoid a warning when using a function declared with
+ * gcc's warn_unused_result attribute, but for which you really do want to
+ * ignore the result.  Traditionally, people have used a "(void)" cast to
+ * indicate that a function's return value is deliberately unused.  However,
+ * if the function is declared with __attribute__((warn_unused_result)),
+ * gcc issues a warning even with the cast.
+ *
+ * Caution: most of the time, you really should heed gcc's warning, and
+ * check the return value.  However, in those exceptional cases in which
+ * you're sure you know what you're doing, use this function.
+ *
+ * Normally casting an expression to void discards its value, but GCC
+ * versions 3.4 and newer have __attribute__ ((__warn_unused_result__))
+ * which may cause unwanted diagnostics in that case.  Use __typeof__
+ * and __extension__ to work around the problem, if the workaround is
+ * known to be needed.
+ * Written by Jim Meyering, Eric Blake and Pádraig Brady.
+ * (See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 for the details)
+ */
+#if 3 < __GNUC__ + (4 <= __GNUC_MINOR__)
+# define __ignore_value(x)	({ __typeof__ (x) __x = (x); (void) __x; })
+#else
+# define __ignore_value(x) ((void) (x))
+#endif
+
 #endif /* __CR_COMPILER_H__ */

From dc4677123ba03f93deab2d1ec6047d3a35ba694c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20C=C5=82api=C5=84ski?= <mclapinski@google.com>
Date: Wed, 6 Nov 2019 02:15:20 +0100
Subject: [PATCH 0069/1854] Checkpoint only specified controllers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this change CRIU would checkpoint all controllers, even the ones
not specified in --cgroup-dump-controller. That becomes a problem if
there's a cgroup controller on the checkpointing machine that doesn't
exist on the restoring machine even if CRIU is instructed not to dump
that controller. After that change everything works as expected.

Signed-off-by: Michał Cłapiński <mclapinski@google.com>
---
 criu/proc_parse.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index d67392a12..fa7644992 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -2498,6 +2498,12 @@ int collect_controllers(struct list_head *cgroups, unsigned int *n_cgroups)
 			goto err;
 		}
 		*off = '\0';
+
+		if (cgp_should_skip_controller(controllers)) {
+			pr_debug("cg-prop: Skipping controller %s\n", controllers);
+			continue;
+		}
+
 		while (1) {
 			off = strchr(controllers, ',');
 			if (off)

From 8f45330d168df043c400593f2387a92e2b686ef8 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 17 Nov 2019 16:04:16 +0200
Subject: [PATCH 0070/1854] travis: group lazy-pages options

The amount of lazy-pages options keeps growing, let's put the common ones
into a variable.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 scripts/travis/travis-tests | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index bc97fd455..a87ddbaf4 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -146,10 +146,11 @@ fi
 LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps04"
 
 LAZY_TESTS=.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*
+LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 
-./test/zdtm.py run -p 2 -T $LAZY_TESTS --lazy-pages $LAZY_EXCLUDE $ZDTM_OPTS
-./test/zdtm.py run -p 2 -T $LAZY_TESTS --remote-lazy-pages $LAZY_EXCLUDE $ZDTM_OPTS
-./test/zdtm.py run -p 2 -T $LAZY_TESTS --remote-lazy-pages --tls $LAZY_EXCLUDE $ZDTM_OPTS
+./test/zdtm.py run $LAZY_OPTS --lazy-pages
+./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages
+./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
 
 bash ./test/jenkins/criu-fault.sh
 bash ./test/jenkins/criu-fcg.sh

From 75fcec0ecbccea5b8258def25adb056e4d02c0c1 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 17 Nov 2019 16:05:47 +0200
Subject: [PATCH 0071/1854] travis: exclude uns tests for lazy-pages on newer
 kernels

Kernels 5.4 and higher will restrict availability of UFFD_EVENT_FORK only
for users with SYS_CAP_PTRACE. This prevents running --lazy-pages tests
with 'uns' flavor.

Disable 'uns' for lazy pages testing in travis for newer kernels.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 scripts/travis/travis-tests | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index a87ddbaf4..4cb842c97 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -145,8 +145,15 @@ else
 fi
 LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps04"
 
+# Starting with 5.4 kernel requires SYS_CAP_PTRACE to use uffd events; as such
+# we cannot run lazy-pages tests in uns
+LAZY_FLAVORS=""
+if [ $KERN_MAJ -ge "5" ] && [ $KERN_MIN -ge "4" ]; then
+    LAZY_FLAVORS = "-f h,ns"
+fi
+
 LAZY_TESTS=.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*
-LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
+LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $LAZY_FLAVORS $ZDTM_OPTS"
 
 ./test/zdtm.py run $LAZY_OPTS --lazy-pages
 ./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages

From b50b6ea09e7a80b91f2bdeb0b5cd444b0ae800ca Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 3 Nov 2019 20:18:38 +0000
Subject: [PATCH 0072/1854] mount: Add error messages

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/mount.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 974af6eb2..6b1adecc6 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1325,8 +1325,10 @@ int ns_open_mountpoint(void *arg)
 	}
 
 	/* Remount all mounts as private to disable propagation */
-	if (mount("none", "/", NULL, MS_REC|MS_PRIVATE, NULL))
+	if (mount("none", "/", NULL, MS_REC|MS_PRIVATE, NULL)) {
+		pr_perror("Unable to remount");
 		goto err;
+	}
 
 	if (umount_overmounts(mi))
 		goto err;
@@ -1536,6 +1538,7 @@ static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_
 
 	ret = mount(source, target, type, 0, NULL);
 	if (ret < 0) {
+		pr_perror("Unable to mount %s %s", source, target);
 		exit_code = -errno;
 		goto restore_ns;
 	} else {
@@ -2004,7 +2007,10 @@ static int fetch_rt_stat(struct mount_info *m, const char *where)
 static int do_simple_mount(struct mount_info *mi, const char *src, const
 			   char *fstype, unsigned long mountflags)
 {
-	return mount(src, mi->mountpoint, fstype, mountflags, mi->options);
+	int ret = mount(src, mi->mountpoint, fstype, mountflags, mi->options);
+	if (ret)
+		pr_perror("Unable to mount %s %s (id=%d)", src, mi->mountpoint, mi->mnt_id);
+	return ret;
 }
 
 static char *mnt_fsname(struct mount_info *mi)
@@ -2491,8 +2497,11 @@ static int do_mount_one(struct mount_info *mi)
 		}
 
 		/* do_mount_root() is called from populate_mnt_ns() */
-		if (mount(opts.root, mi->mountpoint, NULL, MS_BIND | MS_REC, NULL))
+		if (mount(opts.root, mi->mountpoint, NULL, MS_BIND | MS_REC, NULL)) {
+			pr_perror("Unable to mount %s %s (id=%d)", opts.root, mi->mountpoint, mi->mnt_id);
 			return -1;
+		}
+
 		if (do_mount_root(mi))
 			return -1;
 		mi->mounted = true;

From d99ee9753e90df1040dc49341a38357e58d838ee Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 9 Nov 2019 22:48:32 +0000
Subject: [PATCH 0073/1854] mount: Bind-mount root via userns_call

When restoring a runc container with enabled user namespace CRIU fails
to mount the specified root directory because the path is under
/run/runc which is inaccessible to unprivileged users.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/mount.c | 51 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 6b1adecc6..52e70d376 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2020,20 +2020,20 @@ static char *mnt_fsname(struct mount_info *mi)
 	return mi->fstype->name;
 }
 
-static int apply_sb_flags(void *args, int fd, pid_t pid)
+static int userns_mount(char *src, void *args, int fd, pid_t pid)
 {
 	unsigned long flags = *(unsigned long *) args;
 	int rst = -1, err = -1;
-	char path[PSFDS];
+	char target[PSFDS];
 
-	snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+	snprintf(target, sizeof(target), "/proc/self/fd/%d", fd);
 
 	if (pid != getpid() && switch_ns(pid, &mnt_ns_desc, &rst))
 		return -1;
 
-	err = mount(NULL, path, NULL, MS_REMOUNT | flags, NULL);
+	err = mount(src, target, NULL, flags, NULL);
 	if (err)
-		pr_perror("Unable to remount %s", path);
+		pr_perror("Unable to mount %s", target);
 
 	if (rst >= 0 &&	restore_ns(rst, &mnt_ns_desc))
 		return -1;
@@ -2041,6 +2041,16 @@ static int apply_sb_flags(void *args, int fd, pid_t pid)
 	return err;
 }
 
+static int apply_sb_flags(void *args, int fd, pid_t pid)
+{
+	return userns_mount(NULL, args, fd, pid);
+}
+
+static int mount_root(void *args, int fd, pid_t pid)
+{
+	return userns_mount(opts.root, args, fd, pid);
+}
+
 static int do_new_mount(struct mount_info *mi)
 {
 	unsigned long sflags = mi->sb_flags;
@@ -2088,10 +2098,9 @@ static int do_new_mount(struct mount_info *mi)
 			pr_perror("Unable to open %s", mi->mountpoint);
 			return -1;
 		}
-		sflags |= MS_RDONLY;
-		if (userns_call(apply_sb_flags, 0,
-				&sflags, sizeof(sflags), fd)) {
-			pr_perror("Unable to apply mount flags %d for %s",
+		sflags |= MS_RDONLY | MS_REMOUNT;
+		if (userns_call(apply_sb_flags, 0, &sflags, sizeof(sflags), fd)) {
+			pr_err("Unable to apply mount flags %d for %s",
 						mi->sb_flags, mi->mountpoint);
 			close(fd);
 			return -1;
@@ -2491,15 +2500,33 @@ static int do_mount_one(struct mount_info *mi)
 	pr_debug("\tMounting %s @%s (%d)\n", mi->fstype->name, mi->mountpoint, mi->need_plugin);
 
 	if (rst_mnt_is_root(mi)) {
+		int fd;
+		unsigned long flags = MS_BIND | MS_REC;
+
 		if (opts.root == NULL) {
 			pr_err("The --root option is required to restore a mount namespace\n");
 			return -1;
 		}
 
 		/* do_mount_root() is called from populate_mnt_ns() */
-		if (mount(opts.root, mi->mountpoint, NULL, MS_BIND | MS_REC, NULL)) {
-			pr_perror("Unable to mount %s %s (id=%d)", opts.root, mi->mountpoint, mi->mnt_id);
-			return -1;
+		if (root_ns_mask & CLONE_NEWUSER) {
+			fd = open(mi->mountpoint, O_PATH);
+			if (fd < 0) {
+				pr_perror("Unable to open %s", mi->mountpoint);
+				return -1;
+			}
+
+			if (userns_call(mount_root, 0, &flags, sizeof(flags), fd)) {
+				pr_err("Unable to mount %s\n", mi->mountpoint);
+				close(fd);
+				return -1;
+			}
+			close(fd);
+		} else {
+			if (mount(opts.root, mi->mountpoint, NULL, flags, NULL)) {
+				pr_perror("Unable to mount %s %s (id=%d)", opts.root, mi->mountpoint, mi->mnt_id);
+				return -1;
+			}
 		}
 
 		if (do_mount_root(mi))

From 8ab3e40e3e45a4e0337c6715c923fb640e2e8973 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 10 Nov 2019 07:35:50 +0000
Subject: [PATCH 0074/1854] restore: Create temp proc in /tmp

When restoring a container with user namespace, CRIU fails to create
a temporary directory for proc. The is because the unprivileged user
that has been just restored does not have permissions to access the
working directory used by CRIU.

Resolves #828

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 05a25835a..5694931f4 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1588,7 +1588,7 @@ static void restore_pgid(void)
 static int mount_proc(void)
 {
 	int fd, ret;
-	char proc_mountpoint[] = "crtools-proc.XXXXXX";
+	char proc_mountpoint[] = "/tmp/crtools-proc.XXXXXX";
 
 	if (root_ns_mask == 0)
 		fd = ret = open("/proc", O_DIRECTORY);

From 9a50fbce72228404c29642af70af7b42fbc60a7b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 3 Nov 2019 20:35:18 +0000
Subject: [PATCH 0075/1854] man: Describe --root option requirements

These requirements have been described in

https://github.com/opencontainers/runc/blob/b133feae/libcontainer/container_linux.go#L1265

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 Documentation/criu.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 2729bc95a..133a094c0 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -414,6 +414,8 @@ usually need to be escaped from shell.
 
 *-r*, *--root* 'path'::
     Change the root filesystem to 'path' (when run in a mount namespace).
+    This option is required to restore a mount namespace. The directory
+    'path' must be a mount point and its parent must not be overmounted.
 
 *--external* 'type'*[*'id'*]:*'value'::
     Restore an instance of an external resource. The generic syntax is

From 90cbeadb668d99f9d9557cee7a4c67e593f6e7ad Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Tue, 19 Nov 2019 22:10:39 +0000
Subject: [PATCH 0076/1854] zdtm: Replace if->continue with if->elif->else

Replacing the if->continue pattern with if->elif->else
reduces the number of lines while preserving the logic.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 test/zdtm.py | 63 ++++++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 6d3fddfad..17e0540eb 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -867,76 +867,57 @@ class criu_rpc:
     def __set_opts(criu, args, ctx):
         while len(args) != 0:
             arg = args.pop(0)
-            if arg == '-v4':
+            if "-v4" == arg:
                 criu.opts.log_level = 4
-                continue
-            if arg == '-o':
+            elif "-o" == arg:
                 criu.opts.log_file = args.pop(0)
-                continue
-            if arg == '-D':
+            elif "-D" == arg:
                 criu.opts.images_dir_fd = os.open(args.pop(0), os.O_DIRECTORY)
                 ctx['imgd'] = criu.opts.images_dir_fd
-                continue
-            if arg == '-t':
+            elif "-t" == arg:
                 criu.opts.pid = int(args.pop(0))
-                continue
-            if arg == '--pidfile':
+            elif "--pidfile" == arg:
                 ctx['pidf'] = args.pop(0)
-                continue
-            if arg == '--timeout':
+            elif "--timeout" == arg:
                 criu.opts.timeout = int(args.pop(0))
-                continue
-            if arg == '--restore-detached':
-                # Set by service by default
-                ctx['rd'] = True
-                continue
-            if arg == '--root':
+            elif "--restore-detached" == arg:
+                ctx['rd'] = True  # Set by service by default
+            elif "--root" == arg:
                 criu.opts.root = args.pop(0)
-                continue
-            if arg == '--external':
+            elif "--external" == arg:
                 criu.opts.external.append(args.pop(0))
-                continue
-            if arg == '--status-fd':
+            elif "--status-fd" == arg:
                 fd = int(args.pop(0))
                 os.write(fd, b"\0")
                 fcntl.fcntl(fd, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-                continue
-            if arg == '--port':
+            elif "--port" == arg:
                 criu.opts.ps.port = int(args.pop(0))
-                continue
-            if arg == '--address':
+            elif "--address" == arg:
                 criu.opts.ps.address = args.pop(0)
+            elif "--page-server" == arg:
                 continue
-            if arg == '--page-server':
-                continue
-            if arg == '--prev-images-dir':
+            elif "--prev-images-dir" == arg:
                 criu.opts.parent_img = args.pop(0)
-                continue
-            if arg == '--pre-dump-mode':
+            elif "--pre-dump-mode" == arg:
                 key = args.pop(0)
                 mode = crpc.rpc.VM_READ
                 if key == "splice":
                     mode = crpc.rpc.SPLICE
                 criu.opts.pre_dump_mode = mode
-                continue
-            if arg == '--track-mem':
+            elif "--track-mem" == arg:
                 criu.opts.track_mem = True
-                continue
-            if arg == '--tcp-established':
+            elif "--tcp-established" == arg:
                 criu.opts.tcp_established = True
-                continue
-            if arg == '--restore-sibling':
+            elif "--restore-sibling" == arg:
                 criu.opts.rst_sibling = True
-                continue
-            if arg == "--inherit-fd":
+            elif "--inherit-fd" == arg:
                 inhfd = criu.opts.inherit_fd.add()
                 key = args.pop(0)
                 fd, key = key.split(":", 1)
                 inhfd.fd = int(fd[3:-1])
                 inhfd.key = key
-                continue
-
-            raise test_fail_exc('RPC for %s(%s) required' % (arg, args.pop(0)))
+            else:
+                raise test_fail_exc('RPC for %s(%s) required' % (arg, args.pop(0)))
 
     @staticmethod
     def run(action,

From 60bb5c731078ad15b3d9e62782d692d91c5c2db0 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 19 Nov 2019 22:48:44 +0000
Subject: [PATCH 0077/1854] zdtm: Set --root path to 0700 on restore

Update zdtm tests to verify that CRIU does not require the --root
path to be accessible to the unprivileged user being restored when
restoring user namespace.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 test/zdtm.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 17e0540eb..16ff0b379 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -62,6 +62,7 @@ tests_root = None
 def clean_tests_root():
     global tests_root
     if tests_root and tests_root[0] == os.getpid():
+        os.rmdir(os.path.join(tests_root[1], "root"))
         os.rmdir(tests_root[1])
 
 
@@ -70,7 +71,9 @@ def make_tests_root():
     if not tests_root:
         tests_root = (os.getpid(), tempfile.mkdtemp("", "criu-root-", "/tmp"))
         atexit.register(clean_tests_root)
-    return tests_root[1]
+        os.mkdir(os.path.join(tests_root[1], "root"))
+    os.chmod(tests_root[1], 0o777)
+    return os.path.join(tests_root[1], "root")
 
 
 # Report generation
@@ -483,6 +486,13 @@ class zdtm_test:
             # move into some semi-random state
             time.sleep(random.random())
 
+        if self.__flavor.ns:
+            # In the case of runc the path specified with the opts.root
+            # option is created in /run/runc/ which is inaccessible to
+            # unprivileged users. The permissions here are set to test
+            # this use case.
+            os.chmod(os.path.dirname(self.__flavor.root), 0o700)
+
     def kill(self, sig=signal.SIGKILL):
         self.__freezer.thaw()
         if self.__pid:

From 25f6d4f72fb995cb776d65a9d4d539d4fdcc6740 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:34 +0000
Subject: [PATCH 0078/1854] build: Remove SRCARCH

SRCARCH is always equal ARCH. There are no rules when to use one or
another and architectures may forget to set one of them up.

No need for a second variable meaning the same and confusing people.
Remove it completely.

Self-correction [after some debug]: SRCARCH was different in one place:
zdtm Makefile by some unintentional mistake:
> ifeq ($(ARCH),arm64)
>         ARCH		?= aarch64
>         SRCARCH	?= aarch64
> endif

That meant to be "ARCH := aarch64" because "?=" would never work inside
that ifeq. Fix up this part of mess too.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile                  | 3 +--
 Makefile.config           | 2 +-
 compel/plugins/Makefile   | 4 ++--
 criu/Makefile             | 2 +-
 criu/pie/Makefile         | 6 +++---
 criu/pie/Makefile.library | 4 ++--
 test/zdtm/Makefile.inc    | 7 ++-----
 test/zdtm/static/Makefile | 4 ++--
 8 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index f827e7baa..2e62f6f39 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,6 @@ endif
 # commit "S/390: Fix 64 bit sibcall".
 ifeq ($(ARCH),s390)
         ARCH		:= s390
-        SRCARCH		:= s390
         DEFINES		:= -DCONFIG_S390
         CFLAGS_PIE	:= -fno-optimize-sibling-calls
 endif
@@ -94,7 +93,7 @@ endif
 CFLAGS_PIE		+= -DCR_NOGLIBC
 export CFLAGS_PIE
 
-LDARCH ?= $(SRCARCH)
+LDARCH ?= $(ARCH)
 export LDARCH
 export PROTOUFIX DEFINES
 
diff --git a/Makefile.config b/Makefile.config
index 1e4352b9d..5af3fed38 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -30,7 +30,7 @@ CONFIG_FILE = .config
 $(CONFIG_FILE):
 	touch $(CONFIG_FILE)
 
-ifeq ($(SRCARCH),x86)
+ifeq ($(ARCH),x86)
 # CONFIG_COMPAT is only for x86 now, no need for compile-test other archs
 ifeq ($(call try-asm,$(FEATURE_TEST_X86_COMPAT)),true)
         export CONFIG_COMPAT := y
diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index a326e2a66..197ff1b24 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -53,11 +53,11 @@ std-lib-y		+= ./$(PLUGIN_ARCH_DIR)/std/parasite-head.o
 target			+= fds
 fds-lib-y		+= fds/fds.o
 
-ifeq ($(SRCARCH),x86)
+ifeq ($(ARCH),x86)
 	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
 endif
 
-ifeq ($(SRCARCH),ppc64)
+ifeq ($(ARCH),ppc64)
 	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
 	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcmp.o
 endif
diff --git a/criu/Makefile b/criu/Makefile
index 4134e5052..ceb49ce09 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -2,7 +2,7 @@
 # 6a8d90f5fec4 "attr: Allow attribute type 0"
 WRAPFLAGS		+= -Wl,--wrap=nla_parse,--wrap=nlmsg_parse
 
-ARCH_DIR		:= criu/arch/$(SRCARCH)
+ARCH_DIR		:= criu/arch/$(ARCH)
 PIE_DIR			:= criu/pie
 export ARCH_DIR PIE_DIR
 
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 1ad456f43..a30747ac3 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -14,7 +14,7 @@ ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
         compel_plugins	:= $(shell $(COMPEL_BIN) plugins)
 endif
 
-LDS		:= compel/arch/$(SRCARCH)/scripts/compel-pack.lds.S
+LDS		:= compel/arch/$(ARCH)/scripts/compel-pack.lds.S
 
 restorer-obj-y	+= parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
 restorer-obj-y	+= ./$(ARCH_DIR)/restorer.o
@@ -26,11 +26,11 @@ ifeq ($(ARCH),x86)
         endif
 endif
 
-ifeq ($(SRCARCH),aarch64)
+ifeq ($(ARCH),aarch64)
         restorer-obj-y	+= ./$(ARCH_DIR)/intraprocedure.o
 endif
 
-ifeq ($(SRCARCH),ppc64)
+ifeq ($(ARCH),ppc64)
         restorer-obj-y	+= ./$(ARCH_DIR)/vdso-trampoline.o
 endif
 
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index 658c8a4eb..de75b11d4 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -9,14 +9,14 @@ lib-name		:= pie.lib.a
 lib-y			+= util.o
 lib-y			+= util-vdso.o
 
-ifeq ($(SRCARCH),x86)
+ifeq ($(ARCH),x86)
         ifeq ($(CONFIG_COMPAT),y)
                 lib-y	+= util-vdso-elf32.o
         endif
         CFLAGS_util-vdso-elf32.o	+= -DCONFIG_VDSO_32
 endif
 
-ifeq ($(SRCARCH),arm)
+ifeq ($(ARCH),arm)
         lib-y		+= ./$(ARCH_DIR)/aeabi-helpers.o
         lib-y		+= ./$(ARCH_DIR)/pie-cacheflush.o
 endif
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 170f31632..d5c013a3e 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -15,12 +15,9 @@ ARCH ?= $(shell uname -m | sed          \
                 -e s/aarch64.*/arm64/)
 
 ifeq ($(ARCH),arm64)
-        ARCH		?= aarch64
-        SRCARCH		?= aarch64
+        ARCH	:= aarch64
 endif
 
-SRCARCH ?= $(ARCH)
-
 ifeq ($(ARCH),arm)
 	ARMV := $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 
@@ -35,7 +32,7 @@ CC	:= gcc
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= $(USERCFLAGS)
 CFLAGS	+= -D_GNU_SOURCE
-CPPFLAGS += -iquote $(LIBDIR)/arch/$(SRCARCH)/include
+CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
 
 ifeq ($(strip $(V)),)
 	E = @echo
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a38482f44..e0d4d2c5c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -219,13 +219,13 @@ TST_NOFILE	:=				\
 		child_subreaper_and_reparent	\
 #		jobctl00			\
 
-ifneq ($(SRCARCH),arm)
+ifneq ($(ARCH),arm)
 ifneq ($(COMPAT_TEST),y)
         TST_NOFILE += maps03
 endif
 endif
 
-ifeq ($(SRCARCH),s390)
+ifeq ($(ARCH),s390)
         TST_NOFILE +=	s390x_regs_check	\
 			s390x_gs_threads	\
 			s390x_runtime_instr

From a4fa4162d410c0bbc751d92119022f9a1c3a6723 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:35 +0000
Subject: [PATCH 0079/1854] build/nmk: Remove SRCARCH

It's not used anywhere now.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/nmk/scripts/include.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
index e1701103f..ee0e32f62 100644
--- a/scripts/nmk/scripts/include.mk
+++ b/scripts/nmk/scripts/include.mk
@@ -22,9 +22,8 @@ SUBARCH := $(shell uname -m | sed       \
                 -e s/aarch64.*/aarch64/)
 
 ARCH		?= $(SUBARCH)
-SRCARCH 	:= $(ARCH)
 
-export SUBARCH ARCH SRCARCH
+export SUBARCH ARCH
 
 ifndef ____nmk_defined__tools
         include $(__nmk_dir)tools.mk

From df66aa99b6ce59108055759d5ebda69e2fd00669 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:36 +0000
Subject: [PATCH 0080/1854] build/nmk: Provide proper SUBARCH

It's always equal ARCH and not very useful (so nothing actually uses it).
Time for a change: SUBARCH now is meaningful and gives a way to detect
what kind of ARCH flavor build is dealing with.

Also, for cross-compiling sake don't set SUBARCH if the user supplied it.
(and don't call useless uname during cross compilation)

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/nmk/scripts/include.mk | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
index ee0e32f62..c1c1e94af 100644
--- a/scripts/nmk/scripts/include.mk
+++ b/scripts/nmk/scripts/include.mk
@@ -8,21 +8,20 @@ endif
 
 #
 # Common vars.
-SUBARCH := $(shell uname -m | sed       \
-                -e s/i.86/x86/          \
-                -e s/x86_64/x86/        \
-                -e s/sun4u/sparc64/     \
-                -e s/arm.*/arm/         \
-                -e s/sa110/arm/         \
-                -e s/s390x/s390/        \
-                -e s/parisc64/parisc/   \
-                -e s/ppc64.*/ppc64/     \
-                -e s/mips.*/mips/       \
-                -e s/sh[234].*/sh/      \
+SUBARCH ?= $(shell uname -m)
+ARCH	?= $(shell echo $(SUBARCH) | sed	\
+                -e s/i.86/x86/			\
+                -e s/x86_64/x86/		\
+                -e s/sun4u/sparc64/		\
+                -e s/arm.*/arm/			\
+                -e s/sa110/arm/			\
+                -e s/s390x/s390/		\
+                -e s/parisc64/parisc/		\
+                -e s/ppc64.*/ppc64/		\
+                -e s/mips.*/mips/		\
+                -e s/sh[234].*/sh/		\
                 -e s/aarch64.*/aarch64/)
 
-ARCH		?= $(SUBARCH)
-
 export SUBARCH ARCH
 
 ifndef ____nmk_defined__tools

From 1463c41119c8eef8ccf135e71359f579e821a21e Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:37 +0000
Subject: [PATCH 0081/1854] build: Use SUBARCH

Instead of doing additional `uname -m` - use provided $(SUBARCH) to detect
what architecture flavour the build should produce the result for.

Fixes two things:
- zdtm make now correctly supplies $(USERCFLAGS)
- subtly fixes cross compilation by providing a way to specify $(SUBARCH)

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile               |  6 ++----
 test/zdtm/Makefile.inc | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 2e62f6f39..ef76d706c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,6 @@ ifeq ($(origin HOSTCFLAGS), undefined)
         HOSTCFLAGS := $(CFLAGS) $(USERCFLAGS)
 endif
 
-UNAME-M := $(shell uname -m)
-
 #
 # Supported Architectures
 ifneq ($(filter-out x86 arm aarch64 ppc64 s390,$(ARCH)),)
@@ -27,14 +25,14 @@ endif
 
 # The PowerPC 64 bits architecture could be big or little endian.
 # They are handled in the same way.
-ifeq ($(UNAME-M),ppc64)
+ifeq ($(SUBARCH),ppc64)
         error := $(error ppc64 big endian is not yet supported)
 endif
 
 #
 # Architecture specific options.
 ifeq ($(ARCH),arm)
-        ARMV		:= $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
+        ARMV		:= $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 
         ifeq ($(ARMV),6)
                 USERCFLAGS += -march=armv6
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index d5c013a3e..7584d3b06 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -1,17 +1,18 @@
 .SUFFIXES:
 MAKEFLAGS	+= -r
 
-ARCH ?= $(shell uname -m | sed          \
-                -e s/i.86/x86/          \
-                -e s/x86_64/x86/        \
-                -e s/sun4u/sparc64/     \
-                -e s/arm.*/arm/         \
-                -e s/sa110/arm/         \
-                -e s/s390x/s390/        \
-                -e s/parisc64/parisc/   \
-                -e s/ppc64.*/ppc64/     \
-                -e s/mips.*/mips/       \
-                -e s/sh[234].*/sh/      \
+SUBARCH ?= $(shell uname -m)
+ARCH	?= $(shell echo $(SUBARCH) | sed	\
+                -e s/i.86/x86/			\
+                -e s/x86_64/x86/		\
+                -e s/sun4u/sparc64/		\
+                -e s/arm.*/arm/			\
+                -e s/sa110/arm/			\
+                -e s/s390x/s390/		\
+                -e s/parisc64/parisc/		\
+                -e s/ppc64.*/ppc64/		\
+                -e s/mips.*/mips/		\
+                -e s/sh[234].*/sh/		\
                 -e s/aarch64.*/arm64/)
 
 ifeq ($(ARCH),arm64)
@@ -19,7 +20,7 @@ ifeq ($(ARCH),arm64)
 endif
 
 ifeq ($(ARCH),arm)
-	ARMV := $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
+	ARMV := $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 
 	ifeq ($(ARMV),6)
 		USERCFLAGS += -march=armv6

From 70fae12509d7e0448e00fa0b0aa3a94b2384025f Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:38 +0000
Subject: [PATCH 0082/1854] build/zdtm: Support cross-build

Maybe not that useful, but only little change needed.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/Makefile.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 7584d3b06..8f2650b44 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -29,7 +29,10 @@ ifeq ($(ARCH),arm)
 	endif
 endif
 
-CC	:= gcc
+HOSTCC	?= gcc
+ifeq ($(origin CC), default)
+        CC := $(CROSS_COMPILE)$(HOSTCC)
+endif
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= $(USERCFLAGS)
 CFLAGS	+= -D_GNU_SOURCE

From 3b24574b6d48b386127386b18036767a89ad6d0f Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:39 +0000
Subject: [PATCH 0083/1854] build/zdtm: Makefile hack for travis aarch64/armv8l

The very same hack to build aarch32 zdtm tests on armv8 Travis-CI
as in the commit dfa0a1edcbcb ("Makefile hack for travis
aarch64/armv8l")

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/Makefile.inc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 8f2650b44..d132ca981 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -20,13 +20,17 @@ ifeq ($(ARCH),arm64)
 endif
 
 ifeq ($(ARCH),arm)
-	ARMV := $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
+        ARMV := $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 
-	ifeq ($(ARMV),6)
-		USERCFLAGS += -march=armv6
-	else ifeq ($(ARMV),7)
-		USERCFLAGS += -march=armv7-a
-	endif
+        ifeq ($(ARMV),6)
+                USERCFLAGS += -march=armv6
+        else ifeq ($(ARMV),7)
+                USERCFLAGS += -march=armv7-a
+        else ifeq ($(ARMV),8)
+                # To build aarch32 on armv8 Travis-CI (see criu Makefile)
+                USERCFLAGS += -march=armv7-a
+                ARMV := 7
+        endif
 endif
 
 HOSTCC	?= gcc

From bffa6e0ad005a3e125b9b6c3da527a929ed18c79 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:40 +0000
Subject: [PATCH 0084/1854] build/zdtm: Use pkg-config to find includes/libs

Helps to cross-compile zdtm tests in case somebody needs it.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/Makefile.inc    | 13 +++++++++++++
 test/zdtm/static/Makefile |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index d132ca981..32fc72d32 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -53,12 +53,25 @@ endif
 RM := rm -f --one-file-system
 
 ifeq ($(COMPAT_TEST),y)
+        # Firstly look for 32-bit libs and then in standard path.
+        PKG_CONFIG_PATH := $(shell pkg-config --variable pc_path pkg-config)
+        PKG_CONFIG_PATH := /usr/lib32/pkgconfig:$(PKG_CONFIG_PATH)
 ifeq ($(ARCH),x86)
         export CFLAGS += -m32
         export LDFLAGS += -m32
+        PKG_CONFIG_PATH := /usr/lib/i386-linux-gnu/pkgconfig:$(PKG_CONFIG_PATH)
 endif
+        export PKG_CONFIG_PATH
 endif
 
+define pkg-libs
+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --libs $(1))
+endef
+
+define pkg-cflags
+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --cflags $(1))
+endef
+
 %.d: %.c
 	$(E) " DEP      " $@
 	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -MM -MP -c $< -o $@
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index e0d4d2c5c..36d00ca5c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -528,8 +528,8 @@ stopped12:		CFLAGS += -DZDTM_STOPPED_KILL -DZDTM_STOPPED_TKILL
 clone_fs:		LDLIBS += -pthread
 # As generating dependencies won't work without proper includes,
 # we have to explicitly specify both .o and .d for this case:
-netns_sub_veth.o netns_sub_veth.d:	CPPFLAGS += -I/usr/include/libnl3
-netns_sub_veth:		LDLIBS += -lnl-3 -l nl-route-3
+netns_sub_veth.o netns_sub_veth.d: CPPFLAGS += $(call pkg-cflags, libnl-3.0)
+netns_sub_veth:		LDLIBS += $(call pkg-libs, libnl-route-3.0 libnl-3.0)
 
 socket-tcp-fin-wait1:	CFLAGS += -D ZDTM_TCP_FIN_WAIT1
 socket-tcp-fin-wait2:	CFLAGS += -D ZDTM_TCP_FIN_WAIT2

From 1dbc835954d9c27ad1edb8184c02cfea1fd414b1 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:41 +0000
Subject: [PATCH 0085/1854] travis: Add armv7-cross as cross-compile test

Fixes: #455
Based-on-patch-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .travis.yml                          |  4 +++
 scripts/build/Dockerfile.armv7-cross | 44 ++++++++++++++++++++++++++++
 scripts/build/Makefile               |  1 +
 3 files changed, 49 insertions(+)
 create mode 100644 scripts/build/Dockerfile.armv7-cross

diff --git a/.travis.yml b/.travis.yml
index f6f71be48..b27dbfe7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,6 +73,10 @@ matrix:
       arch: amd64
       env: TR_ARCH=fedora-asan
       dist: xenial # test hangs on bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=armv7-cross
+      dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=fedora-rawhide
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
new file mode 100644
index 000000000..434934aad
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-cross
@@ -0,0 +1,44 @@
+FROM dockcross/base:latest
+
+# Add the cross compiler sources
+RUN echo "deb http://ftp.us.debian.org/debian/ jessie main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture armhf && \
+  apt-get install emdebian-archive-keyring
+
+RUN apt-get update && apt-get install -y \
+	crossbuild-essential-armhf	\
+	libbz2-dev:armhf		\
+	libexpat1-dev:armhf		\
+	ncurses-dev:armhf		\
+	libssl-dev:armhf		\
+	protobuf-c-compiler		\
+	protobuf-compiler		\
+	python-protobuf			\
+	libnl-3-dev:armhf		\
+	libprotobuf-dev:armhf		\
+	libnet-dev:armhf		\
+	libprotobuf-c-dev:armhf		\
+	libcap-dev:armhf		\
+	libaio-dev:armhf		\
+	libnl-route-3-dev:armhf
+
+ENV CROSS_TRIPLE=arm-linux-gnueabihf
+ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
+	AS=/usr/bin/${CROSS_TRIPLE}-as				\
+	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
+	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
+	ARCH=arm						\
+	SUBARCH=armv7
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index a7c78e8bd..d093ce76c 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -2,6 +2,7 @@ ARCHES := x86_64 fedora-asan fedora-rawhide centos armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
+TARGETS += armv7-cross
 
 all: $(TARGETS) $(TARGETS_CLANG)
 .PHONY: all

From 434e6b92dbcd47354f02e3a992ead6c25a6db16f Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:42 +0000
Subject: [PATCH 0086/1854] Documentation: Add a hint about docker build

The original/old guide probably doesn't work anymore:
- the patch isn't accessible;
- criu now depends on more libraries not only protobuf

Still, keep it as it might be helpful for someone.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Documentation/HOWTO.cross-compile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Documentation/HOWTO.cross-compile b/Documentation/HOWTO.cross-compile
index f1b17842b..44b19dfea 100644
--- a/Documentation/HOWTO.cross-compile
+++ b/Documentation/HOWTO.cross-compile
@@ -1,4 +1,10 @@
-This HOWTO explains how to cross-compile CRIU on x86
+How to cross-compile CRIU on x86:
+
+Use the Dockerfile provided:
+   scripts/build/Dockerfile.armv7-cross
+
+Historical guide how-to do it without docker container:
+[Unsupported, may not work anymore!]
 
  1. Download the protobuf sources.
  2. Apply the patch http://16918.selcdn.ru/crtools/aarch64/0001-protobuf-added-the-support-for-the-acrchitecture-AAr.patch

From 6ab2bdd940c392ba58ebe68b5134d6327381a498 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 21 Nov 2019 21:56:43 +0000
Subject: [PATCH 0087/1854] zdtm/socket-tcp-fin-wait1: Use array index fro
 TEST_MSG

Fixes the following compile-error:
>  CC        socket-tcp-fin-wait1.o
> socket-tcp-fin-wait1.c:144:26: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int]
>                 if (write(fd, TEST_MSG + 2, sizeof(TEST_MSG) - 2) != sizeof(TEST_MSG) - 2) {
>                               ~~~~~~~~~^~~
> socket-tcp-fin-wait1.c:144:26: note: use array indexing to silence this warning
>                 if (write(fd, TEST_MSG + 2, sizeof(TEST_MSG) - 2) != sizeof(TEST_MSG) - 2) {
>                                        ^
>                               &        [  ]
> 1 error generated.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/socket-tcp-fin-wait1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/socket-tcp-fin-wait1.c b/test/zdtm/static/socket-tcp-fin-wait1.c
index 6c7cc93e5..50da9c152 100644
--- a/test/zdtm/static/socket-tcp-fin-wait1.c
+++ b/test/zdtm/static/socket-tcp-fin-wait1.c
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if (write(fd, TEST_MSG + 2, sizeof(TEST_MSG) - 2) != sizeof(TEST_MSG) - 2) {
+		if (write(fd, &TEST_MSG[2], sizeof(TEST_MSG) - 2) != sizeof(TEST_MSG) - 2) {
 			pr_err("write");
 			return 1;
 		}

From 37220b3c418d8d09ff2ef147e94c37fc897b3e27 Mon Sep 17 00:00:00 2001
From: Nidhi Gupta <itsnidhi16@gmail.com>
Date: Thu, 7 Nov 2019 14:38:42 +0530
Subject: [PATCH 0088/1854] Add File-based Java Functional Tests

Signed-off-by: Nidhi Gupta <itsnidhi16@gmail.com>
---
 test/javaTests/README.md                      |   8 +
 .../criu/java/tests/CheckpointRestore.java    |   4 +-
 .../src/org/criu/java/tests/FileRead.java     |   2 +-
 .../src/org/criu/java/tests/Helper.java       |  39 +++-
 .../org/criu/java/tests/MemoryMappings.java   | 121 +++++++++++
 .../org/criu/java/tests/MultipleFileRead.java | 203 ++++++++++++++++++
 .../criu/java/tests/MultipleFileWrite.java    | 140 ++++++++++++
 .../src/org/criu/java/tests/ReadWrite.java    | 119 ++++++++++
 test/javaTests/test.xml                       |  30 +++
 9 files changed, 659 insertions(+), 7 deletions(-)
 create mode 100644 test/javaTests/src/org/criu/java/tests/MemoryMappings.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/MultipleFileRead.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/MultipleFileWrite.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/ReadWrite.java

diff --git a/test/javaTests/README.md b/test/javaTests/README.md
index cb779285e..670741677 100644
--- a/test/javaTests/README.md
+++ b/test/javaTests/README.md
@@ -23,6 +23,14 @@ CAP_SETUID
 
 Here we test the File-Based Java APIs by checkpointing the application in the following scenarios and verifying the contents of the file after restore:
 - Reading and writing in the same file. (FileRead.java)
+- Read from a file and write its content to another file. (ReadWrite.java)
+- Reading from multiple files and writing their content to another file. (MultipleFileRead)
+- Reading from a file and writing its content to multiple files. (MultipleFileWrite)
+
+## Memory mapping Java APIs
+
+Here we test the Memory Mapping APIs by checkpointing the application in following scenario and verifying the contents after restore:
+- Memory-mapping a file and writing its content to another file. (MemoryMappings.java)
 
 ### Prerequisites for running the tests:
 - Maven
diff --git a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
index 968488191..b848c9938 100644
--- a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
+++ b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
@@ -77,7 +77,7 @@ public class CheckpointRestore {
 	private void testSetup(String testName) throws IOException {
 		Path testFolderPath = Paths.get(outputFolder + testName + "/");
 		if (!Files.exists(testFolderPath)) {
-			System.out.println("Test Folder does not exist creating it");
+			System.out.println("Creating the test folder");
 			Files.createDirectory(testFolderPath);
 		}
 	}
@@ -245,7 +245,7 @@ public class CheckpointRestore {
 		Assert.assertNotEquals(currentState, Helper.STATE_TERMINATE, testName + ": ERROR: Checkpoint-Restore failed");
 		Assert.assertNotEquals(currentState, Helper.STATE_FAIL, testName + ": ERROR: Test Failed, Check Log for details");
 		Assert.assertEquals(currentState, Helper.STATE_PASS, testName + " ERROR: Unexpected State of Mapped Buffer");
-		System.out.println("-----" + "PASS" + "-----");
+		System.out.println("----- " + "PASS" + " -----");
 
 	}
 
diff --git a/test/javaTests/src/org/criu/java/tests/FileRead.java b/test/javaTests/src/org/criu/java/tests/FileRead.java
index d94a14112..d8851a73e 100644
--- a/test/javaTests/src/org/criu/java/tests/FileRead.java
+++ b/test/javaTests/src/org/criu/java/tests/FileRead.java
@@ -50,7 +50,7 @@ class FileRead {
 			/*
 			 * Mapped Byte Buffer should be in init state at the beginning of test
 			 */
-			if ('I' != b.getChar(Helper.MAPPED_INDEX)) {
+			if (Helper.STATE_INIT != b.getChar(Helper.MAPPED_INDEX)) {
 				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
 				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
 				System.exit(1);
diff --git a/test/javaTests/src/org/criu/java/tests/Helper.java b/test/javaTests/src/org/criu/java/tests/Helper.java
index d608fba47..fdf20bb52 100644
--- a/test/javaTests/src/org/criu/java/tests/Helper.java
+++ b/test/javaTests/src/org/criu/java/tests/Helper.java
@@ -1,9 +1,6 @@
 package org.criu.java.tests;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 import java.nio.MappedByteBuffer;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
@@ -96,4 +93,38 @@ class Helper {
 			System.exit(1);
 		}
 	}
+
+
+	/**
+	 * Compare two files and return true if their content is similar.
+	 *
+	 * @param readFile  File 1 whose content has to be compared.
+	 * @param writeFile File 2 whose content has to be compared.
+	 * @return true if the files are similar, false otherwise.
+	 * @throws IOException
+	 */
+	static boolean compare(File readFile, File writeFile) throws IOException {
+		BufferedReader bir = new BufferedReader(new FileReader(readFile));
+		BufferedReader bor = new BufferedReader(new FileReader(writeFile));
+		String si, so;
+		si = bir.readLine();
+		so = bor.readLine();
+		while (null != si && null != so) {
+			if (!si.equals(so)) {
+				return false;
+			}
+
+			si = bir.readLine();
+			so = bor.readLine();
+		}
+
+		if ((null == si) && (null == so)) {
+			return true;
+		}
+		bir.close();
+		bor.close();
+
+		return false;
+	}
+
 }
diff --git a/test/javaTests/src/org/criu/java/tests/MemoryMappings.java b/test/javaTests/src/org/criu/java/tests/MemoryMappings.java
new file mode 100644
index 000000000..4ac6f4a17
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/MemoryMappings.java
@@ -0,0 +1,121 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class MemoryMappings {
+	private static String TESTNAME = "MemoryMappings";
+
+	/**
+	 * Map a file to memory and write the mapped data into a file,
+	 * checkpointing and restoring in between.
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null;
+		Logger logger = null;
+
+		try {
+			MappedByteBuffer testBuffer;
+			char ch;
+			int i = 1;
+			boolean similar;
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			File readFile = new File(Helper.SOURCE_FOLDER + "/" + "ReadWrite.java");
+			File writeFile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/" + "MemoryMappings_file.txt");
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			int val = Helper.init(TESTNAME, pid, logger);
+			if (0 != val) {
+				logger.log(Level.SEVERE, "Helper.init returned a non-zero code.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			/*
+			 * Mapped Byte Buffer should be in init state at the beginning of test
+			 */
+			if (Helper.STATE_INIT != b.getChar(Helper.MAPPED_INDEX)) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Checking existence of file to be memory mapped");
+			if (!readFile.exists()) {
+				logger.log(Level.SEVERE, "Error: File from which to read does not exist");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			channel = FileChannel.open(readFile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			testBuffer = channel.map(MapMode.READ_WRITE, 0, readFile.length());
+			channel.close();
+
+			if (writeFile.exists()) {
+				writeFile.delete();
+			}
+			boolean newFile = writeFile.createNewFile();
+			if (!newFile) {
+				logger.log(Level.SEVERE, "Error: Cannot create a new file to write to.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			BufferedWriter brw = new BufferedWriter(new FileWriter(writeFile));
+
+			while (testBuffer.hasRemaining()) {
+				ch = (char) testBuffer.get();
+				brw.write(ch);
+				i++;
+				if (200 == i) {
+					logger.log(Level.INFO, "Going to checkpoint");
+					Helper.checkpointAndWait(b, logger);
+					logger.log(Level.INFO, "Test has been restored!");
+				}
+			}
+
+			brw.close();
+			logger.log(Level.INFO, "Comparing contents of the file");
+
+			similar = Helper.compare(readFile, writeFile);
+			if (!similar) {
+				logger.log(Level.SEVERE, "Error: Files are not similar after writing");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Data was read and written correctly!");
+			logger.log(Level.INFO, Helper.PASS_MESSAGE);
+			brw.close();
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (null != b) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/MultipleFileRead.java b/test/javaTests/src/org/criu/java/tests/MultipleFileRead.java
new file mode 100644
index 000000000..7b023673e
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/MultipleFileRead.java
@@ -0,0 +1,203 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class MultipleFileRead {
+	private static String TESTNAME = "MultipleFileRead";
+
+	/**
+	 * @param readFile1 File 1 whose contents are read.
+	 * @param readFile2 File 2 whose contents are read.
+	 * @param writeFile File in which data has been written to.
+	 * @return true if the data written is as expected, false otherwise.
+	 * @throws IOException
+	 */
+	private static boolean compare(File readFile1, File readFile2, File writeFile) throws IOException {
+		BufferedReader br1 = new BufferedReader(new FileReader(readFile1));
+		BufferedReader br2 = new BufferedReader(new FileReader(readFile2));
+		BufferedReader brw = new BufferedReader(new FileReader(writeFile));
+		boolean eof1, eof2;
+		eof1 = false;
+		eof2 = false;
+		String inpString, wrtString;
+
+		while (!eof1 || !eof2) {
+			if (!eof1) {
+				inpString = br1.readLine();
+				if (null == inpString) {
+					eof1 = true;
+				} else {
+					wrtString = brw.readLine();
+					if (null == wrtString) {
+						return false;
+					}
+					if (!wrtString.equals(inpString)) {
+						return false;
+					}
+				}
+			}
+			if (!eof2) {
+				inpString = br2.readLine();
+				if (null == inpString) {
+					eof2 = true;
+				} else {
+					wrtString = brw.readLine();
+					if (null == wrtString) {
+						return false;
+					}
+					if (!wrtString.equals(inpString)) {
+						return false;
+					}
+				}
+			}
+		}
+
+		wrtString = brw.readLine();
+		if (null != wrtString) {
+			return false;
+		}
+
+		br1.close();
+		br2.close();
+		brw.close();
+
+		return true;
+	}
+
+	/**
+	 * Read from multiple files and write their content into another file,
+	 * checkpointing and restoring in between.
+	 *
+	 * @param args Not used.
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null;
+		String s;
+		int i = 0;
+		Logger logger = null;
+		try {
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			File readFile1 = new File(Helper.SOURCE_FOLDER + "/" + "FileRead.java");
+			File readFile2 = new File(Helper.SOURCE_FOLDER + "/" + "ReadWrite.java");
+			File writeFile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/" + "MultipleFileRead_file.txt");
+			boolean eofFile1 = false, eofFile2 = false, check;
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			int val = Helper.init(TESTNAME, pid, logger);
+			if (0 != val) {
+				logger.log(Level.SEVERE, "Helper.init returned a non-zero code.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			/*
+			 * Mapped Byte Buffer should be in init state at the beginning of test
+			 */
+			if (b.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Checking existence of the read files");
+
+			if (!readFile1.exists()) {
+				logger.log(Level.SEVERE, "Error: File from which to read does not exist");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (!readFile2.exists()) {
+				logger.log(Level.SEVERE, "Error: File from which to read does not exist");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (writeFile.exists()) {
+				writeFile.delete();
+			}
+			logger.log(Level.INFO, "Creating writeFile");
+			boolean newFile = writeFile.createNewFile();
+			if (!newFile) {
+				logger.log(Level.SEVERE, "Error: Cannot create a new file to write to.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			BufferedReader br1 = new BufferedReader(new FileReader(readFile1));
+			BufferedReader br2 = new BufferedReader(new FileReader(readFile2));
+			BufferedWriter brw = new BufferedWriter(new FileWriter(writeFile));
+
+			logger.log(Level.INFO, "Writing in file");
+
+			while (!eofFile1 || !eofFile2) {
+				if (!eofFile1) {
+					s = br1.readLine();
+					i++;
+					if (null == s) {
+						eofFile1 = true;
+					} else {
+						brw.write(s + "\n");
+					}
+				}
+				if (!eofFile2) {
+					s = br2.readLine();
+					i++;
+					if (null == s) {
+						eofFile2 = true;
+					} else {
+						brw.write(s + "\n");
+					}
+				}
+				if (10 == i) {
+					/*
+					 * Checkpoint and Restore
+					 */
+					logger.log(Level.INFO, "Going to checkpoint");
+					Helper.checkpointAndWait(b, logger);
+					logger.log(Level.INFO, "Test has been restored!");
+				}
+			}
+			brw.flush();
+			logger.log(Level.INFO, "Checking the content of the file");
+			check = compare(readFile1, readFile2, writeFile);
+
+			if (!check) {
+				logger.log(Level.SEVERE, "Error: Files are not similar after writing");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "The file has been written as expected");
+			logger.log(Level.INFO, Helper.PASS_MESSAGE);
+			br1.close();
+			br2.close();
+			brw.close();
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (null != b) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/MultipleFileWrite.java b/test/javaTests/src/org/criu/java/tests/MultipleFileWrite.java
new file mode 100644
index 000000000..76d287a07
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/MultipleFileWrite.java
@@ -0,0 +1,140 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class MultipleFileWrite {
+	private static String TESTNAME = "MultipleFileWrite";
+
+	/**
+	 * Reads from a file and write its content into multiple files,
+	 * checkpointing and restoring in between.
+	 *
+	 * @param args Not used.
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null;
+		String s, pid;
+		int i = 1;
+		Logger logger = null;
+		boolean similar1, similar2;
+		try {
+			File readFile = new File(Helper.SOURCE_FOLDER + "/" + "FileRead.java");
+			File writeFile1 = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/" + TESTNAME + "1_file.txt");
+			File writeFile2 = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/" + TESTNAME + "2_file.txt");
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			int val = Helper.init(TESTNAME, pid, logger);
+			if (0 != val) {
+				logger.log(Level.SEVERE, "Helper.init returned a non-zero code.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			/*
+			 * Mapped Byte Buffer should be in init state at the beginning of test
+			 */
+			if (Helper.STATE_INIT != b.getChar(Helper.MAPPED_INDEX)) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Checking existence of read files!");
+
+			if (!readFile.exists()) {
+				logger.log(Level.SEVERE, "Error: File from which to read does not exist");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (writeFile1.exists()) {
+				writeFile1.delete();
+			}
+			boolean newFile = writeFile1.createNewFile();
+			if (!newFile) {
+				logger.log(Level.SEVERE, "Error: Cannot create a new file to write to.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			if (writeFile2.exists()) {
+				writeFile2.delete();
+			}
+			newFile = writeFile2.createNewFile();
+			if (!newFile) {
+				logger.log(Level.SEVERE, "Error: Cannot create a new file to write to.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Created write files");
+
+			BufferedReader br = new BufferedReader(new FileReader(readFile));
+			BufferedWriter bw1 = new BufferedWriter(new FileWriter(writeFile1));
+			BufferedWriter bw2 = new BufferedWriter(new FileWriter(writeFile2));
+
+			s = br.readLine();
+
+			while (null != s) {
+				bw1.write(s + "\n");
+				bw2.write(s + "\n");
+				if (90 == i) {
+					/*
+					 * Checkpoint and Restore
+					 */
+					logger.log(Level.INFO, "Going to checkpoint");
+					Helper.checkpointAndWait(b, logger);
+					logger.log(Level.INFO, "Test has been restored!");
+				}
+
+				i++;
+				s = br.readLine();
+			}
+
+			bw1.flush();
+			bw2.flush();
+			logger.log(Level.INFO, "Checking files have been written correctly");
+
+			similar1 = Helper.compare(readFile, writeFile1);
+			similar2 = Helper.compare(readFile, writeFile2);
+
+			if (!similar1 || !similar2) {
+				logger.log(Level.SEVERE, "Error: Written data is not identical to the data read");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Content of files is as expected");
+			logger.log(Level.INFO, Helper.PASS_MESSAGE);
+			br.close();
+			bw1.close();
+			bw2.close();
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (null != b) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/ReadWrite.java b/test/javaTests/src/org/criu/java/tests/ReadWrite.java
new file mode 100644
index 000000000..fa98447ed
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/ReadWrite.java
@@ -0,0 +1,119 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class ReadWrite {
+	private static String TESTNAME = "ReadWrite";
+
+	/**
+	 * Read from a file and write its content into another file,
+	 * checkpointing and restoring in between.
+	 *
+	 * @param args Not used.
+	 */
+	public static void main(String[] args) {
+		int i = 0;
+		String s, pid;
+		boolean similar;
+		MappedByteBuffer b = null;
+		Logger logger = null;
+		try {
+			File readFile = new File(Helper.SOURCE_FOLDER + "/" + "FileRead.java");
+			File writeFile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/" + "ReadWrite_file.txt");
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			int val = Helper.init(TESTNAME, pid, logger);
+			if (0 != val) {
+				logger.log(Level.SEVERE, "Helper.init returned a non-zero code.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+			FileChannel channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			/*
+			 * Mapped Byte Buffer should be in init state at the beginning of test
+			 */
+			if (Helper.STATE_INIT != b.getChar(Helper.MAPPED_INDEX)) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Checking existence of files to be read!");
+			if (!readFile.exists()) {
+				logger.log(Level.SEVERE, "Error: File from which to read does not exist");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			if (writeFile.exists()) {
+				writeFile.delete();
+			}
+			logger.log(Level.INFO, "Creating the writeFile");
+			boolean newFile = writeFile.createNewFile();
+			if (!newFile) {
+				logger.log(Level.SEVERE, "Error: Cannot create a new file to write to.");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			BufferedReader brr = new BufferedReader(new FileReader(readFile));
+			BufferedWriter brw = new BufferedWriter(new FileWriter(writeFile));
+			logger.log(Level.INFO, "Start writing");
+
+			s = brr.readLine();
+
+			while (null != s) {
+				i++;
+				brw.write(s + "\n");
+
+				if (50 == i) {
+					/*
+					 * Checkpoint and Restore
+					 */
+					logger.log(Level.INFO, "Going to checkpoint");
+					Helper.checkpointAndWait(b, logger);
+					logger.log(Level.INFO, "Test has been restored!");
+				}
+				s = brr.readLine();
+			}
+
+			brw.flush();
+			logger.log(Level.INFO, "Checking content of the files.");
+			similar = Helper.compare(readFile, writeFile);
+
+			if (!similar) {
+				logger.log(Level.SEVERE, "Error: Files are not similar after writing");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Content of file is as expected");
+			logger.log(Level.INFO, Helper.PASS_MESSAGE);
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			System.exit(0);
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (null != b) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/test.xml b/test/javaTests/test.xml
index 8ff67c5e0..b73a31db2 100644
--- a/test/javaTests/test.xml
+++ b/test/javaTests/test.xml
@@ -4,10 +4,40 @@
 <suite name = "Suite1">
 	<parameter name="checkpointOpt" value=""/>
 	<parameter name="restoreOpt" value=""/>
+
 	<test name = "test1-FileRead">
 		<parameter name="testname" value="FileRead"/>
 		<classes>
 			<class name = "org.criu.java.tests.CheckpointRestore"/>
 		</classes>
 	</test>
+
+	<test name = "test2-ReadWrite">
+		<parameter name="testname" value="ReadWrite"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test3-MemoryMappings">
+		<parameter name="testname" value="MemoryMappings"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test4-MultipleFileRead">
+		<parameter name="testname" value="MultipleFileRead"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test5-MultipleFileWrite">
+		<parameter name="testname" value="MultipleFileWrite"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
 </suite>

From 3ca09b191429a4260a12daf6bbaf58da2aebd656 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 20 Nov 2019 11:01:33 +0300
Subject: [PATCH 0089/1854] travis: ignore fails of podman-test

until it will not be fixed.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b27dbfe7b..e6e410191 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,7 @@ matrix:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=fedora-rawhide
     - env: TR_ARCH=local       GCOV=1
+    - env: TR_ARCH=podman-test
 script:
   - sudo make CCACHE=1 -C scripts/travis $TR_ARCH
 after_success:

From b5b1c4ec4506df7cee6a9ba8ffff36f43e0cd8e3 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 21 Nov 2019 01:24:44 +0300
Subject: [PATCH 0090/1854] kerndat: check whether the new mount API is
 supported of not

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.config                               |  2 +-
 .../arch/arm/plugins/std/syscalls/syscall.def |  3 ++
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  3 ++
 .../plugins/std/syscalls/syscall-s390.tbl     |  3 ++
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  3 ++
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  3 ++
 criu/include/kerndat.h                        |  1 +
 criu/include/linux/mount.h                    | 35 +++++++++++++++++++
 criu/kerndat.c                                | 16 +++++++++
 scripts/feature-tests.mak                     | 12 +++++++
 10 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 criu/include/linux/mount.h

diff --git a/Makefile.config b/Makefile.config
index 5af3fed38..81aae24f8 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -47,7 +47,7 @@ export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW
+	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG
 
 # $1 - config name
 define gen-feature-test
diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 721ff16dc..d5bdc677e 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -112,3 +112,6 @@ userfaultfd			282	388	(int flags)
 fallocate			47	352	(int fd, int mode, loff_t offset, loff_t len)
 cacheflush			!	983042	(void *start, void *end, int flags)
 ppoll				73	336	(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+fsopen				430	430	(char *fsname, unsigned int flags)
+fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 3b3079040..4e283d5e9 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -108,3 +108,6 @@ __NR_gettimeofday	78		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
 __NR_preadv		320		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
 __NR_userfaultfd	364		sys_userfaultfd		(int flags)
 __NR_ppoll		281		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index cc13a63dd..fd48e3950 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -108,3 +108,6 @@ __NR_userfaultfd	355		sys_userfaultfd		(int flags)
 __NR_preadv		328		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
 __NR_gettimeofday	78		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
 __NR_ppoll		302		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 7903ab150..038aeb4f7 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -96,3 +96,6 @@ __NR_seccomp		354		sys_seccomp		(unsigned int op, unsigned int flags, const char
 __NR_memfd_create	356		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd	374		sys_userfaultfd		(int flags)
 __NR_ppoll		309		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 4ac9164ea..215f32026 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -107,3 +107,6 @@ __NR_kcmp			312		sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1
 __NR_memfd_create		319		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd		323		sys_userfaultfd		(int flags)
 __NR_ppoll			271		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_fsopen			430		sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index d93e07813..771195860 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -65,6 +65,7 @@ struct kerndat_s {
 	bool x86_has_ptrace_fpu_xsave_bug;
 	bool has_inotify_setnextwd;
 	bool has_kcmp_epoll_tfd;
+	bool has_fsopen;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/linux/mount.h b/criu/include/linux/mount.h
new file mode 100644
index 000000000..aa6be69ec
--- /dev/null
+++ b/criu/include/linux/mount.h
@@ -0,0 +1,35 @@
+#ifndef _CRIU_LINUX_MOUNT_H
+#define _CRIU_LINUX_MOUNT_H
+
+#include "common/config.h"
+#include "compel/plugins/std/syscall-codes.h"
+
+#ifdef CONFIG_HAS_FSCONFIG
+#include <linux/mount.h>
+#else
+enum fsconfig_command {
+        FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
+        FSCONFIG_SET_STRING     = 1,    /* Set parameter, supplying a string value */
+        FSCONFIG_SET_BINARY     = 2,    /* Set parameter, supplying a binary blob value */
+        FSCONFIG_SET_PATH       = 3,    /* Set parameter, supplying an object by path */
+        FSCONFIG_SET_PATH_EMPTY = 4,    /* Set parameter, supplying an object by (empty) path */
+        FSCONFIG_SET_FD         = 5,    /* Set parameter, supplying an object by fd */
+        FSCONFIG_CMD_CREATE     = 6,    /* Invoke superblock creation */
+        FSCONFIG_CMD_RECONFIGURE = 7,   /* Invoke superblock reconfiguration */
+};
+#endif
+
+static inline int sys_fsopen(const char *fsname, unsigned int flags)
+{
+	return syscall(__NR_fsopen, fsname, flags);
+}
+static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+{
+	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
+}
+static inline int sys_fsmount(int fd, unsigned int flags, unsigned int attr_flags)
+{
+	return syscall(__NR_fsmount, fd, flags, attr_flags);
+}
+
+#endif
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 39cacb8fe..b0dd83135 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -723,6 +723,20 @@ static int kerndat_has_inotify_setnextwd(void)
 	return ret;
 }
 
+static int kerndat_has_fsopen(void)
+{
+	if (syscall(__NR_fsopen, NULL, -1) != -1) {
+		pr_err("fsopen should fail\n");
+		return -1;
+	}
+	if (errno == ENOSYS)
+		pr_info("The new mount API (fsopen, fsmount) isn't supported\n");
+	else
+		kdat.has_fsopen = true;
+
+	return 0;
+}
+
 static int has_kcmp_epoll_tfd(void)
 {
 	kcmp_epoll_slot_t slot = { };
@@ -1043,6 +1057,8 @@ int kerndat_init(void)
 		ret = kerndat_has_inotify_setnextwd();
 	if (!ret)
 		ret = has_kcmp_epoll_tfd();
+	if (!ret)
+		ret = kerndat_has_fsopen();
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index e39d97bb1..39ddfd053 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -136,3 +136,15 @@ ENTRY(main)
         nop
 END(main)
 endef
+
+define FEATURE_TEST_FSCONFIG
+
+#include <linux/mount.h>
+
+int main(void)
+{
+	if (FSCONFIG_CMD_CREATE > 0)
+		return 0;
+	return 0;
+}
+endef

From 4997a096e4ffad4778a24f903e4450842171e576 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 25 Nov 2019 09:50:08 +0300
Subject: [PATCH 0091/1854] util: introduce the mount_detached_fs helper

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/util.h |  2 ++
 criu/util.c         | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index 313aacd8c..45bebf673 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -380,4 +380,6 @@ static inline void print_stack_trace(pid_t pid) {}
 		___ret;									\
 	})
 
+extern int mount_detached_fs(const char *fsname);
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/util.c b/criu/util.c
index e47e109ae..3bae18ab2 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -28,6 +28,8 @@
 #include <sched.h>
 #include <ctype.h>
 
+#include "linux/mount.h"
+
 #include "kerndat.h"
 #include "page.h"
 #include "util.h"
@@ -1423,3 +1425,27 @@ void print_stack_trace(pid_t pid)
 	free(strings);
 }
 #endif
+
+int mount_detached_fs(const char *fsname)
+{
+	int fsfd, fd;
+
+	fsfd = sys_fsopen(fsname, 0);
+	if (fsfd < 0) {
+		pr_perror("Unable to open the %s file system", fsname);
+		return -1;
+	}
+
+	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) < 0) {
+		pr_perror("Unable to create the %s file system", fsname);
+		close(fsfd);
+		return -1;
+	}
+
+	fd = sys_fsmount(fsfd, 0, 0);
+	if (fd < 0)
+		pr_perror("Unable to mount the %s file system", fsname);
+	close(fsfd);
+	return fd;
+}
+

From 1a2d8ad7e162adf95124064109c959c7f7beb77a Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 21 Nov 2019 01:26:38 +0300
Subject: [PATCH 0092/1854] mount: use new mount API to open the proc file
 system

It doesn't require to create a temporary directory and mount the proc
file system in it.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 5694931f4..b920ce262 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -23,6 +23,8 @@
 #include <compel/ptrace.h>
 #include "common/compiler.h"
 
+#include "linux/mount.h"
+
 #include "clone-noasan.h"
 #include "cr_options.h"
 #include "servicefd.h"
@@ -1585,27 +1587,39 @@ static void restore_pgid(void)
 		futex_set_and_wake(&rsti(current)->pgrp_set, 1);
 }
 
+static int __legacy_mount_proc()
+{
+	char proc_mountpoint[] = "/tmp/crtools-proc.XXXXXX";
+	int fd;
+
+	if (mkdtemp(proc_mountpoint) == NULL) {
+		pr_perror("mkdtemp failed %s", proc_mountpoint);
+		return -1;
+	}
+
+	pr_info("Mount procfs in %s\n", proc_mountpoint);
+	if (mount("proc", proc_mountpoint, "proc", MS_MGC_VAL | MS_NOSUID | MS_NOEXEC | MS_NODEV, NULL)) {
+		pr_perror("mount failed");
+		if (rmdir(proc_mountpoint))
+			pr_perror("Unable to remove %s", proc_mountpoint);
+		return -1;
+	}
+
+	fd = open_detach_mount(proc_mountpoint);
+	return fd;
+}
+
 static int mount_proc(void)
 {
 	int fd, ret;
-	char proc_mountpoint[] = "/tmp/crtools-proc.XXXXXX";
 
 	if (root_ns_mask == 0)
 		fd = ret = open("/proc", O_DIRECTORY);
 	else {
-		if (mkdtemp(proc_mountpoint) == NULL) {
-			pr_perror("mkdtemp failed %s", proc_mountpoint);
-			return -1;
-		}
-
-		pr_info("Mount procfs in %s\n", proc_mountpoint);
-		if (mount("proc", proc_mountpoint, "proc", MS_MGC_VAL | MS_NOSUID | MS_NOEXEC | MS_NODEV, NULL)) {
-			pr_perror("mount failed");
-			rmdir(proc_mountpoint);
-			return -1;
-		}
-
-		ret = fd = open_detach_mount(proc_mountpoint);
+		if (kdat.has_fsopen)
+			fd = ret = mount_detached_fs("proc");
+		else
+			fd = ret = __legacy_mount_proc();
 	}
 
 	if (fd >= 0) {

From 76e4d31a3fa6a8d4ccee9a111c212c27ab69474f Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 25 Nov 2019 09:51:40 +0300
Subject: [PATCH 0093/1854] net: use new mount API to open the sysfs file
 system

It doesn't require to create a temporary directory and mount the proc
file system in it.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/net.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/criu/net.c b/criu/net.c
index 9825db10f..5822de629 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2133,6 +2133,11 @@ static int mount_ns_sysfs(void)
 
 	BUG_ON(ns_sysfs_fd != -1);
 
+	if (kdat.has_fsopen) {
+		ns_sysfs_fd = mount_detached_fs("sysfs");
+		return ns_sysfs_fd >= 0 ? 0 : -1;
+	}
+
 	/*
 	 * A new mntns is required to avoid the race between
 	 * open_detach_mount and creating mntns.

From be43c3b840b657a6a31a6885ca6e03da70de1b04 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 25 Nov 2019 09:52:25 +0300
Subject: [PATCH 0094/1854] cgroup: use new mount API to open the cgroup file
 system

It doesn't require to create a temporary directory and mount the proc
file system in it.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cgroup.c | 105 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 82 insertions(+), 23 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index a66fc960e..d4c712167 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -8,6 +8,7 @@
 #include <ftw.h>
 #include <libgen.h>
 #include <sched.h>
+
 #include "common/list.h"
 #include "xmalloc.h"
 #include "cgroup.h"
@@ -24,6 +25,8 @@
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/cgroup.pb-c.h"
+#include "kerndat.h"
+#include "linux/mount.h"
 
 /*
  * This structure describes set of controller groups
@@ -542,6 +545,84 @@ static int add_freezer_state(struct cg_controller *controller)
 	return 0;
 }
 
+static const char namestr[] = "name=";
+static int __new_open_cgroupfs(struct cg_ctl *cc)
+{
+	int fsfd, fd;
+	char *name;
+
+	fsfd = sys_fsopen("cgroup", 0);
+	if (fsfd < 0) {
+		pr_perror("Unable to open the cgroup file system");
+		return -1;
+	}
+
+	if (strstartswith(cc->name, namestr)) {
+		if (sys_fsconfig(fsfd, FSCONFIG_SET_STRING,
+				 "name", cc->name + strlen(namestr), 0)) {
+			pr_perror("Unable to configure the cgroup (%s) file system", cc->name);
+			goto err;
+		}
+	} else {
+		char *saveptr = NULL, *buf = strdupa(cc->name);
+		name = strtok_r(buf, ",", &saveptr);
+		while (name) {
+			if (sys_fsconfig(fsfd, FSCONFIG_SET_FLAG, name, NULL, 0)) {
+				pr_perror("Unable to configure the cgroup (%s) file system", name);
+				goto err;
+			}
+			name = strtok_r(NULL, ",", &saveptr);
+		}
+	}
+
+	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0)) {
+		pr_perror("Unable to create the cgroup (%s) file system", cc->name);
+		goto err;
+	}
+
+	fd = sys_fsmount(fsfd, 0, 0);
+	if (fd < 0)
+		pr_perror("Unable to mount the cgroup (%s) file system", cc->name);
+	close(fsfd);
+
+	return fd;
+err:
+	close(fsfd);
+	return -1;
+}
+
+static int open_cgroupfs(struct cg_ctl *cc)
+{
+	char prefix[] = ".criu.cgmounts.XXXXXX";
+	char mopts[1024];
+	int fd;
+
+	if (kdat.has_fsopen)
+		return __new_open_cgroupfs(cc);
+
+	if (strstartswith(cc->name, namestr))
+		snprintf(mopts, sizeof(mopts), "none,%s", cc->name);
+	else
+		snprintf(mopts, sizeof(mopts), "%s", cc->name);
+
+	if (mkdtemp(prefix) == NULL) {
+		pr_perror("can't make dir for cg mounts");
+		return -1;
+	}
+
+	if (mount("none", prefix, "cgroup", 0, mopts) < 0) {
+		pr_perror("Unable to mount %s", mopts);
+		rmdir(prefix);
+		return -1;
+	}
+
+	fd = open_detach_mount(prefix);
+	if (fd < 0)
+		return -1;
+
+	return fd;
+}
+
 static int collect_cgroups(struct list_head *ctls)
 {
 	struct cg_ctl *cc;
@@ -550,8 +631,6 @@ static int collect_cgroups(struct list_head *ctls)
 
 	list_for_each_entry(cc, ctls, l) {
 		char path[PATH_MAX], *root;
-		char prefix[] = ".criu.cgmounts.XXXXXX";
-		const char namestr[] = "name=";
 		struct cg_controller *cg;
 		struct cg_root_opt *o;
 
@@ -603,27 +682,7 @@ static int collect_cgroups(struct list_head *ctls)
 				return -1;
 			}
 		} else {
-			char mopts[1024];
-
-			if (strstartswith(cc->name, namestr))
-				snprintf(mopts, sizeof(mopts), "none,%s", cc->name);
-			else
-				snprintf(mopts, sizeof(mopts), "%s", cc->name);
-
-			if (mkdtemp(prefix) == NULL) {
-				pr_perror("can't make dir for cg mounts");
-				return -1;
-			}
-
-			if (mount("none", prefix, "cgroup", 0, mopts) < 0) {
-				pr_perror("couldn't mount %s", mopts);
-				rmdir(prefix);
-				return -1;
-			}
-
-			fd = open_detach_mount(prefix);
-			if (fd < 0)
-				return -1;
+			fd = open_cgroupfs(cc);
 		}
 
 		path_pref_len = snprintf(path, PATH_MAX, "/proc/self/fd/%d", fd);

From af7e5f994b4d2221af1a0110dbfe5bdadd67f964 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 26 Nov 2019 07:26:31 +0300
Subject: [PATCH 0095/1854] readme: github pull-requests is the preferred way
 to contribute

We will continue accepting patches.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 558e87160..6a578b953 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ Here are some useful hints to get involved.
 * CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
 * Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
 * Feedback is expected on the github issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
-* For historical reasons we do not accept PRs, instead [patches are welcome](http://criu.org/How_to_submit_patches);
+* We accept github pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [the devel list](http://criu.org/How_to_submit_patches);
 * Spread the word about CRIU in [social networks](http://criu.org/Contacts);
 * If you're giving a talk about CRIU -- let us know, we'll mention it on the [wiki main page](https://criu.org/News/events);
 

From 2237666ac1d277051d2bb90796fb1a0c5febb885 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 12 Nov 2019 14:31:08 +0300
Subject: [PATCH 0096/1854] restorer/inotify: reorder inotify cleanup after
 waiting helpers and zombies

We've seen ppoll interrupted with signal in VZ7 CT migration tests, that
is because in the beggining of CR_STATE_RESTORE_SIGCHLD zombies and
helpers die, and that can trigger SIGCHILDs sent to their parents.

Adding additional debug (printing "Task..." for zombies and helpers) in
sigchld_handler I see:

  (15.644339) pie: 1: Task 10718 exited, status= 0
  (15.644349) pie: 1: Cleaning inotify events from 29
  (15.644359) pie: 1: Cleaning inotify events from 19
  (15.644367) pie: 1: Cleaning inotify events from 10

And previousely we had:

  (05.718449) pie: 104: Cleaning inotify events from 5
  (05.718835) pie: 330: Cleaning inotify events from 3
  (05.719046) pie: 1: Cleaning inotify events from 23
  (05.719164) pie: 80: Cleaning inotify events from 7
  (05.719185) pie: 1: Error (criu/pie/restorer.c:1287): Failed to poll from inotify fd: -4
  (05.719202) pie: 95: Cleaning inotify events from 6
  (05.719269) pie: 1: Error (criu/pie/restorer.c:1890): Restorer fail 1

So reordering cleanup and wait should fix it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pie/restorer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index dab58add6..888eb8e65 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1839,9 +1839,6 @@ long __export_restore_task(struct task_restore_args *args)
 
 	restore_finish_stage(task_entries_local, CR_STATE_RESTORE);
 
-	if (cleanup_current_inotify_events(args))
-		goto core_restore_end;
-
 	if (wait_helpers(args) < 0)
 		goto core_restore_end;
 	if (wait_zombies(args) < 0)
@@ -1854,6 +1851,9 @@ long __export_restore_task(struct task_restore_args *args)
 		goto core_restore_end;
 	}
 
+	if (cleanup_current_inotify_events(args))
+		goto core_restore_end;
+
 	if (!args->compatible_mode) {
 		ret = sys_sigaction(SIGCHLD, &args->sigchld_act,
 				NULL, sizeof(k_rtsigset_t));

From 1d23dc4a3042599cabea90a81c063db453b89abb Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Fri, 29 Nov 2019 10:57:29 +0300
Subject: [PATCH 0097/1854] mount: Order call_helper_process calls

When we do clone threads in a later stage of restore procedure
it may race with helpers which do call clone_noasan by self.

Thus we need to walk over each clone_noasan call and figure
out if calling it without last_pid lock is safe.

 - open_mountpoint: called by fusectl_dump, dump_empty_fs,
   binfmt_misc_dump, tmpfs_dump -- they all are processing
   dump stage, thus safe

 - call_helper_process: try_remount_writable -- called from
   various places in reg-files.c, in particular open_reg_by_id
   called in parallel with other threads, needs a lock
   remount_readonly_mounts -- called from sigreturn_restore,
   so in parallel, needs a lock

 - call_in_child_process: prepare_net_namespaces -- called
   from prepare_namespace which runs before we start forking,
   no need for lock

Thus call_helper_process should use lock_last_pid and
unlock_last_pid helpers and wait for subprocess to finish.

Same time put a warning text into clone_noasan comment
so next time we need to use it we would recall the pitfalls.

v2:
 - fix unitialized ret variable
v3:
 - use exit_code instead of ret

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 criu/clone-noasan.c |  9 +++++++++
 criu/mount.c        | 21 ++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/criu/clone-noasan.c b/criu/clone-noasan.c
index 5ca280eb8..5f1858d4d 100644
--- a/criu/clone-noasan.c
+++ b/criu/clone-noasan.c
@@ -18,6 +18,15 @@
  *         https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69863
  *
  * So the only way is to put this wrapper in separate non-instrumented file
+ *
+ * WARNING: When calling clone_noasan make sure your not sitting in a later
+ * __restore__ phase where other tasks might be creating threads, otherwise
+ * all calls to clone_noasan should be guarder with
+ *
+ * 	lock_last_pid
+ *	clone_noasan
+ *	... wait for process to finish ...
+ *	unlock_last_pid
  */
 int clone_noasan(int (*fn)(void *), int flags, void *arg)
 {
diff --git a/criu/mount.c b/criu/mount.c
index 52e70d376..24a8516c6 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3738,27 +3738,38 @@ struct ns_desc mnt_ns_desc = NS_DESC_ENTRY(CLONE_NEWNS, "mnt");
 
 static int call_helper_process(int (*call)(void *), void *arg)
 {
-	int pid, status;
+	int pid, status, exit_code = -1;
+
+	/*
+	 * Running new helper process on the restore must be
+	 * done under last_pid mutex: other tasks may be restoring
+	 * threads and the PID we need there might be occupied by
+	 * this clone() call.
+	 */
+	lock_last_pid();
 
 	pid = clone_noasan(call, CLONE_VFORK | CLONE_VM | CLONE_FILES |
 			   CLONE_IO | CLONE_SIGHAND | CLONE_SYSVSEM, arg);
 	if (pid == -1) {
 		pr_perror("Can't clone helper process");
-		return -1;
+		goto out;
 	}
 
 	errno = 0;
 	if (waitpid(pid, &status, __WALL) != pid) {
 		pr_perror("Unable to wait %d", pid);
-		return -1;
+		goto out;
 	}
 
 	if (status) {
 		pr_err("Bad child exit status: %d\n", status);
-		return -1;
+		goto out;
 	}
 
-	return 0;
+	exit_code = 0;
+out:
+	unlock_last_pid();
+	return exit_code;
 }
 
 static int ns_remount_writable(void *arg)

From ebe3b52353c5d380d01c332e7d57594995258c18 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 14 Nov 2019 14:41:04 +0300
Subject: [PATCH 0098/1854] unix: sysctl -- Preserve max_dgram_qlen value

The /proc/sys/net/unix/max_dgram_qlen is a per-net variable and
we already noticed that systemd inside a container may change its value
(for example it sets it to 512 by now instead of kernel's default
value 10), thus we need keep it inside image and restore then.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/net.c          | 104 +++++++++++++++++++++++++++++++++++++++++++-
 images/netdev.proto |   1 +
 2 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index 5822de629..e960a34f9 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -210,6 +210,19 @@ char *devconfs6[] = {
 #define MAX_CONF_OPT_PATH IFNAMSIZ+60
 #define MAX_STR_CONF_LEN 200
 
+static const char *unix_conf_entries[] = {
+	"max_dgram_qlen",
+};
+
+/*
+ * MAX_CONF_UNIX_PATH = (sizeof(CONF_UNIX_FMT) - strlen("%s"))
+ * 					  + MAX_CONF_UNIX_OPT_PATH
+ */
+#define CONF_UNIX_BASE		"net/unix"
+#define CONF_UNIX_FMT		CONF_UNIX_BASE"/%s"
+#define MAX_CONF_UNIX_OPT_PATH	32
+#define MAX_CONF_UNIX_PATH	(sizeof(CONF_UNIX_FMT) + MAX_CONF_UNIX_OPT_PATH - 2)
+
 static int net_conf_op(char *tgt, SysctlEntry **conf, int n, int op, char *proto,
 		struct sysctl_req *req, char (*path)[MAX_CONF_OPT_PATH], int size,
 		char **devconfs, SysctlEntry **def_conf)
@@ -339,6 +352,72 @@ static int ipv6_conf_op(char *tgt, SysctlEntry **conf, int n, int op, SysctlEntr
 			devconfs6, def_conf);
 }
 
+static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
+{
+	int i, ret = -1, flags = 0;
+	char path[ARRAY_SIZE(unix_conf_entries)][MAX_CONF_UNIX_PATH] = { };
+	struct sysctl_req req[ARRAY_SIZE(unix_conf_entries)] = { };
+	SysctlEntry **conf = *rconf;
+
+	if (*n != ARRAY_SIZE(unix_conf_entries)) {
+		pr_err("unix: Unexpected entries in config (%zu %zu)\n",
+			*n, ARRAY_SIZE(unix_conf_entries));
+		return -EINVAL;
+	}
+
+	if (opts.weak_sysctls || op == CTL_READ)
+		flags = CTL_FLAGS_OPTIONAL;
+
+	for (i = 0; i < *n; i++) {
+		snprintf(path[i], MAX_CONF_UNIX_PATH, CONF_UNIX_FMT,
+			unix_conf_entries[i]);
+		req[i].name = path[i];
+		req[i].flags = flags;
+
+		switch (conf[i]->type) {
+		case SYSCTL_TYPE__CTL_32:
+			req[i].type = CTL_32;
+			req[i].arg = &conf[i]->iarg;
+			break;
+		default:
+			pr_err("unix: Unknown config type %d\n",
+				conf[i]->type);
+			return -1;
+		}
+	}
+
+	ret = sysctl_op(req, *n, op, CLONE_NEWNET);
+	if (ret < 0) {
+		pr_err("unix: Failed to %s %s/<confs>\n",
+			(op == CTL_READ) ? "read" : "write",
+			CONF_UNIX_BASE);
+		return -1;
+	}
+
+	if (op == CTL_READ) {
+		bool has_entries = false;
+
+		for (i = 0; i < *n; i++) {
+			if (req[i].flags & CTL_FLAGS_HAS) {
+				conf[i]->has_iarg = true;
+				if (!has_entries)
+					has_entries = true;
+			}
+		}
+
+		/*
+		 * Zap the whole section of data.
+		 * Unix conf is optional.
+		 */
+		if (!has_entries) {
+			*n = 0;
+			*rconf = NULL;
+		}
+	}
+
+	return 0;
+}
+
 /*
  * I case if some entry is missing in
  * the kernel, simply write DEVCONFS_UNUSED
@@ -1824,6 +1903,8 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	int ret = -1;
 	int i;
 	NetnsEntry netns = NETNS_ENTRY__INIT;
+	SysctlEntry *unix_confs = NULL;
+	size_t sizex = ARRAY_SIZE(unix_conf_entries);
 	SysctlEntry *def_confs4 = NULL, *all_confs4 = NULL;
 	int size4 = ARRAY_SIZE(devconfs4);
 	SysctlEntry *def_confs6 = NULL, *all_confs6 = NULL;
@@ -1840,7 +1921,8 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	o_buf = buf = xmalloc(
 			i * (sizeof(NetnsId*) + sizeof(NetnsId)) +
 			size4 * (sizeof(SysctlEntry*) + sizeof(SysctlEntry)) * 2 +
-			size6 * (sizeof(SysctlEntry*) + sizeof(SysctlEntry)) * 2
+			size6 * (sizeof(SysctlEntry*) + sizeof(SysctlEntry)) * 2 +
+			sizex * (sizeof(SysctlEntry*) + sizeof(SysctlEntry))
 		     );
 	if (!buf)
 		goto out;
@@ -1896,6 +1978,16 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 		}
 	}
 
+	netns.n_unix_conf = sizex;
+	netns.unix_conf = xptr_pull_s(&buf, sizex * sizeof(SysctlEntry*));
+	unix_confs = xptr_pull_s(&buf, sizex * sizeof(SysctlEntry));
+
+	for (i = 0; i < sizex; i++) {
+		sysctl_entry__init(&unix_confs[i]);
+		netns.unix_conf[i] = &unix_confs[i];
+		netns.unix_conf[i]->type = SYSCTL_TYPE__CTL_32;
+	}
+
 	ret = ipv4_conf_op("default", netns.def_conf4, size4, CTL_READ, NULL);
 	if (ret < 0)
 		goto err_free;
@@ -1910,6 +2002,10 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	if (ret < 0)
 		goto err_free;
 
+	ret = unix_conf_op(&netns.unix_conf, &netns.n_unix_conf, CTL_READ);
+	if (ret < 0)
+		goto err_free;
+
 	ret = pb_write_one(img_from_set(fds, CR_FD_NETNS), &netns, PB_NETNS);
 err_free:
 	xfree(o_buf);
@@ -2122,6 +2218,12 @@ static int restore_netns_conf(struct ns_id *ns)
 		ret = ipv6_conf_op("default", (netns)->def_conf6, (netns)->n_def_conf6, CTL_WRITE, NULL);
 	}
 
+	if ((netns)->unix_conf) {
+		ret = unix_conf_op(&(netns)->unix_conf, &(netns)->n_unix_conf, CTL_WRITE);
+		if (ret)
+			goto out;
+	}
+
 	ns->net.netns = netns;
 out:
 	return ret;
diff --git a/images/netdev.proto b/images/netdev.proto
index 476a92ced..ae9c99531 100644
--- a/images/netdev.proto
+++ b/images/netdev.proto
@@ -71,4 +71,5 @@ message netns_entry {
 
 	repeated netns_id nsids		= 7;
 	optional string	ext_key		= 8;
+	repeated sysctl_entry unix_conf	= 9;
 }

From 55f7a571f286baa6eac6fe7a020914505a0eb464 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 14 Nov 2019 14:50:43 +0300
Subject: [PATCH 0099/1854] zdtm: sysctl net.unix.max_dgram_qlen value
 preservation test

Test checks that if the /proc/sys/net/unix/max_dgram_qlen value has
been changed in process net namespace, then it is saved after c/r.

Signed-off-by: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/lib/Makefile                 |  2 +-
 test/zdtm/lib/sysctl.c                 | 59 ++++++++++++++++++++++++++
 test/zdtm/lib/sysctl.h                 |  7 +++
 test/zdtm/static/Makefile              |  1 +
 test/zdtm/static/netns_sub_sysctl.c    | 56 ++++++++++++++++++++++++
 test/zdtm/static/netns_sub_sysctl.desc |  4 ++
 6 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/lib/sysctl.c
 create mode 100644 test/zdtm/lib/sysctl.h
 create mode 100644 test/zdtm/static/netns_sub_sysctl.c
 create mode 100644 test/zdtm/static/netns_sub_sysctl.desc

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index d2d9f1cc3..b87f36e8f 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -4,7 +4,7 @@ CFLAGS	+= $(USERCFLAGS)
 
 LIB	:= libzdtmtst.a
 
-LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c fs.c
+LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c fs.c sysctl.c
 LIBOBJ	:= $(LIBSRC:%.c=%.o)
 
 BIN	:= groups
diff --git a/test/zdtm/lib/sysctl.c b/test/zdtm/lib/sysctl.c
new file mode 100644
index 000000000..9583ec3df
--- /dev/null
+++ b/test/zdtm/lib/sysctl.c
@@ -0,0 +1,59 @@
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+#include "sysctl.h"
+
+int sysctl_read_int(const char *name, int *data)
+{
+	int fd;
+	int ret;
+	char buf[16];
+
+	fd = open(name, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("Can't open %s", name);
+		return fd;
+	}
+
+	ret = read(fd, buf, sizeof(buf) - 1);
+	if (ret < 0) {
+		pr_perror("Can't read %s", name);
+		ret = -errno;
+		goto err;
+	}
+
+	buf[ret] = '\0';
+
+	*data = (int)strtoul(buf, NULL, 10);
+	ret = 0;
+err:
+	close(fd);
+	return ret;
+}
+
+int sysctl_write_int(const char *name, int val)
+{
+	int fd;
+	int ret;
+	char buf[16];
+
+	fd = open(name, O_WRONLY);
+	if (fd < 0) {
+		pr_perror("Can't open %s", name);
+		return fd;
+	}
+
+	sprintf(buf, "%d\n", val);
+
+	ret = write(fd, buf, strlen(buf));
+	if (ret < 0) {
+		pr_perror("Can't write %d into %s", val, name);
+		ret = -errno;
+		goto err;
+	}
+
+	ret = 0;
+err:
+	close(fd);
+	return ret;
+}
diff --git a/test/zdtm/lib/sysctl.h b/test/zdtm/lib/sysctl.h
new file mode 100644
index 000000000..67129102f
--- /dev/null
+++ b/test/zdtm/lib/sysctl.h
@@ -0,0 +1,7 @@
+#ifndef __ZDTM_SYSCTL__
+#define __ZDTM_SYSCTL__
+
+extern int sysctl_read_int(const char *name, int *data);
+extern int sysctl_write_int(const char *name, int val);
+
+#endif
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 36d00ca5c..f9d2efe74 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -207,6 +207,7 @@ TST_NOFILE	:=				\
 		pipe03				\
 		netns_sub			\
 		netns_sub_veth			\
+		netns_sub_sysctl	\
 		unlink_multiple_largefiles	\
 		config_inotify_irmap		\
 		thp_disable			\
diff --git a/test/zdtm/static/netns_sub_sysctl.c b/test/zdtm/static/netns_sub_sysctl.c
new file mode 100644
index 000000000..bf828e08e
--- /dev/null
+++ b/test/zdtm/static/netns_sub_sysctl.c
@@ -0,0 +1,56 @@
+#include <sched.h>
+
+#include "zdtmtst.h"
+#include "sysctl.h"
+
+const char *test_doc	= "Check dump and restore a net.unix.max_dgram_qlen sysctl parameter in subns";
+const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+
+typedef struct {
+	const char *path;
+	int old;
+	int new;
+} sysctl_opt_t;
+
+#define CONF_UNIX_BASE	"/proc/sys/net/unix"
+
+static sysctl_opt_t net_unix_params[] = {
+	{CONF_UNIX_BASE"/max_dgram_qlen", 0, 0},
+	{NULL, 0, 0}
+};
+
+int main(int argc, char **argv)
+{
+	int ret = 0;
+	sysctl_opt_t *p;
+	test_init(argc, argv);
+
+	for (p = net_unix_params; p->path != NULL; p++) {
+		p->old = (((unsigned)lrand48()) % 1023) + 1;
+		if (sysctl_write_int(p->path, p->old)) {
+			pr_perror("Can't change %s", p->path);
+			return -1;
+		}
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	for (p = net_unix_params; p->path != NULL; p++) {
+		if (sysctl_read_int(p->path, &p->new))
+			ret = 1;
+
+		if (p->old != p->new) {
+			errno = EINVAL;
+			pr_perror("%s changed: %d ---> %d", p->path, p->old, p->new);
+			ret = 1;
+		}
+	}
+
+	if (ret)
+		fail();
+	else
+		pass();
+
+	return ret;
+}
diff --git a/test/zdtm/static/netns_sub_sysctl.desc b/test/zdtm/static/netns_sub_sysctl.desc
new file mode 100644
index 000000000..535842668
--- /dev/null
+++ b/test/zdtm/static/netns_sub_sysctl.desc
@@ -0,0 +1,4 @@
+{
+    'flavor': 'ns',
+    'flags': 'suid'
+}

From 4c46cbc4d86c7578b98e64b8f664cf9c0b0fe978 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 16 Dec 2019 15:34:10 +0300
Subject: [PATCH 0100/1854] x86/cpu: cleanup and improve xfeatures_mask check

Make xfeatures_mask check explicit. We were relying on our guess about
hardware "backward compatibility" and used ">" check here for a long
time. But it looks better to explicitly check that all xfeature bits
available on the source are also available on the destination.

For xsave_size we need to have smaller size on destination than on
source, because xsave operation on small allocated buffer may corrupt
the nearby data. So split up comments about xfeatures_mask and
xsave_size, as having single comment for quiet a different cases is less
understandable.

v2: improve comments, remove extra else-ifs, remove extra typecast

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/arch/x86/cpu.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index 3808b9d33..72c5bd59c 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -236,6 +236,7 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 		return -1;
 
 	if (opts.cpu_cap & CPU_CAP_FPU) {
+		uint64_t m;
 		/*
 		 * If we're requested to check FPU only ignore
 		 * any other bit. It's up to a user if the
@@ -261,24 +262,33 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 #undef __mismatch_fpu_bit
 
 		/*
-		 * Make sure the xsave features are compatible. We already hit the
-		 * issue with libc where we've checkpointed the container on old
-		 * machine but restored on more modern one and libc fetched new
-		 * xsave frame size directly by xsave instruction with greedy
-		 * feature mask causing programs to misbehave.
+		 * Make sure the xsave features are compatible. Check that on
+		 * the destination there are all the features which were on the
+		 * source.
 		 */
-		if (cpu_info->xfeatures_mask > rt_cpu_info.xfeatures_mask) {
-			uint64_t m = cpu_info->xfeatures_mask & ~rt_cpu_info.xfeatures_mask;
-			pr_err("CPU xfeatures has unsupported bits (%#llx)\n",
-			       (unsigned long long)m);
+		if ((m = cpu_info->xfeatures_mask &
+			 ~rt_cpu_info.xfeatures_mask)) {
+			pr_err("CPU xfeatures has unsupported bits (%#"
+			       PRIx64")\n", m);
 			return -1;
-		} else if (cpu_info->xsave_size != rt_cpu_info.xsave_size) {
+		}
+
+		/*
+		 * Make sure the xsave sizes are compatible. We already hit the
+		 * issue with libc where we've checkpointed the container on
+		 * old machine but restored on more modern one and libc fetched
+		 * new xsave frame size directly by xsave instruction with
+		 * greedy feature mask causing programs to misbehave.
+		 */
+		if (cpu_info->xsave_size != rt_cpu_info.xsave_size) {
 			pr_err("CPU xsave size mismatch (%u/%u)\n",
 			       cpu_info->xsave_size, rt_cpu_info.xsave_size);
 			return -1;
-		} else if (cpu_info->xsave_size_max != rt_cpu_info.xsave_size_max) {
+		}
+		if (cpu_info->xsave_size_max != rt_cpu_info.xsave_size_max) {
 			pr_err("CPU xsave max size mismatch (%u/%u)\n",
-			       cpu_info->xsave_size_max, rt_cpu_info.xsave_size_max);
+			       cpu_info->xsave_size_max,
+			       rt_cpu_info.xsave_size_max);
 			return -1;
 		}
 	}

From 2e656222d78fecc1bf6490bed59078083bdb4351 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0101/1854] crit: fix python3 encoding issues

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 lib/py/images/images.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index f4517d845..3eedfca69 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -244,7 +244,7 @@ class ghost_file_handler:
             while True:
                 gc = pb.ghost_chunk_entry()
                 buf = f.read(4)
-                if buf == '':
+                if len(buf) == 0:
                     break
                 size, = struct.unpack('i', buf)
                 gc.ParseFromString(f.read(size))
@@ -252,13 +252,13 @@ class ghost_file_handler:
                 if no_payload:
                     f.seek(gc.len, os.SEEK_CUR)
                 else:
-                    entry['extra'] = base64.encodebytes(f.read(gc.len))
+                    entry['extra'] = base64.encodebytes(f.read(gc.len)).decode('utf-8')
                 entries.append(entry)
         else:
             if no_payload:
                 f.seek(0, os.SEEK_END)
             else:
-                g_entry['extra'] = base64.encodebytes(f.read())
+                g_entry['extra'] = base64.encodebytes(f.read()).decode('utf-8')
             entries.append(g_entry)
 
         return entries

From 00bb068785a8b1a7c4481e2e7f2c0b9f903d941b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Fri, 20 Dec 2019 18:09:15 +0000
Subject: [PATCH 0102/1854] scripts: alpine: Install py2 packages with pip

The py-future package has been renamed to py3-future [1] and py2 package
for yaml has been dropped [2].

[1] https://git.alpinelinux.org/aports/commit/main?id=316d44abaed13964e97eb43c095cd1b64e3943ad
[2] https://git.alpinelinux.org/aports/commit/main?id=e369c1fd7707a73f2c3e2b11b613198d9a4106de

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 scripts/build/Dockerfile.alpine        | 4 +---
 scripts/build/Dockerfile.openj9-alpine | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 70fdf480a..a1d1d9191 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -27,9 +27,7 @@ RUN mv .ccache /tmp && make mrproper && ccache -sz && \
 	date && make -j $(nproc) CC="$CC" && date && ccache -s
 
 RUN apk add \
-	py-yaml \
 	py-pip	\
-	py2-future \
 	ip6tables \
 	iptables \
 	iproute2 \
@@ -42,5 +40,5 @@ RUN apk add \
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
 
-RUN pip install protobuf ipaddress junit_xml flake8
+RUN pip install PyYAML future protobuf ipaddress junit_xml flake8
 RUN make -C test/zdtm
diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
index 654e7bf31..43a993444 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -17,9 +17,6 @@ RUN apk update && apk add \
 	python \
 	sudo \
 	maven \
-	py-yaml \
-	py-pip \
-	py2-future \
 	ip6tables \
 	iptables \
 	bash

From 0980617e24004ea00e4e0841c97b138f0a4e0073 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Thu, 12 Dec 2019 23:04:30 +0000
Subject: [PATCH 0103/1854] sockets: Remove duplicate variable assignment

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/sockets.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index 312b55c6d..80f3153ba 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -524,7 +524,7 @@ int restore_prepare_socket(int sk)
 
 int restore_socket_opts(int sk, SkOptsEntry *soe)
 {
-	int ret = 0, val;
+	int ret = 0, val = 1;
 	struct timeval tv;
 	/* In kernel a bufsize value is doubled. */
 	u32 bufs[2] = { soe->so_sndbuf / 2, soe->so_rcvbuf / 2};
@@ -547,27 +547,22 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 		ret |= restore_opt(sk, SOL_SOCKET, SO_MARK, &soe->so_mark);
 	}
 	if (soe->has_so_passcred && soe->so_passcred) {
-		val = 1;
 		pr_debug("\tset passcred for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_PASSCRED, &val);
 	}
 	if (soe->has_so_passsec && soe->so_passsec) {
-		val = 1;
 		pr_debug("\tset passsec for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_PASSSEC, &val);
 	}
 	if (soe->has_so_dontroute && soe->so_dontroute) {
-		val = 1;
 		pr_debug("\tset dontroute for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_DONTROUTE, &val);
 	}
 	if (soe->has_so_no_check && soe->so_no_check) {
-		val = 1;
 		pr_debug("\tset no_check for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_NO_CHECK, &val);
 	}
 	if (soe->has_so_broadcast && soe->so_broadcast) {
-		val = 1;
 		pr_debug("\tset broadcast for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_BROADCAST, &val);
 	}

From d4e6fc2a0dcff62ff246544d3d9a78d6961f253a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Fri, 13 Dec 2019 00:10:28 +0000
Subject: [PATCH 0104/1854] socket: c/r support for SO_KEEPALIVE

TCP keepalive packets can be used to determine if a connection
is still valid. When the SO_KEEPALIVE option is set, TCP packets
are periodically sent to keep the connection alive.

This patch implements checkpoint/restore support for SO_KEEPALIVE,
TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT options.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/include/sk-inet.h |  2 +-
 criu/sk-inet.c         |  6 +++++-
 criu/sk-tcp.c          | 20 +++++++++++++++++++-
 criu/sockets.c         | 20 ++++++++++++++++++++
 images/sk-opts.proto   |  4 ++++
 5 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index 79966517b..dec67ca6c 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -83,7 +83,7 @@ extern void tcp_locked_conn_add(struct inet_sk_info *);
 extern void rst_unlock_tcp_connections(void);
 extern void cpt_unlock_tcp_connections(void);
 
-extern int dump_one_tcp(int sk, struct inet_sk_desc *sd);
+extern int dump_one_tcp(int sk, struct inet_sk_desc *sd, SkOptsEntry *soe);
 extern int restore_one_tcp(int sk, struct inet_sk_info *si);
 
 #define SK_EST_PARAM	"tcp-established"
diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index f9c64c7af..342548585 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -551,7 +551,7 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 
 	switch (proto) {
 	case IPPROTO_TCP:
-		err = (type != SOCK_RAW) ? dump_one_tcp(lfd, sk) : 0;
+		err = (type != SOCK_RAW) ? dump_one_tcp(lfd, sk, &skopts) : 0;
 		break;
 	case IPPROTO_UDP:
 	case IPPROTO_UDPLITE:
@@ -747,6 +747,10 @@ static int post_open_inet_sk(struct file_desc *d, int sk)
 	if (!val && restore_opt(sk, SOL_SOCKET, SO_BROADCAST, &val))
 		return -1;
 
+	val = ii->ie->opts->so_keepalive;
+	if (!val && restore_opt(sk, SOL_SOCKET, SO_KEEPALIVE, &val))
+		return -1;
+
 	return 0;
 }
 
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 4fd2eb8e6..7ee603818 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -218,8 +218,26 @@ err_r:
 	return ret;
 }
 
-int dump_one_tcp(int fd, struct inet_sk_desc *sk)
+int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)
 {
+	soe->has_tcp_keepcnt = true;
+	if (dump_opt(fd, SOL_TCP, TCP_KEEPCNT, &soe->tcp_keepcnt)) {
+		pr_perror("Can't read TCP_KEEPCNT");
+		return -1;
+	}
+
+	soe->has_tcp_keepidle = true;
+	if (dump_opt(fd, SOL_TCP, TCP_KEEPIDLE, &soe->tcp_keepidle)) {
+		pr_perror("Can't read TCP_KEEPIDLE");
+		return -1;
+	}
+
+	soe->has_tcp_keepintvl = true;
+	if (dump_opt(fd, SOL_TCP, TCP_KEEPINTVL, &soe->tcp_keepintvl)) {
+		pr_perror("Can't read TCP_KEEPINTVL");
+		return -1;
+	}
+
 	if (sk->dst_port == 0)
 		return 0;
 
diff --git a/criu/sockets.c b/criu/sockets.c
index 80f3153ba..2e1ce9d7b 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -566,6 +566,22 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 		pr_debug("\tset broadcast for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_BROADCAST, &val);
 	}
+	if (soe->has_so_keepalive && soe->so_keepalive) {
+		pr_debug("\tset keepalive for socket\n");
+		ret |= restore_opt(sk, SOL_SOCKET, SO_KEEPALIVE, &val);
+	}
+	if (soe->has_tcp_keepcnt) {
+		pr_debug("\tset keepcnt for socket\n");
+		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPCNT, &soe->tcp_keepcnt);
+	}
+	if (soe->has_tcp_keepidle) {
+		pr_debug("\tset keepidle for socket\n");
+		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPIDLE, &soe->tcp_keepidle);
+	}
+	if (soe->has_tcp_keepintvl) {
+		pr_debug("\tset keepintvl for socket\n");
+		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPINTVL, &soe->tcp_keepintvl);
+	}
 
 	tv.tv_sec = soe->so_snd_tmo_sec;
 	tv.tv_usec = soe->so_snd_tmo_usec;
@@ -651,6 +667,10 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 	soe->has_so_broadcast = true;
 	soe->so_broadcast = val ? true : false;
 
+	ret |= dump_opt(sk, SOL_SOCKET, SO_KEEPALIVE, &val);
+	soe->has_so_keepalive = true;
+	soe->so_keepalive = val ? true : false;
+
 	ret |= dump_bound_dev(sk, soe);
 	ret |= dump_socket_filter(sk, soe);
 
diff --git a/images/sk-opts.proto b/images/sk-opts.proto
index c93ec5fd5..336cca22a 100644
--- a/images/sk-opts.proto
+++ b/images/sk-opts.proto
@@ -23,6 +23,10 @@ message sk_opts_entry {
 	repeated fixed64	so_filter	= 16;
 	optional bool		so_reuseport	= 17;
 	optional bool		so_broadcast	= 18;
+	optional bool		so_keepalive	= 19;
+	optional uint32		tcp_keepcnt	= 20;
+	optional uint32		tcp_keepidle	= 21;
+	optional uint32		tcp_keepintvl	= 22;
 }
 
 enum sk_shutdown {

From 8b467dd944f6b3bed0a468800b041efdb218d6e8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Fri, 13 Dec 2019 04:01:36 +0000
Subject: [PATCH 0105/1854] zdtm: Add test for SO_KEEPALIVE

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 test/zdtm/static/Makefile               |  3 +-
 test/zdtm/static/socket-tcp-keepalive.c | 97 +++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/static/socket-tcp-keepalive.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index f9d2efe74..ea5d3c42e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -105,7 +105,8 @@ TST_NOFILE	:=				\
 		socket-tcp-unconn		\
 		socket-tcp6-unconn		\
 		socket-tcp-syn-sent		\
-		socket-tcp-skip-in-flight       \
+		socket-tcp-skip-in-flight	\
+		socket-tcp-keepalive		\
 		sock_opts00			\
 		sock_opts01			\
 		sk-unix-unconn			\
diff --git a/test/zdtm/static/socket-tcp-keepalive.c b/test/zdtm/static/socket-tcp-keepalive.c
new file mode 100644
index 000000000..a977a03b5
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-keepalive.c
@@ -0,0 +1,97 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "test checkpoint/restore of SO_KEEPALIVE\n";
+const char *test_author = "Radostin Stoyanov <rstoyanov1@gmail.com>\n";
+
+int main(int argc, char **argv)
+{
+	int sk;
+	int alive = 1;
+	int cnt = 5;
+	int idle = 10;
+	int intvl = 15;
+	int optval;
+	socklen_t optlen;
+
+	test_init(argc, argv);
+
+	sk = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (sk < 0) {
+		pr_perror("Can't create socket");
+		return 1;
+	}
+
+	/* Set the option active */
+	if (setsockopt(sk, SOL_SOCKET, SO_KEEPALIVE, &alive, sizeof(alive)) < 0) {
+		pr_perror("setsockopt SO_KEEPALIVE");
+		return 1;
+	}
+
+	if (setsockopt(sk, SOL_TCP, TCP_KEEPCNT, &cnt, sizeof(cnt)) < 0) {
+		pr_perror("setsockopt TCP_KEEPCNT");
+		return 1;
+	}
+
+	if (setsockopt(sk, SOL_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)) < 0) {
+		pr_perror("setsockopt TCP_KEEPIDLE");
+		return 1;
+	}
+
+	optval = 5;
+	optlen = sizeof(optval);
+	if (setsockopt(sk, SOL_TCP, TCP_KEEPINTVL, &intvl, sizeof(intvl)) < 0) {
+		pr_perror("setsockopt TCP_KEEPINTVL");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (getsockopt(sk, SOL_SOCKET, SO_KEEPALIVE, &optval, &optlen)) {
+		pr_perror("getsockopt SO_KEEPALIVE");
+		return 1;
+	}
+
+	if (optlen != sizeof(optval) || optval != alive) {
+		fail("SO_KEEPALIVE not set");
+		return 1;
+	}
+
+	if (getsockopt(sk, SOL_TCP, TCP_KEEPCNT, &optval, &optlen) < 0) {
+		pr_perror("getsockopt TCP_KEEPCNT");
+		return 1;
+	}
+
+	if (optval != cnt) {
+		fail("TCP_KEEPCNT has incorrect value (%d != %d)", cnt, optval);
+		return 1;
+	}
+
+	if (getsockopt(sk, SOL_TCP, TCP_KEEPIDLE, &optval, &optlen) < 0) {
+		pr_perror("getsockopt TCP_KEEPIDLE");
+		return 1;
+	}
+
+	if (optval != idle) {
+		fail("TCP_KEEPIDLE has incorrect value (%d != %d)", idle, optval);
+		return 1;
+	}
+
+	if (getsockopt(sk, SOL_TCP, TCP_KEEPINTVL, &optval, &optlen) < 0) {
+		pr_perror("getsockopt TCP_KEEPINTVL");
+		return 1;
+	}
+
+	if (optval != intvl) {
+		fail("TCP_KEEPINTVL has incorrect value (%d != %d)", intvl, optval);
+		return 1;
+	}
+
+	pass();
+	return 0;
+}
\ No newline at end of file

From 79559bef92b524911b766d674ac8bc4470b8b378 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 20 Dec 2019 17:50:37 +0100
Subject: [PATCH 0106/1854] Fix tests on Ubuntu

It seems like Ubuntu introduced a overlayfs change which breaks CRIU:

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257

This disables overlayfs (unfortunately) in most tests by switching to
devicemapper or vfs.

Upstream kernels do not seem to have this problem.

This also adds the 'docker-test' for xenial which still has a working
overlayfs from CRIU's point of view.

Also adjust Podman Ubuntu package location

Podman Ubuntu packages are now available via OBS and no longer via PPA.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                   | 13 +++++++++++--
 scripts/travis/Makefile       |  5 ++++-
 scripts/travis/docker-test.sh | 15 ++++++++++-----
 scripts/travis/podman-test.sh | 13 ++++++++++---
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e6e410191..25dd6a29b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ env:
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
   - TR_ARCH=x86_64
   - TR_ARCH=x86_64      CLANG=1
-  - TR_ARCH=docker-test
   - TR_ARCH=openj9-test
 matrix:
   include:
@@ -57,6 +56,16 @@ matrix:
       arch: amd64
       env: TR_ARCH=podman-test
       dist: bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=docker-test
+      dist: bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=docker-test DIST=xenial
+      # On xenial it should be possible to test overlayfs;
+      # broken on the latest bionic kernel
+      dist: xenial
     - os: linux
       arch: amd64
       env: TR_ARCH=alpine      CLANG=1
@@ -79,9 +88,9 @@ matrix:
       dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
+    - env: TR_ARCH=docker-test DIST=xenial
     - env: TR_ARCH=fedora-rawhide
     - env: TR_ARCH=local       GCOV=1
-    - env: TR_ARCH=podman-test
 script:
   - sudo make CCACHE=1 -C scripts/travis $TR_ARCH
 after_success:
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index 373171149..17abb703a 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -58,7 +58,10 @@ docker-test:
 podman-test:
 	./podman-test.sh
 
-openj9-test:
+# overlayfs behaves differently on Ubuntu and breaks CRIU
+# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
+# Switch to devicemapper
+openj9-test: restart-docker
 	./openj9-test.sh
 
 %:
diff --git a/scripts/travis/docker-test.sh b/scripts/travis/docker-test.sh
index ee96fef48..ac420a445 100755
--- a/scripts/travis/docker-test.sh
+++ b/scripts/travis/docker-test.sh
@@ -19,11 +19,16 @@ apt-get update -qq
 
 apt-get install -qq docker-ce
 
-cat > /etc/docker/daemon.json <<EOF
-{
-    "experimental": true
-}
-EOF
+. /etc/lsb-release
+
+if [ "$DISTRIB_RELEASE" = "18.04" ]; then
+    # overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU
+    # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
+    # Switch to devicemapper
+    echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
+else
+    echo '{ "experimental": true }' > /etc/docker/daemon.json
+fi
 
 service docker restart
 
diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh
index eafdc73be..5189477cd 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/travis/podman-test.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 set -x -e -o pipefail
 
-add-apt-repository -y ppa:projectatomic/ppa
+echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+
+wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_18.04/Release.key -O- | apt-key add -
+
+# podman conflicts with a man page from docker-ce
+# this is a podman packaging bug (https://github.com/containers/libpod/issues/4747)
+apt-get -y purge docker-ce
 
 apt-get install -qq \
     apt-transport-https \
@@ -10,7 +16,6 @@ apt-get install -qq \
     software-properties-common
 
 apt-get update -qq
-
 apt-get install -qqy podman containernetworking-plugins
 
 export SKIP_TRAVIS_TEST=1
@@ -21,7 +26,9 @@ cd ../../
 
 make install
 
-podman info
+# overlaysfs behaves differently on Ubuntu and breaks CRIU
+# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
+podman --storage-driver vfs info
 
 criu --version
 

From 8bb3c17a0f7f14baaed8d9b6ebf953c24a793ccc Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Sat, 21 Dec 2019 18:08:23 +0000
Subject: [PATCH 0107/1854] style: Enforce kernel style
 -Wdeclaration-after-statement

Include warnings that the kernel uses during compilation:
-Wdeclaration-after-statement: enforces having variables declared at the top of scopes

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
[Generated a commit message from the pull request]
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 Makefile                                      |  2 +-
 criu/net.c                                    |  7 +++++--
 criu/page-xfer.c                              | 10 +++++-----
 criu/pie/util-vdso.c                          |  3 ++-
 test/zdtm/Makefile.inc                        |  1 +
 test/zdtm/static/arm-neon00.c                 | 11 +++++-----
 test/zdtm/static/child_subreaper.c            |  6 +++---
 test/zdtm/static/config_inotify_irmap.c       |  3 ++-
 test/zdtm/static/inotify00.c                  |  3 ++-
 test/zdtm/static/maps03.c                     |  3 ++-
 test/zdtm/static/mnt_ext_dev.c                |  3 ++-
 test/zdtm/static/mntns_link_remap.c           |  2 +-
 test/zdtm/static/mntns_open.c                 |  2 +-
 test/zdtm/static/mountpoints.c                |  2 +-
 test/zdtm/static/remap_dead_pid.c             |  4 ++--
 test/zdtm/static/selinux01.c                  |  3 ++-
 test/zdtm/static/sigaltstack.c                | 20 +++++++++----------
 test/zdtm/static/socket-tcp-syn-sent.c        |  4 ++--
 test/zdtm/static/unlink_multiple_largefiles.c |  3 ++-
 test/zdtm/transition/file_aio.c               |  3 ++-
 test/zdtm/transition/file_read.c              |  5 ++++-
 test/zdtm/transition/maps008.c                | 14 +++++++------
 22 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/Makefile b/Makefile
index ef76d706c..133390f17 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ export PROTOUFIX DEFINES
 DEFINES			+= -D_FILE_OFFSET_BITS=64
 DEFINES			+= -D_GNU_SOURCE
 
-WARNINGS		:= -Wall -Wformat-security
+WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement
 
 CFLAGS-GCOV		:= --coverage -fno-exceptions -fno-inline -fprofile-update=atomic
 export CFLAGS-GCOV
diff --git a/criu/net.c b/criu/net.c
index e960a34f9..712837782 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2817,6 +2817,9 @@ int macvlan_ext_add(struct external *ext)
 static int prep_ns_sockets(struct ns_id *ns, bool for_dump)
 {
 	int nsret = -1, ret;
+#ifdef CONFIG_HAS_SELINUX
+	security_context_t ctx;
+#endif
 
 	if (ns->type != NS_CRIU) {
 		pr_info("Switching to %d's net for collecting sockets\n", ns->ns_pid);
@@ -2854,7 +2857,6 @@ static int prep_ns_sockets(struct ns_id *ns, bool for_dump)
 	 * policies installed. For Fedora based systems this is part
 	 * of the container-selinux package.
 	 */
-	security_context_t ctx;
 
 	/*
 	 * This assumes that all processes CRIU wants to dump are labeled
@@ -3294,6 +3296,7 @@ int kerndat_link_nsid()
 	}
 
 	if (pid == 0) {
+		bool has_link_nsid;
 		NetDeviceEntry nde = NET_DEVICE_ENTRY__INIT;
 		struct net_link link = {
 			.created = false,
@@ -3336,7 +3339,7 @@ int kerndat_link_nsid()
 			exit(1);
 		}
 
-		bool has_link_nsid = false;
+		has_link_nsid = false;
 		if (check_link_nsid(sk, &has_link_nsid))
 			exit(1);
 
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 4d2d046ef..9affc2706 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -624,17 +624,17 @@ unsigned long handle_faulty_iov(int pid, struct iovec* riov,
 				unsigned long* aux_len,
 				unsigned long partial_read_bytes)
 {
+	struct iovec dummy;
+	ssize_t bytes_read;
+	unsigned long offset = 0;
+	unsigned long final_read_cnt = 0;
+
 	/* Handling Case 2*/
 	if (riov[faulty_index].iov_len == PAGE_SIZE) {
 		cnt_sub(CNT_PAGES_WRITTEN, 1);
 		return 0;
 	}
 
-	struct iovec dummy;
-	ssize_t bytes_read;
-	unsigned long offset = 0;
-	unsigned long final_read_cnt = 0;
-
 	/* Handling Case 3-Part 3.2*/
 	offset = (partial_read_bytes)? partial_read_bytes : PAGE_SIZE;
 
diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index 104da0633..58b27680c 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -243,10 +243,11 @@ static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 		k = elf_hash((const unsigned char *)symbol);
 
 		for (j = bucket[k % nbucket]; j < nchain && j != STN_UNDEF; j = chain[j]) {
-			addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
 			Sym_t *sym;
 			char *name;
 
+			addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
+
 			addr += sizeof(Sym_t)*j;
 			if (__ptr_struct_oob(addr, sizeof(Sym_t), mem, size))
 				continue;
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 32fc72d32..6958d128e 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -38,6 +38,7 @@ ifeq ($(origin CC), default)
         CC := $(CROSS_COMPILE)$(HOSTCC)
 endif
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+CFLAGS	+= -Wdeclaration-after-statement
 CFLAGS	+= $(USERCFLAGS)
 CFLAGS	+= -D_GNU_SOURCE
 CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
diff --git a/test/zdtm/static/arm-neon00.c b/test/zdtm/static/arm-neon00.c
index 96da16c6b..ce8123e51 100644
--- a/test/zdtm/static/arm-neon00.c
+++ b/test/zdtm/static/arm-neon00.c
@@ -12,13 +12,14 @@ const char *test_author	= "Alexander Karatshov <alekskartashov@parallels.com>";
 
 int main(int argc, char ** argv)
 {
+	int a, b, c, y1, y2;
+
 	srand(time(0));
 
-	int a = rand() % 100;
-	int b = rand() % 100;
-	int c = rand() % 100;
-	int y1 = a + b*c;
-	int y2;
+	a = rand() % 100;
+	b = rand() % 100;
+	c = rand() % 100;
+	y1 = a + b*c;
 
 	test_init(argc, argv);
 
diff --git a/test/zdtm/static/child_subreaper.c b/test/zdtm/static/child_subreaper.c
index 267795249..6d02c9f93 100644
--- a/test/zdtm/static/child_subreaper.c
+++ b/test/zdtm/static/child_subreaper.c
@@ -8,10 +8,11 @@ const char *test_author	= "Michał Cłapiński <mclapinski@google.com>";
 
 int main(int argc, char **argv)
 {
+	int cs_before = 1, cs_after, ret;
+
 	test_init(argc, argv);
 
-	int cs_before = 1;
-	int ret = prctl(PR_SET_CHILD_SUBREAPER, cs_before, 0, 0, 0);
+	ret = prctl(PR_SET_CHILD_SUBREAPER, cs_before, 0, 0, 0);
 	if (ret) {
 		pr_perror("Can't set child subreaper attribute, err = %d", ret);
 		exit(1);
@@ -20,7 +21,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	int cs_after;
 	ret = prctl(PR_GET_CHILD_SUBREAPER, (unsigned long)&cs_after, 0, 0, 0);
 	if (ret) {
 		pr_perror("Can't get child subreaper attribute, err = %d", ret);
diff --git a/test/zdtm/static/config_inotify_irmap.c b/test/zdtm/static/config_inotify_irmap.c
index 831dc1974..3cbeba7d3 100644
--- a/test/zdtm/static/config_inotify_irmap.c
+++ b/test/zdtm/static/config_inotify_irmap.c
@@ -31,6 +31,7 @@ char test_files[2][128] = {TDIR"/zdtm-test", TDIR"/zdtm-test1",};
 
 int main (int argc, char *argv[])
 {
+	FILE *configfile;
 	char buf[BUFF_SIZE];
 	int fd, wd, i;
 
@@ -56,7 +57,7 @@ int main (int argc, char *argv[])
 		}
 	}
 
-	FILE *configfile = fopen(CONFIG_PATH, "w");
+	configfile = fopen(CONFIG_PATH, "w");
 	if (configfile == NULL) {
 		pr_perror("Unable to create configuration file %s", CONFIG_PATH);
 		goto err;
diff --git a/test/zdtm/static/inotify00.c b/test/zdtm/static/inotify00.c
index 67088edd8..635c05047 100644
--- a/test/zdtm/static/inotify00.c
+++ b/test/zdtm/static/inotify00.c
@@ -125,9 +125,10 @@ int main (int argc, char *argv[])
 {
 	pid_t pid;
 	task_waiter_t t;
-	task_waiter_init(&t);
 	static char buf[PATH_MAX];
 
+	task_waiter_init(&t);
+
 	if (mount(NULL, "/", NULL, MS_PRIVATE | MS_REC, NULL)) {
 		pr_perror("Unable to remount /");
 		return 1;
diff --git a/test/zdtm/static/maps03.c b/test/zdtm/static/maps03.c
index f2bf7957a..0e0a5b8f2 100644
--- a/test/zdtm/static/maps03.c
+++ b/test/zdtm/static/maps03.c
@@ -16,9 +16,10 @@ const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 int main(int argc, char **argv)
 {
-	test_init(argc, argv);
 	unsigned char *mem;
 
+	test_init(argc, argv);
+
 	test_msg("Alloc huge VMA\n");
 	mem = (void *)mmap(NULL, (10L << 30), PROT_READ | PROT_WRITE,
 			   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
diff --git a/test/zdtm/static/mnt_ext_dev.c b/test/zdtm/static/mnt_ext_dev.c
index a9ac01333..1d60fc92f 100644
--- a/test/zdtm/static/mnt_ext_dev.c
+++ b/test/zdtm/static/mnt_ext_dev.c
@@ -20,10 +20,11 @@ TEST_OPTION(dirname, string, "directory name", 1);
 int main(int argc, char **argv)
 {
 	char *loop, fd, dfd, fd2;
-	test_init(argc, argv);
 	struct stat st, stp, st2;
 	char dname[PATH_MAX], dname2[PATH_MAX];
 
+	test_init(argc, argv);
+
 	snprintf(dname, sizeof(dname), "%s/test_dir", dirname);
 	snprintf(dname2, sizeof(dname2), "%s/test_dir2", dirname);
 
diff --git a/test/zdtm/static/mntns_link_remap.c b/test/zdtm/static/mntns_link_remap.c
index 642641b16..6ac08191a 100644
--- a/test/zdtm/static/mntns_link_remap.c
+++ b/test/zdtm/static/mntns_link_remap.c
@@ -230,8 +230,8 @@ int main(int argc, char **argv)
 
 
 	if (pid > 0) {
-		kill(pid, SIGTERM);
 		int status = 1;
+		kill(pid, SIGTERM);
 		wait(&status);
 		if (WIFEXITED(status)) {
 			if (WEXITSTATUS(status) == AWK_OK)
diff --git a/test/zdtm/static/mntns_open.c b/test/zdtm/static/mntns_open.c
index e19c4ea72..c687080a7 100644
--- a/test/zdtm/static/mntns_open.c
+++ b/test/zdtm/static/mntns_open.c
@@ -119,8 +119,8 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (pid > 0) {
-		kill(pid, SIGTERM);
 		int status = 1;
+		kill(pid, SIGTERM);
 		wait(&status);
 		if (WIFEXITED(status)) {
 			if (WEXITSTATUS(status) == AWK_OK)
diff --git a/test/zdtm/static/mountpoints.c b/test/zdtm/static/mountpoints.c
index 00475cdc5..cf54d1096 100644
--- a/test/zdtm/static/mountpoints.c
+++ b/test/zdtm/static/mountpoints.c
@@ -292,8 +292,8 @@ int main(int argc, char **argv)
 	}
 
 	if (pid > 0) {
-		kill(pid, SIGTERM);
 		int status = 1;
+		kill(pid, SIGTERM);
 		wait(&status);
 		if (status)
 			return 1;
diff --git a/test/zdtm/static/remap_dead_pid.c b/test/zdtm/static/remap_dead_pid.c
index 261c591b7..5d4241fc6 100644
--- a/test/zdtm/static/remap_dead_pid.c
+++ b/test/zdtm/static/remap_dead_pid.c
@@ -40,12 +40,12 @@ int main(int argc, char **argv)
 		while(1)
 			sleep(10);
 	} else {
-		test_msg("child is %d\n", pid);
-
 		int fd, ret;
 		char path[PATH_MAX];
 		pid_t result;
 
+		test_msg("child is %d\n", pid);
+
 		sprintf(path, proc_path, pid);
 		fd = open(path, O_RDONLY);
 		if (fd < 0) {
diff --git a/test/zdtm/static/selinux01.c b/test/zdtm/static/selinux01.c
index 9966455c4..cec5980e8 100644
--- a/test/zdtm/static/selinux01.c
+++ b/test/zdtm/static/selinux01.c
@@ -133,6 +133,7 @@ int check_sockcreate_empty()
 
 int main(int argc, char **argv)
 {
+	int sk;
 	char ctx[1024];
 	test_init(argc, argv);
 
@@ -159,7 +160,7 @@ int main(int argc, char **argv)
 #endif
 
 	/* Open our test socket */
-	int sk = socket(AF_INET, SOCK_STREAM, 0);
+	sk = socket(AF_INET, SOCK_STREAM, 0);
 	memset(ctx, 0, 1024);
 	/* Read out the socket label */
 	if (fgetxattr(sk, "security.selinux", ctx, 1024) == -1) {
diff --git a/test/zdtm/static/sigaltstack.c b/test/zdtm/static/sigaltstack.c
index d324b0d37..f36d409f5 100644
--- a/test/zdtm/static/sigaltstack.c
+++ b/test/zdtm/static/sigaltstack.c
@@ -61,17 +61,17 @@ void thread_sigaction(int signo, siginfo_t *info, void *context)
 
 static void *thread_func(void *arg)
 {
+	struct sigaction sa = {
+		.sa_sigaction	= thread_sigaction,
+		.sa_flags	= SA_RESTART | SA_ONSTACK,
+	};
+
 	sas_state[SAS_THRD_OLD] = (stack_t) {
 		.ss_size	= sizeof(stack_thread) - 8,
 		.ss_sp		= stack_thread,
 		.ss_flags	= 0,
 	};
 
-	struct sigaction sa = {
-		.sa_sigaction	= thread_sigaction,
-		.sa_flags	= SA_RESTART | SA_ONSTACK,
-	};
-
 	sigemptyset(&sa.sa_mask);
 
 	if (sigaction(SIGUSR2, &sa, NULL)) {
@@ -103,17 +103,17 @@ int main(int argc, char *argv[])
 {
 	pthread_t thread;
 
+	struct sigaction sa = {
+		.sa_sigaction	= leader_sigaction,
+		.sa_flags	= SA_RESTART | SA_ONSTACK,
+	};
+
 	sas_state[SAS_MAIN_OLD] = (stack_t) {
 		.ss_size	= sizeof(stack_main) - 8,
 		.ss_sp		= stack_main,
 		.ss_flags	= 0,
 	};
 
-	struct sigaction sa = {
-		.sa_sigaction	= leader_sigaction,
-		.sa_flags	= SA_RESTART | SA_ONSTACK,
-	};
-
 	sigemptyset(&sa.sa_mask);
 
 	test_init(argc, argv);
diff --git a/test/zdtm/static/socket-tcp-syn-sent.c b/test/zdtm/static/socket-tcp-syn-sent.c
index cf4c3bb46..755532a8a 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.c
+++ b/test/zdtm/static/socket-tcp-syn-sent.c
@@ -37,7 +37,7 @@ int main(int argc, char **argv)
 {
 	int fd, fd_s, sock, sk;
 	union sockaddr_inet addr;
-	char cmd[4096];
+	char c, cmd[4096];
 
 	test_init(argc, argv);
 
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
 
 	fcntl(sock, F_SETFL, 0);
 
-	char c = 5;
+	c = 5;
 	if (write(sock, &c, 1) != 1) {
 		fail("Unable to send data");
 		return 1;
diff --git a/test/zdtm/static/unlink_multiple_largefiles.c b/test/zdtm/static/unlink_multiple_largefiles.c
index 7cf628606..2f9248c2f 100644
--- a/test/zdtm/static/unlink_multiple_largefiles.c
+++ b/test/zdtm/static/unlink_multiple_largefiles.c
@@ -30,10 +30,11 @@ void create_check_pattern(char *buf, size_t count, unsigned char seed)
 
 struct fiemap *read_fiemap(int fd)
 {
-	test_msg("Obtaining fiemap for fd %d\n", fd);
 	struct fiemap *fiemap, *tmp;
 	int extents_size;
 
+	test_msg("Obtaining fiemap for fd %d\n", fd);
+
 	fiemap = malloc(sizeof(struct fiemap));
 	if (fiemap == NULL) {
 		pr_perror("Cannot allocate fiemap");
diff --git a/test/zdtm/transition/file_aio.c b/test/zdtm/transition/file_aio.c
index a16010158..4a76c9390 100644
--- a/test/zdtm/transition/file_aio.c
+++ b/test/zdtm/transition/file_aio.c
@@ -17,7 +17,6 @@ const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 int main(int argc, char **argv)
 {
-	test_init(argc, argv);
 	char buf[BUF_SIZE];
 	int fd;
 	struct aiocb aiocb;
@@ -25,6 +24,8 @@ int main(int argc, char **argv)
 	char tmpfname[256]="/tmp/file_aio.XXXXXX";
 	int ret;
 
+	test_init(argc, argv);
+
 	fd = mkstemp(tmpfname);
 	if (fd == -1) {
 		pr_perror("mkstemp() failed");
diff --git a/test/zdtm/transition/file_read.c b/test/zdtm/transition/file_read.c
index 50dffd8c4..5d6e4dbba 100644
--- a/test/zdtm/transition/file_read.c
+++ b/test/zdtm/transition/file_read.c
@@ -158,9 +158,11 @@ static void chew_some_file(int num)
 			rv = SEEK_FAILED;
 			goto out_exit;
 		case 1:
-			rv = FILE_CORRUPTED;
+			{
 			int fd1;
 			char str[PATH_MAX];
+
+			rv = FILE_CORRUPTED;
 			// create standard file
 			sprintf(str, "standard_%s.%d", filename, num);
 			fd1 = open(str, O_WRONLY | O_CREAT | O_TRUNC, 0666);
@@ -168,6 +170,7 @@ static void chew_some_file(int num)
 				pr_perror("can't write %s", str);
 			close(fd1);
 			goto out_exit;
+			}
 		}
 	}
 	rv = SUCCESS;
diff --git a/test/zdtm/transition/maps008.c b/test/zdtm/transition/maps008.c
index 5f6eb0887..7ed7c10a5 100644
--- a/test/zdtm/transition/maps008.c
+++ b/test/zdtm/transition/maps008.c
@@ -348,6 +348,7 @@ static int proc11_func(task_waiter_t *setup_waiter)
 	void *mem3_old = mem3;
 	size_t mem3_size_old = mem3_size;
 	uint32_t crc_epoch = 0;
+	uint8_t *proc1_mem3;
 
 	pstree->proc11 = getpid();
 	xmunmap(mem3, MEM3_START_CUT);
@@ -382,7 +383,7 @@ static int proc11_func(task_waiter_t *setup_waiter)
 	chk_proc_mem_eq(pstree->proc11, mem3, mem3_size,
 		pstree->proc112, mem3, mem3_size + MEM3_END_CUT);
 
-	uint8_t *proc1_mem3 = mmap_proc_mem(pstree->proc1,
+	proc1_mem3 = mmap_proc_mem(pstree->proc1,
 			(unsigned long)mem3_old, mem3_size_old);
 	check_mem_eq(mem3, mem3_size, proc1_mem3 + MEM3_START_CUT, mem3_size);
 	xmunmap(proc1_mem3, mem3_size_old);
@@ -489,16 +490,17 @@ static void sigchld_hand(int signo, siginfo_t *info, void *ucontext)
 
 int main(int argc, char **argv)
 {
-	test_init(argc, argv);
-
-	pstree = (struct pstree *)mmap_ashmem(PAGE_SIZE);
-	test_sync = (struct test_sync *)mmap_ashmem(sizeof(*test_sync));
-
 	struct sigaction sa = {
 		.sa_sigaction = sigchld_hand,
 		.sa_flags = SA_RESTART | SA_SIGINFO | SA_NOCLDSTOP
 	};
 	sigemptyset(&sa.sa_mask);
+
+	test_init(argc, argv);
+
+	pstree = (struct pstree *)mmap_ashmem(PAGE_SIZE);
+	test_sync = (struct test_sync *)mmap_ashmem(sizeof(*test_sync));
+
 	if (sigaction(SIGCHLD, &sa, NULL)) {
 		pr_perror("SIGCHLD handler setup");
 		exit(1);

From 17c4a8b24507d1bd1a906aa4a9d5ea3054072141 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Sat, 21 Dec 2019 18:13:06 +0000
Subject: [PATCH 0108/1854] style: Enforce kernel style -Wstrict-prototypes

Include warnings that the kernel uses during compilation:
-Wstrict-prototypes: enforces full declaration of functions.
Previously, when declaring extern void func(), one can call func(123)
and have no compilation error. This is dangerous. The correct declaration
is extern void func(void).

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
[Generated a commit message from the pull request]
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 Makefile                                      |  2 +-
 criu/config.c                                 |  2 +-
 criu/cr-check.c                               | 10 ++++-----
 criu/cr-dump.c                                |  4 ++--
 criu/cr-restore.c                             |  8 +++----
 criu/cr-service.c                             |  4 ++--
 criu/crtools.c                                |  2 +-
 criu/fault-injection.c                        |  2 +-
 criu/include/cr_options.h                     |  4 ++--
 criu/include/lsm.h                            |  4 ++--
 criu/include/mount.h                          |  2 +-
 criu/include/net.h                            |  8 +++----
 criu/include/tls.h                            |  2 +-
 criu/kerndat.c                                |  6 ++---
 criu/lsm.c                                    |  2 +-
 criu/mount.c                                  |  6 ++---
 criu/namespaces.c                             |  2 +-
 criu/net.c                                    | 10 ++++-----
 criu/pstree.c                                 |  2 +-
 criu/seize.c                                  |  2 +-
 criu/tls.c                                    |  6 ++---
 criu/util.c                                   |  4 ++--
 soccr/test/tcp-conn.c                         |  2 +-
 soccr/test/tcp-constructor.c                  |  2 +-
 test/others/unix-callback/unix-client.c       |  2 +-
 test/others/unix-callback/unix-server.c       |  2 +-
 test/zdtm/Makefile.inc                        |  2 +-
 test/zdtm/lib/test.c                          |  6 ++---
 test/zdtm/static/apparmor.c                   |  4 ++--
 .../static/child_subreaper_and_reparent.c     |  6 ++---
 .../static/child_subreaper_existing_child.c   |  6 ++---
 test/zdtm/static/dumpable02.c                 |  2 +-
 test/zdtm/static/fdt_shared.c                 |  4 ++--
 test/zdtm/static/file_locks00.c               |  2 +-
 test/zdtm/static/inotify_system.c             |  2 +-
 test/zdtm/static/maps00.c                     |  7 +++---
 test/zdtm/static/selinux00.c                  |  8 +++----
 test/zdtm/static/selinux01.c                  | 10 ++++-----
 test/zdtm/static/session02.c                  |  8 +++----
 test/zdtm/static/session03.c                  | 10 ++++-----
 test/zdtm/transition/netlink00.c              | 22 +++++++++----------
 41 files changed, 101 insertions(+), 100 deletions(-)

diff --git a/Makefile b/Makefile
index 133390f17..00e563c11 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ export PROTOUFIX DEFINES
 DEFINES			+= -D_FILE_OFFSET_BITS=64
 DEFINES			+= -D_GNU_SOURCE
 
-WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement
+WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement -Wstrict-prototypes
 
 CFLAGS-GCOV		:= --coverage -fno-exceptions -fno-inline -fprofile-update=atomic
 export CFLAGS-GCOV
diff --git a/criu/config.c b/criu/config.c
index e5d42efe4..73c62f5bb 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -853,7 +853,7 @@ bad_arg:
 	return 1;
 }
 
-int check_options()
+int check_options(void)
 {
 	if (opts.tcp_established_ok)
 		pr_info("Will dump/restore TCP connections\n");
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 729b2dc38..17dd29b42 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -51,7 +51,7 @@
 #include "restorer.h"
 #include "uffd.h"
 
-static char *feature_name(int (*func)());
+static char *feature_name(int (*func)(void));
 
 static int check_tty(void)
 {
@@ -513,7 +513,7 @@ static int check_ipc(void)
 	return -1;
 }
 
-static int check_sigqueuinfo()
+static int check_sigqueuinfo(void)
 {
 	siginfo_t info = { .si_code = 1 };
 
@@ -960,7 +960,7 @@ static int clone_cb(void *_arg) {
 	exit(0);
 }
 
-static int check_clone_parent_vs_pid()
+static int check_clone_parent_vs_pid(void)
 {
 	struct clone_arg ca;
 	pid_t pid;
@@ -1447,7 +1447,7 @@ static int check_external_net_ns(void)
 
 struct feature_list {
 	char *name;
-	int (*func)();
+	int (*func)(void);
 };
 
 static struct feature_list feature_list[] = {
@@ -1517,7 +1517,7 @@ int check_add_feature(char *feat)
 	return -1;
 }
 
-static char *feature_name(int (*func)())
+static char *feature_name(int (*func)(void))
 {
 	struct feature_list *fl;
 
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 4b5a01cfd..88323af92 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1439,7 +1439,7 @@ err_cure_imgset:
 
 static int alarm_attempts = 0;
 
-bool alarm_timeouted() {
+bool alarm_timeouted(void) {
 	return alarm_attempts > 0;
 }
 
@@ -1456,7 +1456,7 @@ static void alarm_handler(int signo)
 	BUG();
 }
 
-static int setup_alarm_handler()
+static int setup_alarm_handler(void)
 {
 	struct sigaction sa = {
 		.sa_handler	= alarm_handler,
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index b920ce262..687cd6c68 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -182,13 +182,13 @@ static int __restore_wait_inprogress_tasks(int participants)
 	return 0;
 }
 
-static int restore_wait_inprogress_tasks()
+static int restore_wait_inprogress_tasks(void)
 {
 	return __restore_wait_inprogress_tasks(0);
 }
 
 /* Wait all tasks except the current one */
-static int restore_wait_other_tasks()
+static int restore_wait_other_tasks(void)
 {
 	int participants, stage;
 
@@ -1587,7 +1587,7 @@ static void restore_pgid(void)
 		futex_set_and_wake(&rsti(current)->pgrp_set, 1);
 }
 
-static int __legacy_mount_proc()
+static int __legacy_mount_proc(void)
 {
 	char proc_mountpoint[] = "/tmp/crtools-proc.XXXXXX";
 	int fd;
@@ -1941,7 +1941,7 @@ static int catch_tasks(bool root_seized, enum trace_flags *flag)
 	return 0;
 }
 
-static int clear_breakpoints()
+static int clear_breakpoints(void)
 {
 	struct pstree_item *item;
 	int ret = 0, i;
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 549b3368b..279016bcd 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -1278,7 +1278,7 @@ static void reap_worker(int signo)
 	}
 }
 
-static int setup_sigchld_handler()
+static int setup_sigchld_handler(void)
 {
 	struct sigaction action;
 
@@ -1295,7 +1295,7 @@ static int setup_sigchld_handler()
 	return 0;
 }
 
-static int restore_sigchld_handler()
+static int restore_sigchld_handler(void)
 {
 	struct sigaction action;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index 700fad994..9b6e94809 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -47,7 +47,7 @@
 #include "setproctitle.h"
 #include "sysctl.h"
 
-void flush_early_log_to_stderr() __attribute__((destructor));
+void flush_early_log_to_stderr(void) __attribute__((destructor));
 
 void flush_early_log_to_stderr(void)
 {
diff --git a/criu/fault-injection.c b/criu/fault-injection.c
index 4128814d5..4b0650008 100644
--- a/criu/fault-injection.c
+++ b/criu/fault-injection.c
@@ -3,7 +3,7 @@
 
 enum faults fi_strategy;
 
-int fault_injection_init()
+int fault_injection_init(void)
 {
 	char *val;
 	int start;
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 2c1451e86..c5af33186 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -158,7 +158,7 @@ extern struct cr_options opts;
 char *rpc_cfg_file;
 
 extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
-extern int check_options();
-extern void init_opts();
+extern int check_options(void);
+extern void init_opts(void);
 
 #endif /* __CR_OPTIONS_H__ */
diff --git a/criu/include/lsm.h b/criu/include/lsm.h
index 3b8271282..a41915a4c 100644
--- a/criu/include/lsm.h
+++ b/criu/include/lsm.h
@@ -39,7 +39,7 @@ extern int lsm_check_opts(void);
 #ifdef CONFIG_HAS_SELINUX
 int dump_xattr_security_selinux(int fd, FdinfoEntry *e);
 int run_setsockcreatecon(FdinfoEntry *e);
-int reset_setsockcreatecon();
+int reset_setsockcreatecon(void);
 #else
 static inline int dump_xattr_security_selinux(int fd, FdinfoEntry *e) {
 	return 0;
@@ -47,7 +47,7 @@ static inline int dump_xattr_security_selinux(int fd, FdinfoEntry *e) {
 static inline int run_setsockcreatecon(FdinfoEntry *e) {
 	return 0;
 }
-static inline int reset_setsockcreatecon() {
+static inline int reset_setsockcreatecon(void) {
 	return 0;
 }
 #endif
diff --git a/criu/include/mount.h b/criu/include/mount.h
index d9b375f5d..8bf19b266 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -96,7 +96,7 @@ extern int collect_binfmt_misc(void);
 static inline int collect_binfmt_misc(void) { return 0; }
 #endif
 
-extern struct mount_info *mnt_entry_alloc();
+extern struct mount_info *mnt_entry_alloc(void);
 extern void mnt_entry_free(struct mount_info *mi);
 
 extern int __mntns_get_root_fd(pid_t pid);
diff --git a/criu/include/net.h b/criu/include/net.h
index 9976f6eb0..0a556f3da 100644
--- a/criu/include/net.h
+++ b/criu/include/net.h
@@ -31,7 +31,7 @@ extern int collect_net_namespaces(bool for_dump);
 
 extern int network_lock(void);
 extern void network_unlock(void);
-extern int network_lock_internal();
+extern int network_lock_internal(void);
 
 extern struct ns_desc net_ns_desc;
 
@@ -47,11 +47,11 @@ extern int move_veth_to_bridge(void);
 
 extern int kerndat_link_nsid(void);
 extern int net_get_nsid(int rtsk, int fd, int *nsid);
-extern struct ns_id *net_get_root_ns();
+extern struct ns_id *net_get_root_ns(void);
 extern int kerndat_nsid(void);
 extern void check_has_netns_ioc(int fd, bool *kdat_val, const char *name);
 extern int net_set_ext(struct ns_id *ns);
-extern struct ns_id *get_root_netns();
-extern int read_net_ns_img();
+extern struct ns_id *get_root_netns(void);
+extern int read_net_ns_img(void);
 
 #endif /* __CR_NET_H__ */
diff --git a/criu/include/tls.h b/criu/include/tls.h
index aa2517887..b48e4b480 100644
--- a/criu/include/tls.h
+++ b/criu/include/tls.h
@@ -4,7 +4,7 @@
 # ifdef CONFIG_GNUTLS
 
 int tls_x509_init(int sockfd, bool is_server);
-void tls_terminate_session();
+void tls_terminate_session(void);
 
 ssize_t tls_send(const void *buf, size_t len, int flags);
 ssize_t tls_recv(void *buf, size_t len, int flags);
diff --git a/criu/kerndat.c b/criu/kerndat.c
index b0dd83135..d1afde71d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -364,7 +364,7 @@ no_dt:
 }
 
 /* The page frame number (PFN) is constant for the zero page */
-static int init_zero_page_pfn()
+static int init_zero_page_pfn(void)
 {
 	void *addr;
 	int ret = 0;
@@ -429,7 +429,7 @@ static int get_task_size(void)
 	return 0;
 }
 
-static int kerndat_fdinfo_has_lock()
+static int kerndat_fdinfo_has_lock(void)
 {
 	int fd, pfd = -1, exit_code = -1, len;
 	char buf[PAGE_SIZE];
@@ -464,7 +464,7 @@ out:
 	return exit_code;
 }
 
-static int get_ipv6()
+static int get_ipv6(void)
 {
 	if (access("/proc/sys/net/ipv6", F_OK) < 0) {
 		if (errno == ENOENT) {
diff --git a/criu/lsm.c b/criu/lsm.c
index 9d7e55c11..060f10259 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -133,7 +133,7 @@ static int selinux_get_sockcreate_label(pid_t pid, char **output)
 	return 0;
 }
 
-int reset_setsockcreatecon()
+int reset_setsockcreatecon(void)
 {
 	/* Currently this only works for SELinux. */
 	if (kdat.lsm != LSMTYPE__SELINUX)
diff --git a/criu/mount.c b/criu/mount.c
index 24a8516c6..180f2a62d 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2140,7 +2140,7 @@ static int restore_ext_mount(struct mount_info *mi)
 
 static char mnt_clean_path[] = "/tmp/cr-tmpfs.XXXXXX";
 
-static int mount_clean_path()
+static int mount_clean_path(void)
 {
 	/*
 	 * To make a bind mount, we need to have access to a source directory,
@@ -2167,7 +2167,7 @@ static int mount_clean_path()
 	return 0;
 }
 
-static int umount_clean_path()
+static int umount_clean_path(void)
 {
 	if (umount2(mnt_clean_path, MNT_DETACH)) {
 		pr_perror("Unable to umount %s", mnt_clean_path);
@@ -2659,7 +2659,7 @@ static int find_remap_mounts(struct mount_info *root)
 }
 
 /* Move remapped mounts to places where they have to be */
-static int fixup_remap_mounts()
+static int fixup_remap_mounts(void)
 {
 	struct mnt_remap_entry *r;
 
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 57f6bdfef..21266df7c 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -976,7 +976,7 @@ err:
 	return exit_code;
 }
 
-void free_userns_maps()
+void free_userns_maps(void)
 {
 	if (userns_entry.n_uid_map > 0) {
 		xfree(userns_entry.uid_map[0]);
diff --git a/criu/net.c b/criu/net.c
index 712837782..8e6cfaff1 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1765,7 +1765,7 @@ static int __restore_links(struct ns_id *nsid, int *nrlinks, int *nrcreated)
 	return 0;
 }
 
-static int restore_links()
+static int restore_links(void)
 {
 	int nrcreated, nrlinks;
 	struct ns_id *nsid;
@@ -2080,7 +2080,7 @@ out:
  * iptables-restore is executed from a target userns and it may have not enough
  * rights to open /run/xtables.lock. Here we try to workaround this problem.
  */
-static int prepare_xtable_lock()
+static int prepare_xtable_lock(void)
 {
 	int fd;
 
@@ -2700,7 +2700,7 @@ err:
 	return ret;
 }
 
-int network_lock_internal()
+int network_lock_internal(void)
 {
 	char conf[] =	"*filter\n"
 				":CRIU - [0:0]\n"
@@ -2731,7 +2731,7 @@ int network_lock_internal()
 	return ret;
 }
 
-static int network_unlock_internal()
+static int network_unlock_internal(void)
 {
 	char conf[] =	"*filter\n"
 			":CRIU - [0:0]\n"
@@ -3284,7 +3284,7 @@ static int check_link_nsid(int rtsk, void *args)
 	return do_rtnl_req(rtsk, &req, sizeof(req), check_one_link_nsid, NULL, NULL, args);
 }
 
-int kerndat_link_nsid()
+int kerndat_link_nsid(void)
 {
 	int status;
 	pid_t pid;
diff --git a/criu/pstree.c b/criu/pstree.c
index 92b4167aa..19cf5ad38 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -608,7 +608,7 @@ err:
 }
 
 #define RESERVED_PIDS		300
-static int get_free_pid()
+static int get_free_pid(void)
 {
 	static struct pid *prev, *next;
 
diff --git a/criu/seize.c b/criu/seize.c
index e1e6b8195..fd314666f 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -194,7 +194,7 @@ static int seize_cgroup_tree(char *root_path, const char *state)
  * A freezer cgroup can contain tasks which will not be dumped
  * and we need to wait them, because the are interrupted them by ptrace.
  */
-static int freezer_wait_processes()
+static int freezer_wait_processes(void)
 {
 	int i;
 
diff --git a/criu/tls.c b/criu/tls.c
index db9cc4f5a..f7b94dee8 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -31,7 +31,7 @@ static gnutls_certificate_credentials_t x509_cred;
 static int tls_sk = -1;
 static int tls_sk_flags = 0;
 
-void tls_terminate_session()
+void tls_terminate_session(void)
 {
 	int ret;
 
@@ -227,7 +227,7 @@ static int tls_x509_verify_peer_cert(void)
 	return 0;
 }
 
-static int tls_handshake()
+static int tls_handshake(void)
 {
 	int ret = -1;
 	while (ret != GNUTLS_E_SUCCESS) {
@@ -241,7 +241,7 @@ static int tls_handshake()
 	return 0;
 }
 
-static int tls_x509_setup_creds()
+static int tls_x509_setup_creds(void)
 {
 	int ret;
 	char *cacert = CRIU_CACERT;
diff --git a/criu/util.c b/criu/util.c
index 3bae18ab2..1646ce1c4 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -326,7 +326,7 @@ int close_pid_proc(void)
 	return 0;
 }
 
-void close_proc()
+void close_proc(void)
 {
 	close_pid_proc();
 	close_service_fd(PROC_FD_OFF);
@@ -690,7 +690,7 @@ int cr_daemon(int nochdir, int noclose, int close_fd)
 	return 0;
 }
 
-int is_root_user()
+int is_root_user(void)
 {
 	if (geteuid() != 0) {
 		pr_err("You need to be root to run this command\n");
diff --git a/soccr/test/tcp-conn.c b/soccr/test/tcp-conn.c
index 1a1a5bb39..e31f58e7e 100644
--- a/soccr/test/tcp-conn.c
+++ b/soccr/test/tcp-conn.c
@@ -23,7 +23,7 @@ static void pr_printf(unsigned int level, const char *fmt, ...)
 	va_end(args);
 }
 
-int main()
+int main(void)
 {
 	union libsoccr_addr addr, dst;
 	int srv, sock, clnt, rst;
diff --git a/soccr/test/tcp-constructor.c b/soccr/test/tcp-constructor.c
index 89f201000..973dbf10c 100644
--- a/soccr/test/tcp-constructor.c
+++ b/soccr/test/tcp-constructor.c
@@ -20,7 +20,7 @@ struct tcp {
 	uint16_t wscale;
 };
 
-static void usage()
+static void usage(void)
 {
 	printf(
 		"Usage: --addr ADDR -port PORT --seq SEQ --next --addr ADDR -port PORT --seq SEQ -- CMD ...\n"
diff --git a/test/others/unix-callback/unix-client.c b/test/others/unix-callback/unix-client.c
index 69808b53c..676c4adbc 100644
--- a/test/others/unix-callback/unix-client.c
+++ b/test/others/unix-callback/unix-client.c
@@ -86,7 +86,7 @@ static int check_sock(int i)
 	return 0;
 }
 
-int main()
+int main(void)
 {
 	int i, fd;
 	sigset_t set;
diff --git a/test/others/unix-callback/unix-server.c b/test/others/unix-callback/unix-server.c
index 8f32f53dd..47bebd05d 100644
--- a/test/others/unix-callback/unix-server.c
+++ b/test/others/unix-callback/unix-server.c
@@ -19,7 +19,7 @@ struct ticket *tickets;
 
 #define SK_NAME "/tmp/criu.unix.callback.test"
 
-int main()
+int main(void)
 {
 	int sk, ret, id;
 	char buf[4096];
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 6958d128e..43763321f 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -38,7 +38,7 @@ ifeq ($(origin CC), default)
         CC := $(CROSS_COMPILE)$(HOSTCC)
 endif
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
-CFLAGS	+= -Wdeclaration-after-statement
+CFLAGS	+= -Wdeclaration-after-statement -Wstrict-prototypes
 CFLAGS	+= $(USERCFLAGS)
 CFLAGS	+= -D_GNU_SOURCE
 CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index a1bdfc1b4..630476de0 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -71,7 +71,7 @@ static void test_fini(void)
 	unlinkat(cwd, pidfile, 0);
 }
 
-static void setup_outfile()
+static void setup_outfile(void)
 {
 	if (!access(outfile, F_OK) || errno != ENOENT) {
 		fprintf(stderr, "Output file %s appears to exist, aborting\n",
@@ -93,7 +93,7 @@ static void setup_outfile()
 		exit(1);
 }
 
-static void redir_stdfds()
+static void redir_stdfds(void)
 {
 	int nullfd;
 
@@ -346,7 +346,7 @@ void test_init(int argc, char **argv)
 	srand48(time(NULL));	/* just in case we need it */
 }
 
-void test_daemon()
+void test_daemon(void)
 {
 	futex_set_and_wake(&test_shared_state->stage, TEST_RUNNING_STAGE);
 }
diff --git a/test/zdtm/static/apparmor.c b/test/zdtm/static/apparmor.c
index 15930c761..b3a4d7549 100644
--- a/test/zdtm/static/apparmor.c
+++ b/test/zdtm/static/apparmor.c
@@ -15,7 +15,7 @@ const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #define PROFILE "criu_test"
 
-int setprofile()
+int setprofile(void)
 {
 	char profile[1024];
 	int fd, len;
@@ -45,7 +45,7 @@ int setprofile()
 	return 0;
 }
 
-int checkprofile()
+int checkprofile(void)
 {
 	FILE *f;
 	char path[PATH_MAX], profile[1024];
diff --git a/test/zdtm/static/child_subreaper_and_reparent.c b/test/zdtm/static/child_subreaper_and_reparent.c
index 57943a67b..e3955d3d9 100644
--- a/test/zdtm/static/child_subreaper_and_reparent.c
+++ b/test/zdtm/static/child_subreaper_and_reparent.c
@@ -25,7 +25,7 @@ struct shared {
 	int parent_after_cr;
 } *sh;
 
-int orphan()
+int orphan(void)
 {
 	/*
 	 * Wait until reparented to the pidns init. (By waiting
@@ -45,7 +45,7 @@ int orphan()
 	return 0;
 }
 
-int helper()
+int helper(void)
 {
 	int pid;
 
@@ -59,7 +59,7 @@ int helper()
 	return 0;
 }
 
-int subreaper()
+int subreaper(void)
 {
 	int pid, ret, status;
 
diff --git a/test/zdtm/static/child_subreaper_existing_child.c b/test/zdtm/static/child_subreaper_existing_child.c
index 28e9dbb8a..8291aba08 100644
--- a/test/zdtm/static/child_subreaper_existing_child.c
+++ b/test/zdtm/static/child_subreaper_existing_child.c
@@ -24,7 +24,7 @@ struct shared {
 } *sh;
 
 
-int orphan()
+int orphan(void)
 {
 	/* Return the control back to MAIN worker to do C/R */
 	futex_set_and_wake(&sh->fstate, TEST_CRIU);
@@ -36,7 +36,7 @@ int orphan()
 	return 0;
 }
 
-int helper()
+int helper(void)
 {
 	int pid;
 
@@ -52,7 +52,7 @@ int helper()
 	return 0;
 }
 
-int subreaper()
+int subreaper(void)
 {
 	int pid, ret, status;
 
diff --git a/test/zdtm/static/dumpable02.c b/test/zdtm/static/dumpable02.c
index 024371bd8..7e2eee2d1 100644
--- a/test/zdtm/static/dumpable02.c
+++ b/test/zdtm/static/dumpable02.c
@@ -13,7 +13,7 @@
 const char *test_doc    = "Check dumpable flag handling (non-dumpable case)";
 const char *test_author = "Filipe Brandenburger <filbranden@google.com>";
 
-int dumpable_server() {
+int dumpable_server(void) {
 	char buf[256];
 	int ret;
 
diff --git a/test/zdtm/static/fdt_shared.c b/test/zdtm/static/fdt_shared.c
index 2111356f5..a84444af5 100644
--- a/test/zdtm/static/fdt_shared.c
+++ b/test/zdtm/static/fdt_shared.c
@@ -22,7 +22,7 @@ TEST_OPTION(filename, string, "file name", 1);
 #define CHILDREN 4
 static int fork_pfd[2];
 
-static void forked()
+static void forked(void)
 {
 	char c = 0;
 
@@ -32,7 +32,7 @@ static void forked()
 	}
 }
 
-static void wait_children()
+static void wait_children(void)
 {
 	int i;
 	char c;
diff --git a/test/zdtm/static/file_locks00.c b/test/zdtm/static/file_locks00.c
index 59e19cfe1..fa98a31b3 100644
--- a/test/zdtm/static/file_locks00.c
+++ b/test/zdtm/static/file_locks00.c
@@ -101,7 +101,7 @@ static int check_write_lock(int fd, int whence, off_t offset, off_t len)
 	return -1;
 }
 
-static int check_file_locks()
+static int check_file_locks(void)
 {
 	int fd_0, fd_1;
 	int ret0, ret1;
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 59f47c41c..3e6b2ad48 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -68,7 +68,7 @@ typedef struct {
 	int dir;
 } desc;
 
-void do_wait() {
+void do_wait(void) {
 	test_daemon();
 	test_waitsig();
 }
diff --git a/test/zdtm/static/maps00.c b/test/zdtm/static/maps00.c
index a6c68cd25..f2da9b975 100644
--- a/test/zdtm/static/maps00.c
+++ b/test/zdtm/static/maps00.c
@@ -123,7 +123,7 @@ static void segfault(int signo)
  * after test func should be placed check map, because size of test_func
  * is calculated as (check_map-test_func)
  */
-int test_func()
+int test_func(void)
 {
 	return 1;
 }
@@ -176,8 +176,9 @@ static int check_map(struct map *map)
 			memcpy(map->ptr,test_func, getpagesize());
 		} else {
 			if (!(map->flag & MAP_ANONYMOUS)) {
+				uint8_t funlen = (uint8_t *)check_map - (uint8_t *)test_func;
 				lseek(map->fd,0,SEEK_SET);
-				if (write(map->fd,test_func,check_map - test_func)<check_map - test_func) {
+				if (write(map->fd,test_func,funlen)<funlen) {
 					pr_perror("failed to write %s", map->filename);
 					return -1;
 				}
@@ -185,7 +186,7 @@ static int check_map(struct map *map)
 		}
 		if (!(map->flag & MAP_ANONYMOUS) || map->prot & PROT_WRITE)
 			/* Function body has been copied into the mapping */
-			((int (*)())map->ptr)();	/* perform exec access */
+			((int (*)(void))map->ptr)();	/* perform exec access */
 		else
 			/* No way to copy function body into mapping,
 			 * clear exec bit from effective protection
diff --git a/test/zdtm/static/selinux00.c b/test/zdtm/static/selinux00.c
index db8420eac..b5b3e3cc0 100644
--- a/test/zdtm/static/selinux00.c
+++ b/test/zdtm/static/selinux00.c
@@ -26,14 +26,14 @@ const char *test_author	= "Adrian Reber <areber@redhat.com>";
  */
 char state;
 
-int check_for_selinux()
+int check_for_selinux(void)
 {
 	if (access("/sys/fs/selinux", F_OK) == 0)
 		return 0;
 	return 1;
 }
 
-int setprofile()
+int setprofile(void)
 {
 	int fd, len;
 
@@ -54,7 +54,7 @@ int setprofile()
 	return 0;
 }
 
-int checkprofile()
+int checkprofile(void)
 {
 	int fd;
 	char context[1024];
@@ -83,7 +83,7 @@ int checkprofile()
 	return 0;
 }
 
-int check_sockcreate()
+int check_sockcreate(void)
 {
 	char *output = NULL;
 	FILE *f = fopen("/proc/self/attr/sockcreate", "r");
diff --git a/test/zdtm/static/selinux01.c b/test/zdtm/static/selinux01.c
index cec5980e8..cbf145d2a 100644
--- a/test/zdtm/static/selinux01.c
+++ b/test/zdtm/static/selinux01.c
@@ -28,14 +28,14 @@ const char *test_author	= "Adrian Reber <areber@redhat.com>";
  */
 char state;
 
-int check_for_selinux()
+int check_for_selinux(void)
 {
 	if (access("/sys/fs/selinux", F_OK) == 0)
 		return 0;
 	return 1;
 }
 
-int setprofile()
+int setprofile(void)
 {
 	int fd, len;
 
@@ -56,7 +56,7 @@ int setprofile()
 	return 0;
 }
 
-int set_sockcreate()
+int set_sockcreate(void)
 {
 	int fd, len;
 
@@ -77,7 +77,7 @@ int set_sockcreate()
 	return 0;
 }
 
-int check_sockcreate()
+int check_sockcreate(void)
 {
 	int fd;
 	char context[1024];
@@ -106,7 +106,7 @@ int check_sockcreate()
 	return 0;
 }
 
-int check_sockcreate_empty()
+int check_sockcreate_empty(void)
 {
 	char *output = NULL;
 	FILE *f = fopen("/proc/self/attr/sockcreate", "r");
diff --git a/test/zdtm/static/session02.c b/test/zdtm/static/session02.c
index 37f245d2e..f5c81df16 100644
--- a/test/zdtm/static/session02.c
+++ b/test/zdtm/static/session02.c
@@ -25,7 +25,7 @@ struct process *processes;
 int nr_processes = 20;
 int current = 0;
 
-static void cleanup()
+static void cleanup(void)
 {
 	int i;
 
@@ -55,9 +55,9 @@ struct command
 	int		arg2;
 };
 
-static void handle_command();
+static void handle_command(void);
 
-static void mainloop()
+static void mainloop(void)
 {
 	while (1)
 		handle_command();
@@ -100,7 +100,7 @@ static int make_child(int id, int flags)
 	return cid;
 }
 
-static void handle_command()
+static void handle_command(void)
 {
 	int sk = processes[current].sks[0], ret, status = 0;
 	struct command cmd;
diff --git a/test/zdtm/static/session03.c b/test/zdtm/static/session03.c
index 2b3c46c32..8ca16e410 100644
--- a/test/zdtm/static/session03.c
+++ b/test/zdtm/static/session03.c
@@ -36,7 +36,7 @@ static void sigchld_handler(int signal, siginfo_t *siginfo, void *data)
 		waitpid(pid, NULL, WNOHANG);
 }
 
-static void cleanup()
+static void cleanup(void)
 {
 	int i, ret;
 
@@ -72,7 +72,7 @@ enum commands
 
 int cmd_weght[TEST_MAX] = {10, 3, 1, 10, 7};
 int sum_weight = 0;
-static int get_rnd_op()
+static int get_rnd_op(void)
 {
 	int i, m;
 	if (sum_weight == 0) {
@@ -97,9 +97,9 @@ struct command
 	int		arg2;
 };
 
-static void handle_command();
+static void handle_command(void);
 
-static void mainloop()
+static void mainloop(void)
 {
 	while (1)
 		handle_command();
@@ -142,7 +142,7 @@ static int make_child(int id, int flags)
 	return cid;
 }
 
-static void handle_command()
+static void handle_command(void)
 {
 	int sk = processes[current].sks[0], ret, status = 0;
 	struct command cmd;
diff --git a/test/zdtm/transition/netlink00.c b/test/zdtm/transition/netlink00.c
index c9b2303e8..3504a48a1 100644
--- a/test/zdtm/transition/netlink00.c
+++ b/test/zdtm/transition/netlink00.c
@@ -56,12 +56,12 @@ struct rtmsg *rtp;
 int rtl;
 struct rtattr *rtap;
 
-int send_request();
-int recv_reply();
-int form_request_add();
-int form_request_del();
-int read_reply();
-typedef int (*cmd_t)();
+int send_request(void);
+int recv_reply(void);
+int form_request_add(void);
+int form_request_del(void);
+int read_reply(void);
+typedef int (*cmd_t)(void);
 #define CMD_NUM 2
 cmd_t cmd[CMD_NUM]={form_request_add, form_request_del};
 
@@ -120,7 +120,7 @@ out:
 	return 0;
 }
 
-int send_request()
+int send_request(void)
 {
 	// create the remote address
 	// to communicate
@@ -145,7 +145,7 @@ int send_request()
 	}
 	return 0;
 }
-int recv_reply()
+int recv_reply(void)
 {
 	char *p;
 	// initialize the socket read buffer
@@ -191,7 +191,7 @@ int recv_reply()
 	return 0;
 }
 
-int read_reply()
+int read_reply(void)
 {
 	//string to hold content of the route
 	// table (i.e. one entry)
@@ -250,7 +250,7 @@ int read_reply()
 #define NLMSG_TAIL(nmsg) \
         ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 
-int form_request_del()
+int form_request_del(void)
 {
 	bzero(&req, sizeof(req));
 	req.nl.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
@@ -272,7 +272,7 @@ int form_request_del()
 	return 0;
 }
 
-int form_request_add()
+int form_request_add(void)
 {
 	int ifcn = 1; //interface number
 

From e1c4871759d6edb4d7c2d3129981060b873ec912 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Date: Mon, 11 Nov 2019 19:07:52 +0300
Subject: [PATCH 0109/1854] net: add nftables c/r

After Centos-8 nft used instead of iptables. But we had never supported nft rules in
CRIU, and after c/r all rules are flushed.

Co-developed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 Makefile.config                      |  17 ++++
 criu/image-desc.c                    |   1 +
 criu/include/image-desc.h            |   1 +
 criu/include/magic.h                 |   1 +
 criu/net.c                           | 115 +++++++++++++++++++++++++++
 scripts/build/Dockerfile.alpine      |   1 +
 scripts/build/Dockerfile.fedora.tmpl |   2 +
 scripts/feature-tests.mak            |  23 ++++++
 8 files changed, 161 insertions(+)

diff --git a/Makefile.config b/Makefile.config
index 81aae24f8..161365960 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -23,6 +23,23 @@ else
         $(info Note: Building without GnuTLS support)
 endif
 
+ifeq ($(call pkg-config-check,libnftables),y)
+        LIB_NFTABLES	:= $(shell pkg-config --libs libnftables)
+        ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
+                LIBS_FEATURES	+= $(LIB_NFTABLES)
+                FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_0
+        else ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_1),$(LIB_NFTABLES)),true)
+                LIBS_FEATURES	+= $(LIB_NFTABLES)
+                FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_1
+        else
+                $(warning Warn: you have libnftables installed but it has incompatible API)
+                $(warning Warn: Building without nftables support)
+        endif
+else
+        $(warning Warn: you have no libnftables installed)
+        $(warning Warn: Building without nftables support)
+endif
+
 export LIBS += $(LIBS_FEATURES)
 
 CONFIG_FILE = .config
diff --git a/criu/image-desc.c b/criu/image-desc.c
index 81cd07484..ae5d817fe 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -76,6 +76,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY_F(RULE,	"rule-%u", O_NOBUF),
 	FD_ENTRY_F(IPTABLES,	"iptables-%u", O_NOBUF),
 	FD_ENTRY_F(IP6TABLES,	"ip6tables-%u", O_NOBUF),
+	FD_ENTRY_F(NFTABLES,	"nftables-%u", O_NOBUF),
 	FD_ENTRY_F(TMPFS_IMG,	"tmpfs-%u.tar.gz", O_NOBUF),
 	FD_ENTRY_F(TMPFS_DEV,	"tmpfs-dev-%u.tar.gz", O_NOBUF),
 	FD_ENTRY_F(AUTOFS,	"autofs-%u", O_NOBUF),
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index fea80a719..6db8bf94f 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -42,6 +42,7 @@ enum {
 	CR_FD_RULE,
 	CR_FD_IPTABLES,
 	CR_FD_IP6TABLES,
+	CR_FD_NFTABLES,
 	CR_FD_NETNS,
 	CR_FD_NETNF_CT,
 	CR_FD_NETNF_EXP,
diff --git a/criu/include/magic.h b/criu/include/magic.h
index 05101f436..1a583f4ed 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -103,6 +103,7 @@
 #define TMPFS_DEV_MAGIC		RAW_IMAGE_MAGIC
 #define IPTABLES_MAGIC		RAW_IMAGE_MAGIC
 #define IP6TABLES_MAGIC		RAW_IMAGE_MAGIC
+#define NFTABLES_MAGIC		RAW_IMAGE_MAGIC
 #define NETNF_CT_MAGIC		RAW_IMAGE_MAGIC
 #define NETNF_EXP_MAGIC		RAW_IMAGE_MAGIC
 
diff --git a/criu/net.c b/criu/net.c
index 8e6cfaff1..762f9b547 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -17,6 +17,10 @@
 #include <libnl3/netlink/msg.h>
 #include <libnl3/netlink/netlink.h>
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+#include <nftables/libnftables.h>
+#endif
+
 #ifdef CONFIG_HAS_SELINUX
 #include <selinux/selinux.h>
 #endif
@@ -1897,6 +1901,55 @@ static inline int dump_iptables(struct cr_imgset *fds)
 	return 0;
 }
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+static inline int dump_nftables(struct cr_imgset *fds)
+{
+	int ret = -1;
+	struct cr_img *img;
+	int img_fd;
+	FILE *fp;
+	struct nft_ctx *nft;
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		return -1;
+
+	img = img_from_set(fds, CR_FD_NFTABLES);
+	img_fd = dup(img_raw_fd(img));
+	if (img_fd < 0) {
+		pr_perror("dup() failed");
+		goto nft_ctx_free_out;
+	}
+
+	fp = fdopen(img_fd, "w");
+	if (!fp) {
+		pr_perror("fdopen() failed");
+		close(img_fd);
+		goto nft_ctx_free_out;
+	}
+
+	nft_ctx_set_output(nft, fp);
+#define DUMP_NFTABLES_CMD "list ruleset"
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
+	if (nft_run_cmd_from_buffer(nft, DUMP_NFTABLES_CMD, strlen(DUMP_NFTABLES_CMD)))
+#elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	if (nft_run_cmd_from_buffer(nft, DUMP_NFTABLES_CMD))
+#else
+	BUILD_BUG_ON(1);
+#endif
+		goto fp_close_out;
+
+	ret = 0;
+
+fp_close_out:
+	fclose(fp);
+nft_ctx_free_out:
+	nft_ctx_free(nft);
+
+	return ret;
+}
+#endif
+
 static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 {
 	void *buf, *o_buf;
@@ -2149,6 +2202,60 @@ out:
 	return ret;
 }
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+static inline int restore_nftables(int pid)
+{
+	int ret = -1;
+	struct cr_img *img;
+	struct nft_ctx *nft;
+	off_t img_data_size;
+	char *buf;
+
+	img = open_image(CR_FD_NFTABLES, O_RSTR, pid);
+	if (img == NULL)
+		return -1;
+	if (empty_image(img)) {
+		/* Backward compatibility */
+		pr_info("Skipping nft restore, no image");
+		ret = 0;
+		goto image_close_out;
+	}
+
+	if ((img_data_size = img_raw_size(img)) < 0)
+		goto image_close_out;
+
+	if (read_img_str(img, &buf, img_data_size) < 0)
+		goto image_close_out;
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		goto buf_free_out;
+
+	if (nft_ctx_buffer_output(nft) || nft_ctx_buffer_error(nft) ||
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
+		nft_run_cmd_from_buffer(nft, buf, strlen(buf)))
+#elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+		nft_run_cmd_from_buffer(nft, buf))
+#else
+	{
+		BUILD_BUG_ON(1);
+	}
+#endif
+		goto nft_ctx_free_out;
+
+	ret = 0;
+
+nft_ctx_free_out:
+	nft_ctx_free(nft);
+buf_free_out:
+	xfree(buf);
+image_close_out:
+	close_image(img);
+
+	return ret;
+}
+#endif
+
 int read_net_ns_img(void)
 {
 	struct ns_id *ns;
@@ -2380,6 +2487,10 @@ int dump_net_ns(struct ns_id *ns)
 			ret = dump_rule(fds);
 		if (!ret)
 			ret = dump_iptables(fds);
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+		if (!ret)
+			ret = dump_nftables(fds);
+#endif
 		if (!ret)
 			ret = dump_netns_conf(ns, fds);
 	} else if (ns->type != NS_ROOT) {
@@ -2473,6 +2584,10 @@ static int prepare_net_ns_second_stage(struct ns_id *ns)
 			ret = restore_rule(nsid);
 		if (!ret)
 			ret = restore_iptables(nsid);
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+		if (!ret)
+			ret = restore_nftables(nsid);
+#endif
 	}
 
 	if (!ret)
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index a1d1d9191..29a754058 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -14,6 +14,7 @@ RUN apk update && apk add \
 	libcap-dev \
 	libnet-dev \
 	libnl3-dev \
+	nftables \
 	pkgconfig \
 	protobuf-c-dev \
 	protobuf-dev \
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 0500a8fc5..138588bce 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -10,6 +10,8 @@ RUN dnf install -y \
 	gnutls-devel \
 	iproute \
 	iptables \
+	nftables \
+	nftables-devel \
 	libaio-devel \
 	libasan \
 	libcap-devel \
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index 39ddfd053..6f67c6035 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -147,4 +147,27 @@ int main(void)
 		return 0;
 	return 0;
 }
+
+endef
+
+define FEATURE_TEST_NFTABLES_LIB_API_0
+
+#include <nftables/libnftables.h>
+
+int main(int argc, char **argv)
+{
+	return nft_run_cmd_from_buffer(nft_ctx_new(NFT_CTX_DEFAULT), \"cmd\", strlen(\"cmd\"));
+}
+
+endef
+
+define FEATURE_TEST_NFTABLES_LIB_API_1
+
+#include <nftables/libnftables.h>
+
+int main(int argc, char **argv)
+{
+	return nft_run_cmd_from_buffer(nft_ctx_new(NFT_CTX_DEFAULT), \"cmd\");
+}
+
 endef

From acb42456dc707a303b308fef67b2be92c81ab427 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 11 Nov 2019 19:20:22 +0300
Subject: [PATCH 0110/1854] zdtm: nft tables preservation test

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Alexander Mikhalitsyn <alexander@mihalicyn.com>
[Added test_author to zdtm test]
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 scripts/build/Dockerfile.alpine      |  1 +
 test/zdtm/static/Makefile            |  1 +
 test/zdtm/static/netns-nft.c         | 64 ++++++++++++++++++++++++++++
 test/zdtm/static/netns-nft.checkskip |  3 ++
 test/zdtm/static/netns-nft.desc      |  5 +++
 5 files changed, 74 insertions(+)
 create mode 100644 test/zdtm/static/netns-nft.c
 create mode 100755 test/zdtm/static/netns-nft.checkskip
 create mode 100644 test/zdtm/static/netns-nft.desc

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 29a754058..601a8693a 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -31,6 +31,7 @@ RUN apk add \
 	py-pip	\
 	ip6tables \
 	iptables \
+	nftables \
 	iproute2 \
 	tar \
 	bash \
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ea5d3c42e..19d93e315 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -288,6 +288,7 @@ TST_FILE	=				\
 		file_locks07			\
 		file_locks08			\
 		netns-nf			\
+		netns-nft				\
 		maps_file_prot			\
 		socket_close_data01		\
 
diff --git a/test/zdtm/static/netns-nft.c b/test/zdtm/static/netns-nft.c
new file mode 100644
index 000000000..f4991afda
--- /dev/null
+++ b/test/zdtm/static/netns-nft.c
@@ -0,0 +1,64 @@
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that nft rules (some) are kept";
+const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "file name", 1);
+
+int main(int argc, char **argv)
+{
+	char cmd[128];
+
+	test_init(argc, argv);
+
+	/* create nft table */
+	if (system("nft add table inet netns-nft-zdtm-test")) {
+		pr_perror("Can't create nft table");
+		return -1;
+	}
+
+	/* create input chain in table */
+	if (system("nft add chain inet netns-nft-zdtm-test input { type filter hook input priority 0 \\; }")) {
+		pr_perror("Can't create input chain in nft table");
+		return -1;
+	}
+
+	/* block ICMPv4 traffic */
+	if (system("nft add rule inet netns-nft-zdtm-test input meta nfproto ipv4 icmp type { echo-request } reject")) {
+		pr_perror("Can't set input rule");
+		return -1;
+	}
+
+	/* save resulting nft table */
+	sprintf(cmd, "nft list table inet netns-nft-zdtm-test > pre-%s", filename);
+	if (system(cmd)) {
+		pr_perror("Can't get nft table");
+		return -1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/* get nft table */
+	sprintf(cmd, "nft list table inet netns-nft-zdtm-test > post-%s", filename);
+	if (system(cmd)) {
+		fail("Can't get nft table");
+		return -1;
+	}
+
+	/* compare nft table before/after c/r */
+	sprintf(cmd, "diff pre-%s post-%s", filename, filename);
+	if (system(cmd)) {
+		fail("nft table differ");
+		return -1;
+	}
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/netns-nft.checkskip b/test/zdtm/static/netns-nft.checkskip
new file mode 100755
index 000000000..270cafeb5
--- /dev/null
+++ b/test/zdtm/static/netns-nft.checkskip
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+test -f /usr/sbin/nft || exit 1
diff --git a/test/zdtm/static/netns-nft.desc b/test/zdtm/static/netns-nft.desc
new file mode 100644
index 000000000..f53890a24
--- /dev/null
+++ b/test/zdtm/static/netns-nft.desc
@@ -0,0 +1,5 @@
+{   'deps': [   '/bin/sh',
+                '/usr/sbin/nft',
+                '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns'}

From 7622b7a70eb7a00b2ba542f9118f4351b3df2538 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0111/1854] files: fix ghost file error path

Signed-off-by: Nicolas Viennot <nicolas.viennot@twosigma.com>
---
 criu/files-reg.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 2f68bc03f..90fb7dd7f 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -844,10 +844,13 @@ static int dump_ghost_remap(char *path, const struct stat *st,
 	gf->dev = phys_dev;
 	gf->ino = st->st_ino;
 	gf->id = ghost_file_ids++;
-	list_add_tail(&gf->list, &ghost_files);
 
-	if (dump_ghost_file(lfd, gf->id, st, phys_dev))
+	if (dump_ghost_file(lfd, gf->id, st, phys_dev)) {
+		xfree(gf);
 		return -1;
+	}
+
+	list_add_tail(&gf->list, &ghost_files);
 
 dump_entry:
 	rpe.orig_id = id;

From 2ac43cd426badfc6d68582b203ace318e5f79427 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Mon, 30 Dec 2019 20:27:40 +0000
Subject: [PATCH 0112/1854] python: Improve decoding of file flags

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 lib/py/images/pb2dict.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index daaa7297e..6fce4be22 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -105,11 +105,22 @@ mmap_status_map = [
 ]
 
 rfile_flags_map = [
-    ('O_WRONLY', 0o1),
-    ('O_RDWR', 0o2),
-    ('O_APPEND', 0o2000),
-    ('O_DIRECT', 0o40000),
-    ('O_LARGEFILE', 0o100000),
+    ('O_WRONLY', 0o00000001),
+    ('O_RDWR', 0o00000002),
+    ('O_CREAT', 0o00000100),
+    ('O_EXCL', 0o00000200),
+    ('O_NOCTTY', 0o00000400),
+    ('O_TRUNC', 0o00001000),
+    ('O_APPEND', 0o00002000),
+    ('O_NONBLOCK', 0o00004000),
+    ('O_DSYNC', 0o00010000),
+    ('FASYNC', 0o00020000),
+    ('O_DIRECT', 0o00040000),
+    ('O_LARGEFILE', 0o00100000),
+    ('O_DIRECTORY', 0o00200000),
+    ('O_NOFOLLOW', 0o00400000),
+    ('O_NOATIME', 0o01000000),
+    ('O_CLOEXEC', 0o02000000),
 ]
 
 pmap_flags_map = [

From 8255caf27b5e2bb96af6affc161b8d0d3bbdccbe Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Mon, 30 Dec 2019 20:29:27 +0000
Subject: [PATCH 0113/1854] files: Remove O_CLOEXEC from file flags

The kernel artificially adds the O_CLOEXEC flag when reading from the
/proc/fdinfo/fd interface if FD_CLOEXEC is set on the file descriptor
used to access the file.

This commit removes the O_CLOEXEC flag in our file flags.

To restore the proper FD_CLOEXEC value in each of the file descriptors,
CRIU uses fcntl(F_GETFD) to retrieve the FD_CLOEXEC status, and restore
it later with fcntl(F_SETFD). This is necessary because multiple file
descriptors may point to the same open file.
---
 criu/files.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/criu/files.c b/criu/files.c
index ffdaa459f..e26897870 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -382,7 +382,13 @@ static int fill_fd_params(struct pid *owner_pid, int fd, int lfd,
 	p->fs_type	= fsbuf.f_type;
 	p->fd		= fd;
 	p->pos		= fdinfo.pos;
-	p->flags	= fdinfo.flags;
+	/*
+	 * The kernel artificially adds the O_CLOEXEC flag on the file pointer
+	 * flags by looking at the flags on the file descriptor (see kernel
+	 * code fs/proc/fd.c). FD_CLOEXEC is a file descriptor property, which
+	 * is saved in fd_flags.
+	 */
+	p->flags	= fdinfo.flags & ~O_CLOEXEC;
 	p->mnt_id	= fdinfo.mnt_id;
 	p->pid		= owner_pid->real;
 	p->fd_flags	= opts->flags;

From 75a74423801a83ef7657e67e0b016a76f741db11 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Mon, 30 Dec 2019 20:21:03 +0000
Subject: [PATCH 0114/1854] files: Add FD_CLOEXEC test

---
 test/zdtm/static/Makefile       |  1 +
 test/zdtm/static/file_cloexec.c | 63 +++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 test/zdtm/static/file_cloexec.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 19d93e315..5ca05ee9e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -122,6 +122,7 @@ TST_NOFILE	:=				\
 		groups				\
 		pdeath_sig			\
 		file_fown			\
+		file_cloexec			\
 		proc-self			\
 		eventfs00			\
 		epoll				\
diff --git a/test/zdtm/static/file_cloexec.c b/test/zdtm/static/file_cloexec.c
new file mode 100644
index 000000000..b8eba39e5
--- /dev/null
+++ b/test/zdtm/static/file_cloexec.c
@@ -0,0 +1,63 @@
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/vfs.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check FD_CLOEXEC flag";
+const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+static void assert_fd_flags(int fd, int mask, int value)
+{
+	int flags = fcntl(fd, F_GETFD);
+	if (flags == -1)
+		err(1, "Can't get fd flags");
+
+	if ((flags & mask) != value) {
+		fail("fd flags mismatch");
+		exit(1);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	int fd1, fd2, fd3, fd4;
+
+	test_init(argc, argv);
+
+	fd1 = open("/", O_RDONLY | O_CLOEXEC);
+	if (fd1 < 0)
+		err(1, "Can't open()");
+
+	fd2 = open("/", O_RDONLY);
+	if (fd2 < 0)
+		err(1, "Can't open()");
+
+	fd3 = dup(fd1);
+	if (fd3 < 0)
+		err(1, "Can't dup()");
+
+	fd4 = fcntl(fd2, F_DUPFD_CLOEXEC, 0);
+	if (fd4 < 0)
+		err(1, "Can't dup()");
+
+	test_daemon();
+	test_waitsig();
+
+	assert_fd_flags(fd1, FD_CLOEXEC, FD_CLOEXEC);
+	assert_fd_flags(fd2, FD_CLOEXEC, 0);
+	assert_fd_flags(fd3, FD_CLOEXEC, 0);
+	assert_fd_flags(fd4, FD_CLOEXEC, FD_CLOEXEC);
+
+	pass();
+
+	return 0;
+}

From 8b5dea33f6bff8e8d35e709e026218caf7d4a2d8 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 9 Jan 2020 10:31:41 +0000
Subject: [PATCH 0115/1854] travis: switch alpine to python3

Now that Python 2 has officially reached its end of life also switch the
Alpine based test to Python 3.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.alpine | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 601a8693a..5785102da 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -18,7 +18,7 @@ RUN apk update && apk add \
 	pkgconfig \
 	protobuf-c-dev \
 	protobuf-dev \
-	python \
+	python3 \
 	sudo
 
 COPY . /criu
@@ -28,7 +28,6 @@ RUN mv .ccache /tmp && make mrproper && ccache -sz && \
 	date && make -j $(nproc) CC="$CC" && date && ccache -s
 
 RUN apk add \
-	py-pip	\
 	ip6tables \
 	iptables \
 	nftables \
@@ -37,10 +36,16 @@ RUN apk add \
 	bash \
 	go \
 	e2fsprogs \
+	py-yaml \
+	py3-flake8 \
 	asciidoctor
 
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
 
-RUN pip install PyYAML future protobuf ipaddress junit_xml flake8
+RUN pip3 install protobuf junit_xml
+
+# For zdtm we need an unversioned python binary
+RUN ln -s /usr/bin/python3 /usr/bin/python
+
 RUN make -C test/zdtm

From 1e9ff2aa03206102a7aeaf1d32f61056d3d05e46 Mon Sep 17 00:00:00 2001
From: Nidhi Gupta <itsnidhi16@gmail.com>
Date: Sun, 8 Dec 2019 10:14:40 +0530
Subject: [PATCH 0116/1854] Add Socket-based Java Functional Tests

Signed-off-by: Nidhi Gupta <itsnidhi16@gmail.com>
---
 scripts/build/Dockerfile.openj9-ubuntu        |   1 +
 test/javaTests/README.md                      |  11 +-
 .../criu/java/tests/CheckpointRestore.java    |   1 +
 .../src/org/criu/java/tests/Helper.java       |   2 +-
 .../src/org/criu/java/tests/SocketHelper.java | 100 ++++++++
 .../src/org/criu/java/tests/Sockets.java      | 141 ++++++++++++
 .../org/criu/java/tests/SocketsClient.java    | 133 +++++++++++
 .../org/criu/java/tests/SocketsConnect.java   | 157 +++++++++++++
 .../criu/java/tests/SocketsConnectClient.java | 130 +++++++++++
 .../criu/java/tests/SocketsConnectServer.java | 151 ++++++++++++
 .../src/org/criu/java/tests/SocketsData.java  | 156 +++++++++++++
 .../criu/java/tests/SocketsDataClient.java    | 141 ++++++++++++
 .../criu/java/tests/SocketsDataServer.java    | 124 ++++++++++
 .../org/criu/java/tests/SocketsListen.java    | 153 +++++++++++++
 .../criu/java/tests/SocketsListenClient.java  | 136 +++++++++++
 .../criu/java/tests/SocketsListenServer.java  | 160 +++++++++++++
 .../org/criu/java/tests/SocketsMultiple.java  | 152 +++++++++++++
 .../java/tests/SocketsMultipleClient.java     | 174 ++++++++++++++
 .../java/tests/SocketsMultipleServer.java     | 215 ++++++++++++++++++
 .../org/criu/java/tests/SocketsServer.java    | 142 ++++++++++++
 test/javaTests/test.xml                       |  46 ++++
 21 files changed, 2424 insertions(+), 2 deletions(-)
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketHelper.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/Sockets.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsClient.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsConnect.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsData.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsDataClient.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsListen.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsListenClient.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsMultiple.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
 create mode 100644 test/javaTests/src/org/criu/java/tests/SocketsServer.java

diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 13d9080ff..f235cc004 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-comp
 	make \
 	git \
 	pkg-config \
+	iptables \
 	gcc \
 	maven
 
diff --git a/test/javaTests/README.md b/test/javaTests/README.md
index 670741677..4315b9b12 100644
--- a/test/javaTests/README.md
+++ b/test/javaTests/README.md
@@ -30,7 +30,16 @@ Here we test the File-Based Java APIs by checkpointing the application in the fo
 ## Memory mapping Java APIs
 
 Here we test the Memory Mapping APIs by checkpointing the application in following scenario and verifying the contents after restore:
-- Memory-mapping a file and writing its content to another file. (MemoryMappings.java)
+- Memory-mapping a file and writing its content to another file. (MemoryMappings.java)  
+
+## Socket-based Java APIs
+
+Here we test the Socket-based API's by checkpointing the application in the following scenario and verifying the state after restore:  
+- Checkpointing the server process in the middle of data transfer. (Sockets.java)  
+- Checkpointing the server process after it has bound to a port but is not listening for client connections. (SocketListen.java)  
+- Checkpointing the server process while it is listening for client connections, and no client has connected yet. (SocketConnect.java)  
+- Checkpointing the server process when it has multiple clients in multiple states connected to it. (SocketMultiple.java)  
+- Checkpointing the client process in the middle of data transfer. (SocketsData.java)  
 
 ### Prerequisites for running the tests:
 - Maven
diff --git a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
index b848c9938..9d61e126f 100644
--- a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
+++ b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
@@ -154,6 +154,7 @@ public class CheckpointRestore {
 		 */
 		while (Helper.STATE_INIT == currentState) {
 			currentState = mappedByteBuffer.getChar(Helper.MAPPED_INDEX);
+			Thread.sleep(100);
 		}
 
 		/*
diff --git a/test/javaTests/src/org/criu/java/tests/Helper.java b/test/javaTests/src/org/criu/java/tests/Helper.java
index fdf20bb52..9a1b33328 100644
--- a/test/javaTests/src/org/criu/java/tests/Helper.java
+++ b/test/javaTests/src/org/criu/java/tests/Helper.java
@@ -30,7 +30,7 @@ class Helper {
 	 * the pid to the pidFile.
 	 *
 	 * @param testName Name of the java test
-	 * @param pid Pid of the java test process
+	 * @param pid      Pid of the java test process
 	 * @param logger
 	 * @return 0 or 1 denoting whether the function was successful or not.
 	 * @throws IOException
diff --git a/test/javaTests/src/org/criu/java/tests/SocketHelper.java b/test/javaTests/src/org/criu/java/tests/SocketHelper.java
new file mode 100644
index 000000000..684125019
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketHelper.java
@@ -0,0 +1,100 @@
+package org.criu.java.tests;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.MappedByteBuffer;
+import java.util.logging.FileHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+class SocketHelper {
+
+	static char STATE_LISTEN = 'S';
+	static char STATE_SUCCESS = 'Z';
+	static String IP_ADDRESS = "127.0.0.1";
+
+	/**
+	 * Creates a new log file, for the logger to log in.
+	 *
+	 * @param testName       Name of the server or client program
+	 * @param parentTestName Name of the test
+	 * @param logger
+	 * @throws IOException
+	 */
+	static void init(String testName, String parentTestName, Logger logger) throws IOException {
+		FileHandler handler = new FileHandler(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/" + testName + ".log", false);
+		handler.setFormatter(new SimpleFormatter());
+		handler.setLevel(Level.FINE);
+		logger.addHandler(handler);
+		logger.setLevel(Level.FINE);
+	}
+
+	/**
+	 * Writes pid of the process to be checkpointed in the file
+	 *
+	 * @param parentTestName Name of the test
+	 * @param pid            Pid of the process to be checkpointed
+	 * @throws IOException
+	 */
+	static void writePid(String parentTestName, String pid) throws IOException {
+		File pidfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/" + parentTestName + Helper.PID_APPEND);
+		BufferedWriter pidwriter = new BufferedWriter(new FileWriter(pidfile));
+		/*
+		 * Overwriting pid to be checkpointed
+		 */
+		pidwriter.write(pid + "\n");
+		pidwriter.close();
+	}
+
+	/**
+	 * Waits for the MappedByteBuffer to change state from STATE_CHECKPOINT to STATE_RESTORE
+	 *
+	 * @param socketMappedBuffer MappedByteBuffer between the client, server and the controller process.
+	 * @param logger
+	 */
+	static void socketWaitForRestore(MappedByteBuffer socketMappedBuffer, Logger logger) {
+		while (Helper.STATE_CHECKPOINT == socketMappedBuffer.getChar(Helper.MAPPED_INDEX)) {
+			;
+		}
+		if (Helper.STATE_RESTORE != socketMappedBuffer.getChar(Helper.MAPPED_INDEX)) {
+			logger.log(Level.SEVERE, "Server socket was not in expected restore state " + socketMappedBuffer.getChar(Helper.MAPPED_INDEX));
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			System.exit(1);
+		} else {
+			logger.log(Level.INFO, "Restored!!!");
+		}
+	}
+
+	/**
+	 * Puts the MappedByteBuffer to Helper.STATE_CHECKPOINT and waits for CheckpointRestore.java to change its state to Helper.STATE_RESTORE
+	 *
+	 * @param b      MappedByteBuffer between the controller process and CheckpointRestore.java
+	 * @param logger Logger to log the messages
+	 * @param p1     Process object for the client process
+	 * @param p2     Process object for the server process
+	 */
+	static void checkpointAndWait(MappedByteBuffer b, Logger logger, Process p1, Process p2) {
+		b.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+		char c = b.getChar(Helper.MAPPED_INDEX);
+		while (Helper.STATE_CHECKPOINT == c) {
+			c = b.getChar(Helper.MAPPED_INDEX);
+		}
+		if (Helper.STATE_TERMINATE == c) {
+			logger.log(Level.SEVERE, "Error during checkpoint-restore, Test terminated");
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			p1.destroy();
+			p2.destroy();
+			System.exit(1);
+		}
+		if (Helper.STATE_RESTORE != c) {
+			logger.log(Level.SEVERE, "Error: Test state is not the expected Restored state");
+			b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			p1.destroy();
+			p2.destroy();
+			System.exit(1);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/Sockets.java b/test/javaTests/src/org/criu/java/tests/Sockets.java
new file mode 100644
index 000000000..94cc217c4
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/Sockets.java
@@ -0,0 +1,141 @@
+package org.criu.java.tests;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class Sockets {
+	static String TESTNAME = "Sockets";
+
+	/**
+	 * Runs the client and server process, checkpoints the server process while its in the middle of data transfer
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null, socketMappedBuffer = null;
+		FileChannel channel;
+		String pid;
+		String port = "49200";
+		Logger logger = null;
+		try {
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+
+			/*
+			 * Mapped buffer 'b' to communicate between CheckpointRestore.java and this process.
+			 */
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			Helper.init(TESTNAME, pid, logger);
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			if (Helper.STATE_INIT != b.getChar(Helper.MAPPED_INDEX)) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Creating socketBufferFile and setting the init value of buffer");
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and this process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/SocketsFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_INIT);
+
+			logger.log(Level.INFO, "Starting server and client process");
+			ProcessBuilder builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsServer", TESTNAME, port);
+			Process serverProcess = builder.start();
+			logger.log(Level.INFO, "Server process started");
+			builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsClient", TESTNAME, port);
+			Process clientProcess = builder.start();
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Killing the server and client process");
+				logger.log(Level.SEVERE, "Error took place in the client or server process; check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT) {
+				logger.log(Level.SEVERE, "Killing the server and client process");
+				logger.log(Level.SEVERE, "State is not the expected 'to be checkpointed' state");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				logger.log(Level.INFO, "Going to checkpoint server process");
+				SocketHelper.checkpointAndWait(b, logger, serverProcess, clientProcess);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_RESTORE);
+				logger.log(Level.INFO, "Process has been restored");
+			}
+			/*
+			 * Loop while test is running.
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_FAIL && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_PASS) {
+				logger.log(Level.SEVERE, "Killing the server and client process");
+				logger.log(Level.SEVERE, "Received wrong message from the child process: not the expected finish message");
+				logger.log(Level.SEVERE, "Check their log files for more details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
+				logger.log(Level.SEVERE, "Killing the server and client process");
+				logger.log(Level.SEVERE, "Error in the client or server process: check their log for details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			/*
+			 * Client process puts socketMappedBuffer to Pass state if the test passed.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_PASS) {
+				logger.log(Level.INFO, Helper.PASS_MESSAGE);
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (b != null) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsClient.java b/test/javaTests/src/org/criu/java/tests/SocketsClient.java
new file mode 100644
index 000000000..1c8e7b9a1
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsClient.java
@@ -0,0 +1,133 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsClient {
+	static String TESTNAME = "SocketsClient";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		Socket socket = null;
+		Logger logger = null;
+		String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2",
+				readMssg, msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4";
+		String parentTestName, portArg;
+		int port;
+
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "Error: Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+			logger.log(Level.INFO, "Client socket sending req to server at IP: 127.0.0.1 port:" + port);
+
+			/*
+			 * Ensure client does not try to connect to port before server has bound itself.
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT) {
+				;
+			}
+			/*
+			 * Socket Buffer should be put in SocketHelper.STATE_LISTEN state by server process, just before
+			 * it starts listening for client connections.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "Error: Buffer does not contain the expected 'server bound to port and listening' state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			/*
+			 * Ensure server has bound to port
+			 */
+			try {
+				Thread.sleep(10);
+			} catch (InterruptedException e) {
+				logger.log(Level.WARNING, "InterruptedException occurred!");
+			}
+
+			socket = new Socket(SocketHelper.IP_ADDRESS, port);
+
+			PrintStream out = new PrintStream(socket.getOutputStream());
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+
+			logger.log(Level.INFO, "Sending message to server " + msg1);
+			out.println(msg1);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Message received from server " + readMssg);
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Error: wrong message received; message expected " + msg2);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+
+			logger.log(Level.INFO, "Sending message to server " + msg3);
+			out.println(msg3);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Message received from server " + readMssg);
+			if (!msg4.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Error: wrong message received; message expected " + msg4);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			socket.close();
+			/*
+			 * Wait for server process to end and then check whether it ended successfully or not
+			 * If it has finished properly the socketMappedBuffer will contain SocketHelper.STATE_SUCCESS
+			 */
+			logger.log(Level.INFO, "Waiting for server process to end....");
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			/*
+			 * Check the server process has ended successfully, if it was a success put Mapped Buffer to pass state, else to failed state
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			logger.log(Level.INFO, "Test ends");
+
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsConnect.java b/test/javaTests/src/org/criu/java/tests/SocketsConnect.java
new file mode 100644
index 000000000..164c21089
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsConnect.java
@@ -0,0 +1,157 @@
+package org.criu.java.tests;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsConnect {
+	static String TESTNAME = "SocketsConnect";
+
+	/**
+	 * Runs the client and server process, checkpoints the server when its listening for incoming client connection requests on a port but no client has connected yet
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null, socketMappedBuffer = null;
+		FileChannel channel;
+		String pid;
+		String port = "49200";
+		Logger logger = null;
+		try {
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+
+			/*
+			 * Mapped buffer 'b' to communicate between CheckpointRestore.java and this process.
+			 */
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			Helper.init(TESTNAME, pid, logger);
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			if (b.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and this process.
+			 */
+			logger.log(Level.INFO, "Creating socketbufferfile and setting the init value of buffer");
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/SocketsConnectFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			/*
+			 * Set socketMappedBuffer to init state.
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_INIT);
+			logger.log(Level.INFO, "Starting server and client process");
+			ProcessBuilder builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsConnectServer", TESTNAME, port);
+			Process serverProcess = builder.start();
+			builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsConnectClient", TESTNAME, port);
+			Process clientProcess = builder.start();
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Some error took place in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "State is not the expected 'to be checkpointed' state");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				logger.log(Level.INFO, "Going to checkpoint server process");
+				try {
+					Thread.sleep(10);
+				} catch (InterruptedException e) {
+					logger.log(Level.WARNING, "Thread was interrupted");
+				}
+				SocketHelper.checkpointAndWait(b, logger, serverProcess, clientProcess);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_RESTORE);
+				logger.log(Level.INFO, "Process has been restored!");
+			}
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN) {
+				;
+			}
+			char bufchar = socketMappedBuffer.getChar(Helper.MAPPED_INDEX);
+			if (bufchar != Helper.STATE_FAIL && bufchar != Helper.STATE_PASS && bufchar != SocketHelper.STATE_SUCCESS) {
+				logger.log(Level.SEVERE, "Received wrong message from the child process: not the expected finish message");
+				logger.log(Level.SEVERE, "Check their log files for more details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Error in the client or server process: check their log for details");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				;
+			}
+
+			/*
+			 * Client process puts socketMappedBuffer to 'P'-Pass state if the test passed.
+			 * Send pass message to Checkpoint-restore.java
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_PASS) {
+				logger.log(Level.INFO, Helper.PASS_MESSAGE);
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (b != null) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java b/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java
new file mode 100644
index 000000000..ed1c7fab3
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java
@@ -0,0 +1,130 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsConnectClient {
+	static String TESTNAME = "SocketsConnectClient";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		Socket socket = null;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2",
+					readMssg, msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4";
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsConnectFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_RESTORE) {
+				logger.log(Level.SEVERE, "Error: Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Waiting for CR");
+			/*
+			 * Wait for Checkpoint-Restore to occur
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_RESTORE) {
+				logger.log(Level.SEVERE, "Error:Buffer does not contain the expected restored state: " + socketMappedBuffer.getChar(Helper.MAPPED_INDEX));
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			logger.log(Level.INFO, "Restored");
+			logger.log(Level.INFO, "Client socket sending req to server at IP: 127.0.0.1 port:" + port);
+
+			/*
+			 * Server should has have been listening for client connections when it was checkpointed, and it should continue to listen after restore.
+			 */
+			try {
+				socket = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Exception occured when connecting to port: " + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			PrintStream out = new PrintStream(socket.getOutputStream());
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+
+			logger.log(Level.INFO, "Sending message to server " + msg1);
+			out.println(msg1);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "message received from server " + readMssg);
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Expected " + msg2);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Sending message to server " + msg3);
+			out.println(msg3);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "message received from server " + readMssg);
+			if (!msg4.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Expected " + msg4);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			socket.close();
+
+			/*
+			 * Wait for server process to end.
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			/*
+			 * Check the server process has ended successfully, if it was a success put Mapped Buffer to pass state, else to failed state
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java b/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
new file mode 100644
index 000000000..1e4cf3aeb
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
@@ -0,0 +1,151 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsConnectServer {
+	static String TESTNAME = "SocketsConnectServer";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		Socket socket = null;
+		String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2", msg3 = "@Ft@rCPM$$g3",
+				msg4 = "Aft@rCPM$$g4", readMssg;
+		Logger logger = null;
+		String parentTestName, portArg;
+		int port;
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsConnectFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			SocketHelper.writePid(parentTestName, pid);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+			logger.log(Level.INFO, "Server pid: " + pid);
+			logger.log(Level.INFO, "socket buffer connection opened");
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+
+			ServerSocket ser = new ServerSocket(port);
+			logger.log(Level.INFO, "Server will be listening on Port: " + port);
+
+			/*
+			 * Timeout after 7 sec if client does not connect
+			 */
+			try {
+				ser.setSoTimeout(7 * 1000);
+
+			} catch (SocketException e) {
+				logger.log(Level.SEVERE, "Cannot set timeout!");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			logger.log(Level.INFO, "Waiting for client to connect");
+			logger.log(Level.INFO, "Going to checkpoint");
+
+			try {
+				if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+					ser.close();
+					System.exit(1);
+				}
+				/*
+				 * Checkpoint when server is listening for connections, and no client has connected to the server.
+				 */
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+				socket = ser.accept();
+				SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
+
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Timed out while waiting for client to connect\n" + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			if (!ser.isBound()) {
+				logger.log(Level.SEVERE, "Server is not bound to a port");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (ser.getLocalPort() != port) {
+				logger.log(Level.SEVERE, "Server is not listening on correct port");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+			PrintStream outstream = new PrintStream(socket.getOutputStream());
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 1: " + readMssg);
+			if (!msg1.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 1 received was wrong,received: " + readMssg + " expected: " + msg1);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Sending message: " + msg2);
+			outstream.println(msg2);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 3: " + readMssg);
+
+			if (!msg3.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 3 received was wrong, received: " + readMssg + " expected: " + msg3);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			outstream.println(msg4);
+			logger.log(Level.INFO, "Sent message 4 " + msg4);
+
+			socket.close();
+
+			/*
+			 * Put Socket-MappedBuffer to state SocketHelper.STATE_SUCCESS telling the server process has ended successfully.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				System.exit(1);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_SUCCESS);
+			}
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsData.java b/test/javaTests/src/org/criu/java/tests/SocketsData.java
new file mode 100644
index 000000000..67d8cef0e
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsData.java
@@ -0,0 +1,156 @@
+package org.criu.java.tests;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsData {
+	static String TESTNAME = "SocketsData";
+
+	/**
+	 * Runs the server and client processes, checkpoints the client process when its in the middle of data transfer
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null, socketMappedBuffer = null;
+		FileChannel channel;
+		String pid;
+		Logger logger = null;
+		String port = "49200";
+		try {
+			/*
+			 * Mapped buffer 'b' to communicate between CheckpointRestore.java and this process.
+			 */
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			Helper.init(TESTNAME, pid, logger);
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			if (b.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and this process.
+			 */
+			logger.log(Level.INFO, "Creating socketbufferfile and setting the init value of buffer");
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/SocketsDataFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			/*
+			 * Set socketMappedBuffer to init state.
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_INIT);
+			logger.log(Level.INFO, "Starting server and client process");
+			ProcessBuilder builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsDataServer", TESTNAME, port);
+			Process serverProcess = builder.start();
+			builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsDataClient", TESTNAME, port);
+			Process clientProcess = builder.start();
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Some error took place in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "State is not the expected 'to be checkpointed' state");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				logger.log(Level.INFO, "Going to checkpoint client process");
+				try {
+					Thread.sleep(10);
+				} catch (InterruptedException e) {
+					logger.log(Level.WARNING, "Thread was interrupted");
+				}
+				SocketHelper.checkpointAndWait(b, logger, serverProcess, clientProcess);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_RESTORE);
+				logger.log(Level.INFO, "Process has been restored!");
+			}
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			char bufchar = socketMappedBuffer.getChar(Helper.MAPPED_INDEX);
+			if (bufchar != Helper.STATE_FAIL && bufchar != Helper.STATE_PASS && bufchar != SocketHelper.STATE_SUCCESS) {
+				logger.log(Level.SEVERE, "Received wrong message from the child process: not the expected finish message");
+				logger.log(Level.SEVERE, "Check their log files for more details");
+				serverProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Error in the client or server process: check their log for details");
+				serverProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				;
+			}
+
+			/*
+			 * Client process puts socketMappedBuffer to STATE_PASS if the test passed.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_PASS) {
+				logger.log(Level.INFO, Helper.PASS_MESSAGE);
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				logger.log(Level.INFO, "Did not receive pass message from the client process");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (b != null) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java b/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java
new file mode 100644
index 000000000..49885a886
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java
@@ -0,0 +1,141 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsDataClient {
+	static String TESTNAME = "SocketsDataClient";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		Socket socket = null;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+			String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2",
+					readMssg, msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4";
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsDataFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+
+			logger.log(Level.INFO, "Client pid: " + pid);
+			SocketHelper.writePid(parentTestName, pid);
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "Error: Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT) {
+				;
+			}
+			/*
+			 * Socket Mapped Buffer should be in 'Server listening for connections' state
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "socket-buffer not in expected state, current state: " + socketMappedBuffer.getChar(Helper.MAPPED_INDEX));
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			/*
+			 * Server starts listening on port after putting the Mapped Buffer is in SocketHelper.STATE_LISTEN state
+			 */
+			logger.log(Level.INFO, "Client socket sending req to server at IP: 127.0.0.1 port:" + port);
+
+			try {
+				socket = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (IOException e) {
+				logger.log(Level.SEVERE, "Exception occured when connecting to port: " + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			PrintStream out = new PrintStream(socket.getOutputStream());
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+
+			logger.log(Level.INFO, "Sending message to server " + msg1);
+			out.println(msg1);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "message received from server " + readMssg);
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Expected " + msg2);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			/*
+			 * Checkpoints and wait for Restore
+			 */
+			logger.log(Level.INFO, "Going to checkpoint");
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+			SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
+
+			logger.log(Level.INFO, "Sending message to server " + msg3);
+			out.println(msg3);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "message received from server " + readMssg);
+			if (!msg4.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Expected " + msg2);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			socket.close();
+			/*
+			 * Wait for server process to end.
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			/*
+			 * Check the server process has ended successfully, if it was a success put Mapped Buffer to pass state, else to failed state
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java b/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
new file mode 100644
index 000000000..65fe92a9d
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
@@ -0,0 +1,124 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsDataServer {
+	static String TESTNAME = "SocketsDataServer";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		String parentTestName, portArg;
+		int port;
+		Socket socket = null;
+		Logger logger = null;
+		String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2",
+				msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4", readMssg;
+
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsDataFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+			logger.log(Level.INFO, "socket buffer connection opened");
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			ServerSocket ser = new ServerSocket(port);
+			logger.log(Level.INFO, "Server will be listening on Port " + port);
+
+			/*
+			 * Wait for 7 seconds for client to connect, else throw a timeout exception
+			 */
+			try {
+				ser.setSoTimeout(7 * 1000);
+
+			} catch (SocketException e) {
+				logger.log(Level.SEVERE, "cannot set timeout");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			logger.log(Level.INFO, "Waiting for client to connect");
+			/*
+			 * Put Socket Mapped Buffer to SocketHelper.STATE_LISTEN state - server has bound to port and
+			 * begin listening for connections.
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
+			socket = ser.accept();
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+			PrintStream outstream = new PrintStream(socket.getOutputStream());
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 1: " + readMssg);
+
+			if (!msg1.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 1 received was wrong:rec " + readMssg + " expected: " + msg1);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			logger.log(Level.INFO, "Sending message: " + msg2);
+			outstream.println(msg2);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 3: " + readMssg);
+
+			if (!msg3.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 3 received was wrong:rec " + readMssg + " expected: " + msg3);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			outstream.println(msg4);
+			logger.log(Level.INFO, "Sent message 4 " + msg4);
+
+			socket.close();
+			/*
+			 * Put Socket-MappedBuffer to state SocketHelper.STATE_SUCCESS telling the server process has ended successfully.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				System.exit(1);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_SUCCESS);
+			}
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsListen.java b/test/javaTests/src/org/criu/java/tests/SocketsListen.java
new file mode 100644
index 000000000..3fad38549
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsListen.java
@@ -0,0 +1,153 @@
+package org.criu.java.tests;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsListen {
+	static String TESTNAME = "SocketsListen";
+
+	/**
+	 * Runs the client and server process, checkpoints the server process when the server has bound to a port, but has not yet started listening
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null, socketMappedBuffer = null;
+		FileChannel channel;
+		String pid;
+		String port = "49200";
+		Logger logger = null;
+		try {
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			/*
+			 * Mapped buffer 'b' to communicate between CheckpointRestore.java and this process.
+			 */
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			Helper.init(TESTNAME, pid, logger);
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+
+			if (b.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Creating socketbufferfile and setting the init value of buffer");
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and this process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/SocketsListenFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			/*
+			 * Set socketMappedBuffer to init state.
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_INIT);
+
+			logger.log(Level.INFO, "Starting server and client process");
+			ProcessBuilder builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsListenServer", TESTNAME, port);
+			Process serverProcess = builder.start();
+			builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsListenClient", TESTNAME, port);
+			Process clientProcess = builder.start();
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Some error took place in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "State is not the expected 'to be checkpointed' state");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				logger.log(Level.INFO, "Going to checkpoint server process");
+				SocketHelper.checkpointAndWait(b, logger, serverProcess, clientProcess);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_RESTORE);
+				logger.log(Level.INFO, "Process has been restored!");
+			}
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN) {
+				;
+			}
+			char bufchar = socketMappedBuffer.getChar(Helper.MAPPED_INDEX);
+			if (bufchar != Helper.STATE_FAIL && bufchar != Helper.STATE_PASS && bufchar != SocketHelper.STATE_SUCCESS) {
+				logger.log(Level.SEVERE, "Received wrong message from the child process: not the expected finish message");
+				logger.log(Level.SEVERE, "Check their log files for more details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Error in the client or server process: check their log for details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				;
+			}
+
+			/*
+			 * Client process puts socketMappedBuffer to Helper.STATE_PASS-Pass state if the test passed.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_PASS) {
+				logger.log(Level.INFO, Helper.PASS_MESSAGE);
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (b != null) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java b/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java
new file mode 100644
index 000000000..efcb3d545
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java
@@ -0,0 +1,136 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsListenClient {
+	static String TESTNAME = "SocketsListenClient";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		Socket socket = null;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+			String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2", readMssg,
+					msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4";
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsListenFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_RESTORE && socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "Error: Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Waiting for CR");
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				;
+			}
+
+			logger.log(Level.INFO, "Restored");
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "Buffer does not contain the expected 'server bound to port' state" + socketMappedBuffer.getChar(Helper.MAPPED_INDEX));
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			/*
+			 * Make the thread sleep to ensure server is listening on the port for client connections.
+			 */
+			logger.log(Level.INFO, "Put thread to sleep");
+			try {
+				Thread.sleep(10);
+			} catch (InterruptedException e) {
+				logger.log(Level.WARNING, "Thread was interuptedp");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			logger.log(Level.INFO, "Client socket sending req to server at IP: 127.0.0.1 port:" + port);
+			try {
+				socket = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Exception occured when connecting to port: " + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			PrintStream out = new PrintStream(socket.getOutputStream());
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+
+			logger.log(Level.INFO, "Sending message to server " + msg1);
+			out.println(msg1);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "message received from server " + readMssg);
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Expected " + msg2);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			logger.log(Level.INFO, "Sending message to server " + msg3);
+			out.println(msg3);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "message received from server " + readMssg);
+			if (!msg4.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Expected " + msg4);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			socket.close();
+
+			/*
+			 * Wait for server process to end.
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN) {
+				;
+			}
+			/*
+			 * Check the server process has ended successfully, if it was a success put MappedBuffer to STATE_PASS, else to STATE_FAIL
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java b/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
new file mode 100644
index 000000000..46fef40ec
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
@@ -0,0 +1,160 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsListenServer {
+	static String TESTNAME = "SocketsListenServer";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+		Socket socket = null;
+		String readMssg, msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2",
+				msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4";
+
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsListenFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			SocketHelper.writePid(parentTestName, pid);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+			logger.log(Level.INFO, "Server pid: " + pid);
+			logger.log(Level.INFO, "socket buffer connection opened");
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			logger.log(Level.INFO, "Server will be listening on Port " + port);
+			ServerSocket ser = new ServerSocket(port);
+			/*
+			 * Server has bound to a port but is not listening yet!
+			 */
+			logger.log(Level.INFO, "Going to checkpoint");
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				ser.close();
+				System.exit(1);
+			}
+			/*
+			 * Checkpoint and wait for Restore.
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+			SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
+
+			if (!ser.isBound()) {
+				logger.log(Level.SEVERE, "Server is not bound to a port");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (ser.getLocalPort() != port) {
+				logger.log(Level.SEVERE, "SServer is not listening on correct port");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			/*
+			 * Timeout after 5 sec if client does not connect
+			 */
+			try {
+				ser.setSoTimeout(5 * 1000);
+
+			} catch (SocketException e) {
+				logger.log(Level.SEVERE, "cannot set timeout");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			try {
+				logger.log(Level.INFO, "Waiting for client to connect");
+				/*
+				 * Put Socket Mapped Buffer to SocketHelper.STATE_LISTEN state - server has bound to port and
+				 * will begin listening for connections.
+				 */
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
+				socket = ser.accept();
+
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Timed out while waiting for client to connect\n" + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+			PrintStream outstream = new PrintStream(socket.getOutputStream());
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 1: " + readMssg);
+			if (!msg1.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 1 received was wrong:rec " + readMssg + " expected: " + msg1);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			logger.log(Level.INFO, "Sending message: " + msg2);
+			outstream.println(msg2);
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 3: " + readMssg);
+
+			if (!msg3.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 3 received was wrong:rec " + readMssg + " expected: " + msg3);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			outstream.println(msg4);
+			logger.log(Level.INFO, "Sending message: " + msg4);
+
+			/*
+			 * Put Socket-MappedBuffer to state SocketHelper.STATE_SUCCESS telling the server process has ended successfully.
+			 */
+			socket.close();
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				System.exit(1);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_SUCCESS);
+			}
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java b/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java
new file mode 100644
index 000000000..5e55c4274
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java
@@ -0,0 +1,152 @@
+package org.criu.java.tests;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsMultiple {
+	static String TESTNAME = "SocketsMultiple";
+
+	/**
+	 * Runs the Client and Server Processes, Multiple clients connect to server Process, checkpoints the server process
+	 *
+	 * @param args Not used
+	 */
+	public static void main(String[] args) {
+		MappedByteBuffer b = null, socketMappedBuffer = null;
+		FileChannel channel;
+		String pid;
+		String port = "49200";
+		Logger logger = null;
+		try {
+			/*
+			 * Mapped buffer 'b' to communicate between CheckpointRestore.java and this process.
+			 */
+			File f = new File(Helper.MEMORY_MAPPED_FILE_NAME);
+			channel = FileChannel.open(f.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			b = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			pid = bean.getName();
+			Helper.init(TESTNAME, pid, logger);
+			logger.log(Level.INFO, "Test init done; pid written to pid file; beginning with test");
+
+			if (b.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Error: Error in memory mapping, test is not in init state");
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and this process.
+			 */
+			logger.log(Level.INFO, "Creating socketBufferFile and setting the init value of buffer");
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + TESTNAME + "/SocketsMultipleFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			/*
+			 * Set socketMappedBuffer to init state.
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_INIT);
+
+			logger.log(Level.INFO, "Starting server and client process");
+			ProcessBuilder builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsMultipleServer", TESTNAME, port);
+			Process serverProcess = builder.start();
+			builder = new ProcessBuilder("java", "-cp", "target/classes", Helper.PACKAGE_NAME + "." + "SocketsMultipleClient", TESTNAME, port);
+			Process clientProcess = builder.start();
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Some error took place in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_CHECKPOINT) {
+				logger.log(Level.SEVERE, "Killing the server process and client process");
+				logger.log(Level.SEVERE, "State is not the expected 'to be checkpointed' state");
+				serverProcess.destroy();
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				logger.log(Level.INFO, "Going to checkpoint server process");
+				SocketHelper.checkpointAndWait(b, logger, serverProcess, clientProcess);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_RESTORE);
+				logger.log(Level.INFO, "Process has been restored!");
+			}
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			char bufchar = socketMappedBuffer.getChar(Helper.MAPPED_INDEX);
+			if (bufchar != Helper.STATE_FAIL && bufchar != Helper.STATE_PASS && bufchar != SocketHelper.STATE_SUCCESS) {
+				logger.log(Level.SEVERE, "Received wrong message from the child process: not the expected finish message");
+				logger.log(Level.SEVERE, "Check their log files for more details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				logger.log(Level.SEVERE, "Error in the client or server process: check their log for details");
+				clientProcess.destroy();
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				;
+			}
+
+			/*
+			 * Client process puts socketMappedBuffer to STATE_PASS state if the test passed.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_PASS) {
+				logger.log(Level.INFO, Helper.PASS_MESSAGE);
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			System.exit(0);
+
+		} catch (Exception e) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				e.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.FINE, writer.toString());
+			}
+			if (b != null) {
+				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+			System.exit(5);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java b/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java
new file mode 100644
index 000000000..d97a946fd
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java
@@ -0,0 +1,174 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsMultipleClient {
+	static String TESTNAME = "SocketsMultipleClient";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		String msg1 = "Message1", msg2 = "Message2", readMssg;
+		Socket socket1 = null, socket2 = null, socket3 = null, socket4 = null;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsMultipleFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != SocketHelper.STATE_LISTEN) {
+				logger.log(Level.SEVERE, "Error: Socket-buffer not in expected state");
+
+			}
+			try {
+				logger.log(Level.INFO, "client 1 connecting...");
+				socket1 = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Exception when client connects to server: " + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+			logger.log(Level.INFO, "Client 1 connected to server successfully");
+			PrintStream out1 = new PrintStream(socket1.getOutputStream());
+			BufferedReader br1 = new BufferedReader(new InputStreamReader(socket1.getInputStream()));
+			logger.log(Level.INFO, "Got input and output streams for socket1");
+			try {
+				logger.log(Level.INFO, "client 2 connecting...");
+				socket2 = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Exception when client connects to server: " + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+			logger.log(Level.INFO, "Client 2 connected to server successfully");
+			PrintStream out2 = new PrintStream(socket2.getOutputStream());
+			BufferedReader br2 = new BufferedReader(new InputStreamReader(socket2.getInputStream()));
+			logger.log(Level.INFO, "Got input and output streams for socket2");
+
+			try {
+				logger.log(Level.INFO, "client 3 connecting...");
+				socket3 = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Exception when client connects to server: " + e);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+			logger.log(Level.INFO, "Client 3 connected to server successfully");
+			PrintStream out3 = new PrintStream(socket3.getOutputStream());
+			BufferedReader br3 = new BufferedReader(new InputStreamReader(socket3.getInputStream()));
+			logger.log(Level.INFO, "Got input and output streams for socket3");
+
+			out1.println(msg1);
+
+			readMssg = br1.readLine();
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received; Received: " + readMssg);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+			socket1.close();
+
+			out2.println(msg1);
+
+			/*
+			 * Wait for Checkpoint-Restore
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_INIT || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_LISTEN || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_CHECKPOINT) {
+				;
+			}
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_RESTORE) {
+				logger.log(Level.SEVERE, "Socket-mapped-buffer is not in restored state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Server is Restored!!");
+
+			out3.println(msg1);
+			readMssg = br2.readLine();
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received by client 2; Received: " + readMssg);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			readMssg = br3.readLine();
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received by client 3; Received: " + readMssg);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			socket2.close();
+			socket3.close();
+
+			try {
+				logger.log(Level.INFO, "client 4 connecting...");
+				socket4 = new Socket(SocketHelper.IP_ADDRESS, port);
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Exception when client connects to server: " + e);
+			}
+			logger.log(Level.INFO, "Client 4 connected to server successfully");
+			PrintStream out4 = new PrintStream(socket4.getOutputStream());
+			BufferedReader br4 = new BufferedReader(new InputStreamReader(socket4.getInputStream()));
+			logger.log(Level.INFO, "Got input and output streams for socket4");
+
+			out4.println(msg1);
+			readMssg = br4.readLine();
+			if (!msg2.equals(readMssg)) {
+				logger.log(Level.SEVERE, "wrong message received by client 4; Received: " + readMssg);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+			socket4.close();
+			/*
+			 * Wait for server process to end.
+			 */
+			while (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_RESTORE) {
+				;
+			}
+			/*
+			 * Check the server process has ended successfully, if it was a success put Mapped Buffer to STATE_PASS, else to STATE_FAIL
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == SocketHelper.STATE_SUCCESS) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_PASS);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java b/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
new file mode 100644
index 000000000..a7e4d3b9e
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
@@ -0,0 +1,215 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsMultipleServer {
+	static String TESTNAME = "SocketsMultipleServer";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		FileChannel channel;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsMultipleFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			SocketHelper.writePid(parentTestName, pid);
+
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+			logger.log(Level.INFO, "Server pid: " + pid);
+			logger.log(Level.INFO, "socket buffer connection opened");
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+				System.exit(1);
+			}
+
+			/*
+			 * The array indexes 3, 5, 7 and 9 will map the state of client 1, 2, 3 and 4.
+			 * Set these array indexes to init state.
+			 */
+
+			socketMappedBuffer.putChar(3, Helper.STATE_INIT);
+			socketMappedBuffer.putChar(5, Helper.STATE_INIT);
+			socketMappedBuffer.putChar(7, Helper.STATE_INIT);
+			socketMappedBuffer.putChar(9, Helper.STATE_INIT);
+
+			ServerSocket ser = new ServerSocket(port);
+			logger.log(Level.INFO, "Server will be listening on Port " + port);
+
+			Socket[] sockets = new Socket[4];
+
+			/*
+			 * Set the SocketMappedBuffer to S state-server will be listening for connections
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
+
+			for (int i = 1; i <= 4; i++) {
+				sockets[i - 1] = ser.accept();
+				ServerThread serverThread = new ServerThread(sockets[i - 1], "ser-socket " + i, 2 * i + 1, logger, socketMappedBuffer);
+				serverThread.start();
+				if (i == 3) {
+					logger.log(Level.INFO, "Connected to client: 3");
+					/*
+					 * Client 3 has connected, wait for thread 1 to finish and then checkpoint.
+					 */
+					while (socketMappedBuffer.getChar(3) != Helper.STATE_FAIL && socketMappedBuffer.getChar(3) != Helper.STATE_PASS) {
+						;
+					}
+					logger.log(Level.INFO, "Going to checkpoint");
+					socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+					SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
+				}
+			}
+
+			/*
+			 * Loop while any of the 4 thread is running
+			 */
+			while (socketMappedBuffer.getChar(3) == Helper.STATE_INIT || socketMappedBuffer.getChar(5) == Helper.STATE_INIT
+					|| socketMappedBuffer.getChar(7) == Helper.STATE_INIT || socketMappedBuffer.getChar(9) == Helper.STATE_INIT) {
+				;
+			}
+
+			/*
+			 * Check Socket Mapped Buffer for a thread that failed
+			 */
+			for (int i = 1; i <= 4; i++) {
+				if (socketMappedBuffer.getChar(i * 2 + 1) == Helper.STATE_FAIL) {
+					logger.log(Level.SEVERE, "Error in thread connected to client " + i);
+					socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+					System.exit(1);
+				}
+			}
+
+			/*
+			 * Check the 1st Socket is closed
+			 */
+			if (!sockets[0].isClosed()) {
+				logger.log(Level.SEVERE, "socket 1 is not closed");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+			logger.log(Level.INFO, "Socket 1 is in expected closed state: " + sockets[0].isClosed());
+
+			/*
+			 * Check all threads are in expected pass state
+			 */
+			for (int i = 1; i <= 4; i++) {
+				if (socketMappedBuffer.getChar(i * 2 + 1) != Helper.STATE_PASS) {
+					logger.log(Level.SEVERE, "Unexpected State of buffer: " + socketMappedBuffer.getChar(i * 2 + 1) + ", client: " + i);
+					socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+					System.exit(1);
+				}
+			}
+			logger.log(Level.INFO, "Done");
+
+			/*
+			 * Put Socket-MappedBuffer to state SocketHelper.STATE_SUCCESS telling the server process has ended successfully.
+			 */
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				System.exit(1);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_SUCCESS);
+			}
+
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		}
+	}
+}
+
+class ServerThread extends Thread {
+	Socket socket = null;
+	String name;
+	int num;
+	MappedByteBuffer socketMappedBuffer;
+	Logger logger;
+
+	ServerThread(Socket socket, String name, int num, Logger logger, MappedByteBuffer socketMappedBuffer) {
+		this.socket = socket;
+		this.name = name;
+		this.logger = logger;
+		this.num = num;
+		this.socketMappedBuffer = socketMappedBuffer;
+	}
+
+	public void run() {
+		try {
+			String readMssg, msg1 = "Message1", msg2 = "Message2";
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+			PrintStream out = new PrintStream(socket.getOutputStream());
+			readMssg = br.readLine();
+			if (!msg1.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message read by thread " + name + " was not 'Message1', received Message: " + readMssg);
+				socket.close();
+				socketMappedBuffer.putChar(num, Helper.STATE_FAIL);
+			} else {
+				logger.log(Level.INFO, name + " received correct message");
+				out.println(msg2);
+				logger.log(Level.INFO, name + " has sent message");
+				socket.close();
+				socketMappedBuffer.putChar(num, Helper.STATE_PASS);
+			}
+
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred in thread :" + name + " " + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			try {
+				if (socket != null) {
+					socket.close();
+				}
+			} catch (IOException e) {
+				;
+			}
+
+			/*
+			 * If exception occurs fail the thread
+			 */
+			socketMappedBuffer.putChar(num, Helper.STATE_FAIL);
+		}
+	}
+}
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsServer.java b/test/javaTests/src/org/criu/java/tests/SocketsServer.java
new file mode 100644
index 000000000..051233443
--- /dev/null
+++ b/test/javaTests/src/org/criu/java/tests/SocketsServer.java
@@ -0,0 +1,142 @@
+package org.criu.java.tests;
+
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileChannel.MapMode;
+import java.nio.file.StandardOpenOption;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+class SocketsServer {
+	static String TESTNAME = "SocketsServer";
+
+	public static void main(String[] args) {
+		MappedByteBuffer socketMappedBuffer = null;
+		String msg1 = "Ch@ckM@$$@Ge!1", msg2 = "cH@C!m$SG!!2",
+				msg3 = "@Ft@rCPM$$g3", msg4 = "Aft@rCPM$$g4", readMssg;
+		FileChannel channel;
+		String parentTestName, portArg;
+		int port;
+		Logger logger = null;
+
+		try {
+			parentTestName = args[0];
+			portArg = args[1];
+			port = Integer.parseInt(portArg);
+
+			/*
+			 * Socket Mapped Buffer to communicate between server process, client process and the calling parent process.
+			 */
+			File socketfile = new File(Helper.OUTPUT_FOLDER_NAME + "/" + parentTestName + "/SocketsFile");
+			channel = FileChannel.open(socketfile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+			socketMappedBuffer = channel.map(MapMode.READ_WRITE, 0, Helper.MAPPED_REGION_SIZE);
+			channel.close();
+
+			logger = Logger.getLogger(Helper.PACKAGE_NAME + "." + TESTNAME);
+
+			SocketHelper.init(TESTNAME, parentTestName, logger);
+			logger.log(Level.INFO, "Begin");
+			logger.log(Level.INFO, "Parent name: " + parentTestName);
+
+			RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean();
+			String pid = bean.getName();
+			SocketHelper.writePid(parentTestName, pid);
+
+			logger.log(Level.INFO, "Socket buffer mapped");
+
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) != Helper.STATE_INIT) {
+				logger.log(Level.SEVERE, "Socket-buffer not in expected Init state");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+
+			ServerSocket ser = new ServerSocket(port);
+			logger.log(Level.INFO, "Server will be listening on Port " + port);
+
+			/*
+			 * Timeout after 5 second if client does not connect
+			 */
+			ser.setSoTimeout(5 * 1000);
+			logger.log(Level.INFO, "Waiting for client to connect");
+			Socket socket = null;
+			try {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
+				socket = ser.accept();
+			} catch (Exception e) {
+				logger.log(Level.SEVERE, "Timed out while waiting for client to connect");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+			PrintStream outstream = new PrintStream(socket.getOutputStream());
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 1: " + readMssg);
+			if (!msg1.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 1 received was wrong:rec " + readMssg + " expected: " + msg1);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
+			}
+
+			logger.log(Level.INFO, "Sending message: " + msg2);
+			outstream.println(msg2);
+
+			logger.log(Level.INFO, "Going to checkpoint");
+			/*
+			 * Put socket Mapped Buffer to 'to be checkpointed' state and wait for restore
+			 */
+			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
+			SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
+
+			if (!ser.isBound()) {
+				logger.log(Level.SEVERE, "Server is not bound to a port");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			if (ser.getLocalPort() != port) {
+				logger.log(Level.SEVERE, "Server is not listening on correct port");
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				System.exit(1);
+			}
+
+			readMssg = br.readLine();
+			logger.log(Level.INFO, "Read message 3: " + readMssg);
+
+			if (!msg3.equals(readMssg)) {
+				logger.log(Level.SEVERE, "Message 3 received was wrong:rec " + readMssg + " expected: " + msg3);
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+				socket.close();
+				System.exit(1);
+			}
+
+			outstream.println(msg4);
+			logger.log(Level.INFO, "Sent message 4 " + msg4);
+
+			/*
+			 * Put Socket-MappedBuffer to state SocketHelper.STATE_SUCCESS telling the server process has ended successfully.
+			 */
+			socket.close();
+			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
+				System.exit(1);
+			} else {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_SUCCESS);
+			}
+
+		} catch (Exception exception) {
+			if (null != logger) {
+				StringWriter writer = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(writer);
+				exception.printStackTrace(printWriter);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
+				logger.log(Level.FINE, writer.toString());
+			}
+
+			if (socketMappedBuffer != null) {
+				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
+			}
+		}
+	}
+}
diff --git a/test/javaTests/test.xml b/test/javaTests/test.xml
index b73a31db2..4768bf193 100644
--- a/test/javaTests/test.xml
+++ b/test/javaTests/test.xml
@@ -40,4 +40,50 @@
 		</classes>
 	</test>
 
+	<test name = "test6-Sockets">
+		<parameter name="testname" value="Sockets"/>
+		<parameter name="checkpointOpt" value="--tcp-established"/>
+		<parameter name="restoreOpt" value="--tcp-established"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test7-SocketsListen">
+		<parameter name="testname" value="SocketsListen"/>
+		<parameter name="checkpointOpt" value="--tcp-established"/>
+		<parameter name="restoreOpt" value="--tcp-established"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test8-SocketsConnect">
+		<parameter name="testname" value="SocketsConnect"/>
+		<parameter name="checkpointOpt" value="--tcp-established"/>
+		<parameter name="restoreOpt" value="--tcp-established"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test9-SocketsMultiple">
+		<parameter name="testname" value="SocketsMultiple"/>
+		<parameter name="checkpointOpt" value="--tcp-established"/>
+		<parameter name="restoreOpt" value="--tcp-established"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+	</test>
+
+	<test name = "test10-SocketsData">
+		<parameter name="testname" value="SocketsData"/>
+		<parameter name="checkpointOpt" value="--tcp-established"/>
+		<parameter name="restoreOpt" value="--tcp-established"/>
+		<classes>
+			<class name = "org.criu.java.tests.CheckpointRestore"/>
+		</classes>
+
+	</test>
+
 </suite>

From 0c218746d587483346d5dcb7638b642392a4985f Mon Sep 17 00:00:00 2001
From: Nidhi Gupta <itsnidhi16@gmail.com>
Date: Thu, 9 Jan 2020 22:43:25 +0530
Subject: [PATCH 0117/1854] Switch open-j9 alpine tests to python3

Signed-off-by: Nidhi Gupta <itsnidhi16@gmail.com>
---
 scripts/build/Dockerfile.openj9-alpine | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
index 43a993444..39ea4d08e 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -14,7 +14,7 @@ RUN apk update && apk add \
 	pkgconfig \
 	protobuf-c-dev \
 	protobuf-dev \
-	python \
+	python3 \
 	sudo \
 	maven \
 	ip6tables \

From f1abc9aa26421b0c0ea52a703590cd998e676b55 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 14 Jan 2020 14:47:18 +0100
Subject: [PATCH 0118/1854] ppc64le: remove register '1' from clobber list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compiling 'criu-dev' on Fedora 31 gives two errors about wrong clobber
lists:

compel/include/uapi/compel/asm/sigframe.h:47:9: error: listing the stack pointer register ‘1’ in a clobber list is deprecated [-Werror=deprecated]

criu/arch/ppc64/include/asm/restore.h:14:2: error: listing the stack pointer register ‘1’ in a clobber list is deprecated [-Werror=deprecated]

There was also a bug report from Debian that CRIU does not build because
of this.

Each of these errors comes with the following note:

note: the value of the stack pointer after an ‘asm’ statement must be the same as it was before the statement

As far as I understand it this should not be a problem in this cases as
the code never returns anyway.

Running zdtm very seldom fails during 'zdtm/static/cgroup_ifpriomap'
with a double free or corruption. This happens not very often and I
cannot verify if it happens without this patch. As CRIU does not build
without the patch.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h | 2 +-
 criu/arch/ppc64/include/asm/restore.h                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
index 9467a1b99..5c98b199d 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
@@ -50,7 +50,7 @@ struct rt_sigframe {
 		"sc \n"						\
 		:						\
 		: "r"(new_sp)					\
-		: "1", "memory")
+		: "memory")
 
 #if _CALL_ELF != 2
 # error Only supporting ABIv2.
diff --git a/criu/arch/ppc64/include/asm/restore.h b/criu/arch/ppc64/include/asm/restore.h
index 8d4516090..f065ec3a0 100644
--- a/criu/arch/ppc64/include/asm/restore.h
+++ b/criu/arch/ppc64/include/asm/restore.h
@@ -21,7 +21,7 @@
 		: "r"(new_sp),						\
 		  "r"((unsigned long)restore_task_exec_start),		\
 		  "r"(task_args)					\
-		: "1", "3", "12")
+		: "3", "12")
 
 /* There is nothing to do since TLS is accessed through r13 */
 #define core_get_tls(pcore, ptls)

From 4232b270b8a0c866b9ee26e7b5f381cbf7cea56a Mon Sep 17 00:00:00 2001
From: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Date: Fri, 10 Jan 2020 15:57:50 +0300
Subject: [PATCH 0119/1854] image: core -- Reserve start_time field

To ensure consistency of runtime environment processes within a
container need to see same start time values over suspend/resume
cycles. We introduce new field to the core image structure to
store start time of a dumped process. Later same value would be
restored to a newly created task. In future the feature is likely
to be pulled here, so we reserve field id in protobuf descriptor.

Signed-off-by: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
---
 images/core.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/core.proto b/images/core.proto
index c3dba6f6d..e90522914 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -53,6 +53,8 @@ message task_core_entry {
 	//optional int32		tty_pgrp	= 17;
 
 	optional bool			child_subreaper	= 18;
+	// Reserved for container relative start time
+	//optional uint64		start_time	= 19;
 }
 
 message task_kobj_ids_entry {

From 8fea2647b69fc0be0cac6a43639ed648cdd08db6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 9 Jan 2020 18:54:50 +0000
Subject: [PATCH 0120/1854] travis: reduce the number of podman tests

We are running each podman test loop 50 times. This takes more than 20
minutes in Travis. Reduce both test loops to only run 20 times.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/podman-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh
index 5189477cd..825bca746 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/travis/podman-test.sh
@@ -35,7 +35,7 @@ criu --version
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
 
 sleep 1
-for i in `seq 50`; do
+for i in `seq 20`; do
 	echo "Test $i for podman container checkpoint"
 	podman exec cr ps axf
 	podman logs cr
@@ -48,7 +48,7 @@ for i in `seq 50`; do
 	podman logs cr
 done
 
-for i in `seq 50`; do
+for i in `seq 20`; do
 	echo "Test $i for podman container checkpoint --export"
 	podman ps -a
 	podman exec cr ps axf

From ca02c47075b69c3387d03ae2a09ab9499d5bd27f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 15 Dec 2019 20:38:46 +0000
Subject: [PATCH 0121/1854] kerndat: detect if system support clone3() with
 set_tid

Linux kernel 5.4 extends clone3() with set_tid to allow processes to
specify the PID of a newly created process. This introduces detection
of the clone3() syscall and if set_tid is supported.

This first implementation is X86_64 only.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 .../plugins/include/uapi/std/syscall-types.h  |  1 +
 criu/cr-check.c                               | 12 ++++++
 criu/include/kerndat.h                        |  1 +
 criu/include/sched.h                          | 33 +++++++++++++++
 criu/kerndat.c                                | 41 +++++++++++++++++++
 10 files changed, 93 insertions(+)
 create mode 100644 criu/include/sched.h

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index d5bdc677e..f7ebc8527 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -115,3 +115,4 @@ ppoll				73	336	(struct pollfd *fds, unsigned int nfds, const struct timespec *t
 fsopen				430	430	(char *fsname, unsigned int flags)
 fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
+clone3				435	435	(struct clone_args *uargs, size_t size)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 4e283d5e9..1afaf1e70 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -111,3 +111,4 @@ __NR_ppoll		281		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index fd48e3950..ae6fdb5f8 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -111,3 +111,4 @@ __NR_ppoll		302		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 038aeb4f7..7a487110d 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -99,3 +99,4 @@ __NR_ppoll		309		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 215f32026..6667c07db 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -110,3 +110,4 @@ __NR_ppoll			271		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struc
 __NR_fsopen			430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_clone3			435		sys_clone3		(struct clone_args *uargs, size_t size)
diff --git a/compel/plugins/include/uapi/std/syscall-types.h b/compel/plugins/include/uapi/std/syscall-types.h
index 57865e741..031e773bb 100644
--- a/compel/plugins/include/uapi/std/syscall-types.h
+++ b/compel/plugins/include/uapi/std/syscall-types.h
@@ -39,6 +39,7 @@ struct msghdr;
 struct rusage;
 struct iocb;
 struct pollfd;
+struct clone_args;
 
 typedef unsigned long aio_context_t;
 
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 17dd29b42..80df3f7cd 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1224,6 +1224,16 @@ static int check_uffd_noncoop(void)
 	return 0;
 }
 
+static int check_clone3_set_tid(void)
+{
+	if (!kdat.has_clone3_set_tid) {
+		pr_warn("clone3() with set_tid not supported\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int check_can_map_vdso(void)
 {
 	if (kdat_can_map_vdso() == 1)
@@ -1373,6 +1383,7 @@ int cr_check(void)
 		ret |= check_sk_netns();
 		ret |= check_kcmp_epoll();
 		ret |= check_net_diag_raw();
+		ret |= check_clone3_set_tid();
 	}
 
 	/*
@@ -1476,6 +1487,7 @@ static struct feature_list feature_list[] = {
 	{ "link_nsid", check_link_nsid},
 	{ "kcmp_epoll", check_kcmp_epoll},
 	{ "external_net_ns", check_external_net_ns},
+	{ "clone3_set_tid", check_clone3_set_tid},
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 771195860..27c870bb8 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -66,6 +66,7 @@ struct kerndat_s {
 	bool has_inotify_setnextwd;
 	bool has_kcmp_epoll_tfd;
 	bool has_fsopen;
+	bool has_clone3_set_tid;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/sched.h b/criu/include/sched.h
new file mode 100644
index 000000000..78f65e3b7
--- /dev/null
+++ b/criu/include/sched.h
@@ -0,0 +1,33 @@
+#ifndef __CR_SCHED_H__
+#define __CR_SCHED_H__
+
+#include <linux/types.h>
+
+#ifndef ptr_to_u64
+#define ptr_to_u64(ptr)	((__u64)((uintptr_t)(ptr)))
+#endif
+#ifndef u64_to_ptr
+#define u64_to_ptr(x)	((void *)(uintptr_t)x)
+#endif
+
+/*
+ * This structure is needed by clone3(). The kernel
+ * calls it 'struct clone_args'. As CRIU will always
+ * need at least this part of the structure (VER1)
+ * to be able to test if clone3() with set_tid works,
+ * the structure is defined here as 'struct _clone_args'.
+ */
+
+struct _clone_args {
+	__aligned_u64 flags;
+	__aligned_u64 pidfd;
+	__aligned_u64 child_tid;
+	__aligned_u64 parent_tid;
+	__aligned_u64 exit_signal;
+	__aligned_u64 stack;
+	__aligned_u64 stack_size;
+	__aligned_u64 tls;
+	__aligned_u64 set_tid;
+	__aligned_u64 set_tid_size;
+};
+#endif /* __CR_SCHED_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index d1afde71d..0772828bc 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -41,6 +41,7 @@
 #include "uffd.h"
 #include "vdso.h"
 #include "kcmp.h"
+#include "sched.h"
 
 struct kerndat_s kdat = {
 };
@@ -986,6 +987,44 @@ static int kerndat_tun_netns(void)
 	return check_tun_netns_cr(&kdat.tun_ns);
 }
 
+static bool kerndat_has_clone3_set_tid(void)
+{
+	pid_t pid;
+	struct _clone_args args = {};
+
+#ifndef CONFIG_X86_64
+	/*
+	 * Currently the CRIU PIE assembler clone3() wrapper is
+	 * only implemented for X86_64.
+	 */
+	kdat.has_clone3_set_tid = false;
+	return 0;
+#endif
+
+	args.set_tid = -1;
+	/*
+	 * On a system without clone3() this will return ENOSYS.
+	 * On a system with clone3() but without set_tid this
+	 * will return E2BIG.
+	 * On a system with clone3() and set_tid it will return
+	 * EINVAL.
+	 */
+	pid = syscall(__NR_clone3, &args, sizeof(args));
+
+	if (pid == -1 && (errno == ENOSYS || errno == E2BIG)) {
+		kdat.has_clone3_set_tid = false;
+		return 0;
+	}
+	if (pid == -1 && errno == EINVAL) {
+		kdat.has_clone3_set_tid = true;
+	} else {
+		pr_perror("Unexpected error from clone3\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 int kerndat_init(void)
 {
 	int ret;
@@ -1059,6 +1098,8 @@ int kerndat_init(void)
 		ret = has_kcmp_epoll_tfd();
 	if (!ret)
 		ret = kerndat_has_fsopen();
+	if (!ret)
+		ret = kerndat_has_clone3_set_tid();
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From 97c03b97d00e27397ca2ea0f9b5569739e24ae27 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 16 Dec 2019 07:57:03 +0000
Subject: [PATCH 0122/1854] Add assembler wrapper for clone3()

To create a new process/thread with a certain PID based on clone3() a
new assembler wrapper is necessary as there is not glibc wrapper (yet).

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/aarch64/include/asm/restorer.h |  7 ++
 criu/arch/arm/include/asm/restorer.h     |  7 ++
 criu/arch/ppc64/include/asm/restorer.h   |  7 ++
 criu/arch/s390/include/asm/restorer.h    |  7 ++
 criu/arch/x86/include/asm/restorer.h     | 92 ++++++++++++++++++++++++
 5 files changed, 120 insertions(+)

diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index f502cdcaf..2fe58915b 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -42,6 +42,13 @@
 			  "r"(&thread_args[i])					\
 			: "x0", "x1", "x2", "x3", "x8", "memory")
 
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
+			      clone_restore_fn)	do { \
+	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
+	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
+	ret = -1; \
+} while (0)
+
 #define ARCH_FAIL_CORE_RESTORE					\
 	asm volatile(						\
 			"mov sp, %0			\n"	\
diff --git a/criu/arch/arm/include/asm/restorer.h b/criu/arch/arm/include/asm/restorer.h
index 217d920e8..ad4b58f93 100644
--- a/criu/arch/arm/include/asm/restorer.h
+++ b/criu/arch/arm/include/asm/restorer.h
@@ -43,6 +43,13 @@
 		       "r"(&thread_args[i])				\
 		     : "r0", "r1", "r2", "r3", "r7", "memory")
 
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
+			      clone_restore_fn)	do { \
+	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
+	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
+	ret = -1; \
+} while (0)
+
 #define ARCH_FAIL_CORE_RESTORE					\
 	asm volatile(						\
 		     "mov sp, %0			\n"	\
diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index d48d833d6..19bc3ea36 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/criu/arch/ppc64/include/asm/restorer.h
@@ -48,6 +48,13 @@
 		  "r"(&thread_args[i])		/* %6 */		\
 		: "memory","0","3","4","5","6","7","14","15")
 
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
+			      clone_restore_fn)	do { \
+	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
+	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
+	ret = -1; \
+} while (0)
+
 #define arch_map_vdso(map, compat)		-1
 
 int restore_gpregs(struct rt_sigframe *f, UserPpc64RegsEntry *r);
diff --git a/criu/arch/s390/include/asm/restorer.h b/criu/arch/s390/include/asm/restorer.h
index cfdefcab9..733f2de33 100644
--- a/criu/arch/s390/include/asm/restorer.h
+++ b/criu/arch/s390/include/asm/restorer.h
@@ -39,6 +39,13 @@
 	  "d"(&thread_args[i])						\
 	: "0", "1", "2", "3", "4", "5", "6", "cc", "memory")
 
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
+			      clone_restore_fn)	do { \
+	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
+	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
+	ret = -1; \
+} while (0)
+
 #define arch_map_vdso(map, compat)		-1
 
 int restore_gpregs(struct rt_sigframe *f, UserS390RegsEntry *r);
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 25559b57c..731477ec9 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -25,6 +25,21 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 }
 #endif /* !CONFIG_COMPAT */
 
+/*
+ * Documentation copied from glibc sysdeps/unix/sysv/linux/x86_64/clone.S
+ * The kernel expects:
+ * rax: system call number
+ * rdi: flags
+ * rsi: child_stack
+ * rdx: TID field in parent
+ * r10: TID field in child
+ * r8:	thread pointer
+ *
+ * int clone(unsigned long clone_flags, unsigned long newsp,
+ *           int *parent_tidptr, int *child_tidptr,
+ *           unsigned long tls);
+ */
+
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
 			     thread_args, clone_restore_fn)		\
 	asm volatile(							\
@@ -63,6 +78,83 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 		       "g"(&thread_args[i])				\
 		     : "rax", "rcx", "rdi", "rsi", "rdx", "r10", "r11", "memory")
 
+/* int clone3(struct clone_args *args, size_t size) */
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args,		\
+			      clone_restore_fn)				\
+	asm volatile(							\
+		     "clone3_emul:				\n"	\
+	/*
+	 * Prepare stack pointer for child process. The kernel does
+	 * stack + stack_size before passing the stack pointer to the
+	 * child process. As we have to put the function and the
+	 * arguments for the new process on that stack we have handle
+	 * the kernel's implicit stack + stack_size.
+	 */								\
+		     "movq (%3), %%rsi	/* new stack pointer */	\n"	\
+	/* Move the stack_size to %rax to use later as the offset */	\
+		     "movq %4, %%rax				\n"	\
+	/* 16 bytes are needed on the stack for function and args */	\
+		     "subq $16, (%%rsi, %%rax)			\n"	\
+		     "movq %6, %%rdi	/* thread args */	\n"	\
+		     "movq %%rdi, 8(%%rsi, %%rax)		\n"	\
+		     "movq %5, %%rdi	/* thread function */	\n"	\
+		     "movq %%rdi, 0(%%rsi, %%rax)		\n"	\
+	/*
+	 * The stack address has been modified for the two
+	 * elements above (child function, child arguments).
+	 * This modified stack needs to be stored back into the
+	 * clone_args structure.
+	 */								\
+		     "movq (%%rsi), %3				\n"	\
+	/*
+	 * Do the actual clone3() syscall. First argument (%rdi) is
+	 * the clone_args structure, second argument is the size
+	 * of clone_args.
+	 */								\
+		     "movq %1, %%rdi	/* clone_args */	\n"	\
+		     "movq %2, %%rsi	/* size */		\n"	\
+		     "movl $"__stringify(__NR_clone3)", %%eax	\n"	\
+		     "syscall					\n"	\
+	/*
+	 * If clone3() was successful and if we are in the child
+	 * '0' is returned. Jump to the child function handler.
+	 */								\
+		     "testq %%rax,%%rax				\n"	\
+		     "jz thread3_run				\n"	\
+	/* Return the PID to the parent process. */			\
+		     "movq %%rax, %0				\n"	\
+		     "jmp clone3_end				\n"	\
+									\
+		     "thread3_run:	/* Child process */	\n"	\
+	/* Clear the frame pointer */					\
+		     "xorq %%rbp, %%rbp				\n"	\
+	/* Pop the child function from the stack */			\
+		     "popq %%rax				\n"	\
+	/* Pop the child function arguments from the stack */		\
+		     "popq %%rdi				\n"	\
+	/* Run the child function */					\
+		     "callq *%%rax				\n"	\
+	/*
+	 * If the child function is expected to return, this
+	 * would be the place to handle the return code. In CRIU's
+	 * case the child function is expected to not return
+	 * and do exit() itself.
+	 */								\
+									\
+		     "clone3_end:				\n"	\
+		     : "=r"(ret)		 			\
+	/*
+	 * This uses the "r" modifier for all parameters
+	 * as clang complained if using "g".
+	 */								\
+		     : "r"(&clone_args),				\
+		       "r"(size),					\
+		       "r"(&clone_args.stack),				\
+		       "r"(clone_args.stack_size),			\
+		       "r"(clone_restore_fn),				\
+		       "r"(args)					\
+		     : "rax", "rcx", "rdi", "rsi", "rdx", "r10", "r11", "memory")
+
 #define ARCH_FAIL_CORE_RESTORE					\
 	asm volatile(						\
 		     "movq %0, %%rsp			    \n"	\

From a1ea8deb4c0824dc2178dbe116c9b10f81a608aa Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 16 Dec 2019 10:42:13 +0000
Subject: [PATCH 0123/1854] Use clone3() with set_tid to create processes

With the in Linux Kernel 5.4 introduced clone3() with set_tid it is no
longer necessary to write to to /proc/../ns_last_pid to influence the
next PID number. clone3() can directly select a PID for the newly
created process/thread.

After checking for the availability of clone3() with set_tid and adding
the assembler wrapper for clone3() in previous patches, this extends
criu/pie/restorer.c and criu/clone-noasan.c to use the newly added
assembler clone3() wrapper to create processes with a certain PID.

This is a RFC and WIP, but I wanted to share it and run it through CI
for feedback. As the CI will probably not use a 5.4 based kernel it
should just keep on working as before.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/clone-noasan.c         | 32 +++++++++++++++++++
 criu/cr-restore.c           | 64 +++++++++++++++++++++++--------------
 criu/include/clone-noasan.h |  2 ++
 criu/include/restorer.h     |  1 +
 criu/include/rst_info.h     |  1 +
 criu/pie/restorer.c         | 64 ++++++++++++++++++++++++-------------
 6 files changed, 117 insertions(+), 47 deletions(-)

diff --git a/criu/clone-noasan.c b/criu/clone-noasan.c
index 5f1858d4d..bcbc3e4bd 100644
--- a/criu/clone-noasan.c
+++ b/criu/clone-noasan.c
@@ -1,4 +1,10 @@
+#include <stdlib.h>
 #include <sched.h>
+#include <unistd.h>
+
+#include <compel/plugins/std/syscall-codes.h>
+
+#include "sched.h"
 #include "common/compiler.h"
 #include "log.h"
 #include "common/bug.h"
@@ -31,6 +37,7 @@
 int clone_noasan(int (*fn)(void *), int flags, void *arg)
 {
 	void *stack_ptr = (void *)round_down((unsigned long)&stack_ptr - 1024, 16);
+
 	BUG_ON((flags & CLONE_VM) && !(flags & CLONE_VFORK));
 	/*
 	 * Reserve some bytes for clone() internal needs
@@ -38,3 +45,28 @@ int clone_noasan(int (*fn)(void *), int flags, void *arg)
 	 */
 	return clone(fn, stack_ptr, flags, arg);
 }
+
+int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags,
+			   int exit_signal, pid_t pid)
+{
+	struct _clone_args c_args = {};
+
+	BUG_ON(flags & CLONE_VM);
+
+	/*
+	 * Make sure no child signals are requested. clone3() uses
+	 * exit_signal for that.
+	 */
+	BUG_ON(flags & 0xff);
+
+	pr_debug("Creating process using clone3()\n");
+
+	c_args.exit_signal = exit_signal;
+	c_args.flags = flags;
+	c_args.set_tid = ptr_to_u64(&pid);
+	c_args.set_tid_size = 1;
+	pid = syscall(__NR_clone3, &c_args, sizeof(c_args));
+	if (pid == 0)
+		exit(fn(arg));
+	return pid;
+}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 687cd6c68..b4f8d9e75 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1374,40 +1374,55 @@ static inline int fork_with_pid(struct pstree_item *item)
 	if (!(ca.clone_flags & CLONE_NEWPID)) {
 		char buf[32];
 		int len;
-		int fd;
+		int fd = -1;
 
-		fd = open_proc_rw(PROC_GEN, LAST_PID_PATH);
-		if (fd < 0)
-			goto err;
+		if (!kdat.has_clone3_set_tid) {
+			fd = open_proc_rw(PROC_GEN, LAST_PID_PATH);
+			if (fd < 0)
+				goto err;
+		}
 
 		lock_last_pid();
 
-		len = snprintf(buf, sizeof(buf), "%d", pid - 1);
-		if (write(fd, buf, len) != len) {
-			pr_perror("%d: Write %s to %s", pid, buf, LAST_PID_PATH);
+		if (!kdat.has_clone3_set_tid) {
+			len = snprintf(buf, sizeof(buf), "%d", pid - 1);
+			if (write(fd, buf, len) != len) {
+				pr_perror("%d: Write %s to %s", pid, buf,
+					LAST_PID_PATH);
+				close(fd);
+				goto err_unlock;
+			}
 			close(fd);
-			goto err_unlock;
 		}
-		close(fd);
 	} else {
 		BUG_ON(pid != INIT_PID);
 	}
 
-	/*
-	 * Some kernel modules, such as network packet generator
-	 * run kernel thread upon net-namespace creattion taking
-	 * the @pid we've been requeting via LAST_PID_PATH interface
-	 * so that we can't restore a take with pid needed.
-	 *
-	 * Here is an idea -- unhare net namespace in callee instead.
-	 */
-	/*
-	 * The cgroup namespace is also unshared explicitly in the
-	 * move_in_cgroup(), so drop this flag here as well.
-	 */
-	close_pid_proc();
-	ret = clone_noasan(restore_task_with_children,
-			(ca.clone_flags & ~(CLONE_NEWNET | CLONE_NEWCGROUP)) | SIGCHLD, &ca);
+	if (kdat.has_clone3_set_tid) {
+		ret = clone3_with_pid_noasan(restore_task_with_children,
+				&ca, (ca.clone_flags &
+					~(CLONE_NEWNET | CLONE_NEWCGROUP)),
+				SIGCHLD, pid);
+	} else {
+		/*
+		 * Some kernel modules, such as network packet generator
+		 * run kernel thread upon net-namespace creation taking
+		 * the @pid we've been requesting via LAST_PID_PATH interface
+		 * so that we can't restore a take with pid needed.
+		 *
+		 * Here is an idea -- unshare net namespace in callee instead.
+		 */
+		/*
+		 * The cgroup namespace is also unshared explicitly in the
+		 * move_in_cgroup(), so drop this flag here as well.
+		 */
+		close_pid_proc();
+		ret = clone_noasan(restore_task_with_children,
+				(ca.clone_flags &
+				 ~(CLONE_NEWNET | CLONE_NEWCGROUP)) | SIGCHLD,
+				&ca);
+	}
+
 	if (ret < 0) {
 		pr_perror("Can't fork for %d", pid);
 		goto err_unlock;
@@ -3588,6 +3603,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	task_args->vdso_maps_rt = vdso_maps_rt;
 	task_args->vdso_rt_size = vdso_rt_size;
 	task_args->can_map_vdso = kdat.can_map_vdso;
+	task_args->has_clone3_set_tid = kdat.has_clone3_set_tid;
 
 	new_sp = restorer_stack(task_args->t->mz);
 
diff --git a/criu/include/clone-noasan.h b/criu/include/clone-noasan.h
index 8ef75fa73..0cfdaa1d9 100644
--- a/criu/include/clone-noasan.h
+++ b/criu/include/clone-noasan.h
@@ -2,5 +2,7 @@
 #define __CR_CLONE_NOASAN_H__
 
 int clone_noasan(int (*fn)(void *), int flags, void *arg);
+int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags,
+			   int exit_signal, pid_t pid);
 
 #endif /* __CR_CLONE_NOASAN_H__ */
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index b93807f5f..dfb4e6b71 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -221,6 +221,7 @@ struct task_restore_args {
 #endif
 	int				lsm_type;
 	int				child_subreaper;
+	bool				has_clone3_set_tid;
 } __aligned(64);
 
 /*
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 07c634f4a..3283849e4 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -4,6 +4,7 @@
 #include "common/lock.h"
 #include "common/list.h"
 #include "vma.h"
+#include "kerndat.h"
 
 struct task_entries {
 	int nr_threads, nr_tasks, nr_helpers;
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 888eb8e65..7012b88a1 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -35,6 +35,7 @@
 #include "sk-inet.h"
 #include "vma.h"
 #include "uffd.h"
+#include "sched.h"
 
 #include "common/lock.h"
 #include "common/page.h"
@@ -1771,16 +1772,19 @@ long __export_restore_task(struct task_restore_args *args)
 		long clone_flags = CLONE_VM | CLONE_FILES | CLONE_SIGHAND	|
 				   CLONE_THREAD | CLONE_SYSVSEM | CLONE_FS;
 		long last_pid_len;
+		pid_t thread_pid;
 		long parent_tid;
 		int i, fd = -1;
 
-		/* One level pid ns hierarhy */
-		fd = sys_openat(args->proc_fd, LAST_PID_PATH, O_RDWR, 0);
-		if (fd < 0) {
-			pr_err("can't open last pid fd %d\n", fd);
-			goto core_restore_end;
-		}
+		if (!args->has_clone3_set_tid) {
+			/* One level pid ns hierarhy */
+			fd = sys_openat(args->proc_fd, LAST_PID_PATH, O_RDWR, 0);
+			if (fd < 0) {
+				pr_err("can't open last pid fd %d\n", fd);
+				goto core_restore_end;
+			}
 
+		}
 		mutex_lock(&task_entries_local->last_pid_mutex);
 
 		for (i = 0; i < args->nr_threads; i++) {
@@ -1791,24 +1795,38 @@ long __export_restore_task(struct task_restore_args *args)
 				continue;
 
 			new_sp = restorer_stack(thread_args[i].mz);
-			last_pid_len = std_vprint_num(last_pid_buf, sizeof(last_pid_buf), thread_args[i].pid - 1, &s);
-			sys_lseek(fd, 0, SEEK_SET);
-			ret = sys_write(fd, s, last_pid_len);
-			if (ret < 0) {
-				pr_err("Can't set last_pid %ld/%s\n", ret, last_pid_buf);
-				sys_close(fd);
-				mutex_unlock(&task_entries_local->last_pid_mutex);
-				goto core_restore_end;
+			if (args->has_clone3_set_tid) {
+				struct _clone_args c_args = {};
+				thread_pid = thread_args[i].pid;
+				c_args.set_tid = ptr_to_u64(&thread_pid);
+				c_args.flags = clone_flags;
+				c_args.set_tid_size = 1;
+				/* The kernel does stack + stack_size. */
+				c_args.stack = new_sp - RESTORE_STACK_SIZE;
+				c_args.stack_size = RESTORE_STACK_SIZE;
+				c_args.child_tid = ptr_to_u64(&thread_args[i].pid);
+				c_args.parent_tid = ptr_to_u64(&parent_tid);
+				pr_debug("Using clone3 to restore the process\n");
+				RUN_CLONE3_RESTORE_FN(ret, c_args, sizeof(c_args), &thread_args[i], args->clone_restore_fn);
+			} else {
+				last_pid_len = std_vprint_num(last_pid_buf, sizeof(last_pid_buf), thread_args[i].pid - 1, &s);
+				sys_lseek(fd, 0, SEEK_SET);
+				ret = sys_write(fd, s, last_pid_len);
+				if (ret < 0) {
+					pr_err("Can't set last_pid %ld/%s\n", ret, last_pid_buf);
+					sys_close(fd);
+					mutex_unlock(&task_entries_local->last_pid_mutex);
+					goto core_restore_end;
+				}
+
+				/*
+				 * To achieve functionality like libc's clone()
+				 * we need a pure assembly here, because clone()'ed
+				 * thread will run with own stack and we must not
+				 * have any additional instructions... oh, dear...
+				 */
+				RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, thread_args, args->clone_restore_fn);
 			}
-
-			/*
-			 * To achieve functionality like libc's clone()
-			 * we need a pure assembly here, because clone()'ed
-			 * thread will run with own stack and we must not
-			 * have any additional instructions... oh, dear...
-			 */
-
-			RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, thread_args, args->clone_restore_fn);
 			if (ret != thread_args[i].pid) {
 				pr_err("Unable to create a thread: %ld\n", ret);
 				mutex_unlock(&task_entries_local->last_pid_mutex);

From 4c4f67a56be60300e734d92411e16e26928d3776 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 15 Jan 2020 14:27:09 +0100
Subject: [PATCH 0124/1854] s390x: remove stack pointer from clobber list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Just like on all other supported architectures gcc complains about the
stack pointer register being part of the clobber list:

error: listing the stack pointer register ‘15’ in a clobber list is deprecated [-Werror=deprecated]

This removes the stack pointer from the clobber list.

'zdtm.py run -a' still runs without any errors after this change.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/arch/s390/src/lib/include/uapi/asm/sigframe.h | 2 +-
 criu/arch/s390/include/asm/restore.h                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h b/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
index b6b894473..c599ef3ab 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
@@ -66,7 +66,7 @@ struct rt_sigframe {
 		"svc	0\n"					\
 		:						\
 		: "d" (new_sp)					\
-		: "15", "memory")
+		: "memory")
 
 #define RT_SIGFRAME_UC(rt_sigframe) (&rt_sigframe->uc)
 #define RT_SIGFRAME_REGIP(rt_sigframe) (rt_sigframe)->uc.uc_mcontext.regs.psw.addr
diff --git a/criu/arch/s390/include/asm/restore.h b/criu/arch/s390/include/asm/restore.h
index 6463d8e62..b77e36c77 100644
--- a/criu/arch/s390/include/asm/restore.h
+++ b/criu/arch/s390/include/asm/restore.h
@@ -18,7 +18,7 @@
 		: "d" (new_sp),						\
 		  "d"((unsigned long)restore_task_exec_start),		\
 		  "d" (task_args)					\
-		: "2", "14", "15", "memory")
+		: "2", "14", "memory")
 
 /* There is nothing to do since TLS is accessed through %a01 */
 #define core_get_tls(pcore, ptls)

From cbadd201cbd20b7e44b9f8edea932a9420f67230 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 16 Jan 2020 16:41:40 +0100
Subject: [PATCH 0125/1854] s390x: use clone3() if possible

This adds the parasite clone3() with set_tid wrapper for s390x.

In contrast to the x86_64 implementation the thread start address and
arguments are not put on the thread stack but passed via r4 and r5. As
those registers are caller-saved they still contain the correct value
(thread start address and arguments) after returning from the syscall.

Tested on 5.5.0-rc6.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/s390/include/asm/restorer.h | 40 +++++++++++++++++++++++----
 criu/kerndat.c                        |  4 +--
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/criu/arch/s390/include/asm/restorer.h b/criu/arch/s390/include/asm/restorer.h
index 733f2de33..2fc266535 100644
--- a/criu/arch/s390/include/asm/restorer.h
+++ b/criu/arch/s390/include/asm/restorer.h
@@ -40,11 +40,41 @@
 	: "0", "1", "2", "3", "4", "5", "6", "cc", "memory")
 
 #define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
-			      clone_restore_fn)	do { \
-	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
-	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
-	ret = -1; \
-} while (0)
+			      clone_restore_fn)				\
+	asm volatile(							\
+	/*
+	 * clone3 only needs two arguments (r2, r3), this means
+	 * we can use r4 and r5 for args and thread function.
+	 * r4 and r5 are callee-saved and are not overwritten.
+	 * No need to put these values on the child stack.
+	 */								\
+	"lgr	%%r4,%4\n"	/* Save args in %r4 */			\
+	"lgr	%%r5,%3\n"	/* Save clone_restore_fn in %r5 */	\
+	"lgr	%%r2,%1\n"	/* Parameter 1: clone_args */		\
+	"lgr	%%r3,%2\n"	/* Parameter 2: size */			\
+	/*
+	 * On s390x a syscall is done sc <syscall number>.
+	 * That only works for syscalls < 255. clone3 is 435,
+	 * therefore it is necessary to load the syscall number
+	 * into r1 and do 'svc 0'.
+	 */								\
+	"lghi	%%r1,"__stringify(__NR_clone3)"\n"			\
+	"svc	0\n"							\
+	"ltgr	%0,%%r2\n"	/* Set and check "ret" */		\
+	"jnz	0f\n"		/* ret != 0: Continue caller */		\
+	"lgr	%%r2,%%r4\n"	/* Thread arguments taken from r4. */	\
+	"lgr	%%r1,%%r5\n"	/* Thread function taken from r5. */	\
+	"aghi	%%r15,-160\n"	/* Prepare stack frame */		\
+	"xc	0(8,%%r15),0(%%r15)\n"					\
+	"basr	%%r14,%%r1\n"	/* Jump to clone_restore_fn() */	\
+	"j	.+2\n"		/* BUG(): Force PGM check */		\
+"0:\n"				/* Continue caller */			\
+	: "=d"(ret)							\
+	: "a"(&clone_args),						\
+	  "d"(size),							\
+	  "d"(clone_restore_fn),					\
+	  "d"(args)							\
+	: "0", "1", "2", "3", "4", "5", "cc", "memory")
 
 #define arch_map_vdso(map, compat)		-1
 
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 0772828bc..2261cca60 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -992,10 +992,10 @@ static bool kerndat_has_clone3_set_tid(void)
 	pid_t pid;
 	struct _clone_args args = {};
 
-#ifndef CONFIG_X86_64
+#if !defined(CONFIG_X86_64) && !defined(CONFIG_S390)
 	/*
 	 * Currently the CRIU PIE assembler clone3() wrapper is
-	 * only implemented for X86_64.
+	 * only implemented for X86_64 and S390X.
 	 */
 	kdat.has_clone3_set_tid = false;
 	return 0;

From 55c8ec62a53e2728b09ee93d36fd6dd36eeb0c49 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 21 Jan 2020 14:20:05 +0100
Subject: [PATCH 0126/1854] arm: remove stack pointer from clobber list

Just like on all other supported architectures gcc complains about the
stack pointer register being part of the clobber list. This removes the
stack pointer from the clobber list.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/arm/include/asm/restore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/arch/arm/include/asm/restore.h b/criu/arch/arm/include/asm/restore.h
index 4c64d58ef..c3b64c5b7 100644
--- a/criu/arch/arm/include/asm/restore.h
+++ b/criu/arch/arm/include/asm/restore.h
@@ -16,7 +16,7 @@
 		     : "r"(new_sp),					\
 		       "r"(restore_task_exec_start),			\
 		       "r"(task_args)					\
-		     : "sp", "r0", "r1", "memory")
+		     : "r0", "r1", "memory")
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {

From f6469493dd739d4c16c8230524fa5d5a88731b80 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 17 Jan 2020 13:35:48 +0100
Subject: [PATCH 0127/1854] ppc64le: use clone3() if possible

This adds the parasite clone3() with set_tid wrapper for ppc64le.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/ppc64/include/asm/restorer.h | 46 ++++++++++++++++++++++----
 criu/kerndat.c                         |  4 +--
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index 19bc3ea36..c447eefea 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/criu/arch/ppc64/include/asm/restorer.h
@@ -48,12 +48,46 @@
 		  "r"(&thread_args[i])		/* %6 */		\
 		: "memory","0","3","4","5","6","7","14","15")
 
-#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
-			      clone_restore_fn)	do { \
-	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
-	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
-	ret = -1; \
-} while (0)
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args,		\
+			      clone_restore_fn)				\
+/*
+ * The clone3() function accepts following parameters:
+ *   int clone3(struct clone_args *args, size_t size)
+ *
+ * Always consult the CLONE3 wrappers for other architectures
+ * for additional details.
+ *
+ * For PPC64LE the first parameter (clone_args) is passed in r3 and
+ * the second parameter (size) is passed in r4.
+ *
+ * This clone3() wrapper is based on the clone() wrapper from above.
+ */									\
+	asm volatile(							\
+		"clone3_emul:					\n"	\
+		"/* Save fn, args across syscall. */		\n"	\
+		"mr	14, %3	/* clone_restore_fn in r14 */	\n"	\
+		"mr	15, %4	/* &thread_args[i] in r15 */	\n"	\
+		"mr	3, %1	/* clone_args */		\n"	\
+		"mr	4, %2	/* size */			\n"	\
+		"li	0,"__stringify(__NR_clone3)"		\n"	\
+		"sc						\n"	\
+		"/* Check for child process. */			\n"	\
+		"cmpdi	cr1,3,0					\n"	\
+		"crandc	cr1*4+eq,cr1*4+eq,cr0*4+so		\n"	\
+		"bne-	cr1,clone3_end				\n"	\
+		"/* child */					\n"	\
+		"addi	14, 14, 8 /* jump over r2 fixup */	\n"	\
+		"mtctr	14					\n"	\
+		"mr	3,15					\n"	\
+		"bctr						\n"	\
+		"clone3_end:					\n"	\
+		"mr	%0,3					\n"	\
+		: "=r"(ret)			/* %0 */		\
+		: "r"(&clone_args),		/* %1 */		\
+		  "r"(size),			/* %2 */		\
+		  "r"(clone_restore_fn),	/* %3 */		\
+		  "r"(args)			/* %4 */		\
+		: "memory","0","3","4","5","14","15")
 
 #define arch_map_vdso(map, compat)		-1
 
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 2261cca60..c1fc9259b 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -992,10 +992,10 @@ static bool kerndat_has_clone3_set_tid(void)
 	pid_t pid;
 	struct _clone_args args = {};
 
-#if !defined(CONFIG_X86_64) && !defined(CONFIG_S390)
+#if !defined(CONFIG_X86_64) && !defined(CONFIG_S390) && !defined(CONFIG_PPC64)
 	/*
 	 * Currently the CRIU PIE assembler clone3() wrapper is
-	 * only implemented for X86_64 and S390X.
+	 * only implemented for X86_64, S390X and PPC64LE.
 	 */
 	kdat.has_clone3_set_tid = false;
 	return 0;

From 3dabd38a8292872dcf4c5710449a4c8017304ac2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 25 Jan 2020 13:25:21 +0100
Subject: [PATCH 0128/1854] clone3: handle clone3() with CLONE_PARENT

clone3() explicitly blocks setting an exit_signal if CLONE_PARENT is
specified. With clone() it also did not work, but there was no error
message. The exit signal from the thread group leader is taken.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/clone-noasan.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/criu/clone-noasan.c b/criu/clone-noasan.c
index bcbc3e4bd..a2190ba0a 100644
--- a/criu/clone-noasan.c
+++ b/criu/clone-noasan.c
@@ -61,7 +61,19 @@ int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags,
 
 	pr_debug("Creating process using clone3()\n");
 
-	c_args.exit_signal = exit_signal;
+	/*
+	 * clone3() explicitly blocks setting an exit_signal
+	 * if CLONE_PARENT is specified. With clone() it also
+	 * did not work, but there was no error message. The
+	 * exit signal from the thread group leader is taken.
+	 */
+	if (!(flags & CLONE_PARENT)) {
+		if (exit_signal != SIGCHLD) {
+			pr_err("Exit signal not SIGCHLD\n");
+			return -1;
+		}
+		c_args.exit_signal = exit_signal;
+	}
 	c_args.flags = flags;
 	c_args.set_tid = ptr_to_u64(&pid);
 	c_args.set_tid_size = 1;

From f991f235064807a59ad8e4f98e82f34767b05e18 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 19 Jan 2020 21:42:58 +0100
Subject: [PATCH 0129/1854] aarch64: use clone3() if possible

This adds the parasite clone3() with set_tid wrapper for aarch64.

Tested on Fedora 31 with 5.5.0-rc6.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/aarch64/include/asm/restorer.h | 67 +++++++++++++++++++++---
 criu/kerndat.c                           |  4 +-
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index 2fe58915b..120fa8fb2 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -42,12 +42,67 @@
 			  "r"(&thread_args[i])					\
 			: "x0", "x1", "x2", "x3", "x8", "memory")
 
-#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
-			      clone_restore_fn)	do { \
-	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
-	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
-	ret = -1; \
-} while (0)
+/*
+ * Based on sysdeps/unix/sysv/linux/aarch64/clone.S
+ *
+ * int clone(int (*fn)(void *arg),            x0
+ *	     void *child_stack,               x1
+ *	     int flags,                       x2
+ *	     void *arg,                       x3
+ *	     pid_t *ptid,                     x4
+ *	     struct user_desc *tls,           x5
+ *	     pid_t *ctid);                    x6
+ *
+ * int clone3(struct clone_args *args,        x0
+ *	      size_t size);                   x1
+ *
+ * Always consult the CLONE3 wrappers for other architectures
+ * for additional details.
+ *
+ */
+
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args,			\
+			      clone_restore_fn)					\
+	asm volatile(								\
+	/* In contrast to the clone() wrapper above this does not put
+	 * the thread function and its arguments on the child stack,
+	 * but uses registers to pass these parameters to the child process.
+	 * Based on the glibc clone() wrapper at
+	 * sysdeps/unix/sysv/linux/aarch64/clone.S.
+	 */									\
+			"clone3_emul:					\n"	\
+	/*
+	 * Based on the glibc clone() wrapper, which uses x10 and x11
+	 * to save the arguments for the child process, this does the same.
+	 * x10 for the thread function and x11 for the thread arguments.
+	 */									\
+			"mov x10, %3	/* clone_restore_fn */		\n"	\
+			"mov x11, %4	/* args */			\n"	\
+			"mov x0, %1	/* &clone_args */		\n"	\
+			"mov x1, %2	/* size */			\n"	\
+	/* Load syscall number */						\
+			"mov x8, #"__stringify(__NR_clone3)"		\n"	\
+	/* Do the syscall */							\
+			"svc #0						\n"	\
+										\
+			"cbz x0, clone3_thread_run			\n"	\
+										\
+			"mov %0, x0					\n"	\
+			"b   clone3_end					\n"	\
+										\
+			"clone3_thread_run:				\n"	\
+	/* Move args to x0 */							\
+			"mov x0, x11					\n"	\
+	/* Jump to clone_restore_fn */						\
+			"br  x10					\n"	\
+										\
+			"clone3_end:					\n"	\
+			: "=r"(ret)						\
+			: "r"(&clone_args),					\
+			  "r"(size),						\
+			  "r"(clone_restore_fn),				\
+			  "r"(args)						\
+			: "x0", "x1", "x8", "x10", "x11", "memory")
 
 #define ARCH_FAIL_CORE_RESTORE					\
 	asm volatile(						\
diff --git a/criu/kerndat.c b/criu/kerndat.c
index c1fc9259b..4070e01d2 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -992,10 +992,10 @@ static bool kerndat_has_clone3_set_tid(void)
 	pid_t pid;
 	struct _clone_args args = {};
 
-#if !defined(CONFIG_X86_64) && !defined(CONFIG_S390) && !defined(CONFIG_PPC64)
+#if !defined(CONFIG_X86_64) && !defined(CONFIG_S390) && !defined(CONFIG_PPC64) && !defined(CONFIG_AARCH64)
 	/*
 	 * Currently the CRIU PIE assembler clone3() wrapper is
-	 * only implemented for X86_64, S390X and PPC64LE.
+	 * only implemented for X86_64, S390X, AARCH64 and PPC64LE.
 	 */
 	kdat.has_clone3_set_tid = false;
 	return 0;

From 0e291d26c9e0258f60ae8921f0e03c89f332dc31 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 22 Jan 2020 19:41:41 +0100
Subject: [PATCH 0130/1854] arm: use clone3() if it exists

This is the last architecture specific change to make CRIU use clone3()
with set_tid if available. Just as on all other architectures this adds
a clone3() based assembler wrapper to be used in the restorer code.

Tested on Fedora 31 with the same 5.5.0-rc6 kernel as on the other
architectures.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/arm/include/asm/restorer.h | 62 +++++++++++++++++++++++++---
 criu/kerndat.c                       |  9 ----
 2 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/criu/arch/arm/include/asm/restorer.h b/criu/arch/arm/include/asm/restorer.h
index ad4b58f93..13ed15b26 100644
--- a/criu/arch/arm/include/asm/restorer.h
+++ b/criu/arch/arm/include/asm/restorer.h
@@ -43,12 +43,62 @@
 		       "r"(&thread_args[i])				\
 		     : "r0", "r1", "r2", "r3", "r7", "memory")
 
-#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
-			      clone_restore_fn)	do { \
-	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
-	pr_err("Not creating a process with PID: %d\n", ((pid_t *)u64_to_ptr(clone_args.set_tid))[0]); \
-	ret = -1; \
-} while (0)
+
+/*
+ * The clone3() assembler wrapper is based on the clone() wrapper above
+ * and on code from the glibc wrapper at
+ * sysdeps/unix/sysv/linux/arm/clone.S
+ *
+ * For arm it is necessary to change the child stack as on x86_64 as
+ * it seems there are not registers which stay the same over a syscall
+ * like on s390x, ppc64le and aarch64.
+ *
+ * Changing the child stack means that this code has to deal with the
+ * kernel doing stack + stack_size implicitly.
+ *
+ * int clone3(struct clone_args *args, size_t size)
+ */
+
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args,		\
+			      clone_restore_fn)				\
+	asm volatile(							\
+		"clone3_emul:					\n"	\
+	/* Load thread stack pointer */					\
+		"ldr r1, [%3]					\n"	\
+	/* Load thread stack size */					\
+		"mov r2, %4					\n"	\
+	/* Goto to the end of stack */					\
+		"add r1, r1, r2					\n"	\
+	/* Load thread function and arguments and push on stack */	\
+		"mov r2, %6		/* args */		\n"	\
+		"str r2, [r1, #4]	/* args */		\n"	\
+		"mov r2, %5		/* function */		\n"	\
+		"str r2, [r1]		/* function */		\n"	\
+		"mov r0, %1		/* clone_args */	\n"	\
+		"mov r1, %2		/* size */		\n"	\
+		"mov r7, #"__stringify(__NR_clone3)"		\n"	\
+		"svc #0						\n"	\
+									\
+		"cmp r0, #0					\n"	\
+		"beq thread3_run				\n"	\
+									\
+		"mov %0, r0					\n"	\
+		"b   clone3_end					\n"	\
+									\
+		"thread3_run:					\n"	\
+		"pop { r1 }					\n"	\
+		"pop { r0 }					\n"	\
+		"bx  r1						\n"	\
+									\
+		"clone3_end:					\n"	\
+			: "=r"(ret)					\
+			: "r"(&clone_args),				\
+			  "r"(size),					\
+			  "r"(&clone_args.stack),			\
+			  "r"(clone_args.stack_size),			\
+			  "r"(clone_restore_fn),			\
+			  "r"(args)					\
+			: "r0", "r1", "r2", "r7", "memory")
 
 #define ARCH_FAIL_CORE_RESTORE					\
 	asm volatile(						\
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 4070e01d2..e0b5731d5 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -992,15 +992,6 @@ static bool kerndat_has_clone3_set_tid(void)
 	pid_t pid;
 	struct _clone_args args = {};
 
-#if !defined(CONFIG_X86_64) && !defined(CONFIG_S390) && !defined(CONFIG_PPC64) && !defined(CONFIG_AARCH64)
-	/*
-	 * Currently the CRIU PIE assembler clone3() wrapper is
-	 * only implemented for X86_64, S390X, AARCH64 and PPC64LE.
-	 */
-	kdat.has_clone3_set_tid = false;
-	return 0;
-#endif
-
 	args.set_tid = -1;
 	/*
 	 * On a system without clone3() this will return ENOSYS.

From f6de8d4ea9a2d0ce8f9d3373ab04a3c080348a86 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2020 14:43:59 +0000
Subject: [PATCH 0131/1854] travis: fix warning and errors from validation

This fixes the validation errors from Travis:

 Build config validation
 root: deprecated key sudo (The key `sudo` has no effect anymore.)
 root: missing os, using the default linux
 root: key matrix is an alias for jobs, using jobs

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 25dd6a29b..7c36af006 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: c
-sudo: required
+os: linux
 dist: bionic
 cache: ccache
 services:
@@ -12,7 +12,7 @@ env:
   - TR_ARCH=x86_64
   - TR_ARCH=x86_64      CLANG=1
   - TR_ARCH=openj9-test
-matrix:
+jobs:
   include:
     - os: linux
       arch: ppc64le

From c98af78c58e2168d2322cd0ee15837468fd4ffb0 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 14 Jan 2020 12:04:40 +0300
Subject: [PATCH 0132/1854] compel: add -ffreestanding to force gcc not to use
 builtin memcpy, memset

This patch fixes the problem with SSE (xmm) registers corruption on amd64
architecture. The problem was that gcc generates parasite blob that uses
xmm registers, but we don't preserve this registers in CRIU when injecting
parasite. Also, gcc, even with -nostdlib option uses builtin memcpy,
memset functions that optimized for amd64 and involves SSE registers.

It seems, that optimal solution is to use -ffreestanding gcc option
to compile parasite. This option implies -fno-builtin and also it designed
for OS kernels compilation/another code that suited to work on non-hosted
environments and could prevent future sumilar bugs.

To check that you amd64 CRIU build affected by this problem you could simply
objdump -dS criu/pie/parasite.o | grep xmm
Output should be empty.

Reported-by: Diyu Zhou <zhoudiyupku at gmail.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Alexander Mikhalitsyn <alexander@mihalicyn.com>
---
 compel/src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compel/src/main.c b/compel/src/main.c
index 51bac099f..8b2c8bc8d 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -21,7 +21,7 @@
 
 #define CFLAGS_DEFAULT_SET					\
 	"-Wstrict-prototypes "					\
-	"-fno-stack-protector -nostdlib -fomit-frame-pointer "
+	"-fno-stack-protector -nostdlib -fomit-frame-pointer -ffreestanding "
 
 #define COMPEL_CFLAGS_PIE	CFLAGS_DEFAULT_SET "-fpie"
 #define COMPEL_CFLAGS_NOPIC	CFLAGS_DEFAULT_SET "-fno-pic"

From 8477875dc29e82485318b1c0f8482735755d5265 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 30 Jan 2020 15:21:54 -0800
Subject: [PATCH 0133/1854] doc/Makefile: don't hide xmlto stderr

In case asciidoc is installed and xmlto is not, make returns an error
but there's no diagnostics shown, since "xmlto: command not found"
goes to /dev/null.

Remove the redirect.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Documentation/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index cbc7ff2c8..5025e2b99 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -54,7 +54,7 @@ ifneq ($(USE_ASCIIDOCTOR),)
 	$(Q) $(ASCIIDOC) -b manpage -d manpage -o $@ $<
 else
 	$(Q) $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.1,%.xml,$@) $<
-	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.1,%.xml,$@) 2>/dev/null
+	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.1,%.xml,$@)
 endif
 
 %.8: %.txt $(FOOTER) custom.xsl
@@ -63,7 +63,7 @@ ifneq ($(USE_ASCIIDOCTOR),)
 	$(Q) $(ASCIIDOC) -b manpage -d manpage -o $@ $<
 else
 	$(Q) $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.8,%.xml,$@) $<
-	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.8,%.xml,$@) 2>/dev/null
+	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.8,%.xml,$@)
 endif
 
 %.ps: %.1

From a15426a111eb50e2339607225b0ab0d1dc49e0ed Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 30 Jan 2020 15:27:07 -0800
Subject: [PATCH 0134/1854] criu(8): some minor rewording

1. Add a/the articles where I see them missing

2. s/Forbid/disable/

3. s/crit/crit(1)/ as we're referring to a man page

4. Simplify some descriptions

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Documentation/criu.txt | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 133a094c0..64b33ce6d 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -24,8 +24,8 @@ on a different system, or both.
 OPTIONS
 -------
 
-Most of the true / false long options (the ones without arguments) can be
-prefixed with *--no-* to negate the option (example: *--display-stats*
+Most of the long flags can be
+prefixed with *no-* to negate the option (example: *--display-stats*
 and *--no-display-stats*).
 
 Common options
@@ -33,9 +33,8 @@ Common options
 Common options are applicable to any 'command'.
 
 *-v*[*v*...], *--verbosity*::
-    Increase verbosity up from the default level. Multiple *v* can be used,
-    each increasing verbosity by one level. Using long option without argument
-    increases verbosity by one level.
+    Increase verbosity up from the default level. In case of short option,
+    multiple *v* can be used, each increasing verbosity by one.
 
 *-v*'num', *--verbosity*='num'::
     Set verbosity level to 'num'. The higher the level, the more output
@@ -57,22 +56,22 @@ The following levels are available:
     Pass a specific configuration file to criu.
 
 *--no-default-config*::
-    Forbid parsing of default configuration files.
+    Disable parsing of default configuration files.
 
 *--pidfile* 'file'::
     Write root task, service or page-server pid into a 'file'.
 
 *-o*, *--log-file* 'file'::
-    Write logging messages to 'file'.
+    Write logging messages to a 'file'.
 
 *--display-stats*::
-    During dump as well as during restore *criu* collects information
-    like the time required to dump or restore the process or the
+    During dump, as well as during restore, *criu* collects some statistics,
+    like the time required to dump or restore the process, or the
     number of pages dumped or restored. This information is always
-    written to the files 'stats-dump' and 'stats-restore' and can
-    be easily displayed using *crit*. The option *--display-stats*
-    additionally prints out this information on the console at the end
-    of a dump or a restore.
+    saved to the *stats-dump* and *stats-restore* files, and can
+    be shown using *crit*(1). The option *--display-stats*
+    prints out this information on the console at the end
+    of a dump or restore operation.
 
 *-D*, *--images-dir* 'path'::
     Use 'path' as a base directory where to look for sets of image files.

From 23374b779898470016b2a0e95af56b0766aa6b3e Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 30 Jan 2020 15:30:57 -0800
Subject: [PATCH 0135/1854] criu(8): fix for asciidoctor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 0493724c8eda3 added support for using asciidoctor
(instead of asciidoc + xmlto) to generate man pages.

For some reason, asciidoctor does not deal well with some
complex formatting that we use for options such as --external,
leading to literal ’ and ' appearing in the man page instead
of italic formatting. For example:

> --inherit-fd fd[’N']:’resource'

(here both N and resource should be in italic).

Asciidoctor documentation (asciidoctor --help syntax) tells:

> == Text Formatting
>
> .Constrained (applied at word boundaries)
> *strong importance* (aka bold)
> _stress emphasis_ (aka italic)
> `monospaced` (aka typewriter text)
> "`double`" and '`single`' typographic quotes
> +passthrough text+ (substitutions disabled)
> `+literal text+` (monospaced with substitutions disabled)
>
> .Unconstrained (applied anywhere)
> **C**reate+**R**ead+**U**pdate+**D**elete
> fan__freakin__tastic
> ``mono``culture

so I had to carefully replace *bold* with **bold** and
'italic' with __italic__ to make it all work.

Tested with both terminal and postscript output, with both
asciidoctor and asciidoc+xmlto.

TODO: figure out how to fix examples (literal multi-line text),
since asciidoctor does not display it in monospaced font (this
is only true for postscript/pdf output so low priority).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Documentation/criu.txt | 51 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 64b33ce6d..a6b9f7fae 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -36,8 +36,8 @@ Common options are applicable to any 'command'.
     Increase verbosity up from the default level. In case of short option,
     multiple *v* can be used, each increasing verbosity by one.
 
-*-v*'num', *--verbosity*='num'::
-    Set verbosity level to 'num'. The higher the level, the more output
+**-v**__num__, **--verbosity=**__num__::
+    Set verbosity level to _num_. The higher the level, the more output
     is produced.
     +
 The following levels are available:
@@ -184,7 +184,7 @@ In other words, do not use it unless really needed.
 *-s*, *--leave-stopped*::
     Leave tasks in stopped state after checkpoint, instead of killing.
 
-*--external* 'type'*[*'id'*]:*'value'::
+*--external* __type__**[**__id__**]:**__value__::
     Dump an instance of an external resource. The generic syntax is
     'type' of resource, followed by resource 'id' (enclosed in literal
     square brackets), and optional 'value' (prepended by a literal colon).
@@ -193,35 +193,36 @@ In other words, do not use it unless really needed.
     Note to restore external resources, either *--external* or *--inherit-fd*
     is used, depending on resource type.
 
-*--external mnt[*'mountpoint'*]:*'name'::
+*--external* **mnt[**__mountpoint__**]:**__name__::
     Dump an external bind mount referenced by 'mountpoint', saving it
     to image under the identifier 'name'.
 
-*--external mnt[]:*'flags'::
+*--external* **mnt[]:**__flags__::
     Dump all external bind mounts, autodetecting those. Optional 'flags'
     can contain *m* to also dump external master mounts, *s* to also
     dump external shared mounts (default behavior is to abort dumping
     if such mounts are found). If 'flags' are not provided, colon
     is optional.
 
-*--external dev[*'major'*/*'minor'*]:*'name'::
+*--external* **dev[**__major__**/**__minor__**]:**__name__::
     Allow to dump a mount namespace having a real block device mounted.
     A block device is identified by its 'major' and 'minor' numbers,
     and *criu* saves its information to image under the identifier 'name'.
 
-*--external file[*'mnt_id'*:*'inode'*]*::
+*--external* **file[**__mnt_id__**:**__inode__**]**::
     Dump an external file, i.e. an opened file that is can not be resolved
     from the current mount namespace, which can not be dumped without using
     this option. The file is identified by 'mnt_id' (a field obtained from
-    */proc/*'pid'*/fdinfo/*'N') and 'inode' (as returned by *stat*(2)).
+    **/proc/**__pid__**/fdinfo/**__N__) and 'inode' (as returned by
+    *stat*(2)).
 
-*--external tty[*'rdev'*:*'dev'*]*::
+*--external* **tty[**__rdev__**:**__dev__**]**::
     Dump an external TTY, identified by *st_rdev* and *st_dev* fields
     returned by *stat*(2).
 
-*--external unix[*'id'*]*::
+*--external* **unix[**__id__**]**::
     Tell *criu* that one end of a pair of UNIX sockets (created by
-    *socketpair*(2)) with 'id' is OK to be disconnected.
+    *socketpair*(2)) with the given _id_ is OK to be disconnected.
 
 *--freeze-cgroup*::
    Use cgroup freezer to collect processes.
@@ -379,7 +380,7 @@ By default the option is set to *fpu* and *ins*.
 ~~~~~~~~~
 Restores previously checkpointed processes.
 
-*--inherit-fd* *fd[*'N'*]:*'resource'::
+*--inherit-fd* **fd[**__N__**]:**__resource__::
     Inherit a file descriptor. This option lets *criu* use an already opened
     file descriptor 'N' for restoring a file identified by 'resource'.
     This option can be used to restore an external resource dumped
@@ -387,10 +388,10 @@ Restores previously checkpointed processes.
 +
 The 'resource' argument can be one of the following:
 +
-    - *tty[*'rdev'*:*'dev'*]*
-    - *pipe[*'inode'*]*
-    - *socket[*'inode'*]*
-    - *file[*'mnt_id'*:*'inode'*]*
+    - **tty[**__rdev__**:**__dev__**]**
+    - **pipe[**__inode__**]**
+    - **socket[**__inode__*]*
+    - **file[**__mnt_id__**:**__inode__**]**
     - 'path/to/file'
 
 +
@@ -416,7 +417,7 @@ usually need to be escaped from shell.
     This option is required to restore a mount namespace. The directory
     'path' must be a mount point and its parent must not be overmounted.
 
-*--external* 'type'*[*'id'*]:*'value'::
+*--external* __type__**[**__id__**]:**__value__::
     Restore an instance of an external resource. The generic syntax is
     'type' of resource, followed by resource 'id' (enclosed in literal
     square brackets), and optional 'value' (prepended by a literal colon).
@@ -426,7 +427,7 @@ usually need to be escaped from shell.
     the help of *--external* *file*, *tty*, and *unix* options), option
     *--inherit-fd* should be used.
 
-*--external mnt[*'name'*]:*'mountpoint'::
+*--external* **mnt[**__name__**]:**__mountpoint__::
     Restore an external bind mount referenced in the image by 'name',
     bind-mounting it from the host 'mountpoint' to a proper mount point.
 
@@ -434,17 +435,17 @@ usually need to be escaped from shell.
     Restore all external bind mounts (dumped with the help of
     *--external mnt[]* auto-detection).
 
-*--external dev[*'name'*]:*'/dev/path'::
+*--external* **dev[**__name__**]:**__/dev/path__::
     Restore an external mount device, identified in the image by 'name',
     using the existing block device '/dev/path'.
 
-*--external veth[*'inner_dev'*]:*'outer_dev'*@*'bridge'::
+*--external* **veth[**__inner_dev__**]:**__outer_dev__**@**__bridge__::
     Set the outer VETH device name (corresponding to 'inner_dev' being
-    restored) to 'outer_dev'. If optional *@*'bridge' is specified,
+    restored) to 'outer_dev'. If optional **@**_bridge_ is specified,
     'outer_dev' is added to that bridge. If the option is not used,
     'outer_dev' will be autogenerated by the kernel.
 
-*--external macvlan[*'inner_dev'*]:*'outer_dev'::
+*--external* **macvlan[**__inner_dev__**]:**__outer_dev__::
     When restoring an image that have a MacVLAN device in it, this option
     must be used to specify to which 'outer_dev' (an existing network device
     in CRIU namespace) the restored 'inner_dev' should be bound to.
@@ -489,14 +490,14 @@ The 'mode' may be one of the following:
 *--tcp-close*::
     Restore connected TCP sockets in closed state.
 
-*--veth-pair* 'IN'*=*'OUT'::
+*--veth-pair* __IN__**=**__OUT__::
     Correspondence between outside and inside names of veth devices.
 
 *-l*, *--file-locks*::
     Restore file locks from the image.
 
-*--lsm-profile* 'type'*:*'name'::
-    Specify an LSM profile to be used during restore. The `type` can be
+*--lsm-profile* __type__**:**__name__::
+    Specify an LSM profile to be used during restore. The _type_ can be
     either *apparmor* or *selinux*.
 
 *--auto-dedup*::

From 56258da17619883631d0d3c96ad583bc697f953e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sun, 2 Feb 2020 18:45:59 +0000
Subject: [PATCH 0136/1854] criu: fix build failure against gcc-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On gcc-10 (and gcc-9 -fno-common) build fails as:

```
ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159:
  multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here
make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1
```

gcc-10 will change the default from -fcommon to fno-common:
https://gcc.gnu.org/PR85678.

The error also happens if CFLAGS=-fno-common passed explicitly.

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/707942
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 criu/config.c             | 1 +
 criu/include/cr_options.h | 2 +-
 criu/include/pstree.h     | 2 +-
 criu/include/tun.h        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 73c62f5bb..b84b7da28 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -30,6 +30,7 @@
 #include "common/xmalloc.h"
 
 struct cr_options opts;
+char *rpc_cfg_file;
 
 static int count_elements(char **to_count)
 {
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index c5af33186..ba405182e 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -155,7 +155,7 @@ struct cr_options {
 };
 
 extern struct cr_options opts;
-char *rpc_cfg_file;
+extern char *rpc_cfg_file;
 
 extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
 extern int check_options(void);
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 7303c1fed..61ab0ce0e 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -42,7 +42,7 @@ enum {
 };
 #define FDS_EVENT (1 << FDS_EVENT_BIT)
 
-struct pstree_item *current;
+extern struct pstree_item *current;
 
 struct rst_info;
 /* See alloc_pstree_item() for details */
diff --git a/criu/include/tun.h b/criu/include/tun.h
index ce0b266a6..b82c445a7 100644
--- a/criu/include/tun.h
+++ b/criu/include/tun.h
@@ -5,7 +5,7 @@
 #define TUN_MINOR	200
 #endif
 
-struct ns_id *ns;
+extern struct ns_id *ns;
 
 #include <linux/netlink.h>
 

From f1714ccce714093170a2616474cfc7b33298c75e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 4 Feb 2020 23:12:22 -0800
Subject: [PATCH 0137/1854] test/vdso: check the code path when here is no API
 to map vDSO

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/crtools.c                 | 3 +++
 criu/include/fault-injection.h | 1 +
 test/jenkins/criu-fault.sh     | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/criu/crtools.c b/criu/crtools.c
index 9b6e94809..3cd40e87d 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -176,6 +176,9 @@ int main(int argc, char *argv[], char *envp[])
 	if (kerndat_init())
 		return 1;
 
+       if (fault_injected(FI_CANNOT_MAP_VDSO))
+               kdat.can_map_vdso = 0;
+
 	if (opts.deprecated_ok)
 		pr_debug("DEPRECATED ON\n");
 
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 852d27166..31fe16178 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -17,6 +17,7 @@ enum faults {
 	FI_NO_BREAKPOINTS = 130,
 	FI_PARTIAL_PAGES = 131,
 	FI_HUGE_ANON_SHMEM_ID = 132,
+	FI_CANNOT_MAP_VDSO = 133,
 	FI_MAX,
 };
 
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index ec6d26f89..4e3790e59 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -12,6 +12,10 @@ prep
 ./test/zdtm.py run -t zdtm/static/vdso01 --fault 127 || fail
 ./test/zdtm.py run -t zdtm/static/vdso-proxy --fault 127 --iters 3 || fail
 
+if [ "${COMPAT_TEST}" != "y" ] ; then
+	./test/zdtm.py run -t zdtm/static/vdso01 --fault 133 -f h || fail
+fi
+
 ./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 2 --keep-going --report report || fail
 ./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 4 --keep-going --report report || fail
 
@@ -23,3 +27,4 @@ prep
 ./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/static/maps01 --fault 132 -f h || fail
+

From 9bc9366c94d2c81f706d56d0227bf32a2425eef1 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 4 Feb 2020 23:13:43 -0800
Subject: [PATCH 0138/1854] vdso: use correct offsets to remap vdso and vvar
 mappings

In the current version, the offsets of remapping vvar and vdso regions
are mixed up.

If vdso is before vvar, vvar has to be mapped with the vdso_size offset.
if vvar is before vdso, vdso has to be mapped with the vvar_size offset.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/pie/parasite-vdso.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index 38da76680..3a1684d35 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -119,9 +119,9 @@ int vdso_do_park(struct vdso_maps *rt, unsigned long addr, unsigned long space)
 	BUG_ON((vdso_size + vvar_size) < space);
 
 	if (rt->sym.vdso_before_vvar)
-		return park_at(rt, addr, addr + vvar_size);
+		return park_at(rt, addr, addr + vdso_size);
 	else
-		return park_at(rt, addr + vdso_size, addr);
+		return park_at(rt, addr + vvar_size, addr);
 }
 
 #ifndef CONFIG_COMPAT

From 0f438ceeed27f3473a9ebda6c9e15d593ceeebde Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 5 Feb 2020 22:33:02 +0000
Subject: [PATCH 0139/1854] typo: fix missing space in error message

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/sk-unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index f43aa2124..048ff44ae 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1877,7 +1877,7 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 				!(opts.ext_unix_sk)) {
 			pr_err("External socket found in image. "
 					"Consider using the --" USK_EXT_PARAM
-					"option to allow restoring it.\n");
+					" option to allow restoring it.\n");
 			return -1;
 		}
 

From 72ff29070816e57b408f0bd6b8f71ff50c2e9cd4 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 6 Feb 2020 18:01:00 +0000
Subject: [PATCH 0140/1854] criu: Make use strlcpy() to copy into allocated
 strings

strncpy() with n == strlen(src) won't put NULL-terminator in dst.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/cr-restore.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index b4f8d9e75..c1dfc44f1 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -75,6 +75,7 @@
 #include "sk-queue.h"
 #include "sigframe.h"
 #include "fdstore.h"
+#include "string.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
@@ -3142,7 +3143,7 @@ rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 
 			args = rst_mem_remap_ptr(this_pos, RM_PRIVATE);
 			args->lsm_profile = lsm_profile;
-			strncpy(args->lsm_profile, rendered, lsm_profile_len);
+			strlcpy(args->lsm_profile, rendered, lsm_profile_len + 1);
 			xfree(rendered);
 		}
 	} else {
@@ -3176,7 +3177,7 @@ rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 
 			args = rst_mem_remap_ptr(this_pos, RM_PRIVATE);
 			args->lsm_sockcreate = lsm_sockcreate;
-			strncpy(args->lsm_sockcreate, rendered, lsm_sockcreate_len);
+			strlcpy(args->lsm_sockcreate, rendered, lsm_sockcreate_len + 1);
 			xfree(rendered);
 		}
 	} else {

From 99346a28247a3abeae094008fefa2edbc78fbb4d Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 24 Jan 2020 11:55:00 +0000
Subject: [PATCH 0141/1854] zdtm: Make test_{doc,author} weak variables

Allows to override them in every test, optionally.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 test/zdtm/lib/parseargs.c | 4 ++--
 test/zdtm/lib/zdtmtst.h   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/lib/parseargs.c b/test/zdtm/lib/parseargs.c
index 7e411f6b6..d8aa4ed63 100644
--- a/test/zdtm/lib/parseargs.c
+++ b/test/zdtm/lib/parseargs.c
@@ -113,8 +113,8 @@ static void helpexit(void)
 	exit(1);
 }
 
-const char *test_doc;
-const char *test_author;
+const char __attribute__((weak)) *test_doc;
+const char __attribute__((weak)) *test_author;
 
 static void prdoc(void)
 {
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index 1fbf795bf..2cd4bdd1d 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -155,6 +155,9 @@ struct zdtm_tcp_opts {
 	int flags;
 };
 
+extern const char *test_author;
+extern const char *test_doc;
+
 extern int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts);
 extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid,
 			       void *child_tid, unsigned long newtls);

From 0022c28468714a5329fd41ec12d744340b250cd4 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Tue, 21 Jan 2020 12:31:00 +0000
Subject: [PATCH 0142/1854] vdso: Add vdso_is_present() helper

Use it in kerndat to check if the kernel provides vDSO.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/include/util-vdso.h |  5 +++++
 criu/vdso.c              | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/criu/include/util-vdso.h b/criu/include/util-vdso.h
index 33b7411de..046cd96d7 100644
--- a/criu/include/util-vdso.h
+++ b/criu/include/util-vdso.h
@@ -41,6 +41,11 @@ struct vdso_maps {
 	bool			compatible;
 };
 
+static inline bool vdso_is_present(struct vdso_maps *m)
+{
+	return m->vdso_start != VDSO_BAD_ADDR;
+}
+
 #define VDSO_SYMBOL_INIT	{ .offset = VDSO_BAD_ADDR, }
 
 #define VDSO_SYMTABLE_INIT						\
diff --git a/criu/vdso.c b/criu/vdso.c
index 50b8b8dba..b8df2d7a6 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -611,6 +611,12 @@ int kerndat_vdso_fill_symtable(void)
 		return -1;
 	}
 
+	if (!vdso_is_present(&vdso_maps)) {
+		pr_debug("Kernel doesn't premap vDSO - probably CONFIG_VDSO is not set\n");
+		kdat.vdso_sym = vdso_maps.sym;
+		return 0;
+	}
+
 	if (vdso_fill_self_symtable(&vdso_maps)) {
 		pr_err("Failed to fill self vdso symtable\n");
 		return -1;
@@ -643,7 +649,7 @@ int kerndat_vdso_preserves_hint(void)
 
 	kdat.vdso_hint_reliable = 0;
 
-	if (vdso_maps.vdso_start == VDSO_BAD_ADDR)
+	if (!vdso_is_present(&vdso_maps))
 		return 0;
 
 	child = fork();
@@ -693,7 +699,7 @@ int kerndat_vdso_preserves_hint(void)
 		goto out_kill;
 	}
 
-	if (vdso_maps_after.vdso_start != VDSO_BAD_ADDR)
+	if (vdso_is_present(&vdso_maps_after))
 		kdat.vdso_hint_reliable = 1;
 
 	ret = 0;

From a96a7ed87fece0eeb397b9dd4901f680fbf2b4f6 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 22 Jan 2020 14:00:27 +0000
Subject: [PATCH 0143/1854] vdso: Repair !CONFIG_VDSO

Apparently, C/R is broken when CONFIG_VDSO is not set.
Probably, I've broken it while adding arm vdso support.
Or maybe some commits after.

Repair it by adding checks into vdso_init_dump(), vdso_init_restore().
Also, don't try handling vDSO in restorer if it wasn't present in
parent. And prevent summing VDSO_BAD_SIZE to {vdso,vvar}_rt_size.

Reported-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/cr-restore.c        |  9 +++++---
 criu/pie/parasite-vdso.c | 12 ++++++++++
 criu/pie/restorer.c      |  2 +-
 criu/vdso.c              | 48 ++++++++++++++++++++++++++--------------
 4 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index c1dfc44f1..03dbc850f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3373,10 +3373,13 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		vdso_maps_rt = vdso_maps;
 	/*
 	 * Figure out how much memory runtime vdso and vvar will need.
+	 * Check if vDSO or VVAR is not provided by kernel.
 	 */
-	vdso_rt_size = vdso_maps_rt.sym.vdso_size;
-	if (vdso_rt_size && vdso_maps_rt.sym.vvar_size)
-		vdso_rt_size += ALIGN(vdso_maps_rt.sym.vvar_size, PAGE_SIZE);
+	if (vdso_maps_rt.sym.vdso_size != VDSO_BAD_SIZE) {
+		vdso_rt_size = vdso_maps_rt.sym.vdso_size;
+		if (vdso_maps_rt.sym.vvar_size != VVAR_BAD_SIZE)
+			vdso_rt_size += ALIGN(vdso_maps_rt.sym.vvar_size, PAGE_SIZE);
+	}
 	task_args->bootstrap_len += vdso_rt_size;
 
 	/*
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index 3a1684d35..3f5cb1431 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -292,6 +292,18 @@ int vdso_proxify(struct vdso_maps *rt, bool *added_proxy,
 		return -1;
 	}
 
+	/*
+	 * We could still do something about it here..
+	 * 1. Hope that vDSO from images still works (might not be the case).
+	 * 2. Try to map vDSO.
+	 * But, hopefully no one intends to migrate application that uses
+	 * vDSO to a dut where kernel doesn't provide it.
+	 */
+	if (!vdso_is_present(rt)) {
+		pr_err("vDSO isn't provided by kernel, but exists in images\n");
+		return -1;
+	}
+
 	/*
 	 * vDSO mark overwrites Elf program header of proxy vDSO thus
 	 * it must never ever be greater in size.
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 7012b88a1..afe185f04 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1454,7 +1454,7 @@ long __export_restore_task(struct task_restore_args *args)
 	 * it's presence in original task: vdso will be used for fast
 	 * getttimeofday() in restorer's log timings.
 	 */
-	if (!args->can_map_vdso) {
+	if (!args->can_map_vdso && vdso_is_present(&args->vdso_maps_rt)) {
 		/* It's already checked in kdat, but let's check again */
 		if (args->compatible_mode) {
 			pr_err("Compatible mode without vdso map support\n");
diff --git a/criu/vdso.c b/criu/vdso.c
index b8df2d7a6..19ba4765d 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -275,6 +275,10 @@ int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid,
 	struct vma_area *vma;
 	int fd = -1;
 
+	/* vDSO is not provided by kernel */
+	if (kdat.vdso_sym.vdso_size == VDSO_BAD_SIZE)
+		return 0;
+
 	vcheck = get_vdso_check_type(ctl);
 	if (vcheck == VDSO_CHECK_PFN) {
 		BUG_ON(vdso_pfn == VDSO_BAD_PFN);
@@ -534,21 +538,6 @@ out_unmap:
 }
 #endif /* CONFIG_COMPAT */
 
-int vdso_init_dump(void)
-{
-	if (vdso_parse_maps(PROC_SELF, &vdso_maps)) {
-		pr_err("Failed reading self/maps for filling vdso/vvar bounds\n");
-		return -1;
-	}
-
-	if (kdat.pmap != PM_FULL)
-		pr_info("VDSO detection turned off\n");
-	else if (vaddr_to_pfn(-1, vdso_maps.vdso_start, &vdso_pfn))
-		return -1;
-
-	return 0;
-}
-
 /*
  * Check vdso/vvar sized read from maps to kdat values.
  * We do not read /proc/self/maps for compatible vdso as it's
@@ -566,11 +555,36 @@ static int is_kdat_vdso_sym_valid(void)
 	return true;
 }
 
+int vdso_init_dump(void)
+{
+	if (vdso_parse_maps(PROC_SELF, &vdso_maps)) {
+		pr_err("Failed reading self/maps for filling vdso/vvar bounds\n");
+		return -1;
+	}
+
+	if (!is_kdat_vdso_sym_valid()) {
+		pr_err("Kdat sizes of vdso/vvar differ to maps file \n");
+		return -1;
+	}
+
+	if (kdat.vdso_sym.vdso_size == VDSO_BAD_SIZE) {
+		pr_debug("Kdat has empty vdso symtable - probably CONFIG_VDSO is not set\n");
+		return 0;
+	}
+
+	if (kdat.pmap != PM_FULL)
+		pr_info("VDSO detection turned off\n");
+	else if (vaddr_to_pfn(-1, vdso_maps.vdso_start, &vdso_pfn))
+		return -1;
+
+	return 0;
+}
+
 int vdso_init_restore(void)
 {
 	if (kdat.vdso_sym.vdso_size == VDSO_BAD_SIZE) {
-		pr_err("Kdat has empty vdso symtable\n");
-		return -1;
+		pr_debug("Kdat has empty vdso symtable - probably CONFIG_VDSO is not set\n");
+		return 0;
 	}
 
 	/* Already filled vdso_maps during kdat test */

From 9cb4067e132ba48eb36b0b8075043b13e96e8974 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 22 Jan 2020 14:05:47 +0000
Subject: [PATCH 0144/1854] vdso: Don't page-align vvar

It's always page-aligned (as any VMA).

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 03dbc850f..e5e8fc9c5 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3378,7 +3378,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	if (vdso_maps_rt.sym.vdso_size != VDSO_BAD_SIZE) {
 		vdso_rt_size = vdso_maps_rt.sym.vdso_size;
 		if (vdso_maps_rt.sym.vvar_size != VVAR_BAD_SIZE)
-			vdso_rt_size += ALIGN(vdso_maps_rt.sym.vvar_size, PAGE_SIZE);
+			vdso_rt_size += vdso_maps_rt.sym.vvar_size;
 	}
 	task_args->bootstrap_len += vdso_rt_size;
 

From 3a4c33c502b8ed685d1ffe81b15d11159d43848a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 18 Jan 2020 14:28:03 +0000
Subject: [PATCH 0145/1854] zdtm: mntns_rw_ro_rw update error msg

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 test/zdtm/static/mntns_rw_ro_rw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/mntns_rw_ro_rw.c b/test/zdtm/static/mntns_rw_ro_rw.c
index 7aed254b6..6179c4788 100644
--- a/test/zdtm/static/mntns_rw_ro_rw.c
+++ b/test/zdtm/static/mntns_rw_ro_rw.c
@@ -31,12 +31,12 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (access("/proc/sys/net/ipv4/ip_forward", W_OK)) {
-		fail("Unable to access /proc/sys/net/core/wmem_max");
+		fail("Unable to access /proc/sys/net/ipv4/ip_forward");
 		return 1;
 	}
 
 	if (access("/proc/sys/kernel/ns_last_pid", W_OK) != -1 || errno != EROFS) {
-		fail("Unable to access /proc/sys/kernel/pid_max");
+		fail("Unable to access /proc/sys/kernel/ns_last_pid");
 		return 1;
 	}
 

From f5181b2767d03f17e72dd6f70c83ce394b750e68 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 8 Feb 2020 19:43:39 +0100
Subject: [PATCH 0146/1854] Travis: fix podman test case

Podman changed the output of 'podman ps'. For the test only running
containers are interesting. Adding the filter '-f status=running' only
returns running containers as previously.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/podman-test.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh
index 825bca746..7490d5fe9 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/travis/podman-test.sh
@@ -39,12 +39,12 @@ for i in `seq 20`; do
 	echo "Test $i for podman container checkpoint"
 	podman exec cr ps axf
 	podman logs cr
-	[ `podman ps -f name=cr -q | wc -l` -eq "1" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
 	podman container checkpoint cr
-	[ `podman ps -f name=cr -q | wc -l` -eq "0" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "0" ]
 	podman ps -a
 	podman container restore cr
-	[ `podman ps -f name=cr -q | wc -l` -eq "1" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
 	podman logs cr
 done
 
@@ -53,16 +53,16 @@ for i in `seq 20`; do
 	podman ps -a
 	podman exec cr ps axf
 	podman logs cr
-	[ `podman ps -f name=cr -q | wc -l` -eq "1" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
 	podman container checkpoint -l --export /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr -q | wc -l` -eq "0" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "0" ]
 	podman ps -a
 	podman rm -fa
 	podman ps -a
 	podman container restore --import /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr -q | wc -l` -eq "1" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
 	podman container restore --name cr2 --import /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr2 -q | wc -l` -eq "1" ]
+	[ `podman ps -f name=cr2 -q -f status=running | wc -l` -eq "1" ]
 	podman ps -a
 	podman logs cr
 	podman logs cr2
@@ -70,7 +70,7 @@ for i in `seq 20`; do
 	podman rm -fa
 	podman ps -a
 	podman container restore --import /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr -q | wc -l` -eq "1" ]
+	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
 	podman ps -a
 	rm -f /tmp/chkpt.tar.gz
 done

From d68a68b8f478e12bd457eccfbf8e49b50ca95e86 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 6 Feb 2020 20:46:17 -0800
Subject: [PATCH 0147/1854] test/zdtm/inhfd: update dump options one each
 iteration

This allows to run inhfd tests with many iterations of C/R.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/zdtm.py b/test/zdtm.py
index 16ff0b379..47c89a162 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -757,6 +757,11 @@ class inhfd_test:
             fcntl.fcntl(fd, fcntl.F_SETFD, fdflags)
             peer_file_name = self.__peer_file_names[i]
             ropts.extend(["--inherit-fd", "fd[%d]:%s" % (fd, peer_file_name)])
+        self.__peer_file_names = []
+        self.__dump_opts = []
+        for _, peer_file in self.__files:
+            self.__peer_file_names.append(self.__fdtyp.filename(peer_file))
+            self.__dump_opts += self.__fdtyp.dump_opts(peer_file)
         return ropts
 
     def print_output(self):

From ff756cbb28c4ee10651ed80f38b8ef37ee74fc39 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 6 Feb 2020 21:20:20 -0800
Subject: [PATCH 0148/1854] python: sort imports

202 Additional newline in a group of imports.
I100 Import statements are in the wrong order.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 lib/py/images/pb2dict.py       | 13 ++++++------
 test/inhfd/socket.py           |  2 +-
 test/others/rpc/config_file.py |  7 ++++---
 test/zdtm.py                   | 38 ++++++++++++++++++----------------
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index 6fce4be22..a89850a1d 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -1,12 +1,13 @@
-from google.protobuf.descriptor import FieldDescriptor as FD
-import opts_pb2
-from ipaddress import IPv4Address, ip_address
-from ipaddress import IPv6Address
-import socket
+import base64
 import collections
 import os
-import base64
 import quopri
+import socket
+from ipaddress import IPv4Address, IPv6Address, ip_address
+
+from google.protobuf.descriptor import FieldDescriptor as FD
+
+import opts_pb2
 
 if "encodebytes" not in dir(base64):
     base64.encodebytes = base64.encodestring
diff --git a/test/inhfd/socket.py b/test/inhfd/socket.py
index 9cea16ffb..7efe7faab 100755
--- a/test/inhfd/socket.py
+++ b/test/inhfd/socket.py
@@ -1,5 +1,5 @@
-import socket
 import os
+import socket
 
 
 def create_fds():
diff --git a/test/others/rpc/config_file.py b/test/others/rpc/config_file.py
index 7b07bc145..90c80fcae 100755
--- a/test/others/rpc/config_file.py
+++ b/test/others/rpc/config_file.py
@@ -1,11 +1,12 @@
 #!/usr/bin/python
 
+import argparse
 import os
 import sys
-import rpc_pb2 as rpc
-import argparse
-from tempfile import mkstemp
 import time
+from tempfile import mkstemp
+
+import rpc_pb2 as rpc
 
 from setup_swrk import setup_swrk
 
diff --git a/test/zdtm.py b/test/zdtm.py
index 47c89a162..3fc57ba55 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1,31 +1,33 @@
 #!/usr/bin/env python
 # vim: noet ts=8 sw=8 sts=8
 from __future__ import absolute_import, division, print_function, unicode_literals
-from builtins import (str, open, range, zip, int, input)
 
 import argparse
-import glob
-import os
-import subprocess
-import time
-import tempfile
-import shutil
-import re
-import stat
-import signal
 import atexit
-import sys
-import linecache
-import random
-import string
-import fcntl
-import errno
 import datetime
-import yaml
-import struct
+import errno
+import fcntl
+import glob
+import linecache
 import mmap
+import os
+import random
+import re
+import shutil
+import signal
+import stat
+import string
+import struct
+import subprocess
+import sys
+import tempfile
+import time
+from builtins import (input, int, open, range, str, zip)
+
 import pycriu as crpc
 
+import yaml
+
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 prev_line = None

From 872b795a5678d82a415419e139d680cbf81391ff Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 21 Feb 2020 18:48:41 +0300
Subject: [PATCH 0149/1854] Maintainers: Suggest the maintainers codex (#932)

The guide is based on the one from the RunC project, but
has some criu-related specifics.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 MAINTAINERS          |   2 +
 MAINTAINERS_GUIDE.md | 136 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)
 create mode 100644 MAINTAINERS
 create mode 100644 MAINTAINERS_GUIDE.md

diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 000000000..fbd5d03e8
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,2 @@
+Pavel Emelyanov <ovzxemul@gmail.com> (chief)
+Andrey Vagin <avagin@gmail.com>
diff --git a/MAINTAINERS_GUIDE.md b/MAINTAINERS_GUIDE.md
new file mode 100644
index 000000000..2830a3caa
--- /dev/null
+++ b/MAINTAINERS_GUIDE.md
@@ -0,0 +1,136 @@
+## Introduction
+
+Dear maintainer. Thank you for investing the time and energy to help
+make CRIU as useful as possible. Maintaining a project is difficult,
+sometimes unrewarding work. Sure, you will contribute cool features
+to the project, but most of your time will be spent reviewing patches,
+cleaning things up, documenting, answering questions, justifying design
+decisions - while everyone else will just have fun! But remember -- the
+quality of the maintainers work is what distinguishes the good projects
+from the great. So please be proud of your work, even the unglamorous
+parts, and encourage a culture of appreciation and respect for *every*
+aspect of improving the project -- not just the hot new features.
+
+Being a maintainer is a time consuming commitment and should not be
+taken lightly. This document is a manual for maintainers old and new.
+It explains what is expected of maintainers, how they should work, and
+what tools are available to them.
+
+This is a living document - if you see something out of date or missing,
+speak up!
+
+## What are a maintainer's responsibility?
+
+Part of a healthy project is to have active maintainers to support the
+community in contributions and perform tasks to keep the project running.
+It is every maintainer's responsibility to:
+
+  * Keep the community a friendly place
+  * Deliver prompt feedback and decisions on pull requests and mailing
+    list threads
+  * Encourage other members to help each other, especially in cases the
+    maintainer is overloaded or feels the lack of needed expertise
+  * Make sure the changes made respects the philosophy, design and
+    roadmap of the project
+
+## How are decisions made?
+
+CRIU is an open-source project with an open design philosophy. This
+means that the repository is the source of truth for EVERY aspect of the
+project. *If it's part of the project, it's in the repo. It's in the
+repo, it's part of the project.*
+
+All decisions affecting CRIU, big and small, follow the same 3 steps:
+
+  * Submit a change. Anyone can do this
+
+  * Discuss it. Anyone can and is encouraged to do this
+
+  * Accept or decline it. Only maintainers do this
+
+*I'm a maintainer, should I make pull requests / send patches too?*
+
+Yes. Nobody should ever push to the repository directly. All changes
+should be made through submitting (and accepting) the change.
+
+### Two-steps decision making ###
+
+Since CRIU is extremely complex piece of software we try double hard
+not to make mistakes, that would be hard to fix in the future. In order
+to facilitate this, the "final" decision is made in two stages:
+
+  * We definitely want to try something out
+
+  * We think that the attempt was successful
+
+Respectively, new features get accepted first into the *criu-dev* branch and
+after they have been validated they are merged into the *master* branch. Yet,
+urgent bug fixes may land directly in the master branch. If a change in
+the criu-dev branch is considered to be bad (whatever it means), then it
+can be reverted without propagation to the master branch. Reverting from
+the master branch is expected not to happen at all, but if such an
+extraordinary case occurs, the impact of this step, especially the question
+of backward compatibility, should be considered in the most careful manner.
+
+## Who decides what?
+
+All decisions can be expressed as changes to the repository (either in the
+form of pull requests, or patches sent to the mailing list), and maintainers
+make decisions by merging or rejecting them. Review and approval or
+disagreement can be done by anyone and is denoted by adding a respective
+comment in the pull request. However, merging the change into either branch
+only happens after approvals from maintainers.
+
+In order for a patch to be merged into the criu-dev branch at least two
+maintainers should accept it. In order for a patch to be merged into the
+master branch the majority of maintainers should decide that (then prepare
+a pull request, submit it, etc.).
+
+Overall the maintainer system works because of mutual respect across the
+maintainers of the project. The maintainers trust one another to make
+decisions in the best interests of the project. Sometimes maintainers
+can disagree and this is part of a healthy project to represent the point
+of views of various people. In the case where maintainers cannot find
+agreement on a specific change the role of a Chief Maintainer comes into
+play.
+
+### Chief maintainer
+
+The chief maintainer for the project is responsible for overall architecture
+of the project to maintain conceptual integrity. Large decisions and
+architecture changes should be reviewed by the chief maintainer.
+
+Also the chief maintainer has the veto power on any change submitted
+to any branch. Naturally, a change in the criu-dev branch can be reverted
+after a chief maintainer veto, a change in the master branch must be
+carefully reviwed by the chief maintainer and vetoed in advance.
+
+### How are maintainers added (and removed)?
+
+The best maintainers have a vested interest in the project. Maintainers
+are first and foremost contributors that have shown they are committed to
+the long term success of the project. Contributors wanting to become
+maintainers are expected to be deeply involved in contributing code,
+patches review, and paying needed attention to the issues in the project.
+Just contributing does not make you a maintainer, it is about building trust
+with the current maintainers of the project and being a person that they can
+rely on and trust to make decisions in the best interest of the project.
+
+When a contributor wants to become a maintainer or nominate someone as a
+maintainer, one can submit a "nomination", which technically is the
+respective modification to the `MAINTAINERS` file. When a maintainer feels
+they is unable to perform the required duties, or someone else wants to draw
+the community attention to this fact, one can submit a "(self-)removing"
+change.
+
+The final vote to add or to remove a maintainer is to be approved by the
+majority of current maintainers (with the chief maintainer having veto power
+on that too).
+
+One might have noticed, that the chief maintainer (re-)assignment is not
+regulated by this document. That's true :) However, this can be done. If
+the community decides that the chief maintainer needs to be changed the
+respective "decision making rules" are to be prepared, submitted and
+accepted into this file first.
+
+Good luck!

From 42db2c1563544fc4307c95b8cc2cba8ddfc51262 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Wed, 26 Feb 2020 20:35:12 +0200
Subject: [PATCH 0150/1854] MAINTAINERS: add Mike

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index fbd5d03e8..ed5bf25c1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,2 +1,3 @@
 Pavel Emelyanov <ovzxemul@gmail.com> (chief)
 Andrey Vagin <avagin@gmail.com>
+Mike Rapoport <rppt@kernel.org>

From e19f4cf3b120b91384cdd87fb138a319857f8d8b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Tue, 3 Mar 2020 11:46:08 -0800
Subject: [PATCH 0151/1854] MAINTAINERS: Add Dima and Adrian to maintainers

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index ed5bf25c1..5c28463a7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,5 @@
 Pavel Emelyanov <ovzxemul@gmail.com> (chief)
 Andrey Vagin <avagin@gmail.com>
 Mike Rapoport <rppt@kernel.org>
+Dmitry Safonov <0x7f454c46@gmail.com>
+Adrian Reber <areber@redhat.com>

From 5dbc24b206cd365db7498dddcd03798c5d8ed4e4 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 25 Nov 2019 09:50:08 +0300
Subject: [PATCH 0152/1854] util: introduce the mount_detached_fs helper

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/util.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/util.c b/criu/util.c
index 1646ce1c4..a0a49c5a3 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -30,6 +30,8 @@
 
 #include "linux/mount.h"
 
+#include "linux/mount.h"
+
 #include "kerndat.h"
 #include "page.h"
 #include "util.h"

From c1e72aa936bd86fb4cd819e84791e8a9a5c4d572 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0153/1854] memfd: add file support

See "man memfd_create" for more information of what memfd is.

This adds support for memfd open files, that are not not memory mapped.

* We add a new kind of file: MEMFD.
* We add two image types MEMFD_FILE, and MEMFD_INODE.
  MEMFD_FILE contains usual file information (e.g., position).
  MEMFD_INODE contains the memfd name, and a shmid identifier
  referring to the content.
* We reuse the shmem facilities for dumping memfd content as it
  would be easier to support incremental checkpoints in the future.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 Makefile.config              |   2 +-
 criu/Makefile.crtools        |   1 +
 criu/cr-restore.c            |   2 +
 criu/files.c                 |  18 +-
 criu/image-desc.c            |   1 +
 criu/include/image-desc.h    |   2 +
 criu/include/magic.h         |   1 +
 criu/include/memfd.h         |  24 +++
 criu/include/protobuf-desc.h |   2 +
 criu/include/shmem.h         |   3 +
 criu/kerndat.c               |   3 +-
 criu/memfd.c                 | 350 +++++++++++++++++++++++++++++++++++
 criu/shmem.c                 |  66 ++++++-
 images/Makefile              |   1 +
 images/fdinfo.proto          |   3 +
 images/memfd.proto           |  20 ++
 lib/py/images/images.py      |   2 +
 scripts/feature-tests.mak    |  11 ++
 18 files changed, 503 insertions(+), 9 deletions(-)
 create mode 100644 criu/include/memfd.h
 create mode 100644 criu/memfd.c
 create mode 100644 images/memfd.proto

diff --git a/Makefile.config b/Makefile.config
index 161365960..98ba5d892 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -64,7 +64,7 @@ export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG
+	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE
 
 # $1 - config name
 define gen-feature-test
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 4588ea5b8..1a6e0b5b5 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -37,6 +37,7 @@ obj-y			+= libnetlink.o
 obj-y			+= log.o
 obj-y			+= lsm.o
 obj-y			+= mem.o
+obj-y			+= memfd.o
 obj-y			+= mount.o
 obj-y			+= filesystems.o
 obj-y			+= namespaces.o
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index e5e8fc9c5..13d1001c9 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -76,6 +76,7 @@
 #include "sigframe.h"
 #include "fdstore.h"
 #include "string.h"
+#include "memfd.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
@@ -289,6 +290,7 @@ static struct collect_image_info *cinfos_files[] = {
 	&fanotify_cinfo,
 	&fanotify_mark_cinfo,
 	&ext_file_cinfo,
+	&memfd_cinfo,
 };
 
 /* These images are required to restore namespaces */
diff --git a/criu/files.c b/criu/files.c
index e26897870..ea86deaa3 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -34,6 +34,7 @@
 #include "sk-packet.h"
 #include "mount.h"
 #include "signalfd.h"
+#include "memfd.h"
 #include "namespaces.h"
 #include "tun.h"
 #include "timerfd.h"
@@ -546,13 +547,17 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 			return -1;
 
 		p.link = &link;
-		if (link.name[1] == '/')
-			return do_dump_gen_file(&p, lfd, &regfile_dump_ops, e);
 
-		if (check_ns_proc(&link))
-			return do_dump_gen_file(&p, lfd, &nsfile_dump_ops, e);
+		if (is_memfd(p.stat.st_dev, &link.name[1]))
+			ops = &memfd_dump_ops;
+		else if (link.name[1] == '/')
+			ops = &regfile_dump_ops;
+		else if (check_ns_proc(&link))
+			ops = &nsfile_dump_ops;
+		else
+			return dump_unsupp_fd(&p, lfd, "reg", link.name + 1, e);
 
-		return dump_unsupp_fd(&p, lfd, "reg", link.name + 1, e);
+		return do_dump_gen_file(&p, lfd, ops, e);
 	}
 
 	if (S_ISFIFO(p.stat.st_mode)) {
@@ -1721,6 +1726,9 @@ static int collect_one_file(void *o, ProtobufCMessage *base, struct cr_img *i)
 	case FD_TYPES__TTY:
 		ret = collect_one_file_entry(fe, fe->tty->id, &fe->tty->base, &tty_cinfo);
 		break;
+	case FD_TYPES__MEMFD:
+		ret = collect_one_file_entry(fe, fe->memfd->id, &fe->memfd->base, &memfd_cinfo);
+		break;
 	}
 
 	return ret;
diff --git a/criu/image-desc.c b/criu/image-desc.c
index ae5d817fe..b538a76ea 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -66,6 +66,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(FS,		"fs-%u"),
 	FD_ENTRY(REMAP_FPATH,	"remap-fpath"),
 	FD_ENTRY_F(GHOST_FILE,	"ghost-file-%x", O_NOBUF),
+	FD_ENTRY_F(MEMFD_INODE,	"memfd-%u", O_NOBUF),
 	FD_ENTRY(TCP_STREAM,	"tcp-stream-%x"),
 	FD_ENTRY(MNTS,		"mountpoints-%u"),
 	FD_ENTRY(NETDEV,	"netdev-%u"),
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 6db8bf94f..9ca9643a1 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -106,6 +106,8 @@ enum {
 	CR_FD_FIFO,
 	CR_FD_PIPES,
 	CR_FD_TTY_FILES,
+	CR_FD_MEMFD_FILE,
+	CR_FD_MEMFD_INODE,
 
 	CR_FD_AUTOFS,
 
diff --git a/criu/include/magic.h b/criu/include/magic.h
index 1a583f4ed..bdaca968d 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -94,6 +94,7 @@
 #define BINFMT_MISC_MAGIC	0x67343323 /* Apatity */
 #define AUTOFS_MAGIC		0x49353943 /* Sochi */
 #define FILES_MAGIC		0x56303138 /* Toropets */
+#define MEMFD_INODE_MAGIC	0x48453499 /* Dnipro */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
new file mode 100644
index 000000000..c1d7949cb
--- /dev/null
+++ b/criu/include/memfd.h
@@ -0,0 +1,24 @@
+#ifndef __CR_MEMFD_H__
+#define __CR_MEMFD_H__
+
+#include <sys/stat.h>
+#include "int.h"
+#include "common/config.h"
+
+extern int is_memfd(dev_t dev, const char *path);
+extern const struct fdtype_ops memfd_dump_ops;
+
+extern struct collect_image_info memfd_cinfo;
+
+#ifdef CONFIG_HAS_MEMFD_CREATE
+# include <sys/mman.h>
+#else
+# include <sys/syscall.h>
+# include <linux/memfd.h>
+static inline int memfd_create(const char *name, unsigned int flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
+#endif /* CONFIG_HAS_MEMFD_CREATE */
+
+#endif /* __CR_MEMFD_H__ */
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 31f5b9a79..7e0385ef4 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -61,6 +61,8 @@ enum {
 	PB_AUTOFS,
 	PB_GHOST_CHUNK,
 	PB_FILE,
+	PB_MEMFD_FILE,
+	PB_MEMFD_INODE,		/* 60 */
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/include/shmem.h b/criu/include/shmem.h
index 04ab8d076..9afdb799a 100644
--- a/criu/include/shmem.h
+++ b/criu/include/shmem.h
@@ -13,8 +13,11 @@ extern int collect_sysv_shmem(unsigned long shmid, unsigned long size);
 extern int cr_dump_shmem(void);
 extern int add_shmem_area(pid_t pid, VmaEntry *vma, u64 *map);
 extern int fixup_sysv_shmems(void);
+extern int dump_one_memfd_shmem(int fd, unsigned long shmid, unsigned long size);
 extern int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shmid);
 extern int restore_sysv_shmem_content(void *addr, unsigned long size, unsigned long shmid);
+extern int restore_memfd_shmem_content(int fd, unsigned long shmid, unsigned long size);
+
 
 #define SYSV_SHMEM_SKIP_FD	(0x7fffffff)
 
diff --git a/criu/kerndat.c b/criu/kerndat.c
index e0b5731d5..8ac83820b 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -42,6 +42,7 @@
 #include "vdso.h"
 #include "kcmp.h"
 #include "sched.h"
+#include "memfd.h"
 
 struct kerndat_s kdat = {
 };
@@ -409,7 +410,7 @@ static bool kerndat_has_memfd_create(void)
 {
 	int ret;
 
-	ret = syscall(SYS_memfd_create, NULL, 0);
+	ret = memfd_create(NULL, 0);
 
 	if (ret == -1 && errno == ENOSYS)
 		kdat.has_memfd = false;
diff --git a/criu/memfd.c b/criu/memfd.c
new file mode 100644
index 000000000..bcef35e75
--- /dev/null
+++ b/criu/memfd.c
@@ -0,0 +1,350 @@
+#include <unistd.h>
+
+#include "common/compiler.h"
+#include "common/lock.h"
+#include "memfd.h"
+#include "fdinfo.h"
+#include "imgset.h"
+#include "image.h"
+#include "util.h"
+#include "log.h"
+#include "files.h"
+#include "fs-magic.h"
+#include "kerndat.h"
+#include "files-reg.h"
+#include "rst-malloc.h"
+#include "fdstore.h"
+#include "file-ids.h"
+#include "namespaces.h"
+#include "shmem.h"
+
+#include "protobuf.h"
+#include "images/memfd.pb-c.h"
+
+#define MEMFD_PREFIX "/memfd:"
+#define MEMFD_PREFIX_LEN (sizeof(MEMFD_PREFIX)-1)
+
+struct memfd_inode {
+	struct list_head	list;
+	u32			id;
+	union {
+		/* Only for dump */
+		struct {
+			u32	dev;
+			u32	ino;
+		};
+		/* Only for restore */
+		struct {
+			mutex_t	lock;
+			int	fdstore_id;
+		};
+	};
+};
+
+static LIST_HEAD(memfd_inodes);
+
+/*
+ * Dump only
+ */
+
+static u32 memfd_inode_ids = 1;
+
+int is_memfd(dev_t dev, const char *path)
+{
+	/*
+	 * TODO When MAP_HUGETLB is used, the file device is not shmem_dev,
+	 * Note that other parts of CRIU have similar issues, see
+	 * is_anon_shmem_map().
+	 */
+	return dev == kdat.shmem_dev &&
+		!strncmp(path, MEMFD_PREFIX, MEMFD_PREFIX_LEN);
+}
+
+static int dump_memfd_inode(int fd, struct memfd_inode *inode,
+			    const char *name, const struct stat *st)
+{
+	int ret = -1;
+	struct cr_img *img = NULL;
+	MemfdInodeEntry mie = MEMFD_INODE_ENTRY__INIT;
+	u32 shmid;
+
+	 /*
+	  * shmids are chosen as the inode number of the corresponding mmaped
+	  * file. See handle_vma() in proc_parse.c.
+	  * It works for memfd too, because we share the same device as the
+	  * shmem device.
+	  */
+	shmid = inode->ino;
+
+	pr_info("Dumping memfd:%s contents (id %#x, shmid: %#x, size: %"PRIu64")\n",
+		name, inode->id, shmid, st->st_size);
+
+	if (dump_one_memfd_shmem(fd, shmid, st->st_size) < 0)
+		goto out;
+
+	img = open_image(CR_FD_MEMFD_INODE, O_DUMP, inode->id);
+	if (!img)
+		goto out;
+
+	mie.uid = userns_uid(st->st_uid);
+	mie.gid = userns_gid(st->st_gid);
+	mie.name = (char *)name;
+	mie.size = st->st_size;
+	mie.shmid = shmid;
+
+	if (pb_write_one(img, &mie, PB_MEMFD_INODE))
+		goto out;
+
+	ret = 0;
+
+out:
+	if (img)
+		close_image(img);
+	return ret;
+}
+
+static struct memfd_inode *dump_unique_memfd_inode(int lfd, const char *name, const struct stat *st)
+{
+	struct memfd_inode *inode;
+
+	list_for_each_entry(inode, &memfd_inodes, list)
+		if ((inode->dev == st->st_dev) && (inode->ino == st->st_ino))
+			return inode;
+
+	inode = xmalloc(sizeof(*inode));
+	if (inode == NULL)
+		return NULL;
+
+	inode->dev = st->st_dev;
+	inode->ino = st->st_ino;
+	inode->id = memfd_inode_ids++;
+
+	if (dump_memfd_inode(lfd, inode, name, st)) {
+		xfree(inode);
+		return NULL;
+	}
+
+	list_add_tail(&inode->list, &memfd_inodes);
+
+	return inode;
+}
+
+static int dump_one_memfd(int lfd, u32 id, const struct fd_parms *p)
+{
+	MemfdFileEntry mfe = MEMFD_FILE_ENTRY__INIT;
+	FileEntry fe = FILE_ENTRY__INIT;
+	struct memfd_inode *inode;
+	struct fd_link _link, *link;
+	const char *name;
+
+	if (!p->link) {
+		if (fill_fdlink(lfd, p, &_link))
+			return -1;
+		link = &_link;
+	} else
+		link = p->link;
+
+	strip_deleted(link);
+	name = &link->name[1+MEMFD_PREFIX_LEN];
+
+	inode = dump_unique_memfd_inode(lfd, name, &p->stat);
+	if (!inode)
+		return -1;
+
+	mfe.id = id;
+	mfe.flags = p->flags;
+	mfe.pos = p->pos;
+	mfe.fown = (FownEntry *)&p->fown;
+	mfe.inode_id = inode->id;
+
+	fe.type = FD_TYPES__MEMFD;
+	fe.id = mfe.id;
+	fe.memfd = &mfe;
+
+	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
+}
+
+const struct fdtype_ops memfd_dump_ops = {
+	.type		= FD_TYPES__MEMFD,
+	.dump		= dump_one_memfd,
+};
+
+
+/*
+ * Restore only
+ */
+
+struct memfd_info {
+	MemfdFileEntry		*mfe;
+	struct file_desc	d;
+	struct memfd_inode	*inode;
+};
+
+static struct memfd_inode *memfd_alloc_inode(int id)
+{
+	struct memfd_inode *inode;
+
+	list_for_each_entry(inode, &memfd_inodes, list)
+		if (inode->id == id)
+			return inode;
+
+	inode = shmalloc(sizeof(*inode));
+	if (!inode)
+		return NULL;
+
+	inode->id = id;
+	mutex_init(&inode->lock);
+	inode->fdstore_id = -1;
+
+	list_add_tail(&inode->list, &memfd_inodes);
+	return inode;
+}
+
+extern int restore_memfd_shm(int fd, u64 id, u64 size);
+static int memfd_open_inode_nocache(struct memfd_inode *inode)
+{
+	MemfdInodeEntry *mie = NULL;
+	struct cr_img *img = NULL;
+	int fd = -1;
+	int ret = -1;
+	int flags;
+
+	img = open_image(CR_FD_MEMFD_INODE, O_RSTR, inode->id);
+	if (!img)
+		goto out;
+
+	if (pb_read_one(img, &mie, PB_MEMFD_INODE) < 0)
+		goto out;
+
+	fd = memfd_create(mie->name, 0);
+	if (fd < 0) {
+		pr_perror("Can't create memfd:%s", mie->name);
+		goto out;
+	}
+
+	if (restore_memfd_shmem_content(fd, mie->shmid, mie->size))
+		goto out;
+
+	if (fchown(fd, mie->uid, mie->gid)) {
+		pr_perror("Can't change uid %d gid %d of memfd:%s",
+			  (int)mie->uid, (int)mie->gid, mie->name);
+		goto out;
+	}
+
+	inode->fdstore_id = fdstore_add(fd);
+	if (inode->fdstore_id < 0)
+		goto out;
+
+	ret = fd;
+	fd = -1;
+
+out:
+	if (fd != -1)
+		close(fd);
+	if (img)
+		close_image(img);
+	if (mie)
+		memfd_inode_entry__free_unpacked(mie, NULL);
+	return ret;
+}
+
+static int memfd_open_inode(struct memfd_inode *inode)
+{
+	int fd;
+
+	if (inode->fdstore_id != -1)
+		return fdstore_get(inode->fdstore_id);
+
+	mutex_lock(&inode->lock);
+	if (inode->fdstore_id != -1)
+		fd = fdstore_get(inode->fdstore_id);
+	else
+		fd = memfd_open_inode_nocache(inode);
+	mutex_unlock(&inode->lock);
+
+	return fd;
+}
+
+static int memfd_open(struct file_desc *d, u32 *fdflags)
+{
+	char lpath[PSFDS];
+	struct memfd_info *mfi;
+	MemfdFileEntry *mfe;
+	int fd, _fd;
+	u32 flags;
+
+	mfi = container_of(d, struct memfd_info, d);
+	mfe = mfi->mfe;
+
+	pr_info("Restoring memfd id=%d\n", mfe->id);
+
+	fd = memfd_open_inode(mfi->inode);
+	if (fd < 0)
+		goto err;
+
+	/* Reopen the fd with original permissions */
+	sprintf(lpath, "/proc/self/fd/%d", fd);
+	flags = fdflags ? *fdflags : mfe->flags;
+	/*
+	 * Ideally we should call compat version open() to not force the
+	 * O_LARGEFILE file flag with regular open(). It doesn't seem that
+	 * important though.
+	 */
+	_fd = open(lpath, flags);
+	if (_fd < 0) {
+		pr_perror("Can't reopen memfd id=%d", mfe->id);
+		goto err;
+	}
+	close(fd);
+	fd = _fd;
+
+	if (restore_fown(fd, mfe->fown) < 0)
+		goto err;
+
+	if (lseek(fd, mfe->pos, SEEK_SET) < 0) {
+		pr_perror("Can't restore file position of memfd id=%d", mfe->id);
+		goto err;
+	}
+
+	return fd;
+
+err:
+	if (fd >= 0)
+		close(fd);
+	return -1;
+}
+
+static int memfd_open_fe_fd(struct file_desc *fd, int *new_fd)
+{
+	int tmp;
+
+	tmp = memfd_open(fd, NULL);
+	if (tmp < 0)
+		return -1;
+	*new_fd = tmp;
+	return 0;
+}
+
+static struct file_desc_ops memfd_desc_ops = {
+	.type = FD_TYPES__MEMFD,
+	.open = memfd_open_fe_fd,
+};
+
+static int collect_one_memfd(void *o, ProtobufCMessage *msg, struct cr_img *i)
+{
+	struct memfd_info *info = o;
+
+	info->mfe = pb_msg(msg, MemfdFileEntry);
+	info->inode = memfd_alloc_inode(info->mfe->inode_id);
+	if (!info->inode)
+		return -1;
+
+	return file_desc_add(&info->d, info->mfe->id, &memfd_desc_ops);
+}
+
+struct collect_image_info memfd_cinfo = {
+	.fd_type = CR_FD_MEMFD_FILE,
+	.pb_type = PB_MEMFD_FILE,
+	.priv_size = sizeof(struct memfd_info),
+	.collect = collect_one_memfd,
+};
diff --git a/criu/shmem.c b/criu/shmem.c
index cee47dba7..29383e79a 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -23,6 +23,7 @@
 #include "types.h"
 #include "page.h"
 #include "util.h"
+#include "memfd.h"
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
 
@@ -490,7 +491,7 @@ static int do_restore_shmem_content(void *addr, unsigned long size, unsigned lon
 	return ret;
 }
 
-static int restore_shmem_content(void *addr, struct shmem_info *si)
+int restore_shmem_content(void *addr, struct shmem_info *si)
 {
 	return do_restore_shmem_content(addr, si->size, si->shmid);
 }
@@ -500,6 +501,41 @@ int restore_sysv_shmem_content(void *addr, unsigned long size, unsigned long shm
 	return do_restore_shmem_content(addr, round_up(size, PAGE_SIZE), shmid);
 }
 
+int restore_memfd_shmem_content(int fd, unsigned long shmid, unsigned long size)
+{
+	void *addr = NULL;
+	int ret = 1;
+
+	if (size == 0)
+		return 0;
+
+	if (ftruncate(fd, size) < 0) {
+		pr_perror("Can't resize shmem 0x%lx size=%ld", shmid, size);
+		goto out;
+	}
+
+	addr = mmap(NULL, size, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
+	if (addr == MAP_FAILED) {
+		pr_perror("Can't mmap shmem 0x%lx size=%ld", shmid, size);
+		goto out;
+	}
+
+	/*
+	 * do_restore_shmem_content needs size to be page aligned.
+	 */
+	if (do_restore_shmem_content(addr, round_up(size, PAGE_SIZE), shmid) < 0) {
+		pr_err("Can't restore shmem content\n");
+		goto out;
+	}
+
+	ret = 0;
+
+out:
+	if (addr)
+		munmap(addr, size);
+	return ret;
+}
+
 static int open_shmem(int pid, struct vma_area *vma)
 {
 	VmaEntry *vi = vma->e;
@@ -532,7 +568,7 @@ static int open_shmem(int pid, struct vma_area *vma)
 
 	flags = MAP_SHARED;
 	if (kdat.has_memfd) {
-		f = syscall(SYS_memfd_create, "", 0);
+		f = memfd_create("", 0);
 		if (f < 0) {
 			pr_perror("Unable to create memfd");
 			goto err;
@@ -779,6 +815,32 @@ err:
 	return ret;
 }
 
+int dump_one_memfd_shmem(int fd, unsigned long shmid, unsigned long size)
+{
+	int ret = -1;
+	void *addr;
+	struct shmem_info si;
+
+	if (size == 0)
+		return 0;
+
+	memset(&si, 0, sizeof(si));
+	si.shmid = shmid;
+	si.size = size;
+
+	addr = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+	if (addr == MAP_FAILED) {
+		pr_perror("Can't mmap shmem 0x%lx", shmid);
+		goto err;
+	}
+
+	ret = do_dump_one_shmem(fd, addr, &si);
+
+	munmap(addr, size);
+err:
+	return ret;
+}
+
 int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shmid)
 {
 	int fd, ret;
diff --git a/images/Makefile b/images/Makefile
index edaab0633..e7f0580cf 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -63,6 +63,7 @@ proto-obj-y	+= sysctl.o
 proto-obj-y	+= autofs.o
 proto-obj-y	+= macvlan.o
 proto-obj-y	+= sit.o
+proto-obj-y	+= memfd.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/fdinfo.proto b/images/fdinfo.proto
index 77e375aa9..d966d5bc5 100644
--- a/images/fdinfo.proto
+++ b/images/fdinfo.proto
@@ -16,6 +16,7 @@ import "sk-unix.proto";
 import "fifo.proto";
 import "pipe.proto";
 import "tty.proto";
+import "memfd.proto";
 
 enum fd_types {
 	UND		= 0;
@@ -36,6 +37,7 @@ enum fd_types {
 	TUNF		= 15;
 	EXT		= 16;
 	TIMERFD		= 17;
+	MEMFD		= 18;
 
 	/* Any number above the real used. Not stored to image */
 	CTL_TTY		= 65534;
@@ -70,4 +72,5 @@ message file_entry {
 	optional fifo_entry		fifo	= 17;
 	optional pipe_entry		pipe	= 18;
 	optional tty_file_entry		tty	= 19;
+	optional memfd_file_entry	memfd	= 20;
 }
diff --git a/images/memfd.proto b/images/memfd.proto
new file mode 100644
index 000000000..8eccd6f4f
--- /dev/null
+++ b/images/memfd.proto
@@ -0,0 +1,20 @@
+syntax = "proto2";
+
+import "opts.proto";
+import "fown.proto";
+
+message memfd_file_entry {
+	required uint32		id		= 1;
+	required uint32		flags		= 2 [(criu).flags = "rfile.flags"];
+	required uint64		pos		= 3;
+	required fown_entry	fown		= 4;
+	required uint32		inode_id	= 5;
+};
+
+message memfd_inode_entry {
+	required string		name		= 1;
+	required uint32		uid		= 2;
+	required uint32		gid		= 3;
+	required uint64		size		= 4;
+	required uint32		shmid		= 5;
+};
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 3eedfca69..dca080657 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -522,6 +522,8 @@ handlers = {
     'AUTOFS': entry_handler(pb.autofs_entry),
     'FILES': entry_handler(pb.file_entry),
     'CPUINFO': entry_handler(pb.cpuinfo_entry),
+    'MEMFD_FILE': entry_handler(pb.memfd_file_entry),
+    'MEMFD_INODE': entry_handler(pb.memfd_inode_entry),
 }
 
 
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index 6f67c6035..21b390092 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -171,3 +171,14 @@ int main(int argc, char **argv)
 }
 
 endef
+
+define FEATURE_TEST_MEMFD_CREATE
+
+#include <sys/mman.h>
+#include <stddef.h>
+
+int main(void)
+{
+	return memfd_create(NULL, 0);
+}
+endef

From 875ac4d03f9034adb88eec5875d63d0561c48107 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0154/1854] files: increase path buffer size in inherited_fd()

Prepare memfd to use inherited_fd(), needing long path names support.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/files.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/files.c b/criu/files.c
index ea86deaa3..789b08a4c 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1608,7 +1608,7 @@ int inherit_fd_lookup_id(char *id)
 
 bool inherited_fd(struct file_desc *d, int *fd_p)
 {
-	char buf[32], *id_str;
+	char buf[PATH_MAX], *id_str;
 	int i_fd;
 
 	if (!d->ops->name)

From b25684e24ae7643f2a8da73617c22a44dc9023ca Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0155/1854] memfd: add --inherit-fd support

Upon file restore, inherited_fd() is called to check for a user-defined
inerit-fd override. Note that the MEMFD_INODE image is read at each
invocation (memfd name is not cached).

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/crtools.c |  1 +
 criu/memfd.c   | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/criu/crtools.c b/criu/crtools.c
index 3cd40e87d..7f72dde27 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -392,6 +392,7 @@ usage:
 "                            pipe[inode]\n"
 "                            socket[inode]\n"
 "                            file[mnt_id:inode]\n"
+"                            /memfd:name\n"
 "                            path/to/file\n"
 "  --empty-ns net        Create a namespace, but don't restore its properties\n"
 "                        (assuming it will be restored by action scripts)\n"
diff --git a/criu/memfd.c b/criu/memfd.c
index bcef35e75..36b3be8df 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -276,6 +276,9 @@ static int memfd_open(struct file_desc *d, u32 *fdflags)
 	mfi = container_of(d, struct memfd_info, d);
 	mfe = mfi->mfe;
 
+	if (inherited_fd(d, &fd))
+		return fd;
+
 	pr_info("Restoring memfd id=%d\n", mfe->id);
 
 	fd = memfd_open_inode(mfi->inode);
@@ -325,9 +328,42 @@ static int memfd_open_fe_fd(struct file_desc *fd, int *new_fd)
 	return 0;
 }
 
+static char *memfd_d_name(struct file_desc *d, char *buf, size_t s)
+{
+	MemfdInodeEntry *mie = NULL;
+	struct cr_img *img = NULL;
+	struct memfd_info *mfi;
+	char *ret = NULL;
+
+	mfi = container_of(d, struct memfd_info, d);
+
+	img = open_image(CR_FD_MEMFD_INODE, O_RSTR, mfi->inode->id);
+	if (!img)
+		goto out;
+
+	if (pb_read_one(img, &mie, PB_MEMFD_INODE) < 0)
+		goto out;
+
+	if (snprintf(buf, s, "%s%s", MEMFD_PREFIX, mie->name) >= s) {
+		pr_err("Buffer too small for memfd name %s\n", mie->name);
+		goto out;
+	}
+
+	ret = buf;
+
+out:
+	if (img)
+		close_image(img);
+	if (mie)
+		memfd_inode_entry__free_unpacked(mie, NULL);
+
+	return ret;
+}
+
 static struct file_desc_ops memfd_desc_ops = {
 	.type = FD_TYPES__MEMFD,
 	.open = memfd_open_fe_fd,
+	.name = memfd_d_name,
 };
 
 static int collect_one_memfd(void *o, ProtobufCMessage *msg, struct cr_img *i)

From 29a1a88bcebaf9d83591077d2bec424da82c0e71 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0156/1854] memfd: add memory mapping support

* During checkpoint, we add a vma flags: VMA_AREA_MEMFD to denote memfd
  regions.
* Even though memfd is backed by the shmem device, we use the file
  semantics of memfd (via /proc/map_files/<vma>) which we already have
  support for.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/cr-dump.c       |  6 +++++-
 criu/files-reg.c     | 11 +++++++++--
 criu/include/image.h |  1 +
 criu/include/memfd.h |  6 ++++++
 criu/memfd.c         | 19 ++++++++++++++++++-
 criu/proc_parse.c    | 35 +++++++++++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 88323af92..6aa114c2d 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -80,6 +80,7 @@
 #include "fault-injection.h"
 #include "dump.h"
 #include "eventpoll.h"
+#include "memfd.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
@@ -414,7 +415,10 @@ static int dump_filemap(struct vma_area *vma_area, int fd)
 
 	/* Flags will be set during restore in open_filmap() */
 
-	ret = dump_one_reg_file_cond(fd, &id, &p);
+	if (vma->status & VMA_AREA_MEMFD)
+		ret = dump_one_memfd_cond(fd, &id, &p);
+	else
+		ret = dump_one_reg_file_cond(fd, &id, &p);
 
 	vma->shmid = id;
 	return ret;
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 90fb7dd7f..b0dad78e6 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -35,6 +35,7 @@
 #include "pstree.h"
 #include "fault-injection.h"
 #include "external.h"
+#include "memfd.h"
 
 #include "protobuf.h"
 #include "util.h"
@@ -1879,7 +1880,10 @@ static int open_filemap(int pid, struct vma_area *vma)
 	flags = vma->e->fdflags;
 
 	if (ctx.flags != flags || ctx.desc != vma->vmfd) {
-		ret = open_path(vma->vmfd, do_open_reg_noseek_flags, &flags);
+		if (vma->e->status & VMA_AREA_MEMFD)
+			ret = memfd_open(vma->vmfd, &flags);
+		else
+			ret = open_path(vma->vmfd, do_open_reg_noseek_flags, &flags);
 		if (ret < 0)
 			return ret;
 
@@ -1909,7 +1913,10 @@ int collect_filemap(struct vma_area *vma)
 			vma->e->fdflags = O_RDONLY;
 	}
 
-	fd = collect_special_file(vma->e->shmid);
+	if (vma->e->status & VMA_AREA_MEMFD)
+		fd = collect_memfd(vma->e->shmid);
+	else
+		fd = collect_special_file(vma->e->shmid);
 	if (!fd)
 		return -1;
 
diff --git a/criu/include/image.h b/criu/include/image.h
index 2baa39496..1c7cc5471 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -83,6 +83,7 @@
 #define VMA_AREA_SOCKET		(1 <<  11)
 #define VMA_AREA_VVAR		(1 <<  12)
 #define VMA_AREA_AIORING	(1 <<  13)
+#define VMA_AREA_MEMFD		(1 <<  14)
 
 #define VMA_CLOSE		(1 <<  28)
 #define VMA_NO_PROT_WRITE	(1 <<  29)
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
index c1d7949cb..0a9aeff2f 100644
--- a/criu/include/memfd.h
+++ b/criu/include/memfd.h
@@ -5,10 +5,16 @@
 #include "int.h"
 #include "common/config.h"
 
+struct fd_parms;
+struct file_desc;
+
 extern int is_memfd(dev_t dev, const char *path);
+extern int dump_one_memfd_cond(int lfd, u32 *id, struct fd_parms *parms);
 extern const struct fdtype_ops memfd_dump_ops;
 
+extern int memfd_open(struct file_desc *d, u32 *fdflags);
 extern struct collect_image_info memfd_cinfo;
+extern struct file_desc *collect_memfd(u32 id);
 
 #ifdef CONFIG_HAS_MEMFD_CREATE
 # include <sys/mman.h>
diff --git a/criu/memfd.c b/criu/memfd.c
index 36b3be8df..1cca96a32 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -164,6 +164,13 @@ static int dump_one_memfd(int lfd, u32 id, const struct fd_parms *p)
 	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
 }
 
+int dump_one_memfd_cond(int lfd, u32 *id, struct fd_parms *parms)
+{
+	if (fd_id_generate_special(parms, id))
+		return dump_one_memfd(lfd, *id, parms);
+	return 0;
+}
+
 const struct fdtype_ops memfd_dump_ops = {
 	.type		= FD_TYPES__MEMFD,
 	.dump		= dump_one_memfd,
@@ -265,7 +272,7 @@ static int memfd_open_inode(struct memfd_inode *inode)
 	return fd;
 }
 
-static int memfd_open(struct file_desc *d, u32 *fdflags)
+int memfd_open(struct file_desc *d, u32 *fdflags)
 {
 	char lpath[PSFDS];
 	struct memfd_info *mfi;
@@ -384,3 +391,13 @@ struct collect_image_info memfd_cinfo = {
 	.priv_size = sizeof(struct memfd_info),
 	.collect = collect_one_memfd,
 };
+
+struct file_desc *collect_memfd(u32 id) {
+	struct file_desc *fdesc;
+
+	fdesc = find_file_desc_raw(FD_TYPES__MEMFD, id);
+	if (fdesc == NULL)
+		pr_err("No entry for memfd %#x\n", id);
+
+	return fdesc;
+}
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index fa7644992..468afcdf3 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -41,6 +41,7 @@
 #include "timerfd.h"
 #include "path.h"
 #include "fault-injection.h"
+#include "memfd.h"
 
 #include "protobuf.h"
 #include "images/fdinfo.pb-c.h"
@@ -303,6 +304,26 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 	}
 
 	vfi_dev = makedev(vfi->dev_maj, vfi->dev_min);
+
+	if (is_memfd(vfi_dev, fname)) {
+		struct fd_link link;
+		link.len = strlen(fname);
+		strlcpy(link.name, fname, sizeof(link.name));
+		strip_deleted(&link);
+
+		/*
+		 * The error EPERM will be shown in the following pr_perror().
+		 * It comes from the previous open() call.
+		 */
+		pr_perror("Can't open mapped [%s]", link.name);
+
+		/*
+		 * TODO Perhaps we could do better than failing and dump the
+		 * memory like what is being done in shmem.c
+		 */
+		return -1;
+	}
+
 	if (is_anon_shmem_map(vfi_dev)) {
 		if (!(vma->e->flags & MAP_SHARED))
 			return -1;
@@ -578,7 +599,20 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 		/*
 		 * /dev/zero stands for anon-shared mapping
 		 * otherwise it's some file mapping.
+		 *
+		 * We treat memfd mappings as regular file mappings because
+		 * their backing can be seen as files, which is easy to
+		 * support. So even though memfd is an anonymous shmem, we
+		 * treat it differently.
+		 * Note: maybe we should revisit this as /proc/map_files/<vma>
+		 * may not always be accessible.
 		 */
+
+		if (is_memfd(st_buf->st_dev, file_path)) {
+			vma_area->e->status |= VMA_AREA_MEMFD;
+			goto normal_file;
+		}
+
 		if (is_anon_shmem_map(st_buf->st_dev)) {
 			if (!(vma_area->e->flags & MAP_SHARED))
 				goto err_bogus_mapping;
@@ -594,6 +628,7 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 					vma_area->e->shmid += FI_HUGE_ANON_SHMEM_ID_BASE;
 			}
 		} else {
+normal_file:
 			if (vma_area->e->flags & MAP_PRIVATE)
 				vma_area->e->status |= VMA_FILE_PRIVATE;
 			else

From 56d8e2455fb86b885775db6c236cbb04ba403f4d Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 18 Dec 2019 23:32:32 +0000
Subject: [PATCH 0157/1854] memfd: add seals support

See "man fcntl" for more information about seals.

memfd are the only files that can be sealed, currently. For this
reason, we dump the seal values in the MEMFD_INODE image.

Restoring seals must be done carefully as the seal F_SEAL_FUTURE_WRITE
prevents future write access. This means that any memory mapping with
write access must be restored before restoring the seals.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/cr-restore.c        |  4 +++
 criu/include/fcntl.h     |  8 ++++++
 criu/include/memfd.h     |  1 +
 criu/memfd.c             | 59 +++++++++++++++++++++++++++++++++++++++-
 images/memfd.proto       |  1 +
 lib/py/images/pb2dict.py |  9 ++++++
 6 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 13d1001c9..f50448cd2 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2232,6 +2232,10 @@ skip_ns_bouncing:
 	if (ret < 0)
 		goto out_kill;
 
+	ret = apply_memfd_seals();
+	if (ret < 0)
+		goto out_kill;
+
 	/*
 	 * Zombies die after CR_STATE_RESTORE which is switched
 	 * by root task, not by us. See comment before CR_STATE_FORKING
diff --git a/criu/include/fcntl.h b/criu/include/fcntl.h
index d9c5c5e7b..ea9d48c72 100644
--- a/criu/include/fcntl.h
+++ b/criu/include/fcntl.h
@@ -34,6 +34,14 @@ struct f_owner_ex {
 # define F_GETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 8)
 #endif
 
+#ifndef F_ADD_SEALS
+# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#endif
+
+#ifndef F_GET_SEALS
+# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+#endif
+
 #ifndef O_PATH
 # define O_PATH		010000000
 #endif
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
index 0a9aeff2f..2d8eda545 100644
--- a/criu/include/memfd.h
+++ b/criu/include/memfd.h
@@ -15,6 +15,7 @@ extern const struct fdtype_ops memfd_dump_ops;
 extern int memfd_open(struct file_desc *d, u32 *fdflags);
 extern struct collect_image_info memfd_cinfo;
 extern struct file_desc *collect_memfd(u32 id);
+extern int apply_memfd_seals(void);
 
 #ifdef CONFIG_HAS_MEMFD_CREATE
 # include <sys/mman.h>
diff --git a/criu/memfd.c b/criu/memfd.c
index 1cca96a32..d17c10fb7 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -1,4 +1,5 @@
 #include <unistd.h>
+#include <linux/memfd.h>
 
 #include "common/compiler.h"
 #include "common/lock.h"
@@ -24,6 +25,13 @@
 #define MEMFD_PREFIX "/memfd:"
 #define MEMFD_PREFIX_LEN (sizeof(MEMFD_PREFIX)-1)
 
+#define F_SEAL_SEAL	0x0001	/* prevent further seals from being set */
+#define F_SEAL_SHRINK	0x0002	/* prevent file from shrinking */
+#define F_SEAL_GROW	0x0004	/* prevent file from growing */
+#define F_SEAL_WRITE	0x0008	/* prevent writes */
+/* Linux 5.1+ */
+#define F_SEAL_FUTURE_WRITE	0x0010  /* prevent future writes while mapped */
+
 struct memfd_inode {
 	struct list_head	list;
 	u32			id;
@@ -37,6 +45,7 @@ struct memfd_inode {
 		struct {
 			mutex_t	lock;
 			int	fdstore_id;
+			unsigned int pending_seals;
 		};
 	};
 };
@@ -92,6 +101,10 @@ static int dump_memfd_inode(int fd, struct memfd_inode *inode,
 	mie.size = st->st_size;
 	mie.shmid = shmid;
 
+	mie.seals = fcntl(fd, F_GET_SEALS);
+	if (mie.seals == -1)
+		goto out;
+
 	if (pb_write_one(img, &mie, PB_MEMFD_INODE))
 		goto out;
 
@@ -187,6 +200,8 @@ struct memfd_info {
 	struct memfd_inode	*inode;
 };
 
+static int memfd_open_inode(struct memfd_inode *inode);
+
 static struct memfd_inode *memfd_alloc_inode(int id)
 {
 	struct memfd_inode *inode;
@@ -202,6 +217,7 @@ static struct memfd_inode *memfd_alloc_inode(int id)
 	inode->id = id;
 	mutex_init(&inode->lock);
 	inode->fdstore_id = -1;
+	inode->pending_seals = 0;
 
 	list_add_tail(&inode->list, &memfd_inodes);
 	return inode;
@@ -223,7 +239,16 @@ static int memfd_open_inode_nocache(struct memfd_inode *inode)
 	if (pb_read_one(img, &mie, PB_MEMFD_INODE) < 0)
 		goto out;
 
-	fd = memfd_create(mie->name, 0);
+	if (mie->seals == F_SEAL_SEAL) {
+		inode->pending_seals = 0;
+		flags = 0;
+	} else {
+		/* Seals are applied later due to F_SEAL_FUTURE_WRITE */
+		inode->pending_seals = mie->seals;
+		flags = MFD_ALLOW_SEALING;
+	}
+
+	fd = memfd_create(mie->name, flags);
 	if (fd < 0) {
 		pr_perror("Can't create memfd:%s", mie->name);
 		goto out;
@@ -401,3 +426,35 @@ struct file_desc *collect_memfd(u32 id) {
 
 	return fdesc;
 }
+
+int apply_memfd_seals(void)
+{
+	/*
+	 * We apply the seals after all the mappings are done because the seal
+	 * F_SEAL_FUTURE_WRITE prevents future write access (added in
+	 * Linux 5.1). Thus we must make sure all writable mappings are opened
+	 * before applying this seal.
+	 */
+
+	int ret, fd;
+	struct memfd_inode *inode;
+
+	list_for_each_entry(inode, &memfd_inodes, list) {
+		if (!inode->pending_seals)
+			continue;
+
+		fd = memfd_open_inode(inode);
+		if (fd < 0)
+			return -1;
+
+		ret = fcntl(fd, F_ADD_SEALS, inode->pending_seals);
+		close(fd);
+
+		if (ret < 0) {
+			pr_perror("Cannot apply seals on memfd");
+			return -1;
+		}
+	}
+
+	return 0;
+}
diff --git a/images/memfd.proto b/images/memfd.proto
index 8eccd6f4f..546ffc2ab 100644
--- a/images/memfd.proto
+++ b/images/memfd.proto
@@ -17,4 +17,5 @@ message memfd_inode_entry {
 	required uint32		gid		= 3;
 	required uint64		size		= 4;
 	required uint32		shmid		= 5;
+	required uint32		seals		= 6 [(criu).flags = "seals.flags"];
 };
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index a89850a1d..40a6036cf 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -124,6 +124,14 @@ rfile_flags_map = [
     ('O_CLOEXEC', 0o02000000),
 ]
 
+seals_flags_map = [
+    ('F_SEAL_SEAL', 0x0001),
+    ('F_SEAL_SHRINK', 0x0002),
+    ('F_SEAL_GROW', 0x0004),
+    ('F_SEAL_WRITE', 0x0008),
+    ('F_SEAL_FUTURE_WRITE', 0x0010),
+]
+
 pmap_flags_map = [
     ('PE_PARENT', 1 << 0),
     ('PE_LAZY', 1 << 1),
@@ -136,6 +144,7 @@ flags_maps = {
     'mmap.status': mmap_status_map,
     'rfile.flags': rfile_flags_map,
     'pmap.flags': pmap_flags_map,
+    'seals.flags': seals_flags_map,
 }
 
 gen_maps = {

From b133c375ad2d21cf6a1a9e96e7dab3741c966fbe Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Tue, 4 Feb 2020 16:39:53 +0000
Subject: [PATCH 0158/1854] inhfd_test: add support for non-pair files

File pairs naturally block on read() until the write() happen (or the
writer is closed). This is not the case for regular files, so we
take extra precaution for these.

Also cleaned-up an extra my_file.close()

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 test/zdtm.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 3fc57ba55..4110b5142 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -691,9 +691,14 @@ class inhfd_test:
             i = 0
             for _, peer_file in self.__files:
                 msg = self.__get_message(i)
-                my_file.close()
                 try:
-                    data = peer_file.read(16)
+                    # File pairs naturally block on read() until the write()
+                    # happen (or the writer is closed). This is not the case for
+                    # regular files, so we loop.
+                    data = b''
+                    while not data:
+                        data = peer_file.read(16)
+                        time.sleep(0.1)
                 except Exception as e:
                     print("Unable to read a peer file: %s" % e)
                     sys.exit(1)

From 2dd105b8dfb23399e18ab4e3f7d13b00c19ad910 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 20 Dec 2019 21:56:38 -0500
Subject: [PATCH 0159/1854] memfd: add tests

Testing for all the memfd features, namely support for CR of:
* the same fd shared by multiple processes
* the same file shared by multiple processes
* the memfd content
* file flags and fd flags
* mmaps, MAP_SHARED and MAP_PRIVATE
* seals, excluding F_SEAL_FUTURE_WRITE because this feature only exists
  in recent kernels (5.1 and up)
* inherited fd

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 test/inhfd/memfd.py           |  28 +++++++++
 test/inhfd/memfd.py.checkskip |   7 +++
 test/inhfd/memfd.py.desc      |   1 +
 test/zdtm/static/Makefile     |   4 ++
 test/zdtm/static/memfd00.c    | 103 ++++++++++++++++++++++++++++++
 test/zdtm/static/memfd01.c    | 114 ++++++++++++++++++++++++++++++++++
 test/zdtm/static/memfd02.c    |  87 ++++++++++++++++++++++++++
 test/zdtm/static/memfd03.c    |  97 +++++++++++++++++++++++++++++
 8 files changed, 441 insertions(+)
 create mode 100755 test/inhfd/memfd.py
 create mode 100755 test/inhfd/memfd.py.checkskip
 create mode 100644 test/inhfd/memfd.py.desc
 create mode 100644 test/zdtm/static/memfd00.c
 create mode 100644 test/zdtm/static/memfd01.c
 create mode 100644 test/zdtm/static/memfd02.c
 create mode 100644 test/zdtm/static/memfd03.c

diff --git a/test/inhfd/memfd.py b/test/inhfd/memfd.py
new file mode 100755
index 000000000..d9ce01e41
--- /dev/null
+++ b/test/inhfd/memfd.py
@@ -0,0 +1,28 @@
+import os
+import ctypes
+libc = ctypes.CDLL(None)
+
+
+def memfd_create(name, flags):
+    return libc.memfd_create(name.encode('utf8'), flags)
+
+
+def create_fds():
+    def create_memfd_pair(name):
+        fd = memfd_create(name, 0)
+        fw = open('/proc/self/fd/{}'.format(fd), 'wb')
+        fr = open('/proc/self/fd/{}'.format(fd), 'rb')
+        os.close(fd)
+        return (fw, fr)
+
+    return [create_memfd_pair("name{}".format(i)) for i in range(10)]
+
+
+def filename(f):
+    name = os.readlink('/proc/self/fd/{}'.format(f.fileno()))
+    name = name.replace(' (deleted)', '')
+    return name
+
+
+def dump_opts(sockf):
+    return []
diff --git a/test/inhfd/memfd.py.checkskip b/test/inhfd/memfd.py.checkskip
new file mode 100755
index 000000000..252778969
--- /dev/null
+++ b/test/inhfd/memfd.py.checkskip
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+import ctypes
+libc = ctypes.CDLL(None)
+
+# libc may not have memfd_create (e.g., centos on travis)
+libc.memfd_create("test".encode('utf8'), 0)
diff --git a/test/inhfd/memfd.py.desc b/test/inhfd/memfd.py.desc
new file mode 100644
index 000000000..10666c823
--- /dev/null
+++ b/test/inhfd/memfd.py.desc
@@ -0,0 +1 @@
+{ 'flavor': 'h' }
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 5ca05ee9e..5afd18cd6 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -220,6 +220,10 @@ TST_NOFILE	:=				\
 		child_subreaper			\
 		child_subreaper_existing_child	\
 		child_subreaper_and_reparent	\
+		memfd00				\
+		memfd01				\
+		memfd02				\
+		memfd03				\
 #		jobctl00			\
 
 ifneq ($(ARCH),arm)
diff --git a/test/zdtm/static/memfd00.c b/test/zdtm/static/memfd00.c
new file mode 100644
index 000000000..6b56eca01
--- /dev/null
+++ b/test/zdtm/static/memfd00.c
@@ -0,0 +1,103 @@
+#include <fcntl.h>
+#include <linux/memfd.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/vfs.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "memfd file descriptor";
+const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+static int _memfd_create(const char *name, unsigned int flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
+
+int main(int argc, char *argv[])
+{
+	int fd, fl_flags1, fl_flags2, fd_flags1, fd_flags2;
+	struct statfs statfs1, statfs2;
+	off_t pos1, pos2;
+	char buf[5];
+
+	test_init(argc, argv);
+
+	fd = _memfd_create("somename", MFD_CLOEXEC);
+	if (fd < 0)
+		err(1, "Can't call memfd_create");
+
+	if (fcntl(fd, F_SETFL, O_APPEND) < 0)
+		err(1, "Can't get fl flags");
+
+	if ((fl_flags1 = fcntl(fd, F_GETFL)) == -1)
+		err(1, "Can't get fl flags");
+
+	if ((fd_flags1 = fcntl(fd, F_GETFD)) == -1)
+		err(1, "Can't get fd flags");
+
+	if (fstatfs(fd, &statfs1) < 0)
+		err(1, "statfs issue");
+
+	if (write(fd, "hello", 5) != 5)
+		err(1, "write error");
+
+	pos1 = 3;
+	if (lseek(fd, pos1, SEEK_SET) < 0)
+		err(1, "seek error");
+
+	test_daemon();
+	test_waitsig();
+
+	if ((fl_flags2 = fcntl(fd, F_GETFL)) == -1)
+		err(1, "Can't get fl flags");
+
+	if (fl_flags1 != fl_flags2) {
+		fail("fl flags differs");
+		return 1;
+	}
+
+	if ((fd_flags2 = fcntl(fd, F_GETFD)) == -1)
+		err(1, "Can't get fd flags");
+
+	if (fd_flags1 != fd_flags2) {
+		fail("fd flags differs");
+		return 1;
+	}
+
+	if (fstatfs(fd, &statfs2) < 0)
+		err(1, "statfs issue");
+
+	if (statfs1.f_type != statfs2.f_type) {
+		fail("statfs.f_type differs");
+		return 1;
+	}
+
+	pos2 = lseek(fd, 0, SEEK_CUR);
+	if (pos1 != pos2) {
+		fail("position differs");
+		return 1;
+	}
+
+	if (pread(fd, buf, sizeof(buf), 0) != sizeof(buf)) {
+		fail("read problem");
+		return 1;
+	}
+
+	if (memcmp(buf, "hello", sizeof(buf))) {
+		fail("content mismatch");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/memfd01.c b/test/zdtm/static/memfd01.c
new file mode 100644
index 000000000..7a7853642
--- /dev/null
+++ b/test/zdtm/static/memfd01.c
@@ -0,0 +1,114 @@
+#include <fcntl.h>
+#include <linux/memfd.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/vfs.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "memfd with different file pointer";
+const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+static int _memfd_create(const char *name, unsigned int flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
+
+int main(int argc, char *argv[])
+{
+	pid_t pid, pid_child;
+	int fd, ret, status;
+	task_waiter_t t;
+
+	test_init(argc, argv);
+
+	task_waiter_init(&t);
+
+	fd = _memfd_create("somename", MFD_CLOEXEC);
+	if (fd < 0)
+		err(1, "Can't call memfd_create");
+
+	pid = getpid();
+
+	pid_child = fork();
+	if (pid_child < 0)
+		err(1, "Can't fork");
+
+	if (!pid_child) {
+		char fdpath[100];
+		char buf[1];
+		int fl_flags1, fl_flags2, fd_flags1, fd_flags2;
+
+		snprintf(fdpath, sizeof(fdpath), "/proc/%d/fd/%d", pid, fd);
+		/*
+		 * We pass O_LARGEFILE because in compat mode, our file
+		 * descriptor does not get O_LARGEFILE automatically, but the
+		 * restorer using non-compat open() is forced O_LARGEFILE.
+		 * This creates a flag difference, which we don't want to deal
+		 * with this at the moment.
+		 */
+		fd = open(fdpath, O_RDONLY | O_LARGEFILE);
+		if (fd < 0)
+			err(1, "Can't open memfd via proc");
+
+		if ((fl_flags1 = fcntl(fd, F_GETFL)) == -1)
+			err(1, "Can't get fl flags");
+
+		if ((fd_flags1 = fcntl(fd, F_GETFD)) == -1)
+			err(1, "Can't get fd flags");
+
+		task_waiter_complete(&t, 1);
+		// checkpoint-restore happens here
+		task_waiter_wait4(&t, 2);
+
+		if (read(fd, buf, 1) != 1)
+			err(1, "Can't read");
+
+		if ((fl_flags2 = fcntl(fd, F_GETFL)) == -1)
+			err(1, "Can't get fl flags");
+
+		if (fl_flags1 != fl_flags2)
+			err(1, "fl flags differs");
+
+		if ((fd_flags2 = fcntl(fd, F_GETFD)) == -1)
+			err(1, "Can't get fd flags");
+
+		if (fd_flags1 != fd_flags2)
+			err(1, "fd flags differs");
+
+		if (buf[0] != 'x')
+			err(1, "Read incorrect");
+
+		return 0;
+	}
+
+	task_waiter_wait4(&t, 1);
+
+	test_daemon();
+	test_waitsig();
+
+	if (write(fd, "x", 1) != 1)
+		err(1, "Can't write");
+
+	task_waiter_complete(&t, 2);
+
+	ret = wait(&status);
+	if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status)) {
+		kill(pid, SIGKILL);
+		fail("child had issue");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/memfd02.c b/test/zdtm/static/memfd02.c
new file mode 100644
index 000000000..1843e9c9a
--- /dev/null
+++ b/test/zdtm/static/memfd02.c
@@ -0,0 +1,87 @@
+#include <fcntl.h>
+#include <linux/memfd.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/vfs.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "memfd mmap";
+const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+static int _memfd_create(const char *name, unsigned int flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
+
+int main(int argc, char *argv[])
+{
+#define LEN 6
+	int fd;
+	void *addr_shared, *addr_private;
+	char buf[LEN];
+
+	test_init(argc, argv);
+
+	fd = _memfd_create("somename", MFD_CLOEXEC);
+	if (fd < 0)
+		err(1, "Can't call memfd_create");
+
+	if (ftruncate(fd, LEN) < 0)
+		err(1, "Can't truncate");
+
+	addr_shared = mmap(NULL, LEN, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+	if (addr_shared == MAP_FAILED)
+		err(1, "Can't mmap");
+
+	write(fd, "write1", LEN);
+
+	addr_private = mmap(NULL, LEN, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+	if (addr_private == MAP_FAILED)
+		err(1, "Can't mmap");
+
+	test_daemon();
+	test_waitsig();
+
+	if (memcmp(addr_shared, "write1", LEN)) {
+		fail("content mismatch (shared)");
+		return 1;
+	}
+
+	strcpy(addr_shared, "write2");
+
+	if (pread(fd, buf, LEN, 0) != LEN) {
+		fail("read problem");
+		return 1;
+	}
+
+	if (memcmp(buf, "write2", LEN)) {
+		fail("content mismatch (shared)");
+		return 1;
+	}
+
+	if (memcmp(addr_private, "write2", LEN)) {
+		fail("content mismatch (private)");
+		return 1;
+	}
+
+	strcpy(addr_private, "write3");
+
+	if (memcmp(addr_shared, "write2", LEN)) {
+		fail("content mismatch (shared)");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/memfd03.c b/test/zdtm/static/memfd03.c
new file mode 100644
index 000000000..faedf9383
--- /dev/null
+++ b/test/zdtm/static/memfd03.c
@@ -0,0 +1,97 @@
+#include <fcntl.h>
+#include <linux/memfd.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/vfs.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "memfd seals";
+const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+static int _memfd_create(const char *name, unsigned int flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
+
+
+#ifndef F_LINUX_SPECIFIC_BASE
+# define F_LINUX_SPECIFIC_BASE	1024
+#endif
+
+#ifndef F_ADD_SEALS
+  #define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#endif
+
+#ifndef F_GET_SEALS
+  #define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+#endif
+
+
+#ifndef F_SEAL_SEAL
+#define F_SEAL_SEAL	0x0001	/* prevent further seals from being set */
+#define F_SEAL_SHRINK	0x0002	/* prevent file from shrinking */
+#define F_SEAL_GROW	0x0004	/* prevent file from growing */
+#define F_SEAL_WRITE	0x0008	/* prevent writes */
+#endif
+
+int main(int argc, char *argv[])
+{
+#define LEN 5
+	int fd, fd2;
+	void *addr_write, *addr_read;
+	char fdpath[100];
+
+	test_init(argc, argv);
+
+	fd = _memfd_create("somename", MFD_ALLOW_SEALING | MFD_CLOEXEC);
+	if (fd < 0)
+		err(1, "Can't call memfd_create");
+
+	if (write(fd, "hello", LEN) != LEN)
+		err(1, "Can't write");
+
+	if (fcntl(fd, F_ADD_SEALS, F_SEAL_WRITE) < 0)
+		err(1, "Can't add seals");
+
+	test_daemon();
+	test_waitsig();
+
+	snprintf(fdpath, sizeof(fdpath), "/proc/self/fd/%d", fd);
+	fd2 = open(fdpath, O_RDWR);
+	if (fd2 < 0)
+		err(1, "Can't open memfd via proc");
+
+	if (fcntl(fd, F_GET_SEALS) != F_SEAL_WRITE) {
+		fail("Seals are different");
+		return 1;
+	}
+
+	addr_write = mmap(NULL, LEN, PROT_WRITE, MAP_SHARED, fd2, 0);
+	if (addr_write != MAP_FAILED) {
+		fail("Should not be able to get write access");
+		return 1;
+	}
+
+	addr_read = mmap(NULL, 1, PROT_READ, MAP_PRIVATE, fd2, 0);
+	if (addr_read == MAP_FAILED)
+		err(1, "Can't mmap");
+
+	if (memcmp(addr_read, "hello", LEN)) {
+		fail("Mapping has bad data");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}

From ec116449544cd2f062b7523c2eadc6d791baa0ac Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 23 Jan 2020 16:39:28 +0000
Subject: [PATCH 0160/1854] criu: Use strlcpy() instead of strncpy()

gcc8 in Fedora Rawhide has a new useful warning:

> criu/img-remote.c: In function 'push_snapshot_id':
> criu/img-remote.c:1099:2: error: 'strncpy' specified bound 4096 equals destination size [-Werror=stringop-truncation]
>  1099 |  strncpy(rn.snapshot_id, snapshot_id, PATH_MAX);
>       |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From man 3 strncpy:
> Warning:  If there is no null byte among the first n bytes of src,
> the string placed in dest will not be null-terminated.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/files-reg.c | 3 ++-
 criu/files.c     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index b0dad78e6..c2a55aeb3 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -33,6 +33,7 @@
 #include "namespaces.h"
 #include "proc_parse.h"
 #include "pstree.h"
+#include "string.h"
 #include "fault-injection.h"
 #include "external.h"
 #include "memfd.h"
@@ -457,7 +458,7 @@ static int open_remap_ghost(struct reg_file_info *rfi,
 	gf->remap.rmnt_id = rfi->rfe->mnt_id;
 
 	if (S_ISDIR(gfe->mode))
-		strncpy(gf->remap.rpath, rfi->path, PATH_MAX);
+		strlcpy(gf->remap.rpath, rfi->path, PATH_MAX);
 	else
 		ghost_path(gf->remap.rpath, PATH_MAX, rfi, rpe);
 
diff --git a/criu/files.c b/criu/files.c
index 789b08a4c..f7963bf54 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -45,6 +45,7 @@
 #include "autofs.h"
 #include "parasite.h"
 #include "parasite-syscall.h"
+#include "string.h"
 #include "kerndat.h"
 #include "fdstore.h"
 
@@ -291,8 +292,7 @@ static int fixup_overlayfs(struct fd_parms *p, struct fd_link *link)
 		char buf[PATH_MAX];
 		int n;
 
-		strncpy(buf, link->name, PATH_MAX);
-		buf[PATH_MAX - 1] = 0;
+		strlcpy(buf, link->name, PATH_MAX);
 		n = snprintf(link->name, PATH_MAX, "%s/%s", m->mountpoint, buf + 2);
 		if (n >= PATH_MAX) {
 			pr_err("Not enough space to replace %s\n", buf);

From bc49927bbc28b41e4b2759d42dc24f1d66e22df3 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 6 Feb 2020 18:01:00 +0000
Subject: [PATCH 0161/1854] criu: Make use strlcpy() to copy into allocated
 strings

strncpy() with n == strlen(src) won't put NULL-terminator in dst.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/cr-restore.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index f50448cd2..85105a18e 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -77,6 +77,7 @@
 #include "fdstore.h"
 #include "string.h"
 #include "memfd.h"
+#include "string.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"

From 3eab205bae1d31f00922d1e717a1cd56c1cb7177 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 6 Feb 2020 21:20:20 -0800
Subject: [PATCH 0162/1854] python: sort imports

202 Additional newline in a group of imports.
I100 Import statements are in the wrong order.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/inhfd/memfd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/inhfd/memfd.py b/test/inhfd/memfd.py
index d9ce01e41..b06e35068 100755
--- a/test/inhfd/memfd.py
+++ b/test/inhfd/memfd.py
@@ -1,5 +1,5 @@
-import os
 import ctypes
+import os
 libc = ctypes.CDLL(None)
 
 

From 38793699e7f0e97d14b6b17e83e8bc071c3ce283 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 21 Feb 2020 12:14:38 +0300
Subject: [PATCH 0163/1854] test/jenkins: remove empty line at the end of file

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/jenkins/criu-fault.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 4e3790e59..c27dd3738 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -27,4 +27,3 @@ fi
 ./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/static/maps01 --fault 132 -f h || fail
-

From cdd08cdff8692aad9d05dd83e2ab24379cd83393 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Wed, 26 Feb 2020 12:25:37 +0200
Subject: [PATCH 0164/1854] uffd: use userns_call() to execute
 ioctl(UFFDIO_API)

In the recent kernels the userfaultfd support for FORK events is limited to
CAP_SYS_PTRACE. That causes the followong error when the ioctl(UFFDIO_API)
is executed from non-privilieged userns:

Error (criu/uffd.c:273): uffd: Failed to get uffd API: Operation not permitted

Wrapping the call to ioctl(UFFDIO_API) in userns_call() resolves the issue.

Fixes: #964
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 criu/uffd.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index c47b35b1f..99373c04d 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -40,6 +40,7 @@
 #include "tls.h"
 #include "fdstore.h"
 #include "util.h"
+#include "namespaces.h"
 
 #undef  LOG_PREFIX
 #define LOG_PREFIX "uffd: "
@@ -254,6 +255,13 @@ bool uffd_noncooperative(void)
 	return (kdat.uffd_features & features) == features;
 }
 
+static int uffd_api_ioctl(void *arg, int fd, pid_t pid)
+{
+	struct uffdio_api *uffdio_api = arg;
+
+	return ioctl(fd, UFFDIO_API, uffdio_api);
+}
+
 int uffd_open(int flags, unsigned long *features)
 {
 	struct uffdio_api uffdio_api = { 0 };
@@ -269,7 +277,8 @@ int uffd_open(int flags, unsigned long *features)
 	if (features)
 		uffdio_api.features = *features;
 
-	if (ioctl(uffd, UFFDIO_API, &uffdio_api)) {
+	if (userns_call(uffd_api_ioctl, 0, &uffdio_api, sizeof(uffdio_api),
+			uffd)) {
 		pr_perror("Failed to get uffd API");
 		goto err;
 	}

From 48f3b6516b384f9c4f240aff76f671697198884b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Tue, 18 Feb 2020 19:45:08 +0000
Subject: [PATCH 0165/1854] criu(8): Add documentation for --enable-fs

This option was introduced with:

https://github.com/checkpoint-restore/criu/commit/e2c38245c613df5e36dcf0253c7652f928e46abf

v2: (comment from Pavel Tikhomirov) --enable-fs does not fit with
--external dev[]:, see try_resolve_ext_mount, external dev mounts
only determined for FSTYPE__UNSUPPORTED.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 Documentation/criu.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index a6b9f7fae..0ac29103a 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -90,6 +90,19 @@ The following levels are available:
 *-L*, *--libdir* 'path'::
     Path to plugins directory.
 
+*--enable-fs* ['fs'[,'fs'...]]::
+    Specify a comma-separated list of filesystem names that should
+    be auto-detected. The value 'all' enables auto-detection for
+    all filesystems.
++
+Note: This option is not safe, use at your own risk.
+Auto-detecting a filesystem mount assumes that the mountpoint can
+be restored with *mount(src, mountpoint, flags, options)*. When used,
+*dump* is expected to always succeed if a mountpoint is to be
+auto-detected, however *restore* may fail (or do something wrong)
+if the assumption for restore logic is incorrect. This option is
+not compatable with *--external* *dev*.
+
 *--action-script* 'script'::
     Add an external action script to be executed at certain stages.
     The environment variable *CRTOOLS_SCRIPT_ACTION* is available

From bb032cc3e218c4aee5394642caa59be3909b259a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Tue, 18 Feb 2020 19:53:36 +0000
Subject: [PATCH 0166/1854] criu(8): Convert tabs to spaces

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 Documentation/criu.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 0ac29103a..ab63e461c 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -477,7 +477,7 @@ The 'mode' may be one of the following:
 
     *soft*:::   Restore cgroup properties if only cgroup has been created
                 by *criu*, otherwise do not restore properties. This is the
-		default if mode is unspecified.
+                default if mode is unspecified.
 
     *full*:::   Always restore all cgroups and their properties.
 
@@ -575,17 +575,17 @@ check* always checks Category 1 features unless *--feature* is specified
 which only checks a specified feature.
 
 *Category 1*::: Absolutely required. These are features like support for
-		*/proc/PID/map_files*, *NETLINK_SOCK_DIAG* socket
-		monitoring, */proc/sys/kernel/ns_last_pid* etc.
+        */proc/PID/map_files*, *NETLINK_SOCK_DIAG* socket
+        monitoring, */proc/sys/kernel/ns_last_pid* etc.
 
 *Category 2*::: Required only for specific cases. These are features
-		like AIO remap, */dev/net/tun* and others that are only
-		required if a process being dumped or restored
-		is using those.
+        like AIO remap, */dev/net/tun* and others that are only
+        required if a process being dumped or restored
+        is using those.
 
 *Category 3*::: Experimental. These are features like *task-diag* that
-		are used for experimental purposes (mostly
-		during development).
+        are used for experimental purposes (mostly
+        during development).
 
 If there are no errors or warnings, *criu* prints "Looks good." and its
 exit code is 0.

From 563c5e5e763949de7b1c48bd04c777db17d768e1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2020 09:10:49 +0000
Subject: [PATCH 0167/1854] seize: prepare for cgroupv2 freezer

The cgroupv2 freezer does not return the same strings as v1. Instead of
THAWED and FROZEN v2 returns 0 and 1 (strings). This prepares the seize
code to use 0 and 1 everywhere and THAWED and FROZEN only for v1
specific code paths.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/seize.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index fd314666f..14cd82417 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -30,7 +30,14 @@ static const char frozen[]	= "FROZEN";
 static const char freezing[]	= "FREEZING";
 static const char thawed[]	= "THAWED";
 
-static const char *get_freezer_state(int fd)
+enum freezer_state {
+	FREEZER_ERROR = -1,
+	THAWED,
+	FROZEN,
+	FREEZING
+};
+
+static enum freezer_state get_freezer_state(int fd)
 {
 	char state[32];
 	int ret;
@@ -52,15 +59,15 @@ static const char *get_freezer_state(int fd)
 
 	pr_debug("freezer.state=%s\n", state);
 	if (strcmp(state, frozen) == 0)
-		return frozen;
+		return FROZEN;
 	else if (strcmp(state, freezing) == 0)
-		return freezing;
+		return FREEZING;
 	else if (strcmp(state, thawed) == 0)
-		return thawed;
+		return THAWED;
 
 	pr_err("Unknown freezer state: %s\n", state);
 err:
-	return NULL;
+	return FREEZER_ERROR;
 }
 
 static bool freezer_thawed;
@@ -98,7 +105,7 @@ static int freezer_restore_state(void)
 static int processes_to_wait;
 static pid_t *processes_to_wait_pids;
 
-static int seize_cgroup_tree(char *root_path, const char *state)
+static int seize_cgroup_tree(char *root_path, enum freezer_state state)
 {
 	DIR *dir;
 	struct dirent *de;
@@ -134,7 +141,7 @@ static int seize_cgroup_tree(char *root_path, const char *state)
 		if (!compel_interrupt_task(pid)) {
 			pr_debug("SEIZE %d: success\n", pid);
 			processes_to_wait++;
-		} else if (state == frozen) {
+		} else if (state == FROZEN) {
 			char buf[] = "/proc/XXXXXXXXXX/exe";
 			struct stat st;
 
@@ -332,7 +339,7 @@ static int freeze_processes(void)
 {
 	int fd, exit_code = -1;
 	char path[PATH_MAX];
-	const char *state = thawed;
+	enum freezer_state state = THAWED;
 
 	static const unsigned long step_ms = 100;
 	unsigned long nr_attempts = (opts.timeout * 1000000) / step_ms;
@@ -361,11 +368,11 @@ static int freeze_processes(void)
 		return -1;
 	}
 	state = get_freezer_state(fd);
-	if (!state) {
+	if (state == FREEZER_ERROR) {
 		close(fd);
 		return -1;
 	}
-	if (state == thawed) {
+	if (state == THAWED) {
 		freezer_thawed = true;
 
 		lseek(fd, 0, SEEK_SET);
@@ -384,12 +391,12 @@ static int freeze_processes(void)
 		 */
 		for (; i <= nr_attempts; i++) {
 			state = get_freezer_state(fd);
-			if (!state) {
+			if (state == FREEZER_ERROR) {
 				close(fd);
 				return -1;
 			}
 
-			if (state == frozen)
+			if (state == FROZEN)
 				break;
 			if (alarm_timeouted())
 				goto err;

From 9f902e0c6b74ce2d7abf6a632d3abdf6b1370751 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2020 09:53:51 +0000
Subject: [PATCH 0168/1854] seize: factor out opening and writing the freezer
 state

More preparations for cgroupv2 freezer. Factor our the freezer state
opening and writing to have one location where to handle v1 and v2
differences.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/seize.c | 81 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index 14cd82417..b53707e44 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -20,6 +20,7 @@
 #include "seccomp.h"
 #include "seize.h"
 #include "stats.h"
+#include "string.h"
 #include "xmalloc.h"
 #include "util.h"
 #include <compel/compel.h>
@@ -77,13 +78,39 @@ const char *get_real_freezer_state(void)
 	return freezer_thawed ? thawed : frozen;
 }
 
-static int freezer_restore_state(void)
+static int freezer_write_state(int fd, enum freezer_state new_state)
 {
-	int fd;
-	char path[PATH_MAX];
+	char state[32];
+	int ret;
 
-	if (!opts.freeze_cgroup || freezer_thawed)
-		return 0;
+	if (new_state == THAWED) {
+		if (strlcpy(state, thawed, sizeof(state)) >= sizeof(state))
+			return -1;
+	} else if (new_state == FROZEN) {
+		if (strlcpy(state, frozen, sizeof(state)) >= sizeof(state))
+			return -1;
+	} else {
+		return -1;
+	}
+
+	ret = lseek(fd, 0, SEEK_SET);
+	if (ret < 0) {
+		pr_perror("Unable to seek freezer FD");
+		return -1;
+	}
+	if (write(fd, state, sizeof(state)) != sizeof(state)) {
+		pr_perror("Unable to %s tasks",
+				(new_state == THAWED) ? "thaw" : "freeze");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int freezer_open(void)
+{
+	char path[PATH_MAX];
+	int fd;
 
 	snprintf(path, sizeof(path), "%s/freezer.state", opts.freeze_cgroup);
 	fd = open(path, O_RDWR);
@@ -92,13 +119,24 @@ static int freezer_restore_state(void)
 		return -1;
 	}
 
-	if (write(fd, frozen, sizeof(frozen)) != sizeof(frozen)) {
-		pr_perror("Unable to freeze tasks");
-		close(fd);
+	return fd;
+}
+
+static int freezer_restore_state(void)
+{
+	int fd;
+	int ret;
+
+	if (!opts.freeze_cgroup || freezer_thawed)
+		return 0;
+
+	fd = freezer_open();
+	if (fd < 0)
 		return -1;
-	}
+
+	ret = freezer_write_state(fd, FROZEN);
 	close(fd);
-	return 0;
+	return ret;
 }
 
 /* A number of tasks in a freezer cgroup which are not going to be dumped */
@@ -338,7 +376,6 @@ static int log_unfrozen_stacks(char *root)
 static int freeze_processes(void)
 {
 	int fd, exit_code = -1;
-	char path[PATH_MAX];
 	enum freezer_state state = THAWED;
 
 	static const unsigned long step_ms = 100;
@@ -361,12 +398,10 @@ static int freeze_processes(void)
 	pr_debug("freezing processes: %lu attempts with %lu ms steps\n",
 		 nr_attempts, step_ms);
 
-	snprintf(path, sizeof(path), "%s/freezer.state", opts.freeze_cgroup);
-	fd = open(path, O_RDWR);
-	if (fd < 0) {
-		pr_perror("Unable to open %s", path);
+	fd = freezer_open();
+	if (fd < 0)
 		return -1;
-	}
+
 	state = get_freezer_state(fd);
 	if (state == FREEZER_ERROR) {
 		close(fd);
@@ -375,9 +410,7 @@ static int freeze_processes(void)
 	if (state == THAWED) {
 		freezer_thawed = true;
 
-		lseek(fd, 0, SEEK_SET);
-		if (write(fd, frozen, sizeof(frozen)) != sizeof(frozen)) {
-			pr_perror("Unable to freeze tasks");
+		if (freezer_write_state(fd, FROZEN)) {
 			close(fd);
 			return -1;
 		}
@@ -427,13 +460,9 @@ static int freeze_processes(void)
 	}
 
 err:
-	if (exit_code == 0 || freezer_thawed) {
-		lseek(fd, 0, SEEK_SET);
-		if (write(fd, thawed, sizeof(thawed)) != sizeof(thawed)) {
-			pr_perror("Unable to thaw tasks");
-			exit_code = -1;
-		}
-	}
+	if (exit_code == 0 || freezer_thawed)
+		exit_code = freezer_write_state(fd, THAWED);
+
 	if (close(fd)) {
 		pr_perror("Unable to thaw tasks");
 		return -1;

From 10416bcbcb3c2ab4732971083f99d9390f8d168b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2020 13:38:42 +0000
Subject: [PATCH 0169/1854] seize: support cgroup v2 freezer

This adds support to checkpoint processes using the cgroup v2 freezer.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/seize.c | 150 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 133 insertions(+), 17 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index b53707e44..0ba2d9b1d 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -38,7 +38,10 @@ enum freezer_state {
 	FREEZING
 };
 
-static enum freezer_state get_freezer_state(int fd)
+/* Track if we are running on cgroup v2 system. */
+static bool cgroup_v2 = false;
+
+static enum freezer_state get_freezer_v1_state(int fd)
 {
 	char state[32];
 	int ret;
@@ -71,6 +74,70 @@ err:
 	return FREEZER_ERROR;
 }
 
+static enum freezer_state get_freezer_v2_state(int fd)
+{
+	int exit_code = FREEZER_ERROR;
+	char path[PATH_MAX];
+	FILE *event;
+	char state;
+	int ret;
+
+	/*
+	 * cgroupv2 freezer uses cgroup.freeze to control the state. The file
+	 * can return 0 or 1. 1 means the cgroup is frozen; 0 means it is not
+	 * frozen. Writing 1 to an unfrozen cgroup can freeze it. Freezing can
+	 * take some time and if the cgroup has finished freezing can be
+	 * seen in cgroup.events: frozen 0|1.
+	 */
+
+	ret = lseek(fd, 0, SEEK_SET);
+	if (ret < 0) {
+		pr_perror("Unable to seek freezer FD");
+		goto out;
+	}
+	ret = read(fd, &state, 1);
+	if (ret <= 0) {
+		pr_perror("Unable to read from freezer FD");
+		goto out;
+	}
+	pr_debug("cgroup.freeze=%c\n", state);
+	if (state == '0') {
+		exit_code = THAWED;
+		goto out;
+	}
+
+	snprintf(path, sizeof(path), "%s/cgroup.events", opts.freeze_cgroup);
+	event = fopen(path, "r");
+	if (event == NULL) {
+		pr_perror("Unable to open %s", path);
+		goto out;
+	}
+	while (fgets(path, sizeof(path), event)) {
+		if (strncmp(path, "frozen", 6) != 0) {
+			continue;
+		} else if (strncmp(path, "frozen 0", 8) == 0) {
+			exit_code = FREEZING;
+			goto close;
+		} else if (strncmp(path, "frozen 1", 8) == 0) {
+			exit_code = FROZEN;
+			goto close;
+		}
+	}
+
+	pr_err("Unknown freezer state: %c\n", state);
+close:
+	fclose(event);
+out:
+	return exit_code;
+}
+
+static enum freezer_state get_freezer_state(int fd)
+{
+	if (cgroup_v2)
+		return get_freezer_v2_state(fd);
+	return get_freezer_v1_state(fd);
+}
+
 static bool freezer_thawed;
 
 const char *get_real_freezer_state(void)
@@ -80,15 +147,23 @@ const char *get_real_freezer_state(void)
 
 static int freezer_write_state(int fd, enum freezer_state new_state)
 {
-	char state[32];
+	char state[32] = {0};
 	int ret;
 
 	if (new_state == THAWED) {
-		if (strlcpy(state, thawed, sizeof(state)) >= sizeof(state))
-			return -1;
+		if (cgroup_v2)
+			state[0] = '0';
+		else
+			if (strlcpy(state, thawed, sizeof(state)) >=
+					sizeof(state))
+				return -1;
 	} else if (new_state == FROZEN) {
-		if (strlcpy(state, frozen, sizeof(state)) >= sizeof(state))
-			return -1;
+		if (cgroup_v2)
+			state[0] = '1';
+		else
+			if (strlcpy(state, frozen, sizeof(state)) >=
+					sizeof(state))
+				return -1;
 	} else {
 		return -1;
 	}
@@ -109,10 +184,13 @@ static int freezer_write_state(int fd, enum freezer_state new_state)
 
 static int freezer_open(void)
 {
+	const char freezer_v1[] = "freezer.state";
+	const char freezer_v2[] = "cgroup.freeze";
 	char path[PATH_MAX];
 	int fd;
 
-	snprintf(path, sizeof(path), "%s/freezer.state", opts.freeze_cgroup);
+	snprintf(path, sizeof(path), "%s/%s", opts.freeze_cgroup,
+			cgroup_v2 ? freezer_v2 : freezer_v1);
 	fd = open(path, O_RDWR);
 	if (fd < 0) {
 		pr_perror("Unable to open %s", path);
@@ -139,6 +217,22 @@ static int freezer_restore_state(void)
 	return ret;
 }
 
+static FILE *freezer_open_thread_list(char *root_path)
+{
+	char path[PATH_MAX];
+	FILE *f;
+
+	snprintf(path, sizeof(path), "%s/%s", root_path,
+			cgroup_v2 ? "cgroup.threads" : "tasks");
+	f = fopen(path, "r");
+	if (f == NULL) {
+		pr_perror("Unable to open %s", path);
+		return NULL;
+	}
+
+	return f;
+}
+
 /* A number of tasks in a freezer cgroup which are not going to be dumped */
 static int processes_to_wait;
 static pid_t *processes_to_wait_pids;
@@ -154,12 +248,10 @@ static int seize_cgroup_tree(char *root_path, enum freezer_state state)
 	 * New tasks can appear while a freezer state isn't
 	 * frozen, so we need to catch all new tasks.
 	 */
-	snprintf(path, sizeof(path), "%s/tasks", root_path);
-	f = fopen(path, "r");
-	if (f == NULL) {
-		pr_perror("Unable to open %s", path);
+	f = freezer_open_thread_list(root_path);
+	if (f == NULL)
 		return -1;
-	}
+
 	while (fgets(path, sizeof(path), f)) {
 		pid_t pid;
 		int ret;
@@ -306,12 +398,10 @@ static int log_unfrozen_stacks(char *root)
 	char path[PATH_MAX];
 	FILE *f;
 
-	snprintf(path, sizeof(path), "%s/tasks", root);
-	f = fopen(path, "r");
-	if (f == NULL) {
-		pr_perror("Unable to open %s", path);
+	f = freezer_open_thread_list(root);
+	if (f == NULL)
 		return -1;
-	}
+
 	while (fgets(path, sizeof(path), f)) {
 		pid_t pid;
 		int ret, stack;
@@ -820,6 +910,27 @@ err_close:
 	return -1;
 }
 
+static int cgroup_version(void)
+{
+	char path[PATH_MAX];
+
+	snprintf(path, sizeof(path), "%s/freezer.state", opts.freeze_cgroup);
+	if (access(path, F_OK) == 0) {
+		cgroup_v2 = false;
+		return 0;
+	}
+
+	snprintf(path, sizeof(path), "%s/cgroup.freeze", opts.freeze_cgroup);
+	if (access(path, F_OK) == 0) {
+		cgroup_v2 = true;
+		return 0;
+	}
+
+	pr_err("Neither a cgroupv1 (freezer.state) or cgroupv2 (cgroup.freeze) control file found.\n");
+
+	return -1;
+}
+
 int collect_pstree(void)
 {
 	pid_t pid = root_item->pid->real;
@@ -835,6 +946,11 @@ int collect_pstree(void)
 	 */
 	alarm(opts.timeout);
 
+	if (opts.freeze_cgroup && cgroup_version())
+		goto err;
+
+	pr_debug("Detected cgroup V%d freezer\n", cgroup_v2 ? 2 : 1);
+
 	if (opts.freeze_cgroup && freeze_processes())
 		goto err;
 

From 4129d3262ad2d2ac6875c2c86d565528969d8e72 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 5 Feb 2020 09:39:32 +0000
Subject: [PATCH 0170/1854] cgroup2: add minimal cgroup2 support

The runc test cases are (sometimes) mounting a cgroup inside of the
container. For these tests to succeed, let CRIU know that cgroup2 exists
and how to restore such a mount.

This does not fix any specific cgroup2 settings, it just enables CRIU to
mount cgroup2 in the restored container.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/filesystems.c | 5 +++++
 images/mnt.proto   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/criu/filesystems.c b/criu/filesystems.c
index 1e4550b37..d76b18291 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -747,6 +747,11 @@ static struct fstype fstypes[] = {
 		.code = FSTYPE__CGROUP,
 		.parse = cgroup_parse,
 		.sb_equal = cgroup_sb_equal,
+	}, {
+		.name = "cgroup2",
+		.code = FSTYPE__CGROUP2,
+		.parse = cgroup_parse,
+		.sb_equal = cgroup_sb_equal,
 	}, {
 		.name = "aufs",
 		.code = FSTYPE__AUFS,
diff --git a/images/mnt.proto b/images/mnt.proto
index 4160acbf6..8983395ae 100644
--- a/images/mnt.proto
+++ b/images/mnt.proto
@@ -28,6 +28,8 @@ enum fstype {
 	// RPC_PIPEFS		= 20;
 	// NFS			= 21;
 	// NFS4			= 22;
+
+	CGROUP2			= 23;
 };
 
 message mnt_entry {

From ffe0896ed01790e62cd617cf01bc6a4076fa4e87 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 1 Mar 2020 04:26:12 +0300
Subject: [PATCH 0171/1854] fs: use __open_proc instead of open("/proc/...",
 ... )

Processes can run in a mount namespace without /proc.

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/files-reg.c | 4 +---
 criu/memfd.c     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index c2a55aeb3..0d0076666 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -778,14 +778,12 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st, dev_t phys_de
 
 	if (S_ISREG(st->st_mode)) {
 		int fd, ret;
-		char lpath[PSFDS];
 
 		/*
 		 * Reopen file locally since it may have no read
 		 * permissions when drained
 		 */
-		sprintf(lpath, "/proc/self/fd/%d", _fd);
-		fd = open(lpath, O_RDONLY);
+		fd = open_proc(PROC_SELF, "fd/%d", _fd);
 		if (fd < 0) {
 			pr_perror("Can't open ghost original file");
 			goto err_out;
diff --git a/criu/memfd.c b/criu/memfd.c
index d17c10fb7..30ccdf22c 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -299,7 +299,6 @@ static int memfd_open_inode(struct memfd_inode *inode)
 
 int memfd_open(struct file_desc *d, u32 *fdflags)
 {
-	char lpath[PSFDS];
 	struct memfd_info *mfi;
 	MemfdFileEntry *mfe;
 	int fd, _fd;
@@ -318,14 +317,13 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 		goto err;
 
 	/* Reopen the fd with original permissions */
-	sprintf(lpath, "/proc/self/fd/%d", fd);
 	flags = fdflags ? *fdflags : mfe->flags;
 	/*
 	 * Ideally we should call compat version open() to not force the
 	 * O_LARGEFILE file flag with regular open(). It doesn't seem that
 	 * important though.
 	 */
-	_fd = open(lpath, flags);
+	_fd = __open_proc(getpid(), 0, flags, "fd/%d", fd);
 	if (_fd < 0) {
 		pr_perror("Can't reopen memfd id=%d", mfe->id);
 		goto err;

From fce196d88df8363666922ac2fa2d6e23bb774289 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 29 Feb 2020 09:51:33 +0300
Subject: [PATCH 0172/1854] memfd: don't corrupt a state of the dumped fd

Right now, criu uses a dumped fd to dump content of a memfd "file".

Here are two reasons why we should not do this:
* a state of a dumped fd doesn't have to be changed, but now criu calls
  lseek on it. This can be workarounded by using pread.
* a dumped descriptor can be write-only.

Reported-by: Mr Jenkins
Cc: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/memfd.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 30ccdf22c..983e01b38 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -119,6 +119,7 @@ out:
 static struct memfd_inode *dump_unique_memfd_inode(int lfd, const char *name, const struct stat *st)
 {
 	struct memfd_inode *inode;
+	int fd;
 
 	list_for_each_entry(inode, &memfd_inodes, list)
 		if ((inode->dev == st->st_dev) && (inode->ino == st->st_ino))
@@ -132,11 +133,19 @@ static struct memfd_inode *dump_unique_memfd_inode(int lfd, const char *name, co
 	inode->ino = st->st_ino;
 	inode->id = memfd_inode_ids++;
 
-	if (dump_memfd_inode(lfd, inode, name, st)) {
+	fd = open_proc(PROC_SELF, "fd/%d", lfd);
+	if (fd < 0) {
 		xfree(inode);
 		return NULL;
 	}
 
+	if (dump_memfd_inode(fd, inode, name, st)) {
+		close(fd);
+		xfree(inode);
+		return NULL;
+	}
+	close(fd);
+
 	list_add_tail(&inode->list, &memfd_inodes);
 
 	return inode;

From 58fd63042c925c6422f5453b9a13147ebd2a6769 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 1 Mar 2020 01:04:20 +0300
Subject: [PATCH 0173/1854] zdtm/inhfd: force python to read new data from a
 file

python 2.7 doesn't call the read system call if it's read file to the
end once. The next seek allows to workaround this problem.

inhfd/memfd.py hangs due to this issue.

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 4110b5142..0bd7b84cc 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -697,7 +697,10 @@ class inhfd_test:
                     # regular files, so we loop.
                     data = b''
                     while not data:
-                        data = peer_file.read(16)
+                        # In python 2.7, peer_file.read() doesn't call the read
+                        # system call if it's read file to the end once. The
+                        # next seek allows to workaround this problem.
+                        data = os.read(peer_file.fileno(), 16)
                         time.sleep(0.1)
                 except Exception as e:
                     print("Unable to read a peer file: %s" % e)

From f167d1f4e9eb24dfbda077746f25cfdf8a2b59b9 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Fri, 7 Feb 2020 15:59:45 +0300
Subject: [PATCH 0174/1854] fown: Don't fail on dumping files opened with
 O_PATH

O_PATH opened files are special: they have empty
file operations in kernel space, so there not that
much we can do with them, even setting position is
not allowed. Same applies to a signal number for
owner settings.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Co-developed-by: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
---
 criu/files-reg.c    | 16 +++++++---
 criu/files.c        |  5 ++-
 criu/pie/parasite.c | 75 +++++++++++++++++++++++++++++----------------
 3 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 0d0076666..d1d1ee5af 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1776,11 +1776,17 @@ static int do_open_reg(int ns_root_fd, struct reg_file_info *rfi, void *arg)
 	if (fd < 0)
 		return fd;
 
-	if ((rfi->rfe->pos != -1ULL) &&
-			lseek(fd, rfi->rfe->pos, SEEK_SET) < 0) {
-		pr_perror("Can't restore file pos");
-		close(fd);
-		return -1;
+	/*
+	 * O_PATH opened files carry empty fops in kernel,
+	 * just ignore positioning at all.
+	 */
+	if (!(rfi->rfe->flags & O_PATH)) {
+		if (rfi->rfe->pos != -1ULL &&
+		    lseek(fd, rfi->rfe->pos, SEEK_SET) < 0) {
+			pr_perror("Can't restore file pos");
+			close(fd);
+			return -1;
+		}
 	}
 
 	return fd;
diff --git a/criu/files.c b/criu/files.c
index f7963bf54..3f1d77931 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -399,7 +399,10 @@ static int fill_fd_params(struct pid *owner_pid, int fd, int lfd,
 	pr_info("%d fdinfo %d: pos: %#16"PRIx64" flags: %16o/%#x\n",
 			owner_pid->real, fd, p->pos, p->flags, (int)p->fd_flags);
 
-	ret = fcntl(lfd, F_GETSIG, 0);
+	if (p->flags & O_PATH)
+		ret = 0;
+	else
+		ret = fcntl(lfd, F_GETSIG, 0);
 	if (ret < 0) {
 		pr_perror("Can't get owner signum on %d", lfd);
 		return -1;
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 387a976da..64b5bbb3e 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -317,15 +317,60 @@ grps_err:
 	return -1;
 }
 
+static int fill_fds_fown(int fd, struct fd_opts *p)
+{
+	int flags, ret;
+	struct f_owner_ex owner_ex;
+	uint32_t v[2];
+
+	/*
+	 * For O_PATH opened files there is no owner at all.
+	 */
+	flags = sys_fcntl(fd, F_GETFL, 0);
+	if (flags < 0) {
+		pr_err("fcntl(%d, F_GETFL) -> %d\n", fd, flags);
+		return -1;
+	}
+	if (flags & O_PATH) {
+		p->fown.pid = 0;
+		return 0;
+	}
+
+	ret = sys_fcntl(fd, F_GETOWN_EX, (long)&owner_ex);
+	if (ret) {
+		pr_err("fcntl(%d, F_GETOWN_EX) -> %d\n", fd, ret);
+		return -1;
+	}
+
+	/*
+	 * Simple case -- nothing is changed.
+	 */
+	if (owner_ex.pid == 0) {
+		p->fown.pid = 0;
+		return 0;
+	}
+
+	ret = sys_fcntl(fd, F_GETOWNER_UIDS, (long)&v);
+	if (ret) {
+		pr_err("fcntl(%d, F_GETOWNER_UIDS) -> %d\n", fd, ret);
+		return -1;
+	}
+
+	p->fown.uid	 = v[0];
+	p->fown.euid	 = v[1];
+	p->fown.pid_type = owner_ex.type;
+	p->fown.pid	 = owner_ex.pid;
+
+	return 0;
+}
+
 static int fill_fds_opts(struct parasite_drain_fd *fds, struct fd_opts *opts)
 {
 	int i;
 
 	for (i = 0; i < fds->nr_fds; i++) {
-		int flags, fd = fds->fds[i], ret;
+		int flags, fd = fds->fds[i];
 		struct fd_opts *p = opts + i;
-		struct f_owner_ex owner_ex;
-		uint32_t v[2];
 
 		flags = sys_fcntl(fd, F_GETFD, 0);
 		if (flags < 0) {
@@ -335,30 +380,8 @@ static int fill_fds_opts(struct parasite_drain_fd *fds, struct fd_opts *opts)
 
 		p->flags = (char)flags;
 
-		ret = sys_fcntl(fd, F_GETOWN_EX, (long)&owner_ex);
-		if (ret) {
-			pr_err("fcntl(%d, F_GETOWN_EX) -> %d\n", fd, ret);
+		if (fill_fds_fown(fd, p))
 			return -1;
-		}
-
-		/*
-		 * Simple case -- nothing is changed.
-		 */
-		if (owner_ex.pid == 0) {
-			p->fown.pid = 0;
-			continue;
-		}
-
-		ret = sys_fcntl(fd, F_GETOWNER_UIDS, (long)&v);
-		if (ret) {
-			pr_err("fcntl(%d, F_GETOWNER_UIDS) -> %d\n", fd, ret);
-			return -1;
-		}
-
-		p->fown.uid	 = v[0];
-		p->fown.euid	 = v[1];
-		p->fown.pid_type = owner_ex.type;
-		p->fown.pid	 = owner_ex.pid;
 	}
 
 	return 0;

From 8b9c1f4c5bebd501f544cfe81534e4386f85246f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 7 Feb 2020 15:59:55 +0300
Subject: [PATCH 0175/1854] zdtm: add a test for files opened with O_PATH

On these test without the patch ("fown: Don't fail on dumping files opened
wit O_PATH") we trigger these errors:

Error (criu/pie/parasite.c:340): fcntl(4, F_GETOWN_EX) -> -9
Error (criu/files.c:403): Can't get owner signum on 18: Bad file descriptor
Error (criu/files-reg.c:1887): Can't restore file pos: Bad file descriptor

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
---
 test/zdtm/static/Makefile     |  1 +
 test/zdtm/static/opath_file.c | 95 +++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 test/zdtm/static/opath_file.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 5afd18cd6..035b8fa9c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -363,6 +363,7 @@ TST_DIR		=				\
 		private_bind_propagation	\
 		ghost_on_rofs			\
 		overmounted_file		\
+		opath_file			\
 
 TST_DIR_FILE	=				\
 		chroot				\
diff --git a/test/zdtm/static/opath_file.c b/test/zdtm/static/opath_file.c
new file mode 100644
index 000000000..602a5af27
--- /dev/null
+++ b/test/zdtm/static/opath_file.c
@@ -0,0 +1,95 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+
+#include "zdtmtst.h"
+
+#define TEST_FILE "test_file"
+#define BUF_SIZE 4096
+#define fdinfo_field(str, field)        !strncmp(str, field":", sizeof(field))
+#define pr_debug(format, arg...) test_msg("DBG: %s:%d: " format, __FILE__, __LINE__, ## arg)
+
+const char *test_doc	= "Check open file with O_PATH preserved";
+const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "directory name", 1);
+
+struct fdinfo {
+	int flags;
+};
+
+static int parse_self_fdinfo(int fd, struct fdinfo *fi)
+{
+	char path[PATH_MAX], line[BUF_SIZE];
+	FILE *file;
+	int ret = -1;
+	unsigned long long val;
+
+	snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd);
+	file = fopen(path, "r");
+	if (!file) {
+		pr_perror("fopen");
+		return -1;
+	}
+
+	while (fgets(line, sizeof(line), file)) {
+		if (fdinfo_field(line, "flags")) {
+			if (sscanf(line, "%*s %llu", &val) != 1) {
+				pr_err("failed to read flags: %s", line);
+				goto fail;
+			}
+			pr_debug("Open flags = %llu\n", val);
+			fi->flags = val;
+			ret = 0;
+			break;
+		}
+	}
+fail:
+	fclose(file);
+	return ret;
+}
+
+int main(int argc, char **argv)
+{
+	char test_file[PATH_MAX];
+	struct fdinfo fi;
+	int fd;
+
+	test_init(argc, argv);
+
+	if (mkdir(dirname, 0700)) {
+		pr_perror("can't make directory %s", dirname);
+		exit(1);
+	}
+
+	snprintf(test_file, sizeof(test_file), "%s/%s", dirname, TEST_FILE);
+	fd = creat(test_file, 0644);
+	if (fd == -1) {
+		pr_perror("cat't create %s", test_file);
+		return 1;
+	}
+	close(fd);
+
+	fd = open(test_file, O_PATH);
+	if (fd == -1) {
+		pr_perror("cat't open file %s with O_PATH", test_file);
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (parse_self_fdinfo(fd, &fi))
+		return 1;
+
+	if (!(fi.flags & O_PATH)) {
+		fail("File lost O_PATH open flag");
+		return 1;
+	}
+
+	close(fd);
+	pass();
+	return 0;
+}

From 1936608ce42283b6c5aa007c883092bb2776af4b Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 7 Feb 2020 16:00:01 +0300
Subject: [PATCH 0176/1854] files: allow dumping opened symlinks

To really open symlink file and not the regular file below it, one needs
to do open with O_PATH|O_NOFOLLOW flags. Looks like systemd started to
open /etc/localtime symlink this way sometimes, and before that nobody
actually used this and thus we never supported this in CRIU.

Error (criu/files-ext.c:96): Can't dump file 11 of that type [120777]
(unknown /etc/localtime)

Looks like it is quiet easy to support, as c/r of symlink file is almost
the same as c/r of regular one. We need to only make fstatat not
following links in check_path_remap.

Also we need to take into account support of ghost symlinks.

Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
Co-developed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c        | 88 +++++++++++++++++++++++++++++++++++++----
 criu/files.c            |  3 +-
 images/ghost-file.proto |  2 +
 3 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index d1d1ee5af..b53e9b080 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -282,19 +282,53 @@ static int mkreg_ghost(char *path, GhostFileEntry *gfe, struct cr_img *img)
 	return ret;
 }
 
+static int mklnk_ghost(char *path, GhostFileEntry *gfe)
+{
+	if (!gfe->symlnk_target) {
+		pr_err("Ghost symlink target is NULL for %s. Image from old CRIU?\n", path);
+		return -1;
+	}
+
+	if (symlink(gfe->symlnk_target, path) < 0) {
+		/*
+		 * ENOENT case is OK
+		 * Take a look closer on create_ghost() function
+		 */
+		if (errno != ENOENT)
+			pr_perror("symlink(%s, %s) failed", gfe->symlnk_target, path);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int ghost_apply_metadata(const char *path, GhostFileEntry *gfe)
 {
 	struct timeval tv[2];
 	int ret = -1;
 
-	if (chown(path, gfe->uid, gfe->gid) < 0) {
-		pr_perror("Can't reset user/group on ghost %s", path);
-		goto err;
-	}
+	if (S_ISLNK(gfe->mode)) {
+		if (lchown(path, gfe->uid, gfe->gid) < 0) {
+			pr_perror("Can't reset user/group on ghost %s", path);
+			goto err;
+		}
 
-	if (chmod(path, gfe->mode)) {
-		pr_perror("Can't set perms %o on ghost %s", gfe->mode, path);
-		goto err;
+		/*
+		 * We have no lchmod() function, and fchmod() will fail on
+		 * O_PATH | O_NOFOLLOW fd. Yes, we have fchmodat()
+		 * function and flag AT_SYMLINK_NOFOLLOW described in
+		 * man 2 fchmodat, but it is not currently implemented. %)
+		 */
+	} else {
+		if (chown(path, gfe->uid, gfe->gid) < 0) {
+			pr_perror("Can't reset user/group on ghost %s", path);
+			goto err;
+		}
+
+		if (chmod(path, gfe->mode)) {
+			pr_perror("Can't set perms %o on ghost %s", gfe->mode, path);
+			goto err;
+		}
 	}
 
 	if (gfe->atim) {
@@ -353,6 +387,9 @@ again:
 	} else if (S_ISDIR(gfe->mode)) {
 		if ((ret = mkdirpat(AT_FDCWD, path, gfe->mode)) < 0)
 			msg = "Can't make ghost dir";
+	} else if (S_ISLNK(gfe->mode)) {
+		if ((ret = mklnk_ghost(path, gfe)) < 0)
+			msg = "Can't create ghost symlink";
 	} else {
 		if ((ret = mkreg_ghost(path, gfe, img)) < 0)
 			msg = "Can't create ghost regfile";
@@ -740,6 +777,7 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st, dev_t phys_de
 	int exit_code = -1;
 	GhostFileEntry gfe = GHOST_FILE_ENTRY__INIT;
 	Timeval atim = TIMEVAL__INIT, mtim = TIMEVAL__INIT;
+	char pathbuf[PATH_MAX];
 
 	pr_info("Dumping ghost file contents (id %#x)\n", id);
 
@@ -773,6 +811,36 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st, dev_t phys_de
 		gfe.size = st->st_size;
 	}
 
+	/*
+	 * We set gfe.symlnk_target only if we need to dump
+	 * symlink content, otherwise we leave it NULL.
+	 * It will be taken into account on restore in mklnk_ghost function.
+	 */
+	if (S_ISLNK(st->st_mode)) {
+		ssize_t ret;
+
+		/*
+		 * We assume that _fd opened with O_PATH | O_NOFOLLOW
+		 * flags because S_ISLNK(st->st_mode). With current kernel version,
+		 * it's looks like correct assumption in any case.
+		 */
+		ret = readlinkat(_fd, "", pathbuf, sizeof(pathbuf) - 1);
+		if (ret < 0) {
+			pr_perror("Can't readlinkat");
+			goto err_out;
+		}
+
+		pathbuf[ret] = 0;
+
+		if (ret != st->st_size) {
+			pr_err("Buffer for readlinkat is too small: ret %zd, st_size %"PRId64", buf %u %s\n",
+					ret, st->st_size, PATH_MAX, pathbuf);
+			goto err_out;
+		}
+
+		gfe.symlnk_target = pathbuf;
+	}
+
 	if (pb_write_one(img, &gfe, PB_GHOST_FILE))
 		goto err_out;
 
@@ -1116,6 +1184,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 	int ret, mntns_root;
 	struct stat pst;
 	const struct stat *ost = &parms->stat;
+	int flags = 0;
 
 	if (parms->fs_type == PROC_SUPER_MAGIC) {
 		/* The file points to /proc/pid/<foo> where pid is a dead
@@ -1212,7 +1281,10 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 	if (mntns_root < 0)
 		return -1;
 
-	ret = fstatat(mntns_root, rpath, &pst, 0);
+	if (S_ISLNK(parms->stat.st_mode))
+		flags = AT_SYMLINK_NOFOLLOW;
+
+	ret = fstatat(mntns_root, rpath, &pst, flags);
 	if (ret < 0) {
 		/*
 		 * Linked file, but path is not accessible (unless any
diff --git a/criu/files.c b/criu/files.c
index 3f1d77931..f6ba39a30 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -545,7 +545,8 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 		return do_dump_gen_file(&p, lfd, ops, e);
 	}
 
-	if (S_ISREG(p.stat.st_mode) || S_ISDIR(p.stat.st_mode)) {
+	if (S_ISREG(p.stat.st_mode) || S_ISDIR(p.stat.st_mode) ||
+		S_ISLNK(p.stat.st_mode)) {
 		if (fill_fdlink(lfd, &p, &link))
 			return -1;
 
diff --git a/images/ghost-file.proto b/images/ghost-file.proto
index eda466451..0576089fd 100644
--- a/images/ghost-file.proto
+++ b/images/ghost-file.proto
@@ -15,6 +15,8 @@ message ghost_file_entry {
 	optional timeval	mtim		= 8;
 	optional bool		chunks		= 9;
 	optional uint64		size		= 10;
+	/* this field makes sense only when S_ISLNK(mode) */
+	optional string		symlnk_target	= 11;
 }
 
 message ghost_chunk_entry {

From 73e0ed3b8ae2a87d4232dd4a39ce3dab4edb1f24 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 7 Feb 2020 16:00:05 +0300
Subject: [PATCH 0177/1854] zdtm: add a test on open symlink migration

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Co-Developed-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com>
Signed-off-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com>
Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
---
 test/zdtm/static/Makefile     |   3 +
 test/zdtm/static/opath_file.c |   2 +-
 test/zdtm/static/symlink.c    | 102 ++++++++++++++++++++++++++++++++++
 test/zdtm/static/symlink01.c  |   1 +
 4 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/static/symlink.c
 create mode 120000 test/zdtm/static/symlink01.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 035b8fa9c..ee69612c7 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -364,6 +364,8 @@ TST_DIR		=				\
 		ghost_on_rofs			\
 		overmounted_file		\
 		opath_file			\
+		symlink				\
+		symlink01			\
 
 TST_DIR_FILE	=				\
 		chroot				\
@@ -539,6 +541,7 @@ clone_fs:		LDLIBS += -pthread
 # we have to explicitly specify both .o and .d for this case:
 netns_sub_veth.o netns_sub_veth.d: CPPFLAGS += $(call pkg-cflags, libnl-3.0)
 netns_sub_veth:		LDLIBS += $(call pkg-libs, libnl-route-3.0 libnl-3.0)
+symlink01:		CFLAGS += -DZDTM_UNLINK_SYMLINK
 
 socket-tcp-fin-wait1:	CFLAGS += -D ZDTM_TCP_FIN_WAIT1
 socket-tcp-fin-wait2:	CFLAGS += -D ZDTM_TCP_FIN_WAIT2
diff --git a/test/zdtm/static/opath_file.c b/test/zdtm/static/opath_file.c
index 602a5af27..943f4eddb 100644
--- a/test/zdtm/static/opath_file.c
+++ b/test/zdtm/static/opath_file.c
@@ -36,7 +36,7 @@ static int parse_self_fdinfo(int fd, struct fdinfo *fi)
 
 	while (fgets(line, sizeof(line), file)) {
 		if (fdinfo_field(line, "flags")) {
-			if (sscanf(line, "%*s %llu", &val) != 1) {
+			if (sscanf(line, "%*s %llo", &val) != 1) {
 				pr_err("failed to read flags: %s", line);
 				goto fail;
 			}
diff --git a/test/zdtm/static/symlink.c b/test/zdtm/static/symlink.c
new file mode 100644
index 000000000..074c80052
--- /dev/null
+++ b/test/zdtm/static/symlink.c
@@ -0,0 +1,102 @@
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <limits.h>
+
+#include "zdtmtst.h"
+
+#define TEST_FILE "test_file"
+#define TEST_SYMLINK "test_symlink"
+
+const char *test_doc	= "Check open symlink preserved";
+const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "directory name", 1);
+
+int main(int argc, char **argv)
+{
+	char test_symlink[PATH_MAX];
+	char test_file[PATH_MAX];
+	char pathbuf[PATH_MAX];
+	struct stat stb, sta;
+	int ret, fd;
+
+	test_init(argc, argv);
+
+	if (mkdir(dirname, 0700)) {
+		pr_perror("can't make directory %s", dirname);
+		exit(1);
+	}
+
+	snprintf(test_file, sizeof(test_file), "%s/%s", dirname, TEST_FILE);
+	ret = creat(test_file, 0644);
+	if (ret == -1) {
+		pr_perror("cat't create %s", test_file);
+		return 1;
+	}
+	close(ret);
+
+	snprintf(test_symlink, sizeof(test_symlink), "%s/%s", dirname, TEST_SYMLINK);
+	ret = symlink(test_file, test_symlink);
+	if (ret == -1) {
+		pr_perror("cat't symlink to %s", test_symlink);
+		return 1;
+	}
+
+	fd = open(test_symlink, O_PATH | O_NOFOLLOW);
+	if (fd == -1) {
+		pr_perror("cat't open symlink %s", test_symlink);
+		return 1;
+	}
+
+	ret = fstat(fd, &sta);
+	if (ret == -1) {
+		pr_perror("cat't fstat %s", test_symlink);
+		return 1;
+	}
+
+	if (!S_ISLNK(sta.st_mode)) {
+		pr_perror("file is not symlink %s", test_symlink);
+		return 1;
+	}
+
+#ifdef ZDTM_UNLINK_SYMLINK
+	if (unlink(test_symlink)) {
+		pr_perror("can't unlink symlink %s", test_symlink);
+		return 1;
+	}
+#endif
+
+	test_daemon();
+	test_waitsig();
+
+	ret = fstat(fd, &stb);
+	if (ret == -1) {
+		fail("cat't fstat %s", test_symlink);
+		return 1;
+	}
+
+	if (!S_ISLNK(stb.st_mode)) {
+		fail("file is not symlink %s", test_symlink);
+		return 1;
+	}
+
+	ret = readlinkat(fd, "", pathbuf, sizeof(pathbuf) - 1);
+	if (ret < 0) {
+		fail("Can't readlinkat");
+		return 1;
+	}
+	pathbuf[ret] = 0;
+
+	if (strcmp(test_file, pathbuf)) {
+		fail("symlink points to %s but %s expected", pathbuf, test_file);
+		return 1;
+	}
+
+	close(fd);
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/symlink01.c b/test/zdtm/static/symlink01.c
new file mode 120000
index 000000000..e2d071ea4
--- /dev/null
+++ b/test/zdtm/static/symlink01.c
@@ -0,0 +1 @@
+symlink.c
\ No newline at end of file

From 065ff6f4151805fe50cc881ef506b6ae6407ec57 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 5 Mar 2020 08:30:23 +0300
Subject: [PATCH 0178/1854] zdtm/fifo_loop: don't try to write more than pipe
 size

... otherwise write() can block.

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/transition/fifo_loop.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/zdtm/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
index 2e28320ba..b028c2fd5 100644
--- a/test/zdtm/transition/fifo_loop.c
+++ b/test/zdtm/transition/fifo_loop.c
@@ -39,6 +39,7 @@ int main(int argc, char **argv)
 	int i;
 	uint8_t buf[0x100000];
 	char *file_path;
+	int pipe_size;
 
 	test_init(argc, argv);
 
@@ -104,6 +105,13 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
+	pipe_size = fcntl(writefd, F_SETPIPE_SZ, sizeof(buf));
+	if (pipe_size != sizeof(buf)) {
+		pr_perror("fcntl(writefd, F_GETPIPE_SZ) -> %d", pipe_size);
+		kill(0, SIGKILL);
+		exit(1);
+	}
+
 	file_path = path[i - 1];
 	readfd = open(file_path, O_RDONLY);
 	if (readfd < 0) {
@@ -138,13 +146,14 @@ int main(int argc, char **argv)
 
 		for (p = rbuf, len = wlen; len > 0; p += rlen, len -= rlen) {
 			rlen = read(readfd, p, len);
+			if (rlen < 0 && errno == EINTR) {
+				continue;
+			}
+
 			if (rlen <= 0)
 				break;
 		}
 
-		if (rlen < 0 && errno == EINTR)
-			continue;
-
 		if (len > 0) {
 			fail("read failed: %m\n");
 			ret = 1;

From 62ad2f6095b466bfade1af6fea60bcb0fa1505ec Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 5 Mar 2020 14:45:34 +0000
Subject: [PATCH 0179/1854] criu: Remove compel.h includes

The plan is to remove "compel.h". That file only includes other headers
(which may be not needed). If we aim for one-include-for-compel, we
could instead paste all subheaders into "compel.h".
Rather, I think it's worth to migrate to more fine-grained compel
headers than follow the strategy 'one header to rule them all'.

Further, the header creates problems for cross-compilation: it's
included in files, those are used by host-compel. Which rightfully
confuses compiler/linker as host's definitions for fpu regs/other
platform details get drained into host's compel.

As a first step - stop including "compel.h" in criu.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/aio.c                   | 2 +-
 criu/arch/aarch64/crtools.c  | 2 +-
 criu/arch/arm/crtools.c      | 3 +--
 criu/arch/ppc64/crtools.c    | 2 +-
 criu/arch/s390/crtools.c     | 2 +-
 criu/arch/x86/crtools.c      | 2 +-
 criu/arch/x86/sys-exec-tbl.c | 1 -
 criu/cr-restore.c            | 1 -
 criu/include/proc_parse.h    | 2 +-
 criu/kerndat.c               | 1 -
 criu/mem.c                   | 2 +-
 criu/parasite-syscall.c      | 2 --
 criu/pie/pie-relocs.h        | 2 --
 criu/seize.c                 | 1 -
 criu/vdso.c                  | 1 -
 15 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/criu/aio.c b/criu/aio.c
index 45651f2d3..6ee65d5f4 100644
--- a/criu/aio.c
+++ b/criu/aio.c
@@ -11,7 +11,7 @@
 #include "parasite.h"
 #include "parasite-syscall.h"
 #include "images/mm.pb-c.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define NR_IOEVENTS_IN_NPAGES(npages) ((PAGE_SIZE * (npages) - sizeof(struct aio_ring)) / sizeof(struct io_event))
 
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index f98743a23..76bd1fea7 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -19,7 +19,7 @@
 #include "util.h"
 #include "cpu.h"
 #include "restorer.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))(src)->e
 
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index c216cdc5c..840d489a6 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -18,8 +18,7 @@
 #include "elf.h"
 #include "parasite-syscall.h"
 #include "restorer.h"
-
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))((src)->ARM_##e)
 
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 5a5966ad4..0d9f49c3f 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -17,7 +17,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/s390/crtools.c b/criu/arch/s390/crtools.c
index 238035b76..000b7779f 100644
--- a/criu/arch/s390/crtools.c
+++ b/criu/arch/s390/crtools.c
@@ -17,7 +17,7 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #include "protobuf.h"
 #include "images/core.pb-c.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index e4073c27b..9c8beeedd 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -1,5 +1,5 @@
 #include "compel/asm/fpu.h"
-#include "compel/compel.h"
+#include "compel/infect.h"
 #include "compel/plugins/std/syscall-codes.h"
 #include "cpu.h"
 #include "cr_options.h"
diff --git a/criu/arch/x86/sys-exec-tbl.c b/criu/arch/x86/sys-exec-tbl.c
index 608dc2510..225b8a153 100644
--- a/criu/arch/x86/sys-exec-tbl.c
+++ b/criu/arch/x86/sys-exec-tbl.c
@@ -1,4 +1,3 @@
-#include <compel/compel.h>
 
 static struct syscall_exec_desc sc_exec_table_64[] = {
 #include "sys-exec-tbl-64.c"
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 85105a18e..41146d4ad 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -67,7 +67,6 @@
 #include "timerfd.h"
 #include "action-scripts.h"
 #include "shmem.h"
-#include <compel/compel.h>
 #include "aio.h"
 #include "lsm.h"
 #include "seccomp.h"
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 96a097b3d..fd50ff47e 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 
-#include <compel/compel.h>
+#include "compel/infect.h"
 
 #define PROC_TASK_COMM_LEN	32
 #define PROC_TASK_COMM_LEN_FMT	"(%31s"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 8ac83820b..2ad72c350 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -33,7 +33,6 @@
 #include "net.h"
 #include "tun.h"
 #include <compel/plugins/std/syscall-codes.h>
-#include <compel/compel.h>
 #include "netfilter.h"
 #include "fsnotify.h"
 #include "linux/userfaultfd.h"
diff --git a/criu/mem.c b/criu/mem.c
index 4e110c9e9..55022d94a 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -29,7 +29,7 @@
 #include "pagemap-cache.h"
 #include "fault-injection.h"
 #include "prctl.h"
-#include <compel/compel.h>
+#include "compel/infect-util.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index e5a8194e5..b649d1b51 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -45,8 +45,6 @@
 #include "infect-rpc.h"
 #include "pie/parasite-blob.h"
 
-#include <compel/compel.h>
-
 unsigned long get_exec_start(struct vm_area_list *vmas)
 {
 	struct vma_area *vma_area;
diff --git a/criu/pie/pie-relocs.h b/criu/pie/pie-relocs.h
index 6797486c2..e36126be6 100644
--- a/criu/pie/pie-relocs.h
+++ b/criu/pie/pie-relocs.h
@@ -1,8 +1,6 @@
 #ifndef __PIE_RELOCS_H__
 #define __PIE_RELOCS_H__
 
-#include <compel/compel.h>
-
 #include "common/config.h"
 #include "common/compiler.h"
 
diff --git a/criu/seize.c b/criu/seize.c
index 0ba2d9b1d..f973806d9 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -23,7 +23,6 @@
 #include "string.h"
 #include "xmalloc.h"
 #include "util.h"
-#include <compel/compel.h>
 
 #define NR_ATTEMPTS 5
 
diff --git a/criu/vdso.c b/criu/vdso.c
index 19ba4765d..433a54728 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -20,7 +20,6 @@
 #include "criu-log.h"
 #include "mem.h"
 #include "vma.h"
-#include <compel/compel.h>
 #include <compel/plugins/std/syscall.h>
 
 #ifdef LOG_PREFIX

From 327554ee646ac8c7728981d0607dc42420c3a85a Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 5 Mar 2020 15:00:08 +0000
Subject: [PATCH 0180/1854] compel: Remove compel.h

The file only includes other headers (which may be not needed).
If we aim for one-include-for-compel, we could instead paste all
subheaders into "compel.h".
Rather, I think it's worth to migrate to more fine-grained compel
headers than follow the strategy 'one header to rule them all'.

Further, the header creates problems for cross-compilation: it's
included in files, those are used by host-compel. Which rightfully
confuses compiler/linker as host's definitions for fpu regs/other
platform details get drained into host's compel.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 Documentation/compel.txt                 |  2 +-
 compel/arch/aarch64/src/lib/handle-elf.c |  3 +--
 compel/arch/arm/src/lib/handle-elf.c     |  3 +--
 compel/arch/arm/src/lib/infect.c         |  1 +
 compel/arch/ppc64/src/lib/cpu.c          |  1 +
 compel/arch/ppc64/src/lib/handle-elf.c   |  3 +--
 compel/arch/s390/src/lib/handle-elf.c    |  3 +--
 compel/arch/s390/src/lib/infect.c        |  1 +
 compel/arch/x86/src/lib/handle-elf.c     |  3 +--
 compel/arch/x86/src/lib/infect.c         |  1 +
 compel/include/log.h                     |  3 +--
 compel/include/uapi/compel.h             | 14 --------------
 compel/src/lib/handle-elf.c              |  6 ++----
 compel/src/lib/log.c                     |  3 ---
 compel/src/main.c                        |  2 --
 compel/test/fdspy/spy.c                  |  1 -
 compel/test/infect/spy.c                 |  1 -
 compel/test/rsys/spy.c                   |  2 --
 include/common/scm.h                     |  2 ++
 19 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 compel/include/uapi/compel.h

diff --git a/Documentation/compel.txt b/Documentation/compel.txt
index 744a3b35d..6ccd20861 100644
--- a/Documentation/compel.txt
+++ b/Documentation/compel.txt
@@ -86,7 +86,7 @@ Infecting code
 ~~~~~~~~~~~~~~
 The parasitic code is compiled and converted to a header using *compel*, and included here.
 
-*#include <compel/compel.h>*
+*#include <compel/infect.h>*
 
 *#include "parasite.h"*
 
diff --git a/compel/arch/aarch64/src/lib/handle-elf.c b/compel/arch/aarch64/src/lib/handle-elf.c
index 1c3686c48..1ee65ee2c 100644
--- a/compel/arch/aarch64/src/lib/handle-elf.c
+++ b/compel/arch/aarch64/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/arm/src/lib/handle-elf.c b/compel/arch/arm/src/lib/handle-elf.c
index 8abf8dad1..5b8d00a6f 100644
--- a/compel/arch/arm/src/lib/handle-elf.c
+++ b/compel/arch/arm/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index c17cb9c9b..0053bef58 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
+#include <string.h>
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/processor-flags.h>
 #include "common/page.h"
diff --git a/compel/arch/ppc64/src/lib/cpu.c b/compel/arch/ppc64/src/lib/cpu.c
index 338ab4891..7a3972790 100644
--- a/compel/arch/ppc64/src/lib/cpu.c
+++ b/compel/arch/ppc64/src/lib/cpu.c
@@ -2,6 +2,7 @@
 #include <asm/cputable.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <string.h>
 
 #include "compel-cpu.h"
 
diff --git a/compel/arch/ppc64/src/lib/handle-elf.c b/compel/arch/ppc64/src/lib/handle-elf.c
index 3d4020f59..f29fdc8a3 100644
--- a/compel/arch/ppc64/src/lib/handle-elf.c
+++ b/compel/arch/ppc64/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/s390/src/lib/handle-elf.c b/compel/arch/s390/src/lib/handle-elf.c
index 01a8bf4c8..6ed382c92 100644
--- a/compel/arch/s390/src/lib/handle-elf.c
+++ b/compel/arch/s390/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 7e7d24ce2..5a4675449 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <elf.h>
 #include <compel/plugins/std/syscall-codes.h>
diff --git a/compel/arch/x86/src/lib/handle-elf.c b/compel/arch/x86/src/lib/handle-elf.c
index 62fb28f49..938999b2e 100644
--- a/compel/arch/x86/src/lib/handle-elf.c
+++ b/compel/arch/x86/src/lib/handle-elf.c
@@ -1,6 +1,5 @@
 #include <string.h>
-
-#include "uapi/compel.h"
+#include <errno.h>
 
 #include "handle-elf.h"
 #include "piegen.h"
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 11e7f4c91..9c4abb60c 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -3,6 +3,7 @@
 #include <sys/auxv.h>
 #include <sys/mman.h>
 #include <sys/user.h>
+#include <errno.h>
 
 #include <compel/asm/fpu.h>
 
diff --git a/compel/include/log.h b/compel/include/log.h
index 559f909ce..49e65bb50 100644
--- a/compel/include/log.h
+++ b/compel/include/log.h
@@ -1,8 +1,7 @@
 #ifndef COMPEL_LOG_H__
 #define COMPEL_LOG_H__
 
-#include "uapi/compel/compel.h"
-#include "uapi/compel/loglevels.h"
+#include "uapi/compel/log.h"
 
 #ifndef LOG_PREFIX
 # define LOG_PREFIX
diff --git a/compel/include/uapi/compel.h b/compel/include/uapi/compel.h
deleted file mode 100644
index 318a472da..000000000
--- a/compel/include/uapi/compel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef UAPI_COMPEL_H__
-#define UAPI_COMPEL_H__
-
-#include <errno.h>
-#include <stdarg.h>
-
-#include <compel/asm/infect-types.h>
-#include <compel/handle-elf.h>
-#include <compel/log.h>
-#include <compel/infect-util.h>
-#include <compel/infect-rpc.h>
-#include <compel/infect.h>
-
-#endif /* UAPI_COMPEL_H__ */
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index ca7c53b71..69d5104b6 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdint.h>
+#include <errno.h>
 
 #include <fcntl.h>
 
@@ -12,8 +12,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "uapi/compel.h"
-
 #include "handle-elf.h"
 #include "piegen.h"
 #include "log.h"
@@ -228,7 +226,7 @@ int __handle_elf(void *mem, size_t size)
 	}
 
 	pr_out("/* Autogenerated from %s */\n", opts.input_filename);
-	pr_out("#include <compel/compel.h>\n");
+	pr_out("#include <compel/infect.h>\n");
 
 	for (i = 0; i < symtab_hdr->sh_size / symtab_hdr->sh_entsize; i++) {
 		Elf_Sym *sym = &symbols[i];
diff --git a/compel/src/lib/log.c b/compel/src/lib/log.c
index d195343e4..c86be02c5 100644
--- a/compel/src/lib/log.c
+++ b/compel/src/lib/log.c
@@ -4,11 +4,8 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <unistd.h>
-
 #include <fcntl.h>
 
-#include <compel/compel.h>
-
 #include "log.h"
 
 static unsigned int current_loglevel = COMPEL_DEFAULT_LOGLEVEL;
diff --git a/compel/src/main.c b/compel/src/main.c
index 8b2c8bc8d..36127c357 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -13,8 +13,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "uapi/compel/compel.h"
-
 #include "version.h"
 #include "piegen.h"
 #include "log.h"
diff --git a/compel/test/fdspy/spy.c b/compel/test/fdspy/spy.c
index 258e3ab75..1a373b6bb 100644
--- a/compel/test/fdspy/spy.c
+++ b/compel/test/fdspy/spy.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
-#include <compel/compel.h>
 #include "parasite.h"
 
 #define PARASITE_CMD_GETFD	PARASITE_USER_CMDS
diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index a5aba7308..b5f8b2559 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
-#include <compel/compel.h>
 #include "parasite.h"
 
 #define PARASITE_CMD_INC	PARASITE_USER_CMDS
diff --git a/compel/test/rsys/spy.c b/compel/test/rsys/spy.c
index f5c999d5a..98654efcf 100644
--- a/compel/test/rsys/spy.c
+++ b/compel/test/rsys/spy.c
@@ -4,8 +4,6 @@
 #include <sys/wait.h>
 #include <sys/syscall.h>
 
-#include <compel/compel.h>
-
 static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 {
 	printf("\tLC%u: ", lvl);
diff --git a/include/common/scm.h b/include/common/scm.h
index ab27137b8..a8eb9ec4c 100644
--- a/include/common/scm.h
+++ b/include/common/scm.h
@@ -3,7 +3,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 
 /*
  * Because of kernel doing kmalloc for user data passed

From 18ac1540c4b64108b53fcd8fa3b3df256075e3f6 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 5 Mar 2020 15:04:15 +0000
Subject: [PATCH 0181/1854] travis: Add aarch64-cross test on amd64

Fixes: #924
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 .travis.yml                            |  4 +++
 scripts/build/Dockerfile.aarch64-cross | 45 ++++++++++++++++++++++++++
 scripts/build/Makefile                 |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 scripts/build/Dockerfile.aarch64-cross

diff --git a/.travis.yml b/.travis.yml
index 7c36af006..ffa82f15f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,6 +86,10 @@ jobs:
       arch: amd64
       env: TR_ARCH=armv7-cross
       dist: bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=aarch64-cross
+      dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
new file mode 100644
index 000000000..38229497a
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-cross
@@ -0,0 +1,45 @@
+FROM dockcross/base:latest
+
+# Add the cross compiler sources
+RUN echo "deb http://ftp.us.debian.org/debian/ jessie main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture arm64 && \
+  apt-get install emdebian-archive-keyring
+
+RUN apt-get update && apt-get install -y \
+	crossbuild-essential-arm64	\
+	libc6-dev-arm64-cross		\
+	libc6-arm64-cross		\
+	libbz2-dev:arm64		\
+	libexpat1-dev:arm64		\
+	ncurses-dev:arm64		\
+	libssl-dev:arm64		\
+	protobuf-c-compiler		\
+	protobuf-compiler		\
+	python-protobuf			\
+	libnl-3-dev:arm64		\
+	libprotobuf-dev:arm64		\
+	libnet-dev:arm64		\
+	libprotobuf-c-dev:arm64		\
+	libcap-dev:arm64		\
+	libaio-dev:arm64		\
+	libnl-route-3-dev:arm64
+
+ENV CROSS_TRIPLE=aarch64-linux-gnu
+ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
+	AS=/usr/bin/${CROSS_TRIPLE}-as				\
+	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
+	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
+	ARCH=aarch64
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index d093ce76c..913a86d6c 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -2,7 +2,7 @@ ARCHES := x86_64 fedora-asan fedora-rawhide centos armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
-TARGETS += armv7-cross
+TARGETS += armv7-cross aarch64-cross
 
 all: $(TARGETS) $(TARGETS_CLANG)
 .PHONY: all

From 1f74f8d77087ce06624cb54f2fa70afaf1380103 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 5 Mar 2020 16:43:48 +0000
Subject: [PATCH 0182/1854] travis: Use debian/buster as base for cross build
 tests

Jessie is called 'oldoldstable', migrate to Buster.

Suggested-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 scripts/build/Dockerfile.aarch64-cross | 2 +-
 scripts/build/Dockerfile.armv7-cross   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
index 38229497a..252e0f875 100644
--- a/scripts/build/Dockerfile.aarch64-cross
+++ b/scripts/build/Dockerfile.aarch64-cross
@@ -1,7 +1,7 @@
 FROM dockcross/base:latest
 
 # Add the cross compiler sources
-RUN echo "deb http://ftp.us.debian.org/debian/ jessie main" >> /etc/apt/sources.list && \
+RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
   dpkg --add-architecture arm64 && \
   apt-get install emdebian-archive-keyring
 
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
index 434934aad..17a55561e 100644
--- a/scripts/build/Dockerfile.armv7-cross
+++ b/scripts/build/Dockerfile.armv7-cross
@@ -1,7 +1,7 @@
 FROM dockcross/base:latest
 
 # Add the cross compiler sources
-RUN echo "deb http://ftp.us.debian.org/debian/ jessie main" >> /etc/apt/sources.list && \
+RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
   dpkg --add-architecture armhf && \
   apt-get install emdebian-archive-keyring
 

From b9c8e957d8f198fb47ed9e73a5d5c3727ba4d4cc Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 10 Mar 2020 17:40:57 +0300
Subject: [PATCH 0183/1854] crit-recode: skip (not try to parse) nftables raw
 image

We should ignore (not parse) images that has non-crtool format,
that images has no magic number (RAW_IMAGE_MAGIC equals 0).

nftables images has format compatible with `nft -f /proc/self/fd/0`
input format.

Reported-by: Mr Jenkins
Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
---
 test/crit-recode.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/crit-recode.py b/test/crit-recode.py
index a7dcc7272..adaf33733 100755
--- a/test/crit-recode.py
+++ b/test/crit-recode.py
@@ -47,6 +47,8 @@ for imgf in find.stdout.readlines():
         continue
     if imgf_b.startswith(b'ip6tables-'):
         continue
+    if imgf_b.startswith(b'nftables-'):
+        continue
     if imgf_b.startswith(b'route-'):
         continue
     if imgf_b.startswith(b'route6-'):

From c3ad4942d43524c617bb77345ce8912461b6f9aa Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Thu, 5 Mar 2020 20:46:16 +0200
Subject: [PATCH 0184/1854] travis: add ppc64-cross test on amd64

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 .travis.yml                          |  4 +++
 scripts/build/Dockerfile.ppc64-cross | 45 ++++++++++++++++++++++++++++
 scripts/build/Makefile               |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 scripts/build/Dockerfile.ppc64-cross

diff --git a/.travis.yml b/.travis.yml
index ffa82f15f..9928f16c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,6 +90,10 @@ jobs:
       arch: amd64
       env: TR_ARCH=aarch64-cross
       dist: bionic
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=ppc64-cross
+      dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross
new file mode 100644
index 000000000..44061c558
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-cross
@@ -0,0 +1,45 @@
+FROM dockcross/base:latest
+
+# Add the cross compiler sources
+RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture ppc64el && \
+  apt-get install emdebian-archive-keyring
+
+RUN apt-get update && apt-get install -y \
+	crossbuild-essential-ppc64el	\
+	libc6-dev-ppc64el-cross		\
+	libc6-ppc64el-cross		\
+	libbz2-dev:ppc64el		\
+	libexpat1-dev:ppc64el		\
+	ncurses-dev:ppc64el		\
+	libssl-dev:ppc64el		\
+	protobuf-c-compiler		\
+	protobuf-compiler		\
+	python-protobuf			\
+	libnl-3-dev:ppc64el		\
+	libprotobuf-dev:ppc64el		\
+	libnet-dev:ppc64el		\
+	libprotobuf-c-dev:ppc64el		\
+	libcap-dev:ppc64el		\
+	libaio-dev:ppc64el		\
+	libnl-route-3-dev:ppc64el
+
+ENV CROSS_TRIPLE=powerpc64le-linux-gnu
+ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
+	AS=/usr/bin/${CROSS_TRIPLE}-as				\
+	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
+	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
+	ARCH=ppc64
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 913a86d6c..855539152 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -2,7 +2,7 @@ ARCHES := x86_64 fedora-asan fedora-rawhide centos armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
-TARGETS += armv7-cross aarch64-cross
+TARGETS += armv7-cross aarch64-cross ppc64-cross
 
 all: $(TARGETS) $(TARGETS_CLANG)
 .PHONY: all

From d0d6f1ad108a6bd7eb0e2019aaca7689bff45275 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 21 Mar 2020 10:35:42 -0700
Subject: [PATCH 0185/1854] mailmap: update my email

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .mailmap | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index d8c3f594d..6f046b972 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,8 @@
 Stanislav Kinsbursky <skinsbursky@parallels.com> <skinsbursky@openvz.org>
 Pavel Emelyanov <xemul@parallels.com> <xemul@openvz.org>
-Andrey Vagin <avagin@parallels.com> <avagin@openvz.org>
-Andrey Vagin <avagin@parallels.com> <avagin@gmail.com>
-Andrey Vagin <avagin@parallels.com> Andrew Vagin <avagin@parallels.com>
+Andrei Vagin <avagin@gmail.com> <avagin@openvz.org>
+Andrei Vagin <avagin@gmail.com> <avagin@parallels.com>
+Andrei Vagin <avagin@gmail.com> <avagin@virtuozzo.com>
+Andrei Vagin <avagin@gmail.com> <avagin@odin.com>
+Andrei Vagin <avagin@gmail.com> <avagin@google.com>
 Cyrill Gorcunov <gorcunov@openvz.org> <gorcunov@gmail.com>

From f42ae70c75802787e980715a7ca895eb2b390d06 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 20 Mar 2020 23:12:59 +0000
Subject: [PATCH 0186/1854] make: use cflags/ldflags for config.h detection
 mechanism

The config.h detection scripts should use the provided CFLAGS/LDFLAGS
as it tries to link libnl, libnet, and others.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 scripts/nmk/scripts/utils.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nmk/scripts/utils.mk b/scripts/nmk/scripts/utils.mk
index 0cf216bc0..b9790615c 100644
--- a/scripts/nmk/scripts/utils.mk
+++ b/scripts/nmk/scripts/utils.mk
@@ -3,7 +3,7 @@ ifndef ____nmk_defined__utils
 #
 # Usage: option := $(call try-compile,language,source-to-build,cc-options,cc-defines)
 try-compile = $(shell sh -c 'echo "$(2)" |					\
-        $(CC) $(4) -x $(1) - $(3) -o /dev/null > /dev/null 2>&1 &&		\
+        $(CC) $(CFLAGS) $(LDFLAGS) $(4) -x $(1) - $(3) -o /dev/null > /dev/null 2>&1 &&		\
         echo true || echo false')
 
 #

From fb65ab2b1a47558c2fe92a635630d53b971e5876 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 15 Mar 2020 10:44:14 +0300
Subject: [PATCH 0187/1854] mem: dump shared memory file descriptors

Any shared memroy mapping can be opened via /proc/self/maps_files/.
Such file descriptors look like memfd file descriptors, so
they can be dumped by the same way.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/files.c         |  2 +-
 criu/include/memfd.h |  2 +-
 criu/memfd.c         | 11 +++++++----
 criu/proc_parse.c    | 38 ++++++++++----------------------------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/criu/files.c b/criu/files.c
index f6ba39a30..a1fd26764 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -552,7 +552,7 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 
 		p.link = &link;
 
-		if (is_memfd(p.stat.st_dev, &link.name[1]))
+		if (is_memfd(p.stat.st_dev))
 			ops = &memfd_dump_ops;
 		else if (link.name[1] == '/')
 			ops = &regfile_dump_ops;
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
index 2d8eda545..4189766fd 100644
--- a/criu/include/memfd.h
+++ b/criu/include/memfd.h
@@ -8,7 +8,7 @@
 struct fd_parms;
 struct file_desc;
 
-extern int is_memfd(dev_t dev, const char *path);
+extern int is_memfd(dev_t dev);
 extern int dump_one_memfd_cond(int lfd, u32 *id, struct fd_parms *parms);
 extern const struct fdtype_ops memfd_dump_ops;
 
diff --git a/criu/memfd.c b/criu/memfd.c
index 983e01b38..bca6900cb 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -58,15 +58,14 @@ static LIST_HEAD(memfd_inodes);
 
 static u32 memfd_inode_ids = 1;
 
-int is_memfd(dev_t dev, const char *path)
+int is_memfd(dev_t dev)
 {
 	/*
 	 * TODO When MAP_HUGETLB is used, the file device is not shmem_dev,
 	 * Note that other parts of CRIU have similar issues, see
 	 * is_anon_shmem_map().
 	 */
-	return dev == kdat.shmem_dev &&
-		!strncmp(path, MEMFD_PREFIX, MEMFD_PREFIX_LEN);
+	return dev == kdat.shmem_dev;
 }
 
 static int dump_memfd_inode(int fd, struct memfd_inode *inode,
@@ -167,7 +166,11 @@ static int dump_one_memfd(int lfd, u32 id, const struct fd_parms *p)
 		link = p->link;
 
 	strip_deleted(link);
-	name = &link->name[1+MEMFD_PREFIX_LEN];
+	/* link->name is always started with "." which has to be skipped.  */
+	if (strncmp(link->name + 1, MEMFD_PREFIX, MEMFD_PREFIX_LEN) == 0)
+		name = &link->name[1 + MEMFD_PREFIX_LEN];
+	else
+		name = link->name + 1;
 
 	inode = dump_unique_memfd_inode(lfd, name, &p->stat);
 	if (!inode)
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 468afcdf3..980342870 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -305,7 +305,7 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 
 	vfi_dev = makedev(vfi->dev_maj, vfi->dev_min);
 
-	if (is_memfd(vfi_dev, fname)) {
+	if (is_memfd(vfi_dev)) {
 		struct fd_link link;
 		link.len = strlen(fname);
 		strlcpy(link.name, fname, sizeof(link.name));
@@ -596,39 +596,21 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 			goto err;
 		}
 
-		/*
-		 * /dev/zero stands for anon-shared mapping
-		 * otherwise it's some file mapping.
-		 *
-		 * We treat memfd mappings as regular file mappings because
-		 * their backing can be seen as files, which is easy to
-		 * support. So even though memfd is an anonymous shmem, we
-		 * treat it differently.
-		 * Note: maybe we should revisit this as /proc/map_files/<vma>
-		 * may not always be accessible.
-		 */
-
-		if (is_memfd(st_buf->st_dev, file_path)) {
-			vma_area->e->status |= VMA_AREA_MEMFD;
-			goto normal_file;
-		}
-
-		if (is_anon_shmem_map(st_buf->st_dev)) {
-			if (!(vma_area->e->flags & MAP_SHARED))
-				goto err_bogus_mapping;
+		if (is_anon_shmem_map(st_buf->st_dev) && !strncmp(file_path, "/SYSV", 5)) {
 			vma_area->e->flags  |= MAP_ANONYMOUS;
 			vma_area->e->status |= VMA_ANON_SHARED;
 			vma_area->e->shmid = st_buf->st_ino;
-
-			if (!strncmp(file_path, "/SYSV", 5)) {
-				pr_info("path: %s\n", file_path);
-				vma_area->e->status |= VMA_AREA_SYSVIPC;
-			} else {
+			if (!(vma_area->e->flags & MAP_SHARED))
+				goto err_bogus_mapping;
+			pr_info("path: %s\n", file_path);
+			vma_area->e->status |= VMA_AREA_SYSVIPC;
+		} else {
+			if (is_anon_shmem_map(st_buf->st_dev)) {
+				vma_area->e->status |= VMA_AREA_MEMFD;
 				if (fault_injected(FI_HUGE_ANON_SHMEM_ID))
 					vma_area->e->shmid += FI_HUGE_ANON_SHMEM_ID_BASE;
 			}
-		} else {
-normal_file:
+
 			if (vma_area->e->flags & MAP_PRIVATE)
 				vma_area->e->status |= VMA_FILE_PRIVATE;
 			else

From 10b1d46f674ec458cd1a006eb1b0546bf5a7135c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 19 Mar 2020 09:37:18 +0300
Subject: [PATCH 0188/1854] mem/vma: set VMA_FILE_{PRIVATE,SHARED} if a vma
 file is borrowed

Here is a fast path when two consequent vma-s share the same file.

But one of these vma-s can map a file with MAP_SHARED, but another one
can map it with MAP_PRIVATE and we need to take this into account.
---
 criu/proc_parse.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 980342870..60aba8788 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -584,6 +584,14 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 		vma_area->e->shmid = prev->e->shmid;
 		vma_area->vmst = prev->vmst;
 		vma_area->mnt_id = prev->mnt_id;
+
+		if (!(vma_area->e->status & VMA_AREA_SYSVIPC)) {
+			vma_area->e->status &= ~(VMA_FILE_PRIVATE | VMA_FILE_SHARED);
+			if (vma_area->e->flags & MAP_PRIVATE)
+				vma_area->e->status |= VMA_FILE_PRIVATE;
+			else
+				vma_area->e->status |= VMA_FILE_SHARED;
+		}
 	} else if (*vm_file_fd >= 0) {
 		struct stat *st_buf = vma_area->vmst;
 

From c40c09cbbf03afc058a761314fcdb14a3f69cb53 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 15 Mar 2020 10:53:51 +0300
Subject: [PATCH 0189/1854] test/zdtmp: add a test to C/R shared memory file
 descriptors

Any shared memory region can be openned via /proc/self/map_files.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile          |   2 +
 test/zdtm/static/shmemfd-priv.c    |  84 ++++++++++++++++++++++
 test/zdtm/static/shmemfd-priv.desc |   1 +
 test/zdtm/static/shmemfd.c         | 107 +++++++++++++++++++++++++++++
 test/zdtm/static/shmemfd.desc      |   1 +
 5 files changed, 195 insertions(+)
 create mode 100644 test/zdtm/static/shmemfd-priv.c
 create mode 100644 test/zdtm/static/shmemfd-priv.desc
 create mode 100644 test/zdtm/static/shmemfd.c
 create mode 100644 test/zdtm/static/shmemfd.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ee69612c7..a8e4107d3 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -224,6 +224,8 @@ TST_NOFILE	:=				\
 		memfd01				\
 		memfd02				\
 		memfd03				\
+		shmemfd				\
+		shmemfd-priv			\
 #		jobctl00			\
 
 ifneq ($(ARCH),arm)
diff --git a/test/zdtm/static/shmemfd-priv.c b/test/zdtm/static/shmemfd-priv.c
new file mode 100644
index 000000000..bbdb46905
--- /dev/null
+++ b/test/zdtm/static/shmemfd-priv.c
@@ -0,0 +1,84 @@
+#include <unistd.h>
+#include <stdio.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/vfs.h>
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Test C/R of shared memory file descriptors";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+int main(int argc, char *argv[])
+{
+	void *addr, *priv_addr, *addr2;
+	char path[4096];
+	int fd;
+
+	test_init(argc, argv);
+
+	addr = mmap(NULL, 5 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	if (addr == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+
+	*(int *) addr = 1;
+	*(int *) (addr + PAGE_SIZE) = 11;
+	*(int *) (addr +  2 * PAGE_SIZE) = 111;
+
+	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx",
+					(long)addr, (long)addr + 5 * PAGE_SIZE);
+	fd = open(path, O_RDWR | O_LARGEFILE);
+	if (fd < 0)
+		err(1, "Can't open %s", path);
+
+	priv_addr = mmap(NULL, 5 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_FILE | MAP_PRIVATE, fd, PAGE_SIZE);
+	if (priv_addr == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+
+	addr2 = mmap(NULL, 5 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, fd, 2 * PAGE_SIZE);
+	if (addr2 == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+
+	*(int *) (priv_addr + PAGE_SIZE) = 22;
+
+	test_daemon();
+	test_waitsig();
+
+	if (*(int *) (priv_addr + PAGE_SIZE) != 22) {
+		fail("the second page of the private mapping is corrupted");
+		return 1;
+	}
+	if (*(int *) (priv_addr) != 11) {
+		fail("the first page of the private mapping is corrupted");
+		return 1;
+	}
+	if (*(int *) (addr2) != 111) {
+		fail("the first page of the second shared mapping is corrupted");
+		return 1;
+	}
+	*(int *) (addr2) = 333;
+	if (*(int *) (addr + 2 * PAGE_SIZE) != 333) {
+		fail("the first page of the second shared mapping isn't shared");
+		return 1;
+	}
+	*(int *) (addr + 3 * PAGE_SIZE) = 444;
+	if (*(int *) (priv_addr + 2 * PAGE_SIZE) != 444) {
+		fail("the third page of the private mapping is corrupted");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/shmemfd-priv.desc b/test/zdtm/static/shmemfd-priv.desc
new file mode 100644
index 000000000..d969725f6
--- /dev/null
+++ b/test/zdtm/static/shmemfd-priv.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns', 'flags': 'suid'}
diff --git a/test/zdtm/static/shmemfd.c b/test/zdtm/static/shmemfd.c
new file mode 100644
index 000000000..b65faa2e1
--- /dev/null
+++ b/test/zdtm/static/shmemfd.c
@@ -0,0 +1,107 @@
+#include <unistd.h>
+#include <stdio.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/vfs.h>
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Test C/R of shared memory file descriptors";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+
+#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+
+int main(int argc, char *argv[])
+{
+	int fd, fl_flags1, fl_flags2, fd_flags1, fd_flags2;
+	struct statfs statfs1, statfs2;
+	off_t pos1, pos2;
+	char path[4096];
+	char buf[5];
+	void *addr;
+
+	test_init(argc, argv);
+
+	addr = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	if (addr == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+
+	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx",
+					(long)addr, (long)addr + PAGE_SIZE);
+	fd = open(path, O_RDWR | O_LARGEFILE);
+	if (fd < 0)
+		err(1, "Can't open %s", path);
+	ftruncate(fd, 0);
+	munmap(addr, PAGE_SIZE);
+
+	if (fcntl(fd, F_SETFL, O_APPEND) < 0)
+		err(1, "Can't get fl flags");
+
+	if ((fl_flags1 = fcntl(fd, F_GETFL)) == -1)
+		err(1, "Can't get fl flags");
+
+	if ((fd_flags1 = fcntl(fd, F_GETFD)) == -1)
+		err(1, "Can't get fd flags");
+
+	if (fstatfs(fd, &statfs1) < 0)
+		err(1, "statfs issue");
+
+	if (write(fd, "hello", 5) != 5)
+		err(1, "write error");
+
+	pos1 = 3;
+	if (lseek(fd, pos1, SEEK_SET) < 0)
+		err(1, "seek error");
+
+	test_daemon();
+	test_waitsig();
+
+	if ((fl_flags2 = fcntl(fd, F_GETFL)) == -1)
+		err(1, "Can't get fl flags");
+
+	if (fl_flags1 != fl_flags2) {
+		fail("fl flags differs %x %x", fl_flags1, fl_flags2);
+		return 1;
+	}
+
+	if ((fd_flags2 = fcntl(fd, F_GETFD)) == -1)
+		err(1, "Can't get fd flags");
+
+	if (fd_flags1 != fd_flags2) {
+		fail("fd flags differs");
+		return 1;
+	}
+
+	if (fstatfs(fd, &statfs2) < 0)
+		err(1, "statfs issue");
+
+	if (statfs1.f_type != statfs2.f_type) {
+		fail("statfs.f_type differs");
+		return 1;
+	}
+
+	pos2 = lseek(fd, 0, SEEK_CUR);
+	if (pos1 != pos2) {
+		fail("position differs");
+		return 1;
+	}
+
+	if (pread(fd, buf, sizeof(buf), 0) != sizeof(buf)) {
+		fail("read problem");
+		return 1;
+	}
+
+	if (memcmp(buf, "hello", sizeof(buf))) {
+		fail("content mismatch");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/shmemfd.desc b/test/zdtm/static/shmemfd.desc
new file mode 100644
index 000000000..d969725f6
--- /dev/null
+++ b/test/zdtm/static/shmemfd.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns', 'flags': 'suid'}

From 691b4a4e7ee980778d8f13eaebddf9b04063942a Mon Sep 17 00:00:00 2001
From: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Date: Mon, 3 Feb 2020 15:08:26 +0300
Subject: [PATCH 0190/1854] zdtm: Implemented get_current_dir_name wrapper that
 checks for 'x' permissions

Any filesystem syscall, that needs to navigate to inode by it's
absolute path performs successive lookup operations for each part of the
path. Lookup operation includes access rights check.
Usually but not always zdtm tests processes fall under 'other' access
category. Also, usually directories don't have 'x' bit set for other.
In case when bit 'x' is not set and user-ID and group-ID of a process
relate it to 'other', test's will not succeed in performing these
syscalls which are most of filesystem api, that has const char *path
as part of it arguments (open, openat, mkdir, bind, etc).
The observable behavior of that is that zdtm tests fail at file
creation ops on one system and pass on the other. The above is not
immediately clear to the developer by just looking at failed test's logs.
Investigation of that is also not quick for a developer due to the
complex structure of zdtm runtime where nested clones with
NAMESPACE flags take place alongside with bind-mounts.

As an additional note: 'get_current_dir_name' is documented as returning
EACCESS in case when some part of the path lacks read/list permissions.
But in fact it's not always so. Practice shows, that test processes can
get false success on this operation only to fail on later call to
something like mkdir/mknod/bind with a given path in arguments.

'get_cwd_check_perm' is a wrapper around 'get_current_dir_name'. It also
checks for permissions on the given filepath and logs the error. This
directs the developer towards the right investigation path or even
eliminates the need for investigation completely.

Signed-off-by: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
---
 test/zdtm/lib/fs.c | 24 ++++++++++++++++++++++++
 test/zdtm/lib/fs.h | 24 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/test/zdtm/lib/fs.c b/test/zdtm/lib/fs.c
index 0decfc37b..e82011ec8 100644
--- a/test/zdtm/lib/fs.c
+++ b/test/zdtm/lib/fs.c
@@ -94,3 +94,27 @@ err:
 	mnt_info_free(&m);
 	goto out;
 }
+
+int get_cwd_check_perm(char **result)
+{
+	char *cwd;
+	*result = 0;
+	cwd = get_current_dir_name();
+	if (!cwd) {
+		pr_perror("failed to get current directory");
+		return -1;
+	}
+
+	if (access(cwd, X_OK)) {
+		pr_err("access check for bit X for current dir path '%s' "
+		       "failed for uid:%d,gid:%d, error: %d(%s). "
+		       "Bit 'x' should be set in all path components of "
+		       "this directory\n",
+		       cwd, getuid(), getgid(), errno, strerror(errno)
+		);
+		return -1;
+	}
+
+	*result = cwd;
+	return 0;
+}
diff --git a/test/zdtm/lib/fs.h b/test/zdtm/lib/fs.h
index 972b15aba..af7a665fb 100644
--- a/test/zdtm/lib/fs.h
+++ b/test/zdtm/lib/fs.h
@@ -50,4 +50,28 @@ extern mnt_info_t *mnt_info_alloc(void);
 extern void mnt_info_free(mnt_info_t **m);
 extern mnt_info_t *get_cwd_mnt_info(void);
 
+/*
+ * get_cwd_check_perm is called to check that cwd is actually usable for a calling
+ * process.
+ *
+ * Example output of a stat command on a '/root' path shows file access bits:
+ * > stat /root
+ * File: ‘/root’
+ *   ...
+ *   Access: (0550/dr-xr-x---) Uid: (  0/root)   Gid: (  0/root)
+ *                          ^- no 'x' bit for other
+ *
+ * Here we can see that '/root' dir (that often can be part of cwd path) does not
+ * allow non-root user and non-root group to list contents of this directory.
+ * Calling process matching 'other' access category may succeed getting cwd path, but will
+ * fail performing further filesystem operations based on this path with confusing errors.
+ *
+ * This function calls get_current_dir_name and explicitly checks that bit 'x' is enabled for
+ * a calling process and logs the error.
+ *
+ * If check passes, stores get_current_dir's result in *result and returns 0
+ * If check fails, stores 0 in *result and returns -1
+ */
+extern int get_cwd_check_perm(char **result);
+
 #endif /* ZDTM_FS_H_ */

From fa705e418b4e7c2bce0925ad9f8689cd40b0c00d Mon Sep 17 00:00:00 2001
From: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Date: Mon, 3 Feb 2020 15:27:40 +0300
Subject: [PATCH 0191/1854] zdtm: Use safe helper function to initialize unix
 socket sockaddr structure

The helper function removes code duplication from tests that want to
initialize unix socket address to an absolute file path, derived from
current working directory of the test + relative filename of a resulting
socket. Because the former code used cwd = get_current_dir_name() as
part of absolute filename generation, the resulting filepath could later
cause failure of bind systcall due to unchecked permissions and
introduce confusing permission errors.

Signed-off-by: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
---
 test/zdtm/lib/Makefile               |  2 +-
 test/zdtm/lib/unix.c                 | 19 ++++++++++++++++
 test/zdtm/lib/zdtmtst.h              |  3 +++
 test/zdtm/static/del_standalone_un.c | 17 +-------------
 test/zdtm/static/deleted_unix_sock.c | 19 ++--------------
 test/zdtm/static/sk-unix01.c         | 33 ++++++----------------------
 6 files changed, 33 insertions(+), 60 deletions(-)
 create mode 100644 test/zdtm/lib/unix.c

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index b87f36e8f..89ca90933 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -4,7 +4,7 @@ CFLAGS	+= $(USERCFLAGS)
 
 LIB	:= libzdtmtst.a
 
-LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c fs.c sysctl.c
+LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
 LIBOBJ	:= $(LIBSRC:%.c=%.o)
 
 BIN	:= groups
diff --git a/test/zdtm/lib/unix.c b/test/zdtm/lib/unix.c
new file mode 100644
index 000000000..c36846cad
--- /dev/null
+++ b/test/zdtm/lib/unix.c
@@ -0,0 +1,19 @@
+#include <sys/socket.h>
+#include <sys/un.h>
+#include "zdtmtst.h"
+#include "fs.h"
+
+int unix_fill_sock_name(struct sockaddr_un *name, char *relFilename)
+{
+	char *cwd;
+
+	if (get_cwd_check_perm(&cwd)) {
+		pr_err("failed to get current working directory with valid permissions.\n");
+		return -1;
+	}
+
+	name->sun_family = AF_LOCAL;
+	ssprintf(name->sun_path, "%s/%s", cwd, relFilename);
+	return 0;
+}
+
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index 2cd4bdd1d..6eec26647 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -149,6 +149,9 @@ extern int tcp_init_server(int family, int *port);
 extern int tcp_accept_server(int sock);
 extern int tcp_init_client(int family, char *servIP, unsigned short servPort);
 
+struct sockaddr_un;
+extern int unix_fill_sock_name(struct sockaddr_un *name, char *relFilename);
+
 struct zdtm_tcp_opts {
 	bool reuseaddr;
 	bool reuseport;
diff --git a/test/zdtm/static/del_standalone_un.c b/test/zdtm/static/del_standalone_un.c
index d8200068b..5426fc786 100644
--- a/test/zdtm/static/del_standalone_un.c
+++ b/test/zdtm/static/del_standalone_un.c
@@ -16,19 +16,6 @@ const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-static int fill_sock_name(struct sockaddr_un *name, const char *filename)
-{
-	char *cwd;
-
-	cwd = get_current_dir_name();
-	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path))
-		return -1;
-
-	name->sun_family = AF_LOCAL;
-	ssprintf(name->sun_path, "%s/%s", cwd, filename);
-	return 0;
-}
-
 static int bind_and_listen(struct sockaddr_un *addr)
 {
 	int sk;
@@ -71,10 +58,8 @@ int main(int argc, char **argv)
 		goto out;
 	}
 
-	if (fill_sock_name(&addr, filename) < 0) {
-		pr_err("filename \"%s\" is too long\n", filename);
+	if (unix_fill_sock_name(&addr, filename))
 		goto out;
-	}
 
 	sk1 = bind_and_listen(&addr);
 	if (sk1 < 0)
diff --git a/test/zdtm/static/deleted_unix_sock.c b/test/zdtm/static/deleted_unix_sock.c
index bcc33f3de..4d328e996 100644
--- a/test/zdtm/static/deleted_unix_sock.c
+++ b/test/zdtm/static/deleted_unix_sock.c
@@ -17,28 +17,13 @@ const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-static int fill_sock_name(struct sockaddr_un *name, const char *filename)
-{
-	char *cwd;
-
-	cwd = get_current_dir_name();
-	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path))
-		return -1;
-
-	name->sun_family = AF_LOCAL;
-	sprintf(name->sun_path, "%s/%s", cwd, filename);
-	return 0;
-}
-
 static int setup_srv_sock(void)
 {
 	struct sockaddr_un name;
 	int sock;
 
-	if (fill_sock_name(&name, filename) < 0) {
-		pr_perror("filename \"%s\" is too long", filename);
+	if (unix_fill_sock_name(&name, filename))
 		return -1;
-	}
 
 	sock = socket(PF_LOCAL, SOCK_STREAM, 0);
 	if (sock < 0) {
@@ -67,7 +52,7 @@ static int setup_clnt_sock(void)
 	struct sockaddr_un name;
 	int sock;
 
-	if (fill_sock_name(&name, filename) < 0)
+	if (unix_fill_sock_name(&name, filename))
 		return -1;
 
 	sock = socket(PF_LOCAL, SOCK_STREAM, 0);
diff --git a/test/zdtm/static/sk-unix01.c b/test/zdtm/static/sk-unix01.c
index 2bceef79a..0e9006a15 100644
--- a/test/zdtm/static/sk-unix01.c
+++ b/test/zdtm/static/sk-unix01.c
@@ -24,22 +24,6 @@ const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-static int fill_sock_name(struct sockaddr_un *name, const char *filename)
-{
-	char *cwd;
-
-	cwd = get_current_dir_name();
-	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path)) {
-		pr_err("Name %s/%s is too long for socket\n",
-		       cwd, filename);
-		return -1;
-	}
-
-	name->sun_family = AF_LOCAL;
-	ssprintf(name->sun_path, "%s/%s", cwd, filename);
-	return 0;
-}
-
 static int sk_alloc_bind(int type, struct sockaddr_un *addr)
 {
 	int sk;
@@ -155,10 +139,9 @@ int main(int argc, char **argv)
 	 */
 
 	ssprintf(filename, "%s/%s", subdir_dg, "sk-dt");
-	if (fill_sock_name(&addr, filename) < 0) {
-		pr_err("%s is too long for socket\n", filename);
+	if (unix_fill_sock_name(&addr, filename))
 		return 1;
-	}
+
 	unlink(addr.sun_path);
 
 	sk_dgram[0] = sk_alloc_bind(SOCK_DGRAM, &addr);
@@ -184,10 +167,9 @@ int main(int argc, char **argv)
 	test_msg("sk-dt: alloc/connect/unlink %d %s\n", sk_dgram[3], addr.sun_path);
 
 	ssprintf(filename, "%s/%s", dirname, "sole");
-	if (fill_sock_name(&addr, filename) < 0) {
-		pr_err("%s is too long for socket\n", filename);
+	if (unix_fill_sock_name(&addr, filename))
 		return 1;
-	}
+
 	unlink(addr.sun_path);
 
 	sk_dgram[4] = sk_alloc_bind(SOCK_DGRAM, &addr);
@@ -237,7 +219,7 @@ int main(int argc, char **argv)
 		 sk_dgram_pair[0], sk_dgram_pair[1]);
 	ssprintf(filename, "%s/%s", subdir_dg, "sk-dtp");
 
-	if (fill_sock_name(&addr, filename) < 0) {
+	if (unix_fill_sock_name(&addr, filename)) {
 		pr_err("%s is too long for socket\n", filename);
 		return 1;
 	}
@@ -270,10 +252,9 @@ int main(int argc, char **argv)
 	 *  - delete socket on fs
 	 */
 	ssprintf(filename, "%s/%s", subdir_st, "sk-st");
-	if (fill_sock_name(&addr, filename) < 0) {
-		pr_err("%s is too long for socket\n", filename);
+	if (unix_fill_sock_name(&addr, filename))
 		return 1;
-	}
+
 	unlink(addr.sun_path);
 
 	sk_st[0] = sk_alloc_bind(SOCK_STREAM, &addr);

From 2b376168efd751856ebef192e764ebd0037e7174 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 21 Mar 2020 21:58:55 +0300
Subject: [PATCH 0192/1854] pipe: restore pipe size even if a pipe is empty

Without this patch, pipe size is restored only if a pipe has
queued data.

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/pipes.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/criu/pipes.c b/criu/pipes.c
index cb5da71de..d74329161 100644
--- a/criu/pipes.c
+++ b/criu/pipes.c
@@ -160,24 +160,24 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash
 		return 0;
 	}
 
-	if (!pd->pde->bytes)
-		goto out;
-
-	if (!pd->data) {
-		pr_err("Double data restore occurred on %#x\n", id);
-		return -1;
-	}
-
 	if (pd->pde->has_size) {
 		pr_info("Restoring size %#x for %#x\n",
 				pd->pde->size, pd->pde->pipe_id);
 		ret = fcntl(pfd, F_SETPIPE_SZ, pd->pde->size);
 		if (ret < 0) {
 			pr_perror("Can't restore pipe size");
-			goto err;
+			return -1;
 		}
 	}
 
+	if (!pd->pde->bytes)
+		return 0;
+
+	if (!pd->data) {
+		pr_err("Double data restore occurred on %#x\n", id);
+		return -1;
+	}
+
 	iov.iov_base = pd->data;
 	iov.iov_len = pd->pde->bytes;
 
@@ -185,14 +185,13 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash
 		ret = vmsplice(pfd, &iov, 1, SPLICE_F_GIFT | SPLICE_F_NONBLOCK);
 		if (ret < 0) {
 			pr_perror("%#x: Error splicing data", id);
-			goto err;
+			return -1;
 		}
 
 		if (ret == 0 || ret > iov.iov_len /* sanity */) {
 			pr_err("%#x: Wanted to restore %zu bytes, but got %d\n", id,
 					iov.iov_len, ret);
-			ret = -1;
-			goto err;
+			return -1;
 		}
 
 		iov.iov_base += ret;
@@ -211,10 +210,7 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash
 
 	munmap(pd->data, pd->pde->bytes);
 	pd->data = NULL;
-out:
-	ret = 0;
-err:
-	return ret;
+	return 0;
 }
 
 static int userns_reopen(void *_arg, int fd, pid_t pid)

From 1ad209b9c2b780fe2d5b043c3ffe29634629252c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 21 Mar 2020 22:08:38 +0300
Subject: [PATCH 0193/1854] test/pipe03: check that pipe size is restored

Create two pipes with and without queued data.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/pipe03.c | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/test/zdtm/static/pipe03.c b/test/zdtm/static/pipe03.c
index a8721e934..d649007b7 100644
--- a/test/zdtm/static/pipe03.c
+++ b/test/zdtm/static/pipe03.c
@@ -13,27 +13,28 @@ const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
 
 int main(int argc, char **argv)
 {
-	int p[2], i;
+	int p[2][2], i;
 	uint8_t buf[BUF_SIZE];
 	uint32_t crc;
 
 	test_init(argc, argv);
 
-	if (pipe2(p, O_NONBLOCK)) {
-		pr_perror("pipe");
-		return 1;
-	}
-
-	if (fcntl(p[1], F_SETPIPE_SZ, DATA_SIZE) == -1) {
-		pr_perror("Unable to change a pipe size");
-		return 1;
+	for (i = 0; i < 2; i++) {
+		if (pipe2(p[i], O_NONBLOCK)) {
+			pr_perror("pipe");
+			return 1;
+		}
+		if (fcntl(p[i][1], F_SETPIPE_SZ, DATA_SIZE) == -1) {
+			pr_perror("Unable to change a pipe size");
+			return 1;
+		}
 	}
 
 	crc = ~0;
 	datagen(buf, BUF_SIZE, &crc);
 
 	for (i = 0; i < DATA_SIZE / BUF_SIZE; i++) {
-		if (write(p[1], buf, BUF_SIZE) != BUF_SIZE) {
+		if (write(p[0][1], buf, BUF_SIZE) != BUF_SIZE) {
 			pr_perror("write");
 			return 1;
 		}
@@ -43,12 +44,26 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	for (i = 0; i < DATA_SIZE / BUF_SIZE; i++) {
-		if (read(p[0], buf, BUF_SIZE) != BUF_SIZE) {
+		if (read(p[0][0], buf, BUF_SIZE) != BUF_SIZE) {
 			pr_perror("read");
 			return 1;
 		}
 	}
 
+	for (i = 0; i < 2; i++) {
+		int size;
+
+		size = fcntl(p[i][1], F_GETPIPE_SZ);
+		if (size < 0) {
+			pr_perror("Unable to get a pipe size");
+			return 1;
+		}
+		if (size != DATA_SIZE) {
+			fail("%d: size %d expected %d", i, size, DATA_SIZE);
+			return 1;
+		}
+	}
+
 	pass();
 	return 0;
 }

From 5f28b692a0c972ddefb1ca4d1d0ef003dec4f617 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 21 Mar 2020 22:11:28 +0300
Subject: [PATCH 0194/1854] test/fifo_loop: change sizes of all fifo-s to fit a
 test buffer

This test doesn't expect that the write operation will block.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/transition/fifo_loop.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
index b028c2fd5..b06592586 100644
--- a/test/zdtm/transition/fifo_loop.c
+++ b/test/zdtm/transition/fifo_loop.c
@@ -84,6 +84,14 @@ int main(int argc, char **argv)
 				ret = errno;
 				return ret;
 			}
+
+			pipe_size = fcntl(writefd, F_SETPIPE_SZ, sizeof(buf));
+			if (pipe_size != sizeof(buf)) {
+				pr_perror("fcntl(writefd, F_SETPIPE_SZ) -> %d", pipe_size);
+				kill(0, SIGKILL);
+				exit(1);
+			}
+
 			signal(SIGPIPE, SIG_IGN);
 			if (pipe_in2out(readfd, writefd, buf, sizeof(buf)) < 0)
 				/* pass errno as exit code to the parent */
@@ -107,7 +115,7 @@ int main(int argc, char **argv)
 
 	pipe_size = fcntl(writefd, F_SETPIPE_SZ, sizeof(buf));
 	if (pipe_size != sizeof(buf)) {
-		pr_perror("fcntl(writefd, F_GETPIPE_SZ) -> %d", pipe_size);
+		pr_perror("fcntl(writefd, F_SETPIPE_SZ) -> %d", pipe_size);
 		kill(0, SIGKILL);
 		exit(1);
 	}

From 1ad8657ddb3d383874cc07cd3cf456cac7977db6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 24 Mar 2020 19:31:42 +0300
Subject: [PATCH 0195/1854] config/nftables: include string.h for strlen

Fixes: 9433b7b9db3e ("make: use cflags/ldflags for config.h detection mechanism")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/feature-tests.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index 21b390092..8df20afb7 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -152,6 +152,8 @@ endef
 
 define FEATURE_TEST_NFTABLES_LIB_API_0
 
+#include <string.h>
+
 #include <nftables/libnftables.h>
 
 int main(int argc, char **argv)

From cc362b432e2d2e3ec68628fb33b117fe3e89f9c2 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 Mar 2020 17:34:57 +0300
Subject: [PATCH 0196/1854] namespaces: fix error handling in dump_user_ns

Fix n_xid_map leaks on error path and remove useless exit_code.

Fixes: 6e1726f8 ("userns: set uid and gid before entering into userns")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/namespaces.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 21266df7c..2db805b2f 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -938,9 +938,9 @@ static int check_user_ns(int pid)
 
 int dump_user_ns(pid_t pid, int ns_id)
 {
-	int ret, exit_code = -1;
 	UsernsEntry *e = &userns_entry;
 	struct cr_img *img;
+	int ret;
 
 	ret = parse_id_map(pid, "uid_map", &e->uid_map);
 	if (ret < 0)
@@ -953,7 +953,7 @@ int dump_user_ns(pid_t pid, int ns_id)
 	e->n_gid_map = ret;
 
 	if (check_user_ns(pid))
-		return -1;
+		goto err;
 
 	img = open_image(CR_FD_USERNS, O_DUMP, ns_id);
 	if (!img)
@@ -973,7 +973,7 @@ err:
 		xfree(e->gid_map[0]);
 		xfree(e->gid_map);
 	}
-	return exit_code;
+	return -1;
 }
 
 void free_userns_maps(void)

From 967797a8676c8b3b7cd8954892b113c6765af25a Mon Sep 17 00:00:00 2001
From: Byeonggon Lee <gonny952@gmail.com>
Date: Sun, 15 Mar 2020 16:32:15 +0900
Subject: [PATCH 0197/1854] Add build directory to gitignore

After running make install, build directory is generated but not ignored
in gitignore. So this commit add build directory to gitignore.

Signed-off-by: Byeonggon Lee <gonny952@gmail.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c231104af..23cd703be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ lib/.crit-setup.files
 compel/include/asm
 include/common/asm
 include/common/config.h
+build/

From e3a5d0975240f9e9b6b6d7a096af6b4bbad36737 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 23 Mar 2020 07:37:00 +0300
Subject: [PATCH 0198/1854] memfd: save all memfd inodes in one image

Per-object image is acceptable if we expect to have 1-3 objects
per-container. If we expect to have more objects, it is better to save
them all into one image. There are a number of reasons for this:
* We need fewer system calls to read all objects from one image.
* It is faster to save or move one image.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c         |  3 ++
 criu/image-desc.c         |  2 +-
 criu/include/image-desc.h |  2 +-
 criu/include/memfd.h      |  2 +
 criu/memfd.c              | 90 +++++++++++++++++----------------------
 images/memfd.proto        |  1 +
 6 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 41146d4ad..1d3092f2f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -233,6 +233,9 @@ static int restore_finish_ns_stage(int from, int to)
 
 static int crtools_prepare_shared(void)
 {
+	if (prepare_memfd_inodes())
+		return -1;
+
 	if (prepare_files())
 		return -1;
 
diff --git a/criu/image-desc.c b/criu/image-desc.c
index b538a76ea..ac627a829 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -66,7 +66,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(FS,		"fs-%u"),
 	FD_ENTRY(REMAP_FPATH,	"remap-fpath"),
 	FD_ENTRY_F(GHOST_FILE,	"ghost-file-%x", O_NOBUF),
-	FD_ENTRY_F(MEMFD_INODE,	"memfd-%u", O_NOBUF),
+	FD_ENTRY_F(MEMFD_INODE,	"memfd", O_NOBUF),
 	FD_ENTRY(TCP_STREAM,	"tcp-stream-%x"),
 	FD_ENTRY(MNTS,		"mountpoints-%u"),
 	FD_ENTRY(NETDEV,	"netdev-%u"),
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 9ca9643a1..ce6ef1529 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -65,6 +65,7 @@ enum {
 	CR_FD_CGROUP,
 	CR_FD_FILE_LOCKS,
 	CR_FD_SECCOMP,
+	CR_FD_MEMFD_INODE,
 	_CR_FD_GLOB_TO,
 
 	CR_FD_TMPFS_IMG,
@@ -107,7 +108,6 @@ enum {
 	CR_FD_PIPES,
 	CR_FD_TTY_FILES,
 	CR_FD_MEMFD_FILE,
-	CR_FD_MEMFD_INODE,
 
 	CR_FD_AUTOFS,
 
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
index 4189766fd..3074a5c0f 100644
--- a/criu/include/memfd.h
+++ b/criu/include/memfd.h
@@ -17,6 +17,8 @@ extern struct collect_image_info memfd_cinfo;
 extern struct file_desc *collect_memfd(u32 id);
 extern int apply_memfd_seals(void);
 
+extern int prepare_memfd_inodes(void);
+
 #ifdef CONFIG_HAS_MEMFD_CREATE
 # include <sys/mman.h>
 #else
diff --git a/criu/memfd.c b/criu/memfd.c
index bca6900cb..2158e925b 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -43,9 +43,10 @@ struct memfd_inode {
 		};
 		/* Only for restore */
 		struct {
-			mutex_t	lock;
-			int	fdstore_id;
-			unsigned int pending_seals;
+			mutex_t		lock;
+			int		fdstore_id;
+			unsigned int	pending_seals;
+			MemfdInodeEntry	*mie;
 		};
 	};
 };
@@ -71,9 +72,8 @@ int is_memfd(dev_t dev)
 static int dump_memfd_inode(int fd, struct memfd_inode *inode,
 			    const char *name, const struct stat *st)
 {
-	int ret = -1;
-	struct cr_img *img = NULL;
 	MemfdInodeEntry mie = MEMFD_INODE_ENTRY__INIT;
+	int ret = -1;
 	u32 shmid;
 
 	 /*
@@ -90,10 +90,7 @@ static int dump_memfd_inode(int fd, struct memfd_inode *inode,
 	if (dump_one_memfd_shmem(fd, shmid, st->st_size) < 0)
 		goto out;
 
-	img = open_image(CR_FD_MEMFD_INODE, O_DUMP, inode->id);
-	if (!img)
-		goto out;
-
+	mie.inode_id = inode->id;
 	mie.uid = userns_uid(st->st_uid);
 	mie.gid = userns_gid(st->st_gid);
 	mie.name = (char *)name;
@@ -104,14 +101,12 @@ static int dump_memfd_inode(int fd, struct memfd_inode *inode,
 	if (mie.seals == -1)
 		goto out;
 
-	if (pb_write_one(img, &mie, PB_MEMFD_INODE))
+	if (pb_write_one(img_from_set(glob_imgset, CR_FD_MEMFD_INODE), &mie, PB_MEMFD_INODE))
 		goto out;
 
 	ret = 0;
 
 out:
-	if (img)
-		close_image(img);
 	return ret;
 }
 
@@ -212,8 +207,6 @@ struct memfd_info {
 	struct memfd_inode	*inode;
 };
 
-static int memfd_open_inode(struct memfd_inode *inode);
-
 static struct memfd_inode *memfd_alloc_inode(int id)
 {
 	struct memfd_inode *inode;
@@ -222,35 +215,47 @@ static struct memfd_inode *memfd_alloc_inode(int id)
 		if (inode->id == id)
 			return inode;
 
-	inode = shmalloc(sizeof(*inode));
-	if (!inode)
-		return NULL;
+	pr_err("Unable to find the %d memfd inode\n", id);
+	return NULL;
+}
 
-	inode->id = id;
+static int collect_one_memfd_inode(void *o, ProtobufCMessage *base, struct cr_img *i)
+{
+	MemfdInodeEntry *mie = pb_msg(base, MemfdInodeEntry);
+	struct memfd_inode *inode = o;
+
+	inode->mie = mie;
+	inode->id = mie->inode_id;
 	mutex_init(&inode->lock);
 	inode->fdstore_id = -1;
 	inode->pending_seals = 0;
 
 	list_add_tail(&inode->list, &memfd_inodes);
-	return inode;
+
+	return 0;
+}
+
+static struct collect_image_info memfd_inode_cinfo = {
+	.fd_type = CR_FD_MEMFD_INODE,
+	.pb_type = PB_MEMFD_INODE,
+	.priv_size = sizeof(struct memfd_inode),
+	.collect = collect_one_memfd_inode,
+	.flags = COLLECT_SHARED | COLLECT_NOFREE,
+};
+
+int prepare_memfd_inodes(void)
+{
+	return collect_image(&memfd_inode_cinfo);
 }
 
-extern int restore_memfd_shm(int fd, u64 id, u64 size);
 static int memfd_open_inode_nocache(struct memfd_inode *inode)
 {
 	MemfdInodeEntry *mie = NULL;
-	struct cr_img *img = NULL;
 	int fd = -1;
 	int ret = -1;
 	int flags;
 
-	img = open_image(CR_FD_MEMFD_INODE, O_RSTR, inode->id);
-	if (!img)
-		goto out;
-
-	if (pb_read_one(img, &mie, PB_MEMFD_INODE) < 0)
-		goto out;
-
+	mie = inode->mie;
 	if (mie->seals == F_SEAL_SEAL) {
 		inode->pending_seals = 0;
 		flags = 0;
@@ -285,10 +290,6 @@ static int memfd_open_inode_nocache(struct memfd_inode *inode)
 out:
 	if (fd != -1)
 		close(fd);
-	if (img)
-		close_image(img);
-	if (mie)
-		memfd_inode_entry__free_unpacked(mie, NULL);
 	return ret;
 }
 
@@ -373,33 +374,17 @@ static int memfd_open_fe_fd(struct file_desc *fd, int *new_fd)
 static char *memfd_d_name(struct file_desc *d, char *buf, size_t s)
 {
 	MemfdInodeEntry *mie = NULL;
-	struct cr_img *img = NULL;
 	struct memfd_info *mfi;
-	char *ret = NULL;
 
 	mfi = container_of(d, struct memfd_info, d);
 
-	img = open_image(CR_FD_MEMFD_INODE, O_RSTR, mfi->inode->id);
-	if (!img)
-		goto out;
-
-	if (pb_read_one(img, &mie, PB_MEMFD_INODE) < 0)
-		goto out;
-
+	mie = mfi->inode->mie;
 	if (snprintf(buf, s, "%s%s", MEMFD_PREFIX, mie->name) >= s) {
 		pr_err("Buffer too small for memfd name %s\n", mie->name);
-		goto out;
+		return NULL;
 	}
 
-	ret = buf;
-
-out:
-	if (img)
-		close_image(img);
-	if (mie)
-		memfd_inode_entry__free_unpacked(mie, NULL);
-
-	return ret;
+	return buf;
 }
 
 static struct file_desc_ops memfd_desc_ops = {
@@ -427,7 +412,8 @@ struct collect_image_info memfd_cinfo = {
 	.collect = collect_one_memfd,
 };
 
-struct file_desc *collect_memfd(u32 id) {
+struct file_desc *collect_memfd(u32 id)
+{
 	struct file_desc *fdesc;
 
 	fdesc = find_file_desc_raw(FD_TYPES__MEMFD, id);
diff --git a/images/memfd.proto b/images/memfd.proto
index 546ffc2ab..ad5373d10 100644
--- a/images/memfd.proto
+++ b/images/memfd.proto
@@ -18,4 +18,5 @@ message memfd_inode_entry {
 	required uint64		size		= 4;
 	required uint32		shmid		= 5;
 	required uint32		seals		= 6 [(criu).flags = "seals.flags"];
+	required uint64		inode_id	= 7;
 };

From 8c36865c84666c73424b7a0fdb9f460557465ff2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 25 Mar 2020 20:14:24 +0300
Subject: [PATCH 0199/1854] memfd: split the struct memfd_inode

The struct memfd_inode has a union for dump and restore parts.
The only common parts are the list_head node, and the inode id.

Suggested-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/memfd.c | 58 ++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 2158e925b..4419b4bf5 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -32,23 +32,19 @@
 /* Linux 5.1+ */
 #define F_SEAL_FUTURE_WRITE	0x0010  /* prevent future writes while mapped */
 
-struct memfd_inode {
+struct memfd_dump_inode {
 	struct list_head	list;
 	u32			id;
-	union {
-		/* Only for dump */
-		struct {
-			u32	dev;
-			u32	ino;
-		};
-		/* Only for restore */
-		struct {
-			mutex_t		lock;
-			int		fdstore_id;
-			unsigned int	pending_seals;
-			MemfdInodeEntry	*mie;
-		};
-	};
+	u32			dev;
+	u32			ino;
+};
+
+struct memfd_restore_inode {
+	struct list_head	list;
+	mutex_t			lock;
+	int			fdstore_id;
+	unsigned int		pending_seals;
+	MemfdInodeEntry		*mie;
 };
 
 static LIST_HEAD(memfd_inodes);
@@ -69,7 +65,7 @@ int is_memfd(dev_t dev)
 	return dev == kdat.shmem_dev;
 }
 
-static int dump_memfd_inode(int fd, struct memfd_inode *inode,
+static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode,
 			    const char *name, const struct stat *st)
 {
 	MemfdInodeEntry mie = MEMFD_INODE_ENTRY__INIT;
@@ -110,9 +106,10 @@ out:
 	return ret;
 }
 
-static struct memfd_inode *dump_unique_memfd_inode(int lfd, const char *name, const struct stat *st)
+static struct memfd_dump_inode *
+dump_unique_memfd_inode(int lfd, const char *name, const struct stat *st)
 {
-	struct memfd_inode *inode;
+	struct memfd_dump_inode *inode;
 	int fd;
 
 	list_for_each_entry(inode, &memfd_inodes, list)
@@ -149,7 +146,7 @@ static int dump_one_memfd(int lfd, u32 id, const struct fd_parms *p)
 {
 	MemfdFileEntry mfe = MEMFD_FILE_ENTRY__INIT;
 	FileEntry fe = FILE_ENTRY__INIT;
-	struct memfd_inode *inode;
+	struct memfd_dump_inode *inode;
 	struct fd_link _link, *link;
 	const char *name;
 
@@ -202,17 +199,17 @@ const struct fdtype_ops memfd_dump_ops = {
  */
 
 struct memfd_info {
-	MemfdFileEntry		*mfe;
-	struct file_desc	d;
-	struct memfd_inode	*inode;
+	MemfdFileEntry			*mfe;
+	struct file_desc		d;
+	struct memfd_restore_inode	*inode;
 };
 
-static struct memfd_inode *memfd_alloc_inode(int id)
+static struct memfd_restore_inode *memfd_alloc_inode(int id)
 {
-	struct memfd_inode *inode;
+	struct memfd_restore_inode *inode;
 
 	list_for_each_entry(inode, &memfd_inodes, list)
-		if (inode->id == id)
+		if (inode->mie->inode_id == id)
 			return inode;
 
 	pr_err("Unable to find the %d memfd inode\n", id);
@@ -222,10 +219,9 @@ static struct memfd_inode *memfd_alloc_inode(int id)
 static int collect_one_memfd_inode(void *o, ProtobufCMessage *base, struct cr_img *i)
 {
 	MemfdInodeEntry *mie = pb_msg(base, MemfdInodeEntry);
-	struct memfd_inode *inode = o;
+	struct memfd_restore_inode *inode = o;
 
 	inode->mie = mie;
-	inode->id = mie->inode_id;
 	mutex_init(&inode->lock);
 	inode->fdstore_id = -1;
 	inode->pending_seals = 0;
@@ -238,7 +234,7 @@ static int collect_one_memfd_inode(void *o, ProtobufCMessage *base, struct cr_im
 static struct collect_image_info memfd_inode_cinfo = {
 	.fd_type = CR_FD_MEMFD_INODE,
 	.pb_type = PB_MEMFD_INODE,
-	.priv_size = sizeof(struct memfd_inode),
+	.priv_size = sizeof(struct memfd_restore_inode),
 	.collect = collect_one_memfd_inode,
 	.flags = COLLECT_SHARED | COLLECT_NOFREE,
 };
@@ -248,7 +244,7 @@ int prepare_memfd_inodes(void)
 	return collect_image(&memfd_inode_cinfo);
 }
 
-static int memfd_open_inode_nocache(struct memfd_inode *inode)
+static int memfd_open_inode_nocache(struct memfd_restore_inode *inode)
 {
 	MemfdInodeEntry *mie = NULL;
 	int fd = -1;
@@ -293,7 +289,7 @@ out:
 	return ret;
 }
 
-static int memfd_open_inode(struct memfd_inode *inode)
+static int memfd_open_inode(struct memfd_restore_inode *inode)
 {
 	int fd;
 
@@ -433,7 +429,7 @@ int apply_memfd_seals(void)
 	 */
 
 	int ret, fd;
-	struct memfd_inode *inode;
+	struct memfd_restore_inode *inode;
 
 	list_for_each_entry(inode, &memfd_inodes, list) {
 		if (!inode->pending_seals)

From e3fb52e375d2fdd7160395220cf52eb25dfc8c09 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 30 Mar 2020 14:16:30 +0300
Subject: [PATCH 0200/1854] remove header include statements duplicates

Revert "util: introduce the mount_detached_fs helper"

This reverts commit 5dbc24b206cd365db7498dddcd03798c5d8ed4e4.

Revert "criu: Make use strlcpy() to copy into allocated strings"

This reverts commit bc49927bbc28b41e4b2759d42dc24f1d66e22df3.

Fixes for https://github.com/checkpoint-restore/criu/pull/1003

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c | 1 -
 criu/util.c       | 2 --
 2 files changed, 3 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 1d3092f2f..74be1a5ca 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -76,7 +76,6 @@
 #include "fdstore.h"
 #include "string.h"
 #include "memfd.h"
-#include "string.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
diff --git a/criu/util.c b/criu/util.c
index a0a49c5a3..1646ce1c4 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -30,8 +30,6 @@
 
 #include "linux/mount.h"
 
-#include "linux/mount.h"
-
 #include "kerndat.h"
 #include "page.h"
 #include "util.h"

From 0e9b42acf96d2c5fc3a6174ae6e4f2ad8a64c272 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 25 Feb 2020 11:31:07 +0300
Subject: [PATCH 0201/1854] MAINTAINERS: Add Pavel (myself) to maintainers

Hope I have enough experience in the project to be nominated. I want to
help with review and will try to do my best in it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5c28463a7..bb153f1ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3,3 +3,4 @@ Andrey Vagin <avagin@gmail.com>
 Mike Rapoport <rppt@kernel.org>
 Dmitry Safonov <0x7f454c46@gmail.com>
 Adrian Reber <areber@redhat.com>
+Pavel Tikhomirov <ptikhomirov@virtuozzo.com>

From 4127ef4ab769dc4417c22d0ce0a4ddaaca4193b4 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 14 Aug 2019 07:40:40 +0300
Subject: [PATCH 0202/1854] criu: Add support for time namespaces

The time namespace allows for per-namespace offsets to the system
monotonic and boot-time clocks.

C/R of time namespaces are very straightforward. On dump, criu enters a
target time namespace and dumps currents clocks values, then on restore,
criu creates a new namespace and restores clocks values.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/Makefile.crtools        |   1 +
 criu/cr-check.c              |  12 ++++
 criu/cr-restore.c            |  10 ++-
 criu/image-desc.c            |   1 +
 criu/include/image-desc.h    |   1 +
 criu/include/kerndat.h       |   1 +
 criu/include/magic.h         |   1 +
 criu/include/namespaces.h    |   9 ++-
 criu/include/proc_parse.h    |   2 +
 criu/include/protobuf-desc.h |   1 +
 criu/include/timens.h        |   9 +++
 criu/kerndat.c               |  17 +++++
 criu/namespaces.c            |  24 +++++++
 criu/proc_parse.c            |  38 ++++++++++
 criu/protobuf-desc.c         |   1 +
 criu/pstree.c                |   2 +
 criu/timens.c                | 130 +++++++++++++++++++++++++++++++++++
 criu/util.c                  |   2 +
 images/Makefile              |   1 +
 images/core.proto            |   1 +
 images/timens.proto          |  10 +++
 lib/py/images/images.py      |   1 +
 22 files changed, 272 insertions(+), 3 deletions(-)
 create mode 100644 criu/include/timens.h
 create mode 100644 criu/timens.c
 create mode 100644 images/timens.proto

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 1a6e0b5b5..5c25b8928 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -87,6 +87,7 @@ obj-y			+= config.o
 obj-y			+= servicefd.o
 obj-y			+= pie-util-vdso.o
 obj-y			+= vdso.o
+obj-y			+= timens.o
 obj-$(CONFIG_COMPAT)	+= pie-util-vdso-elf32.o
 CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
 obj-$(CONFIG_COMPAT)	+= vdso-compat.o
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 80df3f7cd..b790c2ffb 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1266,6 +1266,16 @@ static int check_kcmp_epoll(void)
 	return 0;
 }
 
+static int check_time_namespace(void)
+{
+	if (!kdat.has_timens) {
+		pr_err("Time namespaces are not supported\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int check_net_diag_raw(void)
 {
 	check_sock_diag();
@@ -1384,6 +1394,7 @@ int cr_check(void)
 		ret |= check_kcmp_epoll();
 		ret |= check_net_diag_raw();
 		ret |= check_clone3_set_tid();
+		ret |= check_time_namespace();
 	}
 
 	/*
@@ -1486,6 +1497,7 @@ static struct feature_list feature_list[] = {
 	{ "nsid", check_nsid },
 	{ "link_nsid", check_link_nsid},
 	{ "kcmp_epoll", check_kcmp_epoll},
+	{ "timens", check_time_namespace},
 	{ "external_net_ns", check_external_net_ns},
 	{ "clone3_set_tid", check_clone3_set_tid},
 	{ NULL, NULL },
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 74be1a5ca..ce6e667d7 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -76,6 +76,7 @@
 #include "fdstore.h"
 #include "string.h"
 #include "memfd.h"
+#include "timens.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
@@ -1406,7 +1407,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 	if (kdat.has_clone3_set_tid) {
 		ret = clone3_with_pid_noasan(restore_task_with_children,
 				&ca, (ca.clone_flags &
-					~(CLONE_NEWNET | CLONE_NEWCGROUP)),
+					~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)),
 				SIGCHLD, pid);
 	} else {
 		/*
@@ -1424,7 +1425,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 		close_pid_proc();
 		ret = clone_noasan(restore_task_with_children,
 				(ca.clone_flags &
-				 ~(CLONE_NEWNET | CLONE_NEWCGROUP)) | SIGCHLD,
+				 ~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)) | SIGCHLD,
 				&ca);
 	}
 
@@ -1745,6 +1746,11 @@ static int restore_task_with_children(void *_arg)
 			}
 		}
 
+		if (root_ns_mask & CLONE_NEWTIME) {
+			if (prepare_timens(current->ids->time_ns_id))
+				goto err;
+		}
+
 		/* Wait prepare_userns */
 		if (restore_finish_ns_stage(CR_STATE_ROOT_TASK, CR_STATE_PREPARE_NAMESPACES) < 0)
 			goto err;
diff --git a/criu/image-desc.c b/criu/image-desc.c
index ac627a829..617b95355 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -102,6 +102,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(NETNF_CT,	"netns-ct-%u"),
 	FD_ENTRY(NETNF_EXP,	"netns-exp-%u"),
 	FD_ENTRY(FILES,		"files"),
+	FD_ENTRY(TIMENS,	"timens-%u"),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index ce6ef1529..6283a576d 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -26,6 +26,7 @@ enum {
 	CR_FD_UTSNS,
 	CR_FD_MNTS,
 	CR_FD_USERNS,
+	CR_FD_TIMENS,
 
 	_CR_FD_IPCNS_FROM,
 	CR_FD_IPC_VAR,
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 27c870bb8..ad5f7d324 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -67,6 +67,7 @@ struct kerndat_s {
 	bool has_kcmp_epoll_tfd;
 	bool has_fsopen;
 	bool has_clone3_set_tid;
+	bool has_timens;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/magic.h b/criu/include/magic.h
index bdaca968d..d078ec422 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -95,6 +95,7 @@
 #define AUTOFS_MAGIC		0x49353943 /* Sochi */
 #define FILES_MAGIC		0x56303138 /* Toropets */
 #define MEMFD_INODE_MAGIC	0x48453499 /* Dnipro */
+#define TIMENS_MAGIC		0x43114433 /* Beslan */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index a9a970a9b..e570aa0ab 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -34,7 +34,13 @@
 #define CLONE_NEWCGROUP	0x02000000
 #endif
 
-#define CLONE_ALLNS	(CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER | CLONE_NEWCGROUP)
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME   0x00000080
+#endif
+
+#define CLONE_ALLNS	(CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | \
+			 CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER | \
+			 CLONE_NEWCGROUP | CLONE_NEWTIME)
 
 /* Nested namespaces are supported only for these types */
 #define CLONE_SUBNS	(CLONE_NEWNS | CLONE_NEWNET)
@@ -146,6 +152,7 @@ extern bool check_ns_proc(struct fd_link *link);
 
 extern struct ns_desc pid_ns_desc;
 extern struct ns_desc user_ns_desc;
+extern struct ns_desc time_ns_desc;
 extern unsigned long root_ns_mask;
 
 extern const struct fdtype_ops nsfile_dump_ops;
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index fd50ff47e..25a57df6c 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -102,4 +102,6 @@ extern bool is_vma_range_fmt(char *line);
 extern void parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf);
 extern int parse_uptime(uint64_t *upt);
 
+extern int parse_timens_offsets(struct timespec *boff, struct timespec *moff);
+
 #endif /* __CR_PROC_PARSE_H__ */
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 7e0385ef4..ee4135d65 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -63,6 +63,7 @@ enum {
 	PB_FILE,
 	PB_MEMFD_FILE,
 	PB_MEMFD_INODE,		/* 60 */
+	PB_TIMENS,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/include/timens.h b/criu/include/timens.h
new file mode 100644
index 000000000..22a4a5220
--- /dev/null
+++ b/criu/include/timens.h
@@ -0,0 +1,9 @@
+#ifndef __CR_TIME_NS_H__
+#define __CR_TIME_NS_H__
+
+extern int dump_time_ns(int ns_id);
+extern int prepare_timens(int pid);
+
+extern struct ns_desc time_ns_desc;
+
+#endif /* __CR_TIME_NS_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 2ad72c350..0c6910da9 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -783,6 +783,21 @@ out:
 	return ret;
 }
 
+static int has_time_namespace(void)
+{
+	if (access("/proc/self/timens_offsets", F_OK) < 0) {
+		if (errno == ENOENT) {
+			pr_debug("Time namespaces are not supported.\n");
+			kdat.has_timens = false;
+			return 0;
+		}
+		pr_perror("Unable to access /proc/self/timens_offsets");
+		return -1;
+	}
+	kdat.has_timens = true;
+	return 0;
+}
+
 int __attribute__((weak)) kdat_x86_has_ptrace_fpu_xsave_bug(void)
 {
 	return 0;
@@ -1091,6 +1106,8 @@ int kerndat_init(void)
 		ret = kerndat_has_fsopen();
 	if (!ret)
 		ret = kerndat_has_clone3_set_tid();
+	if (!ret)
+		ret = has_time_namespace();
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 2db805b2f..e376feaca 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -20,6 +20,7 @@
 #include "imgset.h"
 #include "uts_ns.h"
 #include "ipc_ns.h"
+#include "timens.h"
 #include "mount.h"
 #include "pstree.h"
 #include "namespaces.h"
@@ -39,6 +40,7 @@ static struct ns_desc *ns_desc_array[] = {
 	&pid_ns_desc,
 	&user_ns_desc,
 	&mnt_ns_desc,
+	&time_ns_desc,
 	&cgroup_ns_desc,
 };
 
@@ -157,6 +159,9 @@ int join_ns_add(const char *type, char *ns_file, char *extra_opts)
 	} else if (!strncmp(type, "uts", 4)) {
 		jn->nd = &uts_ns_desc;
 		join_ns_flags |= CLONE_NEWUTS;
+	} else if (!strncmp(type, "time", 5)) {
+		jn->nd = &time_ns_desc;
+		join_ns_flags |= CLONE_NEWTIME;
 	} else if (!strncmp(type, "ipc", 4)) {
 		jn->nd = &ipc_ns_desc;
 		join_ns_flags |= CLONE_NEWIPC;
@@ -568,6 +573,10 @@ static int open_ns_fd(struct file_desc *d, int *new_fd)
 			item = t;
 			nd = &cgroup_ns_desc;
 			break;
+		} else if (ids->time_ns_id == nfi->nfe->ns_id) {
+			item = t;
+			nd = &time_ns_desc;
+			break;
 		}
 	}
 
@@ -671,6 +680,13 @@ int dump_task_ns_ids(struct pstree_item *item)
 		return -1;
 	}
 
+	ids->has_time_ns_id = true;
+	ids->time_ns_id = get_ns_id(pid, &time_ns_desc, NULL);
+	if (!ids->time_ns_id) {
+		pr_err("Can't make timens id\n");
+		return -1;
+	}
+
 	ids->has_mnt_ns_id = true;
 	ids->mnt_ns_id = get_ns_id(pid, &mnt_ns_desc, NULL);
 	if (!ids->mnt_ns_id) {
@@ -914,6 +930,9 @@ static int check_user_ns(int pid)
 		if ((root_ns_mask & CLONE_NEWUTS) &&
 		    switch_ns(pid, &uts_ns_desc, NULL))
 			exit(1);
+		if ((root_ns_mask & CLONE_NEWTIME) &&
+		    switch_ns(pid, &time_ns_desc, NULL))
+			exit(1);
 		if ((root_ns_mask & CLONE_NEWIPC) &&
 		    switch_ns(pid, &ipc_ns_desc, NULL))
 			exit(1);
@@ -1002,6 +1021,11 @@ static int do_dump_namespaces(struct ns_id *ns)
 				ns->id, ns->ns_pid);
 		ret = dump_uts_ns(ns->id);
 		break;
+	case CLONE_NEWTIME:
+		pr_info("Dump TIME namespace %d via %d\n",
+				ns->id, ns->ns_pid);
+		ret = dump_time_ns(ns->id);
+		break;
 	case CLONE_NEWIPC:
 		pr_info("Dump IPC namespace %d via %d\n",
 				ns->id, ns->ns_pid);
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 60aba8788..c73fa9776 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1472,6 +1472,44 @@ static bool should_skip_mount(const char *mountpoint)
 	return false;
 }
 
+int parse_timens_offsets(struct timespec *boff, struct timespec *moff)
+{
+	int exit_code = -1;
+	FILE *f;
+
+	f = fopen_proc(PROC_SELF, "timens_offsets");
+	if (!f) {
+		pr_perror("Unable to open /proc/self/timens_offsets");
+		goto out;
+	}
+	while (fgets(buf, BUF_SIZE, f)) {
+		int64_t sec, nsec;
+		int clockid;
+
+		if (sscanf(buf, "%d %"PRId64" %"PRId64"\n", &clockid, &sec, &nsec) != 3) {
+			pr_err("Unable to parse: %s\n", buf);
+			goto out;
+		}
+		switch (clockid) {
+		case CLOCK_MONOTONIC:
+			moff->tv_sec = sec;
+			moff->tv_nsec = nsec;
+			break;
+		case CLOCK_BOOTTIME:
+			boff->tv_sec = sec;
+			boff->tv_nsec = nsec;
+			break;
+		default:
+			pr_err("Unknown clockid: %d\n", clockid);
+			goto out;
+		}
+	}
+	exit_code = 0;
+out:
+	fclose(f);
+	return exit_code;
+}
+
 struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 {
 	struct mount_info *list = NULL;
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index 41c208037..2ee81e5db 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -37,6 +37,7 @@
 #include "images/creds.pb-c.h"
 #include "images/timer.pb-c.h"
 #include "images/utsns.pb-c.h"
+#include "images/timens.pb-c.h"
 #include "images/ipc-var.pb-c.h"
 #include "images/ipc-shm.pb-c.h"
 #include "images/ipc-msg.pb-c.h"
diff --git a/criu/pstree.c b/criu/pstree.c
index 19cf5ad38..d0e81bfad 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -814,6 +814,8 @@ static unsigned long get_clone_mask(TaskKobjIdsEntry *i,
 		mask |= CLONE_NEWIPC;
 	if (i->uts_ns_id != p->uts_ns_id)
 		mask |= CLONE_NEWUTS;
+	if (i->time_ns_id != p->time_ns_id)
+		mask |= CLONE_NEWTIME;
 	if (i->mnt_ns_id != p->mnt_ns_id)
 		mask |= CLONE_NEWNS;
 	if (i->user_ns_id != p->user_ns_id)
diff --git a/criu/timens.c b/criu/timens.c
new file mode 100644
index 000000000..79ba6a2ce
--- /dev/null
+++ b/criu/timens.c
@@ -0,0 +1,130 @@
+#include <time.h>
+#include <sched.h>
+
+#include "types.h"
+#include "proc_parse.h"
+#include "namespaces.h"
+#include "timens.h"
+
+#include "protobuf.h"
+#include "images/timens.pb-c.h"
+
+int dump_time_ns(int ns_id)
+{
+	struct cr_img *img;
+	TimensEntry te = TIMENS_ENTRY__INIT;
+	Timespec b = TIMESPEC__INIT, m = TIMESPEC__INIT;
+	struct timespec ts;
+	int ret;
+
+	img = open_image(CR_FD_TIMENS, O_DUMP, ns_id);
+	if (!img)
+		return -1;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	te.monotonic = &m;
+	te.monotonic->tv_sec = ts.tv_sec;
+	te.monotonic->tv_nsec = ts.tv_nsec;
+	clock_gettime(CLOCK_BOOTTIME, &ts);
+	te.boottime = &b;
+	te.boottime->tv_sec = ts.tv_sec;
+	te.boottime->tv_nsec = ts.tv_nsec;
+
+	ret = pb_write_one(img, &te, PB_TIMENS);
+	close_image(img);
+
+	return ret < 0 ? -1 : 0;
+}
+
+static void normalize_timespec(struct timespec *ts)
+{
+        while (ts->tv_nsec >= NSEC_PER_SEC) {
+                ts->tv_nsec -= NSEC_PER_SEC;
+                ++ts->tv_sec;
+        }
+        while (ts->tv_nsec < 0) {
+                ts->tv_nsec += NSEC_PER_SEC;
+                --ts->tv_sec;
+        }
+}
+
+
+int prepare_timens(int id)
+{
+	int exit_code = -1;
+	int ret, fd = -1;
+	struct cr_img *img;
+	TimensEntry *te;
+	struct timespec ts;
+	struct timespec prev_moff = {}, prev_boff = {};
+
+	img = open_image(CR_FD_TIMENS, O_RSTR, id);
+	if (!img)
+		return -1;
+
+	ret = pb_read_one(img, &te, PB_TIMENS);
+	close_image(img);
+	if (ret < 0)
+		goto err;
+
+	if (unshare(CLONE_NEWTIME)) {
+		pr_perror("Unable to create a new time namespace");
+		return -1;
+	}
+
+	if (parse_timens_offsets(&prev_boff, &prev_moff))
+		goto err;
+
+	fd = open_proc_rw(PROC_SELF, "timens_offsets");
+	if (fd < 0)
+		goto err;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	ts.tv_sec  = ts.tv_sec  - prev_moff.tv_sec;
+	ts.tv_nsec = ts.tv_nsec - prev_moff.tv_nsec;
+
+	ts.tv_sec  = te->monotonic->tv_sec  - ts.tv_sec;
+	ts.tv_nsec = te->monotonic->tv_nsec - ts.tv_nsec;
+	normalize_timespec(&ts);
+
+	pr_debug("timens: %d %ld %ld\n",
+		 CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec);
+	if (dprintf(fd, "%d %ld %ld\n",
+		    CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec) < 0) {
+		pr_perror("Unable to set a monotonic clock offset");
+		goto err;
+	}
+
+	clock_gettime(CLOCK_BOOTTIME, &ts);
+
+	ts.tv_sec  = ts.tv_sec  - prev_boff.tv_sec;
+	ts.tv_nsec = ts.tv_nsec - prev_boff.tv_nsec;
+
+	ts.tv_sec  = te->boottime->tv_sec  - ts.tv_sec;
+	ts.tv_nsec = te->boottime->tv_nsec - ts.tv_nsec;
+	normalize_timespec(&ts);
+
+	pr_debug("timens: %d %ld %ld\n",
+		 CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec);
+	if (dprintf(fd, "%d %ld %ld\n",
+		    CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec) < 0) {
+		pr_perror("Unable to set a boottime clock offset");
+		goto err;
+	}
+
+	timens_entry__free_unpacked(te, NULL);
+	close_safe(&fd);
+
+	fd = open_proc(PROC_SELF, "ns/time_for_children");
+	if (fd < 0) {
+		pr_perror("Unable to open ns/time_for_children");
+		goto err;
+	}
+	if (switch_ns_by_fd(fd, &time_ns_desc, NULL))
+		goto err;
+	exit_code = 0;
+err:
+	close_safe(&fd);
+	return exit_code;
+}
+struct ns_desc time_ns_desc = NS_DESC_ENTRY(CLONE_NEWTIME, "time");
diff --git a/criu/util.c b/criu/util.c
index 1646ce1c4..6f6a6dde7 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -967,6 +967,8 @@ const char *ns_to_string(unsigned int ns)
 		return "user";
 	case CLONE_NEWUTS:
 		return "uts";
+	case CLONE_NEWTIME:
+		return "time";
 	default:
 		return NULL;
 	}
diff --git a/images/Makefile b/images/Makefile
index e7f0580cf..5ddd37664 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -64,6 +64,7 @@ proto-obj-y	+= autofs.o
 proto-obj-y	+= macvlan.o
 proto-obj-y	+= sit.o
 proto-obj-y	+= memfd.o
+proto-obj-y	+= timens.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/core.proto b/images/core.proto
index e90522914..22c2a9f1f 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -70,6 +70,7 @@ message task_kobj_ids_entry {
 	optional uint32			mnt_ns_id	= 9;
 	optional uint32			user_ns_id	= 10;
 	optional uint32			cgroup_ns_id	= 11;
+	optional uint32			time_ns_id	= 12;
 }
 
 message thread_sas_entry {
diff --git a/images/timens.proto b/images/timens.proto
new file mode 100644
index 000000000..a8272609b
--- /dev/null
+++ b/images/timens.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+
+message timespec {
+	required uint64		tv_sec	= 1;
+	required uint64		tv_nsec	= 2;
+}
+message timens_entry {
+	required timespec monotonic	= 1;
+	required timespec boottime	= 2;
+}
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index dca080657..ca6f207bb 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -466,6 +466,7 @@ handlers = {
     'IDS': entry_handler(pb.task_kobj_ids_entry),
     'CREDS': entry_handler(pb.creds_entry),
     'UTSNS': entry_handler(pb.utsns_entry),
+    'TIMENS': entry_handler(pb.timens_entry),
     'IPC_VAR': entry_handler(pb.ipc_var_entry),
     'FS': entry_handler(pb.fs_entry),
     'GHOST_FILE': ghost_file_handler(),

From ddba4af608d546a968e9558758718bead9c638c5 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 28 Mar 2020 22:14:40 +0300
Subject: [PATCH 0203/1854] namespace: fail if ns/time_for_children isn't equal
 to ns/time

This case isn't supported right now.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/timens.h |  1 +
 criu/namespaces.c     | 20 ++++++++++++++++----
 criu/timens.c         |  2 ++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/criu/include/timens.h b/criu/include/timens.h
index 22a4a5220..0567c5828 100644
--- a/criu/include/timens.h
+++ b/criu/include/timens.h
@@ -5,5 +5,6 @@ extern int dump_time_ns(int ns_id);
 extern int prepare_timens(int pid);
 
 extern struct ns_desc time_ns_desc;
+extern struct ns_desc time_for_children_ns_desc;
 
 #endif /* __CR_TIME_NS_H__ */
diff --git a/criu/namespaces.c b/criu/namespaces.c
index e376feaca..89d97c7bc 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -341,7 +341,7 @@ struct ns_id *lookup_ns_by_kid(unsigned int kid, struct ns_desc *nd)
 	struct ns_id *nsid;
 
 	for (nsid = ns_ids; nsid != NULL; nsid = nsid->next)
-		if (nsid->kid == kid && nsid->nd == nd)
+		if (nsid->kid == kid && nsid->nd->cflag == nd->cflag)
 			return nsid;
 
 	return NULL;
@@ -447,7 +447,7 @@ static unsigned int __get_ns_id(int pid, struct ns_desc *nd, protobuf_c_boolean
 {
 	int proc_dir;
 	unsigned int kid;
-	char ns_path[10];
+	char ns_path[32];
 	struct stat st;
 
 	proc_dir = open_pid_proc(pid);
@@ -680,12 +680,24 @@ int dump_task_ns_ids(struct pstree_item *item)
 		return -1;
 	}
 
-	ids->has_time_ns_id = true;
-	ids->time_ns_id = get_ns_id(pid, &time_ns_desc, NULL);
+	ids->time_ns_id = get_ns_id(pid, &time_ns_desc, &ids->has_time_ns_id);
 	if (!ids->time_ns_id) {
 		pr_err("Can't make timens id\n");
 		return -1;
 	}
+	if (ids->has_time_ns_id) {
+		unsigned int id;
+		protobuf_c_boolean supported;
+		id = get_ns_id(pid, &time_for_children_ns_desc, &supported);
+		if (!supported || !id) {
+			pr_err("Can't make timens id\n");
+			return -1;
+		}
+		if (id != ids->time_ns_id) {
+			pr_err("Can't dump nested time namespace for %d\n", pid);
+			return -1;
+		}
+	}
 
 	ids->has_mnt_ns_id = true;
 	ids->mnt_ns_id = get_ns_id(pid, &mnt_ns_desc, NULL);
diff --git a/criu/timens.c b/criu/timens.c
index 79ba6a2ce..764f8c9e0 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -128,3 +128,5 @@ err:
 	return exit_code;
 }
 struct ns_desc time_ns_desc = NS_DESC_ENTRY(CLONE_NEWTIME, "time");
+struct ns_desc time_for_children_ns_desc =
+			NS_DESC_ENTRY(CLONE_NEWTIME, "time_for_children");

From 3fd0fa4bdc7d325bb244ef01873255e4ebcbb403 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 14 Aug 2019 07:44:02 +0300
Subject: [PATCH 0204/1854] zdtm: add support for time namespaces

For ns and uns flavors, tests run in separate time namespaces.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/lib/ns.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 3099f7495..0054a3040 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -15,6 +15,8 @@
 #include <signal.h>
 #include <sched.h>
 #include <sys/socket.h>
+#include <time.h>
+#include <sys/prctl.h>
 
 #include "zdtmtst.h"
 #include "ns.h"
@@ -207,6 +209,39 @@ write_out:
 	write(STDERR_FILENO, buf, MIN(len, sizeof(buf)));
 }
 
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME   0x00000080      /* New time namespace */
+#endif
+
+static inline int _settime(clockid_t clk_id, time_t offset)
+{
+	int fd, len;
+	char buf[4096];
+
+	if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
+		clk_id = CLOCK_MONOTONIC;
+
+	len = snprintf(buf, sizeof(buf), "%d %ld 0", clk_id, offset);
+
+	fd = open("/proc/self/timens_offsets", O_WRONLY);
+	if (fd < 0) {
+		fprintf(stderr, "open(/proc/self/timens_offsets): %m");
+		return -1;
+	}
+
+	if (write(fd, buf, len) != len) {
+		fprintf(stderr, "write(/proc/self/timens_offsets): %m");
+		return -1;
+	}
+
+	if (close(fd)) {
+		fprintf(stderr, "close(/proc/self/timens_offsets): %m");
+		return -1;
+	}
+
+	return 0;
+}
+
 #define STATUS_FD 255
 static int ns_exec(void *_arg)
 {
@@ -218,6 +253,7 @@ static int ns_exec(void *_arg)
 
 	setsid();
 
+	prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
 	ret = dup2(args->status_pipe[1], STATUS_FD);
 	if (ret < 0) {
 		fprintf(stderr, "dup2() failed: %m\n");
@@ -236,6 +272,35 @@ static int ns_exec(void *_arg)
 	return -1;
 }
 
+static int create_timens(void)
+{
+	int fd;
+
+	if (unshare(CLONE_NEWTIME)) {
+		if (errno == EINVAL) {
+			fprintf(stderr, "timens isn't supported\n");
+			return 0;
+		} else {
+			fprintf(stderr, "unshare(CLONE_NEWTIME) failed: %m");
+			exit(1);
+		}
+	}
+
+	if (_settime(CLOCK_MONOTONIC, 10 * 24 * 60 * 60))
+		exit(1);
+	if (_settime(CLOCK_BOOTTIME, 20 * 24 * 60 * 60))
+		exit(1);
+
+	fd = open("/proc/self/ns/time_for_children", O_RDONLY);
+	if (fd < 0)
+		exit(1);
+	if (setns(fd, 0))
+		exit(1);
+	close(fd);
+
+	return 0;
+}
+
 int ns_init(int argc, char **argv)
 {
 	struct sigaction sa = {
@@ -253,6 +318,9 @@ int ns_init(int argc, char **argv)
 		exit(1);
 	}
 
+	if (create_timens())
+		exit(1);
+
 	if (init_notify()) {
 		fprintf(stderr, "Can't init pre-dump notification: %m");
 		exit(1);

From f1655fd5402f7827415cddbd796e5e44ed33cbc9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 14 Aug 2019 07:45:34 +0300
Subject: [PATCH 0205/1854] zdtm: add a new test to check c/r of time
 namespaces

This test checks that monotonic and boottime don't jump after C/R.

In ns and uns flavors, the test is started in a separate time namespace
with big offsets, so if criu will restore a time namespace incorrectly
the test will detect the big delta of clocks values before and after C/R.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile |  1 +
 test/zdtm/static/time.c   | 47 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 test/zdtm/static/time.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a8e4107d3..1b7542574 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -226,6 +226,7 @@ TST_NOFILE	:=				\
 		memfd03				\
 		shmemfd				\
 		shmemfd-priv			\
+		time				\
 #		jobctl00			\
 
 ifneq ($(ARCH),arm)
diff --git a/test/zdtm/static/time.c b/test/zdtm/static/time.c
new file mode 100644
index 000000000..d37e2a8f8
--- /dev/null
+++ b/test/zdtm/static/time.c
@@ -0,0 +1,47 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check monotonic and boot clocks";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com";
+
+
+#define NSEC_PER_SEC 1000000000ULL
+
+int main(int argc, char **argv)
+{
+	struct timespec tss[2], ts;
+	int clocks[] = {CLOCK_MONOTONIC, CLOCK_BOOTTIME};
+	unsigned long long a, b;
+	int i;
+
+	test_init(argc, argv);
+
+	for (i = 0; i < 2; i++)
+		clock_gettime(clocks[i], &tss[i]);
+
+	test_daemon();
+	test_waitsig();
+
+	for (i = 0; i < 2; i++) {
+		clock_gettime(clocks[i], &ts);
+
+		a = ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec;
+		b = tss[i].tv_sec * NSEC_PER_SEC + tss[i].tv_nsec;
+		if (a < b) {
+			fail("%d: %lld %lld", clocks[i], a, b);
+			return 1;
+		}
+		if (a > b + 60 * 60 * NSEC_PER_SEC) {
+			fail("%d: %lld %lld", clocks[i], a, b);
+			return 1;
+		}
+	}
+
+	pass();
+
+	return 0;
+}

From 0d8c0562f9d8e67bae04f1b1aea08e485edf7340 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 15 Aug 2019 06:51:15 +0300
Subject: [PATCH 0206/1854] zdtm_ct: run each test in a new time namespace

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm_ct.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index bc88dadde..5495d61eb 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -5,6 +5,69 @@
 #include <stdio.h>
 #include <sys/mount.h>
 #include <unistd.h>
+#include <time.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME   0x00000080      /* New time namespace */
+#endif
+
+static inline int _settime(clockid_t clk_id, time_t offset)
+{
+        int fd, len;
+        char buf[4096];
+
+        if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
+                clk_id = CLOCK_MONOTONIC;
+
+        len = snprintf(buf, sizeof(buf), "%d %ld 0", clk_id, offset);
+
+        fd = open("/proc/self/timens_offsets", O_WRONLY);
+        if (fd < 0) {
+                fprintf(stderr, "/proc/self/timens_offsets: %m");
+		return -1;
+	}
+
+        if (write(fd, buf, len) != len) {
+                fprintf(stderr, "/proc/self/timens_offsets: %m");
+		return -1;
+	}
+
+        close(fd);
+
+        return 0;
+}
+
+static int create_timens()
+{
+	int fd;
+
+	if (unshare(CLONE_NEWTIME)) {
+		if (errno == EINVAL) {
+			fprintf(stderr, "timens isn't supported\n");
+			return 0;
+		} else {
+			fprintf(stderr, "unshare(CLONE_NEWTIME) failed: %m");
+			exit(1);
+		}
+	}
+
+	if (_settime(CLOCK_MONOTONIC, 110 * 24 * 60 * 60))
+		exit(1);
+	if (_settime(CLOCK_BOOTTIME, 40 * 24 * 60 * 60))
+		exit(1);
+
+	fd = open("/proc/self/ns/time_for_children", O_RDONLY);
+	if (fd < 0)
+		exit(1);
+	if (setns(fd, 0))
+		exit(1);
+	close(fd);
+
+	return 0;
+}
 
 int main(int argc, char **argv)
 {
@@ -20,6 +83,8 @@ int main(int argc, char **argv)
 		return 1;
 	pid = fork();
 	if (pid == 0) {
+		if (create_timens())
+			exit(1);
 		if (mount(NULL, "/", NULL, MS_REC | MS_SLAVE, NULL)) {
 			fprintf(stderr, "mount(/, S_REC | MS_SLAVE)): %m");
 			return 1;

From 73438d34bb5bfba5f0ac063c699f66454c722c51 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 26 Mar 2020 10:55:13 +0300
Subject: [PATCH 0207/1854] test: check that C/R of nested time namespaces
 fails

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile             |  2 +
 test/zdtm/static/timens_for_kids.c    | 36 ++++++++++++++
 test/zdtm/static/timens_for_kids.desc |  1 +
 test/zdtm/static/timens_nested.c      | 67 +++++++++++++++++++++++++++
 test/zdtm/static/timens_nested.desc   |  1 +
 5 files changed, 107 insertions(+)
 create mode 100644 test/zdtm/static/timens_for_kids.c
 create mode 100644 test/zdtm/static/timens_for_kids.desc
 create mode 100644 test/zdtm/static/timens_nested.c
 create mode 100644 test/zdtm/static/timens_nested.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1b7542574..7d72673c3 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -227,6 +227,8 @@ TST_NOFILE	:=				\
 		shmemfd				\
 		shmemfd-priv			\
 		time				\
+		timens_nested			\
+		timens_for_kids			\
 #		jobctl00			\
 
 ifneq ($(ARCH),arm)
diff --git a/test/zdtm/static/timens_for_kids.c b/test/zdtm/static/timens_for_kids.c
new file mode 100644
index 000000000..72543486b
--- /dev/null
+++ b/test/zdtm/static/timens_for_kids.c
@@ -0,0 +1,36 @@
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sched.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <time.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check nested time namespaces";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com";
+
+
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME   0x00000080
+#endif
+
+int main(int argc, char **argv)
+{
+	test_init(argc, argv);
+
+	if (unshare(CLONE_NEWTIME)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/timens_for_kids.desc b/test/zdtm/static/timens_for_kids.desc
new file mode 100644
index 000000000..0d0083f1e
--- /dev/null
+++ b/test/zdtm/static/timens_for_kids.desc
@@ -0,0 +1 @@
+{'flags': 'suid crfail', 'feature': 'timens'}
diff --git a/test/zdtm/static/timens_nested.c b/test/zdtm/static/timens_nested.c
new file mode 100644
index 000000000..3f4b0e821
--- /dev/null
+++ b/test/zdtm/static/timens_nested.c
@@ -0,0 +1,67 @@
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sched.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <time.h>
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check nested time namespaces";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com";
+
+
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME   0x00000080
+#endif
+
+int main(int argc, char **argv)
+{
+	pid_t pid;
+	int fd;
+
+	test_init(argc, argv);
+
+	fd = open("/proc/self/ns/time", O_RDONLY);
+	if (fd < 0) {
+		pr_perror("Unable to open /proc/self/ns/time");
+		return 1;
+	}
+
+	if (unshare(CLONE_NEWTIME)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("fork");
+		return -1;
+	}
+
+	if (pid == 0) {
+		while (1)
+			sleep(1);
+		return 0;
+	}
+	if (setns(fd, 0) < 0) {
+		kill(pid, SIGKILL);
+		wait(NULL);
+		pr_perror("Unable to restore time namespace");
+		return 1;
+	}
+	close(fd);
+
+	test_daemon();
+	test_waitsig();
+
+	kill(pid, SIGKILL);
+	wait(NULL);
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/timens_nested.desc b/test/zdtm/static/timens_nested.desc
new file mode 100644
index 000000000..0d0083f1e
--- /dev/null
+++ b/test/zdtm/static/timens_nested.desc
@@ -0,0 +1 @@
+{'flags': 'suid crfail', 'feature': 'timens'}

From eab1a30748b17c5fc1caccfd5f3ff917ea0db3ff Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 23 Mar 2020 03:26:00 +0300
Subject: [PATCH 0208/1854] timens: restore processes in a new timens to
 restore clocks

After restoring processes, we have to be sure that monotonic and
boottime clocks will not go backward. For this, we can restore processes
in a new time namespace and set proper offsets for the clocks.

In this patch, criu dumps clocks values event when processes are running
in this host time namespace and on restore, criu creates a new time
namespace, sets dumped clock values and restores processes.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c    | 7 +++++++
 criu/cr-restore.c | 3 +++
 criu/timens.c     | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 6aa114c2d..a38e47d12 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -81,6 +81,7 @@
 #include "dump.h"
 #include "eventpoll.h"
 #include "memfd.h"
+#include "timens.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
@@ -1921,6 +1922,12 @@ int cr_dump_tasks(pid_t pid)
 			goto err;
 	}
 
+	if ((root_ns_mask & CLONE_NEWTIME) == 0) {
+		ret = dump_time_ns(0);
+		if (ret)
+			goto err;
+	}
+
 	ret = dump_cgroups();
 	if (ret)
 		goto err;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ce6e667d7..ed4b95b91 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1749,6 +1749,9 @@ static int restore_task_with_children(void *_arg)
 		if (root_ns_mask & CLONE_NEWTIME) {
 			if (prepare_timens(current->ids->time_ns_id))
 				goto err;
+		} else if (kdat.has_timens) {
+			if (prepare_timens(0))
+				goto err;
 		}
 
 		/* Wait prepare_userns */
diff --git a/criu/timens.c b/criu/timens.c
index 764f8c9e0..f3b50fdff 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -62,6 +62,11 @@ int prepare_timens(int id)
 	if (!img)
 		return -1;
 
+	if (id == 0 && empty_image(img)) {
+		pr_warn("Clocks values have not been dumped\n");
+		return 0;
+	}
+
 	ret = pb_read_one(img, &te, PB_TIMENS);
 	close_image(img);
 	if (ret < 0)

From 698f3a4dbd8754a5c8bf1bf8f682d176f3bd24fb Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 26 Mar 2020 20:03:34 +0300
Subject: [PATCH 0209/1854] zdtm: limit the line length for ps by 160 symbols

By default, this limit is 80 symbols and this isn't enough:
 4730 pts/0    S+     0:00          \_ ./zdtm_ct zdtm.py
7535 4731 pts/0    S+     0:00          |   \_ python zdtm.py
7536 4839 pts/0    S+     0:00          |       \_ python zdtm.p
7537 4861 pts/0    S+     0:00          |           \_ make --no
7538 4882 pts/0    S+     0:00          |               \_ ./mnt
7539 4883 ?        Ss     0:00          |                   \_ .

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 0bd7b84cc..ac8d7bee0 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1885,7 +1885,7 @@ class Launcher:
                 pid, status = os.waitpid(0, flags)
             except OSError as e:
                 if e.errno == errno.EINTR:
-                    subprocess.Popen(["ps", "axf"]).wait()
+                    subprocess.Popen(["ps", "axf", "--width", "160"]).wait()
                     continue
                 signal.alarm(0)
                 raise e

From 067a20c815c5a632eee63469bcc9d99af73a9c79 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 28 Mar 2020 22:13:17 +0300
Subject: [PATCH 0210/1854] zdtm: fail if test with the crfail tag passes

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py                        | 2 ++
 test/zdtm/static/unhashed_proc.desc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index ac8d7bee0..5e42c769e 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1735,6 +1735,8 @@ def do_run_test(tname, tdesc, flavs, opts):
                 t.stop()
                 cr_api.fini()
                 try_run_hook(t, ["--clean"])
+                if t.blocking():
+                    raise test_fail_exc("unexpected success")
         except test_fail_exc as e:
             print_sep("Test %s FAIL at %s" % (tname, e.step), '#')
             t.print_output()
diff --git a/test/zdtm/static/unhashed_proc.desc b/test/zdtm/static/unhashed_proc.desc
index 847e3b27c..de1915b23 100644
--- a/test/zdtm/static/unhashed_proc.desc
+++ b/test/zdtm/static/unhashed_proc.desc
@@ -1 +1 @@
-{'flags': 'crfail', 'opts' : '--link-remap'}
+{'opts' : '--link-remap'}

From bb0b4219efbda66995887b09fb3d6d81dc314031 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Tue, 31 Mar 2020 14:16:30 +0000
Subject: [PATCH 0211/1854] img: fix image_name() when image is empty

When an image is opened but errored with a ENOENT error, the image is
still valid. Later on, do_pb_read_one() can fail and will invoke
image_name(). The image fd is EMPTY_IMG_FD (-404). read_fd_link fails.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/protobuf.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/criu/protobuf.c b/criu/protobuf.c
index e68d42b5c..4accc5ee0 100644
--- a/criu/protobuf.c
+++ b/criu/protobuf.c
@@ -25,8 +25,13 @@ static char *image_name(struct cr_img *img)
 	int fd = img->_x.fd;
 	static char image_path[PATH_MAX];
 
-	if (read_fd_link(fd, image_path, sizeof(image_path)) > 0)
+	if (lazy_image(img))
+		return img->path;
+	else if (empty_image(img))
+		return "(empty-image)";
+	else if (fd >= 0 && read_fd_link(fd, image_path, sizeof(image_path)) > 0)
 		return image_path;
+
 	return NULL;
 }
 

From 4d34f84bb6957f00d3440a428ecd80dd869212be Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 10 Apr 2020 21:10:27 +0000
Subject: [PATCH 0212/1854] img: rellocate a PATH_MAX buffer from the bss
 section to the stack

Reducing our memory footprint by 4K.

Improved-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/protobuf.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/criu/protobuf.c b/criu/protobuf.c
index 4accc5ee0..206223ca5 100644
--- a/criu/protobuf.c
+++ b/criu/protobuf.c
@@ -20,16 +20,16 @@
 #include "protobuf.h"
 #include "util.h"
 
-static char *image_name(struct cr_img *img)
+#define  image_name(img, buf) __image_name(img, buf, sizeof(buf))
+static char *__image_name(struct cr_img *img, char *image_path, size_t image_path_size)
 {
 	int fd = img->_x.fd;
-	static char image_path[PATH_MAX];
 
 	if (lazy_image(img))
 		return img->path;
 	else if (empty_image(img))
 		return "(empty-image)";
-	else if (fd >= 0 && read_fd_link(fd, image_path, sizeof(image_path)) > 0)
+	else if (fd >= 0 && read_fd_link(fd, image_path, image_path_size) > 0)
 		return image_path;
 
 	return NULL;
@@ -48,6 +48,7 @@ static char *image_name(struct cr_img *img)
 
 int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 {
+	char img_name_buf[PATH_MAX];
 	u8 local[PB_PKOBJ_LOCAL_SIZE];
 	void *buf = (void *)&local;
 	u32 size;
@@ -55,7 +56,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 
 	if (!cr_pb_descs[type].pb_desc) {
 		pr_err("Wrong object requested %d on %s\n",
-			type, image_name(img));
+			type, image_name(img, img_name_buf));
 		return -1;
 	}
 
@@ -70,13 +71,13 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 			return 0;
 		} else {
 			pr_err("Unexpected EOF on %s\n",
-			       image_name(img));
+			       image_name(img, img_name_buf));
 			return -1;
 		}
 	} else if (ret < sizeof(size)) {
 		pr_perror("Read %d bytes while %d expected on %s",
 			  ret, (int)sizeof(size),
-			  image_name(img));
+			  image_name(img, img_name_buf));
 		return -1;
 	}
 
@@ -90,11 +91,11 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 	ret = bread(&img->_x, buf, size);
 	if (ret < 0) {
 		pr_perror("Can't read %d bytes from file %s",
-			  size, image_name(img));
+			  size, image_name(img, img_name_buf));
 		goto err;
 	} else if (ret != size) {
 		pr_perror("Read %d bytes while %d expected from %s",
-			  ret, size, image_name(img));
+			  ret, size, image_name(img, img_name_buf));
 		ret = -1;
 		goto err;
 	}
@@ -103,7 +104,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 	if (!*pobj) {
 		ret = -1;
 		pr_err("Failed unpacking object %p from %s\n",
-		       pobj, image_name(img));
+		       pobj, image_name(img, img_name_buf));
 		goto err;
 	}
 

From 6b9faabf39e14bbc23fe3174f308a5f9f870113f Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Sat, 28 Mar 2020 00:18:48 +0000
Subject: [PATCH 0213/1854] mem: avoid re-opening CR_FD_PAGES when not needed

This commit introduces an optimization when rsti(t)->vma_io is empty.
This optimization allows streaming a non-seekable image as CR_FD_PAGES
is not reopened.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/mem.c          | 14 ++++++++++++++
 criu/pie/restorer.c |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/criu/mem.c b/criu/mem.c
index 55022d94a..15aa0cbdb 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1403,6 +1403,20 @@ static int prepare_vma_ios(struct pstree_item *t, struct task_restore_args *ta)
 {
 	struct cr_img *pages;
 
+	/*
+	 * We optimize the case when rsti(t)->vma_io is empty.
+	 *
+	 * This is useful for for remote images, where all VMAs are premapped
+	 * (pr->pieok is false). This avoids re-opening the CR_FD_PAGES file,
+	 * which could be no longer be available.
+	 */
+	if (list_empty(&rsti(t)->vma_io)) {
+		ta->vma_ios = NULL;
+		ta->vma_ios_n = 0;
+		ta->vma_ios_fd = -1;
+		return 0;
+	}
+
 	/*
 	 * If auto-dedup is on we need RDWR mode to be able to punch holes in
 	 * the input files (in restorer.c)
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index afe185f04..b3d7e2b5c 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1602,7 +1602,8 @@ long __export_restore_task(struct task_restore_args *args)
 		rio = ((void *)rio) + RIO_SIZE(rio->nr_iovs);
 	}
 
-	sys_close(args->vma_ios_fd);
+	if (args->vma_ios_fd != -1)
+		sys_close(args->vma_ios_fd);
 
 	/*
 	 * Proxify vDSO.

From d1fa1734ee53404f8a06d82a5732dc1daff8d756 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Date: Wed, 4 Mar 2020 18:26:37 +0300
Subject: [PATCH 0214/1854] autofs: fix integer overflow in mount options
 parsing

In real life cases pipe_ino param could be larger that INT_MAX,
but in autofs_parse() function we using atoi function, that uses
4 byte integers. It's a bug.

Example of mount info from real case:
(00.508286) 	type autofs source /etc/auto.misc mnt_id 2824 s_dev 0x4b9 / @
./misc flags 0x300000 options fd=5,pipe_ino=3480845226,pgrp=95929,timeout=300,
minproto=5,maxproto=5,indirect

3480845226 > 2147483647 (32-bit wide signed int max value) => we have a problem

It causes a error:
(03.195915) Error (criu/pipes.c:529): The packetized mode for pipes is not supported yet

Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
---
 criu/autofs.c | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index a2dc60ffc..175b8900e 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -62,25 +62,53 @@ int autofs_parse(struct mount_info *pm)
 {
 	long pipe_ino = AUTOFS_OPT_UNKNOWN;
 	char **opts;
-	int nr_opts, i;
+	int nr_opts, i, ret;
 
 	split(pm->options, ',', &opts, &nr_opts);
 	if (!opts)
 		return -1;
+
 	for (i = 0; i < nr_opts; i++) {
 		if (!strncmp(opts[i], "pipe_ino=", strlen("pipe_ino=")))
-			pipe_ino = atoi(opts[i] + strlen("pipe_ino="));
+			if (xatol(opts[i] + strlen("pipe_ino="), &pipe_ino)) {
+				pr_err("pipe_ino (%s) mount option parse failed\n", opts[i] + strlen("pipe_ino="));
+				ret = -1;
+				goto free;
+			}
+	}
+
+	/*
+	 * We must inform user about bug if pipe_ino is greater than UINT32_MAX,
+	 * because it means that something changed in Linux Kernel virtual fs
+	 * inode numbers generation mechanism. What we have at the moment:
+	 * 1. struct inode i_ino field (include/linux/fs.h in Linux kernel)
+	 * has unsigned long type.
+	 * 2. get_next_ino() function (fs/inode.c), that used for generating inode
+	 * numbers on virtual filesystems (pipefs, debugfs for instance)
+	 * has unsigned int as return type.
+	 * So, it means that ATM it is safe to keep uint32 type for pipe_id field
+	 * in pipe-data.proto.
+	 */
+	if (pipe_ino > UINT32_MAX) {
+		pr_err("overflow: pipe_ino > UINT32_MAX\n");
+		ret = -1;
+		goto free;
 	}
-	for (i = 0; i < nr_opts; i++)
-		xfree(opts[i]);
-	free(opts);
 
 	if (pipe_ino == AUTOFS_OPT_UNKNOWN) {
 		pr_warn("Failed to find pipe_ino option (old kernel?)\n");
-		return 0;
+		ret = 0;
+		goto free;
 	}
 
-	return autofs_gather_pipe(pipe_ino);
+	ret = autofs_gather_pipe(pipe_ino);
+
+free:
+	for (i = 0; i < nr_opts; i++)
+		xfree(opts[i]);
+	xfree(opts);
+
+	return ret;
 }
 
 static int autofs_check_fd_stat(struct stat *stat, int prgp, int fd,

From 62088c721f08aaec8b63de3904304a3a31dcefea Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 14 Apr 2020 10:04:28 +0300
Subject: [PATCH 0215/1854] criu: put statement continuation on the same line
 as the closing bracket

We should follow Linux Kernel Codding Style:

... the closing brace is empty on a line of its own, except in the cases
where it is followed by a continuation of the same statement, ie ... an
else in an if-statement ...

https://www.kernel.org/doc/html/v4.10/process/coding-style.html#placing-braces-and-spaces

Automaticly fixing with:

:!git grep --files-with-matches "^\s*else[^{]*{" | xargs
:argadd <files>
:argdo :%s/}\s*\n\s*\(else[^{]*{\)/} \1/g | update

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 compel/arch/ppc64/src/lib/infect.c | 6 ++----
 compel/src/main.c                  | 9 +++------
 criu/arch/ppc64/crtools.c          | 3 +--
 criu/cr-dump.c                     | 3 +--
 test/zdtm/static/fifo_wronly.c     | 3 +--
 test/zdtm/static/inotify_system.c  | 3 +--
 test/zdtm/static/ptrace_sig.c      | 3 +--
 test/zdtm/static/vsx.c             | 3 +--
 test/zdtm/transition/epoll.c       | 3 +--
 9 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index defed3d85..637acd46d 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -222,8 +222,7 @@ static int get_altivec_regs(pid_t pid, user_fpregs_struct_t *fp)
 			return -1;
 		}
 		pr_debug("Altivec not supported\n");
-	}
-	else {
+	} else {
 		pr_debug("Dumping Altivec registers\n");
 		fp->flags |= USER_FPREGS_FL_ALTIVEC;
 	}
@@ -251,8 +250,7 @@ static int get_vsx_regs(pid_t pid, user_fpregs_struct_t *fp)
 			return -1;
 		}
 		pr_debug("VSX register's dump not supported.\n");
-	}
-	else {
+	} else {
 		pr_debug("Dumping VSX registers\n");
 		fp->flags |= USER_FPREGS_FL_VSX;
 	}
diff --git a/compel/src/main.c b/compel/src/main.c
index 36127c357..9fc3a924c 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -181,8 +181,7 @@ static void print_ldflags(bool compat)
 	if (uninst_root) {
 		printf("%s/arch/%s/scripts/compel-pack%s.lds.S\n",
 				uninst_root, flags.arch, compat_str);
-	}
-	else {
+	} else {
 		printf("%s/compel/scripts/compel-pack%s.lds.S\n",
 				LIBEXECDIR, compat_str);
 
@@ -222,8 +221,7 @@ static int print_libs(bool is_static)
 			return 1;
 		}
 		printf("%s/%s\n", uninst_root, STATIC_LIB);
-	}
-	else {
+	} else {
 		printf("%s/%s\n", LIBDIR, (is_static) ? STATIC_LIB : DYN_LIB);
 	}
 
@@ -255,8 +253,7 @@ static char *gen_prefix(const char *path)
 	for (i = len - 1; i >= 0; i--) {
 		if (!p1 && path[i] == '.') {
 			p2 = path + i - 1;
-		}
-		else if (!p1 && path[i] == '/') {
+		} else if (!p1 && path[i] == '/') {
 			p1 = path + i + 1;
 			break;
 		}
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 0d9f49c3f..631150c3e 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -374,8 +374,7 @@ static int __copy_task_regs(user_regs_struct_t *regs,
 		fpstate = &(core->ti_ppc64->tmstate->fpstate);
 		vrstate = &(core->ti_ppc64->tmstate->vrstate);
 		vsxstate = &(core->ti_ppc64->tmstate->vsxstate);
-	}
-	else {
+	} else {
 		gpregs = core->ti_ppc64->gpregs;
 		fpstate = &(core->ti_ppc64->fpstate);
 		vrstate = &(core->ti_ppc64->vrstate);
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index a38e47d12..745998afc 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1529,8 +1529,7 @@ static int cr_pre_dump_finish(int status)
 			timing_stop(TIME_MEMWRITE);
 			ret = page_xfer_predump_pages(item->pid->real,
 							&xfer, mem_pp);
-		}
-		else {
+		} else {
 			ret = page_xfer_dump_pages(&xfer, mem_pp);
 		}
 
diff --git a/test/zdtm/static/fifo_wronly.c b/test/zdtm/static/fifo_wronly.c
index 2fbd69e6b..78fc7c8f7 100644
--- a/test/zdtm/static/fifo_wronly.c
+++ b/test/zdtm/static/fifo_wronly.c
@@ -55,8 +55,7 @@ int main(int argc, char **argv)
 			pr_perror("read error %s", filename);
 			chret = errno;
 			return chret;
-		}
-		else if (res == 0) {
+		} else if (res == 0) {
 			pr_perror("read(%d, rbuf, 7) return 0", fd1);
 			return 1;
 		}
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 3e6b2ad48..f8af3dca2 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -280,8 +280,7 @@ int errors(int exp_len, int len, char *etalon_buf, char *buf) {
 			fail("Incorrect length of field name.");
 			error++;
 			break;
-		}
-		else if (event->len && strncmp(event->name, exp_event->name, event->len)) {
+		} else if (event->len && strncmp(event->name, exp_event->name, event->len)) {
 			fail("Handled file name %s, expected %s",
 				event->name,
 				exp_event->name);
diff --git a/test/zdtm/static/ptrace_sig.c b/test/zdtm/static/ptrace_sig.c
index f71517717..b70f8f1b0 100644
--- a/test/zdtm/static/ptrace_sig.c
+++ b/test/zdtm/static/ptrace_sig.c
@@ -74,8 +74,7 @@ int main(int argc, char ** argv)
 	if (cpid < 0) {
 		pr_perror("fork failed");
 		return 1;
-	}
-	else if (cpid == 0) {
+	} else if (cpid == 0) {
 		close(child_pipe[0]);
 		return child(child_pipe[1]);
 	}
diff --git a/test/zdtm/static/vsx.c b/test/zdtm/static/vsx.c
index be02cfe10..e7d81b12c 100644
--- a/test/zdtm/static/vsx.c
+++ b/test/zdtm/static/vsx.c
@@ -388,8 +388,7 @@ int main(int argc, char *argv[])
 			test_msg("Data mismatch\n");
 			fail();
 		}
-	}
-	else {
+	} else {
 		test_msg("The CPU is missing some features.\n");
 		fail();
 	}
diff --git a/test/zdtm/transition/epoll.c b/test/zdtm/transition/epoll.c
index 4eac5214c..6ab436889 100644
--- a/test/zdtm/transition/epoll.c
+++ b/test/zdtm/transition/epoll.c
@@ -181,8 +181,7 @@ int main(int argc, char **argv)
 			fail("waitpid error: %m\n");
 			counter++;
 			continue;
-		}
-		else {
+		} else {
 			rv = WEXITSTATUS(rv);
 			if (rv < MAX_EXIT_CODE && rv > SUCCESS) {
 				fail("Child failed: %s (%d)\n",

From ef7ef9cfa0c0ae4a2777c72b9facf994068b817e Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Tue, 14 Apr 2020 18:03:38 +0000
Subject: [PATCH 0216/1854] kerndat: remove duplicate call to
 kerndat_socket_netns()

kerndat_socket_netns() is called twice. We keep the latter to avoid
changing the behavior.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/kerndat.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 0c6910da9..0421997af 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1068,8 +1068,6 @@ int kerndat_init(void)
 		ret = kerndat_tcp_repair();
 	if (!ret)
 		ret = kerndat_compat_restore();
-	if (!ret)
-		ret = kerndat_socket_netns();
 	if (!ret)
 		ret = kerndat_tun_netns();
 	if (!ret)

From 2c2fdd3334078f5eefea4f82f0df0fccfc8a9238 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Mon, 13 Apr 2020 17:20:34 +0000
Subject: [PATCH 0217/1854] parasite-msg: %u is not implemented for parasite
 code

Changed all the %u into %d.

Ideally, we should implement the %u format for parasite code.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/pie/parasite.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 64b5bbb3e..d83978317 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -53,7 +53,7 @@ static int mprotect_vmas(struct parasite_dump_pages_args *args)
 		vma = vmas + i;
 		ret = sys_mprotect((void *)vma->start, vma->len, vma->prot | args->add_prot);
 		if (ret) {
-			pr_err("mprotect(%08lx, %lu) failed with code %d\n",
+			pr_err("mprotect(%08lx, %ld) failed with code %d\n",
 						vma->start, vma->len, ret);
 			break;
 		}
@@ -102,7 +102,7 @@ static int dump_pages(struct parasite_dump_pages_args *args)
 	}
 	if (spliced_bytes != args->nr_pages * PAGE_SIZE) {
 		sys_close(p);
-		pr_err("Can't splice all pages to pipe (%lu/%d)\n", spliced_bytes, args->nr_pages);
+		pr_err("Can't splice all pages to pipe (%ld/%d)\n", spliced_bytes, args->nr_pages);
 		return -1;
 	}
 

From 42b5700b72c0bebbef113554c064827a3ab40b18 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 15 Apr 2020 11:34:47 +0300
Subject: [PATCH 0218/1854] kerndat remove duplicate call to kerndat_nsid()

Func kerndat_nsid() is called twice.

v2: leave kerndat_nsid call near kerndat_link_nsid

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/kerndat.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 0421997af..0b6d53bc7 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1092,8 +1092,6 @@ int kerndat_init(void)
 		ret = kerndat_vdso_preserves_hint();
 	if (!ret)
 		ret = kerndat_socket_netns();
-	if (!ret)
-		ret = kerndat_nsid();
 	if (!ret)
 		ret = kerndat_x86_has_ptrace_fpu_xsave_bug();
 	if (!ret)

From 7dc89376b85ddea408d43527ff42f4e86ea77a41 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 1 Apr 2020 10:43:25 +0300
Subject: [PATCH 0219/1854] pstree: improve error handling in read_pstree_image

First don't free pstree_item as they are allocated with shmalloc on
restore. Second always pstree_entry__free_unpacked PstreeEntry. Third
remove all breaks replacing them with implict goto err, so that it would
be easier to understand that we are on error path. Forth split out
code for reading one pstree item in separate function.

Sadly there is no much use in xfree-ing pi->threads because in case of
an error we still have ->threads unfreed from previous entries anyway.

But at least some cleanup can be done here.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pstree.c | 197 ++++++++++++++++++++++++++------------------------
 1 file changed, 103 insertions(+), 94 deletions(-)

diff --git a/criu/pstree.c b/criu/pstree.c
index d0e81bfad..5de367688 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -498,11 +498,109 @@ static int read_pstree_ids(struct pstree_item *pi)
 	return 0;
 }
 
+/*
+ * Returns <0 on error, 0 on eof and >0 on successful read
+ */
+static int read_one_pstree_item(struct cr_img *img, pid_t *pid_max)
+{
+	struct pstree_item *pi;
+	PstreeEntry *e;
+	int ret, i;
+
+	ret = pb_read_one_eof(img, &e, PB_PSTREE);
+	if (ret <= 0)
+		return ret;
+
+	ret = -1;
+	pi = lookup_create_item(e->pid);
+	if (pi == NULL)
+		goto err;
+	BUG_ON(pi->pid->state != TASK_UNDEF);
+
+	/*
+	 * All pids should be added in the tree to be able to find
+	 * free pid-s for helpers. pstree_item for these pid-s will
+	 * be initialized when we meet PstreeEntry with this pid or
+	 * we will create helpers for them.
+	 */
+	if (lookup_create_item(e->pgid) == NULL)
+		goto err;
+	if (lookup_create_item(e->sid) == NULL)
+		goto err;
+
+	pi->pid->ns[0].virt = e->pid;
+	if (e->pid > *pid_max)
+		*pid_max = e->pid;
+	pi->pgid = e->pgid;
+	if (e->pgid > *pid_max)
+		*pid_max = e->pgid;
+	pi->sid = e->sid;
+	if (e->sid > *pid_max)
+		*pid_max = e->sid;
+	pi->pid->state = TASK_ALIVE;
+
+	if (e->ppid == 0) {
+		if (root_item) {
+			pr_err("Parent missed on non-root task "
+			       "with pid %d, image corruption!\n", e->pid);
+			goto err;
+		}
+		root_item = pi;
+		pi->parent = NULL;
+	} else {
+		struct pid *pid;
+		struct pstree_item *parent;
+
+		pid = pstree_pid_by_virt(e->ppid);
+		if (!pid || pid->state == TASK_UNDEF || pid->state == TASK_THREAD) {
+			pr_err("Can't find a parent for %d\n", vpid(pi));
+			goto err;
+		}
+
+		parent = pid->item;
+		pi->parent = parent;
+		list_add(&pi->sibling, &parent->children);
+	}
+
+	pi->nr_threads = e->n_threads;
+	pi->threads = xmalloc(e->n_threads * sizeof(struct pid));
+	if (!pi->threads)
+		goto err;
+
+	for (i = 0; i < e->n_threads; i++) {
+		struct pid *node;
+		pi->threads[i].real = -1;
+		pi->threads[i].ns[0].virt = e->threads[i];
+		pi->threads[i].state = TASK_THREAD;
+		pi->threads[i].item = NULL;
+		if (i == 0)
+			continue; /* A thread leader is in a tree already */
+		node = lookup_create_pid(pi->threads[i].ns[0].virt, &pi->threads[i]);
+
+		BUG_ON(node == NULL);
+		if (node != &pi->threads[i]) {
+			pr_err("Unexpected task %d in a tree %d\n", e->threads[i], i);
+			goto err;
+		}
+	}
+
+	task_entries->nr_threads += e->n_threads;
+	task_entries->nr_tasks++;
+
+	/* note: we don't fail if we have empty ids */
+	if (read_pstree_ids(pi) < 0)
+		goto err;
+
+	ret = 1;
+err:
+	pstree_entry__free_unpacked(e, NULL);
+	return ret;
+}
+
 static int read_pstree_image(pid_t *pid_max)
 {
-	int ret = 0, i;
 	struct cr_img *img;
-	struct pstree_item *pi;
+	int ret;
 
 	pr_info("Reading image tree\n");
 
@@ -510,99 +608,10 @@ static int read_pstree_image(pid_t *pid_max)
 	if (!img)
 		return -1;
 
-	while (1) {
-		PstreeEntry *e;
+	do {
+		ret = read_one_pstree_item(img, pid_max);
+	} while (ret > 0);
 
-		ret = pb_read_one_eof(img, &e, PB_PSTREE);
-		if (ret <= 0)
-			break;
-
-		ret = -1;
-		pi = lookup_create_item(e->pid);
-		if (pi == NULL)
-			break;
-		BUG_ON(pi->pid->state != TASK_UNDEF);
-
-		/*
-		 * All pids should be added in the tree to be able to find
-		 * free pid-s for helpers. pstree_item for these pid-s will
-		 * be initialized when we meet PstreeEntry with this pid or
-		 * we will create helpers for them.
-		 */
-		if (lookup_create_item(e->pgid) == NULL)
-			break;
-		if (lookup_create_item(e->sid) == NULL)
-			break;
-
-		pi->pid->ns[0].virt = e->pid;
-		if (e->pid > *pid_max)
-			*pid_max = e->pid;
-		pi->pgid = e->pgid;
-		if (e->pgid > *pid_max)
-			*pid_max = e->pgid;
-		pi->sid = e->sid;
-		if (e->sid > *pid_max)
-			*pid_max = e->sid;
-		pi->pid->state = TASK_ALIVE;
-
-		if (e->ppid == 0) {
-			if (root_item) {
-				pr_err("Parent missed on non-root task "
-				       "with pid %d, image corruption!\n", e->pid);
-				goto err;
-			}
-			root_item = pi;
-			pi->parent = NULL;
-		} else {
-			struct pid *pid;
-			struct pstree_item *parent;
-
-			pid = pstree_pid_by_virt(e->ppid);
-			if (!pid || pid->state == TASK_UNDEF || pid->state == TASK_THREAD) {
-				pr_err("Can't find a parent for %d\n", vpid(pi));
-				pstree_entry__free_unpacked(e, NULL);
-				xfree(pi);
-				goto err;
-			}
-
-			parent = pid->item;
-			pi->parent = parent;
-			list_add(&pi->sibling, &parent->children);
-		}
-
-		pi->nr_threads = e->n_threads;
-		pi->threads = xmalloc(e->n_threads * sizeof(struct pid));
-		if (!pi->threads)
-			break;
-
-		for (i = 0; i < e->n_threads; i++) {
-			struct pid *node;
-			pi->threads[i].real = -1;
-			pi->threads[i].ns[0].virt = e->threads[i];
-			pi->threads[i].state = TASK_THREAD;
-			pi->threads[i].item = NULL;
-			if (i == 0)
-				continue; /* A thread leader is in a tree already */
-			node = lookup_create_pid(pi->threads[i].ns[0].virt, &pi->threads[i]);
-
-			BUG_ON(node == NULL);
-			if (node != &pi->threads[i]) {
-				pr_err("Unexpected task %d in a tree %d\n", e->threads[i], i);
-				return -1;
-			}
-		}
-
-		task_entries->nr_threads += e->n_threads;
-		task_entries->nr_tasks++;
-
-		pstree_entry__free_unpacked(e, NULL);
-
-		ret = read_pstree_ids(pi);
-		if (ret < 0)
-			goto err;
-	}
-
-err:
 	close_image(img);
 	return ret;
 }

From c83a0aae2c71b66abf613c8ef5fe97b7311e1987 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 11 Apr 2020 06:37:38 +0300
Subject: [PATCH 0220/1854] proc: parse clock symbolic names in
 /proc/pid/timens_offsets

Clock IDs in this file has been replaced by clock symbolic names.

Now it looks like this:
    $ cat /proc/774/timens_offsets
    monotonic      864000         0
    boottime      1728000         0

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/proc_parse.c | 22 ++++++++++++----------
 criu/timens.c     |  6 ++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index c73fa9776..4a22700aa 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1484,25 +1484,27 @@ int parse_timens_offsets(struct timespec *boff, struct timespec *moff)
 	}
 	while (fgets(buf, BUF_SIZE, f)) {
 		int64_t sec, nsec;
-		int clockid;
+		char clockid[10];
 
-		if (sscanf(buf, "%d %"PRId64" %"PRId64"\n", &clockid, &sec, &nsec) != 3) {
+		if (sscanf(buf, "%9s %"PRId64" %"PRId64"\n", clockid, &sec, &nsec) != 3) {
 			pr_err("Unable to parse: %s\n", buf);
 			goto out;
 		}
-		switch (clockid) {
-		case CLOCK_MONOTONIC:
+		clockid[sizeof(clockid) - 1] = 0;
+		if (strcmp(clockid, "monotonic") == 0 ||
+		    strcmp(clockid, __stringify(CLOCK_MONOTONIC)) == 0) {
 			moff->tv_sec = sec;
 			moff->tv_nsec = nsec;
-			break;
-		case CLOCK_BOOTTIME:
+			continue;
+		}
+		if (strcmp(clockid, "boottime") == 0 ||
+		    strcmp(clockid, __stringify(CLOCK_BOOTTIME)) == 0) {
 			boff->tv_sec = sec;
 			boff->tv_nsec = nsec;
-			break;
-		default:
-			pr_err("Unknown clockid: %d\n", clockid);
-			goto out;
+			continue;
 		}
+		pr_err("Unknown clockid: %s\n", clockid);
+		goto out;
 	}
 	exit_code = 0;
 out:
diff --git a/criu/timens.c b/criu/timens.c
index f3b50fdff..2a7e95284 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -92,8 +92,7 @@ int prepare_timens(int id)
 	ts.tv_nsec = te->monotonic->tv_nsec - ts.tv_nsec;
 	normalize_timespec(&ts);
 
-	pr_debug("timens: %d %ld %ld\n",
-		 CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec);
+	pr_debug("timens: monotonic %ld %ld\n", ts.tv_sec, ts.tv_nsec);
 	if (dprintf(fd, "%d %ld %ld\n",
 		    CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec) < 0) {
 		pr_perror("Unable to set a monotonic clock offset");
@@ -109,8 +108,7 @@ int prepare_timens(int id)
 	ts.tv_nsec = te->boottime->tv_nsec - ts.tv_nsec;
 	normalize_timespec(&ts);
 
-	pr_debug("timens: %d %ld %ld\n",
-		 CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec);
+	pr_debug("timens: boottime %ld %ld\n", ts.tv_sec, ts.tv_nsec);
 	if (dprintf(fd, "%d %ld %ld\n",
 		    CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec) < 0) {
 		pr_perror("Unable to set a boottime clock offset");

From 5c5e7695a51318b17e3d982df8231ac83971641c Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 20 Apr 2020 15:45:51 -0700
Subject: [PATCH 0221/1854] get_clean_mount: demote an error to a warning

When testing runc checkpointing, I frequently see the following error:

> Error (criu/mount.c:1107): mnt: Can't create a temporary directory: Read-only file system

This happens because container root is read-only mount.

The error here is not actually fatal since it is handled later
in ns_open_mountpoint() (at least since [1] is fixed), but it is shown
as error in runc integration tests.

Since it is not fatal, let's demote it to a warning to avoid confusion.

[1] https://github.com/checkpoint-restore/criu/issues/520

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 180f2a62d..89b8cff59 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1104,7 +1104,7 @@ static char *get_clean_mnt(struct mount_info *mi, char *mnt_path_tmp, char *mnt_
 	if (mnt_path == NULL && errno == ENOENT)
 		mnt_path = mkdtemp(mnt_path_root);
 	if (mnt_path == NULL) {
-		pr_perror("Can't create a temporary directory");
+		pr_warn("Can't create a temporary directory: %s\n", strerror(errno));
 		return NULL;
 	}
 

From 95ead14874244f3c12e5970a74d1f4dd2433d652 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 29 Apr 2020 16:31:49 +0300
Subject: [PATCH 0222/1854] =?UTF-8?q?criu:=20Version=20=CF=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The long-tempting release with lots of new features on board.
We have finally the time namespace support, great improvment of
the pre-dump memory consumption, new clone3 support and many
more.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 Makefile.versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index f3adcb0a6..3ccc48185 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 13
+CRIU_VERSION_MINOR	:= 14
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Silicon Willet
+CRIU_VERSION_NAME	:= Platinum Peacock
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From f2edc1e1999e7c495af404fc6c38b82c391854ec Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 6 May 2020 13:13:38 +0000
Subject: [PATCH 0223/1854] Update certificates for failing tls based tests

When using zdtm.py with --tls it started to fail as the certificates
seem to have expired. Following commands have been used to re-generate
the certificate:

            # Generate CA key and certificate
            echo -ne "ca\ncert_signing_key" > temp
            certtool --generate-privkey > cakey.pem
            certtool --generate-self-signed \
                --template temp \
                --load-privkey cakey.pem \
                --outfile cacert.pem

            # Generate server key and certificate
            echo -ne "cn=$HOSTNAME\nencryption_key\nsigning_key" > temp
            certtool --generate-privkey > key.pem
            certtool --generate-certificate \
                --template temp \
                --load-privkey key.pem \
                --load-ca-certificate cacert.pem \
                --load-ca-privkey cakey.pem \
                --outfile cert.pem
            rm temp cakey.pem

Without this tests will fail in Travis.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/pki/cacert.pem |  42 +++---
 test/pki/cert.pem   |  44 +++----
 test/pki/key.pem    | 310 ++++++++++++++++++++++----------------------
 3 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/test/pki/cacert.pem b/test/pki/cacert.pem
index 2f8706616..65afd2aa7 100644
--- a/test/pki/cacert.pem
+++ b/test/pki/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0TCCAjmgAwIBAgIUWzgmx9p7y7mkrNptGX9+0acjpa4wDQYJKoZIhvcNAQEL
-BQAwADAeFw0xOTA1MDYxMjAzMDJaFw0yMDA1MDUxMjAzMDJaMAAwggGiMA0GCSqG
-SIb3DQEBAQUAA4IBjwAwggGKAoIBgQD0p0lJUlq917GmJuCBeP2eLNd1/MUg1ojy
-s7rrpinPYtLZqqquUhp32lfQtt3uJLjkhTrseZd86zWi3SMZlGs8zGGmKfqg0vaG
-BXIgpEIr5C0wU9995kL9A6LS+eFZR6vJQETO5T22tjponoqEPOXeU8VaiC9jNipC
-uFJT0wyC0bKIo+TUn573kxsGMt8jMOv0tc/okUlH16UAsYrmN7kWzgkWTJPddB7S
-v5a9ibpPkbh+wrIGK5A6V5hTZ8U1wz2bE6/Xp+qjsD2R3jeU6f1tDvc8FZilabQy
-Rmbxggucl1G3Ulo6Nvor1lhog72eZlHZujzf/5e/aMiZ7Br6plZ1/WTwtNgoCw6A
-rgpLDraasQohiK6opYs2rr7uuiQxPLLVWE/RryXwUEoPXzxaf782XtXxkB0UhGvz
-y2JBxCVPn7uUGuyEYywjTjI2UFvsMcXnMiQ4WaAfMbAmrBWM7EQ4b7VpD2c+OZkQ
-J/AJeg85/ovTAtHPjhPP+0a9hnirktkCAwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB
-/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBQOg6AA8Qu/m/O/II5spzYsTnsn
-pjANBgkqhkiG9w0BAQsFAAOCAYEA1KKtw+ILKOg1AhGwgPsJXAWZoSIt7hdLaJ3P
-WGyTWHLKKoJiGlLj3bSsJcMmMO+UwHBH9lmXrOWe/xcOvob2H+7dXbddQ0pX1wzK
-KJKzSG35FZ2BfuSn5oEDtRsHnN2Ikc5MYz1a+F4w2tVL/Hcxld+oSAodDlCbGoe+
-0MkI5f1KhdAw00l/5IO7xPOcThjHw+nB5/cZTQ+l4zLWCWaXkor4IAEq/plPcdX1
-uoLSj3JruLz7/ts/EgG+ARAzXQrJ+LM2hdPB1NiaVxFq7MSWM6FybUdmMYgbP5s4
-RMNqI/M+bU9K5LRySDaiPhDXUoVULuqG1a23GQwXLOjF0JbrUQewfAaTO7TaPFh1
-lr25j9Fc9/gcXZjvLl+CEIv6P/haGOwySCTCks0F5bDehbLjZStPmugcnJflXdBn
-lzoejlw2rePojQMlffQsaRGmmhj0beU4WQBfGACcZQB8GFNxQB8aynf0CK7Dvvb0
-9c9y4k0gHL7RxeLoQfq+smzKm+Eo
+MIID0TCCAjmgAwIBAgIUF0WMpaJUi0+wXbOKQ6P41ZeRwdQwDQYJKoZIhvcNAQEL
+BQAwADAeFw0yMDA1MDYxMzEwMzNaFw0yMTA1MDYxMzEwMzNaMAAwggGiMA0GCSqG
+SIb3DQEBAQUAA4IBjwAwggGKAoIBgQDMPLu3o8RMlWlblK03GynmvNZDQKW0ZTYg
+dE/Dlr/rVKo8KMAm6KbmpUJq8HUtaP/9Epf2eY9+LNNpBFKJuURxD23ObNdbU6o6
+hI4LRQVYsX6FB+6DrIXfD61zxebdpPWlCyoEd43firfwMoeGyarqyrZE+UXkR4fF
+LhVm/4kQ8qRZte+GAIVp0SVMlNyhQM5AmTZPAO3iYRhZObkVFUTWnwjdxKOx1VhU
+vRdhwI4N5x9EGiq6Lzc0iABxyIZ1mHOYhxDQv5gL4CECUZgzVxJp6DVP/v2w4254
+JeKXOPUm6YHxXxzJyT73mdz0/7VpqOZa5yiZKRBtHoWyovuTzu8jS6TgvjNrmAoO
+kyu13jTlBDFUfVKBDoRQMhjt6wpMkUItYvVRq/RYLvXGU7VCzUHoVdBxNNO+MrZ2
+4ebN5l5/CSrOeaa0EylLLlkW7Q0JqmZJpZfK8/AnMyp71AkHTps5LZv/sLbPWwh1
+3XTZA1e+k9lS1Z480HjtNKurL526k8ECAwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB
+/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBR5rZcu6Unhc0ZuuflmHEOa9bBu
+1zANBgkqhkiG9w0BAQsFAAOCAYEAehfgQ1y3GTJ3LPQQOgn3AB/Sf+fGSNecZsTO
+UxGFxbNGvl7UeFCS8Z1/h57AeIXSvE+BGfMvtq9OSl6t+3w9RfbIdzWzYYILoAVM
+t0FkwrjLtVIlUSWD+Aia01ESjw+3ENceGcuo9jVyAI3MMkGftFc7U1UyNB9HY//x
+79uUavmWioc3odooC0FOosIzV2KHCUPAnpN7TtNlefe4JisMa6WGXAk9CNU9t0wG
+JLHK3E0LrtEreIMBmK6zyxH3OwMi1x/3sFSoon09/fsOLBbtUY+401a+nT+vMTKK
+KpVvAC4tsEyFH0vyk68c6Z4VKO5aqoAtaQJZk2A2z1cBAz4aArgx1glkaNjd7sZn
+lSEhnpP7uVUyYU9fyQ46zpIZm38gx6+95XL2gCQnEIUEeOCXMonXaavMqRx5zL8z
+hihMSoLhE6Wx/tzxKlqz0GN8E0CTlpB1MmvCvOkaHzSq7Yc19Bez8jr6PNfZVsFv
+s9a4qqhGKaLz7HKpG0863oCO4dU1
 -----END CERTIFICATE-----
diff --git a/test/pki/cert.pem b/test/pki/cert.pem
index a0946ee41..f5a0452b5 100644
--- a/test/pki/cert.pem
+++ b/test/pki/cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEAzCCAmugAwIBAgIUKV6zLC//OJDnmOYBuIG1Gvmv+V4wDQYJKoZIhvcNAQEL
-BQAwADAeFw0xOTA1MDYxMjAzMDJaFw0yMDA1MDUxMjAzMDJaMBQxEjAQBgNVBAMT
-CWxvY2FsaG9zdDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANX1nv4J
-U8+TEb2bWej5O2nOowpw2zSYTDAQ1oyAvV3P99Y6GZCuVZ1uT/7DWat0uRpcdmNi
-HvownkO4VmDZdVqgiK1eHzY5YBJ7hBVDs3tpWNuN7eJPjnskNmJqKQ6l9rxYl/au
-781T+tdtHp1ATtToMgVJxWaUx5lrpEJdmYc8Y6GpAA42D+rI3o4Sll3mI5rPCk16
-QY5dT2lnL2HuCKzM2bjWat6b3lMpfNz3A/blU9E/462Zxr/yKK/0yy3SBZhYzrrQ
-1/erjIpm4I0sakHIOexM1AQliFiowFzVvr/paiXApWGOcuBJVIbmPI/bEGuTh0nr
-3pmiF0YrkDCRhargElYcz64KQ9IxPFCKcKjkMnFPjTStZ7rcMyqKvGczqFaM5a6c
-9gIn2ieUrVZ38yvtI5Lo/uxZ5IjXqB1Fdg4xi2tyf9WMHKy2tydBr9bTjfQRXfNT
-/Zm3woDXOYsHzj+Sf6ntLVCkO1fnczw03fPRV03/uVRa5mPGyyj9xdPBqwIDAQAB
-o2EwXzAMBgNVHRMBAf8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFEtF
-ELehnIjLzoh/W51TGm2B00QAMB8GA1UdIwQYMBaAFA6DoADxC7+b878gjmynNixO
-eyemMA0GCSqGSIb3DQEBCwUAA4IBgQA17NZCaiCgD9P4GPWgdVNkWUrmc8itJuIB
-z3c9RdJGduxb9W/D7IW//D3hIblOPorNi3+08kO/IRMGah874MDCprMNppk94WGj
-Kgqi/rsxq+rT6bcZXxMrcOIg0j2EvTPIgPh7trd8nHVWxNT/hvFClDtBJ2ssL2Tz
-76EA7smDCUsfdzFJ2Xvk95fSTL49nfT2j9N/YoLaBQtCIxWAVZHKiCF2K+yXufHz
-B/9UlXwsPJfqxM75dYWXFEqvhNf08YRHT1e1GRrybNGrNKF864KbLsnASdK4N5wu
-sK9vZJ7VkLDQz+YpZkbm+UgOYK/BY3M8IX+F+WngV+43fr6Wh89TSgD7acEBvQTm
-q1y9FipRvz0my7fwBh6UlYDja6/3yw6/YfN7uMFGsOOSgpNDCrMLqesf8l1HdQUF
-VaVJyDjgFswV9KykAeJK2KU8QI7TGHv9soW60sr97DgUtCh4a6OPXLt79Ji3RSNw
-MbU54JnpnfmMAj/0suDymdrJWv8EJKc=
+MIIEAjCCAmqgAwIBAgIURFKv2lJVvIEfr7yjE7pK0BdK9W8wDQYJKoZIhvcNAQEL
+BQAwADAeFw0yMDA1MDYxMzExMDVaFw0yMTA1MDYxMzExMDVaMBMxETAPBgNVBAMT
+CGZlZG9yYTAxMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAtS2SivLa
+AfsZ1X9xun/6i/1UNSxG5kPvVkfTPWOwSgCYyqn7u2vZsIsvcurqHQBEg1SWF4XA
+dcFeCxdDN8em6ISfSOUFL9TSQrZ5eFQYcVTX9IFXDWXbFSC8AgJpYhrPf2O0vxQN
+QFD4MpNXrLpEkc3vLrg/JhySC1HAYfO/nuJV3ZnAxJZCIv4upT5j0VjzfPw6WR/O
+UUlcmLnh0+qMLv7G2dRLjdAsV1U8k7eykk+z9qXeKAjgFBEEgLTVbHR1zbrUpw42
+DYR7SQpEJ8wrJ9qHdI4H/9MnPu8O75kfgauQV4s/oIgWmVeHMDxpGaLEKgcYVE2F
+/HlMfFvCrrZKKXi1/k35rG8sg6cP/bRuRZlgO0xFTrW0QKmWoBLqyqVMvifdkT0E
+BWZ4eZWTDn2Rr4HMe7ov54QmKXaXp2VdOGzO1Efv9KvDildb5aEqBrVz+tU+C/Cd
+g5p1d2g2m1Uk9wjcYbXOWx9fd9Ur/fxJuHtauxOW4gzFLcTOgvUgVmSXAgMBAAGj
+YTBfMAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUh+RA
+Kg+4YVs/x9A0hxJlkDxG7IQwHwYDVR0jBBgwFoAUea2XLulJ4XNGbrn5ZhxDmvWw
+btcwDQYJKoZIhvcNAQELBQADggGBAMLv1btjFDwxds0XlPH792ECXgYOXPC8cJAx
+MJ+qdop/nNW8iUUoOjwy1f9jXBjz1bHKJ+XnyTz4rhLWIHVnhsiLMQ+ljHgTtTjY
+3K6Lzo9+KMG/WDRajID8Sk2/B3jnCjgdzb6C4TZQ1mxnhSD7Cj/VitkVLP3D2nYx
+55bXqAHAtSkW965LAxILSzt04a8MM9ZxNzyruGVI+jPF0OSgDNcJpcwUw8w8V1lj
+c5TC9qqRlokFGphR45vblTw3GaXuZ5TTLOdix0QOhl52H2BtCrvTWJLREC5VJ87C
+2FjXIz5zj1WZ3CDZVbpFhTiZy/chHJNaiiDWe6QhD40VvKlo/netp+rxwrpGsFkC
+mtyRKrutdKi0vDvI6sKu13gLxetL+Bd6XWZ+XRsA/687QE+epxoh8sTvIt9j0z5r
+0yIv/0eTKVZLQ6cAXSoR1g1GwTsWf0eBRgePdl4MCXVAs8+X1hTqnrJomiUdm93C
+d2+QakSAhreCtlqMz/AULryv3KgaEg==
 -----END CERTIFICATE-----
diff --git a/test/pki/key.pem b/test/pki/key.pem
index eda1aa761..7acde5181 100644
--- a/test/pki/key.pem
+++ b/test/pki/key.pem
@@ -3,180 +3,180 @@ Public Key Info:
 	Key Security Level: High (3072 bits)
 
 modulus:
-	00:d5:f5:9e:fe:09:53:cf:93:11:bd:9b:59:e8:f9:3b
-	69:ce:a3:0a:70:db:34:98:4c:30:10:d6:8c:80:bd:5d
-	cf:f7:d6:3a:19:90:ae:55:9d:6e:4f:fe:c3:59:ab:74
-	b9:1a:5c:76:63:62:1e:fa:30:9e:43:b8:56:60:d9:75
-	5a:a0:88:ad:5e:1f:36:39:60:12:7b:84:15:43:b3:7b
-	69:58:db:8d:ed:e2:4f:8e:7b:24:36:62:6a:29:0e:a5
-	f6:bc:58:97:f6:ae:ef:cd:53:fa:d7:6d:1e:9d:40:4e
-	d4:e8:32:05:49:c5:66:94:c7:99:6b:a4:42:5d:99:87
-	3c:63:a1:a9:00:0e:36:0f:ea:c8:de:8e:12:96:5d:e6
-	23:9a:cf:0a:4d:7a:41:8e:5d:4f:69:67:2f:61:ee:08
-	ac:cc:d9:b8:d6:6a:de:9b:de:53:29:7c:dc:f7:03:f6
-	e5:53:d1:3f:e3:ad:99:c6:bf:f2:28:af:f4:cb:2d:d2
-	05:98:58:ce:ba:d0:d7:f7:ab:8c:8a:66:e0:8d:2c:6a
-	41:c8:39:ec:4c:d4:04:25:88:58:a8:c0:5c:d5:be:bf
-	e9:6a:25:c0:a5:61:8e:72:e0:49:54:86:e6:3c:8f:db
-	10:6b:93:87:49:eb:de:99:a2:17:46:2b:90:30:91:85
-	aa:e0:12:56:1c:cf:ae:0a:43:d2:31:3c:50:8a:70:a8
-	e4:32:71:4f:8d:34:ad:67:ba:dc:33:2a:8a:bc:67:33
-	a8:56:8c:e5:ae:9c:f6:02:27:da:27:94:ad:56:77:f3
-	2b:ed:23:92:e8:fe:ec:59:e4:88:d7:a8:1d:45:76:0e
-	31:8b:6b:72:7f:d5:8c:1c:ac:b6:b7:27:41:af:d6:d3
-	8d:f4:11:5d:f3:53:fd:99:b7:c2:80:d7:39:8b:07:ce
-	3f:92:7f:a9:ed:2d:50:a4:3b:57:e7:73:3c:34:dd:f3
-	d1:57:4d:ff:b9:54:5a:e6:63:c6:cb:28:fd:c5:d3:c1
-	ab:
+	00:b5:2d:92:8a:f2:da:01:fb:19:d5:7f:71:ba:7f:fa
+	8b:fd:54:35:2c:46:e6:43:ef:56:47:d3:3d:63:b0:4a
+	00:98:ca:a9:fb:bb:6b:d9:b0:8b:2f:72:ea:ea:1d:00
+	44:83:54:96:17:85:c0:75:c1:5e:0b:17:43:37:c7:a6
+	e8:84:9f:48:e5:05:2f:d4:d2:42:b6:79:78:54:18:71
+	54:d7:f4:81:57:0d:65:db:15:20:bc:02:02:69:62:1a
+	cf:7f:63:b4:bf:14:0d:40:50:f8:32:93:57:ac:ba:44
+	91:cd:ef:2e:b8:3f:26:1c:92:0b:51:c0:61:f3:bf:9e
+	e2:55:dd:99:c0:c4:96:42:22:fe:2e:a5:3e:63:d1:58
+	f3:7c:fc:3a:59:1f:ce:51:49:5c:98:b9:e1:d3:ea:8c
+	2e:fe:c6:d9:d4:4b:8d:d0:2c:57:55:3c:93:b7:b2:92
+	4f:b3:f6:a5:de:28:08:e0:14:11:04:80:b4:d5:6c:74
+	75:cd:ba:d4:a7:0e:36:0d:84:7b:49:0a:44:27:cc:2b
+	27:da:87:74:8e:07:ff:d3:27:3e:ef:0e:ef:99:1f:81
+	ab:90:57:8b:3f:a0:88:16:99:57:87:30:3c:69:19:a2
+	c4:2a:07:18:54:4d:85:fc:79:4c:7c:5b:c2:ae:b6:4a
+	29:78:b5:fe:4d:f9:ac:6f:2c:83:a7:0f:fd:b4:6e:45
+	99:60:3b:4c:45:4e:b5:b4:40:a9:96:a0:12:ea:ca:a5
+	4c:be:27:dd:91:3d:04:05:66:78:79:95:93:0e:7d:91
+	af:81:cc:7b:ba:2f:e7:84:26:29:76:97:a7:65:5d:38
+	6c:ce:d4:47:ef:f4:ab:c3:8a:57:5b:e5:a1:2a:06:b5
+	73:fa:d5:3e:0b:f0:9d:83:9a:75:77:68:36:9b:55:24
+	f7:08:dc:61:b5:ce:5b:1f:5f:77:d5:2b:fd:fc:49:b8
+	7b:5a:bb:13:96:e2:0c:c5:2d:c4:ce:82:f5:20:56:64
+	97:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	1e:38:b0:79:7f:85:c8:17:24:f5:5c:41:29:e8:32:5d
-	32:a3:d2:f0:b7:f5:c8:e1:52:14:be:c9:5f:d1:df:b3
-	65:75:6c:05:7a:6b:35:8a:a4:2f:46:73:ff:71:79:6e
-	3f:eb:f9:88:f6:2e:1b:f6:cc:14:12:b0:98:c3:7e:91
-	0b:85:e2:bf:1d:b7:82:09:30:f3:23:68:01:85:13:94
-	80:c9:9a:55:94:96:da:30:48:a0:29:ec:86:da:1b:d5
-	2b:2b:74:63:92:b8:2a:8f:87:29:f0:ae:d7:55:63:0d
-	2d:b3:0b:0e:2d:84:dc:d5:08:b5:ac:a0:f7:29:9d:71
-	89:3d:27:6a:eb:96:f5:4e:9b:8a:dc:14:82:0a:c7:5c
-	16:1c:d2:7e:b9:1b:13:69:d8:b2:b1:b1:7e:aa:a9:ad
-	06:ce:66:0e:5b:50:10:42:2a:0a:fd:29:14:f7:09:63
-	c1:20:18:5f:27:81:46:12:8c:b8:f4:89:a6:3d:55:a1
-	d4:64:fc:f2:db:d7:9c:f5:be:f7:9d:88:5c:6d:36:a4
-	4b:ea:c5:e3:ea:32:81:6b:f3:47:b5:35:d5:c4:1a:b2
-	ae:12:9d:19:a3:ec:a4:af:41:7e:5e:34:9d:f5:bc:b9
-	1f:a3:c2:32:b4:fc:95:a7:7a:54:04:e2:d6:4e:10:2f
-	66:68:8b:3b:20:ea:05:db:2e:72:01:11:e7:7c:f8:72
-	0f:60:be:f1:27:19:ad:3a:6f:e9:70:56:3a:86:6e:46
-	0d:e3:55:31:66:77:09:84:48:b9:25:4b:c3:26:70:12
-	ca:a4:5f:c6:3d:6a:e5:db:4d:63:04:b8:09:07:c9:30
-	85:08:9d:77:40:26:60:da:10:c2:53:d2:00:0d:9e:d9
-	d5:71:06:30:eb:fb:f7:3f:82:1f:b3:9a:f3:4d:24:86
-	2e:94:fd:06:9e:dc:26:68:fa:64:c3:f9:fa:08:c4:b2
-	ec:7a:f5:55:c5:10:b5:e2:2d:de:ba:04:30:10:5b:99
-
+	66:7a:51:72:30:6c:e9:43:eb:57:dc:4f:2a:ab:2a:bf
+	35:da:04:7d:77:d8:d4:c2:32:6e:4b:e8:64:53:99:77
+	fe:f4:5a:f3:5d:0e:62:c2:3d:e7:e7:bb:42:12:87:4d
+	39:6f:85:b9:e6:58:77:02:99:bb:f2:3b:7d:f8:7a:ca
+	f8:00:d4:8d:5d:c2:b1:41:00:a5:0f:cd:e4:db:32:77
+	47:f3:2f:99:5a:a5:ab:26:a7:2e:50:80:a6:b4:eb:ef
+	43:e1:d4:a1:63:a9:1f:20:ed:52:46:0f:08:4f:0f:6b
+	dd:2c:95:a3:77:6c:8a:2a:7d:26:8f:87:98:04:61:cd
+	29:be:3f:32:4e:bf:a2:c7:02:38:c6:14:a5:07:0b:a6
+	25:a2:d1:2a:0a:18:7b:d7:df:fd:2e:de:b2:2b:ef:80
+	c1:71:1e:52:bb:2d:8a:7b:1a:26:c7:2d:d2:70:b9:db
+	45:32:94:9d:34:cd:d8:58:e1:4b:47:b5:81:26:68:34
+	2a:32:02:0b:e6:95:3a:d2:d4:d6:e4:c7:bf:8e:04:4e
+	fc:75:e9:6d:f4:a4:a8:6b:50:76:7c:10:07:81:96:56
+	54:16:d7:39:8a:5f:51:79:1f:96:49:cb:d7:8b:0d:51
+	5d:4a:e8:22:fb:d1:92:a4:a2:02:65:24:0a:62:33:84
+	a9:df:a9:4f:40:1a:95:1d:98:ea:0c:23:05:c2:db:1e
+	4d:c5:f2:e9:63:6b:de:70:67:3a:a2:f4:72:c1:97:ae
+	d0:6f:78:82:2b:a1:6f:2c:d7:90:a3:4f:d6:f9:d6:80
+	11:d4:93:8e:e0:06:19:f6:d9:33:72:5d:d8:16:a2:ef
+	e1:a9:00:de:bc:7e:98:aa:97:45:b8:81:20:01:5d:0b
+	10:3d:69:a9:ba:7d:2c:1f:e0:17:0e:bc:ee:97:95:61
+	a7:6b:10:94:27:ad:ca:c1:93:3b:fa:dc:8d:3d:58:cc
+	fb:04:3f:7f:40:d6:6c:e8:83:a1:be:50:cd:46:73:11
+	
 
 prime1:
-	00:fb:d1:47:9d:9e:73:f8:1e:09:21:fd:89:16:05:56
-	af:a5:cf:52:d5:cd:f7:26:18:d1:84:3a:36:65:0b:a2
-	cd:f9:b8:99:c0:c7:ef:00:c9:2f:c9:92:1a:1d:3d:86
-	58:3b:b1:be:d4:8c:c6:1b:df:ba:ee:87:aa:d1:22:47
-	18:bd:de:01:0f:0d:cb:ac:d0:48:a4:f4:93:e2:a6:cb
-	b5:b7:f5:f5:72:dd:ec:ac:13:e8:3d:62:23:54:ac:52
-	ff:ee:9a:e1:7f:b0:ae:3b:41:38:d8:39:2b:40:ef:25
-	81:50:b0:98:db:f8:40:16:6e:1a:41:79:22:90:58:99
-	80:c2:0d:ba:b5:d3:54:ec:28:33:e4:b0:58:ea:de:61
-	a1:b7:30:0b:9d:dc:73:62:c2:07:d3:75:91:48:49:dd
-	be:cf:b2:90:95:8f:29:6c:6f:f6:68:cb:cf:d5:24:a3
-	d7:37:81:1b:34:3b:af:9a:48:52:af:53:7c:f7:32:a2
-	3f:
+	00:da:9b:62:22:f8:48:3e:9a:4f:ef:e5:b0:f1:e3:5e
+	ec:21:3d:3b:8f:ec:f1:d8:f6:fd:a7:2f:69:2a:cd:79
+	a1:4b:6b:39:36:e9:c3:a9:5b:f9:59:50:71:6b:72:b0
+	8d:13:ca:93:b1:4d:4b:55:3a:69:b2:84:8d:4e:18:77
+	68:ae:f6:d8:ec:43:ef:c8:21:51:b9:cb:86:b7:62:ab
+	5e:90:77:ac:e6:85:a9:e9:f7:19:f7:26:24:4c:18:81
+	53:85:42:cd:35:5c:1d:ae:70:0a:59:b0:44:a2:50:bc
+	68:3a:bd:c2:53:7f:2e:ab:04:2d:85:ee:7d:8a:0c:db
+	cc:85:5a:b5:f8:6f:f8:92:53:0c:93:00:f7:ff:84:61
+	d0:67:f4:10:b4:bf:9a:ba:35:df:05:79:d7:78:42:fb
+	48:c4:db:35:27:4f:18:cf:8d:da:26:13:36:84:42:5d
+	50:c4:9d:38:15:b5:6a:ca:3a:ab:f1:f9:b0:26:1a:54
+	99:
 
 prime2:
-	00:d9:83:5e:be:0a:ea:0b:d9:66:63:56:3b:9e:44:aa
-	46:6d:8d:6c:10:81:4b:de:19:5d:2c:16:7e:30:7c:ad
-	23:9a:89:53:cc:18:e8:e8:51:2b:79:35:d0:67:7d:9e
-	8f:be:ea:63:5e:14:c0:6b:ba:02:6c:4a:da:07:70:9d
-	14:fa:be:1e:40:47:50:6f:f2:5a:87:9e:b6:b1:b8:55
-	2c:b6:a2:e3:b0:24:ba:ea:9b:55:87:8b:4b:cf:40:4a
-	25:b4:89:cf:9e:76:ca:79:4a:f4:74:b7:ee:cf:6c:8f
-	cb:e3:3d:9e:86:3b:44:b7:70:ec:05:0c:68:ce:d6:c3
-	a2:ec:e6:11:d6:2f:f7:80:26:a9:5c:aa:b9:a6:33:84
-	a9:00:43:cf:72:07:8a:91:59:a2:b1:de:79:07:6b:81
-	67:a5:c2:4b:fd:29:8a:1a:96:66:57:66:d4:37:9a:98
-	69:d1:19:24:53:b1:a4:54:68:1e:8c:2b:b4:93:19:ed
-	95:
+	00:d4:2b:34:e6:a1:68:c9:c8:7a:22:5c:21:34:0f:67
+	4b:6a:78:d5:0e:63:be:4b:83:a3:ac:28:b6:37:80:c0
+	79:30:ec:0c:87:6d:c1:f2:d1:f8:bd:8d:3c:bb:20:81
+	d9:dd:6b:25:0d:0c:e4:15:39:11:06:31:06:84:2c:8d
+	12:73:04:b3:cf:fd:57:03:ca:65:3b:f7:e3:e0:6f:37
+	4c:b2:ef:c4:a3:cb:8b:54:f7:35:73:54:e4:f9:62:bd
+	1e:7a:c1:76:b1:f0:cc:d9:d0:fc:c7:83:59:07:3b:55
+	1f:a9:88:7e:e9:27:bb:e8:5a:a0:57:de:1d:f4:56:8c
+	a9:34:9b:0a:43:d5:a1:2a:97:80:27:07:ee:57:20:29
+	f7:08:02:78:c7:fc:9b:c9:28:64:a5:63:a4:a6:a2:65
+	48:fd:6d:42:b0:60:59:13:f7:f1:cd:78:09:94:66:42
+	36:6a:ee:7c:40:c5:f1:2f:f9:7e:ca:f7:b5:02:95:10
+	af:
 
 coefficient:
-	00:90:9a:7f:6f:14:a8:bc:79:3f:25:e5:62:f9:5d:29
-	78:a4:78:8e:7a:e4:8a:62:8a:7f:9c:ae:75:95:fe:ee
-	1a:99:53:40:01:76:29:7d:48:85:28:a2:2a:9f:0f:10
-	8c:19:6a:36:6b:e1:ac:a2:07:b9:72:5c:b9:a6:20:bb
-	8f:cb:f5:ea:dd:3f:0e:ab:9d:c1:57:7e:7b:96:f9:da
-	b0:52:3c:3f:62:94:e7:5c:04:9e:ac:60:cd:4d:ec:7e
-	68:d3:fb:2a:b4:02:f0:0e:be:37:bc:2a:f8:6e:8d:31
-	b5:38:67:00:9e:67:9f:71:d0:88:36:32:69:4b:20:73
-	eb:a1:d9:bc:72:c2:7e:39:1a:36:cc:c1:45:a2:14:37
-	e6:ca:db:4d:0b:5b:68:a4:ff:b7:7b:b1:db:2f:70:27
-	a1:6c:31:3f:c0:c3:23:04:b0:7a:e2:0d:21:ba:5a:80
-	52:c1:a1:2b:57:72:20:b6:ed:b1:e8:3b:95:88:81:90
-	5d:
+	00:c2:99:5b:b5:1c:59:73:c7:70:78:75:aa:67:4d:92
+	d1:27:b6:47:be:e2:71:39:31:f7:5d:be:79:bd:22:b2
+	34:80:b0:a5:39:ab:b2:53:2a:28:f9:4a:34:20:b6:ea
+	25:d5:df:34:ad:d0:b3:26:ed:ba:f3:0c:07:95:34:50
+	ae:48:40:a7:5b:f7:8c:e4:c6:d6:a4:1f:18:07:2a:ea
+	01:38:90:d5:ca:89:19:3d:8e:c2:40:05:e5:09:a8:30
+	78:6c:e9:e6:1d:6c:5b:22:a9:24:d0:07:41:95:0e:82
+	f6:19:e4:6c:c1:96:ae:c3:5d:84:a9:02:e5:7c:d6:b9
+	f7:94:0f:b9:5a:41:87:db:03:17:9b:39:b2:e9:bb:f5
+	3f:0d:91:6d:d2:32:fe:ef:60:19:3c:15:48:c1:a8:e7
+	4c:b8:bd:dc:31:43:49:df:05:be:c5:3b:6a:5d:68:91
+	6d:e6:47:0b:a4:27:74:44:42:12:31:02:ad:aa:7e:e8
+	0c:
 
 exp1:
-	00:ef:ce:66:20:01:44:b9:35:89:46:f8:56:33:45:54
-	3f:23:6d:23:9a:7e:71:6d:b3:56:db:50:40:7a:cb:b0
-	f7:ec:67:52:ec:96:b9:d1:8a:c6:5a:74:2b:30:4b:66
-	03:e2:9d:2b:78:e8:b2:c4:da:b3:fe:f1:ed:c7:09:98
-	a1:44:37:05:d5:1b:33:2a:58:93:c5:9b:30:b6:38:57
-	68:af:4e:a8:b7:02:06:9f:fc:b9:3e:b3:95:a7:ce:0f
-	a0:b0:ce:88:0e:7c:e7:ff:7f:e6:2d:6b:8b:f8:63:85
-	d8:f7:49:a5:d8:5d:3a:52:e1:f9:58:fe:8d:de:de:b1
-	18:40:34:a8:e8:fc:df:33:a2:39:81:00:3b:3d:38:17
-	cb:d4:53:09:cd:04:a2:51:9b:2b:ae:c1:98:60:3a:0f
-	d4:e5:a0:4c:36:51:46:86:80:bd:2d:21:62:c3:bd:07
-	d6:2d:82:62:b0:c4:62:3f:4f:be:86:3e:c0:93:fc:81
-	2b:
+	00:a6:15:8d:5e:a2:21:49:26:b5:fa:be:18:4b:fe:01
+	bd:06:97:dd:eb:c0:0a:12:5b:bc:64:cb:79:6c:22:85
+	f9:0c:32:9f:5a:60:09:de:5e:d9:37:89:0d:52:a3:e5
+	0c:99:ef:bb:7b:e6:0c:88:e9:03:2a:b4:d8:22:70:26
+	30:6b:55:71:83:37:2e:32:6f:56:07:01:61:0d:6c:b2
+	63:fb:00:61:65:16:41:fc:56:56:ec:d5:96:98:15:ba
+	13:b9:58:02:4e:3a:f8:f5:f1:7b:7b:9e:96:d6:76:de
+	5d:95:db:5b:8b:52:42:23:7d:de:14:36:18:3c:cc:fe
+	25:09:5f:dc:86:ae:93:3c:a0:4a:1a:59:8f:11:1b:03
+	b1:71:79:15:44:2d:9a:21:45:12:76:b7:96:03:71:68
+	36:66:11:60:f5:c7:7b:43:1d:33:92:df:df:f8:65:ef
+	3d:90:d3:1d:ac:28:93:c4:a7:04:c1:a7:80:b3:c2:27
+	69:
 
 exp2:
-	11:e4:73:93:b0:74:26:3b:60:e7:c4:fd:2c:7c:bb:81
-	05:9b:ff:8a:b0:08:1c:a1:fb:7f:17:ee:93:70:7e:11
-	92:b1:bf:39:e7:c6:a8:ed:9c:64:e1:1f:5e:93:ff:ca
-	15:4b:54:97:35:9f:ca:7c:c7:9c:3e:e0:06:82:a5:f9
-	46:d3:02:cc:08:d1:be:13:b2:8c:bb:6a:8d:dd:fa:eb
-	ad:ae:62:8a:67:cb:14:67:68:b6:b8:a7:a8:c9:c2:0f
-	ad:f5:34:25:f5:e1:9b:ee:a5:83:40:6a:1d:97:f1:90
-	35:06:29:97:23:22:f8:f0:0a:0a:34:46:1e:d5:9d:cc
-	36:2e:8a:c3:12:b9:0a:4a:a3:dd:e2:91:58:f1:9d:f5
-	04:f7:8f:05:f3:46:db:c4:02:d5:1c:d6:d9:dc:67:0d
-	ae:9d:f8:00:40:3d:83:08:62:2c:c8:61:a6:9d:49:f2
-	52:67:fe:0c:00:6d:e3:1f:99:7b:b0:50:af:55:0f:ad
-
+	3a:11:ad:43:e6:2f:78:f2:be:c2:c2:b6:6f:ba:3b:8a
+	3f:94:dc:b3:38:87:6f:c1:92:bd:5e:d3:28:73:bb:ba
+	2f:b2:9b:67:41:9a:10:ac:79:48:df:ec:1c:47:34:62
+	fd:a0:02:9f:04:c5:34:2d:cf:44:03:8d:06:05:ef:82
+	7a:2a:72:50:5d:c5:40:0b:58:13:c6:af:fe:d0:51:b1
+	53:54:1e:5c:ba:2b:e3:50:59:b7:bc:27:83:3e:0c:06
+	d8:90:34:bd:54:eb:ac:3d:ef:c1:67:68:a9:7b:0a:bc
+	44:b9:50:0a:de:4e:26:b5:0f:27:9d:6a:53:62:90:d3
+	0a:cb:d8:4e:62:9c:de:bc:62:5d:cc:64:e6:41:ae:5a
+	a7:3d:8d:f3:26:67:38:f2:2e:41:b9:f8:e9:86:8e:f4
+	20:30:94:4d:13:c1:ad:9e:71:f6:cb:80:cb:b6:05:2f
+	41:ab:0e:24:e8:48:2f:da:38:62:b2:d3:3e:e6:af:8f
+	
 
 
 Public Key PIN:
-	pin-sha256:EiqPFBPoLKkCzVlK8KoKYGQT/LSo7/0iLg/I7nKt1/0=
+	pin-sha256:6j7MphUbNRjXh9x/BogWeu4m7+ON7aYmCyFxQsSMsec=
 Public Key ID:
-	sha256:122a8f1413e82ca902cd594af0aa0a606413fcb4a8effd222e0fc8ee72add7fd
-	sha1:4b4510b7a19c88cbce887f5b9d531a6d81d34400
+	sha256:ea3ecca6151b3518d787dc7f0688167aee26efe38deda6260b217142c48cb1e7
+	sha1:87e4402a0fb8615b3fc7d034871265903c46ec84
 
 -----BEGIN RSA PRIVATE KEY-----
-MIIG5AIBAAKCAYEA1fWe/glTz5MRvZtZ6Pk7ac6jCnDbNJhMMBDWjIC9Xc/31joZ
-kK5VnW5P/sNZq3S5Glx2Y2Ie+jCeQ7hWYNl1WqCIrV4fNjlgEnuEFUOze2lY243t
-4k+OeyQ2YmopDqX2vFiX9q7vzVP6120enUBO1OgyBUnFZpTHmWukQl2ZhzxjoakA
-DjYP6sjejhKWXeYjms8KTXpBjl1PaWcvYe4IrMzZuNZq3pveUyl83PcD9uVT0T/j
-rZnGv/Ior/TLLdIFmFjOutDX96uMimbgjSxqQcg57EzUBCWIWKjAXNW+v+lqJcCl
-YY5y4ElUhuY8j9sQa5OHSevemaIXRiuQMJGFquASVhzPrgpD0jE8UIpwqOQycU+N
-NK1nutwzKoq8ZzOoVozlrpz2AifaJ5StVnfzK+0jkuj+7FnkiNeoHUV2DjGLa3J/
-1YwcrLa3J0Gv1tON9BFd81P9mbfCgNc5iwfOP5J/qe0tUKQ7V+dzPDTd89FXTf+5
-VFrmY8bLKP3F08GrAgMBAAECggGAHjiweX+FyBck9VxBKegyXTKj0vC39cjhUhS+
-yV/R37NldWwFems1iqQvRnP/cXluP+v5iPYuG/bMFBKwmMN+kQuF4r8dt4IJMPMj
-aAGFE5SAyZpVlJbaMEigKeyG2hvVKyt0Y5K4Ko+HKfCu11VjDS2zCw4thNzVCLWs
-oPcpnXGJPSdq65b1TpuK3BSCCsdcFhzSfrkbE2nYsrGxfqqprQbOZg5bUBBCKgr9
-KRT3CWPBIBhfJ4FGEoy49ImmPVWh1GT88tvXnPW+952IXG02pEvqxePqMoFr80e1
-NdXEGrKuEp0Zo+ykr0F+XjSd9by5H6PCMrT8lad6VATi1k4QL2Zoizsg6gXbLnIB
-Eed8+HIPYL7xJxmtOm/pcFY6hm5GDeNVMWZ3CYRIuSVLwyZwEsqkX8Y9auXbTWME
-uAkHyTCFCJ13QCZg2hDCU9IADZ7Z1XEGMOv79z+CH7Oa800khi6U/Qae3CZo+mTD
-+foIxLLsevVVxRC14i3eugQwEFuZAoHBAPvRR52ec/geCSH9iRYFVq+lz1LVzfcm
-GNGEOjZlC6LN+biZwMfvAMkvyZIaHT2GWDuxvtSMxhvfuu6HqtEiRxi93gEPDcus
-0Eik9JPipsu1t/X1ct3srBPoPWIjVKxS/+6a4X+wrjtBONg5K0DvJYFQsJjb+EAW
-bhpBeSKQWJmAwg26tdNU7Cgz5LBY6t5hobcwC53cc2LCB9N1kUhJ3b7PspCVjyls
-b/Zoy8/VJKPXN4EbNDuvmkhSr1N89zKiPwKBwQDZg16+CuoL2WZjVjueRKpGbY1s
-EIFL3hldLBZ+MHytI5qJU8wY6OhRK3k10Gd9no++6mNeFMBrugJsStoHcJ0U+r4e
-QEdQb/Jah562sbhVLLai47AkuuqbVYeLS89ASiW0ic+edsp5SvR0t+7PbI/L4z2e
-hjtEt3DsBQxoztbDouzmEdYv94AmqVyquaYzhKkAQ89yB4qRWaKx3nkHa4FnpcJL
-/SmKGpZmV2bUN5qYadEZJFOxpFRoHowrtJMZ7ZUCgcEA785mIAFEuTWJRvhWM0VU
-PyNtI5p+cW2zVttQQHrLsPfsZ1LslrnRisZadCswS2YD4p0reOiyxNqz/vHtxwmY
-oUQ3BdUbMypYk8WbMLY4V2ivTqi3Agaf/Lk+s5Wnzg+gsM6IDnzn/3/mLWuL+GOF
-2PdJpdhdOlLh+Vj+jd7esRhANKjo/N8zojmBADs9OBfL1FMJzQSiUZsrrsGYYDoP
-1OWgTDZRRoaAvS0hYsO9B9YtgmKwxGI/T76GPsCT/IErAoHAEeRzk7B0Jjtg58T9
-LHy7gQWb/4qwCByh+38X7pNwfhGSsb8558ao7Zxk4R9ek//KFUtUlzWfynzHnD7g
-BoKl+UbTAswI0b4Tsoy7ao3d+uutrmKKZ8sUZ2i2uKeoycIPrfU0JfXhm+6lg0Bq
-HZfxkDUGKZcjIvjwCgo0Rh7Vncw2LorDErkKSqPd4pFY8Z31BPePBfNG28QC1RzW
-2dxnDa6d+ABAPYMIYizIYaadSfJSZ/4MAG3jH5l7sFCvVQ+tAoHBAJCaf28UqLx5
-PyXlYvldKXikeI565Ipiin+crnWV/u4amVNAAXYpfUiFKKIqnw8QjBlqNmvhrKIH
-uXJcuaYgu4/L9erdPw6rncFXfnuW+dqwUjw/YpTnXASerGDNTex+aNP7KrQC8A6+
-N7wq+G6NMbU4ZwCeZ59x0Ig2MmlLIHProdm8csJ+ORo2zMFFohQ35srbTQtbaKT/
-t3ux2y9wJ6FsMT/AwyMEsHriDSG6WoBSwaErV3Igtu2x6DuViIGQXQ==
+MIIG5AIBAAKCAYEAtS2SivLaAfsZ1X9xun/6i/1UNSxG5kPvVkfTPWOwSgCYyqn7
+u2vZsIsvcurqHQBEg1SWF4XAdcFeCxdDN8em6ISfSOUFL9TSQrZ5eFQYcVTX9IFX
+DWXbFSC8AgJpYhrPf2O0vxQNQFD4MpNXrLpEkc3vLrg/JhySC1HAYfO/nuJV3ZnA
+xJZCIv4upT5j0VjzfPw6WR/OUUlcmLnh0+qMLv7G2dRLjdAsV1U8k7eykk+z9qXe
+KAjgFBEEgLTVbHR1zbrUpw42DYR7SQpEJ8wrJ9qHdI4H/9MnPu8O75kfgauQV4s/
+oIgWmVeHMDxpGaLEKgcYVE2F/HlMfFvCrrZKKXi1/k35rG8sg6cP/bRuRZlgO0xF
+TrW0QKmWoBLqyqVMvifdkT0EBWZ4eZWTDn2Rr4HMe7ov54QmKXaXp2VdOGzO1Efv
+9KvDildb5aEqBrVz+tU+C/Cdg5p1d2g2m1Uk9wjcYbXOWx9fd9Ur/fxJuHtauxOW
+4gzFLcTOgvUgVmSXAgMBAAECggGAZnpRcjBs6UPrV9xPKqsqvzXaBH132NTCMm5L
+6GRTmXf+9FrzXQ5iwj3n57tCEodNOW+FueZYdwKZu/I7ffh6yvgA1I1dwrFBAKUP
+zeTbMndH8y+ZWqWrJqcuUICmtOvvQ+HUoWOpHyDtUkYPCE8Pa90slaN3bIoqfSaP
+h5gEYc0pvj8yTr+ixwI4xhSlBwumJaLRKgoYe9ff/S7esivvgMFxHlK7LYp7GibH
+LdJwudtFMpSdNM3YWOFLR7WBJmg0KjICC+aVOtLU1uTHv44ETvx16W30pKhrUHZ8
+EAeBllZUFtc5il9ReR+WScvXiw1RXUroIvvRkqSiAmUkCmIzhKnfqU9AGpUdmOoM
+IwXC2x5NxfLpY2vecGc6ovRywZeu0G94giuhbyzXkKNP1vnWgBHUk47gBhn22TNy
+XdgWou/hqQDevH6YqpdFuIEgAV0LED1pqbp9LB/gFw687peVYadrEJQnrcrBkzv6
+3I09WMz7BD9/QNZs6IOhvlDNRnMRAoHBANqbYiL4SD6aT+/lsPHjXuwhPTuP7PHY
+9v2nL2kqzXmhS2s5NunDqVv5WVBxa3KwjRPKk7FNS1U6abKEjU4Yd2iu9tjsQ+/I
+IVG5y4a3YqtekHes5oWp6fcZ9yYkTBiBU4VCzTVcHa5wClmwRKJQvGg6vcJTfy6r
+BC2F7n2KDNvMhVq1+G/4klMMkwD3/4Rh0Gf0ELS/mro13wV513hC+0jE2zUnTxjP
+jdomEzaEQl1QxJ04FbVqyjqr8fmwJhpUmQKBwQDUKzTmoWjJyHoiXCE0D2dLanjV
+DmO+S4OjrCi2N4DAeTDsDIdtwfLR+L2NPLsggdndayUNDOQVOREGMQaELI0ScwSz
+z/1XA8plO/fj4G83TLLvxKPLi1T3NXNU5PlivR56wXax8MzZ0PzHg1kHO1UfqYh+
+6Se76FqgV94d9FaMqTSbCkPVoSqXgCcH7lcgKfcIAnjH/JvJKGSlY6SmomVI/W1C
+sGBZE/fxzXgJlGZCNmrufEDF8S/5fsr3tQKVEK8CgcEAphWNXqIhSSa1+r4YS/4B
+vQaX3evAChJbvGTLeWwihfkMMp9aYAneXtk3iQ1So+UMme+7e+YMiOkDKrTYInAm
+MGtVcYM3LjJvVgcBYQ1ssmP7AGFlFkH8Vlbs1ZaYFboTuVgCTjr49fF7e56W1nbe
+XZXbW4tSQiN93hQ2GDzM/iUJX9yGrpM8oEoaWY8RGwOxcXkVRC2aIUUSdreWA3Fo
+NmYRYPXHe0MdM5Lf3/hl7z2Q0x2sKJPEpwTBp4CzwidpAoHAOhGtQ+YvePK+wsK2
+b7o7ij+U3LM4h2/Bkr1e0yhzu7ovsptnQZoQrHlI3+wcRzRi/aACnwTFNC3PRAON
+BgXvgnoqclBdxUALWBPGr/7QUbFTVB5cuivjUFm3vCeDPgwG2JA0vVTrrD3vwWdo
+qXsKvES5UAreTia1DyedalNikNMKy9hOYpzevGJdzGTmQa5apz2N8yZnOPIuQbn4
+6YaO9CAwlE0Twa2ecfbLgMu2BS9Bqw4k6Egv2jhistM+5q+PAoHBAMKZW7UcWXPH
+cHh1qmdNktEntke+4nE5Mfddvnm9IrI0gLClOauyUyoo+Uo0ILbqJdXfNK3Qsybt
+uvMMB5U0UK5IQKdb94zkxtakHxgHKuoBOJDVyokZPY7CQAXlCagweGzp5h1sWyKp
+JNAHQZUOgvYZ5GzBlq7DXYSpAuV81rn3lA+5WkGH2wMXmzmy6bv1Pw2RbdIy/u9g
+GTwVSMGo50y4vdwxQ0nfBb7FO2pdaJFt5kcLpCd0REISMQKtqn7oDA==
 -----END RSA PRIVATE KEY-----

From d23d1fc0f9483e5b99abd31d92369fa8cbb05150 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 5 Jun 2020 07:56:39 +0200
Subject: [PATCH 0224/1854] travis: fix alpine builds

With the latest version of the alpine container image it seems that
alpine changed a few package names. This adapts the alpine container
to solve the travis failures.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.alpine | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 5785102da..dbf3c2bf1 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -15,9 +15,12 @@ RUN apk update && apk add \
 	libnet-dev \
 	libnl3-dev \
 	nftables \
+	nftables-dev \
 	pkgconfig \
 	protobuf-c-dev \
 	protobuf-dev \
+	py3-pip \
+	py3-protobuf \
 	python3 \
 	sudo
 
@@ -43,7 +46,7 @@ RUN apk add \
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
 
-RUN pip3 install protobuf junit_xml
+RUN pip3 install junit_xml
 
 # For zdtm we need an unversioned python binary
 RUN ln -s /usr/bin/python3 /usr/bin/python

From be2ded15ee1cff6c0bd5733dda57bb17ea85bcd9 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 5 Jun 2020 07:55:18 +0200
Subject: [PATCH 0225/1854] test: fix flake8 errors

The newest version of flake reports errors that variable names like 'l'
should not be used, because they are hard to read.

This changes 'l' to 'line' to make flake8 happy.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 5e42c769e..b111fa383 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2047,11 +2047,11 @@ def grep_errors(fname):
     print_next = False
     before = []
     with open(fname, errors='replace') as fd:
-        for l in fd:
-            before.append(l)
+        for line in fd:
+            before.append(line)
             if len(before) > 5:
                 before.pop(0)
-            if "Error" in l or "Warn" in l:
+            if "Error" in line or "Warn" in line:
                 if first:
                     print_fname(fname, 'log')
                     print_sep("grep Error", "-", 60)
@@ -2061,7 +2061,7 @@ def grep_errors(fname):
                 before = []
             else:
                 if print_next:
-                    print_next = print_error(l)
+                    print_next = print_error(line)
                     before = []
     if not first:
         print_sep("ERROR OVER", "-", 60)

From 01cab14dfad656eb1d5f7e6a611a49a87c83b34e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Fri, 22 Feb 2019 18:04:32 +0000
Subject: [PATCH 0226/1854] util: Fix addr casting for IPv4/IPv6 in autobind

When saddr.ss_family is AF_INET6 we should cast &saddr to
(struct sockaddr_in6 *).

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/util.c b/criu/util.c
index 6f6a6dde7..06c594ca9 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1131,9 +1131,9 @@ int setup_tcp_server(char *type, char *addr, unsigned short *port)
 		}
 
 		if (saddr.ss_family == AF_INET6) {
-			(*port) = ntohs(((struct sockaddr_in *)&saddr)->sin_port);
-		} else if (saddr.ss_family == AF_INET) {
 			(*port) = ntohs(((struct sockaddr_in6 *)&saddr)->sin6_port);
+		} else if (saddr.ss_family == AF_INET) {
+			(*port) = ntohs(((struct sockaddr_in *)&saddr)->sin_port);
 		}
 
 		pr_info("Using %u port\n", (*port));

From 0708cbd8839267c30e8dcd8bec63f5bc2d2d36d0 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Thu, 13 Sep 2018 18:28:10 +0100
Subject: [PATCH 0227/1854] remote: Use tmp file buffer when restore ip dump

When CRIU calls the ip tool on restore, it passes the fd of remote
socket by replacing the STDIN before execvp. The stdin is used by the
ip tool to receive input. However, the ip tool calls ftell(stdin)
which fails with "Illegal seek" since UNIX sockets do not support file
positioning operations. To resolve this issue, read the received
content from the UNIX socket and store it into temporary file, then
replace STDIN with the fd of this tmp file.

 # python test/zdtm.py run -t zdtm/static/env00 --remote -f ns
 === Run 1/1 ================ zdtm/static/env00

 ========================= Run zdtm/static/env00 in ns ==========================
 Start test
 ./env00 --pidfile=env00.pid --outfile=env00.out --envname=ENV_00_TEST
 Adding image cache
 Adding image proxy
 Run criu dump
 Run criu restore
 =[log]=> dump/zdtm/static/env00/31/1/restore.log
 ------------------------ grep Error ------------------------
 RTNETLINK answers: File exists
 (00.229895)      1: do_open_remote_image RDONLY path=route-9.img snapshot_id=dump/zdtm/static/env00/31/1
 (00.230316)      1: 	Running ip route restore
 Failed to restore: ftell: Illegal seek
 (00.232757)      1: Error (criu/util.c:712): exited, status=255
 (00.232777)      1: Error (criu/net.c:1479): IP tool failed on route restore
 (00.232803)      1: Error (criu/net.c:2153): Can't create net_ns
 (00.255091) Error (criu/cr-restore.c:1177): 105 killed by signal 9: Killed
 (00.255307) Error (criu/mount.c:2960): mnt: Can't remove the directory /tmp/.criu.mntns.dTd7ak: No such file or directory
 (00.255339) Error (criu/cr-restore.c:2119): Restoring FAILED.
 ------------------------ ERROR OVER ------------------------
 ################# Test zdtm/static/env00 FAIL at CRIU restore ##################
 ##################################### FAIL #####################################

Fixes #311

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 criu/net.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 762f9b547..27e7c7e33 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2068,19 +2068,46 @@ out:
 
 static int restore_ip_dump(int type, int pid, char *cmd)
 {
-	int ret = -1;
+	int ret = -1, sockfd, n, written;
+	FILE *tmp_file;
 	struct cr_img *img;
+	char buf[1024];
 
 	img = open_image(type, O_RSTR, pid);
 	if (empty_image(img)) {
 		close_image(img);
 		return 0;
 	}
+	sockfd = img_raw_fd(img);
+	tmp_file = tmpfile();
+	if (!tmp_file) {
+		pr_perror("Failed to open tmpfile");
+		return -1;
+	}
+
+	while ((n = read(sockfd, buf, 1024)) > 0) {
+		written = fwrite(buf, sizeof(char), n, tmp_file);
+		if (written < n) {
+			pr_perror("Failed to write to tmpfile "
+				  "[written: %d; total: %d]", written, n);
+			return -1;
+		}
+	}
+
+	if (fseek(tmp_file, 0, SEEK_SET)) {
+		pr_perror("Failed to set file position to beginning of tmpfile");
+		return -1;
+	}
+
 	if (img) {
-		ret = run_ip_tool(cmd, "restore", NULL, NULL, img_raw_fd(img), -1, 0);
+		ret = run_ip_tool(cmd, "restore", NULL, NULL, fileno(tmp_file), -1, 0);
 		close_image(img);
 	}
 
+	if(fclose(tmp_file)) {
+		pr_perror("Failed to close tmpfile");
+	}
+
 	return ret;
 }
 

From 51c3f8a908b1738d7d268afc5bb0dd9a59f3d8a5 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 11 Jun 2020 21:01:24 +0000
Subject: [PATCH 0228/1854] pipes: loop over splice() when dumping a pipe's
 data

Instead of erroring, we should loop until we get the desired number of
bytes written, like regular I/O loops.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/pipes.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/criu/pipes.c b/criu/pipes.c
index d74329161..5787fdc53 100644
--- a/criu/pipes.c
+++ b/criu/pipes.c
@@ -463,18 +463,15 @@ int dump_one_pipe_data(struct pipe_data_dump *pd, int lfd, const struct fd_parms
 	if (pb_write_one(img, &pde, PB_PIPE_DATA))
 		goto err_close;
 
-	if (bytes) {
+	while (bytes > 0) {
 		int wrote;
-
 		wrote = splice(steal_pipe[0], NULL, img_raw_fd(img), NULL, bytes, 0);
 		if (wrote < 0) {
 			pr_perror("Can't push pipe data");
 			goto err_close;
-		} else if (wrote != bytes) {
-			pr_err("%#x: Wanted to write %d bytes, but wrote %d\n",
-					pipe_id(p), bytes, wrote);
-			goto err_close;
-		}
+		} else if (wrote == 0)
+			break;
+		bytes -= wrote;
 	}
 
 	ret = 0;

From 7d79a58f4daa9ddda015fc0aaca2a60d156d12cc Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 21 May 2020 17:40:17 +0000
Subject: [PATCH 0229/1854] img-streamer: introduction of criu-image-streamer

This adds the ability to stream images with criu-image-streamer

The workflow is the following:
1) criu-image-streamer is started, and starts listening on a UNIX
   socket.
2) CRIU is started. img_streamer_init() is invoked, which connects to the
   socket. During dump/restore operations, instead of using local disk to
   open an image file, img_streamer_open() is called to provide a UNIX pipe
   that is sent over the UNIX socket.
3) Once the operation is done, img_streamer_finish() is called, and the
   UNIX socket is disconnected.

criu-image-streamer can be found at:
https://github.com/checkpoint-restore/criu-image-streamer

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 Documentation/criu.txt       |   5 +
 criu/Makefile.crtools        |   1 +
 criu/config.c                |   1 +
 criu/cr-dump.c               |   2 +
 criu/cr-restore.c            |   4 +
 criu/cr-service.c            |   9 +-
 criu/crtools.c               |  34 ++++-
 criu/files-reg.c             |  10 +-
 criu/image.c                 |  32 +++--
 criu/img-streamer.c          | 232 +++++++++++++++++++++++++++++++++++
 criu/include/cr_options.h    |   1 +
 criu/include/image.h         |   2 +-
 criu/include/img-streamer.h  |   8 ++
 criu/include/protobuf-desc.h |   4 +-
 criu/include/servicefd.h     |   1 +
 criu/mem.c                   |   6 +-
 criu/page-xfer.c             |   8 ++
 criu/pagemap.c               |  63 +++++++++-
 criu/protobuf-desc.c         |   1 +
 criu/util.c                  |  14 ++-
 images/Makefile              |   1 +
 images/img-streamer.proto    |  16 +++
 22 files changed, 429 insertions(+), 26 deletions(-)
 create mode 100644 criu/img-streamer.c
 create mode 100644 criu/include/img-streamer.h
 create mode 100644 images/img-streamer.proto

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index ab63e461c..4e9b4132e 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -76,6 +76,11 @@ The following levels are available:
 *-D*, *--images-dir* 'path'::
     Use 'path' as a base directory where to look for sets of image files.
 
+*--stream*::
+    dump/restore images using criu-image-streamer.
+    See https://github.com/checkpoint-restore/criu-image-streamer for detailed
+    usage.
+
 *--prev-images-dir* 'path'::
     Use 'path' as a parent directory where to look for sets of image files.
     This option makes sense in case of incremental dumps.
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 5c25b8928..dc92c2ea2 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -29,6 +29,7 @@ obj-y			+= files-reg.o
 obj-y			+= fsnotify.o
 obj-y			+= image-desc.o
 obj-y			+= image.o
+obj-y			+= img-streamer.o
 obj-y			+= ipc_ns.o
 obj-y			+= irmap.o
 obj-y			+= kcmp-ids.o
diff --git a/criu/config.c b/criu/config.c
index b84b7da28..e78b534a9 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -510,6 +510,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		BOOL_OPT(SK_CLOSE_PARAM, &opts.tcp_close),
 		{ "verbosity",			optional_argument,	0, 'v'	},
 		{ "ps-socket",			required_argument,	0, 1091},
+		BOOL_OPT("stream", &opts.stream),
 		{ "config",			required_argument,	0, 1089},
 		{ "no-default-config",		no_argument,		0, 1090},
 		{ "tls-cacert",			required_argument,	0, 1092},
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 745998afc..2b4c9ae82 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -82,6 +82,7 @@
 #include "eventpoll.h"
 #include "memfd.h"
 #include "timens.h"
+#include "img-streamer.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
@@ -1759,6 +1760,7 @@ static int cr_dump_finish(int ret)
 	free_userns_maps();
 
 	close_service_fd(CR_PROC_FD_OFF);
+	close_image_dir();
 
 	if (ret) {
 		pr_err("Dumping FAILED.\n");
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ed4b95b91..f572f79a0 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -29,6 +29,7 @@
 #include "cr_options.h"
 #include "servicefd.h"
 #include "image.h"
+#include "img-streamer.h"
 #include "util.h"
 #include "util-pie.h"
 #include "criu-log.h"
@@ -2355,6 +2356,9 @@ skip_ns_bouncing:
 	pr_info("Restore finished successfully. Tasks resumed.\n");
 	write_stats(RESTORE_STATS);
 
+	/* This has the effect of dismissing the image streamer */
+	close_image_dir();
+
 	ret = run_scripts(ACT_POST_RESUME);
 	if (ret != 0)
 		pr_err("Post-resume script ret code %d\n", ret);
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 279016bcd..53eadb1bc 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -343,7 +343,14 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->parent_img)
 		SET_CHAR_OPTS(img_parent, req->parent_img);
 
-	if (open_image_dir(images_dir_path) < 0) {
+	/*
+	 * Image streaming is not supported with CRIU's service feature as
+	 * the streamer must be started for each dump/restore operation.
+	 * It is unclear how to do that with RPC, so we punt for now.
+	 * This explains why we provide the argument mode=-1 instead of
+	 * O_RSTR or O_DUMP.
+	 */
+	if (open_image_dir(images_dir_path, -1) < 0) {
 		pr_perror("Can't open images directory");
 		goto err;
 	}
diff --git a/criu/crtools.c b/criu/crtools.c
index 7f72dde27..ad61fa9bb 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -54,6 +54,20 @@ void flush_early_log_to_stderr(void)
 	flush_early_log_buffer(STDERR_FILENO);
 }
 
+static int image_dir_mode(char *argv[], int optind)
+{
+	if (!strcmp(argv[optind], "dump") ||
+	    !strcmp(argv[optind], "pre-dump") ||
+	    (!strcmp(argv[optind], "cpuinfo") && !strcmp(argv[optind + 1], "dump")))
+		return O_DUMP;
+
+	if (!strcmp(argv[optind], "restore") ||
+	    (!strcmp(argv[optind], "cpuinfo") && !strcmp(argv[optind + 1], "restore")))
+		return O_RSTR;
+
+	return -1;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 	int ret = -1;
@@ -148,13 +162,30 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 
+	if (opts.stream && image_dir_mode(argv, optind) == -1) {
+		pr_err("--stream cannot be used with the %s command\n", argv[optind]);
+		goto usage;
+	}
+
 	/* We must not open imgs dir, if service is called */
 	if (strcmp(argv[optind], "service")) {
-		ret = open_image_dir(opts.imgs_dir);
+		ret = open_image_dir(opts.imgs_dir, image_dir_mode(argv, optind));
 		if (ret < 0)
 			return 1;
 	}
 
+	/*
+	 * The kernel might send us lethal signals when writing to a pipe
+	 * which reader has disappeared. We deal with write() failures on our
+	 * own, and prefer not to get killed. So we ignore SIGPIPEs.
+	 *
+	 * Pipes are used in various places:
+	 * 1) Receiving application page data
+	 * 2) Transmitting data to the image streamer
+	 * 3) Emitting logs (potentially to a pipe).
+	 */
+	signal(SIGPIPE, SIG_IGN);
+
 	/*
 	 * When a process group becomes an orphan,
 	 * its processes are sent a SIGHUP signal
@@ -322,6 +353,7 @@ usage:
 "                        this requires running a second instance of criu\n"
 "                        in lazy-pages mode: 'criu lazy-pages -D DIR'\n"
 "                        --lazy-pages and lazy-pages mode require userfaultfd\n"
+"  --stream              dump/restore images using criu-image-streamer\n"
 "\n"
 "* External resources support:\n"
 "  --external RES        dump objects from this list as external resources:\n"
diff --git a/criu/files-reg.c b/criu/files-reg.c
index b53e9b080..7e84addf2 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -154,7 +154,6 @@ static int trim_last_parent(char *path)
 
 static int copy_chunk_from_file(int fd, int img, off_t off, size_t len)
 {
-	char *buf = NULL;
 	int ret;
 
 	while (len > 0) {
@@ -167,7 +166,6 @@ static int copy_chunk_from_file(int fd, int img, off_t off, size_t len)
 		len -= ret;
 	}
 
-	xfree(buf);
 	return 0;
 }
 
@@ -213,7 +211,6 @@ static int copy_file_to_chunks(int fd, struct cr_img *img, size_t file_size)
 
 static int copy_chunk_to_file(int img, int fd, off_t off, size_t len)
 {
-	char *buf = NULL;
 	int ret;
 
 	while (len > 0) {
@@ -221,7 +218,11 @@ static int copy_chunk_to_file(int img, int fd, off_t off, size_t len)
 			pr_perror("Can't seek file");
 			return -1;
 		}
-		ret = sendfile(fd, img, NULL, len);
+
+		if (opts.stream)
+			ret = splice(img, NULL, fd, NULL, len, SPLICE_F_MOVE);
+		else
+			ret = sendfile(fd, img, NULL, len);
 		if (ret < 0) {
 			pr_perror("Can't send data");
 			return -1;
@@ -231,7 +232,6 @@ static int copy_chunk_to_file(int img, int fd, off_t off, size_t len)
 		len -= ret;
 	}
 
-	xfree(buf);
 	return 0;
 }
 
diff --git a/criu/image.c b/criu/image.c
index 0225788b0..2bbb4dd02 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -17,6 +17,7 @@
 #include "images/inventory.pb-c.h"
 #include "images/pagemap.pb-c.h"
 #include "proc_parse.h"
+#include "img-streamer.h"
 #include "namespaces.h"
 
 bool ns_per_id = false;
@@ -415,13 +416,16 @@ static int do_open_image(struct cr_img *img, int dfd, int type, unsigned long of
 
 	flags = oflags & ~(O_NOBUF | O_SERVICE | O_FORCE_LOCAL);
 
-	/*
-	 * For pages images dedup we need to open images read-write on
-	 * restore, that may require proper capabilities, so we ask
-	 * usernsd to do it for us
-	 */
-	if (root_ns_mask & CLONE_NEWUSER &&
-	    type == CR_FD_PAGES && oflags & O_RDWR) {
+	if (opts.stream && !(oflags & O_FORCE_LOCAL)) {
+		ret = img_streamer_open(path, flags);
+		errno = EIO; /* errno value is meaningless, only the ret value is meaningful */
+	} else if (root_ns_mask & CLONE_NEWUSER &&
+		   type == CR_FD_PAGES && oflags & O_RDWR) {
+		/*
+		 * For pages images dedup we need to open images read-write on
+		 * restore, that may require proper capabilities, so we ask
+		 * usernsd to do it for us
+		 */
 		struct openat_args pa = {
 			.flags = flags,
 			.err = 0,
@@ -520,7 +524,12 @@ struct cr_img *img_from_fd(int fd)
 	return img;
 }
 
-int open_image_dir(char *dir)
+/*
+ * `mode` should be O_RSTR or O_DUMP depending on the intent.
+ * This is used when opts.stream is enabled for picking the right streamer
+ * socket name. `mode` is ignored when opts.stream is not enabled.
+ */
+int open_image_dir(char *dir, int mode)
 {
 	int fd, ret;
 
@@ -535,7 +544,10 @@ int open_image_dir(char *dir)
 		return -1;
 	fd = ret;
 
-	if (opts.img_parent) {
+	if (opts.stream) {
+		if (img_streamer_init(dir, mode) < 0)
+			goto err;
+	} else if (opts.img_parent) {
 		ret = symlinkat(opts.img_parent, fd, CR_PARENT_LINK);
 		if (ret < 0 && errno != EEXIST) {
 			pr_perror("Can't link parent snapshot");
@@ -556,6 +568,8 @@ err:
 
 void close_image_dir(void)
 {
+	if (opts.stream)
+		img_streamer_finish();
 	close_service_fd(IMG_FD_OFF);
 }
 
diff --git a/criu/img-streamer.c b/criu/img-streamer.c
new file mode 100644
index 000000000..e31b17dd9
--- /dev/null
+++ b/criu/img-streamer.c
@@ -0,0 +1,232 @@
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include "cr_options.h"
+#include "img-streamer.h"
+#include "image.h"
+#include "images/img-streamer.pb-c.h"
+#include "protobuf.h"
+#include "servicefd.h"
+#include "rst-malloc.h"
+#include "common/scm.h"
+#include "common/lock.h"
+
+/*
+ * We use different path names for the dump and restore sockets because:
+ * 1) The user may want to perform both at the same time (akin to live
+ *     migration). Specifying the same images-dir is convenient.
+ * 2) It fails quickly when the user mix-up the streamer and CRIU operations.
+ *    (e.g., streamer is in capture more, while CRIU is in restore mode).
+ */
+#define IMG_STREAMER_CAPTURE_SOCKET_NAME "streamer-capture.sock"
+#define IMG_STREAMER_SERVE_SOCKET_NAME "streamer-serve.sock"
+
+/* All requests go through the same socket connection. We must synchronize */
+static mutex_t *img_streamer_fd_lock;
+
+/* Either O_DUMP or O_RSTR */
+static int img_streamer_mode;
+
+static const char *socket_name_for_mode(int mode)
+{
+	switch (mode) {
+	case O_DUMP: return IMG_STREAMER_CAPTURE_SOCKET_NAME;
+	case O_RSTR: return IMG_STREAMER_SERVE_SOCKET_NAME;
+	default: BUG(); return NULL;
+	}
+}
+
+/*
+ * img_streamer_init() connects to the image streamer socket.
+ * mode should be either O_DUMP or O_RSTR.
+ */
+int img_streamer_init(const char *image_dir, int mode)
+{
+	struct sockaddr_un addr;
+	int sockfd;
+
+	img_streamer_mode = mode;
+
+	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (sockfd < 0) {
+		pr_perror("Unable to instantiate UNIX socket");
+		return -1;
+	}
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s",
+		 image_dir, socket_name_for_mode(mode));
+
+	if (connect(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+		pr_perror("Unable to connect to image streamer socket: %s", addr.sun_path);
+		goto err;
+	}
+
+	img_streamer_fd_lock = shmalloc(sizeof(*img_streamer_fd_lock));
+	if (!img_streamer_fd_lock) {
+		pr_err("Failed to allocate memory\n");
+		goto err;
+	}
+	mutex_init(img_streamer_fd_lock);
+
+	if (install_service_fd(IMG_STREAMER_FD_OFF, sockfd) < 0)
+		goto err;
+
+	return 0;
+
+err:
+	close(sockfd);
+	return -1;
+}
+
+/*
+ * img_streamer_finish() indicates that no more files will be opened.
+ * In other words, img_streamer_open() will no longer be called.
+ */
+void img_streamer_finish(void)
+{
+	if (get_service_fd(IMG_STREAMER_FD_OFF) >= 0) {
+		pr_info("Dismissing the image streamer\n");
+		close_service_fd(IMG_STREAMER_FD_OFF);
+	}
+}
+
+/*
+ * The regular protobuf APIs pb_write_one() and pb_read_one() operate over a
+ * `struct cr_img` object. Sadly, we don't have such object. We just have a
+ * file descriptor. The following pb_write_one_fd() and pb_read_one_fd()
+ * provide a protobuf API over a file descriptor. The implementation is a bit
+ * of a hack, but should be fine. At some point we can revisit to have a
+ * proper protobuf API over fds.
+ */
+static int pb_write_one_fd(int fd, void *obj, int type)
+{
+	int ret;
+	struct cr_img img;
+	memset(&img, 0, sizeof(img));
+
+	img._x.fd = fd;
+	ret = pb_write_one(&img, obj, type);
+	if (ret < 0)
+		pr_perror("Failed to communicate with the image streamer");
+	return ret;
+}
+
+static int pb_read_one_fd(int fd, void **pobj, int type)
+{
+	int ret;
+	struct cr_img img;
+	memset(&img, 0, sizeof(img));
+
+	img._x.fd = fd;
+	ret = pb_read_one(&img, pobj, type);
+	if (ret < 0)
+		pr_perror("Failed to communicate with the image streamer");
+	return ret;
+}
+
+static int send_file_request(char *filename)
+{
+	ImgStreamerRequestEntry req = IMG_STREAMER_REQUEST_ENTRY__INIT;
+	req.filename = filename;
+	return pb_write_one_fd(get_service_fd(IMG_STREAMER_FD_OFF),
+			       &req, PB_IMG_STREAMER_REQUEST);
+}
+
+static int recv_file_reply(bool *exists)
+{
+	ImgStreamerReplyEntry *reply;
+	int ret = pb_read_one_fd(get_service_fd(IMG_STREAMER_FD_OFF),
+				 (void **)&reply, PB_IMG_STREAMER_REPLY);
+	if (ret < 0)
+		return ret;
+
+	*exists = reply->exists;
+	free(reply);
+
+	return 0;
+}
+
+/*
+ * Using a pipe for image file transfers allows the data to be spliced by the
+ * image streamer, greatly improving performance.
+ * Transfer rates of up to 15GB/s can be seen with this technique.
+ */
+#define READ_PIPE	0 /* index of the read pipe returned by pipe() */
+#define WRITE_PIPE	1
+static int establish_streamer_file_pipe(void)
+{
+	/*
+	 * If the other end of the pipe closes, the kernel will want to kill
+	 * us with a SIGPIPE. These signal must be ignored, which we do in
+	 * crtools.c:main() with signal(SIGPIPE, SIG_IGN).
+	 */
+	int ret = -1;
+	int criu_pipe_direction = img_streamer_mode == O_DUMP ? WRITE_PIPE : READ_PIPE;
+	int streamer_pipe_direction = 1 - criu_pipe_direction;
+	int fds[2];
+
+	if (pipe(fds) < 0) {
+		pr_perror("Unable to create pipe");
+		return -1;
+	}
+
+	if (send_fd(get_service_fd(IMG_STREAMER_FD_OFF),
+		    NULL, 0, fds[streamer_pipe_direction]) < 0)
+		close(fds[criu_pipe_direction]);
+	else
+		ret = fds[criu_pipe_direction];
+
+	close(fds[streamer_pipe_direction]);
+
+	return ret;
+}
+
+static int _img_streamer_open(char *filename)
+{
+	if (send_file_request(filename) < 0)
+		return -1;
+
+	if (img_streamer_mode == O_RSTR) {
+		/* The streamer replies whether the file exists */
+		bool exists;
+		if (recv_file_reply(&exists) < 0)
+			return -1;
+
+		if (!exists)
+			return -ENOENT;
+	}
+
+	/*
+	 * When the image streamer encounters a fatal error, it won't report
+	 * errors via protobufs. Instead, CRIU will get a broken pipe error
+	 * when trying to access a streaming pipe. This behavior is similar to
+	 * what would happen if we were connecting criu and * criu-image-streamer
+	 * via a shell pipe.
+	 */
+
+	return establish_streamer_file_pipe();
+}
+
+/*
+ * Opens an image file via a UNIX pipe with the image streamer.
+ *
+ * Return:
+ * 	A file descriptor on success
+ * 	-ENOENT when the file was not found.
+ * 	-1 on any other error.
+ */
+int img_streamer_open(char *filename, int flags)
+{
+	int ret;
+
+	BUG_ON(flags != img_streamer_mode);
+
+	mutex_lock(img_streamer_fd_lock);
+	ret = _img_streamer_open(filename);
+	mutex_unlock(img_streamer_fd_lock);
+	return ret;
+}
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index ba405182e..d5655212d 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -143,6 +143,7 @@ struct cr_options {
 	int			weak_sysctls;
 	int			status_fd;
 	bool			orphan_pts_master;
+	int			stream;
 	pid_t			tree_id;
 	int			log_level;
 	char			*imgs_dir;
diff --git a/criu/include/image.h b/criu/include/image.h
index 1c7cc5471..62c8d7ba0 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -145,7 +145,7 @@ static inline int img_raw_fd(struct cr_img *img)
 
 extern off_t img_raw_size(struct cr_img *img);
 
-extern int open_image_dir(char *dir);
+extern int open_image_dir(char *dir, int mode);
 extern void close_image_dir(void);
 
 extern struct cr_img *open_image_at(int dfd, int type, unsigned long flags, ...);
diff --git a/criu/include/img-streamer.h b/criu/include/img-streamer.h
new file mode 100644
index 000000000..0c380c915
--- /dev/null
+++ b/criu/include/img-streamer.h
@@ -0,0 +1,8 @@
+#ifndef IMAGE_STREAMER_H
+#define IMAGE_STREAMER_H
+
+extern int img_streamer_init(const char *image_dir, int mode);
+extern void img_streamer_finish(void);
+extern int img_streamer_open(char *filename, int flags);
+
+#endif /* IMAGE_STREAMER_H */
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index ee4135d65..43d961731 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -62,8 +62,10 @@ enum {
 	PB_GHOST_CHUNK,
 	PB_FILE,
 	PB_MEMFD_FILE,
-	PB_MEMFD_INODE,		/* 60 */
+	PB_MEMFD_INODE,
 	PB_TIMENS,
+	PB_IMG_STREAMER_REQUEST,
+	PB_IMG_STREAMER_REPLY,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index 986c46af5..c11f89d37 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -14,6 +14,7 @@ enum sfd_type {
 
 	LOG_FD_OFF,
 	IMG_FD_OFF,
+	IMG_STREAMER_FD_OFF,
 	PROC_FD_OFF,		/* fd with /proc for all proc_ calls */
 	PROC_PID_FD_OFF,
 	CR_PROC_FD_OFF,		/* some other's proc fd:
diff --git a/criu/mem.c b/criu/mem.c
index 15aa0cbdb..167838b98 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1406,9 +1406,9 @@ static int prepare_vma_ios(struct pstree_item *t, struct task_restore_args *ta)
 	/*
 	 * We optimize the case when rsti(t)->vma_io is empty.
 	 *
-	 * This is useful for for remote images, where all VMAs are premapped
-	 * (pr->pieok is false). This avoids re-opening the CR_FD_PAGES file,
-	 * which could be no longer be available.
+	 * This is useful when using the image streamer, where all VMAs are
+	 * premapped (pr->pieok is false). This avoids re-opening the
+	 * CR_FD_PAGES file, which may only be readable only once.
 	 */
 	if (list_empty(&rsti(t)->vma_io)) {
 		ta->vma_ios = NULL;
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 9affc2706..db8e5bec2 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -382,6 +382,10 @@ static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, unsigned lo
 		int pfd;
 		int pr_flags = (fd_type == CR_FD_PAGEMAP) ? PR_TASK : PR_SHMEM;
 
+		/* Image streaming lacks support for incremental images */
+		if (opts.stream)
+			goto out;
+
 		pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
 		if (pfd < 0 && errno == ENOENT)
 			goto out;
@@ -928,6 +932,10 @@ int check_parent_local_xfer(int fd_type, unsigned long img_id)
 	struct stat st;
 	int ret, pfd;
 
+	/* Image streaming lacks support for incremental images */
+	if (opts.stream)
+		return 0;
+
 	pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
 	if (pfd < 0 && errno == ENOENT)
 		return 0;
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 05f6b82b8..f1e1be91f 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -406,6 +406,49 @@ static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr,
 	return ret;
 }
 
+/*
+ * We cannot use maybe_read_page_local() for streaming images as it uses
+ * pread(), seeking in the file. Instead, we use this custom page reader.
+ */
+static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vaddr,
+					int nr, void *buf, unsigned flags)
+{
+	unsigned long len = nr * PAGE_SIZE;
+	int fd = img_raw_fd(pr->pi);
+	int ret;
+	size_t curr = 0;
+
+	pr_debug("\tpr%lu-%u Read page from self %lx/%"PRIx64"\n",
+		 pr->img_id, pr->id, pr->cvaddr, pr->pi_off);
+
+	/* We can't seek. The requested address better match */
+	BUG_ON(pr->cvaddr != vaddr);
+
+	while (1) {
+		ret = read(fd, buf + curr, len - curr);
+		if (ret == 0) {
+			pr_err("Reached EOF unexpectedly while reading page from image\n");
+			return -1;
+		} else if (ret < 0) {
+			pr_perror("Can't read mapping page %d", ret);
+			return -1;
+		}
+		curr += ret;
+		if (curr == len)
+			break;
+	}
+
+	if (opts.auto_dedup)
+		pr_warn_once("Can't dedup when streaming images\n");
+
+	if (ret == 0 && pr->io_complete)
+		ret = pr->io_complete(pr, vaddr, nr);
+
+	pr->pi_off += len;
+
+	return ret;
+}
+
 static int read_page_complete(unsigned long img_id, unsigned long vaddr, int nr_pages, void *priv)
 {
 	int ret = 0;
@@ -601,6 +644,10 @@ static int try_open_parent(int dfd, unsigned long id, struct page_read *pr, int
 	int pfd, ret;
 	struct page_read *parent = NULL;
 
+	/* Image streaming lacks support for incremental images */
+	if (opts.stream)
+		goto out;
+
 	pfd = openat(dfd, CR_PARENT_LINK, O_RDONLY);
 	if (pfd < 0 && errno == ENOENT)
 		goto out;
@@ -657,7 +704,19 @@ static int init_pagemaps(struct page_read *pr)
 	off_t fsize;
 	int nr_pmes, nr_realloc;
 
-	fsize = img_raw_size(pr->pmi);
+	if (opts.stream) {
+		/*
+		 * TODO - There is no easy way to estimate the size of the
+		 * pagemap that is still to be read from the pipe. Possible
+		 * solution is to ask the image streamer for the size of the
+		 * image. 1024 is a wild guess (more space is allocated if
+		 * needed).
+		 */
+		fsize = 1024;
+	} else {
+		fsize = img_raw_size(pr->pmi);
+	}
+
 	if (fsize < 0)
 		return -1;
 
@@ -781,6 +840,8 @@ int open_page_read_at(int dfd, unsigned long img_id, struct page_read *pr, int p
 
 	if (remote)
 		pr->maybe_read_page = maybe_read_page_remote;
+	else if (opts.stream)
+		pr->maybe_read_page = maybe_read_page_img_streamer;
 	else {
 		pr->maybe_read_page = maybe_read_page_local;
 		if (!pr->parent && !opts.lazy_pages)
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index 2ee81e5db..13655264a 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -63,6 +63,7 @@
 #include "images/seccomp.pb-c.h"
 #include "images/binfmt-misc.pb-c.h"
 #include "images/autofs.pb-c.h"
+#include "images/img-streamer.pb-c.h"
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];
 
diff --git a/criu/util.c b/criu/util.c
index 06c594ca9..b30dbc86c 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -423,13 +423,19 @@ int copy_file(int fd_in, int fd_out, size_t bytes)
 {
 	ssize_t written = 0;
 	size_t chunk = bytes ? bytes : 4096;
+	ssize_t ret;
 
 	while (1) {
-		ssize_t ret;
-
-		ret = sendfile(fd_out, fd_in, NULL, chunk);
+		/*
+		 * When fd_out is a pipe, sendfile() returns -EINVAL, so we
+		 * fallback to splice(). Not sure why.
+		 */
+		if (opts.stream)
+			ret = splice(fd_in, NULL, fd_out, NULL, chunk, SPLICE_F_MOVE);
+		else
+			ret = sendfile(fd_out, fd_in, NULL, chunk);
 		if (ret < 0) {
-			pr_perror("Can't send data to ghost file");
+			pr_perror("Can't transfer data to ghost file from image");
 			return -1;
 		}
 
diff --git a/images/Makefile b/images/Makefile
index 5ddd37664..bc67278e6 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -65,6 +65,7 @@ proto-obj-y	+= macvlan.o
 proto-obj-y	+= sit.o
 proto-obj-y	+= memfd.o
 proto-obj-y	+= timens.o
+proto-obj-y	+= img-streamer.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/img-streamer.proto b/images/img-streamer.proto
new file mode 100644
index 000000000..d1bd4cc19
--- /dev/null
+++ b/images/img-streamer.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+
+// This message is sent from CRIU to the streamer.
+// * During dump, it communicates the name of the file that is about to be sent
+//   to the streamer.
+// * During restore, CRIU requests image files from the streamer. The message is
+//   used to communicate the name of the desired file.
+message img_streamer_request_entry {
+	required string filename = 1;
+}
+
+// This message is sent from the streamer to CRIU. It is only used during
+// restore to report whether the requested file exists.
+message img_streamer_reply_entry {
+	required bool exists = 1;
+}

From 27ab533cbec281f60726c2ec3a26f74ca661e814 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Wed, 10 Jun 2020 20:25:36 +0000
Subject: [PATCH 0230/1854] tests: run tests with criu-image-streamer with
 --stream

One can pass --stream to zdtm.py for testing criu with image streaming.
criu-image-streamer should be installed in ../criu-image-streamer
relative to the criu project directory. But any path will do providing
that criu-image-streamer can be found in the PATH env.

Added a few tests to run on travis-ci to make sure streaming works.
We run test that are likely to fail. However, it would be good to once
in a while run all tests with `--stream -a`.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 .travis.yml                            |   1 +
 scripts/install-criu-image-streamer.sh |  14 ++++
 scripts/travis/travis-tests            |  15 ++++
 test/zdtm.py                           | 106 ++++++++++++++++++++++++-
 4 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100755 scripts/install-criu-image-streamer.sh

diff --git a/.travis.yml b/.travis.yml
index 9928f16c2..69a505193 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,6 +94,7 @@ jobs:
       arch: amd64
       env: TR_ARCH=ppc64-cross
       dist: bionic
+    - env: TR_ARCH=local STREAM_TEST=1
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
diff --git a/scripts/install-criu-image-streamer.sh b/scripts/install-criu-image-streamer.sh
new file mode 100755
index 000000000..e4f368602
--- /dev/null
+++ b/scripts/install-criu-image-streamer.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -eux
+
+# Install Rust toolchain
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+# Clone criu-image-streamer in a sibling directory of the criu project directory
+cd $(dirname "$0")/../../
+# TODO change dev branch to master once PR is merged
+git clone --depth=1 https://github.com/checkpoint-restore/criu-image-streamer.git -b dev
+
+# Compile
+cd criu-image-streamer
+make BUILD=debug # debug build compiles faster than release mode (2x faster)
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 4cb842c97..311236d7d 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -61,6 +61,13 @@ travis_prep () {
 	chmod a+x $HOME
 }
 
+test_stream() {
+	# We must test CRIU features that dump content into an image file to ensure
+	# streaming compatibility.
+	STREAM_TEST_PATTERN='.*(ghost|fifo|unlink|memfd|shmem|socket_queue).*'
+	./test/zdtm.py run --stream -p 2 --keep-going -T $STREAM_TEST_PATTERN $ZDTM_OPTS
+}
+
 travis_prep
 
 export GCOV
@@ -132,6 +139,14 @@ chmod 0777 test/
 chmod 0777 test/zdtm/static
 chmod 0777 test/zdtm/transition
 
+# We run streaming tests separately to improve test completion times,
+# hence the exit 0.
+if [ "${STREAM_TEST}" = "1" ]; then
+	./scripts/install-criu-image-streamer.sh
+	test_stream
+	exit 0
+fi
+
 ./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
 
 KERN_MAJ=`uname -r | cut -d. -f1`
diff --git a/test/zdtm.py b/test/zdtm.py
index b111fa383..49387e43e 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -30,6 +30,9 @@ import yaml
 
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
+# File to store content of streamed images
+STREAMED_IMG_FILE_NAME = "img.criu"
+
 prev_line = None
 
 
@@ -1024,6 +1027,7 @@ class criu:
         self.__mdedup = bool(opts['noauto_dedup'])
         self.__user = bool(opts['user'])
         self.__leave_stopped = bool(opts['stop'])
+        self.__stream = bool(opts['stream'])
         self.__criu = (opts['rpc'] and criu_rpc or criu_cli)
         self.__show_stats = bool(opts['show_stats'])
         self.__lazy_pages_p = None
@@ -1208,11 +1212,19 @@ class criu:
             stats_written = int(stent['shpages_written']) + int(
                 stent['pages_written'])
 
+        if self.__stream:
+            p = self.spawn_criu_image_streamer("extract")
+            p.wait()
+
         real_written = 0
         for f in os.listdir(self.__ddir()):
             if f.startswith('pages-'):
                 real_written += os.path.getsize(os.path.join(self.__ddir(), f))
 
+        if self.__stream:
+            # make sure the extracted image is not usable.
+            os.unlink(os.path.join(self.__ddir(), "inventory.img"))
+
         r_pages = real_written / mmap.PAGESIZE
         r_off = real_written % mmap.PAGESIZE
         if (stats_written != r_pages) or (r_off != 0):
@@ -1220,6 +1232,57 @@ class criu:
                   (stats_written, r_pages, r_off))
             raise test_fail_exc("page counts mismatch")
 
+    # action can be "capture", "extract", or "serve"
+    def spawn_criu_image_streamer(self, action):
+        print("Run criu-image-streamer in {} mode".format(action))
+
+        progress_r, progress_w = os.pipe()
+        # We fcntl() on both file descriptors due to some potential differences
+        # with python2 and python3.
+        fcntl.fcntl(progress_r, fcntl.F_SETFD, fcntl.FD_CLOEXEC)
+        fcntl.fcntl(progress_w, fcntl.F_SETFD, 0)
+
+        # We use cat because the streamer requires to work with pipes.
+        if action == 'capture':
+            cmd = ["criu-image-streamer",
+                   "--images-dir '{images_dir}'",
+                   "--progress-fd {progress_fd}",
+                   action,
+                   "| cat > {img_file}"]
+        else:
+            cmd = ["cat {img_file} |",
+                   "criu-image-streamer",
+                   "--images-dir '{images_dir}'",
+                   "--progress-fd {progress_fd}",
+                   action]
+
+        # * As we are using a shell pipe command, we want to use pipefail.
+        # Otherwise, failures stay unnoticed. For this, we use bash as sh
+        # doesn't support that feature.
+        # * We use close_fds=False because we want the child to inherit the progress pipe
+        p = subprocess.Popen(["bash", "-c", "set -o pipefail; " + " ".join(cmd).format(
+            progress_fd=progress_w,
+            images_dir=self.__ddir(),
+            img_file=os.path.join(self.__ddir(), STREAMED_IMG_FILE_NAME)
+        )], close_fds=False)
+
+        os.close(progress_w)
+        progress = os.fdopen(progress_r, "r")
+
+        if action == 'serve' or action == 'extract':
+            # Consume image statistics
+            progress.readline()
+
+        if action == 'capture' or action == 'serve':
+            # The streamer socket is ready for consumption once we receive the
+            # socket-init message.
+            if progress.readline().strip() != "socket-init":
+                p.kill()
+                raise test_fail_exc(
+                    "criu-image-streamer is not starting (exit_code=%d)" % p.wait())
+
+        return p
+
     def dump(self, action, opts=[]):
         self.__iter += 1
         os.mkdir(self.__ddir())
@@ -1249,6 +1312,10 @@ class criu:
 
         a_opts += self.__test.getdopts()
 
+        if self.__stream:
+            streamer_p = self.spawn_criu_image_streamer("capture")
+            a_opts += ["--stream"]
+
         if self.__dedup:
             a_opts += ["--auto-dedup"]
 
@@ -1273,6 +1340,11 @@ class criu:
         self.__dump_process = self.__criu_act(action,
                                               opts=a_opts + opts,
                                               nowait=nowait)
+        if self.__stream:
+            ret = streamer_p.wait()
+            if ret:
+                raise test_fail_exc("criu-image-streamer exited with %d" % ret)
+
         if self.__mdedup and self.__iter > 1:
             self.__criu_act("dedup", opts=[])
 
@@ -1303,6 +1375,10 @@ class criu:
             r_opts += ['--empty-ns', 'net']
             r_opts += ['--action-script', os.getcwd() + '/empty-netns-prep.sh']
 
+        if self.__stream:
+            streamer_p = self.spawn_criu_image_streamer("serve")
+            r_opts += ["--stream"]
+
         if self.__dedup:
             r_opts += ["--auto-dedup"]
 
@@ -1336,6 +1412,11 @@ class criu:
             r_opts += ['--leave-stopped']
 
         self.__criu_act("restore", opts=r_opts + ["--restore-detached"])
+        if self.__stream:
+            ret = streamer_p.wait()
+            if ret:
+                raise test_fail_exc("criu-image-streamer exited with %d" % ret)
+
         self.show_stats("restore")
 
         if self.__leave_stopped:
@@ -1344,6 +1425,13 @@ class criu:
 
     @staticmethod
     def check(feature):
+        if feature == 'stream':
+            try:
+                p = subprocess.Popen(["criu-image-streamer", "--version"])
+                return p.wait() == 0
+            except Exception:
+                return False
+
         return criu_cli.run(
             "check", ["--no-default-config", "-v0", "--feature", feature],
             opts['criu_bin']) == 0
@@ -1852,7 +1940,7 @@ class Launcher:
               'stop', 'empty_ns', 'fault', 'keep_img', 'report', 'snaps',
               'sat', 'script', 'rpc', 'lazy_pages', 'join_ns', 'dedup', 'sbs',
               'freezecg', 'user', 'dry_run', 'noauto_dedup',
-              'remote_lazy_pages', 'show_stats', 'lazy_migrate',
+              'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
               'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
@@ -2138,6 +2226,15 @@ def run_tests(opts):
                 "[WARNING] Non-cooperative UFFD is missing, some tests might spuriously fail"
             )
 
+    if opts['stream']:
+        streamer_dir = os.path.realpath(opts['criu_image_streamer_dir'])
+        os.environ['PATH'] = "{}:{}".format(streamer_dir, os.environ['PATH'])
+        if not criu.check('stream'):
+            raise RuntimeError((
+                "Streaming tests need the criu-image-streamer binary to be accessible in the {} directory. " +
+                "Specify --criu-image-streamer-dir or modify PATH to provide an alternate location")
+                .format(streamer_dir))
+
     launcher = Launcher(opts, len(torun))
     try:
         for t in torun:
@@ -2460,8 +2557,8 @@ rp.add_argument("--rpc",
 rp.add_argument("--page-server",
                 help="Use page server dump",
                 action='store_true')
-rp.add_argument("--remote",
-                help="Use remote option for diskless C/R",
+rp.add_argument("--stream",
+                help="Use criu-image-streamer",
                 action='store_true')
 rp.add_argument("-p", "--parallel", help="Run test in parallel")
 rp.add_argument("--dry-run",
@@ -2500,6 +2597,9 @@ rp.add_argument("--criu-bin",
 rp.add_argument("--crit-bin",
                 help="Path to crit binary",
                 default='../crit/crit')
+rp.add_argument("--criu-image-streamer-dir",
+                help="Directory where the criu-image-streamer binary is located",
+                default="../../criu-image-streamer")
 rp.add_argument("--pre-dump-mode",
                 help="Use splice or read mode of pre-dumping",
                 choices=['splice', 'read'],

From 8c538ca10dc4385baf911b9b1747ff2287aff5fb Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@virtuozzo.com>
Date: Thu, 6 Jul 2017 12:38:48 +0300
Subject: [PATCH 0231/1854] page-read: Warn about async read w/o completion cb

Acked-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
---
 criu/pagemap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/pagemap.c b/criu/pagemap.c
index f1e1be91f..58f2850ff 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -462,6 +462,8 @@ static int read_page_complete(unsigned long img_id, unsigned long vaddr, int nr_
 
 	if (pr->io_complete)
 		ret = pr->io_complete(pr, vaddr, nr_pages);
+	else
+		pr_warn_once("Remote page read w/o io_complete!\n");
 
 	return ret;
 }

From eb732bcf0d7621e3b7a74797e8b4f04b40f2b183 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 24 Mar 2019 14:26:10 +0000
Subject: [PATCH 0232/1854] util: Remove deprecated print_data() routine

The print_data() function was part of the deprecated (and removed)
'show' action, and it was moved in util.c with the following commit:

	a501b4804b3c95e1d83d64dd10ed95c37f0378bb
	The 'show' action has been deprecated since 1.6, let's finally drop it.

	The print_data() routine is kept for yet another (to be deprecated too)
	feature called 'criu exec'.

The criu exec feature was removed with:

	909590a3558560655c1ce5b72215efbb325999ca
	Remove criu exec code

	It's now obsoleted by compel library.
	Maybe-TODO: Add compel tool exec action?

Therefore, now we can drop print_data() as well.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/include/util.h |  2 --
 criu/util.c         | 75 +--------------------------------------------
 2 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/criu/include/util.h b/criu/include/util.h
index 45bebf673..d67f6d39d 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -290,8 +290,6 @@ char *xstrcat(char *str, const char *fmt, ...)
 char *xsprintf(const char *fmt, ...)
 	__attribute__ ((__format__ (__printf__, 1, 2)));
 
-void print_data(unsigned long addr, unsigned char *data, size_t size);
-
 int setup_tcp_server(char *type, char *addr, unsigned short *port);
 int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk);
 int setup_tcp_client(char *hostname);
diff --git a/criu/util.c b/criu/util.c
index b30dbc86c..517f0fc25 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -26,7 +26,6 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sched.h>
-#include <ctype.h>
 
 #include "linux/mount.h"
 
@@ -994,85 +993,13 @@ void tcp_nodelay(int sk, bool on)
 		pr_perror("Unable to restore TCP_NODELAY (%d)", val);
 }
 
-static inline void pr_xsym(unsigned char *data, size_t len, int pos)
-{
-	char sym;
-
-	if (pos < len)
-		sym = data[pos];
-	else
-		sym = ' ';
-
-	pr_msg("%c", isprint(sym) ? sym : '.');
-}
-
-static inline void pr_xdigi(unsigned char *data, size_t len, int pos)
-{
-	if (pos < len)
-		pr_msg("%02x ", data[pos]);
-	else
-		pr_msg("   ");
-}
-
-static int nice_width_for(unsigned long addr)
-{
-	int ret = 3;
-
-	while (addr) {
-		addr >>= 4;
-		ret++;
-	}
-
-	return ret;
-}
-
-void print_data(unsigned long addr, unsigned char *data, size_t size)
-{
-	int i, j, addr_len;
-	unsigned zero_line = 0;
-
-	addr_len = nice_width_for(addr + size);
-
-	for (i = 0; i < size; i += 16) {
-		if (*(u64 *)(data + i) == 0 && *(u64 *)(data + i + 8) == 0) {
-			if (zero_line == 0)
-				zero_line = 1;
-			else {
-				if (zero_line == 1) {
-					pr_msg("*\n");
-					zero_line = 2;
-				}
-
-				continue;
-			}
-		} else
-			zero_line = 0;
-
-		pr_msg("%#0*lx: ", addr_len, addr + i);
-		for (j = 0; j < 8; j++)
-			pr_xdigi(data, size, i + j);
-		pr_msg(" ");
-		for (j = 8; j < 16; j++)
-			pr_xdigi(data, size, i + j);
-
-		pr_msg(" |");
-		for (j = 0; j < 8; j++)
-			pr_xsym(data, size, i + j);
-		pr_msg(" ");
-		for (j = 8; j < 16; j++)
-			pr_xsym(data, size, i + j);
-
-		pr_msg("|\n");
-	}
-}
-
 static int get_sockaddr_in(struct sockaddr_storage *addr, char *host,
 			unsigned short port)
 {
 	memset(addr, 0, sizeof(*addr));
 
 	if (!host) {
- 		((struct sockaddr_in *)addr)->sin_addr.s_addr = INADDR_ANY;
+		((struct sockaddr_in *)addr)->sin_addr.s_addr = INADDR_ANY;
 		addr->ss_family = AF_INET;
 	} else if (inet_pton(AF_INET, host, &((struct sockaddr_in *)addr)->sin_addr)) {
 		addr->ss_family = AF_INET;

From 8be1d457d71c93ea0a592bdc2dc8a982cd3e6fa9 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 15 May 2019 09:47:17 +0000
Subject: [PATCH 0233/1854] net: fix coverity RESOURCE_LEAK

criu-3.12/criu/net.c:2043: overwrite_var: Overwriting "img" in "img =
open_image_at(-1, CR_FD_IP6TABLES, 0UL, pid)" leaks the storage that
"img" points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/net.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 27e7c7e33..86fba2ddc 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2090,13 +2090,13 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 		if (written < n) {
 			pr_perror("Failed to write to tmpfile "
 				  "[written: %d; total: %d]", written, n);
-			return -1;
+			goto close;
 		}
 	}
 
 	if (fseek(tmp_file, 0, SEEK_SET)) {
 		pr_perror("Failed to set file position to beginning of tmpfile");
-		return -1;
+		goto close;
 	}
 
 	if (img) {
@@ -2104,6 +2104,7 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 		close_image(img);
 	}
 
+close:
 	if(fclose(tmp_file)) {
 		pr_perror("Failed to close tmpfile");
 	}
@@ -2208,6 +2209,7 @@ static inline int restore_iptables(int pid)
 		return -1;
 	if (empty_image(img)) {
 		ret = 0;
+		close_image(img);
 		goto ipt6;
 	}
 

From ba0d6dbac1bd237319817ac0f34653a78686be1f Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 8 Apr 2020 10:13:22 +0800
Subject: [PATCH 0234/1854] mips:compel/arch/mips: Add architecture support to
 compel tool and libraries

     This patch only adds the support but does not enable it for building.

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 .../arch/mips/plugins/include/asm/prologue.h  |  36 ++
 .../mips/plugins/include/asm/syscall-types.h  |  36 ++
 compel/arch/mips/plugins/include/features.h   |   6 +
 compel/arch/mips/plugins/std/memcpy.S         |  23 ++
 compel/arch/mips/plugins/std/parasite-head.S  |  20 ++
 .../plugins/std/syscalls/Makefile.syscalls    | 117 +++++++
 .../std/syscalls/syscall-common-mips-64.S     |  12 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  | 115 +++++++
 .../mips/scripts/compel-pack-compat.lds.S     |   4 +
 compel/arch/mips/scripts/compel-pack.lds.S    |  37 +++
 compel/arch/mips/src/lib/cpu.c                |  36 ++
 compel/arch/mips/src/lib/handle-elf-host.c    |   1 +
 compel/arch/mips/src/lib/handle-elf.c         |  23 ++
 compel/arch/mips/src/lib/include/handle-elf.h |   8 +
 compel/arch/mips/src/lib/include/ldsodefs.h   | 147 +++++++++
 compel/arch/mips/src/lib/include/syscall.h    |   7 +
 .../mips/src/lib/include/uapi/asm/.gitignore  |   0
 .../src/lib/include/uapi/asm/breakpoints.h    |   6 +
 .../arch/mips/src/lib/include/uapi/asm/cpu.h  |   5 +
 .../arch/mips/src/lib/include/uapi/asm/fpu.h  |   4 +
 .../src/lib/include/uapi/asm/infect-types.h   |  66 ++++
 .../mips/src/lib/include/uapi/asm/sigframe.h  |  63 ++++
 .../mips/src/lib/include/uapi/asm/siginfo.h   | 124 +++++++
 compel/arch/mips/src/lib/infect.c             | 310 ++++++++++++++++++
 include/common/arch/mips/asm/atomic.h         | 148 +++++++++
 include/common/arch/mips/asm/bitops.h         |  41 +++
 include/common/arch/mips/asm/bitsperlong.h    |   6 +
 include/common/arch/mips/asm/cmpxchg.h        |  67 ++++
 include/common/arch/mips/asm/fls64.h          |  38 +++
 include/common/arch/mips/asm/linkage.h        |  58 ++++
 include/common/arch/mips/asm/page.h           |  39 +++
 include/common/arch/mips/asm/utils.h          |  24 ++
 32 files changed, 1627 insertions(+)
 create mode 100755 compel/arch/mips/plugins/include/asm/prologue.h
 create mode 100755 compel/arch/mips/plugins/include/asm/syscall-types.h
 create mode 100755 compel/arch/mips/plugins/include/features.h
 create mode 100755 compel/arch/mips/plugins/std/memcpy.S
 create mode 100755 compel/arch/mips/plugins/std/parasite-head.S
 create mode 100755 compel/arch/mips/plugins/std/syscalls/Makefile.syscalls
 create mode 100755 compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S
 create mode 100755 compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
 create mode 100755 compel/arch/mips/scripts/compel-pack-compat.lds.S
 create mode 100755 compel/arch/mips/scripts/compel-pack.lds.S
 create mode 100755 compel/arch/mips/src/lib/cpu.c
 create mode 120000 compel/arch/mips/src/lib/handle-elf-host.c
 create mode 100755 compel/arch/mips/src/lib/handle-elf.c
 create mode 100755 compel/arch/mips/src/lib/include/handle-elf.h
 create mode 100755 compel/arch/mips/src/lib/include/ldsodefs.h
 create mode 100755 compel/arch/mips/src/lib/include/syscall.h
 create mode 100755 compel/arch/mips/src/lib/include/uapi/asm/.gitignore
 create mode 100755 compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h
 create mode 100755 compel/arch/mips/src/lib/include/uapi/asm/cpu.h
 create mode 100644 compel/arch/mips/src/lib/include/uapi/asm/fpu.h
 create mode 100755 compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
 create mode 100755 compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
 create mode 100755 compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
 create mode 100755 compel/arch/mips/src/lib/infect.c
 create mode 100755 include/common/arch/mips/asm/atomic.h
 create mode 100644 include/common/arch/mips/asm/bitops.h
 create mode 100755 include/common/arch/mips/asm/bitsperlong.h
 create mode 100755 include/common/arch/mips/asm/cmpxchg.h
 create mode 100644 include/common/arch/mips/asm/fls64.h
 create mode 100644 include/common/arch/mips/asm/linkage.h
 create mode 100755 include/common/arch/mips/asm/page.h
 create mode 100644 include/common/arch/mips/asm/utils.h

diff --git a/compel/arch/mips/plugins/include/asm/prologue.h b/compel/arch/mips/plugins/include/asm/prologue.h
new file mode 100755
index 000000000..9d812eec9
--- /dev/null
+++ b/compel/arch/mips/plugins/include/asm/prologue.h
@@ -0,0 +1,36 @@
+#ifndef __ASM_PROLOGUE_H__
+#define __ASM_PROLOGUE_H__
+
+#ifndef __ASSEMBLY__
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <errno.h>
+
+#define sys_recv(sockfd, ubuf, size, flags)	\
+	sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
+
+typedef struct prologue_init_args {
+	struct sockaddr_un	ctl_sock_addr;
+	unsigned int		ctl_sock_addr_len;
+
+	unsigned int		arg_s;
+	void			*arg_p;
+
+	void			*sigframe;
+} prologue_init_args_t;
+
+#endif /* __ASSEMBLY__ */
+
+/*
+ * Reserve enough space for sigframe.
+ *
+ * FIXME It is rather should be taken from sigframe header.
+ */
+#define PROLOGUE_SGFRAME_SIZE	4096
+
+#define PROLOGUE_INIT_ARGS_SIZE	1024
+
+#endif /* __ASM_PROLOGUE_H__ */
diff --git a/compel/arch/mips/plugins/include/asm/syscall-types.h b/compel/arch/mips/plugins/include/asm/syscall-types.h
new file mode 100755
index 000000000..64daf2c7a
--- /dev/null
+++ b/compel/arch/mips/plugins/include/asm/syscall-types.h
@@ -0,0 +1,36 @@
+#ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
+#define COMPEL_ARCH_SYSCALL_TYPES_H__
+
+/* Types for sigaction, sigprocmask syscalls */
+typedef void rt_signalfn_t(int, siginfo_t *, void *);
+typedef rt_signalfn_t *rt_sighandler_t;
+
+typedef void rt_restorefn_t(void);
+typedef rt_restorefn_t *rt_sigrestore_t;
+
+#define SA_RESTORER	0x04000000
+
+/** refer to linux-3.10/arch/mips/include/uapi/asm/signal.h*/
+#define _KNSIG		128
+#define _NSIG_BPW	64
+
+#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+
+/*
+ * Note: as k_rtsigset_t is the same size for 32-bit and 64-bit,
+ * sig defined as uint64_t rather than (unsigned long) - for the
+ * purpose if we ever going to support native 32-bit compilation.
+ */
+
+typedef struct {
+	uint64_t	sig[_KNSIG_WORDS];
+} k_rtsigset_t;
+
+typedef struct {
+	rt_sighandler_t	rt_sa_handler;
+	unsigned long	rt_sa_flags;
+	rt_sigrestore_t	rt_sa_restorer;
+	k_rtsigset_t	rt_sa_mask;
+} rt_sigaction_t;
+
+#endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/mips/plugins/include/features.h b/compel/arch/mips/plugins/include/features.h
new file mode 100755
index 000000000..0f35725fa
--- /dev/null
+++ b/compel/arch/mips/plugins/include/features.h
@@ -0,0 +1,6 @@
+#ifndef __COMPEL_ARCH_FEATURES_H
+#define __COMPEL_ARCH_FEATURES_H
+
+#define ARCH_HAS_MEMCPY
+
+#endif /* __COMPEL_ARCH_FEATURES_H */
diff --git a/compel/arch/mips/plugins/std/memcpy.S b/compel/arch/mips/plugins/std/memcpy.S
new file mode 100755
index 000000000..262267f7f
--- /dev/null
+++ b/compel/arch/mips/plugins/std/memcpy.S
@@ -0,0 +1,23 @@
+
+#include "common/asm/linkage.h"
+	
+	.section .head.text, "ax"
+ENTRY(memcpy)
+	.set noreorder
+	dadd v0,zero,a0
+	daddiu t1,zero,0
+loop:	
+	beq t1,a2,exit
+	nop
+	lb t2,0(a1)
+	sb t2,0(a0)
+	daddiu t1,t1,1
+	daddiu a0,a0,1
+	daddiu a1,a1,1
+	j loop
+	nop
+exit:
+	jr ra
+	nop
+END(memcpy)
+		
diff --git a/compel/arch/mips/plugins/std/parasite-head.S b/compel/arch/mips/plugins/std/parasite-head.S
new file mode 100755
index 000000000..38e87f823
--- /dev/null
+++ b/compel/arch/mips/plugins/std/parasite-head.S
@@ -0,0 +1,20 @@
+
+#include "common/asm/linkage.h"
+	
+	
+	.section .head.text, "ax"
+ENTRY(__export_parasite_head_start)
+	.set push
+	.set noreorder
+	lw	a0, __export_parasite_cmd
+	dla	a1, __export_parasite_args
+	jal	parasite_service
+	nop
+	.byte   0x0d, 0x00, 0x00, 0x00   //break
+	.set pop
+//	.byte 0x40,0x01,0x00,0x00   //pause
+	
+__export_parasite_cmd:
+	.long 0
+END(__export_parasite_head_start)
+		
diff --git a/compel/arch/mips/plugins/std/syscalls/Makefile.syscalls b/compel/arch/mips/plugins/std/syscalls/Makefile.syscalls
new file mode 100755
index 000000000..ef75f9e95
--- /dev/null
+++ b/compel/arch/mips/plugins/std/syscalls/Makefile.syscalls
@@ -0,0 +1,117 @@
+std-lib-y		+= ./$(PLUGIN_ARCH_DIR)/std/syscalls-64.o
+sys-proto-types		:= $(obj)/include/uapi/std/syscall-types.h
+sys-proto-generic	:= $(obj)/include/uapi/std/syscall.h
+sys-codes-generic	:= $(obj)/include/uapi/std/syscall-codes.h
+sys-codes		 = $(obj)/include/uapi/std/syscall-codes-$(1).h
+sys-proto		 = $(obj)/include/uapi/std/syscall-$(1).h
+sys-def			 = $(PLUGIN_ARCH_DIR)/std/syscalls/syscall_$(1).tbl
+sys-asm			 = $(PLUGIN_ARCH_DIR)/std/syscalls-$(1).S
+sys-asm-common-name	 = std/syscalls/syscall-common-mips-$(1).S
+sys-asm-common		 = $(PLUGIN_ARCH_DIR)/$(sys-asm-common-name)
+sys-asm-types		:= $(obj)/include/uapi/std/asm/syscall-types.h
+sys-exec-tbl		 = $(PLUGIN_ARCH_DIR)/std/sys-exec-tbl-$(1).c
+
+sys-bits		:= 64
+
+AV			:= $$$$
+
+define gen-rule-sys-codes
+$(sys-codes): $(sys-def) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) echo "#ifndef ASM_SYSCALL_CODES_H_$(1)__"					>> $$@
+	$(Q) echo "#define ASM_SYSCALL_CODES_H_$(1)__"					>> $$@
+	$(Q) cat $$< | awk '/^__NR/{SYSN=$(AV)1;					\
+		sub("^__NR", "SYS", SYSN);						\
+		print "\n#ifndef ", $(AV)1;						\
+		print "#define", $(AV)1, $(AV)2;					\
+		print "#endif";								\
+		print "\n#ifndef ", SYSN;						\
+		print "#define ", SYSN, $(AV)1;						\
+		print "#endif";}'							>> $$@
+	$(Q) echo "#endif /* ASM_SYSCALL_CODES_H_$(1)__ */"				>> $$@
+endef
+
+define gen-rule-sys-proto
+$(sys-proto): $(sys-def) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) echo "#ifndef ASM_SYSCALL_PROTO_H_$(1)__"					>> $$@
+	$(Q) echo "#define ASM_SYSCALL_PROTO_H_$(1)__"					>> $$@
+	$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>'			>> $$@
+	$(Q) echo '#include <compel/plugins/std/syscall-types.h>'			>> $$@
+ifeq ($(1),32)
+	$(Q) echo '#include "asm/syscall32.h"'						>> $$@
+endif
+	$(Q) cat $$< | awk '/^__NR/{print "extern long", $(AV)3,			\
+			substr($(AV)0, index($(AV)0,$(AV)4)), ";"}'			>> $$@
+	$(Q) echo "#endif /* ASM_SYSCALL_PROTO_H_$(1)__ */"				>> $$@
+endef
+
+define gen-rule-sys-asm
+$(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>'			>> $$@
+	$(Q) echo '#include "$(sys-asm-common-name)"'					>> $$@
+	$(Q) cat $$< | awk '/^__NR/{print "SYSCALL(", $(AV)3, ",", $(AV)2, ")"}'	>> $$@
+endef
+
+define gen-rule-sys-exec-tbl
+$(sys-exec-tbl): $(sys-def) $(sys-codes) $(sys-proto) $(sys-proto-generic) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) cat $$< | awk '/^__NR/{print						\
+		"SYSCALL(", substr($(AV)3, 5), ",", $(AV)2, ")"}'			>> $$@
+endef
+
+$(sys-codes-generic): $(sys-proto-types)
+	$(call msg-gen, $@)
+	$(Q) echo "/* Autogenerated, don't edit */"			>  $@
+	$(Q) echo "#ifndef __ASM_CR_SYSCALL_CODES_H__"			>> $@
+	$(Q) echo "#define __ASM_CR_SYSCALL_CODES_H__"			>> $@
+	$(Q) echo '#include <compel/plugins/std/syscall-codes-64.h>'	>> $@
+	$(Q) cat $< | awk '/^__NR/{NR32=$$1;				\
+		sub("^__NR", "__NR32", NR32);				\
+		print "\n#ifndef ", NR32;				\
+		print "#define ", NR32, $$2;				\
+		print "#endif";}'					>> $@
+	$(Q) echo "#endif /* __ASM_CR_SYSCALL_CODES_H__ */"		>> $@
+mrproper-y += $(sys-codes-generic)
+
+$(sys-proto-generic): $(strip $(call map,sys-proto,$(sys-bits))) $(sys-proto-types)
+	$(call msg-gen, $@)
+	$(Q) echo "/* Autogenerated, don't edit */"			>  $@
+	$(Q) echo "#ifndef __ASM_CR_SYSCALL_PROTO_H__"			>> $@
+	$(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__"			>> $@
+	$(Q) echo ""							>> $@
+	$(Q) echo '#include <compel/plugins/std/syscall-64.h>'		>> $@
+	$(Q) echo ""							>> $@
+	$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */"		>> $@
+mrproper-y += $(sys-proto-generic)
+
+define gen-rule-sys-exec-tbl
+$(sys-exec-tbl): $(sys-def) $(sys-codes) $(sys-proto) $(sys-proto-generic)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"			>  $$@
+	$(Q) cat $$< | awk '/^__NR/{print				\
+		"SYSCALL(", substr($(AV)3, 5), ",", $(AV)2, ")"}'	>> $$@
+endef
+
+$(eval $(call map,gen-rule-sys-codes,$(sys-bits)))
+$(eval $(call map,gen-rule-sys-proto,$(sys-bits)))
+$(eval $(call map,gen-rule-sys-asm,$(sys-bits)))
+$(eval $(call map,gen-rule-sys-exec-tbl,$(sys-bits)))
+
+$(sys-asm-types): $(PLUGIN_ARCH_DIR)/include/asm/syscall-types.h
+	$(call msg-gen, $@)
+	$(Q) ln -s ../../../../../../$(PLUGIN_ARCH_DIR)/include/asm/syscall-types.h $(sys-asm-types)
+
+std-headers-deps	+= $(call sys-codes,$(sys-bits))
+std-headers-deps	+= $(call sys-proto,$(sys-bits))
+std-headers-deps	+= $(call sys-asm,$(sys-bits))
+std-headers-deps	+= $(call sys-exec-tbl,$(sys-bits))
+std-headers-deps	+= $(sys-codes-generic)
+std-headers-deps	+= $(sys-proto-generic)
+std-headers-deps	+= $(sys-asm-types)
+mrproper-y		+= $(std-headers-deps)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S b/compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S
new file mode 100755
index 000000000..3478488da
--- /dev/null
+++ b/compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S
@@ -0,0 +1,12 @@
+#include "common/asm/linkage.h"
+
+#define SYSCALL(name, opcode)		\
+	ENTRY(name);			\
+	li v0, opcode;		\
+	syscall;			\
+	jr ra;				\
+	nop;				\
+	END(name)
+
+ENTRY(__cr_restore_rt)
+END(__cr_restore_rt)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
new file mode 100755
index 000000000..47c08fc4c
--- /dev/null
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -0,0 +1,115 @@
+#
+# System calls table, please make sure the table consist only the syscalls
+# really used somewhere in project.
+# from kernel/linux-3.10.84/arch/mips/include/uapi/asm/unistd.h Linux 64-bit syscalls are in the range from 5000 to 5999.
+#
+# __NR_name			code		name			arguments
+# -------------------------------------------------------------------------------------------------------------------------------------------------------------
+__NR_read			5000		sys_read		(int fd, void *buf, unsigned long count)
+__NR_write			5001		sys_write		(int fd, const void *buf, unsigned long count)
+__NR_open			5002		sys_open		(const char *filename, unsigned long flags, unsigned long mode)
+__NR_close			5003		sys_close		(int fd)
+__NR_lseek			5008		sys_lseek		(int fd, unsigned long offset, unsigned long origin)
+__NR_mmap			5009		sys_mmap		(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
+__NR_mprotect			5010		sys_mprotect		(const void *addr, unsigned long len, unsigned long prot)
+__NR_munmap			5011		sys_munmap		(void *addr, unsigned long len)
+__NR_brk			5012		sys_brk			(void *addr)
+__NR_rt_sigaction		5013		sys_sigaction		(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
+__NR_rt_sigprocmask		5014		sys_sigprocmask		(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
+__NR_rt_sigreturn		5211		sys_rt_sigreturn	(void)
+__NR_ioctl			5015		sys_ioctl		(unsigned int fd, unsigned int cmd, unsigned long arg)
+__NR_pread64			5016		sys_pread		(unsigned int fd, char *buf, size_t count, loff_t pos)
+__NR_mremap			5024		sys_mremap		(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr)
+__NR_mincore			5026		sys_mincore		(void *addr, unsigned long size, unsigned char *vec)
+__NR_madvise			5027		sys_madvise		(unsigned long start, size_t len, int behavior)
+__NR_shmat			5029		sys_shmat		(int shmid, void *shmaddr, int shmflag)
+__NR_dup2			5032		sys_dup2		(int oldfd, int newfd)
+__NR_nanosleep			5034		sys_nanosleep		(struct timespec *req, struct timespec *rem)
+__NR_getitimer			5035		sys_getitimer		(int which, const struct itimerval *val)
+__NR_setitimer			5036		sys_setitimer		(int which, const struct itimerval *val, struct itimerval *old)
+__NR_getpid			5038		sys_getpid		(void)
+__NR_socket			5040		sys_socket		(int domain, int type, int protocol)
+__NR_connect			5041		sys_connect		(int sockfd, struct sockaddr *addr, int addrlen)
+__NR_sendto			5043		sys_sendto		(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
+__NR_recvfrom			5044		sys_recvfrom		(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
+__NR_sendmsg			5045		sys_sendmsg		(int sockfd, const struct msghdr *msg, int flags)
+__NR_recvmsg			5046		sys_recvmsg		(int sockfd, struct msghdr *msg, int flags)
+__NR_shutdown			5047		sys_shutdown		(int sockfd, int how)
+__NR_bind			5048		sys_bind		(int sockfd, const struct sockaddr *addr, int addrlen)
+__NR_setsockopt			5053		sys_setsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
+__NR_getsockopt			5054		sys_getsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
+__NR_clone			5055		sys_clone		(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
+__NR_exit			5058		sys_exit		(unsigned long error_code)
+__NR_wait4			5059		sys_wait4		(int pid, int *status, int options, struct rusage *ru)
+__NR_kill			5060		sys_kill		(long pid, int sig)
+__NR_fcntl			5070		sys_fcntl		(int fd, int type, long arg)
+__NR_flock			5071		sys_flock		(int fd, unsigned long cmd)
+__NR_mkdir			5081		sys_mkdir		(const char *name, int mode)
+__NR_rmdir			5082		sys_rmdir		(const char *name)
+__NR_unlink			5085		sys_unlink		(char *pathname)
+__NR_umask			5093		sys_umask		(int mask)
+__NR_gettimeofday		5094		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
+__NR_ptrace			5099		sys_ptrace		(long request, pid_t pid, void *addr, void *data)
+__NR_getgroups			5113		sys_getgroups		(int gsize, unsigned int *groups)
+__NR_setgroups			5114		sys_setgroups		(int gsize, unsigned int *groups)
+__NR_setresuid			5115		sys_setresuid		(int uid, int euid, int suid)
+__NR_getresuid			5116		sys_getresuid		(int *uid, int *euid, int *suid)
+__NR_setresgid			5117		sys_setresgid		(int gid, int egid, int sgid)
+__NR_getresgid			5118		sys_getresgid		(int *gid, int *egid, int *sgid)
+__NR_getpgid			5119		sys_getpgid		(pid_t pid)
+__NR_setfsuid			5120		sys_setfsuid		(int fsuid)
+__NR_setfsgid			5121		sys_setfsgid		(int fsgid)
+__NR_getsid			5122		sys_getsid		(void)
+__NR_capget			5123		sys_capget		(struct cap_header *h, struct cap_data *d)
+__NR_capset			5124		sys_capset		(struct cap_header *h, struct cap_data *d)
+__NR_rt_sigqueueinfo		5127		sys_rt_sigqueueinfo	(pid_t pid, int sig, siginfo_t *info)
+__NR_sigaltstack		5129		sys_sigaltstack		(const void *uss, void *uoss)
+__NR_personality		5132		sys_personality		(unsigned int personality)
+__NR_setpriority		5138		sys_setpriority		(int which, int who, int nice)
+__NR_sched_setscheduler		5141		sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
+__NR_prctl			5153		sys_prctl		(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
+__NR_setrlimit			5155		sys_setrlimit		(int resource, struct krlimit *rlim)
+__NR_mount			5160		sys_mount		(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
+__NR_umount2			5161		sys_umount2		(char *name, int flags)
+__NR_gettid			5178		sys_gettid		(void)
+__NR_futex			5194		sys_futex		(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
+__NR_cacheflush			5197		sys_cacheflush		(char *addr, int nbytes, int cache)
+__NR_io_setup			5200		sys_io_setup		(unsigned nr_events, aio_context_t *ctx)
+__NR_io_getevents		5202		sys_io_getevents	(aio_context_t ctx, long min_nr, long nr, struct io_event *evs, struct timespec *tmo)
+__NR_io_submit			5203		sys_io_submit		(aio_context_t ctx, long nr, struct iocb **iocbpp)
+__NR_set_tid_address		5212		sys_set_tid_address	(int *tid_addr)
+__NR_restart_syscall		5213		sys_restart_syscall	(void)
+__NR_sys_timer_create		5216		sys_timer_create	(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
+__NR_sys_timer_settime		5217		sys_timer_settime	(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
+__NR_sys_timer_gettime		5218		sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
+__NR_sys_timer_getoverrun	5219		sys_timer_getoverrun	(int timer_id)
+__NR_sys_timer_delete		5220		sys_timer_delete	(kernel_timer_t timer_id)
+__NR_clock_gettime		5222		sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_exit_group			5205		sys_exit_group		(int error_code)
+__NR_set_thread_area		5242		sys_set_thread_area	(unsigned long *addr)
+__NR_openat			5247		sys_openat		(int dfd, const char *filename, int flags, int mode)
+__NR_waitid			5237		sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
+__NR_readlinkat			5257		sys_readlinkat		(int fd, const char *path, char *buf, int bufsize)
+__NR_ppoll			5261		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_set_robust_list		5268		sys_set_robust_list	(struct robust_list_head *head, size_t len)
+__NR_get_robust_list		5269		sys_get_robust_list	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
+__NR_fallocate			5279		sys_fallocate		(int fd, int mode, loff_t offset, loff_t len)
+__NR_seccomp			5312		sys_seccomp		(unsigned int op, unsigned int flags, const char *uargs)
+__NR_vmsplice			5266		sys_vmsplice		(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
+__NR_timerfd_settime		5282		sys_timerfd_settime	(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
+__NR_signalfd4			5283		sys_signalfd		(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
+__NR_preadv			5289		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
+__NR_rt_tgsigqueueinfo		5291		sys_rt_tgsigqueueinfo	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
+__NR_fanotify_init		5295		sys_fanotify_init	(unsigned int flags, unsigned int event_f_flags)
+__NR_fanotify_mark		5296		sys_fanotify_mark	(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
+__NR_open_by_handle_at		5299		sys_open_by_handle_at	(int mountdirfd, struct file_handle *handle, int flags)
+__NR_setns			5303		sys_setns		(int fd, int nstype)
+__NR_kcmp			5306		sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
+__NR_memfd_create		5314		sys_memfd_create	(const char *name, unsigned int flags)
+__NR_userfaultfd		5317		sys_userfaultfd		(int flags)
+
+##TODO for kernel
+__NR_fsopen			5430		sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount			5432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
\ No newline at end of file
diff --git a/compel/arch/mips/scripts/compel-pack-compat.lds.S b/compel/arch/mips/scripts/compel-pack-compat.lds.S
new file mode 100755
index 000000000..0ae585e0d
--- /dev/null
+++ b/compel/arch/mips/scripts/compel-pack-compat.lds.S
@@ -0,0 +1,4 @@
+OUTPUT_ARCH(mips)
+EXTERN(__export_parasite_head_start)
+ASSERT(0,"Compatible PIEs are unsupported on mips")
+
diff --git a/compel/arch/mips/scripts/compel-pack.lds.S b/compel/arch/mips/scripts/compel-pack.lds.S
new file mode 100755
index 000000000..cadb19aef
--- /dev/null
+++ b/compel/arch/mips/scripts/compel-pack.lds.S
@@ -0,0 +1,37 @@
+OUTPUT_ARCH(mips)
+EXTERN(__export_parasite_head_start)
+
+SECTIONS
+{
+	.text : {  
+		*(.head.text)
+		ASSERT(DEFINED(__export_parasite_head_start),	
+			"Symbol __export_parasite_head_start is missing");
+        	*(.text*)
+		*(.compel.exit)
+		*(.compel.init)
+		/* .rodata section*/
+		*(.rodata*)
+		*(.got*)
+	       /* .data section */
+		*(.data*)
+		*(.bss*)
+		*(.sbss*)
+		*(.toc*)
+	}
+
+	/DISCARD/ : { /*segments need to discard */
+		*(.debug*)
+		*(.pdr)	
+		*(.comment*)
+		*(.note*)
+		*(.group*)
+		*(.eh_frame*)
+		*(.MIPS.options)
+		*(.gnu.attributes)
+	}
+
+/* Parasite args should have 4 bytes align, as we have futex inside. */
+. = ALIGN(32);
+__export_parasite_args = .;
+}
diff --git a/compel/arch/mips/src/lib/cpu.c b/compel/arch/mips/src/lib/cpu.c
new file mode 100755
index 000000000..4b071cd16
--- /dev/null
+++ b/compel/arch/mips/src/lib/cpu.c
@@ -0,0 +1,36 @@
+#include <string.h>
+#include <stdbool.h>
+
+#include "compel-cpu.h"
+#include "common/bitops.h"
+#include "common/compiler.h"
+#include "log.h"
+
+#undef	LOG_PREFIX
+#define LOG_PREFIX "cpu: "
+
+static compel_cpuinfo_t rt_info;
+static bool rt_info_done = false;
+
+void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
+
+void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
+
+int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{ 
+    return 0;
+}
+
+int compel_cpuid(compel_cpuinfo_t *c){	
+    return 0;
+}
+
+bool compel_cpu_has_feature(unsigned int feature)
+{
+    if (!rt_info_done) {
+	compel_cpuid(&rt_info);
+	rt_info_done = true;
+    }
+    
+    return compel_test_cpu_cap(&rt_info, feature);
+}
diff --git a/compel/arch/mips/src/lib/handle-elf-host.c b/compel/arch/mips/src/lib/handle-elf-host.c
new file mode 120000
index 000000000..fe4611886
--- /dev/null
+++ b/compel/arch/mips/src/lib/handle-elf-host.c
@@ -0,0 +1 @@
+handle-elf.c
\ No newline at end of file
diff --git a/compel/arch/mips/src/lib/handle-elf.c b/compel/arch/mips/src/lib/handle-elf.c
new file mode 100755
index 000000000..199bb1581
--- /dev/null
+++ b/compel/arch/mips/src/lib/handle-elf.c
@@ -0,0 +1,23 @@
+#include <string.h>
+#include <errno.h>
+
+#include "handle-elf.h"
+#include "piegen.h"
+#include "log.h"
+
+static const unsigned char __maybe_unused
+elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+extern int __handle_elf(void *mem, size_t size);
+
+int handle_binary(void *mem, size_t size)
+{
+    if (memcmp(mem, elf_ident_64_le, sizeof(elf_ident_64_le)) == 0)
+	return __handle_elf(mem, size);
+
+	pr_err("Unsupported Elf format detected\n");
+	return -EINVAL;
+}
diff --git a/compel/arch/mips/src/lib/include/handle-elf.h b/compel/arch/mips/src/lib/include/handle-elf.h
new file mode 100755
index 000000000..f28188136
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/handle-elf.h
@@ -0,0 +1,8 @@
+#ifndef COMPEL_HANDLE_ELF_H__
+#define COMPEL_HANDLE_ELF_H__
+
+#include "elf64-types.h"
+
+#define arch_is_machine_supported(e_machine)	(e_machine == EM_MIPS)
+
+#endif /* COMPEL_HANDLE_ELF_H__ */
diff --git a/compel/arch/mips/src/lib/include/ldsodefs.h b/compel/arch/mips/src/lib/include/ldsodefs.h
new file mode 100755
index 000000000..6e2d4f549
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/ldsodefs.h
@@ -0,0 +1,147 @@
+/* Run-time dynamic linker data structures for loaded ELF shared objects.
+   Copyright (C) 2000-2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _MIPS_LDSODEFS_H
+#define _MIPS_LDSODEFS_H 1
+
+#include <elf.h>
+
+struct La_mips_32_regs;
+struct La_mips_32_retval;
+struct La_mips_64_regs;
+struct La_mips_64_retval;
+
+#define ARCH_PLTENTER_MEMBERS						    \
+    Elf32_Addr (*mips_o32_gnu_pltenter) (Elf32_Sym *, unsigned int,	    \
+					 uintptr_t *, uintptr_t *,	    \
+					 struct La_mips_32_regs *,	    \
+					 unsigned int *, const char *name,  \
+					 long int *framesizep);		    \
+    Elf32_Addr (*mips_n32_gnu_pltenter) (Elf32_Sym *, unsigned int,	    \
+					 uintptr_t *, uintptr_t *,	    \
+					 struct La_mips_64_regs *,	    \
+					 unsigned int *, const char *name,  \
+					 long int *framesizep);		    \
+    Elf64_Addr (*mips_n64_gnu_pltenter) (Elf64_Sym *, unsigned int,	    \
+					 uintptr_t *, uintptr_t *,	    \
+					 struct La_mips_64_regs *,	    \
+					 unsigned int *, const char *name,  \
+					 long int *framesizep);
+
+#define ARCH_PLTEXIT_MEMBERS						    \
+    unsigned int (*mips_o32_gnu_pltexit) (Elf32_Sym *, unsigned int,	    \
+					  uintptr_t *, uintptr_t *,	    \
+					  const struct La_mips_32_regs *,   \
+					  struct La_mips_32_retval *,	    \
+					  const char *);		    \
+    unsigned int (*mips_n32_gnu_pltexit) (Elf32_Sym *, unsigned int,	    \
+					  uintptr_t *, uintptr_t *,	    \
+					  const struct La_mips_64_regs *,   \
+					  struct La_mips_64_retval *,	    \
+					  const char *);		    \
+    unsigned int (*mips_n64_gnu_pltexit) (Elf64_Sym *, unsigned int,	    \
+					  uintptr_t *, uintptr_t *,	    \
+					  const struct La_mips_64_regs *,   \
+					  struct La_mips_64_retval *,	    \
+					  const char *);
+
+/* The MIPS ABI specifies that the dynamic section has to be read-only.  */
+
+/* The 64-bit MIPS ELF ABI uses an unusual reloc format.  Each
+   relocation entry specifies up to three actual relocations, all at
+   the same address.  The first relocation which required a symbol
+   uses the symbol in the r_sym field.  The second relocation which
+   requires a symbol uses the symbol in the r_ssym field.  If all
+   three relocations require a symbol, the third one uses a zero
+   value.
+
+   We define these structures in internal headers because we're not
+   sure we want to make them part of the ABI yet.  Eventually, some of
+   this may move into elf/elf.h.  */
+
+/* An entry in a 64 bit SHT_REL section.  */
+
+typedef struct
+{
+  Elf32_Word    r_sym;		/* Symbol index */
+  unsigned char r_ssym;		/* Special symbol for 2nd relocation */
+  unsigned char r_type3;	/* 3rd relocation type */
+  unsigned char r_type2;	/* 2nd relocation type */
+  unsigned char r_type1;	/* 1st relocation type */
+} _Elf64_Mips_R_Info;
+
+typedef union
+{
+  Elf64_Xword	r_info_number;
+  _Elf64_Mips_R_Info r_info_fields;
+} _Elf64_Mips_R_Info_union;
+
+typedef struct
+{
+  Elf64_Addr	r_offset;		/* Address */
+  _Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
+} Elf64_Mips_Rel;
+
+typedef struct
+{
+  Elf64_Addr	r_offset;		/* Address */
+  _Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
+  Elf64_Sxword	r_addend;		/* Addend */
+} Elf64_Mips_Rela;
+
+#define ELF64_MIPS_R_SYM(i) \
+  ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
+#define ELF64_MIPS_R_TYPE(i) \
+  (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \
+   | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
+		   ).r_info_fields.r_type2 << 8) \
+   | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
+		   ).r_info_fields.r_type3 << 16) \
+   | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
+		   ).r_info_fields.r_ssym << 24))
+#define ELF64_MIPS_R_INFO(sym, type) \
+  (__extension__ (_Elf64_Mips_R_Info_union) \
+   (__extension__ (_Elf64_Mips_R_Info) \
+   { (sym), ELF64_MIPS_R_SSYM (type), \
+       ELF64_MIPS_R_TYPE3 (type), \
+       ELF64_MIPS_R_TYPE2 (type), \
+       ELF64_MIPS_R_TYPE1 (type) \
+   }).r_info_number)
+/* These macros decompose the value returned by ELF64_MIPS_R_TYPE, and
+   compose it back into a value that it can be used as an argument to
+   ELF64_MIPS_R_INFO.  */
+#define ELF64_MIPS_R_SSYM(i) (((i) >> 24) & 0xff)
+#define ELF64_MIPS_R_TYPE3(i) (((i) >> 16) & 0xff)
+#define ELF64_MIPS_R_TYPE2(i) (((i) >> 8) & 0xff)
+#define ELF64_MIPS_R_TYPE1(i) ((i) & 0xff)
+#define ELF64_MIPS_R_TYPEENC(type1, type2, type3, ssym) \
+  ((type1) \
+   | ((Elf32_Word)(type2) << 8) \
+   | ((Elf32_Word)(type3) << 16) \
+   | ((Elf32_Word)(ssym) << 24))
+
+#undef ELF64_R_SYM
+#define ELF64_R_SYM(i) ELF64_MIPS_R_SYM (i)
+#undef ELF64_R_TYPE
+
+/*fixme*/
+#define ELF64_R_TYPE(i) (ELF64_MIPS_R_TYPE (i) & 0x00ff)
+#undef ELF64_R_INFO
+#define ELF64_R_INFO(sym, type) ELF64_MIPS_R_INFO ((sym), (type))
+
+#endif
diff --git a/compel/arch/mips/src/lib/include/syscall.h b/compel/arch/mips/src/lib/include/syscall.h
new file mode 100755
index 000000000..704080172
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/syscall.h
@@ -0,0 +1,7 @@
+#ifndef __COMPEL_SYSCALL_H__
+#define __COMPEL_SYSCALL_H__
+
+#ifndef SIGSTKFLT
+#define SIGSTKFLT	16
+#endif
+#endif
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/.gitignore b/compel/arch/mips/src/lib/include/uapi/asm/.gitignore
new file mode 100755
index 000000000..e69de29bb
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h b/compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h
new file mode 100755
index 000000000..21eb1309f
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h
@@ -0,0 +1,6 @@
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
+#define ARCH_SI_TRAP TRAP_BRKPT
+extern int ptrace_set_breakpoint(pid_t pid, void *addr);
+extern int ptrace_flush_breakpoints(pid_t pid);
+#endif
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/cpu.h b/compel/arch/mips/src/lib/include/uapi/asm/cpu.h
new file mode 100755
index 000000000..329b9529b
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/uapi/asm/cpu.h
@@ -0,0 +1,5 @@
+#ifndef __CR_ASM_CPU_H__
+#define __CR_ASM_CPU_H__
+
+typedef struct { } compel_cpuinfo_t;
+#endif /* __CR_ASM_CPU_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/fpu.h b/compel/arch/mips/src/lib/include/uapi/asm/fpu.h
new file mode 100644
index 000000000..7f476d541
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/uapi/asm/fpu.h
@@ -0,0 +1,4 @@
+#ifndef __CR_ASM_FPU_H__
+#define __CR_ASM_FPU_H__
+
+#endif /* __CR_ASM_FPU_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
new file mode 100755
index 000000000..423880821
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
@@ -0,0 +1,66 @@
+#ifndef UAPI_COMPEL_ASM_TYPES_H__
+#define UAPI_COMPEL_ASM_TYPES_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <signal.h>
+#include <compel/plugins/std/asm/syscall-types.h>
+#include <linux/types.h>
+#define SIGMAX			64
+#define SIGMAX_OLD		31
+
+/*
+
+ * Copied from the Linux kernel header arch/mips/include/asm/ptrace.h
+ *
+ * A thread MIPS CPU context
+ **/
+typedef struct {
+	/* Saved main processor registers. */
+	__u64 regs[32];
+
+	/* Saved special registers. */
+	__u64 lo;
+	__u64 hi;
+	__u64 cp0_epc;
+	__u64 cp0_badvaddr;
+	__u64 cp0_status;
+	__u64 cp0_cause;
+} user_regs_struct_t;
+
+/* from linux-3.10/arch/mips/kernel/ptrace.c */
+typedef struct {
+	/* Saved fpu registers. */
+	__u64 regs[32];
+
+	__u32 fpu_fcr31;
+	__u32 fpu_id;
+
+
+} user_fpregs_struct_t;
+
+#define MIPS_a0			regs[4] //arguments a0-a3
+#define MIPS_t0			regs[8] //temporaries t0-t7
+#define MIPS_v0			regs[2] 
+#define MIPS_v1			regs[3] 
+#define MIPS_sp			regs[29]
+#define MIPS_ra			regs[31]
+
+
+#define NATIVE_MAGIC	0x0A
+#define COMPAT_MAGIC	0x0C
+static inline bool user_regs_native(user_regs_struct_t *pregs)
+{
+	return true;
+}
+
+
+#define REG_RES(regs)		((regs).MIPS_v0) 
+#define REG_IP(regs)		((regs).cp0_epc) 
+#define REG_SP(regs)		((regs).MIPS_sp)
+#define REG_SYSCALL_NR(regs)	((regs).MIPS_v0) 
+
+//#define __NR(syscall, compat)	((compat) ? __NR32_##syscall : __NR_##syscall)
+#define __NR(syscall, compat)	__NR_##syscall
+
+#endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
new file mode 100755
index 000000000..ed6a959fc
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
@@ -0,0 +1,63 @@
+#ifndef UAPI_COMPEL_ASM_SIGFRAME_H__
+#define UAPI_COMPEL_ASM_SIGFRAME_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <compel/asm/fpu.h>
+#include <compel/plugins/std/syscall-codes.h>
+
+#include <asm/types.h>
+#define u32 __u32
+
+/* sigcontext defined in /usr/include/asm/sigcontext.h*/
+#define rt_sigcontext			sigcontext
+
+
+#include <compel/sigframe-common.h>
+
+/* refer to linux-3.10/include/uapi/asm-generic/ucontext.h */
+struct k_ucontext{
+    unsigned long uc_flags;
+    struct k_ucontext *uc_link;
+    stack_t uc_stack;
+    struct sigcontext uc_mcontext;
+    k_rtsigset_t uc_sigmask;
+};
+
+/* Copy from the kernel source arch/mips/kernel/signal.c */
+struct rt_sigframe {
+	u32 rs_ass[4];		/* argument save space for o32 */
+	u32 rs_pad[2];		/* Was: signal trampoline */
+        siginfo_t rs_info;
+	struct k_ucontext rs_uc;
+};
+
+
+#define RT_SIGFRAME_UC(rt_sigframe)		(&rt_sigframe->rs_uc)
+#define RT_SIGFRAME_UC_SIGMASK(rt_sigframe) 	((k_rtsigset_t *)(void *)&rt_sigframe->rs_uc.uc_sigmask)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	((long unsigned int)0x00)   
+#define RT_SIGFRAME_FPU(rt_sigframe)		     
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe) 1
+
+
+#define RT_SIGFRAME_OFFSET(rt_sigframe)	0
+
+
+#define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)				\
+	asm volatile(							\
+		     "move $29, %0				    \n"	\
+		     "li $2,  "__stringify(__NR_rt_sigreturn)"  \n" \
+		     "syscall					    \n"	\
+		     :							\
+		     : "r"(new_sp)					\
+		     : "$29","$2","memory")
+
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
+		struct rt_sigframe *rsigframe);
+
+#define rt_sigframe_erase_sigset(sigframe)				\
+	memset(&sigframe->rs_uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from)				\
+	memcpy(&sigframe->rs_uc.uc_sigmask, from, sizeof(k_rtsigset_t))
+#endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
new file mode 100755
index 000000000..519aea1a6
--- /dev/null
+++ b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
@@ -0,0 +1,124 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1998, 1999, 2001, 2003 Ralf Baechle
+ * Copyright (C) 2000, 2001 Silicon Graphics, Inc.
+ */
+#ifndef _UAPI_ASM_SIGINFO_H
+#define _UAPI_ASM_SIGINFO_H
+
+
+#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
+#undef __ARCH_SI_TRAPNO /* exception code needs to fill this ...  */
+
+#define HAVE_ARCH_SIGINFO_T
+
+/*
+ * Careful to keep union _sifields from shifting ...
+ */
+
+#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
+
+#define __ARCH_SIGSYS
+
+#define SI_MAX_SIZE	128
+#define SI_PAD_SIZE	((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
+#define __ARCH_SI_UID_T	__kernel_uid32_t
+
+#ifndef __ARCH_SI_UID_T
+#define __ARCH_SI_UID_T	__kernel_uid32_t
+#endif
+
+#ifndef __ARCH_SI_BAND_T
+#define __ARCH_SI_BAND_T long
+#endif
+
+#ifndef __ARCH_SI_CLOCK_T
+#define __ARCH_SI_CLOCK_T __kernel_clock_t
+#endif
+
+#ifndef __ARCH_SI_ATTRIBUTES
+#define __ARCH_SI_ATTRIBUTES
+#endif
+
+typedef struct siginfo {
+	int si_signo;
+	int si_errno;
+	int si_code;
+
+	union {
+		int _pad[SI_PAD_SIZE];
+
+		/* kill() */
+		struct {
+			__kernel_pid_t _pid;	/* sender's pid */
+			__ARCH_SI_UID_T _uid;	/* sender's uid */
+		} _kill;
+
+		/* POSIX.1b timers */
+		struct {
+			__kernel_timer_t _tid;	/* timer id */
+			int _overrun;		/* overrun count */
+			char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
+			sigval_t _sigval;	/* same as below */
+			int _sys_private;       /* not to be passed to user */
+		} _timer;
+
+		/* POSIX.1b signals */
+		struct {
+			__kernel_pid_t _pid;	/* sender's pid */
+			__ARCH_SI_UID_T _uid;	/* sender's uid */
+			sigval_t _sigval;
+		} _rt;
+
+		/* SIGCHLD */
+		struct {
+			__kernel_pid_t _pid;	/* which child */
+			__ARCH_SI_UID_T _uid;	/* sender's uid */
+			int _status;		/* exit code */
+			__ARCH_SI_CLOCK_T _utime;
+			__ARCH_SI_CLOCK_T _stime;
+		} _sigchld;
+
+		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
+		struct {
+			void *_addr; /* faulting insn/memory ref. */
+#ifdef __ARCH_SI_TRAPNO
+			int _trapno;	/* TRAP # which caused the signal */
+#endif
+			short _addr_lsb; /* LSB of the reported address */
+#ifndef __GENKSYMS__
+			struct {
+				void *_lower;
+				void *_upper;
+			} _addr_bnd;
+#endif
+		} _sigfault;
+
+		/* SIGPOLL */
+		struct {
+			__ARCH_SI_BAND_T _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
+			int _fd;
+		} _sigpoll;
+
+		/* SIGSYS */
+		struct {
+			void *_call_addr; /* calling user insn */
+			int _syscall;	/* triggering system call number */
+			unsigned int _arch;	/* AUDIT_ARCH_* of syscall */
+		} _sigsys;
+	} _sifields;
+} __ARCH_SI_ATTRIBUTES siginfo_t;
+
+/*
+ * si_code values
+ * Again these have been chosen to be IRIX compatible.
+ */
+#undef SI_ASYNCIO
+#undef SI_TIMER
+#undef SI_MESGQ
+#define SI_ASYNCIO	-2	/* sent by AIO completion */
+
+#endif /* _UAPI_ASM_SIGINFO_H */
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
new file mode 100755
index 000000000..a7dcea55a
--- /dev/null
+++ b/compel/arch/mips/src/lib/infect.c
@@ -0,0 +1,310 @@
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/auxv.h>
+#include <sys/mman.h>
+#include <compel/asm/fpu.h>
+#include <compel/cpu.h>
+#include "errno.h"
+#include <compel/plugins/std/syscall-codes.h>
+#include <compel/plugins/std/syscall.h>
+#include "common/err.h"
+#include "common/page.h"
+#include "asm/infect-types.h"
+#include "ptrace.h"
+#include "infect.h"
+#include "infect-priv.h"
+#include "log.h"
+#include "common/bug.h"
+/*
+ * Injected syscall instruction
+ * mips64el is Little Endian
+ */
+const char code_syscall[] = {
+    0x0c, 0x00, 0x00, 0x00,   /* syscall    */
+    0x0d, 0x00, 0x00, 0x00   /*  break      */
+};
+
+/* 10-byte legacy floating point register */
+struct fpreg {
+	uint16_t			significand[4];
+	uint16_t			exponent;
+};
+
+/* 16-byte floating point register */
+struct fpxreg {
+	uint16_t			significand[4];
+	uint16_t			exponent;
+	uint16_t			padding[3];
+};
+
+
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
+			      user_regs_struct_t *regs,
+			      user_fpregs_struct_t *fpregs)
+{
+    sigframe->rs_uc.uc_mcontext.sc_regs[0] = regs->regs[0];
+    sigframe->rs_uc.uc_mcontext.sc_regs[1] = regs->regs[1];
+    sigframe->rs_uc.uc_mcontext.sc_regs[2] = regs->regs[2];
+    sigframe->rs_uc.uc_mcontext.sc_regs[3] = regs->regs[3];
+    sigframe->rs_uc.uc_mcontext.sc_regs[4] = regs->regs[4];
+    sigframe->rs_uc.uc_mcontext.sc_regs[5] = regs->regs[5];
+    sigframe->rs_uc.uc_mcontext.sc_regs[6] = regs->regs[6];
+    sigframe->rs_uc.uc_mcontext.sc_regs[7] = regs->regs[7];
+    sigframe->rs_uc.uc_mcontext.sc_regs[8] = regs->regs[8];
+    sigframe->rs_uc.uc_mcontext.sc_regs[9] = regs->regs[9];
+    sigframe->rs_uc.uc_mcontext.sc_regs[10] = regs->regs[10];
+    sigframe->rs_uc.uc_mcontext.sc_regs[11] = regs->regs[11];
+    sigframe->rs_uc.uc_mcontext.sc_regs[12] = regs->regs[12];
+    sigframe->rs_uc.uc_mcontext.sc_regs[13] = regs->regs[13];
+    sigframe->rs_uc.uc_mcontext.sc_regs[14] = regs->regs[14];
+    sigframe->rs_uc.uc_mcontext.sc_regs[15] = regs->regs[15];
+    sigframe->rs_uc.uc_mcontext.sc_regs[16] = regs->regs[16];
+    sigframe->rs_uc.uc_mcontext.sc_regs[17] = regs->regs[17];
+    sigframe->rs_uc.uc_mcontext.sc_regs[18] = regs->regs[18];
+    sigframe->rs_uc.uc_mcontext.sc_regs[19] = regs->regs[19];
+    sigframe->rs_uc.uc_mcontext.sc_regs[20] = regs->regs[20];
+    sigframe->rs_uc.uc_mcontext.sc_regs[21] = regs->regs[21];
+    sigframe->rs_uc.uc_mcontext.sc_regs[22] = regs->regs[22];
+    sigframe->rs_uc.uc_mcontext.sc_regs[23] = regs->regs[23];
+    sigframe->rs_uc.uc_mcontext.sc_regs[24] = regs->regs[24];
+    sigframe->rs_uc.uc_mcontext.sc_regs[25] = regs->regs[25];
+    sigframe->rs_uc.uc_mcontext.sc_regs[26] = regs->regs[26];
+    sigframe->rs_uc.uc_mcontext.sc_regs[27] = regs->regs[27];
+    sigframe->rs_uc.uc_mcontext.sc_regs[28] = regs->regs[28];
+    sigframe->rs_uc.uc_mcontext.sc_regs[29] = regs->regs[29];
+    sigframe->rs_uc.uc_mcontext.sc_regs[30] = regs->regs[30];
+    sigframe->rs_uc.uc_mcontext.sc_regs[31] = regs->regs[31];
+    sigframe->rs_uc.uc_mcontext.sc_mdlo = regs->lo;
+    sigframe->rs_uc.uc_mcontext.sc_mdhi = regs->hi;
+    sigframe->rs_uc.uc_mcontext.sc_pc = regs->cp0_epc;
+
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[0] = fpregs->regs[0];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[1] = fpregs->regs[1];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[2] = fpregs->regs[2];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[3] = fpregs->regs[3];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[4] = fpregs->regs[4];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[5] = fpregs->regs[5];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[6] = fpregs->regs[6];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[7] = fpregs->regs[7];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[8] = fpregs->regs[8];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[9] = fpregs->regs[9];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[10] = fpregs->regs[10];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[11] = fpregs->regs[11];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[12] = fpregs->regs[12];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[13] = fpregs->regs[13];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[14] = fpregs->regs[14];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[15] = fpregs->regs[15];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[16] = fpregs->regs[16];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[17] = fpregs->regs[17];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[18] = fpregs->regs[18];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[19] = fpregs->regs[19];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[20] = fpregs->regs[20];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[21] = fpregs->regs[21];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[22] = fpregs->regs[22];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[23] = fpregs->regs[23];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[24] = fpregs->regs[24];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[25] = fpregs->regs[25];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[26] = fpregs->regs[26];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[27] = fpregs->regs[27];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[28] = fpregs->regs[28];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[29] = fpregs->regs[29];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[30] = fpregs->regs[30];
+    sigframe->rs_uc.uc_mcontext.sc_fpregs[31] = fpregs->regs[31];
+
+    return 0;
+}
+
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
+				   struct rt_sigframe *rsigframe)
+{
+    return 0;
+}
+
+int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+		  void *arg, __maybe_unused unsigned long flags)
+{
+	user_fpregs_struct_t xsave = {  }, *xs = NULL;
+	int ret = -1;
+
+	if (ptrace(PTRACE_GETFPREGS, pid, NULL, &xsave)) {
+	    pr_perror("Can't obtain FPU registers for %d", pid);
+	    return ret;
+	}
+
+	/*Restart the system call*/
+	if (regs->regs[0]){
+	    switch ((long)(int)regs->regs[2]) {
+		case ERESTARTNOHAND:
+		case ERESTARTSYS:
+		case ERESTARTNOINTR:
+		    regs->regs[2] =  regs->regs[0];
+		    regs->regs[7] = regs->regs[26];
+		    regs->cp0_epc -= 4;
+		    break;
+		case ERESTART_RESTARTBLOCK:
+		    regs->regs[2] = __NR_restart_syscall;
+		    regs->regs[7] = regs->regs[26];
+		    regs->cp0_epc -= 4;
+		    break;
+	    }
+	    regs->regs[0] = 0;
+	}
+
+	xs = &xsave;
+	ret = save(arg, regs, xs);
+	return ret;
+}
+
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
+		unsigned long arg1,
+		unsigned long arg2,
+		unsigned long arg3,
+		unsigned long arg4,
+		unsigned long arg5,
+		unsigned long arg6)
+{
+        /*refer to glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/syscall.S*/
+	user_regs_struct_t regs = ctl->orig.regs;
+	int err;
+
+	regs.regs[2] = (unsigned long)nr; //syscall_number will be in v0
+	regs.regs[4] = arg1;
+	regs.regs[5] = arg2;
+	regs.regs[6] = arg3;
+	regs.regs[7] = arg4;
+	regs.regs[8] = arg5;
+	regs.regs[9] = arg6;
+
+	err = compel_execute_syscall(ctl, &regs, code_syscall);
+	*ret = regs.regs[2];
+
+	 return err;
+}
+
+void *remote_mmap(struct parasite_ctl *ctl,
+		  void *addr, size_t length, int prot,
+		  int flags, int fd, off_t offset)
+{
+	long map;
+	int err;
+
+	err = compel_syscall(ctl, __NR_mmap, &map,
+			(unsigned long)addr, length, prot, flags, fd, offset >> PAGE_SHIFT);
+
+	if (err < 0 || IS_ERR_VALUE(map)) {
+		pr_err("remote mmap() failed: %s\n", strerror(-map));
+		return NULL;
+	}
+
+	return (void *)map;
+}
+
+/*
+ * regs must be inited when calling this function from original context
+ */
+void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
+{  
+    regs->cp0_epc = new_ip;
+    if (stack){
+	  /* regs[29] is sp */
+	regs->regs[29] = (unsigned long)stack;
+    }
+}
+
+bool arch_can_dump_task(struct parasite_ctl *ctl)
+{
+    return true;
+}
+
+int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
+{
+    long ret;
+    int err;
+
+    err = compel_syscall(ctl, __NR_sigaltstack,
+			 &ret, 0, (unsigned long)&s->rs_uc.uc_stack,
+			 0, 0, 0, 0);
+    return err ? err : ret;
+}
+
+
+int ptrace_set_breakpoint(pid_t pid, void *addr)
+{
+    return 0;
+}
+
+int ptrace_flush_breakpoints(pid_t pid)
+{
+    return 0;
+}
+
+/*refer to kernel linux-3.10/arch/mips/include/asm/processor.h*/
+#define TASK_SIZE32 0x7fff8000UL
+#define TASK_SIZE64 0x10000000000UL
+#define TASK_SIZE TASK_SIZE64
+
+unsigned long compel_task_size(void) { return TASK_SIZE; }
+
+/*
+ * Get task registers (overwrites weak function)
+ *
+ */
+int ptrace_get_regs(int pid, user_regs_struct_t *regs)
+{
+    return ptrace(PTRACE_GETREGS, pid, NULL, regs);
+}
+
+/*
+ * Set task registers (overwrites weak function)
+ */
+int ptrace_set_regs(int pid, user_regs_struct_t *regs)
+{
+    return ptrace(PTRACE_SETREGS, pid, NULL, regs);
+}
+
+void compel_relocs_apply_mips(void *mem, void *vbase, compel_reloc_t *elf_relocs, size_t nr_relocs)
+{
+    size_t i, j;
+
+      /*
+       * mips rebasing :load time relocation
+       * parasite.built-in.o and restorer.built-in.o is ELF 64-bit LSB relocatable for mips.
+       * so we have to relocate some type for R_MIPS_26 R_MIPS_HIGHEST R_MIPS_HIGHER R_MIPS_HI16 and R_MIPS_LO16 in there.
+       * for mips64el .if toload/store data or jump instruct ,need to relocation R_TYPE 
+       */
+    for (i = 0, j = 0; i < nr_relocs; i++) {
+	if (elf_relocs[i].type & COMPEL_TYPE_MIPS_26) {
+	    int *where = (mem + elf_relocs[i].offset);
+	    *where = *where | ((elf_relocs[i].addend + ((unsigned long)vbase & 0x00fffffff) /*low 28 bit*/)>>2);
+
+	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_64) {
+	    unsigned long *where = (mem + elf_relocs[i].offset);
+	    *where = elf_relocs[i].addend + (unsigned long)vbase;
+
+	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HI16) {
+	      /* refer to binutils mips.cc */
+	    int *where = (mem + elf_relocs[i].offset);
+	    int v_lo16 = (unsigned long)vbase &0x00ffff;
+
+	    if ((v_lo16+elf_relocs[i].value+elf_relocs[i].addend) >= 0x8000){
+		*where = *where | ((((unsigned long)vbase>>16) &0xffff)+0x1);
+	    } else {
+		*where = *where | ((((unsigned long)vbase>>16) &0xffff));
+	    }
+
+	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_LO16) {
+	    int *where = (mem + elf_relocs[i].offset);
+	    int v_lo16 = (unsigned long)vbase &0x00ffff;
+	    *where = *where | ((v_lo16 + elf_relocs[i].addend) & 0xffff);
+
+	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHER) {
+	    int *where = (mem + elf_relocs[i].offset);
+	    *where = *where | ((( (unsigned long)vbase + (uint64_t) 0x80008000) >> 32) & 0xffff);
+
+	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHEST) {
+	    int *where = (mem + elf_relocs[i].offset);
+	    *where = *where | ((( (unsigned long)vbase + (uint64_t) 0x800080008000llu) >> 48) & 0xffff);
+	} else
+	    BUG();
+    }
+}
diff --git a/include/common/arch/mips/asm/atomic.h b/include/common/arch/mips/asm/atomic.h
new file mode 100755
index 000000000..600e3a70f
--- /dev/null
+++ b/include/common/arch/mips/asm/atomic.h
@@ -0,0 +1,148 @@
+#ifndef __CR_ATOMIC_H__
+#define __CR_ATOMIC_H__
+
+#include <linux/types.h>
+#include "common/compiler.h"
+#include "common/arch/mips/asm/utils.h"
+#include "common/arch/mips/asm/cmpxchg.h"
+
+/*
+ * atomic_read - read atomic variable
+ * @v: pointer of type atomic_t
+ *
+ * Atomically reads the value of @v.
+ */
+#define atomic_read(v)		(*(volatile int *)&(v)->counter)
+
+/*
+ * atomic_set - set atomic variable
+ * @v: pointer of type atomic_t
+ * @i: required value
+ *
+ * Atomically sets the value of @v to @i.
+ */
+#define atomic_set(v, i)		((v)->counter = (i))
+/*
+ * atomic_add - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type atomic_t
+ *
+ * Atomically adds @i to @v.
+ */
+
+static __inline__ void atomic_add(int i, atomic_t * v)
+{
+    int temp;
+
+    do {
+	__asm__ __volatile__(
+			     "	.set	mips3				\n"
+			     "	ll	%0, %1		# atomic_add	\n"
+			     "	addu	%0, %2				\n"
+			     "	sc	%0, %1				\n"
+			     "	.set	mips0				\n"
+			     : "=&r" (temp), "+m" (v->counter)
+			     : "Ir" (i));
+    } while (unlikely(!temp));
+}
+
+/*
+ * atomic_sub - subtract the atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type atomic_t
+ *
+ * Atomically subtracts @i from @v.
+ */
+static __inline__ void atomic_sub(int i, atomic_t * v)
+{
+    int temp;
+
+    do {
+	__asm__ __volatile__(
+			     "	.set	mips3				\n"
+			     "	ll	%0, %1		# atomic_sub	\n"
+			     "	subu	%0, %2				\n"
+			     "	sc	%0, %1				\n"
+			     "	.set	mips0				\n"
+			     : "=&r" (temp), "+m" (v->counter)
+			     : "Ir" (i));
+    } while (unlikely(!temp));
+}
+
+/*
+ * Same as above, but return the result value
+ */
+static __inline__ int atomic_add_return(int i, atomic_t * v)
+{
+	int result;
+
+	smp_mb__before_llsc();
+
+
+	int temp;
+
+	do {
+	    __asm__ __volatile__(
+				 "	.set	mips3				\n"
+				 "	ll	%1, %2	# atomic_add_return	\n"
+				 "	addu	%0, %1, %3			\n"
+				 "	sc	%0, %2				\n"
+				 "	.set	mips0				\n"
+				 : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+				 : "Ir" (i));
+	} while (unlikely(!result));
+
+	result = temp + i;
+
+	smp_llsc_mb();
+
+	return result;
+}
+
+static __inline__ int atomic_sub_return(int i, atomic_t * v)
+{
+	int result;
+
+	smp_mb__before_llsc();
+
+	int temp;
+
+	do {
+	    __asm__ __volatile__(
+				 "	.set	mips3				\n"
+				 "	ll	%1, %2	# atomic_sub_return	\n"
+				 "	subu	%0, %1, %3			\n"
+				 "	sc	%0, %2				\n"
+				 "	.set	mips0				\n"
+				 : "=&r" (result), "=&r" (temp), "+m" (v->counter)
+				 : "Ir" (i));
+	} while (unlikely(!result));
+
+	result = temp - i;
+
+	smp_llsc_mb();
+
+	return result;
+}
+
+#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
+#define atomic_dec_return(v) atomic_sub_return(1, (v))
+#define atomic_inc_return(v) atomic_add_return(1, (v))
+
+/*
+ * atomic_inc - increment atomic variable
+ * @v: pointer of type atomic_t
+ *
+ * Atomically increments @v by 1.
+ */
+#define atomic_inc( v) atomic_add(1, (v))
+
+/*
+ * atomic_dec - decrement and test
+ * @v: pointer of type atomic_t
+ *
+ * Atomically decrements @v by 1.
+ */
+#define atomic_dec(v) atomic_sub(1, (v))
+
+#endif /* __CR_ATOMIC_H__ */
diff --git a/include/common/arch/mips/asm/bitops.h b/include/common/arch/mips/asm/bitops.h
new file mode 100644
index 000000000..874845e45
--- /dev/null
+++ b/include/common/arch/mips/asm/bitops.h
@@ -0,0 +1,41 @@
+#ifndef _LINUX_BITOPS_H
+#define _LINUX_BITOPS_H
+#include <asm/types.h>
+#include "common/compiler.h"
+#include "common/asm-generic/bitops.h"
+
+/**
+ * test_and_set_bit - Set a bit and return its old value
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It also implies a memory barrier.
+ */
+
+static inline int test_and_set_bit(unsigned long nr,
+	volatile unsigned long *addr)
+{
+	unsigned long *m = ((unsigned long *) addr) + (nr >> 6);
+	unsigned long temp = 0;
+	unsigned long res;
+	int bit = nr & 63UL;
+
+	do {
+	    __asm__ __volatile__(
+				 "	.set	mips3				\n"
+				 "	lld     %0, %1	# test_and_set_bit	\n"
+				 "	or	%2, %0, %3			\n"
+				 "	scd	%2, %1				\n"
+				 "	.set	mips0				\n"
+				 : "=&r" (temp), "+m" (*m), "=&r" (res)
+				 : "r" (1UL << bit)
+				 : "memory");
+	} while (unlikely(!res));
+
+	res = temp & (1UL << bit);
+
+	return res != 0;
+}
+
+#endif
diff --git a/include/common/arch/mips/asm/bitsperlong.h b/include/common/arch/mips/asm/bitsperlong.h
new file mode 100755
index 000000000..31aece3b6
--- /dev/null
+++ b/include/common/arch/mips/asm/bitsperlong.h
@@ -0,0 +1,6 @@
+#ifndef __CR_BITSPERLONG_H__
+#define __CR_BITSPERLONG_H__
+
+# define BITS_PER_LONG 64
+
+#endif /* __CR_BITSPERLONG_H__ */
diff --git a/include/common/arch/mips/asm/cmpxchg.h b/include/common/arch/mips/asm/cmpxchg.h
new file mode 100755
index 000000000..bdc41390b
--- /dev/null
+++ b/include/common/arch/mips/asm/cmpxchg.h
@@ -0,0 +1,67 @@
+#ifndef __CR_CMPXCHG_H__
+#define __CR_CMPXCHG_H__
+
+#define __cmpxchg_asm(ld, st, m, old, new)				\
+({									\
+	__typeof(*(m)) __ret;						\
+									\
+	if (kernel_uses_llsc) {						\
+		__asm__ __volatile__(					\
+		"	.set	push				\n"	\
+		"	.set	noat				\n"	\
+		"	.set	mips3				\n"	\
+		"1:	" ld "	%0, %2		# __cmpxchg_asm \n"	\
+		"	bne	%0, %z3, 2f			\n"	\
+		"	.set	mips0				\n"	\
+		"	move	$1, %z4				\n"	\
+		"	.set	mips3				\n"	\
+		"	" st "	$1, %1				\n"	\
+		"	beqz	$1, 1b				\n"	\
+		"	.set	pop				\n"	\
+		"2:						\n"	\
+		: "=&r" (__ret), "=R" (*m)				\
+		: "R" (*m), "Jr" (old), "Jr" (new)			\
+		: "memory");						\
+	} else {                                                        \
+	}								\
+									\
+	__ret;								\
+})
+/*
+ * This function doesn't exist, so you'll get a linker error
+ * if something tries to do an invalid cmpxchg().
+ */
+extern void __cmpxchg_called_with_bad_pointer(void);
+
+#define __cmpxchg(ptr, old, new, pre_barrier, post_barrier)		\
+({									\
+	__typeof__(ptr) __ptr = (ptr);					\
+	__typeof__(*(ptr)) __old = (old);				\
+	__typeof__(*(ptr)) __new = (new);				\
+	__typeof__(*(ptr)) __res = 0;					\
+									\
+	pre_barrier;							\
+									\
+	switch (sizeof(*(__ptr))) {					\
+	case 4:								\
+		__res = __cmpxchg_asm("ll", "sc", __ptr, __old, __new); \
+		break;							\
+	case 8:								\
+		if (sizeof(long) == 8) {				\
+			__res = __cmpxchg_asm("lld", "scd", __ptr,	\
+					   __old, __new);		\
+			break;						\
+		}							\
+	default:							\
+		__cmpxchg_called_with_bad_pointer();			\
+		break;							\
+	}								\
+									\
+	post_barrier;							\
+									\
+	__res;								\
+})
+
+#define cmpxchg(ptr, old, new)		__cmpxchg(ptr, old, new, smp_mb__before_llsc(), smp_llsc_mb())
+
+#endif /* __CR_CMPXCHG_H__ */
diff --git a/include/common/arch/mips/asm/fls64.h b/include/common/arch/mips/asm/fls64.h
new file mode 100644
index 000000000..fdae28513
--- /dev/null
+++ b/include/common/arch/mips/asm/fls64.h
@@ -0,0 +1,38 @@
+#ifndef _ASM_GENERIC_BITOPS_FLS64_H_
+#define _ASM_GENERIC_BITOPS_FLS64_H_
+
+#include <asm/types.h>
+
+/**
+ * fls64 - find last set bit in a 64-bit word
+ * @x: the word to search
+ *
+ * This is defined in a similar way as the libc and compiler builtin
+ * ffsll, but returns the position of the most significant set bit.
+ *
+ * fls64(value) returns 0 if value is 0 or the position of the last
+ * set bit if value is nonzero. The last (most significant) bit is
+ * at position 64.
+ */
+#include "common/arch/mips/asm/bitops.h"
+#if BITS_PER_LONG == 32
+static __always_inline int fls64(__u64 x)
+{
+	__u32 h = x >> 32;
+	if (h)
+		return fls(h) + 32;
+	return fls(x);
+}
+#elif BITS_PER_LONG == 64
+extern unsigned long __fls(unsigned long word);
+static __always_inline int fls64(__u64 x)
+{
+	if (x == 0)
+		return 0;
+	return __fls(x) + 1;
+}
+#else
+#error BITS_PER_LONG not 32 or 64
+#endif
+
+#endif /* _ASM_GENERIC_BITOPS_FLS64_H_ */
diff --git a/include/common/arch/mips/asm/linkage.h b/include/common/arch/mips/asm/linkage.h
new file mode 100644
index 000000000..8f2426889
--- /dev/null
+++ b/include/common/arch/mips/asm/linkage.h
@@ -0,0 +1,58 @@
+#ifndef __CR_LINKAGE_H__
+#define __CR_LINKAGE_H__
+
+#define zero    $0      /* wired zero */
+#define AT      $1      /* assembler temp  - uppercase because of ".set at" */
+#define v0 	$2
+#define v1 	$3
+
+#define a0 	$4   
+#define a1      $5
+#define a2      $6
+#define a3      $7
+#define a4      $8
+#define a5      $9
+#define a6      $10
+#define a7      $11
+#define t0      $12
+#define t1      $13
+#define t2      $14
+#define t3      $15
+	
+#define s0      $16     /* callee saved */
+#define s1      $17
+#define s2      $18
+#define s3      $19
+#define s4      $20
+#define s5      $21
+#define s6      $22
+#define s7      $23
+#define t8      $24     /* caller saved */
+#define t9      $25
+#define jp      $25     /* PIC jump register */
+#define k0      $26     /* kernel scratch */
+#define k1      $27
+#define gp      $28     /* global pointer */
+#define sp      $29     /* stack pointer */
+#define fp      $30     /* frame pointer */
+#define s8	$30	/* same like fp! */
+#define ra      $31     /* return address */
+
+#define __ALIGN		.align 8
+#define __ALIGN_STR	".align 8"
+
+#define GLOBAL(name)		\
+	.globl name;		\
+	name:
+
+#define ENTRY(name)		\
+	.globl name;		\
+	__ALIGN;		\
+	.type name, @function;	\
+	name:
+
+#define END(sym)		\
+	.size sym, . - sym
+
+
+#endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/mips/asm/page.h b/include/common/arch/mips/asm/page.h
new file mode 100755
index 000000000..bf27420f7
--- /dev/null
+++ b/include/common/arch/mips/asm/page.h
@@ -0,0 +1,39 @@
+#ifndef __CR_ASM_PAGE_H__
+#define __CR_ASM_PAGE_H__
+
+#define ARCH_HAS_LONG_PAGES
+
+#ifndef CR_NOGLIBC
+#include <string.h> /* ffsl() */
+#include <unistd.h> /* _SC_PAGESIZE */
+
+static unsigned __page_size;
+static unsigned __page_shift;
+
+static inline unsigned page_size(void)
+{
+	if (!__page_size)
+	    __page_size = sysconf(_SC_PAGESIZE);
+	return __page_size;
+}
+
+static inline unsigned page_shift(void)
+{
+	if (!__page_shift)
+		__page_shift = (ffsl(page_size()) - 1);
+	return __page_shift;
+}
+
+#define PAGE_SIZE	page_size()
+#define PAGE_SHIFT	page_shift()
+#define PAGE_MASK	(~(PAGE_SIZE - 1))
+
+#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
+#else /* CR_NOGLIBC */
+
+extern unsigned page_size(void);
+#define PAGE_SIZE page_size()
+
+#endif /* CR_NOGLIBC */
+
+#endif /* __CR_ASM_PAGE_H__ */
diff --git a/include/common/arch/mips/asm/utils.h b/include/common/arch/mips/asm/utils.h
new file mode 100644
index 000000000..6415bf485
--- /dev/null
+++ b/include/common/arch/mips/asm/utils.h
@@ -0,0 +1,24 @@
+#ifndef __UTILS_H__
+#define __UTILS_H__
+
+
+# define kernel_uses_llsc	1
+
+typedef struct {
+	int counter;
+}atomic_t;
+
+
+/*
+ * FIXME: detect with compel_cpu_has_feature() if LL/SC implicitly
+ * provide a memory barrier.
+*/
+#define __WEAK_LLSC_MB		"	sync	\n"
+
+#define smp_llsc_mb()	__asm__ __volatile__(__WEAK_LLSC_MB : : :"memory")
+
+#define smp_mb__before_llsc() smp_llsc_mb()
+#define smp_mb__before_atomic()	smp_mb__before_llsc()
+#define smp_mb__after_atomic()	smp_llsc_mb()
+
+#endif /* __UTILS_H__ */

From e7d13b368db95c57d0a20ea016d6b0517e19d3b8 Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 8 Apr 2020 10:21:11 +0800
Subject: [PATCH 0235/1854] mips:compel: Enable mips in compel/

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 compel/include/uapi/handle-elf.h |  9 ++++-
 compel/include/uapi/infect.h     |  1 +
 compel/plugins/Makefile          | 14 +++++++
 compel/src/lib/handle-elf.c      | 65 +++++++++++++++++++++++++++++++-
 compel/src/lib/infect.c          |  5 ++-
 compel/src/main.c                |  3 ++
 6 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/compel/include/uapi/handle-elf.h b/compel/include/uapi/handle-elf.h
index ddeecb0d5..ba40be57f 100644
--- a/compel/include/uapi/handle-elf.h
+++ b/compel/include/uapi/handle-elf.h
@@ -4,7 +4,14 @@
 #define COMPEL_TYPE_INT		(1u << 0)
 #define COMPEL_TYPE_LONG	(1u << 1)
 #define COMPEL_TYPE_GOTPCREL	(1u << 2)
-
+#ifdef CONFIG_MIPS
+#define COMPEL_TYPE_MIPS_26	  (1u << 3)
+#define COMPEL_TYPE_MIPS_HI16	  (1u << 4)
+#define COMPEL_TYPE_MIPS_LO16	  (1u << 5)
+#define COMPEL_TYPE_MIPS_HIGHER	  (1u << 6)
+#define COMPEL_TYPE_MIPS_HIGHEST  (1u << 7)
+#define COMPEL_TYPE_MIPS_64	  (1u << 8)
+#endif
 typedef struct {
 	unsigned int	offset;
 	unsigned int	type;
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index dd672bc1c..4f14c7270 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -165,6 +165,7 @@ extern struct parasite_blob_desc *compel_parasite_blob_desc(struct parasite_ctl
 extern int __must_check compel_get_thread_regs(struct parasite_thread_ctl *, save_regs_t, void *);
 
 extern void compel_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs);
+extern void compel_relocs_apply_mips(void *mem, void *vbase, compel_reloc_t *elf_relocs, size_t nr_relocs);
 
 extern unsigned long compel_task_size(void);
 
diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index 197ff1b24..e5fa781ac 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -16,7 +16,12 @@ asflags-y		+= -I compel/include/uapi
 
 # General compel includes
 ccflags-y		+= -iquote compel/include
+
+ifeq ($(ARCH),mips)
+ccflags-y		+= -mno-abicalls -fno-pic -fno-stack-protector
+else
 ccflags-y		+= -fpie -fno-stack-protector
+endif
 
 # General compel/plugins includes
 ccflags-y		+= -iquote $(obj)/include
@@ -28,7 +33,12 @@ asflags-y		+= -iquote $(PLUGIN_ARCH_DIR)/include
 asflags-y		+= -iquote $(PLUGIN_ARCH_DIR)
 
 # General flags for assembly
+ifeq ($(ARCH),mips)
+asflags-y		+= -mno-abicalls -fno-pic -Wstrict-prototypes
+else
 asflags-y		+= -fpie -Wstrict-prototypes
+endif
+
 asflags-y		+= -nostdlib -fomit-frame-pointer
 asflags-y		+= -fno-stack-protector
 ldflags-y		+= -z noexecstack
@@ -57,6 +67,10 @@ ifeq ($(ARCH),x86)
 	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
 endif
 
+ifeq ($(ARCH),mips)
+	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
+endif
+
 ifeq ($(ARCH),ppc64)
 	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
 	std-lib-y	+= ./$(PLUGIN_ARCH_DIR)/std/memcmp.o
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 69d5104b6..e97d75026 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -16,8 +16,9 @@
 #include "piegen.h"
 #include "log.h"
 
-piegen_opt_t opts = {};
-
+#ifdef CONFIG_MIPS
+#include "ldsodefs.h"
+#endif
 /* Check if pointer is out-of-bound */
 static bool __ptr_oob(const uintptr_t ptr, const uintptr_t start, const size_t size)
 {
@@ -403,6 +404,66 @@ int __handle_elf(void *mem, size_t size)
 #endif
 
 			switch (ELF_R_TYPE(r->rel.r_info)) {
+#ifdef CONFIG_MIPS
+			case R_MIPS_PC16:
+			      /* s+a-p relative */
+			    *((int32_t *)where) = *((int32_t *)where) | ((value32 + addend32 - place)>>2);
+			    break;
+
+			case R_MIPS_26:
+			      /*  local    : (((A << 2) | (P & 0xf0000000) + S) >> 2
+			       *  external : (sign–extend(A < 2) + S) >> 2
+                              */
+
+			    if (((unsigned)ELF_ST_BIND(sym->st_info) == 0x1)
+				 || ((unsigned)ELF_ST_BIND(sym->st_info) == 0x2)){
+				  /* bind type local is 0x0 ,global is 0x1,WEAK is 0x2 */
+				addend32 = value32;
+			    }
+			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_26,  "
+			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_26 */\n",
+			    	       (unsigned int)place, addend32, value32);
+			    break;
+
+			case R_MIPS_32:
+			    /* S+A */
+			    break;
+
+			case R_MIPS_64:
+				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_64, "
+				       ".addend = %-8ld, .value = 0x%-16lx, }, /* R_MIPS_64 */\n",
+				       (unsigned int)place, (long)addend64, (long)value64);
+				break;
+
+			case R_MIPS_HIGHEST:
+			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HIGHEST,  "
+			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HIGHEST */\n",
+			    	       (unsigned int)place, addend32, value32);
+			    break;
+
+			case R_MIPS_HIGHER:
+			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HIGHER,  "
+			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HIGHER */\n",
+			    	       (unsigned int)place, addend32, value32);
+			    break;
+
+			case R_MIPS_HI16:
+			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HI16,  "
+			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HI16 */\n",
+			    	       (unsigned int)place, addend32, value32);
+			    break;
+
+			case R_MIPS_LO16:
+			    if((unsigned)ELF_ST_BIND(sym->st_info) == 0x1){
+				  /* bind type local is 0x0 ,global is 0x1 */
+				addend32 = value32;
+			    }
+			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_LO16,  "
+			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_LO16 */\n",
+			    	       (unsigned int)place, addend32, value32);
+			    break;
+
+#endif
 #ifdef ELF_PPC64
 			case R_PPC64_REL24:
 				/* Update PC relative offset, linker has not done this yet */
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 3fad85ed3..296ffcbd0 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -817,7 +817,9 @@ err_cure:
 void compel_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs)
 {
 	size_t i, j;
-
+#ifdef CONFIG_MIPS
+	compel_relocs_apply_mips(mem, vbase, elf_relocs, nr_relocs);
+#else
 	for (i = 0, j = 0; i < nr_relocs; i++) {
 		if (elf_relocs[i].type & COMPEL_TYPE_LONG) {
 			long *where = mem + elf_relocs[i].offset;
@@ -840,6 +842,7 @@ void compel_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *el
 		} else
 			BUG();
 	}
+#endif
 }
 
 static int compel_map_exchange(struct parasite_ctl *ctl, unsigned long size)
diff --git a/compel/src/main.c b/compel/src/main.c
index 9fc3a924c..c5f6e57ed 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -53,11 +53,14 @@ static const flags_t flags = {
 #elif defined CONFIG_S390
 	.arch		= "s390",
 	.cflags		= COMPEL_CFLAGS_PIE,
+#elif defined CONFIG_MIPS
+	.arch		= "mips",
 #else
 #error "CONFIG_<ARCH> not defined, or unsupported ARCH"
 #endif
 };
 
+piegen_opt_t opts = {};
 const char *uninst_root;
 
 static int piegen(void)

From 158e8f8fe637117f00bb6ecbad84d6491970d84d Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 8 Apr 2020 10:23:16 +0800
Subject: [PATCH 0236/1854] mips:proto: Add mips to protocol buffer files

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 images/Makefile        |  1 +
 images/core-mips.proto | 90 ++++++++++++++++++++++++++++++++++++++++++
 images/core.proto      |  5 +++
 images/sa.proto        |  1 +
 4 files changed, 97 insertions(+)
 create mode 100755 images/core-mips.proto

diff --git a/images/Makefile b/images/Makefile
index bc67278e6..5458e4679 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,7 @@
 proto-obj-y	+= stats.o
 proto-obj-y	+= core.o
 proto-obj-y	+= core-x86.o
+proto-obj-y	+= core-mips.o
 proto-obj-y	+= core-arm.o
 proto-obj-y	+= core-aarch64.o
 proto-obj-y	+= core-ppc64.o
diff --git a/images/core-mips.proto b/images/core-mips.proto
new file mode 100755
index 000000000..6391b1e86
--- /dev/null
+++ b/images/core-mips.proto
@@ -0,0 +1,90 @@
+syntax = "proto2";
+
+import "opts.proto";
+
+message user_mips_regs_entry {
+	required uint64 r0      = 1;
+	required uint64 r1      = 2;
+	required uint64 r2      = 3;
+	required uint64 r3      = 4;
+	required uint64 r4      = 5;
+	required uint64 r5      = 6;
+	required uint64 r6      = 7;
+	required uint64 r7      = 8;
+	required uint64 r8      = 9;
+	required uint64 r9      = 10;
+	required uint64 r10     = 11;
+	required uint64 r11     = 12;
+	required uint64 r12     = 13;
+	required uint64 r13     = 14;
+	required uint64 r14     = 15;
+	required uint64 r15     = 16;
+	required uint64 r16     = 17;
+	required uint64 r17     = 18;
+	required uint64 r18     = 19;
+	required uint64 r19     = 20;
+	required uint64 r20     = 21;
+	required uint64 r21     = 22;
+	required uint64 r22     = 23;
+	required uint64 r23     = 24;
+	required uint64 r24     = 25;
+	required uint64 r25     = 26;
+	required uint64 r26     = 27;
+	required uint64 r27     = 28;
+	required uint64 r28     = 29;
+	required uint64 r29     = 30;
+	required uint64 r30     = 31;
+	required uint64 r31     = 32;
+	required uint64 lo      = 33;
+	required uint64 hi      = 34;
+	required uint64 cp0_epc      = 35;
+	required uint64 cp0_badvaddr      = 36;
+	required uint64 cp0_status      = 37;
+	required uint64 cp0_cause      = 38;
+}
+
+message user_mips_fpregs_entry {
+	required uint64 r0      = 1;
+	required uint64 r1      = 2;
+	required uint64 r2      = 3;
+	required uint64 r3      = 4;
+	required uint64 r4      = 5;
+	required uint64 r5      = 6;
+	required uint64 r6      = 7;
+	required uint64 r7      = 8;
+	required uint64 r8      = 9;
+	required uint64 r9      = 10;
+	required uint64 r10     = 11;
+	required uint64 r11     = 12;
+	required uint64 r12     = 13;
+	required uint64 r13     = 14;
+	required uint64 r14     = 15;
+	required uint64 r15     = 16;
+	required uint64 r16     = 17;
+	required uint64 r17     = 18;
+	required uint64 r18     = 19;
+	required uint64 r19     = 20;
+	required uint64 r20     = 21;
+	required uint64 r21     = 22;
+	required uint64 r22     = 23;
+	required uint64 r23     = 24;
+	required uint64 r24     = 25;
+	required uint64 r25     = 26;
+	required uint64 r26     = 27;
+	required uint64 r27     = 28;
+	required uint64 r28     = 29;
+	required uint64 r29     = 30;
+	required uint64 r30     = 31;
+	required uint64 r31     = 32;
+	required uint64 lo      = 33;
+	required uint64 hi      = 34;
+	required uint32 fpu_fcr31      = 35;
+	required uint32 fpu_id      = 36;
+}
+
+message thread_info_mips {
+	required uint64			 clear_tid_addr	= 1[(criu).hex = true];
+	required uint64                  tls            = 2;
+	required user_mips_regs_entry	 gpregs		= 3[(criu).hex = true];
+	required user_mips_fpregs_entry	 fpregs		= 4[(criu).hex = true];
+}
diff --git a/images/core.proto b/images/core.proto
index 22c2a9f1f..9e9e39388 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -5,6 +5,7 @@ import "core-arm.proto";
 import "core-aarch64.proto";
 import "core-ppc64.proto";
 import "core-s390.proto";
+import "core-mips.proto";
 
 import "rlimit.proto";
 import "timer.proto";
@@ -55,6 +56,7 @@ message task_core_entry {
 	optional bool			child_subreaper	= 18;
 	// Reserved for container relative start time
 	//optional uint64		start_time	= 19;
+	optional uint64			blk_sigset_extended = 20[(criu).hex = true];
 }
 
 message task_kobj_ids_entry {
@@ -96,6 +98,7 @@ message thread_core_entry {
 	optional uint32			seccomp_filter	= 12;
 
 	optional string			comm		= 13;
+	optional uint64			blk_sigset_extended	= 14;
 }
 
 message task_rlimits_entry {
@@ -110,6 +113,7 @@ message core_entry {
 		AARCH64		= 3;
 		PPC64		= 4;
 		S390		= 5;
+		MIPS		= 6;
 	}
 
 	required march			mtype		= 1;
@@ -118,6 +122,7 @@ message core_entry {
 	optional thread_info_aarch64	ti_aarch64	= 8;
 	optional thread_info_ppc64	ti_ppc64	= 9;
 	optional thread_info_s390	ti_s390		= 10;
+	optional thread_info_mips	ti_mips		= 11;
 
 	optional task_core_entry	tc		= 3;
 	optional task_kobj_ids_entry	ids		= 4;
diff --git a/images/sa.proto b/images/sa.proto
index 3bce0c4ff..07fd4ffd3 100644
--- a/images/sa.proto
+++ b/images/sa.proto
@@ -8,4 +8,5 @@ message sa_entry {
 	required uint64	restorer	= 3 [(criu).hex = true];
 	required uint64	mask		= 4 [(criu).hex = true];
 	optional bool compat_sigaction	= 5;
+	optional uint64	mask_extended	= 6 [(criu).hex = true];
 }

From d325b7b775cd2e51651c00137be0df5bd3d2d74f Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 8 Apr 2020 10:24:45 +0800
Subject: [PATCH 0237/1854] mips:criu/arch/mips: Add mips parts to criu

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 criu/arch/mips/Makefile                       |  14 +
 criu/arch/mips/cpu.c                          |  53 ++++
 criu/arch/mips/crtools.c                      | 252 ++++++++++++++++++
 criu/arch/mips/include/asm/dump.h             |  14 +
 criu/arch/mips/include/asm/int.h              |   6 +
 criu/arch/mips/include/asm/kerndat.h          |   7 +
 criu/arch/mips/include/asm/parasite-syscall.h |   8 +
 criu/arch/mips/include/asm/parasite.h         |   9 +
 criu/arch/mips/include/asm/restore.h          |  29 ++
 criu/arch/mips/include/asm/restorer.h         |  79 ++++++
 criu/arch/mips/include/asm/syscall32.h        |  17 ++
 criu/arch/mips/include/asm/types.h            |  31 +++
 criu/arch/mips/include/asm/vdso.h             |  23 ++
 criu/arch/mips/restorer.c                     |  17 ++
 criu/arch/mips/sigaction_compat.c             |  19 ++
 criu/arch/mips/sigframe.c                     |  13 +
 criu/arch/mips/vdso-pie.c                     |  21 ++
 17 files changed, 612 insertions(+)
 create mode 100755 criu/arch/mips/Makefile
 create mode 100755 criu/arch/mips/cpu.c
 create mode 100755 criu/arch/mips/crtools.c
 create mode 100755 criu/arch/mips/include/asm/dump.h
 create mode 100755 criu/arch/mips/include/asm/int.h
 create mode 100644 criu/arch/mips/include/asm/kerndat.h
 create mode 100755 criu/arch/mips/include/asm/parasite-syscall.h
 create mode 100755 criu/arch/mips/include/asm/parasite.h
 create mode 100755 criu/arch/mips/include/asm/restore.h
 create mode 100755 criu/arch/mips/include/asm/restorer.h
 create mode 100755 criu/arch/mips/include/asm/syscall32.h
 create mode 100755 criu/arch/mips/include/asm/types.h
 create mode 100755 criu/arch/mips/include/asm/vdso.h
 create mode 100755 criu/arch/mips/restorer.c
 create mode 100755 criu/arch/mips/sigaction_compat.c
 create mode 100755 criu/arch/mips/sigframe.c
 create mode 100755 criu/arch/mips/vdso-pie.c

diff --git a/criu/arch/mips/Makefile b/criu/arch/mips/Makefile
new file mode 100755
index 000000000..4bd99eb7e
--- /dev/null
+++ b/criu/arch/mips/Makefile
@@ -0,0 +1,14 @@
+builtin-name		:= crtools.built-in.o
+
+ccflags-y		+= -iquote $(obj)/include
+ccflags-y		+= -iquote criu/include -iquote include
+ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
+
+asflags-y		+= -Wstrict-prototypes
+asflags-y		+= -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
+asflags-y		+= -iquote $(obj)/include
+ldflags-y		+= -r -z noexecstack
+
+obj-y			+= cpu.o
+obj-y			+= crtools.o
+obj-y			+= sigframe.o
diff --git a/criu/arch/mips/cpu.c b/criu/arch/mips/cpu.c
new file mode 100755
index 000000000..484698e4f
--- /dev/null
+++ b/criu/arch/mips/cpu.c
@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include "bitops.h"
+#include "asm/types.h"
+#include "asm/cpu.h"
+#include <compel/asm/fpu.h>
+#include <compel/cpu.h>
+
+#include "common/compiler.h"
+#include "cr_options.h"
+#include "image.h"
+#include "util.h"
+#include "log.h"
+#include "cpu.h"
+#include "protobuf.h"
+#include "images/cpuinfo.pb-c.h"
+
+#undef	LOG_PREFIX
+#define LOG_PREFIX "cpu: "
+
+int cpu_init(void)
+{
+    return 0;
+}
+
+int cpu_dump_cpuinfo(void)
+{
+    return 0;
+}
+
+int cpu_validate_cpuinfo(void)
+{
+    return 0;
+}
+
+int cpuinfo_dump(void)
+{
+    if (cpu_init())
+	return -1;
+    if (cpu_dump_cpuinfo())
+	return -1;
+    return 0;
+}
+
+int cpuinfo_check(void)
+{
+    return 0;
+}
diff --git a/criu/arch/mips/crtools.c b/criu/arch/mips/crtools.c
new file mode 100755
index 000000000..329ae8edb
--- /dev/null
+++ b/criu/arch/mips/crtools.c
@@ -0,0 +1,252 @@
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <elf.h>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <sys/auxv.h>
+#include <sys/wait.h>
+
+#include "types.h"
+#include "log.h"
+#include "asm/parasite-syscall.h"
+#include "asm/restorer.h"
+#include <compel/asm/fpu.h>
+#include "asm/dump.h"
+#include "cr_options.h"
+#include "common/compiler.h"
+#include "restorer.h"
+#include "parasite-syscall.h"
+#include "util.h"
+#include "cpu.h"
+#include <compel/plugins/std/syscall-codes.h>
+#include "kerndat.h"
+
+#include "protobuf.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
+
+
+int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+{
+    CoreEntry *core = x;
+
+      /* Save the MIPS CPU state */
+    core->ti_mips->gpregs->r0 = regs->regs[0];
+    core->ti_mips->gpregs->r1 = regs->regs[1];
+    core->ti_mips->gpregs->r2 = regs->regs[2];
+    core->ti_mips->gpregs->r3 = regs->regs[3];
+    core->ti_mips->gpregs->r4 = regs->regs[4];
+    core->ti_mips->gpregs->r5 = regs->regs[5];
+    core->ti_mips->gpregs->r6 = regs->regs[6];
+    core->ti_mips->gpregs->r7 = regs->regs[7];
+    core->ti_mips->gpregs->r8 = regs->regs[8];
+    core->ti_mips->gpregs->r9 = regs->regs[9];
+    core->ti_mips->gpregs->r10 = regs->regs[10];
+    core->ti_mips->gpregs->r11 = regs->regs[11];
+    core->ti_mips->gpregs->r12 = regs->regs[12];
+    core->ti_mips->gpregs->r13 = regs->regs[13];
+    core->ti_mips->gpregs->r14 = regs->regs[14];
+    core->ti_mips->gpregs->r15 = regs->regs[15];
+    core->ti_mips->gpregs->r16 = regs->regs[16];
+    core->ti_mips->gpregs->r17 = regs->regs[17];
+    core->ti_mips->gpregs->r18 = regs->regs[18];
+    core->ti_mips->gpregs->r19 = regs->regs[19];
+    core->ti_mips->gpregs->r20 = regs->regs[20];
+    core->ti_mips->gpregs->r21 = regs->regs[21];
+    core->ti_mips->gpregs->r22 = regs->regs[22];
+    core->ti_mips->gpregs->r23 = regs->regs[23];
+    core->ti_mips->gpregs->r24 = regs->regs[24];
+    core->ti_mips->gpregs->r25 = regs->regs[25];
+    core->ti_mips->gpregs->r26 = regs->regs[26];
+    core->ti_mips->gpregs->r27 = regs->regs[27];
+    core->ti_mips->gpregs->r28 = regs->regs[28];
+    core->ti_mips->gpregs->r29 = regs->regs[29];
+    core->ti_mips->gpregs->r30 = regs->regs[30];
+    core->ti_mips->gpregs->r31 = regs->regs[31];
+    
+    core->ti_mips->gpregs->lo = regs->lo;
+    core->ti_mips->gpregs->hi = regs->hi;
+    core->ti_mips->gpregs->cp0_epc = regs->cp0_epc;
+    core->ti_mips->gpregs->cp0_badvaddr = regs->cp0_badvaddr;
+    core->ti_mips->gpregs->cp0_status = regs->cp0_status;
+    core->ti_mips->gpregs->cp0_cause = regs->cp0_cause;
+    
+    core->ti_mips->fpregs->r0 = fpregs->regs[0];
+    core->ti_mips->fpregs->r1 = fpregs->regs[1];
+    core->ti_mips->fpregs->r2 = fpregs->regs[2];
+    core->ti_mips->fpregs->r3 = fpregs->regs[3];
+    core->ti_mips->fpregs->r4 = fpregs->regs[4];
+    core->ti_mips->fpregs->r5 = fpregs->regs[5];
+    core->ti_mips->fpregs->r6 = fpregs->regs[6];
+    core->ti_mips->fpregs->r7 = fpregs->regs[7];
+    core->ti_mips->fpregs->r8 = fpregs->regs[8];
+    core->ti_mips->fpregs->r9 = fpregs->regs[9];
+    core->ti_mips->fpregs->r10 = fpregs->regs[10];
+    core->ti_mips->fpregs->r11 = fpregs->regs[11];
+    core->ti_mips->fpregs->r12 = fpregs->regs[12];
+    core->ti_mips->fpregs->r13 = fpregs->regs[13];
+    core->ti_mips->fpregs->r14 = fpregs->regs[14];
+    core->ti_mips->fpregs->r15 = fpregs->regs[15];
+    core->ti_mips->fpregs->r16 = fpregs->regs[16];
+    core->ti_mips->fpregs->r17 = fpregs->regs[17];
+    core->ti_mips->fpregs->r18 = fpregs->regs[18];
+    core->ti_mips->fpregs->r19 = fpregs->regs[19];
+    core->ti_mips->fpregs->r20 = fpregs->regs[20];
+    core->ti_mips->fpregs->r21 = fpregs->regs[21];
+    core->ti_mips->fpregs->r22 = fpregs->regs[22];
+    core->ti_mips->fpregs->r23 = fpregs->regs[23];
+    core->ti_mips->fpregs->r24 = fpregs->regs[24];
+    core->ti_mips->fpregs->r25 = fpregs->regs[25];
+    core->ti_mips->fpregs->r26 = fpregs->regs[26];
+    core->ti_mips->fpregs->r27 = fpregs->regs[27];
+    core->ti_mips->fpregs->r28 = fpregs->regs[28];
+    core->ti_mips->fpregs->r29 = fpregs->regs[29];
+    core->ti_mips->fpregs->r30 = fpregs->regs[30];
+    core->ti_mips->fpregs->r31 = fpregs->regs[31];
+    core->ti_mips->fpregs->fpu_fcr31 = fpregs->fpu_fcr31;
+    core->ti_mips->fpregs->fpu_id = fpregs->fpu_id;
+    
+    return 0;
+}
+
+int arch_alloc_thread_info(CoreEntry *core)
+{
+    ThreadInfoMips *ti_mips;
+    UserMipsRegsEntry *gpregs;
+    UserMipsFpregsEntry *fpregs;
+
+    ti_mips = xmalloc(sizeof(*ti_mips));
+    if (!ti_mips)
+	goto err;
+
+    thread_info_mips__init(ti_mips);
+    core->ti_mips = ti_mips;
+
+    gpregs = xmalloc(sizeof(*gpregs));
+    if (!gpregs){
+	xfree(ti_mips);
+	goto err;
+    }
+
+    user_mips_regs_entry__init(gpregs);
+    ti_mips->gpregs = gpregs;
+
+    fpregs = xmalloc(sizeof(*fpregs));
+    if (!fpregs){
+	xfree(ti_mips);
+	xfree(gpregs);
+	goto err;
+    }
+
+    user_mips_fpregs_entry__init(fpregs);
+    ti_mips->fpregs = fpregs;
+    
+    return 0;
+err:
+    return -1;
+}
+
+void arch_free_thread_info(CoreEntry *core)
+{
+    if (!core->ti_mips)
+	return;
+
+    if (core->ti_mips->gpregs)
+	xfree(core->ti_mips->gpregs);
+    
+    if (core->ti_mips->fpregs)
+	xfree(core->ti_mips->fpregs);
+
+    xfree(core->ti_mips);
+}
+
+int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
+{
+    struct rt_sigframe *f = sigframe;
+    UserMipsFpregsEntry *r = core->ti_mips->fpregs;
+
+    f->rs_uc.uc_mcontext.sc_fpregs[0] = r->r0;
+    f->rs_uc.uc_mcontext.sc_fpregs[1] = r->r1;
+    f->rs_uc.uc_mcontext.sc_fpregs[2] = r->r2;
+    f->rs_uc.uc_mcontext.sc_fpregs[3] = r->r3;
+    f->rs_uc.uc_mcontext.sc_fpregs[4] = r->r4;
+    f->rs_uc.uc_mcontext.sc_fpregs[5] = r->r5;
+    f->rs_uc.uc_mcontext.sc_fpregs[6] = r->r6;
+    f->rs_uc.uc_mcontext.sc_fpregs[7] = r->r7;
+    f->rs_uc.uc_mcontext.sc_fpregs[8] = r->r8;
+    f->rs_uc.uc_mcontext.sc_fpregs[9] = r->r9;
+    f->rs_uc.uc_mcontext.sc_fpregs[10] = r->r10;
+    f->rs_uc.uc_mcontext.sc_fpregs[11] = r->r11;
+    f->rs_uc.uc_mcontext.sc_fpregs[12] = r->r12;
+    f->rs_uc.uc_mcontext.sc_fpregs[13] = r->r13;
+    f->rs_uc.uc_mcontext.sc_fpregs[14] = r->r14;
+    f->rs_uc.uc_mcontext.sc_fpregs[15] = r->r15;
+    f->rs_uc.uc_mcontext.sc_fpregs[16] = r->r16;
+    f->rs_uc.uc_mcontext.sc_fpregs[17] = r->r17;
+    f->rs_uc.uc_mcontext.sc_fpregs[18] = r->r18;
+    f->rs_uc.uc_mcontext.sc_fpregs[19] = r->r19;
+    f->rs_uc.uc_mcontext.sc_fpregs[20] = r->r20;
+    f->rs_uc.uc_mcontext.sc_fpregs[21] = r->r21;
+    f->rs_uc.uc_mcontext.sc_fpregs[22] = r->r22;
+    f->rs_uc.uc_mcontext.sc_fpregs[23] = r->r23;
+    f->rs_uc.uc_mcontext.sc_fpregs[24] = r->r24;
+    f->rs_uc.uc_mcontext.sc_fpregs[25] = r->r25;
+    f->rs_uc.uc_mcontext.sc_fpregs[26] = r->r26;
+    f->rs_uc.uc_mcontext.sc_fpregs[27] = r->r27;
+    f->rs_uc.uc_mcontext.sc_fpregs[28] = r->r28;
+    f->rs_uc.uc_mcontext.sc_fpregs[29] = r->r29;
+    f->rs_uc.uc_mcontext.sc_fpregs[30] = r->r30;
+    f->rs_uc.uc_mcontext.sc_fpregs[31] = r->r31;
+
+    return 0;
+}
+
+
+int restore_gpregs(struct rt_sigframe *f, UserMipsRegsEntry *r)
+{
+    f->rs_uc.uc_mcontext.sc_regs[0] = r->r0;
+    f->rs_uc.uc_mcontext.sc_regs[1] = r->r1;
+    f->rs_uc.uc_mcontext.sc_regs[2] = r->r2;
+    f->rs_uc.uc_mcontext.sc_regs[3] = r->r3;
+    f->rs_uc.uc_mcontext.sc_regs[4] = r->r4;
+    f->rs_uc.uc_mcontext.sc_regs[5] = r->r5;
+    f->rs_uc.uc_mcontext.sc_regs[6] = r->r6;
+    f->rs_uc.uc_mcontext.sc_regs[7] = r->r7;
+    f->rs_uc.uc_mcontext.sc_regs[8] = r->r8;
+    f->rs_uc.uc_mcontext.sc_regs[9] = r->r9;
+    f->rs_uc.uc_mcontext.sc_regs[10] = r->r10;
+    f->rs_uc.uc_mcontext.sc_regs[11] = r->r11;
+    f->rs_uc.uc_mcontext.sc_regs[12] = r->r12;
+    f->rs_uc.uc_mcontext.sc_regs[13] = r->r13;
+    f->rs_uc.uc_mcontext.sc_regs[14] = r->r14;
+    f->rs_uc.uc_mcontext.sc_regs[15] = r->r15;
+    f->rs_uc.uc_mcontext.sc_regs[16] = r->r16;
+    f->rs_uc.uc_mcontext.sc_regs[17] = r->r17;
+    f->rs_uc.uc_mcontext.sc_regs[18] = r->r18;
+    f->rs_uc.uc_mcontext.sc_regs[19] = r->r19;
+    f->rs_uc.uc_mcontext.sc_regs[20] = r->r20;
+    f->rs_uc.uc_mcontext.sc_regs[21] = r->r21;
+    f->rs_uc.uc_mcontext.sc_regs[22] = r->r22;
+    f->rs_uc.uc_mcontext.sc_regs[23] = r->r23;
+    f->rs_uc.uc_mcontext.sc_regs[24] = r->r24;
+    f->rs_uc.uc_mcontext.sc_regs[25] = r->r25;
+    f->rs_uc.uc_mcontext.sc_regs[26] = r->r26;
+    f->rs_uc.uc_mcontext.sc_regs[27] = r->r27;
+    f->rs_uc.uc_mcontext.sc_regs[28] = r->r28;
+    f->rs_uc.uc_mcontext.sc_regs[29] = r->r29;
+    f->rs_uc.uc_mcontext.sc_regs[30] = r->r30;
+    f->rs_uc.uc_mcontext.sc_regs[31] = r->r31;
+
+    f->rs_uc.uc_mcontext.sc_mdlo = r->lo;
+    f->rs_uc.uc_mcontext.sc_mdhi = r->hi;
+    f->rs_uc.uc_mcontext.sc_pc = r->cp0_epc;
+
+    return 0;
+}
+
+int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info)
+{
+    return 0;
+}
diff --git a/criu/arch/mips/include/asm/dump.h b/criu/arch/mips/include/asm/dump.h
new file mode 100755
index 000000000..58015833d
--- /dev/null
+++ b/criu/arch/mips/include/asm/dump.h
@@ -0,0 +1,14 @@
+#ifndef __CR_ASM_DUMP_H__
+#define __CR_ASM_DUMP_H__
+
+extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int arch_alloc_thread_info(CoreEntry *core);
+extern void arch_free_thread_info(CoreEntry *core);
+extern int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info);
+
+static inline void core_put_tls(CoreEntry *core, tls_t tls)
+{
+	core->ti_mips->tls = tls;
+}
+
+#endif
diff --git a/criu/arch/mips/include/asm/int.h b/criu/arch/mips/include/asm/int.h
new file mode 100755
index 000000000..642804e9b
--- /dev/null
+++ b/criu/arch/mips/include/asm/int.h
@@ -0,0 +1,6 @@
+#ifndef __CR_ASM_INT_H__
+#define __CR_ASM_INT_H__
+
+#include "asm-generic/int.h"
+
+#endif /* __CR_ASM_INT_H__ */
diff --git a/criu/arch/mips/include/asm/kerndat.h b/criu/arch/mips/include/asm/kerndat.h
new file mode 100644
index 000000000..60956b573
--- /dev/null
+++ b/criu/arch/mips/include/asm/kerndat.h
@@ -0,0 +1,7 @@
+#ifndef __CR_ASM_KERNDAT_H__
+#define __CR_ASM_KERNDAT_H__
+
+#define kdat_compatible_cr()			0
+#define kdat_can_map_vdso()			0
+
+#endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/mips/include/asm/parasite-syscall.h b/criu/arch/mips/include/asm/parasite-syscall.h
new file mode 100755
index 000000000..a2b5e75ff
--- /dev/null
+++ b/criu/arch/mips/include/asm/parasite-syscall.h
@@ -0,0 +1,8 @@
+#ifndef __CR_ASM_PARASITE_SYSCALL_H__
+#define __CR_ASM_PARASITE_SYSCALL_H__
+
+#include "asm/types.h"
+
+struct parasite_ctl;
+
+#endif
diff --git a/criu/arch/mips/include/asm/parasite.h b/criu/arch/mips/include/asm/parasite.h
new file mode 100755
index 000000000..39882dd21
--- /dev/null
+++ b/criu/arch/mips/include/asm/parasite.h
@@ -0,0 +1,9 @@
+#ifndef __ASM_PARASITE_H__
+#define __ASM_PARASITE_H__
+
+static inline void arch_get_tls(tls_t *ptls)
+{
+    asm("rdhwr %0, $29" : "=r"(*ptls));
+}
+
+#endif
diff --git a/criu/arch/mips/include/asm/restore.h b/criu/arch/mips/include/asm/restore.h
new file mode 100755
index 000000000..0cb9aa8ed
--- /dev/null
+++ b/criu/arch/mips/include/asm/restore.h
@@ -0,0 +1,29 @@
+#ifndef __CR_ASM_RESTORE_H__
+#define __CR_ASM_RESTORE_H__
+
+#include "asm/restorer.h"
+#include "images/core.pb-c.h"
+
+#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,		\
+			      task_args)				\
+	asm volatile(							\
+		     "move $4, %0				    \n" \
+		     "move $25, %1 				    \n" \
+		     "move $5, %2				    \n" \
+		     "move $29, $5				    \n" \
+		     "jalr $25   				    \n"		\
+		     "nop   				    \n"		\
+		     :							\
+		     :"r"(task_args),"r"(restore_task_exec_start),	\
+		      "g"(new_sp)			\
+		     : "$29", "$25", "$4","$5")
+
+static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
+{
+	*ptls = pcore->ti_mips->tls;
+}
+
+
+int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
+
+#endif
diff --git a/criu/arch/mips/include/asm/restorer.h b/criu/arch/mips/include/asm/restorer.h
new file mode 100755
index 000000000..1a33cd884
--- /dev/null
+++ b/criu/arch/mips/include/asm/restorer.h
@@ -0,0 +1,79 @@
+#ifndef __CR_ASM_RESTORER_H__
+#define __CR_ASM_RESTORER_H__
+
+#include "asm/types.h"
+#include <compel/asm/fpu.h>
+#include "images/core.pb-c.h"
+#include <compel/plugins/std/syscall-codes.h>
+#include <compel/asm/sigframe.h>
+
+static inline void restore_tls(tls_t *ptls) { 
+	asm volatile(							
+		     "move $4, %0				    \n"	
+		     "li $2,  "__stringify(__NR_set_thread_area)"  \n" 
+		     "syscall					    \n"	
+		     :							
+		     : "r"(*ptls)					
+		     : "$4","$2","memory");
+}
+static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
+{
+	return -1;
+}
+static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
+{
+	return -1;
+}
+
+#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,      \
+			     thread_args, clone_restore_fn)      \
+    asm volatile(						 \
+		 "ld    $5,%2	\n"	/* a1 = new_sp */	 \
+		 "dsubu $5,32	\n"				 \
+		 "sd    %5,0($5)	\n"				 \
+		 "sd    %6,8($5)	\n"			 \
+		 "sd    %1,16($5)   \n"				\
+		 "move  $4,%1	\n"  /* a0=flags */			\
+		 "move  $6,%3	\n" /* a2=parent_tid */			\
+		 "li    $7,0	\n"	    /* a3 = tls is 0 */		\
+		 "move  $8,%4	\n"	    /* a4 = child_tid */	\
+		 "li    $2, "__stringify(__NR_clone)"	\n"		\
+		 "syscall  	\n"	/* syscall */			\
+		 "sync  	\n"				\
+		 "bnez	$7,err  	\n"				\
+		 "nop  	\n"						\
+		 "beqz	$2,thread_start  	\n"			\
+		 "nop 	                        \n"			\
+		 "move %0,$2 	                \n"			\
+		 "b  end 	                \n"			\
+		 "err:break  \n"					\
+		 "thread_start:  	\n"				\
+		 "ld 	$25,0($29)         \n"				\
+		 "ld 	$4,8($29)      \n"				\
+		 "jal 	$25  \n"					\
+		 "nop  \n"						\
+		 "end:  \n"						\
+		     : "=r"(ret)					\
+		     : "r"(clone_flags),				\
+		       "m"(new_sp),					\
+		       "r"(&parent_tid),				\
+		       "r"(&thread_args[i].pid),			\
+		       "r"(clone_restore_fn),				\
+		       "r"(&thread_args[i])				\
+		 :"$2","$4","$5","$6","$7","$8","$25","$29","memory")
+
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
+			      clone_restore_fn)	do { \
+	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
+	ret = -1; \
+} while (0)
+
+#define kdat_compatible_cr()			0
+#define arch_map_vdso(map, compat)		-1
+
+static inline void *alloc_compat_syscall_stack(void) { return NULL; }
+static inline void free_compat_syscall_stack(void *stack32) { }
+int restore_gpregs(struct rt_sigframe *f, UserMipsRegsEntry *r);
+int restore_nonsigframe_gpregs(UserMipsRegsEntry *r);
+
+#endif
diff --git a/criu/arch/mips/include/asm/syscall32.h b/criu/arch/mips/include/asm/syscall32.h
new file mode 100755
index 000000000..a6e298217
--- /dev/null
+++ b/criu/arch/mips/include/asm/syscall32.h
@@ -0,0 +1,17 @@
+#ifndef __CR_SYSCALL32_H__
+#define __CR_SYSCALL32_H__
+
+extern long sys_socket(int domain, int type, int protocol);
+extern long sys_connect(int sockfd, struct sockaddr *addr, int addrlen);
+extern long sys_sendto(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len);
+extern long sys_recvfrom(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len);
+extern long sys_sendmsg(int sockfd, const struct msghdr *msg, int flags);
+extern long sys_recvmsg(int sockfd, struct msghdr *msg, int flags);
+extern long sys_shutdown(int sockfd, int how);
+extern long sys_bind(int sockfd, const struct sockaddr *addr, int addrlen);
+extern long sys_setsockopt(int sockfd, int level, int optname, const void *optval, unsigned int optlen);
+extern long sys_getsockopt(int sockfd, int level, int optname, const void *optval, unsigned int *optlen);
+extern long sys_shmat(int shmid, void *shmaddr, int shmflag);
+extern long sys_pread(unsigned int fd, char *ubuf, u32 count, u64 pos);
+
+#endif /* __CR_SYSCALL32_H__ */
diff --git a/criu/arch/mips/include/asm/types.h b/criu/arch/mips/include/asm/types.h
new file mode 100755
index 000000000..8366e0540
--- /dev/null
+++ b/criu/arch/mips/include/asm/types.h
@@ -0,0 +1,31 @@
+#ifndef __CR_ASM_TYPES_H__
+#define __CR_ASM_TYPES_H__
+
+#include <stdbool.h>
+#include <signal.h>
+
+#include "page.h"
+#include "bitops.h"
+#include "asm/int.h"
+
+#include <compel/plugins/std/asm/syscall-types.h>
+
+#include "images/core.pb-c.h"
+
+#define core_is_compat(core)			false
+
+#define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__MIPS
+
+#define CORE_THREAD_ARCH_INFO(core) core->ti_mips
+
+typedef UserMipsRegsEntry UserRegsEntry;
+
+static inline u64 encode_pointer(void *p) { return (u64)p; }
+static inline void *decode_pointer(u64 v) { return (void*)v; }
+
+
+#define AT_VECTOR_SIZE			44
+typedef uint64_t auxv_t;
+typedef unsigned long tls_t;
+
+#endif /* __CR_ASM_TYPES_H__ */
diff --git a/criu/arch/mips/include/asm/vdso.h b/criu/arch/mips/include/asm/vdso.h
new file mode 100755
index 000000000..0e5da159e
--- /dev/null
+++ b/criu/arch/mips/include/asm/vdso.h
@@ -0,0 +1,23 @@
+#ifndef __CR_ASM_VDSO_H__
+#define __CR_ASM_VDSO_H__
+
+#include "asm/int.h"
+#include "asm-generic/vdso.h"
+
+/* This definition is used in pie/util-vdso.c to initialize the vdso symbol
+ * name string table 'vdso_symbols'
+ */
+
+/*
+ * This is a minimal amount of symbols
+ * we should support at the moment.
+ */
+#define VDSO_SYMBOL_MAX	3
+#define VDSO_SYMBOL_GTOD	0
+#define ARCH_VDSO_SYMBOLS			\
+	"__vdso_clock_gettime",			\
+	"__vdso_gettimeofday",			\
+	"__vdso_clock_getres"
+
+
+#endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/mips/restorer.c b/criu/arch/mips/restorer.c
new file mode 100755
index 000000000..2e196b60c
--- /dev/null
+++ b/criu/arch/mips/restorer.c
@@ -0,0 +1,17 @@
+#include <unistd.h>
+
+#include "types.h"
+#include "restorer.h"
+#include "asm/restorer.h"
+#include <compel/asm/fpu.h>
+
+#include <compel/plugins/std/syscall-codes.h>
+#include <compel/plugins/std/string.h>
+#include <compel/plugins/std/syscall.h>
+#include "log.h"
+#include "cpu.h"
+
+int restore_nonsigframe_gpregs(UserMipsRegsEntry *r)
+{
+    return 0;
+}
diff --git a/criu/arch/mips/sigaction_compat.c b/criu/arch/mips/sigaction_compat.c
new file mode 100755
index 000000000..d3e45f082
--- /dev/null
+++ b/criu/arch/mips/sigaction_compat.c
@@ -0,0 +1,19 @@
+#include "log.h"
+#include "asm/restorer.h"
+#include <compel/asm/fpu.h>
+#include "asm/compat.h"
+#include <compel/plugins/std/syscall-codes.h>
+
+#ifdef CR_NOGLIBC
+# include <compel/plugins/std/string.h>
+#endif
+
+#include "cpu.h"
+
+extern char restore_rt_sigaction;
+
+int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
+{
+    return 0;
+}
+
diff --git a/criu/arch/mips/sigframe.c b/criu/arch/mips/sigframe.c
new file mode 100755
index 000000000..1e39102f0
--- /dev/null
+++ b/criu/arch/mips/sigframe.c
@@ -0,0 +1,13 @@
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "asm/sigframe.h"
+#include "asm/types.h"
+
+#include "log.h"
+#include <stdio.h>
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
+		struct rt_sigframe *rsigframe)
+{
+    return 0;
+}
diff --git a/criu/arch/mips/vdso-pie.c b/criu/arch/mips/vdso-pie.c
new file mode 100755
index 000000000..737e5538b
--- /dev/null
+++ b/criu/arch/mips/vdso-pie.c
@@ -0,0 +1,21 @@
+#include <unistd.h>
+#include "asm/types.h"
+
+#include <compel/plugins/std/string.h>
+#include <compel/plugins/std/syscall.h>
+#include "parasite-vdso.h"
+#include "log.h"
+#include "common/bug.h"
+
+#ifdef LOG_PREFIX
+# undef LOG_PREFIX
+#endif
+#define LOG_PREFIX "vdso: "
+
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
+			struct vdso_symtable *sto, struct vdso_symtable *sfrom,
+			bool compat_vdso)
+{
+    pr_err("Vdso proxification isn't implemented on mips\n");
+    return -1;
+}

From afe90627e276e9e68cdf4872cae8fa3c5c637914 Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 8 Apr 2020 10:29:21 +0800
Subject: [PATCH 0238/1854] mips:criu: Enable mips in criu

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 Makefile                  | 10 +++++++++-
 criu/cr-restore.c         |  9 ++++++++-
 criu/kerndat.c            |  9 +++++++++
 criu/parasite-syscall.c   | 17 +++++++++++++++++
 criu/pie/Makefile         |  4 ++++
 criu/pie/Makefile.library |  4 ++++
 6 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 00e563c11..e72dd1428 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 
 #
 # Supported Architectures
-ifneq ($(filter-out x86 arm aarch64 ppc64 s390,$(ARCH)),)
+ifneq ($(filter-out x86 arm aarch64 ppc64 s390 mips,$(ARCH)),)
         $(error "The architecture $(ARCH) isn't supported")
 endif
 
@@ -76,6 +76,10 @@ ifeq ($(ARCH),x86)
         DEFINES		:= -DCONFIG_X86_64
 endif
 
+ifeq ($(ARCH),mips)
+        DEFINES		:= -DCONFIG_MIPS 
+endif
+
 #
 # CFLAGS_PIE:
 #
@@ -105,6 +109,10 @@ WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement -Wstrict-prot
 CFLAGS-GCOV		:= --coverage -fno-exceptions -fno-inline -fprofile-update=atomic
 export CFLAGS-GCOV
 
+ifeq ($(ARCH),mips)
+WARNINGS		:= -rdynamic
+endif
+
 ifneq ($(GCOV),)
         LDFLAGS         += -lgcov
         CFLAGS          += $(CFLAGS-GCOV)
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index f572f79a0..99b36e0d4 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -461,9 +461,16 @@ static int restore_native_sigaction(int sig, SaEntry *e)
 	ASSIGN_TYPED(act.rt_sa_handler, decode_pointer(e->sigaction));
 	ASSIGN_TYPED(act.rt_sa_flags, e->flags);
 	ASSIGN_TYPED(act.rt_sa_restorer, decode_pointer(e->restorer));
+#ifdef CONFIG_MIPS
+	e->has_mask_extended = 1;
+	BUILD_BUG_ON(sizeof(e->mask)* 2 != sizeof(act.rt_sa_mask.sig));
+
+	memcpy(&(act.rt_sa_mask.sig[0]), &e->mask, sizeof(act.rt_sa_mask.sig[0]));
+	memcpy(&(act.rt_sa_mask.sig[1]), &e->mask_extended, sizeof(act.rt_sa_mask.sig[1]));
+#else
 	BUILD_BUG_ON(sizeof(e->mask) != sizeof(act.rt_sa_mask.sig));
 	memcpy(act.rt_sa_mask.sig, &e->mask, sizeof(act.rt_sa_mask.sig));
-
+#endif
 	if (sig == SIGCHLD) {
 		sigchld_act = act;
 		return 0;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 0b6d53bc7..831f9f72a 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1007,6 +1007,15 @@ static bool kerndat_has_clone3_set_tid(void)
 	pid_t pid;
 	struct _clone_args args = {};
 
+#if defined(CONFIG_MIPS)
+	/*
+	 * Currently the CRIU PIE assembler clone3() wrapper is
+	 * not implemented for MIPS.
+	 */
+	kdat.has_clone3_set_tid = false;
+	return 0;
+#endif
+
 	args.set_tid = -1;
 	/*
 	 * On a system without clone3() this will return ENOSYS.
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index b649d1b51..5f9de152a 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -179,7 +179,12 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
 	pc->cap_last_cap = kdat.last_cap;
 
 	tc->has_blk_sigset = true;
+#ifdef CONFIG_MIPS
+	memcpy(&tc->blk_sigset, (unsigned long *)compel_thread_sigmask(tctl), sizeof(tc->blk_sigset));
+	memcpy(&tc->blk_sigset_extended, (unsigned long *)compel_thread_sigmask(tctl)+1, sizeof(tc->blk_sigset));
+#else
 	memcpy(&tc->blk_sigset, compel_thread_sigmask(tctl), sizeof(k_rtsigset_t));
+#endif
 	ret = compel_get_thread_regs(tctl, save_task_regs, core);
 	if (ret) {
 		pr_err("Can't obtain regs for thread %d\n", pid);
@@ -240,8 +245,15 @@ int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *i
 		ASSIGN_TYPED(sa->sigaction, encode_pointer(args->sas[i].rt_sa_handler));
 		ASSIGN_TYPED(sa->flags, args->sas[i].rt_sa_flags);
 		ASSIGN_TYPED(sa->restorer, encode_pointer(args->sas[i].rt_sa_restorer));
+#ifdef CONFIG_MIPS
+		sa->has_mask_extended = 1;
+		BUILD_BUG_ON(sizeof(sa->mask) * 2 != sizeof(args->sas[0].rt_sa_mask.sig));
+		memcpy(&sa->mask, &(args->sas[i].rt_sa_mask.sig[0]), sizeof(sa->mask));
+		memcpy(&sa->mask_extended, &(args->sas[i].rt_sa_mask.sig[1]), sizeof(sa->mask));
+#else
 		BUILD_BUG_ON(sizeof(sa->mask) != sizeof(args->sas[0].rt_sa_mask.sig));
 		memcpy(&sa->mask, args->sas[i].rt_sa_mask.sig, sizeof(sa->mask));
+#endif
 		sa->has_compat_sigaction = true;
 		sa->compat_sigaction = !compel_mode_native(ctl);
 
@@ -569,7 +581,12 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 	}
 
 	parasite_args_size = PARASITE_ARG_SIZE_MIN; /* reset for next task */
+#ifdef CONFIG_MIPS
+	memcpy(&item->core[0]->tc->blk_sigset, (unsigned long *)compel_task_sigmask(ctl), sizeof(item->core[0]->tc->blk_sigset));
+	memcpy(&item->core[0]->tc->blk_sigset_extended, (unsigned long *)compel_task_sigmask(ctl)+1, sizeof(item->core[0]->tc->blk_sigset));
+#else
 	memcpy(&item->core[0]->tc->blk_sigset, compel_task_sigmask(ctl), sizeof(k_rtsigset_t));
+#endif
 	dmpi(item)->parasite_ctl = ctl;
 
 	return ctl;
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index a30747ac3..265dcf82b 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -14,6 +14,10 @@ ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
         compel_plugins	:= $(shell $(COMPEL_BIN) plugins)
 endif
 
+ifeq ($(ARCH),mips)
+	ccflags-y	+= -mno-abicalls -fno-pic
+endif
+
 LDS		:= compel/arch/$(ARCH)/scripts/compel-pack.lds.S
 
 restorer-obj-y	+= parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index de75b11d4..da2a2fab3 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -23,3 +23,7 @@ endif
 
 CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN),$(CFLAGS))
 CFLAGS		+= $(CFLAGS_PIE)
+
+ifeq ($(ARCH),mips)
+CFLAGS			+= -fno-stack-protector -DCR_NOGLIBC -mno-abicalls -fno-pic
+endif

From b5c34c74c5055301821c2acbe4cf8aad646da558 Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 8 Apr 2020 10:49:47 +0800
Subject: [PATCH 0239/1854] mips:support  docker-cross compile

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 .travis.yml                                  |   4 +
 scripts/build/Dockerfile.mips64el-cross      |  44 ++++++
 scripts/build/Makefile                       |   4 +-
 test/zdtm/lib/arch/mips/include/asm/atomic.h | 136 +++++++++++++++++++
 test/zdtm/lib/test.c                         |   2 +-
 test/zdtm/static/pthread01.c                 |   5 +
 6 files changed, 193 insertions(+), 2 deletions(-)
 create mode 100644 scripts/build/Dockerfile.mips64el-cross
 create mode 100644 test/zdtm/lib/arch/mips/include/asm/atomic.h

diff --git a/.travis.yml b/.travis.yml
index 69a505193..8c126b47f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,6 +95,10 @@ jobs:
       env: TR_ARCH=ppc64-cross
       dist: bionic
     - env: TR_ARCH=local STREAM_TEST=1
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=mips64el-cross
+      dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross
new file mode 100644
index 000000000..1ba936105
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-cross
@@ -0,0 +1,44 @@
+FROM dockcross/base:latest
+
+# Add the cross compiler sources
+RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture mips64el && \
+  apt-get install emdebian-archive-keyring
+
+RUN apt-get update && apt-get install -y \
+	crossbuild-essential-mips64el	\
+	libbz2-dev:mips64el		\
+	libexpat1-dev:mips64el		\
+	ncurses-dev:mips64el		\
+	libssl-dev:mips64el		\
+	protobuf-c-compiler		\
+	protobuf-compiler		\
+	python-protobuf			\
+	libnl-3-dev:mips64el		\
+	libprotobuf-dev:mips64el		\
+	libnet-dev:mips64el		\
+	libprotobuf-c-dev:mips64el		\
+	libcap-dev:mips64el		\
+	libaio-dev:mips64el		\
+	libnl-route-3-dev:mips64el
+
+ENV CROSS_TRIPLE=mips64el-linux-gnuabi64
+ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
+	AS=/usr/bin/${CROSS_TRIPLE}-as				\
+	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
+	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
+	ARCH=mips						\
+	SUBARCH=mips
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 855539152..974d1455f 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -2,7 +2,9 @@ ARCHES := x86_64 fedora-asan fedora-rawhide centos armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
-TARGETS += armv7-cross aarch64-cross ppc64-cross
+
+TARGETS += armv7-cross aarch64-cross ppc64-cross mips64el-cross
+
 
 all: $(TARGETS) $(TARGETS_CLANG)
 .PHONY: all
diff --git a/test/zdtm/lib/arch/mips/include/asm/atomic.h b/test/zdtm/lib/arch/mips/include/asm/atomic.h
new file mode 100644
index 000000000..acf4c03cd
--- /dev/null
+++ b/test/zdtm/lib/arch/mips/include/asm/atomic.h
@@ -0,0 +1,136 @@
+#ifndef __CR_ATOMIC_H__
+#define __CR_ATOMIC_H__
+
+//#include <linux/types.h>
+//#include "common/compiler.h"
+//#include "common/arch/mips/asm/utils.h"
+//#include "common/arch/mips/asm/cmpxchg.h"
+
+typedef uint32_t atomic_t;
+/* typedef struct { */
+/* 	int counter; */
+/* }atomic_t; */
+
+#define __WEAK_LLSC_MB		"	sync	\n"
+
+#define smp_llsc_mb()	__asm__ __volatile__(__WEAK_LLSC_MB : : :"memory")
+
+#define smp_mb__before_llsc() smp_llsc_mb()
+#define smp_mb__before_atomic()	smp_mb__before_llsc()
+#define smp_mb__after_atomic()	smp_llsc_mb()
+
+#define likely(x)		__builtin_expect(!!(x), 1)
+#define unlikely(x)		__builtin_expect(!!(x), 0)
+
+#define atomic_get(v)		(*(volatile int *)v)
+#define atomic_set(v, i)		((*v) = (i))
+
+//#define atomic_get atomic_read
+
+/*
+ * atomic_add - add integer to atomic variable
+ * @i: integer value to add
+ * @v: pointer of type atomic_t
+ *
+ * Atomically adds @i to @v.
+ */
+
+static __inline__ void atomic_add(int i, atomic_t * v)
+{
+    int temp;
+
+    do {
+	__asm__ __volatile__(
+			     "	.set	mips3				\n"
+			     "	ll	%0, %1		# atomic_add	\n"
+			     "	addu	%0, %2				\n"
+			     "	sc	%0, %1				\n"
+			     "	.set	mips0				\n"
+			     : "=&r" (temp), "+m" (*v)
+			     : "Ir" (i));
+    } while (unlikely(!temp));
+}
+
+/*
+ * atomic_sub - subtract the atomic variable
+ * @i: integer value to subtract
+ * @v: pointer of type atomic_t
+ *
+ * Atomically subtracts @i from @v.
+ */
+static __inline__ void atomic_sub(int i, atomic_t * v)
+{
+    int temp;
+
+    do {
+	__asm__ __volatile__(
+			     "	.set	mips3				\n"
+			     "	ll	%0, %1		# atomic_sub	\n"
+			     "	subu	%0, %2				\n"
+			     "	sc	%0, %1				\n"
+			     "	.set	mips0				\n"
+			     : "=&r" (temp), "+m" (*v)
+			     : "Ir" (i));
+    } while (unlikely(!temp));
+}
+
+/*
+ * Same as above, but return the result value
+ */
+static __inline__ int atomic_add_return(int i, atomic_t * v)
+{
+	int result;
+	int temp;
+
+	smp_mb__before_llsc();
+
+	do {
+	    __asm__ __volatile__(
+				 "	.set	mips3				\n"
+				 "	ll	%1, %2	# atomic_add_return	\n"
+				 "	addu	%0, %1, %3			\n"
+				 "	sc	%0, %2				\n"
+				 "	.set	mips0				\n"
+				 : "=&r" (result), "=&r" (temp), "+m" (*v)
+				 : "Ir" (i));
+	} while (unlikely(!result));
+
+	result = temp + i;
+
+	smp_llsc_mb();
+
+	return result;
+}
+
+static __inline__ int atomic_sub_return(int i, atomic_t * v)
+{
+	int result;
+	int temp;
+
+	smp_mb__before_llsc();
+
+	do {
+	    __asm__ __volatile__(
+				 "	.set	mips3				\n"
+				 "	ll	%1, %2	# atomic_sub_return	\n"
+				 "	subu	%0, %1, %3			\n"
+				 "	sc	%0, %2				\n"
+				 "	.set	mips0				\n"
+				 : "=&r" (result), "=&r" (temp), "+m" (*v)
+				 : "Ir" (i));
+	} while (unlikely(!result));
+
+	result = temp - i;
+
+	smp_llsc_mb();
+
+	return result;
+}
+
+#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
+#define atomic_dec_return(v) atomic_sub_return(1, (v))
+#define atomic_inc_return(v) atomic_add_return(1, (v))
+
+static inline unsigned int atomic_inc(atomic_t *v) { return atomic_add_return(1, v) - 1; }
+static inline unsigned int atomic_dec(atomic_t *v) { return atomic_sub_return(1, v) + 1; }
+#endif /* __CR_ATOMIC_H__ */
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index 630476de0..e031357ac 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -403,7 +403,7 @@ pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid
 {
 #ifdef __x86_64__
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, child_tid, newtls);
-#elif (__i386__ || __arm__ || __aarch64__ ||__powerpc64__)
+#elif (__i386__ || __arm__ || __aarch64__ ||__powerpc64__ || __mips__)
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, newtls, child_tid);
 #elif __s390x__
 	return (pid_t)syscall(__NR_clone, child_stack, flags, parent_tid, child_tid, newtls);
diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
index 1e84463ee..bdd7c59d8 100644
--- a/test/zdtm/static/pthread01.c
+++ b/test/zdtm/static/pthread01.c
@@ -27,6 +27,11 @@ static __thread struct tls_data_s {
 static task_waiter_t t1;
 static task_waiter_t t2;
 
+#ifdef CONFIG_MIPS
+#ifndef SIGSTKFLT
+#define SIGSTKFLT 16
+#endif
+#endif
 static char *decode_signal(const sigset_t *s, char *buf)
 {
 	buf[0] = '\0';

From 40169b950eff23347975acc0de0b9316f08d175b Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 26 Mar 2020 06:26:48 +0000
Subject: [PATCH 0240/1854] style: fix typos

Oddly, one of the test had a typo which should be fatal.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/config.c              | 2 +-
 test/others/ext-tty/run.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index e78b534a9..eb303fd77 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -876,7 +876,7 @@ int check_options(void)
 	}
 
 	if (!opts.restore_detach && opts.restore_sibling) {
-		pr_err("--restore-sibling only makes sense with --restore-detach\n");
+		pr_err("--restore-sibling only makes sense with --restore-detached\n");
 		return 1;
 	}
 
diff --git a/test/others/ext-tty/run.py b/test/others/ext-tty/run.py
index 2c0bacc84..8109033cb 100755
--- a/test/others/ext-tty/run.py
+++ b/test/others/ext-tty/run.py
@@ -29,7 +29,7 @@ ttyid = "fd[%d]:tty[%x:%x]" % (slave, st.st_rdev, st.st_dev)
 
 ret = subprocess.Popen([
     "../../../criu/criu", "restore", "-v4", "--inherit-fd", ttyid,
-    "--restore-sibling", "--restore-detach"
+    "--restore-sibling", "--restore-detached"
 ]).wait()
 if ret:
     sys.exit(ret)

From d38851c9bd003d9c5b2b1c804291f518db681938 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 18 Apr 2020 22:28:24 +0300
Subject: [PATCH 0241/1854] test/jenkins: use bash to run shell scripts

We permanently have issues like this:
./test/jenkins/criu-iter.sh: 3: source: not found

It looks like a good idea to use one shell to run our jenkins scripts.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/jenkins/criu-btrfs.sh             | 2 ++
 test/jenkins/criu-by-id.sh             | 2 ++
 test/jenkins/criu-dedup.sh             | 2 ++
 test/jenkins/criu-dump.sh              | 2 ++
 test/jenkins/criu-fault.sh             | 1 +
 test/jenkins/criu-fcg.sh               | 2 ++
 test/jenkins/criu-groups.sh            | 2 ++
 test/jenkins/criu-inhfd.sh             | 2 ++
 test/jenkins/criu-iter.sh              | 2 ++
 test/jenkins/criu-join-ns.sh           | 2 ++
 test/jenkins/criu-lazy-common.sh       | 2 ++
 test/jenkins/criu-lazy-migration.sh    | 2 ++
 test/jenkins/criu-lazy-pages.sh        | 2 ++
 test/jenkins/criu-other.sh             | 2 ++
 test/jenkins/criu-overlay.sh           | 2 ++
 test/jenkins/criu-pre-dump.sh          | 2 ++
 test/jenkins/criu-remote-lazy-pages.sh | 2 ++
 test/jenkins/criu-sibling.sh           | 2 ++
 test/jenkins/criu-snap.sh              | 2 ++
 test/jenkins/criu-stop.sh              | 2 ++
 test/jenkins/criu-user.sh              | 2 ++
 test/jenkins/criu.sh                   | 2 ++
 22 files changed, 43 insertions(+)

diff --git a/test/jenkins/criu-btrfs.sh b/test/jenkins/criu-btrfs.sh
index e749ad906..e456f1c34 100644
--- a/test/jenkins/criu-btrfs.sh
+++ b/test/jenkins/criu-btrfs.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # This is a job which is executed on btrfs
 
 source `dirname $0`/criu-lib.sh &&
diff --git a/test/jenkins/criu-by-id.sh b/test/jenkins/criu-by-id.sh
index 2381e73f7..c041ed358 100644
--- a/test/jenkins/criu-by-id.sh
+++ b/test/jenkins/criu-by-id.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 echo 950000 > /sys/fs/cgroup/cpu,cpuacct/system/cpu.rt_runtime_us
 echo 950000 > /sys/fs/cgroup/cpu,cpuacct/system/jenkins.service/cpu.rt_runtime_us
 git checkout -f ${TEST_COMMIT}
diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh
index e75ef5f82..0041496d8 100755
--- a/test/jenkins/criu-dedup.sh
+++ b/test/jenkins/criu-dedup.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check auto-deduplication of pagemaps
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-dump.sh b/test/jenkins/criu-dump.sh
index 381cf7a98..4c49532b2 100755
--- a/test/jenkins/criu-dump.sh
+++ b/test/jenkins/criu-dump.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check that dump is not destructive
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index c27dd3738..f871a140b 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # Check known fault injections
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-fcg.sh b/test/jenkins/criu-fcg.sh
index 938a72f26..ca5054f5e 100755
--- a/test/jenkins/criu-fcg.sh
+++ b/test/jenkins/criu-fcg.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Test how freeze cgroup works
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-groups.sh b/test/jenkins/criu-groups.sh
index 508d20aa6..b5bea4eab 100755
--- a/test/jenkins/criu-groups.sh
+++ b/test/jenkins/criu-groups.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make one regular C/R cycle over randomly-generated groups
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-inhfd.sh b/test/jenkins/criu-inhfd.sh
index a59dcda6e..8f44ba13a 100755
--- a/test/jenkins/criu-inhfd.sh
+++ b/test/jenkins/criu-inhfd.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check known fault injections
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-iter.sh b/test/jenkins/criu-iter.sh
index d414b0575..304aa43db 100755
--- a/test/jenkins/criu-iter.sh
+++ b/test/jenkins/criu-iter.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make 3 iteration of dump/restore for each test
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-join-ns.sh b/test/jenkins/criu-join-ns.sh
index 39ef182f0..241c29034 100755
--- a/test/jenkins/criu-join-ns.sh
+++ b/test/jenkins/criu-join-ns.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make one regular C/R cycle
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-lazy-common.sh b/test/jenkins/criu-lazy-common.sh
index 7fdab40dd..a8ff9e51b 100644
--- a/test/jenkins/criu-lazy-common.sh
+++ b/test/jenkins/criu-lazy-common.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 KERN_MAJ=`uname -r | cut -d. -f1`
 KERN_MIN=`uname -r | cut -d. -f2`
 if [ $KERN_MAJ -ge "4" ] && [ $KERN_MIN -ge "11" ]; then
diff --git a/test/jenkins/criu-lazy-migration.sh b/test/jenkins/criu-lazy-migration.sh
index 30e3c0375..02a212e0d 100755
--- a/test/jenkins/criu-lazy-migration.sh
+++ b/test/jenkins/criu-lazy-migration.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check lazy-pages
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-lazy-pages.sh b/test/jenkins/criu-lazy-pages.sh
index a3ee9a4ec..9ef721739 100755
--- a/test/jenkins/criu-lazy-pages.sh
+++ b/test/jenkins/criu-lazy-pages.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check lazy-pages
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-other.sh b/test/jenkins/criu-other.sh
index c6c231c86..bb68f912a 100755
--- a/test/jenkins/criu-other.sh
+++ b/test/jenkins/criu-other.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 source `dirname $0`/criu-lib.sh &&
 prep &&
 make -C test other &&
diff --git a/test/jenkins/criu-overlay.sh b/test/jenkins/criu-overlay.sh
index 5ef7682ac..de80007a3 100755
--- a/test/jenkins/criu-overlay.sh
+++ b/test/jenkins/criu-overlay.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make one regular C/R cycle
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-pre-dump.sh b/test/jenkins/criu-pre-dump.sh
index 95f4d8549..137f7c23f 100755
--- a/test/jenkins/criu-pre-dump.sh
+++ b/test/jenkins/criu-pre-dump.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check 3 pre-dump-s before dump (with and w/o page server)
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-remote-lazy-pages.sh b/test/jenkins/criu-remote-lazy-pages.sh
index ea0d17f0e..1c677e333 100755
--- a/test/jenkins/criu-remote-lazy-pages.sh
+++ b/test/jenkins/criu-remote-lazy-pages.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check remote-lazy-pages
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-sibling.sh b/test/jenkins/criu-sibling.sh
index 93f070330..d59b38970 100755
--- a/test/jenkins/criu-sibling.sh
+++ b/test/jenkins/criu-sibling.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make 3 iteration of dump/restore for each test
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-snap.sh b/test/jenkins/criu-snap.sh
index d28ba45d9..b08c57f52 100755
--- a/test/jenkins/criu-snap.sh
+++ b/test/jenkins/criu-snap.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check snapshots
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-stop.sh b/test/jenkins/criu-stop.sh
index d92519d68..64da2ee8a 100644
--- a/test/jenkins/criu-stop.sh
+++ b/test/jenkins/criu-stop.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Check --leave-stopped option
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu-user.sh b/test/jenkins/criu-user.sh
index d89ede203..f4ec52fc6 100755
--- a/test/jenkins/criu-user.sh
+++ b/test/jenkins/criu-user.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make 3 iteration of dump/restore for each test
 set -e
 source `dirname $0`/criu-lib.sh
diff --git a/test/jenkins/criu.sh b/test/jenkins/criu.sh
index 19d545c3c..0ee750b08 100755
--- a/test/jenkins/criu.sh
+++ b/test/jenkins/criu.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Make one regular C/R cycle
 set -e
 source `dirname $0`/criu-lib.sh

From be1394122112381eca55faf5b1a7b2e2b51bd383 Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Fri, 17 Apr 2020 11:54:31 +0000
Subject: [PATCH 0242/1854] mips: impliment arch_shmat()

On MIPS CPUs with VIPT caches also has aliasing issues, just like ARMv6.
To overcome this issue, page coloring 0x40000 align for shared mappings was introduced (SHMLBA) in kernel.
    https://github.com/torvalds/linux/blob/master/arch/mips/include/asm/shmparam.h

Related to this, zdtm test suites ipc.c shm.c shm-unaligned.c and shm-mp.c are passed.

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 criu/arch/mips/include/asm/restorer.h |  4 ++++
 criu/arch/mips/restorer.c             | 32 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/criu/arch/mips/include/asm/restorer.h b/criu/arch/mips/include/asm/restorer.h
index 1a33cd884..d916377f4 100755
--- a/criu/arch/mips/include/asm/restorer.h
+++ b/criu/arch/mips/include/asm/restorer.h
@@ -76,4 +76,8 @@ static inline void free_compat_syscall_stack(void *stack32) { }
 int restore_gpregs(struct rt_sigframe *f, UserMipsRegsEntry *r);
 int restore_nonsigframe_gpregs(UserMipsRegsEntry *r);
 
+#define ARCH_HAS_SHMAT_HOOK
+unsigned long arch_shmat(int shmid, void *shmaddr,
+			int shmflg, unsigned long size);
+
 #endif
diff --git a/criu/arch/mips/restorer.c b/criu/arch/mips/restorer.c
index 2e196b60c..e3a1e4a44 100755
--- a/criu/arch/mips/restorer.c
+++ b/criu/arch/mips/restorer.c
@@ -15,3 +15,35 @@ int restore_nonsigframe_gpregs(UserMipsRegsEntry *r)
 {
     return 0;
 }
+
+#define SHMLBA 0x40000
+unsigned long arch_shmat(int shmid, void *shmaddr,
+			int shmflg, unsigned long size)
+{
+	unsigned long smap;
+
+	/* SHMLBA-aligned, direct call shmat() */
+	if (!((unsigned long)shmaddr & (SHMLBA - 1)))
+		return sys_shmat(shmid, shmaddr, shmflg);
+
+	smap = sys_shmat(shmid, NULL, shmflg);
+	if (IS_ERR_VALUE(smap)) {
+		pr_err("shmat() with NULL shmaddr failed: %d\n", (int)smap);
+		return smap;
+	}
+
+	/* We're lucky! */
+	if (smap == (unsigned long)shmaddr)
+		return smap;
+
+	 /* Warn ALOUD */
+	pr_warn("Restoring shmem %p unaligned to SHMLBA.\n", shmaddr);
+	pr_warn("Make sure that you don't migrate shmem from non-VIPT cached CPU to VIPT cached \n");
+	pr_warn("Otherwise YOU HAVE A CHANCE OF DATA CORRUPTIONS in writeable shmem\n");
+
+	smap = sys_mremap(smap, size, size,
+			MREMAP_FIXED | MREMAP_MAYMOVE, (unsigned long)shmaddr);
+	if (IS_ERR_VALUE(smap))
+		pr_err("mremap() for shmem failed: %d\n", (int)smap);
+	return smap;
+}

From 277b0b69fac7afa6cbde51e7c99e2756029d0d6c Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Wed, 22 Apr 2020 15:43:04 +0800
Subject: [PATCH 0243/1854] mips: fix fail when run zdtm test pthread01.c

k_rtsigset_t is 16Bytes in mips architecture but not 8Bytes.
so blk_sigset_extended be added in TaskCoreEntry and ThreadCoreEntry for dumping
extern 8Bytes data in parasite-syscall.c, restore extern 8Bytes data in cr-restore.c

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 criu/cr-restore.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 99b36e0d4..ec00bf71b 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3551,8 +3551,12 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	for (i = 0; i < current->nr_threads; i++) {
 		CoreEntry *tcore;
 		struct rt_sigframe *sigframe;
+#ifdef CONFIG_MIPS
+		k_rtsigset_t mips_blkset;
+#else
 		k_rtsigset_t *blkset = NULL;
 
+#endif
 		thread_args[i].pid = current->threads[i].ns[0].virt;
 		thread_args[i].siginfo_n = siginfo_priv_nr[i];
 		thread_args[i].siginfo = task_args->siginfo;
@@ -3563,11 +3567,22 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		if (thread_args[i].pid == pid) {
 			task_args->t = thread_args + i;
 			tcore = core;
+#ifdef CONFIG_MIPS
+			mips_blkset.sig[0] = tcore->tc->blk_sigset;
+			mips_blkset.sig[1] = tcore->tc->blk_sigset_extended;
+#else
 			blkset = (void *)&tcore->tc->blk_sigset;
+#endif
 		} else {
 			tcore = current->core[i];
-			if (tcore->thread_core->has_blk_sigset)
+			if (tcore->thread_core->has_blk_sigset) {
+#ifdef CONFIG_MIPS
+				mips_blkset.sig[0] = tcore->thread_core->blk_sigset;
+				mips_blkset.sig[1] = tcore->thread_core->blk_sigset_extended;
+#else
 				blkset = (void *)&tcore->thread_core->blk_sigset;
+#endif
+			}
 		}
 
 		if ((tcore->tc || tcore->ids) && thread_args[i].pid != pid) {
@@ -3607,7 +3622,11 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		thread_args[i].mz = mz + i;
 		sigframe = (struct rt_sigframe *)&mz[i].rt_sigframe;
 
+#ifdef CONFIG_MIPS
+		if (construct_sigframe(sigframe, sigframe, &mips_blkset, tcore))
+#else
 		if (construct_sigframe(sigframe, sigframe, blkset, tcore))
+#endif
 			goto err;
 
 		if (tcore->thread_core->comm)

From 8364b09407a969c1af68cd3e477449fa60d2518e Mon Sep 17 00:00:00 2001
From: Josh Abraham <sinisterpatrician@gmail.com>
Date: Mon, 27 Apr 2020 13:40:46 -0400
Subject: [PATCH 0244/1854] soccr/test: Fix error logging in libsoccr tcp-test

Signed-off-by: Joshua Abraham <sinisterpatrician@gmail.com>
---
 soccr/test/tcp-conn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soccr/test/tcp-conn.c b/soccr/test/tcp-conn.c
index e31f58e7e..cdd75129a 100644
--- a/soccr/test/tcp-conn.c
+++ b/soccr/test/tcp-conn.c
@@ -101,12 +101,12 @@ int main(void)
 	/* Start testing */
 	dst_let = sizeof(addr);
 	if (getsockname(sock, (struct sockaddr *) &addr, &dst_let)) {
-		pr_perror("connect");
+		pr_perror("getsockname");
 		return 1;
 	}
 	dst_let = sizeof(addr);
 	if (getpeername(sock, (struct sockaddr *) &dst, &dst_let)) {
-		pr_perror("connect");
+		pr_perror("getpeername");
 		return 1;
 	}
 

From 5bd776da382fb0838830d80f4bec6c0aaec8bfbb Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 11 May 2020 02:38:14 -0700
Subject: [PATCH 0245/1854] Remove dupe of "deprecated stuff on" msg

A similar one is already printed in check_options().

Before this patch:
> $ ./criu/criu -vvvvvv --deprecated --log-file=/dev/stdout xxx
> (00.000000) Turn deprecated stuff ON
> ...
> (00.029680) DEPRECATED ON
> (00.029687) Error (criu/crtools.c:284): unknown command: xxx

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/crtools.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index ad61fa9bb..76172f350 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -210,9 +210,6 @@ int main(int argc, char *argv[], char *envp[])
        if (fault_injected(FI_CANNOT_MAP_VDSO))
                kdat.can_map_vdso = 0;
 
-	if (opts.deprecated_ok)
-		pr_debug("DEPRECATED ON\n");
-
 	if (!list_empty(&opts.inherit_fds)) {
 		if (strcmp(argv[optind], "restore")) {
 			pr_err("--inherit-fd is restore-only option\n");

From 8452be93cf24b0dffe257ddab892a9c95d44c91b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 13 May 2020 15:48:28 +0000
Subject: [PATCH 0246/1854] travis: use bionic almost everywhere

A few tests were still running on xenial because at some point they were
hanging. This switches now all tests to bionic except one docker test
which still uses xenial to test with overlayfs.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c126b47f..b28bd64f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,7 @@ jobs:
     - os: linux
       arch: amd64
       env: TR_ARCH=fedora-rawhide
-      dist: xenial # test hangs on bionic
+      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=podman-test
@@ -69,19 +69,19 @@ jobs:
     - os: linux
       arch: amd64
       env: TR_ARCH=alpine      CLANG=1
-      dist: xenial # test hangs on bionic
+      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=alpine
-      dist: xenial # test hangs on bionic
+      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=centos
-      dist: xenial # test hangs on bionic
+      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=fedora-asan
-      dist: xenial # test hangs on bionic
+      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=armv7-cross

From 00b8257d9f31876e35e08e6d556f6f67d76f3908 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 13 May 2020 17:57:03 +0200
Subject: [PATCH 0247/1854] tests: move cross compilation to github actions

This moves the cross compilation tests to github actions, to slightly
reduce the number of Travis tests and run them in parallel on github
actions.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/cross-compile.yml | 23 +++++++++++++++++++++++
 .travis.yml                         | 16 ----------------
 2 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/cross-compile.yml

diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
new file mode 100644
index 000000000..9545d3df6
--- /dev/null
+++ b/.github/workflows/cross-compile.yml
@@ -0,0 +1,23 @@
+name: Cross Compile Tests
+
+on:
+  push:
+    branches: [ criu-dev ]
+  pull_request:
+    branches: [ criu-dev ]
+  schedule:
+    - cron:  '55 5 * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Cross Compilation Targets
+      run: >
+        sudo make -C scripts/travis ${{ matrix.target }}
diff --git a/.travis.yml b/.travis.yml
index b28bd64f9..e71afa0a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,23 +82,7 @@ jobs:
       arch: amd64
       env: TR_ARCH=fedora-asan
       dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=armv7-cross
-      dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=aarch64-cross
-      dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=ppc64-cross
-      dist: bionic
     - env: TR_ARCH=local STREAM_TEST=1
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=mips64el-cross
-      dist: bionic
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial

From 00a44031e220919c9df6a1e25db8f32fb141d741 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 15 May 2020 17:10:58 -0700
Subject: [PATCH 0248/1854] cr-service: fix wording in debug messages

The message "Overwriting RPC settings with values from <filename>" is
misleading, giving the impression that file is being read and consumed.
It really puzzled me, since <filename> didn't exist.

What it needs to say is "Would overwrite", i.e. if a file with such name
is present, it would be used.

Also, add actual "Parsing file ..." so it will be clear which files are
being used.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/config.c     | 2 ++
 criu/cr-service.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/config.c b/criu/config.c
index eb303fd77..904addf3a 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -126,6 +126,8 @@ static char ** parse_config(char *filepath)
 	if (!configfile)
 		return NULL;
 
+	pr_debug("Parsing config file %s\n", filepath);
+
 	configuration = xmalloc(config_size * sizeof(char *));
 	if (configuration == NULL) {
 		fclose(configfile);
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 53eadb1bc..6dc2379d6 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -405,7 +405,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	}
 
 	if (req->config_file) {
-		pr_debug("Overwriting RPC settings with values from %s\n", req->config_file);
+		pr_debug("Would overwrite RPC settings with values from %s\n", req->config_file);
 	}
 
 	if (kerndat_init())

From f6d1b498dc22a66865e1c8899ac5dc2b81363ce1 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 15 May 2020 17:13:33 -0700
Subject: [PATCH 0249/1854] cr-service: spell out an error

While working on runc checkpointing, I incorrectly closed status_fd
prematurely, and received an error from CRIU, but it was
non-descriptive.

Do print the error from open().

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/cr-service.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 6dc2379d6..7c2ff9835 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -680,8 +680,10 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->has_status_fd) {
 		sprintf(status_fd, "/proc/%d/fd/%d", ids.pid, req->status_fd);
 		opts.status_fd = open(status_fd, O_WRONLY);
-		if (opts.status_fd < 0)
+		if (opts.status_fd < 0) {
+			pr_perror("Can't reopen status fd %s", status_fd);
 			goto err;
+		}
 	}
 
 	if (req->orphan_pts_master)

From ae4fd07ca5c09482fa5a78f3ede0d31a4b5ff63e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Thu, 20 Feb 2020 21:10:23 +0000
Subject: [PATCH 0250/1854] libcriu: Add orphan pts master

The orphan pts master option was introduced with commit [1]
to enable checkpoint/restore of containers with a pty pair
used as a console.

[1] https://github.com/checkpoint-restore/criu/commit/6afe523d97d59e6bf29621b8aa0e6a4332f710fc

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 lib/c/criu.c | 11 +++++++++++
 lib/c/criu.h |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index 1d0a235f4..2ac18ade9 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -541,6 +541,17 @@ void criu_set_shell_job(bool shell_job)
 	criu_local_set_shell_job(global_opts, shell_job);
 }
 
+void criu_local_set_orphan_pts_master(criu_opts *opts, bool orphan_pts_master)
+{
+	opts->rpc->has_orphan_pts_master = true;
+	opts->rpc->orphan_pts_master = orphan_pts_master;
+}
+
+void criu_set_orphan_pts_master(bool orphan_pts_master)
+{
+	criu_local_set_orphan_pts_master(global_opts, orphan_pts_master);
+}
+
 void criu_local_set_file_locks(criu_opts *opts, bool file_locks)
 {
 	opts->rpc->has_file_locks	= true;
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 22db0fdcf..3a9204f5b 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -72,6 +72,7 @@ void criu_set_tcp_close(bool tcp_close);
 void criu_set_weak_sysctls(bool val);
 void criu_set_evasive_devices(bool evasive_devices);
 void criu_set_shell_job(bool shell_job);
+void criu_set_orphan_pts_master(bool orphan_pts_master);
 void criu_set_file_locks(bool file_locks);
 void criu_set_track_mem(bool track_mem);
 void criu_set_auto_dedup(bool auto_dedup);
@@ -185,6 +186,7 @@ void criu_local_set_tcp_close(criu_opts *opts, bool tcp_close);
 void criu_local_set_weak_sysctls(criu_opts *opts, bool val);
 void criu_local_set_evasive_devices(criu_opts *opts, bool evasive_devices);
 void criu_local_set_shell_job(criu_opts *opts, bool shell_job);
+void criu_local_set_orphan_pts_master(criu_opts *opts, bool orphan_pts_master);
 void criu_local_set_file_locks(criu_opts *opts, bool file_locks);
 void criu_local_set_track_mem(criu_opts *opts, bool track_mem);
 void criu_local_set_auto_dedup(criu_opts *opts, bool auto_dedup);

From 4ac9a3c904ace0414521afc05e1ba3287a95f248 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Fri, 21 Feb 2020 12:23:01 +0000
Subject: [PATCH 0251/1854] libcriu: Use spaces around '='

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 lib/c/criu.c | 94 ++++++++++++++++++++++++++--------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index 2ac18ade9..7daac7dbf 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -256,11 +256,11 @@ int criu_local_init_opts(criu_opts **o)
 		return -1;
 	}
 
-	opts->rpc	= rpc;
-	opts->notify	= NULL;
+	opts->rpc = rpc;
+	opts->notify = NULL;
 
-	opts->service_comm	= CRIU_COMM_BIN;
-	opts->service_binary	= strdup(CR_DEFAULT_SERVICE_BIN);
+	opts->service_comm = CRIU_COMM_BIN;
+	opts->service_binary = strdup(CR_DEFAULT_SERVICE_BIN);
 
 	if(opts->service_binary == NULL) {
 		perror("Can't allocate memory for criu service setting");
@@ -303,8 +303,8 @@ int criu_notify_pid(criu_notify_arg_t na)
 
 void criu_local_set_pid(criu_opts *opts, int pid)
 {
-	opts->rpc->has_pid	= true;
-	opts->rpc->pid		= pid;
+	opts->rpc->has_pid = true;
+	opts->rpc->pid = pid;
 }
 
 void criu_set_pid(int pid)
@@ -408,8 +408,8 @@ void criu_set_work_dir_fd(int fd)
 
 void criu_local_set_leave_running(criu_opts *opts, bool leave_running)
 {
-	opts->rpc->has_leave_running	= true;
-	opts->rpc->leave_running	= leave_running;
+	opts->rpc->has_leave_running = true;
+	opts->rpc->leave_running = leave_running;
 }
 
 void criu_set_leave_running(bool leave_running)
@@ -419,8 +419,8 @@ void criu_set_leave_running(bool leave_running)
 
 void criu_local_set_ext_unix_sk(criu_opts *opts, bool ext_unix_sk)
 {
-	opts->rpc->has_ext_unix_sk	= true;
-	opts->rpc->ext_unix_sk	= ext_unix_sk;
+	opts->rpc->has_ext_unix_sk = true;
+	opts->rpc->ext_unix_sk = ext_unix_sk;
 }
 
 void criu_set_ext_unix_sk(bool ext_unix_sk)
@@ -477,8 +477,8 @@ int criu_add_unix_sk(unsigned int inode)
 
 void criu_local_set_tcp_established(criu_opts *opts, bool tcp_established)
 {
-	opts->rpc->has_tcp_established	= true;
-	opts->rpc->tcp_established	= tcp_established;
+	opts->rpc->has_tcp_established = true;
+	opts->rpc->tcp_established = tcp_established;
 }
 
 void criu_set_tcp_established(bool tcp_established)
@@ -488,8 +488,8 @@ void criu_set_tcp_established(bool tcp_established)
 
 void criu_local_set_tcp_skip_in_flight(criu_opts *opts, bool tcp_skip_in_flight)
 {
-	opts->rpc->has_tcp_skip_in_flight	= true;
-	opts->rpc->tcp_skip_in_flight		= tcp_skip_in_flight;
+	opts->rpc->has_tcp_skip_in_flight = true;
+	opts->rpc->tcp_skip_in_flight = tcp_skip_in_flight;
 }
 
 void criu_set_tcp_skip_in_flight(bool tcp_skip_in_flight)
@@ -499,8 +499,8 @@ void criu_set_tcp_skip_in_flight(bool tcp_skip_in_flight)
 
 void criu_local_set_tcp_close(criu_opts *opts, bool tcp_close)
 {
-	opts->rpc->has_tcp_close	= true;
-	opts->rpc->tcp_close		= tcp_close;
+	opts->rpc->has_tcp_close = true;
+	opts->rpc->tcp_close = tcp_close;
 }
 
 void criu_set_tcp_close(bool tcp_close)
@@ -511,7 +511,7 @@ void criu_set_tcp_close(bool tcp_close)
 void criu_local_set_weak_sysctls(criu_opts *opts, bool val)
 {
 	opts->rpc->has_weak_sysctls = true;
-	opts->rpc->weak_sysctls	= val;
+	opts->rpc->weak_sysctls = val;
 }
 
 void criu_set_weak_sysctls(bool val)
@@ -521,8 +521,8 @@ void criu_set_weak_sysctls(bool val)
 
 void criu_local_set_evasive_devices(criu_opts *opts, bool evasive_devices)
 {
-	opts->rpc->has_evasive_devices	= true;
-	opts->rpc->evasive_devices	= evasive_devices;
+	opts->rpc->has_evasive_devices = true;
+	opts->rpc->evasive_devices = evasive_devices;
 }
 
 void criu_set_evasive_devices(bool evasive_devices)
@@ -532,8 +532,8 @@ void criu_set_evasive_devices(bool evasive_devices)
 
 void criu_local_set_shell_job(criu_opts *opts, bool shell_job)
 {
-	opts->rpc->has_shell_job	= true;
-	opts->rpc->shell_job		= shell_job;
+	opts->rpc->has_shell_job = true;
+	opts->rpc->shell_job = shell_job;
 }
 
 void criu_set_shell_job(bool shell_job)
@@ -554,8 +554,8 @@ void criu_set_orphan_pts_master(bool orphan_pts_master)
 
 void criu_local_set_file_locks(criu_opts *opts, bool file_locks)
 {
-	opts->rpc->has_file_locks	= true;
-	opts->rpc->file_locks		= file_locks;
+	opts->rpc->has_file_locks = true;
+	opts->rpc->file_locks = file_locks;
 }
 
 void criu_set_file_locks(bool file_locks)
@@ -565,8 +565,8 @@ void criu_set_file_locks(bool file_locks)
 
 void criu_local_set_log_level(criu_opts *opts, int log_level)
 {
-	opts->rpc->has_log_level	= true;
-	opts->rpc->log_level		= log_level;
+	opts->rpc->has_log_level = true;
+	opts->rpc->log_level = log_level;
 }
 
 void criu_set_log_level(int log_level)
@@ -697,8 +697,8 @@ int criu_set_log_file(const char *log_file)
 
 void criu_local_set_cpu_cap(criu_opts *opts, unsigned int cap)
 {
-	opts->rpc->has_cpu_cap	= true;
-	opts->rpc->cpu_cap	= cap;
+	opts->rpc->has_cpu_cap = true;
+	opts->rpc->cpu_cap = cap;
 }
 
 void criu_set_cpu_cap(unsigned int cap)
@@ -1410,7 +1410,7 @@ exit:
 static int send_req_and_recv_resp(criu_opts *opts, CriuReq *req, CriuResp **resp)
 {
 	int fd;
-	int ret	= 0;
+	int ret = 0;
 	bool d = false;
 
 	if (req->type == CRIU_REQ_TYPE__DUMP && req->opts->has_pid == false)
@@ -1431,12 +1431,12 @@ static int send_req_and_recv_resp(criu_opts *opts, CriuReq *req, CriuResp **resp
 int criu_local_check(criu_opts *opts)
 {
 	int ret = -1;
-	CriuReq req	= CRIU_REQ__INIT;
-	CriuResp *resp	= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 
 	saved_errno = 0;
 
-	req.type	= CRIU_REQ_TYPE__CHECK;
+	req.type = CRIU_REQ_TYPE__CHECK;
 
 	ret = send_req_and_recv_resp(opts, &req, &resp);
 	if (ret)
@@ -1463,13 +1463,13 @@ int criu_check(void)
 int criu_local_dump(criu_opts *opts)
 {
 	int ret = -1;
-	CriuReq req	= CRIU_REQ__INIT;
-	CriuResp *resp	= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 
 	saved_errno = 0;
 
-	req.type	= CRIU_REQ_TYPE__DUMP;
-	req.opts	= opts->rpc;
+	req.type = CRIU_REQ_TYPE__DUMP;
+	req.opts = opts->rpc;
 
 	ret = send_req_and_recv_resp(opts, &req, &resp);
 	if (ret)
@@ -1502,13 +1502,13 @@ int criu_dump(void)
 int criu_local_dump_iters(criu_opts *opts, int (*more)(criu_predump_info pi))
 {
 	int ret = -1, fd = -1, uret;
-	CriuReq req	= CRIU_REQ__INIT;
-	CriuResp *resp	= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 
 	saved_errno = 0;
 
-	req.type	= CRIU_REQ_TYPE__PRE_DUMP;
-	req.opts	= opts->rpc;
+	req.type = CRIU_REQ_TYPE__PRE_DUMP;
+	req.opts = opts->rpc;
 
 	ret = -EINVAL;
 	/*
@@ -1573,13 +1573,13 @@ int criu_dump_iters(int (*more)(criu_predump_info pi))
 int criu_local_restore(criu_opts *opts)
 {
 	int ret = -1;
-	CriuReq req	= CRIU_REQ__INIT;
-	CriuResp *resp	= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 
 	saved_errno = 0;
 
-	req.type	= CRIU_REQ_TYPE__RESTORE;
-	req.opts	= opts->rpc;
+	req.type = CRIU_REQ_TYPE__RESTORE;
+	req.opts = opts->rpc;
 
 	ret = send_req_and_recv_resp(opts, &req, &resp);
 	if (ret)
@@ -1612,8 +1612,8 @@ int criu_local_restore_child(criu_opts *opts)
 	enum criu_service_comm saved_comm;
 	const char *saved_comm_data;
 	bool save_comm;
-	CriuReq req	= CRIU_REQ__INIT;
-	CriuResp *resp	= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 
 	/*
 	 * restore_child is not possible with criu running as a system
@@ -1644,8 +1644,8 @@ int criu_local_restore_child(criu_opts *opts)
 
 	saved_errno = 0;
 
-	req.type	= CRIU_REQ_TYPE__RESTORE;
-	req.opts	= opts->rpc;
+	req.type = CRIU_REQ_TYPE__RESTORE;
+	req.opts = opts->rpc;
 
 	req.opts->has_rst_sibling = true;
 	req.opts->rst_sibling = true;

From f3341025207ba960e36140bb24d63098cdd69a57 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Mon, 24 Feb 2020 18:30:59 +0000
Subject: [PATCH 0252/1854] libcriu: Add space between 'if' and parenthesis

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 lib/c/criu.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index 7daac7dbf..de57a65dc 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -58,7 +58,7 @@ int criu_local_set_service_address(criu_opts *opts, const char *path)
 	} else {
 		opts->service_address = strdup(CR_DEFAULT_SERVICE_ADDRESS);
 	}
-	if(opts->service_address == NULL) {
+	if (opts->service_address == NULL) {
 		return -ENOMEM;
 	}
 	return 0;
@@ -90,7 +90,7 @@ int criu_local_set_service_binary(criu_opts *opts, const char *path)
 	} else {
 		opts->service_binary = strdup(CR_DEFAULT_SERVICE_BIN);
 	}
-	if(opts->service_binary == NULL) {
+	if (opts->service_binary == NULL) {
 		return -ENOMEM;
 	}
 	return 0;
@@ -118,7 +118,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_exec_cmd = 0;
 
-	if(opts->rpc->unix_sk_ino) {
+	if (opts->rpc->unix_sk_ino) {
 		for (i = 0; i < opts->rpc->n_unix_sk_ino; i++) {
 			free(opts->rpc->unix_sk_ino[i]);
 		}
@@ -126,7 +126,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_unix_sk_ino = 0;
 
-	if(opts->rpc->ext_mnt) {
+	if (opts->rpc->ext_mnt) {
 		for (i = 0; i < opts->rpc->n_ext_mnt; i++) {
 			if (opts->rpc->ext_mnt[i]) {
 				free(opts->rpc->ext_mnt[i]->val);
@@ -138,7 +138,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_ext_mnt = 0;
 
-	if(opts->rpc->cg_root) {
+	if (opts->rpc->cg_root) {
 		for (i = 0; i < opts->rpc->n_cg_root; i++) {
 			if (opts->rpc->cg_root[i]) {
 				free(opts->rpc->cg_root[i]->ctrl);
@@ -150,7 +150,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_cg_root = 0;
 
-	if(opts->rpc->veths) {
+	if (opts->rpc->veths) {
 		for (i = 0; i < opts->rpc->n_veths; i++) {
 			if (opts->rpc->veths[i]) {
 				free(opts->rpc->veths[i]->if_in);
@@ -162,7 +162,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_veths = 0;
 
-	if(opts->rpc->enable_fs) {
+	if (opts->rpc->enable_fs) {
 		for (i = 0; i < opts->rpc->n_enable_fs; i++) {
 			free(opts->rpc->enable_fs[i]);
 		}
@@ -170,7 +170,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_enable_fs = 0;
 
-	if(opts->rpc->skip_mnt) {
+	if (opts->rpc->skip_mnt) {
 		for (i = 0; i < opts->rpc->n_skip_mnt; i++) {
 			free(opts->rpc->skip_mnt[i]);
 		}
@@ -178,7 +178,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_skip_mnt = 0;
 
-	if(opts->rpc->irmap_scan_paths) {
+	if (opts->rpc->irmap_scan_paths) {
 		for (i = 0; i < opts->rpc->n_irmap_scan_paths; i++) {
 			free(opts->rpc->irmap_scan_paths[i]);
 		}
@@ -186,7 +186,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_irmap_scan_paths = 0;
 
-	if(opts->rpc->cgroup_dump_controller) {
+	if (opts->rpc->cgroup_dump_controller) {
 		for (i = 0; i < opts->rpc->n_cgroup_dump_controller; i++) {
 			free(opts->rpc->cgroup_dump_controller[i]);
 		}
@@ -194,7 +194,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_cgroup_dump_controller = 0;
 
-	if(opts->rpc->inherit_fd) {
+	if (opts->rpc->inherit_fd) {
 		for (i = 0; i < opts->rpc->n_inherit_fd; i++) {
 			if (opts->rpc->inherit_fd[i]) {
 				free(opts->rpc->inherit_fd[i]->key);
@@ -205,7 +205,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_inherit_fd = 0;
 
-	if(opts->rpc->external) {
+	if (opts->rpc->external) {
 		for (i = 0; i < opts->rpc->n_external; i++) {
 			free(opts->rpc->external[i]);
 		}
@@ -213,7 +213,7 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_external = 0;
 
-	if(opts->rpc->ps) {
+	if (opts->rpc->ps) {
 		free(opts->rpc->ps->address);
 		free(opts->rpc->ps);
 	}
@@ -262,7 +262,7 @@ int criu_local_init_opts(criu_opts **o)
 	opts->service_comm = CRIU_COMM_BIN;
 	opts->service_binary = strdup(CR_DEFAULT_SERVICE_BIN);
 
-	if(opts->service_binary == NULL) {
+	if (opts->service_binary == NULL) {
 		perror("Can't allocate memory for criu service setting");
 		criu_local_free_opts(opts);
 		return -1;
@@ -325,7 +325,7 @@ void criu_set_images_dir_fd(int fd)
 int criu_local_set_parent_images(criu_opts *opts, const char *path)
 {
 	opts->rpc->parent_img = strdup(path);
-	if(opts->rpc->parent_img == NULL) {
+	if (opts->rpc->parent_img == NULL) {
 		return -ENOMEM;
 	}
 	return 0;
@@ -577,7 +577,7 @@ void criu_set_log_level(int log_level)
 int criu_local_set_root(criu_opts *opts, const char *root)
 {
 	opts->rpc->root = strdup(root);
-	if(opts->rpc->root == NULL) {
+	if (opts->rpc->root == NULL) {
 		return -ENOMEM;
 	}
 	return 0;
@@ -613,7 +613,7 @@ void criu_set_manage_cgroups_mode(enum criu_cg_mode mode)
 int criu_local_set_freeze_cgroup(criu_opts *opts, const char *name)
 {
 	opts->rpc->freeze_cgroup = strdup(name);
-	if(opts->rpc->freeze_cgroup == NULL) {
+	if (opts->rpc->freeze_cgroup == NULL) {
 		return -ENOMEM;
 	}
 	return 0;
@@ -627,7 +627,7 @@ int criu_set_freeze_cgroup(const char *name)
 int criu_local_set_lsm_profile(criu_opts *opts, const char *name)
 {
 	opts->rpc->lsm_profile = strdup(name);
-	if(opts->rpc->lsm_profile == NULL) {
+	if (opts->rpc->lsm_profile == NULL) {
 		return -ENOMEM;
 	}
 	return 0;
@@ -684,7 +684,7 @@ void criu_set_ext_masters(bool val)
 int criu_local_set_log_file(criu_opts *opts, const char *log_file)
 {
 	opts->rpc->log_file = strdup(log_file);
-	if(opts->rpc->log_file == NULL) {
+	if (opts->rpc->log_file == NULL) {
 		return -ENOMEM;
 	}
 	return 0;

From 64347398c10b5911d0f1acd2db5c856b4b1fe464 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 20 May 2020 11:57:22 +0000
Subject: [PATCH 0253/1854] coverity: fix RESOURCE_LEAK criu/timens.c: 67

 7. criu-3.14/criu/timens.c:67: leaked_storage: Variable "img" going out of scope leaks the storage it points to.
    65|   	if (id == 0 && empty_image(img)) {
    66|   		pr_warn("Clocks values have not been dumped\n");
    67|-> 		return 0;
    68|   	}

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/timens.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/timens.c b/criu/timens.c
index 2a7e95284..f81808abf 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -64,6 +64,7 @@ int prepare_timens(int id)
 
 	if (id == 0 && empty_image(img)) {
 		pr_warn("Clocks values have not been dumped\n");
+		close_image(img);
 		return 0;
 	}
 

From b4c51ea492c98011472dd28a7cb47bffcfb4ad20 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 20 May 2020 12:19:36 +0000
Subject: [PATCH 0254/1854] coverity: fix FORWARD_NULL in criu/proc_parse.c:
 1481

8. criu-3.14/criu/proc_parse.c:1511: var_deref_model: Passing null pointer "f" to "fclose", which dereferences it.
  1509|   	exit_code = 0;
  1510|   out:
  1511|-> 	fclose(f);
  1512|   	return exit_code;
  1513|   }

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/proc_parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 4a22700aa..d1ccd9281 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1480,7 +1480,7 @@ int parse_timens_offsets(struct timespec *boff, struct timespec *moff)
 	f = fopen_proc(PROC_SELF, "timens_offsets");
 	if (!f) {
 		pr_perror("Unable to open /proc/self/timens_offsets");
-		goto out;
+		return exit_code;
 	}
 	while (fgets(buf, BUF_SIZE, f)) {
 		int64_t sec, nsec;

From e34f5dd3a351dc2e475fa235c25ed115ac996644 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 20 May 2020 12:38:55 +0000
Subject: [PATCH 0255/1854] clang: Branch condition evaluates to a garbage
 value

criu-3.14/criu/namespaces.c:692:7: warning: Branch condition evaluates to a garbage value

criu-3.14/criu/namespaces.c:690:3: note: 'supported' declared without an initial value
              protobuf_c_boolean supported;
              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
criu-3.14/criu/namespaces.c:691:8: note: Calling 'get_ns_id'
              id = get_ns_id(pid, &time_for_children_ns_desc, &supported);
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
criu-3.14/criu/namespaces.c:479:9: note: Calling '__get_ns_id'
      return __get_ns_id(pid, nd, supported, NULL);
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
criu-3.14/criu/namespaces.c:454:6: note: Assuming 'proc_dir' is < 0
      if (proc_dir < 0)
          ^~~~~~~~~~~~
criu-3.14/criu/namespaces.c:454:2: note: Taking true branch
      if (proc_dir < 0)
      ^
criu-3.14/criu/namespaces.c:455:3: note: Returning without writing to '*supported'
              return 0;
              ^
criu-3.14/criu/namespaces.c:479:9: note: Returning from '__get_ns_id'
      return __get_ns_id(pid, nd, supported, NULL);
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
criu-3.14/criu/namespaces.c:479:2: note: Returning without writing to '*supported'
      return __get_ns_id(pid, nd, supported, NULL);
      ^
criu-3.14/criu/namespaces.c:691:8: note: Returning from 'get_ns_id'
              id = get_ns_id(pid, &time_for_children_ns_desc, &supported);
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
criu-3.14/criu/namespaces.c:692:7: note: Branch condition evaluates to a garbage value
              if (!supported || !id) {
                  ^~~~~~~~~~
690|   		protobuf_c_boolean supported;
691|   		id = get_ns_id(pid, &time_for_children_ns_desc, &supported);
692|-> 		if (!supported || !id) {
693|   			pr_err("Can't make timens id\n");
694|

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/namespaces.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 89d97c7bc..04f242505 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -687,7 +687,7 @@ int dump_task_ns_ids(struct pstree_item *item)
 	}
 	if (ids->has_time_ns_id) {
 		unsigned int id;
-		protobuf_c_boolean supported;
+		protobuf_c_boolean supported = false;
 		id = get_ns_id(pid, &time_for_children_ns_desc, &supported);
 		if (!supported || !id) {
 			pr_err("Can't make timens id\n");

From faf6dbf33e04eb8a0907f44b2787022b14a840e0 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 15 May 2020 18:21:25 -0700
Subject: [PATCH 0256/1854] close_service_fd: rename to status_ready

The name close_service_fd() is misleading, as it not just closes the
status_fd, but also writes to it. On a high level, though, it signals
the other side that we are ready, so rename to status_ready.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/cr-service.c   | 2 +-
 criu/include/util.h | 2 +-
 criu/uffd.c         | 2 +-
 criu/util.c         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 7c2ff9835..7201b549a 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -1394,7 +1394,7 @@ int cr_service(bool daemon_mode)
 	if (setup_sigchld_handler())
 		goto err;
 
-	if (close_status_fd())
+	if (status_ready())
 		goto err;
 
 	while (1) {
diff --git a/criu/include/util.h b/criu/include/util.h
index d67f6d39d..1b22d9e0b 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -177,7 +177,7 @@ extern int cr_system(int in, int out, int err, char *cmd, char *const argv[], un
 extern int cr_system_userns(int in, int out, int err, char *cmd,
 				char *const argv[], unsigned flags, int userns_pid);
 extern int cr_daemon(int nochdir, int noclose, int close_fd);
-extern int close_status_fd(void);
+extern int status_ready(void);
 extern int is_root_user(void);
 
 extern void set_proc_self_fd(int fd);
diff --git a/criu/uffd.c b/criu/uffd.c
index 99373c04d..33b34ba25 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1456,7 +1456,7 @@ int cr_lazy_pages(bool daemon)
 		}
 	}
 
-	if (close_status_fd())
+	if (status_ready())
 		return -1;
 
 	/*
diff --git a/criu/util.c b/criu/util.c
index 517f0fc25..0a60fa105 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -643,7 +643,7 @@ out:
 	return ret;
 }
 
-int close_status_fd(void)
+int status_ready(void)
 {
 	char c = 0;
 
@@ -1105,7 +1105,7 @@ int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk)
 		}
 	}
 
-	if (close_status_fd())
+	if (status_ready())
 		return -1;
 
 	if (sk >= 0) {

From 62c03530c9d6e0a1012a589ed1a26c2612113238 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 15 May 2020 18:12:30 -0700
Subject: [PATCH 0257/1854] swrk: send notification instead of using status fd

When we use swrk, we have a mechanism to send notifications over RPC.
It is cleaner and more straightforward than sending \0 to status fd.

For now, both mechanisms are supported, although status fd request
option is now deprecated, so a warning is logged in case it's used.

Guess we can remove it in a few years.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/action-scripts.c         | 1 +
 criu/cr-service.c             | 2 ++
 criu/include/action-scripts.h | 1 +
 criu/util.c                   | 4 ++++
 4 files changed, 8 insertions(+)

diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index 2f7617c0f..5337efa64 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -29,6 +29,7 @@ static const char *action_names[ACT_MAX] = {
 	[ ACT_PRE_RESUME ]	= "pre-resume",
 	[ ACT_POST_RESUME ]	= "post-resume",
 	[ ACT_ORPHAN_PTS_MASTER ] = "orphan-pts-master",
+	[ ACT_STATUS_READY ]    = "status-ready",
 };
 
 struct script {
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 7201b549a..56be6bcd3 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -678,6 +678,8 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	}
 
 	if (req->has_status_fd) {
+		pr_warn("status_fd is obsoleted; use status-ready notification instead\n");
+
 		sprintf(status_fd, "/proc/%d/fd/%d", ids.pid, req->status_fd);
 		opts.status_fd = open(status_fd, O_WRONLY);
 		if (opts.status_fd < 0) {
diff --git a/criu/include/action-scripts.h b/criu/include/action-scripts.h
index 40b09b160..c2e8850aa 100644
--- a/criu/include/action-scripts.h
+++ b/criu/include/action-scripts.h
@@ -15,6 +15,7 @@ enum script_actions {
 	ACT_POST_RESUME,
 	ACT_PRE_RESUME,
 	ACT_ORPHAN_PTS_MASTER,
+	ACT_STATUS_READY,
 
 	ACT_MAX
 };
diff --git a/criu/util.c b/criu/util.c
index 0a60fa105..4c1f3b4ca 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -45,6 +45,7 @@
 #include "pstree.h"
 
 #include "cr-errno.h"
+#include "action-scripts.h"
 
 #define VMA_OPT_LEN	128
 
@@ -647,6 +648,9 @@ int status_ready(void)
 {
 	char c = 0;
 
+	if (run_scripts(ACT_STATUS_READY))
+		return -1;
+
 	if (opts.status_fd < 0)
 		return 0;
 

From e57e74a18df0b7bbfb2fa556941fc7c8715e57d1 Mon Sep 17 00:00:00 2001
From: ZeyadYasser <zeyady98@gmail.com>
Date: Thu, 16 Apr 2020 15:58:18 +0200
Subject: [PATCH 0258/1854] criu: optimize find_unix_sk_by_ino()

Fixes: #339
Replaced the linear search with a hashtable lookup.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/files.c           |  1 +
 criu/include/sockets.h |  2 ++
 criu/sk-unix.c         | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/criu/files.c b/criu/files.c
index a1fd26764..2cfc9040e 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1749,5 +1749,6 @@ struct collect_image_info files_cinfo = {
 int prepare_files(void)
 {
 	init_fdesc_hash();
+	init_sk_info_hash();
 	return collect_image(&files_cinfo);
 }
diff --git a/criu/include/sockets.h b/criu/include/sockets.h
index cd98d18e0..e971f3efd 100644
--- a/criu/include/sockets.h
+++ b/criu/include/sockets.h
@@ -62,6 +62,8 @@ extern int unix_sk_id_add(unsigned int ino);
 extern int unix_sk_ids_parse(char *optarg);
 extern int unix_prepare_root_shared(void);
 
+extern void init_sk_info_hash(void);
+
 extern int do_dump_opt(int sk, int level, int name, void *val, int len);
 #define dump_opt(s, l, n, f)	do_dump_opt(s, l, n, f, sizeof(*f))
 extern int do_restore_opt(int sk, int level, int name, void *val, int len);
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 048ff44ae..cbcf1f66c 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -903,6 +903,7 @@ struct unix_sk_info {
 	struct unix_sk_info	*peer;
 	struct pprep_head	peer_resolve; /* XXX : union with the above? */
 	struct file_desc	d;
+	struct hlist_node	hash; /* To lookup socket by ino */
 	struct list_head	connected; /* List of sockets, connected to me */
 	struct list_head	node; /* To link in peer's connected list  */
 	struct list_head	scm_fles;
@@ -934,11 +935,25 @@ struct scm_fle {
 #define USK_PAIR_SLAVE		0x2
 #define USK_GHOST_FDSTORE	0x4	/* bound but removed address */
 
+#define SK_INFO_HASH_SIZE	32
+
+static struct hlist_head sk_info_hash[SK_INFO_HASH_SIZE];
+
+void init_sk_info_hash(void)
+{
+	int i;
+
+	for (i = 0; i < SK_INFO_HASH_SIZE; i++)
+		INIT_HLIST_HEAD(&sk_info_hash[i]);
+}
+
 static struct unix_sk_info *find_unix_sk_by_ino(int ino)
 {
 	struct unix_sk_info *ui;
+	struct hlist_head *chain;
 
-	list_for_each_entry(ui, &unix_sockets, list) {
+	chain = &sk_info_hash[ino % SK_INFO_HASH_SIZE];
+	hlist_for_each_entry(ui, chain, hash) {
 		if (ui->ue->ino == ino)
 			return ui;
 	}
@@ -2044,6 +2059,7 @@ static int init_unix_sk_info(struct unix_sk_info *ui, UnixSkEntry *ue)
 	INIT_LIST_HEAD(&ui->node);
 	INIT_LIST_HEAD(&ui->scm_fles);
 	INIT_LIST_HEAD(&ui->ghost_node);
+	INIT_HLIST_NODE(&ui->hash);
 
 	return 0;
 }
@@ -2135,6 +2151,7 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 		list_add_tail(&ui->ghost_node, &unix_ghost_addr);
 	}
 
+	hlist_add_head(&ui->hash, &sk_info_hash[ui->ue->ino % SK_INFO_HASH_SIZE]);
 	list_add_tail(&ui->list, &unix_sockets);
 	return file_desc_add(&ui->d, ui->ue->id, &unix_desc_ops);
 }

From 55f71b8667043fb8241bc500a96c20644d478eba Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 23 Apr 2020 14:13:15 +0000
Subject: [PATCH 0259/1854] lib/c: add criu_get_version()

Although the CRIU version is exported in macros in version.h it only
contains the CRIU version of libcriu during build time.

As it is possible that CRIU is upgraded since the last time something
was built against libcriu, this adds functions to query the actual CRIU
binary about its version.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/c/criu.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/c/criu.h | 32 ++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index de57a65dc..d052f8d1f 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1668,3 +1668,68 @@ int criu_restore_child(void)
 {
 	return criu_local_restore_child(global_opts);
 }
+
+int criu_local_get_version(criu_opts *opts)
+{
+	int ret = -1;
+	CriuReq req	= CRIU_REQ__INIT;
+	CriuResp *resp	= NULL;
+
+	saved_errno = 0;
+
+	req.type	= CRIU_REQ_TYPE__VERSION;
+	req.opts	= opts->rpc;
+
+	ret = send_req_and_recv_resp(opts, &req, &resp);
+	if (ret)
+		goto exit;
+
+	if (resp->success) {
+		ret = resp->version->major_number * 10000;
+		ret += resp->version->minor_number * 100;
+		if (resp->version->has_sublevel)
+			ret += resp->version->sublevel;
+		if (resp->version->gitid) {
+			/* Taken from runc: a git release -> minor + 1 */
+			ret -= (ret % 100);
+			ret += 100;
+		}
+	} else {
+		ret = -EBADE;
+	}
+
+exit:
+	if (resp)
+		criu_resp__free_unpacked(resp, NULL);
+
+	swrk_wait(opts);
+
+	errno = saved_errno;
+
+	return ret;
+}
+
+int criu_get_version(void)
+{
+	return criu_local_get_version(global_opts);
+}
+
+int criu_local_check_version(criu_opts *opts, int minimum)
+{
+	int version;
+
+	version = criu_local_get_version(opts);
+
+	if (version < 0)
+		return version;
+
+	if (minimum <= version)
+		return 1;
+
+	return 0;
+}
+
+int criu_check_version(int minimum)
+{
+	return criu_local_check_version(global_opts, minimum);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 3a9204f5b..49f7a7005 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -158,6 +158,35 @@ int criu_restore_child(void);
 typedef void *criu_predump_info;
 int criu_dump_iters(int (*more)(criu_predump_info pi));
 
+/*
+ * Get the version of the actual binary used for RPC.
+ *
+ * As this library is just forwarding all tasks to an
+ * independent (of this library) CRIU binary, the actual
+ * version of the CRIU binary can be different then the
+ * hardcoded values in the libary (version.h).
+ * To be able to easily check the version of the CRIU binary
+ * the function criu_get_version() returns the version
+ * in the following format:
+ *
+ * (major * 10000) + (minor * 100) + sublevel
+ *
+ * If the CRIU binary has been built from a git checkout
+ * minor will increased by one.
+ */
+int criu_get_version(void);
+
+/*
+ * Check if the version of the CRIU binary is at least
+ * 'minimum'. Version has to be in the same format as
+ * described for criu_get_version().
+ *
+ * Returns 1 if CRIU is at least 'minimum'.
+ * Returns 0 if CRIU is too old.
+ * Returns < 0 if there was an error.
+ */
+int criu_check_version(int minimum);
+
 /*
  * Same as the list above, but lets you have your very own options
  * structure and lets you set individual options in it.
@@ -229,6 +258,9 @@ int criu_local_restore(criu_opts *opts);
 int criu_local_restore_child(criu_opts *opts);
 int criu_local_dump_iters(criu_opts *opts, int (*more)(criu_predump_info pi));
 
+int criu_local_get_version(criu_opts *opts);
+int criu_local_check_version(criu_opts *opts, int minimum);
+
 #ifdef __GNUG__
 }
 #endif

From 047ecd3a15f83b15535943c2c87e0c55b4866dd9 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 23 Apr 2020 14:28:00 +0000
Subject: [PATCH 0260/1854] test/others/libcriu: test version library calls

This adds the previously added libcriu version functions to the libcriu
tests.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/libcriu/lib.c       |  7 ++++++-
 test/others/libcriu/lib.h       |  1 +
 test/others/libcriu/test_self.c | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/test/others/libcriu/lib.c b/test/others/libcriu/lib.c
index 33aa4090d..0c7929cda 100644
--- a/test/others/libcriu/lib.c
+++ b/test/others/libcriu/lib.c
@@ -2,6 +2,8 @@
 #include <errno.h>
 #include <sys/wait.h>
 
+#include "criu.h"
+
 void what_err_ret_mean(int ret)
 {
 	/* NOTE: errno is set by libcriu */
@@ -44,4 +46,7 @@ int chk_exit(int status, int want)
 	return 1;
 }
 
-
+int get_version()
+{
+	printf("Using a CRIU binary with version %d\n", criu_get_version());
+}
diff --git a/test/others/libcriu/lib.h b/test/others/libcriu/lib.h
index 67b784bff..6fdf8aef2 100644
--- a/test/others/libcriu/lib.h
+++ b/test/others/libcriu/lib.h
@@ -1,2 +1,3 @@
 void what_err_ret_mean(int ret);
 int chk_exit(int status, int want);
+int get_version(void);
diff --git a/test/others/libcriu/test_self.c b/test/others/libcriu/test_self.c
index c9d2a2e64..374a4b545 100644
--- a/test/others/libcriu/test_self.c
+++ b/test/others/libcriu/test_self.c
@@ -2,6 +2,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
@@ -23,6 +24,18 @@ int main(int argc, char *argv[])
 
 	criu_init_opts();
 	criu_set_service_binary(argv[1]);
+
+	get_version();
+	if (!criu_check_version(31400)) {
+		printf("CRIU version check failed. CRIU too old\n");
+		return 1;
+	}
+
+	if (criu_check_version(INT_MAX)) {
+		printf("CRIU version check failed. CRIU too new.\n");
+		return 1;
+	}
+
 	criu_set_images_dir_fd(fd);
 	criu_set_log_level(4);
 

From d72428b7c4254c2e3587d8d84f16626302e7e111 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 23 Apr 2020 09:11:48 +0000
Subject: [PATCH 0261/1854] Also report clone3() errors correctly

Without clone3() CRIU was able to detect a process with a wrong PID only
in the already created child process. With clone3() this error can
happen before the process is created.

In the case of EEXIST this error will now be correctly forwarded to an
RPC client.

This was detected by running test/others/libcriu on a clone3() system.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/clone-noasan.c | 1 +
 criu/cr-restore.c   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/criu/clone-noasan.c b/criu/clone-noasan.c
index a2190ba0a..35c40c21d 100644
--- a/criu/clone-noasan.c
+++ b/criu/clone-noasan.c
@@ -70,6 +70,7 @@ int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags,
 	if (!(flags & CLONE_PARENT)) {
 		if (exit_signal != SIGCHLD) {
 			pr_err("Exit signal not SIGCHLD\n");
+			errno = EINVAL;
 			return -1;
 		}
 		c_args.exit_signal = exit_signal;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ec00bf71b..e44ba308d 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1439,6 +1439,8 @@ static inline int fork_with_pid(struct pstree_item *item)
 
 	if (ret < 0) {
 		pr_perror("Can't fork for %d", pid);
+		if (errno == EEXIST)
+			set_cr_errno(EEXIST);
 		goto err_unlock;
 	}
 

From cbf099400a24debe4eaf830bd81138bb73a46a00 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 8 Feb 2020 16:58:36 +0100
Subject: [PATCH 0262/1854] Travis: use Vagrant to run VMs

This adds the minimal configuration to run Fedora 31 based VMs on
Travis.

This can be used to test cgroupv2 based tests, tests with vdso=off and
probably much more which requires booting a newer kernel.

As an example this builds CRIU on Fedora 31 and reconfigures it to boot
without VDSO support and runs one single test.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml               |  1 +
 scripts/travis/Makefile   |  8 ++++++
 scripts/travis/vagrant.sh | 53 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100755 scripts/travis/vagrant.sh

diff --git a/.travis.yml b/.travis.yml
index e71afa0a3..8ada90193 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ env:
   - TR_ARCH=x86_64
   - TR_ARCH=x86_64      CLANG=1
   - TR_ARCH=openj9-test
+  - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
     - os: linux
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
index 17abb703a..1af60fe8d 100644
--- a/scripts/travis/Makefile
+++ b/scripts/travis/Makefile
@@ -64,5 +64,13 @@ podman-test:
 openj9-test: restart-docker
 	./openj9-test.sh
 
+setup-vagrant:
+	./vagrant.sh setup
+
+vagrant-fedora-no-vdso: setup-vagrant
+	./vagrant.sh fedora-no-vdso
+
+.PHONY: setup-vagrant vagrant-fedora-no-vdso
+
 %:
 	$(MAKE) -C ../build $@$(target-suffix)
diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
new file mode 100755
index 000000000..943a8b9a3
--- /dev/null
+++ b/scripts/travis/vagrant.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# This script is used to run vagrant based tests on Travis.
+# This script is started via sudo from .travis.yml
+
+set -e
+set -x
+
+VAGRANT_VERSION=2.2.7
+FEDORA_VERSION=31
+FEDORA_BOX_VERSION=31.20191023.0
+
+setup() {
+	apt-get -qq update
+	# Load the kvm modules for vagrant to use qemu
+	modprobe kvm kvm_intel
+
+	# Tar up the git checkout to have vagrant rsync it to the VM
+	tar cf criu.tar ../../../criu
+	wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_$(uname -m).deb -O /tmp/vagrant.deb && \
+		dpkg -i /tmp/vagrant.deb
+
+	apt-get -qq install -y libvirt-bin libvirt-dev qemu-utils qemu
+	systemctl restart libvirt-bin
+	vagrant plugin install vagrant-libvirt
+	vagrant init fedora/${FEDORA_VERSION}-cloud-base --box-version ${FEDORA_BOX_VERSION}
+	# The default libvirt Vagrant VM uses 512MB.
+	# Travis VMs should have around 7.5GB.
+	# Increasing it to 4GB should work.
+	sed -i Vagrantfile -e 's,^end$,  config.vm.provider :libvirt do |libvirt|'"\n"'    libvirt.memory = 4096;end'"\n"'end,g'
+	vagrant up --provider=libvirt
+	mkdir -p /root/.ssh
+	vagrant ssh-config >> /root/.ssh/config
+	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
+		libasan libcap-devel libnet-devel libnl3-devel make protobuf-c-devel \
+		protobuf-devel python3-flake8 python3-future python3-protobuf \
+		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel
+	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
+	ssh default sudo systemctl mask sssd
+	ssh default cat /proc/cmdline
+}
+
+fedora-no-vdso() {
+	ssh default sudo grubby --update-kernel ALL --args="vdso=0"
+	vagrant reload
+	ssh default cat /proc/cmdline
+	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
+	# Excluding the VDSO test as we are running without VDSO
+	# Excluding two cgroup tests which seem to fail because of cgroup2
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a -x zdtm/static/cgroup04 -x zdtm/static/cgroup_ifpriomap -x zdtm/static/vdso01 --keep-going'
+}
+
+$1

From 1d9438aefbd1609ee765f7e958b88883f402a662 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 28 Apr 2020 19:00:42 -0700
Subject: [PATCH 0263/1854] criu swrk: fix usage, allow common options

TL;DR: this makes possible -v with criu swrk, and removes showing usage
which is useless in swrk mode.

1. Since criu swrk command is not described in usage, there is no sense
   in showing it. Instead, show a one-line hint about how to use it.

2. In case some global options (like -v) are used, argv[1] might not
   point to "swrk". Use optind to point to a correct non-option
   argument.

3. While at it, also error out in case we have extra arguments.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/crtools.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 76172f350..b696898e7 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -100,12 +100,18 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	if (ret == 2)
 		goto usage;
+	if (optind >= argc) {
+		pr_err("command is required\n");
+		goto usage;
+	}
 
 	log_set_loglevel(opts.log_level);
 
-	if (!strcmp(argv[1], "swrk")) {
-		if (argc < 3)
-			goto usage;
+	if (optind < argc && !strcmp(argv[optind], "swrk")) {
+		if (argc != optind+2) {
+			fprintf(stderr, "Usage: criu swrk <fd>\n");
+			return 1;
+		}
 		/*
 		 * This is to start criu service worker from libcriu calls.
 		 * The usage is "criu swrk <fd>" and is not for CLI/scripts.
@@ -113,7 +119,7 @@ int main(int argc, char *argv[], char *envp[])
 		 * corresponding lib call change.
 		 */
 		opts.swrk_restore = true;
-		return cr_service_work(atoi(argv[2]));
+		return cr_service_work(atoi(argv[optind+1]));
 	}
 
 	if (check_options())
@@ -125,11 +131,6 @@ int main(int argc, char *argv[], char *envp[])
 	if (opts.work_dir == NULL)
 		SET_CHAR_OPTS(work_dir, opts.imgs_dir);
 
-	if (optind >= argc) {
-		pr_err("command is required\n");
-		goto usage;
-	}
-
 	has_sub_command = (argc - optind) > 1;
 
 	if (has_exec_cmd) {

From 6ee4b72382f72362ab746876cf32a70712eb89f9 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Mon, 18 May 2020 11:19:23 +0300
Subject: [PATCH 0264/1854] arch/x86: Fix calculation of xstate_size

The layout of xsave frame in a standart format is predefined by the hardware.
Lets make sure we're increasing in frame offsets and use latest offset where
appropriate.

https://github.com/checkpoint-restore/criu/issues/1042

Reported-by: Ashutosh Mehra <mehra.ashutosh@ibm.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 criu/arch/x86/crtools.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 9c8beeedd..bc8022535 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -437,6 +437,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 			void *from = xsave->member;					\
 			size_t size = pb_repeated_size(xsave, member);			\
 			size_t xsize = (size_t)compel_fpu_feature_size(feature);	\
+			size_t xstate_size_next = off + xsize;				\
 			if (xsize != size) {						\
 				if (size) {						\
 					pr_err("%s reported %zu bytes (expecting %zu)\n",\
@@ -448,7 +449,8 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 				}							\
 			}								\
 			xstate_bv |= (1UL << feature);					\
-			xstate_size += xsize;						\
+			BUG_ON(xstate_size > xstate_size_next);				\
+			xstate_size = xstate_size_next;					\
 			memcpy(to, from, size);						\
 		}									\
 	} while (0)
@@ -485,6 +487,11 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 			UserX86XsaveEntry *xsave = core->thread_info->fpregs->xsave;
 			uint8_t *extended_state_area = (void *)x;
 
+			/*
+			 * Note the order does matter here and bound
+			 * to the increasing offsets of XFEATURE_x
+			 * inside memory layout (xstate_size calculation).
+			 */
 			assign_xsave(XFEATURE_YMM,	xsave, ymmh_space,	extended_state_area);
 			assign_xsave(XFEATURE_BNDREGS,	xsave, bndreg_state,	extended_state_area);
 			assign_xsave(XFEATURE_BNDCSR,	xsave, bndcsr_state,	extended_state_area);

From 808684c99eb4c0cf12a5725cd6bbe3fea191273c Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Tue, 9 Jun 2020 16:52:10 +0300
Subject: [PATCH 0265/1854] Add CONTRIBUTING.md

Move the existing contribution guidelines to a dedicated file for future
extensions.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 CONTRIBUTING.md | 19 +++++++++++++++++++
 README.md       | 20 +++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..342619e88
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,19 @@
+[![master](https://travis-ci.org/checkpoint-restore/criu.svg?branch=master)](https://travis-ci.org/checkpoint-restore/criu)
+[![development](https://travis-ci.org/checkpoint-restore/criu.svg?branch=criu-dev)](https://travis-ci.org/checkpoint-restore/criu)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/55251ec7db28421da4481fc7c1cb0cee)](https://www.codacy.com/app/xemul/criu?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=xemul/criu&amp;utm_campaign=Badge_Grade)
+<p align="center"><img src="https://criu.org/w/images/1/1c/CRIU.svg" width="128px"/></p>
+
+## How to contribute to CRIU
+
+CRIU project is (almost) the never-ending story, because we have to always keep up with the
+Linux kernel supporting checkpoint and restore for all the features it provides. Thus we're
+looking for contributors of all kinds -- feedback, bug reports, testing, coding, writing, etc.
+Here are some useful hints to get involved.
+
+* We have both -- [very simple](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) and [more sophisticated](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+feature%22) coding tasks;
+* CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
+* Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
+* Feedback is expected on the github issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
+* We accept github pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [the devel list](http://criu.org/How_to_submit_patches);
+* Spread the word about CRIU in [social networks](http://criu.org/Contacts);
+* If you're giving a talk about CRIU -- let us know, we'll mention it on the [wiki main page](https://criu.org/News/events);
diff --git a/README.md b/README.md
index 6a578b953..d703638ec 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,11 @@ project is that it is mainly implemented in user space. There are some more proj
 doing C/R for Linux, and so far CRIU [appears to be](https://criu.org/Comparison_to_other_CR_projects) 
 the most feature-rich and up-to-date with the kernel.
 
+CRIU project is (almost) the never-ending story, because we have to always keep up with the
+Linux kernel supporting checkpoint and restore for all the features it provides. Thus we're
+looking for contributors of all kinds -- feedback, bug reports, testing, coding, writing, etc.
+Please refer to [CONTRIBUTING.md](CONTRIBUTING.md) if you would like to get involved.
+
 The project [started](https://criu.org/History) as the way to do live migration for OpenVZ
 Linux containers, but later grew to more sophisticated and flexible tool. It is currently 
 used by (integrated into) OpenVZ, LXC/LXD, Docker, and other software, project gets tremendous 
@@ -56,21 +61,6 @@ One of the CRIU features is the ability to save and restore state of a TCP socke
 without breaking the connection. This functionality is considered to be useful by
 itself, and we have it available as the [libsoccr library](https://criu.org/Libsoccr).
 
-## How to contribute
-
-CRIU project is (almost) the never-ending story, because we have to always keep up with the
-Linux kernel supporting checkpoint and restore for all the features it provides. Thus we're
-looking for contributors of all kinds -- feedback, bug reports, testing, coding, writing, etc.
-Here are some useful hints to get involved.
-
-* We have both -- [very simple](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) and [more sophisticated](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+feature%22) coding tasks;
-* CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
-* Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
-* Feedback is expected on the github issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
-* We accept github pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [the devel list](http://criu.org/How_to_submit_patches);
-* Spread the word about CRIU in [social networks](http://criu.org/Contacts);
-* If you're giving a talk about CRIU -- let us know, we'll mention it on the [wiki main page](https://criu.org/News/events);
-
 ## Licence
 
 The project is licensed under GPLv2 (though files sitting in the lib/ directory are LGPLv2.1).

From d0fcb01d47de8d5c659cc09d0ab5d994d10b5ffa Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Tue, 9 Jun 2020 16:52:11 +0300
Subject: [PATCH 0266/1854] CONTRIBUTING.md: import "How to submit patches"
 from criu.org

Import "How to submit patches" article from CRIU wiki and update its
format to match GitHub markdown.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 CONTRIBUTING.md | 200 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 199 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 342619e88..edb7ecb48 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,6 +14,204 @@ Here are some useful hints to get involved.
 * CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
 * Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
 * Feedback is expected on the github issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
-* We accept github pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [the devel list](http://criu.org/How_to_submit_patches);
+* We accept github pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [CRIU development mailing list](https://lists.openvz.org/mailman/listinfo/criu).
+Below we describe in more detail recommend practices for CRIU developemnt.
 * Spread the word about CRIU in [social networks](http://criu.org/Contacts);
 * If you're giving a talk about CRIU -- let us know, we'll mention it on the [wiki main page](https://criu.org/News/events);
+
+### Seting up the developemnt environment
+
+Although criu could be run as non-root (see [Security](https://criu.org/Security), development is better to be done as root. For example, some tests require root. So, it would be a good idea to set up some recent Linux distro on a virtual machine.
+
+### Get the source code
+
+The CRIU sources are tracked by Git. Official CRIU repo is at https://github.com/checkpoint-restore/criu.
+
+The repository may contain multiple branches. Development happens in the **criu-dev** branch.
+
+To clone CRIU repo and switch to the proper branch, run:
+
+```
+        git clone https://github.com/checkpoint-restore/criu criu
+        cd criu
+        git checkout criu-dev
+```
+
+### Compile
+
+First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info.
+
+To compile CRIU, run:
+
+```
+        make
+```
+
+This should create the `./criu/criu` executable.
+
+## Edit the source code
+
+If you use ctags, you can generate the ctags file by running
+
+```
+        make tags
+```
+
+When you change the source code, please keep in mind the following code conventions:
+
+* we prefer tabs and indentations to be 8 characters width
+* CRIU mostly follows [Linux kernel coding style](https://www.kernel.org/doc/Documentation/process/coding-style.rst), but we are less strict than the kernel community.
+
+Other conventions can be learned from the source code itself. In short, make sure your new code
+looks similar to what is already there.
+
+## Test your changes
+
+CRIU comes with an extensive test suite. To check whether your changes introduce any regressions, run
+
+```
+         make test
+```
+
+The command runs [ZDTM Test Suite](https://criu.org/ZDTM_Test_Suite). Check for any error messages produced by it.
+
+In case you'd rather have someone else run the tests, you can use travis-ci for your
+own github fork of CRIU. It will check the compilation for various supported platforms,
+as well as run most of the tests from the suite. See https://travis-ci.org/checkpoint-restore/criu
+for more details.
+
+## Sign your work
+
+To improve tracking of who did what, we ask you to sign off the patches
+that are to be emailed.
+
+The sign-off is a simple line at the end of the explanation for the
+patch, which certifies that you wrote it or otherwise have the right to
+pass it on as an open-source patch.  The rules are pretty simple: if you
+can certify the below:
+
+### Developer's Certificate of Origin 1.1
+    By making a contribution to this project, I certify that:
+
+    (a) The contribution was created in whole or in part by me and I
+        have the right to submit it under the open source license
+        indicated in the file; or
+
+    (b) The contribution is based upon previous work that, to the best
+        of my knowledge, is covered under an appropriate open source
+        license and I have the right under that license to submit that
+        work with modifications, whether created in whole or in part
+        by me, under the same open source license (unless I am
+        permitted to submit under a different license), as indicated
+        in the file; or
+
+    (c) The contribution was provided directly to me by some other
+        person who certified (a), (b) or (c) and I have not modified
+        it.
+
+    (d) I understand and agree that this project and the contribution
+        are public and that a record of the contribution (including all
+        personal information I submit with it, including my sign-off) is
+        maintained indefinitely and may be redistributed consistent with
+        this project or the open source license(s) involved.
+
+then you just add a line saying
+
+```
+        Signed-off-by: Random J Developer <random at developer.example.org>
+```
+
+using your real name (please, no pseudonyms or anonymous contributions if
+it possible).
+
+Hint: you can use `git commit -s` to add Signed-off-by line to your
+commit message. To append such line to a commit you already made, use
+`git commit --amend -s`.
+
+```
+ From: Random J Developer <random at developer.example.org>
+ Subject: [PATCH] Short patch description
+
+ Long patch description (could be skipped if patch
+ is trivial enough)
+
+ Signed-off-by: Random J Developer <random at developer.example.org>
+ ---
+ Patch body here
+```
+
+## Submit your work upstream
+
+We accept github pull requests and this is the preferred way to contribute to CRIU.
+For that you should push your work to your fork of CRIU at [GitHub](https://github.com) and create a [pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)
+
+Historically, CRIU worked with mailing lists and patches so if you still prefer this way continue reading till the end of this section.
+
+### Make a patch
+
+To create a patch, run
+
+```
+    git format-patch --signoff origin/criu-dev
+```
+
+You might need to read GIT documentation on how to prepare patches
+for mail submission. Take a look at http://book.git-scm.com/ and/or
+http://git-scm.com/documentation for details. It should not be hard
+at all.
+
+We recommend to post patches using `git send-email`
+
+```
+  git send-email --cover-letter --no-chain-reply-to --annotate \
+                 --confirm=always --to=criu@openvz.org criu-dev
+```
+
+Note that the `git send-email` subcommand may not be in
+the main git package and using it may require installation of a
+separate package, for example the "git-email" package in Fedora and
+Debian.
+
+If this is your first time using git send-email, you might need to
+configure it to point it to your SMTP server with something like:
+
+```
+    git config --global sendemail.smtpServer stmp.example.net
+```
+
+If you get tired of typing `--to=criu@openvz.org` all the time,
+you can configure that to be automatically handled as well:
+
+```
+    git config sendemail.to criu@openvz.org
+```
+
+If a developer is sending another version of the patch (e.g. to address
+review comments), they are advised to note differences to previous versions
+after the `---` line in the patch so that it helps reviewers but
+doesn't become part of git history. Moreover, such patch needs to be prefixed
+correctly with `--subject-prefix=PATCHv2` appended to
+`git send-email` (substitute `v2` with the correct
+version if needed though).
+
+### Mail patches
+
+The patches should be sent to CRIU development mailing list, `criu AT openvz.org`. Note that you need to be subscribed first in order to post. The list web interface is available at https://openvz.org/mailman/listinfo/criu; you can also use standard mailman aliases to work with it.
+
+Please make sure the email client you're using doesn't screw your patch (line wrapping and so on).
+
+{{Note| When sending a patch set that consists of more than one patch, please, push your changes in your local repo and provide the URL of the branch in the cover-letter}}
+
+### Wait for response
+
+Be patient. Most CRIU developers are pretty busy people so if
+there is no immediate response on your patch — don't be surprised,
+sometimes a patch may fly around a week before it gets reviewed.
+
+## Continuous integration
+
+Wiki article: [Continuous integration](https://criu.org/Continuous_integration)
+
+CRIU tests are run for each series sent to the mailing list. If you get a message from our patchwork that patches failed to pass the tests, you have to investigate what is wrong.
+
+We also recommend you to [enable Travis CI for your repo](https://criu.org/Continuous_integration#Enable_Travis_CI_for_your_repo) to check patches in your git branch, before sending them to the mailing list.

From 2e5805878bbf1f80b2297b4b60a6859d15055142 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 14 Jun 2020 09:31:15 +0300
Subject: [PATCH 0267/1854] CONTRIBUTING.md: minor formatting fixes

* Mark lowcase criu as code in the environment section
* Add missing brace around the reference to https://criu.org/Secrity
* Fixup an admolition block that GitHub cannot render
* Spelling fixups
* s/github/GitHub/g

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 CONTRIBUTING.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index edb7ecb48..de4f3e1ea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,15 +13,15 @@ Here are some useful hints to get involved.
 * We have both -- [very simple](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) and [more sophisticated](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+feature%22) coding tasks;
 * CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
 * Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
-* Feedback is expected on the github issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
-* We accept github pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [CRIU development mailing list](https://lists.openvz.org/mailman/listinfo/criu).
-Below we describe in more detail recommend practices for CRIU developemnt.
+* Feedback is expected on the GitHub issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
+* We accept GitHub pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [CRIU development mailing list](https://lists.openvz.org/mailman/listinfo/criu).
+Below we describe in more detail recommend practices for CRIU development.
 * Spread the word about CRIU in [social networks](http://criu.org/Contacts);
 * If you're giving a talk about CRIU -- let us know, we'll mention it on the [wiki main page](https://criu.org/News/events);
 
-### Seting up the developemnt environment
+### Setting up the development environment
 
-Although criu could be run as non-root (see [Security](https://criu.org/Security), development is better to be done as root. For example, some tests require root. So, it would be a good idea to set up some recent Linux distro on a virtual machine.
+Although `criu` could be run as non-root (see [Security](https://criu.org/Security)), development is better to be done as root. For example, some tests require root. So, it would be a good idea to set up some recent Linux distro on a virtual machine.
 
 ### Get the source code
 
@@ -76,14 +76,14 @@ CRIU comes with an extensive test suite. To check whether your changes introduce
 The command runs [ZDTM Test Suite](https://criu.org/ZDTM_Test_Suite). Check for any error messages produced by it.
 
 In case you'd rather have someone else run the tests, you can use travis-ci for your
-own github fork of CRIU. It will check the compilation for various supported platforms,
+own GitHub fork of CRIU. It will check the compilation for various supported platforms,
 as well as run most of the tests from the suite. See https://travis-ci.org/checkpoint-restore/criu
 for more details.
 
 ## Sign your work
 
-To improve tracking of who did what, we ask you to sign off the patches
-that are to be emailed.
+To improve tracking of who did what, we ask you to sign off the commits in
+your fork of CRIU or the patches that are to be emailed.
 
 The sign-off is a simple line at the end of the explanation for the
 patch, which certifies that you wrote it or otherwise have the right to
@@ -142,7 +142,7 @@ commit message. To append such line to a commit you already made, use
 
 ## Submit your work upstream
 
-We accept github pull requests and this is the preferred way to contribute to CRIU.
+We accept GitHub pull requests and this is the preferred way to contribute to CRIU.
 For that you should push your work to your fork of CRIU at [GitHub](https://github.com) and create a [pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)
 
 Historically, CRIU worked with mailing lists and patches so if you still prefer this way continue reading till the end of this section.
@@ -200,7 +200,7 @@ The patches should be sent to CRIU development mailing list, `criu AT openvz.org
 
 Please make sure the email client you're using doesn't screw your patch (line wrapping and so on).
 
-{{Note| When sending a patch set that consists of more than one patch, please, push your changes in your local repo and provide the URL of the branch in the cover-letter}}
+>  **Note:** When sending a patch set that consists of more than one patch, please, push your changes in your local repo and provide the URL of the branch in the cover-letter
 
 ### Wait for response
 

From 35f8c056ac49ab62b8575a2d1f04cbbd94ccff5b Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 14 Jun 2020 11:22:19 +0300
Subject: [PATCH 0268/1854] CONTRIBUTING.md: add sections about patch
 description and splitting

Shamelessly stolen from the Linux kernel [1], shortened a bit and
relaxed to match CRIU.

[1] https://www.kernel.org/doc/html/latest/process/submitting-patches.html

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 CONTRIBUTING.md | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index de4f3e1ea..1c731b7f8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -80,6 +80,77 @@ own GitHub fork of CRIU. It will check the compilation for various supported pla
 as well as run most of the tests from the suite. See https://travis-ci.org/checkpoint-restore/criu
 for more details.
 
+## Describe your changes
+
+Describe your problem.  Whether your change is a one-line bug fix or
+5000 lines of a new feature, there must be an underlying problem that
+motivated you to do this work.  Convince the reviewer that there is a
+problem worth fixing and that it makes sense for them to read past the
+first paragraph.
+
+Once the problem is established, describe what you are actually doing
+about it in technical detail. It's important to describe the change
+in plain English for the reviewer to verify that the code is behaving
+as you intend it to.
+
+Solve only one problem per commit. If your description starts to get
+long, that's a sign that you probably need to split up your commit.
+See [Separate your changes](#separate-your-changes).
+
+Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
+instead of "[This commit] makes xyzzy do frotz" or "[I] changed xyzzy
+to do frotz", as if you are giving orders to the codebase to change
+its behaviour.
+
+If your change fixes a bug in a specific commit, e.g. you found an issue using
+`git bisect`, please use the `Fixes:` tag with the abbreviation of
+the SHA-1 ID, and the one line summary. For example:
+
+```
+	Fixes: 9433b7b9db3e ("make: use cflags/ldflags for config.h detection mechanism")
+```
+
+The following `git config` settings can be used to add a pretty format for
+outputting the above style in the `git log` or `git show` commands:
+
+```
+	[pretty]
+		fixes = Fixes: %h (\"%s\")
+```
+
+If your change address an issue listed in GitHub, please use `Fixes:` tag with the number of the issue. For instance:
+
+```
+	Fixes: #339
+```
+
+You may refer to [How to Write a Git Commit
+Message](https://chris.beams.io/posts/git-commit/) article for
+recommendations for good commit message.
+
+## Separate your changes
+
+Separate each **logical change** into a separate commit.
+
+For example, if your changes include both bug fixes and performance
+enhancements for a single driver, separate those changes into two
+or more commits.  If your changes include an API update, and a new
+driver which uses that new API, separate those into two commits.
+
+On the other hand, if you make a single change to numerous files,
+group those changes into a single commit.  Thus a single logical change
+is contained within a single commit.
+
+The point to remember is that each commit should make an easily understood
+change that can be verified by reviewers.  Each commit should be justifiable
+on its own merits.
+
+When dividing your change into a series of commits, take special care to
+ensure that CRIU builds and runs properly after each commit in the
+series.  Developers using `git bisect` to track down a problem can end up
+splitting your patch series at any point; they will not thank you if you
+introduce bugs in the middle.
+
 ## Sign your work
 
 To improve tracking of who did what, we ask you to sign off the commits in

From 6815aa958d1ac01f0dd0c81d55475d44aabfff88 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 14 Jun 2020 11:26:14 +0300
Subject: [PATCH 0269/1854] CONTRIBUTING.md: add pull request guidelines

Following the discussion at [1] describe best practices for pull request
creation.

[1] https://github.com/checkpoint-restore/criu/pull/1096

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 CONTRIBUTING.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c731b7f8..d40f0014c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -216,6 +216,44 @@ commit message. To append such line to a commit you already made, use
 We accept GitHub pull requests and this is the preferred way to contribute to CRIU.
 For that you should push your work to your fork of CRIU at [GitHub](https://github.com) and create a [pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)
 
+### Pull request guidelines
+
+Pull request comment should contain description of the problem your changes
+solve and a brief outline of the changes included in the pull request.
+
+Please avoid pushing fixup commits to an existent pull request. Each commit
+should be self contained and there should not be fixup commits in a patch
+series. Pull requests that contain one commit which breaks something
+and another commit which fixes it, will be rejected.
+
+Please merge the fixup commits into the commits that has introduced the
+problem before creating a pull request.
+
+It may happen that the reviewers were not completely happy with your
+changes and requested changes to your patches. After you updated your
+changes please close the old pull request and create a new one that
+contains the following:
+
+* Description of the problem your changes solve and a brief outline of the
+  changes
+* Link to the previous version of the pull request
+* Brief description of the changes between old and new versions of the pull
+  request. If there were more than one previous pull request, all the
+  revisions should be listed. For example:
+
+```
+	v3: rebase on the current criu-dev
+	v2: add commit to foo() and update bar() coding style
+```
+
+If there are only minor updates to the commits in a pull request, it is
+possible to force-push them into an existing pull request. This only applies
+to small changes and should be used with care. If you update an existing
+pull request, remember to add the description of the changes from the
+previous version.
+
+### Mailing list submission
+
 Historically, CRIU worked with mailing lists and patches so if you still prefer this way continue reading till the end of this section.
 
 ### Make a patch

From ce22e0f37dfce44bcdd6c9b8a94713441f139158 Mon Sep 17 00:00:00 2001
From: Angie Ni <avtni@google.com>
Date: Thu, 4 Jun 2020 11:24:23 -0600
Subject: [PATCH 0270/1854] uffd: uffd_open prints info, caller prints error

When uffd_open is called from kerndat_uffd, userfaultfd failure is not
considered an error, so the goal is to suppress the error message --
instead, we print this message as info.

If the function fails, it is the responsibility of the caller
to print the error message.

Signed-off-by: Angie Ni <avtni@google.com>
---
 criu/uffd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index 33b34ba25..5f4c15a60 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -269,7 +269,7 @@ int uffd_open(int flags, unsigned long *features)
 
 	uffd = syscall(SYS_userfaultfd, flags);
 	if (uffd == -1) {
-		pr_perror("Lazy pages are not available");
+		pr_info("Lazy pages are not available: %s\n", strerror(errno));
 		return -errno;
 	}
 

From 41b535d312828eac6fd79481d04abe20163b0cc8 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 16 Jun 2020 14:26:06 +0000
Subject: [PATCH 0271/1854] test: skip vdso test on non-vdso systems

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/vagrant.sh         | 3 +--
 test/zdtm/static/vdso01.checkskip | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100755 test/zdtm/static/vdso01.checkskip

diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
index 943a8b9a3..46740efc3 100755
--- a/scripts/travis/vagrant.sh
+++ b/scripts/travis/vagrant.sh
@@ -45,9 +45,8 @@ fedora-no-vdso() {
 	vagrant reload
 	ssh default cat /proc/cmdline
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
-	# Excluding the VDSO test as we are running without VDSO
 	# Excluding two cgroup tests which seem to fail because of cgroup2
-	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a -x zdtm/static/cgroup04 -x zdtm/static/cgroup_ifpriomap -x zdtm/static/vdso01 --keep-going'
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a -x zdtm/static/cgroup04 -x zdtm/static/cgroup_ifpriomap --keep-going'
 }
 
 $1
diff --git a/test/zdtm/static/vdso01.checkskip b/test/zdtm/static/vdso01.checkskip
new file mode 100755
index 000000000..a00df6231
--- /dev/null
+++ b/test/zdtm/static/vdso01.checkskip
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep -q "\[vdso\]" /proc/self/maps

From d38046b0035d977f44f99d68bb5e3c3d4fb4fd9a Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date: Sat, 22 Jul 2017 11:33:12 +0300
Subject: [PATCH 0272/1854] mount: restore_task_mnt_ns - Lookup for mount
 namespace conditionally

In case if our parent is a dead task (zombie) we should lookup
for parent ids which will be inherited on restore. Otherwise
parent->ids may be nil and SIGSEGV produced.

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>

Rework and port from vzcriu:
87b320964 ("vz7: mount: restore_task_mnt_ns - Lookup for mount namespace
conditionally")

Fixes: #1066

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 89b8cff59..a0b8b2e06 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3094,19 +3094,19 @@ int restore_task_mnt_ns(struct pstree_item *current)
 		return 0;
 
 	if (current->ids && current->ids->has_mnt_ns_id) {
+		struct pstree_item *parent = current->parent;
 		unsigned int id = current->ids->mnt_ns_id;
 		struct ns_id *nsid;
 
-		/*
-		 * Regardless of the namespace a task wants to
-		 * live in, by that point they all will live in
-		 * root's one (see prepare_pstree_kobj_ids() +
-		 * get_clone_mask()). So if the current task's
-		 * target namespace is the root's one -- it's
-		 * already there, otherwise it will have to do
-		 * setns().
+		/* Zombies and helpers can have ids == 0 so we skip them */
+		while (parent && !parent->ids)
+			parent = parent->parent;
+
+		/**
+		 * Our parent had restored the mount namespace before forking
+		 * us and if we have the same mntns we just stay there.
 		 */
-		if (current->parent && id == current->parent->ids->mnt_ns_id)
+		if (parent && id == parent->ids->mnt_ns_id)
 			return 0;
 
 		nsid = lookup_ns_by_id(id, &mnt_ns_desc);

From f0438f47f28d73a75e0fff4c74ee50f80b0c70d1 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 22 Jun 2020 18:50:55 +0300
Subject: [PATCH 0273/1854] cgroup: make prepare_task_cgroup lookup current
 cgset in ancestors

In case if our parent is a dead task (zombie) or a helper which in it's
turn has zombie parent, and parent thus has zero cg_set we should look
for current cgset deeper.

Fixes: #1066

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cgroup.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index d4c712167..3737772df 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1210,14 +1210,19 @@ static int move_in_cgroup(CgSetEntry *se, bool setup_cgns)
 
 int prepare_task_cgroup(struct pstree_item *me)
 {
+	struct pstree_item *parent = me->parent;
 	CgSetEntry *se;
 	u32 current_cgset;
 
 	if (!rsti(me)->cg_set)
 		return 0;
 
-	if (me->parent)
-		current_cgset = rsti(me->parent)->cg_set;
+	/* Zombies and helpers can have cg_set == 0 so we skip them */
+	while (parent && !rsti(parent)->cg_set)
+		parent = parent->parent;
+
+	if (parent)
+		current_cgset = rsti(parent)->cg_set;
 	else
 		current_cgset = root_cg_set;
 

From 99c84878374e90e52ed1723f12564a5d16b1281d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 22 Jun 2020 14:20:29 +0300
Subject: [PATCH 0274/1854] zdtm: add zombie_leader test

Create a session leader and it's child - session member, make leader
zombie. To restore this criu will need to create a helper task a child
of our zombie so that member can inherit session. Before fixes in this
patchset we segfault on empty ids and fail to restore cgroups because of
empty cg_set

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile           |  1 +
 test/zdtm/static/zombie_leader.c    | 83 +++++++++++++++++++++++++++++
 test/zdtm/static/zombie_leader.desc |  1 +
 3 files changed, 85 insertions(+)
 create mode 100644 test/zdtm/static/zombie_leader.c
 create mode 100644 test/zdtm/static/zombie_leader.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 7d72673c3..45a0df784 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -229,6 +229,7 @@ TST_NOFILE	:=				\
 		time				\
 		timens_nested			\
 		timens_for_kids			\
+		zombie_leader			\
 #		jobctl00			\
 
 ifneq ($(ARCH),arm)
diff --git a/test/zdtm/static/zombie_leader.c b/test/zdtm/static/zombie_leader.c
new file mode 100644
index 000000000..d94b2af04
--- /dev/null
+++ b/test/zdtm/static/zombie_leader.c
@@ -0,0 +1,83 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check non-empty session with zombie leader";
+const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+int child(void)
+{
+	while (1)
+		sleep(1);
+
+	return 0;
+}
+
+int zombie_leader(int *cpid)
+{
+	int pid;
+
+	setsid();
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("Failed to fork child");
+		return 1;
+	} else if (pid == 0) {
+		exit(child());
+	}
+
+	*cpid = pid;
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	int ret = -1, status;
+	int pid, *cpid;
+	siginfo_t infop;
+
+	test_init(argc, argv);
+
+	cpid = (int *)mmap(NULL, sizeof(int), PROT_READ | PROT_WRITE,
+			   MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	*cpid = 0;
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("Failed to fork zombie");
+		return 1;
+	} else if (pid == 0) {
+		exit(zombie_leader(cpid));
+	}
+
+	if (waitid(P_PID, pid, &infop, WNOWAIT | WEXITED) < 0) {
+		pr_perror("Failed to waitid zombie");
+		goto err;
+	}
+
+	if (!*cpid) {
+		pr_err("Don't know grand child's pid");
+		goto err;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = 0;
+err:
+	waitpid(pid, &status, 0);
+
+	if (*cpid)
+		kill(*cpid, SIGKILL);
+
+	if (!ret)
+		pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/zombie_leader.desc b/test/zdtm/static/zombie_leader.desc
new file mode 100644
index 000000000..6c4afe5f0
--- /dev/null
+++ b/test/zdtm/static/zombie_leader.desc
@@ -0,0 +1 @@
+{'flavor': 'ns uns'}

From 4e7ec3c88b518e7bbf986228bb822bed6869ad9c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 5 May 2020 14:53:08 +0000
Subject: [PATCH 0275/1854] pidns: add pidns image file definition

TODO: create correct magic

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/image-desc.c            | 1 +
 criu/include/image-desc.h    | 1 +
 criu/include/magic.h         | 1 +
 criu/include/protobuf-desc.h | 1 +
 criu/protobuf-desc.c         | 1 +
 images/Makefile              | 1 +
 images/pidns.proto           | 5 +++++
 lib/py/images/images.py      | 1 +
 8 files changed, 12 insertions(+)
 create mode 100644 images/pidns.proto

diff --git a/criu/image-desc.c b/criu/image-desc.c
index 617b95355..c9581f5b8 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -103,6 +103,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(NETNF_EXP,	"netns-exp-%u"),
 	FD_ENTRY(FILES,		"files"),
 	FD_ENTRY(TIMENS,	"timens-%u"),
+	FD_ENTRY(PIDNS,		"pidns-%u"),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 6283a576d..e37d535c2 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -27,6 +27,7 @@ enum {
 	CR_FD_MNTS,
 	CR_FD_USERNS,
 	CR_FD_TIMENS,
+	CR_FD_PIDNS,
 
 	_CR_FD_IPCNS_FROM,
 	CR_FD_IPC_VAR,
diff --git a/criu/include/magic.h b/criu/include/magic.h
index d078ec422..ac5cd8033 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -96,6 +96,7 @@
 #define FILES_MAGIC		0x56303138 /* Toropets */
 #define MEMFD_INODE_MAGIC	0x48453499 /* Dnipro */
 #define TIMENS_MAGIC		0x43114433 /* Beslan */
+#define PIDNS_MAGIC		0x12345678
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 43d961731..46f7f8cea 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -66,6 +66,7 @@ enum {
 	PB_TIMENS,
 	PB_IMG_STREAMER_REQUEST,
 	PB_IMG_STREAMER_REPLY,
+	PB_PIDNS,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index 13655264a..223a6149f 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -38,6 +38,7 @@
 #include "images/timer.pb-c.h"
 #include "images/utsns.pb-c.h"
 #include "images/timens.pb-c.h"
+#include "images/pidns.pb-c.h"
 #include "images/ipc-var.pb-c.h"
 #include "images/ipc-shm.pb-c.h"
 #include "images/ipc-msg.pb-c.h"
diff --git a/images/Makefile b/images/Makefile
index 5458e4679..9ce7198c0 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -55,6 +55,7 @@ proto-obj-y	+= rpc.o
 proto-obj-y	+= ext-file.o
 proto-obj-y	+= cgroup.o
 proto-obj-y	+= userns.o
+proto-obj-y	+= pidns.o
 proto-obj-y	+= google/protobuf/descriptor.o # To make protoc-c happy and compile opts.proto
 proto-obj-y	+= opts.o
 proto-obj-y	+= seccomp.o
diff --git a/images/pidns.proto b/images/pidns.proto
new file mode 100644
index 000000000..7ff049749
--- /dev/null
+++ b/images/pidns.proto
@@ -0,0 +1,5 @@
+syntax = "proto2";
+
+message pidns_entry {
+	optional string ext_key		= 1;
+}
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index ca6f207bb..7faefbb96 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -467,6 +467,7 @@ handlers = {
     'CREDS': entry_handler(pb.creds_entry),
     'UTSNS': entry_handler(pb.utsns_entry),
     'TIMENS': entry_handler(pb.timens_entry),
+    'PIDNS': entry_handler(pb.pidns_entry),
     'IPC_VAR': entry_handler(pb.ipc_var_entry),
     'FS': entry_handler(pb.fs_entry),
     'GHOST_FILE': ghost_file_handler(),

From f1e6b103692e20a031fde1257193aab3d1f45ef4 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 5 May 2020 15:16:19 +0000
Subject: [PATCH 0276/1854] pidns: write and read pidns information

This loads and stores the key for an external PID namespace if specified
by the user using: --external pid[<inode>]:<label>

Preparation for restoring into existing PID namespaces.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/namespaces.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++
 criu/pstree.c     |  4 +++
 2 files changed, 83 insertions(+)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 04f242505..3ddf07be8 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -32,6 +32,7 @@
 #include "util.h"
 #include "images/ns.pb-c.h"
 #include "images/userns.pb-c.h"
+#include "images/pidns.pb-c.h"
 
 static struct ns_desc *ns_desc_array[] = {
 	&net_ns_desc,
@@ -46,6 +47,8 @@ static struct ns_desc *ns_desc_array[] = {
 
 static unsigned int join_ns_flags;
 
+static int collect_pid_namespaces(bool);
+
 int check_namespace_opts(void)
 {
 	errno = EINVAL;
@@ -1563,6 +1566,10 @@ int collect_namespaces(bool for_dump)
 	if (ret < 0)
 		return ret;
 
+	ret = collect_pid_namespaces(for_dump);
+	if (ret < 0)
+		return ret;
+
 	return 0;
 }
 
@@ -1754,6 +1761,35 @@ out:
 	return ret;
 }
 
+static int read_pid_ns_img(void)
+{
+	struct ns_id *ns;
+	PidnsEntry *e;
+
+	for (ns = ns_ids; ns != NULL; ns = ns->next) {
+		struct cr_img *img;
+		int ret;
+
+		if (ns->nd != &pid_ns_desc)
+			continue;
+
+		img = open_image(CR_FD_PIDNS, O_RSTR, ns->id);
+		if (!img)
+			return -1;
+
+		ret = pb_read_one_eof(img, &e, PB_PIDNS);
+		close_image(img);
+		if (ret < 0) {
+			pr_err("Can not read pidns object\n");
+			return -1;
+		}
+		if (ret > 0)
+			ns->ext_key = e->ext_key;
+	}
+
+	return 0;
+}
+
 int prepare_namespace_before_tasks(void)
 {
 	if (start_usernsd())
@@ -1771,6 +1807,9 @@ int prepare_namespace_before_tasks(void)
 	if (read_net_ns_img())
 		goto err_img;
 
+	if (read_pid_ns_img())
+		goto err_img;
+
 	return 0;
 
 err_img:
@@ -1788,3 +1827,43 @@ err_unds:
 
 struct ns_desc pid_ns_desc = NS_DESC_ENTRY(CLONE_NEWPID, "pid");
 struct ns_desc user_ns_desc = NS_DESC_ENTRY(CLONE_NEWUSER, "user");
+
+static int collect_pid_ns(struct ns_id *ns, void *oarg)
+{
+	PidnsEntry e = PIDNS_ENTRY__INIT;
+	struct cr_img *img;
+	int ret;
+	char id[64], *val;
+
+	pr_info("Collecting pidns %d/%d\n", ns->id, ns->ns_pid);
+
+	snprintf(id, sizeof(id), "pid[%u]", ns->kid);
+	val = external_lookup_by_key(id);
+	if (PTR_RET(val))
+		return 0;
+
+	/*
+	 * Only if the user marked the PID namespace as external
+	 * via --external pid[<inode>]:<label> the pidns
+	 * image is written.
+	 */
+
+	pr_debug("The %s pidns is external\n", id);
+	ns->ext_key = e.ext_key = val;
+
+	img = open_image(CR_FD_PIDNS, O_DUMP, ns->id);
+	if (!img)
+		return -1;
+	ret = pb_write_one(img, &e, PB_PIDNS);
+	close_image(img);
+
+	return ret;
+}
+
+static int collect_pid_namespaces(bool for_dump)
+{
+	if (!for_dump)
+		return 0;
+
+	return walk_namespaces(&pid_ns_desc, collect_pid_ns, NULL);
+}
diff --git a/criu/pstree.c b/criu/pstree.c
index 5de367688..f9478bb0a 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -494,6 +494,10 @@ static int read_pstree_ids(struct pstree_item *pi)
 		if (rst_add_ns_id(pi->ids->net_ns_id, pi, &net_ns_desc))
 			return -1;
 	}
+	if (pi->ids->has_pid_ns_id) {
+		if (rst_add_ns_id(pi->ids->pid_ns_id, pi, &pid_ns_desc))
+			return -1;
+	}
 
 	return 0;
 }

From 9dd1ab00e75ec425e09562d54a00f03c17a374c6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 5 May 2020 15:45:25 +0000
Subject: [PATCH 0277/1854] pidns: support external PID namespaces

This allows CRIU to restore a process into an existing PID namespace.
During checkpointing the PID namespace can be marked as external using:

   --external pid[<inode>]:<label>

This can be the host PID namespace or any other PID namespace.

During restore a process can be restored into an existing PID namespace
using:

  --inherit-fd fd[<FD>]:<label>

The <label> has to be the same for checkpoint and restore. CRIU uses
the <label> to know which resource the user means.

A process can start in the host PID namespace and can be moved to
another namespace or the other way around. Any PID namespace can be
used.

This is necessary to checkpoint containers in a POD which share certain
namespaces and this code to support external PID namespaces is the first
step towards checkpointing and restoring containers which belong to a
POD.

This is not using the --join-ns functionality as it is not possible to
move existing process to a PID namespace using setns(). Only child
process will be created in the PID namespace and that is why setns()
needs to be called before clone().

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-restore.c | 124 +++++++++++++++++++++++++++++++++++++---------
 criu/namespaces.c |  31 ++++++++++--
 2 files changed, 129 insertions(+), 26 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index e44ba308d..d6035d61e 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1335,9 +1335,32 @@ static bool needs_prep_creds(struct pstree_item *item)
 	return (!item->parent && ((root_ns_mask & CLONE_NEWUSER) || getuid()));
 }
 
+static int write_ns_last_pid(pid_t pid)
+{
+	char buf[32];
+	int len;
+	int fd;
+
+	fd = open_proc_rw(PROC_GEN, LAST_PID_PATH);
+	if (fd < 0)
+		return -1;
+
+	len = snprintf(buf, sizeof(buf), "%d", pid - 1);
+	if (write(fd, buf, len) != len) {
+		pr_perror("%d: Write %s to %s", pid, buf,
+			LAST_PID_PATH);
+		close(fd);
+		return -1;
+	}
+	close(fd);
+	return 0;
+}
+
 static inline int fork_with_pid(struct pstree_item *item)
 {
+	unsigned long clone_flags;
 	struct cr_clone_arg ca;
+	struct ns_id *pid_ns = NULL;
 	int ret = -1;
 	pid_t pid = vpid(item);
 
@@ -1385,36 +1408,91 @@ static inline int fork_with_pid(struct pstree_item *item)
 
 	pr_info("Forking task with %d pid (flags 0x%lx)\n", pid, ca.clone_flags);
 
-	if (!(ca.clone_flags & CLONE_NEWPID)) {
-		char buf[32];
-		int len;
-		int fd = -1;
+	if (ca.item->ids)
+		pid_ns = lookup_ns_by_id(ca.item->ids->pid_ns_id, &pid_ns_desc);
 
-		if (!kdat.has_clone3_set_tid) {
-			fd = open_proc_rw(PROC_GEN, LAST_PID_PATH);
-			if (fd < 0)
-				goto err;
+	clone_flags = ca.clone_flags;
+	if (pid_ns && pid_ns->ext_key) {
+		int fd;
+
+		/* Not possible to restore into an empty PID namespace. */
+		BUG_ON(pid == INIT_PID);
+
+		/*
+		 * Restoring into an existing namespace means that CLONE_NEWPID
+		 * needs to be removed during clone() as the process will be
+		 * created in the correct PID namespace thanks to switch_ns_by_fd().
+		 */
+		clone_flags &= ~CLONE_NEWPID;
+
+		fd = inherit_fd_lookup_id(pid_ns->ext_key);
+		if (fd < 0) {
+			pr_err("Unable to find an external pidns: %s\n", pid_ns->ext_key);
+			return -1;
 		}
 
+		ret = switch_ns_by_fd(fd, &pid_ns_desc, NULL);
+		close(fd);
+
+		/*
+		 * If a process without a PID namespace is restored into
+		 * a PID namespace this tells CRIU to still handle the
+		 * process as if using CLONE_NEWPID.
+		 */
+		root_ns_mask |= CLONE_NEWPID;
+		rsti(item)->clone_flags |= CLONE_NEWPID;
+	}
+
+	if (!(clone_flags & CLONE_NEWPID)) {
+		pid_t helper_pid = -1;
+
 		lock_last_pid();
 
 		if (!kdat.has_clone3_set_tid) {
-			len = snprintf(buf, sizeof(buf), "%d", pid - 1);
-			if (write(fd, buf, len) != len) {
-				pr_perror("%d: Write %s to %s", pid, buf,
-					LAST_PID_PATH);
-				close(fd);
-				goto err_unlock;
+			if (pid_ns && pid_ns->ext_key) {
+				/*
+				 * Restoring into another namespace requires a helper
+				 * to write to LAST_PID_PATH. Using clone3() this is
+				 * so much easier and simpler. As long as CRIU supports
+				 * clone() this is needed.
+				 */
+				helper_pid = fork();
+				if (helper_pid < 0) {
+					pr_perror("Cannot fork ns_last_pid writer");
+					goto err_unlock;
+				}
+			}
+			if (helper_pid <= 0) {
+				ret = write_ns_last_pid(pid);
+				if (ret == -1 && helper_pid == -1)
+					goto err_unlock;
+				if (helper_pid == 0)
+					exit(ret);
+			}
+			if (helper_pid > 0) {
+				/* We forked and this is the parent. */
+				int status;
+
+				ret = waitpid(-1, &status, 0);
+				if (ret < 0) {
+					pr_perror("Cannot wait for ns_last_pid writer");
+					goto err_unlock;
+				}
+				if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+					pr_err("Writing ns_last_pid failed with error %d\n", status);
+					ret = -1;
+					goto err_unlock;
+				}
 			}
-			close(fd);
 		}
 	} else {
-		BUG_ON(pid != INIT_PID);
+		if (!(pid_ns && pid_ns->ext_key))
+			BUG_ON(pid != INIT_PID);
 	}
 
 	if (kdat.has_clone3_set_tid) {
 		ret = clone3_with_pid_noasan(restore_task_with_children,
-				&ca, (ca.clone_flags &
+				&ca, (clone_flags &
 					~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)),
 				SIGCHLD, pid);
 	} else {
@@ -1432,7 +1510,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 		 */
 		close_pid_proc();
 		ret = clone_noasan(restore_task_with_children,
-				(ca.clone_flags &
+				(clone_flags &
 				 ~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)) | SIGCHLD,
 				&ca);
 	}
@@ -1452,9 +1530,9 @@ static inline int fork_with_pid(struct pstree_item *item)
 	}
 
 err_unlock:
-	if (!(ca.clone_flags & CLONE_NEWPID))
+	if (!(clone_flags & CLONE_NEWPID))
 		unlock_last_pid();
-err:
+
 	if (ca.core)
 		core_entry__free_unpacked(ca.core, NULL);
 	return ret;
@@ -2149,6 +2227,9 @@ static int restore_root_task(struct pstree_item *init)
 	 * this later.
 	 */
 
+	if (prepare_namespace_before_tasks())
+		return -1;
+
 	if (vpid(init) == INIT_PID) {
 		if (!(root_ns_mask & CLONE_NEWPID)) {
 			pr_err("This process tree can only be restored "
@@ -2165,9 +2246,6 @@ static int restore_root_task(struct pstree_item *init)
 	if (prepare_userns_hook())
 		return -1;
 
-	if (prepare_namespace_before_tasks())
-		return -1;
-
 	__restore_switch_stage_nw(CR_STATE_ROOT_TASK);
 
 	ret = fork_with_pid(init);
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 3ddf07be8..796f412c5 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1081,8 +1081,24 @@ int dump_namespaces(struct pstree_item *item, unsigned int ns_flags)
 	pr_info("Dumping %d(%d)'s namespaces\n", ns_pid->ns[0].virt, ns_pid->real);
 
 	if ((ns_flags & CLONE_NEWPID) && ns_pid->ns[0].virt != 1) {
-		pr_err("Can't dump a pid namespace without the process init\n");
-		return -1;
+		char *val = NULL;
+		for (ns = ns_ids; ns; ns = ns->next) {
+			if (ns->nd->cflag == CLONE_NEWPID) {
+				char id[64];
+				snprintf(id, sizeof(id), "pid[%u]", ns->kid);
+				val = external_lookup_by_key(id);
+				if (IS_ERR_OR_NULL(val)) {
+					val = NULL;
+					continue;
+				}
+				if (val)
+					break;
+			}
+		}
+		if (!val) {
+			pr_err("Can't dump a pid namespace without the process init\n");
+			return -1;
+		}
 	}
 
 	for (ns = ns_ids; ns; ns = ns->next) {
@@ -1783,8 +1799,17 @@ static int read_pid_ns_img(void)
 			pr_err("Can not read pidns object\n");
 			return -1;
 		}
-		if (ret > 0)
+		if (ret > 0) {
 			ns->ext_key = e->ext_key;
+			/*
+			 * Restoring into an existing PID namespace. This disables
+			 * the check to require a PID 1 when restoring a process
+			 * which used to be in a PID namespace.
+			 * To keep the PID namespace code paths enabled this bit
+			 * will be set after having clone()ed the process.
+			 */
+			root_ns_mask &= ~CLONE_NEWPID;
+		}
 	}
 
 	return 0;

From f3ebdeebe20c0e4fec2e96cb9a889d16b6b3732f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 5 May 2020 16:19:50 +0000
Subject: [PATCH 0278/1854] pidns: add external pidns to man-page

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Documentation/criu.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 4e9b4132e..6ce384163 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -242,6 +242,12 @@ In other words, do not use it unless really needed.
     Tell *criu* that one end of a pair of UNIX sockets (created by
     *socketpair*(2)) with the given _id_ is OK to be disconnected.
 
+*--external* **pid[**__inode__**]:**__name__::
+    Mark a PID namespace as external. This can be later used to restore
+    a process into an existing PID namespace. The label 'name' can be
+    used to assign another PID namespace during restore with the help
+    of *--inherit-fd*.
+
 *--freeze-cgroup*::
    Use cgroup freezer to collect processes.
 
@@ -402,7 +408,7 @@ Restores previously checkpointed processes.
     Inherit a file descriptor. This option lets *criu* use an already opened
     file descriptor 'N' for restoring a file identified by 'resource'.
     This option can be used to restore an external resource dumped
-    with the help of *--external* *file*, *tty*, and *unix* options.
+    with the help of *--external* *file*, *tty*, *pid* and *unix* options.
 +
 The 'resource' argument can be one of the following:
 +

From 3490d997be2887f161bc70f253eb1eb1343b8cd6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 6 May 2020 08:04:45 +0000
Subject: [PATCH 0279/1854] test: test external namespace support

Adapt netns_ext tests to also work with pid namespaces and move it from
test/others/netns_ext/ to test/others/ns_ext/.

Also enable ns_ext tests in Travis runs.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/travis-tests               |  3 +
 test/others/netns_ext/Makefile            |  2 -
 test/others/netns_ext/run.sh              | 40 ------------
 test/others/ns_ext/Makefile               |  7 +++
 test/others/{netns_ext => ns_ext}/_run.sh |  1 +
 test/others/ns_ext/run.sh                 | 74 +++++++++++++++++++++++
 6 files changed, 85 insertions(+), 42 deletions(-)
 delete mode 100644 test/others/netns_ext/Makefile
 delete mode 100755 test/others/netns_ext/run.sh
 create mode 100644 test/others/ns_ext/Makefile
 rename test/others/{netns_ext => ns_ext}/_run.sh (63%)
 create mode 100755 test/others/ns_ext/run.sh

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 311236d7d..e9c2d5c6a 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -211,4 +211,7 @@ ip net add test
 # libcriu testing
 make -C test/others/libcriu run
 
+# external namespace testing
+make -C test/others/ns_ext run
+
 make -C test/others/shell-job
diff --git a/test/others/netns_ext/Makefile b/test/others/netns_ext/Makefile
deleted file mode 100644
index 7779a9903..000000000
--- a/test/others/netns_ext/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-run:
-	./run.sh
diff --git a/test/others/netns_ext/run.sh b/test/others/netns_ext/run.sh
deleted file mode 100755
index 6de6c5ad8..000000000
--- a/test/others/netns_ext/run.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CRIU=../../../criu/criu
-setsid unshare -n bash -c 'unshare -n sh _run.sh pidfile2 & unshare -n sh _run.sh pidfile3 & ip link add xxx type veth && ip link add mymacvlan1 link xxx type macvlan mode bridge && . _run.sh pidfile' < /dev/zero &> output &
-sleep 1
-while :; do
-	test -f pidfile && test -f pidfile2 && break;
-	sleep 0.1
-done
-
-pid=$(cat pidfile)
-pid2=$(cat pidfile2)
-
-touch test_netns
-mount --bind /proc/$pid/ns/net test_netns
-touch test_netns2
-mount --bind /proc/$pid2/ns/net test_netns2
-mkdir -p images
-ino=$(ls -iL test_netns | awk '{ print $1 }')
-ino2=$(ls -iL test_netns2 | awk '{ print $1 }')
-exec 33< test_netns
-exec 34< test_netns2
-$CRIU dump -t $pid -o dump.log -D images --external net[$ino]:test_netns --external net[$ino2]:test_netns2
-cat images/dump.log | grep -B 5 Error || echo ok
-$CRIU restore -o restore.log -D images --inherit-fd fd[33]:test_netns --inherit-fd fd[34]:test_netns2 -d
-cat images/restore.log | grep -B 5 Error || echo ok
-new_ino=$(ls -iL /proc/$pid/ns/net | awk '{ print $1 }')
-new_ino2=$(ls -iL /proc/$pid2/ns/net | awk '{ print $1 }')
-[ "$ino" -ne "$new_ino" ] && {
-	echo FAIL
-	exit 1
-}
-[ "$ino2" -ne "$new_ino2" ] && {
-	echo FAIL
-	exit 1
-}
-echo PASS
-exit 0
diff --git a/test/others/ns_ext/Makefile b/test/others/ns_ext/Makefile
new file mode 100644
index 000000000..f859b89bc
--- /dev/null
+++ b/test/others/ns_ext/Makefile
@@ -0,0 +1,7 @@
+run:
+	./run.sh net
+	./run.sh pid
+
+clean:
+	rm -rf images output  pidfile  pidfile2  pidfile3
+.PHONY: clean run
diff --git a/test/others/netns_ext/_run.sh b/test/others/ns_ext/_run.sh
similarity index 63%
rename from test/others/netns_ext/_run.sh
rename to test/others/ns_ext/_run.sh
index 59070fb1b..8ac1022b4 100644
--- a/test/others/netns_ext/_run.sh
+++ b/test/others/ns_ext/_run.sh
@@ -1,3 +1,4 @@
+ip link set up dev lo
 echo $$ > $1
 while :; do
 	sleep 1
diff --git a/test/others/ns_ext/run.sh b/test/others/ns_ext/run.sh
new file mode 100755
index 000000000..32e75c42d
--- /dev/null
+++ b/test/others/ns_ext/run.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+set -x
+
+if [[ "$1" == "pid" ]]; then
+	NS=pid
+else
+	NS=net
+fi
+
+MNT1=test_ns1
+MNT2=test_ns2
+
+trap "cleanup" QUIT TERM INT HUP EXIT
+
+function cleanup()
+{
+	kill -9 $pid $pid2
+	sleep 0.5
+	umount -lf $MNT1 $MNT2 || :
+	rm -f $MNT1 $MNT2
+	rm -f pidfile pidfile2 pidfile3
+}
+
+CRIU=../../../criu/criu
+if [[ "$NS" == "net" ]]; then
+	setsid unshare -n bash -c 'unshare -n sh _run.sh pidfile2 & unshare -n sh _run.sh pidfile3 & ip link add xxx type veth && ip link add mymacvlan1 link xxx type macvlan mode bridge && . _run.sh pidfile' < /dev/zero &> output &
+elif [[ "$NS" == "pid" ]]; then
+	RND1=$RANDOM
+	RND2=$RANDOM
+	setsid unshare -p -f setsid bash -c "setsid sh _run.sh pidfile2 $RND2 & . _run.sh pidfile $RND1" < /dev/zero &> output &
+fi
+sleep 1
+while :; do
+	test -f pidfile && test -f pidfile2 && break;
+	sleep 0.1
+done
+
+if [[ "$NS" == "net" ]]; then
+	pid=$(cat pidfile)
+	pid2=$(cat pidfile2)
+elif [[ "$NS" == "pid" ]]; then
+	pid2=$(pgrep -f ". _run.sh pidfile $RND1" -n)
+	pid=$(pgrep -f "sh _run.sh pidfile2 $RND2" -n)
+fi
+
+touch $MNT1
+mount --bind /proc/$pid/ns/$NS $MNT1
+touch $MNT2
+mount --bind /proc/$pid2/ns/$NS $MNT2
+mkdir -p images
+ino=$(ls -iL $MNT1 | awk '{ print $1 }')
+ino2=$(ls -iL $MNT2 | awk '{ print $1 }')
+exec 33< $MNT1
+exec 34< $MNT2
+$CRIU dump -v4 -t $pid -o dump.log -D images --external $NS[$ino]:test_ns --external $NS[$ino2]:test_ns2
+cat images/dump.log | grep -B 5 Error || echo ok
+$CRIU restore -v4 -o restore.log -D images --inherit-fd fd[33]:test_ns --inherit-fd fd[34]:test_ns2 -d
+cat images/restore.log | grep -B 5 Error || echo ok
+if [[ "$NS" == "pid" ]]; then
+	pid=$(pgrep -f "^sh _run.sh pidfile2 $RND2")
+fi
+new_ino=$(ls -iL /proc/$pid/ns/$NS | awk '{ print $1 }')
+new_ino2=$(ls -iL /proc/$pid2/ns/$NS | awk '{ print $1 }')
+[ "$ino" != "$new_ino" ] && {
+	echo FAIL
+	exit 1
+}
+[ "$ino2" != "$new_ino2" ] && {
+	echo FAIL
+	exit 1
+}
+echo PASS
+exit 0

From 9a4b933f243f030d472f5a8d318827cf4cca1ed2 Mon Sep 17 00:00:00 2001
From: Angie Ni <avtni@google.com>
Date: Wed, 10 Jun 2020 14:34:19 -0600
Subject: [PATCH 0280/1854] Add error logging to kerndat init

CRIU sometimes returns 1 from main() with no explanation.
These changes add additional logging for initialization errors in kerndat.

Signed-off-by: Angie Ni <avtni@google.com>
---
 criu/kerndat.c | 202 +++++++++++++++++++++++++++++++++----------------
 criu/net.c     |   8 +-
 2 files changed, 143 insertions(+), 67 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 831f9f72a..f91d7be41 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -390,9 +390,10 @@ static int init_zero_page_pfn(void)
 	ret = vaddr_to_pfn(-1, (unsigned long)addr, &kdat.zero_page_pfn);
 	munmap(addr, PAGE_SIZE);
 
-	if (kdat.zero_page_pfn == 0)
+	if (kdat.zero_page_pfn == 0) {
+		pr_err("vaddr_to_pfn succeeded but kdat.zero_page_pfn is invalid.\n");
 		ret = -1;
-
+	}
 	return ret;
 }
 
@@ -577,8 +578,10 @@ int kerndat_tcp_repair(void)
 	}
 
 	if (setsockopt(clnt, SOL_TCP, TCP_REPAIR, &yes, sizeof(yes))) {
-		if (errno != EPERM)
+		if (errno != EPERM) {
+			pr_perror("Unable to set TCP_REPAIR with setsockopt");
 			goto err;
+		}
 		kdat.has_tcp_half_closed = false;
 	} else
 		kdat.has_tcp_half_closed = true;
@@ -617,8 +620,10 @@ static int kerndat_compat_restore(void)
 	int ret;
 
 	ret = kdat_can_map_vdso();
-	if (ret < 0)
+	if (ret < 0) {
+		pr_err("kdat_can_map_vdso failed\n");
 		return ret;
+	}
 	kdat.can_map_vdso = !!ret;
 
 	/* depends on kdat.can_map_vdso result */
@@ -653,6 +658,7 @@ static int kerndat_detect_stack_guard_gap(void)
 
 	maps = fopen("/proc/self/maps", "r");
 	if (maps == NULL) {
+		pr_perror("Could not open /proc/self/maps");
 		munmap(mem, 4096);
 		return -1;
 	}
@@ -807,8 +813,10 @@ static int kerndat_x86_has_ptrace_fpu_xsave_bug(void)
 {
 	int ret = kdat_x86_has_ptrace_fpu_xsave_bug();
 
-	if (ret < 0)
+	if (ret < 0) {
+		pr_err("kdat_x86_has_ptrace_fpu_xsave_bug failed\n");
 		return ret;
+	}
 
 	kdat.x86_has_ptrace_fpu_xsave_bug = !!ret;
 	return 0;
@@ -936,8 +944,10 @@ int kerndat_has_thp_disable(void)
 	bool vma_match = false;
 
 	if (prctl(PR_SET_THP_DISABLE, 1, 0, 0, 0)) {
-		if (errno != EINVAL)
+		if (errno != EINVAL) {
+			pr_perror("prctl PR_SET_THP_DISABLE failed");
 			return -1;
+		}
 		pr_info("PR_SET_THP_DISABLE is not available\n");
 		return 0;
 	}
@@ -949,8 +959,10 @@ int kerndat_has_thp_disable(void)
 		return -1;
 	}
 
-	if (prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0))
-		return -1;
+	if (prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0)) {
+		pr_perror("prctl PR_SET_THP_DISABLE failed");
+		goto out_unmap;
+	}
 
 	f.fd = open("/proc/self/smaps", O_RDONLY);
 	if (f.fd < 0) {
@@ -1047,6 +1059,7 @@ int kerndat_init(void)
 	ret = kerndat_try_load_cache();
 	if (ret <= 0)
 		return ret;
+	ret = 0;
 
 	/* kerndat_try_load_cache can leave some trash in kdat */
 	memset(&kdat, 0, sizeof(kdat));
@@ -1054,65 +1067,124 @@ int kerndat_init(void)
 	preload_socket_modules();
 	preload_netfilter_modules();
 
-	ret = check_pagemap();
-	if (!ret)
-		ret = kerndat_get_shmemdev();
-	if (!ret)
-		ret = kerndat_get_dirty_track();
-	if (!ret)
-		ret = init_zero_page_pfn();
-	if (!ret)
-		ret = get_last_cap();
-	if (!ret)
-		ret = kerndat_fdinfo_has_lock();
-	if (!ret)
-		ret = get_task_size();
-	if (!ret)
-		ret = get_ipv6();
-	if (!ret)
-		ret = kerndat_loginuid();
-	if (!ret)
-		ret = kerndat_iptables_has_xtlocks();
-	if (!ret)
-		ret = kerndat_tcp_repair();
-	if (!ret)
-		ret = kerndat_compat_restore();
-	if (!ret)
-		ret = kerndat_tun_netns();
-	if (!ret)
-		ret = kerndat_socket_unix_file();
-	if (!ret)
-		ret = kerndat_nsid();
-	if (!ret)
-		ret = kerndat_link_nsid();
-	if (!ret)
-		ret = kerndat_has_memfd_create();
-	if (!ret)
-		ret = kerndat_detect_stack_guard_gap();
-	if (!ret)
-		ret = kerndat_uffd();
-	if (!ret)
-		ret = kerndat_has_thp_disable();
+	if (check_pagemap()) {
+		pr_err("check_pagemap failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_get_shmemdev()) {
+		pr_err("kerndat_get_shmemdev failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_get_dirty_track()) {
+		pr_err("kerndat_get_dirty_track failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && init_zero_page_pfn()) {
+		pr_err("init_zero_page_pfn failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && get_last_cap()) {
+		pr_err("get_last_cap failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_fdinfo_has_lock()) {
+		pr_err("kerndat_fdinfo_has_lock failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && get_task_size()) {
+		pr_err("get_task_size failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && get_ipv6()) {
+		pr_err("get_ipv6 failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_loginuid()) {
+		pr_err("kerndat_loginuid failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_iptables_has_xtlocks()) {
+		pr_err("kerndat_iptables_has_xtlocks failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_tcp_repair()) {
+		pr_err("kerndat_tcp_repair failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_compat_restore()) {
+		pr_err("kerndat_compat_restore failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_tun_netns()) {
+		pr_err("kerndat_tun_netns failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_socket_unix_file()) {
+		pr_err("kerndat_socket_unix_file failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_nsid()) {
+		pr_err("kerndat_nsid failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_link_nsid()) {
+		pr_err("kerndat_link_nsid failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_memfd_create()) {
+		pr_err("kerndat_has_memfd_create failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_detect_stack_guard_gap()) {
+		pr_err("kerndat_detect_stack_guard_gap failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_uffd()) {
+		pr_err("kerndat_uffd failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_thp_disable()) {
+		pr_err("kerndat_has_thp_disable failed when initializing kerndat.\n");
+		ret = -1;
+	}
 	/* Needs kdat.compat_cr filled before */
-	if (!ret)
-		ret = kerndat_vdso_fill_symtable();
+	if (!ret && kerndat_vdso_fill_symtable()) {
+		pr_err("kerndat_vdso_fill_symtable failed when initializing kerndat.\n");
+		ret = -1;
+	}
 	/* Depends on kerndat_vdso_fill_symtable() */
-	if (!ret)
-		ret = kerndat_vdso_preserves_hint();
-	if (!ret)
-		ret = kerndat_socket_netns();
-	if (!ret)
-		ret = kerndat_x86_has_ptrace_fpu_xsave_bug();
-	if (!ret)
-		ret = kerndat_has_inotify_setnextwd();
-	if (!ret)
-		ret = has_kcmp_epoll_tfd();
-	if (!ret)
-		ret = kerndat_has_fsopen();
-	if (!ret)
-		ret = kerndat_has_clone3_set_tid();
-	if (!ret)
-		ret = has_time_namespace();
+	if (!ret && kerndat_vdso_preserves_hint()) {
+		pr_err("kerndat_vdso_preserves_hint failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_socket_netns()) {
+		pr_err("kerndat_socket_netns failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_x86_has_ptrace_fpu_xsave_bug()) {
+		pr_err("kerndat_x86_has_ptrace_fpu_xsave_bug failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_inotify_setnextwd()) {
+		pr_err("kerndat_has_inotify_setnextwd failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && has_kcmp_epoll_tfd()) {
+		pr_err("has_kcmp_epoll_tfd failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_fsopen()) {
+		pr_err("kerndat_has_fsopen failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_clone3_set_tid()) {
+		pr_err("kerndat_has_clone3_set_tid failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && has_time_namespace()) {
+		pr_err("has_time_namespace failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/net.c b/criu/net.c
index 86fba2ddc..6e650bb66 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3484,11 +3484,15 @@ int kerndat_link_nsid(void)
 		}
 
 		has_link_nsid = false;
-		if (check_link_nsid(sk, &has_link_nsid))
+		if (check_link_nsid(sk, &has_link_nsid)) {
+			pr_err("check_link_nsid failed\n");
 			exit(1);
+		}
 
-		if (!has_link_nsid)
+		if (!has_link_nsid) {
+			pr_err("check_link_nsid succeeded but has_link_nsid is false\n");
 			exit(5);
+		}
 
 		close(sk);
 

From 539183fadda1a203cb12f5894184494f72fbf60b Mon Sep 17 00:00:00 2001
From: Angie Ni <avtni@google.com>
Date: Fri, 12 Jun 2020 09:41:52 -0600
Subject: [PATCH 0281/1854] Add error logging to config + crtools init

CRIU sometimes returns 1 from main() with no explanation.
Changes made add more logging in the case of
initialization errors in config and crtools.

Signed-off-by: Angie Ni <avtni@google.com>
---
 criu/config.c           | 32 ++++++++++++++++++++++++--------
 criu/crtools.c          | 12 +++++++++---
 criu/fault-injection.c  |  5 ++++-
 criu/image.c            |  4 +++-
 criu/include/criu-log.h |  1 +
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 904addf3a..3a3a13edb 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -587,8 +587,10 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			opts.final_state = TASK_ALIVE;
 			break;
 		case 'x':
-			if (optarg && unix_sk_ids_parse(optarg) < 0)
+			if (optarg && unix_sk_ids_parse(optarg) < 0) {
+				pr_err("Failed to parse unix socket inode from optarg: %s\n", optarg);
 				return 1;
+			}
 			opts.ext_unix_sk = true;
 			break;
 		case 't':
@@ -648,13 +650,17 @@ int parse_options(int argc, char **argv, bool *usage_error,
 					goto bad_arg;
 
 				*aux = '\0';
-				if (veth_pair_add(optarg, aux + 1))
+				if (veth_pair_add(optarg, aux + 1)) {
+					pr_err("Failed to add veth pair: %s, %s.\n", optarg, aux + 1);
 					return 1;
+				}
 			}
 			break;
 		case 1049:
-			if (add_script(optarg))
+			if (add_script(optarg)) {
+				pr_err("Failed to add action-script: %s.\n", optarg);
 				return 1;
+			}
 			break;
 		case 1051:
 			SET_CHAR_OPTS(addr, optarg);
@@ -724,12 +730,16 @@ int parse_options(int argc, char **argv, bool *usage_error,
 				return 0;
 			break;
 		case 1064:
-			if (!add_skip_mount(optarg))
+			if (!add_skip_mount(optarg)) {
+				pr_err("Failed to add skip-mnt: %s\n", optarg);
 				return 1;
+			}
 			break;
 		case 1065:
-			if (!add_fsname_auto(optarg))
+			if (!add_fsname_auto(optarg)) {
+				pr_err("Failed while parsing --enable-fs option: %s", optarg);
 				return 1;
+			}
 			break;
 		case 1068:
 			SET_CHAR_OPTS(freeze_cgroup, optarg);
@@ -738,8 +748,10 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			opts.ghost_limit = parse_size(optarg);
 			break;
 		case 1070:
-			if (irmap_scan_path_add(optarg))
+			if (irmap_scan_path_add(optarg)) {
+				pr_err("Failed while parsing --irmap-scan-path option: %s", optarg);
 				return -1;
+			}
 			break;
 		case 1071:
 			SET_CHAR_OPTS(lsm_profile, optarg);
@@ -765,13 +777,17 @@ int parse_options(int argc, char **argv, bool *usage_error,
 					goto bad_arg;
 
 				*aux = '\0';
-				if (ext_mount_add(optarg, aux + 1))
+				if (ext_mount_add(optarg, aux + 1)) {
+					pr_err("Could not add external mount when initializing config: %s, %s\n", optarg, aux + 1);
 					return 1;
+				}
 			}
 			break;
 		case 1073:
-			if (add_external(optarg))
+			if (add_external(optarg)) {
+				pr_err("Could not add external resource when initializing config: %s\n", optarg);
 				return 1;
+			}
 			break;
 		case 1074:
 			if (!strcmp("net", optarg))
diff --git a/criu/crtools.c b/criu/crtools.c
index b696898e7..4f5d13957 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -82,8 +82,10 @@ int main(int argc, char *argv[], char *envp[])
 	BUG_ON(get_service_fd(SERVICE_FD_MIN+1) <
 	       get_service_fd(SERVICE_FD_MAX-1));
 
-	if (fault_injection_init())
+	if (fault_injection_init()) {
+		pr_err("Failed to initialize fault injection when initializing crtools.\n");
 		return 1;
+	}
 
 	cr_pb_init();
 	setproctitle_init(argc, argv, envp);
@@ -171,8 +173,10 @@ int main(int argc, char *argv[], char *envp[])
 	/* We must not open imgs dir, if service is called */
 	if (strcmp(argv[optind], "service")) {
 		ret = open_image_dir(opts.imgs_dir, image_dir_mode(argv, optind));
-		if (ret < 0)
+		if (ret < 0) {
+			pr_err("Couldn't open image dir: %s", opts.imgs_dir);
 			return 1;
+		}
 	}
 
 	/*
@@ -205,8 +209,10 @@ int main(int argc, char *argv[], char *envp[])
 	if (log_init(opts.output))
 		return 1;
 
-	if (kerndat_init())
+	if (kerndat_init()) {
+		pr_err("Could not initialize kernel features detection.\n");
 		return 1;
+	}
 
        if (fault_injected(FI_CANNOT_MAP_VDSO))
                kdat.can_map_vdso = 0;
diff --git a/criu/fault-injection.c b/criu/fault-injection.c
index 4b0650008..83dc1fc8d 100644
--- a/criu/fault-injection.c
+++ b/criu/fault-injection.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include "criu-log.h"
 #include "fault-injection.h"
 
 enum faults fi_strategy;
@@ -14,8 +15,10 @@ int fault_injection_init(void)
 
 	start = atoi(val);
 
-	if (start <= 0 || start >= FI_MAX)
+	if (start <= 0 || start >= FI_MAX) {
+		pr_err("CRIU_FAULT out of bounds.\n");
 		return -1;
+	}
 
 	fi_strategy = start;
 	return 0;
diff --git a/criu/image.c b/criu/image.c
index 2bbb4dd02..56c6f787c 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -540,8 +540,10 @@ int open_image_dir(char *dir, int mode)
 	}
 
 	ret = install_service_fd(IMG_FD_OFF, fd);
-	if (ret < 0)
+	if (ret < 0) {
+		pr_err("install_service_fd failed.\n");
 		return -1;
+	}
 	fd = ret;
 
 	if (opts.stream) {
diff --git a/criu/include/criu-log.h b/criu/include/criu-log.h
index c2a635ba7..ae2f38489 100644
--- a/criu/include/criu-log.h
+++ b/criu/include/criu-log.h
@@ -21,6 +21,7 @@
 #define __CRIU_LOG_H__
 
 #include "log.h"
+#include <sys/types.h>
 
 extern int log_init(const char *output);
 extern void log_fini(void);

From 62d70bd4828856d51aa043870337148aca468a99 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 15 Jul 2020 19:11:27 +0300
Subject: [PATCH 0282/1854] test/zdtm/autofs: use sigaction instead of the
 deprecated siginterrupt

Reported-by: Mr Travis
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/autofs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/static/autofs.c b/test/zdtm/static/autofs.c
index 4360f90f0..b6d0170fe 100644
--- a/test/zdtm/static/autofs.c
+++ b/test/zdtm/static/autofs.c
@@ -469,9 +469,6 @@ static int automountd_loop(int pipe, const char *mountpoint, struct autofs_param
 		return -ENOMEM;
 	}
 
-	/* Allow SIGUSR2 to interrupt system call */
-	siginterrupt(SIGUSR2, 1);
-
 	while (!stop && !err) {
 		memset(packet, 0, psize);
 
@@ -874,6 +871,13 @@ struct autofs_params autofs_types[] = {
 
 int main(int argc, char **argv)
 {
+	struct sigaction act = {
+		.sa_handler = do_stop,
+		/*
+		 * SIGUSR2 is used to interrupt system calls, so SA_RESTART
+		 * isn't set.
+		 */
+	};
 	int ret = 0;
 
 	test_init(argc, argv);
@@ -889,7 +893,7 @@ int main(int argc, char **argv)
 	if (autofs_dev < 0)
 		return -1;
 
-	if (signal(SIGUSR2, do_stop) == SIG_ERR) {
+	if (sigaction(SIGUSR2, &act, NULL) < 0) {
 		pr_perror("Failed to set SIGUSR2 handler");
 		return -1;
 	}

From 0d8d7f2329c3c8b0fdbf61f65e50456fb4c17959 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 16 Jul 2020 15:15:49 +0000
Subject: [PATCH 0283/1854] tests: criu-image-streamer change dev branch to
 master branch

Now that the new CRIU to criu-image-streamer protocol is in, we can use
the master branch of criu-image-streamer.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 scripts/install-criu-image-streamer.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/install-criu-image-streamer.sh b/scripts/install-criu-image-streamer.sh
index e4f368602..749214823 100755
--- a/scripts/install-criu-image-streamer.sh
+++ b/scripts/install-criu-image-streamer.sh
@@ -6,8 +6,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 # Clone criu-image-streamer in a sibling directory of the criu project directory
 cd $(dirname "$0")/../../
-# TODO change dev branch to master once PR is merged
-git clone --depth=1 https://github.com/checkpoint-restore/criu-image-streamer.git -b dev
+git clone --depth=1 https://github.com/checkpoint-restore/criu-image-streamer.git
 
 # Compile
 cd criu-image-streamer

From 8354b526c4b355b2eabfd3ab10856a47c482357b Mon Sep 17 00:00:00 2001
From: Angie Ni <avtni@google.com>
Date: Fri, 12 Jun 2020 10:20:28 -0600
Subject: [PATCH 0284/1854] restore: skip unnecessary setgroups calls

When groups already have desired values, we skip calling setgroups.
Furthermore, this check allows us to restore when in an
unprivileged user namespace that cannot use setgroups.

Signed-off-by: Angie Ni <avtni@google.com>
---
 criu/cr-restore.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d6035d61e..ec0c280b7 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3201,6 +3201,40 @@ static void rst_reloc_creds(struct thread_restore_args *thread_args,
 	thread_args->creds_args = args;
 }
 
+static bool groups_match(gid_t* groups, int n_groups)
+{
+	int n, len;
+	bool ret;
+	gid_t* gids;
+
+	n = getgroups(0, NULL);
+	if (n == -1) {
+		pr_perror("Failed to get number of supplementary groups");
+		ret = false;
+	}
+	if (n != n_groups)
+		return false;
+	if (n == 0)
+		return true;
+
+	len = n * sizeof(gid_t);
+	gids = xmalloc(len);
+	if (gids == NULL)
+		return false;
+
+	n = getgroups(n, gids);
+	if (n == -1) {
+		pr_perror("Failed to get supplementary groups");
+		ret = false;
+	} else {
+		/* getgroups sorts gids, so it is safe to memcmp gid arrays */
+		ret = !memcmp(gids, groups, len);
+	}
+
+	xfree(gids);
+	return ret;
+}
+
 static struct thread_creds_args *
 rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 {
@@ -3308,7 +3342,7 @@ rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 	memcpy(args->cap_prm, ce->cap_prm, sizeof(args->cap_prm));
 	memcpy(args->cap_bnd, ce->cap_bnd, sizeof(args->cap_bnd));
 
-	if (ce->n_groups) {
+	if (ce->n_groups && !groups_match(ce->groups, ce->n_groups)) {
 		unsigned int *groups;
 
 		args->mem_groups_pos = rst_mem_align_cpos(RM_PRIVATE);

From 7b18c13c1942e206b4af86e5797b30d2bdd8ce6c Mon Sep 17 00:00:00 2001
From: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
Date: Fri, 29 May 2020 11:56:22 +0530
Subject: [PATCH 0285/1854] images/regfile.proto: adds additional fields to
 RegFileEntry

This adds build-id, checksum, checksum-config and checksum-parameter fields
to RegFileEntry to store metadata used for file verification.

build_id: Holds the build-id if it could be obtained

checksum: Holds the checksum if it could be obtained

checksum_config: Holds the configuration of bytes for which checksum has
been calculated (The entire file, first N bytes or every Nth byte)

checksum_parameter: Specifies the value of 'N', if required, for the
configuration of bytes

Signed-off-by: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
---
 images/regfile.proto | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/images/regfile.proto b/images/regfile.proto
index bc4c14d4d..49884ddc9 100644
--- a/images/regfile.proto
+++ b/images/regfile.proto
@@ -4,13 +4,31 @@ import "opts.proto";
 import "fown.proto";
 
 message reg_file_entry {
-	required uint32		id	= 1;
-	required uint32		flags	= 2 [(criu).flags = "rfile.flags"];
-	required uint64		pos	= 3;
-	required fown_entry	fown	= 5;
-	required string		name	= 6;
-	optional sint32		mnt_id	= 7 [default = -1];
-	optional uint64		size	= 8;
-	optional bool		ext	= 9;
-	optional uint32         mode    = 10;
-}
+	required uint32		id			= 1;
+	required uint32		flags			= 2 [(criu).flags = "rfile.flags"];
+	required uint64		pos			= 3;
+	required fown_entry	fown			= 5;
+	required string		name			= 6;
+	optional sint32		mnt_id			= 7 [default = -1];
+	optional uint64		size			= 8;
+	optional bool		ext			= 9;
+	optional uint32         mode    		= 10;
+
+	/* This field stores the build-ID of the file if it could be obtained. */
+	repeated uint32 	build_id 		= 11;
+
+	/* This field stores the CRC32C checksum of the file if it could be obtained. */
+	optional uint32 	checksum 		= 12;
+
+	/*
+	 * This field stores the configuration of bytes which were used in the
+	 * calculation of the checksum, if it could be obtained.
+	 */
+	optional uint32 	checksum_config 	= 13;
+
+	/*
+	 * This field stores the checksum parameter if it was used in the calculation
+	 * of the checksum, if it could be obtained.
+	 */
+	optional uint32 	checksum_parameter 	= 14;
+}
\ No newline at end of file

From 9191f8728d6224e3c108063128131c8f219bdd4f Mon Sep 17 00:00:00 2001
From: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
Date: Fri, 26 Jun 2020 14:43:40 +0530
Subject: [PATCH 0286/1854] criu/files-reg.c: add build-id validation
 functionality

efi.h: Required for accessing the build-id of .efi files

This adds functions to find, store and compare with the stored build-id.
get_build_id() calls 32-bit or 64-bit helper functions depending on
the bitness of the ELF file after first ensuring that it is actually
an ELF file by checking for the magic number.

The number of iterations while searching the elf file for the
build-id before giving up (500 while searching the note section)
are limited.

Signed-off-by: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
---
 criu/files-reg.c | 395 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 385 insertions(+), 10 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 7e84addf2..27b8164ce 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -12,6 +12,7 @@
 #include <sched.h>
 #include <sys/capability.h>
 #include <sys/mount.h>
+#include <elf.h>
 
 #ifndef SEEK_DATA
 #define SEEK_DATA	3
@@ -22,6 +23,13 @@
 #define SILLYNAME_PREF ".nfs"
 #define SILLYNAME_SUFF_LEN (((unsigned)sizeof(u64) << 1) + ((unsigned)sizeof(unsigned int) << 1))
 
+/*
+ * If the build-id exists, then it will most likely be present in the
+ * beginning of the file. Therefore only the first 1MB will be mapped
+ * and checked.
+ */
+#define BUILD_ID_MAP_SIZE 1048576
+
 #include "cr_options.h"
 #include "imgset.h"
 #include "file-ids.h"
@@ -1339,12 +1347,309 @@ static bool should_check_size(int flags)
 	return true;
 }
 
+/*
+ * Gets the build-id (If it exists) from 32-bit ELF files.
+ * Returns the number of bytes of the build-id if it could
+ * be obtained, else -1.
+ */
+static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
+				const int fd, size_t mapped_size)
+{
+	int size, num_iterations;
+	size_t file_header_end;
+	Elf32_Phdr *program_header, *program_header_end;
+	Elf32_Nhdr *note_header, *note_header_end;
+
+	file_header_end = (size_t) file_header + mapped_size;
+	if (sizeof(Elf32_Ehdr) > mapped_size)
+		return -1;
+
+	/*
+	 * If the file doesn't have atleast 1 program header entry, it definitely can't
+	 * have a build-id.
+	 */
+	if (!file_header->e_phnum) {
+		pr_warn("Couldn't find any program headers for file with fd %d\n", fd);
+		return -1;
+	}
+
+	program_header = (Elf32_Phdr *) (file_header->e_phoff + (char *) file_header);
+	if (program_header <= (Elf32_Phdr *) file_header)
+		return -1;
+
+	program_header_end = (Elf32_Phdr *) (file_header_end - sizeof(Elf32_Phdr));
+	num_iterations = file_header->e_phnum + 1;
+
+	/*
+	 * If the file has a build-id, it will be in the PT_NOTE program header
+	 * entry AKA the note sections.
+	 */
+	while (num_iterations-- && program_header <= program_header_end &&
+			program_header->p_type != PT_NOTE)
+		program_header++;
+
+	if (!num_iterations || program_header >= program_header_end) {
+		pr_warn("Couldn't find the note program header for file with fd %d\n", fd);
+		return -1;
+	}
+
+	note_header = (Elf32_Nhdr *) (program_header->p_offset + (char *) file_header);
+	if (note_header <= (Elf32_Nhdr *) file_header)
+		return -1;
+
+	note_header_end = (Elf32_Nhdr *) min_t(char*,
+						(char *) note_header + program_header->p_filesz,
+						(char *) (file_header_end - sizeof(Elf32_Nhdr)));
+
+	/* The note type for the build-id is NT_GNU_BUILD_ID. */
+	while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
+		note_header = (Elf32_Nhdr *) ((char *) note_header + sizeof(Elf32_Nhdr) +
+						ALIGN(note_header->n_namesz, 4) +
+						ALIGN(note_header->n_descsz, 4));
+
+	if (note_header >= note_header_end) {
+		pr_warn("Couldn't find the build-id note for file with fd %d\n", fd);
+		return -1;
+	}
+
+	/*
+	 * If the size of the notes description is too large or is invalid
+	 * then the build-id could not be obtained.
+	 */
+	if (note_header->n_descsz <= 0 || note_header->n_descsz > 512) {
+		pr_warn("Invalid description size for build-id note for file with fd %d\n", fd);
+		return -1;
+	}
+
+	size = note_header->n_descsz;
+	note_header = (Elf32_Nhdr *) ((char *) note_header + sizeof(Elf32_Nhdr) +
+					ALIGN(note_header->n_namesz, 4));
+	note_header_end = (Elf32_Nhdr *) (file_header_end - size);
+	if (note_header <= (Elf32_Nhdr *) file_header || note_header > note_header_end)
+		return -1;
+
+	*build_id = (unsigned char *) xmalloc(size);
+	if (!*build_id)
+		return -1;
+
+	memcpy(*build_id, (void *) note_header, size);
+	return size;
+}
+
+/*
+ * Gets the build-id (If it exists) from 64-bit ELF files.
+ * Returns the number of bytes of the build-id if it could
+ * be obtained, else -1.
+ */
+static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
+				const int fd, size_t mapped_size)
+{
+	int size, num_iterations;
+	size_t file_header_end;
+	Elf64_Phdr *program_header, *program_header_end;
+	Elf64_Nhdr *note_header, *note_header_end;
+
+	file_header_end = (size_t) file_header + mapped_size;
+	if (sizeof(Elf64_Ehdr) > mapped_size)
+		return -1;
+
+	/*
+	 * If the file doesn't have atleast 1 program header entry, it definitely can't
+	 * have a build-id.
+	 */
+	if (!file_header->e_phnum) {
+		pr_warn("Couldn't find any program headers for file with fd %d\n", fd);
+		return -1;
+	}
+
+	program_header = (Elf64_Phdr *) (file_header->e_phoff + (char *) file_header);
+	if (program_header <= (Elf64_Phdr *) file_header)
+		return -1;
+
+	program_header_end = (Elf64_Phdr *) (file_header_end - sizeof(Elf64_Phdr));
+	num_iterations = file_header->e_phnum + 1;
+
+	/*
+	 * If the file has a build-id, it will be in the PT_NOTE program header
+	 * entry AKA the note sections.
+	 */
+	while (num_iterations-- && program_header <= program_header_end &&
+			program_header->p_type != PT_NOTE)
+		program_header++;
+
+	if (!num_iterations || program_header >= program_header_end) {
+		pr_warn("Couldn't find the note program header for file with fd %d\n", fd);
+		return -1;
+	}
+
+	note_header = (Elf64_Nhdr *) (program_header->p_offset + (char *) file_header);
+	if (note_header <= (Elf64_Nhdr *) file_header)
+		return -1;
+
+	note_header_end = (Elf64_Nhdr *) min_t(char*,
+						(char *) note_header + program_header->p_filesz,
+						(char *) (file_header_end - sizeof(Elf64_Nhdr)));
+
+	/* The note type for the build-id is NT_GNU_BUILD_ID. */
+	while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
+		note_header = (Elf64_Nhdr *) ((char *) note_header + sizeof(Elf64_Nhdr) +
+						ALIGN(note_header->n_namesz, 4) +
+						ALIGN(note_header->n_descsz, 4));
+
+	if (note_header >= note_header_end) {
+		pr_warn("Couldn't find the build-id note for file with fd %d\n", fd);
+		return -1;
+	}
+
+	/*
+	 * If the size of the notes description is too large or is invalid
+	 * then the build-id could not be obtained.
+	 */
+	if (note_header->n_descsz <= 0 || note_header->n_descsz > 512) {
+		pr_warn("Invalid description size for build-id note for file with fd %d\n", fd);
+		return -1;
+	}
+
+	size = note_header->n_descsz;
+	note_header = (Elf64_Nhdr *) ((char *) note_header + sizeof(Elf64_Nhdr) +
+					ALIGN(note_header->n_namesz, 4));
+	note_header_end = (Elf64_Nhdr *) (file_header_end - size);
+	if (note_header <= (Elf64_Nhdr *) file_header || note_header > note_header_end)
+		return -1;
+
+	*build_id = (unsigned char *) xmalloc(size);
+	if (!*build_id)
+		return -1;
+
+	memcpy(*build_id, (void *) note_header, size);
+	return size;
+}
+
+/*
+ * Finds the build-id of the file by checking if the file is an ELF file
+ * and then calling either the 32-bit or the 64-bit function as necessary.
+ * Returns the number of bytes of the build-id if it could be
+ * obtained, else -1.
+ */
+static int get_build_id(const int fd, const struct stat *fd_status,
+				unsigned char **build_id)
+{
+	char buf[SELFMAG+1];
+	void *start_addr;
+	size_t mapped_size;
+	int ret = -1;
+
+	if (read(fd, buf, SELFMAG+1) != SELFMAG+1)
+		return -1;
+
+	/*
+	 * The first 4 bytes contain a magic number identifying the file as an
+	 * ELF file. They should contain the characters ‘\x7f’, ‘E’, ‘L’, and
+	 * ‘F’, respectively. These characters are together defined as ELFMAG.
+	 */
+	if (strncmp(buf, ELFMAG, SELFMAG))
+		return -1;
+
+	/*
+	 * If the build-id exists, then it will most likely be present in the
+	 * beginning of the file. Therefore at most only the first 1 MB of the
+	 * file is mapped.
+	 */
+	mapped_size = min_t(size_t, fd_status->st_size, BUILD_ID_MAP_SIZE);
+	start_addr = mmap(0, mapped_size, PROT_READ, MAP_PRIVATE | MAP_FILE, fd, 0);
+	if (start_addr == MAP_FAILED) {
+		pr_warn("Couldn't mmap file with fd %d", fd);
+		return -1;
+	}
+
+	if (buf[EI_CLASS] == ELFCLASS32)
+		ret = get_build_id_32(start_addr, build_id, fd, mapped_size);
+	if (buf[EI_CLASS] == ELFCLASS64)
+		ret = get_build_id_64(start_addr, build_id, fd, mapped_size);
+	
+	munmap(start_addr, mapped_size);
+	return ret;
+}
+
+/*
+ * Finds and stores the build-id of a file, if it exists, so that it can be validated
+ * while restoring.
+ * Returns 1 if the build-id of the file could be stored, -1 if there was an error
+ * or 0 if the build-id could not be obtained.
+ */
+static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
+						const struct fd_parms *p)
+{
+	unsigned char *build_id = NULL;
+	int build_id_size;
+	int fd;
+
+	/*
+	 * Checks whether the file is atleast big enough to try and read the first
+	 * four (SELFMAG) bytes which should correspond to the ELF magic number
+	 * and the next byte which indicates whether the file is 32-bit or 64-bit.
+	 */
+	if (p->stat.st_size < SELFMAG+1)
+		return 0;
+
+	fd = open_proc(PROC_SELF, "fd/%d", lfd);
+	if (fd < 0) {
+		pr_err("Build-ID (For validation) could not be obtained for file %s because can't open the file\n",
+				rfe->name);
+		return -1;
+	}
+
+	build_id_size = get_build_id(fd, &(p->stat), &build_id);
+	close(fd);
+	if (!build_id || build_id_size == -1)
+		return 0;
+
+	rfe->build_id = xmalloc(round_up(build_id_size, sizeof(uint32_t)));
+	if (!rfe->build_id) {
+		pr_warn("Build-ID (For validation) could not be set for file %s\n",
+				rfe->name);
+		return -1;
+	}
+
+	rfe->n_build_id = build_id_size;
+	memcpy(rfe->build_id, (void *) build_id, rfe->n_build_id);
+
+	xfree(build_id);
+	return 1;
+}
+
+/*
+ * This routine stores metadata about the open file (File size, build-id, CRC32C checksum)
+ * so that validation can be done while restoring to make sure that the right file is
+ * being restored.
+ * Returns true if atleast some metadata was stored, if there was an error it returns false.
+ */
+static bool store_validation_data(RegFileEntry *rfe,
+					const struct fd_parms *p, int lfd)
+{
+	int result = 1;
+
+	rfe->has_size = true;
+	rfe->size = p->stat.st_size;
+
+	result = store_validation_data_build_id(rfe, lfd, p);
+
+	if (result == -1)
+		return false;
+
+	if (!result)
+		pr_info("Only file size could be stored for validation for file %s\n",
+				rfe->name);
+	return true;
+}
+
 int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 {
 	struct fd_link _link, *link;
 	struct mount_info *mi;
 	struct cr_img *rimg;
 	char ext_id[64];
+	int ret;
 	FileEntry fe = FILE_ENTRY__INIT;
 	RegFileEntry rfe = REG_FILE_ENTRY__INIT;
 
@@ -1405,17 +1710,21 @@ ext:
 	rfe.has_mode	= true;
 	rfe.mode	= p->stat.st_mode;
 
-	if (S_ISREG(p->stat.st_mode) && should_check_size(rfe.flags)) {
-		rfe.has_size = true;
-		rfe.size = p->stat.st_size;
-	}
+	if (S_ISREG(p->stat.st_mode) && should_check_size(rfe.flags) &&
+		!store_validation_data(&rfe, p, lfd))
+		return -1;
 
 	fe.type = FD_TYPES__REG;
 	fe.id = rfe.id;
 	fe.reg = &rfe;
 
 	rimg = img_from_set(glob_imgset, CR_FD_FILES);
-	return pb_write_one(rimg, &fe, PB_FILE);
+	ret = pb_write_one(rimg, &fe, PB_FILE);
+
+	if (rfe.build_id)
+		xfree(rfe.build_id);
+
+	return ret;
 }
 
 const struct fdtype_ops regfile_dump_ops = {
@@ -1685,6 +1994,76 @@ out_root:
 	return 0;
 }
 
+/*
+ * Compares the file's build-id with the stored value.
+ * Returns 1 if the build-id of the file matches the build-id that was stored
+ * while dumping, -1 if there is a mismatch or 0 if the build-id has not been
+ * stored or could not be obtained.
+ */
+static int validate_with_build_id(const int fd, const struct stat *fd_status,
+					const struct reg_file_info *rfi)
+{
+	unsigned char *build_id;
+	int build_id_size;
+
+	if (!rfi->rfe->has_size)
+		return 1;
+
+	if (!rfi->rfe->n_build_id)
+		return 0;
+
+	build_id = NULL;
+	build_id_size = get_build_id(fd, fd_status, &build_id);
+	if (!build_id || build_id_size == -1)
+		return 0;
+
+	if (build_id_size != rfi->rfe->n_build_id) {
+		pr_err("File %s has bad build-ID length %d (expect %d)\n", rfi->path,
+				build_id_size, (int) rfi->rfe->n_build_id);
+		xfree(build_id);
+		return -1;
+	}
+
+	if (memcmp(build_id, rfi->rfe->build_id, build_id_size)) {
+		pr_err("File %s has bad build-ID\n", rfi->path);
+		xfree(build_id);
+		return -1;
+	}
+
+	xfree(build_id);
+	return 1;
+}
+
+/*
+ * This function determines whether it was the same file that was open during dump
+ * by checking the file's size, build-id and/or checksum with the same metadata
+ * that was stored before dumping.
+ * Checksum is calculated with CRC32C.
+ * Returns true if the metadata of the file matches the metadata stored while
+ * dumping else returns false.
+ */
+static bool validate_file(const int fd, const struct stat *fd_status,
+					const struct reg_file_info *rfi)
+{
+	int result = 1;
+
+	if (rfi->rfe->has_size && (fd_status->st_size != rfi->rfe->size)) {
+		pr_err("File %s has bad size %"PRIu64" (expect %"PRIu64")\n",
+				rfi->path, fd_status->st_size, rfi->rfe->size);
+		return false;
+	}
+
+	result = validate_with_build_id(fd, fd_status, rfi);
+
+	if (result == -1)
+		return false;
+
+	if (!result)
+		pr_info("File %s could only be validated with file size\n",
+				rfi->path);
+	return true;
+}
+
 int open_path(struct file_desc *d,
 		int(*open_cb)(int mntns_root, struct reg_file_info *, void *), void *arg)
 {
@@ -1779,12 +2158,8 @@ ext:
 			return -1;
 		}
 
-		if (rfi->rfe->has_size && (st.st_size != rfi->rfe->size)) {
-			pr_err("File %s has bad size %"PRIu64" (expect %"PRIu64")\n",
-					rfi->path, st.st_size,
-					rfi->rfe->size);
+		if (!validate_file(tmp, &st, rfi))
 			return -1;
-		}
 
 		if (rfi->rfe->has_mode && (st.st_mode != rfi->rfe->mode)) {
 			pr_err("File %s has bad mode 0%o (expect 0%o)\n",

From bb555b372019b934e841d48714381947ecd8e87c Mon Sep 17 00:00:00 2001
From: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
Date: Fri, 26 Jun 2020 16:31:47 +0530
Subject: [PATCH 0287/1854] criu/config.c: added cli option for build-id

file_validation_method field added to cr_options structure in
"criu/include/cr_options.h" along with the constants:
FILE_VALIDATION_FILE_SIZE
FILE_VALIDATION_BUILD_ID
FILE_VALIDATION_DEFAULT (Equal to FILE_VALIDATION_BUILD_ID)

Usage and description information is yet to be added

Usage:
--file-validation="filesize" (To use only the file size check)
--file-validation="buildid" (To try and use only the build-id check)

Signed-off-by: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
---
 Documentation/criu.txt    | 32 ++++++++++++++++++++++++++++++++
 criu/config.c             | 22 ++++++++++++++++++++++
 criu/crtools.c            |  3 +++
 criu/files-reg.c          |  6 ++++--
 criu/include/cr_options.h | 21 +++++++++++++++++++++
 5 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 6ce384163..ff6886d9d 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -400,6 +400,22 @@ By default the option is set to *fpu* and *ins*.
     option is intended for post-copy (lazy) migration and should be
     used in conjunction with *restore* with appropriate options.
 
+*--file-validation* ['mode']::
+    Set the method to be used to validate open files. Validation is done
+    to ensure that the version of the file being restored is the same
+    version when it was dumped.
+
+The 'mode' may be one of the following:
+
+    *filesize*:::
+                To explicitly use only the file size check all the time.
+                This is the fastest and least intensive check.
+
+    *buildid*:::
+                To validate ELF files with their build-ID. If the
+                build-ID cannot be obtained, 'chksm-first' method will be
+                used. This is the default if mode is unspecified.
+
 *restore*
 ~~~~~~~~~
 Restores previously checkpointed processes.
@@ -576,6 +592,22 @@ are not adequate, but this can be suppressed by using *--cpu-cap=none*.
    restored process.
    This option requires running *lazy-pages* daemon.
 
+*--file-validation* ['mode']::
+    Set the method to be used to validate open files. Validation is done
+    to ensure that the version of the file being restored is the same
+    version when it was dumped.
+
+The 'mode' may be one of the following:
+
+    *filesize*:::
+                To explicitly use only the file size check all the time.
+                This is the fastest and least intensive check.
+
+    *buildid*:::
+                To validate ELF files with their build-ID. If the
+                build-ID cannot be obtained, 'chksm-first' method will be
+                used. This is the default if mode is unspecified.
+
 *check*
 ~~~~~~~
 Checks whether the kernel supports the features needed by *criu* to
diff --git a/criu/config.c b/criu/config.c
index 3a3a13edb..08606fb33 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -280,6 +280,7 @@ void init_opts(void)
 	opts.status_fd = -1;
 	opts.log_level = DEFAULT_LOGLEVEL;
 	opts.pre_dump_mode = PRE_DUMP_SPLICE;
+	opts.file_validation_method = FILE_VALIDATION_DEFAULT;
 }
 
 bool deprecated_ok(char *what)
@@ -420,6 +421,22 @@ static int parse_join_ns(const char *ptr)
 	return 0;
 }
 
+static int parse_file_validation_method(struct cr_options *opts, const char *optarg)
+{
+	if (!strcmp(optarg, "filesize"))
+		opts->file_validation_method = FILE_VALIDATION_FILE_SIZE;
+	else if (!strcmp(optarg, "buildid"))
+		opts->file_validation_method = FILE_VALIDATION_BUILD_ID;
+	else
+		goto Esyntax;
+
+	return 0;
+
+Esyntax:
+	pr_err("Unknown file validation method `%s' selected\n", optarg);
+	return -1;
+}
+
 /*
  * parse_options() is the point where the getopt parsing happens. The CLI
  * parsing as well as the configuration file parsing happens here.
@@ -523,6 +540,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		{"tls-no-cn-verify",		no_argument,		&opts.tls_no_cn_verify, true},
 		{ "cgroup-yard",		required_argument,	0, 1096 },
 		{ "pre-dump-mode",		required_argument,	0, 1097},
+		{ "file-validation",		required_argument,	0, 1098	},
 		{ },
 	};
 
@@ -848,6 +866,10 @@ int parse_options(int argc, char **argv, bool *usage_error,
 				return 1;
 			}
 			break;
+		case 1098:
+			if (parse_file_validation_method(&opts, optarg))
+				return 2;
+			break;
 		case 'V':
 			pr_msg("Version: %s\n", CRIU_VERSION);
 			if (strcmp(CRIU_GITID, "0"))
diff --git a/criu/crtools.c b/criu/crtools.c
index 4f5d13957..7a32d9443 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -437,6 +437,9 @@ usage:
 "			Namespace can be specified as either pid or file path.\n"
 "			OPTIONS can be used to specify parameters for userns:\n"
 "			    user:PID,UID,GID\n"
+"  --file-validation METHOD\n"
+			"pass the validation method to be used; argument\n"
+			"can be 'filesize' or 'buildid' (default).\n"
 "\n"
 "Check options:\n"
 "  Without options, \"criu check\" checks availability of absolutely required\n"
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 27b8164ce..2914b4941 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1632,7 +1632,8 @@ static bool store_validation_data(RegFileEntry *rfe,
 	rfe->has_size = true;
 	rfe->size = p->stat.st_size;
 
-	result = store_validation_data_build_id(rfe, lfd, p);
+	if (opts.file_validation_method == FILE_VALIDATION_BUILD_ID)
+		result = store_validation_data_build_id(rfe, lfd, p);
 
 	if (result == -1)
 		return false;
@@ -2053,7 +2054,8 @@ static bool validate_file(const int fd, const struct stat *fd_status,
 		return false;
 	}
 
-	result = validate_with_build_id(fd, fd_status, rfi);
+	if (opts.file_validation_method == FILE_VALIDATION_BUILD_ID)
+		result = validate_with_build_id(fd, fd_status, rfi);
 
 	if (result == -1)
 		return false;
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index d5655212d..ac1c9e9c7 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -63,6 +63,24 @@ struct cg_root_opt {
 
 #define DEFAULT_TIMEOUT		10
 
+enum FILE_VALIDATION_OPTIONS
+{
+	/*
+	 * This constant indicates that the file validation should be tried with the
+	 * file size method by default.
+	 */
+	FILE_VALIDATION_FILE_SIZE,
+
+	/*
+	 * This constant indicates that the file validation should be tried with the
+	 * build-ID method by default.
+	 */
+	FILE_VALIDATION_BUILD_ID
+};
+
+/* This constant dictates which file validation method should be tried by default. */
+#define FILE_VALIDATION_DEFAULT			FILE_VALIDATION_BUILD_ID
+
 struct irmap;
 
 struct irmap_path_opt {
@@ -153,6 +171,9 @@ struct cr_options {
 	char			*tls_key;
 	int			tls;
 	int			tls_no_cn_verify;
+
+	/* This stores which method to use for file validation. */
+	int 			file_validation_method;
 };
 
 extern struct cr_options opts;

From a93df9eb9b811b99c566ec862508d1e48af0e574 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 5 May 2020 14:53:08 +0000
Subject: [PATCH 0288/1854] pidns: fixup

I pushed the wrong branch to the pidns PR

https://github.com/checkpoint-restore/criu/pull/1056

which resulted in the wrong patches getting merged.

This is the actual result from the review.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-restore.c         | 67 +++++++++++++++++----------------------
 criu/include/magic.h      |  2 +-
 test/others/ns_ext/run.sh | 24 ++++++++++++--
 3 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ec0c280b7..d654b0dd7 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1335,9 +1335,10 @@ static bool needs_prep_creds(struct pstree_item *item)
 	return (!item->parent && ((root_ns_mask & CLONE_NEWUSER) || getuid()));
 }
 
-static int write_ns_last_pid(pid_t pid)
+static int set_next_pid(void *arg)
 {
 	char buf[32];
+	pid_t *pid = arg;
 	int len;
 	int fd;
 
@@ -1345,10 +1346,10 @@ static int write_ns_last_pid(pid_t pid)
 	if (fd < 0)
 		return -1;
 
-	len = snprintf(buf, sizeof(buf), "%d", pid - 1);
+	len = snprintf(buf, sizeof(buf), "%d", *pid - 1);
 	if (write(fd, buf, len) != len) {
-		pr_perror("%d: Write %s to %s", pid, buf,
-			LAST_PID_PATH);
+		pr_perror("Failed to write %s to /proc/%s",
+			buf, LAST_PID_PATH);
 		close(fd);
 		return -1;
 	}
@@ -1416,7 +1417,10 @@ static inline int fork_with_pid(struct pstree_item *item)
 		int fd;
 
 		/* Not possible to restore into an empty PID namespace. */
-		BUG_ON(pid == INIT_PID);
+		if (pid == INIT_PID) {
+			pr_err("Unable to restore into an empty PID namespace\n");
+			return -1;
+		}
 
 		/*
 		 * Restoring into an existing namespace means that CLONE_NEWPID
@@ -1433,6 +1437,10 @@ static inline int fork_with_pid(struct pstree_item *item)
 
 		ret = switch_ns_by_fd(fd, &pid_ns_desc, NULL);
 		close(fd);
+		if (ret) {
+			pr_err("Unable to enter existing PID namespace\n");
+			return -1;
+		}
 
 		/*
 		 * If a process without a PID namespace is restored into
@@ -1444,8 +1452,6 @@ static inline int fork_with_pid(struct pstree_item *item)
 	}
 
 	if (!(clone_flags & CLONE_NEWPID)) {
-		pid_t helper_pid = -1;
-
 		lock_last_pid();
 
 		if (!kdat.has_clone3_set_tid) {
@@ -1456,38 +1462,23 @@ static inline int fork_with_pid(struct pstree_item *item)
 				 * so much easier and simpler. As long as CRIU supports
 				 * clone() this is needed.
 				 */
-				helper_pid = fork();
-				if (helper_pid < 0) {
-					pr_perror("Cannot fork ns_last_pid writer");
-					goto err_unlock;
-				}
+				ret = call_in_child_process(set_next_pid, (void *)&pid);
+			} else {
+				ret = set_next_pid((void *)&pid);
 			}
-			if (helper_pid <= 0) {
-				ret = write_ns_last_pid(pid);
-				if (ret == -1 && helper_pid == -1)
-					goto err_unlock;
-				if (helper_pid == 0)
-					exit(ret);
-			}
-			if (helper_pid > 0) {
-				/* We forked and this is the parent. */
-				int status;
-
-				ret = waitpid(-1, &status, 0);
-				if (ret < 0) {
-					pr_perror("Cannot wait for ns_last_pid writer");
-					goto err_unlock;
-				}
-				if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-					pr_err("Writing ns_last_pid failed with error %d\n", status);
-					ret = -1;
-					goto err_unlock;
-				}
+			if (ret != 0) {
+				pr_err("Setting PID failed");
+				goto err_unlock;
 			}
 		}
 	} else {
-		if (!(pid_ns && pid_ns->ext_key))
-			BUG_ON(pid != INIT_PID);
+		if (!(pid_ns && pid_ns->ext_key)) {
+			if (pid != INIT_PID) {
+				pr_err("First PID in a PID namespace needs to be %d and not %d\n",
+					pid, INIT_PID);
+				return -1;
+			}
+		}
 	}
 
 	if (kdat.has_clone3_set_tid) {
@@ -2227,6 +2218,9 @@ static int restore_root_task(struct pstree_item *init)
 	 * this later.
 	 */
 
+	if (prepare_userns_hook())
+		return -1;
+
 	if (prepare_namespace_before_tasks())
 		return -1;
 
@@ -2243,9 +2237,6 @@ static int restore_root_task(struct pstree_item *init)
 		return -1;
 	}
 
-	if (prepare_userns_hook())
-		return -1;
-
 	__restore_switch_stage_nw(CR_STATE_ROOT_TASK);
 
 	ret = fork_with_pid(init);
diff --git a/criu/include/magic.h b/criu/include/magic.h
index ac5cd8033..1dff50236 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -96,7 +96,7 @@
 #define FILES_MAGIC		0x56303138 /* Toropets */
 #define MEMFD_INODE_MAGIC	0x48453499 /* Dnipro */
 #define TIMENS_MAGIC		0x43114433 /* Beslan */
-#define PIDNS_MAGIC		0x12345678
+#define PIDNS_MAGIC		0x61157326 /* Surgut */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/test/others/ns_ext/run.sh b/test/others/ns_ext/run.sh
index 32e75c42d..4b57f8c59 100755
--- a/test/others/ns_ext/run.sh
+++ b/test/others/ns_ext/run.sh
@@ -26,6 +26,7 @@ CRIU=../../../criu/criu
 if [[ "$NS" == "net" ]]; then
 	setsid unshare -n bash -c 'unshare -n sh _run.sh pidfile2 & unshare -n sh _run.sh pidfile3 & ip link add xxx type veth && ip link add mymacvlan1 link xxx type macvlan mode bridge && . _run.sh pidfile' < /dev/zero &> output &
 elif [[ "$NS" == "pid" ]]; then
+	# Adding some random values to the command-line to easily grep the correct process later
 	RND1=$RANDOM
 	RND2=$RANDOM
 	setsid unshare -p -f setsid bash -c "setsid sh _run.sh pidfile2 $RND2 & . _run.sh pidfile $RND1" < /dev/zero &> output &
@@ -36,12 +37,15 @@ while :; do
 	sleep 0.1
 done
 
+# Figure out the PIDs of the relevant processes
 if [[ "$NS" == "net" ]]; then
 	pid=$(cat pidfile)
 	pid2=$(cat pidfile2)
 elif [[ "$NS" == "pid" ]]; then
+	# Unfortunately we cannot read out 'pidfile' as it contains the PID
+	# from within the PID namespace. We need to know the outside PID.
 	pid2=$(pgrep -f ". _run.sh pidfile $RND1" -n)
-	pid=$(pgrep -f "sh _run.sh pidfile2 $RND2" -n)
+	pid=$(pgrep -x -f "^sh _run.sh pidfile2 $RND2" -o)
 fi
 
 touch $MNT1
@@ -54,19 +58,35 @@ ino2=$(ls -iL $MNT2 | awk '{ print $1 }')
 exec 33< $MNT1
 exec 34< $MNT2
 $CRIU dump -v4 -t $pid -o dump.log -D images --external $NS[$ino]:test_ns --external $NS[$ino2]:test_ns2
+RESULT=$?
 cat images/dump.log | grep -B 5 Error || echo ok
+[ "$RESULT" != "0" ] && {
+	echo "CRIU dump failed"
+	echo FAIL
+	exit 1
+}
+
 $CRIU restore -v4 -o restore.log -D images --inherit-fd fd[33]:test_ns --inherit-fd fd[34]:test_ns2 -d
+RESULT=$?
 cat images/restore.log | grep -B 5 Error || echo ok
+[ "$RESULT" != "0" ] && {
+	echo "CRIU restore failed"
+	echo FAIL
+	exit 1
+}
+
 if [[ "$NS" == "pid" ]]; then
-	pid=$(pgrep -f "^sh _run.sh pidfile2 $RND2")
+	pid=$(pgrep -x -f "^sh _run.sh pidfile2 $RND2")
 fi
 new_ino=$(ls -iL /proc/$pid/ns/$NS | awk '{ print $1 }')
 new_ino2=$(ls -iL /proc/$pid2/ns/$NS | awk '{ print $1 }')
 [ "$ino" != "$new_ino" ] && {
+	echo "Inode of new NS is different"
 	echo FAIL
 	exit 1
 }
 [ "$ino2" != "$new_ino2" ] && {
+	echo "Inode of new NS is different"
 	echo FAIL
 	exit 1
 }

From 98e9165f0cbe821995c8903ee24ceb7f1515c2c7 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 19 Jun 2020 10:33:49 +0300
Subject: [PATCH 0289/1854] cgroup: Add the initial support for cgroup2

This change is very straightforward. We don't skip the cgroup2
controller and dump it as any other controllers.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cgroup.c     | 31 ++++++++++++++++++++++++-------
 criu/proc_parse.c | 26 ++++++--------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 3737772df..1f6d57257 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -194,6 +194,11 @@ static bool cgroup_contains(char **controllers,
 {
 	unsigned int i;
 	bool all_match = true;
+
+	/* Check whether this cgroup2 or not.*/
+	if (n_controllers == 1 && controllers[0][0] == 0)
+		return name[0] == 0;
+
 	for (i = 0; i < n_controllers; i++) {
 		bool found = false;
 		const char *loc = name;
@@ -548,10 +553,11 @@ static int add_freezer_state(struct cg_controller *controller)
 static const char namestr[] = "name=";
 static int __new_open_cgroupfs(struct cg_ctl *cc)
 {
+	const char *fstype = cc->name[0] == 0 ? "cgroup2" : "cgroup";
 	int fsfd, fd;
 	char *name;
 
-	fsfd = sys_fsopen("cgroup", 0);
+	fsfd = sys_fsopen(fstype, 0);
 	if (fsfd < 0) {
 		pr_perror("Unable to open the cgroup file system");
 		return -1;
@@ -563,7 +569,7 @@ static int __new_open_cgroupfs(struct cg_ctl *cc)
 			pr_perror("Unable to configure the cgroup (%s) file system", cc->name);
 			goto err;
 		}
-	} else {
+	} else if (cc->name[0] != 0)  { /* cgroup v1 */
 		char *saveptr = NULL, *buf = strdupa(cc->name);
 		name = strtok_r(buf, ",", &saveptr);
 		while (name) {
@@ -593,6 +599,7 @@ err:
 
 static int open_cgroupfs(struct cg_ctl *cc)
 {
+	const char *fstype = cc->name[0] == 0 ? "cgroup2" : "cgroup";
 	char prefix[] = ".criu.cgmounts.XXXXXX";
 	char mopts[1024];
 	int fd;
@@ -610,7 +617,7 @@ static int open_cgroupfs(struct cg_ctl *cc)
 		return -1;
 	}
 
-	if (mount("none", prefix, "cgroup", 0, mopts) < 0) {
+	if (mount("none", prefix, fstype, 0, mopts) < 0) {
 		pr_perror("Unable to mount %s", mopts);
 		rmdir(prefix);
 		return -1;
@@ -673,6 +680,8 @@ static int collect_cgroups(struct list_head *ctls)
 			off = snprintf(dir_path, PATH_MAX, "%s/", opts.cgroup_yard);
 			if (strstartswith(cc->name, namestr))
 				snprintf(dir_path + off, PATH_MAX - off, "%s", cc->name + strlen(namestr));
+			else if (cc->name[0] == 0)
+				snprintf(dir_path + off, PATH_MAX - off, "unified");
 			else
 				snprintf(dir_path + off, PATH_MAX - off, "%s", cc->name);
 
@@ -1027,7 +1036,10 @@ static int ctrl_dir_and_opt(CgControllerEntry *ctl, char *dir, int ds,
 			}
 		}
 
-		doff += snprintf(dir + doff, ds - doff, "%s,", n);
+		if (n[0] == 0)
+			doff += snprintf(dir + doff, ds - doff, "unified");
+		else
+			doff += snprintf(dir + doff, ds - doff, "%s,", n);
 		if (opt)
 			ooff += snprintf(opt + ooff, os - ooff, "%s,", ctl->cnames[i]);
 	}
@@ -1138,7 +1150,7 @@ static int prepare_cgns(CgSetEntry *se)
 			ce->path[ce->cgns_prefix] = '\0';
 
 			pr_info("setting cgns prefix to %s\n", ce->path);
-			snprintf(aux + aux_off, sizeof(aux) - aux_off, "/%s/tasks", ce->path);
+			snprintf(aux + aux_off, sizeof(aux) - aux_off, "/%s/cgroup.procs", ce->path);
 			ce->path[ce->cgns_prefix] = tmp;
 			if (userns_call(userns_move, 0, aux, strlen(aux) + 1, -1) < 0) {
 				pr_perror("couldn't set cgns prefix %s", aux);
@@ -1196,7 +1208,7 @@ static int move_in_cgroup(CgSetEntry *se, bool setup_cgns)
 		 * the root cgns, we still want to use the full path here when
 		 * we move into the cgroup.
 		 */
-		snprintf(aux + aux_off, sizeof(aux) - aux_off, "/%s/tasks", ce->path);
+		snprintf(aux + aux_off, sizeof(aux) - aux_off, "/%s/cgroup.procs", ce->path);
 		pr_debug("  `-> %s\n", aux);
 		err = userns_call(userns_move, 0, aux, strlen(aux) + 1, -1);
 		if (err < 0) {
@@ -1791,12 +1803,17 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 
 		/* Create controller if not yet present */
 		if (access(paux, F_OK)) {
+			char *fstype = "cgroup";
+
+			if (ctrl->cnames[0][0] == 0)
+				fstype = "cgroup2";
+
 			pr_debug("\tMaking controller dir %s (%s)\n", paux, opt);
 			if (mkdir(paux, 0700)) {
 				pr_perror("\tCan't make controller dir %s", paux);
 				goto err;
 			}
-			if (mount("none", paux, "cgroup", 0, opt) < 0) {
+			if (mount("none", paux, fstype, 0, opt) < 0) {
 				pr_perror("\tCan't mount controller dir %s", paux);
 				goto err;
 			}
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index d1ccd9281..ddae618f9 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -2374,20 +2374,13 @@ int parse_cgroup_file(FILE *f, struct list_head *retl, unsigned int *n)
 		 * 2:name=systemd:/user.slice/user-1000.slice/session-1.scope
 		 */
 		name = strchr(buf, ':');
-		if (name) {
-			path = strchr(++name, ':');
-			if (*name == ':') {
-				/*
-				 * It's unified hierarchy. On kernels with legacy
-				 * tree this item is added automatically, so we
-				 * can just skip one. For those with full unified
-				 * support is on ... we need to write new code.
-				 */
-				xfree(ncc);
-				continue;
-			}
+		if (!name) {
+			pr_err("Failed parsing cgroup %s\n", buf);
+			xfree(ncc);
+			goto err;
 		}
-		if (!name || !path) {
+			path = strchr(++name, ':');
+		if (!path) {
 			pr_err("Failed parsing cgroup %s\n", buf);
 			xfree(ncc);
 			goto err;
@@ -2550,13 +2543,6 @@ int collect_controllers(struct list_head *cgroups, unsigned int *n_cgroups)
 		}
 		controllers++;
 
-		if (*controllers == ':')
-			/*
-			 * Unified hier. See comment in parse_cgroup_file
-			 * for more details.
-			 */
-			continue;
-
 		off = strchr(controllers, ':');
 		if (!off) {
 			pr_err("Unable to parse \"%s\"\n", buf);

From 5f160811aa180de0f9dbd4f1f6b155831ee33a03 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 19 Jun 2020 10:40:02 +0300
Subject: [PATCH 0290/1854] zdtm.py: add the cgroup2 freezer support

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 49387e43e..dff64d4ed 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1667,6 +1667,37 @@ class noop_freezer:
         return []
 
 
+class cg_freezer2:
+    def __init__(self, path, state):
+        self.__path = '/sys/fs/cgroup/' + path
+        self.__state = state
+        self.kernel = True
+
+    def attach(self):
+        if not os.access(self.__path, os.F_OK):
+            os.makedirs(self.__path)
+        with open(self.__path + '/cgroup.procs', 'w') as f:
+            f.write('0')
+
+    def __set_state(self, state):
+        with open(self.__path + '/cgroup.freeze', 'w') as f:
+            f.write(state)
+
+    def freeze(self):
+        if self.__state.startswith('f'):
+            self.__set_state('1')
+
+    def thaw(self):
+        if self.__state.startswith('f'):
+            self.__set_state('0')
+
+    def getdopts(self):
+        return ['--freeze-cgroup', self.__path, '--manage-cgroups']
+
+    def getropts(self):
+        return ['--manage-cgroups']
+
+
 class cg_freezer:
     def __init__(self, path, state):
         self.__path = '/sys/fs/cgroup/freezer/' + path
@@ -1703,7 +1734,11 @@ def get_freezer(desc):
         return noop_freezer()
 
     fd = desc.split(':')
-    fr = cg_freezer(path=fd[0], state=fd[1])
+
+    if os.access("/sys/fs/cgroup/user.slice/cgroup.procs", os .F_OK):
+        fr = cg_freezer2(path=fd[0], state=fd[1])
+    else:
+        fr = cg_freezer(path=fd[0], state=fd[1])
     return fr
 
 

From f96cd8c749448ee7c976f38f7fcbdf3d153278f7 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 19 Jun 2020 10:41:35 +0300
Subject: [PATCH 0291/1854] tests: skip cgroup04 and cgroup_ifpriomap on pure
 cgroup2 systems

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/travis/vagrant.sh                   | 2 +-
 test/zdtm/static/cgroup04.checkskip         | 3 +++
 test/zdtm/static/cgroup_ifpriomap.checkskip | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 test/zdtm/static/cgroup04.checkskip
 create mode 100755 test/zdtm/static/cgroup_ifpriomap.checkskip

diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
index 46740efc3..a606c45f5 100755
--- a/scripts/travis/vagrant.sh
+++ b/scripts/travis/vagrant.sh
@@ -46,7 +46,7 @@ fedora-no-vdso() {
 	ssh default cat /proc/cmdline
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
 	# Excluding two cgroup tests which seem to fail because of cgroup2
-	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a -x zdtm/static/cgroup04 -x zdtm/static/cgroup_ifpriomap --keep-going'
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going'
 }
 
 $1
diff --git a/test/zdtm/static/cgroup04.checkskip b/test/zdtm/static/cgroup04.checkskip
new file mode 100755
index 000000000..205f8fc53
--- /dev/null
+++ b/test/zdtm/static/cgroup04.checkskip
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+! test -f /sys/fs/cgroup/cgroup.controllers
diff --git a/test/zdtm/static/cgroup_ifpriomap.checkskip b/test/zdtm/static/cgroup_ifpriomap.checkskip
new file mode 100755
index 000000000..205f8fc53
--- /dev/null
+++ b/test/zdtm/static/cgroup_ifpriomap.checkskip
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+! test -f /sys/fs/cgroup/cgroup.controllers

From f92948ccaf7dc34549a542d981d6ba3359237de9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 19 Jun 2020 10:43:30 +0300
Subject: [PATCH 0292/1854] zdtm: make cgroup_yard to be aware of cgroup2

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/cgroup_yard.hook | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/cgroup_yard.hook b/test/zdtm/static/cgroup_yard.hook
index 072b9d38d..d06bc45fd 100755
--- a/test/zdtm/static/cgroup_yard.hook
+++ b/test/zdtm/static/cgroup_yard.hook
@@ -18,7 +18,7 @@ if sys.argv[1] == "--post-start":
 			cgr = line.split(":")[1]
 
 			if cgr == "":
-				continue
+				cgr = "unified"
 
 			if cgr.startswith("name="):
 				ctrl = cgr[len("name="):]
@@ -28,7 +28,10 @@ if sys.argv[1] == "--post-start":
 				opts = cgr
 
 			os.mkdir(yard + "/" + ctrl)
-			subprocess.check_call(["mount", "-t", "cgroup", "none", yard + "/" + ctrl, "-o", opts])
+			if cgr == "unified":
+				subprocess.check_call(["mount", "-t", "cgroup2", "none", yard + "/" + ctrl])
+			else:
+				subprocess.check_call(["mount", "-t", "cgroup", "none", yard + "/" + ctrl, "-o", opts])
 
 if sys.argv[1] in ["--pre-restore", "--clean"]:
 	'''

From 8ac0fa6aaf92f3d3893058fdc97757445621e2da Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Mon, 6 Jul 2020 14:32:20 +0000
Subject: [PATCH 0293/1854] compel: add error message for COMMON symbols

COMMON symbols are emitted for global variable that are not initialized
in shared libraries.
They typically end up in the .bss section when linking an executable.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/src/lib/handle-elf.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index e97d75026..fd5ca3405 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -334,6 +334,15 @@ int __handle_elf(void *mem, size_t size)
 				pr_err("Unexpected undefined symbol: `%s'. External symbol in PIE?\n", name);
 				goto err;
 #endif
+			} else if (sym->st_shndx == SHN_COMMON) {
+				/*
+				 * To support COMMON symbols, we could
+				 * allocate these variables somewhere,
+				 * perhaps somewhere near the GOT table.
+				 * For now, we punt.
+				 */
+				pr_err("Unsupported COMMON symbol: `%s'. Try initializing the variable\n", name);
+				goto err;
 			}
 
 			if (sh->sh_type == SHT_REL) {

From a531f9a8bc61a39c89599dd8c5206c3d519aa71d Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 17 Jul 2020 00:01:41 +0000
Subject: [PATCH 0294/1854] compel: pass the parasite_blob_desc to
 compel_relocs_apply()

compel_relocs_apply() was taking arguments mostly from the struct
parasite_blob_desc. Instead of passing all the arguments, we pass a
pointer to the struct itself.

This makes the code safer, as cr-restore.c calls compel_relocs_apply().
It previously needed to poke into what can be considered private
variables of the restorer-pie.h file.

To allow the parasite_blob_desc struct to be populated without a
parasite_ctl struct, we expand the compel API to export a
parasite_setup_c_header_desc() in the generated pie.h.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/arch/mips/src/lib/infect.c |  6 ++++--
 compel/include/uapi/infect.h      |  4 ++--
 compel/src/lib/handle-elf.c       | 14 +++++++++-----
 compel/src/lib/infect.c           | 13 ++++++++-----
 criu/cr-restore.c                 | 11 +++++++++--
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index a7dcea55a..521528f76 100755
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -262,9 +262,11 @@ int ptrace_set_regs(int pid, user_regs_struct_t *regs)
     return ptrace(PTRACE_SETREGS, pid, NULL, regs);
 }
 
-void compel_relocs_apply_mips(void *mem, void *vbase, compel_reloc_t *elf_relocs, size_t nr_relocs)
+void compel_relocs_apply_mips(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 {
-    size_t i, j;
+	compel_reloc_t *elf_relocs = pbd->hdr.relocs;
+	size_t nr_relocs = pbd->hdr.nr_relocs;
+	size_t i, j;
 
       /*
        * mips rebasing :load time relocation
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 4f14c7270..dbcb7fc85 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -164,8 +164,8 @@ extern struct parasite_blob_desc *compel_parasite_blob_desc(struct parasite_ctl
 
 extern int __must_check compel_get_thread_regs(struct parasite_thread_ctl *, save_regs_t, void *);
 
-extern void compel_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs);
-extern void compel_relocs_apply_mips(void *mem, void *vbase, compel_reloc_t *elf_relocs, size_t nr_relocs);
+extern void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd);
+extern void compel_relocs_apply_mips(void *mem, void *vbase, struct parasite_blob_desc *pbd);
 
 extern unsigned long compel_task_size(void);
 
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index fd5ca3405..6b54d5544 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -681,20 +681,17 @@ int __handle_elf(void *mem, size_t size)
 	}
 	pr_out("};\n");
 	pr_out("\n");
-	pr_out("static void __maybe_unused %s_setup_c_header(struct parasite_ctl *ctl)\n",
+	pr_out("static void __maybe_unused %s_setup_c_header_desc(struct parasite_blob_desc *pbd, bool native)\n",
 			opts.prefix);
 	pr_out(
 "{\n"
-"	struct parasite_blob_desc *pbd;\n"
-"\n"
-"	pbd = compel_parasite_blob_desc(ctl);\n"
 "	pbd->parasite_type	= COMPEL_BLOB_CHEADER;\n"
 );
 	pr_out("\tpbd->hdr.mem		= %s_blob;\n", opts.prefix);
 	pr_out("\tpbd->hdr.bsize		= sizeof(%s_blob);\n",
 			opts.prefix);
 	pr_out("\tpbd->hdr.nr_gotpcrel	= %s_nr_gotpcrel;\n", opts.prefix);
-	pr_out("\tif (compel_mode_native(ctl))\n");
+	pr_out("\tif (native)\n");
 	pr_out("\t\tpbd->hdr.parasite_ip_off	= "
 		"%s_sym__export_parasite_head_start;\n", opts.prefix);
 	pr_out("#ifdef CONFIG_COMPAT\n");
@@ -711,6 +708,13 @@ int __handle_elf(void *mem, size_t size)
 			"sizeof(%s_relocs) / sizeof(%s_relocs[0]);\n",
 			opts.prefix, opts.prefix);
 	pr_out("}\n");
+	pr_out("\n");
+	pr_out("static void __maybe_unused %s_setup_c_header(struct parasite_ctl *ctl)\n",
+			opts.prefix);
+	pr_out("{\n");
+	pr_out("\t%s_setup_c_header_desc(compel_parasite_blob_desc(ctl), compel_mode_native(ctl));\n", opts.prefix);
+	pr_out("}\n");
+
 	ret = 0;
 err:
 	free(sec_hdrs);
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 296ffcbd0..3abbb4e2f 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -814,11 +814,16 @@ err_cure:
 	return -1;
 }
 
-void compel_relocs_apply(void *mem, void *vbase, size_t size, compel_reloc_t *elf_relocs, size_t nr_relocs)
+void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 {
+	size_t size = pbd->hdr.bsize;
+	compel_reloc_t *elf_relocs = pbd->hdr.relocs;
+	size_t nr_relocs = pbd->hdr.nr_relocs;
+
 	size_t i, j;
+
 #ifdef CONFIG_MIPS
-	compel_relocs_apply_mips(mem, vbase, elf_relocs, nr_relocs);
+	compel_relocs_apply_mips(mem, vbase, pbd);
 #else
 	for (i = 0, j = 0; i < nr_relocs; i++) {
 		if (elf_relocs[i].type & COMPEL_TYPE_LONG) {
@@ -904,9 +909,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	ctl->addr_args = ctl->local_map + ctl->pblob.hdr.addr_arg_off;
 
 	memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
-	if (ctl->pblob.hdr.nr_relocs)
-		compel_relocs_apply(ctl->local_map, ctl->remote_map, ctl->pblob.hdr.bsize,
-				    ctl->pblob.hdr.relocs, ctl->pblob.hdr.nr_relocs);
+	compel_relocs_apply(ctl->local_map, ctl->remote_map, &ctl->pblob);
 
 	p = parasite_size;
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d654b0dd7..3d135af4b 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2928,6 +2928,7 @@ static int prepare_restorer_blob(void)
 
 static int remap_restorer_blob(void *addr)
 {
+	struct parasite_blob_desc pbd;
 	void *mem;
 
 	mem = mremap(restorer, restorer_len, restorer_len,
@@ -2937,8 +2938,14 @@ static int remap_restorer_blob(void *addr)
 		return -1;
 	}
 
-	compel_relocs_apply(addr, addr, sizeof(restorer_blob),
-			restorer_relocs, ARRAY_SIZE(restorer_relocs));
+	/*
+	 * Pass native=true, which is then used to set the value of
+	 * pbd.parasite_ip_off. parasite_ip_off is unused in restorer
+	 * as compat (ia32) tasks are restored from native (x86_64)
+	 * mode, so the value we pass as native argument is not relevant.
+	 */
+	restorer_setup_c_header_desc(&pbd, true);
+	compel_relocs_apply(addr, addr, &pbd);
 
 	return 0;
 }

From d99fc1e55364db64a2fd9a4df19b134beca10f34 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 17 Jul 2020 01:56:37 +0000
Subject: [PATCH 0295/1854] compel: remove "addr_" from offset variable names

It removes the potential confusion when it comes to virtual address vs
offsets. Further, doing so makes naming more consistent with the rest of
the parasite_blob_desc struct.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/include/infect-priv.h |  4 ++--
 compel/include/uapi/infect.h |  4 ++--
 compel/src/lib/handle-elf.c  |  4 ++--
 compel/src/lib/infect.c      | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index ec6dd455d..8e1f990d5 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -33,8 +33,8 @@ struct parasite_ctl {
 
 	unsigned long		parasite_ip;				/* service routine start ip */
 
-	unsigned int		*addr_cmd;				/* addr for command */
-	void			*addr_args;				/* address for arguments */
+	unsigned int		*cmd;					/* address for command */
+	void			*args;					/* address for arguments */
 	unsigned long		args_size;
 	int			tsock;					/* transport socket for transferring fds */
 
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index dbcb7fc85..aebaa8f75 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -152,8 +152,8 @@ struct parasite_blob_desc {
 			size_t			bsize;
 			size_t			nr_gotpcrel;
 			unsigned long		parasite_ip_off;
-			unsigned long		addr_cmd_off;
-			unsigned long		addr_arg_off;
+			unsigned long		cmd_off;
+			unsigned long		args_off;
 			compel_reloc_t		*relocs;
 			unsigned int		nr_relocs;
 		} hdr;
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 6b54d5544..6fb0fb37f 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -699,9 +699,9 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("\t\tpbd->hdr.parasite_ip_off	= "
 		"%s_sym__export_parasite_head_start_compat;\n", opts.prefix);
 	pr_out("#endif /* CONFIG_COMPAT */\n");
-	pr_out("\tpbd->hdr.addr_cmd_off	= "
+	pr_out("\tpbd->hdr.cmd_off	= "
 			"%s_sym__export_parasite_cmd;\n", opts.prefix);
-	pr_out("\tpbd->hdr.addr_arg_off	= "
+	pr_out("\tpbd->hdr.args_off	= "
 			"%s_sym__export_parasite_args;\n", opts.prefix);
 	pr_out("\tpbd->hdr.relocs		= %s_relocs;\n", opts.prefix);
 	pr_out("\tpbd->hdr.nr_relocs	= "
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 3abbb4e2f..94a1883ab 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -612,7 +612,7 @@ static int parasite_init_daemon(struct parasite_ctl *ctl)
 	user_regs_struct_t regs;
 	struct ctl_msg m = { };
 
-	*ctl->addr_cmd = PARASITE_CMD_INIT_DAEMON;
+	*ctl->cmd = PARASITE_CMD_INIT_DAEMON;
 
 	args = compel_parasite_args(ctl, struct parasite_init_args);
 
@@ -905,8 +905,8 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	pr_info("Putting parasite blob into %p->%p\n", ctl->local_map, ctl->remote_map);
 
 	ctl->parasite_ip = (unsigned long)(ctl->remote_map + ctl->pblob.hdr.parasite_ip_off);
-	ctl->addr_cmd = ctl->local_map + ctl->pblob.hdr.addr_cmd_off;
-	ctl->addr_args = ctl->local_map + ctl->pblob.hdr.addr_arg_off;
+	ctl->cmd = ctl->local_map + ctl->pblob.hdr.cmd_off;
+	ctl->args = ctl->local_map + ctl->pblob.hdr.args_off;
 
 	memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
 	compel_relocs_apply(ctl->local_map, ctl->remote_map, &ctl->pblob);
@@ -1364,7 +1364,7 @@ int compel_cure(struct parasite_ctl *ctl)
 
 void *compel_parasite_args_p(struct parasite_ctl *ctl)
 {
-	return ctl->addr_args;
+	return ctl->args;
 }
 
 void *compel_parasite_args_s(struct parasite_ctl *ctl, unsigned long args_size)
@@ -1382,7 +1382,7 @@ int compel_run_in_thread(struct parasite_thread_ctl *tctl, unsigned int cmd)
 	user_regs_struct_t regs = octx->regs;
 	int ret;
 
-	*ctl->addr_cmd = cmd;
+	*ctl->cmd = cmd;
 
 	ret = parasite_run(pid, PTRACE_CONT, ctl->parasite_ip, stack, &regs, octx);
 	if (ret == 0)

From 391da7464747d561452a0dd78c43a00f3c5f4e69 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 17 Jul 2020 01:37:46 +0000
Subject: [PATCH 0296/1854] compel: stop rounding up the parasite blob size and
 args region to PAGE_SIZE

It is unnecessary and potentially confusing for understanding the memory
layout requirement of the parasite blob.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/src/lib/infect.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 94a1883ab..887a22d2a 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -862,11 +862,6 @@ static int compel_map_exchange(struct parasite_ctl *ctl, unsigned long size)
 	return ret;
 }
 
-static inline unsigned long total_pie_size(size_t blob_size)
-{
-	return round_up(blob_size, page_size());
-}
-
 int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size)
 {
 	int ret;
@@ -888,11 +883,14 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 * without using ptrace at all.
 	 */
 
-	parasite_size = total_pie_size(ctl->pblob.hdr.bsize);
+	parasite_size = ctl->pblob.hdr.bsize;
 
-	ctl->args_size = round_up(args_size, PAGE_SIZE);
+	ctl->args_size = args_size;
 	parasite_size += ctl->args_size;
 
+	/* RESTORE_STACK_SIGFRAME needs a 64 bytes alignement */
+	parasite_size = round_up(parasite_size, 64);
+
 	map_exchange_size = parasite_size;
 	map_exchange_size += RESTORE_STACK_SIGFRAME + PARASITE_STACK_SIZE;
 	if (nr_threads > 1)

From b8c1d9d9399c68ee7452c04c11b495456b8a4c9f Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 16 Jul 2020 23:14:35 +0000
Subject: [PATCH 0297/1854] compel: rewrite parasite cmd and args manipulation
 from assembly to C

Previously, __export_parasite_cmd was located in parasite-head.S, and
__export_parasite_args located exactly at the end of the parasite blob.
This is not ideal for various reasons:
1) These two variables work together. It would be preferrable to have
them in the same location
2) This prevent us from allocating another section betweeen the parasite
blob and the args area. We'll need this to allocate a GOT table

This commit changes the allocation of these symbols from assembly/linker
script to a C file.

Moreover, the assembly entry points that invoke parasite_service()
prepares arguments with hand crafted assembly. This is unecessary.
This commit rewrite this logic with regular C code.

Note: if it wasn't for the x86 compat mode, we could remove all
parasite-head.S files and directly jump to parasite_service() via
ptrace.  An int3 architecture specific equivalent could be called at the
end of parasite_service() with an inline asm statement.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 .../arch/aarch64/plugins/std/parasite-head.S  | 13 --------
 compel/arch/aarch64/scripts/compel-pack.lds.S |  4 ---
 compel/arch/arm/plugins/std/parasite-head.S   | 14 --------
 compel/arch/arm/scripts/compel-pack.lds.S     |  4 ---
 compel/arch/mips/plugins/std/parasite-head.S  |  5 ---
 compel/arch/mips/scripts/compel-pack.lds.S    |  4 ---
 compel/arch/ppc64/plugins/std/parasite-head.S | 16 ----------
 compel/arch/ppc64/scripts/compel-pack.lds.S   |  4 ---
 compel/arch/s390/plugins/std/parasite-head.S  | 18 -----------
 compel/arch/s390/scripts/compel-pack.lds.S    |  4 ---
 compel/arch/x86/plugins/std/parasite-head.S   |  6 ----
 .../arch/x86/scripts/compel-pack-compat.lds.S |  4 ---
 compel/arch/x86/scripts/compel-pack.lds.S     |  4 ---
 compel/include/uapi/infect.h                  |  1 +
 compel/plugins/include/uapi/std/infect.h      |  5 ++-
 compel/plugins/std/infect.c                   | 16 +++++++++-
 compel/src/lib/handle-elf.c                   |  7 ++--
 compel/src/lib/infect.c                       | 32 ++++++++++++++++++-
 18 files changed, 54 insertions(+), 107 deletions(-)

diff --git a/compel/arch/aarch64/plugins/std/parasite-head.S b/compel/arch/aarch64/plugins/std/parasite-head.S
index 5e7067f6b..456c2117d 100644
--- a/compel/arch/aarch64/plugins/std/parasite-head.S
+++ b/compel/arch/aarch64/plugins/std/parasite-head.S
@@ -2,19 +2,6 @@
 
 	.section .head.text, "ax"
 ENTRY(__export_parasite_head_start)
-	adr	x2, __export_parasite_head_start	// get the address of this instruction
-
-	ldr	x0, __export_parasite_cmd
-
-	ldr	x1, parasite_args_ptr
-	add	x1, x1, x2				// fixup __export_parasite_args
-
 	bl	parasite_service
 	brk	#0					// the instruction BRK #0 generates the signal SIGTRAP in Linux
-
-parasite_args_ptr:
-	.quad	__export_parasite_args
-
-__export_parasite_cmd:
-	.quad	0
 END(__export_parasite_head_start)
diff --git a/compel/arch/aarch64/scripts/compel-pack.lds.S b/compel/arch/aarch64/scripts/compel-pack.lds.S
index eba89cd5f..57895ec9b 100644
--- a/compel/arch/aarch64/scripts/compel-pack.lds.S
+++ b/compel/arch/aarch64/scripts/compel-pack.lds.S
@@ -29,8 +29,4 @@ SECTIONS
 		*(.eh_frame*)
 		*(*)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(4);
-__export_parasite_args = .;
 }
diff --git a/compel/arch/arm/plugins/std/parasite-head.S b/compel/arch/arm/plugins/std/parasite-head.S
index e72646b50..6e46bed1f 100644
--- a/compel/arch/arm/plugins/std/parasite-head.S
+++ b/compel/arch/arm/plugins/std/parasite-head.S
@@ -2,21 +2,7 @@
 
 	.section .head.text, "ax"
 ENTRY(__export_parasite_head_start)
-	sub	r2, pc, #8			@ get the address of this instruction
-
-	adr     r0, __export_parasite_cmd
-	ldr	r0, [r0]
-
-	adr     r1, parasite_args_ptr
-	ldr	r1, [r1]
-	add	r1, r1, r2			@ fixup __export_parasite_args
-
 	bl	parasite_service
 	.byte   0xf0, 0x01, 0xf0, 0xe7		@ the instruction UDF #32 generates the signal SIGTRAP in Linux
 
-parasite_args_ptr:
-	.long __export_parasite_args
-
-__export_parasite_cmd:
-	.long 0
 END(__export_parasite_head_start)
diff --git a/compel/arch/arm/scripts/compel-pack.lds.S b/compel/arch/arm/scripts/compel-pack.lds.S
index f8a4739f3..3d97bb139 100644
--- a/compel/arch/arm/scripts/compel-pack.lds.S
+++ b/compel/arch/arm/scripts/compel-pack.lds.S
@@ -29,8 +29,4 @@ SECTIONS
 		*(.eh_frame*)
 		*(*)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(4);
-__export_parasite_args = .;
 }
diff --git a/compel/arch/mips/plugins/std/parasite-head.S b/compel/arch/mips/plugins/std/parasite-head.S
index 38e87f823..978c0b58c 100755
--- a/compel/arch/mips/plugins/std/parasite-head.S
+++ b/compel/arch/mips/plugins/std/parasite-head.S
@@ -6,15 +6,10 @@
 ENTRY(__export_parasite_head_start)
 	.set push
 	.set noreorder
-	lw	a0, __export_parasite_cmd
-	dla	a1, __export_parasite_args
 	jal	parasite_service
 	nop
 	.byte   0x0d, 0x00, 0x00, 0x00   //break
 	.set pop
 //	.byte 0x40,0x01,0x00,0x00   //pause
-	
-__export_parasite_cmd:
-	.long 0
 END(__export_parasite_head_start)
 		
diff --git a/compel/arch/mips/scripts/compel-pack.lds.S b/compel/arch/mips/scripts/compel-pack.lds.S
index cadb19aef..24ee408e8 100755
--- a/compel/arch/mips/scripts/compel-pack.lds.S
+++ b/compel/arch/mips/scripts/compel-pack.lds.S
@@ -30,8 +30,4 @@ SECTIONS
 		*(.MIPS.options)
 		*(.gnu.attributes)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(32);
-__export_parasite_args = .;
 }
diff --git a/compel/arch/ppc64/plugins/std/parasite-head.S b/compel/arch/ppc64/plugins/std/parasite-head.S
index c870efdc2..c675ab508 100644
--- a/compel/arch/ppc64/plugins/std/parasite-head.S
+++ b/compel/arch/ppc64/plugins/std/parasite-head.S
@@ -4,10 +4,6 @@
 	.align 8
 
 ENTRY(__export_parasite_head_start)
-
-	// int __used parasite_service(unsigned int cmd, void *args)
-	// cmd  = r3 = *__export_parasite_cmd (u32 ?)
-	// args = r4 = @parasite_args_ptr + @pc
 	bl	0f
 0:	mflr	r2
 
@@ -15,12 +11,6 @@ ENTRY(__export_parasite_head_start)
         addis   reg,r2,(name - 0b)@ha;		\
         addi    reg,r2,(name - 0b)@l;
 
-	LOAD_REG_ADDR(r3,__export_parasite_cmd)
-	lwz	r3,0(r3)
-
-	LOAD_REG_ADDR(r4,parasite_args_ptr)
-	ld	r4,0(r4)
-
 	LOAD_REG_ADDR(r12,parasite_service_ptr)
 	ld	r12,0(r12)
 	mtctr	r12
@@ -28,9 +18,6 @@ ENTRY(__export_parasite_head_start)
 	bctrl			// call parasite_service
 	twi 	31,0,0		// Should generate SIGTRAP
 
-parasite_args_ptr:
-        .quad  __export_parasite_args
-
 parasite_service_ptr:
 	// We want to run the function prototype to set r2.
 	// Since the relocation will prefer the local entry
@@ -39,7 +26,4 @@ parasite_service_ptr:
 	// FIXME: There should be a way to specify the global entry here.
 	.quad	parasite_service - 8
 
-__export_parasite_cmd:
-	.long 0
-
 END(__export_parasite_head_start)
diff --git a/compel/arch/ppc64/scripts/compel-pack.lds.S b/compel/arch/ppc64/scripts/compel-pack.lds.S
index e0f826d7d..572f1c42d 100644
--- a/compel/arch/ppc64/scripts/compel-pack.lds.S
+++ b/compel/arch/ppc64/scripts/compel-pack.lds.S
@@ -33,8 +33,4 @@ SECTIONS
 		*(.group*)
 		*(.eh_frame*)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(4);
-__export_parasite_args = .;
 }
diff --git a/compel/arch/s390/plugins/std/parasite-head.S b/compel/arch/s390/plugins/std/parasite-head.S
index f4cb37276..1e276a2f5 100644
--- a/compel/arch/s390/plugins/std/parasite-head.S
+++ b/compel/arch/s390/plugins/std/parasite-head.S
@@ -2,25 +2,7 @@
 
 	.section .head.text, "ax"
 
-/*
- * Entry point for parasite_service()
- *
- * Addresses of symbols are exported in auto-generated criu/pie/parasite-blob.h
- *
- * Function is called via parasite_run(). The command for parasite_service()
- * is stored in global variable __export_parasite_cmd.
- *
- * Load parameters for parasite_service(unsigned int cmd, void *args):
- *
- *  - Parameter 1 (cmd) : %r2 = *(uint32 *)(__export_parasite_cmd + pc)
- *  - Parameter 2 (args): %r3 = __export_parasite_args + pc
- */
 ENTRY(__export_parasite_head_start)
-	larl	%r14,__export_parasite_cmd
-	llgf	%r2,0(%r14)
-	larl	%r3,__export_parasite_args
 	brasl	%r14,parasite_service
 	.long 0x00010001	/* S390_BREAKPOINT_U16: Generates SIGTRAP */
-__export_parasite_cmd:
-	.long 0
 END(__export_parasite_head_start)
diff --git a/compel/arch/s390/scripts/compel-pack.lds.S b/compel/arch/s390/scripts/compel-pack.lds.S
index 91ffbda3e..2571ac852 100644
--- a/compel/arch/s390/scripts/compel-pack.lds.S
+++ b/compel/arch/s390/scripts/compel-pack.lds.S
@@ -33,8 +33,4 @@ SECTIONS
 		*(.group*)
 		*(.eh_frame*)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(4);
-__export_parasite_args = .;
 }
diff --git a/compel/arch/x86/plugins/std/parasite-head.S b/compel/arch/x86/plugins/std/parasite-head.S
index 465cd887b..2225568b9 100644
--- a/compel/arch/x86/plugins/std/parasite-head.S
+++ b/compel/arch/x86/plugins/std/parasite-head.S
@@ -11,8 +11,6 @@
 	andq	$~15, %rsp
 	pushq	$\num
 	movq	%rsp, %rbp
-	movl	__export_parasite_cmd(%rip), %edi
-	leaq	__export_parasite_args(%rip), %rsi
 	call	parasite_service
 .endm
 
@@ -48,7 +46,3 @@ ENTRY(__export_parasite_head_start)
 	PARASITE_ENTRY 0
 	int	$0x03
 END(__export_parasite_head_start)
-
-.align 8
-GLOBAL(__export_parasite_cmd)
-	.long 0
diff --git a/compel/arch/x86/scripts/compel-pack-compat.lds.S b/compel/arch/x86/scripts/compel-pack-compat.lds.S
index ff9c2c6b2..2d907a4a7 100644
--- a/compel/arch/x86/scripts/compel-pack-compat.lds.S
+++ b/compel/arch/x86/scripts/compel-pack-compat.lds.S
@@ -34,8 +34,4 @@ SECTIONS
 		*(.group*)
 		*(.eh_frame*)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(4);
-__export_parasite_args = .;
 }
diff --git a/compel/arch/x86/scripts/compel-pack.lds.S b/compel/arch/x86/scripts/compel-pack.lds.S
index 0c936f84d..68ddb3622 100644
--- a/compel/arch/x86/scripts/compel-pack.lds.S
+++ b/compel/arch/x86/scripts/compel-pack.lds.S
@@ -34,8 +34,4 @@ SECTIONS
 		*(.group*)
 		*(.eh_frame*)
 	}
-
-/* Parasite args should have 4 bytes align, as we have futex inside. */
-. = ALIGN(4);
-__export_parasite_args = .;
 }
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index aebaa8f75..8f9de0e1c 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -153,6 +153,7 @@ struct parasite_blob_desc {
 			size_t			nr_gotpcrel;
 			unsigned long		parasite_ip_off;
 			unsigned long		cmd_off;
+			unsigned long		args_ptr_off;
 			unsigned long		args_off;
 			compel_reloc_t		*relocs;
 			unsigned int		nr_relocs;
diff --git a/compel/plugins/include/uapi/std/infect.h b/compel/plugins/include/uapi/std/infect.h
index 1e784f8b4..78de781b2 100644
--- a/compel/plugins/include/uapi/std/infect.h
+++ b/compel/plugins/include/uapi/std/infect.h
@@ -4,7 +4,10 @@
 #include "common/compiler.h"
 
 extern int parasite_get_rpc_sock(void);
-extern int __must_check parasite_service(unsigned int cmd, void *args);
+
+extern unsigned int __export_parasite_service_cmd;
+extern void * __export_parasite_service_args_ptr;
+extern int __must_check parasite_service(void);
 
 /*
  * Must be supplied by user plugins.
diff --git a/compel/plugins/std/infect.c b/compel/plugins/std/infect.c
index d5e1b4354..9749db7b7 100644
--- a/compel/plugins/std/infect.c
+++ b/compel/plugins/std/infect.c
@@ -196,8 +196,22 @@ err:
 # define __parasite_entry
 #endif
 
-int __used __parasite_entry parasite_service(unsigned int cmd, void *args)
+/*
+ * __export_parasite_service_{cmd,args} serve as arguments to the
+ * parasite_service() function. We use these global variables to make it
+ * easier to pass arguments when invoking from ptrace.
+ *
+ * We need the linker to allocate these variables. Hence the dummy
+ * initialization. Otherwise, we end up with COMMON symbols.
+ */
+unsigned int __export_parasite_service_cmd = 0;
+void * __export_parasite_service_args_ptr = NULL;
+
+int __used __parasite_entry parasite_service(void)
 {
+	unsigned int cmd = __export_parasite_service_cmd;
+	void *args = __export_parasite_service_args_ptr;
+
 	pr_info("Parasite cmd %d/%x process\n", cmd, cmd);
 
 	if (cmd == PARASITE_CMD_INIT_DAEMON)
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 6fb0fb37f..8a79151b4 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -699,10 +699,9 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("\t\tpbd->hdr.parasite_ip_off	= "
 		"%s_sym__export_parasite_head_start_compat;\n", opts.prefix);
 	pr_out("#endif /* CONFIG_COMPAT */\n");
-	pr_out("\tpbd->hdr.cmd_off	= "
-			"%s_sym__export_parasite_cmd;\n", opts.prefix);
-	pr_out("\tpbd->hdr.args_off	= "
-			"%s_sym__export_parasite_args;\n", opts.prefix);
+	pr_out("\tpbd->hdr.cmd_off	= %s_sym__export_parasite_service_cmd;\n", opts.prefix);
+	pr_out("\tpbd->hdr.args_ptr_off	= %s_sym__export_parasite_service_args_ptr;\n", opts.prefix);
+	pr_out("\tpbd->hdr.args_off	= round_up(pbd->hdr.bsize, 4);\n");
 	pr_out("\tpbd->hdr.relocs		= %s_relocs;\n", opts.prefix);
 	pr_out("\tpbd->hdr.nr_relocs	= "
 			"sizeof(%s_relocs) / sizeof(%s_relocs[0]);\n",
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 887a22d2a..78fe1f1a6 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -822,6 +822,13 @@ void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 
 	size_t i, j;
 
+	/*
+	 * parasite_service() reads the value of __export_parasite_service_args_ptr.
+	 * The reason it is set here is that semantically, we are doing a symbol
+	 * resolution on parasite_service_args, and it turns out to be relocatable.
+	 */
+	*(void **)(mem + pbd->hdr.args_ptr_off) = vbase + pbd->hdr.args_off;
+
 #ifdef CONFIG_MIPS
 	compel_relocs_apply_mips(mem, vbase, pbd);
 #else
@@ -883,7 +890,30 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 * without using ptrace at all.
 	 */
 
-	parasite_size = ctl->pblob.hdr.bsize;
+	/*
+	 * The parasite memory layout is the following:
+	 * Low address start first.
+	 * The number in parenthesis denotes the size of the section.
+	 * The arrow on the right shows the different variables that
+	 * corresponds to a given offset.
+	 * +------------------------------------------------------+ <--- 0
+	 * |   Parasite blob (sizeof(parasite_blob))              |
+	 * +------------------------------------------------------+ <--- hdr.bsize
+	 *                         align 4
+	 * +------------------------------------------------------+ <--- hdr.args_off
+	 * |   Args area (args_size)                              |
+	 * +------------------------------------------------------+
+	 *                         align 64
+	 * +------------------------------------------------------+ <--- ctl->rsigframe
+	 * |   sigframe (RESTORE_STACK_SIGFRAME)                  |      ctl->sigframe
+	 * +------------------------------------------------------+
+	 * |   main stack (PARASITE_STACK_SIZE)                   |
+	 * +------------------------------------------------------+ <--- ctl->rstack
+	 * |   compel_run_in_thread stack (PARASITE_STACK_SIZE)   |
+	 * +------------------------------------------------------+ <--- ctl->r_thread_stack
+	 *                                                               map_exchange_size
+	 */
+	parasite_size = ctl->pblob.hdr.args_off;
 
 	ctl->args_size = args_size;
 	parasite_size += ctl->args_size;

From 8d8dd5a79932d95a5aaade924c22ee71e04896b8 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 17 Jul 2020 02:39:52 +0000
Subject: [PATCH 0298/1854] compel: x86 parasite_service entry point
 simplification

We don't need to push 0 on the stack. This seems to be a remnant of the
initial commit of 2011 that had a `pushq $0`.

The 16 bytes %rsp alignment was added with commit 2a0cea29 in 2012.
This is no longer necessary as we already guarantee that %rsp is 16
bytes aligned. A BUG_ON() is added to enforce this guarantee.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/arch/x86/plugins/std/parasite-head.S | 12 ++----------
 compel/src/lib/infect.c                     | 11 +++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/compel/arch/x86/plugins/std/parasite-head.S b/compel/arch/x86/plugins/std/parasite-head.S
index 2225568b9..4fb38d1f1 100644
--- a/compel/arch/x86/plugins/std/parasite-head.S
+++ b/compel/arch/x86/plugins/std/parasite-head.S
@@ -6,14 +6,6 @@
 # error 64-bit parasite should compile with CONFIG_X86_64
 #endif
 
-.macro PARASITE_ENTRY num
-	subq	$16, %rsp
-	andq	$~15, %rsp
-	pushq	$\num
-	movq	%rsp, %rbp
-	call	parasite_service
-.endm
-
 #ifdef CONFIG_COMPAT
 .code32
 ENTRY(__export_parasite_head_start_compat)
@@ -21,7 +13,7 @@ ENTRY(__export_parasite_head_start_compat)
 	jmp	$__USER_CS,$1f
 1:
 .code64
-	PARASITE_ENTRY 0
+	call	parasite_service
 	pushq	$__USER32_CS
 	xor	%r11, %r11
 	movl	$2f, %r11d
@@ -43,6 +35,6 @@ END(__export_parasite_head_start_compat)
 #endif
 
 ENTRY(__export_parasite_head_start)
-	PARASITE_ENTRY 0
+	call	parasite_service
 	int	$0x03
 END(__export_parasite_head_start)
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 78fe1f1a6..da02d1744 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -948,6 +948,17 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	p += PARASITE_STACK_SIZE;
 	ctl->rstack = ctl->remote_map + p;
 
+	/*
+	 * x86-64 ABI requires a 16 bytes aligned stack.
+	 * It is already the case as RESTORE_STACK_SIGFRAME is a multiple of
+	 * 64, and PARASITE_STACK_SIZE is 0x4000.
+	 */
+	if ((unsigned long)ctl->rstack & (16-1)) {
+		pr_err("BUG: stack is not 16 bytes aligned: %p\n", ctl->rstack);
+		ctl->rstack = (void *)round_down((unsigned long)ctl->rstack, 16);
+	}
+
+
 	if (nr_threads > 1) {
 		p += PARASITE_STACK_SIZE;
 		ctl->r_thread_stack = ctl->remote_map + p;

From fee517b3da601d29624d318956fd9422b70d9f2f Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 17 Jul 2020 05:42:36 +0000
Subject: [PATCH 0299/1854] compel: remove x86/prologue.S

This file has been ignored since commit 19fadee9 from 2016.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/arch/x86/plugins/std/prologue.S | 33 --------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 compel/arch/x86/plugins/std/prologue.S

diff --git a/compel/arch/x86/plugins/std/prologue.S b/compel/arch/x86/plugins/std/prologue.S
deleted file mode 100644
index 79ad1f6f2..000000000
--- a/compel/arch/x86/plugins/std/prologue.S
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "common/asm/linkage.h"
-#include "asm/prologue.h"
-
-#include "uapi/std/syscall-codes.h"
-
-	.section .compel.prologue.text, "ax"
-ENTRY(__export_std_prologue_start)
-	push	%rsp
-
-	leaq	__export_std_prologue_init_args(%rip), %rdi
-	movq	__export_std_plugin_begin(%rip), %rsi
-	movq	__export_std_plugin_size(%rip), %rdx
-	call	__export_std_compel_start
-
-do_rt_sigreturn:
-	leaq	__export_std_prologue_sigframe(%rip), %rax
-	addq	$8, %rax
-	movq	%rax, %rsp			# we can't use sys_rt_sigreturn here
-	mov	$__NR_rt_sigreturn, %eax	# because we're adjusting stack
-	syscall
-
-GLOBAL(__export_std_prologue_init_args)
-	.space PROLOGUE_INIT_ARGS_SIZE, 0
-
-GLOBAL(__export_std_plugin_begin)
-	.space 8, 0
-GLOBAL(__export_std_plugin_size)
-	.space 8, 0
-
-	.align 64
-GLOBAL(__export_std_prologue_sigframe)
-	.space PROLOGUE_SGFRAME_SIZE, 0
-END(__export_std_prologue_start)

From 70ecbbcc86df7bcd61d666006f28cb91c129ccbe Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 17 Jul 2020 02:13:35 +0000
Subject: [PATCH 0300/1854] compel: allocate the GOT table to avoid memory
 corruption

Previously, the GOT table was using the same memory location as the
args region, leading to difficult to debug memory corruption bugs.

We allocate the GOT table between the parasite blob and the args region.
The reason this is a good placement is:
1) Putting it after the args region is possible but a bit combersome as
the args region has a variable size
2) The cr-restore.c code maps the parasite code without the args region,
as it does not do RPC.

Another option is to rely on the linker to generate a GOT section, but I
failed to do so despite my best attempts.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 compel/include/uapi/infect.h |  2 +-
 compel/src/lib/handle-elf.c  |  5 ++---
 compel/src/lib/infect.c      | 21 ++++++++++++++++-----
 criu/cr-restore.c            | 23 +++++++++++++++++++----
 criu/parasite-syscall.c      |  1 -
 criu/pie/pie-relocs.h        | 10 ----------
 6 files changed, 38 insertions(+), 24 deletions(-)
 delete mode 100644 criu/pie/pie-relocs.h

diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 8f9de0e1c..257658a70 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -150,10 +150,10 @@ struct parasite_blob_desc {
 		struct {
 			const void		*mem;
 			size_t			bsize;
-			size_t			nr_gotpcrel;
 			unsigned long		parasite_ip_off;
 			unsigned long		cmd_off;
 			unsigned long		args_ptr_off;
+			unsigned long		got_off;
 			unsigned long		args_off;
 			compel_reloc_t		*relocs;
 			unsigned int		nr_relocs;
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 8a79151b4..9646dd4dc 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -648,7 +648,6 @@ int __handle_elf(void *mem, size_t size)
 	}
 #endif /* !NO_RELOCS */
 	pr_out("};\n");
-	pr_out("static __maybe_unused size_t %s_nr_gotpcrel = %zd;\n", opts.prefix, nr_gotpcrel);
 
 	pr_out("static __maybe_unused const char %s_blob[] = {\n\t", opts.prefix);
 
@@ -690,7 +689,6 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("\tpbd->hdr.mem		= %s_blob;\n", opts.prefix);
 	pr_out("\tpbd->hdr.bsize		= sizeof(%s_blob);\n",
 			opts.prefix);
-	pr_out("\tpbd->hdr.nr_gotpcrel	= %s_nr_gotpcrel;\n", opts.prefix);
 	pr_out("\tif (native)\n");
 	pr_out("\t\tpbd->hdr.parasite_ip_off	= "
 		"%s_sym__export_parasite_head_start;\n", opts.prefix);
@@ -701,7 +699,8 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("#endif /* CONFIG_COMPAT */\n");
 	pr_out("\tpbd->hdr.cmd_off	= %s_sym__export_parasite_service_cmd;\n", opts.prefix);
 	pr_out("\tpbd->hdr.args_ptr_off	= %s_sym__export_parasite_service_args_ptr;\n", opts.prefix);
-	pr_out("\tpbd->hdr.args_off	= round_up(pbd->hdr.bsize, 4);\n");
+	pr_out("\tpbd->hdr.got_off	= round_up(pbd->hdr.bsize, sizeof(long));\n");
+	pr_out("\tpbd->hdr.args_off	= pbd->hdr.got_off + %zd*sizeof(long);\n", nr_gotpcrel);
 	pr_out("\tpbd->hdr.relocs		= %s_relocs;\n", opts.prefix);
 	pr_out("\tpbd->hdr.nr_relocs	= "
 			"sizeof(%s_relocs) / sizeof(%s_relocs[0]);\n",
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index da02d1744..a48d5ff7d 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -816,11 +816,11 @@ err_cure:
 
 void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 {
-	size_t size = pbd->hdr.bsize;
 	compel_reloc_t *elf_relocs = pbd->hdr.relocs;
 	size_t nr_relocs = pbd->hdr.nr_relocs;
 
 	size_t i, j;
+	void **got = mem + pbd->hdr.got_off;
 
 	/*
 	 * parasite_service() reads the value of __export_parasite_service_args_ptr.
@@ -835,14 +835,13 @@ void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 	for (i = 0, j = 0; i < nr_relocs; i++) {
 		if (elf_relocs[i].type & COMPEL_TYPE_LONG) {
 			long *where = mem + elf_relocs[i].offset;
-			long *p = mem + size;
 
 			if (elf_relocs[i].type & COMPEL_TYPE_GOTPCREL) {
 				int *value = (int *)where;
 				int rel;
 
-				p[j] = (long)vbase + elf_relocs[i].value;
-				rel = (unsigned)((void *)&p[j] - (void *)mem) - elf_relocs[i].offset + elf_relocs[i].addend;
+				got[j] = vbase + elf_relocs[i].value;
+				rel = (unsigned)((void *)&got[j] - (void *)mem) - elf_relocs[i].offset + elf_relocs[i].addend;
 
 				*value = rel;
 				j++;
@@ -899,7 +898,9 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 * +------------------------------------------------------+ <--- 0
 	 * |   Parasite blob (sizeof(parasite_blob))              |
 	 * +------------------------------------------------------+ <--- hdr.bsize
-	 *                         align 4
+	 *                         align 8
+	 * +------------------------------------------------------+ <--- hdr.got_off
+	 * |   GOT Table (nr_gotpcrel * sizeof(long))             |
 	 * +------------------------------------------------------+ <--- hdr.args_off
 	 * |   Args area (args_size)                              |
 	 * +------------------------------------------------------+
@@ -936,6 +937,16 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	ctl->cmd = ctl->local_map + ctl->pblob.hdr.cmd_off;
 	ctl->args = ctl->local_map + ctl->pblob.hdr.args_off;
 
+	/*
+	 * args must be 4 bytes aligned as we use futexes() on them. It is
+	 * already the case, as args follows the GOT table, which is 8 bytes
+	 * aligned.
+	 */
+	if ((unsigned long)ctl->args & (4-1)) {
+		pr_err("BUG: args are not 4 bytes aligned: %p\n", ctl->args);
+		ctl->args = (void *)round_up((unsigned long)ctl->args, 4);
+	}
+
 	memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
 	compel_relocs_apply(ctl->local_map, ctl->remote_map, &ctl->pblob);
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 3d135af4b..edb30af20 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -96,8 +96,6 @@
 
 #include "cr-errno.h"
 
-#include "pie/pie-relocs.h"
-
 #ifndef arch_export_restore_thread
 #define arch_export_restore_thread	__export_restore_thread
 #endif
@@ -2913,7 +2911,23 @@ static int prepare_restorer_blob(void)
 	 * in turn will lead to set-exe-file prctl to fail with EBUSY.
 	 */
 
-	restorer_len = pie_size(restorer);
+	struct parasite_blob_desc pbd;
+
+	/*
+	 * We pass native=true, which is then used to set the value of
+	 * pbd.parasite_ip_off. We don't use parasite_ip_off, so the value we
+	 * pass as native argument is not relevant.
+	 */
+	restorer_setup_c_header_desc(&pbd, true);
+
+	/*
+	 * args_off is the offset where the binary blob with its GOT table
+	 * ends. As we don't do RPC, parasite sections after args_off can be
+	 * ignored. See compel_infect() for a description of the parasite
+	 * memory layout.
+	 */
+	restorer_len = round_up(pbd.hdr.args_off, page_size());
+
 	restorer = mmap(NULL, restorer_len,
 			PROT_READ | PROT_WRITE | PROT_EXEC,
 			MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
@@ -2922,7 +2936,8 @@ static int prepare_restorer_blob(void)
 		return -1;
 	}
 
-	memcpy(restorer, &restorer_blob, sizeof(restorer_blob));
+	memcpy(restorer, pbd.hdr.mem, pbd.hdr.bsize);
+
 	return 0;
 }
 
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 5f9de152a..c7074c7c4 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -39,7 +39,6 @@
 
 #include "dump.h"
 #include "restorer.h"
-#include "pie/pie-relocs.h"
 
 #include "infect.h"
 #include "infect-rpc.h"
diff --git a/criu/pie/pie-relocs.h b/criu/pie/pie-relocs.h
deleted file mode 100644
index e36126be6..000000000
--- a/criu/pie/pie-relocs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __PIE_RELOCS_H__
-#define __PIE_RELOCS_H__
-
-#include "common/config.h"
-#include "common/compiler.h"
-
-#define pie_size(__pie_name)	(round_up(sizeof(__pie_name##_blob) + \
-			__pie_name ## _nr_gotpcrel * sizeof(long), page_size()))
-
-#endif /* __PIE_RELOCS_H__ */

From 9c0b904a02a48057b440e28c6a0192f6112f92a0 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Mon, 27 Jul 2020 19:38:01 +0100
Subject: [PATCH 0301/1854] compel/infect: Don't adjust stack/args alignment

Instead, fail to infect task and let compel cure it.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/src/lib/infect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index a48d5ff7d..38846c21f 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -944,7 +944,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 */
 	if ((unsigned long)ctl->args & (4-1)) {
 		pr_err("BUG: args are not 4 bytes aligned: %p\n", ctl->args);
-		ctl->args = (void *)round_up((unsigned long)ctl->args, 4);
+		goto err;
 	}
 
 	memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
@@ -966,7 +966,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 */
 	if ((unsigned long)ctl->rstack & (16-1)) {
 		pr_err("BUG: stack is not 16 bytes aligned: %p\n", ctl->rstack);
-		ctl->rstack = (void *)round_down((unsigned long)ctl->rstack, 16);
+		goto err;
 	}
 
 

From aeeaa30a560c040d417b43667787955cb0c05da8 Mon Sep 17 00:00:00 2001
From: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
Date: Fri, 24 Jul 2020 09:52:36 +0530
Subject: [PATCH 0302/1854] criu/files-reg.c: build-id from multiple headers
 fix

This addresses a bug when the ELF file contains multiple PT_NOTE program
headers but only the first header is checked for the build-id.

Signed-off-by: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
---
 criu/files-reg.c | 90 +++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 2914b4941..8751d5d3a 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1358,7 +1358,7 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
 	int size, num_iterations;
 	size_t file_header_end;
 	Elf32_Phdr *program_header, *program_header_end;
-	Elf32_Nhdr *note_header, *note_header_end;
+	Elf32_Nhdr *note_header_end, *note_header = NULL;
 
 	file_header_end = (size_t) file_header + mapped_size;
 	if (sizeof(Elf32_Ehdr) > mapped_size)
@@ -1378,36 +1378,41 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
 		return -1;
 
 	program_header_end = (Elf32_Phdr *) (file_header_end - sizeof(Elf32_Phdr));
-	num_iterations = file_header->e_phnum + 1;
 
 	/*
 	 * If the file has a build-id, it will be in the PT_NOTE program header
 	 * entry AKA the note sections.
 	 */
-	while (num_iterations-- && program_header <= program_header_end &&
-			program_header->p_type != PT_NOTE)
-		program_header++;
+	for (num_iterations = 0; num_iterations < file_header->e_phnum; num_iterations++, program_header++) {
+		if (program_header > program_header_end)
+			break;
+		if (program_header->p_type != PT_NOTE)
+			continue;
 
-	if (!num_iterations || program_header >= program_header_end) {
-		pr_warn("Couldn't find the note program header for file with fd %d\n", fd);
-		return -1;
-	}
+		note_header = (Elf32_Nhdr *) (program_header->p_offset + (char *) file_header);
+		if (note_header <= (Elf32_Nhdr *) file_header) {
+			note_header = NULL;
+			continue;
+		}
 
-	note_header = (Elf32_Nhdr *) (program_header->p_offset + (char *) file_header);
-	if (note_header <= (Elf32_Nhdr *) file_header)
-		return -1;
-
-	note_header_end = (Elf32_Nhdr *) min_t(char*,
+		note_header_end = (Elf32_Nhdr *) min_t(char*,
 						(char *) note_header + program_header->p_filesz,
 						(char *) (file_header_end - sizeof(Elf32_Nhdr)));
 
-	/* The note type for the build-id is NT_GNU_BUILD_ID. */
-	while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
-		note_header = (Elf32_Nhdr *) ((char *) note_header + sizeof(Elf32_Nhdr) +
-						ALIGN(note_header->n_namesz, 4) +
-						ALIGN(note_header->n_descsz, 4));
+		/* The note type for the build-id is NT_GNU_BUILD_ID. */
+		while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
+			note_header = (Elf32_Nhdr *) ((char *) note_header + sizeof(Elf32_Nhdr) +
+							ALIGN(note_header->n_namesz, 4) +
+							ALIGN(note_header->n_descsz, 4));
 
-	if (note_header >= note_header_end) {
+		if (note_header > note_header_end) {
+			note_header = NULL;
+			continue;
+		}
+		break;
+	}
+
+	if (!note_header) {
 		pr_warn("Couldn't find the build-id note for file with fd %d\n", fd);
 		return -1;
 	}
@@ -1447,7 +1452,7 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
 	int size, num_iterations;
 	size_t file_header_end;
 	Elf64_Phdr *program_header, *program_header_end;
-	Elf64_Nhdr *note_header, *note_header_end;
+	Elf64_Nhdr *note_header_end, *note_header = NULL;
 
 	file_header_end = (size_t) file_header + mapped_size;
 	if (sizeof(Elf64_Ehdr) > mapped_size)
@@ -1467,36 +1472,41 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
 		return -1;
 
 	program_header_end = (Elf64_Phdr *) (file_header_end - sizeof(Elf64_Phdr));
-	num_iterations = file_header->e_phnum + 1;
 
 	/*
 	 * If the file has a build-id, it will be in the PT_NOTE program header
 	 * entry AKA the note sections.
 	 */
-	while (num_iterations-- && program_header <= program_header_end &&
-			program_header->p_type != PT_NOTE)
-		program_header++;
+	for (num_iterations = 0; num_iterations < file_header->e_phnum; num_iterations++, program_header++) {
+		if (program_header > program_header_end)
+			break;
+		if (program_header->p_type != PT_NOTE)
+			continue;
 
-	if (!num_iterations || program_header >= program_header_end) {
-		pr_warn("Couldn't find the note program header for file with fd %d\n", fd);
-		return -1;
-	}
+		note_header = (Elf64_Nhdr *) (program_header->p_offset + (char *) file_header);
+		if (note_header <= (Elf64_Nhdr *) file_header) {
+			note_header = NULL;
+			continue;
+		}
 
-	note_header = (Elf64_Nhdr *) (program_header->p_offset + (char *) file_header);
-	if (note_header <= (Elf64_Nhdr *) file_header)
-		return -1;
-
-	note_header_end = (Elf64_Nhdr *) min_t(char*,
+		note_header_end = (Elf64_Nhdr *) min_t(char*,
 						(char *) note_header + program_header->p_filesz,
 						(char *) (file_header_end - sizeof(Elf64_Nhdr)));
 
-	/* The note type for the build-id is NT_GNU_BUILD_ID. */
-	while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
-		note_header = (Elf64_Nhdr *) ((char *) note_header + sizeof(Elf64_Nhdr) +
-						ALIGN(note_header->n_namesz, 4) +
-						ALIGN(note_header->n_descsz, 4));
+		/* The note type for the build-id is NT_GNU_BUILD_ID. */
+		while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
+			note_header = (Elf64_Nhdr *) ((char *) note_header + sizeof(Elf64_Nhdr) +
+							ALIGN(note_header->n_namesz, 4) +
+							ALIGN(note_header->n_descsz, 4));
 
-	if (note_header >= note_header_end) {
+		if (note_header > note_header_end) {
+			note_header = NULL;
+			continue;
+		}
+		break;
+	}
+
+	if (!note_header) {
 		pr_warn("Couldn't find the build-id note for file with fd %d\n", fd);
 		return -1;
 	}

From cee36af3866c9eb19b5fa889929093f1ab3e3847 Mon Sep 17 00:00:00 2001
From: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
Date: Mon, 27 Jul 2020 16:37:42 +0530
Subject: [PATCH 0303/1854] criu/files-reg.c: build-id size bug fix

This addresses a bug where the RegFileEntry n_build_id field would be
populated with incorrect data, causing dump to crash at times.

Signed-off-by: Ajay Bharadwaj <ajayrbharadwaj@gmail.com>
---
 criu/files-reg.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 8751d5d3a..10e5e6263 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1591,7 +1591,7 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
 						const struct fd_parms *p)
 {
 	unsigned char *build_id = NULL;
-	int build_id_size;
+	int build_id_size, allocated_size;
 	int fd;
 
 	/*
@@ -1614,15 +1614,16 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
 	if (!build_id || build_id_size == -1)
 		return 0;
 
-	rfe->build_id = xmalloc(round_up(build_id_size, sizeof(uint32_t)));
+	allocated_size = round_up(build_id_size, sizeof(uint32_t));
+	rfe->build_id = xzalloc(allocated_size);
 	if (!rfe->build_id) {
 		pr_warn("Build-ID (For validation) could not be set for file %s\n",
 				rfe->name);
 		return -1;
 	}
 
-	rfe->n_build_id = build_id_size;
-	memcpy(rfe->build_id, (void *) build_id, rfe->n_build_id);
+	rfe->n_build_id = allocated_size / sizeof(uint32_t);
+	memcpy(rfe->build_id, (void *) build_id, build_id_size);
 
 	xfree(build_id);
 	return 1;
@@ -2028,9 +2029,10 @@ static int validate_with_build_id(const int fd, const struct stat *fd_status,
 	if (!build_id || build_id_size == -1)
 		return 0;
 
-	if (build_id_size != rfi->rfe->n_build_id) {
+	if (round_up(build_id_size, sizeof(uint32_t)) != rfi->rfe->n_build_id * sizeof(uint32_t)) {
 		pr_err("File %s has bad build-ID length %d (expect %d)\n", rfi->path,
-				build_id_size, (int) rfi->rfe->n_build_id);
+				round_up(build_id_size, sizeof(uint32_t)),
+				(int) (rfi->rfe->n_build_id * sizeof(uint32_t)));
 		xfree(build_id);
 		return -1;
 	}

From 7646deed61cc96c7bbdae12b189589caa46b8ebe Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 29 Jul 2020 14:17:27 +0100
Subject: [PATCH 0304/1854] vagrant: Update to Fedora 32

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/travis/vagrant.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
index a606c45f5..dcadc4e28 100755
--- a/scripts/travis/vagrant.sh
+++ b/scripts/travis/vagrant.sh
@@ -7,8 +7,8 @@ set -e
 set -x
 
 VAGRANT_VERSION=2.2.7
-FEDORA_VERSION=31
-FEDORA_BOX_VERSION=31.20191023.0
+FEDORA_VERSION=32
+FEDORA_BOX_VERSION=32.20200422.0
 
 setup() {
 	apt-get -qq update

From 8564bc49e47bd46721408ac4a45e05000953a775 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 31 Jul 2020 13:58:35 +0300
Subject: [PATCH 0305/1854] check: Use pr_foo macros

Instead of directly calling the print_on_level.
The pr_msg/pr_warn seems to be better choise for all those cases.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 criu/cr-check.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index b790c2ffb..66a99cf99 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1304,7 +1304,7 @@ static int (*chk_feature)(void);
 			"dump or restore failure."
 #define CHECK_CAT1(fn)	do { \
 				if ((ret = fn) != 0) { \
-					print_on_level(DEFAULT_LOGLEVEL, "%s\n", CHECK_BAD); \
+					pr_warn("%s\n", CHECK_BAD); \
 					return ret; \
 				} \
 			} while (0)
@@ -1336,8 +1336,7 @@ int cr_check(void)
 	if (chk_feature) {
 		if (chk_feature())
 			return -1;
-		print_on_level(DEFAULT_LOGLEVEL, "%s is supported\n",
-			feature_name(chk_feature));
+		pr_msg("%s is supported\n", feature_name(chk_feature));
 		return 0;
 	}
 
@@ -1405,7 +1404,7 @@ int cr_check(void)
 		ret |= check_compat_cr();
 	}
 
-	print_on_level(DEFAULT_LOGLEVEL, "%s\n", ret ? CHECK_MAYBE : CHECK_GOOD);
+	pr_msg("%s\n", ret ? CHECK_MAYBE : CHECK_GOOD);
 	return ret;
 }
 #undef CHECK_GOOD

From 99fc76d8b574d63a6a3f71fe0038c89770672cc9 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 31 Jul 2020 14:02:02 +0300
Subject: [PATCH 0306/1854] proc_parse: Do not feed loglevel into
 restore_loginuid

If a helper routine doesn't know whether its failure leads
to the error, then it should just emit a warning and return
-1. It's the caller who should print (or not) the error.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 criu/cr-restore.c         | 10 ++++++----
 criu/include/proc_parse.h |  2 +-
 criu/kerndat.c            |  4 ++--
 criu/proc_parse.c         |  5 ++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index edb30af20..d926b66a4 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -864,9 +864,11 @@ static int prepare_proc_misc(pid_t pid, TaskCoreEntry *tc, struct task_restore_a
 	/* loginuid value is critical to restore */
 	if (kdat.luid == LUID_FULL && tc->has_loginuid &&
 			tc->loginuid != INVALID_UID) {
-		ret = prepare_loginuid(tc->loginuid, LOG_ERROR);
-		if (ret < 0)
+		ret = prepare_loginuid(tc->loginuid);
+		if (ret < 0) {
+			pr_err("Setting loginuid for %d task failed\n", pid);
 			return ret;
+		}
 	}
 
 	/* oom_score_adj is not critical: only log errors */
@@ -2152,7 +2154,7 @@ static int prepare_userns_hook(void)
 	if (ret < 0)
 		return -1;
 
-	if (prepare_loginuid(INVALID_UID, LOG_ERROR) < 0) {
+	if (prepare_loginuid(INVALID_UID) < 0) {
 		pr_err("Setting loginuid for CT init task failed, CAP_AUDIT_CONTROL?\n");
 		return -1;
 	}
@@ -2165,7 +2167,7 @@ static void restore_origin_ns_hook(void)
 		return;
 
 	/* not critical: it does not affect CT in any way */
-	if (prepare_loginuid(saved_loginuid, LOG_ERROR) < 0)
+	if (prepare_loginuid(saved_loginuid) < 0)
 		pr_err("Restore original /proc/self/loginuid failed\n");
 }
 
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 25a57df6c..c043804b4 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -88,7 +88,7 @@ struct proc_status_creds {
 extern int parse_pid_stat(pid_t pid, struct proc_pid_stat *s);
 extern unsigned int parse_pid_loginuid(pid_t pid, int *err, bool ignore_noent);
 extern int parse_pid_oom_score_adj(pid_t pid, int *err);
-extern int prepare_loginuid(unsigned int value, unsigned int loglevel);
+extern int prepare_loginuid(unsigned int value);
 extern int parse_pid_status(pid_t pid, struct seize_task_status *, void *data);
 extern int parse_file_locks(void);
 extern int get_fd_mntid(int fd, int *mnt_id);
diff --git a/criu/kerndat.c b/criu/kerndat.c
index f91d7be41..3c84e53fe 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -500,10 +500,10 @@ static int kerndat_loginuid(void)
 	 * on that rely dump/restore code.
 	 * See also: marc.info/?l=git-commits-head&m=138509506407067
 	 */
-	if (prepare_loginuid(INVALID_UID, LOG_WARN) < 0)
+	if (prepare_loginuid(INVALID_UID) < 0)
 		return 0;
 	/* Cleaning value back as it was */
-	if (prepare_loginuid(saved_loginuid, LOG_WARN) < 0)
+	if (prepare_loginuid(saved_loginuid) < 0)
 		return 0;
 
 	kdat.luid = LUID_FULL;
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index ddae618f9..77f1b216c 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -944,7 +944,7 @@ err:
 	return -1;
 }
 
-int prepare_loginuid(unsigned int value, unsigned int loglevel)
+int prepare_loginuid(unsigned int value)
 {
 	int fd, ret = 0;
 	char buf[11]; /* 4294967295 is maximum for u32 */
@@ -956,8 +956,7 @@ int prepare_loginuid(unsigned int value, unsigned int loglevel)
 	snprintf(buf, 11, "%u", value);
 
 	if (write(fd, buf, 11) < 0) {
-		print_on_level(loglevel,
-			"Write %s to /proc/self/loginuid failed: %s\n",
+		pr_warn("Write %s to /proc/self/loginuid failed: %s\n",
 			buf, strerror(errno));
 		ret = -1;
 	}

From 1955d490777b55acc9b36909267ef19ebd979ab8 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 31 Jul 2020 14:05:07 +0300
Subject: [PATCH 0307/1854] ipc: Use pr_info() instead of
 print_on_level(PR_INFO...)

All the cases here are naturally and de-facto pr_info-s.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 criu/ipc_ns.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index d8590fa39..915aea20b 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -36,9 +36,9 @@
 #define MSG_COPY		040000
 #endif
 
-static void pr_ipc_desc_entry(unsigned int loglevel, const IpcDescEntry *desc)
+static void pr_ipc_desc_entry(const IpcDescEntry *desc)
 {
-	print_on_level(loglevel, "id: %-10d key: %#08x uid: %-10d gid: %-10d "
+	pr_info("id: %-10d key: %#08x uid: %-10d gid: %-10d "
 		       "cuid: %-10d cgid: %-10d mode: %-10o ",
 		       desc->id, desc->key, desc->uid, desc->gid,
 		       desc->cuid, desc->cgid, desc->mode);
@@ -55,19 +55,19 @@ static void fill_ipc_desc(int id, IpcDescEntry *desc, const struct ipc_perm *ipc
 	desc->mode = ipcp->mode;
 }
 
-static void pr_ipc_sem_array(unsigned int loglevel, int nr, u16 *values)
+static void pr_ipc_sem_array(int nr, u16 *values)
 {
 	while (nr--)
-		print_on_level(loglevel, "  %-5d", values[nr]);
-	print_on_level(loglevel, "\n");
+		pr_info("  %-5d", values[nr]);
+	pr_info("\n");
 }
 
-#define pr_info_ipc_sem_array(nr, values)	pr_ipc_sem_array(LOG_INFO, nr, values)
+#define pr_info_ipc_sem_array(nr, values)	pr_ipc_sem_array(nr, values)
 
 static void pr_info_ipc_sem_entry(const IpcSemEntry *sem)
 {
-	pr_ipc_desc_entry(LOG_INFO, sem->desc);
-	print_on_level(LOG_INFO, "nsems: %-10d\n", sem->nsems);
+	pr_ipc_desc_entry(sem->desc);
+	pr_info("nsems: %-10d\n", sem->nsems);
 }
 
 static int dump_ipc_sem_set(struct cr_img *img, const IpcSemEntry *sem)
@@ -160,15 +160,14 @@ static int dump_ipc_sem(struct cr_img *img)
 
 static void pr_info_ipc_msg(int nr, const IpcMsg *msg)
 {
-	print_on_level(LOG_INFO, "  %-5d: type: %-20"PRId64" size: %-10d\n",
+	pr_info("  %-5d: type: %-20"PRId64" size: %-10d\n",
 		       nr++, msg->mtype, msg->msize);
 }
 
 static void pr_info_ipc_msg_entry(const IpcMsgEntry *msg)
 {
-	pr_ipc_desc_entry(LOG_INFO, msg->desc);
-	print_on_level(LOG_INFO, "qbytes: %-10d qnum: %-10d\n",
-		       msg->qbytes, msg->qnum);
+	pr_ipc_desc_entry(msg->desc);
+	pr_info("qbytes: %-10d qnum: %-10d\n", msg->qbytes, msg->qnum);
 }
 
 static int dump_ipc_msg_queue_messages(struct cr_img *img, const IpcMsgEntry *msq,
@@ -287,8 +286,8 @@ static int dump_ipc_msg(struct cr_img *img)
 
 static void pr_info_ipc_shm(const IpcShmEntry *shm)
 {
-	pr_ipc_desc_entry(LOG_INFO, shm->desc);
-	print_on_level(LOG_INFO, "size: %-10"PRIu64"\n", shm->size);
+	pr_ipc_desc_entry(shm->desc);
+	pr_info("size: %-10"PRIu64"\n", shm->size);
 }
 
 #define NR_MANDATORY_IPC_SYSCTLS 9

From 478072474511d99fb135f7cd3c846d3763564e0e Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 31 Jul 2020 14:07:07 +0300
Subject: [PATCH 0308/1854] util: Use pr_info in vma printing

Same as previous patch -- all users are coded as pr_info-s
and are naturally such.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 criu/include/util.h | 10 +++++-----
 criu/util.c         |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/criu/include/util.h b/criu/include/util.h
index 1b22d9e0b..c2baf2788 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -39,17 +39,17 @@ struct list_head;
 
 extern int service_fd_rlim_cur;
 
-extern void pr_vma(unsigned int loglevel, const struct vma_area *vma_area);
+extern void pr_vma(const struct vma_area *vma_area);
 
-#define pr_info_vma(vma_area)	pr_vma(LOG_INFO, vma_area)
+#define pr_info_vma(vma_area)	pr_vma(vma_area)
 
-#define pr_vma_list(level, head)				\
+#define pr_vma_list(head)					\
 	do {							\
 		struct vma_area *vma;				\
 		list_for_each_entry(vma, head, list)		\
-			pr_vma(level, vma);			\
+			pr_vma(vma);				\
 	} while (0)
-#define pr_info_vma_list(head)	pr_vma_list(LOG_INFO, head)
+#define pr_info_vma_list(head)	pr_vma_list(head)
 
 extern int move_fd_from(int *img_fd, int want_fd);
 extern int close_safe(int *fd);
diff --git a/criu/util.c b/criu/util.c
index 4c1f3b4ca..111c956d2 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -191,7 +191,7 @@ static void vma_opt_str(const struct vma_area *v, char *opt)
 #undef opt2s
 }
 
-void pr_vma(unsigned int loglevel, const struct vma_area *vma_area)
+void pr_vma(const struct vma_area *vma_area)
 {
 	char opt[VMA_OPT_LEN];
 	memset(opt, 0, VMA_OPT_LEN);
@@ -200,7 +200,7 @@ void pr_vma(unsigned int loglevel, const struct vma_area *vma_area)
 		return;
 
 	vma_opt_str(vma_area, opt);
-	print_on_level(loglevel, "%#"PRIx64"-%#"PRIx64" (%"PRIi64"K) prot %#x flags %#x fdflags %#o st %#x off %#"PRIx64" "
+	pr_info("%#"PRIx64"-%#"PRIx64" (%"PRIi64"K) prot %#x flags %#x fdflags %#o st %#x off %#"PRIx64" "
 			"%s shmid: %#"PRIx64"\n",
 			vma_area->e->start, vma_area->e->end,
 			KBYTES(vma_area_len(vma_area)),

From ebc0d205a10f7a0264b40a4246005be7d1325768 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 31 Jul 2020 14:09:24 +0300
Subject: [PATCH 0309/1854] log: Hide vprint_on_level in log.c

This one is not used outside of log.c.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 criu/include/log.h | 3 ---
 criu/log.c         | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/criu/include/log.h b/criu/include/log.h
index 15787b09f..7966deca5 100644
--- a/criu/include/log.h
+++ b/criu/include/log.h
@@ -9,9 +9,6 @@
 #include <errno.h>
 #include <stdarg.h>
 
-extern void vprint_on_level(unsigned int loglevel, const char *format,
-		va_list params);
-
 #endif /* CR_NOGLIBC */
 
 #define LOG_UNSET	(-1)
diff --git a/criu/log.c b/criu/log.c
index 0ee113b91..439a899f0 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -34,6 +34,7 @@
 #define EARLY_LOG_BUF_LEN	1024
 
 static unsigned int current_loglevel = DEFAULT_LOGLEVEL;
+static void vprint_on_level(unsigned int, const char *, va_list);
 
 static char buffer[LOG_BUF_LEN];
 static char buf_off = 0;
@@ -350,7 +351,7 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 	early_log_buf_off += log_size;
 }
 
-void vprint_on_level(unsigned int loglevel, const char *format, va_list params)
+static void vprint_on_level(unsigned int loglevel, const char *format, va_list params)
 {
 	int fd, size, ret, off = 0;
 	int _errno = errno;

From 20a24c11ea5d839787ca36f707f3d22503520635 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 31 Jul 2020 14:11:04 +0300
Subject: [PATCH 0310/1854] log: Ask developers not to use print_on_level
 directly

The decision whether a log message is info/warning/error should
be made by the place in code where it's shown, not by any other
expression. This makes it pointless to use the print_on_level
directly, as in each particular place the needed pr_foo() helper
can be chosen.

However, we cannot (easily) make this function static, so keep
it in header, but ask people to think twise (or more times) before
calling it directly.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 criu/include/log.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/include/log.h b/criu/include/log.h
index 7966deca5..58d012337 100644
--- a/criu/include/log.h
+++ b/criu/include/log.h
@@ -20,6 +20,10 @@
 
 #define DEFAULT_LOGLEVEL	LOG_WARN
 
+/*
+ * This is low-level printing helper, try hard not to use it directly
+ * and use the pr_foo() helpers below.
+ */
 extern void print_on_level(unsigned int loglevel, const char *format, ...)
 	__attribute__ ((__format__ (__printf__, 2, 3)));
 

From 83be11f1f4a24d05814a66061e04b9b4d0825763 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 13 May 2020 14:11:05 +0000
Subject: [PATCH 0311/1854] lib/c: extend receive to handle incoming FDs

When using libcriu with the notify callback functionality CRIU transmits
an FD during 'orphan-pts-master' back to libcriu user. This is message
is sent via sendmsg() to transmit the FD and not via write() as all
other protobuf messages.

libcriu was using recv() and to be able to receive the FD this needs to
be changed to recvmsg() and if an FD is attached to it (currently only
for 'orphan-pts-master' this FD is stored in a variable which can be
retrieved with the function criu_get_orphan_pts_master_fd().

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/c/criu.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++---
 lib/c/criu.h | 11 +++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index d052f8d1f..7b780044b 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -34,6 +34,7 @@ struct criu_opts {
 
 static criu_opts *global_opts;
 static int saved_errno;
+static int orphan_pts_master_fd = -1;
 
 void criu_free_service(criu_opts *opts)
 {
@@ -1145,29 +1146,72 @@ int criu_set_page_server_address_port(const char *address, int port)
 
 static CriuResp *recv_resp(int socket_fd)
 {
+	struct msghdr msg_hdr = {0};
 	unsigned char *buf = NULL;
-	int len;
+	struct cmsghdr *cmsg;
 	CriuResp *msg = 0;
+	struct iovec io;
+	int cmsg_len;
+	int len;
 
+	/* Check the size of the waiting data. */
 	len = recv(socket_fd, NULL, 0, MSG_TRUNC | MSG_PEEK);
 	if (len == -1) {
 		perror("Can't read request");
 		goto err;
 	}
 
-	buf = malloc(len);
+	/*
+	 * If there is an FD attached to the protobuf message from CRIU
+	 * the FD will be in the ancillary data. Let's reserve additional
+	 * memory for that.
+	 */
+	cmsg_len = CMSG_LEN(sizeof(int));
+	buf = malloc(len + cmsg_len);
 	if (!buf) {
 		errno = ENOMEM;
 		perror("Can't receive response");
 		goto err;
 	}
 
-	len = recv(socket_fd, buf, len, MSG_TRUNC);
+	io.iov_base = buf;
+	io.iov_len = len;
+	msg_hdr.msg_iov = &io;
+	msg_hdr.msg_iovlen = 1;
+	msg_hdr.msg_control = buf + len;
+	msg_hdr.msg_controllen = cmsg_len;
+	len = recvmsg(socket_fd, &msg_hdr, MSG_TRUNC);
+
 	if (len == -1) {
 		perror("Can't read request");
 		goto err;
 	}
 
+	/*
+	 * This will be NULL if no FD is in the message. Currently
+	 * only a response with script set to 'orphan-pts-master'
+	 * has an FD in the ancillary data.
+	 */
+	cmsg = CMSG_FIRSTHDR(&msg_hdr);
+	if (cmsg) {
+		/* We probably got an FD from CRIU. */
+		if (cmsg->cmsg_type != SCM_RIGHTS) {
+			errno = EINVAL;
+			goto err;
+		}
+		/* CTRUNC will be set if msg_hdr.msg_controllen is too small. */
+		if (msg_hdr.msg_flags & MSG_CTRUNC) {
+			errno = ENFILE;
+			goto err;
+		}
+		/*
+		 * Not using 'orphan_pts_master_fd = *(int *)CMSG_DATA(cmsg)'
+		 * as that fails with some compilers with:
+		 * 'error: dereferencing type-punned pointer will break strict-aliasing rules'
+		 */
+		memcpy(&orphan_pts_master_fd, CMSG_DATA(cmsg), sizeof(int));
+	}
+
 	msg = criu_resp__unpack(NULL, len, buf);
 	if (!msg) {
 		perror("Failed unpacking response");
@@ -1733,3 +1777,8 @@ int criu_check_version(int minimum)
 {
 	return criu_local_check_version(global_opts, minimum);
 }
+
+int criu_get_orphan_pts_master_fd(void)
+{
+	return orphan_pts_master_fd;
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 49f7a7005..e9b2f1e9d 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -117,6 +117,17 @@ void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
 /* Get pid of root task. 0 if not available */
 int criu_notify_pid(criu_notify_arg_t na);
 
+/*
+ * If CRIU sends and FD in the case of 'orphan-pts-master',
+ * this FD can be retrieved with criu_get_orphan_pts_master_fd().
+ *
+ * If no FD has been received this will return -1.
+ *
+ * To make sure the FD returned is valid this function has to be
+ * called after the callback with the 'action' 'orphan-pts-master'.
+ */
+int criu_get_orphan_pts_master_fd(void);
+
 /* Here is a table of return values and errno's of functions
  * from the list down below.
  *

From 320c88e922c191f508e4fbf8e95809d30a3cc571 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Wed, 5 Aug 2020 16:20:10 +0300
Subject: [PATCH 0312/1854] CONTRIBUTING.md: clarify placement of Fixes: tags

The description of the Fixes: tags could be misleading and may be
understood as if "Fixes: " should be the commit summary.

Add a sentence with explicit description of Fixme: tags placement.

Reported-by: Otto Bittner <otto-bittner@gmx.de>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d40f0014c..5d803d020 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -124,6 +124,8 @@ If your change address an issue listed in GitHub, please use `Fixes:` tag with t
 	Fixes: #339
 ```
 
+The `Fixes:` tags should be put at the end of the detailed description.
+
 You may refer to [How to Write a Git Commit
 Message](https://chris.beams.io/posts/git-commit/) article for
 recommendations for good commit message.

From 9ce4ed0935bc1902b250d570ec32271726d4d1ca Mon Sep 17 00:00:00 2001
From: Otto Bittner <otto-bittner@gmx.de>
Date: Tue, 4 Aug 2020 16:00:15 +0200
Subject: [PATCH 0313/1854] python: Handle byte strings when converting
 protobuf to dict

Fixes #1165
Traceback (most recent call last):
  File "../criu/crit/crit-python3", line 6, in <module>
    cli.main()
  File "/home/xcv/repos/criu/crit/pycriu/cli.py", line 410, in main
    opts["func"](opts)
  File "/home/xcv/repos/criu/crit/pycriu/cli.py", line 43, in decode
    json.dump(img, f, indent=indent)
  File "/usr/lib/python3.8/json/__init__.py", line 179, in dump
    for chunk in iterable:
  File "/usr/lib/python3.8/json/encoder.py", line 431, in _iterencode
    yield from _iterencode_dict(o, _current_indent_level)
  File "/usr/lib/python3.8/json/encoder.py", line 405, in _iterencode_dict
    yield from chunks
  File "/usr/lib/python3.8/json/encoder.py", line 325, in _iterencode_list
    yield from chunks
  File "/usr/lib/python3.8/json/encoder.py", line 405, in _iterencode_dict
    yield from chunks
  File "/usr/lib/python3.8/json/encoder.py", line 405, in _iterencode_dict
    yield from chunks
  File "/usr/lib/python3.8/json/encoder.py", line 438, in _iterencode
    o = _default(o)
  File "/usr/lib/python3.8/json/encoder.py", line 179, in default
    raise TypeError(f'Object of type {o.__class__.__name__} '
TypeError: Object of type bytes is not JSON serializable

Co-authored-by: Julian <jb@futureplay.de>
Signed-off-by: Otto Bittner <otto-bittner@gmx.de>
---
 lib/py/images/pb2dict.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index 40a6036cf..eecdc0522 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -357,7 +357,7 @@ def pb2dict(pb, pretty=False, is_hex=False):
         else:
             d_val = _pb2dict_cast(field, value, pretty, is_hex)
 
-        d[field.name] = d_val
+        d[field.name] = d_val.decode() if type(d_val) == bytes else d_val
     return d
 
 

From 3d67e8a0d2341ee7cb8c64031b7a585d92c1b1b0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 5 Aug 2020 13:17:00 +0000
Subject: [PATCH 0314/1854] Makefiles: do not re-generate magic.py every time

I always wondered why re-running make on a criu checkout always prints
out

  GEN      magic.py

even if no file has changed. It seems the Makefile was looking for the
file in the wrong location. Providing the full path to the file will now
only rebuild magic.py if something actually changed that requires a
rebuild.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/py/images/Makefile b/lib/py/images/Makefile
index f7df20f12..d55362dd1 100644
--- a/lib/py/images/Makefile
+++ b/lib/py/images/Makefile
@@ -1,4 +1,4 @@
-all-y	+= images magic.py pb.py
+all-y	+= images $(obj)/magic.py pb.py
 
 proto := $(filter-out images/rpc.proto, $(sort $(wildcard images/*.proto)))
 proto-py-modules := $(foreach m,$(proto),$(subst -,_,$(notdir $(m:.proto=_pb2))))
@@ -10,9 +10,9 @@ images:
 	$(Q) protoc -I=images/ -I=/usr/include/ --python_out=$(obj) $(proto)
 .PHONY: images
 
-magic.py: scripts/magic-gen.py criu/include/magic.h
+$(obj)/magic.py: scripts/magic-gen.py criu/include/magic.h
 	$(call msg-gen, $@)
-	$(Q) $(PYTHON) $^ $(obj)/$@
+	$(Q) $(PYTHON) $^ $@
 
 pb.py: images
 	$(Q) echo "# Autogenerated. Do not edit!" > $(obj)/$@

From 18f42b3021f377df289c82260abd278406731a68 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 5 Aug 2020 14:16:38 +0000
Subject: [PATCH 0315/1854] travis: loop over apt-get to recover from errors

One of the most common CI errors we see is that package install fails
due to some hashsum mismatch or some DNS errors.

This adds a loop around each apt-get install call to do a clean, update
and install and if one of the steps fails it repeats it up to 10 times.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/travis-tests | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index e9c2d5c6a..b95f551f4 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -x -e
 
 TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev python-future
@@ -19,6 +19,27 @@ if [ "$UNAME_M" != "x86_64" ]; then
 	SKIP_TRAVIS_TEST=1
 fi
 
+install_retry_counter=0
+max_apt_retries=5
+
+# This function loops a couple of times over apt-get, hoping to
+# avoid CI errors due to errors during apt-get
+# hashsum mismatches, DNS errors and similar things
+apt_install () {
+	while true; do
+		let install_retry_counter+=1
+		if [ $install_retry_counter -gt $max_apt_retries ]; then
+			exit 1
+		fi
+		apt-get clean -qqy || continue
+		apt-get update -qqy || continue
+		apt-get install -qqy --no-install-recommends $@ && break
+
+		# In case it is a network error let's wait a bit.
+		sleep $install_retry_counter
+	done
+}
+
 travis_prep () {
 	[ -n "$SKIP_TRAVIS_PREP" ] && return
 
@@ -36,8 +57,7 @@ travis_prep () {
 
 	[ -n "$GCOV" ] && {
 		apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-		apt-get update -yq
-		apt-get -yq --no-install-suggests --no-install-recommends --force-yes install g++-7
+		apt_install --no-install-suggests g++-7
 		CC=gcc-7
 	}
 
@@ -56,8 +76,7 @@ travis_prep () {
 		TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS"
 	fi
 
-	apt-get update -qq
-	apt-get install -qq --no-install-recommends $TRAVIS_PKGS
+	apt_install $TRAVIS_PKGS
 	chmod a+x $HOME
 }
 
@@ -111,7 +130,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 		IA32_PKGS="$IA32_PKGS $i:i386"
 	done
 	apt-get remove $INCOMPATIBLE_LIBS
-	apt-get install --no-install-recommends $IA32_PKGS
+	apt_install $IA32_PKGS
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi

From a6b00b1a7aa998aaccf1f7b47d7267c5efa96c86 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 17 May 2020 10:42:19 +0000
Subject: [PATCH 0316/1854] actions: create file for daily rebuild

This adds a definition to do a daily rebuild of all cross-compile tests
on the master and criu-dev branch.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/cross-compile-daily.yml | 22 ++++++++++++++++++++++
 .github/workflows/cross-compile.yml       |  6 ++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/cross-compile-daily.yml

diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
new file mode 100644
index 000000000..9d8688b37
--- /dev/null
+++ b/.github/workflows/cross-compile-daily.yml
@@ -0,0 +1,22 @@
+name: Daily Cross Compile Tests
+
+on:
+  schedule:
+    - cron:  '30 * * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+        branches: [criu-dev, master]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ matrix.branches }}
+    - name: Run Cross Compilation Targets
+      run: >
+        sudo make -C scripts/travis ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 9545d3df6..5649b7064 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -2,11 +2,9 @@ name: Cross Compile Tests
 
 on:
   push:
-    branches: [ criu-dev ]
+    branches: [criu-dev, master]
   pull_request:
-    branches: [ criu-dev ]
-  schedule:
-    - cron:  '55 5 * * *'
+    branches: [criu-dev, master]
 
 jobs:
   build:

From 5b751fbaf8712ced089eeeb8d91d6a58f467b1c3 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 10 Aug 2020 20:57:15 -0700
Subject: [PATCH 0317/1854] criu: the type of a socket inode has to be
 "unsigned int"

(00.015271) unix: 	Add a peer: ino 2203289876 peer_ino 2203289875 family    1 type    1 state  1 name /mnt/test/zdtm/static/sockets03.test
(00.015277) Warn  (criu/sk-unix.c:475): unix: Shutdown mismatch -2091677421:1 -> -2091677420:0

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sk-inet.c |  2 +-
 criu/sk-unix.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 342548585..dc1ee8144 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -116,7 +116,7 @@ static void show_one_inet_img(const char *act, const InetSkEntry *e)
 		src_addr);
 }
 
-static int can_dump_ipproto(int ino, int proto, int type)
+static int can_dump_ipproto(unsigned int ino, int proto, int type)
 {
 	/* Raw sockets may have any protocol inside */
 	if (type == SOCK_RAW)
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index cbcf1f66c..00d09cc11 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -472,7 +472,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 			 * to check both ends on read()/write(). Thus mismatched sockets behave
 			 * the same way as matched.
 			 */
-			pr_warn("Shutdown mismatch %d:%d -> %d:%d\n",
+			pr_warn("Shutdown mismatch %u:%d -> %u:%d\n",
 					ue->ino, ue->shutdown, peer->sd.ino, peer->shutdown);
 		}
 	} else if (ue->state == TCP_ESTABLISHED) {
@@ -947,7 +947,7 @@ void init_sk_info_hash(void)
 		INIT_HLIST_HEAD(&sk_info_hash[i]);
 }
 
-static struct unix_sk_info *find_unix_sk_by_ino(int ino)
+static struct unix_sk_info *find_unix_sk_by_ino(unsigned int ino)
 {
 	struct unix_sk_info *ui;
 	struct hlist_head *chain;
@@ -1145,7 +1145,7 @@ static int shutdown_unix_sk(int sk, struct unix_sk_info *ui)
 		return -1;
 	}
 
-	pr_debug("Socket %d is shut down %d\n", ue->ino, how);
+	pr_debug("Socket %u is shut down %d\n", ue->ino, how);
 	return 0;
 }
 
@@ -1825,13 +1825,13 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 		int ret, sks[2];
 
 		if (ui->ue->type != SOCK_STREAM) {
-			pr_err("Non-stream socket %d in established state\n",
+			pr_err("Non-stream socket %u in established state\n",
 					ui->ue->ino);
 			return -1;
 		}
 
 		if (ui->ue->shutdown != SK_SHUTDOWN__BOTH) {
-			pr_err("Wrong shutdown/peer state for %d\n",
+			pr_err("Wrong shutdown/peer state for %u\n",
 					ui->ue->ino);
 			return -1;
 		}
@@ -1909,7 +1909,7 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 	}
 
 	if (ui->ue->state == TCP_LISTEN) {
-		pr_info("\tPutting %d into listen state\n", ui->ue->ino);
+		pr_info("\tPutting %u into listen state\n", ui->ue->ino);
 		if (listen(sk, ui->ue->backlog) < 0) {
 			pr_perror("Can't make usk listen");
 			close(sk);
@@ -2267,7 +2267,7 @@ static int fixup_unix_peer(struct unix_sk_info *ui)
 	struct unix_sk_info *peer = ui->peer;
 
 	if (!peer) {
-		pr_err("FATAL: Peer %d unresolved for %d\n",
+		pr_err("FATAL: Peer %u unresolved for %u\n",
 				ui->ue->peer, ui->ue->ino);
 		return -1;
 	}

From 52eff52e6741c75524b8613ea2863e2cfd363640 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Wed, 12 Aug 2020 22:27:01 +0300
Subject: [PATCH 0318/1854] github: disable cross-compule for mips on master
 branch

Master branch does not have mips support yet, so automated builds for
mips on the master branch fail.

Temporarily split mips cross-build into a separate files until mips
support will be mergded into the master branch.

Suggested-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 .../workflows/cross-compile-daily-mips.yml    | 22 +++++++++++++++++++
 .github/workflows/cross-compile-daily.yml     |  2 +-
 .github/workflows/cross-compile-mips.yml      | 21 ++++++++++++++++++
 .github/workflows/cross-compile.yml           |  2 +-
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/cross-compile-daily-mips.yml
 create mode 100644 .github/workflows/cross-compile-mips.yml

diff --git a/.github/workflows/cross-compile-daily-mips.yml b/.github/workflows/cross-compile-daily-mips.yml
new file mode 100644
index 000000000..b372a23ae
--- /dev/null
+++ b/.github/workflows/cross-compile-daily-mips.yml
@@ -0,0 +1,22 @@
+name: Daily Cross Compile Tests
+
+on:
+  schedule:
+    - cron:  '30 * * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [mips64el-cross]
+        branches: [criu-dev]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: ${{ matrix.branches }}
+    - name: Run Cross Compilation Targets
+      run: >
+        sudo make -C scripts/travis ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
index 9d8688b37..78e9c1619 100644
--- a/.github/workflows/cross-compile-daily.yml
+++ b/.github/workflows/cross-compile-daily.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+        target: [armv7-cross, aarch64-cross, ppc64-cross]
         branches: [criu-dev, master]
 
     steps:
diff --git a/.github/workflows/cross-compile-mips.yml b/.github/workflows/cross-compile-mips.yml
new file mode 100644
index 000000000..4f6c6dbd3
--- /dev/null
+++ b/.github/workflows/cross-compile-mips.yml
@@ -0,0 +1,21 @@
+name: Cross Compile Tests
+
+on:
+  push:
+    branches: [criu-dev]
+  pull_request:
+    branches: [criu-dev]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [mips64el-cross]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Cross Compilation Targets
+      run: >
+        sudo make -C scripts/travis ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 5649b7064..98cf6f77f 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+        target: [armv7-cross, aarch64-cross, ppc64-cross]
 
     steps:
     - uses: actions/checkout@v2

From 8063fbb47d9cfa04039c9f51fd3d61c37c2a4681 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 14 Aug 2020 21:31:29 +0300
Subject: [PATCH 0319/1854] contrib: Add python-future to Debian packages

This one contains builtins module from which zdtm.py imports.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 contrib/debian/dev-packages.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/debian/dev-packages.lst b/contrib/debian/dev-packages.lst
index 049bbd82d..ddb1f8dd1 100644
--- a/contrib/debian/dev-packages.lst
+++ b/contrib/debian/dev-packages.lst
@@ -18,3 +18,4 @@ libcap-dev
 libaio-dev
 python-yaml
 libnl-route-3-dev
+python-future

From ca360ce30bbecf0dccca2b34af8fcc9d33524f3d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 19 May 2020 16:23:31 +0000
Subject: [PATCH 0320/1854] travis: switch travis to Python 3

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/travis/travis-tests | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index b95f551f4..6c54ea438 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -1,12 +1,26 @@
 #!/bin/bash
 set -x -e
 
-TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev python-future
-		libgnutls28-dev libgnutls30 libprotobuf-dev protobuf-compiler
-		libcap-dev libnl-3-dev gdb bash python-protobuf python-yaml
-		libnet-dev util-linux asciidoctor libnl-route-3-dev
-		python-junit.xml python-ipaddress time ccache flake8
-		libbsd-dev"
+TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
+		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
+		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
+		libnl-route-3-dev time ccache flake8 libbsd-dev"
+
+
+if [ -e /etc/lsb-release ]; then
+	# This file does not exist on non Ubuntu
+	. /etc/lsb-release
+	if [ "$DISTRIB_RELEASE" = "16.04" ]; then
+		# There is one last test running on 16.04 because of the broken
+		# overlayfs in 18.04. Once that is fixed we can remove the last
+		# 16.04 based test and this if clause.
+		TRAVIS_PKGS="$TRAVIS_PKGS python-future python-protobuf python-yaml
+				python-junit.xml python-ipaddress"
+	else
+		TRAVIS_PKGS="$TRAVIS_PKGS python3-future python3-protobuf python3-yaml
+				python3-junit.xml"
+	fi
+fi
 
 X86_64_PKGS="gcc-multilib"
 
@@ -78,6 +92,10 @@ travis_prep () {
 
 	apt_install $TRAVIS_PKGS
 	chmod a+x $HOME
+
+	# zdtm uses an unversioned python binary to run the tests.
+	# let's point python to python3
+	ln -sf /usr/bin/python3 /usr/bin/python
 }
 
 test_stream() {

From d6735616a96906c65213ac38cd29e27e6f857d99 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 14 Aug 2020 19:08:14 +0000
Subject: [PATCH 0321/1854] travis: add a focal based test run

It seems travis supports now Ubuntu 20.04. Let's run at least one test
also on 20.04 (focal).

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                 | 4 ++++
 scripts/travis/travis-tests | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8ada90193..08d0b2ed6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,10 @@ env:
   - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
+    - os: linux
+      arch: amd64
+      env: TR_ARCH=local
+      dist: focal
     - os: linux
       arch: ppc64le
       env: TR_ARCH=local
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 6c54ea438..8c185f1cb 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -59,6 +59,11 @@ travis_prep () {
 
 	cd ../../
 
+	# At least one of the test cases run by this script (others/rpc)
+	# expects a user with the ID 1000. sudo from 20.04 (focal) does
+	# not run anymore with 'sudo -u \#1000' if the UID does not exist.
+	adduser -u 1000 --disabled-password --gecos "criutest" criutest || :
+
 	# This can fail on aarch64 travis
 	service apport stop || :
 
@@ -201,7 +206,7 @@ LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps04"
 # we cannot run lazy-pages tests in uns
 LAZY_FLAVORS=""
 if [ $KERN_MAJ -ge "5" ] && [ $KERN_MIN -ge "4" ]; then
-    LAZY_FLAVORS = "-f h,ns"
+    LAZY_FLAVORS="-f h,ns"
 fi
 
 LAZY_TESTS=.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*

From c26cd1395f68663e5b417b7b64c9c1e35f48fedd Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Fri, 24 Jul 2020 20:24:57 +0530
Subject: [PATCH 0322/1854] images: protobuf definitions for BPF map meta-data
 and data

This commit adds protobuf definitions needed to checkpoint and
restore BPF map files along with the data they contain

Source files added:

* bpfmap-file.proto - Stores the meta-data about BPF maps

* bpfmap-data.proto - Stores the data (key-value pairs) contained
in BPF maps

Source files modified:

* fdinfo.proto - Added BPF map as a new kind of file descriptor.
'message file_entry' can now hold information about BPF map file
descriptors

* Makefile - Now generates build artifacts for bpfmap-file.proto
and bpfmap-data.proto

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 images/Makefile          |  2 ++
 images/bpfmap-data.proto |  8 ++++++++
 images/bpfmap-file.proto | 20 ++++++++++++++++++++
 images/fdinfo.proto      |  3 +++
 4 files changed, 33 insertions(+)
 create mode 100644 images/bpfmap-data.proto
 create mode 100644 images/bpfmap-file.proto

diff --git a/images/Makefile b/images/Makefile
index 9ce7198c0..34bc36792 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -68,6 +68,8 @@ proto-obj-y	+= sit.o
 proto-obj-y	+= memfd.o
 proto-obj-y	+= timens.o
 proto-obj-y	+= img-streamer.o
+proto-obj-y	+= bpfmap-file.o
+proto-obj-y	+= bpfmap-data.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/bpfmap-data.proto b/images/bpfmap-data.proto
new file mode 100644
index 000000000..dc3b0db01
--- /dev/null
+++ b/images/bpfmap-data.proto
@@ -0,0 +1,8 @@
+syntax = "proto2";
+
+message bpfmap_data_entry {
+	required uint32	map_id			= 1;
+	required uint32	keys_bytes		= 2;	/* Bytes required to store keys */
+	required uint32	values_bytes		= 3;	/* Bytes required to store values */
+	required uint32 count			= 4;	/* Number of key-value pairs stored */
+}
diff --git a/images/bpfmap-file.proto b/images/bpfmap-file.proto
new file mode 100644
index 000000000..ae789aa72
--- /dev/null
+++ b/images/bpfmap-file.proto
@@ -0,0 +1,20 @@
+syntax = "proto2";
+
+import "opts.proto";
+import "fown.proto";
+
+message bpfmap_file_entry {
+	required uint32		id		= 1;
+	required uint32		flags		= 2 [(criu).flags = "rfile.flags"];
+	required uint64		pos		= 3;
+	required fown_entry	fown		= 4;
+	required uint32		map_type	= 5;
+	required uint32		key_size	= 6;
+	required uint32		value_size	= 7;
+	required uint32		map_id		= 8;
+	required uint32		max_entries	= 9;
+	required uint32		map_flags	= 10;
+	required uint64		memlock		= 11;
+	required bool		frozen		= 12;
+	optional sint32		mnt_id		= 13 [default = -1];
+}
diff --git a/images/fdinfo.proto b/images/fdinfo.proto
index d966d5bc5..f5e18954b 100644
--- a/images/fdinfo.proto
+++ b/images/fdinfo.proto
@@ -17,6 +17,7 @@ import "fifo.proto";
 import "pipe.proto";
 import "tty.proto";
 import "memfd.proto";
+import "bpfmap-file.proto";
 
 enum fd_types {
 	UND		= 0;
@@ -38,6 +39,7 @@ enum fd_types {
 	EXT		= 16;
 	TIMERFD		= 17;
 	MEMFD		= 18;
+	BPFMAP		= 19;
 
 	/* Any number above the real used. Not stored to image */
 	CTL_TTY		= 65534;
@@ -73,4 +75,5 @@ message file_entry {
 	optional pipe_entry		pipe	= 18;
 	optional tty_file_entry		tty	= 19;
 	optional memfd_file_entry	memfd	= 20;
+	optional bpfmap_file_entry	bpf	= 21;
 }

From 95b7d06cbc4cb31509b03f988f2541942d2624f7 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Fri, 24 Jul 2020 20:34:21 +0530
Subject: [PATCH 0323/1854] criu: define constants for c/r of BPF maps

This commit defines constants and includes necessary headers to c/r
BPF maps

Source files modified:

* magic.h - Defining BPFMAP_FILE_MAGIC and BPFMAP_DATA_MAGIC

* image-desc.h - Defining CR_FD_BPFMAP_FILE and CR_FD_BPFMAP_DATA

* image-desc.c - Create new entries for bpfmap-file and bpfmap-data
in CRIU's file descriptor set

* protobuf-desc.h - Defining PB_BPFMAP_FILE and PB_BPFMAP_DATA

* protobuf-desc.c - Including headers for BPF map protobuf images

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/image-desc.c            | 2 ++
 criu/include/image-desc.h    | 2 ++
 criu/include/magic.h         | 2 ++
 criu/include/protobuf-desc.h | 2 ++
 criu/protobuf-desc.c         | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/criu/image-desc.c b/criu/image-desc.c
index c9581f5b8..26e6b27bc 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -104,6 +104,8 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(FILES,		"files"),
 	FD_ENTRY(TIMENS,	"timens-%u"),
 	FD_ENTRY(PIDNS,		"pidns-%u"),
+	FD_ENTRY_F(BPFMAP_FILE,	"bpfmap-file", O_NOBUF),
+	FD_ENTRY_F(BPFMAP_DATA,	"bpfmap-data", O_NOBUF),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index e37d535c2..f69cc5824 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -68,6 +68,8 @@ enum {
 	CR_FD_FILE_LOCKS,
 	CR_FD_SECCOMP,
 	CR_FD_MEMFD_INODE,
+	CR_FD_BPFMAP_FILE,
+	CR_FD_BPFMAP_DATA,
 	_CR_FD_GLOB_TO,
 
 	CR_FD_TMPFS_IMG,
diff --git a/criu/include/magic.h b/criu/include/magic.h
index 1dff50236..ec87c82bf 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -97,6 +97,8 @@
 #define MEMFD_INODE_MAGIC	0x48453499 /* Dnipro */
 #define TIMENS_MAGIC		0x43114433 /* Beslan */
 #define PIDNS_MAGIC		0x61157326 /* Surgut */
+#define BPFMAP_FILE_MAGIC	0x57506142 /* Alapayevsk */
+#define BPFMAP_DATA_MAGIC	0x64324033 /* Arkhangelsk */
 
 #define IFADDR_MAGIC		RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC		RAW_IMAGE_MAGIC
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 46f7f8cea..35fa1a90b 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -67,6 +67,8 @@ enum {
 	PB_IMG_STREAMER_REQUEST,
 	PB_IMG_STREAMER_REPLY,
 	PB_PIDNS,
+	PB_BPFMAP_FILE,
+	PB_BPFMAP_DATA,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index 223a6149f..8f601ea24 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -65,6 +65,8 @@
 #include "images/binfmt-misc.pb-c.h"
 #include "images/autofs.pb-c.h"
 #include "images/img-streamer.pb-c.h"
+#include "images/bpfmap-file.pb-c.h"
+#include "images/bpfmap-data.pb-c.h"
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];
 

From aa59dfc6dfcb3a52a1f64c97f75b9827261be25b Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 15 Aug 2020 13:37:56 +0530
Subject: [PATCH 0324/1854] Set Makefile config variables for libbpf

Source files modified:

* Makefile.config - Checks whether libbpf is installed on the system.
If so, we add -lbpf to LIBS_FEATURES, -DCONFIG_HAS_LIBBPF to
FEATURE_DEFINES and set CONFIG_HAS_LIBBPF. This allows us to check for
the presence of libbpf before compiling or executing BPF c/r code and
ZDTM tests.

* Makefile - Set CONFIG_HAS_LIBBPF to clean all files.

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 Makefile        | 1 +
 Makefile.config | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index e72dd1428..5ac4cbacd 100644
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,7 @@ else
 # To clean all files, enable make/build options here
 export CONFIG_COMPAT := y
 export CONFIG_GNUTLS := y
+export CONFIG_HAS_LIBBPF := y
 endif
 
 #
diff --git a/Makefile.config b/Makefile.config
index 98ba5d892..3d99e680b 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -15,6 +15,12 @@ ifeq ($(call pkg-config-check,libselinux),y)
         FEATURE_DEFINES	+= -DCONFIG_HAS_SELINUX
 endif
 
+ifeq ($(call pkg-config-check,libbpf),y)
+        LIBS_FEATURES	+= -lbpf
+        FEATURE_DEFINES	+= -DCONFIG_HAS_LIBBPF
+        export CONFIG_HAS_LIBBPF := y
+endif
+
 ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
         LIBS_FEATURES	+= -lgnutls
         export CONFIG_GNUTLS := y

From b85709797ca499b7ee9727a66b40de99d3b30344 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Fri, 24 Jul 2020 17:18:32 +0530
Subject: [PATCH 0325/1854] criu: parse information about BPF maps from procfs

This commit enables CRIU to:
(a) identify an anonymous inode as being a BPF map
(b) parse information about BPF maps from procfs

Source files modified:

* files.c - Checks anonymous inodes to see whether they are BPF maps.
If so, sets struct fdtype_ops *ops to a structure that knows how to
dump BPF maps

* proc_parse.c - Function parse_fdinfo_pid_s() now checks whether the
current file being processed is a BPF map. If so, it calls a newly
defined function parse_bpfmap() which knows how to parse information
about BPF maps from procfs

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/files.c      |  5 ++++
 criu/proc_parse.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/criu/files.c b/criu/files.c
index 2cfc9040e..45105f673 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -48,6 +48,7 @@
 #include "string.h"
 #include "kerndat.h"
 #include "fdstore.h"
+#include "bpfmap.h"
 
 #include "protobuf.h"
 #include "util.h"
@@ -539,6 +540,10 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 			ops = &signalfd_dump_ops;
 		else if (is_timerfd_link(link))
 			ops = &timerfd_dump_ops;
+#ifdef CONFIG_HAS_LIBBPF
+		else if (is_bpfmap_link(link))
+			ops = &bpfmap_dump_ops;
+#endif
 		else
 			return dump_unsupp_fd(&p, lfd, "anon", link, e);
 
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 77f1b216c..7473bcf67 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1682,6 +1682,57 @@ nodata:
 	goto parse_err;
 }
 
+typedef struct bpfmap_fmt {
+	char *fmt;
+	void *value;
+} bpfmap_fmt;
+
+static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
+{
+	/*
+	 * Format is:
+	 * 
+	 * uint32_t map_type
+	 * uint32_t key_size
+	 * uint32_t value_size
+	 * uint32_t max_entries
+	 * uint32_t map_flags
+	 * uint64_t memlock
+	 * uint32_t map_id
+	 * boolean frozen
+	 */
+
+	bpfmap_fmt map[] = {
+		{"map_type: %u", &bpf->map_type },
+		{"key_size: %u", &bpf->key_size },
+		{"value_size: %u", &bpf->value_size },
+		{"max_entries: %u", &bpf->max_entries },
+		{"map_flags: %"PRIx32"", &bpf->map_flags },
+		{"memlock: %"PRIu64"", &bpf->memlock },
+		{"map_id: %u", &bpf->map_id },
+		{"frozen: %d", &bpf->frozen },
+	};
+
+	size_t n = sizeof(map) / sizeof(bpfmap_fmt);
+	int i;
+	
+	for (i = 0; i < n; i++) {
+		if (sscanf(str, map[i].fmt, map[i].value) != 1)
+			return -1;
+
+		if (i == n - 1)
+			break;
+
+		str = breadline(f);
+		if (IS_ERR_OR_NULL(str)) {
+			pr_err("No data left in proc file while parsing bpfmap\n");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 #define fdinfo_field(str, field)	!strncmp(str, field":", sizeof(field))
 
 static int parse_file_lock_buf(char *buf, struct file_lock *fl,
@@ -2014,6 +2065,18 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			entry_met = true;
 			continue;
 		}
+		if (fdinfo_field(str, "map_type")) {
+			BpfmapFileEntry *bpf = arg;
+			if (type != FD_TYPES__BPFMAP)
+				goto parse_err;
+
+			ret = parse_bpfmap(&f, str, bpf);
+			if (ret)
+				goto parse_err;
+
+			entry_met = true;
+			continue;
+		}
 	}
 
 	exit_code = 0;

From 5ff0e70586b8a18a6bef6cfac137c3404162e422 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Fri, 24 Jul 2020 18:02:52 +0530
Subject: [PATCH 0326/1854] criu: dumping meta-data about BPF map files

This commit enables CRIU to dump meta-data about BPF maps files by
prividing the structures and functions needed by other parts of the
code-base.

Source files added:

* bpfmap.c - defines new structures and functions:

    (a) struct fdtype_ops bpfmap_dump_ops:
            sets up the function handler to dump BPF maps

    (b) is_bpfmap_link():
            checks whether an anonymous inode is a BPF map file

    (c) dump_one_bpfmap():
            parses information for a BPF map file from procfs and
			dumps it

* include/bpfmap.h - structure and function declarations

Source files modified:

* Makefile.crtools - generates build artifacts for bpfmap.c

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/Makefile.crtools |  1 +
 criu/bpfmap.c         | 62 +++++++++++++++++++++++++++++++++++++++++++
 criu/include/bpfmap.h | 10 +++++++
 3 files changed, 73 insertions(+)
 create mode 100644 criu/bpfmap.c
 create mode 100644 criu/include/bpfmap.h

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index dc92c2ea2..dcffb4f9d 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -89,6 +89,7 @@ obj-y			+= servicefd.o
 obj-y			+= pie-util-vdso.o
 obj-y			+= vdso.o
 obj-y			+= timens.o
+obj-$(CONFIG_HAS_LIBBPF)	+= bpfmap.o
 obj-$(CONFIG_COMPAT)	+= pie-util-vdso-elf32.o
 CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
 obj-$(CONFIG_COMPAT)	+= vdso-compat.o
diff --git a/criu/bpfmap.c b/criu/bpfmap.c
new file mode 100644
index 000000000..e97c827e7
--- /dev/null
+++ b/criu/bpfmap.c
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <linux/bpf.h>
+
+#include "common/compiler.h"
+#include "imgset.h"
+#include "bpfmap.h"
+#include "fdinfo.h"
+#include "image.h"
+#include "util.h"
+#include "log.h"
+
+#include "protobuf.h"
+
+int is_bpfmap_link(char *link)
+{
+	return is_anon_link_type(link, "bpf-map");
+}
+
+static void pr_info_bpfmap(char *action, BpfmapFileEntry *bpf)
+{
+	pr_info("%sbpfmap: id %#08x map_id %#08x map_type %d flags %"PRIx32"\n",
+		action, bpf->id, bpf->map_id, bpf->map_type, bpf->map_flags);
+}
+
+static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
+{
+	BpfmapFileEntry bpf = BPFMAP_FILE_ENTRY__INIT;
+	FileEntry fe = FILE_ENTRY__INIT;
+	int ret;
+
+	if (parse_fdinfo(lfd, FD_TYPES__BPFMAP, &bpf))
+		return -1;
+
+	switch (bpf.map_type) {
+
+		case BPF_MAP_TYPE_HASH:
+		case BPF_MAP_TYPE_ARRAY:
+			bpf.id = id;
+			bpf.flags = p->flags;
+			bpf.fown = (FownEntry *)&p->fown;
+
+			fe.type = FD_TYPES__BPFMAP;
+			fe.id = bpf.id;
+			fe.bpf = &bpf;
+
+			pr_info_bpfmap("Dumping ", &bpf);
+			ret = pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
+			break;
+
+		default:
+			pr_err("CRIU does not currently support dumping BPF map type %u!\n", bpf.map_type);
+			ret = -1;
+	}
+
+	return ret;
+	
+}
+
+const struct fdtype_ops bpfmap_dump_ops = {
+	.type		= FD_TYPES__BPFMAP,
+	.dump		= dump_one_bpfmap,
+};
diff --git a/criu/include/bpfmap.h b/criu/include/bpfmap.h
new file mode 100644
index 000000000..881a94554
--- /dev/null
+++ b/criu/include/bpfmap.h
@@ -0,0 +1,10 @@
+#ifndef __CR_BPFMAP_H__
+#define __CR_BPFMAP_H__
+
+#include "files.h"
+#include "bpfmap-file.pb-c.h"
+
+extern int is_bpfmap_link(char *link);
+extern const struct fdtype_ops bpfmap_dump_ops;
+
+#endif /* __CR_BPFMAP_H__ */ 

From b924394ccdab4830013a5f4364f1c05a5cdc0d15 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Fri, 24 Jul 2020 21:51:13 +0530
Subject: [PATCH 0327/1854] criu: dumping BPF map data

This commit enables CRIU to dump data(key-value) pairs stored in BPF
maps

Source files modified:

* bpfmap.c

    - Function dump_one_bpfmap_data() reads the map's keys and
    values into two buffers using bpf_map_lookup_batch() and then
    writes them out to a protobuf image along with the number of
    key-value pairs read

    - Function dump_one_bpfmap() now dumps the data as well before
    returning

* include/bpfmap.h - Includes headers and declares functions needed to
dump BPF map data

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/bpfmap.c         | 103 +++++++++++++++++++++++++++++++++++++++++-
 criu/include/bpfmap.h |   3 ++
 2 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index e97c827e7..4eb9fc559 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <linux/bpf.h>
+#include <bpf/bpf.h>
 
 #include "common/compiler.h"
 #include "imgset.h"
@@ -22,6 +23,103 @@ static void pr_info_bpfmap(char *action, BpfmapFileEntry *bpf)
 		action, bpf->id, bpf->map_id, bpf->map_type, bpf->map_flags);
 }
 
+int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p)
+{
+	/*
+	 * Linux kernel patch notes for bpf_map_*_batch():
+	 *
+	 * in_batch/out_batch are opaque values use to communicate between
+	 * user/kernel space, in_batch/out_batch must be of key_size length.
+	 * To start iterating from the beginning in_batch must be null,
+	 * count is the # of key/value elements to retrieve. Note that the 'keys'
+	 * buffer must be a buffer of key_size * count size and the 'values' buffer
+	 * must be value_size * count, where value_size must be aligned to 8 bytes
+	 * by userspace if it's dealing with percpu maps. 'count' will contain the
+	 * number of keys/values successfully retrieved. Note that 'count' is an
+	 * input/output variable and it can contain a lower value after a call.
+	 * 
+	 * If there's no more entries to retrieve, ENOENT will be returned. If error
+	 * is ENOENT, count might be > 0 in case it copied some values but there were
+	 * no more entries to retrieve.
+	 * 
+	 * Note that if the return code is an error and not -EFAULT,
+	 * count indicates the number of elements successfully processed.
+	 */
+
+	struct cr_img *img;
+	uint32_t key_size, value_size, max_entries, count;
+	void *keys = NULL, *values = NULL;
+	void *in_batch = NULL, *out_batch = NULL;
+	BpfmapDataEntry bde = BPFMAP_DATA_ENTRY__INIT;
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+	int ret;
+
+	key_size = bpf->key_size;
+	value_size = bpf->value_size;
+	max_entries = bpf->max_entries;
+	count = max_entries;
+
+	keys = mmap(NULL, key_size * max_entries, PROT_READ | PROT_WRITE,
+				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (keys == MAP_FAILED) {
+		pr_perror("Can't map memory for BPF map keys");
+		goto err;
+	}
+
+	values = mmap(NULL, value_size * max_entries, PROT_READ | PROT_WRITE,
+				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (values == MAP_FAILED) {
+		pr_perror("Can't map memory for BPF map values");
+		goto err;
+	}
+
+	out_batch = mmap(NULL, key_size, PROT_READ | PROT_WRITE,
+				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (out_batch == MAP_FAILED) {
+		pr_perror("Can't map memory for BPF map out_batch");
+		goto err;
+	}
+
+	ret = bpf_map_lookup_batch(lfd, in_batch, out_batch, keys, values, &count, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't perform a batch lookup on BPF map");
+		goto err;
+	}
+
+	img = img_from_set(glob_imgset, CR_FD_BPFMAP_DATA);
+
+	bde.map_id = bpf->map_id;
+	bde.keys_bytes = (key_size * count);
+	bde.values_bytes = (value_size * count);
+	bde.count = count;
+
+	if (pb_write_one(img, &bde, PB_BPFMAP_DATA))
+		goto err;
+
+	if (write(img_raw_fd(img), keys, key_size * count) != (key_size * count)) {
+		pr_perror("Can't write BPF map's keys");
+		goto err;
+	}
+	if (write(img_raw_fd(img), values, value_size * count) != (value_size * count)) {
+		pr_perror("Can't write BPF map's values");
+		goto err;
+	}
+
+	munmap(keys, key_size * max_entries);
+	munmap(values, value_size * max_entries);
+	munmap(out_batch, key_size);
+	return 0;
+
+err:
+	munmap(keys, key_size * max_entries);
+	munmap(values, value_size * max_entries);
+	munmap(out_batch, key_size);
+	return -1;
+}
+
 static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 {
 	BpfmapFileEntry bpf = BPFMAP_FILE_ENTRY__INIT;
@@ -44,7 +142,10 @@ static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 			fe.bpf = &bpf;
 
 			pr_info_bpfmap("Dumping ", &bpf);
-			ret = pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
+			if (pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE))
+				return -1;
+			pr_info_bpfmap("Dumping data for ", &bpf);
+			ret = dump_one_bpfmap_data(&bpf, lfd, p);
 			break;
 
 		default:
diff --git a/criu/include/bpfmap.h b/criu/include/bpfmap.h
index 881a94554..cfeeb2745 100644
--- a/criu/include/bpfmap.h
+++ b/criu/include/bpfmap.h
@@ -3,8 +3,11 @@
 
 #include "files.h"
 #include "bpfmap-file.pb-c.h"
+#include "bpfmap-data.pb-c.h"
 
 extern int is_bpfmap_link(char *link);
+extern int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p);
+
 extern const struct fdtype_ops bpfmap_dump_ops;
 
 #endif /* __CR_BPFMAP_H__ */ 

From 4b8186cb6eedda5c71a3319ca339a50278653c8c Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 25 Jul 2020 16:17:07 +0530
Subject: [PATCH 0328/1854] crit: add BPF map data decoding

This commit enables CRIT to decode the contents of a protobuf image
that stores information related to BPF map

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 lib/py/images/images.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 7faefbb96..9c8e1447d 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -353,6 +353,19 @@ class tcp_stream_extra_handler:
         f.seek(0, os.SEEK_END)
         return pbuff.inq_len + pbuff.outq_len
 
+class bpfmap_data_extra_handler:
+    def load(self, f, pload):
+        size = pload.keys_bytes + pload.values_bytes
+        data = f.read(size)
+        return base64.encodebytes(data)
+
+    def dump(self, extra, f, pload):
+        data = base64.decodebytes(extra)
+        f.write(data)
+
+    def skip(self, f, pload):
+        f.seek(pload.bytes, os.SEEK_CUR)
+        return pload.bytes
 
 class ipc_sem_set_handler:
     def load(self, f, pbuff):
@@ -526,6 +539,9 @@ handlers = {
     'CPUINFO': entry_handler(pb.cpuinfo_entry),
     'MEMFD_FILE': entry_handler(pb.memfd_file_entry),
     'MEMFD_INODE': entry_handler(pb.memfd_inode_entry),
+    'BPFMAP_FILE': entry_handler(pb.bpfmap_file_entry),
+    'BPFMAP_DATA': entry_handler(pb.bpfmap_data_entry,
+                                bpfmap_data_extra_handler()),
 }
 
 

From 4d073a75e2f1f82288b2097da3529e976f3c4321 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 25 Jul 2020 17:13:35 +0530
Subject: [PATCH 0329/1854] criu: restoring BPF maps (without data)

This commit enables CRIU to restore a process' BPF map file
descriptors.

Source files modified:

* bpfmap.c - Structure and function definitions needed to:
    (a) collect a BPF map's information from its protobuf image
    (b) create and open a BPF map with the same parameters as when
    it was dumped
    (c) add the newly opened BPF map to the process' file descriptor
    list

* include/bpfmap.h - Structure declarations for restoring BPF maps

* files.c - Collects a BPF map's file entry during the restoration
phase

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/bpfmap.c         | 51 +++++++++++++++++++++++++++++++++++++++++++
 criu/files.c          |  5 +++++
 criu/include/bpfmap.h |  6 +++++
 3 files changed, 62 insertions(+)

diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index 4eb9fc559..c5bde6ebb 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -161,3 +161,54 @@ const struct fdtype_ops bpfmap_dump_ops = {
 	.type		= FD_TYPES__BPFMAP,
 	.dump		= dump_one_bpfmap,
 };
+
+static int bpfmap_open(struct file_desc *d, int *new_fd)
+{
+	struct bpfmap_file_info *info;
+	BpfmapFileEntry *bpfe;
+	int bpfmap_fd;
+
+	info = container_of(d, struct bpfmap_file_info, d);
+	bpfe = info->bpfe;
+
+	pr_info_bpfmap("Creating and opening ", bpfe);
+	bpfmap_fd = bpf_create_map(bpfe->map_type, bpfe->key_size,
+						bpfe->value_size, bpfe->max_entries, bpfe->map_flags);
+	if (bpfmap_fd < 0) {
+		pr_perror("Can't create bpfmap %#08x", bpfe->id);
+		return -1;
+	}
+
+	if (rst_file_params(bpfmap_fd, bpfe->fown, bpfe->flags)) {
+		pr_perror("Can't restore params on bpfmap %#08x", bpfe->id);
+		goto err_close;
+	}
+
+	*new_fd = bpfmap_fd;
+	return 0;
+
+err_close:
+	close(bpfmap_fd);
+	return -1;
+}
+
+static struct file_desc_ops bpfmap_desc_ops = {
+	.type = FD_TYPES__BPFMAP,
+	.open = bpfmap_open,
+};
+
+static int collect_one_bpfmap(void *obj, ProtobufCMessage *msg, struct cr_img *i)
+{
+	struct bpfmap_file_info *info = obj;
+
+	info->bpfe = pb_msg(msg, BpfmapFileEntry);
+	pr_info_bpfmap("Collected ", info->bpfe);
+	return file_desc_add(&info->d, info->bpfe->id, &bpfmap_desc_ops);
+}
+
+struct collect_image_info bpfmap_cinfo = {
+	.fd_type = CR_FD_BPFMAP_FILE,
+	.pb_type = PB_BPFMAP_FILE,
+	.priv_size = sizeof(struct bpfmap_file_info),
+	.collect = collect_one_bpfmap,
+};
diff --git a/criu/files.c b/criu/files.c
index 45105f673..0912d1a4d 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1738,6 +1738,11 @@ static int collect_one_file(void *o, ProtobufCMessage *base, struct cr_img *i)
 	case FD_TYPES__MEMFD:
 		ret = collect_one_file_entry(fe, fe->memfd->id, &fe->memfd->base, &memfd_cinfo);
 		break;
+#ifdef CONFIG_HAS_LIBBPF
+	case FD_TYPES__BPFMAP:
+		ret = collect_one_file_entry(fe, fe->bpf->id, &fe->bpf->base, &bpfmap_cinfo);
+		break;
+#endif
 	}
 
 	return ret;
diff --git a/criu/include/bpfmap.h b/criu/include/bpfmap.h
index cfeeb2745..bf5bbfec5 100644
--- a/criu/include/bpfmap.h
+++ b/criu/include/bpfmap.h
@@ -5,9 +5,15 @@
 #include "bpfmap-file.pb-c.h"
 #include "bpfmap-data.pb-c.h"
 
+struct bpfmap_file_info {
+	BpfmapFileEntry		*bpfe;
+	struct file_desc	d;
+};
+
 extern int is_bpfmap_link(char *link);
 extern int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p);
 
 extern const struct fdtype_ops bpfmap_dump_ops;
+extern struct collect_image_info bpfmap_cinfo;
 
 #endif /* __CR_BPFMAP_H__ */ 

From 14b1cc26debc04c3911720ce04e90b60df6d2191 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 25 Jul 2020 17:56:26 +0530
Subject: [PATCH 0330/1854] criu: restoring BPF map data

This commit restores the data of BPF maps. A hash table (indexed by
the map's id) is used to store data objects for multiple BPF map
files that a process may have opened. Collisions are resolved with
chaining using a linked list.

Source files modified:

* bpfmap.c - Structure and function definitions needed to:
    (a) collect the protobuf image containing BPF map data
    (b) read the BPF map's data from the image and store it in the
    hash table
    (c) restore the map's data using bpf_map_update_batch()

* include/bpfmap.h
    - Defines the size of the hash table and maks to be used while
	indexing into it
	- Structure and function declarations that are used while restoring
	BPF map data

* cr-restore.c - Collects the protobuf image containing BPF map data
during the restoration phase

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/bpfmap.c         | 109 ++++++++++++++++++++++++++++++++++++++++++
 criu/cr-restore.c     |   4 ++
 criu/include/bpfmap.h |  14 ++++++
 3 files changed, 127 insertions(+)

diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index c5bde6ebb..dc8edb09c 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -23,6 +23,112 @@ static void pr_info_bpfmap(char *action, BpfmapFileEntry *bpf)
 		action, bpf->id, bpf->map_id, bpf->map_type, bpf->map_flags);
 }
 
+struct bpfmap_data_rst *bpfmap_data_hash_table[BPFMAP_DATA_TABLE_SIZE];
+
+static int bpfmap_data_read(struct cr_img *img, struct bpfmap_data_rst *r)
+{
+	unsigned long bytes = r->bde->keys_bytes + r->bde->values_bytes;
+	if (!bytes)
+		return 0;
+
+	r->data = mmap(NULL, bytes, PROT_READ | PROT_WRITE,
+			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (r->data == MAP_FAILED) {
+		pr_perror("Can't map mem for bpfmap buffers");
+		return -1;
+	}
+
+	return read_img_buf(img, r->data, bytes);
+}
+
+int do_collect_bpfmap_data(struct bpfmap_data_rst *r, ProtobufCMessage *msg,
+		struct cr_img *img, struct bpfmap_data_rst **bpf_hash_table)
+{
+	int ret;
+	int table_index;
+
+	r->bde = pb_msg(msg, BpfmapDataEntry);
+	ret = bpfmap_data_read(img, r);
+	if (ret < 0)
+		return ret;
+
+	table_index = r->bde->map_id & BPFMAP_DATA_HASH_MASK;
+	r->next = bpf_hash_table[table_index];
+	bpf_hash_table[table_index] = r;
+
+	pr_info("Collected bpfmap data for %#x\n", r->bde->map_id);
+	return 0;
+}
+
+int restore_bpfmap_data(int map_fd, uint32_t map_id, struct bpfmap_data_rst **bpf_hash_table)
+{
+	struct bpfmap_data_rst *map_data;
+	BpfmapDataEntry *bde;
+	void *keys = NULL;
+	void *values = NULL;
+	unsigned int count;
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	for (map_data = bpf_hash_table[map_id & BPFMAP_DATA_HASH_MASK]; map_data != NULL; 
+		map_data = map_data->next) {
+
+		if (map_data->bde->map_id == map_id)
+			break;
+	}
+
+	if (!map_data || map_data->bde->count == 0) {
+		pr_info("No data for BPF map %#x\n", map_id);
+		return 0;
+	}
+
+	bde = map_data->bde;
+	count = bde->count;
+
+	keys = mmap(NULL, bde->keys_bytes, PROT_READ | PROT_WRITE,
+				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (keys == MAP_FAILED) {
+		pr_perror("Can't map memory for BPF map keys");
+		goto err;
+	}
+	memcpy(keys, map_data->data, bde->keys_bytes);
+
+	values = mmap(NULL, bde->values_bytes, PROT_READ | PROT_WRITE,
+				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (values == MAP_FAILED) {
+		pr_perror("Can't map memory for BPF map values");
+		goto err;
+	}
+	memcpy(values, map_data->data + bde->keys_bytes, bde->values_bytes);
+
+	if (bpf_map_update_batch(map_fd, keys, values, &count, &opts)) {
+		pr_perror("Can't load key-value pairs to BPF map");
+		goto err;
+	}
+	munmap(keys, bde->keys_bytes);
+	munmap(values, bde->values_bytes);
+	return 0;
+
+err:
+	munmap(keys, bde->keys_bytes);
+	munmap(values, bde->values_bytes);
+	return -1;
+}
+
+static int collect_bpfmap_data(void *obj, ProtobufCMessage *msg, struct cr_img *img)
+{
+	return do_collect_bpfmap_data(obj, msg, img, bpfmap_data_hash_table);
+}
+
+struct collect_image_info bpfmap_data_cinfo = {
+	.fd_type = CR_FD_BPFMAP_DATA,
+	.pb_type = PB_BPFMAP_DATA,
+	.priv_size = sizeof(struct bpfmap_data_rst),
+	.collect = collect_bpfmap_data,
+};
+
 int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p)
 {
 	/*
@@ -179,6 +285,9 @@ static int bpfmap_open(struct file_desc *d, int *new_fd)
 		return -1;
 	}
 
+	if (restore_bpfmap_data(bpfmap_fd, bpfe->map_id, bpfmap_data_hash_table))
+		return -1;
+
 	if (rst_file_params(bpfmap_fd, bpfe->fown, bpfe->flags)) {
 		pr_perror("Can't restore params on bpfmap %#08x", bpfe->id);
 		goto err_close;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d926b66a4..641ac4a65 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -78,6 +78,7 @@
 #include "string.h"
 #include "memfd.h"
 #include "timens.h"
+#include "bpfmap.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
@@ -272,6 +273,9 @@ static struct collect_image_info *cinfos[] = {
 	&pipe_data_cinfo,
 	&fifo_data_cinfo,
 	&sk_queues_cinfo,
+#ifdef CONFIG_HAS_LIBBPF
+	&bpfmap_data_cinfo,
+#endif
 };
 
 static struct collect_image_info *cinfos_files[] = {
diff --git a/criu/include/bpfmap.h b/criu/include/bpfmap.h
index bf5bbfec5..ad065dfc6 100644
--- a/criu/include/bpfmap.h
+++ b/criu/include/bpfmap.h
@@ -10,10 +10,24 @@ struct bpfmap_file_info {
 	struct file_desc	d;
 };
 
+struct bpfmap_data_rst {
+	BpfmapDataEntry			*bde;
+	void				*data;
+	struct bpfmap_data_rst		*next;
+};
+
+#define BPFMAP_DATA_HASH_BITS	5
+#define BPFMAP_DATA_TABLE_SIZE	(1 << BPFMAP_DATA_HASH_BITS)
+#define BPFMAP_DATA_HASH_MASK	(BPFMAP_DATA_TABLE_SIZE - 1)
+
 extern int is_bpfmap_link(char *link);
 extern int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p);
+extern int do_collect_bpfmap_data(struct bpfmap_data_rst *, ProtobufCMessage *,
+		struct cr_img *, struct bpfmap_data_rst **);
+extern int restore_bpfmap_data(int, uint32_t, struct bpfmap_data_rst **);
 
 extern const struct fdtype_ops bpfmap_dump_ops;
 extern struct collect_image_info bpfmap_cinfo;
+extern struct collect_image_info bpfmap_data_cinfo;
 
 #endif /* __CR_BPFMAP_H__ */ 

From 372782d8ac2a9c49081d43a9edf2e45023121fdb Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Tue, 28 Jul 2020 22:52:10 +0530
Subject: [PATCH 0331/1854] zdtm: adding tests for BPF maps

This commit adds ZDTM tests for c/r of processes with BPF maps as open
files

Source files added:

* zdtm/static/bpf_hash.c - Tests for c/r of the data and meta-data of
BPF map type BPF_MAP_TYPE_HASH

* zdtm/static/bpf_array.c - Tests for c/r of the data and meta-data
of BPF map type BPF_MAP_TYPE_ARRAY

Source files modified:

* zdtm/static/Makefile - Generating build artifacts for BPF tests

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 test/zdtm/static/Makefile    |  10 +++
 test/zdtm/static/bpf_array.c | 155 ++++++++++++++++++++++++++++++++++
 test/zdtm/static/bpf_hash.c  | 158 +++++++++++++++++++++++++++++++++++
 3 files changed, 323 insertions(+)
 create mode 100644 test/zdtm/static/bpf_array.c
 create mode 100644 test/zdtm/static/bpf_hash.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 45a0df784..051572838 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -232,6 +232,13 @@ TST_NOFILE	:=				\
 		zombie_leader			\
 #		jobctl00			\
 
+pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
+ifeq ($(call pkg-config-check,libbpf),y)
+TST_NOFILE	+=				\
+		bpf_hash			\
+		bpf_array			
+endif
+
 ifneq ($(ARCH),arm)
 ifneq ($(COMPAT_TEST),y)
         TST_NOFILE += maps03
@@ -574,6 +581,9 @@ s390x_gs_threads:	LDFLAGS += -pthread
 
 thread_different_uid_gid:	LDLIBS += -pthread -lcap
 
+bpf_hash:		LDLIBS += -lbpf
+bpf_array:		LDLIBS += -lbpf
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/bpf_array.c b/test/zdtm/static/bpf_array.c
new file mode 100644
index 000000000..4019d45d2
--- /dev/null
+++ b/test/zdtm/static/bpf_array.c
@@ -0,0 +1,155 @@
+#include <linux/bpf.h>
+#include <bpf/bpf.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_ARRAY"
+							"is correctly restored";
+const char *test_author	= "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
+
+static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
+{
+	int i, ret;
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	for (i = 0; i < max_entries; i++) {
+		keys[i] = i;
+		values[i] = i + 1;
+	}
+
+	ret = bpf_map_update_batch(map_fd, keys, values, &max_entries, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't load key-value pairs to BPF map fd");
+		return -1;
+	}
+	return 0;
+}
+
+static int map_batch_verify(int *visited, uint32_t max_entries, int *keys, int *values)
+{
+	int i;
+
+	memset(visited, 0, max_entries * sizeof(*visited));
+	for (i = 0; i < max_entries; i++) {
+		if (keys[i] + 1 != values[i]) {
+			pr_err("Key/value checking error: i=%d, key=%d, value=%d\n", i, keys[i], values[i]);
+			return -1;
+		}
+		visited[i] = 1;
+	}
+	for (i = 0; i < max_entries; i++) {
+		if (visited[i] != 1) {
+			pr_err("Visited checking error: keys array at index %d missing\n", i);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	uint32_t batch, count;
+	int map_fd;
+	int *keys = NULL, *values = NULL, *visited = NULL;
+	const uint32_t max_entries = 10;
+	int ret;
+	struct bpf_map_info map_info = {};
+	uint32_t info_len = sizeof(map_info);
+	struct bpf_create_map_attr xattr = {
+		.map_type = BPF_MAP_TYPE_ARRAY,
+		.key_size = sizeof(int),
+		.value_size = sizeof(int),
+		.max_entries = max_entries,
+		.map_flags = BPF_F_NUMA_NODE,
+	};
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	keys = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);	
+	values = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	visited = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	
+	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
+		pr_perror("Can't mmap()");
+		goto err;
+	}
+
+	test_init(argc, argv);
+
+	map_fd = bpf_create_map_xattr(&xattr);
+	if (map_fd == -1) {
+		pr_perror("Can't create BPF map");
+		goto err;
+	}
+
+	if (map_batch_update(map_fd, max_entries, keys, values))
+		goto err;
+
+	test_daemon();
+
+	test_waitsig();
+
+	ret = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get map info");
+		goto err;
+	}
+	
+	if (map_info.type != BPF_MAP_TYPE_ARRAY) {
+		pr_err("Map type should be BPF_MAP_TYPE_ARRAY\n");
+		goto err;
+	}
+	if (map_info.key_size != sizeof(*keys)) {
+		pr_err("Key size should be %zu\n", sizeof(*keys));
+		goto err;
+	}
+	if (map_info.value_size != sizeof(*values)) {
+		pr_err("Value size should be %zu\n", sizeof(*values));
+		goto err;
+	}
+	if (map_info.max_entries != max_entries) {
+		pr_err("Max entries should be %d\n", max_entries);
+		goto err;
+	}
+	if (!(map_info.map_flags & BPF_F_NUMA_NODE)) {
+		pr_err("Map flag BPF_F_NUMA_NODE should be set\n");
+		goto err;
+	}
+
+	memset(keys, 0, max_entries * sizeof(*keys));
+	memset(values, 0, max_entries * sizeof(*values));
+
+	ret = bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values, &count, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't perform a batch lookup on BPF map");
+		goto err;
+	}
+
+	if (map_batch_verify(visited, max_entries, keys, values))
+		goto err;
+
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+
+	pass();
+	return 0;
+
+err:
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+	
+	fail();
+	return 1;
+}
\ No newline at end of file
diff --git a/test/zdtm/static/bpf_hash.c b/test/zdtm/static/bpf_hash.c
new file mode 100644
index 000000000..f1cf667b5
--- /dev/null
+++ b/test/zdtm/static/bpf_hash.c
@@ -0,0 +1,158 @@
+#include <linux/bpf.h>
+#include <bpf/bpf.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_HASH"
+							"is correctly restored";
+const char *test_author	= "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
+
+static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
+{
+	int ret;
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	for (int i = 0; i < max_entries; i++) {
+		keys[i] = i + 1;
+		values[i] = i + 2;
+	}
+
+	ret = bpf_map_update_batch(map_fd, keys, values, &max_entries, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't load key-value pairs to BPF map");
+		return -1;
+	}
+	return 0;
+}
+
+static int map_batch_verify(int *visited, uint32_t max_entries, int *keys, int *values)
+{
+	memset(visited, 0, max_entries * sizeof(*visited));
+	for (int i = 0; i < max_entries; i++) {
+		
+		if (keys[i] + 1 != values[i]) {
+			pr_err("Key/value checking error: i=%d, key=%d, value=%d\n", i, keys[i], values[i]);
+			return -1;
+		}
+		visited[i] = 1;
+	}
+	for (int i = 0; i < max_entries; i++) {
+		if (visited[i] != 1) {
+			pr_err("Visited checking error: keys array at index %d missing\n", i);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	uint32_t batch, count;
+	int map_fd;
+	int *keys = NULL, *values = NULL, *visited = NULL;
+	const uint32_t max_entries = 10;
+	int ret;
+	struct bpf_map_info map_info = {};
+	uint32_t info_len = sizeof(map_info);
+	struct bpf_create_map_attr xattr = {
+		.map_type = BPF_MAP_TYPE_HASH,
+		.key_size = sizeof(int),
+		.value_size = sizeof(int),
+		.max_entries = max_entries,
+		.map_flags = BPF_F_NO_PREALLOC | BPF_F_NUMA_NODE,
+	};
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
+		.elem_flags = 0,
+		.flags = 0,
+	);
+
+	keys = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);	
+	values = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	visited = mmap(NULL, max_entries * sizeof(int), 
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	
+	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
+		pr_perror("Can't mmap()");
+		goto err;
+	}
+
+	test_init(argc, argv);
+
+	map_fd = bpf_create_map_xattr(&xattr);
+	if (!map_fd) {
+		pr_perror("Can't create BPF map");
+		goto err;
+	}
+
+	if (map_batch_update(map_fd, max_entries, keys, values))
+		goto err;
+
+	test_daemon();
+
+	test_waitsig();
+
+	ret = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get map info");
+		goto err;
+	}
+	
+	if (map_info.type != BPF_MAP_TYPE_HASH) {
+		pr_err("Map type should be BPF_MAP_TYPE_HASH\n");
+		goto err;
+	}
+	if (map_info.key_size != sizeof(*keys)) {
+		pr_err("Key size should be %zu\n", sizeof(*keys));
+		goto err;
+	}
+	if (map_info.value_size != sizeof(*values)) {
+		pr_err("Value size should be %zu\n", sizeof(*values));
+		goto err;
+	}
+	if (map_info.max_entries != max_entries) {
+		pr_err("Max entries should be %d\n", max_entries);
+		goto err;
+	}
+	if (!(map_info.map_flags & BPF_F_NO_PREALLOC)) {
+		pr_err("Map flag BPF_F_NO_PREALLOC should be set\n");
+		goto err;
+	}
+	if (!(map_info.map_flags & BPF_F_NUMA_NODE)) {
+		pr_err("Map flag BPF_F_NUMA_NODE should be set\n");
+		goto err;
+	}
+
+	memset(keys, 0, max_entries * sizeof(*keys));
+	memset(values, 0, max_entries * sizeof(*values));
+
+	ret = bpf_map_lookup_batch(map_fd, NULL, &batch, keys, values, &count, &opts);
+	if (ret && errno != ENOENT) {
+		pr_perror("Can't perform a batch lookup on BPF map");
+		goto err;
+	}
+
+	if (map_batch_verify(visited, max_entries, keys, values))
+		goto err;
+
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+
+	pass();
+	return 0;
+
+err:
+	munmap(keys, max_entries * sizeof(int));
+	munmap(values, max_entries * sizeof(int));
+	munmap(visited, max_entries * sizeof(int));
+	
+	fail();
+	return 1;
+}
\ No newline at end of file

From 20d87bbfac8744e9a75281261241d1d723baabd4 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 15 Aug 2020 16:39:05 +0530
Subject: [PATCH 0332/1854] scripts: adding libbpf for Travis tests

Source files modified:

* travis/vagrant.sh - Adding libbpf-devel

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 scripts/travis/vagrant.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
index dcadc4e28..e3ea7ed3d 100755
--- a/scripts/travis/vagrant.sh
+++ b/scripts/travis/vagrant.sh
@@ -34,7 +34,7 @@ setup() {
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel make protobuf-c-devel \
 		protobuf-devel python3-flake8 python3-future python3-protobuf \
-		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel
+		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel libbpf-devel
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
 	ssh default cat /proc/cmdline

From 1391f84d8583b738ffc0b6b080eecfcb1ede9725 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sun, 16 Aug 2020 11:20:23 +0530
Subject: [PATCH 0333/1854] criu: don't use the deprecated security_context_t
 (SELinux)

This change fixes the error:
error: 'security_context_t' is deprecated
[-Werror=deprecated-declarations]

Source files modified:

* lsm.c
* net.c

Please refer to:
https://github.com/SELinuxProject/selinux/commit/9eb9c9327

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/lsm.c | 2 +-
 criu/net.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/lsm.c b/criu/lsm.c
index 060f10259..7cc36049f 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -64,7 +64,7 @@ static int apparmor_get_label(pid_t pid, char **profile_name)
 #ifdef CONFIG_HAS_SELINUX
 static int selinux_get_label(pid_t pid, char **output)
 {
-	security_context_t ctx;
+	char *ctx;
 	char *pos;
 	int i;
 	int ret = -1;
diff --git a/criu/net.c b/criu/net.c
index 6e650bb66..edca25360 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2962,7 +2962,7 @@ static int prep_ns_sockets(struct ns_id *ns, bool for_dump)
 {
 	int nsret = -1, ret;
 #ifdef CONFIG_HAS_SELINUX
-	security_context_t ctx;
+	char *ctx;
 #endif
 
 	if (ns->type != NS_CRIU) {

From df0c793d52ba0878a35f7ceff33d348e62167d21 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 23 Aug 2020 13:03:31 +0300
Subject: [PATCH 0334/1854] travis: restore lazy-pages tests for uns flavor

Since commit cdd08cdff ("uffd: use userns_call() to execute
ioctl(UFFDIO_API)") UFFD_API ioctl() is wrapped with userns_call() and this
allows runing lazy-pages tests on recent kernels in uns.

Restore testing of lazy-pages in uns in travis.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 scripts/travis/travis-tests | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 8c185f1cb..a9e99992f 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -202,15 +202,8 @@ else
 fi
 LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps04"
 
-# Starting with 5.4 kernel requires SYS_CAP_PTRACE to use uffd events; as such
-# we cannot run lazy-pages tests in uns
-LAZY_FLAVORS=""
-if [ $KERN_MAJ -ge "5" ] && [ $KERN_MIN -ge "4" ]; then
-    LAZY_FLAVORS="-f h,ns"
-fi
-
 LAZY_TESTS=.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*
-LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $LAZY_FLAVORS $ZDTM_OPTS"
+LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 
 ./test/zdtm.py run $LAZY_OPTS --lazy-pages
 ./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages

From 596276a9aff286c4bee4db045cddf5f5a367a9d6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 21 Aug 2020 11:11:57 +0000
Subject: [PATCH 0335/1854] travis: use Fedora rawhide images from Fedora

The docker hub container registry is not updated as fast as Fedora's
registry at registry.fedoraproject.org. Fedora's registry gets a new
image whenever there is a new version of rawhide, docker hub's rawhide
image can take a couple of weeks because the process is not automated.

Especially when Fedora branches of a new release we see lot's of errors
in CRIU's Fedora rawhide based Travis runs. Switch to Fedora's registry
to always have the newest rawhide images for our tests.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.fedora-rawhide.hdr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.fedora-rawhide.hdr b/scripts/build/Dockerfile.fedora-rawhide.hdr
index d6d9ab7e2..2cc31a3aa 100644
--- a/scripts/build/Dockerfile.fedora-rawhide.hdr
+++ b/scripts/build/Dockerfile.fedora-rawhide.hdr
@@ -1 +1 @@
-FROM fedora:rawhide
+FROM registry.fedoraproject.org/fedora:rawhide

From dd082fad10c6aafb18db9b9612c5d763c4daa479 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 21 Aug 2020 14:09:32 +0300
Subject: [PATCH 0336/1854] eventpoll: resort toff back by idx

In dump_one_eventpoll we call find_tfd_bsearch with arguments
"e->tfd[i]->tfd, toff[i].off". By this we want to check if
"toff[i].off"-th inclusion of target "e->tfd[i]->tfd" in an eventpoll
coresponds to our fd "e->tfd[i]->tfd" in terms of kcmp.

But because of toff was sorted to calculate off, indexes in e->tfd and
toff does not address the same eventpoll target at this point.

Let's sort toff back to original state to make indexes consistent.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/eventpoll.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index e1384fa4b..0735bae6e 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -205,6 +205,15 @@ static int toff_cmp(const void *a, const void *b)
 	return 0;
 }
 
+static int toff_cmp_idx(const void *a, const void *b)
+{
+	if (((toff_t *)a)[0].idx > ((toff_t *)b)[0].idx)
+		return 1;
+	if (((toff_t *)a)[0].idx < ((toff_t *)b)[0].idx)
+		return -1;
+	return 0;
+}
+
 /*
  * fds in fd_parms are sorted so we can use binary search
  * for better performance.
@@ -300,6 +309,8 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 			} else
 				toff_base = NULL;
 		}
+
+		qsort(toff, e->n_tfd, sizeof(*toff), toff_cmp_idx);
 	}
 
 	/*

From 0dda60f51825c0971633e82bf2a8fc859b2ec4c8 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 24 Aug 2020 13:46:56 +0300
Subject: [PATCH 0337/1854] eventpoll: fix toff off calculation

Kcmp expect off to be a number of inclusion of target tfd. So we should
set off=0 to a first inclusion and off++ for all next inclusions.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/eventpoll.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index 0735bae6e..9818f24dd 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -256,7 +256,7 @@ static int find_tfd_bsearch(pid_t pid, int efd, int fds[], size_t nr_fds,
 
 static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 {
-	toff_t *toff_base, *toff = NULL;
+	toff_t *toff = NULL;
 	EventpollFileEntry *e = NULL;
 	FileEntry *fe = NULL;
 	int ret = -1;
@@ -300,15 +300,9 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 
 		qsort(toff, e->n_tfd, sizeof(*toff), toff_cmp);
 
-		toff_base = NULL;
-		for (i = 1; i < e->n_tfd; i++) {
-			if (toff[i].tfd == toff[i - 1].tfd) {
-				if (!toff_base)
-					toff_base = &toff[i - 1];
-				toff[i].off = toff[i].idx - toff_base->idx;
-			} else
-				toff_base = NULL;
-		}
+		for (i = 1; i < e->n_tfd; i++)
+			if (toff[i].tfd == toff[i - 1].tfd)
+				toff[i].off = toff[i - 1].off + 1;
 
 		qsort(toff, e->n_tfd, sizeof(*toff), toff_cmp_idx);
 	}

From ed74c9e05897b00abf3ea6b078aeda9f214056de Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 24 Aug 2020 11:36:37 +0300
Subject: [PATCH 0338/1854] zdtm: add new epoll01 test

This adds three epoll targets on tfd 702 and then adds two epoll targets
on tfd 701. This test is for off calculation in dump_one_eventpoll, the
reverse order makes qsort to actually work.

v2: update test_doc with longer explanation, remove unused DUPFDNO

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile     |   1 +
 test/zdtm/static/epoll01.c    | 121 ++++++++++++++++++++++++++++++++++
 test/zdtm/static/epoll01.desc |   1 +
 3 files changed, 123 insertions(+)
 create mode 100644 test/zdtm/static/epoll01.c
 create mode 100644 test/zdtm/static/epoll01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 051572838..2ca9421c3 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -126,6 +126,7 @@ TST_NOFILE	:=				\
 		proc-self			\
 		eventfs00			\
 		epoll				\
+		epoll01				\
 		signalfd00			\
 		inotify_irmap			\
 		fanotify00			\
diff --git a/test/zdtm/static/epoll01.c b/test/zdtm/static/epoll01.c
new file mode 100644
index 000000000..0f5a4fda8
--- /dev/null
+++ b/test/zdtm/static/epoll01.c
@@ -0,0 +1,121 @@
+#include <unistd.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/eventfd.h>
+#include <sys/ioctl.h>
+#include <sys/epoll.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check another case of epoll: This adds three epoll "
+			  "targets on tfd 702 and then adds two epoll targets "
+			  "on tfd 701. This test is for off calculation in "
+			  "dump_one_eventpoll, the reverse order makes qsort "
+			  "to actually work.";
+const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+int main(int argc, char *argv[])
+{
+	int epollfd;
+	struct epoll_event ev;
+	int i, ret;
+
+	struct {
+		int	pipefd[2];
+		int	dupfd;
+		bool	close;
+	} pipes[5] = {
+		{ {}, 702, true },
+		{ {}, 702, true },
+		{ {}, 702, false },
+		{ {}, 701, true },
+		{ {}, 701, false },
+	};
+
+	test_init(argc, argv);
+
+	epollfd = epoll_create(1);
+	if (epollfd < 0) {
+		pr_perror("epoll_create failed");
+		exit(1);
+	}
+
+	memset(&ev, 0, sizeof(ev));
+	ev.events = EPOLLIN | EPOLLOUT;
+
+	for (i = 0; i < ARRAY_SIZE(pipes); i++) {
+		int fd;
+
+		if (pipe(pipes[i].pipefd)) {
+			pr_err("Can't create pipe %d\n", i);
+			exit(1);
+		}
+
+		ev.data.u64 = i;
+
+		fd = dup2(pipes[i].pipefd[0], pipes[i].dupfd);
+		if (fd < 0 || fd != pipes[i].dupfd) {
+			pr_perror("Can't dup %d to %d", pipes[i].pipefd[0], pipes[i].dupfd);
+			exit(1);
+		}
+
+		test_msg("epoll %d add %d dup'ed from %d\n", epollfd, fd, pipes[i].pipefd[0]);
+		if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev)) {
+			pr_perror("Can't add pipe %d", fd);
+			close(fd);
+			exit(1);
+		}
+
+		if (pipes[i].close) {
+			close(fd);
+			test_msg("epoll source %d closed\n", fd);
+		}
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = 0;
+	for (i = 0; i < ARRAY_SIZE(pipes); i++) {
+		uint8_t cw = 1, cr;
+
+		if (write(pipes[i].pipefd[1], &cw, sizeof(cw)) != sizeof(cw)) {
+			pr_perror("Unable to write into a pipe\n");
+			return 1;
+		}
+
+		if (epoll_wait(epollfd, &ev, 1, -1) != 1) {
+			pr_perror("Unable to wait events");
+			return 1;
+		}
+
+		if (ev.data.u64 != i) {
+			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n",
+			       ev.data.fd, (long long)ev.data.u64, i);
+			ret |= 1;
+		}
+
+		if (read(pipes[i].pipefd[0], &cr, sizeof(cr)) != sizeof(cr)) {
+			pr_perror("read");
+			return 1;
+		}
+	}
+
+	if (ret)
+		return 1;
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/epoll01.desc b/test/zdtm/static/epoll01.desc
new file mode 100644
index 000000000..72cc898d5
--- /dev/null
+++ b/test/zdtm/static/epoll01.desc
@@ -0,0 +1 @@
+{ 'feature' : 'kcmp_epoll' }

From c0f3653108b22ef837f5dde4b2b55577f5d8945d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 10 Aug 2020 12:29:21 +0300
Subject: [PATCH 0339/1854] images: kindly ask not to use fields with id 18 in
 unix_sk_entry

The field id 18 is used in Virtuozzo criu in multiple releases, so that
we can't change the id easily. So we can at least kindly ask not to use
this field in mainstream criu to decrease the pain of Virtuozzo criu
rebases.

Reference to related patch in Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/58e61a20c22c#images/sk-unix.proto

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 images/sk-unix.proto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/sk-unix.proto b/images/sk-unix.proto
index c59644f6e..2a3a7cc32 100644
--- a/images/sk-unix.proto
+++ b/images/sk-unix.proto
@@ -51,4 +51,5 @@ message unix_sk_entry {
 
 	optional uint32			ns_id		= 16;
 	optional sint32			mnt_id		= 17 [default = -1];
+	/* Please, don't use field with number 18. */
 }

From dbf798811f21869ba91ffd7a68809de5ccf8840a Mon Sep 17 00:00:00 2001
From: Hello1024 <omattos@gmail.com>
Date: Thu, 12 Dec 2019 14:45:35 +0000
Subject: [PATCH 0340/1854] sk-netlink: Handle case of in-use netlink peer ids

Netlink sockets normally kernel-assign a peer id based on the
requesting pid at bind time. CRIU saves this peer ID and tries
to restore it. At restore time, it's possible for the id to
already be in use (e.g., assigned to another process, perhaps
in another pid namespace).

This patch tries to use the original id, but if that fails then
allows the kernel to auto-allocate a new peer id. We make a
warning message, because it is possible (although rather unlikely)
the application cares what its peer id is.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/sk-netlink.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index e4163f538..c5ff38d32 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -224,8 +224,17 @@ static int open_netlink_sk(struct file_desc *d, int *new_fd)
 		addr.nl_pid = nse->portid;
 
 		if (bind(sk, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-			pr_perror("Can't bind netlink socket");
-			goto err;
+			/*
+			 * Reassign if original bind fails, because socket addresses are
+			 * typically kernel assigned based on PID, and collisions are common
+			 * and very few applications care what address they are bound to.
+			 */
+			addr.nl_pid = 0;
+			if (bind(sk, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+				pr_perror("Can't bind netlink socket");
+				goto err;
+			}
+			pr_warn("Netlink socket id %#x reassigned new port\n", nse->id);
 		}
 	}
 

From f3b18865f975da28e06c173c5cdbeeb68fb5ad8d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 26 Jul 2019 11:36:55 +0300
Subject: [PATCH 0341/1854] mount: delay setting unbindable flag where possible

Setting mounts unbindable just after mounting them and before other
mounts of the same superblock are mounted can break the restore of
mounts, because other mounts will try to bind from it and obviously will
fail. See the test "unbindable" for more info.

Currently we can't delay if the mount is overmounted, if we will
need these in future we would likely set it through open fd on the
mountpoint.

https://bugs.openvz.org/browse/OVZ-7116

v2: simplify coderead, print message on setting unbindable error, add
some more comments about unbindable.
v3: add a list to optimise a walk over delayed unbindable mounts, don't
call set_unbindable on error path.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/mount.c         | 47 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 8bf19b266..d204e40d6 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -79,6 +79,7 @@ struct mount_info {
 	struct mount_info	*mnt_master;	/* slave is on master->mnt_slave_list */
 	struct list_head	mnt_propagate;	/* circular list of mounts which propagate from each other */
 	struct list_head	mnt_notprop;	/* temporary list used in can_mount_now */
+	struct list_head	mnt_unbindable;	/* list of mounts with delayed unbindable */
 
 	struct list_head	postpone;
 
diff --git a/criu/mount.c b/criu/mount.c
index a0b8b2e06..c3f0d8eed 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -48,6 +48,8 @@
 /* A helper mount_info entry for the roots yard */
 static struct mount_info *root_yard_mp = NULL;
 
+static LIST_HEAD(delayed_unbindable);
+
 int ext_mount_add(char *key, char *val)
 {
 	char *e_str;
@@ -1844,10 +1846,25 @@ static int restore_shared_options(struct mount_info *mi, bool private, bool shar
 			mi->mnt_id, mi->mountpoint, private, shared, slave);
 
 	if (mi->flags & MS_UNBINDABLE) {
-		if (shared || slave)
+		if (shared || slave) {
 			pr_warn("%s has both unbindable and sharing, ignoring unbindable\n", mi->mountpoint);
-		else
-			return mount(NULL, mi->mountpoint, NULL, MS_UNBINDABLE, NULL);
+		} else {
+			if (!mnt_is_overmounted(mi)) {
+				/* Someone may still want to bind from us, let them do it. */
+				pr_debug("Temporary leave unbindable mount %s as private\n", mi->mountpoint);
+				if (mount(NULL, mi->mountpoint, NULL, MS_PRIVATE, NULL)) {
+					pr_perror("Unable to make %d private", mi->mnt_id);
+					return -1;
+				}
+				list_add(&mi->mnt_unbindable, &delayed_unbindable);
+				return 0;
+			}
+			if (mount(NULL, mi->mountpoint, NULL, MS_UNBINDABLE, NULL)) {
+				pr_perror("Unable to make %d unbindable", mi->mnt_id);
+				return -1;
+			}
+			return 0;
+		}
 	}
 
 	if (private && mount(NULL, mi->mountpoint, NULL, MS_PRIVATE, NULL)) {
@@ -2477,6 +2494,16 @@ static int do_close_one(struct mount_info *mi)
 	return 0;
 }
 
+static int set_unbindable(struct mount_info *mi)
+{
+	if (mount(NULL, mi->mountpoint, NULL, MS_UNBINDABLE, NULL)) {
+		pr_perror("Failed setting unbindable flag on %d", mi->mnt_id);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int do_mount_one(struct mount_info *mi)
 {
 	int ret;
@@ -2776,6 +2803,7 @@ struct mount_info *mnt_entry_alloc()
 		INIT_LIST_HEAD(&new->mnt_bind);
 		INIT_LIST_HEAD(&new->mnt_propagate);
 		INIT_LIST_HEAD(&new->mnt_notprop);
+		INIT_LIST_HEAD(&new->mnt_unbindable);
 		INIT_LIST_HEAD(&new->postpone);
 	}
 	return new;
@@ -3252,6 +3280,19 @@ static int populate_mnt_ns(void)
 	ret = mnt_tree_for_each(root_yard_mp, do_mount_one);
 	mnt_tree_for_each(root_yard_mp, do_close_one);
 
+	if (ret == 0) {
+		struct mount_info *mi;
+
+		/*
+		 * Mounts in delayed_unbindable list were temporary mounted as
+		 * private instead of unbindable so that do_mount_one can bind
+		 * from them, now we are ready to fix it.
+		 */
+		list_for_each_entry(mi, &delayed_unbindable, mnt_unbindable)
+			if (set_unbindable(mi))
+				return -1;
+	}
+
 	if (ret == 0 && fixup_remap_mounts())
 		return -1;
 

From b554eacb51643c7daabe7fe88cbcc84cc7bb622d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 7 Oct 2019 11:45:13 +0300
Subject: [PATCH 0342/1854] mount: replace mountpoint to mnt_id in error
 messages

Replace in restore_shared_options "->mountpoint" in messages with more
descriptive "->mnt_id". Mountpoints concide a lot, and mnt_id is unique.
These also makes a message shorter. (We already print a mapping from
mnt_id to mountpoint in mnt_tree_show, so we can easily find mountpoint
if we want).

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index c3f0d8eed..fd0341e02 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1868,15 +1868,15 @@ static int restore_shared_options(struct mount_info *mi, bool private, bool shar
 	}
 
 	if (private && mount(NULL, mi->mountpoint, NULL, MS_PRIVATE, NULL)) {
-		pr_perror("Unable to make %s private", mi->mountpoint);
+		pr_perror("Unable to make %d private", mi->mnt_id);
 		return -1;
 	}
 	if (slave && mount(NULL, mi->mountpoint, NULL, MS_SLAVE, NULL)) {
-		pr_perror("Unable to make %s slave", mi->mountpoint);
+		pr_perror("Unable to make %d slave", mi->mnt_id);
 		return -1;
 	}
 	if (shared && mount(NULL, mi->mountpoint, NULL, MS_SHARED, NULL)) {
-		pr_perror("Unable to make %s shared", mi->mountpoint);
+		pr_perror("Unable to make %d shared", mi->mnt_id);
 		return -1;
 	}
 

From 5c11b0e440c48497eb7fa8f42e5220917a617cd7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 29 Jul 2019 11:54:00 +0300
Subject: [PATCH 0343/1854] zdtm: check that unbindable mount flag does not
 affect restore

Make two mounts, binds of the same file system, the first has root "/"
and the second has a cut root "/auxiliary". This insures that on restore
criu will mount the first mount first and latter bind the second from
it. After set the first mount unbindable to check if restoring these
flag does not interfere with restoring mounts.

Before the fix in these series we had the error:

(00.031286)      1: mnt: 	Mounting tmpfs @/tmp/.criu.mntns.wGroPU/12-0000000000/zdtm/static/unbindable.test/bind_of_unbindable (0)
(00.031298)      1: mnt: 	Bind /tmp/.criu.mntns.wGroPU/12-0000000000/zdtm/static/unbindable.test/unbindable/auxiliary to /tmp/.criu.mntns.wGroPU/12-0000000000/zdtm/static/unbindable.test/bind_of_unbindable
(00.031329)      1: Error (criu/mount.c:2298): mnt: Can't mount at /tmp/.criu.mntns.wGroPU/12-0000000000/zdtm/static/unbindable.test/bind_of_unbindable: Invalid argument

https://bugs.openvz.org/browse/OVZ-7116

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile        |  1 +
 test/zdtm/static/unbindable.c    | 69 ++++++++++++++++++++++++++++++++
 test/zdtm/static/unbindable.desc |  1 +
 3 files changed, 71 insertions(+)
 create mode 100644 test/zdtm/static/unbindable.c
 create mode 100644 test/zdtm/static/unbindable.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 2ca9421c3..6e9768c73 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -380,6 +380,7 @@ TST_DIR		=				\
 		opath_file			\
 		symlink				\
 		symlink01			\
+		unbindable			\
 
 TST_DIR_FILE	=				\
 		chroot				\
diff --git a/test/zdtm/static/unbindable.c b/test/zdtm/static/unbindable.c
new file mode 100644
index 000000000..2f7b38164
--- /dev/null
+++ b/test/zdtm/static/unbindable.c
@@ -0,0 +1,69 @@
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check unbindable flag does not break mount restore";
+const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "directory name", 1);
+
+int main(int argc, char **argv)
+{
+	char unbindable[PATH_MAX], bind_of_unbindable[PATH_MAX];
+	char auxiliary[PATH_MAX];
+
+	test_init(argc, argv);
+	mkdir(dirname, 0700);
+
+	snprintf(unbindable, sizeof(unbindable), "%s/unbindable", dirname);
+	if (mkdir(unbindable, 0700)) {
+		pr_perror("Unable to mkdir %s", unbindable);
+		return 1;
+	}
+	if (mount("unbindable", unbindable, "tmpfs", 0, NULL)) {
+		pr_perror("Unable to mount tmpfs to %s", unbindable);
+		return 1;
+	}
+
+	snprintf(auxiliary, sizeof(auxiliary), "%s/unbindable/auxiliary", dirname);
+	if (mkdir(auxiliary, 0700)) {
+		pr_perror("Unable to mkdir %s", auxiliary);
+		return 1;
+	}
+
+	snprintf(bind_of_unbindable, sizeof(bind_of_unbindable), "%s/bind_of_unbindable", dirname);
+	if (mkdir(bind_of_unbindable, 0700)) {
+		pr_perror("Unable to mkdir %s", bind_of_unbindable);
+		return 1;
+	}
+	if (mount(auxiliary, bind_of_unbindable, NULL, MS_BIND, NULL)) {
+		pr_perror("Unable to mount %s to %s", unbindable, bind_of_unbindable);
+		return 1;
+	}
+
+	if (mount(NULL, unbindable, NULL, MS_UNBINDABLE, NULL)) {
+		pr_perror("Unable to set %s unbindable", unbindable);
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (umount(bind_of_unbindable)) {
+		pr_perror("Unable to umount %s", bind_of_unbindable);
+		return 1;
+	}
+
+	if (umount(unbindable)) {
+		pr_perror("Unable to umount %s", unbindable);
+		return 1;
+	}
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/unbindable.desc b/test/zdtm/static/unbindable.desc
new file mode 100644
index 000000000..7657ba45c
--- /dev/null
+++ b/test/zdtm/static/unbindable.desc
@@ -0,0 +1 @@
+{'flavor': 'ns uns', 'flags': 'suid'}

From 0aeddba7cc0c5a355980a81a108d8aa255881e21 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 28 Dec 2019 10:40:22 +0000
Subject: [PATCH 0344/1854] socket: c/r support for SO_OOBINLINE

This patch enables checkpoint/restore of the SO_OOBINLINE socket option.
When the SO_OOBINLINE option is used, out-of-band data is placed in the
normal input queue as it is received. This permits it to be read using
read or recv without specifying the MSG_OOB flag.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/sockets.c                 | 8 ++++++++
 images/sk-opts.proto           | 1 +
 test/zdtm/static/sock_opts00.c | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index 2e1ce9d7b..fccf0eee9 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -566,6 +566,10 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 		pr_debug("\tset broadcast for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_BROADCAST, &val);
 	}
+	if (soe->has_so_oobinline && soe->so_oobinline) {
+		pr_debug("\tset oobinline for socket\n");
+		ret |= restore_opt(sk, SOL_SOCKET, SO_OOBINLINE, &val);
+	}
 	if (soe->has_so_keepalive && soe->so_keepalive) {
 		pr_debug("\tset keepalive for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_KEEPALIVE, &val);
@@ -671,6 +675,10 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 	soe->has_so_keepalive = true;
 	soe->so_keepalive = val ? true : false;
 
+	ret |= dump_opt(sk, SOL_SOCKET, SO_OOBINLINE, &val);
+	soe->has_so_oobinline = true;
+	soe->so_oobinline = val ? true : false;
+
 	ret |= dump_bound_dev(sk, soe);
 	ret |= dump_socket_filter(sk, soe);
 
diff --git a/images/sk-opts.proto b/images/sk-opts.proto
index 336cca22a..ee35ef7e0 100644
--- a/images/sk-opts.proto
+++ b/images/sk-opts.proto
@@ -27,6 +27,7 @@ message sk_opts_entry {
 	optional uint32		tcp_keepcnt	= 20;
 	optional uint32		tcp_keepidle	= 21;
 	optional uint32		tcp_keepintvl	= 22;
+	optional uint32		so_oobinline	= 23;
 }
 
 enum sk_shutdown {
diff --git a/test/zdtm/static/sock_opts00.c b/test/zdtm/static/sock_opts00.c
index 08fc1d357..e02a2e7ba 100644
--- a/test/zdtm/static/sock_opts00.c
+++ b/test/zdtm/static/sock_opts00.c
@@ -12,7 +12,7 @@ const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
 #define TEST_PORT 59687
 #define TEST_ADDR INADDR_ANY
 
-#define NOPTS	7
+#define NOPTS	8
 
 int main(int argc, char ** argv)
 {
@@ -26,6 +26,7 @@ int main(int argc, char ** argv)
 	vname[4] = SO_PASSSEC;
 	vname[5] = SO_DONTROUTE;
 	vname[6] = SO_NO_CHECK;
+	vname[7] = SO_OOBINLINE;
 
 	test_init(argc, argv);
 

From 5bb5890cb4ded9ba81919a122f911812af59c244 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 28 Dec 2019 12:33:26 +0000
Subject: [PATCH 0345/1854] socket: c/r support for SO_LINGER

The SO_LINGER option allows to control how a TCP connection is closed.
The default behavior is to return immediately when close() is called,
and any unsent data is not guaranteed to be delivered. When SO_LINGER
is enabled, the close() call would block until all final data is
delivered to the remote end, for a specified time interval. When the
time interval is set to zero, the connection is aborted and any pending
data is immediately discarded upon close().

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 criu/sockets.c       | 14 ++++++++++++++
 images/sk-opts.proto |  1 +
 2 files changed, 15 insertions(+)

diff --git a/criu/sockets.c b/criu/sockets.c
index fccf0eee9..a23383fcc 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -526,6 +526,7 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 {
 	int ret = 0, val = 1;
 	struct timeval tv;
+	struct linger so_linger;
 	/* In kernel a bufsize value is doubled. */
 	u32 bufs[2] = { soe->so_sndbuf / 2, soe->so_rcvbuf / 2};
 
@@ -570,6 +571,12 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 		pr_debug("\tset oobinline for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_OOBINLINE, &val);
 	}
+	if (soe->has_so_linger) {
+		pr_debug("\tset so_linger for socket\n");
+		so_linger.l_onoff = true;
+		so_linger.l_linger = soe->so_linger;
+		ret |= restore_opt(sk, SOL_SOCKET, SO_LINGER, &so_linger);
+	}
 	if (soe->has_so_keepalive && soe->so_keepalive) {
 		pr_debug("\tset keepalive for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_KEEPALIVE, &val);
@@ -625,6 +632,7 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 {
 	int ret = 0, val;
 	struct timeval tv;
+	struct linger so_linger = {0, 0};
 
 	ret |= dump_opt(sk, SOL_SOCKET, SO_SNDBUF, &soe->so_sndbuf);
 	ret |= dump_opt(sk, SOL_SOCKET, SO_RCVBUF, &soe->so_rcvbuf);
@@ -679,6 +687,12 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 	soe->has_so_oobinline = true;
 	soe->so_oobinline = val ? true : false;
 
+	ret |= dump_opt(sk, SOL_SOCKET, SO_LINGER, &so_linger);
+	if (so_linger.l_onoff) {
+		soe->has_so_linger = true;
+		soe->so_linger = so_linger.l_linger;
+	}
+
 	ret |= dump_bound_dev(sk, soe);
 	ret |= dump_socket_filter(sk, soe);
 
diff --git a/images/sk-opts.proto b/images/sk-opts.proto
index ee35ef7e0..5bdc5063f 100644
--- a/images/sk-opts.proto
+++ b/images/sk-opts.proto
@@ -28,6 +28,7 @@ message sk_opts_entry {
 	optional uint32		tcp_keepidle	= 21;
 	optional uint32		tcp_keepintvl	= 22;
 	optional uint32		so_oobinline	= 23;
+	optional uint32		so_linger	= 24;
 }
 
 enum sk_shutdown {

From 80672c9f343ec5530d084744534673405d210289 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sat, 28 Dec 2019 13:15:26 +0000
Subject: [PATCH 0346/1854] zdtm: Add test for SO_LINDER

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 test/zdtm/static/Makefile        |  1 +
 test/zdtm/static/socket-linger.c | 52 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 test/zdtm/static/socket-linger.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 6e9768c73..ae23e78aa 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -107,6 +107,7 @@ TST_NOFILE	:=				\
 		socket-tcp-syn-sent		\
 		socket-tcp-skip-in-flight	\
 		socket-tcp-keepalive		\
+		socket-linger			\
 		sock_opts00			\
 		sock_opts01			\
 		sk-unix-unconn			\
diff --git a/test/zdtm/static/socket-linger.c b/test/zdtm/static/socket-linger.c
new file mode 100644
index 000000000..b512745ca
--- /dev/null
+++ b/test/zdtm/static/socket-linger.c
@@ -0,0 +1,52 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check SO_LINGER socket option";
+const char *test_author	= "Radostin Stoyanov <rstoyanov1@gmail.com>";
+
+int main(int argc, char **argv)
+{
+	int sk;
+	struct linger dump = {true, 30}, restore = {0, 0};
+	socklen_t optlen = sizeof(restore);
+
+	test_init(argc, argv);
+
+	sk = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (sk < 0) {
+		pr_perror("Can't create socket");
+		return 1;
+	}
+
+	if (setsockopt(sk, SOL_SOCKET, SO_LINGER, &dump, sizeof(dump)) < 0) {
+		pr_perror("setsockopt SO_LINGER");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (getsockopt(sk, SOL_SOCKET, SO_LINGER, &restore, &optlen) < 0) {
+		pr_perror("getsockopt SO_LINGER");
+		return 1;
+	}
+
+	if (restore.l_onoff != dump.l_onoff) {
+		fail("linger.l_onoff has incorrect value (%d != %d)",
+			restore.l_onoff, dump.l_onoff);
+		return 1;
+	}
+
+	if (restore.l_linger != dump.l_linger) {
+		fail("linger.l_linger has incorrect value (%d != %d)",
+			restore.l_linger, dump.l_linger);
+		return 1;
+	}
+
+	pass();
+	return 0;
+}
\ No newline at end of file

From a6214c360da5eda353a7d7586b76bf542b5c8681 Mon Sep 17 00:00:00 2001
From: Guoyun Sun <sunguoyun@loongson.cn>
Date: Mon, 14 Sep 2020 20:01:57 +0800
Subject: [PATCH 0347/1854] mips64: implement vdso_redirect_calls()

Signed-off-by: Guoyun Sun <sunguoyun@loongson.cn>
---
 criu/arch/mips/vdso-pie.c | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/criu/arch/mips/vdso-pie.c b/criu/arch/mips/vdso-pie.c
index 737e5538b..5fd15f3dc 100755
--- a/criu/arch/mips/vdso-pie.c
+++ b/criu/arch/mips/vdso-pie.c
@@ -11,11 +11,46 @@
 # undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
+static void insert_trampoline(uintptr_t from, uintptr_t to)
+{
+	struct {
+		uint32_t	ldr_pc;
+		uint32_t	imm32;
+		uint32_t	guards;
+	} __packed jmp = {
+		.ldr_pc		= 0x1000fffe,		/* b -4 */
+		.imm32		= to,
+		.guards		= 0x0000000d,		/* break */
+	};
+	void *iflush_start	= (void *)from;
+	void *iflush_end	= iflush_start + sizeof(jmp);
+
+	memcpy((void *)from, &jmp, sizeof(jmp));
+
+	sys_cacheflush(iflush_start, sizeof(jmp), 0);
+}
 
 int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 			struct vdso_symtable *sto, struct vdso_symtable *sfrom,
 			bool compat_vdso)
 {
-    pr_err("Vdso proxification isn't implemented on mips\n");
-    return -1;
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(sto->symbols); i++) {
+		uintptr_t from, to;
+
+		if (vdso_symbol_empty(&sfrom->symbols[i]))
+			continue;
+
+		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n",
+			 base_from, sfrom->symbols[i].offset,
+			 base_to, sto->symbols[i].offset, i);
+
+		from = base_from + sfrom->symbols[i].offset;
+		to = base_to + sto->symbols[i].offset;
+
+		insert_trampoline(from, to);
+	}
+
+	return 0;
 }

From 3957d9533b4973635e2f53b1e0282dde7707f31b Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 11 Aug 2020 12:00:48 +0200
Subject: [PATCH 0348/1854] Switch to python 3 variants of dependencies on
 debian-based builds

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 contrib/debian/dev-packages.lst         | 5 ++---
 criu/Makefile.packages                  | 8 +++-----
 scripts/build/Dockerfile.aarch64-cross  | 2 +-
 scripts/build/Dockerfile.armv7-cross    | 2 +-
 scripts/build/Dockerfile.linux32.tmpl   | 4 ++--
 scripts/build/Dockerfile.mips64el-cross | 2 +-
 scripts/build/Dockerfile.openj9-ubuntu  | 6 +++---
 scripts/build/Dockerfile.ppc64-cross    | 2 +-
 scripts/build/Dockerfile.tmpl           | 4 ++--
 9 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/contrib/debian/dev-packages.lst b/contrib/debian/dev-packages.lst
index ddb1f8dd1..c2d1509fa 100644
--- a/contrib/debian/dev-packages.lst
+++ b/contrib/debian/dev-packages.lst
@@ -4,18 +4,17 @@ libprotobuf-dev
 libprotobuf-c-dev
 protobuf-c-compiler
 protobuf-compiler
-python-protobuf
+python3-protobuf
 libnet-dev
 
 # Extra packages, required for testing and building other tools
 pkg-config
 libnl-3-dev
-python-ipaddr
 libbsd0
 libbsd-dev
 iproute2
 libcap-dev
 libaio-dev
-python-yaml
+python3-yaml
 libnl-route-3-dev
 python-future
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
index f380fa2f0..13c346f44 100644
--- a/criu/Makefile.packages
+++ b/criu/Makefile.packages
@@ -14,21 +14,19 @@ REQ-DEB-PKG-NAMES	+= libprotobuf-dev
 REQ-DEB-PKG-NAMES	+= libprotobuf-c-dev
 REQ-DEB-PKG-NAMES	+= protobuf-c-compiler
 REQ-DEB-PKG-NAMES	+= protobuf-compiler
-REQ-DEB-PKG-NAMES	+= python-protobuf
+REQ-DEB-PKG-NAMES	+= $(PYTHON)-protobuf
+REQ-DEB-PKG-NAMES	+= $(PYTHON)-future
 REQ-DEB-PKG-NAMES	+= libnl-3-dev
 REQ-DEB-PKG-NAMES	+= libcap-dev
 
-REQ-DEB-PKG-TEST-NAMES	+= python-yaml
+REQ-DEB-PKG-TEST-NAMES	+= $(PYTHON)-yaml
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 
 ifeq ($(PYTHON),python3)
-REQ-DEB-PKG-NAMES	+= $(PYTHON)-future
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-PyYAML
 else
-REQ-DEB-PKG-NAMES	+= python-future
-
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-pyyaml
 endif
 
diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
index 252e0f875..54178e2ae 100644
--- a/scripts/build/Dockerfile.aarch64-cross
+++ b/scripts/build/Dockerfile.aarch64-cross
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:arm64		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:arm64		\
 	libprotobuf-dev:arm64		\
 	libnet-dev:arm64		\
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
index 17a55561e..caa401e2b 100644
--- a/scripts/build/Dockerfile.armv7-cross
+++ b/scripts/build/Dockerfile.armv7-cross
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:armhf		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:armhf		\
 	libprotobuf-dev:armhf		\
 	libnet-dev:armhf		\
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index 5d3fe5139..cc9060d13 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
-	python-minimal \
-	python-future
+	python3-minimal \
+	python3-future
 
 COPY . /criu
 WORKDIR /criu
diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross
index 1ba936105..37e542125 100644
--- a/scripts/build/Dockerfile.mips64el-cross
+++ b/scripts/build/Dockerfile.mips64el-cross
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:mips64el		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:mips64el		\
 	libprotobuf-dev:mips64el		\
 	libnet-dev:mips64el		\
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index f235cc004..8c0504f0c 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -3,15 +3,15 @@ FROM adoptopenjdk/openjdk8-openj9:latest
 RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-compiler \
 	libprotobuf-c-dev \
 	libaio-dev \
-	python-future \
+	python3-future \
 	libprotobuf-dev \
 	protobuf-compiler \
 	libcap-dev \
 	libnl-3-dev \
 	gdb \
 	bash \
-	python-protobuf \
-	python-yaml \
+	python3-protobuf \
+	python3-yaml \
 	libnet-dev \
 	libnl-route-3-dev \
 	libbsd-dev \
diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross
index 44061c558..569c4e309 100644
--- a/scripts/build/Dockerfile.ppc64-cross
+++ b/scripts/build/Dockerfile.ppc64-cross
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
 	libssl-dev:ppc64el		\
 	protobuf-c-compiler		\
 	protobuf-compiler		\
-	python-protobuf			\
+	python3-protobuf			\
 	libnl-3-dev:ppc64el		\
 	libprotobuf-dev:ppc64el		\
 	libnet-dev:ppc64el		\
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index d90a1d229..203f9e23c 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
-	python-minimal \
-	python-future
+	python3-minimal \
+	python3-future
 
 COPY . /criu
 WORKDIR /criu

From 5b5f4b717b529c8f55efc05d6fa38abc3342d698 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 9 Sep 2020 05:46:11 +0300
Subject: [PATCH 0349/1854] socket/tcp: shutdown tcp sockets if the tcp-close
 option is set

A user process can try to write in a tcp socket and it has to get a
error in this case.

Fixes #1134

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sk-tcp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 7ee603818..8c982e5a4 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -431,7 +431,11 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii)
 	pr_info("Restoring TCP connection\n");
 
 	if (opts.tcp_close &&
-		ii->ie->state != TCP_LISTEN && ii->ie->state != TCP_CLOSE) {
+	    ii->ie->state != TCP_LISTEN && ii->ie->state != TCP_CLOSE) {
+		if (shutdown(fd, SHUT_RDWR) && errno != ENOTCONN) {
+			pr_perror("Unable to shutdown the socket id %x ino %x",
+				  ii->ie->id, ii->ie->ino);
+		}
 		return 0;
 	}
 

From 4f7c480413f9727eda36cb8f8e0f8dcf066c1b8c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 9 Sep 2020 05:48:25 +0300
Subject: [PATCH 0350/1854] test/zdtm: write in a tcp socket has to fail if
 tcp-close was set

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/socket-tcp-close0.c | 56 ++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/test/zdtm/static/socket-tcp-close0.c b/test/zdtm/static/socket-tcp-close0.c
index 6043cebb8..c23c3d688 100644
--- a/test/zdtm/static/socket-tcp-close0.c
+++ b/test/zdtm/static/socket-tcp-close0.c
@@ -4,6 +4,8 @@
 #include <netinet/tcp.h>
 #include <netinet/in.h>
 #include <linux/types.h>
+#include <poll.h>
+#include <signal.h>
 
 #include "zdtmtst.h"
 
@@ -19,21 +21,44 @@ static int check_socket_closed(int sk)
 		__u8    tcpi_state;
 	} info;
 	socklen_t len = sizeof(info);
+	struct pollfd pollfd = {};
 
 	err = getsockopt(sk, IPPROTO_TCP, TCP_INFO, (void *)&info, &len);
 	if (err != 0) {
 		pr_perror("Can't get socket state\n");
 		return -1;
 	} else if (info.tcpi_state != TCP_CLOSE) {
-		pr_err("Invalid socket state (%i)\n", (int)info.tcpi_state);
+		pr_err("Invalid socket state (%i)", (int)info.tcpi_state);
 		return -1;
 	}
 
-	err = recv(sk, &buffer, sizeof(buffer), 0);
-	if (!err || errno != ENOTCONN) {
-		pr_perror("Invalid recv response\n");
+	err = recv(sk, &buffer, sizeof(buffer), MSG_DONTWAIT);
+	if (err != 0) {
+		pr_perror("Invalid recv response");
 		return -1;
 	}
+
+	pollfd.fd = sk;
+	pollfd.events = POLLHUP;
+	if (poll(&pollfd, 1, 0) != 1) {
+		pr_perror("poll");
+		return 0;
+	}
+
+	if (pollfd.revents != POLLHUP) {
+		fail("POLLHUP isn't set");
+		return 1;
+	}
+
+	if (send(sk, "1", 1, MSG_DONTWAIT) != -1) {
+		fail("write completed successfully");
+		return 1;
+	}
+
+	if (errno != EPIPE) {
+		fail("errno is %d (%s) (expected EPIPE)", errno, strerror(errno));
+		return 1;
+	}
 	return 0;
 }
 
@@ -43,6 +68,12 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
+	/*
+	 * check_socket_closed triggers SIGPIPE on attempt of writing into a
+	 * closed socket.
+	 */
+	signal(SIGPIPE, SIG_IGN);
+
 	fd_s = tcp_init_server(AF_INET, &port);
 	if (fd_s < 0) {
 		pr_err("Server initializations failed\n");
@@ -57,17 +88,28 @@ int main(int argc, char **argv)
 		pr_err("Can't accept client connection\n");
 		return 1;
 	}
-	close(fd_s);
 
 	test_daemon();
 	test_waitsig();
 
 	if (check_socket_closed(fd)) {
-		fail("Server socket isn't closed\n");
+		fail("Server socket isn't closed");
 		return 1;
 	}
 	if (check_socket_closed(clt)) {
-		fail("Client socket isn't closed\n");
+		fail("Client socket isn't closed");
+		return 1;
+	}
+
+	close(clt);
+	close(fd);
+	clt = tcp_init_client(AF_INET, "localhost", port);
+	if (clt < 0)
+		return 1;
+
+	fd = tcp_accept_server(fd_s);
+	if (fd < 0) {
+		pr_err("Can't accept client connection\n");
 		return 1;
 	}
 	pass();

From e42f5e032e0a518374f8e38aae6af198d2b66da8 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 9 Sep 2020 19:39:53 +0300
Subject: [PATCH 0351/1854] tcp: allow to specify --tcp-close on dump

In this case, states of established tcp connections will not be dumped
and they will not be blocked. This will be useful in case of snapshots,
when we don't need to restore tcp connections.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/image.c                                | 11 +++++++++++
 criu/sk-inet.c                              |  3 ++-
 criu/sk-tcp.c                               |  7 +++++++
 images/inventory.proto                      |  1 +
 test/zdtm/static/Makefile                   |  1 +
 test/zdtm/static/socket-dump-tcp-close.c    |  1 +
 test/zdtm/static/socket-dump-tcp-close.desc |  1 +
 7 files changed, 24 insertions(+), 1 deletion(-)
 create mode 120000 test/zdtm/static/socket-dump-tcp-close.c
 create mode 100644 test/zdtm/static/socket-dump-tcp-close.desc

diff --git a/criu/image.c b/criu/image.c
index 56c6f787c..d4ad7a79e 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -81,6 +81,11 @@ int check_img_inventory(void)
 		goto out_err;
 	}
 
+	if (he->tcp_close && !opts.tcp_close) {
+		pr_err("Need to set the --tcp-close option.");
+		goto out_err;
+	}
+
 	ret = 0;
 
 out_err:
@@ -212,6 +217,12 @@ int prepare_inventory(InventoryEntry *he)
 
 	he->root_ids = crt.i.ids;
 
+	/* tcp_close has to be set on restore if it has been set on dump. */
+	if (opts.tcp_close) {
+		he->tcp_close = true;
+		he->has_tcp_close = true;
+	}
+
 	return 0;
 }
 
diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index dc1ee8144..42bae9454 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -194,7 +194,7 @@ static int can_dump_inet_sk(const struct inet_sk_desc *sk)
 	case TCP_LAST_ACK:
 	case TCP_CLOSING:
 	case TCP_SYN_SENT:
-		if (!opts.tcp_established_ok) {
+		if (!opts.tcp_established_ok && !opts.tcp_close) {
 			pr_err("Connected TCP socket, consider using --%s option.\n",
 					SK_EST_PARAM);
 			return 0;
@@ -787,6 +787,7 @@ int restore_ip_opts(int sk, int family, int proto, IpOptsEntry *ioe)
 		ret |= restore_ip_raw_opts(sk, family, proto, ioe->raw);
 	return ret;
 }
+
 static int open_inet_sk(struct file_desc *d, int *new_fd)
 {
 	struct fdinfo_list_entry *fle = file_master(d);
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 8c982e5a4..0409e22c3 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -241,6 +241,10 @@ int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)
 	if (sk->dst_port == 0)
 		return 0;
 
+	if (opts.tcp_close) {
+		return 0;
+	}
+
 	pr_info("Dumping TCP connection\n");
 
 	if (tcp_repair_established(fd, sk))
@@ -461,6 +465,9 @@ void rst_unlock_tcp_connections(void)
 {
 	struct inet_sk_info *ii;
 
+	if (opts.tcp_close)
+		return;
+
 	/* Network will be unlocked by network-unlock scripts */
 	if (root_ns_mask & CLONE_NEWNET)
 		return;
diff --git a/images/inventory.proto b/images/inventory.proto
index d1438e8c8..d7d0622c4 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -17,4 +17,5 @@ message inventory_entry {
 	optional lsmtype		lsmtype		= 6;
 	optional uint64			dump_uptime	= 8;
 	optional uint32			pre_dump_mode	= 9;
+	optional bool			tcp_close	= 10;
 }
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ae23e78aa..ee9b57abe 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -102,6 +102,7 @@ TST_NOFILE	:=				\
 		socket-tcp4v6-closed		\
 		socket-tcp-close0 		\
 		socket-tcp-close1 		\
+		socket-dump-tcp-close 		\
 		socket-tcp-unconn		\
 		socket-tcp6-unconn		\
 		socket-tcp-syn-sent		\
diff --git a/test/zdtm/static/socket-dump-tcp-close.c b/test/zdtm/static/socket-dump-tcp-close.c
new file mode 120000
index 000000000..5e3c85c91
--- /dev/null
+++ b/test/zdtm/static/socket-dump-tcp-close.c
@@ -0,0 +1 @@
+socket-tcp-close0.c
\ No newline at end of file
diff --git a/test/zdtm/static/socket-dump-tcp-close.desc b/test/zdtm/static/socket-dump-tcp-close.desc
new file mode 100644
index 000000000..c53a1f315
--- /dev/null
+++ b/test/zdtm/static/socket-dump-tcp-close.desc
@@ -0,0 +1 @@
+{'opts': '--tcp-close', 'flags': 'reqrst '}

From 4a80dfab896948801a55e184b2116ec1f1007845 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 20 Sep 2020 20:54:13 +0300
Subject: [PATCH 0352/1854] doc: update documentations for the tcp-close option

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Documentation/criu.txt | 4 ++++
 criu/crtools.c         | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index ff6886d9d..2ee40ec10 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -327,6 +327,10 @@ mount -t cgroup -o devices,freezer none devices,freezer
 *--tcp-established*::
     Checkpoint established TCP connections.
 
+*--tcp-close*::
+    Don't dump the state of, or block, established tcp connections.
+    This is useful when tcp connections are not going to be restored.
+
 *--skip-in-flight*::
     This option skips in-flight TCP connections. If any TCP connections
     that are not yet completely established are found, *criu* ignores
diff --git a/criu/crtools.c b/criu/crtools.c
index 7a32d9443..d4291f2c6 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -377,7 +377,9 @@ usage:
 "* Special resources support:\n"
 "     --" SK_EST_PARAM "  checkpoint/restore established TCP connections\n"
 "     --" SK_INFLIGHT_PARAM "   skip (ignore) in-flight TCP connections\n"
-"     --" SK_CLOSE_PARAM "        restore connected TCP sockets in closed state\n"
+"     --" SK_CLOSE_PARAM "\n"
+"                        Don't dump the state of, or block, established tcp connections,\n"
+"                        and restore them in closed state.\n"
 "  -r|--root PATH        change the root filesystem (when run in mount namespace)\n"
 "  --evasive-devices     use any path to a device file if the original one\n"
 "                        is inaccessible\n"
@@ -438,8 +440,8 @@ usage:
 "			OPTIONS can be used to specify parameters for userns:\n"
 "			    user:PID,UID,GID\n"
 "  --file-validation METHOD\n"
-			"pass the validation method to be used; argument\n"
-			"can be 'filesize' or 'buildid' (default).\n"
+"			pass the validation method to be used; argument\n"
+"			can be 'filesize' or 'buildid' (default).\n"
 "\n"
 "Check options:\n"
 "  Without options, \"criu check\" checks availability of absolutely required\n"

From e2101abf26513cc692b4365fed09d5c317b21f2e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Sep 2020 00:52:49 +0100
Subject: [PATCH 0353/1854] crtools: Fix --help output line width

After commit cd479dc3 Travis fails with:

++ ./criu/criu --help
++ wc --max-line-length
+ WIDTH=87
+ '[' 87 -gt 80 ']'
+ echo 'criu --help output does not obey 80 characters line width!'

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/crtools.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index d4291f2c6..2eb5dba42 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -377,9 +377,8 @@ usage:
 "* Special resources support:\n"
 "     --" SK_EST_PARAM "  checkpoint/restore established TCP connections\n"
 "     --" SK_INFLIGHT_PARAM "   skip (ignore) in-flight TCP connections\n"
-"     --" SK_CLOSE_PARAM "\n"
-"                        Don't dump the state of, or block, established tcp connections,\n"
-"                        and restore them in closed state.\n"
+"     --" SK_CLOSE_PARAM "        don't dump the state of, or block, established tcp\n"
+"                        connections, and restore them in closed state.\n"
 "  -r|--root PATH        change the root filesystem (when run in mount namespace)\n"
 "  --evasive-devices     use any path to a device file if the original one\n"
 "                        is inaccessible\n"

From 84215e0355ed84dff885f169c99d995363007b89 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 17 Sep 2020 17:05:33 +0000
Subject: [PATCH 0354/1854] scripts: run shellcheck on the scripts folder

Shellcheck (https://github.com/koalaman/shellcheck) can identify common
errors in shell scripts. This initial integration of shellcheck only
checks the scripts in the 'scripts/' folder. This commit fixes (or
disables) all reports of shellcheck to ensure this part starts error
free. I am not convinced this is really necessary as most changes do not
seem to be necessary for their circumstances. On the other hand it
probably does not hurt to use a checker to avoid unnecessary errors.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile                               |  2 ++
 scripts/install-criu-image-streamer.sh |  2 +-
 scripts/install-debian-pkgs.sh         |  2 +-
 scripts/protobuf-gen.sh                |  8 +++--
 scripts/systemd-autofs-restart.sh      | 47 +++++++++++++-------------
 scripts/tmp-files.sh                   |  6 ++--
 scripts/travis/asan.sh                 | 14 ++++----
 scripts/travis/docker-test.sh          | 12 ++++---
 scripts/travis/openj9-test.sh          | 12 +++----
 scripts/travis/podman-test.sh          | 21 ++++++------
 scripts/travis/vagrant.sh              |  2 +-
 11 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/Makefile b/Makefile
index 5ac4cbacd..f0a645e75 100644
--- a/Makefile
+++ b/Makefile
@@ -400,6 +400,8 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/inhfd/*.py
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
+	shellcheck scripts/*.sh
+	shellcheck scripts/travis/*.sh
 
 include Makefile.install
 
diff --git a/scripts/install-criu-image-streamer.sh b/scripts/install-criu-image-streamer.sh
index 749214823..8ace3a657 100755
--- a/scripts/install-criu-image-streamer.sh
+++ b/scripts/install-criu-image-streamer.sh
@@ -5,7 +5,7 @@ set -eux
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 # Clone criu-image-streamer in a sibling directory of the criu project directory
-cd $(dirname "$0")/../../
+cd "$(dirname "$0")"/../../
 git clone --depth=1 https://github.com/checkpoint-restore/criu-image-streamer.git
 
 # Compile
diff --git a/scripts/install-debian-pkgs.sh b/scripts/install-debian-pkgs.sh
index c8af34f6c..540c2c094 100755
--- a/scripts/install-debian-pkgs.sh
+++ b/scripts/install-debian-pkgs.sh
@@ -15,7 +15,7 @@ function print_help()
 function process()
 {
 	sudo apt-get update
-	sudo apt-get install -yq $( sed 's/\#.*$//' ${REQ_PKGS} )
+	sudo apt-get install -yq "$( sed 's/\#.*$//' ${REQ_PKGS} )"
 }
 
 if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
diff --git a/scripts/protobuf-gen.sh b/scripts/protobuf-gen.sh
index 29c52cf1a..0c738f13a 100644
--- a/scripts/protobuf-gen.sh
+++ b/scripts/protobuf-gen.sh
@@ -1,3 +1,7 @@
+#!/bin/bash
+
+# shellcheck disable=SC2013,SC1004
+
 TR="y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
 
 for x in $(sed -n '/PB_AUTOGEN_START/,/PB_AUTOGEN_STOP/ {
@@ -6,8 +10,8 @@ for x in $(sed -n '/PB_AUTOGEN_START/,/PB_AUTOGEN_STOP/ {
 		s/\tPB_//;
 		p;
 	   }' criu/include/protobuf-desc.h); do
-	x_la=$(echo $x | sed $TR)
-	x_uf=$(echo $x | sed -nr 's/^./&#\\\
+	x_la=$(echo "$x" | sed $TR)
+	x_uf=$(echo "$x" | sed -nr 's/^./&#\\\
 /;
 		s/_(.)/\\\
 \1#\\\
diff --git a/scripts/systemd-autofs-restart.sh b/scripts/systemd-autofs-restart.sh
index b22078c36..65481b551 100755
--- a/scripts/systemd-autofs-restart.sh
+++ b/scripts/systemd-autofs-restart.sh
@@ -16,7 +16,7 @@
 #
 [ "$CRTOOLS_SCRIPT_ACTION" == "post-resume" ] || exit 0
 
-if [ ! -n "$CRTOOLS_INIT_PID" ]; then
+if [ -z "$CRTOOLS_INIT_PID" ]; then
 	echo "CRTOOLS_INIT_PID environment variable is not set"
 	exit 1
 fi
@@ -37,7 +37,7 @@ fi
 JOIN_CT="$NS_ENTER -t $CRTOOLS_INIT_PID -m -u -p"
 
 # Skip container, if it's not systemd based
-[ "$($JOIN_CT basename -- $($JOIN_CT readlink /proc/1/exe))" == "systemd" ] || exit 0
+[ "$($JOIN_CT basename -- "$($JOIN_CT readlink /proc/1/exe)")" == "systemd" ] || exit 0
 
 AUTOFS_SERVICES="proc-sys-fs-binfmt_misc.automount"
 
@@ -60,11 +60,14 @@ function get_fs_type {
 
 	while IFS='' read -r line; do
 		# Skip those entries which do not match the mountpoint
-		[ "$(echo $line | awk '{print $5;}')" = "$mountpoint" ] || continue
+		[ "$(echo "$line" | awk '{print $5;}')" = "$mountpoint" ] || continue
 
-		local mnt_id=$(echo $line | awk '{print $1;}')
-		local mnt_parent_id=$(echo $line | awk '{print $2;}')
-		local mnt_fs_type=$(echo $line | sed 's/.* - //g' | awk '{print $1;}')
+		local mnt_id
+		mnt_id=$(echo "$line" | awk '{print $1;}')
+		local mnt_parent_id
+		mnt_parent_id=$(echo "$line" | awk '{print $2;}')
+		local mnt_fs_type
+		mnt_fs_type=$(echo "$line" | sed 's/.* - //g' | awk '{print $1;}')
 
 		# Skip mount entry, if not the first one and not a child
 		[ -n "$top_mount_id" ] && [ "$mnt_parent_id" != "$top_mount_id" ] && continue
@@ -78,7 +81,7 @@ function get_fs_type {
 		return 1
 	fi
 
-	echo $top_mount_fs_type
+	echo "$top_mount_fs_type"
 	return 0
 }
 
@@ -86,7 +89,7 @@ function bind_mount {
 	local from=$1
 	local to=$2
 
-	$JOIN_CT mount --bind $from $to && return 0
+	$JOIN_CT mount --bind "$from" "$to" && return 0
 
 	echo "Failed to bind mount $from to $to"
 	return 1
@@ -96,8 +99,7 @@ function save_mountpoint {
 	local mountpoint=$1
 	local top_mount_fs_type=""
 
-	top_mount_fs_type=$(get_fs_type $mountpoint)
-	if [ $? -ne 0 ]; then
+	if ! top_mount_fs_type=$(get_fs_type "$mountpoint"); then
 		echo "$top_mount_fs_type"
 		return
 	fi
@@ -113,7 +115,7 @@ function save_mountpoint {
 
 	# No need to unmount fs on top of autofs:
 	# systemd will does it for us on service restart
-	bind_mount $mountpoint $bindmount || $JOIN_CT rm -rf $bindmount
+	bind_mount "$mountpoint" "$bindmount" || $JOIN_CT rm -rf "$bindmount"
 }
 
 function restore_mountpoint {
@@ -122,25 +124,25 @@ function restore_mountpoint {
 	[ -n "$bindmount" ] || return
 
 	# Umount file system, remounted by systemd, if any
-	top_mount_fs_type=$(get_fs_type $mountpoint)
-	if [ $? -ne 0 ]; then
+	if ! top_mount_fs_type=$(get_fs_type "$mountpoint"); then
 		echo "$top_mount_fs_type"
 		return
 	fi
 
 	# Nothing to do, if no file system is on top of autofs
 	if [ "$top_mount_fs_type" != "autofs" ]; then
-		$JOIN_CT umount $mountpoint || echo "Failed to umount $mountpoint"
+		$JOIN_CT umount "$mountpoint" || echo "Failed to umount $mountpoint"
 	fi
 
 	# Restore origin file system even if we failed to unmount the new one
-	bind_mount $bindmount $mountpoint
+	bind_mount "$bindmount" "$mountpoint"
 	remove_bindmount
 }
 
 function restart_service {
 	local service=$1
-	local mountpoint=$($JOIN_CT systemctl show $service -p Where | sed 's/.*=//g')
+	local mountpoint
+	mountpoint=$($JOIN_CT systemctl show "$service" -p Where | sed 's/.*=//g')
 
 	if [ -z "$mountpoint" ]; then
 		echo "Failed to discover $service mountpoint"
@@ -149,24 +151,23 @@ function restart_service {
 
 	# Try to move restored bind-mount aside and exit if Failed
 	# Nothing to do, if we Failed
-	save_mountpoint $mountpoint || return
+	save_mountpoint "$mountpoint" || return
 
-	$JOIN_CT systemctl restart $service
-	if [ $? -ne 0 ]; then
+	if ! $JOIN_CT systemctl restart "$service"; then
 		echo "Failed to restart $service service"
 		return
 	fi
 	echo "$service restarted"
 
 	# Try to move saved monutpoint back on top of autofs
-	restore_mountpoint $mountpoint
+	restore_mountpoint "$mountpoint"
 }
 
 for service in $AUTOFS_SERVICES; do
-	status=$($JOIN_CT systemctl is-active $service)
+	status=$($JOIN_CT systemctl is-active "$service")
 
-	if [ $status == "active" ]; then
-		restart_service $service
+	if [ "$status" == "active" ]; then
+		restart_service "$service"
 	else
 		echo "$service skipped ($status)"
 	fi
diff --git a/scripts/tmp-files.sh b/scripts/tmp-files.sh
index d6b93a0aa..33be4dafa 100755
--- a/scripts/tmp-files.sh
+++ b/scripts/tmp-files.sh
@@ -23,7 +23,7 @@ DUMPARGS="--create --absolute-names --gzip --no-unquote --no-wildcards --file"
 RESTOREARGS="--extract --gzip --no-unquote --no-wildcards --absolute-names --directory / --file"
 IMGFILE=$CRTOOLS_IMAGE_DIR"/tmpfiles.tar.gz"
 
-MY_NAME=`basename "$0"`
+MY_NAME=$(basename "$0")
 
 case "$CRTOOLS_SCRIPT_ACTION" in
 	$POSTDUMP )
@@ -31,7 +31,7 @@ case "$CRTOOLS_SCRIPT_ACTION" in
 			echo "$MY_NAME: ERROR! No files are given."
 			exit 1
 		fi
-		tar $DUMPARGS $IMGFILE -- "$@"
+		tar "$DUMPARGS" "$IMGFILE" -- "$@"
 		exit $?
 		;;
 	$PRERESTORE )
@@ -39,7 +39,7 @@ case "$CRTOOLS_SCRIPT_ACTION" in
 			echo "$MY_NAME: ERROR! Not expected script args."
 			exit 1
 		fi
-		tar $RESTOREARGS $IMGFILE
+		tar "$RESTOREARGS" "$IMGFILE"
 		exit $?
 		;;
 esac
diff --git a/scripts/travis/asan.sh b/scripts/travis/asan.sh
index 15bfe53fe..8113b9b19 100755
--- a/scripts/travis/asan.sh
+++ b/scripts/travis/asan.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/bin/bash
+
+# shellcheck disable=2044
 
 set -x
 
@@ -11,11 +13,11 @@ chmod 0777 test/zdtm/static
 ./test/zdtm.py run -a --keep-going -k always --parallel 4 -x zdtm/static/rtc "$@"
 ret=$?
 
-for i in `find / -name 'asan.log*'`; do
-	echo $i;
+for i in $(find / -name 'asan.log*'); do
+	echo "$i"
 	echo ========================================
-	cat $i;
+	cat "$i"
 	echo ========================================
-	ret=1;
-done;
+	ret=1
+done
 exit $ret
diff --git a/scripts/travis/docker-test.sh b/scripts/travis/docker-test.sh
index ac420a445..e760be085 100755
--- a/scripts/travis/docker-test.sh
+++ b/scripts/travis/docker-test.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# shellcheck disable=SC1091,SC2015
+
 set -x -e -o pipefail
 
 apt-get install -qq \
@@ -44,21 +47,22 @@ docker info
 
 criu --version
 
+# shellcheck disable=SC2016
 docker run --tmpfs /tmp --tmpfs /run --read-only --security-opt seccomp=unconfined --name cr -d alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
 
 sleep 1
-for i in `seq 50`; do
+for i in $(seq 50); do
 	# docker start returns 0 silently if a container is already started
 	# docker checkpoint doesn't wait when docker updates a container state
 	# Due to both these points, we need to sleep after docker checkpoint to
 	# avoid races with docker start.
 	docker exec cr ps axf &&
-	docker checkpoint create cr checkpoint$i &&
+	docker checkpoint create cr checkpoint"$i" &&
 	sleep 1 &&
 	docker ps &&
 	(docker exec cr true && exit 1 || exit 0) &&
-	docker start --checkpoint checkpoint$i cr 2>&1 | tee log || {
-		cat "`cat log | grep 'log file:' | sed 's/log file:\s*//'`" || true
+	docker start --checkpoint checkpoint"$i" cr 2>&1 | tee log || {
+	cat "$(grep log 'log file:' | sed 's/log file:\s*//')" || true
 		docker logs cr || true
 		cat /tmp/zdtm-core-* || true
 		dmesg
diff --git a/scripts/travis/openj9-test.sh b/scripts/travis/openj9-test.sh
index 968f064f8..b8c07f180 100755
--- a/scripts/travis/openj9-test.sh
+++ b/scripts/travis/openj9-test.sh
@@ -1,19 +1,17 @@
 #!/bin/bash
 
-cd ../..
+cd ../.. || exit 1
 
 failures=""
 
 docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
-docker run --rm --privileged criu-openj9-ubuntu-test:latest
-if [ $? -ne 0 ]; then
-	failures=`echo "$failures ubuntu"`
+if ! docker run --rm --privileged criu-openj9-ubuntu-test:latest; then
+	failures="$failures ubuntu"
 fi
 
 docker build -t criu-openj9-alpine-test:latest -f scripts/build/Dockerfile.openj9-alpine .
-docker run --rm --privileged criu-openj9-alpine-test:latest
-if [ $? -ne 0 ]; then
-	failures=`echo "$failures alpine"`
+if ! docker run --rm --privileged criu-openj9-alpine-test:latest; then
+	failures="$failures alpine"
 fi
 
 if [ -n "$failures" ]; then
diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh
index 7490d5fe9..5c9f446a4 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/travis/podman-test.sh
@@ -32,37 +32,38 @@ podman --storage-driver vfs info
 
 criu --version
 
+# shellcheck disable=SC2016
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
 
 sleep 1
-for i in `seq 20`; do
+for i in $(seq 20); do
 	echo "Test $i for podman container checkpoint"
 	podman exec cr ps axf
 	podman logs cr
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "1" ]
 	podman container checkpoint cr
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "0" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "0" ]
 	podman ps -a
 	podman container restore cr
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "1" ]
 	podman logs cr
 done
 
-for i in `seq 20`; do
+for i in $(seq 20); do
 	echo "Test $i for podman container checkpoint --export"
 	podman ps -a
 	podman exec cr ps axf
 	podman logs cr
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "1" ]
 	podman container checkpoint -l --export /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "0" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "0" ]
 	podman ps -a
 	podman rm -fa
 	podman ps -a
 	podman container restore --import /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "1" ]
 	podman container restore --name cr2 --import /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr2 -q -f status=running | wc -l` -eq "1" ]
+	[ "$(podman ps -f name=cr2 -q -f status=running | wc -l)" -eq "1" ]
 	podman ps -a
 	podman logs cr
 	podman logs cr2
@@ -70,7 +71,7 @@ for i in `seq 20`; do
 	podman rm -fa
 	podman ps -a
 	podman container restore --import /tmp/chkpt.tar.gz
-	[ `podman ps -f name=cr -q -f status=running | wc -l` -eq "1" ]
+	[ "$(podman ps -f name=cr -q -f status=running | wc -l)" -eq "1" ]
 	podman ps -a
 	rm -f /tmp/chkpt.tar.gz
 done
diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
index e3ea7ed3d..e98cea4e4 100755
--- a/scripts/travis/vagrant.sh
+++ b/scripts/travis/vagrant.sh
@@ -17,7 +17,7 @@ setup() {
 
 	# Tar up the git checkout to have vagrant rsync it to the VM
 	tar cf criu.tar ../../../criu
-	wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_$(uname -m).deb -O /tmp/vagrant.deb && \
+	wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_"$(uname -m)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
 
 	apt-get -qq install -y libvirt-bin libvirt-dev qemu-utils qemu

From 0def9bc1ffba589f944f08a2e8296bc404bdf701 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 17 Sep 2020 17:18:41 +0000
Subject: [PATCH 0355/1854] tests: only run 'make lint' once in CI

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/lint.yml  | 13 +++++++++++++
 scripts/travis/travis-tests |  2 --
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..9b5e90368
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,13 @@
+name: Run code linter
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install tools
+      run: sudo apt-get install -qqy flake8 shellcheck
+    - name: Run make lint
+      run: make lint
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index a9e99992f..45d97312f 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -119,8 +119,6 @@ time make CC="$CC" -j4
 ./criu/criu -v4 cpuinfo dump || :
 ./criu/criu -v4 cpuinfo check || :
 
-make lint
-
 # Check that help output fits into 80 columns
 WIDTH=$(./criu/criu --help | wc --max-line-length)
 if [ "$WIDTH" -gt 80 ]; then

From 025ef090d2db883e17745382406f75ad69e4f525 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 14 Aug 2020 08:37:25 +0000
Subject: [PATCH 0356/1854] CI: switch to loop based apt-get

The previously introduced apt_install loop function to make package
install more robust against network errors is now moved to its own
script used in multiple places.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.aarch64-cross  |  6 ++++--
 scripts/build/Dockerfile.armv7-cross    |  6 ++++--
 scripts/build/Dockerfile.linux32.tmpl   |  4 +++-
 scripts/build/Dockerfile.mips64el-cross |  6 ++++--
 scripts/build/Dockerfile.openj9-ubuntu  |  4 +++-
 scripts/build/Dockerfile.ppc64-cross    |  6 ++++--
 scripts/build/Dockerfile.tmpl           |  4 +++-
 scripts/build/Dockerfile.x86_64.hdr     |  5 +++--
 scripts/travis/apt-install              | 23 +++++++++++++++++++++
 scripts/travis/docker-test.sh           |  7 ++-----
 scripts/travis/podman-test.sh           |  5 ++---
 scripts/travis/travis-tests             | 27 +++----------------------
 scripts/travis/vagrant.sh               |  2 +-
 13 files changed, 59 insertions(+), 46 deletions(-)
 create mode 100755 scripts/travis/apt-install

diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
index 54178e2ae..ab5d9299f 100644
--- a/scripts/build/Dockerfile.aarch64-cross
+++ b/scripts/build/Dockerfile.aarch64-cross
@@ -1,11 +1,13 @@
 FROM dockcross/base:latest
 
+COPY scripts/travis/apt-install /bin/apt-install
+
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
   dpkg --add-architecture arm64 && \
-  apt-get install emdebian-archive-keyring
+  apt-install emdebian-archive-keyring
 
-RUN apt-get update && apt-get install -y \
+RUN apt-install \
 	crossbuild-essential-arm64	\
 	libc6-dev-arm64-cross		\
 	libc6-arm64-cross		\
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
index caa401e2b..99321e456 100644
--- a/scripts/build/Dockerfile.armv7-cross
+++ b/scripts/build/Dockerfile.armv7-cross
@@ -1,11 +1,13 @@
 FROM dockcross/base:latest
 
+COPY scripts/travis/apt-install /bin/apt-install
+
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
   dpkg --add-architecture armhf && \
-  apt-get install emdebian-archive-keyring
+  apt-install emdebian-archive-keyring
 
-RUN apt-get update && apt-get install -y \
+RUN apt-install \
 	crossbuild-essential-armhf	\
 	libbz2-dev:armhf		\
 	libexpat1-dev:armhf		\
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index cc9060d13..3b3007e9c 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -1,7 +1,9 @@
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
-RUN apt-get update && apt-get install -y \
+COPY scripts/travis/apt-install /bin/apt-install
+
+RUN apt-install \
 	ccache \
 	libnet-dev \
 	libnl-route-3-dev \
diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross
index 37e542125..0458ee887 100644
--- a/scripts/build/Dockerfile.mips64el-cross
+++ b/scripts/build/Dockerfile.mips64el-cross
@@ -1,11 +1,13 @@
 FROM dockcross/base:latest
 
+COPY scripts/travis/apt-install /bin/apt-install
+
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
   dpkg --add-architecture mips64el && \
-  apt-get install emdebian-archive-keyring
+  apt-install emdebian-archive-keyring
 
-RUN apt-get update && apt-get install -y \
+RUN apt-install \
 	crossbuild-essential-mips64el	\
 	libbz2-dev:mips64el		\
 	libexpat1-dev:mips64el		\
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 8c0504f0c..80af38b1a 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,6 +1,8 @@
 FROM adoptopenjdk/openjdk8-openj9:latest
 
-RUN apt-get update && apt-get install -y --no-install-recommends protobuf-c-compiler \
+COPY scripts/travis/apt-install /bin/apt-install
+
+RUN apt-install protobuf-c-compiler \
 	libprotobuf-c-dev \
 	libaio-dev \
 	python3-future \
diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross
index 569c4e309..fb93a5824 100644
--- a/scripts/build/Dockerfile.ppc64-cross
+++ b/scripts/build/Dockerfile.ppc64-cross
@@ -1,11 +1,13 @@
 FROM dockcross/base:latest
 
+COPY scripts/travis/apt-install /bin/apt-install
+
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
   dpkg --add-architecture ppc64el && \
-  apt-get install emdebian-archive-keyring
+  apt-install emdebian-archive-keyring
 
-RUN apt-get update && apt-get install -y \
+RUN apt-install \
 	crossbuild-essential-ppc64el	\
 	libc6-dev-ppc64el-cross		\
 	libc6-ppc64el-cross		\
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 203f9e23c..f4213cea0 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -1,7 +1,9 @@
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
-RUN apt-get update && apt-get install -y \
+COPY scripts/travis/apt-install /bin/apt-install
+
+RUN apt-install \
 	ccache \
 	libnet-dev \
 	libnl-route-3-dev \
diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index b020d9cfc..2f87c4e8c 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1,4 +1,5 @@
 FROM ubuntu:xenial
 
-RUN apt-get update -qq && apt-get install -qq \
-                gcc-multilib
+COPY scripts/travis/apt-install /bin/apt-install
+
+RUN apt-install gcc-multilib
diff --git a/scripts/travis/apt-install b/scripts/travis/apt-install
new file mode 100755
index 000000000..0dd680f4e
--- /dev/null
+++ b/scripts/travis/apt-install
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e -x
+
+export DEBIAN_FRONTEND=noninteractive
+
+install_retry_counter=0
+max_apt_retries=5
+
+# This function loops a couple of times over apt-get, hoping to
+# avoid CI errors due to errors during apt-get
+# hashsum mismatches, DNS errors and similar things
+while true; do
+	let install_retry_counter+=1
+	if [ ${install_retry_counter} -gt ${max_apt_retries} ]; then
+		exit 1
+	fi
+	apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-install-recommends $@ && break
+
+	# In case it is a network error let's wait a bit.
+	echo "Retrying attempt ${install_retry_counter}"
+	sleep ${install_retry_counter}
+done
diff --git a/scripts/travis/docker-test.sh b/scripts/travis/docker-test.sh
index e760be085..a6990b180 100755
--- a/scripts/travis/docker-test.sh
+++ b/scripts/travis/docker-test.sh
@@ -4,7 +4,7 @@
 
 set -x -e -o pipefail
 
-apt-get install -qq \
+./apt-install \
     apt-transport-https \
     ca-certificates \
     curl \
@@ -17,10 +17,7 @@ add-apt-repository \
    $(lsb_release -cs) \
    stable test"
 
-
-apt-get update -qq
-
-apt-get install -qq docker-ce
+./apt-install docker-ce
 
 . /etc/lsb-release
 
diff --git a/scripts/travis/podman-test.sh b/scripts/travis/podman-test.sh
index 5c9f446a4..509113994 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/travis/podman-test.sh
@@ -9,14 +9,13 @@ wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:st
 # this is a podman packaging bug (https://github.com/containers/libpod/issues/4747)
 apt-get -y purge docker-ce
 
-apt-get install -qq \
+./apt-install \
     apt-transport-https \
     ca-certificates \
     curl \
     software-properties-common
 
-apt-get update -qq
-apt-get install -qqy podman containernetworking-plugins
+./apt-install podman containernetworking-plugins
 
 export SKIP_TRAVIS_TEST=1
 
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 45d97312f..437160407 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -33,27 +33,6 @@ if [ "$UNAME_M" != "x86_64" ]; then
 	SKIP_TRAVIS_TEST=1
 fi
 
-install_retry_counter=0
-max_apt_retries=5
-
-# This function loops a couple of times over apt-get, hoping to
-# avoid CI errors due to errors during apt-get
-# hashsum mismatches, DNS errors and similar things
-apt_install () {
-	while true; do
-		let install_retry_counter+=1
-		if [ $install_retry_counter -gt $max_apt_retries ]; then
-			exit 1
-		fi
-		apt-get clean -qqy || continue
-		apt-get update -qqy || continue
-		apt-get install -qqy --no-install-recommends $@ && break
-
-		# In case it is a network error let's wait a bit.
-		sleep $install_retry_counter
-	done
-}
-
 travis_prep () {
 	[ -n "$SKIP_TRAVIS_PREP" ] && return
 
@@ -76,7 +55,7 @@ travis_prep () {
 
 	[ -n "$GCOV" ] && {
 		apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-		apt_install --no-install-suggests g++-7
+		scripts/travis/apt-install --no-install-suggests g++-7
 		CC=gcc-7
 	}
 
@@ -95,7 +74,7 @@ travis_prep () {
 		TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS"
 	fi
 
-	apt_install $TRAVIS_PKGS
+	scripts/travis/apt-install $TRAVIS_PKGS
 	chmod a+x $HOME
 
 	# zdtm uses an unversioned python binary to run the tests.
@@ -151,7 +130,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 		IA32_PKGS="$IA32_PKGS $i:i386"
 	done
 	apt-get remove $INCOMPATIBLE_LIBS
-	apt_install $IA32_PKGS
+	scripts/travis/apt-install $IA32_PKGS
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi
diff --git a/scripts/travis/vagrant.sh b/scripts/travis/vagrant.sh
index e98cea4e4..bc10693bb 100755
--- a/scripts/travis/vagrant.sh
+++ b/scripts/travis/vagrant.sh
@@ -20,7 +20,7 @@ setup() {
 	wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_"$(uname -m)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
 
-	apt-get -qq install -y libvirt-bin libvirt-dev qemu-utils qemu
+	./apt-install libvirt-bin libvirt-dev qemu-utils qemu
 	systemctl restart libvirt-bin
 	vagrant plugin install vagrant-libvirt
 	vagrant init fedora/${FEDORA_VERSION}-cloud-base --box-version ${FEDORA_BOX_VERSION}

From 32b162831d96f4dfa588203a005bf7a6699bac5a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 23 Sep 2020 06:29:35 +0000
Subject: [PATCH 0357/1854] CI: add Travis test script to 'lint'

Running 'make lint' will now also check our travis-tests script with
shellcheck.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile                    |  2 +-
 scripts/travis/apt-install  |  3 ++-
 scripts/travis/travis-tests | 36 ++++++++++++++++++++----------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index f0a645e75..c33494bec 100644
--- a/Makefile
+++ b/Makefile
@@ -401,7 +401,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	shellcheck scripts/*.sh
-	shellcheck scripts/travis/*.sh
+	shellcheck scripts/travis/*.sh scripts/travis/travis* scripts/travis/apt-install
 
 include Makefile.install
 
diff --git a/scripts/travis/apt-install b/scripts/travis/apt-install
index 0dd680f4e..0b5a6fe3f 100755
--- a/scripts/travis/apt-install
+++ b/scripts/travis/apt-install
@@ -11,10 +11,11 @@ max_apt_retries=5
 # avoid CI errors due to errors during apt-get
 # hashsum mismatches, DNS errors and similar things
 while true; do
-	let install_retry_counter+=1
+	(( install_retry_counter+=1 ))
 	if [ ${install_retry_counter} -gt ${max_apt_retries} ]; then
 		exit 1
 	fi
+	# shellcheck disable=SC2068
 	apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-install-recommends $@ && break
 
 	# In case it is a network error let's wait a bit.
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests
index 437160407..9e1105449 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/travis/travis-tests
@@ -9,6 +9,7 @@ TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 
 if [ -e /etc/lsb-release ]; then
 	# This file does not exist on non Ubuntu
+	# shellcheck disable=SC1091
 	. /etc/lsb-release
 	if [ "$DISTRIB_RELEASE" = "16.04" ]; then
 		# There is one last test running on 16.04 because of the broken
@@ -24,7 +25,7 @@ fi
 
 X86_64_PKGS="gcc-multilib"
 
-UNAME_M=`uname -m`
+UNAME_M=$(uname -m)
 
 if [ "$UNAME_M" != "x86_64" ]; then
 	# For Travis only x86_64 seems to be baremetal. Other
@@ -60,7 +61,7 @@ travis_prep () {
 	}
 
 	# ccache support, only enable for non-GCOV case
-	if [ "$CCACHE" = "1" -a -z "$GCOV" ]; then
+	if [ "$CCACHE" = "1" ] && [ -z "$GCOV" ]; then
 		# ccache is installed by default, need to set it up
 		export CCACHE_DIR=$HOME/.ccache
 		[ "$CC" = "clang" ] && export CCACHE_CPP2=yes
@@ -74,8 +75,8 @@ travis_prep () {
 		TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS"
 	fi
 
-	scripts/travis/apt-install $TRAVIS_PKGS
-	chmod a+x $HOME
+	scripts/travis/apt-install "$TRAVIS_PKGS"
+	chmod a+x "$HOME"
 
 	# zdtm uses an unversioned python binary to run the tests.
 	# let's point python to python3
@@ -86,7 +87,8 @@ test_stream() {
 	# We must test CRIU features that dump content into an image file to ensure
 	# streaming compatibility.
 	STREAM_TEST_PATTERN='.*(ghost|fifo|unlink|memfd|shmem|socket_queue).*'
-	./test/zdtm.py run --stream -p 2 --keep-going -T $STREAM_TEST_PATTERN $ZDTM_OPTS
+	# shellcheck disable=SC2086
+	./test/zdtm.py run --stream -p 2 --keep-going -T "$STREAM_TEST_PATTERN" $ZDTM_OPTS
 }
 
 travis_prep
@@ -109,7 +111,7 @@ fi
 
 ulimit -c unlimited
 
-echo "|`pwd`/test/abrt.sh %P %p %s %e" > /proc/sys/kernel/core_pattern
+echo "|$(pwd)/test/abrt.sh %P %p %s %e" > /proc/sys/kernel/core_pattern
 
 if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	# Dirty hack to keep both ia32 & x86_64 shared libs on a machine:
@@ -124,20 +126,21 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 
 	mkdir "$REFUGE"
 	for i in $INCOMPATIBLE_LIBS ; do
-		for j in $(dpkg --listfiles $i | grep '\.so$') ; do
+		for j in $(dpkg --listfiles "$i" | grep '\.so$') ; do
 			cp "$j" "$REFUGE/"
 		done
 		IA32_PKGS="$IA32_PKGS $i:i386"
 	done
+	# shellcheck disable=SC2086
 	apt-get remove $INCOMPATIBLE_LIBS
-	scripts/travis/apt-install $IA32_PKGS
+	scripts/travis/apt-install "$IA32_PKGS"
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi
 
 time make CC="$CC" -j4 -C test/zdtm
 
-[ -f "$CCACHE_LOGFILE" ] && cat $CCACHE_LOGFILE
+[ -f "$CCACHE_LOGFILE" ] && cat "$CCACHE_LOGFILE"
 
 # umask has to be called before a first criu run, so that .gcda (coverage data)
 # files are created with read-write permissions for all.
@@ -166,11 +169,12 @@ if [ "${STREAM_TEST}" = "1" ]; then
 	exit 0
 fi
 
+# shellcheck disable=SC2086
 ./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
 
-KERN_MAJ=`uname -r | cut -d. -f1`
-KERN_MIN=`uname -r | cut -d. -f2`
-if [ $KERN_MAJ -ge "4" ] && [ $KERN_MIN -ge "18" ]; then
+KERN_MAJ=$(uname -r | cut -d. -f1)
+KERN_MIN=$(uname -r | cut -d. -f2)
+if [ "$KERN_MAJ" -ge "4" ] && [ "$KERN_MIN" -ge "18" ]; then
 	LAZY_EXCLUDE="-x cmdlinenv00 -x maps007"
 else
 	LAZY_EXCLUDE="-x maps007 -x fork -x fork2 -x uffd-events -x cgroupns
@@ -179,12 +183,12 @@ else
 fi
 LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps04"
 
-LAZY_TESTS=.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*
+LAZY_TESTS='.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*'
 LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 
-./test/zdtm.py run $LAZY_OPTS --lazy-pages
-./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages
-./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
+./test/zdtm.py run "$LAZY_OPTS" --lazy-pages
+./test/zdtm.py run "$LAZY_OPTS" --remote-lazy-pages
+./test/zdtm.py run "$LAZY_OPTS" --remote-lazy-pages --tls
 
 bash ./test/jenkins/criu-fault.sh
 bash ./test/jenkins/criu-fcg.sh

From fd7b6e73d65dabe99c974fc9042f093c85a5fb22 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 21 Sep 2020 12:59:54 +0000
Subject: [PATCH 0358/1854] CI: run cross compile on all branches

The github action based cross compile tests are only running when
pushing to master or criu-dev. This changes this to have it run on all
branches. Useful to have all CI tests running on personal CRIU checkouts
on branches with other names.

If I prepare a branch to create a new pull request, the cross compile
tests have not been running if my branch has another name than criu-dev
or master. With this change these tests will run on all branches.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/cross-compile.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 98cf6f77f..3b007cdd0 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -1,10 +1,6 @@
 name: Cross Compile Tests
 
-on:
-  push:
-    branches: [criu-dev, master]
-  pull_request:
-    branches: [criu-dev, master]
+on: [push, pull_request]
 
 jobs:
   build:

From 9ba9d6706fedccaf6c5c1d49c1ad3260459bf4e6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 26 Sep 2020 11:25:24 +0300
Subject: [PATCH 0359/1854] tcp: dump shutdown state for unconnected sockets

There is no direct way to get this state but we can get polling events
for a socket and guess its shutdown state.

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sk-inet.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 42bae9454..d90c53b17 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <linux/icmp.h>
 #include <linux/icmpv6.h>
+#include <poll.h>
 
 #include "../soccr/soccr.h"
 
@@ -225,6 +226,31 @@ static int dump_sockaddr(union libsoccr_addr *sa, u32 *pb_port, u32 *pb_addr)
 	return -1;
 }
 
+/*
+ * There is no direct way to get shutdown state for unconnected sockets,
+ * but we can get it indirectly from polling events for a socket.
+ */
+static int dump_tcp_uncon_shutdown(int lfd, struct inet_sk_desc *sk)
+{
+	struct pollfd pfd = {.fd = lfd, .events = POLLRDHUP | POLLHUP};
+
+	if (poll(&pfd, 1, 0) != 1) {
+		pr_perror("Unable to poll the socket");
+		return -1;
+	}
+
+	sk->shutdown = 0;
+
+	if ((pfd.revents & POLLHUP) == 0)
+		return 0;
+
+	if (pfd.revents & POLLRDHUP)
+		sk->shutdown |= SK_SHUTDOWN__READ;
+
+	return 0;
+}
+
+
 static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p,
 					 int proto, int family, int type)
 {
@@ -300,6 +326,9 @@ static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p,
 		}
 
 		sk->wqlen = info.tcpi_backoff;
+
+		if (dump_tcp_uncon_shutdown(lfd, sk))
+			goto err;
 	}
 
 	sk->state = TCP_CLOSE;
@@ -552,6 +581,8 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 	switch (proto) {
 	case IPPROTO_TCP:
 		err = (type != SOCK_RAW) ? dump_one_tcp(lfd, sk, &skopts) : 0;
+		if (sk->shutdown)
+			sk_encode_shutdown(&ie, sk->shutdown);
 		break;
 	case IPPROTO_UDP:
 	case IPPROTO_UDPLITE:
@@ -902,7 +933,7 @@ done:
 
 	if (ie->has_shutdown &&
 	    (ie->proto == IPPROTO_UDP ||
-	     ie->proto == IPPROTO_UDPLITE)) {
+	     ie->proto == IPPROTO_UDPLITE || ie->proto == IPPROTO_TCP)) {
 		if (shutdown(sk, sk_decode_shutdown(ie->shutdown))) {
 			if (ie->state != TCP_CLOSE && errno != ENOTCONN) {
 				pr_perror("Can't shutdown socket into %d",

From 9acca8df9b79e7967fca6e71a5c84013d531c2a2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 26 Sep 2020 11:08:27 +0300
Subject: [PATCH 0360/1854] tcp: add a separate test for listen sockets

In addition, it checks that an unconnected socket can be connected after
C/R.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/lib/tcp.c                  |   9 +-
 test/zdtm/lib/zdtmtst.h              |   1 +
 test/zdtm/static/Makefile            |   1 +
 test/zdtm/static/socket-tcp-listen.c | 149 +++++++++++++++++++++++++++
 4 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/static/socket-tcp-listen.c

diff --git a/test/zdtm/lib/tcp.c b/test/zdtm/lib/tcp.c
index e753e3c8a..03862b24c 100644
--- a/test/zdtm/lib/tcp.c
+++ b/test/zdtm/lib/tcp.c
@@ -107,12 +107,19 @@ int tcp_accept_server(int sock)
 int tcp_init_client(int family, char *servIP, unsigned short servPort)
 {
 	int sock;
-	union sockaddr_inet servAddr;
 
 	if ((sock = socket(family, SOCK_STREAM, IPPROTO_TCP)) < 0) {
 		pr_perror("can't create socket");
 		return -1;
 	}
+
+	return tcp_init_client_with_fd(sock, family, servIP, servPort);
+}
+
+int tcp_init_client_with_fd(int sock, int family, char *servIP, unsigned short servPort)
+{
+	union sockaddr_inet servAddr;
+
 	/* Construct the server address structure */
 	memset(&servAddr, 0, sizeof(servAddr));
 	if (family == AF_INET) {
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index 6eec26647..b5714ce7b 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -148,6 +148,7 @@ extern void task_waiter_complete_current(task_waiter_t *t);
 extern int tcp_init_server(int family, int *port);
 extern int tcp_accept_server(int sock);
 extern int tcp_init_client(int family, char *servIP, unsigned short servPort);
+extern int tcp_init_client_with_fd(int sock, int family, char *servIP, unsigned short servPort);
 
 struct sockaddr_un;
 extern int unix_fill_sock_name(struct sockaddr_un *name, char *relFilename);
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ee9b57abe..6adf2f0f1 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -69,6 +69,7 @@ TST_NOFILE	:=				\
 		socket_queues			\
 		socket-raw			\
 		socket-tcp			\
+		socket-tcp-listen		\
 		socket-tcp-reseted		\
 		socket-tcp6			\
 		socket-tcp4v6			\
diff --git a/test/zdtm/static/socket-tcp-listen.c b/test/zdtm/static/socket-tcp-listen.c
new file mode 100644
index 000000000..ab43fe01c
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-listen.c
@@ -0,0 +1,149 @@
+#include "zdtmtst.h"
+
+#ifdef ZDTM_IPV4V6
+#define ZDTM_FAMILY AF_INET
+#define ZDTM_SRV_FAMILY AF_INET6
+#elif defined(ZDTM_IPV6)
+#define ZDTM_FAMILY AF_INET6
+#define ZDTM_SRV_FAMILY AF_INET6
+#else
+#define ZDTM_FAMILY AF_INET
+#define ZDTM_SRV_FAMILY AF_INET
+#endif
+
+const char *test_doc = "Check, that a TCP listen socket can be dumped and restored\n";
+const char *test_author = "Andrey Vagin <avagin@parallels.com";
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sched.h>
+#include <netinet/tcp.h>
+
+static int port = 8880;
+
+#define BUF_SIZE 4096
+
+int read_data(int fd, unsigned char *buf, int size)
+{
+	int cur = 0;
+	int ret;
+	while (cur != size) {
+		ret = read(fd, buf + cur, size - cur);
+		if (ret <= 0)
+			return -1;
+		cur += ret;
+	}
+
+	return 0;
+}
+
+int write_data(int fd, const unsigned char *buf, int size)
+{
+	int cur = 0;
+	int ret;
+
+	while (cur != size) {
+		ret = write(fd, buf + cur, size - cur);
+		if (ret <= 0)
+			return -1;
+		cur += ret;
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	unsigned char buf[BUF_SIZE];
+	int fd, fd_s, clt;
+	uint32_t crc;
+	int val;
+	socklen_t optlen;
+
+
+	test_init(argc, argv);
+
+	if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
+		pr_err("initializing server failed\n");
+		return 1;
+	}
+
+	/*
+	 *  Create a client socket before C/R to check that it can be connected
+	 *  after.
+	 */
+	clt = socket(ZDTM_FAMILY, SOCK_STREAM, 0);
+	if (clt < 0) {
+		pr_perror("socket");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	clt = tcp_init_client_with_fd(clt, ZDTM_FAMILY, "localhost", port);
+	if (clt  < 0)
+		return 1;
+
+	/*
+	 * parent is server of TCP connection
+	 */
+	fd = tcp_accept_server(fd_s);
+	if (fd < 0) {
+		pr_err("can't accept client connection\n");
+		return 1;
+	}
+
+	val = 1;
+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val))) {
+		pr_perror("setsockopt");
+		return 1;
+	}
+
+	crc = ~0;
+	datagen(buf, BUF_SIZE, &crc);
+	if (write_data(fd, buf, BUF_SIZE)) {
+		pr_perror("can't write");
+		return 1;
+	}
+
+	if (read_data(clt, buf, BUF_SIZE)) {
+		pr_perror("read less then have to");
+		return 1;
+	}
+
+	crc = ~0;
+	if (datachk(buf, BUF_SIZE, &crc))
+		return 2;
+
+	if (write_data(clt, buf, BUF_SIZE)) {
+		pr_perror("can't write");
+		return 1;
+	}
+
+	if (read_data(fd, buf, BUF_SIZE)) {
+		pr_perror("read less then have to");
+		return 1;
+	}
+
+	crc = ~0;
+	if (datachk(buf, BUF_SIZE, &crc))
+		return 2;
+	optlen = sizeof(val);
+	if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, &optlen)) {
+		pr_perror("getsockopt");
+		return 1;
+	}
+	if (val != 1) {
+		fail("SO_REUSEADDR are not set for %d\n", fd);
+		return 1;
+	}
+
+	pass();
+	return 0;
+}

From 3ef2c1ff8778d8b6be40fdd341c76280790c11d2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 28 Sep 2020 09:53:43 +0300
Subject: [PATCH 0361/1854] criu: check matching the tcp-close option on
 restore only

If the tcp-close has been set for dump, it has to set for restore too.

But we don't need to require matching of tcp-close for criu lazy-pages.

Reported-by: Mr Travis
---
 criu/cr-restore.c      | 2 +-
 criu/image.c           | 6 +++---
 criu/include/crtools.h | 2 +-
 criu/pstree.c          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 641ac4a65..589087f9f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2526,7 +2526,7 @@ int cr_restore_tasks(void)
 	if (cr_plugin_init(CR_PLUGIN_STAGE__RESTORE))
 		return -1;
 
-	if (check_img_inventory() < 0)
+	if (check_img_inventory(/* restore = */ true) < 0)
 		goto err;
 
 	if (init_stats(RESTORE_STATS))
diff --git a/criu/image.c b/criu/image.c
index d4ad7a79e..6ba2ffc7d 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -26,7 +26,7 @@ TaskKobjIdsEntry *root_ids;
 u32 root_cg_set;
 Lsmtype image_lsm;
 
-int check_img_inventory(void)
+int check_img_inventory(bool restore)
 {
 	int ret = -1;
 	struct cr_img *img;
@@ -81,8 +81,8 @@ int check_img_inventory(void)
 		goto out_err;
 	}
 
-	if (he->tcp_close && !opts.tcp_close) {
-		pr_err("Need to set the --tcp-close option.");
+	if (restore && he->tcp_close && !opts.tcp_close) {
+		pr_err("Need to set the --tcp-close options.\n");
 		goto out_err;
 	}
 
diff --git a/criu/include/crtools.h b/criu/include/crtools.h
index c5a5b6499..740bf1737 100644
--- a/criu/include/crtools.h
+++ b/criu/include/crtools.h
@@ -10,7 +10,7 @@
 
 #define CR_FD_PERM		(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
 
-extern int check_img_inventory(void);
+extern int check_img_inventory(bool restore);
 extern int write_img_inventory(InventoryEntry *he);
 extern int inventory_save_uptime(InventoryEntry *he);
 extern InventoryEntry *get_parent_inventory(void);
diff --git a/criu/pstree.c b/criu/pstree.c
index f9478bb0a..a876615fb 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -997,7 +997,7 @@ int prepare_dummy_pstree(void)
 {
 	pid_t dummy = 0;
 
-	if (check_img_inventory() == -1)
+	if (check_img_inventory(/* restore = */ false) == -1)
 		return -1;
 
 	if (prepare_task_entries() == -1)

From f7bd7057355494077605fc5d34f3a37d9577fc8d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 29 Sep 2020 17:47:51 +0300
Subject: [PATCH 0362/1854] servicefd: close temporary fd on error path

We can have tmp != sfd if fcntl(F_DUPFD) sees that sfd is already used,
but tmp is left open on this error path, lets close it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/servicefd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/servicefd.c b/criu/servicefd.c
index dc423895b..2533f6168 100644
--- a/criu/servicefd.c
+++ b/criu/servicefd.c
@@ -178,6 +178,7 @@ int install_service_fd(enum sfd_type type, int fd)
 		return -1;
 	} else if (tmp != sfd) {
 		pr_err("%s busy target %d -> %d\n", sfd_type_name(type), fd, sfd);
+		close(tmp);
 		close(fd);
 		return -1;
 	}

From 97ab725db1262e2bd9a5d3712bcd57e343ca6466 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 12 Sep 2020 17:12:38 +0530
Subject: [PATCH 0363/1854] zdtm: adding BPF helper functions as a new library

This commit adds BPF helper functions needed by tests in a new library.
It defines new functions that allow verifying BPF map meta-data from
the procfs as well as using the bpf() system call with
BPF_OBJ_GET_INFO_BY_FD. It is necessary to verify from procfs and using
BPF_OBJ_GET_INFO_BY_FD because the information available from both
these places is disjoint (for example, checking whether a map is frozen
cannot be performed with BPF_OBJ_GET_INFO_BY_FD).

Source files modified:

* test/zdtm/lib/Makefile - Generating build artifacts

Source files added:

* test/zdtm/lib/bpfmap_zdtm.c - Provides definitions for 3 new
functions:
    (a) parse_bpfmap_fdinfo() - Parses information about the BPF map
    from procfs
    (b) cmp_bpf_map_info() - Compares the attributes of a BPF map file
    obtained from BPF_OBJ_GET_INFO_BY_FD. This function is typically
    used to verify that the attributes of a BPF map remain the same
    before checkpoint and after restore
    (c) cmp_bpfmap_fdinfo() - Compares the attributes of a BPF map file
    obtained from procfs. This function is typically used to verify
    that the attributes of a BPF map remain the same before checkpoint
    and after restore

* test/zdtm/lib/bpfmap_zdtm.h - Structure and function declarations.
Declares struct bpfmap_fdinfo_obj, which stores information about BPF
maps parsed from procfs

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 test/zdtm/lib/Makefile      |   6 ++
 test/zdtm/lib/bpfmap_zdtm.c | 126 ++++++++++++++++++++++++++++++++++++
 test/zdtm/lib/bpfmap_zdtm.h |  21 ++++++
 3 files changed, 153 insertions(+)
 create mode 100644 test/zdtm/lib/bpfmap_zdtm.c
 create mode 100644 test/zdtm/lib/bpfmap_zdtm.h

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index 89ca90933..05fe64e91 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -5,6 +5,12 @@ CFLAGS	+= $(USERCFLAGS)
 LIB	:= libzdtmtst.a
 
 LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
+
+pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
+ifeq ($(call pkg-config-check,libbpf),y)
+LIBSRC	+= bpfmap_zdtm.c
+endif
+
 LIBOBJ	:= $(LIBSRC:%.c=%.o)
 
 BIN	:= groups
diff --git a/test/zdtm/lib/bpfmap_zdtm.c b/test/zdtm/lib/bpfmap_zdtm.c
new file mode 100644
index 000000000..35d82ac63
--- /dev/null
+++ b/test/zdtm/lib/bpfmap_zdtm.c
@@ -0,0 +1,126 @@
+#include "bpfmap_zdtm.h"
+
+int parse_bpfmap_fdinfo(int fd, struct bpfmap_fdinfo_obj *obj, uint32_t expected_to_meet)
+{
+	uint32_t met = 0;
+	char str[512];
+	FILE *f;
+
+	sprintf(str, "/proc/self/fdinfo/%d", fd);
+	f = fopen(str, "r");
+	if (!f) {
+		pr_perror("Can't open fdinfo to parse");
+		return -1;
+	}
+
+	while (fgets(str, sizeof(str), f)) {
+		if (fdinfo_field(str, "map_type")) {
+			if (sscanf(str, "map_type: %u", &obj->map_type) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "key_size")) {
+			if (sscanf(str, "key_size: %u", &obj->key_size) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "value_size")) {
+			if (sscanf(str, "value_size: %u", &obj->value_size) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "max_entries")) {
+			if (sscanf(str, "max_entries: %u", &obj->max_entries) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "map_flags")) {
+			if (sscanf(str, "map_flags: %"PRIx32"", &obj->map_flags) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "memlock")) {
+			if (sscanf(str, "memlock: %"PRIu64"", &obj->memlock) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "map_id")) {
+			if (sscanf(str, "map_id: %u", &obj->map_id) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+		if (fdinfo_field(str, "frozen")) {
+			if (sscanf(str, "frozen: %d", &obj->frozen) != 1)
+				goto parse_err;
+			met++;
+			continue;
+		}
+	}
+
+	if (expected_to_meet != met) {
+		pr_err("Expected to meet %d entries but got %d\n", expected_to_meet, met);
+		return -1;
+	}
+
+	fclose(f);
+	return 0;
+
+parse_err:
+	pr_perror("Can't parse '%s'", str);
+	fclose(f);
+	return -1;
+}
+
+int cmp_bpf_map_info(struct bpf_map_info *old, struct bpf_map_info *new)
+{
+	/*
+	 * We skip the check for old->id and new->id because every time a new BPF
+	 * map is created, it is internally allocated a new map id. Therefore,
+	 * the new BPF map created by CRIU (during restore) will have a different
+	 * map id than the old one
+	 */
+	if ((old->type != new->type)				||
+	    (old->key_size != new->key_size)			||
+	    (old->value_size != new->value_size)		||
+	    (old->max_entries != new->max_entries)		||
+	    (old->map_flags != new->map_flags)			||
+	    (old->ifindex != new->ifindex)			||
+	    (old->netns_dev != new->netns_dev)			||
+	    (old->netns_ino != new->netns_ino)			||
+	    (old->btf_id != new->btf_id)			||
+	    (old->btf_key_type_id != new->btf_key_type_id)	||
+	    (old->btf_value_type_id != new->btf_value_type_id))
+		return -1;
+
+	if (strcmp(old->name, new->name) != 0)
+		return -1;
+
+	return 0;
+}
+
+int cmp_bpfmap_fdinfo(struct bpfmap_fdinfo_obj *old, struct bpfmap_fdinfo_obj *new)
+{
+	/*
+	 * We skip the check for old->map_id and new->map_id because every time a
+	 * new BPF map is created, it is internally allocated a new map id. Therefore,
+	 * the new BPF map created by CRIU (during restore) will have a different map
+	 * id than the old one
+	 */
+	if ((old->map_type != new->map_type)		||
+	    (old->key_size != new->key_size)		||
+	    (old->value_size != new->value_size)	||
+	    (old->max_entries != new->max_entries)	||
+	    (old->map_flags != new->map_flags)		||
+	    (old->memlock != new->memlock)		||
+	    (old->frozen != new->frozen))
+		return -1;
+
+	return 0;
+} 
\ No newline at end of file
diff --git a/test/zdtm/lib/bpfmap_zdtm.h b/test/zdtm/lib/bpfmap_zdtm.h
new file mode 100644
index 000000000..b8b1ecd0b
--- /dev/null
+++ b/test/zdtm/lib/bpfmap_zdtm.h
@@ -0,0 +1,21 @@
+#include <bpf/bpf.h>
+#include <inttypes.h>
+
+#include "zdtmtst.h"
+
+#define fdinfo_field(str, field)	!strncmp(str, field":", sizeof(field))
+
+struct bpfmap_fdinfo_obj {
+	uint32_t	map_type;
+	uint32_t	key_size;
+	uint32_t	value_size;
+	uint32_t	max_entries;
+	uint32_t	map_flags;
+	uint64_t	memlock;
+	uint32_t	map_id;
+	uint32_t	frozen;
+};
+
+extern int parse_bpfmap_fdinfo(int, struct bpfmap_fdinfo_obj *, uint32_t);
+extern int cmp_bpf_map_info(struct bpf_map_info *, struct bpf_map_info *);
+extern int cmp_bpfmap_fdinfo(struct bpfmap_fdinfo_obj *, struct bpfmap_fdinfo_obj *);
\ No newline at end of file

From 02f7e3434d8ab8e536eaadd4b0e01b9b293e902f Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 12 Sep 2020 17:31:40 +0530
Subject: [PATCH 0364/1854] images: adding support for BPF map file name and
 ifindex

This commit adds a BPF map's name and ifindex to its protobuf image.
ifindex is the index of the network interface to which the BPF map is
attached and can be specified via a parameter while creating the BPF
map (BPF_MAP_CREATE). This commit also provides a default value of
false to the field 'frozen'.

Source files modified:

* images/bpfmap-file.proto

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 images/bpfmap-file.proto | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/images/bpfmap-file.proto b/images/bpfmap-file.proto
index ae789aa72..6560bb646 100644
--- a/images/bpfmap-file.proto
+++ b/images/bpfmap-file.proto
@@ -15,6 +15,8 @@ message bpfmap_file_entry {
 	required uint32		max_entries	= 9;
 	required uint32		map_flags	= 10;
 	required uint64		memlock		= 11;
-	required bool		frozen		= 12;
-	optional sint32		mnt_id		= 13 [default = -1];
+	required bool		frozen		= 12 [default = false];
+	required string		map_name	= 13;
+	required uint32		ifindex		= 14 [default = 0];
+	optional sint32		mnt_id		= 15 [default = -1];
 }

From 8301c7e012109dd14fbbe52da73c75f131a2e46d Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 12 Sep 2020 17:40:37 +0530
Subject: [PATCH 0365/1854] criu: adding support for BPF map name, ifindex and
 freeze

This commit achieves the following:
a) C/R of a BPF map's name as well as ifindex (index of the network
interface to which the map is attached). This information is not
available from procfs and therefore has to be obtained using the
bpf() system call with BPF_OBJ_GET_INFO_BY_FD.
b) Adds support for frozen maps - during the restore operation, CRIU
now freezes a BPF map that was frozen during checkpoint.

Source files modified:

* bpfmap.c

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 criu/bpfmap.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index dc8edb09c..dfa0ab96f 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -230,11 +230,19 @@ static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 {
 	BpfmapFileEntry bpf = BPFMAP_FILE_ENTRY__INIT;
 	FileEntry fe = FILE_ENTRY__INIT;
+	struct bpf_map_info map_info;
+	uint32_t info_len = sizeof(struct bpf_map_info);
 	int ret;
 
 	if (parse_fdinfo(lfd, FD_TYPES__BPFMAP, &bpf))
 		return -1;
 
+	ret = bpf_obj_get_info_by_fd(lfd, &map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get BPF map info");
+		return -1;
+	}
+
 	switch (bpf.map_type) {
 
 		case BPF_MAP_TYPE_HASH:
@@ -242,6 +250,8 @@ static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 			bpf.id = id;
 			bpf.flags = p->flags;
 			bpf.fown = (FownEntry *)&p->fown;
+			bpf.map_name = xstrdup(map_info.name);
+			bpf.ifindex = map_info.ifindex;
 
 			fe.type = FD_TYPES__BPFMAP;
 			fe.id = bpf.id;
@@ -272,14 +282,27 @@ static int bpfmap_open(struct file_desc *d, int *new_fd)
 {
 	struct bpfmap_file_info *info;
 	BpfmapFileEntry *bpfe;
+	struct bpf_create_map_attr xattr;
 	int bpfmap_fd;
 
 	info = container_of(d, struct bpfmap_file_info, d);
 	bpfe = info->bpfe;
 
+	xattr.name = xstrdup(bpfe->map_name);
+	xattr.map_type = bpfe->map_type;
+	xattr.map_flags = bpfe->map_flags;
+	xattr.key_size = bpfe->key_size;
+	xattr.value_size = bpfe->value_size;
+	xattr.max_entries = bpfe->max_entries;
+	xattr.numa_node = 0;
+	xattr.btf_fd = 0;
+	xattr.btf_key_type_id = 0;
+	xattr.btf_value_type_id = 0;
+	xattr.map_ifindex = bpfe->ifindex;
+	xattr.inner_map_fd = 0;
+
 	pr_info_bpfmap("Creating and opening ", bpfe);
-	bpfmap_fd = bpf_create_map(bpfe->map_type, bpfe->key_size,
-						bpfe->value_size, bpfe->max_entries, bpfe->map_flags);
+	bpfmap_fd = bpf_create_map_xattr(&xattr);
 	if (bpfmap_fd < 0) {
 		pr_perror("Can't create bpfmap %#08x", bpfe->id);
 		return -1;
@@ -288,6 +311,13 @@ static int bpfmap_open(struct file_desc *d, int *new_fd)
 	if (restore_bpfmap_data(bpfmap_fd, bpfe->map_id, bpfmap_data_hash_table))
 		return -1;
 
+	if (bpfe->frozen) {
+		if (bpf_map_freeze(bpfmap_fd)) {
+			pr_perror("Can't freeze bpfmap %#08x", bpfe->id);
+			goto err_close;
+		}
+	}
+
 	if (rst_file_params(bpfmap_fd, bpfe->fown, bpfe->flags)) {
 		pr_perror("Can't restore params on bpfmap %#08x", bpfe->id);
 		goto err_close;

From 82cd3bb0d004280c2e84865372dab8ecbb6720f3 Mon Sep 17 00:00:00 2001
From: Abhishek Vijeev <abhishek.vijeev@gmail.com>
Date: Sat, 12 Sep 2020 18:05:28 +0530
Subject: [PATCH 0366/1854] zdtm: update and refactor tests for BPF array and
 hash maps

This commit achieves the following:
a) Refactors ZDTM tests bpf_array.c and bpf_hash.c to make use of the
BPF ZDTM library functions. In addition, these tests now verify whether
information obtained from both procfs and BPF_OBJ_GET_INFO_BY_FD are
the same before and after c/r.
b) Updates ZDTM tests bpf_array.c and bpf_hash.c to include a BPF map's
name and also to freeze maps

Source files modified:

* zdtm/static/bpf_array.c
* zdtm/static/bpf_hash.c

Source files added:

* zdtm/static/bpf_array.desc
* zdtm/static/bpf_hash.desc

Note: ${test_name}.desc files have the 'suid' flag set because
BPF_MAP_FREEZE requires the global (root-userns) CAP_SYS_ADMIN or
CAP_BPF. Hence, only test flavors 'h' and 'ns' are executed ('uns'
is skipped) because BPF_MAP_FREEZE can't be used from non-root user
namespaces.

Signed-off-by: Abhishek Vijeev <abhishek.vijeev@gmail.com>
---
 test/zdtm/static/bpf_array.c    | 58 +++++++++++++++++++-----------
 test/zdtm/static/bpf_array.desc |  1 +
 test/zdtm/static/bpf_hash.c     | 62 ++++++++++++++++++++-------------
 test/zdtm/static/bpf_hash.desc  |  1 +
 4 files changed, 78 insertions(+), 44 deletions(-)
 create mode 100644 test/zdtm/static/bpf_array.desc
 create mode 100644 test/zdtm/static/bpf_hash.desc

diff --git a/test/zdtm/static/bpf_array.c b/test/zdtm/static/bpf_array.c
index 4019d45d2..6f4827413 100644
--- a/test/zdtm/static/bpf_array.c
+++ b/test/zdtm/static/bpf_array.c
@@ -3,6 +3,7 @@
 #include <sys/mman.h>
 
 #include "zdtmtst.h"
+#include "bpfmap_zdtm.h"
 
 const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_ARRAY"
 							"is correctly restored";
@@ -58,9 +59,13 @@ int main(int argc, char **argv)
 	int *keys = NULL, *values = NULL, *visited = NULL;
 	const uint32_t max_entries = 10;
 	int ret;
-	struct bpf_map_info map_info = {};
-	uint32_t info_len = sizeof(map_info);
+	struct bpf_map_info old_map_info = {};
+	struct bpf_map_info new_map_info = {};
+	struct bpfmap_fdinfo_obj old_fdinfo = {};
+	struct bpfmap_fdinfo_obj new_fdinfo = {};
+	uint32_t info_len = sizeof(struct bpf_map_info);
 	struct bpf_create_map_attr xattr = {
+		.name = "array_test_map",
 		.map_type = BPF_MAP_TYPE_ARRAY,
 		.key_size = sizeof(int),
 		.value_size = sizeof(int),
@@ -95,34 +100,47 @@ int main(int argc, char **argv)
 	if (map_batch_update(map_fd, max_entries, keys, values))
 		goto err;
 
+	ret = bpf_map_freeze(map_fd);
+	if (ret) {
+		pr_perror("Could not freeze map");
+		goto err;
+	}
+
+	ret = bpf_obj_get_info_by_fd(map_fd, &old_map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get old map info");
+		goto err;
+	}
+
+	ret = parse_bpfmap_fdinfo(map_fd, &old_fdinfo, 8);
+	if (ret) {
+		pr_perror("Could not parse old map fdinfo from procfs");
+		goto err;
+	}
+
 	test_daemon();
 
 	test_waitsig();
 
-	ret = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
+	ret = bpf_obj_get_info_by_fd(map_fd, &new_map_info, &info_len);
 	if (ret) {
-		pr_perror("Could not get map info");
+		pr_perror("Could not get new map info");
+		goto err;
+	}
+
+	ret = parse_bpfmap_fdinfo(map_fd, &new_fdinfo, 8);
+	if (ret) {
+		pr_perror("Could not parse new map fdinfo from procfs");
 		goto err;
 	}
 	
-	if (map_info.type != BPF_MAP_TYPE_ARRAY) {
-		pr_err("Map type should be BPF_MAP_TYPE_ARRAY\n");
+	if (cmp_bpf_map_info(&old_map_info, &new_map_info)) {
+		pr_err("bpf_map_info mismatch\n");
 		goto err;
 	}
-	if (map_info.key_size != sizeof(*keys)) {
-		pr_err("Key size should be %zu\n", sizeof(*keys));
-		goto err;
-	}
-	if (map_info.value_size != sizeof(*values)) {
-		pr_err("Value size should be %zu\n", sizeof(*values));
-		goto err;
-	}
-	if (map_info.max_entries != max_entries) {
-		pr_err("Max entries should be %d\n", max_entries);
-		goto err;
-	}
-	if (!(map_info.map_flags & BPF_F_NUMA_NODE)) {
-		pr_err("Map flag BPF_F_NUMA_NODE should be set\n");
+
+	if (cmp_bpfmap_fdinfo(&old_fdinfo, &new_fdinfo)) {
+		pr_err("bpfmap fdinfo mismatch\n");
 		goto err;
 	}
 
diff --git a/test/zdtm/static/bpf_array.desc b/test/zdtm/static/bpf_array.desc
new file mode 100644
index 000000000..fd8edd25d
--- /dev/null
+++ b/test/zdtm/static/bpf_array.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns', 'flags': 'suid'}
\ No newline at end of file
diff --git a/test/zdtm/static/bpf_hash.c b/test/zdtm/static/bpf_hash.c
index f1cf667b5..ad983dcbb 100644
--- a/test/zdtm/static/bpf_hash.c
+++ b/test/zdtm/static/bpf_hash.c
@@ -3,6 +3,7 @@
 #include <sys/mman.h>
 
 #include "zdtmtst.h"
+#include "bpfmap_zdtm.h"
 
 const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_HASH"
 							"is correctly restored";
@@ -57,9 +58,13 @@ int main(int argc, char **argv)
 	int *keys = NULL, *values = NULL, *visited = NULL;
 	const uint32_t max_entries = 10;
 	int ret;
-	struct bpf_map_info map_info = {};
-	uint32_t info_len = sizeof(map_info);
+	struct bpf_map_info old_map_info = {};
+	struct bpf_map_info new_map_info = {};
+	struct bpfmap_fdinfo_obj old_fdinfo = {};
+	struct bpfmap_fdinfo_obj new_fdinfo = {};
+	uint32_t info_len = sizeof(struct bpf_map_info);
 	struct bpf_create_map_attr xattr = {
+		.name = "hash_test_map",
 		.map_type = BPF_MAP_TYPE_HASH,
 		.key_size = sizeof(int),
 		.value_size = sizeof(int),
@@ -94,38 +99,47 @@ int main(int argc, char **argv)
 	if (map_batch_update(map_fd, max_entries, keys, values))
 		goto err;
 
+	ret = bpf_map_freeze(map_fd);
+	if (ret) {
+		pr_perror("Could not freeze map");
+		goto err;
+	}
+
+	ret = bpf_obj_get_info_by_fd(map_fd, &old_map_info, &info_len);
+	if (ret) {
+		pr_perror("Could not get old map info");
+		goto err;
+	}
+
+	ret = parse_bpfmap_fdinfo(map_fd, &old_fdinfo, 8);
+	if (ret) {
+		pr_perror("Could not parse old map fdinfo from procfs");
+		goto err;
+	}
+
 	test_daemon();
 
 	test_waitsig();
 
-	ret = bpf_obj_get_info_by_fd(map_fd, &map_info, &info_len);
+	ret = bpf_obj_get_info_by_fd(map_fd, &new_map_info, &info_len);
 	if (ret) {
-		pr_perror("Could not get map info");
+		pr_perror("Could not get new map info");
+		goto err;
+	}
+
+	ret = parse_bpfmap_fdinfo(map_fd, &new_fdinfo, 8);
+	if (ret) {
+		pr_perror("Could not parse new map fdinfo from procfs");
 		goto err;
 	}
 	
-	if (map_info.type != BPF_MAP_TYPE_HASH) {
-		pr_err("Map type should be BPF_MAP_TYPE_HASH\n");
+	if (cmp_bpf_map_info(&old_map_info, &new_map_info)) {
+		pr_err("bpf_map_info mismatch\n");
 		goto err;
 	}
-	if (map_info.key_size != sizeof(*keys)) {
-		pr_err("Key size should be %zu\n", sizeof(*keys));
-		goto err;
-	}
-	if (map_info.value_size != sizeof(*values)) {
-		pr_err("Value size should be %zu\n", sizeof(*values));
-		goto err;
-	}
-	if (map_info.max_entries != max_entries) {
-		pr_err("Max entries should be %d\n", max_entries);
-		goto err;
-	}
-	if (!(map_info.map_flags & BPF_F_NO_PREALLOC)) {
-		pr_err("Map flag BPF_F_NO_PREALLOC should be set\n");
-		goto err;
-	}
-	if (!(map_info.map_flags & BPF_F_NUMA_NODE)) {
-		pr_err("Map flag BPF_F_NUMA_NODE should be set\n");
+
+	if (cmp_bpfmap_fdinfo(&old_fdinfo, &new_fdinfo)) {
+		pr_err("bpfmap fdinfo mismatch\n");
 		goto err;
 	}
 
diff --git a/test/zdtm/static/bpf_hash.desc b/test/zdtm/static/bpf_hash.desc
new file mode 100644
index 000000000..fd8edd25d
--- /dev/null
+++ b/test/zdtm/static/bpf_hash.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns', 'flags': 'suid'}
\ No newline at end of file

From 59010ad6d5194a457c027858eb380507db26887e Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 06:18:19 +0000
Subject: [PATCH 0367/1854] net: Argument cannot be negative (NEGATIVE_RETURNS)

CID 302719 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)

 img_raw_fd(img) is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/net.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index edca25360..da9751450 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1915,7 +1915,12 @@ static inline int dump_nftables(struct cr_imgset *fds)
 		return -1;
 
 	img = img_from_set(fds, CR_FD_NFTABLES);
-	img_fd = dup(img_raw_fd(img));
+	img_fd = img_raw_fd(img);
+	if (img_fd < 0) {
+		pr_err("Getting raw FD failed\n");
+		goto nft_ctx_free_out;
+	}
+	img_fd = dup(img_fd);
 	if (img_fd < 0) {
 		pr_perror("dup() failed");
 		goto nft_ctx_free_out;

From b893034335efe46c5a688850bd6e6717e7a66e24 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 06:22:36 +0000
Subject: [PATCH 0368/1854] img-streamer: Double close (USE_AFTER_FREE)

CID 302718 (#1 of 1): Double close (USE_AFTER_FREE)
 Calling close(int) closes handle sockfd which has already been closed.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/img-streamer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/img-streamer.c b/criu/img-streamer.c
index e31b17dd9..bcf6e6818 100644
--- a/criu/img-streamer.c
+++ b/criu/img-streamer.c
@@ -73,7 +73,7 @@ int img_streamer_init(const char *image_dir, int mode)
 	mutex_init(img_streamer_fd_lock);
 
 	if (install_service_fd(IMG_STREAMER_FD_OFF, sockfd) < 0)
-		goto err;
+		return -1;
 
 	return 0;
 

From 19365c1e68cc02d0380564a43109f9b6772483ba Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 06:44:41 +0000
Subject: [PATCH 0369/1854] cgroup: Resource leak (RESOURCE_LEAK)

CID 302717 (#2 of 2): Resource leak (RESOURCE_LEAK)
 Variable dirnew going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cgroup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 1f6d57257..ee4eba332 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1906,6 +1906,7 @@ static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controller
 						    cg->path + dirlen + 1);
 				if (!cg->path) {
 					cg->path = prev;
+					xfree(dirnew);
 					return -ENOMEM;
 				}
 				xfree(prev);

From af569ac0178cac195ffbff2486b7a4ec0e7d3ebc Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 06:55:12 +0000
Subject: [PATCH 0370/1854] pagemap: Argument cannot be negative
 (NEGATIVE_RETURNS)

CID 302715 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
 fd is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/pagemap.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/criu/pagemap.c b/criu/pagemap.c
index 58f2850ff..0bf11c365 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -414,10 +414,16 @@ static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vadd
 					int nr, void *buf, unsigned flags)
 {
 	unsigned long len = nr * PAGE_SIZE;
-	int fd = img_raw_fd(pr->pi);
+	int fd;
 	int ret;
 	size_t curr = 0;
 
+	fd = img_raw_fd(pr->pi);
+	if (fd < 0) {
+		pr_err("Getting raw FD failed\n");
+		return -1;
+	}
+
 	pr_debug("\tpr%lu-%u Read page from self %lx/%"PRIx64"\n",
 		 pr->img_id, pr->id, pr->cvaddr, pr->pi_off);
 

From da5a4d6e57c1095836dd51144ab8314c84c2a63a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 06:57:56 +0000
Subject: [PATCH 0371/1854] cgroup: Resource leak (RESOURCE_LEAK)

CID 302714 (#1 of 1): Resource leak (RESOURCE_LEAK)
 Variable dirnew going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cgroup.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index ee4eba332..e7e15bc51 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1884,6 +1884,7 @@ static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controller
 				cg->path = xsprintf("%s%s", newroot, cg->path + cg->cgns_prefix);
 				if (!cg->path) {
 					cg->path = prev;
+					xfree(dirnew);
 					return -ENOMEM;
 				}
 				xfree(prev);

From 4e7e26b702de359d8bcbc71e68f482c91f6cddc2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:05:49 +0000
Subject: [PATCH 0372/1854] files-reg: Resource leak (RESOURCE_LEAK)

CID 302712 (#1 of 1): Resource leak (RESOURCE_LEAK)
 Variable build_id going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/files-reg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 10e5e6263..aed1e73dc 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1619,6 +1619,7 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
 	if (!rfe->build_id) {
 		pr_warn("Build-ID (For validation) could not be set for file %s\n",
 				rfe->name);
+		xfree(build_id);
 		return -1;
 	}
 

From c1ab1a19e16b53219e393d271c0ec3960ee92d7a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:08:49 +0000
Subject: [PATCH 0373/1854] pagemap: Logically dead code (DEADCODE)

CID 302711 (#1 of 1): Logically dead code (DEADCODE)
 Execution cannot reach the expression pr->io_complete inside this statement: if (ret == 0 && pr->io_comp....

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/pagemap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pagemap.c b/criu/pagemap.c
index 0bf11c365..33bce10e3 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -447,7 +447,7 @@ static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vadd
 	if (opts.auto_dedup)
 		pr_warn_once("Can't dedup when streaming images\n");
 
-	if (ret == 0 && pr->io_complete)
+	if (pr->io_complete)
 		ret = pr->io_complete(pr, vaddr, nr);
 
 	pr->pi_off += len;

From 03d66390b0eafff7e346f0f681b6b1533f2d1d26 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:12:15 +0000
Subject: [PATCH 0374/1854] mount: Resource leak (RESOURCE_LEAK)

CID 226486 (#1 of 2): Resource leak (RESOURCE_LEAK)
 Variable mi going out of scope leaks the storage it points to.

CID 226486 (#2 of 2): Resource leak (RESOURCE_LEAK)
 Variable mi going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/mount.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index fd0341e02..5009fe59a 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1484,7 +1484,7 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 
 	mi->mountpoint = xmalloc(len + strlen(path) + 1);
 	if (!mi->mountpoint)
-		return -1;
+		goto err;
 	mi->ns_mountpoint = mi->mountpoint;
 	if (!add_slash)
 		sprintf(mi->mountpoint, "%s%s", root->mountpoint, path);
@@ -1497,7 +1497,7 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 	mi->source = xstrdup(fsname);
 	mi->options = xstrdup("");
 	if (!mi->root || !mi->fsname || !mi->source || !mi->options)
-		return -1;
+		goto err;
 	mi->fstype = find_fstype_by_name(fsname);
 
 	mi->s_dev = mi->s_dev_rt = s_dev;
@@ -1523,6 +1523,10 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n",
 		mi->mountpoint, parent->mountpoint, parent->mnt_id);
 	return 0;
+
+err:
+	mnt_entry_free(mi);
+	return -1;
 }
 
 /* Returns 1 in case of success, -errno in case of mount fail, and 0 on other errors */

From 38246bf554f78a0b6304ec064a0fbf2291997994 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:17:46 +0000
Subject: [PATCH 0375/1854] uffd: Resource leak (RESOURCE_LEAK)

CID 226485 (#1 of 3): Resource leak (RESOURCE_LEAK)
 Variable events going out of scope leaks the storage it points to

CID 226485 (#2 of 3): Resource leak (RESOURCE_LEAK)
 Variable events going out of scope leaks the storage it points to

CID 226485 (#3 of 3): Resource leak (RESOURCE_LEAK)
 Variable events going out of scope leaks the storage it points to

Also changed epoll_prepare() to check return value of epoll_create()
against '< 0' instead if '== -1' to make coverity happy.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/uffd.c | 11 ++++++++---
 criu/util.c |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index 5f4c15a60..a6886ca10 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1421,7 +1421,7 @@ close_uffd:
 
 int cr_lazy_pages(bool daemon)
 {
-	struct epoll_event *events;
+	struct epoll_event *events = NULL;
 	int nr_fds;
 	int lazy_sk;
 	int ret;
@@ -1469,17 +1469,22 @@ int cr_lazy_pages(bool daemon)
 	if (epollfd < 0)
 		return -1;
 
-	if (prepare_uffds(lazy_sk, epollfd))
+	if (prepare_uffds(lazy_sk, epollfd)) {
+		xfree(events);
 		return -1;
+	}
 
 	if (opts.use_page_server) {
-		if (connect_to_page_server_to_recv(epollfd))
+		if (connect_to_page_server_to_recv(epollfd)) {
+			xfree(events);
 			return -1;
+		}
 	}
 
 	ret = handle_requests(epollfd, events, nr_fds);
 
 	tls_terminate_session();
 
+	xfree(events);
 	return ret;
 }
diff --git a/criu/util.c b/criu/util.c
index 111c956d2..a88da8d03 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1289,7 +1289,7 @@ int epoll_prepare(int nr_fds, struct epoll_event **events)
 		return -1;
 
 	epollfd = epoll_create(nr_fds);
-	if (epollfd == -1) {
+	if (epollfd < 0) {
 		pr_perror("epoll_create failed");
 		goto free_events;
 	}

From 2a4c4bf2fceea879c4b889df2d88ff3ce1f98398 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:24:02 +0000
Subject: [PATCH 0376/1854] filesystem: Double close (USE_AFTER_FREE)

CID 226484 (#1 of 1): Double close (USE_AFTER_FREE)
 Calling close(int) closes handle fd which has already been closed.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/filesystems.c | 1 -
 criu/util.c        | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/criu/filesystems.c b/criu/filesystems.c
index d76b18291..fc53f4e5d 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -656,7 +656,6 @@ static int dump_empty_fs(struct mount_info *pm)
 		return fd;
 
 	ret = is_empty_dir(fd);
-	close(fd);
 	if (ret < 0) {
 		pr_err("%s isn't empty\n", pm->fstype->name);
 		return -1;
diff --git a/criu/util.c b/criu/util.c
index a88da8d03..c610da7b3 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -709,6 +709,10 @@ int is_root_user(void)
 	return 1;
 }
 
+/*
+ * is_empty_dir will always close the FD dirfd: either implicitly
+ * via closedir or explicitly in case fdopendir had failed
+ */
 int is_empty_dir(int dirfd)
 {
 	int ret = 0;
@@ -716,8 +720,10 @@ int is_empty_dir(int dirfd)
 	struct dirent *de;
 
 	fdir = fdopendir(dirfd);
-	if (!fdir)
+	if (!fdir) {
+		close_safe(&dirfd);
 		return -1;
+	}
 
 	while ((de = readdir(fdir))) {
 		if (dir_dots(de))

From 90369437f981a105dc87b53eee8d6beeed090f09 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:27:45 +0000
Subject: [PATCH 0377/1854] cgroup-props: Resource leak (RESOURCE_LEAK)

CID 226483 (#1 of 1): Resource leak (RESOURCE_LEAK)
 Variable p going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cgroup-props.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c
index ecd959352..2f628f4ee 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -319,6 +319,7 @@ static int cgp_parse_stream(char *stream, size_t len)
 					  (cgp_entry->cgp.nr_props + 1) * sizeof(char *))) {
 				pr_err("Can't allocate property for controller %s\n",
 				       cgp_entry->cgp.name);
+				xfree(p);
 				goto err_parse;
 			}
 

From 8645648235c9a417fa04500e0219df9f99a1cf50 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:34:40 +0000
Subject: [PATCH 0378/1854] autofs: Resource leak (RESOURCE_LEAK)

CID 226482 (#1 of 1): Resource leak (RESOURCE_LEAK)
 Variable path going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/autofs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/autofs.c b/criu/autofs.c
index 175b8900e..3e93b7b85 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -143,6 +143,7 @@ static int autofs_kernel_pipe_alive(int pgrp, int fd, int ino)
 			return 0;
 		}
 		pr_perror("Failed to stat %s", path);
+		xfree(path);
 		return -1;
 	}
 

From 2ed16451b004521356a0bf6e7c20b049c9c2833d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:51:28 +0000
Subject: [PATCH 0379/1854] proc_parse: Copy into fixed size buffer
 (STRING_OVERFLOW)

CID 226480 (#1 of 1): Copy into fixed size buffer (STRING_OVERFLOW)
 You might overrun the 4096-character fixed-size string root_link.name by copying new->root without checking the length.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/proc_parse.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 7473bcf67..ba60832f4 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1372,6 +1372,10 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 	cure_path(new->root);
 
 	root_link.len = strlen(new->root);
+	if (root_link.len >= sizeof(root_link.name) - 1) {
+		pr_err("new root path (%s) exceeds %zu\n", new->root, sizeof(root_link.name));
+		goto err;
+	}
 	strcpy(root_link.name, new->root);
 	if (strip_deleted(&root_link)) {
 		strcpy(new->root, root_link.name);

From 7e4f50e747fe6d863181b088b07d4db46d140e33 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:54:24 +0000
Subject: [PATCH 0380/1854] irmap: Double close (USE_AFTER_FREE)

CID 226478 (#1 of 2): Double close (USE_AFTER_FREE)
 Calling close(int) closes handle fd which has already been closed.

CID 226478 (#2 of 2): Double close (USE_AFTER_FREE)
 Calling close(int) closes handle fd which has already been closed.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/irmap.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/irmap.c b/criu/irmap.c
index e72984216..58bc055d5 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -125,6 +125,7 @@ static int irmap_update_dir(struct irmap *t)
 	dfd = fdopendir(fd);
 	if (!dfd) {
 		pr_perror("Can't opendir %s", t->path);
+		close(fd);
 		return -1;
 	}
 
@@ -155,14 +156,12 @@ static int irmap_update_dir(struct irmap *t)
 	}
 
 	closedir(dfd);
-	close(fd);
 	t->nr_kids = nr;
 	return 0;
 
 out_err:
 	xfree(t->kids);
 	closedir(dfd);
-	close(fd);
 	return -1;
 }
 

From 0f4b053c18ba29803a8094026def2360f8b42ef1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 07:56:19 +0000
Subject: [PATCH 0381/1854] cr-dump: Resource leak (RESOURCE_LEAK)

CID 226477 (#1 of 1): Resource leak (RESOURCE_LEAK)
 Variable fd_dir going out of scope leaks the storage it points to.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-dump.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 2b4c9ae82..b9d29145c 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -215,8 +215,10 @@ static int collect_fds(pid_t pid, struct parasite_drain_fd **dfds)
 
 			size += PAGE_SIZE;
 			t = xrealloc(*dfds, size);
-			if (!t)
+			if (!t) {
+				closedir(fd_dir);
 				return -1;
+			}
 			*dfds = t;
 		}
 

From 5631e9dca753e1e570bd989fd4fd49b865cb36cc Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 09:18:42 +0000
Subject: [PATCH 0382/1854] action-scripts: Improper use of negative value
 (NEGATIVE_RETURNS)

CID 192963 (#1 of 1): Improper use of negative value (NEGATIVE_RETURNS)
 dup(sk) is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/action-scripts.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index 5337efa64..7a6fa56b7 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -162,10 +162,18 @@ int add_script(char *path)
 
 int add_rpc_notify(int sk)
 {
+	int fd;
+
+	fd = dup(sk);
+	if (fd < 0) {
+		pr_perror("dup() failed");
+		return -1;
+	}
+
 	BUG_ON(scripts_mode == SCRIPTS_SHELL);
 	scripts_mode = SCRIPTS_RPC;
 
-	if (install_service_fd(RPC_SK_OFF, dup(sk)) < 0)
+	if (install_service_fd(RPC_SK_OFF, fd) < 0)
 		return -1;
 
 	return 0;

From 4a77e0456c651044bc17e0445bce7358be367493 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 09:21:11 +0000
Subject: [PATCH 0383/1854] net: Argument cannot be negative (NEGATIVE_RETURNS)

CID 192961 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
 sockfd is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/net.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/net.c b/criu/net.c
index da9751450..9d58365e2 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2084,6 +2084,10 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 		return 0;
 	}
 	sockfd = img_raw_fd(img);
+	if (sockfd < 0) {
+		pr_err("Getting raw FD failed\n");
+		return -1;
+	}
 	tmp_file = tmpfile();
 	if (!tmp_file) {
 		pr_perror("Failed to open tmpfile");

From 50dbcadf03b38b79adfd551bbc59f497bab65a8b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 10:31:06 +0000
Subject: [PATCH 0384/1854] net: Argument cannot be negative (NEGATIVE_RETURNS)

CID 178391 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
 sk is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index 9d58365e2..4f1f7d47f 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2515,7 +2515,7 @@ int dump_net_ns(struct ns_id *ns)
 		if (!ret)
 			ret = dump_links(sk, ns, fds);
 
-		close(sk);
+		close_safe(&sk);
 
 		if (!ret)
 			ret = dump_ifaddr(fds);

From 4e42278715707c95504da382f8dd064470bf9df4 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 10:37:26 +0000
Subject: [PATCH 0385/1854] kerndat: Argument cannot be negative
 (NEGATIVE_RETURNS)

CID 92720 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
 pfd is passed to a parameter that cannot be negative.

CID 92747 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
 pfd is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/kerndat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 3c84e53fe..b2c47c532 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -460,7 +460,7 @@ static int kerndat_fdinfo_has_lock(void)
 
 	exit_code = 0;
 out:
-	close(pfd);
+	close_safe(&pfd);
 	close(fd);
 
 	return exit_code;

From f0e48be482c1ba1049d3b36dc8468bb4dec0df59 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 10:40:27 +0000
Subject: [PATCH 0386/1854] sk-netlink: Argument cannot be negative
 (NEGATIVE_RETURNS)

CID 73378 (#1 of 1): Argument cannot be negative (NEGATIVE_RETURNS)
 sk is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/sk-netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index c5ff38d32..3b86a7d7b 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -209,7 +209,7 @@ static int open_netlink_sk(struct file_desc *d, int *new_fd)
 	sk = socket(PF_NETLINK, SOCK_RAW, nse->protocol);
 	if (sk < 0) {
 		pr_perror("Can't create netlink sock");
-		goto err;
+		return -1;
 	}
 
 	if (nse->portid) {

From ca7a832b5e2fff9cf3f72a8b25d306bab857834e Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 10:47:31 +0000
Subject: [PATCH 0387/1854] page-xfer: Argument cannot be negative
 (NEGATIVE_RETURNS)

CID 73358 (#2 of 2): Argument cannot be negative (NEGATIVE_RETURNS)
 sk is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/page-xfer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index db8e5bec2..98e9c6b6e 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -1457,7 +1457,7 @@ no_server:
 		return ret > 0 ? 0 : -1;
 
 	if (tls_x509_init(ask, true)) {
-		close(sk);
+		close_safe(&sk);
 		return -1;
 	}
 

From 5f0674075e1ded5e94138b2083f0b13ad0bf1548 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 08:57:07 +0000
Subject: [PATCH 0388/1854] util: Improper use of negative value
 (NEGATIVE_RETURNS)

CID 192968 (#1 of 1): Improper use of negative value (NEGATIVE_RETURNS)
 dup(fd) is passed to a parameter that cannot be negative. [show details]

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/util.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/criu/util.c b/criu/util.c
index c610da7b3..a096f3c19 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -334,7 +334,14 @@ void close_proc(void)
 
 int set_proc_fd(int fd)
 {
-	if (install_service_fd(PROC_FD_OFF, dup(fd)) < 0)
+	int _fd;
+
+	_fd = dup(fd);
+	if (_fd < 0) {
+		pr_perror("dup() failed");
+		return -1;
+	}
+	if (install_service_fd(PROC_FD_OFF, _fd) < 0)
 		return -1;
 	return 0;
 }

From 16aea4a7c9fccc109fcc6da686cd7466c6f00e46 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 09:45:24 +0000
Subject: [PATCH 0389/1854] mount: Explicit null dereferenced (FORWARD_NULL)

CID 181217 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)
 Passing null pointer mntns to mntns_get_root_fd, which dereferences it.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/mount.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/mount.c b/criu/mount.c
index 5009fe59a..25ef7f09e 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3585,6 +3585,10 @@ int mntns_get_root_fd(struct ns_id *mntns)
 {
 	if (!(root_ns_mask & CLONE_NEWNS))
 		return __mntns_get_root_fd(0);
+
+	if (!mntns)
+		return -1;
+
 	/*
 	 * All namespaces are restored from the root task and during the
 	 * CR_STATE_FORKING stage the root task has two file descriptors for

From 867dd27c96f5a44bea50650f68c4d93d8fcf4a80 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Sep 2020 08:43:51 +0000
Subject: [PATCH 0390/1854] util: Improper use of negative value
 (NEGATIVE_RETURNS)

CID 73358 (#1 of 1): Improper use of negative value (NEGATIVE_RETURNS)
 sk is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/util.c b/criu/util.c
index a096f3c19..27751880c 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1139,7 +1139,7 @@ int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk)
 
 	return 0;
 err:
-	close(sk);
+	close_safe(&sk);
 	return -1;
 }
 

From 749eb33a92522d4fff7095b539fc3dc595824eb4 Mon Sep 17 00:00:00 2001
From: Wojciech Marczenko <marczenko@google.com>
Date: Wed, 7 Oct 2020 12:35:49 +0200
Subject: [PATCH 0391/1854] compel: Calculate sh_addr if not provided by linker

GNU ld precalculates this information but lld does not. With this
change, handle-elf.c calculates those addresses on its own.

When calculating addresses sections with SHF_ALLOC bit are put one after
another, respecting their alignment requirements. This matches the way
how the blob is constructed by copying section contents.

Signed-off-by: Wojciech Marczenko <marczenko@google.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/handle-elf.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 9646dd4dc..2319170ae 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -200,6 +200,27 @@ int __handle_elf(void *mem, size_t size)
 		}
 #endif
 	}
+        
+	/* Calculate section addresses with proper alignment.
+	 * Note: some but not all linkers precalculate this information.
+	 */
+	for (i = 0, k = 0; i < hdr->e_shnum; i++) {
+		Elf_Shdr *sh = sec_hdrs[i];
+		if (!(sh->sh_flags & SHF_ALLOC))
+			continue;
+		if (sh->sh_addralign > 0 && k % sh->sh_addralign != 0) {
+			k += sh->sh_addralign - k % sh->sh_addralign;
+		}
+		if (sh->sh_addr && sh->sh_addr != k) {
+			pr_err("Unexpected precalculated address of section (section %s addr 0x%lx expected 0x%lx)\n",
+				   &secstrings[sh->sh_name],
+				   (unsigned long) sh->sh_addr,
+				   (unsigned long) k);
+			goto err;
+		}
+		sh->sh_addr = k;
+		k += sh->sh_size;
+	}
 
 	if (!symtab_hdr) {
 		pr_err("No symbol table present\n");

From 5c4cc46fdc2318fa4a68699cbce59cb37d2ebab5 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Thu, 1 Oct 2020 21:18:40 +0300
Subject: [PATCH 0392/1854] sockets: fix incorrect malloc size

Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/sockets.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index a23383fcc..a73967e72 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -414,12 +414,15 @@ static int restore_socket_filter(int sk, SkOptsEntry *soe)
 
 	pr_info("Restoring socket filter\n");
 	sfp.len = soe->n_so_filter;
-	sfp.filter = xmalloc(soe->n_so_filter * sfp.len);
+	sfp.filter = xmalloc(sfp.len * sizeof(struct sock_filter));
 	if (!sfp.filter)
 		return -1;
 
 	decode_filter(soe->so_filter, sfp.filter, sfp.len);
 	ret = restore_opt(sk, SOL_SOCKET, SO_ATTACH_FILTER, &sfp);
+	if (ret)
+		pr_err("Can't restore filter\n");
+
 	xfree(sfp.filter);
 
 	return ret;

From c7726b7f35d726021e1c10feee265837a7df92f7 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 5 Oct 2020 21:31:26 +0300
Subject: [PATCH 0393/1854] zdtm: add alternative socket filter

A little rework of sock_filter test to be able to use it with different
filters

Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 test/zdtm/static/Makefile                           |  4 +++-
 test/zdtm/static/{sock_filter.c => sock_filter00.c} | 13 +++++++++++++
 test/zdtm/static/sock_filter01.c                    |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)
 rename test/zdtm/static/{sock_filter.c => sock_filter00.c} (89%)
 create mode 120000 test/zdtm/static/sock_filter01.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 6adf2f0f1..aae49832a 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -44,7 +44,8 @@ TST_NOFILE	:=				\
 		packet_sock			\
 		packet_sock_mmap		\
 		packet_sock_spkt		\
-		sock_filter			\
+		sock_filter00			\
+		sock_filter01			\
 		msgque				\
 		inotify_system			\
 		inotify_system_nodel		\
@@ -515,6 +516,7 @@ msgque:			CFLAGS += -DNEW_IPC_NS
 sem:			CFLAGS += -DNEW_IPC_NS
 posix_timers:		LDLIBS += -lrt -pthread
 remap_dead_pid_root:	CFLAGS += -DREMAP_PID_ROOT
+sock_filter01:		CFLAGS += -DSOCK_FILTER01
 socket-tcp6:		CFLAGS += -D ZDTM_IPV6
 socket-tcp4v6:		CFLAGS += -D ZDTM_IPV4V6
 socket-tcpbuf6:		CFLAGS += -D ZDTM_IPV6
diff --git a/test/zdtm/static/sock_filter.c b/test/zdtm/static/sock_filter00.c
similarity index 89%
rename from test/zdtm/static/sock_filter.c
rename to test/zdtm/static/sock_filter00.c
index e2475cd89..7c408220c 100644
--- a/test/zdtm/static/sock_filter.c
+++ b/test/zdtm/static/sock_filter00.c
@@ -15,12 +15,24 @@ const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
 #define SO_GET_FILTER           SO_ATTACH_FILTER
 #endif
 
+#ifdef SOCK_FILTER01
+#define SFLEN	4
+#else
 #define SFLEN	14
+#endif
 
 int main(int argc, char **argv)
 {
 	int sk;
 	struct sock_fprog p;
+#ifdef SOCK_FILTER01
+	struct sock_filter f[SFLEN] = {
+		{ 0x6,  0, 0, 0x0000ffff },
+		{ 0x6,  0, 0, 0x0000ffff },
+		{ 0x6,  0, 0, 0x0000ffff },
+		{ 0x6,  0, 0, 0x0000ffff },
+	};
+#else
 	struct sock_filter f[SFLEN] = {
 		{ 0x28, 0, 0, 0x0000000c },
 		{ 0x15, 0, 4, 0x00000800 },
@@ -37,6 +49,7 @@ int main(int argc, char **argv)
 		{ 0x6,  0, 0, 0x0000ffff },
 		{ 0x6,  0, 0, 0x00000000 },
 	};
+#endif
 	struct sock_filter f2[SFLEN], f3[SFLEN];
 	socklen_t len;
 
diff --git a/test/zdtm/static/sock_filter01.c b/test/zdtm/static/sock_filter01.c
new file mode 120000
index 000000000..4b908979c
--- /dev/null
+++ b/test/zdtm/static/sock_filter01.c
@@ -0,0 +1 @@
+sock_filter00.c
\ No newline at end of file

From 1062cc4fed4dde525c0d5055b03db1af30b1cfbd Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Mon, 12 Oct 2020 10:05:39 +0300
Subject: [PATCH 0394/1854] x86/asm: update test_bit() and test_and_set_bit()

Build on Fedora Core 33 produces the following warnings:

include/common/asm/bitops.h: Assembler messages:
include/common/asm/bitops.h:37: Warning: no instruction mnemonic suffix given and no register operands; using default for `bt'
include/common/asm/bitops.h: Assembler messages:
include/common/asm/bitops.h:63: Warning: no instruction mnemonic suffix given and no register operands; using default for `bts'

Update test_bit() and test_and_set_bit() implementation with recent
version from the Linux kernel to fix the warning.

Fixes #1217
Reported-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 include/common/arch/x86/asm/bitops.h | 32 ++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/include/common/arch/x86/asm/bitops.h b/include/common/arch/x86/asm/bitops.h
index b60ead7fa..c69e0ed02 100644
--- a/include/common/arch/x86/asm/bitops.h
+++ b/include/common/arch/x86/asm/bitops.h
@@ -1,9 +1,18 @@
 #ifndef __CR_BITOPS_H__
 #define __CR_BITOPS_H__
 
+#include <stdbool.h>
 #include "common/arch/x86/asm/cmpxchg.h"
 #include "common/asm/bitsperlong.h"
 
+#ifdef __GCC_ASM_FLAG_OUTPUTS__
+# define CC_SET(c) "\n\t/* output condition code " #c "*/\n"
+# define CC_OUT(c) "=@cc" #c
+#else
+# define CC_SET(c) "\n\tset" #c " %[_cc_" #c "]\n"
+# define CC_OUT(c) [_cc_ ## c] "=qm"
+#endif
+
 #define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
 #define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
 
@@ -30,14 +39,14 @@ static inline void change_bit(int nr, volatile unsigned long *addr)
 	asm volatile("btcl %1,%0" : ADDR : "Ir" (nr));
 }
 
-static inline int test_bit(int nr, volatile const unsigned long *addr)
+static inline bool test_bit(long nr, volatile const unsigned long *addr)
 {
-	int oldbit;
+	bool oldbit;
 
-	asm volatile("bt %2,%1\n\t"
-		     "sbb %0,%0"
-		     : "=r" (oldbit)
-		     : "m" (*(unsigned long *)addr), "Ir" (nr));
+	asm volatile("btq %2,%1"
+		     CC_SET(c)
+		     : CC_OUT(c) (oldbit)
+		     : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");
 
 	return oldbit;
 }
@@ -55,13 +64,14 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
+static inline bool test_and_set_bit(int nr, volatile unsigned long *addr)
 {
-	int oldbit;
-
-	asm volatile(LOCK_PREFIX "bts %2,%1\n\t"
-		     "sbb %0,%0" : "=r" (oldbit), ADDR : "Ir" (nr) : "memory");
+	bool oldbit;
 
+	asm("btsq %2,%1"
+	    CC_SET(c)
+	    : CC_OUT(c) (oldbit)
+	    : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");
 	return oldbit;
 }
 

From 5a655e890a1275ced0f646ebee7a17fa297687a6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Oct 2020 08:18:42 +0000
Subject: [PATCH 0395/1854] travis: install gzip and redhat-rpm-config for
 Fedora Rawhide based tests

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.fedora.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 138588bce..184f0019a 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -8,6 +8,7 @@ RUN dnf install -y \
 	gcc \
 	git \
 	gnutls-devel \
+	gzip \
 	iproute \
 	iptables \
 	nftables \
@@ -26,6 +27,7 @@ RUN dnf install -y \
 	python3-future \
 	python3-protobuf \
 	python3-junit_xml \
+	redhat-rpm-config \
 	sudo \
 	tar \
 	which \

From f68da4a86fee62af216e9e7520f4916aa29e797b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 29 Oct 2020 18:41:48 +0300
Subject: [PATCH 0396/1854] criu: Version 3.15

This is yet another big release with many new features in it:

* Introduced criu-image-streamer
* Added MIPS support.
* Allow checkpointing out of existing PID namespace and
  restoring into existing PID namespace.
* Added additional file validation mechanisms
* Added support to checkpoint and restore BPF hash maps and array maps.
* Initial cgroup2 support

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 3ccc48185..493ae9ac8 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 14
+CRIU_VERSION_MINOR	:= 15
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Platinum Peacock
+CRIU_VERSION_NAME	:= Titanium Falcon
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From e7cbeddff3f48dccb8d3a291ea084922901ff25a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 3 Nov 2020 10:18:02 +0000
Subject: [PATCH 0397/1854] CI: rename 'travis' to 'ci'

CRIU is already using multiple CI systems and not just Travis. This
renames all Travis related things to 'ci' to show it is actually
independent of Travis.

Just a simple rename.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .../workflows/cross-compile-daily-mips.yml    |  2 +-
 .github/workflows/cross-compile-daily.yml     |  2 +-
 .github/workflows/cross-compile-mips.yml      |  2 +-
 .github/workflows/cross-compile.yml           |  2 +-
 .travis.yml                                   |  4 +--
 Makefile                                      |  2 +-
 scripts/build/Dockerfile.aarch64-cross        |  2 +-
 scripts/build/Dockerfile.armv7-cross          |  2 +-
 scripts/build/Dockerfile.linux32.tmpl         |  2 +-
 scripts/build/Dockerfile.mips64el-cross       |  2 +-
 scripts/build/Dockerfile.openj9-ubuntu        |  2 +-
 scripts/build/Dockerfile.ppc64-cross          |  2 +-
 scripts/build/Dockerfile.tmpl                 |  2 +-
 scripts/build/Dockerfile.x86_64.hdr           |  2 +-
 scripts/{travis => ci}/Makefile               |  8 ++---
 scripts/{travis => ci}/apt-install            |  0
 scripts/{travis => ci}/asan.sh                |  0
 .../ci-after-success.sh}                      |  0
 scripts/{travis => ci}/docker-test.sh         |  4 +--
 scripts/{travis => ci}/docker.env             |  2 +-
 scripts/{travis => ci}/openj9-test.sh         |  0
 scripts/{travis => ci}/podman-test.sh         |  4 +--
 .../travis-tests => ci/run-ci-tests.sh}       | 30 +++++++++----------
 scripts/{travis => ci}/vagrant.sh             |  0
 24 files changed, 39 insertions(+), 39 deletions(-)
 rename scripts/{travis => ci}/Makefile (92%)
 rename scripts/{travis => ci}/apt-install (100%)
 rename scripts/{travis => ci}/asan.sh (100%)
 rename scripts/{travis/travis-after_success => ci/ci-after-success.sh} (100%)
 rename scripts/{travis => ci}/docker-test.sh (97%)
 rename scripts/{travis => ci}/docker.env (83%)
 rename scripts/{travis => ci}/openj9-test.sh (100%)
 rename scripts/{travis => ci}/podman-test.sh (98%)
 rename scripts/{travis/travis-tests => ci/run-ci-tests.sh} (91%)
 rename scripts/{travis => ci}/vagrant.sh (100%)

diff --git a/.github/workflows/cross-compile-daily-mips.yml b/.github/workflows/cross-compile-daily-mips.yml
index b372a23ae..164f09c99 100644
--- a/.github/workflows/cross-compile-daily-mips.yml
+++ b/.github/workflows/cross-compile-daily-mips.yml
@@ -19,4 +19,4 @@ jobs:
         ref: ${{ matrix.branches }}
     - name: Run Cross Compilation Targets
       run: >
-        sudo make -C scripts/travis ${{ matrix.target }}
+        sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
index 78e9c1619..aed08f2c9 100644
--- a/.github/workflows/cross-compile-daily.yml
+++ b/.github/workflows/cross-compile-daily.yml
@@ -19,4 +19,4 @@ jobs:
         ref: ${{ matrix.branches }}
     - name: Run Cross Compilation Targets
       run: >
-        sudo make -C scripts/travis ${{ matrix.target }}
+        sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile-mips.yml b/.github/workflows/cross-compile-mips.yml
index 4f6c6dbd3..3b475ff03 100644
--- a/.github/workflows/cross-compile-mips.yml
+++ b/.github/workflows/cross-compile-mips.yml
@@ -18,4 +18,4 @@ jobs:
     - uses: actions/checkout@v2
     - name: Run Cross Compilation Targets
       run: >
-        sudo make -C scripts/travis ${{ matrix.target }}
+        sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 3b007cdd0..d8143b397 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -14,4 +14,4 @@ jobs:
     - uses: actions/checkout@v2
     - name: Run Cross Compilation Targets
       run: >
-        sudo make -C scripts/travis ${{ matrix.target }}
+        sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.travis.yml b/.travis.yml
index 08d0b2ed6..d6ee9a399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,7 +94,7 @@ jobs:
     - env: TR_ARCH=fedora-rawhide
     - env: TR_ARCH=local       GCOV=1
 script:
-  - sudo make CCACHE=1 -C scripts/travis $TR_ARCH
+  - sudo make CCACHE=1 -C scripts/ci $TR_ARCH
 after_success:
   - ccache -s
-  - make -C scripts/travis after_success
+  - make -C scripts/ci after_success
diff --git a/Makefile b/Makefile
index c33494bec..d765df78c 100644
--- a/Makefile
+++ b/Makefile
@@ -401,7 +401,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	shellcheck scripts/*.sh
-	shellcheck scripts/travis/*.sh scripts/travis/travis* scripts/travis/apt-install
+	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 
 include Makefile.install
 
diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
index ab5d9299f..d372b2c91 100644
--- a/scripts/build/Dockerfile.aarch64-cross
+++ b/scripts/build/Dockerfile.aarch64-cross
@@ -1,6 +1,6 @@
 FROM dockcross/base:latest
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
index 99321e456..b3a18d0ec 100644
--- a/scripts/build/Dockerfile.armv7-cross
+++ b/scripts/build/Dockerfile.armv7-cross
@@ -1,6 +1,6 @@
 FROM dockcross/base:latest
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index 3b3007e9c..49eaeb3b2 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -1,7 +1,7 @@
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 RUN apt-install \
 	ccache \
diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross
index 0458ee887..6f0f32820 100644
--- a/scripts/build/Dockerfile.mips64el-cross
+++ b/scripts/build/Dockerfile.mips64el-cross
@@ -1,6 +1,6 @@
 FROM dockcross/base:latest
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 80af38b1a..0663eb7cc 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,6 +1,6 @@
 FROM adoptopenjdk/openjdk8-openj9:latest
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 RUN apt-install protobuf-c-compiler \
 	libprotobuf-c-dev \
diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross
index fb93a5824..eaa4e4ea2 100644
--- a/scripts/build/Dockerfile.ppc64-cross
+++ b/scripts/build/Dockerfile.ppc64-cross
@@ -1,6 +1,6 @@
 FROM dockcross/base:latest
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 # Add the cross compiler sources
 RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index f4213cea0..2e02d902c 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -1,7 +1,7 @@
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 RUN apt-install \
 	ccache \
diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index 2f87c4e8c..7e93c8cc4 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1,5 +1,5 @@
 FROM ubuntu:xenial
 
-COPY scripts/travis/apt-install /bin/apt-install
+COPY scripts/ci/apt-install /bin/apt-install
 
 RUN apt-install gcc-multilib
diff --git a/scripts/travis/Makefile b/scripts/ci/Makefile
similarity index 92%
rename from scripts/travis/Makefile
rename to scripts/ci/Makefile
index 1af60fe8d..513d58bfb 100644
--- a/scripts/travis/Makefile
+++ b/scripts/ci/Makefile
@@ -1,9 +1,9 @@
 local:
-	./travis-tests
+	./run-ci-tests.sh
 .PHONY: local
 
 after_success:
-	./travis-after_success
+	./ci-after-success.sh
 .PHONY: after_success
 
 target-suffix =
@@ -46,11 +46,11 @@ restart-docker:
 
 $(TARGETS): restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/travis/travis-tests
+	docker run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
 
 fedora-asan: restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run -it $(CONTAINER_OPTS) criu-$@ ./scripts/travis/asan.sh $(ZDTM_OPTIONS)
+	docker run -it $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS)
 
 docker-test:
 	./docker-test.sh
diff --git a/scripts/travis/apt-install b/scripts/ci/apt-install
similarity index 100%
rename from scripts/travis/apt-install
rename to scripts/ci/apt-install
diff --git a/scripts/travis/asan.sh b/scripts/ci/asan.sh
similarity index 100%
rename from scripts/travis/asan.sh
rename to scripts/ci/asan.sh
diff --git a/scripts/travis/travis-after_success b/scripts/ci/ci-after-success.sh
similarity index 100%
rename from scripts/travis/travis-after_success
rename to scripts/ci/ci-after-success.sh
diff --git a/scripts/travis/docker-test.sh b/scripts/ci/docker-test.sh
similarity index 97%
rename from scripts/travis/docker-test.sh
rename to scripts/ci/docker-test.sh
index a6990b180..e42e96569 100755
--- a/scripts/travis/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -32,9 +32,9 @@ fi
 
 service docker restart
 
-export SKIP_TRAVIS_TEST=1
+export SKIP_CI_TEST=1
 
-./travis-tests
+./run-ci-tests.sh
 
 cd ../../
 
diff --git a/scripts/travis/docker.env b/scripts/ci/docker.env
similarity index 83%
rename from scripts/travis/docker.env
rename to scripts/ci/docker.env
index 36154df0d..399ced694 100644
--- a/scripts/travis/docker.env
+++ b/scripts/ci/docker.env
@@ -1,4 +1,4 @@
-SKIP_TRAVIS_PREP=1
+SKIP_CI_PREP=1
 ZDTM_OPTS=-x zdtm/static/binfmt_misc -x zdtm/static/sched_policy00
 CC=gcc
 SKIP_EXT_DEV_TEST=1
diff --git a/scripts/travis/openj9-test.sh b/scripts/ci/openj9-test.sh
similarity index 100%
rename from scripts/travis/openj9-test.sh
rename to scripts/ci/openj9-test.sh
diff --git a/scripts/travis/podman-test.sh b/scripts/ci/podman-test.sh
similarity index 98%
rename from scripts/travis/podman-test.sh
rename to scripts/ci/podman-test.sh
index 509113994..f56d10a74 100755
--- a/scripts/travis/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -17,9 +17,9 @@ apt-get -y purge docker-ce
 
 ./apt-install podman containernetworking-plugins
 
-export SKIP_TRAVIS_TEST=1
+export SKIP_CI_TEST=1
 
-./travis-tests
+./run-ci-tests.sh
 
 cd ../../
 
diff --git a/scripts/travis/travis-tests b/scripts/ci/run-ci-tests.sh
similarity index 91%
rename from scripts/travis/travis-tests
rename to scripts/ci/run-ci-tests.sh
index 9e1105449..fab392ff2 100755
--- a/scripts/travis/travis-tests
+++ b/scripts/ci/run-ci-tests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x -e
 
-TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
+CI_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
 		libnl-route-3-dev time ccache flake8 libbsd-dev"
@@ -15,11 +15,11 @@ if [ -e /etc/lsb-release ]; then
 		# There is one last test running on 16.04 because of the broken
 		# overlayfs in 18.04. Once that is fixed we can remove the last
 		# 16.04 based test and this if clause.
-		TRAVIS_PKGS="$TRAVIS_PKGS python-future python-protobuf python-yaml
-				python-junit.xml python-ipaddress"
+		CI_PKGS="$CI_PKGS python-future python-protobuf python-yaml
+			python-junit.xml python-ipaddress"
 	else
-		TRAVIS_PKGS="$TRAVIS_PKGS python3-future python3-protobuf python3-yaml
-				python3-junit.xml"
+		CI_PKGS="$CI_PKGS python3-future python3-protobuf python3-yaml
+			python3-junit.xml"
 	fi
 fi
 
@@ -31,11 +31,11 @@ if [ "$UNAME_M" != "x86_64" ]; then
 	# For Travis only x86_64 seems to be baremetal. Other
 	# architectures are running in unprivileged LXD containers.
 	# That seems to block most of CRIU's interfaces.
-	SKIP_TRAVIS_TEST=1
+	SKIP_CI_TEST=1
 fi
 
-travis_prep () {
-	[ -n "$SKIP_TRAVIS_PREP" ] && return
+ci_prep () {
+	[ -n "$SKIP_CI_PREP" ] && return
 
 	cd ../../
 
@@ -50,13 +50,13 @@ travis_prep () {
 	CC=gcc
 	# clang support
 	if [ "$CLANG" = "1" ]; then
-		TRAVIS_PKGS="$TRAVIS_PKGS clang"
+		CI_PKGS="$CI_PKGS clang"
 		CC=clang
 	fi
 
 	[ -n "$GCOV" ] && {
 		apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-		scripts/travis/apt-install --no-install-suggests g++-7
+		scripts/ci/apt-install --no-install-suggests g++-7
 		CC=gcc-7
 	}
 
@@ -72,10 +72,10 @@ travis_prep () {
 
 	# Do not install x86_64 specific packages on other architectures
 	if [ "$UNAME_M" = "x86_64" ]; then
-		TRAVIS_PKGS="$TRAVIS_PKGS $X86_64_PKGS"
+		CI_PKGS="$CI_PKGS $X86_64_PKGS"
 	fi
 
-	scripts/travis/apt-install "$TRAVIS_PKGS"
+	scripts/ci/apt-install "$CI_PKGS"
 	chmod a+x "$HOME"
 
 	# zdtm uses an unversioned python binary to run the tests.
@@ -91,7 +91,7 @@ test_stream() {
 	./test/zdtm.py run --stream -p 2 --keep-going -T "$STREAM_TEST_PATTERN" $ZDTM_OPTS
 }
 
-travis_prep
+ci_prep
 
 export GCOV
 $CC --version
@@ -107,7 +107,7 @@ if [ "$WIDTH" -gt 80 ]; then
 	exit 1
 fi
 
-[ -n "$SKIP_TRAVIS_TEST" ] && exit 0
+[ -n "$SKIP_CI_TEST" ] && exit 0
 
 ulimit -c unlimited
 
@@ -133,7 +133,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	done
 	# shellcheck disable=SC2086
 	apt-get remove $INCOMPATIBLE_LIBS
-	scripts/travis/apt-install "$IA32_PKGS"
+	scripts/ci/apt-install "$IA32_PKGS"
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi
diff --git a/scripts/travis/vagrant.sh b/scripts/ci/vagrant.sh
similarity index 100%
rename from scripts/travis/vagrant.sh
rename to scripts/ci/vagrant.sh

From 0d691acbae8eaf912da5c3a8a27ceb7403f6b6da Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 3 Nov 2020 11:09:38 +0000
Subject: [PATCH 0398/1854] CI: distribute CI jobs between CI systems

Move podman, openj9, x86_64 tests from Travis to GitHub Actions.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/openj9-test.yml       | 11 +++++++++++
 .github/workflows/podman-test.yml       | 11 +++++++++++
 .github/workflows/x86-64-clang-test.yml | 11 +++++++++++
 .github/workflows/x86-64-gcc-test.yml   | 11 +++++++++++
 .travis.yml                             |  7 -------
 scripts/build/Dockerfile.tmpl           |  2 ++
 scripts/build/Dockerfile.x86_64.hdr     |  2 +-
 scripts/ci/podman-test.sh               | 14 +++++++++++---
 8 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/openj9-test.yml
 create mode 100644 .github/workflows/podman-test.yml
 create mode 100644 .github/workflows/x86-64-clang-test.yml
 create mode 100644 .github/workflows/x86-64-gcc-test.yml

diff --git a/.github/workflows/openj9-test.yml b/.github/workflows/openj9-test.yml
new file mode 100644
index 000000000..1d7a1eb6b
--- /dev/null
+++ b/.github/workflows/openj9-test.yml
@@ -0,0 +1,11 @@
+name: OpenJ9 Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run OpenJ9 Test
+      run: sudo make -C scripts/ci openj9-test
diff --git a/.github/workflows/podman-test.yml b/.github/workflows/podman-test.yml
new file mode 100644
index 000000000..447cbf0b6
--- /dev/null
+++ b/.github/workflows/podman-test.yml
@@ -0,0 +1,11 @@
+name: Podman Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Podman Test
+      run: sudo make -C scripts/ci podman-test
diff --git a/.github/workflows/x86-64-clang-test.yml b/.github/workflows/x86-64-clang-test.yml
new file mode 100644
index 000000000..e6e84ef52
--- /dev/null
+++ b/.github/workflows/x86-64-clang-test.yml
@@ -0,0 +1,11 @@
+name: X86_64 CLANG Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run X86_64 CLANG Test
+      run: sudo make -C scripts/ci x86_64 CLANG=1
diff --git a/.github/workflows/x86-64-gcc-test.yml b/.github/workflows/x86-64-gcc-test.yml
new file mode 100644
index 000000000..b8b81ef15
--- /dev/null
+++ b/.github/workflows/x86-64-gcc-test.yml
@@ -0,0 +1,11 @@
+name: X86_64 GCC Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run X86_64 GCC Test
+      run: sudo make -C scripts/ci x86_64
diff --git a/.travis.yml b/.travis.yml
index d6ee9a399..fc95844b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ env:
   - TR_ARCH=local       CLANG=1
   - TR_ARCH=local       COMPAT_TEST=y
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
-  - TR_ARCH=x86_64
-  - TR_ARCH=x86_64      CLANG=1
-  - TR_ARCH=openj9-test
   - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
@@ -57,10 +54,6 @@ jobs:
       arch: amd64
       env: TR_ARCH=fedora-rawhide
       dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=podman-test
-      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=docker-test
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 2e02d902c..0cb6de3db 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -13,9 +13,11 @@ RUN apt-install \
 	git-core \
 	iptables \
 	libaio-dev \
+	libbsd-dev \
 	libcap-dev \
 	libgnutls28-dev \
 	libgnutls30 \
+	libnftables-dev \
 	libnl-3-dev \
 	libprotobuf-c-dev \
 	libprotobuf-dev \
diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index 7e93c8cc4..32fc2978a 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:focal
 
 COPY scripts/ci/apt-install /bin/apt-install
 
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index f56d10a74..d61e2d0b8 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -1,13 +1,21 @@
 #!/bin/bash
 set -x -e -o pipefail
 
-echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+if [ ! -e /etc/lsb-release ]; then
+       # This expects to run on Ubuntu
+       exit 1
+fi
 
-wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_18.04/Release.key -O- | apt-key add -
+#shellcheck disable=SC1091
+. /etc/lsb-release
+
+echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${DISTRIB_RELEASE}/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+
+curl -sL "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${DISTRIB_RELEASE}/Release.key" | apt-key add -
 
 # podman conflicts with a man page from docker-ce
 # this is a podman packaging bug (https://github.com/containers/libpod/issues/4747)
-apt-get -y purge docker-ce
+apt-get -y purge docker-ce || :
 
 ./apt-install \
     apt-transport-https \

From 2598f64fa97a9ed8312bfaa0f1ab89cd54952e2e Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@virtuozzo.com>
Date: Wed, 3 Aug 2016 18:14:00 +0300
Subject: [PATCH 0399/1854] crns.py: New attempt to have --unshare option

So, here's the enhanced version of the first try.

Changes are:

1. The wrapper name is criu-ns instead of crns.py
2. The CLI is absolutely the same as for criu, since the script
   re-execl-s criu binary. E.g.
	   scripts/criu-ns dump -t 1234 ...
   just works
3. Caller doesn't need to care about substituting CLI options,
   instead, the scripts analyzes the command line and
   a) replaces -t|--tree argument with virtual pid __if__ the
      target task lives in another pidns
   b) keeps the current cwd (and root) __if__ switches to another
      mntns. A limitation applies here -- cwd path should be the
      same in target ns, no "smart path mapping" is performed. So
      this script is for now only useful for mntns clones (which
      is our main goal at the moment).

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Looks-good-to: Andrey Vagin <avagin@openvz.org>
---
 scripts/criu-ns | 240 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100755 scripts/criu-ns

diff --git a/scripts/criu-ns b/scripts/criu-ns
new file mode 100755
index 000000000..e7ebbf0ca
--- /dev/null
+++ b/scripts/criu-ns
@@ -0,0 +1,240 @@
+#!/usr/bin/env python
+import ctypes
+import ctypes.util
+import errno
+import sys
+import os
+
+# <sched.h> constants for unshare
+CLONE_NEWNS = 0x00020000
+CLONE_NEWPID = 0x20000000
+
+# <sys/mount.h> - constants for mount
+MS_REC = 16384
+MS_PRIVATE = 1 << 18
+MS_SLAVE = 1 << 19
+
+# Load libc bindings
+_libc = ctypes.CDLL(ctypes.util.find_library("c"), use_errno=True)
+
+try:
+	_unshare = _libc.unshare
+except AttributeError:
+	raise OSError(errno.EINVAL, "unshare is not supported on this platform")
+else:
+	_unshare.argtypes = [ ctypes.c_int ]
+	_unshare.restype = ctypes.c_int
+
+try:
+	_setns = _libc.setns
+except AttributeError:
+	raise OSError(errno.EINVAL, "setns is not supported on this platform")
+else:
+	_setns.argtypes = [ ctypes.c_int, ctypes.c_int ]
+	_setns.restype = ctypes.c_int
+
+try:
+	_mount = _libc.mount
+except AttributeError:
+	raise OSError(errno.EINVAL, "mount is not supported on this platform")
+else:
+	_mount.argtypes = [
+		ctypes.c_char_p,
+		ctypes.c_char_p,
+		ctypes.c_char_p,
+		ctypes.c_ulong,
+		ctypes.c_void_p
+	]
+	_mount.restype = ctypes.c_int
+
+try:
+	_umount = _libc.umount
+except AttributeError:
+	raise OSError(errno.EINVAL, "umount is not supported on this platform")
+else:
+	_umount.argtypes = [ctypes.c_char]
+	_umount.restype = ctypes.c_int
+
+
+def run_criu():
+	print sys.argv
+	os.execlp('criu', *['criu'] + sys.argv[1:])
+
+
+def wrap_restore():
+	# Unshare pid and mount namespaces
+	if _unshare(CLONE_NEWNS | CLONE_NEWPID) != 0:
+		_errno = ctypes.get_errno()
+		raise OSError(_errno, errno.errorcode[_errno])
+
+	(r_pipe, w_pipe) = os.pipe()
+
+	# Spawn the init
+	if os.fork() == 0:
+		os.close(r_pipe)
+
+		# Mount new /proc
+		if _mount(None, "/", None, MS_SLAVE|MS_REC, None) != 0:
+			_errno = ctypes.get_errno()
+			raise OSError(_errno, errno.errorcode[_errno])
+
+		if _mount('proc', '/proc', 'proc', 0, None) != 0:
+			_errno = ctypes.get_errno()
+			raise OSError(_errno, errno.errorcode[_errno])
+
+		# Spawn CRIU binary
+		criu_pid = os.fork()
+		if criu_pid == 0:
+			run_criu()
+			raise OSError(errno.ENOENT, "No such command")
+
+		while True:
+			try:
+				(pid, status) = os.wait()
+				if pid == criu_pid:
+					status = os.WEXITSTATUS(status)
+					break
+			except OSError:
+				status = -251
+				break
+
+		os.write(w_pipe, "%d" % status)
+		os.close(w_pipe)
+
+		if status != 0:
+			sys.exit(status)
+
+		while True:
+			try:
+				os.wait()
+			except OSError:
+				break
+
+		sys.exit(0)
+
+	# Wait for CRIU to exit and report the status back
+	os.close(w_pipe)
+	status = os.read(r_pipe, 1024)
+	if not status.isdigit():
+		status_i = -252
+	else:
+		status_i = int(status)
+
+	return status_i
+
+
+def get_varg(args):
+	for i in xrange(1, len(sys.argv)):
+		if not sys.argv[i] in args:
+			continue
+
+		if i + 1 >= len(sys.argv):
+			break
+
+		return (sys.argv[i + 1], i + 1)
+
+	return (None, None)
+
+
+
+def set_pidns(tpid, pid_idx):
+	# Joind pid namespace. Note, that the given pid should
+	# be changed in -t option, as task lives in different
+	# pid namespace.
+
+	myns = os.stat('/proc/self/ns/pid').st_ino
+
+	ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
+	if myns != os.fstat(ns_fd).st_ino:
+
+		for l in open('/proc/%s/status' % tpid):
+			if not l.startswith('NSpid:'):
+				continue
+
+			ls = l.split()
+			if ls[1] != tpid:
+				raise OSError(errno.ESRCH, 'No such pid')
+
+			print 'Replace pid %s with %s' % (tpid, ls[2])
+			sys.argv[pid_idx] = ls[2]
+			break
+		else:
+			raise OSError(errno.ENOENT, 'Cannot find NSpid field in proc')
+
+		if _setns(ns_fd, 0) != 0:
+			_errno = ctypes.get_errno()
+			raise OSError(_errno, errno.errorcode[_errno])
+
+	os.close(ns_fd)
+
+
+def set_mntns(tpid):
+	# Join mount namespace. Trick here too -- check / and .
+	# will be the same in target mntns.
+
+	myns = os.stat('/proc/self/ns/mnt').st_ino
+	ns_fd = os.open('/proc/%s/ns/mnt' % tpid, os.O_RDONLY)
+	if myns != os.fstat(ns_fd).st_ino:
+		root_st = os.stat('/')
+		cwd_st = os.stat('.')
+		cwd_path = os.path.realpath('.')
+
+		if _setns(ns_fd, 0) != 0:
+			_errno = ctypes.get_errno()
+			raise OSError(_errno, errno.errorcode[_errno])
+
+		os.chdir(cwd_path)
+		root_nst = os.stat('/')
+		cwd_nst = os.stat('.')
+
+		def steq(st, nst):
+			return (st.st_dev, st.st_ino) == (nst.st_dev, nst.st_ino)
+
+		if not steq(root_st, root_nst):
+			raise OSError(errno.EXDEV, 'Target ns / is not as current')
+		if not steq(cwd_st, cwd_nst):
+			raise OSError(errno.EXDEV, 'Target ns . is not as current')
+
+
+	os.close(ns_fd)
+
+
+def wrap_dump():
+	(pid, pid_idx) = get_varg(('-t', '--tree'))
+	if pid is None:
+		raise OSError(errno.EINVAL, 'No --tree option given')
+
+	set_pidns(pid, pid_idx)
+	set_mntns(pid)
+
+	# Spawn CRIU binary
+	criu_pid = os.fork()
+	if criu_pid == 0:
+		run_criu()
+		raise OSError(errno.ENOENT, "No such command")
+
+	# Wait for CRIU to exit and report the status back
+	while True:
+		try:
+			(pid, status) = os.wait()
+			if pid == criu_pid:
+				status = os.WEXITSTATUS(status)
+				break
+		except OSError:
+			status = -251
+			break
+
+	return status
+
+
+action = sys.argv[1]
+
+if action == 'restore':
+	res = wrap_restore()
+elif action == 'dump' or action == 'pre-dump':
+	res = wrap_dump()
+else:
+	print 'Unsupported action %s for nswrap' % action
+	res = -1
+
+sys.exit(res)

From 72ca9673de4437151c8972162ab2479a37679ee2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 23 Sep 2018 15:31:54 +0100
Subject: [PATCH 0400/1854] python: Replace xrange with range

In Py2 `range` returns a list and `xrange` creates a sequence object
that evaluates lazily. In Py3 `range` is equivalent to `xrange` in Py2.

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index e7ebbf0ca..0910f2a33 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -124,7 +124,7 @@ def wrap_restore():
 
 
 def get_varg(args):
-	for i in xrange(1, len(sys.argv)):
+	for i in range(1, len(sys.argv)):
 		if not sys.argv[i] in args:
 			continue
 

From 26371e56f0e69dfbe3fdccbe8aa6ff4e5070b17d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 7 Apr 2019 20:41:37 +0100
Subject: [PATCH 0401/1854] criu-ns: Convert to python3 style print() syntax

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 scripts/criu-ns | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 0910f2a33..b6b6a1111 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -57,7 +57,7 @@ else:
 
 
 def run_criu():
-	print sys.argv
+	print(sys.argv)
 	os.execlp('criu', *['criu'] + sys.argv[1:])
 
 
@@ -155,7 +155,7 @@ def set_pidns(tpid, pid_idx):
 			if ls[1] != tpid:
 				raise OSError(errno.ESRCH, 'No such pid')
 
-			print 'Replace pid %s with %s' % (tpid, ls[2])
+			print('Replace pid {} with {}'.format(tpid, ls[2]))
 			sys.argv[pid_idx] = ls[2]
 			break
 		else:
@@ -234,7 +234,7 @@ if action == 'restore':
 elif action == 'dump' or action == 'pre-dump':
 	res = wrap_dump()
 else:
-	print 'Unsupported action %s for nswrap' % action
+	print('Unsupported action {} for nswrap'.format(action))
 	res = -1
 
 sys.exit(res)

From d16033658f0234045477a34250b519f4d57d25a5 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 7 Apr 2019 20:43:12 +0100
Subject: [PATCH 0402/1854] criu-ns: Print usage info when no args provided

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 scripts/criu-ns | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index b6b6a1111..b582f7580 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -227,6 +227,18 @@ def wrap_dump():
 	return status
 
 
+if len(sys.argv) == 1:
+	print("""
+Usage:
+  {0} dump|pre-dump -t PID [<options>]
+  {0} restore [<options>]
+\nCommands:
+  dump           checkpoint a process/tree identified by pid
+  pre-dump       pre-dump task(s) minimizing their frozen time
+  restore        restore a process/tree
+""".format(sys.argv[0]))
+	exit(1)
+
 action = sys.argv[1]
 
 if action == 'restore':

From b2232f7f7accd19acd789c3bb23ecde9588f7769 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov1@gmail.com>
Date: Sun, 7 Apr 2019 20:55:32 +0100
Subject: [PATCH 0403/1854] criu-ns: Convert c_char_p strings to bytes object

class ctypes.c_char_p
    Represents the C char * datatype when it points to a zero-
    terminated string. For a general character pointer that may
    also point to binary data, POINTER(c_char) must be used.
    The constructor accepts an integer address, or a bytes object.

https://docs.python.org/3/library/ctypes.html#ctypes.c_char_p

Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
---
 scripts/criu-ns | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index b582f7580..e065c5971 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -74,11 +74,11 @@ def wrap_restore():
 		os.close(r_pipe)
 
 		# Mount new /proc
-		if _mount(None, "/", None, MS_SLAVE|MS_REC, None) != 0:
+		if _mount(None, b"/", None, MS_SLAVE|MS_REC, None) != 0:
 			_errno = ctypes.get_errno()
 			raise OSError(_errno, errno.errorcode[_errno])
 
-		if _mount('proc', '/proc', 'proc', 0, None) != 0:
+		if _mount(b'proc', b'/proc', b'proc', 0, None) != 0:
 			_errno = ctypes.get_errno()
 			raise OSError(_errno, errno.errorcode[_errno])
 
@@ -98,7 +98,7 @@ def wrap_restore():
 				status = -251
 				break
 
-		os.write(w_pipe, "%d" % status)
+		os.write(w_pipe, b"%d" % status)
 		os.close(w_pipe)
 
 		if status != 0:

From 4381043a7f4f40f6895ed7cfbb89a3f70962d96e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 6 Oct 2020 03:59:38 +0100
Subject: [PATCH 0404/1854] criu-ns: Use PID 1 on restore

criu-ns performs double fork, which results in criu restore
using PID=2. Thus, if a user is trying to restore a process
with that PID, the restore will fail.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 54 +++++++++++++------------------------------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index e065c5971..dc6da8401 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -67,12 +67,8 @@ def wrap_restore():
 		_errno = ctypes.get_errno()
 		raise OSError(_errno, errno.errorcode[_errno])
 
-	(r_pipe, w_pipe) = os.pipe()
-
-	# Spawn the init
-	if os.fork() == 0:
-		os.close(r_pipe)
-
+	criu_pid = os.fork()
+	if criu_pid == 0:
 		# Mount new /proc
 		if _mount(None, b"/", None, MS_SLAVE|MS_REC, None) != 0:
 			_errno = ctypes.get_errno()
@@ -83,44 +79,22 @@ def wrap_restore():
 			raise OSError(_errno, errno.errorcode[_errno])
 
 		# Spawn CRIU binary
-		criu_pid = os.fork()
-		if criu_pid == 0:
-			run_criu()
-			raise OSError(errno.ENOENT, "No such command")
-
-		while True:
-			try:
-				(pid, status) = os.wait()
-				if pid == criu_pid:
-					status = os.WEXITSTATUS(status)
-					break
-			except OSError:
-				status = -251
-				break
-
-		os.write(w_pipe, b"%d" % status)
-		os.close(w_pipe)
-
-		if status != 0:
-			sys.exit(status)
-
-		while True:
-			try:
-				os.wait()
-			except OSError:
-				break
-
+		run_criu()
+		raise OSError(errno.ENOENT, "No such command")
 		sys.exit(0)
 
 	# Wait for CRIU to exit and report the status back
-	os.close(w_pipe)
-	status = os.read(r_pipe, 1024)
-	if not status.isdigit():
-		status_i = -252
-	else:
-		status_i = int(status)
+	while True:
+		try:
+			(pid, status) = os.wait()
+			if pid == criu_pid:
+				status = os.WEXITSTATUS(status)
+				break
+		except OSError:
+			status = -251
+			break
 
-	return status_i
+	return status
 
 
 def get_varg(args):

From 6edcef7406ae08ef0d70211442626ca866a73d98 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 6 Oct 2020 21:25:23 +0100
Subject: [PATCH 0405/1854] cr-restore: Wait child & reap zombies if PID=1

When criu restore runs as PID=1 it has an additional responsibility to
reap zombie processes.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 589087f9f..472d960df 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2192,6 +2192,18 @@ static int write_restored_pid(void)
 	return 0;
 }
 
+static void reap_zombies(void)
+{
+	while (1) {
+		pid_t pid = wait(NULL);
+		if (pid == -1) {
+			if (errno != ECHILD)
+				pr_perror("Error while waiting for pids");
+			return;
+		}
+	}
+}
+
 static int restore_root_task(struct pstree_item *init)
 {
 	enum trace_flags flag = TRACE_ALL;
@@ -2445,8 +2457,9 @@ skip_ns_bouncing:
 	if (ret != 0)
 		pr_err("Post-resume script ret code %d\n", ret);
 
-	if (!opts.restore_detach && !opts.exec_cmd)
-		wait(NULL);
+	if (!opts.restore_detach && !opts.exec_cmd) {
+		reap_zombies();
+	}
 
 	return 0;
 

From 70c8c12c6406e5d63c3441edc7ffe47a4a3867fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20C=C5=82api=C5=84ski?= <mclapinski@google.com>
Date: Tue, 13 Oct 2020 01:47:09 +0200
Subject: [PATCH 0406/1854] compel: don't mmap parasite as RWX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some kernels have W^X mitigation, which means they won't execute memory
blocks if that memory block is also writable or ever was writable. This
patch enables CRIU to run on such kernels.

1. Align .data section to a page.
2. mmap a memory block for parasite as RX.
3. mprotect everything after .text as RW.

Signed-off-by: Michał Cłapiński <mclapinski@google.com>
---
 compel/arch/ppc64/scripts/compel-pack.lds.S |  2 +-
 compel/arch/s390/scripts/compel-pack.lds.S  |  2 +-
 compel/arch/x86/scripts/compel-pack.lds.S   |  2 +-
 compel/include/uapi/infect.h                |  1 +
 compel/src/lib/handle-elf.c                 |  5 +++
 compel/src/lib/infect.c                     | 48 +++++++++++++++++----
 6 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/compel/arch/ppc64/scripts/compel-pack.lds.S b/compel/arch/ppc64/scripts/compel-pack.lds.S
index 572f1c42d..f197fb999 100644
--- a/compel/arch/ppc64/scripts/compel-pack.lds.S
+++ b/compel/arch/ppc64/scripts/compel-pack.lds.S
@@ -12,7 +12,7 @@ SECTIONS
 		*(.compel.init)
 	}
 
-	.data : {
+	.data : ALIGN(0x10000) {
 		*(.data*)
 		*(.bss*)
 	}
diff --git a/compel/arch/s390/scripts/compel-pack.lds.S b/compel/arch/s390/scripts/compel-pack.lds.S
index 2571ac852..a82118983 100644
--- a/compel/arch/s390/scripts/compel-pack.lds.S
+++ b/compel/arch/s390/scripts/compel-pack.lds.S
@@ -12,7 +12,7 @@ SECTIONS
 		*(.compel.init)
 	}
 
-	.data : {
+	.data : ALIGN(0x1000) {
 		*(.data*)
 		*(.bss*)
 	}
diff --git a/compel/arch/x86/scripts/compel-pack.lds.S b/compel/arch/x86/scripts/compel-pack.lds.S
index 68ddb3622..44e705e29 100644
--- a/compel/arch/x86/scripts/compel-pack.lds.S
+++ b/compel/arch/x86/scripts/compel-pack.lds.S
@@ -13,7 +13,7 @@ SECTIONS
 		*(.compel.init)
 	}
 
-	.data : {
+	.data : ALIGN(0x1000) {
 		*(.data*)
 		*(.bss*)
 	}
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 257658a70..fa326eafe 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -155,6 +155,7 @@ struct parasite_blob_desc {
 			unsigned long		args_ptr_off;
 			unsigned long		got_off;
 			unsigned long		args_off;
+			unsigned long		data_off;
 			compel_reloc_t		*relocs;
 			unsigned int		nr_relocs;
 		} hdr;
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 2319170ae..e505f2c43 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -155,6 +155,7 @@ int __handle_elf(void *mem, size_t size)
 	int64_t toc_offset = 0;
 #endif
 	int ret = -EINVAL;
+	unsigned long data_off = 0;
 
 	pr_debug("Header\n");
 	pr_debug("------------\n");
@@ -698,6 +699,9 @@ int __handle_elf(void *mem, size_t size)
 				pr_out("\n\t");
 			pr_out("0x%02x,", shdata[j]);
 		}
+
+		if (!strcmp(&secstrings[sh->sh_name], ".data"))
+			data_off = sh->sh_addr;
 	}
 	pr_out("};\n");
 	pr_out("\n");
@@ -722,6 +726,7 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("\tpbd->hdr.args_ptr_off	= %s_sym__export_parasite_service_args_ptr;\n", opts.prefix);
 	pr_out("\tpbd->hdr.got_off	= round_up(pbd->hdr.bsize, sizeof(long));\n");
 	pr_out("\tpbd->hdr.args_off	= pbd->hdr.got_off + %zd*sizeof(long);\n", nr_gotpcrel);
+	pr_out("\tpbd->hdr.data_off	= %#lx;\n", data_off);
 	pr_out("\tpbd->hdr.relocs		= %s_relocs;\n", opts.prefix);
 	pr_out("\tpbd->hdr.nr_relocs	= "
 			"sizeof(%s_relocs) / sizeof(%s_relocs[0]);\n",
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 38846c21f..5c4c1b18d 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -690,12 +690,11 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 	return 0;
 }
 
-static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size)
+static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size, int remote_prot)
 {
 	int fd;
 
-	ctl->remote_map = remote_mmap(ctl, NULL, size,
-				      PROT_READ | PROT_WRITE | PROT_EXEC,
+	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot,
 				      MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 	if (!ctl->remote_map) {
 		pr_err("Can't allocate memory for parasite blob (pid: %d)\n", ctl->rpid);
@@ -733,7 +732,7 @@ static void parasite_memfd_close(struct parasite_ctl *ctl, int fd)
 		pr_err("Can't close memfd\n");
 }
 
-static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
+static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size, int remote_prot)
 {
 	void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE;
 	bool compat_task = !compel_mode_native(ctl);
@@ -785,8 +784,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size)
 		goto err_cure;
 	}
 
-	ctl->remote_map = remote_mmap(ctl, NULL, size,
-				      PROT_READ | PROT_WRITE | PROT_EXEC,
+	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot,
 				      MAP_FILE | MAP_SHARED, fd, 0);
 	if (!ctl->remote_map) {
 		pr_err("Can't rmap memfd for parasite blob\n");
@@ -856,15 +854,47 @@ void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 #endif
 }
 
+long remote_mprotect(struct parasite_ctl *ctl, void *addr, size_t len, int prot)
+{
+	long ret;
+	int err;
+	bool compat_task = !user_regs_native(&ctl->orig.regs);
+
+	err = compel_syscall(ctl, __NR(mprotect, compat_task), &ret,
+			(unsigned long)addr, len, prot, 0, 0, 0);
+	if (err < 0) {
+		pr_err("compel_syscall for mprotect failed\n");
+		return -1;
+	}
+	return ret;
+}
+
 static int compel_map_exchange(struct parasite_ctl *ctl, unsigned long size)
 {
-	int ret;
+	int ret, remote_prot;
 
-	ret = parasite_memfd_exchange(ctl, size);
+	if (ctl->pblob.hdr.data_off)
+		remote_prot = PROT_READ | PROT_EXEC;
+	else
+		remote_prot = PROT_READ | PROT_WRITE | PROT_EXEC;
+
+	ret = parasite_memfd_exchange(ctl, size, remote_prot);
 	if (ret == 1) {
 		pr_info("MemFD parasite doesn't work, goto legacy mmap\n");
-		ret = parasite_mmap_exchange(ctl, size);
+		ret = parasite_mmap_exchange(ctl, size, remote_prot);
+		if (ret)
+			return ret;
 	}
+
+	if (!ctl->pblob.hdr.data_off)
+		return 0;
+
+	ret = remote_mprotect(ctl, ctl->remote_map + ctl->pblob.hdr.data_off,
+			      size - ctl->pblob.hdr.data_off,
+			      PROT_READ | PROT_WRITE);
+	if (ret)
+		pr_err("remote_mprotect failed\n");
+
 	return ret;
 }
 

From ee048e14898b41afeec8710e40283e5b4d32ee2f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 06:17:32 +0000
Subject: [PATCH 0407/1854] lock: disable clang_analyzer for the LOCK_BUG_ON()
 macro

The clang analyzer, scan-build, cannot correctly handle the
LOCK_BUG_ON() macro. At multiple places there is the following warning:

  Error: CLANG_WARNING:
    criu/pie/restorer.c:1221:4: warning: Dereference of null pointer

  include/common/lock.h:14:35: note: expanded from macro 'LOCK_BUG_ON'
               *(volatile unsigned long *)NULL = 0xdead0000 + __LINE__
               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~

This just disable the clang analyzer for the LOCK_BUG_ON() macro.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 include/common/lock.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/common/lock.h b/include/common/lock.h
index 4782b638f..6baece25f 100644
--- a/include/common/lock.h
+++ b/include/common/lock.h
@@ -9,10 +9,13 @@
 #include "common/asm/atomic.h"
 #include "common/compiler.h"
 
+/* scan-build complains about derefencing a NULL pointer here. */
+#ifndef __clang_analyzer__
 #define LOCK_BUG_ON(condition)							\
 	if ((condition))							\
 		*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__
 #define LOCK_BUG()	LOCK_BUG_ON(1)
+#endif /* __clang_analyzer__ */
 
 #ifdef CR_NOGLIBC
 # include <compel/plugins/std/syscall.h>

From 7db0bb69e7e8bfae58f60f33b0c484510abe98d7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 07:21:19 +0000
Subject: [PATCH 0408/1854] infect: initialize struct to avoid CLANG_WARNING

Using scan-build there is a warning about

 infect.c:231:17: warning: The left operand of '!=' is a garbage value
                 if (ss->state != 'Z') {

which is a false positive as every process will have a 'Status' field,
but initializing the structure makes the clang analyzer silent.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/src/lib/infect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 5c4c1b18d..4f2402fee 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -105,7 +105,7 @@ err_parse:
 int compel_stop_task(int pid)
 {
 	int ret;
-	struct seize_task_status ss;
+	struct seize_task_status ss = {};
 
 	ret = compel_interrupt_task(pid);
 	if (ret == 0)

From 1543527bf9f1af0c6cf698fbc67d127ad5a63ac7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Sep 2020 11:16:54 +0000
Subject: [PATCH 0409/1854] lib/py: remove unused variable

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 9c8e1447d..b4b55c910 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -418,7 +418,6 @@ class ipc_msg_queue_handler:
         return messages
 
     def dump(self, extra, f, pbuff):
-        entry = pb2dict.pb2dict(pbuff)
         for i in range(0, len(extra), 2):
             msg = pb.ipc_msg()
             pb2dict.dict2pb(extra[i], msg)

From a0298680486369a86870318dc9b5a85fa7232242 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Sep 2020 11:18:09 +0000
Subject: [PATCH 0410/1854] coredump: remove two unused variables

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 coredump/criu_coredump/coredump.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 68dc16bf2..459714da6 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -523,7 +523,6 @@ class coredump_generator:
                 continue
 
             shmid = vma["shmid"]
-            size = vma["end"] - vma["start"]
             off = vma["pgoff"] / PAGESIZE
 
             files = self.reg_files
@@ -822,8 +821,6 @@ class coredump_generator:
         for vma in mm["vmas"]:
             size = self._get_vma_dump_size(vma)
 
-            chunk = self._gen_mem_chunk(pid, vma, size)
-
             v = vma_class()
             v.filesz = self._get_vma_dump_size(vma)
             v.data = self._gen_mem_chunk(pid, vma, v.filesz)

From 820525fe8dbaa93d82a06597d62bc54854214f07 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Sep 2020 11:18:37 +0000
Subject: [PATCH 0411/1854] bfd: remove unused line

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/bfd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/bfd.c b/criu/bfd.c
index 05824551b..535c4d354 100644
--- a/criu/bfd.c
+++ b/criu/bfd.c
@@ -198,8 +198,7 @@ again:
 
 		if (b->sz == BUFSIZE) {
 			pr_err("The bfd buffer is too small\n");
-			ERR_PTR(-EIO);
-			return NULL;
+			return ERR_PTR(-EIO);
 		}
 		/*
 		 * Last bytes may lack the \n at the

From 1d403eb18a42f8db07bed600e90daaa225b4fc8a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Sep 2020 11:22:26 +0000
Subject: [PATCH 0412/1854] Use 'is None' instead of '== None'

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 coredump/criu_coredump/coredump.py | 2 +-
 lib/py/cli.py                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 459714da6..b37ef2291 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -718,7 +718,7 @@ class coredump_generator:
                 # than one from maped file on disk.
                 page = page_mem
 
-            if page == None:
+            if page is None:
                 # Hole
                 page = PAGESIZE * "\0"
 
diff --git a/lib/py/cli.py b/lib/py/cli.py
index da343022e..94cc2f947 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -133,7 +133,7 @@ def ftype_find_in_image(opts, ft, fid, img):
     if f:
         return f[ft['field']]
 
-    if ft['img'] == None:
+    if ft['img'] is None:
         ft['img'] = pycriu.images.load(dinf(opts, img))['entries']
     for f in ft['img']:
         if f['id'] == fid:

From 9b1921fb70a65d3780477af5ce2b71b4d3654938 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Sep 2020 11:28:35 +0000
Subject: [PATCH 0413/1854] sk-unix: do not overwrite function parameter

The function collect_one_unixsk() has a parameter 'i' and at the same
time has a variable, in a loop, with the name 'i'.

This is no real error or problem, because the function parameter 'i' is
never used in the whole function.

Just trying to reduce confusion and making a code checker happy.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/sk-unix.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 00d09cc11..5fcc0b461 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -2118,10 +2118,10 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 		if (memrchr(uname, 0, ulen)) {
 			/* replace zero characters */
 			char *s = alloca(ulen + 1);
-			int i;
+			int j;
 
-			for (i = 0; i < ulen; i++)
-				s[i] = uname[i] ? : '@';
+			for (j = 0; j < ulen; j++)
+				s[j] = uname[j] ? : '@';
 			uname = s;
 		}
 	} else if (ulen == 0) {

From d0db532979d493ed16483eec5c2286809bcd9eec Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 10:37:41 +0000
Subject: [PATCH 0414/1854] autofs: Potential leak of memory pointed to by
 'token'

Using strsep() moves the pointer of the original string and this
introduces a copy of the malloc()ed memory to be able to free() it
later.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/autofs.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index 3e93b7b85..c35ef39db 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -330,11 +330,11 @@ static int parse_options(char *options, AutofsEntry *entry, long *pipe_ino)
 static int autofs_revisit_options(struct mount_info *pm)
 {
 	FILE *f;
-	char *str;
+	char *buf;
 	int ret = -ENOMEM;
 
-	str = xmalloc(1024);
-	if (!str) {
+	buf = xmalloc(1024);
+	if (!buf) {
 		return -ENOMEM;
 	}
 
@@ -342,8 +342,9 @@ static int autofs_revisit_options(struct mount_info *pm)
 	if (!f)
 		goto free_str;
 
-	while (fgets(str, 1024, f)) {
+	while (fgets(buf, 1024, f)) {
 		int mnt_id = -1;
+		char *str = buf;
 		char *token;
 
 		/* Removing '/n' */
@@ -376,7 +377,7 @@ static int autofs_revisit_options(struct mount_info *pm)
 close_proc:
 	fclose(f);
 free_str:
-	free(str);
+	free(buf);
 	return ret;
 }
 

From cfcc0b14a6a3e6b57c8c5671a60069712636cff7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 10:42:46 +0000
Subject: [PATCH 0415/1854] coverity: ignore CHECKED_RETURN

Ignore coverity errors about CHECKED_RETURN.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/autofs.c | 1 +
 criu/cgroup.c | 1 +
 criu/mount.c  | 3 +++
 criu/net.c    | 1 +
 4 files changed, 6 insertions(+)

diff --git a/criu/autofs.c b/criu/autofs.c
index c35ef39db..8b25308d9 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -433,6 +433,7 @@ static int access_autofs_mount(struct mount_info *pm)
 		case 0:
 			/* We don't care about results.
 			 * All we need is to "touch" */
+			/* coverity[check_return] */
 			openat(autofs_mnt, mnt_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY);
 			_exit(0);
 
diff --git a/criu/cgroup.c b/criu/cgroup.c
index e7e15bc51..8576ee2f1 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1940,6 +1940,7 @@ static int rewrite_cgroup_roots(CgroupEntry *cge)
 		list_for_each_entry(o, &opts.new_cgroup_roots, node) {
 			unsigned old_mask = ctrl_mask;
 
+			/* coverity[check_return] */
 			cgroup_contains(ctrl->cnames, ctrl->n_cnames,
 					o->controller, &ctrl_mask);
 			if (old_mask != ctrl_mask) {
diff --git a/criu/mount.c b/criu/mount.c
index 25ef7f09e..2d6ee66db 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1188,6 +1188,7 @@ exit:
 
 static int set_is_overmounted(struct mount_info *mi)
 {
+	/* coverity[check_return] */
 	mnt_is_overmounted(mi);
 	return 0;
 }
@@ -1444,6 +1445,7 @@ int open_mountpoint(struct mount_info *pm)
 	return __open_mountpoint(pm, fd);
 err:
 	if (ns_old >= 0)
+		/* coverity[check_return] */
 		restore_ns(ns_old, &mnt_ns_desc);
 	close_safe(&fd);
 	if (fchdir(cwd_fd))
@@ -3508,6 +3510,7 @@ int prepare_mnt_ns(void)
 	return ret;
 err:
 	if (rst >= 0)
+		/* coverity[check_return] */
 		restore_ns(rst, &mnt_ns_desc);
 	return -1;
 }
diff --git a/criu/net.c b/criu/net.c
index 4f1f7d47f..91990412f 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2930,6 +2930,7 @@ void network_unlock(void)
 	rst_unlock_tcp_connections();
 
 	if (root_ns_mask & CLONE_NEWNET) {
+		/* coverity[check_return] */
 		run_scripts(ACT_NET_UNLOCK);
 		network_unlock_internal();
 	}

From cf4fe1fa1c07e1ce484d6163180740d5574b4e9c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 13:38:48 +0000
Subject: [PATCH 0416/1854] vdso-compat: let coverity know that the function
 does not return

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/vdso-compat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/vdso-compat.c b/criu/vdso-compat.c
index a68c0bace..8f5d19e10 100644
--- a/criu/vdso-compat.c
+++ b/criu/vdso-compat.c
@@ -13,6 +13,7 @@ static void exit_on(int ret, int err_fd, char *reason)
 	if (ret) {
 		syscall(__NR_write, err_fd, reason, strlen(reason));
 		syscall(__NR_exit, ret);
+		__builtin_unreachable();
 	}
 }
 /*

From 8e5acdd2d0d563f888d81f281664b2a98b486947 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 14:57:55 +0000
Subject: [PATCH 0417/1854] cr-dump: Potential leak of memory pointed to by
 'si'

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-dump.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index b9d29145c..4a839b3f6 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -946,6 +946,7 @@ static int dump_signal_queue(pid_t tid, SignalQueueEntry **sqe, bool group)
 			} else
 				pr_perror("ptrace");
 
+			xfree(si);
 			break;
 		}
 

From c98eb0384b2880fb1b44e82d000be24c27901860 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 15:06:55 +0000
Subject: [PATCH 0418/1854] restore: Value stored to 'ret' is never read

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-restore.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 472d960df..d94db5fd3 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1404,8 +1404,6 @@ static inline int fork_with_pid(struct pstree_item *item)
 		ca.core = NULL;
 	}
 
-	ret = -1;
-
 	ca.item = item;
 	ca.clone_flags = rsti(item)->clone_flags;
 

From def84b8ef57f7d983b626c2ec5bce835f2c2cb0a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 16:49:35 +0000
Subject: [PATCH 0419/1854] coverity: fix parameter_hidden: declaration hides
 parameter

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/libnetlink.c |  6 +++---
 criu/path.c       |  6 +++---
 criu/pstree.c     | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/criu/libnetlink.c b/criu/libnetlink.c
index 18a323b8d..f9da58e9a 100644
--- a/criu/libnetlink.c
+++ b/criu/libnetlink.c
@@ -20,9 +20,9 @@ static int nlmsg_receive(char *buf, int len,
 		if (hdr->nlmsg_seq != CR_NLMSG_SEQ)
 			continue;
 		if (hdr->nlmsg_type == NLMSG_DONE) {
-			int *len = (int *)NLMSG_DATA(hdr);
-			if (*len < 0)
-				return err_cb(*len, ns, arg);
+			int *length = (int *)NLMSG_DATA(hdr);
+			if (*length < 0)
+				return err_cb(*length, ns, arg);
 			return 0;
 		}
 		if (hdr->nlmsg_type == NLMSG_ERROR) {
diff --git a/criu/path.c b/criu/path.c
index 22a89a4aa..637d0fae2 100644
--- a/criu/path.c
+++ b/criu/path.c
@@ -88,11 +88,11 @@ char *mnt_get_sibling_path(struct mount_info *m,
 		len -= off;
 		path += off;
 	} else {
-		int len = strlen(cut_root);
-		if (strncmp(rpath, cut_root, len))
+		int length = strlen(cut_root);
+		if (strncmp(rpath, cut_root, length))
 			return NULL;
 		rpath += strlen(cut_root);
-		if (len > 0 && (rpath[0] && rpath[0] != '/'))
+		if (length > 0 && (rpath[0] && rpath[0] != '/'))
 			return NULL;
 	}
 	if (rpath[0] == '/')
diff --git a/criu/pstree.c b/criu/pstree.c
index a876615fb..f1513dc81 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -674,12 +674,12 @@ static int prepare_pstree_ids(pid_t pid)
 		leader = pstree_item_by_virt(item->sid);
 		BUG_ON(leader == NULL);
 		if (leader->pid->state != TASK_UNDEF) {
-			pid_t pid;
+			pid_t helper_pid;
 
-			pid = get_free_pid();
-			if (pid < 0)
+			helper_pid = get_free_pid();
+			if (helper_pid < 0)
 				break;
-			helper = lookup_create_item(pid);
+			helper = lookup_create_item(helper_pid);
 			if (helper == NULL)
 				return -1;
 
@@ -771,15 +771,15 @@ static int prepare_pstree_ids(pid_t pid)
 
 	/* Add a process group leader if it is absent  */
 	for_each_pstree_item(item) {
-		struct pid *pid;
+		struct pid *pgid;
 
 		if (!item->pgid || vpid(item) == item->pgid)
 			continue;
 
-		pid = pstree_pid_by_virt(item->pgid);
-		if (pid->state != TASK_UNDEF) {
-			BUG_ON(pid->state == TASK_THREAD);
-			rsti(item)->pgrp_leader = pid->item;
+		pgid = pstree_pid_by_virt(item->pgid);
+		if (pgid->state != TASK_UNDEF) {
+			BUG_ON(pgid->state == TASK_THREAD);
+			rsti(item)->pgrp_leader = pgid->item;
 			continue;
 		}
 
@@ -791,7 +791,7 @@ static int prepare_pstree_ids(pid_t pid)
 		if (current_pgid == item->pgid)
 			continue;
 
-		helper = pid->item;
+		helper = pgid->item;
 
 		helper->sid = item->sid;
 		helper->pgid = item->pgid;

From b47cb053911650d156dd3aee2ce85f06928c17f6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 17:05:15 +0000
Subject: [PATCH 0420/1854] dump: Potential leak of memory pointed to by 'si'

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-dump.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 4a839b3f6..10b13f17d 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -936,8 +936,10 @@ static int dump_signal_queue(pid_t tid, SignalQueueEntry **sqe, bool group)
 		}
 
 		nr = ret = ptrace(PTRACE_PEEKSIGINFO, tid, &arg, si);
-		if (ret == 0)
+		if (ret == 0) {
+			xfree(si);
 			break; /* Finished */
+		}
 
 		if (ret < 0) {
 			if (errno == EIO) {
@@ -954,6 +956,7 @@ static int dump_signal_queue(pid_t tid, SignalQueueEntry **sqe, bool group)
 		queue->signals = xrealloc(queue->signals, sizeof(*queue->signals) * queue->n_signals);
 		if (!queue->signals) {
 			ret = -1;
+			xfree(si);
 			break;
 		}
 

From ed905a002acc5a5c509c9d0e3229ebafcf68ea48 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Oct 2020 06:27:17 +0000
Subject: [PATCH 0421/1854] util: fix double_close false positive

Coverity does not understand how close_fds() works.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/util.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/util.c b/criu/util.c
index 27751880c..670ef158d 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -534,6 +534,7 @@ static int close_fds(int minfd)
 			continue;
 		if (fd < minfd)
 			continue;
+		/* coverity[double_close] */
 		close(fd);
 	}
 	closedir(dir);

From cfeb9c10ffb73e62c5b33537be2263b0ce778566 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 15:03:10 +0000
Subject: [PATCH 0422/1854] cr-dump: get_service_fd() is passed to a parameter
 that cannot be negative

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-dump.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 10b13f17d..193a49c4d 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1099,8 +1099,16 @@ static int dump_zombies(void)
 	int ret = -1;
 	int pidns = root_ns_mask & CLONE_NEWPID;
 
-	if (pidns && set_proc_fd(get_service_fd(CR_PROC_FD_OFF)))
-		return -1;
+	if (pidns) {
+		int fd;
+
+		fd = get_service_fd(CR_PROC_FD_OFF);
+		if (fd < 0)
+			return -1;
+
+		if (set_proc_fd(fd))
+			return -1;
+	}
 
 	/*
 	 * We dump zombies separately because for pid-ns case

From 04d7b71570834638c19bef0c335dda962c158091 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Oct 2020 08:23:01 +0000
Subject: [PATCH 0423/1854] sk-unix: ignore coverity chroot() warning

criu/sk-unix.c:1173: chroot_call: Calling chroot: "chroot(".")".
criu/sk-unix.c:1175: chroot: Calling function "close_safe" after chroot() but before calling chdir("/").

criu/sk-unix.c:1251: chroot_call: Calling chroot: "chroot(".")".
criu/sk-unix.c:1263: chroot: Calling function "print_on_level" after chroot() but before calling chdir("/").

Coverity also says:

175312, 175313 Insecure chroot

If a call to chroot is not followed by a call to chdir("/") the chroot jail confinement can be violated.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/sk-unix.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 5fcc0b461..a3964081b 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1170,6 +1170,7 @@ static int revert_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *ro
 	if (*ns_fd >= 0 && restore_ns(*ns_fd, &mnt_ns_desc))
 		ret = -1;
 	if (*root_fd >= 0) {
+		/* coverity[chroot_call] */
 		if (fchdir(*root_fd) || chroot("."))
 			pr_perror("Can't revert root directory");
 		close_safe(root_fd);
@@ -1248,6 +1249,7 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd,
 			goto err;
 		}
 		close(fd);
+		/* coverity[chroot_call] */
 		if (chroot(".")) {
 			pr_perror("Unable to change root directory");
 			goto err;

From 097c931ed376970634ee202d3dc5529ceb1e21b2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Oct 2020 08:46:26 +0000
Subject: [PATCH 0424/1854] coverity: img_raw_fd() returns a negative number

criu/pagemap.c:245: negative_return_fn: Function "img_raw_fd(pr->pi)" returns a negative number.
criu/pagemap.c:245: assign: Assigning: "fd" = "img_raw_fd(pr->pi)".
criu/pagemap.c:258: negative_returns: "fd" is passed to a parameter that cannot be negative.

criu/ipc_ns.c:762: negative_return_fn: Function "img_raw_fd(img)" returns a negative number.
criu/ipc_ns.c:762: assign: Assigning: "ifd" = "img_raw_fd(img)".
criu/ipc_ns.c:768: negative_returns: "ifd" is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/ipc_ns.c  | 4 ++++
 criu/pagemap.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index 915aea20b..e7049599f 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -760,6 +760,10 @@ static int restore_content(void *data, struct cr_img *img, const IpcShmEntry *sh
 	ssize_t size, off;
 
 	ifd = img_raw_fd(img);
+	if (ifd < 0) {
+		pr_err("Failed getting raw image fd\n");
+		return -1;
+	}
 	size = round_up(shm->size, sizeof(u32));
 	off = 0;
 	do {
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 33bce10e3..abcdcdfd5 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -242,10 +242,15 @@ static int read_parent_page(struct page_read *pr, unsigned long vaddr,
 static int read_local_page(struct page_read *pr, unsigned long vaddr,
 			   unsigned long len, void *buf)
 {
-	int fd = img_raw_fd(pr->pi);
+	int fd;
 	ssize_t ret;
 	size_t curr = 0;
 
+	fd = img_raw_fd(pr->pi);
+	if (fd < 0) {
+		pr_err("Failed getting raw image fd\n");
+		return -1;
+	}
 	/*
 	 * Flush any pending async requests if any not to break the
 	 * linear reading from the pages.img file.

From 1ecaee67a57c5c2f3b6b8b2c51d59fc69f5214b8 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Oct 2020 10:15:04 +0000
Subject: [PATCH 0425/1854] namespaces: fix 'Declaring variable "path" without
 initializer'

criu/namespaces.c:529: var_decl: Declaring variable "path" without initializer.
criu/namespaces.c:602: uninit_use_in_call: Using uninitialized value "*path" as argument to "%s" when calling "print_on_level".

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/namespaces.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 796f412c5..384c9ca0c 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -537,7 +537,10 @@ static int open_ns_fd(struct file_desc *d, int *new_fd)
 		else
 			break;
 		fd = fdstore_get(nsfd_id);
-		goto check_open;
+		if (fd < 0) {
+			return -1;
+		}
+		goto out;
 	}
 
 	/*
@@ -597,12 +600,11 @@ static int open_ns_fd(struct file_desc *d, int *new_fd)
 	path[sizeof(path) - 1] = '\0';
 
 	fd = open(path, nfi->nfe->flags);
-check_open:
 	if (fd < 0) {
 		pr_perror("Can't open file %s on restore", path);
 		return fd;
 	}
-
+out:
 	*new_fd = fd;
 	return 0;
 }

From 20a83e77c94af432e7e23185019b76312cc45d5e Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 7 Nov 2020 13:22:20 +0000
Subject: [PATCH 0426/1854] ci: 'fix' lazy tests

Most (all?) lazy tests are not being executed if "$KERN_MAJ" -ge "4" and
"$KERN_MIN" -ge "18". Currently most CI systems are running on something
with 5.4.x which means $KERN_MAJ is greater than 4 but $KERN_MIN is less
than 18 and so we are not running any lazy tests.

This commit removes the complete lazy test kernel version detection as
kernels on the CI systems are new enough to always have all required
features.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index fab392ff2..063921c6e 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -172,23 +172,17 @@ fi
 # shellcheck disable=SC2086
 ./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
 
-KERN_MAJ=$(uname -r | cut -d. -f1)
-KERN_MIN=$(uname -r | cut -d. -f2)
-if [ "$KERN_MAJ" -ge "4" ] && [ "$KERN_MIN" -ge "18" ]; then
-	LAZY_EXCLUDE="-x cmdlinenv00 -x maps007"
-else
-	LAZY_EXCLUDE="-x maps007 -x fork -x fork2 -x uffd-events -x cgroupns
-		      -x socket_listen -x socket_listen6 -x cmdlinenv00
-		      -x socket_close_data01 -x file_read -x lazy-thp -x futex"
-fi
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps04"
+LAZY_EXCLUDE="-x maps04 -x cmdlinenv00 -x maps007"
 
 LAZY_TESTS='.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*'
 LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 
-./test/zdtm.py run "$LAZY_OPTS" --lazy-pages
-./test/zdtm.py run "$LAZY_OPTS" --remote-lazy-pages
-./test/zdtm.py run "$LAZY_OPTS" --remote-lazy-pages --tls
+# shellcheck disable=SC2086
+./test/zdtm.py run $LAZY_OPTS --lazy-pages
+# shellcheck disable=SC2086
+./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages
+# shellcheck disable=SC2086
+./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
 
 bash ./test/jenkins/criu-fault.sh
 bash ./test/jenkins/criu-fcg.sh

From ebea8f560ff8a8e3ed98efbc2c5fb95596a37eca Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 8 Nov 2020 09:50:23 +0200
Subject: [PATCH 0427/1854] ci: fix lazy-pages test selection

The special characters in the test selection regexp should no be esaped
for the regexp to work properly.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 scripts/ci/run-ci-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 063921c6e..29a0524d2 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -174,7 +174,7 @@ fi
 
 LAZY_EXCLUDE="-x maps04 -x cmdlinenv00 -x maps007"
 
-LAZY_TESTS='.*\(maps0\|uffd-events\|lazy-thp\|futex\|fork\).*'
+LAZY_TESTS='.*(maps0|uffd-events|lazy-thp|futex|fork).*'
 LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 
 # shellcheck disable=SC2086

From b6e4dae22e95810739831188cd1f75a94990fdb1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 7 Nov 2020 19:14:10 +0000
Subject: [PATCH 0428/1854] criu-ns: Remove unreachable statement

Raising an exception breaks out of the normal
flow of control of a code block. When an exception
is not handled, the interpreter terminates execution
of the program, or returns to its interactive main loop.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index dc6da8401..05635b160 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -81,7 +81,6 @@ def wrap_restore():
 		# Spawn CRIU binary
 		run_criu()
 		raise OSError(errno.ENOENT, "No such command")
-		sys.exit(0)
 
 	# Wait for CRIU to exit and report the status back
 	while True:

From 247523c0cf2ae57892e851d5d7b8edaf3348732e Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 30 Sep 2020 13:08:02 +0000
Subject: [PATCH 0429/1854] travis: rename centos test to centos7

Because it is actually running on CentOS 7 and to easier distinguish it
from the new CentOS 8 test.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                                             | 2 +-
 scripts/build/{Dockerfile.centos => Dockerfile.centos7} | 0
 scripts/build/Makefile                                  | 2 +-
 scripts/ci/Makefile                                     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename scripts/build/{Dockerfile.centos => Dockerfile.centos7} (100%)

diff --git a/.travis.yml b/.travis.yml
index fc95844b3..da4c85c4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,7 @@ jobs:
       dist: bionic
     - os: linux
       arch: amd64
-      env: TR_ARCH=centos
+      env: TR_ARCH=centos7
       dist: bionic
     - os: linux
       arch: amd64
diff --git a/scripts/build/Dockerfile.centos b/scripts/build/Dockerfile.centos7
similarity index 100%
rename from scripts/build/Dockerfile.centos
rename to scripts/build/Dockerfile.centos7
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 974d1455f..0fe466303 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,4 +1,4 @@
-ARCHES := x86_64 fedora-asan fedora-rawhide centos armv7hf
+ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 513d58bfb..098ed1e14 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -11,7 +11,7 @@ ifdef CLANG
 	target-suffix = -clang
 endif
 
-TARGETS := alpine fedora-rawhide centos
+TARGETS := alpine fedora-rawhide centos7
 ZDTM_OPTIONS :=
 UNAME := $(shell uname -m)
 

From b0676302fbc5ed7c96a17289732b531e8cb76763 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 7 Nov 2020 12:40:22 +0000
Subject: [PATCH 0430/1854] ci: switch centos7 to github actions

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/centos-test.yml | 15 +++++++++++++++
 scripts/ci/Makefile               | 12 +++++++++++-
 scripts/ci/run-ci-tests.sh        |  8 +++++---
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/centos-test.yml

diff --git a/.github/workflows/centos-test.yml b/.github/workflows/centos-test.yml
new file mode 100644
index 000000000..41b1f3a6e
--- /dev/null
+++ b/.github/workflows/centos-test.yml
@@ -0,0 +1,15 @@
+name: CentOS Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        target: [centos7]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run CentOS ${{ matrix.target }} Test
+      run: sudo -E make -C scripts/ci ${{ matrix.target }}
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 098ed1e14..b75314a0a 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -27,10 +27,20 @@ endef
 
 export DOCKER_JSON
 
+ifeq ($(GITHUB_ACTIONS),true)
+	# GitHub Actions does not give us a real TTY and errors out with
+	# 'the input device is not a TTY' if using '-t'
+	CONTAINER_TERMINAL := -i
+else
+	CONTAINER_TERMINAL := -it
+endif
+
+export CONTAINER_TERMINAL
+
 ifeq ($(UNAME),x86_64)
 	# On anything besides x86_64 Travis is running unprivileged LXD
 	# containers which do not support running docker with '--privileged'.
-	CONTAINER_OPTS := --rm -it --privileged -v /lib/modules:/lib/modules --tmpfs /run
+	CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged -v /lib/modules:/lib/modules --tmpfs /run
 else
 	CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
 endif
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 29a0524d2..e470bf62a 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -193,7 +193,11 @@ if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 fi
 #make -C test/others/exec/ run
 make -C test/others/make/ run CC="$CC"
-make -C test/others/shell-job/ run
+if [ -n "$TRAVIS" ]; then
+       # GitHub Actions does not provide a real TTY and CRIU will fail with:
+       # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
+       make -C test/others/shell-job/ run
+fi
 make -C test/others/rpc/ run
 
 ./test/zdtm.py run -t zdtm/static/env00 --sibling
@@ -223,5 +227,3 @@ make -C test/others/libcriu run
 
 # external namespace testing
 make -C test/others/ns_ext run
-
-make -C test/others/shell-job

From 7db0c7c02b5125bed620d1e4bef20a4185d115a0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 28 Sep 2020 16:34:24 +0000
Subject: [PATCH 0431/1854] ci: add CentOS 8 based CI run

Our CentOS based CI run is based on CentOS 7. CentOS 8 exists already
for some time and CentOS 7 will probably go end of life at some point.

This adds a CentOS 8 based CI run to be prepared for the time CentOS 7
goes away.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/centos-test.yml |  2 +-
 scripts/build/Dockerfile.centos8  | 56 +++++++++++++++++++++++++++++++
 scripts/build/Makefile            |  2 +-
 scripts/ci/Makefile               |  2 +-
 4 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 scripts/build/Dockerfile.centos8

diff --git a/.github/workflows/centos-test.yml b/.github/workflows/centos-test.yml
index 41b1f3a6e..e14c2460b 100644
--- a/.github/workflows/centos-test.yml
+++ b/.github/workflows/centos-test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        target: [centos7]
+        target: [centos7, centos8]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
new file mode 100644
index 000000000..0b658d5fa
--- /dev/null
+++ b/scripts/build/Dockerfile.centos8
@@ -0,0 +1,56 @@
+FROM registry.centos.org/centos/centos:8
+
+ARG CC=gcc
+ARG ENV1=FOOBAR
+
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
+RUN yum config-manager --set-enabled PowerTools
+RUN yum install -y --allowerasing \
+	asciidoc \
+	ccache \
+	coreutils \
+	chkconfig \
+	diffutils \
+	findutils \
+	gcc \
+	git \
+	gnutls-devel \
+	iproute \
+	iptables \
+	libaio-devel \
+	libasan \
+	libcap-devel \
+	libnet-devel \
+	libnl3-devel \
+	libselinux-devel \
+	make \
+	procps-ng \
+	protobuf-c-devel \
+	protobuf-devel \
+	python3-devel \
+	python3-flake8 \
+	python3-PyYAML \
+	python3-future \
+	python3-protobuf \
+	python3-pip \
+	sudo \
+	tar \
+	which \
+	xmlto
+
+RUN alternatives --set python /usr/bin/python3
+ENV PYTHON=python3
+
+COPY . /criu
+WORKDIR /criu
+
+ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
+RUN mv .ccache /tmp && make mrproper && ccache -sz  && \
+	date && make -j $(nproc) CC="$CC" && date && ccache -s
+
+# The rpc test cases are running as user #1000, let's add the user
+RUN adduser -u 1000 test
+
+RUN pip3 install junit_xml
+
+RUN make -C test/zdtm -j $(nproc)
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 0fe466303..85bbf2010 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,4 +1,4 @@
-ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf
+ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index b75314a0a..ffa78446a 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -11,7 +11,7 @@ ifdef CLANG
 	target-suffix = -clang
 endif
 
-TARGETS := alpine fedora-rawhide centos7
+TARGETS := alpine fedora-rawhide centos7 centos8
 ZDTM_OPTIONS :=
 UNAME := $(shell uname -m)
 

From 56a70ff99b7c1ddad4b909e3ae6906e13722ac4d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 8 Nov 2020 11:54:20 +0000
Subject: [PATCH 0432/1854] uffd: fix 'double free detected in tcache 2'

One of the previous static code analyzer fixes added a xfree() at the
end of cr_lazy_pages(). It can, however, happen that during
complete_forks() the memory location for events is moved by xrealloc()
and the final xfree() will be done on the wrong address.

Passing &events to handle_requests() enables the xfree() to free the
correct and changed memory location.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/uffd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index a6886ca10..958edab2f 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1254,18 +1254,18 @@ static void lazy_pages_summary(struct lazy_pages_info *lpi)
 #endif
 }
 
-static int handle_requests(int epollfd, struct epoll_event *events, int nr_fds)
+static int handle_requests(int epollfd, struct epoll_event **events, int nr_fds)
 {
 	struct lazy_pages_info *lpi, *n;
 	int poll_timeout = -1;
 	int ret;
 
 	for (;;) {
-		ret = epoll_run_rfds(epollfd, events, nr_fds, poll_timeout);
+		ret = epoll_run_rfds(epollfd, *events, nr_fds, poll_timeout);
 		if (ret < 0)
 			goto out;
 		if (ret > 0) {
-			ret = complete_forks(epollfd, &events, &nr_fds);
+			ret = complete_forks(epollfd, events, &nr_fds);
 			if (ret < 0)
 				goto out;
 			if (restore_finished)
@@ -1481,7 +1481,7 @@ int cr_lazy_pages(bool daemon)
 		}
 	}
 
-	ret = handle_requests(epollfd, events, nr_fds);
+	ret = handle_requests(epollfd, &events, nr_fds);
 
 	tls_terminate_session();
 

From 528ce259879242ca2cd56269bd71238b6ec4e5ff Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 12 Nov 2020 11:17:01 +0000
Subject: [PATCH 0433/1854] uffd: handle xrealloc() failure

In the case, that xrealloc() fails do not overwrite the original pointer
to be able to free the original pointer on exit.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/uffd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index 958edab2f..96586ad19 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1131,6 +1131,7 @@ out:
 static int complete_forks(int epollfd, struct epoll_event **events, int *nr_fds)
 {
 	struct lazy_pages_info *lpi, *n;
+	struct epoll_event *tmp;
 
 	if (list_empty(&pending_lpis))
 		return 1;
@@ -1138,9 +1139,10 @@ static int complete_forks(int epollfd, struct epoll_event **events, int *nr_fds)
 	list_for_each_entry(lpi, &pending_lpis, l)
 		(*nr_fds)++;
 
-	*events = xrealloc(*events, sizeof(struct epoll_event) * (*nr_fds));
-	if (!*events)
+	tmp = xrealloc(*events, sizeof(struct epoll_event) * (*nr_fds));
+	if (!tmp)
 		return -1;
+	*events = tmp;
 
 	list_for_each_entry_safe(lpi, n, &pending_lpis, l) {
 		if (epoll_add_rfd(epollfd, &lpi->lpfd))

From b93fe2b2d65b7e71e52461b57e49423cc5d791a1 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 11 Nov 2020 20:01:03 +0000
Subject: [PATCH 0434/1854] vdso: Let zero-terminator in vdso_symbol_length

When vdso symbol is copied, it should be zero-terminated.
The logging code wants to print vdso names that differ
between vdso from images and vdso that's provided by kernel:

: pr_info("[%zu]`%s` offset differs: %lx != %lx (rt)\n",
:		i, sym_name, sym_offset, rt_sym_offset);

In unlikely event when vdso function name is longer than 32
(not any currently), null-terminator is missing.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/pie/util-vdso.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index 58b27680c..ff91a3b12 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -222,7 +222,7 @@ static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 	const char *vdso_symbols[VDSO_SYMBOL_MAX] = {
 		ARCH_VDSO_SYMBOLS
 	};
-	const size_t vdso_symbol_length = sizeof(t->symbols[0].name);
+	const size_t vdso_symbol_length = sizeof(t->symbols[0].name) - 1;
 
 	Hash_t nbucket, nchain;
 	Hash_t *bucket, *chain;
@@ -265,6 +265,7 @@ static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 			if (std_strncmp(name, symbol, vdso_symbol_length))
 				continue;
 
+			/* XXX: provide strncpy() implementation for PIE */
 			memcpy(t->symbols[i].name, name, vdso_symbol_length);
 			t->symbols[i].offset = (unsigned long)sym->st_value - load->p_vaddr;
 			break;

From c39ed518f099dafa98396ab9d66821afcce6b09a Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 11 Nov 2020 23:14:39 +0000
Subject: [PATCH 0435/1854] compel/log: Stop parsing at unknown format
 specifier

Currently if the specifier can't be parsed - error message is printed
and parsing of the format string continues. That's wrong as the argument
for the specifier will be used for the next specifier. I.e:
  pr_info("[%zu]`%s`\n", 0UL, "")
will crash PIE because %u is not known and the argument (0UL) will be
used for dereferencing string for %s.

Stop parsing printf position arguments at an unknown specifier.
Make this string visible so that `grep Error` in zdtm.py will catch it:

=[log]=> dump/zdtm/static/busyloop00/52/1/restore.log
------------------------ grep Error ------------------------
b'(00.001847) pie: 52: vdso: ['
b'Error: Unknown printf format %u'
------------------------ ERROR OVER ------------------------
Send the 15 signal to  52
Wait for zdtm/static/busyloop00(52) to die for 0.100000
======================= Test zdtm/static/busyloop00 PASS =======================

Reported-by: @ashwani29
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/plugins/std/log.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compel/plugins/std/log.c b/compel/plugins/std/log.c
index f9be432ea..3fb66c2cd 100644
--- a/compel/plugins/std/log.c
+++ b/compel/plugins/std/log.c
@@ -330,9 +330,10 @@ static void sbuf_printf(struct simple_buf *b, const char *format, va_list args)
 			print_hex_l((unsigned long)va_arg(args, void *), b);
 			break;
 		default:
-			print_string("UNKNOWN FORMAT ", b);
+			print_string("\nError: Unknown printf format %", b);
 			sbuf_putc(b, *s);
-			break;
+			sbuf_putc(b, '\n');
+			return;
 		}
 		s++;
 	}

From b28eb7b2d18184cf8ef1a8f95719f47499967c8c Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 12 Nov 2020 00:26:11 +0000
Subject: [PATCH 0436/1854] compel/log: Provide %u specifier parsing

%u is quite common and I remember there were workarounds to print
(unsigned long) as long or whatever.
Just support it from now - it's not hard and not much code.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/plugins/std/log.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/compel/plugins/std/log.c b/compel/plugins/std/log.c
index 3fb66c2cd..005348246 100644
--- a/compel/plugins/std/log.c
+++ b/compel/plugins/std/log.c
@@ -225,6 +225,22 @@ done:
 	print_string(s, b);
 }
 
+static void print_num_u(unsigned long num, struct simple_buf *b)
+{
+	char buf[22], *s;
+
+	buf[21] = '\0';
+	s = &buf[21];
+
+	do {
+		s--;
+		*s = (num % 10) + '0';
+		num /= 10;
+	} while (num > 0);
+
+	print_string(s, b);
+}
+
 static void hexdigit(unsigned int v, char *to, char **z)
 {
 	*to = "0123456789abcdef"[v & 0xf];
@@ -329,6 +345,12 @@ static void sbuf_printf(struct simple_buf *b, const char *format, va_list args)
 		case 'p':
 			print_hex_l((unsigned long)va_arg(args, void *), b);
 			break;
+		case 'u':
+			if (along)
+				print_num_u(va_arg(args, unsigned long), b);
+			else
+				print_num_u(va_arg(args, unsigned), b);
+			break;
 		default:
 			print_string("\nError: Unknown printf format %", b);
 			sbuf_putc(b, *s);

From fb21643b285b57b740aa7fe598503cbaca91e870 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 20 Nov 2020 20:44:59 +0000
Subject: [PATCH 0437/1854] tls: Add logging within send/recv callbacks

Log messages showing the send/recv errno value would
help us to debug issues such as #1280.

Example:
    Error (criu/tls.c:321): tls: Pull callback recv failed: Connection reset by peer'
    Error (criu/tls.c:147): tls: Failed receiving data: Error in the pull function.'
    Error (criu/page-xfer.c:1225): page-xfer: Can't read pagemap from socket: I/O error"

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/tls.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/criu/tls.c b/criu/tls.c
index f7b94dee8..e865368c4 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -303,13 +303,25 @@ static int tls_x509_setup_creds(void)
 static ssize_t _tls_push_cb(void *p, const void* data, size_t sz)
 {
 	int fd = *(int *)(p);
-	return send(fd, data, sz, tls_sk_flags);
+	int ret = send(fd, data, sz, tls_sk_flags);
+	if (ret < 0 && errno != EAGAIN) {
+		int _errno = errno;
+		pr_perror("Push callback send failed");
+		errno = _errno;
+	}
+	return ret;
 }
 
 static ssize_t _tls_pull_cb(void *p, void* data, size_t sz)
 {
 	int fd = *(int *)(p);
-	return recv(fd, data, sz, tls_sk_flags);
+	int ret = recv(fd, data, sz, tls_sk_flags);
+	if (ret < 0 && errno != EAGAIN) {
+		int _errno = errno;
+		pr_perror("Pull callback recv failed");
+		errno = _errno;
+	}
+	return ret;
 }
 
 static int tls_x509_setup_session(unsigned int flags)

From 5bb4406e94a957e5a1e2257b94fce990043d6a47 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 4 Nov 2020 07:51:32 +0000
Subject: [PATCH 0438/1854] ci: use graviton2 for arm64 tests on Travis

Using travis-ci.com instead of travis-ci.org offers access to bare metal
aarch64 based systems and thus enabling us to run the full CRIU CI test
suite.

Switch arm64 based tests to arm64-graviton2 for tests.

This is the first non x86_64 architecture running tests and not just
compile in Travis.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                                   | 14 +++++++----
 scripts/ci/run-ci-tests.sh                    | 23 ++++++++++++++-----
 test/others/libcriu/run.sh                    |  5 +++-
 test/zdtm/static/netns-nf.desc                |  2 +-
 .../static/socket-tcp-closed-last-ack.desc    |  4 ++--
 test/zdtm/static/socket-tcp-reseted.desc      |  6 ++---
 test/zdtm/static/socket-tcp-syn-sent.desc     |  4 ++--
 7 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da4c85c4e..1c6da2a8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,12 +29,16 @@ jobs:
       env: TR_ARCH=local
       dist: bionic
     - os: linux
-      arch: arm64
-      env: TR_ARCH=local
-      dist: bionic
+      arch: arm64-graviton2
+      env: TR_ARCH=local RUN_TESTS=1
+      dist: focal
+      group: edge
+      virt: vm
     - os: linux
-      arch: arm64
-      env: TR_ARCH=local CLANG=1
+      arch: arm64-graviton2
+      env: TR_ARCH=local CLANG=1 RUN_TESTS=1
+      group: edge
+      virt: vm
       dist: bionic
     - os: linux
       arch: arm64
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index e470bf62a..648d5886c 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -31,7 +31,11 @@ if [ "$UNAME_M" != "x86_64" ]; then
 	# For Travis only x86_64 seems to be baremetal. Other
 	# architectures are running in unprivileged LXD containers.
 	# That seems to block most of CRIU's interfaces.
-	SKIP_CI_TEST=1
+
+	# But with the introduction of baremetal aarch64 systems in
+	# Travis (arch: arm64-graviton2) we can override this using
+	# an evironment variable
+	[ -n "$RUN_TESTS" ] || SKIP_CI_TEST=1
 fi
 
 ci_prep () {
@@ -147,8 +151,11 @@ time make CC="$CC" -j4 -C test/zdtm
 umask 0000
 ./criu/criu check
 ./criu/criu check --all || echo $?
-./criu/criu cpuinfo dump
-./criu/criu cpuinfo check
+if [ "$UNAME_M" == "x86_64" ]; then
+	# This fails on aarch64 (aws-graviton2)
+	./criu/criu cpuinfo dump
+	./criu/criu cpuinfo check
+fi
 
 export SKIP_PREP=1
 # The 3.19 kernel (from Ubuntu 14.04) has a bug. When /proc/PID/pagemap
@@ -184,9 +191,13 @@ LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 # shellcheck disable=SC2086
 ./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
 
-bash ./test/jenkins/criu-fault.sh
-bash ./test/jenkins/criu-fcg.sh
-bash ./test/jenkins/criu-inhfd.sh
+bash -x ./test/jenkins/criu-fault.sh
+if [ "$UNAME_M" == "x86_64" ]; then
+	# This fails on aarch64 (aws-graviton2) with:
+	# 33: ERR: thread-bomb.c:49: pthread_attr_setstacksize(): 22
+	bash -x ./test/jenkins/criu-fcg.sh
+fi
+bash -x ./test/jenkins/criu-inhfd.sh
 
 if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 	make -C test/others/mnt-ext-dev/ run
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index bd92f8544..5a0dca46b 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -48,7 +48,10 @@ function run_test {
 run_test test_sub
 run_test test_self
 run_test test_notify
-run_test test_iters
+if [ "$(uname -m)" == "x86_64" ]; then
+	# Skip this on aarch64 as aarch64 has no dirty page tracking
+	run_test test_iters
+fi
 run_test test_errno
 
 echo "== Tests done"
diff --git a/test/zdtm/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index 496477aa7..8fd3770bd 100644
--- a/test/zdtm/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
@@ -1,6 +1,6 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables',
-                '/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so',
+                '/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
                 '/usr/bin/diff'],
     'flags': 'suid',
     'flavor': 'ns uns'}
diff --git a/test/zdtm/static/socket-tcp-closed-last-ack.desc b/test/zdtm/static/socket-tcp-closed-last-ack.desc
index 8a9df7fc4..43afd920e 100644
--- a/test/zdtm/static/socket-tcp-closed-last-ack.desc
+++ b/test/zdtm/static/socket-tcp-closed-last-ack.desc
@@ -1,7 +1,7 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables',
-                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so',
-                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so',
+                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
+                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',
diff --git a/test/zdtm/static/socket-tcp-reseted.desc b/test/zdtm/static/socket-tcp-reseted.desc
index 94425b44e..744ed88c9 100644
--- a/test/zdtm/static/socket-tcp-reseted.desc
+++ b/test/zdtm/static/socket-tcp-reseted.desc
@@ -1,8 +1,8 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables',
-                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so',
-                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so',
-		'/usr/lib64/xtables/libipt_REJECT.so|/lib/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so',
+                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
+                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+		'/usr/lib64/xtables/libipt_REJECT.so|/lib/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/aarch64-linux-gnu/xtables/libipt_REJECT.so',
        ],
        'opts': '--tcp-established',
        'flags': 'suid nouser samens',
diff --git a/test/zdtm/static/socket-tcp-syn-sent.desc b/test/zdtm/static/socket-tcp-syn-sent.desc
index b9f3d5e6d..a27673681 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.desc
+++ b/test/zdtm/static/socket-tcp-syn-sent.desc
@@ -1,7 +1,7 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables',
-                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so',
-                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so',
+                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
+                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',

From 2d68627dc93a59073d53cf10861c83a6e70795f1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 12 Nov 2020 17:53:00 +0000
Subject: [PATCH 0439/1854] CI: remove centos7 from Travis

It is running on GitHub Actions

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c6da2a8a..a82ed910c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,10 +76,6 @@ jobs:
       arch: amd64
       env: TR_ARCH=alpine
       dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=centos7
-      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=fedora-asan

From 00bd72f325f3a8692d60b762feda303a59b0bf42 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 12 Nov 2020 11:07:18 +0000
Subject: [PATCH 0440/1854] ci: remove special handling for mips

For the schedule daily special definitions were needed for MIPS as it is
not part of the release branch. Now that the release branch contains
MIPS, it is no longer necessary to have separate files for MIPS.

This also changes to make the scheduled runs actually daily and not
hourly.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .../workflows/cross-compile-daily-mips.yml    | 22 -------------------
 .github/workflows/cross-compile-daily.yml     |  4 ++--
 .github/workflows/cross-compile-mips.yml      | 21 ------------------
 .github/workflows/cross-compile.yml           |  2 +-
 4 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/cross-compile-daily-mips.yml
 delete mode 100644 .github/workflows/cross-compile-mips.yml

diff --git a/.github/workflows/cross-compile-daily-mips.yml b/.github/workflows/cross-compile-daily-mips.yml
deleted file mode 100644
index 164f09c99..000000000
--- a/.github/workflows/cross-compile-daily-mips.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Daily Cross Compile Tests
-
-on:
-  schedule:
-    - cron:  '30 * * * *'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target: [mips64el-cross]
-        branches: [criu-dev]
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ matrix.branches }}
-    - name: Run Cross Compilation Targets
-      run: >
-        sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
index aed08f2c9..701213276 100644
--- a/.github/workflows/cross-compile-daily.yml
+++ b/.github/workflows/cross-compile-daily.yml
@@ -2,7 +2,7 @@ name: Daily Cross Compile Tests
 
 on:
   schedule:
-    - cron:  '30 * * * *'
+    - cron:  '30 12 * * *'
 
 jobs:
   build:
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross]
+        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
         branches: [criu-dev, master]
 
     steps:
diff --git a/.github/workflows/cross-compile-mips.yml b/.github/workflows/cross-compile-mips.yml
deleted file mode 100644
index 3b475ff03..000000000
--- a/.github/workflows/cross-compile-mips.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Cross Compile Tests
-
-on:
-  push:
-    branches: [criu-dev]
-  pull_request:
-    branches: [criu-dev]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        target: [mips64el-cross]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run Cross Compilation Targets
-      run: >
-        sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index d8143b397..90862e7ab 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross]
+        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
 
     steps:
     - uses: actions/checkout@v2

From 8ca4d6e5b04c7f10063440d84457091d523c1346 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 11 Nov 2020 01:24:48 +0000
Subject: [PATCH 0441/1854] cr-restore: Properly inspect status in
 sigchld_process()

Currently the code checks for SIGSTOP only if (!current).
Let's provide better status checks for debug-ability.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/cr-restore.c | 58 +++++++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d94db5fd3..8af2e2974 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1531,35 +1531,53 @@ err_unlock:
 	return ret;
 }
 
+/* Returns 0 if restore can be continued */
+static int sigchld_process(int status, pid_t pid)
+{
+	int sig;
+
+	if (WIFEXITED(status)) {
+		pr_err("%d exited, status=%d\n", pid, WEXITSTATUS(status));
+		return -1;
+	} else if (WIFSIGNALED(status)) {
+		sig = WTERMSIG(status);
+		pr_err("%d killed by signal %d: %s\n", pid, sig, strsignal(sig));
+		return -1;
+	} else if (WIFSTOPPED(status)) {
+		sig = WSTOPSIG(status);
+		/* The root task is ptraced. Allow it to handle SIGCHLD */
+		if (sig == SIGCHLD && !current) {
+			if (ptrace(PTRACE_CONT, pid, 0, SIGCHLD)) {
+				pr_perror("Unable to resume %d", pid);
+				return -1;
+			}
+			return 0;
+		}
+		pr_err("%d stopped by signal %d: %s\n", pid, sig, strsignal(sig));
+		return -1;
+	} else if (WIFCONTINUED(status)) {
+		pr_err("%d unexpectedly continued\n", pid);
+		return -1;
+	}
+	pr_err("wait for %d resulted in %x status\n", pid, status);
+	return -1;
+}
+
 static void sigchld_handler(int signal, siginfo_t *siginfo, void *data)
 {
-	int status, pid, exit;
-
 	while (1) {
+		int status;
+		pid_t pid;
+
 		pid = waitpid(-1, &status, WNOHANG);
 		if (pid <= 0)
 			return;
 
-		if (!current && WIFSTOPPED(status) &&
-					WSTOPSIG(status) == SIGCHLD) {
-			/* The root task is ptraced. Allow it to handle SIGCHLD */
-			if (ptrace(PTRACE_CONT, pid, 0, SIGCHLD))
-				pr_perror("Unable to resume %d", pid);
-			return;
-		}
-
-		exit = WIFEXITED(status);
-		status = exit ? WEXITSTATUS(status) : WTERMSIG(status);
-
-		break;
+		if (sigchld_process(status, pid) < 0)
+			goto err_abort;
 	}
 
-	if (exit)
-		pr_err("%d exited, status=%d\n", pid, status);
-	else
-		pr_err("%d killed by signal %d: %s\n",
-			pid, status, strsignal(status));
-
+err_abort:
 	futex_abort_and_wake(&task_entries->nr_in_progress);
 }
 

From 3b220215134f582dc654dbb32658475ae0bdd588 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 Nov 2020 11:31:40 +0300
Subject: [PATCH 0442/1854] uffd: cleanup read error handling in
 handle_uffd_event

We can't use errno in case read returned >=0 according to man.

Found in scope of #1277

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/uffd.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index 96586ad19..815b848bb 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1209,17 +1209,16 @@ static int handle_uffd_event(struct epoll_rfd *lpfd)
 	lpi = container_of(lpfd, struct lazy_pages_info, lpfd);
 
 	ret = read(lpfd->fd, &msg, sizeof(msg));
-	if (!ret)
-		return 1;
-
-	if (ret != sizeof(msg)) {
+	if (ret < 0) {
 		/* we've already handled the page fault for another thread */
 		if (errno == EAGAIN)
 			return 0;
-		if (ret < 0)
-			lp_perror(lpi, "Can't read uffd message");
-		else
-			lp_err(lpi, "Can't read uffd message: short read");
+		lp_perror(lpi, "Can't read uffd message");
+		return -1;
+	} else if (ret == 0) {
+		return 1;
+	} else if (ret != sizeof(msg)) {
+		lp_err(lpi, "Can't read uffd message: short read");
 		return -1;
 	}
 

From 9bdae79d0a82d89d6dc2b5087dd3baa8e8d7e248 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Thu, 19 Nov 2020 19:17:35 +0200
Subject: [PATCH 0443/1854] uffd: check for exited task when reading uffd_msg

Sometimes there are uffd messages in a queue of a dying task and by the
time these messages are processed in handle_request, the uffd is no
longer valid and reading from it causes errors.

Add processing of EBADF in handle_uffd_event() to gracefully handle such
situation.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 criu/uffd.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/uffd.c b/criu/uffd.c
index 815b848bb..e46042344 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1213,6 +1213,10 @@ static int handle_uffd_event(struct epoll_rfd *lpfd)
 		/* we've already handled the page fault for another thread */
 		if (errno == EAGAIN)
 			return 0;
+		if (errno == EBADF && lpi->exited) {
+			lp_debug(lpi, "excess message in queue: %d", msg.event);
+			return 0;
+		}
 		lp_perror(lpi, "Can't read uffd message");
 		return -1;
 	} else if (ret == 0) {

From 2c89954cc6ce7d23dabdc9a06774a697e6e71289 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 Nov 2020 13:06:13 +0300
Subject: [PATCH 0444/1854] zdtm: on fail with no error also print the tail of
 the log

We see strange cases there page-server or lazy-pages are exiting with
non-zero but print no errors, probably the tail of the log can help us
to understand what happened.

There are some other uses of grep_errors but let's only change cases
where we explicitly through an exeption on bad ret. For others I'm not
sure if we need extra output, e.g. for validly failing fault injections.

To debug #1280

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index dff64d4ed..a33807050 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1043,19 +1043,19 @@ class criu:
             ret = self.__dump_process.wait()
         if self.__lazy_pages_p:
             ret = self.__lazy_pages_p.wait()
-            grep_errors(os.path.join(self.__ddir(), "lazy-pages.log"))
+            grep_errors(os.path.join(self.__ddir(), "lazy-pages.log"), err=ret)
             self.__lazy_pages_p = None
             if ret:
                 raise test_fail_exc("criu lazy-pages exited with %s" % ret)
         if self.__page_server_p:
             ret = self.__page_server_p.wait()
-            grep_errors(os.path.join(self.__ddir(), "page-server.log"))
+            grep_errors(os.path.join(self.__ddir(), "page-server.log"), err=ret)
             self.__page_server_p = None
             if ret:
                 raise test_fail_exc("criu page-server exited with %s" % ret)
         if self.__dump_process:
             ret = self.__dump_process.wait()
-            grep_errors(os.path.join(self.__ddir(), "dump.log"))
+            grep_errors(os.path.join(self.__ddir(), "dump.log"), err=ret)
             self.__dump_process = None
             if ret:
                 raise test_fail_exc("criu dump exited with %s" % ret)
@@ -1357,7 +1357,7 @@ class criu:
 
         if self.__page_server_p:
             ret = self.__page_server_p.wait()
-            grep_errors(os.path.join(self.__ddir(), "page-server.log"))
+            grep_errors(os.path.join(self.__ddir(), "page-server.log"), err=ret)
             self.__page_server_p = None
             if ret:
                 raise test_fail_exc("criu page-server exited with %d" % ret)
@@ -2165,7 +2165,7 @@ def print_error(line):
     return False
 
 
-def grep_errors(fname):
+def grep_errors(fname, err=False):
     first = True
     print_next = False
     before = []
@@ -2186,6 +2186,17 @@ def grep_errors(fname):
                 if print_next:
                     print_next = print_error(line)
                     before = []
+
+    # If process failed but there are no errors in log,
+    # let's just print the log tail, probably it would
+    # be helpful.
+    if err and first:
+        print_fname(fname, 'log')
+        print_sep("grep Error (no)", "-", 60)
+        first = False
+        for i in before:
+            print_next = print_error(i)
+
     if not first:
         print_sep("ERROR OVER", "-", 60)
 

From b023f0ab5a59f8245fa5f8e6924adebb14d4e238 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 Nov 2020 12:40:20 +0300
Subject: [PATCH 0445/1854] vim: remove wrong 8-space tabs indent from python
 files

Probably all vim users can setup their desired indent in their vimrc by
themselfs.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/crit-recode.py | 2 --
 test/inhfd/tty.py   | 1 -
 test/zdtm.py        | 1 -
 3 files changed, 4 deletions(-)

diff --git a/test/crit-recode.py b/test/crit-recode.py
index adaf33733..4135681e1 100755
--- a/test/crit-recode.py
+++ b/test/crit-recode.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# vim: noet ts=8 sw=8 sts=8
-
 import pycriu
 import sys
 import os
diff --git a/test/inhfd/tty.py b/test/inhfd/tty.py
index c11a57117..984f60c64 100755
--- a/test/inhfd/tty.py
+++ b/test/inhfd/tty.py
@@ -1,4 +1,3 @@
-# vim: noet ts=8 sw=8 sts=8
 import fcntl
 import os
 import pty
diff --git a/test/zdtm.py b/test/zdtm.py
index a33807050..9488c6edb 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# vim: noet ts=8 sw=8 sts=8
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import argparse

From 6a7bb0b9f669351b1971786118f4ce926f228af0 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sun, 29 Nov 2020 19:08:26 +1100
Subject: [PATCH 0446/1854] docs: fix simple typo, clietn -> client

There is a small typo in test/zdtm/static/socket_aio.c, test/zdtm/static/socket_listen.c, test/zdtm/static/socket_listen4v6.c, test/zdtm/static/socket_listen6.c, test/zdtm/static/socket_udp-corked.c, test/zdtm/static/socket_udp.c, test/zdtm/static/socket_udplite.c.

Should read `client` rather than `clietn`.

Signed-off-by: Tim Gates <tim.gates@iress.com>
---
 test/zdtm/static/socket_aio.c        | 2 +-
 test/zdtm/static/socket_listen.c     | 2 +-
 test/zdtm/static/socket_udp-corked.c | 2 +-
 test/zdtm/static/socket_udp.c        | 2 +-
 test/zdtm/static/socket_udplite.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/zdtm/static/socket_aio.c b/test/zdtm/static/socket_aio.c
index b276adb2b..1dcdfec42 100644
--- a/test/zdtm/static/socket_aio.c
+++ b/test/zdtm/static/socket_aio.c
@@ -5,7 +5,7 @@ const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 /* Description:
  * Create two tcp socket, server send asynchronous request on
- * read data and clietn write data after migration
+ * read data and client write data after migration
  */
 
 #include <stdio.h>
diff --git a/test/zdtm/static/socket_listen.c b/test/zdtm/static/socket_listen.c
index d0acfd911..a4d3e66bd 100644
--- a/test/zdtm/static/socket_listen.c
+++ b/test/zdtm/static/socket_listen.c
@@ -16,7 +16,7 @@ const char *test_author = "Stanislav Kinsbursky <skinsbursky@openvz.org>";
 
 /* Description:
  * Create two tcp socket, server send asynchronous request on
- * read data and clietn write data after migration
+ * read data and client write data after migration
  */
 
 #include <stdio.h>
diff --git a/test/zdtm/static/socket_udp-corked.c b/test/zdtm/static/socket_udp-corked.c
index 30cfac5ec..540b9456a 100644
--- a/test/zdtm/static/socket_udp-corked.c
+++ b/test/zdtm/static/socket_udp-corked.c
@@ -5,7 +5,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
 
 /* Description:
  * Create two tcp socket, server send asynchronous request on
- * read data and clietn write data after migration
+ * read data and client write data after migration
  */
 
 #include <stdio.h>
diff --git a/test/zdtm/static/socket_udp.c b/test/zdtm/static/socket_udp.c
index 36a954237..cce29fc96 100644
--- a/test/zdtm/static/socket_udp.c
+++ b/test/zdtm/static/socket_udp.c
@@ -5,7 +5,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
 
 /* Description:
  * Create two tcp socket, server send asynchronous request on
- * read data and clietn write data after migration
+ * read data and client write data after migration
  */
 
 #include <stdio.h>
diff --git a/test/zdtm/static/socket_udplite.c b/test/zdtm/static/socket_udplite.c
index 229005a10..763df319b 100644
--- a/test/zdtm/static/socket_udplite.c
+++ b/test/zdtm/static/socket_udplite.c
@@ -5,7 +5,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
 
 /* Description:
  * Create two tcp socket, server send asynchronous request on
- * read data and clietn write data after migration
+ * read data and client write data after migration
  */
 
 #include <stdio.h>

From 98fbb766d618386eb2d7638b23365890bfde1491 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 3 Dec 2020 10:22:18 +0300
Subject: [PATCH 0447/1854] compel/handle-elf: override unexpected
 precalculated addresses

We've seen addresses in parasite.built-in.o precalculated by linker but
in some unexpected manner:

readelf -WS criu/pie/parasite.built-in.o
Section Headers:
  [Nr] Name              Type            Address          Off    Size   ES Flg Lk Inf Al
  [ 1] .text             PROGBITS        0000000000000000 000040 00400a 00  AX  0   0 16
  [87] .data             PROGBITS        0000000000000000 005000 000068 00  WA  0   0 4096
  [88] .rodata           PROGBITS        0000000000000080 005080 001016 00   A  0   0 32

(Notes: All other sections does not have SHF_ALLOC or are of size 0, so I
skip them. Need to add "-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" to
CFLAGS to reproduce.)

Section 88 has address 0x80 in elf file but in our "consequent"
addresses precalculation algorithm it should be at 0x5080:

  addr(.text) == 0x0
  addr(.data) == 0x400a + (0x1000 - 0x400a % 0x1000) + 0x68 == 0x5068
  addr(.rodata) == 0x5068 + (0x20 - 0x5068 % 0x20) == 0x5080

Probably the linker advises us to move 4096 aligned section to the
beginning to save some space, but it's just a guess.

So probably we should be ready to "non-consequent" alignments
precalculated and just override them.

https://github.com/checkpoint-restore/criu/issues/1301

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 compel/src/lib/handle-elf.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index e505f2c43..2d643ce43 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -212,13 +212,11 @@ int __handle_elf(void *mem, size_t size)
 		if (sh->sh_addralign > 0 && k % sh->sh_addralign != 0) {
 			k += sh->sh_addralign - k % sh->sh_addralign;
 		}
-		if (sh->sh_addr && sh->sh_addr != k) {
-			pr_err("Unexpected precalculated address of section (section %s addr 0x%lx expected 0x%lx)\n",
-				   &secstrings[sh->sh_name],
-				   (unsigned long) sh->sh_addr,
-				   (unsigned long) k);
-			goto err;
-		}
+		if (sh->sh_addr && sh->sh_addr != k)
+			pr_info("Overriding unexpected precalculated address of section (section %s addr 0x%lx expected 0x%lx)\n",
+				&secstrings[sh->sh_name],
+				(unsigned long) sh->sh_addr,
+				(unsigned long) k);
 		sh->sh_addr = k;
 		k += sh->sh_size;
 	}

From c629525cadc3b7167b20c664a321f97b97fea808 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 27 Oct 2020 18:26:35 +0300
Subject: [PATCH 0448/1854] cr-restore: make CLONE_NEWPID flag in clone_flags
 more consistent

I) Let's make CLONE_NEWPID in rsti(item)->clone_flags always only mean
that we need to clone with CLONE_NEWPID to create this task. Only pidns
reaper would have this flag because only they can be restored via clone
with CLONE_NEWPID flag. If we have non pidns reaper root task but its
pidns is different from criu this can be only restored into external
pidns.

II) Let's remove clone_flags variable from fork_with_pid as it does not
actually needed now:

clone_flags was introduced to be able to restore into external pidns

rsti(item)->clone_flags is determined in prepare_pstree_kobj_ids and
before (I) it means 1) parent has different namespace from item or 2)
item is root task and criu has different namespace from it. We don't
support nested pid namespaces so (1) is always false. And for (2) we
have two cases a) pid == INIT_PID - when it is not possible to restore
into external pidns b) pid != INIT_PID - when it is only possible to
restore into external pidns.

For (b) we previousely had CLONE_NEWPID flag in rsti(item)->clone_flags
and to workaround it we've added this extra clone_flags variable, but I
think it is not needed because we can simply remove CLONE_NEWPID from
non-reaper processes initially.

Also the code with removing CLONE_NEWPID from clone_flags and adding the
same flag to rsti(item)->clone_flags is super strange because I don't
see any other place where we later can use rsti(item)->clone_flags.

III) Also don't print differen flags in "Forking task with ..." from
which we actually use in clone.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c | 36 +++++++++++++-----------------------
 criu/pstree.c     |  6 ++++++
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 8af2e2974..416f57630 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1363,7 +1363,6 @@ static int set_next_pid(void *arg)
 
 static inline int fork_with_pid(struct pstree_item *item)
 {
-	unsigned long clone_flags;
 	struct cr_clone_arg ca;
 	struct ns_id *pid_ns = NULL;
 	int ret = -1;
@@ -1404,17 +1403,9 @@ static inline int fork_with_pid(struct pstree_item *item)
 		ca.core = NULL;
 	}
 
-	ca.item = item;
-	ca.clone_flags = rsti(item)->clone_flags;
+	if (item->ids)
+		pid_ns = lookup_ns_by_id(item->ids->pid_ns_id, &pid_ns_desc);
 
-	BUG_ON(ca.clone_flags & CLONE_VM);
-
-	pr_info("Forking task with %d pid (flags 0x%lx)\n", pid, ca.clone_flags);
-
-	if (ca.item->ids)
-		pid_ns = lookup_ns_by_id(ca.item->ids->pid_ns_id, &pid_ns_desc);
-
-	clone_flags = ca.clone_flags;
 	if (pid_ns && pid_ns->ext_key) {
 		int fd;
 
@@ -1424,13 +1415,6 @@ static inline int fork_with_pid(struct pstree_item *item)
 			return -1;
 		}
 
-		/*
-		 * Restoring into an existing namespace means that CLONE_NEWPID
-		 * needs to be removed during clone() as the process will be
-		 * created in the correct PID namespace thanks to switch_ns_by_fd().
-		 */
-		clone_flags &= ~CLONE_NEWPID;
-
 		fd = inherit_fd_lookup_id(pid_ns->ext_key);
 		if (fd < 0) {
 			pr_err("Unable to find an external pidns: %s\n", pid_ns->ext_key);
@@ -1450,10 +1434,16 @@ static inline int fork_with_pid(struct pstree_item *item)
 		 * process as if using CLONE_NEWPID.
 		 */
 		root_ns_mask |= CLONE_NEWPID;
-		rsti(item)->clone_flags |= CLONE_NEWPID;
 	}
 
-	if (!(clone_flags & CLONE_NEWPID)) {
+	ca.item = item;
+	ca.clone_flags = rsti(item)->clone_flags;
+
+	BUG_ON(ca.clone_flags & CLONE_VM);
+
+	pr_info("Forking task with %d pid (flags 0x%lx)\n", pid, ca.clone_flags);
+
+	if (!(ca.clone_flags & CLONE_NEWPID)) {
 		lock_last_pid();
 
 		if (!kdat.has_clone3_set_tid) {
@@ -1485,7 +1475,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 
 	if (kdat.has_clone3_set_tid) {
 		ret = clone3_with_pid_noasan(restore_task_with_children,
-				&ca, (clone_flags &
+				&ca, (ca.clone_flags &
 					~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)),
 				SIGCHLD, pid);
 	} else {
@@ -1503,7 +1493,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 		 */
 		close_pid_proc();
 		ret = clone_noasan(restore_task_with_children,
-				(clone_flags &
+				(ca.clone_flags &
 				 ~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)) | SIGCHLD,
 				&ca);
 	}
@@ -1523,7 +1513,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 	}
 
 err_unlock:
-	if (!(clone_flags & CLONE_NEWPID))
+	if (!(ca.clone_flags & CLONE_NEWPID))
 		unlock_last_pid();
 
 	if (ca.core)
diff --git a/criu/pstree.c b/criu/pstree.c
index f1513dc81..533f6c064 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -906,6 +906,12 @@ static int prepare_pstree_kobj_ids(void)
 			 */
 			rsti(item)->clone_flags &= ~CLONE_NEWNS;
 
+		/**
+		 * Only child reaper can clone with CLONE_NEWPID
+		 */
+		if (vpid(item) != INIT_PID)
+			rsti(item)->clone_flags &= ~CLONE_NEWPID;
+
 		cflags &= CLONE_ALLNS;
 
 		if (item == root_item) {

From c5064eda12d623393f48970dc3d914e545da754b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 28 Oct 2020 11:45:55 +0300
Subject: [PATCH 0449/1854] namespaces: make root_ns_mask more consistent

I) Make root_ns_mask always display namespaces of root task which are
different from criu ones. All this play with temporary unsetting it
makes this variable hard to understand (more over it is not in shared
memory).

II) Disable "INIT_PID + pidns is dumped" check for external pidns
explicitly.

III) On dump we should check that pidns of root task is external, not
just any pidns is external (in case in future we would support nested
pidns-es it would be wrong). That also allows us to use regular
lookup_ns_by_id search.

IV) On error when killing tasks we should kill only root task if it is
an init of pidns. Previousely we had CLONE_NEWPID set in root_ns_mask
for external pidns but root task was not init and we killed only root
task on error cleanup.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c | 24 +++++++++++++-----------
 criu/namespaces.c | 34 +++++++++++-----------------------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 416f57630..4cc87b482 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1427,13 +1427,6 @@ static inline int fork_with_pid(struct pstree_item *item)
 			pr_err("Unable to enter existing PID namespace\n");
 			return -1;
 		}
-
-		/*
-		 * If a process without a PID namespace is restored into
-		 * a PID namespace this tells CRIU to still handle the
-		 * process as if using CLONE_NEWPID.
-		 */
-		root_ns_mask |= CLONE_NEWPID;
 	}
 
 	ca.item = item;
@@ -2254,9 +2247,18 @@ static int restore_root_task(struct pstree_item *init)
 				"\"--namespace pid\" option.\n");
 			return -1;
 		}
-	} else	if (root_ns_mask & CLONE_NEWPID) {
-		pr_err("Can't restore pid namespace without the process init\n");
-		return -1;
+	} else if (root_ns_mask & CLONE_NEWPID) {
+		struct ns_id *ns;
+		/*
+		 * Restoring into an existing PID namespace. This disables
+		 * the check to require a PID 1 when restoring a process
+		 * which used to be in a PID namespace.
+		 */
+		ns = lookup_ns_by_id(init->ids->pid_ns_id, &pid_ns_desc);
+		if (!ns || !ns->ext_key) {
+			pr_err("Can't restore pid namespace without the process init\n");
+			return -1;
+		}
 	}
 
 	__restore_switch_stage_nw(CR_STATE_ROOT_TASK);
@@ -2476,7 +2478,7 @@ out_kill:
 	 * The processes can be killed only when all of them have been created,
 	 * otherwise an external processes can be killed.
 	 */
-	if (root_ns_mask & CLONE_NEWPID) {
+	if (vpid(root_item) == INIT_PID) {
 		int status;
 
 		/* Kill init */
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 384c9ca0c..296e0e3fe 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1082,21 +1082,18 @@ int dump_namespaces(struct pstree_item *item, unsigned int ns_flags)
 
 	pr_info("Dumping %d(%d)'s namespaces\n", ns_pid->ns[0].virt, ns_pid->real);
 
-	if ((ns_flags & CLONE_NEWPID) && ns_pid->ns[0].virt != 1) {
+	if ((ns_flags & CLONE_NEWPID) && ns_pid->ns[0].virt != INIT_PID) {
 		char *val = NULL;
-		for (ns = ns_ids; ns; ns = ns->next) {
-			if (ns->nd->cflag == CLONE_NEWPID) {
-				char id[64];
-				snprintf(id, sizeof(id), "pid[%u]", ns->kid);
-				val = external_lookup_by_key(id);
-				if (IS_ERR_OR_NULL(val)) {
-					val = NULL;
-					continue;
-				}
-				if (val)
-					break;
-			}
+
+		ns = lookup_ns_by_id(item->ids->pid_ns_id, &pid_ns_desc);
+		if (ns) {
+			char id[64];
+			snprintf(id, sizeof(id), "pid[%u]", ns->kid);
+			val = external_lookup_by_key(id);
+			if (IS_ERR_OR_NULL(val))
+				val = NULL;
 		}
+
 		if (!val) {
 			pr_err("Can't dump a pid namespace without the process init\n");
 			return -1;
@@ -1801,17 +1798,8 @@ static int read_pid_ns_img(void)
 			pr_err("Can not read pidns object\n");
 			return -1;
 		}
-		if (ret > 0) {
+		if (ret > 0)
 			ns->ext_key = e->ext_key;
-			/*
-			 * Restoring into an existing PID namespace. This disables
-			 * the check to require a PID 1 when restoring a process
-			 * which used to be in a PID namespace.
-			 * To keep the PID namespace code paths enabled this bit
-			 * will be set after having clone()ed the process.
-			 */
-			root_ns_mask &= ~CLONE_NEWPID;
-		}
 	}
 
 	return 0;

From eb9ed1aafa2209a5fd2624096a7b68937e86bcbb Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 28 Oct 2020 13:24:36 +0300
Subject: [PATCH 0450/1854] cr-restore: setup external pidns only for root task

All other tasks will inherit, let's remove excess steps. While on it
also add some info message about external pidns used.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>

---
v2: add new external_pidns variable to sinchronize all uses of external
pidns case
---
 criu/cr-restore.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 4cc87b482..4d98a0790 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1365,6 +1365,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 {
 	struct cr_clone_arg ca;
 	struct ns_id *pid_ns = NULL;
+	bool external_pidns = false;
 	int ret = -1;
 	pid_t pid = vpid(item);
 
@@ -1406,7 +1407,10 @@ static inline int fork_with_pid(struct pstree_item *item)
 	if (item->ids)
 		pid_ns = lookup_ns_by_id(item->ids->pid_ns_id, &pid_ns_desc);
 
-	if (pid_ns && pid_ns->ext_key) {
+	if (!current && pid_ns && pid_ns->ext_key)
+		external_pidns = true;
+
+	if (external_pidns) {
 		int fd;
 
 		/* Not possible to restore into an empty PID namespace. */
@@ -1427,6 +1431,8 @@ static inline int fork_with_pid(struct pstree_item *item)
 			pr_err("Unable to enter existing PID namespace\n");
 			return -1;
 		}
+
+		pr_info("Inheriting external pidns %s for %d\n", pid_ns->ext_key, pid);
 	}
 
 	ca.item = item;
@@ -1440,7 +1446,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 		lock_last_pid();
 
 		if (!kdat.has_clone3_set_tid) {
-			if (pid_ns && pid_ns->ext_key) {
+			if (external_pidns) {
 				/*
 				 * Restoring into another namespace requires a helper
 				 * to write to LAST_PID_PATH. Using clone3() this is
@@ -1457,7 +1463,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 			}
 		}
 	} else {
-		if (!(pid_ns && pid_ns->ext_key)) {
+		if (!external_pidns) {
 			if (pid != INIT_PID) {
 				pr_err("First PID in a PID namespace needs to be %d and not %d\n",
 					pid, INIT_PID);

From 371d9c83d7f9294f5a235069e3e472c72b58a017 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 2 Nov 2020 15:00:58 +0300
Subject: [PATCH 0451/1854] others/ns_ext: restore a process out of PID
 namespaces into the host PID namespace

It is quiet a common case to move the process from one pidns to another
existing pidns with criu (only restriction is pids should not
intersect). Let's check it works.

v2: - use pipe-s to synchronize processes
    - run the test in a pid namespace to avoid pid conflicts in the host
      pid namespace
    - grep errors in restore.log
    - add some more comments
v3: use 1000 for ns_last_pid so that test works on systems with low
pid_max; remove excess ';'s.

Co-Developed-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/others/ns_ext/Makefile       |  9 ++++-
 test/others/ns_ext/__run_pidns.sh | 21 +++++++++++
 test/others/ns_ext/_run_pidns.sh  | 33 +++++++++++++++++
 test/others/ns_ext/run_pidns.sh   | 59 +++++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 test/others/ns_ext/__run_pidns.sh
 create mode 100644 test/others/ns_ext/_run_pidns.sh
 create mode 100755 test/others/ns_ext/run_pidns.sh

diff --git a/test/others/ns_ext/Makefile b/test/others/ns_ext/Makefile
index f859b89bc..d15224d52 100644
--- a/test/others/ns_ext/Makefile
+++ b/test/others/ns_ext/Makefile
@@ -1,7 +1,14 @@
-run:
+run: run_pidns run_net run_pid
+
+run_net:
 	./run.sh net
+
+run_pid:
 	./run.sh pid
 
+run_pidns:
+	unshare -fp -m --mount-proc --propagation private ./run_pidns.sh
+
 clean:
 	rm -rf images output  pidfile  pidfile2  pidfile3
 .PHONY: clean run
diff --git a/test/others/ns_ext/__run_pidns.sh b/test/others/ns_ext/__run_pidns.sh
new file mode 100644
index 000000000..50cdb6b76
--- /dev/null
+++ b/test/others/ns_ext/__run_pidns.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+status_fd=$1
+
+exec 0</dev/null
+exec 2>/dev/null
+exec 1>/dev/null
+
+# Sending our real pid to run_pidns.sh over pipe
+
+exec {fd}</proc/self/status
+pid=$(cat <&$fd | grep '^Pid:' | awk '{print $2}')
+exec {fd}>&-
+echo $pid >&$status_fd
+exec {status_fd}>&-
+
+while :; do
+	sleep 10000
+done
diff --git a/test/others/ns_ext/_run_pidns.sh b/test/others/ns_ext/_run_pidns.sh
new file mode 100644
index 000000000..b0b266ad6
--- /dev/null
+++ b/test/others/ns_ext/_run_pidns.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+status_fd=$1
+
+# Note that with this block we only guaranty that pid of
+# __run_pidns.sh would be somewhere around 1000, not
+# exactly 1000.
+
+mkdir -p pidns_proc
+mount -t proc proc pidns_proc
+echo 1000 > pidns_proc/sys/kernel/ns_last_pid
+umount -l pidns_proc
+rmdir pidns_proc
+
+# Here we create a pipe to wait for __run_pidns.sh to die,
+# when it dies the pipe_w is closed and read from pipe_r
+# is unblocked.
+
+exec {pipe}<> <(:)
+exec {pipe_r}</proc/self/fd/$pipe
+exec {pipe_w}>/proc/self/fd/$pipe
+exec {pipe}>&-
+
+setsid bash __run_pidns.sh $status_fd &
+exec {pipe_w}>&-
+exec {status_fd}>&-
+
+# Waiting for __run_pidns.sh to be checkpointed
+
+cat <&$pipe_r
+echo "Temporary pidns init is exiting..."
diff --git a/test/others/ns_ext/run_pidns.sh b/test/others/ns_ext/run_pidns.sh
new file mode 100755
index 000000000..b4c7b88a8
--- /dev/null
+++ b/test/others/ns_ext/run_pidns.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+# This test creates a process in non-host pidns and then dumps it and restores
+# it into host pidns. We use pid >100000 in non-host pidns to make sure it does
+# not intersect with some host pid on restore but it is potentially racy so
+# please run this test only in manualy.
+
+CRIU=../../../criu/criu
+
+# This is a status pipe to report the pid of __run_pidns.sh
+exec {pipe}<> <(:)
+exec {pipe_r}</proc/self/fd/$pipe
+exec {pipe_w}>/proc/self/fd/$pipe
+exec {pipe}>&-
+
+unshare -p sh -c "bash _run_pidns.sh $pipe_w &"
+exec {pipe_w}>&-
+
+PID=$(cat <&$pipe_r)
+echo PID: $PID
+
+PIDNS=$(readlink /proc/$PID/ns/pid | sed 's/://')
+echo PIDNS: $PIDNS
+
+BEFORE=$(grep NSpid /proc/$PID/status)
+echo "before c/r: $BEFORE"
+
+rm -rf images_pidns || :
+mkdir -p images_pidns
+
+echo "$CRIU dump -v4 -o dump.log -t $PID -D images_pidns --external $PIDNS:exti"
+$CRIU dump -v4 -o dump.log -t $PID -D images_pidns --external $PIDNS:exti
+RESULT=$?
+cat images_pidns/dump.log | grep -B 5 Error || echo ok
+[ "$RESULT" != "0" ] && {
+	echo "CRIU dump failed"
+	echo FAIL
+	exit 1
+}
+
+exec {pidns_fd}< /proc/self/ns/pid
+
+echo "$CRIU restore -v4 -o restore.log -D images_pidns --restore-detached --inherit-fd fd[$pidns_fd]:exti"
+$CRIU restore -v4 -o restore.log -D images_pidns --restore-detached --inherit-fd fd[$pidns_fd]:exti --pidfile test.pidfile
+RESULT=$?
+cat images_pidns/restore.log | grep -B 5 Error || echo ok
+[ "$RESULT" != "0" ] && {
+	echo "CRIU restore failed"
+	echo FAIL
+	exit 1
+}
+
+PID=$(cat images_pidns/test.pidfile)
+AFTER=$(grep NSpid /proc/$PID/status)
+echo "after c/r: $AFTER"
+echo PASS
+exit 0

From 898329b302bd91ecfcbd015576feebea4ef27c85 Mon Sep 17 00:00:00 2001
From: anatasluo <luolongjuna@gmail.com>
Date: Thu, 3 Dec 2020 10:53:43 +0000
Subject: [PATCH 0452/1854] x86/asm: fix compile error in bitops.h

Build on Ubuntu 18.04 amd64 with command "make DEBUG=1" produces the following error:

include/common/asm/bitops.h: Assembler messages:
include/common/asm/bitops.h:71: Error: incorrect register `%edx' used with `q' suffix

Signed-off-by: anatasluo <luolongjuna@gmail.com>
---
 include/common/arch/x86/asm/asm.h    | 28 ++++++++++++++++++++++++++++
 include/common/arch/x86/asm/bitops.h | 27 ++++++++++-----------------
 2 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 include/common/arch/x86/asm/asm.h

diff --git a/include/common/arch/x86/asm/asm.h b/include/common/arch/x86/asm/asm.h
new file mode 100644
index 000000000..af324c6e2
--- /dev/null
+++ b/include/common/arch/x86/asm/asm.h
@@ -0,0 +1,28 @@
+#ifndef __CR_ASM_H__
+#define __CR_ASM_H__
+
+#ifdef __GCC_ASM_FLAG_OUTPUTS__
+# define CC_SET(c) "\n\t/* output condition code " #c "*/\n"
+# define CC_OUT(c) "=@cc" #c
+#else
+# define CC_SET(c) "\n\tset" #c " %[_cc_" #c "]\n"
+# define CC_OUT(c) [_cc_ ## c] "=qm"
+#endif
+
+#ifdef __ASSEMBLY__
+# define __ASM_FORM(x)	x
+#else
+# define __ASM_FORM(x)	" " #x " "
+#endif
+
+#ifndef __x86_64__
+/* 32 bit */
+# define __ASM_SEL(a,b) __ASM_FORM(a)
+#else
+/* 64 bit */
+# define __ASM_SEL(a,b) __ASM_FORM(b)
+#endif
+
+#define __ASM_SIZE(inst, ...)	__ASM_SEL(inst##l##__VA_ARGS__, inst##q##__VA_ARGS__)
+
+#endif /* __CR_ASM_H__ */
diff --git a/include/common/arch/x86/asm/bitops.h b/include/common/arch/x86/asm/bitops.h
index c69e0ed02..9c7aeb5d7 100644
--- a/include/common/arch/x86/asm/bitops.h
+++ b/include/common/arch/x86/asm/bitops.h
@@ -3,16 +3,9 @@
 
 #include <stdbool.h>
 #include "common/arch/x86/asm/cmpxchg.h"
+#include "common/arch/x86/asm/asm.h"
 #include "common/asm/bitsperlong.h"
 
-#ifdef __GCC_ASM_FLAG_OUTPUTS__
-# define CC_SET(c) "\n\t/* output condition code " #c "*/\n"
-# define CC_OUT(c) "=@cc" #c
-#else
-# define CC_SET(c) "\n\tset" #c " %[_cc_" #c "]\n"
-# define CC_OUT(c) [_cc_ ## c] "=qm"
-#endif
-
 #define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
 #define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
 
@@ -29,21 +22,21 @@
 
 #define ADDR				BITOP_ADDR(addr)
 
-static inline void set_bit(int nr, volatile unsigned long *addr)
+static inline void set_bit(long nr, volatile unsigned long *addr)
 {
-	asm volatile("btsl %1,%0" : ADDR : "Ir" (nr) : "memory");
+	asm volatile(__ASM_SIZE(bts) " %1,%0" : ADDR : "Ir" (nr) : "memory");
 }
 
-static inline void change_bit(int nr, volatile unsigned long *addr)
+static inline void change_bit(long nr, volatile unsigned long *addr)
 {
-	asm volatile("btcl %1,%0" : ADDR : "Ir" (nr));
+	asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr));
 }
 
 static inline bool test_bit(long nr, volatile const unsigned long *addr)
 {
 	bool oldbit;
 
-	asm volatile("btq %2,%1"
+	asm volatile(__ASM_SIZE(bt) " %2,%1"
 		     CC_SET(c)
 		     : CC_OUT(c) (oldbit)
 		     : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");
@@ -51,9 +44,9 @@ static inline bool test_bit(long nr, volatile const unsigned long *addr)
 	return oldbit;
 }
 
-static inline void clear_bit(int nr, volatile unsigned long *addr)
+static inline void clear_bit(long nr, volatile unsigned long *addr)
 {
-	asm volatile("btrl %1,%0" : ADDR : "Ir" (nr));
+	asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr));
 }
 
 /**
@@ -64,11 +57,11 @@ static inline void clear_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline bool test_and_set_bit(int nr, volatile unsigned long *addr)
+static inline bool test_and_set_bit(long nr, volatile unsigned long *addr)
 {
 	bool oldbit;
 
-	asm("btsq %2,%1"
+	asm(__ASM_SIZE(bts) " %2,%1"
 	    CC_SET(c)
 	    : CC_OUT(c) (oldbit)
 	    : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");

From 82bddc4b20fffae56dcb11c03d29ae272bdcec57 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Mon, 14 Dec 2020 10:00:04 +0000
Subject: [PATCH 0453/1854] scripts/Docerfile.centos8: Use 'powertools' repo
 name

See https://bugs.centos.org/view.php?id=17920

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 scripts/build/Dockerfile.centos8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
index 0b658d5fa..e3aabbe59 100644
--- a/scripts/build/Dockerfile.centos8
+++ b/scripts/build/Dockerfile.centos8
@@ -4,7 +4,7 @@ ARG CC=gcc
 ARG ENV1=FOOBAR
 
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
-RUN yum config-manager --set-enabled PowerTools
+RUN yum config-manager --set-enabled powertools
 RUN yum install -y --allowerasing \
 	asciidoc \
 	ccache \

From adfec67c0827d6ba8826207d4754579b4ccbc0ae Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Mon, 14 Dec 2020 10:11:49 +0000
Subject: [PATCH 0454/1854] .gitignore: Remove qemu-user-static

Not a thing since commit fe668075ad2a ("travis: switch pcp64le and s390x
to real hardware").

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 23cd703be..3b3da545c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,6 @@ criu/pie/parasite-blob.h
 criu/protobuf-desc-gen.h
 lib/build/
 lib/c/criu.pc
-scripts/build/qemu-user-static/*
 lib/.crit-setup.files
 compel/include/asm
 include/common/asm

From a719a2f49f3ac2584b31a19e6d3de36373ca8608 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 18 Dec 2020 12:03:17 +0300
Subject: [PATCH 0455/1854] CONTRIBUTING.md: add component prefix to the
 subject example

If one will do "git log --oneline", it is quite easy to see that we
don't begin subject lines with a capital letter. We start subjects with
component prefixes where components (mostly) are lowercase. So let's fix
it in contribution guide not to mislead newcomers.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 CONTRIBUTING.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d803d020..96972296e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -126,6 +126,19 @@ If your change address an issue listed in GitHub, please use `Fixes:` tag with t
 
 The `Fixes:` tags should be put at the end of the detailed description.
 
+Please add a prefix to your commit subject line describing the part of the
+project your change is related to. This can be either the name of the file or
+directory you changed, or just a general word. If your patch is touching
+multiple components you may separate prefixes with "/"-es. Here are some good
+examples of subject lines from git log:
+
+```
+criu-ns: Convert to python3 style print() syntax
+compel: Calculate sh_addr if not provided by linker
+style: Enforce kernel style -Wstrict-prototypes
+rpc/libcriu: Add lsm-profile option
+```
+
 You may refer to [How to Write a Git Commit
 Message](https://chris.beams.io/posts/git-commit/) article for
 recommendations for good commit message.
@@ -203,7 +216,7 @@ commit message. To append such line to a commit you already made, use
 
 ```
  From: Random J Developer <random at developer.example.org>
- Subject: [PATCH] Short patch description
+ Subject: [PATCH] component: Short patch description
 
  Long patch description (could be skipped if patch
  is trivial enough)

From 70088b66c1dcb82077ba197013ef3692fbc8a291 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 16 Dec 2020 18:58:23 +0000
Subject: [PATCH 0456/1854] ci: add Circle CI definition

Circle CI provides bare metal test systems which are a very good
environment for the CRIU test cases. This adds two CI runs on Circle CI.

On Circle CI it is necessary to tell clang to use '-Wl,-z,now', because
gcc has it hard-coded in Ubuntu and clang does not.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .circleci/config.yml       | 27 +++++++++++++++++++++++++++
 .travis.yml                |  6 ------
 scripts/ci/run-ci-tests.sh |  8 +++++++-
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..47f7ad9b1
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,27 @@
+version: 2.1
+jobs:
+  test-local-gcc:
+    machine:
+      image: ubuntu-2004:202010-01
+    working_directory: ~/criu
+    steps:
+      - checkout
+      - run:
+          name: "Test local with GCC"
+          command: sudo -E make -C scripts/ci local
+  test-local-clang:
+    machine:
+      image: ubuntu-2004:202010-01
+    working_directory: ~/criu
+    steps:
+      - checkout
+      - run:
+          name: "Test local with CLANG"
+          command: sudo -E make -C scripts/ci local CLANG=1
+
+workflows:
+  version: 2
+  builds:
+    jobs:
+      - test-local-gcc
+      - test-local-clang
diff --git a/.travis.yml b/.travis.yml
index a82ed910c..a94eb5edb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,11 @@ cache: ccache
 services:
   - docker
 env:
-  - TR_ARCH=local
-  - TR_ARCH=local       CLANG=1
   - TR_ARCH=local       COMPAT_TEST=y
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
   - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=local
-      dist: focal
     - os: linux
       arch: ppc64le
       env: TR_ARCH=local
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 648d5886c..42062aee9 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -97,6 +97,12 @@ test_stream() {
 
 ci_prep
 
+if [ "$CLANG" = "1" ]; then
+	# Needed for clang on Circle CI
+	LDFLAGS="$LDFLAGS -Wl,-z,now"
+	export LDFLAGS
+fi
+
 export GCOV
 $CC --version
 time make CC="$CC" -j4
@@ -204,7 +210,7 @@ if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 fi
 #make -C test/others/exec/ run
 make -C test/others/make/ run CC="$CC"
-if [ -n "$TRAVIS" ]; then
+if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # GitHub Actions does not provide a real TTY and CRIU will fail with:
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run

From a28947bb8266ed6b76de959deaba485c8ed85ef5 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 20 Dec 2020 17:08:18 +0000
Subject: [PATCH 0457/1854] ci: give an overview of the current CI environment

As CRIU is using multiple different CI systems this adds a printout to
each CI run about the CI environment for easier debugging of possible
errors.

Also use V=1 to build CRIU and the tests to easily see which compiler
and which options are used.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 42062aee9..29711d3c3 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -95,6 +95,36 @@ test_stream() {
 	./test/zdtm.py run --stream -p 2 --keep-going -T "$STREAM_TEST_PATTERN" $ZDTM_OPTS
 }
 
+print_header() {
+	echo "############### $1 ###############"
+}
+
+print_env() {
+	# As this script can run on multiple different CI systems
+	# the following lines should give some context to the
+	# evnvironment of this CI run.
+	print_header "Environment variables"
+	printenv
+	print_header "uname -a"
+	uname -a || :
+	print_header "Mounted file systems"
+	mount || :
+	print_header "Kernel command line"
+	cat /proc/cmdline || :
+	print_header "Distribution information"
+	[ -e /etc/lsb-release ] && cat /etc/lsb-release
+	[ -e /etc/redhat-release ] && cat /etc/redhat-release
+	[ -e /etc/alpine-release ] && cat /etc/alpine-release
+	print_header "ulimit -a"
+	ulimit -a
+	print_header "Available memory"
+	free -h
+	print_header "Available CPUs"
+	lscpu || :
+}
+
+print_env
+
 ci_prep
 
 if [ "$CLANG" = "1" ]; then
@@ -103,9 +133,9 @@ if [ "$CLANG" = "1" ]; then
 	export LDFLAGS
 fi
 
-export GCOV
+export GCOV CC
 $CC --version
-time make CC="$CC" -j4
+time make CC="$CC" -j4 V=1
 
 ./criu/criu -v4 cpuinfo dump || :
 ./criu/criu -v4 cpuinfo check || :
@@ -148,7 +178,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi
 
-time make CC="$CC" -j4 -C test/zdtm
+time make CC="$CC" -j4 -C test/zdtm V=1
 
 [ -f "$CCACHE_LOGFILE" ] && cat "$CCACHE_LOGFILE"
 

From 94fb7c36a12c2813f6fe71525011a119405da098 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 17 Dec 2020 13:47:36 +0000
Subject: [PATCH 0458/1854] ci: move alpine based tests to github actions

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/alpine-test.yml | 15 +++++++++++++++
 .travis.yml                       |  8 --------
 2 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/alpine-test.yml

diff --git a/.github/workflows/alpine-test.yml b/.github/workflows/alpine-test.yml
new file mode 100644
index 000000000..6fc546ff5
--- /dev/null
+++ b/.github/workflows/alpine-test.yml
@@ -0,0 +1,15 @@
+name: Alpine Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        target: [GCC=1, CLANG=1]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Alpine ${{ matrix.target }} Test
+      run: sudo -E make -C scripts/ci alpine ${{ matrix.target }}
diff --git a/.travis.yml b/.travis.yml
index a94eb5edb..60516df3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,14 +62,6 @@ jobs:
       # On xenial it should be possible to test overlayfs;
       # broken on the latest bionic kernel
       dist: xenial
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=alpine      CLANG=1
-      dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=alpine
-      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=fedora-asan

From d2ed60b60a05e1707f0737e04b40dd1ab949718e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 10 Nov 2020 15:37:00 +0300
Subject: [PATCH 0459/1854] namespaces: don't set rst on error in
 switch_ns_by_fd

This is just a small cleanup, no behaviour change.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/namespaces.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 296e0e3fe..c8baf42fc 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -247,11 +247,11 @@ int switch_ns(int pid, struct ns_desc *nd, int *rst)
 
 int switch_ns_by_fd(int nsfd, struct ns_desc *nd, int *rst)
 {
-	int ret = -1;
+	int ret = -1, old_ns = -1;
 
 	if (rst) {
-		*rst = open_proc(PROC_SELF, "ns/%s", nd->str);
-		if (*rst < 0)
+		old_ns = open_proc(PROC_SELF, "ns/%s", nd->str);
+		if (old_ns < 0)
 			goto err_ns;
 	}
 
@@ -261,11 +261,12 @@ int switch_ns_by_fd(int nsfd, struct ns_desc *nd, int *rst)
 		goto err_set;
 	}
 
+	if (rst)
+		*rst = old_ns;
 	return 0;
 
 err_set:
-	if (rst)
-		close(*rst);
+	close_safe(&old_ns);
 err_ns:
 	return -1;
 }

From f736b8750e077fbb80f6eeec7d2adcb6cbdfebba Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 26 Dec 2020 19:29:58 +0000
Subject: [PATCH 0460/1854] ci: Alpine's busybox based free does not understand
 -h

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 29711d3c3..9b07fd966 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -118,7 +118,12 @@ print_env() {
 	print_header "ulimit -a"
 	ulimit -a
 	print_header "Available memory"
-	free -h
+	if [ -e /etc/alpine-release ]; then
+		# Alpine's busybox based free does not understand -h
+		free
+	else
+		free -h
+	fi
 	print_header "Available CPUs"
 	lscpu || :
 }

From 797f41e8aabe111c295f1fc1919da57711ca75f2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 28 Dec 2020 20:51:27 +0300
Subject: [PATCH 0461/1854] test/zdtm_ct: Run zdtm.py in the host time
 namespace

Before the 5.11 kernel, there is a known issue.

start_time in /proc/pid/stat is printed in the host time namespace,
but /proc/uptime is shown in a current namespace, but criu compares them
to detect when a new task has reused one of old pids.

Fixes: #1266

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm_ct.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index 5495d61eb..d9823da3f 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/utsname.h>
 
 #ifndef CLONE_NEWTIME
 #define CLONE_NEWTIME   0x00000080      /* New time namespace */
@@ -42,7 +43,28 @@ static inline int _settime(clockid_t clk_id, time_t offset)
 
 static int create_timens()
 {
-	int fd;
+	struct utsname buf;
+	unsigned major, minor;
+	int fd, ret;
+
+	/*
+	 * Before the 5.11 kernel, there is a known issue.
+	 * start_time in /proc/pid/stat is printed in the host time
+	 * namespace, but /proc/uptime is shown in the current time
+	 * namespace, so criu can't compare them to detect tasks that
+	 * reuse old pids.
+	 */
+	ret = uname(&buf);
+	if (ret)
+		return -1;
+
+	if (sscanf(buf.release, "%u.%u", &major, &minor) != 2)
+		return -1;
+
+	if (major == 5 && minor < 11) {
+		fprintf(stderr, "timens isn't supported on %s\n", buf.release);
+		return 0;
+	}
 
 	if (unshare(CLONE_NEWTIME)) {
 		if (errno == EINVAL) {

From fabd5be3846d2da4590dfa64a56e464b6d8575ba Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 1 Jan 2021 14:20:09 +0300
Subject: [PATCH 0462/1854] zdtm: look up iptables in /sbin and /usr/sbin

On Ubuntu 20.04, iptables is in /usr/sbin/.

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/netns-nf.desc                   | 2 +-
 test/zdtm/static/socket-tcp-closed-last-ack.desc | 2 +-
 test/zdtm/static/socket-tcp-reseted.desc         | 2 +-
 test/zdtm/static/socket-tcp-syn-sent.desc        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index 8fd3770bd..67c294888 100644
--- a/test/zdtm/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
@@ -1,5 +1,5 @@
 {   'deps': [   '/bin/sh',
-                '/sbin/iptables',
+                '/sbin/iptables|/usr/sbin/iptables',
                 '/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
                 '/usr/bin/diff'],
     'flags': 'suid',
diff --git a/test/zdtm/static/socket-tcp-closed-last-ack.desc b/test/zdtm/static/socket-tcp-closed-last-ack.desc
index 43afd920e..8a83de6fd 100644
--- a/test/zdtm/static/socket-tcp-closed-last-ack.desc
+++ b/test/zdtm/static/socket-tcp-closed-last-ack.desc
@@ -1,5 +1,5 @@
 {   'deps': [   '/bin/sh',
-                '/sbin/iptables',
+                '/sbin/iptables|/usr/sbin/iptables',
                 '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
                 '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 	],
diff --git a/test/zdtm/static/socket-tcp-reseted.desc b/test/zdtm/static/socket-tcp-reseted.desc
index 744ed88c9..a5c1a209d 100644
--- a/test/zdtm/static/socket-tcp-reseted.desc
+++ b/test/zdtm/static/socket-tcp-reseted.desc
@@ -1,5 +1,5 @@
 {   'deps': [   '/bin/sh',
-                '/sbin/iptables',
+                '/sbin/iptables|/usr/sbin/iptables',
                 '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
                 '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 		'/usr/lib64/xtables/libipt_REJECT.so|/lib/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/aarch64-linux-gnu/xtables/libipt_REJECT.so',
diff --git a/test/zdtm/static/socket-tcp-syn-sent.desc b/test/zdtm/static/socket-tcp-syn-sent.desc
index a27673681..d59e59717 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.desc
+++ b/test/zdtm/static/socket-tcp-syn-sent.desc
@@ -1,5 +1,5 @@
 {   'deps': [   '/bin/sh',
-                '/sbin/iptables',
+                '/sbin/iptables|/usr/sbin/iptables',
                 '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
                 '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 	],

From 0cbfba7780e3456c41f895b274cbc11bcfb6b7d8 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 31 Dec 2020 09:02:30 +0000
Subject: [PATCH 0463/1854] github: auto-close stale issues and pull requests

This is a copy of stale.yml from the Podman repository to automatically
close tickets after 365 days. After 30 days tickets and issues are
marked as stale and after 365 tickets and issues are finally closed.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/stale.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 000000000..29676b911
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,27 @@
+name: Mark stale issues and pull requests
+
+# Please refer to https://github.com/actions/stale/blob/master/action.yml
+# to see all config knobs of the stale action.
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'A friendly reminder that this issue had no activity for 30 days.'
+        stale-pr-message: 'A friendly reminder that this PR had no activity for 30 days.'
+        stale-issue-label: 'stale-issue'
+        stale-pr-label: 'stale-pr'
+        days-before-stale: 30
+        days-before-close: 365
+        remove-stale-when-updated: true
+        exempt-pr-labels: 'no-auto-close'
+        exempt-issue-labels: 'no-auto-close'

From c7544894fe8de4f00c396c6fe4ce5c0542689bb5 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 1 Jan 2021 01:21:44 +0300
Subject: [PATCH 0464/1854] dump/ppc64,arm,mips: sanitize the
 ERESTART_RESTARTBLOCK -> EINTR transition

1. The -ERESTART_RESTARTBLOCK case in get_task_regs() depends on kernel
   internals too much, and for no reason. We shouldn't rely on fact that
   a) we are going to do sigreturn() and b) restore_sigcontext() always
   sets restart_block->fn = do_no_restart_syscall which returns -EINTR.

   Just change this code to enforce -EINTR after restore, this is what
   we actually want until we teach criu to handle ERESTART_RESTARTBLOCK.

2. Add pr_warn() to make the potential bug-reports more understandable,
   a sane application should handle -EINTR correctly but this is not
   always the case.

Fixes: #1325
Report-by: Mr Travis
Inspired-by: dd71cca58ada ("dump/x86: sanitize the ERESTART_RESTARTBLOCK -> EINTR transition")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/arm/src/lib/infect.c   | 6 ++++--
 compel/arch/mips/src/lib/infect.c  | 7 ++++---
 compel/arch/ppc64/src/lib/infect.c | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index 0053bef58..75b985b74 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -4,6 +4,8 @@
 #include <string.h>
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/processor-flags.h>
+#include <errno.h>
+
 #include "common/page.h"
 #include "uapi/compel/asm/infect-types.h"
 #include "log.h"
@@ -91,8 +93,8 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 			regs->ARM_pc -= 4;
 			break;
 		case -ERESTART_RESTARTBLOCK:
-			regs->ARM_r0 = __NR_restart_syscall;
-			regs->ARM_pc -= 4;
+			pr_warn("Will restore %d with interrupted system call\n", pid);
+			regs->ARM_r0 = -EINTR;
 			break;
 		}
 	}
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index 521528f76..35e947cc0 100755
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -2,6 +2,8 @@
 #include <sys/uio.h>
 #include <sys/auxv.h>
 #include <sys/mman.h>
+#include <errno.h>
+
 #include <compel/asm/fpu.h>
 #include <compel/cpu.h>
 #include "errno.h"
@@ -142,9 +144,8 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 		    regs->cp0_epc -= 4;
 		    break;
 		case ERESTART_RESTARTBLOCK:
-		    regs->regs[2] = __NR_restart_syscall;
-		    regs->regs[7] = regs->regs[26];
-		    regs->cp0_epc -= 4;
+		    pr_warn("Will restore %d with interrupted system call\n", pid);
+		    regs->regs[2] = -EINTR;
 		    break;
 	    }
 	    regs->regs[0] = 0;
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index 637acd46d..b2c725f62 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -330,8 +330,8 @@ static int __get_task_regs(pid_t pid, user_regs_struct_t *regs,
 			regs->nip -= 4;
 			break;
 		case ERESTART_RESTARTBLOCK:
-			regs->gpr[0] = __NR_restart_syscall;
-			regs->nip -= 4;
+			pr_warn("Will restore %d with interrupted system call\n", pid);
+			regs->gpr[3] = EINTR;
 			break;
 		}
 	}

From ae686848b2dcde7ebbd58150fd313004b3ecb6d7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 11 Jan 2021 00:00:02 +0000
Subject: [PATCH 0465/1854] compel/test: Resolve missing includes

Resolves #1333

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 compel/include/uapi/infect-rpc.h | 2 ++
 compel/test/fdspy/parasite.c     | 4 ++--
 compel/test/fdspy/spy.c          | 4 ++++
 compel/test/infect/spy.c         | 3 +++
 compel/test/rsys/spy.c           | 3 +++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compel/include/uapi/infect-rpc.h b/compel/include/uapi/infect-rpc.h
index 180dedf1f..5fcdb56ff 100644
--- a/compel/include/uapi/infect-rpc.h
+++ b/compel/include/uapi/infect-rpc.h
@@ -5,6 +5,8 @@
 #include <sys/un.h>
 #include <stdint.h>
 
+#include <common/compiler.h>
+
 struct parasite_ctl;
 extern int __must_check compel_rpc_sync(unsigned int cmd, struct parasite_ctl *ctl);
 extern int __must_check compel_rpc_call(unsigned int cmd, struct parasite_ctl *ctl);
diff --git a/compel/test/fdspy/parasite.c b/compel/test/fdspy/parasite.c
index c14064b36..7933d29ae 100644
--- a/compel/test/fdspy/parasite.c
+++ b/compel/test/fdspy/parasite.c
@@ -1,7 +1,7 @@
 #include <errno.h>
 
-#include <compel/plugins/plugin-fds.h>
 #include <compel/infect-rpc.h>
+#include <compel/plugins/plugin-fds.h>
 
 /*
  * Stubs for std compel plugin.
@@ -15,6 +15,6 @@ void parasite_cleanup(void) { }
 int parasite_daemon_cmd(int cmd, void *args)
 {
 	if (cmd == PARASITE_CMD_GETFD)
-		fds_send_fd(2);
+		return (fds_send_fd(2) < 0);
 	return 0;
 }
diff --git a/compel/test/fdspy/spy.c b/compel/test/fdspy/spy.c
index 1a373b6bb..c6558f079 100644
--- a/compel/test/fdspy/spy.c
+++ b/compel/test/fdspy/spy.c
@@ -5,6 +5,10 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
+#include <compel/log.h>
+#include <compel/infect-rpc.h>
+#include <compel/infect-util.h>
+
 #include "parasite.h"
 
 #define PARASITE_CMD_GETFD	PARASITE_USER_CMDS
diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index b5f8b2559..8be6925c5 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -3,6 +3,9 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
+#include <compel/log.h>
+#include <compel/infect-rpc.h>
+
 #include "parasite.h"
 
 #define PARASITE_CMD_INC	PARASITE_USER_CMDS
diff --git a/compel/test/rsys/spy.c b/compel/test/rsys/spy.c
index 98654efcf..6ccb2a502 100644
--- a/compel/test/rsys/spy.c
+++ b/compel/test/rsys/spy.c
@@ -4,6 +4,9 @@
 #include <sys/wait.h>
 #include <sys/syscall.h>
 
+#include <compel/log.h>
+#include <compel/infect.h>
+
 static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 {
 	printf("\tLC%u: ", lvl);

From fbb21b40419450848ecc233ead48fce942323073 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 11 Jan 2021 22:41:54 +0000
Subject: [PATCH 0466/1854] compel/test: Add main makefile

These changes enable running all compel tests with a single
command from the root path of the repository:

	# sudo make -C compel/test

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 compel/test/Makefile        | 17 +++++++++++++++++
 compel/test/fdspy/Makefile  |  4 ++++
 compel/test/infect/Makefile |  4 ++++
 compel/test/rsys/Makefile   |  4 ++++
 4 files changed, 29 insertions(+)
 create mode 100644 compel/test/Makefile

diff --git a/compel/test/Makefile b/compel/test/Makefile
new file mode 100644
index 000000000..63fb76f80
--- /dev/null
+++ b/compel/test/Makefile
@@ -0,0 +1,17 @@
+all: fdspy infect rsys
+
+fdspy:
+	$(Q) $(MAKE) -C fdspy
+	$(Q) $(MAKE) -C fdspy run
+.PHONY: fdspy
+
+infect:
+	$(Q) $(MAKE) -C infect
+	$(Q) $(MAKE) -C infect run
+.PHONY: infect
+
+
+rsys:
+	$(Q) $(MAKE) -C rsys
+	$(Q) $(MAKE) -C rsys run
+.PHONY: rsys
diff --git a/compel/test/fdspy/Makefile b/compel/test/fdspy/Makefile
index 027c373fe..82d9fdc0b 100644
--- a/compel/test/fdspy/Makefile
+++ b/compel/test/fdspy/Makefile
@@ -5,6 +5,10 @@ COMPEL		:= ../../../compel/compel-host
 
 all: victim spy
 
+run:
+	./spy
+.PHONY: run
+
 clean:
 	rm -f victim
 	rm -f spy
diff --git a/compel/test/infect/Makefile b/compel/test/infect/Makefile
index 4dedf33c9..bacfad962 100644
--- a/compel/test/infect/Makefile
+++ b/compel/test/infect/Makefile
@@ -5,6 +5,10 @@ COMPEL		:= ../../../compel/compel-host
 
 all: victim spy
 
+run:
+	./spy
+.PHONY: run
+
 clean:
 	rm -f victim
 	rm -f spy
diff --git a/compel/test/rsys/Makefile b/compel/test/rsys/Makefile
index 3babda18f..53400498e 100644
--- a/compel/test/rsys/Makefile
+++ b/compel/test/rsys/Makefile
@@ -5,6 +5,10 @@ COMPEL		:= ../../../compel/compel-host
 
 all: victim spy
 
+run:
+	./spy
+.PHONY: run
+
 clean:
 	rm -f victim
 	rm -f spy

From cffbeffed602d971abd66b2017d85c45ba90aeec Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 11 Jan 2021 22:59:06 +0000
Subject: [PATCH 0467/1854] ci: Enable compel testing

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 9b07fd966..1a51d6aeb 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -279,3 +279,6 @@ make -C test/others/libcriu run
 
 # external namespace testing
 make -C test/others/ns_ext run
+
+# compel testing
+make -C compel/test

From 8aba7ae9fa5f3d563500d2f76ecde16b02981b17 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 11 Jan 2021 23:38:43 +0000
Subject: [PATCH 0468/1854] compel: Fix missing loff_t in Alpine

musl defines 'loff_t' in fcntl.h as 'off_t'.
This patch resolves the following error when running the compel tests
on Alpine Linux:

gcc -O2 -g -Wall -Werror -c -Wstrict-prototypes -fno-stack-protector -nostdlib -fomit-frame-pointer -ffreestanding -fpie -I ../../../compel/include/uapi -o parasite.o parasite.c
In file included from ../../../compel/include/uapi/compel/plugins/std/syscall.h:8,
                 from ../../../compel/include/uapi/compel/plugins/std.h:5,
                 from parasite.c:3:
../../../compel/include/uapi/compel/plugins/std/syscall-64.h:19:66: error: unknown type name 'loff_t'; did you mean 'off_t'?
   19 | extern long sys_pread (unsigned int fd, char *buf, size_t count, loff_t pos) ;
      |                                                                  ^~~~~~
      |                                                                  off_t
../../../compel/include/uapi/compel/plugins/std/syscall-64.h:96:46: error: unknown type name 'loff_t'; did you mean 'off_t'?
   96 | extern long sys_fallocate (int fd, int mode, loff_t offset, loff_t len) ;
      |                                              ^~~~~~
      |                                              off_t
../../../compel/include/uapi/compel/plugins/std/syscall-64.h:96:61: error: unknown type name 'loff_t'; did you mean 'off_t'?
   96 | extern long sys_fallocate (int fd, int mode, loff_t offset, loff_t len) ;
      |                                                             ^~~~~~
      |                                                             off_t
make[1]: *** [Makefile:32: parasite.o] Error 1

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 compel/arch/x86/plugins/std/syscalls/Makefile.syscalls | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/compel/arch/x86/plugins/std/syscalls/Makefile.syscalls b/compel/arch/x86/plugins/std/syscalls/Makefile.syscalls
index 4ba4b56c8..62c25f3e0 100644
--- a/compel/arch/x86/plugins/std/syscalls/Makefile.syscalls
+++ b/compel/arch/x86/plugins/std/syscalls/Makefile.syscalls
@@ -39,6 +39,10 @@ $(sys-proto): $(sys-def) $(sys-proto-types)
 	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
 	$(Q) echo "#ifndef ASM_SYSCALL_PROTO_H_$(1)__"					>> $$@
 	$(Q) echo "#define ASM_SYSCALL_PROTO_H_$(1)__"					>> $$@
+	$(Q) echo "/* musl defines loff_t as off_t */"					>> $$@
+	$(Q) echo '#ifndef loff_t'							>> $$@
+	$(Q) echo '#define loff_t off_t'						>> $$@
+	$(Q) echo '#endif'								>> $$@
 	$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>'			>> $$@
 	$(Q) echo '#include <compel/plugins/std/syscall-types.h>'			>> $$@
 ifeq ($(1),32)
@@ -71,6 +75,10 @@ $(sys-codes-generic): $(PLUGIN_ARCH_DIR)/std/syscalls/syscall_32.tbl $(sys-proto
 	$(Q) echo "/* Autogenerated, don't edit */"			>  $@
 	$(Q) echo "#ifndef __ASM_CR_SYSCALL_CODES_H__"			>> $@
 	$(Q) echo "#define __ASM_CR_SYSCALL_CODES_H__"			>> $@
+	$(Q) echo "/* musl defines loff_t as off_t */"			>> $@
+	$(Q) echo '#ifndef loff_t'					>> $@
+	$(Q) echo '#define loff_t off_t'				>> $@
+	$(Q) echo '#endif'						>> $@
 	$(Q) echo '#include <compel/plugins/std/syscall-codes-64.h>'	>> $@
 	$(Q) cat $< | awk '/^__NR/{NR32=$$1;				\
 		sub("^__NR", "__NR32", NR32);				\

From 5364ca3da42579dbf1b1449c243a2c7243f7b765 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 12 Jan 2021 08:49:02 +0000
Subject: [PATCH 0469/1854] compel/test: Fix warn_unused_result
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gcc -O2 -g -Wall -Werror -I ../../../compel/include/uapi -o spy spy.c ../../../compel/libcompel.a
spy.c: In function ‘check_pipe_ends’:
spy.c:107:2: error: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Werror=unused-result]
  107 |  write(wfd, "1", 2);
      |  ^~~~~~~~~~~~~~~~~~
spy.c:108:2: error: ignoring return value of ‘read’, declared with attribute warn_unused_result [-Werror=unused-result]
  108 |  read(rfd, aux, sizeof(aux));
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 compel/test/fdspy/spy.c   | 10 ++++++++--
 compel/test/rsys/spy.c    | 14 +++++++++++---
 compel/test/rsys/victim.c |  3 ++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/compel/test/fdspy/spy.c b/compel/test/fdspy/spy.c
index c6558f079..bbb9eb418 100644
--- a/compel/test/fdspy/spy.c
+++ b/compel/test/fdspy/spy.c
@@ -104,8 +104,14 @@ static int check_pipe_ends(int wfd, int rfd)
 	}
 
 	printf("Check pipe ends are connected\n");
-	write(wfd, "1", 2);
-	read(rfd, aux, sizeof(aux));
+	if (write(wfd, "1", 2) != 2) {
+		fprintf(stderr, "write to pipe failed\n");
+		return -1;
+	}
+	if (read(rfd, aux, sizeof(aux)) != sizeof(aux)) {
+		fprintf(stderr, "read from pipe failed\n");
+		return -1;
+	}
 	if (aux[0] != '1' || aux[1] != '\0') {
 		fprintf(stderr, "Pipe connectivity lost\n");
 		return 0;
diff --git a/compel/test/rsys/spy.c b/compel/test/rsys/spy.c
index 6ccb2a502..dd89005f1 100644
--- a/compel/test/rsys/spy.c
+++ b/compel/test/rsys/spy.c
@@ -64,7 +64,9 @@ static inline int chk(int fd, int val)
 {
 	int v = 0;
 
-	read(fd, &v, sizeof(v));
+	if (read(fd, &v, sizeof(v)) != sizeof(v)) {
+		fprintf(stderr, "read failed\n");
+	}
 	printf("%d, want %d\n", v, val);
 	return v == val;
 }
@@ -97,7 +99,10 @@ int main(int argc, char **argv)
 	 * Kick the victim once
 	 */
 	i = 0;
-	write(p_in[1], &i, sizeof(i));
+	if (write(p_in[1], &i, sizeof(i)) != sizeof(i)) {
+		fprintf(stderr, "write to pipe failed\n");
+		return -1;
+	}
 
 	printf("Checking the victim session to be %d\n", sid);
 	pass = chk(p_out[0], sid);
@@ -115,7 +120,10 @@ int main(int argc, char **argv)
 	/*
 	 * Kick the victim again so it tells new session
 	 */
-	write(p_in[1], &i, sizeof(i));
+	if (write(p_in[1], &i, sizeof(i)) != sizeof(i)) {
+		fprintf(stderr, "write to pipe failed\n");
+		return -1;
+	}
 
 	/*
 	 * Stop the victim and check the intrusion went well
diff --git a/compel/test/rsys/victim.c b/compel/test/rsys/victim.c
index 2f1943d0c..85cb7cb89 100644
--- a/compel/test/rsys/victim.c
+++ b/compel/test/rsys/victim.c
@@ -9,7 +9,8 @@ int main(int argc, char **argv)
 			break;
 
 		i = getsid(0);
-		write(1, &i, sizeof(i));
+		if (write(1, &i, sizeof(i)) != sizeof(i))
+			break;
 	}
 
 	return 0;

From 068672f39d767dca3a50ccbd862e90982573ec89 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 15 Dec 2020 10:49:34 +0300
Subject: [PATCH 0470/1854] servicefd: don't move service fds in case they
 remain in the same place

Improve the check to skip moving service fds in clone_service_fd because
we don't need to move anything if old service fds resulting offset is
the same as new service fds resulting offset. It saves us from excess
calls to dup/fcntl(F_DUPFD).

Currently we check that base is the same and shared fdt ids are the
same, but there also can be situations where different bases with
different shared fdt ids still give the same offset sum (running zdtm in
Virtuozzo CT we've seen such a case where service_fd_base=512,
new_base=128, service_fd_id=24, id=0, SERVICE_FD_MAX=16).

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/servicefd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/servicefd.c b/criu/servicefd.c
index 2533f6168..4aeb15360 100644
--- a/criu/servicefd.c
+++ b/criu/servicefd.c
@@ -290,7 +290,8 @@ int clone_service_fd(struct pstree_item *me)
 
 	if (new_base == -1)
 		return -1;
-	if (service_fd_base == new_base && service_fd_id == id)
+
+	if (get_service_fd(LOG_FD_OFF) == new_base - LOG_FD_OFF - SERVICE_FD_MAX * id)
 		return 0;
 
 	/* Dup sfds in memmove() style: they may overlap */

From 34024dfdcbc011ca91a5a2eac090826f96139ff2 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 10 Nov 2020 11:36:02 +0300
Subject: [PATCH 0471/1854] util: move open_proc_self_fd to service_fd

We need this to avoid conflicts with file descriptors which has to be
restored. Currently open_proc PROC_SELF is not used during restoring
file descriptors, but we are going to use it for memfd restore.

Note: in get_proc_fd let's not close service fd if we detect service fd
is not ours, it will be replaced in open_pid_proc anyway, and e.g. in
protected sfd context we can't close or open sfd, but can replace it
without any problems.

While on it also add FIXME because the check in get_proc_fd is error
prone in some rare cases (nested pidns is not supported yet).

We need to populate this new SELF service fd in populate_pid_proc, so
that it is later available in protected context. Also don't close
/proc/self service fd in prep_unix_sk_cwd as it can be called from
protected context and there is no much point of closing it anyway.

Close proc self servicefd in close_old_fds, because first we don't wan't
to reuse it from some ancestor, second there can be some junk fd as we
are yet only in the beginning of close_old_fds. This junk fd can come
from service fds of other tasks from parent's shared fdtable, and this
fd would not allow us to do opendir_proc(PROC_SELF).

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c        |  4 ++++
 criu/files.c             |  9 ++++++++-
 criu/include/servicefd.h |  2 ++
 criu/include/util.h      |  2 +-
 criu/servicefd.c         | 10 ++++++++++
 criu/sk-unix.c           |  1 -
 criu/util.c              | 29 ++++++++++++++++++++---------
 7 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 4d98a0790..19ab0c5ae 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -418,6 +418,10 @@ static int populate_pid_proc(void)
 		pr_err("Can't open PROC_SELF\n");
 		return -1;
 	}
+	if (open_pid_proc(PROC_SELF) < 0) {
+		pr_err("Can't open PROC_SELF\n");
+		return -1;
+	}
 	return 0;
 }
 
diff --git a/criu/files.c b/criu/files.c
index 0912d1a4d..f10527b59 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1256,6 +1256,14 @@ int close_old_fds(void)
 	struct dirent *de;
 	int fd, ret;
 
+	/**
+	 * Close previous /proc/self/ service fd, as we don't wan't to reuse it
+	 * from a different task. Also there can be some junk fd in it's place
+	 * after we've moved our service fds (e.g. from other task of parents
+	 * shared fdtable), we need to close it before opendir_proc() below.
+	 */
+	__close_service_fd(PROC_SELF_FD_OFF);
+
 	dir = opendir_proc(PROC_SELF, "fd");
 	if (dir == NULL)
 		return -1;
@@ -1297,7 +1305,6 @@ int prepare_fds(struct pstree_item *me)
 	sfds_protected = false;
 	close_service_fd(CGROUP_YARD);
 	sfds_protected = true;
-	set_proc_self_fd(-1); /* flush any proc cached fds we may have */
 
 	if (rsti(me)->fdt) {
 		struct fdt *fdt = rsti(me)->fdt;
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index c11f89d37..b03bdaf59 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -17,6 +17,7 @@ enum sfd_type {
 	IMG_STREAMER_FD_OFF,
 	PROC_FD_OFF,		/* fd with /proc for all proc_ calls */
 	PROC_PID_FD_OFF,
+	PROC_SELF_FD_OFF,
 	CR_PROC_FD_OFF,		/* some other's proc fd:
 				 *  - For dump -- target ns' proc
 				 *  - For restore -- CRIU ns' proc
@@ -44,6 +45,7 @@ extern bool is_service_fd(int fd, enum sfd_type type);
 extern int service_fd_min_fd(struct pstree_item *item);
 extern int install_service_fd(enum sfd_type type, int fd);
 extern int close_service_fd(enum sfd_type type);
+extern void __close_service_fd(enum sfd_type type);
 extern int clone_service_fd(struct pstree_item *me);
 
 #endif /* __CR_SERVICE_FD_H__ */
diff --git a/criu/include/util.h b/criu/include/util.h
index c2baf2788..7cb8c262c 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -180,7 +180,7 @@ extern int cr_daemon(int nochdir, int noclose, int close_fd);
 extern int status_ready(void);
 extern int is_root_user(void);
 
-extern void set_proc_self_fd(int fd);
+extern int set_proc_self_fd(int fd);
 
 static inline bool dir_dots(const struct dirent *de)
 {
diff --git a/criu/servicefd.c b/criu/servicefd.c
index 4aeb15360..952410a8d 100644
--- a/criu/servicefd.c
+++ b/criu/servicefd.c
@@ -46,6 +46,7 @@ const char *sfd_type_name(enum sfd_type type)
 		[IMG_FD_OFF]		= __stringify_1(IMG_FD_OFF),
 		[PROC_FD_OFF]		= __stringify_1(PROC_FD_OFF),
 		[PROC_PID_FD_OFF]	= __stringify_1(PROC_PID_FD_OFF),
+		[PROC_SELF_FD_OFF]	= __stringify_1(PROC_SELF_FD_OFF),
 		[CR_PROC_FD_OFF]	= __stringify_1(CR_PROC_FD_OFF),
 		[ROOT_FD_OFF]		= __stringify_1(ROOT_FD_OFF),
 		[CGROUP_YARD]		= __stringify_1(CGROUP_YARD),
@@ -206,6 +207,15 @@ int close_service_fd(enum sfd_type type)
 	return 0;
 }
 
+void __close_service_fd(enum sfd_type type)
+{
+	int fd;
+
+	fd = __get_service_fd(type, service_fd_id);
+	close(fd);
+	clear_bit(type, sfd_map);
+}
+
 static int move_service_fd(struct pstree_item *me, int type, int new_id, int new_base)
 {
 	int old = get_service_fd(type);
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index a3964081b..a5b931b2a 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1211,7 +1211,6 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd,
 		if (switch_ns_by_fd(ns_fd, &mnt_ns_desc, prev_mntns_fd))
 			return -1;
 
-		set_proc_self_fd(-1);
 		close(ns_fd);
 	}
 
diff --git a/criu/util.c b/criu/util.c
index 670ef158d..91add00f3 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -281,15 +281,18 @@ int move_fd_from(int *img_fd, int want_fd)
 
 static pid_t open_proc_pid = PROC_NONE;
 static pid_t open_proc_self_pid;
-static int open_proc_self_fd = -1;
 
-void set_proc_self_fd(int fd)
+int set_proc_self_fd(int fd)
 {
-	if (open_proc_self_fd >= 0)
-		close(open_proc_self_fd);
+	int ret;
+
+	if (fd < 0)
+		return close_service_fd(PROC_SELF_FD_OFF);
 
-	open_proc_self_fd = fd;
 	open_proc_self_pid = getpid();
+	ret = install_service_fd(PROC_SELF_FD_OFF, fd);
+
+	return ret;
 }
 
 static inline int set_proc_pid_fd(int pid, int fd)
@@ -308,10 +311,18 @@ static inline int set_proc_pid_fd(int pid, int fd)
 static inline int get_proc_fd(int pid)
 {
 	if (pid == PROC_SELF) {
-		if (open_proc_self_fd != -1 && open_proc_self_pid != getpid()) {
-			close(open_proc_self_fd);
+		int open_proc_self_fd;
+
+		open_proc_self_fd = get_service_fd(PROC_SELF_FD_OFF);
+		/**
+		 * FIXME in case two processes from different pidnses have the
+		 * same pid from getpid() and one inherited service fds from
+		 * another or they share them by shared fdt - this check will
+		 * not detect that one of them reuses /proc/self of another.
+		 * Everything proc related may break in this case.
+		 */
+		if (open_proc_self_fd >= 0 && open_proc_self_pid != getpid())
 			open_proc_self_fd = -1;
-		}
 		return open_proc_self_fd;
 	} else if (pid == open_proc_pid)
 		return get_service_fd(PROC_PID_FD_OFF);
@@ -402,7 +413,7 @@ inline int open_pid_proc(pid_t pid)
 	}
 
 	if (pid == PROC_SELF)
-		set_proc_self_fd(fd);
+		fd = set_proc_self_fd(fd);
 	else
 		fd = set_proc_pid_fd(pid, fd);
 

From 0bb3d85863e71b750511e5fa1123a1c5a135bf72 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 6 Nov 2020 13:40:25 +0300
Subject: [PATCH 0472/1854] memfd: use PROC_SELF instead of getpid in
 __open_proc

This looks better for me, should be no functional change.

Another implication of this is nested pid namespaces, when we will
support them "__open_proc(getpid()...)" will try to open file of the
process which has the same pid but in NS_ROOT pidns, which is bad.

See also aa2d92082 ("files: use PROC_SELF when a process accesses its
/proc/PID") for a similar change.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/memfd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 4419b4bf5..6c243a509 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -332,7 +332,7 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	 * O_LARGEFILE file flag with regular open(). It doesn't seem that
 	 * important though.
 	 */
-	_fd = __open_proc(getpid(), 0, flags, "fd/%d", fd);
+	_fd = __open_proc(PROC_SELF, 0, flags, "fd/%d", fd);
 	if (_fd < 0) {
 		pr_perror("Can't reopen memfd id=%d", mfe->id);
 		goto err;

From 6ff51fd8d31a932a791deb7af76feb5e251991f3 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 13 Oct 2020 17:11:52 +0000
Subject: [PATCH 0473/1854] restore: warning: Value stored to 'ret' is never
 read

 criu/cr-restore.c:3230:3: note: Value stored to 'ret' is never read
                 ret = false;
                 ^     ~~~~~
  3228|   	if (n == -1) {
  3229|   		pr_perror("Failed to get number of supplementary groups");
  3230|-> 		ret = false;
  3231|   	}
  3232|   	if (n != n_groups)

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 19ab0c5ae..53eddba6b 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3260,7 +3260,7 @@ static bool groups_match(gid_t* groups, int n_groups)
 	n = getgroups(0, NULL);
 	if (n == -1) {
 		pr_perror("Failed to get number of supplementary groups");
-		ret = false;
+		return false;
 	}
 	if (n != n_groups)
 		return false;

From c405a011669cbd3bc37145d833507a5ed62adcfe Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Oct 2020 08:29:13 +0000
Subject: [PATCH 0474/1854] coverity: get_service_fd() is passed to a parameter
 that cannot be negative

criu/fdstore.c:110: negative_return_fn: Function "get_service_fd(FDSTORE_SK_OFF)" returns a negative number.
criu/fdstore.c:110: assign: Assigning: "sk" = "get_service_fd(FDSTORE_SK_OFF)".
criu/fdstore.c:114: negative_returns: "sk" is passed to a parameter that cannot be negative.

criu/namespaces.c:1366: negative_return_fn: Function "get_service_fd(USERNSD_SK)" returns a negative number.
criu/namespaces.c:1366: assign: Assigning: "sk" = "get_service_fd(USERNSD_SK)".
criu/namespaces.c:1389: negative_returns: "sk" is passed to a parameter that cannot be negative.

Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/fdstore.c    | 9 +++++++--
 criu/namespaces.c | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/criu/fdstore.c b/criu/fdstore.c
index a4583fdf4..7c8eb7208 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -107,8 +107,13 @@ int fdstore_add(int fd)
 
 int fdstore_get(int id)
 {
-	int sk = get_service_fd(FDSTORE_SK_OFF);
-	int fd;
+	int sk, fd;
+
+	sk = get_service_fd(FDSTORE_SK_OFF);
+	if (sk < 0) {
+		pr_err("Cannot get FDSTORE_SK_OFF fd\n");
+		return -1;
+	}
 
 	mutex_lock(&desc->lock);
 	if (setsockopt(sk, SOL_SOCKET, SO_PEEK_OFF, &id, sizeof(id))) {
diff --git a/criu/namespaces.c b/criu/namespaces.c
index c8baf42fc..eeb9205d0 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1364,6 +1364,10 @@ int __userns_call(const char *func_name, uns_call_t call, int flags,
 		return call(arg, fd, getpid());
 
 	sk = get_service_fd(USERNSD_SK);
+	if (sk < 0) {
+		pr_err("Cannot get USERNSD_SK fd\n");
+		return -1;
+	}
 	pr_debug("uns: calling %s (%d, %x)\n", func_name, fd, flags);
 
 	if (!async)

From 8c53627dd89dd837fbc8e6505bdebef718c4062a Mon Sep 17 00:00:00 2001
From: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Date: Wed, 26 Aug 2020 16:18:41 +0300
Subject: [PATCH 0475/1854] dump: at exit do not call timing_stop if stats are
 not initialized

Stats often call 'get_timing' function which has a BUG() assertion to
catch cases when stats failed to initialize correctly.
If stats haven't initialized yet assertion will also be triggered.
We dont want the trigger to happen in a case when criu fails at early
steps before initializing stats, but this can happen in the following
case:
  - at cr_dump_tasks criu can catch error before the call to init_stats.
  - it then decides to gracefully quit with error and
    calls cr_dump_finish.
  - cr_dump_finish will call timing_stop -> get_timing
    and BUG() gets triggered

But because criu is already quitting gracefully, BUG() is not needed.
In this code path we can call timing_stop under proper condition.

[avagin: rebase on top of criu-dev and a few minor changes]

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/stats.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/stats.c b/criu/stats.c
index 891c37800..ed5a19141 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -102,6 +102,10 @@ void timing_stop(int t)
 	struct timing *tm;
 	struct timeval now;
 
+	/* stats haven't been initialized. */
+	if (!dstats && !rstats)
+		return;
+
 	tm = get_timing(t);
 	gettimeofday(&now, NULL);
 	timeval_accumulate(&tm->start, &now, &tm->total);

From 3fd3a376fd00dedb3e5af49bbe41c337b4ab2a02 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Fri, 3 Jul 2020 11:31:01 +0300
Subject: [PATCH 0476/1854] mount: adjust log level for get_clean_mnt

In case get_clean_mnt fails open_mountpoint is still able to resolve mounts
by helper process or print error in the worst case. Using pr_warn instead of
pr_perror.

Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/mount.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 2d6ee66db..d6841b2bd 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1111,8 +1111,8 @@ static char *get_clean_mnt(struct mount_info *mi, char *mnt_path_tmp, char *mnt_
 	}
 
 	if (mount(mi->mountpoint, mnt_path, NULL, MS_BIND, NULL)) {
-		pr_perror("Can't bind-mount %d:%s to %s",
-				mi->mnt_id, mi->mountpoint, mnt_path);
+		pr_warn("Can't bind-mount %d:%s to %s: %s\n",
+				mi->mnt_id, mi->mountpoint, mnt_path, strerror(errno));
 		rmdir(mnt_path);
 		return NULL;
 	}

From c4f176b1e6ab87ad94baa57e3b4d2e8d9255f003 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Fri, 3 Jul 2020 11:42:37 +0300
Subject: [PATCH 0477/1854] mount: adjust log level for mnt_is_dir

mnt_is_dir is used when looking up for suitable mount point. In some cases
that function may fail several times. Error level seems to strict for this
cases.
Added error message to lookup_mnt_sdev in case all mnt_is_dir failed.
As for open_handle and alloc_openable which are calling mnt_is_dir, they are
used in check_open_handle, which will call error afterwards.

Adjusted log level for __open_mountpoint result in open_handle since it is
allowed to fail several times. open_handle caller get_mark_path expect
possible failure and will print error in case.

Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/fsnotify.c | 2 +-
 criu/mount.c    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 09093c0be..f34c6b921 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -209,7 +209,7 @@ static int open_handle(unsigned int s_dev, unsigned long i_ino,
 
 		mntfd = __open_mountpoint(m, -1);
 		if (mntfd < 0) {
-			pr_err("Can't open mount for s_dev %x, continue\n", s_dev);
+			pr_warn("Can't open mount for s_dev %x, continue\n", s_dev);
 			continue;
 		}
 
diff --git a/criu/mount.c b/criu/mount.c
index d6841b2bd..d20054aef 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -235,6 +235,7 @@ struct mount_info *lookup_mnt_sdev(unsigned int s_dev)
 		if (m->s_dev == s_dev && mnt_is_dir(m))
 			return m;
 
+	pr_err("Unable to find suitable mount point for s_dev %x\n", s_dev);
 	return NULL;
 }
 
@@ -1016,12 +1017,12 @@ int mnt_is_dir(struct mount_info *pm)
 
 	mntns_root = mntns_get_root_fd(pm->nsid);
 	if (mntns_root < 0) {
-		pr_perror("Can't get root fd of mntns for %d", pm->mnt_id);
+		pr_warn("Can't get root fd of mntns for %d: %s\n", pm->mnt_id, strerror(errno));
 		return 0;
 	}
 
 	if (fstatat(mntns_root, pm->ns_mountpoint, &st, 0)) {
-		pr_perror("Can't fstatat on %s", pm->ns_mountpoint);
+		pr_warn("Can't fstatat on %s: %s\n", pm->ns_mountpoint, strerror(errno));
 		return 0;
 	}
 

From 2721d865f1448a3eb467397c2b5f30e53b2bb5e0 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Fri, 3 Jul 2020 12:43:49 +0300
Subject: [PATCH 0478/1854] fsnotify: rework redundant code

open_handle and first part of alloc_openable do the same work. Both these
function are called from check_open_handle. Rework check_open_handle to call
only alloc_openable.

Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/fsnotify.c | 115 +++++++++++++++++++++++++-----------------------
 1 file changed, 59 insertions(+), 56 deletions(-)

diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index f34c6b921..00a6a32c1 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -104,12 +104,19 @@ static int open_by_handle(void *arg, int fd, int pid)
 	return syscall(__NR_open_by_handle_at, fd, arg, O_PATH);
 }
 
+enum {
+	ERR_NO_MOUNT = -1,
+	ERR_NO_PATH_IN_MOUNT = -2,
+	ERR_GENERIC = -3
+};
+
 static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_handle)
 {
 	struct mount_info *m;
 	fh_t handle;
 	int fd = -1;
 	char *path;
+	char suitable_mount_found = 0;
 
 	decode_handle(&handle, f_handle);
 
@@ -142,6 +149,7 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 		close(mntfd);
 		if (fd < 0)
 			continue;
+		suitable_mount_found = 1;
 
 		if (read_fd_link(fd, buf, sizeof(buf)) < 0) {
 			close(fd);
@@ -164,7 +172,7 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 			if (fstat(openable_fd, &st)) {
 				pr_perror("Can't stat on %s", __path);
 				close(openable_fd);
-				return ERR_PTR(-errno);
+				goto err;
 			}
 			close(openable_fd);
 
@@ -175,7 +183,7 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 			if (st.st_ino == i_ino) {
 				path = xstrdup(buf);
 				if (path == NULL)
-					return ERR_PTR(-ENOMEM);
+					return ERR_PTR(ERR_GENERIC);
 				if (root_ns_mask & CLONE_NEWNS) {
 					f_handle->has_mnt_id = true;
 					f_handle->mnt_id = m->mnt_id;
@@ -186,9 +194,10 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 			pr_debug("\t\t\tnot openable as %s (%m)\n", __path);
 	}
 
-	return ERR_PTR(-ENOENT);
 err:
-	return ERR_PTR(-1);
+	if (suitable_mount_found)
+		return ERR_PTR(ERR_NO_PATH_IN_MOUNT);
+	return ERR_PTR(ERR_NO_MOUNT);
 }
 
 static int open_handle(unsigned int s_dev, unsigned long i_ino,
@@ -228,63 +237,59 @@ int check_open_handle(unsigned int s_dev, unsigned long i_ino,
 		FhEntry *f_handle)
 {
 	char *path, *irmap_path;
-	int fd = -1;
+	struct mount_info *mi;
 
-	if (fault_injected(FI_CHECK_OPEN_HANDLE)) {
-		fd = -1;
+	if (fault_injected(FI_CHECK_OPEN_HANDLE))
 		goto fault;
-	}
 
-	fd = open_handle(s_dev, i_ino, f_handle);
-fault:
-	if (fd >= 0) {
-		struct mount_info *mi;
+	/*
+	 * Always try to fetch watchee path first. There are several reasons:
+	 *
+	 *  - tmpfs/devtmps do not save inode numbers between mounts,
+	 *    so it is critical to have the complete path under our
+	 *    hands for restore purpose;
+	 *
+	 *  - in case of migration the inodes might be changed as well
+	 *    so the only portable solution is to carry the whole path
+	 *    to the watchee inside image.
+	 */
+	path = alloc_openable(s_dev, i_ino, f_handle);
 
+	if (!IS_ERR_OR_NULL(path)) {
 		pr_debug("\tHandle 0x%x:0x%lx is openable\n", s_dev, i_ino);
-
-		mi = lookup_mnt_sdev(s_dev);
-		if (mi == NULL) {
-			pr_err("Unable to lookup a mount by dev 0x%x\n", s_dev);
-			goto err;
-		}
-
-		/*
-		 * Always try to fetch watchee path first. There are several reasons:
-		 *
-		 *  - tmpfs/devtmps do not save inode numbers between mounts,
-		 *    so it is critical to have the complete path under our
-		 *    hands for restore purpose;
-		 *
-		 *  - in case of migration the inodes might be changed as well
-		 *    so the only portable solution is to carry the whole path
-		 *    to the watchee inside image.
-		 */
-		path = alloc_openable(s_dev, i_ino, f_handle);
-		if (!IS_ERR_OR_NULL(path))
-			goto out;
-		else if (IS_ERR(path) && PTR_ERR(path) == -ENOMEM)
-			goto err;
-
-		if ((mi->fstype->code == FSTYPE__TMPFS) ||
-		    (mi->fstype->code == FSTYPE__DEVTMPFS)) {
-			pr_err("Can't find suitable path for handle (dev %#x ino %#lx): %d\n",
-			       s_dev, i_ino, (int)PTR_ERR(path));
-			goto err;
-		}
-
-		if (!opts.force_irmap)
-			/*
-			 * If we're not forced to do irmap, then
-			 * say we have no path for watch. Otherwise
-			 * do irmap scan even if the handle is
-			 * working.
-			 *
-			 * FIXME -- no need to open-by-handle if
-			 * we are in force-irmap and not on tempfs
-			 */
-			goto out_nopath;
+		goto out;
+	} else if (IS_ERR(path) && PTR_ERR(path) == ERR_NO_MOUNT) {
+		goto fault;
+	} else if (IS_ERR(path) && PTR_ERR(path) == ERR_GENERIC) {
+		goto err;
 	}
 
+	mi = lookup_mnt_sdev(s_dev);
+	if (mi == NULL) {
+		pr_err("Unable to lookup a mount by dev 0x%x\n", s_dev);
+		goto err;
+	}
+
+	if ((mi->fstype->code == FSTYPE__TMPFS) ||
+	    (mi->fstype->code == FSTYPE__DEVTMPFS)) {
+		pr_err("Can't find suitable path for handle (dev %#x ino %#lx): %d\n",
+		       s_dev, i_ino, (int)PTR_ERR(path));
+		goto err;
+	}
+
+	if (!opts.force_irmap)
+		/*
+		 * If we're not forced to do irmap, then
+		 * say we have no path for watch. Otherwise
+		 * do irmap scan even if the handle is
+		 * working.
+		 *
+		 * FIXME -- no need to open-by-handle if
+		 * we are in force-irmap and not on tempfs
+		 */
+		goto out_nopath;
+
+fault:
 	pr_warn("\tHandle 0x%x:0x%lx cannot be opened\n", s_dev, i_ino);
 	irmap_path = irmap_lookup(s_dev, i_ino);
 	if (!irmap_path) {
@@ -298,10 +303,8 @@ out:
 	pr_debug("\tDumping %s as path for handle\n", path);
 	f_handle->path = path;
 out_nopath:
-	close_safe(&fd);
 	return 0;
 err:
-	close_safe(&fd);
 	return -1;
 }
 

From f04e8517ca9e35f12e0ddc613dad8d8012443182 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 25 Jan 2021 19:46:00 -0800
Subject: [PATCH 0479/1854] workflows/stale: Don't close issue that has labels
 'new feature' or 'enhancement'

---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 29676b911..f865bedeb 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -24,4 +24,4 @@ jobs:
         days-before-close: 365
         remove-stale-when-updated: true
         exempt-pr-labels: 'no-auto-close'
-        exempt-issue-labels: 'no-auto-close'
+        exempt-issue-labels: 'no-auto-close', 'new feature', 'enhancement'

From 50a96e9faf1cf06bf1952eed0d4eee62b8b3172c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 5 Nov 2020 06:47:52 +0000
Subject: [PATCH 0480/1854] ci: move vagrant test to cirrus ci

With Travis dramatically reducing the minutes available for CI, CRIU
needs a new place to run tests. This moves the Vagrant based Fedora 32
no VDSO test cases to Cirrus CI. Cirrus CI seems to be one of the very
few free CI services allowing access to /dev/kvm.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml           | 16 ++++++++++++++++
 .travis.yml           |  1 -
 scripts/ci/vagrant.sh | 43 ++++++++++++++++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 000000000..dce5ce8cd
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,16 @@
+environment:
+  CIRRUS_WORKING_DIR: "/tmp/criu"
+container:
+  # This test case does not work on focal, because the newer version
+  # of libvirt fails during 'vagrant up' with ip6tables errors.
+  image: ubuntu:bionic
+  kvm: true
+  cpu: 4
+  memory: 8G
+task:
+  name: Vagrant Fedora based test (no VDSO)
+  setup_script: |
+    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+  build_script: |
+    make -C scripts/ci vagrant-fedora-no-vdso
diff --git a/.travis.yml b/.travis.yml
index 60516df3a..562026bf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ services:
 env:
   - TR_ARCH=local       COMPAT_TEST=y
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
-  - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
     - os: linux
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index bc10693bb..a23a37175 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -6,29 +6,55 @@
 set -e
 set -x
 
-VAGRANT_VERSION=2.2.7
+VAGRANT_VERSION=2.2.10
 FEDORA_VERSION=32
 FEDORA_BOX_VERSION=32.20200422.0
 
 setup() {
-	apt-get -qq update
-	# Load the kvm modules for vagrant to use qemu
-	modprobe kvm kvm_intel
+	if [ -n "$TRAVIS" ]; then
+		# Load the kvm modules for vagrant to use qemu
+		modprobe kvm kvm_intel
+	fi
+	if [ -n "$CIRRUS_CI" ]; then
+		# Running modprobe is not possible on Cirrus, because
+		# we are running in a container with potentially other
+		# modules than the host.
+		# Vagrant can still use /dev/kvm later if we do
+		chmod 666 /dev/kvm
+	fi
 
 	# Tar up the git checkout to have vagrant rsync it to the VM
 	tar cf criu.tar ../../../criu
-	wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_"$(uname -m)".deb -O /tmp/vagrant.deb && \
+	# Cirrus has problems with the following certificate.
+	wget --no-check-certificate https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_"$(uname -m)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
 
-	./apt-install libvirt-bin libvirt-dev qemu-utils qemu
-	systemctl restart libvirt-bin
+	./apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu \
+		ruby build-essential libxml2-dev qemu-kvm rsync ebtables dnsmasq-base \
+		openssh-client
+	if [ -n "$CIRRUS_CI" ]; then
+		# On Cirrus systemctl does not work, because we are running in
+		# a container without access to systemd
+		/usr/sbin/virtlogd -d
+		/usr/sbin/libvirtd -d
+	else
+		systemctl restart libvirtd
+	fi
 	vagrant plugin install vagrant-libvirt
 	vagrant init fedora/${FEDORA_VERSION}-cloud-base --box-version ${FEDORA_BOX_VERSION}
 	# The default libvirt Vagrant VM uses 512MB.
 	# Travis VMs should have around 7.5GB.
 	# Increasing it to 4GB should work.
 	sed -i Vagrantfile -e 's,^end$,  config.vm.provider :libvirt do |libvirt|'"\n"'    libvirt.memory = 4096;end'"\n"'end,g'
-	vagrant up --provider=libvirt
+	if [ -n "$CIRRUS_CI" ]; then
+		# Work around for:
+		# Error while activating network: Call to virNetworkCreate failed: internal error:
+		# Failed to apply firewall rules /usr/sbin/ip6tables --table filter --list-rules: modprobe: FATAL: Module ip6_tables not found in directory /lib/modules/5.4.0-1025-gcp
+		# On cirrus-ci.com. Running in a container without access to the host's kernel modules
+		rm -f /sbin/ip6tables
+		cp /bin/true /sbin/ip6tables
+	fi
+	vagrant up --provider=libvirt > /dev/null
 	mkdir -p /root/.ssh
 	vagrant ssh-config >> /root/.ssh/config
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
@@ -45,7 +71,6 @@ fedora-no-vdso() {
 	vagrant reload
 	ssh default cat /proc/cmdline
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
-	# Excluding two cgroup tests which seem to fail because of cgroup2
 	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going'
 }
 

From 95df2524cce4b64f3ab1a161feae3ec13ef0dd90 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 20 Jan 2021 11:12:51 +0300
Subject: [PATCH 0481/1854] zdtm: cleanup thread-bomb test error handling and
 printing

1) Let's do test_init earlier so that max_nr test_msg is now visible in
thread-bomb.out.

2) Also lets check errors from malloc and pthread_...  functions, print
messages about their errors and do proper deallocation at least.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/transition/thread-bomb.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/transition/thread-bomb.c b/test/zdtm/transition/thread-bomb.c
index 6621b18ed..c1b825be7 100644
--- a/test/zdtm/transition/thread-bomb.c
+++ b/test/zdtm/transition/thread-bomb.c
@@ -18,17 +18,31 @@ static const size_t stack_size = 64 * 1024;
 static void *thread_fn(void *arg)
 {
 	pthread_t t, p, *self;
+	int err;
 
 	if (arg) {
 		p = *(pthread_t *)arg;
-		pthread_join(p, NULL);
+		err = pthread_join(p, NULL);
 		free(arg);
+		if (err) {
+			pr_err("pthread_join(): %d\n", err);
+			return NULL;
+		}
 	}
 
 	self = malloc(sizeof(*self));
+	if (!self) {
+		pr_perror("malloc()");
+		return NULL;
+	}
+
 	*self = pthread_self();
 
-	pthread_create(&t, &attr, thread_fn, self);
+	err = pthread_create(&t, &attr, thread_fn, self);
+	if (err) {
+		pr_err("pthread_create(): %d\n", err);
+		free(self);
+	}
 	return NULL;
 }
 
@@ -38,6 +52,8 @@ int main(int argc, char **argv)
 	char *val;
 	int err;
 
+	test_init(argc, argv);
+
 	err = pthread_attr_init(&attr);
 	if (err) {
 		pr_err("pthread_attr_init(): %d\n", err);
@@ -56,8 +72,6 @@ int main(int argc, char **argv)
 
 	test_msg("%d\n", max_nr);
 
-	test_init(argc, argv);
-
 	for (i = 0; i < max_nr; i++) {
 		pthread_t p;
 		err = pthread_create(&p, &attr, thread_fn, NULL);

From baad84efb28f828ca3dce459eced2163590d839d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 12 Nov 2020 12:22:41 +0000
Subject: [PATCH 0482/1854] ci: run aarch64 compile tests on Drone

Besides Travis CI Drone CI seems to be only service providing ARM based
builds. This switches the aarch64 and arm32 builds to drone.io.

Because Drone CI is running in a Docker container we cannot use 'setarch
linux32' as it requires the blocked syscall 'personality(2)'.

But Drone CI provides an 'arch: arm' which gives the same architecture
as 'setarch linux32' on Travis aarch64: armv8l

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .drone.yml                 | 65 ++++++++++++++++++++++++++++++++++++++
 .travis.yml                | 10 ------
 scripts/ci/run-ci-tests.sh | 10 +++---
 3 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 000000000..d21b6edbb
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,65 @@
+---
+kind: pipeline
+type: docker
+name: aarch64 build GCC (native)
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: ubuntu:focal
+  commands:
+  - scripts/ci/apt-install make
+  - make -C scripts/ci local
+
+---
+kind: pipeline
+type: docker
+name: aarch64 build CLANG (native)
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: ubuntu:focal
+  commands:
+  - scripts/ci/apt-install make
+  - make -C scripts/ci local CLANG=1
+
+---
+kind: pipeline
+type: docker
+name: armhf build GCC (native)
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  # At the time of setting up focal did not work
+  image: ubuntu:bionic
+  commands:
+  - scripts/ci/apt-install make
+  - make -C scripts/ci local
+
+---
+kind: pipeline
+type: docker
+name: armhf build CLANG (native)
+
+platform:
+  os: linux
+  arch: arm
+
+steps:
+- name: build
+  # At the time of setting up focal did not work
+  image: ubuntu:bionic
+  commands:
+  - scripts/ci/apt-install make
+  - make -C scripts/ci local CLANG=1
diff --git a/.travis.yml b/.travis.yml
index 562026bf2..10437aa4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,16 +33,6 @@ jobs:
       group: edge
       virt: vm
       dist: bionic
-    - os: linux
-      arch: arm64
-      # This runs on aarch64 with 'setarch linux32'
-      env: TR_ARCH=armv7hf
-      dist: bionic
-    - os: linux
-      arch: arm64
-      # This runs on aarch64 with 'setarch linux32'
-      env: TR_ARCH=armv7hf     CLANG=1
-      dist: bionic
     - os: linux
       arch: arm64
       env: TR_ARCH=fedora-rawhide
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 1a51d6aeb..900bba594 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -4,7 +4,8 @@ set -x -e
 CI_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
-		libnl-route-3-dev time ccache flake8 libbsd-dev"
+		libnl-route-3-dev time ccache flake8 libbsd-dev
+		libperl-dev pkg-config"
 
 
 if [ -e /etc/lsb-release ]; then
@@ -51,12 +52,13 @@ ci_prep () {
 	# This can fail on aarch64 travis
 	service apport stop || :
 
-	CC=gcc
-	# clang support
 	if [ "$CLANG" = "1" ]; then
-		CI_PKGS="$CI_PKGS clang"
+		# clang support
 		CC=clang
+	else
+		CC=gcc
 	fi
+	CI_PKGS="$CI_PKGS $CC"
 
 	[ -n "$GCOV" ] && {
 		apt-add-repository -y "ppa:ubuntu-toolchain-r/test"

From b83a1dd956462b6fa6271ac41f2fc503eb4ac852 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 29 Dec 2020 08:47:26 +0000
Subject: [PATCH 0483/1854] ci: also use clang for compel-host-bin

Running in an environment with clang and without gcc even installed
does not work as compel-host-bin uses HOSTCC which defaults to gcc.

If CLANG=1 is set this also sets HOSTCC to clang to actually build
compel-host-bin with clang and not with gcc.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 900bba594..c64fa1190 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -55,6 +55,10 @@ ci_prep () {
 	if [ "$CLANG" = "1" ]; then
 		# clang support
 		CC=clang
+		# If this is running in an environment without gcc installed
+		# compel-host-bin will fail as it is using HOSTCC. Also
+		# set HOSTCC to clang to build compel-host-bin with it.
+		export HOSTCC=clang
 	else
 		CC=gcc
 	fi

From 540141c7c56aed9064a0343fe69e76dc569ea78d Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 20 Jan 2021 23:48:31 -0800
Subject: [PATCH 0484/1854] namespaces: handle errors of snprintf

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/namespaces.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index eeb9205d0..ccd6e1323 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1163,11 +1163,19 @@ static int write_id_map(pid_t pid, UidGidExtent **extents, int n, char *id_map)
 	 *  We can perform only a single write (that may contain multiple
 	 *  newline-delimited records) to a uid_map and a gid_map files.
 	 */
-	for (i = 0; i < n; i++)
-		off += snprintf(buf + off, sizeof(buf) - off,
+	for (i = 0; i < n; i++) {
+		int len;
+
+		len = snprintf(buf + off, sizeof(buf) - off,
 				"%u %u %u\n", extents[i]->first,
 					extents[i]->lower_first,
 					extents[i]->count);
+		if (len < 0) {
+			pr_perror("Unable to form the user/group mappings buffer");
+			return -1;
+		}
+		off += len;
+	}
 
 	fd = open_proc_rw(pid, "%s", id_map);
 	if (fd < 0)

From d74353d7710c2af6093c9ab5048c340b979f2509 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 20 Jan 2021 23:49:28 -0800
Subject: [PATCH 0485/1854] util: zero the events pointer to avoid its double
 free

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/util.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/util.c b/criu/util.c
index 91add00f3..634600cec 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1323,6 +1323,7 @@ int epoll_prepare(int nr_fds, struct epoll_event **events)
 
 free_events:
 	xfree(*events);
+	*events = NULL;
 	return -1;
 }
 

From fc5ba7de72519ee9b85a8cfb2bb8afc2ae21f162 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Jan 2021 00:31:27 -0800
Subject: [PATCH 0486/1854] zdtm: handle a case when a test vma is merged with
 another one

Fixes: #1346
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/get_smaps_bits.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/get_smaps_bits.c b/test/zdtm/static/get_smaps_bits.c
index 9253f4db6..3debaa752 100644
--- a/test/zdtm/static/get_smaps_bits.c
+++ b/test/zdtm/static/get_smaps_bits.c
@@ -109,7 +109,7 @@ int get_smaps_bits(unsigned long where, unsigned long *flags, unsigned long *mad
 	while (fgets(buf, sizeof(buf), smaps)) {
 		is_vma_range_fmt(buf, &start, &end);
 
-		if (!strncmp(buf, "VmFlags: ", 9) && start == where) {
+		if (!strncmp(buf, "VmFlags: ", 9) && start <= where && where < end) {
 			found = 1;
 			parse_vmflags(buf, flags, madv);
 			break;

From da2c83d871c85f8f77d314354d8d7e3e57e67907 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 29 Jan 2021 19:24:55 +0000
Subject: [PATCH 0487/1854] ci: fix syntax error in stale.yml

The commas need to be inside of the quotes. Not on the outside.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index f865bedeb..e8aa9b4d0 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -24,4 +24,4 @@ jobs:
         days-before-close: 365
         remove-stale-when-updated: true
         exempt-pr-labels: 'no-auto-close'
-        exempt-issue-labels: 'no-auto-close', 'new feature', 'enhancement'
+        exempt-issue-labels: 'no-auto-close, new feature, enhancement'

From bb2078f3685a415d093f4c718bb286874ca1db97 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 29 Jan 2021 19:20:48 +0000
Subject: [PATCH 0488/1854] ci: upgrade vagrant and Fedora version

The updates to the latest Vagrant version and from Fedora 32 to 33.

Also using --no-tty instead of > /dev/null for vagrant up.

Also run 'dnf upgrade -y' in out vagrant VM to get the latest kernel.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index a23a37175..3dc79dd83 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -6,9 +6,9 @@
 set -e
 set -x
 
-VAGRANT_VERSION=2.2.10
-FEDORA_VERSION=32
-FEDORA_BOX_VERSION=32.20200422.0
+VAGRANT_VERSION=2.2.14
+FEDORA_VERSION=33
+FEDORA_BOX_VERSION=33.20201019.0
 
 setup() {
 	if [ -n "$TRAVIS" ]; then
@@ -54,9 +54,10 @@ setup() {
 		rm -f /sbin/ip6tables
 		cp /bin/true /sbin/ip6tables
 	fi
-	vagrant up --provider=libvirt > /dev/null
+	vagrant up --provider=libvirt --no-tty
 	mkdir -p /root/.ssh
 	vagrant ssh-config >> /root/.ssh/config
+	ssh default sudo dnf upgrade -y
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel make protobuf-c-devel \
 		protobuf-devel python3-flake8 python3-future python3-protobuf \

From 95c4a8b4007e78c96917d37e796e333646310fc0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 31 Jan 2021 17:30:46 +0000
Subject: [PATCH 0489/1854] ci: skip bpf tests on vagrant

See: https://github.com/checkpoint-restore/criu/issues/1354

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 3dc79dd83..4dccf2613 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -72,7 +72,9 @@ fedora-no-vdso() {
 	vagrant reload
 	ssh default cat /proc/cmdline
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
-	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going'
+	# BPF tests are failing see: https://github.com/checkpoint-restore/criu/issues/1354
+	# Needs to be fixed, skip for now
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going -x zdtm/static/bpf_hash -x zdtm/static/bpf_array'
 }
 
 $1

From ed7cefe21789bf688abfa710d4372ffbd3e50368 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 31 Jan 2021 17:38:45 +0000
Subject: [PATCH 0490/1854] ci: factor out Fedora Rawhide CI setup

To run Fedora Rawhide based aarch64 containers on Drone CI our current
Dockerfile setup does not work.

This moves the package installation out of the Dockerfile into
scripts/ci/prepare-for-fedora-rawhide.sh to be usable in the Dockerfile
environment and in the Drone CI environment.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.fedora.tmpl     | 39 ++----------------------
 scripts/ci/prepare-for-fedora-rawhide.sh | 37 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100755 scripts/ci/prepare-for-fedora-rawhide.sh

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 184f0019a..918849a7b 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -1,42 +1,8 @@
 ARG CC=gcc
 ARG ENV1=FOOBAR
 
-RUN dnf install -y \
-	ccache \
-	diffutils \
-	findutils \
-	gcc \
-	git \
-	gnutls-devel \
-	gzip \
-	iproute \
-	iptables \
-	nftables \
-	nftables-devel \
-	libaio-devel \
-	libasan \
-	libcap-devel \
-	libnet-devel \
-	libnl3-devel \
-	make \
-	procps-ng \
-	protobuf-c-devel \
-	protobuf-devel \
-	python3-flake8 \
-	python3-PyYAML \
-	python3-future \
-	python3-protobuf \
-	python3-junit_xml \
-	redhat-rpm-config \
-	sudo \
-	tar \
-	which \
-	e2fsprogs \
-	rubygem-asciidoctor \
-	kmod
-
-RUN ln -sf python3 /usr/bin/python
-ENV PYTHON=python3
+COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
+RUN /bin/prepare-for-fedora-rawhide.sh
 
 COPY . /criu
 WORKDIR /criu
@@ -49,4 +15,3 @@ RUN mv .ccache /tmp && make mrproper && ccache -sz  && \
 RUN adduser -u 1000 test
 
 RUN make -C test/zdtm -j $(nproc)
-
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
new file mode 100755
index 000000000..1b2273b3b
--- /dev/null
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e -x
+
+dnf install -y \
+	ccache \
+	diffutils \
+	findutils \
+	gcc \
+	git \
+	gnutls-devel \
+	gzip \
+	iproute \
+	iptables \
+	nftables \
+	nftables-devel \
+	libaio-devel \
+	libasan \
+	libcap-devel \
+	libnet-devel \
+	libnl3-devel \
+	make \
+	procps-ng \
+	protobuf-c-devel \
+	protobuf-devel \
+	python3-flake8 \
+	python3-PyYAML \
+	python3-future \
+	python3-protobuf \
+	python3-junit_xml \
+	python-unversioned-command \
+	redhat-rpm-config \
+	sudo \
+	tar \
+	which \
+	e2fsprogs \
+	rubygem-asciidoctor \
+	kmod

From f4c5937cac31f989494e9aafd18182bd44bf4c5d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 31 Jan 2021 17:41:09 +0000
Subject: [PATCH 0491/1854] ci: move Fedora Rawhide based tests away from
 Travis

This moves Fedora Rawhide based tests away from Travis. To Github
Actions for x86_64 and to Drone for aarch64.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .drone.yml                                | 17 +++++++++++++++++
 .github/workflows/fedora-rawhide-test.yml | 12 ++++++++++++
 .travis.yml                               |  8 --------
 scripts/ci/run-ci-tests.sh                |  4 ++++
 4 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/fedora-rawhide-test.yml

diff --git a/.drone.yml b/.drone.yml
index d21b6edbb..07eb8be65 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -63,3 +63,20 @@ steps:
   commands:
   - scripts/ci/apt-install make
   - make -C scripts/ci local CLANG=1
+
+---
+kind: pipeline
+type: docker
+name: aarch64 Fedora Rawhide
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  image: registry.fedoraproject.org/fedora:rawhide
+  commands:
+  - scripts/ci/prepare-for-fedora-rawhide.sh
+  - make -C scripts/ci/ local CC=gcc SKIP_CI_PREP=1 SKIP_CI_TEST=1 CD_TO_TOP=1
+  - make -C test/zdtm -j 4
diff --git a/.github/workflows/fedora-rawhide-test.yml b/.github/workflows/fedora-rawhide-test.yml
new file mode 100644
index 000000000..2ff8c1371
--- /dev/null
+++ b/.github/workflows/fedora-rawhide-test.yml
@@ -0,0 +1,12 @@
+name: Fedora Rawhide Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Fedora Rawhide Test
+      run: sudo -E make -C scripts/ci fedora-rawhide
diff --git a/.travis.yml b/.travis.yml
index 10437aa4e..f51bd0807 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,14 +33,6 @@ jobs:
       group: edge
       virt: vm
       dist: bionic
-    - os: linux
-      arch: arm64
-      env: TR_ARCH=fedora-rawhide
-      dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=fedora-rawhide
-      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=docker-test
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index c64fa1190..7693e5a86 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -138,6 +138,10 @@ print_env
 
 ci_prep
 
+if [ "${CD_TO_TOP}" = "1" ]; then
+	cd ../../
+fi
+
 if [ "$CLANG" = "1" ]; then
 	# Needed for clang on Circle CI
 	LDFLAGS="$LDFLAGS -Wl,-z,now"

From 909ce55d8c8735b8b2949e17b74e1317875229a0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 29 Jan 2021 18:05:28 +0000
Subject: [PATCH 0492/1854] Tell podman to use vfs as storage-driver

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/podman-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index d61e2d0b8..a13e1dbdc 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -35,6 +35,7 @@ make install
 
 # overlaysfs behaves differently on Ubuntu and breaks CRIU
 # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
+export STORAGE_DRIVER=vfs
 podman --storage-driver vfs info
 
 criu --version

From f983a55e68a7589d6ebabb843a17281751409cf6 Mon Sep 17 00:00:00 2001
From: anatasluo <luolongjuna@gmail.com>
Date: Fri, 29 Jan 2021 13:48:57 +0000
Subject: [PATCH 0493/1854] vdso: fix segmentation fault caused by char pointer
 array

When I compile criu with "make DEBUG=1" and run it to restore my
program, it produces a segmentation fault.

In aarch64, with compile flag "-O0", when criu executes the code in pie,
it is unable to visit the content of ARCH_VDSO_SYMBOLS. So I put these
variables into the stack.

Signed-off-by: anatasluo <luolongjuna@gmail.com>
---
 criu/arch/aarch64/include/asm/vdso.h | 17 +++++++-------
 criu/arch/arm/include/asm/vdso.h     |  9 +++++---
 criu/arch/mips/include/asm/vdso.h    | 12 ++++++----
 criu/arch/ppc64/include/asm/vdso.h   | 34 +++++++++++++++++++---------
 criu/arch/s390/include/asm/vdso.h    | 17 +++++++++-----
 criu/arch/x86/include/asm/vdso.h     | 23 +++++++++++++------
 criu/pie/util-vdso.c                 |  2 ++
 7 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/criu/arch/aarch64/include/asm/vdso.h b/criu/arch/aarch64/include/asm/vdso.h
index 8a65e0947..97a2440ee 100644
--- a/criu/arch/aarch64/include/asm/vdso.h
+++ b/criu/arch/aarch64/include/asm/vdso.h
@@ -16,15 +16,16 @@
  * Workaround for VDSO array symbol table's relocation.
  * XXX: remove when compel/piegen will support aarch64.
  */
-static const char* __maybe_unused aarch_vdso_symbol1 = "__kernel_clock_getres";
-static const char* __maybe_unused aarch_vdso_symbol2 = "__kernel_clock_gettime";
-static const char* __maybe_unused aarch_vdso_symbol3 = "__kernel_gettimeofday";
-static const char* __maybe_unused aarch_vdso_symbol4 = "__kernel_rt_sigreturn";
+#define ARCH_VDSO_SYMBOLS_LIST \
+	const char* aarch_vdso_symbol1 = "__kernel_clock_getres"; \
+	const char* aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
+	const char* aarch_vdso_symbol3 = "__kernel_gettimeofday"; \
+	const char* aarch_vdso_symbol4 = "__kernel_rt_sigreturn";
 
-#define ARCH_VDSO_SYMBOLS			\
-	aarch_vdso_symbol1,			\
-	aarch_vdso_symbol2,			\
-	aarch_vdso_symbol3,			\
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, \
+	aarch_vdso_symbol2, \
+	aarch_vdso_symbol3, \
 	aarch_vdso_symbol4
 
 extern void write_intraprocedure_branch(unsigned long to, unsigned long from);
diff --git a/criu/arch/arm/include/asm/vdso.h b/criu/arch/arm/include/asm/vdso.h
index f57790ac2..e96514e0e 100644
--- a/criu/arch/arm/include/asm/vdso.h
+++ b/criu/arch/arm/include/asm/vdso.h
@@ -11,8 +11,11 @@
  */
 #define VDSO_SYMBOL_MAX		2
 #define VDSO_SYMBOL_GTOD	1
-#define ARCH_VDSO_SYMBOLS			\
-	"__vdso_clock_gettime",		\
-	"__vdso_gettimeofday"
+#define ARCH_VDSO_SYMBOLS_LIST \
+	const char* aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
+	const char* aarch_vdso_symbol2 = "__vdso_gettimeofday";
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, \
+	aarch_vdso_symbol2,
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/mips/include/asm/vdso.h b/criu/arch/mips/include/asm/vdso.h
index 0e5da159e..c3e9b0176 100755
--- a/criu/arch/mips/include/asm/vdso.h
+++ b/criu/arch/mips/include/asm/vdso.h
@@ -14,10 +14,14 @@
  */
 #define VDSO_SYMBOL_MAX	3
 #define VDSO_SYMBOL_GTOD	0
-#define ARCH_VDSO_SYMBOLS			\
-	"__vdso_clock_gettime",			\
-	"__vdso_gettimeofday",			\
-	"__vdso_clock_getres"
+#define ARCH_VDSO_SYMBOLS_LIST \
+	const char* aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
+	const char* aarch_vdso_symbol2 = "__vdso_gettimeofday"; \
+	const char* aarch_vdso_symbol3 = "__vdso_clock_getres";
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, \
+	aarch_vdso_symbol2, \
+	aarch_vdso_symbol3,
 
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/ppc64/include/asm/vdso.h b/criu/arch/ppc64/include/asm/vdso.h
index 6c92348d6..fe0433665 100644
--- a/criu/arch/ppc64/include/asm/vdso.h
+++ b/criu/arch/ppc64/include/asm/vdso.h
@@ -14,16 +14,28 @@
  */
 #define VDSO_SYMBOL_MAX		10
 #define VDSO_SYMBOL_GTOD	5
-#define ARCH_VDSO_SYMBOLS			\
-	"__kernel_clock_getres",		\
-	"__kernel_clock_gettime",		\
-	"__kernel_get_syscall_map",		\
-	"__kernel_get_tbfreq",			\
-	"__kernel_getcpu",			\
-	"__kernel_gettimeofday",		\
-	"__kernel_sigtramp_rt64",		\
-	"__kernel_sync_dicache",		\
-	"__kernel_sync_dicache_p5",		\
-	"__kernel_time"
+#define ARCH_VDSO_SYMBOLS_LIST \
+	const char* aarch_vdso_symbol1 = "__kernel_clock_getres"; \
+	const char* aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
+	const char* aarch_vdso_symbol3 = "__kernel_get_syscall_map"; \
+	const char* aarch_vdso_symbol4 = "__kernel_get_tbfreq"; \
+	const char* aarch_vdso_symbol5 = "__kernel_getcpu"; \
+	const char* aarch_vdso_symbol6 = "__kernel_gettimeofday"; \
+	const char* aarch_vdso_symbol7 = "__kernel_sigtramp_rt64"; \
+	const char* aarch_vdso_symbol8 = "__kernel_sync_dicache"; \
+	const char* aarch_vdso_symbol9 = "__kernel_sync_dicache_p5"; \
+	const char* aarch_vdso_symbol10 = "__kernel_time";
+
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, \
+	aarch_vdso_symbol2, \
+	aarch_vdso_symbol3, \
+	aarch_vdso_symbol4, \
+	aarch_vdso_symbol5, \
+	aarch_vdso_symbol6, \
+	aarch_vdso_symbol7, \
+	aarch_vdso_symbol8, \
+	aarch_vdso_symbol9, \
+	aarch_vdso_symbol10
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/s390/include/asm/vdso.h b/criu/arch/s390/include/asm/vdso.h
index c54d848ad..ac71f5981 100644
--- a/criu/arch/s390/include/asm/vdso.h
+++ b/criu/arch/s390/include/asm/vdso.h
@@ -12,13 +12,18 @@
 #define VDSO_SYMBOL_GTOD	0
 
 /*
- * This definition is used in pie/util-vdso.c to initialize the vdso symbol
+ * These definitions are used in pie/util-vdso.c to initialize the vdso symbol
  * name string table 'vdso_symbols'
  */
-#define ARCH_VDSO_SYMBOLS				\
-	"__kernel_gettimeofday",			\
-	"__kernel_clock_gettime",			\
-	"__kernel_clock_getres",			\
-	"__kernel_getcpu"
+#define ARCH_VDSO_SYMBOLS_LIST \
+	const char* aarch_vdso_symbol1 = "__kernel_gettimeofday"; \
+	const char* aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
+	const char* aarch_vdso_symbol3 = "__kernel_clock_getres"; \
+	const char* aarch_vdso_symbol4 = "__kernel_getcpu";
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, \
+	aarch_vdso_symbol2, \
+	aarch_vdso_symbol3, \
+	aarch_vdso_symbol4
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/x86/include/asm/vdso.h b/criu/arch/x86/include/asm/vdso.h
index 28ae2d15a..54d1fba69 100644
--- a/criu/arch/x86/include/asm/vdso.h
+++ b/criu/arch/x86/include/asm/vdso.h
@@ -35,13 +35,22 @@
  * vsyscall will be patched again when addressing:
  * https://github.com/checkpoint-restore/criu/issues/512
  */
-#define ARCH_VDSO_SYMBOLS			\
-	"__vdso_clock_gettime",			\
-	"__vdso_getcpu",			\
-	"__vdso_gettimeofday",			\
-	"__vdso_time",				\
-	"__kernel_sigreturn",			\
-	"__kernel_rt_sigreturn"
+
+#define ARCH_VDSO_SYMBOLS_LIST \
+	const char* aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
+	const char* aarch_vdso_symbol2 = "__vdso_getcpu"; \
+	const char* aarch_vdso_symbol3 = "__vdso_gettimeofday"; \
+	const char* aarch_vdso_symbol4 = "__vdso_time"; \
+	const char* aarch_vdso_symbol5 = "__kernel_sigreturn"; \
+	const char* aarch_vdso_symbol6 = "__kernel_rt_sigreturn";
+
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, \
+	aarch_vdso_symbol2, \
+	aarch_vdso_symbol3, \
+	aarch_vdso_symbol4, \
+	aarch_vdso_symbol5, \
+	aarch_vdso_symbol6
 
 /*	"__kernel_vsyscall",			*/
 
diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index ff91a3b12..5e1f128e8 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -219,6 +219,8 @@ static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 		struct vdso_symtable *t, uintptr_t dynsymbol_names,
 		Hash_t *hash, Dyn_t *dyn_symtab)
 {
+	ARCH_VDSO_SYMBOLS_LIST
+
 	const char *vdso_symbols[VDSO_SYMBOL_MAX] = {
 		ARCH_VDSO_SYMBOLS
 	};

From 67ce4e46c020b6c1a07529e79f8717e16e300c5a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 1 Feb 2021 13:23:49 +0000
Subject: [PATCH 0494/1854] ci: move asan and image streamer test to github

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/fedora-asan-test.yml   | 12 ++++++++++++
 .github/workflows/stream-test.yml        | 12 ++++++++++++
 .travis.yml                              |  5 -----
 scripts/build/Dockerfile.fedora-asan.hdr |  2 +-
 scripts/ci/Makefile                      |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/fedora-asan-test.yml
 create mode 100644 .github/workflows/stream-test.yml

diff --git a/.github/workflows/fedora-asan-test.yml b/.github/workflows/fedora-asan-test.yml
new file mode 100644
index 000000000..44b0f16d6
--- /dev/null
+++ b/.github/workflows/fedora-asan-test.yml
@@ -0,0 +1,12 @@
+name: Fedora ASAN Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Fedora ASAN Test
+      run: sudo -E make -C scripts/ci fedora-asan
diff --git a/.github/workflows/stream-test.yml b/.github/workflows/stream-test.yml
new file mode 100644
index 000000000..ecdd81e0a
--- /dev/null
+++ b/.github/workflows/stream-test.yml
@@ -0,0 +1,12 @@
+name: CRIU Image Streamer Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run CRIU Image Streamer Test
+      run: sudo -E make -C scripts/ci local STREAM_TEST=1
diff --git a/.travis.yml b/.travis.yml
index f51bd0807..a3b604988 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,11 +43,6 @@ jobs:
       # On xenial it should be possible to test overlayfs;
       # broken on the latest bionic kernel
       dist: xenial
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=fedora-asan
-      dist: bionic
-    - env: TR_ARCH=local STREAM_TEST=1
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
diff --git a/scripts/build/Dockerfile.fedora-asan.hdr b/scripts/build/Dockerfile.fedora-asan.hdr
index 3ec09c1c0..7a20edd24 100644
--- a/scripts/build/Dockerfile.fedora-asan.hdr
+++ b/scripts/build/Dockerfile.fedora-asan.hdr
@@ -1,2 +1,2 @@
-FROM fedora:29
+FROM registry.fedoraproject.org/fedora:latest
 ENV ASAN=1
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index ffa78446a..79637db0b 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -60,7 +60,7 @@ $(TARGETS): restart-docker
 
 fedora-asan: restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run -it $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS)
+	docker run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS)
 
 docker-test:
 	./docker-test.sh

From fad9f805cf1742bf55a5dcb035faef1def62250d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 1 Feb 2021 11:17:39 +0000
Subject: [PATCH 0495/1854] README.md: remove trailing whitespaces

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d703638ec..ae721e2df 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,11 @@
 
 CRIU (stands for Checkpoint and Restore in Userspace) is a utility to checkpoint/restore Linux tasks.
 
-Using this tool, you can freeze a running application (or part of it) and checkpoint 
+Using this tool, you can freeze a running application (or part of it) and checkpoint
 it to a hard drive as a collection of files. You can then use the files to restore and run the
 application from the point it was frozen at. The distinctive feature of the CRIU
 project is that it is mainly implemented in user space. There are some more projects
-doing C/R for Linux, and so far CRIU [appears to be](https://criu.org/Comparison_to_other_CR_projects) 
+doing C/R for Linux, and so far CRIU [appears to be](https://criu.org/Comparison_to_other_CR_projects)
 the most feature-rich and up-to-date with the kernel.
 
 CRIU project is (almost) the never-ending story, because we have to always keep up with the
@@ -20,8 +20,8 @@ looking for contributors of all kinds -- feedback, bug reports, testing, coding,
 Please refer to [CONTRIBUTING.md](CONTRIBUTING.md) if you would like to get involved.
 
 The project [started](https://criu.org/History) as the way to do live migration for OpenVZ
-Linux containers, but later grew to more sophisticated and flexible tool. It is currently 
-used by (integrated into) OpenVZ, LXC/LXD, Docker, and other software, project gets tremendous 
+Linux containers, but later grew to more sophisticated and flexible tool. It is currently
+used by (integrated into) OpenVZ, LXC/LXD, Docker, and other software, project gets tremendous
 help from the community, and its packages are included into many Linux distributions.
 
 The project home is at http://criu.org. This wiki contains all the knowledge base for CRIU we have.
@@ -31,13 +31,13 @@ Pages worth starting with are:
 - [Examples of more advanced usage](https://criu.org/Category:HOWTO)
 - Troubleshooting can be hard, some help can be found [here](https://criu.org/When_C/R_fails), [here](https://criu.org/What_cannot_be_checkpointed) and [here](https://criu.org/FAQ)
 
-### Checkpoint and restore of simple loop process 
+### Checkpoint and restore of simple loop process
 [<p align="center"><img src="https://asciinema.org/a/232445.png" width="572px" height="412px"/></p>](https://asciinema.org/a/232445)
 
 ## Advanced features
 
 As main usage for CRIU is live migration, there's a library for it called P.Haul. Also the
-project exposes two cool core features as standalone libraries. These are libcompel for parasite code 
+project exposes two cool core features as standalone libraries. These are libcompel for parasite code
 injection and libsoccr for TCP connections checkpoint-restore.
 
 ### Live migration

From 246c37ad3af57e3344af2859207c4e98ed557fdd Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 1 Feb 2021 11:37:36 +0000
Subject: [PATCH 0496/1854] README.md: remove unused badges; add a few new
 badges

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ae721e2df..ee8987f3c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-[![master](https://travis-ci.org/checkpoint-restore/criu.svg?branch=master)](https://travis-ci.org/checkpoint-restore/criu)
-[![development](https://travis-ci.org/checkpoint-restore/criu.svg?branch=criu-dev)](https://travis-ci.org/checkpoint-restore/criu)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/55251ec7db28421da4481fc7c1cb0cee)](https://www.codacy.com/app/xemul/criu?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=xemul/criu&amp;utm_campaign=Badge_Grade)
+![X86_64 GCC Test](https://github.com/checkpoint-restore/criu/workflows/X86_64%20GCC%20Test/badge.svg)
+![Podman Test](https://github.com/checkpoint-restore/criu/workflows/Podman%20Test/badge.svg)
+[![CircleCI](https://circleci.com/gh/checkpoint-restore/criu.svg?style=svg)](https://circleci.com/gh/checkpoint-restore/criu)
+
 <p align="center"><img src="https://criu.org/w/images/1/1c/CRIU.svg" width="256px"/></p>
 
 ## CRIU -- A project to implement checkpoint/restore functionality for Linux

From 37c09f89042f6ecb6b90159bd2470b185990708f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 1 Feb 2021 11:06:07 +0000
Subject: [PATCH 0497/1854] ci: move compat tests to Github Actions

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/compat-test.yml | 16 ++++++++++++++++
 .travis.yml                       |  4 ----
 scripts/ci/run-ci-tests.sh        |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/compat-test.yml

diff --git a/.github/workflows/compat-test.yml b/.github/workflows/compat-test.yml
new file mode 100644
index 000000000..5ae25fb73
--- /dev/null
+++ b/.github/workflows/compat-test.yml
@@ -0,0 +1,16 @@
+name: Compat Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        target: [GCC, CLANG]
+
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Compat Tests (${{ matrix.target }})
+      run: sudo -E make -C scripts/ci local COMPAT_TEST=y ${{ matrix.target }}=1
diff --git a/.travis.yml b/.travis.yml
index a3b604988..c908b341a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ dist: bionic
 cache: ccache
 services:
   - docker
-env:
-  - TR_ARCH=local       COMPAT_TEST=y
-  - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
 jobs:
   include:
     - os: linux
@@ -46,7 +43,6 @@ jobs:
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
-    - env: TR_ARCH=fedora-rawhide
     - env: TR_ARCH=local       GCOV=1
 script:
   - sudo make CCACHE=1 -C scripts/ci $TR_ARCH
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7693e5a86..197020eb2 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -188,6 +188,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	done
 	# shellcheck disable=SC2086
 	apt-get remove $INCOMPATIBLE_LIBS
+	dpkg --add-architecture i386
 	scripts/ci/apt-install "$IA32_PKGS"
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/

From 7b5e7166ec0f6bd313710ffc4ac5318011de4ef5 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 1 Feb 2021 03:43:57 +0300
Subject: [PATCH 0498/1854] dump: dump has to fail if there is locks and
 --file-locks isn't set

If criu finds a file lock and the --file-locks option isn't set, it
stops dumping processes, resumes them and exits with an error.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/file-lock.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/file-lock.c b/criu/file-lock.c
index 8be7589df..3b3c4759b 100644
--- a/criu/file-lock.c
+++ b/criu/file-lock.c
@@ -108,6 +108,12 @@ int dump_file_locks(void)
 			continue;
 		}
 
+		if (!opts.handle_file_locks) {
+			pr_err("Some file locks are hold by dumping tasks!"
+					"You can try --" OPT_FILE_LOCKS " to dump them.\n");
+			return -1;
+		}
+
 		file_lock_entry__init(&fle);
 		fle.pid = fl->real_owner;
 		fle.fd = fl->owners_fd;

From 6be56e92c8d95e01e0c6b2b49b1693b0e9ca6565 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 1 Feb 2021 03:41:18 +0300
Subject: [PATCH 0499/1854] test/zdtm: check that locks are not dumped if
 --file-locks isn't set

If criu finds a file lock and the --file-locks option isn't set, it
stops dumping processes, resumes them and exits with an error.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile               | 1 +
 test/zdtm/static/file_locks00_fail.c    | 1 +
 test/zdtm/static/file_locks00_fail.desc | 1 +
 3 files changed, 3 insertions(+)
 create mode 120000 test/zdtm/static/file_locks00_fail.c
 create mode 100644 test/zdtm/static/file_locks00_fail.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index aae49832a..0e14e9d08 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -302,6 +302,7 @@ TST_FILE	=				\
 		file_lease03			\
 		file_lease04			\
 		file_locks00			\
+		file_locks00_fail		\
 		file_locks01			\
 		file_locks02			\
 		file_locks03			\
diff --git a/test/zdtm/static/file_locks00_fail.c b/test/zdtm/static/file_locks00_fail.c
new file mode 120000
index 000000000..d52374825
--- /dev/null
+++ b/test/zdtm/static/file_locks00_fail.c
@@ -0,0 +1 @@
+file_locks00.c
\ No newline at end of file
diff --git a/test/zdtm/static/file_locks00_fail.desc b/test/zdtm/static/file_locks00_fail.desc
new file mode 100644
index 000000000..6626fefa8
--- /dev/null
+++ b/test/zdtm/static/file_locks00_fail.desc
@@ -0,0 +1 @@
+{'flags': 'excl crfail'}

From 3a4bffc14348330d7a37898bd036631ca06914a6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 1 Feb 2021 11:08:24 +0000
Subject: [PATCH 0500/1854] ci: move coverage run to github

This also connects the coverage run to codecov.io.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/gcov-test.yml | 14 ++++++++++++++
 .travis.yml                     |  1 -
 Makefile                        |  5 +++++
 scripts/ci/run-ci-tests.sh      | 11 +++++------
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/gcov-test.yml

diff --git a/.github/workflows/gcov-test.yml b/.github/workflows/gcov-test.yml
new file mode 100644
index 000000000..f1b38e77e
--- /dev/null
+++ b/.github/workflows/gcov-test.yml
@@ -0,0 +1,14 @@
+name: Coverage Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Coverage Tests
+      run: sudo -E make -C scripts/ci local GCOV=1
+    - name: Run Coverage Analysis
+      run: sudo -E make codecov
diff --git a/.travis.yml b/.travis.yml
index c908b341a..b9b5c643a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,6 @@ jobs:
   allow_failures:
     - env: TR_ARCH=docker-test
     - env: TR_ARCH=docker-test DIST=xenial
-    - env: TR_ARCH=local       GCOV=1
 script:
   - sudo make CCACHE=1 -C scripts/ci $TR_ARCH
 after_success:
diff --git a/Makefile b/Makefile
index d765df78c..a5c4aa41d 100644
--- a/Makefile
+++ b/Makefile
@@ -403,6 +403,11 @@ lint:
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 
+codecov: SHELL := $(shell which bash)
+codecov:
+	bash <(curl -s https://codecov.io/bash)
+.PHONY: codecov
+
 include Makefile.install
 
 .DEFAULT_GOAL := all
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 197020eb2..57cab6ab1 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -64,12 +64,6 @@ ci_prep () {
 	fi
 	CI_PKGS="$CI_PKGS $CC"
 
-	[ -n "$GCOV" ] && {
-		apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
-		scripts/ci/apt-install --no-install-suggests g++-7
-		CC=gcc-7
-	}
-
 	# ccache support, only enable for non-GCOV case
 	if [ "$CCACHE" = "1" ] && [ -z "$GCOV" ]; then
 		# ccache is installed by default, need to set it up
@@ -291,5 +285,10 @@ make -C test/others/libcriu run
 # external namespace testing
 make -C test/others/ns_ext run
 
+# Skip all further tests when running with GCOV=1
+# The one test which currently cannot handle GCOV testing is compel/test
+# Probably because the GCOV Makefile infrastructure does not exist in compel
+[ -n "$GCOV" ] && exit 0
+
 # compel testing
 make -C compel/test

From 129cc7fbc4ab7860cee81f9ad2b6dda278348c25 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 25 Jan 2021 10:21:14 +0300
Subject: [PATCH 0501/1854] files: Don't forget on stripping deleted postfix on
 linked files

Otherwise we gonna accumulated "(deleted)" postfix generated by
kernel on every c/r iteration eventually overflowing PATH_MAX
which will make container undumpable.

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
---
 criu/files-reg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index aed1e73dc..b9d67146c 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1301,9 +1301,11 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 * name.
 		 */
 
-		if (errno == ENOENT)
+		if (errno == ENOENT) {
+			strip_deleted(link);
 			return dump_linked_remap(rpath + 1, plen - 1,
 							ost, lfd, id, nsid);
+		}
 
 		pr_perror("Can't stat path");
 		return -1;

From 49889baa20d7d2b8d9f3efda4149ed5e2d3f479b Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 11 Jan 2021 17:57:05 +0300
Subject: [PATCH 0502/1854] files-reg: rework strip_deleted

Moved strip_deleted to util and reworked it so other parts of criu can use
it without the need of files-reg.h

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Reviewed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/files-reg.c         | 42 ++++------------------------------------
 criu/include/files-reg.h |  6 +++++-
 criu/include/util.h      |  2 ++
 criu/memfd.c             |  2 +-
 criu/proc_parse.c        | 26 ++++++++++++-------------
 criu/util.c              | 33 +++++++++++++++++++++++++++++++
 6 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index b9d67146c..f4f41193b 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1150,40 +1150,6 @@ static inline bool nfs_silly_rename(char *rpath, const struct fd_parms *parms)
 	return (parms->fs_type == NFS_SUPER_MAGIC) && is_sillyrename_name(rpath);
 }
 
-int strip_deleted(struct fd_link *link)
-{
-	struct dcache_prepends {
-		const char	*str;
-		size_t		len;
-	} static const prepends[] = {
-		{
-			.str	= " (deleted)",
-			.len	= 10,
-		}, {
-			.str	= "//deleted",
-			.len	= 9,
-		}
-	};
-	size_t i;
-
-	for (i = 0; i < ARRAY_SIZE(prepends); i++) {
-		size_t at;
-
-		if (link->len <= prepends[i].len)
-			continue;
-
-		at = link->len - prepends[i].len;
-		if (!strcmp(&link->name[at], prepends[i].str)) {
-			pr_debug("Strip '%s' tag from '%s'\n",
-				 prepends[i].str, link->name);
-			link->name[at] = '\0';
-			link->len -= prepends[i].len;
-			return 1;
-		}
-	}
-	return 0;
-}
-
 static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 				int lfd, u32 id, struct ns_id *nsid)
 {
@@ -1219,7 +1185,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 * cases.
 		 */
 		if (pid != 0) {
-			bool is_dead = strip_deleted(link);
+			bool is_dead = link_strip_deleted(link);
 			mntns_root = mntns_get_root_fd(nsid);
 			if (mntns_root < 0)
 				return -1;
@@ -1252,7 +1218,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 * this FS and can't have a valid " (deleted)"
 		 * postfix as a part of not deleted filename.
 		 */
-		strip_deleted(link);
+		link_strip_deleted(link);
 		/*
 		 * Devpts devices/files are generated by the
 		 * kernel itself so we should not try to generate
@@ -1269,7 +1235,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 * be careful whether anybody still has any of its hardlinks
 		 * also open.
 		 */
-		strip_deleted(link);
+		link_strip_deleted(link);
 		return dump_ghost_remap(rpath + 1, ost, lfd, id, nsid);
 	}
 
@@ -1302,7 +1268,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 */
 
 		if (errno == ENOENT) {
-			strip_deleted(link);
+			link_strip_deleted(link);
 			return dump_linked_remap(rpath + 1, plen - 1,
 							ost, lfd, id, nsid);
 		}
diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h
index 016d76a9f..0cb67c51a 100644
--- a/criu/include/files-reg.h
+++ b/criu/include/files-reg.h
@@ -2,6 +2,7 @@
 #define __CR_FILES_REG_H__
 
 #include "files.h"
+#include "util.h"
 
 #include "images/regfile.pb-c.h"
 #include "images/ghost-file.pb-c.h"
@@ -51,7 +52,10 @@ extern void free_link_remaps(void);
 extern int prepare_remaps(void);
 extern int try_clean_remaps(bool only_ghosts);
 
-extern int strip_deleted(struct fd_link *link);
+static inline int link_strip_deleted(struct fd_link *link)
+{
+	return strip_deleted(link->name, link->len);
+}
 
 extern int dead_pid_conflict(void);
 
diff --git a/criu/include/util.h b/criu/include/util.h
index 7cb8c262c..311fa85ff 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -252,6 +252,8 @@ static inline bool issubpath(const char *path, const char *sub_path)
 		(end == '/' || end == '\0');
 }
 
+int strip_deleted(char *path, int len);
+
 /*
  * mkdir -p
  */
diff --git a/criu/memfd.c b/criu/memfd.c
index 6c243a509..48245eb75 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -157,7 +157,7 @@ static int dump_one_memfd(int lfd, u32 id, const struct fd_parms *p)
 	} else
 		link = p->link;
 
-	strip_deleted(link);
+	link_strip_deleted(link);
 	/* link->name is always started with "." which has to be skipped.  */
 	if (strncmp(link->name + 1, MEMFD_PREFIX, MEMFD_PREFIX_LEN) == 0)
 		name = &link->name[1 + MEMFD_PREFIX_LEN];
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index ba60832f4..83ad0194e 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -35,7 +35,6 @@
 #include "seccomp.h"
 #include "string.h"
 #include "namespaces.h"
-#include "files-reg.h"
 #include "cgroup.h"
 #include "cgroup-props.h"
 #include "timerfd.h"
@@ -306,16 +305,15 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 	vfi_dev = makedev(vfi->dev_maj, vfi->dev_min);
 
 	if (is_memfd(vfi_dev)) {
-		struct fd_link link;
-		link.len = strlen(fname);
-		strlcpy(link.name, fname, sizeof(link.name));
-		strip_deleted(&link);
+		char tmp[PATH_MAX];
+		strlcpy(tmp, fname, PATH_MAX);
+		strip_deleted(tmp, strlen(tmp));
 
 		/*
 		 * The error EPERM will be shown in the following pr_perror().
 		 * It comes from the previous open() call.
 		 */
-		pr_perror("Can't open mapped [%s]", link.name);
+		pr_perror("Can't open mapped [%s]", tmp);
 
 		/*
 		 * TODO Perhaps we could do better than failing and dump the
@@ -1351,10 +1349,10 @@ replace:
 
 static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 {
-	struct fd_link root_link;
 	unsigned int kmaj, kmin;
-	int ret, n;
+	int ret, n, len;
 	char *sub, *opt = NULL;
+	char link_path[PATH_MAX];
 
 	new->mountpoint = xmalloc(PATH_MAX);
 	if (new->mountpoint == NULL)
@@ -1371,14 +1369,14 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 	cure_path(new->mountpoint);
 	cure_path(new->root);
 
-	root_link.len = strlen(new->root);
-	if (root_link.len >= sizeof(root_link.name) - 1) {
-		pr_err("new root path (%s) exceeds %zu\n", new->root, sizeof(root_link.name));
+	len = strlen(new->root);
+	if (len >= PATH_MAX - 1) {
+		pr_err("new root path (%s) exceeds %d\n", new->root, PATH_MAX);
 		goto err;
 	}
-	strcpy(root_link.name, new->root);
-	if (strip_deleted(&root_link)) {
-		strcpy(new->root, root_link.name);
+	strcpy(link_path, new->root);
+	if (strip_deleted(link_path, len)) {
+		strcpy(new->root, link_path);
 		new->deleted = true;
 	}
 
diff --git a/criu/util.c b/criu/util.c
index 634600cec..1c3070e9a 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1414,3 +1414,36 @@ int mount_detached_fs(const char *fsname)
 	return fd;
 }
 
+int strip_deleted(char *name, int len)
+{
+	struct dcache_prepends {
+		const char	*str;
+		size_t		len;
+	} static const prepends[] = {
+		{
+			.str	= " (deleted)",
+			.len	= 10,
+		}, {
+			.str	= "//deleted",
+			.len	= 9,
+		}
+	};
+	size_t i;
+
+	for (i = 0; i < ARRAY_SIZE(prepends); i++) {
+		size_t at;
+
+		if (len <= prepends[i].len)
+			continue;
+
+		at = len - prepends[i].len;
+		if (!strcmp(&name[at], prepends[i].str)) {
+			pr_debug("Strip '%s' tag from '%s'\n",
+				 prepends[i].str, name);
+			name[at] = '\0';
+			len -= prepends[i].len;
+			return 1;
+		}
+	}
+	return 0;
+}

From d0308e5ecc1ce70b489354b0ddce8045800b3215 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 11 Jan 2021 18:17:40 +0300
Subject: [PATCH 0503/1854] sk-unix: make criu respect existing files while
 restoring ghost unix socket fd

If there are any file in place of ghost unix socket, criu will delete it at
restore while trying to recreate ghost one.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Reviewed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/sk-unix.c | 84 ++++++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 41 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index a5b931b2a..09ae1f542 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1470,56 +1470,49 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	addr.sun_family = AF_UNIX;
 	memcpy(&addr.sun_path, ui->name, ui->ue->name.len);
 
+	ret = access(ui->name, F_OK);
+	if (!ret) {
+		snprintf(path_parked, sizeof(path_parked), UNIX_GHOST_FMT, ui->name);
+		/*
+		 * In case if there exist any file with same name
+		 * just move it aside for a while, we will move it back
+		 * once ghost socket is processed.
+		 */
+		if (unlinkat(AT_FDCWD, path_parked, 0) == 0)
+			pr_debug("ghost: Unlinked stale socket id %#x ino %d name %s\n",
+				 ui->ue->id, ui->ue->ino, path_parked);
+		if (rename(ui->name, path_parked)) {
+			ret = -errno;
+			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
+				  ui->ue->id, ui->ue->ino, ui->name, path_parked);
+			return ret;
+		}
+		pr_debug("ghost: id %#x ino %d renamed %s -> %s\n",
+			 ui->ue->id, ui->ue->ino, ui->name, path_parked);
+		renamed = true;
+	}
+
 	ret = bind(sk, (struct sockaddr *)&addr,
 		   sizeof(addr.sun_family) + ui->ue->name.len);
 	if (ret < 0) {
-		/*
-		 * In case if there some real living socket
-		 * with same name just move it aside for a
-		 * while, we will move it back once ghost
-		 * socket is processed.
-		 */
-		if (errno == EADDRINUSE) {
-			snprintf(path_parked, sizeof(path_parked), UNIX_GHOST_FMT, ui->name);
-			/*
-			 * Say previous restore get killed in a middle due to
-			 * any reason, be ready the file might already exist,
-			 * clean it up.
-			 */
-			if (unlinkat(AT_FDCWD, path_parked, 0) == 0)
-				pr_debug("ghost: Unlinked stale socket id %#x ino %u name %s\n",
-					 ui->ue->id, ui->ue->ino, path_parked);
-			if (rename(ui->name, path_parked)) {
-				ret = -errno;
-				pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
-					  ui->ue->id, ui->ue->ino, ui->name, path_parked);
-				return ret;
-			}
-			pr_debug("ghost: id %#x ino %u renamed %s -> %s\n",
-				 ui->ue->id, ui->ue->ino, ui->name, path_parked);
-			renamed = true;
-			ret = bind(sk, (struct sockaddr *)&addr,
-				   sizeof(addr.sun_family) + ui->ue->name.len);
-		}
-		if (ret < 0) {
-			ret = -errno;
-			pr_perror("ghost: Can't bind on socket id %#x ino %u addr %s",
-				  ui->ue->id, ui->ue->ino, ui->name);
-			return ret;
-		}
+		ret = -errno;
+		pr_perror("ghost: Can't bind on socket id %#x ino %d addr %s",
+			  ui->ue->id, ui->ue->ino, ui->name);
+		goto out_rename;
 	}
 
 	ret = restore_file_perms(ui);
 	if (ret < 0)
-		return ret;
+		goto out;
 
 	ret = keep_deleted(ui);
 	if (ret < 0) {
 		pr_err("ghost: Can't save socket %#x ino %u addr %s into fdstore\n",
 		       ui->ue->id, ui->ue->ino, ui->name);
-		return -EIO;
+		ret = -EIO;
 	}
 
+out:
 	/*
 	 * Once everything is ready, just remove the socket from the
 	 * filesystem and rename back the original one if it were here.
@@ -1529,19 +1522,18 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 		ret = -errno;
 		pr_perror("ghost: Can't unlink socket %#x ino %u addr %s",
 			  ui->ue->id, ui->ue->ino, ui->name);
-		return ret;
 	}
 
+out_rename:
 	if (renamed) {
 		if (rename(path_parked, ui->name)) {
 			ret = -errno;
 			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
 				  ui->ue->id, ui->ue->ino, path_parked, ui->name);
-			return ret;
+		} else {
+			pr_debug("ghost: id %#x ino %d renamed %s -> %s\n",
+				 ui->ue->id, ui->ue->ino, path_parked,  ui->name);
 		}
-
-		pr_debug("ghost: id %#x ino %u renamed %s -> %s\n",
-			 ui->ue->id, ui->ue->ino, path_parked,  ui->name);
 	}
 
 	/*
@@ -1988,6 +1980,7 @@ static struct file_desc_ops unix_desc_ops = {
 static int unlink_sk(struct unix_sk_info *ui)
 {
 	int ret = 0, cwd_fd = -1, root_fd = -1, ns_fd = -1;
+	struct stat statbuf;
 
 	if (!ui->name || ui->name[0] == '\0' || (ui->ue->uflags & USK_EXTERN))
 		return 0;
@@ -1995,6 +1988,15 @@ static int unlink_sk(struct unix_sk_info *ui)
 	if (prep_unix_sk_cwd(ui, &cwd_fd, &root_fd, NULL))
 		return -1;
 
+	ret = stat(ui->name, &statbuf);
+	if (!ret) {
+		/* Do not cleanup non-socket files */
+		if (!S_ISSOCK(statbuf.st_mode)) {
+			ret = 0;
+			goto out;
+		}
+	}
+
 	ret = unlinkat(AT_FDCWD, ui->name, 0) ? -1 : 0;
 	if (ret < 0 && errno != ENOENT) {
 		pr_warn("Can't unlink socket %u peer %u (name %s dir %s)\n",

From 7c5c813661f46a5486174f34a62966e61c99d883 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 9 Nov 2020 08:07:28 +0300
Subject: [PATCH 0504/1854] sk-unix: rework unix_resolve_name

Use SIOCUNIXFILE ioctl approach to get socket fd opened with O_PATH. Utilise it
for detecting deletion and resolving relative name. Preserve old method as
fallback if this new IOCTL fails.

Also remove overmount_sock crfail in zdtm. With the unix_resolve_name
reworked to use SIOCUNIXFILE criu can now pass this test.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Reviewed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/include/util.h                  |  1 +
 criu/sk-unix.c                       | 80 +++++++++++++++++++++++++++-
 criu/util.c                          | 40 ++++++++++++++
 test/zdtm/static/overmount_sock.desc |  2 +-
 4 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/criu/include/util.h b/criu/include/util.h
index 311fa85ff..f000e97a7 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -253,6 +253,7 @@ static inline bool issubpath(const char *path, const char *sub_path)
 }
 
 int strip_deleted(char *path, int len);
+int cut_path_ending(char *path, char *sub_path);
 
 /*
  * mkdir -p
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 09ae1f542..25d25e2d4 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -559,7 +559,7 @@ const struct fdtype_ops unix_dump_ops = {
 	.dump		= dump_one_unix_fd,
 };
 
-static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d,
+static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d,
 				UnixSkEntry *ue, const struct fd_parms *p)
 {
 	char *name = d->name;
@@ -644,6 +644,84 @@ skip:
 	goto out;
 }
 
+static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d,
+				UnixSkEntry *ue, const struct fd_parms *p)
+{
+	char *name = d->name;
+	char path[PATH_MAX], tmp[PATH_MAX];
+	struct stat st;
+	int fd, proc_fd, mnt_id, ret;
+
+	if (d->namelen == 0 || name[0] == '\0')
+		return 0;
+
+	if (kdat.sk_unix_file && (root_ns_mask & CLONE_NEWNS)) {
+		if (get_mnt_id(lfd, &mnt_id))
+			return -1;
+		ue->mnt_id = mnt_id;
+		ue->has_mnt_id = true;
+	}
+
+	fd = ioctl(lfd, SIOCUNIXFILE);
+	if (fd < 0) {
+		pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl.");
+		goto fallback;
+	}
+
+	ret = fstat(fd, &st);
+	if (ret) {
+		pr_perror("Unable to fstat socket fd");
+		return -1;
+	}
+	d->mode = st.st_mode;
+	d->uid	= st.st_uid;
+	d->gid	= st.st_gid;
+
+	proc_fd = get_service_fd(PROC_FD_OFF);
+	if (proc_fd < 0) {
+		pr_err("Unable to get service fd for proc\n");
+		return -1;
+	}
+
+	snprintf(tmp, sizeof(tmp), "self/fd/%d", fd);
+	ret = readlinkat(proc_fd, tmp, path, PATH_MAX);
+	if (ret < 0 && ret >= PATH_MAX) {
+		pr_perror("Unable to readlink %s", tmp);
+		goto out;
+	}
+	path[ret] = 0;
+
+	d->deleted = strip_deleted(path, ret);
+
+	if (name[0] != '/') {
+		ret = cut_path_ending(path, name);
+		if (ret) {
+			pr_err("Unable too resolve %s from %s\n", name, path);
+			goto out;
+		}
+
+		ue->name_dir = xstrdup(path);
+		if (!ue->name_dir) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
+		pr_debug("Resolved socket relative name %s to %s/%s\n", name, ue->name_dir, name);
+	}
+
+	ret = 0;
+out:
+	close(fd);
+	return ret;
+
+fallback:
+	pr_warn("Trying to resolve unix socket with obsolete method");
+	ret = unix_resolve_name_old(lfd, id, d, ue, p);
+	if (ret < 0)
+		pr_err("Unable to resolve unix socket name with obsolete method. Try a linux kernel newer than 4.10\n");
+	return ret;
+}
+
 /*
  * Returns: < 0 on error, 0 if OK, 1 to skip the socket
  */
diff --git a/criu/util.c b/criu/util.c
index 1c3070e9a..76624dc5a 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1447,3 +1447,43 @@ int strip_deleted(char *name, int len)
 	}
 	return 0;
 }
+
+/*
+ * This function check if path ends with ending and cuts it from path.
+ * Return 0 if path is cut. -1 otherwise, leaving path unchanged.
+ * Example:
+ *	path = "/foo/bar", ending = "bar"
+ *	cut(path, ending)  -> path becomes "/foo"
+ *
+ * 1. Skip leading "./" in subpath.
+ * 2. Respect root: ("/a/b", "b") -> "/a" but ("/a", "a") -> "/"
+ * 3. Refuse to cut identical strings, e.g. ("abc", "abc") will result in -1
+ * 4. Do not handle "..", "//", "./" (with exception "./" as leading symbols)
+ */
+
+int cut_path_ending(char *path, char *ending)
+{
+	int ending_pos;
+
+	if (ending[0] == '.' && ending[1] == '/')
+		ending = ending + 2;
+
+	ending_pos = strlen(path) - strlen(ending);
+
+	if (ending_pos < 1)
+		return -1;
+
+	if (strcmp(path + ending_pos, ending))
+		return -1;
+
+	if (path[ending_pos - 1] != '/')
+		return -1;
+
+	if (ending_pos == 1) {
+		path[ending_pos] = 0;
+		return 0;
+	}
+
+	path[ending_pos - 1] = 0;
+	return 0;
+}
\ No newline at end of file
diff --git a/test/zdtm/static/overmount_sock.desc b/test/zdtm/static/overmount_sock.desc
index 1ba68c314..cc9d23ab9 100644
--- a/test/zdtm/static/overmount_sock.desc
+++ b/test/zdtm/static/overmount_sock.desc
@@ -1 +1 @@
-{'flavor' : 'ns uns', 'flags': 'suid crfail'}
+{'flavor' : 'ns uns', 'flags': 'suid'}

From 1f2e10771a13c96a4b458251ad165ebedb78fa1f Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Fri, 18 Sep 2020 00:35:48 +0300
Subject: [PATCH 0505/1854] zdtm: add fifo upon unix socket test case

Create unix socket and unlink it. Make fifo in this place.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Reviewed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 test/zdtm/static/Makefile                   |   1 +
 test/zdtm/static/fifo_upon_unix_socket.c    | 150 ++++++++++++++++++++
 test/zdtm/static/fifo_upon_unix_socket.desc |   1 +
 3 files changed, 152 insertions(+)
 create mode 100644 test/zdtm/static/fifo_upon_unix_socket.c
 create mode 100644 test/zdtm/static/fifo_upon_unix_socket.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 0e14e9d08..78ba8f017 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -315,6 +315,7 @@ TST_FILE	=				\
 		netns-nft				\
 		maps_file_prot			\
 		socket_close_data01		\
+		fifo_upon_unix_socket		\
 
 TST_DIR		=				\
 		cwd00				\
diff --git a/test/zdtm/static/fifo_upon_unix_socket.c b/test/zdtm/static/fifo_upon_unix_socket.c
new file mode 100644
index 000000000..d7cf878e2
--- /dev/null
+++ b/test/zdtm/static/fifo_upon_unix_socket.c
@@ -0,0 +1,150 @@
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that fifo upon ghost socket configuration is restored";
+const char *test_author	= "Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "socket name", 1);
+
+static int fill_sock_name(struct sockaddr_un *name, const char *filename)
+{
+	char *cwd;
+
+	cwd = get_current_dir_name();
+	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path)) {
+		pr_err("Name %s/%s is too long for socket\n",
+			   cwd, filename);
+		return -1;
+	}
+
+	name->sun_family = AF_LOCAL;
+	ssprintf(name->sun_path, "%s/%s", cwd, filename);
+	return 0;
+}
+
+static int sk_alloc_bind(int type, struct sockaddr_un *addr)
+{
+	int sk;
+
+	sk = socket(PF_UNIX, type, 0);
+	if (sk < 0) {
+		pr_perror("socket");
+		return -1;
+	}
+
+	if (addr && bind(sk, (const struct sockaddr *)addr, sizeof(*addr))) {
+		pr_perror("bind %s", addr->sun_path);
+		close(sk);
+		return -1;
+	}
+
+	return sk;
+}
+
+static int sk_alloc_connect(int type, struct sockaddr_un *addr)
+{
+	int sk;
+
+	sk = socket(PF_UNIX, type, 0);
+	if (sk < 0) {
+		pr_perror("socket");
+		return -1;
+	}
+
+	if (connect(sk, (const struct sockaddr *)addr, sizeof(*addr))) {
+		pr_perror("connect %s", addr->sun_path);
+		close(sk);
+		return -1;
+	}
+
+	return sk;
+}
+
+static int check_fd(int fdin, int fdout)
+{
+	int ret;
+	char c = 0;
+
+	ret = write(fdin, &c, 1);
+	if (ret != 1)
+		goto err;
+
+	ret = read(fdout, &c, 1);
+	if (ret != 1)
+		goto err;
+
+	return 0;
+
+err:
+	pr_perror("broken fd pair %d %d", fdin, fdout);
+	return -1;
+}
+
+int main(int argc, char **argv)
+{
+	int sk1, sk2, fd1, err;
+	struct sockaddr_un addr;
+
+	test_init(argc, argv);
+
+	unlink(filename);
+
+	if (fill_sock_name(&addr, filename))
+		return 1;
+
+	sk1 = sk_alloc_bind(SOCK_DGRAM, &addr);
+	if (sk1 < 0) {
+		pr_perror("Can't create sk");
+		return 1;
+	}
+
+	sk2 = sk_alloc_connect(SOCK_DGRAM, &addr);
+	if (sk2 < 0) {
+		pr_perror("Can't connect to sk");
+		return 1;
+	}
+
+	if (unlink(filename) < 0) {
+		fail("can't unlink %s", filename);
+		return 1;
+	}
+
+	if (mkfifo(filename, 0666)) {
+		pr_perror("can't make fifo \"%s\"", filename);
+		return 1;
+	}
+
+	fd1 = open(filename, O_RDWR);
+	if (fd1 < 0) {
+		pr_perror("can't open %s", filename);
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	unlink(filename);
+
+	err = check_fd(sk2, sk1) || check_fd(fd1, fd1);
+	if (err)
+		fail();
+	else
+		pass();
+
+	close(sk1);
+	close(sk2);
+	close(fd1);
+
+	return 0;
+}
diff --git a/test/zdtm/static/fifo_upon_unix_socket.desc b/test/zdtm/static/fifo_upon_unix_socket.desc
new file mode 100644
index 000000000..2eac7e654
--- /dev/null
+++ b/test/zdtm/static/fifo_upon_unix_socket.desc
@@ -0,0 +1 @@
+{'flags': 'suid'}

From 2dc65a6360cb70cbc362ee459945969ed523ad37 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 9 Nov 2020 08:22:45 +0300
Subject: [PATCH 0506/1854] zdtm: add second fifo_upon_unix test

This differs from the previous one by
1. using relative path instead of absolute
2. chdir() after setup

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Reviewed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 test/zdtm/static/Makefile                      |  5 ++++-
 ...unix_socket.c => fifo_upon_unix_socket00.c} | 18 ++++++++++++++++++
 ...ocket.desc => fifo_upon_unix_socket00.desc} |  0
 test/zdtm/static/fifo_upon_unix_socket01.c     |  1 +
 test/zdtm/static/fifo_upon_unix_socket01.desc  |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)
 rename test/zdtm/static/{fifo_upon_unix_socket.c => fifo_upon_unix_socket00.c} (87%)
 rename test/zdtm/static/{fifo_upon_unix_socket.desc => fifo_upon_unix_socket00.desc} (100%)
 create mode 120000 test/zdtm/static/fifo_upon_unix_socket01.c
 create mode 120000 test/zdtm/static/fifo_upon_unix_socket01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 78ba8f017..d0974bb0d 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -315,7 +315,8 @@ TST_FILE	=				\
 		netns-nft				\
 		maps_file_prot			\
 		socket_close_data01		\
-		fifo_upon_unix_socket		\
+		fifo_upon_unix_socket00		\
+		fifo_upon_unix_socket01		\
 
 TST_DIR		=				\
 		cwd00				\
@@ -593,6 +594,8 @@ thread_different_uid_gid:	LDLIBS += -pthread -lcap
 bpf_hash:		LDLIBS += -lbpf
 bpf_array:		LDLIBS += -lbpf
 
+fifo_upon_unix_socket01:	CFLAGS += -DFIFO_UPON_UNIX01
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/fifo_upon_unix_socket.c b/test/zdtm/static/fifo_upon_unix_socket00.c
similarity index 87%
rename from test/zdtm/static/fifo_upon_unix_socket.c
rename to test/zdtm/static/fifo_upon_unix_socket00.c
index d7cf878e2..f75965fdd 100644
--- a/test/zdtm/static/fifo_upon_unix_socket.c
+++ b/test/zdtm/static/fifo_upon_unix_socket00.c
@@ -17,6 +17,7 @@ const char *test_author	= "Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>";
 char *filename;
 TEST_OPTION(filename, string, "socket name", 1);
 
+#ifndef FIFO_UPON_UNIX01
 static int fill_sock_name(struct sockaddr_un *name, const char *filename)
 {
 	char *cwd;
@@ -32,6 +33,19 @@ static int fill_sock_name(struct sockaddr_un *name, const char *filename)
 	ssprintf(name->sun_path, "%s/%s", cwd, filename);
 	return 0;
 }
+#else
+static int fill_sock_name(struct sockaddr_un *name, const char *filename)
+{
+	if (strlen(filename) + 1 >= sizeof(name->sun_path)) {
+		pr_err("Name %s is too long for socket\n", filename);
+		return -1;
+	}
+
+	name->sun_family = AF_LOCAL;
+	ssprintf(name->sun_path, "%s", filename);
+	return 0;
+}
+#endif
 
 static int sk_alloc_bind(int type, struct sockaddr_un *addr)
 {
@@ -131,6 +145,10 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+#ifdef FIFO_UPON_UNIX01
+	chdir("/");
+#endif
+
 	test_daemon();
 	test_waitsig();
 
diff --git a/test/zdtm/static/fifo_upon_unix_socket.desc b/test/zdtm/static/fifo_upon_unix_socket00.desc
similarity index 100%
rename from test/zdtm/static/fifo_upon_unix_socket.desc
rename to test/zdtm/static/fifo_upon_unix_socket00.desc
diff --git a/test/zdtm/static/fifo_upon_unix_socket01.c b/test/zdtm/static/fifo_upon_unix_socket01.c
new file mode 120000
index 000000000..235241eb3
--- /dev/null
+++ b/test/zdtm/static/fifo_upon_unix_socket01.c
@@ -0,0 +1 @@
+fifo_upon_unix_socket00.c
\ No newline at end of file
diff --git a/test/zdtm/static/fifo_upon_unix_socket01.desc b/test/zdtm/static/fifo_upon_unix_socket01.desc
new file mode 120000
index 000000000..d29414c1d
--- /dev/null
+++ b/test/zdtm/static/fifo_upon_unix_socket01.desc
@@ -0,0 +1 @@
+fifo_upon_unix_socket00.desc
\ No newline at end of file

From 719e42fe1cb8e04511d96f87fb3c986e60da1e9b Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Tue, 9 Feb 2021 20:26:34 +0000
Subject: [PATCH 0507/1854] seccomp: initialize seccomp_mode in all cases

In parse_pid_status(), it is assumed that the seccomp field can be
missing from /proc/pid/status. When the field is missing, it is not
properly initialized, leading to bad behavior.

We initialize seccomp_mode to SECCOMP_MODE_DISABLED by default,
similarly to what is done in compel/src/lib/infect.c:parse_pid_status.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/proc_parse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 83ad0194e..7b0b32e2e 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1056,6 +1056,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 
 	cr->s.sigpnd = 0;
 	cr->s.shdpnd = 0;
+	cr->s.seccomp_mode = SECCOMP_MODE_DISABLED;
 
 	if (bfdopenr(&f))
 		return -1;

From 950805bf165a3f6f9e41eab80684477b6dc5c119 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 17 Feb 2021 17:03:10 +0000
Subject: [PATCH 0508/1854] ci: use runc instead of crun for podman tests

The latest podman pulls in crun instead of runc. Unfortunately crun is
not built against libcriu and does not support checkpoint/restore.

Switch back to runc.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/podman-test.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index a13e1dbdc..5d8a6f840 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -23,7 +23,10 @@ apt-get -y purge docker-ce || :
     curl \
     software-properties-common
 
-./apt-install podman containernetworking-plugins
+# explicitly install runc. crun is not compiled with criu support
+./apt-install cri-o-runc podman containernetworking-plugins
+
+echo -e '[engine]\nruntime="runc"' > /etc/containers/containers.conf
 
 export SKIP_CI_TEST=1
 

From 56d7dbd7cd7700b77ca1eb50a4cf3acc1b5b8090 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 19 Feb 2021 04:14:53 +0000
Subject: [PATCH 0509/1854] file-lock: Add space in error message

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/file-lock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/file-lock.c b/criu/file-lock.c
index 3b3c4759b..050954cde 100644
--- a/criu/file-lock.c
+++ b/criu/file-lock.c
@@ -109,7 +109,7 @@ int dump_file_locks(void)
 		}
 
 		if (!opts.handle_file_locks) {
-			pr_err("Some file locks are hold by dumping tasks!"
+			pr_err("Some file locks are hold by dumping tasks! "
 					"You can try --" OPT_FILE_LOCKS " to dump them.\n");
 			return -1;
 		}
@@ -201,7 +201,7 @@ static int lock_check_fd(int lfd, struct file_lock *fl)
 	} else {
 		/*
 		 * The ret == 0 means, that new lock doesn't conflict
-		 * with any others on the file. But since we do know, 
+		 * with any others on the file. But since we do know,
 		 * that there should be some other one (file is found
 		 * in /proc/locks), it means that the lock is already
 		 * on file pointed by fd.

From ae143161b8dc77348dfac9ab81b48b54b42b1f78 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 19 Feb 2021 04:18:36 +0000
Subject: [PATCH 0510/1854] javaTests: Add --file-locks option

Resolves #1370

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/javaTests/src/org/criu/java/tests/CheckpointRestore.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
index 9d61e126f..860619c26 100644
--- a/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
+++ b/test/javaTests/src/org/criu/java/tests/CheckpointRestore.java
@@ -361,7 +361,7 @@ public class CheckpointRestore {
 	private void checkpoint(String pid, String checkpointOpt) throws IOException, InterruptedException {
 		ProcessBuilder builder;
 		System.out.println("Checkpointing process " + pid);
-		String command = "../../criu/criu dump --shell-job -t " + pid + " -vvv -D " + logFolder + " -o dump.log";
+		String command = "../../criu/criu dump --shell-job -t " + pid + " --file-locks -v4 -D " + logFolder + " -o dump.log";
 		if (0 == checkpointOpt.length()) {
 			String[] cmd = command.split(" ");
 			builder = new ProcessBuilder(cmd);
@@ -411,7 +411,7 @@ public class CheckpointRestore {
 	private void restore(String restoreOpt) throws IOException, InterruptedException {
 		ProcessBuilder builder;
 		System.out.println("Restoring process");
-		String command = "../../criu/criu restore -d -vvv --shell-job -D " + logFolder + " -o restore.log";
+		String command = "../../criu/criu restore -d --file-locks -v4 --shell-job -D " + logFolder + " -o restore.log";
 		if (0 == restoreOpt.length()) {
 			String[] cmd = command.split(" ");
 			builder = new ProcessBuilder(cmd);

From 7b3eb03ab2ccc94d322a4b8f0b3256ff601a8b8b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 19 Feb 2021 04:07:07 +0000
Subject: [PATCH 0511/1854] test: Reduce verbosity of mvn output

The -q option will only show errors

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.openj9-alpine | 2 +-
 scripts/build/Dockerfile.openj9-ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
index 39ea4d08e..873284f44 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -26,5 +26,5 @@ WORKDIR /criu
 
 RUN make
 
-ENTRYPOINT mvn -f test/javaTests/pom.xml test
+ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
 
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 0663eb7cc..abcd8cc1a 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -29,5 +29,5 @@ WORKDIR /criu
 
 RUN make
 
-ENTRYPOINT mvn -f test/javaTests/pom.xml test
+ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
 

From 6f8e671351cfc75ec425d636710506d19dec24dd Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 19 Feb 2021 04:20:56 +0000
Subject: [PATCH 0512/1854] zdtm: Add javaTests output to .gitignore

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/.gitignore b/test/.gitignore
index 6a735ba7a..17b4d8635 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -14,3 +14,5 @@
 /zdtm_mount_cgroups.lock
 /compel/handle_binary
 /umount2
+/javaTests/output/
+/javaTests/target/

From 4eb43dc4de6e88c9863dada6c9c34c74f1a024df Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 17 Feb 2021 16:58:50 +0000
Subject: [PATCH 0513/1854] test: fix test compilation on rawhide

The latest glibc has redefined SIGSTKSZ as 'sysconf (_SC_SIGSTKSZ)' and
this breaks a static char[] definition.

Hardcoding TESTSIGSTKSZ to 16384 in the test. This fixes:

 sigaltstack.c:17:13: error: variably modified 'stack_thread' at file scope
   17 | static char stack_thread[SIGSTKSZ + TEST_MSG_BUFFER_SIZE] __stack_aligned__;
      |             ^~~~~~~~~~~~
sigaltstack.c:18:13: error: variably modified 'stack_main' at file scope
   18 | static char stack_main[SIGSTKSZ + TEST_MSG_BUFFER_SIZE] __stack_aligned__;
      |             ^~~~~~~~~~

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/sigaltstack.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/sigaltstack.c b/test/zdtm/static/sigaltstack.c
index f36d409f5..13602d3a1 100644
--- a/test/zdtm/static/sigaltstack.c
+++ b/test/zdtm/static/sigaltstack.c
@@ -14,8 +14,10 @@
 const char *test_doc	= "Check for alternate signal stack";
 const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
 
-static char stack_thread[SIGSTKSZ + TEST_MSG_BUFFER_SIZE] __stack_aligned__;
-static char stack_main[SIGSTKSZ + TEST_MSG_BUFFER_SIZE] __stack_aligned__;
+#define TESTSIGSTKSZ 16384
+
+static char stack_thread[TESTSIGSTKSZ + TEST_MSG_BUFFER_SIZE] __stack_aligned__;
+static char stack_main[TESTSIGSTKSZ + TEST_MSG_BUFFER_SIZE] __stack_aligned__;
 
 enum {
 	SAS_MAIN_OLD,

From 9582a44ce18013fc7a5e1a6e416d997b015e842b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 23 Feb 2021 22:08:27 -0800
Subject: [PATCH 0514/1854] bug: add __builtin_unreachable in BUG_ON_HANDLER

This will surpress false gcc warnings like this:
criu/stats.c:85:10: error: array subscript 4 is above array bounds
of 'struct timing[2]' [-Werror=array-bounds]
   85 |   return &rstats->timings[t];
      |          ^~~~~~~~~~~~~~~~~~~
criu/stats.c:25:16: note: while referencing 'timings'
   25 |  struct timing timings[RESTORE_TIME_NS_STATS];
      |                ^~~~~~~
cc1: all warnings being treated as errors

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 include/common/bug.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/common/bug.h b/include/common/bug.h
index 462291104..bacbf566b 100644
--- a/include/common/bug.h
+++ b/include/common/bug.h
@@ -24,6 +24,7 @@
 			pr_err("BUG at %s:%d\n", __FILE__, __LINE__);			\
 			__raise();							\
 			*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__;	\
+			__builtin_unreachable();					\
 		}									\
 	} while (0)
 #else

From 87822356001ec1d032c1e81cf48ab881cb496bc0 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 23 Feb 2021 22:12:58 -0800
Subject: [PATCH 0515/1854] sk-unix: check whether a socket name is NULL before
 printing it

criu/include/log.h:72:2: error: '%s' directive argument is null [-Werror=format-overflow=]
   72 |  print_on_level(LOG_DEBUG,     \
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   73 |          LOG_PREFIX fmt, ##__VA_ARGS__)
      |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
criu/sk-unix.c:133:2: note: in expansion of macro 'pr_debug'
  133 |  pr_debug("\t%s: ino %u peer_ino %u family %4d type %4d state %2d name %s\n",
      |  ^~~~~~~~
  CC       criu/stats.o

Fixes: #1373
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sk-unix.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 25d25e2d4..e589da8de 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -131,7 +131,8 @@ static struct unix_sk_listen_icon *lookup_unix_listen_icons(unsigned int peer_in
 static void show_one_unix(char *act, const struct unix_sk_desc *sk)
 {
 	pr_debug("\t%s: ino %u peer_ino %u family %4d type %4d state %2d name %s\n",
-		act, sk->sd.ino, sk->peer_ino, sk->sd.family, sk->type, sk->state, sk->name);
+		act, sk->sd.ino, sk->peer_ino, sk->sd.family, sk->type, sk->state,
+		sk->name ? : "null");
 
 	if (sk->nr_icons) {
 		int i;

From 79b3893ecf5d2f3874e68454269c6466e87acefc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 25 Feb 2021 15:44:12 +0300
Subject: [PATCH 0516/1854] plugin: check for plugin path truncation

New compilators print warnings if snprintf return value is not checked
for truncation. Let's make them happy.

Fixes: #1372
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/plugin.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/criu/plugin.c b/criu/plugin.c
index b97d3763a..f35a04fc9 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -243,7 +243,11 @@ int cr_plugin_init(int stage)
 		if (len < 3 || strncmp(de->d_name + len - 3, ".so", 3))
 			continue;
 
-		snprintf(path, sizeof(path), "%s/%s", opts.libdir, de->d_name);
+		if (snprintf(path, sizeof(path), "%s/%s", opts.libdir, de->d_name) >=
+		    sizeof(path)) {
+			pr_err("Unable to build plugin path\n");
+			goto err;
+		}
 
 		if (cr_lib_load(stage, path))
 			goto err;

From ff38944b98294da0988d0176df63c5694f1b6190 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 1 Mar 2021 15:58:22 +0000
Subject: [PATCH 0517/1854] ci: fix Fedora rawhide CI failures

It seems the Fedora rawhide /tmp is no longer 1777 but 755.

Change it back to 1777 to make our CI runs successful again.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/prepare-for-fedora-rawhide.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index 1b2273b3b..3ce991dc4 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -35,3 +35,6 @@ dnf install -y \
 	e2fsprogs \
 	rubygem-asciidoctor \
 	kmod
+
+# /tmp is no longer 755 in the rawhide container image and breaks CI - fix it
+chmod 1777 /tmp

From 10fe08c37f63ce9d08d0e3f19ee750295f0f213a Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 1 Mar 2021 23:12:22 -0800
Subject: [PATCH 0518/1854] github/stale: separate labels with commas without
 following spaces

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index e8aa9b4d0..beb6774e4 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -24,4 +24,4 @@ jobs:
         days-before-close: 365
         remove-stale-when-updated: true
         exempt-pr-labels: 'no-auto-close'
-        exempt-issue-labels: 'no-auto-close, new feature, enhancement'
+        exempt-issue-labels: 'no-auto-close,new feature,enhancement'

From 72dc328502d19ff900761fb2651e844669229af6 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 26 Feb 2021 20:43:41 +0000
Subject: [PATCH 0519/1854] ci/compat: Check if tests are 32-bit ELFs

To be sure that we don't lose COMPAT_TEST=y on the way to make.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 scripts/ci/run-ci-tests.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 57cab6ab1..b568ff43f 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -190,6 +190,11 @@ fi
 
 time make CC="$CC" -j4 -C test/zdtm V=1
 
+if [ "${COMPAT_TEST}x" = "yx" ] ; then
+	# Cross-verify that zdtm tests are 32-bit
+	file test/zdtm/static/env00 | grep 'ELF 32-bit' -q
+fi
+
 [ -f "$CCACHE_LOGFILE" ] && cat "$CCACHE_LOGFILE"
 
 # umask has to be called before a first criu run, so that .gcda (coverage data)

From ffb848e6d9ac7db7e505a2b51903305aca08b7b0 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 12 Nov 2020 03:10:52 +0000
Subject: [PATCH 0520/1854] x86: Use PTRACE_GET_THREAD_AREA instead of
 sys_get_thread_area()

To minimize things done in parasite, PTRACE_GET_THREAD_AREA can be
used to get remote tls. That also removes an additional compat stack
(de)allocation in the parasite (also asm-coded syscall).

In order to use PTRACE_GET_THREAD_AREA, the dumpee should be stopped.
So, let's move this from criu to compel to non-seized state and put tls
into thread info on x86.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/Makefile                               |  4 +
 .../src/lib/include/uapi/asm/infect-types.h   |  5 ++
 .../src/lib/include/uapi/asm/infect-types.h   |  5 ++
 .../src/lib/include/uapi/asm/infect-types.h   |  4 +
 .../src/lib/include/uapi/asm/infect-types.h   |  5 ++
 .../src/lib/include/uapi/asm/infect-types.h   |  5 ++
 .../src/lib/include/uapi/asm/infect-types.h   | 23 +++++
 compel/arch/x86/src/lib/thread_area.c         | 88 +++++++++++++++++++
 compel/include/infect-priv.h                  |  3 +
 compel/src/lib/infect.c                       |  5 ++
 criu/arch/arm/include/asm/parasite.h          |  1 +
 criu/arch/x86/include/asm/parasite.h          | 77 ++--------------
 criu/arch/x86/include/asm/restorer.h          |  1 +
 criu/arch/x86/include/asm/types.h             | 13 ---
 criu/parasite-syscall.c                       | 10 +++
 15 files changed, 164 insertions(+), 85 deletions(-)
 create mode 100644 compel/arch/x86/src/lib/thread_area.c

diff --git a/compel/Makefile b/compel/Makefile
index de9318c42..b79aee687 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -28,6 +28,10 @@ lib-y			+= src/lib/infect-util.o
 lib-y			+= src/lib/infect.o
 lib-y			+= src/lib/ptrace.o
 
+ifeq ($(ARCH),x86)
+lib-y			+= arch/$(ARCH)/src/lib/thread_area.o
+endif
+
 # handle_elf() has no support of ELF relocations on ARM (yet?)
 ifneq ($(filter arm aarch64,$(ARCH)),)
 CFLAGS			+= -DNO_RELOCS
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index 7a33baa8e..b52f7a766 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -18,6 +18,11 @@
 typedef struct user_pt_regs		user_regs_struct_t;
 typedef struct user_fpsimd_state	user_fpregs_struct_t;
 
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
+
 #define REG_RES(r)			((uint64_t)(r).regs[0])
 #define REG_IP(r)			((uint64_t)(r).pc)
 #define REG_SP(r)			((uint64_t)((r).sp))
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
index 69222b251..5e05ef53d 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
@@ -17,6 +17,11 @@ typedef struct {
 	long			uregs[18];
 } user_regs_struct_t;
 
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
+
 typedef struct user_vfp		user_fpregs_struct_t;
 
 #define ARM_cpsr		uregs[16]
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
index 423880821..07f3936a9 100755
--- a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
@@ -54,6 +54,10 @@ static inline bool user_regs_native(user_regs_struct_t *pregs)
 	return true;
 }
 
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
 
 #define REG_RES(regs)		((regs).MIPS_v0) 
 #define REG_IP(regs)		((regs).cp0_epc) 
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
index 126fa2ea3..b65c942ee 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
@@ -83,4 +83,9 @@ typedef struct {
 
 #define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
 
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
+
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
index 8171d3395..807be5a9a 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
@@ -84,4 +84,9 @@ struct mmap_arg_struct {
 	unsigned long offset;
 };
 
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
+
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
index e6d394989..470a1b0fd 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
@@ -9,6 +9,29 @@
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 
+#define ARCH_HAS_PTRACE_GET_THREAD_AREA
+
+/*
+ * Linux preserves three TLS segments in GDT.
+ * Offsets in GDT differ between 32-bit and 64-bit machines.
+ * For 64-bit x86 those GDT offsets are the same
+ * for native and compat tasks.
+ */
+#define GDT_ENTRY_TLS_MIN		12
+#define GDT_ENTRY_TLS_MAX		14
+#define GDT_ENTRY_TLS_NUM		3
+typedef struct {
+	user_desc_t		desc[GDT_ENTRY_TLS_NUM];
+} tls_t;
+
+struct thread_ctx;
+struct parasite_ctl;
+struct parasite_thread_ctl;
+extern int __compel_arch_fetch_thread_area(int tid, struct thread_ctx *th);
+extern int compel_arch_fetch_thread_area(struct parasite_thread_ctl *tctl);
+extern void compel_arch_get_tls_thread(struct parasite_thread_ctl *tctl, tls_t *out);
+extern void compel_arch_get_tls_task(struct parasite_ctl *ctl, tls_t *out);
+
 typedef struct {
 	uint64_t	r15;
 	uint64_t	r14;
diff --git a/compel/arch/x86/src/lib/thread_area.c b/compel/arch/x86/src/lib/thread_area.c
new file mode 100644
index 000000000..f581496a7
--- /dev/null
+++ b/compel/arch/x86/src/lib/thread_area.c
@@ -0,0 +1,88 @@
+#include <errno.h>
+#include <string.h>
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+#include "log.h"
+#include "asm/infect-types.h"
+#include "infect.h"
+#include "infect-priv.h"
+
+#ifndef PTRACE_GET_THREAD_AREA
+# define PTRACE_GET_THREAD_AREA		25
+#endif
+
+/*
+ * For 64-bit applications, TLS (fs_base for Glibc) is in MSR,
+ * which are dumped with the help of ptrace() and restored with
+ * arch_prctl(ARCH_SET_FS/ARCH_SET_GS).
+ *
+ * But SET_FS_BASE will update GDT if base pointer fits in 4 bytes.
+ * Otherwise it will set only MSR, which allows for mixed 64/32-bit
+ * code to use: 2 MSRs as TLS base _and_ 3 GDT entries.
+ * Having in sum 5 TLS pointers, 3 of which are four bytes and
+ * other two eight bytes:
+ * struct thread_struct {
+ *	struct desc_struct	tls_array[3];
+ *	...
+ * #ifdef CONFIG_X86_64
+ *	unsigned long		fsbase;
+ *	unsigned long		gsbase;
+ * #endif
+ *	...
+ * };
+ *
+ * Most x86_64 applications don't use GDT, but mixed code (i.e. Wine)
+ * can use it. Be pessimistic and dump it for 64-bit applications too.
+ */
+int __compel_arch_fetch_thread_area(int tid, struct thread_ctx *th)
+{
+	bool native_mode = user_regs_native(&th->regs);
+	tls_t *ptls = &th->tls;
+	int err, i;
+
+	/* Initialise as not present by default */
+	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++) {
+		user_desc_t *d = &ptls->desc[i];
+
+		memset(d, 0, sizeof(user_desc_t));
+		d->seg_not_present = 1;
+		d->entry_number = GDT_ENTRY_TLS_MIN + i;
+	}
+
+	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++)
+	{
+		user_desc_t *d = &ptls->desc[i];
+
+		err = ptrace(PTRACE_GET_THREAD_AREA, tid,
+				GDT_ENTRY_TLS_MIN + i, d);
+		/*
+		 * Ignoring absent syscall on !CONFIG_IA32_EMULATION
+		 * where such mixed code can't run.
+		 * XXX: Add compile CONFIG_X86_IGNORE_64BIT_TLS
+		 * (for x86_64 systems with CONFIG_IA32_EMULATION)
+		 */
+		if (err == -EIO && native_mode)
+			return 0;
+		if (err) {
+			pr_perror("get_thread_area failed for %d\n", tid);
+			return err;
+		}
+	}
+
+	return 0;
+}
+
+int compel_arch_fetch_thread_area(struct parasite_thread_ctl *tctl)
+{
+	return __compel_arch_fetch_thread_area(tctl->tid, &tctl->th);
+}
+
+void compel_arch_get_tls_task(struct parasite_ctl *ctl, tls_t *out)
+{
+	memcpy(out, &ctl->orig.tls, sizeof(tls_t));
+}
+
+void compel_arch_get_tls_thread(struct parasite_thread_ctl *tctl, tls_t *out)
+{
+	memcpy(out, &tctl->th.tls, sizeof(tls_t));
+}
diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index 8e1f990d5..308c027ad 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -8,6 +8,9 @@
 struct thread_ctx {
 	k_rtsigset_t		sigmask;
 	user_regs_struct_t	regs;
+#ifdef ARCH_HAS_PTRACE_GET_THREAD_AREA
+	tls_t			tls;
+#endif
 };
 
 /* parasite control block */
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 4f2402fee..3a815393b 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -681,6 +681,11 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 		return -1;
 	}
 
+	if (__compel_arch_fetch_thread_area(pid, &ctl->orig)) {
+		pr_err("Can't get thread area of %d\n", pid);
+		return -1;
+	}
+
 	if (ictx->make_sigframe(ictx->regs_arg, ctl->sigframe, ctl->rsigframe, &ctl->orig.sigmask))
 		return -1;
 
diff --git a/criu/arch/arm/include/asm/parasite.h b/criu/arch/arm/include/asm/parasite.h
index 0ed320ba6..7f1e219c6 100644
--- a/criu/arch/arm/include/asm/parasite.h
+++ b/criu/arch/arm/include/asm/parasite.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_PARASITE_H__
 #define __ASM_PARASITE_H__
 
+/* kuser_get_tls() kernel-provided user-helper, the address is emulated */
 static inline void arch_get_tls(tls_t *ptls)
 {
 	*ptls = ((tls_t (*)(void))0xffff0fe0)();
diff --git a/criu/arch/x86/include/asm/parasite.h b/criu/arch/x86/include/asm/parasite.h
index 6b4d4ac59..678fc75e2 100644
--- a/criu/arch/x86/include/asm/parasite.h
+++ b/criu/arch/x86/include/asm/parasite.h
@@ -1,77 +1,10 @@
 #ifndef __ASM_PARASITE_H__
 #define __ASM_PARASITE_H__
 
-#include <compel/plugins/std/string.h>
-#include <compel/plugins/std/syscall-codes.h>
-#include "asm/compat.h"
-
-static int arch_get_user_desc(user_desc_t *desc)
-{
-	int ret = __NR32_get_thread_area;
-	/*
-	 * For 64-bit applications, TLS (fs_base for Glibc) is
-	 * in MSR, which are dumped with the help of arch_prctl().
-	 *
-	 * But SET_FS_BASE will update GDT if base pointer fits in 4 bytes.
-	 * Otherwise it will set only MSR, which allows for mixed 64/32-bit
-	 * code to use: 2 MSRs as TLS base _and_ 3 GDT entries.
-	 * Having in sum 5 TLS pointers, 3 of which are four bytes and
-	 * other two bigger than four bytes:
-	 * struct thread_struct {
-	 *	struct desc_struct	tls_array[3];
-	 *	...
-	 * #ifdef CONFIG_X86_64
-	 *	unsigned long		fsbase;
-	 *	unsigned long		gsbase;
-	 * #endif
-	 *	...
-	 * };
-	 */
-	asm volatile (
-	"	mov %0,%%eax			\n"
-	"	mov %1,%%rbx			\n"
-	"	int $0x80			\n"
-	"	mov %%eax,%0			\n"
-	: "+m"(ret)
-	: "m"(desc)
-	: "rax", "rbx", "r8", "r9", "r10", "r11", "memory");
-
-	if (ret)
-		pr_err("Failed to dump TLS descriptor #%d: %d\n",
-				desc->entry_number, ret);
-	return ret;
-}
-
-static void arch_get_tls(tls_t *ptls)
-{
-	void *syscall_mem;
-	int i;
-
-	syscall_mem = alloc_compat_syscall_stack();
-	if (!syscall_mem) {
-		pr_err("Failed to allocate memory <4Gb for compat syscall\n");
-
-		for (i = 0; i < GDT_ENTRY_TLS_NUM; i++) {
-			user_desc_t *d = &ptls->desc[i];
-
-			d->seg_not_present = 1;
-			d->entry_number = GDT_ENTRY_TLS_MIN + i;
-		}
-		return;
-	}
-
-	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++)
-	{
-		user_desc_t *d = syscall_mem;
-
-		memset(d, 0, sizeof(user_desc_t));
-		d->seg_not_present = 1;
-		d->entry_number = GDT_ENTRY_TLS_MIN + i;
-		arch_get_user_desc(d);
-		memcpy(&ptls->desc[i], d, sizeof(user_desc_t));
-	}
-
-	free_compat_syscall_stack(syscall_mem);
-}
+/*
+ * TLS is accessed through PTRACE_GET_THREAD_AREA,
+ * see compel_arch_fetch_thread_area().
+ */
+static inline void arch_get_tls(tls_t *ptls) { (void)ptls; }
 
 #endif
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 731477ec9..6ba074020 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -3,6 +3,7 @@
 
 #include "asm/types.h"
 #include <compel/asm/fpu.h>
+#include <compel/asm/infect-types.h>
 #include "images/core.pb-c.h"
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/sigframe.h>
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index 3ff7fc630..012358949 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -36,17 +36,4 @@ static inline void *decode_pointer(u64 v) { return (void*)(long)v; }
 #define AT_VECTOR_SIZE			44
 typedef uint64_t auxv_t;
 
-/*
- * Linux preserves three TLS segments in GDT.
- * Offsets in GDT differ between 32-bit and 64-bit machines.
- * For 64-bit x86 those GDT offsets are the same
- * for native and compat tasks.
- */
-#define GDT_ENTRY_TLS_MIN		12
-#define GDT_ENTRY_TLS_MAX		14
-#define GDT_ENTRY_TLS_NUM		3
-typedef struct {
-	user_desc_t		desc[GDT_ENTRY_TLS_NUM];
-} tls_t;
-
 #endif /* __CR_ASM_TYPES_H__ */
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index c7074c7c4..a961cb8ae 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -156,6 +156,8 @@ int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEn
 		return -1;
 	}
 
+	compel_arch_get_tls_task(ctl, &args->tls);
+
 	return dump_thread_core(pid, core, args);
 }
 
@@ -190,6 +192,14 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
 		goto err_rth;
 	}
 
+	ret = compel_arch_fetch_thread_area(tctl);
+	if (ret) {
+		pr_err("Can't obtain thread area of %d\n", pid);
+		goto err_rth;
+	}
+
+	compel_arch_get_tls_thread(tctl, &args->tls);
+
 	ret = compel_run_in_thread(tctl, PARASITE_CMD_DUMP_THREAD);
 	if (ret) {
 		pr_err("Can't init thread in parasite %d\n", pid);

From 327e14933d6b2391d0e3d0790e6556216a7d9ebb Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 25 Feb 2021 12:56:37 +0300
Subject: [PATCH 0521/1854] namespaces: properly handle errors of snprintf

If snprintf was truncated we should probably know about it instead of
continuing to increase off, as snprintf returns number of characters
which would have been written and not the number which was actually
written.

Normally we check snprintf only for overflow not for error, some modern
compilers print warnings if truncation was not checked.

Probably it was the case why we implemented [1], the truncation happened
and on the next iteration of for loop we've hit negative size for
snprintf and got -1.

Fixes: 90f043dea ("namespaces: handle errors of snprintf") [1]
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/namespaces.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index ccd6e1323..aecc82f66 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1173,6 +1173,9 @@ static int write_id_map(pid_t pid, UidGidExtent **extents, int n, char *id_map)
 		if (len < 0) {
 			pr_perror("Unable to form the user/group mappings buffer");
 			return -1;
+		} else if (len >= sizeof(buf) - off) {
+			pr_err("The user/group mappings buffer truncated\n");
+			return -1;
 		}
 		off += len;
 	}

From e2e8be37f22b2fb4623af3bec844cf5a98e823c1 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 25 Feb 2021 19:57:10 +0000
Subject: [PATCH 0522/1854] x86/compel/fault-inject: Add a fault-injection for
 corrupting extended regset

With pseudo-random garbage, the seed is printed with pr_err().
get_task_regs() is called during seizing the task and also for each
thread.
At this moment only for x86.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/arch/x86/src/lib/cpu.c                 |  2 +-
 .../arch/x86/src/lib/include/uapi/asm/fpu.h   |  4 +-
 compel/arch/x86/src/lib/infect.c              | 79 +++++++++++++++++++
 compel/include/uapi/infect.h                  |  2 +
 criu/include/fault-injection.h                |  1 +
 criu/parasite-syscall.c                       |  2 +
 6 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/compel/arch/x86/src/lib/cpu.c b/compel/arch/x86/src/lib/cpu.c
index 617512167..c96f01353 100644
--- a/compel/arch/x86/src/lib/cpu.c
+++ b/compel/arch/x86/src/lib/cpu.c
@@ -125,7 +125,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 			c->xfeatures_mask &= ~(1 << i);
 	}
 
-	c->xfeatures_mask &= XCNTXT_MASK;
+	c->xfeatures_mask &= XFEATURE_MASK_USER;
 	c->xfeatures_mask &= ~XFEATURE_MASK_SUPERVISOR;
 
 	/*
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index 4ff531fb9..8985ad7f6 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -76,7 +76,7 @@ enum xfeature {
 #define XFEATURE_MASK_SUPERVISOR	(XFEATURE_MASK_PT | XFEATURE_HDC)
 
 /* All currently supported features */
-#define XCNTXT_MASK							  \
+#define XFEATURE_MASK_USER						  \
 	(XFEATURE_MASK_FP		| XFEATURE_MASK_SSE		| \
 	 XFEATURE_MASK_YMM		| XFEATURE_MASK_OPMASK		| \
 	 XFEATURE_MASK_ZMM_Hi256	| XFEATURE_MASK_Hi16_ZMM	| \
@@ -232,7 +232,7 @@ struct pkru_state {
  * can vary quite a bit between CPUs.
  *
  *
- * One page should be enough for the whole xsave state.
+ * One page should be enough for the whole xsave state ;-)
  */
 #define EXTENDED_STATE_AREA_SIZE	(4096 - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct))
 
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 9c4abb60c..401001942 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -4,6 +4,8 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include <compel/asm/fpu.h>
 
@@ -258,6 +260,80 @@ static int get_task_fpregs(pid_t pid, user_fpregs_struct_t *xsave)
 	return 0;
 }
 
+/* See arch/x86/kernel/fpu/xstate.c */
+static void validate_random_xstate(struct xsave_struct *xsave)
+{
+	struct xsave_hdr_struct *hdr = &xsave->xsave_hdr;
+	unsigned int i;
+
+	/* No unknown or supervisor features may be set */
+	hdr->xstate_bv &= XFEATURE_MASK_USER;
+	hdr->xstate_bv &= ~XFEATURE_MASK_SUPERVISOR;
+
+	for (i = 0; i < XFEATURE_MAX; i++) {
+		if (!compel_fpu_has_feature(i))
+			hdr->xstate_bv &= ~(1 << i);
+	}
+
+	/* Userspace must use the uncompacted format */
+	hdr->xcomp_bv = 0;
+
+	/*
+	 * If 'reserved' is shrunken to add a new field, make sure to validate
+	 * that new field here!
+	 */
+	BUILD_BUG_ON(sizeof(hdr->reserved) != 48);
+
+	/* No reserved bits may be set */
+	memset(&hdr->reserved, 0, sizeof(hdr->reserved));
+}
+
+/*
+ * TODO: Put fault-injection under CONFIG_* and move
+ * extended regset corruption to generic code
+ */
+static int corrupt_extregs(pid_t pid)
+{
+	bool use_xsave = compel_cpu_has_feature(X86_FEATURE_OSXSAVE);
+	user_fpregs_struct_t ext_regs;
+	int *rand_to = (int *)&ext_regs;
+	unsigned int seed;
+	size_t i;
+
+	seed = time(NULL);
+	for (i = 0; i < sizeof(ext_regs) / sizeof(int); i++)
+		*rand_to++ = rand_r(&seed);
+
+	/*
+	 * Error log-level as:
+	 *  - not intended to be used outside of testing,
+	 *  - zdtm.py will grep it auto-magically from logs
+	 *    (and the seed will be known from an automatical testing)
+	 */
+	pr_err("Corrupting %s for %d, seed %u\n",
+			use_xsave ? "xsave" : "fpuregs", pid, seed);
+
+	if (!use_xsave) {
+		if (ptrace(PTRACE_SETFPREGS, pid, NULL, &ext_regs)) {
+			pr_perror("Can't set FPU registers for %d", pid);
+			return -1;
+		}
+	} else {
+		struct iovec iov;
+
+		validate_random_xstate((void *)&ext_regs);
+
+		iov.iov_base = &ext_regs;
+		iov.iov_len = sizeof(ext_regs);
+
+		if (ptrace(PTRACE_SETREGSET, pid, (unsigned int)NT_X86_XSTATE, &iov) < 0) {
+			pr_perror("Can't set xstate for %d", pid);
+			return -1;
+		}
+	}
+	return 0;
+}
+
 int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 		  void *arg, unsigned long flags)
 {
@@ -309,6 +385,9 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 		ret = get_task_xsave(pid, &xsave);
 	}
 
+	if (!ret && unlikely(flags & INFECT_CORRUPT_EXTREGS))
+		ret = corrupt_extregs(pid);
+
 	if (ret)
 		goto err;
 
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index fa326eafe..6cf3daf46 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -136,6 +136,8 @@ extern struct infect_ctx *compel_infect_ctx(struct parasite_ctl *);
 #define INFECT_COMPATIBLE		(1UL << 3)
 /* Workaround for ptrace bug on Skylake CPUs with kernels older than v4.14 */
 #define INFECT_X86_PTRACE_MXCSR_BUG	(1UL << 4)
+/* After infecting - corrupt extended registers (fault-injection) */
+#define INFECT_CORRUPT_EXTREGS		(1UL << 5)
 
 /*
  * There are several ways to describe a blob to compel
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 31fe16178..0fd9b512d 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -18,6 +18,7 @@ enum faults {
 	FI_PARTIAL_PAGES = 131,
 	FI_HUGE_ANON_SHMEM_ID = 132,
 	FI_CANNOT_MAP_VDSO = 133,
+	FI_CORRUPT_EXTREGS = 134,
 	FI_MAX,
 };
 
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index a961cb8ae..04364e5bf 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -575,6 +575,8 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 		ictx->flags |= INFECT_COMPATIBLE;
 	if (kdat.x86_has_ptrace_fpu_xsave_bug)
 		ictx->flags |= INFECT_X86_PTRACE_MXCSR_BUG;
+	if (fault_injected(FI_CORRUPT_EXTREGS))
+		ictx->flags |= INFECT_CORRUPT_EXTREGS;
 
 	ictx->log_fd = log_get_fd();
 

From 6c879c3c83b97c78cb9f9a5b60085c8a25930acd Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 25 Feb 2021 23:10:49 +0000
Subject: [PATCH 0523/1854] zdtm/fpu00: Simplify ifdeffery

..to introduce a new one! ;-D

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 test/zdtm/static/fpu00.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/test/zdtm/static/fpu00.c b/test/zdtm/static/fpu00.c
index 04aa738fd..e9fcb7e18 100644
--- a/test/zdtm/static/fpu00.c
+++ b/test/zdtm/static/fpu00.c
@@ -44,17 +44,14 @@ int chk_proc_fpu(void)
 
 	return edx & CPUID_FEAT_EDX_FPU;
 }
-#endif
 
 int main(int argc, char ** argv)
 {
-#if defined(__i386__) || defined(__x86_64__)
 	float a, b, c, d;
 	float res1, res2;
-#endif
 
 	test_init(argc, argv);
-#if defined(__i386__) || defined(__x86_64__)
+
 	if (!chk_proc_fpu()) {
 		skip("FPU not supported");
 		return 1;
@@ -80,8 +77,17 @@ int main(int argc, char ** argv)
 		fail("%f != %f\n", res1, res2);
 	else
 		pass();
-#else
-	skip("Unsupported arch");
-#endif
+
 	return 0;
 }
+
+#else
+
+int main(int argc, char *argv[])
+{
+	test_init(argc, argv);
+	skip("Unsupported arch");
+	return 0;
+}
+
+#endif

From 7af06af10d281b70b3722eab503d5258772de1e8 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Thu, 25 Feb 2021 23:35:15 +0000
Subject: [PATCH 0524/1854] zdtm/fpu03: Add a test to check fpu C/R in a thread

CRIU dumps main thread and sub-threads differently, so there needed
a test to check if fpu is preserved across C/R in sub-threads.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 test/zdtm/static/Makefile |  3 +++
 test/zdtm/static/fpu00.c  | 45 +++++++++++++++++++++++++++++++--------
 test/zdtm/static/fpu03.c  |  1 +
 3 files changed, 40 insertions(+), 9 deletions(-)
 create mode 120000 test/zdtm/static/fpu03.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index d0974bb0d..53dee92c5 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -14,6 +14,7 @@ TST_NOFILE	:=				\
 		fpu00				\
 		fpu01				\
 		fpu02				\
+		fpu03				\
 		arm-neon00			\
 		futex				\
 		futex-rl			\
@@ -496,6 +497,8 @@ $(TST):	| $(LIB)
 aio00:			LDLIBS += -laio
 different_creds:	LDLIBS += -lcap
 file_locks06 file_locks07 file_locks08:	ofd_file_locks.o
+fpu03:			CFLAGS += -pthread -D ZDTM_FPU00_RUN_IN_THREAD
+fpu03:			LDFLAGS += -pthread
 futex:			CFLAGS += -pthread
 futex:			LDFLAGS += -pthread
 futex-rl:		CFLAGS += -pthread
diff --git a/test/zdtm/static/fpu00.c b/test/zdtm/static/fpu00.c
index e9fcb7e18..6f2e1c2bf 100644
--- a/test/zdtm/static/fpu00.c
+++ b/test/zdtm/static/fpu00.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <pthread.h>
 
 #include "zdtmtst.h"
 
@@ -45,18 +46,11 @@ int chk_proc_fpu(void)
 	return edx & CPUID_FEAT_EDX_FPU;
 }
 
-int main(int argc, char ** argv)
+void *run_fpu_test(void *unused)
 {
 	float a, b, c, d;
 	float res1, res2;
 
-	test_init(argc, argv);
-
-	if (!chk_proc_fpu()) {
-		skip("FPU not supported");
-		return 1;
-	}
-
 	a = drand48();
 	b = drand48();
 	c = drand48();
@@ -78,7 +72,40 @@ int main(int argc, char ** argv)
 	else
 		pass();
 
-	return 0;
+	return (void *)(uintptr_t)(res1 != res2);
+}
+
+int main(int argc, char ** argv)
+{
+	test_init(argc, argv);
+
+	if (!chk_proc_fpu()) {
+		skip("FPU not supported");
+		return 1;
+	}
+
+
+#ifdef ZDTM_FPU00_RUN_IN_THREAD
+	/* Check if thread's fpu state is preserved */
+	{
+		pthread_t child;
+		void *ret;
+
+		if (pthread_create(&child, NULL, &run_fpu_test, NULL)) {
+			pr_perror("Can't create pthread\n");
+			exit(1);
+		}
+
+		if (pthread_join(child, &ret)) {
+			pr_perror("Can't join pthread\n");
+			exit(1);
+		}
+
+		exit(!!ret);
+	}
+#else
+	return !!run_fpu_test(NULL);
+#endif
 }
 
 #else
diff --git a/test/zdtm/static/fpu03.c b/test/zdtm/static/fpu03.c
new file mode 120000
index 000000000..158732c02
--- /dev/null
+++ b/test/zdtm/static/fpu03.c
@@ -0,0 +1 @@
+fpu00.c
\ No newline at end of file

From 3613b6f15fa8357e8f38f9377c51806e90b452d3 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 26 Feb 2021 01:08:00 +0000
Subject: [PATCH 0525/1854] compel: Store extended registers set in the thread
 context

Extended registers set for task is restored with rt_sigreturn() through
prepared sigframe. For threads it's currently lost.
Preserve it inside thread context to restore on thread curing.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/arch/aarch64/src/lib/infect.c | 11 ++++++-----
 compel/arch/arm/src/lib/infect.c     |  9 +++++----
 compel/arch/mips/src/lib/infect.c    |  8 ++++----
 compel/arch/ppc64/src/lib/infect.c   |  9 +++++----
 compel/arch/s390/src/lib/infect.c    | 25 +++++++++++++------------
 compel/arch/x86/src/lib/infect.c     | 14 +++++++-------
 compel/include/infect-priv.h         | 12 +++++++++++-
 compel/src/lib/infect.c              |  7 ++++---
 8 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 4b5939022..39428cd8d 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -60,11 +60,12 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
 	return 0;
 }
 
-int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+		  user_fpregs_struct_t *ext_regs, save_regs_t save,
 		  void *arg, __maybe_unused unsigned long flags)
 {
+	user_fpregs_struct_t tmp, *fpsimd = ext_regs ? ext_regs : &tmp;
 	struct iovec iov;
-	user_fpregs_struct_t fpsimd;
 	int ret;
 
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
@@ -76,14 +77,14 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 		goto err;
 	}
 
-	iov.iov_base = &fpsimd;
-	iov.iov_len = sizeof(fpsimd);
+	iov.iov_base = fpsimd;
+	iov.iov_len = sizeof(*fpsimd);
 	if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &iov))) {
 		pr_perror("Failed to obtain FPU registers for %d", pid);
 		goto err;
 	}
 
-	ret = save(arg, regs, &fpsimd);
+	ret = save(arg, regs, fpsimd);
 err:
 	return ret;
 }
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index 75b985b74..dd5aa9784 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -69,15 +69,16 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
 }
 
 #define PTRACE_GETVFPREGS 27
-int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+		  user_fpregs_struct_t *ext_regs, save_regs_t save,
 		  void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t vfp;
+	user_fpregs_struct_t tmp, *vfp = ext_regs ? ext_regs : &tmp;
 	int ret = -1;
 
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
 
-	if (ptrace(PTRACE_GETVFPREGS, pid, NULL, &vfp)) {
+	if (ptrace(PTRACE_GETVFPREGS, pid, NULL, vfp)) {
 		pr_perror("Can't obtain FPU registers for %d", pid);
 		goto err;
 	}
@@ -99,7 +100,7 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 		}
 	}
 
-	ret = save(arg, regs, &vfp);
+	ret = save(arg, regs, vfp);
 err:
 	return ret;
 }
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index 35e947cc0..6a53b3c3b 100755
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -122,13 +122,14 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
     return 0;
 }
 
-int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+		  user_fpregs_struct_t *ext_regs, save_regs_t save,
 		  void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t xsave = {  }, *xs = NULL;
+	user_fpregs_struct_t xsave = {  }, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
-	if (ptrace(PTRACE_GETFPREGS, pid, NULL, &xsave)) {
+	if (ptrace(PTRACE_GETFPREGS, pid, NULL, xs)) {
 	    pr_perror("Can't obtain FPU registers for %d", pid);
 	    return ret;
 	}
@@ -151,7 +152,6 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 	    regs->regs[0] = 0;
 	}
 
-	xs = &xsave;
 	ret = save(arg, regs, xs);
 	return ret;
 }
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index b2c725f62..339e01209 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -372,17 +372,18 @@ static int __get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	return 0;
 }
 
-int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+		  user_fpregs_struct_t *ext_regs, save_regs_t save,
 		  void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t fpregs;
+	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
 	int ret;
 
-	ret = __get_task_regs(pid, regs, &fpregs);
+	ret = __get_task_regs(pid, regs, fpregs);
 	if (ret)
 		return ret;
 
-	return save(arg, regs, &fpregs);
+	return save(arg, regs, fpregs);
 }
 
 int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 5a4675449..5b3c0d62e 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -310,31 +310,32 @@ static int s390_disable_ri_bit(pid_t pid, user_regs_struct_t *regs)
 /*
  * Prepare task registers for restart
  */
-int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+		  user_fpregs_struct_t *ext_regs, save_regs_t save,
 		  void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t fpregs;
+	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
 	struct iovec iov;
 	int rewind;
 
-	print_user_regs_struct("get_task_regs", pid, regs);
+	print_user_regs_struct("compel_get_task_regs", pid, regs);
 
-	memset(&fpregs, 0, sizeof(fpregs));
-	iov.iov_base = &fpregs.prfpreg;
-	iov.iov_len = sizeof(fpregs.prfpreg);
+	memset(fpregs, 0, sizeof(*fpregs));
+	iov.iov_base = &fpregs->prfpreg;
+	iov.iov_len = sizeof(fpregs->prfpreg);
 	if (ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &iov) < 0) {
 		pr_perror("Couldn't get floating-point registers");
 		return -1;
 	}
-	if (get_vx_regs(pid, &fpregs)) {
+	if (get_vx_regs(pid, fpregs)) {
 		pr_perror("Couldn't get vector registers");
 		return -1;
 	}
-	if (get_gs_cb(pid, &fpregs)) {
+	if (get_gs_cb(pid, fpregs)) {
 		pr_perror("Couldn't get guarded-storage");
 		return -1;
 	}
-	if (get_ri_cb(pid, &fpregs)) {
+	if (get_ri_cb(pid, fpregs)) {
 		pr_perror("Couldn't get runtime-instrumentation");
 		return -1;
 	}
@@ -343,10 +344,10 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 	 * before we execute parasite code. Otherwise parasite operations
 	 * would be recorded.
 	 */
-	if (fpregs.flags & USER_RI_ON)
+	if (fpregs->flags & USER_RI_ON)
 		s390_disable_ri_bit(pid, regs);
 
-	print_user_fpregs_struct("get_task_regs", pid, &fpregs);
+	print_user_fpregs_struct("compel_get_task_regs", pid, fpregs);
 	/* Check for system call restarting. */
 	if (regs->system_call) {
 		rewind = regs->system_call >> 16;
@@ -366,7 +367,7 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 		}
 	}
 	/* Call save_task_regs() */
-	return save(arg, regs, &fpregs);
+	return save(arg, regs, fpregs);
 }
 
 /*
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 401001942..9d81083f7 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -334,10 +334,11 @@ static int corrupt_extregs(pid_t pid)
 	return 0;
 }
 
-int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+		  user_fpregs_struct_t *ext_regs, save_regs_t save,
 		  void *arg, unsigned long flags)
 {
-	user_fpregs_struct_t xsave = { }, *xs = NULL;
+	user_fpregs_struct_t xsave = { }, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
 	pr_info("Dumping general registers for %d in %s mode\n", pid,
@@ -371,18 +372,18 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
 
 	if (!compel_cpu_has_feature(X86_FEATURE_OSXSAVE)) {
-		ret = get_task_fpregs(pid, &xsave);
+		ret = get_task_fpregs(pid, xs);
 	} else if (unlikely(flags & INFECT_X86_PTRACE_MXCSR_BUG)) {
 		/*
 		 * get_task_fpregs() will fill FP state,
 		 * get_task_xsave() will overwrite rightly sse/mmx/etc
 		 */
 		pr_warn("Skylake xsave fpu bug workaround used\n");
-		ret = get_task_fpregs(pid, &xsave);
+		ret = get_task_fpregs(pid, xs);
 		if (!ret)
-			ret = get_task_xsave(pid, &xsave);
+			ret = get_task_xsave(pid, xs);
 	} else {
-		ret = get_task_xsave(pid, &xsave);
+		ret = get_task_xsave(pid, xs);
 	}
 
 	if (!ret && unlikely(flags & INFECT_CORRUPT_EXTREGS))
@@ -391,7 +392,6 @@ int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
 	if (ret)
 		goto err;
 
-	xs = &xsave;
 out:
 	ret = save(arg, regs, xs);
 err:
diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index 308c027ad..16114164c 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -11,6 +11,7 @@ struct thread_ctx {
 #ifdef ARCH_HAS_PTRACE_GET_THREAD_AREA
 	tls_t			tls;
 #endif
+	user_fpregs_struct_t	ext_regs;
 };
 
 /* parasite control block */
@@ -61,7 +62,16 @@ extern void *remote_mmap(struct parasite_ctl *ctl,
 		void *addr, size_t length, int prot,
 		int flags, int fd, off_t offset);
 extern bool arch_can_dump_task(struct parasite_ctl *ctl);
-extern int get_task_regs(pid_t pid, user_regs_struct_t *regs, save_regs_t save,
+/*
+ * @regs:	general purpose registers
+ * @ext_regs:	extended register set (fpu/mmx/sse/etc)
+ *		for task that is NULL, restored by sigframe on rt_sigreturn()
+ * @save:	callback to dump all info
+ * @flags:	see INFECT_* in infect_ctx::flags
+ * @pid:	mystery
+ */
+extern int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
+			user_fpregs_struct_t *ext_regs, save_regs_t save,
 			void *arg, unsigned long flags);
 extern int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s);
 extern int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 3a815393b..d50356f6c 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -671,11 +671,11 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 
 	/*
 	 * Get task registers before going daemon, since the
-	 * compel_get_task_regs needs to call ptrace on _stopped_ task,
+	 * compel_get_task_regs() needs to call ptrace on _stopped_ task,
 	 * while in daemon it is not such.
 	 */
 
-	if (get_task_regs(pid, &ctl->orig.regs, ictx->save_regs,
+	if (compel_get_task_regs(pid, &ctl->orig.regs, NULL, ictx->save_regs,
 			ictx->regs_arg, ictx->flags)) {
 		pr_err("Can't obtain regs for thread %d\n", pid);
 		return -1;
@@ -1674,7 +1674,8 @@ k_rtsigset_t *compel_task_sigmask(struct parasite_ctl *ctl)
 
 int compel_get_thread_regs(struct parasite_thread_ctl *tctl, save_regs_t save, void * arg)
 {
-	return get_task_regs(tctl->tid, &tctl->th.regs, save, arg, tctl->ctl->ictx.flags);
+	return compel_get_task_regs(tctl->tid, &tctl->th.regs, &tctl->th.ext_regs,
+			     save, arg, tctl->ctl->ictx.flags);
 }
 
 struct infect_ctx *compel_infect_ctx(struct parasite_ctl *ctl)

From 21e3c530731f0f77119958a7bd26b7a954cf67d3 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 26 Feb 2021 02:25:57 +0000
Subject: [PATCH 0526/1854] compel: Provide compel_set_task_ext_regs()

Arch-dependend way to restore extended registers set.
Use it straight-away to restore per-thread registers.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/arch/aarch64/src/lib/infect.c | 15 ++++++++
 compel/arch/arm/src/lib/infect.c     | 11 ++++++
 compel/arch/mips/src/lib/infect.c    | 13 +++++++
 compel/arch/ppc64/src/lib/infect.c   | 28 ++++++++++++++
 compel/arch/s390/src/lib/infect.c    | 55 ++++++++++++++++++++++++++++
 compel/arch/x86/src/lib/infect.c     | 25 +++++++++++++
 compel/include/infect-priv.h         |  1 +
 compel/src/lib/infect.c              | 25 +++++++++----
 8 files changed, 165 insertions(+), 8 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 39428cd8d..586eedac0 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -89,6 +89,21 @@ err:
 	return ret;
 }
 
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	struct iovec iov;
+
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	iov.iov_base = ext_regs;
+	iov.iov_len = sizeof(*ext_regs);
+	if (ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &iov)) {
+		pr_perror("Failed to set FPU registers for %d", pid);
+		return -1;
+	}
+	return 0;
+}
+
 int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 					unsigned long arg1,
 					unsigned long arg2,
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index dd5aa9784..1ddb48654 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -105,6 +105,17 @@ err:
 	return ret;
 }
 
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	if (ptrace(PTRACE_SETVFPREGS, pid, NULL, ext_regs)) {
+		pr_perror("Can't set FPU registers for %d", pid);
+		return -1;
+	}
+	return 0;
+}
+
 int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 		unsigned long arg1,
 		unsigned long arg2,
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index 6a53b3c3b..0c8067f88 100755
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -129,6 +129,8 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	user_fpregs_struct_t xsave = {  }, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
+	pr_info("Dumping GP/FPU registers for %d\n", pid);
+
 	if (ptrace(PTRACE_GETFPREGS, pid, NULL, xs)) {
 	    pr_perror("Can't obtain FPU registers for %d", pid);
 	    return ret;
@@ -156,6 +158,17 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	return ret;
 }
 
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	if (ptrace(PTRACE_SETFPREGS, pid, NULL, ext_regs)) {
+		pr_perror("Can't set FPU registers for %d", pid);
+		return -1;
+	}
+	return 0;
+}
+
 int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 		unsigned long arg1,
 		unsigned long arg2,
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index 339e01209..5797fb16d 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -386,6 +386,34 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	return save(arg, regs, fpregs);
 }
 
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	int ret = 0;
+
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	/* XXX: should restore TM registers somehow? */
+	if (ext_regs->flags & USER_FPREGS_FL_FP) {
+		if (ptrace(PTRACE_SETFPREGS, pid, 0, (void *)&ext_regs->fpregs) < 0) {
+			pr_perror("Couldn't set floating-point registers");
+			ret = -1;
+		}
+	}
+
+	if (ext_regs->flags & USER_FPREGS_FL_ALTIVEC) {
+		if (ptrace(PTRACE_SETVRREGS, pid, 0, (void*)&ext_regs->vrregs) < 0) {
+			pr_perror("Couldn't set Altivec registers");
+			ret = -1;
+		}
+		if (ptrace(PTRACE_SETVSRREGS, pid, 0, (void*)ext_regs->vsxregs) < 0) {
+			pr_perror("Couldn't set VSX registers");
+			ret = -1;
+		}
+	}
+
+	return ret;
+}
+
 int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 		unsigned long arg1,
 		unsigned long arg2,
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 5b3c0d62e..557b21203 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -370,6 +370,61 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	return save(arg, regs, fpregs);
 }
 
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	struct iovec iov;
+	int ret = 0;
+
+	iov.iov_base = &ext_regs->prfpreg;
+	iov.iov_len = sizeof(ext_regs->prfpreg);
+	if (ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &iov) < 0) {
+		pr_perror("Couldn't set floating-point registers");
+		ret = -1;
+	}
+
+	if (ext_regs->flags & USER_FPREGS_VXRS) {
+		iov.iov_base = &ext_regs->vxrs_low;
+		iov.iov_len = sizeof(ext_regs->vxrs_low);
+		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_VXRS_LOW, &iov) < 0) {
+			pr_perror("Couldn't set VXRS_LOW\n");
+			ret = -1;
+		}
+
+		iov.iov_base = &ext_regs->vxrs_high;
+		iov.iov_len = sizeof(ext_regs->vxrs_high);
+		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_VXRS_HIGH, &iov) < 0) {
+			pr_perror("Couldn't set VXRS_HIGH\n");
+			ret = -1;
+		}
+	}
+
+	if (ext_regs->flags & USER_GS_CB) {
+		iov.iov_base = &ext_regs->gs_cb;
+		iov.iov_len = sizeof(ext_regs->gs_cb);
+		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_GS_CB, &iov) < 0) {
+			pr_perror("Couldn't set GS_CB\n");
+			ret = -1;
+		}
+		iov.iov_base = &ext_regs->gs_bc;
+		iov.iov_len = sizeof(ext_regs->gs_bc);
+		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_GS_BC, &iov) < 0) {
+			pr_perror("Couldn't set GS_BC\n");
+			ret = -1;
+		}
+	}
+
+	if (ext_regs->flags & USER_RI_CB) {
+		iov.iov_base = &ext_regs->ri_cb;
+		iov.iov_len = sizeof(ext_regs->ri_cb);
+		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_RI_CB, &iov) < 0) {
+			pr_perror("Couldn't set RI_CB\n");
+			ret = -1;
+		}
+	}
+
+	return ret;
+}
+
 /*
  * Injected syscall instruction
  */
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 9d81083f7..566238d2d 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -398,6 +398,31 @@ err:
 	return ret;
 }
 
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	struct iovec iov;
+
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	if (!compel_cpu_has_feature(X86_FEATURE_OSXSAVE)) {
+		if (ptrace(PTRACE_SETFPREGS, pid, NULL, ext_regs)) {
+			pr_perror("Can't set FPU registers for %d", pid);
+			return -1;
+		}
+		return 0;
+	}
+
+	iov.iov_base = ext_regs;
+	iov.iov_len = sizeof(*ext_regs);
+
+	if (ptrace(PTRACE_SETREGSET, pid, (unsigned int)NT_X86_XSTATE, &iov) < 0) {
+		pr_perror("Can't set FPU registers for %d", pid);
+		return -1;
+	}
+
+	return 0;
+}
+
 int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 		unsigned long arg1,
 		unsigned long arg2,
diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index 16114164c..d4f19307d 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -73,6 +73,7 @@ extern bool arch_can_dump_task(struct parasite_ctl *ctl);
 extern int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 			user_fpregs_struct_t *ext_regs, save_regs_t save,
 			void *arg, unsigned long flags);
+extern int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs);
 extern int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s);
 extern int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 				     user_regs_struct_t *regs,
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index d50356f6c..1bb07ace5 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -475,7 +475,8 @@ err_sig:
 	return -1;
 }
 
-static int restore_thread_ctx(int pid, struct thread_ctx *ctx)
+static int restore_thread_ctx(int pid, struct thread_ctx *ctx,
+			      bool restore_ext_regs)
 {
 	int ret = 0;
 
@@ -483,6 +484,10 @@ static int restore_thread_ctx(int pid, struct thread_ctx *ctx)
 		pr_perror("Can't restore registers (pid: %d)", pid);
 		ret = -1;
 	}
+
+	if (restore_ext_regs && compel_set_task_ext_regs(pid, &ctx->ext_regs))
+		ret = -1;
+
 	if (ptrace(PTRACE_SETSIGMASK, pid, sizeof(k_rtsigset_t), &ctx->sigmask)) {
 		pr_perror("Can't block signals");
 		ret = -1;
@@ -491,11 +496,11 @@ static int restore_thread_ctx(int pid, struct thread_ctx *ctx)
 	return ret;
 }
 
-
 /* we run at @regs->ip */
 static int parasite_trap(struct parasite_ctl *ctl, pid_t pid,
 				user_regs_struct_t *regs,
-				struct thread_ctx *octx)
+				struct thread_ctx *octx,
+				bool may_use_extended_regs)
 {
 	siginfo_t siginfo;
 	int status;
@@ -540,7 +545,7 @@ static int parasite_trap(struct parasite_ctl *ctl, pid_t pid,
 	 */
 	ret = 0;
 err:
-	if (restore_thread_ctx(pid, octx))
+	if (restore_thread_ctx(pid, octx, may_use_extended_regs))
 		ret = -1;
 
 	return ret;
@@ -567,7 +572,7 @@ int compel_execute_syscall(struct parasite_ctl *ctl,
 
 	err = parasite_run(pid, PTRACE_CONT, ctl->ictx.syscall_ip, 0, regs, &ctl->orig);
 	if (!err)
-		err = parasite_trap(ctl, pid, regs, &ctl->orig);
+		err = parasite_trap(ctl, pid, regs, &ctl->orig, false);
 
 	if (ptrace_poke_area(pid, (void *)code_orig,
 			     (void *)ctl->ictx.syscall_ip, sizeof(code_orig))) {
@@ -585,7 +590,7 @@ int compel_run_at(struct parasite_ctl *ctl, unsigned long ip, user_regs_struct_t
 
 	ret = parasite_run(ctl->rpid, PTRACE_CONT, ip, 0, &regs, &ctl->orig);
 	if (!ret)
-		ret = parasite_trap(ctl, ctl->rpid, ret_regs ? ret_regs : &regs, &ctl->orig);
+		ret = parasite_trap(ctl, ctl->rpid, ret_regs ? ret_regs : &regs, &ctl->orig, false);
 	return ret;
 }
 
@@ -1471,7 +1476,7 @@ int compel_run_in_thread(struct parasite_thread_ctl *tctl, unsigned int cmd)
 
 	ret = parasite_run(pid, PTRACE_CONT, ctl->parasite_ip, stack, &regs, octx);
 	if (ret == 0)
-		ret = parasite_trap(ctl, pid, &regs, octx);
+		ret = parasite_trap(ctl, pid, &regs, octx, true);
 	if (ret == 0)
 		ret = (int)REG_RES(regs);
 
@@ -1499,7 +1504,11 @@ int compel_unmap(struct parasite_ctl *ctl, unsigned long addr)
 	ret = compel_stop_on_syscall(1, __NR(munmap, 0),
 			__NR(munmap, 1), TRACE_ENTER);
 
-	if (restore_thread_ctx(pid, &ctl->orig))
+	/*
+	 * Don't touch extended registers here: they were restored
+	 * with rt_sigreturn from sigframe.
+	 */
+	if (restore_thread_ctx(pid, &ctl->orig, false))
 		ret = -1;
 err:
 	return ret;

From 39b7252c6fd8daf66fbddf6ff521ef63a04f5642 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 26 Feb 2021 03:05:48 +0000
Subject: [PATCH 0527/1854] fault-injection: Run fpu corruption tests

For the thread leader and for subthreads too.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 test/jenkins/criu-fault.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index f871a140b..a8c3a5cf7 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -28,3 +28,8 @@ fi
 ./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/static/maps01 --fault 132 -f h || fail
+# 134 is corrupting extended registers set, should run in a sub-thread (fpu03)
+# without restore (that will check if parasite corrupts extended registers)
+./test/zdtm.py run -t zdtm/static/fpu03 --fault 134 -f h --norst || fail
+# also check for the main thread corruption
+./test/zdtm.py run -t zdtm/static/fpu00 --fault 134 -f h --norst || fail

From 1bac3a64b969be71cff45b2404458dd3f4876b5e Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 26 Feb 2021 03:09:01 +0000
Subject: [PATCH 0528/1854] s390: Purge stale comment

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/arch/s390/src/lib/infect.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 557b21203..9fad61468 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -717,14 +717,6 @@ unsigned long compel_task_size(void)
 
 /*
  * Get task registers (overwrites weak function)
- *
- * We don't store floating point and vector registers here because we
- * assue that compel/pie code does not change them.
- *
- * For verification issue:
- *
- * $ objdump -S criu/pie/parasite.built-in.bin.o | grep "%f"
- * $ objdump -S criu/pie/restorer.built-in.bin.o | grep "%f"
  */
 int ptrace_get_regs(int pid, user_regs_struct_t *regs)
 {

From a87c61fe8e5ad8f3b5107fc83234ba272b93973e Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Fri, 26 Feb 2021 03:10:35 +0000
Subject: [PATCH 0529/1854] Revert "compel: add -ffreestanding to force gcc not
 to use builtin memcpy, memset"

This reverts commit c98af78c58e2168d2322cd0ee15837468fd4ffb0.

Now FPU/SSE/MMX/etc can be used inside parasite.
Let's have compiler optimizations back.

Cc: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 compel/src/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compel/src/main.c b/compel/src/main.c
index c5f6e57ed..2c98659cc 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -19,7 +19,7 @@
 
 #define CFLAGS_DEFAULT_SET					\
 	"-Wstrict-prototypes "					\
-	"-fno-stack-protector -nostdlib -fomit-frame-pointer -ffreestanding "
+	"-fno-stack-protector -nostdlib -fomit-frame-pointer "
 
 #define COMPEL_CFLAGS_PIE	CFLAGS_DEFAULT_SET "-fpie"
 #define COMPEL_CFLAGS_NOPIC	CFLAGS_DEFAULT_SET "-fno-pic"

From c66ca3aa23a0985bc820f9c16ebdd6c7834f1ed6 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Tue, 9 Mar 2021 11:17:56 +0000
Subject: [PATCH 0530/1854] zdtm/fpu03: Add .desc file to omit running on !x86

I managed to forget .desc file and ppc on Jenkins now fails with:

> === Run 177/394 =======--------- zdtm/static/fpu03
> timens isn't supported on 5.8.18-100.fc31.ppc64le
> ========================== Run zdtm/static/fpu03 in h ==========================
> Start test
> ./fpu03 --pidfile=fpu03.pid --outfile=fpu03.out
> make: *** [Makefile:430: fpu03.pid] Error 1
>  Test zdtm/static/fpu03 FAIL at ['make', '--no-print-directory', '-C', 'zdtm/static', 'fpu03.pid']
> Test output: ================================
> 08:56:48.325:    56: SKIP: fpu03.c:116: Unsupported arch
> 08:56:48.325:    55: ERR: test.c:316: Test exited unexpectedly with code 0
>
>  <<< ================================

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 test/zdtm/static/fpu03.desc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test/zdtm/static/fpu03.desc

diff --git a/test/zdtm/static/fpu03.desc b/test/zdtm/static/fpu03.desc
new file mode 100644
index 000000000..d2f501de2
--- /dev/null
+++ b/test/zdtm/static/fpu03.desc
@@ -0,0 +1 @@
+{'arch': 'x86_64'}

From bb5bad532664c8ce360fe64ca7b34fc7c69ce2a1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 4 Mar 2021 17:41:06 +0000
Subject: [PATCH 0531/1854] test: move vt test to minor 65 on s390x

Our Jenkins s390x vt test fails with

./vt --pidfile=vt.pid --outfile=vt.out --filename=vt.test
make: *** [Makefile:432: vt.pid] Error 1
 Test zdtm/static/vt FAIL at ['make', '--no-print-directory', '-C', 'zdtm/static', 'vt.pid']
Test output: ================================
08:08:15.556:    54: ERR: vt.c:38: Open virtual terminal vt.test failed (errno = 6 (No such device or address))
08:08:15.556:    53: ERR: test.c:316: Test exited unexpectedly with code 1

Because the host has no ttyS0 as used previously. This changes the test
to use 'ttysclp0'. That seems to exist on multiple s390x we checked.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/vt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/vt.c b/test/zdtm/static/vt.c
index 0d843c4cf..6c96fceba 100644
--- a/test/zdtm/static/vt.c
+++ b/test/zdtm/static/vt.c
@@ -16,7 +16,7 @@ char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
 #ifdef __s390x__
-#define MINOR	64 /* ttyS0 */
+#define MINOR	65 /* ttysclp0 */
 #else
 #define MINOR	5
 #endif

From 7e6a1a7011b404fbf0108b062bda118e9a696b60 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 1 Mar 2021 10:55:18 +0300
Subject: [PATCH 0532/1854] pstree: check for pid collision before switching to
 new sid/gid

Without this check we can hit the BUG in lookup_create_item just a few
steps later (if one thread in images has same pid with new sid/gid). And
also this check saves us from different sorts of unexpected errors on
restore (if one non-thread task in images has same pid/sid/gid already).

Fixes: #1332
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pstree.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/criu/pstree.c b/criu/pstree.c
index 533f6c064..e2c130de3 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -339,6 +339,7 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 	pid_t current_gid = getpgid(pid);
 
 	struct pstree_item *pi;
+	struct pid *tmp;
 
 	pid_t old_sid;
 	pid_t old_gid;
@@ -371,6 +372,13 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 	pr_info("Migrating process tree (SID %d->%d)\n",
 		old_sid, current_sid);
 
+	tmp = pstree_pid_by_virt(current_sid);
+	if (tmp) {
+		pr_err("Current sid %d intersects with pid (%d) in images",
+		       current_sid, tmp->state);
+		return -1;
+	}
+
 	for_each_pstree_item(pi) {
 		if (pi->sid == old_sid)
 			pi->sid = current_sid;
@@ -384,6 +392,13 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 		pr_info("Migrating process tree (GID %d->%d)\n",
 			old_gid, current_gid);
 
+		tmp = pstree_pid_by_virt(current_gid);
+		if (tmp) {
+			pr_err("Current gid %d intersects with pid (%d) in images",
+			       current_gid, tmp->state);
+			return -1;
+		}
+
 		for_each_pstree_item(pi) {
 			if (pi->pgid == old_gid)
 				pi->pgid = current_gid;

From 25f37808306d90e7337086d5769c0bd1ec9d891a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 3 Feb 2021 23:01:18 +0000
Subject: [PATCH 0533/1854] ci: move Travis CI Docker tests to GitHub Actions

Travis CI is no longer providing CI minutes for open source projects.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/docker-test.yml | 14 ++++++++++++++
 .travis.yml                       | 13 -------------
 scripts/ci/docker-test.sh         | 12 ++++--------
 3 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/docker-test.yml

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
new file mode 100644
index 000000000..701b646fb
--- /dev/null
+++ b/.github/workflows/docker-test.yml
@@ -0,0 +1,14 @@
+name: Docker Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Docker Test (${{ matrix.os }})
+      run: sudo make -C scripts/ci docker-test
diff --git a/.travis.yml b/.travis.yml
index b9b5c643a..02180ce49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,19 +30,6 @@ jobs:
       group: edge
       virt: vm
       dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=docker-test
-      dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=docker-test DIST=xenial
-      # On xenial it should be possible to test overlayfs;
-      # broken on the latest bionic kernel
-      dist: xenial
-  allow_failures:
-    - env: TR_ARCH=docker-test
-    - env: TR_ARCH=docker-test DIST=xenial
 script:
   - sudo make CCACHE=1 -C scripts/ci $TR_ARCH
 after_success:
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index e42e96569..68edfb36b 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,14 +21,10 @@ add-apt-repository \
 
 . /etc/lsb-release
 
-if [ "$DISTRIB_RELEASE" = "18.04" ]; then
-    # overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU
-    # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
-    # Switch to devicemapper
-    echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
-else
-    echo '{ "experimental": true }' > /etc/docker/daemon.json
-fi
+# overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU
+# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
+# Switch to devicemapper
+echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
 
 service docker restart
 

From 046cad8bf09e7174fa8a6eee7619136242de1042 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 3 Feb 2021 23:33:06 +0000
Subject: [PATCH 0534/1854] docker-test: use containerd v1.5.0-beta.0

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 68edfb36b..0af45a19e 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -26,6 +26,11 @@ add-apt-repository \
 # Switch to devicemapper
 echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
 
+service docker stop
+
+# Restore with containerd versions after v1.2.14 and before v1.5.0-beta.0 is broken.
+wget -nv https://github.com/containerd/containerd/releases/download/v1.5.0-beta.0/containerd-1.5.0-beta.0-linux-amd64.tar.gz -O - | tar -xz -C /usr/bin/
+
 service docker restart
 
 export SKIP_CI_TEST=1

From a433943a7fc1bfe8b5041c10802536117e15d52f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 3 Feb 2021 23:48:26 +0000
Subject: [PATCH 0535/1854] docker-test: set log file path

By default docker writes logs in a run-time directory unique for each
container. To be able to read this file, we can specify the path in
CRIU's configuration file for runc.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 0af45a19e..466a2c4c7 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -26,6 +26,10 @@ add-apt-repository \
 # Switch to devicemapper
 echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
 
+CRIU_LOG='/criu.log'
+mkdir -p /etc/criu
+echo "log-file=$CRIU_LOG" > /etc/criu/runc.conf
+
 service docker stop
 
 # Restore with containerd versions after v1.2.14 and before v1.5.0-beta.0 is broken.
@@ -62,7 +66,7 @@ for i in $(seq 50); do
 	docker start --checkpoint checkpoint"$i" cr 2>&1 | tee log || {
 	cat "$(grep log 'log file:' | sed 's/log file:\s*//')" || true
 		docker logs cr || true
-		cat /tmp/zdtm-core-* || true
+		cat $CRIU_LOG || true
 		dmesg
 		docker ps
 		exit 1

From ed0f4608f48615dd5146452324083fa0b66ae9df Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Wed, 3 Mar 2021 23:33:44 +0000
Subject: [PATCH 0536/1854] lib/cli.py: Open out file as a binary

python3 fails to encode image with the following:

> [dima@Mindolluin criu]$ ./crit/crit encode -i tmp -o tmp.1
> Traceback (most recent call last):
>   File "/home/dima/src/criu/./crit/crit", line 6, in <module>
>     cli.main()
>   File "/home/dima/src/criu/crit/pycriu/cli.py", line 410, in main
>     opts["func"](opts)
>   File "/home/dima/src/criu/crit/pycriu/cli.py", line 50, in encode
>     pycriu.images.dump(img, outf(opts))
>   File "/home/dima/src/criu/crit/pycriu/images/images.py", line 617, in dump
>     f.write(struct.pack('i', magic.by_name['IMG_COMMON']))
> TypeError: write() argument must be str, not bytes

Opening the output file as binary seems to help.

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 lib/py/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index 94cc2f947..df96729e2 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -16,7 +16,7 @@ def inf(opts):
 
 def outf(opts):
     if opts['out']:
-        return open(opts['out'], 'w+')
+        return open(opts['out'], 'wb+')
     else:
         return sys.stdout
 

From c84dddf2f281cfe5b45f4c69a91efe5a53739123 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 10 Mar 2021 15:59:00 +0000
Subject: [PATCH 0537/1854] ci: remove '-Wl,-z,now' workaround

This removes extending LDFLAGS with '-Wl,-z,now'. This was added as
workaround but never really worked. It is correctly fixed with
pull request #1379

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index b568ff43f..0a01f4ce8 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -136,12 +136,6 @@ if [ "${CD_TO_TOP}" = "1" ]; then
 	cd ../../
 fi
 
-if [ "$CLANG" = "1" ]; then
-	# Needed for clang on Circle CI
-	LDFLAGS="$LDFLAGS -Wl,-z,now"
-	export LDFLAGS
-fi
-
 export GCOV CC
 $CC --version
 time make CC="$CC" -j4 V=1

From 71013465b8907d5f0f67ef0c8caba9784ec431a3 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 10 Mar 2021 14:57:00 +0000
Subject: [PATCH 0538/1854] lib: fix recode errors seen in Jenkins

Although we are running crit-recode.py also in all CI runs we never seen
following error except in Jenkins:

Traceback (most recent call last):
  File "/usr/lib/python3.8/base64.py", line 510, in _input_type_check
    m = memoryview(s)
TypeError: memoryview: a bytes-like object is required, not 'str'

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "./test/crit-recode.py", line 25, in recode_and_check
    r_img = pycriu.images.dumps(pb)
  File "/var/lib/jenkins/workspace/Q/test/pycriu/images/images.py", line 635, in dumps
    dump(img, f)
  File "/var/lib/jenkins/workspace/Q/test/pycriu/images/images.py", line 626, in dump
    handler.dump(img['entries'], f)
  File "/var/lib/jenkins/workspace/Q/test/pycriu/images/images.py", line 289, in dump
    f.write(base64.decodebytes(item['extra']))
  File "/usr/lib/python3.8/base64.py", line 545, in decodebytes
    _input_type_check(s)
  File "/usr/lib/python3.8/base64.py", line 513, in _input_type_check
    raise TypeError(msg) from err
TypeError: expected bytes-like object, not str

This commit fixes this by encoding the string to bytes.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py  | 4 ++--
 lib/py/images/pb2dict.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index b4b55c910..85497bdca 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -284,9 +284,9 @@ class ghost_file_handler:
                 size = len(pb_str)
                 f.write(struct.pack('i', size))
                 f.write(pb_str)
-                f.write(base64.decodebytes(item['extra']))
+                f.write(base64.decodebytes(str.encode(item['extra'])))
         else:
-            f.write(base64.decodebytes(item['extra']))
+            f.write(base64.decodebytes(str.encode(item['extra'])))
 
     def dumps(self, entries):
         f = io.BytesIO('')
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index eecdc0522..068d583dc 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -246,11 +246,11 @@ def encode_dev(field, value):
 
 
 def encode_base64(value):
-    return base64.encodebytes(value)
+    return base64.encodebytes(value).decode()
 
 
 def decode_base64(value):
-    return base64.decodebytes(value)
+    return base64.decodebytes(str.encode(value))
 
 
 def encode_unix(value):

From 2e0107ead833f4b6c1865275b819693e92978d63 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 10 Mar 2021 15:42:29 +0000
Subject: [PATCH 0539/1854] ci: run recode tests on more input files

We were running crit-recode in CI only on the output of
zdtm/static/env00.

This adds zdtm/transition/fork and zdtm/static/ghost_holes00
to run through crit-recode as the image files from those test
triggered errors in Jenkins we did not see in CI.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 0a01f4ce8..06d6810d7 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -275,7 +275,7 @@ ip net add test
 
 ./test/zdtm.py run --empty-ns -T zdtm/static/socket-tcp*-local --iter 2
 
-./test/zdtm.py run -t zdtm/static/env00 -k always
+./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -k always
 ./test/crit-recode.py
 
 # libcriu testing

From 288adfc591103aa7e50ee1c0944d8ae7d4ecf291 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 10 Mar 2021 07:47:37 +0000
Subject: [PATCH 0540/1854] ci: remove ccache setup

ccache was set up in Travis to speed up compilation by re-using the
.ccache directory from previous CI runs. As we are no longer using
Travis we can remove all CI related ccache setup.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .travis.yml                              |  4 +---
 scripts/build/Dockerfile.alpine          |  6 ++----
 scripts/build/Dockerfile.centos7         |  6 ++----
 scripts/build/Dockerfile.centos8         |  6 ++----
 scripts/build/Dockerfile.fedora.tmpl     |  5 ++---
 scripts/build/Dockerfile.linux32.tmpl    |  6 ++----
 scripts/build/Dockerfile.openj9-alpine   |  1 -
 scripts/build/Dockerfile.tmpl            |  6 ++----
 scripts/build/Makefile                   |  6 +-----
 scripts/ci/prepare-for-fedora-rawhide.sh |  1 -
 scripts/ci/run-ci-tests.sh               | 14 +-------------
 11 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02180ce49..94841b3f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: c
 os: linux
 dist: bionic
-cache: ccache
 services:
   - docker
 jobs:
@@ -31,7 +30,6 @@ jobs:
       virt: vm
       dist: bionic
 script:
-  - sudo make CCACHE=1 -C scripts/ci $TR_ARCH
+  - sudo make -C scripts/ci $TR_ARCH
 after_success:
-  - ccache -s
   - make -C scripts/ci after_success
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index dbf3c2bf1..058b46ad6 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -6,7 +6,6 @@ RUN apk update && apk add \
 	$CC \
 	bash \
 	build-base \
-	ccache \
 	coreutils \
 	git \
 	gnutls-dev \
@@ -26,9 +25,8 @@ RUN apk update && apk add \
 
 COPY . /criu
 WORKDIR /criu
-ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
-RUN mv .ccache /tmp && make mrproper && ccache -sz && \
-	date && make -j $(nproc) CC="$CC" && date && ccache -s
+ENV $ENV1=yes
+RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 RUN apk add \
 	ip6tables \
diff --git a/scripts/build/Dockerfile.centos7 b/scripts/build/Dockerfile.centos7
index 213be694f..d10ec48e1 100644
--- a/scripts/build/Dockerfile.centos7
+++ b/scripts/build/Dockerfile.centos7
@@ -5,7 +5,6 @@ ARG ENV1=FOOBAR
 
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 RUN yum install -y \
-	ccache \
 	findutils \
 	gcc \
 	git \
@@ -39,9 +38,8 @@ RUN yum install -y \
 COPY . /criu
 WORKDIR /criu
 
-ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
-RUN mv .ccache /tmp && make mrproper && ccache -sz  && \
-	date && make -j $(nproc) CC="$CC" && date && ccache -s
+ENV $ENV1=yes
+RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 test
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
index e3aabbe59..ff6c15f7f 100644
--- a/scripts/build/Dockerfile.centos8
+++ b/scripts/build/Dockerfile.centos8
@@ -7,7 +7,6 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.n
 RUN yum config-manager --set-enabled powertools
 RUN yum install -y --allowerasing \
 	asciidoc \
-	ccache \
 	coreutils \
 	chkconfig \
 	diffutils \
@@ -44,9 +43,8 @@ ENV PYTHON=python3
 COPY . /criu
 WORKDIR /criu
 
-ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
-RUN mv .ccache /tmp && make mrproper && ccache -sz  && \
-	date && make -j $(nproc) CC="$CC" && date && ccache -s
+ENV $ENV1=yes
+RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 test
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 918849a7b..2ee20ae38 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -7,9 +7,8 @@ RUN /bin/prepare-for-fedora-rawhide.sh
 COPY . /criu
 WORKDIR /criu
 
-ENV CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
-RUN mv .ccache /tmp && make mrproper && ccache -sz  && \
-	date && make -j $(nproc) CC="$CC" && date && ccache -s
+ENV $ENV1=yes
+RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 test
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index 49eaeb3b2..cf26b2756 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -4,7 +4,6 @@ ARG ENV1=FOOBAR
 COPY scripts/ci/apt-install /bin/apt-install
 
 RUN apt-install \
-	ccache \
 	libnet-dev \
 	libnl-route-3-dev \
 	$CC \
@@ -28,12 +27,11 @@ RUN apt-install \
 
 COPY . /criu
 WORKDIR /criu
-ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
+ENV $ENV1=yes
 
 RUN uname -m && setarch linux32 uname -m && setarch --list
 
-RUN mv .ccache /tmp && make mrproper && ccache -s && \
-	date && \
+RUN make mrproper && date && \
 # Check single object build
 	setarch linux32 make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
 # Compile criu
diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
index 873284f44..5f2f08df4 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -3,7 +3,6 @@ FROM adoptopenjdk/openjdk8-openj9:alpine
 RUN apk update && apk add \
 	bash \
 	build-base \
-	ccache \
 	coreutils \
 	git \
 	gnutls-dev \
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 0cb6de3db..c25979624 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -4,7 +4,6 @@ ARG ENV1=FOOBAR
 COPY scripts/ci/apt-install /bin/apt-install
 
 RUN apt-install \
-	ccache \
 	libnet-dev \
 	libnl-route-3-dev \
 	$CC \
@@ -30,10 +29,9 @@ RUN apt-install \
 
 COPY . /criu
 WORKDIR /criu
-ENV CC="ccache $CC" CCACHE_DIR=/tmp/.ccache CCACHE_NOCOMPRESS=1 $ENV1=yes
+ENV $ENV1=yes
 
-RUN mv .ccache /tmp && make mrproper && ccache -s && \
-	date && \
+RUN make mrproper && date && \
 # Check single object build
 	make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
 # Compile criu
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 85bbf2010..b6c6477f3 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -19,10 +19,7 @@ Dockerfile.%: Dockerfile.%.hdr Dockerfile.%.tmpl
 	cat $^ > $@
 
 $(TARGETS):
-	mkdir -p $(HOME)/.ccache
-	mv $(HOME)/.ccache ../../
-	$(CONTAINER_RUNTIME) build  -t criu-$@ -f Dockerfile.$@ $(DB_CC) $(DB_ENV) ../..
-	$(CONTAINER_RUNTIME) run criu-$@ tar c -C /tmp .ccache | tar x -C $(HOME)
+	$(CONTAINER_RUNTIME) build  -t criu-$@ -f Dockerfile.$@ $(DB_CC) ../..
 .PHONY: $(TARGETS)
 
 # Clang builds add some Docker build env
@@ -32,6 +29,5 @@ endef
 $(foreach t,$(TARGETS),$(eval $(call CLANG_DEP,$(t))))
 
 %-clang:	DB_CC=--build-arg CC=clang
-%-clang:	DB_ENV=--build-arg ENV1=CCACHE_CPP2
 s390x-clang:	DB_CC=--build-arg CC=clang-3.8
 .PHONY: $(TARGETS_CLANG)
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index 3ce991dc4..e5900e563 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -2,7 +2,6 @@
 set -e -x
 
 dnf install -y \
-	ccache \
 	diffutils \
 	findutils \
 	gcc \
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 06d6810d7..ad897a340 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -4,7 +4,7 @@ set -x -e
 CI_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
-		libnl-route-3-dev time ccache flake8 libbsd-dev
+		libnl-route-3-dev time flake8 libbsd-dev
 		libperl-dev pkg-config"
 
 
@@ -64,16 +64,6 @@ ci_prep () {
 	fi
 	CI_PKGS="$CI_PKGS $CC"
 
-	# ccache support, only enable for non-GCOV case
-	if [ "$CCACHE" = "1" ] && [ -z "$GCOV" ]; then
-		# ccache is installed by default, need to set it up
-		export CCACHE_DIR=$HOME/.ccache
-		[ "$CC" = "clang" ] && export CCACHE_CPP2=yes
-		# uncomment the following to get detailed ccache logs
-		#export CCACHE_LOGFILE=$HOME/ccache.log
-		CC="ccache $CC"
-	fi
-
 	# Do not install x86_64 specific packages on other architectures
 	if [ "$UNAME_M" = "x86_64" ]; then
 		CI_PKGS="$CI_PKGS $X86_64_PKGS"
@@ -189,8 +179,6 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	file test/zdtm/static/env00 | grep 'ELF 32-bit' -q
 fi
 
-[ -f "$CCACHE_LOGFILE" ] && cat "$CCACHE_LOGFILE"
-
 # umask has to be called before a first criu run, so that .gcda (coverage data)
 # files are created with read-write permissions for all.
 umask 0000

From f3d071461f350ac5eb04a568e48c5d9877ce87ac Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 22 Jan 2021 01:08:59 +0200
Subject: [PATCH 0541/1854] ci: run zdtm/transition/pid_reuse with pre-dumps in
 ci tests

This test should be run with at least 1 pre-dump to trigger the problem as mentioned in commit 4d9bf608b59b6e323f346b0beb956b02ecbef294.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 scripts/ci/run-ci-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index ad897a340..61413cc39 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -251,6 +251,8 @@ make -C test/others/rpc/ run
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server --dedup
 
+./test/zdtm.py run -t zdtm/transition/pid_reuse --pre 2
+
 ./test/zdtm.py run -t zdtm/static/socket-tcp-local --norst
 
 ip net add test

From 8f69a58e03c74fbd49c3f97b0fb786cd7d9e0fb2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Dec 2020 20:12:44 +0000
Subject: [PATCH 0542/1854] criu-ns: Convert indentation to spaces

Spaces are the preferred indentation method.
https://www.python.org/dev/peps/pep-0008/#tabs-or-spaces

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 254 ++++++++++++++++++++++++------------------------
 1 file changed, 127 insertions(+), 127 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 05635b160..5f8e17be0 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -18,190 +18,190 @@ MS_SLAVE = 1 << 19
 _libc = ctypes.CDLL(ctypes.util.find_library("c"), use_errno=True)
 
 try:
-	_unshare = _libc.unshare
+    _unshare = _libc.unshare
 except AttributeError:
-	raise OSError(errno.EINVAL, "unshare is not supported on this platform")
+    raise OSError(errno.EINVAL, "unshare is not supported on this platform")
 else:
-	_unshare.argtypes = [ ctypes.c_int ]
-	_unshare.restype = ctypes.c_int
+    _unshare.argtypes = [ ctypes.c_int ]
+    _unshare.restype = ctypes.c_int
 
 try:
-	_setns = _libc.setns
+    _setns = _libc.setns
 except AttributeError:
-	raise OSError(errno.EINVAL, "setns is not supported on this platform")
+    raise OSError(errno.EINVAL, "setns is not supported on this platform")
 else:
-	_setns.argtypes = [ ctypes.c_int, ctypes.c_int ]
-	_setns.restype = ctypes.c_int
+    _setns.argtypes = [ ctypes.c_int, ctypes.c_int ]
+    _setns.restype = ctypes.c_int
 
 try:
-	_mount = _libc.mount
+    _mount = _libc.mount
 except AttributeError:
-	raise OSError(errno.EINVAL, "mount is not supported on this platform")
+    raise OSError(errno.EINVAL, "mount is not supported on this platform")
 else:
-	_mount.argtypes = [
-		ctypes.c_char_p,
-		ctypes.c_char_p,
-		ctypes.c_char_p,
-		ctypes.c_ulong,
-		ctypes.c_void_p
-	]
-	_mount.restype = ctypes.c_int
+    _mount.argtypes = [
+        ctypes.c_char_p,
+        ctypes.c_char_p,
+        ctypes.c_char_p,
+        ctypes.c_ulong,
+        ctypes.c_void_p
+    ]
+    _mount.restype = ctypes.c_int
 
 try:
-	_umount = _libc.umount
+    _umount = _libc.umount
 except AttributeError:
-	raise OSError(errno.EINVAL, "umount is not supported on this platform")
+    raise OSError(errno.EINVAL, "umount is not supported on this platform")
 else:
-	_umount.argtypes = [ctypes.c_char]
-	_umount.restype = ctypes.c_int
+    _umount.argtypes = [ctypes.c_char]
+    _umount.restype = ctypes.c_int
 
 
 def run_criu():
-	print(sys.argv)
-	os.execlp('criu', *['criu'] + sys.argv[1:])
+    print(sys.argv)
+    os.execlp('criu', *['criu'] + sys.argv[1:])
 
 
 def wrap_restore():
-	# Unshare pid and mount namespaces
-	if _unshare(CLONE_NEWNS | CLONE_NEWPID) != 0:
-		_errno = ctypes.get_errno()
-		raise OSError(_errno, errno.errorcode[_errno])
+    # Unshare pid and mount namespaces
+    if _unshare(CLONE_NEWNS | CLONE_NEWPID) != 0:
+        _errno = ctypes.get_errno()
+        raise OSError(_errno, errno.errorcode[_errno])
 
-	criu_pid = os.fork()
-	if criu_pid == 0:
-		# Mount new /proc
-		if _mount(None, b"/", None, MS_SLAVE|MS_REC, None) != 0:
-			_errno = ctypes.get_errno()
-			raise OSError(_errno, errno.errorcode[_errno])
+    criu_pid = os.fork()
+    if criu_pid == 0:
+        # Mount new /proc
+        if _mount(None, b"/", None, MS_SLAVE|MS_REC, None) != 0:
+            _errno = ctypes.get_errno()
+            raise OSError(_errno, errno.errorcode[_errno])
 
-		if _mount(b'proc', b'/proc', b'proc', 0, None) != 0:
-			_errno = ctypes.get_errno()
-			raise OSError(_errno, errno.errorcode[_errno])
+        if _mount(b'proc', b'/proc', b'proc', 0, None) != 0:
+            _errno = ctypes.get_errno()
+            raise OSError(_errno, errno.errorcode[_errno])
 
-		# Spawn CRIU binary
-		run_criu()
-		raise OSError(errno.ENOENT, "No such command")
+        # Spawn CRIU binary
+        run_criu()
+        raise OSError(errno.ENOENT, "No such command")
 
-	# Wait for CRIU to exit and report the status back
-	while True:
-		try:
-			(pid, status) = os.wait()
-			if pid == criu_pid:
-				status = os.WEXITSTATUS(status)
-				break
-		except OSError:
-			status = -251
-			break
+    # Wait for CRIU to exit and report the status back
+    while True:
+        try:
+            (pid, status) = os.wait()
+            if pid == criu_pid:
+                status = os.WEXITSTATUS(status)
+                break
+        except OSError:
+            status = -251
+            break
 
-	return status
+    return status
 
 
 def get_varg(args):
-	for i in range(1, len(sys.argv)):
-		if not sys.argv[i] in args:
-			continue
+    for i in range(1, len(sys.argv)):
+        if not sys.argv[i] in args:
+            continue
 
-		if i + 1 >= len(sys.argv):
-			break
+        if i + 1 >= len(sys.argv):
+            break
 
-		return (sys.argv[i + 1], i + 1)
+        return (sys.argv[i + 1], i + 1)
 
-	return (None, None)
+    return (None, None)
 
 
 
 def set_pidns(tpid, pid_idx):
-	# Joind pid namespace. Note, that the given pid should
-	# be changed in -t option, as task lives in different
-	# pid namespace.
+    # Joind pid namespace. Note, that the given pid should
+    # be changed in -t option, as task lives in different
+    # pid namespace.
 
-	myns = os.stat('/proc/self/ns/pid').st_ino
+    myns = os.stat('/proc/self/ns/pid').st_ino
 
-	ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
-	if myns != os.fstat(ns_fd).st_ino:
+    ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
+    if myns != os.fstat(ns_fd).st_ino:
 
-		for l in open('/proc/%s/status' % tpid):
-			if not l.startswith('NSpid:'):
-				continue
+        for l in open('/proc/%s/status' % tpid):
+            if not l.startswith('NSpid:'):
+                continue
 
-			ls = l.split()
-			if ls[1] != tpid:
-				raise OSError(errno.ESRCH, 'No such pid')
+            ls = l.split()
+            if ls[1] != tpid:
+                raise OSError(errno.ESRCH, 'No such pid')
 
-			print('Replace pid {} with {}'.format(tpid, ls[2]))
-			sys.argv[pid_idx] = ls[2]
-			break
-		else:
-			raise OSError(errno.ENOENT, 'Cannot find NSpid field in proc')
+            print('Replace pid {} with {}'.format(tpid, ls[2]))
+            sys.argv[pid_idx] = ls[2]
+            break
+        else:
+            raise OSError(errno.ENOENT, 'Cannot find NSpid field in proc')
 
-		if _setns(ns_fd, 0) != 0:
-			_errno = ctypes.get_errno()
-			raise OSError(_errno, errno.errorcode[_errno])
+        if _setns(ns_fd, 0) != 0:
+            _errno = ctypes.get_errno()
+            raise OSError(_errno, errno.errorcode[_errno])
 
-	os.close(ns_fd)
+    os.close(ns_fd)
 
 
 def set_mntns(tpid):
-	# Join mount namespace. Trick here too -- check / and .
-	# will be the same in target mntns.
+    # Join mount namespace. Trick here too -- check / and .
+    # will be the same in target mntns.
 
-	myns = os.stat('/proc/self/ns/mnt').st_ino
-	ns_fd = os.open('/proc/%s/ns/mnt' % tpid, os.O_RDONLY)
-	if myns != os.fstat(ns_fd).st_ino:
-		root_st = os.stat('/')
-		cwd_st = os.stat('.')
-		cwd_path = os.path.realpath('.')
+    myns = os.stat('/proc/self/ns/mnt').st_ino
+    ns_fd = os.open('/proc/%s/ns/mnt' % tpid, os.O_RDONLY)
+    if myns != os.fstat(ns_fd).st_ino:
+        root_st = os.stat('/')
+        cwd_st = os.stat('.')
+        cwd_path = os.path.realpath('.')
 
-		if _setns(ns_fd, 0) != 0:
-			_errno = ctypes.get_errno()
-			raise OSError(_errno, errno.errorcode[_errno])
+        if _setns(ns_fd, 0) != 0:
+            _errno = ctypes.get_errno()
+            raise OSError(_errno, errno.errorcode[_errno])
 
-		os.chdir(cwd_path)
-		root_nst = os.stat('/')
-		cwd_nst = os.stat('.')
+        os.chdir(cwd_path)
+        root_nst = os.stat('/')
+        cwd_nst = os.stat('.')
 
-		def steq(st, nst):
-			return (st.st_dev, st.st_ino) == (nst.st_dev, nst.st_ino)
+        def steq(st, nst):
+            return (st.st_dev, st.st_ino) == (nst.st_dev, nst.st_ino)
 
-		if not steq(root_st, root_nst):
-			raise OSError(errno.EXDEV, 'Target ns / is not as current')
-		if not steq(cwd_st, cwd_nst):
-			raise OSError(errno.EXDEV, 'Target ns . is not as current')
+        if not steq(root_st, root_nst):
+            raise OSError(errno.EXDEV, 'Target ns / is not as current')
+        if not steq(cwd_st, cwd_nst):
+            raise OSError(errno.EXDEV, 'Target ns . is not as current')
 
 
-	os.close(ns_fd)
+    os.close(ns_fd)
 
 
 def wrap_dump():
-	(pid, pid_idx) = get_varg(('-t', '--tree'))
-	if pid is None:
-		raise OSError(errno.EINVAL, 'No --tree option given')
+    (pid, pid_idx) = get_varg(('-t', '--tree'))
+    if pid is None:
+        raise OSError(errno.EINVAL, 'No --tree option given')
 
-	set_pidns(pid, pid_idx)
-	set_mntns(pid)
+    set_pidns(pid, pid_idx)
+    set_mntns(pid)
 
-	# Spawn CRIU binary
-	criu_pid = os.fork()
-	if criu_pid == 0:
-		run_criu()
-		raise OSError(errno.ENOENT, "No such command")
+    # Spawn CRIU binary
+    criu_pid = os.fork()
+    if criu_pid == 0:
+        run_criu()
+        raise OSError(errno.ENOENT, "No such command")
 
-	# Wait for CRIU to exit and report the status back
-	while True:
-		try:
-			(pid, status) = os.wait()
-			if pid == criu_pid:
-				status = os.WEXITSTATUS(status)
-				break
-		except OSError:
-			status = -251
-			break
+    # Wait for CRIU to exit and report the status back
+    while True:
+        try:
+            (pid, status) = os.wait()
+            if pid == criu_pid:
+                status = os.WEXITSTATUS(status)
+                break
+        except OSError:
+            status = -251
+            break
 
-	return status
+    return status
 
 
 if len(sys.argv) == 1:
-	print("""
+    print("""
 Usage:
   {0} dump|pre-dump -t PID [<options>]
   {0} restore [<options>]
@@ -210,16 +210,16 @@ Usage:
   pre-dump       pre-dump task(s) minimizing their frozen time
   restore        restore a process/tree
 """.format(sys.argv[0]))
-	exit(1)
+    exit(1)
 
 action = sys.argv[1]
 
 if action == 'restore':
-	res = wrap_restore()
+    res = wrap_restore()
 elif action == 'dump' or action == 'pre-dump':
-	res = wrap_dump()
+    res = wrap_dump()
 else:
-	print('Unsupported action {} for nswrap'.format(action))
-	res = -1
+    print('Unsupported action {} for nswrap'.format(action))
+    res = -1
 
 sys.exit(res)

From a0a02c73e727ea6280eb061976e1b75837685e4f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Dec 2020 20:15:05 +0000
Subject: [PATCH 0543/1854] criu-ns: Remove space before/after bracket

Avoid extraneous whitespace.
https://python.org/dev/peps/pep-0008/#whitespace-in-expressions-and-statements

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 5f8e17be0..de9308035 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -22,7 +22,7 @@ try:
 except AttributeError:
     raise OSError(errno.EINVAL, "unshare is not supported on this platform")
 else:
-    _unshare.argtypes = [ ctypes.c_int ]
+    _unshare.argtypes = [ctypes.c_int]
     _unshare.restype = ctypes.c_int
 
 try:
@@ -30,7 +30,7 @@ try:
 except AttributeError:
     raise OSError(errno.EINVAL, "setns is not supported on this platform")
 else:
-    _setns.argtypes = [ ctypes.c_int, ctypes.c_int ]
+    _setns.argtypes = [ctypes.c_int, ctypes.c_int]
     _setns.restype = ctypes.c_int
 
 try:

From a08aa44064dcadfed48383a08d0e73ad22f01386 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Dec 2020 20:25:47 +0000
Subject: [PATCH 0544/1854] criu-ns: Extract mount new /proc into a function

By extracting this code into a function the main code becomes
smaller and more obvious.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index de9308035..89e52c9ab 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -56,6 +56,18 @@ else:
     _umount.restype = ctypes.c_int
 
 
+def _mount_new_proc():
+    """
+    Mount new /proc filesystem.
+    """
+    if _mount(None, b"/", None, MS_SLAVE|MS_REC, None):
+        _errno = ctypes.get_errno()
+        raise OSError(_errno, errno.errorcode[_errno])
+    if _mount(b'proc', b'/proc', b'proc', 0, None):
+        _errno = ctypes.get_errno()
+        raise OSError(_errno, errno.errorcode[_errno])
+
+
 def run_criu():
     print(sys.argv)
     os.execlp('criu', *['criu'] + sys.argv[1:])
@@ -69,14 +81,7 @@ def wrap_restore():
 
     criu_pid = os.fork()
     if criu_pid == 0:
-        # Mount new /proc
-        if _mount(None, b"/", None, MS_SLAVE|MS_REC, None) != 0:
-            _errno = ctypes.get_errno()
-            raise OSError(_errno, errno.errorcode[_errno])
-
-        if _mount(b'proc', b'/proc', b'proc', 0, None) != 0:
-            _errno = ctypes.get_errno()
-            raise OSError(_errno, errno.errorcode[_errno])
+        _mount_new_proc()
 
         # Spawn CRIU binary
         run_criu()

From f8556f947fd582f39dfc6ef43051453ecec77481 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Dec 2020 20:31:50 +0000
Subject: [PATCH 0545/1854] criu-ns: Extract wait for process into a function

Reduce duplication of code.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 89e52c9ab..183f4485b 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -68,6 +68,19 @@ def _mount_new_proc():
         raise OSError(_errno, errno.errorcode[_errno])
 
 
+def _wait_for_process_status(criu_pid):
+    """
+    Wait for CRIU to exit and report the status back.
+    """
+    while True:
+        try:
+            (pid, status) = os.wait()
+            if pid == criu_pid:
+                return os.WEXITSTATUS(status)
+        except OSError:
+            return -251
+
+
 def run_criu():
     print(sys.argv)
     os.execlp('criu', *['criu'] + sys.argv[1:])
@@ -87,18 +100,7 @@ def wrap_restore():
         run_criu()
         raise OSError(errno.ENOENT, "No such command")
 
-    # Wait for CRIU to exit and report the status back
-    while True:
-        try:
-            (pid, status) = os.wait()
-            if pid == criu_pid:
-                status = os.WEXITSTATUS(status)
-                break
-        except OSError:
-            status = -251
-            break
-
-    return status
+    return _wait_for_process_status(criu_pid)
 
 
 def get_varg(args):
@@ -191,18 +193,7 @@ def wrap_dump():
         run_criu()
         raise OSError(errno.ENOENT, "No such command")
 
-    # Wait for CRIU to exit and report the status back
-    while True:
-        try:
-            (pid, status) = os.wait()
-            if pid == criu_pid:
-                status = os.WEXITSTATUS(status)
-                break
-        except OSError:
-            status = -251
-            break
-
-    return status
+    return _wait_for_process_status(pid)
 
 
 if len(sys.argv) == 1:

From 6fd59abc8fa0712ec2165b6f7f826ba15ab2686f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Dec 2020 20:50:18 +0000
Subject: [PATCH 0546/1854] criu-ns: Use documentation strings

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 183f4485b..7cbf0b141 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -82,6 +82,9 @@ def _wait_for_process_status(criu_pid):
 
 
 def run_criu():
+    """
+    Spawn CRIU binary
+    """
     print(sys.argv)
     os.execlp('criu', *['criu'] + sys.argv[1:])
 
@@ -96,7 +99,6 @@ def wrap_restore():
     if criu_pid == 0:
         _mount_new_proc()
 
-        # Spawn CRIU binary
         run_criu()
         raise OSError(errno.ENOENT, "No such command")
 
@@ -118,12 +120,12 @@ def get_varg(args):
 
 
 def set_pidns(tpid, pid_idx):
-    # Joind pid namespace. Note, that the given pid should
-    # be changed in -t option, as task lives in different
-    # pid namespace.
-
+    """
+    Join pid namespace. Note, that the given pid should
+    be changed in -t option, as task lives in different
+    pid namespace.
+    """
     myns = os.stat('/proc/self/ns/pid').st_ino
-
     ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
     if myns != os.fstat(ns_fd).st_ino:
 
@@ -149,9 +151,10 @@ def set_pidns(tpid, pid_idx):
 
 
 def set_mntns(tpid):
-    # Join mount namespace. Trick here too -- check / and .
-    # will be the same in target mntns.
-
+    """
+    Join mount namespace. Trick here too -- check / and .
+    will be the same in target mntns.
+    """
     myns = os.stat('/proc/self/ns/mnt').st_ino
     ns_fd = os.open('/proc/%s/ns/mnt' % tpid, os.O_RDONLY)
     if myns != os.fstat(ns_fd).st_ino:
@@ -187,7 +190,6 @@ def wrap_dump():
     set_pidns(pid, pid_idx)
     set_mntns(pid)
 
-    # Spawn CRIU binary
     criu_pid = os.fork()
     if criu_pid == 0:
         run_criu()

From a80f08c2e752b56ed724852df67e66c989d8bdd0 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 21 Dec 2020 20:59:45 +0000
Subject: [PATCH 0547/1854] criu-ns: Remove unused _umount

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 7cbf0b141..7808b02cc 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -47,14 +47,6 @@ else:
     ]
     _mount.restype = ctypes.c_int
 
-try:
-    _umount = _libc.umount
-except AttributeError:
-    raise OSError(errno.EINVAL, "umount is not supported on this platform")
-else:
-    _umount.argtypes = [ctypes.c_char]
-    _umount.restype = ctypes.c_int
-
 
 def _mount_new_proc():
     """

From 0e024bfce198689c0fef84f94012b1b23e32e655 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 22 Dec 2020 11:46:03 +0000
Subject: [PATCH 0548/1854] criu-ns: Extract set namespace functions

This change extracts some of the duplicated code from
set_pidns() and set_mntns() functions.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 7808b02cc..f8a8e6ce5 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -110,6 +110,17 @@ def get_varg(args):
     return (None, None)
 
 
+def _set_namespace(fd):
+    """Join namespace referred to by fd"""
+    if _setns(fd, 0) != 0:
+        _errno = ctypes.get_errno()
+        raise OSError(_errno, errno.errorcode[_errno])
+
+
+def is_my_namespace(fd):
+    """Returns True if fd refers to current namespace"""
+    return os.stat('/proc/self/ns/pid').st_ino != os.fstat(fd).st_ino
+
 
 def set_pidns(tpid, pid_idx):
     """
@@ -117,14 +128,11 @@ def set_pidns(tpid, pid_idx):
     be changed in -t option, as task lives in different
     pid namespace.
     """
-    myns = os.stat('/proc/self/ns/pid').st_ino
     ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
-    if myns != os.fstat(ns_fd).st_ino:
-
+    if is_my_namespace(ns_fd):
         for l in open('/proc/%s/status' % tpid):
             if not l.startswith('NSpid:'):
                 continue
-
             ls = l.split()
             if ls[1] != tpid:
                 raise OSError(errno.ESRCH, 'No such pid')
@@ -134,11 +142,7 @@ def set_pidns(tpid, pid_idx):
             break
         else:
             raise OSError(errno.ENOENT, 'Cannot find NSpid field in proc')
-
-        if _setns(ns_fd, 0) != 0:
-            _errno = ctypes.get_errno()
-            raise OSError(_errno, errno.errorcode[_errno])
-
+        _set_namespace(ns_fd)
     os.close(ns_fd)
 
 
@@ -147,16 +151,13 @@ def set_mntns(tpid):
     Join mount namespace. Trick here too -- check / and .
     will be the same in target mntns.
     """
-    myns = os.stat('/proc/self/ns/mnt').st_ino
     ns_fd = os.open('/proc/%s/ns/mnt' % tpid, os.O_RDONLY)
-    if myns != os.fstat(ns_fd).st_ino:
+    if is_my_namespace(ns_fd):
         root_st = os.stat('/')
         cwd_st = os.stat('.')
         cwd_path = os.path.realpath('.')
 
-        if _setns(ns_fd, 0) != 0:
-            _errno = ctypes.get_errno()
-            raise OSError(_errno, errno.errorcode[_errno])
+        _set_namespace(ns_fd)
 
         os.chdir(cwd_path)
         root_nst = os.stat('/')
@@ -169,8 +170,6 @@ def set_mntns(tpid):
             raise OSError(errno.EXDEV, 'Target ns / is not as current')
         if not steq(cwd_st, cwd_nst):
             raise OSError(errno.EXDEV, 'Target ns . is not as current')
-
-
     os.close(ns_fd)
 
 

From 55a0557db159278d46677353c95595014731a139 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 17 Jan 2021 13:05:42 +0000
Subject: [PATCH 0549/1854] criu-ns: Close namespace fd before raise

It is a good practice to close open file descriptors.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index f8a8e6ce5..e94bfcfbf 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -135,12 +135,14 @@ def set_pidns(tpid, pid_idx):
                 continue
             ls = l.split()
             if ls[1] != tpid:
+                os.close(ns_fd)
                 raise OSError(errno.ESRCH, 'No such pid')
 
             print('Replace pid {} with {}'.format(tpid, ls[2]))
             sys.argv[pid_idx] = ls[2]
             break
         else:
+            os.close(ns_fd)
             raise OSError(errno.ENOENT, 'Cannot find NSpid field in proc')
         _set_namespace(ns_fd)
     os.close(ns_fd)
@@ -167,8 +169,10 @@ def set_mntns(tpid):
             return (st.st_dev, st.st_ino) == (nst.st_dev, nst.st_ino)
 
         if not steq(root_st, root_nst):
+            os.close(ns_fd)
             raise OSError(errno.EXDEV, 'Target ns / is not as current')
         if not steq(cwd_st, cwd_nst):
+            os.close(ns_fd)
             raise OSError(errno.EXDEV, 'Target ns . is not as current')
     os.close(ns_fd)
 

From 6b375ed7558554a24a10c2b4cbec569aabcf0b54 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 22 Dec 2020 11:57:58 +0000
Subject: [PATCH 0550/1854] criu-ns: Pass arguments to run_criu()

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index e94bfcfbf..f9623fb7f 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -73,12 +73,13 @@ def _wait_for_process_status(criu_pid):
             return -251
 
 
-def run_criu():
+def run_criu(args):
     """
     Spawn CRIU binary
     """
     print(sys.argv)
-    os.execlp('criu', *['criu'] + sys.argv[1:])
+    os.execlp('criu', *['criu'] + args)
+    raise OSError(errno.ENOENT, "No such command")
 
 
 def wrap_restore():
@@ -90,10 +91,7 @@ def wrap_restore():
     criu_pid = os.fork()
     if criu_pid == 0:
         _mount_new_proc()
-
-        run_criu()
-        raise OSError(errno.ENOENT, "No such command")
-
+        run_criu(sys.argv[1:])
     return _wait_for_process_status(criu_pid)
 
 
@@ -187,9 +185,7 @@ def wrap_dump():
 
     criu_pid = os.fork()
     if criu_pid == 0:
-        run_criu()
-        raise OSError(errno.ENOENT, "No such command")
-
+        run_criu(sys.argv[1:])
     return _wait_for_process_status(pid)
 
 

From 79742298672dcf4191c96993d8f7ea77e4618f0e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 22 Dec 2020 12:15:54 +0000
Subject: [PATCH 0551/1854] criu-ns: Handle restore-detached option

The criu-ns script creates a new PID namespace where criu is the "init"
process. When using the --restore-detached option with criu-ns, users
expect criu-ns to exit without killing the restored process tree.

Thus, criu-ns should not pass the --restore-detached to criu to prevent
it from terminating, and it should exit instead of waiting for criu's
exit status.

Resolves #1278

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index f9623fb7f..0c753347b 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -88,10 +88,23 @@ def wrap_restore():
         _errno = ctypes.get_errno()
         raise OSError(_errno, errno.errorcode[_errno])
 
+    restore_detached = False
+    restore_args = sys.argv[1:]
+    if '-d' in restore_args:
+        restore_detached = True
+        restore_args.remove('-d')
+    if '--restore-detached' in restore_args:
+        restore_detached = True
+        restore_args.remove('--restore-detached')
+
     criu_pid = os.fork()
     if criu_pid == 0:
         _mount_new_proc()
-        run_criu(sys.argv[1:])
+        run_criu(restore_args)
+
+    if restore_detached:
+        return 0
+
     return _wait_for_process_status(criu_pid)
 
 

From 5f59a7cc3507c9d3b91ef851ebb0d32a6aa47a8b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 22 Dec 2020 12:26:03 +0000
Subject: [PATCH 0552/1854] criu-ns: Add unsupported msg for restore-sibling

Currently criu-ns does not support the --restore-sibling option.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 0c753347b..68ced5ec8 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -83,13 +83,16 @@ def run_criu(args):
 
 
 def wrap_restore():
+    restore_args = sys.argv[1:]
+    if '--restore-sibling' in restore_args:
+        raise OSError(errno.EINVAL, "--restore-sibling is not supported")
+
     # Unshare pid and mount namespaces
     if _unshare(CLONE_NEWNS | CLONE_NEWPID) != 0:
         _errno = ctypes.get_errno()
         raise OSError(_errno, errno.errorcode[_errno])
 
     restore_detached = False
-    restore_args = sys.argv[1:]
     if '-d' in restore_args:
         restore_detached = True
         restore_args.remove('-d')

From c10aae8f6e41f69d8b2f806b4e93e84f0c337869 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 22 Dec 2020 12:31:30 +0000
Subject: [PATCH 0553/1854] criu-ns: Merge comparisons with 'in'

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 68ced5ec8..3ee6564e9 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -221,7 +221,7 @@ action = sys.argv[1]
 
 if action == 'restore':
     res = wrap_restore()
-elif action == 'dump' or action == 'pre-dump':
+elif action in ['dump', 'pre-dump']:
     res = wrap_dump()
 else:
     print('Unsupported action {} for nswrap'.format(action))

From abe3405b2078245825dbc0872defda059a66fb1c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 15 Mar 2021 14:16:14 +0000
Subject: [PATCH 0554/1854] lib: fromstring() and tostring() are deprecated

fromstring() and tostring() are deprecated since Python 3.2 and have
been removed in 3.9. Both functions were just aliases and this patch
changes images.py to directly call fromybytes() and tobytes().

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 85497bdca..c854c6152 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -375,7 +375,7 @@ class ipc_sem_set_handler:
         s = array.array('H')
         if s.itemsize != sizeof_u16:
             raise Exception("Array size mismatch")
-        s.fromstring(f.read(size))
+        s.frombytes(f.read(size))
         f.seek(rounded - size, 1)
         return s.tolist()
 
@@ -389,7 +389,7 @@ class ipc_sem_set_handler:
         s.fromlist(extra)
         if len(s) != entry['nsems']:
             raise Exception("Number of semaphores mismatch")
-        f.write(s.tostring())
+        f.write(s.tobytes())
         f.write('\0' * (rounded - size))
 
     def skip(self, f, pbuff):

From 248b7736765890650cea791615fcb350206f3d45 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 15 Mar 2021 14:30:04 +0000
Subject: [PATCH 0555/1854] lib: correctly handle padding of dump images

With the switch to Python3 and binary output it is not possible to use
code like: 'f.write('\0' * (rounded - size))'. Switching to binary
helps.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index c854c6152..e4f9ca3d4 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -390,7 +390,7 @@ class ipc_sem_set_handler:
         if len(s) != entry['nsems']:
             raise Exception("Number of semaphores mismatch")
         f.write(s.tobytes())
-        f.write('\0' * (rounded - size))
+        f.write(b'\0' * (rounded - size))
 
     def skip(self, f, pbuff):
         entry = pb2dict.pb2dict(pbuff)
@@ -428,7 +428,7 @@ class ipc_msg_queue_handler:
             rounded = round_up(msg.msize, sizeof_u64)
             data = base64.decodebytes(extra[i + 1])
             f.write(data[:msg.msize])
-            f.write('\0' * (rounded - msg.msize))
+            f.write(b'\0' * (rounded - msg.msize))
 
     def skip(self, f, pbuff):
         entry = pb2dict.pb2dict(pbuff)
@@ -462,7 +462,7 @@ class ipc_shm_handler:
         data = base64.decodebytes(extra)
         rounded = round_up(size, sizeof_u32)
         f.write(data[:size])
-        f.write('\0' * (rounded - size))
+        f.write(b'\0' * (rounded - size))
 
     def skip(self, f, pbuff):
         entry = pb2dict.pb2dict(pbuff)

From 90e03b1a1142ca40fb78de9eb04944ab51d06eeb Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 17 Mar 2021 15:37:31 +0300
Subject: [PATCH 0556/1854] pstree: don't change sid/gid-s if current sid/gid
 is the same

Previously we only skipped replacing sid for shell job if root_item was
session leader, but there is other case where root_item sid is the same
as current_sid we can safely skip replacing for this case. Same applies
to gid-s.

Now after we have pid collision check we not only "can" but should skip
pid collision checks for the latter case. It is quite obvious that
there are tasks in tree with sid==current_sid if current_sid==old_sid.

Fixes: #1400
Fixes: 77968d43c ("pstree: check for pid collision before switching to
new sid/gid")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pstree.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/criu/pstree.c b/criu/pstree.c
index e2c130de3..3ca8908b4 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -347,6 +347,7 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 	if (!opts.shell_job)
 		return 0;
 
+	/* root_item is a session leader */
 	if (root_item->sid == vpid(root_item))
 		return 0;
 
@@ -368,27 +369,32 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 	 */
 
 	old_sid = root_item->sid;
+	if (old_sid != current_sid) {
+		pr_info("Migrating process tree (SID %d->%d)\n",
+			old_sid, current_sid);
 
-	pr_info("Migrating process tree (SID %d->%d)\n",
-		old_sid, current_sid);
+		tmp = pstree_pid_by_virt(current_sid);
+		if (tmp) {
+			pr_err("Current sid %d intersects with pid (%d) in images",
+			       current_sid, tmp->state);
+			return -1;
+		}
 
-	tmp = pstree_pid_by_virt(current_sid);
-	if (tmp) {
-		pr_err("Current sid %d intersects with pid (%d) in images",
-		       current_sid, tmp->state);
-		return -1;
-	}
+		for_each_pstree_item(pi) {
+			if (pi->sid == old_sid)
+				pi->sid = current_sid;
+		}
 
-	for_each_pstree_item(pi) {
-		if (pi->sid == old_sid)
-			pi->sid = current_sid;
-	}
-
-	old_gid = root_item->pgid;
-	if (old_gid != vpid(root_item)) {
 		if (lookup_create_item(current_sid) == NULL)
 			return -1;
+	}
 
+	/* root_item is a group leader */
+	if (root_item->pgid == vpid(root_item))
+		return 0;
+
+	old_gid = root_item->pgid;
+	if (old_gid != current_gid) {
 		pr_info("Migrating process tree (GID %d->%d)\n",
 			old_gid, current_gid);
 

From 069d92e5132fd66f044395b39bbb53f334de714e Mon Sep 17 00:00:00 2001
From: fedor <fedor@cirruslabs.org>
Date: Wed, 17 Mar 2021 07:49:26 -0400
Subject: [PATCH 0557/1854] Use a real VM instead of a privileged container

---
 .cirrus.yml           | 18 +++++++++++-------
 scripts/ci/vagrant.sh | 24 +-----------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index dce5ce8cd..a3f401ddb 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,16 +1,20 @@
 environment:
+  HOME: "/root"
   CIRRUS_WORKING_DIR: "/tmp/criu"
-container:
-  # This test case does not work on focal, because the newer version
-  # of libvirt fails during 'vagrant up' with ip6tables errors.
-  image: ubuntu:bionic
-  kvm: true
+
+compute_engine_instance:
+  image_project: cirrus-images
+  image: family/docker-kvm
+  platform: linux
   cpu: 4
-  memory: 8G
+  memory: 16G
+  nested_virtualization: true
+
 task:
   name: Vagrant Fedora based test (no VDSO)
   setup_script: |
-    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget
+    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
+    sudo kvm-ok
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
   build_script: |
     make -C scripts/ci vagrant-fedora-no-vdso
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 4dccf2613..3ed1a2675 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -15,13 +15,6 @@ setup() {
 		# Load the kvm modules for vagrant to use qemu
 		modprobe kvm kvm_intel
 	fi
-	if [ -n "$CIRRUS_CI" ]; then
-		# Running modprobe is not possible on Cirrus, because
-		# we are running in a container with potentially other
-		# modules than the host.
-		# Vagrant can still use /dev/kvm later if we do
-		chmod 666 /dev/kvm
-	fi
 
 	# Tar up the git checkout to have vagrant rsync it to the VM
 	tar cf criu.tar ../../../criu
@@ -32,28 +25,13 @@ setup() {
 	./apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu \
 		ruby build-essential libxml2-dev qemu-kvm rsync ebtables dnsmasq-base \
 		openssh-client
-	if [ -n "$CIRRUS_CI" ]; then
-		# On Cirrus systemctl does not work, because we are running in
-		# a container without access to systemd
-		/usr/sbin/virtlogd -d
-		/usr/sbin/libvirtd -d
-	else
-		systemctl restart libvirtd
-	fi
+	systemctl restart libvirtd
 	vagrant plugin install vagrant-libvirt
 	vagrant init fedora/${FEDORA_VERSION}-cloud-base --box-version ${FEDORA_BOX_VERSION}
 	# The default libvirt Vagrant VM uses 512MB.
 	# Travis VMs should have around 7.5GB.
 	# Increasing it to 4GB should work.
 	sed -i Vagrantfile -e 's,^end$,  config.vm.provider :libvirt do |libvirt|'"\n"'    libvirt.memory = 4096;end'"\n"'end,g'
-	if [ -n "$CIRRUS_CI" ]; then
-		# Work around for:
-		# Error while activating network: Call to virNetworkCreate failed: internal error:
-		# Failed to apply firewall rules /usr/sbin/ip6tables --table filter --list-rules: modprobe: FATAL: Module ip6_tables not found in directory /lib/modules/5.4.0-1025-gcp
-		# On cirrus-ci.com. Running in a container without access to the host's kernel modules
-		rm -f /sbin/ip6tables
-		cp /bin/true /sbin/ip6tables
-	fi
 	vagrant up --provider=libvirt --no-tty
 	mkdir -p /root/.ssh
 	vagrant ssh-config >> /root/.ssh/config

From 228e510d21044a5e461d0ded75a0bc26039859ad Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 19 Mar 2021 08:57:04 +0000
Subject: [PATCH 0558/1854] ci: move CentOS 8 based test to Cirrus

The kernel on GitHub Actions has a bug

https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1919472

which breaks our CI. It works on Cirrus. Let's move it there.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml                       | 57 ++++++++++++++++++++++++-------
 .github/workflows/centos-test.yml |  2 +-
 scripts/ci/run-ci-tests.sh        |  2 +-
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index a3f401ddb..5574b1583 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,20 +1,53 @@
-environment:
-  HOME: "/root"
-  CIRRUS_WORKING_DIR: "/tmp/criu"
-
-compute_engine_instance:
-  image_project: cirrus-images
-  image: family/docker-kvm
-  platform: linux
-  cpu: 4
-  memory: 16G
-  nested_virtualization: true
-
 task:
   name: Vagrant Fedora based test (no VDSO)
+  environment:
+    HOME: "/root"
+    CIRRUS_WORKING_DIR: "/tmp/criu"
+
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-kvm
+    platform: linux
+    cpu: 4
+    memory: 16G
+    nested_virtualization: true
+
   setup_script: |
     scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
   build_script: |
     make -C scripts/ci vagrant-fedora-no-vdso
+
+task:
+  name: CentOS 8 based test
+  environment:
+    HOME: "/root"
+    CIRRUS_WORKING_DIR: "/tmp/criu"
+
+  compute_engine_instance:
+    image_project: centos-cloud
+    image: family/centos-8
+    platform: linux
+    cpu: 4
+    memory: 8G
+
+  setup_script: |
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
+    yum config-manager --set-enabled powertools
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf xmlto
+    alternatives --set python /usr/bin/python3
+    systemctl stop sssd
+    # Even with selinux in permissive mode the selinux tests will be executed
+    # The Cirrus CI user runs as a service from selinux point of view and is
+    # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
+    # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode
+    setenforce 0
+    # netns-nft fails with
+    # 4: FAIL: netns-nft.c:51: Can't get nft table (errno = 11 (Resource temporarily unavailable))
+    mv /usr/sbin/nft /usr/sbin/nft.away
+    pip3 install junit_xml
+
+  build_script: |
+    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1
diff --git a/.github/workflows/centos-test.yml b/.github/workflows/centos-test.yml
index e14c2460b..41b1f3a6e 100644
--- a/.github/workflows/centos-test.yml
+++ b/.github/workflows/centos-test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        target: [centos7, centos8]
+        target: [centos7]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 61413cc39..56a4742b8 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -238,7 +238,7 @@ fi
 #make -C test/others/exec/ run
 make -C test/others/make/ run CC="$CC"
 if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
-       # GitHub Actions does not provide a real TTY and CRIU will fail with:
+       # GitHub Actions (and Cirrus CI) does not provide a real TTY and CRIU will fail with:
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run
 fi

From b82f222d6b7e1140bc36c9bf0ebe9173a5a90764 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 20 Mar 2021 11:35:32 +0000
Subject: [PATCH 0559/1854] lib: fix crit-recode fix for Python 2

The recent fix to make Jenkins run crit-recode again broke
Python 2 support (because Python 2 based CI was not running).

This should fix the Python 2 based test run.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py  | 11 +++++++++--
 lib/py/images/pb2dict.py | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index e4f9ca3d4..0a9d36f08 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -42,6 +42,7 @@ import base64
 import struct
 import os
 import array
+import sys
 
 from . import magic
 from . import pb
@@ -284,9 +285,15 @@ class ghost_file_handler:
                 size = len(pb_str)
                 f.write(struct.pack('i', size))
                 f.write(pb_str)
-                f.write(base64.decodebytes(str.encode(item['extra'])))
+                if (sys.version_info > (3, 0)):
+                    f.write(base64.decodebytes(str.encode(item['extra'])))
+                else:
+                    f.write(base64.decodebytes(item['extra']))
         else:
-            f.write(base64.decodebytes(str.encode(item['extra'])))
+            if (sys.version_info > (3, 0)):
+                f.write(base64.decodebytes(str.encode(item['extra'])))
+            else:
+                f.write(base64.decodebytes(item['extra']))
 
     def dumps(self, entries):
         f = io.BytesIO('')
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index 068d583dc..cfaff6c7d 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -3,6 +3,7 @@ import collections
 import os
 import quopri
 import socket
+import sys
 from ipaddress import IPv4Address, IPv6Address, ip_address
 
 from google.protobuf.descriptor import FieldDescriptor as FD
@@ -246,11 +247,17 @@ def encode_dev(field, value):
 
 
 def encode_base64(value):
-    return base64.encodebytes(value).decode()
+    if (sys.version_info > (3, 0)):
+        return base64.encodebytes(value).decode()
+    else:
+        return base64.encodebytes(value)
 
 
 def decode_base64(value):
-    return base64.decodebytes(str.encode(value))
+    if (sys.version_info > (3, 0)):
+        return base64.decodebytes(str.encode(value))
+    else:
+        return base64.decodebytes(value)
 
 
 def encode_unix(value):

From 8dc7ce3e77840ea108d1b12403687ab59c722653 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 16 Mar 2021 20:26:14 +0200
Subject: [PATCH 0560/1854] cr-service: fix CRIU_REQ_TYPE__FEATURE_CHECK RPC
 request

Closes: #1408

CRIU_REQ_TYPE__FEATURE_CHECK was failing, this was caused by two
things in handle_feature_check():
	1. setup_opts_from_req() was used and it could be NULL
	   (kerndat_init() is enough for feature checking)
	2. resp.success was always set to false

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-service.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 56be6bcd3..474f598ac 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -1069,8 +1069,7 @@ static int handle_feature_check(int sk, CriuReq * msg)
 	}
 
 	if (pid == 0) {
-		/* kerndat_init() is called from setup_opts_from_req() */
-		if (setup_opts_from_req(sk, msg->opts))
+		if (kerndat_init())
 			exit(1);
 
 		setproctitle("feature-check --rpc");
@@ -1104,6 +1103,8 @@ static int handle_feature_check(int sk, CriuReq * msg)
 	if (status != 0)
 		goto out;
 
+	return 0;
+
 	/*
 	 * The child process was not able to send an answer. Tell
 	 * the RPC client that something did not work as expected.

From 96c1351d8a9d749fbcd2aa756789bf0380e2c83a Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sat, 13 Mar 2021 10:22:24 +0700
Subject: [PATCH 0561/1854] criu: Throw error when parent path is provided but
 invalid

In image dump directory, there are 2 parent symlink error cases:
- Parent symlink does not exist
- Parent symlink exists but points to invalid target

At the moment, 2 cases are handled exactly the same (do full dump). However, while
the first case happen when parent path is not provided, the second one is likely
user's mistake when provides invalid parent path.

So we throw an error in the latter case instead of performing the full dump.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/image.c         | 31 +++++++++++++++++++++++++++----
 criu/include/image.h |  6 ++++++
 criu/irmap.c         |  6 ++----
 criu/page-xfer.c     | 24 +++++++++++++++---------
 criu/pagemap.c       |  6 ++++--
 5 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/criu/image.c b/criu/image.c
index 6ba2ffc7d..06f770626 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -149,8 +149,7 @@ InventoryEntry *get_parent_inventory(void)
 	InventoryEntry *ie;
 	int dir;
 
-	dir = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
-	if (dir == -1) {
+	if (open_parent(get_service_fd(IMG_FD_OFF), &dir)) {
 		/*
 		 * We print the warning below to be notified that we had some
 		 * unexpected problem on open. For instance we have a parent
@@ -158,10 +157,11 @@ InventoryEntry *get_parent_inventory(void)
 		 * when also having no parent directory is an expected case of
 		 * first dump iteration.
 		 */
-		if (errno != ENOENT)
-			pr_warn("Failed to open parent directory\n");
+		pr_warn("Failed to open parent directory\n");
 		return NULL;
 	}
+	if (dir < 0)
+		return NULL;
 
 	img = open_image_at(dir, CR_FD_INVENTORY, O_RSTR);
 	if (!img) {
@@ -561,6 +561,11 @@ int open_image_dir(char *dir, int mode)
 		if (img_streamer_init(dir, mode) < 0)
 			goto err;
 	} else if (opts.img_parent) {
+		if (faccessat(fd, opts.img_parent, R_OK, 0)) {
+			pr_perror("Invalid parent image directory provided");
+			goto err;
+		}
+
 		ret = symlinkat(opts.img_parent, fd, CR_PARENT_LINK);
 		if (ret < 0 && errno != EEXIST) {
 			pr_perror("Can't link parent snapshot");
@@ -586,6 +591,24 @@ void close_image_dir(void)
 	close_service_fd(IMG_FD_OFF);
 }
 
+int open_parent(int dfd, int *pfd)
+{
+	*pfd = -1;
+	/* Check if the parent symlink exists */
+	if (faccessat(dfd, CR_PARENT_LINK, F_OK, AT_SYMLINK_NOFOLLOW) && errno == ENOENT) {
+		pr_debug("No parent images directory provided\n");
+		return 0;
+	}
+
+	*pfd = openat(dfd, CR_PARENT_LINK, O_RDONLY);
+	if (*pfd < 0) {
+		pr_perror("Can't open parent path");
+		return -1;
+	}
+
+	return 0;
+}
+
 static unsigned long page_ids = 1;
 
 void up_page_ids_base(void)
diff --git a/criu/include/image.h b/criu/include/image.h
index 62c8d7ba0..7c45381db 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -147,6 +147,12 @@ extern off_t img_raw_size(struct cr_img *img);
 
 extern int open_image_dir(char *dir, int mode);
 extern void close_image_dir(void);
+/*
+ * Return -1 -- parent symlink points to invalid target
+ * Return 0 && pfd < 0 -- parent symlink does not exist
+ * Return 0 && pfd >= 0 -- opened
+ */
+extern int open_parent(int dfd, int *pfd);
 
 extern struct cr_img *open_image_at(int dfd, int type, unsigned long flags, ...);
 #define open_image(typ, flags, ...) open_image_at(-1, typ, flags, ##__VA_ARGS__)
diff --git a/criu/irmap.c b/criu/irmap.c
index 58bc055d5..c9bfdbe22 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -425,12 +425,10 @@ in:
 		close_image(*img);
 		if (dir == AT_FDCWD) {
 			pr_info("Searching irmap cache in parent\n");
-			dir = openat(get_service_fd(IMG_FD_OFF),
-					CR_PARENT_LINK, O_RDONLY);
+			if (open_parent(get_service_fd(IMG_FD_OFF), &dir))
+				return -1;
 			if (dir >= 0)
 				goto in;
-			if (errno != ENOENT)
-				return -1;
 		}
 
 		pr_info("No irmap cache\n");
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 98e9c6b6e..34f6a0967 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -364,10 +364,8 @@ static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, unsigned lo
 		return -1;
 
 	xfer->pi = open_pages_image(O_DUMP, xfer->pmi, &pages_id);
-	if (!xfer->pi) {
-		close_image(xfer->pmi);
-		return -1;
-	}
+	if (!xfer->pi)
+		goto err_pmi;
 
 	/*
 	 * Open page-read for parent images (if it exists). It will
@@ -386,14 +384,15 @@ static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, unsigned lo
 		if (opts.stream)
 			goto out;
 
-		pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
-		if (pfd < 0 && errno == ENOENT)
+		if (open_parent(get_service_fd(IMG_FD_OFF), &pfd))
+			goto err_pi;
+		if (pfd < 0)
 			goto out;
 
 		xfer->parent = xmalloc(sizeof(*xfer->parent));
 		if (!xfer->parent) {
 			close(pfd);
-			return -1;
+			goto err_pi;
 		}
 
 		ret = open_page_read_at(pfd, img_id, xfer->parent, pr_flags);
@@ -412,6 +411,12 @@ out:
 	xfer->write_pages = write_pages_loc;
 	xfer->close = close_page_xfer;
 	return 0;
+
+err_pi:
+	close_image(xfer->pi);
+err_pmi:
+	close_image(xfer->pmi);
+	return -1;
 }
 
 int open_page_xfer(struct page_xfer *xfer, int fd_type, unsigned long img_id)
@@ -936,8 +941,9 @@ int check_parent_local_xfer(int fd_type, unsigned long img_id)
 	if (opts.stream)
 		return 0;
 
-	pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
-	if (pfd < 0 && errno == ENOENT)
+	if (open_parent(get_service_fd(IMG_FD_OFF), &pfd))
+		return -1;
+	if (pfd < 0)
 		return 0;
 
 	snprintf(path, sizeof(path), imgset_template[fd_type].fmt, img_id);
diff --git a/criu/pagemap.c b/criu/pagemap.c
index abcdcdfd5..1d849a1b9 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -661,8 +661,9 @@ static int try_open_parent(int dfd, unsigned long id, struct page_read *pr, int
 	if (opts.stream)
 		goto out;
 
-	pfd = openat(dfd, CR_PARENT_LINK, O_RDONLY);
-	if (pfd < 0 && errno == ENOENT)
+	if (open_parent(dfd, &pfd))
+		goto err;
+	if (pfd < 0)
 		goto out;
 
 	parent = xmalloc(sizeof(*parent));
@@ -687,6 +688,7 @@ err_free:
 	xfree(parent);
 err_cl:
 	close(pfd);
+err:
 	return -1;
 }
 

From 9635d6496e974ce5b1ef5e813f1d296c97451c5a Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 30 Mar 2021 21:06:19 +0700
Subject: [PATCH 0562/1854] criu: Replace faccessat with fstatat when using
 AT_SYMLINK_NOFOLLOW flag

Currently, alpine musl libc library returns Invalid argument error (EINVAL)
when calling faccessat with AT_SYMLINK_NOFOLLOW flag.

Fix this by using fstatat instead.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/image.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/image.c b/criu/image.c
index 06f770626..84101b610 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -593,9 +593,11 @@ void close_image_dir(void)
 
 int open_parent(int dfd, int *pfd)
 {
+	struct stat st;
+
 	*pfd = -1;
 	/* Check if the parent symlink exists */
-	if (faccessat(dfd, CR_PARENT_LINK, F_OK, AT_SYMLINK_NOFOLLOW) && errno == ENOENT) {
+	if (fstatat(dfd, CR_PARENT_LINK, &st, AT_SYMLINK_NOFOLLOW) && errno == ENOENT) {
 		pr_debug("No parent images directory provided\n");
 		return 0;
 	}

From bf80fee4f4a7cb93fa804b3ed41f6ac29cd2bddc Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 10 Mar 2021 17:14:41 +0000
Subject: [PATCH 0563/1854] lib: correctly handle stdin/stdout (Python 3)

This changes stdin to be opened as binary if the input is not a tty.

This changes stdout to be opened as binary if encoding or if the output
is not a tty.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/cli.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index df96729e2..1d8b8515f 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -11,14 +11,28 @@ def inf(opts):
     if opts['in']:
         return open(opts['in'], 'rb')
     else:
-        return sys.stdin
+        if (sys.version_info < (3, 0)):
+            return sys.stdin
+        if sys.stdin.isatty():
+            # If we are reading from a terminal (not a pipe) we want text input and not binary
+            return sys.stdin
+        return sys.stdin.buffer
 
 
-def outf(opts):
+def outf(opts, decode):
+    # Decode means from protobuf to JSON.
+    # Use text when writing to JSON else use binaray mode
     if opts['out']:
-        return open(opts['out'], 'wb+')
+        mode = 'wb+'
+        if decode:
+            mode = 'w+'
+        return open(opts['out'], mode)
     else:
-        return sys.stdout
+        if (sys.version_info < (3, 0)):
+            return sys.stdout
+        if decode:
+            return sys.stdout
+        return sys.stdout.buffer
 
 
 def dinf(opts, name):
@@ -39,7 +53,7 @@ def decode(opts):
     if opts['pretty']:
         indent = 4
 
-    f = outf(opts)
+    f = outf(opts, True)
     json.dump(img, f, indent=indent)
     if f == sys.stdout:
         f.write("\n")
@@ -47,7 +61,7 @@ def decode(opts):
 
 def encode(opts):
     img = json.load(inf(opts))
-    pycriu.images.dump(img, outf(opts))
+    pycriu.images.dump(img, outf(opts, False))
 
 
 def info(opts):

From bf9e502c6f24c5c723bf86205dfc6342b6bdf768 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 15 Mar 2021 13:57:38 +0000
Subject: [PATCH 0564/1854] lib: print nice error if crit gets wrong input

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/cli.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index 1d8b8515f..cb125aab8 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -60,7 +60,13 @@ def decode(opts):
 
 
 def encode(opts):
-    img = json.load(inf(opts))
+    try:
+        img = json.load(inf(opts))
+    except UnicodeDecodeError:
+        print("Cannot read JSON.\n"\
+          "Maybe you are feeding me an image with protobuf data? "\
+          "Encode expects JSON input.", file=sys.stderr)
+        sys.exit(1)
     pycriu.images.dump(img, outf(opts, False))
 
 

From 13e6e68998cdd369cfe5cdc024c7d20be2346efe Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 23 Mar 2021 08:48:03 +0000
Subject: [PATCH 0565/1854] lib: also handle extra pipe data correctly

CI sometimes errors out encoding/decoding extra pipe data.

This should fix extra pipe data for Python 3 and still keep it working
on Python 2.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 0a9d36f08..956932e03 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -311,10 +311,13 @@ class pipes_data_extra_handler:
     def load(self, f, pload):
         size = pload.bytes
         data = f.read(size)
-        return base64.encodebytes(data)
+        return base64.encodebytes(data).decode()
 
     def dump(self, extra, f, pload):
-        data = base64.decodebytes(extra)
+        if (sys.version_info > (3, 0)):
+            data = base64.decodebytes(str.encode(extra))
+        else:
+            data = base64.decodebytes(extra)
         f.write(data)
 
     def skip(self, f, pload):
@@ -326,10 +329,13 @@ class sk_queues_extra_handler:
     def load(self, f, pload):
         size = pload.length
         data = f.read(size)
-        return base64.encodebytes(data)
+        return base64.encodebytes(data).decode()
 
     def dump(self, extra, f, _unused):
-        data = base64.decodebytes(extra)
+        if (sys.version_info > (3, 0)):
+            data = base64.decodebytes(str.encode(extra))
+        else:
+            data = base64.decodebytes(extra)
         f.write(data)
 
     def skip(self, f, pload):

From b78c4e071a42ebe34aac82fa0711df07ed375e2b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 15 Mar 2021 14:03:25 +0000
Subject: [PATCH 0566/1854] test: fix crit test and extend it

This fixes the others/crit test to work again and extends it to make
sure all possible input and output options are correctly handled by
crit.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile                 |  1 +
 test/others/crit/test.sh | 70 ++++++++++++++++++++++++++++++++++++----
 test/others/env.sh       | 11 ++++++-
 3 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a5c4aa41d..9a43fef14 100644
--- a/Makefile
+++ b/Makefile
@@ -402,6 +402,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
+	shellcheck test/others/crit/*.sh
 
 codecov: SHELL := $(shell which bash)
 codecov:
diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index a85b4c3b2..9d30575c4 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -1,8 +1,14 @@
+#!/bin/bash
+# shellcheck disable=SC1091,SC2002
+
+set -x
+
 source ../env.sh
 
 images_list=""
 
 function _exit {
+	# shellcheck disable=SC2181
 	if [ $? -ne 0 ]; then
 		echo "FAIL"
 		exit 1
@@ -13,37 +19,89 @@ function gen_imgs {
 	setsid ./loop.sh < /dev/null &> /dev/null &
 	PID=$!
 	$CRIU dump -v4 -o dump.log -D ./ -t $PID
+	# shellcheck disable=SC2181
 	if [ $? -ne 0 ]; then
 		kill -9 $PID
 		_exit 1
 	fi
 
-	images_list=$(ls -1 *.img)
+	images_list=$(ls -1 ./*.img)
 	if [ -z "$images_list" ]; then
 		echo "Failed to generate images"
 		_exit 1
 	fi
 }
 
-function run_test {
+function run_test1 {
 	for x in $images_list
 	do
 		echo "=== $x"
-		if [[ $x == pages* ]]; then
+		if [[ $x == *pages* ]]; then
 			echo "skip"
 			continue
 		fi
 
 		echo "  -- to json"
-		$CRIT decode -o "$x"".json" --pretty < $x || _exit $?
+		$CRIT decode -o "$x"".json" --pretty < "$x" || _exit $?
 		echo "  -- to img"
 		$CRIT encode -i "$x"".json" > "$x"".json.img" || _exit $?
 		echo "  -- cmp"
-		cmp $x "$x"".json.img" || _exit $?
+		cmp "$x" "$x"".json.img" || _exit $?
 
 		echo "=== done"
 	done
 }
 
+
+function run_test2 {
+	mapfile -t array <<< "$images_list"
+
+	PROTO_IN=${array[0]}
+	JSON_IN=$(mktemp -p ./ tmp.XXXXXXXXXX.json)
+	OUT=$(mktemp -p ./ tmp.XXXXXXXXXX.log)
+
+	# prepare
+	${CRIT} decode -i "${PROTO_IN}" -o "${JSON_IN}"
+
+	# proto in - json out decode
+	cat "${PROTO_IN}" | ${CRIT} decode || _exit 1
+	cat "${PROTO_IN}" | ${CRIT} decode -o "${OUT}" || _exit 1
+	cat "${PROTO_IN}" | ${CRIT} decode > "${OUT}" || _exit 1
+	${CRIT} decode -i "${PROTO_IN}" || _exit 1
+	${CRIT} decode -i "${PROTO_IN}" -o "${OUT}" || _exit 1
+	${CRIT} decode -i "${PROTO_IN}" > "${OUT}" || _exit 1
+	${CRIT} decode < "${PROTO_IN}" || _exit 1
+	${CRIT} decode -o "${OUT}" < "${PROTO_IN}" || _exit 1
+	${CRIT} decode < "${PROTO_IN}" > "${OUT}" || _exit 1
+
+	# proto in - json out encode -> should fail
+	cat "${PROTO_IN}" | ${CRIT} encode || true
+	cat "${PROTO_IN}" | ${CRIT} encode -o "${OUT}" || true
+	cat "${PROTO_IN}" | ${CRIT} encode > "${OUT}" || true
+	${CRIT} encode -i "${PROTO_IN}" || true
+	${CRIT} encode -i "${PROTO_IN}" -o "${OUT}" || true
+	${CRIT} encode -i "${PROTO_IN}" > "${OUT}" || true
+
+	# json in - proto out encode
+	cat "${JSON_IN}" | ${CRIT} encode || _exit 1
+	cat "${JSON_IN}" | ${CRIT} encode -o "${OUT}" || _exit 1
+	cat "${JSON_IN}" | ${CRIT} encode > "${OUT}" || _exit 1
+	${CRIT} encode -i "${JSON_IN}" || _exit 1
+	${CRIT} encode -i "${JSON_IN}" -o "${OUT}" || _exit 1
+	${CRIT} encode -i "${JSON_IN}" > "${OUT}" || _exit 1
+	${CRIT} encode < "${JSON_IN}" || _exit 1
+	${CRIT} encode -o "${OUT}" < "${JSON_IN}" || _exit 1
+	${CRIT} encode < "${JSON_IN}" > "${OUT}" || _exit 1
+
+	# json in - proto out decode -> should fail
+	cat "${JSON_IN}" | ${CRIT} decode || true
+	cat "${JSON_IN}" | ${CRIT} decode -o "${OUT}" || true
+	cat "${JSON_IN}" | ${CRIT} decode > "${OUT}" || true
+	${CRIT} decode -i "${JSON_IN}" || true
+	${CRIT} decode -i "${JSON_IN}" -o "${OUT}" || true
+	${CRIT} decode -i "${JSON_IN}" > "${OUT}" || true
+}
+
 gen_imgs
-run_test
+run_test1
+run_test2
diff --git a/test/others/env.sh b/test/others/env.sh
index 73369ad1b..b514e87d9 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -2,7 +2,16 @@
 
 CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu/criu)
 criu=$CRIU
-CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit)
+if [ $(which python3) ]; then
+	PYTHON=python3
+elif [ $(which python2) ]; then
+	PYTHON=python2
+else
+	echo "FAIL: Neither python3 nor python2"
+	exit 1
+fi
+#export PYTHON
+CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
 crit=$CRIT
 CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu-coredump/criu-coredump)
 criu_coredump=$CRIU_COREDUMP

From 9c18c63d2adda9bfd877c8e7e91da9f54b6c6d24 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 15 Mar 2021 14:06:18 +0000
Subject: [PATCH 0567/1854] ci: enable crit tests in CI

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 56a4742b8..f1ed6bcfc 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -268,6 +268,9 @@ ip net add test
 ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -k always
 ./test/crit-recode.py
 
+# more crit testing
+make -C test/others/crit run
+
 # libcriu testing
 make -C test/others/libcriu run
 

From eb5726c44a8f7afcf9fa7c7be341526e0a73019d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 8 May 2020 11:36:57 +0000
Subject: [PATCH 0568/1854] images: re-license as Expat license (so-called MIT)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This changes the license of all files in the images/ directory from
GPLv2 to the Expat license (so-called MIT).

According to git the files have been authored by:

   Abhishek Dubey
   Adrian Reber
   Alexander Mikhalitsyn
   Alice Frosi
   Andrei Vagin (Andrew Vagin, Andrey Vagin)
   Cyrill Gorcunov
   Dengguangxing
   Dmitry Safonov
   Guoyun Sun
   Kirill Tkhai
   Kir Kolyshkin
   Laurent Dufour
   Michael Holzheu
   Michał Cłapiński
   Mike Rapoport
   Nicolas Viennot
   Nikita Spiridonov
   Pavel Emelianov (Pavel Emelyanov)
   Pavel Tikhomirov
   Radostin Stoyanov
   rbruno@gsd.inesc-id.pt
   Sebastian Pipping
   Stanislav Kinsburskiy
   Tycho Andersen
   Valeriy Vdovin

The Expat license (so-called MIT) can be found here:
https://opensource.org/licenses/MIT

According to that link the correct SPDX short identifier is 'MIT'.

https://spdx.org/licenses/MIT.html

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 README.md                    |  3 +++
 images/LICENSE               | 19 +++++++++++++++++++
 images/autofs.proto          |  2 ++
 images/binfmt-misc.proto     |  2 ++
 images/bpfmap-data.proto     |  2 ++
 images/bpfmap-file.proto     |  2 ++
 images/cgroup.proto          |  2 ++
 images/core-aarch64.proto    |  2 ++
 images/core-arm.proto        |  2 ++
 images/core-mips.proto       |  2 ++
 images/core-ppc64.proto      |  2 ++
 images/core-s390.proto       |  2 ++
 images/core-x86.proto        |  2 ++
 images/core.proto            |  2 ++
 images/cpuinfo.proto         |  2 ++
 images/creds.proto           |  2 ++
 images/eventfd.proto         |  2 ++
 images/eventpoll.proto       |  2 ++
 images/ext-file.proto        |  2 ++
 images/fdinfo.proto          |  2 ++
 images/fh.proto              |  2 ++
 images/fifo.proto            |  2 ++
 images/file-lock.proto       |  2 ++
 images/fown.proto            |  2 ++
 images/fs.proto              |  2 ++
 images/fsnotify.proto        |  2 ++
 images/ghost-file.proto      |  2 ++
 images/img-streamer.proto    |  2 ++
 images/inventory.proto       |  2 ++
 images/ipc-desc.proto        |  2 ++
 images/ipc-msg.proto         |  2 ++
 images/ipc-sem.proto         |  2 ++
 images/ipc-shm.proto         |  2 ++
 images/ipc-var.proto         |  2 ++
 images/macvlan.proto         |  2 ++
 images/memfd.proto           |  2 ++
 images/mm.proto              |  2 ++
 images/mnt.proto             |  2 ++
 images/netdev.proto          |  2 ++
 images/ns.proto              |  2 ++
 images/opts.proto            |  2 ++
 images/packet-sock.proto     |  2 ++
 images/pagemap.proto         |  2 ++
 images/pidns.proto           |  2 ++
 images/pipe-data.proto       |  2 ++
 images/pipe.proto            |  2 ++
 images/pstree.proto          |  2 ++
 images/regfile.proto         |  2 ++
 images/remap-file-path.proto |  2 ++
 images/rlimit.proto          |  2 ++
 images/rpc.proto             |  2 ++
 images/sa.proto              |  2 ++
 images/seccomp.proto         |  2 ++
 images/siginfo.proto         |  2 ++
 images/signalfd.proto        |  2 ++
 images/sit.proto             |  2 ++
 images/sk-inet.proto         |  2 ++
 images/sk-netlink.proto      |  2 ++
 images/sk-opts.proto         |  2 ++
 images/sk-packet.proto       |  2 ++
 images/sk-unix.proto         |  2 ++
 images/stats.proto           |  2 ++
 images/sysctl.proto          |  2 ++
 images/tcp-stream.proto      |  2 ++
 images/time.proto            |  2 ++
 images/timens.proto          |  2 ++
 images/timer.proto           |  2 ++
 images/timerfd.proto         |  2 ++
 images/tty.proto             |  2 ++
 images/tun.proto             |  2 ++
 images/userns.proto          |  2 ++
 images/utsns.proto           |  2 ++
 images/vma.proto             |  2 ++
 73 files changed, 164 insertions(+)
 create mode 100644 images/LICENSE

diff --git a/README.md b/README.md
index ee8987f3c..fd86b2c15 100644
--- a/README.md
+++ b/README.md
@@ -65,3 +65,6 @@ itself, and we have it available as the [libsoccr library](https://criu.org/Libs
 ## Licence
 
 The project is licensed under GPLv2 (though files sitting in the lib/ directory are LGPLv2.1).
+
+All files in the images/ directory are licensed under the Expat license (so-called MIT).
+See the images/LICENSE file.
diff --git a/images/LICENSE b/images/LICENSE
new file mode 100644
index 000000000..3c6395a10
--- /dev/null
+++ b/images/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2020 The CRIU developers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/images/autofs.proto b/images/autofs.proto
index 2146ca89f..5c8c216c8 100644
--- a/images/autofs.proto
+++ b/images/autofs.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message autofs_entry {
diff --git a/images/binfmt-misc.proto b/images/binfmt-misc.proto
index 82a86c8c9..a48d8724c 100644
--- a/images/binfmt-misc.proto
+++ b/images/binfmt-misc.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message binfmt_misc_entry {
diff --git a/images/bpfmap-data.proto b/images/bpfmap-data.proto
index dc3b0db01..b9502bb45 100644
--- a/images/bpfmap-data.proto
+++ b/images/bpfmap-data.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message bpfmap_data_entry {
diff --git a/images/bpfmap-file.proto b/images/bpfmap-file.proto
index 6560bb646..34a6c1dd2 100644
--- a/images/bpfmap-file.proto
+++ b/images/bpfmap-file.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/cgroup.proto b/images/cgroup.proto
index b8a545e3c..ee0354124 100644
--- a/images/cgroup.proto
+++ b/images/cgroup.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message cgroup_perms {
diff --git a/images/core-aarch64.proto b/images/core-aarch64.proto
index 83fdd6437..3356e6b75 100644
--- a/images/core-aarch64.proto
+++ b/images/core-aarch64.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/core-arm.proto b/images/core-arm.proto
index 3004346bb..f9c9e80cb 100644
--- a/images/core-arm.proto
+++ b/images/core-arm.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/core-mips.proto b/images/core-mips.proto
index 6391b1e86..ec06d6951 100755
--- a/images/core-mips.proto
+++ b/images/core-mips.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/core-ppc64.proto b/images/core-ppc64.proto
index aca1c2fae..6a27f9012 100644
--- a/images/core-ppc64.proto
+++ b/images/core-ppc64.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/core-s390.proto b/images/core-s390.proto
index 497c73b20..44130f206 100644
--- a/images/core-s390.proto
+++ b/images/core-s390.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/core-x86.proto b/images/core-x86.proto
index 2ed2ad35d..ee7be8ff1 100644
--- a/images/core-x86.proto
+++ b/images/core-x86.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/core.proto b/images/core.proto
index 9e9e39388..b713119f2 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "core-x86.proto";
diff --git a/images/cpuinfo.proto b/images/cpuinfo.proto
index 8ee629c2c..15860a90c 100644
--- a/images/cpuinfo.proto
+++ b/images/cpuinfo.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message cpuinfo_x86_entry {
diff --git a/images/creds.proto b/images/creds.proto
index 23b84c7e5..0007fb46d 100644
--- a/images/creds.proto
+++ b/images/creds.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message creds_entry {
diff --git a/images/eventfd.proto b/images/eventfd.proto
index ff9ced393..225462f76 100644
--- a/images/eventfd.proto
+++ b/images/eventfd.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "fown.proto";
diff --git a/images/eventpoll.proto b/images/eventpoll.proto
index 4a8d1b834..0f3e8a870 100644
--- a/images/eventpoll.proto
+++ b/images/eventpoll.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "fown.proto";
diff --git a/images/ext-file.proto b/images/ext-file.proto
index f820ffb07..8b4f82568 100644
--- a/images/ext-file.proto
+++ b/images/ext-file.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "fown.proto";
diff --git a/images/fdinfo.proto b/images/fdinfo.proto
index f5e18954b..88f1c1186 100644
--- a/images/fdinfo.proto
+++ b/images/fdinfo.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "regfile.proto";
diff --git a/images/fh.proto b/images/fh.proto
index 2da7e9deb..7a2ce484b 100644
--- a/images/fh.proto
+++ b/images/fh.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/fifo.proto b/images/fifo.proto
index f5b3283ff..ae6f48162 100644
--- a/images/fifo.proto
+++ b/images/fifo.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message fifo_entry {
diff --git a/images/file-lock.proto b/images/file-lock.proto
index 5dd8847cc..dcf3d871c 100644
--- a/images/file-lock.proto
+++ b/images/file-lock.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message file_lock_entry {
diff --git a/images/fown.proto b/images/fown.proto
index 9956b9865..b2e20b657 100644
--- a/images/fown.proto
+++ b/images/fown.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message fown_entry {
diff --git a/images/fs.proto b/images/fs.proto
index 5b940a1c1..158501ac9 100644
--- a/images/fs.proto
+++ b/images/fs.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message fs_entry {
diff --git a/images/fsnotify.proto b/images/fsnotify.proto
index 399a449a0..df6a667f8 100644
--- a/images/fsnotify.proto
+++ b/images/fsnotify.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/ghost-file.proto b/images/ghost-file.proto
index 0576089fd..9ecee41d2 100644
--- a/images/ghost-file.proto
+++ b/images/ghost-file.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/img-streamer.proto b/images/img-streamer.proto
index d1bd4cc19..48a3a93b0 100644
--- a/images/img-streamer.proto
+++ b/images/img-streamer.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 // This message is sent from CRIU to the streamer.
diff --git a/images/inventory.proto b/images/inventory.proto
index d7d0622c4..56e85a80a 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "core.proto";
diff --git a/images/ipc-desc.proto b/images/ipc-desc.proto
index b400bd7d2..8b4c7f5ba 100644
--- a/images/ipc-desc.proto
+++ b/images/ipc-desc.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message ipc_desc_entry {
diff --git a/images/ipc-msg.proto b/images/ipc-msg.proto
index 5260ea862..5b3103182 100644
--- a/images/ipc-msg.proto
+++ b/images/ipc-msg.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "ipc-desc.proto";
diff --git a/images/ipc-sem.proto b/images/ipc-sem.proto
index bffb581ae..71a2beb94 100644
--- a/images/ipc-sem.proto
+++ b/images/ipc-sem.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "ipc-desc.proto";
diff --git a/images/ipc-shm.proto b/images/ipc-shm.proto
index 31e172eb8..7865dad8d 100644
--- a/images/ipc-shm.proto
+++ b/images/ipc-shm.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "ipc-desc.proto";
diff --git a/images/ipc-var.proto b/images/ipc-var.proto
index f46fcdeeb..a5e2df9de 100644
--- a/images/ipc-var.proto
+++ b/images/ipc-var.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message ipc_var_entry {
diff --git a/images/macvlan.proto b/images/macvlan.proto
index 0ca2652f0..6f78076d8 100644
--- a/images/macvlan.proto
+++ b/images/macvlan.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message macvlan_link_entry {
diff --git a/images/memfd.proto b/images/memfd.proto
index ad5373d10..a944f145d 100644
--- a/images/memfd.proto
+++ b/images/memfd.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/mm.proto b/images/mm.proto
index e0f14c62f..b37668c4b 100644
--- a/images/mm.proto
+++ b/images/mm.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/mnt.proto b/images/mnt.proto
index 8983395ae..4abb7d1a9 100644
--- a/images/mnt.proto
+++ b/images/mnt.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/netdev.proto b/images/netdev.proto
index ae9c99531..748fd0200 100644
--- a/images/netdev.proto
+++ b/images/netdev.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "macvlan.proto";
diff --git a/images/ns.proto b/images/ns.proto
index 5ff000165..19ec641f6 100644
--- a/images/ns.proto
+++ b/images/ns.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message ns_file_entry {
diff --git a/images/opts.proto b/images/opts.proto
index 70c7fd481..95304a8c6 100644
--- a/images/opts.proto
+++ b/images/opts.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "google/protobuf/descriptor.proto";
diff --git a/images/packet-sock.proto b/images/packet-sock.proto
index 25875b470..d4b38cf15 100644
--- a/images/packet-sock.proto
+++ b/images/packet-sock.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/pagemap.proto b/images/pagemap.proto
index 42ed5ebb9..e6d341b0f 100644
--- a/images/pagemap.proto
+++ b/images/pagemap.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/pidns.proto b/images/pidns.proto
index 7ff049749..f7e92e3ec 100644
--- a/images/pidns.proto
+++ b/images/pidns.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message pidns_entry {
diff --git a/images/pipe-data.proto b/images/pipe-data.proto
index 78d53a890..040479e7c 100644
--- a/images/pipe-data.proto
+++ b/images/pipe-data.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message pipe_data_entry {
diff --git a/images/pipe.proto b/images/pipe.proto
index a9a213b90..2c0360e85 100644
--- a/images/pipe.proto
+++ b/images/pipe.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/pstree.proto b/images/pstree.proto
index 23e88aa74..fca284cb7 100644
--- a/images/pstree.proto
+++ b/images/pstree.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message pstree_entry {
diff --git a/images/regfile.proto b/images/regfile.proto
index 49884ddc9..bf22d2026 100644
--- a/images/regfile.proto
+++ b/images/regfile.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/remap-file-path.proto b/images/remap-file-path.proto
index 3cc78a25e..8635370c0 100644
--- a/images/remap-file-path.proto
+++ b/images/remap-file-path.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 enum remap_type {
diff --git a/images/rlimit.proto b/images/rlimit.proto
index 773a8df9c..3a3aeda30 100644
--- a/images/rlimit.proto
+++ b/images/rlimit.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message rlimit_entry {
diff --git a/images/rpc.proto b/images/rpc.proto
index df1b5aed2..c968cc991 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message criu_page_server_info {
diff --git a/images/sa.proto b/images/sa.proto
index 07fd4ffd3..07f71c3a0 100644
--- a/images/sa.proto
+++ b/images/sa.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/seccomp.proto b/images/seccomp.proto
index 177e5fd4a..e56cea3a1 100644
--- a/images/seccomp.proto
+++ b/images/seccomp.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message seccomp_filter {
diff --git a/images/siginfo.proto b/images/siginfo.proto
index e0d141e6c..6e696c7fd 100644
--- a/images/siginfo.proto
+++ b/images/siginfo.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message siginfo_entry {
diff --git a/images/signalfd.proto b/images/signalfd.proto
index 31d0d9f00..83546ae21 100644
--- a/images/signalfd.proto
+++ b/images/signalfd.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/sit.proto b/images/sit.proto
index 7ca91ccd0..539645858 100644
--- a/images/sit.proto
+++ b/images/sit.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/sk-inet.proto b/images/sk-inet.proto
index 75d565dcd..594e29c66 100644
--- a/images/sk-inet.proto
+++ b/images/sk-inet.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/sk-netlink.proto b/images/sk-netlink.proto
index 97fa44586..cfcc88daa 100644
--- a/images/sk-netlink.proto
+++ b/images/sk-netlink.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/sk-opts.proto b/images/sk-opts.proto
index 5bdc5063f..2377f6b62 100644
--- a/images/sk-opts.proto
+++ b/images/sk-opts.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message sk_opts_entry {
diff --git a/images/sk-packet.proto b/images/sk-packet.proto
index e15dd382a..b60a8870a 100644
--- a/images/sk-packet.proto
+++ b/images/sk-packet.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message scm_entry {
diff --git a/images/sk-unix.proto b/images/sk-unix.proto
index 2a3a7cc32..8ddbccde0 100644
--- a/images/sk-unix.proto
+++ b/images/sk-unix.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/stats.proto b/images/stats.proto
index 68d2f1bbb..64e46181d 100644
--- a/images/stats.proto
+++ b/images/stats.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 // This one contains statistics about dump/restore process
diff --git a/images/sysctl.proto b/images/sysctl.proto
index 4ecdf2701..0922b87ab 100644
--- a/images/sysctl.proto
+++ b/images/sysctl.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 enum SysctlType {
diff --git a/images/tcp-stream.proto b/images/tcp-stream.proto
index 174078305..c2244ba3b 100644
--- a/images/tcp-stream.proto
+++ b/images/tcp-stream.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/time.proto b/images/time.proto
index 4bb2b9459..5e5e7eee4 100644
--- a/images/time.proto
+++ b/images/time.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message timeval {
diff --git a/images/timens.proto b/images/timens.proto
index a8272609b..79097a18d 100644
--- a/images/timens.proto
+++ b/images/timens.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message timespec {
diff --git a/images/timer.proto b/images/timer.proto
index a254a6f80..4eb5452b3 100644
--- a/images/timer.proto
+++ b/images/timer.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message itimer_entry {
diff --git a/images/timerfd.proto b/images/timerfd.proto
index 243281549..0bdf12538 100644
--- a/images/timerfd.proto
+++ b/images/timerfd.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/tty.proto b/images/tty.proto
index ed664ef51..14bc543ec 100644
--- a/images/tty.proto
+++ b/images/tty.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/tun.proto b/images/tun.proto
index b70c9ed67..ad61037db 100644
--- a/images/tun.proto
+++ b/images/tun.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";
diff --git a/images/userns.proto b/images/userns.proto
index 16be6b161..3a23cbbf8 100644
--- a/images/userns.proto
+++ b/images/userns.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message uid_gid_extent {
diff --git a/images/utsns.proto b/images/utsns.proto
index a29aea1c2..efc689fa5 100644
--- a/images/utsns.proto
+++ b/images/utsns.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 message utsns_entry {
diff --git a/images/vma.proto b/images/vma.proto
index 7085f4237..0c07d51c6 100644
--- a/images/vma.proto
+++ b/images/vma.proto
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: MIT
+
 syntax = "proto2";
 
 import "opts.proto";

From e3b694392dbaff573194c22f9d637e706159b72e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 12 Apr 2021 23:30:45 +0100
Subject: [PATCH 0569/1854] scripts/build: drop obsolete ENV1 variable

The ENV1 variable was first introduced with commit
7290de5 (travis: enable ccache for docker/qemu builds)
and it is not used anymore.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.alpine       | 2 --
 scripts/build/Dockerfile.centos7      | 2 --
 scripts/build/Dockerfile.centos8      | 2 --
 scripts/build/Dockerfile.fedora.tmpl  | 2 --
 scripts/build/Dockerfile.linux32.tmpl | 2 --
 scripts/build/Dockerfile.tmpl         | 2 --
 6 files changed, 12 deletions(-)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 058b46ad6..a6579c0bb 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -1,6 +1,5 @@
 FROM alpine
 ARG CC=gcc
-ARG ENV1=FOOBAR
 
 RUN apk update && apk add \
 	$CC \
@@ -25,7 +24,6 @@ RUN apk update && apk add \
 
 COPY . /criu
 WORKDIR /criu
-ENV $ENV1=yes
 RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 RUN apk add \
diff --git a/scripts/build/Dockerfile.centos7 b/scripts/build/Dockerfile.centos7
index d10ec48e1..21e70ff0e 100644
--- a/scripts/build/Dockerfile.centos7
+++ b/scripts/build/Dockerfile.centos7
@@ -1,7 +1,6 @@
 FROM centos:7
 
 ARG CC=gcc
-ARG ENV1=FOOBAR
 
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 RUN yum install -y \
@@ -38,7 +37,6 @@ RUN yum install -y \
 COPY . /criu
 WORKDIR /criu
 
-ENV $ENV1=yes
 RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
index ff6c15f7f..488f95d65 100644
--- a/scripts/build/Dockerfile.centos8
+++ b/scripts/build/Dockerfile.centos8
@@ -1,7 +1,6 @@
 FROM registry.centos.org/centos/centos:8
 
 ARG CC=gcc
-ARG ENV1=FOOBAR
 
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
 RUN yum config-manager --set-enabled powertools
@@ -43,7 +42,6 @@ ENV PYTHON=python3
 COPY . /criu
 WORKDIR /criu
 
-ENV $ENV1=yes
 RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 2ee20ae38..9d3bb0f87 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -1,5 +1,4 @@
 ARG CC=gcc
-ARG ENV1=FOOBAR
 
 COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
 RUN /bin/prepare-for-fedora-rawhide.sh
@@ -7,7 +6,6 @@ RUN /bin/prepare-for-fedora-rawhide.sh
 COPY . /criu
 WORKDIR /criu
 
-ENV $ENV1=yes
 RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index cf26b2756..a15038631 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -1,5 +1,4 @@
 ARG CC=gcc
-ARG ENV1=FOOBAR
 
 COPY scripts/ci/apt-install /bin/apt-install
 
@@ -27,7 +26,6 @@ RUN apt-install \
 
 COPY . /criu
 WORKDIR /criu
-ENV $ENV1=yes
 
 RUN uname -m && setarch linux32 uname -m && setarch --list
 
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index c25979624..feee8710c 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -1,5 +1,4 @@
 ARG CC=gcc
-ARG ENV1=FOOBAR
 
 COPY scripts/ci/apt-install /bin/apt-install
 
@@ -29,7 +28,6 @@ RUN apt-install \
 
 COPY . /criu
 WORKDIR /criu
-ENV $ENV1=yes
 
 RUN make mrproper && date && \
 # Check single object build

From cdb0d427020f0531f5a35146513c3a36b6eece11 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 15 Mar 2021 17:07:01 +0100
Subject: [PATCH 0570/1854] net: allow restoring of precreated veth devices

This introduces a new option

--external netdev[IFNAME]:ORIGNAME

which informs CRIU that this is pre-created network device that it is
supposed to move into a target network namespace. The "netdev" name was
chosen to make it flexible enough to e.g. also cover physical devices if
that is desirable at some point. For example:

--external netdev[eth0]:vethA23adf3

would instruct CRIU to move the network device with the name
"vethA23adf3" into a target network namespace renaming it to "eth0"
while doing so.

In order to restore ip addresses and additional data correctly CRIU
needs to move the network device into the target netns with the recorded
ifindex. This requires a kernel patch as discussed in [1]. The patch has
been merged into net-next and is expected to show up in the v5.13
release (cf. [2])

The motivating use-case can be found in [1]. But I'm repeating it mostly
verbatim here:

Assume a container with a standard veth tunnel for an unprivileged container:
<veth-host> <-> <bridge-host> <-> <veth-container>

When LXD starts a container it will create the veth pair in the host
namespaces with random names, let's assume:
<veth-host> := vethHOST
<veth-container> := vethCONT

The LXD generates a config for the container and tells the container to
use vethCONT as network device and usually also tells it to rename that
device to something more sensible like eth3. The container will then use
netlink to move and rename the vethCONT device into it's network
namespace as eth3 during startup.

Users may use lxc snapshot --stateful to create a CRIU dump.
And they can restore via
lxc restore --stateful <container-name> <stateful-snapshot-name>

And this is where things get hairy currently. LXD's network models
requires it to always be in control of all network devices and so
similar to regular startup it will precreate the two veth devices
vethHOST and vethCONT and tell LXC about it.

What we would like CRIU to be able to do is to add a commandline option
to tell CRIU to not bother creating the veth device but instead to
simply assume that someone else will create, move, and rename it and
instead  just restore routes, iptables, addresses and so on.

With this kernel patch applied I can successfully dump and restore a
LXD containers:

ubuntu@f2-vm:~/src/bin$ lxc launch images:alpine/edge alp1
Creating alp1
Starting alp1

ubuntu@f2-vm:~/src/bin$ lxc snapshot --stateful alp1

ubuntu@f2-vm:~/src/bin$ lxc list
+------+---------+----------------------+-----------------------------------------------+-----------+-----------+
| NAME |  STATE  |         IPV4         |                     IPV6                      |   TYPE    | SNAPSHOTS |
+------+---------+----------------------+-----------------------------------------------+-----------+-----------+
| alp1 | RUNNING | 10.47.211.144 (eth0) | fd42:8722:277d:69cf:216:3eff:fe69:9b8b (eth0) | CONTAINER | 1         |
+------+---------+----------------------+-----------------------------------------------+-----------+-----------+

ubuntu@f2-vm:~/src/bin$ lxc restore --stateful alp1 snap0

ubuntu@f2-vm:~/src/bin$ lxc list
+------+---------+----------------------+-----------------------------------------------+-----------+-----------+
| NAME |  STATE  |         IPV4         |                     IPV6                      |   TYPE    | SNAPSHOTS |
+------+---------+----------------------+-----------------------------------------------+-----------+-----------+
| alp1 | RUNNING | 10.47.211.144 (eth0) | fd42:8722:277d:69cf:216:3eff:fe69:9b8b (eth0) | CONTAINER | 1         |
+------+---------+----------------------+-----------------------------------------------+-----------+-----------+

ubuntu@f2-vm:~/src/bin$ lxc exec alp1 -- sh
~ # ip addr
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN qlen 1000
    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
    inet 127.0.0.1/8 scope host lo
       valid_lft forever preferred_lft forever
    inet6 ::1/128 scope host
       valid_lft forever preferred_lft forever
15: eth0@if18: <BROADCAST,MULTICAST,UP,LOWER_UP,M-DOWN> mtu 1500 qdisc noqueue state UP qlen 1000
    link/ether 00:16:3e:69:9b:8b brd ff:ff:ff:ff:ff:ff
    inet 10.47.211.144/24 brd 10.47.211.255 scope global eth0
       valid_lft forever preferred_lft forever
    inet6 fd42:8722:277d:69cf:216:3eff:fe69:9b8b/64 scope global dynamic flags 100
       valid_lft 86355sec preferred_lft 86355sec
    inet6 fe80::216:3eff:fe69:9b8b/64 scope link
       valid_lft forever preferred_lft forever

[1]: https://github.com/checkpoint-restore/criu/issues/1421
[2]: https://patchwork.kernel.org/project/netdevbpf/patch/20210406075448.203816-1-avagin@gmail.com/
Fixes: #1421
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/crtools.c |   1 +
 criu/net.c     | 117 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/criu/crtools.c b/criu/crtools.c
index 2eb5dba42..47b01af44 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -373,6 +373,7 @@ usage:
 "                            veth[IFNAME]:OUTNAME{@BRIDGE}\n"
 "                            macvlan[IFNAME]:OUTNAME\n"
 "                            mnt[COOKIE]:ROOT\n"
+"                            netdev[IFNAME]:ORIGNAME\n"
 "\n"
 "* Special resources support:\n"
 "     --" SK_EST_PARAM "  checkpoint/restore established TCP connections\n"
diff --git a/criu/net.c b/criu/net.c
index 91990412f..f9e1767a4 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1171,6 +1171,12 @@ static int restore_link_cb(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 	return 0;
 }
 
+static int restore_newlink_cb(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
+{
+	pr_info("Got response on RTM_NEWLINK =)\n");
+	return 0;
+}
+
 struct newlink_req {
 	struct nlmsghdr h;
 	struct ifinfomsg i;
@@ -1269,6 +1275,110 @@ static int restore_one_link(struct ns_id *ns, struct net_link *link, int nlsk,
 	return do_rtm_link_req(RTM_NEWLINK, link, nlsk, ns, link_info, extras);
 }
 
+struct move_req {
+	struct newlink_req req;
+	char ifnam[IFNAMSIZ];
+};
+
+static int move_veth_cb(void *arg, int fd, pid_t pid)
+{
+	int fd_ns_old = -1, ret = -1;
+	struct move_req *mvreq = arg;
+	struct newlink_req *req = &mvreq->req;
+	int ifindex, nlsk;
+
+	if (!(root_ns_mask & CLONE_NEWUSER)) {
+		int fd_ns;
+
+		fd_ns = get_service_fd(NS_FD_OFF);
+		if (switch_ns_by_fd(fd_ns, &net_ns_desc, &fd_ns_old))
+			return -1;
+	}
+
+	/* Retrieve ifindex of precreated veth device in source netns. */
+	ifindex = if_nametoindex(mvreq->ifnam);
+	if (!ifindex)
+		goto out;
+	req->i.ifi_index = ifindex;
+
+	/* Tell netlink what netns we want to move that veth device into. */
+	addattr_l(&req->h, sizeof(*req), IFLA_NET_NS_FD, &fd, sizeof(fd));
+
+	nlsk = socket(PF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
+	if (nlsk < 0)
+		goto out;
+
+	ret = do_rtnl_req(nlsk, req, req->h.nlmsg_len, restore_newlink_cb, NULL, NULL, NULL);
+	close(nlsk);
+
+out:
+	if (fd_ns_old >= 0)
+		ret = restore_ns(fd_ns_old, &net_ns_desc);
+
+	return ret;
+}
+
+static int move_veth(const char *netdev, struct ns_id *ns,
+		     struct net_link *link, int nlsk)
+{
+
+	NetDeviceEntry *nde = link->nde;
+	struct newlink_req *req;
+	struct move_req mvreq;
+	size_t len_val;
+	int ret;
+
+	/*
+	 * We require a target ifindex otherwise we can't restore addresses
+	 * later on as ip stores ifindex in its address dump for network
+	 * devices.
+	 */
+	if (!nde->ifindex)
+		return -1;
+
+	memset(&mvreq.req, 0, sizeof(mvreq.req));
+	req = &mvreq.req;
+
+	req->h.nlmsg_len	= NLMSG_LENGTH(sizeof(struct ifinfomsg));
+	req->h.nlmsg_flags	= NLM_F_REQUEST|NLM_F_ACK;
+	req->h.nlmsg_type	= RTM_NEWLINK;
+	req->h.nlmsg_seq	= CR_NLMSG_SEQ;
+
+	req->i.ifi_family	= AF_UNSPEC;
+	req->i.ifi_flags	= nde->flags;
+
+	/* Tell netlink what name we want in the target netns. */
+	addattr_l(&req->h, sizeof(*req), IFLA_IFNAME,
+		  nde->name, strlen(nde->name));
+
+	/* Tell netlink what mtu we want in the target netns. */
+	addattr_l(&req->h, sizeof(*req), IFLA_MTU,
+		  &nde->mtu, sizeof(nde->mtu));
+
+	/* Tell netlink what ifindex we want in the target netns. */
+	addattr_l(&req->h, sizeof(*req), IFLA_NEW_IFINDEX,
+		  &nde->ifindex, sizeof(nde->ifindex));
+
+	if (nde->has_address) {
+		pr_debug("Restore ll addr (%02x:../%d) for device with target ifindex %d\n",
+			 (int)nde->address.data[0], (int)nde->address.len, nde->ifindex);
+		addattr_l(&req->h, sizeof(*req), IFLA_ADDRESS,
+			  nde->address.data, nde->address.len);
+	}
+
+	len_val = strlen(netdev);
+	if (len_val >= IFNAMSIZ)
+		return -1;
+	strlcpy(mvreq.ifnam, netdev, IFNAMSIZ);
+
+	ret = userns_call(move_veth_cb, 0, &mvreq, sizeof(mvreq), ns->net.ns_fd);
+	if (ret < 0)
+		return -1;
+
+	link->created = true;
+	return 0;
+}
+
 #ifndef VETH_INFO_MAX
 enum {
 	VETH_INFO_UNSPEC,
@@ -1600,6 +1710,7 @@ skip:;
 static int __restore_link(struct ns_id *ns, struct net_link *link, int nlsk)
 {
 	NetDeviceEntry *nde = link->nde;
+	char key[100], *val;
 
 	pr_info("Restoring link %s type %d\n", nde->name, nde->type);
 
@@ -1610,6 +1721,12 @@ static int __restore_link(struct ns_id *ns, struct net_link *link, int nlsk)
 	case ND_TYPE__VENET:
 		return restore_one_link(ns, link, nlsk, venet_link_info, NULL);
 	case ND_TYPE__VETH:
+		/* Handle pre-created veth devices we just need to move over. */
+		snprintf(key, sizeof(key), "netdev[%s]", nde->name);
+		val = external_lookup_by_key(key);
+		if (!IS_ERR_OR_NULL(val))
+			return move_veth(val, ns, link, nlsk);
+
 		return restore_one_link(ns, link, nlsk, veth_link_info, NULL);
 	case ND_TYPE__TUN:
 		return restore_one_tun(ns, link, nlsk);

From 264b4a8d24ea86396ca508cbce24855ff704638e Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Tue, 13 Apr 2021 13:09:17 +0800
Subject: [PATCH 0571/1854] tiny fix on function dump_empty_fs

return value of is_empty_dir:
*  < 0 : open directory stream failed
*    0 : directory is not empty
*    1 : directory is empty

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/filesystems.c | 4 ++--
 criu/util.c        | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/criu/filesystems.c b/criu/filesystems.c
index fc53f4e5d..94d348a8e 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -656,12 +656,12 @@ static int dump_empty_fs(struct mount_info *pm)
 		return fd;
 
 	ret = is_empty_dir(fd);
-	if (ret < 0) {
+	if (ret == 0) {
 		pr_err("%s isn't empty\n", pm->fstype->name);
 		return -1;
 	}
 
-	return ret ? 0 : -1;
+	return ret == 1 ? 0 : -1;
 }
 
 /*
diff --git a/criu/util.c b/criu/util.c
index 76624dc5a..ca09f02a1 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -731,7 +731,13 @@ int is_root_user(void)
 /*
  * is_empty_dir will always close the FD dirfd: either implicitly
  * via closedir or explicitly in case fdopendir had failed
+ *
+ * return values:
+ *   < 0 : open directory stream failed
+ *     0 : directory is not empty
+ *     1 : directory is empty
  */
+
 int is_empty_dir(int dirfd)
 {
 	int ret = 0;
@@ -740,6 +746,7 @@ int is_empty_dir(int dirfd)
 
 	fdir = fdopendir(dirfd);
 	if (!fdir) {
+		pr_perror("open directory stream by fd %d failed", dirfd);
 		close_safe(&dirfd);
 		return -1;
 	}

From f432186e73585dba598a98601c2b18467272f32c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 9 Apr 2021 21:41:02 +0100
Subject: [PATCH 0572/1854] Dockerfile: use 'git clean' before build

The 'make docker-build' command creates a copy of all files from the
in local CRIU clone inside a container.

Then it runs 'make mrproper' inside the container, followed by
compilation of criu, followed by another 'make mrproper'.

After the last mrproper command, it attempts to check if
the clean was successful by running 'git clean'.

However, this check fails when the local repository contains
files that are not part of the repository.

For example, the vscode editor creates the folder '.vscode/'
which would be copied inside the docker container and cause
'make docker-build' to fail.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index feee8710c..5f045c917 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -29,7 +29,7 @@ RUN apt-install \
 COPY . /criu
 WORKDIR /criu
 
-RUN make mrproper && date && \
+RUN git clean -dfx && date && \
 # Check single object build
 	make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
 # Compile criu

From 3074b6d5a25d9f49c06957c5f1066769cf5651ef Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 10 Apr 2021 08:05:02 +0100
Subject: [PATCH 0573/1854] Dockerfile: re-build criu after clean

In order to be able to run the zdtm tests inside a container,
we have to make sure that all protobuf sources have been compiled.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.tmpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 5f045c917..66e3d8c59 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -39,7 +39,8 @@ RUN git clean -dfx && date && \
 	make mrproper && ! git clean -ndx --exclude=scripts/build \
 	--exclude=.config --exclude=test | grep .
 
-# Compile tests
-RUN date && make -j $(nproc) CC="$CC" -C test/zdtm && date
+# Re-compile criu and compile tests for 'make docker-test'
+RUN make -j $(nproc) CC="$CC" && \
+	date &&  make -j $(nproc) CC="$CC" -C test/zdtm && date
 
 #RUN make test/compel/handle_binary && ./test/compel/handle_binary

From e3c0fa7011490b5a46b85dda68f1111775b80b64 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 10 Apr 2021 08:06:59 +0100
Subject: [PATCH 0574/1854] Dockerfile: add missing test dependencies

This patch adds missing dependencies required to run
the zdtm tests.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile                      | 6 +++---
 scripts/build/Dockerfile.tmpl | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9a43fef14..66db87c92 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ ifeq ($(ARCH),x86)
 endif
 
 ifeq ($(ARCH),mips)
-        DEFINES		:= -DCONFIG_MIPS 
+        DEFINES		:= -DCONFIG_MIPS
 endif
 
 #
@@ -369,11 +369,11 @@ gcov:
 .PHONY: gcov
 
 docker-build:
-	$(MAKE) -C scripts/build/ x86_64 
+	$(MAKE) -C scripts/build/ x86_64
 .PHONY: docker-build
 
 docker-test:
-	docker run --rm -it --privileged criu-x86_64 ./test/zdtm.py run -a -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup
+	docker run --rm -it --privileged -v /lib/modules:/lib/modules criu-x86_64 ./test/zdtm.py run -a -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup
 .PHONY: docker-test
 
 help:
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 66e3d8c59..e0e72372d 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -2,6 +2,8 @@ ARG CC=gcc
 
 COPY scripts/ci/apt-install /bin/apt-install
 
+# On Ubuntu, kernel modules such as ip_tables and xt_mark may not be loaded by default
+# We need to install kmod to enable iptables to load these modules for us.
 RUN apt-install \
 	libnet-dev \
 	libnl-route-3-dev \
@@ -20,10 +22,15 @@ RUN apt-install \
 	libprotobuf-c-dev \
 	libprotobuf-dev \
 	libselinux-dev \
+	iproute2 \
+	kmod \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
+	python-is-python3 \
 	python3-minimal \
+	python3-protobuf \
+	python3-yaml \
 	python3-future
 
 COPY . /criu

From 5d8ecee0accf07f5f20df99be3472e54f7f63f0f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 10 Apr 2021 08:08:42 +0100
Subject: [PATCH 0575/1854] docker-test: use host cgroup & network ns

The test/zdtm_mount_cgroups script fails with 'permission denied'
when running tests with private cgroup namespace.

Using the host network namespace allows us to test criu as if
it is running on the host, sharing iptables rules etc.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 66db87c92..7d3d00cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -373,7 +373,8 @@ docker-build:
 .PHONY: docker-build
 
 docker-test:
-	docker run --rm -it --privileged -v /lib/modules:/lib/modules criu-x86_64 ./test/zdtm.py run -a -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup
+	docker run --rm -it --privileged -v /lib/modules:/lib/modules --network=host --cgroupns=host criu-x86_64 \
+		./test/zdtm.py run -a -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup
 .PHONY: docker-test
 
 help:

From 27b9ed53ead066ab916134d51a18107695640f56 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 10 Apr 2021 10:10:03 +0100
Subject: [PATCH 0576/1854] Makefile: update excluded tests for docker-test

All zdtm tests pass on Fedora 33 for `make docker-build && make docker-test`
with devicemapper storage driver.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7d3d00cdc..5e9c4c653 100644
--- a/Makefile
+++ b/Makefile
@@ -374,7 +374,7 @@ docker-build:
 
 docker-test:
 	docker run --rm -it --privileged -v /lib/modules:/lib/modules --network=host --cgroupns=host criu-x86_64 \
-		./test/zdtm.py run -a -x tcp6 -x tcpbuf6 -x static/rtc -x cgroup
+		./test/zdtm.py run -a --keep-going --ignore-taint
 .PHONY: docker-test
 
 help:

From 6c77d722654426f280a27eaf9eb7a1faf66f2899 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 12 Apr 2021 07:57:28 +0100
Subject: [PATCH 0577/1854] Makefile: docker-test don't use interactive tty

Running zdtm tests does not require input and therefore it is not
necessary to use -it. This change also allows to run the test in CI
where it currently fails with:

the input device is not a TTY
make: *** [Makefile:388: docker-test] Error 1

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5e9c4c653..b627c2099 100644
--- a/Makefile
+++ b/Makefile
@@ -373,7 +373,7 @@ docker-build:
 .PHONY: docker-build
 
 docker-test:
-	docker run --rm -it --privileged -v /lib/modules:/lib/modules --network=host --cgroupns=host criu-x86_64 \
+	docker run --rm --privileged -v /lib/modules:/lib/modules --network=host --cgroupns=host criu-x86_64 \
 		./test/zdtm.py run -a --keep-going --ignore-taint
 .PHONY: docker-test
 

From 3ca09f5c9fa942acd4c8d44d9a630698e604f023 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 28 Feb 2021 20:37:10 +0000
Subject: [PATCH 0578/1854] ci: exclude lazy-thp for remote pages over tls

Temporarily disable this test until the #1380 is resolved.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index f1ed6bcfc..8fabf4a1d 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -221,8 +221,10 @@ LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 ./test/zdtm.py run $LAZY_OPTS --lazy-pages
 # shellcheck disable=SC2086
 ./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages
+# FIXME: post-copy migration of THP over TLS (sometimes) fails with:
+#     Error (criu/tls.c:321): tls: Pull callback recv failed: Connection reset by peer
 # shellcheck disable=SC2086
-./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
+./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls -x lazy-thp
 
 bash -x ./test/jenkins/criu-fault.sh
 if [ "$UNAME_M" == "x86_64" ]; then

From f60f24bfbed0f974a94b6807d38cbd6459a1acde Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 20 Apr 2021 08:49:26 +0300
Subject: [PATCH 0579/1854] kerndat: check whether IFLA_NEW_IFINDEX is
 supported

Send an RTM_SETLINK request with a negative IFLA_NEW_IFINDEX. If
IFLA_NEW_IFINDEX is supported, the kernel will return ERANGE.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-check.c        | 12 +++++++++
 criu/include/kerndat.h |  1 +
 criu/include/net.h     |  2 ++
 criu/kerndat.c         |  4 +++
 criu/net.c             | 61 ++++++++++++++++++++++++++++++++++++++++--
 5 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 66a99cf99..57b6316c2 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1276,6 +1276,16 @@ static int check_time_namespace(void)
 	return 0;
 }
 
+static int check_newifindex(void)
+{
+	if (!kdat.has_newifindex) {
+		pr_err("IFLA_NEW_IFINDEX isn't supported\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int check_net_diag_raw(void)
 {
 	check_sock_diag();
@@ -1394,6 +1404,7 @@ int cr_check(void)
 		ret |= check_net_diag_raw();
 		ret |= check_clone3_set_tid();
 		ret |= check_time_namespace();
+		ret |= check_newifindex();
 	}
 
 	/*
@@ -1499,6 +1510,7 @@ static struct feature_list feature_list[] = {
 	{ "timens", check_time_namespace},
 	{ "external_net_ns", check_external_net_ns},
 	{ "clone3_set_tid", check_clone3_set_tid},
+	{ "newifindex", check_newifindex},
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index ad5f7d324..8b7088df0 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -68,6 +68,7 @@ struct kerndat_s {
 	bool has_fsopen;
 	bool has_clone3_set_tid;
 	bool has_timens;
+	bool has_newifindex;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/net.h b/criu/include/net.h
index 0a556f3da..c83c79377 100644
--- a/criu/include/net.h
+++ b/criu/include/net.h
@@ -45,6 +45,8 @@ extern int veth_pair_add(char *in, char *out);
 extern int macvlan_ext_add(struct external *ext);
 extern int move_veth_to_bridge(void);
 
+extern int kerndat_has_newifindex(void);
+
 extern int kerndat_link_nsid(void);
 extern int net_get_nsid(int rtsk, int fd, int *nsid);
 extern struct ns_id *net_get_root_ns(void);
diff --git a/criu/kerndat.c b/criu/kerndat.c
index b2c47c532..df7eb070f 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1185,6 +1185,10 @@ int kerndat_init(void)
 		pr_err("has_time_namespace failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_newifindex()) {
+		pr_err("kerndat_has_newifindex failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/net.c b/criu/net.c
index f9e1767a4..f6b6c8c09 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1167,13 +1167,13 @@ static int dump_links(int rtsk, struct ns_id *ns, struct cr_imgset *fds)
 
 static int restore_link_cb(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 {
-	pr_info("Got response on SETLINK =)\n");
+	pr_info("Got response on SETLINK.\n");
 	return 0;
 }
 
 static int restore_newlink_cb(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 {
-	pr_info("Got response on RTM_NEWLINK =)\n");
+	pr_info("Got response on RTM_NEWLINK.\n");
 	return 0;
 }
 
@@ -1251,6 +1251,58 @@ static int populate_newlink_req(struct ns_id *ns, struct newlink_req *req,
 	return 0;
 }
 
+static int kerndat_newifindex_err_cb(int err, struct ns_id *ns, void *arg)
+{
+	switch (err) {
+	case -ENODEV:
+		kdat.has_newifindex = false;
+		break;
+	case -ERANGE:
+		kdat.has_newifindex = true;
+		break;
+	default:
+		pr_err("Unexpected error: %d(%s)\n", err, strerror(-err));
+		break;
+	}
+	return 0;
+}
+
+int kerndat_has_newifindex(void)
+{
+	struct newlink_req req = {};
+	int ifindex = -1;
+	int sk, ret;
+
+	kdat.has_newifindex = false;
+	sk = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+	if (sk < 0) {
+		pr_perror("Unable to create a netlink socket");
+		return -1;
+	}
+	memset(&req, 0, sizeof(req));
+
+	req.h.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+	req.h.nlmsg_flags = NLM_F_REQUEST|NLM_F_ACK|NLM_F_CREATE;
+	req.h.nlmsg_type = RTM_SETLINK;
+	req.h.nlmsg_seq = CR_NLMSG_SEQ;
+	req.i.ifi_family = AF_UNSPEC;
+
+	/*
+	 * ifindex is negative, so the kernel will return ERANGE if
+	 * IFLA_NEW_IFINDEX is supported.
+	 */
+	addattr_l(&req.h, sizeof(req), IFLA_NEW_IFINDEX,
+		  &ifindex, sizeof(ifindex));
+	/* criu-kdat doesn't exist, so the kernel will return ENODEV. */
+	addattr_l(&req.h, sizeof(req), IFLA_IFNAME, "criu-kdat", 9);
+
+	ret = do_rtnl_req(sk, &req, sizeof(req), restore_link_cb,
+			  kerndat_newifindex_err_cb, NULL, NULL);
+	close(sk);
+	return ret;
+}
+
+
 static int do_rtm_link_req(int msg_type,
 			struct net_link *link, int nlsk, struct ns_id *ns,
 			link_info_t link_info, struct newlink_extras *extras)
@@ -1328,6 +1380,11 @@ static int move_veth(const char *netdev, struct ns_id *ns,
 	size_t len_val;
 	int ret;
 
+	if (!kdat.has_newifindex) {
+		pr_err("Unable to specify ifindex in the target namespace.\n");
+		return -1;
+	}
+
 	/*
 	 * We require a target ifindex otherwise we can't restore addresses
 	 * later on as ip stores ifindex in its address dump for network

From 5e3b07b95dd1c5c63eb6bd2005155c6f51c498a7 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 15 Apr 2021 09:56:39 +0300
Subject: [PATCH 0580/1854] test/zdtm: check that restore can handle precreated
 veth devices

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile            |  1 +
 test/zdtm/static/cr_veth02.c         | 56 ++++++++++++++++++++++++++++
 test/zdtm/static/cr_veth02.checkskip |  2 +
 test/zdtm/static/cr_veth02.desc      |  7 ++++
 test/zdtm/static/cr_veth02.hook      | 43 +++++++++++++++++++++
 5 files changed, 109 insertions(+)
 create mode 100644 test/zdtm/static/cr_veth02.c
 create mode 100755 test/zdtm/static/cr_veth02.checkskip
 create mode 100644 test/zdtm/static/cr_veth02.desc
 create mode 100755 test/zdtm/static/cr_veth02.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 53dee92c5..598e8d3b9 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -208,6 +208,7 @@ TST_NOFILE	:=				\
 		macvlan			\
 		sit				\
 		cr_veth				\
+		cr_veth02			\
 		sock_peercred			\
 		s390x_mmap_high			\
 		uffd-events			\
diff --git a/test/zdtm/static/cr_veth02.c b/test/zdtm/static/cr_veth02.c
new file mode 100644
index 000000000..9e75906c0
--- /dev/null
+++ b/test/zdtm/static/cr_veth02.c
@@ -0,0 +1,56 @@
+#include <stdlib.h>
+#include <stdbool.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Restore with precreated veth devices.";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+
+#define IF_NAME "zdtmvthc0"
+
+static bool wait_for_veth(void)
+{
+	int i;
+
+	for (i = 0; i < 10; i++) {
+		if (system("ip addr list dev " IF_NAME) == 0)
+			return true;
+
+		sleep(1);
+	}
+
+	return false;
+}
+
+int main(int argc, char **argv)
+{
+	test_init(argc, argv);
+
+	if (!wait_for_veth()) {
+		fail("failed to inject veth device");
+		return 1;
+	}
+
+	if (system("ip addr list dev " IF_NAME " | sed -e 's/@.*://' > cr_veth02.dump.state")) {
+		fail("can't save net config");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (system("ip addr list dev " IF_NAME " | sed -e 's/@.*://' > cr_veth02.rst.state")) {
+		fail("can't get net config");
+		return 1;
+	}
+
+	if (system("diff cr_veth02.rst.state cr_veth02.dump.state")) {
+		fail("Net config differs after restore");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/cr_veth02.checkskip b/test/zdtm/static/cr_veth02.checkskip
new file mode 100755
index 000000000..2995e0cdf
--- /dev/null
+++ b/test/zdtm/static/cr_veth02.checkskip
@@ -0,0 +1,2 @@
+#!/bin/bash
+unshare --net ip link add type veth
diff --git a/test/zdtm/static/cr_veth02.desc b/test/zdtm/static/cr_veth02.desc
new file mode 100644
index 000000000..d30d9d7cd
--- /dev/null
+++ b/test/zdtm/static/cr_veth02.desc
@@ -0,0 +1,7 @@
+{
+    'deps': ['/bin/sh', '/bin/sed', '/bin/grep', '/sbin/ip|/bin/ip', '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns',
+    'ropts': '--external netdev[zdtmvthc0]:zdtmvthc1',
+    'feature': 'newifindex',
+}
diff --git a/test/zdtm/static/cr_veth02.hook b/test/zdtm/static/cr_veth02.hook
new file mode 100755
index 000000000..53f7224d6
--- /dev/null
+++ b/test/zdtm/static/cr_veth02.hook
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if [ "$1" == "--post-start" ]; then
+	set -xe
+
+	PIDF="zdtm/static/cr_veth02.pid.inprogress"
+	while [ ! -f "$PIDF" ]; do
+		sleep ".1"
+	done
+
+	TPID=$(cat $PIDF)
+	ps xaf
+	echo "-> $TPID"
+
+	ip link add zdtmvthc0 type veth peer name zdtmvthh0
+	ip link set zdtmvthc0 netns $TPID
+	nsenter -n -t $TPID ip addr add 192.168.124.124/32 dev zdtmvthc0
+	nsenter -n -t $TPID ip addr
+
+elif [ "$1" == "--post-restore" ]; then
+	PIDF="zdtm/static/cr_veth02.pid"
+	TPID=$(cat $PIDF)
+
+	nsenter -n -t $TPID ip addr
+
+	echo "Device OK"
+elif [ "$1" == "--pre-restore" ]; then
+	# Wait for the link to die
+	ip link list
+	while ip link list zdtmvthh0 ; do
+		sleep ".5"
+	done
+	ip link add zdtmvthc1 type veth peer name zdtmvthh1
+elif [ "$1" == "--clean" ]; then
+	# Wait for the link to die
+	ip link list
+	while ip link list zdtmvthh0 ; do
+		sleep ".5"
+	done
+	while ip link list zdtmvthh1 ; do
+		sleep ".5"
+	done
+fi

From f3be776ccc84857736ca1e4d2aa3d312fd00472d Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 13:15:25 -0700
Subject: [PATCH 0581/1854] Drop \n from pr_perror

Another pr_perror spring cleaning time!

As pr_perror adds a semicolon, an strerror(errno), and a newline,
there's no need to add one manually.

Brought to you by

	for f in $(git grep -l pr_perror); do
		test -f $f || continue
		echo $f
		sed -i '\%^[[:space:]]*pr_perror(.*\\n"%s/\\n//' $f
	done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 compel/arch/s390/src/lib/infect.c           | 18 +++++++++---------
 compel/arch/x86/src/lib/thread_area.c       |  2 +-
 criu/arch/x86/kerndat.c                     |  2 +-
 criu/cr-restore.c                           |  2 +-
 criu/fdstore.c                              |  2 +-
 criu/file-lock.c                            | 12 ++++++------
 criu/kerndat.c                              |  2 +-
 criu/vdso.c                                 |  4 ++--
 test/zdtm/lib/test.c                        |  2 +-
 test/zdtm/static/cgroup_ifpriomap.c         |  2 +-
 test/zdtm/static/epoll.c                    |  2 +-
 test/zdtm/static/epoll01.c                  |  2 +-
 test/zdtm/static/file_lease00.c             |  4 ++--
 test/zdtm/static/file_lease01.c             |  2 +-
 test/zdtm/static/file_lease02.c             | 12 ++++++------
 test/zdtm/static/file_lease03.c             | 14 +++++++-------
 test/zdtm/static/file_lease04.c             | 12 ++++++------
 test/zdtm/static/file_locks06.c             |  4 ++--
 test/zdtm/static/file_locks07.c             |  4 ++--
 test/zdtm/static/file_locks08.c             |  4 ++--
 test/zdtm/static/fpu00.c                    |  4 ++--
 test/zdtm/static/seccomp_filter_threads.c   |  2 +-
 test/zdtm/static/sk-unix-mntns.c            |  6 +++---
 test/zdtm/static/sock_peercred.c            |  4 ++--
 test/zdtm/static/socket-ext.c               |  2 +-
 test/zdtm/static/socket-tcp-close-wait.c    |  2 +-
 test/zdtm/static/socket-tcp-close0.c        |  2 +-
 test/zdtm/static/socket-tcp-close1.c        |  2 +-
 test/zdtm/static/thread_different_uid_gid.c | 20 ++++++++++----------
 29 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 9fad61468..a928c72c3 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -196,13 +196,13 @@ int get_vx_regs(pid_t pid, user_fpregs_struct_t *fpregs)
 			pr_debug("VXRS registers not supported\n");
 			return 0;
 		}
-		pr_perror("Couldn't get VXRS_LOW\n");
+		pr_perror("Couldn't get VXRS_LOW");
 		return -1;
 	}
 	iov.iov_base = &fpregs->vxrs_high;
 	iov.iov_len = sizeof(fpregs->vxrs_high);
 	if (ptrace(PTRACE_GETREGSET, pid, NT_S390_VXRS_HIGH, &iov) < 0) {
-		pr_perror("Couldn't get VXRS_HIGH\n");
+		pr_perror("Couldn't get VXRS_HIGH");
 		return -1;
 	}
 	fpregs->flags |= USER_FPREGS_VXRS;
@@ -243,7 +243,7 @@ int get_gs_cb(pid_t pid, user_fpregs_struct_t *fpregs)
 			pr_debug("GS_BC not set\n");
 			return 0;
 		}
-		pr_perror("Couldn't get GS_BC\n");
+		pr_perror("Couldn't get GS_BC");
 		return -1;
 	}
 	fpregs->flags |= USER_GS_BC;
@@ -274,7 +274,7 @@ int get_ri_cb(pid_t pid, user_fpregs_struct_t *fpregs)
 			pr_debug("RI_CB not set\n");
 			return 0;
 		default:
-			pr_perror("Couldn't get RI_CB\n");
+			pr_perror("Couldn't get RI_CB");
 			return -1;
 		}
 	}
@@ -386,14 +386,14 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 		iov.iov_base = &ext_regs->vxrs_low;
 		iov.iov_len = sizeof(ext_regs->vxrs_low);
 		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_VXRS_LOW, &iov) < 0) {
-			pr_perror("Couldn't set VXRS_LOW\n");
+			pr_perror("Couldn't set VXRS_LOW");
 			ret = -1;
 		}
 
 		iov.iov_base = &ext_regs->vxrs_high;
 		iov.iov_len = sizeof(ext_regs->vxrs_high);
 		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_VXRS_HIGH, &iov) < 0) {
-			pr_perror("Couldn't set VXRS_HIGH\n");
+			pr_perror("Couldn't set VXRS_HIGH");
 			ret = -1;
 		}
 	}
@@ -402,13 +402,13 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 		iov.iov_base = &ext_regs->gs_cb;
 		iov.iov_len = sizeof(ext_regs->gs_cb);
 		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_GS_CB, &iov) < 0) {
-			pr_perror("Couldn't set GS_CB\n");
+			pr_perror("Couldn't set GS_CB");
 			ret = -1;
 		}
 		iov.iov_base = &ext_regs->gs_bc;
 		iov.iov_len = sizeof(ext_regs->gs_bc);
 		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_GS_BC, &iov) < 0) {
-			pr_perror("Couldn't set GS_BC\n");
+			pr_perror("Couldn't set GS_BC");
 			ret = -1;
 		}
 	}
@@ -417,7 +417,7 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 		iov.iov_base = &ext_regs->ri_cb;
 		iov.iov_len = sizeof(ext_regs->ri_cb);
 		if (ptrace(PTRACE_SETREGSET, pid, NT_S390_RI_CB, &iov) < 0) {
-			pr_perror("Couldn't set RI_CB\n");
+			pr_perror("Couldn't set RI_CB");
 			ret = -1;
 		}
 	}
diff --git a/compel/arch/x86/src/lib/thread_area.c b/compel/arch/x86/src/lib/thread_area.c
index f581496a7..3ff5dc5d4 100644
--- a/compel/arch/x86/src/lib/thread_area.c
+++ b/compel/arch/x86/src/lib/thread_area.c
@@ -64,7 +64,7 @@ int __compel_arch_fetch_thread_area(int tid, struct thread_ctx *th)
 		if (err == -EIO && native_mode)
 			return 0;
 		if (err) {
-			pr_perror("get_thread_area failed for %d\n", tid);
+			pr_perror("get_thread_area failed for %d", tid);
 			return err;
 		}
 	}
diff --git a/criu/arch/x86/kerndat.c b/criu/arch/x86/kerndat.c
index 94c954e1e..cb7a2aa05 100644
--- a/criu/arch/x86/kerndat.c
+++ b/criu/arch/x86/kerndat.c
@@ -224,7 +224,7 @@ int kdat_x86_has_ptrace_fpu_xsave_bug(void)
 		 * waitpid() may end with ECHILD if SIGCHLD == SIG_IGN,
 		 * and the child has stopped already.
 		 */
-		pr_perror("Failed to wait for %s() test\n", __func__);
+		pr_perror("Failed to wait for %s() test", __func__);
 		goto out_kill;
 	}
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 53eddba6b..6da80f031 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1224,7 +1224,7 @@ static int wait_exiting_children(void)
 	futex_dec_and_wake(&task_entries->nr_in_progress);
 
 	if (waitid(P_ALL, 0, &info, WEXITED | WNOWAIT)) {
-		pr_perror("Failed to wait\n");
+		pr_perror("Failed to wait");
 		return -1;
 	}
 
diff --git a/criu/fdstore.c b/criu/fdstore.c
index 7c8eb7208..40c4b90cd 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -93,7 +93,7 @@ int fdstore_add(int fd)
 
 	ret = send_fd(sk, NULL, 0, fd);
 	if (ret) {
-		pr_perror("Can't send fd %d into store\n", fd);
+		pr_perror("Can't send fd %d into store", fd);
 		mutex_unlock(&desc->lock);
 		return -1;
 	}
diff --git a/criu/file-lock.c b/criu/file-lock.c
index 050954cde..f6601c974 100644
--- a/criu/file-lock.c
+++ b/criu/file-lock.c
@@ -479,7 +479,7 @@ static int open_break_cb(int ns_root_fd, struct reg_file_info *rfi, void *arg)
 		close(fd);
 		return -1;
 	} else if (errno != EWOULDBLOCK) {
-		pr_perror("Can't break lease\n");
+		pr_perror("Can't break lease");
 		return -1;
 	}
 	return 0;
@@ -512,7 +512,7 @@ static int set_file_lease(int fd, int type)
 	struct stat st;
 
 	if (fstat(fd, &st)) {
-		pr_perror("Can't get file stat (%i)\n", fd);
+		pr_perror("Can't get file stat (%i)", fd);
 		return -1;
 	}
 
@@ -524,7 +524,7 @@ static int set_file_lease(int fd, int type)
 
 	ret = fcntl(fd, F_SETLEASE, type);
 	if (ret < 0)
-		pr_perror("Can't set lease\n");
+		pr_perror("Can't set lease");
 
 	setfsuid(old_fsuid);
 	return ret;
@@ -589,20 +589,20 @@ static int restore_file_lease(FileLockEntry *fle)
 		signum_fcntl = fcntl(fle->fd, F_GETSIG);
 		signum = signum_fcntl ? signum_fcntl : SIGIO;
 		if (signum_fcntl < 0) {
-			pr_perror("Can't get file i/o signum\n");
+			pr_perror("Can't get file i/o signum");
 			return -1;
 		}
 		if (sigemptyset(&blockmask) ||
 			sigaddset(&blockmask, signum) ||
 			sigprocmask(SIG_BLOCK, &blockmask, &oldmask)) {
-			pr_perror("Can't block file i/o signal\n");
+			pr_perror("Can't block file i/o signal");
 			return -1;
 		}
 
 		ret = restore_breaking_file_lease(fle);
 
 		if (sigprocmask(SIG_SETMASK, &oldmask, NULL)) {
-			pr_perror("Can't restore sigmask\n");
+			pr_perror("Can't restore sigmask");
 			ret = -1;
 		}
 		return ret;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index df7eb070f..21fcb620d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1045,7 +1045,7 @@ static bool kerndat_has_clone3_set_tid(void)
 	if (pid == -1 && errno == EINVAL) {
 		kdat.has_clone3_set_tid = true;
 	} else {
-		pr_perror("Unexpected error from clone3\n");
+		pr_perror("Unexpected error from clone3");
 		return -1;
 	}
 
diff --git a/criu/vdso.c b/criu/vdso.c
index 433a54728..b8a28dd63 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -471,12 +471,12 @@ static int vdso_mmap_compat(struct vdso_maps *native,
 		goto out_kill;
 
 	if (kill(pid, SIGCONT)) {
-		pr_perror("Failed to kill(SIGCONT) for compat vdso helper\n");
+		pr_perror("Failed to kill(SIGCONT) for compat vdso helper");
 		goto out_kill;
 	}
 	if (write(fds[1], &compat->vdso_start, sizeof(void *)) !=
 			sizeof(compat->vdso_start)) {
-		pr_perror("Failed write to pipe\n");
+		pr_perror("Failed write to pipe");
 		goto out_kill;
 	}
 	waitpid(pid, &status, WUNTRACED);
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index e031357ac..e848091c1 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -372,7 +372,7 @@ int test_wait_pre_dump(void)
 
 	if (read(criu_status_in, &ret, sizeof(ret)) != sizeof(ret)) {
 		if (errno != EBADF || !futex_get(&sig_received))
-			pr_perror("Can't wait pre-dump\n");
+			pr_perror("Can't wait pre-dump");
 		return -1;
 	}
 	pr_err("pre-dump\n");
diff --git a/test/zdtm/static/cgroup_ifpriomap.c b/test/zdtm/static/cgroup_ifpriomap.c
index f043b365b..24ed44f14 100644
--- a/test/zdtm/static/cgroup_ifpriomap.c
+++ b/test/zdtm/static/cgroup_ifpriomap.c
@@ -105,7 +105,7 @@ static int read_one_priomap(char *prop_line, struct ifpriomap_t *out)
 
 	out->ifname = malloc(len + 1);
 	if (!out->ifname) {
-		pr_perror("malloc() failed\n");
+		pr_perror("malloc() failed");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/epoll.c b/test/zdtm/static/epoll.c
index ce3b176d3..ed2609a07 100644
--- a/test/zdtm/static/epoll.c
+++ b/test/zdtm/static/epoll.c
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 		uint8_t cw = 1, cr;
 
 		if (write(pipes[i].pipefd[1], &cw, sizeof(cw)) != sizeof(cw)) {
-			pr_perror("Unable to write into a pipe\n");
+			pr_perror("Unable to write into a pipe");
 			return 1;
 		}
 
diff --git a/test/zdtm/static/epoll01.c b/test/zdtm/static/epoll01.c
index 0f5a4fda8..23d536123 100644
--- a/test/zdtm/static/epoll01.c
+++ b/test/zdtm/static/epoll01.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 		uint8_t cw = 1, cr;
 
 		if (write(pipes[i].pipefd[1], &cw, sizeof(cw)) != sizeof(cw)) {
-			pr_perror("Unable to write into a pipe\n");
+			pr_perror("Unable to write into a pipe");
 			return 1;
 		}
 
diff --git a/test/zdtm/static/file_lease00.c b/test/zdtm/static/file_lease00.c
index 8413f831b..226e73abc 100644
--- a/test/zdtm/static/file_lease00.c
+++ b/test/zdtm/static/file_lease00.c
@@ -41,7 +41,7 @@ static int check_lease_type(int fd, int expected_type)
 
 	if (lease_type != expected_type) {
 		if (lease_type < 0)
-			pr_perror("Can't acquire lease type\n");
+			pr_perror("Can't acquire lease type");
 		else
 			pr_err("Mismatched lease type: %i\n", lease_type);
 		return -1;
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 	}
 	if (fcntl(fd_rd, F_SETLEASE, F_RDLCK) < 0 ||
 		fcntl(fd_wr, F_SETLEASE, F_WRLCK) < 0) {
-		pr_perror("Can't set leases\n");
+		pr_perror("Can't set leases");
 		close_files(fd_rd, fd_wr);
 		return -1;
 	}
diff --git a/test/zdtm/static/file_lease01.c b/test/zdtm/static/file_lease01.c
index 90fa74a1c..047bca705 100644
--- a/test/zdtm/static/file_lease01.c
+++ b/test/zdtm/static/file_lease01.c
@@ -44,7 +44,7 @@ static int check_lease_type(int fd, int expected_type)
 
 	if (lease_type != expected_type) {
 		if (lease_type < 0)
-			pr_perror("Can't acquire lease type\n");
+			pr_perror("Can't acquire lease type");
 		else
 			pr_err("Mismatched lease type: %i\n", lease_type);
 		return -1;
diff --git a/test/zdtm/static/file_lease02.c b/test/zdtm/static/file_lease02.c
index cd7945d31..3afb458f9 100644
--- a/test/zdtm/static/file_lease02.c
+++ b/test/zdtm/static/file_lease02.c
@@ -39,7 +39,7 @@ static int check_lease_type(int fd, int expected_type)
 
 	if (lease_type != expected_type) {
 		if (lease_type < 0)
-			pr_perror("Can't acquire lease type\n");
+			pr_perror("Can't acquire lease type");
 		else
 			pr_err("Mismatched lease type: %i\n", lease_type);
 		return -1;
@@ -54,15 +54,15 @@ static int prepare_file(char *file, int file_type, int break_type)
 
 	fd = open(file, file_type | O_CREAT, 0666);
 	if (fd < 0) {
-		pr_perror("Can't open file (type %i)\n", file_type);
+		pr_perror("Can't open file (type %i)", file_type);
 		return fd;
 	}
 	if (fcntl(fd, F_SETLEASE, lease_type) < 0) {
-		pr_perror("Can't set exclusive lease\n");
+		pr_perror("Can't set exclusive lease");
 		goto err;
 	}
 	if (fcntl(fd, F_SETSIG, BREAK_SIGNUM) < 0) {
-		pr_perror("Can't set signum for file i/o\n");
+		pr_perror("Can't set signum for file i/o");
 		goto err;
 	}
 
@@ -74,7 +74,7 @@ static int prepare_file(char *file, int file_type, int break_type)
 		pr_err("Conflicting lease not found\n");
 		goto err;
 	} else if (errno != EWOULDBLOCK) {
-		pr_perror("Can't break lease\n");
+		pr_perror("Can't break lease");
 		goto err;
 	}
 	return fd;
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
 	if (sigemptyset(&act.sa_mask) ||
 		sigaddset(&act.sa_mask, BREAK_SIGNUM) ||
 		sigaction(BREAK_SIGNUM, &act, NULL)) {
-		pr_perror("Can't set signal action\n");
+		pr_perror("Can't set signal action");
 		fail();
 		return -1;
 	}
diff --git a/test/zdtm/static/file_lease03.c b/test/zdtm/static/file_lease03.c
index 4cde2b655..eeb33d245 100644
--- a/test/zdtm/static/file_lease03.c
+++ b/test/zdtm/static/file_lease03.c
@@ -34,7 +34,7 @@ static int check_lease_type(int fd, int expected_type)
 
 	if (lease_type != expected_type) {
 		if (lease_type < 0)
-			pr_perror("Can't acquire lease type\n");
+			pr_perror("Can't acquire lease type");
 		else
 			pr_err("Mismatched lease type: %i\n", lease_type);
 		return -1;
@@ -49,15 +49,15 @@ static int prepare_file(char *file, int file_type, int break_type)
 
 	fd = open(file, file_type | O_CREAT, 0666);
 	if (fd < 0) {
-		pr_perror("Can't open file (type %i)\n", file_type);
+		pr_perror("Can't open file (type %i)", file_type);
 		return fd;
 	}
 	if (fcntl(fd, F_SETLEASE, lease_type) < 0) {
-		pr_perror("Can't set exclusive lease\n");
+		pr_perror("Can't set exclusive lease");
 		goto err;
 	}
 	if (fcntl(fd, F_SETSIG, BREAK_SIGNUM) < 0) {
-		pr_perror("Can't set signum for file i/o\n");
+		pr_perror("Can't set signum for file i/o");
 		goto err;
 	}
 
@@ -69,7 +69,7 @@ static int prepare_file(char *file, int file_type, int break_type)
 		pr_err("Conflicting lease not found\n");
 		goto err;
 	} else if (errno != EWOULDBLOCK) {
-		pr_perror("Can't break lease\n");
+		pr_perror("Can't break lease");
 		goto err;
 	}
 	return fd;
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	if (sigemptyset(&act.sa_mask) ||
 		sigaddset(&act.sa_mask, BREAK_SIGNUM) ||
 		sigaction(BREAK_SIGNUM, &act, NULL)) {
-		pr_perror("Can't set signal action\n");
+		pr_perror("Can't set signal action");
 		return -1;
 	}
 
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
 
 	ret = fd_dup = dup(fd);
 	if (fd_dup < 0) {
-		pr_perror("Can't dup fd\n");
+		pr_perror("Can't dup fd");
 		goto done;
 	}
 
diff --git a/test/zdtm/static/file_lease04.c b/test/zdtm/static/file_lease04.c
index c924f6c5d..10fbc6b2a 100644
--- a/test/zdtm/static/file_lease04.c
+++ b/test/zdtm/static/file_lease04.c
@@ -34,7 +34,7 @@ static int check_lease_type(int fd, int expected_type)
 
 	if (lease_type != expected_type) {
 		if (lease_type < 0)
-			pr_perror("Can't acquire lease type\n");
+			pr_perror("Can't acquire lease type");
 		else
 			pr_err("Mismatched lease type: %i\n", lease_type);
 		return -1;
@@ -49,15 +49,15 @@ static int prepare_file(char *file, int file_type, int break_type)
 
 	fd = open(file, file_type | O_CREAT, 0666);
 	if (fd < 0) {
-		pr_perror("Can't open file (type %i)\n", file_type);
+		pr_perror("Can't open file (type %i)", file_type);
 		return fd;
 	}
 	if (fcntl(fd, F_SETLEASE, lease_type) < 0) {
-		pr_perror("Can't set exclusive lease\n");
+		pr_perror("Can't set exclusive lease");
 		goto err;
 	}
 	if (fcntl(fd, F_SETSIG, BREAK_SIGNUM) < 0) {
-		pr_perror("Can't set signum for file i/o\n");
+		pr_perror("Can't set signum for file i/o");
 		goto err;
 	}
 
@@ -69,7 +69,7 @@ static int prepare_file(char *file, int file_type, int break_type)
 		pr_err("Conflicting lease not found\n");
 		goto err;
 	} else if (errno != EWOULDBLOCK) {
-		pr_perror("Can't break lease\n");
+		pr_perror("Can't break lease");
 		goto err;
 	}
 	return fd;
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	if (sigemptyset(&act.sa_mask) ||
 		sigaddset(&act.sa_mask, BREAK_SIGNUM) ||
 		sigaction(BREAK_SIGNUM, &act, NULL)) {
-		pr_perror("Can't set signal action\n");
+		pr_perror("Can't set signal action");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/file_locks06.c b/test/zdtm/static/file_locks06.c
index 780fb07ea..e7f4c6293 100644
--- a/test/zdtm/static/file_locks06.c
+++ b/test/zdtm/static/file_locks06.c
@@ -36,10 +36,10 @@ int init_lock(int *fd, struct flock *lck)
 void cleanup(int *fd)
 {
 	if (close(*fd))
-		pr_perror("Can't close fd\n");
+		pr_perror("Can't close fd");
 
 	if (unlink(filename))
-		pr_perror("Can't unlink file\n");
+		pr_perror("Can't unlink file");
 }
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/file_locks07.c b/test/zdtm/static/file_locks07.c
index 2fe169fcf..fcbfbf1d4 100644
--- a/test/zdtm/static/file_locks07.c
+++ b/test/zdtm/static/file_locks07.c
@@ -59,10 +59,10 @@ void cleanup(void)
 
 	for (i = 0; i < FILE_NUM; ++i)
 		if (close(fds[i]))
-			pr_perror("Can't close fd\n");
+			pr_perror("Can't close fd");
 
 	if (unlink(filename))
-		pr_perror("Can't unlink file failed\n");
+		pr_perror("Can't unlink file failed");
 }
 
 int check_file_locks_restored(void)
diff --git a/test/zdtm/static/file_locks08.c b/test/zdtm/static/file_locks08.c
index fea8d9e7e..214c90788 100644
--- a/test/zdtm/static/file_locks08.c
+++ b/test/zdtm/static/file_locks08.c
@@ -38,10 +38,10 @@ int init_file_lock(int *fd, struct flock *lck)
 void cleanup(int *fd)
 {
 	if (close(*fd))
-		pr_perror("Can't close fd\n");
+		pr_perror("Can't close fd");
 
 	if (unlink(filename))
-		pr_perror("Can't unlink file\n");
+		pr_perror("Can't unlink file");
 }
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/fpu00.c b/test/zdtm/static/fpu00.c
index 6f2e1c2bf..150b404f2 100644
--- a/test/zdtm/static/fpu00.c
+++ b/test/zdtm/static/fpu00.c
@@ -92,12 +92,12 @@ int main(int argc, char ** argv)
 		void *ret;
 
 		if (pthread_create(&child, NULL, &run_fpu_test, NULL)) {
-			pr_perror("Can't create pthread\n");
+			pr_perror("Can't create pthread");
 			exit(1);
 		}
 
 		if (pthread_join(child, &ret)) {
-			pr_perror("Can't join pthread\n");
+			pr_perror("Can't join pthread");
 			exit(1);
 		}
 
diff --git a/test/zdtm/static/seccomp_filter_threads.c b/test/zdtm/static/seccomp_filter_threads.c
index 63ea4b5bd..f3ca235df 100644
--- a/test/zdtm/static/seccomp_filter_threads.c
+++ b/test/zdtm/static/seccomp_filter_threads.c
@@ -153,7 +153,7 @@ int main(int argc, char ** argv)
 			MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 
 	if (wait_rdy == MAP_FAILED || wait_run == MAP_FAILED) {
-		pr_perror("mmap failed\n");
+		pr_perror("mmap failed");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/sk-unix-mntns.c b/test/zdtm/static/sk-unix-mntns.c
index 58f63797a..3e480db81 100644
--- a/test/zdtm/static/sk-unix-mntns.c
+++ b/test/zdtm/static/sk-unix-mntns.c
@@ -78,12 +78,12 @@ int main(int argc, char *argv[])
 
 	sk = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
 	if (sk < 0) {
-		pr_perror("socket\n");
+		pr_perror("socket");
 		exit(1);
 	}
 	csk = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
 	if (csk < 0) {
-		pr_perror("socket\n");
+		pr_perror("socket");
 		exit(1);
 	}
 
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 		close(csk);
 		csk = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
 		if (csk < 0) {
-			pr_perror("socket\n");
+			pr_perror("socket");
 			exit(1);
 		}
 		if (connect(csk, (struct sockaddr *) &addr, addrlen)) {
diff --git a/test/zdtm/static/sock_peercred.c b/test/zdtm/static/sock_peercred.c
index 069cc52f7..46a3312c5 100644
--- a/test/zdtm/static/sock_peercred.c
+++ b/test/zdtm/static/sock_peercred.c
@@ -53,7 +53,7 @@ static int child_func(void *fd_p)
 
 	/* If sks[1] == fd, the below closes it, but we don't care */
 	if (dup2(sks[0], fd) == -1) {
-		pr_perror("Can't dup fd\n");
+		pr_perror("Can't dup fd");
 		return 1;
 	}
 
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 	}
 
 	if (wait(&status) == -1 || status) {
-		pr_perror("wait error: status=%d\n", status);
+		pr_perror("wait error: status=%d", status);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/socket-ext.c b/test/zdtm/static/socket-ext.c
index 333fb8ce2..88e70559f 100644
--- a/test/zdtm/static/socket-ext.c
+++ b/test/zdtm/static/socket-ext.c
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 	test_waitsig();
 
 	if (unlink(path)) {
-		pr_perror("Unable to remove %s\n", path);
+		pr_perror("Unable to remove %s", path);
 		return 1;
 	}
 	if (rmdir(dir)) {
diff --git a/test/zdtm/static/socket-tcp-close-wait.c b/test/zdtm/static/socket-tcp-close-wait.c
index 3e3462bff..2efa89b17 100644
--- a/test/zdtm/static/socket-tcp-close-wait.c
+++ b/test/zdtm/static/socket-tcp-close-wait.c
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
 
 		close(pfd[1]);
 		if (read(pfd[0], &port, sizeof(port)) != sizeof(port)) {
-			pr_perror("Can't read port\n");
+			pr_perror("Can't read port");
 			return 1;
 		}
 		close(pfd[0]);
diff --git a/test/zdtm/static/socket-tcp-close0.c b/test/zdtm/static/socket-tcp-close0.c
index c23c3d688..a411b6e0d 100644
--- a/test/zdtm/static/socket-tcp-close0.c
+++ b/test/zdtm/static/socket-tcp-close0.c
@@ -25,7 +25,7 @@ static int check_socket_closed(int sk)
 
 	err = getsockopt(sk, IPPROTO_TCP, TCP_INFO, (void *)&info, &len);
 	if (err != 0) {
-		pr_perror("Can't get socket state\n");
+		pr_perror("Can't get socket state");
 		return -1;
 	} else if (info.tcpi_state != TCP_CLOSE) {
 		pr_err("Invalid socket state (%i)", (int)info.tcpi_state);
diff --git a/test/zdtm/static/socket-tcp-close1.c b/test/zdtm/static/socket-tcp-close1.c
index 3dba4e54d..1fefeea82 100644
--- a/test/zdtm/static/socket-tcp-close1.c
+++ b/test/zdtm/static/socket-tcp-close1.c
@@ -21,7 +21,7 @@ static int check_socket_state(int sk, int state)
 
 	err = getsockopt(sk, IPPROTO_TCP, TCP_INFO, (void *)&info, &len);
 	if (err != 0) {
-		pr_perror("Can't get socket state\n");
+		pr_perror("Can't get socket state");
 		return -1;
 	}
 	return info.tcpi_state == state ? 0 : -1;
diff --git a/test/zdtm/static/thread_different_uid_gid.c b/test/zdtm/static/thread_different_uid_gid.c
index 1a6cdc976..e229d91ed 100644
--- a/test/zdtm/static/thread_different_uid_gid.c
+++ b/test/zdtm/static/thread_different_uid_gid.c
@@ -39,19 +39,19 @@ void *chg_uid_gid(void *arg)
 
 	newcaps = cap_from_text("cap_setgid,cap_setuid=+eip");
 	if (!newcaps) {
-		pr_perror("Failed to get capability struct\n");
+		pr_perror("Failed to get capability struct");
 		exit(1);
 	}
 
 	ret = cap_set_proc(newcaps);
 	if (ret) {
-		pr_perror("Failed to set capabilities for the process\n");
+		pr_perror("Failed to set capabilities for the process");
 		exit(1);
 	}
 
 	mycaps = cap_get_proc();
 	if (!mycaps) {
-		pr_perror("Failed to get child thread capabilities\n");
+		pr_perror("Failed to get child thread capabilities");
 		exit_group(2);
 	}
 
@@ -62,7 +62,7 @@ void *chg_uid_gid(void *arg)
 	if (ret >= 0) {
 		syscall(SYS_setresuid, uid, uid, uid);
 	} else if (ret < 0) {
-		pr_perror("Failed to change UID/GID\n");
+		pr_perror("Failed to change UID/GID");
 		exit_group(2);
 	}
 
@@ -103,17 +103,17 @@ int main(int argc, char **argv)
 
 	newcaps = cap_from_text("cap_setgid,cap_setuid=+eip");
 	if (!newcaps) {
-		pr_perror("Failed to get capability struct\n");
+		pr_perror("Failed to get capability struct");
 		exit(1);
 	}
 	ret = cap_set_proc(newcaps);
 	if (ret) {
-		pr_perror("Failed to set capabilities for the process\n");
+		pr_perror("Failed to set capabilities for the process");
 		exit(1);
 	}
 	ret = prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);
 	if (ret) {
-		pr_perror("Unable to set KEEPCAPS\n");
+		pr_perror("Unable to set KEEPCAPS");
 		exit(1);
 	}
 
@@ -132,12 +132,12 @@ int main(int argc, char **argv)
 	if (ret >= 0) {
 		ret = syscall(SYS_setresuid, mainuser, mainuser, mainuser);
 	} else if (ret < 0) {
-		pr_perror("Failed to drop privileges\n");
+		pr_perror("Failed to drop privileges");
 		exit(1);
 	}
 	test_msg("Now main thread runs as UID: %d; GID: %d\n", getuid(), getgid());
 	if (gid == getgid() || uid == getuid()) {
-		pr_perror("Thread credentials match\n");
+		pr_perror("Thread credentials match");
 		exit(1);
 	}
 	test_msg("Main thread is waiting for signal\n");
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (gid == getgid() || uid == getuid()) {
-		pr_perror("Thread credentials match after restore\n");
+		pr_perror("Thread credentials match after restore");
 		exit(1);
 	}
 

From d55a65e93914ef11f80d767ba730d4049ed9f0d1 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 13:59:23 -0700
Subject: [PATCH 0582/1854] criu: don't use errno for pr_error

There is no need to, as pr_error already adds strerror(errno)
to the error message.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/cr-dedup.c | 4 ++--
 criu/mem.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/cr-dedup.c b/criu/cr-dedup.c
index 71b7a9cc3..a09873f94 100644
--- a/criu/cr-dedup.c
+++ b/criu/cr-dedup.c
@@ -19,7 +19,7 @@ int cr_dedup(void)
 
 	dirp = opendir(CR_PARENT_LINK);
 	if (dirp == NULL) {
-		pr_perror("Can't enter previous snapshot folder, error=%d", errno);
+		pr_perror("Can't enter previous snapshot folder");
 		ret = -1;
 		goto err;
 	}
@@ -29,7 +29,7 @@ int cr_dedup(void)
 		ent = readdir(dirp);
 		if (ent == NULL) {
 			if (errno) {
-				pr_perror("Failed readdir, error=%d", errno);
+				pr_perror("Failed readdir");
 				ret = -1;
 				goto err;
 			}
diff --git a/criu/mem.c b/criu/mem.c
index 167838b98..e11f4f492 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -64,7 +64,7 @@ int do_task_reset_dirty_track(int pid)
 		if (errno == EINVAL) /* No clear-soft-dirty in kernel */
 			ret = 1;
 		else {
-			pr_perror("Can't reset %d's dirty memory tracker (%d)", pid, errno);
+			pr_perror("Can't reset %d's dirty memory tracker", pid);
 			ret = -1;
 		}
 	} else {

From 865a5e95119e58e798b26d6176b33358524eef2b Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 14:03:06 -0700
Subject: [PATCH 0583/1854] test/zdtm: don't use pr_perror where errno is unset

pr_perror should be used for cases where the failed operation sets
errno. For cases where errno is not set, pr_err is preferable.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/dumpable02.c     | 10 +++---
 test/zdtm/static/inotify_system.c |  4 +--
 test/zdtm/static/ipc_namespace.c  | 52 +++++++++++++++----------------
 test/zdtm/static/shm.c            |  2 +-
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/test/zdtm/static/dumpable02.c b/test/zdtm/static/dumpable02.c
index 7e2eee2d1..16d880adc 100644
--- a/test/zdtm/static/dumpable02.c
+++ b/test/zdtm/static/dumpable02.c
@@ -44,13 +44,13 @@ int get_dumpable_from_pipes(int pipe_input, int pipe_output) {
 	buf[len] = 0;
 
 	if (memcmp(buf, "DUMPABLE:", 9) != 0) {
-		pr_perror("child returned [%s]", buf);
+		pr_err("child returned [%s]\n", buf);
 		return -1;
 	}
 
 	value = strtol(&buf[9], &endptr, 10);
 	if (!endptr || *endptr != '\n' || endptr != buf + len - 1) {
-		pr_perror("child returned [%s]", buf);
+		pr_err("child returned [%s]\n", buf);
 		return -1;
 	}
 
@@ -188,17 +188,17 @@ int main(int argc, char **argv)
 	}
 	errno = 0;
 	if (waited != pid) {
-		pr_perror("waited pid %d did not match child pid %d",
+		pr_err("waited pid %d did not match child pid %d\n",
 		    waited, pid);
 		return 1;
 	}
 	if (!WIFEXITED(status)) {
-		pr_perror("child dumpable server returned abnormally with status=%d",
+		pr_err("child dumpable server returned abnormally with status=%d\n",
 		    status);
 		return 1;
 	}
 	if (WEXITSTATUS(status) != 0) {
-		pr_perror("child dumpable server returned rc=%d",
+		pr_err("child dumpable server returned rc=%d\n",
 		    WEXITSTATUS(status));
 		return 1;
 	}
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index f8af3dca2..456d20e1c 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -170,13 +170,13 @@ desc init_env(const char *dir, char *file_path, char *link_path) {
 	}
 
 	if (snprintf(file_path, BUF_SIZE, "%s/%s", dir, filename) >= BUF_SIZE) {
-		pr_perror("filename %s is too long", filename);
+		pr_err("filename %s is too long\n", filename);
 		rmdir(dir);
 		return in_desc;
 	}
 
 	if (snprintf(link_path, BUF_SIZE, "%s/%s", dir, linkname) >= BUF_SIZE) {
-		pr_perror("filename %s is too long", linkname);
+		pr_err("filename %s is too long\n", linkname);
 		rmdir(dir);
 		return in_desc;
 	}
diff --git a/test/zdtm/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index d01d654e5..e185c0aea 100644
--- a/test/zdtm/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
@@ -199,19 +199,19 @@ int fill_ipc_ns(struct ipc_ns *ipc)
 
 	ret = get_messages_info(ipc);
 	if (ret < 0) {
-		pr_perror("Failed to collect messages");
+		pr_err("Failed to collect messages\n");
 		return ret;
 	}
 
 	ret = get_semaphores_info(ipc);
 	if (ret < 0) {
-		pr_perror("Failed to collect semaphores");
+		pr_err("Failed to collect semaphores\n");
 		return ret;
 	}
 
 	ret = get_shared_memory_info(ipc);
 	if (ret < 0) {
-		pr_perror("Failed to collect shared memory");
+		pr_err("Failed to collect shared memory\n");
 		return ret;
 	}
 	return 0;
@@ -304,7 +304,7 @@ static int rand_ipc_ns(void)
 		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_default", ((unsigned)lrand48() & (8192 * 128 - 1)) | 128);
 
 	if (ret < 0)
-		pr_perror("Failed to randomize ipc namespace tunables");
+		pr_err("Failed to randomize ipc namespace tunables\n");
 
 	return ret;
 }
@@ -315,64 +315,64 @@ static void show_ipc_entry(struct ipc_ns *old, struct ipc_ns *new)
 
 	for (i = 0; i < 3; i++) {
 		if (old->ids[i].in_use != new->ids[i].in_use)
-			pr_perror("ids[%d].in_use differs: %d ---> %d", i,
+			pr_err("ids[%d].in_use differs: %d ---> %d\n", i,
 				old->ids[i].in_use, new->ids[i].in_use);
 
 	}
 	for (i = 0; i < 4; i++) {
 		if (old->sem_ctls[i] != new->sem_ctls[i])
-			pr_perror("sem_ctls[%d] differs: %d ---> %d", i,
+			pr_err("sem_ctls[%d] differs: %d ---> %d\n", i,
 				old->sem_ctls[i], new->sem_ctls[i]);
 
 	}
 
 	if (old->msg_ctlmax != new->msg_ctlmax)
-		pr_perror("msg_ctlmax differs: %d ---> %d",
+		pr_err("msg_ctlmax differs: %d ---> %d\n",
 			old->msg_ctlmax, new->msg_ctlmax);
 	if (old->msg_ctlmnb != new->msg_ctlmnb)
-		pr_perror("msg_ctlmnb differs: %d ---> %d",
+		pr_err("msg_ctlmnb differs: %d ---> %d\n",
 			old->msg_ctlmnb, new->msg_ctlmnb);
 	if (old->msg_ctlmni != new->msg_ctlmni)
-		pr_perror("msg_ctlmni differs: %d ---> %d",
+		pr_err("msg_ctlmni differs: %d ---> %d\n",
 			old->msg_ctlmni, new->msg_ctlmni);
 	if (old->auto_msgmni != new->auto_msgmni)
-		pr_perror("auto_msgmni differs: %d ---> %d",
+		pr_err("auto_msgmni differs: %d ---> %d\n",
 			old->auto_msgmni, new->auto_msgmni);
 	if (old->msg_next_id != new->msg_next_id)
-		pr_perror("msg_next_id differs: %d ---> %d",
+		pr_err("msg_next_id differs: %d ---> %d\n",
 			old->msg_next_id, new->msg_next_id);
 	if (old->sem_next_id != new->sem_next_id)
-		pr_perror("sem_next_id differs: %d ---> %d",
+		pr_err("sem_next_id differs: %d ---> %d\n",
 			old->sem_next_id, new->sem_next_id);
 	if (old->shm_next_id != new->shm_next_id)
-		pr_perror("shm_next_id differs: %d ---> %d",
+		pr_err("shm_next_id differs: %d ---> %d\n",
 			old->shm_next_id, new->shm_next_id);
 	if (old->shm_ctlmax != new->shm_ctlmax)
-		pr_perror("shm_ctlmax differs: %zu ---> %zu",
+		pr_err("shm_ctlmax differs: %zu ---> %zu\n",
 			old->shm_ctlmax, new->shm_ctlmax);
 	if (old->shm_ctlall != new->shm_ctlall)
-		pr_perror("shm_ctlall differs: %zu ---> %zu",
+		pr_err("shm_ctlall differs: %zu ---> %zu\n",
 			old->shm_ctlall, new->shm_ctlall);
 	if (old->shm_ctlmni != new->shm_ctlmni)
-		pr_perror("shm_ctlmni differs: %d ---> %d",
+		pr_err("shm_ctlmni differs: %d ---> %d\n",
 			old->shm_ctlmni, new->shm_ctlmni);
 	if (old->shm_rmid_forced != new->shm_rmid_forced)
-		pr_perror("shm_rmid_forced differs: %d ---> %d",
+		pr_err("shm_rmid_forced differs: %d ---> %d\n",
 			old->shm_rmid_forced, new->shm_rmid_forced);
 	if (old->mq_queues_max != new->mq_queues_max)
-		pr_perror("mq_queues_max differs: %d ---> %d",
+		pr_err("mq_queues_max differs: %d ---> %d\n",
 			old->mq_queues_max, new->mq_queues_max);
 	if (old->mq_msg_max != new->mq_msg_max)
-		pr_perror("mq_msg_max differs: %d ---> %d",
+		pr_err("mq_msg_max differs: %d ---> %d\n",
 			old->mq_msg_max, new->mq_msg_max);
 	if (old->mq_msgsize_max != new->mq_msgsize_max)
-		pr_perror("mq_msgsize_max differs: %d ---> %d",
+		pr_err("mq_msgsize_max differs: %d ---> %d\n",
 			old->mq_msgsize_max, new->mq_msgsize_max);
 	if (old->mq_msg_default != new->mq_msg_default)
-		pr_perror("mq_msg_default differs: %d ---> %d",
+		pr_err("mq_msg_default differs: %d ---> %d\n",
 			old->mq_msg_default, new->mq_msg_default);
 	if (old->mq_msgsize_default != new->mq_msgsize_default)
-		pr_perror("mq_msgsize_default differs: %d ---> %d",
+		pr_err("mq_msgsize_default differs: %d ---> %d\n",
 			old->mq_msgsize_default, new->mq_msgsize_default);
 }
 
@@ -384,13 +384,13 @@ int main(int argc, char **argv)
 
 	ret = rand_ipc_ns();
 	if (ret) {
-		pr_perror("Failed to randomize ipc ns before migration");
+		pr_err("Failed to randomize ipc ns before migration\n");
 		return -1;
 	}
 
 	ret = fill_ipc_ns(&ipc_before);
 	if (ret) {
-		pr_perror("Failed to collect ipc ns before migration");
+		pr_err("Failed to collect ipc ns before migration\n");
 		return ret;
 	}
 
@@ -399,12 +399,12 @@ int main(int argc, char **argv)
 
 	ret = fill_ipc_ns(&ipc_after);
 	if (ret) {
-		pr_perror("Failed to collect ipc ns after migration");
+		pr_err("Failed to collect ipc ns after migration\n");
 		return ret;
 	}
 
 	if (memcmp(&ipc_before, &ipc_after, sizeof(ipc_after))) {
-		pr_perror("IPC's differ");
+		pr_err("IPCs differ\n");
 		show_ipc_entry(&ipc_before, &ipc_after);
 		return -EINVAL;
 	}
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index a177e3561..23941389a 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 
 	shm = prepare_shm(key, shmem_size);
 	if (shm == -1) {
-		pr_perror("Can't prepare shm (1)");
+		pr_err("Can't prepare shm (1)\n");
 		goto out;
 	}
 

From 9cbcaaed39c62e99ef45ea6df1926153884aa5ba Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 14:11:59 -0700
Subject: [PATCH 0584/1854] test/zdtm: don't use errno for pr_perror

Macro pr_perror already adds errno and its string representation to the
error message, so there's no need to explicitly do it.

While at it, fix some error messages.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/dumpable02.c     |  4 ++--
 test/zdtm/static/inotify_system.c | 37 +++++++++++++------------------
 test/zdtm/static/ipc_namespace.c  | 10 ++++-----
 test/zdtm/static/mtime_mmap.c     |  6 ++---
 test/zdtm/static/shm.c            | 10 ++++-----
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/test/zdtm/static/dumpable02.c b/test/zdtm/static/dumpable02.c
index 16d880adc..cbcd5ba66 100644
--- a/test/zdtm/static/dumpable02.c
+++ b/test/zdtm/static/dumpable02.c
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 	 */
 	ret = chmod(argv[0], 0111);
 	if (ret < 0) {
-		pr_perror("error chmodding %s", argv[0]);
+		pr_perror("chmod(%s) failed", argv[0]);
 		return 1;
 	}
 
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
 		}
 
 		execl(argv[0], "dumpable_server", NULL);
-		pr_perror("could not execv %s as a dumpable_server\nError No: %d", argv[0], errno);
+		pr_perror("could not execv %s as a dumpable_server", argv[0]);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 456d20e1c..d504647f2 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -92,8 +92,8 @@ int addWatcher(int fd, const char *path) {
 	int wd;
 	wd = inotify_add_watch(fd, path, IN_ALL_EVENTS | IN_DONT_FOLLOW);
 	if (wd < 0) {
-		pr_perror("inotify_add_watch(%d, %s, IN_ALL_EVENTS) Failed, %s",
-			fd, path, strerror(errno));
+		pr_perror("inotify_add_watch(%d, %s, IN_ALL_EVENTS) failed",
+				fd, path);
 		return -1;
 	}
 	return wd;
@@ -101,8 +101,7 @@ int addWatcher(int fd, const char *path) {
 
 int fChmod(char *path) {
 	if (chmod(path, 0755) < 0) {
-		pr_perror("chmod(%s, 0755) Failed, %s",
-			path, strerror(errno));
+		pr_perror("chmod(%s, 0755) failed", path);
 		return -1;
 	}
 	return 0;
@@ -111,16 +110,15 @@ int fChmod(char *path) {
 int fWriteClose(char *path) {
 	int fd = open(path, O_RDWR | O_CREAT, 0700);
 	if (fd == -1) {
-		pr_perror("open(%s, O_RDWR|O_CREAT,0700) Failed, %s",
-			path, strerror(errno));
+		pr_perror("open(%s, O_RDWR|O_CREAT, 0700) failed", path);
 		return -1;
 	}
 	if (write(fd, "string", 7) == -1) {
-		pr_perror("write(%d, %s, 1) Failed, %s", fd, path, strerror(errno));
+		pr_perror("write(%d, %s, 1) failed", fd, path);
 		return -1;
 	}
 	if (close(fd) == -1) {
-		pr_perror("close(%s) Failed, %s", path, strerror(errno));
+		pr_perror("close(%s) failed", path);
 		return -1;
 	}
 	return 0;
@@ -130,17 +128,16 @@ int fNoWriteClose(char *path) {
 	char buf[BUF_SIZE];
 	int fd = open(path, O_RDONLY);
 	if ( fd < 0 ) {
-		pr_perror("open(%s, O_RDONLY) Failed, %s",
-			path, strerror(errno));
+		pr_perror("open(%s, O_RDONLY) failed", path);
 		return -1;
 	}
 	if (read(fd, buf, BUF_SIZE) == -1) {
-		pr_perror("read error: %s", strerror(errno));
+		pr_perror("read");
 		close(fd);
 		return -1;
 	}
 	if (close(fd) == -1) {
-		pr_perror("close(%s) Failed, %s", path, strerror(errno));
+		pr_perror("close(%s) failed", path);
 		return -1;
 	}
 	return 0;
@@ -148,8 +145,7 @@ int fNoWriteClose(char *path) {
 
 int fMove(char *from, char *to) {
 	if (rename(from, to) == -1) {
-		pr_perror("rename error (from: %s to: %s) : %s",
-			from, to, strerror(errno));
+		pr_perror("rename error (from: %s to: %s)", from, to);
 		return -1;
 	}
 	return 0;
@@ -158,13 +154,12 @@ int fMove(char *from, char *to) {
 desc init_env(const char *dir, char *file_path, char *link_path) {
 	desc in_desc = {-1, -1, -1, -1};
 	if (mkdir(dir, 0777) < 0) {
-		pr_perror("error in creating directory: %s, %s",
-			dir, strerror(errno));
+		pr_perror("mkdir(%s)", dir);
 		return in_desc;
 	}
 	in_desc.inot = inotify_init();
 	if (in_desc.inot < 0) {
-		pr_perror("inotify_init () Failed, %s", strerror(errno));
+		pr_perror("inotify_init() failed");
 		rmdir(dir);
 		return in_desc;
 	}
@@ -193,7 +188,7 @@ desc init_env(const char *dir, char *file_path, char *link_path) {
 
 int fDelete(char *path) {
 	if (unlink(path) != 0) {
-		pr_perror("unlink: (%s)", strerror(errno));
+		pr_perror("unlink(%s)", path);
 		return -1;
 	}
 	return 0;
@@ -201,7 +196,7 @@ int fDelete(char *path) {
 
 int fRemDir(const char *target) {
 	if(rmdir(target)) {
-		pr_perror("rmdir: (%s)", strerror(errno));
+		pr_perror("rmdir(%s)", target);
 		return -1;
 	}
 	return 0;
@@ -295,8 +290,8 @@ next_event:
 int read_set(int inot_fd, char *event_set) {
 	int len;
 	if ((len = read(inot_fd, event_set, EVENT_BUF_LEN)) < 0) {
-		pr_perror("read(%d, buf, %lu) Failed, errno=%d",
-			inot_fd, (unsigned long)EVENT_BUF_LEN, errno);
+		pr_perror("read(%d, buf, %lu) failed",
+			inot_fd, (unsigned long)EVENT_BUF_LEN);
 		return -1;
 	}
 	return len;
diff --git a/test/zdtm/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index e185c0aea..da400db6c 100644
--- a/test/zdtm/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
@@ -100,7 +100,7 @@ static int get_messages_info(struct ipc_ns *ipc)
 
 	ret = msgctl(0, MSG_INFO, (struct msqid_ds *)&info);
 	if (ret < 0) {
-		pr_perror("msgctl failed with %d", errno);
+		pr_perror("msgctl failed");
 		return ret;
 	}
 
@@ -149,7 +149,7 @@ static int get_semaphores_info(struct ipc_ns *ipc)
 
 	err = semctl(0, 0, SEM_INFO, &info);
 	if (err < 0)
-		pr_perror("semctl failed with %d", errno);
+		pr_perror("semctl failed");
 
 	ipc->sem_ctls[0] = info.semmsl;
 	ipc->sem_ctls[1] = info.semmns;
@@ -172,7 +172,7 @@ static int get_shared_memory_info(struct ipc_ns *ipc)
 
 	ret = shmctl(0, IPC_INFO, &u.shmid);
 	if (ret < 0)
-		pr_perror("semctl failed with %d", errno);
+		pr_perror("semctl failed");
 
 	ipc->shm_ctlmax = u.shminfo64.shmmax;
 	ipc->shm_ctlall = u.shminfo64.shmall;
@@ -180,7 +180,7 @@ static int get_shared_memory_info(struct ipc_ns *ipc)
 
 	ret = shmctl(0, SHM_INFO, &u.shmid);
 	if (ret < 0)
-		pr_perror("semctl failed with %d", errno);
+		pr_perror("semctl failed");
 
 	ipc->shm_tot = u.shminfo.shm_tot;
 	ipc->ids[IPC_SHM_IDS].in_use = u.shminfo.used_ids;
@@ -256,7 +256,7 @@ static int rand_ipc_sem(void)
 				      (unsigned) lrand48(), (unsigned) lrand48() % MAX_MNI);
 	ret = write(fd, buf, 128);
 	if (ret < 0) {
-		pr_perror("Can't write %s: %d", name, errno);
+		pr_perror("Can't write %s", name);
 		return -errno;
 	}
 	close(fd);
diff --git a/test/zdtm/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
index 64d92ca99..c2e2bddb7 100644
--- a/test/zdtm/static/mtime_mmap.c
+++ b/test/zdtm/static/mtime_mmap.c
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 	ptr = (char *)mmap(NULL, count, PROT_READ | PROT_WRITE,
 			MAP_SHARED, fd, 0);
 	if (ptr == MAP_FAILED) {
-		pr_perror("mmap() Failed, errno=%d : %s", errno, strerror(errno));
+		pr_perror("mmap() failed");
 		goto failed;
 	}
 
@@ -66,12 +66,12 @@ int main(int argc, char **argv)
 		ptr[i]++;
 
 	if (munmap(ptr, count)) {
-		pr_perror("munmap Failed, errno=%d : %s", errno, strerror(errno));
+		pr_perror("munmap failed");
 		goto failed;
 	}
 
 	if (fstat(fd, &fst) < 0) {
-		pr_perror("can't get %s file info", filename);
+		pr_perror("fstat(%s) failed", filename);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index 23941389a..5ec0fd73e 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -29,14 +29,14 @@ static int fill_shm_seg(int id, size_t size)
 
 	mem = shmat(id, NULL, 0);
 	if (mem == (void *)-1) {
-		pr_perror("Can't attach shm: %d", -errno);
+		pr_perror("Can't attach shm");
 		return -1;
 	}
 
 	datagen(mem, size, &crc);
 
 	if (shmdt(mem) < 0) {
-		pr_perror("Can't detach shm: %d", -errno);
+		pr_perror("Can't detach shm");
 		return -1;
 	}
 	return 0;
@@ -48,7 +48,7 @@ static int get_shm_seg(int key, size_t size, unsigned int flags)
 
 	id = shmget(key, size, 0777 | flags);
 	if (id == -1) {
-		pr_perror("Can't get shm: %d", -errno);
+		pr_perror("Can't get shm");
 		return -1;
 	}
 	return id;
@@ -74,7 +74,7 @@ static int check_shm_id(int id, size_t size)
 
 	mem = shmat(id, NULL, 0);
 	if (mem == (void *)-1) {
-		pr_perror("Can't attach shm: %d", -errno);
+		pr_perror("Can't attach shm");
 		return -1;
 	}
 	crc = INIT_CRC;
@@ -83,7 +83,7 @@ static int check_shm_id(int id, size_t size)
 		return -1;
 	}
 	if (shmdt(mem) < 0) {
-		pr_perror("Can't detach shm: %d", -errno);
+		pr_perror("Can't detach shm");
 		return -1;
 	}
 	return 0;

From b20694835d6ca50cb2c03c78e98ab9ce8a843765 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 14:54:04 -0700
Subject: [PATCH 0585/1854] test/zdtm: don't use \n with fail()

Macro fail already appends \n to the message, so there's no need to do
it explicitly.

Brought to you by

	for f in $(git grep -l fail test/zdtm); do
		test -f $f || continue
		echo $f
		sed -i '\%^[[:space:]]*fail(.*\\n"%s/\\n"/"/' $f
	done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/apparmor.c                   | 12 ++++----
 test/zdtm/static/arm-neon00.c                 |  2 +-
 test/zdtm/static/binfmt_misc.c                |  4 +--
 test/zdtm/static/cgroup01.c                   |  6 ++--
 test/zdtm/static/cgroup02.c                   |  4 +--
 test/zdtm/static/cgroup03.c                   |  6 ++--
 test/zdtm/static/cgroup_stray.c               |  2 +-
 test/zdtm/static/child_subreaper.c            |  2 +-
 test/zdtm/static/cmdlinenv00.c                |  2 +-
 test/zdtm/static/cr_veth.c                    |  2 +-
 test/zdtm/static/cwd00.c                      |  4 +--
 test/zdtm/static/cwd01.c                      |  4 +--
 test/zdtm/static/cwd02.c                      |  6 ++--
 test/zdtm/static/del_standalone_un.c          |  2 +-
 test/zdtm/static/deleted_dev.c                |  2 +-
 test/zdtm/static/deleted_unix_sock.c          | 16 +++++------
 test/zdtm/static/env00.c                      |  4 +--
 test/zdtm/static/eventfs00.c                  |  2 +-
 test/zdtm/static/fanotify00.c                 |  8 +++---
 test/zdtm/static/fd.c                         |  2 +-
 test/zdtm/static/fdt_shared.c                 | 12 ++++----
 test/zdtm/static/fifo-rowo-pair.c             |  4 +--
 test/zdtm/static/fifo.c                       |  2 +-
 test/zdtm/static/fifo_ro.c                    |  2 +-
 test/zdtm/static/fifo_wronly.c                |  2 +-
 test/zdtm/static/file_attr.c                  | 10 +++----
 test/zdtm/static/file_fown.c                  | 26 ++++++++---------
 test/zdtm/static/file_lease00.c               |  4 +--
 test/zdtm/static/file_lease01.c               |  6 ++--
 test/zdtm/static/file_lease02.c               |  4 +--
 test/zdtm/static/file_lease03.c               |  4 +--
 test/zdtm/static/file_lease04.c               |  2 +-
 test/zdtm/static/file_locks06.c               |  2 +-
 test/zdtm/static/file_locks07.c               |  2 +-
 test/zdtm/static/file_locks08.c               |  4 +--
 test/zdtm/static/file_shared.c                | 14 +++++-----
 test/zdtm/static/fpu00.c                      |  2 +-
 test/zdtm/static/futex-rl.c                   |  6 ++--
 test/zdtm/static/futex.c                      |  6 ++--
 test/zdtm/static/grow_map.c                   |  2 +-
 test/zdtm/static/inotify_system.c             |  2 +-
 test/zdtm/static/loginuid.c                   |  2 +-
 test/zdtm/static/macvlan.c                    |  2 +-
 test/zdtm/static/maps00.c                     | 10 +++----
 test/zdtm/static/maps03.c                     |  2 +-
 test/zdtm/static/mem-touch.c                  |  2 +-
 test/zdtm/static/mlock_setuid.c               |  2 +-
 test/zdtm/static/mmx00.c                      |  4 +--
 test/zdtm/static/mprotect00.c                 | 12 ++++----
 test/zdtm/static/msgque.c                     |  4 +--
 test/zdtm/static/mtime_mmap.c                 |  2 +-
 test/zdtm/static/oom_score_adj.c              |  2 +-
 test/zdtm/static/overmount_sock.c             | 12 ++++----
 test/zdtm/static/packet_sock.c                |  4 +--
 test/zdtm/static/pipe01.c                     |  2 +-
 test/zdtm/static/posix_timers.c               | 28 +++++++++----------
 test/zdtm/static/proc-self.c                  |  2 +-
 test/zdtm/static/pthread00.c                  |  4 +--
 test/zdtm/static/pty00.c                      |  2 +-
 test/zdtm/static/rmdir_open.c                 |  6 ++--
 test/zdtm/static/s390x_gs_threads.c           |  2 +-
 test/zdtm/static/s390x_mmap_high.c            |  2 +-
 test/zdtm/static/seccomp_filter.c             |  2 +-
 test/zdtm/static/seccomp_filter_inheritance.c |  2 +-
 test/zdtm/static/seccomp_filter_threads.c     |  4 +--
 test/zdtm/static/seccomp_filter_tsync.c       |  2 +-
 test/zdtm/static/seccomp_strict.c             |  2 +-
 test/zdtm/static/selinux00.c                  | 14 +++++-----
 test/zdtm/static/selinux01.c                  | 26 ++++++++---------
 test/zdtm/static/sem.c                        |  2 +-
 test/zdtm/static/session00.c                  |  2 +-
 test/zdtm/static/shm-mp.c                     | 12 ++++----
 test/zdtm/static/shm.c                        | 10 +++----
 test/zdtm/static/sigpending.c                 |  4 +--
 test/zdtm/static/sk-unix-mntns.c              |  8 +++---
 test/zdtm/static/sk-unix-rel.c                | 14 +++++-----
 test/zdtm/static/sk-unix-unconn.c             |  2 +-
 test/zdtm/static/sock_peercred.c              |  2 +-
 test/zdtm/static/socket-raw.c                 |  2 +-
 test/zdtm/static/socket-tcp-close-wait.c      |  4 +--
 test/zdtm/static/socket-tcp-close1.c          |  2 +-
 test/zdtm/static/socket-tcp-closing.c         |  4 +--
 test/zdtm/static/socket-tcp-fin-wait1.c       |  2 +-
 test/zdtm/static/socket-tcp-listen.c          |  2 +-
 test/zdtm/static/socket-tcp-reuseport.c       |  4 +--
 test/zdtm/static/socket-tcp.c                 |  2 +-
 test/zdtm/static/socket-tcpbuf.c              |  8 +++---
 test/zdtm/static/socket_dgram_data.c          |  6 ++--
 test/zdtm/static/socket_queues.c              | 20 ++++++-------
 test/zdtm/static/socket_snd_addr.c            |  6 ++--
 test/zdtm/static/sockets00.c                  | 20 ++++++-------
 test/zdtm/static/sockets02.c                  |  4 +--
 test/zdtm/static/sockets03.c                  | 20 ++++++-------
 test/zdtm/static/sockets_dgram.c              | 12 ++++----
 test/zdtm/static/sockets_spair.c              |  6 ++--
 test/zdtm/static/sse00.c                      |  2 +-
 test/zdtm/static/sse20.c                      |  2 +-
 test/zdtm/static/thread_different_uid_gid.c   |  2 +-
 test/zdtm/static/umask00.c                    |  2 +-
 test/zdtm/static/unhashed_proc.c              |  6 ++--
 test/zdtm/static/unlink_fstat00.c             |  4 +--
 test/zdtm/static/unlink_fstat02.c             |  2 +-
 test/zdtm/static/unlink_fstat03.c             |  4 +--
 test/zdtm/static/uptime_grow.c                |  2 +-
 test/zdtm/static/wait00.c                     |  8 +++---
 test/zdtm/static/write_read00.c               |  6 ++--
 test/zdtm/static/write_read01.c               |  4 +--
 test/zdtm/static/write_read02.c               |  8 +++---
 test/zdtm/static/write_read10.c               | 18 ++++++------
 test/zdtm/static/zombie00.c                   | 10 +++----
 test/zdtm/transition/epoll.c                  |  8 +++---
 test/zdtm/transition/fifo_dyn.c               |  8 +++---
 test/zdtm/transition/fifo_loop.c              | 12 ++++----
 test/zdtm/transition/file_read.c              |  8 +++---
 test/zdtm/transition/lazy-thp.c               |  4 +--
 test/zdtm/transition/pipe_loop00.c            | 12 ++++----
 test/zdtm/transition/pipe_shared00.c          |  8 +++---
 test/zdtm/transition/shmem.c                  |  2 +-
 test/zdtm/transition/socket_loop00.c          | 16 +++++------
 test/zdtm/transition/unix_sock.c              | 10 +++----
 120 files changed, 359 insertions(+), 359 deletions(-)

diff --git a/test/zdtm/static/apparmor.c b/test/zdtm/static/apparmor.c
index b3a4d7549..a06589815 100644
--- a/test/zdtm/static/apparmor.c
+++ b/test/zdtm/static/apparmor.c
@@ -22,13 +22,13 @@ int setprofile(void)
 
 	len = snprintf(profile, sizeof(profile), "changeprofile " PROFILE);
 	if (len < 0 || len >= sizeof(profile)) {
-		fail("bad sprintf\n");
+		fail("bad sprintf");
 		return -1;
 	}
 
 	fd = open("/proc/self/attr/current", O_WRONLY);
 	if (fd < 0) {
-		fail("couldn't open fd\n");
+		fail("couldn't open fd");
 		return -1;
 	}
 
@@ -38,7 +38,7 @@ int setprofile(void)
 	close(fd);
 
 	if (len < 0) {
-		fail("couldn't write profile\n");
+		fail("couldn't write profile");
 		return -1;
 	}
 
@@ -55,19 +55,19 @@ int checkprofile(void)
 
 	f = fopen(path, "r");
 	if (!f) {
-		fail("couldn't open lsm current\n");
+		fail("couldn't open lsm current");
 		return -1;
 	}
 
 	len = fscanf(f, "%[^ \n]s", profile);
 	fclose(f);
 	if (len != 1) {
-		fail("wrong number of items scanned %d\n", len);
+		fail("wrong number of items scanned %d", len);
 		return -1;
 	}
 
 	if (strcmp(profile, PROFILE) != 0) {
-		fail("bad profile .%s. expected .%s.\n", profile, PROFILE);
+		fail("bad profile .%s. expected .%s.", profile, PROFILE);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/arm-neon00.c b/test/zdtm/static/arm-neon00.c
index ce8123e51..c58218a11 100644
--- a/test/zdtm/static/arm-neon00.c
+++ b/test/zdtm/static/arm-neon00.c
@@ -49,7 +49,7 @@ int main(int argc, char ** argv)
 	);
 
 	if (y1 != y2)
-		fail("VFP restoration failed: result = %d, expected = %d (a = %d, b = %d, c = %d)\n", y2, y1, a, b, c);
+		fail("VFP restoration failed: result = %d, expected = %d (a = %d, b = %d, c = %d)", y2, y1, a, b, c);
 	else
 		pass();
 
diff --git a/test/zdtm/static/binfmt_misc.c b/test/zdtm/static/binfmt_misc.c
index 72ab8c1ec..553cc1795 100644
--- a/test/zdtm/static/binfmt_misc.c
+++ b/test/zdtm/static/binfmt_misc.c
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
 	ssprintf(path, "%s/%s", dirname, NAME[0]);
 	fd = open(path, O_WRONLY);
 	if (fd < 0 || write(fd, "0", 1) != 1) {
-		fail("Can't disable %s\n", path);
+		fail("Can't disable %s", path);
 		exit(1);
 	}
 	close(fd);
@@ -170,7 +170,7 @@ int main(int argc, char **argv)
 			exit(1);
 
 		if (strcmp(tmp, dump[i])) {
-			fail("Content differs:\n%s\nand\n%s\n", tmp, dump[i]);
+			fail("Content differs:\n%s\nand\n%s", tmp, dump[i]);
 			exit(1);
 		}
 		free(dump[i]);
diff --git a/test/zdtm/static/cgroup01.c b/test/zdtm/static/cgroup01.c
index cf54c1d9e..f0d00f209 100644
--- a/test/zdtm/static/cgroup01.c
+++ b/test/zdtm/static/cgroup01.c
@@ -86,13 +86,13 @@ int main(int argc, char **argv)
 			ssprintf(paux, "%s/%s/%s.%d", aux, subname, empty, i);
 
 			if (stat(paux, &st)) {
-				fail("couldn't stat %s\n", paux);
+				fail("couldn't stat %s", paux);
 				ret = -1;
 				goto out_close;
 			}
 
 			if (!S_ISDIR(st.st_mode)) {
-				fail("%s is not a directory\n", paux);
+				fail("%s is not a directory", paux);
 				ret = -1;
 				goto out_close;
 			}
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
 		goto out_close;
 	}
 
-	fail("empty cgroup not found!\n");
+	fail("empty cgroup not found!");
 
 out_close:
 	fclose(cgf);
diff --git a/test/zdtm/static/cgroup02.c b/test/zdtm/static/cgroup02.c
index 6de22226f..67cc73d9e 100644
--- a/test/zdtm/static/cgroup02.c
+++ b/test/zdtm/static/cgroup02.c
@@ -148,12 +148,12 @@ int main(int argc, char **argv)
 	}
 
 	if (!found_zdtmtstroot) {
-		fail("oldroot not rewritten to zdtmtstroot!\n");
+		fail("oldroot not rewritten to zdtmtstroot!");
 		goto out_close;
 	}
 
 	if (!found_newroot) {
-		fail("oldroot not rewritten to newroot!\n");
+		fail("oldroot not rewritten to newroot!");
 		goto out_close;
 	}
 
diff --git a/test/zdtm/static/cgroup03.c b/test/zdtm/static/cgroup03.c
index 0b5db2345..757f0c3b4 100644
--- a/test/zdtm/static/cgroup03.c
+++ b/test/zdtm/static/cgroup03.c
@@ -102,17 +102,17 @@ int checkperms(char *path)
 	}
 
 	if ((sb.st_mode & 0777) != 0777) {
-		fail("mode for %s doesn't match (%o)\n", path, sb.st_mode);
+		fail("mode for %s doesn't match (%o)", path, sb.st_mode);
 		return -1;
 	}
 
 	if (sb.st_uid != 1000) {
-		fail("uid for %s doesn't match (%d)\n", path, sb.st_uid);
+		fail("uid for %s doesn't match (%d)", path, sb.st_uid);
 		return -1;
 	}
 
 	if (sb.st_gid != 1000) {
-		fail("gid for %s doesn't match (%d)\n", path, sb.st_gid);
+		fail("gid for %s doesn't match (%d)", path, sb.st_gid);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/cgroup_stray.c b/test/zdtm/static/cgroup_stray.c
index 8532f84da..dc68ee6e5 100644
--- a/test/zdtm/static/cgroup_stray.c
+++ b/test/zdtm/static/cgroup_stray.c
@@ -206,7 +206,7 @@ int main(int argc, char **argv)
 	}
 
 	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-		fail("exit status %d\n", status);
+		fail("exit status %d", status);
 		goto out_umount;
 	}
 
diff --git a/test/zdtm/static/child_subreaper.c b/test/zdtm/static/child_subreaper.c
index 6d02c9f93..4a27569fc 100644
--- a/test/zdtm/static/child_subreaper.c
+++ b/test/zdtm/static/child_subreaper.c
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
 	}
 
 	if (cs_before != cs_after)
-		fail("%d != %d\n", cs_before, cs_after);
+		fail("%d != %d", cs_before, cs_after);
 	else
 		pass();
 
diff --git a/test/zdtm/static/cmdlinenv00.c b/test/zdtm/static/cmdlinenv00.c
index 90e7735db..8fffcb3e0 100644
--- a/test/zdtm/static/cmdlinenv00.c
+++ b/test/zdtm/static/cmdlinenv00.c
@@ -26,7 +26,7 @@ static void read_from_proc(const char *path, char *buf, size_t size)
 
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
-		fail("Can't open cmdline\n");
+		fail("Can't open cmdline");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/cr_veth.c b/test/zdtm/static/cr_veth.c
index deef73579..bc5c0cbd4 100644
--- a/test/zdtm/static/cr_veth.c
+++ b/test/zdtm/static/cr_veth.c
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (!wait_for_veth()) {
-		fail("failed to inject veth device\n");
+		fail("failed to inject veth device");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/cwd00.c b/test/zdtm/static/cwd00.c
index b0736f5e2..e05aea42f 100644
--- a/test/zdtm/static/cwd00.c
+++ b/test/zdtm/static/cwd00.c
@@ -46,12 +46,12 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (!getcwd(cwd2, sizeof(cwd2))) {
-		fail("can't get cwd: %m\n");
+		fail("can't get cwd: %m");
 		goto cleanup;
 	}
 
 	if (strcmp(cwd1, cwd2))
-		fail("%s != %s\n", cwd1, cwd2);
+		fail("%s != %s", cwd1, cwd2);
 	else
 		pass();
 cleanup:
diff --git a/test/zdtm/static/cwd01.c b/test/zdtm/static/cwd01.c
index 4e10a6b8b..8751dc514 100644
--- a/test/zdtm/static/cwd01.c
+++ b/test/zdtm/static/cwd01.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 
 	aux2 = readlink("/proc/self/cwd", cwd2, sizeof(cwd2));
 	if (aux2 < 0) {
-		fail("can't get cwd: %m\n");
+		fail("can't get cwd: %m");
 		goto cleanup;
 	}
 	if (aux2 == sizeof(cwd2)) {
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 
 	/* FIXME -- criu adds a suffix to removed cwd */
 	if (strncmp(cwd1, cwd2, aux))
-		fail("%s != %s\n", cwd1, cwd2);
+		fail("%s != %s", cwd1, cwd2);
 	else
 		pass();
 cleanup:
diff --git a/test/zdtm/static/cwd02.c b/test/zdtm/static/cwd02.c
index 82f258627..0d4b276e5 100644
--- a/test/zdtm/static/cwd02.c
+++ b/test/zdtm/static/cwd02.c
@@ -63,18 +63,18 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (fstat(fd, &stf) < 0) {
-		fail("dir fd closed\n");
+		fail("dir fd closed");
 		goto cleanup;
 	}
 
 	if (stat("/proc/self/cwd", &std) < 0) {
-		fail("cwd is not OK\n");
+		fail("cwd is not OK");
 		goto cleanup;
 	}
 
 	if (stf.st_ino != std.st_ino ||
 			stf.st_dev != std.st_dev) {
-		fail("cwd and opened fd are not the same\n");
+		fail("cwd and opened fd are not the same");
 		goto cleanup;
 	}
 
diff --git a/test/zdtm/static/del_standalone_un.c b/test/zdtm/static/del_standalone_un.c
index 5426fc786..f1a7a30f6 100644
--- a/test/zdtm/static/del_standalone_un.c
+++ b/test/zdtm/static/del_standalone_un.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	}
 
 	if (stat(addr.sun_path, &sb) != 0) {
-		fail("%s doesn't exist after restore\n", addr.sun_path);
+		fail("%s doesn't exist after restore", addr.sun_path);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/deleted_dev.c b/test/zdtm/static/deleted_dev.c
index 41319b7ec..c9ca4f123 100644
--- a/test/zdtm/static/deleted_dev.c
+++ b/test/zdtm/static/deleted_dev.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n", filename);
+		fail("file %s should have been deleted before migration: unlink: %m", filename);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/deleted_unix_sock.c b/test/zdtm/static/deleted_unix_sock.c
index 4d328e996..4a0f50e68 100644
--- a/test/zdtm/static/deleted_unix_sock.c
+++ b/test/zdtm/static/deleted_unix_sock.c
@@ -125,46 +125,46 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m\n");
+		fail("terminating the child failed: %m");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid %d: %m\n", pid);
+		fail("wait() returned wrong pid %d: %m", pid);
 		goto out;
 	}
 
 	if (WIFEXITED(ret)) {
 		ret = WEXITSTATUS(ret);
 		if (ret) {
-			fail("child exited with nonzero code %d (%s)\n", ret, strerror(ret));
+			fail("child exited with nonzero code %d (%s)", ret, strerror(ret));
 			goto out;
 		}
 	}
 	if (WIFSIGNALED(ret)) {
-		fail("child exited on unexpected signal %d\n", WTERMSIG(ret));
+		fail("child exited on unexpected signal %d", WTERMSIG(ret));
 		goto out;
 	}
 
 	if (read(sock, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		goto out;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto out;
 	}
 
 
 	if (close(sock)) {
-		fail("close failed: %m\n");
+		fail("close failed: %m");
 		goto out;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n", filename);
+		fail("file %s should have been deleted before migration: unlink: %m", filename);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/env00.c b/test/zdtm/static/env00.c
index 1feabfa9f..7207f0c05 100644
--- a/test/zdtm/static/env00.c
+++ b/test/zdtm/static/env00.c
@@ -26,12 +26,12 @@ int main(int argc, char **argv)
 
 	env = getenv(envname);
 	if (!env) {
-		fail("can't get env var \"%s\": %m\n", envname);
+		fail("can't get env var \"%s\": %m", envname);
 		goto out;
 	}
 
 	if (strcmp(env, test_author))
-		fail("%s != %s\n", env, test_author);
+		fail("%s != %s", env, test_author);
 	else
 		pass();
 out:
diff --git a/test/zdtm/static/eventfs00.c b/test/zdtm/static/eventfs00.c
index 72fd38a9c..5278777ba 100644
--- a/test/zdtm/static/eventfs00.c
+++ b/test/zdtm/static/eventfs00.c
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (v != EVENTFD_FINAL) {
-		fail("EVENTFD_FINAL mismatch\n");
+		fail("EVENTFD_FINAL mismatch");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/fanotify00.c b/test/zdtm/static/fanotify00.c
index e948a63aa..0251e46d4 100644
--- a/test/zdtm/static/fanotify00.c
+++ b/test/zdtm/static/fanotify00.c
@@ -284,25 +284,25 @@ int main (int argc, char *argv[])
 	close(fd);
 
 	if (unlink(fanotify_path)) {
-		fail("can't unlink %s\n", fanotify_path);
+		fail("can't unlink %s", fanotify_path);
 		exit(1);
 	}
 
 	if (parse_fanotify_fdinfo(fa_fd, &new, 3)) {
-		fail("parsing fanotify fdinfo failed\n");
+		fail("parsing fanotify fdinfo failed");
 		exit(1);
 	}
 
 	show_fanotify_obj(&new);
 
 	if (cmp_fanotify_obj(&old, &new)) {
-		fail("fanotify mismatch on fdinfo level\n");
+		fail("fanotify mismatch on fdinfo level");
 		exit(1);
 	}
 
 	length = read(fa_fd, buf, sizeof(buf));
 	if (length <= 0) {
-		fail("No events in fanotify queue\n");
+		fail("No events in fanotify queue");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/fd.c b/test/zdtm/static/fd.c
index a2e89d93f..bf27eaf44 100644
--- a/test/zdtm/static/fd.c
+++ b/test/zdtm/static/fd.c
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 			ret = 0;
 		}
 		pfd[ret] = '\0';
-		fail("Unexpected fd: %s -> %s\n", de->d_name, pfd);
+		fail("Unexpected fd: %s -> %s", de->d_name, pfd);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fdt_shared.c b/test/zdtm/static/fdt_shared.c
index a84444af5..6ccd25487 100644
--- a/test/zdtm/static/fdt_shared.c
+++ b/test/zdtm/static/fdt_shared.c
@@ -81,7 +81,7 @@ static int child3(void *_arg)
 	test_waitsig();
 
 	if (close(TEST_FD) != -1) {
-		fail("%d is exist\n", TEST_FD);
+		fail("%d is exist", TEST_FD);
 		return 1;
 	}
 
@@ -110,14 +110,14 @@ static int child(void *_arg)
 	waitpid(pid2, &status, 0);
 
 	if (status) {
-		fail("The child3 returned %d\n", status);
+		fail("The child3 returned %d", status);
 		return 1;
 	}
 
 	waitpid(pid, &status, 0);
 
 	if (status) {
-		fail("The child2 returned %d\n", status);
+		fail("The child2 returned %d", status);
 		return 1;
 	}
 
@@ -185,18 +185,18 @@ int main(int argc, char ** argv)
 	kill(pid, SIGTERM);
 
 	if (status) {
-		fail("The child returned %d\n", status);
+		fail("The child returned %d", status);
 		return 1;
 	}
 
 	waitpid(pid, &status, 0);
 	if (status) {
-		fail("The child returned %d\n", status);
+		fail("The child returned %d", status);
 		return 1;
 	}
 
 	if (close(TEST_FD) == 0) {
-		fail("%d was not closed\n", TEST_FD);
+		fail("%d was not closed", TEST_FD);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fifo-rowo-pair.c b/test/zdtm/static/fifo-rowo-pair.c
index 85aad027d..5becf1689 100644
--- a/test/zdtm/static/fifo-rowo-pair.c
+++ b/test/zdtm/static/fifo-rowo-pair.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
 	task_waiter_complete_current(&t);
 
 	if (v != TEST_VALUE) {
-		fail("read data mismatch\n");
+		fail("read data mismatch");
 		exit_shot(pid, 1);
 	}
 
@@ -130,7 +130,7 @@ int main(int argc, char **argv)
 		exit_shot(pid, 1);
 	}
 	if (v != TEST_VALUE) {
-		fail("read data mismatch\n");
+		fail("read data mismatch");
 		exit_shot(pid, 1);
 	}
 
diff --git a/test/zdtm/static/fifo.c b/test/zdtm/static/fifo.c
index ab5674a9e..0381aee39 100644
--- a/test/zdtm/static/fifo.c
+++ b/test/zdtm/static/fifo.c
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 
 	crc = ~0;
 	if (datachk(buf, BUF_SIZE, &crc)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fifo_ro.c b/test/zdtm/static/fifo_ro.c
index ea3232937..3347d2003 100644
--- a/test/zdtm/static/fifo_ro.c
+++ b/test/zdtm/static/fifo_ro.c
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 
 	crc = ~0;
 	if (datachk(buf, BUF_SIZE, &crc)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fifo_wronly.c b/test/zdtm/static/fifo_wronly.c
index 78fc7c8f7..3aea32c64 100644
--- a/test/zdtm/static/fifo_wronly.c
+++ b/test/zdtm/static/fifo_wronly.c
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 		wait(&chret);
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child exited with non-zero code %d (%s)\n",
+			fail("child exited with non-zero code %d (%s)",
 				chret, strerror(chret));
 			return 1;
 		}
diff --git a/test/zdtm/static/file_attr.c b/test/zdtm/static/file_attr.c
index eb1c2a202..d6764b53d 100644
--- a/test/zdtm/static/file_attr.c
+++ b/test/zdtm/static/file_attr.c
@@ -72,18 +72,18 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (lseek(fd, 0, SEEK_SET) < 0) {
-		fail("lseeking to the beginning of file failed: %m\n");
+		fail("lseeking to the beginning of file failed: %m");
 		goto out;
 	}
 
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		goto out;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto out;
 	}
 
@@ -103,12 +103,12 @@ int main(int argc, char ** argv)
 	}
 
 	if (close(fd)) {
-		fail("close failed: %m\n");
+		fail("close failed: %m");
 		goto out_noclose;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n", filename);
+		fail("file %s should have been deleted before migration: unlink: %m", filename);
 		goto out_noclose;
 	}
 
diff --git a/test/zdtm/static/file_fown.c b/test/zdtm/static/file_fown.c
index f29ba45af..af20a3174 100644
--- a/test/zdtm/static/file_fown.c
+++ b/test/zdtm/static/file_fown.c
@@ -55,17 +55,17 @@ static int cmp_pipe_params(struct params *p1, struct params *p2)
 
 	for (i = 0; i < 2; i++) {
 		if (p1->pipe_flags[i] != p2->pipe_flags[i]) {
-			fail("pipe flags failed [%d] expected %08o got %08o\n",
+			fail("pipe flags failed [%d] expected %08o got %08o",
 			     i, p1->pipe_flags[i], p2->pipe_flags[i]);
 			return -1;
 		}
 		if (p1->pipe_pid[i] != p2->pipe_pid[i]) {
-			fail("pipe pid failed [%d] expected %d got %d\n",
+			fail("pipe pid failed [%d] expected %d got %d",
 			     i, p1->pipe_pid[i], p2->pipe_pid[i]);
 			return -1;
 		}
 		if (p1->pipe_sig[i] != p2->pipe_sig[i]) {
-			fail("pipe sig failed [%d] expected %d got %d\n",
+			fail("pipe sig failed [%d] expected %d got %d",
 			     i, p1->pipe_sig[i], p2->pipe_sig[i]);
 			return -1;
 		}
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (getresuid(&ruid, &euid, &suid)) {
-		fail("getresuid failed\n");
+		fail("getresuid failed");
 		exit(1);
 	}
 
@@ -103,12 +103,12 @@ int main(int argc, char *argv[])
 	saio.sa_handler	= (sig_t)signal_handler_io;
 	saio.sa_flags	= SA_RESTART;
 	if (sigaction(SIGIO, &saio, 0)) {
-		fail("sigaction failed\n");
+		fail("sigaction failed");
 		exit(1);
 	}
 
 	if (!getuid() && setresuid(-1, 1, -1)) {
-		fail("setresuid failed\n");
+		fail("setresuid failed");
 		exit(1);
 	}
 
@@ -118,14 +118,14 @@ int main(int argc, char *argv[])
 	    fcntl(pipes[1], F_SETSIG, SIGIO)					||
 	    fcntl(pipes[0], F_SETFL, fcntl(pipes[0], F_GETFL) | O_ASYNC)	||
 	    fcntl(pipes[1], F_SETFL, fcntl(pipes[1], F_GETFL) | O_ASYNC)) {
-		fail("fcntl failed\n");
+		fail("fcntl failed");
 		exit(1);
 	}
 
 	fill_pipe_params(shared, pipes);
 
 	if (setresuid(-1, euid, -1)) {
-		fail("setresuid failed\n");
+		fail("setresuid failed");
 		exit(1);
 	}
 
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
 		fill_pipe_params(&p, pipes);
 
 		if (write(pipes[1], &p, sizeof(p)) != sizeof(p)) {
-			fail("write failed\n");
+			fail("write failed");
 			exit(1);
 		}
 
@@ -156,24 +156,24 @@ int main(int argc, char *argv[])
 	kill(pid, SIGTERM);
 
 	if (waitpid(pid, &status, P_ALL) == -1) {
-		fail("waitpid failed\n");
+		fail("waitpid failed");
 		exit(1);
 	}
 
 	if (read(pipes[0], &obtained, sizeof(obtained)) != sizeof(obtained)) {
-		fail("read failed\n");
+		fail("read failed");
 		exit(1);
 	}
 
 	if (shared->sigio < 1) {
-		fail("shared->sigio = %d (> 0 expected)\n", shared->sigio);
+		fail("shared->sigio = %d (> 0 expected)", shared->sigio);
 		exit(1);
 	}
 
 	shared->pipe_pid[1] = pid;
 
 	if (cmp_pipe_params(shared, &obtained)) {
-		fail("params comparison failed\n");
+		fail("params comparison failed");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/file_lease00.c b/test/zdtm/static/file_lease00.c
index 226e73abc..3fd1a0d88 100644
--- a/test/zdtm/static/file_lease00.c
+++ b/test/zdtm/static/file_lease00.c
@@ -73,9 +73,9 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (check_lease_type(fd_rd, F_RDLCK))
-		fail("Read lease check failed\n");
+		fail("Read lease check failed");
 	else if (check_lease_type(fd_wr, F_WRLCK))
-		fail("Write lease check failed\n");
+		fail("Write lease check failed");
 	else
 		pass();
 
diff --git a/test/zdtm/static/file_lease01.c b/test/zdtm/static/file_lease01.c
index 047bca705..6f3dfe60f 100644
--- a/test/zdtm/static/file_lease01.c
+++ b/test/zdtm/static/file_lease01.c
@@ -74,11 +74,11 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (check_lease_type(fds[FD_LEASE_FREE], F_UNLCK))
-		fail("Unexpected lease was found (%i)\n", fds[FD_LEASE_FREE]);
+		fail("Unexpected lease was found (%i)", fds[FD_LEASE_FREE]);
 	else if (check_lease_type(fds[FD_LEASED1], F_RDLCK))
-		fail("Lease isn't set (%i)\n", fds[FD_LEASED1]);
+		fail("Lease isn't set (%i)", fds[FD_LEASED1]);
 	else if (check_lease_type(fds[FD_LEASED2], F_RDLCK))
-		fail("Lease isn't set (%i)\n", fds[FD_LEASED2]);
+		fail("Lease isn't set (%i)", fds[FD_LEASED2]);
 	else
 		pass();
 
diff --git a/test/zdtm/static/file_lease02.c b/test/zdtm/static/file_lease02.c
index 3afb458f9..87c56cfd1 100644
--- a/test/zdtm/static/file_lease02.c
+++ b/test/zdtm/static/file_lease02.c
@@ -131,11 +131,11 @@ int main(int argc, char **argv)
 
 	ret = 0;
 	if (sigaction_error)
-		fail("Ghost signal\n");
+		fail("Ghost signal");
 	else if (check_lease_type(fds[0], F_UNLCK) ||
 		check_lease_type(fds[1], F_RDLCK) ||
 		check_lease_type(fds[2], F_UNLCK))
-		fail("Lease type doesn't match\n");
+		fail("Lease type doesn't match");
 	else
 		pass();
 done:
diff --git a/test/zdtm/static/file_lease03.c b/test/zdtm/static/file_lease03.c
index eeb33d245..799c1b1f1 100644
--- a/test/zdtm/static/file_lease03.c
+++ b/test/zdtm/static/file_lease03.c
@@ -129,9 +129,9 @@ int main(int argc, char **argv)
 	if (ret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
 		fail();
 	if (sigaction_error)
-		fail("Ghost signal\n");
+		fail("Ghost signal");
 	else if (check_lease_type(fd, F_UNLCK))
-		fail("Lease type doesn't match\n");
+		fail("Lease type doesn't match");
 	else
 		pass();
 
diff --git a/test/zdtm/static/file_lease04.c b/test/zdtm/static/file_lease04.c
index 10fbc6b2a..4ad9af84f 100644
--- a/test/zdtm/static/file_lease04.c
+++ b/test/zdtm/static/file_lease04.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
 	if (ret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
 		fail();
 	else if (sigaction_error)
-		fail("Ghost signal\n");
+		fail("Ghost signal");
 	else
 		pass();
 done:
diff --git a/test/zdtm/static/file_locks06.c b/test/zdtm/static/file_locks06.c
index e7f4c6293..2fb0080c4 100644
--- a/test/zdtm/static/file_locks06.c
+++ b/test/zdtm/static/file_locks06.c
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
 
 	if (check_file_lock_restored(getpid(), fd, &lck) ||
 		check_lock_exists(filename, &lck) < 0)
-		fail("OFD file locks check failed\n");
+		fail("OFD file locks check failed");
 	else
 		pass();
 
diff --git a/test/zdtm/static/file_locks07.c b/test/zdtm/static/file_locks07.c
index fcbfbf1d4..155c1a4a7 100644
--- a/test/zdtm/static/file_locks07.c
+++ b/test/zdtm/static/file_locks07.c
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (check_file_locks_restored())
-		fail("OFD file locks check failed\n");
+		fail("OFD file locks check failed");
 	else
 		pass();
 
diff --git a/test/zdtm/static/file_locks08.c b/test/zdtm/static/file_locks08.c
index 214c90788..a4fa1feb5 100644
--- a/test/zdtm/static/file_locks08.c
+++ b/test/zdtm/static/file_locks08.c
@@ -75,13 +75,13 @@ int main(int argc, char **argv)
 
 	if (check_file_lock_restored(getpid(), fd, &lck) ||
 		check_lock_exists(filename, &lck) < 0)
-		fail("OFD file locks check failed\n");
+		fail("OFD file locks check failed");
 
 	kill(pid, SIGTERM);
 	ret = waitpid(pid, &status, 0);
 
 	if (ret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
-		fail("OFD file locks check failed\n");
+		fail("OFD file locks check failed");
 	else
 		pass();
 
diff --git a/test/zdtm/static/file_shared.c b/test/zdtm/static/file_shared.c
index 8f1acb160..0e78b07e2 100644
--- a/test/zdtm/static/file_shared.c
+++ b/test/zdtm/static/file_shared.c
@@ -70,24 +70,24 @@ int main(int argc, char **argv)
 		}
 		off = lseek(fd2, 0, SEEK_CUR);
 		if (off != OFFSET) {
-			fail("offset1 fail\n");
+			fail("offset1 fail");
 			return 1;
 		}
 		off = lseek(fd3, 0, SEEK_CUR);
 		if (off != OFFSET2) {
-			fail("offset2 fail\n");
+			fail("offset2 fail");
 			return 1;
 		}
 
 		ret = fcntl(fd, F_GETFD, 0);
 		if (ret != 0) {
-			fail("fd cloexec broken\n");
+			fail("fd cloexec broken");
 			return 1;
 		}
 
 		ret = fcntl(fd2, F_GETFD, 0);
 		if (ret != 1) {
-			fail("fd2 cloexec broken\n");
+			fail("fd2 cloexec broken");
 			return 1;
 		}
 
@@ -95,17 +95,17 @@ int main(int argc, char **argv)
 		test_waitsig();
 		off = lseek(fd, 0, SEEK_CUR);
 		if (off != OFFSET) {
-			fail("offset3 fail\n");
+			fail("offset3 fail");
 			return 1;
 		}
 		off = lseek(fd2, 0, SEEK_CUR);
 		if (off != OFFSET) {
-			fail("offset4 fail\n");
+			fail("offset4 fail");
 			return 1;
 		}
 		off = lseek(fd3, 0, SEEK_CUR);
 		if (off != OFFSET2) {
-			fail("offset5 fail\n");
+			fail("offset5 fail");
 			return 1;
 		}
 		return 0;
diff --git a/test/zdtm/static/fpu00.c b/test/zdtm/static/fpu00.c
index 150b404f2..6cc15a2b2 100644
--- a/test/zdtm/static/fpu00.c
+++ b/test/zdtm/static/fpu00.c
@@ -68,7 +68,7 @@ void *run_fpu_test(void *unused)
 	res2 = finish();
 
 	if (res1 != res2)
-		fail("%f != %f\n", res1, res2);
+		fail("%f != %f", res1, res2);
 	else
 		pass();
 
diff --git a/test/zdtm/static/futex-rl.c b/test/zdtm/static/futex-rl.c
index 678e175e3..a5888a340 100644
--- a/test/zdtm/static/futex-rl.c
+++ b/test/zdtm/static/futex-rl.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 
 	args = (struct args *)mmap(NULL, sizeof(*args), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 	if ((void *)args == MAP_FAILED) {
-		fail("mmap failed\n");
+		fail("mmap failed");
 		exit(1);
 	}
 
@@ -86,14 +86,14 @@ int main(int argc, char **argv)
 
 	test_msg("Creating thread\n");
 	if (pthread_create(&thread, NULL, thread_fn, (void *)args)) {
-		fail("Can't create thread\n");
+		fail("Can't create thread");
 		exit(1);
 	}
 
 	test_msg("Wait for thread work\n");
 	task_waiter_wait4(&args->waiter, 1);
 	if (args->result == -1) {
-		fail("thread failed\n");
+		fail("thread failed");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/futex.c b/test/zdtm/static/futex.c
index 2ad82d28b..5d1f2de86 100644
--- a/test/zdtm/static/futex.c
+++ b/test/zdtm/static/futex.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 
 	sleep(1);
 	if (kid_passed != 0)
-		fail("some kids broke through\n");
+		fail("some kids broke through");
 
 	pthread_mutex_unlock(&m);
 	for (i = 0; i < num_threads; i++)
@@ -67,13 +67,13 @@ int main(int argc, char **argv)
 
 	if (pthread_mutex_trylock(&m)) {
 		if (errno == EBUSY)
-			fail("kids left my mutex locked\n");
+			fail("kids left my mutex locked");
 		else
 			pr_perror("kids spoiled my mutex");
 	}
 
 	if (kid_passed != num_threads)
-		fail("some kids died during migration\n");
+		fail("some kids died during migration");
 
 	pass();
 out:
diff --git a/test/zdtm/static/grow_map.c b/test/zdtm/static/grow_map.c
index dd1dffd74..089ff7d45 100644
--- a/test/zdtm/static/grow_map.c
+++ b/test/zdtm/static/grow_map.c
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 
 	munmap(test_addr, PAGE_SIZE);
 	if (fake_grow_down[0] != 'c' || *(fake_grow_down - 1) != 'b') {
-		fail("%c %c\n", fake_grow_down[0], *(fake_grow_down - 1));
+		fail("%c %c", fake_grow_down[0], *(fake_grow_down - 1));
 		return 1;
 	}
 
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index d504647f2..3d2355436 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -257,7 +257,7 @@ int errors(int exp_len, int len, char *etalon_buf, char *buf) {
 			exp_event = (struct inotify_event *) &etalon_buf[marker];
 		else {
 			if (!harmless(event->mask)) {
-				fail("got unexpected event %s (%x mask)\n",
+				fail("got unexpected event %s (%x mask)",
 					handle_event(event->mask), event->mask);
 				error++;
 			}
diff --git a/test/zdtm/static/loginuid.c b/test/zdtm/static/loginuid.c
index 628fe64b9..dc27eeef3 100644
--- a/test/zdtm/static/loginuid.c
+++ b/test/zdtm/static/loginuid.c
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 		return -1;
 
 	if (new_loginuid != test_value) {
-		fail("loginuid value %d is different after restore: %d\n",
+		fail("loginuid value %d is different after restore: %d",
 				test_value, new_loginuid);
 		return -1;
 	}
diff --git a/test/zdtm/static/macvlan.c b/test/zdtm/static/macvlan.c
index 018dffd93..0d5feb233 100644
--- a/test/zdtm/static/macvlan.c
+++ b/test/zdtm/static/macvlan.c
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (!wait_for_macvlan()) {
-		fail("failed to inject macvlan device\n");
+		fail("failed to inject macvlan device");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/maps00.c b/test/zdtm/static/maps00.c
index f2da9b975..60328c4c1 100644
--- a/test/zdtm/static/maps00.c
+++ b/test/zdtm/static/maps00.c
@@ -133,7 +133,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, segfault) == SIG_ERR)
 	{
-		fail("setting SIGSEGV handler failed: %m\n");
+		fail("setting SIGSEGV handler failed: %m");
 		return -1;
 	}
 	if (!sigsetjmp(segv_ret, 1))
@@ -142,7 +142,7 @@ static int check_map(struct map *map)
 		if (datachk(map->ptr, ONE_MAP_SIZE, &crc))	/* perform read access */
 			if (!(map->flag & MAP_ANONYMOUS) ||
 					(map->prot & PROT_WRITE)) {	/* anon maps could only be filled when r/w */
-				fail("CRC mismatch: ptr %p flag %8x prot %8x\n",
+				fail("CRC mismatch: ptr %p flag %8x prot %8x",
 				     map->ptr, map->flag, map->prot);
 				return -1;
 			}
@@ -154,7 +154,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, segfault) == SIG_ERR)
 	{
-		fail("setting SIGSEGV handler failed: %m\n");
+		fail("setting SIGSEGV handler failed: %m");
 		return -1;
 	}
 
@@ -166,7 +166,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, segfault) == SIG_ERR)
 	{
-		fail("restoring SIGSEGV handler failed: %m\n");
+		fail("restoring SIGSEGV handler failed: %m");
 		return -1;
 	}
 
@@ -197,7 +197,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR)
 	{
-		fail("restoring SIGSEGV handler failed: %m\n");
+		fail("restoring SIGSEGV handler failed: %m");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/maps03.c b/test/zdtm/static/maps03.c
index 0e0a5b8f2..17299d551 100644
--- a/test/zdtm/static/maps03.c
+++ b/test/zdtm/static/maps03.c
@@ -37,7 +37,7 @@ int main(int argc, char **argv)
 	test_msg("Testing restored data\n");
 
 	if (mem[4L << 30] != 1 || mem[8L << 30] != 2) {
-		fail("Data corrupted!\n");
+		fail("Data corrupted!");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/mem-touch.c b/test/zdtm/static/mem-touch.c
index 5c8c33998..b11c97f53 100644
--- a/test/zdtm/static/mem-touch.c
+++ b/test/zdtm/static/mem-touch.c
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 			test_msg("Page %u matches %u\n", i, backup[i]);
 
 	if (fail)
-		fail("Memory corruption\n");
+		fail("Memory corruption");
 	else
 		pass();
 
diff --git a/test/zdtm/static/mlock_setuid.c b/test/zdtm/static/mlock_setuid.c
index a737bddf9..d8aec8315 100644
--- a/test/zdtm/static/mlock_setuid.c
+++ b/test/zdtm/static/mlock_setuid.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	if (new_flags & MAP_LOCKED) {
 		pass();
 	} else {
-		fail("Vma is not locked after c/r\n");
+		fail("Vma is not locked after c/r");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/mmx00.c b/test/zdtm/static/mmx00.c
index f0f7c3c9e..b736a80a1 100644
--- a/test/zdtm/static/mmx00.c
+++ b/test/zdtm/static/mmx00.c
@@ -87,9 +87,9 @@ int main(int argc, char **argv)
 	finish(resbytes2, reswords2);
 
 	if (memcmp((uint8_t *) resbytes1, (uint8_t *) resbytes2, sizeof(resbytes1)))
-		fail("byte op mismatch\n");
+		fail("byte op mismatch");
 	else if (memcmp((uint8_t *) reswords1, (uint8_t *) reswords2, sizeof(reswords2)))
-		fail("word op mismatch\n");
+		fail("word op mismatch");
 	else
 		pass();
 #else
diff --git a/test/zdtm/static/mprotect00.c b/test/zdtm/static/mprotect00.c
index 463091a64..e70d29ae0 100644
--- a/test/zdtm/static/mprotect00.c
+++ b/test/zdtm/static/mprotect00.c
@@ -31,7 +31,7 @@ static void segfault(int signo)
 static int check_prot(char *ptr, int prot)
 {
 	if (signal(SIGSEGV, segfault) == SIG_ERR) {
-		fail("setting SIGSEGV handler failed: %m\n");
+		fail("setting SIGSEGV handler failed: %m");
 		return -1;
 	}
 
@@ -41,32 +41,32 @@ static int check_prot(char *ptr, int prot)
 			return -1;
 		}
 		if (!(prot & PROT_READ)) {
-			fail("PROT_READ bypassed\n");
+			fail("PROT_READ bypassed");
 			return -1;
 		}
 	}
 	else		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_READ) {
-			fail("PROT_READ rejected\n");
+			fail("PROT_READ rejected");
 			return -1;
 		}
 
 	if (!sigsetjmp(segv_ret, 1)) {
 		ptr[20] = 67;
 		if (!(prot & PROT_WRITE)) {
-			fail("PROT_WRITE bypassed\n");
+			fail("PROT_WRITE bypassed");
 			return -1;
 		}
 	}
 	else		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_WRITE) {
-			fail("PROT_WRITE rejected\n");
+			fail("PROT_WRITE rejected");
 			return -1;
 		}
 
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
-		fail("restoring SIGSEGV handler failed: %m\n");
+		fail("restoring SIGSEGV handler failed: %m");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/msgque.c b/test/zdtm/static/msgque.c
index 6bbb103bd..9ae3caf1f 100644
--- a/test/zdtm/static/msgque.c
+++ b/test/zdtm/static/msgque.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 		wait(&chret);
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("Parent: child exited with non-zero code %d (%s)\n",
+			fail("Parent: child exited with non-zero code %d (%s)",
 			     chret, strerror(chret));
 			goto out;
 		}
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 
 out:
 	if (msgctl(msg, IPC_RMID, 0)) {
-		fail("Failed to destroy message queue: %d\n", -errno);
+		fail("Failed to destroy message queue: %d", -errno);
 		return -errno;
 	}
 	return chret;
diff --git a/test/zdtm/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
index c2e2bddb7..90b4d6883 100644
--- a/test/zdtm/static/mtime_mmap.c
+++ b/test/zdtm/static/mtime_mmap.c
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 	ctime_new = fst.st_ctime;
 	/* time of last status change */
 	if (ctime_new <= ctime_old) {
-		fail("time of last status change of %s file wasn't changed\n",
+		fail("time of last status change of %s file wasn't changed",
 			filename);
 		goto failed;
 	}
diff --git a/test/zdtm/static/oom_score_adj.c b/test/zdtm/static/oom_score_adj.c
index b4275301e..8e9c40782 100644
--- a/test/zdtm/static/oom_score_adj.c
+++ b/test/zdtm/static/oom_score_adj.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 		return -1;
 
 	if (new_oom_score_adj != test_value) {
-		fail("OOM score value %d is different after restore: %d\n",
+		fail("OOM score value %d is different after restore: %d",
 				test_value, new_oom_score_adj);
 		return -1;
 	}
diff --git a/test/zdtm/static/overmount_sock.c b/test/zdtm/static/overmount_sock.c
index 94e4c7e6f..fb8ea7011 100644
--- a/test/zdtm/static/overmount_sock.c
+++ b/test/zdtm/static/overmount_sock.c
@@ -147,36 +147,36 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m\n");
+		fail("terminating the child failed: %m");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid %d: %m\n", pid);
+		fail("wait() returned wrong pid %d: %m", pid);
 		goto out;
 	}
 
 	if (WIFEXITED(ret)) {
 		ret = WEXITSTATUS(ret);
 		if (ret) {
-			fail("child exited with nonzero code %d (%s)\n", ret,
+			fail("child exited with nonzero code %d (%s)", ret,
 				strerror(ret));
 			goto out;
 		}
 	}
 	if (WIFSIGNALED(ret)) {
-		fail("child exited on unexpected signal %d\n", WTERMSIG(ret));
+		fail("child exited on unexpected signal %d", WTERMSIG(ret));
 		goto out;
 	}
 
 	if (read(sock, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m\n", path);
+		fail("can't read %s: %m", path);
 		goto out;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/packet_sock.c b/test/zdtm/static/packet_sock.c
index 66175d46b..5ec992edb 100644
--- a/test/zdtm/static/packet_sock.c
+++ b/test/zdtm/static/packet_sock.c
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
 	}
 
 	if (ver != TPACKET_V2) {
-		fail("Version mismatch have %d, want %d\n", ver, TPACKET_V2);
+		fail("Version mismatch have %d, want %d", ver, TPACKET_V2);
 		return 1;
 	}
 
@@ -272,7 +272,7 @@ int main(int argc, char **argv)
 	}
 
 	if (rsv != SK_RESERVE) {
-		fail("Reserve mismatch have %d, want %d\n", rsv, SK_RESERVE);
+		fail("Reserve mismatch have %d, want %d", rsv, SK_RESERVE);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/pipe01.c b/test/zdtm/static/pipe01.c
index ec8d1fb61..fd51988b5 100644
--- a/test/zdtm/static/pipe01.c
+++ b/test/zdtm/static/pipe01.c
@@ -116,7 +116,7 @@ int main(int argc, char ** argv)
 		crc = ~0;
 		ret = datachk(buf, sizeof(buf), &crc);
 		if (ret) {
-			fail("CRC mismatch\n");
+			fail("CRC mismatch");
 			goto err;
 		}
 	}
diff --git a/test/zdtm/static/posix_timers.c b/test/zdtm/static/posix_timers.c
index 97fd3c0a9..b88114cdb 100644
--- a/test/zdtm/static/posix_timers.c
+++ b/test/zdtm/static/posix_timers.c
@@ -122,32 +122,32 @@ static int check_handler_status(struct posix_timers_info *info,
 	int timer_ms;
 
 	if (!info->handler_cnt && !info->oneshot) {
-		fail("%s: Signal handler wasn't called\n", info->name);
+		fail("%s: Signal handler wasn't called", info->name);
 		return -EINVAL;
 	}
 
 	if (info->handler_status) {
 		if (info->handler_status & WRONG_SIGNAL)
-			fail("%s: Handler: wrong signal received\n", info->name);
+			fail("%s: Handler: wrong signal received", info->name);
 		if (info->handler_status & WRONG_SI_PTR)
-			fail("%s: Handler: wrong timer address\n", info->name);
+			fail("%s: Handler: wrong timer address", info->name);
 		if (info->handler_status & FAIL_OVERRUN)
-			fail("%s: Handler: failed to get overrun count\n", info->name);
+			fail("%s: Handler: failed to get overrun count", info->name);
 		return -1;
 	}
 
 	if (!info->oneshot && !its->it_value.tv_sec && !its->it_value.tv_nsec) {
-		fail("%s: timer became unset\n", info->name);
+		fail("%s: timer became unset", info->name);
 		return -EFAULT;
 	}
 
 	if (info->oneshot && (its->it_interval.tv_sec || its->it_interval.tv_nsec)) {
-		fail("%s: timer became periodic\n", info->name);
+		fail("%s: timer became periodic", info->name);
 		return -EFAULT;
 	}
 
 	if (!info->oneshot && !its->it_interval.tv_sec && !its->it_interval.tv_nsec) {
-		fail("%s: timer became oneshot\n", info->name);
+		fail("%s: timer became oneshot", info->name);
 		return -EFAULT;
 	}
 
@@ -155,15 +155,15 @@ static int check_handler_status(struct posix_timers_info *info,
 		int val = its->it_value.tv_sec * 1000 + its->it_value.tv_nsec / 1000 / 1000;
 		if (info->handler_cnt) {
 			if (val != 0) {
-				fail("%s: timer continues ticking after expiration\n", info->name);
+				fail("%s: timer continues ticking after expiration", info->name);
 				return -EFAULT;
 			}
 			if (info->handler_cnt > 1) {
-				fail("%s: timer expired %d times\n", info->name, info->handler_cnt);
+				fail("%s: timer expired %d times", info->name, info->handler_cnt);
 				return -EFAULT;
 			}
 			if (info->ms_int > ms_passed) {
-				fail("%s: timer expired too early\n", info->name);
+				fail("%s: timer expired too early", info->name);
 				return -EFAULT;
 			}
 			return 0;
@@ -179,7 +179,7 @@ static int check_handler_status(struct posix_timers_info *info,
 	test_msg("%20s: Handler count    : %d\n", info->name, info->handler_cnt);
 
 	if (displacement > MAX_TIMER_DISPLACEMENT) {
-		fail("%32s: Time displacement: %d%% (max alloved: %d%%)\n", info->name, displacement, MAX_TIMER_DISPLACEMENT);
+		fail("%32s: Time displacement: %d%% (max alloved: %d%%)", info->name, displacement, MAX_TIMER_DISPLACEMENT);
 		return -EFAULT;
 	}
 	return 0;
@@ -193,19 +193,19 @@ static int check_timers(int delta, struct timespec *sleep_start, struct timespec
 	struct itimerspec val, oldval;
 
 	if (sigprocmask(SIG_UNBLOCK, &mask, NULL) == -1) {
-		fail("Failed to unlock signal\n");
+		fail("Failed to unlock signal");
 		return -errno;
 	}
 
 	while (info->handler) {
 		memset(&val, 0, sizeof(val));
 		if (timer_settime(info->timerid, 0, &val, &oldval) == -1) {
-			fail("%s: failed to reset timer\n", info->name);
+			fail("%s: failed to reset timer", info->name);
 			return -errno;
 		}
 
 		if (clock_gettime(info->clock, &info->end) == -1) {
-			fail("Can't get %s end time\n", info->name);
+			fail("Can't get %s end time", info->name);
 			return -errno;
 		}
 
diff --git a/test/zdtm/static/proc-self.c b/test/zdtm/static/proc-self.c
index 8292c08cc..6f0a30e7d 100644
--- a/test/zdtm/static/proc-self.c
+++ b/test/zdtm/static/proc-self.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (memcmp(path_orig, path_new, sizeof(path_orig))) {
-		fail("Paths mismatch %s %s\n", path_orig, path_new);
+		fail("Paths mismatch %s %s", path_orig, path_new);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/pthread00.c b/test/zdtm/static/pthread00.c
index 2b248b234..4da824056 100644
--- a/test/zdtm/static/pthread00.c
+++ b/test/zdtm/static/pthread00.c
@@ -89,7 +89,7 @@ static void *thread_func_1(void *map)
 
 	pid = test_fork();
 	if (pid < 0) {
-		fail("Failed to test_fork()\n");
+		fail("Failed to test_fork()");
 		exit_group(1);
 	} else if (pid == 0) {
 		passage(2);
@@ -115,7 +115,7 @@ static void *thread_func_2(void *map)
 
 	pid = test_fork();
 	if (pid < 0) {
-		fail("Failed to test_fork()\n");
+		fail("Failed to test_fork()");
 		exit_group(1);
 	} else if (pid == 0) {
 		passage(4);
diff --git a/test/zdtm/static/pty00.c b/test/zdtm/static/pty00.c
index 9e4f45232..2c76d9c3e 100644
--- a/test/zdtm/static/pty00.c
+++ b/test/zdtm/static/pty00.c
@@ -38,7 +38,7 @@ int main(int argc, char ** argv)
 	 * receive SIGHUP, so make sure it's delivered.
 	 */
 	if (sigaction(SIGHUP, &sa, 0)) {
-		fail("sigaction failed\n");
+		fail("sigaction failed");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/rmdir_open.c b/test/zdtm/static/rmdir_open.c
index 279aa7898..f671ac48f 100644
--- a/test/zdtm/static/rmdir_open.c
+++ b/test/zdtm/static/rmdir_open.c
@@ -49,17 +49,17 @@ int main(int argc, char **argv)
 	 * still points to some removed directory.
 	 */
 	if (fstat(fd, &st)) {
-		fail("Can't stat fd\n");
+		fail("Can't stat fd");
 		goto out;
 	}
 
 	if (!S_ISDIR(st.st_mode)) {
-		fail("Fd is no longer directory\n");
+		fail("Fd is no longer directory");
 		goto out;
 	}
 
 	if (st.st_nlink != 0) {
-		fail("Directory is not removed\n");
+		fail("Directory is not removed");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/s390x_gs_threads.c b/test/zdtm/static/s390x_gs_threads.c
index 8d1442194..6f6e7de22 100644
--- a/test/zdtm/static/s390x_gs_threads.c
+++ b/test/zdtm/static/s390x_gs_threads.c
@@ -118,7 +118,7 @@ static void *thread_run(void *param)
 	gs_epl = malloc(sizeof(unsigned long) * 6);
 	gs_cb = malloc(sizeof(*gs_cb));
 	if (gs_epl == NULL || gs_cb == NULL) {
-		fail("Error allocating memory\n");
+		fail("Error allocating memory");
 		exit(1);
 	}
 	gs_cb->gsd = 0x1234000000UL | 26;
diff --git a/test/zdtm/static/s390x_mmap_high.c b/test/zdtm/static/s390x_mmap_high.c
index 5eb06e6bc..c4bd1c83d 100644
--- a/test/zdtm/static/s390x_mmap_high.c
+++ b/test/zdtm/static/s390x_mmap_high.c
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < MAP_SIZE; i++) {
 		if (buf[i] == VAL)
 			continue;
-		fail("%d: %d != %d\n", i, buf[i], VAL);
+		fail("%d: %d != %d", i, buf[i], VAL);
 		goto out;
 	}
 	pass();
diff --git a/test/zdtm/static/seccomp_filter.c b/test/zdtm/static/seccomp_filter.c
index 81d985132..501a4941c 100644
--- a/test/zdtm/static/seccomp_filter.c
+++ b/test/zdtm/static/seccomp_filter.c
@@ -180,7 +180,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (mode != SECCOMP_MODE_FILTER) {
-		fail("seccomp mode mismatch %d\n", mode);
+		fail("seccomp mode mismatch %d", mode);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/seccomp_filter_inheritance.c b/test/zdtm/static/seccomp_filter_inheritance.c
index 840136c5c..3129185ea 100644
--- a/test/zdtm/static/seccomp_filter_inheritance.c
+++ b/test/zdtm/static/seccomp_filter_inheritance.c
@@ -159,7 +159,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (mode != SECCOMP_MODE_FILTER) {
-		fail("seccomp mode mismatch %d\n", mode);
+		fail("seccomp mode mismatch %d", mode);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/seccomp_filter_threads.c b/test/zdtm/static/seccomp_filter_threads.c
index f3ca235df..8d5b77d16 100644
--- a/test/zdtm/static/seccomp_filter_threads.c
+++ b/test/zdtm/static/seccomp_filter_threads.c
@@ -206,7 +206,7 @@ int main(int argc, char ** argv)
 	mode = get_seccomp_mode(pid);
 
 	if (mode != SECCOMP_MODE_DISABLED) {
-		fail("seccomp mode mismatch %d\n", mode);
+		fail("seccomp mode mismatch %d", mode);
 		return 1;
 	}
 
@@ -217,7 +217,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-		fail("expected 0 exit, got %d\n", WEXITSTATUS(status));
+		fail("expected 0 exit, got %d", WEXITSTATUS(status));
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/seccomp_filter_tsync.c b/test/zdtm/static/seccomp_filter_tsync.c
index e374f0aff..739ea96f7 100644
--- a/test/zdtm/static/seccomp_filter_tsync.c
+++ b/test/zdtm/static/seccomp_filter_tsync.c
@@ -196,7 +196,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (mode != SECCOMP_MODE_FILTER) {
-		fail("seccomp mode mismatch %d\n", mode);
+		fail("seccomp mode mismatch %d", mode);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/seccomp_strict.c b/test/zdtm/static/seccomp_strict.c
index ac95ac828..9042924b2 100644
--- a/test/zdtm/static/seccomp_strict.c
+++ b/test/zdtm/static/seccomp_strict.c
@@ -115,7 +115,7 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 	if (mode != SECCOMP_MODE_STRICT) {
-		fail("seccomp mode mismatch %d\n", mode);
+		fail("seccomp mode mismatch %d", mode);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/selinux00.c b/test/zdtm/static/selinux00.c
index b5b3e3cc0..be647834d 100644
--- a/test/zdtm/static/selinux00.c
+++ b/test/zdtm/static/selinux00.c
@@ -39,7 +39,7 @@ int setprofile(void)
 
 	fd = open("/proc/self/attr/current", O_WRONLY);
 	if (fd < 0) {
-		fail("Could not open /proc/self/attr/current\n");
+		fail("Could not open /proc/self/attr/current");
 		return -1;
 	}
 
@@ -47,7 +47,7 @@ int setprofile(void)
 	close(fd);
 
 	if (len < 0) {
-		fail("Could not write context\n");
+		fail("Could not write context");
 		return -1;
 	}
 
@@ -63,20 +63,20 @@ int checkprofile(void)
 
 	fd = open("/proc/self/attr/current", O_RDONLY);
 	if (fd < 0) {
-		fail("Could not open /proc/self/attr/current\n");
+		fail("Could not open /proc/self/attr/current");
 		return -1;
 	}
 
 	len = read(fd, context, strlen(CONTEXT));
 	close(fd);
 	if (len != strlen(CONTEXT)) {
-		fail("SELinux context has unexpected length %d, expected %zd\n",
+		fail("SELinux context has unexpected length %d, expected %zd",
 			len, strlen(CONTEXT));
 		return -1;
 	}
 
 	if (strncmp(context, CONTEXT, strlen(CONTEXT)) != 0) {
-		fail("Wrong SELinux context %s expected %s\n", context, CONTEXT);
+		fail("Wrong SELinux context %s expected %s", context, CONTEXT);
 		return -1;
 	}
 
@@ -94,14 +94,14 @@ int check_sockcreate(void)
 		free(output);
 		/* sockcreate should be empty, if fscanf found something
 		 * it is wrong.*/
-		fail("sockcreate should be empty\n");
+		fail("sockcreate should be empty");
 		return -1;
 	}
 
 	if (output) {
 		free(output);
 		/* Same here, output should still be NULL. */
-		fail("sockcreate should be empty\n");
+		fail("sockcreate should be empty");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/selinux01.c b/test/zdtm/static/selinux01.c
index cbf145d2a..14e99c739 100644
--- a/test/zdtm/static/selinux01.c
+++ b/test/zdtm/static/selinux01.c
@@ -41,7 +41,7 @@ int setprofile(void)
 
 	fd = open("/proc/self/attr/current", O_WRONLY);
 	if (fd < 0) {
-		fail("Could not open /proc/self/attr/current\n");
+		fail("Could not open /proc/self/attr/current");
 		return -1;
 	}
 
@@ -49,7 +49,7 @@ int setprofile(void)
 	close(fd);
 
 	if (len < 0) {
-		fail("Could not write context\n");
+		fail("Could not write context");
 		return -1;
 	}
 
@@ -62,7 +62,7 @@ int set_sockcreate(void)
 
 	fd = open("/proc/self/attr/sockcreate", O_WRONLY);
 	if (fd < 0) {
-		fail("Could not open /proc/self/attr/sockcreate\n");
+		fail("Could not open /proc/self/attr/sockcreate");
 		return -1;
 	}
 
@@ -70,7 +70,7 @@ int set_sockcreate(void)
 	close(fd);
 
 	if (len < 0) {
-		fail("Could not write context\n");
+		fail("Could not write context");
 		return -1;
 	}
 
@@ -86,20 +86,20 @@ int check_sockcreate(void)
 
 	fd = open("/proc/self/attr/sockcreate", O_RDONLY);
 	if (fd < 0) {
-		fail("Could not open /proc/self/attr/sockcreate\n");
+		fail("Could not open /proc/self/attr/sockcreate");
 		return -1;
 	}
 
 	len = read(fd, context, strlen(CONTEXT));
 	close(fd);
 	if (len != strlen(CONTEXT)) {
-		fail("SELinux context has unexpected length %d, expected %zd\n",
+		fail("SELinux context has unexpected length %d, expected %zd",
 			len, strlen(CONTEXT));
 		return -1;
 	}
 
 	if (strncmp(context, CONTEXT, strlen(CONTEXT)) != 0) {
-		fail("Wrong SELinux context %s expected %s\n", context, CONTEXT);
+		fail("Wrong SELinux context %s expected %s", context, CONTEXT);
 		return -1;
 	}
 
@@ -117,14 +117,14 @@ int check_sockcreate_empty(void)
 		free(output);
 		/* sockcreate should be empty, if fscanf found something
 		 * it is wrong.*/
-		fail("sockcreate should be empty\n");
+		fail("sockcreate should be empty");
 		return -1;
 	}
 
 	if (output) {
 		free(output);
 		/* Same here, output should still be NULL. */
-		fail("sockcreate should be empty\n");
+		fail("sockcreate should be empty");
 		return -1;
 	}
 
@@ -164,11 +164,11 @@ int main(int argc, char **argv)
 	memset(ctx, 0, 1024);
 	/* Read out the socket label */
 	if (fgetxattr(sk, "security.selinux", ctx, 1024) == -1) {
-		fail("Reading xattr 'security.selinux' failed.\n");
+		fail("Reading xattr 'security.selinux' failed.");
 		return -1;
 	}
 	if (strncmp(ctx, CONTEXT, strlen(CONTEXT)) != 0) {
-		fail("Wrong SELinux context %s expected %s\n", ctx, CONTEXT);
+		fail("Wrong SELinux context %s expected %s", ctx, CONTEXT);
 		return -1;
 	}
 	memset(ctx, 0, 1024);
@@ -179,11 +179,11 @@ int main(int argc, char **argv)
 	/* Read out the socket label again */
 
 	if (fgetxattr(sk, "security.selinux", ctx, 1024) == -1) {
-		fail("Reading xattr 'security.selinux' failed.\n");
+		fail("Reading xattr 'security.selinux' failed.");
 		return -1;
 	}
 	if (strncmp(ctx, CONTEXT, strlen(CONTEXT)) != 0) {
-		fail("Wrong SELinux context %s expected %s\n", ctx, CONTEXT);
+		fail("Wrong SELinux context %s expected %s", ctx, CONTEXT);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/sem.c b/test/zdtm/static/sem.c
index 1db8f0082..257dd84ca 100644
--- a/test/zdtm/static/sem.c
+++ b/test/zdtm/static/sem.c
@@ -98,7 +98,7 @@ static int check_sem_by_id(int id, int num, int val)
 		return -errno;
 	}
 	if (curr != val) {
-		fail("Sem has wrong value: %d instead of %d\n", curr, val);
+		fail("Sem has wrong value: %d instead of %d", curr, val);
 		return -EFAULT;
 	}
 	return sem_test(id, lock, unlock,
diff --git a/test/zdtm/static/session00.c b/test/zdtm/static/session00.c
index 4a239e159..f65b3cdef 100644
--- a/test/zdtm/static/session00.c
+++ b/test/zdtm/static/session00.c
@@ -217,7 +217,7 @@ int main(int argc, char ** argv)
 				err++;
 			}
 			if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-				fail("The process with pid %d returns %d\n", pid, status);
+				fail("The process with pid %d returns %d", pid, status);
 				err++;
 			}
 		}
diff --git a/test/zdtm/static/shm-mp.c b/test/zdtm/static/shm-mp.c
index 084796ae2..850b22cc2 100644
--- a/test/zdtm/static/shm-mp.c
+++ b/test/zdtm/static/shm-mp.c
@@ -20,7 +20,7 @@ static void segfault(int signo)
 static int check_prot(char *ptr, char val, int prot)
 {
 	if (signal(SIGSEGV, segfault) == SIG_ERR) {
-		fail("setting SIGSEGV handler failed: %m\n");
+		fail("setting SIGSEGV handler failed: %m");
 		return -1;
 	}
 
@@ -30,29 +30,29 @@ static int check_prot(char *ptr, char val, int prot)
 			return -1;
 		}
 		if (!(prot & PROT_READ)) {
-			fail("PROT_READ bypassed\n");
+			fail("PROT_READ bypassed");
 			return -1;
 		}
 	} else		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_READ) {
-			fail("PROT_READ rejected\n");
+			fail("PROT_READ rejected");
 			return -1;
 		}
 
 	if (!sigsetjmp(segv_ret, 1)) {
 		*ptr = val;
 		if (!(prot & PROT_WRITE)) {
-			fail("PROT_WRITE bypassed\n");
+			fail("PROT_WRITE bypassed");
 			return -1;
 		}
 	} else		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_WRITE) {
-			fail("PROT_WRITE rejected\n");
+			fail("PROT_WRITE rejected");
 			return -1;
 		}
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
-		fail("restoring SIGSEGV handler failed: %m\n");
+		fail("restoring SIGSEGV handler failed: %m");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index 5ec0fd73e..7e7d9570b 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -138,14 +138,14 @@ int main(int argc, char **argv)
 
 	ret = check_shm_id(shm, shmem_size);
 	if (ret < 0) {
-		fail("ID check (1) failed\n");
+		fail("ID check (1) failed");
 		fail_count++;
 		goto out_shm;
 	}
 
 	ret = check_shm_key(key, shmem_size);
 	if (ret < 0) {
-		fail("KEY check failed\n");
+		fail("KEY check failed");
 		fail_count++;
 		goto out_shm;
 	}
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 
 	ret = shmctl(shm, IPC_RMID, NULL);
 	if (ret < 0) {
-		fail("Failed (1) to destroy segment: %d\n", -errno);
+		fail("Failed (1) to destroy segment: %d", -errno);
 		fail_count++;
 		goto out_shm;
 	}
@@ -179,7 +179,7 @@ int main(int argc, char **argv)
 
 	ret = check_shm_id(shm, shmem_size);
 	if (ret < 0) {
-		fail("ID check (2) failed\n");
+		fail("ID check (2) failed");
 		fail_count++;
 		goto out_shm;
 	}
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
 out_shm:
 	ret = shmctl(shm, IPC_RMID, NULL);
 	if (ret < 0) {
-		fail("Failed (2) to destroy segment: %d\n", -errno);
+		fail("Failed (2) to destroy segment: %d", -errno);
 		fail_count++;
 	}
 	if (fail_count == 0)
diff --git a/test/zdtm/static/sigpending.c b/test/zdtm/static/sigpending.c
index ac2fdcf84..4d174588c 100644
--- a/test/zdtm/static/sigpending.c
+++ b/test/zdtm/static/sigpending.c
@@ -105,12 +105,12 @@ static void sig_handler(int signal, siginfo_t *info, void *data)
 
 		crc = ~0;
 		if (datachk((uint8_t *) siginf_body(info), _si_fields_sz, &crc)) {
-			fail("CRC mismatch\n");
+			fail("CRC mismatch");
 			return;
 		}
 
 		 if (memcmp(info, src, siginfo_filled)) {
-			fail("Source and received info are differ\n");
+			fail("Source and received info are differ");
 			return;
 		}
 
diff --git a/test/zdtm/static/sk-unix-mntns.c b/test/zdtm/static/sk-unix-mntns.c
index 3e480db81..46376ff50 100644
--- a/test/zdtm/static/sk-unix-mntns.c
+++ b/test/zdtm/static/sk-unix-mntns.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	task_waiter_init(&t);
 	cwd = get_current_dir_name();
 	if (!cwd) {
-		fail("getcwd\n");
+		fail("getcwd");
 		exit(1);
 	}
 
@@ -89,12 +89,12 @@ int main(int argc, char *argv[])
 
 	ret = bind(sk, (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
 	if (connect(csk, (struct sockaddr *) &addr, addrlen)) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 		}
 
 		if (strncmp(rbuf, sbuf, len)) {
-			fail("data corrupted\n");
+			fail("data corrupted");
 			exit(1);
 		}
 
diff --git a/test/zdtm/static/sk-unix-rel.c b/test/zdtm/static/sk-unix-rel.c
index 5b3e85289..a62a5c92d 100644
--- a/test/zdtm/static/sk-unix-rel.c
+++ b/test/zdtm/static/sk-unix-rel.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 
 	cwd = get_current_dir_name();
 	if (!cwd) {
-		fail("getcwd\n");
+		fail("getcwd");
 		exit(1);
 	}
 
@@ -57,25 +57,25 @@ int main(int argc, char *argv[])
 	sock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
 	sock[1] = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (sock[0] < 0 || sock[1] < 0) {
-		fail("socket\n");
+		fail("socket");
 		exit(1);
 	}
 
 	if (setsockopt(sock[0], SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof(int)) < 0 ||
 	    setsockopt(sock[1], SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof(int)) < 0) {
-		fail("setsockopt\n");
+		fail("setsockopt");
 		exit(1);
 	}
 
 	ret = bind(sock[0], (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
 	ret = listen(sock[0], 16);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 	test_waitsig();
 
 	if (connect(sock[1], (struct sockaddr *) &addr, addrlen)) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
 	read(ret, &buf, sizeof(buf));
 
 	if (strcmp(buf, SK_DATA)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream            : '%s'\n", buf);
diff --git a/test/zdtm/static/sk-unix-unconn.c b/test/zdtm/static/sk-unix-unconn.c
index 72d1348a8..91e3d433b 100644
--- a/test/zdtm/static/sk-unix-unconn.c
+++ b/test/zdtm/static/sk-unix-unconn.c
@@ -45,7 +45,7 @@ int main(int argc, char ** argv)
 
 	ret = bind(sk, (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/sock_peercred.c b/test/zdtm/static/sock_peercred.c
index 46a3312c5..23c709bb5 100644
--- a/test/zdtm/static/sock_peercred.c
+++ b/test/zdtm/static/sock_peercred.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 
 	if (ucred.pid != pid || ucred.gid != getuid() + UID_INC ||
 			        ucred.gid != getgid() + GID_INC) {
-		fail("Wrong pid, uid or gid\n");
+		fail("Wrong pid, uid or gid");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/socket-raw.c b/test/zdtm/static/socket-raw.c
index 9a359485d..7382bf7c4 100644
--- a/test/zdtm/static/socket-raw.c
+++ b/test/zdtm/static/socket-raw.c
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
 	ret = wait(&status);
 	if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status)) {
 		kill(pid, SIGKILL);
-		fail("Failed waiting server\n");
+		fail("Failed waiting server");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/socket-tcp-close-wait.c b/test/zdtm/static/socket-tcp-close-wait.c
index 2efa89b17..3608e6b37 100644
--- a/test/zdtm/static/socket-tcp-close-wait.c
+++ b/test/zdtm/static/socket-tcp-close-wait.c
@@ -267,7 +267,7 @@ int main(int argc, char **argv)
 	rcv_size = clean_sk_buf(fd);
 
 	if (ret != rcv_size) {
-		fail("The child sent %d bytes, but the parent received %d bytes\n", ret, rcv_size);
+		fail("The child sent %d bytes, but the parent received %d bytes", ret, rcv_size);
 		return 1;
 	}
 
@@ -278,7 +278,7 @@ int main(int argc, char **argv)
 	/* == End of the final stage == */
 
 	if (ret != snd_size) {
-		fail("The parent sent %d bytes, but the child received %d bytes\n", snd_size, ret);
+		fail("The parent sent %d bytes, but the child received %d bytes", snd_size, ret);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-close1.c b/test/zdtm/static/socket-tcp-close1.c
index 1fefeea82..49a34a6ef 100644
--- a/test/zdtm/static/socket-tcp-close1.c
+++ b/test/zdtm/static/socket-tcp-close1.c
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (check_socket_state(fd_s, TCP_LISTEN)) {
-		fail("Listen socket state is changed\n");
+		fail("Listen socket state is changed");
 		close(fd_s);
 		return 1;
 	}
diff --git a/test/zdtm/static/socket-tcp-closing.c b/test/zdtm/static/socket-tcp-closing.c
index 23d49cc86..83b21e8ad 100644
--- a/test/zdtm/static/socket-tcp-closing.c
+++ b/test/zdtm/static/socket-tcp-closing.c
@@ -209,7 +209,7 @@ int main(int argc, char **argv)
 	rcv_size = clean_sk_buf(fd);
 
 	if (ret != rcv_size) {
-		fail("The child sent %d bytes, but the parent received %d bytes\n", ret, rcv_size);
+		fail("The child sent %d bytes, but the parent received %d bytes", ret, rcv_size);
 		return 1;
 	}
 
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
 	}
 
 	if (ret != snd_size) {
-		fail("The parent sent %d bytes, but the child received %d bytes\n", snd_size, ret);
+		fail("The parent sent %d bytes, but the child received %d bytes", snd_size, ret);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-fin-wait1.c b/test/zdtm/static/socket-tcp-fin-wait1.c
index 50da9c152..1264a5959 100644
--- a/test/zdtm/static/socket-tcp-fin-wait1.c
+++ b/test/zdtm/static/socket-tcp-fin-wait1.c
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
 	}
 
 	if (ret != snd_size) {
-		fail("The parent sent %d bytes, but the child received %d bytes\n", snd_size, ret);
+		fail("The parent sent %d bytes, but the child received %d bytes", snd_size, ret);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-listen.c b/test/zdtm/static/socket-tcp-listen.c
index ab43fe01c..52d21d894 100644
--- a/test/zdtm/static/socket-tcp-listen.c
+++ b/test/zdtm/static/socket-tcp-listen.c
@@ -140,7 +140,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (val != 1) {
-		fail("SO_REUSEADDR are not set for %d\n", fd);
+		fail("SO_REUSEADDR are not set for %d", fd);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-reuseport.c b/test/zdtm/static/socket-tcp-reuseport.c
index 4cd1802f9..a085ab503 100644
--- a/test/zdtm/static/socket-tcp-reuseport.c
+++ b/test/zdtm/static/socket-tcp-reuseport.c
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (val == 1) {
-		fail("SO_REUSEPORT is set for %d\n", fd);
+		fail("SO_REUSEPORT is set for %d", fd);
 		return 1;
 	}
 	optlen = sizeof(val);
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (val != 1) {
-		fail("SO_REUSEPORT is not set for %d\n", fd);
+		fail("SO_REUSEPORT is not set for %d", fd);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp.c b/test/zdtm/static/socket-tcp.c
index 5158fe348..80c2e7b3b 100644
--- a/test/zdtm/static/socket-tcp.c
+++ b/test/zdtm/static/socket-tcp.c
@@ -210,7 +210,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (val != 1) {
-		fail("SO_REUSEADDR are not set for %d\n", fd);
+		fail("SO_REUSEADDR are not set for %d", fd);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcpbuf.c b/test/zdtm/static/socket-tcpbuf.c
index f61f6a507..fbb4043f1 100644
--- a/test/zdtm/static/socket-tcpbuf.c
+++ b/test/zdtm/static/socket-tcpbuf.c
@@ -196,7 +196,7 @@ int main(int argc, char **argv)
 			return 1;
 
 		if (size != rcv_buf_size) {
-			fail("the received buffer contains only %d bytes (%d)\n", size, rcv_buf_size);
+			fail("the received buffer contains only %d bytes (%d)", size, rcv_buf_size);
 		}
 
 		rcv_size += size;
@@ -300,19 +300,19 @@ int main(int argc, char **argv)
 
 	ret = clean_sk_buf(fd, 0);
 	if (ret != rcv_buf_size) {
-		fail("the received buffer contains only %d bytes (%d)\n", ret, rcv_buf_size);
+		fail("the received buffer contains only %d bytes (%d)", ret, rcv_buf_size);
 	}
 	rcv_size += ret;
 
 	if (snd != rcv_size) {
-		fail("The child sent %d bytes, but the parent received %d bytes\n", rcv_buf_size, rcv_size);
+		fail("The child sent %d bytes, but the parent received %d bytes", rcv_buf_size, rcv_size);
 		return 1;
 	}
 
 	read_safe(ctl_fd, &ret, sizeof(ret));
 
 	if (ret != snd_size) {
-		fail("The parent sent %d bytes, but the child received %d bytes\n", snd_size, ret);
+		fail("The parent sent %d bytes, but the child received %d bytes", snd_size, ret);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket_dgram_data.c b/test/zdtm/static/socket_dgram_data.c
index 2f635b6e6..0f29af0ad 100644
--- a/test/zdtm/static/socket_dgram_data.c
+++ b/test/zdtm/static/socket_dgram_data.c
@@ -43,15 +43,15 @@ int main(int argc, char **argv)
 	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
 
 	if (bind(srv, (struct sockaddr *) &addr, addrlen)) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 	if (connect(clnt1, (struct sockaddr *) &addr, addrlen)) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 	if (connect(clnt2, (struct sockaddr *) &addr, addrlen)) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/socket_queues.c b/test/zdtm/static/socket_queues.c
index 375b449e0..86e052db7 100644
--- a/test/zdtm/static/socket_queues.c
+++ b/test/zdtm/static/socket_queues.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	test_init(argc, argv);
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, ssk_pair_s) == -1) {
-		fail("socketpair\n");
+		fail("socketpair");
 		exit(1);
 	}
 
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 	write(ssk_pair_s[1], SK_DATA_S1, sizeof(SK_DATA_S1));
 
 	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, ssk_pair_d) == -1) {
-		fail("socketpair\n");
+		fail("socketpair");
 		exit(1);
 	}
 
@@ -57,48 +57,48 @@ int main(int argc, char *argv[])
 
 	read(ssk_pair_s[1], buf_left, strlen(SK_DATA_S1) + 1);
 	if (strcmp(buf_left, SK_DATA_S1)) {
-		fail("SK_DATA_S2: '%s\n", SK_DATA_S1);
+		fail("SK_DATA_S2: '%s", SK_DATA_S1);
 		exit(1);
 	}
 	read(ssk_pair_s[1], buf_right, strlen(SK_DATA_S2) + 1);
 	if (strcmp(buf_right, SK_DATA_S2)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream1            : '%s' '%s'\n", buf_left, buf_right);
 
 	read(ssk_pair_s[0], buf_left, strlen(SK_DATA_S2) + 1);
 	if (strcmp(buf_left, SK_DATA_S2)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	read(ssk_pair_s[0], buf_right, strlen(SK_DATA_S1) + 1);
 	if (strcmp(buf_right, SK_DATA_S1)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream2            : '%s' '%s'\n", buf_left, buf_right);
 
 	read(ssk_pair_d[1], buf_left, strlen(SK_DATA_D1) + 1);
 	if (strcmp(buf_left, SK_DATA_D1)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	read(ssk_pair_d[1], buf_right, strlen(SK_DATA_D2) + 1);
 	if (strcmp(buf_right, SK_DATA_D2)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram1            : '%s' '%s'\n", buf_left, buf_right);
 
 	read(ssk_pair_d[0], buf_left, strlen(SK_DATA_D2) + 1);
 	if (strcmp(buf_left, SK_DATA_D2)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	read(ssk_pair_d[0], buf_right,strlen(SK_DATA_D1) + 1);
 	if (strcmp(buf_right, SK_DATA_D1)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram2            : '%s' '%s'\n", buf_left, buf_right);
diff --git a/test/zdtm/static/socket_snd_addr.c b/test/zdtm/static/socket_snd_addr.c
index 7e5376e72..89a0a1762 100644
--- a/test/zdtm/static/socket_snd_addr.c
+++ b/test/zdtm/static/socket_snd_addr.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
 
 	if (bind(srv, (struct sockaddr *) &addr, addrlen)) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
@@ -59,14 +59,14 @@ int main(int argc, char **argv)
 		addrlen = sizeof(addr.sun_family) + sizeof(SK_NAME);
 
 		if (bind(clnt, (struct sockaddr *) &addr, addrlen)) {
-			fail("bind\n");
+			fail("bind");
 			exit(1);
 		}
 
 		memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
 		addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
 		if (connect(clnt, (struct sockaddr *) &addr, addrlen)) {
-			fail("connect\n");
+			fail("connect");
 			exit(1);
 		}
 
diff --git a/test/zdtm/static/sockets00.c b/test/zdtm/static/sockets00.c
index 41c64c717..4aa8ae098 100644
--- a/test/zdtm/static/sockets00.c
+++ b/test/zdtm/static/sockets00.c
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
 
 	cwd = get_current_dir_name();
 	if (!cwd) {
-		fail("getcwd\n");
+		fail("getcwd");
 		exit(1);
 	}
 
@@ -62,13 +62,13 @@ int main(int argc, char *argv[])
 	ssk_icon[1] = socket(AF_UNIX, SOCK_STREAM, 0);
 	ssk_icon[2] = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (ssk_icon[0] < 0 || ssk_icon[1] < 0 || ssk_icon[2] < 0) {
-		fail("socket\n");
+		fail("socket");
 		exit(1);
 	}
 
 	ret = bind(ssk_icon[0], (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
@@ -86,13 +86,13 @@ int main(int argc, char *argv[])
 
 	ret = listen(ssk_icon[0], 16);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
 	ret = connect(ssk_icon[2], (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
 
 	ret = connect(ssk_icon[1], (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (st_b.st_mode != st_a.st_mode) {
-		fail("The file permissions for %s were changed %o %o\n",
+		fail("The file permissions for %s were changed %o %o",
 					path, st_b.st_mode, st_a.st_mode);
 		exit(1);
 	}
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
 
 	ret = accept(ssk_icon[0], NULL, NULL);
 	if (ret < 0) {
-		fail("accept\n");
+		fail("accept");
 		exit(1);
 	}
 
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
 	write(ssk_icon[1], SK_DATA, sizeof(SK_DATA));
 	read(ret, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream1           : '%s'\n", buf);
@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
 	write(ssk_icon[2], SK_DATA, sizeof(SK_DATA));
 	read(ssk_icon[3], &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream2           : '%s'\n", buf);
diff --git a/test/zdtm/static/sockets02.c b/test/zdtm/static/sockets02.c
index ed4afbbe0..5819e76af 100644
--- a/test/zdtm/static/sockets02.c
+++ b/test/zdtm/static/sockets02.c
@@ -26,12 +26,12 @@ int main(int argc, char *argv[])
 	data = (char)lrand48();
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, ssk_pair) == -1) {
-		fail("socketpair\n");
+		fail("socketpair");
 		exit(1);
 	}
 
 	if (write(ssk_pair[1], &data, sizeof(data)) != sizeof(data)) {
-		fail("write\n");
+		fail("write");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/sockets03.c b/test/zdtm/static/sockets03.c
index e4c647d4c..ce668b7f8 100644
--- a/test/zdtm/static/sockets03.c
+++ b/test/zdtm/static/sockets03.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
 
 	cwd = get_current_dir_name();
 	if (!cwd) {
-		fail("getcwd\n");
+		fail("getcwd");
 		exit(1);
 	}
 
@@ -55,31 +55,31 @@ int main(int argc, char *argv[])
 	sk[0] = socket(AF_UNIX, SOCK_STREAM, 0);
 	sk[1] = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (sk[0] < 0 || sk[1] < 0) {
-		fail("socket\n");
+		fail("socket");
 		exit(1);
 	}
 
 	ret = bind(sk[0], (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("bind\n");
+		fail("bind");
 		exit(1);
 	}
 
 	ret = listen(sk[0], 16);
 	if (ret) {
-		fail("listen\n");
+		fail("listen");
 		exit(1);
 	}
 
 	ret = shutdown(sk[1], SHUT_RD);
 	if (ret) {
-		fail("shutdown\n");
+		fail("shutdown");
 		exit(1);
 	}
 
 	ret = connect(sk[1], (struct sockaddr *) &addr, addrlen);
 	if (ret) {
-		fail("connect\n");
+		fail("connect");
 		exit(1);
 	}
 
@@ -93,22 +93,22 @@ int main(int argc, char *argv[])
 	test_waitsig();
 
 	if (write(sk[1], SK_DATA, sizeof(SK_DATA)) < 0) {
-		fail("write\n");
+		fail("write");
 		exit(1);
 	}
 
 	if (read(sk[2], &buf, sizeof(buf)) < 0) {
-		fail("read\n");
+		fail("read");
 		exit(1);
 	}
 
 	if (strncmp(buf, SK_DATA, sizeof(SK_DATA))) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 
 	if (write(sk[2], SK_DATA, sizeof(SK_DATA)) >= 0) {
-		fail("successful write to shutdown receiver\n");
+		fail("successful write to shutdown receiver");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/sockets_dgram.c b/test/zdtm/static/sockets_dgram.c
index f135a3bbf..35ee88244 100644
--- a/test/zdtm/static/sockets_dgram.c
+++ b/test/zdtm/static/sockets_dgram.c
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
 	       (struct sockaddr *) &name_bound, sizeof(name_bound));
 	read(sk_dgram_bound_server, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_BOUND)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram-bound       : '%s'\n", buf);
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
 	write(sk_dgram_conn_client, SK_DATA_CONN, sizeof(SK_DATA_CONN));
 	read(sk_dgram_conn_server, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_CONN)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram-conn        : '%s'\n", buf);
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
 	write(sk_dgram_bound_conn, SK_DATA_BOUND_CONN, sizeof(SK_DATA_BOUND_CONN));
 	read(sk_dgram_bound_conn, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_BOUND_CONN)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram-bound-conn  : '%s'\n", buf);
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
 	       (struct sockaddr *) &name_bound, sizeof(name_bound));
 	read(sk_dgram_bound_server, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_BOUND)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram-bound       : '%s'\n", buf);
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
 	write(sk_dgram_conn_client, SK_DATA_CONN, sizeof(SK_DATA_CONN));
 	read(sk_dgram_conn_server, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_CONN)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram-conn        : '%s'\n", buf);
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
 	write(sk_dgram_bound_conn, SK_DATA_BOUND_CONN, sizeof(SK_DATA_BOUND_CONN));
 	read(sk_dgram_bound_conn, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_BOUND_CONN)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("dgram-bound-conn  : '%s'\n", buf);
diff --git a/test/zdtm/static/sockets_spair.c b/test/zdtm/static/sockets_spair.c
index ed9ffa94f..a67cdb312 100644
--- a/test/zdtm/static/sockets_spair.c
+++ b/test/zdtm/static/sockets_spair.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
 	test_init(argc, argv);
 
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, ssk_pair) == -1) {
-		fail("socketpair\n");
+		fail("socketpair");
 		exit(1);
 	}
 
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 	write(ssk_pair[0], SK_DATA, sizeof(SK_DATA));
 	read(ssk_pair[1], &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream            : '%s'\n", buf);
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 	write(ssk_pair[0], SK_DATA, sizeof(SK_DATA));
 	read(ssk_pair[1], &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA)) {
-		fail("data corrupted\n");
+		fail("data corrupted");
 		exit(1);
 	}
 	test_msg("stream            : '%s'\n", buf);
diff --git a/test/zdtm/static/sse00.c b/test/zdtm/static/sse00.c
index 0c04aba1b..c2d601948 100644
--- a/test/zdtm/static/sse00.c
+++ b/test/zdtm/static/sse00.c
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 	finish(res2);
 
 	if (memcmp((uint8_t *) res1, (uint8_t *) res2, sizeof(res1)))
-		fail("results differ\n");
+		fail("results differ");
 	else
 		pass();
 #else
diff --git a/test/zdtm/static/sse20.c b/test/zdtm/static/sse20.c
index 912528b42..1958eedfa 100644
--- a/test/zdtm/static/sse20.c
+++ b/test/zdtm/static/sse20.c
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 	finish(res2);
 
 	if (memcmp((uint8_t *) res1, (uint8_t *) res2, sizeof(res1)))
-		fail("results differ\n");
+		fail("results differ");
 	else
 		pass();
 #else
diff --git a/test/zdtm/static/thread_different_uid_gid.c b/test/zdtm/static/thread_different_uid_gid.c
index e229d91ed..4344654e7 100644
--- a/test/zdtm/static/thread_different_uid_gid.c
+++ b/test/zdtm/static/thread_different_uid_gid.c
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 	task_waiter_init(&t);
 
 	if (getuid() != 0) {
-		fail("Test is expected to be run with root privileges\n");
+		fail("Test is expected to be run with root privileges");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/umask00.c b/test/zdtm/static/umask00.c
index 1157f0d08..5acf5a39b 100644
--- a/test/zdtm/static/umask00.c
+++ b/test/zdtm/static/umask00.c
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
 
 	mask2 = umask(0);
 	if (mask != mask2)
-		fail("mask changed: %o != %o\n", mask, mask2);
+		fail("mask changed: %o != %o", mask, mask2);
 	else
 		pass();
 
diff --git a/test/zdtm/static/unhashed_proc.c b/test/zdtm/static/unhashed_proc.c
index 1fdc38f67..68132aac2 100644
--- a/test/zdtm/static/unhashed_proc.c
+++ b/test/zdtm/static/unhashed_proc.c
@@ -58,16 +58,16 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (getcwd(cwd2, sizeof(cwd2))) {
-		fail("successful getcwd: %s\n", cwd2);
+		fail("successful getcwd: %s", cwd2);
 		exit(1);
 	} else if (errno != ENOENT) {
-		fail("wrong errno: %m\n");
+		fail("wrong errno: %m");
 		exit(1);
 	}
 
 	len = readlink("/proc/self/cwd", cwd2, sizeof(cwd2)-1);
 	if (len < 0) {
-		fail("can't read cwd symlink %m\n");
+		fail("can't read cwd symlink %m");
 		exit(1);
 	}
 	cwd2[len] = 0;
diff --git a/test/zdtm/static/unlink_fstat00.c b/test/zdtm/static/unlink_fstat00.c
index 79ea90274..1c196ba43 100644
--- a/test/zdtm/static/unlink_fstat00.c
+++ b/test/zdtm/static/unlink_fstat00.c
@@ -152,13 +152,13 @@ int main(int argc, char ** argv)
 		goto failed;
 	}
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		goto failed;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat02.c b/test/zdtm/static/unlink_fstat02.c
index 1ffeffd73..3d75db3e0 100644
--- a/test/zdtm/static/unlink_fstat02.c
+++ b/test/zdtm/static/unlink_fstat02.c
@@ -82,7 +82,7 @@ int main(int argc, char ** argv)
 	}
 
 	if ((fst.st_dev != fst2.st_dev) || (fst.st_ino != fst2.st_ino)) {
-		fail("files differ after restore\n");
+		fail("files differ after restore");
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat03.c b/test/zdtm/static/unlink_fstat03.c
index b31ef1993..64d069970 100644
--- a/test/zdtm/static/unlink_fstat03.c
+++ b/test/zdtm/static/unlink_fstat03.c
@@ -75,12 +75,12 @@ int main(int argc, char ** argv)
 
 	/* An NFS mount is restored with another st_dev */
 	if (fsst.f_type != NFS_SUPER_MAGIC && fst.st_dev != fst2.st_dev) {
-		fail("files differ after restore\n");
+		fail("files differ after restore");
 		goto failed;
 	}
 
 	if (fst.st_ino != fst2.st_ino) {
-		fail("files differ after restore\n");
+		fail("files differ after restore");
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/uptime_grow.c b/test/zdtm/static/uptime_grow.c
index 6d99509ca..ce262c4fc 100644
--- a/test/zdtm/static/uptime_grow.c
+++ b/test/zdtm/static/uptime_grow.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
 		if (!tv_ge(&tm, &tm_old)) {
 			diff_nsec = (tm_old.tv_sec - tm.tv_sec) * 1.0E9 +\
 				(tm_old.tv_nsec - tm.tv_nsec);
-			fail("clock step backward for %e nsec\n", diff_nsec);
+			fail("clock step backward for %e nsec", diff_nsec);
 			exit(1);
 		}
 		tm_old = tm;
diff --git a/test/zdtm/static/wait00.c b/test/zdtm/static/wait00.c
index f16505c0f..7248d41c0 100644
--- a/test/zdtm/static/wait00.c
+++ b/test/zdtm/static/wait00.c
@@ -33,24 +33,24 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m\n");
+		fail("terminating the child failed: %m");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid: %m\n");
+		fail("wait() returned wrong pid: %m");
 		goto out;
 	}
 
 	if (WIFEXITED(ret)) {
 		ret = WEXITSTATUS(ret);
 		if (ret) {
-			fail("child exited with nonzero code %d (%s)\n", ret, strerror(ret));
+			fail("child exited with nonzero code %d (%s)", ret, strerror(ret));
 			goto out;
 		}
 	}
 	if (WIFSIGNALED(ret)) {
-		fail("child exited on unexpected signal %d\n", WTERMSIG(ret));
+		fail("child exited on unexpected signal %d", WTERMSIG(ret));
 		goto out;
 	}
 
diff --git a/test/zdtm/static/write_read00.c b/test/zdtm/static/write_read00.c
index 1648e3546..c3fc5b18b 100644
--- a/test/zdtm/static/write_read00.c
+++ b/test/zdtm/static/write_read00.c
@@ -39,18 +39,18 @@ int main(int argc, char ** argv)
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		fail("can't open %s: %m\n", filename);
+		fail("can't open %s: %m", filename);
 		exit(1);
 	}
 
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		goto out;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/write_read01.c b/test/zdtm/static/write_read01.c
index 0d4176742..b556c0ba5 100644
--- a/test/zdtm/static/write_read01.c
+++ b/test/zdtm/static/write_read01.c
@@ -52,13 +52,13 @@ int main(int argc, char ** argv)
 
 	/* recover reading */
 	if (read(fd, buf + len, sizeof(buf) - len) != (sizeof(buf) - len)) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		goto out;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/write_read02.c b/test/zdtm/static/write_read02.c
index 0a8055805..4100affa8 100644
--- a/test/zdtm/static/write_read02.c
+++ b/test/zdtm/static/write_read02.c
@@ -50,7 +50,7 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (write(fd, buf + len, sizeof(buf) - len) != (sizeof(buf) - len)) {
-		fail("can't write %s: %m\n", filename);
+		fail("can't write %s: %m", filename);
 		goto out;
 	}
 
@@ -58,18 +58,18 @@ int main(int argc, char ** argv)
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		fail("can't open %s: %m\n", filename);
+		fail("can't open %s: %m", filename);
 		return 1;
 	}
 
 	if (read(fd, buf, full_len) != full_len) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		return 1;
 	}
 
 	crc = ~0;
 	if (datachk(buf, full_len, &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/write_read10.c b/test/zdtm/static/write_read10.c
index 4e8a67e84..b572d51d7 100644
--- a/test/zdtm/static/write_read10.c
+++ b/test/zdtm/static/write_read10.c
@@ -72,51 +72,51 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m\n");
+		fail("terminating the child failed: %m");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid %d: %m\n", pid);
+		fail("wait() returned wrong pid %d: %m", pid);
 		goto out;
 	}
 
 	if (WIFEXITED(ret)) {
 		ret = WEXITSTATUS(ret);
 		if (ret) {
-			fail("child exited with nonzero code %d (%s)\n", ret, strerror(ret));
+			fail("child exited with nonzero code %d (%s)", ret, strerror(ret));
 			goto out;
 		}
 	}
 	if (WIFSIGNALED(ret)) {
-		fail("child exited on unexpected signal %d\n", WTERMSIG(ret));
+		fail("child exited on unexpected signal %d", WTERMSIG(ret));
 		goto out;
 	}
 
 	if (lseek(fd, 0, SEEK_SET) < 0) {
-		fail("lseeking to the beginning of file failed: %m\n");
+		fail("lseeking to the beginning of file failed: %m");
 		goto out;
 	}
 
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m\n", filename);
+		fail("can't read %s: %m", filename);
 		goto out;
 	}
 
 	crc = ~0;
 	if (datachk(buf, sizeof(buf), &crc)) {
-		fail("CRC mismatch\n");
+		fail("CRC mismatch");
 		goto out;
 	}
 
 
 	if (close(fd)) {
-		fail("close failed: %m\n");
+		fail("close failed: %m");
 		goto out_noclose;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m\n",
+		fail("file %s should have been deleted before migration: unlink: %m",
 				filename);
 		goto out_noclose;
 	}
diff --git a/test/zdtm/static/zombie00.c b/test/zdtm/static/zombie00.c
index df12a7046..def2c8892 100644
--- a/test/zdtm/static/zombie00.c
+++ b/test/zdtm/static/zombie00.c
@@ -78,28 +78,28 @@ int main(int argc, char ** argv)
 
 	for (i = 0; i < NR_ZOMBIES; i++) {
 		if (waitpid(zombie[i].pid, &status, 0) != zombie[i].pid) {
-			fail("Exit with wrong pid\n");
+			fail("Exit with wrong pid");
 			exit(1);
 		}
 
 		if (zombie[i].exited) {
 			if (!WIFEXITED(status)) {
-				fail("Not exited, but should (%d)\n", zombie[i].pid);
+				fail("Not exited, but should (%d)", zombie[i].pid);
 				exit(1);
 			}
 
 			if (WEXITSTATUS(status) != zombie[i].exitcode) {
-				fail("Exit with wrong status (%d)\n", zombie[i].pid);
+				fail("Exit with wrong status (%d)", zombie[i].pid);
 				exit(1);
 			}
 		} else {
 			if (!WIFSIGNALED(status)) {
-				fail("Not killed, but should (%d)\n", zombie[i].pid);
+				fail("Not killed, but should (%d)", zombie[i].pid);
 				exit(1);
 			}
 
 			if (WTERMSIG(status) != zombie[i].exitcode) {
-				fail("Killed with wrong signal (%d)\n", zombie[i].pid);
+				fail("Killed with wrong signal (%d)", zombie[i].pid);
 				exit(1);
 			}
 		}
diff --git a/test/zdtm/transition/epoll.c b/test/zdtm/transition/epoll.c
index 6ab436889..578322b3e 100644
--- a/test/zdtm/transition/epoll.c
+++ b/test/zdtm/transition/epoll.c
@@ -82,7 +82,7 @@ static void run_child(int num)
 		if (write(fd, buf, buf_size) < 0 &&
 			(!stop /* signal SIGUSR2 NOT received */ ||
 				(errno != EINTR && errno != EPIPE))) {
-			fail("child write: %m\n");
+			fail("child write: %m");
 			rv = WRITEERROR;
 			goto out;
 		}
@@ -178,17 +178,17 @@ int main(int argc, char **argv)
 	for (i = 0; i < scale; i++) {
 		kill(pids[i], SIGUSR2);
 		if (waitpid(pids[i], &rv, 0) < 0) {
-			fail("waitpid error: %m\n");
+			fail("waitpid error: %m");
 			counter++;
 			continue;
 		} else {
 			rv = WEXITSTATUS(rv);
 			if (rv < MAX_EXIT_CODE && rv > SUCCESS) {
-				fail("Child failed: %s (%d)\n",
+				fail("Child failed: %s (%d)",
 						child_fail_reason[rv], rv);
 				counter++;
 			} else if (rv != SUCCESS) {
-				fail("Unknown exitcode from child: %d\n", rv);
+				fail("Unknown exitcode from child: %d", rv);
 				counter++;
 			}
 		}
diff --git a/test/zdtm/transition/fifo_dyn.c b/test/zdtm/transition/fifo_dyn.c
index 62ebce4f3..2cdb48f46 100644
--- a/test/zdtm/transition/fifo_dyn.c
+++ b/test/zdtm/transition/fifo_dyn.c
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed: %m\n");
+				fail("write failed: %m");
 				ret = 1;
 				break;
 			}
@@ -120,13 +120,13 @@ int main(int argc, char **argv)
 			continue;
 
 		if (len > 0) {
-			fail("read failed: %m\n");
+			fail("read failed: %m");
 			ret = 1;
 			break;
 		}
 
 		if (memcmp(buf, rbuf, wlen)) {
-			fail("data mismatch\n");
+			fail("data mismatch");
 			ret = 1;
 			break;
 		}
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 	wait(&chret);
 	chret = WEXITSTATUS(chret);
 	if (chret) {
-		fail("child exited with non-zero code %d (%s)\n",
+		fail("child exited with non-zero code %d (%s)",
 			chret, strerror(chret));
 		return 1;
 	}
diff --git a/test/zdtm/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
index b06592586..2af8ab24f 100644
--- a/test/zdtm/transition/fifo_loop.c
+++ b/test/zdtm/transition/fifo_loop.c
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed: %m\n");
+				fail("write failed: %m");
 				ret = 1;
 				break;
 			}
@@ -163,13 +163,13 @@ int main(int argc, char **argv)
 		}
 
 		if (len > 0) {
-			fail("read failed: %m\n");
+			fail("read failed: %m");
 			ret = 1;
 			break;
 		}
 
 		if (memcmp(buf, rbuf, wlen)) {
-			fail("data mismatch\n");
+			fail("data mismatch");
 			ret = 1;
 			break;
 		}
@@ -180,7 +180,7 @@ int main(int argc, char **argv)
 	test_waitsig(); /* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m\n");
+		fail("failed to send SIGTERM to my process group: %m");
 		return 1;	/* shouldn't wait() in this case */
 	}
 	close(readfd);
@@ -188,14 +188,14 @@ int main(int argc, char **argv)
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (waitpid(pids[i], &chret, 0) < 0) {
-			fail("waitpid error: %m\n");
+			fail("waitpid error: %m");
 			ret = 1;
 			continue;
 		}
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child %d exited with non-zero code %d (%s)\n",
+			fail("child %d exited with non-zero code %d (%s)",
 				i, chret, strerror(chret));
 			ret = 1;
 			continue;
diff --git a/test/zdtm/transition/file_read.c b/test/zdtm/transition/file_read.c
index 5d6e4dbba..9b5670c65 100644
--- a/test/zdtm/transition/file_read.c
+++ b/test/zdtm/transition/file_read.c
@@ -217,21 +217,21 @@ int main(int argc, char **argv)
 	killall();
 	for (i = 0; i < scale; i++) {
 		if (waitpid(pids[i], &rv, 0) == -1) {
-			fail("Can't wipe up the kid\n");
+			fail("Can't wipe up the kid");
 			counter++;
 			continue;
 		}
 		if (!WIFEXITED(rv)) {
-			fail("Kid was killed\n");
+			fail("Kid was killed");
 			counter++;
 		} else {
 			rv = WEXITSTATUS(rv);
 			if (rv < MAX_EXIT_CODE_VAL && rv > SUCCESS) {
-				fail("Kid failed: %s (%d)\n",
+				fail("Kid failed: %s (%d)",
 						kids_fail_reasons[rv], rv);
 				counter++;
 			} else if (rv != SUCCESS) {
-				fail("Unknown exitcode from kid: %d\n", rv);
+				fail("Unknown exitcode from kid: %d", rv);
 				counter++;
 			}
 		}
diff --git a/test/zdtm/transition/lazy-thp.c b/test/zdtm/transition/lazy-thp.c
index a0cf33041..01075d773 100644
--- a/test/zdtm/transition/lazy-thp.c
+++ b/test/zdtm/transition/lazy-thp.c
@@ -29,7 +29,7 @@ int main(int argc, char ** argv)
 	mem = malloc(PAGE_SIZE * N_PAGES);
 	org = malloc(PAGE_SIZE);
 	if (!mem || !org) {
-		fail("malloc failed\n");
+		fail("malloc failed");
 		exit(1);
 	}
 
@@ -48,7 +48,7 @@ int main(int argc, char ** argv)
 			org[128] = (count % 2 == 0) ? count : 0x42;
 
 			if (memcmp(org, m, PAGE_SIZE)) {
-				fail("memory corruption\n");
+				fail("memory corruption");
 				return 1;
 			}
 		}
diff --git a/test/zdtm/transition/pipe_loop00.c b/test/zdtm/transition/pipe_loop00.c
index 01964c618..99fa79914 100644
--- a/test/zdtm/transition/pipe_loop00.c
+++ b/test/zdtm/transition/pipe_loop00.c
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed\n");
+				fail("write failed");
 				ret = 1;
 				break;
 			}
@@ -129,13 +129,13 @@ int main(int argc, char **argv)
 			continue;
 
 		if (len > 0) {
-			fail("read failed: %m\n");
+			fail("read failed: %m");
 			ret = 1;
 			break;
 		}
 
 		if (memcmp(buf, rbuf, wlen)) {
-			fail("data mismatch\n");
+			fail("data mismatch");
 			ret = 1;
 			break;
 		}
@@ -146,21 +146,21 @@ int main(int argc, char **argv)
 	test_waitsig();	/* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m\n");
+		fail("failed to send SIGTERM to my process group: %m");
 		goto out;	/* shouldn't wait() in this case */
 	}
 
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m\n");
+			fail("can't wait for a child: %m");
 			ret = 1;
 			continue;
 		}
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child %d exited with non-zero code %d (%s)\n",
+			fail("child %d exited with non-zero code %d (%s)",
 			     i, chret, strerror(chret));
 			ret = 1;
 			continue;
diff --git a/test/zdtm/transition/pipe_shared00.c b/test/zdtm/transition/pipe_shared00.c
index 64708d9f8..9fd261934 100644
--- a/test/zdtm/transition/pipe_shared00.c
+++ b/test/zdtm/transition/pipe_shared00.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	while(test_go())
 		if (write(pipes[1], buf, sizeof(buf)) < 0 &&
 		    (errno != EINTR || test_go())) {	/* only SIGTERM may stop us */
-			fail("write failed: %m\n");
+			fail("write failed: %m");
 			ret = 1;
 			break;
 		}
@@ -111,21 +111,21 @@ int main(int argc, char **argv)
 	test_waitsig();	/* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m\n");
+		fail("failed to send SIGTERM to my process group: %m");
 		goto out;	/* shouldn't wait() in this case */
 	}
 
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m\n");
+			fail("can't wait for a child: %m");
 			ret = 1;
 			continue;
 		}
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child exited with non-zero code %d (%s)\n",
+			fail("child exited with non-zero code %d (%s)",
 			     chret, strerror(chret));
 			ret = 1;
 			continue;
diff --git a/test/zdtm/transition/shmem.c b/test/zdtm/transition/shmem.c
index 56b0f678b..39ccfbe9b 100644
--- a/test/zdtm/transition/shmem.c
+++ b/test/zdtm/transition/shmem.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 	}
 
 	if (status != *sum) {
-		fail("checksum mismatch: %x %x\n", status, *sum);
+		fail("checksum mismatch: %x %x", status, *sum);
 		return 1;
 	}
 
diff --git a/test/zdtm/transition/socket_loop00.c b/test/zdtm/transition/socket_loop00.c
index 1d7097bb9..ef9ab56d4 100644
--- a/test/zdtm/transition/socket_loop00.c
+++ b/test/zdtm/transition/socket_loop00.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed\n");
+				fail("write failed");
 				ret = 1;
 				break;
 			}
@@ -131,13 +131,13 @@ int main(int argc, char **argv)
 			continue;
 
 		if (len > 0) {
-			fail("read failed: %m\n");
+			fail("read failed: %m");
 			ret = 1;
 			break;
 		}
 
 		if (memcmp(buf, rbuf, wlen)) {
-			fail("data mismatch\n");
+			fail("data mismatch");
 			ret = 1;
 			break;
 		}
@@ -150,29 +150,29 @@ int main(int argc, char **argv)
 	 * has been received. Thus, send signal before closing parent fds.
 	 */
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m\n");
+		fail("failed to send SIGTERM to my process group: %m");
 		goto out;	/* shouldn't wait() in this case */
 	}
 	if (close(out))
-		fail("Failed to close parent fd 'out': %m\n");
+		fail("Failed to close parent fd 'out': %m");
 	/* If last child in the chain (from whom we read data) receives signal
 	 * after parent has finished reading but before calling write(2), this
 	 * child can block forever.  To avoid this, close 'in' fd.
 	 */
 	if (close(in))
-		fail("failed to close parent fd 'in': %m\n");
+		fail("failed to close parent fd 'in': %m");
 
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m\n");
+			fail("can't wait for a child: %m");
 			ret = 1;
 			continue;
 		}
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child %d exited with non-zero code %d (%s)\n",
+			fail("child %d exited with non-zero code %d (%s)",
 			     i, chret, strerror(chret));
 			ret = 1;
 			continue;
diff --git a/test/zdtm/transition/unix_sock.c b/test/zdtm/transition/unix_sock.c
index 64a4919dc..1bcd538cc 100644
--- a/test/zdtm/transition/unix_sock.c
+++ b/test/zdtm/transition/unix_sock.c
@@ -155,7 +155,7 @@ static int child(void)
 				(errno != EINTR && errno != EPIPE && \
 					errno != ECONNRESET))) {
 			ret = errno;
-			fail("child write: %m\n");
+			fail("child write: %m");
 			goto out;
 		}
 	}
@@ -246,7 +246,7 @@ out:
 	test_waitsig();
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m\n");
+		fail("failed to send SIGTERM to my process group: %m");
 		goto cleanup;	/* shouldn't wait() in this case */
 	}
 
@@ -259,16 +259,16 @@ out:
 		 * (not yet delivered), then called write(), blocking forever.
 		 */
 		if(close(child_desc[nproc].sock))
-			fail("Can't close server socket: %m\n");
+			fail("Can't close server socket: %m");
 
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m\n");
+			fail("can't wait for a child: %m");
 			goto cleanup;
 		}
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child exited with non-zero code %d (%s)\n",
+			fail("child exited with non-zero code %d (%s)",
 			     chret, strerror(chret));
 			goto cleanup;
 		}

From 12a2bd0eddecfc8655857854edc03711522aacb9 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 14:24:31 -0700
Subject: [PATCH 0586/1854] test/zdtm: don't use %m with fail

Macro fail already appends errno and strerror(errno) to the error
message, so there's no need to do it explicitly.

Brought to you by

	for f in $(git grep -l fail test/zdtm); do
		test -f $f || continue
		echo $f
		sed -i '\|^[[:space:]]*fail(.*[ (]%m)*"|s/:*[ (]*%m)*//' $f
	done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/cwd00.c              |  2 +-
 test/zdtm/static/cwd01.c              |  2 +-
 test/zdtm/static/deleted_dev.c        |  6 +++---
 test/zdtm/static/deleted_unix_sock.c  | 10 +++++-----
 test/zdtm/static/env00.c              |  2 +-
 test/zdtm/static/fifo-rowo-pair.c     |  2 +-
 test/zdtm/static/fifo.c               |  6 +++---
 test/zdtm/static/fifo_ro.c            |  6 +++---
 test/zdtm/static/fifo_wronly.c        |  8 ++++----
 test/zdtm/static/file_attr.c          | 10 +++++-----
 test/zdtm/static/jobctl00.c           |  6 +++---
 test/zdtm/static/link10.c             |  2 +-
 test/zdtm/static/maps00.c             |  8 ++++----
 test/zdtm/static/mprotect00.c         |  4 ++--
 test/zdtm/static/msgque.c             | 10 +++++-----
 test/zdtm/static/overmount_dev.c      |  8 ++++----
 test/zdtm/static/overmount_fifo.c     |  8 ++++----
 test/zdtm/static/overmount_file.c     |  6 +++---
 test/zdtm/static/overmount_sock.c     | 12 ++++++------
 test/zdtm/static/packet_sock.c        | 12 ++++++------
 test/zdtm/static/shm-mp.c             |  4 ++--
 test/zdtm/static/unbound_sock.c       |  2 +-
 test/zdtm/static/unhashed_proc.c      |  4 ++--
 test/zdtm/static/unlink_fifo.c        |  2 +-
 test/zdtm/static/unlink_fifo_wronly.c |  4 ++--
 test/zdtm/static/unlink_fstat00.c     |  2 +-
 test/zdtm/static/vfork00.c            |  4 ++--
 test/zdtm/static/wait00.c             |  4 ++--
 test/zdtm/static/write_read00.c       |  4 ++--
 test/zdtm/static/write_read01.c       |  2 +-
 test/zdtm/static/write_read02.c       |  6 +++---
 test/zdtm/static/write_read10.c       | 12 ++++++------
 test/zdtm/transition/epoll.c          |  4 ++--
 test/zdtm/transition/fifo_dyn.c       |  4 ++--
 test/zdtm/transition/fifo_loop.c      |  8 ++++----
 test/zdtm/transition/netlink00.c      |  2 +-
 test/zdtm/transition/pipe_loop00.c    |  6 +++---
 test/zdtm/transition/pipe_shared00.c  |  6 +++---
 test/zdtm/transition/socket_loop00.c  | 10 +++++-----
 test/zdtm/transition/unix_sock.c      | 12 ++++++------
 40 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/test/zdtm/static/cwd00.c b/test/zdtm/static/cwd00.c
index e05aea42f..d75fa6a4e 100644
--- a/test/zdtm/static/cwd00.c
+++ b/test/zdtm/static/cwd00.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (!getcwd(cwd2, sizeof(cwd2))) {
-		fail("can't get cwd: %m");
+		fail("can't get cwd");
 		goto cleanup;
 	}
 
diff --git a/test/zdtm/static/cwd01.c b/test/zdtm/static/cwd01.c
index 8751dc514..b04032c1c 100644
--- a/test/zdtm/static/cwd01.c
+++ b/test/zdtm/static/cwd01.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 
 	aux2 = readlink("/proc/self/cwd", cwd2, sizeof(cwd2));
 	if (aux2 < 0) {
-		fail("can't get cwd: %m");
+		fail("can't get cwd");
 		goto cleanup;
 	}
 	if (aux2 == sizeof(cwd2)) {
diff --git a/test/zdtm/static/deleted_dev.c b/test/zdtm/static/deleted_dev.c
index c9ca4f123..a850338d9 100644
--- a/test/zdtm/static/deleted_dev.c
+++ b/test/zdtm/static/deleted_dev.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (fstat(fd, &st) < 0) {
-		fail("can't stat %s: %m", filename);
+		fail("can't stat %s", filename);
 		goto out;
 	}
 
@@ -59,12 +59,12 @@ int main(int argc, char **argv)
 	}
 
 	if (close(fd) < 0) {
-		fail("can't close %s: %m", filename);
+		fail("can't close %s", filename);
 		goto out;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m", filename);
+		fail("file %s should have been deleted before migration: unlink", filename);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/deleted_unix_sock.c b/test/zdtm/static/deleted_unix_sock.c
index 4a0f50e68..b8856b6fd 100644
--- a/test/zdtm/static/deleted_unix_sock.c
+++ b/test/zdtm/static/deleted_unix_sock.c
@@ -125,12 +125,12 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m");
+		fail("terminating the child failed");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid %d: %m", pid);
+		fail("wait() returned wrong pid %d", pid);
 		goto out;
 	}
 
@@ -147,7 +147,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (read(sock, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		goto out;
 	}
 
@@ -159,12 +159,12 @@ int main(int argc, char ** argv)
 
 
 	if (close(sock)) {
-		fail("close failed: %m");
+		fail("close failed");
 		goto out;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m", filename);
+		fail("file %s should have been deleted before migration: unlink", filename);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/env00.c b/test/zdtm/static/env00.c
index 7207f0c05..5ee995b93 100644
--- a/test/zdtm/static/env00.c
+++ b/test/zdtm/static/env00.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv)
 
 	env = getenv(envname);
 	if (!env) {
-		fail("can't get env var \"%s\": %m", envname);
+		fail("can't get env var \"%s\"", envname);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/fifo-rowo-pair.c b/test/zdtm/static/fifo-rowo-pair.c
index 5becf1689..239634381 100644
--- a/test/zdtm/static/fifo-rowo-pair.c
+++ b/test/zdtm/static/fifo-rowo-pair.c
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
 
 	errno = WEXITSTATUS(status);
 	if (errno) {
-		fail("Child exited with error %m");
+		fail("Child exited with error");
 		exit(errno);
 	}
 
diff --git a/test/zdtm/static/fifo.c b/test/zdtm/static/fifo.c
index 0381aee39..91a116619 100644
--- a/test/zdtm/static/fifo.c
+++ b/test/zdtm/static/fifo.c
@@ -59,12 +59,12 @@ int main(int argc, char **argv)
 	}
 
 	if (close(fd) < 0) {
-		fail("can't close %s: %m", filename);
+		fail("can't close %s", filename);
 		return 1;
 	}
 
 	if (stat(filename, &st) < 0) {
-		fail("can't stat %s: %m", filename);
+		fail("can't stat %s", filename);
 		return 1;
 	}
 
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 	}
 
 	if (unlink(filename) < 0) {
-		fail("can't unlink %s: %m", filename);
+		fail("can't unlink %s", filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fifo_ro.c b/test/zdtm/static/fifo_ro.c
index 3347d2003..d0d2cc48e 100644
--- a/test/zdtm/static/fifo_ro.c
+++ b/test/zdtm/static/fifo_ro.c
@@ -67,12 +67,12 @@ int main(int argc, char **argv)
 	}
 
 	if (close(fd_ro) < 0) {
-		fail("can't close %s: %m", filename);
+		fail("can't close %s", filename);
 		return 1;
 	}
 
 	if (stat(filename, &st) < 0) {
-		fail("can't stat %s: %m", filename);
+		fail("can't stat %s", filename);
 		return 1;
 	}
 
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 	}
 
 	if (unlink(filename) < 0) {
-		fail("can't unlink %s: %m", filename);
+		fail("can't unlink %s", filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fifo_wronly.c b/test/zdtm/static/fifo_wronly.c
index 3aea32c64..64502e187 100644
--- a/test/zdtm/static/fifo_wronly.c
+++ b/test/zdtm/static/fifo_wronly.c
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
 			return 1;
 		}
 		if (close(fd1) < 0) {
-			fail("can't close %d, %s: %m", fd1, filename);
+			fail("can't close %d, %s", fd1, filename);
 			chret = errno;
 			return chret;
 		}
@@ -93,12 +93,12 @@ int main(int argc, char **argv)
 		}
 
 		if (close(fd) < 0) {
-			fail("can't close %d, %s: %m", fd, filename);
+			fail("can't close %d, %s", fd, filename);
 			return 1;
 		}
 
 		if (stat(filename, &st) < 0) {
-			fail("can't stat %s: %m", filename);
+			fail("can't stat %s", filename);
 			return 1;
 		}
 
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
 		}
 
 		if (unlink(filename) < 0) {
-			fail("can't unlink %s: %m", filename);
+			fail("can't unlink %s", filename);
 			return 1;
 		}
 	}
diff --git a/test/zdtm/static/file_attr.c b/test/zdtm/static/file_attr.c
index d6764b53d..752c094bf 100644
--- a/test/zdtm/static/file_attr.c
+++ b/test/zdtm/static/file_attr.c
@@ -72,12 +72,12 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (lseek(fd, 0, SEEK_SET) < 0) {
-		fail("lseeking to the beginning of file failed: %m");
+		fail("lseeking to the beginning of file failed");
 		goto out;
 	}
 
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		goto out;
 	}
 
@@ -88,7 +88,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (fstat(fd, &st) < 0) {
-		fail("can't fstat %s: %m", filename);
+		fail("can't fstat %s", filename);
 		goto out;
 	}
 
@@ -103,12 +103,12 @@ int main(int argc, char ** argv)
 	}
 
 	if (close(fd)) {
-		fail("close failed: %m");
+		fail("close failed");
 		goto out_noclose;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m", filename);
+		fail("file %s should have been deleted before migration: unlink", filename);
 		goto out_noclose;
 	}
 
diff --git a/test/zdtm/static/jobctl00.c b/test/zdtm/static/jobctl00.c
index 397747b24..a14c4a768 100644
--- a/test/zdtm/static/jobctl00.c
+++ b/test/zdtm/static/jobctl00.c
@@ -75,7 +75,7 @@ static int reader(int sig)
 static int post_reader(int fd)
 {
 	if (write(fd, rd_string, sizeof(rd_string) - 1) < 0) {
-		fail("write failed: %m");
+		fail("write failed");
 		return -1;
 	}
 	return 0;
@@ -90,7 +90,7 @@ static int post_writer(int fd)
 {
 	char str[sizeof(wr_string) + 1];
 	if (read(0, str, sizeof(str)) < 0) {
-		fail("read failed: %m");
+		fail("read failed");
 		return -1;
 	}
 	/*
@@ -241,7 +241,7 @@ int finish_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 		int jtno = i % (sizeof(job_types) / sizeof(job_types[0]));
 
 		if (tcsetpgrp(fdslave, jobs[i]) < 0) {
-			fail("can't bring a job into foreground: %m");
+			fail("can't bring a job into foreground");
 			goto killout;
 		}
 
diff --git a/test/zdtm/static/link10.c b/test/zdtm/static/link10.c
index 4bc2b5f2c..9deb4a127 100644
--- a/test/zdtm/static/link10.c
+++ b/test/zdtm/static/link10.c
@@ -53,7 +53,7 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (fstat(fd, &stat) < 0 || fstat(fd2, &stat2) < 0) {
-		fail("fstat failed: %m");
+		fail("fstat failed");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/maps00.c b/test/zdtm/static/maps00.c
index 60328c4c1..9ed248d4d 100644
--- a/test/zdtm/static/maps00.c
+++ b/test/zdtm/static/maps00.c
@@ -133,7 +133,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, segfault) == SIG_ERR)
 	{
-		fail("setting SIGSEGV handler failed: %m");
+		fail("setting SIGSEGV handler failed");
 		return -1;
 	}
 	if (!sigsetjmp(segv_ret, 1))
@@ -154,7 +154,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, segfault) == SIG_ERR)
 	{
-		fail("setting SIGSEGV handler failed: %m");
+		fail("setting SIGSEGV handler failed");
 		return -1;
 	}
 
@@ -166,7 +166,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, segfault) == SIG_ERR)
 	{
-		fail("restoring SIGSEGV handler failed: %m");
+		fail("restoring SIGSEGV handler failed");
 		return -1;
 	}
 
@@ -197,7 +197,7 @@ static int check_map(struct map *map)
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR)
 	{
-		fail("restoring SIGSEGV handler failed: %m");
+		fail("restoring SIGSEGV handler failed");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/mprotect00.c b/test/zdtm/static/mprotect00.c
index e70d29ae0..bf852e596 100644
--- a/test/zdtm/static/mprotect00.c
+++ b/test/zdtm/static/mprotect00.c
@@ -31,7 +31,7 @@ static void segfault(int signo)
 static int check_prot(char *ptr, int prot)
 {
 	if (signal(SIGSEGV, segfault) == SIG_ERR) {
-		fail("setting SIGSEGV handler failed: %m");
+		fail("setting SIGSEGV handler failed");
 		return -1;
 	}
 
@@ -66,7 +66,7 @@ static int check_prot(char *ptr, int prot)
 
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
-		fail("restoring SIGSEGV handler failed: %m");
+		fail("restoring SIGSEGV handler failed");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/msgque.c b/test/zdtm/static/msgque.c
index 9ae3caf1f..55f81792f 100644
--- a/test/zdtm/static/msgque.c
+++ b/test/zdtm/static/msgque.c
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 		test_waitsig();
 
 		if (msgrcv(msg, &msgbuf, sizeof(TEST_STRING), MSG_TYPE, IPC_NOWAIT) == -1) {
-			fail("Child: msgrcv failed (%m)");
+			fail("Child: msgrcv failed");
 			return -errno;
 		}
 
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 		msgbuf.mtype = ANOTHER_MSG_TYPE;
 		memcpy(msgbuf.mtext, ANOTHER_TEST_STRING, sizeof(ANOTHER_TEST_STRING));
 		if (msgsnd(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), IPC_NOWAIT) != 0) {
-			fail("Child: msgsnd failed (%m)");
+			fail("Child: msgsnd failed");
 			return -errno;
 		};
 		pass();
@@ -83,14 +83,14 @@ int main(int argc, char **argv)
 		msgbuf.mtype = MSG_TYPE;
 		memcpy(msgbuf.mtext, TEST_STRING, sizeof(TEST_STRING));
 		if (msgsnd(msg, &msgbuf, sizeof(TEST_STRING), IPC_NOWAIT) != 0) {
-			fail("Parent: msgsnd failed (%m)");
+			fail("Parent: msgsnd failed");
 			goto err_kill;
 		};
 
 		msgbuf.mtype = ANOTHER_MSG_TYPE;
 		memcpy(msgbuf.mtext, ANOTHER_TEST_STRING, sizeof(ANOTHER_TEST_STRING));
 		if (msgsnd(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), IPC_NOWAIT) != 0) {
-			fail("child: msgsnd (2) failed (%m)");
+			fail("child: msgsnd (2) failed");
 			return -errno;
 		};
 
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
 		}
 
 		if (msgrcv(msg, &msgbuf, sizeof(ANOTHER_TEST_STRING), ANOTHER_MSG_TYPE, IPC_NOWAIT) == -1) {
-			fail("Parent: msgrcv failed (%m)");
+			fail("Parent: msgrcv failed");
 			goto err;
 		}
 
diff --git a/test/zdtm/static/overmount_dev.c b/test/zdtm/static/overmount_dev.c
index a8dc8b80b..e126d301d 100644
--- a/test/zdtm/static/overmount_dev.c
+++ b/test/zdtm/static/overmount_dev.c
@@ -57,17 +57,17 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (umount(dirname) < 0) {
-		fail("can't umount %s: %m", dirname);
+		fail("can't umount %s", dirname);
 		goto cleanup;
 	}
 
 	if (close(fd) < 0) {
-		fail("can't close %s: %m", path);
+		fail("can't close %s", path);
 		goto unlink;
 	}
 
 	if (stat(path, &st) < 0) {
-		fail("can't stat %s: %m", path);
+		fail("can't stat %s", path);
 		goto unlink;
 	}
 
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 	}
 
 	if (unlink(path) < 0) {
-		fail("can't unlink %s: %m", path);
+		fail("can't unlink %s", path);
 		goto rmdir;
 	}
 
diff --git a/test/zdtm/static/overmount_fifo.c b/test/zdtm/static/overmount_fifo.c
index e452f1bae..c73793036 100644
--- a/test/zdtm/static/overmount_fifo.c
+++ b/test/zdtm/static/overmount_fifo.c
@@ -54,17 +54,17 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (umount(dirname) < 0) {
-		fail("can't umount %s: %m", dirname);
+		fail("can't umount %s", dirname);
 		goto cleanup;
 	}
 
 	if (close(fd) < 0) {
-		fail("can't close %s: %m", path);
+		fail("can't close %s", path);
 		goto unlink;
 	}
 
 	if (stat(path, &st) < 0) {
-		fail("can't stat %s: %m", path);
+		fail("can't stat %s", path);
 		goto unlink;
 	}
 
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 	}
 
 	if (unlink(path) < 0) {
-		fail("can't unlink %s: %m", path);
+		fail("can't unlink %s", path);
 		goto rmdir;
 	}
 
diff --git a/test/zdtm/static/overmount_file.c b/test/zdtm/static/overmount_file.c
index 5c370e05a..e20d98f93 100644
--- a/test/zdtm/static/overmount_file.c
+++ b/test/zdtm/static/overmount_file.c
@@ -47,17 +47,17 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (umount(dirname) < 0) {
-		fail("can't umount %s: %m", dirname);
+		fail("can't umount %s", dirname);
 		goto cleanup;
 	}
 
 	if (close(fd) < 0) {
-		fail("can't close %s: %m", path);
+		fail("can't close %s", path);
 		goto unlink;
 	}
 
 	if (unlink(path) < 0) {
-		fail("can't unlink %s: %m", path);
+		fail("can't unlink %s", path);
 		goto rmdir;
 	}
 
diff --git a/test/zdtm/static/overmount_sock.c b/test/zdtm/static/overmount_sock.c
index fb8ea7011..8d2d28bf6 100644
--- a/test/zdtm/static/overmount_sock.c
+++ b/test/zdtm/static/overmount_sock.c
@@ -147,12 +147,12 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m");
+		fail("terminating the child failed");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid %d: %m", pid);
+		fail("wait() returned wrong pid %d", pid);
 		goto out;
 	}
 
@@ -170,7 +170,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (read(sock, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m", path);
+		fail("can't read %s", path);
 		goto out;
 	}
 
@@ -181,17 +181,17 @@ int main(int argc, char ** argv)
 	}
 
 	if (umount(dirname) < 0) {
-		fail("can't umount %s: %m", dirname);
+		fail("can't umount %s", dirname);
 		goto out;
 	}
 
 	if (close(sock) < 0) {
-		fail("can't close %s: %m", path);
+		fail("can't close %s", path);
 		goto out;
 	}
 
 	if (unlink(path) < 0) {
-		fail("can't unlink %s: %m", path);
+		fail("can't unlink %s", path);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/packet_sock.c b/test/zdtm/static/packet_sock.c
index 5ec992edb..36516fa99 100644
--- a/test/zdtm/static/packet_sock.c
+++ b/test/zdtm/static/packet_sock.c
@@ -206,7 +206,7 @@ int main(int argc, char **argv)
 
 	alen = sizeof(ver);
 	if (getsockopt(sk1, SOL_PACKET, PACKET_VERSION, &ver, &alen) < 0) {
-		fail("Can't get sockopt ver %m");
+		fail("Can't get sockopt ver");
 		return 1;
 	}
 
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
 
 	alen = sizeof(yes);
 	if (getsockopt(sk1, SOL_PACKET, PACKET_AUXDATA, &yes, &alen) < 0) {
-		fail("Can't get sockopt auxdata %m");
+		fail("Can't get sockopt auxdata");
 		return 1;
 	}
 
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
 
 	alen = sizeof(yes);
 	if (getsockopt(sk1, SOL_PACKET, PACKET_FANOUT, &yes, &alen) < 0) {
-		fail("Can't read fanout back %m");
+		fail("Can't read fanout back");
 		return 1;
 	}
 
@@ -256,13 +256,13 @@ int main(int argc, char **argv)
 
 	alen = sizeof(rsv);
 	if (getsockopt(sk2, SOL_PACKET, PACKET_RESERVE, &rsv, &alen) < 0) {
-		fail("Can't get sockopt rsv %m");
+		fail("Can't get sockopt rsv");
 		return 1;
 	}
 
 	alen = sizeof(yes);
 	if (getsockopt(sk2, SOL_PACKET, PACKET_ORIGDEV, &yes, &alen) < 0) {
-		fail("Can't get sockopt origdev %m");
+		fail("Can't get sockopt origdev");
 		return 1;
 	}
 
@@ -287,7 +287,7 @@ int main(int argc, char **argv)
 
 	alen = sizeof(yes);
 	if (getsockopt(sk2, SOL_PACKET, PACKET_FANOUT, &yes, &alen) < 0) {
-		fail("Can't read fanout2 back %m");
+		fail("Can't read fanout2 back");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/shm-mp.c b/test/zdtm/static/shm-mp.c
index 850b22cc2..a7c87962d 100644
--- a/test/zdtm/static/shm-mp.c
+++ b/test/zdtm/static/shm-mp.c
@@ -20,7 +20,7 @@ static void segfault(int signo)
 static int check_prot(char *ptr, char val, int prot)
 {
 	if (signal(SIGSEGV, segfault) == SIG_ERR) {
-		fail("setting SIGSEGV handler failed: %m");
+		fail("setting SIGSEGV handler failed");
 		return -1;
 	}
 
@@ -52,7 +52,7 @@ static int check_prot(char *ptr, char val, int prot)
 		}
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
-		fail("restoring SIGSEGV handler failed: %m");
+		fail("restoring SIGSEGV handler failed");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/unbound_sock.c b/test/zdtm/static/unbound_sock.c
index be8318c5f..f1d610d20 100644
--- a/test/zdtm/static/unbound_sock.c
+++ b/test/zdtm/static/unbound_sock.c
@@ -33,7 +33,7 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0)
-		fail("can't bind to a socket: %m");
+		fail("can't bind to a socket");
 	else
 		pass();
 
diff --git a/test/zdtm/static/unhashed_proc.c b/test/zdtm/static/unhashed_proc.c
index 68132aac2..75fe881ce 100644
--- a/test/zdtm/static/unhashed_proc.c
+++ b/test/zdtm/static/unhashed_proc.c
@@ -61,13 +61,13 @@ int main(int argc, char ** argv)
 		fail("successful getcwd: %s", cwd2);
 		exit(1);
 	} else if (errno != ENOENT) {
-		fail("wrong errno: %m");
+		fail("wrong errno");
 		exit(1);
 	}
 
 	len = readlink("/proc/self/cwd", cwd2, sizeof(cwd2)-1);
 	if (len < 0) {
-		fail("can't read cwd symlink %m");
+		fail("can't read cwd symlink");
 		exit(1);
 	}
 	cwd2[len] = 0;
diff --git a/test/zdtm/static/unlink_fifo.c b/test/zdtm/static/unlink_fifo.c
index 765f5eb07..ff36edacf 100644
--- a/test/zdtm/static/unlink_fifo.c
+++ b/test/zdtm/static/unlink_fifo.c
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (close(fd) < 0) {
-		fail("can't close %s: %m", filename);
+		fail("can't close %s", filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/unlink_fifo_wronly.c b/test/zdtm/static/unlink_fifo_wronly.c
index 5fb4c3450..c5c4b206e 100644
--- a/test/zdtm/static/unlink_fifo_wronly.c
+++ b/test/zdtm/static/unlink_fifo_wronly.c
@@ -46,12 +46,12 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (close(fd) < 0) {
-		fail("can't close (O_RDONLY | O_NONBLOCK) %s: %m", filename);
+		fail("can't close (O_RDONLY | O_NONBLOCK) %s", filename);
 		return 1;
 	}
 
 	if (close(fd1) < 0) {
-		fail("can't close (O_WRONLY) %s: %m", filename);
+		fail("can't close (O_WRONLY) %s", filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat00.c b/test/zdtm/static/unlink_fstat00.c
index 1c196ba43..9f8e30188 100644
--- a/test/zdtm/static/unlink_fstat00.c
+++ b/test/zdtm/static/unlink_fstat00.c
@@ -152,7 +152,7 @@ int main(int argc, char ** argv)
 		goto failed;
 	}
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/vfork00.c b/test/zdtm/static/vfork00.c
index 002ddeedc..0f8ef0666 100644
--- a/test/zdtm/static/vfork00.c
+++ b/test/zdtm/static/vfork00.c
@@ -54,12 +54,12 @@ int main(int argc, char ** argv)
 	 * the grand-child has exec()-ed, but we don't know the pid of the
 	 * latter */
 	if (kill(0, SIGTERM)) {
-		fail("terminating the children failed: %m");
+		fail("terminating the children failed");
 		exit(1);
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid: %m");
+		fail("wait() returned wrong pid");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/wait00.c b/test/zdtm/static/wait00.c
index 7248d41c0..e16cd5bd7 100644
--- a/test/zdtm/static/wait00.c
+++ b/test/zdtm/static/wait00.c
@@ -33,12 +33,12 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m");
+		fail("terminating the child failed");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid: %m");
+		fail("wait() returned wrong pid");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/write_read00.c b/test/zdtm/static/write_read00.c
index c3fc5b18b..2b7bdd4ad 100644
--- a/test/zdtm/static/write_read00.c
+++ b/test/zdtm/static/write_read00.c
@@ -39,12 +39,12 @@ int main(int argc, char ** argv)
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		fail("can't open %s: %m", filename);
+		fail("can't open %s", filename);
 		exit(1);
 	}
 
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/write_read01.c b/test/zdtm/static/write_read01.c
index b556c0ba5..abb481117 100644
--- a/test/zdtm/static/write_read01.c
+++ b/test/zdtm/static/write_read01.c
@@ -52,7 +52,7 @@ int main(int argc, char ** argv)
 
 	/* recover reading */
 	if (read(fd, buf + len, sizeof(buf) - len) != (sizeof(buf) - len)) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/write_read02.c b/test/zdtm/static/write_read02.c
index 4100affa8..59ff4ce2f 100644
--- a/test/zdtm/static/write_read02.c
+++ b/test/zdtm/static/write_read02.c
@@ -50,7 +50,7 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (write(fd, buf + len, sizeof(buf) - len) != (sizeof(buf) - len)) {
-		fail("can't write %s: %m", filename);
+		fail("can't write %s", filename);
 		goto out;
 	}
 
@@ -58,12 +58,12 @@ int main(int argc, char ** argv)
 
 	fd = open(filename, O_RDONLY);
 	if (fd < 0) {
-		fail("can't open %s: %m", filename);
+		fail("can't open %s", filename);
 		return 1;
 	}
 
 	if (read(fd, buf, full_len) != full_len) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/write_read10.c b/test/zdtm/static/write_read10.c
index b572d51d7..f4ef9bb16 100644
--- a/test/zdtm/static/write_read10.c
+++ b/test/zdtm/static/write_read10.c
@@ -72,12 +72,12 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	if (kill(pid, SIGTERM)) {
-		fail("terminating the child failed: %m");
+		fail("terminating the child failed");
 		goto out;
 	}
 
 	if (wait(&ret) != pid) {
-		fail("wait() returned wrong pid %d: %m", pid);
+		fail("wait() returned wrong pid %d", pid);
 		goto out;
 	}
 
@@ -94,12 +94,12 @@ int main(int argc, char ** argv)
 	}
 
 	if (lseek(fd, 0, SEEK_SET) < 0) {
-		fail("lseeking to the beginning of file failed: %m");
+		fail("lseeking to the beginning of file failed");
 		goto out;
 	}
 
 	if (read(fd, buf, sizeof(buf)) != sizeof(buf)) {
-		fail("can't read %s: %m", filename);
+		fail("can't read %s", filename);
 		goto out;
 	}
 
@@ -111,12 +111,12 @@ int main(int argc, char ** argv)
 
 
 	if (close(fd)) {
-		fail("close failed: %m");
+		fail("close failed");
 		goto out_noclose;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink: %m",
+		fail("file %s should have been deleted before migration: unlink",
 				filename);
 		goto out_noclose;
 	}
diff --git a/test/zdtm/transition/epoll.c b/test/zdtm/transition/epoll.c
index 578322b3e..098eeb1fd 100644
--- a/test/zdtm/transition/epoll.c
+++ b/test/zdtm/transition/epoll.c
@@ -82,7 +82,7 @@ static void run_child(int num)
 		if (write(fd, buf, buf_size) < 0 &&
 			(!stop /* signal SIGUSR2 NOT received */ ||
 				(errno != EINTR && errno != EPIPE))) {
-			fail("child write: %m");
+			fail("child write");
 			rv = WRITEERROR;
 			goto out;
 		}
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < scale; i++) {
 		kill(pids[i], SIGUSR2);
 		if (waitpid(pids[i], &rv, 0) < 0) {
-			fail("waitpid error: %m");
+			fail("waitpid error");
 			counter++;
 			continue;
 		} else {
diff --git a/test/zdtm/transition/fifo_dyn.c b/test/zdtm/transition/fifo_dyn.c
index 2cdb48f46..d72e1e6cd 100644
--- a/test/zdtm/transition/fifo_dyn.c
+++ b/test/zdtm/transition/fifo_dyn.c
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed: %m");
+				fail("write failed");
 				ret = 1;
 				break;
 			}
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
 			continue;
 
 		if (len > 0) {
-			fail("read failed: %m");
+			fail("read failed");
 			ret = 1;
 			break;
 		}
diff --git a/test/zdtm/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
index 2af8ab24f..51f93f645 100644
--- a/test/zdtm/transition/fifo_loop.c
+++ b/test/zdtm/transition/fifo_loop.c
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
 			if (errno == EINTR)
 				continue;
 			else {
-				fail("write failed: %m");
+				fail("write failed");
 				ret = 1;
 				break;
 			}
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
 		}
 
 		if (len > 0) {
-			fail("read failed: %m");
+			fail("read failed");
 			ret = 1;
 			break;
 		}
@@ -180,7 +180,7 @@ int main(int argc, char **argv)
 	test_waitsig(); /* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m");
+		fail("failed to send SIGTERM to my process group");
 		return 1;	/* shouldn't wait() in this case */
 	}
 	close(readfd);
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (waitpid(pids[i], &chret, 0) < 0) {
-			fail("waitpid error: %m");
+			fail("waitpid error");
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/netlink00.c b/test/zdtm/transition/netlink00.c
index 3504a48a1..8e7d33c95 100644
--- a/test/zdtm/transition/netlink00.c
+++ b/test/zdtm/transition/netlink00.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 				goto out;
 			};
 			if (recv_reply() < 0){
-				fail("RTNETLINK answers: %m");
+				fail("RTNETLINK answers");
 				goto out;
 			};
 
diff --git a/test/zdtm/transition/pipe_loop00.c b/test/zdtm/transition/pipe_loop00.c
index 99fa79914..73e05e217 100644
--- a/test/zdtm/transition/pipe_loop00.c
+++ b/test/zdtm/transition/pipe_loop00.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 			continue;
 
 		if (len > 0) {
-			fail("read failed: %m");
+			fail("read failed");
 			ret = 1;
 			break;
 		}
@@ -146,14 +146,14 @@ int main(int argc, char **argv)
 	test_waitsig();	/* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m");
+		fail("failed to send SIGTERM to my process group");
 		goto out;	/* shouldn't wait() in this case */
 	}
 
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m");
+			fail("can't wait for a child");
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/pipe_shared00.c b/test/zdtm/transition/pipe_shared00.c
index 9fd261934..d1dcd665d 100644
--- a/test/zdtm/transition/pipe_shared00.c
+++ b/test/zdtm/transition/pipe_shared00.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	while(test_go())
 		if (write(pipes[1], buf, sizeof(buf)) < 0 &&
 		    (errno != EINTR || test_go())) {	/* only SIGTERM may stop us */
-			fail("write failed: %m");
+			fail("write failed");
 			ret = 1;
 			break;
 		}
@@ -111,14 +111,14 @@ int main(int argc, char **argv)
 	test_waitsig();	/* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m");
+		fail("failed to send SIGTERM to my process group");
 		goto out;	/* shouldn't wait() in this case */
 	}
 
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m");
+			fail("can't wait for a child");
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/socket_loop00.c b/test/zdtm/transition/socket_loop00.c
index ef9ab56d4..85dba1155 100644
--- a/test/zdtm/transition/socket_loop00.c
+++ b/test/zdtm/transition/socket_loop00.c
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
 			continue;
 
 		if (len > 0) {
-			fail("read failed: %m");
+			fail("read failed");
 			ret = 1;
 			break;
 		}
@@ -150,22 +150,22 @@ int main(int argc, char **argv)
 	 * has been received. Thus, send signal before closing parent fds.
 	 */
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m");
+		fail("failed to send SIGTERM to my process group");
 		goto out;	/* shouldn't wait() in this case */
 	}
 	if (close(out))
-		fail("Failed to close parent fd 'out': %m");
+		fail("Failed to close parent fd 'out'");
 	/* If last child in the chain (from whom we read data) receives signal
 	 * after parent has finished reading but before calling write(2), this
 	 * child can block forever.  To avoid this, close 'in' fd.
 	 */
 	if (close(in))
-		fail("failed to close parent fd 'in': %m");
+		fail("failed to close parent fd 'in'");
 
 	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m");
+			fail("can't wait for a child");
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/unix_sock.c b/test/zdtm/transition/unix_sock.c
index 1bcd538cc..1fb61139d 100644
--- a/test/zdtm/transition/unix_sock.c
+++ b/test/zdtm/transition/unix_sock.c
@@ -155,7 +155,7 @@ static int child(void)
 				(errno != EINTR && errno != EPIPE && \
 					errno != ECONNRESET))) {
 			ret = errno;
-			fail("child write: %m");
+			fail("child write");
 			goto out;
 		}
 	}
@@ -219,7 +219,7 @@ int main(int argc, char **argv)
 		read_fds = active_fds;
 		if (select(FD_SETSIZE, &read_fds, NULL, NULL, NULL) < 0 &&
 		    errno != EINTR) {
-			fail("error waiting for data: %m");
+			fail("error waiting for data");
 			goto out;
 		}
 
@@ -229,7 +229,7 @@ int main(int argc, char **argv)
 					if(errno == EINTR)	/* we're asked to stop */
 						break;
 					else {
-						fail("error reading data from socket: %m");
+						fail("error reading data from socket");
 						goto out;
 					}
 				}
@@ -246,7 +246,7 @@ out:
 	test_waitsig();
 
 	if (kill(0, SIGTERM)) {
-		fail("failed to send SIGTERM to my process group: %m");
+		fail("failed to send SIGTERM to my process group");
 		goto cleanup;	/* shouldn't wait() in this case */
 	}
 
@@ -259,10 +259,10 @@ out:
 		 * (not yet delivered), then called write(), blocking forever.
 		 */
 		if(close(child_desc[nproc].sock))
-			fail("Can't close server socket: %m");
+			fail("Can't close server socket");
 
 		if (wait(&chret) < 0) {
-			fail("can't wait for a child: %m");
+			fail("can't wait for a child");
 			goto cleanup;
 		}
 

From 4cd23083bedaab42d5be8d6a89d05b3212697452 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 14:30:00 -0700
Subject: [PATCH 0587/1854] test/zdtm: don't pass errno to fail()

Macro fail() already prints the value of errno, so there's no need to
explicitly add it.

Found by git grep '^\s*\<fail\>.*errno'

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/file_locks05.c        | 2 +-
 test/zdtm/static/msgque.c              | 2 +-
 test/zdtm/static/s390x_runtime_instr.c | 2 +-
 test/zdtm/static/shm.c                 | 4 ++--
 test/zdtm/static/socket-tcp-close0.c   | 2 +-
 test/zdtm/static/sockets02.c           | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/zdtm/static/file_locks05.c b/test/zdtm/static/file_locks05.c
index 33877f842..e9e56acfe 100644
--- a/test/zdtm/static/file_locks05.c
+++ b/test/zdtm/static/file_locks05.c
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	if (flock(fd2, LOCK_SH) == 0)
 		pass();
 	else
-		fail("Flock file locks check failed (%d)", errno);
+		fail("Flock file locks check failed");
 
 	close(fd);
 	close(fd2);
diff --git a/test/zdtm/static/msgque.c b/test/zdtm/static/msgque.c
index 55f81792f..f52307221 100644
--- a/test/zdtm/static/msgque.c
+++ b/test/zdtm/static/msgque.c
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 
 out:
 	if (msgctl(msg, IPC_RMID, 0)) {
-		fail("Failed to destroy message queue: %d", -errno);
+		fail("Failed to destroy message queue");
 		return -errno;
 	}
 	return chret;
diff --git a/test/zdtm/static/s390x_runtime_instr.c b/test/zdtm/static/s390x_runtime_instr.c
index e0a5742d9..ff692d7c6 100644
--- a/test/zdtm/static/s390x_runtime_instr.c
+++ b/test/zdtm/static/s390x_runtime_instr.c
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
 			free(buf);
 			return 0;
 		}
-		fail("Fail with error %d", errno);
+		fail("syscall(s390_runtime_instr) failed");
 		free(buf);
 		return -1;
 	}
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index 7e7d9570b..320211bfc 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
 
 	ret = shmctl(shm, IPC_RMID, NULL);
 	if (ret < 0) {
-		fail("Failed (1) to destroy segment: %d", -errno);
+		fail("Failed (1) to destroy segment");
 		fail_count++;
 		goto out_shm;
 	}
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
 out_shm:
 	ret = shmctl(shm, IPC_RMID, NULL);
 	if (ret < 0) {
-		fail("Failed (2) to destroy segment: %d", -errno);
+		fail("Failed (2) to destroy segment");
 		fail_count++;
 	}
 	if (fail_count == 0)
diff --git a/test/zdtm/static/socket-tcp-close0.c b/test/zdtm/static/socket-tcp-close0.c
index a411b6e0d..367e40473 100644
--- a/test/zdtm/static/socket-tcp-close0.c
+++ b/test/zdtm/static/socket-tcp-close0.c
@@ -56,7 +56,7 @@ static int check_socket_closed(int sk)
 	}
 
 	if (errno != EPIPE) {
-		fail("errno is %d (%s) (expected EPIPE)", errno, strerror(errno));
+		fail("wrong errno (expected EPIPE)");
 		return 1;
 	}
 	return 0;
diff --git a/test/zdtm/static/sockets02.c b/test/zdtm/static/sockets02.c
index 5819e76af..a227c88ae 100644
--- a/test/zdtm/static/sockets02.c
+++ b/test/zdtm/static/sockets02.c
@@ -49,14 +49,14 @@ int main(int argc, char *argv[])
 	errno = 0;
 	ret = read(ssk_pair[0], &aux, sizeof(aux));
 	if (ret != 0 || errno != 0) {
-		fail("Opened end in wrong state (%d/%d)", ret, errno);
+		fail("Opened end in wrong state (ret=%d)", ret);
 		return 0;
 	}
 
 	errno = 0;
 	ret = read(ssk_pair[1], &aux, sizeof(aux));
 	if (ret != -1 || errno != EBADF) {
-		fail("Closed end in wrong state (%d/%d)", ret, errno);
+		fail("Closed end in wrong state (ret=%d)", ret);
 		return 0;
 	}
 

From 5f3631916a7b994fe16fd4e1402f2c4ceb3bfc0d Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 14:56:54 -0700
Subject: [PATCH 0588/1854] Makefile: amend lint with pr_perror/fail checks

In many cases developers forget that pr_perror and fail macros
are a bit special, in particular:

1. they already show errno;
2. they already append \n to the message.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index b627c2099..6de731bd6 100644
--- a/Makefile
+++ b/Makefile
@@ -404,6 +404,13 @@ lint:
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 	shellcheck test/others/crit/*.sh
+	# Do not append \n to pr_perror or fail
+	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
+	# Do not use %m with pr_perror or fail
+	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*%m'
+	# Do not use errno with pr_perror or fail
+	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>\(".*".*errno'
+.PHONY: lint
 
 codecov: SHELL := $(shell which bash)
 codecov:

From 2166d47482f55c0b9b3d3f31f748d7b4aefe7efd Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 15:30:47 -0700
Subject: [PATCH 0589/1854] scripts: fix shellcheck warnings

On my system (shellcheck v0.7.1) make lint shows a few warnings about
needing to quote variables.

Fix those.

PS I am not sure why those are not shown by GHA CI, I assume there is
different shellcheck version used. Add shellcheck -- version to the
appropriate Makefile target to avoid confusion.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Makefile                          | 1 +
 scripts/ci/apt-install            | 4 ++--
 scripts/systemd-autofs-restart.sh | 6 +++---
 scripts/tmp-files.sh              | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6de731bd6..1f5aed156 100644
--- a/Makefile
+++ b/Makefile
@@ -401,6 +401,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/inhfd/*.py
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
+	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 	shellcheck test/others/crit/*.sh
diff --git a/scripts/ci/apt-install b/scripts/ci/apt-install
index 0b5a6fe3f..5a790901a 100755
--- a/scripts/ci/apt-install
+++ b/scripts/ci/apt-install
@@ -12,7 +12,7 @@ max_apt_retries=5
 # hashsum mismatches, DNS errors and similar things
 while true; do
 	(( install_retry_counter+=1 ))
-	if [ ${install_retry_counter} -gt ${max_apt_retries} ]; then
+	if [ "${install_retry_counter}" -gt "${max_apt_retries}" ]; then
 		exit 1
 	fi
 	# shellcheck disable=SC2068
@@ -20,5 +20,5 @@ while true; do
 
 	# In case it is a network error let's wait a bit.
 	echo "Retrying attempt ${install_retry_counter}"
-	sleep ${install_retry_counter}
+	sleep "${install_retry_counter}"
 done
diff --git a/scripts/systemd-autofs-restart.sh b/scripts/systemd-autofs-restart.sh
index 65481b551..4d2be1c10 100755
--- a/scripts/systemd-autofs-restart.sh
+++ b/scripts/systemd-autofs-restart.sh
@@ -45,8 +45,8 @@ bindmount=""
 
 function remove_bindmount {
 	if [ -n "$bindmount" ]; then
-		$JOIN_CT umount $bindmount
-		$JOIN_CT rm -rf $bindmount
+		$JOIN_CT umount "$bindmount"
+		$JOIN_CT rm -rf "$bindmount"
 		bindmount=""
 	fi
 }
@@ -107,7 +107,7 @@ function save_mountpoint {
 	# Nothing to do, if no file system is on top of autofs
 	[ "$top_mount_fs_type" = "autofs" ] && return
 
-	bindmount=$($JOIN_CT mktemp -d)
+	bindmount="$($JOIN_CT mktemp -d)"
 	if [ -z "$bindmount" ]; then
 		echo "Failed to create temporary directory"
 		return 1
diff --git a/scripts/tmp-files.sh b/scripts/tmp-files.sh
index 33be4dafa..78edd9a9e 100755
--- a/scripts/tmp-files.sh
+++ b/scripts/tmp-files.sh
@@ -26,7 +26,7 @@ IMGFILE=$CRTOOLS_IMAGE_DIR"/tmpfiles.tar.gz"
 MY_NAME=$(basename "$0")
 
 case "$CRTOOLS_SCRIPT_ACTION" in
-	$POSTDUMP )
+	"$POSTDUMP")
 		if [ "$#" -lt 1 ]; then
 			echo "$MY_NAME: ERROR! No files are given."
 			exit 1
@@ -34,7 +34,7 @@ case "$CRTOOLS_SCRIPT_ACTION" in
 		tar "$DUMPARGS" "$IMGFILE" -- "$@"
 		exit $?
 		;;
-	$PRERESTORE )
+	"$PRERESTORE")
 		if [ "$#" -ne 0 ]; then
 			echo "$MY_NAME: ERROR! Not expected script args."
 			exit 1

From e326889c062ba87651dc3f895af54e57db0cfeda Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 16:42:25 -0700
Subject: [PATCH 0590/1854] criu/mount.c: fix \n in pr_debug

Funny but it used incorrect slash.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/mount.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index d20054aef..50a014426 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3832,7 +3832,7 @@ static int ns_remount_writable(void *arg)
 
 	if (do_restore_task_mnt_ns(ns))
 		return 1;
-	pr_debug("Switched to mntns %u:%u/n", ns->id, ns->kid);
+	pr_debug("Switched to mntns %u:%u\n", ns->id, ns->kid);
 
 	if (mount(NULL, mi->ns_mountpoint, NULL, MS_REMOUNT | MS_BIND |
 		  (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)), NULL) == -1) {
@@ -3903,7 +3903,7 @@ static int __remount_readonly_mounts(struct ns_id *ns)
 			if (do_restore_task_mnt_ns(ns))
 				return -1;
 			mntns_set = true;
-			pr_debug("Switched to mntns %u:%u/n", ns->id, ns->kid);
+			pr_debug("Switched to mntns %u:%u\n", ns->id, ns->kid);
 		}
 
 		pr_info("Remount %d:%s back to readonly\n", mi->mnt_id, mi->mountpoint);

From dca0eb5b4a7c28d51c8f20527ecf54049ff443d1 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 17:35:14 -0700
Subject: [PATCH 0591/1854] test/others/bers: use pr_perror

When errno is set, it makes sense to use pr_perror.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/others/bers/bers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/others/bers/bers.c b/test/others/bers/bers.c
index 90b70c349..bb0c9dbcb 100644
--- a/test/others/bers/bers.c
+++ b/test/others/bers/bers.c
@@ -366,7 +366,7 @@ int main(int argc, char *argv[])
 
 		pid = fork();
 		if (pid < 0) {
-			printf("Can't create fork: %m\n");
+			pr_perror("Can't fork");
 			exit(1);
 		} else if (pid == 0) {
 			work_on_fork(shared);

From 10c619adb94208b801cc549ec3d3ede2efb4a2dc Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 17:36:05 -0700
Subject: [PATCH 0592/1854] test/zdtm: pr_err / pr_perror fixes

1. Use pr_perror where errno needs to be shown.

2. Use pr_err in cases where errno is not set
   by the previous failed call.

3. Make sure pr_err's first argument do not have \n.

4. While at it, fix some error messages.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/lib/tcp.c                      |  4 +--
 test/zdtm/lib/zdtmtst.h                  |  2 +-
 test/zdtm/static/autofs.c                |  6 ++--
 test/zdtm/static/cgroup_stray.c          |  4 +--
 test/zdtm/static/cgroupns.c              |  6 ++--
 test/zdtm/static/criu-rtc.c              |  2 +-
 test/zdtm/static/epoll.c                 |  4 +--
 test/zdtm/static/file_locks01.c          |  4 +--
 test/zdtm/static/inotify02.c             | 10 +++----
 test/zdtm/static/maps01.c                |  8 ++---
 test/zdtm/static/netns_sub_veth.c        |  2 +-
 test/zdtm/static/opath_file.c            |  2 +-
 test/zdtm/static/socket-tcp-close-wait.c | 16 +++++-----
 test/zdtm/static/socket-tcp-close0.c     |  2 +-
 test/zdtm/static/socket-tcp-closed.c     |  4 +--
 test/zdtm/static/socket-tcp-closing.c    | 38 ++++++++++++------------
 test/zdtm/static/socket-tcp-fin-wait1.c  | 38 ++++++++++++------------
 test/zdtm/static/socket-tcp-unconn.c     |  2 +-
 test/zdtm/static/socket_udp_shutdown.c   | 20 ++++++-------
 test/zdtm/static/tempfs_overmounted.c    |  2 +-
 test/zdtm/static/tempfs_overmounted01.c  |  4 +--
 test/zdtm/static/vdso-proxy.c            |  8 ++---
 test/zdtm/static/vfork00.c               |  2 +-
 test/zdtm/static/zombie_leader.c         |  2 +-
 test/zdtm/transition/maps008.c           |  4 +--
 25 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/test/zdtm/lib/tcp.c b/test/zdtm/lib/tcp.c
index 03862b24c..623994bf8 100644
--- a/test/zdtm/lib/tcp.c
+++ b/test/zdtm/lib/tcp.c
@@ -43,13 +43,13 @@ int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts)
 
 	if (opts->reuseport &&
 	    setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(int)) == -1) {
-		pr_perror("");
+		pr_perror("setsockopt(SO_REUSEPORT) failed");
 		return -1;
 	}
 
 	if (opts->reuseaddr &&
 	    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1 ) {
-		pr_perror("setsockopt() error");
+		pr_perror("setsockopt(SO_REUSEATTR) failed");
 		return -1;
 	}
 
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index b5714ce7b..ec6c110a2 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -114,7 +114,7 @@ extern int write_pidfile(int pid);
 #define __stringify(x)          __stringify_1(x)
 
 /*
- * Macro to define stack alignment. 
+ * Macro to define stack alignment.
  * aarch64 requires stack to be aligned to 16 bytes.
  */
 #define __stack_aligned__	__attribute__((aligned(16)))
diff --git a/test/zdtm/static/autofs.c b/test/zdtm/static/autofs.c
index b6d0170fe..6d261677b 100644
--- a/test/zdtm/static/autofs.c
+++ b/test/zdtm/static/autofs.c
@@ -437,11 +437,11 @@ static int automountd_serve(const char *mountpoint, struct autofs_params *p,
 			res = autofs_mount_direct(mountpoint, v5_packet);
 			break;
 		case autofs_ptype_expire_indirect:
-			pr_err("%d: expire request for indirect mount %s?",
+			pr_err("%d: expire request for indirect mount %s?\n",
 					getpid(), v5_packet->name);
 			return -EINVAL;
 		case autofs_ptype_expire_direct:
-			pr_err("%d: expire request for direct mount?",
+			pr_err("%d: expire request for direct mount?\n",
 					getpid());
 			return -EINVAL;
 		default:
@@ -507,7 +507,7 @@ static int automountd(struct autofs_params *p, int control_fd)
 
 	autofs_path = xsprintf("%s/%s", dirname, p->mountpoint);
 	if (!autofs_path) {
-		pr_err("failed to allocate autofs path");
+		pr_err("failed to allocate autofs path\n");
 		goto err;
 	}
 
diff --git a/test/zdtm/static/cgroup_stray.c b/test/zdtm/static/cgroup_stray.c
index dc68ee6e5..a068378ec 100644
--- a/test/zdtm/static/cgroup_stray.c
+++ b/test/zdtm/static/cgroup_stray.c
@@ -97,7 +97,7 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 		/* skip hierarchy no. */
 		pos = strstr(buf, ":");
 		if (!pos) {
-			pr_err("invalid /proc/pid/cgroups file");
+			pr_err("invalid /proc/pid/cgroups file\n");
 			goto out;
 		}
 		pos++;
@@ -105,7 +105,7 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 
 		pos = strstr(pos, ":");
 		if (!pos) {
-			pr_err("invalid /proc/pid/cgroups file");
+			pr_err("invalid /proc/pid/cgroups file\n");
 			goto out;
 		}
 
diff --git a/test/zdtm/static/cgroupns.c b/test/zdtm/static/cgroupns.c
index 7459af138..68b86b44b 100644
--- a/test/zdtm/static/cgroupns.c
+++ b/test/zdtm/static/cgroupns.c
@@ -95,7 +95,7 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 		/* skip hierarchy no. */
 		pos = strstr(buf, ":");
 		if (!pos) {
-			pr_err("invalid /proc/pid/cgroups file");
+			pr_err("invalid /proc/pid/cgroups file\n");
 			goto out;
 		}
 		pos++;
@@ -103,7 +103,7 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 
 		pos = strstr(pos, ":");
 		if (!pos) {
-			pr_err("invalid /proc/pid/cgroups file");
+			pr_err("invalid /proc/pid/cgroups file\n");
 			goto out;
 		}
 
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
 	}
 
 	if (pid != waitpid(pid, &status, 0)) {
-		pr_err("wrong pid");
+		pr_perror("wrong pid");
 		goto out;
 	}
 
diff --git a/test/zdtm/static/criu-rtc.c b/test/zdtm/static/criu-rtc.c
index 8588f9f52..8ffb0cd08 100644
--- a/test/zdtm/static/criu-rtc.c
+++ b/test/zdtm/static/criu-rtc.c
@@ -96,7 +96,7 @@ int cr_plugin_restore_file(int id)
 
 	e = criu_rtc__unpack(NULL, len, buf);
 	if (e == NULL) {
-		pr_err("Unable to parse the RTC message %#x", id);
+		pr_err("Unable to parse the RTC message %#x\n", id);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/epoll.c b/test/zdtm/static/epoll.c
index ed2609a07..5acb54094 100644
--- a/test/zdtm/static/epoll.c
+++ b/test/zdtm/static/epoll.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
 	for (i = 0; i < ARRAY_SIZE(pipes); i++) {
 		if (pipe(pipes[i].pipefd)) {
-			pr_err("Can't create pipe %d\n", i);
+			pr_perror("Can't create pipe %d", i);
 			exit(1);
 		}
 
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 
 			nfd = dup2(pipes[i].pipefd[0], i + 700);
 			if (nfd < 0) {
-				pr_err("dup2");
+				pr_perror("dup2");
 				exit(1);
 			}
 			close(pipes[i].pipefd[0]);
diff --git a/test/zdtm/static/file_locks01.c b/test/zdtm/static/file_locks01.c
index c08c40b51..a57a5b61b 100644
--- a/test/zdtm/static/file_locks01.c
+++ b/test/zdtm/static/file_locks01.c
@@ -96,7 +96,7 @@ static int check_file_lock(int fd, char *expected_type,
 	snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd);
 	fp_locks = fopen(path, "r");
 	if (!fp_locks) {
-		pr_err("Can't open %s\n", path);
+		pr_perror("Can't open %s", path);
 		return -1;
 	}
 
@@ -113,7 +113,7 @@ static int check_file_lock(int fd, char *expected_type,
 			     fl_flag, fl_type, fl_option, &fl_owner,
 			     &maj, &min, &i_no);
 		if (num < 7) {
-			pr_perror("Invalid lock info.");
+			pr_err("Invalid lock info\n");
 			break;
 		}
 
diff --git a/test/zdtm/static/inotify02.c b/test/zdtm/static/inotify02.c
index b1b75d2e1..bedfefac9 100644
--- a/test/zdtm/static/inotify02.c
+++ b/test/zdtm/static/inotify02.c
@@ -34,7 +34,7 @@ static int num_of_handles(int fd)
 	snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd);
 	f = fopen(path, "r");
 	if (!f) {
-		pr_err("Can't open %s", path);
+		pr_perror("Can't open %s", path);
 		return -1;
 	}
 
@@ -59,13 +59,13 @@ int main (int argc, char *argv[])
 	test_init(argc, argv);
 
 	if (mkdir(dirname, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
-		pr_err("Can't create directory %s", dirname);
+		pr_perror("Can't create directory %s", dirname);
 		exit(1);
 	}
 
 	fd = inotify_init1(IN_NONBLOCK);
 	if (fd < 0) {
-		pr_err("inotify_init failed");
+		pr_perror("inotify_init failed");
 		exit(1);
 	}
 
@@ -73,12 +73,12 @@ int main (int argc, char *argv[])
 		snprintf(temp[i], sizeof(temp[0]), "d.%03d", i);
 		snprintf(path, sizeof(path), "%s/%s", dirname, temp[i]);
 		if (mkdir(path, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
-			pr_err("Can't create %s", path);
+			pr_perror("Can't create %s", path);
 			exit(1);
 		}
 
 		if (inotify_add_watch(fd, path, mask) < 0) {
-			pr_err("inotify_add_watch failed on %s", path);
+			pr_perror("inotify_add_watch failed on %s", path);
 			exit(1);
 		}
 	}
diff --git a/test/zdtm/static/maps01.c b/test/zdtm/static/maps01.c
index 119d7a6a4..2bb465a25 100644
--- a/test/zdtm/static/maps01.c
+++ b/test/zdtm/static/maps01.c
@@ -36,7 +36,7 @@ int main(int argc, char ** argv)
 				MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 
 	if (m == MAP_FAILED) {
-		pr_err("Failed to mmap %lu Mb shared anonymous R/W memory\n",
+		pr_perror("Failed to mmap %lu Mb shared anonymous R/W memory",
 				MEM_SIZE >> 20);
 		goto err;
 	}
@@ -45,14 +45,14 @@ int main(int argc, char ** argv)
 				MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 
 	if (p == MAP_FAILED) {
-		pr_err("Failed to mmap %ld Mb shared anonymous R/W memory\n",
+		pr_perror("Failed to mmap %ld Mb shared anonymous R/W memory",
 				MEM_SIZE >> 20);
 		goto err;
 	}
 
 	p2 = mmap(NULL, MEM_OFFSET, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (p2 == MAP_FAILED) {
-		pr_err("Failed to mmap %lu Mb anonymous memory\n",
+		pr_perror("Failed to mmap %lu Mb anonymous memory",
 				MEM_OFFSET >> 20);
 		goto err;
 	}
@@ -67,7 +67,7 @@ int main(int argc, char ** argv)
 		p3 = mmap(NULL, MEM_OFFSET3, PROT_READ | PROT_WRITE,
 					MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 		if (p3 == MAP_FAILED) {
-			pr_err("Failed to mmap %lu Mb anonymous R/W memory\n",
+			pr_perror("Failed to mmap %lu Mb anonymous R/W memory",
 					MEM_OFFSET3 >> 20);
 			goto err;
 		}
diff --git a/test/zdtm/static/netns_sub_veth.c b/test/zdtm/static/netns_sub_veth.c
index eedbb15c3..c0a71b337 100644
--- a/test/zdtm/static/netns_sub_veth.c
+++ b/test/zdtm/static/netns_sub_veth.c
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 	ret = nl_connect(sk, NETLINK_ROUTE);
 	if (ret < 0) {
 		nl_socket_free(sk);
-		pr_err("Unable to connect socket: %s", nl_geterror(ret));
+		pr_err("Unable to connect socket: %s\n", nl_geterror(ret));
 		return -1;
 	}
 
diff --git a/test/zdtm/static/opath_file.c b/test/zdtm/static/opath_file.c
index 943f4eddb..40e5987c3 100644
--- a/test/zdtm/static/opath_file.c
+++ b/test/zdtm/static/opath_file.c
@@ -37,7 +37,7 @@ static int parse_self_fdinfo(int fd, struct fdinfo *fi)
 	while (fgets(line, sizeof(line), file)) {
 		if (fdinfo_field(line, "flags")) {
 			if (sscanf(line, "%*s %llo", &val) != 1) {
-				pr_err("failed to read flags: %s", line);
+				pr_err("failed to read flags: %s\n", line);
 				goto fail;
 			}
 			pr_debug("Open flags = %llu\n", val);
diff --git a/test/zdtm/static/socket-tcp-close-wait.c b/test/zdtm/static/socket-tcp-close-wait.c
index 3608e6b37..152dcf31f 100644
--- a/test/zdtm/static/socket-tcp-close-wait.c
+++ b/test/zdtm/static/socket-tcp-close-wait.c
@@ -37,11 +37,11 @@ int fill_sock_buf(int fd)
 
 	flags = fcntl(fd, F_GETFL, 0);
 	if (flags == -1) {
-		pr_err("Can't get flags");
+		pr_perror("Can't get flags");
 		return -1;
 	}
 	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
-		pr_err("Can't set flags");
+		pr_perror("Can't set flags");
 		return -1;
 	}
 
@@ -52,14 +52,14 @@ int fill_sock_buf(int fd)
 		if (ret == -1) {
 			if (errno == EAGAIN)
 				break;
-			pr_err("write");
+			pr_perror("write");
 			return -1;
 		}
 		size += ret;
 	}
 
 	if (fcntl(fd, F_SETFL, flags) == -1) {
-		pr_err("Can't set flags");
+		pr_perror("Can't set flags");
 		return -1;
 	}
 
@@ -77,7 +77,7 @@ static int clean_sk_buf(int fd)
 	while (1) {
 		ret = read(fd, buf, sizeof(buf));
 		if (ret == -1) {
-			pr_err("read");
+			pr_perror("read");
 			return -11;
 		}
 
@@ -192,7 +192,7 @@ int main(int argc, char **argv)
 		test_init(argc, argv);
 
 	if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
-		pr_err("initializing server failed");
+		pr_err("initializing server failed\n");
 		return 1;
 	}
 
@@ -208,13 +208,13 @@ int main(int argc, char **argv)
 	 */
 	fd = tcp_accept_server(fd_s);
 	if (fd < 0) {
-		pr_err("can't accept client connection");
+		pr_err("can't accept client connection\n");
 		return 1;
 	}
 
 	ctl_fd = tcp_accept_server(fd_s);
 	if (ctl_fd < 0) {
-		pr_err("can't accept client connection");
+		pr_err("can't accept client connection\n");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-close0.c b/test/zdtm/static/socket-tcp-close0.c
index 367e40473..270965cbd 100644
--- a/test/zdtm/static/socket-tcp-close0.c
+++ b/test/zdtm/static/socket-tcp-close0.c
@@ -28,7 +28,7 @@ static int check_socket_closed(int sk)
 		pr_perror("Can't get socket state");
 		return -1;
 	} else if (info.tcpi_state != TCP_CLOSE) {
-		pr_err("Invalid socket state (%i)", (int)info.tcpi_state);
+		pr_err("Invalid socket state (%i)\n", (int)info.tcpi_state);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-closed.c b/test/zdtm/static/socket-tcp-closed.c
index a51f9b96d..e8fc25c56 100644
--- a/test/zdtm/static/socket-tcp-closed.c
+++ b/test/zdtm/static/socket-tcp-closed.c
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (memcmp(&addr, &dst_addr, aux)) {
-		pr_err("A destination address mismatch");
+		pr_err("A destination address mismatch\n");
 		return 1;
 	}
 
@@ -137,7 +137,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (memcmp(&addr, &src_addr, aux)) {
-		pr_err("A source address mismatch");
+		pr_err("A source address mismatch\n");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-closing.c b/test/zdtm/static/socket-tcp-closing.c
index 83b21e8ad..84ff6be9d 100644
--- a/test/zdtm/static/socket-tcp-closing.c
+++ b/test/zdtm/static/socket-tcp-closing.c
@@ -37,11 +37,11 @@ int fill_sock_buf(int fd)
 
 	flags = fcntl(fd, F_GETFL, 0);
 	if (flags == -1) {
-		pr_err("Can't get flags");
+		pr_perror("Can't get flags");
 		return -1;
 	}
 	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
-		pr_err("Can't set flags");
+		pr_perror("Can't set flags");
 		return -1;
 	}
 
@@ -52,14 +52,14 @@ int fill_sock_buf(int fd)
 		if (ret == -1) {
 			if (errno == EAGAIN)
 				break;
-			pr_err("write");
+			pr_perror("write");
 			return -1;
 		}
 		size += ret;
 	}
 
 	if (fcntl(fd, F_SETFL, flags) == -1) {
-		pr_err("Can't set flags");
+		pr_perror("Can't set flags");
 		return -1;
 	}
 
@@ -77,7 +77,7 @@ static int clean_sk_buf(int fd)
 	while (1) {
 		ret = read(fd, buf, sizeof(buf));
 		if (ret == -1) {
-			pr_err("read");
+			pr_perror("read");
 			return -11;
 		}
 
@@ -104,13 +104,13 @@ int main(int argc, char **argv)
 		test_init(argc, argv);
 
 	if (pipe(pfd)) {
-		pr_err("pipe() failed");
+		pr_perror("pipe() failed");
 		return 1;
 	}
 
 	extpid = fork();
 	if (extpid < 0) {
-		pr_err("fork() failed");
+		pr_perror("fork() failed");
 		return 1;
 	} else if (extpid == 0) {
 		int size = 0;
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
 
 		close(pfd[1]);
 		if (read(pfd[0], &port, sizeof(port)) != sizeof(port)) {
-			pr_err("Can't read port\n");
+			pr_perror("Can't read port");
 			return 1;
 		}
 
@@ -138,17 +138,17 @@ int main(int argc, char **argv)
 			return 1;
 
 		if (shutdown(fd, SHUT_WR) == -1) {
-			pr_err("shutdown");
+			pr_perror("shutdown");
 			return 1;
 		}
 
 		if (write(ctl_fd, &size, sizeof(size)) != sizeof(size)) {
-			pr_err("write");
+			pr_perror("write");
 			return 1;
 		}
 
 		if (read(ctl_fd, &c, 1) != 0) {
-			pr_err("read");
+			pr_perror("read");
 			return 1;
 		}
 
@@ -166,13 +166,13 @@ int main(int argc, char **argv)
 		test_init(argc, argv);
 
 	if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
-		pr_err("initializing server failed");
+		pr_err("initializing server failed\n");
 		return 1;
 	}
 
 	close(pfd[0]);
 	if (write(pfd[1], &port, sizeof(port)) != sizeof(port)) {
-		pr_err("Can't send port");
+		pr_perror("Can't send port");
 		return 1;
 	}
 	close(pfd[1]);
@@ -182,13 +182,13 @@ int main(int argc, char **argv)
 	 */
 	fd = tcp_accept_server(fd_s);
 	if (fd < 0) {
-		pr_err("can't accept client connection %m");
+		pr_err("can't accept client connection\n");
 		return 1;
 	}
 
 	ctl_fd = tcp_accept_server(fd_s);
 	if (ctl_fd < 0) {
-		pr_err("can't accept client connection %m");
+		pr_err("can't accept client connection\n");
 		return 1;
 	}
 
@@ -197,12 +197,12 @@ int main(int argc, char **argv)
 		return 1;
 
 	if (shutdown(fd, SHUT_WR) == -1) {
-		pr_err("shutdown");
+		pr_perror("shutdown");
 		return 1;
 	}
 
 	if (read(ctl_fd, &ret, sizeof(ret)) != sizeof(ret)) {
-		pr_err("read");
+		pr_perror("read");
 		return 1;
 	}
 
@@ -224,12 +224,12 @@ int main(int argc, char **argv)
 	}
 
 	if (shutdown(ctl_fd, SHUT_WR) == -1) {
-		pr_err("shutdown");
+		pr_perror("shutdown");
 		return 1;
 	}
 
 	if (read(ctl_fd, &ret, sizeof(ret)) != sizeof(ret)) {
-		pr_err("read");
+		pr_perror("read");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-fin-wait1.c b/test/zdtm/static/socket-tcp-fin-wait1.c
index 1264a5959..4bc7b3238 100644
--- a/test/zdtm/static/socket-tcp-fin-wait1.c
+++ b/test/zdtm/static/socket-tcp-fin-wait1.c
@@ -38,11 +38,11 @@ int fill_sock_buf(int fd)
 
 	flags = fcntl(fd, F_GETFL, 0);
 	if (flags == -1) {
-		pr_err("Can't get flags");
+		pr_perror("Can't get flags");
 		return -1;
 	}
 	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
-		pr_err("Can't set flags");
+		pr_perror("Can't set flags");
 		return -1;
 	}
 
@@ -53,14 +53,14 @@ int fill_sock_buf(int fd)
 		if (ret == -1) {
 			if (errno == EAGAIN)
 				break;
-			pr_err("write");
+			pr_perror("write");
 			return -1;
 		}
 		size += ret;
 	}
 
 	if (fcntl(fd, F_SETFL, flags) == -1) {
-		pr_err("Can't set flags");
+		pr_perror("Can't set flags");
 		return -1;
 	}
 
@@ -78,7 +78,7 @@ static int clean_sk_buf(int fd)
 	while (1) {
 		ret = read(fd, buf, sizeof(buf));
 		if (ret == -1) {
-			pr_err("read");
+			pr_perror("read");
 			return -11;
 		}
 
@@ -106,13 +106,13 @@ int main(int argc, char **argv)
 		test_init(argc, argv);
 
 	if (pipe(pfd)) {
-		pr_err("pipe() failed");
+		pr_perror("pipe() failed");
 		return 1;
 	}
 
 	extpid = fork();
 	if (extpid < 0) {
-		pr_err("fork() failed");
+		pr_perror("fork() failed");
 		return 1;
 	} else if (extpid == 0) {
 		int size = 0;
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
 
 		close(pfd[1]);
 		if (read(pfd[0], &port, sizeof(port)) != sizeof(port)) {
-			pr_err("Can't read port\n");
+			pr_perror("Can't read port");
 			return 1;
 		}
 
@@ -137,17 +137,17 @@ int main(int argc, char **argv)
 			return 1;
 
 		if (read(ctl_fd, &c, 1) != 0) {
-			pr_err("read");
+			pr_perror("read");
 			return 1;
 		}
 
 		if (write(fd, &TEST_MSG[2], sizeof(TEST_MSG) - 2) != sizeof(TEST_MSG) - 2) {
-			pr_err("write");
+			pr_perror("write");
 			return 1;
 		}
 
 		if (shutdown(fd, SHUT_WR) == -1) {
-			pr_err("shutdown");
+			pr_perror("shutdown");
 			return 1;
 		}
 
@@ -165,13 +165,13 @@ int main(int argc, char **argv)
 		test_init(argc, argv);
 
 	if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
-		pr_err("initializing server failed");
+		pr_err("initializing server failed\n");
 		return 1;
 	}
 
 	close(pfd[0]);
 	if (write(pfd[1], &port, sizeof(port)) != sizeof(port)) {
-		pr_err("Can't send port");
+		pr_perror("Can't send port");
 		return 1;
 	}
 	close(pfd[1]);
@@ -181,13 +181,13 @@ int main(int argc, char **argv)
 	 */
 	fd = tcp_accept_server(fd_s);
 	if (fd < 0) {
-		pr_err("can't accept client connection %m");
+		pr_err("can't accept client connection\n");
 		return 1;
 	}
 
 	ctl_fd = tcp_accept_server(fd_s);
 	if (ctl_fd < 0) {
-		pr_err("can't accept client connection %m");
+		pr_err("can't accept client connection\n");
 		return 1;
 	}
 
@@ -198,7 +198,7 @@ int main(int argc, char **argv)
 #endif
 
 	if (shutdown(fd, SHUT_WR) == -1) {
-		pr_err("shutdown");
+		pr_perror("shutdown");
 		return 1;
 	}
 
@@ -207,18 +207,18 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (shutdown(ctl_fd, SHUT_WR) == -1) {
-		pr_err("shutdown");
+		pr_perror("shutdown");
 		return 1;
 	}
 
 	if (recv(fd, buf, sizeof(buf), MSG_WAITALL) != sizeof(TEST_MSG) ||
 	    strncmp(buf, TEST_MSG, sizeof(TEST_MSG))) {
-		pr_err("read");
+		pr_perror("recv: expected %s, got %s", TEST_MSG, buf);
 		return 1;
 	}
 
 	if (read(ctl_fd, &ret, sizeof(ret)) != sizeof(ret)) {
-		pr_err("read");
+		pr_perror("read");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-tcp-unconn.c b/test/zdtm/static/socket-tcp-unconn.c
index e943b7c7a..1b3e1a660 100644
--- a/test/zdtm/static/socket-tcp-unconn.c
+++ b/test/zdtm/static/socket-tcp-unconn.c
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	if (memcmp(&addr, &src_addr, aux)) {
-		pr_err("A source address mismatch");
+		pr_err("A source address mismatch\n");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket_udp_shutdown.c b/test/zdtm/static/socket_udp_shutdown.c
index ae148c5fa..5d65348ea 100644
--- a/test/zdtm/static/socket_udp_shutdown.c
+++ b/test/zdtm/static/socket_udp_shutdown.c
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 	sk1 = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	sk2 = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	if (sk1 < 0 || sk2 < 0) {
-		pr_err("Can't create socket");
+		pr_perror("Can't create socket");
 		exit(1);
 		return 1;
 	}
@@ -49,19 +49,19 @@ int main(int argc, char **argv)
 
 	if (bind(sk1, (struct sockaddr *)&addr1, len) < 0 ||
 	    bind(sk2, (struct sockaddr *)&addr2, len) < 0) {
-		pr_err("Can't bind socket");
+		pr_perror("Can't bind socket");
 		return 1;
 	}
 
 	if (connect(sk1, (struct sockaddr *)&addr2, len) ||
 	    connect(sk2, (struct sockaddr *)&addr1, len)) {
-		pr_err("Can't connect");
+		pr_perror("Can't connect");
 		return 1;
 	}
 
 	if (shutdown(sk1, SHUT_WR) ||
 	    shutdown(sk2, SHUT_RD)) {
-		pr_err("Can't shutdown\n");
+		pr_perror("Can't shutdown");
 		return 1;
 	}
 
@@ -75,17 +75,17 @@ int main(int argc, char **argv)
 	ret = recvfrom(sk1, buf, sizeof(buf), 0,
 		       (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
-		pr_err("Can't receive data");
+		pr_perror("Can't receive data");
 		return 1;
 	}
 
 	if (len != sizeof(struct sockaddr_in) || memcmp(&addr2, &addr, len)) {
-		pr_err("Data received from wrong peer");
+		pr_err("Data received from wrong peer\n");
 		return 1;
 	}
 
 	if (ret != sizeof(MSG1) || memcmp(buf, MSG1, ret)) {
-		pr_err("Wrong message received");
+		pr_err("Wrong message received\n");
 		return 1;
 	}
 
@@ -102,17 +102,17 @@ int main(int argc, char **argv)
 	ret = recvfrom(sk1, buf, sizeof(buf), 0,
 		       (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
-		pr_err("Can't receive data");
+		pr_perror("Can't receive data");
 		return 1;
 	}
 
 	if (len != sizeof(struct sockaddr_in) || memcmp(&addr2, &addr, len)) {
-		pr_err("Data received from wrong peer");
+		pr_err("Data received from wrong peer\n");
 		return 1;
 	}
 
 	if (ret != sizeof(MSG1) || memcmp(buf, MSG1, ret)) {
-		pr_err("Wrong message received");
+		pr_err("Wrong message received\n");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/tempfs_overmounted.c b/test/zdtm/static/tempfs_overmounted.c
index 29eca00f4..ed329bf99 100644
--- a/test/zdtm/static/tempfs_overmounted.c
+++ b/test/zdtm/static/tempfs_overmounted.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	if (umount("a/b") || umount("a") || umount("a") || umount("a/b/c") || umount("a/b") || umount("a/b")) {
-		pr_err("umount");
+		pr_perror("umount");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/tempfs_overmounted01.c b/test/zdtm/static/tempfs_overmounted01.c
index e868b184c..5a7250903 100644
--- a/test/zdtm/static/tempfs_overmounted01.c
+++ b/test/zdtm/static/tempfs_overmounted01.c
@@ -34,11 +34,11 @@ int main(int argc, char **argv)
 	}
 	if (pid == 0) {
 		if (mount("zdtm", dirname, "tmpfs", 0, "") < 0) {
-			pr_err("Can't mount tmpfs");
+			pr_perror("Can't mount tmpfs");
 			return 1;
 		}
 		if (chdir(dirname)) {
-			pr_err("chdir");
+			pr_perror("chdir");
 			return 1;
 		}
 
diff --git a/test/zdtm/static/vdso-proxy.c b/test/zdtm/static/vdso-proxy.c
index 2946eb790..f5ff21bd9 100644
--- a/test/zdtm/static/vdso-proxy.c
+++ b/test/zdtm/static/vdso-proxy.c
@@ -42,7 +42,7 @@ static int parse_maps(struct vm_area *vmas)
 
 	maps = fopen("/proc/self/maps", "r");
 	if (maps == NULL) {
-		pr_err("Failed to open maps file: %m\n");
+		pr_perror("Failed to open maps file");
 		return -1;
 	}
 
@@ -74,7 +74,7 @@ static int parse_maps(struct vm_area *vmas)
 	}
 
 	if (fclose(maps)) {
-		pr_err("Failed to close maps file: %m\n");
+		pr_perror("Failed to close maps file");
 		return -1;
 	}
 
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
 	test_msg("[NOTE]\tMappings before:\n");
 	nr_before = parse_maps(vmas_before);
 	if (nr_before < 0) {
-		pr_perror("Failed to parse maps");
+		pr_err("Failed to parse maps\n");
 		return -1;
 	}
 
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
 	test_msg("[NOTE]\tMappings after:\n");
 	nr_after = parse_maps(vmas_after);
 	if (nr_after < 0) {
-		pr_perror("Failed to parse maps");
+		pr_err("Failed to parse maps\n");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/vfork00.c b/test/zdtm/static/vfork00.c
index 0f8ef0666..6abc5c6ac 100644
--- a/test/zdtm/static/vfork00.c
+++ b/test/zdtm/static/vfork00.c
@@ -23,7 +23,7 @@ int main(int argc, char ** argv)
 	 * in the child */
 	pid = fork();
 	if (pid < 0) {
-		pr_err("fork failed: %m");
+		pr_perror("fork failed");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/zombie_leader.c b/test/zdtm/static/zombie_leader.c
index d94b2af04..1928687cd 100644
--- a/test/zdtm/static/zombie_leader.c
+++ b/test/zdtm/static/zombie_leader.c
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 	}
 
 	if (!*cpid) {
-		pr_err("Don't know grand child's pid");
+		pr_err("Don't know grand child's pid\n");
 		goto err;
 	}
 
diff --git a/test/zdtm/transition/maps008.c b/test/zdtm/transition/maps008.c
index 7ed7c10a5..851814c11 100644
--- a/test/zdtm/transition/maps008.c
+++ b/test/zdtm/transition/maps008.c
@@ -109,7 +109,7 @@ static void check_mem_eq(void *addr1, size_t size1, void *addr2, size_t size2)
 static void xmunmap(void *map, size_t size)
 {
 	if (munmap(map, size)) {
-		pr_err("xmunmap");
+		pr_perror("xmunmap");
 		exit(1);
 	}
 }
@@ -507,7 +507,7 @@ int main(int argc, char **argv)
 	};
 
 	if (atexit(kill_pstree_from_root)) {
-		pr_err("Can't setup atexit cleanup func");
+		pr_err("Can't setup atexit cleanup func\n");
 		exit(1);
 	}
 	return proc1_func();

From 7ea20e8f5a533a2458b53b14749d36e1194ac47c Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 17:43:47 -0700
Subject: [PATCH 0593/1854] criu: make sure to use pr_perror to show errno

In cases where we need to print errno, it is better to use pr_perror.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/arch/x86/kerndat.c |  2 +-
 criu/cgroup.c           |  2 +-
 criu/cr-check.c         | 12 ++++++------
 criu/cr-restore.c       |  2 +-
 criu/kerndat.c          |  2 +-
 criu/shmem.c            |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/criu/arch/x86/kerndat.c b/criu/arch/x86/kerndat.c
index cb7a2aa05..ac627ac00 100644
--- a/criu/arch/x86/kerndat.c
+++ b/criu/arch/x86/kerndat.c
@@ -110,7 +110,7 @@ static void mmap_bug_test(void)
 	}
 
 	if (munmap(map1, PAGE_SIZE)) {
-		pr_err("Failed to unmap() 32-bit mapping: %m\n");
+		pr_perror("Failed to unmap() 32-bit mapping");
 		exit(1);
 	}
 
diff --git a/criu/cgroup.c b/criu/cgroup.c
index 8576ee2f1..d0761e8e7 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -311,7 +311,7 @@ static int read_cgroup_prop(struct cgroup_prop *property, const char *fullpath)
 
 	ret = read(fd, buf, sizeof(buf) - 1);
 	if (ret == -1) {
-		pr_err("Failed scanning %s\n", fullpath);
+		pr_perror("Failed scanning %s", fullpath);
 		close(fd);
 		return -1;
 	}
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 57b6316c2..2fdc4408a 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -190,7 +190,7 @@ static int check_prctl_cat1(void)
 
 	ret = prctl(PR_GET_TID_ADDRESS, (unsigned long)&tid_addr, 0, 0, 0);
 	if (ret < 0) {
-		pr_msg("prctl: PR_GET_TID_ADDRESS is not supported: %m");
+		pr_perror("prctl: PR_GET_TID_ADDRESS is not supported");
 		return -1;
 	}
 
@@ -206,19 +206,19 @@ static int check_prctl_cat1(void)
 			if (errno == EPERM)
 				pr_msg("prctl: One needs CAP_SYS_RESOURCE capability to perform testing\n");
 			else
-				pr_msg("prctl: PR_SET_MM_BRK is not supported: %m\n");
+				pr_perror("prctl: PR_SET_MM_BRK is not supported");
 			return -1;
 		}
 
 		ret = prctl(PR_SET_MM, PR_SET_MM_EXE_FILE, -1, 0, 0);
 		if (ret < 0 && errno != EBADF) {
-			pr_msg("prctl: PR_SET_MM_EXE_FILE is not supported: %m\n");
+			pr_perror("prctl: PR_SET_MM_EXE_FILE is not supported");
 			return -1;
 		}
 
 		ret = prctl(PR_SET_MM, PR_SET_MM_AUXV, (long)&user_auxv, sizeof(user_auxv), 0);
 		if (ret < 0) {
-			pr_msg("prctl: PR_SET_MM_AUXV is not supported: %m\n");
+			pr_perror("prctl: PR_SET_MM_AUXV is not supported");
 			return -1;
 		}
 	}
@@ -908,7 +908,7 @@ static int check_aio_remap(void)
 	int r;
 
 	if (syscall(SYS_io_setup, 16, &ctx) < 0) {
-		pr_err("No AIO syscall: %m\n");
+		pr_perror("No AIO syscall");
 		return -1;
 	}
 
@@ -930,7 +930,7 @@ static int check_aio_remap(void)
 	ctx = (aio_context_t)naddr;
 	r = syscall(SYS_io_getevents, ctx, 0, 1, NULL, NULL);
 	if (r < 0) {
-		pr_err("AIO remap doesn't work properly: %m\n");
+		pr_perror("AIO remap doesn't work properly");
 		return -1;
 	}
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 6da80f031..53cae3509 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3614,7 +3614,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	/* VMA we need for stacks and sigframes for threads */
 	if (mmap(mem, memzone_size, PROT_READ | PROT_WRITE,
 			MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0) != mem) {
-		pr_err("Can't mmap section for restore code\n");
+		pr_perror("Can't mmap section for restore code");
 		goto err;
 	}
 
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 21fcb620d..2327a8e25 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -417,7 +417,7 @@ static bool kerndat_has_memfd_create(void)
 	else if (ret == -1 && errno == EFAULT)
 		kdat.has_memfd = true;
 	else {
-		pr_err("Unexpected error from memfd_create(NULL, 0): %m\n");
+		pr_perror("Unexpected error from memfd_create(NULL, 0)");
 		return -1;
 	}
 
diff --git a/criu/shmem.c b/criu/shmem.c
index 29383e79a..3de7170b8 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -591,7 +591,7 @@ static int open_shmem(int pid, struct vma_area *vma)
 	 */
 	addr = mmap(NULL, si->size, PROT_WRITE | PROT_READ, flags, f, 0);
 	if (addr == MAP_FAILED) {
-		pr_err("Can't mmap shmid=0x%"PRIx64" size=%ld\n",
+		pr_perror("Can't mmap shmid=0x%"PRIx64" size=%ld",
 				vi->shmid, si->size);
 		goto err;
 	}

From 96b7178babb132e78a5c0f11d925d4b5c5eedc00 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 17:48:08 -0700
Subject: [PATCH 0594/1854] Whitespace at EOL cleanup and check

My editor (vim) auto-removes whitespace at EOL for *.c and *.h files,
and I think it makes sense to have a separate commit for this, rather
than littering other commits with such changes.

To make sure this won't pile up again, add a line to Makefile under
the linter target to check for such things (so CI will fail).

This is all whitespace except an addition to Makefile.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Makefile                                       |  2 ++
 compel/arch/mips/src/lib/cpu.c                 |  6 +++---
 .../src/lib/include/uapi/asm/infect-types.h    | 10 +++++-----
 .../mips/src/lib/include/uapi/asm/sigframe.h   |  4 ++--
 compel/arch/mips/src/lib/infect.c              |  4 ++--
 compel/src/lib/handle-elf.c                    |  2 +-
 criu/arch/mips/crtools.c                       | 10 +++++-----
 criu/arch/mips/include/asm/restorer.h          | 14 +++++++-------
 criu/bpfmap.c                                  |  8 ++++----
 criu/files-reg.c                               |  4 ++--
 criu/include/bpfmap.h                          |  2 +-
 criu/proc_parse.c                              |  4 ++--
 include/common/arch/mips/asm/linkage.h         |  4 ++--
 include/common/compiler.h                      |  2 +-
 soccr/soccr.h                                  |  6 +++---
 test/others/pipes/pipe.c                       |  6 +++---
 test/zdtm/lib/bpfmap_zdtm.c                    |  2 +-
 test/zdtm/static/bpf_array.c                   | 16 ++++++++--------
 test/zdtm/static/bpf_hash.c                    | 18 +++++++++---------
 .../static/child_subreaper_existing_child.c    |  6 +++---
 test/zdtm/static/sockets03.c                   |  2 +-
 21 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/Makefile b/Makefile
index 1f5aed156..4b13a8d42 100644
--- a/Makefile
+++ b/Makefile
@@ -411,6 +411,8 @@ lint:
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*%m'
 	# Do not use errno with pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>\(".*".*errno'
+	# No EOL whitespace for C files
+	! git --no-pager grep -E '\s+$$' \*.c \*.h
 .PHONY: lint
 
 codecov: SHELL := $(shell which bash)
diff --git a/compel/arch/mips/src/lib/cpu.c b/compel/arch/mips/src/lib/cpu.c
index 4b071cd16..b9f07a041 100755
--- a/compel/arch/mips/src/lib/cpu.c
+++ b/compel/arch/mips/src/lib/cpu.c
@@ -17,11 +17,11 @@ void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
 void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
 
 int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
-{ 
+{
     return 0;
 }
 
-int compel_cpuid(compel_cpuinfo_t *c){	
+int compel_cpuid(compel_cpuinfo_t *c){
     return 0;
 }
 
@@ -31,6 +31,6 @@ bool compel_cpu_has_feature(unsigned int feature)
 	compel_cpuid(&rt_info);
 	rt_info_done = true;
     }
-    
+
     return compel_test_cpu_cap(&rt_info, feature);
 }
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
index 07f3936a9..c711bf346 100755
--- a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
@@ -41,8 +41,8 @@ typedef struct {
 
 #define MIPS_a0			regs[4] //arguments a0-a3
 #define MIPS_t0			regs[8] //temporaries t0-t7
-#define MIPS_v0			regs[2] 
-#define MIPS_v1			regs[3] 
+#define MIPS_v0			regs[2]
+#define MIPS_v1			regs[3]
 #define MIPS_sp			regs[29]
 #define MIPS_ra			regs[31]
 
@@ -59,10 +59,10 @@ static inline bool user_regs_native(user_regs_struct_t *pregs)
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
-#define REG_RES(regs)		((regs).MIPS_v0) 
-#define REG_IP(regs)		((regs).cp0_epc) 
+#define REG_RES(regs)		((regs).MIPS_v0)
+#define REG_IP(regs)		((regs).cp0_epc)
 #define REG_SP(regs)		((regs).MIPS_sp)
-#define REG_SYSCALL_NR(regs)	((regs).MIPS_v0) 
+#define REG_SYSCALL_NR(regs)	((regs).MIPS_v0)
 
 //#define __NR(syscall, compat)	((compat) ? __NR32_##syscall : __NR_##syscall)
 #define __NR(syscall, compat)	__NR_##syscall
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
index ed6a959fc..75869c55f 100755
--- a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
@@ -36,8 +36,8 @@ struct rt_sigframe {
 
 #define RT_SIGFRAME_UC(rt_sigframe)		(&rt_sigframe->rs_uc)
 #define RT_SIGFRAME_UC_SIGMASK(rt_sigframe) 	((k_rtsigset_t *)(void *)&rt_sigframe->rs_uc.uc_sigmask)
-#define RT_SIGFRAME_REGIP(rt_sigframe)	((long unsigned int)0x00)   
-#define RT_SIGFRAME_FPU(rt_sigframe)		     
+#define RT_SIGFRAME_REGIP(rt_sigframe)	((long unsigned int)0x00)
+#define RT_SIGFRAME_FPU(rt_sigframe)
 #define RT_SIGFRAME_HAS_FPU(rt_sigframe) 1
 
 
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index 0c8067f88..29cd511c9 100755
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -217,7 +217,7 @@ void *remote_mmap(struct parasite_ctl *ctl,
  * regs must be inited when calling this function from original context
  */
 void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
-{  
+{
     regs->cp0_epc = new_ip;
     if (stack){
 	  /* regs[29] is sp */
@@ -286,7 +286,7 @@ void compel_relocs_apply_mips(void *mem, void *vbase, struct parasite_blob_desc
        * mips rebasing :load time relocation
        * parasite.built-in.o and restorer.built-in.o is ELF 64-bit LSB relocatable for mips.
        * so we have to relocate some type for R_MIPS_26 R_MIPS_HIGHEST R_MIPS_HIGHER R_MIPS_HI16 and R_MIPS_LO16 in there.
-       * for mips64el .if toload/store data or jump instruct ,need to relocation R_TYPE 
+       * for mips64el .if toload/store data or jump instruct ,need to relocation R_TYPE
        */
     for (i = 0, j = 0; i < nr_relocs; i++) {
 	if (elf_relocs[i].type & COMPEL_TYPE_MIPS_26) {
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 2d643ce43..9a972bee6 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -201,7 +201,7 @@ int __handle_elf(void *mem, size_t size)
 		}
 #endif
 	}
-        
+
 	/* Calculate section addresses with proper alignment.
 	 * Note: some but not all linkers precalculate this information.
 	 */
diff --git a/criu/arch/mips/crtools.c b/criu/arch/mips/crtools.c
index 329ae8edb..0e40428aa 100755
--- a/criu/arch/mips/crtools.c
+++ b/criu/arch/mips/crtools.c
@@ -65,14 +65,14 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpre
     core->ti_mips->gpregs->r29 = regs->regs[29];
     core->ti_mips->gpregs->r30 = regs->regs[30];
     core->ti_mips->gpregs->r31 = regs->regs[31];
-    
+
     core->ti_mips->gpregs->lo = regs->lo;
     core->ti_mips->gpregs->hi = regs->hi;
     core->ti_mips->gpregs->cp0_epc = regs->cp0_epc;
     core->ti_mips->gpregs->cp0_badvaddr = regs->cp0_badvaddr;
     core->ti_mips->gpregs->cp0_status = regs->cp0_status;
     core->ti_mips->gpregs->cp0_cause = regs->cp0_cause;
-    
+
     core->ti_mips->fpregs->r0 = fpregs->regs[0];
     core->ti_mips->fpregs->r1 = fpregs->regs[1];
     core->ti_mips->fpregs->r2 = fpregs->regs[2];
@@ -107,7 +107,7 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpre
     core->ti_mips->fpregs->r31 = fpregs->regs[31];
     core->ti_mips->fpregs->fpu_fcr31 = fpregs->fpu_fcr31;
     core->ti_mips->fpregs->fpu_id = fpregs->fpu_id;
-    
+
     return 0;
 }
 
@@ -142,7 +142,7 @@ int arch_alloc_thread_info(CoreEntry *core)
 
     user_mips_fpregs_entry__init(fpregs);
     ti_mips->fpregs = fpregs;
-    
+
     return 0;
 err:
     return -1;
@@ -155,7 +155,7 @@ void arch_free_thread_info(CoreEntry *core)
 
     if (core->ti_mips->gpregs)
 	xfree(core->ti_mips->gpregs);
-    
+
     if (core->ti_mips->fpregs)
 	xfree(core->ti_mips->fpregs);
 
diff --git a/criu/arch/mips/include/asm/restorer.h b/criu/arch/mips/include/asm/restorer.h
index d916377f4..4223b3196 100755
--- a/criu/arch/mips/include/asm/restorer.h
+++ b/criu/arch/mips/include/asm/restorer.h
@@ -7,13 +7,13 @@
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/sigframe.h>
 
-static inline void restore_tls(tls_t *ptls) { 
-	asm volatile(							
-		     "move $4, %0				    \n"	
-		     "li $2,  "__stringify(__NR_set_thread_area)"  \n" 
-		     "syscall					    \n"	
-		     :							
-		     : "r"(*ptls)					
+static inline void restore_tls(tls_t *ptls) {
+	asm volatile(
+		     "move $4, %0				    \n"
+		     "li $2,  "__stringify(__NR_set_thread_area)"  \n"
+		     "syscall					    \n"
+		     :
+		     : "r"(*ptls)
 		     : "$4","$2","memory");
 }
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index dfa0ab96f..9a133f8bc 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -72,7 +72,7 @@ int restore_bpfmap_data(int map_fd, uint32_t map_id, struct bpfmap_data_rst **bp
 		.flags = 0,
 	);
 
-	for (map_data = bpf_hash_table[map_id & BPFMAP_DATA_HASH_MASK]; map_data != NULL; 
+	for (map_data = bpf_hash_table[map_id & BPFMAP_DATA_HASH_MASK]; map_data != NULL;
 		map_data = map_data->next) {
 
 		if (map_data->bde->map_id == map_id)
@@ -143,11 +143,11 @@ int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p
 	 * by userspace if it's dealing with percpu maps. 'count' will contain the
 	 * number of keys/values successfully retrieved. Note that 'count' is an
 	 * input/output variable and it can contain a lower value after a call.
-	 * 
+	 *
 	 * If there's no more entries to retrieve, ENOENT will be returned. If error
 	 * is ENOENT, count might be > 0 in case it copied some values but there were
 	 * no more entries to retrieve.
-	 * 
+	 *
 	 * Note that if the return code is an error and not -EFAULT,
 	 * count indicates the number of elements successfully processed.
 	 */
@@ -270,7 +270,7 @@ static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 	}
 
 	return ret;
-	
+
 }
 
 const struct fdtype_ops bpfmap_dump_ops = {
diff --git a/criu/files-reg.c b/criu/files-reg.c
index f4f41193b..7d42d435e 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1544,7 +1544,7 @@ static int get_build_id(const int fd, const struct stat *fd_status,
 		ret = get_build_id_32(start_addr, build_id, fd, mapped_size);
 	if (buf[EI_CLASS] == ELFCLASS64)
 		ret = get_build_id_64(start_addr, build_id, fd, mapped_size);
-	
+
 	munmap(start_addr, mapped_size);
 	return ret;
 }
@@ -2065,7 +2065,7 @@ int open_path(struct file_desc *d,
 		tmp = inherit_fd_lookup_id(rfi->rfe->name);
 		if (tmp >= 0) {
 			inh_fd = tmp;
-			/* 
+			/*
 			 * PROC_SELF isn't used, because only service
 			 * descriptors can be used here.
 			 */
diff --git a/criu/include/bpfmap.h b/criu/include/bpfmap.h
index ad065dfc6..2d83f44d2 100644
--- a/criu/include/bpfmap.h
+++ b/criu/include/bpfmap.h
@@ -30,4 +30,4 @@ extern const struct fdtype_ops bpfmap_dump_ops;
 extern struct collect_image_info bpfmap_cinfo;
 extern struct collect_image_info bpfmap_data_cinfo;
 
-#endif /* __CR_BPFMAP_H__ */ 
+#endif /* __CR_BPFMAP_H__ */
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 7b0b32e2e..cb47d6fdd 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1694,7 +1694,7 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 {
 	/*
 	 * Format is:
-	 * 
+	 *
 	 * uint32_t map_type
 	 * uint32_t key_size
 	 * uint32_t value_size
@@ -1718,7 +1718,7 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 
 	size_t n = sizeof(map) / sizeof(bpfmap_fmt);
 	int i;
-	
+
 	for (i = 0; i < n; i++) {
 		if (sscanf(str, map[i].fmt, map[i].value) != 1)
 			return -1;
diff --git a/include/common/arch/mips/asm/linkage.h b/include/common/arch/mips/asm/linkage.h
index 8f2426889..87bfcffa8 100644
--- a/include/common/arch/mips/asm/linkage.h
+++ b/include/common/arch/mips/asm/linkage.h
@@ -6,7 +6,7 @@
 #define v0 	$2
 #define v1 	$3
 
-#define a0 	$4   
+#define a0 	$4
 #define a1      $5
 #define a2      $6
 #define a3      $7
@@ -18,7 +18,7 @@
 #define t1      $13
 #define t2      $14
 #define t3      $15
-	
+
 #define s0      $16     /* callee saved */
 #define s1      $17
 #define s2      $18
diff --git a/include/common/compiler.h b/include/common/compiler.h
index 1d431a529..f19292989 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -44,7 +44,7 @@
 #define __aligned(x)		__attribute__((aligned(x)))
 
 /*
- * Macro to define stack alignment. 
+ * Macro to define stack alignment.
  * aarch64 requires stack to be aligned to 16 bytes.
  */
 #define __stack_aligned__	__attribute__((aligned(16)))
diff --git a/soccr/soccr.h b/soccr/soccr.h
index 2c34e169b..e3cfb7955 100644
--- a/soccr/soccr.h
+++ b/soccr/soccr.h
@@ -96,7 +96,7 @@ struct libsoccr_sk_data {
  * from the kernel and is required for restore. Not present data
  * is zeroified by the library.
  *
- * Ideally the caller should carry the whole _data structure between 
+ * Ideally the caller should carry the whole _data structure between
  * calls, but for optimization purposes it may analyze the flags
  * field and drop the unneeded bits.
  */
@@ -213,14 +213,14 @@ union libsoccr_addr *libsoccr_get_addr(struct libsoccr_sk *sk, int self, unsigne
 
 /*
  * Set a pointer on the send/recv queue data.
- * If flags have SOCCR_MEM_EXCL, the buffer is stolen by the library and is 
+ * If flags have SOCCR_MEM_EXCL, the buffer is stolen by the library and is
  * free()-ed after libsoccr_resume().
  */
 int libsoccr_set_queue_bytes(struct libsoccr_sk *sk, int queue_id, char *bytes, unsigned flags);
 
 /*
  * Set a pointer on the libsoccr_addr for src/dst.
- * If flags have SOCCR_MEM_EXCL, the buffer is stolen by the library and is 
+ * If flags have SOCCR_MEM_EXCL, the buffer is stolen by the library and is
  * fre()-ed after libsoccr_resume().
  */
 int libsoccr_set_addr(struct libsoccr_sk *sk, int self, union libsoccr_addr *, unsigned flags);
diff --git a/test/others/pipes/pipe.c b/test/others/pipes/pipe.c
index 33ec60e7f..d693f4b02 100644
--- a/test/others/pipes/pipe.c
+++ b/test/others/pipes/pipe.c
@@ -10,7 +10,7 @@
  * Also note that changing the log file during restore has nothing to do
  * with the pipe.  It's just a nice feature for cases where it's desirable
  * to have a restored process use a different file then the original one.
- * 
+ *
  * The parent process spawns a child that will write messages to its
  * parent through a pipe.  After a couple of messages, parent invokes
  * criu to checkpoint the child.  Since the child exits after checkpoint,
@@ -377,7 +377,7 @@ void chld_handler(int signum)
 	if (pid == child_pid) {
 		if (!qflag) {
 			printf("%s %s exited with status %d\n", who(0),
-				who(pid), status); 
+				who(pid), status);
 		}
 		/* if child exited successfully, we're done */
 		if (status == 0)
@@ -528,7 +528,7 @@ char *pipe_name(int fd)
 }
 
 /*
- * Use two buffers to support two calls to 
+ * Use two buffers to support two calls to
  * this function in a printf argument list.
  */
 char *who(pid_t pid)
diff --git a/test/zdtm/lib/bpfmap_zdtm.c b/test/zdtm/lib/bpfmap_zdtm.c
index 35d82ac63..73a79b3f5 100644
--- a/test/zdtm/lib/bpfmap_zdtm.c
+++ b/test/zdtm/lib/bpfmap_zdtm.c
@@ -123,4 +123,4 @@ int cmp_bpfmap_fdinfo(struct bpfmap_fdinfo_obj *old, struct bpfmap_fdinfo_obj *n
 		return -1;
 
 	return 0;
-} 
\ No newline at end of file
+}
diff --git a/test/zdtm/static/bpf_array.c b/test/zdtm/static/bpf_array.c
index 6f4827413..ca7796bdf 100644
--- a/test/zdtm/static/bpf_array.c
+++ b/test/zdtm/static/bpf_array.c
@@ -77,13 +77,13 @@ int main(int argc, char **argv)
 		.flags = 0,
 	);
 
-	keys = mmap(NULL, max_entries * sizeof(int), 
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);	
-	values = mmap(NULL, max_entries * sizeof(int), 
+	keys = mmap(NULL, max_entries * sizeof(int),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	visited = mmap(NULL, max_entries * sizeof(int), 
+	values = mmap(NULL, max_entries * sizeof(int),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	
+	visited = mmap(NULL, max_entries * sizeof(int),
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+
 	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
 		pr_perror("Can't mmap()");
 		goto err;
@@ -133,7 +133,7 @@ int main(int argc, char **argv)
 		pr_perror("Could not parse new map fdinfo from procfs");
 		goto err;
 	}
-	
+
 	if (cmp_bpf_map_info(&old_map_info, &new_map_info)) {
 		pr_err("bpf_map_info mismatch\n");
 		goto err;
@@ -167,7 +167,7 @@ err:
 	munmap(keys, max_entries * sizeof(int));
 	munmap(values, max_entries * sizeof(int));
 	munmap(visited, max_entries * sizeof(int));
-	
+
 	fail();
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/test/zdtm/static/bpf_hash.c b/test/zdtm/static/bpf_hash.c
index ad983dcbb..4054140b8 100644
--- a/test/zdtm/static/bpf_hash.c
+++ b/test/zdtm/static/bpf_hash.c
@@ -34,7 +34,7 @@ static int map_batch_verify(int *visited, uint32_t max_entries, int *keys, int *
 {
 	memset(visited, 0, max_entries * sizeof(*visited));
 	for (int i = 0; i < max_entries; i++) {
-		
+
 		if (keys[i] + 1 != values[i]) {
 			pr_err("Key/value checking error: i=%d, key=%d, value=%d\n", i, keys[i], values[i]);
 			return -1;
@@ -76,13 +76,13 @@ int main(int argc, char **argv)
 		.flags = 0,
 	);
 
-	keys = mmap(NULL, max_entries * sizeof(int), 
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);	
-	values = mmap(NULL, max_entries * sizeof(int), 
+	keys = mmap(NULL, max_entries * sizeof(int),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	visited = mmap(NULL, max_entries * sizeof(int), 
+	values = mmap(NULL, max_entries * sizeof(int),
 			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	
+	visited = mmap(NULL, max_entries * sizeof(int),
+			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+
 	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
 		pr_perror("Can't mmap()");
 		goto err;
@@ -132,7 +132,7 @@ int main(int argc, char **argv)
 		pr_perror("Could not parse new map fdinfo from procfs");
 		goto err;
 	}
-	
+
 	if (cmp_bpf_map_info(&old_map_info, &new_map_info)) {
 		pr_err("bpf_map_info mismatch\n");
 		goto err;
@@ -166,7 +166,7 @@ err:
 	munmap(keys, max_entries * sizeof(int));
 	munmap(values, max_entries * sizeof(int));
 	munmap(visited, max_entries * sizeof(int));
-	
+
 	fail();
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/test/zdtm/static/child_subreaper_existing_child.c b/test/zdtm/static/child_subreaper_existing_child.c
index 8291aba08..bc0047480 100644
--- a/test/zdtm/static/child_subreaper_existing_child.c
+++ b/test/zdtm/static/child_subreaper_existing_child.c
@@ -76,18 +76,18 @@ int subreaper(void)
 		pr_perror("Wrong exit status for HELPER: %d", status);
 		return 1;
 	}
-	
+
 	/* Give control to ORPHAN so it can check its parent */
 	futex_set_and_wake(&sh->fstate, TEST_CHECK);
 	futex_wait_until(&sh->fstate, TEST_EXIT);
-	
+
 	/* Cleanup: reap the ORPHAN */
 	wait(&status);
 	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
 		pr_perror("Wrong exit status for ORPHAN: %d", status);
 		return 1;
 	}
-	
+
 	return 0;
 }
 
diff --git a/test/zdtm/static/sockets03.c b/test/zdtm/static/sockets03.c
index ce668b7f8..cbc46ca27 100644
--- a/test/zdtm/static/sockets03.c
+++ b/test/zdtm/static/sockets03.c
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	test_init(argc, argv);
-    
+
 	signal(SIGPIPE, SIG_IGN);
 
 	cwd = get_current_dir_name();

From f10425e0530e64b73c994e68bdf4829e4a173ff4 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 22 Apr 2021 17:57:49 -0700
Subject: [PATCH 0595/1854] criu: end pr_(err|warn|msg|info|debug) with \n

Unlike pr_perror, pr_err and other macros do not append \n
to the message being printed, so the caller needs to take care of it.

Sometimes it was not done, so let's add this manually.

To make sure it won't happen again, add a line to Makefile under the
linter target to check for such missing \n. NOTE this check is only
done for part of such cases (where the pr_* statement fits in one line
and there's no comment after), but it's better than nothing.

Add comments after pr_msg and pr_info statements where we deliberately
don't add \n, so that the above check ignores them.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Makefile          | 2 ++
 criu/config.c     | 6 +++---
 criu/cr-check.c   | 4 ++--
 criu/cr-restore.c | 2 +-
 criu/crtools.c    | 2 +-
 criu/files-reg.c  | 2 +-
 criu/ipc_ns.c     | 2 +-
 criu/kerndat.c    | 2 +-
 criu/net.c        | 2 +-
 criu/sk-unix.c    | 4 ++--
 10 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 4b13a8d42..572a21d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -411,6 +411,8 @@ lint:
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*%m'
 	# Do not use errno with pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>\(".*".*errno'
+	# End pr_(err|warn|msg|info|debug) with \n
+	! git --no-pager grep -En '^\s*\<pr_(err|warn|msg|info|debug)\>.*);$$' | grep -v '\\n'
 	# No EOL whitespace for C files
 	! git --no-pager grep -E '\s+$$' \*.c \*.h
 .PHONY: lint
diff --git a/criu/config.c b/criu/config.c
index 08606fb33..36be023f7 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -187,7 +187,7 @@ static int next_config(char **argv, char ***_argv, bool no_default_config,
 				break;
 			home_dir = getenv("HOME");
 			if (!home_dir) {
-				pr_info("Unable to get $HOME directory, local configuration file will not be used.");
+				pr_info("Unable to get $HOME directory, local configuration file will not be used.\n");
 			} else {
 				snprintf(local_filepath, PATH_MAX, "%s/%s%s",
 						home_dir, USER_CONFIG_DIR, DEFAULT_CONFIG_FILENAME);
@@ -755,7 +755,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			break;
 		case 1065:
 			if (!add_fsname_auto(optarg)) {
-				pr_err("Failed while parsing --enable-fs option: %s", optarg);
+				pr_err("Failed while parsing --enable-fs option: %s\n", optarg);
 				return 1;
 			}
 			break;
@@ -767,7 +767,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			break;
 		case 1070:
 			if (irmap_scan_path_add(optarg)) {
-				pr_err("Failed while parsing --irmap-scan-path option: %s", optarg);
+				pr_err("Failed while parsing --irmap-scan-path option: %s\n", optarg);
 				return -1;
 			}
 			break;
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 2fdc4408a..f095d59b0 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1528,10 +1528,10 @@ void pr_check_features(const char *offset, const char *sep, int width)
 			pr_msg("\n%s", offset);
 			pos = offset_len;
 		}
-		pr_msg("%s", fl->name);
+		pr_msg("%s", fl->name); // no \n
 		pos += len;
 		if ((fl + 1)->name) { // not the last item
-			pr_msg("%s", sep);
+			pr_msg("%s", sep); // no \n
 			pos += sep_len;
 		}
 	}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 53cae3509..0d85db6ce 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1462,7 +1462,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 				ret = set_next_pid((void *)&pid);
 			}
 			if (ret != 0) {
-				pr_err("Setting PID failed");
+				pr_err("Setting PID failed\n");
 				goto err_unlock;
 			}
 		}
diff --git a/criu/crtools.c b/criu/crtools.c
index 47b01af44..c78570e58 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -174,7 +174,7 @@ int main(int argc, char *argv[], char *envp[])
 	if (strcmp(argv[optind], "service")) {
 		ret = open_image_dir(opts.imgs_dir, image_dir_mode(argv, optind));
 		if (ret < 0) {
-			pr_err("Couldn't open image dir: %s", opts.imgs_dir);
+			pr_err("Couldn't open image dir %s\n", opts.imgs_dir);
 			return 1;
 		}
 	}
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 7d42d435e..d0a6fae60 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1536,7 +1536,7 @@ static int get_build_id(const int fd, const struct stat *fd_status,
 	mapped_size = min_t(size_t, fd_status->st_size, BUILD_ID_MAP_SIZE);
 	start_addr = mmap(0, mapped_size, PROT_READ, MAP_PRIVATE | MAP_FILE, fd, 0);
 	if (start_addr == MAP_FAILED) {
-		pr_warn("Couldn't mmap file with fd %d", fd);
+		pr_warn("Couldn't mmap file with fd %d\n", fd);
 		return -1;
 	}
 
diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index e7049599f..1c8de41a8 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -58,7 +58,7 @@ static void fill_ipc_desc(int id, IpcDescEntry *desc, const struct ipc_perm *ipc
 static void pr_ipc_sem_array(int nr, u16 *values)
 {
 	while (nr--)
-		pr_info("  %-5d", values[nr]);
+		pr_info("  %-5d", values[nr]); // no \n
 	pr_info("\n");
 }
 
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 2327a8e25..a559756f8 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -54,7 +54,7 @@ static int check_pagemap(void)
 	fd = __open_proc(PROC_SELF, EPERM, O_RDONLY, "pagemap");
 	if (fd < 0) {
 		if (errno == EPERM) {
-			pr_info("Pagemap disabled");
+			pr_info("Pagemap disabled\n");
 			kdat.pmap = PM_DISABLED;
 			return 0;
 		}
diff --git a/criu/net.c b/criu/net.c
index f6b6c8c09..38dc73ea1 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2428,7 +2428,7 @@ static inline int restore_nftables(int pid)
 		return -1;
 	if (empty_image(img)) {
 		/* Backward compatibility */
-		pr_info("Skipping nft restore, no image");
+		pr_info("Skipping nft restore, no image\n");
 		ret = 0;
 		goto image_close_out;
 	}
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index e589da8de..d628e32cb 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -665,7 +665,7 @@ static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d,
 
 	fd = ioctl(lfd, SIOCUNIXFILE);
 	if (fd < 0) {
-		pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl.");
+		pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl: %m\n");
 		goto fallback;
 	}
 
@@ -716,7 +716,7 @@ out:
 	return ret;
 
 fallback:
-	pr_warn("Trying to resolve unix socket with obsolete method");
+	pr_warn("Trying to resolve unix socket with obsolete method\n");
 	ret = unix_resolve_name_old(lfd, id, d, ue, p);
 	if (ret < 0)
 		pr_err("Unable to resolve unix socket name with obsolete method. Try a linux kernel newer than 4.10\n");

From 29c34386b0d624b0327bfe83251ae6212393cf4a Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 8 May 2020 20:58:28 +0000
Subject: [PATCH 0596/1854] restore: fix error message when fork fails

`last_pid_buf` is not where the last_pid string is, but it is in `s`.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/pie/restorer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index b3d7e2b5c..310ce2754 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1814,7 +1814,7 @@ long __export_restore_task(struct task_restore_args *args)
 				sys_lseek(fd, 0, SEEK_SET);
 				ret = sys_write(fd, s, last_pid_len);
 				if (ret < 0) {
-					pr_err("Can't set last_pid %ld/%s\n", ret, last_pid_buf);
+					pr_err("Can't set last_pid %ld/%s\n", ret, s);
 					sys_close(fd);
 					mutex_unlock(&task_entries_local->last_pid_mutex);
 					goto core_restore_end;

From 24bdfa72df3b453618873f2a97779755e11f9ab1 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 23 Apr 2021 23:37:22 +0000
Subject: [PATCH 0597/1854] net: add a #define for increased compatiblity with
 old distributions

Debian 9 doesn't have IFLA_NEW_IFINDEX defined

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/net.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/net.c b/criu/net.c
index 38dc73ea1..2ef4dba13 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -50,6 +50,10 @@
 #include "images/netdev.pb-c.h"
 #include "images/inventory.pb-c.h"
 
+#ifndef IFLA_NEW_IFINDEX
+#define IFLA_NEW_IFINDEX	49
+#endif
+
 #ifndef IFLA_LINK_NETNSID
 #define IFLA_LINK_NETNSID	37
 #undef IFLA_MAX

From 731cafa85cbaee28609349f379f5f9f2a7d61fea Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 23 Apr 2021 19:10:48 +0000
Subject: [PATCH 0598/1854] logging: pr_perror() -> pr_msg() when execvp fails
 in action scripts and others

When invoking an action-script, all file descriptors >= 3 are closed.
If execvp() fails, we can only log the error on stderr. pr_msg() outputs
on stderr, so we use this as opposed to pr_perror().

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/util.c b/criu/util.c
index ca09f02a1..5f60f502f 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -626,7 +626,9 @@ int cr_system_userns(int in, int out, int err, char *cmd,
 
 		execvp(cmd, argv);
 
-		pr_perror("exec(%s, ...) failed", cmd);
+		/* We can't use pr_error() as log file fd is closed. */
+		fprintf(stderr, "Error (%s:%d): " LOG_PREFIX "execvp(\"%s\", ...) failed: %s\n",
+		       __FILE__, __LINE__, cmd, strerror(errno));
 out_chld:
 		_exit(1);
 	}

From 99a6a17c2f66f5f4b77961ef3cc63962204d4bf2 Mon Sep 17 00:00:00 2001
From: zl-wang <zlwang@ca.ibm.com>
Date: Fri, 7 May 2021 12:13:52 -0400
Subject: [PATCH 0599/1854] Allow systemcfg proc file to be dumped

Currently, it cannot be check-pointed, because that type of file is on UNSUPP list.

Signed-off-by: zl-wang <zlwang@ca.ibm.com>
---
 criu/proc_parse.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index cb47d6fdd..86debe2f5 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -173,7 +173,8 @@ static void parse_vma_vmflags(char *buf, struct vma_area *vma_area)
 	 * only exception is VVAR area that mapped by the kernel as
 	 * VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP
 	 */
-	if (io_pf && !vma_area_is(vma_area, VMA_AREA_VVAR))
+	if (io_pf && !vma_area_is(vma_area, VMA_AREA_VVAR) &&
+	    !vma_entry_is(vma_area->e, VMA_FILE_SHARED))
 		vma_area->e->status |= VMA_UNSUPP;
 
 	if (vma_area->e->madv)

From 22142eedf0e88f86ed128493a3cee0f94c487882 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 30 Apr 2021 20:54:01 +0100
Subject: [PATCH 0600/1854] mips: coding style fixes

CRIU follows Linux kernel coding style. This patch updates the
architecture-specific code for MIPS to use tab indentation,
add whitespace between closing parenthesis and open bracket,
and changes the mode of source files from 755 to 644.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .../arch/mips/plugins/include/asm/prologue.h  |   0
 .../mips/plugins/include/asm/syscall-types.h  |   0
 compel/arch/mips/plugins/include/features.h   |   0
 compel/arch/mips/plugins/std/memcpy.S         |   5 +-
 compel/arch/mips/plugins/std/parasite-head.S  |   9 +-
 .../plugins/std/syscalls/Makefile.syscalls    |   0
 .../std/syscalls/syscall-common-mips-64.S     |   0
 .../mips/plugins/std/syscalls/syscall_64.tbl  |   0
 .../mips/scripts/compel-pack-compat.lds.S     |   1 -
 compel/arch/mips/scripts/compel-pack.lds.S    |  10 +-
 compel/arch/mips/src/lib/cpu.c                |  14 +-
 compel/arch/mips/src/lib/handle-elf.c         |   4 +-
 compel/arch/mips/src/lib/include/handle-elf.h |   0
 compel/arch/mips/src/lib/include/ldsodefs.h   | 193 +++++-----
 compel/arch/mips/src/lib/include/syscall.h    |   0
 .../src/lib/include/uapi/asm/breakpoints.h    |   0
 .../arch/mips/src/lib/include/uapi/asm/cpu.h  |   0
 .../src/lib/include/uapi/asm/infect-types.h   |   3 +-
 .../mips/src/lib/include/uapi/asm/sigframe.h  |  28 +-
 .../mips/src/lib/include/uapi/asm/siginfo.h   |   0
 compel/arch/mips/src/lib/infect.c             | 287 +++++++-------
 criu/arch/mips/Makefile                       |   0
 criu/arch/mips/cpu.c                          |  18 +-
 criu/arch/mips/crtools.c                      | 358 +++++++++---------
 criu/arch/mips/include/asm/dump.h             |   0
 criu/arch/mips/include/asm/int.h              |   0
 criu/arch/mips/include/asm/parasite-syscall.h |   0
 criu/arch/mips/include/asm/parasite.h         |   2 +-
 criu/arch/mips/include/asm/restore.h          |  23 +-
 criu/arch/mips/include/asm/restorer.h         |   0
 criu/arch/mips/include/asm/syscall32.h        |   0
 criu/arch/mips/include/asm/types.h            |   0
 criu/arch/mips/include/asm/vdso.h             |   0
 criu/arch/mips/restorer.c                     |   2 +-
 criu/arch/mips/sigaction_compat.c             |   2 +-
 criu/arch/mips/sigframe.c                     |   2 +-
 criu/arch/mips/vdso-pie.c                     |   0
 criu/crtools.c                                |   4 +-
 38 files changed, 483 insertions(+), 482 deletions(-)
 mode change 100755 => 100644 compel/arch/mips/plugins/include/asm/prologue.h
 mode change 100755 => 100644 compel/arch/mips/plugins/include/asm/syscall-types.h
 mode change 100755 => 100644 compel/arch/mips/plugins/include/features.h
 mode change 100755 => 100644 compel/arch/mips/plugins/std/memcpy.S
 mode change 100755 => 100644 compel/arch/mips/plugins/std/parasite-head.S
 mode change 100755 => 100644 compel/arch/mips/plugins/std/syscalls/Makefile.syscalls
 mode change 100755 => 100644 compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S
 mode change 100755 => 100644 compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
 mode change 100755 => 100644 compel/arch/mips/scripts/compel-pack-compat.lds.S
 mode change 100755 => 100644 compel/arch/mips/scripts/compel-pack.lds.S
 mode change 100755 => 100644 compel/arch/mips/src/lib/cpu.c
 mode change 100755 => 100644 compel/arch/mips/src/lib/handle-elf.c
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/handle-elf.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/ldsodefs.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/syscall.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/uapi/asm/cpu.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
 mode change 100755 => 100644 compel/arch/mips/src/lib/infect.c
 mode change 100755 => 100644 criu/arch/mips/Makefile
 mode change 100755 => 100644 criu/arch/mips/cpu.c
 mode change 100755 => 100644 criu/arch/mips/crtools.c
 mode change 100755 => 100644 criu/arch/mips/include/asm/dump.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/int.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/parasite-syscall.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/parasite.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/restore.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/restorer.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/syscall32.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/types.h
 mode change 100755 => 100644 criu/arch/mips/include/asm/vdso.h
 mode change 100755 => 100644 criu/arch/mips/restorer.c
 mode change 100755 => 100644 criu/arch/mips/sigaction_compat.c
 mode change 100755 => 100644 criu/arch/mips/sigframe.c
 mode change 100755 => 100644 criu/arch/mips/vdso-pie.c

diff --git a/compel/arch/mips/plugins/include/asm/prologue.h b/compel/arch/mips/plugins/include/asm/prologue.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/plugins/include/asm/syscall-types.h b/compel/arch/mips/plugins/include/asm/syscall-types.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/plugins/include/features.h b/compel/arch/mips/plugins/include/features.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/plugins/std/memcpy.S b/compel/arch/mips/plugins/std/memcpy.S
old mode 100755
new mode 100644
index 262267f7f..5d13a1590
--- a/compel/arch/mips/plugins/std/memcpy.S
+++ b/compel/arch/mips/plugins/std/memcpy.S
@@ -1,12 +1,12 @@
 
 #include "common/asm/linkage.h"
-	
+
 	.section .head.text, "ax"
 ENTRY(memcpy)
 	.set noreorder
 	dadd v0,zero,a0
 	daddiu t1,zero,0
-loop:	
+loop:
 	beq t1,a2,exit
 	nop
 	lb t2,0(a1)
@@ -20,4 +20,3 @@ exit:
 	jr ra
 	nop
 END(memcpy)
-		
diff --git a/compel/arch/mips/plugins/std/parasite-head.S b/compel/arch/mips/plugins/std/parasite-head.S
old mode 100755
new mode 100644
index 978c0b58c..33d04db96
--- a/compel/arch/mips/plugins/std/parasite-head.S
+++ b/compel/arch/mips/plugins/std/parasite-head.S
@@ -1,15 +1,14 @@
 
 #include "common/asm/linkage.h"
-	
-	
+
 	.section .head.text, "ax"
 ENTRY(__export_parasite_head_start)
 	.set push
 	.set noreorder
 	jal	parasite_service
 	nop
-	.byte   0x0d, 0x00, 0x00, 0x00   //break
+	.byte	0x0d, 0x00, 0x00, 0x00	//break
 	.set pop
-//	.byte 0x40,0x01,0x00,0x00   //pause
+//	.byte 0x40,0x01,0x00,0x00	//pause
 END(__export_parasite_head_start)
-		
+
diff --git a/compel/arch/mips/plugins/std/syscalls/Makefile.syscalls b/compel/arch/mips/plugins/std/syscalls/Makefile.syscalls
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S b/compel/arch/mips/plugins/std/syscalls/syscall-common-mips-64.S
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/scripts/compel-pack-compat.lds.S b/compel/arch/mips/scripts/compel-pack-compat.lds.S
old mode 100755
new mode 100644
index 0ae585e0d..fe54847aa
--- a/compel/arch/mips/scripts/compel-pack-compat.lds.S
+++ b/compel/arch/mips/scripts/compel-pack-compat.lds.S
@@ -1,4 +1,3 @@
 OUTPUT_ARCH(mips)
 EXTERN(__export_parasite_head_start)
 ASSERT(0,"Compatible PIEs are unsupported on mips")
-
diff --git a/compel/arch/mips/scripts/compel-pack.lds.S b/compel/arch/mips/scripts/compel-pack.lds.S
old mode 100755
new mode 100644
index 24ee408e8..370cac68f
--- a/compel/arch/mips/scripts/compel-pack.lds.S
+++ b/compel/arch/mips/scripts/compel-pack.lds.S
@@ -3,17 +3,17 @@ EXTERN(__export_parasite_head_start)
 
 SECTIONS
 {
-	.text : {  
+	.text : {
 		*(.head.text)
-		ASSERT(DEFINED(__export_parasite_head_start),	
+		ASSERT(DEFINED(__export_parasite_head_start),
 			"Symbol __export_parasite_head_start is missing");
-        	*(.text*)
+		*(.text*)
 		*(.compel.exit)
 		*(.compel.init)
 		/* .rodata section*/
 		*(.rodata*)
 		*(.got*)
-	       /* .data section */
+		/* .data section */
 		*(.data*)
 		*(.bss*)
 		*(.sbss*)
@@ -22,7 +22,7 @@ SECTIONS
 
 	/DISCARD/ : { /*segments need to discard */
 		*(.debug*)
-		*(.pdr)	
+		*(.pdr)
 		*(.comment*)
 		*(.note*)
 		*(.group*)
diff --git a/compel/arch/mips/src/lib/cpu.c b/compel/arch/mips/src/lib/cpu.c
old mode 100755
new mode 100644
index b9f07a041..bdb65ff9f
--- a/compel/arch/mips/src/lib/cpu.c
+++ b/compel/arch/mips/src/lib/cpu.c
@@ -18,19 +18,19 @@ void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
 
 int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
 {
-    return 0;
+	return 0;
 }
 
 int compel_cpuid(compel_cpuinfo_t *c){
-    return 0;
+	return 0;
 }
 
 bool compel_cpu_has_feature(unsigned int feature)
 {
-    if (!rt_info_done) {
-	compel_cpuid(&rt_info);
-	rt_info_done = true;
-    }
+	if (!rt_info_done) {
+		compel_cpuid(&rt_info);
+		rt_info_done = true;
+	}
 
-    return compel_test_cpu_cap(&rt_info, feature);
+	return compel_test_cpu_cap(&rt_info, feature);
 }
diff --git a/compel/arch/mips/src/lib/handle-elf.c b/compel/arch/mips/src/lib/handle-elf.c
old mode 100755
new mode 100644
index 199bb1581..988985151
--- a/compel/arch/mips/src/lib/handle-elf.c
+++ b/compel/arch/mips/src/lib/handle-elf.c
@@ -15,8 +15,8 @@ extern int __handle_elf(void *mem, size_t size);
 
 int handle_binary(void *mem, size_t size)
 {
-    if (memcmp(mem, elf_ident_64_le, sizeof(elf_ident_64_le)) == 0)
-	return __handle_elf(mem, size);
+	if (memcmp(mem, elf_ident_64_le, sizeof(elf_ident_64_le)) == 0)
+		return __handle_elf(mem, size);
 
 	pr_err("Unsupported Elf format detected\n");
 	return -EINVAL;
diff --git a/compel/arch/mips/src/lib/include/handle-elf.h b/compel/arch/mips/src/lib/include/handle-elf.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/src/lib/include/ldsodefs.h b/compel/arch/mips/src/lib/include/ldsodefs.h
old mode 100755
new mode 100644
index 6e2d4f549..54faa4668
--- a/compel/arch/mips/src/lib/include/ldsodefs.h
+++ b/compel/arch/mips/src/lib/include/ldsodefs.h
@@ -1,20 +1,22 @@
-/* Run-time dynamic linker data structures for loaded ELF shared objects.
-   Copyright (C) 2000-2014 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
+/*
+ * Run-time dynamic linker data structures for loaded ELF shared objects.
+ * Copyright (C) 2000-2014 Free Software Foundation, Inc.
+ * This file is part of the GNU C Library.
+ *
+ * The GNU C Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * The GNU C Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the GNU C Library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef _MIPS_LDSODEFS_H
 #define _MIPS_LDSODEFS_H 1
@@ -26,114 +28,121 @@ struct La_mips_32_retval;
 struct La_mips_64_regs;
 struct La_mips_64_retval;
 
-#define ARCH_PLTENTER_MEMBERS						    \
-    Elf32_Addr (*mips_o32_gnu_pltenter) (Elf32_Sym *, unsigned int,	    \
-					 uintptr_t *, uintptr_t *,	    \
-					 struct La_mips_32_regs *,	    \
-					 unsigned int *, const char *name,  \
-					 long int *framesizep);		    \
-    Elf32_Addr (*mips_n32_gnu_pltenter) (Elf32_Sym *, unsigned int,	    \
-					 uintptr_t *, uintptr_t *,	    \
-					 struct La_mips_64_regs *,	    \
-					 unsigned int *, const char *name,  \
-					 long int *framesizep);		    \
-    Elf64_Addr (*mips_n64_gnu_pltenter) (Elf64_Sym *, unsigned int,	    \
-					 uintptr_t *, uintptr_t *,	    \
-					 struct La_mips_64_regs *,	    \
-					 unsigned int *, const char *name,  \
+#define ARCH_PLTENTER_MEMBERS							\
+	Elf32_Addr (*mips_o32_gnu_pltenter) (Elf32_Sym *, unsigned int,		\
+					 uintptr_t *, uintptr_t *,		\
+					 struct La_mips_32_regs *,		\
+					 unsigned int *, const char *name,	\
+					 long int *framesizep);			\
+	Elf32_Addr (*mips_n32_gnu_pltenter) (Elf32_Sym *, unsigned int,		\
+					 uintptr_t *, uintptr_t *,		\
+					 struct La_mips_64_regs *,		\
+					 unsigned int *, const char *name,	\
+					 long int *framesizep);			\
+	Elf64_Addr (*mips_n64_gnu_pltenter) (Elf64_Sym *, unsigned int,		\
+					 uintptr_t *, uintptr_t *,		\
+					 struct La_mips_64_regs *,		\
+					 unsigned int *, const char *name,	\
 					 long int *framesizep);
 
-#define ARCH_PLTEXIT_MEMBERS						    \
-    unsigned int (*mips_o32_gnu_pltexit) (Elf32_Sym *, unsigned int,	    \
-					  uintptr_t *, uintptr_t *,	    \
-					  const struct La_mips_32_regs *,   \
-					  struct La_mips_32_retval *,	    \
-					  const char *);		    \
-    unsigned int (*mips_n32_gnu_pltexit) (Elf32_Sym *, unsigned int,	    \
-					  uintptr_t *, uintptr_t *,	    \
-					  const struct La_mips_64_regs *,   \
-					  struct La_mips_64_retval *,	    \
-					  const char *);		    \
-    unsigned int (*mips_n64_gnu_pltexit) (Elf64_Sym *, unsigned int,	    \
-					  uintptr_t *, uintptr_t *,	    \
-					  const struct La_mips_64_regs *,   \
-					  struct La_mips_64_retval *,	    \
+#define ARCH_PLTEXIT_MEMBERS							\
+	unsigned int (*mips_o32_gnu_pltexit) (Elf32_Sym *, unsigned int,	\
+					  uintptr_t *, uintptr_t *,		\
+					  const struct La_mips_32_regs *,	\
+					  struct La_mips_32_retval *,		\
+					  const char *);			\
+	unsigned int (*mips_n32_gnu_pltexit) (Elf32_Sym *, unsigned int,	\
+					  uintptr_t *, uintptr_t *,		\
+					  const struct La_mips_64_regs *,	\
+					  struct La_mips_64_retval *,		\
+					  const char *);			\
+	unsigned int (*mips_n64_gnu_pltexit) (Elf64_Sym *, unsigned int,	\
+					  uintptr_t *, uintptr_t *,		\
+					  const struct La_mips_64_regs *,	\
+					  struct La_mips_64_retval *,		\
 					  const char *);
 
 /* The MIPS ABI specifies that the dynamic section has to be read-only.  */
 
-/* The 64-bit MIPS ELF ABI uses an unusual reloc format.  Each
-   relocation entry specifies up to three actual relocations, all at
-   the same address.  The first relocation which required a symbol
-   uses the symbol in the r_sym field.  The second relocation which
-   requires a symbol uses the symbol in the r_ssym field.  If all
-   three relocations require a symbol, the third one uses a zero
-   value.
-
-   We define these structures in internal headers because we're not
-   sure we want to make them part of the ABI yet.  Eventually, some of
-   this may move into elf/elf.h.  */
+/*
+ * The 64-bit MIPS ELF ABI uses an unusual reloc format.  Each
+ * relocation entry specifies up to three actual relocations, all at
+ * the same address.  The first relocation which required a symbol
+ * uses the symbol in the r_sym field.  The second relocation which
+ * requires a symbol uses the symbol in the r_ssym field.  If all
+ * three relocations require a symbol, the third one uses a zero
+ * value.
+ *
+ * We define these structures in internal headers because we're not
+ * sure we want to make them part of the ABI yet.  Eventually, some of
+ * this may move into elf/elf.h.
+ */
 
 /* An entry in a 64 bit SHT_REL section.  */
 
 typedef struct
 {
-  Elf32_Word    r_sym;		/* Symbol index */
-  unsigned char r_ssym;		/* Special symbol for 2nd relocation */
-  unsigned char r_type3;	/* 3rd relocation type */
-  unsigned char r_type2;	/* 2nd relocation type */
-  unsigned char r_type1;	/* 1st relocation type */
+	Elf32_Word    r_sym;		/* Symbol index */
+	unsigned char r_ssym;		/* Special symbol for 2nd relocation */
+	unsigned char r_type3;	/* 3rd relocation type */
+	unsigned char r_type2;	/* 2nd relocation type */
+	unsigned char r_type1;	/* 1st relocation type */
 } _Elf64_Mips_R_Info;
 
 typedef union
 {
-  Elf64_Xword	r_info_number;
-  _Elf64_Mips_R_Info r_info_fields;
+	Elf64_Xword	r_info_number;
+	_Elf64_Mips_R_Info r_info_fields;
 } _Elf64_Mips_R_Info_union;
 
 typedef struct
 {
-  Elf64_Addr	r_offset;		/* Address */
-  _Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
+	Elf64_Addr	r_offset;		/* Address */
+	_Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
 } Elf64_Mips_Rel;
 
 typedef struct
 {
-  Elf64_Addr	r_offset;		/* Address */
-  _Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
-  Elf64_Sxword	r_addend;		/* Addend */
+	Elf64_Addr	r_offset;		/* Address */
+	_Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
+	Elf64_Sxword	r_addend;		/* Addend */
 } Elf64_Mips_Rela;
 
 #define ELF64_MIPS_R_SYM(i) \
-  ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
+	((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
+
 #define ELF64_MIPS_R_TYPE(i) \
-  (((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \
-   | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
-		   ).r_info_fields.r_type2 << 8) \
-   | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
-		   ).r_info_fields.r_type3 << 16) \
-   | ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
-		   ).r_info_fields.r_ssym << 24))
+	(((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \
+	| ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
+			).r_info_fields.r_type2 << 8) \
+	| ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
+			).r_info_fields.r_type3 << 16) \
+	| ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
+			).r_info_fields.r_ssym << 24))
+
 #define ELF64_MIPS_R_INFO(sym, type) \
-  (__extension__ (_Elf64_Mips_R_Info_union) \
-   (__extension__ (_Elf64_Mips_R_Info) \
-   { (sym), ELF64_MIPS_R_SSYM (type), \
-       ELF64_MIPS_R_TYPE3 (type), \
-       ELF64_MIPS_R_TYPE2 (type), \
-       ELF64_MIPS_R_TYPE1 (type) \
-   }).r_info_number)
-/* These macros decompose the value returned by ELF64_MIPS_R_TYPE, and
-   compose it back into a value that it can be used as an argument to
-   ELF64_MIPS_R_INFO.  */
+	(__extension__ (_Elf64_Mips_R_Info_union) \
+	(__extension__ (_Elf64_Mips_R_Info) \
+	{ (sym), ELF64_MIPS_R_SSYM (type), \
+		ELF64_MIPS_R_TYPE3 (type), \
+		ELF64_MIPS_R_TYPE2 (type), \
+		ELF64_MIPS_R_TYPE1 (type) \
+	}).r_info_number)
+
+/*
+ * These macros decompose the value returned by ELF64_MIPS_R_TYPE, and
+ * compose it back into a value that it can be used as an argument to
+ * ELF64_MIPS_R_INFO.
+ */
 #define ELF64_MIPS_R_SSYM(i) (((i) >> 24) & 0xff)
 #define ELF64_MIPS_R_TYPE3(i) (((i) >> 16) & 0xff)
 #define ELF64_MIPS_R_TYPE2(i) (((i) >> 8) & 0xff)
 #define ELF64_MIPS_R_TYPE1(i) ((i) & 0xff)
 #define ELF64_MIPS_R_TYPEENC(type1, type2, type3, ssym) \
-  ((type1) \
-   | ((Elf32_Word)(type2) << 8) \
-   | ((Elf32_Word)(type3) << 16) \
-   | ((Elf32_Word)(ssym) << 24))
+	((type1) \
+	| ((Elf32_Word)(type2) << 8) \
+	| ((Elf32_Word)(type3) << 16) \
+	| ((Elf32_Word)(ssym) << 24))
 
 #undef ELF64_R_SYM
 #define ELF64_R_SYM(i) ELF64_MIPS_R_SYM (i)
diff --git a/compel/arch/mips/src/lib/include/syscall.h b/compel/arch/mips/src/lib/include/syscall.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h b/compel/arch/mips/src/lib/include/uapi/asm/breakpoints.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/cpu.h b/compel/arch/mips/src/lib/include/uapi/asm/cpu.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
old mode 100755
new mode 100644
index c711bf346..2a85dd402
--- a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
@@ -10,11 +10,10 @@
 #define SIGMAX_OLD		31
 
 /*
-
  * Copied from the Linux kernel header arch/mips/include/asm/ptrace.h
  *
  * A thread MIPS CPU context
- **/
+ */
 typedef struct {
 	/* Saved main processor registers. */
 	__u64 regs[32];
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
old mode 100755
new mode 100644
index 75869c55f..7030332ad
--- a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
@@ -18,18 +18,18 @@
 
 /* refer to linux-3.10/include/uapi/asm-generic/ucontext.h */
 struct k_ucontext{
-    unsigned long uc_flags;
-    struct k_ucontext *uc_link;
-    stack_t uc_stack;
-    struct sigcontext uc_mcontext;
-    k_rtsigset_t uc_sigmask;
+	unsigned long uc_flags;
+	struct k_ucontext *uc_link;
+	stack_t uc_stack;
+	struct sigcontext uc_mcontext;
+	k_rtsigset_t uc_sigmask;
 };
 
 /* Copy from the kernel source arch/mips/kernel/signal.c */
 struct rt_sigframe {
 	u32 rs_ass[4];		/* argument save space for o32 */
 	u32 rs_pad[2];		/* Was: signal trampoline */
-        siginfo_t rs_info;
+	siginfo_t rs_info;
 	struct k_ucontext rs_uc;
 };
 
@@ -44,14 +44,14 @@ struct rt_sigframe {
 #define RT_SIGFRAME_OFFSET(rt_sigframe)	0
 
 
-#define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)				\
-	asm volatile(							\
-		     "move $29, %0				    \n"	\
-		     "li $2,  "__stringify(__NR_rt_sigreturn)"  \n" \
-		     "syscall					    \n"	\
-		     :							\
-		     : "r"(new_sp)					\
-		     : "$29","$2","memory")
+#define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)			\
+	asm volatile(						\
+	"move $29, %0					\n"	\
+	"li $2,  "__stringify(__NR_rt_sigreturn)"	\n"	\
+	"syscall					\n"	\
+	:							\
+	: "r"(new_sp)						\
+	: "$29","$2","memory")
 
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
 		struct rt_sigframe *rsigframe);
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
old mode 100755
new mode 100644
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
old mode 100755
new mode 100644
index 29cd511c9..d8c03c33a
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -17,26 +17,27 @@
 #include "infect-priv.h"
 #include "log.h"
 #include "common/bug.h"
+
 /*
  * Injected syscall instruction
  * mips64el is Little Endian
  */
 const char code_syscall[] = {
-    0x0c, 0x00, 0x00, 0x00,   /* syscall    */
-    0x0d, 0x00, 0x00, 0x00   /*  break      */
+	0x0c, 0x00, 0x00, 0x00,   /* syscall    */
+	0x0d, 0x00, 0x00, 0x00   /*  break      */
 };
 
 /* 10-byte legacy floating point register */
 struct fpreg {
-	uint16_t			significand[4];
-	uint16_t			exponent;
+	uint16_t significand[4];
+	uint16_t exponent;
 };
 
 /* 16-byte floating point register */
 struct fpxreg {
-	uint16_t			significand[4];
-	uint16_t			exponent;
-	uint16_t			padding[3];
+	uint16_t significand[4];
+	uint16_t exponent;
+	uint16_t padding[3];
 };
 
 
@@ -44,82 +45,82 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 			      user_regs_struct_t *regs,
 			      user_fpregs_struct_t *fpregs)
 {
-    sigframe->rs_uc.uc_mcontext.sc_regs[0] = regs->regs[0];
-    sigframe->rs_uc.uc_mcontext.sc_regs[1] = regs->regs[1];
-    sigframe->rs_uc.uc_mcontext.sc_regs[2] = regs->regs[2];
-    sigframe->rs_uc.uc_mcontext.sc_regs[3] = regs->regs[3];
-    sigframe->rs_uc.uc_mcontext.sc_regs[4] = regs->regs[4];
-    sigframe->rs_uc.uc_mcontext.sc_regs[5] = regs->regs[5];
-    sigframe->rs_uc.uc_mcontext.sc_regs[6] = regs->regs[6];
-    sigframe->rs_uc.uc_mcontext.sc_regs[7] = regs->regs[7];
-    sigframe->rs_uc.uc_mcontext.sc_regs[8] = regs->regs[8];
-    sigframe->rs_uc.uc_mcontext.sc_regs[9] = regs->regs[9];
-    sigframe->rs_uc.uc_mcontext.sc_regs[10] = regs->regs[10];
-    sigframe->rs_uc.uc_mcontext.sc_regs[11] = regs->regs[11];
-    sigframe->rs_uc.uc_mcontext.sc_regs[12] = regs->regs[12];
-    sigframe->rs_uc.uc_mcontext.sc_regs[13] = regs->regs[13];
-    sigframe->rs_uc.uc_mcontext.sc_regs[14] = regs->regs[14];
-    sigframe->rs_uc.uc_mcontext.sc_regs[15] = regs->regs[15];
-    sigframe->rs_uc.uc_mcontext.sc_regs[16] = regs->regs[16];
-    sigframe->rs_uc.uc_mcontext.sc_regs[17] = regs->regs[17];
-    sigframe->rs_uc.uc_mcontext.sc_regs[18] = regs->regs[18];
-    sigframe->rs_uc.uc_mcontext.sc_regs[19] = regs->regs[19];
-    sigframe->rs_uc.uc_mcontext.sc_regs[20] = regs->regs[20];
-    sigframe->rs_uc.uc_mcontext.sc_regs[21] = regs->regs[21];
-    sigframe->rs_uc.uc_mcontext.sc_regs[22] = regs->regs[22];
-    sigframe->rs_uc.uc_mcontext.sc_regs[23] = regs->regs[23];
-    sigframe->rs_uc.uc_mcontext.sc_regs[24] = regs->regs[24];
-    sigframe->rs_uc.uc_mcontext.sc_regs[25] = regs->regs[25];
-    sigframe->rs_uc.uc_mcontext.sc_regs[26] = regs->regs[26];
-    sigframe->rs_uc.uc_mcontext.sc_regs[27] = regs->regs[27];
-    sigframe->rs_uc.uc_mcontext.sc_regs[28] = regs->regs[28];
-    sigframe->rs_uc.uc_mcontext.sc_regs[29] = regs->regs[29];
-    sigframe->rs_uc.uc_mcontext.sc_regs[30] = regs->regs[30];
-    sigframe->rs_uc.uc_mcontext.sc_regs[31] = regs->regs[31];
-    sigframe->rs_uc.uc_mcontext.sc_mdlo = regs->lo;
-    sigframe->rs_uc.uc_mcontext.sc_mdhi = regs->hi;
-    sigframe->rs_uc.uc_mcontext.sc_pc = regs->cp0_epc;
+	sigframe->rs_uc.uc_mcontext.sc_regs[0] = regs->regs[0];
+	sigframe->rs_uc.uc_mcontext.sc_regs[1] = regs->regs[1];
+	sigframe->rs_uc.uc_mcontext.sc_regs[2] = regs->regs[2];
+	sigframe->rs_uc.uc_mcontext.sc_regs[3] = regs->regs[3];
+	sigframe->rs_uc.uc_mcontext.sc_regs[4] = regs->regs[4];
+	sigframe->rs_uc.uc_mcontext.sc_regs[5] = regs->regs[5];
+	sigframe->rs_uc.uc_mcontext.sc_regs[6] = regs->regs[6];
+	sigframe->rs_uc.uc_mcontext.sc_regs[7] = regs->regs[7];
+	sigframe->rs_uc.uc_mcontext.sc_regs[8] = regs->regs[8];
+	sigframe->rs_uc.uc_mcontext.sc_regs[9] = regs->regs[9];
+	sigframe->rs_uc.uc_mcontext.sc_regs[10] = regs->regs[10];
+	sigframe->rs_uc.uc_mcontext.sc_regs[11] = regs->regs[11];
+	sigframe->rs_uc.uc_mcontext.sc_regs[12] = regs->regs[12];
+	sigframe->rs_uc.uc_mcontext.sc_regs[13] = regs->regs[13];
+	sigframe->rs_uc.uc_mcontext.sc_regs[14] = regs->regs[14];
+	sigframe->rs_uc.uc_mcontext.sc_regs[15] = regs->regs[15];
+	sigframe->rs_uc.uc_mcontext.sc_regs[16] = regs->regs[16];
+	sigframe->rs_uc.uc_mcontext.sc_regs[17] = regs->regs[17];
+	sigframe->rs_uc.uc_mcontext.sc_regs[18] = regs->regs[18];
+	sigframe->rs_uc.uc_mcontext.sc_regs[19] = regs->regs[19];
+	sigframe->rs_uc.uc_mcontext.sc_regs[20] = regs->regs[20];
+	sigframe->rs_uc.uc_mcontext.sc_regs[21] = regs->regs[21];
+	sigframe->rs_uc.uc_mcontext.sc_regs[22] = regs->regs[22];
+	sigframe->rs_uc.uc_mcontext.sc_regs[23] = regs->regs[23];
+	sigframe->rs_uc.uc_mcontext.sc_regs[24] = regs->regs[24];
+	sigframe->rs_uc.uc_mcontext.sc_regs[25] = regs->regs[25];
+	sigframe->rs_uc.uc_mcontext.sc_regs[26] = regs->regs[26];
+	sigframe->rs_uc.uc_mcontext.sc_regs[27] = regs->regs[27];
+	sigframe->rs_uc.uc_mcontext.sc_regs[28] = regs->regs[28];
+	sigframe->rs_uc.uc_mcontext.sc_regs[29] = regs->regs[29];
+	sigframe->rs_uc.uc_mcontext.sc_regs[30] = regs->regs[30];
+	sigframe->rs_uc.uc_mcontext.sc_regs[31] = regs->regs[31];
+	sigframe->rs_uc.uc_mcontext.sc_mdlo = regs->lo;
+	sigframe->rs_uc.uc_mcontext.sc_mdhi = regs->hi;
+	sigframe->rs_uc.uc_mcontext.sc_pc = regs->cp0_epc;
 
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[0] = fpregs->regs[0];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[1] = fpregs->regs[1];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[2] = fpregs->regs[2];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[3] = fpregs->regs[3];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[4] = fpregs->regs[4];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[5] = fpregs->regs[5];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[6] = fpregs->regs[6];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[7] = fpregs->regs[7];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[8] = fpregs->regs[8];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[9] = fpregs->regs[9];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[10] = fpregs->regs[10];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[11] = fpregs->regs[11];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[12] = fpregs->regs[12];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[13] = fpregs->regs[13];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[14] = fpregs->regs[14];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[15] = fpregs->regs[15];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[16] = fpregs->regs[16];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[17] = fpregs->regs[17];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[18] = fpregs->regs[18];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[19] = fpregs->regs[19];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[20] = fpregs->regs[20];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[21] = fpregs->regs[21];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[22] = fpregs->regs[22];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[23] = fpregs->regs[23];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[24] = fpregs->regs[24];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[25] = fpregs->regs[25];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[26] = fpregs->regs[26];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[27] = fpregs->regs[27];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[28] = fpregs->regs[28];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[29] = fpregs->regs[29];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[30] = fpregs->regs[30];
-    sigframe->rs_uc.uc_mcontext.sc_fpregs[31] = fpregs->regs[31];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[0] = fpregs->regs[0];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[1] = fpregs->regs[1];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[2] = fpregs->regs[2];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[3] = fpregs->regs[3];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[4] = fpregs->regs[4];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[5] = fpregs->regs[5];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[6] = fpregs->regs[6];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[7] = fpregs->regs[7];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[8] = fpregs->regs[8];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[9] = fpregs->regs[9];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[10] = fpregs->regs[10];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[11] = fpregs->regs[11];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[12] = fpregs->regs[12];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[13] = fpregs->regs[13];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[14] = fpregs->regs[14];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[15] = fpregs->regs[15];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[16] = fpregs->regs[16];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[17] = fpregs->regs[17];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[18] = fpregs->regs[18];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[19] = fpregs->regs[19];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[20] = fpregs->regs[20];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[21] = fpregs->regs[21];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[22] = fpregs->regs[22];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[23] = fpregs->regs[23];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[24] = fpregs->regs[24];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[25] = fpregs->regs[25];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[26] = fpregs->regs[26];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[27] = fpregs->regs[27];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[28] = fpregs->regs[28];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[29] = fpregs->regs[29];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[30] = fpregs->regs[30];
+	sigframe->rs_uc.uc_mcontext.sc_fpregs[31] = fpregs->regs[31];
 
-    return 0;
+	return 0;
 }
 
 int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
 				   struct rt_sigframe *rsigframe)
 {
-    return 0;
+	return 0;
 }
 
 int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
@@ -132,26 +133,26 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
 
 	if (ptrace(PTRACE_GETFPREGS, pid, NULL, xs)) {
-	    pr_perror("Can't obtain FPU registers for %d", pid);
-	    return ret;
+		pr_perror("Can't obtain FPU registers for %d", pid);
+		return ret;
 	}
 
 	/*Restart the system call*/
-	if (regs->regs[0]){
-	    switch ((long)(int)regs->regs[2]) {
+	if (regs->regs[0]) {
+		switch ((long)(int)regs->regs[2]) {
 		case ERESTARTNOHAND:
 		case ERESTARTSYS:
 		case ERESTARTNOINTR:
-		    regs->regs[2] =  regs->regs[0];
-		    regs->regs[7] = regs->regs[26];
-		    regs->cp0_epc -= 4;
-		    break;
+			regs->regs[2] =  regs->regs[0];
+			regs->regs[7] = regs->regs[26];
+			regs->cp0_epc -= 4;
+			break;
 		case ERESTART_RESTARTBLOCK:
-		    pr_warn("Will restore %d with interrupted system call\n", pid);
-		    regs->regs[2] = -EINTR;
-		    break;
-	    }
-	    regs->regs[0] = 0;
+			pr_warn("Will restore %d with interrupted system call\n", pid);
+			regs->regs[2] = -EINTR;
+			break;
+		}
+		regs->regs[0] = 0;
 	}
 
 	ret = save(arg, regs, xs);
@@ -177,7 +178,7 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 		unsigned long arg5,
 		unsigned long arg6)
 {
-        /*refer to glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/syscall.S*/
+	/*refer to glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/syscall.S*/
 	user_regs_struct_t regs = ctl->orig.regs;
 	int err;
 
@@ -203,7 +204,7 @@ void *remote_mmap(struct parasite_ctl *ctl,
 	int err;
 
 	err = compel_syscall(ctl, __NR_mmap, &map,
-			(unsigned long)addr, length, prot, flags, fd, offset >> PAGE_SHIFT);
+		(unsigned long)addr, length, prot, flags, fd, offset >> PAGE_SHIFT);
 
 	if (err < 0 || IS_ERR_VALUE(map)) {
 		pr_err("remote mmap() failed: %s\n", strerror(-map));
@@ -218,38 +219,38 @@ void *remote_mmap(struct parasite_ctl *ctl,
  */
 void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
 {
-    regs->cp0_epc = new_ip;
-    if (stack){
-	  /* regs[29] is sp */
-	regs->regs[29] = (unsigned long)stack;
-    }
+	regs->cp0_epc = new_ip;
+	if (stack) {
+		/* regs[29] is sp */
+		regs->regs[29] = (unsigned long)stack;
+	}
 }
 
 bool arch_can_dump_task(struct parasite_ctl *ctl)
 {
-    return true;
+	return true;
 }
 
 int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 {
-    long ret;
-    int err;
+	long ret;
+	int err;
 
-    err = compel_syscall(ctl, __NR_sigaltstack,
+	err = compel_syscall(ctl, __NR_sigaltstack,
 			 &ret, 0, (unsigned long)&s->rs_uc.uc_stack,
 			 0, 0, 0, 0);
-    return err ? err : ret;
+	return err ? err : ret;
 }
 
 
 int ptrace_set_breakpoint(pid_t pid, void *addr)
 {
-    return 0;
+	return 0;
 }
 
 int ptrace_flush_breakpoints(pid_t pid)
 {
-    return 0;
+	return 0;
 }
 
 /*refer to kernel linux-3.10/arch/mips/include/asm/processor.h*/
@@ -265,7 +266,7 @@ unsigned long compel_task_size(void) { return TASK_SIZE; }
  */
 int ptrace_get_regs(int pid, user_regs_struct_t *regs)
 {
-    return ptrace(PTRACE_GETREGS, pid, NULL, regs);
+	return ptrace(PTRACE_GETREGS, pid, NULL, regs);
 }
 
 /*
@@ -273,7 +274,7 @@ int ptrace_get_regs(int pid, user_regs_struct_t *regs)
  */
 int ptrace_set_regs(int pid, user_regs_struct_t *regs)
 {
-    return ptrace(PTRACE_SETREGS, pid, NULL, regs);
+	return ptrace(PTRACE_SETREGS, pid, NULL, regs);
 }
 
 void compel_relocs_apply_mips(void *mem, void *vbase, struct parasite_blob_desc *pbd)
@@ -282,45 +283,41 @@ void compel_relocs_apply_mips(void *mem, void *vbase, struct parasite_blob_desc
 	size_t nr_relocs = pbd->hdr.nr_relocs;
 	size_t i, j;
 
-      /*
-       * mips rebasing :load time relocation
-       * parasite.built-in.o and restorer.built-in.o is ELF 64-bit LSB relocatable for mips.
-       * so we have to relocate some type for R_MIPS_26 R_MIPS_HIGHEST R_MIPS_HIGHER R_MIPS_HI16 and R_MIPS_LO16 in there.
-       * for mips64el .if toload/store data or jump instruct ,need to relocation R_TYPE
-       */
-    for (i = 0, j = 0; i < nr_relocs; i++) {
-	if (elf_relocs[i].type & COMPEL_TYPE_MIPS_26) {
-	    int *where = (mem + elf_relocs[i].offset);
-	    *where = *where | ((elf_relocs[i].addend + ((unsigned long)vbase & 0x00fffffff) /*low 28 bit*/)>>2);
+	/*
+	 * mips rebasing :load time relocation
+	 * parasite.built-in.o and restorer.built-in.o is ELF 64-bit LSB relocatable for mips.
+	 * so we have to relocate some type for R_MIPS_26 R_MIPS_HIGHEST R_MIPS_HIGHER R_MIPS_HI16 and R_MIPS_LO16 in there.
+	 * for mips64el .if toload/store data or jump instruct ,need to relocation R_TYPE
+	 */
+	for (i = 0, j = 0; i < nr_relocs; i++) {
+		if (elf_relocs[i].type & COMPEL_TYPE_MIPS_26) {
+			int *where = (mem + elf_relocs[i].offset);
+			*where = *where | ((elf_relocs[i].addend + ((unsigned long)vbase & 0x00fffffff) /*low 28 bit*/)>>2);
+		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_64) {
+			unsigned long *where = (mem + elf_relocs[i].offset);
+			*where = elf_relocs[i].addend + (unsigned long)vbase;
+		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HI16) {
+			/* refer to binutils mips.cc */
+			int *where = (mem + elf_relocs[i].offset);
+			int v_lo16 = (unsigned long)vbase &0x00ffff;
 
-	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_64) {
-	    unsigned long *where = (mem + elf_relocs[i].offset);
-	    *where = elf_relocs[i].addend + (unsigned long)vbase;
-
-	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HI16) {
-	      /* refer to binutils mips.cc */
-	    int *where = (mem + elf_relocs[i].offset);
-	    int v_lo16 = (unsigned long)vbase &0x00ffff;
-
-	    if ((v_lo16+elf_relocs[i].value+elf_relocs[i].addend) >= 0x8000){
-		*where = *where | ((((unsigned long)vbase>>16) &0xffff)+0x1);
-	    } else {
-		*where = *where | ((((unsigned long)vbase>>16) &0xffff));
-	    }
-
-	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_LO16) {
-	    int *where = (mem + elf_relocs[i].offset);
-	    int v_lo16 = (unsigned long)vbase &0x00ffff;
-	    *where = *where | ((v_lo16 + elf_relocs[i].addend) & 0xffff);
-
-	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHER) {
-	    int *where = (mem + elf_relocs[i].offset);
-	    *where = *where | ((( (unsigned long)vbase + (uint64_t) 0x80008000) >> 32) & 0xffff);
-
-	} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHEST) {
-	    int *where = (mem + elf_relocs[i].offset);
-	    *where = *where | ((( (unsigned long)vbase + (uint64_t) 0x800080008000llu) >> 48) & 0xffff);
-	} else
-	    BUG();
-    }
+			if ((v_lo16+elf_relocs[i].value+elf_relocs[i].addend) >= 0x8000) {
+				*where = *where | ((((unsigned long)vbase>>16) &0xffff)+0x1);
+			} else {
+				*where = *where | ((((unsigned long)vbase>>16) &0xffff));
+			}
+		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_LO16) {
+			int *where = (mem + elf_relocs[i].offset);
+			int v_lo16 = (unsigned long)vbase &0x00ffff;
+			*where = *where | ((v_lo16 + elf_relocs[i].addend) & 0xffff);
+		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHER) {
+			int *where = (mem + elf_relocs[i].offset);
+			*where = *where | ((( (unsigned long)vbase + (uint64_t) 0x80008000) >> 32) & 0xffff);
+		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHEST) {
+			int *where = (mem + elf_relocs[i].offset);
+			*where = *where | ((( (unsigned long)vbase + (uint64_t) 0x800080008000llu) >> 48) & 0xffff);
+		} else {
+			BUG();
+		}
+	}
 }
diff --git a/criu/arch/mips/Makefile b/criu/arch/mips/Makefile
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/cpu.c b/criu/arch/mips/cpu.c
old mode 100755
new mode 100644
index 484698e4f..f76afc2a2
--- a/criu/arch/mips/cpu.c
+++ b/criu/arch/mips/cpu.c
@@ -25,29 +25,29 @@
 
 int cpu_init(void)
 {
-    return 0;
+	return 0;
 }
 
 int cpu_dump_cpuinfo(void)
 {
-    return 0;
+	return 0;
 }
 
 int cpu_validate_cpuinfo(void)
 {
-    return 0;
+	return 0;
 }
 
 int cpuinfo_dump(void)
 {
-    if (cpu_init())
-	return -1;
-    if (cpu_dump_cpuinfo())
-	return -1;
-    return 0;
+	if (cpu_init())
+		return -1;
+	if (cpu_dump_cpuinfo())
+		return -1;
+	return 0;
 }
 
 int cpuinfo_check(void)
 {
-    return 0;
+	return 0;
 }
diff --git a/criu/arch/mips/crtools.c b/criu/arch/mips/crtools.c
old mode 100755
new mode 100644
index 0e40428aa..72bd2c303
--- a/criu/arch/mips/crtools.c
+++ b/criu/arch/mips/crtools.c
@@ -30,223 +30,223 @@
 
 int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
-    CoreEntry *core = x;
+	CoreEntry *core = x;
 
-      /* Save the MIPS CPU state */
-    core->ti_mips->gpregs->r0 = regs->regs[0];
-    core->ti_mips->gpregs->r1 = regs->regs[1];
-    core->ti_mips->gpregs->r2 = regs->regs[2];
-    core->ti_mips->gpregs->r3 = regs->regs[3];
-    core->ti_mips->gpregs->r4 = regs->regs[4];
-    core->ti_mips->gpregs->r5 = regs->regs[5];
-    core->ti_mips->gpregs->r6 = regs->regs[6];
-    core->ti_mips->gpregs->r7 = regs->regs[7];
-    core->ti_mips->gpregs->r8 = regs->regs[8];
-    core->ti_mips->gpregs->r9 = regs->regs[9];
-    core->ti_mips->gpregs->r10 = regs->regs[10];
-    core->ti_mips->gpregs->r11 = regs->regs[11];
-    core->ti_mips->gpregs->r12 = regs->regs[12];
-    core->ti_mips->gpregs->r13 = regs->regs[13];
-    core->ti_mips->gpregs->r14 = regs->regs[14];
-    core->ti_mips->gpregs->r15 = regs->regs[15];
-    core->ti_mips->gpregs->r16 = regs->regs[16];
-    core->ti_mips->gpregs->r17 = regs->regs[17];
-    core->ti_mips->gpregs->r18 = regs->regs[18];
-    core->ti_mips->gpregs->r19 = regs->regs[19];
-    core->ti_mips->gpregs->r20 = regs->regs[20];
-    core->ti_mips->gpregs->r21 = regs->regs[21];
-    core->ti_mips->gpregs->r22 = regs->regs[22];
-    core->ti_mips->gpregs->r23 = regs->regs[23];
-    core->ti_mips->gpregs->r24 = regs->regs[24];
-    core->ti_mips->gpregs->r25 = regs->regs[25];
-    core->ti_mips->gpregs->r26 = regs->regs[26];
-    core->ti_mips->gpregs->r27 = regs->regs[27];
-    core->ti_mips->gpregs->r28 = regs->regs[28];
-    core->ti_mips->gpregs->r29 = regs->regs[29];
-    core->ti_mips->gpregs->r30 = regs->regs[30];
-    core->ti_mips->gpregs->r31 = regs->regs[31];
+	/* Save the MIPS CPU state */
+	core->ti_mips->gpregs->r0 = regs->regs[0];
+	core->ti_mips->gpregs->r1 = regs->regs[1];
+	core->ti_mips->gpregs->r2 = regs->regs[2];
+	core->ti_mips->gpregs->r3 = regs->regs[3];
+	core->ti_mips->gpregs->r4 = regs->regs[4];
+	core->ti_mips->gpregs->r5 = regs->regs[5];
+	core->ti_mips->gpregs->r6 = regs->regs[6];
+	core->ti_mips->gpregs->r7 = regs->regs[7];
+	core->ti_mips->gpregs->r8 = regs->regs[8];
+	core->ti_mips->gpregs->r9 = regs->regs[9];
+	core->ti_mips->gpregs->r10 = regs->regs[10];
+	core->ti_mips->gpregs->r11 = regs->regs[11];
+	core->ti_mips->gpregs->r12 = regs->regs[12];
+	core->ti_mips->gpregs->r13 = regs->regs[13];
+	core->ti_mips->gpregs->r14 = regs->regs[14];
+	core->ti_mips->gpregs->r15 = regs->regs[15];
+	core->ti_mips->gpregs->r16 = regs->regs[16];
+	core->ti_mips->gpregs->r17 = regs->regs[17];
+	core->ti_mips->gpregs->r18 = regs->regs[18];
+	core->ti_mips->gpregs->r19 = regs->regs[19];
+	core->ti_mips->gpregs->r20 = regs->regs[20];
+	core->ti_mips->gpregs->r21 = regs->regs[21];
+	core->ti_mips->gpregs->r22 = regs->regs[22];
+	core->ti_mips->gpregs->r23 = regs->regs[23];
+	core->ti_mips->gpregs->r24 = regs->regs[24];
+	core->ti_mips->gpregs->r25 = regs->regs[25];
+	core->ti_mips->gpregs->r26 = regs->regs[26];
+	core->ti_mips->gpregs->r27 = regs->regs[27];
+	core->ti_mips->gpregs->r28 = regs->regs[28];
+	core->ti_mips->gpregs->r29 = regs->regs[29];
+	core->ti_mips->gpregs->r30 = regs->regs[30];
+	core->ti_mips->gpregs->r31 = regs->regs[31];
 
-    core->ti_mips->gpregs->lo = regs->lo;
-    core->ti_mips->gpregs->hi = regs->hi;
-    core->ti_mips->gpregs->cp0_epc = regs->cp0_epc;
-    core->ti_mips->gpregs->cp0_badvaddr = regs->cp0_badvaddr;
-    core->ti_mips->gpregs->cp0_status = regs->cp0_status;
-    core->ti_mips->gpregs->cp0_cause = regs->cp0_cause;
+	core->ti_mips->gpregs->lo = regs->lo;
+	core->ti_mips->gpregs->hi = regs->hi;
+	core->ti_mips->gpregs->cp0_epc = regs->cp0_epc;
+	core->ti_mips->gpregs->cp0_badvaddr = regs->cp0_badvaddr;
+	core->ti_mips->gpregs->cp0_status = regs->cp0_status;
+	core->ti_mips->gpregs->cp0_cause = regs->cp0_cause;
 
-    core->ti_mips->fpregs->r0 = fpregs->regs[0];
-    core->ti_mips->fpregs->r1 = fpregs->regs[1];
-    core->ti_mips->fpregs->r2 = fpregs->regs[2];
-    core->ti_mips->fpregs->r3 = fpregs->regs[3];
-    core->ti_mips->fpregs->r4 = fpregs->regs[4];
-    core->ti_mips->fpregs->r5 = fpregs->regs[5];
-    core->ti_mips->fpregs->r6 = fpregs->regs[6];
-    core->ti_mips->fpregs->r7 = fpregs->regs[7];
-    core->ti_mips->fpregs->r8 = fpregs->regs[8];
-    core->ti_mips->fpregs->r9 = fpregs->regs[9];
-    core->ti_mips->fpregs->r10 = fpregs->regs[10];
-    core->ti_mips->fpregs->r11 = fpregs->regs[11];
-    core->ti_mips->fpregs->r12 = fpregs->regs[12];
-    core->ti_mips->fpregs->r13 = fpregs->regs[13];
-    core->ti_mips->fpregs->r14 = fpregs->regs[14];
-    core->ti_mips->fpregs->r15 = fpregs->regs[15];
-    core->ti_mips->fpregs->r16 = fpregs->regs[16];
-    core->ti_mips->fpregs->r17 = fpregs->regs[17];
-    core->ti_mips->fpregs->r18 = fpregs->regs[18];
-    core->ti_mips->fpregs->r19 = fpregs->regs[19];
-    core->ti_mips->fpregs->r20 = fpregs->regs[20];
-    core->ti_mips->fpregs->r21 = fpregs->regs[21];
-    core->ti_mips->fpregs->r22 = fpregs->regs[22];
-    core->ti_mips->fpregs->r23 = fpregs->regs[23];
-    core->ti_mips->fpregs->r24 = fpregs->regs[24];
-    core->ti_mips->fpregs->r25 = fpregs->regs[25];
-    core->ti_mips->fpregs->r26 = fpregs->regs[26];
-    core->ti_mips->fpregs->r27 = fpregs->regs[27];
-    core->ti_mips->fpregs->r28 = fpregs->regs[28];
-    core->ti_mips->fpregs->r29 = fpregs->regs[29];
-    core->ti_mips->fpregs->r30 = fpregs->regs[30];
-    core->ti_mips->fpregs->r31 = fpregs->regs[31];
-    core->ti_mips->fpregs->fpu_fcr31 = fpregs->fpu_fcr31;
-    core->ti_mips->fpregs->fpu_id = fpregs->fpu_id;
+	core->ti_mips->fpregs->r0 = fpregs->regs[0];
+	core->ti_mips->fpregs->r1 = fpregs->regs[1];
+	core->ti_mips->fpregs->r2 = fpregs->regs[2];
+	core->ti_mips->fpregs->r3 = fpregs->regs[3];
+	core->ti_mips->fpregs->r4 = fpregs->regs[4];
+	core->ti_mips->fpregs->r5 = fpregs->regs[5];
+	core->ti_mips->fpregs->r6 = fpregs->regs[6];
+	core->ti_mips->fpregs->r7 = fpregs->regs[7];
+	core->ti_mips->fpregs->r8 = fpregs->regs[8];
+	core->ti_mips->fpregs->r9 = fpregs->regs[9];
+	core->ti_mips->fpregs->r10 = fpregs->regs[10];
+	core->ti_mips->fpregs->r11 = fpregs->regs[11];
+	core->ti_mips->fpregs->r12 = fpregs->regs[12];
+	core->ti_mips->fpregs->r13 = fpregs->regs[13];
+	core->ti_mips->fpregs->r14 = fpregs->regs[14];
+	core->ti_mips->fpregs->r15 = fpregs->regs[15];
+	core->ti_mips->fpregs->r16 = fpregs->regs[16];
+	core->ti_mips->fpregs->r17 = fpregs->regs[17];
+	core->ti_mips->fpregs->r18 = fpregs->regs[18];
+	core->ti_mips->fpregs->r19 = fpregs->regs[19];
+	core->ti_mips->fpregs->r20 = fpregs->regs[20];
+	core->ti_mips->fpregs->r21 = fpregs->regs[21];
+	core->ti_mips->fpregs->r22 = fpregs->regs[22];
+	core->ti_mips->fpregs->r23 = fpregs->regs[23];
+	core->ti_mips->fpregs->r24 = fpregs->regs[24];
+	core->ti_mips->fpregs->r25 = fpregs->regs[25];
+	core->ti_mips->fpregs->r26 = fpregs->regs[26];
+	core->ti_mips->fpregs->r27 = fpregs->regs[27];
+	core->ti_mips->fpregs->r28 = fpregs->regs[28];
+	core->ti_mips->fpregs->r29 = fpregs->regs[29];
+	core->ti_mips->fpregs->r30 = fpregs->regs[30];
+	core->ti_mips->fpregs->r31 = fpregs->regs[31];
+	core->ti_mips->fpregs->fpu_fcr31 = fpregs->fpu_fcr31;
+	core->ti_mips->fpregs->fpu_id = fpregs->fpu_id;
 
-    return 0;
+	return 0;
 }
 
 int arch_alloc_thread_info(CoreEntry *core)
 {
-    ThreadInfoMips *ti_mips;
-    UserMipsRegsEntry *gpregs;
-    UserMipsFpregsEntry *fpregs;
+	ThreadInfoMips *ti_mips;
+	UserMipsRegsEntry *gpregs;
+	UserMipsFpregsEntry *fpregs;
 
-    ti_mips = xmalloc(sizeof(*ti_mips));
-    if (!ti_mips)
-	goto err;
+	ti_mips = xmalloc(sizeof(*ti_mips));
+	if (!ti_mips)
+		goto err;
 
-    thread_info_mips__init(ti_mips);
-    core->ti_mips = ti_mips;
+	thread_info_mips__init(ti_mips);
+	core->ti_mips = ti_mips;
 
-    gpregs = xmalloc(sizeof(*gpregs));
-    if (!gpregs){
-	xfree(ti_mips);
-	goto err;
-    }
+	gpregs = xmalloc(sizeof(*gpregs));
+	if (!gpregs) {
+		xfree(ti_mips);
+		goto err;
+	}
 
-    user_mips_regs_entry__init(gpregs);
-    ti_mips->gpregs = gpregs;
+	user_mips_regs_entry__init(gpregs);
+	ti_mips->gpregs = gpregs;
 
-    fpregs = xmalloc(sizeof(*fpregs));
-    if (!fpregs){
-	xfree(ti_mips);
-	xfree(gpregs);
-	goto err;
-    }
+	fpregs = xmalloc(sizeof(*fpregs));
+	if (!fpregs) {
+		xfree(ti_mips);
+		xfree(gpregs);
+		goto err;
+	}
 
-    user_mips_fpregs_entry__init(fpregs);
-    ti_mips->fpregs = fpregs;
+	user_mips_fpregs_entry__init(fpregs);
+	ti_mips->fpregs = fpregs;
 
-    return 0;
+	return 0;
 err:
-    return -1;
+	return -1;
 }
 
 void arch_free_thread_info(CoreEntry *core)
 {
-    if (!core->ti_mips)
-	return;
+	if (!core->ti_mips)
+		return;
 
-    if (core->ti_mips->gpregs)
-	xfree(core->ti_mips->gpregs);
+	if (core->ti_mips->gpregs)
+		xfree(core->ti_mips->gpregs);
 
-    if (core->ti_mips->fpregs)
-	xfree(core->ti_mips->fpregs);
+	if (core->ti_mips->fpregs)
+		xfree(core->ti_mips->fpregs);
 
-    xfree(core->ti_mips);
+	xfree(core->ti_mips);
 }
 
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 {
-    struct rt_sigframe *f = sigframe;
-    UserMipsFpregsEntry *r = core->ti_mips->fpregs;
+	struct rt_sigframe *f = sigframe;
+	UserMipsFpregsEntry *r = core->ti_mips->fpregs;
 
-    f->rs_uc.uc_mcontext.sc_fpregs[0] = r->r0;
-    f->rs_uc.uc_mcontext.sc_fpregs[1] = r->r1;
-    f->rs_uc.uc_mcontext.sc_fpregs[2] = r->r2;
-    f->rs_uc.uc_mcontext.sc_fpregs[3] = r->r3;
-    f->rs_uc.uc_mcontext.sc_fpregs[4] = r->r4;
-    f->rs_uc.uc_mcontext.sc_fpregs[5] = r->r5;
-    f->rs_uc.uc_mcontext.sc_fpregs[6] = r->r6;
-    f->rs_uc.uc_mcontext.sc_fpregs[7] = r->r7;
-    f->rs_uc.uc_mcontext.sc_fpregs[8] = r->r8;
-    f->rs_uc.uc_mcontext.sc_fpregs[9] = r->r9;
-    f->rs_uc.uc_mcontext.sc_fpregs[10] = r->r10;
-    f->rs_uc.uc_mcontext.sc_fpregs[11] = r->r11;
-    f->rs_uc.uc_mcontext.sc_fpregs[12] = r->r12;
-    f->rs_uc.uc_mcontext.sc_fpregs[13] = r->r13;
-    f->rs_uc.uc_mcontext.sc_fpregs[14] = r->r14;
-    f->rs_uc.uc_mcontext.sc_fpregs[15] = r->r15;
-    f->rs_uc.uc_mcontext.sc_fpregs[16] = r->r16;
-    f->rs_uc.uc_mcontext.sc_fpregs[17] = r->r17;
-    f->rs_uc.uc_mcontext.sc_fpregs[18] = r->r18;
-    f->rs_uc.uc_mcontext.sc_fpregs[19] = r->r19;
-    f->rs_uc.uc_mcontext.sc_fpregs[20] = r->r20;
-    f->rs_uc.uc_mcontext.sc_fpregs[21] = r->r21;
-    f->rs_uc.uc_mcontext.sc_fpregs[22] = r->r22;
-    f->rs_uc.uc_mcontext.sc_fpregs[23] = r->r23;
-    f->rs_uc.uc_mcontext.sc_fpregs[24] = r->r24;
-    f->rs_uc.uc_mcontext.sc_fpregs[25] = r->r25;
-    f->rs_uc.uc_mcontext.sc_fpregs[26] = r->r26;
-    f->rs_uc.uc_mcontext.sc_fpregs[27] = r->r27;
-    f->rs_uc.uc_mcontext.sc_fpregs[28] = r->r28;
-    f->rs_uc.uc_mcontext.sc_fpregs[29] = r->r29;
-    f->rs_uc.uc_mcontext.sc_fpregs[30] = r->r30;
-    f->rs_uc.uc_mcontext.sc_fpregs[31] = r->r31;
+	f->rs_uc.uc_mcontext.sc_fpregs[0] = r->r0;
+	f->rs_uc.uc_mcontext.sc_fpregs[1] = r->r1;
+	f->rs_uc.uc_mcontext.sc_fpregs[2] = r->r2;
+	f->rs_uc.uc_mcontext.sc_fpregs[3] = r->r3;
+	f->rs_uc.uc_mcontext.sc_fpregs[4] = r->r4;
+	f->rs_uc.uc_mcontext.sc_fpregs[5] = r->r5;
+	f->rs_uc.uc_mcontext.sc_fpregs[6] = r->r6;
+	f->rs_uc.uc_mcontext.sc_fpregs[7] = r->r7;
+	f->rs_uc.uc_mcontext.sc_fpregs[8] = r->r8;
+	f->rs_uc.uc_mcontext.sc_fpregs[9] = r->r9;
+	f->rs_uc.uc_mcontext.sc_fpregs[10] = r->r10;
+	f->rs_uc.uc_mcontext.sc_fpregs[11] = r->r11;
+	f->rs_uc.uc_mcontext.sc_fpregs[12] = r->r12;
+	f->rs_uc.uc_mcontext.sc_fpregs[13] = r->r13;
+	f->rs_uc.uc_mcontext.sc_fpregs[14] = r->r14;
+	f->rs_uc.uc_mcontext.sc_fpregs[15] = r->r15;
+	f->rs_uc.uc_mcontext.sc_fpregs[16] = r->r16;
+	f->rs_uc.uc_mcontext.sc_fpregs[17] = r->r17;
+	f->rs_uc.uc_mcontext.sc_fpregs[18] = r->r18;
+	f->rs_uc.uc_mcontext.sc_fpregs[19] = r->r19;
+	f->rs_uc.uc_mcontext.sc_fpregs[20] = r->r20;
+	f->rs_uc.uc_mcontext.sc_fpregs[21] = r->r21;
+	f->rs_uc.uc_mcontext.sc_fpregs[22] = r->r22;
+	f->rs_uc.uc_mcontext.sc_fpregs[23] = r->r23;
+	f->rs_uc.uc_mcontext.sc_fpregs[24] = r->r24;
+	f->rs_uc.uc_mcontext.sc_fpregs[25] = r->r25;
+	f->rs_uc.uc_mcontext.sc_fpregs[26] = r->r26;
+	f->rs_uc.uc_mcontext.sc_fpregs[27] = r->r27;
+	f->rs_uc.uc_mcontext.sc_fpregs[28] = r->r28;
+	f->rs_uc.uc_mcontext.sc_fpregs[29] = r->r29;
+	f->rs_uc.uc_mcontext.sc_fpregs[30] = r->r30;
+	f->rs_uc.uc_mcontext.sc_fpregs[31] = r->r31;
 
-    return 0;
+	return 0;
 }
 
 
 int restore_gpregs(struct rt_sigframe *f, UserMipsRegsEntry *r)
 {
-    f->rs_uc.uc_mcontext.sc_regs[0] = r->r0;
-    f->rs_uc.uc_mcontext.sc_regs[1] = r->r1;
-    f->rs_uc.uc_mcontext.sc_regs[2] = r->r2;
-    f->rs_uc.uc_mcontext.sc_regs[3] = r->r3;
-    f->rs_uc.uc_mcontext.sc_regs[4] = r->r4;
-    f->rs_uc.uc_mcontext.sc_regs[5] = r->r5;
-    f->rs_uc.uc_mcontext.sc_regs[6] = r->r6;
-    f->rs_uc.uc_mcontext.sc_regs[7] = r->r7;
-    f->rs_uc.uc_mcontext.sc_regs[8] = r->r8;
-    f->rs_uc.uc_mcontext.sc_regs[9] = r->r9;
-    f->rs_uc.uc_mcontext.sc_regs[10] = r->r10;
-    f->rs_uc.uc_mcontext.sc_regs[11] = r->r11;
-    f->rs_uc.uc_mcontext.sc_regs[12] = r->r12;
-    f->rs_uc.uc_mcontext.sc_regs[13] = r->r13;
-    f->rs_uc.uc_mcontext.sc_regs[14] = r->r14;
-    f->rs_uc.uc_mcontext.sc_regs[15] = r->r15;
-    f->rs_uc.uc_mcontext.sc_regs[16] = r->r16;
-    f->rs_uc.uc_mcontext.sc_regs[17] = r->r17;
-    f->rs_uc.uc_mcontext.sc_regs[18] = r->r18;
-    f->rs_uc.uc_mcontext.sc_regs[19] = r->r19;
-    f->rs_uc.uc_mcontext.sc_regs[20] = r->r20;
-    f->rs_uc.uc_mcontext.sc_regs[21] = r->r21;
-    f->rs_uc.uc_mcontext.sc_regs[22] = r->r22;
-    f->rs_uc.uc_mcontext.sc_regs[23] = r->r23;
-    f->rs_uc.uc_mcontext.sc_regs[24] = r->r24;
-    f->rs_uc.uc_mcontext.sc_regs[25] = r->r25;
-    f->rs_uc.uc_mcontext.sc_regs[26] = r->r26;
-    f->rs_uc.uc_mcontext.sc_regs[27] = r->r27;
-    f->rs_uc.uc_mcontext.sc_regs[28] = r->r28;
-    f->rs_uc.uc_mcontext.sc_regs[29] = r->r29;
-    f->rs_uc.uc_mcontext.sc_regs[30] = r->r30;
-    f->rs_uc.uc_mcontext.sc_regs[31] = r->r31;
+	f->rs_uc.uc_mcontext.sc_regs[0] = r->r0;
+	f->rs_uc.uc_mcontext.sc_regs[1] = r->r1;
+	f->rs_uc.uc_mcontext.sc_regs[2] = r->r2;
+	f->rs_uc.uc_mcontext.sc_regs[3] = r->r3;
+	f->rs_uc.uc_mcontext.sc_regs[4] = r->r4;
+	f->rs_uc.uc_mcontext.sc_regs[5] = r->r5;
+	f->rs_uc.uc_mcontext.sc_regs[6] = r->r6;
+	f->rs_uc.uc_mcontext.sc_regs[7] = r->r7;
+	f->rs_uc.uc_mcontext.sc_regs[8] = r->r8;
+	f->rs_uc.uc_mcontext.sc_regs[9] = r->r9;
+	f->rs_uc.uc_mcontext.sc_regs[10] = r->r10;
+	f->rs_uc.uc_mcontext.sc_regs[11] = r->r11;
+	f->rs_uc.uc_mcontext.sc_regs[12] = r->r12;
+	f->rs_uc.uc_mcontext.sc_regs[13] = r->r13;
+	f->rs_uc.uc_mcontext.sc_regs[14] = r->r14;
+	f->rs_uc.uc_mcontext.sc_regs[15] = r->r15;
+	f->rs_uc.uc_mcontext.sc_regs[16] = r->r16;
+	f->rs_uc.uc_mcontext.sc_regs[17] = r->r17;
+	f->rs_uc.uc_mcontext.sc_regs[18] = r->r18;
+	f->rs_uc.uc_mcontext.sc_regs[19] = r->r19;
+	f->rs_uc.uc_mcontext.sc_regs[20] = r->r20;
+	f->rs_uc.uc_mcontext.sc_regs[21] = r->r21;
+	f->rs_uc.uc_mcontext.sc_regs[22] = r->r22;
+	f->rs_uc.uc_mcontext.sc_regs[23] = r->r23;
+	f->rs_uc.uc_mcontext.sc_regs[24] = r->r24;
+	f->rs_uc.uc_mcontext.sc_regs[25] = r->r25;
+	f->rs_uc.uc_mcontext.sc_regs[26] = r->r26;
+	f->rs_uc.uc_mcontext.sc_regs[27] = r->r27;
+	f->rs_uc.uc_mcontext.sc_regs[28] = r->r28;
+	f->rs_uc.uc_mcontext.sc_regs[29] = r->r29;
+	f->rs_uc.uc_mcontext.sc_regs[30] = r->r30;
+	f->rs_uc.uc_mcontext.sc_regs[31] = r->r31;
 
-    f->rs_uc.uc_mcontext.sc_mdlo = r->lo;
-    f->rs_uc.uc_mcontext.sc_mdhi = r->hi;
-    f->rs_uc.uc_mcontext.sc_pc = r->cp0_epc;
+	f->rs_uc.uc_mcontext.sc_mdlo = r->lo;
+	f->rs_uc.uc_mcontext.sc_mdhi = r->hi;
+	f->rs_uc.uc_mcontext.sc_pc = r->cp0_epc;
 
-    return 0;
+	return 0;
 }
 
 int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info)
 {
-    return 0;
+	return 0;
 }
diff --git a/criu/arch/mips/include/asm/dump.h b/criu/arch/mips/include/asm/dump.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/include/asm/int.h b/criu/arch/mips/include/asm/int.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/include/asm/parasite-syscall.h b/criu/arch/mips/include/asm/parasite-syscall.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/include/asm/parasite.h b/criu/arch/mips/include/asm/parasite.h
old mode 100755
new mode 100644
index 39882dd21..d8557095b
--- a/criu/arch/mips/include/asm/parasite.h
+++ b/criu/arch/mips/include/asm/parasite.h
@@ -3,7 +3,7 @@
 
 static inline void arch_get_tls(tls_t *ptls)
 {
-    asm("rdhwr %0, $29" : "=r"(*ptls));
+	asm("rdhwr %0, $29" : "=r"(*ptls));
 }
 
 #endif
diff --git a/criu/arch/mips/include/asm/restore.h b/criu/arch/mips/include/asm/restore.h
old mode 100755
new mode 100644
index 0cb9aa8ed..1860a37b7
--- a/criu/arch/mips/include/asm/restore.h
+++ b/criu/arch/mips/include/asm/restore.h
@@ -4,19 +4,18 @@
 #include "asm/restorer.h"
 #include "images/core.pb-c.h"
 
-#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,		\
-			      task_args)				\
+#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, task_args) \
 	asm volatile(							\
-		     "move $4, %0				    \n" \
-		     "move $25, %1 				    \n" \
-		     "move $5, %2				    \n" \
-		     "move $29, $5				    \n" \
-		     "jalr $25   				    \n"		\
-		     "nop   				    \n"		\
-		     :							\
-		     :"r"(task_args),"r"(restore_task_exec_start),	\
-		      "g"(new_sp)			\
-		     : "$29", "$25", "$4","$5")
+		"move $4, %0					\n"	\
+		"move $25, %1 					\n"	\
+		"move $5, %2					\n"	\
+		"move $29, $5					\n"	\
+		"jalr $25   					\n"	\
+		"nop   						\n"	\
+		:							\
+		:"r"(task_args),"r"(restore_task_exec_start),		\
+		 "g"(new_sp)						\
+		: "$29", "$25", "$4","$5")
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {
diff --git a/criu/arch/mips/include/asm/restorer.h b/criu/arch/mips/include/asm/restorer.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/include/asm/syscall32.h b/criu/arch/mips/include/asm/syscall32.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/include/asm/types.h b/criu/arch/mips/include/asm/types.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/include/asm/vdso.h b/criu/arch/mips/include/asm/vdso.h
old mode 100755
new mode 100644
diff --git a/criu/arch/mips/restorer.c b/criu/arch/mips/restorer.c
old mode 100755
new mode 100644
index e3a1e4a44..d840c8913
--- a/criu/arch/mips/restorer.c
+++ b/criu/arch/mips/restorer.c
@@ -13,7 +13,7 @@
 
 int restore_nonsigframe_gpregs(UserMipsRegsEntry *r)
 {
-    return 0;
+	return 0;
 }
 
 #define SHMLBA 0x40000
diff --git a/criu/arch/mips/sigaction_compat.c b/criu/arch/mips/sigaction_compat.c
old mode 100755
new mode 100644
index d3e45f082..cd9c9559d
--- a/criu/arch/mips/sigaction_compat.c
+++ b/criu/arch/mips/sigaction_compat.c
@@ -14,6 +14,6 @@ extern char restore_rt_sigaction;
 
 int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
 {
-    return 0;
+	return 0;
 }
 
diff --git a/criu/arch/mips/sigframe.c b/criu/arch/mips/sigframe.c
old mode 100755
new mode 100644
index 1e39102f0..4950613dc
--- a/criu/arch/mips/sigframe.c
+++ b/criu/arch/mips/sigframe.c
@@ -9,5 +9,5 @@
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
 		struct rt_sigframe *rsigframe)
 {
-    return 0;
+	return 0;
 }
diff --git a/criu/arch/mips/vdso-pie.c b/criu/arch/mips/vdso-pie.c
old mode 100755
new mode 100644
diff --git a/criu/crtools.c b/criu/crtools.c
index c78570e58..b016c28af 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -214,8 +214,8 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-       if (fault_injected(FI_CANNOT_MAP_VDSO))
-               kdat.can_map_vdso = 0;
+	if (fault_injected(FI_CANNOT_MAP_VDSO))
+		kdat.can_map_vdso = 0;
 
 	if (!list_empty(&opts.inherit_fds)) {
 		if (strcmp(argv[optind], "restore")) {

From 177e4b4badf6c31d781315b5752a88c8e0a46f68 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 2 May 2021 04:12:37 +0100
Subject: [PATCH 0601/1854] mips: remove empty gitignore

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 compel/arch/mips/src/lib/include/uapi/asm/.gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 compel/arch/mips/src/lib/include/uapi/asm/.gitignore

diff --git a/compel/arch/mips/src/lib/include/uapi/asm/.gitignore b/compel/arch/mips/src/lib/include/uapi/asm/.gitignore
deleted file mode 100755
index e69de29bb..000000000

From e2c352e4f80ea374c5d9d0d45af8cef2040d1c05 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 30 Apr 2021 20:02:15 +0100
Subject: [PATCH 0602/1854] tools.mk: Use Python 3 by default

As of January 1st, 2020 Python 2 is no longer supported and
many distributions no longer provide packages for Python 2
dependencies.

This patch allows CRIU to use Python 3 by default when both
major versions are available on the system.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/nmk/scripts/tools.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
index ce3d85dea..c5794401c 100644
--- a/scripts/nmk/scripts/tools.mk
+++ b/scripts/nmk/scripts/tools.mk
@@ -22,7 +22,7 @@ MAKE		:= make
 MKDIR		:= mkdir -p
 AWK		:= awk
 PERL		:= perl
-FULL_PYTHON	:= $(shell which python2 2>/dev/null || which python3 2>/dev/null)
+FULL_PYTHON	:= $(shell which python3 2>/dev/null || which python2 2>/dev/null)
 PYTHON		?= $(shell basename $(FULL_PYTHON))
 FIND		:= find
 SH		:= $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \

From e26949cfede8bc84b8e51092a39828820c4420f9 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 27 Apr 2021 06:59:05 +0000
Subject: [PATCH 0603/1854] lsm: handle half initialized SELinux setups

CRIU used to check for the existence of /sys/fs/selinux to see if
SELinux is enabled on a system. We have seen systems with SELinux kind
of enabled but reading out the labels gives does not return real labels.

To work around this, this commit adds a check during LSM detection
if SELinux labels are in the right format. For CRIU this check means to
see if there are at least 3 ':' in a label. If not CRIU switches to no
LSM mode.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/lsm.c | 79 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 52 insertions(+), 27 deletions(-)

diff --git a/criu/lsm.c b/criu/lsm.c
index 7cc36049f..20c015b54 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -62,11 +62,37 @@ static int apparmor_get_label(pid_t pid, char **profile_name)
 }
 
 #ifdef CONFIG_HAS_SELINUX
+static int verify_selinux_label(char *ctx)
+{
+	char *pos;
+	int i;
+
+	/*
+	 * There are SELinux setups where SELinux seems to be enabled,
+	 * but the returned labels are not really valid. See also
+	 * https://github.com/torvalds/linux/blob/master/security/selinux/include/initial_sid_to_string.h
+	 *
+	 * CRIU tells the user that such labels are invalid
+	 * and CRIU expects a SELinux label to contain three ':'.
+	 *
+	 * A label should look like this:
+	 *
+	 *      unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
+	 */
+	pos = (char*)ctx;
+	for (i = 0; i < 3; i++) {
+		pos = strstr(pos, ":");
+		if (!pos)
+			return -1;
+		pos++;
+	}
+
+	return 0;
+}
+
 static int selinux_get_label(pid_t pid, char **output)
 {
 	char *ctx;
-	char *pos;
-	int i;
 	int ret = -1;
 
 	if (getpidcon_raw(pid, &ctx) < 0) {
@@ -74,29 +100,15 @@ static int selinux_get_label(pid_t pid, char **output)
 		return -1;
 	}
 
+	if (verify_selinux_label(ctx)) {
+		pr_err("Invalid selinux context %s\n", (char *)ctx);
+		goto err;
+	}
+
 	*output = xstrdup((char *)ctx);
 	if (!*output)
 		goto err;
 
-	/*
-	 * Make sure it is a valid SELinux label. It should look like this:
-	 *
-	 *	unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
-	 */
-	pos = (char*)ctx;
-	for (i = 0; i < 3; i++) {
-		pos = strstr(pos, ":");
-		if (!pos) {
-			pr_err("Invalid selinux context %s\n", (char *)ctx);
-			xfree(*output);
-			*output = NULL;
-			goto err;
-		}
-
-		*pos = 0;
-		pos++;
-	}
-
 	ret = 0;
 err:
 	freecon(ctx);
@@ -201,21 +213,34 @@ int dump_xattr_security_selinux(int fd, FdinfoEntry *e)
 
 void kerndat_lsm(void)
 {
+
 	if (access(AA_SECURITYFS_PATH, F_OK) == 0) {
 		kdat.lsm = LSMTYPE__APPARMOR;
 		return;
 	}
 
 #ifdef CONFIG_HAS_SELINUX
-	/*
-	 * This seems to be the canonical place to mount this fs if it is
-	 * enabled, although we may (?) want to check /selinux for posterity as
-	 * well.
-	 */
-	if (access("/sys/fs/selinux", F_OK) == 0) {
+	if (is_selinux_enabled()) {
+		char *ctx;
+
+		/*
+		 * CRIU used to only check if /sys/fs/selinux is mounted, but that does not
+		 * seem to be enough for CRIU's use case. CRIU actually needs to look if
+		 * a valid label is returned.
+		 */
+		if (getpidcon_raw(getpid(), &ctx) < 0)
+			goto no_lsm;
+
+		if (verify_selinux_label(ctx)) {
+			freecon(ctx);
+			goto no_lsm;
+		}
+
 		kdat.lsm = LSMTYPE__SELINUX;
+		freecon(ctx);
 		return;
 	}
+no_lsm:
 #endif
 
 	kdat.lsm = LSMTYPE__NO_LSM;

From d8821d9a8f2edb54c2f592e95fc80c62ccaa2ce9 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Sun, 11 Apr 2021 18:56:54 +0300
Subject: [PATCH 0604/1854] net: skip iptables dump if it has nft backend and
 nft dump is supported

On modern Linux distributions iptables binaries using new nftables
API. We dump iptables rules using "iptables-save", and nftables
rules using libnftables API. This breaks network unlock on modern systems
because technically, we dump rules (including network lock rules) two times.

There is another problem - on host we can have modern distribution, but
in Docker container we can use iptables with netfilter (legacy) API.
So, in this case this legacy rules will be skipped.

This patch handles all of that cases. It tries to find iptables legacy and
dump legacy rules by using appropriate iptables binaries, dump nftables
rules by using libnftables.

Fixes #1435

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-check.c     | 40 +++++++++++++++++++++
 criu/include/util.h |  2 ++
 criu/net.c          | 32 ++++++++++++++---
 criu/util.c         | 88 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 157 insertions(+), 5 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index f095d59b0..eef45b93b 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1201,6 +1201,44 @@ static int check_compat_cr(void)
 	return -1;
 }
 
+static int check_nftables_cr(void)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	return 0;
+#else
+	pr_warn("CRIU was built without nftables support - nftables rules will "
+		"not be preserved during C/R\n");
+	return -1;
+#endif
+}
+
+static int check_ipt_legacy(void)
+{
+	char *ipt_legacy_bin;
+	char *ip6t_legacy_bin;
+
+	ipt_legacy_bin = get_legacy_iptables_bin(false);
+	if (!ipt_legacy_bin) {
+		pr_warn("Couldn't find iptables version which is using iptables legacy API\n");
+		return -1;
+	}
+
+	pr_info("iptables cmd: %s\n", ipt_legacy_bin);
+
+	if (!kdat.ipv6)
+		return 0;
+
+	ip6t_legacy_bin = get_legacy_iptables_bin(true);
+	if (!ip6t_legacy_bin) {
+		pr_warn("Couldn't find ip6tables version which is using iptables legacy API\n");
+		return -1;
+	}
+
+	pr_info("ip6tables cmd: %s\n", ip6t_legacy_bin);
+
+	return 0;
+}
+
 static int check_uffd(void)
 {
 	if (!kdat.has_uffd) {
@@ -1511,6 +1549,8 @@ static struct feature_list feature_list[] = {
 	{ "external_net_ns", check_external_net_ns},
 	{ "clone3_set_tid", check_clone3_set_tid},
 	{ "newifindex", check_newifindex},
+	{ "nftables", check_nftables_cr },
+	{ "has_ipt_legacy", check_ipt_legacy },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/util.h b/criu/include/util.h
index f000e97a7..039d42f4f 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -383,4 +383,6 @@ static inline void print_stack_trace(pid_t pid) {}
 
 extern int mount_detached_fs(const char *fsname);
 
+extern char *get_legacy_iptables_bin(bool ipv6);
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/net.c b/criu/net.c
index 2ef4dba13..51b02efe7 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2065,14 +2065,36 @@ static inline int dump_rule(struct cr_imgset *fds)
 static inline int dump_iptables(struct cr_imgset *fds)
 {
 	struct cr_img *img;
+	char *iptables_cmd = "iptables-save";
+	char *ip6tables_cmd = "ip6tables-save";
 
-	img = img_from_set(fds, CR_FD_IPTABLES);
-	if (run_iptables_tool("iptables-save", -1, img_raw_fd(img)))
-		return -1;
+	/*
+	 * Let's skip iptables dump if we have nftables support compiled in,
+	 * and iptables backend is nft to prevent duplicate dumps.
+	 */
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	iptables_cmd = get_legacy_iptables_bin(false);
 
-	if (kdat.ipv6) {
+	if (kdat.ipv6)
+		ip6tables_cmd = get_legacy_iptables_bin(true);
+#endif
+
+	if (!iptables_cmd) {
+		pr_info("skipping iptables dump - no legacy version present\n");
+	} else {
+		img = img_from_set(fds, CR_FD_IPTABLES);
+		if (run_iptables_tool(iptables_cmd, -1, img_raw_fd(img)))
+			return -1;
+	}
+
+	if (!kdat.ipv6)
+		return 0;
+
+	if (!ip6tables_cmd) {
+		pr_info("skipping ip6tables dump - no legacy version present\n");
+	} else {
 		img = img_from_set(fds, CR_FD_IP6TABLES);
-		if (run_iptables_tool("ip6tables-save", -1, img_raw_fd(img)))
+		if (run_iptables_tool(ip6tables_cmd, -1, img_raw_fd(img)))
 			return -1;
 	}
 
diff --git a/criu/util.c b/criu/util.c
index 5f60f502f..973553bbc 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1495,4 +1495,92 @@ int cut_path_ending(char *path, char *ending)
 
 	path[ending_pos - 1] = 0;
 	return 0;
+}
+
+static int is_iptables_nft(char *bin)
+{
+	int pfd[2] = { -1, -1 }, ret = -1;
+	char *cmd[] = { bin, "-V", NULL };
+	char buf[100];
+
+	if (pipe(pfd) < 0) {
+		pr_perror("Unable to create pipe");
+		goto err;
+	}
+
+	ret = cr_system(-1, pfd[1], -1, cmd[0], cmd, 0);
+	if (ret) {
+		pr_err("%s -V failed\n", cmd[0]);
+		goto err;
+	}
+
+	close_safe(&pfd[1]);
+
+	ret = read(pfd[0], buf, sizeof(buf) - 1);
+	if (ret < 0) {
+		pr_perror("Unable to read %s -V output", cmd[0]);
+		goto err;
+	}
+
+	buf[ret] = '\0';
+	ret = 0;
+
+	if (strstr(buf, "nf_tables")) {
+		pr_info("iptables has nft backend: %s\n", buf);
+		ret = 1;
+	}
+
+err:
+	close_safe(&pfd[1]);
+	close_safe(&pfd[0]);
+	return ret;
+}
+
+char *get_legacy_iptables_bin(bool ipv6)
+{
+	static char iptables_bin[2][32];
+	/* 0  - means we don't know yet,
+	 * -1 - not present,
+	 * 1  - present.
+	 */
+	static int iptables_present[2] = { 0, 0 };
+	char bins[2][2][32] = {
+		{
+			"iptables-save",
+			"iptables-legacy-save"
+		},
+		{
+			"ip6tables-save",
+			"ip6tables-legacy-save"
+		}
+	};
+	int ret;
+
+	if (iptables_present[ipv6] == -1)
+		return NULL;
+
+	if (iptables_present[ipv6] == 1)
+		return iptables_bin[ipv6];
+
+	memcpy(iptables_bin[ipv6], bins[ipv6][0], strlen(bins[ipv6][0]) + 1);
+	ret = is_iptables_nft(iptables_bin[ipv6]);
+
+	/*
+	 * iptables on host uses nft backend (or not installed),
+	 * let's try iptables-legacy
+	 */
+	if (ret < 0 || ret == 1) {
+		memcpy(iptables_bin[ipv6], bins[ipv6][1],
+					   strlen(bins[ipv6][1]) + 1);
+		ret = is_iptables_nft(iptables_bin[ipv6]);
+		if (ret < 0 || ret == 1) {
+			iptables_present[ipv6] = -1;
+			return NULL;
+		}
+	}
+
+	/* we can come here with iptables-save or iptables-legacy-save */
+	iptables_present[ipv6] = 1;
+
+	return iptables_bin[ipv6];
 }
\ No newline at end of file

From 4696e61edb2d656c1f60a328d54abb5e1375dcb8 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 20 Apr 2021 17:23:20 +0300
Subject: [PATCH 0605/1854] zdtm: skip static/netns-nft test if nftables
 feature isn't supported

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/static/netns-nft.checkskip | 3 ---
 test/zdtm/static/netns-nft.desc      | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100755 test/zdtm/static/netns-nft.checkskip

diff --git a/test/zdtm/static/netns-nft.checkskip b/test/zdtm/static/netns-nft.checkskip
deleted file mode 100755
index 270cafeb5..000000000
--- a/test/zdtm/static/netns-nft.checkskip
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-test -f /usr/sbin/nft || exit 1
diff --git a/test/zdtm/static/netns-nft.desc b/test/zdtm/static/netns-nft.desc
index f53890a24..82d03bad1 100644
--- a/test/zdtm/static/netns-nft.desc
+++ b/test/zdtm/static/netns-nft.desc
@@ -1,5 +1,6 @@
-{   'deps': [   '/bin/sh',
-                '/usr/sbin/nft',
-                '/usr/bin/diff'],
+{  'feature': 'nftables',
+   'deps': [   '/bin/sh',
+               '/usr/sbin/nft',
+               '/usr/bin/diff'],
     'flags': 'suid',
     'flavor': 'ns uns'}

From ddefbbff16a96dc450f40707bbf4473284c75f43 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 20 Apr 2021 17:26:08 +0300
Subject: [PATCH 0606/1854] zdtm: add combined nftables/iptables netns-nft-ipt
 test

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/static/Makefile           |  3 +-
 test/zdtm/static/netns-nft-ipt.c    | 81 +++++++++++++++++++++++++++++
 test/zdtm/static/netns-nft-ipt.desc |  8 +++
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/static/netns-nft-ipt.c
 create mode 100644 test/zdtm/static/netns-nft-ipt.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 598e8d3b9..b021b18fb 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -314,7 +314,8 @@ TST_FILE	=				\
 		file_locks07			\
 		file_locks08			\
 		netns-nf			\
-		netns-nft				\
+		netns-nft			\
+		netns-nft-ipt			\
 		maps_file_prot			\
 		socket_close_data01		\
 		fifo_upon_unix_socket00		\
diff --git a/test/zdtm/static/netns-nft-ipt.c b/test/zdtm/static/netns-nft-ipt.c
new file mode 100644
index 000000000..02c2a2f58
--- /dev/null
+++ b/test/zdtm/static/netns-nft-ipt.c
@@ -0,0 +1,81 @@
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that both nftables & iptables rules (some) are C/R properly";
+const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "file name", 1);
+
+int main(int argc, char **argv)
+{
+	char cmd[128];
+
+	test_init(argc, argv);
+
+	/* create nft table */
+	if (system("nft add table inet netns-nft-zdtm-test")) {
+		pr_perror("Can't create nft table");
+		return -1;
+	}
+
+	/* create input chain in table */
+	if (system("nft add chain inet netns-nft-zdtm-test input { type filter hook input priority 0 \\; }")) {
+		pr_perror("Can't create input chain in nft table");
+		return -1;
+	}
+
+	/* block ICMPv4 traffic */
+	if (system("nft add rule inet netns-nft-zdtm-test input meta nfproto ipv4 icmp type { echo-request } reject")) {
+		pr_perror("Can't set input rule");
+		return -1;
+	}
+
+	/* save resulting nft table */
+	sprintf(cmd, "nft list table inet netns-nft-zdtm-test > pre-%s", filename);
+	if (system(cmd)) {
+		pr_perror("Can't get nft table");
+		return -1;
+	}
+
+	if (system("iptables -A INPUT -t filter --protocol icmp -j DROP")) {
+		pr_perror("Can't set input rule");
+		return -1;
+	}
+
+	sprintf(cmd, "iptables -L >> pre-%s", filename);
+	if (system(cmd)) {
+		pr_perror("Can't save iptables");
+		return -1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/* get nft table */
+	sprintf(cmd, "nft list table inet netns-nft-zdtm-test > post-%s", filename);
+	if (system(cmd)) {
+		fail("Can't get nft table");
+		return -1;
+	}
+
+	sprintf(cmd, "iptables -L >> post-%s", filename);
+	if (system(cmd)) {
+		fail("Can't get iptables");
+		return -1;
+	}
+
+	/* compare nft table before/after c/r */
+	sprintf(cmd, "diff pre-%s post-%s", filename, filename);
+	if (system(cmd)) {
+		fail("nft table differ");
+		return -1;
+	}
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/netns-nft-ipt.desc b/test/zdtm/static/netns-nft-ipt.desc
new file mode 100644
index 000000000..76f2f14b6
--- /dev/null
+++ b/test/zdtm/static/netns-nft-ipt.desc
@@ -0,0 +1,8 @@
+{  'feature': 'nftables has_ipt_legacy',
+   'deps': [   '/bin/sh',
+               '/usr/sbin/nft',
+               '/sbin/iptables|/usr/sbin/iptables',
+               '/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+               '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns'}

From 655610e09ac39befc7f9999202d2ee4bd72c6de7 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 20 Apr 2021 18:35:49 +0300
Subject: [PATCH 0607/1854] ci: remove hack for netns-nft zdtm test

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 .cirrus.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5574b1583..9c590f0b2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -44,9 +44,6 @@ task:
     # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
     # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode
     setenforce 0
-    # netns-nft fails with
-    # 4: FAIL: netns-nft.c:51: Can't get nft table (errno = 11 (Resource temporarily unavailable))
-    mv /usr/sbin/nft /usr/sbin/nft.away
     pip3 install junit_xml
 
   build_script: |

From 2609e98ee719e4c4a1e62955d667a351542613fb Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Date: Sun, 30 Aug 2020 22:30:29 +0300
Subject: [PATCH 0608/1854] sk-unix: ghost: fix deadlock between
 peer_fle->stage and fds wake up

This patch fixes deadlock that appears on ghost DGRAM unix sockets.
Problem is that wake_connected_sockets() function *should* be called
strictly after fle->stage >= FLE_OPEN.

Explanation:
Consider situation, we have ghost unix DGRAM socket (peer socket),
and also have several sockets that connected to this peer socket.

How restore of that picture works?
In files subsystem we have open_fdinfos(pstree_item*) function that calls open_fd()
function for *every* fd of task. open_fd() function calls appropriate
file descriptor "open" handler that may return "1" which means "try again later".
This retcode means, that some additional resources is needed to fully restore file
descriptor. For *ghost* UNIX sockets, for instance, we need to have peer socket
file descriptor *before* we can open and restore client sockets. Here is the main problem.
open_fdinfos() called from separate tasks simultaneously, so, when we get "1" retcode
we stay on futex (wait_fds_event() function) and waiting for someone another task
restore some resource and notify us that we can retry opening of file descriptor.

With *ghost* UNIX socket I've managed to caught next behaviour.
1. From one task (that holds client socket) open_fdinfos() called open_fd() that called
open_unixsk_standalone(). In open_unixsk_standalone we have check that means
"if socket have peer and that peer is GHOST and that peer fle->stage < FLE_OPEN"
return "try again". Ok. So, this task will stay on wait_fds_event().

2. Second task, that holds *peer* tried to open peer socket fd. So,
it also calls open_fd() -> open_unixsk_standalone() -> opening socket
-> bind_unix_sk() -> in bind_unix_sk we have call to wake_connected_sockets().
So, after that call we will "wake up" task from first point and it may proceed
fd restoring. Yes? No. In first point we need to "peer_fle->stage >= FLE_OPEN"
but fle->stage of our peer socket will become FLE_OPEN in open_fd(). After we
return from open_unixsk_standalone we proceed to setup_and_serve_out() where we have
appropriate stage change.
Between call of wake_connected_sockets and moment when we set stage to FLE_OPEN
should pass very small amount of time. But it may happen, so we "wake up"
tasks that holds client sockets but did not have enough time to change fle->stage
to FLE_OPEN. Exactly that case I've managed to reproduce.
(Really, ossec-hids application managed to reproduce this problem at first %) )

v1: file_desc_ops->on_stage_change callback was introduced,
sk-unix ghost code reworked so that to call wake_connected_sockets() strictly
after changing fle->stage to FLE_OPEN.
v2: implementation replaced with short and more practical patch by Andrei

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/sk-unix.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index d628e32cb..d62cebc46 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1845,7 +1845,7 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 {
 	struct unix_sk_info *queuer = ui->queuer;
 	struct unix_sk_info *peer = ui->peer;
-	struct fdinfo_list_entry *fle, *fle_peer;
+	struct fdinfo_list_entry *fle;
 	int sk;
 
 	fle = file_master(&ui->d);
@@ -1859,10 +1859,12 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 	 * into it in a special way.
 	 */
 	if (peer && (peer->flags & USK_GHOST_FDSTORE)) {
-		fle_peer = file_master(&peer->d);
-		if (fle_peer->stage < FLE_OPEN) {
+		/*
+		 * Here we return 1 which says "try again" to
+		 * the caller if peer is not yet bounded.
+		 */
+		if (peer_is_not_prepared(peer))
 			return 1;
-		}
 	}
 
 	if (fle->stage == FLE_OPEN)

From 6beeabcd42cbc4c82c4c11f8b8e5a28bdb146ba6 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Date: Fri, 20 Mar 2020 22:17:30 +0300
Subject: [PATCH 0609/1854] zdtm: add sk-unix-dgram-ghost test case

This testcase reproduces deadlock in "wait_fds_event" futex in open_fdinfos()
function (files subsystem).

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/static/Makefile                 |   1 +
 test/zdtm/static/sk-unix-dgram-ghost.c    | 230 ++++++++++++++++++++++
 test/zdtm/static/sk-unix-dgram-ghost.desc |   1 +
 3 files changed, 232 insertions(+)
 create mode 100644 test/zdtm/static/sk-unix-dgram-ghost.c
 create mode 100644 test/zdtm/static/sk-unix-dgram-ghost.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index b021b18fb..6e4f50880 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -381,6 +381,7 @@ TST_DIR		=				\
 		del_standalone_un		\
 		sk-unix-mntns			\
 		sk-unix01			\
+		sk-unix-dgram-ghost		\
 		unsupported_children_collision  \
 		shared_slave_mount_children	\
 		non_uniform_share_propagation	\
diff --git a/test/zdtm/static/sk-unix-dgram-ghost.c b/test/zdtm/static/sk-unix-dgram-ghost.c
new file mode 100644
index 000000000..a726d6a64
--- /dev/null
+++ b/test/zdtm/static/sk-unix-dgram-ghost.c
@@ -0,0 +1,230 @@
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdbool.h>
+#include <limits.h>
+#include <errno.h>
+#include <dirent.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check data of bound ghost DGRAM unix socket and possibility to connect";
+const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+
+/*
+ * PROCESS_NUM | FREEZE_FREQ
+ * 3           | 1 / 5
+ * 4           | 1 / 5
+ * 5           | 2 / 5
+ * 10          | 10 / 10
+ */
+#define PROCESSES_NUM 10
+
+#define MSG "hello"
+char filename[PATH_MAX];
+char *dirname;
+TEST_OPTION(dirname, string, "directory name", 1);
+
+static int fill_sock_name(struct sockaddr_un *name, const char *filename)
+{
+	char *cwd;
+
+	cwd = get_current_dir_name();
+	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path)) {
+		pr_err("Name %s/%s is too long for socket\n",
+		       cwd, filename);
+		return -1;
+	}
+
+	name->sun_family = AF_LOCAL;
+	ssprintf(name->sun_path, "%s/%s", cwd, filename);
+	return 0;
+}
+
+static int client(int i, task_waiter_t t)
+{
+	struct sockaddr_un addr;
+	int sk;
+
+	sk = socket(AF_UNIX, SOCK_DGRAM, 0);
+	if (sk < 0) {
+		pr_perror("open client %d", i);
+		return 1;
+	}
+
+	if (fill_sock_name(&addr, filename) < 0) {
+		pr_err("%s is too long for socket\n", filename);
+		return 1;
+	}
+
+	if (connect(sk, (struct sockaddr *) &addr, sizeof(struct sockaddr_un)) < 0) {
+		pr_perror("connect failed %d", i);
+		return 1;
+	}
+
+	/* we are ready to c/r */
+	task_waiter_complete(&t, 1);
+
+	/* wait for server let us to send data */
+	task_waiter_wait4(&t, 2);
+
+	test_msg("child %d: lets send\n", i);
+
+	if (send(sk, MSG, sizeof(MSG), 0) != sizeof(MSG)) {
+		pr_perror("send failed %d", i);
+		return 1;
+	}
+
+	test_msg("child %d: MSG was sent\n", i);
+
+	/* notify server that we sent data */
+	task_waiter_complete(&t, 3);
+
+	return 0;
+}
+
+static void child_exited(int signo)
+{
+	int status;
+	pid_t pid;
+
+	while (1) {
+		pid = waitpid(-1, &status, WNOHANG);
+		if (pid == -1) {
+			if (errno == ECHILD)
+				break;
+
+			fail("wait failed");
+			exit(1);
+		}
+
+		if (pid == 0)
+			return;
+
+		if (status) {
+			pr_err("A child (pid: %d) exited with 0x%x\n", pid, status);
+			exit(1);
+		}
+	}
+}
+
+int main(int argc, char **argv)
+{
+	struct sockaddr_un addr;
+	int srv, ret;
+	size_t i;
+	char buf[1024];
+	task_waiter_t t[PROCESSES_NUM];
+
+	test_init(argc, argv);
+
+	ssprintf(filename, "%s/%s", dirname, "sk");
+
+	if (fill_sock_name(&addr, filename) < 0) {
+		pr_err("%s is too long for socket\n", filename);
+		ret = 1;
+		goto clean;
+	}
+
+	if (signal(SIGCHLD, child_exited) == SIG_ERR) {
+		pr_perror("can't set SIGCHLD handler");
+		exit(1);
+	}
+
+	for (i = 0; i < PROCESSES_NUM; i++)
+		task_waiter_init(&t[i]);
+
+	if (mkdir(dirname, 0755) < 0) {
+		if (errno != EEXIST) {
+			pr_perror("Can't create %s", dirname);
+			return 1;
+		}
+	}
+
+	/*
+	 * Freeze happens if unix socket is the *last* file descriptor.
+	 * So, if we for example, move task_waiter_init() after server
+	 * socket creation we loose reproduce.
+	 */
+	srv = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
+	if (srv < 0) {
+		pr_perror("open srv");
+		ret = 1;
+		goto clean;
+	}
+
+	if (bind(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_un))) {
+		pr_perror("bind srv");
+		ret = 1;
+		goto clean;
+	}
+
+	for (i = 0; i < PROCESSES_NUM; i++) {
+		ret = test_fork();
+		if (ret == -1) {
+			pr_perror("fork");
+			ret = 1;
+			goto clean;
+		}
+
+		if (ret == 0) {
+			close(srv);
+			exit(client(i, t[i]));
+		}
+
+		task_waiter_wait4(&t[i], 1);
+	}
+
+	/*
+	 * It's very important part of this test-case to make
+	 * *ghost* unix socket. Because problem with criu freeze
+	 * appears especially with *ghost* unix socket.
+	 */
+	unlink(addr.sun_path);
+
+	ret = 1;
+
+	test_daemon();
+	test_waitsig();
+
+	test_msg("C/R complete\n");
+
+	/* let childs to send data to server socket */
+	for (i = 0; i < PROCESSES_NUM; i++)
+		task_waiter_complete(&t[i], 2);
+
+	/* wait childs for send data */
+	for (i = 0; i < PROCESSES_NUM; i++)
+		task_waiter_wait4(&t[i], 3);
+
+	test_msg("Checking result\n");
+
+	/* check we can read all client messages */
+	for (i = 0; i < PROCESSES_NUM; i++) {
+		ret = read(srv, buf, sizeof(MSG));
+		buf[ret > 0 ? ret : 0] = 0;
+		if (ret != sizeof(MSG)) {
+			fail("%d: %s", ret, buf);
+			ret = 1;
+			goto clean;
+		}
+	}
+
+	ret = 0;
+	pass();
+
+clean:
+	unlink(addr.sun_path);
+	rmdir(dirname);
+	return ret;
+}
diff --git a/test/zdtm/static/sk-unix-dgram-ghost.desc b/test/zdtm/static/sk-unix-dgram-ghost.desc
new file mode 100644
index 000000000..2651c4d77
--- /dev/null
+++ b/test/zdtm/static/sk-unix-dgram-ghost.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns uns', 'flags': 'suid'}

From ed58fb22142bdb211f9c90199b782b40ca513e7c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 8 May 2021 21:41:41 +0000
Subject: [PATCH 0610/1854] test: create new tls certificates

The certificates expired again. This replaces the expired
certificates with test certificates which are valid for ever:

  echo -ne "ca\ncert_signing_key\nexpiration_days = -1\n" > temp
  certtool --generate-privkey > cakey.pem
  certtool --generate-self-signed \
           --template temp \
           --load-privkey cakey.pem \
           --outfile cacert.pem
  echo -ne "cn=$HOSTNAME\nencryption_key\nsigning_key\nexpiration_days = -1\n" > temp
  certtool --generate-privkey > key.pem
  certtool --generate-certificate \
           --template temp \
           --load-privkey key.pem \
           --load-ca-certificate cacert.pem \
           --load-ca-privkey cakey.pem \
           --outfile cert.pem
  rm cakey.pem temp

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/pki/cacert.pem |  42 +++---
 test/pki/cert.pem   |  44 +++----
 test/pki/key.pem    | 308 ++++++++++++++++++++++----------------------
 3 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/test/pki/cacert.pem b/test/pki/cacert.pem
index 65afd2aa7..0deec1150 100644
--- a/test/pki/cacert.pem
+++ b/test/pki/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0TCCAjmgAwIBAgIUF0WMpaJUi0+wXbOKQ6P41ZeRwdQwDQYJKoZIhvcNAQEL
-BQAwADAeFw0yMDA1MDYxMzEwMzNaFw0yMTA1MDYxMzEwMzNaMAAwggGiMA0GCSqG
-SIb3DQEBAQUAA4IBjwAwggGKAoIBgQDMPLu3o8RMlWlblK03GynmvNZDQKW0ZTYg
-dE/Dlr/rVKo8KMAm6KbmpUJq8HUtaP/9Epf2eY9+LNNpBFKJuURxD23ObNdbU6o6
-hI4LRQVYsX6FB+6DrIXfD61zxebdpPWlCyoEd43firfwMoeGyarqyrZE+UXkR4fF
-LhVm/4kQ8qRZte+GAIVp0SVMlNyhQM5AmTZPAO3iYRhZObkVFUTWnwjdxKOx1VhU
-vRdhwI4N5x9EGiq6Lzc0iABxyIZ1mHOYhxDQv5gL4CECUZgzVxJp6DVP/v2w4254
-JeKXOPUm6YHxXxzJyT73mdz0/7VpqOZa5yiZKRBtHoWyovuTzu8jS6TgvjNrmAoO
-kyu13jTlBDFUfVKBDoRQMhjt6wpMkUItYvVRq/RYLvXGU7VCzUHoVdBxNNO+MrZ2
-4ebN5l5/CSrOeaa0EylLLlkW7Q0JqmZJpZfK8/AnMyp71AkHTps5LZv/sLbPWwh1
-3XTZA1e+k9lS1Z480HjtNKurL526k8ECAwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB
-/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBR5rZcu6Unhc0ZuuflmHEOa9bBu
-1zANBgkqhkiG9w0BAQsFAAOCAYEAehfgQ1y3GTJ3LPQQOgn3AB/Sf+fGSNecZsTO
-UxGFxbNGvl7UeFCS8Z1/h57AeIXSvE+BGfMvtq9OSl6t+3w9RfbIdzWzYYILoAVM
-t0FkwrjLtVIlUSWD+Aia01ESjw+3ENceGcuo9jVyAI3MMkGftFc7U1UyNB9HY//x
-79uUavmWioc3odooC0FOosIzV2KHCUPAnpN7TtNlefe4JisMa6WGXAk9CNU9t0wG
-JLHK3E0LrtEreIMBmK6zyxH3OwMi1x/3sFSoon09/fsOLBbtUY+401a+nT+vMTKK
-KpVvAC4tsEyFH0vyk68c6Z4VKO5aqoAtaQJZk2A2z1cBAz4aArgx1glkaNjd7sZn
-lSEhnpP7uVUyYU9fyQ46zpIZm38gx6+95XL2gCQnEIUEeOCXMonXaavMqRx5zL8z
-hihMSoLhE6Wx/tzxKlqz0GN8E0CTlpB1MmvCvOkaHzSq7Yc19Bez8jr6PNfZVsFv
-s9a4qqhGKaLz7HKpG0863oCO4dU1
+MIID0zCCAjugAwIBAgIUZ1SFU6Mbf9tAr6kUlRfc67ivpEowDQYJKoZIhvcNAQEL
+BQAwADAgFw0yMTA1MDgyMTQwMjNaGA85OTk5MTIzMTIzNTk1OVowADCCAaIwDQYJ
+KoZIhvcNAQEBBQADggGPADCCAYoCggGBAObs0jaPkHKT0RTtHbny+xSFKsoeetTE
+BKBHS/kYniuOuC6MUGNvJm1ZQQrHDQ+sYSashFHPKURc3e/+lNys9YwwM/Glakcl
+EuA/BIPBnITdChA1JVhl83r/8+hGnXn5LbrmP934/3c7t5k1dCoqskjmQeAvr4yM
+KnPAgeDi2P5tRCWJVjmRQPdXRHDLFobkTnc7RLwxFDsUQtaksbNSHhttZlIRfmtR
+IGy2t7u3XD8NdEvaQ5lyoB4xxk4UxcIsruGHsRqxAZMzurn7IQE21ShGMQ8xc9MC
+mRNBpeUwZ7pURHnNXz+g7f83VB1STJN7DLL6++G6MjHagqyzRweVmb0bSTomXX85
+3vGiv8V2HQViB/X3c6l8vKvDVcAMDPWdE3Cq7BsOvycLOqd8T2XLgweXMBc7rjy4
+g9E4SI2Arb1VpfsKycIijq8bwvdIuL5i/tG605WHXeBir75Vyd7zzg3Hf0HlboZR
+RS9s5NNmVfKU9PyC6zC8bU5XCsDOgJQEgQIDAQABo0MwQTAPBgNVHRMBAf8EBTAD
+AQH/MA8GA1UdDwEB/wQFAwMHBAAwHQYDVR0OBBYEFIgUFBNbqRilTiv4n2AcXDKv
+U+4nMA0GCSqGSIb3DQEBCwUAA4IBgQCFRJcpTp0CiDX9INjn0hd2eyz/KIAfO89M
+VwWB7fINJJD5qIcmKmkFtOUtqq8LidyIq8mWia4A6MOcN1uDhm+ppwsIFaTMkree
+pmpn2aDL+p9Ug/3ioH51Rg/E7gAipPZR2Au+R7rp2bRDxSFhA+c7ZX0tcdaOD/NT
+cghBqcDpu8ie2bhF/aZW5DWNVFFZIc85lQ7Y1vgaUazcM+nqHl6qPbZNUcsD3CLh
+3t78niLYWavVai0d/2Luk1uHx0zWehucnbtmVn7d/221DMXi5dcgxZnIbdGKoCI/
+k846SxUxcmORVjxuZTvH+7nlMdAQZEqPSi8xFNJVwI5QUZlwpeN4gAXSS4MJ2owf
+YHYbqG/gnPvr4orT3KWGs8fcM1HlxydTV2nitwCkUBM+NwJpqzbDFzTRDxxpbg1R
+g8kijrv6xn4me3jDQbQi2DI/d1bDD94sAkM2DWqHG6SUYRXfV6MGpzgS/Q738Rr9
+2TGOyaDYwa3iZHXgJt62v+QmLB8GiHQ=
 -----END CERTIFICATE-----
diff --git a/test/pki/cert.pem b/test/pki/cert.pem
index f5a0452b5..5e7e02df3 100644
--- a/test/pki/cert.pem
+++ b/test/pki/cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEAjCCAmqgAwIBAgIURFKv2lJVvIEfr7yjE7pK0BdK9W8wDQYJKoZIhvcNAQEL
-BQAwADAeFw0yMDA1MDYxMzExMDVaFw0yMTA1MDYxMzExMDVaMBMxETAPBgNVBAMT
-CGZlZG9yYTAxMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAtS2SivLa
-AfsZ1X9xun/6i/1UNSxG5kPvVkfTPWOwSgCYyqn7u2vZsIsvcurqHQBEg1SWF4XA
-dcFeCxdDN8em6ISfSOUFL9TSQrZ5eFQYcVTX9IFXDWXbFSC8AgJpYhrPf2O0vxQN
-QFD4MpNXrLpEkc3vLrg/JhySC1HAYfO/nuJV3ZnAxJZCIv4upT5j0VjzfPw6WR/O
-UUlcmLnh0+qMLv7G2dRLjdAsV1U8k7eykk+z9qXeKAjgFBEEgLTVbHR1zbrUpw42
-DYR7SQpEJ8wrJ9qHdI4H/9MnPu8O75kfgauQV4s/oIgWmVeHMDxpGaLEKgcYVE2F
-/HlMfFvCrrZKKXi1/k35rG8sg6cP/bRuRZlgO0xFTrW0QKmWoBLqyqVMvifdkT0E
-BWZ4eZWTDn2Rr4HMe7ov54QmKXaXp2VdOGzO1Efv9KvDildb5aEqBrVz+tU+C/Cd
-g5p1d2g2m1Uk9wjcYbXOWx9fd9Ur/fxJuHtauxOW4gzFLcTOgvUgVmSXAgMBAAGj
-YTBfMAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUh+RA
-Kg+4YVs/x9A0hxJlkDxG7IQwHwYDVR0jBBgwFoAUea2XLulJ4XNGbrn5ZhxDmvWw
-btcwDQYJKoZIhvcNAQELBQADggGBAMLv1btjFDwxds0XlPH792ECXgYOXPC8cJAx
-MJ+qdop/nNW8iUUoOjwy1f9jXBjz1bHKJ+XnyTz4rhLWIHVnhsiLMQ+ljHgTtTjY
-3K6Lzo9+KMG/WDRajID8Sk2/B3jnCjgdzb6C4TZQ1mxnhSD7Cj/VitkVLP3D2nYx
-55bXqAHAtSkW965LAxILSzt04a8MM9ZxNzyruGVI+jPF0OSgDNcJpcwUw8w8V1lj
-c5TC9qqRlokFGphR45vblTw3GaXuZ5TTLOdix0QOhl52H2BtCrvTWJLREC5VJ87C
-2FjXIz5zj1WZ3CDZVbpFhTiZy/chHJNaiiDWe6QhD40VvKlo/netp+rxwrpGsFkC
-mtyRKrutdKi0vDvI6sKu13gLxetL+Bd6XWZ+XRsA/687QE+epxoh8sTvIt9j0z5r
-0yIv/0eTKVZLQ6cAXSoR1g1GwTsWf0eBRgePdl4MCXVAs8+X1hTqnrJomiUdm93C
-d2+QakSAhreCtlqMz/AULryv3KgaEg==
+MIIEBDCCAmygAwIBAgIUCwBm4J3NBipseP3LYY3IxXA5m1QwDQYJKoZIhvcNAQEL
+BQAwADAgFw0yMTA1MDgyMTQxMjJaGA85OTk5MTIzMTIzNTk1OVowEzERMA8GA1UE
+AxMIZmVkb3JhMDEwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCi1o2p
+y4AKxUrCSc5m0yIHKgMPIXUWP4WYO4KyJw2w9N0crlG4m/GVZL5lwt0/msIfHSIH
+eUxDVdTKAFcLt8gp91Ezh5G6ZX1ScXVVSlmLZNwJ4+P6vEjxRhw6hJbWRFrqs8D4
+FVJjBnya+OQvF17gvKWvC/9EzPWugMvH6hH/oHL7qNnKeI2sF5JkVdw3d6gO68Cc
+vKfVUEYeOhPFrd4TDuNhlUeL35j9MHedtGucgiqQYm8JI+19lLZ6Exnz2cQL/2lF
+IG8p9p5lwCzA+WTHEo+AsdedyUvMmATh0DbzXY8FjwWrYQBUmQsKXUdeA0LaIatf
+KESR+HHY3XgHpxks0a97VKAJsgxRxTtzFso1k4gGvv21LoueT80FLejn6hPBxIi0
+X6Qn2lTxbP0on42DB6adEcSxqzpWex1Jwga8hNVOX1S0ME2qSXo1NTuoCzjWJTmr
+YYCGyeMNI24Wq1I8gkUdSG5Zle26ZTmP3MZHCdkcc8BjM9VkFh61EgSaCZ8CAwEA
+AaNhMF8wDAYDVR0TAQH/BAIwADAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQc
+tdoPFLeN0DicShnBeRadxghVBzAfBgNVHSMEGDAWgBSIFBQTW6kYpU4r+J9gHFwy
+r1PuJzANBgkqhkiG9w0BAQsFAAOCAYEAOPZQlGrirCBO4eauGArCFUIOOp1mTfX9
+zMDEELL1dThg80qqzvPIz8qofKhxdGc9jiJI2EQNBrv51Hi6Ba/FOBMLAW3NmBg0
+byOxzvAVqINl2jTAF0b4WRHWctS/5T+NjJ4epksQaTxrglyLkZVYFBJzIPsj5zFG
+w2tXcWB3wh5p3Hp3bpX/lTW43YFvnHaOIhCjIkb0r5+KKLlIZv8bCU1tfnZ2xQgy
+K64IYUmGk9vsQVA68xO52gRkGzMYO7TNlqukaobNx20dOufBqWxS4OKRqshycnTf
+ZxFbkQDPKUZ3hBALxqAjiuyVriB0023w+ntwsEfCVI38MQhC7DD6f/3Cw6pXv7pz
+v19zlVNtGpUePzdf2P9Do/bGPDnHeuCQRLwGzZKvVVj4GZ7RAlKTER4TACQ/70pp
+NPBRx3aW3fTvg/OeTYSaonwdveobhuIVPQEWJUI+4AIxky7jvqBVTgnQ7GbfUY1W
+XgxUZFP7NMc1DPuN815HObVoeKkEdvwI
 -----END CERTIFICATE-----
diff --git a/test/pki/key.pem b/test/pki/key.pem
index 7acde5181..f610effe7 100644
--- a/test/pki/key.pem
+++ b/test/pki/key.pem
@@ -3,180 +3,180 @@ Public Key Info:
 	Key Security Level: High (3072 bits)
 
 modulus:
-	00:b5:2d:92:8a:f2:da:01:fb:19:d5:7f:71:ba:7f:fa
-	8b:fd:54:35:2c:46:e6:43:ef:56:47:d3:3d:63:b0:4a
-	00:98:ca:a9:fb:bb:6b:d9:b0:8b:2f:72:ea:ea:1d:00
-	44:83:54:96:17:85:c0:75:c1:5e:0b:17:43:37:c7:a6
-	e8:84:9f:48:e5:05:2f:d4:d2:42:b6:79:78:54:18:71
-	54:d7:f4:81:57:0d:65:db:15:20:bc:02:02:69:62:1a
-	cf:7f:63:b4:bf:14:0d:40:50:f8:32:93:57:ac:ba:44
-	91:cd:ef:2e:b8:3f:26:1c:92:0b:51:c0:61:f3:bf:9e
-	e2:55:dd:99:c0:c4:96:42:22:fe:2e:a5:3e:63:d1:58
-	f3:7c:fc:3a:59:1f:ce:51:49:5c:98:b9:e1:d3:ea:8c
-	2e:fe:c6:d9:d4:4b:8d:d0:2c:57:55:3c:93:b7:b2:92
-	4f:b3:f6:a5:de:28:08:e0:14:11:04:80:b4:d5:6c:74
-	75:cd:ba:d4:a7:0e:36:0d:84:7b:49:0a:44:27:cc:2b
-	27:da:87:74:8e:07:ff:d3:27:3e:ef:0e:ef:99:1f:81
-	ab:90:57:8b:3f:a0:88:16:99:57:87:30:3c:69:19:a2
-	c4:2a:07:18:54:4d:85:fc:79:4c:7c:5b:c2:ae:b6:4a
-	29:78:b5:fe:4d:f9:ac:6f:2c:83:a7:0f:fd:b4:6e:45
-	99:60:3b:4c:45:4e:b5:b4:40:a9:96:a0:12:ea:ca:a5
-	4c:be:27:dd:91:3d:04:05:66:78:79:95:93:0e:7d:91
-	af:81:cc:7b:ba:2f:e7:84:26:29:76:97:a7:65:5d:38
-	6c:ce:d4:47:ef:f4:ab:c3:8a:57:5b:e5:a1:2a:06:b5
-	73:fa:d5:3e:0b:f0:9d:83:9a:75:77:68:36:9b:55:24
-	f7:08:dc:61:b5:ce:5b:1f:5f:77:d5:2b:fd:fc:49:b8
-	7b:5a:bb:13:96:e2:0c:c5:2d:c4:ce:82:f5:20:56:64
-	97:
+	00:a2:d6:8d:a9:cb:80:0a:c5:4a:c2:49:ce:66:d3:22
+	07:2a:03:0f:21:75:16:3f:85:98:3b:82:b2:27:0d:b0
+	f4:dd:1c:ae:51:b8:9b:f1:95:64:be:65:c2:dd:3f:9a
+	c2:1f:1d:22:07:79:4c:43:55:d4:ca:00:57:0b:b7:c8
+	29:f7:51:33:87:91:ba:65:7d:52:71:75:55:4a:59:8b
+	64:dc:09:e3:e3:fa:bc:48:f1:46:1c:3a:84:96:d6:44
+	5a:ea:b3:c0:f8:15:52:63:06:7c:9a:f8:e4:2f:17:5e
+	e0:bc:a5:af:0b:ff:44:cc:f5:ae:80:cb:c7:ea:11:ff
+	a0:72:fb:a8:d9:ca:78:8d:ac:17:92:64:55:dc:37:77
+	a8:0e:eb:c0:9c:bc:a7:d5:50:46:1e:3a:13:c5:ad:de
+	13:0e:e3:61:95:47:8b:df:98:fd:30:77:9d:b4:6b:9c
+	82:2a:90:62:6f:09:23:ed:7d:94:b6:7a:13:19:f3:d9
+	c4:0b:ff:69:45:20:6f:29:f6:9e:65:c0:2c:c0:f9:64
+	c7:12:8f:80:b1:d7:9d:c9:4b:cc:98:04:e1:d0:36:f3
+	5d:8f:05:8f:05:ab:61:00:54:99:0b:0a:5d:47:5e:03
+	42:da:21:ab:5f:28:44:91:f8:71:d8:dd:78:07:a7:19
+	2c:d1:af:7b:54:a0:09:b2:0c:51:c5:3b:73:16:ca:35
+	93:88:06:be:fd:b5:2e:8b:9e:4f:cd:05:2d:e8:e7:ea
+	13:c1:c4:88:b4:5f:a4:27:da:54:f1:6c:fd:28:9f:8d
+	83:07:a6:9d:11:c4:b1:ab:3a:56:7b:1d:49:c2:06:bc
+	84:d5:4e:5f:54:b4:30:4d:aa:49:7a:35:35:3b:a8:0b
+	38:d6:25:39:ab:61:80:86:c9:e3:0d:23:6e:16:ab:52
+	3c:82:45:1d:48:6e:59:95:ed:ba:65:39:8f:dc:c6:47
+	09:d9:1c:73:c0:63:33:d5:64:16:1e:b5:12:04:9a:09
+	9f:
 
 public exponent:
 	01:00:01:
 
 private exponent:
-	66:7a:51:72:30:6c:e9:43:eb:57:dc:4f:2a:ab:2a:bf
-	35:da:04:7d:77:d8:d4:c2:32:6e:4b:e8:64:53:99:77
-	fe:f4:5a:f3:5d:0e:62:c2:3d:e7:e7:bb:42:12:87:4d
-	39:6f:85:b9:e6:58:77:02:99:bb:f2:3b:7d:f8:7a:ca
-	f8:00:d4:8d:5d:c2:b1:41:00:a5:0f:cd:e4:db:32:77
-	47:f3:2f:99:5a:a5:ab:26:a7:2e:50:80:a6:b4:eb:ef
-	43:e1:d4:a1:63:a9:1f:20:ed:52:46:0f:08:4f:0f:6b
-	dd:2c:95:a3:77:6c:8a:2a:7d:26:8f:87:98:04:61:cd
-	29:be:3f:32:4e:bf:a2:c7:02:38:c6:14:a5:07:0b:a6
-	25:a2:d1:2a:0a:18:7b:d7:df:fd:2e:de:b2:2b:ef:80
-	c1:71:1e:52:bb:2d:8a:7b:1a:26:c7:2d:d2:70:b9:db
-	45:32:94:9d:34:cd:d8:58:e1:4b:47:b5:81:26:68:34
-	2a:32:02:0b:e6:95:3a:d2:d4:d6:e4:c7:bf:8e:04:4e
-	fc:75:e9:6d:f4:a4:a8:6b:50:76:7c:10:07:81:96:56
-	54:16:d7:39:8a:5f:51:79:1f:96:49:cb:d7:8b:0d:51
-	5d:4a:e8:22:fb:d1:92:a4:a2:02:65:24:0a:62:33:84
-	a9:df:a9:4f:40:1a:95:1d:98:ea:0c:23:05:c2:db:1e
-	4d:c5:f2:e9:63:6b:de:70:67:3a:a2:f4:72:c1:97:ae
-	d0:6f:78:82:2b:a1:6f:2c:d7:90:a3:4f:d6:f9:d6:80
-	11:d4:93:8e:e0:06:19:f6:d9:33:72:5d:d8:16:a2:ef
-	e1:a9:00:de:bc:7e:98:aa:97:45:b8:81:20:01:5d:0b
-	10:3d:69:a9:ba:7d:2c:1f:e0:17:0e:bc:ee:97:95:61
-	a7:6b:10:94:27:ad:ca:c1:93:3b:fa:dc:8d:3d:58:cc
-	fb:04:3f:7f:40:d6:6c:e8:83:a1:be:50:cd:46:73:11
+	11:5a:fe:c4:4f:1d:39:88:a7:9c:27:93:a9:1f:ed:ab
+	87:cd:c5:aa:12:39:a9:d1:8a:55:25:6b:e9:7f:ab:11
+	9e:13:75:7c:de:49:38:a9:6c:90:62:76:2f:70:9d:04
+	fd:9d:f4:47:89:a5:18:34:28:b6:d2:ec:74:22:45:62
+	3b:aa:da:ec:23:1b:13:c0:14:ae:65:0c:0f:1d:96:1e
+	cc:d8:fd:02:0a:72:50:ef:ee:42:09:f6:a1:c0:fa:8e
+	1a:1f:c8:7c:68:81:5c:6e:8f:8f:50:e1:b9:27:2b:84
+	96:76:ae:3e:80:19:8c:22:cf:53:88:e4:a8:cc:fc:4a
+	d4:96:7f:fb:9e:79:d4:d7:b7:b7:71:9c:39:19:6c:56
+	6c:28:b2:61:c2:35:bd:25:8e:23:a0:9b:04:e1:b0:1e
+	a5:e2:94:3e:fd:de:29:99:bb:ba:93:b5:2a:4a:a1:e6
+	b9:b4:a3:d9:23:c7:41:83:b5:fa:f0:ed:e2:41:3c:3f
+	5e:62:e2:4d:bf:b9:f4:eb:35:0e:76:0e:d5:f6:64:b1
+	48:0a:90:43:f2:2f:bf:da:28:de:52:3d:dc:6e:f4:06
+	aa:29:f8:b3:e6:1d:c5:24:2e:f1:64:cb:2b:04:ab:9a
+	38:5d:0e:60:f4:4b:83:a9:a6:61:a4:08:5a:e8:a7:6a
+	5b:42:b7:68:47:ea:ae:a8:95:e6:25:f1:cc:53:8f:0b
+	a6:2c:72:11:70:16:e1:20:c5:7e:b3:35:f1:b9:df:22
+	d3:a3:7a:34:41:56:41:35:cd:3e:c8:81:fa:77:9a:f0
+	53:84:fb:76:7c:d8:78:04:78:88:dd:c7:ed:fc:51:57
+	2b:32:2b:b0:8a:03:d6:fc:bf:69:b8:22:42:6d:97:bc
+	32:46:31:f5:03:ba:82:80:ee:e9:33:82:11:29:79:d0
+	55:7c:9b:ad:14:4d:c4:13:15:4e:5f:98:26:9b:3b:27
+	a7:06:2a:93:78:07:0b:d0:fc:3a:f7:30:5d:e9:f7:b9
 	
 
 prime1:
-	00:da:9b:62:22:f8:48:3e:9a:4f:ef:e5:b0:f1:e3:5e
-	ec:21:3d:3b:8f:ec:f1:d8:f6:fd:a7:2f:69:2a:cd:79
-	a1:4b:6b:39:36:e9:c3:a9:5b:f9:59:50:71:6b:72:b0
-	8d:13:ca:93:b1:4d:4b:55:3a:69:b2:84:8d:4e:18:77
-	68:ae:f6:d8:ec:43:ef:c8:21:51:b9:cb:86:b7:62:ab
-	5e:90:77:ac:e6:85:a9:e9:f7:19:f7:26:24:4c:18:81
-	53:85:42:cd:35:5c:1d:ae:70:0a:59:b0:44:a2:50:bc
-	68:3a:bd:c2:53:7f:2e:ab:04:2d:85:ee:7d:8a:0c:db
-	cc:85:5a:b5:f8:6f:f8:92:53:0c:93:00:f7:ff:84:61
-	d0:67:f4:10:b4:bf:9a:ba:35:df:05:79:d7:78:42:fb
-	48:c4:db:35:27:4f:18:cf:8d:da:26:13:36:84:42:5d
-	50:c4:9d:38:15:b5:6a:ca:3a:ab:f1:f9:b0:26:1a:54
-	99:
+	00:c7:3d:da:9a:1d:b6:6e:c3:44:62:7d:34:02:bc:8a
+	06:8f:4c:92:86:48:2f:c4:19:0d:04:06:54:53:fd:a9
+	19:ba:7e:73:1a:06:52:07:13:a2:49:a7:fe:a6:c4:8c
+	6f:d1:f6:03:e5:0b:a7:2d:75:f1:51:1d:bc:ae:88:4b
+	d7:46:97:6d:b5:7a:23:c4:c7:b2:d0:92:89:3e:89:57
+	90:64:ed:c2:77:d8:9e:2f:f1:b3:e9:c7:47:a0:03:a7
+	1e:07:8b:aa:56:b4:ee:6b:6e:6c:3f:76:56:e6:f5:fb
+	6d:f3:38:f8:7b:62:05:48:87:f7:f7:7e:d1:db:72:e0
+	92:36:fd:78:08:b4:40:bb:aa:1e:5a:ac:b1:cd:61:0d
+	88:39:0b:8b:7c:fb:10:6b:03:5d:79:15:5d:78:a0:c4
+	f4:ce:46:34:57:5b:45:b7:fb:70:7d:d7:eb:d7:fc:71
+	bf:b7:f8:9e:68:42:90:5d:ed:3f:25:02:17:02:12:b7
+	fb:
 
 prime2:
-	00:d4:2b:34:e6:a1:68:c9:c8:7a:22:5c:21:34:0f:67
-	4b:6a:78:d5:0e:63:be:4b:83:a3:ac:28:b6:37:80:c0
-	79:30:ec:0c:87:6d:c1:f2:d1:f8:bd:8d:3c:bb:20:81
-	d9:dd:6b:25:0d:0c:e4:15:39:11:06:31:06:84:2c:8d
-	12:73:04:b3:cf:fd:57:03:ca:65:3b:f7:e3:e0:6f:37
-	4c:b2:ef:c4:a3:cb:8b:54:f7:35:73:54:e4:f9:62:bd
-	1e:7a:c1:76:b1:f0:cc:d9:d0:fc:c7:83:59:07:3b:55
-	1f:a9:88:7e:e9:27:bb:e8:5a:a0:57:de:1d:f4:56:8c
-	a9:34:9b:0a:43:d5:a1:2a:97:80:27:07:ee:57:20:29
-	f7:08:02:78:c7:fc:9b:c9:28:64:a5:63:a4:a6:a2:65
-	48:fd:6d:42:b0:60:59:13:f7:f1:cd:78:09:94:66:42
-	36:6a:ee:7c:40:c5:f1:2f:f9:7e:ca:f7:b5:02:95:10
-	af:
+	00:d1:39:e3:f7:47:31:cc:91:11:04:a6:6d:c4:05:1f
+	5f:66:6c:71:8a:a6:7e:66:c3:86:a4:a1:20:0f:74:18
+	b1:0a:45:1b:7c:45:ab:b7:52:7a:bf:57:6d:67:77:d5
+	59:3e:ce:34:cc:83:4a:74:8e:72:c6:a0:07:9e:6c:d1
+	66:e4:01:0c:98:77:43:2e:0e:2c:df:c6:6b:2c:2b:31
+	87:a7:c4:5a:50:7e:53:41:30:6a:80:bc:cb:75:93:1f
+	a3:ee:d7:21:01:5c:c5:fd:11:ea:a7:1f:c7:89:1b:c1
+	cd:98:77:80:9d:d9:c9:90:5d:64:f3:c1:9f:87:21:ca
+	e3:3e:0f:8f:91:47:6d:0f:49:0c:f1:71:b7:c8:71:0f
+	24:9c:47:98:25:9d:9d:11:ca:5a:d6:ec:ff:2f:1e:57
+	ff:7d:dd:a9:95:da:7e:e8:5c:4d:96:b7:ee:a1:73:f8
+	96:76:fb:17:e0:96:ff:c1:ca:08:90:88:f7:ab:c4:0f
+	ad:
 
 coefficient:
-	00:c2:99:5b:b5:1c:59:73:c7:70:78:75:aa:67:4d:92
-	d1:27:b6:47:be:e2:71:39:31:f7:5d:be:79:bd:22:b2
-	34:80:b0:a5:39:ab:b2:53:2a:28:f9:4a:34:20:b6:ea
-	25:d5:df:34:ad:d0:b3:26:ed:ba:f3:0c:07:95:34:50
-	ae:48:40:a7:5b:f7:8c:e4:c6:d6:a4:1f:18:07:2a:ea
-	01:38:90:d5:ca:89:19:3d:8e:c2:40:05:e5:09:a8:30
-	78:6c:e9:e6:1d:6c:5b:22:a9:24:d0:07:41:95:0e:82
-	f6:19:e4:6c:c1:96:ae:c3:5d:84:a9:02:e5:7c:d6:b9
-	f7:94:0f:b9:5a:41:87:db:03:17:9b:39:b2:e9:bb:f5
-	3f:0d:91:6d:d2:32:fe:ef:60:19:3c:15:48:c1:a8:e7
-	4c:b8:bd:dc:31:43:49:df:05:be:c5:3b:6a:5d:68:91
-	6d:e6:47:0b:a4:27:74:44:42:12:31:02:ad:aa:7e:e8
-	0c:
+	78:20:f9:55:55:de:fd:be:57:ce:3d:d5:ec:a5:da:ac
+	dd:20:ff:03:37:37:d2:68:6e:7d:35:71:6d:fc:1a:cb
+	36:4a:cc:df:17:5b:39:e7:19:d1:33:2d:a8:6c:f8:34
+	38:8d:cf:46:33:0c:ca:17:8c:a9:ac:67:d8:3d:3a:21
+	2e:21:91:ad:95:8c:c0:b5:83:23:c3:07:3b:dc:70:5d
+	0b:4e:63:99:ff:7d:08:65:24:c8:45:2c:3d:47:3c:40
+	44:fd:e9:b6:8a:67:a8:d4:4d:a8:dc:34:c9:e0:45:c1
+	c8:e8:6b:cf:15:d2:b5:63:17:ac:69:d9:ca:04:60:b3
+	74:ea:a2:9f:26:50:fe:78:a5:ad:71:f5:7c:02:37:04
+	a7:bd:79:d0:d7:e3:0a:0c:12:7e:ff:85:8e:9e:ad:d5
+	48:84:7d:49:c1:b1:ab:50:f7:57:6b:b7:a3:73:77:07
+	c8:50:1c:eb:12:8e:a7:d5:54:68:a3:37:59:6e:75:d7
+	
 
 exp1:
-	00:a6:15:8d:5e:a2:21:49:26:b5:fa:be:18:4b:fe:01
-	bd:06:97:dd:eb:c0:0a:12:5b:bc:64:cb:79:6c:22:85
-	f9:0c:32:9f:5a:60:09:de:5e:d9:37:89:0d:52:a3:e5
-	0c:99:ef:bb:7b:e6:0c:88:e9:03:2a:b4:d8:22:70:26
-	30:6b:55:71:83:37:2e:32:6f:56:07:01:61:0d:6c:b2
-	63:fb:00:61:65:16:41:fc:56:56:ec:d5:96:98:15:ba
-	13:b9:58:02:4e:3a:f8:f5:f1:7b:7b:9e:96:d6:76:de
-	5d:95:db:5b:8b:52:42:23:7d:de:14:36:18:3c:cc:fe
-	25:09:5f:dc:86:ae:93:3c:a0:4a:1a:59:8f:11:1b:03
-	b1:71:79:15:44:2d:9a:21:45:12:76:b7:96:03:71:68
-	36:66:11:60:f5:c7:7b:43:1d:33:92:df:df:f8:65:ef
-	3d:90:d3:1d:ac:28:93:c4:a7:04:c1:a7:80:b3:c2:27
-	69:
+	57:cc:9a:18:70:1f:84:8f:e8:02:be:c9:bc:aa:f8:e8
+	0b:1d:e3:33:e9:7b:a3:1e:a6:ed:af:1c:5a:26:dd:ed
+	c8:91:10:87:d7:61:2e:5d:28:96:ec:c0:fb:1c:82:06
+	84:af:b4:e7:aa:4a:f1:6d:97:f9:f6:f0:be:b8:b1:33
+	1c:98:7e:70:0a:72:d8:b4:67:c8:21:ca:f9:13:ec:d2
+	64:a7:a1:9a:ce:8a:66:f6:4c:22:28:ff:17:34:84:e0
+	66:d2:d5:2d:80:6d:d0:49:c8:c9:ee:8c:3d:1b:08:c1
+	5a:fd:30:02:af:1f:44:e7:26:0e:9a:84:40:00:4f:96
+	1f:45:73:2f:e2:be:e3:f4:03:8c:51:ad:c8:a3:8c:23
+	0b:80:5a:e7:a8:7b:83:ac:e7:f4:03:c6:3c:f2:1b:d9
+	05:4d:4a:a3:74:45:34:de:48:a4:2c:12:72:0b:7c:d4
+	cf:6d:6f:e0:e1:f4:5c:6f:bf:f3:bf:08:04:91:db:21
+	
 
 exp2:
-	3a:11:ad:43:e6:2f:78:f2:be:c2:c2:b6:6f:ba:3b:8a
-	3f:94:dc:b3:38:87:6f:c1:92:bd:5e:d3:28:73:bb:ba
-	2f:b2:9b:67:41:9a:10:ac:79:48:df:ec:1c:47:34:62
-	fd:a0:02:9f:04:c5:34:2d:cf:44:03:8d:06:05:ef:82
-	7a:2a:72:50:5d:c5:40:0b:58:13:c6:af:fe:d0:51:b1
-	53:54:1e:5c:ba:2b:e3:50:59:b7:bc:27:83:3e:0c:06
-	d8:90:34:bd:54:eb:ac:3d:ef:c1:67:68:a9:7b:0a:bc
-	44:b9:50:0a:de:4e:26:b5:0f:27:9d:6a:53:62:90:d3
-	0a:cb:d8:4e:62:9c:de:bc:62:5d:cc:64:e6:41:ae:5a
-	a7:3d:8d:f3:26:67:38:f2:2e:41:b9:f8:e9:86:8e:f4
-	20:30:94:4d:13:c1:ad:9e:71:f6:cb:80:cb:b6:05:2f
-	41:ab:0e:24:e8:48:2f:da:38:62:b2:d3:3e:e6:af:8f
-	
+	00:af:ca:8c:17:7f:e1:ff:97:03:4d:7c:e8:4d:02:60
+	d1:af:24:fe:61:18:72:ab:b5:2c:b3:b6:0d:51:ee:a1
+	b0:5e:88:a2:07:50:22:6e:ed:05:e5:2e:77:e5:af:71
+	ba:82:62:8f:4a:26:25:b0:b8:df:06:b3:fe:b2:c5:8b
+	4b:7f:d6:c1:d6:78:9e:21:5c:17:a8:0c:f6:8f:2d:db
+	77:b7:25:eb:1c:26:87:9d:06:28:f5:f1:aa:a1:26:f4
+	36:b0:be:60:24:dc:e6:1d:33:a8:8c:b2:ce:dc:0c:4e
+	51:88:01:20:37:80:7d:32:a6:c5:e3:68:93:b8:de:53
+	b1:8a:bb:58:4d:20:4e:29:c1:9e:f6:5e:2d:a4:64:19
+	ed:10:c1:b6:bc:24:29:8c:81:10:c1:f4:6e:94:10:52
+	af:7f:f9:76:3b:4a:51:c6:b9:87:17:53:83:54:74:34
+	31:77:d6:90:c1:4b:1d:a8:9d:2f:85:01:0f:d7:69:ec
+	21:
 
 
 Public Key PIN:
-	pin-sha256:6j7MphUbNRjXh9x/BogWeu4m7+ON7aYmCyFxQsSMsec=
+	pin-sha256:DP1FtdL6ROAN9z3CzpX0VVenKXA88+p5XXz+4Vg2qpY=
 Public Key ID:
-	sha256:ea3ecca6151b3518d787dc7f0688167aee26efe38deda6260b217142c48cb1e7
-	sha1:87e4402a0fb8615b3fc7d034871265903c46ec84
+	sha256:0cfd45b5d2fa44e00df73dc2ce95f45557a729703cf3ea795d7cfee15836aa96
+	sha1:1cb5da0f14b78dd0389c4a19c179169dc6085507
 
 -----BEGIN RSA PRIVATE KEY-----
-MIIG5AIBAAKCAYEAtS2SivLaAfsZ1X9xun/6i/1UNSxG5kPvVkfTPWOwSgCYyqn7
-u2vZsIsvcurqHQBEg1SWF4XAdcFeCxdDN8em6ISfSOUFL9TSQrZ5eFQYcVTX9IFX
-DWXbFSC8AgJpYhrPf2O0vxQNQFD4MpNXrLpEkc3vLrg/JhySC1HAYfO/nuJV3ZnA
-xJZCIv4upT5j0VjzfPw6WR/OUUlcmLnh0+qMLv7G2dRLjdAsV1U8k7eykk+z9qXe
-KAjgFBEEgLTVbHR1zbrUpw42DYR7SQpEJ8wrJ9qHdI4H/9MnPu8O75kfgauQV4s/
-oIgWmVeHMDxpGaLEKgcYVE2F/HlMfFvCrrZKKXi1/k35rG8sg6cP/bRuRZlgO0xF
-TrW0QKmWoBLqyqVMvifdkT0EBWZ4eZWTDn2Rr4HMe7ov54QmKXaXp2VdOGzO1Efv
-9KvDildb5aEqBrVz+tU+C/Cdg5p1d2g2m1Uk9wjcYbXOWx9fd9Ur/fxJuHtauxOW
-4gzFLcTOgvUgVmSXAgMBAAECggGAZnpRcjBs6UPrV9xPKqsqvzXaBH132NTCMm5L
-6GRTmXf+9FrzXQ5iwj3n57tCEodNOW+FueZYdwKZu/I7ffh6yvgA1I1dwrFBAKUP
-zeTbMndH8y+ZWqWrJqcuUICmtOvvQ+HUoWOpHyDtUkYPCE8Pa90slaN3bIoqfSaP
-h5gEYc0pvj8yTr+ixwI4xhSlBwumJaLRKgoYe9ff/S7esivvgMFxHlK7LYp7GibH
-LdJwudtFMpSdNM3YWOFLR7WBJmg0KjICC+aVOtLU1uTHv44ETvx16W30pKhrUHZ8
-EAeBllZUFtc5il9ReR+WScvXiw1RXUroIvvRkqSiAmUkCmIzhKnfqU9AGpUdmOoM
-IwXC2x5NxfLpY2vecGc6ovRywZeu0G94giuhbyzXkKNP1vnWgBHUk47gBhn22TNy
-XdgWou/hqQDevH6YqpdFuIEgAV0LED1pqbp9LB/gFw687peVYadrEJQnrcrBkzv6
-3I09WMz7BD9/QNZs6IOhvlDNRnMRAoHBANqbYiL4SD6aT+/lsPHjXuwhPTuP7PHY
-9v2nL2kqzXmhS2s5NunDqVv5WVBxa3KwjRPKk7FNS1U6abKEjU4Yd2iu9tjsQ+/I
-IVG5y4a3YqtekHes5oWp6fcZ9yYkTBiBU4VCzTVcHa5wClmwRKJQvGg6vcJTfy6r
-BC2F7n2KDNvMhVq1+G/4klMMkwD3/4Rh0Gf0ELS/mro13wV513hC+0jE2zUnTxjP
-jdomEzaEQl1QxJ04FbVqyjqr8fmwJhpUmQKBwQDUKzTmoWjJyHoiXCE0D2dLanjV
-DmO+S4OjrCi2N4DAeTDsDIdtwfLR+L2NPLsggdndayUNDOQVOREGMQaELI0ScwSz
-z/1XA8plO/fj4G83TLLvxKPLi1T3NXNU5PlivR56wXax8MzZ0PzHg1kHO1UfqYh+
-6Se76FqgV94d9FaMqTSbCkPVoSqXgCcH7lcgKfcIAnjH/JvJKGSlY6SmomVI/W1C
-sGBZE/fxzXgJlGZCNmrufEDF8S/5fsr3tQKVEK8CgcEAphWNXqIhSSa1+r4YS/4B
-vQaX3evAChJbvGTLeWwihfkMMp9aYAneXtk3iQ1So+UMme+7e+YMiOkDKrTYInAm
-MGtVcYM3LjJvVgcBYQ1ssmP7AGFlFkH8Vlbs1ZaYFboTuVgCTjr49fF7e56W1nbe
-XZXbW4tSQiN93hQ2GDzM/iUJX9yGrpM8oEoaWY8RGwOxcXkVRC2aIUUSdreWA3Fo
-NmYRYPXHe0MdM5Lf3/hl7z2Q0x2sKJPEpwTBp4CzwidpAoHAOhGtQ+YvePK+wsK2
-b7o7ij+U3LM4h2/Bkr1e0yhzu7ovsptnQZoQrHlI3+wcRzRi/aACnwTFNC3PRAON
-BgXvgnoqclBdxUALWBPGr/7QUbFTVB5cuivjUFm3vCeDPgwG2JA0vVTrrD3vwWdo
-qXsKvES5UAreTia1DyedalNikNMKy9hOYpzevGJdzGTmQa5apz2N8yZnOPIuQbn4
-6YaO9CAwlE0Twa2ecfbLgMu2BS9Bqw4k6Egv2jhistM+5q+PAoHBAMKZW7UcWXPH
-cHh1qmdNktEntke+4nE5Mfddvnm9IrI0gLClOauyUyoo+Uo0ILbqJdXfNK3Qsybt
-uvMMB5U0UK5IQKdb94zkxtakHxgHKuoBOJDVyokZPY7CQAXlCagweGzp5h1sWyKp
-JNAHQZUOgvYZ5GzBlq7DXYSpAuV81rn3lA+5WkGH2wMXmzmy6bv1Pw2RbdIy/u9g
-GTwVSMGo50y4vdwxQ0nfBb7FO2pdaJFt5kcLpCd0REISMQKtqn7oDA==
+MIIG4wIBAAKCAYEAotaNqcuACsVKwknOZtMiByoDDyF1Fj+FmDuCsicNsPTdHK5R
+uJvxlWS+ZcLdP5rCHx0iB3lMQ1XUygBXC7fIKfdRM4eRumV9UnF1VUpZi2TcCePj
++rxI8UYcOoSW1kRa6rPA+BVSYwZ8mvjkLxde4Lylrwv/RMz1roDLx+oR/6By+6jZ
+yniNrBeSZFXcN3eoDuvAnLyn1VBGHjoTxa3eEw7jYZVHi9+Y/TB3nbRrnIIqkGJv
+CSPtfZS2ehMZ89nEC/9pRSBvKfaeZcAswPlkxxKPgLHXnclLzJgE4dA2812PBY8F
+q2EAVJkLCl1HXgNC2iGrXyhEkfhx2N14B6cZLNGve1SgCbIMUcU7cxbKNZOIBr79
+tS6Lnk/NBS3o5+oTwcSItF+kJ9pU8Wz9KJ+NgwemnRHEsas6VnsdScIGvITVTl9U
+tDBNqkl6NTU7qAs41iU5q2GAhsnjDSNuFqtSPIJFHUhuWZXtumU5j9zGRwnZHHPA
+YzPVZBYetRIEmgmfAgMBAAECggGAEVr+xE8dOYinnCeTqR/tq4fNxaoSOanRilUl
+a+l/qxGeE3V83kk4qWyQYnYvcJ0E/Z30R4mlGDQottLsdCJFYjuq2uwjGxPAFK5l
+DA8dlh7M2P0CCnJQ7+5CCfahwPqOGh/IfGiBXG6Pj1DhuScrhJZ2rj6AGYwiz1OI
+5KjM/ErUln/7nnnU17e3cZw5GWxWbCiyYcI1vSWOI6CbBOGwHqXilD793imZu7qT
+tSpKoea5tKPZI8dBg7X68O3iQTw/XmLiTb+59Os1DnYO1fZksUgKkEPyL7/aKN5S
+Pdxu9AaqKfiz5h3FJC7xZMsrBKuaOF0OYPRLg6mmYaQIWuinaltCt2hH6q6oleYl
+8cxTjwumLHIRcBbhIMV+szXxud8i06N6NEFWQTXNPsiB+nea8FOE+3Z82HgEeIjd
+x+38UVcrMiuwigPW/L9puCJCbZe8MkYx9QO6goDu6TOCESl50FV8m60UTcQTFU5f
+mCabOyenBiqTeAcL0Pw69zBd6fe5AoHBAMc92podtm7DRGJ9NAK8igaPTJKGSC/E
+GQ0EBlRT/akZun5zGgZSBxOiSaf+psSMb9H2A+ULpy118VEdvK6IS9dGl221eiPE
+x7LQkok+iVeQZO3Cd9ieL/Gz6cdHoAOnHgeLqla07mtubD92Vub1+23zOPh7YgVI
+h/f3ftHbcuCSNv14CLRAu6oeWqyxzWENiDkLi3z7EGsDXXkVXXigxPTORjRXW0W3
++3B91+vX/HG/t/ieaEKQXe0/JQIXAhK3+wKBwQDROeP3RzHMkREEpm3EBR9fZmxx
+iqZ+ZsOGpKEgD3QYsQpFG3xFq7dSer9XbWd31Vk+zjTMg0p0jnLGoAeebNFm5AEM
+mHdDLg4s38ZrLCsxh6fEWlB+U0EwaoC8y3WTH6Pu1yEBXMX9EeqnH8eJG8HNmHeA
+ndnJkF1k88GfhyHK4z4Pj5FHbQ9JDPFxt8hxDyScR5glnZ0RylrW7P8vHlf/fd2p
+ldp+6FxNlrfuoXP4lnb7F+CW/8HKCJCI96vED60CgcBXzJoYcB+Ej+gCvsm8qvjo
+Cx3jM+l7ox6m7a8cWibd7ciREIfXYS5dKJbswPscggaEr7TnqkrxbZf59vC+uLEz
+HJh+cApy2LRnyCHK+RPs0mSnoZrOimb2TCIo/xc0hOBm0tUtgG3QScjJ7ow9GwjB
+Wv0wAq8fROcmDpqEQABPlh9Fcy/ivuP0A4xRrcijjCMLgFrnqHuDrOf0A8Y88hvZ
+BU1Ko3RFNN5IpCwScgt81M9tb+Dh9Fxvv/O/CASR2yECgcEAr8qMF3/h/5cDTXzo
+TQJg0a8k/mEYcqu1LLO2DVHuobBeiKIHUCJu7QXlLnflr3G6gmKPSiYlsLjfBrP+
+ssWLS3/WwdZ4niFcF6gM9o8t23e3JescJoedBij18aqhJvQ2sL5gJNzmHTOojLLO
+3AxOUYgBIDeAfTKmxeNok7jeU7GKu1hNIE4pwZ72Xi2kZBntEMG2vCQpjIEQwfRu
+lBBSr3/5djtKUca5hxdTg1R0NDF31pDBSx2onS+FAQ/XaewhAoHAeCD5VVXe/b5X
+zj3V7KXarN0g/wM3N9Jobn01cW38Gss2SszfF1s55xnRMy2obPg0OI3PRjMMyheM
+qaxn2D06IS4hka2VjMC1gyPDBzvccF0LTmOZ/30IZSTIRSw9RzxARP3ptopnqNRN
+qNw0yeBFwcjoa88V0rVjF6xp2coEYLN06qKfJlD+eKWtcfV8AjcEp7150NfjCgwS
+fv+Fjp6t1UiEfUnBsatQ91drt6NzdwfIUBzrEo6n1VRoozdZbnXX
 -----END RSA PRIVATE KEY-----

From 61c7cc5a929a67a10d88f818eaae72499d8df6f6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 20 May 2021 19:32:53 +0300
Subject: [PATCH 0611/1854] parasite: don't block SIGTRAP

This is the workaround for #1429.

The parasite code contains instructions that trigger SIGTRAP to stop at
certain points. In such cases, the kernel sends a force SIGTRAP that
can't be ignore and if it is blocked, the kernel resets its signal
handler to a default one and unblocks it. It means that if we want to
save the origin signal handle

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/include/uapi/ksigset.h |  6 ++++++
 compel/src/lib/infect.c       | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/compel/include/uapi/ksigset.h b/compel/include/uapi/ksigset.h
index f6b124bf3..8b5d95804 100644
--- a/compel/include/uapi/ksigset.h
+++ b/compel/include/uapi/ksigset.h
@@ -22,4 +22,10 @@ static inline void ksigaddset(k_rtsigset_t *set, int _sig)
 	int sig = _sig - 1;
 	set->sig[sig / _NSIG_BPW] |= 1UL << (sig % _NSIG_BPW);
 }
+
+static inline void ksigdelset(k_rtsigset_t *set, int _sig)
+{
+	int sig = _sig - 1;
+	set->sig[sig / _NSIG_BPW] |= ~(1UL << (sig % _NSIG_BPW));
+}
 #endif
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 1bb07ace5..a15b99ad6 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -281,6 +281,19 @@ try_again:
 	if (ss->seccomp_mode != SECCOMP_MODE_DISABLED && ptrace_suspend_seccomp(pid) < 0)
 		goto err;
 
+	/*
+	 * FIXME(issues/1429): parasite code contains instructions that trigger
+	 * SIGTRAP to stop at certain points. In such cases, the kernel sends a
+	 * force SIGTRAP that can't be ignored and if it is blocked, the kernel
+	 * resets its signal handler to a default one and unblocks it. It means
+	 * that if we want to save the origin signal handler, we need to run a
+	 * parasite code with the unblocked SIGTRAP.
+	 */
+	if ((ss->sigpnd | ss->shdpnd) & (1 << (SIGTRAP - 1))) {
+		pr_err("Can't dump the %d thread with a pending SIGTRAP.\n", pid);
+		goto err;
+	}
+
 	nr_sigstop = 0;
 	if (ss->sigpnd & (1 << (SIGSTOP - 1)))
 		nr_sigstop++;
@@ -447,6 +460,11 @@ static int parasite_run(pid_t pid, int cmd, unsigned long ip, void *stack,
 	k_rtsigset_t block;
 
 	ksigfillset(&block);
+	/*
+	 * FIXME(issues/1429): SIGTRAP can't be blocked, otherwice its hanlder
+	 * will be reseted to the default one.
+	 */
+	ksigdelset(&block, SIGTRAP);
 	if (ptrace(PTRACE_SETSIGMASK, pid, sizeof(k_rtsigset_t), &block)) {
 		pr_perror("Can't block signals for %d", pid);
 		goto err_sig;

From c8973d426b49094a1b9b0df40dd9b4d4a28b8e8b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 20 May 2021 19:34:31 +0300
Subject: [PATCH 0612/1854] test/zdtm: check that a penging SIGTRAP handled
 properly

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile     |  1 +
 test/zdtm/static/sigtrap.c    | 81 +++++++++++++++++++++++++++++++++++
 test/zdtm/static/sigtrap.desc |  1 +
 3 files changed, 83 insertions(+)
 create mode 100644 test/zdtm/static/sigtrap.c
 create mode 100644 test/zdtm/static/sigtrap.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 6e4f50880..525f91ba3 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -237,6 +237,7 @@ TST_NOFILE	:=				\
 		timens_nested			\
 		timens_for_kids			\
 		zombie_leader			\
+		sigtrap				\
 #		jobctl00			\
 
 pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
diff --git a/test/zdtm/static/sigtrap.c b/test/zdtm/static/sigtrap.c
new file mode 100644
index 000000000..659213cf5
--- /dev/null
+++ b/test/zdtm/static/sigtrap.c
@@ -0,0 +1,81 @@
+#include <unistd.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/signalfd.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that a pending SIGTRAP handled correctly";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+
+static void sigh(int signo) {}
+
+int main(int argc, char *argv[])
+{
+	int fd, ret;
+	sigset_t mask;
+	siginfo_t info;
+	struct sigaction act = {
+		.sa_handler = sigh,
+	};
+
+	test_init(argc, argv);
+
+	if (sigaction(SIGTRAP, &act, NULL)) {
+		pr_perror("sigaction");
+		exit(1);
+	}
+
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGTRAP);
+	fd = signalfd(-1, &mask, SFD_NONBLOCK);
+	if (fd < 0) {
+		fail("Can't create signalfd");
+		exit(1);
+	}
+
+	sigemptyset(&mask);
+	sigaddset(&mask, SIGTRAP);
+	sigprocmask(SIG_BLOCK, &mask, NULL);
+	kill(getpid(), SIGTRAP);
+
+	test_daemon();
+	test_waitsig();
+
+	ret = read(fd, &info, sizeof(info));
+	if (ret < 0) {
+		fail("can't read signals");
+		exit(1);
+	}
+
+	if (info.si_signo != SIGTRAP) {
+		fail("wrong signal");
+		exit(1);
+	}
+
+	if (sigaction(SIGTRAP, NULL, &act)) {
+		pr_perror("sigaction");
+		exit(1);
+	}
+
+	if (act.sa_handler != sigh) {
+		fail("unexpected sighanl hanlder");
+		exit(1);
+	}
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/sigtrap.desc b/test/zdtm/static/sigtrap.desc
new file mode 100644
index 000000000..ded89879a
--- /dev/null
+++ b/test/zdtm/static/sigtrap.desc
@@ -0,0 +1 @@
+{'flags': 'crfail'}

From e393001095e910fbcf2f1584f411f49ae32cb574 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 24 May 2021 06:36:09 +0100
Subject: [PATCH 0613/1854] lib/cli.py: Open explore file as a binary

Fixes #1484

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/py/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index cb125aab8..e3c4a4fb3 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -36,7 +36,7 @@ def outf(opts, decode):
 
 
 def dinf(opts, name):
-    return open(os.path.join(opts['dir'], name))
+    return open(os.path.join(opts['dir'], name), mode='rb')
 
 
 def decode(opts):

From 8c303d1a6495972f97b87a458c1be0a214228e45 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 25 May 2021 06:30:52 +0100
Subject: [PATCH 0614/1854] test/others/crit: add test for 'x'

This commit extends the CRIT tests to cover the 'x' command, which is
used to explore an image directory.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/crit/test.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 9d30575c4..2976730b3 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -100,6 +100,12 @@ function run_test2 {
 	${CRIT} decode -i "${JSON_IN}" || true
 	${CRIT} decode -i "${JSON_IN}" -o "${OUT}" || true
 	${CRIT} decode -i "${JSON_IN}" > "${OUT}" || true
+
+	# explore image directory
+	${CRIT} x ./ ps || _exit 1
+	${CRIT} x ./ fds || _exit 1
+	${CRIT} x ./ mems || _exit 1
+	${CRIT} x ./ rss || _exit 1
 }
 
 gen_imgs

From 5d08f975a1997f5f4dcd30883290cc621645704b Mon Sep 17 00:00:00 2001
From: nithin-jaikar <jaikar006@gmail.com>
Date: Fri, 21 May 2021 23:52:06 +0530
Subject: [PATCH 0615/1854] kerndat: Handle non-root mode when checking uffd

When criu is run as user it fails and exits because of kerndat_uffd() returning -1.
This, in turn, happens after uffd = syscall(SYS_userfaultfd, flags); which only works
for root.

In the change it ignores the permission error and proceeds further just like it's done
for e.g. pagemap checking.

Signed-off-by: Nithin Jaikar J <jaikar006@gmail.com>
---
 criu/kerndat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index a559756f8..53a8c2304 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -919,7 +919,10 @@ static int kerndat_uffd(void)
 	if (uffd < 0) {
 		if (uffd == -ENOSYS)
 			return 0;
-
+		if (uffd == -EPERM) {
+			pr_info("Lazy pages are disabled\n");
+			return 0;
+		}
 		pr_err("Lazy pages are not available\n");
 		return -1;
 	}

From 30e8d8cadf336718470ccc78c6a6e02708040077 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 26 Feb 2021 14:55:43 +0200
Subject: [PATCH 0616/1854] criu: check if pidfd_open syscall is supported

pidfd_open syscall will be needed later to send pidfds between
pre-dump/dump iterations for pid reuse detection.

v2:
	- make kerndat_has_pidfd_open void since 0 is always returned
	- fix missing tabs in syscall tables

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 compel/arch/arm/plugins/std/syscalls/syscall.def  |  1 +
 .../arch/mips/plugins/std/syscalls/syscall_64.tbl |  3 ++-
 .../ppc64/plugins/std/syscalls/syscall-ppc64.tbl  |  1 +
 .../s390/plugins/std/syscalls/syscall-s390.tbl    |  1 +
 .../arch/x86/plugins/std/syscalls/syscall_32.tbl  |  1 +
 .../arch/x86/plugins/std/syscalls/syscall_64.tbl  |  1 +
 criu/include/kerndat.h                            |  1 +
 criu/kerndat.c                                    | 15 +++++++++++++++
 8 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index f7ebc8527..b20b6cb35 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -116,3 +116,4 @@ fsopen				430	430	(char *fsname, unsigned int flags)
 fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
 clone3				435	435	(struct clone_args *uargs, size_t size)
+pidfd_open			434	434	(pid_t pid, unsigned int flags)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 47c08fc4c..2397c943c 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -112,4 +112,5 @@ __NR_userfaultfd		5317		sys_userfaultfd		(int flags)
 __NR_fsopen			5430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			5432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
-__NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
\ No newline at end of file
+__NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_pidfd_open			5434		sys_pidfd_open		(pid_t pid, unsigned int flags)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 1afaf1e70..ce93d8249 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -112,3 +112,4 @@ __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index ae6fdb5f8..4d058375c 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -112,3 +112,4 @@ __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 7a487110d..863db6a56 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -100,3 +100,4 @@ __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 6667c07db..ba32affb0 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -111,3 +111,4 @@ __NR_fsopen			430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_pidfd_open			434		sys_pidfd_open		(pid_t pid, unsigned int flags)
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 8b7088df0..bd5352a48 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -69,6 +69,7 @@ struct kerndat_s {
 	bool has_clone3_set_tid;
 	bool has_timens;
 	bool has_newifindex;
+	bool has_pidfd_open;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 53a8c2304..9aeef17d2 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1055,6 +1055,19 @@ static bool kerndat_has_clone3_set_tid(void)
 	return 0;
 }
 
+static void kerndat_has_pidfd_open(void)
+{
+	int pidfd;
+
+	pidfd = syscall(SYS_pidfd_open, getpid(), 0);
+	if (pidfd == -1)
+		kdat.has_pidfd_open = false;
+	else
+		kdat.has_pidfd_open = true;
+
+	close_safe(&pidfd);
+}
+
 int kerndat_init(void)
 {
 	int ret;
@@ -1192,6 +1205,8 @@ int kerndat_init(void)
 		pr_err("kerndat_has_newifindex failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret)
+		kerndat_has_pidfd_open();
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From a9508c98641e2e0337ca9a913addcbb54030a36b Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 26 Feb 2021 22:32:39 +0200
Subject: [PATCH 0617/1854] criu: check if pidfd_getfd syscall is supported

pidfd_getfd syscall will be needed later to send pidfds between
pre-dump/dump iterations for pid reuse detection.

v2:
	- check size written/read of val_a/val_b is correct
	- return with error when val_a != val_b

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 criu/include/kerndat.h                        |  1 +
 criu/kerndat.c                                | 67 +++++++++++++++++++
 8 files changed, 74 insertions(+)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index b20b6cb35..e6508ed9f 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -117,3 +117,4 @@ fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value
 fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
 clone3				435	435	(struct clone_args *uargs, size_t size)
 pidfd_open			434	434	(pid_t pid, unsigned int flags)
+pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 2397c943c..7a6db192c 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -114,3 +114,4 @@ __NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key,
 __NR_fsmount			5432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open			5434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_pidfd_getfd		5438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index ce93d8249..1bb626bc5 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -113,3 +113,4 @@ __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, co
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index 4d058375c..7178bf483 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -113,3 +113,4 @@ __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, co
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 863db6a56..7e456cdb7 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -101,3 +101,4 @@ __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, co
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index ba32affb0..2dfcc6eee 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -112,3 +112,4 @@ __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, c
 __NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open			434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_pidfd_getfd		438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index bd5352a48..df57ca185 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -70,6 +70,7 @@ struct kerndat_s {
 	bool has_timens;
 	bool has_newifindex;
 	bool has_pidfd_open;
+	bool has_pidfd_getfd;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 9aeef17d2..90f4f2d9a 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1068,6 +1068,69 @@ static void kerndat_has_pidfd_open(void)
 	close_safe(&pidfd);
 }
 
+static int kerndat_has_pidfd_getfd(void)
+{
+	int ret;
+	int fds[2];
+	int val_a, val_b;
+	int pidfd, stolen_fd;
+
+	ret = 0;
+
+	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, fds)) {
+		pr_perror("Can't open unix socket pair");
+		ret = -1;
+		goto out;
+	}
+
+	val_a = 1984;
+	if (write(fds[0], &val_a, sizeof(val_a)) != sizeof(val_a)) {
+		pr_perror("Can't write to socket");
+		ret = -1;
+		goto close_pair;
+	}
+
+	pidfd = syscall(SYS_pidfd_open, getpid(), 0);
+	if (pidfd == -1) {
+		pr_warn("Can't get pidfd\n");
+		/*
+		 * If pidfd_open is not supported then pidfd_getfd
+		 * will not be supported as well.
+		 */
+		kdat.has_pidfd_getfd = false;
+		goto close_pair;
+	}
+
+	stolen_fd = syscall(SYS_pidfd_getfd, pidfd, fds[1], 0);
+	if (stolen_fd == -1) {
+		kdat.has_pidfd_getfd = false;
+		goto close_all;
+	}
+
+	if (read(fds[1], &val_b, sizeof(val_b)) != sizeof(val_b)) {
+		pr_perror("Can't read from socket");
+		ret = -1;
+		goto close_all;
+	}
+
+	if (val_b == val_a) {
+		kdat.has_pidfd_getfd = true;
+	} else {
+		/* If val_b != val_a then something unexpected happend. */
+		pr_err("Unexpected value read from socket\n");
+		ret = -1;
+	}
+
+close_all:
+	close_safe(&stolen_fd);
+	close_safe(&pidfd);
+close_pair:
+	close(fds[0]);
+	close(fds[1]);
+out:
+	return ret;
+}
+
 int kerndat_init(void)
 {
 	int ret;
@@ -1205,6 +1268,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_newifindex failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_pidfd_getfd()) {
+		pr_err("kerndat_has_pidfd_getfd failed when initializing kerndat.\n");
+		ret = -1;
+	}
 	if (!ret)
 		kerndat_has_pidfd_open();
 

From e3c9c3429a58cd5aedeec0dc703e4b44870799f8 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 16 Mar 2021 14:21:19 +0200
Subject: [PATCH 0618/1854] cr-service: add pidfd_store_sk option to rpc.proto

pidfd_store_sk option will be used later to store tasks pidfds
between predumps to detect pid reuse reliably.
pidfd_store_sk should be a fd of a connectionless unix socket.

init_pidfd_store_sk() steals the socket from the RPC client using
pidfd_getfd, checks that it is a connectionless unix socket and
checks if it is not initialized before (i.e. unnamed socket).
If not initialized the socket is first bound to an abstract name
(combination of the real pid/fd to avoid overlap), then it is
connected to itself hence allowing us to store the pidfds in the
receive queue of the socket (this is similar to how fdstore_init()
works).

v2:
	- avoid close(pidfd) overriding errno of SYS_pidfd_open in
	  init_pidfd_store_sk()
	- close pidfd_store_sk because we might have leftover from
	  previous iterations

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-service.c  |  4 ++
 criu/include/mem.h |  2 +
 criu/mem.c         | 97 ++++++++++++++++++++++++++++++++++++++++++++++
 images/rpc.proto   |  1 +
 lib/c/criu.c       | 11 ++++++
 lib/c/criu.h       |  2 +
 6 files changed, 117 insertions(+)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 474f598ac..983d60096 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -40,6 +40,7 @@
 #include "proc_parse.h"
 #include "common/scm.h"
 #include "uffd.h"
+#include "mem.h"
 
 #include "setproctitle.h"
 
@@ -688,6 +689,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		}
 	}
 
+	if (req->has_pidfd_store_sk && init_pidfd_store_sk(ids.pid, req->pidfd_store_sk))
+		goto err;
+
 	if (req->orphan_pts_master)
 		opts.orphan_pts_master = true;
 
diff --git a/criu/include/mem.h b/criu/include/mem.h
index 251cb1a9e..24b888b75 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -50,4 +50,6 @@ int prepare_vmas(struct pstree_item *t, struct task_restore_args *ta);
 int unmap_guard_pages(struct pstree_item *t);
 int prepare_mappings(struct pstree_item *t);
 bool should_dump_page(VmaEntry *vmae, u64 pme);
+
+int init_pidfd_store_sk(pid_t pid, int fd);
 #endif /* __CR_MEM_H__ */
diff --git a/criu/mem.c b/criu/mem.c
index e11f4f492..211bc8750 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -30,10 +30,107 @@
 #include "fault-injection.h"
 #include "prctl.h"
 #include "compel/infect-util.h"
+#include "compel/plugins/std/syscall-codes.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
 
+static int pidfd_store_sk = -1;
+
+int init_pidfd_store_sk(pid_t pid, int sk)
+{
+	int pidfd;
+	int sock_type;
+	socklen_t len;
+	struct sockaddr_un addr;
+	unsigned int addrlen;
+	/* In kernel a bufsize has type int and a value is doubled. */
+	uint32_t buf[2] = { INT_MAX / 2, INT_MAX / 2 };
+
+	if (!kdat.has_pidfd_open) {
+		pr_err("pidfd_open syscall is not supported\n");
+		return -1;
+	}
+
+	if (!kdat.has_pidfd_getfd) {
+		pr_err("pidfd_getfd syscall is not supported\n");
+		return -1;
+	}
+
+	/* Steal pidfd store socket from RPC client */
+	pidfd = syscall(SYS_pidfd_open, pid, 0);
+	if (pidfd == -1) {
+		pr_perror("Can't get pidfd of (pid: %d)", pid);
+		goto err;
+	}
+
+	close_safe(&pidfd_store_sk);
+	pidfd_store_sk = syscall(SYS_pidfd_getfd, pidfd, sk, 0);
+	if (pidfd_store_sk == -1) {
+		pr_perror("Can't steal fd %d using pidfd_getfd", sk);
+		close(pidfd);
+		goto err;
+	}
+	close(pidfd);
+
+	/* Check that stolen socket is a connectionless unix domain socket */
+	len = sizeof(sock_type);
+	if (getsockopt(pidfd_store_sk, SOL_SOCKET, SO_TYPE, &sock_type, &len)) {
+		pr_perror("Can't get socket type (fd: %d)", pidfd_store_sk);
+		goto err;
+	}
+
+	if (sock_type != SOCK_DGRAM) {
+		pr_err("Pidfd store socket must be of type SOCK_DGRAM\n");
+		goto err;
+	}
+
+	addrlen = sizeof(addr);
+	if (getsockname(pidfd_store_sk, (struct sockaddr *)&addr, &addrlen)) {
+		pr_perror("Can't get socket bound name (fd: %d)", pidfd_store_sk);
+		goto err;
+	}
+
+	if (addr.sun_family != AF_UNIX) {
+		pr_err("Pidfd store socket must be AF_UNIX\n");
+		goto err;
+	}
+
+	/*
+	 * Unnamed socket needs to be initialized and connected to itself.
+	 * This only occurs once in the first predump, after the socket is
+	 * bound, addrlen will be sizeof(struct sockaddr_un).
+	 * This is similar to how fdstore_init() works.
+	 */
+	if (addrlen == sizeof(sa_family_t)) {
+		if (setsockopt(pidfd_store_sk, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0], sizeof(buf[0])) < 0 ||
+			setsockopt(pidfd_store_sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
+			pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
+			goto err;
+		}
+
+		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d", pid, sk);
+		addrlen += sizeof(addr.sun_family);
+
+		addr.sun_path[0] = 0;
+
+		if (bind(pidfd_store_sk, (struct sockaddr *)&addr, addrlen)) {
+			pr_perror("Unable to bind a socket");
+			goto err;
+		}
+
+		if (connect(pidfd_store_sk, (struct sockaddr *) &addr, addrlen)) {
+			pr_perror("Unable to connect a socket");
+			goto err;
+		}
+	}
+
+	return 0;
+err:
+	close_safe(&pidfd_store_sk);
+	return -1;
+}
+
 static int task_reset_dirty_track(int pid)
 {
 	int ret;
diff --git a/images/rpc.proto b/images/rpc.proto
index c968cc991..e83f2c9f8 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -129,6 +129,7 @@ message criu_opts {
 	optional bool			tls_no_cn_verify	= 59;
 	optional string			cgroup_yard		= 60;
 	optional criu_pre_dump_mode	pre_dump_mode		= 61 [default = SPLICE];
+	optional int32			pidfd_store_sk		= 62;
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 7b780044b..6f7c673eb 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1782,3 +1782,14 @@ int criu_get_orphan_pts_master_fd(void)
 {
 	return orphan_pts_master_fd;
 }
+
+void criu_local_set_pidfd_store_sk(criu_opts *opts, int sk)
+{
+	opts->rpc->has_pidfd_store_sk = true;
+	opts->rpc->pidfd_store_sk = sk;
+}
+
+void criu_set_pidfd_store_sk(int sk)
+{
+	criu_local_set_pidfd_store_sk(global_opts, sk);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index e9b2f1e9d..3d6493958 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -102,6 +102,7 @@ int criu_add_inherit_fd(int fd, const char *key);
 int criu_add_external(const char *key);
 int criu_set_page_server_address_port(const char *address, int port);
 int criu_set_pre_dump_mode(enum criu_pre_dump_mode mode);
+void criu_set_pidfd_store_sk(int sk);
 
 /*
  * The criu_notify_arg_t na argument is an opaque
@@ -260,6 +261,7 @@ int criu_local_add_inherit_fd(criu_opts *opts, int fd, const char *key);
 int criu_local_add_external(criu_opts *opts, const char *key);
 int criu_local_set_page_server_address_port(criu_opts *opts, const char *address, int port);
 int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode);
+void criu_local_set_pidfd_store_sk(criu_opts *opts, int sk);
 
 void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_notify_arg_t na));
 

From ba882893c330b557f99fa6a23bb19c9d2c06e9f9 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 16 Mar 2021 15:07:39 +0200
Subject: [PATCH 0619/1854] cr-check: add ability to check if pidfd_store
 feature is supported

pidfd_store which will be used for reliable pidfd based pid reuse
detection for RPC clients requires two recent syscalls (pidfd_open
and pidfd_getfd).

We allow checking if pidfd_store is supported using:
	1. CLI: criu check --feature pidfd_store
	2. RPC: CRIU_REQ_TYPE__FEATURE_CHECK and set pidfd_store to
	   true in the "features" field of the request

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-check.c   | 17 +++++++++++++++++
 criu/cr-service.c |  6 ++++++
 images/rpc.proto  |  1 +
 3 files changed, 24 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index eef45b93b..fda17cc53 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1331,6 +1331,21 @@ static int check_net_diag_raw(void)
 		socket_test_collect_bit(AF_INET6, IPPROTO_RAW)) ? 0 : -1;
 }
 
+static int check_pidfd_store(void)
+{
+	if (!kdat.has_pidfd_open) {
+		pr_warn("Pidfd store requires pidfd_open syscall which is not supported\n");
+		return -1;
+	}
+
+	if (!kdat.has_pidfd_getfd) {
+		pr_warn("Pidfd store requires pidfd_getfd syscall which is not supported\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1443,6 +1458,7 @@ int cr_check(void)
 		ret |= check_clone3_set_tid();
 		ret |= check_time_namespace();
 		ret |= check_newifindex();
+		ret |= check_pidfd_store();
 	}
 
 	/*
@@ -1551,6 +1567,7 @@ static struct feature_list feature_list[] = {
 	{ "newifindex", check_newifindex},
 	{ "nftables", check_nftables_cr },
 	{ "has_ipt_legacy", check_ipt_legacy },
+	{ "pidfd_store", check_pidfd_store },
 	{ NULL, NULL },
 };
 
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 983d60096..81ae5f745 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -1065,6 +1065,8 @@ static int handle_feature_check(int sk, CriuReq * msg)
 	feat.mem_track = false;
 	feat.has_lazy_pages = 1;
 	feat.lazy_pages = false;
+	feat.has_pidfd_store = 1;
+	feat.pidfd_store = false;
 
 	pid = fork();
 	if (pid < 0) {
@@ -1086,6 +1088,10 @@ static int handle_feature_check(int sk, CriuReq * msg)
 		    (msg->features->lazy_pages == true))
 			feat.lazy_pages = kdat.has_uffd && uffd_noncooperative();
 
+		if ((msg->features->has_pidfd_store == 1) &&
+		    (msg->features->pidfd_store == true))
+			feat.pidfd_store = kdat.has_pidfd_getfd && kdat.has_pidfd_open;
+
 		resp.features = &feat;
 		resp.type = msg->type;
 		/* The feature check is working, actual results are in resp.features */
diff --git a/images/rpc.proto b/images/rpc.proto
index e83f2c9f8..f667d136c 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -174,6 +174,7 @@ enum criu_req_type {
 message criu_features {
 	optional bool			mem_track	= 1;
 	optional bool			lazy_pages	= 2;
+	optional bool			pidfd_store	= 3;
 }
 
 /*

From e79131e8c36940422095eab63202c76706a07c4e Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 16 Mar 2021 15:12:10 +0200
Subject: [PATCH 0620/1854] criu: add pidfd based pid reuse detection for RPC
 clients

Closes: #717

This increases the reliability of pid reuse detection using pidfds,
currently through RPC migration tools like P.Haul.

A connectionless unix socket is passed to criu in RPC mode through
the RPC option pidfd_store_sk.
If this option is set, the socket is initialized in
init_pidfd_store_sk() to be used as a queue for task pidfds.
criu then sends tasks pidfds to this socket in send_pidfd_entry()
and receives them in the next pre-dump/dump iteration to build
the pidfds hashtable in init_pidfd_store_hash().
These pidfds will be used later in detect_pid_reuse().

How it should be used in migration tools like P.Haul:
	- Open a connectionless unix socket
	- Pass the socket fd in the RPC option pidfd_store_sk when
	  doing a pre-dump or dump

This will fail if the kernel does not support pidfd_open or
pidfd_getfd syscalls, so pidfd_store_sk should not be set if the
kernel does not support pidfd_open.
This could be checked with:
	CLI: criu check --feature pidfd_store
	RPC: CRIU_REQ_TYPE__FEATURE_CHECK and set pidfd_store to
	     true in the "features" field of the request

v2:
	- add reasonable polling restart limit in check_pidfd_entry_state
	  to avoid getting stuck
	- avoid leaking pidfd in send_pidfd_entry when entry is NULL,
	  otherwise pidfds are freed in free_pidfd_store

v3:
	- check that the passed pidfd store is not empty after
	  the first iteration (i.e. --prev-images-dir option set).

v4:
	- clear pidfd_hash heads
	- check entry allocation error in init_pidfd_store_hash()

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-dump.c     |  17 ++++
 criu/include/mem.h |   3 +
 criu/mem.c         | 203 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 223 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 193a49c4d..1be98745d 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1165,6 +1165,15 @@ static int pre_dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie
 	pr_info("Pre-dumping task (pid: %d)\n", pid);
 	pr_info("========================================\n");
 
+	/*
+	 * Send pidfd of task over pidfd_store_sk if it is set.
+	 * This pidfd will be used in the next pre-dump/dump iteration
+	 * in detect_pid_reuse().
+	 */
+	ret = send_pidfd_entry(pid);
+	if (ret)
+		goto err;
+
 	if (item->pid->state == TASK_STOPPED) {
 		pr_warn("Stopped tasks are not supported\n");
 		return 0;
@@ -1562,6 +1571,7 @@ static int cr_pre_dump_finish(int status)
 
 	free_pstree(root_item);
 	seccomp_free_entries();
+	free_pidfd_store();
 
 	if (irmap_predump_run()) {
 		ret = -1;
@@ -1616,6 +1626,9 @@ int cr_pre_dump_tasks(pid_t pid)
 	if (init_stats(DUMP_STATS))
 		goto err;
 
+	if (init_pidfd_store_hash())
+		goto err;
+
 	if (cr_plugin_init(CR_PLUGIN_STAGE__PRE_DUMP))
 		goto err;
 
@@ -1772,6 +1785,7 @@ static int cr_dump_finish(int ret)
 	free_link_remaps();
 	free_aufs_branches();
 	free_userns_maps();
+	free_pidfd_store();
 
 	close_service_fd(CR_PROC_FD_OFF);
 	close_image_dir();
@@ -1817,6 +1831,9 @@ int cr_dump_tasks(pid_t pid)
 	if (init_stats(DUMP_STATS))
 		goto err;
 
+	if (init_pidfd_store_hash())
+		goto err;
+
 	if (cr_plugin_init(CR_PLUGIN_STAGE__DUMP))
 		goto err;
 
diff --git a/criu/include/mem.h b/criu/include/mem.h
index 24b888b75..d747385c4 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -52,4 +52,7 @@ int prepare_mappings(struct pstree_item *t);
 bool should_dump_page(VmaEntry *vmae, u64 pme);
 
 int init_pidfd_store_sk(pid_t pid, int fd);
+int init_pidfd_store_hash(void);
+void free_pidfd_store(void);
+int send_pidfd_entry(pid_t pid);
 #endif /* __CR_MEM_H__ */
diff --git a/criu/mem.c b/criu/mem.c
index 211bc8750..4fa2b72ed 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -31,11 +31,20 @@
 #include "prctl.h"
 #include "compel/infect-util.h"
 #include "compel/plugins/std/syscall-codes.h"
+#include "common/scm.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
 
+struct pidfd_entry {
+	pid_t				pid;
+	int				pidfd;
+	struct hlist_node		hash; /* To lookup pidfd by pid */
+};
+
 static int pidfd_store_sk = -1;
+#define PIDFD_HASH_SIZE	32
+static struct hlist_head pidfd_hash[PIDFD_HASH_SIZE];
 
 int init_pidfd_store_sk(pid_t pid, int sk)
 {
@@ -131,6 +140,175 @@ err:
 	return -1;
 }
 
+void free_pidfd_store(void)
+{
+	int i;
+	struct pidfd_entry *entry;
+	struct hlist_node *tmp;
+
+	for (i = 0; i < PIDFD_HASH_SIZE; i++) {
+		hlist_for_each_entry_safe(entry, tmp, &pidfd_hash[i], hash) {
+			close(entry->pidfd);
+			xfree(entry);
+		}
+		INIT_HLIST_HEAD(&pidfd_hash[i]);
+	}
+
+	close_safe(&pidfd_store_sk);
+}
+
+int init_pidfd_store_hash(void)
+{
+	int i, cnt, ret;
+	struct pidfd_entry *entry;
+
+	for (i = 0; i < PIDFD_HASH_SIZE; i++)
+		INIT_HLIST_HEAD(&pidfd_hash[i]);
+
+	/* Skip building pidfd_hash if pidfd_store_sk is not initialized */
+	if (pidfd_store_sk == -1)
+		return 0;
+
+	/*
+	 * Drain all queued pidfd entries in pidfd_store_sk from
+	 * the last predump into pidfd_hash.
+	 */
+	cnt = 0;
+	while (1) {
+		entry = xmalloc(sizeof(struct pidfd_entry));
+		if (entry == NULL) {
+			return -1;
+		}
+		INIT_HLIST_NODE(&entry->hash);
+
+		ret = __recv_fds(pidfd_store_sk, &entry->pidfd, 1, &entry->pid, sizeof(pid_t), MSG_DONTWAIT);
+		if (ret == -EAGAIN || ret == -EWOULDBLOCK) {
+			/* No more fds to read */
+			xfree(entry);
+			goto check_empty;
+		} else if (ret) {
+			pr_perror("Can't read pidfd");
+			xfree(entry);
+			free_pidfd_store();
+			return ret;
+		}
+
+		cnt++;
+		hlist_add_head(&entry->hash, &pidfd_hash[entry->pid % PIDFD_HASH_SIZE]);
+	}
+
+check_empty:
+	/*
+	 * If no pidfds exist in pidfd_store. This would cause full page
+	 * dumps which goes against the purpose of the pidfd store.
+	 * This is probably due to sending a different pidfd_store socket.
+	 */
+	if (cnt == 0 && opts.img_parent) {
+		pr_err("No pidfds found in pidfd store\n");
+		pr_err("The same socket from the previous iteration should be passed\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+static struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid)
+{
+	struct pidfd_entry *entry;
+	struct hlist_head *chain;
+
+	chain = &pidfd_hash[pid % PIDFD_HASH_SIZE];
+	hlist_for_each_entry(entry, chain, hash) {
+		if (entry->pid == pid)
+			return entry;
+	}
+
+	return NULL;
+}
+
+/*
+ * 1 - task closed
+ * 0 - task still running
+ * -1 - error
+ */
+static int check_pidfd_entry_state(struct pidfd_entry *entry)
+{
+	struct pollfd pollfd;
+	int ret, restart_cnt = 0;
+	const int MAX_RESTARTS = 10; /* Reasonable limit to avoid getting stuck */
+
+	/*
+	 * When there is data to read from the pidfd, it means
+	 * that the task associated with this pidfd is closed.
+	 */
+	pollfd.fd = entry->pidfd;
+	pollfd.events = POLLIN;
+
+	while (1) {
+		ret = poll(&pollfd, 1, 0);
+		if (errno == EINTR && restart_cnt < MAX_RESTARTS) {
+			restart_cnt++;
+			continue; /* restart polling */
+		}
+
+		return ret;
+	}
+}
+
+int send_pidfd_entry(pid_t pid)
+{
+	int pidfd, entry_state;
+	struct pidfd_entry *entry;
+
+	/* Skip sending if pidfd_store_sk is not initialized */
+	if (pidfd_store_sk == -1)
+		return 0;
+
+	/*
+	 * Use existing pidfd entry or create pidfd for task.
+	 * If entry exists with same pid we must check that
+	 * it is not a case of pid reuse (i.e. task is closed).
+	 */
+	entry = find_pidfd_entry_by_pid(pid);
+	if (entry != NULL) {
+		entry_state = check_pidfd_entry_state(entry);
+		if (entry_state == -1) {
+			pr_perror("Can't get state of pidfd entry of pid %d", pid);
+			return -1;
+		} else if(entry_state == 1) {
+			/* Task is closed, We need to create a new pidfd for task. */
+			entry = NULL;
+		}
+	}
+
+	if (entry == NULL) {
+		if (!kdat.has_pidfd_open) {
+			pr_err("pidfd_open syscall is not supported\n");
+			return -1;
+		}
+
+		pidfd = syscall(SYS_pidfd_open, pid, 0);
+		if (pidfd == -1) {
+			pr_perror("Can't get pidfd of pid %d", pid);
+			return -1;
+		}
+	} else {
+		pidfd = entry->pidfd;
+	}
+
+	if (send_fds(pidfd_store_sk, NULL, 0, &pidfd, 1, &pid, sizeof(pid_t))) {
+		pr_perror("Can't send pidfd %d of pid %d", pidfd, pid);
+		if(!entry)
+			close(pidfd);
+		return -1;
+	}
+
+	if(!entry)
+		close(pidfd);
+
+	return 0;
+}
+
 static int task_reset_dirty_track(int pid)
 {
 	int ret;
@@ -410,9 +588,34 @@ static int detect_pid_reuse(struct pstree_item *item,
 {
 	unsigned long long dump_ticks;
 	struct proc_pid_stat pps_buf;
+	struct pidfd_entry *entry;
 	unsigned long long tps; /* ticks per second */
 	int ret;
 
+	/* Check pid reuse using pidfds */
+	if (pidfd_store_sk != -1) {
+		entry = find_pidfd_entry_by_pid(item->pid->real);
+		if (entry == NULL) {
+			/*
+			 * This task was created between two iteration so it
+			 * should be marked as a pid reuse to make a full memory dump.
+			 */
+			pr_warn("Pid reuse detected for pid %d\n", item->pid->real);
+			return 1;
+		}
+
+		ret = check_pidfd_entry_state(entry);
+		if (ret < 0) {
+			pr_err("Failed to get pidfd entry state for pid %d\n", item->pid->real);
+			return -1;
+		}
+
+		if (ret == 1)
+			pr_warn("Pid reuse detected for pid %d\n", item->pid->real);
+
+		return ret;
+	}
+
 	if (!parent_ie) {
 		pr_err("Pid-reuse detection failed: no parent inventory, " \
 		       "check warnings in get_parent_inventory\n");

From ea0dc7807ac7441a2845925d2be27238baf04377 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 20 Apr 2021 23:26:35 +0200
Subject: [PATCH 0621/1854] zdtm: add --pidfd-store option in RPC mode

When testing pid reuse using pidfd_store feature in RPC mode we need
to pass a unix socket fd used to CRIU in the RPC option
pidfd_store_sk to store the pidfds between predump/dump iterations.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/zdtm.py b/test/zdtm.py
index 9488c6edb..41609a9b2 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -21,6 +21,7 @@ import subprocess
 import sys
 import tempfile
 import time
+import socket
 from builtins import (input, int, open, range, str, zip)
 
 import pycriu as crpc
@@ -890,6 +891,8 @@ class criu_rpc_process:
 
 
 class criu_rpc:
+    pidfd_store_socket = None
+
     @staticmethod
     def __set_opts(criu, args, ctx):
         while len(args) != 0:
@@ -943,6 +946,10 @@ class criu_rpc:
                 fd, key = key.split(":", 1)
                 inhfd.fd = int(fd[3:-1])
                 inhfd.key = key
+            elif "--pidfd-store" == arg:
+                if criu_rpc.pidfd_store_socket is None:
+                    criu_rpc.pidfd_store_socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
+                criu.opts.pidfd_store_sk = criu_rpc.pidfd_store_socket.fileno()
             else:
                 raise test_fail_exc('RPC for %s(%s) required' % (arg, args.pop(0)))
 

From 1c08709cdbea76c87dadefe534eee1b0d06e0d41 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 20 Apr 2021 23:46:15 +0200
Subject: [PATCH 0622/1854] zdtm: add pidfd store based pid reuse test

This is just a symlink to the original transition/pid_reuse test with
the right options passed to trigger the pidfd store based pid reuse
detection code path.

Pidfd store based detection is supported only in RPC mode which
requires passing a unix socket fd to be used as pidfd store and
the kernel should support pidfd_open and pidfd_getfd syscalls
{'feature': 'pidfd_store'} for this test to work.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 scripts/ci/run-ci-tests.sh               | 3 ++-
 scripts/ci/vagrant.sh                    | 3 +++
 test/zdtm/transition/Makefile            | 1 +
 test/zdtm/transition/pidfd_store_sk.c    | 1 +
 test/zdtm/transition/pidfd_store_sk.desc | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)
 create mode 120000 test/zdtm/transition/pidfd_store_sk.c
 create mode 100644 test/zdtm/transition/pidfd_store_sk.desc

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 8fabf4a1d..72b31f7a2 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -253,7 +253,8 @@ make -C test/others/rpc/ run
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server --dedup
 
-./test/zdtm.py run -t zdtm/transition/pid_reuse --pre 2
+./test/zdtm.py run -t zdtm/transition/pid_reuse --pre 2 # start time based pid reuse detection
+./test/zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2 # pidfd based pid reuse detection
 
 ./test/zdtm.py run -t zdtm/static/socket-tcp-local --norst
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 3ed1a2675..91b912aad 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -53,6 +53,9 @@ fedora-no-vdso() {
 	# BPF tests are failing see: https://github.com/checkpoint-restore/criu/issues/1354
 	# Needs to be fixed, skip for now
 	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going -x zdtm/static/bpf_hash -x zdtm/static/bpf_array'
+	# This test (pidfd_store_sk) requires pidfd_getfd syscall which is guaranteed in Fedora 33.
+	# It is also skipped from -a because it runs in RPC mode only
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2'
 }
 
 $1
diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index 35301ac85..9388157e8 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -22,6 +22,7 @@ TST_NOFILE	=	\
 		shmem		\
 		lazy-thp	\
 		pid_reuse	\
+		pidfd_store_sk \
 
 
 TST_FILE	=	\
diff --git a/test/zdtm/transition/pidfd_store_sk.c b/test/zdtm/transition/pidfd_store_sk.c
new file mode 120000
index 000000000..fa1219477
--- /dev/null
+++ b/test/zdtm/transition/pidfd_store_sk.c
@@ -0,0 +1 @@
+pid_reuse.c
\ No newline at end of file
diff --git a/test/zdtm/transition/pidfd_store_sk.desc b/test/zdtm/transition/pidfd_store_sk.desc
new file mode 100644
index 000000000..841b21783
--- /dev/null
+++ b/test/zdtm/transition/pidfd_store_sk.desc
@@ -0,0 +1 @@
+{'flags': 'noauto suid pre-dump-notify', 'opts': '--pidfd-store', 'feature': 'pidfd_store'}

From c1b2d194e91f05f08026a66ba677bbdefc338dda Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 1 Jun 2021 10:56:58 +0300
Subject: [PATCH 0623/1854] mem/pidfd: fix poll retry error checking

One should never rely on errno if libc syscall is successful. We can
either see an errno set from some previous failed syscall or even errno
set by a this successful libc syscall. So lets check ret first.

Fixes: 1ccdaf47 ("criu: add pidfd based pid reuse detection for RPC
clients")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mem.c b/criu/mem.c
index 4fa2b72ed..8809f5b1a 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -246,7 +246,7 @@ static int check_pidfd_entry_state(struct pidfd_entry *entry)
 
 	while (1) {
 		ret = poll(&pollfd, 1, 0);
-		if (errno == EINTR && restart_cnt < MAX_RESTARTS) {
+		if (ret == -1 && errno == EINTR && restart_cnt < MAX_RESTARTS) {
 			restart_cnt++;
 			continue; /* restart polling */
 		}

From b310fbd31fa17f44459cc66da7e0c8c5b03a4905 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 2 Jun 2021 08:40:13 -0700
Subject: [PATCH 0624/1854] ksigset: fix a typo in ksigdelset

Fixes: 8063eb8fe641 ("parasite: don't block SIGTRAP")
Reported-by: zl-wang <zlwang@ca.ibm.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/include/uapi/ksigset.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compel/include/uapi/ksigset.h b/compel/include/uapi/ksigset.h
index 8b5d95804..e2465041d 100644
--- a/compel/include/uapi/ksigset.h
+++ b/compel/include/uapi/ksigset.h
@@ -26,6 +26,6 @@ static inline void ksigaddset(k_rtsigset_t *set, int _sig)
 static inline void ksigdelset(k_rtsigset_t *set, int _sig)
 {
 	int sig = _sig - 1;
-	set->sig[sig / _NSIG_BPW] |= ~(1UL << (sig % _NSIG_BPW));
+	set->sig[sig / _NSIG_BPW] &= ~(1UL << (sig % _NSIG_BPW));
 }
 #endif

From 34410b9e75d0b2b90817a372c7e0528de7532335 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 2 Jun 2021 08:43:43 -0700
Subject: [PATCH 0625/1854] test: add a test to check that sigtrap handlers are
 restored

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile    |  1 +
 test/zdtm/static/sigtrap01.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 test/zdtm/static/sigtrap01.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 525f91ba3..e60fe6dc2 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -238,6 +238,7 @@ TST_NOFILE	:=				\
 		timens_for_kids			\
 		zombie_leader			\
 		sigtrap				\
+		sigtrap01			\
 #		jobctl00			\
 
 pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
diff --git a/test/zdtm/static/sigtrap01.c b/test/zdtm/static/sigtrap01.c
new file mode 100644
index 000000000..a63e55d6a
--- /dev/null
+++ b/test/zdtm/static/sigtrap01.c
@@ -0,0 +1,34 @@
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check that a signal handler for SIGTRAP is restored";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+
+static int sigtrap = 0;
+static void sigh(int signo) {
+	sigtrap = 1;
+}
+
+
+int main(int argc, char **argv)
+{
+	test_init(argc, argv);
+
+	signal(SIGTRAP, sigh);
+
+	test_daemon();
+	test_waitsig();
+	kill(getpid(), SIGTRAP);
+
+	if (sigtrap != 1) {
+		fail("The sigtrap handler hasn't been called.");
+		return 1;
+	}
+
+	pass();
+	return 0;
+}

From 2b78d95e6b3861a1051c960d462d00cad6f7f091 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 9 Jun 2021 07:25:34 +0100
Subject: [PATCH 0626/1854] test/others: drop '_exit' function

The function name '_exit' is misleading as this function doesn't
actually exit when the status of the previous command is zero.
In addition, the behaviour of this function is not really needed.

This patch removes the '_exit' function and applies the correct
behaviour to stop the test on failure.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/crit/test.sh          | 70 ++++++++++++++-----------------
 test/others/criu-coredump/test.sh | 24 ++++-------
 2 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 2976730b3..345f8ce04 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -7,28 +7,20 @@ source ../env.sh
 
 images_list=""
 
-function _exit {
-	# shellcheck disable=SC2181
-	if [ $? -ne 0 ]; then
-		echo "FAIL"
-		exit 1
-	fi
-}
-
 function gen_imgs {
 	setsid ./loop.sh < /dev/null &> /dev/null &
 	PID=$!
-	$CRIU dump -v4 -o dump.log -D ./ -t $PID
-	# shellcheck disable=SC2181
-	if [ $? -ne 0 ]; then
-		kill -9 $PID
-		_exit 1
+	if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
+		echo "Failed to checkpoint process $PID"
+		cat dump.log
+		kill -9 "$PID"
+		exit 1
 	fi
 
 	images_list=$(ls -1 ./*.img)
 	if [ -z "$images_list" ]; then
 		echo "Failed to generate images"
-		_exit 1
+		exit 1
 	fi
 }
 
@@ -42,11 +34,11 @@ function run_test1 {
 		fi
 
 		echo "  -- to json"
-		$CRIT decode -o "$x"".json" --pretty < "$x" || _exit $?
+		$CRIT decode -o "$x"".json" --pretty < "$x" || exit $?
 		echo "  -- to img"
-		$CRIT encode -i "$x"".json" > "$x"".json.img" || _exit $?
+		$CRIT encode -i "$x"".json" > "$x"".json.img" || exit $?
 		echo "  -- cmp"
-		cmp "$x" "$x"".json.img" || _exit $?
+		cmp "$x" "$x"".json.img" || exit $?
 
 		echo "=== done"
 	done
@@ -64,15 +56,15 @@ function run_test2 {
 	${CRIT} decode -i "${PROTO_IN}" -o "${JSON_IN}"
 
 	# proto in - json out decode
-	cat "${PROTO_IN}" | ${CRIT} decode || _exit 1
-	cat "${PROTO_IN}" | ${CRIT} decode -o "${OUT}" || _exit 1
-	cat "${PROTO_IN}" | ${CRIT} decode > "${OUT}" || _exit 1
-	${CRIT} decode -i "${PROTO_IN}" || _exit 1
-	${CRIT} decode -i "${PROTO_IN}" -o "${OUT}" || _exit 1
-	${CRIT} decode -i "${PROTO_IN}" > "${OUT}" || _exit 1
-	${CRIT} decode < "${PROTO_IN}" || _exit 1
-	${CRIT} decode -o "${OUT}" < "${PROTO_IN}" || _exit 1
-	${CRIT} decode < "${PROTO_IN}" > "${OUT}" || _exit 1
+	cat "${PROTO_IN}" | ${CRIT} decode || exit 1
+	cat "${PROTO_IN}" | ${CRIT} decode -o "${OUT}" || exit 1
+	cat "${PROTO_IN}" | ${CRIT} decode > "${OUT}" || exit 1
+	${CRIT} decode -i "${PROTO_IN}" || exit 1
+	${CRIT} decode -i "${PROTO_IN}" -o "${OUT}" || exit 1
+	${CRIT} decode -i "${PROTO_IN}" > "${OUT}" || exit 1
+	${CRIT} decode < "${PROTO_IN}" || exit 1
+	${CRIT} decode -o "${OUT}" < "${PROTO_IN}" || exit 1
+	${CRIT} decode < "${PROTO_IN}" > "${OUT}" || exit 1
 
 	# proto in - json out encode -> should fail
 	cat "${PROTO_IN}" | ${CRIT} encode || true
@@ -83,15 +75,15 @@ function run_test2 {
 	${CRIT} encode -i "${PROTO_IN}" > "${OUT}" || true
 
 	# json in - proto out encode
-	cat "${JSON_IN}" | ${CRIT} encode || _exit 1
-	cat "${JSON_IN}" | ${CRIT} encode -o "${OUT}" || _exit 1
-	cat "${JSON_IN}" | ${CRIT} encode > "${OUT}" || _exit 1
-	${CRIT} encode -i "${JSON_IN}" || _exit 1
-	${CRIT} encode -i "${JSON_IN}" -o "${OUT}" || _exit 1
-	${CRIT} encode -i "${JSON_IN}" > "${OUT}" || _exit 1
-	${CRIT} encode < "${JSON_IN}" || _exit 1
-	${CRIT} encode -o "${OUT}" < "${JSON_IN}" || _exit 1
-	${CRIT} encode < "${JSON_IN}" > "${OUT}" || _exit 1
+	cat "${JSON_IN}" | ${CRIT} encode || exit 1
+	cat "${JSON_IN}" | ${CRIT} encode -o "${OUT}" || exit 1
+	cat "${JSON_IN}" | ${CRIT} encode > "${OUT}" || exit 1
+	${CRIT} encode -i "${JSON_IN}" || exit 1
+	${CRIT} encode -i "${JSON_IN}" -o "${OUT}" || exit 1
+	${CRIT} encode -i "${JSON_IN}" > "${OUT}" || exit 1
+	${CRIT} encode < "${JSON_IN}" || exit 1
+	${CRIT} encode -o "${OUT}" < "${JSON_IN}" || exit 1
+	${CRIT} encode < "${JSON_IN}" > "${OUT}" || exit 1
 
 	# json in - proto out decode -> should fail
 	cat "${JSON_IN}" | ${CRIT} decode || true
@@ -102,10 +94,10 @@ function run_test2 {
 	${CRIT} decode -i "${JSON_IN}" > "${OUT}" || true
 
 	# explore image directory
-	${CRIT} x ./ ps || _exit 1
-	${CRIT} x ./ fds || _exit 1
-	${CRIT} x ./ mems || _exit 1
-	${CRIT} x ./ rss || _exit 1
+	${CRIT} x ./ ps || exit 1
+	${CRIT} x ./ fds || exit 1
+	${CRIT} x ./ mems || exit 1
+	${CRIT} x ./ rss || exit 1
 }
 
 gen_imgs
diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index 1830b9dc3..6a0fbc627 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -1,25 +1,19 @@
 source ../env.sh
 
-function _exit {
-	if [ $? -ne 0 ]; then
-		echo "FAIL"
-		exit 1
-	fi
-}
-
 function gen_imgs {
 	setsid ./loop.sh < /dev/null &> /dev/null &
 	PID=$!
-	$CRIU dump -v4 -o dump.log -D ./ -t $PID
-	if [ $? -ne 0 ]; then
-		kill -9 $PID
-		_exit 1
+	if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
+		echo "Failed to checkpoint process $PID"
+		cat dump.log
+		kill -9 "$PID"
+		exit 1
 	fi
 
 	images_list=$(ls -1 *.img)
 	if [ -z "$images_list" ]; then
 		echo "Failed to generate images"
-		_exit 1
+		exit 1
 	fi
 }
 
@@ -27,19 +21,19 @@ function run_test {
 	echo "= Test core dump"
 
 	echo "=== img to core dump"
-	$CRIU_COREDUMP -i ./ -o ./ || _exit $?
+	$CRIU_COREDUMP -i ./ -o ./ || exit $?
 	echo "=== done"
 
 	cores=$(ls -1 core.*)
 	if [ -z "$cores" ]; then
 		echo "Failed to generate coredumps"
-		_exit 1
+		exit 1
 	fi
 
 	for x in $cores
 	do
 		echo "=== try readelf $x"
-		readelf -a $x || _exit $?
+		readelf -a $x || exit $?
 		echo "=== done"
 	done
 

From 2aa4185a6c3e2a699a76696fb1737e0303a29de0 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 9 Jun 2021 08:13:00 +0100
Subject: [PATCH 0627/1854] test/others: refactor loop process

There are several problems with the loop.sh script. First, the code is
duplicated across tests in the so-called 'othres' category. Second, we
need to run it with the 'setsid' utility to make sure that it runs in
a new session. Third, we have to redirect the standard file descriptors
and use the '&' operator to make it run in the background. Finally,
obtaining the PID of the 'loop.sh' process resulted in race condition.

In this patch we replace the loop.sh script with a program that would
address all problems mentioned above. The requirements for this program
are as follows.
- It must be reusable across tests
- It must start a process that is detached from the current shell
- It must wait for the process to start and output its PID

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/.gitignore             |  1 +
 test/others/Makefile               |  2 +
 test/others/crit/Makefile          |  1 +
 test/others/crit/loop.sh           |  4 --
 test/others/crit/test.sh           |  3 +-
 test/others/criu-coredump/Makefile |  1 +
 test/others/criu-coredump/loop.sh  |  4 --
 test/others/criu-coredump/test.sh  |  3 +-
 test/others/loop.c                 | 63 ++++++++++++++++++++++++++++++
 test/others/rpc/Makefile           |  1 +
 test/others/rpc/loop.sh            |  4 --
 test/others/rpc/run.sh             |  7 ++--
 12 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 test/others/.gitignore
 create mode 100644 test/others/Makefile
 delete mode 100755 test/others/crit/loop.sh
 delete mode 100755 test/others/criu-coredump/loop.sh
 create mode 100644 test/others/loop.c
 delete mode 100755 test/others/rpc/loop.sh

diff --git a/test/others/.gitignore b/test/others/.gitignore
new file mode 100644
index 000000000..1ef2ddf24
--- /dev/null
+++ b/test/others/.gitignore
@@ -0,0 +1 @@
+loop
diff --git a/test/others/Makefile b/test/others/Makefile
new file mode 100644
index 000000000..b84894bfa
--- /dev/null
+++ b/test/others/Makefile
@@ -0,0 +1,2 @@
+loop:
+	gcc -Wall loop.c -o loop
diff --git a/test/others/crit/Makefile b/test/others/crit/Makefile
index 75d09b66c..ca296e333 100644
--- a/test/others/crit/Makefile
+++ b/test/others/crit/Makefile
@@ -1,4 +1,5 @@
 run: clean
+	@make -C .. loop
 	./test.sh
 
 clean:
diff --git a/test/others/crit/loop.sh b/test/others/crit/loop.sh
deleted file mode 100755
index 0ab34ce96..000000000
--- a/test/others/crit/loop.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-while :; do
-	sleep 1
-done
diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 345f8ce04..0d38043d7 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -8,8 +8,7 @@ source ../env.sh
 images_list=""
 
 function gen_imgs {
-	setsid ./loop.sh < /dev/null &> /dev/null &
-	PID=$!
+	PID=$(../loop)
 	if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
 		echo "Failed to checkpoint process $PID"
 		cat dump.log
diff --git a/test/others/criu-coredump/Makefile b/test/others/criu-coredump/Makefile
index aa684a972..2b0d5e688 100644
--- a/test/others/criu-coredump/Makefile
+++ b/test/others/criu-coredump/Makefile
@@ -1,4 +1,5 @@
 run: clean
+	@make -C .. loop
 	./test.sh
 
 clean:
diff --git a/test/others/criu-coredump/loop.sh b/test/others/criu-coredump/loop.sh
deleted file mode 100755
index 0ab34ce96..000000000
--- a/test/others/criu-coredump/loop.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-while :; do
-	sleep 1
-done
diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index 6a0fbc627..62d9f7edc 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -1,8 +1,7 @@
 source ../env.sh
 
 function gen_imgs {
-	setsid ./loop.sh < /dev/null &> /dev/null &
-	PID=$!
+	PID=$(../loop)
 	if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
 		echo "Failed to checkpoint process $PID"
 		cat dump.log
diff --git a/test/others/loop.c b/test/others/loop.c
new file mode 100644
index 000000000..850c5dedf
--- /dev/null
+++ b/test/others/loop.c
@@ -0,0 +1,63 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+int main(void)
+{
+	pid_t pid;
+	pid_t sid;
+	int res = EXIT_FAILURE;
+	int start_pipe[2];
+
+	if (pipe(start_pipe)) {
+		perror("pipe failed!");
+		goto out;
+	}
+
+	pid = fork();
+	if (pid < 0) {
+		perror("fork failed!");
+		goto out;
+	}
+
+	if (pid == 0) {
+		close(start_pipe[0]);
+
+		sid = setsid();
+		if (sid < 0) {
+			perror("setsid failed!");
+			res = EXIT_FAILURE;
+			write(start_pipe[1], &res, sizeof(res));
+			close(start_pipe[1]);
+			exit(1);
+		}
+
+		// Create a file descriptor for "crit x ./ fds" test
+		open("/dev/null", O_RDONLY);
+
+		chdir("/");
+		close(STDIN_FILENO);
+		close(STDOUT_FILENO);
+		close(STDERR_FILENO);
+
+		res = EXIT_SUCCESS;
+		write(start_pipe[1], &res, sizeof(res));
+		close(start_pipe[1]);
+
+		while(1) {
+			sleep(1);
+		}
+	}
+
+	close(start_pipe[1]);
+	read(start_pipe[0], &res, sizeof(res));
+	close(start_pipe[0]);
+
+ out:
+	if (res == EXIT_SUCCESS)
+		printf("%d\n", pid);
+	return res;
+}
diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index 08caa0c77..fc64f0c97 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -7,6 +7,7 @@ LDLIBS +=  -lprotobuf-c
 PYTHON ?= python
 
 run: all
+	@make -C .. loop
 	mkdir -p build
 	chmod a+rwx build
 	rm -f build/status
diff --git a/test/others/rpc/loop.sh b/test/others/rpc/loop.sh
deleted file mode 100755
index 0ab34ce96..000000000
--- a/test/others/rpc/loop.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-while :; do
-	sleep 1
-done
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index d1facd82f..afd4fb5e3 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -44,12 +44,11 @@ function test_py {
 function test_restore_loop {
 	mkdir -p build/imgs_loop
 
-	title_print "Run loop.sh"
-	setsid ./loop.sh < /dev/null &> build/loop.log &
-	P=${!}
+	title_print "Run loop process"
+	P=$(../loop)
 	echo "pid ${P}"
 
-	title_print "Dump loop.sh"
+	title_print "Dump loop process"
 	# So theoretically '-j' (--shell-job) should not be necessary, but on alpine
 	# this test fails without it.
 	${CRIU} dump -j -v4 -o dump-loop.log -D build/imgs_loop -t ${P}

From a8525c07d471e2480a14e248258decd69d514908 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 13 Jun 2021 19:21:18 +0000
Subject: [PATCH 0628/1854] ci: no longer avoid overlayfs

Now that the Ubuntu kernel is no longer broken with regards to
overlayfs, let's switch back to overlayfs instead of devicemapper and
vfs graphdrivers.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/docker-test.sh |  5 +----
 scripts/ci/podman-test.sh | 10 +---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 466a2c4c7..cbb38f54c 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,10 +21,7 @@ add-apt-repository \
 
 . /etc/lsb-release
 
-# overlayfs behaves differently on Ubuntu (18.04) and breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
-# Switch to devicemapper
-echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
+echo '{ "experimental": true }' > /etc/docker/daemon.json
 
 CRIU_LOG='/criu.log'
 mkdir -p /etc/criu
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 5d8a6f840..cc878d6d1 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -23,10 +23,7 @@ apt-get -y purge docker-ce || :
     curl \
     software-properties-common
 
-# explicitly install runc. crun is not compiled with criu support
-./apt-install cri-o-runc podman containernetworking-plugins
-
-echo -e '[engine]\nruntime="runc"' > /etc/containers/containers.conf
+./apt-install podman containernetworking-plugins
 
 export SKIP_CI_TEST=1
 
@@ -36,11 +33,6 @@ cd ../../
 
 make install
 
-# overlaysfs behaves differently on Ubuntu and breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
-export STORAGE_DRIVER=vfs
-podman --storage-driver vfs info
-
 criu --version
 
 # shellcheck disable=SC2016

From 80ee4f8aec30320382b7b9376853470183260262 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 31 May 2021 11:04:02 +0300
Subject: [PATCH 0629/1854] kdat: make uffd_open return errno from syscall
 separately

Previousely kerndat_uffd could not differentiate -EPERM and -1 returned
from uffd_open(). That way "Failed to get uffd API" and "Incompatible
uffd API ..." errors were just ignored, which is probably not what we
want.

v2: rework with extra argument of uffd_open for errno, rename err
label in uffd_open for readability

Fixes: cfdeac4a4 ("kerndat: Handle non-root mode when checking uffd")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/uffd.h |  2 +-
 criu/kerndat.c      | 18 ++++++++++--------
 criu/uffd.c         | 14 ++++++++------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/criu/include/uffd.h b/criu/include/uffd.h
index 814e60f33..102ff561c 100644
--- a/criu/include/uffd.h
+++ b/criu/include/uffd.h
@@ -3,7 +3,7 @@
 
 struct task_restore_args;
 
-extern int uffd_open(int flags, unsigned long *features);
+extern int uffd_open(int flags, unsigned long *features, int *err);
 extern bool uffd_noncooperative(void);
 extern int setup_uffd(int pid, struct task_restore_args *task_args);
 extern int lazy_pages_setup_zombie(int pid);
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 90f4f2d9a..1e0e2817b 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -905,22 +905,24 @@ unl:
 
 static int kerndat_uffd(void)
 {
-	int uffd;
+	int uffd, err = 0;
 
 	kdat.uffd_features = 0;
-	uffd = uffd_open(0, &kdat.uffd_features);
+	uffd = uffd_open(0, &kdat.uffd_features, &err);
 
 	/*
-	 * uffd == -ENOSYS means userfaultfd is not supported on this
-	 * system and we just happily return with kdat.has_uffd = false.
-	 * Error other than -ENOSYS would mean "Houston, Houston, we
+	 * err == ENOSYS means userfaultfd is not supported on this system and
+	 * we just happily return with kdat.has_uffd = false.
+	 * err == EPERM means that userfaultfd is not allowed as we are
+	 * non-root user, so we also return with kdat.has_uffd = false.
+	 * Errors other than ENOSYS and EPERM would mean "Houston, Houston, we
 	 * have a problem!"
 	 */
 	if (uffd < 0) {
-		if (uffd == -ENOSYS)
+		if (err == ENOSYS)
 			return 0;
-		if (uffd == -EPERM) {
-			pr_info("Lazy pages are disabled\n");
+		if (err == EPERM) {
+			pr_info("Lazy pages are not permited\n");
 			return 0;
 		}
 		pr_err("Lazy pages are not available\n");
diff --git a/criu/uffd.c b/criu/uffd.c
index e46042344..76873797d 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -262,7 +262,7 @@ static int uffd_api_ioctl(void *arg, int fd, pid_t pid)
 	return ioctl(fd, UFFDIO_API, uffdio_api);
 }
 
-int uffd_open(int flags, unsigned long *features)
+int uffd_open(int flags, unsigned long *features, int *err)
 {
 	struct uffdio_api uffdio_api = { 0 };
 	int uffd;
@@ -270,7 +270,9 @@ int uffd_open(int flags, unsigned long *features)
 	uffd = syscall(SYS_userfaultfd, flags);
 	if (uffd == -1) {
 		pr_info("Lazy pages are not available: %s\n", strerror(errno));
-		return -errno;
+		if (err)
+			*err = errno;
+		return -1;
 	}
 
 	uffdio_api.api = UFFD_API;
@@ -280,13 +282,13 @@ int uffd_open(int flags, unsigned long *features)
 	if (userns_call(uffd_api_ioctl, 0, &uffdio_api, sizeof(uffdio_api),
 			uffd)) {
 		pr_perror("Failed to get uffd API");
-		goto err;
+		goto close;
 	}
 
 	if (uffdio_api.api != UFFD_API) {
 		pr_err("Incompatible uffd API: expected %Lu, got %Lu\n",
 		       UFFD_API, uffdio_api.api);
-		goto err;
+		goto close;
 	}
 
 	if (features)
@@ -294,7 +296,7 @@ int uffd_open(int flags, unsigned long *features)
 
 	return uffd;
 
-err:
+close:
 	close(uffd);
 	return -1;
 }
@@ -313,7 +315,7 @@ int setup_uffd(int pid, struct task_restore_args *task_args)
 	 * Open userfaulfd FD which is passed to the restorer blob and
 	 * to a second process handling the userfaultfd page faults.
 	 */
-	task_args->uffd = uffd_open(O_CLOEXEC | O_NONBLOCK, &features);
+	task_args->uffd = uffd_open(O_CLOEXEC | O_NONBLOCK, &features, NULL);
 	if (task_args->uffd < 0) {
 		pr_perror("Unable to open an userfaultfd descriptor");
 		return -1;

From 3c10d3335bafaad211d92a0b88c27144fe349d25 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 31 May 2021 08:17:16 +0100
Subject: [PATCH 0630/1854] criu(8): document --join-ns option

The --join-ns option was introduced with commits:

https://github.com/checkpoint-restore/criu/commit/2cf17cd
https://github.com/checkpoint-restore/criu/commit/790ec46

Closes: #1054

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/criu.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 2ee40ec10..9c8377a6e 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -494,6 +494,16 @@ usually need to be escaped from shell.
     must be used to specify to which 'outer_dev' (an existing network device
     in CRIU namespace) the restored 'inner_dev' should be bound to.
 
+*-J*, *--join-ns* **NS**:{**PID**|**NS_FILE**}[,**EXTRA_OPTS**]::
+    Restore process tree inside an existing namespace. The namespace can
+    be specified in 'PID' or 'NS_FILE' path format (example:
+    *--join-ns net:12345* or *--join-ns net:/foo/bar*). Currently supported
+    values for **NS** are: *ipc*, *net*, *time*, *user*, and *uts*.
+    This option doesn't support joining a PID namespace, however, this is
+    possible using *--external* and *--inheritfd*. 'EXTRA_OPTS' is optional
+    and can be used to specify UID and GID for user namespace (e.g.,
+    *--join-ns user:PID,UID,GID*).
+
 *--manage-cgroups* ['mode']::
     Restore cgroups configuration associated with a task from the image.
     Controllers are always restored in an optimistic way -- if already present

From d0511319e5edb1f05683600cc2279dc47725b352 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sat, 29 May 2021 10:19:49 +0300
Subject: [PATCH 0631/1854] github: Add templates for new issues and pull
 requests

This way users would be able to create more meaningfull pull-requests
and issues. And we would not need to ask them to provide basic
information each time.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .github/ISSUE_TEMPLATE.md        | 63 ++++++++++++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md | 18 +++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..222d66156
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,63 @@
+<!--
+Before reporting a new issue, please make sure that it's not a duplicate.
+
+If you suspect your issue is a bug, please provide information as shown below. If your issue is a feature request, this information is not always necessary.
+-->
+
+**Description**
+
+<!--
+Briefly describe the problem you are having in a few paragraphs.
+-->
+
+**Steps to reproduce the issue:**
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+**Describe the results you expected:**
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+
+**CRIU logs and information:**
+
+<!--
+You can either attach logs as files to the issue or put them under details
+-->
+
+<details><summary>CRIU full dump/restore logs:</summary>
+<p>
+
+```
+(paste your output here)
+```
+
+</p>
+</details>
+
+<details><summary>Output of `criu --version`:</summary>
+<p>
+
+```
+(paste your output here)
+```
+
+</p>
+</details>
+
+<details><summary>Output of `criu check --all`:</summary>
+<p>
+
+```
+(paste your output here)
+```
+
+</p>
+</details>
+
+**Additional environment details:**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..62365b191
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,18 @@
+<!--
+Please make sure you've read and understood our contributing guidelines:
+https://github.com/checkpoint-restore/criu/blob/criu-dev/CONTRIBUTING.md
+
+In short you need to:
+
+- Describe What you do and How you do it;
+- Separate each logical change into a separate commit;
+- Add a "Signed-off-by:" line identifying that you certify your work with DCO;
+- If you fix some specific bug or commit, please add "Fixes: ..." line;
+- Review fixes should be made by amending the original commits. For example:
+  a) fix the code (e.g. this fixes commit with hash aaa1111)
+  b) git commit -a --fixup aaa1111
+  c) git rebase --interactive --autosquash aaa1111^
+- Pull request integration tests should generally be passing;
+- If you change something non-obvious, please consider adding a ZDTM test for it;
+
+-->

From ebc74668ff0291f7849fd54ebc73203e8b701731 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 28 May 2021 15:43:33 +0200
Subject: [PATCH 0632/1854] cr_options: handle the case where __dest == __src
 in SET_CHAR_OPTS

The SET_CHAR_OPT(__dest, __src) macro is essentially:

free(opts.__dest);
opts.__dest = xstrdup(__src);

So if __dest == __src the string that get's copied is freed. This e.g.
is the case in criu/lsm.c

int lsm_check_opts(void)
{
	char *aux;

	if (!opts.lsm_supplied)
		return 0;

	aux = strchr(opts.lsm_profile, ':');
	if (aux == NULL) {
		pr_err("invalid argument %s for --lsm-profile\n", opts.lsm_profile);
		return -1;
	}

	*aux = '\0';
	aux++;

	if (strcmp(opts.lsm_profile, "apparmor") == 0) {
		if (kdat.lsm != LSMTYPE__APPARMOR) {
			pr_err("apparmor LSM specified but apparmor not supported by kernel\n");
			return -1;
		}

		SET_CHAR_OPTS(lsm_profile, aux);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

	} else if (strcmp(opts.lsm_profile, "selinux") == 0) {
		if (kdat.lsm != LSMTYPE__SELINUX) {
			pr_err("selinux LSM specified but selinux not supported by kernel\n");
			return -1;
		}

		SET_CHAR_OPTS(lsm_profile, aux);
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

	} else if (strcmp(opts.lsm_profile, "none") == 0) {
		xfree(opts.lsm_profile);
		opts.lsm_profile = NULL;
	} else {
		pr_err("unknown lsm %s\n", opts.lsm_profile);
		return -1;
	}

	return 0;
}

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/include/cr_options.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index ac1c9e9c7..a8fe02609 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -15,11 +15,12 @@
 #define PARSING_RPC_CONF	6
 #define PARSING_LAST		7
 
-#define SET_CHAR_OPTS(__dest, __src) \
-	do { \
-		free(opts.__dest); \
-		opts.__dest = xstrdup(__src); \
-	} while(0)
+#define SET_CHAR_OPTS(__dest, __src)              \
+	do {                                      \
+		char *__src_dup = xstrdup(__src); \
+		free(opts.__dest);                \
+		opts.__dest = __src_dup;          \
+	} while (0)
 
 /*
  * CPU capability options.

From e42083aa8be5a20fb73f624d9b4f2f4cfc513472 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 16 Jun 2021 10:37:02 +0100
Subject: [PATCH 0633/1854] ci: update docker test matrix

Ubuntu 18.04 still has a problem with overlayfs and breaks CRIU
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/docker-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 701b646fb..564691449 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-20.04]
     steps:
     - uses: actions/checkout@v2
     - name: Run Docker Test (${{ matrix.os }})

From 9d9ec73dd7f0b3f2238785a4c0f373b6499ab3ea Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 16 Jun 2021 11:46:54 +0000
Subject: [PATCH 0634/1854] test: skip time namespaced tests on <= 5

Although CentOS 8 comes with 4.18 kernel it has time namespace patches
backported but not all the required once. This disables time namespaced
tests on everything older than 5.11.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm_ct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index d9823da3f..60aa40334 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -61,7 +61,7 @@ static int create_timens()
 	if (sscanf(buf.release, "%u.%u", &major, &minor) != 2)
 		return -1;
 
-	if (major == 5 && minor < 11) {
+	if ((major <= 5) || (major == 5 && minor < 11)) {
 		fprintf(stderr, "timens isn't supported on %s\n", buf.release);
 		return 0;
 	}

From 638e53c950de7f5d98ebd5c25c1119e01926ad28 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 30 May 2021 11:39:49 +0100
Subject: [PATCH 0635/1854] zdtm/tun_ns: add per-test dependencies

The tun_ns test was introduced with [1] and [2], however, these commits
didn't add per-test dependencies required for the test.

Per-test dependencies are listed in the .desc file as 'deps': [<list>]

These dependencies are made available inside the test namespace and without
the ip dependency, the tests fails on Fedora 34 with

   Error: ipv4: FIB table does not exist.

[1] https://github.com/checkpoint-restore/criu/commit/7e355e7
[2] https://github.com/checkpoint-restore/criu/commit/3ba0893

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/tun_ns.desc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/tun_ns.desc b/test/zdtm/static/tun_ns.desc
index cea7cfd49..da247dd38 100644
--- a/test/zdtm/static/tun_ns.desc
+++ b/test/zdtm/static/tun_ns.desc
@@ -1 +1 @@
-{'flavor': 'ns uns', 'flags': 'suid', 'feature': 'tun tun_ns'}
+{'deps': ['/bin/sh', '/sbin/ip|/bin/ip'], 'flavor': 'ns uns', 'flags': 'suid', 'feature': 'tun tun_ns'}

From 81a68ad3b2dfc5cac7c084f11b11599247c696ae Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 17 Jun 2021 12:50:05 +0100
Subject: [PATCH 0636/1854] docker-test: use latest containerd release

This patch improves the changes from 19be9ced9.

To use the newer version of containerd, we need to make sure that the
containerd service has been restarted after install. Instead of
hard-coding a version number, we can use github API to get the latest
release. In addition, the tar file contains all binary files in a
'./bin' sub-folder. Thus, it should be extracted in '/usr'.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index cbb38f54c..c1baf9eb5 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -28,10 +28,15 @@ mkdir -p /etc/criu
 echo "log-file=$CRIU_LOG" > /etc/criu/runc.conf
 
 service docker stop
+systemctl stop containerd.service
 
-# Restore with containerd versions after v1.2.14 and before v1.5.0-beta.0 is broken.
-wget -nv https://github.com/containerd/containerd/releases/download/v1.5.0-beta.0/containerd-1.5.0-beta.0-linux-amd64.tar.gz -O - | tar -xz -C /usr/bin/
+# Always use the latest containerd release.
+# Restore with containerd versions after v1.2.14 and before v1.5.0-beta.0 are broken.
+# https://github.com/checkpoint-restore/criu/issues/1223
+CONTAINERD_DOWNLOAD_URL=$(curl -s https://api.github.com/repos/containerd/containerd/releases/latest | grep '"browser_download_url":.*/containerd-.*-linux-amd64.tar.gz.$' | cut -d\" -f4)
+wget -nv "$CONTAINERD_DOWNLOAD_URL" -O - | tar -xz -C /usr/
 
+systemctl restart containerd.service
 service docker restart
 
 export SKIP_CI_TEST=1

From 2967bed64ec294e7c5e67d5eacbbde61cac75ab9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Wed, 16 Jun 2021 15:43:04 -0400
Subject: [PATCH 0637/1854] build: respect $PKG_CONFIG settings

The build needs to respect $PKG_CONFIG env var like other standard
build systems and the the upstream pkg-config project itself.  This
allows the package builder to point it to the right tool when doing
a cross-compile build.  Otherwise the host pkg-config tool is used
which won't have access to the packages in the cross sysroot.

Signed-off-by: Mike Frysinger <vapier@chromium.org>
---
 Makefile.config              | 2 +-
 criu/Makefile                | 2 +-
 scripts/nmk/scripts/tools.mk | 1 +
 scripts/nmk/scripts/utils.mk | 2 +-
 test/zdtm/Makefile.inc       | 7 ++++---
 test/zdtm/lib/Makefile       | 2 +-
 test/zdtm/static/Makefile    | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index 3d99e680b..6e3e1b062 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -30,7 +30,7 @@ else
 endif
 
 ifeq ($(call pkg-config-check,libnftables),y)
-        LIB_NFTABLES	:= $(shell pkg-config --libs libnftables)
+        LIB_NFTABLES	:= $(shell $(PKG_CONFIG) --libs libnftables)
         ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
                 LIBS_FEATURES	+= $(LIB_NFTABLES)
                 FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_0
diff --git a/criu/Makefile b/criu/Makefile
index ceb49ce09..11d454c81 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -27,7 +27,7 @@ CFLAGS			+= -iquote include
 CFLAGS			+= -iquote images
 CFLAGS			+= -iquote $(ARCH_DIR)/include
 CFLAGS			+= -iquote .
-CFLAGS			+= $(shell pkg-config --cflags libnl-3.0)
+CFLAGS			+= $(shell $(PKG_CONFIG) --cflags libnl-3.0)
 CFLAGS			+= $(CONFIG-DEFINES)
 
 ifeq ($(GMON),1)
diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
index c5794401c..1681d4e90 100644
--- a/scripts/nmk/scripts/tools.mk
+++ b/scripts/nmk/scripts/tools.mk
@@ -17,6 +17,7 @@ AR		:= $(CROSS_COMPILE)ar
 STRIP		:= $(CROSS_COMPILE)strip
 OBJCOPY		:= $(CROSS_COMPILE)objcopy
 OBJDUMP		:= $(CROSS_COMPILE)objdump
+PKG_CONFIG	?= pkg-config
 NM		:= $(CROSS_COMPILE)nm
 MAKE		:= make
 MKDIR		:= mkdir -p
diff --git a/scripts/nmk/scripts/utils.mk b/scripts/nmk/scripts/utils.mk
index b9790615c..f93fdf911 100644
--- a/scripts/nmk/scripts/utils.mk
+++ b/scripts/nmk/scripts/utils.mk
@@ -16,7 +16,7 @@ try-asm = $(call try-compile,assembler-with-cpp,$(1),$(2),$(3))
 
 # pkg-config-check
 # Usage: ifeq ($(call pkg-config-check, library),y)
-pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
 
 #
 # Remove duplicates.
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 43763321f..69154fdc9 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -37,6 +37,7 @@ HOSTCC	?= gcc
 ifeq ($(origin CC), default)
         CC := $(CROSS_COMPILE)$(HOSTCC)
 endif
+PKG_CONFIG ?= pkg-config
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= -Wdeclaration-after-statement -Wstrict-prototypes
 CFLAGS	+= $(USERCFLAGS)
@@ -55,7 +56,7 @@ RM := rm -f --one-file-system
 
 ifeq ($(COMPAT_TEST),y)
         # Firstly look for 32-bit libs and then in standard path.
-        PKG_CONFIG_PATH := $(shell pkg-config --variable pc_path pkg-config)
+        PKG_CONFIG_PATH := $(shell $(PKG_CONFIG) --variable pc_path pkg-config)
         PKG_CONFIG_PATH := /usr/lib32/pkgconfig:$(PKG_CONFIG_PATH)
 ifeq ($(ARCH),x86)
         export CFLAGS += -m32
@@ -66,11 +67,11 @@ endif
 endif
 
 define pkg-libs
-        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --libs $(1))
+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --libs $(1))
 endef
 
 define pkg-cflags
-        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --cflags $(1))
+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --cflags $(1))
 endef
 
 %.d: %.c
diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index 05fe64e91..5ecf8bccf 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -6,7 +6,7 @@ LIB	:= libzdtmtst.a
 
 LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
 
-pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
 ifeq ($(call pkg-config-check,libbpf),y)
 LIBSRC	+= bpfmap_zdtm.c
 endif
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index e60fe6dc2..c5f3c98be 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -241,7 +241,7 @@ TST_NOFILE	:=				\
 		sigtrap01			\
 #		jobctl00			\
 
-pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
 ifeq ($(call pkg-config-check,libbpf),y)
 TST_NOFILE	+=				\
 		bpf_hash			\

From 6db0f95dbf6e3272e6e2103f035647a1fc787f46 Mon Sep 17 00:00:00 2001
From: Valery Ivanov <ivalery111@gmail.com>
Date: Tue, 15 Jun 2021 00:24:18 +0300
Subject: [PATCH 0638/1854] crtools: improve error handling on signal setting

Signed-off-by: Valery Ivanov <ivalery111@gmail.com>
---
 criu/crtools.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index b016c28af..51852ff56 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -189,7 +189,10 @@ int main(int argc, char *argv[], char *envp[])
 	 * 2) Transmitting data to the image streamer
 	 * 3) Emitting logs (potentially to a pipe).
 	 */
-	signal(SIGPIPE, SIG_IGN);
+	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+		pr_perror("Failed to set a SIGPIPE signal ignore.");
+		return 1;
+	}
 
 	/*
 	 * When a process group becomes an orphan,

From 87ea13f6b7f176f9b7f9587f7cedec2e79880aae Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Fri, 18 Jun 2021 18:44:45 -0400
Subject: [PATCH 0639/1854] add PKG_CONFIG default in a few more places

These files use $PKG_CONFIG before they include the common files that
setup a default, so set early defaults in them too.

Signed-off-by: Mike Frysinger <vapier@chromium.org>
---
 test/zdtm/lib/Makefile    | 1 +
 test/zdtm/static/Makefile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index 5ecf8bccf..ceec2b878 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -6,6 +6,7 @@ LIB	:= libzdtmtst.a
 
 LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
 
+PKG_CONFIG ?= pkg-config
 pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
 ifeq ($(call pkg-config-check,libbpf),y)
 LIBSRC	+= bpfmap_zdtm.c
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index c5f3c98be..1c11b36c3 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -241,6 +241,7 @@ TST_NOFILE	:=				\
 		sigtrap01			\
 #		jobctl00			\
 
+PKG_CONFIG ?= pkg-config
 pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
 ifeq ($(call pkg-config-check,libbpf),y)
 TST_NOFILE	+=				\

From eda3ac2ff356323d8fe7a1a1882d8ead1f9927d8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 28 May 2021 19:45:27 +0100
Subject: [PATCH 0640/1854] scripts/vagrant: Use Fedora 34

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 91b912aad..2212d22ae 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -7,8 +7,8 @@ set -e
 set -x
 
 VAGRANT_VERSION=2.2.14
-FEDORA_VERSION=33
-FEDORA_BOX_VERSION=33.20201019.0
+FEDORA_VERSION=34
+FEDORA_BOX_VERSION=34.20210423.0
 
 setup() {
 	if [ -n "$TRAVIS" ]; then

From a92833818ba237c6659467cf9fc5b0f07c76c758 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 28 May 2021 19:45:38 +0100
Subject: [PATCH 0641/1854] scripts/vagrant: Use vagrant 2.2.16

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 2212d22ae..839b100c8 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -6,7 +6,7 @@
 set -e
 set -x
 
-VAGRANT_VERSION=2.2.14
+VAGRANT_VERSION=2.2.16
 FEDORA_VERSION=34
 FEDORA_BOX_VERSION=34.20210423.0
 

From b4c7267b0e9e282948cf7c52e1f83d70512aac8c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 14 Jun 2021 20:40:51 +0000
Subject: [PATCH 0642/1854] zdtm: allow ignore taint via environment variable

With this change tainted kernels can be ignored with setting
ZDTM_IGNORE_TAINT=1. This is just to simplify the CI script to not
require to change every call of zdtm. Setting the variable once should
be enough.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 41609a9b2..9fae6e2c8 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1938,7 +1938,7 @@ class Launcher:
             self.__taint = taintfd.read()
         if int(self.__taint, 0) != 0:
             print("The kernel is tainted: %r" % self.__taint)
-            if not opts["ignore_taint"]:
+            if not opts["ignore_taint"] and os.getenv("ZDTM_IGNORE_TAINT") != '1':
                 raise Exception("The kernel is tainted: %r" % self.__taint)
 
     def __show_progress(self, msg):

From 1fbe876242f0189fd0007390ab3f48c6dcce11cc Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 14 Jun 2021 20:52:44 +0000
Subject: [PATCH 0643/1854] ci: disable -x during print_env()

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 72b31f7a2..6cd83e8b6 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -90,6 +90,7 @@ print_header() {
 }
 
 print_env() {
+	set +x
 	# As this script can run on multiple different CI systems
 	# the following lines should give some context to the
 	# evnvironment of this CI run.
@@ -116,6 +117,7 @@ print_env() {
 	fi
 	print_header "Available CPUs"
 	lscpu || :
+	set -x
 }
 
 print_env

From 6ef01d3e6a122963d4ba4b218fc9974760a8e353 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 14 Jun 2021 19:07:25 +0000
Subject: [PATCH 0644/1854] ci: switch CentOS 7 test to Cirrus CI

On Cirrus CI we can run tests on the orignal CentOS 7 kernel.

The kernel is rather old, but on GitHub Actions we a 5.8 kernel
and a containerized CentOS 7 user space not much is working
correctly anymore. With this commit CentOS 7 based tests are
no longer running on GitHub Actions but on Cirrus CI.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml                       | 29 +++++++++++++++++++++++++++++
 .github/workflows/centos-test.yml | 15 ---------------
 2 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 .github/workflows/centos-test.yml

diff --git a/.cirrus.yml b/.cirrus.yml
index 9c590f0b2..671178d8b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -48,3 +48,32 @@ task:
 
   build_script: |
     make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1
+
+task:
+  name: CentOS 7 based test
+  environment:
+    HOME: "/root"
+    CIRRUS_WORKING_DIR: "/tmp/criu"
+
+  compute_engine_instance:
+    image_project: centos-cloud
+    image: family/centos-7
+    platform: linux
+    cpu: 4
+    memory: 8G
+
+  setup_script: |
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+    yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
+    # Even with selinux in permissive mode the selinux tests will be executed
+    # The Cirrus CI user runs as a service from selinux point of view and is
+    # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
+    # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode
+    setenforce 0
+    # Enable user namespaces on CentOS 7
+    echo 10000 > /proc/sys/user/max_user_namespaces
+    # Adapt sudoers to our needs
+    echo 'root ALL=(ALL:ALL) ALL' | EDITOR='tee -a' visudo
+
+  build_script: |
+    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_IGNORE_TAINT=1 ZDTM_OPTS="-x zdtm/static/socket-raw -x zdtm/static/child_subreaper_existing_child -x zdtm/static/fifo_upon_unix_socket01 -x zdtm/static/overmount_sock -x zdtm/static/tempfs_overmounted"
diff --git a/.github/workflows/centos-test.yml b/.github/workflows/centos-test.yml
deleted file mode 100644
index 41b1f3a6e..000000000
--- a/.github/workflows/centos-test.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: CentOS Test
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        target: [centos7]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run CentOS ${{ matrix.target }} Test
-      run: sudo -E make -C scripts/ci ${{ matrix.target }}

From 63ca464bcba41100a36624b9b6cfc988a2d788cc Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 15 Jun 2021 06:02:55 +0000
Subject: [PATCH 0645/1854] ci: remove old workarounds

This commit removes a couple of workaround for old kernels and
distributions which we no longer use in CI.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 6cd83e8b6..0ccd3eece 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -4,25 +4,9 @@ set -x -e
 CI_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
-		libnl-route-3-dev time flake8 libbsd-dev
-		libperl-dev pkg-config"
-
-
-if [ -e /etc/lsb-release ]; then
-	# This file does not exist on non Ubuntu
-	# shellcheck disable=SC1091
-	. /etc/lsb-release
-	if [ "$DISTRIB_RELEASE" = "16.04" ]; then
-		# There is one last test running on 16.04 because of the broken
-		# overlayfs in 18.04. Once that is fixed we can remove the last
-		# 16.04 based test and this if clause.
-		CI_PKGS="$CI_PKGS python-future python-protobuf python-yaml
-			python-junit.xml python-ipaddress"
-	else
-		CI_PKGS="$CI_PKGS python3-future python3-protobuf python3-yaml
-			python3-junit.xml"
-	fi
-fi
+		libnl-route-3-dev time flake8 libbsd-dev python3-yaml
+		libperl-dev pkg-config python3-future python3-protobuf
+		python3-junit.xml"
 
 X86_64_PKGS="gcc-multilib"
 
@@ -193,11 +177,6 @@ if [ "$UNAME_M" == "x86_64" ]; then
 fi
 
 export SKIP_PREP=1
-# The 3.19 kernel (from Ubuntu 14.04) has a bug. When /proc/PID/pagemap
-# is read for a few VMAs in one read call, incorrect data is returned.
-# See https://github.com/checkpoint-restore/criu/issues/207
-# Kernel 4.4 (from Ubuntu 14.04.5 update) fixes this.
-uname -r | grep -q ^3\.19 && export CRIU_PMC_OFF=1
 
 chmod 0777 test/
 chmod 0777 test/zdtm/static
@@ -239,7 +218,7 @@ bash -x ./test/jenkins/criu-inhfd.sh
 if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 	make -C test/others/mnt-ext-dev/ run
 fi
-#make -C test/others/exec/ run
+
 make -C test/others/make/ run CC="$CC"
 if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # GitHub Actions (and Cirrus CI) does not provide a real TTY and CRIU will fail with:

From 24bc083653f7d2b984653194e921b1ff32292b3b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 15 Jun 2021 08:48:48 +0000
Subject: [PATCH 0646/1854] ci: disable some tests on CentOS 7

Now that we are running CI on an actual CentOS 7 kernel different
tests are no longer working as they require newer kernels.

This commit disables a few tests only on CentOS 7.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/ns_ext/run.sh       |  2 ++
 test/others/ns_ext/run_pidns.sh |  3 +++
 test/others/rpc/run.sh          | 10 +++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/others/ns_ext/run.sh b/test/others/ns_ext/run.sh
index 4b57f8c59..2e9a6fe86 100755
--- a/test/others/ns_ext/run.sh
+++ b/test/others/ns_ext/run.sh
@@ -4,6 +4,8 @@ set -x
 
 if [[ "$1" == "pid" ]]; then
 	NS=pid
+	# CentOS 7 kernels do not have NSpid -> skip this test
+	grep NSpid /proc/self/status || exit 0
 else
 	NS=net
 fi
diff --git a/test/others/ns_ext/run_pidns.sh b/test/others/ns_ext/run_pidns.sh
index b4c7b88a8..19fb97b95 100755
--- a/test/others/ns_ext/run_pidns.sh
+++ b/test/others/ns_ext/run_pidns.sh
@@ -2,6 +2,9 @@
 
 set -e
 
+# CentOS 7 kernels do not have NSpid -> skip this test
+grep NSpid /proc/self/status || exit 0
+
 # This test creates a process in non-host pidns and then dumps it and restores
 # it into host pidns. We use pid >100000 in non-host pidns to make sure it does
 # not intersect with some host pid on restore but it is potentially racy so
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index afd4fb5e3..9be577587 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 
-set -e
+set -ex
+
+if [ -e /etc/os-release ]; then
+	. /etc/os-release
+	if [ "$ID" == "centos" ] && [[ "$VERSION_ID" == "7"* ]];then
+		echo "Skipping tests on CentOS 7 because they do not work in CI"
+		exit 0
+	fi
+fi
 
 CRIU=./criu
 

From 031a8d790572f53b39856477a485226714ec6768 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 18 Jun 2021 21:38:07 +0000
Subject: [PATCH 0647/1854] bfd: loop through read()/write() when the action is
 incomplete

The callers of bread() and bwrite() assume the operation reads/writes
the complete length of the passed buffer.
We must loop when invoking the read()/write() APIs.

Fixes #1504

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/bfd.c          | 17 ++++++++-----
 criu/include/util.h |  3 +++
 criu/util.c         | 58 ++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/criu/bfd.c b/criu/bfd.c
index 535c4d354..e0d9ede7a 100644
--- a/criu/bfd.c
+++ b/criu/bfd.c
@@ -145,7 +145,7 @@ static int brefill(struct bfd *f)
 	memmove(b->mem, b->data, b->sz);
 	b->data = b->mem;
 
-	ret = read(f->fd, b->mem + b->sz, BUFSIZE - b->sz);
+	ret = read_all(f->fd, b->mem + b->sz, BUFSIZE - b->sz);
 	if (ret < 0) {
 		pr_perror("Error reading file");
 		return -1;
@@ -241,7 +241,7 @@ static int bflush(struct bfd *bfd)
 	if (!b->sz)
 		return 0;
 
-	ret = write(bfd->fd, b->data, b->sz);
+	ret = write_all(bfd->fd, b->data, b->sz);
 	if (ret != b->sz)
 		return -1;
 
@@ -261,7 +261,7 @@ static int __bwrite(struct bfd *bfd, const void *buf, int size)
 	}
 
 	if (size > BUFSIZE)
-		return write(bfd->fd, buf, size);
+		return write_all(bfd->fd, buf, size);
 
 	memcpy(b->data + b->sz, buf, size);
 	b->sz += size;
@@ -271,7 +271,7 @@ static int __bwrite(struct bfd *bfd, const void *buf, int size)
 int bwrite(struct bfd *bfd, const void *buf, int size)
 {
 	if (!bfd_buffered(bfd))
-		return write(bfd->fd, buf, size);
+		return write_all(bfd->fd, buf, size);
 
 	return __bwrite(bfd, buf, size);
 }
@@ -280,8 +280,13 @@ int bwritev(struct bfd *bfd, const struct iovec *iov, int cnt)
 {
 	int i, written = 0;
 
-	if (!bfd_buffered(bfd))
+	if (!bfd_buffered(bfd)) {
+		/*
+		 * FIXME writev() should be called again if writev() writes
+		 * less bytes than requested.
+		 */
 		return writev(bfd->fd, iov, cnt);
+	}
 
 	for (i = 0; i < cnt; i++) {
 		int ret;
@@ -304,7 +309,7 @@ int bread(struct bfd *bfd, void *buf, int size)
 	int more = 1, filled = 0;
 
 	if (!bfd_buffered(bfd))
-		return read(bfd->fd, buf, size);
+		return read_all(bfd->fd, buf, size);
 
 	while (more > 0) {
 		int chunk;
diff --git a/criu/include/util.h b/criu/include/util.h
index 039d42f4f..5a6829ed6 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -385,4 +385,7 @@ extern int mount_detached_fs(const char *fsname);
 
 extern char *get_legacy_iptables_bin(bool ipv6);
 
+extern ssize_t read_all(int fd, void *buf, size_t size);
+extern ssize_t write_all(int fd, const void *buf, size_t size);
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/util.c b/criu/util.c
index 973553bbc..86bc22e62 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1583,4 +1583,60 @@ char *get_legacy_iptables_bin(bool ipv6)
 	iptables_present[ipv6] = 1;
 
 	return iptables_bin[ipv6];
-}
\ No newline at end of file
+}
+
+/*
+ * read_all() behaves like read() without the possibility of partial reads.
+ * Use only with blocking I/O.
+ */
+ssize_t read_all(int fd, void *buf, size_t size)
+{
+	ssize_t n = 0;
+	while (size > 0) {
+		ssize_t ret = read(fd, buf, size);
+		if (ret == -1) {
+			if (errno == EINTR)
+				continue;
+			/*
+			 * The caller should use standard read() for
+			 * non-blocking I/O.
+			 */
+			if (errno == EAGAIN || errno == EWOULDBLOCK)
+				errno = EINVAL;
+			return ret;
+		}
+		if (ret == 0)
+			break;
+		n += ret;
+		buf = (char *)buf + ret;
+		size -= ret;
+	}
+	return n;
+}
+
+/*
+ * write_all() behaves like write() without the possibility of partial writes.
+ * Use only with blocking I/O.
+ */
+ssize_t write_all(int fd, const void *buf, size_t size)
+{
+	ssize_t n = 0;
+	while (size > 0) {
+		ssize_t ret = write(fd, buf, size);
+		if (ret == -1) {
+			if (errno == EINTR)
+				continue;
+			/*
+			 * The caller should use standard write() for
+			 * non-blocking I/O.
+			 */
+			if (errno == EAGAIN || errno == EWOULDBLOCK)
+				errno = EINVAL;
+			return ret;
+		}
+		n += ret;
+		buf = (char *)buf + ret;
+		size -= ret;
+	}
+	return n;
+}

From 381d2e88fb9ca5a4c37bd2f476fd7c2934c3daef Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 23 Jun 2021 17:47:57 +0000
Subject: [PATCH 0648/1854] criu: add cleanup_free attribute

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/include/util.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index 5a6829ed6..3c6027c27 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -388,4 +388,11 @@ extern char *get_legacy_iptables_bin(bool ipv6);
 extern ssize_t read_all(int fd, void *buf, size_t size);
 extern ssize_t write_all(int fd, const void *buf, size_t size);
 
+#define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
+static inline void cleanup_freep (void *p)
+{
+	void **pp = (void **) p;
+	free (*pp);
+}
+
 #endif /* __CR_UTIL_H__ */

From f695e6e107c8b19bdaf7c1476fd048d1327cea65 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 15 Jun 2021 16:16:12 +0000
Subject: [PATCH 0649/1854] config: make configuration file parser more robust

Trying to see how robust the configuration parser I was able to crash
CRIU pretty quickly. This fixes a few crashes in the existing
configuration file parser.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/config.c | 261 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 205 insertions(+), 56 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 36be023f7..ba828f75f 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -44,72 +44,208 @@ static int count_elements(char **to_count)
 /* Parse one statement in configuration file */
 int parse_statement(int i, char *line, char **configuration)
 {
+	cleanup_free char *input = NULL;
 	int offset = 0, len = 0;
-	bool was_newline = true;
-	char *tmp_string, *quoted, *quotedptr;
+	char *tmp_string;
 
-	while (1) {
-		/* Ignore white-space */
-		while ((isspace(*(line + offset)) && (*(line + offset) != '\n'))) offset++;
+	/*
+	 * A line from the configuration file can be:
+	 *  - empty
+	 *  - a boolean option (tcp-close)
+	 *  - an option with one parameter (verbosity 4)
+	 *    - a parameter can be in quotes (lsm-profile "selinux:something")
+	 *    - a parameter can contain escaped quotes
+	 *
+	 * Whenever a '#' is found we ignore everything after as a comment.
+	 *
+	 * This function adds none, one (boolean option) or two entries
+	 * in **configuration and returns i + (the number of entries).
+	 */
 
-		/* Read a single word. A word is everything
-		 * that doesn't contain white-space characters. */
-		if (sscanf(line + offset, "%m[^ \t\n]s", &configuration[i]) != 1) {
-			configuration[i] = NULL;
-			break;
-		}
+	if (strlen(line) == 0)
+		return i;
 
-		/* Ignore comments - everything between '#' and '\n' */
-		if (configuration[i][0] == '#') {
-			configuration[i] = NULL;
-			break;
-		}
+	/* Ignore leading white-space */
+	while ((isspace(*(line + offset)) && (*(line + offset) != '\n')))
+		offset++;
 
-		if ((configuration[i][0] == '\"') && (strchr(line + offset + 1, '"'))) {
-			/* Handle empty strings which strtok ignores */
-			if (!strcmp(configuration[i], "\"\"")) {
-				configuration[i] = "";
-				offset += strlen("\"\"");
-			} else if ((configuration[i] = strtok_r(line + offset, "\"", &quotedptr))) {
-				/* Handle escaping of quotes in quoted string */
-				while (configuration[i][strlen(configuration[i]) - 1] == '\\') {
-					offset++;
-					len = strlen(configuration[i]);
-					configuration[i][len - 1] = '"';
-					if (*quotedptr == '"') {
-						quotedptr++;
-						break;
-					}
-					quoted = strtok_r(NULL, "\"", &quotedptr);
-					tmp_string = xmalloc(len + strlen(quoted) + 1);
-					if (tmp_string == NULL)
-						return -1;
+	/* Ignore empty line */
+	if (line[offset] == '\n')
+		return i;
 
-					memmove(tmp_string, configuration[i], len);
-					memmove(tmp_string + len, quoted, strlen(quoted) + 1);
-					configuration[i] = tmp_string;
-				}
-				offset += 2;
-			}
-		}
+	/* Ignore line starting with a comment */
+	if (line[offset] == '#')
+		return i;
 
-		offset += strlen(configuration[i]);
+	input = xstrdup(line + offset);
+	if (unlikely(!input))
+		return -1;
 
-		if (was_newline) {
-			was_newline = false;
-			len = strlen(configuration[i]);
-			tmp_string = xrealloc(configuration[i], len + strlen("--") + 1);
-			if (tmp_string == NULL)
-				return -1;
+	offset = 0;
 
-			memmove(tmp_string + strlen("--"), tmp_string, len + 1);
-			memmove(tmp_string, "--", strlen("--"));
-			configuration[i] = tmp_string;
-		}
+	/* Remove trailing '\n' */
+	if ((tmp_string = strchr(input, '\n')))
+		tmp_string[0] = 0;
+
+	if ((tmp_string = strchr(input, ' ')) || (tmp_string = strchr(input, '\t'))) {
+		configuration[i] = xzalloc(tmp_string - input + strlen("--") + 1);
+		if (unlikely(!configuration[i]))
+			return -1;
+		memcpy(configuration[i], "--", strlen("--"));
+		memcpy(configuration[i] + strlen("--"), input, tmp_string - input);
+		configuration[i][tmp_string - input + strlen("--")] = 0;
+		/* Go to the next character */
+		offset += tmp_string - input + 1;
 		i++;
+	} else {
+		if (unlikely(asprintf(&configuration[i], "--%s", input) == -1))
+			return -1;
+		return i + 1;
 	}
 
-	return i;
+	while ((isspace(*(input + offset))))
+		offset++;
+
+	/* Check if the next token is a comment */
+	if (input[offset] == '#')
+		return i;
+
+	if (input[offset] == '"') {
+		bool found_second_quote = false;
+		char *quote_start;
+		int quote_offset;
+
+		/* Move by one to skip the leading quote. */
+		offset++;
+		quote_start = input + offset;
+		quote_offset = offset;
+
+		if (input[offset] == 0) {
+			/* The value for the parameter was a single quote, this is not supported. */
+			xfree(configuration[i - 1]);
+			pr_err("Unsupported configuration file format. Please consult man page criu(8)\n");
+			return -1;
+		}
+
+		if (input[offset] == '"') {
+			/* We got "" as value */
+			configuration[i] = xstrdup("");
+			if (unlikely(!configuration[i])) {
+				xfree(configuration[i -1]);
+				return -1;
+			}
+			offset = 0;
+			goto out;
+		}
+
+		/*
+		 * If it starts with a quote everything until the
+		 * next unescaped quote needs to be looked at.
+		 */
+		while ((tmp_string = strchr(input + quote_offset + 1, '"'))) {
+			quote_offset = tmp_string - input;
+			/* Check if it is escaped */
+			if (*(tmp_string - 1) == '\\')
+				continue;
+
+			/* Not escaped. That is the end of the quoted string. */
+			found_second_quote = true;
+			configuration[i] = xzalloc(quote_offset - offset + 1);
+			if (unlikely(!configuration[i])) {
+				xfree(configuration[i -1]);
+				return -1;
+			}
+			memcpy(configuration[i], quote_start, quote_offset - offset);
+			configuration[i][quote_offset - offset] = 0;
+			/* We skipped one additional quote */
+			offset++;
+			/* Check for excessive parameters on the original line. */
+			tmp_string++;
+			if (tmp_string != 0 && strchr(tmp_string, ' ')) {
+				int j;
+				len = strlen(tmp_string);
+				for (j = 0; j < len - 1; j++) {
+					if (tmp_string[j] == '#')
+						break;
+					if (!isspace(tmp_string[j])) {
+						pr_err("Unsupported configuration file format. Please consult man page criu(8)\n");
+						xfree(configuration[i - 1]);
+						xfree(configuration[i]);
+						return -1;
+					}
+				}
+			}
+			break;
+		}
+		if (!found_second_quote) {
+			pr_err("Unsupported configuration file format. Please consult man page criu(8)\n");
+			xfree(configuration[i - 1]);
+			return -1;
+		}
+	} else {
+		/* Does not start with a quote. */
+		if (unlikely(asprintf(&configuration[i], "%s", input + offset) == -1)) {
+			xfree(configuration[i -1]);
+			return -1;
+		}
+
+		if ((tmp_string = strchr(input + offset, ' ')))
+			offset = tmp_string - (input + offset);
+		else
+			offset = 0;
+	}
+
+	len = strlen(configuration[i]);
+	if (strstr(configuration[i], "\\\"")) {
+		/* We found an escaped quote. Skip the backslash. */
+		cleanup_free char *tmp = NULL;
+		int skipped = 0;
+		int start = 0;
+		int dest = 0;
+		int j;
+
+		tmp = xzalloc(len);
+		if (tmp == NULL)
+			return -1;
+
+		for (j = start; j < len; j++) {
+			if (configuration[i][j] == '\\' && j + 1 < len && configuration[i][j + 1] == '"') {
+				skipped++;
+				continue;
+			}
+			tmp[dest++] = configuration[i][j];
+		}
+		memcpy(configuration[i], tmp, strlen(tmp));
+		configuration[i][strlen(tmp)] = 0;
+
+		/* Account for skipped backslashes. */
+		offset += skipped + 1;
+		len -= skipped;
+	}
+
+out:
+	/* Remove potential comments at the end */
+	if ((tmp_string = strstr(configuration[i], "#")) || (tmp_string = strstr(configuration[i], " #")))
+		tmp_string[0] = 0;
+
+	/* Check for unsupported configuration file entries */
+	if (configuration[i] + offset + 1 != 0 && strchr(configuration[i] + offset, ' ')) {
+		int j;
+		len = strlen(configuration[i] + offset);
+		for (j = 0; j < len - 1; j++) {
+			if (!isspace(configuration[i][offset + j])) {
+				pr_err("Unsupported configuration file format. Please consult man page criu(8)\n");
+				xfree(configuration[i - 1]);
+				xfree(configuration[i]);
+				return -1;
+			}
+		}
+	}
+
+	if ((tmp_string = strchr(configuration[i] + offset, ' ')))
+		tmp_string[0] = 0;
+
+	return i + 1;
 }
 
 /* Parse a configuration file */
@@ -139,9 +275,22 @@ static char ** parse_config(char *filepath)
 	configuration[0] = "criu";
 
 	while (getline(&line, &line_size, configfile) != -1) {
+		int spaces = 1;
+		int j;
+		/*
+		 * The statement parser 'parse_statement()' needs as many
+		 * elements in 'configuration' as spaces + 1, because it splits
+		 * each line at a space to return a result that can used as
+		 * input for getopt. So, let's count spaces to determine the
+		 * memory requirements.
+		 */
+		for (j = 0; j < strlen(line); j++)
+			if (line[j] == ' ')
+				spaces++;
+
 		/* Extend configuration buffer if necessary */
-		if (i >= config_size - 1) {
-			config_size *= 2;
+		if (i + spaces >= config_size - 1) {
+			config_size += spaces;
 			configuration = xrealloc(configuration, config_size * sizeof(char *));
 			if (configuration == NULL) {
 				fclose(configfile);

From 45bde968a26e21d060de86e6490c8d10d7a191b5 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 16 Jun 2021 07:19:30 +0000
Subject: [PATCH 0650/1854] test: add tests for configuration file parsing

This adds a test run to ensure known (but fixed) configuration file
parser errors are not crashing CRIU anymore.

Based on missing test code coverage this script also tests code paths of
the option handling which have not been tested until now.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile                           |   1 +
 scripts/ci/run-ci-tests.sh         |   3 +
 test/others/config-file/Makefile   |   3 +
 test/others/config-file/conf1.test |  13 ++++
 test/others/config-file/conf2.test |  16 +++++
 test/others/config-file/conf3.test |  17 +++++
 test/others/config-file/run.sh     | 108 +++++++++++++++++++++++++++++
 7 files changed, 161 insertions(+)
 create mode 100644 test/others/config-file/Makefile
 create mode 100644 test/others/config-file/conf1.test
 create mode 100644 test/others/config-file/conf2.test
 create mode 100644 test/others/config-file/conf3.test
 create mode 100755 test/others/config-file/run.sh

diff --git a/Makefile b/Makefile
index 572a21d1a..3eb202eea 100644
--- a/Makefile
+++ b/Makefile
@@ -405,6 +405,7 @@ lint:
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 	shellcheck test/others/crit/*.sh
+	shellcheck test/others/config-file/*.sh
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
 	# Do not use %m with pr_perror or fail
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 0ccd3eece..b0446219e 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -261,6 +261,9 @@ make -C test/others/libcriu run
 # external namespace testing
 make -C test/others/ns_ext run
 
+# config file parser and parameter testing
+make -C test/others/config-file run
+
 # Skip all further tests when running with GCOV=1
 # The one test which currently cannot handle GCOV testing is compel/test
 # Probably because the GCOV Makefile infrastructure does not exist in compel
diff --git a/test/others/config-file/Makefile b/test/others/config-file/Makefile
new file mode 100644
index 000000000..594edc070
--- /dev/null
+++ b/test/others/config-file/Makefile
@@ -0,0 +1,3 @@
+run:
+	./run.sh
+.PHONY: run
diff --git a/test/others/config-file/conf1.test b/test/others/config-file/conf1.test
new file mode 100644
index 000000000..68d3aba31
--- /dev/null
+++ b/test/others/config-file/conf1.test
@@ -0,0 +1,13 @@
+#
+#
+#
+verbosity 4
+lsm-profile "" # more comments
+lsm-profile "something"# comment
+lsm-profile "selinux:something\"with\"quotes"
+lsm-profile "apparmor:something\"with\"quotes"
+work-dir /tmp
+work-dir "/tmp"
+work-dir "/dir with spaces"
+a b c d e f g h i j k l m n o p
+dsfa "aaaaa \"bbbbbb\""
diff --git a/test/others/config-file/conf2.test b/test/others/config-file/conf2.test
new file mode 100644
index 000000000..41c6c4f92
--- /dev/null
+++ b/test/others/config-file/conf2.test
@@ -0,0 +1,16 @@
+#
+#
+#
+verbosity 4
+lsm-profile "" # more comments
+lsm-profile "something"# comment
+lsm-profile "selinux:something\"with\"quotes"
+lsm-profile "apparmor:something\"with\"quotes"
+work-dir /tmp
+work-dir "/tmp"
+work-dir "/dir with spaces" 
+work-dir "/dir with spaces" #comment
+work-dir "/dir with spaces" # comment
+work-dir "/dir with spaces"# comment
+work-dir "/dir with spaces"#comment
+dsfa "aaaaa \"bbbbbb\""
diff --git a/test/others/config-file/conf3.test b/test/others/config-file/conf3.test
new file mode 100644
index 000000000..fe82a5835
--- /dev/null
+++ b/test/others/config-file/conf3.test
@@ -0,0 +1,17 @@
+#
+#
+#
+verbosity 4
+lsm-profile "" # more comments
+lsm-profile "something"# comment
+lsm-profile "selinux:something\"with\"quotes"
+lsm-profile "apparmor:something\"with\"quotes"
+work-dir /tmp
+work-dir "/tmp"
+work-dir "/dir with spaces" 
+work-dir "/dir with spaces" #comment
+work-dir "/dir with spaces" # comment
+work-dir "/dir with spaces"# comment
+work-dir "/dir with spaces"#comment
+dsfa "aaaaa \"bbbbbb\""
+dsfa "aaaaa \"bbbbbb\"" more
diff --git a/test/others/config-file/run.sh b/test/others/config-file/run.sh
new file mode 100755
index 000000000..92195883e
--- /dev/null
+++ b/test/others/config-file/run.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+# This script tries to run criu with different options to ensure
+# the configuration file and option handling does not break.
+#
+# The options have been selected by looking at the existing
+# test code coverage and missing code coverage should be handled
+# by the options used in this file.
+#
+# This script tries to only exit if criu crashes. A return value
+# of '1' should not stop the script.
+
+set -xbm
+
+#shellcheck disable=SC1091
+source ../env.sh
+
+if [ ! -d /etc/criu ]; then
+	mkdir -p /etc/criu
+fi
+
+if [ ! -e /etc/criu/default.conf ]; then
+	touch /etc/criu/default.conf
+fi
+
+# This tries to capture any exit codes other than 0 and 1
+# Especially looking for crashes
+trap '
+RESULT=$?
+if [[ $RESULT -gt 1 ]]; then
+	echo "unexpected exit code $RESULT"
+	exit 2
+fi
+' CHLD
+
+# Just some random combination of flags
+$CRIU check --pre-dump-mode read --auto-dedup --page-server --track-mem --display-stats -v0
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0 --conf conf1.test
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0 --conf=conf1.test
+$CRIU check --pre-dump-mode invalid --auto-dedup --page-server --track-mem --display-stats -v0 --conf=conf1.test
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0 --conf conf2.test
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0 --conf=conf2.test
+$CRIU check --pre-dump-mode invalid --auto-dedup --page-server --track-mem --display-stats -v0 --conf=conf2.test
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0 --conf conf3.test
+$CRIU check --pre-dump-mode splice --auto-dedup --page-server --track-mem --display-stats -v0 --conf=conf3.test
+$CRIU check --pre-dump-mode invalid --auto-dedup --page-server --track-mem --display-stats -v0 --conf=conf3.test
+$CRIU check --no-default-config
+$CRIU check --no-default-config --config=conf
+$CRIU check --no-default-config --config=conf1.test
+$CRIU check --no-default-config --config=conf1.test --help
+$CRIU check --no-default-config --config=conf1.test --h
+$CRIU check --no-default-config --config=conf2.test
+$CRIU check --no-default-config --config=conf2.test --help
+$CRIU check --no-default-config --config=conf2.test --h
+$CRIU check --no-default-config --config=conf3.test
+$CRIU check --no-default-config --config=conf3.test --help
+$CRIU check --no-default-config --config=conf3.test --h
+
+if [ ! -e "$HOME"/.criu.default ]; then
+	touch "$HOME"/.criu.default
+fi
+$CRIU check --pre-dump-mode read --auto-dedup --page-server --track-mem --display-stats -v0 -s -t "-1"
+$CRIU check --pre-dump-mode read --auto-dedup --page-server --track-mem --display-stats -S -R -vvvvvv
+$CRIU check --pre-dump-mode read --auto-dedup --page-server --track-mem --display-stats -J invalidjoin-invalid
+$CRIU check --pre-dump-mode read --auto-dedup --page-server --track-mem --display-stats -d -r
+$CRIU check --pre-dump-mode read --auto-dedup --page-server --track-mem --display-stats -d -r none
+unset HOME
+$CRIU check --close
+export HOME=/ROOOOT
+$CRIU check --close
+$CRIU check --port
+$CRIU check --port 20000
+$CRIU check --port some-port -l
+CRIU_CONFIG_FILE=conf $CRIU check --port some-port -l
+CRIU_CONFIG_FILE=conf1.test $CRIU check
+CRIU_CONFIG_FILE=conf2.test $CRIU check
+CRIU_CONFIG_FILE=conf3.test $CRIU check
+CRIU_CONFIG_FILE=conf1.test $CRIU check --port some-port -l
+CRIU_CONFIG_FILE=conf2.test $CRIU check --port some-port -l
+CRIU_CONFIG_FILE=conf3.test $CRIU check --port some-port -l
+$CRIU check --ms -L
+CRIU_DEPRECATED=1 $CRIU check --ms
+CRIU_DEPRECATED=1 $CRIU check
+$CRIU check -l
+$CRIU check -l 17
+$CRIU check -L
+$CRIU check -L 13
+$CRIU check -L /tmp
+$CRIU check --skip-mnt
+$CRIU check --skip-mnt 13
+$CRIU check --skip-mnt -13
+$CRIU check --skip-mnt /tmp
+$CRIU check --force-irmap --link-remap --evasive-devices
+$CRIU check -M 1:2 --status-fd
+$CRIU check -M 1:2 --status-fd 1 --ps-socket 1
+$CRIU check -M 1:2 --status-fd 1 --ps-socket 1 -D
+$CRIU check -M 1:2 --status-fd 1 --ps-socket 1 --port 4242
+$CRIU check -M 1:2 --status-fd 1 --ps-socket one
+$CRIU check -M 1:2 --status-fd one
+$CRIU check --cgroup-props conf.test --cgroup-props-file conf.test
+$CRIU -V
+$CRIU dump --file-validation
+$CRIU restore --file-validation 1
+$CRIU check --file-validation filesizefilesize
+$CRIU dump --file-validation filesize
+$CRIU restore --file-validation buildid
+$CRIU check --file-validation buildid --deprecated
+exit 0

From 1a197d4d86ba50012d7808773fa5b361017f658b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 22 Jun 2021 14:52:09 +0000
Subject: [PATCH 0651/1854] criu: add unit testing for config file parser

This tries to add a unit test for the configuration file parser.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .gitignore                 |   1 +
 Makefile                   |   5 ++
 criu/Makefile              |  21 ++++++++
 criu/unittest/Makefile     |   6 +++
 criu/unittest/mock.c       |  99 ++++++++++++++++++++++++++++++++++
 criu/unittest/unit.c       | 107 +++++++++++++++++++++++++++++++++++++
 scripts/ci/run-ci-tests.sh |   4 ++
 7 files changed, 243 insertions(+)
 create mode 100644 criu/unittest/Makefile
 create mode 100644 criu/unittest/mock.c
 create mode 100644 criu/unittest/unit.c

diff --git a/.gitignore b/.gitignore
index 3b3da545c..d5135f5f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ images/google/protobuf/*.c
 images/google/protobuf/*.h
 .gitid
 criu/criu
+criu/unittest/unittest
 crit/crit
 criu/arch/*/sys-exec-tbl*.c
 # x86 syscalls-table is not generated
diff --git a/Makefile b/Makefile
index 3eb202eea..a8d14ca00 100644
--- a/Makefile
+++ b/Makefile
@@ -257,6 +257,10 @@ crit: criu
 	$(Q) $(MAKE) $(build)=crit all
 .PHONY: crit
 
+unittest: $(criu-deps)
+	$(Q) $(MAKE) $(build)=criu unittest
+.PHONY: unittest
+
 
 #
 # Libraries next once crit it ready
@@ -393,6 +397,7 @@ help:
 	@echo '      cscope          - Generate cscope database'
 	@echo '      test            - Run zdtm test-suite'
 	@echo '      gcov            - Make code coverage report'
+	@echo '      unittest        - Run unit tests'
 .PHONY: help
 
 lint:
diff --git a/criu/Makefile b/criu/Makefile
index 11d454c81..b92a3f7e9 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -87,6 +87,26 @@ $(obj)/criu: $(PROGRAM-BUILTINS)
 	$(call msg-link, $@)
 	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) $(WRAPFLAGS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
 
+UNIT-BUILTINS		+= $(obj)/config.o
+UNIT-BUILTINS		+= $(obj)/log.o
+UNIT-BUILTINS		+= $(obj)/string.o
+UNIT-BUILTINS		+= $(obj)/unittest/built-in.o
+
+$(obj)/unittest/Makefile: ;
+
+$(obj)/unittest/%: .FORCE
+
+$(obj)/unittest/built-in.o: .FORCE
+	$(Q) $(MAKE) $(call build-as,Makefile,criu/unittest) all
+
+$(obj)/unittest/unittest: $(UNIT-BUILTINS)
+	$(call msg-link, $@)
+	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@
+
+unittest: $(obj)/unittest/unittest
+	$(Q) $(obj)/unittest/$@
+
+.PHONY: unittest
 
 #
 # Clean the most, except generated c files
@@ -97,6 +117,7 @@ subclean:
 	$(Q) $(MAKE) $(build)=$(ARCH_DIR) clean
 	$(Q) $(MAKE) $(call build-as,Makefile.library,$(PIE_DIR)) clean
 	$(Q) $(MAKE) $(call build-as,Makefile.crtools,criu) clean
+	$(Q) $(MAKE) $(call build-as,Makefile,criu/unittest) clean
 	$(Q) $(MAKE) $(build)=$(PIE_DIR) clean
 .PHONY: subclean
 cleanup-y      += $(obj)/criu
diff --git a/criu/unittest/Makefile b/criu/unittest/Makefile
new file mode 100644
index 000000000..17bbecf19
--- /dev/null
+++ b/criu/unittest/Makefile
@@ -0,0 +1,6 @@
+ldflags-y	+= -r
+
+obj-y		+= unit.o
+obj-y		+= mock.o
+
+cleanup-y	+= $(obj)/unittest
diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c
new file mode 100644
index 000000000..fb9d38494
--- /dev/null
+++ b/criu/unittest/mock.c
@@ -0,0 +1,99 @@
+/* This file contains dummy functions to make the unittest compile */
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+int add_external(char *key)
+{
+	return 0;
+}
+
+int irmap_scan_path_add(char *path)
+{
+	return 0;
+}
+
+bool add_fsname_auto(const char *names)
+{
+	return true;
+}
+
+bool add_skip_mount(const char *mountpoint)
+{
+	return true;
+}
+
+int check_add_feature(char *feat)
+{
+	return 0;
+}
+
+int inherit_fd_parse(char *optarg)
+{
+	return 0;
+}
+
+int new_cg_root_add(char *controller, char *newroot)
+{
+	return 0;
+}
+
+int add_script(char *path)
+{
+	return 0;
+}
+
+int veth_pair_add(char *in, char *out)
+{
+	return 0;
+}
+
+int unix_sk_ids_parse(char *optarg)
+{
+	return 0;
+}
+
+bool cgp_add_dump_controller(const char *name)
+{
+	return 0;
+}
+
+int join_ns_add(const char *type, char *ns_file, char *extra_opts)
+{
+	return 0;
+}
+
+int ext_mount_add(char *key, char *val)
+{
+	return 0;
+}
+
+int check_namespace_opts(void)
+{
+	return 0;
+}
+
+int get_service_fd(int type)
+{
+	return -1;
+}
+
+void *shmalloc(size_t bytes)
+{
+	return malloc(bytes);
+}
+
+int install_service_fd(int type, int fd)
+{
+	return 0;
+}
+
+int close_service_fd(int type)
+{
+	return 0;
+}
+
+void compel_log_init(int log_fn, unsigned int level)
+{
+}
diff --git a/criu/unittest/unit.c b/criu/unittest/unit.c
new file mode 100644
index 000000000..41eacbffe
--- /dev/null
+++ b/criu/unittest/unit.c
@@ -0,0 +1,107 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+
+#include "log.h"
+#include "criu-log.h"
+
+int parse_statement(int i, char *line, char **configuration);
+
+int main(int argc, char *argv[], char *envp[])
+{
+	char **configuration;
+	int i;
+
+	configuration = malloc(10 * sizeof(char *));
+	log_init(NULL);
+
+	i = parse_statement(0, "", configuration);
+	assert(i == 0);
+
+	i = parse_statement(0, "\n", configuration);
+	assert(i == 0);
+
+	i = parse_statement(0, "# comment\n", configuration);
+	assert(i == 0);
+
+	i = parse_statement(0, "#comment\n", configuration);
+	assert(i == 0);
+
+	i = parse_statement(0, "tcp-close #comment\n", configuration);
+	assert(i == 1);
+	assert(!strcmp(configuration[0], "--tcp-close"));
+
+	i = parse_statement(0, " tcp-close #comment\n", configuration);
+	assert(i == 1);
+	assert(!strcmp(configuration[0], "--tcp-close"));
+
+	i = parse_statement(0, "test \"test\"\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--test"));
+	assert(!strcmp(configuration[1], "test"));
+
+	i = parse_statement(0, "dsfa \"aaaaa \\\"bbbbbb\\\"\"\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--dsfa"));
+	assert(!strcmp(configuration[1], "aaaaa \"bbbbbb\""));
+
+
+	i = parse_statement(0, "verbosity 4\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--verbosity"));
+	assert(!strcmp(configuration[1], "4"));
+
+	i = parse_statement(0, "verbosity \"\n", configuration);
+	assert(i == -1);
+
+	i = parse_statement(0, "verbosity 4#comment\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--verbosity"));
+	assert(!strcmp(configuration[1], "4"));
+
+	i = parse_statement(0, "verbosity 4 #comment\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--verbosity"));
+	assert(!strcmp(configuration[1], "4"));
+
+	i = parse_statement(0, "verbosity 4  #comment\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--verbosity"));
+	assert(!strcmp(configuration[1], "4"));
+
+	i = parse_statement(0, "verbosity 4 no-comment\n", configuration);
+	assert(i == -1);
+
+	i = parse_statement(0, "lsm-profile \"\" # more comments\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--lsm-profile"));
+	assert(!strcmp(configuration[1], ""));
+
+	i = parse_statement(0, "lsm-profile \"something\"# comment\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--lsm-profile"));
+	assert(!strcmp(configuration[1], "something"));
+
+	i = parse_statement(0, "#\n", configuration);
+	assert(i == 0);
+
+	i = parse_statement(0, "lsm-profile \"selinux:something\\\"with\\\"quotes\"\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--lsm-profile"));
+	assert(!strcmp(configuration[1], "selinux:something\"with\"quotes"));
+
+	i = parse_statement(0, "work-dir \"/tmp with spaces\" no-comment\n", configuration);
+	assert(i == -1);
+
+	i = parse_statement(0, "work-dir \"/tmp with spaces\"\n", configuration);
+	assert(i == 2);
+	assert(!strcmp(configuration[0], "--work-dir"));
+	assert(!strcmp(configuration[1], "/tmp with spaces"));
+
+	i = parse_statement(0, "a b c d e f g h i\n", configuration);
+	assert(i == -1);
+
+	pr_msg("OK\n");
+	return 0;
+}
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index b0446219e..7a177b67b 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -126,6 +126,10 @@ if [ "$WIDTH" -gt 80 ]; then
 	exit 1
 fi
 
+# Unit tests at this point do not require any kernel or hardware capabilities.
+# Just try to run it everywhere for now.
+time make unittest
+
 [ -n "$SKIP_CI_TEST" ] && exit 0
 
 ulimit -c unlimited

From 0cf79a3608476025ed595320209f56f24bd75294 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 20 Jun 2021 18:45:13 +0200
Subject: [PATCH 0652/1854] test: remove exec test

criu exec is deprecated for some time now and criu just exits with an
error if running 'criu exec'. This removes the test for that non-working
subcommand.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/exec/Makefile |  2 --
 test/others/exec/run.sh   | 16 ----------------
 2 files changed, 18 deletions(-)
 delete mode 100644 test/others/exec/Makefile
 delete mode 100755 test/others/exec/run.sh

diff --git a/test/others/exec/Makefile b/test/others/exec/Makefile
deleted file mode 100644
index 7779a9903..000000000
--- a/test/others/exec/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-run:
-	./run.sh
diff --git a/test/others/exec/run.sh b/test/others/exec/run.sh
deleted file mode 100755
index c3f497ead..000000000
--- a/test/others/exec/run.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-CRIU=../../../criu/criu
-
-set -e -m -x
-
-cat < /dev/zero > /dev/null &
-pid=$!
-sleep 1
-lsof -p $pid
-
-$CRIU exec -t $pid fake_syscall && exit 1 || true
-fd=`$CRIU exec -t $pid open '&/dev/null' 0 | sed 's/.*(\(.*\))/\1/'`
-$CRIU exec -t $pid dup2 $fd 0
-wait $pid
-echo PASS

From fc7705a13f44f4659ef686b4e601e188790a555e Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Thu, 29 Apr 2021 21:18:58 +0200
Subject: [PATCH 0653/1854] zdtm: add network namespace locking test

When criu dumps a process in a network namespace it locks
the network so that no packets from peer enters the stack,
otherwise RST will be sent by a kernel causing the connection
to fail.

In netns_lock.c we try to enter the netns created by post-start
hook so that criu locks the network namespace between dump and
restore.

A TCP server is started in post-start hook inside the test netns
and runs in the background detached from its parent so that
it stays alive for the duration of the test.

Other hooks (pre-dump, pre-restore, post-restore) try to
connect to the server.

Pre-dump and post-restore hooks should be able to connect
successfully.

Pre-restore hook client with SOCCR_MARK should also connect
successfully.

Pre-restore hook client without SOCCR_MARK should not be able
to connect but also should not get connection refused as all
packets are dropped in the namespace so the kernel shouldn't
send an RST packet as a result. Instead we check that the
connect operation causes a timeout.

This test would be useful when testing that the network is
locked using different ways (using iptables currently and
other methods later).

v2:
	- check that packets with SOCCR_MARK are allowed to
	  pass when the netns is locked.

v3:
	- fix pre-restore hook skipping non SOCCR_MARK
	  connection test due to early exit in SOCCR_MARK
	  variant.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/Makefile        |   1 +
 test/zdtm/static/netns_lock.c    |  71 +++++++++++++++
 test/zdtm/static/netns_lock.desc |   6 ++
 test/zdtm/static/netns_lock.hook | 144 +++++++++++++++++++++++++++++++
 4 files changed, 222 insertions(+)
 create mode 100644 test/zdtm/static/netns_lock.c
 create mode 100644 test/zdtm/static/netns_lock.desc
 create mode 100755 test/zdtm/static/netns_lock.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1c11b36c3..d998dcc83 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -214,6 +214,7 @@ TST_NOFILE	:=				\
 		uffd-events			\
 		thread_different_uid_gid	\
 		pipe03				\
+		netns_lock			\
 		netns_sub			\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
diff --git a/test/zdtm/static/netns_lock.c b/test/zdtm/static/netns_lock.c
new file mode 100644
index 000000000..300349c03
--- /dev/null
+++ b/test/zdtm/static/netns_lock.c
@@ -0,0 +1,71 @@
+#include "zdtmtst.h"
+
+const char *test_doc = "Check network namespace is locked between dump and restore\n";
+const char *test_author = "Zeyad Yasser <zeyady98@gmail.com>";
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+
+#define NS_PATH "/var/run/netns/criu-net-lock-test"
+#define MAX_RETRY 3
+
+int main(int argc, char **argv)
+{
+	int i, ns_fd;
+
+	test_init(argc, argv);
+
+	/*
+	 * We try to enter the netns created by post-start hook so that
+	 * criu locks the network namespace between dump and restore.
+	 *
+	 * A TCP server is started in post-start hook inside the netns
+	 * and runs in the background detached from its parent so that
+	 * it stays alive for the duration of the test.
+	 *
+	 * Other hooks (pre-dump, pre-restore, post-restore) try to
+	 * connect to the server.
+	 *
+	 * Pre-dump and post-restore hooks should be able to connect
+	 * successfully.
+	 *
+	 * Pre-restore hook client with SOCCR_MARK should also connect
+	 * successfully.
+	 *
+	 * Pre-restore hook client without SOCCR_MARK should not be able
+	 * to connect but also should not get connection refused as all
+	 * packets are dropped in the namespace so the kernel shouldn't
+	 * send an RST packet as a result. Instead we check that the
+	 * connect operation causes a timeout.
+	 */
+
+	for (i = 0; i < MAX_RETRY; i++) {
+		ns_fd = open(NS_PATH, O_RDONLY);
+		if (ns_fd < 0) {
+			/* Netns not created yet by post-start hook */
+			sleep(1);
+			continue;
+		}
+		break;
+	}
+
+	if (ns_fd < 0) {
+		pr_perror("can't open network ns");
+		return 1;
+	}
+
+	if (setns(ns_fd, CLONE_NEWNET)) {
+		pr_perror("setns %d", ns_fd);
+		return 1;
+	}
+
+	close(ns_fd);
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/netns_lock.desc b/test/zdtm/static/netns_lock.desc
new file mode 100644
index 000000000..79362790e
--- /dev/null
+++ b/test/zdtm/static/netns_lock.desc
@@ -0,0 +1,6 @@
+{
+    'flavor': 'h',
+    'flags': 'suid',
+    'opts': '--tcp-established',
+    'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
+}
diff --git a/test/zdtm/static/netns_lock.hook b/test/zdtm/static/netns_lock.hook
new file mode 100755
index 000000000..bd5967c94
--- /dev/null
+++ b/test/zdtm/static/netns_lock.hook
@@ -0,0 +1,144 @@
+#!/usr/bin/env python
+
+import subprocess
+import socket
+import sys
+import os
+
+from ctypes import CDLL
+
+libc = CDLL('libc.so.6')
+
+SO_MARK = 36 # Define socket option for python2 compatibility
+SOCCR_MARK = 0xC114
+CLONE_NEWNET = 0x40000000
+PORT = 8880
+NETNS = "criu-net-lock-test"
+TIMEOUT = 0.1
+
+def nsenter():
+    with open("/var/run/netns/{}".format(NETNS)) as f:
+        libc.setns(f.fileno(), CLONE_NEWNET)
+
+if sys.argv[1] == "--post-start":
+    # Add test netns
+    subprocess.Popen(["ip", "netns", "add", NETNS]).wait()
+    nsenter() # Enter test netns
+    subprocess.Popen(["ip", "link", "set", "up", "dev", "lo"]).wait()
+
+    # TCP server daemon
+    pid = os.fork()
+    if(pid == 0):
+        os.setsid() # Detach from parent
+        # Run server
+        srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        srv.bind(("127.0.0.1", PORT))
+        srv.listen(1)
+
+        # We should accept connections normally from
+        # pre-dump client, post-restore client and
+        # the pre-restore client using SOCCR_MARK
+        # The pre-restore client without SOCCR_MARK
+        # should fail with a timeout
+
+        # Accept pre-dump client
+        cln, addr = srv.accept()
+        cln.sendall(str.encode("--pre-dump"))
+        cln.close()
+
+        # Accept pre-restore client with SOCCR_MARK
+        srv.setsockopt(socket.SOL_SOCKET, SO_MARK, SOCCR_MARK)
+        cln, addr = srv.accept()
+        cln.sendall(str.encode("--pre-restore"))
+        cln.close()
+        srv.setsockopt(socket.SOL_SOCKET, SO_MARK, 0)
+
+        # Accept post-restore client
+        cln, addr = srv.accept()
+        cln.sendall(str.encode("--post-restore"))
+        cln.close()
+
+        srv.close()
+
+if sys.argv[1] == "--pre-dump":
+    # Network is not locked yet
+    # Client should be able to connect normally
+
+    nsenter() # Enter test netns
+
+    socket.setdefaulttimeout(TIMEOUT)
+    cln = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    try:
+        cln.connect(("127.0.0.1", PORT))
+        resp = cln.recv(100).decode()
+        if resp != sys.argv[1]:
+            print("Expected '{}', got '{}'".format(sys.argv[1], resp))
+            sys.exit(1)
+    except socket.timeout:
+        print("Timeout when trying to connect to server")
+        sys.exit(1)
+    else:
+        sys.exit(0)
+    finally:
+        cln.close()
+
+if sys.argv[1] == "--pre-restore":
+    # Network should be locked now
+    # Only packets with SOCCR_MARK should be allowed
+    # Client should timeout when connecting without SOCCR_MARK
+
+    nsenter()
+
+    socket.setdefaulttimeout(TIMEOUT)
+    # SOCCR_MARK
+    try:
+        cln = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        cln.setsockopt(socket.SOL_SOCKET, SO_MARK, SOCCR_MARK)
+        cln.connect(("localhost", PORT))
+        resp = cln.recv(100).decode()
+        if resp != sys.argv[1]:
+            print("Expected '{}', got '{}'".format(sys.argv[1], resp))
+            sys.exit(1)
+    except socket.timeout:
+        print("Timeout when trying to connect to server")
+        sys.exit(1)
+    finally:
+        cln.close()
+
+    # No SOCCR_MARK
+    try:
+        cln = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        cln.connect(("localhost", PORT))
+    except socket.timeout:
+        sys.exit(0)
+    else:
+        print("Network should be locked, but client connected normally")
+        sys.exit(1)
+    finally:
+        cln.close()
+
+if sys.argv[1] == "--post-restore":
+    # Network should be unlocked now
+    # Client should be able to connect normally
+
+    nsenter()
+
+    socket.setdefaulttimeout(TIMEOUT)
+    cln = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    try:
+        cln.connect(("localhost", PORT))
+        resp = cln.recv(100).decode()
+        if resp != sys.argv[1]:
+            print("Expected '{}', got '{}'".format(sys.argv[1], resp))
+            sys.exit(1)
+    except socket.timeout:
+        print("Timeout when trying to connect to server")
+        sys.exit(1)
+    else:
+        sys.exit(0)
+    finally:
+        cln.close()
+
+if sys.argv[1] == "--clean":
+    # Delete test netns
+    subprocess.Popen(["ip", "netns", "delete", NETNS]).wait()

From 5be71273f68706d80f22873376f6a0326ecd0a90 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 8 Jun 2021 07:15:31 +0000
Subject: [PATCH 0654/1854] Remove unnecessary whitespace

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/include/cr_options.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index a8fe02609..b52cef46a 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -174,7 +174,7 @@ struct cr_options {
 	int			tls_no_cn_verify;
 
 	/* This stores which method to use for file validation. */
-	int 			file_validation_method;
+	int			file_validation_method;
 };
 
 extern struct cr_options opts;

From 64dd64e5041baa08de60b3dddc1aacdb3a2df906 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 8 Jun 2021 17:22:03 +0000
Subject: [PATCH 0655/1854] Enable changing of mount context on restore

This change is motivated by checkpointing and restoring container in
Pods.

When restoring a container into a new Pod the SELinux label of the
existing Pod needs to be used and not the SELinux label saved during
checkpointing.

The option --lsm-profile already enables changing of process SELinux
labels on restore. If there are, however, tmpfs checkpointed they
will be mounted during restore with the same context as during
checkpointing. This can look like the following example:

 context="system_u:object_r:container_file_t:s0:c82,c137"

On restore we want to change this context to match the mount label of
the Pod this container is restored into. Changing of the mount label
is now possible with the new option --mount-context:

 criu restore --mount-context "system_u:object_r:container_file_t:s0:c204,c495"

This will lead to mount options being changed to

 context="system_u:object_r:container_file_t:s0:c204,c495"

Now the restored container can access all the files in the container
again.

This has been tested in combination with runc and CRI-O.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Documentation/criu.txt    | 22 +++++++++++++
 criu/config.c             |  4 +++
 criu/cr-service.c         |  3 ++
 criu/crtools.c            |  4 +++
 criu/include/cr_options.h |  1 +
 criu/mount.c              | 66 +++++++++++++++++++++++++++++++++++++--
 images/rpc.proto          |  1 +
 7 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 9c8377a6e..037257190 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -554,6 +554,28 @@ The 'mode' may be one of the following:
     Specify an LSM profile to be used during restore. The _type_ can be
     either *apparmor* or *selinux*.
 
+*--lsm-mount-context* 'context'::
+    Specify a new mount context to be used during restore.
++
+This option will only replace existing mount context information
+with the one specified with this option. Mounts without the
+'context=' option will not be changed.
++
+If a mountpoint has been checkpointed with an option like
+
+    context="system_u:object_r:container_file_t:s0:c82,c137"
++
+it is possible to change this option using
+
+    --lsm-mount-context "system_u:object_r:container_file_t:s0:c204,c495"
++
+which will result that the mountpoint will be restored
+with the new 'context='.
++
+This option is useful if using *selinux* and if the *selinux*
+labels need to be changed on restore like if a container is
+restored into an existing Pod.
+
 *--auto-dedup*::
     As soon as a page is restored it get punched out from image.
 
diff --git a/criu/config.c b/criu/config.c
index ba828f75f..4c7fcab0a 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -690,6 +690,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		{ "cgroup-yard",		required_argument,	0, 1096 },
 		{ "pre-dump-mode",		required_argument,	0, 1097},
 		{ "file-validation",		required_argument,	0, 1098	},
+		{ "lsm-mount-context",		required_argument,	0, 1099	},
 		{ },
 	};
 
@@ -1019,6 +1020,9 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			if (parse_file_validation_method(&opts, optarg))
 				return 2;
 			break;
+		case 1099:
+			SET_CHAR_OPTS(lsm_mount_context, optarg);
+			break;
 		case 'V':
 			pr_msg("Version: %s\n", CRIU_VERSION);
 			if (strcmp(CRIU_GITID, "0"))
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 81ae5f745..870a5bbc7 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -623,6 +623,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		SET_CHAR_OPTS(lsm_profile, req->lsm_profile);
 	}
 
+	if (req->lsm_mount_context)
+		SET_CHAR_OPTS(lsm_mount_context, req->lsm_mount_context);
+
 	if (req->has_timeout)
 		opts.timeout = req->timeout;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index 51852ff56..778a1f3af 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -422,6 +422,10 @@ usage:
 "  --lsm-profile TYPE:NAME\n"
 "                        Specify an LSM profile to be used during restore.\n"
 "                        The type can be either 'apparmor' or 'selinux'.\n"
+"  --lsm-mount-context CTX\n"
+"                        Specify a mount context to be used during restore.\n"
+"                        Only mounts with an existing context will have their\n"
+"                        mount context replaced with CTX.\n"
 "  --skip-mnt PATH       ignore this mountpoint when dumping the mount namespace\n"
 "  --enable-fs FSNAMES   a comma separated list of filesystem names or \"all\"\n"
 "                        force criu to (try to) dump/restore these filesystem's\n"
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index b52cef46a..dc6c95503 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -145,6 +145,7 @@ struct cr_options {
 	struct list_head	irmap_scan_paths;
 	bool			lsm_supplied;
 	char			*lsm_profile;
+	char			*lsm_mount_context;
 	unsigned int		timeout;
 	unsigned int		empty_ns;
 	int			tcp_skip_in_flight;
diff --git a/criu/mount.c b/criu/mount.c
index 50a014426..ffa14fcd1 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -45,6 +45,8 @@
 #define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc"
 #define CRTIME_MNT_ID 0
 
+#define CONTEXT_OPT "context="
+
 /* A helper mount_info entry for the roots yard */
 static struct mount_info *root_yard_mp = NULL;
 
@@ -2942,6 +2944,66 @@ static int get_mp_mountpoint(char *mountpoint, struct mount_info *mi, char *root
 	return 0;
 }
 
+static char *mount_update_lsm_context(char *mount_opts)
+{
+	cleanup_free char *before_context = NULL;
+	char *other_options;
+	char *context_start;
+	char *context_end;
+	char *old_context;
+	char *new_options;
+	int ret;
+
+	old_context = strstr(mount_opts, CONTEXT_OPT);
+
+	if (!old_context || !opts.lsm_mount_context)
+		return xstrdup(mount_opts);
+
+	/*
+	 * If the user specified a different mount_context we need
+	 * to replace the existing mount context in the mount
+	 * options with the one specified by the user.
+	 *
+	 * The original mount options will be something like:
+	 *
+	 *  context="system_u:object_r:container_file_t:s0:c82,c137",inode64
+	 *
+	 * and it needs to be replaced with opts.lsm_mount_context.
+	 *
+	 * The content between 'context=' and ',inode64' will be replaced
+	 * with opts.lsm_mount_context in quotes.
+	 */
+
+	/* Skip 'context=' */
+	context_start = old_context + strlen(CONTEXT_OPT);
+	if (context_start[0] == '"' && context_start + 1 < mount_opts + strlen(mount_opts)) {
+		/* Skip quotes */
+		context_end = strchr(context_start + 1, '"');
+		if (!context_end) {
+			pr_err("Failed parsing mount option 'context'\n");
+			return NULL;
+		}
+	} else {
+		context_end = context_start;
+	}
+
+	/* Find next after optionally skipping quotes. */
+	other_options = strchr(context_end, ',');
+
+	before_context = xstrdup(mount_opts);
+	if (unlikely(!before_context))
+		return NULL;
+	before_context[context_start - mount_opts] = 0;
+
+	ret = asprintf(&new_options, "%s\"%s\"%s", before_context,
+			opts.lsm_mount_context, other_options ? other_options : "");
+	if (unlikely(ret < 0))
+		return NULL;
+	pr_debug("\t\tChanged mount 'context=' to %s\n", new_options);
+
+	return new_options;
+}
+
 static int collect_mnt_from_image(struct mount_info **head, struct mount_info **tail, struct ns_id *nsid)
 {
 	MntEntry *me = NULL;
@@ -3006,8 +3068,8 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 		if (!pm->source)
 			goto err;
 
-		pm->options = xstrdup(me->options);
-		if (!pm->options)
+		pm->options = mount_update_lsm_context(me->options);
+		if (unlikely(!pm->options))
 			goto err;
 
 		if (me->fstype != FSTYPE__AUTO && me->fsname) {
diff --git a/images/rpc.proto b/images/rpc.proto
index f667d136c..61e1b24f4 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -130,6 +130,7 @@ message criu_opts {
 	optional string			cgroup_yard		= 60;
 	optional criu_pre_dump_mode	pre_dump_mode		= 61 [default = SPLICE];
 	optional int32			pidfd_store_sk		= 62;
+	optional string			lsm_mount_context	= 63;
 /*	optional bool			check_mounts		= 128;	*/
 }
 

From 093fb0c878cec640490bc5ed5d9b1525456cc9ea Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 8 Jun 2021 17:32:21 +0000
Subject: [PATCH 0656/1854] Add test for new --lsm-mount-context option

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/Makefile                     |  1 +
 test/zdtm/static/change_mnt_context.c         | 65 +++++++++++++++++++
 test/zdtm/static/change_mnt_context.checkskip |  3 +
 test/zdtm/static/change_mnt_context.desc      |  2 +
 4 files changed, 71 insertions(+)
 create mode 100644 test/zdtm/static/change_mnt_context.c
 create mode 100755 test/zdtm/static/change_mnt_context.checkskip
 create mode 100644 test/zdtm/static/change_mnt_context.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index d998dcc83..d168f385e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -240,6 +240,7 @@ TST_NOFILE	:=				\
 		zombie_leader			\
 		sigtrap				\
 		sigtrap01			\
+		change_mnt_context		\
 #		jobctl00			\
 
 PKG_CONFIG ?= pkg-config
diff --git a/test/zdtm/static/change_mnt_context.c b/test/zdtm/static/change_mnt_context.c
new file mode 100644
index 000000000..6d436014b
--- /dev/null
+++ b/test/zdtm/static/change_mnt_context.c
@@ -0,0 +1,65 @@
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that mounts can change LSM context on restore";
+const char *test_author = "Adrian Reber <areber@redhat.com>";
+
+char *source = "change_mount_context.test";
+char *original_context = "context=\"system_u:object_r:container_file_t:s0:c82,c137\"";
+char *new_context = "context=\"system_u:object_r:container_file_t:s0:c204,c495\"";
+
+int main(int argc, char **argv)
+{
+	char *dname = "/tmp/change_mount_context.XXXXXX";
+	char line[1024];
+	char opts[1024];
+	int ret = -1;
+	FILE *mi;
+
+	mkdir(dname, 755);
+	if (mount(source, dname, "tmpfs", 0, original_context)) {
+		pr_perror("mount");
+		return 1;
+	}
+
+	test_init(argc, argv);
+
+	test_daemon();
+	test_waitsig();
+
+	mi = fopen("/proc/self/mountinfo", "r");
+	if (mi == NULL) {
+		fail("No mountinfo file");
+		goto out;
+	}
+
+	while (fgets(line, sizeof(line), mi)) {
+		int result;
+		char *pos;
+
+		if (!strstr(line, source))
+			continue;
+
+		pos = strstr(line, " - ");
+		if (!pos)
+			continue;
+
+		result = sscanf(pos, " - %*s %*s %s", opts);
+		if (result != 1) {
+			fail("Not able to sscanf line from mountinfo");
+			goto out;
+		}
+		if (strstr(opts, new_context))
+			ret = 0;
+		else
+			fail("Not re-mounted with new context");
+	}
+
+	if (ret == 0)
+		pass();
+out:
+	umount(dname);
+	return ret;
+}
diff --git a/test/zdtm/static/change_mnt_context.checkskip b/test/zdtm/static/change_mnt_context.checkskip
new file mode 100755
index 000000000..36158f969
--- /dev/null
+++ b/test/zdtm/static/change_mnt_context.checkskip
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+test -d /sys/fs/selinux || exit 1
diff --git a/test/zdtm/static/change_mnt_context.desc b/test/zdtm/static/change_mnt_context.desc
new file mode 100644
index 000000000..5bd5145bc
--- /dev/null
+++ b/test/zdtm/static/change_mnt_context.desc
@@ -0,0 +1,2 @@
+{   'flavor': 'ns uns',
+    'ropts': '--lsm-mount-context=system_u:object_r:container_file_t:s0:c204,c495'}

From d3ce492cc2c7e6a161548c2f86f10fa2c3e7e979 Mon Sep 17 00:00:00 2001
From: "fu.lin" <fulin10@huawei.com>
Date: Fri, 25 Jun 2021 19:52:33 +0800
Subject: [PATCH 0657/1854] pycrit: fix the broken of cli the `crit show
 xxx.img`

It will broken when the cli `crit show ipcns-shm-9.img` is executed, msg:
  {
      "magic": "IPCNS_SHM",
      "entries": [
          {
              "desc": {
                  "key": 0,
                  "uid": 0,
                  "gid": 0,
                  "cuid": 0,
                  "cgid": 0,
                  "mode": 438,
                  "id": 0
              },
              "size": 1048576,
              "in_pagemaps": true,
              "extra": Traceback (most recent call last):
    File "/usr/bin/crit", line 6, in <module>
      cli.main()
    File "/usr/lib/python3/dist-packages/pycriu/cli.py", line 412, in main
      opts["func"](opts)
    File "/usr/lib/python3/dist-packages/pycriu/cli.py", line 45, in decode
      json.dump(img, f, indent=indent)
    File "/usr/lib/python3.9/json/__init__.py", line 179, in dump
      for chunk in iterable:
    File "/usr/lib/python3.9/json/encoder.py", line 431, in _iterencode
      yield from _iterencode_dict(o, _current_indent_level)
    File "/usr/lib/python3.9/json/encoder.py", line 405, in _iterencode_dict
      yield from chunks
    File "/usr/lib/python3.9/json/encoder.py", line 325, in _iterencode_list
      yield from chunks
    File "/usr/lib/python3.9/json/encoder.py", line 405, in _iterencode_dict
      yield from chunks
    File "/usr/lib/python3.9/json/encoder.py", line 438, in _iterencode
      o = _default(o)
    File "/usr/lib/python3.9/json/encoder.py", line 179, in default
      raise TypeError(f'Object of type {o.__class__.__name__} '
  TypeError: Object of type bytes is not JSON serializable

This is caused by `img['magic'][0]['extra']` which is bytes. I find
other load condtions, fix them at the same time.

Signed-off-by: fu.lin <fulin10@huawei.com>
---
 lib/py/images/images.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 956932e03..95a10dd80 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -311,7 +311,7 @@ class pipes_data_extra_handler:
     def load(self, f, pload):
         size = pload.bytes
         data = f.read(size)
-        return base64.encodebytes(data).decode()
+        return base64.encodebytes(data).decode('utf-8')
 
     def dump(self, extra, f, pload):
         if (sys.version_info > (3, 0)):
@@ -329,7 +329,7 @@ class sk_queues_extra_handler:
     def load(self, f, pload):
         size = pload.length
         data = f.read(size)
-        return base64.encodebytes(data).decode()
+        return base64.encodebytes(data).decode('utf-8')
 
     def dump(self, extra, f, _unused):
         if (sys.version_info > (3, 0)):
@@ -350,8 +350,8 @@ class tcp_stream_extra_handler:
         inq = f.read(pbuff.inq_len)
         outq = f.read(pbuff.outq_len)
 
-        d['inq'] = base64.encodebytes(inq)
-        d['outq'] = base64.encodebytes(outq)
+        d['inq'] = base64.encodebytes(inq).decode('utf-8')
+        d['outq'] = base64.encodebytes(outq).decode('utf-8')
 
         return d
 
@@ -370,7 +370,7 @@ class bpfmap_data_extra_handler:
     def load(self, f, pload):
         size = pload.keys_bytes + pload.values_bytes
         data = f.read(size)
-        return base64.encodebytes(data)
+        return base64.encodebytes(data).decode('utf-8')
 
     def dump(self, extra, f, pload):
         data = base64.decodebytes(extra)
@@ -427,7 +427,7 @@ class ipc_msg_queue_handler:
             data = f.read(msg.msize)
             f.seek(rounded - msg.msize, 1)
             messages.append(pb2dict.pb2dict(msg))
-            messages.append(base64.encodebytes(data))
+            messages.append(base64.encodebytes(data).decode('utf-8'))
         return messages
 
     def dump(self, extra, f, pbuff):
@@ -467,7 +467,7 @@ class ipc_shm_handler:
         data = f.read(size)
         rounded = round_up(size, sizeof_u32)
         f.seek(rounded - size, 1)
-        return base64.encodebytes(data)
+        return base64.encodebytes(data).decode('utf-8')
 
     def dump(self, extra, f, pbuff):
         entry = pb2dict.pb2dict(pbuff)

From f3cb156604b02516a4a7157176353123c223f3c6 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Tue, 22 Jun 2021 09:07:42 -0700
Subject: [PATCH 0658/1854] Keep inherit-fd strings alive until task restore

If inherit-fd is read from a config file its buffer will be freed
after the config file is parsed but before task restore, which is
when we need to use the mapping. Therefore, when adding an
inherit-fd mapping to the opts list, copy the key string to a new
buffer.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/files.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/files.c b/criu/files.c
index f10527b59..1d4ac8941 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1568,7 +1568,10 @@ int inherit_fd_add(int fd, char *key)
 	if (fd > inh_fd_max)
 		inh_fd_max = fd;
 
-	inh->inh_id = key;
+	inh->inh_id = xstrdup(key);
+	if (inh->inh_id == NULL)
+		return -1;
+
 	inh->inh_fd = fd;
 	list_add_tail(&inh->inh_list, &opts.inherit_fds);
 	return 0;

From 75feb9635ec54fb4e8d0ef86a85f80fe2368ca26 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 1 Jul 2021 14:13:39 +0000
Subject: [PATCH 0659/1854] ci: fix mips64el-cross test

The mips64el-cross test target started to show following error:

error: listing the stack pointer register '$29' in a clobber list is deprecated [-Werror=deprecated]

This fixes it in three different places by removing $29' from the
clobber list. This is only compile tested as we have no mips hardware
for testing.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/arch/mips/src/lib/include/uapi/asm/sigframe.h | 2 +-
 criu/arch/mips/include/asm/restore.h                 | 2 +-
 criu/arch/mips/include/asm/restorer.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
index 7030332ad..c08fe06a3 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
@@ -51,7 +51,7 @@ struct rt_sigframe {
 	"syscall					\n"	\
 	:							\
 	: "r"(new_sp)						\
-	: "$29","$2","memory")
+	: "$2","memory")
 
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
 		struct rt_sigframe *rsigframe);
diff --git a/criu/arch/mips/include/asm/restore.h b/criu/arch/mips/include/asm/restore.h
index 1860a37b7..04a9551a0 100644
--- a/criu/arch/mips/include/asm/restore.h
+++ b/criu/arch/mips/include/asm/restore.h
@@ -15,7 +15,7 @@
 		:							\
 		:"r"(task_args),"r"(restore_task_exec_start),		\
 		 "g"(new_sp)						\
-		: "$29", "$25", "$4","$5")
+		: "$25", "$4","$5")
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {
diff --git a/criu/arch/mips/include/asm/restorer.h b/criu/arch/mips/include/asm/restorer.h
index 4223b3196..28a9c523f 100644
--- a/criu/arch/mips/include/asm/restorer.h
+++ b/criu/arch/mips/include/asm/restorer.h
@@ -60,7 +60,7 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 		       "r"(&thread_args[i].pid),			\
 		       "r"(clone_restore_fn),				\
 		       "r"(&thread_args[i])				\
-		 :"$2","$4","$5","$6","$7","$8","$25","$29","memory")
+		 :"$2","$4","$5","$6","$7","$8","$25","memory")
 
 #define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args, \
 			      clone_restore_fn)	do { \

From b290df9a659904a1d7e9ec9ea17965e63d6e5c4f Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Thu, 1 Jul 2021 15:11:50 +0200
Subject: [PATCH 0660/1854] test/jenkins: fix netns_lock test multiple
 iterations failure

netns_lock is highly dependent on the order of the hooks, and
iterations causes the --pre-dump hook to be called multiple
times which expectedly caused the test to fail.

The server loop accommodates for multiple iterations.

https://ci.kernoops.org/job/CRIU/job/CRIU-iter/job/criu-dev/431/testReport/(root)/criu/zdtm_static_netns_lock/

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/netns_lock.hook | 44 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/test/zdtm/static/netns_lock.hook b/test/zdtm/static/netns_lock.hook
index bd5967c94..666fa4d5f 100755
--- a/test/zdtm/static/netns_lock.hook
+++ b/test/zdtm/static/netns_lock.hook
@@ -35,30 +35,32 @@ if sys.argv[1] == "--post-start":
         srv.bind(("127.0.0.1", PORT))
         srv.listen(1)
 
-        # We should accept connections normally from
-        # pre-dump client, post-restore client and
-        # the pre-restore client using SOCCR_MARK
-        # The pre-restore client without SOCCR_MARK
-        # should fail with a timeout
+        # Loop allows zdtm multiple iterations to work (i.e. --iter 3)
+        while True:
+            # We should accept connections normally from
+            # pre-dump client, post-restore client and
+            # the pre-restore client using SOCCR_MARK
+            # The pre-restore client without SOCCR_MARK
+            # should fail with a timeout
 
-        # Accept pre-dump client
-        cln, addr = srv.accept()
-        cln.sendall(str.encode("--pre-dump"))
-        cln.close()
+            # Accept pre-dump client
+            cln, addr = srv.accept()
+            cln.sendall(str.encode("--pre-dump"))
+            cln.close()
 
-        # Accept pre-restore client with SOCCR_MARK
-        srv.setsockopt(socket.SOL_SOCKET, SO_MARK, SOCCR_MARK)
-        cln, addr = srv.accept()
-        cln.sendall(str.encode("--pre-restore"))
-        cln.close()
-        srv.setsockopt(socket.SOL_SOCKET, SO_MARK, 0)
+            # Accept pre-restore client with SOCCR_MARK
+            srv.setsockopt(socket.SOL_SOCKET, SO_MARK, SOCCR_MARK)
+            cln, addr = srv.accept()
+            cln.sendall(str.encode("--pre-restore"))
+            cln.close()
+            srv.setsockopt(socket.SOL_SOCKET, SO_MARK, 0)
 
-        # Accept post-restore client
-        cln, addr = srv.accept()
-        cln.sendall(str.encode("--post-restore"))
-        cln.close()
-
-        srv.close()
+            # Accept post-restore client
+            cln, addr = srv.accept()
+            cln.sendall(str.encode("--post-restore"))
+            cln.close()
+        
+        # Server will be closed when zdtm sends SIGKILL
 
 if sys.argv[1] == "--pre-dump":
     # Network is not locked yet

From d55f34ed78f009213c0e3b137029b7a74fd78204 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Wed, 30 Jun 2021 18:59:54 +0200
Subject: [PATCH 0661/1854] test/ci: sync netns_lock test and its --post-start
 hook

The --post-start hook creates a netns which the test should enter
at the beginning of the test.

The test randomly failed in CI tests, it is most likely caused by
a race condition.

I suspect this flow is root cause:
	1. --post-start hook starts just after the test (in parallel)
	2. --post-start hook calls ip netns add to create the test netns
	3. ip creates the netns file
	4. netns_lock test opens that file and uses it in setns
	5. ip mounts the netns to the file

Of course test fails at step 4 because the netns is not yet mounted
to the file.

I made the test wait for SYNCFILE to be created by the --post-start
hook before it tries to open the netns file and call setns.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/netns_lock.c    |  5 +++--
 test/zdtm/static/netns_lock.hook | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/netns_lock.c b/test/zdtm/static/netns_lock.c
index 300349c03..f58ba83da 100644
--- a/test/zdtm/static/netns_lock.c
+++ b/test/zdtm/static/netns_lock.c
@@ -8,6 +8,7 @@ const char *test_author = "Zeyad Yasser <zeyady98@gmail.com>";
 #include <sched.h>
 
 #define NS_PATH "/var/run/netns/criu-net-lock-test"
+#define SYNCFILE_PATH "net_lock.sync"
 #define MAX_RETRY 3
 
 int main(int argc, char **argv)
@@ -41,8 +42,7 @@ int main(int argc, char **argv)
 	 */
 
 	for (i = 0; i < MAX_RETRY; i++) {
-		ns_fd = open(NS_PATH, O_RDONLY);
-		if (ns_fd < 0) {
+		if (access(SYNCFILE_PATH, F_OK )) {
 			/* Netns not created yet by post-start hook */
 			sleep(1);
 			continue;
@@ -50,6 +50,7 @@ int main(int argc, char **argv)
 		break;
 	}
 
+	ns_fd = open(NS_PATH, O_RDONLY);
 	if (ns_fd < 0) {
 		pr_perror("can't open network ns");
 		return 1;
diff --git a/test/zdtm/static/netns_lock.hook b/test/zdtm/static/netns_lock.hook
index 666fa4d5f..b5508a7cb 100755
--- a/test/zdtm/static/netns_lock.hook
+++ b/test/zdtm/static/netns_lock.hook
@@ -15,17 +15,25 @@ CLONE_NEWNET = 0x40000000
 PORT = 8880
 NETNS = "criu-net-lock-test"
 TIMEOUT = 0.1
+SYNCFILE = "zdtm/static/net_lock.sync"
 
 def nsenter():
     with open("/var/run/netns/{}".format(NETNS)) as f:
         libc.setns(f.fileno(), CLONE_NEWNET)
 
+def create_sync_file():
+    open(SYNCFILE, "wb").close()
+
 if sys.argv[1] == "--post-start":
     # Add test netns
     subprocess.Popen(["ip", "netns", "add", NETNS]).wait()
     nsenter() # Enter test netns
     subprocess.Popen(["ip", "link", "set", "up", "dev", "lo"]).wait()
 
+    # Lets test know that the netns is initilized successfully
+    # by checking the access of SYNCFILE
+    create_sync_file()
+
     # TCP server daemon
     pid = os.fork()
     if(pid == 0):
@@ -144,3 +152,5 @@ if sys.argv[1] == "--post-restore":
 if sys.argv[1] == "--clean":
     # Delete test netns
     subprocess.Popen(["ip", "netns", "delete", NETNS]).wait()
+    # Delete sync file
+    os.remove(SYNCFILE)

From 083f0822ed6b89ab1d8679735cf627ad8e9c1ac3 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 25 Jun 2021 22:35:32 +0200
Subject: [PATCH 0662/1854] pidfd_store: move pidfd_store to a separate file

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/Makefile.crtools      |   1 +
 criu/cr-dump.c             |   1 +
 criu/cr-service.c          |   2 +-
 criu/include/mem.h         |   5 -
 criu/include/pidfd-store.h |  21 +++
 criu/mem.c                 | 276 +-----------------------------------
 criu/pidfd-store.c         | 282 +++++++++++++++++++++++++++++++++++++
 7 files changed, 307 insertions(+), 281 deletions(-)
 create mode 100644 criu/include/pidfd-store.h
 create mode 100644 criu/pidfd-store.c

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index dcffb4f9d..624eeb0a2 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -94,6 +94,7 @@ obj-$(CONFIG_COMPAT)	+= pie-util-vdso-elf32.o
 CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
 obj-$(CONFIG_COMPAT)	+= vdso-compat.o
 CFLAGS_REMOVE_vdso-compat.o	+= $(CFLAGS-ASAN) $(CFLAGS-GCOV)
+obj-y			+= pidfd-store.o
 
 PROTOBUF_GEN := scripts/protobuf-gen.sh
 
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 1be98745d..a385bc225 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -83,6 +83,7 @@
 #include "memfd.h"
 #include "timens.h"
 #include "img-streamer.h"
+#include "pidfd-store.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 870a5bbc7..f0d864f7b 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -40,7 +40,7 @@
 #include "proc_parse.h"
 #include "common/scm.h"
 #include "uffd.h"
-#include "mem.h"
+#include "pidfd-store.h"
 
 #include "setproctitle.h"
 
diff --git a/criu/include/mem.h b/criu/include/mem.h
index d747385c4..251cb1a9e 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -50,9 +50,4 @@ int prepare_vmas(struct pstree_item *t, struct task_restore_args *ta);
 int unmap_guard_pages(struct pstree_item *t);
 int prepare_mappings(struct pstree_item *t);
 bool should_dump_page(VmaEntry *vmae, u64 pme);
-
-int init_pidfd_store_sk(pid_t pid, int fd);
-int init_pidfd_store_hash(void);
-void free_pidfd_store(void);
-int send_pidfd_entry(pid_t pid);
 #endif /* __CR_MEM_H__ */
diff --git a/criu/include/pidfd-store.h b/criu/include/pidfd-store.h
new file mode 100644
index 000000000..2607405cf
--- /dev/null
+++ b/criu/include/pidfd-store.h
@@ -0,0 +1,21 @@
+#ifndef __CR_PIDFD_STORE_H__
+#define __CR_PIDFD_STORE_H__
+
+#include <sys/types.h>
+
+struct pidfd_entry {
+	pid_t				pid;
+	int				pidfd;
+	struct hlist_node		hash; /* To lookup pidfd by pid */
+};
+
+extern int pidfd_store_sk;
+
+int init_pidfd_store_sk(pid_t pid, int fd);
+int init_pidfd_store_hash(void);
+void free_pidfd_store(void);
+int send_pidfd_entry(pid_t pid);
+struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid);
+int check_pidfd_entry_state(struct pidfd_entry *entry);
+
+#endif /* __CR_PIDFD_STORE_H__ */
\ No newline at end of file
diff --git a/criu/mem.c b/criu/mem.c
index 8809f5b1a..8c6e13d79 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -30,285 +30,11 @@
 #include "fault-injection.h"
 #include "prctl.h"
 #include "compel/infect-util.h"
-#include "compel/plugins/std/syscall-codes.h"
-#include "common/scm.h"
+#include "pidfd-store.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
 
-struct pidfd_entry {
-	pid_t				pid;
-	int				pidfd;
-	struct hlist_node		hash; /* To lookup pidfd by pid */
-};
-
-static int pidfd_store_sk = -1;
-#define PIDFD_HASH_SIZE	32
-static struct hlist_head pidfd_hash[PIDFD_HASH_SIZE];
-
-int init_pidfd_store_sk(pid_t pid, int sk)
-{
-	int pidfd;
-	int sock_type;
-	socklen_t len;
-	struct sockaddr_un addr;
-	unsigned int addrlen;
-	/* In kernel a bufsize has type int and a value is doubled. */
-	uint32_t buf[2] = { INT_MAX / 2, INT_MAX / 2 };
-
-	if (!kdat.has_pidfd_open) {
-		pr_err("pidfd_open syscall is not supported\n");
-		return -1;
-	}
-
-	if (!kdat.has_pidfd_getfd) {
-		pr_err("pidfd_getfd syscall is not supported\n");
-		return -1;
-	}
-
-	/* Steal pidfd store socket from RPC client */
-	pidfd = syscall(SYS_pidfd_open, pid, 0);
-	if (pidfd == -1) {
-		pr_perror("Can't get pidfd of (pid: %d)", pid);
-		goto err;
-	}
-
-	close_safe(&pidfd_store_sk);
-	pidfd_store_sk = syscall(SYS_pidfd_getfd, pidfd, sk, 0);
-	if (pidfd_store_sk == -1) {
-		pr_perror("Can't steal fd %d using pidfd_getfd", sk);
-		close(pidfd);
-		goto err;
-	}
-	close(pidfd);
-
-	/* Check that stolen socket is a connectionless unix domain socket */
-	len = sizeof(sock_type);
-	if (getsockopt(pidfd_store_sk, SOL_SOCKET, SO_TYPE, &sock_type, &len)) {
-		pr_perror("Can't get socket type (fd: %d)", pidfd_store_sk);
-		goto err;
-	}
-
-	if (sock_type != SOCK_DGRAM) {
-		pr_err("Pidfd store socket must be of type SOCK_DGRAM\n");
-		goto err;
-	}
-
-	addrlen = sizeof(addr);
-	if (getsockname(pidfd_store_sk, (struct sockaddr *)&addr, &addrlen)) {
-		pr_perror("Can't get socket bound name (fd: %d)", pidfd_store_sk);
-		goto err;
-	}
-
-	if (addr.sun_family != AF_UNIX) {
-		pr_err("Pidfd store socket must be AF_UNIX\n");
-		goto err;
-	}
-
-	/*
-	 * Unnamed socket needs to be initialized and connected to itself.
-	 * This only occurs once in the first predump, after the socket is
-	 * bound, addrlen will be sizeof(struct sockaddr_un).
-	 * This is similar to how fdstore_init() works.
-	 */
-	if (addrlen == sizeof(sa_family_t)) {
-		if (setsockopt(pidfd_store_sk, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0], sizeof(buf[0])) < 0 ||
-			setsockopt(pidfd_store_sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
-			pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
-			goto err;
-		}
-
-		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d", pid, sk);
-		addrlen += sizeof(addr.sun_family);
-
-		addr.sun_path[0] = 0;
-
-		if (bind(pidfd_store_sk, (struct sockaddr *)&addr, addrlen)) {
-			pr_perror("Unable to bind a socket");
-			goto err;
-		}
-
-		if (connect(pidfd_store_sk, (struct sockaddr *) &addr, addrlen)) {
-			pr_perror("Unable to connect a socket");
-			goto err;
-		}
-	}
-
-	return 0;
-err:
-	close_safe(&pidfd_store_sk);
-	return -1;
-}
-
-void free_pidfd_store(void)
-{
-	int i;
-	struct pidfd_entry *entry;
-	struct hlist_node *tmp;
-
-	for (i = 0; i < PIDFD_HASH_SIZE; i++) {
-		hlist_for_each_entry_safe(entry, tmp, &pidfd_hash[i], hash) {
-			close(entry->pidfd);
-			xfree(entry);
-		}
-		INIT_HLIST_HEAD(&pidfd_hash[i]);
-	}
-
-	close_safe(&pidfd_store_sk);
-}
-
-int init_pidfd_store_hash(void)
-{
-	int i, cnt, ret;
-	struct pidfd_entry *entry;
-
-	for (i = 0; i < PIDFD_HASH_SIZE; i++)
-		INIT_HLIST_HEAD(&pidfd_hash[i]);
-
-	/* Skip building pidfd_hash if pidfd_store_sk is not initialized */
-	if (pidfd_store_sk == -1)
-		return 0;
-
-	/*
-	 * Drain all queued pidfd entries in pidfd_store_sk from
-	 * the last predump into pidfd_hash.
-	 */
-	cnt = 0;
-	while (1) {
-		entry = xmalloc(sizeof(struct pidfd_entry));
-		if (entry == NULL) {
-			return -1;
-		}
-		INIT_HLIST_NODE(&entry->hash);
-
-		ret = __recv_fds(pidfd_store_sk, &entry->pidfd, 1, &entry->pid, sizeof(pid_t), MSG_DONTWAIT);
-		if (ret == -EAGAIN || ret == -EWOULDBLOCK) {
-			/* No more fds to read */
-			xfree(entry);
-			goto check_empty;
-		} else if (ret) {
-			pr_perror("Can't read pidfd");
-			xfree(entry);
-			free_pidfd_store();
-			return ret;
-		}
-
-		cnt++;
-		hlist_add_head(&entry->hash, &pidfd_hash[entry->pid % PIDFD_HASH_SIZE]);
-	}
-
-check_empty:
-	/*
-	 * If no pidfds exist in pidfd_store. This would cause full page
-	 * dumps which goes against the purpose of the pidfd store.
-	 * This is probably due to sending a different pidfd_store socket.
-	 */
-	if (cnt == 0 && opts.img_parent) {
-		pr_err("No pidfds found in pidfd store\n");
-		pr_err("The same socket from the previous iteration should be passed\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-static struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid)
-{
-	struct pidfd_entry *entry;
-	struct hlist_head *chain;
-
-	chain = &pidfd_hash[pid % PIDFD_HASH_SIZE];
-	hlist_for_each_entry(entry, chain, hash) {
-		if (entry->pid == pid)
-			return entry;
-	}
-
-	return NULL;
-}
-
-/*
- * 1 - task closed
- * 0 - task still running
- * -1 - error
- */
-static int check_pidfd_entry_state(struct pidfd_entry *entry)
-{
-	struct pollfd pollfd;
-	int ret, restart_cnt = 0;
-	const int MAX_RESTARTS = 10; /* Reasonable limit to avoid getting stuck */
-
-	/*
-	 * When there is data to read from the pidfd, it means
-	 * that the task associated with this pidfd is closed.
-	 */
-	pollfd.fd = entry->pidfd;
-	pollfd.events = POLLIN;
-
-	while (1) {
-		ret = poll(&pollfd, 1, 0);
-		if (ret == -1 && errno == EINTR && restart_cnt < MAX_RESTARTS) {
-			restart_cnt++;
-			continue; /* restart polling */
-		}
-
-		return ret;
-	}
-}
-
-int send_pidfd_entry(pid_t pid)
-{
-	int pidfd, entry_state;
-	struct pidfd_entry *entry;
-
-	/* Skip sending if pidfd_store_sk is not initialized */
-	if (pidfd_store_sk == -1)
-		return 0;
-
-	/*
-	 * Use existing pidfd entry or create pidfd for task.
-	 * If entry exists with same pid we must check that
-	 * it is not a case of pid reuse (i.e. task is closed).
-	 */
-	entry = find_pidfd_entry_by_pid(pid);
-	if (entry != NULL) {
-		entry_state = check_pidfd_entry_state(entry);
-		if (entry_state == -1) {
-			pr_perror("Can't get state of pidfd entry of pid %d", pid);
-			return -1;
-		} else if(entry_state == 1) {
-			/* Task is closed, We need to create a new pidfd for task. */
-			entry = NULL;
-		}
-	}
-
-	if (entry == NULL) {
-		if (!kdat.has_pidfd_open) {
-			pr_err("pidfd_open syscall is not supported\n");
-			return -1;
-		}
-
-		pidfd = syscall(SYS_pidfd_open, pid, 0);
-		if (pidfd == -1) {
-			pr_perror("Can't get pidfd of pid %d", pid);
-			return -1;
-		}
-	} else {
-		pidfd = entry->pidfd;
-	}
-
-	if (send_fds(pidfd_store_sk, NULL, 0, &pidfd, 1, &pid, sizeof(pid_t))) {
-		pr_perror("Can't send pidfd %d of pid %d", pidfd, pid);
-		if(!entry)
-			close(pidfd);
-		return -1;
-	}
-
-	if(!entry)
-		close(pidfd);
-
-	return 0;
-}
-
 static int task_reset_dirty_track(int pid)
 {
 	int ret;
diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c
new file mode 100644
index 000000000..517835d2e
--- /dev/null
+++ b/criu/pidfd-store.c
@@ -0,0 +1,282 @@
+#include <sys/socket.h>
+#include <unistd.h>
+#include <limits.h>
+#include <errno.h>
+#include <stdio.h>
+#include <poll.h>
+
+#include "compel/plugins/std/syscall-codes.h"
+#include "cr_options.h"
+#include "common/scm.h"
+#include "common/list.h"
+#include "kerndat.h"
+#include "log.h"
+#include "util.h"
+#include "pidfd-store.h"
+
+int pidfd_store_sk = -1;
+#define PIDFD_HASH_SIZE	32
+static struct hlist_head pidfd_hash[PIDFD_HASH_SIZE];
+
+int init_pidfd_store_sk(pid_t pid, int sk)
+{
+	int pidfd;
+	int sock_type;
+	socklen_t len;
+	struct sockaddr_un addr;
+	unsigned int addrlen;
+	/* In kernel a bufsize has type int and a value is doubled. */
+	uint32_t buf[2] = { INT_MAX / 2, INT_MAX / 2 };
+
+	if (!kdat.has_pidfd_open) {
+		pr_err("pidfd_open syscall is not supported\n");
+		return -1;
+	}
+
+	if (!kdat.has_pidfd_getfd) {
+		pr_err("pidfd_getfd syscall is not supported\n");
+		return -1;
+	}
+
+	/* Steal pidfd store socket from RPC client */
+	pidfd = syscall(SYS_pidfd_open, pid, 0);
+	if (pidfd == -1) {
+		pr_perror("Can't get pidfd of (pid: %d)", pid);
+		goto err;
+	}
+
+	close_safe(&pidfd_store_sk);
+	pidfd_store_sk = syscall(SYS_pidfd_getfd, pidfd, sk, 0);
+	if (pidfd_store_sk == -1) {
+		pr_perror("Can't steal fd %d using pidfd_getfd", sk);
+		close(pidfd);
+		goto err;
+	}
+	close(pidfd);
+
+	/* Check that stolen socket is a connectionless unix domain socket */
+	len = sizeof(sock_type);
+	if (getsockopt(pidfd_store_sk, SOL_SOCKET, SO_TYPE, &sock_type, &len)) {
+		pr_perror("Can't get socket type (fd: %d)", pidfd_store_sk);
+		goto err;
+	}
+
+	if (sock_type != SOCK_DGRAM) {
+		pr_err("Pidfd store socket must be of type SOCK_DGRAM\n");
+		goto err;
+	}
+
+	addrlen = sizeof(addr);
+	if (getsockname(pidfd_store_sk, (struct sockaddr *)&addr, &addrlen)) {
+		pr_perror("Can't get socket bound name (fd: %d)", pidfd_store_sk);
+		goto err;
+	}
+
+	if (addr.sun_family != AF_UNIX) {
+		pr_err("Pidfd store socket must be AF_UNIX\n");
+		goto err;
+	}
+
+	/*
+	 * Unnamed socket needs to be initialized and connected to itself.
+	 * This only occurs once in the first predump, after the socket is
+	 * bound, addrlen will be sizeof(struct sockaddr_un).
+	 * This is similar to how fdstore_init() works.
+	 */
+	if (addrlen == sizeof(sa_family_t)) {
+		if (setsockopt(pidfd_store_sk, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0], sizeof(buf[0])) < 0 ||
+			setsockopt(pidfd_store_sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
+			pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
+			goto err;
+		}
+
+		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d", pid, sk);
+		addrlen += sizeof(addr.sun_family);
+
+		addr.sun_path[0] = 0;
+
+		if (bind(pidfd_store_sk, (struct sockaddr *)&addr, addrlen)) {
+			pr_perror("Unable to bind a socket");
+			goto err;
+		}
+
+		if (connect(pidfd_store_sk, (struct sockaddr *) &addr, addrlen)) {
+			pr_perror("Unable to connect a socket");
+			goto err;
+		}
+	}
+
+	return 0;
+err:
+	close_safe(&pidfd_store_sk);
+	return -1;
+}
+
+void free_pidfd_store(void)
+{
+	int i;
+	struct pidfd_entry *entry;
+	struct hlist_node *tmp;
+
+	for (i = 0; i < PIDFD_HASH_SIZE; i++) {
+		hlist_for_each_entry_safe(entry, tmp, &pidfd_hash[i], hash) {
+			close(entry->pidfd);
+			xfree(entry);
+		}
+		INIT_HLIST_HEAD(&pidfd_hash[i]);
+	}
+
+	close_safe(&pidfd_store_sk);
+}
+
+int init_pidfd_store_hash(void)
+{
+	int i, cnt, ret;
+	struct pidfd_entry *entry;
+
+	for (i = 0; i < PIDFD_HASH_SIZE; i++)
+		INIT_HLIST_HEAD(&pidfd_hash[i]);
+
+	/* Skip building pidfd_hash if pidfd_store_sk is not initialized */
+	if (pidfd_store_sk == -1)
+		return 0;
+
+	/*
+	 * Drain all queued pidfd entries in pidfd_store_sk from
+	 * the last predump into pidfd_hash.
+	 */
+	cnt = 0;
+	while (1) {
+		entry = xmalloc(sizeof(struct pidfd_entry));
+		if (entry == NULL) {
+			return -1;
+		}
+		INIT_HLIST_NODE(&entry->hash);
+
+		ret = __recv_fds(pidfd_store_sk, &entry->pidfd, 1, &entry->pid, sizeof(pid_t), MSG_DONTWAIT);
+		if (ret == -EAGAIN || ret == -EWOULDBLOCK) {
+			/* No more fds to read */
+			xfree(entry);
+			goto check_empty;
+		} else if (ret) {
+			pr_perror("Can't read pidfd");
+			xfree(entry);
+			free_pidfd_store();
+			return ret;
+		}
+
+		cnt++;
+		hlist_add_head(&entry->hash, &pidfd_hash[entry->pid % PIDFD_HASH_SIZE]);
+	}
+
+check_empty:
+	/*
+	 * If no pidfds exist in pidfd_store. This would cause full page
+	 * dumps which goes against the purpose of the pidfd store.
+	 * This is probably due to sending a different pidfd_store socket.
+	 */
+	if (cnt == 0 && opts.img_parent) {
+		pr_err("No pidfds found in pidfd store\n");
+		pr_err("The same socket from the previous iteration should be passed\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid)
+{
+	struct pidfd_entry *entry;
+	struct hlist_head *chain;
+
+	chain = &pidfd_hash[pid % PIDFD_HASH_SIZE];
+	hlist_for_each_entry(entry, chain, hash) {
+		if (entry->pid == pid)
+			return entry;
+	}
+
+	return NULL;
+}
+
+/*
+ * 1 - task closed
+ * 0 - task still running
+ * -1 - error
+ */
+int check_pidfd_entry_state(struct pidfd_entry *entry)
+{
+	struct pollfd pollfd;
+	int ret, restart_cnt = 0;
+	const int MAX_RESTARTS = 10; /* Reasonable limit to avoid getting stuck */
+
+	/*
+	 * When there is data to read from the pidfd, it means
+	 * that the task associated with this pidfd is closed.
+	 */
+	pollfd.fd = entry->pidfd;
+	pollfd.events = POLLIN;
+
+	while (1) {
+		ret = poll(&pollfd, 1, 0);
+		if (ret == -1 && errno == EINTR && restart_cnt < MAX_RESTARTS) {
+			restart_cnt++;
+			continue; /* restart polling */
+		}
+
+		return ret;
+	}
+}
+
+int send_pidfd_entry(pid_t pid)
+{
+	int pidfd, entry_state;
+	struct pidfd_entry *entry;
+
+	/* Skip sending if pidfd_store_sk is not initialized */
+	if (pidfd_store_sk == -1)
+		return 0;
+
+	/*
+	 * Use existing pidfd entry or create pidfd for task.
+	 * If entry exists with same pid we must check that
+	 * it is not a case of pid reuse (i.e. task is closed).
+	 */
+	entry = find_pidfd_entry_by_pid(pid);
+	if (entry != NULL) {
+		entry_state = check_pidfd_entry_state(entry);
+		if (entry_state == -1) {
+			pr_perror("Can't get state of pidfd entry of pid %d", pid);
+			return -1;
+		} else if(entry_state == 1) {
+			/* Task is closed, We need to create a new pidfd for task. */
+			entry = NULL;
+		}
+	}
+
+	if (entry == NULL) {
+		if (!kdat.has_pidfd_open) {
+			pr_err("pidfd_open syscall is not supported\n");
+			return -1;
+		}
+
+		pidfd = syscall(SYS_pidfd_open, pid, 0);
+		if (pidfd == -1) {
+			pr_perror("Can't get pidfd of pid %d", pid);
+			return -1;
+		}
+	} else {
+		pidfd = entry->pidfd;
+	}
+
+	if (send_fds(pidfd_store_sk, NULL, 0, &pidfd, 1, &pid, sizeof(pid_t))) {
+		pr_perror("Can't send pidfd %d of pid %d", pidfd, pid);
+		if(!entry)
+			close(pidfd);
+		return -1;
+	}
+
+	if(!entry)
+		close(pidfd);
+
+	return 0;
+}

From f7cd254004a3ad9fb9e32d9f5b77bf83264dad6e Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 25 Jun 2021 22:50:35 +0200
Subject: [PATCH 0663/1854] pidfd_store: tidy up interface and hide unneeded
 details

There is no need to expose the internals of pidfd_store like
hash table entries and how to use them for pid reuse detection.

v2: fixup some spacing issues
v3: fix hash memory leak after xmalloc in init_pidfd_store_hash()

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-dump.c             |  4 +--
 criu/include/pidfd-store.h | 16 +++------
 criu/mem.c                 | 25 ++------------
 criu/pidfd-store.c         | 71 +++++++++++++++++++++++++++++++-------
 4 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index a385bc225..f210dbf3e 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1167,11 +1167,11 @@ static int pre_dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie
 	pr_info("========================================\n");
 
 	/*
-	 * Send pidfd of task over pidfd_store_sk if it is set.
+	 * Add pidfd of task to pidfd_store if it is initialized.
 	 * This pidfd will be used in the next pre-dump/dump iteration
 	 * in detect_pid_reuse().
 	 */
-	ret = send_pidfd_entry(pid);
+	ret = pidfd_store_add(pid);
 	if (ret)
 		goto err;
 
diff --git a/criu/include/pidfd-store.h b/criu/include/pidfd-store.h
index 2607405cf..a76e681b8 100644
--- a/criu/include/pidfd-store.h
+++ b/criu/include/pidfd-store.h
@@ -3,19 +3,11 @@
 
 #include <sys/types.h>
 
-struct pidfd_entry {
-	pid_t				pid;
-	int				pidfd;
-	struct hlist_node		hash; /* To lookup pidfd by pid */
-};
-
-extern int pidfd_store_sk;
-
 int init_pidfd_store_sk(pid_t pid, int fd);
 int init_pidfd_store_hash(void);
 void free_pidfd_store(void);
-int send_pidfd_entry(pid_t pid);
-struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid);
-int check_pidfd_entry_state(struct pidfd_entry *entry);
+int pidfd_store_add(pid_t pid);
+int pidfd_store_check_pid_reuse(pid_t pid);
+bool pidfd_store_ready(void);
 
-#endif /* __CR_PIDFD_STORE_H__ */
\ No newline at end of file
+#endif /* __CR_PIDFD_STORE_H__ */
diff --git a/criu/mem.c b/criu/mem.c
index 8c6e13d79..9fabe4c47 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -314,33 +314,12 @@ static int detect_pid_reuse(struct pstree_item *item,
 {
 	unsigned long long dump_ticks;
 	struct proc_pid_stat pps_buf;
-	struct pidfd_entry *entry;
 	unsigned long long tps; /* ticks per second */
 	int ret;
 
 	/* Check pid reuse using pidfds */
-	if (pidfd_store_sk != -1) {
-		entry = find_pidfd_entry_by_pid(item->pid->real);
-		if (entry == NULL) {
-			/*
-			 * This task was created between two iteration so it
-			 * should be marked as a pid reuse to make a full memory dump.
-			 */
-			pr_warn("Pid reuse detected for pid %d\n", item->pid->real);
-			return 1;
-		}
-
-		ret = check_pidfd_entry_state(entry);
-		if (ret < 0) {
-			pr_err("Failed to get pidfd entry state for pid %d\n", item->pid->real);
-			return -1;
-		}
-
-		if (ret == 1)
-			pr_warn("Pid reuse detected for pid %d\n", item->pid->real);
-
-		return ret;
-	}
+	if (pidfd_store_ready())
+		return pidfd_store_check_pid_reuse(item->pid->real);
 
 	if (!parent_ie) {
 		pr_err("Pid-reuse detection failed: no parent inventory, " \
diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c
index 517835d2e..211cdcf17 100644
--- a/criu/pidfd-store.c
+++ b/criu/pidfd-store.c
@@ -14,10 +14,20 @@
 #include "util.h"
 #include "pidfd-store.h"
 
-int pidfd_store_sk = -1;
+struct pidfd_entry {
+	pid_t				pid;
+	int				pidfd;
+	struct hlist_node		hash; /* To lookup pidfd by pid */
+};
+
+static int pidfd_store_sk = -1;
 #define PIDFD_HASH_SIZE	32
 static struct hlist_head pidfd_hash[PIDFD_HASH_SIZE];
 
+/*
+ * Steal (sk) from remote RPC client (pid) and prepare it to
+ * be used as the pidfd storage socket.
+ */
 int init_pidfd_store_sk(pid_t pid, int sk)
 {
 	int pidfd;
@@ -100,7 +110,7 @@ int init_pidfd_store_sk(pid_t pid, int sk)
 			goto err;
 		}
 
-		if (connect(pidfd_store_sk, (struct sockaddr *) &addr, addrlen)) {
+		if (connect(pidfd_store_sk, (struct sockaddr *)&addr, addrlen)) {
 			pr_perror("Unable to connect a socket");
 			goto err;
 		}
@@ -148,9 +158,8 @@ int init_pidfd_store_hash(void)
 	cnt = 0;
 	while (1) {
 		entry = xmalloc(sizeof(struct pidfd_entry));
-		if (entry == NULL) {
-			return -1;
-		}
+		if (entry == NULL)
+			goto err;
 		INIT_HLIST_NODE(&entry->hash);
 
 		ret = __recv_fds(pidfd_store_sk, &entry->pidfd, 1, &entry->pid, sizeof(pid_t), MSG_DONTWAIT);
@@ -161,14 +170,16 @@ int init_pidfd_store_hash(void)
 		} else if (ret) {
 			pr_perror("Can't read pidfd");
 			xfree(entry);
-			free_pidfd_store();
-			return ret;
+			goto err;
 		}
 
 		cnt++;
 		hlist_add_head(&entry->hash, &pidfd_hash[entry->pid % PIDFD_HASH_SIZE]);
 	}
 
+err:
+	free_pidfd_store();
+	return -1;
 check_empty:
 	/*
 	 * If no pidfds exist in pidfd_store. This would cause full page
@@ -184,7 +195,7 @@ check_empty:
 	return 0;
 }
 
-struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid)
+static struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid)
 {
 	struct pidfd_entry *entry;
 	struct hlist_head *chain;
@@ -203,7 +214,7 @@ struct pidfd_entry *find_pidfd_entry_by_pid(pid_t pid)
  * 0 - task still running
  * -1 - error
  */
-int check_pidfd_entry_state(struct pidfd_entry *entry)
+static int check_pidfd_entry_state(struct pidfd_entry *entry)
 {
 	struct pollfd pollfd;
 	int ret, restart_cnt = 0;
@@ -227,7 +238,7 @@ int check_pidfd_entry_state(struct pidfd_entry *entry)
 	}
 }
 
-int send_pidfd_entry(pid_t pid)
+int pidfd_store_add(pid_t pid)
 {
 	int pidfd, entry_state;
 	struct pidfd_entry *entry;
@@ -247,7 +258,7 @@ int send_pidfd_entry(pid_t pid)
 		if (entry_state == -1) {
 			pr_perror("Can't get state of pidfd entry of pid %d", pid);
 			return -1;
-		} else if(entry_state == 1) {
+		} else if (entry_state == 1) {
 			/* Task is closed, We need to create a new pidfd for task. */
 			entry = NULL;
 		}
@@ -270,13 +281,47 @@ int send_pidfd_entry(pid_t pid)
 
 	if (send_fds(pidfd_store_sk, NULL, 0, &pidfd, 1, &pid, sizeof(pid_t))) {
 		pr_perror("Can't send pidfd %d of pid %d", pidfd, pid);
-		if(!entry)
+		if (!entry)
 			close(pidfd);
 		return -1;
 	}
 
-	if(!entry)
+	if (!entry)
 		close(pidfd);
 
 	return 0;
 }
+
+/*
+ * 1 - pid reuse detected
+ * 0 - task still running
+ * -1 - error
+ */
+int pidfd_store_check_pid_reuse(pid_t pid)
+{
+	struct pidfd_entry *entry;
+	int ret;
+
+	entry = find_pidfd_entry_by_pid(pid);
+	if (entry == NULL) {
+		/*
+		 * This task was created between two iteration so it
+		 * should be marked as a pid reuse to make a full memory dump.
+		 */
+		pr_warn("Pid reuse detected for pid %d\n", pid);
+		return 1;
+	}
+
+	ret = check_pidfd_entry_state(entry);
+	if (ret == -1)
+		pr_err("Failed to get pidfd entry state for pid %d\n", pid);
+	else if (ret == 1)
+		pr_warn("Pid reuse detected for pid %d\n", pid);
+
+	return ret;
+}
+
+bool pidfd_store_ready(void)
+{
+	return pidfd_store_sk != -1;
+}

From f57e45df56ded0624386007787eb7661c96c169f Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 25 Jun 2021 23:07:34 +0200
Subject: [PATCH 0664/1854] cr-service: move pidfd_store initialization to
 cr-service

Moved pidfd store hashtable initialization to cr-service.c since
pidfd_store is only relevant in RPC mode.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-dump.c    | 8 --------
 criu/cr-service.c | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index f210dbf3e..eece51cff 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1572,7 +1572,6 @@ static int cr_pre_dump_finish(int status)
 
 	free_pstree(root_item);
 	seccomp_free_entries();
-	free_pidfd_store();
 
 	if (irmap_predump_run()) {
 		ret = -1;
@@ -1627,9 +1626,6 @@ int cr_pre_dump_tasks(pid_t pid)
 	if (init_stats(DUMP_STATS))
 		goto err;
 
-	if (init_pidfd_store_hash())
-		goto err;
-
 	if (cr_plugin_init(CR_PLUGIN_STAGE__PRE_DUMP))
 		goto err;
 
@@ -1786,7 +1782,6 @@ static int cr_dump_finish(int ret)
 	free_link_remaps();
 	free_aufs_branches();
 	free_userns_maps();
-	free_pidfd_store();
 
 	close_service_fd(CR_PROC_FD_OFF);
 	close_image_dir();
@@ -1832,9 +1827,6 @@ int cr_dump_tasks(pid_t pid)
 	if (init_stats(DUMP_STATS))
 		goto err;
 
-	if (init_pidfd_store_hash())
-		goto err;
-
 	if (cr_plugin_init(CR_PLUGIN_STAGE__DUMP))
 		goto err;
 
diff --git a/criu/cr-service.c b/criu/cr-service.c
index f0d864f7b..888d6b7e4 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -729,6 +729,8 @@ static int dump_using_req(int sk, CriuOpts *req)
 
 	setproctitle("dump --rpc -t %d -D %s", req->pid, images_dir);
 
+	if (init_pidfd_store_hash())
+		goto pidfd_store_err;
 	/*
 	 * FIXME -- cr_dump_tasks() may return code from custom
 	 * scripts, that can be positive. However, right now we
@@ -740,6 +742,8 @@ static int dump_using_req(int sk, CriuOpts *req)
 
 	success = true;
 exit:
+	free_pidfd_store();
+pidfd_store_err:
 	if (req->leave_running  || !self_dump || !success) {
 		if (send_criu_dump_resp(sk, success, false) == -1) {
 			pr_perror("Can't send response");
@@ -850,11 +854,16 @@ static int pre_dump_using_req(int sk, CriuOpts *req)
 
 		setproctitle("pre-dump --rpc -t %d -D %s", req->pid, images_dir);
 
+		if (init_pidfd_store_hash())
+			goto pidfd_store_err;
+
 		if (cr_pre_dump_tasks(req->pid))
 			goto cout;
 
 		ret = 0;
 cout:
+		free_pidfd_store();
+pidfd_store_err:
 		exit(ret);
 	}
 

From 2ebb1c7419bdf08060e56ed9114c6a8c6c287059 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 2 Jul 2021 16:52:13 +0300
Subject: [PATCH 0665/1854] crit: fix error on memfd files parsing

Else we get error:

[root@fedora criu]# crit/crit x test/dump/zdtm/static/memfd00/56/1/ mems
...
Traceback (most recent call last):
  File "/home/snorch/devel/ms/criu/crit/crit", line 6, in <module>
    cli.main()
  File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 430, in main
    opts["func"](opts)
  File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 361, in explore
    explorers[opts['what']](opts)
  File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 283, in explore_mems
    fn = ' ' + get_file_str(opts, {
  File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 214, in get_file_str
    f = ft['get'](opts, ft, fd['id'])
  File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 165, in ftype_reg
    rf = ftype_find_in_image(opts, ft, fid, 'reg-files.img')
  File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 154, in ftype_find_in_image
    return f[ft['field']]
KeyError: 'reg'

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 lib/py/cli.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index e3c4a4fb3..5419384c3 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -151,7 +151,10 @@ def ftype_find_in_files(opts, ft, fid):
 def ftype_find_in_image(opts, ft, fid, img):
     f = ftype_find_in_files(opts, ft, fid)
     if f:
-        return f[ft['field']]
+        if ft['field'] in f:
+            return f[ft['field']]
+        else:
+            return None
 
     if ft['img'] is None:
         ft['img'] = pycriu.images.load(dinf(opts, img))['entries']

From 0ca36c95eebbdacb918723a7655c11acd5ab330b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 5 Jul 2021 08:10:12 +0000
Subject: [PATCH 0666/1854] ci: combine cross compile container definitions

The cross compile container definitions for each architecture were
almost the same files except for the architecture.

This moves the architecture to variables so that all cross compile
setups can use the same container definition.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .gitignore                                   |  1 -
 scripts/build/Dockerfile.aarch64-cross       | 47 --------------------
 scripts/build/Dockerfile.aarch64-cross.hdr   |  5 +++
 scripts/build/Dockerfile.aarch64-cross.tmpl  |  1 +
 scripts/build/Dockerfile.armv7-cross         | 46 -------------------
 scripts/build/Dockerfile.armv7-cross.hdr     |  6 +++
 scripts/build/Dockerfile.armv7-cross.tmpl    |  1 +
 scripts/build/Dockerfile.cross.tmpl          | 43 ++++++++++++++++++
 scripts/build/Dockerfile.mips64el-cross      | 46 -------------------
 scripts/build/Dockerfile.mips64el-cross.hdr  |  6 +++
 scripts/build/Dockerfile.mips64el-cross.tmpl |  1 +
 scripts/build/Dockerfile.ppc64-cross         | 47 --------------------
 scripts/build/Dockerfile.ppc64-cross.hdr     |  5 +++
 scripts/build/Dockerfile.ppc64-cross.tmpl    |  1 +
 scripts/build/Makefile                       | 16 +++----
 15 files changed, 77 insertions(+), 195 deletions(-)
 delete mode 100644 scripts/build/Dockerfile.aarch64-cross
 create mode 100644 scripts/build/Dockerfile.aarch64-cross.hdr
 create mode 120000 scripts/build/Dockerfile.aarch64-cross.tmpl
 delete mode 100644 scripts/build/Dockerfile.armv7-cross
 create mode 100644 scripts/build/Dockerfile.armv7-cross.hdr
 create mode 120000 scripts/build/Dockerfile.armv7-cross.tmpl
 create mode 100644 scripts/build/Dockerfile.cross.tmpl
 delete mode 100644 scripts/build/Dockerfile.mips64el-cross
 create mode 100644 scripts/build/Dockerfile.mips64el-cross.hdr
 create mode 120000 scripts/build/Dockerfile.mips64el-cross.tmpl
 delete mode 100644 scripts/build/Dockerfile.ppc64-cross
 create mode 100644 scripts/build/Dockerfile.ppc64-cross.hdr
 create mode 120000 scripts/build/Dockerfile.ppc64-cross.tmpl

diff --git a/.gitignore b/.gitignore
index d5135f5f8..b9cd7cdc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,3 @@ lib/.crit-setup.files
 compel/include/asm
 include/common/asm
 include/common/config.h
-build/
diff --git a/scripts/build/Dockerfile.aarch64-cross b/scripts/build/Dockerfile.aarch64-cross
deleted file mode 100644
index d372b2c91..000000000
--- a/scripts/build/Dockerfile.aarch64-cross
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM dockcross/base:latest
-
-COPY scripts/ci/apt-install /bin/apt-install
-
-# Add the cross compiler sources
-RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
-  dpkg --add-architecture arm64 && \
-  apt-install emdebian-archive-keyring
-
-RUN apt-install \
-	crossbuild-essential-arm64	\
-	libc6-dev-arm64-cross		\
-	libc6-arm64-cross		\
-	libbz2-dev:arm64		\
-	libexpat1-dev:arm64		\
-	ncurses-dev:arm64		\
-	libssl-dev:arm64		\
-	protobuf-c-compiler		\
-	protobuf-compiler		\
-	python3-protobuf			\
-	libnl-3-dev:arm64		\
-	libprotobuf-dev:arm64		\
-	libnet-dev:arm64		\
-	libprotobuf-c-dev:arm64		\
-	libcap-dev:arm64		\
-	libaio-dev:arm64		\
-	libnl-route-3-dev:arm64
-
-ENV CROSS_TRIPLE=aarch64-linux-gnu
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
-	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
-	AS=/usr/bin/${CROSS_TRIPLE}-as				\
-	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
-	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
-	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
-	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
-	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
-	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
-
-ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
-	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
-	ARCH=aarch64
-
-COPY . /criu
-WORKDIR /criu
-
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.aarch64-cross.hdr b/scripts/build/Dockerfile.aarch64-cross.hdr
new file mode 100644
index 000000000..c61d2af27
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-cross.hdr
@@ -0,0 +1,5 @@
+FROM docker.io/dockcross/base:latest
+
+ENV ARCH=aarch64
+ENV DEBIAN_ARCH=arm64
+ENV CROSS_TRIPLET=aarch64-linux-gnu
diff --git a/scripts/build/Dockerfile.aarch64-cross.tmpl b/scripts/build/Dockerfile.aarch64-cross.tmpl
new file mode 120000
index 000000000..50eff9213
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.armv7-cross b/scripts/build/Dockerfile.armv7-cross
deleted file mode 100644
index b3a18d0ec..000000000
--- a/scripts/build/Dockerfile.armv7-cross
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM dockcross/base:latest
-
-COPY scripts/ci/apt-install /bin/apt-install
-
-# Add the cross compiler sources
-RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
-  dpkg --add-architecture armhf && \
-  apt-install emdebian-archive-keyring
-
-RUN apt-install \
-	crossbuild-essential-armhf	\
-	libbz2-dev:armhf		\
-	libexpat1-dev:armhf		\
-	ncurses-dev:armhf		\
-	libssl-dev:armhf		\
-	protobuf-c-compiler		\
-	protobuf-compiler		\
-	python3-protobuf			\
-	libnl-3-dev:armhf		\
-	libprotobuf-dev:armhf		\
-	libnet-dev:armhf		\
-	libprotobuf-c-dev:armhf		\
-	libcap-dev:armhf		\
-	libaio-dev:armhf		\
-	libnl-route-3-dev:armhf
-
-ENV CROSS_TRIPLE=arm-linux-gnueabihf
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
-	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
-	AS=/usr/bin/${CROSS_TRIPLE}-as				\
-	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
-	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
-	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
-	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
-	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
-	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
-
-ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
-	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
-	ARCH=arm						\
-	SUBARCH=armv7
-
-COPY . /criu
-WORKDIR /criu
-
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.armv7-cross.hdr b/scripts/build/Dockerfile.armv7-cross.hdr
new file mode 100644
index 000000000..f96dc51f7
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-cross.hdr
@@ -0,0 +1,6 @@
+FROM docker.io/dockcross/base:latest
+
+ENV ARCH=arm
+ENV SUBARCH=armv7
+ENV DEBIAN_ARCH=armhf
+ENV CROSS_TRIPLET=arm-linux-gnueabihf
diff --git a/scripts/build/Dockerfile.armv7-cross.tmpl b/scripts/build/Dockerfile.armv7-cross.tmpl
new file mode 120000
index 000000000..50eff9213
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.cross.tmpl b/scripts/build/Dockerfile.cross.tmpl
new file mode 100644
index 000000000..8b95fbb1c
--- /dev/null
+++ b/scripts/build/Dockerfile.cross.tmpl
@@ -0,0 +1,43 @@
+COPY scripts/ci/apt-install /bin/apt-install
+
+# Add the cross compiler sources
+RUN echo "deb http://deb.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture ${DEBIAN_ARCH} && \
+  apt-install emdebian-archive-keyring
+
+RUN apt-install \
+	crossbuild-essential-${DEBIAN_ARCH}	\
+	libc6-dev-${DEBIAN_ARCH}-cross		\
+	libc6-${DEBIAN_ARCH}-cross		\
+	libbz2-dev:${DEBIAN_ARCH}		\
+	libexpat1-dev:${DEBIAN_ARCH}		\
+	ncurses-dev:${DEBIAN_ARCH}		\
+	libssl-dev:${DEBIAN_ARCH}		\
+	protobuf-c-compiler			\
+	protobuf-compiler			\
+	python3-protobuf			\
+	libnl-3-dev:${DEBIAN_ARCH}		\
+	libprotobuf-dev:${DEBIAN_ARCH}		\
+	libnet-dev:${DEBIAN_ARCH}		\
+	libprotobuf-c-dev:${DEBIAN_ARCH}	\
+	libcap-dev:${DEBIAN_ARCH}		\
+	libaio-dev:${DEBIAN_ARCH}		\
+	libnl-route-3-dev:${DEBIAN_ARCH}
+
+ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
+	AS=/usr/bin/${CROSS_TRIPLET}-as				\
+	AR=/usr/bin/${CROSS_TRIPLET}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLET}-gcc			\
+	CPP=/usr/bin/${CROSS_TRIPLET}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLET}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLET}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLET}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLET}/pkgconfig
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.mips64el-cross b/scripts/build/Dockerfile.mips64el-cross
deleted file mode 100644
index 6f0f32820..000000000
--- a/scripts/build/Dockerfile.mips64el-cross
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM dockcross/base:latest
-
-COPY scripts/ci/apt-install /bin/apt-install
-
-# Add the cross compiler sources
-RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
-  dpkg --add-architecture mips64el && \
-  apt-install emdebian-archive-keyring
-
-RUN apt-install \
-	crossbuild-essential-mips64el	\
-	libbz2-dev:mips64el		\
-	libexpat1-dev:mips64el		\
-	ncurses-dev:mips64el		\
-	libssl-dev:mips64el		\
-	protobuf-c-compiler		\
-	protobuf-compiler		\
-	python3-protobuf			\
-	libnl-3-dev:mips64el		\
-	libprotobuf-dev:mips64el		\
-	libnet-dev:mips64el		\
-	libprotobuf-c-dev:mips64el		\
-	libcap-dev:mips64el		\
-	libaio-dev:mips64el		\
-	libnl-route-3-dev:mips64el
-
-ENV CROSS_TRIPLE=mips64el-linux-gnuabi64
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
-	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
-	AS=/usr/bin/${CROSS_TRIPLE}-as				\
-	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
-	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
-	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
-	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
-	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
-	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
-
-ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
-	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
-	ARCH=mips						\
-	SUBARCH=mips
-
-COPY . /criu
-WORKDIR /criu
-
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.mips64el-cross.hdr b/scripts/build/Dockerfile.mips64el-cross.hdr
new file mode 100644
index 000000000..e78c94aa5
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-cross.hdr
@@ -0,0 +1,6 @@
+FROM dockcross/base:latest
+
+ENV ARCH=mips
+ENV SUBARCH=mips
+ENV DEBIAN_ARCH=mips64el
+ENV CROSS_TRIPLET=mips64el-linux-gnuabi64
diff --git a/scripts/build/Dockerfile.mips64el-cross.tmpl b/scripts/build/Dockerfile.mips64el-cross.tmpl
new file mode 120000
index 000000000..50eff9213
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64-cross b/scripts/build/Dockerfile.ppc64-cross
deleted file mode 100644
index eaa4e4ea2..000000000
--- a/scripts/build/Dockerfile.ppc64-cross
+++ /dev/null
@@ -1,47 +0,0 @@
-FROM dockcross/base:latest
-
-COPY scripts/ci/apt-install /bin/apt-install
-
-# Add the cross compiler sources
-RUN echo "deb http://ftp.us.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
-  dpkg --add-architecture ppc64el && \
-  apt-install emdebian-archive-keyring
-
-RUN apt-install \
-	crossbuild-essential-ppc64el	\
-	libc6-dev-ppc64el-cross		\
-	libc6-ppc64el-cross		\
-	libbz2-dev:ppc64el		\
-	libexpat1-dev:ppc64el		\
-	ncurses-dev:ppc64el		\
-	libssl-dev:ppc64el		\
-	protobuf-c-compiler		\
-	protobuf-compiler		\
-	python3-protobuf			\
-	libnl-3-dev:ppc64el		\
-	libprotobuf-dev:ppc64el		\
-	libnet-dev:ppc64el		\
-	libprotobuf-c-dev:ppc64el		\
-	libcap-dev:ppc64el		\
-	libaio-dev:ppc64el		\
-	libnl-route-3-dev:ppc64el
-
-ENV CROSS_TRIPLE=powerpc64le-linux-gnu
-ENV CROSS_COMPILE=${CROSS_TRIPLE}-				\
-	CROSS_ROOT=/usr/${CROSS_TRIPLE}				\
-	AS=/usr/bin/${CROSS_TRIPLE}-as				\
-	AR=/usr/bin/${CROSS_TRIPLE}-ar				\
-	CC=/usr/bin/${CROSS_TRIPLE}-gcc				\
-	CPP=/usr/bin/${CROSS_TRIPLE}-cpp			\
-	CXX=/usr/bin/${CROSS_TRIPLE}-g++			\
-	LD=/usr/bin/${CROSS_TRIPLE}-ld				\
-	FC=/usr/bin/${CROSS_TRIPLE}-gfortran
-
-ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
-	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLE}/pkgconfig	\
-	ARCH=ppc64
-
-COPY . /criu
-WORKDIR /criu
-
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.ppc64-cross.hdr b/scripts/build/Dockerfile.ppc64-cross.hdr
new file mode 100644
index 000000000..38547ac55
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-cross.hdr
@@ -0,0 +1,5 @@
+FROM dockcross/base:latest
+
+ENV ARCH=ppc64
+ENV DEBIAN_ARCH=ppc64el
+ENV CROSS_TRIPLET=powerpc64le-linux-gnu
diff --git a/scripts/build/Dockerfile.ppc64-cross.tmpl b/scripts/build/Dockerfile.ppc64-cross.tmpl
new file mode 120000
index 000000000..50eff9213
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index b6c6477f3..8e6e3c27c 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,26 +1,26 @@
 ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
+NON_CLANG := armv7-cross aarch64-cross ppc64-cross mips64el-cross
+CREATE_DOCKERFILES := $(ARCHES) $(NON_CLANG)
 TARGETS := $(ARCHES) alpine
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
+CONTAINER_TARGETS := $(TARGETS) $(NON_CLANG)
 
-TARGETS += armv7-cross aarch64-cross ppc64-cross mips64el-cross
-
-
-all: $(TARGETS) $(TARGETS_CLANG)
+all: $(CONTAINER_TARGETS) $(TARGETS_CLANG)
 .PHONY: all
 
 # A build for each architecture requires appropriate Dockerfile
-define ARCH_DEP
+define FILE_DEP
 $(1): Dockerfile.$(1)
 endef
-$(foreach arch,$(ARCHES),$(eval $(call ARCH_DEP,$(arch))))
+$(foreach file,$(CREATE_DOCKERFILES),$(eval $(call FILE_DEP,$(file))))
 
 Dockerfile.%: Dockerfile.%.hdr Dockerfile.%.tmpl
 	cat $^ > $@
 
-$(TARGETS):
+$(CONTAINER_TARGETS):
 	$(CONTAINER_RUNTIME) build  -t criu-$@ -f Dockerfile.$@ $(DB_CC) ../..
-.PHONY: $(TARGETS)
+.PHONY: $(CONTAINER_TARGETS)
 
 # Clang builds add some Docker build env
 define CLANG_DEP

From fa9acb9dc7e8ffe6f40864279fe055e5798045fe Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 5 Jul 2021 07:16:24 +0000
Subject: [PATCH 0667/1854] lib: fix broken crit-recode test

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 95a10dd80..80d8b4531 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -356,8 +356,12 @@ class tcp_stream_extra_handler:
         return d
 
     def dump(self, extra, f, _unused):
-        inq = base64.decodebytes(extra['inq'])
-        outq = base64.decodebytes(extra['outq'])
+        if (sys.version_info > (3, 0)):
+            inq = base64.decodebytes(str.encode(extra['inq']))
+            outq = base64.decodebytes(str.encode(extra['outq']))
+        else:
+            inq = base64.decodebytes(extra['inq'])
+            outq = base64.decodebytes(extra['outq'])
 
         f.write(inq)
         f.write(outq)

From bd648cc8d9a92bca62f8f38764c7f27439e9fdfb Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 5 Jul 2021 07:16:50 +0000
Subject: [PATCH 0668/1854] ci: also test tcp stream crit recoding

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7a177b67b..c8f781734 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -253,7 +253,7 @@ ip net add test
 
 ./test/zdtm.py run --empty-ns -T zdtm/static/socket-tcp*-local --iter 2
 
-./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -k always
+./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -t zdtm/static/socket-tcp -k always
 ./test/crit-recode.py
 
 # more crit testing

From 8f2b8c7be0cde35606046347f436c6d243129ce0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 5 Jul 2021 07:19:18 +0000
Subject: [PATCH 0669/1854] scripts: run lint also on criu-ns

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile        | 1 +
 scripts/criu-ns | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a8d14ca00..eb0063623 100644
--- a/Makefile
+++ b/Makefile
@@ -406,6 +406,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/inhfd/*.py
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
+	flake8 --config=scripts/flake8.cfg scripts/criu-ns
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
diff --git a/scripts/criu-ns b/scripts/criu-ns
index 3ee6564e9..4f7c3a6ec 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -52,7 +52,7 @@ def _mount_new_proc():
     """
     Mount new /proc filesystem.
     """
-    if _mount(None, b"/", None, MS_SLAVE|MS_REC, None):
+    if _mount(None, b"/", None, MS_SLAVE | MS_REC, None):
         _errno = ctypes.get_errno()
         raise OSError(_errno, errno.errorcode[_errno])
     if _mount(b'proc', b'/proc', b'proc', 0, None):
@@ -144,10 +144,10 @@ def set_pidns(tpid, pid_idx):
     """
     ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
     if is_my_namespace(ns_fd):
-        for l in open('/proc/%s/status' % tpid):
-            if not l.startswith('NSpid:'):
+        for line in open('/proc/%s/status' % tpid):
+            if not line.startswith('NSpid:'):
                 continue
-            ls = l.split()
+            ls = line.split()
             if ls[1] != tpid:
                 os.close(ns_fd)
                 raise OSError(errno.ESRCH, 'No such pid')

From 07316d15a66f82976d408446ef1a83652d6e0627 Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Fri, 2 Jul 2021 17:31:39 +0800
Subject: [PATCH 0670/1854] restore: cleanup cgroup properly in error path

Cgroup yard is setup in crtools_prepare_shared. But it is not cleaned up
properly in some code path, which leads cgroup mountpoint leaking.

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/cgroup.c     | 18 +++++++-----------
 criu/cr-restore.c | 15 +++++++--------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index d0761e8e7..408c2daf3 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1771,19 +1771,19 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 		}
 
 		if (make_yard(cg_yard))
-			goto err;
+			return -1;
 	}
 
 	pr_debug("Opening %s as cg yard\n", cg_yard);
 	i = open(cg_yard, O_DIRECTORY);
 	if (i < 0) {
 		pr_perror("Can't open cgyard");
-		goto err;
+		return -1;
 	}
 
 	ret = install_service_fd(CGROUP_YARD, i);
 	if (ret < 0)
-		goto err;
+		return -1;
 
 	paux[off++] = '/';
 
@@ -1794,7 +1794,7 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 
 		if (ctrl->n_cnames < 1) {
 			pr_err("Each cg_controller_entry must have at least 1 controller\n");
-			goto err;
+			return -1;
 		}
 
 		ctl_off += ctrl_dir_and_opt(ctrl,
@@ -1811,11 +1811,11 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 			pr_debug("\tMaking controller dir %s (%s)\n", paux, opt);
 			if (mkdir(paux, 0700)) {
 				pr_perror("\tCan't make controller dir %s", paux);
-				goto err;
+				return -1;
 			}
 			if (mount("none", paux, fstype, 0, opt) < 0) {
 				pr_perror("\tCan't mount controller dir %s", paux);
-				goto err;
+				return -1;
 			}
 		}
 
@@ -1827,14 +1827,10 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 		if (opts.manage_cgroups &&
 		    prepare_cgroup_dirs(ctrl->cnames, ctrl->n_cnames, yard, yard_off,
 				ctrl->dirs, ctrl->n_dirs))
-			goto err;
+			return -1;
 	}
 
 	return 0;
-
-err:
-	fini_cgroup();
-	return -1;
 }
 
 static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controllers,
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 0d85db6ce..7b6eec9ad 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -253,9 +253,6 @@ static int crtools_prepare_shared(void)
 	if (tty_prep_fds())
 		return -1;
 
-	if (prepare_cgroup())
-		return -1;
-
 	return 0;
 }
 
@@ -2459,8 +2456,6 @@ skip_ns_bouncing:
 	if (restore_freezer_state())
 		pr_err("Unable to restore freezer state\n");
 
-	fini_cgroup();
-
 	/* Detaches from processes and they continue run through sigreturn. */
 	if (finalize_restore_detach())
 		goto out_kill_network_unlocked;
@@ -2507,7 +2502,6 @@ out_kill:
 	}
 
 out:
-	fini_cgroup();
 	depopulate_roots_yard(mnt_ns_fd, true);
 	stop_usernsd();
 	__restore_switch_stage(CR_STATE_FAIL);
@@ -2597,13 +2591,18 @@ int cr_restore_tasks(void)
 	if (crtools_prepare_shared() < 0)
 		goto err;
 
+	if (prepare_cgroup())
+		goto clean_cgroup;
+
 	if (criu_signals_setup() < 0)
-		goto err;
+		goto clean_cgroup;
 
 	if (prepare_lazy_pages_socket() < 0)
-		goto err;
+		goto clean_cgroup;
 
 	ret = restore_root_task(root_item);
+clean_cgroup:
+	fini_cgroup();
 err:
 	cr_plugin_fini(CR_PLUGIN_STAGE__RESTORE, ret);
 	return ret;

From 7ff785e1d45d3736fa32ec161348242d80848480 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 2 Jul 2021 10:17:43 +0300
Subject: [PATCH 0671/1854] zdtm: make --sbs also stop on each pre-dump/snap
 iteration

This is useful to investigate problems on pre-dump iterations. After
this patch test output with "--pre=2 --sbs" would have new usefull stop
points.

While on it let's remove confusion in sbs stop point naming. "Pause at
pre-dump" actually has nothing to do with pre-dump, let's better use
"before " instead of "at pre-", similar let's use "after " instead of
"at post-".

Result would look like:

========================== Run zdtm/static/env00 in h ==========================
Start test
./env00 --pidfile=env00.pid --outfile=env00.out --envname=ENV_00_TEST
Pause before pre-dump 0. Press Enter to continue.
Run criu pre-dump
Pause before pre-dump 1. Press Enter to continue.
Run criu pre-dump
Pause before dump. Press Enter to continue.
Run criu dump
Pause before restore. Press Enter to continue.
Run criu restore
Pause after restore. Press Enter to continue.

v2: improve sbs step naming; rename "iter" to more meaningfull
"pre-dump"/"snap".

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 9fae6e2c8..0a52e1b96 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1494,7 +1494,7 @@ def init_sbs():
 
 def sbs(what):
     if do_sbs:
-        input("Pause at %s. Press Enter to continue." % what)
+        input("Pause %s. Press Enter to continue." % what)
 
 
 #
@@ -1516,14 +1516,16 @@ def cr(cr_api, test, opts):
         pres = iter_parm(opts['pre'], 0)
         for p in pres[0]:
             if opts['snaps']:
+                sbs('before snap %d' % p)
                 cr_api.dump("dump", opts=["--leave-running", "--track-mem"])
             else:
+                sbs('before pre-dump %d' % p)
                 cr_api.dump("pre-dump")
                 try_run_hook(test, ["--post-pre-dump"])
                 test.pre_dump_notify()
             time.sleep(pres[1])
 
-        sbs('pre-dump')
+        sbs('before dump')
 
         os.environ["ZDTM_TEST_PID"] = str(test.getpid())
         if opts['norst']:
@@ -1536,13 +1538,13 @@ def cr(cr_api, test, opts):
                 test.gone()
             else:
                 test.unlink_pidfile()
-            sbs('pre-restore')
+            sbs('before restore')
             try_run_hook(test, ["--pre-restore"])
             cr_api.restore()
             os.environ["ZDTM_TEST_PID"] = str(test.getpid())
             os.environ["ZDTM_IMG_DIR"] = cr_api.logs()
             try_run_hook(test, ["--post-restore"])
-            sbs('post-restore')
+            sbs('after restore')
 
         time.sleep(iters[1])
 

From 5034885974cad089f73c51698e2022af272f15eb Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 14 Jul 2021 08:30:53 +0100
Subject: [PATCH 0672/1854] ci/openj9: run mrproper before make

Make sure to remove all files created from previous local build
before compiling in the container.

Reported-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.openj9-alpine | 3 ++-
 scripts/build/Dockerfile.openj9-ubuntu | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
index 5f2f08df4..cf60756b8 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -1,4 +1,5 @@
 FROM adoptopenjdk/openjdk8-openj9:alpine
+ARG CC=gcc
 
 RUN apk update && apk add \
 	bash \
@@ -23,7 +24,7 @@ RUN apk update && apk add \
 COPY . /criu
 WORKDIR /criu
 
-RUN make
+RUN make mrproper && make -j $(nproc) CC="$CC"
 
 ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
 
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index abcd8cc1a..1e2eb41c0 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,4 +1,5 @@
 FROM adoptopenjdk/openjdk8-openj9:latest
+ARG CC=gcc
 
 COPY scripts/ci/apt-install /bin/apt-install
 
@@ -27,7 +28,7 @@ RUN apt-install protobuf-c-compiler \
 COPY . /criu
 WORKDIR /criu
 
-RUN make
+RUN make mrproper && make -j $(nproc) CC="$CC"
 
 ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
 

From 7e86519fe31541268b8059ebd8fe31042ec1e648 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Jul 2021 14:40:47 +0000
Subject: [PATCH 0673/1854] lib: fix crit-recode msgque errors in Jenkins

b'test/dump/zdtm/static/msgque/63/1/ipcns-msg-11.img'  encode fails: expected bytes-like object, not str
b'test/dump/zdtm/static/msgque/63/1/ipcns-msg-11.img' pretty  encode fails: expected bytes-like object, not str
FAIL

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/py/images/images.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 80d8b4531..3ab52d56a 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -443,7 +443,10 @@ class ipc_msg_queue_handler:
             f.write(struct.pack('i', size))
             f.write(msg_str)
             rounded = round_up(msg.msize, sizeof_u64)
-            data = base64.decodebytes(extra[i + 1])
+            if (sys.version_info > (3, 0)):
+                data = base64.decodebytes(str.encode(extra[i + 1]))
+            else:
+                data = base64.decodebytes(extra[i + 1])
             f.write(data[:msg.msize])
             f.write(b'\0' * (rounded - msg.msize))
 

From ac27562f09a8fa5bf4310c0f9da81b3ad127371a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 14 Jul 2021 14:41:59 +0000
Subject: [PATCH 0674/1854] ci: add msgque test case to crit-recode

crit-recode on msgque tests was broken in Jenkins. Run it also in GitHub
CI.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index c8f781734..7c66e6802 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -253,7 +253,7 @@ ip net add test
 
 ./test/zdtm.py run --empty-ns -T zdtm/static/socket-tcp*-local --iter 2
 
-./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -t zdtm/static/socket-tcp -k always
+./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -t zdtm/static/socket-tcp -t zdtm/static/msgque -k always
 ./test/crit-recode.py
 
 # more crit testing

From efb9fccd41d8c25f3571914c6f65c0d702e486e9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 11 Jul 2021 09:57:02 +0300
Subject: [PATCH 0675/1854] cgroup: cgroup_contains has to update the mask for
 cgroupv2

Fixes: #1524
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cgroup.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 408c2daf3..fa088858f 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -196,8 +196,14 @@ static bool cgroup_contains(char **controllers,
 	bool all_match = true;
 
 	/* Check whether this cgroup2 or not.*/
-	if (n_controllers == 1 && controllers[0][0] == 0)
-		return name[0] == 0;
+	if (n_controllers == 1 && controllers[0][0] == 0) {
+		bool match = name[0] == 0;
+
+		if (mask && match)
+			*mask &= ~(1ULL);
+
+		return match;
+	}
 
 	for (i = 0; i < n_controllers; i++) {
 		bool found = false;

From 694eafa1f6ef5801c79ba2c9f872c198b6845c0d Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Thu, 22 Jul 2021 11:39:34 +0200
Subject: [PATCH 0676/1854] protobuf: remove leading underscores from protobuf
 structs

Fixes: #1560

The latest protobuf-c compiler breaks CRIU because they removed
leading underscores from structs in 1.4.0.

This replaces those definitions with the standard generated structs.

v2: remove struct _VmaEntry, struct _CredsEntry and struct _CoreEntry

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/include/irmap.h            | 8 +++++---
 criu/include/parasite-syscall.h | 8 +++-----
 criu/include/pstree.h           | 2 +-
 criu/include/rst_info.h         | 5 ++---
 criu/include/shmem.h            | 1 -
 criu/mem.c                      | 2 +-
 lib/c/criu.h                    | 3 ++-
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/criu/include/irmap.h b/criu/include/irmap.h
index 033f71e37..188d753f4 100644
--- a/criu/include/irmap.h
+++ b/criu/include/irmap.h
@@ -1,13 +1,15 @@
 #ifndef __CR_IRMAP__H__
 #define __CR_IRMAP__H__
+
+#include "images/fh.pb-c.h"
+
 char *irmap_lookup(unsigned int s_dev, unsigned long i_ino);
-struct _FhEntry;
 int irmap_queue_cache(unsigned int dev, unsigned long ino,
-		struct _FhEntry *fh);
+		FhEntry *fh);
 int irmap_predump_prep(void);
 int irmap_predump_run(void);
 int check_open_handle(unsigned int s_dev, unsigned long i_ino,
-		struct _FhEntry *f_handle);
+		FhEntry *f_handle);
 int irmap_load_cache(void);
 int irmap_scan_path_add(char *path);
 #endif
diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h
index c86a724fd..afba95a9e 100644
--- a/criu/include/parasite-syscall.h
+++ b/criu/include/parasite-syscall.h
@@ -11,8 +11,6 @@ struct parasite_dump_misc;
 struct parasite_drain_fd;
 struct vm_area_list;
 struct pstree_item;
-struct _CredsEntry;
-struct _CoreEntry;
 struct list_head;
 struct cr_imgset;
 struct fd_opts;
@@ -31,11 +29,11 @@ extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc
 		struct parasite_ctl *ctl, struct pstree_item *);
 
 extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
-extern int parasite_dump_creds(struct parasite_ctl *ctl, struct _CredsEntry *ce);
-extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, struct _CoreEntry *core);
+extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce);
+extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core);
 extern int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
 				       struct parasite_ctl *ctl, int id,
-				       struct pid *tid, struct _CoreEntry *core);
+				       struct pid *tid, CoreEntry *core);
 extern int dump_thread_core(int pid, CoreEntry *core,
 					const struct parasite_dump_thread *dt);
 
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 61ab0ce0e..17d22e791 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -113,7 +113,7 @@ extern int prepare_task_entries(void);
 extern int prepare_dummy_task_state(struct pstree_item *pi);
 
 extern int get_task_ids(struct pstree_item *);
-extern struct _TaskKobjIdsEntry *root_ids;
+extern TaskKobjIdsEntry *root_ids;
 
 extern void core_entry_free(CoreEntry *core);
 extern CoreEntry *core_entry_alloc(int alloc_thread_info, int alloc_tc);
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 3283849e4..3dc119a93 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -5,6 +5,7 @@
 #include "common/list.h"
 #include "vma.h"
 #include "kerndat.h"
+#include "images/mm.pb-c.h"
 
 struct task_entries {
 	int nr_threads, nr_tasks, nr_helpers;
@@ -25,8 +26,6 @@ struct fdt {
 	futex_t			fdt_lock;
 };
 
-struct _MmEntry;
-
 struct rst_info {
 	struct list_head	fds;
 
@@ -40,7 +39,7 @@ struct rst_info {
 	struct fdt		*fdt;
 
 	struct vm_area_list	vmas;
-	struct _MmEntry		*mm;
+	MmEntry		*mm;
 	struct list_head	vma_io;
 	unsigned int		pages_img_id;
 
diff --git a/criu/include/shmem.h b/criu/include/shmem.h
index 9afdb799a..798e28f34 100644
--- a/criu/include/shmem.h
+++ b/criu/include/shmem.h
@@ -5,7 +5,6 @@
 #include "common/lock.h"
 #include "images/vma.pb-c.h"
 
-struct _VmaEntry;
 struct vma_area;
 
 extern int collect_shmem(int pid, struct vma_area *vma);
diff --git a/criu/mem.c b/criu/mem.c
index 9fabe4c47..b0a76e4da 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1230,7 +1230,7 @@ err_addr:
 
 static int maybe_disable_thp(struct pstree_item *t, struct page_read *pr)
 {
-	struct _MmEntry *mm = rsti(t)->mm;
+	MmEntry *mm = rsti(t)->mm;
 
 	/*
 	 * There is no need to disable it if the page read doesn't
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 3d6493958..d2bfbf958 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -22,6 +22,7 @@
 #include <stdbool.h>
 
 #include "version.h"
+#include "rpc.pb-c.h"
 
 #ifdef __GNUG__
 	extern "C" {
@@ -112,7 +113,7 @@ void criu_set_pidfd_store_sk(int sk);
  * some non-existing one is reported.
  */
 
-typedef struct _CriuNotify *criu_notify_arg_t;
+typedef CriuNotify *criu_notify_arg_t;
 void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na));
 
 /* Get pid of root task. 0 if not available */

From 00ca2b519e5a150b104d97720c98f2f7e0dd76d3 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Sat, 24 Jul 2021 11:27:48 +0200
Subject: [PATCH 0677/1854] scripts/build: add a docker file for archlinux

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 .github/workflows/archlinux-test.yml | 11 +++++++
 scripts/build/Dockerfile.archlinux   | 43 ++++++++++++++++++++++++++++
 scripts/build/Makefile               |  2 +-
 scripts/ci/Makefile                  |  2 +-
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/archlinux-test.yml
 create mode 100644 scripts/build/Dockerfile.archlinux

diff --git a/.github/workflows/archlinux-test.yml b/.github/workflows/archlinux-test.yml
new file mode 100644
index 000000000..bb98623a8
--- /dev/null
+++ b/.github/workflows/archlinux-test.yml
@@ -0,0 +1,11 @@
+name: Arch Linux Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Arch Linux Test
+      run: sudo -E make -C scripts/ci archlinux
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
new file mode 100644
index 000000000..d226244ee
--- /dev/null
+++ b/scripts/build/Dockerfile.archlinux
@@ -0,0 +1,43 @@
+FROM docker.io/library/archlinux:latest
+
+ARG CC=gcc
+
+RUN pacman -Syu --noconfirm \
+	$CC \
+	bash \
+	make \
+	coreutils \
+	git \
+	gnutls \
+	libaio \
+	libcap \
+	libnet \
+	libnl \
+	nftables \
+	pkgconfig \
+	protobuf-c \
+	protobuf \
+	python-pip \
+	python-protobuf \
+	which \
+	sudo \
+	iptables \
+	nftables \
+	iproute2 \
+	tar \
+	bash \
+	go \
+	python-yaml \
+	flake8 \
+	asciidoctor \
+	python-junit-xml \
+	diffutils
+
+COPY . /criu
+WORKDIR /criu
+RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
+
+# The rpc test cases are running as user #1000, let's add the user
+RUN useradd -u 1000 test
+
+RUN make -C test/zdtm
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 8e6e3c27c..3ebece3df 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,7 +1,7 @@
 ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
 NON_CLANG := armv7-cross aarch64-cross ppc64-cross mips64el-cross
 CREATE_DOCKERFILES := $(ARCHES) $(NON_CLANG)
-TARGETS := $(ARCHES) alpine
+TARGETS := $(ARCHES) alpine archlinux
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)
 CONTAINER_RUNTIME := docker
 CONTAINER_TARGETS := $(TARGETS) $(NON_CLANG)
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 79637db0b..b6a2428a4 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -11,7 +11,7 @@ ifdef CLANG
 	target-suffix = -clang
 endif
 
-TARGETS := alpine fedora-rawhide centos7 centos8
+TARGETS := alpine fedora-rawhide centos7 centos8 archlinux
 ZDTM_OPTIONS :=
 UNAME := $(shell uname -m)
 

From 4a9bcd88446a87724b5adf7c1e85f6828983e48a Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Sat, 24 Jul 2021 11:28:23 +0200
Subject: [PATCH 0678/1854] zdtm: prioritize /lib/* dependencies in some tests

Prioritize /lib/* because iptables fails to search /usr/lib64/*
first on archlinux.

This change of 'deps' order prioritizes the default library location.

This affects:
	- zdtm/static/netns-nf
	- zdtm/static/netns-nft-ipt
	- zdtm/static/socket-tcp-closed-last-ack
	- zdtm/static/socket-tcp-reseted
	- zdtm/static/socket-tcp-syn-sent

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/netns-nf.desc                   | 2 +-
 test/zdtm/static/netns-nft-ipt.desc              | 2 +-
 test/zdtm/static/socket-tcp-closed-last-ack.desc | 4 ++--
 test/zdtm/static/socket-tcp-reseted.desc         | 6 +++---
 test/zdtm/static/socket-tcp-syn-sent.desc        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/zdtm/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index 67c294888..e7e73b1ae 100644
--- a/test/zdtm/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
@@ -1,6 +1,6 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
                 '/usr/bin/diff'],
     'flags': 'suid',
     'flavor': 'ns uns'}
diff --git a/test/zdtm/static/netns-nft-ipt.desc b/test/zdtm/static/netns-nft-ipt.desc
index 76f2f14b6..4120f74d6 100644
--- a/test/zdtm/static/netns-nft-ipt.desc
+++ b/test/zdtm/static/netns-nft-ipt.desc
@@ -2,7 +2,7 @@
    'deps': [   '/bin/sh',
                '/usr/sbin/nft',
                '/sbin/iptables|/usr/sbin/iptables',
-               '/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+               '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
                '/usr/bin/diff'],
     'flags': 'suid',
     'flavor': 'ns uns'}
diff --git a/test/zdtm/static/socket-tcp-closed-last-ack.desc b/test/zdtm/static/socket-tcp-closed-last-ack.desc
index 8a83de6fd..d4cfe5064 100644
--- a/test/zdtm/static/socket-tcp-closed-last-ack.desc
+++ b/test/zdtm/static/socket-tcp-closed-last-ack.desc
@@ -1,7 +1,7 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
-                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',
diff --git a/test/zdtm/static/socket-tcp-reseted.desc b/test/zdtm/static/socket-tcp-reseted.desc
index a5c1a209d..3ebdfeef8 100644
--- a/test/zdtm/static/socket-tcp-reseted.desc
+++ b/test/zdtm/static/socket-tcp-reseted.desc
@@ -1,8 +1,8 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
-                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
-		'/usr/lib64/xtables/libipt_REJECT.so|/lib/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/aarch64-linux-gnu/xtables/libipt_REJECT.so',
+                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+		  '/lib/xtables/libipt_REJECT.so|/usr/lib64/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/aarch64-linux-gnu/xtables/libipt_REJECT.so',
        ],
        'opts': '--tcp-established',
        'flags': 'suid nouser samens',
diff --git a/test/zdtm/static/socket-tcp-syn-sent.desc b/test/zdtm/static/socket-tcp-syn-sent.desc
index d59e59717..4cc23c8fc 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.desc
+++ b/test/zdtm/static/socket-tcp-syn-sent.desc
@@ -1,7 +1,7 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/usr/lib64/xtables/libxt_tcp.so|/lib/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
-                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',

From 8891e51cd47146053f2dff88a9eb22cb9166abe6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 26 Jul 2021 20:18:51 +0100
Subject: [PATCH 0679/1854] make: install criu-ns

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/Makefile b/criu/Makefile
index b92a3f7e9..c7ac94d6a 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -144,11 +144,13 @@ install: $(obj)/criu
 	$(Q) install -m 644 $(UAPI_HEADERS) $(DESTDIR)$(INCLUDEDIR)/criu/
 	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/criu/scripts
 	$(Q) install -m 755 scripts/systemd-autofs-restart.sh $(DESTDIR)$(LIBEXECDIR)/criu/scripts
+	$(Q) install -m 755 scripts/criu-ns $(DESTDIR)$(SBINDIR)
 .PHONY: install
 
 uninstall:
 	$(E) " UNINSTALL" criu
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(SBINDIR)/,criu)
+	$(Q) $(RM) $(addprefix $(DESTDIR)$(SBINDIR)/,criu-ns)
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/criu/,$(notdir $(UAPI_HEADERS)))
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/criu/scripts/,systemd-autofs-restart.sh)
 .PHONY: uninstall

From f472e2590e7a8fc10975a7af70d90dc53c2e7b26 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 26 Jul 2021 20:37:50 +0100
Subject: [PATCH 0680/1854] Documentation: Add man page for criu-ns

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/Makefile    |  1 +
 Documentation/criu-ns.txt | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 Documentation/criu-ns.txt

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 5025e2b99..edadfb81c 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -12,6 +12,7 @@ endif
 
 FOOTER		:= footer.txt
 SRC1		+= crit.txt
+SRC1		+= criu-ns.txt
 SRC1		+= compel.txt
 SRC8		+= criu.txt
 SRC		:= $(SRC1) $(SRC8)
diff --git a/Documentation/criu-ns.txt b/Documentation/criu-ns.txt
new file mode 100644
index 000000000..877f5b1fd
--- /dev/null
+++ b/Documentation/criu-ns.txt
@@ -0,0 +1,30 @@
+CRIU-NS(1)
+==========
+include::footer.txt[]
+
+NAME
+----
+criu-ns - run criu in different namespaces
+
+SYNOPSIS
+--------
+*criu-ns* 'dump' -t PID [<options>]
+
+*criu-ns* 'pre-dump' -t PID [<options>]
+
+*criu-ns* 'restore' [<options>]
+
+DESCRIPTION
+-----------
+The *criu-ns* command executes 'criu' in a new PID and mount namespace.
+The purpose of this wrapper script is to enable restoring a process tree
+that might require a specific PID that is already used on the system;
+so called "PID mismatch" problem.
+
+SEE ALSO
+--------
+nsenter(1) namespaces(7) criu(8)
+
+AUTHOR
+------
+The CRIU team

From f70605ef1ea1609e554feb2e0138f64dfa044ff8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 26 Jul 2021 20:57:42 +0100
Subject: [PATCH 0681/1854] criu-ns: update script name in help message

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 4f7c3a6ec..5128c0bbc 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -224,7 +224,7 @@ if action == 'restore':
 elif action in ['dump', 'pre-dump']:
     res = wrap_dump()
 else:
-    print('Unsupported action {} for nswrap'.format(action))
+    print('Unsupported action {} for criu-ns'.format(action))
     res = -1
 
 sys.exit(res)

From 868bffba4d3e12d4c9193cfa2b8334a498be2391 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 26 Jul 2021 21:21:59 +0100
Subject: [PATCH 0682/1854] criu-ns: add top-level conditional execution

Execute actions only if run as a script.
https://docs.python.org/3/library/__main__.html

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 5128c0bbc..fea9b1315 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -205,7 +205,7 @@ def wrap_dump():
     return _wait_for_process_status(pid)
 
 
-if len(sys.argv) == 1:
+def show_usage():
     print("""
 Usage:
   {0} dump|pre-dump -t PID [<options>]
@@ -215,16 +215,20 @@ Usage:
   pre-dump       pre-dump task(s) minimizing their frozen time
   restore        restore a process/tree
 """.format(sys.argv[0]))
-    exit(1)
 
-action = sys.argv[1]
 
-if action == 'restore':
-    res = wrap_restore()
-elif action in ['dump', 'pre-dump']:
-    res = wrap_dump()
-else:
-    print('Unsupported action {} for criu-ns'.format(action))
-    res = -1
+if __name__ == "__main__":
+    if len(sys.argv) == 1:
+        show_usage()
+        exit(1)
 
-sys.exit(res)
+    action = sys.argv[1]
+    if action == 'restore':
+        res = wrap_restore()
+    elif action in ['dump', 'pre-dump']:
+        res = wrap_dump()
+    else:
+        print('Unsupported action {} for criu-ns'.format(action))
+        res = -1
+
+    sys.exit(res)

From 6be9345fb16b105350c36a777eea71abb2ac4526 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 26 Jul 2021 21:39:07 +0100
Subject: [PATCH 0683/1854] criu-ns: add support for 'check' action

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/criu-ns.txt | 2 ++
 scripts/criu-ns           | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Documentation/criu-ns.txt b/Documentation/criu-ns.txt
index 877f5b1fd..c6594a9bc 100644
--- a/Documentation/criu-ns.txt
+++ b/Documentation/criu-ns.txt
@@ -14,6 +14,8 @@ SYNOPSIS
 
 *criu-ns* 'restore' [<options>]
 
+*criu-ns* 'check' [<options>]
+
 DESCRIPTION
 -----------
 The *criu-ns* command executes 'criu' in a new PID and mount namespace.
diff --git a/scripts/criu-ns b/scripts/criu-ns
index fea9b1315..a97c0002b 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -214,6 +214,7 @@ Usage:
   dump           checkpoint a process/tree identified by pid
   pre-dump       pre-dump task(s) minimizing their frozen time
   restore        restore a process/tree
+  check          checks whether the kernel support is up-to-date
 """.format(sys.argv[0]))
 
 
@@ -227,6 +228,8 @@ if __name__ == "__main__":
         res = wrap_restore()
     elif action in ['dump', 'pre-dump']:
         res = wrap_dump()
+    elif action == 'check':
+        run_criu(sys.argv[1:])
     else:
         print('Unsupported action {} for criu-ns'.format(action))
         res = -1

From 80079fbb0d495428964c0836eaf46cf0f4dd8928 Mon Sep 17 00:00:00 2001
From: Liu Chao <liuchao173@huawei.com>
Date: Tue, 29 Jun 2021 02:02:51 +0000
Subject: [PATCH 0684/1854] criu: dump and restore notify_thread_id of posix
 timer

When sigev_notify_thread_id is not set, get_pid will return a NULL
pointer and do_timer_create will return -EINVAL in kernel. So criu
will failed to create posix timer:

(09.806760) pie: 41301: Error (criu/pie/restorer.c:1998): Can't restore posix timers -22
(09.806824) pie: 41301: Error (criu/pie/restorer.c:2133): Restorer fail 41301
(09.891880) Error (criu/cr-restore.c:2596): Restoring FAILED.

Signed-off-by: Liu Chao <liuchao173@huawei.com>
---
 criu/cr-restore.c          | 1 +
 criu/include/posix-timer.h | 1 +
 criu/parasite-syscall.c    | 1 +
 criu/pie/restorer.c        | 5 +++++
 criu/proc_parse.c          | 1 +
 images/timer.proto         | 1 +
 6 files changed, 10 insertions(+)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 7b6eec9ad..93765966c 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2798,6 +2798,7 @@ static inline int decode_posix_timer(PosixTimerEntry *pte,
 	pt->spt.si_signo = pte->si_signo;
 	pt->spt.it_sigev_notify = pte->it_sigev_notify;
 	pt->spt.sival_ptr = decode_pointer(pte->sival_ptr);
+	pt->spt.notify_thread_id = pte->notify_thread_id;
 	pt->overrun = pte->overrun;
 
 	return 0;
diff --git a/criu/include/posix-timer.h b/criu/include/posix-timer.h
index fa99d8628..139f5c9a5 100644
--- a/criu/include/posix-timer.h
+++ b/criu/include/posix-timer.h
@@ -8,6 +8,7 @@ struct str_posix_timer {
 	int clock_id;
 	int si_signo;
 	int it_sigev_notify;
+	int notify_thread_id;
 	void * sival_ptr;
 };
 
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 04364e5bf..6f07ccf1f 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -325,6 +325,7 @@ static void encode_posix_timer(struct posix_timer *v,
 	pte->clock_id = vp->spt.clock_id;
 	pte->si_signo = vp->spt.si_signo;
 	pte->it_sigev_notify = vp->spt.it_sigev_notify;
+	pte->notify_thread_id = vp->spt.notify_thread_id;
 	pte->sival_ptr = encode_pointer(vp->spt.sival_ptr);
 
 	pte->overrun = v->overrun;
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 310ce2754..de0cdb8f5 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1069,6 +1069,11 @@ static int create_posix_timers(struct task_restore_args *args)
 	for (i = 0; i < args->posix_timers_n; i++) {
 		sev.sigev_notify = args->posix_timers[i].spt.it_sigev_notify;
 		sev.sigev_signo = args->posix_timers[i].spt.si_signo;
+#ifdef __GLIBC__
+		sev._sigev_un._tid = args->posix_timers[i].spt.notify_thread_id;
+#else
+		sev.sigev_notify_thread_id = args->posix_timers[i].spt.notify_thread_id;
+#endif
 		sev.sigev_value.sival_ptr = args->posix_timers[i].spt.sival_ptr;
 
 		while (1) {
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 86debe2f5..3015b4703 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -2342,6 +2342,7 @@ int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat *args)
 
 			if ( tidpid[0] == 't') {
 				timer->spt.it_sigev_notify = SIGEV_THREAD_ID;
+				timer->spt.notify_thread_id = pid_t;
 			} else {
 				switch (sigpid[0]) {
 					case 's' :
diff --git a/images/timer.proto b/images/timer.proto
index 4eb5452b3..3b95562ab 100644
--- a/images/timer.proto
+++ b/images/timer.proto
@@ -21,6 +21,7 @@ message posix_timer_entry {
 	required uint64		insec		= 8;
 	required uint64		vsec		= 9;
 	required uint64		vnsec		= 10;
+	optional int32		notify_thread_id= 11;
 }
 
 message task_timers_entry {

From 61e1334ab01a862a72ac78c7c76b4de176d9a7fc Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 11 Jul 2021 04:48:52 +0300
Subject: [PATCH 0685/1854] proc_parse: get a thread ID in a thread pidns from
 /proc/pid/status

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/include/uapi/infect.h |  1 +
 criu/proc_parse.c            | 18 ++++++++++++++++--
 criu/seize.c                 |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 6cf3daf46..65564ae8f 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -19,6 +19,7 @@ struct seize_task_status {
 	unsigned long long	sigpnd;
 	unsigned long long	shdpnd;
 	char			state;
+	int			vpid;
 	int			ppid;
 	int			seccomp_mode;
 };
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 3015b4703..16a82abea 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1062,7 +1062,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 	if (bfdopenr(&f))
 		return -1;
 
-	while (done < 12) {
+	while (done < 13) {
 		str = breadline(&f);
 		if (str == NULL)
 			break;
@@ -1084,6 +1084,20 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 			continue;
 		}
 
+		if (!strncmp(str, "NSpid:", 6)) {
+			/* Get a thread ID in the thread PID namespace. */
+			char *last;
+
+			last = strrchr(str, '\t');
+			if (!last || sscanf(last, "%d", &cr->s.vpid) != 1) {
+				pr_err("Unable to parse: %s\n", str);
+				goto err_parse;
+			}
+
+			done++;
+			continue;
+		}
+
 		if (!strncmp(str, "Uid:", 4)) {
 			if (ids_parse(str + 5, cr->uids))
 				goto err_parse;
@@ -1165,7 +1179,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 	}
 
 	/* seccomp is optional */
-	if (done >= 11 || (done == 10 && !parsed_seccomp))
+	if (done >= 12 || (done == 11 && !parsed_seccomp))
 		ret = 0;
 
 err_parse:
diff --git a/criu/seize.c b/criu/seize.c
index f973806d9..e055a3796 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -816,6 +816,7 @@ static int collect_threads(struct pstree_item *item)
 
 		BUG_ON(item->nr_threads + 1 > nr_threads);
 		item->threads[item->nr_threads].real = pid;
+		item->threads[item->nr_threads].ns[0].virt = t_creds.s.vpid;
 		item->threads[item->nr_threads].item = NULL;
 		item->nr_threads++;
 

From 7eab5a7dc70d9af5461c440751b6a79b840d30a6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 11 Jul 2021 00:55:08 +0300
Subject: [PATCH 0686/1854] timers: save tid from a task pid namespace

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/parasite-syscall.c | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 6f07ccf1f..0df136a74 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -318,14 +318,13 @@ static int core_alloc_posix_timers(TaskTimersEntry *tte, int n,
 	return 0;
 }
 
-static void encode_posix_timer(struct posix_timer *v,
-		struct proc_posix_timer *vp, PosixTimerEntry *pte)
+static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v,
+			     struct proc_posix_timer *vp, PosixTimerEntry *pte)
 {
 	pte->it_id = vp->spt.it_id;
 	pte->clock_id = vp->spt.clock_id;
 	pte->si_signo = vp->spt.si_signo;
 	pte->it_sigev_notify = vp->spt.it_sigev_notify;
-	pte->notify_thread_id = vp->spt.notify_thread_id;
 	pte->sival_ptr = encode_pointer(vp->spt.sival_ptr);
 
 	pte->overrun = v->overrun;
@@ -334,6 +333,27 @@ static void encode_posix_timer(struct posix_timer *v,
 	pte->insec = v->val.it_interval.tv_nsec;
 	pte->vsec = v->val.it_value.tv_sec;
 	pte->vnsec = v->val.it_value.tv_nsec;
+	if (vp->spt.notify_thread_id != 0) {
+		pid_t vtid = 0, rtid = vp->spt.notify_thread_id;
+		int i;
+
+		for (i = 0; i < item->nr_threads; i++) {
+			if (item->threads[i].real != rtid)
+				continue;
+
+			vtid = item->threads[i].ns[0].virt;
+			break;
+		}
+
+		if (vtid == 0) {
+			pr_err("Unable to find the thread %d\n", rtid);
+			return -1;
+		}
+
+		pte->notify_thread_id = vtid;
+		pte->has_notify_thread_id = true;
+	}
+	return 0;
 }
 
 int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args,
@@ -344,8 +364,8 @@ int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args,
 	PosixTimerEntry *pte;
 	struct proc_posix_timer *temp;
 	struct parasite_dump_posix_timers_args *args;
+	int ret, exit_code = -1;
 	int args_size;
-	int ret = 0;
 	int i;
 
 	if (core_alloc_posix_timers(tte, proc_args->timer_n, &pte))
@@ -368,14 +388,16 @@ int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args,
 	i = 0;
 	list_for_each_entry(temp, &proc_args->timers, list) {
 		posix_timer_entry__init(&pte[i]);
-		encode_posix_timer(&args->timer[i], temp, &pte[i]);
+		if (encode_posix_timer(item, &args->timer[i], temp, &pte[i]))
+			goto end_posix;
 		tte->posix[i] = &pte[i];
 		i++;
 	}
 
+	exit_code = 0;
 end_posix:
 	free_posix_timers(proc_args);
-	return ret;
+	return exit_code;
 }
 
 int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc)

From 64f0012e44f816edd3528b6eda475d583d7180d9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 10 Jul 2021 21:06:01 +0300
Subject: [PATCH 0687/1854] zdtm: add a test for SIGEV_THREAD timers

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile         |  2 +
 test/zdtm/static/pthread_timers.c | 83 +++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 test/zdtm/static/pthread_timers.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index d168f385e..11a24d2e2 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -59,6 +59,7 @@ TST_NOFILE	:=				\
 		pthread00			\
 		pthread01			\
 		pthread02			\
+		pthread_timers			\
 		vdso00				\
 		vdso01				\
 		vdso02				\
@@ -520,6 +521,7 @@ inotify_system_nodel:	CFLAGS += -DNODEL
 pthread00:		LDLIBS += -pthread
 pthread01:		LDLIBS += -pthread
 pthread02:		LDLIBS += -pthread
+pthread_timers:		LDLIBS += -lrt -pthread
 different_creds:	LDLIBS += -pthread
 sigpending:		LDLIBS += -pthread
 sigaltstack:		LDLIBS += -pthread
diff --git a/test/zdtm/static/pthread_timers.c b/test/zdtm/static/pthread_timers.c
new file mode 100644
index 000000000..f4b183fc6
--- /dev/null
+++ b/test/zdtm/static/pthread_timers.c
@@ -0,0 +1,83 @@
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <time.h>
+
+#include <sys/eventfd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc	= "Check SIGEV_THREAD timers";
+const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+
+int efd;
+static void timer_func(union sigval sigval) {
+	long long int val = 1;
+
+	if (write(efd, &val, sizeof(val)) != sizeof(val)) {
+		pr_perror("write");
+		exit(1);
+	}
+}
+
+#define TEST_INTERVAL_NSEC 10000000
+
+int main(int argc, char **argv)
+{
+	struct sigevent evp = {};
+	struct itimerspec itimerspec = {};
+	long long val;
+	timer_t timerid;
+
+	test_init(argc, argv);
+
+	efd = eventfd(0, 0);
+	if (efd < 0) {
+		pr_perror("eventfd");
+		return 1;
+	}
+
+	evp.sigev_notify = SIGEV_THREAD;
+	evp.sigev_notify_function = timer_func;
+	itimerspec.it_interval.tv_nsec = TEST_INTERVAL_NSEC;
+	itimerspec.it_value.tv_nsec = TEST_INTERVAL_NSEC;
+
+	if (timer_create(CLOCK_MONOTONIC, &evp, &timerid)) {
+		pr_perror("timer_create");
+		exit(1);
+	}
+
+	if (timer_settime(timerid, 0, &itimerspec, NULL)) {
+		pr_perror("timer_create");
+		exit(1);
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (timer_gettime(timerid, &itimerspec)) {
+		pr_perror("timer_gettime");
+		exit(1);
+	}
+
+	if (itimerspec.it_interval.tv_nsec != TEST_INTERVAL_NSEC || itimerspec.it_interval.tv_sec) {
+		pr_perror("wrong interval: %ld:%ld", itimerspec.it_interval.tv_sec, itimerspec.it_interval.tv_nsec);
+		return 1;
+	}
+
+	/* Read old events. */
+	if (read(efd, &val, sizeof(val)) != sizeof(val)) {
+		pr_perror("read");
+		return 1;
+	}
+
+	/* Wait for new events. */
+	if (read(efd, &val, sizeof(val)) != sizeof(val)) {
+		pr_perror("read");
+		return 1;
+	}
+
+	pass();
+	return 0;
+}

From a692a0d0af41f65b46c1246f2b09f4c6af779dc0 Mon Sep 17 00:00:00 2001
From: Kirill Tkhai <ktkhai@virtuozzo.com>
Date: Mon, 10 Apr 2017 11:16:03 +0300
Subject: [PATCH 0688/1854] kerndat: Check that "/proc/[pid]/status" file has
 NS{pid, ..} lines

If there is nested pid_ns, we need to be able to get pid in
the whole pid hierarhy. This may be taken from "/proc/[pid]/status"
file only. Check, that kernel has support for it.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>

NSpid is not (yet) supported on Centos7 thus we need this check for
compatibility.

(cherry-picked from Virtuozzo criu commit
https://src.openvz.org/projects/OVZ/repos/criu/commits/94f4653f20)

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-check.c        | 13 +++++++++++++
 criu/include/kerndat.h |  3 +++
 criu/kerndat.c         | 31 +++++++++++++++++++++++++++++++
 criu/namespaces.c      |  1 +
 4 files changed, 48 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index fda17cc53..d35b1bffe 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1346,6 +1346,17 @@ static int check_pidfd_store(void)
 	return 0;
 }
 
+static int check_ns_pid(void)
+{
+	if (kerndat_has_nspid() < 0)
+		return -1;
+
+	if (!kdat.has_nspid)
+		return -1;
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1459,6 +1470,7 @@ int cr_check(void)
 		ret |= check_time_namespace();
 		ret |= check_newifindex();
 		ret |= check_pidfd_store();
+		ret |= check_ns_pid();
 	}
 
 	/*
@@ -1568,6 +1580,7 @@ static struct feature_list feature_list[] = {
 	{ "nftables", check_nftables_cr },
 	{ "has_ipt_legacy", check_ipt_legacy },
 	{ "pidfd_store", check_pidfd_store },
+	{ "ns_pid", check_ns_pid },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index df57ca185..97dbd17b3 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -71,6 +71,7 @@ struct kerndat_s {
 	bool has_newifindex;
 	bool has_pidfd_open;
 	bool has_pidfd_getfd;
+	bool has_nspid;
 };
 
 extern struct kerndat_s kdat;
@@ -91,4 +92,6 @@ enum {
  */
 extern int kerndat_fs_virtualized(unsigned int which, u32 kdev);
 
+extern int kerndat_has_nspid(void);
+
 #endif /* __CR_KERNDAT_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 1e0e2817b..f418f42bd 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1133,6 +1133,33 @@ out:
 	return ret;
 }
 
+int kerndat_has_nspid(void)
+{
+	struct bfd f;
+	int ret = -1;
+	char *str;
+
+	f.fd = open("/proc/self/status", O_RDONLY);
+	if (f.fd < 0) {
+		pr_perror("Can't open /proc/self/status");
+		return -1;
+	}
+	if (bfdopenr(&f))
+		return -1;
+	while ((str = breadline(&f)) != NULL) {
+		if (IS_ERR(str))
+			goto close;
+		if (!strncmp(str, "NSpid:", 6)) {
+			kdat.has_nspid = true;
+			break;
+		}
+	}
+	ret = 0;
+close:
+	bclose(&f);
+	return ret;
+}
+
 int kerndat_init(void)
 {
 	int ret;
@@ -1276,6 +1303,10 @@ int kerndat_init(void)
 	}
 	if (!ret)
 		kerndat_has_pidfd_open();
+	if (!ret && kerndat_has_nspid()) {
+		pr_err("kerndat_has_nspid failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/namespaces.c b/criu/namespaces.c
index aecc82f66..b441d2a60 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -27,6 +27,7 @@
 #include "net.h"
 #include "cgroup.h"
 #include "fdstore.h"
+#include "kerndat.h"
 
 #include "protobuf.h"
 #include "util.h"

From 91d7203b80314641ea20c3c118cdfb4d0b33d205 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 26 Jul 2021 10:56:01 +0300
Subject: [PATCH 0689/1854] proc_parse: make nspid field optional

On Centos7 we don't have NSpid field in /proc/[pid]/status so for
compatibility let's skip it.

(cherry-pick one hunk from Virtuozzo commit
https://src.openvz.org/projects/OVZ/repos/criu/commits/c6d0ee567c)

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/proc_parse.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 16a82abea..cdfefe361 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1050,6 +1050,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 	int ret = -1;
 	char *str;
 	bool parsed_seccomp = false;
+	int expected_done;
 
 	f.fd = open_proc(pid, "status");
 	if (f.fd < 0)
@@ -1178,8 +1179,11 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 		}
 	}
 
-	/* seccomp is optional */
-	if (done >= 12 || (done == 11 && !parsed_seccomp))
+	/* seccomp and nspids are optional */
+	expected_done = (parsed_seccomp ? 11 : 10);
+	if (kdat.has_nspid)
+		expected_done++;
+	if (done == expected_done)
 		ret = 0;
 
 err_parse:

From e1b1547c80f41bc309955edd6e69c6c87e4ae903 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 26 Jul 2021 11:29:58 +0300
Subject: [PATCH 0690/1854] posix-timers: fallback notify thread id encoding
 for non-pidns and non-nspid

1) If all dumped processes are in host pidns we can skip pid conversion
   logic and just use real pid.

2) If we have pidns to dump we should also have kernel NSpid feature,
   else we should fail to dump notify thread id, as it's not possible to
   properly convert rpid to vpid.

While on it let's put the code to encode_notify_thread_id helper to
improve code readability.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/parasite-syscall.c | 62 +++++++++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 0df136a74..2513dceec 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -318,6 +318,47 @@ static int core_alloc_posix_timers(TaskTimersEntry *tte, int n,
 	return 0;
 }
 
+static int encode_notify_thread_id(pid_t rtid,
+				   struct pstree_item *item,
+				   PosixTimerEntry *pte)
+{
+	pid_t vtid = 0;
+	int i;
+
+	if (rtid == 0)
+		return 0;
+
+	if (!(root_ns_mask & CLONE_NEWPID)) {
+		/* Non-pid-namespace case */
+		pte->notify_thread_id = rtid;
+		pte->has_notify_thread_id = true;
+		return 0;
+	}
+
+	/* Pid-namespace case */
+	if (!kdat.has_nspid) {
+		pr_err("Have no NSpid support to dump notify thread id in pid namespace\n");
+		return -1;
+	}
+
+	for (i = 0; i < item->nr_threads; i++) {
+		if (item->threads[i].real != rtid)
+			continue;
+
+		vtid = item->threads[i].ns[0].virt;
+		break;
+	}
+
+	if (vtid == 0) {
+		pr_err("Unable to convert the notify thread id %d\n", rtid);
+		return -1;
+	}
+
+	pte->notify_thread_id = vtid;
+	pte->has_notify_thread_id = true;
+	return 0;
+}
+
 static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v,
 			     struct proc_posix_timer *vp, PosixTimerEntry *pte)
 {
@@ -333,26 +374,11 @@ static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v,
 	pte->insec = v->val.it_interval.tv_nsec;
 	pte->vsec = v->val.it_value.tv_sec;
 	pte->vnsec = v->val.it_value.tv_nsec;
-	if (vp->spt.notify_thread_id != 0) {
-		pid_t vtid = 0, rtid = vp->spt.notify_thread_id;
-		int i;
 
-		for (i = 0; i < item->nr_threads; i++) {
-			if (item->threads[i].real != rtid)
-				continue;
+	if (encode_notify_thread_id(vp->spt.notify_thread_id,
+				    item, pte))
+		return -1;
 
-			vtid = item->threads[i].ns[0].virt;
-			break;
-		}
-
-		if (vtid == 0) {
-			pr_err("Unable to find the thread %d\n", rtid);
-			return -1;
-		}
-
-		pte->notify_thread_id = vtid;
-		pte->has_notify_thread_id = true;
-	}
 	return 0;
 }
 

From 918901439f662a7871099df8ae82d48a908e0097 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 26 Jul 2021 11:52:18 +0300
Subject: [PATCH 0691/1854] zdtm/pthread_timers: require ns_pid feature and add
 non-ns test

Resolving real pid to vpid for notify thread ids requires NSpid feature
supported by kernel, though in simple non-pid-ns case we can deal
without it, so add a requirement and split out the host test without the
requirement.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile              | 2 ++
 test/zdtm/static/pthread_timers.desc   | 1 +
 test/zdtm/static/pthread_timers_h.c    | 1 +
 test/zdtm/static/pthread_timers_h.desc | 1 +
 4 files changed, 5 insertions(+)
 create mode 100644 test/zdtm/static/pthread_timers.desc
 create mode 120000 test/zdtm/static/pthread_timers_h.c
 create mode 100644 test/zdtm/static/pthread_timers_h.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 11a24d2e2..cb919c016 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -60,6 +60,7 @@ TST_NOFILE	:=				\
 		pthread01			\
 		pthread02			\
 		pthread_timers			\
+		pthread_timers_h		\
 		vdso00				\
 		vdso01				\
 		vdso02				\
@@ -522,6 +523,7 @@ pthread00:		LDLIBS += -pthread
 pthread01:		LDLIBS += -pthread
 pthread02:		LDLIBS += -pthread
 pthread_timers:		LDLIBS += -lrt -pthread
+pthread_timers_h:	LDLIBS += -lrt -pthread
 different_creds:	LDLIBS += -pthread
 sigpending:		LDLIBS += -pthread
 sigaltstack:		LDLIBS += -pthread
diff --git a/test/zdtm/static/pthread_timers.desc b/test/zdtm/static/pthread_timers.desc
new file mode 100644
index 000000000..c0a31e06b
--- /dev/null
+++ b/test/zdtm/static/pthread_timers.desc
@@ -0,0 +1 @@
+{'feature': 'ns_pid'}
diff --git a/test/zdtm/static/pthread_timers_h.c b/test/zdtm/static/pthread_timers_h.c
new file mode 120000
index 000000000..09ac38c42
--- /dev/null
+++ b/test/zdtm/static/pthread_timers_h.c
@@ -0,0 +1 @@
+pthread_timers.c
\ No newline at end of file
diff --git a/test/zdtm/static/pthread_timers_h.desc b/test/zdtm/static/pthread_timers_h.desc
new file mode 100644
index 000000000..63df42aa6
--- /dev/null
+++ b/test/zdtm/static/pthread_timers_h.desc
@@ -0,0 +1 @@
+{'flavor': 'h'}

From 01fa34f1ebca0a3ee5fb39658ce2c210309f33ae Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 26 Jul 2021 13:42:28 +0000
Subject: [PATCH 0692/1854] ci: use pre-installed Podman

GitHub Actions already has Podman installed. No need to install it a
second time.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/podman-test.sh | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index cc878d6d1..5187c8d32 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -1,30 +1,6 @@
 #!/bin/bash
 set -x -e -o pipefail
 
-if [ ! -e /etc/lsb-release ]; then
-       # This expects to run on Ubuntu
-       exit 1
-fi
-
-#shellcheck disable=SC1091
-. /etc/lsb-release
-
-echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${DISTRIB_RELEASE}/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
-
-curl -sL "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${DISTRIB_RELEASE}/Release.key" | apt-key add -
-
-# podman conflicts with a man page from docker-ce
-# this is a podman packaging bug (https://github.com/containers/libpod/issues/4747)
-apt-get -y purge docker-ce || :
-
-./apt-install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    software-properties-common
-
-./apt-install podman containernetworking-plugins
-
 export SKIP_CI_TEST=1
 
 ./run-ci-tests.sh

From b32c8c6fe51dee3ca309ee0299a61a51f7b856ea Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 28 Jul 2021 10:58:05 +0300
Subject: [PATCH 0693/1854] posix-timers: fix getoverrun error handling

If retcode of dump_posix_timers is not zero it is treated as an error in
compel_rpc_sync. And currently we can return positive overrun of last
timer (if we are lucky and it is not zero) as retcode of function
dump_posix_timers, let's fix it. Also I don't see any point in putting
negative value into .overrun on error path, fix it too.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pie/parasite.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index d83978317..59e838544 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -157,12 +157,13 @@ static int dump_posix_timers(struct parasite_dump_posix_timers_args *args)
 			pr_err("sys_timer_gettime failed (%d)\n", ret);
 			return ret;
 		}
-		args->timer[i].overrun = sys_timer_getoverrun(args->timer[i].it_id);
-		ret = args->timer[i].overrun;
+		ret = sys_timer_getoverrun(args->timer[i].it_id);
 		if (ret < 0) {
 			pr_err("sys_timer_getoverrun failed (%d)\n", ret);
 			return ret;
 		}
+		args->timer[i].overrun = ret;
+		ret = 0;
 	}
 
 	return ret;

From d62e747e91ff5b40686e9a07a0f8ae64fbd461f6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 26 Jul 2021 09:23:38 +0000
Subject: [PATCH 0694/1854] ci: fix Fedora Rawhide

Fedora Rawhide updated to a glibc using clone3(). clone3() is, however,
not yet part of the seccomp filter. Unfortunately 'docker build' does
not allow dropping seccomp but luckily 'podman build' does.

This switches the Fedora Rawhide test to use Podman. Podman is part of
GitHub Actions and no additional packages need to be installed.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/fedora-rawhide-test.yml |  2 +-
 scripts/build/Makefile                    |  2 +-
 scripts/ci/Makefile                       | 20 ++++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/fedora-rawhide-test.yml b/.github/workflows/fedora-rawhide-test.yml
index 2ff8c1371..00bc3b2bd 100644
--- a/.github/workflows/fedora-rawhide-test.yml
+++ b/.github/workflows/fedora-rawhide-test.yml
@@ -9,4 +9,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run Fedora Rawhide Test
-      run: sudo -E make -C scripts/ci fedora-rawhide
+      run: sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 3ebece3df..62e3a9920 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -19,7 +19,7 @@ Dockerfile.%: Dockerfile.%.hdr Dockerfile.%.tmpl
 	cat $^ > $@
 
 $(CONTAINER_TARGETS):
-	$(CONTAINER_RUNTIME) build  -t criu-$@ -f Dockerfile.$@ $(DB_CC) ../..
+	$(CONTAINER_RUNTIME) build $(BUILD_OPTIONS) -t criu-$@ -f Dockerfile.$@ $(DB_CC) ../..
 .PHONY: $(CONTAINER_TARGETS)
 
 # Clang builds add some Docker build env
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index b6a2428a4..02b4d871c 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -14,8 +14,9 @@ endif
 TARGETS := alpine fedora-rawhide centos7 centos8 archlinux
 ZDTM_OPTIONS :=
 UNAME := $(shell uname -m)
-
 export UNAME
+CONTAINER_RUNTIME := docker
+export CONTAINER_RUNTIME
 
 alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap
 
@@ -45,8 +46,19 @@ else
 	CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
 endif
 
+ifeq ($(CONTAINER_RUNTIME),podman)
+	# Just as Docker needs to use devicemapper Podman needs vfs
+	# as graphdriver as overlayfs does not support all test cases
+	STORAGE_DRIVER := vfs
+	# Podman limits the number of processes in a container using cgroups.
+	# Disable it as it breaks the thread-bomb test
+	CONTAINER_OPTS += --pids-limit=0
+endif
+
+export STORAGE_DRIVER
+
 restart-docker:
-	if [ "$$UNAME" = "x86_64" ]; then \
+	if [ "$$UNAME" = "x86_64" ] && [ "$$CONTAINER_RUNTIME" = "docker" ]; then \
 		echo "$$DOCKER_JSON" > /etc/docker/daemon.json; \
 		cat /etc/docker/daemon.json; \
 		systemctl status docker; \
@@ -56,11 +68,11 @@ restart-docker:
 
 $(TARGETS): restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
+	$(CONTAINER_RUNTIME) run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
 
 fedora-asan: restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	docker run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS)
+	$(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS)
 
 docker-test:
 	./docker-test.sh

From cc2317ea4863f1783566fc505e4a3cfe57d29033 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 2 Aug 2021 12:00:49 +0300
Subject: [PATCH 0695/1854] zdtm: fix indentation in Makefile wait_stop target

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index cb919c016..01624705e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -495,8 +495,8 @@ WAIT_TIME=240
 	[ $$i -lt $(WAIT_TIME) ]
 
 wait_stop:
-		i=0; \
-		while [ $$i -lt $(WAIT_TIME) ] ; do \
+	i=0; \
+	while [ $$i -lt $(WAIT_TIME) ] ; do \
 		kill -0 `awk '{print}' *.pid 2>/dev/null` 2>/dev/null || break; \
 		sleep 1; \
 		i=`expr $$i + 1`; \

From 1e26f170caa8b2c26f5d09a78ffe9fdea70d38d0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 26 Jun 2021 17:19:43 +0000
Subject: [PATCH 0696/1854] criu: introduce clang-format to format source code

This is another attempt to introduce a tool to format CRIU's source
code. This time it is based on clang-format.

The .clang-format file is taken from the linux kernel git tree (5.13).

I removed all comments from lines which state that it requires at least
clang-format 4 or 5. For this resulting file at least clang-format 11
is required. See scripts/fetch-clang-format.sh for all the changes
done to the Linux kernel .clang-format file.

Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .clang-format                 | 563 ++++++++++++++++++++++++++++++++++
 Makefile                      |  12 +-
 scripts/fetch-clang-format.sh |  15 +
 3 files changed, 589 insertions(+), 1 deletion(-)
 create mode 100644 .clang-format
 create mode 100755 scripts/fetch-clang-format.sh

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..dd4ade370
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,563 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# clang-format configuration file. Intended for clang-format >= 11.
+#
+# For more information, see:
+#
+#   Documentation/process/clang-format.rst
+#   https://clang.llvm.org/docs/ClangFormat.html
+#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#
+---
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left # Unknown to clang-format-4.0
+AlignOperands: true
+AlignTrailingComments: false
+AlignConsecutiveMacros: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false # Unknown to clang-format-5.0
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: true # Unknown to clang-format-4.0
+  SplitEmptyRecord: true # Unknown to clang-format-4.0
+  SplitEmptyNamespace: true # Unknown to clang-format-4.0
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit: 120
+CommentPragmas: '^ IWYU pragma:'
+CompactNamespaces: false # Unknown to clang-format-4.0
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 8
+ContinuationIndentWidth: 8
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false # Unknown to clang-format-4.0
+
+# Taken from:
+#   git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \
+#   | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$,  - '\1'," \
+#   | sort | uniq
+ForEachMacros:
+  - 'for_each_pstree_item'
+  - 'apei_estatus_for_each_section'
+  - 'ata_for_each_dev'
+  - 'ata_for_each_link'
+  - '__ata_qc_for_each'
+  - 'ata_qc_for_each'
+  - 'ata_qc_for_each_raw'
+  - 'ata_qc_for_each_with_internal'
+  - 'ax25_for_each'
+  - 'ax25_uid_for_each'
+  - '__bio_for_each_bvec'
+  - 'bio_for_each_bvec'
+  - 'bio_for_each_bvec_all'
+  - 'bio_for_each_integrity_vec'
+  - '__bio_for_each_segment'
+  - 'bio_for_each_segment'
+  - 'bio_for_each_segment_all'
+  - 'bio_list_for_each'
+  - 'bip_for_each_vec'
+  - 'bitmap_for_each_clear_region'
+  - 'bitmap_for_each_set_region'
+  - 'blkg_for_each_descendant_post'
+  - 'blkg_for_each_descendant_pre'
+  - 'blk_queue_for_each_rl'
+  - 'bond_for_each_slave'
+  - 'bond_for_each_slave_rcu'
+  - 'bpf_for_each_spilled_reg'
+  - 'btree_for_each_safe128'
+  - 'btree_for_each_safe32'
+  - 'btree_for_each_safe64'
+  - 'btree_for_each_safel'
+  - 'card_for_each_dev'
+  - 'cgroup_taskset_for_each'
+  - 'cgroup_taskset_for_each_leader'
+  - 'cpufreq_for_each_entry'
+  - 'cpufreq_for_each_entry_idx'
+  - 'cpufreq_for_each_valid_entry'
+  - 'cpufreq_for_each_valid_entry_idx'
+  - 'css_for_each_child'
+  - 'css_for_each_descendant_post'
+  - 'css_for_each_descendant_pre'
+  - 'device_for_each_child_node'
+  - 'displayid_iter_for_each'
+  - 'dma_fence_chain_for_each'
+  - 'do_for_each_ftrace_op'
+  - 'drm_atomic_crtc_for_each_plane'
+  - 'drm_atomic_crtc_state_for_each_plane'
+  - 'drm_atomic_crtc_state_for_each_plane_state'
+  - 'drm_atomic_for_each_plane_damage'
+  - 'drm_client_for_each_connector_iter'
+  - 'drm_client_for_each_modeset'
+  - 'drm_connector_for_each_possible_encoder'
+  - 'drm_for_each_bridge_in_chain'
+  - 'drm_for_each_connector_iter'
+  - 'drm_for_each_crtc'
+  - 'drm_for_each_crtc_reverse'
+  - 'drm_for_each_encoder'
+  - 'drm_for_each_encoder_mask'
+  - 'drm_for_each_fb'
+  - 'drm_for_each_legacy_plane'
+  - 'drm_for_each_plane'
+  - 'drm_for_each_plane_mask'
+  - 'drm_for_each_privobj'
+  - 'drm_mm_for_each_hole'
+  - 'drm_mm_for_each_node'
+  - 'drm_mm_for_each_node_in_range'
+  - 'drm_mm_for_each_node_safe'
+  - 'flow_action_for_each'
+  - 'for_each_acpi_dev_match'
+  - 'for_each_active_dev_scope'
+  - 'for_each_active_drhd_unit'
+  - 'for_each_active_iommu'
+  - 'for_each_aggr_pgid'
+  - 'for_each_available_child_of_node'
+  - 'for_each_bio'
+  - 'for_each_board_func_rsrc'
+  - 'for_each_bvec'
+  - 'for_each_card_auxs'
+  - 'for_each_card_auxs_safe'
+  - 'for_each_card_components'
+  - 'for_each_card_dapms'
+  - 'for_each_card_pre_auxs'
+  - 'for_each_card_prelinks'
+  - 'for_each_card_rtds'
+  - 'for_each_card_rtds_safe'
+  - 'for_each_card_widgets'
+  - 'for_each_card_widgets_safe'
+  - 'for_each_cgroup_storage_type'
+  - 'for_each_child_of_node'
+  - 'for_each_clear_bit'
+  - 'for_each_clear_bit_from'
+  - 'for_each_cmsghdr'
+  - 'for_each_compatible_node'
+  - 'for_each_component_dais'
+  - 'for_each_component_dais_safe'
+  - 'for_each_comp_order'
+  - 'for_each_console'
+  - 'for_each_cpu'
+  - 'for_each_cpu_and'
+  - 'for_each_cpu_not'
+  - 'for_each_cpu_wrap'
+  - 'for_each_dapm_widgets'
+  - 'for_each_dev_addr'
+  - 'for_each_dev_scope'
+  - 'for_each_dma_cap_mask'
+  - 'for_each_dpcm_be'
+  - 'for_each_dpcm_be_rollback'
+  - 'for_each_dpcm_be_safe'
+  - 'for_each_dpcm_fe'
+  - 'for_each_drhd_unit'
+  - 'for_each_dss_dev'
+  - 'for_each_dtpm_table'
+  - 'for_each_efi_memory_desc'
+  - 'for_each_efi_memory_desc_in_map'
+  - 'for_each_element'
+  - 'for_each_element_extid'
+  - 'for_each_element_id'
+  - 'for_each_endpoint_of_node'
+  - 'for_each_evictable_lru'
+  - 'for_each_fib6_node_rt_rcu'
+  - 'for_each_fib6_walker_rt'
+  - 'for_each_free_mem_pfn_range_in_zone'
+  - 'for_each_free_mem_pfn_range_in_zone_from'
+  - 'for_each_free_mem_range'
+  - 'for_each_free_mem_range_reverse'
+  - 'for_each_func_rsrc'
+  - 'for_each_hstate'
+  - 'for_each_if'
+  - 'for_each_iommu'
+  - 'for_each_ip_tunnel_rcu'
+  - 'for_each_irq_nr'
+  - 'for_each_link_codecs'
+  - 'for_each_link_cpus'
+  - 'for_each_link_platforms'
+  - 'for_each_lru'
+  - 'for_each_matching_node'
+  - 'for_each_matching_node_and_match'
+  - 'for_each_member'
+  - 'for_each_memcg_cache_index'
+  - 'for_each_mem_pfn_range'
+  - '__for_each_mem_range'
+  - 'for_each_mem_range'
+  - '__for_each_mem_range_rev'
+  - 'for_each_mem_range_rev'
+  - 'for_each_mem_region'
+  - 'for_each_migratetype_order'
+  - 'for_each_msi_entry'
+  - 'for_each_msi_entry_safe'
+  - 'for_each_msi_vector'
+  - 'for_each_net'
+  - 'for_each_net_continue_reverse'
+  - 'for_each_netdev'
+  - 'for_each_netdev_continue'
+  - 'for_each_netdev_continue_rcu'
+  - 'for_each_netdev_continue_reverse'
+  - 'for_each_netdev_feature'
+  - 'for_each_netdev_in_bond_rcu'
+  - 'for_each_netdev_rcu'
+  - 'for_each_netdev_reverse'
+  - 'for_each_netdev_safe'
+  - 'for_each_net_rcu'
+  - 'for_each_new_connector_in_state'
+  - 'for_each_new_crtc_in_state'
+  - 'for_each_new_mst_mgr_in_state'
+  - 'for_each_new_plane_in_state'
+  - 'for_each_new_private_obj_in_state'
+  - 'for_each_node'
+  - 'for_each_node_by_name'
+  - 'for_each_node_by_type'
+  - 'for_each_node_mask'
+  - 'for_each_node_state'
+  - 'for_each_node_with_cpus'
+  - 'for_each_node_with_property'
+  - 'for_each_nonreserved_multicast_dest_pgid'
+  - 'for_each_of_allnodes'
+  - 'for_each_of_allnodes_from'
+  - 'for_each_of_cpu_node'
+  - 'for_each_of_pci_range'
+  - 'for_each_old_connector_in_state'
+  - 'for_each_old_crtc_in_state'
+  - 'for_each_old_mst_mgr_in_state'
+  - 'for_each_oldnew_connector_in_state'
+  - 'for_each_oldnew_crtc_in_state'
+  - 'for_each_oldnew_mst_mgr_in_state'
+  - 'for_each_oldnew_plane_in_state'
+  - 'for_each_oldnew_plane_in_state_reverse'
+  - 'for_each_oldnew_private_obj_in_state'
+  - 'for_each_old_plane_in_state'
+  - 'for_each_old_private_obj_in_state'
+  - 'for_each_online_cpu'
+  - 'for_each_online_node'
+  - 'for_each_online_pgdat'
+  - 'for_each_pci_bridge'
+  - 'for_each_pci_dev'
+  - 'for_each_pci_msi_entry'
+  - 'for_each_pcm_streams'
+  - 'for_each_physmem_range'
+  - 'for_each_populated_zone'
+  - 'for_each_possible_cpu'
+  - 'for_each_present_cpu'
+  - 'for_each_prime_number'
+  - 'for_each_prime_number_from'
+  - 'for_each_process'
+  - 'for_each_process_thread'
+  - 'for_each_prop_codec_conf'
+  - 'for_each_prop_dai_codec'
+  - 'for_each_prop_dai_cpu'
+  - 'for_each_prop_dlc_codecs'
+  - 'for_each_prop_dlc_cpus'
+  - 'for_each_prop_dlc_platforms'
+  - 'for_each_property_of_node'
+  - 'for_each_registered_fb'
+  - 'for_each_requested_gpio'
+  - 'for_each_requested_gpio_in_range'
+  - 'for_each_reserved_mem_range'
+  - 'for_each_reserved_mem_region'
+  - 'for_each_rtd_codec_dais'
+  - 'for_each_rtd_components'
+  - 'for_each_rtd_cpu_dais'
+  - 'for_each_rtd_dais'
+  - 'for_each_set_bit'
+  - 'for_each_set_bit_from'
+  - 'for_each_set_clump8'
+  - 'for_each_sg'
+  - 'for_each_sg_dma_page'
+  - 'for_each_sg_page'
+  - 'for_each_sgtable_dma_page'
+  - 'for_each_sgtable_dma_sg'
+  - 'for_each_sgtable_page'
+  - 'for_each_sgtable_sg'
+  - 'for_each_sibling_event'
+  - 'for_each_subelement'
+  - 'for_each_subelement_extid'
+  - 'for_each_subelement_id'
+  - '__for_each_thread'
+  - 'for_each_thread'
+  - 'for_each_unicast_dest_pgid'
+  - 'for_each_vsi'
+  - 'for_each_wakeup_source'
+  - 'for_each_zone'
+  - 'for_each_zone_zonelist'
+  - 'for_each_zone_zonelist_nodemask'
+  - 'fwnode_for_each_available_child_node'
+  - 'fwnode_for_each_child_node'
+  - 'fwnode_graph_for_each_endpoint'
+  - 'gadget_for_each_ep'
+  - 'genradix_for_each'
+  - 'genradix_for_each_from'
+  - 'hash_for_each'
+  - 'hash_for_each_possible'
+  - 'hash_for_each_possible_rcu'
+  - 'hash_for_each_possible_rcu_notrace'
+  - 'hash_for_each_possible_safe'
+  - 'hash_for_each_rcu'
+  - 'hash_for_each_safe'
+  - 'hctx_for_each_ctx'
+  - 'hlist_bl_for_each_entry'
+  - 'hlist_bl_for_each_entry_rcu'
+  - 'hlist_bl_for_each_entry_safe'
+  - 'hlist_for_each'
+  - 'hlist_for_each_entry'
+  - 'hlist_for_each_entry_continue'
+  - 'hlist_for_each_entry_continue_rcu'
+  - 'hlist_for_each_entry_continue_rcu_bh'
+  - 'hlist_for_each_entry_from'
+  - 'hlist_for_each_entry_from_rcu'
+  - 'hlist_for_each_entry_rcu'
+  - 'hlist_for_each_entry_rcu_bh'
+  - 'hlist_for_each_entry_rcu_notrace'
+  - 'hlist_for_each_entry_safe'
+  - 'hlist_for_each_entry_srcu'
+  - '__hlist_for_each_rcu'
+  - 'hlist_for_each_safe'
+  - 'hlist_nulls_for_each_entry'
+  - 'hlist_nulls_for_each_entry_from'
+  - 'hlist_nulls_for_each_entry_rcu'
+  - 'hlist_nulls_for_each_entry_safe'
+  - 'i3c_bus_for_each_i2cdev'
+  - 'i3c_bus_for_each_i3cdev'
+  - 'ide_host_for_each_port'
+  - 'ide_port_for_each_dev'
+  - 'ide_port_for_each_present_dev'
+  - 'idr_for_each_entry'
+  - 'idr_for_each_entry_continue'
+  - 'idr_for_each_entry_continue_ul'
+  - 'idr_for_each_entry_ul'
+  - 'in_dev_for_each_ifa_rcu'
+  - 'in_dev_for_each_ifa_rtnl'
+  - 'inet_bind_bucket_for_each'
+  - 'inet_lhash2_for_each_icsk_rcu'
+  - 'key_for_each'
+  - 'key_for_each_safe'
+  - 'klp_for_each_func'
+  - 'klp_for_each_func_safe'
+  - 'klp_for_each_func_static'
+  - 'klp_for_each_object'
+  - 'klp_for_each_object_safe'
+  - 'klp_for_each_object_static'
+  - 'kunit_suite_for_each_test_case'
+  - 'kvm_for_each_memslot'
+  - 'kvm_for_each_vcpu'
+  - 'list_for_each'
+  - 'list_for_each_codec'
+  - 'list_for_each_codec_safe'
+  - 'list_for_each_continue'
+  - 'list_for_each_entry'
+  - 'list_for_each_entry_continue'
+  - 'list_for_each_entry_continue_rcu'
+  - 'list_for_each_entry_continue_reverse'
+  - 'list_for_each_entry_from'
+  - 'list_for_each_entry_from_rcu'
+  - 'list_for_each_entry_from_reverse'
+  - 'list_for_each_entry_lockless'
+  - 'list_for_each_entry_rcu'
+  - 'list_for_each_entry_reverse'
+  - 'list_for_each_entry_safe'
+  - 'list_for_each_entry_safe_continue'
+  - 'list_for_each_entry_safe_from'
+  - 'list_for_each_entry_safe_reverse'
+  - 'list_for_each_entry_srcu'
+  - 'list_for_each_prev'
+  - 'list_for_each_prev_safe'
+  - 'list_for_each_safe'
+  - 'llist_for_each'
+  - 'llist_for_each_entry'
+  - 'llist_for_each_entry_safe'
+  - 'llist_for_each_safe'
+  - 'mci_for_each_dimm'
+  - 'media_device_for_each_entity'
+  - 'media_device_for_each_intf'
+  - 'media_device_for_each_link'
+  - 'media_device_for_each_pad'
+  - 'nanddev_io_for_each_page'
+  - 'netdev_for_each_lower_dev'
+  - 'netdev_for_each_lower_private'
+  - 'netdev_for_each_lower_private_rcu'
+  - 'netdev_for_each_mc_addr'
+  - 'netdev_for_each_uc_addr'
+  - 'netdev_for_each_upper_dev_rcu'
+  - 'netdev_hw_addr_list_for_each'
+  - 'nft_rule_for_each_expr'
+  - 'nla_for_each_attr'
+  - 'nla_for_each_nested'
+  - 'nlmsg_for_each_attr'
+  - 'nlmsg_for_each_msg'
+  - 'nr_neigh_for_each'
+  - 'nr_neigh_for_each_safe'
+  - 'nr_node_for_each'
+  - 'nr_node_for_each_safe'
+  - 'of_for_each_phandle'
+  - 'of_property_for_each_string'
+  - 'of_property_for_each_u32'
+  - 'pci_bus_for_each_resource'
+  - 'pcl_for_each_chunk'
+  - 'pcl_for_each_segment'
+  - 'pcm_for_each_format'
+  - 'ping_portaddr_for_each_entry'
+  - 'plist_for_each'
+  - 'plist_for_each_continue'
+  - 'plist_for_each_entry'
+  - 'plist_for_each_entry_continue'
+  - 'plist_for_each_entry_safe'
+  - 'plist_for_each_safe'
+  - 'pnp_for_each_card'
+  - 'pnp_for_each_dev'
+  - 'protocol_for_each_card'
+  - 'protocol_for_each_dev'
+  - 'queue_for_each_hw_ctx'
+  - 'radix_tree_for_each_slot'
+  - 'radix_tree_for_each_tagged'
+  - 'rb_for_each'
+  - 'rbtree_postorder_for_each_entry_safe'
+  - 'rdma_for_each_block'
+  - 'rdma_for_each_port'
+  - 'rdma_umem_for_each_dma_block'
+  - 'resource_list_for_each_entry'
+  - 'resource_list_for_each_entry_safe'
+  - 'rhl_for_each_entry_rcu'
+  - 'rhl_for_each_rcu'
+  - 'rht_for_each'
+  - 'rht_for_each_entry'
+  - 'rht_for_each_entry_from'
+  - 'rht_for_each_entry_rcu'
+  - 'rht_for_each_entry_rcu_from'
+  - 'rht_for_each_entry_safe'
+  - 'rht_for_each_from'
+  - 'rht_for_each_rcu'
+  - 'rht_for_each_rcu_from'
+  - '__rq_for_each_bio'
+  - 'rq_for_each_bvec'
+  - 'rq_for_each_segment'
+  - 'scsi_for_each_prot_sg'
+  - 'scsi_for_each_sg'
+  - 'sctp_for_each_hentry'
+  - 'sctp_skb_for_each'
+  - 'shdma_for_each_chan'
+  - '__shost_for_each_device'
+  - 'shost_for_each_device'
+  - 'sk_for_each'
+  - 'sk_for_each_bound'
+  - 'sk_for_each_entry_offset_rcu'
+  - 'sk_for_each_from'
+  - 'sk_for_each_rcu'
+  - 'sk_for_each_safe'
+  - 'sk_nulls_for_each'
+  - 'sk_nulls_for_each_from'
+  - 'sk_nulls_for_each_rcu'
+  - 'snd_array_for_each'
+  - 'snd_pcm_group_for_each_entry'
+  - 'snd_soc_dapm_widget_for_each_path'
+  - 'snd_soc_dapm_widget_for_each_path_safe'
+  - 'snd_soc_dapm_widget_for_each_sink_path'
+  - 'snd_soc_dapm_widget_for_each_source_path'
+  - 'tb_property_for_each'
+  - 'tcf_exts_for_each_action'
+  - 'udp_portaddr_for_each_entry'
+  - 'udp_portaddr_for_each_entry_rcu'
+  - 'usb_hub_for_each_child'
+  - 'v4l2_device_for_each_subdev'
+  - 'v4l2_m2m_for_each_dst_buf'
+  - 'v4l2_m2m_for_each_dst_buf_safe'
+  - 'v4l2_m2m_for_each_src_buf'
+  - 'v4l2_m2m_for_each_src_buf_safe'
+  - 'virtio_device_for_each_vq'
+  - 'while_for_each_ftrace_op'
+  - 'xa_for_each'
+  - 'xa_for_each_marked'
+  - 'xa_for_each_range'
+  - 'xa_for_each_start'
+  - 'xas_for_each'
+  - 'xas_for_each_conflict'
+  - 'xas_for_each_marked'
+  - 'xbc_array_for_each_value'
+  - 'xbc_for_each_key_value'
+  - 'xbc_node_for_each_array_value'
+  - 'xbc_node_for_each_child'
+  - 'xbc_node_for_each_key_value'
+  - 'zorro_for_each_dev'
+
+IncludeBlocks: Preserve # Unknown to clang-format-5.0
+IncludeCategories:
+  - Regex: '.*'
+    Priority: 1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None # Unknown to clang-format-5.0
+IndentWidth: 8
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
+ObjCBlockIndentWidth: 8
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+
+# Taken from git's rules
+PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 60
+
+PointerAlignment: Right
+ReflowComments: false
+SortIncludes: false
+SortUsingDeclarations: false # Unknown to clang-format-4.0
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
+SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
+SpaceBeforeParens: ControlStatementsExceptForEachMacros
+SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp03
+TabWidth: 8
+UseTab: Always
+...
diff --git a/Makefile b/Makefile
index eb0063623..17e40bbf4 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,7 @@ criu-deps	+= include/common/asm
 #
 # Configure variables.
 export CONFIG_HEADER := include/common/config.h
-ifeq ($(filter tags etags cscope clean mrproper,$(MAKECMDGOALS)),)
+ifeq ($(filter tags etags cscope clean lint indent fetch-clang-format help mrproper,$(MAKECMDGOALS)),)
 include Makefile.config
 else
 # To clean all files, enable make/build options here
@@ -398,6 +398,8 @@ help:
 	@echo '      test            - Run zdtm test-suite'
 	@echo '      gcov            - Make code coverage report'
 	@echo '      unittest        - Run unit tests'
+	@echo '      lint            - Run code linters'
+	@echo '      indent          - Indent C code'
 .PHONY: help
 
 lint:
@@ -429,6 +431,14 @@ codecov:
 	bash <(curl -s https://codecov.io/bash)
 .PHONY: codecov
 
+fetch-clang-format: .FORCE
+	$(E) ".clang-format"
+	$(Q) scripts/fetch-clang-format.sh
+
+indent:
+	find . -name '*.[ch]' -type f -print0 | xargs --null --max-args 128 --max-procs 4 clang-format -i
+.PHONY: indent
+
 include Makefile.install
 
 .DEFAULT_GOAL := all
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
new file mode 100755
index 000000000..c9006c518
--- /dev/null
+++ b/scripts/fetch-clang-format.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# This script fetches .clang-format from the Linux kernel
+# and slightly adapts it for CRIU.
+
+URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/.clang-format?h=v5.13"
+
+curl -s "${URL}" | sed -e "
+	s,^\( *\)#\([A-Z]\),\1\2,g;
+	s,ControlStatements,ControlStatementsExceptForEachMacros,g;
+	s,ColumnLimit: 80,ColumnLimit: 120,g;
+	s,Intended for clang-format >= 4,Intended for clang-format >= 11,g;
+	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;
+	s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
+"  > .clang-format

From 93dd984ca0ee0e31a5650f64328222e748152bcb Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 19 Jul 2021 07:28:38 +0000
Subject: [PATCH 0697/1854] Run 'make indent' on all C files

Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/arch/aarch64/src/lib/cpu.c             |  25 +-
 compel/arch/aarch64/src/lib/handle-elf.c      |  10 +-
 compel/arch/aarch64/src/lib/infect.c          |  46 +-
 compel/arch/arm/src/lib/handle-elf.c          |   5 +-
 compel/arch/arm/src/lib/infect.c              |  46 +-
 compel/arch/mips/src/lib/cpu.c                |  13 +-
 compel/arch/mips/src/lib/handle-elf.c         |   5 +-
 compel/arch/mips/src/lib/infect.c             |  68 +-
 compel/arch/ppc64/src/lib/cpu.c               |  20 +-
 compel/arch/ppc64/src/lib/handle-elf.c        |  10 +-
 compel/arch/ppc64/src/lib/infect.c            | 130 ++--
 .../s390/plugins/std/syscalls/syscalls-s390.c |   5 +-
 compel/arch/s390/src/lib/cpu.c                |  20 +-
 compel/arch/s390/src/lib/handle-elf.c         |   5 +-
 compel/arch/s390/src/lib/infect.c             | 115 ++--
 .../arch/x86/plugins/std/syscalls/syscall32.c |  42 +-
 compel/arch/x86/src/lib/cpu.c                 | 107 ++--
 compel/arch/x86/src/lib/handle-elf.c          |   5 +-
 compel/arch/x86/src/lib/infect.c              | 195 +++---
 compel/arch/x86/src/lib/thread_area.c         |   8 +-
 compel/plugins/fds/fds.c                      |   4 +-
 compel/plugins/shmem/shmem.c                  |   3 +-
 compel/plugins/std/fds.c                      |   4 +-
 compel/plugins/std/infect.c                   |  26 +-
 compel/plugins/std/std.c                      |   6 +-
 compel/plugins/std/string.c                   |  23 +-
 compel/src/lib/handle-elf.c                   | 267 ++++----
 compel/src/lib/infect-rpc.c                   |  12 +-
 compel/src/lib/infect.c                       | 168 ++---
 compel/src/lib/ptrace.c                       |   6 +-
 compel/src/main.c                             | 102 ++-
 compel/test/fdspy/parasite.c                  |  16 +-
 compel/test/fdspy/spy.c                       |  24 +-
 compel/test/infect/parasite.c                 |  13 +-
 compel/test/infect/spy.c                      |  26 +-
 compel/test/rsys/spy.c                        |  22 +-
 criu/action-scripts.c                         |  39 +-
 criu/aio.c                                    |  11 +-
 criu/arch/aarch64/cpu.c                       |   2 +-
 criu/arch/aarch64/crtools.c                   |  20 +-
 criu/arch/aarch64/sigframe.c                  |   3 +-
 criu/arch/aarch64/vdso-pie.c                  |  15 +-
 criu/arch/arm/cpu.c                           |   2 +-
 criu/arch/arm/crtools.c                       |   9 +-
 criu/arch/arm/restorer.c                      |   6 +-
 criu/arch/arm/sigframe.c                      |   3 +-
 criu/arch/arm/vdso-pie.c                      |  28 +-
 criu/arch/mips/cpu.c                          |   2 +-
 criu/arch/mips/crtools.c                      |   2 -
 criu/arch/mips/restorer.c                     |   8 +-
 criu/arch/mips/sigaction_compat.c             |   3 +-
 criu/arch/mips/sigframe.c                     |   3 +-
 criu/arch/mips/vdso-pie.c                     |  28 +-
 criu/arch/ppc64/cpu.c                         |  34 +-
 criu/arch/ppc64/crtools.c                     | 102 ++-
 criu/arch/ppc64/restorer.c                    |  52 +-
 criu/arch/ppc64/sigframe.c                    |  13 +-
 criu/arch/ppc64/vdso-pie.c                    |  77 +--
 criu/arch/s390/cpu.c                          |  29 +-
 criu/arch/s390/crtools.c                      |  42 +-
 criu/arch/s390/restorer.c                     |  13 +-
 criu/arch/s390/sigframe.c                     |   3 +-
 criu/arch/s390/vdso-pie.c                     |  34 +-
 criu/arch/x86/cpu.c                           | 233 +++----
 criu/arch/x86/crtools.c                       | 338 +++++-----
 criu/arch/x86/kerndat.c                       |  27 +-
 criu/arch/x86/restorer.c                      |  27 +-
 criu/arch/x86/sigaction_compat.c              |  34 +-
 criu/arch/x86/sigframe.c                      |  16 +-
 criu/arch/x86/sys-exec-tbl.c                  |  12 +-
 criu/arch/x86/vdso-pie.c                      |  44 +-
 criu/autofs.c                                 | 140 ++---
 criu/bfd.c                                    |   9 +-
 criu/bitmap.c                                 |  11 +-
 criu/bpfmap.c                                 |  84 +--
 criu/cgroup-props.c                           | 218 +++----
 criu/cgroup.c                                 | 127 ++--
 criu/clone-noasan.c                           |   3 +-
 criu/config.c                                 | 333 +++++-----
 criu/cr-check.c                               |  95 ++-
 criu/cr-dedup.c                               |  10 +-
 criu/cr-dump.c                                |  88 +--
 criu/cr-restore.c                             | 297 +++------
 criu/cr-service.c                             |  79 +--
 criu/crtools.c                                | 398 ++++++------
 criu/eventfd.c                                |  19 +-
 criu/eventpoll.c                              | 149 +++--
 criu/fdstore.c                                |   8 +-
 criu/fifo.c                                   |  41 +-
 criu/file-ids.c                               |  13 +-
 criu/file-lock.c                              |  81 +--
 criu/files-ext.c                              |  18 +-
 criu/files-reg.c                              | 300 ++++-----
 criu/files.c                                  | 123 ++--
 criu/filesystems.c                            | 135 ++--
 criu/fsnotify.c                               | 167 ++---
 criu/image-desc.c                             |  18 +-
 criu/image.c                                  |  16 +-
 criu/img-streamer.c                           |  28 +-
 criu/ipc_ns.c                                 |  80 ++-
 criu/irmap.c                                  |  55 +-
 criu/kcmp-ids.c                               |  47 +-
 criu/kerndat.c                                |  84 ++-
 criu/libnetlink.c                             |  53 +-
 criu/log.c                                    |  36 +-
 criu/lsm.c                                    |   3 +-
 criu/mem.c                                    | 159 ++---
 criu/memfd.c                                  |  58 +-
 criu/mount.c                                  | 406 +++++-------
 criu/namespaces.c                             | 119 ++--
 criu/net.c                                    | 449 ++++++-------
 criu/netfilter.c                              |  51 +-
 criu/page-pipe.c                              |  54 +-
 criu/page-xfer.c                              | 198 +++---
 criu/pagemap-cache.c                          |  36 +-
 criu/pagemap.c                                | 107 ++--
 criu/parasite-syscall.c                       |  76 +--
 criu/path.c                                   |   3 +-
 criu/pidfd-store.c                            |  10 +-
 criu/pie/parasite-vdso.c                      |  57 +-
 criu/pie/parasite.c                           | 102 ++-
 criu/pie/restorer.c                           | 282 ++++-----
 criu/pie/util-vdso.c                          |  57 +-
 criu/pie/util.c                               |   6 +-
 criu/pipes.c                                  |  63 +-
 criu/plugin.c                                 |  48 +-
 criu/proc_parse.c                             | 524 +++++++---------
 criu/protobuf-desc.c                          |  63 +-
 criu/protobuf.c                               |  23 +-
 criu/pstree.c                                 |  74 +--
 criu/rbtree.c                                 |  17 +-
 criu/rst-malloc.c                             |  15 +-
 criu/seccomp.c                                |  76 +--
 criu/seize.c                                  |  58 +-
 criu/servicefd.c                              |  46 +-
 criu/shmem.c                                  | 114 ++--
 criu/sigframe.c                               |  16 +-
 criu/signalfd.c                               |  11 +-
 criu/sk-inet.c                                | 183 +++---
 criu/sk-netlink.c                             |  27 +-
 criu/sk-packet.c                              |  57 +-
 criu/sk-queue.c                               |  39 +-
 criu/sk-tcp.c                                 |  44 +-
 criu/sk-unix.c                                | 491 +++++++--------
 criu/sockets.c                                | 231 +++----
 criu/stats.c                                  |  26 +-
 criu/string.c                                 |   2 +-
 criu/sysctl.c                                 | 190 +++---
 criu/sysfs_parse.c                            |  14 +-
 criu/timens.c                                 |  34 +-
 criu/timerfd.c                                |  58 +-
 criu/tls.c                                    |  30 +-
 criu/tty.c                                    | 537 +++++++---------
 criu/tun.c                                    |  11 +-
 criu/uffd.c                                   |  86 +--
 criu/unittest/unit.c                          |   2 -
 criu/util.c                                   | 135 ++--
 criu/vdso-compat.c                            |   9 +-
 criu/vdso.c                                   | 111 ++--
 include/common/scm-code.c                     |  38 +-
 lib/c/criu.c                                  |  56 +-
 soccr/soccr.c                                 | 248 ++++----
 soccr/test/tcp-conn.c                         |  19 +-
 soccr/test/tcp-constructor.c                  |  47 +-
 test/compel/handle_binary.c                   |  16 +-
 test/others/app-emu/job/job.c                 |   3 +-
 test/others/app-emu/make/tmpl.c               |  24 +-
 test/others/bers/bers.c                       | 157 +++--
 test/others/libcriu/test_errno.c              |   1 -
 test/others/libcriu/test_iters.c              |   4 +-
 test/others/libcriu/test_notify.c             |   2 +-
 test/others/libcriu/test_self.c               |   5 +-
 test/others/libcriu/test_sub.c                |   2 +-
 test/others/loop.c                            |   4 +-
 test/others/mounts/ext/ext-mount.c            |   5 +-
 test/others/mounts/ext/ns_init.c              |   2 +-
 test/others/pipes/pipe.c                      | 170 ++---
 test/others/rpc/test-c.c                      |  26 +-
 test/others/socketpairs/socketpair.c          | 127 ++--
 test/others/tcp/cln.c                         |   5 +-
 test/others/unix-callback/syslog-lib.c        |   6 +-
 test/others/unix-callback/unix-client.c       |   7 +-
 test/others/unix-callback/unix-lib.c          |  19 +-
 test/others/unix-callback/unix-server.c       |  13 +-
 test/zdtm/lib/bpfmap_zdtm.c                   |  30 +-
 test/zdtm/lib/datagen.c                       |   5 +-
 test/zdtm/lib/fs.c                            |   8 +-
 test/zdtm/lib/groups.c                        |   4 +-
 test/zdtm/lib/lock.c                          |   8 +-
 test/zdtm/lib/msg.c                           |   3 +-
 test/zdtm/lib/ns.c                            |  32 +-
 test/zdtm/lib/parseargs.c                     |  37 +-
 test/zdtm/lib/tcp.c                           |  30 +-
 test/zdtm/lib/test.c                          |  18 +-
 test/zdtm/lib/unix.c                          |   1 -
 test/zdtm/static/aio00.c                      |   4 +-
 test/zdtm/static/aio01.c                      |  22 +-
 test/zdtm/static/apparmor.c                   |   4 +-
 test/zdtm/static/arm-neon00.c                 |  40 +-
 test/zdtm/static/autofs.c                     | 215 +++----
 test/zdtm/static/bind-mount.c                 |   4 +-
 test/zdtm/static/binfmt_misc.c                |  25 +-
 test/zdtm/static/bpf_array.c                  |  25 +-
 test/zdtm/static/bpf_hash.c                   |  26 +-
 test/zdtm/static/bridge.c                     |   6 +-
 test/zdtm/static/busyloop00.c                 |   6 +-
 test/zdtm/static/caps00.c                     |  32 +-
 test/zdtm/static/cgroup00.c                   |   8 +-
 test/zdtm/static/cgroup01.c                   |   4 +-
 test/zdtm/static/cgroup02.c                   |   5 +-
 test/zdtm/static/cgroup03.c                   |   5 +-
 test/zdtm/static/cgroup04.c                   |  19 +-
 test/zdtm/static/cgroup_ifpriomap.c           |  28 +-
 test/zdtm/static/cgroup_stray.c               |  14 +-
 test/zdtm/static/cgroupns.c                   |  14 +-
 test/zdtm/static/child_opened_proc.c          |   6 +-
 test/zdtm/static/child_subreaper.c            |   4 +-
 .../static/child_subreaper_and_reparent.c     |   6 +-
 .../static/child_subreaper_existing_child.c   |   7 +-
 test/zdtm/static/chroot-file.c                |  20 +-
 test/zdtm/static/chroot.c                     |  20 +-
 test/zdtm/static/clean_mntns.c                |   4 +-
 test/zdtm/static/clone_fs.c                   |  39 +-
 test/zdtm/static/cmdlinenv00.c                |  18 +-
 test/zdtm/static/config_inotify_irmap.c       |  15 +-
 test/zdtm/static/console.c                    |  12 +-
 test/zdtm/static/cow00.c                      |   8 +-
 test/zdtm/static/cow01.c                      | 112 ++--
 test/zdtm/static/cr_veth.c                    |   4 +-
 test/zdtm/static/cr_veth02.c                  |   4 +-
 test/zdtm/static/criu-rtc.c                   |   5 +-
 test/zdtm/static/cwd00.c                      |   4 +-
 test/zdtm/static/cwd01.c                      |   5 +-
 test/zdtm/static/cwd02.c                      |   7 +-
 test/zdtm/static/del_standalone_un.c          |   6 +-
 test/zdtm/static/deleted_dev.c                |  12 +-
 test/zdtm/static/deleted_unix_sock.c          |  17 +-
 test/zdtm/static/different_creds.c            |  60 +-
 test/zdtm/static/dumpable01.c                 |   2 +-
 test/zdtm/static/dumpable02.c                 |  24 +-
 test/zdtm/static/env00.c                      |   4 +-
 test/zdtm/static/epoll.c                      |  14 +-
 test/zdtm/static/epoll01.c                    |  27 +-
 test/zdtm/static/eventfs00.c                  |  12 +-
 test/zdtm/static/fanotify00.c                 | 134 ++--
 test/zdtm/static/fd.c                         |   8 +-
 test/zdtm/static/fd01.c                       |   8 +-
 test/zdtm/static/fdt_shared.c                 |  13 +-
 test/zdtm/static/fifo-ghost.c                 |   4 +-
 test/zdtm/static/fifo-rowo-pair.c             |  18 +-
 test/zdtm/static/fifo.c                       |   6 +-
 test/zdtm/static/fifo_ro.c                    |   4 +-
 test/zdtm/static/fifo_upon_unix_socket00.c    |   7 +-
 test/zdtm/static/fifo_wronly.c                |   8 +-
 test/zdtm/static/file_append.c                |   4 +-
 test/zdtm/static/file_attr.c                  |  29 +-
 test/zdtm/static/file_cloexec.c               |  10 +-
 test/zdtm/static/file_fown.c                  |  45 +-
 test/zdtm/static/file_lease00.c               |   3 +-
 test/zdtm/static/file_lease01.c               |  10 +-
 test/zdtm/static/file_lease02.c               |  12 +-
 test/zdtm/static/file_lease03.c               |   5 +-
 test/zdtm/static/file_lease04.c               |   5 +-
 test/zdtm/static/file_locks00.c               |  43 +-
 test/zdtm/static/file_locks01.c               |  17 +-
 test/zdtm/static/file_locks02.c               |  14 +-
 test/zdtm/static/file_locks03.c               |  14 +-
 test/zdtm/static/file_locks04.c               |  21 +-
 test/zdtm/static/file_locks05.c               |   4 +-
 test/zdtm/static/file_locks06.c               |   6 +-
 test/zdtm/static/file_locks07.c               |   9 +-
 test/zdtm/static/file_locks08.c               |   9 +-
 test/zdtm/static/file_shared.c                |  10 +-
 test/zdtm/static/fpu00.c                      |  31 +-
 test/zdtm/static/fpu01.c                      |  30 +-
 test/zdtm/static/fpu02.c                      |  10 +-
 test/zdtm/static/futex-rl.c                   |   8 +-
 test/zdtm/static/futex.c                      |  18 +-
 test/zdtm/static/get_smaps_bits.c             |  13 +-
 test/zdtm/static/ghost_holes00.c              |  30 +-
 test/zdtm/static/ghost_on_rofs.c              |  12 +-
 test/zdtm/static/groups.c                     |   4 +-
 test/zdtm/static/grow_map.c                   |  15 +-
 test/zdtm/static/grow_map02.c                 |  13 +-
 test/zdtm/static/grow_map03.c                 |  10 +-
 test/zdtm/static/helper_zombie_child.c        |   4 +-
 test/zdtm/static/inotify00.c                  | 121 ++--
 test/zdtm/static/inotify02.c                  |   6 +-
 test/zdtm/static/inotify04.c                  |   8 +-
 test/zdtm/static/inotify_irmap.c              |  10 +-
 test/zdtm/static/inotify_system.c             | 191 +++---
 test/zdtm/static/ipc_namespace.c              | 179 +++---
 test/zdtm/static/jobctl00.c                   |  71 +--
 test/zdtm/static/link10.c                     |  17 +-
 test/zdtm/static/loginuid.c                   |   4 +-
 test/zdtm/static/macvlan.c                    |   6 +-
 test/zdtm/static/maps00.c                     | 100 ++-
 test/zdtm/static/maps01.c                     |  35 +-
 test/zdtm/static/maps02.c                     |  46 +-
 test/zdtm/static/maps03.c                     |   9 +-
 test/zdtm/static/maps04.c                     |  11 +-
 test/zdtm/static/maps05.c                     |  16 +-
 test/zdtm/static/maps06.c                     |  17 +-
 test/zdtm/static/maps_file_prot.c             |  12 +-
 test/zdtm/static/mem-touch.c                  |  15 +-
 test/zdtm/static/memfd00.c                    |  10 +-
 test/zdtm/static/memfd01.c                    |  10 +-
 test/zdtm/static/memfd02.c                    |  10 +-
 test/zdtm/static/memfd03.c                    |  26 +-
 test/zdtm/static/mlock_setuid.c               |   6 +-
 test/zdtm/static/mmx00.c                      |  52 +-
 test/zdtm/static/mnt_enablefs.c               |   4 +-
 test/zdtm/static/mnt_ext_auto.c               |  16 +-
 test/zdtm/static/mnt_ext_dev.c                |   4 +-
 test/zdtm/static/mnt_ext_master.c             |   7 +-
 test/zdtm/static/mnt_ro_bind.c                |   8 +-
 test/zdtm/static/mnt_tracefs.c                |   7 +-
 test/zdtm/static/mntns_deleted.c              |  17 +-
 test/zdtm/static/mntns_ghost.c                |   6 +-
 test/zdtm/static/mntns_ghost01.c              |   7 +-
 test/zdtm/static/mntns_link_remap.c           |  20 +-
 test/zdtm/static/mntns_open.c                 |  16 +-
 test/zdtm/static/mntns_overmount.c            |  15 +-
 test/zdtm/static/mntns_remap.c                |   4 +-
 test/zdtm/static/mntns_ro_root.c              |   5 +-
 test/zdtm/static/mntns_root_bind.c            |  17 +-
 test/zdtm/static/mntns_rw_ro_rw.c             |   6 +-
 test/zdtm/static/mntns_shared_bind.c          |  15 +-
 test/zdtm/static/mntns_shared_bind03.c        |  16 +-
 test/zdtm/static/mntns_shared_vs_private.c    |  10 +-
 test/zdtm/static/mount_paths.c                |   4 +-
 test/zdtm/static/mountpoints.c                | 127 ++--
 test/zdtm/static/mprotect00.c                 |  39 +-
 test/zdtm/static/msgque.c                     |  11 +-
 test/zdtm/static/mtime_mmap.c                 |  18 +-
 test/zdtm/static/netns-dev.c                  | 203 +++---
 test/zdtm/static/netns-nf.c                   |   4 +-
 test/zdtm/static/netns-nft-ipt.c              |   4 +-
 test/zdtm/static/netns-nft.c                  |   4 +-
 test/zdtm/static/netns.c                      |   4 +-
 test/zdtm/static/netns_lock.c                 |   6 +-
 test/zdtm/static/netns_sub.c                  |   6 +-
 test/zdtm/static/netns_sub_sysctl.c           |  11 +-
 test/zdtm/static/netns_sub_veth.c             |  18 +-
 .../static/non_uniform_share_propagation.c    |   4 +-
 test/zdtm/static/ofd_file_locks.c             |  46 +-
 test/zdtm/static/oom_score_adj.c              |   4 +-
 test/zdtm/static/opath_file.c                 |  12 +-
 test/zdtm/static/overmount_dev.c              |   8 +-
 test/zdtm/static/overmount_fifo.c             |   8 +-
 test/zdtm/static/overmount_file.c             |   8 +-
 test/zdtm/static/overmount_sock.c             |  19 +-
 .../static/overmount_with_shared_parent.c     |   4 +-
 test/zdtm/static/overmounted_file.c           |   6 +-
 test/zdtm/static/packet_sock.c                |  29 +-
 test/zdtm/static/packet_sock_mmap.c           |   2 +-
 test/zdtm/static/packet_sock_spkt.c           |   4 +-
 test/zdtm/static/pdeath_sig.c                 |   4 +-
 test/zdtm/static/pid00.c                      |  17 +-
 test/zdtm/static/pid_file.c                   |   4 +-
 test/zdtm/static/pipe00.c                     |   8 +-
 test/zdtm/static/pipe01.c                     |   9 +-
 test/zdtm/static/pipe02.c                     |   6 +-
 test/zdtm/static/pipe03.c                     |   6 +-
 test/zdtm/static/poll.c                       |  13 +-
 test/zdtm/static/posix_timers.c               |  69 +-
 test/zdtm/static/private_bind_propagation.c   |   4 +-
 test/zdtm/static/proc-self.c                  |   4 +-
 test/zdtm/static/pstree.c                     |   4 +-
 test/zdtm/static/pthread00.c                  |  43 +-
 test/zdtm/static/pthread01.c                  |  78 ++-
 test/zdtm/static/pthread02.c                  |   6 +-
 test/zdtm/static/pthread_timers.c             |   7 +-
 test/zdtm/static/ptrace_sig.c                 |  11 +-
 test/zdtm/static/pty00.c                      |  10 +-
 test/zdtm/static/pty01.c                      |   9 +-
 test/zdtm/static/pty02.c                      |  14 +-
 test/zdtm/static/pty03.c                      |   4 +-
 test/zdtm/static/pty04.c                      |   4 +-
 test/zdtm/static/remap_dead_pid.c             |   8 +-
 test/zdtm/static/rlimits00.c                  |   8 +-
 test/zdtm/static/rmdir_open.c                 |   4 +-
 test/zdtm/static/rtc.c                        |   4 +-
 test/zdtm/static/s390x_gs_threads.c           |  60 +-
 test/zdtm/static/s390x_mmap_high.c            |  16 +-
 test/zdtm/static/s390x_regs_check.c           | 290 ++++-----
 test/zdtm/static/s390x_runtime_instr.c        | 109 ++--
 test/zdtm/static/sched_policy00.c             |   7 +-
 test/zdtm/static/sched_prio00.c               |   8 +-
 test/zdtm/static/scm00.c                      |   4 +-
 test/zdtm/static/scm03.c                      |   4 +-
 test/zdtm/static/scm05.c                      |   6 +-
 test/zdtm/static/scm06.c                      |   7 +-
 test/zdtm/static/seccomp_filter.c             |  17 +-
 test/zdtm/static/seccomp_filter_inheritance.c |  25 +-
 test/zdtm/static/seccomp_filter_threads.c     |  77 +--
 test/zdtm/static/seccomp_filter_tsync.c       |  24 +-
 test/zdtm/static/seccomp_strict.c             |  10 +-
 test/zdtm/static/selfexe00.c                  |   6 +-
 test/zdtm/static/selinux00.c                  |   8 +-
 test/zdtm/static/selinux01.c                  |   8 +-
 test/zdtm/static/sem.c                        |  60 +-
 test/zdtm/static/session00.c                  |  54 +-
 test/zdtm/static/session01.c                  |  77 +--
 test/zdtm/static/session02.c                  | 122 ++--
 test/zdtm/static/session03.c                  |  77 +--
 test/zdtm/static/shared_mount_propagation.c   |   4 +-
 .../zdtm/static/shared_slave_mount_children.c |   4 +-
 test/zdtm/static/shm-mp.c                     |  23 +-
 test/zdtm/static/shm.c                        |   8 +-
 test/zdtm/static/shmemfd-priv.c               |  35 +-
 test/zdtm/static/shmemfd.c                    |  13 +-
 test/zdtm/static/sigaltstack.c                |  39 +-
 test/zdtm/static/signalfd00.c                 |   4 +-
 test/zdtm/static/sigpending.c                 |  24 +-
 test/zdtm/static/sigtrap.c                    |   8 +-
 test/zdtm/static/sigtrap01.c                  |   8 +-
 test/zdtm/static/sit.c                        |  11 +-
 test/zdtm/static/sk-freebind.c                |  14 +-
 test/zdtm/static/sk-netlink.c                 |  58 +-
 test/zdtm/static/sk-unix-dgram-ghost.c        |  13 +-
 test/zdtm/static/sk-unix-mntns.c              |  10 +-
 test/zdtm/static/sk-unix-rel.c                |   8 +-
 test/zdtm/static/sk-unix-unconn.c             |  10 +-
 test/zdtm/static/sk-unix01.c                  |  45 +-
 test/zdtm/static/skip-me.c                    |   2 +-
 test/zdtm/static/sleeping00.c                 |   6 +-
 test/zdtm/static/sock_filter00.c              |  38 +-
 test/zdtm/static/sock_opts00.c                |  11 +-
 test/zdtm/static/sock_opts01.c                |   6 +-
 test/zdtm/static/sock_peercred.c              |  13 +-
 test/zdtm/static/socket-ext.c                 |  12 +-
 test/zdtm/static/socket-linger.c              |  12 +-
 test/zdtm/static/socket-raw.c                 | 116 ++--
 test/zdtm/static/socket-tcp-close-wait.c      |   9 +-
 test/zdtm/static/socket-tcp-close0.c          |   2 +-
 test/zdtm/static/socket-tcp-close1.c          |   2 +-
 test/zdtm/static/socket-tcp-closed.c          |   6 +-
 test/zdtm/static/socket-tcp-closing.c         |   6 +-
 test/zdtm/static/socket-tcp-fin-wait1.c       |  10 +-
 test/zdtm/static/socket-tcp-listen.c          |   9 +-
 test/zdtm/static/socket-tcp-reseted.c         |  17 +-
 test/zdtm/static/socket-tcp-reuseport.c       |  12 +-
 test/zdtm/static/socket-tcp-skip-in-flight.c  |   1 -
 test/zdtm/static/socket-tcp-syn-sent.c        |  24 +-
 test/zdtm/static/socket-tcp-unconn.c          |  24 +-
 test/zdtm/static/socket-tcp.c                 |   6 +-
 test/zdtm/static/socket-tcpbuf.c              |   8 +-
 test/zdtm/static/socket6_udp.c                |  13 +-
 test/zdtm/static/socket_aio.c                 |   5 +-
 test/zdtm/static/socket_close_data.c          |   4 +-
 test/zdtm/static/socket_close_data01.c        |   8 +-
 test/zdtm/static/socket_dgram_data.c          |  10 +-
 test/zdtm/static/socket_listen.c              |  13 +-
 test/zdtm/static/socket_queues.c              |   6 +-
 test/zdtm/static/socket_snd_addr.c            |  34 +-
 test/zdtm/static/socket_udp-corked.c          |   3 +-
 test/zdtm/static/socket_udp.c                 |  11 +-
 test/zdtm/static/socket_udp_shutdown.c        |  42 +-
 test/zdtm/static/socket_udplite.c             |  11 +-
 test/zdtm/static/sockets00.c                  |  16 +-
 test/zdtm/static/sockets01.c                  |  18 +-
 test/zdtm/static/sockets02.c                  |   4 +-
 test/zdtm/static/sockets03.c                  |   8 +-
 test/zdtm/static/sockets_dgram.c              |  58 +-
 test/zdtm/static/sockets_spair.c              |   4 +-
 test/zdtm/static/sse00.c                      |  37 +-
 test/zdtm/static/sse20.c                      |  37 +-
 test/zdtm/static/stopped.c                    |   6 +-
 test/zdtm/static/symlink.c                    |   6 +-
 test/zdtm/static/tempfs.c                     |   8 +-
 test/zdtm/static/tempfs_overmounted.c         |   4 +-
 test/zdtm/static/tempfs_overmounted01.c       |  13 +-
 test/zdtm/static/tempfs_ro.c                  |   7 +-
 test/zdtm/static/tempfs_ro02.c                |   7 +-
 test/zdtm/static/tempfs_subns.c               |   4 +-
 test/zdtm/static/thp_disable.c                |   9 +-
 test/zdtm/static/thread_different_uid_gid.c   |  11 +-
 test/zdtm/static/time.c                       |   7 +-
 test/zdtm/static/timens_for_kids.c            |   8 +-
 test/zdtm/static/timens_nested.c              |   7 +-
 test/zdtm/static/timerfd.c                    |  38 +-
 test/zdtm/static/timers.c                     |  28 +-
 test/zdtm/static/tty00.c                      |   6 +-
 test/zdtm/static/tty02.c                      |   6 +-
 test/zdtm/static/tty03.c                      |   6 +-
 test/zdtm/static/tun.c                        |  30 +-
 test/zdtm/static/uffd-events.c                |  13 +-
 test/zdtm/static/umask00.c                    |   4 +-
 test/zdtm/static/unbindable.c                 |   4 +-
 test/zdtm/static/unbound_sock.c               |  14 +-
 test/zdtm/static/unhashed_proc.c              |   8 +-
 test/zdtm/static/unlink_fifo.c                |   6 +-
 test/zdtm/static/unlink_fifo_wronly.c         |   7 +-
 test/zdtm/static/unlink_fstat00.c             |  15 +-
 test/zdtm/static/unlink_fstat01.c             |  26 +-
 test/zdtm/static/unlink_fstat02.c             |  15 +-
 test/zdtm/static/unlink_fstat03.c             |  15 +-
 test/zdtm/static/unlink_largefile.c           |   7 +-
 test/zdtm/static/unlink_mmap00.c              |   7 +-
 test/zdtm/static/unlink_mmap01.c              |   8 +-
 test/zdtm/static/unlink_mmap02.c              |   7 +-
 test/zdtm/static/unlink_multiple_largefiles.c |  28 +-
 test/zdtm/static/unlink_regular00.c           |  11 +-
 .../static/unsupported_children_collision.c   |   4 +-
 test/zdtm/static/uptime_grow.c                |  10 +-
 test/zdtm/static/utsname.c                    |   6 +-
 test/zdtm/static/vdso-proxy.c                 |  24 +-
 test/zdtm/static/vdso00.c                     |   4 +-
 test/zdtm/static/vdso01.c                     | 119 ++--
 test/zdtm/static/vdso02.c                     |  55 +-
 test/zdtm/static/vfork00.c                    |   6 +-
 test/zdtm/static/vsx.c                        | 590 +++++++++---------
 test/zdtm/static/vt.c                         |  12 +-
 test/zdtm/static/wait00.c                     |   6 +-
 test/zdtm/static/write_read00.c               |   6 +-
 test/zdtm/static/write_read01.c               |   6 +-
 test/zdtm/static/write_read02.c               |   6 +-
 test/zdtm/static/write_read10.c               |  16 +-
 test/zdtm/static/xids00.c                     |  12 +-
 test/zdtm/static/zombie00.c                   |  11 +-
 test/zdtm/static/zombie01.c                   |  10 +-
 test/zdtm/static/zombie_leader.c              |   7 +-
 test/zdtm/transition/epoll.c                  |  32 +-
 test/zdtm/transition/fifo_dyn.c               |  12 +-
 test/zdtm/transition/fifo_loop.c              |  30 +-
 test/zdtm/transition/file_aio.c               |  10 +-
 test/zdtm/transition/file_read.c              |  39 +-
 test/zdtm/transition/fork.c                   |   1 -
 test/zdtm/transition/ipc.c                    |  20 +-
 test/zdtm/transition/lazy-thp.c               |   8 +-
 test/zdtm/transition/maps007.c                |  13 +-
 test/zdtm/transition/maps008.c                |  74 +--
 test/zdtm/transition/netlink00.c              | 111 ++--
 test/zdtm/transition/pipe_loop00.c            |  33 +-
 test/zdtm/transition/pipe_shared00.c          |  34 +-
 test/zdtm/transition/ptrace.c                 |  14 +-
 test/zdtm/transition/shmem.c                  |   4 +-
 test/zdtm/transition/socket_loop00.c          |  34 +-
 test/zdtm/transition/thread-bomb.c            |   3 +-
 test/zdtm/transition/unix_sock.c              |  42 +-
 test/zdtm_ct.c                                |  32 +-
 542 files changed, 9346 insertions(+), 11605 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/cpu.c b/compel/arch/aarch64/src/lib/cpu.c
index cfaab1e65..538a29887 100644
--- a/compel/arch/aarch64/src/lib/cpu.c
+++ b/compel/arch/aarch64/src/lib/cpu.c
@@ -7,7 +7,7 @@
 
 #include "log.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 static compel_cpuinfo_t rt_info;
@@ -22,11 +22,24 @@ static void fetch_rt_cpuinfo(void)
 	}
 }
 
-void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { }
-void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { }
-int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; }
-int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; }
-int compel_cpuid(compel_cpuinfo_t *info) { return 0; }
+void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+}
+void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+}
+int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
+int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
+int compel_cpuid(compel_cpuinfo_t *info)
+{
+	return 0;
+}
 
 bool compel_cpu_has_feature(unsigned int feature)
 {
diff --git a/compel/arch/aarch64/src/lib/handle-elf.c b/compel/arch/aarch64/src/lib/handle-elf.c
index 1ee65ee2c..206aef4cd 100644
--- a/compel/arch/aarch64/src/lib/handle-elf.c
+++ b/compel/arch/aarch64/src/lib/handle-elf.c
@@ -5,15 +5,13 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused
-elf_ident_64_le[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-static const unsigned char __maybe_unused
-elf_ident_64_be[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64_be[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 586eedac0..7cfa637eb 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -18,12 +18,11 @@ unsigned __page_shift = 0;
  * Injected syscall instruction
  */
 const char code_syscall[] = {
-	0x01, 0x00, 0x00, 0xd4,		/* SVC #0 */
-	0x00, 0x00, 0x20, 0xd4		/* BRK #0 */
+	0x01, 0x00, 0x00, 0xd4, /* SVC #0 */
+	0x00, 0x00, 0x20, 0xd4 /* BRK #0 */
 };
 
-static const int
-code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
+static const int code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
 
 static inline void __always_unused __check_code_syscall(void)
 {
@@ -31,17 +30,15 @@ static inline void __always_unused __check_code_syscall(void)
 	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
 }
 
-int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-			      user_regs_struct_t *regs,
-			      user_fpregs_struct_t *fpregs)
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
 
 	memcpy(sigframe->uc.uc_mcontext.regs, regs->regs, sizeof(regs->regs));
 
-	sigframe->uc.uc_mcontext.sp	= regs->sp;
-	sigframe->uc.uc_mcontext.pc	= regs->pc;
-	sigframe->uc.uc_mcontext.pstate	= regs->pstate;
+	sigframe->uc.uc_mcontext.sp = regs->sp;
+	sigframe->uc.uc_mcontext.pc = regs->pc;
+	sigframe->uc.uc_mcontext.pstate = regs->pstate;
 
 	memcpy(fpsimd->vregs, fpregs->vregs, 32 * sizeof(__uint128_t));
 
@@ -54,15 +51,13 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 	return 0;
 }
 
-int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
-				   struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-		  user_fpregs_struct_t *ext_regs, save_regs_t save,
-		  void *arg, __maybe_unused unsigned long flags)
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
 {
 	user_fpregs_struct_t tmp, *fpsimd = ext_regs ? ext_regs : &tmp;
 	struct iovec iov;
@@ -104,13 +99,8 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 	return 0;
 }
 
-int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
-					unsigned long arg1,
-					unsigned long arg2,
-					unsigned long arg3,
-					unsigned long arg4,
-					unsigned long arg5,
-					unsigned long arg6)
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
 {
 	user_regs_struct_t regs = ctl->orig.regs;
 	int err;
@@ -131,15 +121,12 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 	return err;
 }
 
-void *remote_mmap(struct parasite_ctl *ctl,
-		void *addr, size_t length, int prot,
-		int flags, int fd, off_t offset)
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
 {
 	long map;
 	int err;
 
-	err = compel_syscall(ctl, __NR_mmap, &map,
-			(unsigned long)addr, length, prot, flags, fd, offset);
+	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long)addr, length, prot, flags, fd, offset);
 	if (err < 0 || (long)map < 0)
 		map = 0;
 
@@ -166,9 +153,7 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 	long ret;
 	int err;
 
-	err = compel_syscall(ctl, __NR_sigaltstack,
-			     &ret, 0, (unsigned long)&s->uc.uc_stack,
-			     0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->uc.uc_stack, 0, 0, 0, 0);
 	return err ? err : ret;
 }
 
@@ -191,4 +176,3 @@ unsigned long compel_task_size(void)
 			break;
 	return task_size;
 }
-
diff --git a/compel/arch/arm/src/lib/handle-elf.c b/compel/arch/arm/src/lib/handle-elf.c
index 5b8d00a6f..a84524abd 100644
--- a/compel/arch/arm/src/lib/handle-elf.c
+++ b/compel/arch/arm/src/lib/handle-elf.c
@@ -5,9 +5,8 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused
-elf_ident_32[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_32[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index 1ddb48654..6715afdb3 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -17,12 +17,11 @@
  * Injected syscall instruction
  */
 const char code_syscall[] = {
-	0x00, 0x00, 0x00, 0xef,         /* SVC #0  */
-	0xf0, 0x01, 0xf0, 0xe7          /* UDF #32 */
+	0x00, 0x00, 0x00, 0xef, /* SVC #0  */
+	0xf0, 0x01, 0xf0, 0xe7 /* UDF #32 */
 };
 
-static const int
-code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
+static const int code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
 
 static inline __always_unused void __check_code_syscall(void)
 {
@@ -30,9 +29,7 @@ static inline __always_unused void __check_code_syscall(void)
 	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
 }
 
-int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-			      user_regs_struct_t *regs,
-			      user_fpregs_struct_t *fpregs)
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	struct aux_sigframe *aux = (struct aux_sigframe *)(void *)&sigframe->sig.uc.uc_regspace;
 
@@ -62,16 +59,14 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 	return 0;
 }
 
-int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
-				   struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
 
 #define PTRACE_GETVFPREGS 27
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-		  user_fpregs_struct_t *ext_regs, save_regs_t save,
-		  void *arg, __maybe_unused unsigned long flags)
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
 {
 	user_fpregs_struct_t tmp, *vfp = ext_regs ? ext_regs : &tmp;
 	int ret = -1;
@@ -116,13 +111,8 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 	return 0;
 }
 
-int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
-		unsigned long arg1,
-		unsigned long arg2,
-		unsigned long arg3,
-		unsigned long arg4,
-		unsigned long arg5,
-		unsigned long arg6)
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
 {
 	user_regs_struct_t regs = ctl->orig.regs;
 	int err;
@@ -141,9 +131,7 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 	return err;
 }
 
-void *remote_mmap(struct parasite_ctl *ctl,
-		  void *addr, size_t length, int prot,
-		  int flags, int fd, off_t offset)
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
 {
 	long map;
 	int err;
@@ -151,8 +139,7 @@ void *remote_mmap(struct parasite_ctl *ctl,
 	if (offset & ~PAGE_MASK)
 		return 0;
 
-	err = compel_syscall(ctl, __NR_mmap2, &map,
-			(unsigned long)addr, length, prot, flags, fd, offset >> 12);
+	err = compel_syscall(ctl, __NR_mmap2, &map, (unsigned long)addr, length, prot, flags, fd, offset >> 12);
 	if (err < 0 || map > ctl->ictx.task_size)
 		map = 0;
 
@@ -182,9 +169,7 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 	long ret;
 	int err;
 
-	err = compel_syscall(ctl, __NR_sigaltstack,
-			     &ret, 0, (unsigned long)&s->sig.uc.uc_stack,
-			     0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->sig.uc.uc_stack, 0, 0, 0, 0);
 	return err ? err : ret;
 }
 
@@ -193,9 +178,9 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
  *   arch/arm/include/asm/memory.h
  *   arch/arm/Kconfig (PAGE_OFFSET values in Memory split section)
  */
-#define TASK_SIZE_MIN		0x3f000000
-#define TASK_SIZE_MAX		0xbf000000
-#define SZ_1G			0x40000000
+#define TASK_SIZE_MIN 0x3f000000
+#define TASK_SIZE_MAX 0xbf000000
+#define SZ_1G	      0x40000000
 
 unsigned long compel_task_size(void)
 {
@@ -207,4 +192,3 @@ unsigned long compel_task_size(void)
 
 	return task_size;
 }
-
diff --git a/compel/arch/mips/src/lib/cpu.c b/compel/arch/mips/src/lib/cpu.c
index bdb65ff9f..172b90e27 100644
--- a/compel/arch/mips/src/lib/cpu.c
+++ b/compel/arch/mips/src/lib/cpu.c
@@ -6,22 +6,27 @@
 #include "common/compiler.h"
 #include "log.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 static compel_cpuinfo_t rt_info;
 static bool rt_info_done = false;
 
-void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
+void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+}
 
-void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature){ }
+void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+}
 
 int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
 {
 	return 0;
 }
 
-int compel_cpuid(compel_cpuinfo_t *c){
+int compel_cpuid(compel_cpuinfo_t *c)
+{
 	return 0;
 }
 
diff --git a/compel/arch/mips/src/lib/handle-elf.c b/compel/arch/mips/src/lib/handle-elf.c
index 988985151..a605a5a45 100644
--- a/compel/arch/mips/src/lib/handle-elf.c
+++ b/compel/arch/mips/src/lib/handle-elf.c
@@ -5,9 +5,8 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused
-elf_ident_64_le[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index d8c03c33a..68d0a2728 100644
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -23,8 +23,8 @@
  * mips64el is Little Endian
  */
 const char code_syscall[] = {
-	0x0c, 0x00, 0x00, 0x00,   /* syscall    */
-	0x0d, 0x00, 0x00, 0x00   /*  break      */
+	0x0c, 0x00, 0x00, 0x00, /* syscall    */
+	0x0d, 0x00, 0x00, 0x00 /*  break      */
 };
 
 /* 10-byte legacy floating point register */
@@ -40,10 +40,7 @@ struct fpxreg {
 	uint16_t padding[3];
 };
 
-
-int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-			      user_regs_struct_t *regs,
-			      user_fpregs_struct_t *fpregs)
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	sigframe->rs_uc.uc_mcontext.sc_regs[0] = regs->regs[0];
 	sigframe->rs_uc.uc_mcontext.sc_regs[1] = regs->regs[1];
@@ -117,17 +114,15 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 	return 0;
 }
 
-int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
-				   struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-		  user_fpregs_struct_t *ext_regs, save_regs_t save,
-		  void *arg, __maybe_unused unsigned long flags)
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t xsave = {  }, *xs = ext_regs ? ext_regs : &xsave;
+	user_fpregs_struct_t xsave = {}, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
@@ -143,7 +138,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
 		case ERESTARTNOHAND:
 		case ERESTARTSYS:
 		case ERESTARTNOINTR:
-			regs->regs[2] =  regs->regs[0];
+			regs->regs[2] = regs->regs[0];
 			regs->regs[7] = regs->regs[26];
 			regs->cp0_epc -= 4;
 			break;
@@ -170,13 +165,8 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 	return 0;
 }
 
-int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
-		unsigned long arg1,
-		unsigned long arg2,
-		unsigned long arg3,
-		unsigned long arg4,
-		unsigned long arg5,
-		unsigned long arg6)
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
 {
 	/*refer to glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/syscall.S*/
 	user_regs_struct_t regs = ctl->orig.regs;
@@ -193,18 +183,15 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 	err = compel_execute_syscall(ctl, &regs, code_syscall);
 	*ret = regs.regs[2];
 
-	 return err;
+	return err;
 }
 
-void *remote_mmap(struct parasite_ctl *ctl,
-		  void *addr, size_t length, int prot,
-		  int flags, int fd, off_t offset)
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
 {
 	long map;
 	int err;
 
-	err = compel_syscall(ctl, __NR_mmap, &map,
-		(unsigned long)addr, length, prot, flags, fd, offset >> PAGE_SHIFT);
+	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long)addr, length, prot, flags, fd, offset >> PAGE_SHIFT);
 
 	if (err < 0 || IS_ERR_VALUE(map)) {
 		pr_err("remote mmap() failed: %s\n", strerror(-map));
@@ -236,13 +223,10 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 	long ret;
 	int err;
 
-	err = compel_syscall(ctl, __NR_sigaltstack,
-			 &ret, 0, (unsigned long)&s->rs_uc.uc_stack,
-			 0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->rs_uc.uc_stack, 0, 0, 0, 0);
 	return err ? err : ret;
 }
 
-
 int ptrace_set_breakpoint(pid_t pid, void *addr)
 {
 	return 0;
@@ -256,9 +240,12 @@ int ptrace_flush_breakpoints(pid_t pid)
 /*refer to kernel linux-3.10/arch/mips/include/asm/processor.h*/
 #define TASK_SIZE32 0x7fff8000UL
 #define TASK_SIZE64 0x10000000000UL
-#define TASK_SIZE TASK_SIZE64
+#define TASK_SIZE   TASK_SIZE64
 
-unsigned long compel_task_size(void) { return TASK_SIZE; }
+unsigned long compel_task_size(void)
+{
+	return TASK_SIZE;
+}
 
 /*
  * Get task registers (overwrites weak function)
@@ -292,30 +279,31 @@ void compel_relocs_apply_mips(void *mem, void *vbase, struct parasite_blob_desc
 	for (i = 0, j = 0; i < nr_relocs; i++) {
 		if (elf_relocs[i].type & COMPEL_TYPE_MIPS_26) {
 			int *where = (mem + elf_relocs[i].offset);
-			*where = *where | ((elf_relocs[i].addend + ((unsigned long)vbase & 0x00fffffff) /*low 28 bit*/)>>2);
+			*where = *where |
+				 ((elf_relocs[i].addend + ((unsigned long)vbase & 0x00fffffff) /*low 28 bit*/) >> 2);
 		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_64) {
 			unsigned long *where = (mem + elf_relocs[i].offset);
 			*where = elf_relocs[i].addend + (unsigned long)vbase;
 		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HI16) {
 			/* refer to binutils mips.cc */
 			int *where = (mem + elf_relocs[i].offset);
-			int v_lo16 = (unsigned long)vbase &0x00ffff;
+			int v_lo16 = (unsigned long)vbase & 0x00ffff;
 
-			if ((v_lo16+elf_relocs[i].value+elf_relocs[i].addend) >= 0x8000) {
-				*where = *where | ((((unsigned long)vbase>>16) &0xffff)+0x1);
+			if ((v_lo16 + elf_relocs[i].value + elf_relocs[i].addend) >= 0x8000) {
+				*where = *where | ((((unsigned long)vbase >> 16) & 0xffff) + 0x1);
 			} else {
-				*where = *where | ((((unsigned long)vbase>>16) &0xffff));
+				*where = *where | ((((unsigned long)vbase >> 16) & 0xffff));
 			}
 		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_LO16) {
 			int *where = (mem + elf_relocs[i].offset);
-			int v_lo16 = (unsigned long)vbase &0x00ffff;
+			int v_lo16 = (unsigned long)vbase & 0x00ffff;
 			*where = *where | ((v_lo16 + elf_relocs[i].addend) & 0xffff);
 		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHER) {
 			int *where = (mem + elf_relocs[i].offset);
-			*where = *where | ((( (unsigned long)vbase + (uint64_t) 0x80008000) >> 32) & 0xffff);
+			*where = *where | ((((unsigned long)vbase + (uint64_t)0x80008000) >> 32) & 0xffff);
 		} else if (elf_relocs[i].type & COMPEL_TYPE_MIPS_HIGHEST) {
 			int *where = (mem + elf_relocs[i].offset);
-			*where = *where | ((( (unsigned long)vbase + (uint64_t) 0x800080008000llu) >> 48) & 0xffff);
+			*where = *where | ((((unsigned long)vbase + (uint64_t)0x800080008000llu) >> 48) & 0xffff);
 		} else {
 			BUG();
 		}
diff --git a/compel/arch/ppc64/src/lib/cpu.c b/compel/arch/ppc64/src/lib/cpu.c
index 7a3972790..f7a128ca3 100644
--- a/compel/arch/ppc64/src/lib/cpu.c
+++ b/compel/arch/ppc64/src/lib/cpu.c
@@ -10,7 +10,7 @@
 
 #include "log.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 static compel_cpuinfo_t rt_info;
@@ -25,10 +25,20 @@ static void fetch_rt_cpuinfo(void)
 	}
 }
 
-void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { }
-void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { }
-int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; }
-int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; }
+void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+}
+void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+}
+int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
+int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
 
 int compel_cpuid(compel_cpuinfo_t *info)
 {
diff --git a/compel/arch/ppc64/src/lib/handle-elf.c b/compel/arch/ppc64/src/lib/handle-elf.c
index f29fdc8a3..84a360c43 100644
--- a/compel/arch/ppc64/src/lib/handle-elf.c
+++ b/compel/arch/ppc64/src/lib/handle-elf.c
@@ -5,15 +5,13 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused
-elf_ident_64_le[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-static const unsigned char __maybe_unused
-elf_ident_64_be[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64_be[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index 5797fb16d..fc174d0dd 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -15,11 +15,11 @@
 #include "infect-priv.h"
 
 #ifndef NT_PPC_TM_SPR
-#define NT_PPC_TM_CGPR  0x108           /* TM checkpointed GPR Registers */
-#define NT_PPC_TM_CFPR  0x109           /* TM checkpointed FPR Registers */
-#define NT_PPC_TM_CVMX  0x10a           /* TM checkpointed VMX Registers */
-#define NT_PPC_TM_CVSX  0x10b           /* TM checkpointed VSX Registers */
-#define NT_PPC_TM_SPR   0x10c           /* TM Special Purpose Registers */
+#define NT_PPC_TM_CGPR 0x108 /* TM checkpointed GPR Registers */
+#define NT_PPC_TM_CFPR 0x109 /* TM checkpointed FPR Registers */
+#define NT_PPC_TM_CVMX 0x10a /* TM checkpointed VMX Registers */
+#define NT_PPC_TM_CVSX 0x10b /* TM checkpointed VSX Registers */
+#define NT_PPC_TM_SPR  0x10c /* TM Special Purpose Registers */
 #endif
 
 unsigned __page_size = 0;
@@ -29,8 +29,8 @@ unsigned __page_shift = 0;
  * Injected syscall instruction
  */
 const uint32_t code_syscall[] = {
-	0x44000002,		/* sc 		*/
-	0x0fe00000		/* twi 31,0,0	*/
+	0x44000002, /* sc 		*/
+	0x0fe00000 /* twi 31,0,0	*/
 };
 
 static inline __always_unused void __check_code_syscall(void)
@@ -43,14 +43,14 @@ static void prep_gp_regs(mcontext_t *dst, user_regs_struct_t *regs)
 {
 	memcpy(dst->gp_regs, regs->gpr, sizeof(regs->gpr));
 
-	dst->gp_regs[PT_NIP]		= regs->nip;
-	dst->gp_regs[PT_MSR]		= regs->msr;
-	dst->gp_regs[PT_ORIG_R3]	= regs->orig_gpr3;
-	dst->gp_regs[PT_CTR]		= regs->ctr;
-	dst->gp_regs[PT_LNK]		= regs->link;
-	dst->gp_regs[PT_XER]		= regs->xer;
-	dst->gp_regs[PT_CCR]		= regs->ccr;
-	dst->gp_regs[PT_TRAP]		= regs->trap;
+	dst->gp_regs[PT_NIP] = regs->nip;
+	dst->gp_regs[PT_MSR] = regs->msr;
+	dst->gp_regs[PT_ORIG_R3] = regs->orig_gpr3;
+	dst->gp_regs[PT_CTR] = regs->ctr;
+	dst->gp_regs[PT_LNK] = regs->link;
+	dst->gp_regs[PT_XER] = regs->xer;
+	dst->gp_regs[PT_CCR] = regs->ccr;
+	dst->gp_regs[PT_TRAP] = regs->trap;
 }
 
 static void put_fpu_regs(mcontext_t *mc, uint64_t *fpregs)
@@ -74,9 +74,7 @@ static void put_vsx_regs(mcontext_t *mc, uint64_t *vsxregs)
 	memcpy((uint64_t *)(mc->v_regs + 1), vsxregs, sizeof(*vsxregs) * NVSXREG);
 }
 
-int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-			      user_regs_struct_t *regs,
-			      user_fpregs_struct_t *fpregs)
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	mcontext_t *dst_tc = &sigframe->uc_transact.uc_mcontext;
 	mcontext_t *dst = &sigframe->uc.uc_mcontext;
@@ -134,14 +132,12 @@ static void update_vregs(mcontext_t *lcontext, mcontext_t *rcontext)
 		uint64_t offset = (uint64_t)(lcontext->v_regs) - (uint64_t)lcontext;
 		lcontext->v_regs = (vrregset_t *)((uint64_t)rcontext + offset);
 
-		pr_debug("Updated v_regs:%llx (rcontext:%llx)\n",
-			 (unsigned long long)lcontext->v_regs,
+		pr_debug("Updated v_regs:%llx (rcontext:%llx)\n", (unsigned long long)lcontext->v_regs,
 			 (unsigned long long)rcontext);
 	}
 }
 
-int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *frame,
-				   struct rt_sigframe *rframe)
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *frame, struct rt_sigframe *rframe)
 {
 	uint64_t msr = frame->uc.uc_mcontext.gp_regs[PT_MSR];
 
@@ -155,9 +151,8 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *frame,
 
 	/* Updating the transactional state address if any */
 	if (frame->uc.uc_link) {
-		update_vregs(&frame->uc_transact.uc_mcontext,
-			     &rframe->uc_transact.uc_mcontext);
-		frame->uc.uc_link =  &rframe->uc_transact;
+		update_vregs(&frame->uc_transact.uc_mcontext, &rframe->uc_transact.uc_mcontext);
+		frame->uc.uc_link = &rframe->uc_transact;
 	}
 
 	return 0;
@@ -214,7 +209,7 @@ static int get_fpu_regs(pid_t pid, user_fpregs_struct_t *fp)
 
 static int get_altivec_regs(pid_t pid, user_fpregs_struct_t *fp)
 {
-	if (ptrace(PTRACE_GETVRREGS, pid, 0, (void*)&fp->vrregs) < 0) {
+	if (ptrace(PTRACE_GETVRREGS, pid, 0, (void *)&fp->vrregs) < 0) {
 		/* PTRACE_GETVRREGS returns EIO if Altivec is not supported.
 		 * This should not happen if msr_vec is set. */
 		if (errno != EIO) {
@@ -240,7 +235,7 @@ static int get_altivec_regs(pid_t pid, user_fpregs_struct_t *fp)
  */
 static int get_vsx_regs(pid_t pid, user_fpregs_struct_t *fp)
 {
-	if (ptrace(PTRACE_GETVSRREGS, pid, 0, (void*)fp->vsxregs) < 0) {
+	if (ptrace(PTRACE_GETVSRREGS, pid, 0, (void *)fp->vsxregs) < 0) {
 		/*
 		 * EIO is returned in the case PTRACE_GETVRREGS is not
 		 * supported.
@@ -263,22 +258,23 @@ static int get_tm_regs(pid_t pid, user_fpregs_struct_t *fpregs)
 
 	pr_debug("Dumping TM registers\n");
 
-#define TM_REQUIRED	0
-#define TM_OPTIONAL	1
-#define PTRACE_GET_TM(s,n,c,u) do {					\
-	iov.iov_base = &s;						\
-	iov.iov_len = sizeof(s);					\
-	if (ptrace(PTRACE_GETREGSET, pid, c, &iov)) {			\
-		if (!u || errno != EIO) {				\
-			pr_perror("Couldn't get TM "n);			\
-			pr_err("Your kernel seems to not support the "	\
-			       "new TM ptrace API (>= 4.8)\n");		\
-			goto out_free;					\
-		}							\
-		pr_debug("TM "n" not supported.\n");			\
-		iov.iov_base = NULL;					\
-	}								\
-} while(0)
+#define TM_REQUIRED 0
+#define TM_OPTIONAL 1
+#define PTRACE_GET_TM(s, n, c, u)                                              \
+	do {                                                                   \
+		iov.iov_base = &s;                                             \
+		iov.iov_len = sizeof(s);                                       \
+		if (ptrace(PTRACE_GETREGSET, pid, c, &iov)) {                  \
+			if (!u || errno != EIO) {                              \
+				pr_perror("Couldn't get TM " n);               \
+				pr_err("Your kernel seems to not support the " \
+				       "new TM ptrace API (>= 4.8)\n");        \
+				goto out_free;                                 \
+			}                                                      \
+			pr_debug("TM " n " not supported.\n");                 \
+			iov.iov_base = NULL;                                   \
+		}                                                              \
+	} while (0)
 
 	/* Get special registers */
 	PTRACE_GET_TM(fpregs->tm.tm_spr_regs, "SPR", NT_PPC_TM_SPR, TM_REQUIRED);
@@ -304,11 +300,10 @@ static int get_tm_regs(pid_t pid, user_fpregs_struct_t *fpregs)
 	return 0;
 
 out_free:
-	return -1;	/* still failing the checkpoint */
+	return -1; /* still failing the checkpoint */
 }
 
-static int __get_task_regs(pid_t pid, user_regs_struct_t *regs,
-			   user_fpregs_struct_t *fpregs)
+static int __get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
 
@@ -317,7 +312,7 @@ static int __get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	 * arch/powerpc/kernel/signal.c
 	 */
 #ifndef TRAP
-#define TRAP(r)              ((r).trap & ~0xF)
+#define TRAP(r) ((r).trap & ~0xF)
 #endif
 
 	if (TRAP(*regs) == 0x0C00 && regs->ccr & 0x10000000) {
@@ -347,10 +342,8 @@ static int __get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	 * impossible) or suspended (easy to get).
 	 */
 	if (MSR_TM_ACTIVE(regs->msr)) {
-		pr_debug("Task %d has %s TM operation at 0x%lx\n",
-			 pid,
-			 (regs->msr & MSR_TMS) ? "a suspended" : "an active",
-			 regs->nip);
+		pr_debug("Task %d has %s TM operation at 0x%lx\n", pid,
+			 (regs->msr & MSR_TMS) ? "a suspended" : "an active", regs->nip);
 		if (get_tm_regs(pid, fpregs))
 			return -1;
 		fpregs->flags = USER_FPREGS_FL_TM;
@@ -372,9 +365,8 @@ static int __get_task_regs(pid_t pid, user_regs_struct_t *regs,
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-		  user_fpregs_struct_t *ext_regs, save_regs_t save,
-		  void *arg, __maybe_unused unsigned long flags)
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
 {
 	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
 	int ret;
@@ -401,11 +393,11 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 	}
 
 	if (ext_regs->flags & USER_FPREGS_FL_ALTIVEC) {
-		if (ptrace(PTRACE_SETVRREGS, pid, 0, (void*)&ext_regs->vrregs) < 0) {
+		if (ptrace(PTRACE_SETVRREGS, pid, 0, (void *)&ext_regs->vrregs) < 0) {
 			pr_perror("Couldn't set Altivec registers");
 			ret = -1;
 		}
-		if (ptrace(PTRACE_SETVSRREGS, pid, 0, (void*)ext_regs->vsxregs) < 0) {
+		if (ptrace(PTRACE_SETVSRREGS, pid, 0, (void *)ext_regs->vsxregs) < 0) {
 			pr_perror("Couldn't set VSX registers");
 			ret = -1;
 		}
@@ -414,13 +406,8 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 	return ret;
 }
 
-int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
-		unsigned long arg1,
-		unsigned long arg2,
-		unsigned long arg3,
-		unsigned long arg4,
-		unsigned long arg5,
-		unsigned long arg6)
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
 {
 	user_regs_struct_t regs = ctl->orig.regs;
 	int err;
@@ -433,21 +420,18 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 	regs.gpr[7] = arg5;
 	regs.gpr[8] = arg6;
 
-	err = compel_execute_syscall(ctl, &regs, (char*)code_syscall);
+	err = compel_execute_syscall(ctl, &regs, (char *)code_syscall);
 
 	*ret = regs.gpr[3];
 	return err;
 }
 
-void *remote_mmap(struct parasite_ctl *ctl,
-		  void *addr, size_t length, int prot,
-		  int flags, int fd, off_t offset)
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
 {
 	long map = 0;
 	int err;
 
-	err = compel_syscall(ctl, __NR_mmap, &map,
-			(unsigned long)addr, length, prot, flags, fd, offset);
+	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long)addr, length, prot, flags, fd, offset);
 	if (err < 0 || (long)map < 0)
 		map = 0;
 
@@ -463,7 +447,7 @@ void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *
 	regs->gpr[12] = new_ip;
 	regs->nip = new_ip;
 	if (stack)
-		regs->gpr[1] = (unsigned long) stack;
+		regs->gpr[1] = (unsigned long)stack;
 	regs->trap = 0;
 }
 
@@ -480,9 +464,7 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 	long ret;
 	int err;
 
-	err = compel_syscall(ctl, __NR_sigaltstack,
-			     &ret, 0, (unsigned long)&s->uc.uc_stack,
-			     0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->uc.uc_stack, 0, 0, 0, 0);
 	return err ? err : ret;
 }
 
@@ -491,7 +473,7 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
  *
  * NOTE: 32bit tasks are not supported.
  */
-#define TASK_SIZE_64TB  (0x0000400000000000UL)
+#define TASK_SIZE_64TB	(0x0000400000000000UL)
 #define TASK_SIZE_512TB (0x0002000000000000UL)
 
 #define TASK_SIZE_MIN TASK_SIZE_64TB
diff --git a/compel/arch/s390/plugins/std/syscalls/syscalls-s390.c b/compel/arch/s390/plugins/std/syscalls/syscalls-s390.c
index 2b35cca4a..11c3284ab 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscalls-s390.c
+++ b/compel/arch/s390/plugins/std/syscalls/syscalls-s390.c
@@ -3,14 +3,13 @@
 /*
  * Define prototype because of compile error if we include uapi/std/syscall.h
  */
-long sys_old_mmap (struct mmap_arg_struct *);
+long sys_old_mmap(struct mmap_arg_struct *);
 
 /*
  * On s390 we have defined __ARCH_WANT_SYS_OLD_MMAP - Therefore implement
  * system call with one parameter "mmap_arg_struct".
  */
-unsigned long sys_mmap(void *addr, unsigned long len, unsigned long prot,
-		       unsigned long flags, unsigned long fd,
+unsigned long sys_mmap(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd,
 		       unsigned long offset)
 {
 	struct mmap_arg_struct arg_struct;
diff --git a/compel/arch/s390/src/lib/cpu.c b/compel/arch/s390/src/lib/cpu.c
index 5d86bf239..c98607e16 100644
--- a/compel/arch/s390/src/lib/cpu.c
+++ b/compel/arch/s390/src/lib/cpu.c
@@ -9,7 +9,7 @@
 
 #include "log.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 static compel_cpuinfo_t rt_info;
@@ -23,10 +23,20 @@ static void fetch_rt_cpuinfo(void)
 	}
 }
 
-void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature) { }
-void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature) { }
-int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; }
-int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature) { return 0; }
+void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+}
+void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+}
+int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
+int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+	return 0;
+}
 
 int compel_cpuid(compel_cpuinfo_t *info)
 {
diff --git a/compel/arch/s390/src/lib/handle-elf.c b/compel/arch/s390/src/lib/handle-elf.c
index 6ed382c92..8e766dc1b 100644
--- a/compel/arch/s390/src/lib/handle-elf.c
+++ b/compel/arch/s390/src/lib/handle-elf.c
@@ -5,9 +5,8 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused
-elf_ident_64[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index a928c72c3..77ace713a 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -17,25 +17,23 @@
 #include "ptrace.h"
 #include "infect-priv.h"
 
-#define NT_PRFPREG		2
-#define NT_S390_VXRS_LOW	0x309
-#define NT_S390_VXRS_HIGH	0x30a
-#define NT_S390_GS_CB		0x30b
-#define NT_S390_GS_BC		0x30c
-#define NT_S390_RI_CB		0x30d
+#define NT_PRFPREG	  2
+#define NT_S390_VXRS_LOW  0x309
+#define NT_S390_VXRS_HIGH 0x30a
+#define NT_S390_GS_CB	  0x30b
+#define NT_S390_GS_BC	  0x30c
+#define NT_S390_RI_CB	  0x30d
 
 /*
  * Print general purpose and access registers
  */
-static void print_user_regs_struct(const char *msg, int pid,
-				   user_regs_struct_t *regs)
+static void print_user_regs_struct(const char *msg, int pid, user_regs_struct_t *regs)
 {
 	int i;
 
 	pr_debug("%s: Registers for pid=%d\n", msg, pid);
-	pr_debug("system_call %08lx\n", (unsigned long) regs->system_call);
-	pr_debug("       psw %016lx %016lx\n", regs->prstatus.psw.mask,
-		 regs->prstatus.psw.addr);
+	pr_debug("system_call %08lx\n", (unsigned long)regs->system_call);
+	pr_debug("       psw %016lx %016lx\n", regs->prstatus.psw.mask, regs->prstatus.psw.addr);
 	pr_debug(" orig_gpr2 %016lx\n", regs->prstatus.orig_gpr2);
 	for (i = 0; i < 16; i++)
 		pr_debug("       g%02d %016lx\n", i, regs->prstatus.gprs[i]);
@@ -57,9 +55,7 @@ static void print_vxrs(user_fpregs_struct_t *fpregs)
 	for (i = 0; i < 16; i++)
 		pr_debug("  vx_low%02d %016lx\n", i, fpregs->vxrs_low[i]);
 	for (i = 0; i < 16; i++)
-		pr_debug(" vx_high%02d %016lx %016lx\n", i,
-			 fpregs->vxrs_high[i].part1,
-			 fpregs->vxrs_high[i].part2);
+		pr_debug(" vx_high%02d %016lx %016lx\n", i, fpregs->vxrs_high[i].part1, fpregs->vxrs_high[i].part2);
 }
 
 /*
@@ -111,8 +107,7 @@ static void print_ri_cb(user_fpregs_struct_t *fpregs)
  * Print FP registers, VX registers, guarded-storage, and
  * runtime-instrumentation
  */
-static void print_user_fpregs_struct(const char *msg, int pid,
-				     user_fpregs_struct_t *fpregs)
+static void print_user_fpregs_struct(const char *msg, int pid, user_fpregs_struct_t *fpregs)
 {
 	int i;
 
@@ -126,28 +121,19 @@ static void print_user_fpregs_struct(const char *msg, int pid,
 	print_ri_cb(fpregs);
 }
 
-int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-			      user_regs_struct_t *regs,
-			      user_fpregs_struct_t *fpregs)
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	_sigregs_ext *dst_ext = &sigframe->uc.uc_mcontext_ext;
 	_sigregs *dst = &sigframe->uc.uc_mcontext;
 
-	memcpy(dst->regs.gprs, regs->prstatus.gprs,
-	       sizeof(regs->prstatus.gprs));
-	memcpy(dst->regs.acrs, regs->prstatus.acrs,
-	       sizeof(regs->prstatus.acrs));
-	memcpy(&dst->regs.psw, &regs->prstatus.psw,
-	       sizeof(regs->prstatus.psw));
-	memcpy(&dst->fpregs.fpc, &fpregs->prfpreg.fpc,
-	       sizeof(fpregs->prfpreg.fpc));
-	memcpy(&dst->fpregs.fprs, &fpregs->prfpreg.fprs,
-	       sizeof(fpregs->prfpreg.fprs));
+	memcpy(dst->regs.gprs, regs->prstatus.gprs, sizeof(regs->prstatus.gprs));
+	memcpy(dst->regs.acrs, regs->prstatus.acrs, sizeof(regs->prstatus.acrs));
+	memcpy(&dst->regs.psw, &regs->prstatus.psw, sizeof(regs->prstatus.psw));
+	memcpy(&dst->fpregs.fpc, &fpregs->prfpreg.fpc, sizeof(fpregs->prfpreg.fpc));
+	memcpy(&dst->fpregs.fprs, &fpregs->prfpreg.fprs, sizeof(fpregs->prfpreg.fprs));
 	if (fpregs->flags & USER_FPREGS_VXRS) {
-		memcpy(&dst_ext->vxrs_low, &fpregs->vxrs_low,
-		       sizeof(fpregs->vxrs_low));
-		memcpy(&dst_ext->vxrs_high, &fpregs->vxrs_high,
-		       sizeof(fpregs->vxrs_high));
+		memcpy(&dst_ext->vxrs_low, &fpregs->vxrs_low, sizeof(fpregs->vxrs_low));
+		memcpy(&dst_ext->vxrs_high, &fpregs->vxrs_high, sizeof(fpregs->vxrs_high));
 	} else {
 		memset(&dst_ext->vxrs_low, 0, sizeof(dst_ext->vxrs_low));
 		memset(&dst_ext->vxrs_high, 0, sizeof(dst_ext->vxrs_high));
@@ -155,8 +141,7 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 	return 0;
 }
 
-int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
-				   struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
@@ -169,9 +154,7 @@ static inline void rewind_psw(psw_t *psw, unsigned long bytes)
 	unsigned long mask;
 
 	pr_debug("Rewind psw: %016lx bytes=%lu\n", psw->addr, bytes);
-	mask = (psw->mask & PSW_MASK_EA) ? -1UL :
-		(psw->mask & PSW_MASK_BA) ? (1UL << 31) - 1 :
-		(1UL << 24) - 1;
+	mask = (psw->mask & PSW_MASK_EA) ? -1UL : (psw->mask & PSW_MASK_BA) ? (1UL << 31) - 1 : (1UL << 24) - 1;
 	psw->addr = (psw->addr - bytes) & mask;
 }
 
@@ -310,9 +293,8 @@ static int s390_disable_ri_bit(pid_t pid, user_regs_struct_t *regs)
 /*
  * Prepare task registers for restart
  */
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-		  user_fpregs_struct_t *ext_regs, save_regs_t save,
-		  void *arg, __maybe_unused unsigned long flags)
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
 {
 	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
 	struct iovec iov;
@@ -429,10 +411,10 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
  * Injected syscall instruction
  */
 const char code_syscall[] = {
-	0x0a, 0x00,		/* sc 0 */
-	0x00, 0x01,		/* S390_BREAKPOINT_U16 */
-	0x00, 0x01,		/* S390_BREAKPOINT_U16 */
-	0x00, 0x01,		/* S390_BREAKPOINT_U16 */
+	0x0a, 0x00, /* sc 0 */
+	0x00, 0x01, /* S390_BREAKPOINT_U16 */
+	0x00, 0x01, /* S390_BREAKPOINT_U16 */
+	0x00, 0x01, /* S390_BREAKPOINT_U16 */
 };
 
 static inline void __check_code_syscall(void)
@@ -444,19 +426,14 @@ static inline void __check_code_syscall(void)
 /*
  * Issue s390 system call
  */
-int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
-		unsigned long arg1,
-		unsigned long arg2,
-		unsigned long arg3,
-		unsigned long arg4,
-		unsigned long arg5,
-		unsigned long arg6)
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
 {
 	user_regs_struct_t regs = ctl->orig.regs;
 	int err;
 
 	/* Load syscall number into %r1 */
-	regs.prstatus.gprs[1] = (unsigned long) nr;
+	regs.prstatus.gprs[1] = (unsigned long)nr;
 	/* Load parameter registers %r2-%r7 */
 	regs.prstatus.gprs[2] = arg1;
 	regs.prstatus.gprs[3] = arg2;
@@ -465,7 +442,7 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 	regs.prstatus.gprs[6] = arg5;
 	regs.prstatus.gprs[7] = arg6;
 
-	err = compel_execute_syscall(ctl, &regs, (char *) code_syscall);
+	err = compel_execute_syscall(ctl, &regs, (char *)code_syscall);
 
 	/* Return code from system is in %r2 */
 	if (ret)
@@ -476,9 +453,7 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 /*
  * Issue s390 mmap call
  */
-void *remote_mmap(struct parasite_ctl *ctl,
-		  void *addr, size_t length, int prot,
-		  int flags, int fd, off_t offset)
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
 {
 	void *where = (void *)ctl->ictx.syscall_ip + BUILTIN_SYSCALL_SIZE;
 	struct mmap_arg_struct arg_struct;
@@ -501,8 +476,7 @@ void *remote_mmap(struct parasite_ctl *ctl,
 	}
 
 	/* Do syscall */
-	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long) where,
-			     0, 0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long)where, 0, 0, 0, 0, 0);
 	if (err < 0 || (long)map < 0)
 		map = 0;
 
@@ -510,8 +484,7 @@ void *remote_mmap(struct parasite_ctl *ctl,
 	if (ptrace_poke_area(pid, &arg_struct, where, sizeof(arg_struct))) {
 		pr_err("Can't restore mmap args (pid: %d)\n", pid);
 		if (map != 0) {
-			err = compel_syscall(ctl, __NR_munmap, NULL, map,
-					     length, 0, 0, 0, 0);
+			err = compel_syscall(ctl, __NR_munmap, NULL, map, length, 0, 0, 0, 0);
 			if (err)
 				pr_err("Can't munmap %d\n", err);
 			map = 0;
@@ -524,14 +497,12 @@ void *remote_mmap(struct parasite_ctl *ctl,
 /*
  * Setup registers for parasite call
  */
-void parasite_setup_regs(unsigned long new_ip, void *stack,
-			 user_regs_struct_t *regs)
+void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
 {
 	regs->prstatus.psw.addr = new_ip;
 	if (!stack)
 		return;
-	regs->prstatus.gprs[15] = ((unsigned long) stack) -
-		STACK_FRAME_OVERHEAD;
+	regs->prstatus.gprs[15] = ((unsigned long)stack) - STACK_FRAME_OVERHEAD;
 }
 
 /*
@@ -579,9 +550,7 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 	long ret;
 	int err;
 
-	err = compel_syscall(ctl, __NR_sigaltstack,
-			     &ret, 0, (unsigned long)&s->uc.uc_stack,
-			     0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->uc.uc_stack, 0, 0, 0, 0);
 	return err ? err : ret;
 }
 
@@ -655,9 +624,9 @@ enum kernel_ts_level {
 };
 
 /* See arch/s390/include/asm/processor.h */
-#define TASK_SIZE_LEVEL_3	0x40000000000UL		/* 4 TB */
-#define TASK_SIZE_LEVEL_4	0x20000000000000UL	/* 8 PB */
-#define TASK_SIZE_LEVEL_5	0xffffffffffffefffUL	/* 16 EB - 0x1000 */
+#define TASK_SIZE_LEVEL_3 0x40000000000UL /* 4 TB */
+#define TASK_SIZE_LEVEL_4 0x20000000000000UL /* 8 PB */
+#define TASK_SIZE_LEVEL_5 0xffffffffffffefffUL /* 16 EB - 0x1000 */
 
 /*
  * Return detected kernel version regarding task size level
@@ -671,12 +640,12 @@ static enum kernel_ts_level get_kernel_ts_level(void)
 	/* Check for 5 levels */
 	if (criu_end_addr >= TASK_SIZE_LEVEL_4)
 		return KERNEL_TS_LEVEL_5;
-	else if (munmap((void *) TASK_SIZE_LEVEL_4, 0x1000) == 0)
+	else if (munmap((void *)TASK_SIZE_LEVEL_4, 0x1000) == 0)
 		return KERNEL_TS_LEVEL_5;
 
 	if (criu_end_addr < TASK_SIZE_LEVEL_3) {
 		/* Check for 4 level kernel with fix */
-		if (munmap((void *) TASK_SIZE_LEVEL_3, 0x1000) == 0)
+		if (munmap((void *)TASK_SIZE_LEVEL_3, 0x1000) == 0)
 			return KERNEL_TS_LEVEL_4_FIX_YES;
 		else
 			return KERNEL_TS_LEVEL_4_FIX_NO;
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall32.c b/compel/arch/x86/plugins/std/syscalls/syscall32.c
index e172cacff..0f2fec3ff 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall32.c
+++ b/compel/arch/x86/plugins/std/syscalls/syscall32.c
@@ -1,16 +1,16 @@
 #include "asm/types.h"
 #include "syscall-32.h"
 
-#define SYS_SOCKET	1		/* sys_socket(2)		*/
-#define SYS_BIND	2		/* sys_bind(2)			*/
-#define SYS_CONNECT	3		/* sys_connect(2)		*/
-#define SYS_SENDTO	11		/* sys_sendto(2)		*/
-#define SYS_RECVFROM	12		/* sys_recvfrom(2)		*/
-#define SYS_SHUTDOWN	13		/* sys_shutdown(2)		*/
-#define SYS_SETSOCKOPT	14		/* sys_setsockopt(2)		*/
-#define SYS_GETSOCKOPT	15		/* sys_getsockopt(2)		*/
-#define SYS_SENDMSG	16		/* sys_sendmsg(2)		*/
-#define SYS_RECVMSG	17		/* sys_recvmsg(2)		*/
+#define SYS_SOCKET     1 /* sys_socket(2)		*/
+#define SYS_BIND       2 /* sys_bind(2)			*/
+#define SYS_CONNECT    3 /* sys_connect(2)		*/
+#define SYS_SENDTO     11 /* sys_sendto(2)		*/
+#define SYS_RECVFROM   12 /* sys_recvfrom(2)		*/
+#define SYS_SHUTDOWN   13 /* sys_shutdown(2)		*/
+#define SYS_SETSOCKOPT 14 /* sys_setsockopt(2)		*/
+#define SYS_GETSOCKOPT 15 /* sys_getsockopt(2)		*/
+#define SYS_SENDMSG    16 /* sys_sendmsg(2)		*/
+#define SYS_RECVMSG    17 /* sys_recvmsg(2)		*/
 
 long sys_socket(int domain, int type, int protocol)
 {
@@ -20,59 +20,61 @@ long sys_socket(int domain, int type, int protocol)
 
 long sys_connect(int sockfd, struct sockaddr *addr, int addrlen)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)addr, (uint32_t)addrlen};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)addr, (uint32_t)addrlen };
 	return sys_socketcall(SYS_CONNECT, (unsigned long *)a);
 }
 
 long sys_sendto(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)buff, (uint32_t)len, (uint32_t)flags, (uint32_t)addr, (uint32_t)addr_len};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)buff, (uint32_t)len,
+			 (uint32_t)flags,  (uint32_t)addr, (uint32_t)addr_len };
 	return sys_socketcall(SYS_SENDTO, (unsigned long *)a);
 }
 
 long sys_recvfrom(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)ubuf, (uint32_t)size, (uint32_t)flags, (uint32_t)addr, (uint32_t)addr_len};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)ubuf, (uint32_t)size,
+			 (uint32_t)flags,  (uint32_t)addr, (uint32_t)addr_len };
 	return sys_socketcall(SYS_RECVFROM, (unsigned long *)a);
 }
 
 long sys_sendmsg(int sockfd, const struct msghdr *msg, int flags)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)msg, (uint32_t)flags};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)msg, (uint32_t)flags };
 	return sys_socketcall(SYS_SENDMSG, (unsigned long *)a);
 }
 
 long sys_recvmsg(int sockfd, struct msghdr *msg, int flags)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)msg, (uint32_t)flags};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)msg, (uint32_t)flags };
 	return sys_socketcall(SYS_RECVMSG, (unsigned long *)a);
 }
 
 long sys_shutdown(int sockfd, int how)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)how};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)how };
 	return sys_socketcall(SYS_SHUTDOWN, (unsigned long *)a);
 }
 
 long sys_bind(int sockfd, const struct sockaddr *addr, int addrlen)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)addr, (uint32_t)addrlen};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)addr, (uint32_t)addrlen };
 	return sys_socketcall(SYS_BIND, (unsigned long *)a);
 }
 
 long sys_setsockopt(int sockfd, int level, int optname, const void *optval, unsigned int optlen)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)level, (uint32_t)optname, (uint32_t)optval, (uint32_t)optlen};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)level, (uint32_t)optname, (uint32_t)optval, (uint32_t)optlen };
 	return sys_socketcall(SYS_SETSOCKOPT, (unsigned long *)a);
 }
 
 long sys_getsockopt(int sockfd, int level, int optname, const void *optval, unsigned int *optlen)
 {
-	uint32_t a[] = {(uint32_t)sockfd, (uint32_t)level, (uint32_t)optname, (uint32_t)optval, (uint32_t)optlen};
+	uint32_t a[] = { (uint32_t)sockfd, (uint32_t)level, (uint32_t)optname, (uint32_t)optval, (uint32_t)optlen };
 	return sys_socketcall(SYS_GETSOCKOPT, (unsigned long *)a);
 }
 
-#define SHMAT		21
+#define SHMAT 21
 
 long sys_shmat(int shmid, void *shmaddr, int shmflag)
 {
diff --git a/compel/arch/x86/src/lib/cpu.c b/compel/arch/x86/src/lib/cpu.c
index c96f01353..5ca794ea0 100644
--- a/compel/arch/x86/src/lib/cpu.c
+++ b/compel/arch/x86/src/lib/cpu.c
@@ -8,7 +8,7 @@
 #include "log.h"
 #include "common/bug.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 static compel_cpuinfo_t rt_info;
@@ -29,32 +29,24 @@ static void fetch_rt_cpuinfo(void)
  * to save/restore PT state in Linux.
  */
 
-static const char * const xfeature_names[] = {
-	"x87 floating point registers"	,
-	"SSE registers"			,
-	"AVX registers"			,
-	"MPX bounds registers"		,
-	"MPX CSR"			,
-	"AVX-512 opmask"		,
-	"AVX-512 Hi256"			,
-	"AVX-512 ZMM_Hi256"		,
-	"Processor Trace"		,
+static const char *const xfeature_names[] = {
+	"x87 floating point registers",
+	"SSE registers",
+	"AVX registers",
+	"MPX bounds registers",
+	"MPX CSR",
+	"AVX-512 opmask",
+	"AVX-512 Hi256",
+	"AVX-512 ZMM_Hi256",
+	"Processor Trace",
 	"Protection Keys User registers",
-	"Hardware Duty Cycling"		,
+	"Hardware Duty Cycling",
 };
 
 static short xsave_cpuid_features[] = {
-	X86_FEATURE_FPU,
-	X86_FEATURE_XMM,
-	X86_FEATURE_AVX,
-	X86_FEATURE_MPX,
-	X86_FEATURE_MPX,
-	X86_FEATURE_AVX512F,
-	X86_FEATURE_AVX512F,
-	X86_FEATURE_AVX512F,
-	X86_FEATURE_INTEL_PT,
-	X86_FEATURE_PKU,
-	X86_FEATURE_HDC,
+	X86_FEATURE_FPU,      X86_FEATURE_XMM,	   X86_FEATURE_AVX,	X86_FEATURE_MPX,
+	X86_FEATURE_MPX,      X86_FEATURE_AVX512F, X86_FEATURE_AVX512F, X86_FEATURE_AVX512F,
+	X86_FEATURE_INTEL_PT, X86_FEATURE_PKU,	   X86_FEATURE_HDC,
 };
 
 void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
@@ -89,8 +81,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 	uint32_t eax, ebx, ecx, edx;
 	size_t i;
 
-	BUILD_BUG_ON(ARRAY_SIZE(xsave_cpuid_features) !=
-		     ARRAY_SIZE(xfeature_names));
+	BUILD_BUG_ON(ARRAY_SIZE(xsave_cpuid_features) != ARRAY_SIZE(xfeature_names));
 
 	if (!compel_test_cpu_cap(c, X86_FEATURE_FPU)) {
 		pr_err("fpu: No FPU detected\n");
@@ -98,9 +89,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 	}
 
 	if (!compel_test_cpu_cap(c, X86_FEATURE_XSAVE)) {
-		pr_info("fpu: x87 FPU will use %s\n",
-			compel_test_cpu_cap(c, X86_FEATURE_FXSR) ?
-			"FXSAVE" : "FSAVE");
+		pr_info("fpu: x87 FPU will use %s\n", compel_test_cpu_cap(c, X86_FEATURE_FXSR) ? "FXSAVE" : "FSAVE");
 		return 0;
 	}
 
@@ -140,12 +129,11 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 	c->xsaves_size = ebx;
 
 	pr_debug("fpu: xfeatures_mask 0x%llx xsave_size %u xsave_size_max %u xsaves_size %u\n",
-		 (unsigned long long)c->xfeatures_mask,
-		 c->xsave_size, c->xsave_size_max, c->xsaves_size);
+		 (unsigned long long)c->xfeatures_mask, c->xsave_size, c->xsave_size_max, c->xsaves_size);
 
 	if (c->xsave_size_max > sizeof(struct xsave_struct))
-		pr_warn_once("fpu: max xsave frame exceed xsave_struct (%u %u)\n",
-			     c->xsave_size_max, (unsigned)sizeof(struct xsave_struct));
+		pr_warn_once("fpu: max xsave frame exceed xsave_struct (%u %u)\n", c->xsave_size_max,
+			     (unsigned)sizeof(struct xsave_struct));
 
 	memset(c->xstate_offsets, 0xff, sizeof(c->xstate_offsets));
 	memset(c->xstate_sizes, 0xff, sizeof(c->xstate_sizes));
@@ -160,10 +148,10 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 	 * in the fixed offsets in the xsave area in either compacted form
 	 * or standard form.
 	 */
-	c->xstate_offsets[0]	= 0;
-	c->xstate_sizes[0]	= offsetof(struct i387_fxsave_struct, xmm_space);
-	c->xstate_offsets[1]	= c->xstate_sizes[0];
-	c->xstate_sizes[1]	= FIELD_SIZEOF(struct i387_fxsave_struct, xmm_space);
+	c->xstate_offsets[0] = 0;
+	c->xstate_sizes[0] = offsetof(struct i387_fxsave_struct, xmm_space);
+	c->xstate_offsets[1] = c->xstate_sizes[0];
+	c->xstate_sizes[1] = FIELD_SIZEOF(struct i387_fxsave_struct, xmm_space);
 
 	for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
 		if (!(c->xfeatures_mask & (1UL << i)))
@@ -189,8 +177,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 		 * highest offset in the buffer.  Ensure it does.
 		 */
 		if (last_good_offset > c->xstate_offsets[i])
-			pr_warn_once("fpu: misordered xstate %d %d\n",
-				     last_good_offset, c->xstate_offsets[i]);
+			pr_warn_once("fpu: misordered xstate %d %d\n", last_good_offset, c->xstate_offsets[i]);
 
 		last_good_offset = c->xstate_offsets[i];
 	}
@@ -198,10 +185,10 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 	BUILD_BUG_ON(sizeof(c->xstate_offsets) != sizeof(c->xstate_sizes));
 	BUILD_BUG_ON(sizeof(c->xstate_comp_offsets) != sizeof(c->xstate_comp_sizes));
 
-	c->xstate_comp_offsets[0]	= 0;
-	c->xstate_comp_sizes[0]		= offsetof(struct i387_fxsave_struct, xmm_space);
-	c->xstate_comp_offsets[1]	= c->xstate_comp_sizes[0];
-	c->xstate_comp_sizes[1]		= FIELD_SIZEOF(struct i387_fxsave_struct, xmm_space);
+	c->xstate_comp_offsets[0] = 0;
+	c->xstate_comp_sizes[0] = offsetof(struct i387_fxsave_struct, xmm_space);
+	c->xstate_comp_offsets[1] = c->xstate_comp_sizes[0];
+	c->xstate_comp_sizes[1] = FIELD_SIZEOF(struct i387_fxsave_struct, xmm_space);
 
 	if (!compel_test_cpu_cap(c, X86_FEATURE_XSAVES)) {
 		for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
@@ -211,8 +198,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 			}
 		}
 	} else {
-		c->xstate_comp_offsets[FIRST_EXTENDED_XFEATURE] =
-			FXSAVE_SIZE + XSAVE_HDR_SIZE;
+		c->xstate_comp_offsets[FIRST_EXTENDED_XFEATURE] = FXSAVE_SIZE + XSAVE_HDR_SIZE;
 
 		for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
 			if ((c->xfeatures_mask & (1UL << i)))
@@ -221,8 +207,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 				c->xstate_comp_sizes[i] = 0;
 
 			if (i > FIRST_EXTENDED_XFEATURE) {
-				c->xstate_comp_offsets[i] = c->xstate_comp_offsets[i-1]
-					+ c->xstate_comp_sizes[i-1];
+				c->xstate_comp_offsets[i] = c->xstate_comp_offsets[i - 1] + c->xstate_comp_sizes[i - 1];
 
 				/*
 				 * The value returned by ECX[1] indicates the alignment
@@ -240,9 +225,9 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 		for (i = 0; i < ARRAY_SIZE(c->xstate_offsets); i++) {
 			if (!(c->xfeatures_mask & (1UL << i)))
 				continue;
-			pr_debug("fpu: %-32s xstate_offsets %6d / %-6d xstate_sizes %6d / %-6d\n",
-				 xfeature_names[i], c->xstate_offsets[i], c->xstate_comp_offsets[i],
-				 c->xstate_sizes[i], c->xstate_comp_sizes[i]);
+			pr_debug("fpu: %-32s xstate_offsets %6d / %-6d xstate_sizes %6d / %-6d\n", xfeature_names[i],
+				 c->xstate_offsets[i], c->xstate_comp_offsets[i], c->xstate_sizes[i],
+				 c->xstate_comp_sizes[i]);
 		}
 	}
 
@@ -261,20 +246,15 @@ int compel_cpuid(compel_cpuinfo_t *c)
 	 */
 
 	/* Get vendor name */
-	cpuid(0x00000000,
-	      (unsigned int *)&c->cpuid_level,
-	      (unsigned int *)&c->x86_vendor_id[0],
-	      (unsigned int *)&c->x86_vendor_id[8],
-	      (unsigned int *)&c->x86_vendor_id[4]);
+	cpuid(0x00000000, (unsigned int *)&c->cpuid_level, (unsigned int *)&c->x86_vendor_id[0],
+	      (unsigned int *)&c->x86_vendor_id[8], (unsigned int *)&c->x86_vendor_id[4]);
 
 	if (!strcmp(c->x86_vendor_id, "GenuineIntel")) {
 		c->x86_vendor = X86_VENDOR_INTEL;
-	} else if (!strcmp(c->x86_vendor_id, "AuthenticAMD") ||
-		!strcmp(c->x86_vendor_id, "HygonGenuine")) {
+	} else if (!strcmp(c->x86_vendor_id, "AuthenticAMD") || !strcmp(c->x86_vendor_id, "HygonGenuine")) {
 		c->x86_vendor = X86_VENDOR_AMD;
 	} else {
-		pr_err("Unsupported CPU vendor %s\n",
-		       c->x86_vendor_id);
+		pr_err("Unsupported CPU vendor %s\n", c->x86_vendor_id);
 		return -1;
 	}
 
@@ -369,7 +349,7 @@ int compel_cpuid(compel_cpuinfo_t *c)
 			while (*p)
 				*q++ = *p++;
 			while (q <= &c->x86_model_id[48])
-				*q++ = '\0';	/* Zero-pad the rest */
+				*q++ = '\0'; /* Zero-pad the rest */
 		}
 	}
 
@@ -440,8 +420,7 @@ int compel_cpuid(compel_cpuinfo_t *c)
 		break;
 	}
 
-	pr_debug("x86_family %u x86_vendor_id %s x86_model_id %s\n",
-		 c->x86_family, c->x86_vendor_id, c->x86_model_id);
+	pr_debug("x86_family %u x86_vendor_id %s x86_model_id %s\n", c->x86_family, c->x86_vendor_id, c->x86_model_id);
 
 	return compel_fpuid(c);
 }
@@ -461,8 +440,7 @@ bool compel_fpu_has_feature(unsigned int feature)
 uint32_t compel_fpu_feature_size(unsigned int feature)
 {
 	fetch_rt_cpuinfo();
-	if (feature >= FIRST_EXTENDED_XFEATURE &&
-	    feature < XFEATURE_MAX)
+	if (feature >= FIRST_EXTENDED_XFEATURE && feature < XFEATURE_MAX)
 		return rt_info.xstate_sizes[feature];
 	return 0;
 }
@@ -470,8 +448,7 @@ uint32_t compel_fpu_feature_size(unsigned int feature)
 uint32_t compel_fpu_feature_offset(unsigned int feature)
 {
 	fetch_rt_cpuinfo();
-	if (feature >= FIRST_EXTENDED_XFEATURE &&
-	    feature < XFEATURE_MAX)
+	if (feature >= FIRST_EXTENDED_XFEATURE && feature < XFEATURE_MAX)
 		return rt_info.xstate_offsets[feature];
 	return 0;
 }
diff --git a/compel/arch/x86/src/lib/handle-elf.c b/compel/arch/x86/src/lib/handle-elf.c
index 938999b2e..78b23f28a 100644
--- a/compel/arch/x86/src/lib/handle-elf.c
+++ b/compel/arch/x86/src/lib/handle-elf.c
@@ -5,9 +5,8 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused
-elf_ident_64_le[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 566238d2d..1e344bf3a 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -24,29 +24,27 @@
 #include "log.h"
 
 #ifndef NT_X86_XSTATE
-#define NT_X86_XSTATE	0x202		/* x86 extended state using xsave */
+#define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */
 #endif
 #ifndef NT_PRSTATUS
-#define NT_PRSTATUS	1		/* Contains copy of prstatus struct */
+#define NT_PRSTATUS 1 /* Contains copy of prstatus struct */
 #endif
 
 /*
  * Injected syscall instruction
  */
 const char code_syscall[] = {
-	0x0f, 0x05,				/* syscall    */
-	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc	/* int 3, ... */
+	0x0f, 0x05, /* syscall    */
+	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc /* int 3, ... */
 };
 
 const char code_int_80[] = {
-	0xcd, 0x80,				/* int $0x80  */
-	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc	/* int 3, ... */
+	0xcd, 0x80, /* int $0x80  */
+	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc /* int 3, ... */
 };
 
-static const int
-code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
-static const int
-code_int_80_aligned = round_up(sizeof(code_syscall), sizeof(long));
+static const int code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
+static const int code_int_80_aligned = round_up(sizeof(code_syscall), sizeof(long));
 
 static inline __always_unused void __check_code_syscall(void)
 {
@@ -57,22 +55,22 @@ static inline __always_unused void __check_code_syscall(void)
 
 /* 10-byte legacy floating point register */
 struct fpreg {
-	uint16_t			significand[4];
-	uint16_t			exponent;
+	uint16_t significand[4];
+	uint16_t exponent;
 };
 
 /* 16-byte floating point register */
 struct fpxreg {
-	uint16_t			significand[4];
-	uint16_t			exponent;
-	uint16_t			padding[3];
+	uint16_t significand[4];
+	uint16_t exponent;
+	uint16_t padding[3];
 };
 
-#define FPREG_ADDR(f, n)	((void *)&(f)->st_space + (n) * 16)
-#define FP_EXP_TAG_VALID	0
-#define FP_EXP_TAG_ZERO		1
-#define FP_EXP_TAG_SPECIAL	2
-#define FP_EXP_TAG_EMPTY	3
+#define FPREG_ADDR(f, n)   ((void *)&(f)->st_space + (n)*16)
+#define FP_EXP_TAG_VALID   0
+#define FP_EXP_TAG_ZERO	   1
+#define FP_EXP_TAG_SPECIAL 2
+#define FP_EXP_TAG_EMPTY   3
 
 static inline uint32_t twd_fxsr_to_i387(struct i387_fxsave_struct *fxsave)
 {
@@ -92,9 +90,7 @@ static inline uint32_t twd_fxsr_to_i387(struct i387_fxsave_struct *fxsave)
 				tag = FP_EXP_TAG_SPECIAL;
 				break;
 			case 0x0000:
-				if (!st->significand[0] &&
-				    !st->significand[1] &&
-				    !st->significand[2] &&
+				if (!st->significand[0] && !st->significand[1] && !st->significand[2] &&
 				    !st->significand[3])
 					tag = FP_EXP_TAG_ZERO;
 				else
@@ -115,8 +111,7 @@ static inline uint32_t twd_fxsr_to_i387(struct i387_fxsave_struct *fxsave)
 	return ret;
 }
 
-void compel_convert_from_fxsr(struct user_i387_ia32_struct *env,
-			      struct i387_fxsave_struct *fxsave)
+void compel_convert_from_fxsr(struct user_i387_ia32_struct *env, struct i387_fxsave_struct *fxsave)
 {
 	struct fpxreg *from = (struct fpxreg *)&fxsave->st_space[0];
 	struct fpreg *to = (struct fpreg *)env->st_space;
@@ -140,16 +135,12 @@ void compel_convert_from_fxsr(struct user_i387_ia32_struct *env,
 		memcpy(&to[i], &from[i], sizeof(to[0]));
 }
 
-int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-			      user_regs_struct_t *regs,
-			      user_fpregs_struct_t *fpregs)
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	bool is_native = user_regs_native(regs);
-	fpu_state_t *fpu_state = is_native ?
-				&sigframe->native.fpu_state :
-				&sigframe->compat.fpu_state;
+	fpu_state_t *fpu_state = is_native ? &sigframe->native.fpu_state : &sigframe->compat.fpu_state;
 	if (is_native) {
-#define cpreg64_native(d, s)	sigframe->native.uc.uc_mcontext.d = regs->native.s
+#define cpreg64_native(d, s) sigframe->native.uc.uc_mcontext.d = regs->native.s
 		cpreg64_native(rdi, di);
 		cpreg64_native(rsi, si);
 		cpreg64_native(rbp, bp);
@@ -173,7 +164,7 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 		sigframe->is_native = true;
 #undef cpreg64_native
 	} else {
-#define cpreg32_compat(d)	sigframe->compat.uc.uc_mcontext.d = regs->compat.d
+#define cpreg32_compat(d) sigframe->compat.uc.uc_mcontext.d = regs->compat.d
 		cpreg32_compat(gs);
 		cpreg32_compat(fs);
 		cpreg32_compat(es);
@@ -206,34 +197,28 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
 	return 0;
 }
 
-int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
-				   struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
-	fpu_state_t *fpu_state = (sigframe->is_native) ?
-		&rsigframe->native.fpu_state :
-		&rsigframe->compat.fpu_state;
+	fpu_state_t *fpu_state = (sigframe->is_native) ? &rsigframe->native.fpu_state : &rsigframe->compat.fpu_state;
 
 	if (sigframe->is_native) {
 		unsigned long addr = (unsigned long)(void *)&fpu_state->fpu_state_64.xsave;
 
 		if ((addr % 64ul)) {
-			pr_err("Unaligned address passed: %lx (native %d)\n",
-			       addr, sigframe->is_native);
+			pr_err("Unaligned address passed: %lx (native %d)\n", addr, sigframe->is_native);
 			return -1;
 		}
 
 		sigframe->native.uc.uc_mcontext.fpstate = (uint64_t)addr;
 	} else if (!sigframe->is_native) {
-		sigframe->compat.uc.uc_mcontext.fpstate =
-			(uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;
+		sigframe->compat.uc.uc_mcontext.fpstate = (uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;
 	}
 
 	return 0;
 }
 
-#define get_signed_user_reg(pregs, name)				\
-	((user_regs_native(pregs)) ? (int64_t)((pregs)->native.name) :	\
-				(int32_t)((pregs)->compat.name))
+#define get_signed_user_reg(pregs, name) \
+	((user_regs_native(pregs)) ? (int64_t)((pregs)->native.name) : (int32_t)((pregs)->compat.name))
 
 static int get_task_xsave(pid_t pid, user_fpregs_struct_t *xsave)
 {
@@ -310,8 +295,7 @@ static int corrupt_extregs(pid_t pid)
 	 *  - zdtm.py will grep it auto-magically from logs
 	 *    (and the seed will be known from an automatical testing)
 	 */
-	pr_err("Corrupting %s for %d, seed %u\n",
-			use_xsave ? "xsave" : "fpuregs", pid, seed);
+	pr_err("Corrupting %s for %d, seed %u\n", use_xsave ? "xsave" : "fpuregs", pid, seed);
 
 	if (!use_xsave) {
 		if (ptrace(PTRACE_SETFPREGS, pid, NULL, &ext_regs)) {
@@ -334,15 +318,13 @@ static int corrupt_extregs(pid_t pid)
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-		  user_fpregs_struct_t *ext_regs, save_regs_t save,
-		  void *arg, unsigned long flags)
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, unsigned long flags)
 {
-	user_fpregs_struct_t xsave = { }, *xs = ext_regs ? ext_regs : &xsave;
+	user_fpregs_struct_t xsave = {}, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
-	pr_info("Dumping general registers for %d in %s mode\n", pid,
-			user_regs_native(regs) ? "native" : "compat");
+	pr_info("Dumping general registers for %d in %s mode\n", pid, user_regs_native(regs) ? "native" : "compat");
 
 	/* Did we come from a system call? */
 	if (get_signed_user_reg(regs, orig_ax) >= 0) {
@@ -423,13 +405,8 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 	return 0;
 }
 
-int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
-		unsigned long arg1,
-		unsigned long arg2,
-		unsigned long arg3,
-		unsigned long arg4,
-		unsigned long arg5,
-		unsigned long arg6)
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
 {
 	user_regs_struct_t regs = ctl->orig.regs;
 	bool native = user_regs_native(&regs);
@@ -438,51 +415,47 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret,
 	if (native) {
 		user_regs_struct64 *r = &regs.native;
 
-		r->ax  = (uint64_t)nr;
-		r->di  = arg1;
-		r->si  = arg2;
-		r->dx  = arg3;
+		r->ax = (uint64_t)nr;
+		r->di = arg1;
+		r->si = arg2;
+		r->dx = arg3;
 		r->r10 = arg4;
-		r->r8  = arg5;
-		r->r9  = arg6;
+		r->r8 = arg5;
+		r->r9 = arg6;
 
 		err = compel_execute_syscall(ctl, &regs, code_syscall);
 	} else {
 		user_regs_struct32 *r = &regs.compat;
 
-		r->ax  = (uint32_t)nr;
-		r->bx  = arg1;
-		r->cx  = arg2;
-		r->dx  = arg3;
-		r->si  = arg4;
-		r->di  = arg5;
-		r->bp  = arg6;
+		r->ax = (uint32_t)nr;
+		r->bx = arg1;
+		r->cx = arg2;
+		r->dx = arg3;
+		r->si = arg4;
+		r->di = arg5;
+		r->bp = arg6;
 
 		err = compel_execute_syscall(ctl, &regs, code_int_80);
 	}
 
-	*ret = native ?
-		(long)get_user_reg(&regs, ax) :
-		(int)get_user_reg(&regs, ax);
+	*ret = native ? (long)get_user_reg(&regs, ax) : (int)get_user_reg(&regs, ax);
 	return err;
 }
 
-void *remote_mmap(struct parasite_ctl *ctl,
-		  void *addr, size_t length, int prot,
-		  int flags, int fd, off_t offset)
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
 {
 	long map;
 	int err;
 	bool compat_task = !user_regs_native(&ctl->orig.regs);
 
-	err = compel_syscall(ctl, __NR(mmap, compat_task), &map,
-			(unsigned long)addr, length, prot, flags, fd, offset);
+	err = compel_syscall(ctl, __NR(mmap, compat_task), &map, (unsigned long)addr, length, prot, flags, fd, offset);
 	if (err < 0)
 		return NULL;
 
 	if (map == -EACCES && (prot & PROT_WRITE) && (prot & PROT_EXEC)) {
 		pr_warn("mmap(PROT_WRITE | PROT_EXEC) failed for %d, "
-			"check selinux execmem policy\n", ctl->rpid);
+			"check selinux execmem policy\n",
+			ctl->rpid);
 		return NULL;
 	}
 	if (IS_ERR_VALUE(map)) {
@@ -507,18 +480,17 @@ void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *
 {
 	set_user_reg(regs, ip, new_ip);
 	if (stack)
-		set_user_reg(regs, sp, (unsigned long) stack);
+		set_user_reg(regs, sp, (unsigned long)stack);
 
 	/* Avoid end of syscall processing */
 	set_user_reg(regs, orig_ax, -1);
 
 	/* Make sure flags are in known state */
-	set_user_reg(regs, flags, get_user_reg(regs, flags) &
-			~(X86_EFLAGS_TF | X86_EFLAGS_DF | X86_EFLAGS_IF));
+	set_user_reg(regs, flags, get_user_reg(regs, flags) & ~(X86_EFLAGS_TF | X86_EFLAGS_DF | X86_EFLAGS_IF));
 }
 
-#define USER32_CS	0x23
-#define USER_CS		0x33
+#define USER32_CS 0x23
+#define USER_CS	  0x33
 
 static bool ldt_task_selectors(pid_t pid)
 {
@@ -574,30 +546,26 @@ bool arch_can_dump_task(struct parasite_ctl *ctl)
 int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 {
 	int native = compel_mode_native(ctl);
-	void *where = native ?
-		(void *)&s->native.uc.uc_stack :
-		(void *)&s->compat.uc.uc_stack;
+	void *where = native ? (void *)&s->native.uc.uc_stack : (void *)&s->compat.uc.uc_stack;
 	long ret;
 	int err;
 
-	err = compel_syscall(ctl, __NR(sigaltstack, !native),
-			     &ret, 0, (unsigned long)where,
-			     0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR(sigaltstack, !native), &ret, 0, (unsigned long)where, 0, 0, 0, 0);
 	return err ? err : ret;
 }
 
 /* Copied from the gdb header gdb/nat/x86-dregs.h */
 
 /* Debug registers' indices.  */
-#define DR_FIRSTADDR	0
-#define DR_LASTADDR	3
-#define DR_NADDR	4  /* The number of debug address registers.  */
-#define DR_STATUS	6  /* Index of debug status register (DR6).  */
-#define DR_CONTROL	7  /* Index of debug control register (DR7).  */
+#define DR_FIRSTADDR 0
+#define DR_LASTADDR  3
+#define DR_NADDR     4 /* The number of debug address registers.  */
+#define DR_STATUS    6 /* Index of debug status register (DR6).  */
+#define DR_CONTROL   7 /* Index of debug control register (DR7).  */
 
-#define DR_LOCAL_ENABLE_SHIFT	0 /* Extra shift to the local enable bit.  */
-#define DR_GLOBAL_ENABLE_SHIFT	1 /* Extra shift to the global enable bit.  */
-#define DR_ENABLE_SIZE		2 /* Two enable bits per debug register.  */
+#define DR_LOCAL_ENABLE_SHIFT  0 /* Extra shift to the local enable bit.  */
+#define DR_GLOBAL_ENABLE_SHIFT 1 /* Extra shift to the global enable bit.  */
+#define DR_ENABLE_SIZE	       2 /* Two enable bits per debug register.  */
 
 /* Locally enable the break/watchpoint in the I'th debug register.  */
 #define X86_DR_LOCAL_ENABLE(i) (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i)))
@@ -607,17 +575,14 @@ int ptrace_set_breakpoint(pid_t pid, void *addr)
 	int ret;
 
 	/* Set a breakpoint */
-	if (ptrace(PTRACE_POKEUSER, pid,
-			offsetof(struct user, u_debugreg[DR_FIRSTADDR]),
-			addr)) {
+	if (ptrace(PTRACE_POKEUSER, pid, offsetof(struct user, u_debugreg[DR_FIRSTADDR]), addr)) {
 		pr_perror("Unable to setup a breakpoint into %d", pid);
 		return -1;
 	}
 
 	/* Enable the breakpoint */
-	if (ptrace(PTRACE_POKEUSER, pid,
-			offsetof(struct user, u_debugreg[DR_CONTROL]),
-			X86_DR_LOCAL_ENABLE(DR_FIRSTADDR))) {
+	if (ptrace(PTRACE_POKEUSER, pid, offsetof(struct user, u_debugreg[DR_CONTROL]),
+		   X86_DR_LOCAL_ENABLE(DR_FIRSTADDR))) {
 		pr_perror("Unable to enable the breakpoint for %d", pid);
 		return -1;
 	}
@@ -634,9 +599,7 @@ int ptrace_set_breakpoint(pid_t pid, void *addr)
 int ptrace_flush_breakpoints(pid_t pid)
 {
 	/* Disable the breakpoint */
-	if (ptrace(PTRACE_POKEUSER, pid,
-			offsetof(struct user, u_debugreg[DR_CONTROL]),
-			0)) {
+	if (ptrace(PTRACE_POKEUSER, pid, offsetof(struct user, u_debugreg[DR_CONTROL]), 0)) {
 		pr_perror("Unable to disable the breakpoint for %d", pid);
 		return -1;
 	}
@@ -668,8 +631,7 @@ int ptrace_get_regs(pid_t pid, user_regs_struct_t *regs)
 	}
 
 	pr_err("PTRACE_GETREGSET read %zu bytes for pid %d, but native/compat regs sizes are %zu/%zu bytes\n",
-			iov.iov_len, pid,
-			sizeof(regs->native), sizeof(regs->compat));
+	       iov.iov_len, pid, sizeof(regs->native), sizeof(regs->compat));
 	return -1;
 }
 
@@ -687,11 +649,14 @@ int ptrace_set_regs(pid_t pid, user_regs_struct_t *regs)
 	return ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov);
 }
 
-#define TASK_SIZE	((1UL << 47) - PAGE_SIZE)
+#define TASK_SIZE ((1UL << 47) - PAGE_SIZE)
 /*
  * Task size may be limited to 3G but we need a
  * higher limit, because it's backward compatible.
  */
-#define TASK_SIZE_IA32	(0xffffe000)
+#define TASK_SIZE_IA32 (0xffffe000)
 
-unsigned long compel_task_size(void) { return TASK_SIZE; }
+unsigned long compel_task_size(void)
+{
+	return TASK_SIZE;
+}
diff --git a/compel/arch/x86/src/lib/thread_area.c b/compel/arch/x86/src/lib/thread_area.c
index 3ff5dc5d4..4750c6cdd 100644
--- a/compel/arch/x86/src/lib/thread_area.c
+++ b/compel/arch/x86/src/lib/thread_area.c
@@ -8,7 +8,7 @@
 #include "infect-priv.h"
 
 #ifndef PTRACE_GET_THREAD_AREA
-# define PTRACE_GET_THREAD_AREA		25
+#define PTRACE_GET_THREAD_AREA 25
 #endif
 
 /*
@@ -49,12 +49,10 @@ int __compel_arch_fetch_thread_area(int tid, struct thread_ctx *th)
 		d->entry_number = GDT_ENTRY_TLS_MIN + i;
 	}
 
-	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++)
-	{
+	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++) {
 		user_desc_t *d = &ptls->desc[i];
 
-		err = ptrace(PTRACE_GET_THREAD_AREA, tid,
-				GDT_ENTRY_TLS_MIN + i, d);
+		err = ptrace(PTRACE_GET_THREAD_AREA, tid, GDT_ENTRY_TLS_MIN + i, d);
 		/*
 		 * Ignoring absent syscall on !CONFIG_IA32_EMULATION
 		 * where such mixed code can't run.
diff --git a/compel/plugins/fds/fds.c b/compel/plugins/fds/fds.c
index 7ed94509d..c0c6a2131 100644
--- a/compel/plugins/fds/fds.c
+++ b/compel/plugins/fds/fds.c
@@ -9,8 +9,8 @@
 #include "common/compiler.h"
 #include "common/bug.h"
 
-#define __sys(foo)	sys_##foo
-#define __sys_err(ret)	ret
+#define __sys(foo)     sys_##foo
+#define __sys_err(ret) ret
 
 #include "common/scm.h"
 
diff --git a/compel/plugins/shmem/shmem.c b/compel/plugins/shmem/shmem.c
index 695d1931f..2b402f926 100644
--- a/compel/plugins/shmem/shmem.c
+++ b/compel/plugins/shmem/shmem.c
@@ -12,8 +12,7 @@ void *shmem_create(unsigned long size)
 	void *mem;
 	struct shmem_plugin_msg spi;
 
-	mem = (void *)sys_mmap(NULL, size, PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	mem = (void *)sys_mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (mem == MAP_FAILED)
 		return NULL;
 
diff --git a/compel/plugins/std/fds.c b/compel/plugins/std/fds.c
index 499102788..6a0757992 100644
--- a/compel/plugins/std/fds.c
+++ b/compel/plugins/std/fds.c
@@ -10,7 +10,7 @@
 #include "common/compiler.h"
 #include "common/bug.h"
 
-#define __sys(foo)	sys_##foo
-#define __sys_err(ret)	ret
+#define __sys(foo)     sys_##foo
+#define __sys_err(ret) ret
 
 #include "common/scm-code.c"
diff --git a/compel/plugins/std/infect.c b/compel/plugins/std/infect.c
index 9749db7b7..abecc140f 100644
--- a/compel/plugins/std/infect.c
+++ b/compel/plugins/std/infect.c
@@ -5,9 +5,9 @@
 #include "common/lock.h"
 #include "common/page.h"
 
-#define pr_err(fmt, ...)	print_on_level(1, fmt, ##__VA_ARGS__)
-#define pr_info(fmt, ...)	print_on_level(3, fmt, ##__VA_ARGS__)
-#define pr_debug(fmt, ...)	print_on_level(4, fmt, ##__VA_ARGS__)
+#define pr_err(fmt, ...)   print_on_level(1, fmt, ##__VA_ARGS__)
+#define pr_info(fmt, ...)  print_on_level(3, fmt, ##__VA_ARGS__)
+#define pr_debug(fmt, ...) print_on_level(4, fmt, ##__VA_ARGS__)
 
 #include "common/bug.h"
 
@@ -51,8 +51,7 @@ static int __parasite_daemon_reply_ack(unsigned int cmd, int err)
 		return -1;
 	}
 
-	pr_debug("__sent ack msg: %d %d %d\n",
-		 m.cmd, m.ack, m.err);
+	pr_debug("__sent ack msg: %d %d %d\n", m.cmd, m.ack, m.err);
 
 	return 0;
 }
@@ -64,16 +63,14 @@ static int __parasite_daemon_wait_msg(struct ctl_msg *m)
 	pr_debug("Daemon waits for command\n");
 
 	while (1) {
-		*m = (struct ctl_msg){ };
+		*m = (struct ctl_msg){};
 		ret = sys_recvfrom(tsock, m, sizeof(*m), MSG_WAITALL, NULL, 0);
 		if (ret != sizeof(*m)) {
-			pr_err("Trimmed message received (%d/%d)\n",
-			       (int)sizeof(*m), ret);
+			pr_err("Trimmed message received (%d/%d)\n", (int)sizeof(*m), ret);
 			return -1;
 		}
 
-		pr_debug("__fetched msg: %d %d %d\n",
-			 m->cmd, m->ack, m->err);
+		pr_debug("__fetched msg: %d %d %d\n", m->cmd, m->ack, m->err);
 		return 0;
 	}
 
@@ -94,8 +91,7 @@ static int fini(void)
 	parasite_cleanup();
 
 	new_sp = (long)sigframe + RT_SIGFRAME_OFFSET(sigframe);
-	pr_debug("%ld: new_sp=%lx ip %lx\n", sys_gettid(),
-		  new_sp, RT_SIGFRAME_REGIP(sigframe));
+	pr_debug("%ld: new_sp=%lx ip %lx\n", sys_gettid(), new_sp, RT_SIGFRAME_REGIP(sigframe));
 
 	sys_close(tsock);
 	std_log_set_fd(-1);
@@ -155,7 +151,7 @@ static noinline __used int parasite_init_daemon(void *data)
 	int ret;
 
 	args->sigreturn_addr = (uint64_t)(uintptr_t)fini_sigreturn;
-	sigframe = (void*)(uintptr_t)args->sigframe;
+	sigframe = (void *)(uintptr_t)args->sigframe;
 #ifdef ARCH_HAS_LONG_PAGES
 	__page_size = args->page_size;
 #endif
@@ -193,7 +189,7 @@ err:
 }
 
 #ifndef __parasite_entry
-# define __parasite_entry
+#define __parasite_entry
 #endif
 
 /*
@@ -205,7 +201,7 @@ err:
  * initialization. Otherwise, we end up with COMMON symbols.
  */
 unsigned int __export_parasite_service_cmd = 0;
-void * __export_parasite_service_args_ptr = NULL;
+void *__export_parasite_service_args_ptr = NULL;
 
 int __used __parasite_entry parasite_service(void)
 {
diff --git a/compel/plugins/std/std.c b/compel/plugins/std/std.c
index 82f51eac4..01f88ef80 100644
--- a/compel/plugins/std/std.c
+++ b/compel/plugins/std/std.c
@@ -46,11 +46,9 @@ err:
 	return ret;
 }
 
-#define plugin_init_count(size)	((size) / (sizeof(plugin_init_t *)))
+#define plugin_init_count(size) ((size) / (sizeof(plugin_init_t *)))
 
-int __export_std_compel_start(struct prologue_init_args *args,
-			      const plugin_init_t * const *init_array,
-			      size_t init_size)
+int __export_std_compel_start(struct prologue_init_args *args, const plugin_init_t *const *init_array, size_t init_size)
 {
 	unsigned int i;
 	int ret = 0;
diff --git a/compel/plugins/std/string.c b/compel/plugins/std/string.c
index 85bede803..bde1bc68b 100644
--- a/compel/plugins/std/string.c
+++ b/compel/plugins/std/string.c
@@ -100,18 +100,11 @@ void std_vdprintf(int fd, const char *format, va_list args)
 			std_dputs(fd, va_arg(args, char *));
 			break;
 		case 'd':
-			__std_vprint_long(buf, sizeof(buf),
-					  along ?
-					  va_arg(args, long) :
-					  (long)va_arg(args, int),
-					  &t);
+			__std_vprint_long(buf, sizeof(buf), along ? va_arg(args, long) : (long)va_arg(args, int), &t);
 			std_dputs(fd, t);
 			break;
 		case 'x':
-			__std_vprint_long_hex(buf, sizeof(buf),
-					      along ?
-					      va_arg(args, long) :
-					      (long)va_arg(args, int),
+			__std_vprint_long_hex(buf, sizeof(buf), along ? va_arg(args, long) : (long)va_arg(args, int),
 					      &t);
 			std_dputs(fd, t);
 			break;
@@ -130,9 +123,7 @@ void std_dprintf(int fd, const char *format, ...)
 
 static inline bool __isspace(unsigned char c)
 {
-	return	c == ' '  || c == '\f' ||
-		c == '\n' || c == '\r' ||
-		c == '\t' || c == '\v';
+	return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
 }
 
 static unsigned char __tolower(unsigned char c)
@@ -142,8 +133,7 @@ static unsigned char __tolower(unsigned char c)
 
 static inline bool __isalpha(unsigned char c)
 {
-	return ((c <= 'Z' && c >= 'A') ||
-		(c <= 'z' && c >= 'a'));
+	return ((c <= 'Z' && c >= 'A') || (c <= 'z' && c >= 'a'));
 }
 
 static inline bool __isdigit(unsigned char c)
@@ -208,7 +198,7 @@ unsigned long std_strtoul(const char *nptr, char **endptr, int base)
 		if (__isspace(*s))
 			continue;
 		if (!__isalnum(*s))
-		    goto fin;
+			goto fin;
 		v = __conv_val(*s);
 		if (v == -1u || v > base)
 			goto fin;
@@ -222,7 +212,6 @@ fin:
 	return neg ? (unsigned long)-num : (unsigned long)num;
 }
 
-
 /*
  * C compiler is free to insert implicit calls to memcmp, memset,
  * memcpy and memmove, assuming they are available during linking.
@@ -267,7 +256,7 @@ void *memset(void *s, const int c, size_t count)
 	size_t i = 0;
 
 	while (i < count)
-		dest[i++] = (char) c;
+		dest[i++] = (char)c;
 
 	return s;
 }
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 9a972bee6..9662751e0 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -28,44 +28,39 @@ static bool __ptr_oob(const uintptr_t ptr, const uintptr_t start, const size_t s
 }
 
 /* Check if pointed structure's end is out-of-bound */
-static bool __ptr_struct_end_oob(const uintptr_t ptr, const size_t struct_size,
-				 const uintptr_t start, const size_t size)
+static bool __ptr_struct_end_oob(const uintptr_t ptr, const size_t struct_size, const uintptr_t start,
+				 const size_t size)
 {
 	/* the last byte of the structure should be inside [begin, end) */
 	return __ptr_oob(ptr + struct_size - 1, start, size);
 }
 
 /* Check if pointed structure is out-of-bound */
-static bool __ptr_struct_oob(const uintptr_t ptr, const size_t struct_size,
-			     const uintptr_t start, const size_t size)
+static bool __ptr_struct_oob(const uintptr_t ptr, const size_t struct_size, const uintptr_t start, const size_t size)
 {
-	return __ptr_oob(ptr, start, size) ||
-		__ptr_struct_end_oob(ptr, struct_size, start, size);
+	return __ptr_oob(ptr, start, size) || __ptr_struct_end_oob(ptr, struct_size, start, size);
 }
 
-static bool test_pointer(const void *ptr, const void *start, const size_t size,
-			 const char *name, const char *file, const int line)
+static bool test_pointer(const void *ptr, const void *start, const size_t size, const char *name, const char *file,
+			 const int line)
 {
 	if (__ptr_oob((const uintptr_t)ptr, (const uintptr_t)start, size)) {
-		pr_err("Corrupted pointer %p (%s) at %s:%d\n",
-		       ptr, name, file, line);
+		pr_err("Corrupted pointer %p (%s) at %s:%d\n", ptr, name, file, line);
 		return true;
 	}
 	return false;
 }
 
-#define ptr_func_exit(__ptr)						\
-	do {								\
-		if (test_pointer((__ptr), mem, size, #__ptr,		\
-				 __FILE__, __LINE__)) {			\
-			free(sec_hdrs);					\
-			return -1;					\
-		}							\
+#define ptr_func_exit(__ptr)                                                        \
+	do {                                                                        \
+		if (test_pointer((__ptr), mem, size, #__ptr, __FILE__, __LINE__)) { \
+			free(sec_hdrs);                                             \
+			return -1;                                                  \
+		}                                                                   \
 	} while (0)
 
 #ifdef ELF_PPC64
-static int do_relative_toc(long value, uint16_t *location,
-			   unsigned long mask, int complain_signed)
+static int do_relative_toc(long value, uint16_t *location, unsigned long mask, int complain_signed)
 {
 	if (complain_signed && (value + 0x8000 > 0xffff)) {
 		pr_err("TOC16 relocation overflows (%ld)\n", value);
@@ -73,8 +68,7 @@ static int do_relative_toc(long value, uint16_t *location,
 	}
 
 	if ((~mask & 0xffff) & value) {
-		pr_err("bad TOC16 relocation (%ld) (0x%lx)\n",
-		       value, (~mask & 0xffff) & value);
+		pr_err("bad TOC16 relocation (%ld) (0x%lx)\n", value, (~mask & 0xffff) & value);
 		return -1;
 	}
 
@@ -89,23 +83,24 @@ static bool is_header_supported(Elf_Ehdr *hdr)
 		return false;
 	if ((hdr->e_type != ET_REL
 #ifdef NO_RELOCS
-		&& hdr->e_type != ET_EXEC
+	     && hdr->e_type != ET_EXEC
 #endif
-	    ) || hdr->e_version != EV_CURRENT)
+	     ) ||
+	    hdr->e_version != EV_CURRENT)
 		return false;
 	return true;
 }
 
 static const char *get_strings_section(Elf_Ehdr *hdr, uintptr_t mem, size_t size)
 {
-	size_t sec_table_size = ((size_t) hdr->e_shentsize) * hdr->e_shnum;
+	size_t sec_table_size = ((size_t)hdr->e_shentsize) * hdr->e_shnum;
 	uintptr_t sec_table = mem + hdr->e_shoff;
 	Elf_Shdr *secstrings_hdr;
 	uintptr_t addr;
 
 	if (__ptr_struct_oob(sec_table, sec_table_size, mem, size)) {
-		pr_err("Section table [%#zx, %#zx) is out of [%#zx, %#zx)\n",
-			sec_table, sec_table + sec_table_size, mem, mem + size);
+		pr_err("Section table [%#zx, %#zx) is out of [%#zx, %#zx)\n", sec_table, sec_table + sec_table_size,
+		       mem, mem + size);
 		return NULL;
 	}
 
@@ -113,24 +108,22 @@ static const char *get_strings_section(Elf_Ehdr *hdr, uintptr_t mem, size_t size
 	 * strings section header's offset in section headers table is
 	 * (size of section header * index of string section header)
 	 */
-	addr = sec_table + ((size_t) hdr->e_shentsize) * hdr->e_shstrndx;
-	if (__ptr_struct_oob(addr, sizeof(Elf_Shdr),
-			sec_table, sec_table_size)) {
-		pr_err("String section header @%#zx is out of [%#zx, %#zx)\n",
-			addr, sec_table, sec_table + sec_table_size);
+	addr = sec_table + ((size_t)hdr->e_shentsize) * hdr->e_shstrndx;
+	if (__ptr_struct_oob(addr, sizeof(Elf_Shdr), sec_table, sec_table_size)) {
+		pr_err("String section header @%#zx is out of [%#zx, %#zx)\n", addr, sec_table,
+		       sec_table + sec_table_size);
 		return NULL;
 	}
-	secstrings_hdr = (void*)addr;
+	secstrings_hdr = (void *)addr;
 
 	addr = mem + secstrings_hdr->sh_offset;
 	if (__ptr_struct_oob(addr, secstrings_hdr->sh_size, mem, size)) {
-		pr_err("String section @%#zx size %#lx is out of [%#zx, %#zx)\n",
-			addr, (unsigned long)secstrings_hdr->sh_size,
-			mem, mem + size);
+		pr_err("String section @%#zx size %#lx is out of [%#zx, %#zx)\n", addr,
+		       (unsigned long)secstrings_hdr->sh_size, mem, mem + size);
 		return NULL;
 	}
 
-	return (void*)addr;
+	return (void *)addr;
 }
 
 /*
@@ -159,8 +152,7 @@ int __handle_elf(void *mem, size_t size)
 
 	pr_debug("Header\n");
 	pr_debug("------------\n");
-	pr_debug("\ttype 0x%x machine 0x%x version 0x%x\n",
-		 (unsigned)hdr->e_type, (unsigned)hdr->e_machine,
+	pr_debug("\ttype 0x%x machine 0x%x version 0x%x\n", (unsigned)hdr->e_type, (unsigned)hdr->e_machine,
 		 (unsigned)hdr->e_version);
 
 	if (!is_header_supported(hdr)) {
@@ -189,8 +181,7 @@ int __handle_elf(void *mem, size_t size)
 			symtab_hdr = sh;
 
 		ptr_func_exit(&secstrings[sh->sh_name]);
-		pr_debug("\t index %-2zd type 0x%-2x name %s\n", i,
-			 (unsigned)sh->sh_type, &secstrings[sh->sh_name]);
+		pr_debug("\t index %-2zd type 0x%-2x name %s\n", i, (unsigned)sh->sh_type, &secstrings[sh->sh_name]);
 
 		sec_hdrs[i] = sh;
 
@@ -214,9 +205,7 @@ int __handle_elf(void *mem, size_t size)
 		}
 		if (sh->sh_addr && sh->sh_addr != k)
 			pr_info("Overriding unexpected precalculated address of section (section %s addr 0x%lx expected 0x%lx)\n",
-				&secstrings[sh->sh_name],
-				(unsigned long) sh->sh_addr,
-				(unsigned long) k);
+				&secstrings[sh->sh_name], (unsigned long)sh->sh_addr, (unsigned long)k);
 		sh->sh_addr = k;
 		k += sh->sh_size;
 	}
@@ -262,8 +251,8 @@ int __handle_elf(void *mem, size_t size)
 			continue;
 
 		pr_debug("\ttype 0x%-2x bind 0x%-2x shndx 0x%-4x value 0x%-2lx name %s\n",
-				(unsigned)ELF_ST_TYPE(sym->st_info), (unsigned)ELF_ST_BIND(sym->st_info),
-				(unsigned)sym->st_shndx, (unsigned long)sym->st_value, name);
+			 (unsigned)ELF_ST_TYPE(sym->st_info), (unsigned)ELF_ST_BIND(sym->st_info),
+			 (unsigned)sym->st_shndx, (unsigned long)sym->st_value, name);
 #ifdef ELF_PPC64
 		if (!sym->st_value && !strncmp(name, ".TOC.", 6)) {
 			if (!toc_offset) {
@@ -276,18 +265,15 @@ int __handle_elf(void *mem, size_t size)
 #endif
 		if (strncmp(name, "__export", 8))
 			continue;
-		if ((sym->st_shndx && sym->st_shndx < hdr->e_shnum) ||
-				sym->st_shndx == SHN_ABS) {
+		if ((sym->st_shndx && sym->st_shndx < hdr->e_shnum) || sym->st_shndx == SHN_ABS) {
 			if (sym->st_shndx == SHN_ABS) {
 				sh_src = NULL;
 			} else {
 				sh_src = sec_hdrs[sym->st_shndx];
 				ptr_func_exit(sh_src);
 			}
-			pr_out("#define %s_sym%s 0x%lx\n",
-					opts.prefix, name,
-					(unsigned long)(sym->st_value +
-						(sh_src ? sh_src->sh_addr : 0)));
+			pr_out("#define %s_sym%s 0x%lx\n", opts.prefix, name,
+			       (unsigned long)(sym->st_value + (sh_src ? sh_src->sh_addr : 0)));
 		}
 	}
 
@@ -305,9 +291,8 @@ int __handle_elf(void *mem, size_t size)
 		sh_rel = sec_hdrs[sh->sh_info];
 		ptr_func_exit(sh_rel);
 
-		pr_debug("\tsection %2zd type 0x%-2x link 0x%-2x info 0x%-2x name %s\n", i,
-			 (unsigned)sh->sh_type, (unsigned)sh->sh_link,
-			 (unsigned)sh->sh_info, &secstrings[sh->sh_name]);
+		pr_debug("\tsection %2zd type 0x%-2x link 0x%-2x info 0x%-2x name %s\n", i, (unsigned)sh->sh_type,
+			 (unsigned)sh->sh_link, (unsigned)sh->sh_info, &secstrings[sh->sh_name]);
 
 		for (k = 0; k < sh->sh_size / sh->sh_entsize; k++) {
 			int64_t __maybe_unused addend64, __maybe_unused value64;
@@ -334,8 +319,7 @@ int __handle_elf(void *mem, size_t size)
 
 			pr_debug("\t\tr_offset 0x%-4lx r_info 0x%-4lx / sym 0x%-2lx type 0x%-2lx symsecoff 0x%-4lx\n",
 				 (unsigned long)r->rel.r_offset, (unsigned long)r->rel.r_info,
-				 (unsigned long)ELF_R_SYM(r->rel.r_info),
-				 (unsigned long)ELF_R_TYPE(r->rel.r_info),
+				 (unsigned long)ELF_R_SYM(r->rel.r_info), (unsigned long)ELF_R_TYPE(r->rel.r_info),
 				 (unsigned long)sh_rel->sh_addr);
 
 			if (sym->st_shndx == SHN_UNDEF) {
@@ -345,8 +329,7 @@ int __handle_elf(void *mem, size_t size)
 				 * Their type is STT_NOTYPE, so report any
 				 * other one.
 				 */
-				if (ELF32_ST_TYPE(sym->st_info) != STT_NOTYPE
-				    || strncmp(name, ".TOC.", 6)) {
+				if (ELF32_ST_TYPE(sym->st_info) != STT_NOTYPE || strncmp(name, ".TOC.", 6)) {
 					pr_err("Unexpected undefined symbol:%s\n", name);
 					goto err;
 				}
@@ -385,8 +368,8 @@ int __handle_elf(void *mem, size_t size)
 				Elf_Shdr *sh_src;
 
 				if ((unsigned)sym->st_shndx > (unsigned)hdr->e_shnum) {
-					pr_err("Unexpected symbol section index %u/%u\n",
-					       (unsigned)sym->st_shndx, hdr->e_shnum);
+					pr_err("Unexpected symbol section index %u/%u\n", (unsigned)sym->st_shndx,
+					       hdr->e_shnum);
 					goto err;
 				}
 				sh_src = sec_hdrs[sym->st_shndx];
@@ -419,11 +402,10 @@ int __handle_elf(void *mem, size_t size)
  *
  * Here we are only handle the case '3' which is the most commonly seen.
  */
-#define LOCAL_OFFSET(s)	((s->st_other >> 5) & 0x7)
+#define LOCAL_OFFSET(s) ((s->st_other >> 5) & 0x7)
 			if (LOCAL_OFFSET(sym)) {
 				if (LOCAL_OFFSET(sym) != 3) {
-					pr_err("Unexpected local offset value %d\n",
-					       LOCAL_OFFSET(sym));
+					pr_err("Unexpected local offset value %d\n", LOCAL_OFFSET(sym));
 					goto err;
 				}
 				pr_debug("\t\t\tUsing local offset\n");
@@ -435,28 +417,28 @@ int __handle_elf(void *mem, size_t size)
 			switch (ELF_R_TYPE(r->rel.r_info)) {
 #ifdef CONFIG_MIPS
 			case R_MIPS_PC16:
-			      /* s+a-p relative */
-			    *((int32_t *)where) = *((int32_t *)where) | ((value32 + addend32 - place)>>2);
-			    break;
+				/* s+a-p relative */
+				*((int32_t *)where) = *((int32_t *)where) | ((value32 + addend32 - place) >> 2);
+				break;
 
 			case R_MIPS_26:
-			      /*  local    : (((A << 2) | (P & 0xf0000000) + S) >> 2
+				/*  local    : (((A << 2) | (P & 0xf0000000) + S) >> 2
 			       *  external : (sign–extend(A < 2) + S) >> 2
                               */
 
-			    if (((unsigned)ELF_ST_BIND(sym->st_info) == 0x1)
-				 || ((unsigned)ELF_ST_BIND(sym->st_info) == 0x2)){
-				  /* bind type local is 0x0 ,global is 0x1,WEAK is 0x2 */
-				addend32 = value32;
-			    }
-			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_26,  "
-			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_26 */\n",
-			    	       (unsigned int)place, addend32, value32);
-			    break;
+				if (((unsigned)ELF_ST_BIND(sym->st_info) == 0x1) ||
+				    ((unsigned)ELF_ST_BIND(sym->st_info) == 0x2)) {
+					/* bind type local is 0x0 ,global is 0x1,WEAK is 0x2 */
+					addend32 = value32;
+				}
+				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_26,  "
+				       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_26 */\n",
+				       (unsigned int)place, addend32, value32);
+				break;
 
 			case R_MIPS_32:
-			    /* S+A */
-			    break;
+				/* S+A */
+				break;
 
 			case R_MIPS_64:
 				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_64, "
@@ -465,39 +447,38 @@ int __handle_elf(void *mem, size_t size)
 				break;
 
 			case R_MIPS_HIGHEST:
-			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HIGHEST,  "
-			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HIGHEST */\n",
-			    	       (unsigned int)place, addend32, value32);
-			    break;
+				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HIGHEST,  "
+				       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HIGHEST */\n",
+				       (unsigned int)place, addend32, value32);
+				break;
 
 			case R_MIPS_HIGHER:
-			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HIGHER,  "
-			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HIGHER */\n",
-			    	       (unsigned int)place, addend32, value32);
-			    break;
+				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HIGHER,  "
+				       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HIGHER */\n",
+				       (unsigned int)place, addend32, value32);
+				break;
 
 			case R_MIPS_HI16:
-			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HI16,  "
-			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HI16 */\n",
-			    	       (unsigned int)place, addend32, value32);
-			    break;
+				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_HI16,  "
+				       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_HI16 */\n",
+				       (unsigned int)place, addend32, value32);
+				break;
 
 			case R_MIPS_LO16:
-			    if((unsigned)ELF_ST_BIND(sym->st_info) == 0x1){
-				  /* bind type local is 0x0 ,global is 0x1 */
-				addend32 = value32;
-			    }
-			    pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_LO16,  "
-			    	       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_LO16 */\n",
-			    	       (unsigned int)place, addend32, value32);
-			    break;
+				if ((unsigned)ELF_ST_BIND(sym->st_info) == 0x1) {
+					/* bind type local is 0x0 ,global is 0x1 */
+					addend32 = value32;
+				}
+				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_MIPS_LO16,  "
+				       ".addend = %-8d, .value = 0x%-16x, }, /* R_MIPS_LO16 */\n",
+				       (unsigned int)place, addend32, value32);
+				break;
 
 #endif
 #ifdef ELF_PPC64
 			case R_PPC64_REL24:
 				/* Update PC relative offset, linker has not done this yet */
-				pr_debug("\t\t\tR_PPC64_REL24 at 0x%-4lx val 0x%lx\n",
-					 place, value64);
+				pr_debug("\t\t\tR_PPC64_REL24 at 0x%-4lx val 0x%lx\n", place, value64);
 				/* Convert value to relative */
 				value64 -= place;
 				if (value64 + 0x2000000 > 0x3ffffff || (value64 & 3) != 0) {
@@ -505,60 +486,54 @@ int __handle_elf(void *mem, size_t size)
 					goto err;
 				}
 				/* Only replace bits 2 through 26 */
-				*(uint32_t *)where = (*(uint32_t *)where & ~0x03fffffc) |
-					(value64 & 0x03fffffc);
+				*(uint32_t *)where = (*(uint32_t *)where & ~0x03fffffc) | (value64 & 0x03fffffc);
 				break;
 
 			case R_PPC64_ADDR32:
 			case R_PPC64_REL32:
-				pr_debug("\t\t\tR_PPC64_ADDR32 at 0x%-4lx val 0x%x\n",
-					 place, (unsigned int)(value32 + addend32));
+				pr_debug("\t\t\tR_PPC64_ADDR32 at 0x%-4lx val 0x%x\n", place,
+					 (unsigned int)(value32 + addend32));
 				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_INT, "
 				       " .addend = %-8d, .value = 0x%-16x, "
 				       "}, /* R_PPC64_ADDR32 */\n",
-				       (unsigned int) place,  addend32, value32);
+				       (unsigned int)place, addend32, value32);
 				break;
 
 			case R_PPC64_ADDR64:
 			case R_PPC64_REL64:
-				pr_debug("\t\t\tR_PPC64_ADDR64 at 0x%-4lx val 0x%lx\n",
-					 place, value64 + addend64);
+				pr_debug("\t\t\tR_PPC64_ADDR64 at 0x%-4lx val 0x%lx\n", place, value64 + addend64);
 				pr_out("\t{ .offset = 0x%-8x, .type = COMPEL_TYPE_LONG,"
 				       " .addend = %-8ld, .value = 0x%-16lx, "
 				       "}, /* R_PPC64_ADDR64 */\n",
-				       (unsigned int) place, (long)addend64, (long)value64);
+				       (unsigned int)place, (long)addend64, (long)value64);
 				break;
 
 			case R_PPC64_TOC16_HA:
-				pr_debug("\t\t\tR_PPC64_TOC16_HA at 0x%-4lx val 0x%lx\n",
-					 place, value64 + addend64 - toc_offset + 0x8000);
-				if (do_relative_toc((value64 + addend64 - toc_offset + 0x8000) >> 16,
-						    where, 0xffff, 1))
+				pr_debug("\t\t\tR_PPC64_TOC16_HA at 0x%-4lx val 0x%lx\n", place,
+					 value64 + addend64 - toc_offset + 0x8000);
+				if (do_relative_toc((value64 + addend64 - toc_offset + 0x8000) >> 16, where, 0xffff, 1))
 					goto err;
 				break;
 
 			case R_PPC64_TOC16_LO:
-				pr_debug("\t\t\tR_PPC64_TOC16_LO at 0x%-4lx val 0x%lx\n",
-					 place, value64 + addend64 - toc_offset);
-				if (do_relative_toc(value64 + addend64 - toc_offset,
-						    where, 0xffff, 1))
+				pr_debug("\t\t\tR_PPC64_TOC16_LO at 0x%-4lx val 0x%lx\n", place,
+					 value64 + addend64 - toc_offset);
+				if (do_relative_toc(value64 + addend64 - toc_offset, where, 0xffff, 1))
 					goto err;
 				break;
 
 			case R_PPC64_TOC16_LO_DS:
-				pr_debug("\t\t\tR_PPC64_TOC16_LO_DS at 0x%-4lx val 0x%lx\n",
-					 place, value64 + addend64 - toc_offset);
-				if (do_relative_toc(value64 + addend64 - toc_offset,
-						    where, 0xfffc, 0))
+				pr_debug("\t\t\tR_PPC64_TOC16_LO_DS at 0x%-4lx val 0x%lx\n", place,
+					 value64 + addend64 - toc_offset);
+				if (do_relative_toc(value64 + addend64 - toc_offset, where, 0xfffc, 0))
 					goto err;
 				break;
 
 			case R_PPC64_REL16_HA:
 				value64 += addend64 - place;
-				pr_debug("\t\t\tR_PPC64_REL16_HA at 0x%-4lx val 0x%lx\n",
-					 place, value64);
+				pr_debug("\t\t\tR_PPC64_REL16_HA at 0x%-4lx val 0x%lx\n", place, value64);
 				/* check that we are dealing with the addis 2,12 instruction */
-				if (((*(uint32_t*)where) & 0xffff0000) != 0x3c4c0000) {
+				if (((*(uint32_t *)where) & 0xffff0000) != 0x3c4c0000) {
 					pr_err("Unexpected instruction for R_PPC64_REL16_HA\n");
 					goto err;
 				}
@@ -567,10 +542,9 @@ int __handle_elf(void *mem, size_t size)
 
 			case R_PPC64_REL16_LO:
 				value64 += addend64 - place;
-				pr_debug("\t\t\tR_PPC64_REL16_LO at 0x%-4lx val 0x%lx\n",
-					 place, value64);
+				pr_debug("\t\t\tR_PPC64_REL16_LO at 0x%-4lx val 0x%lx\n", place, value64);
 				/* check that we are dealing with the addi 2,2 instruction */
-				if (((*(uint32_t*)where) & 0xffff0000) != 0x38420000) {
+				if (((*(uint32_t *)where) & 0xffff0000) != 0x38420000) {
 					pr_err("Unexpected instruction for R_PPC64_REL16_LO\n");
 					goto err;
 				}
@@ -594,14 +568,16 @@ int __handle_elf(void *mem, size_t size)
 				       (unsigned int)place, (long)addend64, (long)value64);
 				break;
 			case R_X86_64_PC32: /* Symbol + Addend - Place (4 bytes) */
-				pr_debug("\t\t\t\tR_X86_64_PC32     at 0x%-4lx val 0x%x\n", place, value32 + addend32 - (int32_t)place);
+				pr_debug("\t\t\t\tR_X86_64_PC32     at 0x%-4lx val 0x%x\n", place,
+					 value32 + addend32 - (int32_t)place);
 				/*
 				 * R_X86_64_PC32 are relative, patch them inplace.
 				 */
 				*((int32_t *)where) = value32 + addend32 - place;
 				break;
 			case R_X86_64_PLT32: /* ProcLinkage + Addend - Place (4 bytes) */
-				pr_debug("\t\t\t\tR_X86_64_PLT32    at 0x%-4lx val 0x%x\n", place, value32 + addend32 - (int32_t)place);
+				pr_debug("\t\t\t\tR_X86_64_PLT32    at 0x%-4lx val 0x%x\n", place,
+					 value32 + addend32 - (int32_t)place);
 				/*
 				 * R_X86_64_PLT32 are relative, patch them inplace.
 				 */
@@ -626,7 +602,8 @@ int __handle_elf(void *mem, size_t size)
 				       (unsigned int)place, addend32, value32);
 				break;
 			case R_386_PC32: /* Symbol + Addend - Place */
-				pr_debug("\t\t\t\tR_386_PC32 at 0x%-4lx val 0x%x\n", place, value32 + addend32 - (int32_t)place);
+				pr_debug("\t\t\t\tR_386_PC32 at 0x%-4lx val 0x%x\n", place,
+					 value32 + addend32 - (int32_t)place);
 				/*
 				 * R_386_PC32 are relative, patch them inplace.
 				 */
@@ -661,7 +638,7 @@ int __handle_elf(void *mem, size_t size)
 #endif
 			default:
 				pr_err("Unsupported relocation of type %lu\n",
-					(unsigned long)ELF_R_TYPE(r->rel.r_info));
+				       (unsigned long)ELF_R_TYPE(r->rel.r_info));
 				goto err;
 			}
 		}
@@ -679,11 +656,11 @@ int __handle_elf(void *mem, size_t size)
 		if (!(sh->sh_flags & SHF_ALLOC) || !sh->sh_size)
 			continue;
 
-		shdata =  mem + sh->sh_offset;
+		shdata = mem + sh->sh_offset;
 		pr_debug("Copying section '%s'\n"
 			 "\tstart:0x%lx (gap:0x%lx) size:0x%lx\n",
-			 &secstrings[sh->sh_name], (unsigned long) sh->sh_addr,
-			 (unsigned long)(sh->sh_addr - k), (unsigned long) sh->sh_size);
+			 &secstrings[sh->sh_name], (unsigned long)sh->sh_addr, (unsigned long)(sh->sh_addr - k),
+			 (unsigned long)sh->sh_size);
 
 		/* write 0 in the gap between the 2 sections */
 		for (; k < sh->sh_addr; k++) {
@@ -704,21 +681,20 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("};\n");
 	pr_out("\n");
 	pr_out("static void __maybe_unused %s_setup_c_header_desc(struct parasite_blob_desc *pbd, bool native)\n",
-			opts.prefix);
-	pr_out(
-"{\n"
-"	pbd->parasite_type	= COMPEL_BLOB_CHEADER;\n"
-);
+	       opts.prefix);
+	pr_out("{\n"
+	       "	pbd->parasite_type	= COMPEL_BLOB_CHEADER;\n");
 	pr_out("\tpbd->hdr.mem		= %s_blob;\n", opts.prefix);
-	pr_out("\tpbd->hdr.bsize		= sizeof(%s_blob);\n",
-			opts.prefix);
+	pr_out("\tpbd->hdr.bsize		= sizeof(%s_blob);\n", opts.prefix);
 	pr_out("\tif (native)\n");
 	pr_out("\t\tpbd->hdr.parasite_ip_off	= "
-		"%s_sym__export_parasite_head_start;\n", opts.prefix);
+	       "%s_sym__export_parasite_head_start;\n",
+	       opts.prefix);
 	pr_out("#ifdef CONFIG_COMPAT\n");
 	pr_out("\telse\n");
 	pr_out("\t\tpbd->hdr.parasite_ip_off	= "
-		"%s_sym__export_parasite_head_start_compat;\n", opts.prefix);
+	       "%s_sym__export_parasite_head_start_compat;\n",
+	       opts.prefix);
 	pr_out("#endif /* CONFIG_COMPAT */\n");
 	pr_out("\tpbd->hdr.cmd_off	= %s_sym__export_parasite_service_cmd;\n", opts.prefix);
 	pr_out("\tpbd->hdr.args_ptr_off	= %s_sym__export_parasite_service_args_ptr;\n", opts.prefix);
@@ -727,12 +703,11 @@ int __handle_elf(void *mem, size_t size)
 	pr_out("\tpbd->hdr.data_off	= %#lx;\n", data_off);
 	pr_out("\tpbd->hdr.relocs		= %s_relocs;\n", opts.prefix);
 	pr_out("\tpbd->hdr.nr_relocs	= "
-			"sizeof(%s_relocs) / sizeof(%s_relocs[0]);\n",
-			opts.prefix, opts.prefix);
+	       "sizeof(%s_relocs) / sizeof(%s_relocs[0]);\n",
+	       opts.prefix, opts.prefix);
 	pr_out("}\n");
 	pr_out("\n");
-	pr_out("static void __maybe_unused %s_setup_c_header(struct parasite_ctl *ctl)\n",
-			opts.prefix);
+	pr_out("static void __maybe_unused %s_setup_c_header(struct parasite_ctl *ctl)\n", opts.prefix);
 	pr_out("{\n");
 	pr_out("\t%s_setup_c_header_desc(compel_parasite_blob_desc(ctl), compel_mode_native(ctl));\n", opts.prefix);
 	pr_out("}\n");
diff --git a/compel/src/lib/infect-rpc.c b/compel/src/lib/infect-rpc.c
index 265a4ad2f..6b19fa6bd 100644
--- a/compel/src/lib/infect-rpc.c
+++ b/compel/src/lib/infect-rpc.c
@@ -19,8 +19,7 @@ static int __parasite_send_cmd(int sockfd, struct ctl_msg *m)
 		pr_perror("Failed to send command %d to daemon", m->cmd);
 		return -1;
 	} else if (ret != sizeof(*m)) {
-		pr_err("Message to daemon is trimmed (%d/%d)\n",
-		       (int)sizeof(*m), ret);
+		pr_err("Message to daemon is trimmed (%d/%d)\n", (int)sizeof(*m), ret);
 		return -1;
 	}
 
@@ -42,12 +41,10 @@ int parasite_wait_ack(int sockfd, unsigned int cmd, struct ctl_msg *m)
 			pr_perror("Failed to read ack");
 			return -1;
 		} else if (ret != sizeof(*m)) {
-			pr_err("Message reply from daemon is trimmed (%d/%d)\n",
-			       (int)sizeof(*m), ret);
+			pr_err("Message reply from daemon is trimmed (%d/%d)\n", (int)sizeof(*m), ret);
 			return -1;
 		}
-		pr_debug("Fetched ack: %d %d %d\n",
-			 m->cmd, m->ack, m->err);
+		pr_debug("Fetched ack: %d %d %d\n", m->cmd, m->ack, m->err);
 
 		if (m->cmd != cmd || m->ack != cmd) {
 			pr_err("Communication error, this is not "
@@ -68,8 +65,7 @@ int compel_rpc_sync(unsigned int cmd, struct parasite_ctl *ctl)
 		return -1;
 
 	if (m.err != 0) {
-		pr_err("Command %d for daemon failed with %d\n",
-		       cmd, m.err);
+		pr_err("Command %d for daemon failed with %d\n", cmd, m.err);
 		return -1;
 	}
 
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index a15b99ad6..0fb9e715c 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -27,18 +27,17 @@
 #include "rpc-pie-priv.h"
 #include "infect-util.h"
 
-#define __sys(foo)	foo
-#define __sys_err(ret)	(-errno)
+#define __sys(foo)     foo
+#define __sys_err(ret) (-errno)
 
 #include "common/scm.h"
 #include "common/scm-code.c"
 
 #ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - \
-			(size_t)((struct sockaddr_un *) 0)->sun_path)
+#define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - (size_t)((struct sockaddr_un *)0)->sun_path)
 #endif
 
-#define PARASITE_STACK_SIZE	(16 << 10)
+#define PARASITE_STACK_SIZE (16 << 10)
 
 #ifndef SECCOMP_MODE_DISABLED
 #define SECCOMP_MODE_DISABLED 0
@@ -193,10 +192,9 @@ static int skip_sigstop(int pid, int nr_signals)
  * of it so the task would not know if it was saddled
  * up with someone else.
  */
-int compel_wait_task(int pid, int ppid,
-		int (*get_status)(int pid, struct seize_task_status *, void *),
-		void (*free_status)(int pid, struct seize_task_status *, void *),
-		struct seize_task_status *ss, void *data)
+int compel_wait_task(int pid, int ppid, int (*get_status)(int pid, struct seize_task_status *, void *),
+		     void (*free_status)(int pid, struct seize_task_status *, void *), struct seize_task_status *ss,
+		     void *data)
 {
 	siginfo_t si;
 	int status, nr_sigstop;
@@ -232,8 +230,8 @@ try_again:
 			if (pid == getpid())
 				pr_err("The criu itself is within dumped tree.\n");
 			else
-				pr_err("Unseizable non-zombie %d found, state %c, err %d/%d\n",
-						pid, ss->state, ret, wait_errno);
+				pr_err("Unseizable non-zombie %d found, state %c, err %d/%d\n", pid, ss->state, ret,
+				       wait_errno);
 			return -1;
 		}
 
@@ -244,8 +242,7 @@ try_again:
 	}
 
 	if ((ppid != -1) && (ss->ppid != ppid)) {
-		pr_err("Task pid reused while suspending (%d: %d -> %d)\n",
-				pid, ppid, ss->ppid);
+		pr_err("Task pid reused while suspending (%d: %d -> %d)\n", pid, ppid, ss->ppid);
 		goto err;
 	}
 
@@ -267,8 +264,7 @@ try_again:
 		 * handle one and repeat.
 		 */
 
-		if (ptrace(PTRACE_CONT, pid, NULL,
-					(void *)(unsigned long)si.si_signo)) {
+		if (ptrace(PTRACE_CONT, pid, NULL, (void *)(unsigned long)si.si_signo)) {
 			pr_perror("Can't continue signal handling, aborting");
 			goto err;
 		}
@@ -368,8 +364,7 @@ static int gen_parasite_saddr(struct sockaddr_un *saddr, int key)
 	int sun_len;
 
 	saddr->sun_family = AF_UNIX;
-	snprintf(saddr->sun_path, UNIX_PATH_MAX,
-			"X/crtools-pr-%d", key);
+	snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d", key);
 
 	sun_len = SUN_LEN(saddr);
 	*saddr->sun_path = '\0';
@@ -377,8 +372,7 @@ static int gen_parasite_saddr(struct sockaddr_un *saddr, int key)
 	return sun_len;
 }
 
-static int prepare_tsock(struct parasite_ctl *ctl, pid_t pid,
-		struct parasite_init_args *args)
+static int prepare_tsock(struct parasite_ctl *ctl, pid_t pid, struct parasite_init_args *args)
 {
 	int ssock = -1;
 	socklen_t sk_len;
@@ -395,7 +389,7 @@ static int prepare_tsock(struct parasite_ctl *ctl, pid_t pid,
 		goto err;
 	}
 
-	if (getsockname(ssock, (struct sockaddr *) &addr, &sk_len) < 0) {
+	if (getsockname(ssock, (struct sockaddr *)&addr, &sk_len) < 0) {
 		pr_perror("Unable to get name for a socket");
 		return -1;
 	}
@@ -430,8 +424,8 @@ err:
 static int setup_child_handler(struct parasite_ctl *ctl)
 {
 	struct sigaction sa = {
-		.sa_sigaction	= ctl->ictx.child_handler,
-		.sa_flags	= SA_SIGINFO | SA_RESTART,
+		.sa_sigaction = ctl->ictx.child_handler,
+		.sa_flags = SA_SIGINFO | SA_RESTART,
 	};
 
 	sigemptyset(&sa.sa_mask);
@@ -454,8 +448,8 @@ static int restore_child_handler(struct parasite_ctl *ctl)
 	return 0;
 }
 
-static int parasite_run(pid_t pid, int cmd, unsigned long ip, void *stack,
-		user_regs_struct_t *regs, struct thread_ctx *octx)
+static int parasite_run(pid_t pid, int cmd, unsigned long ip, void *stack, user_regs_struct_t *regs,
+			struct thread_ctx *octx)
 {
 	k_rtsigset_t block;
 
@@ -493,8 +487,7 @@ err_sig:
 	return -1;
 }
 
-static int restore_thread_ctx(int pid, struct thread_ctx *ctx,
-			      bool restore_ext_regs)
+static int restore_thread_ctx(int pid, struct thread_ctx *ctx, bool restore_ext_regs)
 {
 	int ret = 0;
 
@@ -515,10 +508,8 @@ static int restore_thread_ctx(int pid, struct thread_ctx *ctx,
 }
 
 /* we run at @regs->ip */
-static int parasite_trap(struct parasite_ctl *ctl, pid_t pid,
-				user_regs_struct_t *regs,
-				struct thread_ctx *octx,
-				bool may_use_extended_regs)
+static int parasite_trap(struct parasite_ctl *ctl, pid_t pid, user_regs_struct_t *regs, struct thread_ctx *octx,
+			 bool may_use_extended_regs)
 {
 	siginfo_t siginfo;
 	int status;
@@ -546,12 +537,11 @@ static int parasite_trap(struct parasite_ctl *ctl, pid_t pid,
 
 	if (ptrace_get_regs(pid, regs)) {
 		pr_perror("Can't obtain registers (pid: %d)", pid);
-			goto err;
+		goto err;
 	}
 
 	if (WSTOPSIG(status) != SIGTRAP || siginfo.si_code != ARCH_SI_TRAP) {
-		pr_debug("** delivering signal %d si_code=%d\n",
-			 siginfo.si_signo, siginfo.si_code);
+		pr_debug("** delivering signal %d si_code=%d\n", siginfo.si_signo, siginfo.si_code);
 
 		pr_err("Unexpected %d task interruption, aborting\n", pid);
 		goto err;
@@ -569,9 +559,7 @@ err:
 	return ret;
 }
 
-
-int compel_execute_syscall(struct parasite_ctl *ctl,
-		user_regs_struct_t *regs, const char *code_syscall)
+int compel_execute_syscall(struct parasite_ctl *ctl, user_regs_struct_t *regs, const char *code_syscall)
 {
 	pid_t pid = ctl->rpid;
 	int err;
@@ -582,8 +570,7 @@ int compel_execute_syscall(struct parasite_ctl *ctl,
 	 * we will need it to restore original program content.
 	 */
 	memcpy(code_orig, code_syscall, sizeof(code_orig));
-	if (ptrace_swap_area(pid, (void *)ctl->ictx.syscall_ip,
-			     (void *)code_orig, sizeof(code_orig))) {
+	if (ptrace_swap_area(pid, (void *)ctl->ictx.syscall_ip, (void *)code_orig, sizeof(code_orig))) {
 		pr_err("Can't inject syscall blob (pid: %d)\n", pid);
 		return -1;
 	}
@@ -592,8 +579,7 @@ int compel_execute_syscall(struct parasite_ctl *ctl,
 	if (!err)
 		err = parasite_trap(ctl, pid, regs, &ctl->orig, false);
 
-	if (ptrace_poke_area(pid, (void *)code_orig,
-			     (void *)ctl->ictx.syscall_ip, sizeof(code_orig))) {
+	if (ptrace_poke_area(pid, (void *)code_orig, (void *)ctl->ictx.syscall_ip, sizeof(code_orig))) {
 		pr_err("Can't restore syscall blob (pid: %d)\n", ctl->rpid);
 		err = -1;
 	}
@@ -633,7 +619,7 @@ static int parasite_init_daemon(struct parasite_ctl *ctl)
 	struct parasite_init_args *args;
 	pid_t pid = ctl->rpid;
 	user_regs_struct_t regs;
-	struct ctl_msg m = { };
+	struct ctl_msg m = {};
 
 	*ctl->cmd = PARASITE_CMD_INIT_DAEMON;
 
@@ -674,12 +660,11 @@ static int parasite_init_daemon(struct parasite_ctl *ctl)
 	pr_info("Wait for parasite being daemonized...\n");
 
 	if (parasite_wait_ack(ctl->tsock, PARASITE_CMD_INIT_DAEMON, &m)) {
-		pr_err("Can't switch parasite %d to daemon mode %d\n",
-		       pid, m.err);
+		pr_err("Can't switch parasite %d to daemon mode %d\n", pid, m.err);
 		goto err;
 	}
 
-	ctl->sigreturn_addr = (void*)(uintptr_t)args->sigreturn_addr;
+	ctl->sigreturn_addr = (void *)(uintptr_t)args->sigreturn_addr;
 	ctl->daemonized = true;
 	pr_info("Parasite %d has been switched to daemon mode\n", pid);
 	return 0;
@@ -698,8 +683,7 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 	 * while in daemon it is not such.
 	 */
 
-	if (compel_get_task_regs(pid, &ctl->orig.regs, NULL, ictx->save_regs,
-			ictx->regs_arg, ictx->flags)) {
+	if (compel_get_task_regs(pid, &ctl->orig.regs, NULL, ictx->save_regs, ictx->regs_arg, ictx->flags)) {
 		pr_err("Can't obtain regs for thread %d\n", pid);
 		return -1;
 	}
@@ -722,8 +706,7 @@ static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size,
 {
 	int fd;
 
-	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot,
-				      MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 	if (!ctl->remote_map) {
 		pr_err("Can't allocate memory for parasite blob (pid: %d)\n", ctl->rpid);
 		return -1;
@@ -731,13 +714,12 @@ static int parasite_mmap_exchange(struct parasite_ctl *ctl, unsigned long size,
 
 	ctl->map_length = round_up(size, page_size());
 
-	fd = ctl->ictx.open_proc(ctl->rpid, O_RDWR, "map_files/%lx-%lx",
-		 (long)ctl->remote_map, (long)ctl->remote_map + ctl->map_length);
+	fd = ctl->ictx.open_proc(ctl->rpid, O_RDWR, "map_files/%lx-%lx", (long)ctl->remote_map,
+				 (long)ctl->remote_map + ctl->map_length);
 	if (fd < 0)
 		return -1;
 
-	ctl->local_map = mmap(NULL, size, PROT_READ | PROT_WRITE,
-			      MAP_SHARED | MAP_FILE, fd, 0);
+	ctl->local_map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FILE, fd, 0);
 	close(fd);
 
 	if (ctl->local_map == MAP_FAILED) {
@@ -779,8 +761,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size,
 		return -1;
 	}
 
-	ret = compel_syscall(ctl, __NR(memfd_create, compat_task), &sret,
-			     (unsigned long)where, 0, 0, 0, 0, 0);
+	ret = compel_syscall(ctl, __NR(memfd_create, compat_task), &sret, (unsigned long)where, 0, 0, 0, 0, 0);
 
 	if (ptrace_poke_area(pid, orig_code, where, sizeof(orig_code))) {
 		fd = (int)sret;
@@ -812,15 +793,13 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size,
 		goto err_cure;
 	}
 
-	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot,
-				      MAP_FILE | MAP_SHARED, fd, 0);
+	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot, MAP_FILE | MAP_SHARED, fd, 0);
 	if (!ctl->remote_map) {
 		pr_err("Can't rmap memfd for parasite blob\n");
 		goto err_curef;
 	}
 
-	ctl->local_map = mmap(NULL, size, PROT_READ | PROT_WRITE,
-			      MAP_SHARED | MAP_FILE, lfd, 0);
+	ctl->local_map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FILE, lfd, 0);
 	if (ctl->local_map == MAP_FAILED) {
 		ctl->local_map = NULL;
 		pr_perror("Can't lmap memfd for parasite blob");
@@ -867,7 +846,8 @@ void compel_relocs_apply(void *mem, void *vbase, struct parasite_blob_desc *pbd)
 				int rel;
 
 				got[j] = vbase + elf_relocs[i].value;
-				rel = (unsigned)((void *)&got[j] - (void *)mem) - elf_relocs[i].offset + elf_relocs[i].addend;
+				rel = (unsigned)((void *)&got[j] - (void *)mem) - elf_relocs[i].offset +
+				      elf_relocs[i].addend;
 
 				*value = rel;
 				j++;
@@ -888,8 +868,7 @@ long remote_mprotect(struct parasite_ctl *ctl, void *addr, size_t len, int prot)
 	int err;
 	bool compat_task = !user_regs_native(&ctl->orig.regs);
 
-	err = compel_syscall(ctl, __NR(mprotect, compat_task), &ret,
-			(unsigned long)addr, len, prot, 0, 0, 0);
+	err = compel_syscall(ctl, __NR(mprotect, compat_task), &ret, (unsigned long)addr, len, prot, 0, 0, 0);
 	if (err < 0) {
 		pr_err("compel_syscall for mprotect failed\n");
 		return -1;
@@ -917,8 +896,7 @@ static int compel_map_exchange(struct parasite_ctl *ctl, unsigned long size)
 	if (!ctl->pblob.hdr.data_off)
 		return 0;
 
-	ret = remote_mprotect(ctl, ctl->remote_map + ctl->pblob.hdr.data_off,
-			      size - ctl->pblob.hdr.data_off,
+	ret = remote_mprotect(ctl, ctl->remote_map + ctl->pblob.hdr.data_off, size - ctl->pblob.hdr.data_off,
 			      PROT_READ | PROT_WRITE);
 	if (ret)
 		pr_err("remote_mprotect failed\n");
@@ -1000,7 +978,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 * already the case, as args follows the GOT table, which is 8 bytes
 	 * aligned.
 	 */
-	if ((unsigned long)ctl->args & (4-1)) {
+	if ((unsigned long)ctl->args & (4 - 1)) {
 		pr_err("BUG: args are not 4 bytes aligned: %p\n", ctl->args);
 		goto err;
 	}
@@ -1010,8 +988,8 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 
 	p = parasite_size;
 
-	ctl->rsigframe	= ctl->remote_map + p;
-	ctl->sigframe	= ctl->local_map  + p;
+	ctl->rsigframe = ctl->remote_map + p;
+	ctl->sigframe = ctl->local_map + p;
 
 	p += RESTORE_STACK_SIGFRAME;
 	p += PARASITE_STACK_SIZE;
@@ -1022,12 +1000,11 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	 * It is already the case as RESTORE_STACK_SIGFRAME is a multiple of
 	 * 64, and PARASITE_STACK_SIZE is 0x4000.
 	 */
-	if ((unsigned long)ctl->rstack & (16-1)) {
+	if ((unsigned long)ctl->rstack & (16 - 1)) {
 		pr_err("BUG: stack is not 16 bytes aligned: %p\n", ctl->rstack);
 		goto err;
 	}
 
-
 	if (nr_threads > 1) {
 		p += PARASITE_STACK_SIZE;
 		ctl->r_thread_stack = ctl->remote_map + p;
@@ -1035,8 +1012,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 
 	ret = arch_fetch_sas(ctl, ctl->rsigframe);
 	if (ret) {
-		pr_err("Can't fetch sigaltstack for task %d (ret %d)\n",
-		       ctl->rpid, ret);
+		pr_err("Can't fetch sigaltstack for task %d (ret %d)\n", ctl->rpid, ret);
 		goto err;
 	}
 
@@ -1227,14 +1203,12 @@ static void handle_sigchld(int signal, siginfo_t *siginfo, void *data)
 	if (pid <= 0)
 		return;
 
-	pr_err("si_code=%d si_pid=%d si_status=%d\n",
-		siginfo->si_code, siginfo->si_pid, siginfo->si_status);
+	pr_err("si_code=%d si_pid=%d si_status=%d\n", siginfo->si_code, siginfo->si_pid, siginfo->si_status);
 
 	if (WIFEXITED(status))
 		pr_err("%d exited with %d unexpectedly\n", pid, WEXITSTATUS(status));
 	else if (WIFSIGNALED(status))
-		pr_err("%d was killed by %d unexpectedly: %s\n",
-			pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+		pr_err("%d was killed by %d unexpectedly: %s\n", pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
 	else if (WIFSTOPPED(status))
 		pr_err("%d was stopped by %d unexpectedly\n", pid, WSTOPSIG(status));
 
@@ -1325,9 +1299,8 @@ err:
 
 static bool task_in_parasite(struct parasite_ctl *ctl, user_regs_struct_t *regs)
 {
-	void *addr = (void *) REG_IP(*regs);
-	return addr >= ctl->remote_map &&
-		addr < ctl->remote_map + ctl->map_length;
+	void *addr = (void *)REG_IP(*regs);
+	return addr >= ctl->remote_map && addr < ctl->remote_map + ctl->map_length;
 }
 
 static int parasite_fini_seized(struct parasite_ctl *ctl)
@@ -1376,13 +1349,11 @@ static int parasite_fini_seized(struct parasite_ctl *ctl)
 		return -1;
 
 	/* Go to sigreturn as closer as we can */
-	ret = compel_stop_pie(pid, ctl->sigreturn_addr, &flag,
-			ctl->ictx.flags & INFECT_NO_BREAKPOINTS);
+	ret = compel_stop_pie(pid, ctl->sigreturn_addr, &flag, ctl->ictx.flags & INFECT_NO_BREAKPOINTS);
 	if (ret < 0)
 		return ret;
 
-	if (compel_stop_on_syscall(1, __NR(rt_sigreturn, 0),
-				__NR(rt_sigreturn, 1), flag))
+	if (compel_stop_on_syscall(1, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag))
 		return -1;
 
 	if (ptrace_flush_breakpoints(pid))
@@ -1429,15 +1400,13 @@ int compel_cure_remote(struct parasite_ctl *ctl)
 	if (!ctl->remote_map)
 		return 0;
 
-	err = compel_syscall(ctl, __NR(munmap, !compel_mode_native(ctl)), &ret,
-			     (unsigned long)ctl->remote_map, ctl->map_length,
-			     0, 0, 0, 0);
+	err = compel_syscall(ctl, __NR(munmap, !compel_mode_native(ctl)), &ret, (unsigned long)ctl->remote_map,
+			     ctl->map_length, 0, 0, 0, 0);
 	if (err)
 		return err;
 
 	if (ret) {
-		pr_err("munmap for remote map %p, %lu returned %lu\n",
-				ctl->remote_map, ctl->map_length, ret);
+		pr_err("munmap for remote map %p, %lu returned %lu\n", ctl->remote_map, ctl->map_length, ret);
 		return -1;
 	}
 
@@ -1519,8 +1488,7 @@ int compel_unmap(struct parasite_ctl *ctl, unsigned long addr)
 	if (ret)
 		goto err;
 
-	ret = compel_stop_on_syscall(1, __NR(munmap, 0),
-			__NR(munmap, 1), TRACE_ENTER);
+	ret = compel_stop_on_syscall(1, __NR(munmap, 0), __NR(munmap, 1), TRACE_ENTER);
 
 	/*
 	 * Don't touch extended registers here: they were restored
@@ -1576,25 +1544,22 @@ static bool task_is_trapped(int status, pid_t pid)
 	if (WIFEXITED(status))
 		pr_err("Task exited with %d\n", WEXITSTATUS(status));
 	if (WIFSIGNALED(status))
-		pr_err("Task signaled with %d: %s\n",
-			WTERMSIG(status), strsignal(WTERMSIG(status)));
+		pr_err("Task signaled with %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
 	if (WIFSTOPPED(status))
-		pr_err("Task stopped with %d: %s\n",
-			WSTOPSIG(status), strsignal(WSTOPSIG(status)));
+		pr_err("Task stopped with %d: %s\n", WSTOPSIG(status), strsignal(WSTOPSIG(status)));
 	if (WIFCONTINUED(status))
 		pr_err("Task continued\n");
 
 	return false;
 }
 
-static inline int is_required_syscall(user_regs_struct_t *regs, pid_t pid,
-		const int sys_nr, const int sys_nr_compat)
+static inline int is_required_syscall(user_regs_struct_t *regs, pid_t pid, const int sys_nr, const int sys_nr_compat)
 {
 	const char *mode = user_regs_native(regs) ? "native" : "compat";
 	int req_sysnr = user_regs_native(regs) ? sys_nr : sys_nr_compat;
 
-	pr_debug("%d (%s) is going to execute the syscall %lu, required is %d\n",
-		pid, mode, REG_SYSCALL_NR(*regs), req_sysnr);
+	pr_debug("%d (%s) is going to execute the syscall %lu, required is %d\n", pid, mode, REG_SYSCALL_NR(*regs),
+		 req_sysnr);
 
 	return (REG_SYSCALL_NR(*regs) == req_sysnr);
 }
@@ -1606,9 +1571,7 @@ static inline int is_required_syscall(user_regs_struct_t *regs, pid_t pid,
  * sys_nr - the required syscall number
  * sys_nr_compat - the required compatible syscall number
  */
-int compel_stop_on_syscall(int tasks,
-	const int sys_nr, const int sys_nr_compat,
-	enum trace_flags trace)
+int compel_stop_on_syscall(int tasks, const int sys_nr, const int sys_nr_compat, enum trace_flags trace)
 {
 	user_regs_struct_t regs;
 	int status, ret;
@@ -1668,7 +1631,7 @@ int compel_stop_on_syscall(int tasks,
 			tasks--;
 			continue;
 		}
-goon:
+	goon:
 		ret = ptrace(PTRACE_SYSCALL, pid, NULL, NULL);
 		if (ret) {
 			pr_perror("ptrace");
@@ -1699,10 +1662,9 @@ k_rtsigset_t *compel_task_sigmask(struct parasite_ctl *ctl)
 	return thread_ctx_sigmask(&ctl->orig);
 }
 
-int compel_get_thread_regs(struct parasite_thread_ctl *tctl, save_regs_t save, void * arg)
+int compel_get_thread_regs(struct parasite_thread_ctl *tctl, save_regs_t save, void *arg)
 {
-	return compel_get_task_regs(tctl->tid, &tctl->th.regs, &tctl->th.ext_regs,
-			     save, arg, tctl->ctl->ictx.flags);
+	return compel_get_task_regs(tctl->tid, &tctl->th.regs, &tctl->th.ext_regs, save, arg, tctl->ctl->ictx.flags);
 }
 
 struct infect_ctx *compel_infect_ctx(struct parasite_ctl *ctl)
diff --git a/compel/src/lib/ptrace.c b/compel/src/lib/ptrace.c
index 4c3530c85..49b685d70 100644
--- a/compel/src/lib/ptrace.c
+++ b/compel/src/lib/ptrace.c
@@ -93,8 +93,7 @@ int ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes)
 	if (err) {
 		int err2;
 
-		pr_err("Can't poke %d @ %p from %p sized %ld\n",
-			pid, dst, src, bytes);
+		pr_err("Can't poke %d @ %p from %p sized %ld\n", pid, dst, src, bytes);
 
 		err2 = ptrace_poke_area(pid, t, dst, bytes);
 		if (err2) {
@@ -109,7 +108,8 @@ int ptrace_swap_area(pid_t pid, void *dst, void *src, long bytes)
 	return 0;
 }
 
-int __attribute__((weak)) ptrace_get_regs(int pid, user_regs_struct_t *regs) {
+int __attribute__((weak)) ptrace_get_regs(int pid, user_regs_struct_t *regs)
+{
 	struct iovec iov;
 
 	iov.iov_base = regs;
diff --git a/compel/src/main.c b/compel/src/main.c
index 2c98659cc..a9a50959f 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -17,44 +17,44 @@
 #include "piegen.h"
 #include "log.h"
 
-#define CFLAGS_DEFAULT_SET					\
-	"-Wstrict-prototypes "					\
+#define CFLAGS_DEFAULT_SET     \
+	"-Wstrict-prototypes " \
 	"-fno-stack-protector -nostdlib -fomit-frame-pointer "
 
-#define COMPEL_CFLAGS_PIE	CFLAGS_DEFAULT_SET "-fpie"
-#define COMPEL_CFLAGS_NOPIC	CFLAGS_DEFAULT_SET "-fno-pic"
+#define COMPEL_CFLAGS_PIE   CFLAGS_DEFAULT_SET "-fpie"
+#define COMPEL_CFLAGS_NOPIC CFLAGS_DEFAULT_SET "-fno-pic"
 
 #ifdef NO_RELOCS
-#define COMPEL_LDFLAGS_COMMON	"-z noexecstack -T "
+#define COMPEL_LDFLAGS_COMMON "-z noexecstack -T "
 #else
-#define COMPEL_LDFLAGS_COMMON	"-r -z noexecstack -T "
+#define COMPEL_LDFLAGS_COMMON "-r -z noexecstack -T "
 #endif
 
 typedef struct {
-	const char	*arch;		// dir name under arch/
-	const char	*cflags;
-	const char	*cflags_compat;
+	const char *arch; // dir name under arch/
+	const char *cflags;
+	const char *cflags_compat;
 } flags_t;
 
 static const flags_t flags = {
 #if defined CONFIG_X86_64
-	.arch		= "x86",
-	.cflags		= COMPEL_CFLAGS_PIE,
-	.cflags_compat	= COMPEL_CFLAGS_NOPIC,
+	.arch = "x86",
+	.cflags = COMPEL_CFLAGS_PIE,
+	.cflags_compat = COMPEL_CFLAGS_NOPIC,
 #elif defined CONFIG_AARCH64
-	.arch		= "aarch64",
-	.cflags		= COMPEL_CFLAGS_PIE,
+	.arch = "aarch64",
+	.cflags = COMPEL_CFLAGS_PIE,
 #elif defined(CONFIG_ARMV6) || defined(CONFIG_ARMV7)
-	.arch		= "arm",
-	.cflags		= COMPEL_CFLAGS_PIE,
+	.arch = "arm",
+	.cflags = COMPEL_CFLAGS_PIE,
 #elif defined CONFIG_PPC64
-	.arch		= "ppc64",
-	.cflags		= COMPEL_CFLAGS_PIE,
+	.arch = "ppc64",
+	.cflags = COMPEL_CFLAGS_PIE,
 #elif defined CONFIG_S390
-	.arch		= "s390",
-	.cflags		= COMPEL_CFLAGS_PIE,
+	.arch = "s390",
+	.cflags = COMPEL_CFLAGS_PIE,
 #elif defined CONFIG_MIPS
-	.arch		= "mips",
+	.arch = "mips",
 #else
 #error "CONFIG_<ARCH> not defined, or unsupported ARCH"
 #endif
@@ -123,23 +123,23 @@ static void cli_log(unsigned int lvl, const char *fmt, va_list parms)
 	vfprintf(f, fmt, parms);
 }
 
-static int usage(int rc) {
+static int usage(int rc)
+{
 	FILE *out = (rc == 0) ? stdout : stderr;
 
 	fprintf(out,
-"Usage:\n"
-"  compel [--compat] includes | cflags | ldflags\n"
-"  compel plugins [PLUGIN_NAME ...]\n"
-"  compel [--compat] [--static] libs\n"
-"  compel -f FILE -o FILE [-p NAME] [-l N] hgen\n"
-"    -f, --file FILE		input (parasite object) file name\n"
-"    -o, --output FILE		output (header) file name\n"
-"    -p, --prefix NAME		prefix for var names\n"
-"    -l, --log-level NUM		log level (default: %d)\n"
-"  compel -h|--help\n"
-"  compel -V|--version\n"
-, COMPEL_DEFAULT_LOGLEVEL
-);
+		"Usage:\n"
+		"  compel [--compat] includes | cflags | ldflags\n"
+		"  compel plugins [PLUGIN_NAME ...]\n"
+		"  compel [--compat] [--static] libs\n"
+		"  compel -f FILE -o FILE [-p NAME] [-l N] hgen\n"
+		"    -f, --file FILE		input (parasite object) file name\n"
+		"    -o, --output FILE		output (header) file name\n"
+		"    -p, --prefix NAME		prefix for var names\n"
+		"    -l, --log-level NUM		log level (default: %d)\n"
+		"  compel -h|--help\n"
+		"  compel -V|--version\n",
+		COMPEL_DEFAULT_LOGLEVEL);
 
 	return rc;
 }
@@ -182,12 +182,9 @@ static void print_ldflags(bool compat)
 	printf("%s", COMPEL_LDFLAGS_COMMON);
 
 	if (uninst_root) {
-		printf("%s/arch/%s/scripts/compel-pack%s.lds.S\n",
-				uninst_root, flags.arch, compat_str);
+		printf("%s/arch/%s/scripts/compel-pack%s.lds.S\n", uninst_root, flags.arch, compat_str);
 	} else {
-		printf("%s/compel/scripts/compel-pack%s.lds.S\n",
-				LIBEXECDIR, compat_str);
-
+		printf("%s/compel/scripts/compel-pack%s.lds.S\n", LIBEXECDIR, compat_str);
 	}
 }
 
@@ -196,8 +193,7 @@ static void print_plugin(const char *name)
 	const char suffix[] = ".lib.a";
 
 	if (uninst_root)
-		printf("%s/plugins/%s%s\n",
-				uninst_root, name, suffix);
+		printf("%s/plugins/%s%s\n", uninst_root, name, suffix);
 	else
 		printf("%s/compel/%s%s\n", LIBEXECDIR, name, suffix);
 }
@@ -307,15 +303,15 @@ int main(int argc, char *argv[])
 
 	static const char short_opts[] = "csf:o:p:hVl:";
 	static struct option long_opts[] = {
-		{ "compat",	no_argument,		0, 'c' },
-		{ "static",	no_argument,		0, 's' },
-		{ "file",	required_argument,	0, 'f' },
-		{ "output",	required_argument,	0, 'o' },
-		{ "prefix",	required_argument,	0, 'p' },
-		{ "help",	no_argument,		0, 'h' },
-		{ "version",	no_argument,		0, 'V' },
-		{ "log-level",	required_argument,	0, 'l' },
-		{ },
+		{ "compat", no_argument, 0, 'c' },
+		{ "static", no_argument, 0, 's' },
+		{ "file", required_argument, 0, 'f' },
+		{ "output", required_argument, 0, 'o' },
+		{ "prefix", required_argument, 0, 'p' },
+		{ "help", no_argument, 0, 'h' },
+		{ "version", no_argument, 0, 'V' },
+		{ "log-level", required_argument, 0, 'l' },
+		{},
 	};
 
 	uninst_root = getenv("COMPEL_UNINSTALLED_ROOTDIR");
@@ -347,9 +343,7 @@ int main(int argc, char *argv[])
 		case 'h':
 			return usage(0);
 		case 'V':
-			printf("Version: %d.%d.%d\n",
-			       COMPEL_SO_VERSION_MAJOR,
-			       COMPEL_SO_VERSION_MINOR,
+			printf("Version: %d.%d.%d\n", COMPEL_SO_VERSION_MAJOR, COMPEL_SO_VERSION_MINOR,
 			       COMPEL_SO_VERSION_SUBLEVEL);
 			exit(0);
 			break;
diff --git a/compel/test/fdspy/parasite.c b/compel/test/fdspy/parasite.c
index 7933d29ae..2399cc3ba 100644
--- a/compel/test/fdspy/parasite.c
+++ b/compel/test/fdspy/parasite.c
@@ -6,11 +6,19 @@
 /*
  * Stubs for std compel plugin.
  */
-int compel_main(void *arg_p, unsigned int arg_s) { return 0; }
-int parasite_trap_cmd(int cmd, void *args) { return 0; }
-void parasite_cleanup(void) { }
+int compel_main(void *arg_p, unsigned int arg_s)
+{
+	return 0;
+}
+int parasite_trap_cmd(int cmd, void *args)
+{
+	return 0;
+}
+void parasite_cleanup(void)
+{
+}
 
-#define PARASITE_CMD_GETFD	PARASITE_USER_CMDS
+#define PARASITE_CMD_GETFD PARASITE_USER_CMDS
 
 int parasite_daemon_cmd(int cmd, void *args)
 {
diff --git a/compel/test/fdspy/spy.c b/compel/test/fdspy/spy.c
index bbb9eb418..7f20ea2a7 100644
--- a/compel/test/fdspy/spy.c
+++ b/compel/test/fdspy/spy.c
@@ -11,7 +11,7 @@
 
 #include "parasite.h"
 
-#define PARASITE_CMD_GETFD	PARASITE_USER_CMDS
+#define PARASITE_CMD_GETFD PARASITE_USER_CMDS
 
 static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 {
@@ -21,7 +21,11 @@ static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 
 static int do_infection(int pid, int *stolen_fd)
 {
-#define err_and_ret(msg) do { fprintf(stderr, msg); return -1; } while (0)
+#define err_and_ret(msg)              \
+	do {                          \
+		fprintf(stderr, msg); \
+		return -1;            \
+	} while (0)
 
 	int state;
 	struct parasite_ctl *ctl;
@@ -135,14 +139,22 @@ int main(int argc, char **argv)
 	printf("Run the victim\n");
 	pid = vfork();
 	if (pid == 0) {
-		close(p_in[1]);  dup2(p_in[0], 0);  close(p_in[0]);
-		close(p_out[0]); dup2(p_out[1], 1); close(p_out[1]);
-		close(p_err[0]); dup2(p_err[1], 2); close(p_err[1]);
+		close(p_in[1]);
+		dup2(p_in[0], 0);
+		close(p_in[0]);
+		close(p_out[0]);
+		dup2(p_out[1], 1);
+		close(p_out[1]);
+		close(p_err[0]);
+		dup2(p_err[1], 2);
+		close(p_err[1]);
 		execl("./victim", "victim", NULL);
 		exit(1);
 	}
 
-	close(p_in[0]); close(p_out[1]); close(p_err[1]);
+	close(p_in[0]);
+	close(p_out[1]);
+	close(p_err[1]);
 
 	/*
 	 * Now do the infection with parasite.c
diff --git a/compel/test/infect/parasite.c b/compel/test/infect/parasite.c
index f18580966..ad13bd25d 100644
--- a/compel/test/infect/parasite.c
+++ b/compel/test/infect/parasite.c
@@ -6,11 +6,16 @@
 /*
  * Stubs for std compel plugin.
  */
-int parasite_trap_cmd(int cmd, void *args) { return 0; }
-void parasite_cleanup(void) { }
+int parasite_trap_cmd(int cmd, void *args)
+{
+	return 0;
+}
+void parasite_cleanup(void)
+{
+}
 
-#define PARASITE_CMD_INC	PARASITE_USER_CMDS
-#define PARASITE_CMD_DEC	PARASITE_USER_CMDS + 1
+#define PARASITE_CMD_INC PARASITE_USER_CMDS
+#define PARASITE_CMD_DEC PARASITE_USER_CMDS + 1
 
 int parasite_daemon_cmd(int cmd, void *args)
 {
diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index 8be6925c5..e7273b446 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -8,8 +8,8 @@
 
 #include "parasite.h"
 
-#define PARASITE_CMD_INC	PARASITE_USER_CMDS
-#define PARASITE_CMD_DEC	PARASITE_USER_CMDS + 1
+#define PARASITE_CMD_INC PARASITE_USER_CMDS
+#define PARASITE_CMD_DEC PARASITE_USER_CMDS + 1
 
 static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 {
@@ -19,7 +19,11 @@ static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 
 static int do_infection(int pid)
 {
-#define err_and_ret(msg) do { fprintf(stderr, msg); return -1; } while (0)
+#define err_and_ret(msg)              \
+	do {                          \
+		fprintf(stderr, msg); \
+		return -1;            \
+	} while (0)
 
 	int state;
 	struct parasite_ctl *ctl;
@@ -110,14 +114,22 @@ int main(int argc, char **argv)
 
 	pid = vfork();
 	if (pid == 0) {
-		close(p_in[1]);  dup2(p_in[0], 0);  close(p_in[0]);
-		close(p_out[0]); dup2(p_out[1], 1); close(p_out[1]);
-		close(p_err[0]); dup2(p_err[1], 2); close(p_err[1]);
+		close(p_in[1]);
+		dup2(p_in[0], 0);
+		close(p_in[0]);
+		close(p_out[0]);
+		dup2(p_out[1], 1);
+		close(p_out[1]);
+		close(p_err[0]);
+		dup2(p_err[1], 2);
+		close(p_err[1]);
 		execl("./victim", "victim", NULL);
 		exit(1);
 	}
 
-	close(p_in[0]); close(p_out[1]); close(p_err[1]);
+	close(p_in[0]);
+	close(p_out[1]);
+	close(p_err[1]);
 
 	/*
 	 * Tell the little guy some numbers
diff --git a/compel/test/rsys/spy.c b/compel/test/rsys/spy.c
index dd89005f1..4a6fcef29 100644
--- a/compel/test/rsys/spy.c
+++ b/compel/test/rsys/spy.c
@@ -15,7 +15,11 @@ static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
 
 static int do_rsetsid(int pid)
 {
-#define err_and_ret(msg) do { fprintf(stderr, msg); return -1; } while (0)
+#define err_and_ret(msg)              \
+	do {                          \
+		fprintf(stderr, msg); \
+		return -1;            \
+	} while (0)
 
 	int state;
 	long ret;
@@ -85,14 +89,22 @@ int main(int argc, char **argv)
 
 	pid = vfork();
 	if (pid == 0) {
-		close(p_in[1]);  dup2(p_in[0], 0);  close(p_in[0]);
-		close(p_out[0]); dup2(p_out[1], 1); close(p_out[1]);
-		close(p_err[0]); dup2(p_err[1], 2); close(p_err[1]);
+		close(p_in[1]);
+		dup2(p_in[0], 0);
+		close(p_in[0]);
+		close(p_out[0]);
+		dup2(p_out[1], 1);
+		close(p_out[1]);
+		close(p_err[0]);
+		dup2(p_err[1], 2);
+		close(p_err[1]);
 		execl("./victim", "victim", NULL);
 		exit(1);
 	}
 
-	close(p_in[0]); close(p_out[1]); close(p_err[1]);
+	close(p_in[0]);
+	close(p_out[1]);
+	close(p_err[1]);
 	sid = getsid(0);
 
 	/*
diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index 7a6fa56b7..cc0118353 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -18,18 +18,18 @@
 #include "common/scm.h"
 
 static const char *action_names[ACT_MAX] = {
-	[ ACT_PRE_DUMP ]	= "pre-dump",
-	[ ACT_POST_DUMP ]	= "post-dump",
-	[ ACT_PRE_RESTORE ]	= "pre-restore",
-	[ ACT_POST_RESTORE ]	= "post-restore",
-	[ ACT_NET_LOCK ]	= "network-lock",
-	[ ACT_NET_UNLOCK ]	= "network-unlock",
-	[ ACT_SETUP_NS ]	= "setup-namespaces",
-	[ ACT_POST_SETUP_NS ]	= "post-setup-namespaces",
-	[ ACT_PRE_RESUME ]	= "pre-resume",
-	[ ACT_POST_RESUME ]	= "post-resume",
-	[ ACT_ORPHAN_PTS_MASTER ] = "orphan-pts-master",
-	[ ACT_STATUS_READY ]    = "status-ready",
+	[ACT_PRE_DUMP] = "pre-dump",
+	[ACT_POST_DUMP] = "post-dump",
+	[ACT_PRE_RESTORE] = "pre-restore",
+	[ACT_POST_RESTORE] = "post-restore",
+	[ACT_NET_LOCK] = "network-lock",
+	[ACT_NET_UNLOCK] = "network-unlock",
+	[ACT_SETUP_NS] = "setup-namespaces",
+	[ACT_POST_SETUP_NS] = "post-setup-namespaces",
+	[ACT_PRE_RESUME] = "pre-resume",
+	[ACT_POST_RESUME] = "post-resume",
+	[ACT_ORPHAN_PTS_MASTER] = "orphan-pts-master",
+	[ACT_STATUS_READY] = "status-ready",
 };
 
 struct script {
@@ -37,11 +37,7 @@ struct script {
 	char *path;
 };
 
-enum {
-	SCRIPTS_NONE,
-	SCRIPTS_SHELL,
-	SCRIPTS_RPC
-};
+enum { SCRIPTS_NONE, SCRIPTS_SHELL, SCRIPTS_RPC };
 
 static int scripts_mode = SCRIPTS_NONE;
 static LIST_HEAD(scripts);
@@ -52,8 +48,8 @@ static int run_shell_scripts(const char *action)
 	struct script *script;
 	static unsigned env_set = 0;
 
-#define ENV_IMGDIR	0x1
-#define ENV_ROOTPID	0x2
+#define ENV_IMGDIR  0x1
+#define ENV_ROOTPID 0x2
 
 	if (setenv("CRTOOLS_SCRIPT_ACTION", action, 1)) {
 		pr_perror("Can't set CRTOOLS_SCRIPT_ACTION=%s", action);
@@ -62,7 +58,7 @@ static int run_shell_scripts(const char *action)
 
 	if (!(env_set & ENV_IMGDIR)) {
 		char image_dir[PATH_MAX];
-		sprintf(image_dir, "/proc/%ld/fd/%d", (long) getpid(), get_service_fd(IMG_FD_OFF));
+		sprintf(image_dir, "/proc/%ld/fd/%d", (long)getpid(), get_service_fd(IMG_FD_OFF));
 		if (setenv("CRTOOLS_IMAGE_DIR", image_dir, 1)) {
 			pr_perror("Can't set CRTOOLS_IMAGE_DIR=%s", image_dir);
 			return -1;
@@ -88,8 +84,7 @@ static int run_shell_scripts(const char *action)
 	list_for_each_entry(script, &scripts, node) {
 		int err;
 		pr_debug("\t[%s]\n", script->path);
-		err = cr_system(-1, -1, -1, script->path,
-				(char *[]) { script->path, NULL }, 0);
+		err = cr_system(-1, -1, -1, script->path, (char *[]){ script->path, NULL }, 0);
 		if (err)
 			pr_err("Script %s exited with %d\n", script->path, err);
 		retval |= err;
diff --git a/criu/aio.c b/criu/aio.c
index 6ee65d5f4..d2831a204 100644
--- a/criu/aio.c
+++ b/criu/aio.c
@@ -38,8 +38,7 @@ int dump_aio_ring(MmEntry *mme, struct vma_area *vma)
 	}
 	mme->aios[nr] = re;
 	mme->n_aios = nr + 1;
-	pr_info("Dumping AIO ring @%"PRIx64"-%"PRIx64"\n",
-		vma->e->start, vma->e->end);
+	pr_info("Dumping AIO ring @%" PRIx64 "-%" PRIx64 "\n", vma->e->start, vma->e->end);
 	return 0;
 }
 
@@ -56,7 +55,7 @@ void free_aios(MmEntry *mme)
 
 unsigned int aio_estimate_nr_reqs(unsigned int size)
 {
-	unsigned int k_max_reqs = NR_IOEVENTS_IN_NPAGES(size/PAGE_SIZE);
+	unsigned int k_max_reqs = NR_IOEVENTS_IN_NPAGES(size / PAGE_SIZE);
 
 	if (size & ~PAGE_MASK) {
 		pr_err("Ring size is not aligned\n");
@@ -82,8 +81,7 @@ unsigned int aio_estimate_nr_reqs(unsigned int size)
 
 unsigned long aio_rings_args_size(struct vm_area_list *vmas)
 {
-	return sizeof(struct parasite_check_aios_args) +
-		vmas->nr_aios * sizeof(struct parasite_aio);
+	return sizeof(struct parasite_check_aios_args) + vmas->nr_aios * sizeof(struct parasite_aio);
 }
 
 int parasite_collect_aios(struct parasite_ctl *ctl, struct vm_area_list *vmas)
@@ -111,8 +109,7 @@ int parasite_collect_aios(struct parasite_ctl *ctl, struct vm_area_list *vmas)
 		if (!vma_area_is(vma, VMA_AREA_AIORING))
 			continue;
 
-		pr_debug(" `- Ring #%ld @%"PRIx64"\n",
-				(long)(pa - &aa->ring[0]), vma->e->start);
+		pr_debug(" `- Ring #%ld @%" PRIx64 "\n", (long)(pa - &aa->ring[0]), vma->e->start);
 		pa->ctx = vma->e->start;
 		pa->size = vma->e->end - vma->e->start;
 		pa++;
diff --git a/criu/arch/aarch64/cpu.c b/criu/arch/aarch64/cpu.c
index 34313fb15..97a883b8c 100644
--- a/criu/arch/aarch64/cpu.c
+++ b/criu/arch/aarch64/cpu.c
@@ -1,4 +1,4 @@
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 #include <errno.h>
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 76bd1fea7..e87b8629a 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -21,7 +21,7 @@
 #include "restorer.h"
 #include "compel/infect.h"
 
-#define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))(src)->e
+#define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))(src)->e
 
 int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
 {
@@ -35,12 +35,10 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsi
 	assign_reg(core->ti_aarch64->gpregs, regs, pc);
 	assign_reg(core->ti_aarch64->gpregs, regs, pstate);
 
-
 	// Save the FP/SIMD state
-	for (i = 0; i < 32; ++i)
-	{
-		core->ti_aarch64->fpsimd->vregs[2*i]     = fpsimd->vregs[i];
-		core->ti_aarch64->fpsimd->vregs[2*i + 1] = fpsimd->vregs[i] >> 64;
+	for (i = 0; i < 32; ++i) {
+		core->ti_aarch64->fpsimd->vregs[2 * i] = fpsimd->vregs[i];
+		core->ti_aarch64->fpsimd->vregs[2 * i + 1] = fpsimd->vregs[i] >> 64;
 	}
 	assign_reg(core->ti_aarch64->fpsimd, fpsimd, fpsr);
 	assign_reg(core->ti_aarch64->fpsimd, fpsimd, fpcr);
@@ -65,7 +63,7 @@ int arch_alloc_thread_info(CoreEntry *core)
 		goto err;
 	user_aarch64_regs_entry__init(gpregs);
 
-	gpregs->regs = xmalloc(31*sizeof(uint64_t));
+	gpregs->regs = xmalloc(31 * sizeof(uint64_t));
 	if (!gpregs->regs)
 		goto err;
 	gpregs->n_regs = 31;
@@ -77,7 +75,7 @@ int arch_alloc_thread_info(CoreEntry *core)
 		goto err;
 	user_aarch64_fpsimd_context_entry__init(fpsimd);
 	ti_aarch64->fpsimd = fpsimd;
-	fpsimd->vregs = xmalloc(64*sizeof(fpsimd->vregs[0]));
+	fpsimd->vregs = xmalloc(64 * sizeof(fpsimd->vregs[0]));
 	fpsimd->n_vregs = 64;
 	if (!fpsimd->vregs)
 		goto err;
@@ -110,8 +108,8 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 		return 1;
 
 	for (i = 0; i < 32; ++i)
-		fpsimd->vregs[i] =	(__uint128_t)core->ti_aarch64->fpsimd->vregs[2*i] |
-					((__uint128_t)core->ti_aarch64->fpsimd->vregs[2*i + 1] << 64);
+		fpsimd->vregs[i] = (__uint128_t)core->ti_aarch64->fpsimd->vregs[2 * i] |
+				   ((__uint128_t)core->ti_aarch64->fpsimd->vregs[2 * i + 1] << 64);
 	assign_reg(fpsimd, core->ti_aarch64->fpsimd, fpsr);
 	assign_reg(fpsimd, core->ti_aarch64->fpsimd, fpcr);
 
@@ -123,7 +121,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 
 int restore_gpregs(struct rt_sigframe *f, UserRegsEntry *r)
 {
-#define CPREG1(d)       f->uc.uc_mcontext.d = r->d
+#define CPREG1(d) f->uc.uc_mcontext.d = r->d
 
 	int i;
 
diff --git a/criu/arch/aarch64/sigframe.c b/criu/arch/aarch64/sigframe.c
index be57c1670..8096fab66 100644
--- a/criu/arch/aarch64/sigframe.c
+++ b/criu/arch/aarch64/sigframe.c
@@ -2,8 +2,7 @@
 #include <compel/asm/infect-types.h>
 #include "asm/sigframe.h"
 
-int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
-			     struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
diff --git a/criu/arch/aarch64/vdso-pie.c b/criu/arch/aarch64/vdso-pie.c
index 53d83cbe7..8b9d97274 100644
--- a/criu/arch/aarch64/vdso-pie.c
+++ b/criu/arch/aarch64/vdso-pie.c
@@ -8,13 +8,12 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
-int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *to, struct vdso_symtable *from,
-			bool __always_unused compat_vdso)
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *to,
+			struct vdso_symtable *from, bool __always_unused compat_vdso)
 {
 	unsigned int i;
 
@@ -22,12 +21,10 @@ int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 		if (vdso_symbol_empty(&from->symbols[i]))
 			continue;
 
-		pr_debug("br: %lx/%lx -> %lx/%lx (index %d)\n",
-			 base_from, from->symbols[i].offset,
-			 base_to, to->symbols[i].offset, i);
+		pr_debug("br: %lx/%lx -> %lx/%lx (index %d)\n", base_from, from->symbols[i].offset, base_to,
+			 to->symbols[i].offset, i);
 
-		write_intraprocedure_branch(base_to + to->symbols[i].offset,
-					    base_from + from->symbols[i].offset);
+		write_intraprocedure_branch(base_to + to->symbols[i].offset, base_from + from->symbols[i].offset);
 	}
 
 	return 0;
diff --git a/criu/arch/arm/cpu.c b/criu/arch/arm/cpu.c
index 34313fb15..97a883b8c 100644
--- a/criu/arch/arm/cpu.c
+++ b/criu/arch/arm/cpu.c
@@ -1,4 +1,4 @@
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 #include <errno.h>
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 840d489a6..26b94e157 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -20,7 +20,7 @@
 #include "restorer.h"
 #include "compel/infect.h"
 
-#define assign_reg(dst, src, e)		dst->e = (__typeof__(dst->e))((src)->ARM_##e)
+#define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))((src)->ARM_##e)
 
 int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
@@ -47,7 +47,6 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpre
 	assign_reg(core->ti_arm->gpregs, regs, cpsr);
 	core->ti_arm->gpregs->orig_r0 = regs->ARM_ORIG_r0;
 
-
 	// Save the VFP state
 
 	memcpy(CORE_THREAD_ARCH_INFO(core)->fpstate->vfp_regs, &fpregs->fpregs, sizeof(fpregs->fpregs));
@@ -77,7 +76,7 @@ int arch_alloc_thread_info(CoreEntry *core)
 		goto err;
 	user_arm_vfpstate_entry__init(fpstate);
 	ti_arm->fpstate = fpstate;
-	fpstate->vfp_regs = xmalloc(32*sizeof(unsigned long long));
+	fpstate->vfp_regs = xmalloc(32 * sizeof(unsigned long long));
 	fpstate->n_vfp_regs = 32;
 	if (!fpstate->vfp_regs)
 		goto err;
@@ -113,8 +112,8 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 
 int restore_gpregs(struct rt_sigframe *f, UserArmRegsEntry *r)
 {
-#define CPREG1(d)       f->sig.uc.uc_mcontext.arm_##d = r->d
-#define CPREG2(d, s)    f->sig.uc.uc_mcontext.arm_##d = r->s
+#define CPREG1(d)    f->sig.uc.uc_mcontext.arm_##d = r->d
+#define CPREG2(d, s) f->sig.uc.uc_mcontext.arm_##d = r->s
 
 	CPREG1(r0);
 	CPREG1(r1);
diff --git a/criu/arch/arm/restorer.c b/criu/arch/arm/restorer.c
index 588c1c074..fd4b636b0 100644
--- a/criu/arch/arm/restorer.c
+++ b/criu/arch/arm/restorer.c
@@ -41,8 +41,7 @@ int restore_nonsigframe_gpregs(UserArmRegsEntry *r)
  * allocated with shmat(shmid, NULL, shmflg).
  */
 #define SHMLBA (4UL * PAGE_SIZE)
-unsigned long arch_shmat(int shmid, void *shmaddr,
-			int shmflg, unsigned long size)
+unsigned long arch_shmat(int shmid, void *shmaddr, int shmflg, unsigned long size)
 {
 	unsigned long smap;
 
@@ -65,8 +64,7 @@ unsigned long arch_shmat(int shmid, void *shmaddr,
 	pr_warn("Make sure that you don't migrate shmem from non-VIPT cached CPU to VIPT cached (e.g., ARMv7 -> ARMv6)\n");
 	pr_warn("Otherwise YOU HAVE A CHANCE OF DATA CORRUPTIONS in writeable shmem\n");
 
-	smap = sys_mremap(smap, size, size,
-			MREMAP_FIXED | MREMAP_MAYMOVE, (unsigned long)shmaddr);
+	smap = sys_mremap(smap, size, size, MREMAP_FIXED | MREMAP_MAYMOVE, (unsigned long)shmaddr);
 	if (IS_ERR_VALUE(smap))
 		pr_err("mremap() for shmem failed: %d\n", (int)smap);
 	return smap;
diff --git a/criu/arch/arm/sigframe.c b/criu/arch/arm/sigframe.c
index be57c1670..8096fab66 100644
--- a/criu/arch/arm/sigframe.c
+++ b/criu/arch/arm/sigframe.c
@@ -2,8 +2,7 @@
 #include <compel/asm/infect-types.h>
 #include "asm/sigframe.h"
 
-int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
-			     struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
diff --git a/criu/arch/arm/vdso-pie.c b/criu/arch/arm/vdso-pie.c
index 0ec8bd9a8..ecfe6a498 100644
--- a/criu/arch/arm/vdso-pie.c
+++ b/criu/arch/arm/vdso-pie.c
@@ -9,32 +9,31 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
 static void insert_trampoline(uintptr_t from, uintptr_t to)
 {
 	struct {
-		uint32_t	ldr_pc;
-		uint32_t	imm32;
-		uint32_t	guards;
+		uint32_t ldr_pc;
+		uint32_t imm32;
+		uint32_t guards;
 	} __packed jmp = {
-		.ldr_pc		= 0xe51ff004,		/* ldr	pc, [pc, #-4] */
-		.imm32		= to,
-		.guards		= 0xe1200070,		/* bkpt	0x0000 */
+		.ldr_pc = 0xe51ff004, /* ldr	pc, [pc, #-4] */
+		.imm32 = to,
+		.guards = 0xe1200070, /* bkpt	0x0000 */
 	};
-	void *iflush_start	= (void *)from;
-	void *iflush_end	= iflush_start + sizeof(jmp);
+	void *iflush_start = (void *)from;
+	void *iflush_end = iflush_start + sizeof(jmp);
 
 	memcpy((void *)from, &jmp, sizeof(jmp));
 
 	__builtin___clear_cache(iflush_start, iflush_end);
 }
 
-int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *sto, struct vdso_symtable *sfrom,
-			bool compat_vdso)
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *sto,
+			struct vdso_symtable *sfrom, bool compat_vdso)
 {
 	unsigned int i;
 
@@ -44,9 +43,8 @@ int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 		if (vdso_symbol_empty(&sfrom->symbols[i]))
 			continue;
 
-		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n",
-			 base_from, sfrom->symbols[i].offset,
-			 base_to, sto->symbols[i].offset, i);
+		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n", base_from, sfrom->symbols[i].offset, base_to,
+			 sto->symbols[i].offset, i);
 
 		from = base_from + sfrom->symbols[i].offset;
 		to = base_to + sto->symbols[i].offset;
diff --git a/criu/arch/mips/cpu.c b/criu/arch/mips/cpu.c
index f76afc2a2..55b385d09 100644
--- a/criu/arch/mips/cpu.c
+++ b/criu/arch/mips/cpu.c
@@ -20,7 +20,7 @@
 #include "protobuf.h"
 #include "images/cpuinfo.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 int cpu_init(void)
diff --git a/criu/arch/mips/crtools.c b/criu/arch/mips/crtools.c
index 72bd2c303..ed4da9b7e 100644
--- a/criu/arch/mips/crtools.c
+++ b/criu/arch/mips/crtools.c
@@ -27,7 +27,6 @@
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
 
-
 int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	CoreEntry *core = x;
@@ -203,7 +202,6 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 	return 0;
 }
 
-
 int restore_gpregs(struct rt_sigframe *f, UserMipsRegsEntry *r)
 {
 	f->rs_uc.uc_mcontext.sc_regs[0] = r->r0;
diff --git a/criu/arch/mips/restorer.c b/criu/arch/mips/restorer.c
index d840c8913..45a0f0a64 100644
--- a/criu/arch/mips/restorer.c
+++ b/criu/arch/mips/restorer.c
@@ -17,8 +17,7 @@ int restore_nonsigframe_gpregs(UserMipsRegsEntry *r)
 }
 
 #define SHMLBA 0x40000
-unsigned long arch_shmat(int shmid, void *shmaddr,
-			int shmflg, unsigned long size)
+unsigned long arch_shmat(int shmid, void *shmaddr, int shmflg, unsigned long size)
 {
 	unsigned long smap;
 
@@ -36,13 +35,12 @@ unsigned long arch_shmat(int shmid, void *shmaddr,
 	if (smap == (unsigned long)shmaddr)
 		return smap;
 
-	 /* Warn ALOUD */
+	/* Warn ALOUD */
 	pr_warn("Restoring shmem %p unaligned to SHMLBA.\n", shmaddr);
 	pr_warn("Make sure that you don't migrate shmem from non-VIPT cached CPU to VIPT cached \n");
 	pr_warn("Otherwise YOU HAVE A CHANCE OF DATA CORRUPTIONS in writeable shmem\n");
 
-	smap = sys_mremap(smap, size, size,
-			MREMAP_FIXED | MREMAP_MAYMOVE, (unsigned long)shmaddr);
+	smap = sys_mremap(smap, size, size, MREMAP_FIXED | MREMAP_MAYMOVE, (unsigned long)shmaddr);
 	if (IS_ERR_VALUE(smap))
 		pr_err("mremap() for shmem failed: %d\n", (int)smap);
 	return smap;
diff --git a/criu/arch/mips/sigaction_compat.c b/criu/arch/mips/sigaction_compat.c
index cd9c9559d..b389b7b73 100644
--- a/criu/arch/mips/sigaction_compat.c
+++ b/criu/arch/mips/sigaction_compat.c
@@ -5,7 +5,7 @@
 #include <compel/plugins/std/syscall-codes.h>
 
 #ifdef CR_NOGLIBC
-# include <compel/plugins/std/string.h>
+#include <compel/plugins/std/string.h>
 #endif
 
 #include "cpu.h"
@@ -16,4 +16,3 @@ int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
 {
 	return 0;
 }
-
diff --git a/criu/arch/mips/sigframe.c b/criu/arch/mips/sigframe.c
index 4950613dc..18983ff13 100644
--- a/criu/arch/mips/sigframe.c
+++ b/criu/arch/mips/sigframe.c
@@ -6,8 +6,7 @@
 
 #include "log.h"
 #include <stdio.h>
-int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
-		struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
diff --git a/criu/arch/mips/vdso-pie.c b/criu/arch/mips/vdso-pie.c
index 5fd15f3dc..3bb92d857 100644
--- a/criu/arch/mips/vdso-pie.c
+++ b/criu/arch/mips/vdso-pie.c
@@ -8,31 +8,30 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 static void insert_trampoline(uintptr_t from, uintptr_t to)
 {
 	struct {
-		uint32_t	ldr_pc;
-		uint32_t	imm32;
-		uint32_t	guards;
+		uint32_t ldr_pc;
+		uint32_t imm32;
+		uint32_t guards;
 	} __packed jmp = {
-		.ldr_pc		= 0x1000fffe,		/* b -4 */
-		.imm32		= to,
-		.guards		= 0x0000000d,		/* break */
+		.ldr_pc = 0x1000fffe, /* b -4 */
+		.imm32 = to,
+		.guards = 0x0000000d, /* break */
 	};
-	void *iflush_start	= (void *)from;
-	void *iflush_end	= iflush_start + sizeof(jmp);
+	void *iflush_start = (void *)from;
+	void *iflush_end = iflush_start + sizeof(jmp);
 
 	memcpy((void *)from, &jmp, sizeof(jmp));
 
 	sys_cacheflush(iflush_start, sizeof(jmp), 0);
 }
 
-int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *sto, struct vdso_symtable *sfrom,
-			bool compat_vdso)
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *sto,
+			struct vdso_symtable *sfrom, bool compat_vdso)
 {
 	unsigned int i;
 
@@ -42,9 +41,8 @@ int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 		if (vdso_symbol_empty(&sfrom->symbols[i]))
 			continue;
 
-		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n",
-			 base_from, sfrom->symbols[i].offset,
-			 base_to, sto->symbols[i].offset, i);
+		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n", base_from, sfrom->symbols[i].offset, base_to,
+			 sto->symbols[i].offset, i);
 
 		from = base_from + sfrom->symbols[i].offset;
 		to = base_to + sto->symbols[i].offset;
diff --git a/criu/arch/ppc64/cpu.c b/criu/arch/ppc64/cpu.c
index 4fcfb065a..bb5b7256e 100644
--- a/criu/arch/ppc64/cpu.c
+++ b/criu/arch/ppc64/cpu.c
@@ -1,4 +1,4 @@
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 #include <sys/auxv.h>
@@ -19,9 +19,9 @@
 static compel_cpuinfo_t rt_cpuinfo;
 
 #ifdef __LITTLE_ENDIAN__
-#define CURRENT_ENDIANNESS	CPUINFO_PPC64_ENTRY__ENDIANNESS__LITTLEENDIAN
+#define CURRENT_ENDIANNESS CPUINFO_PPC64_ENTRY__ENDIANNESS__LITTLEENDIAN
 #else
-#define CURRENT_ENDIANNESS	CPUINFO_PPC64_ENTRY__ENDIANESS__BIGENDIAN
+#define CURRENT_ENDIANNESS CPUINFO_PPC64_ENTRY__ENDIANESS__BIGENDIAN
 #endif
 
 int cpu_init(void)
@@ -83,21 +83,23 @@ int cpu_validate_cpuinfo(void)
 		goto error;
 	}
 
-#define CHECK_FEATURE(s,f) do {						\
-		if ((cpu_ppc64_entry->hwcap[s] & f) &&			\
-		    !(rt_cpuinfo.hwcap[s] & f)) {			\
-			pr_err("CPU Feature %s required by image "	\
-			       "is not supported on host.\n", #f);	\
-			goto error;					\
-		}							\
-	} while(0)
+#define CHECK_FEATURE(s, f)                                                          \
+	do {                                                                         \
+		if ((cpu_ppc64_entry->hwcap[s] & f) && !(rt_cpuinfo.hwcap[s] & f)) { \
+			pr_err("CPU Feature %s required by image "                   \
+			       "is not supported on host.\n",                        \
+			       #f);                                                  \
+			goto error;                                                  \
+		}                                                                    \
+	} while (0)
 
-#define REQUIRE_FEATURE(s,f) do {					\
-		if (!(cpu_ppc64_entry->hwcap[s] & f)) {			\
+#define REQUIRE_FEATURE(s, f)                                             \
+	do {                                                              \
+		if (!(cpu_ppc64_entry->hwcap[s] & f)) {                   \
 			pr_err("CPU Feature %s missing in image.\n", #f); \
-			goto error;					\
-		}							\
-	} while(0)
+			goto error;                                       \
+		}                                                         \
+	} while (0)
 
 	REQUIRE_FEATURE(0, PPC_FEATURE_64);
 	REQUIRE_FEATURE(0, PPC_FEATURE_HAS_FPU);
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index 631150c3e..a08a2ca5b 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -53,7 +53,7 @@ static void put_fpu_regs(mcontext_t *mc, UserPpc64FpstateEntry *fpe)
 	size_t i;
 
 	for (i = 0; i < fpe->n_fpregs; i++)
-		mcfp[i] =  fpe->fpregs[i];
+		mcfp[i] = fpe->fpregs[i];
 }
 
 static UserPpc64VrstateEntry *copy_altivec_regs(__vector128 *vrregs)
@@ -69,7 +69,7 @@ static UserPpc64VrstateEntry *copy_altivec_regs(__vector128 *vrregs)
 	user_ppc64_vrstate_entry__init(vse);
 
 	/* protocol buffer store only 64bit entries and we need 128bit */
-	vse->n_vrregs = (NVRREG-1) * 2;
+	vse->n_vrregs = (NVRREG - 1) * 2;
 	vse->vrregs = xmalloc(vse->n_vrregs * sizeof(vse->vrregs[0]));
 	if (!vse->vrregs) {
 		xfree(vse);
@@ -77,13 +77,13 @@ static UserPpc64VrstateEntry *copy_altivec_regs(__vector128 *vrregs)
 	}
 
 	/* Vectors are 2*64bits entries */
-	for (i = 0; i < (NVRREG-1); i++) {
-		p64 = (uint64_t*) &vrregs[i];
-		vse->vrregs[i*2] =  p64[0];
-		vse->vrregs[i*2 + 1] = p64[1];
+	for (i = 0; i < (NVRREG - 1); i++) {
+		p64 = (uint64_t *)&vrregs[i];
+		vse->vrregs[i * 2] = p64[0];
+		vse->vrregs[i * 2 + 1] = p64[1];
 	}
 
-	p32 = (uint32_t*) &vrregs[NVRREG-1];
+	p32 = (uint32_t *)&vrregs[NVRREG - 1];
 	vse->vrsave = *p32;
 
 	return vse;
@@ -95,7 +95,7 @@ static int put_altivec_regs(mcontext_t *mc, UserPpc64VrstateEntry *vse)
 
 	pr_debug("Restoring Altivec registers\n");
 
-	if (vse->n_vrregs != (NVRREG-1)*2) {
+	if (vse->n_vrregs != (NVRREG - 1) * 2) {
 		pr_err("Corrupted Altivec dump data\n");
 		return -1;
 	}
@@ -103,8 +103,7 @@ static int put_altivec_regs(mcontext_t *mc, UserPpc64VrstateEntry *vse)
 	/* Note that this should only be done in the case MSR_VEC is set but
 	 * this is not a big deal to do that in all cases.
 	 */
-	memcpy(&v_regs->vrregs[0][0], vse->vrregs,
-	       sizeof(uint64_t) * 2 * (NVRREG-1));
+	memcpy(&v_regs->vrregs[0][0], vse->vrregs, sizeof(uint64_t) * 2 * (NVRREG - 1));
 	/* vscr has been restored with the previous memcpy which copied 32
 	 * 128bits registers + a 128bits field containing the vscr value in
 	 * the low part.
@@ -116,7 +115,7 @@ static int put_altivec_regs(mcontext_t *mc, UserPpc64VrstateEntry *vse)
 	return 0;
 }
 
-static UserPpc64VsxstateEntry* copy_vsx_regs(uint64_t *vsregs)
+static UserPpc64VsxstateEntry *copy_vsx_regs(uint64_t *vsregs)
 {
 	UserPpc64VsxstateEntry *vse;
 	int i;
@@ -128,7 +127,7 @@ static UserPpc64VsxstateEntry* copy_vsx_regs(uint64_t *vsregs)
 	user_ppc64_vsxstate_entry__init(vse);
 	vse->n_vsxregs = NVSXREG;
 
-	vse->vsxregs = xmalloc(vse->n_vsxregs*sizeof(vse->vsxregs[0]));
+	vse->vsxregs = xmalloc(vse->n_vsxregs * sizeof(vse->vsxregs[0]));
 	if (!vse->vsxregs) {
 		xfree(vse);
 		return NULL;
@@ -153,25 +152,25 @@ static int put_vsx_regs(mcontext_t *mc, UserPpc64VsxstateEntry *vse)
 	}
 
 	/* point after the Altivec registers */
-	buf = (uint64_t*) (mc->v_regs + 1);
+	buf = (uint64_t *)(mc->v_regs + 1);
 
 	/* Copy the value saved by get_vsx_regs in the sigframe */
-	for (i=0; i < vse->n_vsxregs; i++)
+	for (i = 0; i < vse->n_vsxregs; i++)
 		buf[i] = vse->vsxregs[i];
 
 	return 0;
 }
 
-
 static void copy_gp_regs(UserPpc64RegsEntry *dst, user_regs_struct_t *src)
 {
 	int i;
 
-#define assign_reg(e) do {			\
-	dst->e = (__typeof__(dst->e))src->e;	\
-} while (0)
+#define assign_reg(e)                                \
+	do {                                         \
+		dst->e = (__typeof__(dst->e))src->e; \
+	} while (0)
 
-	for (i=0; i<32; i++)
+	for (i = 0; i < 32; i++)
 		assign_reg(gpr[i]);
 	assign_reg(nip);
 	assign_reg(msr);
@@ -189,17 +188,17 @@ static void restore_gp_regs(mcontext_t *dst, UserPpc64RegsEntry *src)
 	int i;
 
 	/* r0 to r31 */
-	for (i=0; i<32; i++)
-		dst->gp_regs[i] 	= src->gpr[i];
+	for (i = 0; i < 32; i++)
+		dst->gp_regs[i] = src->gpr[i];
 
-	dst->gp_regs[PT_NIP] 		= src->nip;
-	dst->gp_regs[PT_MSR] 		= src->msr;
-	dst->gp_regs[PT_ORIG_R3]	= src->orig_gpr3;
-	dst->gp_regs[PT_CTR] 		= src->ctr;
-	dst->gp_regs[PT_LNK] 		= src->link;
-	dst->gp_regs[PT_XER] 		= src->xer;
-	dst->gp_regs[PT_CCR] 		= src->ccr;
-	dst->gp_regs[PT_TRAP] 		= src->trap;
+	dst->gp_regs[PT_NIP] = src->nip;
+	dst->gp_regs[PT_MSR] = src->msr;
+	dst->gp_regs[PT_ORIG_R3] = src->orig_gpr3;
+	dst->gp_regs[PT_CTR] = src->ctr;
+	dst->gp_regs[PT_LNK] = src->link;
+	dst->gp_regs[PT_XER] = src->xer;
+	dst->gp_regs[PT_CCR] = src->ccr;
+	dst->gp_regs[PT_TRAP] = src->trap;
 }
 
 static UserPpc64RegsEntry *allocate_gp_regs(void)
@@ -250,7 +249,7 @@ static void xfree_tm_state(UserPpc64TmRegsEntry *tme)
 
 static int put_tm_regs(struct rt_sigframe *f, UserPpc64TmRegsEntry *tme)
 {
-/*
+	/*
  * WARNING: As stated in kernel's restore_tm_sigcontexts, TEXASR has to be
  * restored by the process itself :
  *   TEXASR was set by the signal delivery reclaim, as was TFIAR.
@@ -261,20 +260,17 @@ static int put_tm_regs(struct rt_sigframe *f, UserPpc64TmRegsEntry *tme)
  */
 	ucontext_t *tm_uc = &f->uc_transact;
 
-	pr_debug("Restoring TM registers FP:%d VR:%d VSX:%d\n",
-		 !!(tme->fpstate), !!(tme->vrstate), !!(tme->vsxstate));
+	pr_debug("Restoring TM registers FP:%d VR:%d VSX:%d\n", !!(tme->fpstate), !!(tme->vrstate), !!(tme->vsxstate));
 
 	restore_gp_regs(&tm_uc->uc_mcontext, tme->gpregs);
 
 	if (tme->fpstate)
 		put_fpu_regs(&tm_uc->uc_mcontext, tme->fpstate);
 
-	if (tme->vrstate && put_altivec_regs(&tm_uc->uc_mcontext,
-					     tme->vrstate))
+	if (tme->vrstate && put_altivec_regs(&tm_uc->uc_mcontext, tme->vrstate))
 		return -1;
 
-	if (tme->vsxstate && put_vsx_regs(&tm_uc->uc_mcontext,
-					  tme->vsxstate))
+	if (tme->vsxstate && put_vsx_regs(&tm_uc->uc_mcontext, tme->vsxstate))
 		return -1;
 
 	f->uc.uc_link = tm_uc;
@@ -282,8 +278,7 @@ static int put_tm_regs(struct rt_sigframe *f, UserPpc64TmRegsEntry *tme)
 }
 
 /****************************************************************************/
-static int copy_tm_regs(user_regs_struct_t *regs, user_fpregs_struct_t *fpregs,
-			CoreEntry *core)
+static int copy_tm_regs(user_regs_struct_t *regs, user_fpregs_struct_t *fpregs, CoreEntry *core)
 {
 	UserPpc64TmRegsEntry *tme;
 	UserPpc64RegsEntry *gpregs = core->ti_ppc64->gpregs;
@@ -299,13 +294,12 @@ static int copy_tm_regs(user_regs_struct_t *regs, user_fpregs_struct_t *fpregs,
 	if (!tme->gpregs)
 		goto out_free;
 
-	gpregs->has_tfhar	= true;
-	gpregs->tfhar		= fpregs->tm.tm_spr_regs.tfhar;
-	gpregs->has_texasr	= true;
-	gpregs->texasr		= fpregs->tm.tm_spr_regs.texasr;
-	gpregs->has_tfiar	= true;
-	gpregs->tfiar		= fpregs->tm.tm_spr_regs.tfiar;
-
+	gpregs->has_tfhar = true;
+	gpregs->tfhar = fpregs->tm.tm_spr_regs.tfhar;
+	gpregs->has_texasr = true;
+	gpregs->texasr = fpregs->tm.tm_spr_regs.texasr;
+	gpregs->has_tfiar = true;
+	gpregs->tfiar = fpregs->tm.tm_spr_regs.tfiar;
 
 	/* This is the checkpointed state, we must save it in place of the
 	 * current state because the signal handler is made in this way.
@@ -352,9 +346,7 @@ out_free:
 	return -1;
 }
 
-static int __copy_task_regs(user_regs_struct_t *regs,
-			    user_fpregs_struct_t *fpregs,
-			    CoreEntry *core)
+static int __copy_task_regs(user_regs_struct_t *regs, user_fpregs_struct_t *fpregs, CoreEntry *core)
 {
 	UserPpc64RegsEntry *gpregs;
 	UserPpc64FpstateEntry **fpstate;
@@ -423,7 +415,7 @@ int arch_alloc_thread_info(CoreEntry *core)
 	ThreadInfoPpc64 *ti_ppc64;
 
 	ti_ppc64 = xmalloc(sizeof(*ti_ppc64));
-	if(!ti_ppc64)
+	if (!ti_ppc64)
 		return -1;
 
 	thread_info_ppc64__init(ti_ppc64);
@@ -466,28 +458,24 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 	int ret = 0;
 
 	if (CORE_THREAD_ARCH_INFO(core)->fpstate)
-		put_fpu_regs(&sigframe->uc.uc_mcontext,
-			     CORE_THREAD_ARCH_INFO(core)->fpstate);
+		put_fpu_regs(&sigframe->uc.uc_mcontext, CORE_THREAD_ARCH_INFO(core)->fpstate);
 
 	if (CORE_THREAD_ARCH_INFO(core)->vrstate)
-		ret = put_altivec_regs(&sigframe->uc.uc_mcontext,
-				       CORE_THREAD_ARCH_INFO(core)->vrstate);
+		ret = put_altivec_regs(&sigframe->uc.uc_mcontext, CORE_THREAD_ARCH_INFO(core)->vrstate);
 	else if (core->ti_ppc64->gpregs->msr & MSR_VEC) {
 		pr_err("Register's data mismatch, corrupted image ?\n");
 		ret = -1;
 	}
 
 	if (!ret && CORE_THREAD_ARCH_INFO(core)->vsxstate)
-		ret = put_vsx_regs(&sigframe->uc.uc_mcontext,
-				   CORE_THREAD_ARCH_INFO(core)->vsxstate);
+		ret = put_vsx_regs(&sigframe->uc.uc_mcontext, CORE_THREAD_ARCH_INFO(core)->vsxstate);
 	else if (core->ti_ppc64->gpregs->msr & MSR_VSX) {
 		pr_err("VSX register's data mismatch, corrupted image ?\n");
 		ret = -1;
 	}
 
 	if (!ret && CORE_THREAD_ARCH_INFO(core)->tmstate)
-		ret = put_tm_regs(sigframe,
-				  CORE_THREAD_ARCH_INFO(core)->tmstate);
+		ret = put_tm_regs(sigframe, CORE_THREAD_ARCH_INFO(core)->tmstate);
 	else if (MSR_TM_ACTIVE(core->ti_ppc64->gpregs->msr)) {
 		pr_err("TM register's data mismatch, corrupted image ?\n");
 		ret = -1;
diff --git a/criu/arch/ppc64/restorer.c b/criu/arch/ppc64/restorer.c
index 7172e44c3..c17ba1669 100644
--- a/criu/arch/ppc64/restorer.c
+++ b/criu/arch/ppc64/restorer.c
@@ -9,35 +9,32 @@
 
 int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r)
 {
-#define SPRN_TFHAR	128
-#define SPRN_TFIAR	129
-#define SPRN_TEXASR	130
+#define SPRN_TFHAR  128
+#define SPRN_TFIAR  129
+#define SPRN_TEXASR 130
 
 	if (r->has_tfhar) {
-		asm __volatile__ (
-			"ld	3, %[value]	;"
-			"mtspr	%[sprn],3	;"
-			: [value]"=m"(r->tfhar)
-			: [sprn]"i"(SPRN_TFHAR)
-			: "r3");
+		asm __volatile__("ld	3, %[value]	;"
+				 "mtspr	%[sprn],3	;"
+				 : [value] "=m"(r->tfhar)
+				 : [sprn] "i"(SPRN_TFHAR)
+				 : "r3");
 	}
 
 	if (r->has_tfiar) {
-		asm __volatile__ (
-			"ld	3, %[value]	;"
-			"mtspr	%[sprn],3	;"
-			: [value]"=m"(r->tfiar)
-			: [sprn]"i"(SPRN_TFIAR)
-			: "r3");
+		asm __volatile__("ld	3, %[value]	;"
+				 "mtspr	%[sprn],3	;"
+				 : [value] "=m"(r->tfiar)
+				 : [sprn] "i"(SPRN_TFIAR)
+				 : "r3");
 	}
 
 	if (r->has_texasr) {
-		asm __volatile__ (
-			"ld	3, %[value]	;"
-			"mtspr	%[sprn],3	;"
-			: [value]"=m"(r->texasr)
-			: [sprn]"i"(SPRN_TEXASR)
-			: "r3");
+		asm __volatile__("ld	3, %[value]	;"
+				 "mtspr	%[sprn],3	;"
+				 : [value] "=m"(r->texasr)
+				 : [sprn] "i"(SPRN_TEXASR)
+				 : "r3");
 	}
 
 	return 0;
@@ -48,15 +45,14 @@ unsigned long sys_shmat(int shmid, const void *shmaddr, int shmflg)
 	unsigned long raddr;
 	int ret;
 
-	ret = sys_ipc(21 /*SHMAT */,
-		      shmid,		 	/* first 		*/
-		      shmflg,		 	/* second 		*/
-		      (unsigned long)&raddr,	/* third 		*/
-		      shmaddr,			/* ptr			*/
-		      0 			/* fifth not used 	*/);
+	ret = sys_ipc(21 /*SHMAT */, shmid, /* first 		*/
+		      shmflg, /* second 		*/
+		      (unsigned long)&raddr, /* third 		*/
+		      shmaddr, /* ptr			*/
+		      0 /* fifth not used 	*/);
 
 	if (ret)
-		raddr = (unsigned long) ret;
+		raddr = (unsigned long)ret;
 
 	return raddr;
 }
diff --git a/criu/arch/ppc64/sigframe.c b/criu/arch/ppc64/sigframe.c
index 52fad2e9a..5a98eb8b9 100644
--- a/criu/arch/ppc64/sigframe.c
+++ b/criu/arch/ppc64/sigframe.c
@@ -18,14 +18,12 @@ static inline void update_vregs(mcontext_t *lcontext, mcontext_t *rcontext)
 		uint64_t offset = (uint64_t)(lcontext->v_regs) - (uint64_t)lcontext;
 		lcontext->v_regs = (vrregset_t *)((uint64_t)rcontext + offset);
 
-		pr_debug("Updated v_regs:%llx (rcontext:%llx)\n",
-			 (unsigned long long) lcontext->v_regs,
-			 (unsigned long long) rcontext);
+		pr_debug("Updated v_regs:%llx (rcontext:%llx)\n", (unsigned long long)lcontext->v_regs,
+			 (unsigned long long)rcontext);
 	}
 }
 
-int sigreturn_prep_fpu_frame(struct rt_sigframe *frame,
-			     struct rt_sigframe *rframe)
+int sigreturn_prep_fpu_frame(struct rt_sigframe *frame, struct rt_sigframe *rframe)
 {
 	uint64_t msr = frame->uc.uc_mcontext.gp_regs[PT_MSR];
 
@@ -39,9 +37,8 @@ int sigreturn_prep_fpu_frame(struct rt_sigframe *frame,
 
 	/* Updating the transactional state address if any */
 	if (frame->uc.uc_link) {
-		update_vregs(&frame->uc_transact.uc_mcontext,
-			     &rframe->uc_transact.uc_mcontext);
-		frame->uc.uc_link =  &rframe->uc_transact;
+		update_vregs(&frame->uc_transact.uc_mcontext, &rframe->uc_transact.uc_mcontext);
+		frame->uc.uc_link = &rframe->uc_transact;
 	}
 
 	return 0;
diff --git a/criu/arch/ppc64/vdso-pie.c b/criu/arch/ppc64/vdso-pie.c
index 910c3d38b..f01123efe 100644
--- a/criu/arch/ppc64/vdso-pie.c
+++ b/criu/arch/ppc64/vdso-pie.c
@@ -9,7 +9,7 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
@@ -18,15 +18,15 @@ extern char *vdso_trampoline, *vdso_trampoline_end;
 
 static inline void invalidate_caches(unsigned long at)
 {
-    asm volatile("isync		\n"	\
-		 "li 	3,0	\n" 	\
-		 "dcbf	3,%0	\n"	\
-		 "sync		\n"	\
-		 "icbi 	3,%0	\n" 	\
-		 "isync		\n" 	\
-		 : /* no output */	\
-		 : "r"(at)		\
-		 :"memory", "r3");
+	asm volatile("isync		\n"
+		     "li 	3,0	\n"
+		     "dcbf	3,%0	\n"
+		     "sync		\n"
+		     "icbi 	3,%0	\n"
+		     "isync		\n"
+		     : /* no output */
+		     : "r"(at)
+		     : "memory", "r3");
 }
 
 /* This is the size of the trampoline call :
@@ -34,7 +34,7 @@ static inline void invalidate_caches(unsigned long at)
  *	bl	trampoline
  *	<64 bit address>
  */
-#define TRAMP_CALL_SIZE	(2*sizeof(uint32_t) + sizeof(uint64_t))
+#define TRAMP_CALL_SIZE (2 * sizeof(uint32_t) + sizeof(uint64_t))
 
 /*
  * put_trampoline does 2 things :
@@ -53,39 +53,35 @@ static inline void invalidate_caches(unsigned long at)
  */
 static unsigned long put_trampoline(unsigned long at, struct vdso_symtable *sym)
 {
-	int i,j;
+	int i, j;
 	unsigned long size;
 	unsigned long trampoline = 0;
 
 	/* First of all we have to find a place where to put the trampoline
 	 * code.
 	 */
-	size = (unsigned long)&vdso_trampoline_end
-		- (unsigned long)&vdso_trampoline;
+	size = (unsigned long)&vdso_trampoline_end - (unsigned long)&vdso_trampoline;
 
 	for (i = 0; i < ARRAY_SIZE(sym->symbols); i++) {
 		if (vdso_symbol_empty(&sym->symbols[i]))
 			continue;
 
-		pr_debug("Checking '%s' at %lx\n", sym->symbols[i].name,
-			 sym->symbols[i].offset);
+		pr_debug("Checking '%s' at %lx\n", sym->symbols[i].name, sym->symbols[i].offset);
 
 		/* find the nearest following symbol we are interested in */
-		for (j=0; j < ARRAY_SIZE(sym->symbols); j++) {
-			if (i==j || vdso_symbol_empty(&sym->symbols[j]))
+		for (j = 0; j < ARRAY_SIZE(sym->symbols); j++) {
+			if (i == j || vdso_symbol_empty(&sym->symbols[j]))
 				continue;
 
 			if (sym->symbols[j].offset <= sym->symbols[i].offset)
 				/* this symbol is above the current one */
 				continue;
 
-			if ((sym->symbols[i].offset+TRAMP_CALL_SIZE) >
-			    sym->symbols[j].offset) {
+			if ((sym->symbols[i].offset + TRAMP_CALL_SIZE) > sym->symbols[j].offset) {
 				/* we have a major issue here since we cannot
 				 * even put the trampoline call for this symbol
 				 */
-				pr_err("Can't handle small vDSO symbol %s\n",
-				       sym->symbols[i].name);
+				pr_err("Can't handle small vDSO symbol %s\n", sym->symbols[i].name);
 				return 0;
 			}
 
@@ -93,8 +89,7 @@ static unsigned long put_trampoline(unsigned long at, struct vdso_symtable *sym)
 				/* no need to put it twice */
 				continue;
 
-			if ((sym->symbols[j].offset -
-			     (sym->symbols[i].offset+TRAMP_CALL_SIZE)) <= size)
+			if ((sym->symbols[j].offset - (sym->symbols[i].offset + TRAMP_CALL_SIZE)) <= size)
 				/* not enough place */
 				continue;
 
@@ -102,10 +97,8 @@ static unsigned long put_trampoline(unsigned long at, struct vdso_symtable *sym)
 			trampoline = at + sym->symbols[i].offset;
 			trampoline += TRAMP_CALL_SIZE;
 
-			pr_debug("Putting vDSO trampoline in %s at %lx\n",
-				 sym->symbols[i].name, trampoline);
-			memcpy((void *)trampoline, &vdso_trampoline,
-				       size);
+			pr_debug("Putting vDSO trampoline in %s at %lx\n", sym->symbols[i].name, trampoline);
+			memcpy((void *)trampoline, &vdso_trampoline, size);
 			invalidate_caches(trampoline);
 		}
 	}
@@ -113,21 +106,19 @@ static unsigned long put_trampoline(unsigned long at, struct vdso_symtable *sym)
 	return trampoline;
 }
 
-static inline void put_trampoline_call(unsigned long at, unsigned long to,
-				       unsigned long tr)
+static inline void put_trampoline_call(unsigned long at, unsigned long to, unsigned long tr)
 {
-    uint32_t *addr = (uint32_t *)at;
+	uint32_t *addr = (uint32_t *)at;
 
-    *addr++ = 0x7C0802a6;					/* mflr	r0 */
-    *addr++ = 0x48000001 | ((long)(tr-at-4) & 0x3fffffc);	/* bl tr */
-    *(uint64_t *)addr = to;	/* the address to read by the trampoline */
+	*addr++ = 0x7C0802a6; /* mflr	r0 */
+	*addr++ = 0x48000001 | ((long)(tr - at - 4) & 0x3fffffc); /* bl tr */
+	*(uint64_t *)addr = to; /* the address to read by the trampoline */
 
-    invalidate_caches(at);
+	invalidate_caches(at);
 }
 
-int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *to, struct vdso_symtable *from,
-			bool __always_unused compat_vdso)
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *to,
+			struct vdso_symtable *from, bool __always_unused compat_vdso)
 {
 	unsigned int i;
 	unsigned long trampoline;
@@ -140,14 +131,10 @@ int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 		if (vdso_symbol_empty(&from->symbols[i]))
 			continue;
 
-		pr_debug("br: %lx/%lx -> %lx/%lx (index %d) '%s'\n",
-			 base_from, from->symbols[i].offset,
-			 base_to, to->symbols[i].offset, i,
-			 from->symbols[i].name);
+		pr_debug("br: %lx/%lx -> %lx/%lx (index %d) '%s'\n", base_from, from->symbols[i].offset, base_to,
+			 to->symbols[i].offset, i, from->symbols[i].name);
 
-		put_trampoline_call(base_from + from->symbols[i].offset,
-				    base_to + to->symbols[i].offset,
-				    trampoline);
+		put_trampoline_call(base_from + from->symbols[i].offset, base_to + to->symbols[i].offset, trampoline);
 	}
 
 	return 0;
diff --git a/criu/arch/s390/cpu.c b/criu/arch/s390/cpu.c
index f93666ed6..3f430f455 100644
--- a/criu/arch/s390/cpu.c
+++ b/criu/arch/s390/cpu.c
@@ -1,4 +1,4 @@
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 #include <sys/auxv.h>
@@ -18,22 +18,11 @@
 static compel_cpuinfo_t rt_cpuinfo;
 
 static const char *hwcap_str1[64] = {
-	"HWCAP_S390_ESAN3",
-	"HWCAP_S390_ZARCH",
-	"HWCAP_S390_STFLE",
-	"HWCAP_S390_MSA",
-	"HWCAP_S390_LDISP",
-	"HWCAP_S390_EIMM",
-	"HWCAP_S390_DFP",
-	"HWCAP_S390_HPAGE",
-	"HWCAP_S390_ETF3EH",
-	"HWCAP_S390_HIGH_GPRS",
-	"HWCAP_S390_TE",
-	"HWCAP_S390_VXRS",
-	"HWCAP_S390_VXRS_BCD",
-	"HWCAP_S390_VXRS_EXT",
+	"HWCAP_S390_ESAN3", "HWCAP_S390_ZARCH", "HWCAP_S390_STFLE",    "HWCAP_S390_MSA",      "HWCAP_S390_LDISP",
+	"HWCAP_S390_EIMM",  "HWCAP_S390_DFP",	"HWCAP_S390_HPAGE",    "HWCAP_S390_ETF3EH",   "HWCAP_S390_HIGH_GPRS",
+	"HWCAP_S390_TE",    "HWCAP_S390_VXRS",	"HWCAP_S390_VXRS_BCD", "HWCAP_S390_VXRS_EXT",
 };
-static const char *hwcap_str2[64] = { };
+static const char *hwcap_str2[64] = {};
 
 static const char **hwcap_str[2] = { hwcap_str1, hwcap_str2 };
 
@@ -73,7 +62,7 @@ int cpu_dump_cpuinfo(void)
 
 	img = open_image(CR_FD_CPUINFO, O_DUMP);
 	if (!img)
-	return -1;
+		return -1;
 
 	cpu_info.s390_entry = &cpu_s390_info_ptr;
 	cpu_info.n_s390_entry = 1;
@@ -124,11 +113,9 @@ int cpu_validate_cpuinfo(void)
 			if (rt_cpuinfo.hwcap[nr] & (1 << cap))
 				continue;
 			if (hwcap_str[nr][cap])
-				pr_err("CPU Feature %s not supported on host\n",
-				       hwcap_str[nr][cap]);
+				pr_err("CPU Feature %s not supported on host\n", hwcap_str[nr][cap]);
 			else
-				pr_err("CPU Feature %d/%x not supported on host\n",
-				       nr, 1 << cap);
+				pr_err("CPU Feature %d/%x not supported on host\n", nr, 1 << cap);
 			ret = -1;
 		}
 	}
diff --git a/criu/arch/s390/crtools.c b/criu/arch/s390/crtools.c
index 000b7779f..b22b64e2b 100644
--- a/criu/arch/s390/crtools.c
+++ b/criu/arch/s390/crtools.c
@@ -26,12 +26,12 @@
 #include "pstree.h"
 #include "image.h"
 
-#define NT_PRFPREG		2
-#define NT_S390_VXRS_LOW	0x309
-#define NT_S390_VXRS_HIGH	0x30a
-#define NT_S390_GS_CB		0x30b
-#define NT_S390_GS_BC		0x30c
-#define NT_S390_RI_CB		0x30d
+#define NT_PRFPREG	  2
+#define NT_S390_VXRS_LOW  0x309
+#define NT_S390_VXRS_HIGH 0x30a
+#define NT_S390_GS_CB	  0x30b
+#define NT_S390_GS_BC	  0x30c
+#define NT_S390_RI_CB	  0x30d
 
 /*
  * Print general purpose and access registers
@@ -41,8 +41,7 @@ static void print_core_gpregs(const char *msg, UserS390RegsEntry *gpregs)
 	int i;
 
 	pr_debug("%s: General purpose registers\n", msg);
-	pr_debug("       psw %016lx %016lx\n",
-		 gpregs->psw_mask, gpregs->psw_addr);
+	pr_debug("       psw %016lx %016lx\n", gpregs->psw_mask, gpregs->psw_addr);
 	pr_debug(" orig_gpr2 %016lx\n", gpregs->orig_gpr2);
 	for (i = 0; i < 16; i++)
 		pr_debug("       g%02d %016lx\n", i, gpregs->gprs[i]);
@@ -69,8 +68,7 @@ static void print_core_vx_regs(CoreEntry *core)
 	for (i = 0; i < 16; i++)
 		pr_debug("  vx_low%02d %016lx\n", i, vxrs_low->regs[i]);
 	for (i = 0; i < 32; i += 2)
-		pr_debug(" vx_high%02d %016lx %016lx\n", i / 2,
-			 vxrs_high->regs[i], vxrs_high->regs[i + 1]);
+		pr_debug(" vx_high%02d %016lx %016lx\n", i / 2, vxrs_high->regs[i], vxrs_high->regs[i + 1]);
 }
 
 /*
@@ -395,10 +393,8 @@ int restore_fpu(struct rt_sigframe *f, CoreEntry *core)
 	dst->fpregs.fpc = fpregs->fpc;
 	memcpy(dst->fpregs.fprs, fpregs->fprs, sizeof(dst->fpregs.fprs));
 	if (vxrs_low) {
-		memcpy(&dst_ext->vxrs_low, vxrs_low->regs,
-		       sizeof(dst_ext->vxrs_low));
-		memcpy(&dst_ext->vxrs_high, vxrs_high->regs,
-		       sizeof(dst_ext->vxrs_high));
+		memcpy(&dst_ext->vxrs_low, vxrs_low->regs, sizeof(dst_ext->vxrs_low));
+		memcpy(&dst_ext->vxrs_high, vxrs_high->regs, sizeof(dst_ext->vxrs_high));
 	}
 	return 0;
 }
@@ -697,10 +693,8 @@ static int set_task_regs(pid_t pid, CoreEntry *core)
 		if (!cvxrs_high)
 			return -1;
 		fpregs.flags |= USER_FPREGS_VXRS;
-		memcpy(&fpregs.vxrs_low, cvxrs_low->regs,
-				sizeof(fpregs.vxrs_low));
-		memcpy(&fpregs.vxrs_high, cvxrs_high->regs,
-				sizeof(fpregs.vxrs_high));
+		memcpy(&fpregs.vxrs_low, cvxrs_low->regs, sizeof(fpregs.vxrs_low));
+		memcpy(&fpregs.vxrs_high, cvxrs_high->regs, sizeof(fpregs.vxrs_high));
 		if (set_vx_regs(pid, &fpregs) < 0)
 			return -1;
 	}
@@ -720,19 +714,15 @@ int arch_set_thread_regs(struct pstree_item *item, bool with_threads)
 	int i;
 
 	for_each_pstree_item(item) {
-		if (item->pid->state == TASK_DEAD ||
-		    item->pid->state == TASK_ZOMBIE)
+		if (item->pid->state == TASK_DEAD || item->pid->state == TASK_ZOMBIE)
 			continue;
 		for (i = 0; i < item->nr_threads; i++) {
-			if (item->threads[i].state == TASK_DEAD ||
-			    item->threads[i].state == TASK_ZOMBIE)
+			if (item->threads[i].state == TASK_DEAD || item->threads[i].state == TASK_ZOMBIE)
 				continue;
 			if (!with_threads && i > 0)
 				continue;
-			if (set_task_regs(item->threads[i].real,
-					  item->core[i])) {
-				pr_perror("Not set registers for task %d",
-					  item->threads[i].real);
+			if (set_task_regs(item->threads[i].real, item->core[i])) {
+				pr_perror("Not set registers for task %d", item->threads[i].real);
 				return -1;
 			}
 		}
diff --git a/criu/arch/s390/restorer.c b/criu/arch/s390/restorer.c
index 3823fda98..6907ad75b 100644
--- a/criu/arch/s390/restorer.c
+++ b/criu/arch/s390/restorer.c
@@ -23,15 +23,14 @@ unsigned long sys_shmat(int shmid, const void *shmaddr, int shmflg)
 	unsigned long raddr;
 	int ret;
 
-	ret = sys_ipc(21 /*SHMAT */,
-		      shmid,			/* first		*/
-		      shmflg,			/* second		*/
-		      (unsigned long)&raddr,	/* third		*/
-		      shmaddr,			/* ptr			*/
-		      0				/* fifth not used	*/);
+	ret = sys_ipc(21 /*SHMAT */, shmid, /* first		*/
+		      shmflg, /* second		*/
+		      (unsigned long)&raddr, /* third		*/
+		      shmaddr, /* ptr			*/
+		      0 /* fifth not used	*/);
 
 	if (ret)
-		raddr = (unsigned long) ret;
+		raddr = (unsigned long)ret;
 
 	return raddr;
 }
diff --git a/criu/arch/s390/sigframe.c b/criu/arch/s390/sigframe.c
index 03f206a8d..89a897260 100644
--- a/criu/arch/s390/sigframe.c
+++ b/criu/arch/s390/sigframe.c
@@ -13,8 +13,7 @@
  * - sigframe : Pointer to local signal frame
  * - rsigframe: Pointer to remote signal frame of inferior
  */
-int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
-			     struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	return 0;
 }
diff --git a/criu/arch/s390/vdso-pie.c b/criu/arch/s390/vdso-pie.c
index 0667668ee..ad504beda 100644
--- a/criu/arch/s390/vdso-pie.c
+++ b/criu/arch/s390/vdso-pie.c
@@ -9,7 +9,7 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
@@ -17,11 +17,11 @@
  * Trampoline instruction sequence
  */
 typedef struct {
-	u8	larl[6];	/* Load relative address of imm64 */
-	u8	lg[6];		/* Load %r1 with imm64 */
-	u8	br[2];		/* Branch to %r1 */
-	u64	addr;		/* Jump address */
-	u32	guards;		/* Guard bytes */
+	u8 larl[6]; /* Load relative address of imm64 */
+	u8 lg[6]; /* Load %r1 with imm64 */
+	u8 br[2]; /* Branch to %r1 */
+	u64 addr; /* Jump address */
+	u32 guards; /* Guard bytes */
 } __packed jmp_t;
 
 /*
@@ -29,21 +29,20 @@ typedef struct {
  */
 jmp_t jmp = {
 	/* larl %r1,e (addr) */
-	.larl		= {0xc0, 0x10, 0x00, 0x00, 0x00, 0x07},
+	.larl = { 0xc0, 0x10, 0x00, 0x00, 0x00, 0x07 },
 	/* lg   %r1,0(%r1) */
-	.lg		= {0xe3, 0x10, 0x10, 0x00, 0x00, 0x04},
+	.lg = { 0xe3, 0x10, 0x10, 0x00, 0x00, 0x04 },
 	/* br   %r1 */
-	.br		= {0x07, 0xf1},
-	.guards		= 0xcccccccc,
+	.br = { 0x07, 0xf1 },
+	.guards = 0xcccccccc,
 };
 
 /*
  * Insert trampoline code into old vdso entry points to
  * jump to new vdso functions.
  */
-int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *to, struct vdso_symtable *from,
-			bool __always_unused compat_vdso)
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *to,
+			struct vdso_symtable *from, bool __always_unused compat_vdso)
 {
 	unsigned int i;
 
@@ -51,14 +50,11 @@ int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 		if (vdso_symbol_empty(&from->symbols[i]))
 			continue;
 
-		pr_debug("jmp: %s: %lx/%lx -> %lx/%lx (index %d)\n",
-			 from->symbols[i].name, base_from,
-			 from->symbols[i].offset,
-			 base_to, to->symbols[i].offset, i);
+		pr_debug("jmp: %s: %lx/%lx -> %lx/%lx (index %d)\n", from->symbols[i].name, base_from,
+			 from->symbols[i].offset, base_to, to->symbols[i].offset, i);
 
 		jmp.addr = base_to + to->symbols[i].offset;
-		memcpy((void *)(base_from + from->symbols[i].offset), &jmp,
-		       sizeof(jmp));
+		memcpy((void *)(base_from + from->symbols[i].offset), &jmp, sizeof(jmp));
 	}
 
 	return 0;
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index 72c5bd59c..d02f4abd5 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -23,7 +23,7 @@
 #include "protobuf.h"
 #include "images/cpuinfo.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cpu: "
 
 static compel_cpuinfo_t rt_cpu_info;
@@ -55,12 +55,9 @@ int cpu_init(void)
 	}
 
 	pr_debug("fpu:%d fxsr:%d xsave:%d xsaveopt:%d xsavec:%d xgetbv1:%d xsaves:%d\n",
-		 !!compel_cpu_has_feature(X86_FEATURE_FPU),
-		 !!compel_cpu_has_feature(X86_FEATURE_FXSR),
-		 !!compel_cpu_has_feature(X86_FEATURE_OSXSAVE),
-		 !!compel_cpu_has_feature(X86_FEATURE_XSAVEOPT),
-		 !!compel_cpu_has_feature(X86_FEATURE_XSAVEC),
-		 !!compel_cpu_has_feature(X86_FEATURE_XGETBV1),
+		 !!compel_cpu_has_feature(X86_FEATURE_FPU), !!compel_cpu_has_feature(X86_FEATURE_FXSR),
+		 !!compel_cpu_has_feature(X86_FEATURE_OSXSAVE), !!compel_cpu_has_feature(X86_FEATURE_XSAVEOPT),
+		 !!compel_cpu_has_feature(X86_FEATURE_XSAVEC), !!compel_cpu_has_feature(X86_FEATURE_XGETBV1),
 		 !!compel_cpu_has_feature(X86_FEATURE_XSAVES));
 
 	return cpu_has_unsupported_features() ? -1 : 0;
@@ -77,25 +74,24 @@ int cpu_dump_cpuinfo(void)
 	if (!img)
 		return -1;
 
-	cpu_info.x86_entry		= &cpu_x86_info_ptr;
-	cpu_info.n_x86_entry		= 1;
+	cpu_info.x86_entry = &cpu_x86_info_ptr;
+	cpu_info.n_x86_entry = 1;
 
-	cpu_x86_info.vendor_id		= (rt_cpu_info.x86_vendor == X86_VENDOR_INTEL) ?
-		CPUINFO_X86_ENTRY__VENDOR__INTEL :
-		CPUINFO_X86_ENTRY__VENDOR__AMD;
+	cpu_x86_info.vendor_id = (rt_cpu_info.x86_vendor == X86_VENDOR_INTEL) ? CPUINFO_X86_ENTRY__VENDOR__INTEL :
+										      CPUINFO_X86_ENTRY__VENDOR__AMD;
 
-	cpu_x86_info.cpu_family		= rt_cpu_info.x86_family;
-	cpu_x86_info.model		= rt_cpu_info.x86_model;
-	cpu_x86_info.stepping		= rt_cpu_info.x86_mask;
-	cpu_x86_info.capability_ver	= 2;
-	cpu_x86_info.n_capability	= ARRAY_SIZE(rt_cpu_info.x86_capability);
-	cpu_x86_info.capability		= (void *)rt_cpu_info.x86_capability;
-	cpu_x86_info.has_xfeatures_mask	= true;
-	cpu_x86_info.xfeatures_mask	= rt_cpu_info.xfeatures_mask;
-	cpu_x86_info.has_xsave_size	= true;
-	cpu_x86_info.xsave_size		= rt_cpu_info.xsave_size;
-	cpu_x86_info.has_xsave_size_max	= true;
-	cpu_x86_info.xsave_size_max	= rt_cpu_info.xsave_size_max;
+	cpu_x86_info.cpu_family = rt_cpu_info.x86_family;
+	cpu_x86_info.model = rt_cpu_info.x86_model;
+	cpu_x86_info.stepping = rt_cpu_info.x86_mask;
+	cpu_x86_info.capability_ver = 2;
+	cpu_x86_info.n_capability = ARRAY_SIZE(rt_cpu_info.x86_capability);
+	cpu_x86_info.capability = (void *)rt_cpu_info.x86_capability;
+	cpu_x86_info.has_xfeatures_mask = true;
+	cpu_x86_info.xfeatures_mask = rt_cpu_info.xfeatures_mask;
+	cpu_x86_info.has_xsave_size = true;
+	cpu_x86_info.xsave_size = rt_cpu_info.xsave_size;
+	cpu_x86_info.has_xsave_size_max = true;
+	cpu_x86_info.xsave_size_max = rt_cpu_info.xsave_size_max;
 
 	if (rt_cpu_info.x86_model_id[0])
 		cpu_x86_info.model_id = rt_cpu_info.x86_model_id;
@@ -109,102 +105,65 @@ int cpu_dump_cpuinfo(void)
 	return 0;
 }
 
-#define __ins_bit(__l, __v)	(1u << ((__v) - 32u * (__l)))
+#define __ins_bit(__l, __v) (1u << ((__v)-32u * (__l)))
 
 static uint32_t x86_ins_capability_mask[NCAPINTS] = {
-	[CPUID_1_EDX] =
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_FPU)				|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_TSC)				|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_CX8)				|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_SEP)				|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_CMOV)			|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_CLFLUSH)			|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_MMX)				|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_FXSR)			|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_XMM)				|
-		__ins_bit(CPUID_1_EDX, X86_FEATURE_XMM2),
+	[CPUID_1_EDX] = __ins_bit(CPUID_1_EDX, X86_FEATURE_FPU) | __ins_bit(CPUID_1_EDX, X86_FEATURE_TSC) |
+			__ins_bit(CPUID_1_EDX, X86_FEATURE_CX8) | __ins_bit(CPUID_1_EDX, X86_FEATURE_SEP) |
+			__ins_bit(CPUID_1_EDX, X86_FEATURE_CMOV) | __ins_bit(CPUID_1_EDX, X86_FEATURE_CLFLUSH) |
+			__ins_bit(CPUID_1_EDX, X86_FEATURE_MMX) | __ins_bit(CPUID_1_EDX, X86_FEATURE_FXSR) |
+			__ins_bit(CPUID_1_EDX, X86_FEATURE_XMM) | __ins_bit(CPUID_1_EDX, X86_FEATURE_XMM2),
 
-	[CPUID_8000_0001_EDX] =
-		__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_SYSCALL)		|
-		__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_MMXEXT)		|
-		__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_RDTSCP)		|
-		__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOWEXT)		|
-		__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOW),
+	[CPUID_8000_0001_EDX] = __ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_SYSCALL) |
+				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_MMXEXT) |
+				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_RDTSCP) |
+				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOWEXT) |
+				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOW),
 
-	[CPUID_LNX_1] =
-		__ins_bit(CPUID_LNX_1, X86_FEATURE_REP_GOOD)			|
-		__ins_bit(CPUID_LNX_1, X86_FEATURE_NOPL),
+	[CPUID_LNX_1] = __ins_bit(CPUID_LNX_1, X86_FEATURE_REP_GOOD) | __ins_bit(CPUID_LNX_1, X86_FEATURE_NOPL),
 
-	[CPUID_1_ECX] =
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM3)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_PCLMULQDQ)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_MWAIT)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_SSSE3)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_CX16)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_1)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_2)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_MOVBE)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_POPCNT)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_AES)				|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_XSAVE)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_OSXSAVE)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_AVX)				|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_F16C)			|
-		__ins_bit(CPUID_1_ECX, X86_FEATURE_RDRAND),
+	[CPUID_1_ECX] = __ins_bit(CPUID_1_ECX, X86_FEATURE_XMM3) | __ins_bit(CPUID_1_ECX, X86_FEATURE_PCLMULQDQ) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_MWAIT) | __ins_bit(CPUID_1_ECX, X86_FEATURE_SSSE3) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_CX16) | __ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_1) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_2) | __ins_bit(CPUID_1_ECX, X86_FEATURE_MOVBE) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_POPCNT) | __ins_bit(CPUID_1_ECX, X86_FEATURE_AES) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_XSAVE) | __ins_bit(CPUID_1_ECX, X86_FEATURE_OSXSAVE) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_AVX) | __ins_bit(CPUID_1_ECX, X86_FEATURE_F16C) |
+			__ins_bit(CPUID_1_ECX, X86_FEATURE_RDRAND),
 
 	[CPUID_8000_0001_ECX] =
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_ABM)			|
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_SSE4A)		|
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_MISALIGNSSE)		|
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_3DNOWPREFETCH)	|
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_XOP)			|
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_FMA4)		|
+		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_ABM) | __ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_SSE4A) |
+		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_MISALIGNSSE) |
+		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_3DNOWPREFETCH) |
+		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_XOP) | __ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_FMA4) |
 		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_TBM),
 
 	[CPUID_7_0_EBX] =
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_FSGSBASE)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI1)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_HLE)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX2)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI2)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_ERMS)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RTM)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_MPX)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512F)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512DQ)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RDSEED)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_ADX)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_CLFLUSHOPT)		|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512PF)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512ER)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512CD)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_SHA_NI)			|
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512BW)			|
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_FSGSBASE) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI1) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_HLE) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX2) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI2) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_ERMS) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RTM) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_MPX) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512F) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512DQ) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RDSEED) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_ADX) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_CLFLUSHOPT) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512PF) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512ER) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512CD) |
+		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_SHA_NI) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512BW) |
 		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512VL),
 
-	[CPUID_D_1_EAX] =
-		__ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEOPT)			|
-		__ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEC)			|
-		__ins_bit(CPUID_D_1_EAX, X86_FEATURE_XGETBV1),
+	[CPUID_D_1_EAX] = __ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEOPT) |
+			  __ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEC) | __ins_bit(CPUID_D_1_EAX, X86_FEATURE_XGETBV1),
 
 	[CPUID_7_0_ECX] =
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512VBMI)		|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VBMI2)		|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_GFNI)			|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_VAES)			|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_VPCLMULQDQ)		|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VNNI)		|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_BITALG)		|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_TME)			|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VPOPCNTDQ)		|
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_RDPID),
+		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512VBMI) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VBMI2) |
+		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_GFNI) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_VAES) |
+		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_VPCLMULQDQ) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VNNI) |
+		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_BITALG) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_TME) |
+		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VPOPCNTDQ) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_RDPID),
 
-	[CPUID_8000_0008_EBX] =
-		__ins_bit(CPUID_8000_0008_EBX, X86_FEATURE_CLZERO),
+	[CPUID_8000_0008_EBX] = __ins_bit(CPUID_8000_0008_EBX, X86_FEATURE_CLZERO),
 
-	[CPUID_7_0_EDX] =
-		__ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4VNNIW)		|
-		__ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4FMAPS),
+	[CPUID_7_0_EDX] = __ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4VNNIW) |
+			  __ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4FMAPS),
 };
 
 #undef __ins_bit
@@ -243,20 +202,14 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 		 * rest of mismatches won't cause problems.
 		 */
 
-#define __mismatch_fpu_bit(__bit)					\
-		(test_bit(__bit, (void *)cpu_info->x86_capability) &&	\
-		 !compel_cpu_has_feature(__bit))
-		if (__mismatch_fpu_bit(X86_FEATURE_FPU)		||
-		    __mismatch_fpu_bit(X86_FEATURE_FXSR)	||
-		    __mismatch_fpu_bit(X86_FEATURE_OSXSAVE)	||
-		    __mismatch_fpu_bit(X86_FEATURE_XSAVES)) {
+#define __mismatch_fpu_bit(__bit) (test_bit(__bit, (void *)cpu_info->x86_capability) && !compel_cpu_has_feature(__bit))
+		if (__mismatch_fpu_bit(X86_FEATURE_FPU) || __mismatch_fpu_bit(X86_FEATURE_FXSR) ||
+		    __mismatch_fpu_bit(X86_FEATURE_OSXSAVE) || __mismatch_fpu_bit(X86_FEATURE_XSAVES)) {
 			pr_err("FPU feature required by image "
 			       "is not supported on host "
 			       "(fpu:%d fxsr:%d osxsave:%d xsaves:%d)\n",
-			       __mismatch_fpu_bit(X86_FEATURE_FPU),
-			       __mismatch_fpu_bit(X86_FEATURE_FXSR),
-			       __mismatch_fpu_bit(X86_FEATURE_OSXSAVE),
-			       __mismatch_fpu_bit(X86_FEATURE_XSAVES));
+			       __mismatch_fpu_bit(X86_FEATURE_FPU), __mismatch_fpu_bit(X86_FEATURE_FXSR),
+			       __mismatch_fpu_bit(X86_FEATURE_OSXSAVE), __mismatch_fpu_bit(X86_FEATURE_XSAVES));
 			return -1;
 		}
 #undef __mismatch_fpu_bit
@@ -266,10 +219,8 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 		 * the destination there are all the features which were on the
 		 * source.
 		 */
-		if ((m = cpu_info->xfeatures_mask &
-			 ~rt_cpu_info.xfeatures_mask)) {
-			pr_err("CPU xfeatures has unsupported bits (%#"
-			       PRIx64")\n", m);
+		if ((m = cpu_info->xfeatures_mask & ~rt_cpu_info.xfeatures_mask)) {
+			pr_err("CPU xfeatures has unsupported bits (%#" PRIx64 ")\n", m);
 			return -1;
 		}
 
@@ -281,13 +232,11 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 		 * greedy feature mask causing programs to misbehave.
 		 */
 		if (cpu_info->xsave_size != rt_cpu_info.xsave_size) {
-			pr_err("CPU xsave size mismatch (%u/%u)\n",
-			       cpu_info->xsave_size, rt_cpu_info.xsave_size);
+			pr_err("CPU xsave size mismatch (%u/%u)\n", cpu_info->xsave_size, rt_cpu_info.xsave_size);
 			return -1;
 		}
 		if (cpu_info->xsave_size_max != rt_cpu_info.xsave_size_max) {
-			pr_err("CPU xsave max size mismatch (%u/%u)\n",
-			       cpu_info->xsave_size_max,
+			pr_err("CPU xsave max size mismatch (%u/%u)\n", cpu_info->xsave_size_max,
 			       rt_cpu_info.xsave_size_max);
 			return -1;
 		}
@@ -305,8 +254,7 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 	 * Strict capability mode. Everything must match.
 	 */
 	if (opts.cpu_cap & CPU_CAP_CPU) {
-		if (memcmp(cpu_info->x86_capability, rt_cpu_info.x86_capability,
-			   sizeof(cpu_info->x86_capability))) {
+		if (memcmp(cpu_info->x86_capability, rt_cpu_info.x86_capability, sizeof(cpu_info->x86_capability))) {
 			pr_err("CPU capabilities do not match run time\n");
 			return -1;
 		}
@@ -316,8 +264,8 @@ static int cpu_validate_features(compel_cpuinfo_t *cpu_info)
 }
 
 static const struct {
-	const uint32_t	capability_ver;
-	const uint32_t	ncapints;
+	const uint32_t capability_ver;
+	const uint32_t ncapints;
 } ncapints[] = {
 	{ .capability_ver = 1, .ncapints = NCAPINTS_V1 },
 	{ .capability_ver = 2, .ncapints = NCAPINTS_V2 },
@@ -328,14 +276,12 @@ static compel_cpuinfo_t *img_to_cpuinfo(CpuinfoX86Entry *img_x86_entry)
 	compel_cpuinfo_t *cpu_info;
 	size_t size, i;
 
-	BUILD_BUG_ON(sizeof(img_x86_entry->capability[0]) !=
-		     sizeof(cpu_info->x86_capability[0]));
+	BUILD_BUG_ON(sizeof(img_x86_entry->capability[0]) != sizeof(cpu_info->x86_capability[0]));
 	BUILD_BUG_ON(ARRAY_SIZE(rt_cpu_info.x86_capability) != NCAPINTS);
 
 	if (img_x86_entry->vendor_id != CPUINFO_X86_ENTRY__VENDOR__INTEL &&
 	    img_x86_entry->vendor_id != CPUINFO_X86_ENTRY__VENDOR__AMD) {
-		pr_err("Image carries unknown vendor %u\n",
-		       (unsigned)img_x86_entry->vendor_id);
+		pr_err("Image carries unknown vendor %u\n", (unsigned)img_x86_entry->vendor_id);
 		return NULL;
 	}
 
@@ -343,8 +289,7 @@ static compel_cpuinfo_t *img_to_cpuinfo(CpuinfoX86Entry *img_x86_entry)
 		if (img_x86_entry->capability_ver == ncapints[i].capability_ver) {
 			if (img_x86_entry->n_capability != ncapints[i].ncapints) {
 				pr_err("Image carries %u words while %u expected\n",
-				       (unsigned)img_x86_entry->n_capability,
-				       (unsigned)ncapints[i].ncapints);
+				       (unsigned)img_x86_entry->n_capability, (unsigned)ncapints[i].ncapints);
 				return NULL;
 			}
 			break;
@@ -352,8 +297,7 @@ static compel_cpuinfo_t *img_to_cpuinfo(CpuinfoX86Entry *img_x86_entry)
 	}
 
 	if (i >= ARRAY_SIZE(ncapints)) {
-		pr_err("Image carries unknown capability version %d\n",
-		       (unsigned)img_x86_entry->capability_ver);
+		pr_err("Image carries unknown capability version %d\n", (unsigned)img_x86_entry->capability_ver);
 		return NULL;
 	}
 
@@ -368,21 +312,20 @@ static compel_cpuinfo_t *img_to_cpuinfo(CpuinfoX86Entry *img_x86_entry)
 	size = sizeof(img_x86_entry->capability[0]) * img_x86_entry->n_capability;
 	memcpy(cpu_info->x86_capability, img_x86_entry->capability, size);
 	if (img_x86_entry->capability_ver == 1) {
-		memcpy(&cpu_info->x86_capability[NCAPINTS_V1],
-		       &rt_cpu_info.x86_capability[NCAPINTS_V1],
+		memcpy(&cpu_info->x86_capability[NCAPINTS_V1], &rt_cpu_info.x86_capability[NCAPINTS_V1],
 		       (NCAPINTS_V2 - NCAPINTS_V1) * sizeof(rt_cpu_info.x86_capability[0]));
 	}
 
 	if (img_x86_entry->vendor_id == CPUINFO_X86_ENTRY__VENDOR__INTEL)
-		cpu_info->x86_vendor	= X86_VENDOR_INTEL;
+		cpu_info->x86_vendor = X86_VENDOR_INTEL;
 	else
-		cpu_info->x86_vendor	= X86_VENDOR_AMD;
-	cpu_info->x86_family		= img_x86_entry->cpu_family;
-	cpu_info->x86_model		= img_x86_entry->model;
-	cpu_info->x86_mask		= img_x86_entry->stepping;
-	cpu_info->extended_cpuid_level	= rt_cpu_info.extended_cpuid_level;
-	cpu_info->cpuid_level		= rt_cpu_info.cpuid_level;
-	cpu_info->x86_power		= rt_cpu_info.x86_power;
+		cpu_info->x86_vendor = X86_VENDOR_AMD;
+	cpu_info->x86_family = img_x86_entry->cpu_family;
+	cpu_info->x86_model = img_x86_entry->model;
+	cpu_info->x86_mask = img_x86_entry->stepping;
+	cpu_info->extended_cpuid_level = rt_cpu_info.extended_cpuid_level;
+	cpu_info->cpuid_level = rt_cpu_info.cpuid_level;
+	cpu_info->x86_power = rt_cpu_info.x86_power;
 
 	memcpy(cpu_info->x86_vendor_id, rt_cpu_info.x86_model_id, sizeof(cpu_info->x86_vendor_id));
 	strncpy(cpu_info->x86_model_id, img_x86_entry->model_id, sizeof(cpu_info->x86_model_id) - 1);
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index bc8022535..f177b9e7b 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -13,30 +13,31 @@
 #undef LOG_PREFIX
 #define LOG_PREFIX "x86: "
 
-#define XSAVE_PB_NELEMS(__s, __obj, __member)		\
-	(sizeof(__s) / sizeof(*(__obj)->__member))
+#define XSAVE_PB_NELEMS(__s, __obj, __member) (sizeof(__s) / sizeof(*(__obj)->__member))
 
 int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	CoreEntry *core = x;
-	UserX86RegsEntry *gpregs	= core->thread_info->gpregs;
+	UserX86RegsEntry *gpregs = core->thread_info->gpregs;
 
-#define assign_reg(dst, src, e)		do { dst->e = (__typeof__(dst->e))src.e; } while (0)
-#define assign_array(dst, src, e)	memcpy(dst->e, &src.e, sizeof(src.e))
-#define assign_xsave(feature, xsave, member, area)					\
-	do {										\
-		if (compel_fpu_has_feature(feature)) {					\
-			uint32_t off = compel_fpu_feature_offset(feature);		\
-			void *from = &area[off];					\
-			size_t size = pb_repeated_size(xsave, member);			\
-			size_t xsize = (size_t)compel_fpu_feature_size(feature);	\
-			if (xsize != size) {						\
-				pr_err("%s reported %zu bytes (expecting %zu)\n",	\
-					# feature, xsize, size);			\
-				return -1;						\
-			}								\
-			memcpy(xsave->member, from, size);				\
-		}									\
+#define assign_reg(dst, src, e)                     \
+	do {                                        \
+		dst->e = (__typeof__(dst->e))src.e; \
+	} while (0)
+#define assign_array(dst, src, e) memcpy(dst->e, &src.e, sizeof(src.e))
+#define assign_xsave(feature, xsave, member, area)                                                        \
+	do {                                                                                              \
+		if (compel_fpu_has_feature(feature)) {                                                    \
+			uint32_t off = compel_fpu_feature_offset(feature);                                \
+			void *from = &area[off];                                                          \
+			size_t size = pb_repeated_size(xsave, member);                                    \
+			size_t xsize = (size_t)compel_fpu_feature_size(feature);                          \
+			if (xsize != size) {                                                              \
+				pr_err("%s reported %zu bytes (expecting %zu)\n", #feature, xsize, size); \
+				return -1;                                                                \
+			}                                                                                 \
+			memcpy(xsave->member, from, size);                                                \
+		}                                                                                         \
 	} while (0)
 
 	if (user_regs_native(regs)) {
@@ -119,13 +120,13 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpre
 		 */
 		assign_reg(xsave, fpregs->xsave_hdr, xstate_bv);
 
-		assign_xsave(XFEATURE_YMM,	xsave, ymmh_space,	extended_state_area);
-		assign_xsave(XFEATURE_BNDREGS,	xsave, bndreg_state,	extended_state_area);
-		assign_xsave(XFEATURE_BNDCSR,	xsave, bndcsr_state,	extended_state_area);
-		assign_xsave(XFEATURE_OPMASK,	xsave, opmask_reg,	extended_state_area);
-		assign_xsave(XFEATURE_ZMM_Hi256,xsave, zmm_upper,	extended_state_area);
-		assign_xsave(XFEATURE_Hi16_ZMM,	xsave, hi16_zmm,	extended_state_area);
-		assign_xsave(XFEATURE_PKRU,	xsave, pkru,		extended_state_area);
+		assign_xsave(XFEATURE_YMM, xsave, ymmh_space, extended_state_area);
+		assign_xsave(XFEATURE_BNDREGS, xsave, bndreg_state, extended_state_area);
+		assign_xsave(XFEATURE_BNDCSR, xsave, bndcsr_state, extended_state_area);
+		assign_xsave(XFEATURE_OPMASK, xsave, opmask_reg, extended_state_area);
+		assign_xsave(XFEATURE_ZMM_Hi256, xsave, zmm_upper, extended_state_area);
+		assign_xsave(XFEATURE_Hi16_ZMM, xsave, hi16_zmm, extended_state_area);
+		assign_xsave(XFEATURE_PKRU, xsave, pkru, extended_state_area);
 	}
 
 #undef assign_reg
@@ -139,7 +140,7 @@ static void alloc_tls(ThreadInfoX86 *ti, void **mempool)
 {
 	int i;
 
-	ti->tls = xptr_pull_s(mempool, GDT_ENTRY_TLS_NUM*sizeof(UserDescT*));
+	ti->tls = xptr_pull_s(mempool, GDT_ENTRY_TLS_NUM * sizeof(UserDescT *));
 	ti->n_tls = GDT_ENTRY_TLS_NUM;
 	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++) {
 		ti->tls[i] = xptr_pull(mempool, UserDescT);
@@ -150,50 +151,50 @@ static void alloc_tls(ThreadInfoX86 *ti, void **mempool)
 static int alloc_xsave_extends(UserX86XsaveEntry *xsave)
 {
 	if (compel_fpu_has_feature(XFEATURE_YMM)) {
-		xsave->n_ymmh_space	= XSAVE_PB_NELEMS(struct ymmh_struct, xsave, ymmh_space);
-		xsave->ymmh_space	= xzalloc(pb_repeated_size(xsave, ymmh_space));
+		xsave->n_ymmh_space = XSAVE_PB_NELEMS(struct ymmh_struct, xsave, ymmh_space);
+		xsave->ymmh_space = xzalloc(pb_repeated_size(xsave, ymmh_space));
 		if (!xsave->ymmh_space)
 			goto err;
 	}
 
 	if (compel_fpu_has_feature(XFEATURE_BNDREGS)) {
-		xsave->n_bndreg_state	= XSAVE_PB_NELEMS(struct mpx_bndreg_state, xsave, bndreg_state);
-		xsave->bndreg_state	= xzalloc(pb_repeated_size(xsave, bndreg_state));
+		xsave->n_bndreg_state = XSAVE_PB_NELEMS(struct mpx_bndreg_state, xsave, bndreg_state);
+		xsave->bndreg_state = xzalloc(pb_repeated_size(xsave, bndreg_state));
 		if (!xsave->bndreg_state)
 			goto err;
 	}
 
 	if (compel_fpu_has_feature(XFEATURE_BNDCSR)) {
-		xsave->n_bndcsr_state	= XSAVE_PB_NELEMS(struct mpx_bndcsr_state, xsave, bndcsr_state);
-		xsave->bndcsr_state	= xzalloc(pb_repeated_size(xsave, bndcsr_state));
+		xsave->n_bndcsr_state = XSAVE_PB_NELEMS(struct mpx_bndcsr_state, xsave, bndcsr_state);
+		xsave->bndcsr_state = xzalloc(pb_repeated_size(xsave, bndcsr_state));
 		if (!xsave->bndcsr_state)
 			goto err;
 	}
 
 	if (compel_fpu_has_feature(XFEATURE_OPMASK)) {
-		xsave->n_opmask_reg	= XSAVE_PB_NELEMS(struct avx_512_opmask_state, xsave, opmask_reg);
-		xsave->opmask_reg	= xzalloc(pb_repeated_size(xsave, opmask_reg));
+		xsave->n_opmask_reg = XSAVE_PB_NELEMS(struct avx_512_opmask_state, xsave, opmask_reg);
+		xsave->opmask_reg = xzalloc(pb_repeated_size(xsave, opmask_reg));
 		if (!xsave->opmask_reg)
 			goto err;
 	}
 
 	if (compel_fpu_has_feature(XFEATURE_ZMM_Hi256)) {
-		xsave->n_zmm_upper	= XSAVE_PB_NELEMS(struct avx_512_zmm_uppers_state, xsave, zmm_upper);
-		xsave->zmm_upper	= xzalloc(pb_repeated_size(xsave, zmm_upper));
+		xsave->n_zmm_upper = XSAVE_PB_NELEMS(struct avx_512_zmm_uppers_state, xsave, zmm_upper);
+		xsave->zmm_upper = xzalloc(pb_repeated_size(xsave, zmm_upper));
 		if (!xsave->zmm_upper)
 			goto err;
 	}
 
 	if (compel_fpu_has_feature(XFEATURE_Hi16_ZMM)) {
-		xsave->n_hi16_zmm	= XSAVE_PB_NELEMS(struct avx_512_hi16_state, xsave, hi16_zmm);
-		xsave->hi16_zmm		= xzalloc(pb_repeated_size(xsave, hi16_zmm));
+		xsave->n_hi16_zmm = XSAVE_PB_NELEMS(struct avx_512_hi16_state, xsave, hi16_zmm);
+		xsave->hi16_zmm = xzalloc(pb_repeated_size(xsave, hi16_zmm));
 		if (!xsave->hi16_zmm)
 			goto err;
 	}
 
 	if (compel_fpu_has_feature(XFEATURE_PKRU)) {
-		xsave->n_pkru		= XSAVE_PB_NELEMS(struct pkru_state, xsave, pkru);
-		xsave->pkru		= xzalloc(pb_repeated_size(xsave, pkru));
+		xsave->n_pkru = XSAVE_PB_NELEMS(struct pkru_state, xsave, pkru);
+		xsave->pkru = xzalloc(pb_repeated_size(xsave, pkru));
 		if (!xsave->pkru)
 			goto err;
 	}
@@ -210,12 +211,10 @@ int arch_alloc_thread_info(CoreEntry *core)
 	void *m;
 	ThreadInfoX86 *ti = NULL;
 
-
 	with_fpu = compel_cpu_has_feature(X86_FEATURE_FPU);
 
-	sz = sizeof(ThreadInfoX86) + sizeof(UserX86RegsEntry) +
-		GDT_ENTRY_TLS_NUM*sizeof(UserDescT) +
-		GDT_ENTRY_TLS_NUM*sizeof(UserDescT*);
+	sz = sizeof(ThreadInfoX86) + sizeof(UserX86RegsEntry) + GDT_ENTRY_TLS_NUM * sizeof(UserDescT) +
+	     GDT_ENTRY_TLS_NUM * sizeof(UserDescT *);
 	if (with_fpu) {
 		sz += sizeof(UserX86FpregsEntry);
 		with_xsave = compel_cpu_has_feature(X86_FEATURE_OSXSAVE);
@@ -240,11 +239,11 @@ int arch_alloc_thread_info(CoreEntry *core)
 		user_x86_fpregs_entry__init(fpregs);
 
 		/* These are numbers from kernel */
-		fpregs->n_st_space	= 32;
-		fpregs->n_xmm_space	= 64;
+		fpregs->n_st_space = 32;
+		fpregs->n_xmm_space = 64;
 
-		fpregs->st_space	= xzalloc(pb_repeated_size(fpregs, st_space));
-		fpregs->xmm_space	= xzalloc(pb_repeated_size(fpregs, xmm_space));
+		fpregs->st_space = xzalloc(pb_repeated_size(fpregs, st_space));
+		fpregs->xmm_space = xzalloc(pb_repeated_size(fpregs, xmm_space));
 
 		if (!fpregs->st_space || !fpregs->xmm_space)
 			goto err;
@@ -293,16 +292,14 @@ static bool valid_xsave_frame(CoreEntry *core)
 	if (core->thread_info->fpregs->n_st_space < ARRAY_SIZE(x->i387.st_space)) {
 		pr_err("Corruption in FPU st_space area "
 		       "(got %li but %li expected)\n",
-		       (long)core->thread_info->fpregs->n_st_space,
-		       (long)ARRAY_SIZE(x->i387.st_space));
+		       (long)core->thread_info->fpregs->n_st_space, (long)ARRAY_SIZE(x->i387.st_space));
 		return false;
 	}
 
 	if (core->thread_info->fpregs->n_xmm_space < ARRAY_SIZE(x->i387.xmm_space)) {
 		pr_err("Corruption in FPU xmm_space area "
 		       "(got %li but %li expected)\n",
-		       (long)core->thread_info->fpregs->n_st_space,
-		       (long)ARRAY_SIZE(x->i387.xmm_space));
+		       (long)core->thread_info->fpregs->n_st_space, (long)ARRAY_SIZE(x->i387.xmm_space));
 		return false;
 	}
 
@@ -310,46 +307,52 @@ static bool valid_xsave_frame(CoreEntry *core)
 		if (xsave) {
 			size_t i;
 			struct {
-				const char	*name;
-				size_t		expected;
-				size_t		obtained;
-				void		*ptr;
+				const char *name;
+				size_t expected;
+				size_t obtained;
+				void *ptr;
 			} features[] = {
 				{
-					.name		= __stringify_1(XFEATURE_YMM),
-					.expected	= XSAVE_PB_NELEMS(struct ymmh_struct, xsave, ymmh_space),
-					.obtained	= xsave->n_ymmh_space,
-					.ptr		= xsave->ymmh_space,
-				}, {
-					.name		= __stringify_1(XFEATURE_BNDREGS),
-					.expected	= XSAVE_PB_NELEMS(struct mpx_bndreg_state, xsave, bndreg_state),
-					.obtained	= xsave->n_bndreg_state,
-					.ptr		= xsave->bndreg_state,
-				}, {
-					.name		= __stringify_1(XFEATURE_BNDCSR),
-					.expected	= XSAVE_PB_NELEMS(struct mpx_bndcsr_state, xsave, bndcsr_state),
-					.obtained	= xsave->n_bndcsr_state,
-					.ptr		= xsave->bndcsr_state,
-				}, {
-					.name		= __stringify_1(XFEATURE_OPMASK),
-					.expected	= XSAVE_PB_NELEMS(struct avx_512_opmask_state, xsave, opmask_reg),
-					.obtained	= xsave->n_opmask_reg,
-					.ptr		= xsave->opmask_reg,
-				}, {
-					.name		= __stringify_1(XFEATURE_ZMM_Hi256),
-					.expected	= XSAVE_PB_NELEMS(struct avx_512_zmm_uppers_state, xsave, zmm_upper),
-					.obtained	= xsave->n_zmm_upper,
-					.ptr		= xsave->zmm_upper,
-				}, {
-					.name		= __stringify_1(XFEATURE_Hi16_ZMM),
-					.expected	= XSAVE_PB_NELEMS(struct avx_512_hi16_state, xsave, hi16_zmm),
-					.obtained	= xsave->n_hi16_zmm,
-					.ptr		= xsave->hi16_zmm,
-				}, {
-					.name		= __stringify_1(XFEATURE_PKRU),
-					.expected	= XSAVE_PB_NELEMS(struct pkru_state, xsave, pkru),
-					.obtained	= xsave->n_pkru,
-					.ptr		= xsave->pkru,
+					.name = __stringify_1(XFEATURE_YMM),
+					.expected = XSAVE_PB_NELEMS(struct ymmh_struct, xsave, ymmh_space),
+					.obtained = xsave->n_ymmh_space,
+					.ptr = xsave->ymmh_space,
+				},
+				{
+					.name = __stringify_1(XFEATURE_BNDREGS),
+					.expected = XSAVE_PB_NELEMS(struct mpx_bndreg_state, xsave, bndreg_state),
+					.obtained = xsave->n_bndreg_state,
+					.ptr = xsave->bndreg_state,
+				},
+				{
+					.name = __stringify_1(XFEATURE_BNDCSR),
+					.expected = XSAVE_PB_NELEMS(struct mpx_bndcsr_state, xsave, bndcsr_state),
+					.obtained = xsave->n_bndcsr_state,
+					.ptr = xsave->bndcsr_state,
+				},
+				{
+					.name = __stringify_1(XFEATURE_OPMASK),
+					.expected = XSAVE_PB_NELEMS(struct avx_512_opmask_state, xsave, opmask_reg),
+					.obtained = xsave->n_opmask_reg,
+					.ptr = xsave->opmask_reg,
+				},
+				{
+					.name = __stringify_1(XFEATURE_ZMM_Hi256),
+					.expected = XSAVE_PB_NELEMS(struct avx_512_zmm_uppers_state, xsave, zmm_upper),
+					.obtained = xsave->n_zmm_upper,
+					.ptr = xsave->zmm_upper,
+				},
+				{
+					.name = __stringify_1(XFEATURE_Hi16_ZMM),
+					.expected = XSAVE_PB_NELEMS(struct avx_512_hi16_state, xsave, hi16_zmm),
+					.obtained = xsave->n_hi16_zmm,
+					.ptr = xsave->hi16_zmm,
+				},
+				{
+					.name = __stringify_1(XFEATURE_PKRU),
+					.expected = XSAVE_PB_NELEMS(struct pkru_state, xsave, pkru),
+					.obtained = xsave->n_pkru,
+					.ptr = xsave->pkru,
 				},
 			};
 
@@ -392,12 +395,11 @@ static void show_rt_xsave_frame(struct xsave_struct *x)
 	pr_debug("xsave runtime structure\n");
 	pr_debug("-----------------------\n");
 
-	pr_debug("cwd:%#x swd:%#x twd:%#x fop:%#x mxcsr:%#x mxcsr_mask:%#x\n",
-		 (int)i387->cwd, (int)i387->swd, (int)i387->twd,
-		 (int)i387->fop, (int)i387->mxcsr, (int)i387->mxcsr_mask);
+	pr_debug("cwd:%#x swd:%#x twd:%#x fop:%#x mxcsr:%#x mxcsr_mask:%#x\n", (int)i387->cwd, (int)i387->swd,
+		 (int)i387->twd, (int)i387->fop, (int)i387->mxcsr, (int)i387->mxcsr_mask);
 
-	pr_debug("magic1:%#x extended_size:%u xstate_bv:%#lx xstate_size:%u\n",
-		 fpx->magic1, fpx->extended_size, (long)fpx->xstate_bv, fpx->xstate_size);
+	pr_debug("magic1:%#x extended_size:%u xstate_bv:%#lx xstate_size:%u\n", fpx->magic1, fpx->extended_size,
+		 (long)fpx->xstate_bv, fpx->xstate_size);
 	pr_debug("xstate_bv: %#lx\n", (long)xsave_hdr->xstate_bv);
 
 	pr_debug("-----------------------\n");
@@ -405,12 +407,9 @@ static void show_rt_xsave_frame(struct xsave_struct *x)
 
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 {
-	fpu_state_t *fpu_state = core_is_compat(core) ?
-		&sigframe->compat.fpu_state :
-		&sigframe->native.fpu_state;
-	struct xsave_struct *x = core_is_compat(core) ?
-		(void *)&fpu_state->fpu_state_ia32.xsave :
-		(void *)&fpu_state->fpu_state_64.xsave;
+	fpu_state_t *fpu_state = core_is_compat(core) ? &sigframe->compat.fpu_state : &sigframe->native.fpu_state;
+	struct xsave_struct *x = core_is_compat(core) ? (void *)&fpu_state->fpu_state_ia32.xsave :
+							      (void *)&fpu_state->fpu_state_64.xsave;
 
 	/*
 	 * If no FPU information provided -- we're restoring
@@ -427,32 +426,33 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 
 	fpu_state->has_fpu = true;
 
-#define assign_reg(dst, src, e)		do { dst.e = (__typeof__(dst.e))src->e; } while (0)
-#define assign_array(dst, src, e)	memcpy(dst.e, (src)->e, sizeof(dst.e))
-#define assign_xsave(feature, xsave, member, area)					\
-	do {										\
-		if (compel_fpu_has_feature(feature)) {					\
-			uint32_t off = compel_fpu_feature_offset(feature);		\
-			void *to = &area[off];						\
-			void *from = xsave->member;					\
-			size_t size = pb_repeated_size(xsave, member);			\
-			size_t xsize = (size_t)compel_fpu_feature_size(feature);	\
-			size_t xstate_size_next = off + xsize;				\
-			if (xsize != size) {						\
-				if (size) {						\
-					pr_err("%s reported %zu bytes (expecting %zu)\n",\
-						# feature, xsize, size);		\
-						return -1;				\
-				} else {						\
-					pr_debug("%s is not present in image, ignore\n",\
-						 # feature);				\
-				}							\
-			}								\
-			xstate_bv |= (1UL << feature);					\
-			BUG_ON(xstate_size > xstate_size_next);				\
-			xstate_size = xstate_size_next;					\
-			memcpy(to, from, size);						\
-		}									\
+#define assign_reg(dst, src, e)                    \
+	do {                                       \
+		dst.e = (__typeof__(dst.e))src->e; \
+	} while (0)
+#define assign_array(dst, src, e) memcpy(dst.e, (src)->e, sizeof(dst.e))
+#define assign_xsave(feature, xsave, member, area)                                                                \
+	do {                                                                                                      \
+		if (compel_fpu_has_feature(feature)) {                                                            \
+			uint32_t off = compel_fpu_feature_offset(feature);                                        \
+			void *to = &area[off];                                                                    \
+			void *from = xsave->member;                                                               \
+			size_t size = pb_repeated_size(xsave, member);                                            \
+			size_t xsize = (size_t)compel_fpu_feature_size(feature);                                  \
+			size_t xstate_size_next = off + xsize;                                                    \
+			if (xsize != size) {                                                                      \
+				if (size) {                                                                       \
+					pr_err("%s reported %zu bytes (expecting %zu)\n", #feature, xsize, size); \
+					return -1;                                                                \
+				} else {                                                                          \
+					pr_debug("%s is not present in image, ignore\n", #feature);               \
+				}                                                                                 \
+			}                                                                                         \
+			xstate_bv |= (1UL << feature);                                                            \
+			BUG_ON(xstate_size > xstate_size_next);                                                   \
+			xstate_size = xstate_size_next;                                                           \
+			memcpy(to, from, size);                                                                   \
+		}                                                                                                 \
 	} while (0)
 
 	assign_reg(x->i387, core->thread_info->fpregs, cwd);
@@ -492,21 +492,21 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 			 * to the increasing offsets of XFEATURE_x
 			 * inside memory layout (xstate_size calculation).
 			 */
-			assign_xsave(XFEATURE_YMM,	xsave, ymmh_space,	extended_state_area);
-			assign_xsave(XFEATURE_BNDREGS,	xsave, bndreg_state,	extended_state_area);
-			assign_xsave(XFEATURE_BNDCSR,	xsave, bndcsr_state,	extended_state_area);
-			assign_xsave(XFEATURE_OPMASK,	xsave, opmask_reg,	extended_state_area);
-			assign_xsave(XFEATURE_ZMM_Hi256,xsave, zmm_upper,	extended_state_area);
-			assign_xsave(XFEATURE_Hi16_ZMM,	xsave, hi16_zmm,	extended_state_area);
-			assign_xsave(XFEATURE_PKRU,	xsave, pkru,		extended_state_area);
+			assign_xsave(XFEATURE_YMM, xsave, ymmh_space, extended_state_area);
+			assign_xsave(XFEATURE_BNDREGS, xsave, bndreg_state, extended_state_area);
+			assign_xsave(XFEATURE_BNDCSR, xsave, bndcsr_state, extended_state_area);
+			assign_xsave(XFEATURE_OPMASK, xsave, opmask_reg, extended_state_area);
+			assign_xsave(XFEATURE_ZMM_Hi256, xsave, zmm_upper, extended_state_area);
+			assign_xsave(XFEATURE_Hi16_ZMM, xsave, hi16_zmm, extended_state_area);
+			assign_xsave(XFEATURE_PKRU, xsave, pkru, extended_state_area);
 		}
 
-		x->xsave_hdr.xstate_bv	= xstate_bv;
+		x->xsave_hdr.xstate_bv = xstate_bv;
 
-		fpx_sw->magic1		= FP_XSTATE_MAGIC1;
-		fpx_sw->xstate_bv	= xstate_bv;
-		fpx_sw->xstate_size	= xstate_size;
-		fpx_sw->extended_size	= xstate_size + FP_XSTATE_MAGIC2_SIZE;
+		fpx_sw->magic1 = FP_XSTATE_MAGIC1;
+		fpx_sw->xstate_bv = xstate_bv;
+		fpx_sw->xstate_size = xstate_size;
+		fpx_sw->extended_size = xstate_size + FP_XSTATE_MAGIC2_SIZE;
 
 		/*
 		 * This should be at the end of xsave frame.
@@ -524,7 +524,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 	return 0;
 }
 
-#define CPREG32(d)	f->compat.uc.uc_mcontext.d = r->d
+#define CPREG32(d) f->compat.uc.uc_mcontext.d = r->d
 static void restore_compat_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 {
 	CPREG32(gs);
@@ -532,8 +532,15 @@ static void restore_compat_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 	CPREG32(es);
 	CPREG32(ds);
 
-	CPREG32(di); CPREG32(si); CPREG32(bp); CPREG32(sp); CPREG32(bx);
-	CPREG32(dx); CPREG32(cx); CPREG32(ip); CPREG32(ax);
+	CPREG32(di);
+	CPREG32(si);
+	CPREG32(bp);
+	CPREG32(sp);
+	CPREG32(bx);
+	CPREG32(dx);
+	CPREG32(cx);
+	CPREG32(ip);
+	CPREG32(ax);
 	CPREG32(cs);
 	CPREG32(ss);
 	CPREG32(flags);
@@ -542,7 +549,7 @@ static void restore_compat_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 }
 #undef CPREG32
 
-#define CPREG64(d, s)	f->native.uc.uc_mcontext.d = r->s
+#define CPREG64(d, s) f->native.uc.uc_mcontext.d = r->s
 static void restore_native_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 {
 	CPREG64(rdi, di);
@@ -575,15 +582,15 @@ static void restore_native_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 {
 	switch (r->mode) {
-		case USER_X86_REGS_MODE__NATIVE:
-			restore_native_gpregs(f, r);
-			break;
-		case USER_X86_REGS_MODE__COMPAT:
-			restore_compat_gpregs(f, r);
-			break;
-		default:
-			pr_err("Can't prepare rt_sigframe: registers mode corrupted (%d)\n", r->mode);
-			return -1;
+	case USER_X86_REGS_MODE__NATIVE:
+		restore_native_gpregs(f, r);
+		break;
+	case USER_X86_REGS_MODE__COMPAT:
+		restore_compat_gpregs(f, r);
+		break;
+	default:
+		pr_err("Can't prepare rt_sigframe: registers mode corrupted (%d)\n", r->mode);
+		return -1;
 	}
 	return 0;
 }
@@ -591,10 +598,10 @@ int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
 static int get_robust_list32(pid_t pid, uintptr_t head, uintptr_t len)
 {
 	struct syscall_args32 s = {
-		.nr	= __NR32_get_robust_list,
-		.arg0	= pid,
-		.arg1	= (uint32_t)head,
-		.arg2	= (uint32_t)len,
+		.nr = __NR32_get_robust_list,
+		.arg0 = pid,
+		.arg1 = (uint32_t)head,
+		.arg2 = (uint32_t)len,
 	};
 
 	return do_full_int80(&s);
@@ -603,9 +610,9 @@ static int get_robust_list32(pid_t pid, uintptr_t head, uintptr_t len)
 static int set_robust_list32(uint32_t head, uint32_t len)
 {
 	struct syscall_args32 s = {
-		.nr	= __NR32_set_robust_list,
-		.arg0	= head,
-		.arg1	= len,
+		.nr = __NR32_set_robust_list,
+		.arg0 = head,
+		.arg1 = len,
 	};
 
 	return do_full_int80(&s);
@@ -625,19 +632,18 @@ int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info)
 	if (ret == -ENOSYS) {
 		/* Check native get_task_futex_robust_list() for details. */
 		if (set_robust_list32(0, 0) == (uint32_t)-ENOSYS) {
-			info->futex_rla		= 0;
-			info->futex_rla_len	= 0;
+			info->futex_rla = 0;
+			info->futex_rla_len = 0;
 			ret = 0;
 		}
 	} else if (ret == 0) {
-		uint32_t *arg1		= (uint32_t*)mmap32;
+		uint32_t *arg1 = (uint32_t *)mmap32;
 
-		info->futex_rla		= *arg1;
-		info->futex_rla_len	= *(arg1 + 1);
+		info->futex_rla = *arg1;
+		info->futex_rla_len = *(arg1 + 1);
 		ret = 0;
 	}
 
-
 	free_compat_syscall_stack(mmap32);
 	return ret;
 }
diff --git a/criu/arch/x86/kerndat.c b/criu/arch/x86/kerndat.c
index ac627ac00..a98797d39 100644
--- a/criu/arch/x86/kerndat.c
+++ b/criu/arch/x86/kerndat.c
@@ -58,22 +58,20 @@ int kdat_can_map_vdso(void)
 		return -1;
 
 	return WEXITSTATUS(stat);
-
 }
 
 #ifdef CONFIG_COMPAT
-void *mmap_ia32(void *addr, size_t len, int prot,
-		int flags, int fildes, off_t off)
+void *mmap_ia32(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
 {
 	struct syscall_args32 s;
 
-	s.nr    = __NR32_mmap2;
-	s.arg0  = (uint32_t)(uintptr_t)addr;
-	s.arg1  = (uint32_t)len;
-	s.arg2  = prot;
-	s.arg3  = flags;
-	s.arg4  = fildes;
-	s.arg5  = (uint32_t)off;
+	s.nr = __NR32_mmap2;
+	s.arg0 = (uint32_t)(uintptr_t)addr;
+	s.arg1 = (uint32_t)len;
+	s.arg2 = prot;
+	s.arg3 = flags;
+	s.arg4 = fildes;
+	s.arg5 = (uint32_t)off;
 
 	return (void *)(uintptr_t)do_full_int80(&s);
 }
@@ -101,7 +99,7 @@ static void mmap_bug_test(void)
 	void *map1, *map2;
 	int err;
 
-	map1 = mmap_ia32(0, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+	map1 = mmap_ia32(0, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	/* 32-bit error, not sign-extended - can't use IS_ERR_VALUE() here */
 	err = (uintptr_t)map1 % PAGE_SIZE;
 	if (err) {
@@ -114,7 +112,7 @@ static void mmap_bug_test(void)
 		exit(1);
 	}
 
-	map2 = mmap_ia32(0, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+	map2 = mmap_ia32(0, PAGE_SIZE, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	err = (uintptr_t)map2 % PAGE_SIZE;
 	if (err) {
 		pr_err("ia32 mmap() failed: %d\n", err);
@@ -200,7 +198,7 @@ static int kdat_x86_has_ptrace_fpu_xsave_bug_child(void *arg)
  */
 int kdat_x86_has_ptrace_fpu_xsave_bug(void)
 {
-	user_fpregs_struct_t xsave = { };
+	user_fpregs_struct_t xsave = {};
 	struct iovec iov;
 	char stack[PAGE_SIZE];
 	int flags = CLONE_VM | CLONE_FILES | CLONE_UNTRACED | SIGCHLD;
@@ -212,8 +210,7 @@ int kdat_x86_has_ptrace_fpu_xsave_bug(void)
 	if (!compel_cpu_has_feature(X86_FEATURE_OSXSAVE))
 		return 0;
 
-	child = clone(kdat_x86_has_ptrace_fpu_xsave_bug_child,
-		stack + ARRAY_SIZE(stack), flags, 0);
+	child = clone(kdat_x86_has_ptrace_fpu_xsave_bug_child, stack + ARRAY_SIZE(stack), flags, 0);
 	if (child < 0) {
 		pr_perror("%s(): failed to clone()", __func__);
 		return -1;
diff --git a/criu/arch/x86/restorer.c b/criu/arch/x86/restorer.c
index b2c3b3668..2ceb26fca 100644
--- a/criu/arch/x86/restorer.c
+++ b/criu/arch/x86/restorer.c
@@ -17,8 +17,7 @@ int arch_map_vdso(unsigned long map_at, bool compatible)
 {
 	int vdso_type = compatible ? ARCH_MAP_VDSO_32 : ARCH_MAP_VDSO_64;
 
-	pr_debug("Mapping %s vDSO at %lx\n",
-		compatible ? "compatible" : "native", map_at);
+	pr_debug("Mapping %s vDSO at %lx\n", compatible ? "compatible" : "native", map_at);
 
 	return sys_arch_prctl(vdso_type, map_at);
 }
@@ -49,9 +48,9 @@ int restore_nonsigframe_gpregs(UserX86RegsEntry *r)
 int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 {
 	struct syscall_args32 s = {
-		.nr	= __NR32_set_robust_list,
-		.arg0	= head_ptr,
-		.arg1	= len,
+		.nr = __NR32_set_robust_list,
+		.arg0 = head_ptr,
+		.arg1 = len,
 	};
 
 	return do_full_int80(&s);
@@ -95,18 +94,16 @@ void restore_tls(tls_t *ptls)
 			return;
 
 		memcpy(stack32, desc, sizeof(user_desc_t));
-		asm volatile (
-		"       mov %1,%%eax			\n"
-		"       mov %2,%%ebx			\n"
-		"	int $0x80			\n"
-		"	mov %%eax,%0			\n"
-		: "=g"(ret)
-		: "r"(__NR32_set_thread_area), "r"((uint32_t)(uintptr_t)stack32)
-		: "eax", "ebx", "r8", "r9", "r10", "r11", "memory");
+		asm volatile("       mov %1,%%eax			\n"
+			     "       mov %2,%%ebx			\n"
+			     "	int $0x80			\n"
+			     "	mov %%eax,%0			\n"
+			     : "=g"(ret)
+			     : "r"(__NR32_set_thread_area), "r"((uint32_t)(uintptr_t)stack32)
+			     : "eax", "ebx", "r8", "r9", "r10", "r11", "memory");
 
 		if (ret)
-			pr_err("Failed to restore TLS descriptor %u in GDT: %d\n",
-					desc->entry_number, ret);
+			pr_err("Failed to restore TLS descriptor %u in GDT: %d\n", desc->entry_number, ret);
 	}
 
 	if (stack32)
diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c
index f467da490..f02b2cc0e 100644
--- a/criu/arch/x86/sigaction_compat.c
+++ b/criu/arch/x86/sigaction_compat.c
@@ -5,21 +5,21 @@
 #include <compel/plugins/std/syscall-codes.h>
 
 #ifdef CR_NOGLIBC
-# include <compel/plugins/std/string.h>
+#include <compel/plugins/std/string.h>
 #endif
 #include "cpu.h"
 
-asm (	"	.pushsection .text				\n"
-	"	.global restore_rt_sigaction			\n"
-	"	.code32						\n"
-	"restore_rt_sigaction:					\n"
-	"	mov %edx, %esi					\n"
-	"	mov $0, %edx					\n"
-	"	movl $"__stringify(__NR32_rt_sigaction)",%eax	\n"
-	"	int $0x80					\n"
-	"	ret						\n"
-	"	.popsection					\n"
-	"	.code64");
+asm("	.pushsection .text				\n"
+    "	.global restore_rt_sigaction			\n"
+    "	.code32						\n"
+    "restore_rt_sigaction:					\n"
+    "	mov %edx, %esi					\n"
+    "	mov $0, %edx					\n"
+    "	movl $" __stringify(__NR32_rt_sigaction) ",%eax	\n"
+						 "	int $0x80					\n"
+						 "	ret						\n"
+						 "	.popsection					\n"
+						 "	.code64");
 extern char restore_rt_sigaction;
 
 /*
@@ -42,11 +42,11 @@ int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
 	 * coping it on the bottom of the stack.
 	 */
 	memcpy(stack32, act, sizeof(rt_sigaction_t_compat));
-	arg.nr		= __NR32_rt_sigaction;
-	arg.arg0	= sig;
-	arg.arg1	= (uint32_t)act_stack;			/* act */
-	arg.arg2	= 0;					/* oldact */
-	arg.arg3	= (uint32_t)sizeof(act->rt_sa_mask);	/* sigsetsize */
+	arg.nr = __NR32_rt_sigaction;
+	arg.arg0 = sig;
+	arg.arg1 = (uint32_t)act_stack; /* act */
+	arg.arg2 = 0; /* oldact */
+	arg.arg3 = (uint32_t)sizeof(act->rt_sa_mask); /* sigsetsize */
 
 	return do_full_int80(&arg);
 }
diff --git a/criu/arch/x86/sigframe.c b/criu/arch/x86/sigframe.c
index 33ba14387..4fa7eb3dc 100644
--- a/criu/arch/x86/sigframe.c
+++ b/criu/arch/x86/sigframe.c
@@ -6,34 +6,28 @@
 
 #include "log.h"
 
-int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
-		struct rt_sigframe *rsigframe)
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
 {
 	/*
 	 * Use local sigframe to check native/compat type,
 	 * but set address for rsigframe.
 	 */
-	fpu_state_t *fpu_state = (sigframe->is_native) ?
-		&rsigframe->native.fpu_state :
-		&rsigframe->compat.fpu_state;
+	fpu_state_t *fpu_state = (sigframe->is_native) ? &rsigframe->native.fpu_state : &rsigframe->compat.fpu_state;
 
 	if (sigframe->is_native) {
 		unsigned long addr = (unsigned long)(void *)&fpu_state->fpu_state_64.xsave;
 
 		if ((addr % 64ul)) {
-			pr_err("Unaligned address passed: %lx (native %d)\n",
-			       addr, sigframe->is_native);
+			pr_err("Unaligned address passed: %lx (native %d)\n", addr, sigframe->is_native);
 			return -1;
 		}
 
 		sigframe->native.uc.uc_mcontext.fpstate = (uint64_t)addr;
 	} else if (!sigframe->is_native) {
 		unsigned long addr = (unsigned long)(void *)&fpu_state->fpu_state_ia32.xsave;
-		sigframe->compat.uc.uc_mcontext.fpstate =
-			(uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;
+		sigframe->compat.uc.uc_mcontext.fpstate = (uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;
 		if ((addr % 64ul)) {
-			pr_err("Unaligned address passed: %lx (native %d)\n",
-			       addr, sigframe->is_native);
+			pr_err("Unaligned address passed: %lx (native %d)\n", addr, sigframe->is_native);
 			return -1;
 		}
 	}
diff --git a/criu/arch/x86/sys-exec-tbl.c b/criu/arch/x86/sys-exec-tbl.c
index 225b8a153..cd7cda47c 100644
--- a/criu/arch/x86/sys-exec-tbl.c
+++ b/criu/arch/x86/sys-exec-tbl.c
@@ -1,20 +1,19 @@
 
 static struct syscall_exec_desc sc_exec_table_64[] = {
 #include "sys-exec-tbl-64.c"
-	{ }, /* terminator */
+	{}, /* terminator */
 };
 
 #ifdef CONFIG_COMPAT
 static struct syscall_exec_desc sc_exec_table_32[] = {
 #include "sys-exec-tbl-32.c"
-	{ }, /* terminator */
+	{}, /* terminator */
 };
 #endif
 
 struct syscall_exec_desc;
 
-static inline struct syscall_exec_desc *
-find_syscall_table(char *name, struct syscall_exec_desc *tbl)
+static inline struct syscall_exec_desc *find_syscall_table(char *name, struct syscall_exec_desc *tbl)
 {
 	int i;
 
@@ -27,7 +26,7 @@ find_syscall_table(char *name, struct syscall_exec_desc *tbl)
 #define ARCH_HAS_FIND_SYSCALL
 /* overwrite default to search in two tables above */
 #ifdef CONFIG_COMPAT
-struct syscall_exec_desc * find_syscall(char *name, struct parasite_ctl *ctl)
+struct syscall_exec_desc *find_syscall(char *name, struct parasite_ctl *ctl)
 {
 	if (compel_mode_native(ctl))
 		return find_syscall_table(name, sc_exec_table_64);
@@ -35,8 +34,7 @@ struct syscall_exec_desc * find_syscall(char *name, struct parasite_ctl *ctl)
 		return find_syscall_table(name, sc_exec_table_32);
 }
 #else
-struct syscall_exec_desc *
-find_syscall(char *name, __always_unused struct parasite_ctl *ctl)
+struct syscall_exec_desc *find_syscall(char *name, __always_unused struct parasite_ctl *ctl)
 {
 	return find_syscall_table(name, sc_exec_table_64);
 }
diff --git a/criu/arch/x86/vdso-pie.c b/criu/arch/x86/vdso-pie.c
index 988cf0869..6b4b82b02 100644
--- a/criu/arch/x86/vdso-pie.c
+++ b/criu/arch/x86/vdso-pie.c
@@ -9,22 +9,22 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
 static void insert_trampoline32(uintptr_t from, uintptr_t to)
 {
 	struct {
-		u8	movl;
-		u32	imm32;
-		u16	jmp_eax;
-		u32	guards;
+		u8 movl;
+		u32 imm32;
+		u16 jmp_eax;
+		u32 guards;
 	} __packed jmp = {
-		.movl		= 0xb8,
-		.imm32		= (uint32_t)to,
-		.jmp_eax	= 0xe0ff,
-		.guards		= 0xcccccccc,
+		.movl = 0xb8,
+		.imm32 = (uint32_t)to,
+		.jmp_eax = 0xe0ff,
+		.guards = 0xcccccccc,
 	};
 
 	memcpy((void *)from, &jmp, sizeof(jmp));
@@ -33,23 +33,22 @@ static void insert_trampoline32(uintptr_t from, uintptr_t to)
 static void insert_trampoline64(uintptr_t from, uintptr_t to)
 {
 	struct {
-		u16	movabs;
-		u64	imm64;
-		u16	jmp_rax;
-		u32	guards;
+		u16 movabs;
+		u64 imm64;
+		u16 jmp_rax;
+		u32 guards;
 	} __packed jmp = {
-		.movabs		= 0xb848,
-		.imm64		= to,
-		.jmp_rax	= 0xe0ff,
-		.guards		= 0xcccccccc,
+		.movabs = 0xb848,
+		.imm64 = to,
+		.jmp_rax = 0xe0ff,
+		.guards = 0xcccccccc,
 	};
 
 	memcpy((void *)from, &jmp, sizeof(jmp));
 }
 
-int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *sto, struct vdso_symtable *sfrom,
-			bool compat_vdso)
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *sto,
+			struct vdso_symtable *sfrom, bool compat_vdso)
 {
 	unsigned int i;
 
@@ -59,9 +58,8 @@ int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
 		if (vdso_symbol_empty(&sfrom->symbols[i]))
 			continue;
 
-		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n",
-			 base_from, sfrom->symbols[i].offset,
-			 base_to, sto->symbols[i].offset, i);
+		pr_debug("jmp: %lx/%lx -> %lx/%lx (index %d)\n", base_from, sfrom->symbols[i].offset, base_to,
+			 sto->symbols[i].offset, i);
 
 		from = base_from + sfrom->symbols[i].offset;
 		to = base_to + sto->symbols[i].offset;
diff --git a/criu/autofs.c b/criu/autofs.c
index 8b25308d9..046d51d48 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -18,13 +18,13 @@
 
 #include "images/autofs.pb-c.h"
 
-#define AUTOFS_OPT_UNKNOWN	INT_MIN
+#define AUTOFS_OPT_UNKNOWN INT_MIN
 
-#define AUTOFS_MODE_DIRECT	0
-#define AUTOFS_MODE_INDIRECT	1
-#define AUTOFS_MODE_OFFSET	2
+#define AUTOFS_MODE_DIRECT   0
+#define AUTOFS_MODE_INDIRECT 1
+#define AUTOFS_MODE_OFFSET   2
 
-#define AUTOFS_CATATONIC_FD	-1
+#define AUTOFS_CATATONIC_FD -1
 
 static int autofs_mnt_open(const char *mnt_path, dev_t devid);
 
@@ -111,8 +111,7 @@ free:
 	return ret;
 }
 
-static int autofs_check_fd_stat(struct stat *stat, int prgp, int fd,
-				long ino, int *mode)
+static int autofs_check_fd_stat(struct stat *stat, int prgp, int fd, long ino, int *mode)
 {
 	struct fdinfo_common fdinfo;
 
@@ -209,13 +208,15 @@ static int autofs_find_read_fd(int pgrp, long pipe_ino)
 	/* We need to find read end and make sure, that it's empty */
 	if (autofs_find_pipe_read_end(pgrp, pipe_ino, &read_fd) < 0) {
 		pr_err("Failed to find read pipe fd (ino %ld) "
-			"in process %d\n", pipe_ino, pgrp);
+		       "in process %d\n",
+		       pipe_ino, pgrp);
 		return -1;
 	}
 
 	if (read_fd == -1) {
 		pr_err("Master %d doesn't have a read end of the pipe with "
-			"inode %ld opened\n", pgrp, pipe_ino);
+		       "inode %ld opened\n",
+		       pgrp, pipe_ino);
 		pr_err("Abandoned mount or control was delegated to child?\n");
 		return -ENOENT;
 	}
@@ -226,8 +227,7 @@ static int autofs_find_read_fd(int pgrp, long pipe_ino)
 		return -1;
 
 	if (fd_has_data(fd)) {
-		pr_err("Process %d autofs pipe fd %d is not empty.\n", pgrp,
-				read_fd);
+		pr_err("Process %d autofs pipe fd %d is not empty.\n", pgrp, read_fd);
 		pr_err("Try again later.\n");
 		return -1;
 	}
@@ -348,7 +348,7 @@ static int autofs_revisit_options(struct mount_info *pm)
 		char *token;
 
 		/* Removing '/n' */
-		str[strlen(str)-1] = '\0';
+		str[strlen(str) - 1] = '\0';
 
 		while ((token = strsep(&str, " ")) != NULL) {
 			if (mnt_id == -1) {
@@ -427,16 +427,15 @@ static int access_autofs_mount(struct mount_info *pm)
 
 	pid = fork();
 	switch (pid) {
-		case -1:
-			pr_err("failed to fork\n");
-			goto close_autofs_mnt;
-		case 0:
-			/* We don't care about results.
+	case -1:
+		pr_err("failed to fork\n");
+		goto close_autofs_mnt;
+	case 0:
+		/* We don't care about results.
 			 * All we need is to "touch" */
-			/* coverity[check_return] */
-			openat(autofs_mnt, mnt_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY);
-			_exit(0);
-
+		/* coverity[check_return] */
+		openat(autofs_mnt, mnt_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY);
+		_exit(0);
 	}
 	/* Here we also don't care about results */
 	waitpid(pid, &status, 0);
@@ -499,24 +498,21 @@ static int autofs_create_entry(struct mount_info *pm, AutofsEntry *entry)
 			 * options, then we can read them again and dump it.
 			 */
 			if (access_autofs_mount(pm)) {
-				pr_err("failed to access autofs %s\n",
-						pm->mountpoint + 1);
+				pr_err("failed to access autofs %s\n", pm->mountpoint + 1);
 				return -1;
 			}
 			if (parse_options(pm->options, entry, &pipe_ino))
 				return -1;
 			if (entry->fd == AUTOFS_CATATONIC_FD)
 				return 0;
-			pr_err("Autofs %d is alive, but unreachable.\n",
-					pm->mnt_id);
+			pr_err("Autofs %d is alive, but unreachable.\n", pm->mnt_id);
 			return -1;
 		}
 
 		/* Let' check whether write end is still open */
 		found = autofs_kernel_pipe_alive(entry->pgrp, entry->fd, pipe_ino);
 		if (found < 0) {
-			pr_err("Failed to check fd %d in process %d\n",
-					entry->fd, entry->pgrp);
+			pr_err("Failed to check fd %d in process %d\n", entry->fd, entry->pgrp);
 			return -1;
 		}
 		/* Write end is absent. we need to carry read end to restore. */
@@ -528,8 +524,7 @@ static int autofs_create_entry(struct mount_info *pm, AutofsEntry *entry)
 		/* We need to get virtual pgrp to restore mount */
 		virt_pgrp = pid_to_virt(entry->pgrp);
 		if (!virt_pgrp) {
-			pr_err("failed to find pstree item with pid %d\n",
-					entry->pgrp);
+			pr_err("failed to find pstree item with pid %d\n", entry->pgrp);
 			pr_err("Non-catatonic mount without master?\n");
 			return -1;
 		}
@@ -551,7 +546,6 @@ static int autofs_dump_entry(struct mount_info *pm, AutofsEntry *entry)
 	return ret;
 }
 
-
 int autofs_dump(struct mount_info *pm)
 {
 	AutofsEntry *entry;
@@ -582,8 +576,7 @@ typedef struct autofs_info_s {
 	struct pprep_head ph;
 } autofs_info_t;
 
-static int dup_pipe_info(struct pipe_info *pi, int flags,
-			 struct file_desc_ops *ops)
+static int dup_pipe_info(struct pipe_info *pi, int flags, struct file_desc_ops *ops)
 {
 	struct pipe_info *new;
 	PipeEntry *pe;
@@ -609,9 +602,7 @@ static int dup_pipe_info(struct pipe_info *pi, int flags,
 	return 0;
 }
 
-static int autofs_dup_pipe(struct pstree_item *task,
-			   struct fdinfo_list_entry *ple,
-			   int new_fd)
+static int autofs_dup_pipe(struct pstree_item *task, struct fdinfo_list_entry *ple, int new_fd)
 {
 	struct pipe_info *pi = container_of(ple->desc, struct pipe_info, d);
 	unsigned flags = O_WRONLY;
@@ -619,23 +610,19 @@ static int autofs_dup_pipe(struct pstree_item *task,
 	new_fd = find_unused_fd(task, new_fd);
 
 	if (dup_pipe_info(pi, flags, pi->d.ops) < 0) {
-		pr_err("Failed to dup pipe entry ID %#x PIPE_ID %#x\n",
-				pi->pe->id, pi->pe->pipe_id);
+		pr_err("Failed to dup pipe entry ID %#x PIPE_ID %#x\n", pi->pe->id, pi->pe->pipe_id);
 		return -1;
 	}
 
 	if (dup_fle(task, ple, new_fd, flags) < 0) {
-		pr_err("Failed to add fd %d to process %d\n",
-				new_fd, vpid(task));
+		pr_err("Failed to add fd %d to process %d\n", new_fd, vpid(task));
 		return -1;
 	}
 
-	pr_info("autofs: added pipe fd %d, flags %#x to %d\n",
-			new_fd, flags, vpid(task));
+	pr_info("autofs: added pipe fd %d, flags %#x to %d\n", new_fd, flags, vpid(task));
 	return new_fd;
 }
 
-
 static int autofs_ioctl(const char *path, int fd, int cmd, const void *param)
 {
 	int err;
@@ -649,7 +636,7 @@ static int autofs_ioctl(const char *path, int fd, int cmd, const void *param)
 
 static int autofs_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)
 {
-	char *path = "/dev/"AUTOFS_DEVICE_NAME;
+	char *path = "/dev/" AUTOFS_DEVICE_NAME;
 	int fd, err;
 
 	fd = open(path, O_RDONLY);
@@ -670,8 +657,7 @@ static int autofs_mnt_make_catatonic(const char *mnt_path, int mnt_fd)
 	return autofs_ioctl(mnt_path, mnt_fd, AUTOFS_IOC_CATATONIC, NULL);
 }
 
-static int autofs_mnt_set_timeout(time_t timeout,
-				  const char *mnt_path, int mnt_fd)
+static int autofs_mnt_set_timeout(time_t timeout, const char *mnt_path, int mnt_fd)
 {
 	pr_info("%s: set timeout %ld for %s\n", __func__, timeout, mnt_path);
 	return autofs_ioctl(mnt_path, mnt_fd, AUTOFS_IOC_SETTIMEOUT, &timeout);
@@ -685,8 +671,7 @@ static int autofs_mnt_set_pipefd(const autofs_info_t *i, int mnt_fd)
 	if (i->entry->fd == AUTOFS_CATATONIC_FD)
 		return 0;
 
-	pr_info("%s: set pipe fd %d (pgrp %d) for mount %s\n", __func__,
-			i->entry->fd, getpgrp(), i->mnt_path);
+	pr_info("%s: set pipe fd %d (pgrp %d) for mount %s\n", __func__, i->entry->fd, getpgrp(), i->mnt_path);
 
 	init_autofs_dev_ioctl(&param);
 	param.ioctlfd = mnt_fd;
@@ -699,8 +684,7 @@ static int autofs_mnt_close(const char *mnt_path, int mnt_fd)
 {
 	struct autofs_dev_ioctl param;
 
-	pr_info("%s: closing fd %d for mount %s\n", __func__, mnt_fd,
-			mnt_path);
+	pr_info("%s: closing fd %d for mount %s\n", __func__, mnt_fd, mnt_path);
 
 	init_autofs_dev_ioctl(&param);
 	param.ioctlfd = mnt_fd;
@@ -730,8 +714,7 @@ static int autofs_mnt_open(const char *mnt_path, dev_t devid)
 	fd = param->ioctlfd;
 	free(param);
 	if (err < 0) {
-		pr_err("Failed to get %s fd (devid: %ld)\n",
-				mnt_path, (long)devid);
+		pr_err("Failed to get %s fd (devid: %ld)\n", mnt_path, (long)devid);
 		return -1;
 	}
 	return fd;
@@ -746,8 +729,7 @@ static int autofs_create_dentries(const struct mount_info *mi, char *mnt_path)
 
 		basename = strrchr(c->mountpoint, '/');
 		if (!basename) {
-			pr_info("%s: mount path \"%s\" doesn't have '/'\n",
-					__func__, c->mountpoint);
+			pr_info("%s: mount path \"%s\" doesn't have '/'\n", __func__, c->mountpoint);
 			return -1;
 		}
 		path = xsprintf("%s%s", mnt_path, basename);
@@ -763,8 +745,7 @@ static int autofs_create_dentries(const struct mount_info *mi, char *mnt_path)
 	return 0;
 }
 
-static int autofs_populate_mount(const struct mount_info *mi,
-				 const AutofsEntry *entry)
+static int autofs_populate_mount(const struct mount_info *mi, const AutofsEntry *entry)
 {
 	if (entry->mode != AUTOFS_MODE_INDIRECT)
 		return 0;
@@ -772,13 +753,11 @@ static int autofs_populate_mount(const struct mount_info *mi,
 	return autofs_create_dentries(mi, mi->mountpoint);
 }
 
-static int autofs_post_mount(const char *mnt_path, dev_t mnt_dev,
-			     time_t timeout)
+static int autofs_post_mount(const char *mnt_path, dev_t mnt_dev, time_t timeout)
 {
 	int mnt_fd;
 
-	pr_info("%s: set timeout for %s and make it catatonic\n",
-			__func__, mnt_path);
+	pr_info("%s: set timeout for %s and make it catatonic\n", __func__, mnt_path);
 
 	mnt_fd = autofs_mnt_open(mnt_path, mnt_dev);
 	if (mnt_fd < 0) {
@@ -787,8 +766,7 @@ static int autofs_post_mount(const char *mnt_path, dev_t mnt_dev,
 	}
 
 	if (autofs_mnt_set_timeout(timeout, mnt_path, mnt_fd)) {
-		pr_err("Failed to set timeout %ld for %s\n",
-				timeout, mnt_path);
+		pr_err("Failed to set timeout %ld for %s\n", timeout, mnt_path);
 		return -1;
 	}
 
@@ -830,23 +808,19 @@ static int autofs_post_open(struct file_desc *d, int fd)
 		return -1;
 	}
 
-	pr_info("autofs mount %s owner restored: pgrp=%d, fd=%d\n",
-			i->mnt_path, getpgrp(), i->entry->fd);
+	pr_info("autofs mount %s owner restored: pgrp=%d, fd=%d\n", i->mnt_path, getpgrp(), i->entry->fd);
 
 	if (i->entry->has_read_fd) {
-		pr_info("%s: pid %d, closing write end %d\n", __func__,
-				getpid(), i->entry->fd);
+		pr_info("%s: pid %d, closing write end %d\n", __func__, getpid(), i->entry->fd);
 		close(i->entry->fd);
 	}
 
-	pr_info("%s: pid %d, closing artificial pipe end %d\n", __func__,
-					getpid(), fd);
+	pr_info("%s: pid %d, closing artificial pipe end %d\n", __func__, getpid(), fd);
 	close(fd);
 	return 0;
 }
 
-static autofs_info_t *autofs_create_info(const struct mount_info *mi,
-					 const struct file_desc *desc,
+static autofs_info_t *autofs_create_info(const struct mount_info *mi, const struct file_desc *desc,
 					 const autofs_info_t *info)
 {
 	autofs_info_t *i;
@@ -876,8 +850,7 @@ static autofs_info_t *autofs_create_info(const struct mount_info *mi,
 	return i;
 }
 
-static struct fdinfo_list_entry *autofs_pipe_le(struct pstree_item *master,
-						AutofsEntry *entry)
+static struct fdinfo_list_entry *autofs_pipe_le(struct pstree_item *master, AutofsEntry *entry)
 {
 	struct fdinfo_list_entry *ple;
 	int pipe_fd = entry->fd;
@@ -887,13 +860,11 @@ static struct fdinfo_list_entry *autofs_pipe_le(struct pstree_item *master,
 
 	ple = find_used_fd(master, pipe_fd);
 	if (!ple) {
-		pr_err("Failed to find pipe fd %d in process %d\n",
-				pipe_fd, vpid(master));
+		pr_err("Failed to find pipe fd %d in process %d\n", pipe_fd, vpid(master));
 		return NULL;
 	}
 	if (ple->fe->type != FD_TYPES__PIPE) {
-		pr_err("Fd %d in process %d is not a pipe: %d\n", pipe_fd,
-				vpid(master), ple->fe->type);
+		pr_err("Fd %d in process %d is not a pipe: %d\n", pipe_fd, vpid(master), ple->fe->type);
 		return NULL;
 	}
 	return ple;
@@ -915,8 +886,7 @@ static int autofs_open_pipefd(struct file_desc *d, int *new_fd)
 	return autofs_post_open(d, fle->fe->fd);
 }
 
-static int autofs_create_pipe(struct pstree_item *task, autofs_info_t *i,
-			      struct fdinfo_list_entry *ple)
+static int autofs_create_pipe(struct pstree_item *task, autofs_info_t *i, struct fdinfo_list_entry *ple)
 {
 	struct pipe_info *pi = container_of(ple->desc, struct pipe_info, d);
 	int fd = -1;
@@ -953,8 +923,7 @@ static int autofs_create_pipe(struct pstree_item *task, autofs_info_t *i,
 		return -1;
 	fe->type = FD_TYPES__AUTOFS_PIPE;
 
-	pr_info("autofs: adding pipe fd %d, flags %#x to %d (with post_open)\n",
-		fe->fd, fe->flags, vpid(task));
+	pr_info("autofs: adding pipe fd %d, flags %#x to %d (with post_open)\n", fe->fd, fe->flags, vpid(task));
 	return collect_fd(vpid(task), fe, rsti(task), false);
 }
 
@@ -985,8 +954,7 @@ static int autofs_add_mount_info(struct pprep_head *ph)
 
 		entry->fd = autofs_dup_pipe(master, ple, entry->fd);
 		if (entry->fd < 0) {
-			pr_err("Failed to find free fd in process %d\n",
-					vpid(master));
+			pr_err("Failed to find free fd in process %d\n", vpid(master));
 			return -1;
 		}
 	}
@@ -1025,8 +993,7 @@ static int autofs_restore_entry(struct mount_info *mi, AutofsEntry **entry)
 	return 0;
 }
 
-int autofs_mount(struct mount_info *mi, const char *source, const
-		 char *filesystemtype, unsigned long mountflags)
+int autofs_mount(struct mount_info *mi, const char *source, const char *filesystemtype, unsigned long mountflags)
 {
 	AutofsEntry *entry;
 	autofs_info_t *info;
@@ -1048,8 +1015,7 @@ int autofs_mount(struct mount_info *mi, const char *source, const
 	if (entry->mode == AUTOFS_MODE_OFFSET)
 		mode = "offset";
 
-	opts = xsprintf("fd=%d,pgrp=%d,minproto=%d,maxproto=%d,%s",
-			control_pipe[1], getpgrp(), entry->minproto,
+	opts = xsprintf("fd=%d,pgrp=%d,minproto=%d,maxproto=%d,%s", control_pipe[1], getpgrp(), entry->minproto,
 			entry->maxproto, mode);
 	if (opts && entry->has_uid)
 		opts = xstrcat(opts, ",uid=%d", entry->uid);
@@ -1060,8 +1026,7 @@ int autofs_mount(struct mount_info *mi, const char *source, const
 		goto close_pipe;
 	}
 
-	pr_info("autofs: mounting to %s with options: \"%s\"\n",
-			mi->mountpoint, opts);
+	pr_info("autofs: mounting to %s with options: \"%s\"\n", mi->mountpoint, opts);
 
 	if (mount(source, mi->mountpoint, filesystemtype, mountflags, opts) < 0) {
 		pr_perror("Failed to mount autofs to %s", mi->mountpoint);
@@ -1118,4 +1083,3 @@ umount:
 		pr_perror("Failed to umount %s", mi->mountpoint);
 	goto close_pipe;
 }
-
diff --git a/criu/bfd.c b/criu/bfd.c
index e0d9ede7a..2c5f5b64a 100644
--- a/criu/bfd.c
+++ b/criu/bfd.c
@@ -16,14 +16,14 @@
 #include "xmalloc.h"
 #include "page.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "bfd: "
 
 /*
  * Kernel doesn't produce more than one page of
  * date per one read call on proc files.
  */
-#define BUFSIZE	(PAGE_SIZE)
+#define BUFSIZE (PAGE_SIZE)
 
 struct bfd_buf {
 	char *mem;
@@ -32,7 +32,7 @@ struct bfd_buf {
 
 static LIST_HEAD(bufs);
 
-#define BUFBATCH	(16)
+#define BUFBATCH (16)
 
 static int buf_get(struct xbuf *xb)
 {
@@ -42,8 +42,7 @@ static int buf_get(struct xbuf *xb)
 		void *mem;
 		int i;
 
-		mem = mmap(NULL, BUFBATCH * BUFSIZE, PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+		mem = mmap(NULL, BUFBATCH * BUFSIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 		if (mem == MAP_FAILED) {
 			pr_perror("No buf");
 			return -1;
diff --git a/criu/bitmap.c b/criu/bitmap.c
index a28a89d8d..d81c93409 100644
--- a/criu/bitmap.c
+++ b/criu/bitmap.c
@@ -1,17 +1,12 @@
 #include "common/bitsperlong.h"
 
-#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
+#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
 
 #define BITMAP_FIRST_WORD_MASK(start) (~0ul << ((start) % BITS_PER_LONG))
 
-#define BITMAP_LAST_WORD_MASK(nbits)					\
-(									\
-	((nbits) % BITS_PER_LONG) ?					\
-		(1ul << ((nbits) % BITS_PER_LONG)) - 1 : ~0ul		\
-)
+#define BITMAP_LAST_WORD_MASK(nbits) (((nbits) % BITS_PER_LONG) ? (1ul << ((nbits) % BITS_PER_LONG)) - 1 : ~0ul)
 
-#define small_const_nbits(nbits)					\
-	(__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
+#define small_const_nbits(nbits) (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
 
 void bitmap_set(unsigned long *map, int start, int nr)
 {
diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index 9a133f8bc..55b381c18 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -19,8 +19,8 @@ int is_bpfmap_link(char *link)
 
 static void pr_info_bpfmap(char *action, BpfmapFileEntry *bpf)
 {
-	pr_info("%sbpfmap: id %#08x map_id %#08x map_type %d flags %"PRIx32"\n",
-		action, bpf->id, bpf->map_id, bpf->map_type, bpf->map_flags);
+	pr_info("%sbpfmap: id %#08x map_id %#08x map_type %d flags %" PRIx32 "\n", action, bpf->id, bpf->map_id,
+		bpf->map_type, bpf->map_flags);
 }
 
 struct bpfmap_data_rst *bpfmap_data_hash_table[BPFMAP_DATA_TABLE_SIZE];
@@ -31,8 +31,7 @@ static int bpfmap_data_read(struct cr_img *img, struct bpfmap_data_rst *r)
 	if (!bytes)
 		return 0;
 
-	r->data = mmap(NULL, bytes, PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	r->data = mmap(NULL, bytes, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (r->data == MAP_FAILED) {
 		pr_perror("Can't map mem for bpfmap buffers");
 		return -1;
@@ -41,8 +40,8 @@ static int bpfmap_data_read(struct cr_img *img, struct bpfmap_data_rst *r)
 	return read_img_buf(img, r->data, bytes);
 }
 
-int do_collect_bpfmap_data(struct bpfmap_data_rst *r, ProtobufCMessage *msg,
-		struct cr_img *img, struct bpfmap_data_rst **bpf_hash_table)
+int do_collect_bpfmap_data(struct bpfmap_data_rst *r, ProtobufCMessage *msg, struct cr_img *img,
+			   struct bpfmap_data_rst **bpf_hash_table)
 {
 	int ret;
 	int table_index;
@@ -67,14 +66,9 @@ int restore_bpfmap_data(int map_fd, uint32_t map_id, struct bpfmap_data_rst **bp
 	void *keys = NULL;
 	void *values = NULL;
 	unsigned int count;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
-		.elem_flags = 0,
-		.flags = 0,
-	);
-
-	for (map_data = bpf_hash_table[map_id & BPFMAP_DATA_HASH_MASK]; map_data != NULL;
-		map_data = map_data->next) {
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
 
+	for (map_data = bpf_hash_table[map_id & BPFMAP_DATA_HASH_MASK]; map_data != NULL; map_data = map_data->next) {
 		if (map_data->bde->map_id == map_id)
 			break;
 	}
@@ -87,16 +81,14 @@ int restore_bpfmap_data(int map_fd, uint32_t map_id, struct bpfmap_data_rst **bp
 	bde = map_data->bde;
 	count = bde->count;
 
-	keys = mmap(NULL, bde->keys_bytes, PROT_READ | PROT_WRITE,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	keys = mmap(NULL, bde->keys_bytes, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (keys == MAP_FAILED) {
 		pr_perror("Can't map memory for BPF map keys");
 		goto err;
 	}
 	memcpy(keys, map_data->data, bde->keys_bytes);
 
-	values = mmap(NULL, bde->values_bytes, PROT_READ | PROT_WRITE,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	values = mmap(NULL, bde->values_bytes, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (values == MAP_FAILED) {
 		pr_perror("Can't map memory for BPF map values");
 		goto err;
@@ -157,10 +149,7 @@ int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p
 	void *keys = NULL, *values = NULL;
 	void *in_batch = NULL, *out_batch = NULL;
 	BpfmapDataEntry bde = BPFMAP_DATA_ENTRY__INIT;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
-		.elem_flags = 0,
-		.flags = 0,
-	);
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
 	int ret;
 
 	key_size = bpf->key_size;
@@ -168,22 +157,19 @@ int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p
 	max_entries = bpf->max_entries;
 	count = max_entries;
 
-	keys = mmap(NULL, key_size * max_entries, PROT_READ | PROT_WRITE,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	keys = mmap(NULL, key_size * max_entries, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (keys == MAP_FAILED) {
 		pr_perror("Can't map memory for BPF map keys");
 		goto err;
 	}
 
-	values = mmap(NULL, value_size * max_entries, PROT_READ | PROT_WRITE,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	values = mmap(NULL, value_size * max_entries, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (values == MAP_FAILED) {
 		pr_perror("Can't map memory for BPF map values");
 		goto err;
 	}
 
-	out_batch = mmap(NULL, key_size, PROT_READ | PROT_WRITE,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	out_batch = mmap(NULL, key_size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (out_batch == MAP_FAILED) {
 		pr_perror("Can't map memory for BPF map out_batch");
 		goto err;
@@ -244,38 +230,36 @@ static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 	}
 
 	switch (bpf.map_type) {
+	case BPF_MAP_TYPE_HASH:
+	case BPF_MAP_TYPE_ARRAY:
+		bpf.id = id;
+		bpf.flags = p->flags;
+		bpf.fown = (FownEntry *)&p->fown;
+		bpf.map_name = xstrdup(map_info.name);
+		bpf.ifindex = map_info.ifindex;
 
-		case BPF_MAP_TYPE_HASH:
-		case BPF_MAP_TYPE_ARRAY:
-			bpf.id = id;
-			bpf.flags = p->flags;
-			bpf.fown = (FownEntry *)&p->fown;
-			bpf.map_name = xstrdup(map_info.name);
-			bpf.ifindex = map_info.ifindex;
+		fe.type = FD_TYPES__BPFMAP;
+		fe.id = bpf.id;
+		fe.bpf = &bpf;
 
-			fe.type = FD_TYPES__BPFMAP;
-			fe.id = bpf.id;
-			fe.bpf = &bpf;
+		pr_info_bpfmap("Dumping ", &bpf);
+		if (pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE))
+			return -1;
+		pr_info_bpfmap("Dumping data for ", &bpf);
+		ret = dump_one_bpfmap_data(&bpf, lfd, p);
+		break;
 
-			pr_info_bpfmap("Dumping ", &bpf);
-			if (pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE))
-				return -1;
-			pr_info_bpfmap("Dumping data for ", &bpf);
-			ret = dump_one_bpfmap_data(&bpf, lfd, p);
-			break;
-
-		default:
-			pr_err("CRIU does not currently support dumping BPF map type %u!\n", bpf.map_type);
-			ret = -1;
+	default:
+		pr_err("CRIU does not currently support dumping BPF map type %u!\n", bpf.map_type);
+		ret = -1;
 	}
 
 	return ret;
-
 }
 
 const struct fdtype_ops bpfmap_dump_ops = {
-	.type		= FD_TYPES__BPFMAP,
-	.dump		= dump_one_bpfmap,
+	.type = FD_TYPES__BPFMAP,
+	.dump = dump_one_bpfmap,
 };
 
 static int bpfmap_open(struct file_desc *d, int *new_fd)
diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c
index 2f628f4ee..5bed7dd9d 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -20,7 +20,7 @@
 #include "log.h"
 #include "common/bug.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "cg-prop: "
 
 enum {
@@ -36,14 +36,14 @@ static const char *____criu_global_props____[] = {
 };
 
 cgp_t cgp_global = {
-	.name		= "____criu_global_props____",
-	.nr_props	= ARRAY_SIZE(____criu_global_props____),
-	.props		= ____criu_global_props____,
+	.name = "____criu_global_props____",
+	.nr_props = ARRAY_SIZE(____criu_global_props____),
+	.props = ____criu_global_props____,
 };
 
 typedef struct {
-	struct list_head	list;
-	cgp_t			cgp;
+	struct list_head list;
+	cgp_t cgp;
 } cgp_list_entry_t;
 
 static LIST_HEAD(cgp_list);
@@ -91,9 +91,7 @@ static int cgp_handle_props(cgp_list_entry_t **p, int strategy)
 		if (strcmp(t->cgp.name, s->cgp.name))
 			continue;
 
-		pr_debug("%s \"%s\" controller properties\n",
-			 strategy == CGP_MERGE ?
-			 "Merging" : "Replacing",
+		pr_debug("%s \"%s\" controller properties\n", strategy == CGP_MERGE ? "Merging" : "Replacing",
 			 s->cgp.name);
 
 		if (strategy == CGP_MERGE) {
@@ -258,21 +256,18 @@ static int cgp_parse_stream(char *stream, size_t len)
 		}
 
 		if (!eat_symbols(&stream, &len, ":\n - ", 5, true)) {
-			pr_err("Expected \':\\n - \' sequence controller's %s stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected \':\\n - \' sequence controller's %s stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		}
 
 		if (!eat_word(&stream, &len, "\"strategy\":", 11, true)) {
-			pr_err("Expected \'strategy:\' keyword in controller's %s stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected \'strategy:\' keyword in controller's %s stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		}
 
 		p = get_quoted(&stream, &len, true);
 		if (!p) {
-			pr_err("Expected strategy in controller's %s stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected strategy in controller's %s stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		};
 
@@ -281,8 +276,7 @@ static int cgp_parse_stream(char *stream, size_t len)
 		} else if (!strcmp(p, "replace")) {
 			strategy = CGP_REPLACE;
 		} else {
-			pr_err("Unknown strategy \"%s\" in controller's %s stream\n",
-			       p, cgp_entry->cgp.name);
+			pr_err("Unknown strategy \"%s\" in controller's %s stream\n", p, cgp_entry->cgp.name);
 			xfree(p);
 			goto err_parse;
 		}
@@ -291,34 +285,28 @@ static int cgp_parse_stream(char *stream, size_t len)
 		xfree(p);
 
 		if (!eat_symbols(&stream, &len, "\n - ", 4, true)) {
-			pr_err("Expected \':\\n - \' sequence controller's %s stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected \':\\n - \' sequence controller's %s stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		}
 
 		if (!eat_word(&stream, &len, "\"properties\":", 13, true)) {
-			pr_err("Expected \"properties:\" keyword in controller's %s stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected \"properties:\" keyword in controller's %s stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		}
 
 		if (!eat_symbol(&stream, &len, '[', true)) {
-			pr_err("Expected \'[\' sequence controller's %s properties stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected \'[\' sequence controller's %s properties stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		}
 
 		while ((p = get_quoted(&stream, &len, true))) {
 			if (!p) {
-				pr_err("Expected property name for controller %s\n",
-				       cgp_entry->cgp.name);
+				pr_err("Expected property name for controller %s\n", cgp_entry->cgp.name);
 				goto err_parse;
 			}
 
-			if (xrealloc_safe(&cgp_entry->cgp.props,
-					  (cgp_entry->cgp.nr_props + 1) * sizeof(char *))) {
-				pr_err("Can't allocate property for controller %s\n",
-				       cgp_entry->cgp.name);
+			if (xrealloc_safe(&cgp_entry->cgp.props, (cgp_entry->cgp.nr_props + 1) * sizeof(char *))) {
+				pr_err("Can't allocate property for controller %s\n", cgp_entry->cgp.name);
 				xfree(p);
 				goto err_parse;
 			}
@@ -331,8 +319,7 @@ static int cgp_parse_stream(char *stream, size_t len)
 					stream++, len--;
 					break;
 				}
-				pr_err("Expected ']' in controller's %s stream\n",
-				       cgp_entry->cgp.name);
+				pr_err("Expected ']' in controller's %s stream\n", cgp_entry->cgp.name);
 				goto err_parse;
 			}
 		}
@@ -343,8 +330,7 @@ static int cgp_parse_stream(char *stream, size_t len)
 		}
 
 		if (!eat_symbol(&stream, &len, '\n', true) && len) {
-			pr_err("Expected \'\\n\' symbol in controller's %s stream\n",
-			       cgp_entry->cgp.name);
+			pr_err("Expected \'\\n\' symbol in controller's %s stream\n", cgp_entry->cgp.name);
 			goto err_parse;
 		}
 
@@ -402,96 +388,94 @@ err:
 
 static int cgp_parse_builtins(void)
 {
-	static const char predefined_stream[] =
-		"\"cpu\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"cpu.shares\", "
-				"\"cpu.cfs_period_us\", "
-				"\"cpu.cfs_quota_us\", "
-				"\"cpu.rt_period_us\", "
-				"\"cpu.rt_runtime_us\" "
-			"]\n"
-		/* limit_in_bytes and memsw.limit_in_bytes must be set in this order */
-		"\"memory\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"memory.limit_in_bytes\", "
-				"\"memory.memsw.limit_in_bytes\", "
-				"\"memory.swappiness\", "
-				"\"memory.soft_limit_in_bytes\", "
-				"\"memory.move_charge_at_immigrate\", "
-				"\"memory.oom_control\", "
-				"\"memory.use_hierarchy\", "
-				"\"memory.kmem.limit_in_bytes\", "
-				"\"memory.kmem.tcp.limit_in_bytes\" "
-			"]\n"
-		/*
+	static const char predefined_stream[] = "\"cpu\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"cpu.shares\", "
+						"\"cpu.cfs_period_us\", "
+						"\"cpu.cfs_quota_us\", "
+						"\"cpu.rt_period_us\", "
+						"\"cpu.rt_runtime_us\" "
+						"]\n"
+						/* limit_in_bytes and memsw.limit_in_bytes must be set in this order */
+						"\"memory\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"memory.limit_in_bytes\", "
+						"\"memory.memsw.limit_in_bytes\", "
+						"\"memory.swappiness\", "
+						"\"memory.soft_limit_in_bytes\", "
+						"\"memory.move_charge_at_immigrate\", "
+						"\"memory.oom_control\", "
+						"\"memory.use_hierarchy\", "
+						"\"memory.kmem.limit_in_bytes\", "
+						"\"memory.kmem.tcp.limit_in_bytes\" "
+						"]\n"
+						/*
 		 * cpuset.cpus and cpuset.mems must be set before the process moves
 		 * into its cgroup; they are "initialized" below to whatever the root
 		 * values are in copy_special_cg_props so as not to cause ENOSPC when
 		 * values are restored via this code.
 		 */
-		"\"cpuset\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"cpuset.cpus\", "
-				"\"cpuset.mems\", "
-				"\"cpuset.memory_migrate\", "
-				"\"cpuset.cpu_exclusive\", "
-				"\"cpuset.mem_exclusive\", "
-				"\"cpuset.mem_hardwall\", "
-				"\"cpuset.memory_spread_page\", "
-				"\"cpuset.memory_spread_slab\", "
-				"\"cpuset.sched_load_balance\", "
-				"\"cpuset.sched_relax_domain_level\" "
-			"]\n"
-		"\"blkio\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"blkio.weight\" "
-			"]\n"
-		"\"freezer\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-			"]\n"
-		"\"perf_event\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-			"]\n"
-		"\"net_cls\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"net_cls.classid\" "
-			"]\n"
-		"\"net_prio\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"net_prio.ifpriomap\" "
-			"]\n"
-		"\"pids\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"pids.max\" "
-			"]\n"
-		"\"devices\":\n"
-			" - \"strategy\": \"replace\"\n"
-			" - \"properties\": "
-			"[ "
-				"\"devices.list\" "
-			"]\n";
+						"\"cpuset\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"cpuset.cpus\", "
+						"\"cpuset.mems\", "
+						"\"cpuset.memory_migrate\", "
+						"\"cpuset.cpu_exclusive\", "
+						"\"cpuset.mem_exclusive\", "
+						"\"cpuset.mem_hardwall\", "
+						"\"cpuset.memory_spread_page\", "
+						"\"cpuset.memory_spread_slab\", "
+						"\"cpuset.sched_load_balance\", "
+						"\"cpuset.sched_relax_domain_level\" "
+						"]\n"
+						"\"blkio\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"blkio.weight\" "
+						"]\n"
+						"\"freezer\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"]\n"
+						"\"perf_event\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"]\n"
+						"\"net_cls\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"net_cls.classid\" "
+						"]\n"
+						"\"net_prio\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"net_prio.ifpriomap\" "
+						"]\n"
+						"\"pids\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"pids.max\" "
+						"]\n"
+						"\"devices\":\n"
+						" - \"strategy\": \"replace\"\n"
+						" - \"properties\": "
+						"[ "
+						"\"devices.list\" "
+						"]\n";
 
-	return cgp_parse_stream((void *)predefined_stream,
-				strlen(predefined_stream));
+	return cgp_parse_stream((void *)predefined_stream, strlen(predefined_stream));
 }
 
 int cgp_init(char *stream, size_t len, char *path)
diff --git a/criu/cgroup.c b/criu/cgroup.c
index fa088858f..73461d6a0 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1,4 +1,4 @@
-#define LOG_PREFIX	"cg: "
+#define LOG_PREFIX "cg: "
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
@@ -36,10 +36,10 @@
  */
 
 struct cg_set {
-	u32			id;
-	struct list_head	l;
-	unsigned int 		n_ctls;
-	struct list_head	ctls;
+	u32 id;
+	struct list_head l;
+	unsigned int n_ctls;
+	struct list_head ctls;
 };
 
 static LIST_HEAD(cg_sets);
@@ -66,8 +66,8 @@ static CgSetEntry *find_rst_set_by_id(u32 id)
 	return NULL;
 }
 
-#define CGCMP_MATCH	1	/* check for exact match */
-#define CGCMP_ISSUB	2	/* check set is subset of ctls */
+#define CGCMP_MATCH 1 /* check for exact match */
+#define CGCMP_ISSUB 2 /* check set is subset of ctls */
 
 static bool cg_set_compare(struct cg_set *set, struct list_head *ctls, int what)
 {
@@ -189,8 +189,7 @@ int parse_cg_info(void)
 /* Check that co-mounted controllers from /proc/cgroups (e.g. cpu and cpuacct)
  * are contained in a comma separated string (e.g. from /proc/self/cgroup or
  * mount options). */
-static bool cgroup_contains(char **controllers,
-			unsigned int n_controllers, char *name, u64 *mask)
+static bool cgroup_contains(char **controllers, unsigned int n_controllers, char *name, u64 *mask)
 {
 	unsigned int i;
 	bool all_match = true;
@@ -230,12 +229,12 @@ static bool cgroup_contains(char **controllers,
 
 /* This is for use in add_cgroup() as additional arguments for the ftw()
  * callback */
-static struct cg_controller	*current_controller;
-static unsigned int		path_pref_len;
+static struct cg_controller *current_controller;
+static unsigned int path_pref_len;
 
-#define EXACT_MATCH	0
-#define PARENT_MATCH	1
-#define NO_MATCH	2
+#define EXACT_MATCH  0
+#define PARENT_MATCH 1
+#define NO_MATCH     2
 
 static int find_dir(const char *path, struct list_head *dirs, struct cgroup_dir **rdir)
 {
@@ -253,7 +252,6 @@ static int find_dir(const char *path, struct list_head *dirs, struct cgroup_dir
 				return PARENT_MATCH;
 			}
 			return ret;
-
 		}
 	}
 
@@ -431,8 +429,7 @@ static int dump_cg_props_array(const char *fpath, struct cgroup_dir *ncd, const
 	return 0;
 }
 
-static int add_cgroup_properties(const char *fpath, struct cgroup_dir *ncd,
-				 struct cg_controller *controller)
+static int add_cgroup_properties(const char *fpath, struct cgroup_dir *ncd, struct cg_controller *controller)
 {
 	int i;
 
@@ -527,7 +524,7 @@ static int add_freezer_state(struct cg_controller *controller)
 {
 	struct cgroup_dir *it;
 
-	 /* There is one more case, that cgroup namespaces might
+	/* There is one more case, that cgroup namespaces might
 	  * generate "multiple" heads if nothing is actually in the
 	  * root freezer cgroup, e.g. --freeze-cgroup=/lxc/foo and all
 	  * tasks in either /lxc/foo/a or /lxc/foo/b.
@@ -570,12 +567,11 @@ static int __new_open_cgroupfs(struct cg_ctl *cc)
 	}
 
 	if (strstartswith(cc->name, namestr)) {
-		if (sys_fsconfig(fsfd, FSCONFIG_SET_STRING,
-				 "name", cc->name + strlen(namestr), 0)) {
+		if (sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "name", cc->name + strlen(namestr), 0)) {
 			pr_perror("Unable to configure the cgroup (%s) file system", cc->name);
 			goto err;
 		}
-	} else if (cc->name[0] != 0)  { /* cgroup v1 */
+	} else if (cc->name[0] != 0) { /* cgroup v1 */
 		char *saveptr = NULL, *buf = strdupa(cc->name);
 		name = strtok_r(buf, ",", &saveptr);
 		while (name) {
@@ -723,8 +719,7 @@ static int collect_cgroups(struct list_head *ctls)
 		if (ret < 0)
 			return ret;
 
-		if (opts.freeze_cgroup && !strcmp(cc->name, "freezer") &&
-				add_freezer_state(current_controller))
+		if (opts.freeze_cgroup && !strcmp(cc->name, "freezer") && add_freezer_state(current_controller))
 			return -1;
 	}
 
@@ -776,7 +771,8 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
 						continue;
 
 					if (strlen(stray->path) < root->cgns_prefix) {
-						pr_err("cg %s shorter than path prefix %d?\n", stray->path, root->cgns_prefix);
+						pr_err("cg %s shorter than path prefix %d?\n", stray->path,
+						       root->cgns_prefix);
 						return -1;
 					}
 
@@ -790,8 +786,7 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
 	return 0;
 }
 
-static int dump_cg_dir_props(struct list_head *props, size_t n_props,
-			     CgroupPropEntry ***ents)
+static int dump_cg_dir_props(struct list_head *props, size_t n_props, CgroupPropEntry ***ents)
 {
 	struct cgroup_prop *prop_cur;
 	CgroupPropEntry *cpe;
@@ -876,8 +871,7 @@ static int dump_cg_dirs(struct list_head *dirs, size_t n_dirs, CgroupDirEntry **
 
 		cde->n_properties = cur->n_properties;
 		if (cde->n_properties > 0) {
-			if (dump_cg_dir_props(&cur->properties,
-					      cde->n_properties, &cde->properties) < 0) {
+			if (dump_cg_dir_props(&cur->properties, cde->n_properties, &cde->properties) < 0) {
 				xfree(*ents);
 				return -1;
 			}
@@ -931,7 +925,6 @@ static void free_sets(CgroupEntry *cg, unsigned nr)
 	xfree(cg->sets);
 }
 
-
 static int dump_sets(CgroupEntry *cg)
 {
 	struct cg_set *set;
@@ -1024,8 +1017,7 @@ err:
 	return ret;
 }
 
-static int ctrl_dir_and_opt(CgControllerEntry *ctl, char *dir, int ds,
-		char *opt, int os)
+static int ctrl_dir_and_opt(CgControllerEntry *ctl, char *dir, int ds, char *opt, int os)
 {
 	int i, doff = 0, ooff = 0;
 	bool none_opt = false;
@@ -1062,14 +1054,8 @@ static int ctrl_dir_and_opt(CgControllerEntry *ctl, char *dir, int ds,
  * it. We restore these properties as soon as the cgroup is created.
  */
 static const char *special_props[] = {
-	"cpuset.cpus",
-	"cpuset.mems",
-	"devices.list",
-	"memory.kmem.limit_in_bytes",
-	"memory.swappiness",
-	"memory.oom_control",
-	"memory.use_hierarchy",
-	NULL,
+	"cpuset.cpus",	     "cpuset.mems",	   "devices.list",	   "memory.kmem.limit_in_bytes",
+	"memory.swappiness", "memory.oom_control", "memory.use_hierarchy", NULL,
 };
 
 bool is_special_property(const char *prop)
@@ -1165,7 +1151,6 @@ static int prepare_cgns(CgSetEntry *se)
 
 			do_unshare = true;
 		}
-
 	}
 
 	if (do_unshare && unshare(CLONE_NEWCGROUP) < 0) {
@@ -1294,13 +1279,12 @@ static int restore_perms(int fd, const char *path, CgroupPerms *perms)
 		 * allowed to chmod some cgroup props (e.g. the read only ones), so we
 		 * don't want to try if the perms already match.
 		 */
-		if (sb.st_mode != (mode_t) perms->mode && fchmod(fd, perms->mode) < 0) {
+		if (sb.st_mode != (mode_t)perms->mode && fchmod(fd, perms->mode) < 0) {
 			pr_perror("chmod of %s failed", path);
 			return -1;
 		}
 
-		if ((sb.st_uid != perms->uid || sb.st_gid != perms->gid) &&
-		    fchown(fd, perms->uid, perms->gid)) {
+		if ((sb.st_uid != perms->uid || sb.st_gid != perms->gid) && fchown(fd, perms->uid, perms->gid)) {
 			pr_perror("chown of %s failed", path);
 			return -1;
 		}
@@ -1309,8 +1293,8 @@ static int restore_perms(int fd, const char *path, CgroupPerms *perms)
 	return 0;
 }
 
-static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p,
-		char *path, int off, bool split_lines, bool skip_fails)
+static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *path, int off, bool split_lines,
+			       bool skip_fails)
 {
 	int cg, fd, ret = -1;
 	CgroupPerms *perms = cg_prop_entry_p->perms;
@@ -1358,7 +1342,7 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p,
 					goto out;
 			}
 			line = next_line + 1;
-		} while(*next_line != '\0');
+		} while (*next_line != '\0');
 	} else {
 		size_t len = strlen(cg_prop_entry_p->value);
 
@@ -1389,8 +1373,7 @@ int restore_freezer_state(void)
 		return 0;
 
 	freezer_path_len = strlen(freezer_path);
-	return restore_cgroup_prop(freezer_state_entry, freezer_path,
-			freezer_path_len, false, false);
+	return restore_cgroup_prop(freezer_state_entry, freezer_path, freezer_path_len, false, false);
 }
 
 static void add_freezer_state_for_restore(CgroupPropEntry *entry, char *path, size_t path_len)
@@ -1455,9 +1438,9 @@ static int filter_ifpriomap(char *out, char *line)
 		strncpy(out, line, len + 1);
 		out += len + 1;
 		written = true;
-next:
+	next:
 		line = next_line + 1;
-	} while(*next_line != '\0');
+	} while (*next_line != '\0');
 
 	if (written)
 		*(out - 1) = '\0';
@@ -1486,8 +1469,7 @@ out:
 	return ret;
 }
 
-static int prepare_cgroup_dir_properties(char *path, int off, CgroupDirEntry **ents,
-					 unsigned int n_ents)
+static int prepare_cgroup_dir_properties(char *path, int off, CgroupDirEntry **ents, unsigned int n_ents)
 {
 	unsigned int i, j;
 
@@ -1528,7 +1510,7 @@ static int prepare_cgroup_dir_properties(char *path, int off, CgroupDirEntry **e
 			if (restore_cgroup_prop(p, path, off2, false, false) < 0)
 				return -1;
 		}
-skip:
+	skip:
 		if (prepare_cgroup_dir_properties(path, off2, e->children, e->n_children) < 0)
 			return -1;
 	}
@@ -1655,8 +1637,8 @@ static int prepare_dir_perms(int cg, char *path, CgroupPerms *perms)
 	return ret;
 }
 
-static int prepare_cgroup_dirs(char **controllers, int n_controllers, char *paux, size_t off,
-				CgroupDirEntry **ents, size_t n_ents)
+static int prepare_cgroup_dirs(char **controllers, int n_controllers, char *paux, size_t off, CgroupDirEntry **ents,
+			       size_t n_ents)
 {
 	size_t i, j;
 	CgroupDirEntry *e;
@@ -1689,9 +1671,8 @@ static int prepare_cgroup_dirs(char **controllers, int n_controllers, char *paux
 				return -1;
 
 			for (j = 0; j < n_controllers; j++) {
-				if (!strcmp(controllers[j], "cpuset")
-						|| !strcmp(controllers[j], "memory")
-						|| !strcmp(controllers[j], "devices")) {
+				if (!strcmp(controllers[j], "cpuset") || !strcmp(controllers[j], "memory") ||
+				    !strcmp(controllers[j], "devices")) {
 					if (restore_special_props(paux, off2, e) < 0) {
 						pr_err("Restoring special cpuset props failed!\n");
 						return -1;
@@ -1715,13 +1696,11 @@ static int prepare_cgroup_dirs(char **controllers, int n_controllers, char *paux
 				}
 			}
 
-			if (!(opts.manage_cgroups & CG_MODE_NONE) &&
-			    prepare_dir_perms(cg, paux, e->dir_perms) < 0)
+			if (!(opts.manage_cgroups & CG_MODE_NONE) && prepare_dir_perms(cg, paux, e->dir_perms) < 0)
 				return -1;
 		}
 
-		if (prepare_cgroup_dirs(controllers, n_controllers, paux, off2,
-				e->children, e->n_children) < 0)
+		if (prepare_cgroup_dirs(controllers, n_controllers, paux, off2, e->children, e->n_children) < 0)
 			return -1;
 	}
 
@@ -1754,8 +1733,7 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 	if (!opts.manage_cgroups)
 		return 0;
 
-	pr_info("Preparing cgroups yard (cgroups restore mode %#x)\n",
-		opts.manage_cgroups);
+	pr_info("Preparing cgroups yard (cgroups restore mode %#x)\n", opts.manage_cgroups);
 
 	if (opts.cgroup_yard) {
 		off = sprintf(paux, "%s", opts.cgroup_yard);
@@ -1803,9 +1781,7 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 			return -1;
 		}
 
-		ctl_off += ctrl_dir_and_opt(ctrl,
-				paux + ctl_off, sizeof(paux) - ctl_off,
-				opt, sizeof(opt));
+		ctl_off += ctrl_dir_and_opt(ctrl, paux + ctl_off, sizeof(paux) - ctl_off, opt, sizeof(opt));
 
 		/* Create controller if not yet present */
 		if (access(paux, F_OK)) {
@@ -1831,16 +1807,14 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 		yard = paux + strlen(cg_yard) + 1;
 		yard_off = ctl_off - (strlen(cg_yard) + 1);
 		if (opts.manage_cgroups &&
-		    prepare_cgroup_dirs(ctrl->cnames, ctrl->n_cnames, yard, yard_off,
-				ctrl->dirs, ctrl->n_dirs))
+		    prepare_cgroup_dirs(ctrl->cnames, ctrl->n_cnames, yard, yard_off, ctrl->dirs, ctrl->n_dirs))
 			return -1;
 	}
 
 	return 0;
 }
 
-static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controllers,
-			  char **dir_name, char *newroot)
+static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controllers, char **dir_name, char *newroot)
 {
 	size_t dirlen = strlen(*dir_name);
 	char *dir = *dir_name;
@@ -1877,7 +1851,7 @@ static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controller
 			 * "/" is matching to be renamed.
 			 */
 			if (!(cgroup_contains(controllers, n_controllers, cg->name, NULL) &&
-					strstartswith(cg->path + 1, dir)))
+			      strstartswith(cg->path + 1, dir)))
 				continue;
 
 			if (cg->has_cgns_prefix && cg->cgns_prefix) {
@@ -1905,8 +1879,7 @@ static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controller
 				 * root but make sure the rest of path is
 				 * untouched.
 				 */
-				cg->path = xsprintf("%s%s", newroot,
-						    cg->path + dirlen + 1);
+				cg->path = xsprintf("%s%s", newroot, cg->path + dirlen + 1);
 				if (!cg->path) {
 					cg->path = prev;
 					xfree(dirnew);
@@ -1943,12 +1916,10 @@ static int rewrite_cgroup_roots(CgroupEntry *cge)
 			unsigned old_mask = ctrl_mask;
 
 			/* coverity[check_return] */
-			cgroup_contains(ctrl->cnames, ctrl->n_cnames,
-					o->controller, &ctrl_mask);
+			cgroup_contains(ctrl->cnames, ctrl->n_cnames, o->controller, &ctrl_mask);
 			if (old_mask != ctrl_mask) {
 				if (newroot && strcmp(newroot, o->newroot)) {
-					pr_err("CG paths mismatch: %s %s\n",
-							newroot, o->newroot);
+					pr_err("CG paths mismatch: %s %s\n", newroot, o->newroot);
 					return -1;
 				}
 				newroot = o->newroot;
diff --git a/criu/clone-noasan.c b/criu/clone-noasan.c
index 35c40c21d..d657ea2e8 100644
--- a/criu/clone-noasan.c
+++ b/criu/clone-noasan.c
@@ -46,8 +46,7 @@ int clone_noasan(int (*fn)(void *), int flags, void *arg)
 	return clone(fn, stack_ptr, flags, arg);
 }
 
-int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags,
-			   int exit_signal, pid_t pid)
+int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags, int exit_signal, pid_t pid)
 {
 	struct _clone_args c_args = {};
 
diff --git a/criu/config.c b/criu/config.c
index 4c7fcab0a..4561c3d70 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -131,7 +131,7 @@ int parse_statement(int i, char *line, char **configuration)
 			/* We got "" as value */
 			configuration[i] = xstrdup("");
 			if (unlikely(!configuration[i])) {
-				xfree(configuration[i -1]);
+				xfree(configuration[i - 1]);
 				return -1;
 			}
 			offset = 0;
@@ -152,7 +152,7 @@ int parse_statement(int i, char *line, char **configuration)
 			found_second_quote = true;
 			configuration[i] = xzalloc(quote_offset - offset + 1);
 			if (unlikely(!configuration[i])) {
-				xfree(configuration[i -1]);
+				xfree(configuration[i - 1]);
 				return -1;
 			}
 			memcpy(configuration[i], quote_start, quote_offset - offset);
@@ -185,7 +185,7 @@ int parse_statement(int i, char *line, char **configuration)
 	} else {
 		/* Does not start with a quote. */
 		if (unlikely(asprintf(&configuration[i], "%s", input + offset) == -1)) {
-			xfree(configuration[i -1]);
+			xfree(configuration[i - 1]);
 			return -1;
 		}
 
@@ -249,10 +249,10 @@ out:
 }
 
 /* Parse a configuration file */
-static char ** parse_config(char *filepath)
+static char **parse_config(char *filepath)
 {
-#define DEFAULT_CONFIG_SIZE	10
-	FILE* configfile = fopen(filepath, "r");
+#define DEFAULT_CONFIG_SIZE 10
+	FILE *configfile = fopen(filepath, "r");
 	int config_size = DEFAULT_CONFIG_SIZE;
 	int i = 1;
 	size_t line_size = 0;
@@ -315,8 +315,7 @@ static char ** parse_config(char *filepath)
 	return configuration;
 }
 
-static int next_config(char **argv, char ***_argv, bool no_default_config,
-		int state, char *cfg_file)
+static int next_config(char **argv, char ***_argv, bool no_default_config, int state, char *cfg_file)
 {
 	char local_filepath[PATH_MAX + 1];
 	char *home_dir = NULL;
@@ -325,52 +324,51 @@ static int next_config(char **argv, char ***_argv, bool no_default_config,
 	if (state >= PARSING_LAST)
 		return 0;
 
-	switch(state) {
-		case PARSING_GLOBAL_CONF:
-			if (no_default_config)
-				break;
-			*_argv = parse_config(GLOBAL_CONFIG_DIR DEFAULT_CONFIG_FILENAME);
+	switch (state) {
+	case PARSING_GLOBAL_CONF:
+		if (no_default_config)
 			break;
-		case PARSING_USER_CONF:
-			if (no_default_config)
-				break;
-			home_dir = getenv("HOME");
-			if (!home_dir) {
-				pr_info("Unable to get $HOME directory, local configuration file will not be used.\n");
-			} else {
-				snprintf(local_filepath, PATH_MAX, "%s/%s%s",
-						home_dir, USER_CONFIG_DIR, DEFAULT_CONFIG_FILENAME);
-				*_argv = parse_config(local_filepath);
-			}
+		*_argv = parse_config(GLOBAL_CONFIG_DIR DEFAULT_CONFIG_FILENAME);
+		break;
+	case PARSING_USER_CONF:
+		if (no_default_config)
 			break;
-		case PARSING_ENV_CONF:
-			cfg_from_env = getenv("CRIU_CONFIG_FILE");
-			if (!cfg_from_env)
-				break;
-			*_argv = parse_config(cfg_from_env);
+		home_dir = getenv("HOME");
+		if (!home_dir) {
+			pr_info("Unable to get $HOME directory, local configuration file will not be used.\n");
+		} else {
+			snprintf(local_filepath, PATH_MAX, "%s/%s%s", home_dir, USER_CONFIG_DIR,
+				 DEFAULT_CONFIG_FILENAME);
+			*_argv = parse_config(local_filepath);
+		}
+		break;
+	case PARSING_ENV_CONF:
+		cfg_from_env = getenv("CRIU_CONFIG_FILE");
+		if (!cfg_from_env)
 			break;
-		case PARSING_CMDLINE_CONF:
-			if (!cfg_file)
-				break;
-			*_argv = parse_config(cfg_file);
+		*_argv = parse_config(cfg_from_env);
+		break;
+	case PARSING_CMDLINE_CONF:
+		if (!cfg_file)
 			break;
-		case PARSING_ARGV:
-			*_argv = argv;
-			break;
-		case PARSING_RPC_CONF:
-			if (!rpc_cfg_file)
-				break;
-			*_argv = parse_config(rpc_cfg_file);
-			break;
-		default:
+		*_argv = parse_config(cfg_file);
+		break;
+	case PARSING_ARGV:
+		*_argv = argv;
+		break;
+	case PARSING_RPC_CONF:
+		if (!rpc_cfg_file)
 			break;
+		*_argv = parse_config(rpc_cfg_file);
+		break;
+	default:
+		break;
 	}
 
 	return ++state;
 }
 
-static int pre_parse(int argc, char **argv, bool *usage_error, bool *no_default_config,
-		char **cfg_file)
+static int pre_parse(int argc, char **argv, bool *usage_error, bool *no_default_config, char **cfg_file)
 {
 	int i;
 	/*
@@ -447,12 +445,12 @@ static int parse_cpu_cap(struct cr_options *opts, const char *optarg)
 {
 	bool inverse = false;
 
-#define ____cpu_set_cap(__opts, __cap, __inverse)	\
-	do {						\
-		if ((__inverse))			\
-			(__opts)->cpu_cap &= ~(__cap);	\
-		else					\
-			(__opts)->cpu_cap |=  (__cap);	\
+#define ____cpu_set_cap(__opts, __cap, __inverse)      \
+	do {                                           \
+		if ((__inverse))                       \
+			(__opts)->cpu_cap &= ~(__cap); \
+		else                                   \
+			(__opts)->cpu_cap |= (__cap);  \
 	} while (0)
 
 	if (!optarg) {
@@ -594,8 +592,7 @@ Esyntax:
  * correct, '1' if something failed and '2' if the CRIU help text should
  * be displayed.
  */
-int parse_options(int argc, char **argv, bool *usage_error,
-		bool *has_exec_cmd, int state)
+int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state)
 {
 	int ret;
 	int opt = -1;
@@ -605,99 +602,99 @@ int parse_options(int argc, char **argv, bool *usage_error,
 	char **_argv = NULL;
 	int _argc = 0;
 
-
-#define BOOL_OPT(OPT_NAME, SAVE_TO) \
-		{OPT_NAME, no_argument, SAVE_TO, true},\
-		{"no-" OPT_NAME, no_argument, SAVE_TO, false}
+#define BOOL_OPT(OPT_NAME, SAVE_TO)                         \
+	{ OPT_NAME, no_argument, SAVE_TO, true },           \
+	{                                                   \
+		"no-" OPT_NAME, no_argument, SAVE_TO, false \
+	}
 
 	static const char short_opts[] = "dSsRt:hD:o:v::x::Vr:jJ:lW:L:M:";
 	static struct option long_opts[] = {
-		{ "tree",			required_argument,	0, 't'	},
-		{ "leave-stopped",		no_argument,		0, 's'	},
-		{ "leave-running",		no_argument,		0, 'R'	},
+		{ "tree", required_argument, 0, 't' },
+		{ "leave-stopped", no_argument, 0, 's' },
+		{ "leave-running", no_argument, 0, 'R' },
 		BOOL_OPT("restore-detached", &opts.restore_detach),
 		BOOL_OPT("restore-sibling", &opts.restore_sibling),
 		BOOL_OPT("daemon", &opts.restore_detach),
-		{ "images-dir",			required_argument,	0, 'D'	},
-		{ "work-dir",			required_argument,	0, 'W'	},
-		{ "log-file",			required_argument,	0, 'o'	},
-		{ "join-ns",			required_argument,	0, 'J'	},
-		{ "root",			required_argument,	0, 'r'	},
-		{ USK_EXT_PARAM,		optional_argument,	0, 'x'	},
-		{ "help",			no_argument,		0, 'h'	},
+		{ "images-dir", required_argument, 0, 'D' },
+		{ "work-dir", required_argument, 0, 'W' },
+		{ "log-file", required_argument, 0, 'o' },
+		{ "join-ns", required_argument, 0, 'J' },
+		{ "root", required_argument, 0, 'r' },
+		{ USK_EXT_PARAM, optional_argument, 0, 'x' },
+		{ "help", no_argument, 0, 'h' },
 		BOOL_OPT(SK_EST_PARAM, &opts.tcp_established_ok),
-		{ "close",			required_argument,	0, 1043	},
+		{ "close", required_argument, 0, 1043 },
 		BOOL_OPT("log-pid", &opts.log_file_per_pid),
-		{ "version",			no_argument,		0, 'V'	},
+		{ "version", no_argument, 0, 'V' },
 		BOOL_OPT("evasive-devices", &opts.evasive_devices),
-		{ "pidfile",			required_argument,	0, 1046	},
-		{ "veth-pair",			required_argument,	0, 1047	},
-		{ "action-script",		required_argument,	0, 1049	},
+		{ "pidfile", required_argument, 0, 1046 },
+		{ "veth-pair", required_argument, 0, 1047 },
+		{ "action-script", required_argument, 0, 1049 },
 		BOOL_OPT(LREMAP_PARAM, &opts.link_remap_ok),
 		BOOL_OPT(OPT_SHELL_JOB, &opts.shell_job),
 		BOOL_OPT(OPT_FILE_LOCKS, &opts.handle_file_locks),
 		BOOL_OPT("page-server", &opts.use_page_server),
-		{ "address",			required_argument,	0, 1051	},
-		{ "port",			required_argument,	0, 1052	},
-		{ "prev-images-dir",		required_argument,	0, 1053	},
-		{ "ms",				no_argument,		0, 1054	},
+		{ "address", required_argument, 0, 1051 },
+		{ "port", required_argument, 0, 1052 },
+		{ "prev-images-dir", required_argument, 0, 1053 },
+		{ "ms", no_argument, 0, 1054 },
 		BOOL_OPT("track-mem", &opts.track_mem),
 		BOOL_OPT("auto-dedup", &opts.auto_dedup),
-		{ "libdir",			required_argument,	0, 'L'	},
-		{ "cpu-cap",			optional_argument,	0, 1057	},
+		{ "libdir", required_argument, 0, 'L' },
+		{ "cpu-cap", optional_argument, 0, 1057 },
 		BOOL_OPT("force-irmap", &opts.force_irmap),
-		{ "ext-mount-map",		required_argument,	0, 'M'	},
-		{ "exec-cmd",			no_argument,		0, 1059	},
-		{ "manage-cgroups",		optional_argument,	0, 1060	},
-		{ "cgroup-root",		required_argument,	0, 1061	},
-		{ "inherit-fd",			required_argument,	0, 1062	},
-		{ "feature",			required_argument,	0, 1063	},
-		{ "skip-mnt",			required_argument,	0, 1064 },
-		{ "enable-fs",			required_argument,	0, 1065 },
-		{ "enable-external-sharing",	no_argument,		&opts.enable_external_sharing, true	},
-		{ "enable-external-masters",	no_argument,		&opts.enable_external_masters, true	},
-		{ "freeze-cgroup",		required_argument,	0, 1068 },
-		{ "ghost-limit",		required_argument,	0, 1069 },
-		{ "irmap-scan-path",		required_argument,	0, 1070 },
-		{ "lsm-profile",		required_argument,	0, 1071 },
-		{ "timeout",			required_argument,	0, 1072 },
-		{ "external",			required_argument,	0, 1073	},
-		{ "empty-ns",			required_argument,	0, 1074	},
-		{ "lazy-pages",			no_argument,		0, 1076 },
+		{ "ext-mount-map", required_argument, 0, 'M' },
+		{ "exec-cmd", no_argument, 0, 1059 },
+		{ "manage-cgroups", optional_argument, 0, 1060 },
+		{ "cgroup-root", required_argument, 0, 1061 },
+		{ "inherit-fd", required_argument, 0, 1062 },
+		{ "feature", required_argument, 0, 1063 },
+		{ "skip-mnt", required_argument, 0, 1064 },
+		{ "enable-fs", required_argument, 0, 1065 },
+		{ "enable-external-sharing", no_argument, &opts.enable_external_sharing, true },
+		{ "enable-external-masters", no_argument, &opts.enable_external_masters, true },
+		{ "freeze-cgroup", required_argument, 0, 1068 },
+		{ "ghost-limit", required_argument, 0, 1069 },
+		{ "irmap-scan-path", required_argument, 0, 1070 },
+		{ "lsm-profile", required_argument, 0, 1071 },
+		{ "timeout", required_argument, 0, 1072 },
+		{ "external", required_argument, 0, 1073 },
+		{ "empty-ns", required_argument, 0, 1074 },
+		{ "lazy-pages", no_argument, 0, 1076 },
 		BOOL_OPT("extra", &opts.check_extra_features),
 		BOOL_OPT("experimental", &opts.check_experimental_features),
-		{ "all",			no_argument,		0, 1079	},
-		{ "cgroup-props",		required_argument,	0, 1080	},
-		{ "cgroup-props-file",		required_argument,	0, 1081	},
-		{ "cgroup-dump-controller",	required_argument,	0, 1082	},
+		{ "all", no_argument, 0, 1079 },
+		{ "cgroup-props", required_argument, 0, 1080 },
+		{ "cgroup-props-file", required_argument, 0, 1081 },
+		{ "cgroup-dump-controller", required_argument, 0, 1082 },
 		BOOL_OPT(SK_INFLIGHT_PARAM, &opts.tcp_skip_in_flight),
 		BOOL_OPT("deprecated", &opts.deprecated_ok),
 		BOOL_OPT("display-stats", &opts.display_stats),
 		BOOL_OPT("weak-sysctls", &opts.weak_sysctls),
-		{ "status-fd",			required_argument,	0, 1088 },
+		{ "status-fd", required_argument, 0, 1088 },
 		BOOL_OPT(SK_CLOSE_PARAM, &opts.tcp_close),
-		{ "verbosity",			optional_argument,	0, 'v'	},
-		{ "ps-socket",			required_argument,	0, 1091},
+		{ "verbosity", optional_argument, 0, 'v' },
+		{ "ps-socket", required_argument, 0, 1091 },
 		BOOL_OPT("stream", &opts.stream),
-		{ "config",			required_argument,	0, 1089},
-		{ "no-default-config",		no_argument,		0, 1090},
-		{ "tls-cacert",			required_argument,	0, 1092},
-		{ "tls-cacrl",			required_argument,	0, 1093},
-		{ "tls-cert",			required_argument,	0, 1094},
-		{ "tls-key",			required_argument,	0, 1095},
+		{ "config", required_argument, 0, 1089 },
+		{ "no-default-config", no_argument, 0, 1090 },
+		{ "tls-cacert", required_argument, 0, 1092 },
+		{ "tls-cacrl", required_argument, 0, 1093 },
+		{ "tls-cert", required_argument, 0, 1094 },
+		{ "tls-key", required_argument, 0, 1095 },
 		BOOL_OPT("tls", &opts.tls),
-		{"tls-no-cn-verify",		no_argument,		&opts.tls_no_cn_verify, true},
-		{ "cgroup-yard",		required_argument,	0, 1096 },
-		{ "pre-dump-mode",		required_argument,	0, 1097},
-		{ "file-validation",		required_argument,	0, 1098	},
-		{ "lsm-mount-context",		required_argument,	0, 1099	},
-		{ },
+		{ "tls-no-cn-verify", no_argument, &opts.tls_no_cn_verify, true },
+		{ "cgroup-yard", required_argument, 0, 1096 },
+		{ "pre-dump-mode", required_argument, 0, 1097 },
+		{ "file-validation", required_argument, 0, 1098 },
+		{ "lsm-mount-context", required_argument, 0, 1099 },
+		{},
 	};
 
 #undef BOOL_OPT
 
-	ret = pre_parse(argc, argv, usage_error, &no_default_config,
-			&cfg_file);
+	ret = pre_parse(argc, argv, usage_error, &no_default_config, &cfg_file);
 
 	if (ret)
 		return 2;
@@ -709,7 +706,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			/* Do not free any memory if it points to argv */
 			if (state != PARSING_ARGV + 1) {
 				int i;
-				for (i=1; i < _argc; i++) {
+				for (i = 1; i < _argc; i++) {
 					free(_argv[i]);
 				}
 				free(_argv);
@@ -809,21 +806,19 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		case 1046:
 			SET_CHAR_OPTS(pidfile, optarg);
 			break;
-		case 1047:
-			{
-				char *aux;
+		case 1047: {
+			char *aux;
 
-				aux = strchr(optarg, '=');
-				if (aux == NULL)
-					goto bad_arg;
+			aux = strchr(optarg, '=');
+			if (aux == NULL)
+				goto bad_arg;
 
-				*aux = '\0';
-				if (veth_pair_add(optarg, aux + 1)) {
-					pr_err("Failed to add veth pair: %s, %s.\n", optarg, aux + 1);
-					return 1;
-				}
+			*aux = '\0';
+			if (veth_pair_add(optarg, aux + 1)) {
+				pr_err("Failed to add veth pair: %s, %s.\n", optarg, aux + 1);
+				return 1;
 			}
-			break;
+		} break;
 		case 1049:
 			if (add_script(optarg)) {
 				pr_err("Failed to add action-script: %s.\n", optarg);
@@ -868,33 +863,31 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			if (parse_manage_cgroups(&opts, optarg))
 				return 2;
 			break;
-		case 1061:
-			{
-				char *path, *ctl;
+		case 1061: {
+			char *path, *ctl;
 
-				path = strchr(optarg, ':');
-				if (path) {
-					*path = '\0';
-					path++;
-					ctl = optarg;
-				} else {
-					path = optarg;
-					ctl = NULL;
-				}
-
-				if (new_cg_root_add(ctl, path))
-					return -1;
+			path = strchr(optarg, ':');
+			if (path) {
+				*path = '\0';
+				path++;
+				ctl = optarg;
+			} else {
+				path = optarg;
+				ctl = NULL;
 			}
-			break;
+
+			if (new_cg_root_add(ctl, path))
+				return -1;
+		} break;
 		case 1062:
 			if (inherit_fd_parse(optarg) < 0)
 				return 1;
 			break;
 		case 1063:
 			ret = check_add_feature(optarg);
-			if (ret < 0)	/* invalid kernel feature name */
+			if (ret < 0) /* invalid kernel feature name */
 				return 1;
-			if (ret > 0)	/* list kernel features and exit */
+			if (ret > 0) /* list kernel features and exit */
 				return 0;
 			break;
 		case 1064:
@@ -931,26 +924,25 @@ int parse_options(int argc, char **argv, bool *usage_error,
 		case 1076:
 			opts.lazy_pages = true;
 			break;
-		case 'M':
-			{
-				char *aux;
+		case 'M': {
+			char *aux;
 
-				if (strcmp(optarg, "auto") == 0) {
-					opts.autodetect_ext_mounts = true;
-					break;
-				}
-
-				aux = strchr(optarg, ':');
-				if (aux == NULL)
-					goto bad_arg;
-
-				*aux = '\0';
-				if (ext_mount_add(optarg, aux + 1)) {
-					pr_err("Could not add external mount when initializing config: %s, %s\n", optarg, aux + 1);
-					return 1;
-				}
+			if (strcmp(optarg, "auto") == 0) {
+				opts.autodetect_ext_mounts = true;
+				break;
 			}
-			break;
+
+			aux = strchr(optarg, ':');
+			if (aux == NULL)
+				goto bad_arg;
+
+			*aux = '\0';
+			if (ext_mount_add(optarg, aux + 1)) {
+				pr_err("Could not add external mount when initializing config: %s, %s\n", optarg,
+				       aux + 1);
+				return 1;
+			}
+		} break;
 		case 1073:
 			if (add_external(optarg)) {
 				pr_err("Could not add external resource when initializing config: %s\n", optarg);
@@ -961,8 +953,7 @@ int parse_options(int argc, char **argv, bool *usage_error,
 			if (!strcmp("net", optarg))
 				opts.empty_ns |= CLONE_NEWNET;
 			else {
-				pr_err("Unsupported empty namespace: %s\n",
-						optarg);
+				pr_err("Unsupported empty namespace: %s\n", optarg);
 				return 1;
 			}
 			break;
@@ -1040,11 +1031,9 @@ int parse_options(int argc, char **argv, bool *usage_error,
 
 bad_arg:
 	if (idx < 0) /* short option */
-		pr_err("invalid argument for -%c: %s\n",
-				opt, optarg);
+		pr_err("invalid argument for -%c: %s\n", opt, optarg);
 	else /* long option */
-		pr_err("invalid argument for --%s: %s\n",
-				long_opts[idx].name, optarg);
+		pr_err("invalid argument for --%s: %s\n", long_opts[idx].name, optarg);
 	return 1;
 }
 
@@ -1079,7 +1068,7 @@ int check_options(void)
 				"combination with --ps-socket is obsolete\n");
 		if (opts.ps_socket <= STDERR_FILENO && opts.daemon_mode) {
 			pr_err("Standard file descriptors will be closed"
-				" in daemon mode\n");
+			       " in daemon mode\n");
 			return 1;
 		}
 	}
diff --git a/criu/cr-check.c b/criu/cr-check.c
index d35b1bffe..6583b6ea0 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -63,9 +63,8 @@ static int check_tty(void)
 
 	if (ARRAY_SIZE(t.c_cc) < TERMIOS_NCC) {
 		pr_err("struct termios has %d @c_cc while "
-			"at least %d expected.\n",
-			(int)ARRAY_SIZE(t.c_cc),
-			TERMIOS_NCC);
+		       "at least %d expected.\n",
+		       (int)ARRAY_SIZE(t.c_cc), TERMIOS_NCC);
 		goto out;
 	}
 
@@ -293,8 +292,7 @@ static int check_fdinfo_eventfd(void)
 	}
 
 	if (fe.counter != cnt) {
-		pr_err("Counter mismatch (or not met) %d want %d\n",
-				(int)fe.counter, cnt);
+		pr_err("Counter mismatch (or not met) %d want %d\n", (int)fe.counter, cnt);
 		return -1;
 	}
 
@@ -468,7 +466,7 @@ err:
 }
 
 #ifndef SO_GET_FILTER
-#define SO_GET_FILTER		SO_ATTACH_FILTER
+#define SO_GET_FILTER SO_ATTACH_FILTER
 #endif
 
 static int check_so_gets(void)
@@ -612,9 +610,9 @@ static int check_ptrace_peeksiginfo(void)
 }
 
 struct special_mapping {
-	const char	*name;
-	void		*addr;
-	size_t		size;
+	const char *name;
+	void *addr;
+	size_t size;
 };
 
 static int parse_special_maps(struct special_mapping *vmas, size_t nr)
@@ -632,8 +630,7 @@ static int parse_special_maps(struct special_mapping *vmas, size_t nr)
 		int r, tail;
 		size_t i;
 
-		r = sscanf(buf, "%lx-%lx %*s %*s %*s %*s %n\n",
-				&start, &end, &tail);
+		r = sscanf(buf, "%lx-%lx %*s %*s %*s %*s %n\n", &start, &end, &tail);
 		if (r != 2) {
 			fclose(maps);
 			pr_err("Bad maps format %d.%d (%s)\n", r, tail, buf + tail);
@@ -674,8 +671,7 @@ static void dummy_sighandler(int sig)
  * And we definitely mremap() support by the fact that those special_mappings
  * are subjects for ASLR. (See #288 as a reference)
  */
-static void check_special_mapping_mremap_child(struct special_mapping *vmas,
-					       size_t nr)
+static void check_special_mapping_mremap_child(struct special_mapping *vmas, size_t nr)
 {
 	size_t i, parking_size = 0;
 	void *parking_lot;
@@ -691,8 +687,7 @@ static void check_special_mapping_mremap_child(struct special_mapping *vmas,
 		exit(1);
 	}
 
-	parking_lot = mmap(NULL, parking_size, PROT_NONE,
-			   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	parking_lot = mmap(NULL, parking_size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (parking_lot == MAP_FAILED) {
 		pr_perror("mmap(%zu) failed", parking_size);
 		exit(1);
@@ -704,10 +699,8 @@ static void check_special_mapping_mremap_child(struct special_mapping *vmas,
 		if (vmas[i].addr == MAP_FAILED)
 			continue;
 
-		ret = syscall(__NR_mremap, (unsigned long)vmas[i].addr,
-			      vmas[i].size, vmas[i].size,
-			      MREMAP_FIXED | MREMAP_MAYMOVE,
-			      (unsigned long)parking_lot);
+		ret = syscall(__NR_mremap, (unsigned long)vmas[i].addr, vmas[i].size, vmas[i].size,
+			      MREMAP_FIXED | MREMAP_MAYMOVE, (unsigned long)parking_lot);
 		if (ret != (unsigned long)parking_lot)
 			syscall(__NR_exit, 1);
 		parking_lot += vmas[i].size;
@@ -807,19 +800,19 @@ static int check_ptrace_suspend_seccomp(void)
 static int setup_seccomp_filter(void)
 {
 	struct sock_filter filter[] = {
-		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
+		BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(struct seccomp_data, nr)),
 		/* Allow all syscalls except ptrace */
-		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, __NR_ptrace, 0, 1),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW),
+		BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, __NR_ptrace, 0, 1),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_KILL),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ALLOW),
 	};
 
 	struct sock_fprog bpf_prog = {
-		.len = (unsigned short)(sizeof(filter)/sizeof(filter[0])),
+		.len = (unsigned short)(sizeof(filter) / sizeof(filter[0])),
 		.filter = filter,
 	};
 
-	if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, (long) &bpf_prog, 0, 0) < 0)
+	if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, (long)&bpf_prog, 0, 0) < 0)
 		return -1;
 
 	return 0;
@@ -912,7 +905,7 @@ static int check_aio_remap(void)
 		return -1;
 	}
 
-	len = get_ring_len((unsigned long) ctx);
+	len = get_ring_len((unsigned long)ctx);
 	if (!len)
 		return -1;
 
@@ -956,7 +949,8 @@ struct clone_arg {
 	char stack_ptr[0];
 };
 
-static int clone_cb(void *_arg) {
+static int clone_cb(void *_arg)
+{
 	exit(0);
 }
 
@@ -1016,8 +1010,7 @@ static int check_autofs(void)
 
 	ret = -1;
 
-	options = xsprintf("fd=%d,pgrp=%d,minproto=5,maxproto=5,direct",
-				pfd[1], getpgrp());
+	options = xsprintf("fd=%d,pgrp=%d,minproto=5,maxproto=5,direct", pfd[1], getpgrp());
 	if (!options) {
 		pr_err("failed to allocate autofs options\n");
 		goto close_pipe;
@@ -1129,7 +1122,7 @@ static int kerndat_tcp_repair_window(void)
 			pr_perror("Unable to set TCP_REPAIR_WINDOW");
 			goto err;
 		}
-now:
+	now:
 		val = 0;
 	} else
 		val = 1;
@@ -1327,8 +1320,8 @@ static int check_newifindex(void)
 static int check_net_diag_raw(void)
 {
 	check_sock_diag();
-	return (socket_test_collect_bit(AF_INET, IPPROTO_RAW) &&
-		socket_test_collect_bit(AF_INET6, IPPROTO_RAW)) ? 0 : -1;
+	return (socket_test_collect_bit(AF_INET, IPPROTO_RAW) && socket_test_collect_bit(AF_INET6, IPPROTO_RAW)) ? 0 :
+															 -1;
 }
 
 static int check_pidfd_store(void)
@@ -1371,17 +1364,19 @@ static int (*chk_feature)(void);
  * We fail if any feature in category 1 is missing but tolerate failures
  * in the other categories.  Currently, there is nothing in category 3.
  */
-#define CHECK_GOOD	"Looks good."
-#define CHECK_BAD	"Does not look good."
-#define CHECK_MAYBE	"Looks good but some kernel features are missing\n" \
-			"which, depending on your process tree, may cause\n" \
-			"dump or restore failure."
-#define CHECK_CAT1(fn)	do { \
-				if ((ret = fn) != 0) { \
-					pr_warn("%s\n", CHECK_BAD); \
-					return ret; \
-				} \
-			} while (0)
+#define CHECK_GOOD "Looks good."
+#define CHECK_BAD  "Does not look good."
+#define CHECK_MAYBE                                          \
+	"Looks good but some kernel features are missing\n"  \
+	"which, depending on your process tree, may cause\n" \
+	"dump or restore failure."
+#define CHECK_CAT1(fn)                              \
+	do {                                        \
+		if ((ret = fn) != 0) {              \
+			pr_warn("%s\n", CHECK_BAD); \
+			return ret;                 \
+		}                                   \
+	} while (0)
 int cr_check(void)
 {
 	struct ns_id *ns;
@@ -1566,17 +1561,17 @@ static struct feature_list feature_list[] = {
 	{ "compat_cr", check_compat_cr },
 	{ "uffd", check_uffd },
 	{ "uffd-noncoop", check_uffd_noncoop },
-	{ "can_map_vdso", check_can_map_vdso},
+	{ "can_map_vdso", check_can_map_vdso },
 	{ "sk_ns", check_sk_netns },
 	{ "sk_unix_file", check_sk_unix_file },
 	{ "net_diag_raw", check_net_diag_raw },
 	{ "nsid", check_nsid },
-	{ "link_nsid", check_link_nsid},
-	{ "kcmp_epoll", check_kcmp_epoll},
-	{ "timens", check_time_namespace},
-	{ "external_net_ns", check_external_net_ns},
-	{ "clone3_set_tid", check_clone3_set_tid},
-	{ "newifindex", check_newifindex},
+	{ "link_nsid", check_link_nsid },
+	{ "kcmp_epoll", check_kcmp_epoll },
+	{ "timens", check_time_namespace },
+	{ "external_net_ns", check_external_net_ns },
+	{ "clone3_set_tid", check_clone3_set_tid },
+	{ "newifindex", check_newifindex },
 	{ "nftables", check_nftables_cr },
 	{ "has_ipt_legacy", check_ipt_legacy },
 	{ "pidfd_store", check_pidfd_store },
diff --git a/criu/cr-dedup.c b/criu/cr-dedup.c
index a09873f94..c0c21f53e 100644
--- a/criu/cr-dedup.c
+++ b/criu/cr-dedup.c
@@ -14,7 +14,7 @@ int cr_dedup(void)
 {
 	int close_ret, ret = 0;
 	unsigned long img_id;
-	DIR * dirp;
+	DIR *dirp;
 	struct dirent *ent;
 
 	dirp = opendir(CR_PARENT_LINK);
@@ -71,7 +71,7 @@ static int cr_dedup_one_pagemap(unsigned long img_id, int flags)
 {
 	int ret;
 	struct page_read pr;
-	struct page_read * prp;
+	struct page_read *prp;
 
 	flags |= PR_MOD;
 	ret = open_page_read(img_id, &pr, flags);
@@ -87,11 +87,9 @@ static int cr_dedup_one_pagemap(unsigned long img_id, int flags)
 		if (ret <= 0)
 			goto exit;
 
-		pr_debug("dedup iovec base=%"PRIx64", len=%lu\n",
-			 pr.pe->vaddr, pagemap_len(pr.pe));
+		pr_debug("dedup iovec base=%" PRIx64 ", len=%lu\n", pr.pe->vaddr, pagemap_len(pr.pe));
 		if (!pagemap_in_parent(pr.pe)) {
-			ret = dedup_one_iovec(prp, pr.pe->vaddr,
-					      pagemap_len(pr.pe));
+			ret = dedup_one_iovec(prp, pr.pe->vaddr, pagemap_len(pr.pe));
 			if (ret)
 				goto exit;
 		}
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index eece51cff..54a426cc1 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -15,7 +15,6 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 
-
 #include <sched.h>
 #include <sys/resource.h>
 
@@ -93,13 +92,12 @@
  * with_threads = true : The register sets of the tasks with all their threads
  *			 are restored
  */
-int __attribute__((weak)) arch_set_thread_regs(struct pstree_item *item,
-					       bool with_threads)
+int __attribute__((weak)) arch_set_thread_regs(struct pstree_item *item, bool with_threads)
 {
 	return 0;
 }
 
-#define PERSONALITY_LENGTH	9
+#define PERSONALITY_LENGTH 9
 static char loc_buf[PERSONALITY_LENGTH];
 
 void free_mappings(struct vm_area_list *vma_area_list)
@@ -115,8 +113,7 @@ void free_mappings(struct vm_area_list *vma_area_list)
 	vm_area_list_init(vma_area_list);
 }
 
-int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list,
-						dump_filemap_t dump_file)
+int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t dump_file)
 {
 	int ret = -1;
 
@@ -128,8 +125,7 @@ int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list,
 	if (ret < 0)
 		goto err;
 
-	pr_info("Collected, longest area occupies %lu pages\n",
-		vma_area_list->nr_priv_pages_longest);
+	pr_info("Collected, longest area occupies %lu pages\n", vma_area_list->nr_priv_pages_longest);
 	pr_info_vma_list(&vma_area_list->h);
 
 	pr_info("----------------------------------------\n");
@@ -325,8 +321,7 @@ static int dump_task_fs(pid_t pid, struct parasite_dump_misc *misc, struct cr_im
 
 	close(fd);
 
-	pr_info("Dumping task cwd id %#x root id %#x\n",
-			fe.cwd_id, fe.root_id);
+	pr_info("Dumping task cwd id %#x root id %#x\n", fe.cwd_id, fe.root_id);
 
 	return pb_write_one(img_from_set(imgset, CR_FD_FS), &fe, PB_FS);
 }
@@ -340,7 +335,7 @@ static int dump_task_rlimits(int pid, TaskRlimitsEntry *rls)
 {
 	int res;
 
-	for (res = 0; res <rls->n_rlimits ; res++) {
+	for (res = 0; res < rls->n_rlimits; res++) {
 		struct rlimit64 lim;
 
 		if (syscall(__NR_prlimit64, pid, res, NULL, &lim)) {
@@ -412,8 +407,7 @@ static int dump_filemap(struct vma_area *vma_area, int fd)
 	if (vma_area->aufs_rpath) {
 		struct fd_link aufs_link;
 
-		strlcpy(aufs_link.name, vma_area->aufs_rpath,
-				sizeof(aufs_link.name));
+		strlcpy(aufs_link.name, vma_area->aufs_rpath, sizeof(aufs_link.name));
 		aufs_link.len = strlen(aufs_link.name);
 		p.link = &aufs_link;
 	}
@@ -434,8 +428,7 @@ static int check_sysvipc_map_dump(pid_t pid, VmaEntry *vma)
 	if (root_ns_mask & CLONE_NEWIPC)
 		return 0;
 
-	pr_err("Task %d with SysVIPC shmem map @%"PRIx64" doesn't live in IPC ns\n",
-			pid, vma->start);
+	pr_err("Task %d with SysVIPC shmem map @%" PRIx64 " doesn't live in IPC ns\n", pid, vma->start);
 	return -1;
 }
 
@@ -467,10 +460,8 @@ err:
 	return ret;
 }
 
-static int dump_task_mm(pid_t pid, const struct proc_pid_stat *stat,
-		const struct parasite_dump_misc *misc,
-		const struct vm_area_list *vma_area_list,
-		const struct cr_imgset *imgset)
+static int dump_task_mm(pid_t pid, const struct proc_pid_stat *stat, const struct parasite_dump_misc *misc,
+			const struct vm_area_list *vma_area_list, const struct cr_imgset *imgset)
 {
 	MmEntry mme = MM_ENTRY__INIT;
 	struct vma_area *vma_area;
@@ -578,8 +569,8 @@ static int get_task_futex_robust_list(pid_t pid, ThreadCoreEntry *info)
 		goto err;
 	}
 
-	info->futex_rla		= encode_pointer(head);
-	info->futex_rla_len	= (u32)len;
+	info->futex_rla = encode_pointer(head);
+	info->futex_rla_len = (u32)len;
 
 	return 0;
 
@@ -713,8 +704,7 @@ int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread
 		ret = dump_sched_info(pid, tc);
 	if (!ret) {
 		core_put_tls(core, ti->tls);
-		CORE_THREAD_ARCH_INFO(core)->clear_tid_addr =
-			encode_pointer(ti->tid_addr);
+		CORE_THREAD_ARCH_INFO(core)->clear_tid_addr = encode_pointer(ti->tid_addr);
 		BUG_ON(!tc->sas);
 		copy_sas(tc->sas, &ti->sas);
 		if (ti->pdeath_sig) {
@@ -731,11 +721,8 @@ int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread
 	return ret;
 }
 
-static int dump_task_core_all(struct parasite_ctl *ctl,
-			      struct pstree_item *item,
-			      const struct proc_pid_stat *stat,
-			      const struct cr_imgset *cr_imgset,
-			      const struct parasite_dump_misc *misc)
+static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item, const struct proc_pid_stat *stat,
+			      const struct cr_imgset *cr_imgset, const struct parasite_dump_misc *misc)
 {
 	struct cr_img *img;
 	CoreEntry *core = item->core[0];
@@ -805,7 +792,9 @@ static int collect_pstree_ids_predump(void)
 	struct {
 		struct pstree_item i;
 		struct dmp_info d;
-	} crt = { .i.pid = &pid, };
+	} crt = {
+		.i.pid = &pid,
+	};
 
 	/*
 	 * This thing is normally done inside
@@ -845,8 +834,7 @@ static int collect_file_locks(void)
 	return parse_file_locks();
 }
 
-static int dump_task_thread(struct parasite_ctl *parasite_ctl,
-				const struct pstree_item *item, int id)
+static int dump_task_thread(struct parasite_ctl *parasite_ctl, const struct pstree_item *item, int id)
 {
 	struct parasite_thread_ctl *tctl = dmpi(item)->thread_ctls[id];
 	struct pid *tid = &item->threads[id];
@@ -878,8 +866,7 @@ err:
 	return ret;
 }
 
-static int dump_one_zombie(const struct pstree_item *item,
-			   const struct proc_pid_stat *pps)
+static int dump_one_zombie(const struct pstree_item *item, const struct proc_pid_stat *pps)
 {
 	CoreEntry *core;
 	int ret = -1;
@@ -904,7 +891,7 @@ err:
 	return ret;
 }
 
-#define SI_BATCH	32
+#define SI_BATCH 32
 
 static int dump_signal_queue(pid_t tid, SignalQueueEntry **sqe, bool group)
 {
@@ -961,8 +948,7 @@ static int dump_signal_queue(pid_t tid, SignalQueueEntry **sqe, bool group)
 			break;
 		}
 
-		for (si_pos = queue->n_signals - nr;
-				si_pos < queue->n_signals; si_pos++) {
+		for (si_pos = queue->n_signals - nr; si_pos < queue->n_signals; si_pos++) {
 			SiginfoEntry *se;
 
 			se = xmalloc(sizeof(*se));
@@ -1014,8 +1000,7 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item)
 
 static struct proc_pid_stat pps_buf;
 
-static int dump_task_threads(struct parasite_ctl *parasite_ctl,
-			     const struct pstree_item *item)
+static int dump_task_threads(struct parasite_ctl *parasite_ctl, const struct pstree_item *item)
 {
 	int i;
 
@@ -1348,12 +1333,10 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 	item->sid = misc.sid;
 	item->pgid = misc.pgid;
 
-	pr_info("sid=%d pgid=%d pid=%d\n",
-		item->sid, item->pgid, vpid(item));
+	pr_info("sid=%d pgid=%d pid=%d\n", item->sid, item->pgid, vpid(item));
 
 	if (item->sid == 0) {
-		pr_err("A session leader of %d(%d) is outside of its pid namespace\n",
-			item->pid->real, vpid(item));
+		pr_err("A session leader of %d(%d) is outside of its pid namespace\n", item->pid->real, vpid(item));
 		goto err_cure;
 	}
 
@@ -1469,13 +1452,13 @@ err_cure_imgset:
 
 static int alarm_attempts = 0;
 
-bool alarm_timeouted(void) {
+bool alarm_timeouted(void)
+{
 	return alarm_attempts > 0;
 }
 
 static void alarm_handler(int signo)
 {
-
 	pr_err("Timeout reached. Try to interrupt: %d\n", alarm_attempts);
 	if (alarm_attempts++ < 5) {
 		alarm(1);
@@ -1489,8 +1472,7 @@ static void alarm_handler(int signo)
 static int setup_alarm_handler(void)
 {
 	struct sigaction sa = {
-		.sa_handler	= alarm_handler,
-		.sa_flags	= 0, /* Don't restart syscalls */
+		.sa_handler = alarm_handler, .sa_flags = 0, /* Don't restart syscalls */
 	};
 
 	sigemptyset(&sa.sa_mask);
@@ -1552,8 +1534,7 @@ static int cr_pre_dump_finish(int status)
 
 		if (opts.pre_dump_mode == PRE_DUMP_READ) {
 			timing_stop(TIME_MEMWRITE);
-			ret = page_xfer_predump_pages(item->pid->real,
-							&xfer, mem_pp);
+			ret = page_xfer_predump_pages(item->pid->real, &xfer, mem_pp);
 		} else {
 			ret = page_xfer_dump_pages(&xfer, mem_pp);
 		}
@@ -1772,9 +1753,7 @@ static int cr_dump_finish(int ret)
 
 	if (arch_set_thread_regs(root_item, true) < 0)
 		return -1;
-	pstree_switch_state(root_item,
-			    (ret || post_dump_ret) ?
-			    TASK_ALIVE : opts.final_state);
+	pstree_switch_state(root_item, (ret || post_dump_ret) ? TASK_ALIVE : opts.final_state);
 	timing_stop(TIME_FROZEN);
 	free_pstree(root_item);
 	seccomp_free_entries();
@@ -1792,7 +1771,7 @@ static int cr_dump_finish(int ret)
 		write_stats(DUMP_STATS);
 		pr_info("Dumping finished successfully\n");
 	}
-	return post_dump_ret ? : (ret != 0);
+	return post_dump_ret ?: (ret != 0);
 }
 
 int cr_dump_tasks(pid_t pid)
@@ -1842,10 +1821,7 @@ int cr_dump_tasks(pid_t pid)
 	if (vdso_init_dump())
 		goto err;
 
-	if (cgp_init(opts.cgroup_props,
-		     opts.cgroup_props ?
-		     strlen(opts.cgroup_props) : 0,
-		     opts.cgroup_props_file))
+	if (cgp_init(opts.cgroup_props, opts.cgroup_props ? strlen(opts.cgroup_props) : 0, opts.cgroup_props_file))
 		goto err;
 
 	if (parse_cg_info())
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 93765966c..82dbaa0dc 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -18,7 +18,6 @@
 #include <sys/prctl.h>
 #include <sched.h>
 
-
 #include "types.h"
 #include <compel/ptrace.h>
 #include "common/compiler.h"
@@ -98,16 +97,16 @@
 #include "cr-errno.h"
 
 #ifndef arch_export_restore_thread
-#define arch_export_restore_thread	__export_restore_thread
+#define arch_export_restore_thread __export_restore_thread
 #endif
 
 #ifndef arch_export_restore_task
-#define arch_export_restore_task	__export_restore_task
+#define arch_export_restore_task __export_restore_task
 #endif
 
 #ifndef arch_export_unmap
-#define arch_export_unmap		__export_unmap
-#define arch_export_unmap_compat	__export_unmap_compat
+#define arch_export_unmap	 __export_unmap
+#define arch_export_unmap_compat __export_unmap_compat
 #endif
 
 struct pstree_item *current;
@@ -202,16 +201,14 @@ static int restore_wait_other_tasks(void)
 
 static inline void __restore_switch_stage_nw(int next_stage)
 {
-	futex_set(&task_entries->nr_in_progress,
-			stage_participants(next_stage));
+	futex_set(&task_entries->nr_in_progress, stage_participants(next_stage));
 	futex_set(&task_entries->start, next_stage);
 }
 
 static inline void __restore_switch_stage(int next_stage)
 {
 	if (next_stage != CR_STATE_COMPLETE)
-		futex_set(&task_entries->nr_in_progress,
-				stage_participants(next_stage));
+		futex_set(&task_entries->nr_in_progress, stage_participants(next_stage));
 	futex_set_and_wake(&task_entries->start, next_stage);
 }
 
@@ -266,34 +263,17 @@ static int crtools_prepare_shared(void)
  */
 
 static struct collect_image_info *cinfos[] = {
-	&file_locks_cinfo,
-	&pipe_data_cinfo,
-	&fifo_data_cinfo,
-	&sk_queues_cinfo,
+	&file_locks_cinfo,  &pipe_data_cinfo, &fifo_data_cinfo, &sk_queues_cinfo,
 #ifdef CONFIG_HAS_LIBBPF
 	&bpfmap_data_cinfo,
 #endif
 };
 
 static struct collect_image_info *cinfos_files[] = {
-	&unix_sk_cinfo,
-	&fifo_cinfo,
-	&pipe_cinfo,
-	&nsfile_cinfo,
-	&packet_sk_cinfo,
-	&netlink_sk_cinfo,
-	&eventfd_cinfo,
-	&epoll_cinfo,
-	&epoll_tfd_cinfo,
-	&signalfd_cinfo,
-	&tunfile_cinfo,
-	&timerfd_cinfo,
-	&inotify_cinfo,
-	&inotify_mark_cinfo,
-	&fanotify_cinfo,
-	&fanotify_mark_cinfo,
-	&ext_file_cinfo,
-	&memfd_cinfo,
+	&unix_sk_cinfo,	      &fifo_cinfo,     &pipe_cinfo,    &nsfile_cinfo,	    &packet_sk_cinfo,
+	&netlink_sk_cinfo,    &eventfd_cinfo,  &epoll_cinfo,   &epoll_tfd_cinfo,    &signalfd_cinfo,
+	&tunfile_cinfo,	      &timerfd_cinfo,  &inotify_cinfo, &inotify_mark_cinfo, &fanotify_cinfo,
+	&fanotify_mark_cinfo, &ext_file_cinfo, &memfd_cinfo,
 };
 
 /* These images are required to restore namespaces */
@@ -337,8 +317,7 @@ static int root_prepare_shared(void)
 	if (collect_images(cinfos, ARRAY_SIZE(cinfos)))
 		return -1;
 
-	if (!files_collected() &&
-			collect_images(cinfos_files, ARRAY_SIZE(cinfos_files)))
+	if (!files_collected() && collect_images(cinfos_files, ARRAY_SIZE(cinfos_files)))
 		return -1;
 
 	for_each_pstree_item(pi) {
@@ -451,9 +430,8 @@ static bool sa_inherited(int sig, rt_sigaction_t *sa)
 		if (pa->rt_sa_mask.sig[i] != sa->rt_sa_mask.sig[i])
 			return false;
 
-	return pa->rt_sa_handler == sa->rt_sa_handler &&
-		pa->rt_sa_flags == sa->rt_sa_flags &&
-		pa->rt_sa_restorer == sa->rt_sa_restorer;
+	return pa->rt_sa_handler == sa->rt_sa_handler && pa->rt_sa_flags == sa->rt_sa_flags &&
+	       pa->rt_sa_restorer == sa->rt_sa_restorer;
 }
 
 static int restore_native_sigaction(int sig, SaEntry *e)
@@ -466,7 +444,7 @@ static int restore_native_sigaction(int sig, SaEntry *e)
 	ASSIGN_TYPED(act.rt_sa_restorer, decode_pointer(e->restorer));
 #ifdef CONFIG_MIPS
 	e->has_mask_extended = 1;
-	BUILD_BUG_ON(sizeof(e->mask)* 2 != sizeof(act.rt_sa_mask.sig));
+	BUILD_BUG_ON(sizeof(e->mask) * 2 != sizeof(act.rt_sa_mask.sig));
 
 	memcpy(&(act.rt_sa_mask.sig[0]), &e->mask, sizeof(act.rt_sa_mask.sig[0]));
 	memcpy(&(act.rt_sa_mask.sig[1]), &e->mask_extended, sizeof(act.rt_sa_mask.sig[1]));
@@ -522,9 +500,8 @@ static bool sa_compat_inherited(int sig, rt_sigaction_t_compat *sa)
 		if (pa->rt_sa_mask.sig[i] != sa->rt_sa_mask.sig[i])
 			return false;
 
-	return pa->rt_sa_handler == sa->rt_sa_handler &&
-		pa->rt_sa_flags == sa->rt_sa_flags &&
-		pa->rt_sa_restorer == sa->rt_sa_restorer;
+	return pa->rt_sa_handler == sa->rt_sa_handler && pa->rt_sa_flags == sa->rt_sa_flags &&
+	       pa->rt_sa_restorer == sa->rt_sa_restorer;
 }
 
 static int restore_compat_sigaction(int sig, SaEntry *e)
@@ -576,8 +553,7 @@ static int prepare_sigactions_from_core(TaskCoreEntry *tc)
 	int sig, i;
 
 	if (tc->n_sigactions != SIGMAX - 2) {
-		pr_err("Bad number of sigactions in the image (%d, want %d)\n",
-				(int)tc->n_sigactions, SIGMAX - 2);
+		pr_err("Bad number of sigactions in the image (%d, want %d)\n", (int)tc->n_sigactions, SIGMAX - 2);
 		return -1;
 	}
 
@@ -661,8 +637,7 @@ static int prepare_sigactions_from_image(void)
 			rst++;
 	}
 
-	pr_info("Restored %d/%d sigacts\n", rst,
-			SIGMAX - 3 /* KILL, STOP and CHLD */);
+	pr_info("Restored %d/%d sigacts\n", rst, SIGMAX - 3 /* KILL, STOP and CHLD */);
 
 	close_image(img);
 	return ret;
@@ -722,8 +697,7 @@ static int collect_child_pids(int state, unsigned int *n)
 
 	if (current == root_item) {
 		for_each_pstree_item(pi) {
-			if (pi->pid->state != TASK_HELPER &&
-			    pi->pid->state != TASK_DEAD)
+			if (pi->pid->state != TASK_HELPER && pi->pid->state != TASK_DEAD)
 				continue;
 			if (__collect_child_pids(pi, state, n))
 				return -1;
@@ -801,7 +775,7 @@ static int open_cores(int pid, CoreEntry *leader_core)
 	int i, tpid;
 	CoreEntry **cores = NULL;
 
-	cores = xmalloc(sizeof(*cores)*current->nr_threads);
+	cores = xmalloc(sizeof(*cores) * current->nr_threads);
 	if (!cores)
 		goto err;
 
@@ -867,8 +841,7 @@ static int prepare_proc_misc(pid_t pid, TaskCoreEntry *tc, struct task_restore_a
 		args->child_subreaper = tc->child_subreaper;
 
 	/* loginuid value is critical to restore */
-	if (kdat.luid == LUID_FULL && tc->has_loginuid &&
-			tc->loginuid != INVALID_UID) {
+	if (kdat.luid == LUID_FULL && tc->has_loginuid && tc->loginuid != INVALID_UID) {
 		ret = prepare_loginuid(tc->loginuid);
 		if (ret < 0) {
 			pr_err("Setting loginuid for %d task failed\n", pid);
@@ -894,8 +867,7 @@ static int restore_one_alive_task(int pid, CoreEntry *core)
 
 	rst_mem_switch_to_private();
 
-	args_len = round_up(sizeof(*ta) + sizeof(struct thread_restore_args) *
-			current->nr_threads, page_size());
+	args_len = round_up(sizeof(*ta) + sizeof(struct thread_restore_args) * current->nr_threads, page_size());
 	ta = mmap(NULL, args_len, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
 	if (!ta)
 		return -1;
@@ -996,33 +968,12 @@ static void zombie_prepare_signals(void)
 		sigaction(sig, &act, NULL);
 }
 
-#define SIG_FATAL_MASK	(	\
-		(1 << SIGHUP)	|\
-		(1 << SIGINT)	|\
-		(1 << SIGQUIT)	|\
-		(1 << SIGILL)	|\
-		(1 << SIGTRAP)	|\
-		(1 << SIGABRT)	|\
-		(1 << SIGIOT)	|\
-		(1 << SIGBUS)	|\
-		(1 << SIGFPE)	|\
-		(1 << SIGKILL)	|\
-		(1 << SIGUSR1)	|\
-		(1 << SIGSEGV)	|\
-		(1 << SIGUSR2)	|\
-		(1 << SIGPIPE)	|\
-		(1 << SIGALRM)	|\
-		(1 << SIGTERM)	|\
-		(1 << SIGXCPU)	|\
-		(1 << SIGXFSZ)	|\
-		(1 << SIGVTALRM)|\
-		(1 << SIGPROF)	|\
-		(1 << SIGPOLL)	|\
-		(1 << SIGIO)	|\
-		(1 << SIGSYS)	|\
-		(1 << SIGSTKFLT)|\
-		(1 << SIGPWR)	 \
-	)
+#define SIG_FATAL_MASK                                                                                          \
+	((1 << SIGHUP) | (1 << SIGINT) | (1 << SIGQUIT) | (1 << SIGILL) | (1 << SIGTRAP) | (1 << SIGABRT) |     \
+	 (1 << SIGIOT) | (1 << SIGBUS) | (1 << SIGFPE) | (1 << SIGKILL) | (1 << SIGUSR1) | (1 << SIGSEGV) |     \
+	 (1 << SIGUSR2) | (1 << SIGPIPE) | (1 << SIGALRM) | (1 << SIGTERM) | (1 << SIGXCPU) | (1 << SIGXFSZ) |  \
+	 (1 << SIGVTALRM) | (1 << SIGPROF) | (1 << SIGPOLL) | (1 << SIGIO) | (1 << SIGSYS) | (1 << SIGSTKFLT) | \
+	 (1 << SIGPWR))
 
 static inline int sig_fatal(int sig)
 {
@@ -1111,8 +1062,7 @@ static int setup_newborn_fds(struct pstree_item *me)
 	if (clone_service_fd(me))
 		return -1;
 
-	if (!me->parent ||
-	    (rsti(me->parent)->fdt && !(rsti(me)->clone_flags & CLONE_FILES))) {
+	if (!me->parent || (rsti(me->parent)->fdt && !(rsti(me)->clone_flags & CLONE_FILES))) {
 		/*
 		 * When our parent has shared fd table, some of the table owners
 		 * may be already created. Files, they open, will be inherited
@@ -1295,8 +1245,7 @@ struct cr_clone_arg {
 	CoreEntry *core;
 };
 
-static void maybe_clone_parent(struct pstree_item *item,
-			      struct cr_clone_arg *ca)
+static void maybe_clone_parent(struct pstree_item *item, struct cr_clone_arg *ca)
 {
 	/*
 	 * zdtm runs in kernel 3.11, which has the problem described below. We
@@ -1353,8 +1302,7 @@ static int set_next_pid(void *arg)
 
 	len = snprintf(buf, sizeof(buf), "%d", *pid - 1);
 	if (write(fd, buf, len) != len) {
-		pr_perror("Failed to write %s to /proc/%s",
-			buf, LAST_PID_PATH);
+		pr_perror("Failed to write %s to /proc/%s", buf, LAST_PID_PATH);
 		close(fd);
 		return -1;
 	}
@@ -1466,18 +1414,16 @@ static inline int fork_with_pid(struct pstree_item *item)
 	} else {
 		if (!external_pidns) {
 			if (pid != INIT_PID) {
-				pr_err("First PID in a PID namespace needs to be %d and not %d\n",
-					pid, INIT_PID);
+				pr_err("First PID in a PID namespace needs to be %d and not %d\n", pid, INIT_PID);
 				return -1;
 			}
 		}
 	}
 
 	if (kdat.has_clone3_set_tid) {
-		ret = clone3_with_pid_noasan(restore_task_with_children,
-				&ca, (ca.clone_flags &
-					~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)),
-				SIGCHLD, pid);
+		ret = clone3_with_pid_noasan(restore_task_with_children, &ca,
+					     (ca.clone_flags & ~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)),
+					     SIGCHLD, pid);
 	} else {
 		/*
 		 * Some kernel modules, such as network packet generator
@@ -1493,9 +1439,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 		 */
 		close_pid_proc();
 		ret = clone_noasan(restore_task_with_children,
-				(ca.clone_flags &
-				 ~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)) | SIGCHLD,
-				&ca);
+				   (ca.clone_flags & ~(CLONE_NEWNET | CLONE_NEWCGROUP | CLONE_NEWTIME)) | SIGCHLD, &ca);
 	}
 
 	if (ret < 0) {
@@ -1505,11 +1449,9 @@ static inline int fork_with_pid(struct pstree_item *item)
 		goto err_unlock;
 	}
 
-
 	if (item == root_item) {
 		item->pid->real = ret;
-		pr_debug("PID: real %d virt %d\n",
-				item->pid->real, vpid(item));
+		pr_debug("PID: real %d virt %d\n", item->pid->real, vpid(item));
 	}
 
 err_unlock:
@@ -1644,8 +1586,7 @@ static void restore_sid(void)
 			/* Skip the root task if it's not init */
 			if (current == root_item && vpid(root_item) != INIT_PID)
 				return;
-			pr_err("Requested sid %d doesn't match inherited %d\n",
-					current->sid, sid);
+			pr_err("Requested sid %d doesn't match inherited %d\n", current->sid, sid);
 			exit(1);
 		}
 	}
@@ -1804,8 +1745,7 @@ static int restore_task_with_children(void *_arg)
 		buf[ret] = '\0';
 
 		current->pid->real = atoi(buf);
-		pr_debug("PID: real %d virt %d\n",
-				current->pid->real, vpid(current));
+		pr_debug("PID: real %d virt %d\n", current->pid->real, vpid(current));
 	}
 
 	pid = getpid();
@@ -1993,7 +1933,6 @@ static int attach_to_tasks(bool root_seized)
 				return -1;
 			}
 
-
 			if (wait4(pid, &status, __WALL, NULL) != pid) {
 				pr_perror("waitpid(%d) failed", pid);
 				return -1;
@@ -2009,7 +1948,7 @@ static int attach_to_tasks(bool root_seized)
 			if (rsti(item)->has_seccomp && ptrace_suspend_seccomp(pid) < 0)
 				pr_err("failed to suspend seccomp, restore will probably fail...\n");
 
-			if (ptrace(PTRACE_CONT, pid, NULL, NULL) ) {
+			if (ptrace(PTRACE_CONT, pid, NULL, NULL)) {
 				pr_perror("Unable to resume %d", pid);
 				return -1;
 			}
@@ -2049,8 +1988,7 @@ static int catch_tasks(bool root_seized, enum trace_flags *flag)
 				return -1;
 			}
 
-			ret = compel_stop_pie(pid, rsti(item)->breakpoint,
-					flag, fault_injected(FI_NO_BREAKPOINTS));
+			ret = compel_stop_pie(pid, rsti(item)->breakpoint, flag, fault_injected(FI_NO_BREAKPOINTS));
 			if (ret < 0)
 				return -1;
 		}
@@ -2100,8 +2038,7 @@ static void finalize_restore(void)
 
 		xfree(ctl);
 
-		if ((item->pid->state == TASK_STOPPED) ||
-				(opts.final_state == TASK_STOPPED))
+		if ((item->pid->state == TASK_STOPPED) || (opts.final_state == TASK_STOPPED))
 			kill(item->pid->real, SIGSTOP);
 	}
 }
@@ -2249,9 +2186,9 @@ static int restore_root_task(struct pstree_item *init)
 	if (vpid(init) == INIT_PID) {
 		if (!(root_ns_mask & CLONE_NEWPID)) {
 			pr_err("This process tree can only be restored "
-				"in a new pid namespace.\n"
-				"criu should be re-executed with the "
-				"\"--namespace pid\" option.\n");
+			       "in a new pid namespace.\n"
+			       "criu should be re-executed with the "
+			       "\"--namespace pid\" option.\n");
 			return -1;
 		}
 	} else if (root_ns_mask & CLONE_NEWPID) {
@@ -2437,8 +2374,7 @@ skip_ns_bouncing:
 
 	__restore_switch_stage(CR_STATE_COMPLETE);
 
-	ret = compel_stop_on_syscall(task_entries->nr_threads,
-		__NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag);
+	ret = compel_stop_on_syscall(task_entries->nr_threads, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag);
 	if (ret) {
 		pr_err("Can't stop all tasks on rt_sigreturn\n");
 		goto out_kill_network_unlocked;
@@ -2491,8 +2427,7 @@ out_kill:
 			kill(root_item->pid->real, SIGKILL);
 
 		if (waitpid(root_item->pid->real, &status, 0) < 0)
-			pr_warn("Unable to wait %d: %s\n",
-				root_item->pid->real, strerror(errno));
+			pr_warn("Unable to wait %d: %s\n", root_item->pid->real, strerror(errno));
 	} else {
 		struct pstree_item *pi;
 
@@ -2608,8 +2543,7 @@ err:
 	return ret;
 }
 
-static long restorer_get_vma_hint(struct list_head *tgt_vma_list,
-		struct list_head *self_vma_list, long vma_len)
+static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_head *self_vma_list, long vma_len)
 {
 	struct vma_area *t_vma, *s_vma;
 	long prev_vma_end = 0;
@@ -2693,9 +2627,8 @@ static inline int decode_itimer(char *n, ItimerEntry *ie, struct itimerval *val)
 		return -1;
 	}
 
-	pr_info("Restored %s timer to %ld.%ld -> %ld.%ld\n", n,
-			val->it_value.tv_sec, val->it_value.tv_usec,
-			val->it_interval.tv_sec, val->it_interval.tv_usec);
+	pr_info("Restored %s timer to %ld.%ld -> %ld.%ld\n", n, val->it_value.tv_sec, val->it_value.tv_usec,
+		val->it_interval.tv_sec, val->it_interval.tv_usec);
 
 	return 0;
 }
@@ -2765,8 +2698,7 @@ static inline int timespec_valid(struct timespec *ts)
 	return (ts->tv_sec >= 0) && ((unsigned long)ts->tv_nsec < NSEC_PER_SEC);
 }
 
-static inline int decode_posix_timer(PosixTimerEntry *pte,
-		struct restore_posix_timer *pt)
+static inline int decode_posix_timer(PosixTimerEntry *pte, struct restore_posix_timer *pt)
 {
 	pt->val.it_interval.tv_sec = pte->isec;
 	pt->val.it_interval.tv_nsec = pte->insec;
@@ -2822,9 +2754,7 @@ static void sort_posix_timers(struct task_restore_args *ta)
 
 	if (ta->posix_timers_n > 0) {
 		tmem = rst_mem_remap_ptr((unsigned long)ta->posix_timers, RM_PRIVATE);
-		qsort(tmem, ta->posix_timers_n,
-				sizeof(struct restore_posix_timer),
-				cmp_posix_timer_proc_id);
+		qsort(tmem, ta->posix_timers_n, sizeof(struct restore_posix_timer), cmp_posix_timer_proc_id);
 	}
 }
 
@@ -2901,8 +2831,8 @@ out:
 
 static inline int verify_cap_size(CredsEntry *ce)
 {
-	return ((ce->n_cap_inh == CR_CAP_SIZE) && (ce->n_cap_eff == CR_CAP_SIZE) &&
-		(ce->n_cap_prm == CR_CAP_SIZE) && (ce->n_cap_bnd == CR_CAP_SIZE));
+	return ((ce->n_cap_inh == CR_CAP_SIZE) && (ce->n_cap_eff == CR_CAP_SIZE) && (ce->n_cap_prm == CR_CAP_SIZE) &&
+		(ce->n_cap_bnd == CR_CAP_SIZE));
 }
 
 static int prepare_mm(pid_t pid, struct task_restore_args *args)
@@ -2919,7 +2849,7 @@ static int prepare_mm(pid_t pid, struct task_restore_args *args)
 		goto out;
 	}
 
-	args->mm_saved_auxv_size = mm->n_mm_saved_auxv*sizeof(auxv_t);
+	args->mm_saved_auxv_size = mm->n_mm_saved_auxv * sizeof(auxv_t);
 	for (i = 0; i < mm->n_mm_saved_auxv; ++i) {
 		args->mm_saved_auxv[i] = (auxv_t)mm->mm_saved_auxv[i];
 	}
@@ -2965,9 +2895,7 @@ static int prepare_restorer_blob(void)
 	 */
 	restorer_len = round_up(pbd.hdr.args_off, page_size());
 
-	restorer = mmap(NULL, restorer_len,
-			PROT_READ | PROT_WRITE | PROT_EXEC,
-			MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	restorer = mmap(NULL, restorer_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 	if (restorer == MAP_FAILED) {
 		pr_perror("Can't map restorer code");
 		return -1;
@@ -2983,8 +2911,7 @@ static int remap_restorer_blob(void *addr)
 	struct parasite_blob_desc pbd;
 	void *mem;
 
-	mem = mremap(restorer, restorer_len, restorer_len,
-			MREMAP_FIXED | MREMAP_MAYMOVE, addr);
+	mem = mremap(restorer, restorer_len, restorer_len, MREMAP_FIXED | MREMAP_MAYMOVE, addr);
 	if (mem != addr) {
 		pr_perror("Can't remap restorer blob");
 		return -1;
@@ -3033,8 +2960,7 @@ static int prep_sched_info(struct rst_sched_param *sp, ThreadCoreEntry *tc)
 	sp->prio = tc->sched_prio;
 
 	if (!validate_sched_parm(sp)) {
-		pr_err("Inconsistent sched params received (%d.%d.%d)\n",
-				sp->policy, sp->nice, sp->prio);
+		pr_err("Inconsistent sched params received (%d.%d.%d)\n", sp->policy, sp->nice, sp->prio);
 		return -1;
 	}
 
@@ -3076,16 +3002,14 @@ static int prepare_rlimits_from_fd(int pid, struct task_restore_args *ta)
 
 		r = rst_mem_alloc(sizeof(*r), RM_PRIVATE);
 		if (!r) {
-			pr_err("Can't allocate memory for resource %d\n",
-			       ta->rlims_n);
+			pr_err("Can't allocate memory for resource %d\n", ta->rlims_n);
 			return -1;
 		}
 
 		r->rlim_cur = decode_rlim(re->cur);
 		r->rlim_max = decode_rlim(re->max);
 		if (r->rlim_cur > r->rlim_max) {
-			pr_err("Can't restore cur > max for %d.%d\n",
-					pid, ta->rlims_n);
+			pr_err("Can't restore cur > max for %d.%d\n", pid, ta->rlims_n);
 			r->rlim_cur = r->rlim_max;
 		}
 
@@ -3134,7 +3058,7 @@ static int signal_to_mem(SiginfoEntry *sie)
 {
 	siginfo_t *info, *t;
 
-	info = (siginfo_t *) sie->siginfo.data;
+	info = (siginfo_t *)sie->siginfo.data;
 	t = rst_mem_alloc(sizeof(siginfo_t), RM_PRIVATE);
 	if (!t)
 		return -1;
@@ -3177,7 +3101,7 @@ static int open_signal_image(int type, pid_t pid, unsigned int *nr)
 
 	close_image(img);
 
-	return ret ? : 0;
+	return ret ?: 0;
 }
 
 static int prepare_one_signal_queue(SignalQueueEntry *sqe, unsigned int *nr)
@@ -3205,7 +3129,7 @@ static int prepare_signals(int pid, struct task_restore_args *ta, CoreEntry *lea
 		goto out;
 
 	/* Prepare shared signals */
-	if (!leader_core->tc->signals_s)/*backward compatibility*/
+	if (!leader_core->tc->signals_s) /*backward compatibility*/
 		ret = open_signal_image(CR_FD_SIGNAL, pid, &ta->siginfo_n);
 	else
 		ret = prepare_one_signal_queue(leader_core->tc->signals_s, &ta->siginfo_n);
@@ -3214,12 +3138,10 @@ static int prepare_signals(int pid, struct task_restore_args *ta, CoreEntry *lea
 		goto out;
 
 	for (i = 0; i < current->nr_threads; i++) {
-		if (!current->core[i]->thread_core->signals_p)/*backward compatibility*/
-			ret = open_signal_image(CR_FD_PSIGNAL,
-					current->threads[i].ns[0].virt, &siginfo_priv_nr[i]);
+		if (!current->core[i]->thread_core->signals_p) /*backward compatibility*/
+			ret = open_signal_image(CR_FD_PSIGNAL, current->threads[i].ns[0].virt, &siginfo_priv_nr[i]);
 		else
-			ret = prepare_one_signal_queue(current->core[i]->thread_core->signals_p,
-										&siginfo_priv_nr[i]);
+			ret = prepare_one_signal_queue(current->core[i]->thread_core->signals_p, &siginfo_priv_nr[i]);
 		if (ret < 0)
 			goto out;
 	}
@@ -3228,10 +3150,11 @@ out:
 }
 
 extern void __gcov_flush(void) __attribute__((weak));
-void __gcov_flush(void) {}
+void __gcov_flush(void)
+{
+}
 
-static void rst_reloc_creds(struct thread_restore_args *thread_args,
-			    unsigned long *creds_pos_next)
+static void rst_reloc_creds(struct thread_restore_args *thread_args, unsigned long *creds_pos_next)
 {
 	struct thread_creds_args *args;
 
@@ -3251,11 +3174,11 @@ static void rst_reloc_creds(struct thread_restore_args *thread_args,
 	thread_args->creds_args = args;
 }
 
-static bool groups_match(gid_t* groups, int n_groups)
+static bool groups_match(gid_t *groups, int n_groups)
 {
 	int n, len;
 	bool ret;
-	gid_t* gids;
+	gid_t *gids;
 
 	n = getgroups(0, NULL);
 	if (n == -1) {
@@ -3285,16 +3208,14 @@ static bool groups_match(gid_t* groups, int n_groups)
 	return ret;
 }
 
-static struct thread_creds_args *
-rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
+static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 {
 	unsigned long this_pos;
 	struct thread_creds_args *args;
 
 	if (!verify_cap_size(ce)) {
-		pr_err("Caps size mismatch %d %d %d %d\n",
-		       (int)ce->n_cap_inh, (int)ce->n_cap_eff,
-		       (int)ce->n_cap_prm, (int)ce->n_cap_bnd);
+		pr_err("Caps size mismatch %d %d %d %d\n", (int)ce->n_cap_inh, (int)ce->n_cap_eff, (int)ce->n_cap_prm,
+		       (int)ce->n_cap_bnd);
 		return ERR_PTR(-EINVAL);
 	}
 
@@ -3537,8 +3458,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		/* Wait when all tasks restored all files */
 		if (restore_wait_other_tasks())
 			goto err_nv;
-		if (root_ns_mask & CLONE_NEWNS &&
-		    remount_readonly_mounts())
+		if (root_ns_mask & CLONE_NEWNS && remount_readonly_mounts())
 			goto err_nv;
 	}
 
@@ -3556,8 +3476,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	memzone_size = round_up(sizeof(struct restore_mem_zone) * current->nr_threads, page_size());
 	task_args->bootstrap_len = restorer_len + memzone_size + alen + rst_mem_size;
 	BUG_ON(task_args->bootstrap_len & (PAGE_SIZE - 1));
-	pr_info("%d threads require %ldK of memory\n",
-			current->nr_threads, KBYTES(task_args->bootstrap_len));
+	pr_info("%d threads require %ldK of memory\n", current->nr_threads, KBYTES(task_args->bootstrap_len));
 
 	if (core_is_compat(core))
 		vdso_maps_rt = vdso_maps_compat;
@@ -3585,16 +3504,13 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	 * or inited from scratch).
 	 */
 
-	mem = (void *)restorer_get_vma_hint(&vmas->h, &self_vmas.h,
-					      task_args->bootstrap_len);
+	mem = (void *)restorer_get_vma_hint(&vmas->h, &self_vmas.h, task_args->bootstrap_len);
 	if (mem == (void *)-1) {
-		pr_err("No suitable area for task_restore bootstrap (%ldK)\n",
-				task_args->bootstrap_len);
+		pr_err("No suitable area for task_restore bootstrap (%ldK)\n", task_args->bootstrap_len);
 		goto err;
 	}
 
-	pr_info("Found bootstrap VMA hint at: %p (needs ~%ldK)\n",
-			mem, KBYTES(task_args->bootstrap_len));
+	pr_info("Found bootstrap VMA hint at: %p (needs ~%ldK)\n", mem, KBYTES(task_args->bootstrap_len));
 
 	ret = remap_restorer_blob(mem);
 	if (ret < 0)
@@ -3604,16 +3520,15 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	 * Prepare a memory map for restorer. Note a thread space
 	 * might be completely unused so it's here just for convenience.
 	 */
-	task_args->clone_restore_fn	= restorer_sym(mem, arch_export_restore_thread);
-	restore_task_exec_start		= restorer_sym(mem, arch_export_restore_task);
-	rsti(current)->munmap_restorer	= restorer_munmap_addr(core, mem);
+	task_args->clone_restore_fn = restorer_sym(mem, arch_export_restore_thread);
+	restore_task_exec_start = restorer_sym(mem, arch_export_restore_task);
+	rsti(current)->munmap_restorer = restorer_munmap_addr(core, mem);
 
 	task_args->bootstrap_start = mem;
 	mem += restorer_len;
 
 	/* VMA we need for stacks and sigframes for threads */
-	if (mmap(mem, memzone_size, PROT_READ | PROT_WRITE,
-			MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0) != mem) {
+	if (mmap(mem, memzone_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, 0, 0) != mem) {
 		pr_perror("Can't mmap section for restore code");
 		goto err;
 	}
@@ -3623,7 +3538,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	mem += memzone_size;
 
 	/* New home for task_restore_args and thread_restore_args */
-	task_args = mremap(task_args, alen, alen, MREMAP_MAYMOVE|MREMAP_FIXED, mem);
+	task_args = mremap(task_args, alen, alen, MREMAP_MAYMOVE | MREMAP_FIXED, mem);
 	if (task_args != mem) {
 		pr_perror("Can't move task args");
 		goto err;
@@ -3699,10 +3614,10 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 
 	BUG_ON(core->mtype != CORE_ENTRY__MARCH);
 
-	task_args->logfd	= log_get_fd();
-	task_args->loglevel	= log_get_loglevel();
+	task_args->logfd = log_get_fd();
+	task_args->loglevel = log_get_loglevel();
 	log_get_logstart(&task_args->logstart);
-	task_args->sigchld_act	= sigchld_act;
+	task_args->sigchld_act = sigchld_act;
 
 	strncpy(task_args->comm, core->tc->comm, TASK_COMM_LEN - 1);
 	task_args->comm[TASK_COMM_LEN - 1] = 0;
@@ -3750,27 +3665,25 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		}
 
 		if ((tcore->tc || tcore->ids) && thread_args[i].pid != pid) {
-			pr_err("Thread has optional fields present %d\n",
-			       thread_args[i].pid);
+			pr_err("Thread has optional fields present %d\n", thread_args[i].pid);
 			ret = -1;
 		}
 
 		if (ret < 0) {
-			pr_err("Can't read core data for thread %d\n",
-			       thread_args[i].pid);
+			pr_err("Can't read core data for thread %d\n", thread_args[i].pid);
 			goto err;
 		}
 
-		thread_args[i].ta		= task_args;
-		thread_args[i].gpregs		= *CORE_THREAD_ARCH_INFO(tcore)->gpregs;
-		thread_args[i].clear_tid_addr	= CORE_THREAD_ARCH_INFO(tcore)->clear_tid_addr;
+		thread_args[i].ta = task_args;
+		thread_args[i].gpregs = *CORE_THREAD_ARCH_INFO(tcore)->gpregs;
+		thread_args[i].clear_tid_addr = CORE_THREAD_ARCH_INFO(tcore)->clear_tid_addr;
 		core_get_tls(tcore, &thread_args[i].tls);
 
 		rst_reloc_creds(&thread_args[i], &creds_pos_next);
 
-		thread_args[i].futex_rla	= tcore->thread_core->futex_rla;
-		thread_args[i].futex_rla_len	= tcore->thread_core->futex_rla_len;
-		thread_args[i].pdeath_sig	= tcore->thread_core->pdeath_sig;
+		thread_args[i].futex_rla = tcore->thread_core->futex_rla;
+		thread_args[i].futex_rla_len = tcore->thread_core->futex_rla_len;
+		thread_args[i].pdeath_sig = tcore->thread_core->pdeath_sig;
 		if (tcore->thread_core->pdeath_sig > _KNSIG) {
 			pr_err("Pdeath signal is too big\n");
 			goto err;
@@ -3802,9 +3715,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		if (thread_args[i].pid != pid)
 			core_entry__free_unpacked(tcore, NULL);
 
-		pr_info("Thread %4d stack %8p rt_sigframe %8p\n",
-				i, mz[i].stack, mz[i].rt_sigframe);
-
+		pr_info("Thread %4d stack %8p rt_sigframe %8p\n", i, mz[i].stack, mz[i].rt_sigframe);
 	}
 
 	/*
@@ -3829,17 +3740,17 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	/*
 	 * Now prepare run-time data for threads restore.
 	 */
-	task_args->nr_threads		= current->nr_threads;
-	task_args->thread_args		= thread_args;
+	task_args->nr_threads = current->nr_threads;
+	task_args->thread_args = thread_args;
 
-	task_args->auto_dedup		= opts.auto_dedup;
+	task_args->auto_dedup = opts.auto_dedup;
 
 	/*
 	 * In the restorer we need to know if it is SELinux or not. For SELinux
 	 * we must change the process context before creating threads. For
 	 * Apparmor we can change each thread after they have been created.
 	 */
-	task_args->lsm_type		= kdat.lsm;
+	task_args->lsm_type = kdat.lsm;
 
 	/*
 	 * Make root and cwd restore _that_ late not to break any
@@ -3866,9 +3777,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		"task_args->nr_threads: %d\n"
 		"task_args->clone_restore_fn: %p\n"
 		"task_args->thread_args: %p\n",
-		task_args, task_args->t->pid,
-		task_args->nr_threads,
-		task_args->clone_restore_fn,
+		task_args, task_args->t->pid, task_args->nr_threads, task_args->clone_restore_fn,
 		task_args->thread_args);
 
 	/*
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 888d6b7e4..38a8ea365 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -491,14 +491,14 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 
 	if (req->has_pre_dump_mode) {
 		switch (req->pre_dump_mode) {
-			case CRIU_PRE_DUMP_MODE__SPLICE:
-				opts.pre_dump_mode = PRE_DUMP_SPLICE;
-				break;
-			case CRIU_PRE_DUMP_MODE__VM_READ:
-				opts.pre_dump_mode = PRE_DUMP_READ;
-				break;
-			default:
-				goto err;
+		case CRIU_PRE_DUMP_MODE__SPLICE:
+			opts.pre_dump_mode = PRE_DUMP_SPLICE;
+			break;
+		case CRIU_PRE_DUMP_MODE__VM_READ:
+			opts.pre_dump_mode = PRE_DUMP_READ;
+			break;
+		default:
+			goto err;
 		}
 	}
 
@@ -553,8 +553,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 			goto err;
 
 	for (i = 0; i < req->n_cg_root; i++) {
-		if (new_cg_root_add(req->cg_root[i]->ctrl,
-					req->cg_root[i]->path))
+		if (new_cg_root_add(req->cg_root[i]->ctrl, req->cg_root[i]->path))
 			goto err;
 	}
 
@@ -698,7 +697,6 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->orphan_pts_master)
 		opts.orphan_pts_master = true;
 
-
 	/* Evaluate additional configuration file a second time to overwrite
 	 * all RPC settings. */
 	if (req->config_file) {
@@ -744,7 +742,7 @@ static int dump_using_req(int sk, CriuOpts *req)
 exit:
 	free_pidfd_store();
 pidfd_store_err:
-	if (req->leave_running  || !self_dump || !success) {
+	if (req->leave_running || !self_dump || !success) {
 		if (send_criu_dump_resp(sk, success, false) == -1) {
 			pr_perror("Can't send response");
 			success = false;
@@ -776,8 +774,7 @@ static int restore_using_req(int sk, CriuOpts *req)
 
 	success = true;
 exit:
-	if (send_criu_restore_resp(sk, success,
-				   root_item ? root_item->pid->real : -1) == -1) {
+	if (send_criu_restore_resp(sk, success, root_item ? root_item->pid->real : -1) == -1) {
 		pr_perror("Can't send response");
 		success = false;
 	}
@@ -861,9 +858,9 @@ static int pre_dump_using_req(int sk, CriuOpts *req)
 			goto cout;
 
 		ret = 0;
-cout:
+	cout:
 		free_pidfd_store();
-pidfd_store_err:
+	pidfd_store_err:
 		exit(ret);
 	}
 
@@ -947,7 +944,7 @@ static int start_page_server_req(int sk, CriuOpts *req, bool daemon_mode)
 		}
 
 		ret = 0;
-out_ch:
+	out_ch:
 		if (daemon_mode && ret < 0 && pid > 0)
 			kill(pid, SIGKILL);
 		close(start_pipe[1]);
@@ -1012,8 +1009,7 @@ static int chk_keepopen_req(CriuReq *msg)
 	if (msg->type == CRIU_REQ_TYPE__PAGE_SERVER_CHLD)
 		/* This just fork()-s so no leaks */
 		return 0;
-	else if (msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ||
-		 msg->type == CRIU_REQ_TYPE__CPUINFO_CHECK)
+	else if (msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP || msg->type == CRIU_REQ_TYPE__CPUINFO_CHECK)
 		return 0;
 	else if (msg->type == CRIU_REQ_TYPE__FEATURE_CHECK)
 		return 0;
@@ -1027,7 +1023,7 @@ static int chk_keepopen_req(CriuReq *msg)
  * Return the version information, depending on the information
  * available in version.h
  */
-static int handle_version(int sk, CriuReq * msg)
+static int handle_version(int sk, CriuReq *msg)
 {
 	CriuResp resp = CRIU_RESP__INIT;
 	CriuVersion version = CRIU_VERSION__INIT;
@@ -1065,7 +1061,7 @@ static int handle_version(int sk, CriuReq * msg)
  * For each feature which has been requested in msg->features
  * the corresponding parameter will be set in resp.features.
  */
-static int handle_feature_check(int sk, CriuReq * msg)
+static int handle_feature_check(int sk, CriuReq *msg)
 {
 	CriuResp resp = CRIU_RESP__INIT;
 	CriuFeatures feat = CRIU_FEATURES__INIT;
@@ -1092,16 +1088,13 @@ static int handle_feature_check(int sk, CriuReq * msg)
 
 		setproctitle("feature-check --rpc");
 
-		if ((msg->features->has_mem_track == 1) &&
-		    (msg->features->mem_track == true))
+		if ((msg->features->has_mem_track == 1) && (msg->features->mem_track == true))
 			feat.mem_track = kdat.has_dirty_track;
 
-		if ((msg->features->has_lazy_pages == 1) &&
-		    (msg->features->lazy_pages == true))
+		if ((msg->features->has_lazy_pages == 1) && (msg->features->lazy_pages == true))
 			feat.lazy_pages = kdat.has_uffd && uffd_noncooperative();
 
-		if ((msg->features->has_pidfd_store == 1) &&
-		    (msg->features->pidfd_store == true))
+		if ((msg->features->has_pidfd_store == 1) && (msg->features->pidfd_store == true))
 			feat.pidfd_store = kdat.has_pidfd_getfd && kdat.has_pidfd_open;
 
 		resp.features = &feat;
@@ -1179,16 +1172,14 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 		if (setup_opts_from_req(sk, msg->opts))
 			goto cout;
 
-		setproctitle("cpuinfo %s --rpc -D %s",
-			     msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ?
-			     "dump" : "check",
+		setproctitle("cpuinfo %s --rpc -D %s", msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ? "dump" : "check",
 			     images_dir);
 
 		if (msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP)
 			ret = cpuinfo_dump();
 		else
 			ret = cpuinfo_check();
-cout:
+	cout:
 		exit(ret);
 	}
 
@@ -1255,7 +1246,7 @@ more:
 		ret = start_page_server_req(sk, msg->opts, false);
 		break;
 	case CRIU_REQ_TYPE__WAIT_PID:
-		ret =  handle_wait_pid(sk, msg->pid);
+		ret = handle_wait_pid(sk, msg->pid);
 		break;
 	case CRIU_REQ_TYPE__CPUINFO_DUMP:
 	case CRIU_REQ_TYPE__CPUINFO_CHECK:
@@ -1304,11 +1295,10 @@ static void reap_worker(int signo)
 		}
 
 		if (WIFEXITED(status))
-			pr_info("Worker(pid %d) exited with %d\n",
-				pid, WEXITSTATUS(status));
+			pr_info("Worker(pid %d) exited with %d\n", pid, WEXITSTATUS(status));
 		else if (WIFSIGNALED(status))
-			pr_info("Worker(pid %d) was killed by %d: %s\n", pid,
-				WTERMSIG(status), strsignal(WTERMSIG(status)));
+			pr_info("Worker(pid %d) was killed by %d: %s\n", pid, WTERMSIG(status),
+				strsignal(WTERMSIG(status)));
 	}
 }
 
@@ -1318,8 +1308,8 @@ static int setup_sigchld_handler(void)
 
 	sigemptyset(&action.sa_mask);
 	sigaddset(&action.sa_mask, SIGCHLD);
-	action.sa_handler	= reap_worker;
-	action.sa_flags		= SA_RESTART;
+	action.sa_handler = reap_worker;
+	action.sa_flags = SA_RESTART;
 
 	if (sigaction(SIGCHLD, &action, NULL)) {
 		pr_perror("Can't setup SIGCHLD handler");
@@ -1335,8 +1325,8 @@ static int restore_sigchld_handler(void)
 
 	sigemptyset(&action.sa_mask);
 	sigaddset(&action.sa_mask, SIGCHLD);
-	action.sa_handler	= SIG_DFL;
-	action.sa_flags		= SA_RESTART;
+	action.sa_handler = SIG_DFL;
+	action.sa_flags = SA_RESTART;
 
 	if (sigaction(SIGCHLD, &action, NULL)) {
 		pr_perror("Can't restore SIGCHLD handler");
@@ -1373,17 +1363,14 @@ int cr_service(bool daemon_mode)
 			SET_CHAR_OPTS(addr, CR_DEFAULT_SERVICE_ADDRESS);
 		}
 
-		strncpy(server_addr.sun_path, opts.addr,
-				sizeof(server_addr.sun_path) - 1);
+		strncpy(server_addr.sun_path, opts.addr, sizeof(server_addr.sun_path) - 1);
 
-		server_addr_len = strlen(server_addr.sun_path)
-				+ sizeof(server_addr.sun_family);
+		server_addr_len = strlen(server_addr.sun_path) + sizeof(server_addr.sun_family);
 		client_addr_len = sizeof(client_addr);
 
 		unlink(server_addr.sun_path);
 
-		if (bind(server_fd, (struct sockaddr *) &server_addr,
-						server_addr_len) == -1) {
+		if (bind(server_fd, (struct sockaddr *)&server_addr, server_addr_len) == -1) {
 			pr_perror("Can't bind");
 			goto err;
 		}
diff --git a/criu/crtools.c b/criu/crtools.c
index 778a1f3af..ba41d382d 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -56,8 +56,7 @@ void flush_early_log_to_stderr(void)
 
 static int image_dir_mode(char *argv[], int optind)
 {
-	if (!strcmp(argv[optind], "dump") ||
-	    !strcmp(argv[optind], "pre-dump") ||
+	if (!strcmp(argv[optind], "dump") || !strcmp(argv[optind], "pre-dump") ||
 	    (!strcmp(argv[optind], "cpuinfo") && !strcmp(argv[optind + 1], "dump")))
 		return O_DUMP;
 
@@ -79,8 +78,7 @@ int main(int argc, char *argv[], char *envp[])
 	BUILD_BUG_ON(CTL_32 != SYSCTL_TYPE__CTL_32);
 	BUILD_BUG_ON(__CTL_STR != SYSCTL_TYPE__CTL_STR);
 	/* We use it for fd overlap handling in clone_service_fd() */
-	BUG_ON(get_service_fd(SERVICE_FD_MIN+1) <
-	       get_service_fd(SERVICE_FD_MAX-1));
+	BUG_ON(get_service_fd(SERVICE_FD_MIN + 1) < get_service_fd(SERVICE_FD_MAX - 1));
 
 	if (fault_injection_init()) {
 		pr_err("Failed to initialize fault injection when initializing crtools.\n");
@@ -95,7 +93,6 @@ int main(int argc, char *argv[], char *envp[])
 
 	init_opts();
 
-
 	ret = parse_options(argc, argv, &usage_error, &has_exec_cmd, state);
 
 	if (ret == 1)
@@ -110,7 +107,7 @@ int main(int argc, char *argv[], char *envp[])
 	log_set_loglevel(opts.log_level);
 
 	if (optind < argc && !strcmp(argv[optind], "swrk")) {
-		if (argc != optind+2) {
+		if (argc != optind + 2) {
 			fprintf(stderr, "Usage: criu swrk <fd>\n");
 			return 1;
 		}
@@ -121,7 +118,7 @@ int main(int argc, char *argv[], char *envp[])
 		 * corresponding lib call change.
 		 */
 		opts.swrk_restore = true;
-		return cr_service_work(atoi(argv[optind+1]));
+		return cr_service_work(atoi(argv[optind + 1]));
 	}
 
 	if (check_options())
@@ -159,8 +156,7 @@ int main(int argc, char *argv[], char *envp[])
 	} else {
 		/* No subcommands except for cpuinfo and restore --exec-cmd */
 		if (strcmp(argv[optind], "cpuinfo") && has_sub_command) {
-			pr_err("excessive parameter%s for command %s\n",
-				(argc - optind) > 2 ? "s" : "", argv[optind]);
+			pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", argv[optind]);
 			goto usage;
 		}
 	}
@@ -198,10 +194,8 @@ int main(int argc, char *argv[], char *envp[])
 	 * When a process group becomes an orphan,
 	 * its processes are sent a SIGHUP signal
 	 */
-	if (!strcmp(argv[optind], "restore") &&
-			opts.restore_detach &&
-			opts.final_state == TASK_STOPPED &&
-			opts.shell_job)
+	if (!strcmp(argv[optind], "restore") && opts.restore_detach && opts.final_state == TASK_STOPPED &&
+	    opts.shell_job)
 		pr_warn("Stopped and detached shell job will get SIGHUP from OS.\n");
 
 	if (chdir(opts.work_dir)) {
@@ -305,26 +299,25 @@ int main(int argc, char *argv[], char *envp[])
 	pr_err("unknown command: %s\n", argv[optind]);
 usage:
 	pr_msg("\n"
-"Usage:\n"
-"  criu dump|pre-dump -t PID [<options>]\n"
-"  criu restore [<options>]\n"
-"  criu check [--feature FEAT]\n"
-"  criu page-server\n"
-"  criu service [<options>]\n"
-"  criu dedup\n"
-"  criu lazy-pages -D DIR [<options>]\n"
-"\n"
-"Commands:\n"
-"  dump           checkpoint a process/tree identified by pid\n"
-"  pre-dump       pre-dump task(s) minimizing their frozen time\n"
-"  restore        restore a process/tree\n"
-"  check          checks whether the kernel support is up-to-date\n"
-"  page-server    launch page server\n"
-"  service        launch service\n"
-"  dedup          remove duplicates in memory dump\n"
-"  cpuinfo dump   writes cpu information into image file\n"
-"  cpuinfo check  validates cpu information read from image file\n"
-	);
+	       "Usage:\n"
+	       "  criu dump|pre-dump -t PID [<options>]\n"
+	       "  criu restore [<options>]\n"
+	       "  criu check [--feature FEAT]\n"
+	       "  criu page-server\n"
+	       "  criu service [<options>]\n"
+	       "  criu dedup\n"
+	       "  criu lazy-pages -D DIR [<options>]\n"
+	       "\n"
+	       "Commands:\n"
+	       "  dump           checkpoint a process/tree identified by pid\n"
+	       "  pre-dump       pre-dump task(s) minimizing their frozen time\n"
+	       "  restore        restore a process/tree\n"
+	       "  check          checks whether the kernel support is up-to-date\n"
+	       "  page-server    launch page server\n"
+	       "  service        launch service\n"
+	       "  dedup          remove duplicates in memory dump\n"
+	       "  cpuinfo dump   writes cpu information into image file\n"
+	       "  cpuinfo check  validates cpu information read from image file\n");
 
 	if (usage_error) {
 		pr_msg("\nTry -h|--help for more info\n");
@@ -333,178 +326,175 @@ usage:
 
 	pr_msg("\n"
 
-"Most of the true / false long options (the ones without arguments) can be\n"
-"prefixed with --no- to negate the option (example: --display-stats and\n"
-"--no-display-stats).\n"
-"\n"
-"Dump/Restore options:\n"
-"\n"
-"* Generic:\n"
-"  -t|--tree PID         checkpoint a process tree identified by PID\n"
-"  -d|--restore-detached detach after restore\n"
-"  -S|--restore-sibling  restore root task as sibling\n"
-"  -s|--leave-stopped    leave tasks in stopped state after checkpoint\n"
-"  -R|--leave-running    leave tasks in running state after checkpoint\n"
-"  -D|--images-dir DIR   directory for image files\n"
-"     --pidfile FILE     write root task, service or page-server pid to FILE\n"
-"  -W|--work-dir DIR     directory to cd and write logs/pidfiles/stats to\n"
-"                        (if not specified, value of --images-dir is used)\n"
-"     --cpu-cap [CAP]    CPU capabilities to write/check. CAP is comma-separated\n"
-"                        list of: cpu, fpu, all, ins, none. To disable\n"
-"                        a capability, use ^CAP. Empty argument implies all\n"
-"     --exec-cmd         execute the command specified after '--' on successful\n"
-"                        restore making it the parent of the restored process\n"
-"  --freeze-cgroup       use cgroup freezer to collect processes\n"
-"  --weak-sysctls        skip restoring sysctls that are not available\n"
-"  --lazy-pages          restore pages on demand\n"
-"                        this requires running a second instance of criu\n"
-"                        in lazy-pages mode: 'criu lazy-pages -D DIR'\n"
-"                        --lazy-pages and lazy-pages mode require userfaultfd\n"
-"  --stream              dump/restore images using criu-image-streamer\n"
-"\n"
-"* External resources support:\n"
-"  --external RES        dump objects from this list as external resources:\n"
-"                        Formats of RES on dump:\n"
-"                            tty[rdev:dev]\n"
-"                            file[mnt_id:inode]\n"
-"                            dev[major/minor]:NAME\n"
-"                            unix[ino]\n"
-"                            mnt[MOUNTPOINT]:COOKIE\n"
-"                            mnt[]{:AUTO_OPTIONS}\n"
-"                        Formats of RES on restore:\n"
-"                            dev[NAME]:DEVPATH\n"
-"                            veth[IFNAME]:OUTNAME{@BRIDGE}\n"
-"                            macvlan[IFNAME]:OUTNAME\n"
-"                            mnt[COOKIE]:ROOT\n"
-"                            netdev[IFNAME]:ORIGNAME\n"
-"\n"
-"* Special resources support:\n"
-"     --" SK_EST_PARAM "  checkpoint/restore established TCP connections\n"
-"     --" SK_INFLIGHT_PARAM "   skip (ignore) in-flight TCP connections\n"
-"     --" SK_CLOSE_PARAM "        don't dump the state of, or block, established tcp\n"
-"                        connections, and restore them in closed state.\n"
-"  -r|--root PATH        change the root filesystem (when run in mount namespace)\n"
-"  --evasive-devices     use any path to a device file if the original one\n"
-"                        is inaccessible\n"
-"  --link-remap          allow one to link unlinked files back when possible\n"
-"  --ghost-limit size    limit max size of deleted file contents inside image\n"
-"  --action-script FILE  add an external action script\n"
-"  -j|--" OPT_SHELL_JOB "        allow one to dump and restore shell jobs\n"
-"  -l|--" OPT_FILE_LOCKS "       handle file locks, for safety, only used for container\n"
-"  -L|--libdir           path to a plugin directory (by default " CR_PLUGIN_DEFAULT ")\n"
-"  --force-irmap         force resolving names for inotify/fsnotify watches\n"
-"  --irmap-scan-path FILE\n"
-"                        add a path the irmap hints to scan\n"
-"  --manage-cgroups [m]  dump/restore process' cgroups; argument can be one of\n"
-"                        'none', 'props', 'soft' (default), 'full', 'strict'\n"
-"                        or 'ignore'\n"
-"  --cgroup-root [controller:]/newroot\n"
-"                        on dump: change the root for the controller that will\n"
-"                        be dumped. By default, only the paths with tasks in\n"
-"                        them and below will be dumped.\n"
-"                        on restore: change the root cgroup the controller will\n"
-"                        be installed into. No controller means that root is the\n"
-"                        default for all controllers not specified\n"
-"  --cgroup-props STRING\n"
-"                        define cgroup controllers and properties\n"
-"                        to be checkpointed, which are described\n"
-"                        via STRING using simplified YAML format\n"
-"  --cgroup-props-file FILE\n"
-"                        same as --cgroup-props, but taking description\n"
-"                        from the path specified\n"
-"  --cgroup-dump-controller NAME\n"
-"                        define cgroup controller to be dumped\n"
-"                        and skip anything else present in system\n"
-"  --cgroup-yard PATH\n"
-"                        instead of trying to mount cgroups in CRIU, provide\n"
-"                        a path to a directory with already created cgroup yard.\n"
-"                        Useful if you don't want to grant CAP_SYS_ADMIN to CRIU\n"
-"  --lsm-profile TYPE:NAME\n"
-"                        Specify an LSM profile to be used during restore.\n"
-"                        The type can be either 'apparmor' or 'selinux'.\n"
-"  --lsm-mount-context CTX\n"
-"                        Specify a mount context to be used during restore.\n"
-"                        Only mounts with an existing context will have their\n"
-"                        mount context replaced with CTX.\n"
-"  --skip-mnt PATH       ignore this mountpoint when dumping the mount namespace\n"
-"  --enable-fs FSNAMES   a comma separated list of filesystem names or \"all\"\n"
-"                        force criu to (try to) dump/restore these filesystem's\n"
-"                        mountpoints even if fs is not supported\n"
-"  --inherit-fd fd[NUM]:RES\n"
-"                        Inherit file descriptors, treating fd NUM as being\n"
-"                        already opened via an existing RES, which can be:\n"
-"                            tty[rdev:dev]\n"
-"                            pipe[inode]\n"
-"                            socket[inode]\n"
-"                            file[mnt_id:inode]\n"
-"                            /memfd:name\n"
-"                            path/to/file\n"
-"  --empty-ns net        Create a namespace, but don't restore its properties\n"
-"                        (assuming it will be restored by action scripts)\n"
-"  -J|--join-ns NS:{PID|NS_FILE}[,OPTIONS]\n"
-"			Join existing namespace and restore process in it.\n"
-"			Namespace can be specified as either pid or file path.\n"
-"			OPTIONS can be used to specify parameters for userns:\n"
-"			    user:PID,UID,GID\n"
-"  --file-validation METHOD\n"
-"			pass the validation method to be used; argument\n"
-"			can be 'filesize' or 'buildid' (default).\n"
-"\n"
-"Check options:\n"
-"  Without options, \"criu check\" checks availability of absolutely required\n"
-"  kernel features, critical for performing dump and restore.\n"
-"  --extra               add check for extra kernel features\n"
-"  --experimental        add check for experimental kernel features\n"
-"  --all                 same as --extra --experimental\n"
-"  --feature FEAT        only check a particular feature, one of:"
-	);
+	       "Most of the true / false long options (the ones without arguments) can be\n"
+	       "prefixed with --no- to negate the option (example: --display-stats and\n"
+	       "--no-display-stats).\n"
+	       "\n"
+	       "Dump/Restore options:\n"
+	       "\n"
+	       "* Generic:\n"
+	       "  -t|--tree PID         checkpoint a process tree identified by PID\n"
+	       "  -d|--restore-detached detach after restore\n"
+	       "  -S|--restore-sibling  restore root task as sibling\n"
+	       "  -s|--leave-stopped    leave tasks in stopped state after checkpoint\n"
+	       "  -R|--leave-running    leave tasks in running state after checkpoint\n"
+	       "  -D|--images-dir DIR   directory for image files\n"
+	       "     --pidfile FILE     write root task, service or page-server pid to FILE\n"
+	       "  -W|--work-dir DIR     directory to cd and write logs/pidfiles/stats to\n"
+	       "                        (if not specified, value of --images-dir is used)\n"
+	       "     --cpu-cap [CAP]    CPU capabilities to write/check. CAP is comma-separated\n"
+	       "                        list of: cpu, fpu, all, ins, none. To disable\n"
+	       "                        a capability, use ^CAP. Empty argument implies all\n"
+	       "     --exec-cmd         execute the command specified after '--' on successful\n"
+	       "                        restore making it the parent of the restored process\n"
+	       "  --freeze-cgroup       use cgroup freezer to collect processes\n"
+	       "  --weak-sysctls        skip restoring sysctls that are not available\n"
+	       "  --lazy-pages          restore pages on demand\n"
+	       "                        this requires running a second instance of criu\n"
+	       "                        in lazy-pages mode: 'criu lazy-pages -D DIR'\n"
+	       "                        --lazy-pages and lazy-pages mode require userfaultfd\n"
+	       "  --stream              dump/restore images using criu-image-streamer\n"
+	       "\n"
+	       "* External resources support:\n"
+	       "  --external RES        dump objects from this list as external resources:\n"
+	       "                        Formats of RES on dump:\n"
+	       "                            tty[rdev:dev]\n"
+	       "                            file[mnt_id:inode]\n"
+	       "                            dev[major/minor]:NAME\n"
+	       "                            unix[ino]\n"
+	       "                            mnt[MOUNTPOINT]:COOKIE\n"
+	       "                            mnt[]{:AUTO_OPTIONS}\n"
+	       "                        Formats of RES on restore:\n"
+	       "                            dev[NAME]:DEVPATH\n"
+	       "                            veth[IFNAME]:OUTNAME{@BRIDGE}\n"
+	       "                            macvlan[IFNAME]:OUTNAME\n"
+	       "                            mnt[COOKIE]:ROOT\n"
+	       "                            netdev[IFNAME]:ORIGNAME\n"
+	       "\n"
+	       "* Special resources support:\n"
+	       "     --" SK_EST_PARAM "  checkpoint/restore established TCP connections\n"
+	       "     --" SK_INFLIGHT_PARAM "   skip (ignore) in-flight TCP connections\n"
+	       "     --" SK_CLOSE_PARAM "        don't dump the state of, or block, established tcp\n"
+	       "                        connections, and restore them in closed state.\n"
+	       "  -r|--root PATH        change the root filesystem (when run in mount namespace)\n"
+	       "  --evasive-devices     use any path to a device file if the original one\n"
+	       "                        is inaccessible\n"
+	       "  --link-remap          allow one to link unlinked files back when possible\n"
+	       "  --ghost-limit size    limit max size of deleted file contents inside image\n"
+	       "  --action-script FILE  add an external action script\n"
+	       "  -j|--" OPT_SHELL_JOB "        allow one to dump and restore shell jobs\n"
+	       "  -l|--" OPT_FILE_LOCKS "       handle file locks, for safety, only used for container\n"
+	       "  -L|--libdir           path to a plugin directory (by default " CR_PLUGIN_DEFAULT ")\n"
+	       "  --force-irmap         force resolving names for inotify/fsnotify watches\n"
+	       "  --irmap-scan-path FILE\n"
+	       "                        add a path the irmap hints to scan\n"
+	       "  --manage-cgroups [m]  dump/restore process' cgroups; argument can be one of\n"
+	       "                        'none', 'props', 'soft' (default), 'full', 'strict'\n"
+	       "                        or 'ignore'\n"
+	       "  --cgroup-root [controller:]/newroot\n"
+	       "                        on dump: change the root for the controller that will\n"
+	       "                        be dumped. By default, only the paths with tasks in\n"
+	       "                        them and below will be dumped.\n"
+	       "                        on restore: change the root cgroup the controller will\n"
+	       "                        be installed into. No controller means that root is the\n"
+	       "                        default for all controllers not specified\n"
+	       "  --cgroup-props STRING\n"
+	       "                        define cgroup controllers and properties\n"
+	       "                        to be checkpointed, which are described\n"
+	       "                        via STRING using simplified YAML format\n"
+	       "  --cgroup-props-file FILE\n"
+	       "                        same as --cgroup-props, but taking description\n"
+	       "                        from the path specified\n"
+	       "  --cgroup-dump-controller NAME\n"
+	       "                        define cgroup controller to be dumped\n"
+	       "                        and skip anything else present in system\n"
+	       "  --cgroup-yard PATH\n"
+	       "                        instead of trying to mount cgroups in CRIU, provide\n"
+	       "                        a path to a directory with already created cgroup yard.\n"
+	       "                        Useful if you don't want to grant CAP_SYS_ADMIN to CRIU\n"
+	       "  --lsm-profile TYPE:NAME\n"
+	       "                        Specify an LSM profile to be used during restore.\n"
+	       "                        The type can be either 'apparmor' or 'selinux'.\n"
+	       "  --lsm-mount-context CTX\n"
+	       "                        Specify a mount context to be used during restore.\n"
+	       "                        Only mounts with an existing context will have their\n"
+	       "                        mount context replaced with CTX.\n"
+	       "  --skip-mnt PATH       ignore this mountpoint when dumping the mount namespace\n"
+	       "  --enable-fs FSNAMES   a comma separated list of filesystem names or \"all\"\n"
+	       "                        force criu to (try to) dump/restore these filesystem's\n"
+	       "                        mountpoints even if fs is not supported\n"
+	       "  --inherit-fd fd[NUM]:RES\n"
+	       "                        Inherit file descriptors, treating fd NUM as being\n"
+	       "                        already opened via an existing RES, which can be:\n"
+	       "                            tty[rdev:dev]\n"
+	       "                            pipe[inode]\n"
+	       "                            socket[inode]\n"
+	       "                            file[mnt_id:inode]\n"
+	       "                            /memfd:name\n"
+	       "                            path/to/file\n"
+	       "  --empty-ns net        Create a namespace, but don't restore its properties\n"
+	       "                        (assuming it will be restored by action scripts)\n"
+	       "  -J|--join-ns NS:{PID|NS_FILE}[,OPTIONS]\n"
+	       "			Join existing namespace and restore process in it.\n"
+	       "			Namespace can be specified as either pid or file path.\n"
+	       "			OPTIONS can be used to specify parameters for userns:\n"
+	       "			    user:PID,UID,GID\n"
+	       "  --file-validation METHOD\n"
+	       "			pass the validation method to be used; argument\n"
+	       "			can be 'filesize' or 'buildid' (default).\n"
+	       "\n"
+	       "Check options:\n"
+	       "  Without options, \"criu check\" checks availability of absolutely required\n"
+	       "  kernel features, critical for performing dump and restore.\n"
+	       "  --extra               add check for extra kernel features\n"
+	       "  --experimental        add check for experimental kernel features\n"
+	       "  --all                 same as --extra --experimental\n"
+	       "  --feature FEAT        only check a particular feature, one of:");
 	pr_check_features("                            ", ", ", 80);
-	pr_msg(
-"\n"
-"* Logging:\n"
-"  -o|--log-file FILE    log file name\n"
-"     --log-pid          enable per-process logging to separate FILE.pid files\n"
-"  -v[v...]|--verbosity  increase verbosity (can use multiple v)\n"
-"  -vNUM|--verbosity=NUM set verbosity to NUM (higher level means more output):\n"
-"                          -v1 - only errors and messages\n"
-"                          -v2 - also warnings (default level)\n"
-"                          -v3 - also information messages and timestamps\n"
-"                          -v4 - lots of debug\n"
-"  --display-stats       print out dump/restore stats\n"
-"\n"
-"* Memory dumping options:\n"
-"  --track-mem           turn on memory changes tracker in kernel\n"
-"  --prev-images-dir DIR path to images from previous dump (relative to -D)\n"
-"  --page-server         send pages to page server (see options below as well)\n"
-"  --auto-dedup          when used on dump it will deduplicate \"old\" data in\n"
-"                        pages images of previous dump\n"
-"                        when used on restore, as soon as page is restored, it\n"
-"                        will be punched from the image\n"
-"  --pre-dump-mode       splice - parasite based pre-dumping (default)\n"
-"                        read   - process_vm_readv syscall based pre-dumping\n"
-"\n"
-"Page/Service server options:\n"
-"  --address ADDR        address of server or service\n"
-"  --port PORT           port of page server\n"
-"  --ps-socket FD        use specified FD as page server socket\n"
-"  -d|--daemon           run in the background after creating socket\n"
-"  --status-fd FD        write \\0 to the FD and close it once process is ready\n"
-"                        to handle requests\n"
-"  --tls-cacert FILE     trust certificates signed only by this CA\n"
-"  --tls-cacrl FILE      path to CA certificate revocation list file\n"
-"  --tls-cert FILE       path to TLS certificate file\n"
-"  --tls-key FILE        path to TLS private key file\n"
-"  --tls                 use TLS to secure remote connection\n"
-"  --tls-no-cn-verify    do not verify common name in server certificate\n"
-"\n"
-"Configuration file options:\n"
-"  --config FILEPATH     pass a specific configuration file\n"
-"  --no-default-config   forbid usage of default configuration files\n"
-"\n"
-"Other options:\n"
-"  -h|--help             show this text\n"
-"  -V|--version          show version\n"
-	);
+	pr_msg("\n"
+	       "* Logging:\n"
+	       "  -o|--log-file FILE    log file name\n"
+	       "     --log-pid          enable per-process logging to separate FILE.pid files\n"
+	       "  -v[v...]|--verbosity  increase verbosity (can use multiple v)\n"
+	       "  -vNUM|--verbosity=NUM set verbosity to NUM (higher level means more output):\n"
+	       "                          -v1 - only errors and messages\n"
+	       "                          -v2 - also warnings (default level)\n"
+	       "                          -v3 - also information messages and timestamps\n"
+	       "                          -v4 - lots of debug\n"
+	       "  --display-stats       print out dump/restore stats\n"
+	       "\n"
+	       "* Memory dumping options:\n"
+	       "  --track-mem           turn on memory changes tracker in kernel\n"
+	       "  --prev-images-dir DIR path to images from previous dump (relative to -D)\n"
+	       "  --page-server         send pages to page server (see options below as well)\n"
+	       "  --auto-dedup          when used on dump it will deduplicate \"old\" data in\n"
+	       "                        pages images of previous dump\n"
+	       "                        when used on restore, as soon as page is restored, it\n"
+	       "                        will be punched from the image\n"
+	       "  --pre-dump-mode       splice - parasite based pre-dumping (default)\n"
+	       "                        read   - process_vm_readv syscall based pre-dumping\n"
+	       "\n"
+	       "Page/Service server options:\n"
+	       "  --address ADDR        address of server or service\n"
+	       "  --port PORT           port of page server\n"
+	       "  --ps-socket FD        use specified FD as page server socket\n"
+	       "  -d|--daemon           run in the background after creating socket\n"
+	       "  --status-fd FD        write \\0 to the FD and close it once process is ready\n"
+	       "                        to handle requests\n"
+	       "  --tls-cacert FILE     trust certificates signed only by this CA\n"
+	       "  --tls-cacrl FILE      path to CA certificate revocation list file\n"
+	       "  --tls-cert FILE       path to TLS certificate file\n"
+	       "  --tls-key FILE        path to TLS private key file\n"
+	       "  --tls                 use TLS to secure remote connection\n"
+	       "  --tls-no-cn-verify    do not verify common name in server certificate\n"
+	       "\n"
+	       "Configuration file options:\n"
+	       "  --config FILEPATH     pass a specific configuration file\n"
+	       "  --no-default-config   forbid usage of default configuration files\n"
+	       "\n"
+	       "Other options:\n"
+	       "  -h|--help             show this text\n"
+	       "  -V|--version          show version\n");
 
 	return 0;
 
diff --git a/criu/eventfd.c b/criu/eventfd.c
index da31ce9f5..a5d51a189 100644
--- a/criu/eventfd.c
+++ b/criu/eventfd.c
@@ -22,12 +22,12 @@
 #include "protobuf.h"
 #include "images/eventfd.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "eventfd: "
 
 struct eventfd_file_info {
-	EventfdFileEntry		*efe;
-	struct file_desc		d;
+	EventfdFileEntry *efe;
+	struct file_desc d;
 };
 
 /* Checks if file descriptor @lfd is eventfd */
@@ -38,8 +38,7 @@ int is_eventfd_link(char *link)
 
 static void pr_info_eventfd(char *action, EventfdFileEntry *efe)
 {
-	pr_info("%s: id %#08x flags %#04x counter %#016"PRIx64"\n",
-		action, efe->id, efe->flags, efe->counter);
+	pr_info("%s: id %#08x flags %#04x counter %#016" PRIx64 "\n", action, efe->id, efe->flags, efe->counter);
 }
 
 static int dump_one_eventfd(int lfd, u32 id, const struct fd_parms *p)
@@ -63,8 +62,8 @@ static int dump_one_eventfd(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops eventfd_dump_ops = {
-	.type		= FD_TYPES__EVENTFD,
-	.dump		= dump_one_eventfd,
+	.type = FD_TYPES__EVENTFD,
+	.dump = dump_one_eventfd,
 };
 
 static int eventfd_open(struct file_desc *d, int *new_fd)
@@ -76,14 +75,12 @@ static int eventfd_open(struct file_desc *d, int *new_fd)
 
 	tmp = eventfd(info->efe->counter, 0);
 	if (tmp < 0) {
-		pr_perror("Can't create eventfd %#08x",
-			  info->efe->id);
+		pr_perror("Can't create eventfd %#08x", info->efe->id);
 		return -1;
 	}
 
 	if (rst_file_params(tmp, info->efe->fown, info->efe->flags)) {
-		pr_perror("Can't restore params on eventfd %#08x",
-			  info->efe->id);
+		pr_perror("Can't restore params on eventfd %#08x", info->efe->id);
 		goto err_close;
 	}
 
diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index 9818f24dd..978dca5be 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -30,33 +30,33 @@
 #include "protobuf.h"
 #include "images/eventpoll.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "epoll: "
 
 static LIST_HEAD(dinfo_list);
 
 typedef struct {
-	uint32_t			tfd;
-	uint32_t			off;
-	uint32_t			idx;
+	uint32_t tfd;
+	uint32_t off;
+	uint32_t idx;
 } toff_t;
 
 struct eventpoll_dinfo {
-	struct list_head		list;
+	struct list_head list;
 
-	FileEntry			*fe;
-	EventpollFileEntry		*e;
+	FileEntry *fe;
+	EventpollFileEntry *e;
 
-	toff_t				*toff;
-	FownEntry			fown;
+	toff_t *toff;
+	FownEntry fown;
 
-	pid_t				pid;
-	int				efd;
+	pid_t pid;
+	int efd;
 };
 
 struct eventpoll_file_info {
-	EventpollFileEntry		*efe;
-	struct file_desc		d;
+	EventpollFileEntry *efe;
+	struct file_desc d;
 };
 
 /* Checks if file descriptor @lfd is eventfd */
@@ -67,8 +67,8 @@ int is_eventpoll_link(char *link)
 
 static void pr_info_eventpoll_tfd(char *action, uint32_t id, EventpollTfdEntry *e)
 {
-	pr_info("%seventpoll-tfd: id %#08x tfd %8d events %#08x data %#016"PRIx64"\n",
-		action, id, e->tfd, e->events, e->data);
+	pr_info("%seventpoll-tfd: id %#08x tfd %8d events %#08x data %#016" PRIx64 "\n", action, id, e->tfd, e->events,
+		e->data);
 }
 
 static void pr_info_eventpoll(char *action, EventpollFileEntry *e)
@@ -90,16 +90,16 @@ static int queue_dinfo(FileEntry **fe, EventpollFileEntry **e, toff_t **toff, co
 
 	INIT_LIST_HEAD(&dinfo->list);
 
-	dinfo->fe	= *fe;
-	dinfo->e	= *e;
-	dinfo->toff	= *toff;
-	dinfo->e->fown	= &dinfo->fown;
-	dinfo->pid	= p->pid;
-	dinfo->efd	= p->fd;
+	dinfo->fe = *fe;
+	dinfo->e = *e;
+	dinfo->toff = *toff;
+	dinfo->e->fown = &dinfo->fown;
+	dinfo->pid = p->pid;
+	dinfo->efd = p->fd;
 
-	*fe	= NULL;
-	*e	= NULL;
-	*toff	= NULL;
+	*fe = NULL;
+	*e = NULL;
+	*toff = NULL;
 
 	list_add_tail(&dinfo->list, &dinfo_list);
 	return 0;
@@ -133,31 +133,29 @@ int flush_eventpoll_dinfo_queue(void)
 		for (i = 0; i < e->n_tfd; i++) {
 			EventpollTfdEntry *tfde = e->tfd[i];
 			struct kid_elem ke = {
-				.pid	= dinfo->pid,
-				.genid	= make_gen_id(tfde->dev,
-						      tfde->inode,
-						      tfde->pos),
-				.idx	= tfde->tfd,
+				.pid = dinfo->pid,
+				.genid = make_gen_id(tfde->dev, tfde->inode, tfde->pos),
+				.idx = tfde->tfd,
 			};
 			kcmp_epoll_slot_t slot = {
-				.efd	= dinfo->efd,
-				.tfd	= tfde->tfd,
-				.toff	= dinfo->toff[i].off,
+				.efd = dinfo->efd,
+				.tfd = tfde->tfd,
+				.toff = dinfo->toff[i].off,
 			};
 			struct kid_elem *t = kid_lookup_epoll_tfd(&fd_tree, &ke, &slot);
 			if (!t) {
-				pr_debug("kid_lookup_epoll: no match pid %d efd %d tfd %d toff %u\n",
-					 dinfo->pid, dinfo->efd, tfde->tfd, dinfo->toff[i].off);
+				pr_debug("kid_lookup_epoll: no match pid %d efd %d tfd %d toff %u\n", dinfo->pid,
+					 dinfo->efd, tfde->tfd, dinfo->toff[i].off);
 				goto err;
 			}
 
-			pr_debug("kid_lookup_epoll: rbsearch match pid %d efd %d tfd %d toff %u -> %d\n",
-				 dinfo->pid, dinfo->efd, tfde->tfd, dinfo->toff[i].off, t->idx);
+			pr_debug("kid_lookup_epoll: rbsearch match pid %d efd %d tfd %d toff %u -> %d\n", dinfo->pid,
+				 dinfo->efd, tfde->tfd, dinfo->toff[i].off, t->idx);
 
 			/* Make sure the pid matches */
 			if (t->pid != dinfo->pid) {
-				pr_debug("kid_lookup_epoll: pid mismatch %d %d efd %d tfd %d toff %u\n",
-					 dinfo->pid, t->pid, dinfo->efd, tfde->tfd, dinfo->toff[i].off);
+				pr_debug("kid_lookup_epoll: pid mismatch %d %d efd %d tfd %d toff %u\n", dinfo->pid,
+					 t->pid, dinfo->efd, tfde->tfd, dinfo->toff[i].off);
 				goto err;
 			}
 
@@ -218,13 +216,12 @@ static int toff_cmp_idx(const void *a, const void *b)
  * fds in fd_parms are sorted so we can use binary search
  * for better performance.
  */
-static int find_tfd_bsearch(pid_t pid, int efd, int fds[], size_t nr_fds,
-			    int tfd, unsigned int toff)
+static int find_tfd_bsearch(pid_t pid, int efd, int fds[], size_t nr_fds, int tfd, unsigned int toff)
 {
 	kcmp_epoll_slot_t slot = {
-		.efd	= efd,
-		.tfd	= tfd,
-		.toff	= toff,
+		.efd = efd,
+		.tfd = tfd,
+		.toff = toff,
 	};
 	int *tfd_found;
 
@@ -243,14 +240,13 @@ static int find_tfd_bsearch(pid_t pid, int efd, int fds[], size_t nr_fds,
 				return tfd;
 			}
 		} else {
-			pr_debug("find_tfd_bsearch (kcmp-no): bsearch match pid %d efd %d tfd %d toff %u\n",
-				 pid, efd, tfd, toff);
+			pr_debug("find_tfd_bsearch (kcmp-no): bsearch match pid %d efd %d tfd %d toff %u\n", pid, efd,
+				 tfd, toff);
 			return tfd;
 		}
 	}
 
-	pr_debug("find_tfd_bsearch: no match pid %d efd %d tfd %d toff %u\n",
-		 pid, efd, tfd, toff);
+	pr_debug("find_tfd_bsearch: no match pid %d efd %d tfd %d toff %u\n", pid, efd, tfd, toff);
 	return -1;
 }
 
@@ -272,16 +268,16 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 		goto out;
 	file_entry__init(fe);
 
-	e->id		= id;
-	e->flags	= p->flags;
-	e->fown		= (FownEntry *)&p->fown;
+	e->id = id;
+	e->flags = p->flags;
+	e->fown = (FownEntry *)&p->fown;
 
 	if (parse_fdinfo(lfd, FD_TYPES__EVENTPOLL, e))
 		goto out;
 
-	fe->type	= FD_TYPES__EVENTPOLL;
-	fe->id		= e->id;
-	fe->epfd	= e;
+	fe->type = FD_TYPES__EVENTPOLL;
+	fe->id = e->id;
+	fe->epfd = e;
 
 	/*
 	 * In regular case there is no so many dup'ed
@@ -293,9 +289,9 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 		if (!toff)
 			goto out;
 		for (i = 0; i < e->n_tfd; i++) {
-			toff[i].idx	= i;
-			toff[i].tfd	= e->tfd[i]->tfd;
-			toff[i].off	= 0;
+			toff[i].idx = i;
+			toff[i].tfd = e->tfd[i]->tfd;
+			toff[i].off = 0;
 		}
 
 		qsort(toff, e->n_tfd, sizeof(*toff), toff_cmp);
@@ -317,14 +313,13 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 	 */
 	if (p->dfds) {
 		for (i = 0; i < e->n_tfd; i++) {
-			int tfd = find_tfd_bsearch(p->pid, p->fd, p->dfds->fds,
-						   p->dfds->nr_fds, e->tfd[i]->tfd, toff[i].off);
+			int tfd = find_tfd_bsearch(p->pid, p->fd, p->dfds->fds, p->dfds->nr_fds, e->tfd[i]->tfd,
+						   toff[i].off);
 			if (tfd == -1) {
 				if (kdat.has_kcmp_epoll_tfd) {
 					ret = queue_dinfo(&fe, &e, &toff, p);
 				} else {
-					pr_err("Escaped/closed fd descriptor %d on pid %d\n",
-					       e->tfd[i]->tfd, p->pid);
+					pr_err("Escaped/closed fd descriptor %d on pid %d\n", e->tfd[i]->tfd, p->pid);
 				}
 				goto out;
 			}
@@ -352,8 +347,8 @@ out:
 }
 
 const struct fdtype_ops eventpoll_dump_ops = {
-	.type		= FD_TYPES__EVENTPOLL,
-	.dump		= dump_one_eventpoll,
+	.type = FD_TYPES__EVENTPOLL,
+	.dump = dump_one_eventpoll,
 };
 
 static int eventpoll_post_open(struct file_desc *d, int fd);
@@ -373,14 +368,12 @@ static int eventpoll_open(struct file_desc *d, int *new_fd)
 
 	tmp = epoll_create(1);
 	if (tmp < 0) {
-		pr_perror("Can't create epoll %#08x",
-			  info->efe->id);
+		pr_perror("Can't create epoll %#08x", info->efe->id);
 		return -1;
 	}
 
 	if (rst_file_params(tmp, info->efe->fown, info->efe->flags)) {
-		pr_perror("Can't restore file params on epoll %#08x",
-			  info->efe->id);
+		pr_perror("Can't restore file params on epoll %#08x", info->efe->id);
 		goto err_close;
 	}
 
@@ -418,8 +411,8 @@ static int eventpoll_retore_tfd(int fd, int id, EventpollTfdEntry *tdefe)
 
 	pr_info_eventpoll_tfd("Restore ", id, tdefe);
 
-	event.events	= tdefe->events;
-	event.data.u64	= tdefe->data;
+	event.events = tdefe->events;
+	event.data.u64 = tdefe->data;
 	if (epoll_ctl(fd, EPOLL_CTL_ADD, tdefe->tfd, &event)) {
 		pr_perror("Can't add event on %#08x", id);
 		return -1;
@@ -448,8 +441,8 @@ static int eventpoll_post_open(struct file_desc *d, int fd)
 }
 
 static struct file_desc_ops desc_ops = {
-	.type		= FD_TYPES__EVENTPOLL,
-	.open		= eventpoll_open,
+	.type = FD_TYPES__EVENTPOLL,
+	.open = eventpoll_open,
 };
 
 static int collect_one_epoll_tfd(void *o, ProtobufCMessage *msg, struct cr_img *i)
@@ -484,10 +477,10 @@ static int collect_one_epoll_tfd(void *o, ProtobufCMessage *msg, struct cr_img *
 }
 
 struct collect_image_info epoll_tfd_cinfo = {
-	.fd_type	= CR_FD_EVENTPOLL_TFD,
-	.pb_type	= PB_EVENTPOLL_TFD,
-	.collect	= collect_one_epoll_tfd,
-	.flags		= COLLECT_NOFREE,
+	.fd_type = CR_FD_EVENTPOLL_TFD,
+	.pb_type = PB_EVENTPOLL_TFD,
+	.collect = collect_one_epoll_tfd,
+	.flags = COLLECT_NOFREE,
 };
 
 static int collect_one_epoll(void *o, ProtobufCMessage *msg, struct cr_img *i)
@@ -500,8 +493,8 @@ static int collect_one_epoll(void *o, ProtobufCMessage *msg, struct cr_img *i)
 }
 
 struct collect_image_info epoll_cinfo = {
-	.fd_type	= CR_FD_EVENTPOLL_FILE,
-	.pb_type	= PB_EVENTPOLL_FILE,
-	.priv_size	= sizeof(struct eventpoll_file_info),
-	.collect	= collect_one_epoll,
+	.fd_type = CR_FD_EVENTPOLL_FILE,
+	.pb_type = PB_EVENTPOLL_FILE,
+	.priv_size = sizeof(struct eventpoll_file_info),
+	.collect = collect_one_epoll,
 };
diff --git a/criu/fdstore.c b/criu/fdstore.c
index 40c4b90cd..77935484f 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -16,7 +16,7 @@
 static struct fdstore_desc {
 	int next_id;
 	mutex_t lock; /* to protect a peek offset */
-} *desc;
+} * desc;
 
 int fdstore_init(void)
 {
@@ -54,7 +54,7 @@ int fdstore_init(void)
 	}
 
 	addr.sun_family = AF_UNIX;
-	addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%"PRIx64, st.st_ino);
+	addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64, st.st_ino);
 	addrlen += sizeof(addr.sun_family);
 
 	addr.sun_path[0] = 0;
@@ -66,12 +66,12 @@ int fdstore_init(void)
 	 * a queue and remember its sequence number. Then we can set SO_PEEK_OFF
 	 * to get a file descriptor without dequeuing it.
 	 */
-	if (bind(sk, (struct sockaddr *) &addr, addrlen)) {
+	if (bind(sk, (struct sockaddr *)&addr, addrlen)) {
 		pr_perror("Unable to bind a socket");
 		close(sk);
 		return -1;
 	}
-	if (connect(sk, (struct sockaddr *) &addr, addrlen)) {
+	if (connect(sk, (struct sockaddr *)&addr, addrlen)) {
 		pr_perror("Unable to connect a socket");
 		close(sk);
 		return -1;
diff --git a/criu/fifo.c b/criu/fifo.c
index a26934319..bb291c14e 100644
--- a/criu/fifo.c
+++ b/criu/fifo.c
@@ -30,14 +30,16 @@
  */
 
 struct fifo_info {
-	struct list_head	list;
-	struct file_desc	d;
-	FifoEntry		*fe;
-	bool			restore_data;
+	struct list_head list;
+	struct file_desc d;
+	FifoEntry *fe;
+	bool restore_data;
 };
 
 static LIST_HEAD(fifo_head);
-static struct pipe_data_dump pd_fifo = { .img_type = CR_FD_FIFO_DATA, };
+static struct pipe_data_dump pd_fifo = {
+	.img_type = CR_FD_FIFO_DATA,
+};
 
 static int dump_one_fifo(int lfd, u32 id, const struct fd_parms *p)
 {
@@ -56,13 +58,12 @@ static int dump_one_fifo(int lfd, u32 id, const struct fd_parms *p)
 	if (dump_one_reg_file(lfd, rf_id, p))
 		return -1;
 
-	pr_info("Dumping fifo %d with id %#x pipe_id %#x\n",
-			lfd, id, pipe_id(p));
+	pr_info("Dumping fifo %d with id %#x pipe_id %#x\n", lfd, id, pipe_id(p));
 
-	e.id		= id;
-	e.pipe_id	= pipe_id(p);
-	e.has_regf_id	= true;
-	e.regf_id	= rf_id;
+	e.id = id;
+	e.pipe_id = pipe_id(p);
+	e.has_regf_id = true;
+	e.regf_id = rf_id;
 
 	fe.type = FD_TYPES__FIFO;
 	fe.id = e.id;
@@ -75,8 +76,8 @@ static int dump_one_fifo(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops fifo_dump_ops = {
-	.type		= FD_TYPES__FIFO,
-	.dump		= dump_one_fifo,
+	.type = FD_TYPES__FIFO,
+	.dump = dump_one_fifo,
 };
 
 static struct pipe_data_rst *pd_hash_fifo[PIPE_DATA_HASH_SIZE];
@@ -105,8 +106,7 @@ static int do_open_fifo(int ns_root_fd, struct reg_file_info *rfi, void *arg)
 	}
 
 	if (info->restore_data)
-		if (restore_pipe_data(CR_FD_FIFO_DATA, fake_fifo,
-					info->fe->pipe_id, pd_hash_fifo)) {
+		if (restore_pipe_data(CR_FD_FIFO_DATA, fake_fifo, info->fe->pipe_id, pd_hash_fifo)) {
 			close(new_fifo);
 			new_fifo = -1;
 		}
@@ -122,8 +122,7 @@ static int open_fifo_fd(struct file_desc *d, int *new_fd)
 	struct file_desc *reg_d;
 	int fd;
 
-	reg_d = collect_special_file(info->fe->has_regf_id ?
-			info->fe->regf_id : info->fe->id);
+	reg_d = collect_special_file(info->fe->has_regf_id ? info->fe->regf_id : info->fe->id);
 	if (!reg_d)
 		return -1;
 
@@ -135,8 +134,8 @@ static int open_fifo_fd(struct file_desc *d, int *new_fd)
 }
 
 static struct file_desc_ops fifo_desc_ops = {
-	.type		= FD_TYPES__FIFO,
-	.open		= open_fifo_fd,
+	.type = FD_TYPES__FIFO,
+	.open = open_fifo_fd,
 };
 
 static int collect_one_fifo(void *o, ProtobufCMessage *base, struct cr_img *i)
@@ -144,8 +143,7 @@ static int collect_one_fifo(void *o, ProtobufCMessage *base, struct cr_img *i)
 	struct fifo_info *info = o, *f;
 
 	info->fe = pb_msg(base, FifoEntry);
-	pr_info("Collected fifo entry ID %#x PIPE ID %#x\n",
-			info->fe->id, info->fe->pipe_id);
+	pr_info("Collected fifo entry ID %#x PIPE ID %#x\n", info->fe->id, info->fe->pipe_id);
 
 	/* check who will restore the fifo data */
 	list_for_each_entry(f, &fifo_head, list)
@@ -161,7 +159,6 @@ static int collect_one_fifo(void *o, ProtobufCMessage *base, struct cr_img *i)
 	}
 
 	return file_desc_add(&info->d, info->fe->id, &fifo_desc_ops);
-
 }
 
 struct collect_image_info fifo_cinfo = {
diff --git a/criu/file-ids.c b/criu/file-ids.c
index 006e47d64..1b9d68888 100644
--- a/criu/file-ids.c
+++ b/criu/file-ids.c
@@ -21,9 +21,9 @@
 
 DECLARE_KCMP_TREE(fd_tree, KCMP_FILE);
 
-#define FDID_BITS	5
-#define FDID_SIZE	(1 << FDID_BITS)
-#define FDID_MASK	(FDID_SIZE - 1)
+#define FDID_BITS 5
+#define FDID_SIZE (1 << FDID_BITS)
+#define FDID_MASK (FDID_SIZE - 1)
 
 static inline int fdid_hashfn(unsigned int s_dev, unsigned long i_ino)
 {
@@ -63,11 +63,8 @@ static struct fd_id *fd_id_cache_lookup(struct fd_parms *p)
 	struct stat *st = &p->stat;
 	struct fd_id *fi;
 
-	for (fi = fd_id_cache[fdid_hashfn(st->st_dev, st->st_ino)];
-			fi; fi = fi->n)
-		if (fi->dev == st->st_dev &&
-		    fi->ino == st->st_ino &&
-		    fi->mnt_id == p->mnt_id)
+	for (fi = fd_id_cache[fdid_hashfn(st->st_dev, st->st_ino)]; fi; fi = fi->n)
+		if (fi->dev == st->st_dev && fi->ino == st->st_ino && fi->mnt_id == p->mnt_id)
 			return fi;
 
 	return NULL;
diff --git a/criu/file-lock.c b/criu/file-lock.c
index f6601c974..6334462b6 100644
--- a/criu/file-lock.c
+++ b/criu/file-lock.c
@@ -76,11 +76,10 @@ void free_file_locks(void)
 
 static int dump_one_file_lock(FileLockEntry *fle)
 {
-	pr_info("LOCK flag: %d,type: %d,pid: %d,fd: %d,start: %8"PRIx64",len: %8"PRIx64"\n",
-		fle->flag, fle->type, fle->pid,	fle->fd, fle->start, fle->len);
+	pr_info("LOCK flag: %d,type: %d,pid: %d,fd: %d,start: %8" PRIx64 ",len: %8" PRIx64 "\n", fle->flag, fle->type,
+		fle->pid, fle->fd, fle->start, fle->len);
 
-	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILE_LOCKS),
-			fle, PB_FILE_LOCK);
+	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILE_LOCKS), fle, PB_FILE_LOCK);
 }
 
 static void fill_flock_entry(FileLockEntry *fle, int fl_kind, int fl_ltype)
@@ -91,17 +90,16 @@ static void fill_flock_entry(FileLockEntry *fle, int fl_kind, int fl_ltype)
 
 int dump_file_locks(void)
 {
-	FileLockEntry	 fle;
+	FileLockEntry fle;
 	struct file_lock *fl;
-	int	ret = 0;
+	int ret = 0;
 
 	pr_info("Dumping file-locks\n");
 
 	list_for_each_entry(fl, &file_lock_list, list) {
 		if (fl->real_owner == -1) {
 			if (fl->fl_kind == FL_POSIX) {
-				pr_err("Unresolved lock found pid %d ino %ld\n",
-						fl->fl_owner, fl->i_no);
+				pr_err("Unresolved lock found pid %d ino %ld\n", fl->fl_owner, fl->i_no);
 				return -1;
 			}
 
@@ -110,7 +108,7 @@ int dump_file_locks(void)
 
 		if (!opts.handle_file_locks) {
 			pr_err("Some file locks are hold by dumping tasks! "
-					"You can try --" OPT_FILE_LOCKS " to dump them.\n");
+			       "You can try --" OPT_FILE_LOCKS " to dump them.\n");
 			return -1;
 		}
 
@@ -154,7 +152,7 @@ static int lock_btrfs_file_match(pid_t pid, int fd, struct file_lock *fl, struct
 	link[ret] = 0;
 
 	ns = lookup_nsid_by_mnt_id(p->mnt_id);
-	return  phys_stat_dev_match(p->stat.st_dev, phys_dev, ns, link);
+	return phys_stat_dev_match(p->stat.st_dev, phys_dev, ns, link);
 }
 
 static inline int lock_file_match(pid_t pid, int fd, struct file_lock *fl, struct fd_parms *p)
@@ -224,11 +222,7 @@ static int lock_ofd_check_fd(int lfd, struct file_lock *fl)
 {
 	int ret;
 
-	struct flock lck = {
-		.l_whence = SEEK_SET,
-		.l_type   = F_WRLCK,
-		.l_start  = fl->start
-	};
+	struct flock lck = { .l_whence = SEEK_SET, .l_type = F_WRLCK, .l_start = fl->start };
 	if (strcmp(fl->end, "EOF")) {
 		unsigned long end;
 
@@ -366,7 +360,7 @@ int note_file_lock(struct pid *pid, int fd, int lfd, struct fd_parms *p)
 
 		if (!opts.handle_file_locks) {
 			pr_err("Some file locks are hold by dumping tasks!"
-					"You can try --" OPT_FILE_LOCKS " to dump them.\n");
+			       "You can try --" OPT_FILE_LOCKS " to dump them.\n");
 			return -1;
 		}
 
@@ -380,8 +374,7 @@ int note_file_lock(struct pid *pid, int fd, int lfd, struct fd_parms *p)
 		} else if (fl->fl_kind == FL_LEASE) {
 			if (fl->owners_fd >= 0)
 				continue;
-			if (fl->fl_owner != pid->real &&
-					fl->real_owner != -1)
+			if (fl->fl_owner != pid->real && fl->real_owner != -1)
 				continue;
 
 			ret = lease_check_fd(lfd, p->flags, fl);
@@ -399,8 +392,7 @@ int note_file_lock(struct pid *pid, int fd, int lfd, struct fd_parms *p)
 			 * anyway.
 			 */
 
-			if (fl->fl_owner != pid->real &&
-					fl->real_owner != -1)
+			if (fl->fl_owner != pid->real && fl->real_owner != -1)
 				continue;
 
 			pr_debug("Checking lock holder %d:%d\n", pid->real, fd);
@@ -419,9 +411,7 @@ int note_file_lock(struct pid *pid, int fd, int lfd, struct fd_parms *p)
 		fl->real_owner = pid->ns[0].virt;
 		fl->owners_fd = fd;
 
-		pr_info("Found lock entry %d.%d %d vs %d\n",
-				pid->real, pid->ns[0].virt, fd,
-				fl->fl_owner);
+		pr_info("Found lock entry %d.%d %d vs %d\n", pid->real, pid->ns[0].virt, fd, fl->fl_owner);
 	}
 
 	return 0;
@@ -450,8 +440,7 @@ int correct_file_leases_type(struct pid *pid, int fd, int lfd)
 		if (fl->fl_holder != pid->real || fl->owners_fd != fd)
 			continue;
 
-		if (fl->fl_kind == FL_LEASE &&
-			(fl->fl_ltype & LEASE_BREAKING)) {
+		if (fl->fl_kind == FL_LEASE && (fl->fl_ltype & LEASE_BREAKING)) {
 			/*
 			 * Set lease type to actual 'target lease type'
 			 * instead of 'READ' returned by procfs.
@@ -538,8 +527,7 @@ static int restore_lease_prebreaking_state(int fd, int fd_type)
 	return set_file_lease(fd, lease_type);
 }
 
-static struct fdinfo_list_entry *find_fd_unordered(struct pstree_item *task,
-							int fd)
+static struct fdinfo_list_entry *find_fd_unordered(struct pstree_item *task, int fd)
 {
 	struct list_head *head = &rsti(task)->fds;
 	struct fdinfo_list_entry *fle;
@@ -592,9 +580,8 @@ static int restore_file_lease(FileLockEntry *fle)
 			pr_perror("Can't get file i/o signum");
 			return -1;
 		}
-		if (sigemptyset(&blockmask) ||
-			sigaddset(&blockmask, signum) ||
-			sigprocmask(SIG_BLOCK, &blockmask, &oldmask)) {
+		if (sigemptyset(&blockmask) || sigaddset(&blockmask, signum) ||
+		    sigprocmask(SIG_BLOCK, &blockmask, &oldmask)) {
 			pr_perror("Can't block file i/o signal");
 			return -1;
 		}
@@ -633,8 +620,8 @@ static int restore_file_lock(FileLockEntry *fle)
 			goto err;
 		}
 
-		pr_info("(flock)flag: %d, type: %d, cmd: %d, pid: %d, fd: %d\n",
-			fle->flag, fle->type, cmd, fle->pid, fle->fd);
+		pr_info("(flock)flag: %d, type: %d, cmd: %d, pid: %d, fd: %d\n", fle->flag, fle->type, cmd, fle->pid,
+			fle->fd);
 
 		ret = flock(fle->fd, cmd);
 		if (ret < 0) {
@@ -646,15 +633,14 @@ static int restore_file_lock(FileLockEntry *fle)
 		memset(&flk, 0, sizeof(flk));
 
 		flk.l_whence = SEEK_SET;
-		flk.l_start  = fle->start;
-		flk.l_len    = fle->len;
-		flk.l_pid    = fle->pid;
-		flk.l_type   = fle->type;
+		flk.l_start = fle->start;
+		flk.l_len = fle->len;
+		flk.l_pid = fle->pid;
+		flk.l_type = fle->type;
 
 		pr_info("(posix)flag: %d, type: %d, pid: %d, fd: %d, "
-			"start: %8"PRIx64", len: %8"PRIx64"\n",
-			fle->flag, fle->type, fle->pid, fle->fd,
-			fle->start, fle->len);
+			"start: %8" PRIx64 ", len: %8" PRIx64 "\n",
+			fle->flag, fle->type, fle->pid, fle->fd, fle->start, fle->len);
 
 		ret = fcntl(fle->fd, F_SETLKW, &flk);
 		if (ret < 0) {
@@ -663,17 +649,12 @@ static int restore_file_lock(FileLockEntry *fle)
 		}
 	} else if (fle->flag & FL_OFD) {
 		struct flock flk = {
-			.l_whence = SEEK_SET,
-			.l_start  = fle->start,
-			.l_len    = fle->len,
-			.l_pid    = 0,
-			.l_type   = fle->type
+			.l_whence = SEEK_SET, .l_start = fle->start, .l_len = fle->len, .l_pid = 0, .l_type = fle->type
 		};
 
 		pr_info("(ofd)flag: %d, type: %d, pid: %d, fd: %d, "
-				"start: %8"PRIx64", len: %8"PRIx64"\n",
-				fle->flag, fle->type, fle->pid, fle->fd,
-				fle->start, fle->len);
+			"start: %8" PRIx64 ", len: %8" PRIx64 "\n",
+			fle->flag, fle->type, fle->pid, fle->fd, fle->start, fle->len);
 
 		ret = fcntl(fle->fd, F_OFD_SETLK, &flk);
 		if (ret < 0) {
@@ -682,9 +663,8 @@ static int restore_file_lock(FileLockEntry *fle)
 		}
 	} else if (fle->flag & FL_LEASE) {
 		pr_info("(lease)flag: %d, type: %d, pid: %d, fd: %d, "
-				"start: %8"PRIx64", len: %8"PRIx64"\n",
-			fle->flag, fle->type, fle->pid, fle->fd,
-			fle->start, fle->len);
+			"start: %8" PRIx64 ", len: %8" PRIx64 "\n",
+			fle->flag, fle->type, fle->pid, fle->fd, fle->start, fle->len);
 		ret = restore_file_lease(fle);
 		if (ret < 0)
 			goto err;
@@ -720,5 +700,4 @@ int prepare_file_locks(int pid)
 		return 0;
 
 	return restore_file_locks(pid);
-
 }
diff --git a/criu/files-ext.c b/criu/files-ext.c
index a6247d673..95ec8e37c 100644
--- a/criu/files-ext.c
+++ b/criu/files-ext.c
@@ -20,8 +20,8 @@ static int dump_one_ext_file(int lfd, u32 id, const struct fd_parms *p)
 	if (ret < 0)
 		return ret;
 
-	xfe.id		= id;
-	xfe.fown	= (FownEntry *)&p->fown;
+	xfe.id = id;
+	xfe.fown = (FownEntry *)&p->fown;
 
 	fe.type = FD_TYPES__EXT;
 	fe.id = xfe.id;
@@ -32,13 +32,13 @@ static int dump_one_ext_file(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops ext_dump_ops = {
-	.type		= FD_TYPES__EXT,
-	.dump		= dump_one_ext_file,
+	.type = FD_TYPES__EXT,
+	.dump = dump_one_ext_file,
 };
 
 struct ext_file_info {
-	struct file_desc	d;
-	ExtFileEntry		*xfe;
+	struct file_desc d;
+	ExtFileEntry *xfe;
 };
 
 static int open_fd(struct file_desc *d, int *new_fd)
@@ -83,8 +83,7 @@ struct collect_image_info ext_file_cinfo = {
 	.collect = collect_one_ext,
 };
 
-int dump_unsupp_fd(struct fd_parms *p, int lfd,
-		char *more, char *info, FdinfoEntry *e)
+int dump_unsupp_fd(struct fd_parms *p, int lfd, char *more, char *info, FdinfoEntry *e)
 {
 	int ret;
 
@@ -92,7 +91,6 @@ int dump_unsupp_fd(struct fd_parms *p, int lfd,
 	if (ret == 0)
 		return 0;
 	if (ret == -ENOTSUP)
-		pr_err("Can't dump file %d of that type [%o] (%s %s)\n",
-			p->fd, p->stat.st_mode, more, info);
+		pr_err("Can't dump file %d of that type [%o] (%s %s)\n", p->fd, p->stat.st_mode, more, info);
 	return -1;
 }
diff --git a/criu/files-reg.c b/criu/files-reg.c
index d0a6fae60..b4d6f6f9a 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -15,12 +15,12 @@
 #include <elf.h>
 
 #ifndef SEEK_DATA
-#define SEEK_DATA	3
-#define SEEK_HOLE	4
+#define SEEK_DATA 3
+#define SEEK_HOLE 4
 #endif
 
 /* Stolen from kernel/fs/nfs/unlink.c */
-#define SILLYNAME_PREF ".nfs"
+#define SILLYNAME_PREF	   ".nfs"
 #define SILLYNAME_SUFF_LEN (((unsigned)sizeof(u64) << 1) + ((unsigned)sizeof(unsigned int) << 1))
 
 /*
@@ -63,13 +63,13 @@ int setfsgid(gid_t fsuid);
  * us. Any brave soul to implement link unlinked file back?
  */
 struct ghost_file {
-	struct list_head	list;
-	u32			id;
+	struct list_head list;
+	u32 id;
 
-	u32			dev;
-	u32			ino;
+	u32 dev;
+	u32 ino;
 
-	struct file_remap	remap;
+	struct file_remap remap;
 };
 
 static u32 ghost_file_ids = 1;
@@ -102,9 +102,9 @@ static LIST_HEAD(remaps);
  * we keep all data in memory.
  */
 struct link_remap_rlb {
-	struct list_head	list;
-	struct ns_id		*mnt_ns;
-	char			*path;
+	struct list_head list;
+	struct ns_id *mnt_ns;
+	char *path;
 };
 
 static int note_link_remap(char *path, struct ns_id *nsid)
@@ -158,7 +158,7 @@ static int trim_last_parent(char *path)
 	return 0;
 }
 
-#define BUFSIZE	(4096)
+#define BUFSIZE (4096)
 
 static int copy_chunk_from_file(int fd, int img, off_t off, size_t len)
 {
@@ -369,7 +369,7 @@ static int create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, struct cr_im
 	}
 
 	/* Add a '/' only if we have no at the end */
-	if (path[root_len-1] != '/') {
+	if (path[root_len - 1] != '/') {
 		path[root_len++] = '/';
 		path[root_len] = '\0';
 	}
@@ -429,14 +429,12 @@ err:
 	return ret;
 }
 
-static inline void ghost_path(char *path, int plen,
-		struct reg_file_info *rfi, RemapFilePathEntry *rpe)
+static inline void ghost_path(char *path, int plen, struct reg_file_info *rfi, RemapFilePathEntry *rpe)
 {
 	snprintf(path, plen, "%s.cr.%x.ghost", rfi->path, rpe->remap_id);
 }
 
-static int collect_remap_ghost(struct reg_file_info *rfi,
-		RemapFilePathEntry *rpe)
+static int collect_remap_ghost(struct reg_file_info *rfi, RemapFilePathEntry *rpe)
 {
 	struct ghost_file *gf;
 
@@ -476,8 +474,7 @@ gf_found:
 	return 0;
 }
 
-static int open_remap_ghost(struct reg_file_info *rfi,
-					RemapFilePathEntry *rpe)
+static int open_remap_ghost(struct reg_file_info *rfi, RemapFilePathEntry *rpe)
 {
 	struct ghost_file *gf = container_of(rfi->remap, struct ghost_file, remap);
 	GhostFileEntry *gfe = NULL;
@@ -527,8 +524,7 @@ err:
 	return -1;
 }
 
-static int collect_remap_linked(struct reg_file_info *rfi,
-		RemapFilePathEntry *rpe)
+static int collect_remap_linked(struct reg_file_info *rfi, RemapFilePathEntry *rpe)
 {
 	struct file_remap *rm;
 	struct file_desc *rdesc;
@@ -575,8 +571,7 @@ static int open_remap_linked(struct reg_file_info *rfi)
 	return 0;
 }
 
-static int collect_remap_dead_process(struct reg_file_info *rfi,
-		RemapFilePathEntry *rfe)
+static int collect_remap_dead_process(struct reg_file_info *rfi, RemapFilePathEntry *rfe)
 {
 	struct pstree_item *helper;
 
@@ -589,7 +584,6 @@ static int collect_remap_dead_process(struct reg_file_info *rfi,
 		return 0;
 	}
 
-
 	helper->sid = root_item->sid;
 	helper->pgid = root_item->pgid;
 	helper->pid->ns[0].virt = rfe->remap_id;
@@ -777,7 +771,7 @@ static struct collect_image_info remap_cinfo = {
 };
 
 /* Tiny files don't need to generate chunks in ghost image. */
-#define GHOST_CHUNKS_THRESH	(3 * 4096)
+#define GHOST_CHUNKS_THRESH (3 * 4096)
 
 static int dump_ghost_file(int _fd, u32 id, const struct stat *st, dev_t phys_dev)
 {
@@ -841,8 +835,8 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st, dev_t phys_de
 		pathbuf[ret] = 0;
 
 		if (ret != st->st_size) {
-			pr_err("Buffer for readlinkat is too small: ret %zd, st_size %"PRId64", buf %u %s\n",
-					ret, st->st_size, PATH_MAX, pathbuf);
+			pr_err("Buffer for readlinkat is too small: ret %zd, st_size %" PRId64 ", buf %u %s\n", ret,
+			       st->st_size, PATH_MAX, pathbuf);
 			goto err_out;
 		}
 
@@ -893,8 +887,7 @@ struct file_remap *lookup_ghost_remap(u32 dev, u32 ino)
 	return NULL;
 }
 
-static int dump_ghost_remap(char *path, const struct stat *st,
-				int lfd, u32 id, struct ns_id *nsid)
+static int dump_ghost_remap(char *path, const struct stat *st, int lfd, u32 id, struct ns_id *nsid)
 {
 	struct ghost_file *gf;
 	RemapFilePathEntry rpe = REMAP_FILE_PATH_ENTRY__INIT;
@@ -903,8 +896,7 @@ static int dump_ghost_remap(char *path, const struct stat *st,
 	pr_info("Dumping ghost file for fd %d id %#x\n", lfd, id);
 
 	if (st->st_size > opts.ghost_limit) {
-		pr_err("Can't dump ghost file %s of %"PRIu64" size, increase limit\n",
-				path, st->st_size);
+		pr_err("Can't dump ghost file %s of %" PRIu64 " size, increase limit\n", path, st->st_size);
 		return -1;
 	}
 
@@ -934,8 +926,7 @@ dump_entry:
 	rpe.has_remap_type = true;
 	rpe.remap_type = REMAP_TYPE__GHOST;
 
-	return pb_write_one(img_from_set(glob_imgset, CR_FD_REMAP_FPATH),
-			&rpe, PB_REMAP_FPATH);
+	return pb_write_one(img_from_set(glob_imgset, CR_FD_REMAP_FPATH), &rpe, PB_REMAP_FPATH);
 }
 
 static void __rollback_link_remaps(bool do_unlink)
@@ -958,13 +949,17 @@ static void __rollback_link_remaps(bool do_unlink)
 	}
 }
 
-void delete_link_remaps(void) { __rollback_link_remaps(true); }
-void free_link_remaps(void) { __rollback_link_remaps(false); }
+void delete_link_remaps(void)
+{
+	__rollback_link_remaps(true);
+}
+void free_link_remaps(void)
+{
+	__rollback_link_remaps(false);
+}
 static int linkat_hard(int odir, char *opath, int ndir, char *npath, uid_t uid, gid_t gid, int flags);
 
-static int create_link_remap(char *path, int len, int lfd,
-				u32 *idp, struct ns_id *nsid,
-				const struct stat *st)
+static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_id *nsid, const struct stat *st)
 {
 	char link_name[PATH_MAX], *tmp;
 	FileEntry fe = FILE_ENTRY__INIT;
@@ -975,7 +970,8 @@ static int create_link_remap(char *path, int len, int lfd,
 
 	if (!opts.link_remap_ok) {
 		pr_err("Can't create link remap for %s. "
-				"Use " LREMAP_PARAM " option.\n", path);
+		       "Use " LREMAP_PARAM " option.\n",
+		       path);
 		return -1;
 	}
 
@@ -997,11 +993,11 @@ static int create_link_remap(char *path, int len, int lfd,
 	}
 
 	fd_id_generate_special(NULL, idp);
-	rfe.id		= *idp;
-	rfe.flags	= 0;
-	rfe.pos		= 0;
-	rfe.fown	= &fwn;
-	rfe.name	= link_name + 1;
+	rfe.id = *idp;
+	rfe.flags = 0;
+	rfe.pos = 0;
+	rfe.fown = &fwn;
+	rfe.name = link_name + 1;
 
 	/* Any 'unique' name works here actually. Remap works by reg-file ids. */
 	snprintf(tmp + 1, sizeof(link_name) - (size_t)(tmp - link_name - 1), "link_remap.%d", rfe.id);
@@ -1009,8 +1005,7 @@ static int create_link_remap(char *path, int len, int lfd,
 	mntns_root = mntns_get_root_fd(nsid);
 
 again:
-	ret = linkat_hard(lfd, "", mntns_root, link_name,
-				st->st_uid, st->st_gid, AT_EMPTY_PATH);
+	ret = linkat_hard(lfd, "", mntns_root, link_name, st->st_uid, st->st_gid, AT_EMPTY_PATH);
 	if (ret < 0 && errno == ENOENT) {
 		/* Use grand parent, if parent directory does not exist. */
 		if (trim_last_parent(link_name) < 0) {
@@ -1033,8 +1028,7 @@ again:
 	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
 }
 
-static int dump_linked_remap(char *path, int len, const struct stat *ost,
-				int lfd, u32 id, struct ns_id *nsid)
+static int dump_linked_remap(char *path, int len, const struct stat *ost, int lfd, u32 id, struct ns_id *nsid)
 {
 	u32 lid;
 	RemapFilePathEntry rpe = REMAP_FILE_PATH_ENTRY__INIT;
@@ -1047,8 +1041,7 @@ static int dump_linked_remap(char *path, int len, const struct stat *ost,
 	rpe.has_remap_type = true;
 	rpe.remap_type = REMAP_TYPE__LINKED;
 
-	return pb_write_one(img_from_set(glob_imgset, CR_FD_REMAP_FPATH),
-			&rpe, PB_REMAP_FPATH);
+	return pb_write_one(img_from_set(glob_imgset, CR_FD_REMAP_FPATH), &rpe, PB_REMAP_FPATH);
 }
 
 static pid_t *dead_pids;
@@ -1071,7 +1064,7 @@ int dead_pid_conflict(void)
 			continue;
 
 		pr_err("Conflict with a dead task with the same PID as of this thread (virt %d, real %d).\n",
-			node->ns[0].virt, node->real);
+		       node->ns[0].virt, node->real);
 		return -1;
 	}
 
@@ -1112,8 +1105,7 @@ static int dump_dead_process_remap(pid_t pid, u32 id)
 	rpe.has_remap_type = true;
 	rpe.remap_type = REMAP_TYPE__PROCFS;
 
-	return pb_write_one(img_from_set(glob_imgset, CR_FD_REMAP_FPATH),
-			&rpe, PB_REMAP_FPATH);
+	return pb_write_one(img_from_set(glob_imgset, CR_FD_REMAP_FPATH), &rpe, PB_REMAP_FPATH);
 }
 
 static bool is_sillyrename_name(char *name)
@@ -1150,8 +1142,7 @@ static inline bool nfs_silly_rename(char *rpath, const struct fd_parms *parms)
 	return (parms->fs_type == NFS_SUPER_MAGIC) && is_sillyrename_name(rpath);
 }
 
-static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
-				int lfd, u32 id, struct ns_id *nsid)
+static int check_path_remap(struct fd_link *link, const struct fd_parms *parms, int lfd, u32 id, struct ns_id *nsid)
 {
 	char *rpath = link->name;
 	int plen = link->len;
@@ -1269,8 +1260,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 
 		if (errno == ENOENT) {
 			link_strip_deleted(link);
-			return dump_linked_remap(rpath + 1, plen - 1,
-							ost, lfd, id, nsid);
+			return dump_linked_remap(rpath + 1, plen - 1, ost, lfd, id, nsid);
 		}
 
 		pr_perror("Can't stat path");
@@ -1278,8 +1268,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 	}
 
 	if ((pst.st_ino != ost->st_ino) || (pst.st_dev != ost->st_dev)) {
-		if (opts.evasive_devices &&
-		    (S_ISCHR(ost->st_mode) || S_ISBLK(ost->st_mode)) &&
+		if (opts.evasive_devices && (S_ISCHR(ost->st_mode) || S_ISBLK(ost->st_mode)) &&
 		    pst.st_rdev == ost->st_rdev)
 			return 0;
 		/*
@@ -1292,9 +1281,8 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 * have the "(deleted)" suffix in proc and name conflict
 		 * is unlikely :)
 		 */
-		pr_err("Unaccessible path opened %u:%u, need %u:%u\n",
-				(int)pst.st_dev, (int)pst.st_ino,
-				(int)ost->st_dev, (int)ost->st_ino);
+		pr_err("Unaccessible path opened %u:%u, need %u:%u\n", (int)pst.st_dev, (int)pst.st_ino,
+		       (int)ost->st_dev, (int)ost->st_ino);
 		return -1;
 	}
 
@@ -1308,8 +1296,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 static bool should_check_size(int flags)
 {
 	/* Skip size if file has O_APPEND and O_WRONLY flags (e.g. log file). */
-	if (((flags & O_ACCMODE) == O_WRONLY) &&
-			(flags & O_APPEND))
+	if (((flags & O_ACCMODE) == O_WRONLY) && (flags & O_APPEND))
 		return false;
 
 	return true;
@@ -1320,15 +1307,14 @@ static bool should_check_size(int flags)
  * Returns the number of bytes of the build-id if it could
  * be obtained, else -1.
  */
-static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
-				const int fd, size_t mapped_size)
+static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id, const int fd, size_t mapped_size)
 {
 	int size, num_iterations;
 	size_t file_header_end;
 	Elf32_Phdr *program_header, *program_header_end;
 	Elf32_Nhdr *note_header_end, *note_header = NULL;
 
-	file_header_end = (size_t) file_header + mapped_size;
+	file_header_end = (size_t)file_header + mapped_size;
 	if (sizeof(Elf32_Ehdr) > mapped_size)
 		return -1;
 
@@ -1341,11 +1327,11 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
 		return -1;
 	}
 
-	program_header = (Elf32_Phdr *) (file_header->e_phoff + (char *) file_header);
-	if (program_header <= (Elf32_Phdr *) file_header)
+	program_header = (Elf32_Phdr *)(file_header->e_phoff + (char *)file_header);
+	if (program_header <= (Elf32_Phdr *)file_header)
 		return -1;
 
-	program_header_end = (Elf32_Phdr *) (file_header_end - sizeof(Elf32_Phdr));
+	program_header_end = (Elf32_Phdr *)(file_header_end - sizeof(Elf32_Phdr));
 
 	/*
 	 * If the file has a build-id, it will be in the PT_NOTE program header
@@ -1357,21 +1343,19 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
 		if (program_header->p_type != PT_NOTE)
 			continue;
 
-		note_header = (Elf32_Nhdr *) (program_header->p_offset + (char *) file_header);
-		if (note_header <= (Elf32_Nhdr *) file_header) {
+		note_header = (Elf32_Nhdr *)(program_header->p_offset + (char *)file_header);
+		if (note_header <= (Elf32_Nhdr *)file_header) {
 			note_header = NULL;
 			continue;
 		}
 
-		note_header_end = (Elf32_Nhdr *) min_t(char*,
-						(char *) note_header + program_header->p_filesz,
-						(char *) (file_header_end - sizeof(Elf32_Nhdr)));
+		note_header_end = (Elf32_Nhdr *)min_t(char *, (char *)note_header + program_header->p_filesz,
+						      (char *)(file_header_end - sizeof(Elf32_Nhdr)));
 
 		/* The note type for the build-id is NT_GNU_BUILD_ID. */
 		while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
-			note_header = (Elf32_Nhdr *) ((char *) note_header + sizeof(Elf32_Nhdr) +
-							ALIGN(note_header->n_namesz, 4) +
-							ALIGN(note_header->n_descsz, 4));
+			note_header = (Elf32_Nhdr *)((char *)note_header + sizeof(Elf32_Nhdr) +
+						     ALIGN(note_header->n_namesz, 4) + ALIGN(note_header->n_descsz, 4));
 
 		if (note_header > note_header_end) {
 			note_header = NULL;
@@ -1395,17 +1379,16 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
 	}
 
 	size = note_header->n_descsz;
-	note_header = (Elf32_Nhdr *) ((char *) note_header + sizeof(Elf32_Nhdr) +
-					ALIGN(note_header->n_namesz, 4));
-	note_header_end = (Elf32_Nhdr *) (file_header_end - size);
-	if (note_header <= (Elf32_Nhdr *) file_header || note_header > note_header_end)
+	note_header = (Elf32_Nhdr *)((char *)note_header + sizeof(Elf32_Nhdr) + ALIGN(note_header->n_namesz, 4));
+	note_header_end = (Elf32_Nhdr *)(file_header_end - size);
+	if (note_header <= (Elf32_Nhdr *)file_header || note_header > note_header_end)
 		return -1;
 
-	*build_id = (unsigned char *) xmalloc(size);
+	*build_id = (unsigned char *)xmalloc(size);
 	if (!*build_id)
 		return -1;
 
-	memcpy(*build_id, (void *) note_header, size);
+	memcpy(*build_id, (void *)note_header, size);
 	return size;
 }
 
@@ -1414,15 +1397,14 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id,
  * Returns the number of bytes of the build-id if it could
  * be obtained, else -1.
  */
-static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
-				const int fd, size_t mapped_size)
+static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id, const int fd, size_t mapped_size)
 {
 	int size, num_iterations;
 	size_t file_header_end;
 	Elf64_Phdr *program_header, *program_header_end;
 	Elf64_Nhdr *note_header_end, *note_header = NULL;
 
-	file_header_end = (size_t) file_header + mapped_size;
+	file_header_end = (size_t)file_header + mapped_size;
 	if (sizeof(Elf64_Ehdr) > mapped_size)
 		return -1;
 
@@ -1435,11 +1417,11 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
 		return -1;
 	}
 
-	program_header = (Elf64_Phdr *) (file_header->e_phoff + (char *) file_header);
-	if (program_header <= (Elf64_Phdr *) file_header)
+	program_header = (Elf64_Phdr *)(file_header->e_phoff + (char *)file_header);
+	if (program_header <= (Elf64_Phdr *)file_header)
 		return -1;
 
-	program_header_end = (Elf64_Phdr *) (file_header_end - sizeof(Elf64_Phdr));
+	program_header_end = (Elf64_Phdr *)(file_header_end - sizeof(Elf64_Phdr));
 
 	/*
 	 * If the file has a build-id, it will be in the PT_NOTE program header
@@ -1451,21 +1433,19 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
 		if (program_header->p_type != PT_NOTE)
 			continue;
 
-		note_header = (Elf64_Nhdr *) (program_header->p_offset + (char *) file_header);
-		if (note_header <= (Elf64_Nhdr *) file_header) {
+		note_header = (Elf64_Nhdr *)(program_header->p_offset + (char *)file_header);
+		if (note_header <= (Elf64_Nhdr *)file_header) {
 			note_header = NULL;
 			continue;
 		}
 
-		note_header_end = (Elf64_Nhdr *) min_t(char*,
-						(char *) note_header + program_header->p_filesz,
-						(char *) (file_header_end - sizeof(Elf64_Nhdr)));
+		note_header_end = (Elf64_Nhdr *)min_t(char *, (char *)note_header + program_header->p_filesz,
+						      (char *)(file_header_end - sizeof(Elf64_Nhdr)));
 
 		/* The note type for the build-id is NT_GNU_BUILD_ID. */
 		while (note_header <= note_header_end && note_header->n_type != NT_GNU_BUILD_ID)
-			note_header = (Elf64_Nhdr *) ((char *) note_header + sizeof(Elf64_Nhdr) +
-							ALIGN(note_header->n_namesz, 4) +
-							ALIGN(note_header->n_descsz, 4));
+			note_header = (Elf64_Nhdr *)((char *)note_header + sizeof(Elf64_Nhdr) +
+						     ALIGN(note_header->n_namesz, 4) + ALIGN(note_header->n_descsz, 4));
 
 		if (note_header > note_header_end) {
 			note_header = NULL;
@@ -1489,17 +1469,16 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
 	}
 
 	size = note_header->n_descsz;
-	note_header = (Elf64_Nhdr *) ((char *) note_header + sizeof(Elf64_Nhdr) +
-					ALIGN(note_header->n_namesz, 4));
-	note_header_end = (Elf64_Nhdr *) (file_header_end - size);
-	if (note_header <= (Elf64_Nhdr *) file_header || note_header > note_header_end)
+	note_header = (Elf64_Nhdr *)((char *)note_header + sizeof(Elf64_Nhdr) + ALIGN(note_header->n_namesz, 4));
+	note_header_end = (Elf64_Nhdr *)(file_header_end - size);
+	if (note_header <= (Elf64_Nhdr *)file_header || note_header > note_header_end)
 		return -1;
 
-	*build_id = (unsigned char *) xmalloc(size);
+	*build_id = (unsigned char *)xmalloc(size);
 	if (!*build_id)
 		return -1;
 
-	memcpy(*build_id, (void *) note_header, size);
+	memcpy(*build_id, (void *)note_header, size);
 	return size;
 }
 
@@ -1509,15 +1488,14 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id,
  * Returns the number of bytes of the build-id if it could be
  * obtained, else -1.
  */
-static int get_build_id(const int fd, const struct stat *fd_status,
-				unsigned char **build_id)
+static int get_build_id(const int fd, const struct stat *fd_status, unsigned char **build_id)
 {
-	char buf[SELFMAG+1];
+	char buf[SELFMAG + 1];
 	void *start_addr;
 	size_t mapped_size;
 	int ret = -1;
 
-	if (read(fd, buf, SELFMAG+1) != SELFMAG+1)
+	if (read(fd, buf, SELFMAG + 1) != SELFMAG + 1)
 		return -1;
 
 	/*
@@ -1555,8 +1533,7 @@ static int get_build_id(const int fd, const struct stat *fd_status,
  * Returns 1 if the build-id of the file could be stored, -1 if there was an error
  * or 0 if the build-id could not be obtained.
  */
-static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
-						const struct fd_parms *p)
+static int store_validation_data_build_id(RegFileEntry *rfe, int lfd, const struct fd_parms *p)
 {
 	unsigned char *build_id = NULL;
 	int build_id_size, allocated_size;
@@ -1567,13 +1544,13 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
 	 * four (SELFMAG) bytes which should correspond to the ELF magic number
 	 * and the next byte which indicates whether the file is 32-bit or 64-bit.
 	 */
-	if (p->stat.st_size < SELFMAG+1)
+	if (p->stat.st_size < SELFMAG + 1)
 		return 0;
 
 	fd = open_proc(PROC_SELF, "fd/%d", lfd);
 	if (fd < 0) {
 		pr_err("Build-ID (For validation) could not be obtained for file %s because can't open the file\n",
-				rfe->name);
+		       rfe->name);
 		return -1;
 	}
 
@@ -1585,14 +1562,13 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
 	allocated_size = round_up(build_id_size, sizeof(uint32_t));
 	rfe->build_id = xzalloc(allocated_size);
 	if (!rfe->build_id) {
-		pr_warn("Build-ID (For validation) could not be set for file %s\n",
-				rfe->name);
+		pr_warn("Build-ID (For validation) could not be set for file %s\n", rfe->name);
 		xfree(build_id);
 		return -1;
 	}
 
 	rfe->n_build_id = allocated_size / sizeof(uint32_t);
-	memcpy(rfe->build_id, (void *) build_id, build_id_size);
+	memcpy(rfe->build_id, (void *)build_id, build_id_size);
 
 	xfree(build_id);
 	return 1;
@@ -1604,8 +1580,7 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd,
  * being restored.
  * Returns true if atleast some metadata was stored, if there was an error it returns false.
  */
-static bool store_validation_data(RegFileEntry *rfe,
-					const struct fd_parms *p, int lfd)
+static bool store_validation_data(RegFileEntry *rfe, const struct fd_parms *p, int lfd)
 {
 	int result = 1;
 
@@ -1619,8 +1594,7 @@ static bool store_validation_data(RegFileEntry *rfe,
 		return false;
 
 	if (!result)
-		pr_info("Only file size could be stored for validation for file %s\n",
-				rfe->name);
+		pr_info("Only file size could be stored for validation for file %s\n", rfe->name);
 	return true;
 }
 
@@ -1641,9 +1615,7 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 	} else
 		link = p->link;
 
-
-
-	snprintf(ext_id, sizeof(ext_id), "file[%x:%"PRIx64"]", p->mnt_id, p->stat.st_ino);
+	snprintf(ext_id, sizeof(ext_id), "file[%x:%" PRIx64 "]", p->mnt_id, p->stat.st_ino);
 	if (external_lookup_id(ext_id)) {
 		/* the first symbol will be cut on restore to get an relative path*/
 		rfe.name = xstrdup(ext_id);
@@ -1654,8 +1626,7 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 
 	mi = lookup_mnt_id(p->mnt_id);
 	if (mi == NULL) {
-		pr_err("Can't lookup mount=%d for fd=%d path=%s\n",
-			p->mnt_id, p->fd, link->name + 1);
+		pr_err("Can't lookup mount=%d for fd=%d path=%s\n", p->mnt_id, p->fd, link->name + 1);
 		return -1;
 	}
 
@@ -1669,8 +1640,7 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 		rfe.has_mnt_id = true;
 	}
 
-	pr_info("Dumping path for %d fd via self %d [%s]\n",
-			p->fd, lfd, &link->name[1]);
+	pr_info("Dumping path for %d fd via self %d [%s]\n", p->fd, lfd, &link->name[1]);
 
 	/*
 	 * The regular path we can handle should start with slash.
@@ -1682,17 +1652,16 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 
 	if (check_path_remap(link, p, lfd, id, mi->nsid))
 		return -1;
-	rfe.name	= &link->name[1];
+	rfe.name = &link->name[1];
 ext:
-	rfe.id		= id;
-	rfe.flags	= p->flags;
-	rfe.pos		= p->pos;
-	rfe.fown	= (FownEntry *)&p->fown;
-	rfe.has_mode	= true;
-	rfe.mode	= p->stat.st_mode;
+	rfe.id = id;
+	rfe.flags = p->flags;
+	rfe.pos = p->pos;
+	rfe.fown = (FownEntry *)&p->fown;
+	rfe.has_mode = true;
+	rfe.mode = p->stat.st_mode;
 
-	if (S_ISREG(p->stat.st_mode) && should_check_size(rfe.flags) &&
-		!store_validation_data(&rfe, p, lfd))
+	if (S_ISREG(p->stat.st_mode) && should_check_size(rfe.flags) && !store_validation_data(&rfe, p, lfd))
 		return -1;
 
 	fe.type = FD_TYPES__REG;
@@ -1709,13 +1678,11 @@ ext:
 }
 
 const struct fdtype_ops regfile_dump_ops = {
-	.type		= FD_TYPES__REG,
-	.dump		= dump_one_reg_file,
+	.type = FD_TYPES__REG,
+	.dump = dump_one_reg_file,
 };
 
-static void convert_path_from_another_mp(char *src, char *dst, int dlen,
-					struct mount_info *smi,
-					struct mount_info *dmi)
+static void convert_path_from_another_mp(char *src, char *dst, int dlen, struct mount_info *smi, struct mount_info *dmi)
 {
 	int off;
 
@@ -1732,10 +1699,7 @@ static void convert_path_from_another_mp(char *src, char *dst, int dlen,
 	 * Absolute path to the mount point + difference between source
 	 * and destination roots + path relative to the mountpoint.
 	 */
-	snprintf(dst, dlen, "./%s/%s/%s",
-				dmi->ns_mountpoint + 1,
-				smi->root + strlen(dmi->root),
-				src + off);
+	snprintf(dst, dlen, "./%s/%s/%s", dmi->ns_mountpoint + 1, smi->root + strlen(dmi->root), src + off);
 }
 
 static int linkat_hard(int odir, char *opath, int ndir, char *npath, uid_t uid, gid_t gid, int flags)
@@ -1749,7 +1713,7 @@ static int linkat_hard(int odir, char *opath, int ndir, char *npath, uid_t uid,
 	if (ret == 0)
 		return 0;
 
-	if (!( (errno == EPERM || errno == EOVERFLOW) && (root_ns_mask & CLONE_NEWUSER) )) {
+	if (!((errno == EPERM || errno == EOVERFLOW) && (root_ns_mask & CLONE_NEWUSER))) {
 		errno_save = errno;
 		pr_warn("Can't link %s -> %s\n", opath, npath);
 		errno = errno_save;
@@ -1964,8 +1928,7 @@ out_root:
 	if (*level < 0)
 		return -1;
 
-	if (linkat_hard(mntns_root, rpath, mntns_root, path,
-			rfi->remap->uid, rfi->remap->gid, 0) < 0) {
+	if (linkat_hard(mntns_root, rpath, mntns_root, path, rfi->remap->uid, rfi->remap->gid, 0) < 0) {
 		int errno_saved = errno;
 		rm_parent_dirs(mntns_root, path, *level);
 		errno = errno_saved;
@@ -1981,8 +1944,7 @@ out_root:
  * while dumping, -1 if there is a mismatch or 0 if the build-id has not been
  * stored or could not be obtained.
  */
-static int validate_with_build_id(const int fd, const struct stat *fd_status,
-					const struct reg_file_info *rfi)
+static int validate_with_build_id(const int fd, const struct stat *fd_status, const struct reg_file_info *rfi)
 {
 	unsigned char *build_id;
 	int build_id_size;
@@ -2000,8 +1962,7 @@ static int validate_with_build_id(const int fd, const struct stat *fd_status,
 
 	if (round_up(build_id_size, sizeof(uint32_t)) != rfi->rfe->n_build_id * sizeof(uint32_t)) {
 		pr_err("File %s has bad build-ID length %d (expect %d)\n", rfi->path,
-				round_up(build_id_size, sizeof(uint32_t)),
-				(int) (rfi->rfe->n_build_id * sizeof(uint32_t)));
+		       round_up(build_id_size, sizeof(uint32_t)), (int)(rfi->rfe->n_build_id * sizeof(uint32_t)));
 		xfree(build_id);
 		return -1;
 	}
@@ -2024,14 +1985,13 @@ static int validate_with_build_id(const int fd, const struct stat *fd_status,
  * Returns true if the metadata of the file matches the metadata stored while
  * dumping else returns false.
  */
-static bool validate_file(const int fd, const struct stat *fd_status,
-					const struct reg_file_info *rfi)
+static bool validate_file(const int fd, const struct stat *fd_status, const struct reg_file_info *rfi)
 {
 	int result = 1;
 
 	if (rfi->rfe->has_size && (fd_status->st_size != rfi->rfe->size)) {
-		pr_err("File %s has bad size %"PRIu64" (expect %"PRIu64")\n",
-				rfi->path, fd_status->st_size, rfi->rfe->size);
+		pr_err("File %s has bad size %" PRIu64 " (expect %" PRIu64 ")\n", rfi->path, fd_status->st_size,
+		       rfi->rfe->size);
 		return false;
 	}
 
@@ -2042,13 +2002,11 @@ static bool validate_file(const int fd, const struct stat *fd_status,
 		return false;
 
 	if (!result)
-		pr_info("File %s could only be validated with file size\n",
-				rfi->path);
+		pr_info("File %s could only be validated with file size\n", rfi->path);
 	return true;
 }
 
-int open_path(struct file_desc *d,
-		int(*open_cb)(int mntns_root, struct reg_file_info *, void *), void *arg)
+int open_path(struct file_desc *d, int (*open_cb)(int mntns_root, struct reg_file_info *, void *), void *arg)
 {
 	int tmp, mntns_root, level = 0;
 	struct reg_file_info *rfi;
@@ -2095,8 +2053,7 @@ int open_path(struct file_desc *d,
 			static char tmp_path[PATH_MAX];
 
 			if (errno != EEXIST) {
-				pr_perror("Can't link %s -> %s",
-					  rfi->remap->rpath, rfi->path);
+				pr_perror("Can't link %s -> %s", rfi->remap->rpath, rfi->path);
 				return -1;
 			}
 
@@ -2132,8 +2089,7 @@ ext:
 	}
 	close_safe(&inh_fd);
 
-	if ((rfi->rfe->has_size || rfi->rfe->has_mode) &&
-	    !rfi->size_mode_checked) {
+	if ((rfi->rfe->has_size || rfi->rfe->has_mode) && !rfi->size_mode_checked) {
 		struct stat st;
 
 		if (fstat(tmp, &st) < 0) {
@@ -2145,9 +2101,7 @@ ext:
 			return -1;
 
 		if (rfi->rfe->has_mode && (st.st_mode != rfi->rfe->mode)) {
-			pr_err("File %s has bad mode 0%o (expect 0%o)\n",
-			       rfi->path, (int)st.st_mode,
-			       rfi->rfe->mode);
+			pr_err("File %s has bad mode 0%o (expect 0%o)\n", rfi->path, (int)st.st_mode, rfi->rfe->mode);
 			return -1;
 		}
 
@@ -2211,8 +2165,7 @@ static int do_open_reg(int ns_root_fd, struct reg_file_info *rfi, void *arg)
 	 * just ignore positioning at all.
 	 */
 	if (!(rfi->rfe->flags & O_PATH)) {
-		if (rfi->rfe->pos != -1ULL &&
-		    lseek(fd, rfi->rfe->pos, SEEK_SET) < 0) {
+		if (rfi->rfe->pos != -1ULL && lseek(fd, rfi->rfe->pos, SEEK_SET) < 0) {
 			pr_perror("Can't restore file pos");
 			close(fd);
 			return -1;
@@ -2282,10 +2235,10 @@ static struct filemap_ctx ctx;
 
 void filemap_ctx_init(bool auto_close)
 {
-	ctx.desc = NULL;	/* to fail the first comparison in open_ */
-	ctx.fd = -1;		/* not to close random fd in _fini */
-	ctx.vma = NULL;		/* not to put spurious VMA_CLOSE in _fini */
-				/* flags may remain any */
+	ctx.desc = NULL; /* to fail the first comparison in open_ */
+	ctx.fd = -1; /* not to close random fd in _fini */
+	ctx.vma = NULL; /* not to put spurious VMA_CLOSE in _fini */
+	/* flags may remain any */
 	ctx.close = auto_close;
 }
 
@@ -2341,8 +2294,7 @@ int collect_filemap(struct vma_area *vma)
 	if (!vma->e->has_fdflags) {
 		/* Make a wild guess for the fdflags */
 		vma->e->has_fdflags = true;
-		if ((vma->e->prot & PROT_WRITE) &&
-				vma_area_is(vma, VMA_FILE_SHARED))
+		if ((vma->e->prot & PROT_WRITE) && vma_area_is(vma, VMA_FILE_SHARED))
 			vma->e->fdflags = O_RDWR;
 		else
 			vma->e->fdflags = O_RDONLY;
diff --git a/criu/files.c b/criu/files.c
index 1d4ac8941..93754fb44 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -57,7 +57,7 @@
 
 #include "plugin.h"
 
-#define FDESC_HASH_SIZE	64
+#define FDESC_HASH_SIZE 64
 static struct hlist_head file_desc_hash[FDESC_HASH_SIZE];
 /* file_desc's, which fle is not owned by a process, that is able to open them */
 static LIST_HEAD(fake_master_head);
@@ -78,8 +78,8 @@ void file_desc_init(struct file_desc *d, u32 id, struct file_desc_ops *ops)
 	INIT_LIST_HEAD(&d->fake_master_list);
 	INIT_HLIST_NODE(&d->hash);
 
-	d->id	= id;
-	d->ops	= ops;
+	d->id = id;
+	d->ops = ops;
 }
 
 int file_desc_add(struct file_desc *d, u32 id, struct file_desc_ops *ops)
@@ -100,8 +100,7 @@ struct file_desc *find_file_desc_raw(int type, u32 id)
 
 	chain = &file_desc_hash[id % FDESC_HASH_SIZE];
 	hlist_for_each_entry(d, chain, hash)
-		if ((d->id == id) &&
-				(d->ops->type == type || type == FD_TYPES__UND))
+		if ((d->id == id) && (d->ops->type == type || type == FD_TYPES__UND))
 			/*
 			 * Warning -- old CRIU might generate matching IDs
 			 * for different file types! So any code that uses
@@ -219,8 +218,7 @@ struct fdinfo_list_entry *try_file_master(struct file_desc *d)
 	if (list_empty(&d->fd_info_head))
 		return NULL;
 
-	return list_first_entry(&d->fd_info_head,
-			struct fdinfo_list_entry, desc_list);
+	return list_first_entry(&d->fd_info_head, struct fdinfo_list_entry, desc_list);
 }
 
 struct fdinfo_list_entry *file_master(struct file_desc *d)
@@ -229,8 +227,7 @@ struct fdinfo_list_entry *file_master(struct file_desc *d)
 
 	fle = try_file_master(d);
 	if (!fle) {
-		pr_err("Empty list on file desc id %#x(%d)\n", d->id,
-				d->ops ? d->ops->type : -1);
+		pr_err("Empty list on file desc id %#x(%d)\n", d->id, d->ops ? d->ops->type : -1);
 		BUG();
 	}
 
@@ -319,16 +316,13 @@ uint32_t make_gen_id(uint32_t st_dev, uint32_t st_ino, uint64_t pos)
 	return st_dev ^ st_ino ^ pos_hi ^ pos_low;
 }
 
-int do_dump_gen_file(struct fd_parms *p, int lfd,
-		const struct fdtype_ops *ops, FdinfoEntry *e)
+int do_dump_gen_file(struct fd_parms *p, int lfd, const struct fdtype_ops *ops, FdinfoEntry *e)
 {
 	int ret = -1;
 
-	e->type	= ops->type;
-	e->id	= make_gen_id((uint32_t)p->stat.st_dev,
-			      (uint32_t)p->stat.st_ino,
-			      (uint64_t)p->pos);
-	e->fd	= p->fd;
+	e->type = ops->type;
+	e->id = make_gen_id((uint32_t)p->stat.st_dev, (uint32_t)p->stat.st_ino, (uint64_t)p->pos);
+	e->fd = p->fd;
 	e->flags = p->fd_flags;
 
 	ret = fd_id_generate(p->pid, e, p);
@@ -361,8 +355,7 @@ int fill_fdlink(int lfd, const struct fd_parms *p, struct fd_link *link)
 	return 0;
 }
 
-static int fill_fd_params(struct pid *owner_pid, int fd, int lfd,
-				struct fd_opts *opts, struct fd_parms *p)
+static int fill_fd_params(struct pid *owner_pid, int fd, int lfd, struct fd_opts *opts, struct fd_parms *p)
 {
 	int ret;
 	struct statfs fsbuf;
@@ -381,24 +374,24 @@ static int fill_fd_params(struct pid *owner_pid, int fd, int lfd,
 	if (parse_fdinfo_pid(owner_pid->real, fd, FD_TYPES__UND, &fdinfo))
 		return -1;
 
-	p->fs_type	= fsbuf.f_type;
-	p->fd		= fd;
-	p->pos		= fdinfo.pos;
+	p->fs_type = fsbuf.f_type;
+	p->fd = fd;
+	p->pos = fdinfo.pos;
 	/*
 	 * The kernel artificially adds the O_CLOEXEC flag on the file pointer
 	 * flags by looking at the flags on the file descriptor (see kernel
 	 * code fs/proc/fd.c). FD_CLOEXEC is a file descriptor property, which
 	 * is saved in fd_flags.
 	 */
-	p->flags	= fdinfo.flags & ~O_CLOEXEC;
-	p->mnt_id	= fdinfo.mnt_id;
-	p->pid		= owner_pid->real;
-	p->fd_flags	= opts->flags;
+	p->flags = fdinfo.flags & ~O_CLOEXEC;
+	p->mnt_id = fdinfo.mnt_id;
+	p->pid = owner_pid->real;
+	p->fd_flags = opts->flags;
 
 	fown_entry__init(&p->fown);
 
-	pr_info("%d fdinfo %d: pos: %#16"PRIx64" flags: %16o/%#x\n",
-			owner_pid->real, fd, p->pos, p->flags, (int)p->fd_flags);
+	pr_info("%d fdinfo %d: pos: %#16" PRIx64 " flags: %16o/%#x\n", owner_pid->real, fd, p->pos, p->flags,
+		(int)p->fd_flags);
 
 	if (p->flags & O_PATH)
 		ret = 0;
@@ -413,10 +406,10 @@ static int fill_fd_params(struct pid *owner_pid, int fd, int lfd,
 	if (opts->fown.pid == 0)
 		return 0;
 
-	p->fown.pid	 = opts->fown.pid;
+	p->fown.pid = opts->fown.pid;
 	p->fown.pid_type = opts->fown.pid_type;
-	p->fown.uid	 = opts->fown.uid;
-	p->fown.euid	 = opts->fown.euid;
+	p->fown.uid = opts->fown.uid;
+	p->fown.euid = opts->fown.euid;
 
 	return 0;
 }
@@ -489,9 +482,8 @@ static int dump_chrdev(struct fd_parms *p, int lfd, FdinfoEntry *e)
 	return err;
 }
 
-static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
-		struct parasite_ctl *ctl, FdinfoEntry *e,
-		struct parasite_drain_fd *dfds)
+static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts, struct parasite_ctl *ctl,
+			 FdinfoEntry *e, struct parasite_drain_fd *dfds)
 {
 	struct fd_parms p = FD_PARMS_INIT;
 	const struct fdtype_ops *ops;
@@ -550,8 +542,7 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 		return do_dump_gen_file(&p, lfd, ops, e);
 	}
 
-	if (S_ISREG(p.stat.st_mode) || S_ISDIR(p.stat.st_mode) ||
-		S_ISLNK(p.stat.st_mode)) {
+	if (S_ISREG(p.stat.st_mode) || S_ISDIR(p.stat.st_mode) || S_ISLNK(p.stat.st_mode)) {
 		if (fill_fdlink(lfd, &p, &link))
 			return -1;
 
@@ -606,14 +597,13 @@ int dump_my_file(int lfd, u32 *id, int *type)
 	return 0;
 }
 
-int dump_task_files_seized(struct parasite_ctl *ctl, struct pstree_item *item,
-		struct parasite_drain_fd *dfds)
+int dump_task_files_seized(struct parasite_ctl *ctl, struct pstree_item *item, struct parasite_drain_fd *dfds)
 {
 	int *lfds = NULL;
 	struct cr_img *img = NULL;
 	struct fd_opts *opts = NULL;
 	int i, ret = -1;
-	int off, nr_fds = min((int) PARASITE_MAX_FDS, dfds->nr_fds);
+	int off, nr_fds = min((int)PARASITE_MAX_FDS, dfds->nr_fds);
 
 	pr_info("\n");
 	pr_info("Dumping opened files (pid: %d)\n", item->pid->real);
@@ -636,16 +626,14 @@ int dump_task_files_seized(struct parasite_ctl *ctl, struct pstree_item *item,
 		if (nr_fds + off > dfds->nr_fds)
 			nr_fds = dfds->nr_fds - off;
 
-		ret = parasite_drain_fds_seized(ctl, dfds, nr_fds,
-							off, lfds, opts);
+		ret = parasite_drain_fds_seized(ctl, dfds, nr_fds, off, lfds, opts);
 		if (ret)
 			goto err;
 
 		for (i = 0; i < nr_fds; i++) {
 			FdinfoEntry e = FDINFO_ENTRY__INIT;
 
-			ret = dump_one_file(item->pid, dfds->fds[i + off],
-						lfds[i], opts + i, ctl, &e, dfds);
+			ret = dump_one_file(item->pid, dfds->fds[i + off], lfds[i], opts + i, ctl, &e, dfds);
 			if (ret)
 				break;
 
@@ -810,8 +798,7 @@ static void __collect_desc_fle(struct fdinfo_list_entry *new_le, struct file_des
 	list_add(&new_le->desc_list, &le->desc_list);
 }
 
-static void collect_desc_fle(struct fdinfo_list_entry *new_le,
-			     struct file_desc *fdesc, bool force_master)
+static void collect_desc_fle(struct fdinfo_list_entry *new_le, struct file_desc *fdesc, bool force_master)
 {
 	new_le->desc = fdesc;
 
@@ -823,9 +810,8 @@ static void collect_desc_fle(struct fdinfo_list_entry *new_le,
 	}
 }
 
-struct fdinfo_list_entry *collect_fd_to(int pid, FdinfoEntry *e,
-		struct rst_info *rst_info, struct file_desc *fdesc,
-		bool fake, bool force_master)
+struct fdinfo_list_entry *collect_fd_to(int pid, FdinfoEntry *e, struct rst_info *rst_info, struct file_desc *fdesc,
+					bool fake, bool force_master)
 {
 	struct fdinfo_list_entry *new_le;
 
@@ -843,8 +829,7 @@ int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info, bool fake)
 {
 	struct file_desc *fdesc;
 
-	pr_info("Collect fdinfo pid=%d fd=%d id=%#x\n",
-		pid, e->fd, e->id);
+	pr_info("Collect fdinfo pid=%d fd=%d id=%#x\n", pid, e->fd, e->id);
 
 	fdesc = find_file_desc(e);
 	if (fdesc == NULL) {
@@ -868,15 +853,14 @@ FdinfoEntry *dup_fdinfo(FdinfoEntry *old, int fd, unsigned flags)
 
 	fdinfo_entry__init(e);
 
-	e->id		= old->id;
-	e->type		= old->type;
-	e->fd		= fd;
-	e->flags	= flags;
+	e->id = old->id;
+	e->type = old->type;
+	e->fd = fd;
+	e->flags = flags;
 	return e;
 }
 
-int dup_fle(struct pstree_item *task, struct fdinfo_list_entry *ple,
-		   int fd, unsigned flags)
+int dup_fle(struct pstree_item *task, struct fdinfo_list_entry *ple, int fd, unsigned flags)
 {
 	FdinfoEntry *e;
 
@@ -952,7 +936,8 @@ int set_fd_flags(int fd, int flags)
 
 	if (ret != flags) {
 		pr_err("fcntl call on fd %d (flags %#o) succeeded, "
-			"but some flags were dropped: %#o\n", fd, flags, ret);
+		       "but some flags were dropped: %#o\n",
+		       fd, flags, ret);
 		return -1;
 	}
 	return 0;
@@ -1134,7 +1119,7 @@ static int open_fd(struct fdinfo_list_entry *fle)
 
 	flem = file_master(d);
 	if (fle != flem) {
-		BUG_ON (fle->stage != FLE_INITIALIZED);
+		BUG_ON(fle->stage != FLE_INITIALIZED);
 		ret = receive_fd(fle);
 		if (ret != 0)
 			return ret;
@@ -1212,8 +1197,7 @@ static int open_fdinfos(struct pstree_item *me)
 			BUG_ON(st == FLE_RESTORED);
 			ret = open_fd(fle);
 			if (ret == -1) {
-				pr_err("Unable to open fd=%d id=%#x\n",
-					fle->fe->fd, fle->fe->id);
+				pr_err("Unable to open fd=%d id=%#x\n", fle->fe->fd, fle->fe->id);
 				goto splice;
 			}
 			if (st != fle->stage || ret == 0)
@@ -1231,7 +1215,7 @@ static int open_fdinfos(struct pstree_item *me)
 					list_add(&fle->ps_list, &fake);
 			}
 			if (ret == 1)
-			       again = true;
+				again = true;
 		}
 		if (!progress && again)
 			wait_fds_event();
@@ -1501,8 +1485,8 @@ int shared_fdt_prepare(struct pstree_item *item)
 
 struct inherit_fd {
 	struct list_head inh_list;
-	char *inh_id;		/* file identifier */
-	int inh_fd;		/* criu's descriptor to inherit */
+	char *inh_id; /* file identifier */
+	int inh_fd; /* criu's descriptor to inherit */
 	int inh_fd_id;
 };
 
@@ -1541,8 +1525,7 @@ int inherit_fd_parse(char *optarg)
 	if (dbg) {
 		n = strlen(cp);
 		if (write(fd, cp, n) != n) {
-			pr_err("Can't write debug message %s to inherit fd %d\n",
-				cp, fd);
+			pr_err("Can't write debug message %s to inherit fd %d\n", cp, fd);
 			return -1;
 		}
 		return 0;
@@ -1586,8 +1569,7 @@ void inherit_fd_log(void)
 	struct inherit_fd *inh;
 
 	list_for_each_entry(inh, &opts.inherit_fds, inh_list) {
-		pr_info("File %s will be restored from inherit fd %d\n",
-			inh->inh_id, inh->inh_fd);
+		pr_info("File %s will be restored from inherit fd %d\n", inh->inh_id, inh->inh_fd);
 	}
 }
 
@@ -1617,8 +1599,7 @@ int inherit_fd_lookup_id(char *id)
 	list_for_each_entry(inh, &opts.inherit_fds, inh_list) {
 		if (!strcmp(inh->inh_id, id)) {
 			ret = fdstore_get(inh->inh_fd_id);
-			pr_debug("Found id %s (fd %d) in inherit fd list\n",
-				id, ret);
+			pr_debug("Found id %s (fd %d) in inherit fd list\n", id, ret);
 			break;
 		}
 	}
@@ -1643,7 +1624,8 @@ bool inherited_fd(struct file_desc *d, int *fd_p)
 
 	*fd_p = i_fd;
 	pr_info("File %s will be restored from fd %d dumped "
-				"from inherit fd %d\n", id_str, *fd_p, i_fd);
+		"from inherit fd %d\n",
+		id_str, *fd_p, i_fd);
 	return true;
 }
 
@@ -1673,8 +1655,7 @@ out:
 	return ret;
 }
 
-static int collect_one_file_entry(FileEntry *fe, u_int32_t id, ProtobufCMessage *base,
-		struct collect_image_info *cinfo)
+static int collect_one_file_entry(FileEntry *fe, u_int32_t id, ProtobufCMessage *base, struct collect_image_info *cinfo)
 {
 	if (fe->id != id) {
 		pr_err("ID mismatch %u != %u\n", fe->id, id);
diff --git a/criu/filesystems.c b/criu/filesystems.c
index 94d348a8e..ee766a2f4 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -44,7 +44,6 @@ static int binfmt_misc_parse_or_collect(struct mount_info *pm)
 {
 	opts.has_binfmt_misc = true;
 	return 0;
-
 }
 
 static int binfmt_misc_virtual(struct mount_info *pm)
@@ -78,13 +77,13 @@ static int parse_binfmt_misc_entry(struct bfd *f, BinfmtMiscEntry *bme)
 			continue;
 		}
 
-#define DUP_EQUAL_AS(key, member)					\
-		if (!strncmp(str, key, strlen(key))) {			\
-			bme->member = xstrdup(str + strlen(key));	\
-			if (!bme->member)				\
-				return -1;				\
-			continue;					\
-		}
+#define DUP_EQUAL_AS(key, member)                         \
+	if (!strncmp(str, key, strlen(key))) {            \
+		bme->member = xstrdup(str + strlen(key)); \
+		if (!bme->member)                         \
+			return -1;                        \
+		continue;                                 \
+	}
 		DUP_EQUAL_AS("interpreter ", interpreter)
 		DUP_EQUAL_AS("flags: ", flags)
 		DUP_EQUAL_AS("extension .", extension)
@@ -130,7 +129,6 @@ err:
 	free(bme.mask);
 	bclose(&f);
 	return ret;
-
 }
 
 static int binfmt_misc_dump(struct mount_info *pm)
@@ -192,7 +190,7 @@ out:
 static int write_binfmt_misc_entry(char *mp, char *buf, BinfmtMiscEntry *bme)
 {
 	int fd, len, ret = -1;
-	char path[PATH_MAX+1];
+	char path[PATH_MAX + 1];
 
 	snprintf(path, PATH_MAX, "%s/register", mp);
 
@@ -243,9 +241,9 @@ static int make_bfmtm_magic_str(char *buf, BinfmtMiscEntry *bme)
 	 * dump them without changes. But for registering a new entry
 	 * it expects every byte is prepended with \x, i.e. \x61\x62\x63.
 	 */
-	len = strlen(bme->name) + 3 /* offset < 128 */ + 2 * strlen(bme->magic)
-	    + (bme->mask ? 2 * strlen(bme->mask) : 0) + strlen(bme->interpreter)
-	    + (bme->flags ? strlen(bme->flags) : 0) + strlen(":::::::");
+	len = strlen(bme->name) + 3 /* offset < 128 */ + 2 * strlen(bme->magic) +
+	      (bme->mask ? 2 * strlen(bme->mask) : 0) + strlen(bme->interpreter) +
+	      (bme->flags ? strlen(bme->flags) : 0) + strlen(":::::::");
 
 	if ((len > BINFMT_MISC_STR - 1) || bme->offset > 128)
 		return -1;
@@ -264,7 +262,7 @@ static int make_bfmtm_magic_str(char *buf, BinfmtMiscEntry *bme)
 			buf += sprintf(buf, "\\x%c%c", bme->mask[i], bme->mask[i + 1]);
 	}
 
-	sprintf(buf, ":%s:%s", bme->interpreter, bme->flags ? : "\0");
+	sprintf(buf, ":%s:%s", bme->interpreter, bme->flags ?: "\0");
 
 	return 1;
 }
@@ -281,9 +279,8 @@ static int binfmt_misc_restore_bme(struct mount_info *mi, BinfmtMiscEntry *bme,
 		ret = make_bfmtm_magic_str(buf, bme);
 	} else if (bme->extension) {
 		/* :name:E::extension::interpreter:flags */
-		ret = snprintf(buf, BINFMT_MISC_STR, ":%s:E::%s::%s:%s",
-			       bme->name, bme->extension, bme->interpreter,
-			       bme->flags ? : "\0");
+		ret = snprintf(buf, BINFMT_MISC_STR, ":%s:E::%s::%s:%s", bme->name, bme->extension, bme->interpreter,
+			       bme->flags ?: "\0");
 		if (ret >= BINFMT_MISC_STR) /* output truncated */
 			ret = -1;
 	} else
@@ -374,8 +371,8 @@ int collect_binfmt_misc(void)
 	return collect_image(&binfmt_misc_cinfo);
 }
 #else
-#define binfmt_misc_dump	NULL
-#define binfmt_misc_restore	NULL
+#define binfmt_misc_dump	     NULL
+#define binfmt_misc_restore	     NULL
 #define binfmt_misc_parse_or_collect NULL
 #endif
 
@@ -419,17 +416,11 @@ static int tmpfs_dump(struct mount_info *pm)
 	if (root_ns_mask & CLONE_NEWUSER)
 		userns_pid = root_item->pid->real;
 
-	ret = cr_system_userns(fd, img_raw_fd(img), -1, "tar", (char *[])
-			{ "tar", "--create",
-			"--gzip",
-			"--no-unquote",
-			"--no-wildcards",
-			"--one-file-system",
-			"--check-links",
-			"--preserve-permissions",
-			"--sparse",
-			"--numeric-owner",
-			"--directory", "/proc/self/fd/0", ".", NULL }, 0, userns_pid);
+	ret = cr_system_userns(fd, img_raw_fd(img), -1, "tar",
+			       (char *[]){ "tar", "--create", "--gzip", "--no-unquote", "--no-wildcards",
+					   "--one-file-system", "--check-links", "--preserve-permissions", "--sparse",
+					   "--numeric-owner", "--directory", "/proc/self/fd/0", ".", NULL },
+			       0, userns_pid);
 
 	if (ret)
 		pr_err("Can't dump tmpfs content\n");
@@ -460,9 +451,9 @@ static int tmpfs_restore(struct mount_info *pm)
 	}
 
 	ret = cr_system(img_raw_fd(img), -1, -1, "tar",
-			(char *[]) {"tar", "--extract", "--gzip",
-				"--no-unquote", "--no-wildcards",
-				"--directory", pm->mountpoint, NULL}, 0);
+			(char *[]){ "tar", "--extract", "--gzip", "--no-unquote", "--no-wildcards", "--directory",
+				    pm->mountpoint, NULL },
+			0);
 	close_image(img);
 
 	if (ret) {
@@ -556,8 +547,7 @@ static int fusectl_dump(struct mount_info *pm)
 		}
 
 		for (it = mntinfo; it; it = it->next) {
-			if (it->fstype->code == FSTYPE__FUSE &&
-					id == kdev_minor(it->s_dev) && !it->external) {
+			if (it->fstype->code == FSTYPE__FUSE && id == kdev_minor(it->s_dev) && !it->external) {
 				pr_err("%s is a fuse mount but not external\n", it->mountpoint);
 				goto out;
 			}
@@ -588,8 +578,7 @@ static int tracefs_parse(struct mount_info *pm)
 
 static bool cgroup_sb_equal(struct mount_info *a, struct mount_info *b)
 {
-	if (a->private && b->private &&
-			strcmp(a->private, b->private))
+	if (a->private && b->private && strcmp(a->private, b->private))
 		return false;
 	if (strcmp(a->options, b->options))
 		return false;
@@ -670,8 +659,7 @@ static int dump_empty_fs(struct mount_info *pm)
  */
 static int always_fail(struct mount_info *pm)
 {
-	pr_err("failed to dump fs %s (%s): always fail\n", pm->mountpoint,
-							   pm->fstype->name);
+	pr_err("failed to dump fs %s (%s): always fail\n", pm->mountpoint, pm->fstype->name);
 	return -1;
 }
 
@@ -679,92 +667,113 @@ static struct fstype fstypes[] = {
 	{
 		.name = "unsupported",
 		.code = FSTYPE__UNSUPPORTED,
-	}, {
+	},
+	{
 		.name = "auto_cr",
 		.code = FSTYPE__AUTO,
-	}, {
+	},
+	{
 		.name = "proc",
 		.code = FSTYPE__PROC,
-	}, {
+	},
+	{
 		.name = "sysfs",
 		.code = FSTYPE__SYSFS,
-	}, {
+	},
+	{
 		.name = "devtmpfs",
 		.code = FSTYPE__DEVTMPFS,
 		.dump = devtmpfs_dump,
 		.restore = devtmpfs_restore,
-	}, {
+	},
+	{
 		.name = "binfmt_misc",
 		.parse = binfmt_misc_parse_or_collect,
 		.collect = binfmt_misc_parse_or_collect,
 		.code = FSTYPE__BINFMT_MISC,
 		.dump = binfmt_misc_dump,
 		.restore = binfmt_misc_restore,
-	}, {
+	},
+	{
 		.name = "tmpfs",
 		.code = FSTYPE__TMPFS,
 		.dump = tmpfs_dump,
 		.restore = tmpfs_restore,
-	}, {
+	},
+	{
 		.name = "devpts",
 		.parse = devpts_parse,
 		.code = FSTYPE__DEVPTS,
 		.restore = devpts_restore,
 		.check_bindmount = devpts_check_bindmount,
-	}, {
+	},
+	{
 		.name = "simfs",
 		.code = FSTYPE__SIMFS,
-	}, {
+	},
+	{
 		.name = "btrfs",
 		.code = FSTYPE__UNSUPPORTED,
 		.sb_equal = btrfs_sb_equal,
-	}, {
+	},
+	{
 		.name = "pstore",
 		.dump = dump_empty_fs,
 		.code = FSTYPE__PSTORE,
-	}, {
+	},
+	{
 		.name = "mqueue",
 		.dump = dump_empty_fs,
 		.code = FSTYPE__MQUEUE,
-	}, {
+	},
+	{
 		.name = "securityfs",
 		.code = FSTYPE__SECURITYFS,
-	}, {
+	},
+	{
 		.name = "fusectl",
 		.dump = fusectl_dump,
 		.code = FSTYPE__FUSECTL,
-	}, {
+	},
+	{
 		.name = "debugfs",
 		.code = FSTYPE__DEBUGFS,
 		.parse = debugfs_parse,
-	}, {
+	},
+	{
 		.name = "tracefs",
 		.code = FSTYPE__TRACEFS,
 		.parse = tracefs_parse,
-	}, {
+	},
+	{
 		.name = "cgroup",
 		.code = FSTYPE__CGROUP,
 		.parse = cgroup_parse,
 		.sb_equal = cgroup_sb_equal,
-	}, {
+	},
+	{
 		.name = "cgroup2",
 		.code = FSTYPE__CGROUP2,
 		.parse = cgroup_parse,
 		.sb_equal = cgroup_sb_equal,
-	}, {
+	},
+	{
 		.name = "aufs",
 		.code = FSTYPE__AUFS,
 		.parse = aufs_parse,
-	}, {
+	},
+	{
 		.name = "fuse",
 		.code = FSTYPE__FUSE,
 		.dump = always_fail,
 		.restore = always_fail,
-	}, {
+	},
+	{
 		.name = "overlay",
 		.code = FSTYPE__OVERLAYFS,
 		.parse = overlayfs_parse,
-	}, {
+	},
+	{
 		.name = "autofs",
 		.code = FSTYPE__AUTOFS,
 		.parse = autofs_parse,
@@ -773,7 +782,10 @@ static struct fstype fstypes[] = {
 	},
 };
 
-struct fstype *fstype_auto(void) { return &fstypes[1]; }
+struct fstype *fstype_auto(void)
+{
+	return &fstypes[1];
+}
 
 static char fsauto_all[] = "all";
 static char *fsauto_names;
@@ -871,4 +883,3 @@ struct fstype *decode_fstype(u32 fst)
 uns:
 	return &fstypes[0];
 }
-
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 00a6a32c1..b5dd15dd8 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -46,26 +46,26 @@
 #include "images/fsnotify.pb-c.h"
 #include "images/mnt.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "fsnotify: "
 
 struct fsnotify_mark_info {
-	struct list_head		list;
+	struct list_head list;
 	union {
-		InotifyWdEntry		*iwe;
-		FanotifyMarkEntry	*fme;
+		InotifyWdEntry *iwe;
+		FanotifyMarkEntry *fme;
 	};
-	struct pprep_head		prep; /* XXX union with remap */
-	struct file_remap		*remap;
+	struct pprep_head prep; /* XXX union with remap */
+	struct file_remap *remap;
 };
 
 struct fsnotify_file_info {
 	union {
-		InotifyFileEntry	*ife;
-		FanotifyFileEntry	*ffe;
+		InotifyFileEntry *ife;
+		FanotifyFileEntry *ffe;
 	};
-	struct list_head		marks;
-	struct file_desc		d;
+	struct list_head marks;
+	struct file_desc d;
 };
 
 /* File handle */
@@ -91,12 +91,10 @@ static void decode_handle(fh_t *handle, FhEntry *img)
 {
 	memzero(handle, sizeof(*handle));
 
-	handle->type	= img->type;
-	handle->bytes	= img->bytes;
+	handle->type = img->type;
+	handle->bytes = img->bytes;
 
-	memcpy(handle->__handle, img->handle,
-			min(pb_repeated_size(img, handle),
-				sizeof(handle->__handle)));
+	memcpy(handle->__handle, img->handle, min(pb_repeated_size(img, handle), sizeof(handle->__handle)));
 }
 
 static int open_by_handle(void *arg, int fd, int pid)
@@ -104,11 +102,7 @@ static int open_by_handle(void *arg, int fd, int pid)
 	return syscall(__NR_open_by_handle_at, fd, arg, O_PATH);
 }
 
-enum {
-	ERR_NO_MOUNT = -1,
-	ERR_NO_PATH_IN_MOUNT = -2,
-	ERR_GENERIC = -3
-};
+enum { ERR_NO_MOUNT = -1, ERR_NO_PATH_IN_MOUNT = -2, ERR_GENERIC = -3 };
 
 static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_handle)
 {
@@ -139,13 +133,12 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 			continue;
 
 		mntfd = __open_mountpoint(m, -1);
-		pr_debug("\t\tTrying via mntid %d root %s ns_mountpoint @%s (%d)\n",
-			 m->mnt_id, m->root, m->ns_mountpoint, mntfd);
+		pr_debug("\t\tTrying via mntid %d root %s ns_mountpoint @%s (%d)\n", m->mnt_id, m->root,
+			 m->ns_mountpoint, mntfd);
 		if (mntfd < 0)
 			continue;
 
-		fd = userns_call(open_by_handle, UNS_FDOUT, &handle,
-				 sizeof(handle), mntfd);
+		fd = userns_call(open_by_handle, UNS_FDOUT, &handle, sizeof(handle), mntfd);
 		close(mntfd);
 		if (fd < 0)
 			continue;
@@ -176,9 +169,8 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 			}
 			close(openable_fd);
 
-			pr_debug("\t\t\topenable (inode %s) as %s\n",
-				 st.st_ino == i_ino ?
-				 "match" : "don't match", __path);
+			pr_debug("\t\t\topenable (inode %s) as %s\n", st.st_ino == i_ino ? "match" : "don't match",
+				 __path);
 
 			if (st.st_ino == i_ino) {
 				path = xstrdup(buf);
@@ -200,8 +192,7 @@ err:
 	return ERR_PTR(ERR_NO_MOUNT);
 }
 
-static int open_handle(unsigned int s_dev, unsigned long i_ino,
-		FhEntry *f_handle)
+static int open_handle(unsigned int s_dev, unsigned long i_ino, FhEntry *f_handle)
 {
 	struct mount_info *m;
 	int mntfd, fd = -1;
@@ -209,8 +200,7 @@ static int open_handle(unsigned int s_dev, unsigned long i_ino,
 
 	decode_handle(&handle, f_handle);
 
-	pr_debug("Opening fhandle %x:%llx...\n",
-			s_dev, (unsigned long long)handle.__handle[0]);
+	pr_debug("Opening fhandle %x:%llx...\n", s_dev, (unsigned long long)handle.__handle[0]);
 
 	for (m = mntinfo; m; m = m->next) {
 		if (m->s_dev != s_dev || !mnt_is_dir(m))
@@ -233,8 +223,7 @@ out:
 	return fd;
 }
 
-int check_open_handle(unsigned int s_dev, unsigned long i_ino,
-		FhEntry *f_handle)
+int check_open_handle(unsigned int s_dev, unsigned long i_ino, FhEntry *f_handle)
 {
 	char *path, *irmap_path;
 	struct mount_info *mi;
@@ -270,10 +259,9 @@ int check_open_handle(unsigned int s_dev, unsigned long i_ino,
 		goto err;
 	}
 
-	if ((mi->fstype->code == FSTYPE__TMPFS) ||
-	    (mi->fstype->code == FSTYPE__DEVTMPFS)) {
-		pr_err("Can't find suitable path for handle (dev %#x ino %#lx): %d\n",
-		       s_dev, i_ino, (int)PTR_ERR(path));
+	if ((mi->fstype->code == FSTYPE__TMPFS) || (mi->fstype->code == FSTYPE__DEVTMPFS)) {
+		pr_err("Can't find suitable path for handle (dev %#x ino %#lx): %d\n", s_dev, i_ino,
+		       (int)PTR_ERR(path));
 		goto err;
 	}
 
@@ -310,11 +298,9 @@ err:
 
 static int check_one_wd(InotifyWdEntry *we)
 {
-	pr_info("wd: wd %#08x s_dev %#08x i_ino %#16"PRIx64" mask %#08x\n",
-			we->wd, we->s_dev, we->i_ino, we->mask);
-	pr_info("\t[fhandle] bytes %#08x type %#08x __handle %#016"PRIx64":%#016"PRIx64"\n",
-			we->f_handle->bytes, we->f_handle->type,
-			we->f_handle->handle[0], we->f_handle->handle[1]);
+	pr_info("wd: wd %#08x s_dev %#08x i_ino %#16" PRIx64 " mask %#08x\n", we->wd, we->s_dev, we->i_ino, we->mask);
+	pr_info("\t[fhandle] bytes %#08x type %#08x __handle %#016" PRIx64 ":%#016" PRIx64 "\n", we->f_handle->bytes,
+		we->f_handle->type, we->f_handle->handle[0], we->f_handle->handle[1]);
 
 	if (we->mask & KERNEL_FS_EVENT_ON_CHILD)
 		pr_warn_once("\t\tDetected FS_EVENT_ON_CHILD bit "
@@ -387,23 +373,21 @@ static int pre_dump_one_inotify(int pid, int lfd)
 }
 
 const struct fdtype_ops inotify_dump_ops = {
-	.type		= FD_TYPES__INOTIFY,
-	.dump		= dump_one_inotify,
-	.pre_dump	= pre_dump_one_inotify,
+	.type = FD_TYPES__INOTIFY,
+	.dump = dump_one_inotify,
+	.pre_dump = pre_dump_one_inotify,
 };
 
 static int check_one_mark(FanotifyMarkEntry *fme)
 {
 	if (fme->type == MARK_TYPE__INODE) {
-
 		BUG_ON(!fme->ie);
 
-		pr_info("mark: s_dev %#08x i_ino %#016"PRIx64" mask %#08x\n",
-			fme->s_dev, fme->ie->i_ino, fme->mask);
+		pr_info("mark: s_dev %#08x i_ino %#016" PRIx64 " mask %#08x\n", fme->s_dev, fme->ie->i_ino, fme->mask);
 
-		pr_info("\t[fhandle] bytes %#08x type %#08x __handle %#016"PRIx64":%#016"PRIx64"\n",
-			fme->ie->f_handle->bytes, fme->ie->f_handle->type,
-			fme->ie->f_handle->handle[0], fme->ie->f_handle->handle[1]);
+		pr_info("\t[fhandle] bytes %#08x type %#08x __handle %#016" PRIx64 ":%#016" PRIx64 "\n",
+			fme->ie->f_handle->bytes, fme->ie->f_handle->type, fme->ie->f_handle->handle[0],
+			fme->ie->f_handle->handle[1]);
 
 		if (check_open_handle(fme->s_dev, fme->ie->i_ino, fme->ie->f_handle))
 			return -1;
@@ -423,9 +407,7 @@ static int check_one_mark(FanotifyMarkEntry *fme)
 			fme->me->path = m->mountpoint + 1;
 		fme->s_dev = m->s_dev;
 
-		pr_info("mark: s_dev %#08x mnt_id  %#08x mask %#08x\n",
-			fme->s_dev, fme->me->mnt_id, fme->mask);
-
+		pr_info("mark: s_dev %#08x mnt_id  %#08x mask %#08x\n", fme->s_dev, fme->me->mnt_id, fme->mask);
 	}
 
 	return 0;
@@ -480,9 +462,7 @@ static int pre_dump_one_fanotify(int pid, int lfd)
 	for (i = 0; i < fe.n_mark; i++) {
 		FanotifyMarkEntry *me = fe.mark[i];
 
-		if (me->type == MARK_TYPE__INODE &&
-				irmap_queue_cache(me->s_dev, me->ie->i_ino,
-					me->ie->f_handle))
+		if (me->type == MARK_TYPE__INODE && irmap_queue_cache(me->s_dev, me->ie->i_ino, me->ie->f_handle))
 			return -1;
 
 		xfree(me);
@@ -492,13 +472,12 @@ static int pre_dump_one_fanotify(int pid, int lfd)
 }
 
 const struct fdtype_ops fanotify_dump_ops = {
-	.type		= FD_TYPES__FANOTIFY,
-	.dump		= dump_one_fanotify,
-	.pre_dump	= pre_dump_one_fanotify,
+	.type = FD_TYPES__FANOTIFY,
+	.dump = dump_one_fanotify,
+	.pre_dump = pre_dump_one_fanotify,
 };
 
-static char *get_mark_path(const char *who, struct file_remap *remap,
-			   FhEntry *f_handle, unsigned long i_ino,
+static char *get_mark_path(const char *who, struct file_remap *remap, FhEntry *f_handle, unsigned long i_ino,
 			   unsigned int s_dev, char *buf, int *target)
 {
 	char *path = NULL;
@@ -508,11 +487,10 @@ static char *get_mark_path(const char *who, struct file_remap *remap,
 
 		mntns_root = mntns_get_root_by_mnt_id(remap->rmnt_id);
 
-		pr_debug("\t\tRestore %s watch for %#08x:%#016lx (via %s)\n",
-			 who, s_dev, i_ino, remap->rpath);
+		pr_debug("\t\tRestore %s watch for %#08x:%#016lx (via %s)\n", who, s_dev, i_ino, remap->rpath);
 		*target = openat(mntns_root, remap->rpath, O_PATH);
 	} else if (f_handle->path) {
-		int  mntns_root;
+		int mntns_root;
 		char *path = ".";
 		uint32_t mnt_id = f_handle->has_mnt_id ? f_handle->mnt_id : -1;
 
@@ -550,8 +528,7 @@ static char *get_mark_path(const char *who, struct file_remap *remap,
 		if (read_fd_link(*target, link, sizeof(link)) < 0)
 			link[0] = '\0';
 
-		pr_debug("\t\tRestore %s watch for %#08x:%#016lx (via %s -> %s)\n",
-				who, s_dev, i_ino, path, link);
+		pr_debug("\t\tRestore %s watch for %#08x:%#016lx (via %s -> %s)\n", who, s_dev, i_ino, path, link);
 	}
 err:
 	return path;
@@ -564,15 +541,13 @@ static int restore_one_inotify(int inotify_fd, struct fsnotify_mark_info *info)
 	char buf[PSFDS], *path;
 	uint32_t mask;
 
-	path = get_mark_path("inotify", info->remap, iwe->f_handle,
-			     iwe->i_ino, iwe->s_dev, buf, &target);
+	path = get_mark_path("inotify", info->remap, iwe->f_handle, iwe->i_ino, iwe->s_dev, buf, &target);
 	if (!path)
 		goto err;
 
 	mask = iwe->mask & IN_ALL_EVENTS;
 	if (iwe->mask & ~IN_ALL_EVENTS) {
-		pr_info("\t\tfilter event mask %#x -> %#x\n",
-			iwe->mask, mask);
+		pr_info("\t\tfilter event mask %#x -> %#x\n", iwe->mask, mask);
 	}
 
 	if (kdat.has_inotify_setnextwd) {
@@ -643,9 +618,8 @@ static int restore_one_fanotify(int fd, struct fsnotify_mark_info *mark)
 		snprintf(buf, sizeof(buf), "/proc/self/fd/%d", target);
 		path = buf;
 	} else if (fme->type == MARK_TYPE__INODE) {
-		path = get_mark_path("fanotify", mark->remap,
-				     fme->ie->f_handle, fme->ie->i_ino,
-				     fme->s_dev, buf, &target);
+		path = get_mark_path("fanotify", mark->remap, fme->ie->f_handle, fme->ie->i_ino, fme->s_dev, buf,
+				     &target);
 		if (!path)
 			goto err;
 	} else {
@@ -658,18 +632,16 @@ static int restore_one_fanotify(int fd, struct fsnotify_mark_info *mark)
 	if (mark->fme->mask) {
 		ret = fanotify_mark(fd, flags, fme->mask, AT_FDCWD, path);
 		if (ret) {
-			pr_err("Adding fanotify mask 0x%x on 0x%x/%s failed (%d)\n",
-			       fme->mask, fme->id, path, ret);
+			pr_err("Adding fanotify mask 0x%x on 0x%x/%s failed (%d)\n", fme->mask, fme->id, path, ret);
 			goto err;
 		}
 	}
 
 	if (fme->ignored_mask) {
-		ret = fanotify_mark(fd, flags | FAN_MARK_IGNORED_MASK,
-				    fme->ignored_mask, AT_FDCWD, path);
+		ret = fanotify_mark(fd, flags | FAN_MARK_IGNORED_MASK, fme->ignored_mask, AT_FDCWD, path);
 		if (ret) {
-			pr_err("Adding fanotify ignored-mask 0x%x on 0x%x/%s failed (%d)\n",
-			       fme->ignored_mask, fme->id, path, ret);
+			pr_err("Adding fanotify ignored-mask 0x%x on 0x%x/%s failed (%d)\n", fme->ignored_mask, fme->id,
+			       path, ret);
 			goto err;
 		}
 	}
@@ -791,8 +763,7 @@ static int __collect_inotify_mark(struct fsnotify_file_info *p, struct fsnotify_
 	return 0;
 }
 
-static int __collect_fanotify_mark(struct fsnotify_file_info *p,
-				struct fsnotify_mark_info *mark)
+static int __collect_fanotify_mark(struct fsnotify_file_info *p, struct fsnotify_mark_info *mark)
 {
 	list_add(&mark->list, &p->marks);
 	if (mark->fme->type == MARK_TYPE__INODE) {
@@ -830,10 +801,10 @@ static int collect_one_inotify(void *o, ProtobufCMessage *msg, struct cr_img *im
 }
 
 struct collect_image_info inotify_cinfo = {
-	.fd_type	= CR_FD_INOTIFY_FILE,
-	.pb_type	= PB_INOTIFY_FILE,
-	.priv_size	= sizeof(struct fsnotify_file_info),
-	.collect	= collect_one_inotify,
+	.fd_type = CR_FD_INOTIFY_FILE,
+	.pb_type = PB_INOTIFY_FILE,
+	.priv_size = sizeof(struct fsnotify_file_info),
+	.collect = collect_one_inotify,
 };
 
 static int collect_one_fanotify(void *o, ProtobufCMessage *msg, struct cr_img *img)
@@ -864,10 +835,10 @@ static int collect_one_fanotify(void *o, ProtobufCMessage *msg, struct cr_img *i
 }
 
 struct collect_image_info fanotify_cinfo = {
-	.fd_type	= CR_FD_FANOTIFY_FILE,
-	.pb_type	= PB_FANOTIFY_FILE,
-	.priv_size	= sizeof(struct fsnotify_file_info),
-	.collect	= collect_one_fanotify,
+	.fd_type = CR_FD_FANOTIFY_FILE,
+	.pb_type = PB_FANOTIFY_FILE,
+	.priv_size = sizeof(struct fsnotify_file_info),
+	.collect = collect_one_fanotify,
 };
 
 static int collect_one_inotify_mark(void *o, ProtobufCMessage *msg, struct cr_img *i)
@@ -902,10 +873,10 @@ static int collect_one_inotify_mark(void *o, ProtobufCMessage *msg, struct cr_im
 }
 
 struct collect_image_info inotify_mark_cinfo = {
-	.fd_type	= CR_FD_INOTIFY_WD,
-	.pb_type	= PB_INOTIFY_WD,
-	.priv_size	= sizeof(struct fsnotify_mark_info),
-	.collect	= collect_one_inotify_mark,
+	.fd_type = CR_FD_INOTIFY_WD,
+	.pb_type = PB_INOTIFY_WD,
+	.priv_size = sizeof(struct fsnotify_mark_info),
+	.collect = collect_one_inotify_mark,
 };
 
 static int collect_one_fanotify_mark(void *o, ProtobufCMessage *msg, struct cr_img *i)
@@ -930,8 +901,8 @@ static int collect_one_fanotify_mark(void *o, ProtobufCMessage *msg, struct cr_i
 }
 
 struct collect_image_info fanotify_mark_cinfo = {
-	.fd_type	= CR_FD_FANOTIFY_MARK,
-	.pb_type	= PB_FANOTIFY_MARK,
-	.priv_size	= sizeof(struct fsnotify_mark_info),
-	.collect	= collect_one_fanotify_mark,
+	.fd_type = CR_FD_FANOTIFY_MARK,
+	.pb_type = PB_FANOTIFY_MARK,
+	.priv_size = sizeof(struct fsnotify_mark_info),
+	.collect = collect_one_fanotify_mark,
 };
diff --git a/criu/image-desc.c b/criu/image-desc.c
index 26e6b27bc..03842934f 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -11,17 +11,17 @@
  * for more details.
  */
 
-#define FD_ENTRY(_name, _fmt)			\
-	[CR_FD_##_name] = {			\
-		.fmt	= _fmt ".img",		\
-		.magic	= _name##_MAGIC,	\
+#define FD_ENTRY(_name, _fmt)           \
+	[CR_FD_##_name] = {             \
+		.fmt = _fmt ".img",     \
+		.magic = _name##_MAGIC, \
 	}
 
-#define FD_ENTRY_F(_name, _fmt, _f)		\
-	[CR_FD_##_name] = {			\
-		.fmt	= _fmt ".img",		\
-		.magic	= _name##_MAGIC,	\
-		.oflags	= _f,			\
+#define FD_ENTRY_F(_name, _fmt, _f)     \
+	[CR_FD_##_name] = {             \
+		.fmt = _fmt ".img",     \
+		.magic = _name##_MAGIC, \
+		.oflags = _f,           \
 	}
 
 struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
diff --git a/criu/image.c b/criu/image.c
index 84101b610..3a85eb532 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -274,8 +274,7 @@ void close_cr_imgset(struct cr_imgset **cr_imgset)
 	*cr_imgset = NULL;
 }
 
-struct cr_imgset *cr_imgset_open_range(int pid, int from, int to,
-			       unsigned long flags)
+struct cr_imgset *cr_imgset_open_range(int pid, int from, int to, unsigned long flags)
 {
 	struct cr_imgset *imgset;
 	unsigned int i;
@@ -403,10 +402,10 @@ static int img_write_magic(struct cr_img *img, int oflags, int type)
 }
 
 struct openat_args {
-	char	path[PATH_MAX];
-	int	flags;
-	int	err;
-	int	mode;
+	char path[PATH_MAX];
+	int flags;
+	int err;
+	int mode;
 };
 
 static int userns_openat(void *arg, int dfd, int pid)
@@ -430,8 +429,7 @@ static int do_open_image(struct cr_img *img, int dfd, int type, unsigned long of
 	if (opts.stream && !(oflags & O_FORCE_LOCAL)) {
 		ret = img_streamer_open(path, flags);
 		errno = EIO; /* errno value is meaningless, only the ret value is meaningful */
-	} else if (root_ns_mask & CLONE_NEWUSER &&
-		   type == CR_FD_PAGES && oflags & O_RDWR) {
+	} else if (root_ns_mask & CLONE_NEWUSER && type == CR_FD_PAGES && oflags & O_RDWR) {
 		/*
 		 * For pages images dedup we need to open images read-write on
 		 * restore, that may require proper capabilities, so we ask
@@ -574,7 +572,7 @@ int open_image_dir(char *dir, int mode)
 
 		if (opts.img_parent[0] == '/')
 			pr_warn("Absolute paths for parent links "
-					"may not work on restore!\n");
+				"may not work on restore!\n");
 	}
 
 	return 0;
diff --git a/criu/img-streamer.c b/criu/img-streamer.c
index bcf6e6818..7e36eae01 100644
--- a/criu/img-streamer.c
+++ b/criu/img-streamer.c
@@ -21,7 +21,7 @@
  *    (e.g., streamer is in capture more, while CRIU is in restore mode).
  */
 #define IMG_STREAMER_CAPTURE_SOCKET_NAME "streamer-capture.sock"
-#define IMG_STREAMER_SERVE_SOCKET_NAME "streamer-serve.sock"
+#define IMG_STREAMER_SERVE_SOCKET_NAME	 "streamer-serve.sock"
 
 /* All requests go through the same socket connection. We must synchronize */
 static mutex_t *img_streamer_fd_lock;
@@ -32,9 +32,13 @@ static int img_streamer_mode;
 static const char *socket_name_for_mode(int mode)
 {
 	switch (mode) {
-	case O_DUMP: return IMG_STREAMER_CAPTURE_SOCKET_NAME;
-	case O_RSTR: return IMG_STREAMER_SERVE_SOCKET_NAME;
-	default: BUG(); return NULL;
+	case O_DUMP:
+		return IMG_STREAMER_CAPTURE_SOCKET_NAME;
+	case O_RSTR:
+		return IMG_STREAMER_SERVE_SOCKET_NAME;
+	default:
+		BUG();
+		return NULL;
 	}
 }
 
@@ -57,8 +61,7 @@ int img_streamer_init(const char *image_dir, int mode)
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sun_family = AF_UNIX;
-	snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s",
-		 image_dir, socket_name_for_mode(mode));
+	snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", image_dir, socket_name_for_mode(mode));
 
 	if (connect(sockfd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		pr_perror("Unable to connect to image streamer socket: %s", addr.sun_path);
@@ -132,15 +135,13 @@ static int send_file_request(char *filename)
 {
 	ImgStreamerRequestEntry req = IMG_STREAMER_REQUEST_ENTRY__INIT;
 	req.filename = filename;
-	return pb_write_one_fd(get_service_fd(IMG_STREAMER_FD_OFF),
-			       &req, PB_IMG_STREAMER_REQUEST);
+	return pb_write_one_fd(get_service_fd(IMG_STREAMER_FD_OFF), &req, PB_IMG_STREAMER_REQUEST);
 }
 
 static int recv_file_reply(bool *exists)
 {
 	ImgStreamerReplyEntry *reply;
-	int ret = pb_read_one_fd(get_service_fd(IMG_STREAMER_FD_OFF),
-				 (void **)&reply, PB_IMG_STREAMER_REPLY);
+	int ret = pb_read_one_fd(get_service_fd(IMG_STREAMER_FD_OFF), (void **)&reply, PB_IMG_STREAMER_REPLY);
 	if (ret < 0)
 		return ret;
 
@@ -155,8 +156,8 @@ static int recv_file_reply(bool *exists)
  * image streamer, greatly improving performance.
  * Transfer rates of up to 15GB/s can be seen with this technique.
  */
-#define READ_PIPE	0 /* index of the read pipe returned by pipe() */
-#define WRITE_PIPE	1
+#define READ_PIPE  0 /* index of the read pipe returned by pipe() */
+#define WRITE_PIPE 1
 static int establish_streamer_file_pipe(void)
 {
 	/*
@@ -174,8 +175,7 @@ static int establish_streamer_file_pipe(void)
 		return -1;
 	}
 
-	if (send_fd(get_service_fd(IMG_STREAMER_FD_OFF),
-		    NULL, 0, fds[streamer_pipe_direction]) < 0)
+	if (send_fd(get_service_fd(IMG_STREAMER_FD_OFF), NULL, 0, fds[streamer_pipe_direction]) < 0)
 		close(fds[criu_pipe_direction]);
 	else
 		ret = fds[criu_pipe_direction];
diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index 1c8de41a8..a2eb72f28 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -22,26 +22,25 @@
 #include "images/ipc-sem.pb-c.h"
 #include "images/ipc-msg.pb-c.h"
 
-#if defined (__GLIBC__) && __GLIBC__ >= 2
+#if defined(__GLIBC__) && __GLIBC__ >= 2
 #define KEY __key
 #else
 #define KEY key
 #endif
 
 #ifndef MSGMAX
-#define MSGMAX			8192
+#define MSGMAX 8192
 #endif
 
 #ifndef MSG_COPY
-#define MSG_COPY		040000
+#define MSG_COPY 040000
 #endif
 
 static void pr_ipc_desc_entry(const IpcDescEntry *desc)
 {
 	pr_info("id: %-10d key: %#08x uid: %-10d gid: %-10d "
-		       "cuid: %-10d cgid: %-10d mode: %-10o ",
-		       desc->id, desc->key, desc->uid, desc->gid,
-		       desc->cuid, desc->cgid, desc->mode);
+		"cuid: %-10d cgid: %-10d mode: %-10o ",
+		desc->id, desc->key, desc->uid, desc->gid, desc->cuid, desc->cgid, desc->mode);
 }
 
 static void fill_ipc_desc(int id, IpcDescEntry *desc, const struct ipc_perm *ipcp)
@@ -62,7 +61,7 @@ static void pr_ipc_sem_array(int nr, u16 *values)
 	pr_info("\n");
 }
 
-#define pr_info_ipc_sem_array(nr, values)	pr_ipc_sem_array(nr, values)
+#define pr_info_ipc_sem_array(nr, values) pr_ipc_sem_array(nr, values)
 
 static void pr_info_ipc_sem_entry(const IpcSemEntry *sem)
 {
@@ -160,8 +159,7 @@ static int dump_ipc_sem(struct cr_img *img)
 
 static void pr_info_ipc_msg(int nr, const IpcMsg *msg)
 {
-	pr_info("  %-5d: type: %-20"PRId64" size: %-10d\n",
-		       nr++, msg->mtype, msg->msize);
+	pr_info("  %-5d: type: %-20" PRId64 " size: %-10d\n", nr++, msg->mtype, msg->msize);
 }
 
 static void pr_info_ipc_msg_entry(const IpcMsgEntry *msg)
@@ -170,8 +168,7 @@ static void pr_info_ipc_msg_entry(const IpcMsgEntry *msg)
 	pr_info("qbytes: %-10d qnum: %-10d\n", msg->qbytes, msg->qnum);
 }
 
-static int dump_ipc_msg_queue_messages(struct cr_img *img, const IpcMsgEntry *msq,
-				       unsigned int msg_nr)
+static int dump_ipc_msg_queue_messages(struct cr_img *img, const IpcMsgEntry *msq, unsigned int msg_nr)
 {
 	struct msgbuf *message = NULL;
 	unsigned int msgmax;
@@ -287,7 +284,7 @@ static int dump_ipc_msg(struct cr_img *img)
 static void pr_info_ipc_shm(const IpcShmEntry *shm)
 {
 	pr_ipc_desc_entry(shm->desc);
-	pr_info("size: %-10"PRIu64"\n", shm->size);
+	pr_info("size: %-10" PRIu64 "\n", shm->size);
 }
 
 #define NR_MANDATORY_IPC_SYSCTLS 9
@@ -295,24 +292,24 @@ static void pr_info_ipc_shm(const IpcShmEntry *shm)
 static int ipc_sysctl_req(IpcVarEntry *e, int op)
 {
 	struct sysctl_req req[] = {
-		{ "kernel/sem",			e->sem_ctls,		CTL_U32A(e->n_sem_ctls) },
-		{ "kernel/msgmax",		&e->msg_ctlmax,		CTL_U32 },
-		{ "kernel/msgmnb",		&e->msg_ctlmnb,		CTL_U32 },
-		{ "kernel/auto_msgmni",		&e->auto_msgmni,	CTL_U32 },
-		{ "kernel/msgmni",		&e->msg_ctlmni,		CTL_U32 },
-		{ "kernel/shmmax",		&e->shm_ctlmax,		CTL_U64 },
-		{ "kernel/shmall",		&e->shm_ctlall,		CTL_U64 },
-		{ "kernel/shmmni",		&e->shm_ctlmni,		CTL_U32 },
-		{ "kernel/shm_rmid_forced",	&e->shm_rmid_forced,	CTL_U32 },
+		{ "kernel/sem", e->sem_ctls, CTL_U32A(e->n_sem_ctls) },
+		{ "kernel/msgmax", &e->msg_ctlmax, CTL_U32 },
+		{ "kernel/msgmnb", &e->msg_ctlmnb, CTL_U32 },
+		{ "kernel/auto_msgmni", &e->auto_msgmni, CTL_U32 },
+		{ "kernel/msgmni", &e->msg_ctlmni, CTL_U32 },
+		{ "kernel/shmmax", &e->shm_ctlmax, CTL_U64 },
+		{ "kernel/shmall", &e->shm_ctlall, CTL_U64 },
+		{ "kernel/shmmni", &e->shm_ctlmni, CTL_U32 },
+		{ "kernel/shm_rmid_forced", &e->shm_rmid_forced, CTL_U32 },
 		/* We have 9 mandatory sysctls above and 8 optional below */
-		{ "fs/mqueue/queues_max",	&e->mq_queues_max,	CTL_U32 },
-		{ "fs/mqueue/msg_max",		&e->mq_msg_max,		CTL_U32 },
-		{ "fs/mqueue/msgsize_max",	&e->mq_msgsize_max,	CTL_U32 },
-		{ "fs/mqueue/msg_default",	&e->mq_msg_default,	CTL_U32 },
-		{ "fs/mqueue/msgsize_default",	&e->mq_msgsize_default,	CTL_U32 },
-		{ "kernel/msg_next_id", 	&e->msg_next_id, 	CTL_U32 },
-		{ "kernel/sem_next_id", 	&e->sem_next_id, 	CTL_U32 },
-		{ "kernel/shm_next_id", 	&e->shm_next_id, 	CTL_U32 },
+		{ "fs/mqueue/queues_max", &e->mq_queues_max, CTL_U32 },
+		{ "fs/mqueue/msg_max", &e->mq_msg_max, CTL_U32 },
+		{ "fs/mqueue/msgsize_max", &e->mq_msgsize_max, CTL_U32 },
+		{ "fs/mqueue/msg_default", &e->mq_msg_default, CTL_U32 },
+		{ "fs/mqueue/msgsize_default", &e->mq_msgsize_default, CTL_U32 },
+		{ "kernel/msg_next_id", &e->msg_next_id, CTL_U32 },
+		{ "kernel/sem_next_id", &e->sem_next_id, CTL_U32 },
+		{ "kernel/shm_next_id", &e->shm_next_id, CTL_U32 },
 	};
 
 	int nr = NR_MANDATORY_IPC_SYSCTLS;
@@ -408,8 +405,7 @@ static int dump_ipc_shm(struct cr_img *img)
 		slot++;
 	}
 	if (slot != info.used_ids) {
-		pr_err("Failed to collect %d (only %d succeeded)\n",
-				info.used_ids, slot);
+		pr_err("Failed to collect %d (only %d succeeded)\n", info.used_ids, slot);
 		return -EFAULT;
 	}
 	return 0;
@@ -420,8 +416,8 @@ static int dump_ipc_var(struct cr_img *img)
 	IpcVarEntry var = IPC_VAR_ENTRY__INIT;
 	int ret = -1;
 
-	var.n_sem_ctls	= 4;
-	var.sem_ctls	= xmalloc(pb_repeated_size(&var, sem_ctls));
+	var.n_sem_ctls = 4;
+	var.sem_ctls = xmalloc(pb_repeated_size(&var, sem_ctls));
 	if (!var.sem_ctls)
 		goto err;
 	var.has_mq_msg_default = true;
@@ -543,16 +539,14 @@ static int prepare_ipc_sem_desc(struct cr_img *img, const IpcSemEntry *sem)
 		return ret;
 	}
 
-	id = semget(sem->desc->key, sem->nsems,
-		     sem->desc->mode | IPC_CREAT | IPC_EXCL);
+	id = semget(sem->desc->key, sem->nsems, sem->desc->mode | IPC_CREAT | IPC_EXCL);
 	if (id == -1) {
 		pr_perror("Failed to create sem set");
 		return -errno;
 	}
 
 	if (id != sem->desc->id) {
-		pr_err("Failed to restore sem id (%d instead of %d)\n",
-							id, sem->desc->id);
+		pr_err("Failed to restore sem id (%d instead of %d)\n", id, sem->desc->id);
 		return -EFAULT;
 	}
 
@@ -639,8 +633,7 @@ static int prepare_ipc_msg_queue_messages(struct cr_img *img, const IpcMsgEntry
 
 		if (msg->msize > MSGMAX) {
 			ret = -1;
-			pr_err("Unsupported message size: %d (MAX: %d)\n",
-						msg->msize, MSGMAX);
+			pr_err("Unsupported message size: %d (MAX: %d)\n", msg->msize, MSGMAX);
 			break;
 		}
 
@@ -686,8 +679,7 @@ static int prepare_ipc_msg_queue(struct cr_img *img, const IpcMsgEntry *msq)
 	}
 
 	if (id != msq->desc->id) {
-		pr_err("Failed to restore msg id (%d instead of %d)\n",
-							id, msq->desc->id);
+		pr_err("Failed to restore msg id (%d instead of %d)\n", id, msq->desc->id);
 		return -EFAULT;
 	}
 
@@ -821,16 +813,14 @@ static int prepare_ipc_shm_seg(struct cr_img *img, const IpcShmEntry *shm)
 		return ret;
 	}
 
-	id = shmget(shm->desc->key, shm->size,
-		    shm->desc->mode | IPC_CREAT | IPC_EXCL);
+	id = shmget(shm->desc->key, shm->size, shm->desc->mode | IPC_CREAT | IPC_EXCL);
 	if (id == -1) {
 		pr_perror("Failed to create shm set");
 		return -errno;
 	}
 
 	if (id != shm->desc->id) {
-		pr_err("Failed to restore shm id (%d instead of %d)\n",
-							id, shm->desc->id);
+		pr_err("Failed to restore shm id (%d instead of %d)\n", id, shm->desc->id);
 		return -EFAULT;
 	}
 
diff --git a/criu/irmap.c b/criu/irmap.c
index c9bfdbe22..09570c593 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -30,12 +30,12 @@
 #include "images/fsnotify.pb-c.h"
 #include "images/fh.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "irmap: "
 
-#define IRMAP_CACHE_BITS	5
-#define IRMAP_CACHE_SIZE	(1 << IRMAP_CACHE_BITS)
-#define IRMAP_CACHE_MASK	(IRMAP_CACHE_SIZE - 1)
+#define IRMAP_CACHE_BITS 5
+#define IRMAP_CACHE_SIZE (1 << IRMAP_CACHE_BITS)
+#define IRMAP_CACHE_MASK (IRMAP_CACHE_SIZE - 1)
 
 static inline int irmap_hashfn(unsigned int s_dev, unsigned long i_ino)
 {
@@ -55,16 +55,34 @@ struct irmap {
 static struct irmap *cache[IRMAP_CACHE_SIZE];
 
 static struct irmap hints[] = {
-	{ .path = "/etc", .nr_kids = -1, },
-	{ .path = "/var/spool", .nr_kids = -1, },
-	{ .path = "/var/log", .nr_kids = -1, },
+	{
+		.path = "/etc",
+		.nr_kids = -1,
+	},
+	{
+		.path = "/var/spool",
+		.nr_kids = -1,
+	},
+	{
+		.path = "/var/log",
+		.nr_kids = -1,
+	},
 	{ .path = "/usr/share/dbus-1/system-services", .nr_kids = -1 },
 	{ .path = "/var/lib/polkit-1/localauthority", .nr_kids = -1 },
 	{ .path = "/usr/share/polkit-1/actions", .nr_kids = -1 },
-	{ .path = "/lib/udev", .nr_kids = -1, },
-	{ .path = "/.", .nr_kids = 0, },
-	{ .path = "/no-such-path", .nr_kids = -1, },
-	{ },
+	{
+		.path = "/lib/udev",
+		.nr_kids = -1,
+	},
+	{
+		.path = "/.",
+		.nr_kids = 0,
+	},
+	{
+		.path = "/no-such-path",
+		.nr_kids = -1,
+	},
+	{},
 };
 
 /*
@@ -142,8 +160,8 @@ static int irmap_update_dir(struct irmap *t)
 
 		k = &t->kids[nr - 1];
 
-		k->kids = NULL;	 /* for xrealloc above */
-		k->ino = 0;	 /* for irmap_update_stat */
+		k->kids = NULL; /* for xrealloc above */
+		k->ino = 0; /* for irmap_update_stat */
 		k->nr_kids = -1; /* for irmap_update_dir */
 		k->path = xsprintf("%s/%s", t->path, de->d_name);
 		if (!k->path)
@@ -235,14 +253,13 @@ char *irmap_lookup(unsigned int s_dev, unsigned long i_ino)
 	 * But the root service fd is already set by the
 	 * irmap_predump_prep, so we just go ahead and scan.
 	 */
-	if (!doing_predump &&
-			__mntns_get_root_fd(root_item->pid->real) < 0)
+	if (!doing_predump && __mntns_get_root_fd(root_item->pid->real) < 0)
 		goto out;
 
 	timing_start(TIME_IRMAP_RESOLVE);
 
 	hv = irmap_hashfn(s_dev, i_ino);
-	for (p = &cache[hv]; *p; ) {
+	for (p = &cache[hv]; *p;) {
 		c = *p;
 		if (!(c->dev == s_dev && c->ino == i_ino)) {
 			p = &(*p)->next;
@@ -298,8 +315,7 @@ struct irmap_predump {
 
 static struct irmap_predump *predump_queue;
 
-int irmap_queue_cache(unsigned int dev, unsigned long ino,
-		FhEntry *fh)
+int irmap_queue_cache(unsigned int dev, unsigned long ino, FhEntry *fh)
 {
 	struct irmap_predump *ip;
 
@@ -310,8 +326,7 @@ int irmap_queue_cache(unsigned int dev, unsigned long ino,
 	ip->dev = dev;
 	ip->ino = ino;
 	ip->fh = *fh;
-	ip->fh.handle = xmemdup(fh->handle,
-			FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
+	ip->fh.handle = xmemdup(fh->handle, FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
 	if (!ip->fh.handle) {
 		xfree(ip);
 		return -1;
diff --git a/criu/kcmp-ids.c b/criu/kcmp-ids.c
index 4fde10e67..1569b9d40 100644
--- a/criu/kcmp-ids.c
+++ b/criu/kcmp-ids.c
@@ -52,13 +52,13 @@
  */
 
 struct kid_entry {
-	struct rb_node	node;
+	struct rb_node node;
 
-	struct rb_root	subtree_root;
-	struct rb_node	subtree_node;
+	struct rb_root subtree_root;
+	struct rb_node subtree_node;
 
-	uint32_t	subid;	/* subid is always unique */
-	struct kid_elem	elem;
+	uint32_t subid; /* subid is always unique */
+	struct kid_elem elem;
 } __aligned(sizeof(long));
 
 static struct kid_entry *alloc_kid_entry(struct kid_tree *tree, struct kid_elem *elem)
@@ -69,8 +69,8 @@ static struct kid_entry *alloc_kid_entry(struct kid_tree *tree, struct kid_elem
 	if (!e)
 		goto err;
 
-	e->subid	= tree->subid++;
-	e->elem		= *elem;
+	e->subid = tree->subid++;
+	e->elem = *elem;
 
 	/* Make sure no overflow here */
 	BUG_ON(!e->subid);
@@ -78,14 +78,12 @@ static struct kid_entry *alloc_kid_entry(struct kid_tree *tree, struct kid_elem
 	rb_init_node(&e->node);
 	rb_init_node(&e->subtree_node);
 	e->subtree_root = RB_ROOT;
-	rb_link_and_balance(&e->subtree_root, &e->subtree_node,
-			NULL, &e->subtree_root.rb_node);
+	rb_link_and_balance(&e->subtree_root, &e->subtree_node, NULL, &e->subtree_root.rb_node);
 err:
 	return e;
 }
 
-static uint32_t kid_generate_sub(struct kid_tree *tree, struct kid_entry *e,
-		struct kid_elem *elem, int *new_id)
+static uint32_t kid_generate_sub(struct kid_tree *tree, struct kid_entry *e, struct kid_elem *elem, int *new_id)
 {
 	struct rb_node *node = e->subtree_root.rb_node;
 	struct kid_entry *sub = NULL;
@@ -97,8 +95,7 @@ static uint32_t kid_generate_sub(struct kid_tree *tree, struct kid_entry *e,
 
 	while (node) {
 		struct kid_entry *this = rb_entry(node, struct kid_entry, subtree_node);
-		int ret = syscall(SYS_kcmp, this->elem.pid, elem->pid, tree->kcmp_type,
-				this->elem.idx, elem->idx);
+		int ret = syscall(SYS_kcmp, this->elem.pid, elem->pid, tree->kcmp_type, this->elem.idx, elem->idx);
 
 		parent = *new;
 		if (ret == 1)
@@ -108,9 +105,8 @@ static uint32_t kid_generate_sub(struct kid_tree *tree, struct kid_entry *e,
 		else if (ret == 0)
 			return this->subid;
 		else {
-			pr_perror("kcmp failed: pid (%d %d) type %u idx (%u %u)",
-				  this->elem.pid, elem->pid, tree->kcmp_type,
-				  this->elem.idx, elem->idx);
+			pr_perror("kcmp failed: pid (%d %d) type %u idx (%u %u)", this->elem.pid, elem->pid,
+				  tree->kcmp_type, this->elem.idx, elem->idx);
 			return 0;
 		}
 	}
@@ -124,8 +120,7 @@ static uint32_t kid_generate_sub(struct kid_tree *tree, struct kid_entry *e,
 	return sub->subid;
 }
 
-uint32_t kid_generate_gen(struct kid_tree *tree,
-		struct kid_elem *elem, int *new_id)
+uint32_t kid_generate_gen(struct kid_tree *tree, struct kid_elem *elem, int *new_id)
 {
 	struct rb_node *node = tree->root.rb_node;
 	struct kid_entry *e = NULL;
@@ -154,9 +149,7 @@ uint32_t kid_generate_gen(struct kid_tree *tree,
 	return e->subid;
 }
 
-static struct kid_elem *kid_lookup_epoll_tfd_sub(struct kid_tree *tree,
-						 struct kid_entry *e,
-						 struct kid_elem *elem,
+static struct kid_elem *kid_lookup_epoll_tfd_sub(struct kid_tree *tree, struct kid_entry *e, struct kid_elem *elem,
 						 kcmp_epoll_slot_t *slot)
 {
 	struct rb_node *node = e->subtree_root.rb_node;
@@ -166,8 +159,7 @@ static struct kid_elem *kid_lookup_epoll_tfd_sub(struct kid_tree *tree,
 
 	while (node) {
 		struct kid_entry *this = rb_entry(node, struct kid_entry, subtree_node);
-		int ret = syscall(SYS_kcmp, this->elem.pid, elem->pid, KCMP_EPOLL_TFD,
-				  this->elem.idx, slot);
+		int ret = syscall(SYS_kcmp, this->elem.pid, elem->pid, KCMP_EPOLL_TFD, this->elem.idx, slot);
 
 		if (ret == 1)
 			node = node->rb_left, new = &((*new)->rb_left);
@@ -176,9 +168,8 @@ static struct kid_elem *kid_lookup_epoll_tfd_sub(struct kid_tree *tree,
 		else if (ret == 0)
 			return &this->elem;
 		else {
-			pr_perror("kcmp-epoll failed: pid (%d %d) type %u idx (%u %u)",
-				  this->elem.pid, elem->pid, KCMP_EPOLL_TFD,
-				  this->elem.idx, elem->idx);
+			pr_perror("kcmp-epoll failed: pid (%d %d) type %u idx (%u %u)", this->elem.pid, elem->pid,
+				  KCMP_EPOLL_TFD, this->elem.idx, elem->idx);
 			return NULL;
 		}
 	}
@@ -186,9 +177,7 @@ static struct kid_elem *kid_lookup_epoll_tfd_sub(struct kid_tree *tree,
 	return NULL;
 }
 
-struct kid_elem *kid_lookup_epoll_tfd(struct kid_tree *tree,
-				      struct kid_elem *elem,
-				      kcmp_epoll_slot_t *slot)
+struct kid_elem *kid_lookup_epoll_tfd(struct kid_tree *tree, struct kid_elem *elem, kcmp_epoll_slot_t *slot)
 {
 	struct rb_node *node = tree->root.rb_node;
 	struct rb_node **new = &tree->root.rb_node;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index f418f42bd..4d28dac98 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -10,11 +10,10 @@
 #include <sys/sysmacros.h>
 #include <stdint.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/prctl.h>
 #include <sys/inotify.h>
 
-
 #include "common/config.h"
 #include "int.h"
 #include "log.h"
@@ -43,8 +42,7 @@
 #include "sched.h"
 #include "memfd.h"
 
-struct kerndat_s kdat = {
-};
+struct kerndat_s kdat = {};
 
 static int check_pagemap(void)
 {
@@ -133,29 +131,26 @@ static void kerndat_mmap_min_addr(void)
 
 	struct sysctl_req req[] = {
 		{
-			.name	= "vm/mmap_min_addr",
-			.arg	= &value,
-			.type	= CTL_U64,
+			.name = "vm/mmap_min_addr",
+			.arg = &value,
+			.type = CTL_U64,
 		},
 	};
 
 	if (sysctl_op(req, ARRAY_SIZE(req), CTL_READ, 0)) {
-		pr_warn("Can't fetch %s value, use default %#lx\n",
-			req[0].name, (unsigned long)default_mmap_min_addr);
+		pr_warn("Can't fetch %s value, use default %#lx\n", req[0].name, (unsigned long)default_mmap_min_addr);
 		kdat.mmap_min_addr = default_mmap_min_addr;
 		return;
 	}
 
 	if (value < default_mmap_min_addr) {
-		pr_debug("Adjust mmap_min_addr %#lx -> %#lx\n",
-			 (unsigned long)value,
+		pr_debug("Adjust mmap_min_addr %#lx -> %#lx\n", (unsigned long)value,
 			 (unsigned long)default_mmap_min_addr);
 		kdat.mmap_min_addr = default_mmap_min_addr;
 	} else
 		kdat.mmap_min_addr = value;
 
-	pr_debug("Found mmap_min_addr %#lx\n",
-		 (unsigned long)kdat.mmap_min_addr);
+	pr_debug("Found mmap_min_addr %#lx\n", (unsigned long)kdat.mmap_min_addr);
 }
 
 static int kerndat_files_stat(void)
@@ -165,9 +160,9 @@ static int kerndat_files_stat(void)
 
 	struct sysctl_req req[] = {
 		{
-			.name	= "fs/nr_open",
-			.arg	= &nr_open,
-			.type	= CTL_U32,
+			.name = "fs/nr_open",
+			.arg = &nr_open,
+			.type = CTL_U32,
 		},
 	};
 
@@ -178,8 +173,7 @@ static int kerndat_files_stat(void)
 
 	kdat.sysctl_nr_open = nr_open;
 
-	pr_debug("files stat: %s %u\n",
-		 req[0].name, kdat.sysctl_nr_open);
+	pr_debug("files stat: %s %u\n", req[0].name, kdat.sysctl_nr_open);
 
 	return 0;
 }
@@ -191,15 +185,13 @@ static int kerndat_get_shmemdev(void)
 	struct stat buf;
 	dev_t dev;
 
-	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (map == MAP_FAILED) {
 		pr_perror("Can't mmap memory for shmemdev test");
 		return -1;
 	}
 
-	sprintf(maps, "/proc/self/map_files/%lx-%lx",
-			(unsigned long)map, (unsigned long)map + page_size());
+	sprintf(maps, "/proc/self/map_files/%lx-%lx", (unsigned long)map, (unsigned long)map + page_size());
 	if (stat(maps, &buf) < 0) {
 		int e = errno;
 		if (errno == EPERM) {
@@ -221,7 +213,7 @@ static int kerndat_get_shmemdev(void)
 
 	munmap(map, PAGE_SIZE);
 	kdat.shmem_dev = dev;
-	pr_info("Found anon-shmem device at %"PRIx64"\n", kdat.shmem_dev);
+	pr_info("Found anon-shmem device at %" PRIx64 "\n", kdat.shmem_dev);
 	return 0;
 
 err:
@@ -232,10 +224,10 @@ err:
 static dev_t get_host_dev(unsigned int which)
 {
 	static struct kst {
-		const char	*name;
-		const char	*path;
-		unsigned int	magic;
-		dev_t		fs_dev;
+		const char *name;
+		const char *path;
+		unsigned int magic;
+		dev_t fs_dev;
 	} kstat[KERNDAT_FS_STAT_MAX] = {
 		[KERNDAT_FS_STAT_DEVPTS] = {
 			.name	= "devpts",
@@ -314,8 +306,7 @@ static int kerndat_get_dirty_track(void)
 	u64 pmap = 0;
 	int ret = -1;
 
-	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE,
-			MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 	if (map == MAP_FAILED) {
 		pr_perror("Can't mmap memory for pagemap test");
 		return ret;
@@ -353,7 +344,7 @@ static int kerndat_get_dirty_track(void)
 		pr_info("Dirty track supported on kernel\n");
 		kdat.has_dirty_track = true;
 	} else {
-no_dt:
+	no_dt:
 		pr_info("Dirty tracking support is OFF\n");
 		if (opts.track_mem) {
 			pr_err("Tracking memory is not available\n");
@@ -382,7 +373,7 @@ static int init_zero_page_pfn(void)
 		return 0;
 	}
 
-	if (*((int *) addr) != 0) {
+	if (*((int *)addr) != 0) {
 		BUG();
 		return -1;
 	}
@@ -535,7 +526,7 @@ int kerndat_tcp_repair(void)
 	struct sockaddr_in addr;
 	socklen_t aux;
 
-	memset(&addr,0,sizeof(addr));
+	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
 	inet_pton(AF_INET, "127.0.0.1", &(addr.sin_addr));
 	addr.sin_port = 0;
@@ -545,13 +536,13 @@ int kerndat_tcp_repair(void)
 		return -1;
 	}
 
-	if (bind(sock, (struct sockaddr *) &addr, sizeof(addr))) {
+	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr))) {
 		pr_perror("Unable to bind a socket");
 		goto err;
 	}
 
 	aux = sizeof(addr);
-	if (getsockname(sock, (struct sockaddr *) &addr, &aux)) {
+	if (getsockname(sock, (struct sockaddr *)&addr, &aux)) {
 		pr_perror("Unable to get a socket name");
 		goto err;
 	}
@@ -567,7 +558,7 @@ int kerndat_tcp_repair(void)
 		goto err;
 	}
 
-	if (connect(clnt, (struct sockaddr *) &addr, sizeof(addr))) {
+	if (connect(clnt, (struct sockaddr *)&addr, sizeof(addr))) {
 		pr_perror("Unable to connect a socket");
 		goto err;
 	}
@@ -641,8 +632,7 @@ static int kerndat_detect_stack_guard_gap(void)
 	FILE *maps;
 	void *mem;
 
-	mem = mmap(NULL, (3ul << 20), PROT_READ | PROT_WRITE,
-		   MAP_PRIVATE | MAP_ANONYMOUS | MAP_GROWSDOWN, -1, 0);
+	mem = mmap(NULL, (3ul << 20), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_GROWSDOWN, -1, 0);
 	if (mem == MAP_FAILED) {
 		pr_perror("Can't mmap stack area");
 		return -1;
@@ -664,8 +654,7 @@ static int kerndat_detect_stack_guard_gap(void)
 	}
 
 	while (fgets(buf, sizeof(buf), maps)) {
-		num = sscanf(buf, "%lx-%lx %c%c%c%c",
-			     &start, &end, &r, &w, &x, &s);
+		num = sscanf(buf, "%lx-%lx %c%c%c%c", &start, &end, &r, &w, &x, &s);
 		if (num < 6) {
 			pr_err("Can't parse: %s\n", buf);
 			goto err;
@@ -746,7 +735,7 @@ static int kerndat_has_fsopen(void)
 
 static int has_kcmp_epoll_tfd(void)
 {
-	kcmp_epoll_slot_t slot = { };
+	kcmp_epoll_slot_t slot = {};
 	int ret = -1, efd, tfd;
 	pid_t pid = getpid();
 	struct epoll_event ev;
@@ -822,8 +811,8 @@ static int kerndat_x86_has_ptrace_fpu_xsave_bug(void)
 	return 0;
 }
 
-#define KERNDAT_CACHE_FILE	KDAT_RUNDIR"/criu.kdat"
-#define KERNDAT_CACHE_FILE_TMP	KDAT_RUNDIR"/.criu.kdat"
+#define KERNDAT_CACHE_FILE     KDAT_RUNDIR "/criu.kdat"
+#define KERNDAT_CACHE_FILE_TMP KDAT_RUNDIR "/.criu.kdat"
 
 static int kerndat_try_load_cache(void)
 {
@@ -831,7 +820,7 @@ static int kerndat_try_load_cache(void)
 
 	fd = open(KERNDAT_CACHE_FILE, O_RDONLY);
 	if (fd < 0) {
-		if(ENOENT == errno)
+		if (ENOENT == errno)
 			pr_debug("File %s does not exist\n", KERNDAT_CACHE_FILE);
 		else
 			pr_warn("Can't load %s\n", KERNDAT_CACHE_FILE);
@@ -847,9 +836,7 @@ static int kerndat_try_load_cache(void)
 
 	close(fd);
 
-	if (ret != sizeof(kdat) ||
-			kdat.magic1 != KDAT_MAGIC ||
-			kdat.magic2 != KDAT_MAGIC_2) {
+	if (ret != sizeof(kdat) || kdat.magic1 != KDAT_MAGIC || kdat.magic2 != KDAT_MAGIC_2) {
 		pr_warn("Stale %s file\n", KERNDAT_CACHE_FILE);
 		unlink(KERNDAT_CACHE_FILE);
 		return 1;
@@ -898,7 +885,7 @@ static void kerndat_save_cache(void)
 
 	if (ret < 0) {
 		pr_perror("Couldn't save %s", KERNDAT_CACHE_FILE);
-unl:
+	unl:
 		unlink(KERNDAT_CACHE_FILE_TMP);
 	}
 }
@@ -957,8 +944,7 @@ int kerndat_has_thp_disable(void)
 		return 0;
 	}
 
-	addr = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE,
-		    MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	addr = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 	if (addr == MAP_FAILED) {
 		pr_perror("Can't mmap memory for THP disable test");
 		return -1;
diff --git a/criu/libnetlink.c b/criu/libnetlink.c
index f9da58e9a..6dad7551a 100644
--- a/criu/libnetlink.c
+++ b/criu/libnetlink.c
@@ -10,9 +10,8 @@
 #include "libnetlink.h"
 #include "util.h"
 
-static int nlmsg_receive(char *buf, int len,
-		int (*cb)(struct nlmsghdr *, struct ns_id *ns, void *),
-		int (*err_cb)(int, struct ns_id *, void *), struct ns_id *ns, void *arg)
+static int nlmsg_receive(char *buf, int len, int (*cb)(struct nlmsghdr *, struct ns_id *ns, void *),
+			 int (*err_cb)(int, struct ns_id *, void *), struct ns_id *ns, void *arg)
 {
 	struct nlmsghdr *hdr;
 
@@ -56,8 +55,7 @@ static int rtnl_return_err(int err, struct ns_id *ns, void *arg)
 	return err;
 }
 
-int do_rtnl_req(int nl, void *req, int size,
-		int (*receive_callback)(struct nlmsghdr *h, struct ns_id *ns, void *),
+int do_rtnl_req(int nl, void *req, int size, int (*receive_callback)(struct nlmsghdr *h, struct ns_id *ns, void *),
 		int (*error_callback)(int err, struct ns_id *ns, void *arg), struct ns_id *ns, void *arg)
 {
 	struct msghdr msg;
@@ -70,16 +68,16 @@ int do_rtnl_req(int nl, void *req, int size,
 		error_callback = rtnl_return_err;
 
 	memset(&msg, 0, sizeof(msg));
-	msg.msg_name	= &nladdr;
-	msg.msg_namelen	= sizeof(nladdr);
-	msg.msg_iov	= &iov;
-	msg.msg_iovlen	= 1;
+	msg.msg_name = &nladdr;
+	msg.msg_namelen = sizeof(nladdr);
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
 
-	iov.iov_base	= req;
-	iov.iov_len	= size;
+	iov.iov_base = req;
+	iov.iov_len = size;
 
 	if (sendmsg(nl, &msg, 0) < 0) {
 		err = -errno;
@@ -87,16 +85,15 @@ int do_rtnl_req(int nl, void *req, int size,
 		goto err;
 	}
 
-	iov.iov_base	= buf;
-	iov.iov_len	= sizeof(buf);
+	iov.iov_base = buf;
+	iov.iov_len = sizeof(buf);
 
 	while (1) {
-
 		memset(&msg, 0, sizeof(msg));
-		msg.msg_name	= &nladdr;
-		msg.msg_namelen	= sizeof(nladdr);
-		msg.msg_iov	= &iov;
-		msg.msg_iovlen	= 1;
+		msg.msg_name = &nladdr;
+		msg.msg_namelen = sizeof(nladdr);
+		msg.msg_iov = &iov;
+		msg.msg_iovlen = 1;
 
 		err = recvmsg(nl, &msg, 0);
 		if (err < 0) {
@@ -130,8 +127,7 @@ err:
 	return err;
 }
 
-int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
-		int alen)
+int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, int alen)
 {
 	int len = nla_attr_size(alen);
 	struct rtattr *rta;
@@ -172,8 +168,7 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
  * @see nla_validate
  * @return 0 on success or a negative error code.
  */
-int __wrap_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head, int len,
-	      struct nla_policy *policy)
+int __wrap_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head, int len, struct nla_policy *policy)
 {
 	struct nlattr *nla;
 	int rem;
@@ -188,14 +183,16 @@ int __wrap_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head, int
 
 		if (tb[type])
 			pr_warn("Attribute of type %#x found multiple times in message, "
-				  "previous attribute is being ignored.\n", type);
+				"previous attribute is being ignored.\n",
+				type);
 
 		tb[type] = nla;
 	}
 
 	if (rem > 0)
 		pr_warn("netlink: %d bytes leftover after parsing "
-		       "attributes.\n", rem);
+			"attributes.\n",
+			rem);
 
 	return 0;
 }
@@ -210,17 +207,15 @@ int __wrap_nla_parse(struct nlattr *tb[], int maxtype, struct nlattr *head, int
  *
  * See nla_parse()
  */
-int __wrap_nlmsg_parse(struct nlmsghdr *nlh, int hdrlen, struct nlattr *tb[],
-		int maxtype, struct nla_policy *policy)
+int __wrap_nlmsg_parse(struct nlmsghdr *nlh, int hdrlen, struct nlattr *tb[], int maxtype, struct nla_policy *policy)
 {
 	if (!nlmsg_valid_hdr(nlh, hdrlen))
 		return -NLE_MSG_TOOSHORT;
 
-	return nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen),
-			 nlmsg_attrlen(nlh, hdrlen), policy);
+	return nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen), nlmsg_attrlen(nlh, hdrlen), policy);
 }
 
 int32_t nla_get_s32(const struct nlattr *nla)
 {
-	return *(const int32_t *) nla_data(nla);
+	return *(const int32_t *)nla_data(nla);
 }
diff --git a/criu/log.c b/criu/log.c
index 439a899f0..c4ce90ec0 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -26,12 +26,11 @@
 #include "../soccr/soccr.h"
 #include "compel/log.h"
 
-
-#define DEFAULT_LOGFD		STDERR_FILENO
+#define DEFAULT_LOGFD STDERR_FILENO
 /* Enable timestamps if verbosity is increased from default */
-#define LOG_TIMESTAMP		(DEFAULT_LOGLEVEL + 1)
-#define LOG_BUF_LEN		(8*1024)
-#define EARLY_LOG_BUF_LEN	1024
+#define LOG_TIMESTAMP	  (DEFAULT_LOGLEVEL + 1)
+#define LOG_BUF_LEN	  (8 * 1024)
+#define EARLY_LOG_BUF_LEN 1024
 
 static unsigned int current_loglevel = DEFAULT_LOGLEVEL;
 static void vprint_on_level(unsigned int, const char *, va_list);
@@ -53,7 +52,7 @@ static struct timeval start;
  * Manual buf len as sprintf will _always_ put '\0' at the end,
  * but we want a "constant" pid to be there on restore
  */
-#define TS_BUF_OFF	12
+#define TS_BUF_OFF 12
 
 static void timediff(struct timeval *from, struct timeval *to)
 {
@@ -72,8 +71,7 @@ static void print_ts(void)
 
 	gettimeofday(&t, NULL);
 	timediff(&start, &t);
-	snprintf(buffer, TS_BUF_OFF,
-			"(%02u.%06u)", (unsigned)t.tv_sec, (unsigned)t.tv_usec);
+	snprintf(buffer, TS_BUF_OFF, "(%02u.%06u)", (unsigned)t.tv_sec, (unsigned)t.tv_usec);
 	buffer[TS_BUF_OFF - 1] = ' '; /* kill the '\0' produced by snprintf */
 }
 
@@ -162,8 +160,7 @@ static void print_versions(void)
 		return;
 	}
 
-	pr_info("Running on %s %s %s %s %s\n", buf.nodename, buf.sysname,
-		buf.release, buf.version, buf.machine);
+	pr_info("Running on %s %s %s %s %s\n", buf.nodename, buf.sysname, buf.release, buf.version, buf.machine);
 }
 
 struct early_log_hdr {
@@ -191,8 +188,7 @@ void flush_early_log_buffer(int fd)
 		if (hdr->level <= current_loglevel) {
 			size_t size = 0;
 			while (size < hdr->len) {
-				ret = write(fd, early_log_buffer + pos + size,
-						hdr->len - size);
+				ret = write(fd, early_log_buffer + pos + size, hdr->len - size);
 				if (ret <= 0)
 					break;
 				size += ret;
@@ -219,7 +215,7 @@ int log_init(const char *output)
 			return -1;
 		}
 	} else if (output) {
-		new_logfd = open(output, O_CREAT|O_TRUNC|O_WRONLY|O_APPEND, 0600);
+		new_logfd = open(output, O_CREAT | O_TRUNC | O_WRONLY | O_APPEND, 0600);
 		if (new_logfd < 0) {
 			pr_perror("Can't create log file %s", output);
 			return -1;
@@ -327,7 +323,7 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 	/* Save loglevel */
 
 	hdr = (void *)early_log_buffer + early_log_buf_off;
-	hdr->level  = loglevel;
+	hdr->level = loglevel;
 	/* Skip the log entry size */
 	early_log_buf_off += sizeof(hdr);
 	if (loglevel >= LOG_TIMESTAMP) {
@@ -337,14 +333,12 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 		 * keep the same format as the other messages on
 		 * log levels with timestamps (>=LOG_TIMESTAMP).
 		 */
-		log_size  = snprintf(early_log_buffer + early_log_buf_off,
-				sizeof(early_log_buffer) - early_log_buf_off,
-				"(00.000000) ");
+		log_size = snprintf(early_log_buffer + early_log_buf_off, sizeof(early_log_buffer) - early_log_buf_off,
+				    "(00.000000) ");
 	}
 
 	log_size += vsnprintf(early_log_buffer + early_log_buf_off + log_size,
-			sizeof(early_log_buffer) - early_log_buf_off - log_size,
-			format, params);
+			      sizeof(early_log_buffer) - early_log_buf_off - log_size, format, params);
 
 	/* Save log entry size */
 	hdr->len = log_size;
@@ -375,7 +369,7 @@ static void vprint_on_level(unsigned int loglevel, const char *format, va_list p
 			print_ts();
 	}
 
-	size  = vsnprintf(buffer + buf_off, sizeof buffer - buf_off, format, params);
+	size = vsnprintf(buffer + buf_off, sizeof buffer - buf_off, format, params);
 	size += buf_off;
 
 	while (off < size) {
@@ -389,7 +383,7 @@ static void vprint_on_level(unsigned int loglevel, const char *format, va_list p
 	if (loglevel == LOG_ERROR)
 		log_note_err(buffer + buf_off);
 
-	errno =  _errno;
+	errno = _errno;
 }
 
 void print_on_level(unsigned int loglevel, const char *format, ...)
diff --git a/criu/lsm.c b/criu/lsm.c
index 20c015b54..a352f9adf 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -79,7 +79,7 @@ static int verify_selinux_label(char *ctx)
 	 *
 	 *      unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
 	 */
-	pos = (char*)ctx;
+	pos = (char *)ctx;
 	for (i = 0; i < 3; i++) {
 		pos = strstr(pos, ":");
 		if (!pos)
@@ -213,7 +213,6 @@ int dump_xattr_security_selinux(int fd, FdinfoEntry *e)
 
 void kerndat_lsm(void)
 {
-
 	if (access(AA_SECURITYFS_PATH, F_OK) == 0) {
 		kdat.lsm = LSMTYPE__APPARMOR;
 		return;
diff --git a/criu/mem.c b/criu/mem.c
index b0a76e4da..ca74bfbb6 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -80,9 +80,8 @@ int do_task_reset_dirty_track(int pid)
 unsigned long dump_pages_args_size(struct vm_area_list *vmas)
 {
 	/* In the worst case I need one iovec for each page */
-	return sizeof(struct parasite_dump_pages_args) +
-		vmas->nr * sizeof(struct parasite_vma_entry) +
-		(vmas->nr_priv_pages + 1) * sizeof(struct iovec);
+	return sizeof(struct parasite_dump_pages_args) + vmas->nr * sizeof(struct parasite_vma_entry) +
+	       (vmas->nr_priv_pages + 1) * sizeof(struct iovec);
 }
 
 static inline bool __page_is_zero(u64 pme)
@@ -165,7 +164,8 @@ static bool is_stack(struct pstree_item *item, unsigned long vaddr)
  * the memory contents is present in the pagent image set.
  */
 
-static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct page_pipe *pp, u64 *map, u64 *off, bool has_parent)
+static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct page_pipe *pp, u64 *map, u64 *off,
+			 bool has_parent)
 {
 	u64 *at = &map[PAGE_PFN(*off)];
 	unsigned long pfn, nr_to_scan;
@@ -221,13 +221,12 @@ static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct
 	cnt_add(CNT_PAGES_LAZY, pages[1]);
 	cnt_add(CNT_PAGES_WRITTEN, pages[2]);
 
-	pr_info("Pagemap generated: %lu pages (%lu lazy) %lu holes\n",
-		pages[2] + pages[1], pages[1], pages[0]);
+	pr_info("Pagemap generated: %lu pages (%lu lazy) %lu holes\n", pages[2] + pages[1], pages[1], pages[0]);
 	return ret;
 }
 
-static struct parasite_dump_pages_args *prep_dump_pages_args(struct parasite_ctl *ctl,
-		struct vm_area_list *vma_area_list, bool skip_non_trackable)
+static struct parasite_dump_pages_args *
+prep_dump_pages_args(struct parasite_ctl *ctl, struct vm_area_list *vma_area_list, bool skip_non_trackable)
 {
 	struct parasite_dump_pages_args *args;
 	struct parasite_vma_entry *p_vma;
@@ -261,8 +260,7 @@ static struct parasite_dump_pages_args *prep_dump_pages_args(struct parasite_ctl
 	return args;
 }
 
-static int drain_pages(struct page_pipe *pp, struct parasite_ctl *ctl,
-		      struct parasite_dump_pages_args *args)
+static int drain_pages(struct page_pipe *pp, struct parasite_ctl *ctl, struct parasite_dump_pages_args *args)
 {
 	struct page_pipe_buf *ppb;
 	int ret = 0;
@@ -273,8 +271,8 @@ static int drain_pages(struct page_pipe *pp, struct parasite_ctl *ctl,
 	list_for_each_entry(ppb, &pp->bufs, l) {
 		args->nr_segs = ppb->nr_segs;
 		args->nr_pages = ppb->pages_in;
-		pr_debug("PPB: %d pages %d segs %u pipe %d off\n",
-				args->nr_pages, args->nr_segs, ppb->pipe_size, args->off);
+		pr_debug("PPB: %d pages %d segs %u pipe %d off\n", args->nr_pages, args->nr_segs, ppb->pipe_size,
+			 args->off);
 
 		ret = compel_rpc_call(PARASITE_CMD_DUMPPAGES, ctl);
 		if (ret < 0)
@@ -308,9 +306,7 @@ static int xfer_pages(struct page_pipe *pp, struct page_xfer *xfer)
 	return ret;
 }
 
-static int detect_pid_reuse(struct pstree_item *item,
-			    struct proc_pid_stat* pps,
-			    InventoryEntry *parent_ie)
+static int detect_pid_reuse(struct pstree_item *item, struct proc_pid_stat *pps, InventoryEntry *parent_ie)
 {
 	unsigned long long dump_ticks;
 	struct proc_pid_stat pps_buf;
@@ -322,7 +318,7 @@ static int detect_pid_reuse(struct pstree_item *item,
 		return pidfd_store_check_pid_reuse(item->pid->real);
 
 	if (!parent_ie) {
-		pr_err("Pid-reuse detection failed: no parent inventory, " \
+		pr_err("Pid-reuse detection failed: no parent inventory, "
 		       "check warnings in get_parent_inventory\n");
 		return -1;
 	}
@@ -340,31 +336,25 @@ static int detect_pid_reuse(struct pstree_item *item,
 			return -1;
 	}
 
-	dump_ticks = parent_ie->dump_uptime/(USEC_PER_SEC/tps);
+	dump_ticks = parent_ie->dump_uptime / (USEC_PER_SEC / tps);
 
 	if (pps->start_time >= dump_ticks) {
 		/* Print "*" if unsure */
-		pr_warn("Pid reuse%s detected for pid %d\n",
-			pps->start_time == dump_ticks ? "*" : "",
-			item->pid->real);
+		pr_warn("Pid reuse%s detected for pid %d\n", pps->start_time == dump_ticks ? "*" : "", item->pid->real);
 		return 1;
 	}
 	return 0;
 }
 
-static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma,
-			     struct page_pipe *pp, struct page_xfer *xfer,
-			     struct parasite_dump_pages_args *args,
-			     struct parasite_ctl *ctl, pmc_t *pmc,
-			     bool has_parent, bool pre_dump,
-			     int parent_predump_mode)
+static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma, struct page_pipe *pp,
+			     struct page_xfer *xfer, struct parasite_dump_pages_args *args, struct parasite_ctl *ctl,
+			     pmc_t *pmc, bool has_parent, bool pre_dump, int parent_predump_mode)
 {
 	u64 off = 0;
 	u64 *map;
 	int ret;
 
-	if (!vma_area_is_private(vma, kdat.task_size) &&
-				!vma_area_is(vma, VMA_ANON_SHARED))
+	if (!vma_area_is_private(vma, kdat.task_size) && !vma_area_is(vma, VMA_ANON_SHARED))
 		return 0;
 
 	/*
@@ -408,8 +398,7 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma,
 	if (!(vma->e->prot & PROT_READ)) {
 		if (opts.pre_dump_mode == PRE_DUMP_READ && pre_dump)
 			return 0;
-		if ((parent_predump_mode == PRE_DUMP_READ &&
-			opts.pre_dump_mode == PRE_DUMP_SPLICE) || !pre_dump)
+		if ((parent_predump_mode == PRE_DUMP_READ && opts.pre_dump_mode == PRE_DUMP_SPLICE) || !pre_dump)
 			has_parent = false;
 	}
 
@@ -427,7 +416,7 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma,
 		return add_shmem_area(item->pid->real, vma->e, map);
 
 again:
-	ret = generate_iovs(item,vma, pp, map, &off, has_parent);
+	ret = generate_iovs(item, vma, pp, map, &off, has_parent);
 	if (ret == -EAGAIN) {
 		BUG_ON(!(pp->flags & PP_CHUNK_MODE));
 
@@ -443,11 +432,9 @@ again:
 	return ret;
 }
 
-static int __parasite_dump_pages_seized(struct pstree_item *item,
-		struct parasite_dump_pages_args *args,
-		struct vm_area_list *vma_area_list,
-		struct mem_dump_ctl *mdc,
-		struct parasite_ctl *ctl)
+static int __parasite_dump_pages_seized(struct pstree_item *item, struct parasite_dump_pages_args *args,
+					struct vm_area_list *vma_area_list, struct mem_dump_ctl *mdc,
+					struct parasite_ctl *ctl)
 {
 	pmc_t pmc = PMC_INIT;
 	struct page_pipe *pp;
@@ -466,17 +453,14 @@ static int __parasite_dump_pages_seized(struct pstree_item *item,
 
 	timing_start(TIME_MEMDUMP);
 
-	pr_debug("   Private vmas %lu/%lu pages\n",
-		 vma_area_list->nr_priv_pages_longest, vma_area_list->nr_priv_pages);
+	pr_debug("   Private vmas %lu/%lu pages\n", vma_area_list->nr_priv_pages_longest, vma_area_list->nr_priv_pages);
 
 	/*
 	 * Step 0 -- prepare
 	 */
 
-	pmc_size = max(vma_area_list->nr_priv_pages_longest,
-		       vma_area_list->nr_shared_pages_longest);
-	if (pmc_init(&pmc, item->pid->real, &vma_area_list->h,
-			 pmc_size * PAGE_SIZE))
+	pmc_size = max(vma_area_list->nr_priv_pages_longest, vma_area_list->nr_shared_pages_longest);
+	if (pmc_init(&pmc, item->pid->real, &vma_area_list->h, pmc_size * PAGE_SIZE))
 		return -1;
 
 	if (!(mdc->pre_dump || mdc->lazy))
@@ -486,9 +470,7 @@ static int __parasite_dump_pages_seized(struct pstree_item *item,
 		 * use, i.e. on non-lazy non-predump.
 		 */
 		cpp_flags |= PP_CHUNK_MODE;
-	pp = create_page_pipe(vma_area_list->nr_priv_pages,
-					    mdc->lazy ? NULL : pargs_iovs(args),
-					    cpp_flags);
+	pp = create_page_pipe(vma_area_list->nr_priv_pages, mdc->lazy ? NULL : pargs_iovs(args), cpp_flags);
 	if (!pp)
 		goto out;
 
@@ -513,32 +495,28 @@ static int __parasite_dump_pages_seized(struct pstree_item *item,
 	}
 
 	if (xfer.parent) {
-		possible_pid_reuse = detect_pid_reuse(item, mdc->stat,
-						      mdc->parent_ie);
+		possible_pid_reuse = detect_pid_reuse(item, mdc->stat, mdc->parent_ie);
 		if (possible_pid_reuse == -1)
 			goto out_xfer;
 	}
 
-
 	/*
 	 * Step 1 -- generate the pagemap
 	 */
 	args->off = 0;
 	has_parent = !!xfer.parent && !possible_pid_reuse;
-	if(mdc->parent_ie)
+	if (mdc->parent_ie)
 		parent_predump_mode = mdc->parent_ie->pre_dump_mode;
 
 	list_for_each_entry(vma_area, &vma_area_list->h, list) {
-		ret = generate_vma_iovs(item, vma_area, pp, &xfer, args, ctl,
-					&pmc, has_parent, mdc->pre_dump,
+		ret = generate_vma_iovs(item, vma_area, pp, &xfer, args, ctl, &pmc, has_parent, mdc->pre_dump,
 					parent_predump_mode);
 		if (ret < 0)
 			goto out_xfer;
 	}
 
 	if (mdc->lazy)
-		memcpy(pargs_iovs(args), pp->iovs,
-		       sizeof(struct iovec) * pp->nr_iovs);
+		memcpy(pargs_iovs(args), pp->iovs, sizeof(struct iovec) * pp->nr_iovs);
 
 	/*
 	 * Faking drain_pages for pre-dump here. Actual drain_pages for pre-dump
@@ -580,10 +558,8 @@ out:
 	return exit_code;
 }
 
-int parasite_dump_pages_seized(struct pstree_item *item,
-		struct vm_area_list *vma_area_list,
-		struct mem_dump_ctl *mdc,
-		struct parasite_ctl *ctl)
+int parasite_dump_pages_seized(struct pstree_item *item, struct vm_area_list *vma_area_list, struct mem_dump_ctl *mdc,
+			       struct parasite_ctl *ctl)
 {
 	int ret;
 	struct parasite_dump_pages_args *pargs;
@@ -692,7 +668,6 @@ int prepare_mm_pid(struct pstree_item *i)
 			return -1;
 	}
 
-
 	while (vn < ri->mm->n_vmas || img != NULL) {
 		struct vma_area *vma;
 
@@ -721,12 +696,11 @@ int prepare_mm_pid(struct pstree_item *i)
 				ri->vmas.rst_priv_size += PAGE_SIZE;
 		}
 
-		pr_info("vma 0x%"PRIx64" 0x%"PRIx64"\n", vma->e->start, vma->e->end);
+		pr_info("vma 0x%" PRIx64 " 0x%" PRIx64 "\n", vma->e->start, vma->e->end);
 
 		if (vma_area_is(vma, VMA_ANON_SHARED))
 			ret = collect_shmem(pid, vma);
-		else if (vma_area_is(vma, VMA_FILE_PRIVATE) ||
-				vma_area_is(vma, VMA_FILE_SHARED))
+		else if (vma_area_is(vma, VMA_FILE_PRIVATE) || vma_area_is(vma, VMA_FILE_SHARED))
 			ret = collect_filemap(vma);
 		else if (vma_area_is(vma, VMA_AREA_SOCKET))
 			ret = collect_socket_map(vma);
@@ -766,7 +740,7 @@ static inline bool check_cow_vmas(struct vma_area *vma, struct vma_area *pvma)
 	if (!(vma->e->flags & MAP_ANONYMOUS) && vma->e->shmid != pvma->e->shmid)
 		return false;
 
-	pr_debug("Found two COW VMAs @0x%"PRIx64"-0x%"PRIx64"\n", vma->e->start, pvma->e->end);
+	pr_debug("Found two COW VMAs @0x%" PRIx64 "-0x%" PRIx64 "\n", vma->e->start, pvma->e->end);
 	return true;
 }
 
@@ -886,10 +860,8 @@ static int premap_private_vma(struct pstree_item *t, struct vma_area *vma, void
 		 * bits there. Ideally we'd check for the whole COW-chain
 		 * having any data in.
 		 */
-		addr = mmap(*tgt_addr, size,
-				vma->e->prot | PROT_WRITE,
-				vma->e->flags | MAP_FIXED | flag,
-				vma->e->fd, vma->e->pgoff);
+		addr = mmap(*tgt_addr, size, vma->e->prot | PROT_WRITE, vma->e->flags | MAP_FIXED | flag, vma->e->fd,
+			    vma->e->pgoff);
 
 		if (addr == MAP_FAILED) {
 			pr_perror("Unable to map ANON_VMA");
@@ -909,8 +881,7 @@ static int premap_private_vma(struct pstree_item *t, struct vma_area *vma, void
 		if (vma_has_guard_gap_hidden(vma))
 			paddr -= PAGE_SIZE;
 
-		addr = mremap(paddr, size, size,
-				MREMAP_FIXED | MREMAP_MAYMOVE, *tgt_addr);
+		addr = mremap(paddr, size, size, MREMAP_FIXED | MREMAP_MAYMOVE, *tgt_addr);
 		if (addr != *tgt_addr) {
 			pr_perror("Unable to remap a private vma");
 			return -1;
@@ -918,9 +889,9 @@ static int premap_private_vma(struct pstree_item *t, struct vma_area *vma, void
 	}
 
 	vma->e->status |= VMA_PREMMAPED;
-	vma->premmaped_addr = (unsigned long) addr;
-	pr_debug("\tpremap %#016"PRIx64"-%#016"PRIx64" -> %016lx\n",
-		vma->e->start, vma->e->end, (unsigned long)addr);
+	vma->premmaped_addr = (unsigned long)addr;
+	pr_debug("\tpremap %#016" PRIx64 "-%#016" PRIx64 " -> %016lx\n", vma->e->start, vma->e->end,
+		 (unsigned long)addr);
 
 	if (vma_has_guard_gap_hidden(vma)) { /* Skip guard page */
 		vma->e->start += PAGE_SIZE;
@@ -951,8 +922,7 @@ static inline bool vma_force_premap(struct vma_area *vma, struct list_head *head
 
 			prev = list_entry(vma->list.prev, struct vma_area, list);
 			if (prev->e->end == vma->e->start) {
-				pr_debug("Force premmap for 0x%"PRIx64":0x%"PRIx64"\n",
-						vma->e->start, vma->e->end);
+				pr_debug("Force premmap for 0x%" PRIx64 ":0x%" PRIx64 "\n", vma->e->start, vma->e->end);
 				return true;
 			}
 		}
@@ -969,15 +939,15 @@ static int task_size_check(pid_t pid, VmaEntry *entry)
 #ifdef __s390x__
 	if (entry->end <= kdat.task_size)
 		return 0;
-	pr_err("Can't restore high memory region %lx-%lx because kernel does only support vmas up to %lx\n", entry->start, entry->end, kdat.task_size);
+	pr_err("Can't restore high memory region %lx-%lx because kernel does only support vmas up to %lx\n",
+	       entry->start, entry->end, kdat.task_size);
 	return -1;
 #else
 	return 0;
 #endif
 }
 
-static int premap_priv_vmas(struct pstree_item *t, struct vm_area_list *vmas,
-		void **at, struct page_read *pr)
+static int premap_priv_vmas(struct pstree_item *t, struct vm_area_list *vmas, void **at, struct page_read *pr)
 {
 	struct vma_area *vma;
 	unsigned long pstart = 0;
@@ -1099,13 +1069,11 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr)
 			}
 
 			if (!vma_area_is(vma, VMA_PREMMAPED)) {
-				unsigned long len = min_t(unsigned long,
-						(nr_pages - i) * PAGE_SIZE,
-						vma->e->end - va);
+				unsigned long len = min_t(unsigned long, (nr_pages - i) * PAGE_SIZE, vma->e->end - va);
 
 				if (vma->e->status & VMA_NO_PROT_WRITE) {
-					pr_debug("VMA 0x%"PRIx64":0x%"PRIx64" RO %#lx:%lu IO\n",
-							vma->e->start, vma->e->end, va, nr_pages);
+					pr_debug("VMA 0x%" PRIx64 ":0x%" PRIx64 " RO %#lx:%lu IO\n", vma->e->start,
+						 vma->e->end, va, nr_pages);
 					BUG();
 				}
 
@@ -1127,8 +1095,7 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr)
 			 */
 
 			off = (va - vma->e->start) / PAGE_SIZE;
-			p = decode_pointer((off) * PAGE_SIZE +
-					vma->premmaped_addr);
+			p = decode_pointer((off)*PAGE_SIZE + vma->premmaped_addr);
 
 			set_bit(off, vma->page_bitmap);
 			if (vma_inherited(vma)) {
@@ -1172,7 +1139,6 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr)
 
 				bitmap_set(vma->page_bitmap, off + 1, nr - 1);
 			}
-
 		}
 	}
 
@@ -1197,11 +1163,10 @@ err_read:
 			/* Find all pages, which are not shared with this child */
 			i = find_next_bit(vma->pvma->page_bitmap, size, i);
 
-			if ( i >= size)
+			if (i >= size)
 				break;
 
-			ret = madvise(addr + PAGE_SIZE * i,
-						PAGE_SIZE, MADV_DONTNEED);
+			ret = madvise(addr + PAGE_SIZE * i, PAGE_SIZE, MADV_DONTNEED);
 			if (ret < 0) {
 				pr_perror("madvise failed");
 				return -1;
@@ -1223,8 +1188,7 @@ err_read:
 	return 0;
 
 err_addr:
-	pr_err("Page entry address %lx outside of VMA %lx-%lx\n",
-	       va, (long)vma->e->start, (long)vma->e->end);
+	pr_err("Page entry address %lx outside of VMA %lx-%lx\n", va, (long)vma->e->start, (long)vma->e->end);
 	return -1;
 }
 
@@ -1309,8 +1273,7 @@ int prepare_mappings(struct pstree_item *t)
 	if (old_premmapped_addr) {
 		ret = munmap(old_premmapped_addr, old_premmapped_len);
 		if (ret < 0)
-			pr_perror("Unable to unmap %p(%lx)",
-					old_premmapped_addr, old_premmapped_len);
+			pr_perror("Unable to unmap %p(%lx)", old_premmapped_addr, old_premmapped_len);
 	}
 
 	/*
@@ -1326,8 +1289,7 @@ int prepare_mappings(struct pstree_item *t)
 		if (ret < 0)
 			pr_perror("Unable to unmap %p(%lx)", addr, tail);
 		rsti(t)->premmapped_len = old_premmapped_len;
-		pr_info("Shrunk premap area to %p(%lx)\n",
-				rsti(t)->premmapped_addr, rsti(t)->premmapped_len);
+		pr_info("Shrunk premap area to %p(%lx)\n", rsti(t)->premmapped_addr, rsti(t)->premmapped_len);
 	}
 
 out:
@@ -1380,9 +1342,8 @@ int open_vmas(struct pstree_item *t)
 		if (!vma_area_is(vma, VMA_AREA_REGULAR) || !vma->vm_open)
 			continue;
 
-		pr_info("Opening %#016"PRIx64"-%#016"PRIx64" %#016"PRIx64" (%x) vma\n",
-				vma->e->start, vma->e->end,
-				vma->e->pgoff, vma->e->status);
+		pr_info("Opening %#016" PRIx64 "-%#016" PRIx64 " %#016" PRIx64 " (%x) vma\n", vma->e->start,
+			vma->e->end, vma->e->pgoff, vma->e->status);
 
 		if (vma->vm_open(pid, vma)) {
 			pr_err("`- Can't open vma\n");
@@ -1394,8 +1355,7 @@ int open_vmas(struct pstree_item *t)
 		 * turn, puts the VMA_CLOSE bit itself. For all the rest we
 		 * need to put it by hands, so that the restorer closes the fd
 		 */
-		if (!(vma_area_is(vma, VMA_FILE_PRIVATE) ||
-					vma_area_is(vma, VMA_FILE_SHARED)))
+		if (!(vma_area_is(vma, VMA_FILE_PRIVATE) || vma_area_is(vma, VMA_FILE_SHARED)))
 			vma->e->status |= VMA_CLOSE;
 	}
 
@@ -1426,8 +1386,7 @@ static int prepare_vma_ios(struct pstree_item *t, struct task_restore_args *ta)
 	 * If auto-dedup is on we need RDWR mode to be able to punch holes in
 	 * the input files (in restorer.c)
 	 */
-	pages = open_image(CR_FD_PAGES, opts.auto_dedup ? O_RDWR : O_RSTR,
-				rsti(t)->pages_img_id);
+	pages = open_image(CR_FD_PAGES, opts.auto_dedup ? O_RDWR : O_RSTR, rsti(t)->pages_img_id);
 	if (!pages)
 		return -1;
 
diff --git a/criu/memfd.c b/criu/memfd.c
index 48245eb75..cb3704499 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -22,29 +22,29 @@
 #include "protobuf.h"
 #include "images/memfd.pb-c.h"
 
-#define MEMFD_PREFIX "/memfd:"
-#define MEMFD_PREFIX_LEN (sizeof(MEMFD_PREFIX)-1)
+#define MEMFD_PREFIX	 "/memfd:"
+#define MEMFD_PREFIX_LEN (sizeof(MEMFD_PREFIX) - 1)
 
-#define F_SEAL_SEAL	0x0001	/* prevent further seals from being set */
-#define F_SEAL_SHRINK	0x0002	/* prevent file from shrinking */
-#define F_SEAL_GROW	0x0004	/* prevent file from growing */
-#define F_SEAL_WRITE	0x0008	/* prevent writes */
+#define F_SEAL_SEAL   0x0001 /* prevent further seals from being set */
+#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
+#define F_SEAL_GROW   0x0004 /* prevent file from growing */
+#define F_SEAL_WRITE  0x0008 /* prevent writes */
 /* Linux 5.1+ */
-#define F_SEAL_FUTURE_WRITE	0x0010  /* prevent future writes while mapped */
+#define F_SEAL_FUTURE_WRITE 0x0010 /* prevent future writes while mapped */
 
 struct memfd_dump_inode {
-	struct list_head	list;
-	u32			id;
-	u32			dev;
-	u32			ino;
+	struct list_head list;
+	u32 id;
+	u32 dev;
+	u32 ino;
 };
 
 struct memfd_restore_inode {
-	struct list_head	list;
-	mutex_t			lock;
-	int			fdstore_id;
-	unsigned int		pending_seals;
-	MemfdInodeEntry		*mie;
+	struct list_head list;
+	mutex_t lock;
+	int fdstore_id;
+	unsigned int pending_seals;
+	MemfdInodeEntry *mie;
 };
 
 static LIST_HEAD(memfd_inodes);
@@ -65,14 +65,13 @@ int is_memfd(dev_t dev)
 	return dev == kdat.shmem_dev;
 }
 
-static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode,
-			    const char *name, const struct stat *st)
+static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode, const char *name, const struct stat *st)
 {
 	MemfdInodeEntry mie = MEMFD_INODE_ENTRY__INIT;
 	int ret = -1;
 	u32 shmid;
 
-	 /*
+	/*
 	  * shmids are chosen as the inode number of the corresponding mmaped
 	  * file. See handle_vma() in proc_parse.c.
 	  * It works for memfd too, because we share the same device as the
@@ -80,8 +79,8 @@ static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode,
 	  */
 	shmid = inode->ino;
 
-	pr_info("Dumping memfd:%s contents (id %#x, shmid: %#x, size: %"PRIu64")\n",
-		name, inode->id, shmid, st->st_size);
+	pr_info("Dumping memfd:%s contents (id %#x, shmid: %#x, size: %" PRIu64 ")\n", name, inode->id, shmid,
+		st->st_size);
 
 	if (dump_one_memfd_shmem(fd, shmid, st->st_size) < 0)
 		goto out;
@@ -106,8 +105,7 @@ out:
 	return ret;
 }
 
-static struct memfd_dump_inode *
-dump_unique_memfd_inode(int lfd, const char *name, const struct stat *st)
+static struct memfd_dump_inode *dump_unique_memfd_inode(int lfd, const char *name, const struct stat *st)
 {
 	struct memfd_dump_inode *inode;
 	int fd;
@@ -189,19 +187,18 @@ int dump_one_memfd_cond(int lfd, u32 *id, struct fd_parms *parms)
 }
 
 const struct fdtype_ops memfd_dump_ops = {
-	.type		= FD_TYPES__MEMFD,
-	.dump		= dump_one_memfd,
+	.type = FD_TYPES__MEMFD,
+	.dump = dump_one_memfd,
 };
 
-
 /*
  * Restore only
  */
 
 struct memfd_info {
-	MemfdFileEntry			*mfe;
-	struct file_desc		d;
-	struct memfd_restore_inode	*inode;
+	MemfdFileEntry *mfe;
+	struct file_desc d;
+	struct memfd_restore_inode *inode;
 };
 
 static struct memfd_restore_inode *memfd_alloc_inode(int id)
@@ -271,8 +268,7 @@ static int memfd_open_inode_nocache(struct memfd_restore_inode *inode)
 		goto out;
 
 	if (fchown(fd, mie->uid, mie->gid)) {
-		pr_perror("Can't change uid %d gid %d of memfd:%s",
-			  (int)mie->uid, (int)mie->gid, mie->name);
+		pr_perror("Can't change uid %d gid %d of memfd:%s", (int)mie->uid, (int)mie->gid, mie->name);
 		goto out;
 	}
 
diff --git a/criu/mount.c b/criu/mount.c
index ffa14fcd1..9bd3b27d9 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -36,14 +36,14 @@
  * debugging.
  */
 #define AUTODETECTED_MOUNT "CRIU:AUTOGENERATED"
-#define NO_ROOT_MOUNT "CRIU:NO_ROOT"
-#define MS_PROPAGATE (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
+#define NO_ROOT_MOUNT	   "CRIU:NO_ROOT"
+#define MS_PROPAGATE	   (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "mnt: "
 
 #define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc"
-#define CRTIME_MNT_ID 0
+#define CRTIME_MNT_ID	 0
 
 #define CONTEXT_OPT "context="
 
@@ -126,9 +126,8 @@ static void mntinfo_add_list(struct mount_info *new)
 	}
 }
 
-static struct mount_info *__lookup_overlayfs(struct mount_info *list, char *rpath,
-						unsigned int st_dev, unsigned int st_ino,
-						unsigned int mnt_id)
+static struct mount_info *__lookup_overlayfs(struct mount_info *list, char *rpath, unsigned int st_dev,
+					     unsigned int st_ino, unsigned int mnt_id)
 {
 	/*
 	 * Goes through all entries in the mountinfo table
@@ -196,8 +195,7 @@ static struct mount_info *__lookup_overlayfs(struct mount_info *list, char *rpat
  * correct device id and node number. If that is the case, we update the
  * mount id and link variables with the correct values.
  */
-struct mount_info *lookup_overlayfs(char *rpath, unsigned int st_dev,
-					unsigned int st_ino, unsigned int mnt_id)
+struct mount_info *lookup_overlayfs(char *rpath, unsigned int st_dev, unsigned int st_ino, unsigned int mnt_id)
 {
 	struct mount_info *m;
 
@@ -280,12 +278,10 @@ dev_t phys_stat_resolve_dev(struct ns_id *ns, dev_t st_dev, const char *path)
 	 * superblock dev-id, in such case return device
 	 * obtained from mountinfo (ie subvolume0).
 	 */
-	return strcmp(m->fstype->name, "btrfs") ?
-		MKKDEV(major(st_dev), minor(st_dev)) : m->s_dev;
+	return strcmp(m->fstype->name, "btrfs") ? MKKDEV(major(st_dev), minor(st_dev)) : m->s_dev;
 }
 
-bool phys_stat_dev_match(dev_t st_dev, dev_t phys_dev,
-		struct ns_id *ns, const char *path)
+bool phys_stat_dev_match(dev_t st_dev, dev_t phys_dev, struct ns_id *ns, const char *path)
 {
 	if (st_dev == kdev_to_odev(phys_dev))
 		return true;
@@ -361,8 +357,7 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
 				continue;
 			}
 
-			pr_err("No parent found for mountpoint %d (@%s)\n",
-				m->mnt_id, m->mountpoint);
+			pr_err("No parent found for mountpoint %d (@%s)\n", m->mnt_id, m->mountpoint);
 			return NULL;
 		}
 
@@ -426,11 +421,10 @@ static void __mnt_resort_children(struct mount_info *parent)
 	list_splice(&list, &parent->children);
 }
 
-static struct mount_info *mnt_subtree_next(struct mount_info *mi,
-					   struct mount_info *root);
+static struct mount_info *mnt_subtree_next(struct mount_info *mi, struct mount_info *root);
 
-static void resort_siblings(struct mount_info *root,
-			    void (*resort_children)(struct mount_info *)) {
+static void resort_siblings(struct mount_info *root, void (*resort_children)(struct mount_info *))
+{
 	struct mount_info *mi = root;
 	while (1) {
 		/*
@@ -452,8 +446,7 @@ static void mnt_tree_show(struct mount_info *tree, int off)
 {
 	struct mount_info *m;
 
-	pr_info("%*s[%s](%d->%d)\n", off, "",
-			tree->mountpoint, tree->mnt_id, tree->parent_mnt_id);
+	pr_info("%*s[%s](%d->%d)\n", off, "", tree->mountpoint, tree->mnt_id, tree->parent_mnt_id);
 
 	list_for_each_entry(m, &tree->children, siblings)
 		mnt_tree_show(m, off + 1);
@@ -469,14 +462,12 @@ static int try_resolve_ext_mount(struct mount_info *info)
 
 	ext = ext_mount_lookup(info->mountpoint + 1 /* trim the . */);
 	if (ext) {
-		pr_info("Found %s mapping for %s mountpoint\n",
-				ext, info->mountpoint);
+		pr_info("Found %s mapping for %s mountpoint\n", ext, info->mountpoint);
 		info->external = ext;
 		return 1;
 	}
 
-	snprintf(devstr, sizeof(devstr), "dev[%d/%d]",
-			kdev_major(info->s_dev),  kdev_minor(info->s_dev));
+	snprintf(devstr, sizeof(devstr), "dev[%d/%d]", kdev_major(info->s_dev), kdev_minor(info->s_dev));
 
 	if (info->fstype->code == FSTYPE__UNSUPPORTED) {
 		char *val;
@@ -514,9 +505,7 @@ static struct mount_info *find_fsroot_mount_for(struct mount_info *bm)
 	struct mount_info *sm;
 
 	list_for_each_entry(sm, &bm->mnt_bind, mnt_bind)
-		if (fsroot_mounted(sm) ||
-				(sm->parent == root_yard_mp &&
-				 strstartswith(bm->root, sm->root)))
+		if (fsroot_mounted(sm) || (sm->parent == root_yard_mp && strstartswith(bm->root, sm->root)))
 			return sm;
 
 	return NULL;
@@ -633,8 +622,8 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 
 		if (fsroot_mounted(m)) {
 			if (m->fstype->code == FSTYPE__UNSUPPORTED) {
-				pr_err("FS mnt %s dev %#x root %s unsupported id %d\n",
-						m->mountpoint, m->s_dev, m->root, m->mnt_id);
+				pr_err("FS mnt %s dev %#x root %s unsupported id %d\n", m->mountpoint, m->s_dev,
+				       m->root, m->mnt_id);
 				return -1;
 			}
 		} else {
@@ -662,8 +651,8 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 
 				if (ret < 0) {
 					if (ret == -ENOTSUP)
-						pr_err("%d:%s doesn't have a proper root mount\n",
-								m->mnt_id, m->mountpoint);
+						pr_err("%d:%s doesn't have a proper root mount\n", m->mnt_id,
+						       m->mountpoint);
 					return -1;
 				}
 			}
@@ -738,8 +727,7 @@ static struct ns_id *find_ext_ns_id(void)
 
 	for (ns = ns_ids; ns->next; ns = ns->next)
 		if (ns->type == NS_CRIU && ns->nd == &mnt_ns_desc) {
-			if (!ns->mnt.mntinfo_list &&
-			    !collect_mntinfo(ns, true))
+			if (!ns->mnt.mntinfo_list && !collect_mntinfo(ns, true))
 				break;
 			return ns;
 		}
@@ -836,7 +824,7 @@ static int root_path_from_parent(struct mount_info *m, char *buf, int size)
 		return -1;
 
 	BUG_ON(len <= 0);
-	if (buf[len-1] == '/')
+	if (buf[len - 1] == '/')
 		tail_slash = true;
 
 	size -= len;
@@ -848,8 +836,7 @@ static int root_path_from_parent(struct mount_info *m, char *buf, int size)
 		if (m->mountpoint[p_len] == '/')
 			head_slash = true;
 
-		len = snprintf(buf, size, "%s%s",
-			       (!tail_slash && !head_slash) ? "/" : "",
+		len = snprintf(buf, size, "%s%s", (!tail_slash && !head_slash) ? "/" : "",
 			       m->mountpoint + p_len + (tail_slash && head_slash));
 		if (len >= size)
 			return -1;
@@ -858,7 +845,8 @@ static int root_path_from_parent(struct mount_info *m, char *buf, int size)
 	return 0;
 }
 
-static int same_propagation_group(struct mount_info *a, struct mount_info *b) {
+static int same_propagation_group(struct mount_info *a, struct mount_info *b)
+{
 	char root_path_a[PATH_MAX], root_path_b[PATH_MAX];
 
 	/*
@@ -866,8 +854,7 @@ static int same_propagation_group(struct mount_info *a, struct mount_info *b) {
 	 * 1) Their parents should be different
 	 * 2) Their parents should be together in same shared group
 	 */
-	if (!a->parent || !b->parent || a->parent == b->parent ||
-	    a->parent->shared_id != b->parent->shared_id)
+	if (!a->parent || !b->parent || a->parent == b->parent || a->parent->shared_id != b->parent->shared_id)
 		return 0;
 
 	if (root_path_from_parent(a, root_path_a, PATH_MAX)) {
@@ -909,15 +896,14 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 		need_share = m->shared_id && list_empty(&m->mnt_share);
 		need_master = m->master_id > 0;
 
-		pr_debug("Inspecting sharing on %2d shared_id %d master_id %d (@%s)\n",
-			 m->mnt_id, m->shared_id, m->master_id, m->mountpoint);
+		pr_debug("Inspecting sharing on %2d shared_id %d master_id %d (@%s)\n", m->mnt_id, m->shared_id,
+			 m->master_id, m->mountpoint);
 
 		for (t = info; t && (need_share || need_master); t = t->next) {
 			if (t == m)
 				continue;
 			if (need_master && t->shared_id == m->master_id) {
-				pr_debug("\tThe mount %3d is slave for %3d (@%s -> @%s)\n",
-					 m->mnt_id, t->mnt_id,
+				pr_debug("\tThe mount %3d is slave for %3d (@%s -> @%s)\n", m->mnt_id, t->mnt_id,
 					 m->mountpoint, t->mountpoint);
 				list_add(&m->mnt_slave, &t->mnt_slave_list);
 				m->mnt_master = t;
@@ -926,9 +912,8 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 
 			/* Collect all mounts from this group */
 			if (need_share && t->shared_id == m->shared_id) {
-				pr_debug("\tMount %3d is shared with %3d group %3d (@%s -> @%s)\n",
-					 m->mnt_id, t->mnt_id, m->shared_id,
-					 t->mountpoint, m->mountpoint);
+				pr_debug("\tMount %3d is shared with %3d group %3d (@%s -> @%s)\n", m->mnt_id,
+					 t->mnt_id, m->shared_id, t->mountpoint, m->mountpoint);
 				list_add(&t->mnt_share, &m->mnt_share);
 			}
 		}
@@ -939,8 +924,8 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 		 */
 		if (need_master && m->parent && !mnt_is_external(m)) {
 			pr_err("Mount %d %s (master_id: %d shared_id: %d) "
-			       "has unreachable sharing. Try --enable-external-masters.\n", m->mnt_id,
-				m->mountpoint, m->master_id, m->shared_id);
+			       "has unreachable sharing. Try --enable-external-masters.\n",
+			       m->mnt_id, m->mountpoint, m->master_id, m->shared_id);
 			return -1;
 		}
 
@@ -953,8 +938,7 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 			for (t = m->next; t; t = t->next) {
 				if (mounts_sb_equal(m, t)) {
 					list_add(&t->mnt_bind, &m->mnt_bind);
-					pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n",
-						 t->mnt_id, m->mnt_id,
+					pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n", t->mnt_id, m->mnt_id,
 						 t->mountpoint, m->mountpoint);
 				}
 			}
@@ -1064,8 +1048,7 @@ int __open_mountpoint(struct mount_info *pm, int mnt_fd)
 	}
 
 	if (pm->s_dev_rt == MOUNT_INVALID_DEV) {
-		pr_err("Resolving over invalid device for %#x %s %s\n",
-		       pm->s_dev, pm->fstype->name, pm->ns_mountpoint);
+		pr_err("Resolving over invalid device for %#x %s %s\n", pm->s_dev, pm->fstype->name, pm->ns_mountpoint);
 		goto err;
 	}
 
@@ -1077,8 +1060,7 @@ int __open_mountpoint(struct mount_info *pm, int mnt_fd)
 	 * allocates new device ID).
 	 */
 	if (dev != pm->s_dev_rt) {
-		pr_err("The file system %#x %#x (%#x) %s %s is inaccessible\n",
-		       pm->s_dev, pm->s_dev_rt, dev,
+		pr_err("The file system %#x %#x (%#x) %s %s is inaccessible\n", pm->s_dev, pm->s_dev_rt, dev,
 		       pm->fstype->name, pm->ns_mountpoint);
 		goto err;
 	}
@@ -1114,8 +1096,7 @@ static char *get_clean_mnt(struct mount_info *mi, char *mnt_path_tmp, char *mnt_
 	}
 
 	if (mount(mi->mountpoint, mnt_path, NULL, MS_BIND, NULL)) {
-		pr_warn("Can't bind-mount %d:%s to %s: %s\n",
-				mi->mnt_id, mi->mountpoint, mnt_path, strerror(errno));
+		pr_warn("Can't bind-mount %d:%s to %s: %s\n", mi->mnt_id, mi->mountpoint, mnt_path, strerror(errno));
 		rmdir(mnt_path);
 		return NULL;
 	}
@@ -1317,8 +1298,7 @@ int ns_open_mountpoint(void *arg)
 	 * unmount them (see CL_UNPRIVILEGED in sys_umount(), clone_mnt() and
 	 * copy_mnt_ns() in linux kernel code).
 	 */
-	if ((root_ns_mask & CLONE_NEWUSER) &&
-	    switch_ns(root_item->pid->real, &user_ns_desc, NULL) < 0)
+	if ((root_ns_mask & CLONE_NEWUSER) && switch_ns(root_item->pid->real, &user_ns_desc, NULL) < 0)
 		goto err;
 
 	/*
@@ -1331,7 +1311,7 @@ int ns_open_mountpoint(void *arg)
 	}
 
 	/* Remount all mounts as private to disable propagation */
-	if (mount("none", "/", NULL, MS_REC|MS_PRIVATE, NULL)) {
+	if (mount("none", "/", NULL, MS_REC | MS_PRIVATE, NULL)) {
 		pr_perror("Unable to remount");
 		goto err;
 	}
@@ -1346,7 +1326,7 @@ int ns_open_mountpoint(void *arg)
 	 * explicitly as when last process exits mntns all mounts in it are
 	 * cleaned from their children, and we are exactly the last process.
 	 */
-	*fd = open(mi->mountpoint, O_DIRECTORY|O_RDONLY);
+	*fd = open(mi->mountpoint, O_DIRECTORY | O_RDONLY);
 	if (*fd < 0) {
 		pr_perror("Unable to open %s", mi->mountpoint);
 		goto err;
@@ -1398,13 +1378,9 @@ int open_mountpoint(struct mount_info *pm)
 	 */
 	if (fd < 0) {
 		int pid, status;
-		struct clone_arg ca = {
-			.mi = pm,
-			.fd = &fd
-		};
+		struct clone_arg ca = { .mi = pm, .fd = &fd };
 
-		pr_info("\tmount is overmounted or has children %s\n",
-				pm->mountpoint);
+		pr_info("\tmount is overmounted or has children %s\n", pm->mountpoint);
 
 		/*
 		 * We are overmounted - not accessible in a regular way. We
@@ -1415,19 +1391,17 @@ int open_mountpoint(struct mount_info *pm)
 		 * to create helper process here as entering user namespace is
 		 * irreversible operation.
 		 */
-		pid = clone_noasan(ns_open_mountpoint, CLONE_VFORK | CLONE_VM
-				| CLONE_FILES | CLONE_IO | CLONE_SIGHAND
-				| CLONE_SYSVSEM, &ca);
+		pid = clone_noasan(ns_open_mountpoint,
+				   CLONE_VFORK | CLONE_VM | CLONE_FILES | CLONE_IO | CLONE_SIGHAND | CLONE_SYSVSEM,
+				   &ca);
 		if (pid == -1) {
 			pr_perror("Can't clone helper process");
 			goto err;
 		}
 
 		errno = 0;
-		if (waitpid(pid, &status, __WALL) != pid || !WIFEXITED(status)
-				|| WEXITSTATUS(status)) {
-			pr_err("Can't wait or bad status: errno=%d, status=%d\n",
-				errno, status);
+		if (waitpid(pid, &status, __WALL) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+			pr_err("Can't wait or bad status: errno=%d, status=%d\n", errno, status);
 			goto err;
 		}
 	}
@@ -1525,8 +1499,7 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 	mi->next = parent->next;
 	parent->next = mi;
 	list_add(&mi->siblings, &parent->children);
-	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n",
-		mi->mountpoint, parent->mountpoint, parent->mnt_id);
+	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n", mi->mountpoint, parent->mountpoint, parent->mnt_id);
 	return 0;
 
 err:
@@ -1536,7 +1509,7 @@ err:
 
 /* Returns 1 in case of success, -errno in case of mount fail, and 0 on other errors */
 static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_dev, const char *source,
-			       const char *target, const char *type)
+					      const char *target, const char *type)
 {
 	int mnt_fd, ret, exit_code = 0;
 	struct stat st;
@@ -1554,8 +1527,8 @@ static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_
 		goto restore_ns;
 	} else {
 		if (stat(target, &st) < 0) {
-			 pr_perror("Can't stat %s", target);
-			 exit_code = 0;
+			pr_perror("Can't stat %s", target);
+			exit_code = 0;
 		} else {
 			*s_dev = MKKDEV(major(st.st_dev), minor(st.st_dev));
 			exit_code = 1;
@@ -1568,8 +1541,6 @@ out:
 	return ret < 0 ? 0 : exit_code;
 }
 
-
-
 static int dump_one_fs(struct mount_info *mi)
 {
 	struct mount_info *pm = mi;
@@ -1580,8 +1551,7 @@ static int dump_one_fs(struct mount_info *mi)
 		return 0;
 
 	/* mnt_bind is a cycled list, so list_for_each can't be used here. */
-	for (; &pm->mnt_bind != &mi->mnt_bind || first;
-	     pm = list_entry(pm->mnt_bind.next, typeof(*pm), mnt_bind)) {
+	for (; &pm->mnt_bind != &mi->mnt_bind || first; pm = list_entry(pm->mnt_bind.next, typeof(*pm), mnt_bind)) {
 		int ret;
 
 		first = false;
@@ -1600,8 +1570,7 @@ static int dump_one_fs(struct mount_info *mi)
 		return 0;
 	}
 
-	pr_err("Unable to dump a file system for %d:%s\n",
-				mi->mnt_id, mi->mountpoint);
+	pr_err("Unable to dump a file system for %d:%s\n", mi->mnt_id, mi->mountpoint);
 	return -1;
 }
 
@@ -1609,10 +1578,9 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 {
 	MntEntry me = MNT_ENTRY__INIT;
 
-	pr_info("\t%d: %x:%s @ %s\n", pm->mnt_id, pm->s_dev,
-			pm->root, pm->mountpoint);
+	pr_info("\t%d: %x:%s @ %s\n", pm->mnt_id, pm->s_dev, pm->root, pm->mountpoint);
 
-	me.fstype		= pm->fstype->code;
+	me.fstype = pm->fstype->code;
 
 	if (me.fstype == FSTYPE__AUTO)
 		me.fsname = pm->fsname;
@@ -1621,8 +1589,7 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 		if (!pm->dumped && dump_one_fs(pm))
 			return -1;
 
-		if (!fsroot_mounted(pm) &&
-		    pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm))
+		if (!fsroot_mounted(pm) && pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm))
 			return -1;
 	}
 
@@ -1631,26 +1598,26 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 		return 0;
 	}
 
-	me.mnt_id		= pm->mnt_id;
-	me.root_dev		= pm->s_dev;
-	me.parent_mnt_id	= pm->parent_mnt_id;
-	me.flags		= pm->flags;
-	me.sb_flags		= pm->sb_flags;
-	me.has_sb_flags		= true;
-	me.mountpoint		= pm->mountpoint + 1;
-	me.source		= pm->source;
-	me.options		= pm->options;
-	me.shared_id		= pm->shared_id;
-	me.has_shared_id	= true;
-	me.master_id		= pm->master_id;
-	me.has_master_id	= true;
+	me.mnt_id = pm->mnt_id;
+	me.root_dev = pm->s_dev;
+	me.parent_mnt_id = pm->parent_mnt_id;
+	me.flags = pm->flags;
+	me.sb_flags = pm->sb_flags;
+	me.has_sb_flags = true;
+	me.mountpoint = pm->mountpoint + 1;
+	me.source = pm->source;
+	me.options = pm->options;
+	me.shared_id = pm->shared_id;
+	me.has_shared_id = true;
+	me.master_id = pm->master_id;
+	me.has_master_id = true;
 	if (pm->need_plugin) {
 		me.has_with_plugin = true;
 		me.with_plugin = true;
 	}
 	if (pm->deleted) {
-		me.has_deleted	= true;
-		me.deleted	= true;
+		me.has_deleted = true;
+		me.deleted = true;
 	}
 
 	if (pm->internal_sharing) {
@@ -1734,48 +1701,45 @@ err:
  * _plist - a postpone list. _el is added to this list, if _fn_f returns
  *	    a positive value, and all lower elements are not enumerated.
  */
-#define MNT_TREE_WALK(_r, _el, _fn_f, _fn_r, _plist, _prgs) do {		\
-		struct mount_info *_mi = _r;					\
-										\
-		while (1) {							\
-			int ret;						\
-										\
-			list_del_init(&_mi->postpone);				\
-										\
-			ret = _fn_f(_mi);					\
-			if (ret < 0)						\
-				return -1;					\
-			else if (ret > 0) {					\
-				list_add_tail(&_mi->postpone, _plist);		\
-				goto up;					\
-			}							\
-										\
-			_prgs++;					\
-										\
-			if (!list_empty(&_mi->children)) {			\
-				_mi = list_entry(_mi->children._el,		\
-						struct mount_info, siblings);	\
-				continue;					\
-			}							\
-	up:									\
-			if (_fn_r(_mi))						\
-				return -1;					\
-			if (_mi == _r)						\
-				break;						\
-			if (_mi->siblings._el == &_mi->parent->children) {	\
-				_mi = _mi->parent;				\
-				goto up;					\
-			}							\
-			_mi = list_entry(_mi->siblings._el,			\
-					struct mount_info, siblings);		\
-		}								\
+#define MNT_TREE_WALK(_r, _el, _fn_f, _fn_r, _plist, _prgs)                                       \
+	do {                                                                                      \
+		struct mount_info *_mi = _r;                                                      \
+                                                                                                  \
+		while (1) {                                                                       \
+			int ret;                                                                  \
+                                                                                                  \
+			list_del_init(&_mi->postpone);                                            \
+                                                                                                  \
+			ret = _fn_f(_mi);                                                         \
+			if (ret < 0)                                                              \
+				return -1;                                                        \
+			else if (ret > 0) {                                                       \
+				list_add_tail(&_mi->postpone, _plist);                            \
+				goto up;                                                          \
+			}                                                                         \
+                                                                                                  \
+			_prgs++;                                                                  \
+                                                                                                  \
+			if (!list_empty(&_mi->children)) {                                        \
+				_mi = list_entry(_mi->children._el, struct mount_info, siblings); \
+				continue;                                                         \
+			}                                                                         \
+		up:                                                                               \
+			if (_fn_r(_mi))                                                           \
+				return -1;                                                        \
+			if (_mi == _r)                                                            \
+				break;                                                            \
+			if (_mi->siblings._el == &_mi->parent->children) {                        \
+				_mi = _mi->parent;                                                \
+				goto up;                                                          \
+			}                                                                         \
+			_mi = list_entry(_mi->siblings._el, struct mount_info, siblings);         \
+		}                                                                                 \
 	} while (0)
 
-#define MNT_WALK_NONE	0 &&
+#define MNT_WALK_NONE 0 &&
 
-
-static int mnt_tree_for_each(struct mount_info *start,
-		int (*fn)(struct mount_info *))
+static int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *))
 {
 	struct mount_info *tmp;
 	LIST_HEAD(postpone);
@@ -1796,9 +1760,7 @@ again:
 
 		pr_err("A few mount points can't be mounted\n");
 		list_for_each_entry(m, &postpone2, postpone) {
-			pr_err("%d:%d %s %s %s\n", m->mnt_id,
-				m->parent_mnt_id, m->root,
-				m->mountpoint, m->source);
+			pr_err("%d:%d %s %s %s\n", m->mnt_id, m->parent_mnt_id, m->root, m->mountpoint, m->source);
 		}
 		return -1;
 	}
@@ -1809,15 +1771,13 @@ again:
 		goto again;
 
 	return 0;
-
 }
 
-static int mnt_tree_for_each_reverse(struct mount_info *m,
-		int (*fn)(struct mount_info *))
+static int mnt_tree_for_each_reverse(struct mount_info *m, int (*fn)(struct mount_info *))
 {
 	int progress = 0;
 
-	MNT_TREE_WALK(m, prev, MNT_WALK_NONE, fn, (struct list_head *) NULL, progress);
+	MNT_TREE_WALK(m, prev, MNT_WALK_NONE, fn, (struct list_head *)NULL, progress);
 
 	return 0;
 }
@@ -1839,8 +1799,7 @@ static char *resolve_source(struct mount_info *mi)
 		if (!IS_ERR_OR_NULL(val))
 			return val;
 
-		if (!stat(mi->source, &st) && S_ISBLK(st.st_mode) &&
-		    major(st.st_rdev) == kdev_major(mi->s_dev) &&
+		if (!stat(mi->source, &st) && S_ISBLK(st.st_mode) && major(st.st_rdev) == kdev_major(mi->s_dev) &&
 		    minor(st.st_rdev) == kdev_minor(mi->s_dev))
 			return mi->source;
 	}
@@ -1851,8 +1810,7 @@ static char *resolve_source(struct mount_info *mi)
 
 static int restore_shared_options(struct mount_info *mi, bool private, bool shared, bool slave)
 {
-	pr_debug("%d:%s private %d shared %d slave %d\n",
-			mi->mnt_id, mi->mountpoint, private, shared, slave);
+	pr_debug("%d:%s private %d shared %d slave %d\n", mi->mnt_id, mi->mountpoint, private, shared, slave);
 
 	if (mi->flags & MS_UNBINDABLE) {
 		if (shared || slave) {
@@ -2027,11 +1985,9 @@ static int fetch_rt_stat(struct mount_info *m, const char *where)
  * MS_RDONLY is set for both mnt ans sb flags, so we can restore it for one
  * mount call only if it set for both masks.
  */
-#define MS_MNT_KNOWN_FLAGS (MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_NOATIME | \
-				MS_NODIRATIME | MS_RELATIME | MS_RDONLY)
+#define MS_MNT_KNOWN_FLAGS (MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_NOATIME | MS_NODIRATIME | MS_RELATIME | MS_RDONLY)
 
-static int do_simple_mount(struct mount_info *mi, const char *src, const
-			   char *fstype, unsigned long mountflags)
+static int do_simple_mount(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags)
 {
 	int ret = mount(src, mi->mountpoint, fstype, mountflags, mi->options);
 	if (ret)
@@ -2048,7 +2004,7 @@ static char *mnt_fsname(struct mount_info *mi)
 
 static int userns_mount(char *src, void *args, int fd, pid_t pid)
 {
-	unsigned long flags = *(unsigned long *) args;
+	unsigned long flags = *(unsigned long *)args;
 	int rst = -1, err = -1;
 	char target[PSFDS];
 
@@ -2061,7 +2017,7 @@ static int userns_mount(char *src, void *args, int fd, pid_t pid)
 	if (err)
 		pr_perror("Unable to mount %s", target);
 
-	if (rst >= 0 &&	restore_ns(rst, &mnt_ns_desc))
+	if (rst >= 0 && restore_ns(rst, &mnt_ns_desc))
 		return -1;
 
 	return err;
@@ -2126,16 +2082,14 @@ static int do_new_mount(struct mount_info *mi)
 		}
 		sflags |= MS_RDONLY | MS_REMOUNT;
 		if (userns_call(apply_sb_flags, 0, &sflags, sizeof(sflags), fd)) {
-			pr_err("Unable to apply mount flags %d for %s",
-						mi->sb_flags, mi->mountpoint);
+			pr_err("Unable to apply mount flags %d for %s\n", mi->sb_flags, mi->mountpoint);
 			close(fd);
 			return -1;
 		}
 		close(fd);
 	}
 
-	if (mflags && mount(NULL, mi->mountpoint, NULL,
-				MS_REMOUNT | MS_BIND | mflags, NULL)) {
+	if (mflags && mount(NULL, mi->mountpoint, NULL, MS_REMOUNT | MS_BIND | mflags, NULL)) {
 		pr_perror("Unable to apply bind-mount options");
 		return -1;
 	}
@@ -2215,7 +2169,7 @@ static int do_bind_mount(struct mount_info *mi)
 	int exit_code = -1, mp_len;
 	bool shared = false;
 	bool master = false;
-	bool private = false;
+	bool priv = false;
 	char *mnt_path = NULL;
 	struct stat st;
 	bool umount_mnt_path = false;
@@ -2235,13 +2189,13 @@ static int do_bind_mount(struct mount_info *mi)
 		 * to proper location in the namespace we restore.
 		 */
 		root = mi->external;
-		private = !mi->master_id && (mi->internal_sharing || !mi->shared_id);
+		priv = !mi->master_id && (mi->internal_sharing || !mi->shared_id);
 		goto do_bind;
 	}
 
 	shared = mi->shared_id && mi->shared_id == mi->bind->shared_id;
 	master = mi->master_id && mi->master_id == mi->bind->master_id;
-	private = !mi->master_id && !shared;
+	priv = !mi->master_id && !shared;
 	cut_root = cut_root_for_bind(mi->root, mi->bind->root);
 
 	/* Mount private can be initialized on mount() callback, which is
@@ -2255,8 +2209,7 @@ static int do_bind_mount(struct mount_info *mi)
 
 	/* Access a mount by fd if mi->bind->mountpoint is overmounted */
 	if (mi->bind->fd >= 0) {
-		snprintf(mnt_fd_path, sizeof(mnt_fd_path),
-					"/proc/self/fd/%d", mi->bind->fd);
+		snprintf(mnt_fd_path, sizeof(mnt_fd_path), "/proc/self/fd/%d", mi->bind->fd);
 		mnt_path = mnt_fd_path;
 	}
 
@@ -2281,8 +2234,7 @@ static int do_bind_mount(struct mount_info *mi)
 	if (&c->siblings != &mi->bind->children) {
 		/* Get a copy of mi->bind without child mounts */
 		if (mount(mnt_path, mnt_clean_path, NULL, MS_BIND, NULL)) {
-			pr_perror("Unable to bind-mount %s to %s",
-					mnt_path, mnt_clean_path);
+			pr_perror("Unable to bind-mount %s to %s", mnt_path, mnt_clean_path);
 			return -1;
 		}
 		mnt_path = mnt_clean_path;
@@ -2293,8 +2245,7 @@ static int do_bind_mount(struct mount_info *mi)
 		return -1;
 
 skip_overmount_check:
-	snprintf(rpath, sizeof(rpath), "%s/%s",
-			mnt_path, cut_root);
+	snprintf(rpath, sizeof(rpath), "%s/%s", mnt_path, cut_root);
 	root = rpath;
 do_bind:
 	pr_info("\tBind %s to %s\n", root, mi->mountpoint);
@@ -2311,16 +2262,14 @@ do_bind:
 				goto err;
 			}
 		} else if (S_ISREG(st.st_mode)) {
-			int fd = open(root, O_WRONLY | O_CREAT | O_EXCL,
-				      st.st_mode & ~S_IFMT);
+			int fd = open(root, O_WRONLY | O_CREAT | O_EXCL, st.st_mode & ~S_IFMT);
 			if (fd < 0) {
 				pr_perror("Can't re-create deleted file %s", root);
 				goto err;
 			}
 			close(fd);
 		} else {
-			pr_err("Unsupported st_mode 0%o deleted root %s\n",
-			       (int)st.st_mode, root);
+			pr_err("Unsupported st_mode 0%o deleted root %s\n", (int)st.st_mode, root);
 			goto err;
 		}
 	}
@@ -2355,9 +2304,7 @@ out:
 	 * shared - the mount is in the same shared group with mi->bind
 	 * mi->shared_id && !shared - create a new shared group
 	 */
-	if (restore_shared_options(mi, private,
-				   mi->shared_id && !shared,
-				   mi->master_id && !master))
+	if (restore_shared_options(mi, priv, mi->shared_id && !shared, mi->master_id && !master))
 		goto err;
 
 	mi->mounted = true;
@@ -2490,8 +2437,7 @@ shared:
 
 static int do_mount_root(struct mount_info *mi)
 {
-	if (restore_shared_options(mi, !mi->shared_id && !mi->master_id,
-						mi->shared_id, mi->master_id))
+	if (restore_shared_options(mi, !mi->shared_id && !mi->master_id, mi->shared_id, mi->master_id))
 		return -1;
 
 	return fetch_rt_stat(mi, mi->mountpoint);
@@ -2599,7 +2545,7 @@ static int do_umount_one(struct mount_info *mi)
 	if (!mi->parent)
 		return 0;
 
-	if (mount("none", mi->parent->mountpoint, "none", MS_REC|MS_PRIVATE, NULL)) {
+	if (mount("none", mi->parent->mountpoint, "none", MS_REC | MS_PRIVATE, NULL)) {
 		pr_perror("Can't mark %s as private", mi->parent->mountpoint);
 		return -1;
 	}
@@ -2732,7 +2678,7 @@ static int cr_pivot_root(char *root)
 	int exit_code = -1;
 	struct stat st;
 
-	pr_info("Move the root to %s\n", root ? : ".");
+	pr_info("Move the root to %s\n", root ?: ".");
 
 	if (root) {
 		if (chdir(root)) {
@@ -2765,7 +2711,7 @@ static int cr_pivot_root(char *root)
 		goto err_tmpfs;
 	}
 
-	if (mount("none", put_root, "none", MS_REC|MS_SLAVE, NULL)) {
+	if (mount("none", put_root, "none", MS_REC | MS_SLAVE, NULL)) {
 		pr_perror("Can't remount root with MS_PRIVATE");
 		return -1;
 	}
@@ -2914,8 +2860,7 @@ static int get_mp_root(MntEntry *me, struct mount_info *mi)
 
 	mi->external = ext;
 out:
-	pr_debug("\t\tWill mount %d from %s%s\n",
-			mi->mnt_id, ext ? : mi->root, ext ? " (E)" : "");
+	pr_debug("\t\tWill mount %d from %s%s\n", mi->mnt_id, ext ?: mi->root, ext ? " (E)" : "");
 	return 0;
 }
 
@@ -2923,7 +2868,7 @@ static int get_mp_mountpoint(char *mountpoint, struct mount_info *mi, char *root
 {
 	int len;
 
-	len  = strlen(mountpoint) + root_len + 1;
+	len = strlen(mountpoint) + root_len + 1;
 	mi->mountpoint = xmalloc(len);
 	if (!mi->mountpoint)
 		return -1;
@@ -2995,8 +2940,8 @@ static char *mount_update_lsm_context(char *mount_opts)
 		return NULL;
 	before_context[context_start - mount_opts] = 0;
 
-	ret = asprintf(&new_options, "%s\"%s\"%s", before_context,
-			opts.lsm_mount_context, other_options ? other_options : "");
+	ret = asprintf(&new_options, "%s\"%s\"%s", before_context, opts.lsm_mount_context,
+		       other_options ? other_options : "");
 	if (unlikely(ret < 0))
 		return NULL;
 	pr_debug("\t\tChanged mount 'context=' to %s\n", new_options);
@@ -3017,8 +2962,7 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 
 	root_len = print_ns_root(nsid, 0, root, sizeof(root));
 
-	pr_debug("Reading mountpoint images (id %d pid %d)\n",
-		 nsid->id, (int)nsid->ns_pid);
+	pr_debug("Reading mountpoint images (id %d pid %d)\n", nsid->id, (int)nsid->ns_pid);
 
 	while (1) {
 		struct mount_info *pm;
@@ -3037,16 +2981,14 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 		if (!*tail)
 			*tail = pm;
 
-		pm->mnt_id		= me->mnt_id;
-		pm->parent_mnt_id	= me->parent_mnt_id;
-		pm->s_dev		= me->root_dev;
-		pm->flags		= me->flags;
-		pm->sb_flags		= me->sb_flags;
+		pm->mnt_id = me->mnt_id;
+		pm->parent_mnt_id = me->parent_mnt_id;
+		pm->s_dev = me->root_dev;
+		pm->flags = me->flags;
+		pm->sb_flags = me->sb_flags;
 		if (!me->has_sb_flags) {
-			const unsigned int mflags = MS_SHARED | MS_PRIVATE |
-						MS_SLAVE | MS_UNBINDABLE |
-						MS_NOSUID | MS_NODEV | MS_NOEXEC |
-						MS_NOATIME | MS_NODIRATIME | MS_RELATIME;
+			const unsigned int mflags = MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE | MS_NOSUID |
+						    MS_NODEV | MS_NOEXEC | MS_NOATIME | MS_NODIRATIME | MS_RELATIME;
 
 			/*
 			 * In old images mnt and sb flags are saved together.
@@ -3056,11 +2998,11 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 			pm->sb_flags = pm->flags & ~mflags;
 			pm->flags = pm->flags & mflags;
 		}
-		pm->shared_id		= me->shared_id;
-		pm->master_id		= me->master_id;
-		pm->need_plugin		= me->with_plugin;
-		pm->deleted		= me->deleted;
-		pm->is_ns_root		= is_root(me->mountpoint);
+		pm->shared_id = me->shared_id;
+		pm->master_id = me->master_id;
+		pm->need_plugin = me->with_plugin;
+		pm->deleted = me->deleted;
+		pm->is_ns_root = is_root(me->mountpoint);
 		if (me->has_internal_sharing)
 			pm->internal_sharing = me->internal_sharing;
 
@@ -3082,7 +3024,6 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 		if (pm->fstype->collect && (pm->fstype->collect(pm) < 0))
 			goto err;
 
-
 		if (me->fsname) {
 			pm->fsname = xstrdup(me->fsname);
 			if (!pm->fsname)
@@ -3251,17 +3192,15 @@ static int merge_mount_trees(struct mount_info *root_yard)
 
 		if (!first)
 			first = root;
-		else if (!mounts_sb_equal(root, first) ||
-			 strcmp(root->root, first->root)) {
+		else if (!mounts_sb_equal(root, first) || strcmp(root->root, first->root)) {
 			pr_err("Nested mount namespaces with different "
 			       "roots %d (@%s %s) %d (@%s %s) are not supported yet\n",
-			       root->mnt_id, root->mountpoint, root->root,
-			       first->mnt_id, first->mountpoint, first->root);
+			       root->mnt_id, root->mountpoint, root->root, first->mnt_id, first->mountpoint,
+			       first->root);
 			return -1;
 		}
 
-		pr_debug("Mountpoint %d (@%s) moved to the root yard\n",
-			 root->mnt_id, root->mountpoint);
+		pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->mountpoint);
 		root->parent = root_yard;
 		list_add(&root->siblings, &root_yard->children);
 	}
@@ -3377,7 +3316,7 @@ static int __depopulate_roots_yard(void)
 	if (mnt_roots == NULL)
 		return 0;
 
-	if (mount("none", mnt_roots, "none", MS_REC|MS_PRIVATE, NULL)) {
+	if (mount("none", mnt_roots, "none", MS_REC | MS_PRIVATE, NULL)) {
 		pr_perror("Can't remount root with MS_PRIVATE");
 		ret = 1;
 	}
@@ -3592,7 +3531,6 @@ static int mntns_set_root_fd(pid_t pid, int fd)
 
 int __mntns_get_root_fd(pid_t pid)
 {
-
 	int fd, pfd;
 	int ret;
 	char path[PATH_MAX + 1];
@@ -3764,8 +3702,7 @@ int collect_mnt_namespaces(bool for_dump)
 		}
 
 		if (ns) {
-			ret = mount_cr_time_mount(ns, &s_dev, "binfmt_misc", "/" BINFMT_MISC_HOME,
-						  "binfmt_misc");
+			ret = mount_cr_time_mount(ns, &s_dev, "binfmt_misc", "/" BINFMT_MISC_HOME, "binfmt_misc");
 			if (ret == -EPERM)
 				pr_info("Can't mount binfmt_misc: EPERM. Running in user_ns?\n");
 			else if (ret < 0 && ret != -EBUSY && ret != -ENODEV && ret != -ENOENT) {
@@ -3774,8 +3711,8 @@ int collect_mnt_namespaces(bool for_dump)
 			} else if (ret == 0) {
 				ret = -1;
 				goto err;
-			} else if (ret > 0 && add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc",
-								BINFMT_MISC_HOME, s_dev) < 0) {
+			} else if (ret > 0 && add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc", BINFMT_MISC_HOME,
+								s_dev) < 0) {
 				ret = -1;
 				goto err;
 			}
@@ -3814,7 +3751,7 @@ int dump_mnt_namespaces(void)
 
 		if ((nsid->type == NS_OTHER) && check_mnt_id()) {
 			pr_err("Nested mount namespaces are not supported "
-				"without mnt_id in fdinfo\n");
+			       "without mnt_id in fdinfo\n");
 			return -1;
 		}
 
@@ -3863,8 +3800,7 @@ static int call_helper_process(int (*call)(void *), void *arg)
 	 */
 	lock_last_pid();
 
-	pid = clone_noasan(call, CLONE_VFORK | CLONE_VM | CLONE_FILES |
-			   CLONE_IO | CLONE_SIGHAND | CLONE_SYSVSEM, arg);
+	pid = clone_noasan(call, CLONE_VFORK | CLONE_VM | CLONE_FILES | CLONE_IO | CLONE_SIGHAND | CLONE_SYSVSEM, arg);
 	if (pid == -1) {
 		pr_perror("Can't clone helper process");
 		goto out;
@@ -3896,8 +3832,8 @@ static int ns_remount_writable(void *arg)
 		return 1;
 	pr_debug("Switched to mntns %u:%u\n", ns->id, ns->kid);
 
-	if (mount(NULL, mi->ns_mountpoint, NULL, MS_REMOUNT | MS_BIND |
-		  (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)), NULL) == -1) {
+	if (mount(NULL, mi->ns_mountpoint, NULL, MS_REMOUNT | MS_BIND | (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)),
+		  NULL) == -1) {
 		pr_perror("Failed to remount %d:%s writable", mi->mnt_id, mi->mountpoint);
 		return 1;
 	}
@@ -3929,8 +3865,8 @@ int try_remount_writable(struct mount_info *mi, bool ns)
 
 		pr_info("Remount %d:%s writable\n", mi->mnt_id, mi->mountpoint);
 		if (!ns) {
-			if (mount(NULL, mi->mountpoint, NULL, MS_REMOUNT | MS_BIND |
-				  (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)), NULL) == -1) {
+			if (mount(NULL, mi->mountpoint, NULL,
+				  MS_REMOUNT | MS_BIND | (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)), NULL) == -1) {
 				pr_perror("Failed to remount %d:%s writable", mi->mnt_id, mi->mountpoint);
 				return -1;
 			}
@@ -3969,11 +3905,8 @@ static int __remount_readonly_mounts(struct ns_id *ns)
 		}
 
 		pr_info("Remount %d:%s back to readonly\n", mi->mnt_id, mi->mountpoint);
-		if (mount(NULL, mi->ns_mountpoint, NULL,
-			  MS_REMOUNT | MS_BIND | (mi->flags & ~MS_PROPAGATE),
-			  NULL)) {
-			pr_perror("Failed to restore %d:%s mount flags %x",
-				  mi->mnt_id, mi->mountpoint, mi->flags);
+		if (mount(NULL, mi->ns_mountpoint, NULL, MS_REMOUNT | MS_BIND | (mi->flags & ~MS_PROPAGATE), NULL)) {
+			pr_perror("Failed to restore %d:%s mount flags %x", mi->mnt_id, mi->mountpoint, mi->flags);
 			return -1;
 		}
 	}
@@ -4005,19 +3938,16 @@ int remount_readonly_mounts(void)
 	return call_helper_process(ns_remount_readonly_mounts, NULL);
 }
 
-static struct mount_info *mnt_subtree_next(struct mount_info *mi,
-					   struct mount_info *root)
+static struct mount_info *mnt_subtree_next(struct mount_info *mi, struct mount_info *root)
 {
 	if (!list_empty(&mi->children))
-		return list_entry(mi->children.next,
-				  struct mount_info, siblings);
+		return list_entry(mi->children.next, struct mount_info, siblings);
 
 	while (mi->parent && mi != root) {
 		if (mi->siblings.next == &mi->parent->children)
 			mi = mi->parent;
 		else
-			return list_entry(mi->siblings.next,
-					  struct mount_info, siblings);
+			return list_entry(mi->siblings.next, struct mount_info, siblings);
 	}
 
 	return NULL;
diff --git a/criu/namespaces.c b/criu/namespaces.c
index b441d2a60..b1a15dde8 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -36,14 +36,8 @@
 #include "images/pidns.pb-c.h"
 
 static struct ns_desc *ns_desc_array[] = {
-	&net_ns_desc,
-	&uts_ns_desc,
-	&ipc_ns_desc,
-	&pid_ns_desc,
-	&user_ns_desc,
-	&mnt_ns_desc,
-	&time_ns_desc,
-	&cgroup_ns_desc,
+	&net_ns_desc,  &uts_ns_desc, &ipc_ns_desc,  &pid_ns_desc,
+	&user_ns_desc, &mnt_ns_desc, &time_ns_desc, &cgroup_ns_desc,
 };
 
 static unsigned int join_ns_flags;
@@ -79,9 +73,7 @@ static int check_int_str(char *str)
 
 	errno = EINVAL;
 	val = strtol(str, &endptr, 10);
-	if ((errno == ERANGE) || (endptr == str)
-			|| (*endptr != '\0')
-			|| (val < 0) || (val > 65535)) {
+	if ((errno == ERANGE) || (endptr == str) || (*endptr != '\0') || (val < 0) || (val > 65535)) {
 		str = NULL;
 		return -1;
 	}
@@ -102,8 +94,7 @@ static int check_ns_file(char *ns_file)
 		}
 		proc_dir = open_pid_proc(pid);
 		if (proc_dir < 0) {
-			pr_err("Invalid join_ns pid: /proc/%s not found\n",
-					ns_file);
+			pr_err("Invalid join_ns pid: /proc/%s not found\n", ns_file);
 			return -1;
 		}
 		return 0;
@@ -300,8 +291,7 @@ static void nsid_add(struct ns_id *ns, struct ns_desc *nd, unsigned int id, pid_
 	pr_info("Add %s ns %d pid %d\n", nd->str, ns->id, ns->ns_pid);
 }
 
-static struct ns_id *rst_new_ns_id(unsigned int id, pid_t pid,
-		struct ns_desc *nd, enum ns_type type)
+static struct ns_id *rst_new_ns_id(unsigned int id, pid_t pid, struct ns_desc *nd, enum ns_type type)
 {
 	struct ns_id *nsid;
 
@@ -333,8 +323,7 @@ int rst_add_ns_id(unsigned int id, struct pstree_item *i, struct ns_desc *nd)
 		return 0;
 	}
 
-	nsid = rst_new_ns_id(id, pid, nd,
-			i == root_item ? NS_ROOT : NS_OTHER);
+	nsid = rst_new_ns_id(id, pid, nd, i == root_item ? NS_ROOT : NS_OTHER);
 	if (nsid == NULL)
 		return -1;
 
@@ -403,8 +392,7 @@ int walk_namespaces(struct ns_desc *nd, int (*cb)(struct ns_id *, void *), void
 	return ret;
 }
 
-static unsigned int generate_ns_id(int pid, unsigned int kid, struct ns_desc *nd,
-		struct ns_id **ns_ret)
+static unsigned int generate_ns_id(int pid, unsigned int kid, struct ns_desc *nd, struct ns_id **ns_ret)
 {
 	struct ns_id *nsid;
 	enum ns_type type;
@@ -421,8 +409,7 @@ static unsigned int generate_ns_id(int pid, unsigned int kid, struct ns_desc *nd
 			root_ns_mask |= nd->cflag;
 			type = NS_ROOT;
 		} else if (nd->cflag & ~CLONE_SUBNS) {
-			pr_err("Can't dump nested %s namespace for %d\n",
-					nd->str, pid);
+			pr_err("Can't dump nested %s namespace for %d\n", nd->str, pid);
 			return 0;
 		}
 	} else
@@ -498,10 +485,10 @@ int dump_one_ns_file(int lfd, u32 id, const struct fd_parms *p)
 		return -1;
 	}
 
-	nfe.id		= id;
-	nfe.ns_id	= nsid->id;
-	nfe.ns_cflag	= link->ns_d->cflag;
-	nfe.flags	= p->flags;
+	nfe.id = id;
+	nfe.ns_id = nsid->id;
+	nfe.ns_cflag = link->ns_d->cflag;
+	nfe.flags = p->flags;
 
 	fe.type = FD_TYPES__NS;
 	fe.id = nfe.id;
@@ -512,13 +499,13 @@ int dump_one_ns_file(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops nsfile_dump_ops = {
-	.type		= FD_TYPES__NS,
-	.dump		= dump_one_ns_file,
+	.type = FD_TYPES__NS,
+	.dump = dump_one_ns_file,
 };
 
 struct ns_file_info {
-	struct file_desc	d;
-	NsFileEntry		*nfe;
+	struct file_desc d;
+	NsFileEntry *nfe;
 };
 
 static int open_ns_fd(struct file_desc *d, int *new_fd)
@@ -740,8 +727,7 @@ static unsigned int userns_id(unsigned int id, UidGidExtent **map, int n)
 		return id;
 
 	for (i = 0; i < n; i++) {
-		if (map[i]->lower_first <= id &&
-		    map[i]->lower_first + map[i]->count > id)
+		if (map[i]->lower_first <= id && map[i]->lower_first + map[i]->count > id)
 			return map[i]->first + (id - map[i]->lower_first);
 	}
 
@@ -756,8 +742,7 @@ static unsigned int host_id(unsigned int id, UidGidExtent **map, int n)
 		return id;
 
 	for (i = 0; i < n; i++) {
-		if (map[i]->first <= id &&
-		    map[i]->first + map[i]->count > id)
+		if (map[i]->first <= id && map[i]->first + map[i]->count > id)
 			return map[i]->lower_first + (id - map[i]->first);
 	}
 
@@ -815,8 +800,7 @@ static int parse_id_map(pid_t pid, char *name, UidGidExtent ***pb_exts)
 		ext = &extents[len];
 
 		uid_gid_extent__init(ext);
-		ret = fscanf(f, "%d %d %d", &ext->first,
-				&ext->lower_first, &ext->count);
+		ret = fscanf(f, "%d %d %d", &ext->first, &ext->lower_first, &ext->count);
 		if (ret != 3) {
 			if (ferror(f)) {
 				pr_perror("Unable to parse extents: %d", ret);
@@ -943,20 +927,15 @@ static int check_user_ns(int pid)
 		if (switch_ns(pid, &user_ns_desc, NULL))
 			exit(1);
 
-		if ((root_ns_mask & CLONE_NEWNET) &&
-		    switch_ns(pid, &net_ns_desc, NULL))
+		if ((root_ns_mask & CLONE_NEWNET) && switch_ns(pid, &net_ns_desc, NULL))
 			exit(1);
-		if ((root_ns_mask & CLONE_NEWUTS) &&
-		    switch_ns(pid, &uts_ns_desc, NULL))
+		if ((root_ns_mask & CLONE_NEWUTS) && switch_ns(pid, &uts_ns_desc, NULL))
 			exit(1);
-		if ((root_ns_mask & CLONE_NEWTIME) &&
-		    switch_ns(pid, &time_ns_desc, NULL))
+		if ((root_ns_mask & CLONE_NEWTIME) && switch_ns(pid, &time_ns_desc, NULL))
 			exit(1);
-		if ((root_ns_mask & CLONE_NEWIPC) &&
-		    switch_ns(pid, &ipc_ns_desc, NULL))
+		if ((root_ns_mask & CLONE_NEWIPC) && switch_ns(pid, &ipc_ns_desc, NULL))
 			exit(1);
-		if ((root_ns_mask & CLONE_NEWNS) &&
-		    switch_ns(pid, &mnt_ns_desc, NULL))
+		if ((root_ns_mask & CLONE_NEWNS) && switch_ns(pid, &mnt_ns_desc, NULL))
 			exit(1);
 		exit(0);
 	}
@@ -1036,23 +1015,19 @@ static int do_dump_namespaces(struct ns_id *ns)
 
 	switch (ns->nd->cflag) {
 	case CLONE_NEWUTS:
-		pr_info("Dump UTS namespace %d via %d\n",
-				ns->id, ns->ns_pid);
+		pr_info("Dump UTS namespace %d via %d\n", ns->id, ns->ns_pid);
 		ret = dump_uts_ns(ns->id);
 		break;
 	case CLONE_NEWTIME:
-		pr_info("Dump TIME namespace %d via %d\n",
-				ns->id, ns->ns_pid);
+		pr_info("Dump TIME namespace %d via %d\n", ns->id, ns->ns_pid);
 		ret = dump_time_ns(ns->id);
 		break;
 	case CLONE_NEWIPC:
-		pr_info("Dump IPC namespace %d via %d\n",
-				ns->id, ns->ns_pid);
+		pr_info("Dump IPC namespace %d via %d\n", ns->id, ns->ns_pid);
 		ret = dump_ipc_ns(ns->id);
 		break;
 	case CLONE_NEWNET:
-		pr_info("Dump NET namespace info %d via %d\n",
-				ns->id, ns->ns_pid);
+		pr_info("Dump NET namespace info %d via %d\n", ns->id, ns->ns_pid);
 		ret = dump_net_ns(ns);
 		break;
 	default:
@@ -1061,7 +1036,6 @@ static int do_dump_namespaces(struct ns_id *ns)
 	}
 
 	return ret;
-
 }
 
 int dump_namespaces(struct pstree_item *item, unsigned int ns_flags)
@@ -1108,15 +1082,15 @@ int dump_namespaces(struct pstree_item *item, unsigned int ns_flags)
 			continue;
 
 		switch (ns->nd->cflag) {
-			/* No data for pid namespaces to dump */
-			case CLONE_NEWPID:
-			/* Dumped explicitly with dump_mnt_namespaces() */
-			case CLONE_NEWNS:
-			/* Userns is dumped before dumping tasks */
-			case CLONE_NEWUSER:
-			/* handled separately in cgroup dumping code */
-			case CLONE_NEWCGROUP:
-				continue;
+		/* No data for pid namespaces to dump */
+		case CLONE_NEWPID:
+		/* Dumped explicitly with dump_mnt_namespaces() */
+		case CLONE_NEWNS:
+		/* Userns is dumped before dumping tasks */
+		case CLONE_NEWUSER:
+		/* handled separately in cgroup dumping code */
+		case CLONE_NEWCGROUP:
+			continue;
 		}
 
 		pid = fork();
@@ -1167,10 +1141,8 @@ static int write_id_map(pid_t pid, UidGidExtent **extents, int n, char *id_map)
 	for (i = 0; i < n; i++) {
 		int len;
 
-		len = snprintf(buf + off, sizeof(buf) - off,
-				"%u %u %u\n", extents[i]->first,
-					extents[i]->lower_first,
-					extents[i]->count);
+		len = snprintf(buf + off, sizeof(buf) - off, "%u %u %u\n", extents[i]->first, extents[i]->lower_first,
+			       extents[i]->count);
 		if (len < 0) {
 			pr_perror("Unable to form the user/group mappings buffer");
 			return -1;
@@ -1207,8 +1179,7 @@ struct unsc_msg {
 
 static int usernsd_pid;
 
-static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c,
-		int *x, void *arg, size_t asize, int fd)
+static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c, int *x, void *arg, size_t asize, int fd)
 {
 	struct cmsghdr *ch;
 	struct ucred *ucred;
@@ -1245,7 +1216,7 @@ static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c,
 	ch->cmsg_level = SOL_SOCKET;
 	ch->cmsg_type = SCM_CREDENTIALS;
 
-	ucred = (struct ucred *) CMSG_DATA(ch);
+	ucred = (struct ucred *)CMSG_DATA(ch);
 	ucred->pid = getpid();
 	ucred->uid = getuid();
 	ucred->gid = getgid();
@@ -1273,7 +1244,7 @@ static void unsc_msg_pid_fd(struct unsc_msg *um, pid_t *pid, int *fd)
 	BUG_ON(ch->cmsg_type != SCM_CREDENTIALS);
 
 	if (pid) {
-		ucred = (struct ucred *) CMSG_DATA(ch);
+		ucred = (struct ucred *)CMSG_DATA(ch);
 		*pid = ucred->pid;
 	}
 
@@ -1360,8 +1331,7 @@ static int usernsd(int sk)
 	}
 }
 
-int __userns_call(const char *func_name, uns_call_t call, int flags,
-		  void *arg, size_t arg_size, int fd)
+int __userns_call(const char *func_name, uns_call_t call, int flags, void *arg, size_t arg_size, int fd)
 {
 	int ret, res, sk;
 	bool async = flags & UNS_ASYNC;
@@ -1753,8 +1723,7 @@ int prepare_namespace(struct pstree_item *item, unsigned long clone_flags)
 	sigset_t sig_mask;
 	int id, ret = -1;
 
-	pr_info("Restoring namespaces %d flags 0x%lx\n",
-			vpid(item), clone_flags);
+	pr_info("Restoring namespaces %d flags 0x%lx\n", vpid(item), clone_flags);
 
 	if (block_sigmask(&sig_mask, SIGCHLD) < 0)
 		return -1;
diff --git a/criu/net.c b/criu/net.c
index 51b02efe7..144e9b5c5 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -51,17 +51,17 @@
 #include "images/inventory.pb-c.h"
 
 #ifndef IFLA_NEW_IFINDEX
-#define IFLA_NEW_IFINDEX	49
+#define IFLA_NEW_IFINDEX 49
 #endif
 
 #ifndef IFLA_LINK_NETNSID
-#define IFLA_LINK_NETNSID	37
+#define IFLA_LINK_NETNSID 37
 #undef IFLA_MAX
 #define IFLA_MAX IFLA_LINK_NETNSID
 #endif
 
 #ifndef RTM_NEWNSID
-#define RTM_NEWNSID		88
+#define RTM_NEWNSID 88
 #endif
 
 #ifndef IFLA_MACVLAN_FLAGS
@@ -90,7 +90,7 @@ enum {
 	IFLA_IPTUN_ENCAP_DPORT,
 	__IFLA_IPTUN_MAX,
 };
-#define IFLA_IPTUN_MAX  (__IFLA_IPTUN_MAX - 1)
+#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
 
 static int ns_sysfs_fd = -1;
 
@@ -126,11 +126,11 @@ static bool sysctl_entries_equal(SysctlEntry *a, SysctlEntry *b)
 		return false;
 
 	switch (a->type) {
-		case SYSCTL_TYPE__CTL_32:
-			return a->has_iarg && b->has_iarg && a->iarg == b->iarg;
-		case SYSCTL_TYPE__CTL_STR:
-			return a->sarg && b->sarg && !strcmp(a->sarg, b->sarg);
-		default:;
+	case SYSCTL_TYPE__CTL_32:
+		return a->has_iarg && b->has_iarg && a->iarg == b->iarg;
+	case SYSCTL_TYPE__CTL_STR:
+		return a->sarg && b->sarg && !strcmp(a->sarg, b->sarg);
+	default:;
 	}
 
 	return false;
@@ -214,9 +214,9 @@ char *devconfs6[] = {
 	"use_tempaddr",
 };
 
-#define CONF_OPT_PATH "net/%s/conf/%s/%s"
-#define MAX_CONF_OPT_PATH IFNAMSIZ+60
-#define MAX_STR_CONF_LEN 200
+#define CONF_OPT_PATH	  "net/%s/conf/%s/%s"
+#define MAX_CONF_OPT_PATH IFNAMSIZ + 60
+#define MAX_STR_CONF_LEN  200
 
 static const char *unix_conf_entries[] = {
 	"max_dgram_qlen",
@@ -226,14 +226,13 @@ static const char *unix_conf_entries[] = {
  * MAX_CONF_UNIX_PATH = (sizeof(CONF_UNIX_FMT) - strlen("%s"))
  * 					  + MAX_CONF_UNIX_OPT_PATH
  */
-#define CONF_UNIX_BASE		"net/unix"
-#define CONF_UNIX_FMT		CONF_UNIX_BASE"/%s"
-#define MAX_CONF_UNIX_OPT_PATH	32
-#define MAX_CONF_UNIX_PATH	(sizeof(CONF_UNIX_FMT) + MAX_CONF_UNIX_OPT_PATH - 2)
+#define CONF_UNIX_BASE	       "net/unix"
+#define CONF_UNIX_FMT	       CONF_UNIX_BASE "/%s"
+#define MAX_CONF_UNIX_OPT_PATH 32
+#define MAX_CONF_UNIX_PATH     (sizeof(CONF_UNIX_FMT) + MAX_CONF_UNIX_OPT_PATH - 2)
 
-static int net_conf_op(char *tgt, SysctlEntry **conf, int n, int op, char *proto,
-		struct sysctl_req *req, char (*path)[MAX_CONF_OPT_PATH], int size,
-		char **devconfs, SysctlEntry **def_conf)
+static int net_conf_op(char *tgt, SysctlEntry **conf, int n, int op, char *proto, struct sysctl_req *req,
+		       char (*path)[MAX_CONF_OPT_PATH], int size, char **devconfs, SysctlEntry **def_conf)
 {
 	int i, ri, ar = -1;
 	int ret, flags = op == CTL_READ ? CTL_FLAGS_OPTIONAL : 0;
@@ -259,8 +258,7 @@ static int net_conf_op(char *tgt, SysctlEntry **conf, int n, int op, char *proto
 		 * mtu may be changed by disable_ipv6 so we can not skip
 		 * it's restore
 		 */
-		if (def_conf && sysctl_entries_equal(conf[i], def_conf[i])
-				&& strcmp(devconfs[i], "mtu")) {
+		if (def_conf && sysctl_entries_equal(conf[i], def_conf[i]) && strcmp(devconfs[i], "mtu")) {
 			pr_debug("Skip %s/%s, coincides with default\n", tgt, devconfs[i]);
 			continue;
 		}
@@ -278,36 +276,34 @@ static int net_conf_op(char *tgt, SysctlEntry **conf, int n, int op, char *proto
 		req[ri].name = path[i];
 		req[ri].flags = flags;
 		switch (conf[i]->type) {
-			case SYSCTL_TYPE__CTL_32:
-				req[ri].type = CTL_32;
+		case SYSCTL_TYPE__CTL_32:
+			req[ri].type = CTL_32;
 
-				/* skip non-existing sysctl */
-				if (op == CTL_WRITE && !conf[i]->has_iarg)
-					continue;
-
-				req[ri].arg = &conf[i]->iarg;
-				break;
-			case SYSCTL_TYPE__CTL_STR:
-				req[ri].type = CTL_STR(MAX_STR_CONF_LEN);
-				req[ri].flags |= op == CTL_READ && !strcmp(devconfs[i], "stable_secret")
-					? CTL_FLAGS_READ_EIO_SKIP : 0;
-
-				/* skip non-existing sysctl */
-				if (op == CTL_WRITE && !conf[i]->sarg)
-					continue;
-
-				req[ri].arg = conf[i]->sarg;
-				break;
-			default:
+			/* skip non-existing sysctl */
+			if (op == CTL_WRITE && !conf[i]->has_iarg)
 				continue;
+
+			req[ri].arg = &conf[i]->iarg;
+			break;
+		case SYSCTL_TYPE__CTL_STR:
+			req[ri].type = CTL_STR(MAX_STR_CONF_LEN);
+			req[ri].flags |=
+				op == CTL_READ && !strcmp(devconfs[i], "stable_secret") ? CTL_FLAGS_READ_EIO_SKIP : 0;
+
+			/* skip non-existing sysctl */
+			if (op == CTL_WRITE && !conf[i]->sarg)
+				continue;
+
+			req[ri].arg = conf[i]->sarg;
+			break;
+		default:
+			continue;
 		}
 		rconf[ri] = conf[i];
 		ri++;
 	}
 
-	if (ar != -1
-	    && conf[ar]->type == SYSCTL_TYPE__CTL_32
-	    && conf[ar]->has_iarg) {
+	if (ar != -1 && conf[ar]->type == SYSCTL_TYPE__CTL_32 && conf[ar]->has_iarg) {
 		snprintf(path[ar], MAX_CONF_OPT_PATH, CONF_OPT_PATH, proto, tgt, devconfs[ar]);
 		req[ri].name = path[ar];
 		req[ri].type = CTL_32;
@@ -319,7 +315,7 @@ static int net_conf_op(char *tgt, SysctlEntry **conf, int n, int op, char *proto
 
 	ret = sysctl_op(req, ri, op, CLONE_NEWNET);
 	if (ret < 0) {
-		pr_err("Failed to %s %s/<confs>\n", (op == CTL_READ)?"read":"write", tgt);
+		pr_err("Failed to %s %s/<confs>\n", (op == CTL_READ) ? "read" : "write", tgt);
 		goto err_free;
 	}
 
@@ -345,9 +341,7 @@ static int ipv4_conf_op(char *tgt, SysctlEntry **conf, int n, int op, SysctlEntr
 	struct sysctl_req req[ARRAY_SIZE(devconfs4)];
 	char path[ARRAY_SIZE(devconfs4)][MAX_CONF_OPT_PATH];
 
-	return net_conf_op(tgt, conf, n, op, "ipv4",
-			req, path, ARRAY_SIZE(devconfs4),
-			devconfs4, def_conf);
+	return net_conf_op(tgt, conf, n, op, "ipv4", req, path, ARRAY_SIZE(devconfs4), devconfs4, def_conf);
 }
 
 static int ipv6_conf_op(char *tgt, SysctlEntry **conf, int n, int op, SysctlEntry **def_conf)
@@ -355,21 +349,18 @@ static int ipv6_conf_op(char *tgt, SysctlEntry **conf, int n, int op, SysctlEntr
 	struct sysctl_req req[ARRAY_SIZE(devconfs6)];
 	char path[ARRAY_SIZE(devconfs6)][MAX_CONF_OPT_PATH];
 
-	return net_conf_op(tgt, conf, n, op, "ipv6",
-			req, path, ARRAY_SIZE(devconfs6),
-			devconfs6, def_conf);
+	return net_conf_op(tgt, conf, n, op, "ipv6", req, path, ARRAY_SIZE(devconfs6), devconfs6, def_conf);
 }
 
 static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
 {
 	int i, ret = -1, flags = 0;
-	char path[ARRAY_SIZE(unix_conf_entries)][MAX_CONF_UNIX_PATH] = { };
-	struct sysctl_req req[ARRAY_SIZE(unix_conf_entries)] = { };
+	char path[ARRAY_SIZE(unix_conf_entries)][MAX_CONF_UNIX_PATH] = {};
+	struct sysctl_req req[ARRAY_SIZE(unix_conf_entries)] = {};
 	SysctlEntry **conf = *rconf;
 
 	if (*n != ARRAY_SIZE(unix_conf_entries)) {
-		pr_err("unix: Unexpected entries in config (%zu %zu)\n",
-			*n, ARRAY_SIZE(unix_conf_entries));
+		pr_err("unix: Unexpected entries in config (%zu %zu)\n", *n, ARRAY_SIZE(unix_conf_entries));
 		return -EINVAL;
 	}
 
@@ -377,8 +368,7 @@ static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
 		flags = CTL_FLAGS_OPTIONAL;
 
 	for (i = 0; i < *n; i++) {
-		snprintf(path[i], MAX_CONF_UNIX_PATH, CONF_UNIX_FMT,
-			unix_conf_entries[i]);
+		snprintf(path[i], MAX_CONF_UNIX_PATH, CONF_UNIX_FMT, unix_conf_entries[i]);
 		req[i].name = path[i];
 		req[i].flags = flags;
 
@@ -388,17 +378,14 @@ static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
 			req[i].arg = &conf[i]->iarg;
 			break;
 		default:
-			pr_err("unix: Unknown config type %d\n",
-				conf[i]->type);
+			pr_err("unix: Unknown config type %d\n", conf[i]->type);
 			return -1;
 		}
 	}
 
 	ret = sysctl_op(req, *n, op, CLONE_NEWNET);
 	if (ret < 0) {
-		pr_err("unix: Failed to %s %s/<confs>\n",
-			(op == CTL_READ) ? "read" : "write",
-			CONF_UNIX_BASE);
+		pr_err("unix: Failed to %s %s/<confs>\n", (op == CTL_READ) ? "read" : "write", CONF_UNIX_BASE);
 		return -1;
 	}
 
@@ -431,7 +418,7 @@ static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
  * the kernel, simply write DEVCONFS_UNUSED
  * into the image so we would skip it.
  */
-#define DEVCONFS_UNUSED		(-1u)
+#define DEVCONFS_UNUSED (-1u)
 
 static int ipv4_conf_op_old(char *tgt, int *conf, int n, int op, int *def_conf)
 {
@@ -471,7 +458,7 @@ static int ipv4_conf_op_old(char *tgt, int *conf, int n, int op, int *def_conf)
 
 	ret = sysctl_op(req, ri, op, CLONE_NEWNET);
 	if (ret < 0) {
-		pr_err("Failed to %s %s/<confs>\n", (op == CTL_READ)?"read":"write", tgt);
+		pr_err("Failed to %s %s/<confs>\n", (op == CTL_READ) ? "read" : "write", tgt);
 		return -1;
 	}
 	return 0;
@@ -493,9 +480,8 @@ static int lookup_net_by_netid(struct ns_id *ns, int net_id)
 	return -1;
 }
 
-static int dump_one_netdev(int type, struct ifinfomsg *ifi,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds,
-		int (*dump)(NetDeviceEntry *, struct cr_imgset *, struct nlattr **info))
+static int dump_one_netdev(int type, struct ifinfomsg *ifi, struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds,
+			   int (*dump)(NetDeviceEntry *, struct cr_imgset *, struct nlattr **info))
 {
 	int ret = -1, i, peer_ifindex;
 	NetDeviceEntry netdev = NET_DEVICE_ENTRY__INIT;
@@ -530,16 +516,14 @@ static int dump_one_netdev(int type, struct ifinfomsg *ifi,
 		if (tb[IFLA_LINK_NETNSID])
 			nsid = nla_get_s32(tb[IFLA_LINK_NETNSID]);
 
-		pr_debug("The peer link is in the %d netns with the %u index\n",
-						nsid, netdev.peer_ifindex);
+		pr_debug("The peer link is in the %d netns with the %u index\n", nsid, netdev.peer_ifindex);
 
 		if (nsid == -1)
 			nsid = ns->id;
 		else
 			nsid = lookup_net_by_netid(ns, nsid);
 		if (nsid < 0) {
-			pr_warn("The %s veth is in an external netns\n",
-								netdev.name);
+			pr_warn("The %s veth is in an external netns\n", netdev.name);
 		} else {
 			netdev.has_peer_nsid = true;
 			netdev.peer_nsid = nsid;
@@ -554,9 +538,8 @@ static int dump_one_netdev(int type, struct ifinfomsg *ifi,
 		netdev.has_address = true;
 		netdev.address.data = nla_data(tb[IFLA_ADDRESS]);
 		netdev.address.len = nla_len(tb[IFLA_ADDRESS]);
-		pr_info("Found ll addr (%02x:../%d) for %s\n",
-				(int)netdev.address.data[0],
-				(int)netdev.address.len, netdev.name);
+		pr_info("Found ll addr (%02x:../%d) for %s\n", (int)netdev.address.data[0], (int)netdev.address.len,
+			netdev.name);
 	}
 
 	if (tb[IFLA_MASTER]) {
@@ -646,8 +629,8 @@ static char *link_kind(struct ifinfomsg *ifi, struct nlattr **tb)
 	return nla_data(linkinfo[IFLA_INFO_KIND]);
 }
 
-static int dump_unknown_device(struct ifinfomsg *ifi, char *kind,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
+static int dump_unknown_device(struct ifinfomsg *ifi, char *kind, struct nlattr **tb, struct ns_id *ns,
+			       struct cr_imgset *fds)
 {
 	int ret;
 
@@ -656,8 +639,7 @@ static int dump_unknown_device(struct ifinfomsg *ifi, char *kind,
 		return dump_one_netdev(ND_TYPE__EXTLINK, ifi, tb, ns, fds, NULL);
 
 	if (ret == -ENOTSUP)
-		pr_err("Unsupported link %d (type %d kind %s)\n",
-				ifi->ifi_index, ifi->ifi_type, kind);
+		pr_err("Unsupported link %d (type %d kind %s)\n", ifi->ifi_index, ifi->ifi_type, kind);
 	return -1;
 }
 
@@ -670,7 +652,7 @@ static int dump_macvlan(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nl
 {
 	MacvlanLinkEntry macvlan = MACVLAN_LINK_ENTRY__INIT;
 	int ret;
-	struct nlattr *data[IFLA_MACVLAN_FLAGS+1];
+	struct nlattr *data[IFLA_MACVLAN_FLAGS + 1];
 
 	if (!info || !info[IFLA_INFO_DATA]) {
 		pr_err("no data for macvlan\n");
@@ -691,14 +673,14 @@ static int dump_macvlan(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nl
 	macvlan.mode = *((u32 *)RTA_DATA(data[IFLA_MACVLAN_MODE]));
 
 	if (data[IFLA_MACVLAN_FLAGS])
-		macvlan.flags = *((u16 *) RTA_DATA(data[IFLA_MACVLAN_FLAGS]));
+		macvlan.flags = *((u16 *)RTA_DATA(data[IFLA_MACVLAN_FLAGS]));
 
 	nde->macvlan = &macvlan;
 	return write_netdev_img(nde, imgset, info);
 }
 
-static int dump_one_ethernet(struct ifinfomsg *ifi, char *kind,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
+static int dump_one_ethernet(struct ifinfomsg *ifi, char *kind, struct nlattr **tb, struct ns_id *ns,
+			     struct cr_imgset *fds)
 {
 	if (!strcmp(kind, "veth"))
 		/*
@@ -735,8 +717,8 @@ static int dump_one_ethernet(struct ifinfomsg *ifi, char *kind,
 	return dump_unknown_device(ifi, kind, tb, ns, fds);
 }
 
-static int dump_one_gendev(struct ifinfomsg *ifi, char *kind,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
+static int dump_one_gendev(struct ifinfomsg *ifi, char *kind, struct nlattr **tb, struct ns_id *ns,
+			   struct cr_imgset *fds)
 {
 	if (!strcmp(kind, "tun"))
 		return dump_one_netdev(ND_TYPE__TUN, ifi, tb, ns, fds, dump_tun_link);
@@ -744,8 +726,8 @@ static int dump_one_gendev(struct ifinfomsg *ifi, char *kind,
 	return dump_unknown_device(ifi, kind, tb, ns, fds);
 }
 
-static int dump_one_voiddev(struct ifinfomsg *ifi, char *kind,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
+static int dump_one_voiddev(struct ifinfomsg *ifi, char *kind, struct nlattr **tb, struct ns_id *ns,
+			    struct cr_imgset *fds)
 {
 	if (!strcmp(kind, "venet"))
 		return dump_one_netdev(ND_TYPE__VENET, ifi, tb, ns, fds, NULL);
@@ -753,8 +735,7 @@ static int dump_one_voiddev(struct ifinfomsg *ifi, char *kind,
 	return dump_unknown_device(ifi, kind, tb, ns, fds);
 }
 
-static int dump_one_gre(struct ifinfomsg *ifi, char *kind,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
+static int dump_one_gre(struct ifinfomsg *ifi, char *kind, struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
 {
 	if (!strcmp(kind, "gre")) {
 		char *name = (char *)RTA_DATA(tb[IFLA_IFNAME]);
@@ -794,11 +775,12 @@ static int dump_sit(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nlattr
 		return -1;
 	}
 
-#define ENCODE_ENTRY(__type, __ifla, __proto)	do {			\
-		if (data[__ifla]) {					\
-			se.__proto = *(__type *)nla_data(data[__ifla]);	\
-			se.has_##__proto = true;			\
-		}							\
+#define ENCODE_ENTRY(__type, __ifla, __proto)                           \
+	do {                                                            \
+		if (data[__ifla]) {                                     \
+			se.__proto = *(__type *)nla_data(data[__ifla]); \
+			se.has_##__proto = true;                        \
+		}                                                       \
 	} while (0)
 
 	if (data[IFLA_IPTUN_LOCAL]) {
@@ -817,11 +799,11 @@ static int dump_sit(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nlattr
 		}
 	}
 
-	ENCODE_ENTRY(u32, IFLA_IPTUN_LINK,  link);
-	ENCODE_ENTRY(u8,  IFLA_IPTUN_TTL,   ttl);
-	ENCODE_ENTRY(u8,  IFLA_IPTUN_TOS,   tos);
+	ENCODE_ENTRY(u32, IFLA_IPTUN_LINK, link);
+	ENCODE_ENTRY(u8, IFLA_IPTUN_TTL, ttl);
+	ENCODE_ENTRY(u8, IFLA_IPTUN_TOS, tos);
 	ENCODE_ENTRY(u16, IFLA_IPTUN_FLAGS, flags);
-	ENCODE_ENTRY(u8,  IFLA_IPTUN_PROTO, proto);
+	ENCODE_ENTRY(u8, IFLA_IPTUN_PROTO, proto);
 
 	if (data[IFLA_IPTUN_PMTUDISC]) {
 		u8 v;
@@ -831,7 +813,7 @@ static int dump_sit(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nlattr
 			se.pmtudisc = se.has_pmtudisc = true;
 	}
 
-	ENCODE_ENTRY(u16, IFLA_IPTUN_ENCAP_TYPE,  encap_type);
+	ENCODE_ENTRY(u16, IFLA_IPTUN_ENCAP_TYPE, encap_type);
 	ENCODE_ENTRY(u16, IFLA_IPTUN_ENCAP_FLAGS, encap_flags);
 	ENCODE_ENTRY(u16, IFLA_IPTUN_ENCAP_SPORT, encap_sport);
 	ENCODE_ENTRY(u16, IFLA_IPTUN_ENCAP_DPORT, encap_dport);
@@ -864,7 +846,7 @@ static int dump_sit(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nlattr
 		memcpy(&rl_prefix, nla_data(data[IFLA_IPTUN_6RD_RELAY_PREFIX]), sizeof(rl_prefix));
 		se.n_relay_prefix = 1;
 		se.relay_prefix = &rl_prefix;
-skip:;
+	skip:;
 	}
 
 #undef ENCODE_ENTRY
@@ -873,8 +855,7 @@ skip:;
 	return write_netdev_img(nde, imgset, info);
 }
 
-static int dump_one_sit(struct ifinfomsg *ifi, char *kind,
-		struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
+static int dump_one_sit(struct ifinfomsg *ifi, char *kind, struct nlattr **tb, struct ns_id *ns, struct cr_imgset *fds)
 {
 	char *name;
 
@@ -944,7 +925,7 @@ static int dump_one_link(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 		ret = dump_one_sit(ifi, kind, tb, ns, fds);
 		break;
 	default:
-unk:
+	unk:
 		ret = dump_unknown_device(ifi, kind, tb, ns, fds);
 		break;
 	}
@@ -968,7 +949,7 @@ static int dump_one_nf(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 static int ct_restore_callback(struct nlmsghdr *nlh)
 {
 	struct nfgenmsg *msg;
-	struct nlattr *tb[CTA_MAX+1], *tbp[CTA_PROTOINFO_MAX + 1], *tb_tcp[CTA_PROTOINFO_TCP_MAX+1];
+	struct nlattr *tb[CTA_MAX + 1], *tbp[CTA_PROTOINFO_MAX + 1], *tb_tcp[CTA_PROTOINFO_TCP_MAX + 1];
 	int err;
 
 	msg = NLMSG_DATA(nlh);
@@ -1064,7 +1045,7 @@ static int restore_nf_ct(int pid, int type)
 			if (ct_restore_callback(nlh))
 				goto out;
 
-		nlh->nlmsg_flags = NLM_F_REQUEST|NLM_F_ACK|NLM_F_CREATE;
+		nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE;
 		ret = do_rtnl_req(sk, nlh, nlh->nlmsg_len, NULL, NULL, NULL, NULL);
 		if (ret)
 			goto out;
@@ -1118,7 +1099,6 @@ static int dump_nf_ct(struct cr_imgset *fds, int type)
 	close(sk);
 out:
 	return ret;
-
 }
 
 /*
@@ -1141,7 +1121,7 @@ static int list_links(int rtsk, void *args)
 	memset(&req, 0, sizeof(req));
 	req.nlh.nlmsg_len = sizeof(req);
 	req.nlh.nlmsg_type = RTM_GETLINK;
-	req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+	req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
 	req.nlh.nlmsg_pid = 0;
 	req.nlh.nlmsg_seq = CR_NLMSG_SEQ;
 	req.g.rtgen_family = AF_PACKET;
@@ -1161,7 +1141,7 @@ static int dump_links(int rtsk, struct ns_id *ns, struct cr_imgset *fds)
 	memset(&req, 0, sizeof(req));
 	req.nlh.nlmsg_len = sizeof(req);
 	req.nlh.nlmsg_type = RTM_GETLINK;
-	req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+	req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
 	req.nlh.nlmsg_pid = 0;
 	req.nlh.nlmsg_seq = CR_NLMSG_SEQ;
 	req.g.rtgen_family = AF_PACKET;
@@ -1191,22 +1171,21 @@ struct newlink_req {
  * request.
  */
 struct newlink_extras {
-	int link;		/* IFLA_LINK */
-	int target_netns;	/* IFLA_NET_NS_FD */
+	int link; /* IFLA_LINK */
+	int target_netns; /* IFLA_NET_NS_FD */
 };
 
 typedef int (*link_info_t)(struct ns_id *ns, struct net_link *, struct newlink_req *);
 
-static int populate_newlink_req(struct ns_id *ns, struct newlink_req *req,
-			int msg_type, struct net_link * link,
-			link_info_t link_info, struct newlink_extras *extras)
+static int populate_newlink_req(struct ns_id *ns, struct newlink_req *req, int msg_type, struct net_link *link,
+				link_info_t link_info, struct newlink_extras *extras)
 {
 	NetDeviceEntry *nde = link->nde;
 
 	memset(req, 0, sizeof(*req));
 
 	req->h.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
-	req->h.nlmsg_flags = NLM_F_REQUEST|NLM_F_ACK|NLM_F_CREATE;
+	req->h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE;
 	req->h.nlmsg_type = msg_type;
 	req->h.nlmsg_seq = CR_NLMSG_SEQ;
 	req->i.ifi_family = AF_PACKET;
@@ -1224,18 +1203,16 @@ static int populate_newlink_req(struct ns_id *ns, struct newlink_req *req,
 			addattr_l(&req->h, sizeof(*req), IFLA_LINK, &extras->link, sizeof(extras->link));
 
 		if (extras->target_netns >= 0)
-			addattr_l(&req->h, sizeof(*req), IFLA_NET_NS_FD, &extras->target_netns, sizeof(extras->target_netns));
-
+			addattr_l(&req->h, sizeof(*req), IFLA_NET_NS_FD, &extras->target_netns,
+				  sizeof(extras->target_netns));
 	}
 
 	addattr_l(&req->h, sizeof(*req), IFLA_IFNAME, nde->name, strlen(nde->name));
 	addattr_l(&req->h, sizeof(*req), IFLA_MTU, &nde->mtu, sizeof(nde->mtu));
 
 	if (nde->has_address) {
-		pr_debug("Restore ll addr (%02x:../%d) for device\n",
-				(int)nde->address.data[0], (int)nde->address.len);
-		addattr_l(&req->h, sizeof(*req), IFLA_ADDRESS,
-				nde->address.data, nde->address.len);
+		pr_debug("Restore ll addr (%02x:../%d) for device\n", (int)nde->address.data[0], (int)nde->address.len);
+		addattr_l(&req->h, sizeof(*req), IFLA_ADDRESS, nde->address.data, nde->address.len);
 	}
 
 	if (link_info) {
@@ -1286,7 +1263,7 @@ int kerndat_has_newifindex(void)
 	memset(&req, 0, sizeof(req));
 
 	req.h.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
-	req.h.nlmsg_flags = NLM_F_REQUEST|NLM_F_ACK|NLM_F_CREATE;
+	req.h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE;
 	req.h.nlmsg_type = RTM_SETLINK;
 	req.h.nlmsg_seq = CR_NLMSG_SEQ;
 	req.i.ifi_family = AF_UNSPEC;
@@ -1295,21 +1272,17 @@ int kerndat_has_newifindex(void)
 	 * ifindex is negative, so the kernel will return ERANGE if
 	 * IFLA_NEW_IFINDEX is supported.
 	 */
-	addattr_l(&req.h, sizeof(req), IFLA_NEW_IFINDEX,
-		  &ifindex, sizeof(ifindex));
+	addattr_l(&req.h, sizeof(req), IFLA_NEW_IFINDEX, &ifindex, sizeof(ifindex));
 	/* criu-kdat doesn't exist, so the kernel will return ENODEV. */
 	addattr_l(&req.h, sizeof(req), IFLA_IFNAME, "criu-kdat", 9);
 
-	ret = do_rtnl_req(sk, &req, sizeof(req), restore_link_cb,
-			  kerndat_newifindex_err_cb, NULL, NULL);
+	ret = do_rtnl_req(sk, &req, sizeof(req), restore_link_cb, kerndat_newifindex_err_cb, NULL, NULL);
 	close(sk);
 	return ret;
 }
 
-
-static int do_rtm_link_req(int msg_type,
-			struct net_link *link, int nlsk, struct ns_id *ns,
-			link_info_t link_info, struct newlink_extras *extras)
+static int do_rtm_link_req(int msg_type, struct net_link *link, int nlsk, struct ns_id *ns, link_info_t link_info,
+			   struct newlink_extras *extras)
 {
 	struct newlink_req req;
 
@@ -1324,8 +1297,8 @@ int restore_link_parms(struct net_link *link, int nlsk)
 	return do_rtm_link_req(RTM_SETLINK, link, nlsk, NULL, NULL, NULL);
 }
 
-static int restore_one_link(struct ns_id *ns, struct net_link *link, int nlsk,
-			link_info_t link_info, struct newlink_extras *extras)
+static int restore_one_link(struct ns_id *ns, struct net_link *link, int nlsk, link_info_t link_info,
+			    struct newlink_extras *extras)
 {
 	pr_info("Restoring netdev %s idx %d\n", link->nde->name, link->nde->ifindex);
 	return do_rtm_link_req(RTM_NEWLINK, link, nlsk, ns, link_info, extras);
@@ -1374,10 +1347,8 @@ out:
 	return ret;
 }
 
-static int move_veth(const char *netdev, struct ns_id *ns,
-		     struct net_link *link, int nlsk)
+static int move_veth(const char *netdev, struct ns_id *ns, struct net_link *link, int nlsk)
 {
-
 	NetDeviceEntry *nde = link->nde;
 	struct newlink_req *req;
 	struct move_req mvreq;
@@ -1400,31 +1371,27 @@ static int move_veth(const char *netdev, struct ns_id *ns,
 	memset(&mvreq.req, 0, sizeof(mvreq.req));
 	req = &mvreq.req;
 
-	req->h.nlmsg_len	= NLMSG_LENGTH(sizeof(struct ifinfomsg));
-	req->h.nlmsg_flags	= NLM_F_REQUEST|NLM_F_ACK;
-	req->h.nlmsg_type	= RTM_NEWLINK;
-	req->h.nlmsg_seq	= CR_NLMSG_SEQ;
+	req->h.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+	req->h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
+	req->h.nlmsg_type = RTM_NEWLINK;
+	req->h.nlmsg_seq = CR_NLMSG_SEQ;
 
-	req->i.ifi_family	= AF_UNSPEC;
-	req->i.ifi_flags	= nde->flags;
+	req->i.ifi_family = AF_UNSPEC;
+	req->i.ifi_flags = nde->flags;
 
 	/* Tell netlink what name we want in the target netns. */
-	addattr_l(&req->h, sizeof(*req), IFLA_IFNAME,
-		  nde->name, strlen(nde->name));
+	addattr_l(&req->h, sizeof(*req), IFLA_IFNAME, nde->name, strlen(nde->name));
 
 	/* Tell netlink what mtu we want in the target netns. */
-	addattr_l(&req->h, sizeof(*req), IFLA_MTU,
-		  &nde->mtu, sizeof(nde->mtu));
+	addattr_l(&req->h, sizeof(*req), IFLA_MTU, &nde->mtu, sizeof(nde->mtu));
 
 	/* Tell netlink what ifindex we want in the target netns. */
-	addattr_l(&req->h, sizeof(*req), IFLA_NEW_IFINDEX,
-		  &nde->ifindex, sizeof(nde->ifindex));
+	addattr_l(&req->h, sizeof(*req), IFLA_NEW_IFINDEX, &nde->ifindex, sizeof(nde->ifindex));
 
 	if (nde->has_address) {
-		pr_debug("Restore ll addr (%02x:../%d) for device with target ifindex %d\n",
-			 (int)nde->address.data[0], (int)nde->address.len, nde->ifindex);
-		addattr_l(&req->h, sizeof(*req), IFLA_ADDRESS,
-			  nde->address.data, nde->address.len);
+		pr_debug("Restore ll addr (%02x:../%d) for device with target ifindex %d\n", (int)nde->address.data[0],
+			 (int)nde->address.len, nde->ifindex);
+		addattr_l(&req->h, sizeof(*req), IFLA_ADDRESS, nde->address.data, nde->address.len);
 	}
 
 	len_val = strlen(netdev);
@@ -1446,16 +1413,15 @@ enum {
 	VETH_INFO_PEER,
 
 	__VETH_INFO_MAX
-#define VETH_INFO_MAX   (__VETH_INFO_MAX - 1)
+#define VETH_INFO_MAX (__VETH_INFO_MAX - 1)
 };
 #endif
 
 #if IFLA_MAX <= 28
-#define IFLA_NET_NS_FD	28
+#define IFLA_NET_NS_FD 28
 #endif
 
-static int veth_peer_info(struct net_link *link, struct newlink_req *req,
-						struct ns_id *ns, int ns_fd)
+static int veth_peer_info(struct net_link *link, struct newlink_req *req, struct ns_id *ns, int ns_fd)
 {
 	NetDeviceEntry *nde = link->nde;
 	char key[100], *val;
@@ -1654,7 +1620,7 @@ static int restore_one_macvlan(struct ns_id *ns, struct net_link *link, int nlsk
 	 * CAP_NET_ADMIN is required in both namespaces, which we don't have in
 	 * the userns case, and usernsd doesn't exist in the non-userns case.
 	 */
-	extras.link = (int) (unsigned long) val;
+	extras.link = (int)(unsigned long)val;
 
 	my_netns = open_proc(PROC_SELF, "ns/net");
 	if (my_netns < 0)
@@ -1694,14 +1660,14 @@ static int sit_link_info(struct ns_id *ns, struct net_link *link, struct newlink
 	sit_data = NLMSG_TAIL(&req->h);
 	addattr_l(&req->h, sizeof(*req), IFLA_INFO_DATA, NULL, 0);
 
-#define DECODE_ENTRY(__type, __ifla, __proto) do {				\
-			__type aux;						\
-			if (se->has_##__proto) {				\
-				aux = se->__proto;				\
-				addattr_l(&req->h, sizeof(*req), __ifla,	\
-						&aux, sizeof(__type));		\
-			}							\
-		} while (0)
+#define DECODE_ENTRY(__type, __ifla, __proto)                                           \
+	do {                                                                            \
+		__type aux;                                                             \
+		if (se->has_##__proto) {                                                \
+			aux = se->__proto;                                              \
+			addattr_l(&req->h, sizeof(*req), __ifla, &aux, sizeof(__type)); \
+		}                                                                       \
+	} while (0)
 
 	if (se->n_local) {
 		if (se->n_local != 1) {
@@ -1719,18 +1685,18 @@ static int sit_link_info(struct ns_id *ns, struct net_link *link, struct newlink
 		addattr_l(&req->h, sizeof(*req), IFLA_IPTUN_REMOTE, se->remote, sizeof(u32));
 	}
 
-	DECODE_ENTRY(u32, IFLA_IPTUN_LINK,  link);
-	DECODE_ENTRY(u8,  IFLA_IPTUN_TTL,   ttl);
-	DECODE_ENTRY(u8,  IFLA_IPTUN_TOS,   tos);
+	DECODE_ENTRY(u32, IFLA_IPTUN_LINK, link);
+	DECODE_ENTRY(u8, IFLA_IPTUN_TTL, ttl);
+	DECODE_ENTRY(u8, IFLA_IPTUN_TOS, tos);
 	DECODE_ENTRY(u16, IFLA_IPTUN_FLAGS, flags);
-	DECODE_ENTRY(u8,  IFLA_IPTUN_PROTO, proto);
+	DECODE_ENTRY(u8, IFLA_IPTUN_PROTO, proto);
 
 	if (se->has_pmtudisc && se->pmtudisc) {
 		u8 aux = 1;
 		addattr_l(&req->h, sizeof(*req), IFLA_IPTUN_PMTUDISC, &aux, sizeof(u8));
 	}
 
-	DECODE_ENTRY(u16, IFLA_IPTUN_ENCAP_TYPE,  encap_type);
+	DECODE_ENTRY(u16, IFLA_IPTUN_ENCAP_TYPE, encap_type);
 	DECODE_ENTRY(u16, IFLA_IPTUN_ENCAP_FLAGS, encap_flags);
 	DECODE_ENTRY(u16, IFLA_IPTUN_ENCAP_SPORT, encap_sport);
 	DECODE_ENTRY(u16, IFLA_IPTUN_ENCAP_DPORT, encap_dport);
@@ -1758,7 +1724,7 @@ static int sit_link_info(struct ns_id *ns, struct net_link *link, struct newlink
 		aux = se->relay_prefixlen;
 		addattr_l(&req->h, sizeof(*req), IFLA_IPTUN_6RD_RELAY_PREFIXLEN, &aux, sizeof(u16));
 		addattr_l(&req->h, sizeof(*req), IFLA_IPTUN_6RD_RELAY_PREFIX, se->relay_prefix, sizeof(u32));
-skip:;
+	skip:;
 	}
 
 #undef DECODE_ENTRY
@@ -1777,7 +1743,7 @@ static int __restore_link(struct ns_id *ns, struct net_link *link, int nlsk)
 
 	switch (nde->type) {
 	case ND_TYPE__LOOPBACK: /* fallthrough */
-	case ND_TYPE__EXTLINK:  /* see comment in images/netdev.proto */
+	case ND_TYPE__EXTLINK: /* see comment in images/netdev.proto */
 		return restore_link_parms(link, nlsk);
 	case ND_TYPE__VENET:
 		return restore_one_link(ns, link, nlsk, venet_link_info, NULL);
@@ -1859,14 +1825,17 @@ static int restore_link(int nlsk, struct ns_id *ns, struct net_link *link)
 		def_netns = NULL;
 
 	if (nde->conf4)
-		ret = ipv4_conf_op(nde->name, nde->conf4, nde->n_conf4, CTL_WRITE, def_netns ? (*def_netns)->def_conf4 : NULL);
+		ret = ipv4_conf_op(nde->name, nde->conf4, nde->n_conf4, CTL_WRITE,
+				   def_netns ? (*def_netns)->def_conf4 : NULL);
 	else if (nde->conf)
-		ret = ipv4_conf_op_old(nde->name, nde->conf, nde->n_conf, CTL_WRITE, def_netns ? (*def_netns)->def_conf : NULL);
+		ret = ipv4_conf_op_old(nde->name, nde->conf, nde->n_conf, CTL_WRITE,
+				       def_netns ? (*def_netns)->def_conf : NULL);
 	if (ret)
 		goto exit;
 
 	if (nde->conf6)
-		ret = ipv6_conf_op(nde->name, nde->conf6, nde->n_conf6, CTL_WRITE, def_netns ? (*def_netns)->def_conf6 : NULL);
+		ret = ipv6_conf_op(nde->name, nde->conf6, nde->n_conf6, CTL_WRITE,
+				   def_netns ? (*def_netns)->def_conf6 : NULL);
 exit:
 	return ret;
 }
@@ -1878,15 +1847,14 @@ static int restore_master_link(int nlsk, struct ns_id *ns, struct net_link *link
 	memset(&req, 0, sizeof(req));
 
 	req.h.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
-	req.h.nlmsg_flags = NLM_F_REQUEST|NLM_F_ACK|NLM_F_CREATE;
+	req.h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE;
 	req.h.nlmsg_type = RTM_SETLINK;
 	req.h.nlmsg_seq = CR_NLMSG_SEQ;
 	req.i.ifi_family = AF_PACKET;
 	req.i.ifi_index = link->nde->ifindex;
 	req.i.ifi_flags = link->nde->flags;
 
-	addattr_l(&req.h, sizeof(req), IFLA_MASTER,
-			&link->nde->master, sizeof(link->nde->master));
+	addattr_l(&req.h, sizeof(req), IFLA_MASTER, &link->nde->master, sizeof(link->nde->master));
 
 	return do_rtnl_req(nlsk, &req, req.h.nlmsg_len, restore_link_cb, NULL, NULL, NULL);
 }
@@ -1915,8 +1883,7 @@ static int __restore_links(struct ns_id *nsid, int *nrlinks, int *nrcreated)
 
 		(*nrlinks)++;
 
-		pr_debug("Try to restore a link %d:%d:%s",
-				nsid->id, link->nde->ifindex, link->nde->name);
+		pr_debug("Try to restore a link %d:%d:%s\n", nsid->id, link->nde->ifindex, link->nde->name);
 		if (link->nde->has_master) {
 			mlink = lookup_net_link(nsid, link->nde->master);
 			if (mlink == NULL) {
@@ -1925,8 +1892,8 @@ static int __restore_links(struct ns_id *nsid, int *nrlinks, int *nrcreated)
 			}
 
 			if (!mlink->created) {
-				pr_debug("The master %d:%d:%s isn't created yet",
-					nsid->id, mlink->nde->ifindex, mlink->nde->name);
+				pr_debug("The master %d:%d:%s isn't created yet", nsid->id, mlink->nde->ifindex,
+					 mlink->nde->name);
 				continue;
 			}
 		}
@@ -1977,23 +1944,21 @@ static int restore_links(void)
 	return 0;
 }
 
-
 static int run_ip_tool(char *arg1, char *arg2, char *arg3, char *arg4, int fdin, int fdout, unsigned flags)
 {
 	char *ip_tool_cmd;
 	int ret;
 
-	pr_debug("\tRunning ip %s %s %s %s\n", arg1, arg2, arg3 ? : "", arg4 ? : "");
+	pr_debug("\tRunning ip %s %s %s %s\n", arg1, arg2, arg3 ?: "", arg4 ?: "");
 
 	ip_tool_cmd = getenv("CR_IP_TOOL");
 	if (!ip_tool_cmd)
 		ip_tool_cmd = "ip";
 
-	ret = cr_system(fdin, fdout, -1, ip_tool_cmd,
-				(char *[]) { "ip", arg1, arg2, arg3, arg4, NULL }, flags);
+	ret = cr_system(fdin, fdout, -1, ip_tool_cmd, (char *[]){ "ip", arg1, arg2, arg3, arg4, NULL }, flags);
 	if (ret) {
 		if (!(flags & CRS_CAN_FAIL))
-			pr_err("IP tool failed on %s %s %s %s\n", arg1, arg2, arg3 ? : "", arg4 ? : "");
+			pr_err("IP tool failed on %s %s %s %s\n", arg1, arg2, arg3 ?: "", arg4 ?: "");
 		return -1;
 	}
 
@@ -2009,7 +1974,7 @@ static int run_iptables_tool(char *def_cmd, int fdin, int fdout)
 	if (!cmd)
 		cmd = def_cmd;
 	pr_debug("\tRunning %s for %s\n", cmd, def_cmd);
-	ret = cr_system(fdin, fdout, -1, "sh", (char *[]) { "sh", "-c", cmd, NULL }, 0);
+	ret = cr_system(fdin, fdout, -1, "sh", (char *[]){ "sh", "-c", cmd, NULL }, 0);
 	if (ret)
 		pr_err("%s failed\n", def_cmd);
 
@@ -2169,23 +2134,21 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	int size6 = ARRAY_SIZE(devconfs6);
 	char def_stable_secret[MAX_STR_CONF_LEN + 1] = {};
 	char all_stable_secret[MAX_STR_CONF_LEN + 1] = {};
-	NetnsId	*ids;
+	NetnsId *ids;
 	struct netns_id *p;
 
 	i = 0;
 	list_for_each_entry(p, &ns->net.ids, node)
 		i++;
 
-	o_buf = buf = xmalloc(
-			i * (sizeof(NetnsId*) + sizeof(NetnsId)) +
-			size4 * (sizeof(SysctlEntry*) + sizeof(SysctlEntry)) * 2 +
-			size6 * (sizeof(SysctlEntry*) + sizeof(SysctlEntry)) * 2 +
-			sizex * (sizeof(SysctlEntry*) + sizeof(SysctlEntry))
-		     );
+	o_buf = buf = xmalloc(i * (sizeof(NetnsId *) + sizeof(NetnsId)) +
+			      size4 * (sizeof(SysctlEntry *) + sizeof(SysctlEntry)) * 2 +
+			      size6 * (sizeof(SysctlEntry *) + sizeof(SysctlEntry)) * 2 +
+			      sizex * (sizeof(SysctlEntry *) + sizeof(SysctlEntry)));
 	if (!buf)
 		goto out;
 
-	netns.nsids = xptr_pull_s(&buf, i * sizeof(NetnsId*));
+	netns.nsids = xptr_pull_s(&buf, i * sizeof(NetnsId *));
 	ids = xptr_pull_s(&buf, i * sizeof(NetnsId));
 	i = 0;
 	list_for_each_entry(p, &ns->net.ids, node) {
@@ -2199,8 +2162,8 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 
 	netns.n_def_conf4 = size4;
 	netns.n_all_conf4 = size4;
-	netns.def_conf4 = xptr_pull_s(&buf, size4 * sizeof(SysctlEntry*));
-	netns.all_conf4 = xptr_pull_s(&buf, size4 * sizeof(SysctlEntry*));
+	netns.def_conf4 = xptr_pull_s(&buf, size4 * sizeof(SysctlEntry *));
+	netns.all_conf4 = xptr_pull_s(&buf, size4 * sizeof(SysctlEntry *));
 	def_confs4 = xptr_pull_s(&buf, size4 * sizeof(SysctlEntry));
 	all_confs4 = xptr_pull_s(&buf, size4 * sizeof(SysctlEntry));
 
@@ -2215,8 +2178,8 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 
 	netns.n_def_conf6 = size6;
 	netns.n_all_conf6 = size6;
-	netns.def_conf6 = xptr_pull_s(&buf, size6 * sizeof(SysctlEntry*));
-	netns.all_conf6 = xptr_pull_s(&buf, size6 * sizeof(SysctlEntry*));
+	netns.def_conf6 = xptr_pull_s(&buf, size6 * sizeof(SysctlEntry *));
+	netns.all_conf6 = xptr_pull_s(&buf, size6 * sizeof(SysctlEntry *));
 	def_confs6 = xptr_pull_s(&buf, size6 * sizeof(SysctlEntry));
 	all_confs6 = xptr_pull_s(&buf, size6 * sizeof(SysctlEntry));
 
@@ -2237,7 +2200,7 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	}
 
 	netns.n_unix_conf = sizex;
-	netns.unix_conf = xptr_pull_s(&buf, sizex * sizeof(SysctlEntry*));
+	netns.unix_conf = xptr_pull_s(&buf, sizex * sizeof(SysctlEntry *));
 	unix_confs = xptr_pull_s(&buf, sizex * sizeof(SysctlEntry));
 
 	for (i = 0; i < sizex; i++) {
@@ -2298,7 +2261,8 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 		written = fwrite(buf, sizeof(char), n, tmp_file);
 		if (written < n) {
 			pr_perror("Failed to write to tmpfile "
-				  "[written: %d; total: %d]", written, n);
+				  "[written: %d; total: %d]",
+				  written, n);
 			goto close;
 		}
 	}
@@ -2314,7 +2278,7 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 	}
 
 close:
-	if(fclose(tmp_file)) {
+	if (fclose(tmp_file)) {
 		pr_perror("Failed to close tmpfile");
 	}
 
@@ -2355,7 +2319,7 @@ static inline int restore_rule(int pid)
 	 * Delete 3 default rules to prevent duplicates. See kernel's
 	 * function fib_default_rules_init() for the details.
 	 */
-	run_ip_tool("rule", "flush",  NULL,    NULL,    -1, -1, 0);
+	run_ip_tool("rule", "flush", NULL, NULL, -1, -1, 0);
 	run_ip_tool("rule", "delete", "table", "local", -1, -1, 0);
 
 	if (restore_ip_dump(CR_FD_RULE, pid, "rule"))
@@ -2389,7 +2353,7 @@ static int prepare_xtable_lock(void)
 		return -1;
 	}
 
-	if (mount(NULL, "/",  NULL, MS_SLAVE | MS_REC, NULL)) {
+	if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL)) {
 		pr_perror("Unable to conver mounts to slave mounts");
 		return -1;
 	}
@@ -2471,9 +2435,9 @@ static inline int restore_nftables(int pid)
 
 	if (nft_ctx_buffer_output(nft) || nft_ctx_buffer_error(nft) ||
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
-		nft_run_cmd_from_buffer(nft, buf, strlen(buf)))
+	    nft_run_cmd_from_buffer(nft, buf, strlen(buf)))
 #elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
-		nft_run_cmd_from_buffer(nft, buf))
+	    nft_run_cmd_from_buffer(nft, buf))
 #else
 	{
 		BUILD_BUG_ON(1);
@@ -2655,8 +2619,7 @@ static int dump_netns_ids(int rtsk, struct ns_id *ns)
 		.ns = ns,
 		.sk = rtsk,
 	};
-	return walk_namespaces(&net_ns_desc, collect_netns_id,
-			(void *)&arg);
+	return walk_namespaces(&net_ns_desc, collect_netns_id, (void *)&arg);
 }
 
 int net_set_ext(struct ns_id *ns)
@@ -2918,7 +2881,6 @@ static int __prepare_net_namespaces(void *unused)
 			pr_perror("Can't create nlk socket");
 			goto err;
 		}
-
 	}
 
 	if (restore_links())
@@ -2944,7 +2906,6 @@ err:
 	return -1;
 }
 
-
 int prepare_net_namespaces(void)
 {
 	if (!(root_ns_mask & CLONE_NEWNET))
@@ -3031,8 +2992,8 @@ int netns_keep_nsfd(void)
 static int iptables_restore(bool ipv6, char *buf, int size)
 {
 	int pfd[2], ret = -1;
-	char *cmd4[] = {"iptables-restore", "-w", "--noflush", NULL};
-	char *cmd6[] = {"ip6tables-restore", "-w", "--noflush", NULL};
+	char *cmd4[] = { "iptables-restore", "-w", "--noflush", NULL };
+	char *cmd6[] = { "ip6tables-restore", "-w", "--noflush", NULL };
 	char **cmd = ipv6 ? cmd6 : cmd4;
 
 	if (pipe(pfd) < 0) {
@@ -3055,28 +3016,28 @@ err:
 
 int network_lock_internal(void)
 {
-	char conf[] =	"*filter\n"
-				":CRIU - [0:0]\n"
-				"-I INPUT -j CRIU\n"
-				"-I OUTPUT -j CRIU\n"
-				"-A CRIU -m mark --mark " __stringify(SOCCR_MARK) " -j ACCEPT\n"
-				"-A CRIU -j DROP\n"
-				"COMMIT\n";
+	char conf[] = "*filter\n"
+		      ":CRIU - [0:0]\n"
+		      "-I INPUT -j CRIU\n"
+		      "-I OUTPUT -j CRIU\n"
+		      "-A CRIU -m mark --mark " __stringify(SOCCR_MARK) " -j ACCEPT\n"
+									"-A CRIU -j DROP\n"
+									"COMMIT\n";
 	int ret = 0, nsret;
 
 	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
 		return -1;
 
-
 	ret |= iptables_restore(false, conf, sizeof(conf) - 1);
 	if (kdat.ipv6)
 		ret |= iptables_restore(true, conf, sizeof(conf) - 1);
 
 	if (ret)
 		pr_err("Locking network failed: iptables-restore returned %d. "
-			"This may be connected to disabled "
-			"CONFIG_NETFILTER_XT_MARK kernel build config "
-			"option.\n", ret);
+		       "This may be connected to disabled "
+		       "CONFIG_NETFILTER_XT_MARK kernel build config "
+		       "option.\n",
+		       ret);
 
 	if (restore_ns(nsret, &net_ns_desc))
 		ret = -1;
@@ -3086,18 +3047,17 @@ int network_lock_internal(void)
 
 static int network_unlock_internal(void)
 {
-	char conf[] =	"*filter\n"
-			":CRIU - [0:0]\n"
-			"-D INPUT -j CRIU\n"
-			"-D OUTPUT -j CRIU\n"
-			"-X CRIU\n"
-			"COMMIT\n";
+	char conf[] = "*filter\n"
+		      ":CRIU - [0:0]\n"
+		      "-D INPUT -j CRIU\n"
+		      "-D OUTPUT -j CRIU\n"
+		      "-X CRIU\n"
+		      "COMMIT\n";
 	int ret = 0, nsret;
 
 	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
 		return -1;
 
-
 	ret |= iptables_restore(false, conf, sizeof(conf) - 1);
 	if (kdat.ipv6)
 		ret |= iptables_restore(true, conf, sizeof(conf) - 1);
@@ -3113,7 +3073,7 @@ int network_lock(void)
 	pr_info("Lock network\n");
 
 	/* Each connection will be locked on dump */
-	if  (!(root_ns_mask & CLONE_NEWNET))
+	if (!(root_ns_mask & CLONE_NEWNET))
 		return 0;
 
 	if (run_scripts(ACT_NET_LOCK))
@@ -3149,7 +3109,7 @@ int veth_pair_add(char *in, char *out)
 
 int macvlan_ext_add(struct external *ext)
 {
-	ext->data = (void *) (unsigned long) if_nametoindex(external_val(ext));
+	ext->data = (void *)(unsigned long)if_nametoindex(external_val(ext));
 	if (ext->data == 0) {
 		pr_perror("can't get ifindex of %s", ext->id);
 		return -1;
@@ -3222,16 +3182,14 @@ static int prep_ns_sockets(struct ns_id *ns, bool for_dump)
 	if (kdat.lsm == LSMTYPE__SELINUX) {
 		ret = getpidcon_raw(root_item->pid->real, &ctx);
 		if (ret < 0) {
-			pr_perror("Getting SELinux context for PID %d failed",
-				  root_item->pid->real);
+			pr_perror("Getting SELinux context for PID %d failed", root_item->pid->real);
 			goto err_sq;
 		}
 
 		ret = setsockcreatecon(ctx);
 		freecon(ctx);
 		if (ret < 0) {
-			pr_perror("Setting SELinux socket context for PID %d failed",
-				  root_item->pid->real);
+			pr_perror("Setting SELinux socket context for PID %d failed", root_item->pid->real);
 			goto err_sq;
 		}
 	}
@@ -3309,8 +3267,7 @@ static int collect_net_ns(struct ns_id *ns, void *oarg)
 
 int collect_net_namespaces(bool for_dump)
 {
-	return walk_namespaces(&net_ns_desc, collect_net_ns,
-			(void *)(for_dump ? 1UL : 0));
+	return walk_namespaces(&net_ns_desc, collect_net_ns, (void *)(for_dump ? 1UL : 0));
 }
 
 struct ns_desc net_ns_desc = NS_DESC_ENTRY(CLONE_NEWNET, "net");
@@ -3415,7 +3372,7 @@ static int move_to_bridge(struct external *ext, void *arg)
 		pr_debug("\tMoving dev %s to bridge %s\n", out, br);
 
 		if (s == -1) {
-			s = socket(AF_LOCAL, SOCK_STREAM|SOCK_CLOEXEC, 0);
+			s = socket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
 			if (s < 0) {
 				pr_perror("Can't create control socket");
 				return -1;
@@ -3493,14 +3450,14 @@ enum {
 	__NETNSA_MAX,
 };
 
-#define NETNSA_MAX		(__NETNSA_MAX - 1)
+#define NETNSA_MAX (__NETNSA_MAX - 1)
 #endif
 
 static struct nla_policy rtnl_net_policy[NETNSA_MAX + 1] = {
-	[NETNSA_NONE]		= { .type = NLA_UNSPEC },
-	[NETNSA_NSID]		= { .type = NLA_S32 },
-	[NETNSA_PID]		= { .type = NLA_U32 },
-	[NETNSA_FD]		= { .type = NLA_U32 },
+	[NETNSA_NONE] = { .type = NLA_UNSPEC },
+	[NETNSA_NSID] = { .type = NLA_S32 },
+	[NETNSA_PID] = { .type = NLA_U32 },
+	[NETNSA_FD] = { .type = NLA_U32 },
 };
 
 static int nsid_cb(struct nlmsghdr *msg, struct ns_id *ns, void *arg)
@@ -3508,8 +3465,7 @@ static int nsid_cb(struct nlmsghdr *msg, struct ns_id *ns, void *arg)
 	struct nlattr *tb[NETNSA_MAX + 1];
 	int err;
 
-	err = nlmsg_parse(msg, sizeof(struct rtgenmsg), tb,
-				NETNSA_MAX, rtnl_net_policy);
+	err = nlmsg_parse(msg, sizeof(struct rtgenmsg), tb, NETNSA_MAX, rtnl_net_policy);
 	if (err < 0)
 		return NL_STOP;
 
@@ -3560,7 +3516,7 @@ int net_get_nsid(int rtsk, int pid, int *nsid)
 	if (addattr_l(&req.nlh, sizeof(req), NETNSA_PID, &pid, sizeof(pid)))
 		return -1;
 
-	if (do_rtnl_req(rtsk, &req, req.nlh.nlmsg_len, nsid_cb, NULL, NULL, (void *) &id) < 0)
+	if (do_rtnl_req(rtsk, &req, req.nlh.nlmsg_len, nsid_cb, NULL, NULL, (void *)&id) < 0)
 		return -1;
 
 	if (id == INT_MIN)
@@ -3571,7 +3527,6 @@ int net_get_nsid(int rtsk, int pid, int *nsid)
 	return 0;
 }
 
-
 static int nsid_link_info(struct ns_id *ns, struct net_link *link, struct newlink_req *req)
 {
 	NetDeviceEntry *nde = link->nde;
@@ -3630,7 +3585,7 @@ static int check_link_nsid(int rtsk, void *args)
 	memset(&req, 0, sizeof(req));
 	req.nlh.nlmsg_len = sizeof(req);
 	req.nlh.nlmsg_type = RTM_GETLINK;
-	req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+	req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
 	req.nlh.nlmsg_pid = 0;
 	req.nlh.nlmsg_seq = CR_NLMSG_SEQ;
 	req.g.rtgen_family = AF_PACKET;
diff --git a/criu/netfilter.c b/criu/netfilter.c
index 368651c71..b9b013456 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -22,7 +22,8 @@ static char buf[512];
  * Any brave soul to write it using xtables-devel?
  */
 
-#define NF_CONN_CMD	"%s %s -t filter %s %s --protocol tcp " \
+#define NF_CONN_CMD                             \
+	"%s %s -t filter %s %s --protocol tcp " \
 	"-m mark ! --mark " __stringify(SOCCR_MARK) " --source %s --sport %d --destination %s --dport %d -j DROP"
 
 static char iptable_cmd_ipv4[] = "iptables";
@@ -40,10 +41,8 @@ void preload_netfilter_modules(void)
 		fd = -1;
 		pr_perror("failed to open /dev/null, using log fd for net module preload");
 	}
-	cr_system(fd, fd, fd, iptable_cmd_ipv4,
-		(char *[]) { iptable_cmd_ipv4, "-L", "-n", NULL}, 0);
-	cr_system(fd, fd, fd, iptable_cmd_ipv6,
-		(char *[]) { iptable_cmd_ipv6, "-L", "-n", NULL}, 0);
+	cr_system(fd, fd, fd, iptable_cmd_ipv4, (char *[]){ iptable_cmd_ipv4, "-L", "-n", NULL }, 0);
+	cr_system(fd, fd, fd, iptable_cmd_ipv6, (char *[]){ iptable_cmd_ipv6, "-L", "-n", NULL }, 0);
 	close_safe(&fd);
 }
 
@@ -53,9 +52,8 @@ static int ipv6_addr_mapped(u32 *addr)
 	return (addr[2] == htonl(0x0000ffff));
 }
 
-static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port,
-						u32 *dst_addr, u16 dst_port,
-						bool input, bool lock)
+static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port, u32 *dst_addr, u16 dst_port, bool input,
+				    bool lock)
 {
 	char sip[INET_ADDR_LEN], dip[INET_ADDR_LEN];
 	char *cmd;
@@ -81,16 +79,13 @@ static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port,
 	};
 
 	if (!inet_ntop(family, (void *)src_addr, sip, INET_ADDR_LEN) ||
-			!inet_ntop(family, (void *)dst_addr, dip, INET_ADDR_LEN)) {
+	    !inet_ntop(family, (void *)dst_addr, dip, INET_ADDR_LEN)) {
 		pr_perror("nf: Can't translate ip addr");
 		return -1;
 	}
 
-	snprintf(buf, sizeof(buf), NF_CONN_CMD, cmd,
-			kdat.has_xtlocks ? "-w" : "",
-			lock ? "-I" : "-D",
-			input ? "INPUT" : "OUTPUT",
-			dip, (int)dst_port, sip, (int)src_port);
+	snprintf(buf, sizeof(buf), NF_CONN_CMD, cmd, kdat.has_xtlocks ? "-w" : "", lock ? "-I" : "-D",
+		 input ? "INPUT" : "OUTPUT", dip, (int)dst_port, sip, (int)src_port);
 
 	pr_debug("\tRunning iptables [%s]\n", buf);
 
@@ -104,8 +99,7 @@ static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port,
 		return -1;
 	}
 
-	pr_info("%s %s:%d - %s:%d connection\n", lock ? "Locked" : "Unlocked",
-			sip, (int)src_port, dip, (int)dst_port);
+	pr_info("%s %s:%d - %s:%d connection\n", lock ? "Locked" : "Unlocked", sip, (int)src_port, dip, (int)dst_port);
 	return 0;
 }
 
@@ -113,19 +107,16 @@ static int nf_connection_switch(struct inet_sk_desc *sk, bool lock)
 {
 	int ret = 0;
 
-	ret = nf_connection_switch_raw(sk->sd.family,
-			sk->src_addr, sk->src_port,
-			sk->dst_addr, sk->dst_port, true, lock);
+	ret = nf_connection_switch_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port, true,
+				       lock);
 	if (ret)
 		return -1;
 
-	ret = nf_connection_switch_raw(sk->sd.family,
-			sk->dst_addr, sk->dst_port,
-			sk->src_addr, sk->src_port, false, lock);
+	ret = nf_connection_switch_raw(sk->sd.family, sk->dst_addr, sk->dst_port, sk->src_addr, sk->src_port, false,
+				       lock);
 	if (ret) /* rollback */
-		nf_connection_switch_raw(sk->sd.family,
-			sk->src_addr, sk->src_port,
-			sk->dst_addr, sk->dst_port, true, !lock);
+		nf_connection_switch_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port, true,
+					 !lock);
 	return ret;
 }
 
@@ -143,12 +134,10 @@ int nf_unlock_connection_info(struct inet_sk_info *si)
 {
 	int ret = 0;
 
-	ret |= nf_connection_switch_raw(si->ie->family,
-			si->ie->src_addr, si->ie->src_port,
-			si->ie->dst_addr, si->ie->dst_port, true, false);
-	ret |= nf_connection_switch_raw(si->ie->family,
-			si->ie->dst_addr, si->ie->dst_port,
-			si->ie->src_addr, si->ie->src_port, false, false);
+	ret |= nf_connection_switch_raw(si->ie->family, si->ie->src_addr, si->ie->src_port, si->ie->dst_addr,
+					si->ie->dst_port, true, false);
+	ret |= nf_connection_switch_raw(si->ie->family, si->ie->dst_addr, si->ie->dst_port, si->ie->src_addr,
+					si->ie->src_port, false, false);
 	/*
 	 * rollback nothing in case of any error,
 	 * because nobody checks errors of this function
diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index 439c180e4..5a7e50bc1 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -68,8 +68,7 @@ static inline int ppb_resize_pipe(struct page_pipe_buf *ppb)
 	return 0;
 }
 
-static struct page_pipe_buf *pp_prev_ppb(struct page_pipe *pp,
-					 unsigned int ppb_flags)
+static struct page_pipe_buf *pp_prev_ppb(struct page_pipe *pp, unsigned int ppb_flags)
 {
 	int type = 0;
 
@@ -86,8 +85,7 @@ static struct page_pipe_buf *pp_prev_ppb(struct page_pipe *pp,
 	return pp->prev[type];
 }
 
-static void pp_update_prev_ppb(struct page_pipe *pp, struct page_pipe_buf *ppb,
-			       unsigned int ppb_flags)
+static void pp_update_prev_ppb(struct page_pipe *pp, struct page_pipe_buf *ppb, unsigned int ppb_flags)
 {
 	int type = 0;
 
@@ -97,8 +95,7 @@ static void pp_update_prev_ppb(struct page_pipe *pp, struct page_pipe_buf *ppb,
 	pp->prev[type] = ppb;
 }
 
-static struct page_pipe_buf *ppb_alloc(struct page_pipe *pp,
-				       unsigned int ppb_flags)
+static struct page_pipe_buf *ppb_alloc(struct page_pipe *pp, unsigned int ppb_flags)
 {
 	struct page_pipe_buf *prev = pp_prev_ppb(pp, ppb_flags);
 	struct page_pipe_buf *ppb;
@@ -144,8 +141,7 @@ static void ppb_destroy(struct page_pipe_buf *ppb)
 	xfree(ppb);
 }
 
-static void ppb_init(struct page_pipe_buf *ppb, unsigned int pages_in,
-		     unsigned int nr_segs, unsigned int flags,
+static void ppb_init(struct page_pipe_buf *ppb, unsigned int pages_in, unsigned int nr_segs, unsigned int flags,
 		     struct iovec *iov)
 {
 	ppb->pages_in = pages_in;
@@ -249,8 +245,8 @@ void page_pipe_reinit(struct page_pipe *pp)
 		BUG(); /* It can't fail, because ppb is in free_bufs */
 }
 
-static inline int try_add_page_to(struct page_pipe *pp, struct page_pipe_buf *ppb,
-		unsigned long addr, unsigned int flags)
+static inline int try_add_page_to(struct page_pipe *pp, struct page_pipe_buf *ppb, unsigned long addr,
+				  unsigned int flags)
 {
 	if (ppb->flags != flags)
 		return 1;
@@ -259,10 +255,9 @@ static inline int try_add_page_to(struct page_pipe *pp, struct page_pipe_buf *pp
 		return 1;
 
 	if (ppb->nr_segs && iov_grow_page(&ppb->iov[ppb->nr_segs - 1], addr))
-			goto out;
+		goto out;
 
-	pr_debug("Add iov to page pipe (%u iovs, %u/%u total)\n",
-			ppb->nr_segs, pp->free_iov, pp->nr_iovs);
+	pr_debug("Add iov to page pipe (%u iovs, %u/%u total)\n", ppb->nr_segs, pp->free_iov, pp->nr_iovs);
 	iov_init(&ppb->iov[ppb->nr_segs++], addr);
 	pp->free_iov++;
 	BUG_ON(pp->free_iov > pp->nr_iovs);
@@ -271,15 +266,13 @@ out:
 	return 0;
 }
 
-static inline int try_add_page(struct page_pipe *pp, unsigned long addr,
-			       unsigned int flags)
+static inline int try_add_page(struct page_pipe *pp, unsigned long addr, unsigned int flags)
 {
 	BUG_ON(list_empty(&pp->bufs));
 	return try_add_page_to(pp, list_entry(pp->bufs.prev, struct page_pipe_buf, l), addr, flags);
 }
 
-int page_pipe_add_page(struct page_pipe *pp, unsigned long addr,
-		       unsigned int flags)
+int page_pipe_add_page(struct page_pipe *pp, unsigned long addr, unsigned int flags)
 {
 	int ret;
 
@@ -296,10 +289,9 @@ int page_pipe_add_page(struct page_pipe *pp, unsigned long addr,
 	return ret;
 }
 
-#define PP_HOLES_BATCH	32
+#define PP_HOLES_BATCH 32
 
-int page_pipe_add_hole(struct page_pipe *pp, unsigned long addr,
-		       unsigned int flags)
+int page_pipe_add_hole(struct page_pipe *pp, unsigned long addr, unsigned int flags)
 {
 	if (pp->free_hole >= pp->nr_holes) {
 		size_t new_size = (pp->nr_holes + PP_HOLES_BATCH) * sizeof(struct iovec);
@@ -313,8 +305,7 @@ int page_pipe_add_hole(struct page_pipe *pp, unsigned long addr,
 		pp->nr_holes += PP_HOLES_BATCH;
 	}
 
-	if (pp->free_hole &&
-	    pp->hole_flags[pp->free_hole - 1] == flags &&
+	if (pp->free_hole && pp->hole_flags[pp->free_hole - 1] == flags &&
 	    iov_grow_page(&pp->holes[pp->free_hole - 1], addr))
 		goto out;
 
@@ -330,8 +321,7 @@ out:
  * Get ppb and iov that contain addr and count amount of data between
  * beginning of the pipe belonging to the ppb and addr
  */
-static struct page_pipe_buf *get_ppb(struct page_pipe *pp, unsigned long addr,
-				     struct iovec **iov_ret,
+static struct page_pipe_buf *get_ppb(struct page_pipe *pp, unsigned long addr, struct iovec **iov_ret,
 				     unsigned long *len)
 {
 	struct page_pipe_buf *ppb;
@@ -384,8 +374,7 @@ int pipe_read_dest_init(struct pipe_read_dest *prd)
 	return 0;
 }
 
-int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd,
-		   unsigned long addr, unsigned int *nr_pages,
+int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned long addr, unsigned int *nr_pages,
 		   unsigned int ppb_flags)
 {
 	struct page_pipe_buf *ppb;
@@ -410,8 +399,7 @@ int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd,
 	}
 
 	/* clamp the request if it passes the end of iovec */
-	len = min((unsigned long)iov->iov_base + iov->iov_len - addr,
-		  (unsigned long)(*nr_pages) * PAGE_SIZE);
+	len = min((unsigned long)iov->iov_base + iov->iov_len - addr, (unsigned long)(*nr_pages) * PAGE_SIZE);
 	*nr_pages = len / PAGE_SIZE;
 
 	skip += ppb->pipe_off * PAGE_SIZE;
@@ -449,15 +437,13 @@ void debug_show_page_pipe(struct page_pipe *pp)
 		return;
 
 	pr_debug("Page pipe:\n");
-	pr_debug("* %u pipes %u/%u iovs:\n",
-			pp->nr_pipes, pp->free_iov, pp->nr_iovs);
+	pr_debug("* %u pipes %u/%u iovs:\n", pp->nr_pipes, pp->free_iov, pp->nr_iovs);
 	list_for_each_entry(ppb, &pp->bufs, l) {
-		pr_debug("\tbuf %u pages, %u iovs, flags: %x pipe_off: %x :\n",
-			 ppb->pages_in, ppb->nr_segs, ppb->flags, ppb->pipe_off);
+		pr_debug("\tbuf %u pages, %u iovs, flags: %x pipe_off: %x :\n", ppb->pages_in, ppb->nr_segs, ppb->flags,
+			 ppb->pipe_off);
 		for (i = 0; i < ppb->nr_segs; i++) {
 			iov = &ppb->iov[i];
-			pr_debug("\t\t%p %lu\n", iov->iov_base,
-					iov->iov_len / PAGE_SIZE);
+			pr_debug("\t\t%p %lu\n", iov->iov_base, iov->iov_len / PAGE_SIZE);
 		}
 	}
 
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 34f6a0967..9adf2c8b2 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -30,10 +30,10 @@
 static int page_server_sk = -1;
 
 struct page_server_iov {
-	u32	cmd;
-	u32	nr_pages;
-	u64	vaddr;
-	u64	dst_id;
+	u32 cmd;
+	u32 nr_pages;
+	u64 vaddr;
+	u64 dst_id;
 };
 
 static void psi2iovec(struct page_server_iov *ps, struct iovec *iov)
@@ -42,25 +42,25 @@ static void psi2iovec(struct page_server_iov *ps, struct iovec *iov)
 	iov->iov_len = ps->nr_pages * PAGE_SIZE;
 }
 
-#define PS_IOV_ADD	1
-#define PS_IOV_HOLE	2
-#define PS_IOV_OPEN	3
-#define PS_IOV_OPEN2	4
-#define PS_IOV_PARENT	5
-#define PS_IOV_ADD_F	6
-#define PS_IOV_GET	7
+#define PS_IOV_ADD    1
+#define PS_IOV_HOLE   2
+#define PS_IOV_OPEN   3
+#define PS_IOV_OPEN2  4
+#define PS_IOV_PARENT 5
+#define PS_IOV_ADD_F  6
+#define PS_IOV_GET    7
 
-#define PS_IOV_FLUSH		0x1023
-#define PS_IOV_FLUSH_N_CLOSE	0x1024
+#define PS_IOV_FLUSH	     0x1023
+#define PS_IOV_FLUSH_N_CLOSE 0x1024
 
-#define PS_CMD_BITS	16
-#define PS_CMD_MASK	((1 << PS_CMD_BITS) - 1)
+#define PS_CMD_BITS 16
+#define PS_CMD_MASK ((1 << PS_CMD_BITS) - 1)
 
-#define PS_TYPE_BITS	8
-#define PS_TYPE_MASK	((1 << PS_TYPE_BITS) - 1)
+#define PS_TYPE_BITS 8
+#define PS_TYPE_MASK ((1 << PS_TYPE_BITS) - 1)
 
-#define PS_TYPE_PID	(1)
-#define PS_TYPE_SHMEM	(2)
+#define PS_TYPE_PID   (1)
+#define PS_TYPE_SHMEM (2)
 /*
  * XXX: When adding new types here check decode_pm for legacy
  * numbers that can be met from older CRIUs
@@ -158,31 +158,26 @@ static inline int send_psi(int sk, struct page_server_iov *pi)
 }
 
 /* page-server xfer */
-static int write_pages_to_server(struct page_xfer *xfer,
-		int p, unsigned long len)
+static int write_pages_to_server(struct page_xfer *xfer, int p, unsigned long len)
 {
 	ssize_t ret, left = len;
 
 	if (opts.tls) {
-		pr_debug("Sending %lu bytes / %lu pages\n",
-			len, len / PAGE_SIZE);
+		pr_debug("Sending %lu bytes / %lu pages\n", len, len / PAGE_SIZE);
 
 		if (tls_send_data_from_fd(p, len))
 			return -1;
 	} else {
-		pr_debug("Splicing %lu bytes / %lu pages into socket\n",
-			len, len / PAGE_SIZE);
+		pr_debug("Splicing %lu bytes / %lu pages into socket\n", len, len / PAGE_SIZE);
 
 		while (left > 0) {
-			ret = splice(p, NULL, xfer->sk, NULL, left,
-					SPLICE_F_MOVE);
+			ret = splice(p, NULL, xfer->sk, NULL, left, SPLICE_F_MOVE);
 			if (ret < 0) {
 				pr_perror("Can't write pages to socket");
 				return -1;
 			}
 
-			pr_debug("\tSpliced: %lu bytes sent\n",
-				(unsigned long)ret);
+			pr_debug("\tSpliced: %lu bytes sent\n", (unsigned long)ret);
 			left -= ret;
 		}
 	}
@@ -236,14 +231,13 @@ static int open_page_server_xfer(struct page_xfer *xfer, int fd_type, unsigned l
 	}
 
 	if (has_parent)
-		xfer->parent = (void *) 1; /* This is required for generate_iovs() */
+		xfer->parent = (void *)1; /* This is required for generate_iovs() */
 
 	return 0;
 }
 
 /* local xfer */
-static int write_pages_loc(struct page_xfer *xfer,
-		int p, unsigned long len)
+static int write_pages_loc(struct page_xfer *xfer, int p, unsigned long len)
 {
 	ssize_t ret;
 	ssize_t curr = 0;
@@ -291,7 +285,7 @@ static int check_pagehole_in_parent(struct page_read *p, struct iovec *iov)
 			return -1;
 		}
 
-		pr_debug("\tFound %"PRIx64"/%lu\n", p->pe->vaddr, pagemap_len(p->pe));
+		pr_debug("\tFound %" PRIx64 "/%lu\n", p->pe->vaddr, pagemap_len(p->pe));
 
 		/*
 		 * The pagemap entry in parent may happen to be
@@ -320,8 +314,7 @@ static int write_pagemap_loc(struct page_xfer *xfer, struct iovec *iov, u32 flag
 
 	if (flags & PE_PRESENT) {
 		if (opts.auto_dedup && xfer->parent != NULL) {
-			ret = dedup_one_iovec(xfer->parent, pe.vaddr,
-					      pagemap_len(&pe));
+			ret = dedup_one_iovec(xfer->parent, pe.vaddr, pagemap_len(&pe));
 			if (ret == -1) {
 				pr_perror("Auto-deduplication failed");
 				return ret;
@@ -331,8 +324,7 @@ static int write_pagemap_loc(struct page_xfer *xfer, struct iovec *iov, u32 flag
 		if (xfer->parent != NULL) {
 			ret = check_pagehole_in_parent(xfer->parent, iov);
 			if (ret) {
-				pr_err("Hole %p/%zu not found in parent\n",
-				       iov->iov_base, iov->iov_len);
+				pr_err("Hole %p/%zu not found in parent\n", iov->iov_base, iov->iov_len);
 				return -1;
 			}
 		}
@@ -430,13 +422,11 @@ int open_page_xfer(struct page_xfer *xfer, int fd_type, unsigned long img_id)
 		return open_page_local_xfer(xfer, fd_type, img_id);
 }
 
-static int page_xfer_dump_hole(struct page_xfer *xfer,
-			       struct iovec *hole, u32 flags)
+static int page_xfer_dump_hole(struct page_xfer *xfer, struct iovec *hole, u32 flags)
 {
 	BUG_ON(hole->iov_base < (void *)xfer->offset);
 	hole->iov_base -= xfer->offset;
-	pr_debug("\th %p [%u]\n", hole->iov_base,
-			(unsigned int)(hole->iov_len / PAGE_SIZE));
+	pr_debug("\th %p [%u]\n", hole->iov_base, (unsigned int)(hole->iov_len / PAGE_SIZE));
 
 	if (xfer->write_pagemap(xfer, hole, flags))
 		return -1;
@@ -456,12 +446,11 @@ static int get_hole_flags(struct page_pipe *pp, int n)
 	return -1;
 }
 
-static int dump_holes(struct page_xfer *xfer, struct page_pipe *pp,
-		      unsigned int *cur_hole, void *limit)
+static int dump_holes(struct page_xfer *xfer, struct page_pipe *pp, unsigned int *cur_hole, void *limit)
 {
 	int ret;
 
-	for (; *cur_hole < pp->free_hole ; (*cur_hole)++) {
+	for (; *cur_hole < pp->free_hole; (*cur_hole)++) {
 		struct iovec hole = pp->holes[*cur_hole];
 		u32 hole_flags;
 
@@ -627,11 +616,8 @@ static inline u32 ppb_xfer_flags(struct page_xfer *xfer, struct page_pipe_buf *p
  *	aux_iov: {A,1}{B,1}{C,2}*{C+3,1}*
  */
 
-unsigned long handle_faulty_iov(int pid, struct iovec* riov,
-				unsigned long faulty_index,
-				struct iovec *bufvec, struct iovec* aux_iov,
-				unsigned long* aux_len,
-				unsigned long partial_read_bytes)
+unsigned long handle_faulty_iov(int pid, struct iovec *riov, unsigned long faulty_index, struct iovec *bufvec,
+				struct iovec *aux_iov, unsigned long *aux_len, unsigned long partial_read_bytes)
 {
 	struct iovec dummy;
 	ssize_t bytes_read;
@@ -645,7 +631,7 @@ unsigned long handle_faulty_iov(int pid, struct iovec* riov,
 	}
 
 	/* Handling Case 3-Part 3.2*/
-	offset = (partial_read_bytes)? partial_read_bytes : PAGE_SIZE;
+	offset = (partial_read_bytes) ? partial_read_bytes : PAGE_SIZE;
 
 	dummy.iov_base = riov[faulty_index].iov_base + offset;
 	dummy.iov_len = riov[faulty_index].iov_len - offset;
@@ -654,10 +640,9 @@ unsigned long handle_faulty_iov(int pid, struct iovec* riov,
 		cnt_sub(CNT_PAGES_WRITTEN, 1);
 
 	while (dummy.iov_len) {
-
 		bytes_read = process_vm_readv(pid, bufvec, 1, &dummy, 1, 0);
 
-		if(bytes_read == -1) {
+		if (bytes_read == -1) {
 			/* Handling faulty page read in faulty iov */
 			cnt_sub(CNT_PAGES_WRITTEN, 1);
 			dummy.iov_base += PAGE_SIZE;
@@ -666,9 +651,8 @@ unsigned long handle_faulty_iov(int pid, struct iovec* riov,
 		}
 
 		/* If aux-iov can merge and expand or new entry required */
-		if (aux_iov[(*aux_len)-1].iov_base +
-			aux_iov[(*aux_len)-1].iov_len == dummy.iov_base)
-			aux_iov[(*aux_len)-1].iov_len += bytes_read;
+		if (aux_iov[(*aux_len) - 1].iov_base + aux_iov[(*aux_len) - 1].iov_len == dummy.iov_base)
+			aux_iov[(*aux_len) - 1].iov_len += bytes_read;
 		else {
 			aux_iov[*aux_len].iov_base = dummy.iov_base;
 			aux_iov[*aux_len].iov_len = bytes_read;
@@ -690,8 +674,7 @@ unsigned long handle_faulty_iov(int pid, struct iovec* riov,
  * successfully read iov in iovec. In case of partial read it
  * returns partial_read_bytes, otherwise 0.
  */
-static unsigned long analyze_iov(ssize_t bytes_read, struct iovec* riov,
-				 unsigned long *index, struct iovec *aux_iov,
+static unsigned long analyze_iov(ssize_t bytes_read, struct iovec *riov, unsigned long *index, struct iovec *aux_iov,
 				 unsigned long *aux_len)
 {
 	ssize_t processed_bytes = 0;
@@ -699,7 +682,6 @@ static unsigned long analyze_iov(ssize_t bytes_read, struct iovec* riov,
 
 	/* correlating iovs with read bytes */
 	while (processed_bytes < bytes_read) {
-
 		processed_bytes += riov[*index].iov_len;
 		aux_iov[*aux_len].iov_base = riov[*index].iov_base;
 		aux_iov[*aux_len].iov_len = riov[*index].iov_len;
@@ -710,12 +692,10 @@ static unsigned long analyze_iov(ssize_t bytes_read, struct iovec* riov,
 
 	/* handling partially processed faulty iov*/
 	if (processed_bytes - bytes_read) {
-
 		(*index) -= 1;
 
-		partial_read_bytes = riov[*index].iov_len
-					- (processed_bytes - bytes_read);
-		aux_iov[*aux_len-1].iov_len = partial_read_bytes;
+		partial_read_bytes = riov[*index].iov_len - (processed_bytes - bytes_read);
+		aux_iov[*aux_len - 1].iov_len = partial_read_bytes;
 	}
 
 	return partial_read_bytes;
@@ -736,10 +716,8 @@ static unsigned long analyze_iov(ssize_t bytes_read, struct iovec* riov,
  * skip processing further any entry in iovec. This is handled by
  * handle_faulty_iov function.
  */
-static long fill_userbuf(int pid, struct page_pipe_buf *ppb,
-				  struct iovec *bufvec,
-				  struct iovec* aux_iov,
-				  unsigned long *aux_len)
+static long fill_userbuf(int pid, struct page_pipe_buf *ppb, struct iovec *bufvec, struct iovec *aux_iov,
+			 unsigned long *aux_len)
 {
 	struct iovec *riov = ppb->iov;
 	ssize_t bytes_read;
@@ -748,9 +726,7 @@ static long fill_userbuf(int pid, struct page_pipe_buf *ppb,
 	unsigned long partial_read_bytes = 0;
 
 	while (start < ppb->nr_segs) {
-
-		bytes_read = process_vm_readv(pid, bufvec, 1, &riov[start],
-						   ppb->nr_segs - start, 0);
+		bytes_read = process_vm_readv(pid, bufvec, 1, &riov[start], ppb->nr_segs - start, 0);
 
 		if (bytes_read == -1) {
 			/* Handling Case 1*/
@@ -767,9 +743,7 @@ static long fill_userbuf(int pid, struct page_pipe_buf *ppb,
 		partial_read_bytes = 0;
 
 		if (bytes_read > 0) {
-			partial_read_bytes = analyze_iov(bytes_read, riov,
-							 &start, aux_iov,
-							 aux_len);
+			partial_read_bytes = analyze_iov(bytes_read, riov, &start, aux_iov, aux_len);
 			bufvec->iov_base += bytes_read;
 			bufvec->iov_len -= bytes_read;
 			total_read += bytes_read;
@@ -780,9 +754,7 @@ static long fill_userbuf(int pid, struct page_pipe_buf *ppb,
 		 * it means some iov in between has failed.
 		 */
 		if (start < ppb->nr_segs)
-			total_read += handle_faulty_iov(pid, riov, start, bufvec,
-							aux_iov, aux_len,
-							partial_read_bytes);
+			total_read += handle_faulty_iov(pid, riov, start, bufvec, aux_iov, aux_len, partial_read_bytes);
 
 		start += 1;
 	}
@@ -800,8 +772,7 @@ static long fill_userbuf(int pid, struct page_pipe_buf *ppb,
  * along with unmodified entries are present in aux_iov array.
  */
 
-int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
-				     struct page_pipe *pp)
+int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *pp)
 {
 	struct page_pipe_buf *ppb;
 	unsigned int cur_hole = 0, i;
@@ -811,8 +782,7 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 	struct iovec aux_iov[PIPE_MAX_SIZE];
 	unsigned long aux_len;
 
-	char *userbuf = mmap(NULL, BUFFER_SIZE, PROT_READ | PROT_WRITE,
-						MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+	char *userbuf = mmap(NULL, BUFFER_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 
 	if (userbuf == MAP_FAILED) {
 		pr_perror("Unable to mmap a buffer");
@@ -820,7 +790,6 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 	}
 
 	list_for_each_entry(ppb, &pp->bufs, l) {
-
 		timing_start(TIME_MEMDUMP);
 
 		aux_len = 0;
@@ -849,7 +818,6 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 
 		/* generating pagemap */
 		for (i = 0; i < aux_len; i++) {
-
 			struct iovec iov = aux_iov[i];
 			u32 flags;
 
@@ -861,8 +829,7 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer,
 
 			BUG_ON(iov.iov_base < (void *)xfer->offset);
 			iov.iov_base -= xfer->offset;
-			pr_debug("\t p %p [%u]\n", iov.iov_base,
-				(unsigned int)(iov.iov_len / PAGE_SIZE));
+			pr_debug("\t p %p [%u]\n", iov.iov_base, (unsigned int)(iov.iov_len / PAGE_SIZE));
 
 			flags = ppb_xfer_flags(xfer, ppb);
 
@@ -909,15 +876,13 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp)
 
 			BUG_ON(iov.iov_base < (void *)xfer->offset);
 			iov.iov_base -= xfer->offset;
-			pr_debug("\tp %p [%u]\n", iov.iov_base,
-					(unsigned int)(iov.iov_len / PAGE_SIZE));
+			pr_debug("\tp %p [%u]\n", iov.iov_base, (unsigned int)(iov.iov_len / PAGE_SIZE));
 
 			flags = ppb_xfer_flags(xfer, ppb);
 
 			if (xfer->write_pagemap(xfer, &iov, flags))
 				return -1;
-			if ((flags & PE_PRESENT) && xfer->write_pages(xfer,
-						ppb->p[0], iov.iov_len))
+			if ((flags & PE_PRESENT) && xfer->write_pages(xfer, ppb->p[0], iov.iov_len))
 				return -1;
 		}
 	}
@@ -1012,8 +977,8 @@ int check_parent_page_xfer(int fd_type, unsigned long img_id)
 }
 
 struct page_xfer_job {
-	u64	dst_id;
-	int	p[2];
+	u64 dst_id;
+	int p[2];
 	unsigned pipe_size;
 	struct page_xfer loc_xfer;
 };
@@ -1084,7 +1049,7 @@ static int page_server_add(int sk, struct page_server_iov *pi, u32 flags)
 	struct page_xfer *lxfer = &cxfer.loc_xfer;
 	struct iovec iov;
 
-	pr_debug("Adding %"PRIx64"/%u\n", pi->vaddr, pi->nr_pages);
+	pr_debug("Adding %" PRIx64 "/%u\n", pi->vaddr, pi->nr_pages);
 
 	if (prep_loc_xfer(pi))
 		return -1;
@@ -1119,13 +1084,12 @@ static int page_server_add(int sk, struct page_server_iov *pi, u32 flags)
 		}
 
 		if (opts.tls) {
-			if(tls_recv_data_to_fd(cxfer.p[1], chunk)) {
+			if (tls_recv_data_to_fd(cxfer.p[1], chunk)) {
 				pr_err("Can't read from socket\n");
 				return -1;
 			}
 		} else {
-			chunk = splice(sk, NULL, cxfer.p[1], NULL, chunk,
-					SPLICE_F_MOVE | SPLICE_F_NONBLOCK);
+			chunk = splice(sk, NULL, cxfer.p[1], NULL, chunk, SPLICE_F_MOVE | SPLICE_F_NONBLOCK);
 
 			if (chunk < 0) {
 				pr_perror("Can't read from socket");
@@ -1156,8 +1120,7 @@ static int page_server_get_pages(int sk, struct page_server_iov *pi)
 	item = pstree_item_by_virt(pi->dst_id);
 	pp = dmpi(item)->mem_pp;
 
-	ret = page_pipe_read(pp, &pipe_read_dest, pi->vaddr,
-			     &pi->nr_pages, PPB_LAZY);
+	ret = page_pipe_read(pp, &pipe_read_dest, pi->vaddr, &pi->nr_pages, PPB_LAZY);
 	if (ret)
 		return ret;
 
@@ -1181,8 +1144,7 @@ static int page_server_get_pages(int sk, struct page_server_iov *pi)
 		if (tls_send_data_from_fd(pipe_read_dest.p[0], len))
 			return -1;
 	} else {
-		ret = splice(pipe_read_dest.p[0], NULL, sk, NULL, len,
-			SPLICE_F_MOVE);
+		ret = splice(pipe_read_dest.p[0], NULL, sk, NULL, len, SPLICE_F_MOVE);
 		if (ret != len)
 			return -1;
 	}
@@ -1248,23 +1210,21 @@ static int page_server_serve(int sk)
 			break;
 		case PS_IOV_ADD_F:
 		case PS_IOV_ADD:
-		case PS_IOV_HOLE:
-		{
+		case PS_IOV_HOLE: {
 			u32 flags;
 
 			if (likely(cmd == PS_IOV_ADD_F))
 				flags = decode_ps_flags(pi.cmd);
 			else if (cmd == PS_IOV_ADD)
 				flags = PE_PRESENT;
-			else    /* PS_IOV_HOLE */
+			else /* PS_IOV_HOLE */
 				flags = PE_PARENT;
 
 			ret = page_server_add(sk, &pi, flags);
 			break;
 		}
 		case PS_IOV_FLUSH:
-		case PS_IOV_FLUSH_N_CLOSE:
-		{
+		case PS_IOV_FLUSH_N_CLOSE: {
 			int32_t status = 0;
 
 			ret = 0;
@@ -1347,8 +1307,8 @@ static int fill_page_pipe(struct page_read *pr, struct page_pipe *pp)
 		for (i = 0; i < ppb->nr_segs; i++) {
 			struct iovec iov = ppb->iov[i];
 
-			if (splice(img_raw_fd(pr->pi), NULL, ppb->p[1], NULL,
-				   iov.iov_len, SPLICE_F_MOVE) != iov.iov_len) {
+			if (splice(img_raw_fd(pr->pi), NULL, ppb->p[1], NULL, iov.iov_len, SPLICE_F_MOVE) !=
+			    iov.iov_len) {
 				pr_perror("Splice failed");
 				return -1;
 			}
@@ -1447,7 +1407,7 @@ int cr_page_server(bool daemon_mode, bool lazy_dump, int cfd)
 no_server:
 
 	if (!daemon_mode && cfd >= 0) {
-		struct ps_info info = {.pid = getpid(), .port = opts.port};
+		struct ps_info info = { .pid = getpid(), .port = opts.port };
 		int count;
 
 		count = write(cfd, &info, sizeof(info));
@@ -1512,7 +1472,7 @@ int connect_to_page_server_to_send(void)
 
 int disconnect_from_page_server(void)
 {
-	struct page_server_iov pi = { };
+	struct page_server_iov pi = {};
 	int32_t status = -1;
 	int ret = -1;
 
@@ -1547,7 +1507,7 @@ out:
 	tls_terminate_session();
 	close_safe(&page_server_sk);
 
-	return ret ? : status;
+	return ret ?: status;
 }
 
 struct ps_async_read {
@@ -1572,8 +1532,8 @@ static inline void async_read_set_goal(struct ps_async_read *ar, int nr_pages)
 	ar->nr_pages = nr_pages;
 }
 
-static void init_ps_async_read(struct ps_async_read *ar, void *buf,
-		int nr_pages, ps_async_read_complete complete, void *priv)
+static void init_ps_async_read(struct ps_async_read *ar, void *buf, int nr_pages, ps_async_read_complete complete,
+			       void *priv)
 {
 	ar->pages = buf;
 	ar->rb = 0;
@@ -1582,8 +1542,7 @@ static void init_ps_async_read(struct ps_async_read *ar, void *buf,
 	async_read_set_goal(ar, nr_pages);
 }
 
-static int page_server_start_async_read(void *buf, int nr_pages,
-		ps_async_read_complete complete, void *priv)
+static int page_server_start_async_read(void *buf, int nr_pages, ps_async_read_complete complete, void *priv)
 {
 	struct ps_async_read *ar;
 
@@ -1641,8 +1600,7 @@ static int page_server_read(struct ps_async_read *ar, int flags)
 	 * IO complete -- notify the caller and drop the request
 	 */
 	BUG_ON(ar->rb > ar->goal);
-	return ar->complete((int)ar->pi.dst_id, (unsigned long)ar->pi.vaddr,
-				(int)ar->pi.nr_pages, ar->priv);
+	return ar->complete((int)ar->pi.dst_id, (unsigned long)ar->pi.vaddr, (int)ar->pi.nr_pages, ar->priv);
 }
 
 static int page_server_async_read(struct epoll_rfd *f)
@@ -1687,10 +1645,10 @@ int connect_to_page_server_to_recv(int epfd)
 int request_remote_pages(unsigned long img_id, unsigned long addr, int nr_pages)
 {
 	struct page_server_iov pi = {
-		.cmd		= PS_IOV_GET,
-		.nr_pages	= nr_pages,
-		.vaddr		= addr,
-		.dst_id		= img_id,
+		.cmd = PS_IOV_GET,
+		.nr_pages = nr_pages,
+		.vaddr = addr,
+		.dst_id = img_id,
 	};
 
 	/* XXX: why MSG_DONTWAIT here? */
@@ -1701,8 +1659,7 @@ int request_remote_pages(unsigned long img_id, unsigned long addr, int nr_pages)
 	return 0;
 }
 
-static int page_server_start_sync_read(void *buf, int nr,
-		ps_async_read_complete complete, void *priv)
+static int page_server_start_sync_read(void *buf, int nr, ps_async_read_complete complete, void *priv)
 {
 	struct ps_async_read ar;
 	int ret = 1;
@@ -1713,8 +1670,7 @@ static int page_server_start_sync_read(void *buf, int nr,
 	return ret;
 }
 
-int page_server_start_read(void *buf, int nr,
-		ps_async_read_complete complete, void *priv, unsigned flags)
+int page_server_start_read(void *buf, int nr, ps_async_read_complete complete, void *priv, unsigned flags)
 {
 	if (flags & PR_ASYNC)
 		return page_server_start_async_read(buf, nr, complete, priv);
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index d7915f99c..00f088ff3 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -11,16 +11,16 @@
 #include "mem.h"
 #include "kerndat.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "pagemap-cache: "
 
 /* To carry up to 2M of physical memory */
-#define PMC_SHIFT		(21)
-#define PMC_SIZE		(1ul << PMC_SHIFT)
-#define PMC_MASK		(~(PMC_SIZE - 1))
-#define PMC_SIZE_GAP		(PMC_SIZE / 4)
+#define PMC_SHIFT    (21)
+#define PMC_SIZE     (1ul << PMC_SHIFT)
+#define PMC_MASK     (~(PMC_SIZE - 1))
+#define PMC_SIZE_GAP (PMC_SIZE / 4)
 
-#define PAGEMAP_LEN(addr)	(PAGE_PFN(addr) * sizeof(u64))
+#define PAGEMAP_LEN(addr) (PAGE_PFN(addr) * sizeof(u64))
 
 /*
  * It's a workaround for a kernel bug. In the 3.19 kernel when pagemap are read
@@ -47,9 +47,9 @@ int pmc_init(pmc_t *pmc, pid_t pid, const struct list_head *vma_head, size_t siz
 
 	BUG_ON(!vma_head);
 
-	pmc->pid	= pid;
-	pmc->map_len	= PAGEMAP_LEN(map_size);
-	pmc->vma_head	= vma_head;
+	pmc->pid = pid;
+	pmc->map_len = PAGEMAP_LEN(map_size);
+	pmc->vma_head = vma_head;
 
 	pmc->map = xmalloc(pmc->map_len);
 	if (!pmc->map)
@@ -105,8 +105,8 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 	pmc->start = vma->e->start;
 	pmc->end = vma->e->end;
 
-	pr_debug("%d: filling VMA %lx-%lx (%zuK) [l:%lx h:%lx]\n",
-		 pmc->pid, (long)vma->e->start, (long)vma->e->end, len >> 10, low, high);
+	pr_debug("%d: filling VMA %lx-%lx (%zuK) [l:%lx h:%lx]\n", pmc->pid, (long)vma->e->start, (long)vma->e->end,
+		 len >> 10, low, high);
 
 	/*
 	 * If we meet a small VMA, lets try to fit 2M cache
@@ -118,13 +118,12 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 	 * The benefit (apart redusing the number of read() calls)
 	 * is to walk page tables less.
 	 */
-	if (!pagemap_cache_disabled &&
-	    len < PMC_SIZE && (vma->e->start - low) < PMC_SIZE_GAP) {
+	if (!pagemap_cache_disabled && len < PMC_SIZE && (vma->e->start - low) < PMC_SIZE_GAP) {
 		size_t size_cov = len;
 		size_t nr_vmas = 1;
 
-		pr_debug("\t%d: %16lx-%-16lx nr:%-5zu cov:%zu\n",
-			 pmc->pid, (long)vma->e->start, (long)vma->e->end, nr_vmas, size_cov);
+		pr_debug("\t%d: %16lx-%-16lx nr:%-5zu cov:%zu\n", pmc->pid, (long)vma->e->start, (long)vma->e->end,
+			 nr_vmas, size_cov);
 
 		list_for_each_entry_continue(vma, pmc->vma_head, list) {
 			if (vma->e->start > high || vma->e->end > high)
@@ -134,8 +133,8 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 			size_cov += vma_area_len(vma);
 			nr_vmas++;
 
-			pr_debug("\t%d: %16lx-%-16lx nr:%-5zu cov:%zu\n",
-				 pmc->pid, (long)vma->e->start, (long)vma->e->end, nr_vmas, size_cov);
+			pr_debug("\t%d: %16lx-%-16lx nr:%-5zu cov:%zu\n", pmc->pid, (long)vma->e->start,
+				 (long)vma->e->end, nr_vmas, size_cov);
 		}
 
 		if (nr_vmas > 1) {
@@ -171,8 +170,7 @@ u64 *pmc_get_map(pmc_t *pmc, const struct vma_area *vma)
 
 	/* Miss, refill the cache */
 	if (pmc_fill_cache(pmc, vma)) {
-		pr_err("Failed to fill cache for %d (%lx-%lx)\n",
-		       pmc->pid, (long)vma->e->start, (long)vma->e->end);
+		pr_err("Failed to fill cache for %d (%lx-%lx)\n", pmc->pid, (long)vma->e->start, (long)vma->e->end);
 		return NULL;
 	}
 
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 1d849a1b9..77e519dd1 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -20,8 +20,8 @@
 #include "images/pagemap.pb-c.h"
 
 #ifndef SEEK_DATA
-#define SEEK_DATA	3
-#define SEEK_HOLE	4
+#define SEEK_DATA 3
+#define SEEK_HOLE 4
 #endif
 
 #define MAX_BUNCH_SIZE 256
@@ -30,32 +30,30 @@
  * One "job" for the preadv() syscall in pagemap.c
  */
 struct page_read_iov {
-	off_t from;		/* offset in pi file where to start reading from */
-	off_t end;		/* the end of the read == sum to.iov_len -s */
-	struct iovec *to;	/* destination iovs */
-	unsigned int nr;	/* their number */
+	off_t from; /* offset in pi file where to start reading from */
+	off_t end; /* the end of the read == sum to.iov_len -s */
+	struct iovec *to; /* destination iovs */
+	unsigned int nr; /* their number */
 
 	struct list_head l;
 };
 
-static inline bool can_extend_bunch(struct iovec *bunch,
-		unsigned long off, unsigned long len)
+static inline bool can_extend_bunch(struct iovec *bunch, unsigned long off, unsigned long len)
 {
-	return  /* The next region is the continuation of the existing */
+	return /* The next region is the continuation of the existing */
 		((unsigned long)bunch->iov_base + bunch->iov_len == off) &&
 		/* The resulting region is non empty and is small enough */
 		(bunch->iov_len == 0 || bunch->iov_len + len < MAX_BUNCH_SIZE * PAGE_SIZE);
 }
 
-static int punch_hole(struct page_read *pr, unsigned long off,
-		      unsigned long len, bool cleanup)
+static int punch_hole(struct page_read *pr, unsigned long off, unsigned long len, bool cleanup)
 {
 	int ret;
-	struct iovec * bunch = &pr->bunch;
+	struct iovec *bunch = &pr->bunch;
 
 	if (!cleanup && can_extend_bunch(bunch, off, len)) {
-		pr_debug("pr%lu-%u:Extend bunch len from %zu to %lu\n", pr->img_id,
-			 pr->id, bunch->iov_len, bunch->iov_len + len);
+		pr_debug("pr%lu-%u:Extend bunch len from %zu to %lu\n", pr->img_id, pr->id, bunch->iov_len,
+			 bunch->iov_len + len);
 		bunch->iov_len += len;
 	} else {
 		if (bunch->iov_len > 0) {
@@ -82,17 +80,15 @@ int dedup_one_iovec(struct page_read *pr, unsigned long off, unsigned long len)
 	while (1) {
 		int ret;
 		unsigned long piov_end;
-		struct page_read * prp;
+		struct page_read *prp;
 
 		ret = pr->seek_pagemap(pr, off);
 		if (ret == 0) {
 			if (off < pr->cvaddr && pr->cvaddr < iov_end) {
-				pr_debug("pr%lu-%u:No range %lx-%lx in pagemap\n",
-					 pr->img_id, pr->id, off, pr->cvaddr);
+				pr_debug("pr%lu-%u:No range %lx-%lx in pagemap\n", pr->img_id, pr->id, off, pr->cvaddr);
 				off = pr->cvaddr;
 			} else {
-				pr_debug("pr%lu-%u:No range %lx-%lx in pagemap\n",
-					 pr->img_id, pr->id, off, iov_end);
+				pr_debug("pr%lu-%u:No range %lx-%lx in pagemap\n", pr->img_id, pr->id, off, iov_end);
 				return 0;
 			}
 		}
@@ -109,8 +105,7 @@ int dedup_one_iovec(struct page_read *pr, unsigned long off, unsigned long len)
 		prp = pr->parent;
 		if (prp) {
 			/* recursively */
-			pr_debug("pr%lu-%u:Go to next parent level\n",
-				 pr->img_id, pr->id);
+			pr_debug("pr%lu-%u:Go to next parent level\n", pr->img_id, pr->id);
 			len = min(piov_end, iov_end) - off;
 			ret = dedup_one_iovec(prp, off, len);
 			if (ret != 0)
@@ -167,8 +162,7 @@ static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
 
 		if (end <= vaddr)
 			skip_pagemap_pages(pr, end - pr->cvaddr);
-adv:
-		; /* otherwise "label at end of compound stmt" gcc error */
+	adv:; /* otherwise "label at end of compound stmt" gcc error */
 	} while (advance(pr));
 
 	return 0;
@@ -177,14 +171,12 @@ adv:
 static inline void pagemap_bound_check(PagemapEntry *pe, unsigned long vaddr, int nr)
 {
 	if (vaddr < pe->vaddr || (vaddr - pe->vaddr) / PAGE_SIZE + nr > pe->nr_pages) {
-		pr_err("Page read err %"PRIx64":%u vs %lx:%u\n",
-				pe->vaddr, pe->nr_pages, vaddr, nr);
+		pr_err("Page read err %" PRIx64 ":%u vs %lx:%u\n", pe->vaddr, pe->nr_pages, vaddr, nr);
 		BUG();
 	}
 }
 
-static int read_parent_page(struct page_read *pr, unsigned long vaddr,
-			    int nr, void *buf, unsigned flags)
+static int read_parent_page(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
 {
 	struct page_read *ppr = pr->parent;
 	int ret;
@@ -239,8 +231,7 @@ static int read_parent_page(struct page_read *pr, unsigned long vaddr,
 	return 0;
 }
 
-static int read_local_page(struct page_read *pr, unsigned long vaddr,
-			   unsigned long len, void *buf)
+static int read_local_page(struct page_read *pr, unsigned long vaddr, unsigned long len, void *buf)
 {
 	int fd;
 	ssize_t ret;
@@ -258,7 +249,7 @@ static int read_local_page(struct page_read *pr, unsigned long vaddr,
 	if (pr->sync(pr))
 		return -1;
 
-	pr_debug("\tpr%lu-%u Read page from self %lx/%"PRIx64"\n", pr->img_id, pr->id, pr->cvaddr, pr->pi_off);
+	pr_debug("\tpr%lu-%u Read page from self %lx/%" PRIx64 "\n", pr->img_id, pr->id, pr->cvaddr, pr->pi_off);
 	while (1) {
 		ret = pread(fd, buf + curr, len - curr, pr->pi_off + curr);
 		if (ret < 1) {
@@ -279,8 +270,7 @@ static int read_local_page(struct page_read *pr, unsigned long vaddr,
 	return 0;
 }
 
-static int enqueue_async_iov(struct page_read *pr, void *buf,
-		unsigned long len, struct list_head *to)
+static int enqueue_async_iov(struct page_read *pr, void *buf, unsigned long len, struct list_head *to)
 {
 	struct page_read_iov *pr_iov;
 	struct iovec *iov;
@@ -319,8 +309,7 @@ int pagemap_render_iovec(struct list_head *from, struct task_restore_args *ta)
 	list_for_each_entry(piov, from, l) {
 		struct restore_vma_io *rio;
 
-		pr_info("`- render %d iovs (%p:%zd...)\n", piov->nr,
-				piov->to[0].iov_base, piov->to[0].iov_len);
+		pr_info("`- render %d iovs (%p:%zd...)\n", piov->nr, piov->to[0].iov_base, piov->to[0].iov_len);
 		rio = rst_mem_alloc(RIO_SIZE(piov->nr), RM_PRIVATE);
 		if (!rio)
 			return -1;
@@ -335,8 +324,7 @@ int pagemap_render_iovec(struct list_head *from, struct task_restore_args *ta)
 	return 0;
 }
 
-int pagemap_enqueue_iovec(struct page_read *pr, void *buf,
-			      unsigned long len, struct list_head *to)
+int pagemap_enqueue_iovec(struct page_read *pr, void *buf, unsigned long len, struct list_head *to)
 {
 	struct page_read_iov *cur_async = NULL;
 	struct iovec *iov;
@@ -386,8 +374,7 @@ int pagemap_enqueue_iovec(struct page_read *pr, void *buf,
 	return 0;
 }
 
-static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr,
-				 int nr, void *buf, unsigned flags)
+static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
 {
 	int ret;
 	unsigned long len = nr * PAGE_SIZE;
@@ -398,7 +385,7 @@ static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr,
 	 * for us for urgent async read, just do the regular
 	 * cached read.
 	 */
-	if ((flags & (PR_ASYNC|PR_ASAP)) == PR_ASYNC)
+	if ((flags & (PR_ASYNC | PR_ASAP)) == PR_ASYNC)
 		ret = pagemap_enqueue_iovec(pr, buf, len, &pr->async);
 	else {
 		ret = read_local_page(pr, vaddr, len, buf);
@@ -415,8 +402,7 @@ static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr,
  * We cannot use maybe_read_page_local() for streaming images as it uses
  * pread(), seeking in the file. Instead, we use this custom page reader.
  */
-static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vaddr,
-					int nr, void *buf, unsigned flags)
+static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
 {
 	unsigned long len = nr * PAGE_SIZE;
 	int fd;
@@ -429,8 +415,7 @@ static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vadd
 		return -1;
 	}
 
-	pr_debug("\tpr%lu-%u Read page from self %lx/%"PRIx64"\n",
-		 pr->img_id, pr->id, pr->cvaddr, pr->pi_off);
+	pr_debug("\tpr%lu-%u Read page from self %lx/%" PRIx64 "\n", pr->img_id, pr->id, pr->cvaddr, pr->pi_off);
 
 	/* We can't seek. The requested address better match */
 	BUG_ON(pr->cvaddr != vaddr);
@@ -466,8 +451,7 @@ static int read_page_complete(unsigned long img_id, unsigned long vaddr, int nr_
 	struct page_read *pr = priv;
 
 	if (pr->img_id != img_id) {
-		pr_err("Out of order read completed (want %lu have %lu)\n",
-				pr->img_id, img_id);
+		pr_err("Out of order read completed (want %lu have %lu)\n", pr->img_id, img_id);
 		return -1;
 	}
 
@@ -479,21 +463,18 @@ static int read_page_complete(unsigned long img_id, unsigned long vaddr, int nr_
 	return ret;
 }
 
-static int maybe_read_page_remote(struct page_read *pr, unsigned long vaddr,
-				  int nr, void *buf, unsigned flags)
+static int maybe_read_page_remote(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
 {
 	int ret;
 
 	/* We always do PR_ASAP mode here (FIXME?) */
 	ret = request_remote_pages(pr->img_id, vaddr, nr);
 	if (!ret)
-		ret = page_server_start_read(buf, nr,
-				read_page_complete, pr, flags);
+		ret = page_server_start_read(buf, nr, read_page_complete, pr, flags);
 	return ret;
 }
 
-static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, int nr,
-			     void *buf, unsigned flags)
+static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
 {
 	pr_info("pr%lu-%u Read %lx %u pages\n", pr->img_id, pr->id, vaddr, nr);
 	pagemap_bound_check(pr->pe, vaddr, nr);
@@ -543,8 +524,7 @@ static void advance_piov(struct page_read_iov *piov, ssize_t len)
 		break;
 	}
 
-	pr_debug("Advanced iov %zu bytes, %d->%d iovs, %zu tail\n",
-			olen, onr, piov->nr, len);
+	pr_debug("Advanced iov %zu bytes, %d->%d iovs, %zu tail\n", olen, onr, piov->nr, len);
 }
 
 static int process_async_reads(struct page_read *pr)
@@ -558,10 +538,9 @@ static int process_async_reads(struct page_read *pr)
 		off_t start = piov->from;
 		struct iovec *iovs = piov->to;
 
-		pr_debug("Read piov iovs %d, from %ju, len %ju, first %p:%zu\n",
-				piov->nr, piov->from, piov->end - piov->from,
-				piov->to->iov_base, piov->to->iov_len);
-more:
+		pr_debug("Read piov iovs %d, from %ju, len %ju, first %p:%zu\n", piov->nr, piov->from,
+			 piov->end - piov->from, piov->to->iov_base, piov->to->iov_len);
+	more:
 		ret = preadv(fd, piov->to, piov->nr, piov->from);
 		if (fault_injected(FI_PARTIAL_PAGES)) {
 			/*
@@ -577,8 +556,8 @@ more:
 
 		if (ret != piov->end - piov->from) {
 			if (ret < 0) {
-				pr_err("Can't read async pr bytes (%zd / %ju read, %ju off, %d iovs)\n",
-						ret, piov->end - piov->from, piov->from, piov->nr);
+				pr_err("Can't read async pr bytes (%zd / %ju read, %ju off, %d iovs)\n", ret,
+				       piov->end - piov->from, piov->from, piov->nr);
 				return -1;
 			}
 
@@ -746,8 +725,7 @@ static int init_pagemaps(struct page_read *pr)
 	pr->curr_pme = -1;
 
 	while (1) {
-		int ret = pb_read_one_eof(pr->pmi, &pr->pmes[pr->nr_pmes],
-					  PB_PAGEMAP);
+		int ret = pb_read_one_eof(pr->pmi, &pr->pmes[pr->nr_pmes], PB_PAGEMAP);
 		if (ret < 0)
 			goto free_pagemaps;
 		if (ret == 0)
@@ -759,8 +737,7 @@ static int init_pagemaps(struct page_read *pr)
 		if (pr->nr_pmes >= nr_pmes) {
 			PagemapEntry **new;
 			nr_pmes += nr_realloc;
-			new = xrealloc(pr->pmes,
-					    nr_pmes * sizeof(*pr->pmes));
+			new = xrealloc(pr->pmes, nr_pmes * sizeof(*pr->pmes));
 			if (!new)
 				goto free_pagemaps;
 			pr->pmes = new;
@@ -863,8 +840,7 @@ int open_page_read_at(int dfd, unsigned long img_id, struct page_read *pr, int p
 			pr->pieok = true;
 	}
 
-	pr_debug("Opened %s page read %u (parent %u)\n",
-		 remote ? "remote" : "local", pr->id,
+	pr_debug("Opened %s page read %u (parent %u)\n", remote ? "remote" : "local", pr->id,
 		 pr->parent ? pr->parent->id : 0);
 
 	return 1;
@@ -875,7 +851,6 @@ int open_page_read(unsigned long img_id, struct page_read *pr, int pr_flags)
 	return open_page_read_at(get_service_fd(IMG_FD_OFF), img_id, pr, pr_flags);
 }
 
-
 #define DUP_IDS_BASE 1000
 
 void dup_page_read(struct page_read *src, struct page_read *dst)
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 2513dceec..7175adee1 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -85,14 +85,12 @@ static void sigchld_handler(int signal, siginfo_t *siginfo, void *data)
 	if (pid <= 0)
 		return;
 
-	pr_err("si_code=%d si_pid=%d si_status=%d\n",
-		siginfo->si_code, siginfo->si_pid, siginfo->si_status);
+	pr_err("si_code=%d si_pid=%d si_status=%d\n", siginfo->si_code, siginfo->si_pid, siginfo->si_status);
 
 	if (WIFEXITED(status))
 		pr_err("%d exited with %d unexpectedly\n", pid, WEXITSTATUS(status));
 	else if (WIFSIGNALED(status))
-		pr_err("%d was killed by %d unexpectedly: %s\n",
-			pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+		pr_err("%d was killed by %d unexpectedly: %s\n", pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
 	else if (WIFSTOPPED(status))
 		pr_err("%d was stopped by %d unexpectedly\n", pid, WSTOPSIG(status));
 
@@ -117,19 +115,19 @@ static int alloc_groups_copy_creds(CredsEntry *ce, struct parasite_dump_creds *c
 	memcpy(ce->cap_eff, c->cap_eff, sizeof(c->cap_eff[0]) * CR_CAP_SIZE);
 	memcpy(ce->cap_bnd, c->cap_bnd, sizeof(c->cap_bnd[0]) * CR_CAP_SIZE);
 
-	ce->secbits	= c->secbits;
-	ce->n_groups	= c->ngroups;
+	ce->secbits = c->secbits;
+	ce->n_groups = c->ngroups;
 
-	ce->groups	= xmemdup(c->groups, sizeof(c->groups[0]) * c->ngroups);
+	ce->groups = xmemdup(c->groups, sizeof(c->groups[0]) * c->ngroups);
 
-	ce->uid		= c->uids[0];
-	ce->gid		= c->gids[0];
-	ce->euid	= c->uids[1];
-	ce->egid	= c->gids[1];
-	ce->suid	= c->uids[2];
-	ce->sgid	= c->gids[2];
-	ce->fsuid	= c->uids[3];
-	ce->fsgid	= c->gids[3];
+	ce->uid = c->uids[0];
+	ce->gid = c->gids[0];
+	ce->euid = c->uids[1];
+	ce->egid = c->gids[1];
+	ce->suid = c->uids[2];
+	ce->sgid = c->gids[2];
+	ce->fsuid = c->uids[3];
+	ce->fsgid = c->gids[3];
 
 	return ce->groups ? 0 : -ENOMEM;
 }
@@ -161,9 +159,8 @@ int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEn
 	return dump_thread_core(pid, core, args);
 }
 
-int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
-				struct parasite_ctl *ctl, int id,
-				struct pid *tid, CoreEntry *core)
+int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, struct parasite_ctl *ctl, int id, struct pid *tid,
+				CoreEntry *core)
 {
 	struct parasite_dump_thread *args;
 	pid_t pid = tid->real;
@@ -182,7 +179,7 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
 	tc->has_blk_sigset = true;
 #ifdef CONFIG_MIPS
 	memcpy(&tc->blk_sigset, (unsigned long *)compel_thread_sigmask(tctl), sizeof(tc->blk_sigset));
-	memcpy(&tc->blk_sigset_extended, (unsigned long *)compel_thread_sigmask(tctl)+1, sizeof(tc->blk_sigset));
+	memcpy(&tc->blk_sigset_extended, (unsigned long *)compel_thread_sigmask(tctl) + 1, sizeof(tc->blk_sigset));
 #else
 	memcpy(&tc->blk_sigset, compel_thread_sigmask(tctl), sizeof(k_rtsigset_t));
 #endif
@@ -292,15 +289,14 @@ int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *i
 	if (ret < 0)
 		return ret;
 
-	encode_itimer((&args->real), (core->tc->timers->real));			\
-	encode_itimer((&args->virt), (core->tc->timers->virt));			\
-	encode_itimer((&args->prof), (core->tc->timers->prof));			\
+	encode_itimer((&args->real), (core->tc->timers->real));
+	encode_itimer((&args->virt), (core->tc->timers->virt));
+	encode_itimer((&args->prof), (core->tc->timers->prof));
 
 	return 0;
 }
 
-static int core_alloc_posix_timers(TaskTimersEntry *tte, int n,
-		PosixTimerEntry **pte)
+static int core_alloc_posix_timers(TaskTimersEntry *tte, int n, PosixTimerEntry **pte)
 {
 	int sz;
 
@@ -318,9 +314,7 @@ static int core_alloc_posix_timers(TaskTimersEntry *tte, int n,
 	return 0;
 }
 
-static int encode_notify_thread_id(pid_t rtid,
-				   struct pstree_item *item,
-				   PosixTimerEntry *pte)
+static int encode_notify_thread_id(pid_t rtid, struct pstree_item *item, PosixTimerEntry *pte)
 {
 	pid_t vtid = 0;
 	int i;
@@ -359,8 +353,8 @@ static int encode_notify_thread_id(pid_t rtid,
 	return 0;
 }
 
-static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v,
-			     struct proc_posix_timer *vp, PosixTimerEntry *pte)
+static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v, struct proc_posix_timer *vp,
+			      PosixTimerEntry *pte)
 {
 	pte->it_id = vp->spt.it_id;
 	pte->clock_id = vp->spt.clock_id;
@@ -375,15 +369,14 @@ static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v,
 	pte->vsec = v->val.it_value.tv_sec;
 	pte->vnsec = v->val.it_value.tv_nsec;
 
-	if (encode_notify_thread_id(vp->spt.notify_thread_id,
-				    item, pte))
+	if (encode_notify_thread_id(vp->spt.notify_thread_id, item, pte))
 		return -1;
 
 	return 0;
 }
 
-int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args,
-		struct parasite_ctl *ctl, struct pstree_item *item)
+int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
+				      struct pstree_item *item)
 {
 	CoreEntry *core = item->core[0];
 	TaskTimersEntry *tte = core->tc->timers;
@@ -452,9 +445,8 @@ struct parasite_tty_args *parasite_dump_tty(struct parasite_ctl *ctl, int fd, in
 	return p;
 }
 
-int parasite_drain_fds_seized(struct parasite_ctl *ctl,
-		struct parasite_drain_fd *dfds, int nr_fds, int off,
-		int *lfds, struct fd_opts *opts)
+int parasite_drain_fds_seized(struct parasite_ctl *ctl, struct parasite_drain_fd *dfds, int nr_fds, int off, int *lfds,
+			      struct fd_opts *opts)
 {
 	int ret = -1, size, sk;
 	struct parasite_drain_fd *args;
@@ -532,8 +524,7 @@ static int make_sigframe(void *arg, struct rt_sigframe *sf, struct rt_sigframe *
 	return construct_sigframe(sf, rtsf, bs, (CoreEntry *)arg);
 }
 
-static int parasite_prepare_threads(struct parasite_ctl *ctl,
-				    struct pstree_item *item)
+static int parasite_prepare_threads(struct parasite_ctl *ctl, struct pstree_item *item)
 {
 	struct parasite_thread_ctl **thread_ctls;
 	uint64_t *thread_sp;
@@ -574,8 +565,7 @@ free_ctls:
 	return -1;
 }
 
-struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
-		struct vm_area_list *vma_area_list)
+struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item, struct vm_area_list *vma_area_list)
 {
 	struct parasite_ctl *ctl;
 	struct infect_ctx *ictx;
@@ -642,8 +632,10 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 
 	parasite_args_size = PARASITE_ARG_SIZE_MIN; /* reset for next task */
 #ifdef CONFIG_MIPS
-	memcpy(&item->core[0]->tc->blk_sigset, (unsigned long *)compel_task_sigmask(ctl), sizeof(item->core[0]->tc->blk_sigset));
-	memcpy(&item->core[0]->tc->blk_sigset_extended, (unsigned long *)compel_task_sigmask(ctl)+1, sizeof(item->core[0]->tc->blk_sigset));
+	memcpy(&item->core[0]->tc->blk_sigset, (unsigned long *)compel_task_sigmask(ctl),
+	       sizeof(item->core[0]->tc->blk_sigset));
+	memcpy(&item->core[0]->tc->blk_sigset_extended, (unsigned long *)compel_task_sigmask(ctl) + 1,
+	       sizeof(item->core[0]->tc->blk_sigset));
 #else
 	memcpy(&item->core[0]->tc->blk_sigset, compel_task_sigmask(ctl), sizeof(k_rtsigset_t));
 #endif
diff --git a/criu/path.c b/criu/path.c
index 637d0fae2..1b71c4cb1 100644
--- a/criu/path.c
+++ b/criu/path.c
@@ -38,8 +38,7 @@ out:
 	return path;
 }
 
-char *mnt_get_sibling_path(struct mount_info *m,
-			   struct mount_info *p, char *buf, int len)
+char *mnt_get_sibling_path(struct mount_info *m, struct mount_info *p, char *buf, int len)
 {
 	struct mount_info *pa = m->parent;
 	char *rpath, *cut_root, *path = buf;
diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c
index 211cdcf17..98b478b30 100644
--- a/criu/pidfd-store.c
+++ b/criu/pidfd-store.c
@@ -15,13 +15,13 @@
 #include "pidfd-store.h"
 
 struct pidfd_entry {
-	pid_t				pid;
-	int				pidfd;
-	struct hlist_node		hash; /* To lookup pidfd by pid */
+	pid_t pid;
+	int pidfd;
+	struct hlist_node hash; /* To lookup pidfd by pid */
 };
 
 static int pidfd_store_sk = -1;
-#define PIDFD_HASH_SIZE	32
+#define PIDFD_HASH_SIZE 32
 static struct hlist_head pidfd_hash[PIDFD_HASH_SIZE];
 
 /*
@@ -95,7 +95,7 @@ int init_pidfd_store_sk(pid_t pid, int sk)
 	 */
 	if (addrlen == sizeof(sa_family_t)) {
 		if (setsockopt(pidfd_store_sk, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0], sizeof(buf[0])) < 0 ||
-			setsockopt(pidfd_store_sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
+		    setsockopt(pidfd_store_sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
 			pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
 			goto err;
 		}
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index 3f5cb1431..355007fa9 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -21,7 +21,7 @@
 #include "common/bug.h"
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
@@ -96,7 +96,7 @@ void vdso_update_gtod_addr(struct vdso_maps *rt)
 		return;
 	}
 
-	gtod = (void*)(rt->vdso_start + gtod_sym->offset);
+	gtod = (void *)(rt->vdso_start + gtod_sym->offset);
 	pr_info("Using gettimeofday() on vdso at %p\n", gtod);
 
 	std_log_set_gettimeofday(gtod);
@@ -125,8 +125,7 @@ int vdso_do_park(struct vdso_maps *rt, unsigned long addr, unsigned long space)
 }
 
 #ifndef CONFIG_COMPAT
-static int __vdso_fill_symtable(uintptr_t mem, size_t size,
-		struct vdso_symtable *t, bool __always_unused compat_vdso)
+static int __vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t, bool __always_unused compat_vdso)
 {
 	return vdso_fill_symtable(mem, size, t);
 }
@@ -142,27 +141,25 @@ static int __vdso_fill_symtable(uintptr_t mem, size_t size,
  *    b) Symbols offsets must match
  *    c) Have same number of vDSO zones
  */
-static bool blobs_matches(VmaEntry *vdso_img, VmaEntry *vvar_img,
-		struct vdso_symtable *sym_img, struct vdso_symtable *sym_rt)
+static bool blobs_matches(VmaEntry *vdso_img, VmaEntry *vvar_img, struct vdso_symtable *sym_img,
+			  struct vdso_symtable *sym_rt)
 {
 	unsigned long vdso_size = vma_entry_len(vdso_img);
 	unsigned long rt_vdso_size = sym_rt->vdso_size;
 	size_t i;
 
 	if (vdso_size != rt_vdso_size) {
-		pr_info("size differs: %lx != %lx (rt)\n",
-			vdso_size, rt_vdso_size);
+		pr_info("size differs: %lx != %lx (rt)\n", vdso_size, rt_vdso_size);
 		return false;
 	}
 
 	for (i = 0; i < ARRAY_SIZE(sym_img->symbols); i++) {
-		unsigned long sym_offset	= sym_img->symbols[i].offset;
-		unsigned long rt_sym_offset	= sym_rt->symbols[i].offset;
-		char *sym_name			= sym_img->symbols[i].name;
+		unsigned long sym_offset = sym_img->symbols[i].offset;
+		unsigned long rt_sym_offset = sym_rt->symbols[i].offset;
+		char *sym_name = sym_img->symbols[i].name;
 
 		if (sym_offset != rt_sym_offset) {
-			pr_info("[%zu]`%s` offset differs: %lx != %lx (rt)\n",
-				i, sym_name, sym_offset, rt_sym_offset);
+			pr_info("[%zu]`%s` offset differs: %lx != %lx (rt)\n", i, sym_name, sym_offset, rt_sym_offset);
 			return false;
 		}
 	}
@@ -173,14 +170,12 @@ static bool blobs_matches(VmaEntry *vdso_img, VmaEntry *vvar_img,
 		unsigned long rt_vvar_size = sym_rt->vvar_size;
 
 		if (vvar_size != rt_vvar_size) {
-			pr_info("vvar size differs: %lx != %lx (rt)\n",
-				vdso_size, rt_vdso_size);
+			pr_info("vvar size differs: %lx != %lx (rt)\n", vdso_size, rt_vdso_size);
 			return false;
 		}
 
 		if (vdso_firstly != sym_rt->vdso_before_vvar) {
-			pr_info("[%s] pair has different order\n",
-				vdso_firstly ? "vdso/vvar" : "vvar/vdso");
+			pr_info("[%s] pair has different order\n", vdso_firstly ? "vdso/vvar" : "vvar/vdso");
 			return false;
 		}
 	}
@@ -193,8 +188,7 @@ static bool blobs_matches(VmaEntry *vdso_img, VmaEntry *vvar_img,
  * order and size as runtime vdso, so we simply remap runtime vdso
  * to dumpee position without generating any proxy.
  */
-static int remap_rt_vdso(VmaEntry *vma_vdso, VmaEntry *vma_vvar,
-			 struct vdso_maps *rt)
+static int remap_rt_vdso(VmaEntry *vma_vdso, VmaEntry *vma_vvar, struct vdso_maps *rt)
 {
 	void *remap_addr;
 
@@ -227,12 +221,10 @@ static int remap_rt_vdso(VmaEntry *vma_vdso, VmaEntry *vma_vvar,
  * calls from dumpee vdso to runtime vdso, making dumpee
  * to operate as proxy vdso.
  */
-static int add_vdso_proxy(VmaEntry *vma_vdso, VmaEntry *vma_vvar,
-		struct vdso_symtable *sym_img, struct vdso_maps *rt,
-		bool compat_vdso)
+static int add_vdso_proxy(VmaEntry *vma_vdso, VmaEntry *vma_vvar, struct vdso_symtable *sym_img, struct vdso_maps *rt,
+			  bool compat_vdso)
 {
-	unsigned long orig_vvar_addr =
-		vma_vvar ? vma_vvar->start : VVAR_BAD_ADDR;
+	unsigned long orig_vvar_addr = vma_vvar ? vma_vvar->start : VVAR_BAD_ADDR;
 
 	pr_info("Runtime vdso mismatches dumpee, generate proxy\n");
 
@@ -244,8 +236,7 @@ static int add_vdso_proxy(VmaEntry *vma_vdso, VmaEntry *vma_vvar,
 	 * jumps, so we can't remove them if on the following migration
 	 * found that number of symbols in vdso has decreased.
 	 */
-	if (vdso_redirect_calls(rt->vdso_start, vma_vdso->start,
-				&rt->sym, sym_img, compat_vdso)) {
+	if (vdso_redirect_calls(rt->vdso_start, vma_vdso->start, &rt->sym, sym_img, compat_vdso)) {
 		pr_err("Failed to proxify dumpee contents\n");
 		return -1;
 	}
@@ -256,16 +247,14 @@ static int add_vdso_proxy(VmaEntry *vma_vdso, VmaEntry *vma_vvar,
 	 * it's auto-generated every new session if proxy required.
 	 */
 	sys_mprotect((void *)rt->vdso_start, rt->sym.vdso_size, PROT_WRITE);
-	vdso_put_mark((void *)rt->vdso_start, rt->vvar_start,
-		      vma_vdso->start, orig_vvar_addr);
+	vdso_put_mark((void *)rt->vdso_start, rt->vvar_start, vma_vdso->start, orig_vvar_addr);
 	sys_mprotect((void *)rt->vdso_start, rt->sym.vdso_size, VDSO_PROT);
 
 	return 0;
 }
 
-int vdso_proxify(struct vdso_maps *rt, bool *added_proxy,
-		 VmaEntry *vmas, size_t nr_vmas,
-		 bool compat_vdso, bool force_trampolines)
+int vdso_proxify(struct vdso_maps *rt, bool *added_proxy, VmaEntry *vmas, size_t nr_vmas, bool compat_vdso,
+		 bool force_trampolines)
 {
 	VmaEntry *vma_vdso = NULL, *vma_vvar = NULL;
 	struct vdso_symtable s = VDSO_SYMTABLE_INIT;
@@ -313,12 +302,10 @@ int vdso_proxify(struct vdso_maps *rt, bool *added_proxy,
 	/*
 	 * Find symbols in vDSO zone read from image.
 	 */
-	if (__vdso_fill_symtable((uintptr_t)vma_vdso->start,
-			vma_entry_len(vma_vdso), &s, compat_vdso))
+	if (__vdso_fill_symtable((uintptr_t)vma_vdso->start, vma_entry_len(vma_vdso), &s, compat_vdso))
 		return -1;
 
-	pr_debug("image [vdso] %lx-%lx [vvar] %lx-%lx\n",
-		 (unsigned long)vma_vdso->start, (unsigned long)vma_vdso->end,
+	pr_debug("image [vdso] %lx-%lx [vvar] %lx-%lx\n", (unsigned long)vma_vdso->start, (unsigned long)vma_vdso->end,
 		 vma_vvar ? (unsigned long)vma_vvar->start : VVAR_BAD_ADDR,
 		 vma_vvar ? (unsigned long)vma_vvar->end : VVAR_BAD_ADDR);
 
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 59e838544..bc0a33cd4 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -32,15 +32,15 @@
 static struct parasite_dump_pages_args *mprotect_args = NULL;
 
 #ifndef SPLICE_F_GIFT
-#define SPLICE_F_GIFT	0x08
+#define SPLICE_F_GIFT 0x08
 #endif
 
 #ifndef PR_GET_PDEATHSIG
-#define PR_GET_PDEATHSIG  2
+#define PR_GET_PDEATHSIG 2
 #endif
 
 #ifndef PR_GET_CHILD_SUBREAPER
-#define PR_GET_CHILD_SUBREAPER  37
+#define PR_GET_CHILD_SUBREAPER 37
 #endif
 
 static int mprotect_vmas(struct parasite_dump_pages_args *args)
@@ -53,8 +53,7 @@ static int mprotect_vmas(struct parasite_dump_pages_args *args)
 		vma = vmas + i;
 		ret = sys_mprotect((void *)vma->start, vma->len, vma->prot | args->add_prot);
 		if (ret) {
-			pr_err("mprotect(%08lx, %ld) failed with code %d\n",
-						vma->start, vma->len, ret);
+			pr_err("mprotect(%08lx, %ld) failed with code %d\n", vma->start, vma->len, ret);
 			break;
 		}
 	}
@@ -85,12 +84,10 @@ static int dump_pages(struct parasite_dump_pages_args *args)
 	if (nr_segs > UIO_MAXIOV)
 		nr_segs = UIO_MAXIOV;
 	while (1) {
-		ret = sys_vmsplice(p, &iovs[args->off + off], nr_segs,
-					SPLICE_F_GIFT | SPLICE_F_NONBLOCK);
+		ret = sys_vmsplice(p, &iovs[args->off + off], nr_segs, SPLICE_F_GIFT | SPLICE_F_NONBLOCK);
 		if (ret < 0) {
 			sys_close(p);
-			pr_err("Can't splice pages to pipe (%d/%d/%d)\n",
-						ret, nr_segs, args->off + off);
+			pr_err("Can't splice pages to pipe (%d/%d/%d)\n", ret, nr_segs, args->off + off);
 			return -1;
 		}
 		spliced_bytes += ret;
@@ -151,7 +148,7 @@ static int dump_posix_timers(struct parasite_dump_posix_timers_args *args)
 	int i;
 	int ret = 0;
 
-	for(i = 0; i < args->timer_n; i++) {
+	for (i = 0; i < args->timer_n; i++) {
 		ret = sys_timer_gettime(args->timer[i].it_id, &args->timer[i].val);
 		if (ret < 0) {
 			pr_err("sys_timer_gettime failed (%d)\n", ret);
@@ -176,7 +173,7 @@ static int dump_thread_common(struct parasite_dump_thread *ti)
 	int ret;
 
 	arch_get_tls(&ti->tls);
-	ret = sys_prctl(PR_GET_TID_ADDRESS, (unsigned long) &ti->tid_addr, 0, 0, 0);
+	ret = sys_prctl(PR_GET_TID_ADDRESS, (unsigned long)&ti->tid_addr, 0, 0, 0);
 	if (ret) {
 		pr_err("Unable to get the clear_child_tid address: %d\n", ret);
 		goto out;
@@ -194,7 +191,7 @@ static int dump_thread_common(struct parasite_dump_thread *ti)
 		goto out;
 	}
 
-	ret = sys_prctl(PR_GET_NAME, (unsigned long) &ti->comm, 0, 0, 0);
+	ret = sys_prctl(PR_GET_NAME, (unsigned long)&ti->comm, 0, 0, 0);
 	if (ret) {
 		pr_err("Unable to get the thread name: %d\n", ret);
 		goto out;
@@ -230,7 +227,7 @@ static int dump_creds(struct parasite_dump_creds *args)
 {
 	int ret, i, j;
 	struct cap_data data[_LINUX_CAPABILITY_U32S_3];
-	struct cap_header hdr = {_LINUX_CAPABILITY_VERSION_3, 0};
+	struct cap_header hdr = { _LINUX_CAPABILITY_VERSION_3, 0 };
 
 	ret = sys_capget(&hdr, data);
 	if (ret < 0) {
@@ -254,8 +251,7 @@ static int dump_creds(struct parasite_dump_creds *args)
 				break;
 			ret = sys_prctl(PR_CAPBSET_READ, j + i * 32, 0, 0, 0);
 			if (ret < 0) {
-				pr_err("Unable to read capability %d: %d\n",
-					j + i * 32, ret);
+				pr_err("Unable to read capability %d: %d\n", j + i * 32, ret);
 				return -1;
 			}
 			if (ret)
@@ -280,8 +276,7 @@ static int dump_creds(struct parasite_dump_creds *args)
 		goto grps_err;
 
 	if (ret != args->ngroups) {
-		pr_err("Groups changed on the fly %d -> %d\n",
-				args->ngroups, ret);
+		pr_err("Groups changed on the fly %d -> %d\n", args->ngroups, ret);
 		return -1;
 	}
 
@@ -357,10 +352,10 @@ static int fill_fds_fown(int fd, struct fd_opts *p)
 		return -1;
 	}
 
-	p->fown.uid	 = v[0];
-	p->fown.euid	 = v[1];
+	p->fown.uid = v[0];
+	p->fown.euid = v[1];
 	p->fown.pid_type = owner_ex.type;
-	p->fown.pid	 = owner_ex.pid;
+	p->fown.pid = owner_ex.pid;
 
 	return 0;
 }
@@ -404,8 +399,7 @@ static int drain_fds(struct parasite_drain_fd *args)
 		return ret;
 
 	tsock = parasite_get_rpc_sock();
-	ret = send_fds(tsock, NULL, 0,
-		       args->fds, args->nr_fds, opts, sizeof(struct fd_opts));
+	ret = send_fds(tsock, NULL, 0, args->fds, args->nr_fds, opts, sizeof(struct fd_opts));
 	if (ret)
 		pr_err("send_fds failed (%d)\n", ret);
 
@@ -506,9 +500,9 @@ static inline int tty_ioctl(int fd, int cmd, int *arg)
  * as libaio does the same.
  */
 
-#define AIO_RING_MAGIC			0xa10a10a1
-#define AIO_RING_COMPAT_FEATURES	1
-#define AIO_RING_INCOMPAT_FEATURES	0
+#define AIO_RING_MAGIC		   0xa10a10a1
+#define AIO_RING_COMPAT_FEATURES   1
+#define AIO_RING_INCOMPAT_FEATURES 0
 
 static int sane_ring(struct parasite_aio *aio)
 {
@@ -517,11 +511,9 @@ static int sane_ring(struct parasite_aio *aio)
 
 	nr = (aio->size - sizeof(struct aio_ring)) / sizeof(struct io_event);
 
-	return ring->magic == AIO_RING_MAGIC &&
-		ring->compat_features == AIO_RING_COMPAT_FEATURES &&
-		ring->incompat_features == AIO_RING_INCOMPAT_FEATURES &&
-		ring->header_length == sizeof(struct aio_ring) &&
-		ring->nr == nr;
+	return ring->magic == AIO_RING_MAGIC && ring->compat_features == AIO_RING_COMPAT_FEATURES &&
+	       ring->incompat_features == AIO_RING_INCOMPAT_FEATURES &&
+	       ring->header_length == sizeof(struct aio_ring) && ring->nr == nr;
 }
 
 static int parasite_check_aios(struct parasite_check_aios_args *args)
@@ -553,15 +545,15 @@ static int parasite_dump_tty(struct parasite_tty_args *args)
 	int ret;
 
 #ifndef TIOCGPKT
-# define TIOCGPKT	_IOR('T', 0x38, int)
+#define TIOCGPKT _IOR('T', 0x38, int)
 #endif
 
 #ifndef TIOCGPTLCK
-# define TIOCGPTLCK	_IOR('T', 0x39, int)
+#define TIOCGPTLCK _IOR('T', 0x39, int)
 #endif
 
 #ifndef TIOCGEXCL
-# define TIOCGEXCL	_IOR('T', 0x40, int)
+#define TIOCGEXCL _IOR('T', 0x40, int)
 #endif
 
 	args->sid = 0;
@@ -570,26 +562,26 @@ static int parasite_dump_tty(struct parasite_tty_args *args)
 	args->st_lock = 0;
 	args->st_excl = 0;
 
-#define __tty_ioctl(cmd, arg)					\
-	do {							\
-		ret = tty_ioctl(args->fd, cmd, &arg);		\
-		if (ret < 0) {					\
-			if (ret == -ENOTTY)			\
-				arg = 0;			\
-			else if (ret == -EIO)			\
-				goto err_io;			\
-			else					\
-				goto err;			\
-		}						\
+#define __tty_ioctl(cmd, arg)                         \
+	do {                                          \
+		ret = tty_ioctl(args->fd, cmd, &arg); \
+		if (ret < 0) {                        \
+			if (ret == -ENOTTY)           \
+				arg = 0;              \
+			else if (ret == -EIO)         \
+				goto err_io;          \
+			else                          \
+				goto err;             \
+		}                                     \
 	} while (0)
 
 	__tty_ioctl(TIOCGSID, args->sid);
 	__tty_ioctl(TIOCGPGRP, args->pgrp);
-	__tty_ioctl(TIOCGEXCL,	args->st_excl);
+	__tty_ioctl(TIOCGEXCL, args->st_excl);
 
 	if (args->type == TTY_TYPE__PTY) {
-		__tty_ioctl(TIOCGPKT,	args->st_pckt);
-		__tty_ioctl(TIOCGPTLCK,	args->st_lock);
+		__tty_ioctl(TIOCGPKT, args->st_pckt);
+		__tty_ioctl(TIOCGPTLCK, args->st_lock);
 	}
 
 	args->hangup = false;
@@ -620,15 +612,15 @@ static int parasite_check_vdso_mark(struct parasite_vdso_vma_entry *args)
 			pr_err("vdso: Mark version mismatch!\n");
 			return -EINVAL;
 		}
-		args->is_marked		= 1;
-		args->orig_vdso_addr	= m->orig_vdso_addr;
-		args->orig_vvar_addr	= m->orig_vvar_addr;
-		args->rt_vvar_addr	= m->rt_vvar_addr;
+		args->is_marked = 1;
+		args->orig_vdso_addr = m->orig_vdso_addr;
+		args->orig_vvar_addr = m->orig_vvar_addr;
+		args->rt_vvar_addr = m->rt_vvar_addr;
 	} else {
-		args->is_marked		= 0;
-		args->orig_vdso_addr	= VDSO_BAD_ADDR;
-		args->orig_vvar_addr	= VVAR_BAD_ADDR;
-		args->rt_vvar_addr	= VVAR_BAD_ADDR;
+		args->is_marked = 0;
+		args->orig_vdso_addr = VDSO_BAD_ADDR;
+		args->orig_vvar_addr = VVAR_BAD_ADDR;
+		args->rt_vvar_addr = VVAR_BAD_ADDR;
 
 		if (args->try_fill_symtable) {
 			struct vdso_symtable t;
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index de0cdb8f5..4304691bb 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -59,20 +59,19 @@
 #endif
 
 #ifndef FALLOC_FL_KEEP_SIZE
-#define FALLOC_FL_KEEP_SIZE     0x01
+#define FALLOC_FL_KEEP_SIZE 0x01
 #endif
 
 #ifndef FALLOC_FL_PUNCH_HOLE
-#define FALLOC_FL_PUNCH_HOLE    0x02
+#define FALLOC_FL_PUNCH_HOLE 0x02
 #endif
 
-
-#define sys_prctl_safe(opcode, val1, val2, val3)			\
-	({								\
-		long __ret = sys_prctl(opcode, val1, val2, val3, 0);	\
-		if (__ret)						\
-			 pr_err("prctl failed @%d with %ld\n", __LINE__, __ret);\
-		__ret;							\
+#define sys_prctl_safe(opcode, val1, val2, val3)                                \
+	({                                                                      \
+		long __ret = sys_prctl(opcode, val1, val2, val3, 0);            \
+		if (__ret)                                                      \
+			pr_err("prctl failed @%d with %ld\n", __LINE__, __ret); \
+		__ret;                                                          \
 	})
 
 static struct task_entries *task_entries_local;
@@ -116,8 +115,7 @@ void parasite_cleanup(void)
 {
 }
 
-extern void cr_restore_rt (void) asm ("__cr_restore_rt")
-			__attribute__ ((visibility ("hidden")));
+extern void cr_restore_rt(void) asm("__cr_restore_rt") __attribute__((visibility("hidden")));
 
 static void sigchld_handler(int signal, siginfo_t *siginfo, void *data)
 {
@@ -186,8 +184,7 @@ static int lsm_set_label(char *label, char *type, int procfd)
 	return 0;
 }
 
-static int restore_creds(struct thread_creds_args *args, int procfd,
-			 int lsm_type)
+static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_type)
 {
 	CredsEntry *ce = &args->creds;
 	int b, i, ret;
@@ -275,8 +272,7 @@ static int restore_creds(struct thread_creds_args *args, int procfd,
 				continue;
 			ret = sys_prctl(PR_CAPBSET_DROP, i + b * 32, 0, 0, 0);
 			if (ret) {
-				pr_err("Unable to drop capability %d: %d\n",
-								i + b * 32, ret);
+				pr_err("Unable to drop capability %d: %d\n", i + b * 32, ret);
 				return -1;
 			}
 		}
@@ -388,8 +384,7 @@ static void restore_sched_info(struct rst_sched_param *p)
 {
 	struct sched_param parm;
 
-	pr_info("Restoring scheduler params %d.%d.%d\n",
-			p->policy, p->nice, p->prio);
+	pr_info("Restoring scheduler params %d.%d.%d\n", p->policy, p->nice, p->prio);
 
 	sys_setpriority(PRIO_PROCESS, 0, p->nice);
 	parm.sched_priority = p->prio;
@@ -420,11 +415,9 @@ static int restore_signals(siginfo_t *ptr, int nr, bool group)
 		if (group)
 			ret = sys_rt_sigqueueinfo(sys_getpid(), info->si_signo, info);
 		else
-			ret = sys_rt_tgsigqueueinfo(sys_getpid(),
-						sys_gettid(), info->si_signo, info);
+			ret = sys_rt_tgsigqueueinfo(sys_getpid(), sys_gettid(), info->si_signo, info);
 		if (ret) {
-			pr_err("Unable to send siginfo %d %x with code %d\n",
-					info->si_signo, info->si_code, ret);
+			pr_err("Unable to send siginfo %d %x with code %d\n", info->si_signo, info->si_code, ret);
 			return -1;
 		}
 	}
@@ -441,24 +434,22 @@ static int restore_seccomp_filter(pid_t tid, struct thread_restore_args *args)
 	for (i = 0; i < args->seccomp_filters_n; i++) {
 		struct thread_seccomp_filter *filter = &args->seccomp_filters[i];
 
-		pr_debug("seccomp: Restoring mode %d flags %x on tid %d filter %d\n",
-			 SECCOMP_SET_MODE_FILTER, (filter->flags | flags), tid, (int)i);
+		pr_debug("seccomp: Restoring mode %d flags %x on tid %d filter %d\n", SECCOMP_SET_MODE_FILTER,
+			 (filter->flags | flags), tid, (int)i);
 
 		ret = sys_seccomp(SECCOMP_SET_MODE_FILTER, filter->flags | flags, (void *)&filter->sock_fprog);
 		if (ret < 0) {
 			if (ret == -ENOSYS) {
 				pr_debug("seccomp: sys_seccomp is not supported in kernel, "
 					 "switching to prctl interface\n");
-				ret = sys_prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER,
-						(long)(void *)&filter->sock_fprog, 0, 0);
+				ret = sys_prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, (long)(void *)&filter->sock_fprog,
+						0, 0);
 				if (ret) {
-					pr_err("seccomp: PR_SET_SECCOMP returned %d on tid %d\n",
-					       ret, tid);
+					pr_err("seccomp: PR_SET_SECCOMP returned %d on tid %d\n", ret, tid);
 					return -1;
 				}
 			} else {
-				pr_err("seccomp: SECCOMP_SET_MODE_FILTER returned %d on tid %d\n",
-				       ret, tid);
+				pr_err("seccomp: SECCOMP_SET_MODE_FILTER returned %d on tid %d\n", ret, tid);
 				return -1;
 			}
 		}
@@ -497,23 +488,20 @@ static int restore_seccomp(struct thread_restore_args *args)
 		std_log_set_gettimeofday(NULL);
 		ret = sys_prctl(PR_SET_SECCOMP, SECCOMP_MODE_STRICT, 0, 0, 0);
 		if (ret < 0) {
-			pr_err("seccomp: SECCOMP_MODE_STRICT returned %d on tid %d\n",
-			       ret, tid);
+			pr_err("seccomp: SECCOMP_MODE_STRICT returned %d on tid %d\n", ret, tid);
 		}
 		break;
 	case SECCOMP_MODE_FILTER:
 		ret = restore_seccomp_filter(tid, args);
 		break;
 	default:
-		pr_err("seccomp: Unknown seccomp mode %d on tid %d\n",
-		       args->seccomp_mode, tid);
+		pr_err("seccomp: Unknown seccomp mode %d on tid %d\n", args->seccomp_mode, tid);
 		ret = -1;
 		break;
 	}
 
 	if (!ret) {
-		pr_debug("seccomp: Restored mode %d on tid %d\n",
-			 args->seccomp_mode, tid);
+		pr_debug("seccomp: Restored mode %d on tid %d\n", args->seccomp_mode, tid);
 	}
 
 	return ret;
@@ -564,8 +552,7 @@ static int restore_thread_common(struct thread_restore_args *args)
 	return 0;
 }
 
-static void noinline rst_sigreturn(unsigned long new_sp,
-		struct rt_sigframe *sigframe)
+static void noinline rst_sigreturn(unsigned long new_sp, struct rt_sigframe *sigframe)
 {
 	ARCH_RT_SIGRETURN(new_sp, sigframe);
 }
@@ -600,7 +587,7 @@ long __export_restore_thread(struct thread_restore_args *args)
 	if (restore_thread_common(args))
 		goto core_restore_end;
 
-	ret = sys_prctl(PR_SET_NAME, (unsigned long) &args->comm, 0, 0, 0);
+	ret = sys_prctl(PR_SET_NAME, (unsigned long)&args->comm, 0, 0, 0);
 	if (ret) {
 		pr_err("Unable to set a thread name: %d\n", ret);
 		goto core_restore_end;
@@ -622,8 +609,7 @@ long __export_restore_thread(struct thread_restore_args *args)
 	if (restore_seccomp(args))
 		BUG();
 
-	ret = restore_creds(args->creds_args, args->ta->proc_fd,
-			    args->ta->lsm_type);
+	ret = restore_creds(args->creds_args, args->ta->proc_fd, args->ta->lsm_type);
 	ret = ret || restore_dumpable_flag(&args->ta->mm);
 	ret = ret || restore_pdeath_sig(args);
 	if (ret)
@@ -657,8 +643,7 @@ static long restore_self_exe_late(struct task_restore_args *args)
 }
 
 #ifndef ARCH_HAS_SHMAT_HOOK
-unsigned long arch_shmat(int shmid, void *shmaddr,
-			int shmflg, unsigned long size)
+unsigned long arch_shmat(int shmid, void *shmaddr, int shmflg, unsigned long size)
 {
 	return sys_shmat(shmid, shmaddr, shmflg);
 }
@@ -666,8 +651,8 @@ unsigned long arch_shmat(int shmid, void *shmaddr,
 
 static unsigned long restore_mapping(VmaEntry *vma_entry)
 {
-	int prot	= vma_entry->prot;
-	int flags	= vma_entry->flags | MAP_FIXED;
+	int prot = vma_entry->prot;
+	int flags = vma_entry->flags | MAP_FIXED;
 	unsigned long addr;
 
 	if (vma_entry_is(vma_entry, VMA_AREA_SYSVIPC)) {
@@ -687,7 +672,7 @@ static unsigned long restore_mapping(VmaEntry *vma_entry)
 		} else
 			att_flags = SHM_RDONLY;
 
-		pr_info("Attach SYSV shmem %d at %"PRIx64"\n", (int)vma_entry->fd, vma_entry->start);
+		pr_info("Attach SYSV shmem %d at %" PRIx64 "\n", (int)vma_entry->fd, vma_entry->start);
 		return arch_shmat(vma_entry->fd, shmaddr, att_flags, shmsize);
 	}
 
@@ -705,8 +690,7 @@ static unsigned long restore_mapping(VmaEntry *vma_entry)
 		flags |= MAP_ANONYMOUS;
 
 	/* A mapping of file with MAP_SHARED is up to date */
-	if ((vma_entry->fd == -1 || !(vma_entry->flags & MAP_SHARED)) &&
-			!(vma_entry->status & VMA_NO_PROT_WRITE))
+	if ((vma_entry->fd == -1 || !(vma_entry->flags & MAP_SHARED)) && !(vma_entry->status & VMA_NO_PROT_WRITE))
 		prot |= PROT_WRITE;
 
 	/* TODO: Drop MAP_LOCKED bit and restore it after reading memory.
@@ -717,22 +701,17 @@ static unsigned long restore_mapping(VmaEntry *vma_entry)
 	 * that mechanism as it causes the process to be charged for memory
 	 * immediately upon mmap, not later upon preadv().
 	 */
-	pr_debug("\tmmap(%"PRIx64" -> %"PRIx64", %x %x %d)\n",
-			vma_entry->start, vma_entry->end,
-			prot, flags, (int)vma_entry->fd);
+	pr_debug("\tmmap(%" PRIx64 " -> %" PRIx64 ", %x %x %d)\n", vma_entry->start, vma_entry->end, prot, flags,
+		 (int)vma_entry->fd);
 	/*
 	 * Should map memory here. Note we map them as
 	 * writable since we're going to restore page
 	 * contents.
 	 */
-	addr = sys_mmap(decode_pointer(vma_entry->start),
-			vma_entry_len(vma_entry),
-			prot, flags,
-			vma_entry->fd,
+	addr = sys_mmap(decode_pointer(vma_entry->start), vma_entry_len(vma_entry), prot, flags, vma_entry->fd,
 			vma_entry->pgoff);
 
-	if ((vma_entry->fd != -1) &&
-			(vma_entry->status & VMA_CLOSE))
+	if ((vma_entry->fd != -1) && (vma_entry->status & VMA_CLOSE))
 		sys_close(vma_entry->fd);
 
 	return addr;
@@ -764,10 +743,9 @@ static int restore_aio_ring(struct rst_aio_ring *raio)
 
 	new = (struct aio_ring *)ctx;
 	i = (raio->len - sizeof(struct aio_ring)) / sizeof(struct io_event);
-	if (tail >= ring->nr || head >= ring->nr || ring->nr != i ||
-	    new->nr != ring->nr) {
-		pr_err("wrong aio: tail=%x head=%x req=%x old_nr=%x new_nr=%x expect=%x\n",
-			tail, head, raio->nr_req, ring->nr, new->nr, i);
+	if (tail >= ring->nr || head >= ring->nr || ring->nr != i || new->nr != ring->nr) {
+		pr_err("wrong aio: tail=%x head=%x req=%x old_nr=%x new_nr=%x expect=%x\n", tail, head, raio->nr_req,
+		       ring->nr, new->nr, i);
 
 		return -1;
 	}
@@ -794,15 +772,14 @@ static int restore_aio_ring(struct rst_aio_ring *raio)
 		count = ring->nr + tail;
 	else
 		count = tail;
-	maxr = min_t(unsigned, count, ring->nr-1);
+	maxr = min_t(unsigned, count, ring->nr - 1);
 
 	/*
 	 * Since we only interested in moving the tail, the requests
 	 * may be any. We submit count identical requests.
 	 */
 	size = sizeof(struct iocb) + maxr * sizeof(struct iocb *);
-	iocb = (void *)sys_mmap(NULL, size, PROT_READ|PROT_WRITE,
-				MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+	iocb = (void *)sys_mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	iocbp = (void *)iocb + sizeof(struct iocb);
 
 	if (IS_ERR(iocb)) {
@@ -827,7 +804,7 @@ static int restore_aio_ring(struct rst_aio_ring *raio)
 		}
 		i += ret;
 
-		 /*
+		/*
 		  * We may submit less than requested, because of too big
 		  * count OR behaviour of get_reqs_available(), which
 		  * takes available requests only if their number is
@@ -859,9 +836,7 @@ populate:
 	 * Also, this unmaps temporary anonymous area on raio->addr.
 	 */
 
-	ctx = sys_mremap(ctx, raio->len, raio->len,
-				MREMAP_FIXED | MREMAP_MAYMOVE,
-				raio->addr);
+	ctx = sys_mremap(ctx, raio->len, raio->len, MREMAP_FIXED | MREMAP_MAYMOVE, raio->addr);
 	if (ctx != raio->addr) {
 		pr_err("Ring remap failed with %ld\n", ctx);
 		return -1;
@@ -909,7 +884,7 @@ static int enable_uffd(int uffd, unsigned long addr, unsigned long len)
 
 	pr_info("lazy-pages: register: %lx, len %lx\n", addr, len);
 
-	rc = sys_ioctl(uffd, UFFDIO_REGISTER, (unsigned long) &uffdio_register);
+	rc = sys_ioctl(uffd, UFFDIO_REGISTER, (unsigned long)&uffdio_register);
 	if (rc != 0) {
 		pr_err("lazy-pages: register %lx failed: rc:%d, \n", addr, rc);
 		return -1;
@@ -924,7 +899,6 @@ static int enable_uffd(int uffd, unsigned long addr, unsigned long len)
 	return 0;
 }
 
-
 static int vma_remap(VmaEntry *vma_entry, int uffd)
 {
 	unsigned long src = vma_premmaped_start(vma_entry);
@@ -970,23 +944,20 @@ static int vma_remap(VmaEntry *vma_entry, int uffd)
 		unsigned long addr;
 
 		/* Map guard page (step 2) */
-		tmp = sys_mmap((void *) guard, PAGE_SIZE, PROT_NONE,
-					MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+		tmp = sys_mmap((void *)guard, PAGE_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 		if (tmp != guard) {
 			pr_err("Unable to map a guard page %lx (%lx)\n", guard, tmp);
 			return -1;
 		}
 
 		/* Move src to non-overlapping place (step 3) */
-		addr = sys_mmap(NULL, len, PROT_NONE,
-					MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-		if (addr == (unsigned long) MAP_FAILED) {
+		addr = sys_mmap(NULL, len, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+		if (addr == (unsigned long)MAP_FAILED) {
 			pr_err("Unable to reserve memory (%lx)\n", addr);
 			return -1;
 		}
 
-		tmp = sys_mremap(src, len, len,
-					MREMAP_MAYMOVE | MREMAP_FIXED, addr);
+		tmp = sys_mremap(src, len, len, MREMAP_MAYMOVE | MREMAP_FIXED, addr);
 		if (tmp != addr) {
 			pr_err("Unable to remap %lx -> %lx (%lx)\n", src, addr, tmp);
 			return -1;
@@ -1042,14 +1013,13 @@ static int timerfd_arm(struct task_restore_args *args)
 
 			t->val.it_value.tv_sec += (time_t)ts.tv_sec;
 
-			pr_debug("Adjust id %#x it_value(%llu, %llu) -> it_value(%llu, %llu)\n",
-				 t->id, (unsigned long long)ts.tv_sec,
-				 (unsigned long long)ts.tv_nsec,
+			pr_debug("Adjust id %#x it_value(%llu, %llu) -> it_value(%llu, %llu)\n", t->id,
+				 (unsigned long long)ts.tv_sec, (unsigned long long)ts.tv_nsec,
 				 (unsigned long long)t->val.it_value.tv_sec,
 				 (unsigned long long)t->val.it_value.tv_nsec);
 		}
 
-		ret  = sys_timerfd_settime(t->fd, t->settime_flags, &t->val, NULL);
+		ret = sys_timerfd_settime(t->fd, t->settime_flags, &t->val, NULL);
 		if (t->ticks)
 			ret |= sys_ioctl(t->fd, TFD_IOC_SET_TICKS, (unsigned long)&t->ticks);
 		if (ret) {
@@ -1143,9 +1113,8 @@ void __export_unmap(void)
  * [ 1st end -- 2nd start ]
  * [ 2nd start -- task_size ]
  */
-static int unmap_old_vmas(void *premmapped_addr, unsigned long premmapped_len,
-		      void *bootstrap_start, unsigned long bootstrap_len,
-		      unsigned long task_size)
+static int unmap_old_vmas(void *premmapped_addr, unsigned long premmapped_len, void *bootstrap_start,
+			  unsigned long bootstrap_len, unsigned long task_size)
 {
 	unsigned long s1, s2;
 	void *p1, *p2;
@@ -1177,8 +1146,7 @@ static int unmap_old_vmas(void *premmapped_addr, unsigned long premmapped_len,
 
 	ret = sys_munmap(p2 + s2, task_size - (unsigned long)(p2 + s2));
 	if (ret) {
-		pr_err("Unable to unmap (%p-%p): %d\n",
-				p2 + s2, (void *)task_size, ret);
+		pr_err("Unable to unmap (%p-%p): %d\n", p2 + s2, (void *)task_size, ret);
 		return -1;
 	}
 
@@ -1199,8 +1167,7 @@ static int wait_helpers(struct task_restore_args *task_args)
 			continue;
 		}
 		if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-			pr_err("%d exited with non-zero code (%d,%d)\n", pid,
-				WEXITSTATUS(status), WTERMSIG(status));
+			pr_err("%d exited with non-zero code (%d,%d)\n", pid, WEXITSTATUS(status), WTERMSIG(status));
 			return -1;
 		}
 	}
@@ -1223,8 +1190,7 @@ static int wait_zombies(struct task_restore_args *task_args)
 			 * Let's wait when someone complete this stage
 			 * and try again.
 			 */
-			futex_wait_while_eq(&task_entries_local->nr_in_progress,
-								nr_in_progress);
+			futex_wait_while_eq(&task_entries_local->nr_in_progress, nr_in_progress);
 			i--;
 			continue;
 		}
@@ -1232,8 +1198,7 @@ static int wait_zombies(struct task_restore_args *task_args)
 			pr_err("Wait on %d zombie failed: %d\n", task_args->zombies[i], ret);
 			return -1;
 		}
-		pr_debug("%ld: Collect a zombie with pid %d\n",
-			sys_getpid(), task_args->zombies[i]);
+		pr_debug("%ld: Collect a zombie with pid %d\n", sys_getpid(), task_args->zombies[i]);
 	}
 
 	return 0;
@@ -1319,8 +1284,8 @@ static int map_vdso(struct task_restore_args *args, bool compatible)
 
 static int fd_poll(int inotify_fd)
 {
-	struct pollfd pfd = {inotify_fd, POLLIN, 0};
-	struct timespec tmo = {0, 0};
+	struct pollfd pfd = { inotify_fd, POLLIN, 0 };
+	struct timespec tmo = { 0, 0 };
 
 	return sys_ppoll(&pfd, 1, &tmo, NULL, sizeof(sigset_t));
 }
@@ -1341,7 +1306,7 @@ static int cleanup_inotify_events(int inotify_fd)
 	int ret;
 
 	/* Limit buf to be lesser than half of restorer's stack */
-	BUILD_BUG_ON(ARRAY_SIZE(buf) >= RESTORE_STACK_SIZE/2);
+	BUILD_BUG_ON(ARRAY_SIZE(buf) >= RESTORE_STACK_SIZE / 2);
 
 	while (1) {
 		ret = fd_poll(inotify_fd);
@@ -1408,9 +1373,9 @@ long __export_restore_task(struct task_restore_args *args)
 	bool has_vdso_proxy;
 
 	bootstrap_start = args->bootstrap_start;
-	bootstrap_len	= args->bootstrap_len;
+	bootstrap_len = args->bootstrap_len;
 
-	vdso_rt_size	= args->vdso_rt_size;
+	vdso_rt_size = args->vdso_rt_size;
 
 	fi_strategy = args->fault_strategy;
 
@@ -1467,13 +1432,12 @@ long __export_restore_task(struct task_restore_args *args)
 		}
 		if (!can_restore_vdso(args))
 			goto core_restore_end;
-		if (vdso_do_park(&args->vdso_maps_rt,
-				args->vdso_rt_parked_at, vdso_rt_size))
+		if (vdso_do_park(&args->vdso_maps_rt, args->vdso_rt_parked_at, vdso_rt_size))
 			goto core_restore_end;
 	}
 
-	if (unmap_old_vmas((void *)args->premmapped_addr, args->premmapped_len,
-				bootstrap_start, bootstrap_len, args->task_size))
+	if (unmap_old_vmas((void *)args->premmapped_addr, args->premmapped_len, bootstrap_start, bootstrap_len,
+			   args->task_size))
 		goto core_restore_end;
 
 	/* Map vdso that wasn't parked */
@@ -1542,8 +1506,7 @@ long __export_restore_task(struct task_restore_args *args)
 	for (i = 0; i < args->vmas_n; i++) {
 		vma_entry = args->vmas + i;
 
-		if (!vma_entry_is(vma_entry, VMA_AREA_REGULAR) &&
-				!vma_entry_is(vma_entry, VMA_AREA_AIORING))
+		if (!vma_entry_is(vma_entry, VMA_AREA_REGULAR) && !vma_entry_is(vma_entry, VMA_AREA_AIORING))
 			continue;
 
 		if (vma_entry_is(vma_entry, VMA_PREMMAPED))
@@ -1552,7 +1515,7 @@ long __export_restore_task(struct task_restore_args *args)
 		va = restore_mapping(vma_entry);
 
 		if (va != vma_entry->start) {
-			pr_err("Can't restore %"PRIx64" mapping with %lx\n", vma_entry->start, va);
+			pr_err("Can't restore %" PRIx64 " mapping with %lx\n", vma_entry->start, va);
 			goto core_restore_end;
 		}
 	}
@@ -1568,9 +1531,7 @@ long __export_restore_task(struct task_restore_args *args)
 		ssize_t r;
 
 		while (nr) {
-			pr_debug("Preadv %lx:%d... (%d iovs)\n",
-					(unsigned long)iovs->iov_base,
-					(int)iovs->iov_len, nr);
+			pr_debug("Preadv %lx:%d... (%d iovs)\n", (unsigned long)iovs->iov_base, (int)iovs->iov_len, nr);
 			r = sys_preadv(args->vma_ios_fd, iovs, nr, rio->off);
 			if (r < 0) {
 				pr_err("Can't read pages data (%d)\n", (int)r);
@@ -1581,8 +1542,8 @@ long __export_restore_task(struct task_restore_args *args)
 			/* If the file is open for writing, then it means we should punch holes
 			 * in it. */
 			if (r > 0 && args->auto_dedup) {
-				int fr = sys_fallocate(args->vma_ios_fd, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE,
-					rio->off, r);
+				int fr = sys_fallocate(args->vma_ios_fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE,
+						       rio->off, r);
 				if (fr < 0) {
 					pr_debug("Failed to punch holes with fallocate: %d\n", fr);
 				}
@@ -1613,9 +1574,8 @@ long __export_restore_task(struct task_restore_args *args)
 	/*
 	 * Proxify vDSO.
 	 */
-	if (vdso_proxify(&args->vdso_maps_rt,  &has_vdso_proxy,
-			 args->vmas, args->vmas_n, args->compatible_mode,
-		         fault_injected(FI_VDSO_TRAMPOLINES)))
+	if (vdso_proxify(&args->vdso_maps_rt, &has_vdso_proxy, args->vmas, args->vmas_n, args->compatible_mode,
+			 fault_injected(FI_VDSO_TRAMPOLINES)))
 		goto core_restore_end;
 
 	/* unmap rt-vdso with restorer blob after restore's finished */
@@ -1632,13 +1592,10 @@ long __export_restore_task(struct task_restore_args *args)
 		if (!(vma_entry_is(vma_entry, VMA_AREA_REGULAR)))
 			continue;
 
-		if ((vma_entry->prot & PROT_WRITE) ||
-				(vma_entry->status & VMA_NO_PROT_WRITE))
+		if ((vma_entry->prot & PROT_WRITE) || (vma_entry->status & VMA_NO_PROT_WRITE))
 			continue;
 
-		sys_mprotect(decode_pointer(vma_entry->start),
-			     vma_entry_len(vma_entry),
-			     vma_entry->prot);
+		sys_mprotect(decode_pointer(vma_entry->start), vma_entry_len(vma_entry), vma_entry->prot);
 	}
 
 	/*
@@ -1662,15 +1619,11 @@ long __export_restore_task(struct task_restore_args *args)
 
 		for (m = 0; m < sizeof(vma_entry->madv) * 8; m++) {
 			if (vma_entry->madv & (1ul << m)) {
-				ret = sys_madvise(vma_entry->start,
-						  vma_entry_len(vma_entry),
-						  m);
+				ret = sys_madvise(vma_entry->start, vma_entry_len(vma_entry), m);
 				if (ret) {
-					pr_err("madvise(%"PRIx64", %"PRIu64", %ld) "
+					pr_err("madvise(%" PRIx64 ", %" PRIu64 ", %ld) "
 					       "failed with %ld\n",
-						vma_entry->start,
-						vma_entry_len(vma_entry),
-						m, ret);
+					       vma_entry->start, vma_entry_len(vma_entry), m, ret);
 					goto core_restore_end;
 				}
 			}
@@ -1689,36 +1642,36 @@ long __export_restore_task(struct task_restore_args *args)
 	 * more widespread once kernel get deployed over the world.
 	 * Thus lets be opportunistic and use new interface as a try.
 	 */
-	prctl_map = (struct prctl_mm_map) {
-		.start_code	= args->mm.mm_start_code,
-		.end_code	= args->mm.mm_end_code,
-		.start_data	= args->mm.mm_start_data,
-		.end_data	= args->mm.mm_end_data,
-		.start_stack	= args->mm.mm_start_stack,
-		.start_brk	= args->mm.mm_start_brk,
-		.brk		= args->mm.mm_brk,
-		.arg_start	= args->mm.mm_arg_start,
-		.arg_end	= args->mm.mm_arg_end,
-		.env_start	= args->mm.mm_env_start,
-		.env_end	= args->mm.mm_env_end,
-		.auxv		= (void *)args->mm_saved_auxv,
-		.auxv_size	= args->mm_saved_auxv_size,
-		.exe_fd		= args->fd_exe_link,
+	prctl_map = (struct prctl_mm_map){
+		.start_code = args->mm.mm_start_code,
+		.end_code = args->mm.mm_end_code,
+		.start_data = args->mm.mm_start_data,
+		.end_data = args->mm.mm_end_data,
+		.start_stack = args->mm.mm_start_stack,
+		.start_brk = args->mm.mm_start_brk,
+		.brk = args->mm.mm_brk,
+		.arg_start = args->mm.mm_arg_start,
+		.arg_end = args->mm.mm_arg_end,
+		.env_start = args->mm.mm_env_start,
+		.env_end = args->mm.mm_env_end,
+		.auxv = (void *)args->mm_saved_auxv,
+		.auxv_size = args->mm_saved_auxv_size,
+		.exe_fd = args->fd_exe_link,
 	};
 	ret = sys_prctl(PR_SET_MM, PR_SET_MM_MAP, (long)&prctl_map, sizeof(prctl_map), 0);
 	if (ret == -EINVAL) {
-		ret  = sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_CODE,	(long)args->mm.mm_start_code, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_END_CODE,	(long)args->mm.mm_end_code, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_DATA,	(long)args->mm.mm_start_data, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_END_DATA,	(long)args->mm.mm_end_data, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_STACK,	(long)args->mm.mm_start_stack, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_BRK,	(long)args->mm.mm_start_brk, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_BRK,		(long)args->mm.mm_brk, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ARG_START,	(long)args->mm.mm_arg_start, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ARG_END,	(long)args->mm.mm_arg_end, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ENV_START,	(long)args->mm.mm_env_start, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ENV_END,	(long)args->mm.mm_env_end, 0);
-		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_AUXV,	(long)args->mm_saved_auxv, args->mm_saved_auxv_size);
+		ret = sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_CODE, (long)args->mm.mm_start_code, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_END_CODE, (long)args->mm.mm_end_code, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_DATA, (long)args->mm.mm_start_data, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_END_DATA, (long)args->mm.mm_end_data, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_STACK, (long)args->mm.mm_start_stack, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_BRK, (long)args->mm.mm_start_brk, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_BRK, (long)args->mm.mm_brk, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ARG_START, (long)args->mm.mm_arg_start, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ARG_END, (long)args->mm.mm_arg_end, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ENV_START, (long)args->mm.mm_env_start, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_ENV_END, (long)args->mm.mm_env_end, 0);
+		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_AUXV, (long)args->mm_saved_auxv, args->mm_saved_auxv_size);
 
 		/*
 		 * Because of requirements applied from kernel side
@@ -1739,8 +1692,7 @@ long __export_restore_task(struct task_restore_args *args)
 	/* SELinux (1) process context needs to be set before creating threads. */
 	if (args->lsm_type == LSMTYPE__SELINUX) {
 		/* Only for SELinux */
-		if (lsm_set_label(args->t->creds_args->lsm_profile,
-				  "current", args->proc_fd) < 0)
+		if (lsm_set_label(args->t->creds_args->lsm_profile, "current", args->proc_fd) < 0)
 			goto core_restore_end;
 	}
 
@@ -1775,8 +1727,7 @@ long __export_restore_task(struct task_restore_args *args)
 
 	if (args->nr_threads > 1) {
 		struct thread_restore_args *thread_args = args->thread_args;
-		long clone_flags = CLONE_VM | CLONE_FILES | CLONE_SIGHAND	|
-				   CLONE_THREAD | CLONE_SYSVSEM | CLONE_FS;
+		long clone_flags = CLONE_VM | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | CLONE_SYSVSEM | CLONE_FS;
 		long last_pid_len;
 		pid_t thread_pid;
 		long parent_tid;
@@ -1789,7 +1740,6 @@ long __export_restore_task(struct task_restore_args *args)
 				pr_err("can't open last pid fd %d\n", fd);
 				goto core_restore_end;
 			}
-
 		}
 		mutex_lock(&task_entries_local->last_pid_mutex);
 
@@ -1813,9 +1763,11 @@ long __export_restore_task(struct task_restore_args *args)
 				c_args.child_tid = ptr_to_u64(&thread_args[i].pid);
 				c_args.parent_tid = ptr_to_u64(&parent_tid);
 				pr_debug("Using clone3 to restore the process\n");
-				RUN_CLONE3_RESTORE_FN(ret, c_args, sizeof(c_args), &thread_args[i], args->clone_restore_fn);
+				RUN_CLONE3_RESTORE_FN(ret, c_args, sizeof(c_args), &thread_args[i],
+						      args->clone_restore_fn);
 			} else {
-				last_pid_len = std_vprint_num(last_pid_buf, sizeof(last_pid_buf), thread_args[i].pid - 1, &s);
+				last_pid_len =
+					std_vprint_num(last_pid_buf, sizeof(last_pid_buf), thread_args[i].pid - 1, &s);
 				sys_lseek(fd, 0, SEEK_SET);
 				ret = sys_write(fd, s, last_pid_len);
 				if (ret < 0) {
@@ -1831,7 +1783,8 @@ long __export_restore_task(struct task_restore_args *args)
 				 * thread will run with own stack and we must not
 				 * have any additional instructions... oh, dear...
 				 */
-				RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, thread_args, args->clone_restore_fn);
+				RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, thread_args,
+						     args->clone_restore_fn);
 			}
 			if (ret != thread_args[i].pid) {
 				pr_err("Unable to create a thread: %ld\n", ret);
@@ -1879,8 +1832,7 @@ long __export_restore_task(struct task_restore_args *args)
 		goto core_restore_end;
 
 	if (!args->compatible_mode) {
-		ret = sys_sigaction(SIGCHLD, &args->sigchld_act,
-				NULL, sizeof(k_rtsigset_t));
+		ret = sys_sigaction(SIGCHLD, &args->sigchld_act, NULL, sizeof(k_rtsigset_t));
 	} else {
 		void *stack = alloc_compat_syscall_stack();
 
@@ -1888,8 +1840,7 @@ long __export_restore_task(struct task_restore_args *args)
 			pr_err("Failed to allocate 32-bit stack for sigaction\n");
 			goto core_restore_end;
 		}
-		ret = arch_compat_rt_sigaction(stack, SIGCHLD,
-				(void*)&args->sigchld_act);
+		ret = arch_compat_rt_sigaction(stack, SIGCHLD, (void *)&args->sigchld_act);
 		free_compat_syscall_stack(stack);
 	}
 	if (ret) {
@@ -1921,8 +1872,7 @@ long __export_restore_task(struct task_restore_args *args)
 	 * turning off TCP repair is CAP_SYS_NED_ADMIN protected,
 	 * thus restore* creds _after_ all of the above.
 	 */
-	ret = restore_creds(args->t->creds_args, args->proc_fd,
-			    args->lsm_type);
+	ret = restore_creds(args->t->creds_args, args->proc_fd, args->lsm_type);
 	ret = ret || restore_dumpable_flag(&args->mm);
 	ret = ret || restore_pdeath_sig(args->t);
 	ret = ret || restore_child_subreaper(args->child_subreaper);
@@ -1945,9 +1895,7 @@ long __export_restore_task(struct task_restore_args *args)
 	 * code below doesn't fail due to bad timing values.
 	 */
 
-#define itimer_armed(args, i)				\
-		(args->itimers[i].it_interval.tv_sec ||	\
-		 args->itimers[i].it_interval.tv_usec)
+#define itimer_armed(args, i) (args->itimers[i].it_interval.tv_sec || args->itimers[i].it_interval.tv_usec)
 
 	if (itimer_armed(args, 0))
 		sys_setitimer(ITIMER_REAL, &args->itimers[0], NULL);
diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index 5e1f128e8..f1e3239ff 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -17,14 +17,14 @@
 #include "common/bug.h"
 
 #ifdef CR_NOGLIBC
-# include <compel/plugins/std/string.h>
+#include <compel/plugins/std/string.h>
 #else
-# include <string.h>
-# define std_strncmp strncmp
+#include <string.h>
+#define std_strncmp strncmp
 #endif
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
@@ -37,18 +37,15 @@ static bool __ptr_oob(uintptr_t ptr, uintptr_t start, size_t size)
 }
 
 /* Check if pointed structure's end is out-of-bound */
-static bool __ptr_struct_end_oob(uintptr_t ptr, size_t struct_size,
-				uintptr_t start, size_t size)
+static bool __ptr_struct_end_oob(uintptr_t ptr, size_t struct_size, uintptr_t start, size_t size)
 {
 	return __ptr_oob(ptr + struct_size - 1, start, size);
 }
 
 /* Check if pointed structure is out-of-bound */
-static bool __ptr_struct_oob(uintptr_t ptr, size_t struct_size,
-				uintptr_t start, size_t size)
+static bool __ptr_struct_oob(uintptr_t ptr, size_t struct_size, uintptr_t start, size_t size)
 {
-	return __ptr_oob(ptr, start, size) ||
-		__ptr_struct_end_oob(ptr, struct_size, start, size);
+	return __ptr_oob(ptr, start, size) || __ptr_struct_end_oob(ptr, struct_size, start, size);
 }
 
 /*
@@ -81,13 +78,11 @@ static int has_elf_identity(Ehdr_t *ehdr)
 	 */
 #if defined(CONFIG_VDSO_32)
 	static const char elf_ident[] = {
-		0x7f, 0x45, 0x4c, 0x46, 0x01, BORD, 0x01, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x7f, 0x45, 0x4c, 0x46, 0x01, BORD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	};
 #else
 	static const char elf_ident[] = {
-		0x7f, 0x45, 0x4c, 0x46, 0x02, BORD, 0x01, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x7f, 0x45, 0x4c, 0x46, 0x02, BORD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	};
 #endif
 
@@ -101,8 +96,7 @@ static int has_elf_identity(Ehdr_t *ehdr)
 	return true;
 }
 
-static int parse_elf_phdr(uintptr_t mem, size_t size,
-		Phdr_t **dynamic, Phdr_t **load)
+static int parse_elf_phdr(uintptr_t mem, size_t size, Phdr_t **dynamic, Phdr_t **load)
 {
 	Ehdr_t *ehdr = (void *)mem;
 	uintptr_t addr;
@@ -157,8 +151,8 @@ err_oob:
  *   @dyn_symtab - address of the string table section
  *   @dyn_hash   - address of the symbol hash table
  */
-static int parse_elf_dynamic(uintptr_t mem, size_t size, Phdr_t *dynamic,
-		Dyn_t **dyn_strtab, Dyn_t **dyn_symtab, Dyn_t **dyn_hash)
+static int parse_elf_dynamic(uintptr_t mem, size_t size, Phdr_t *dynamic, Dyn_t **dyn_strtab, Dyn_t **dyn_symtab,
+			     Dyn_t **dyn_hash)
 {
 	Dyn_t *dyn_syment = NULL;
 	Dyn_t *dyn_strsz = NULL;
@@ -170,8 +164,7 @@ static int parse_elf_dynamic(uintptr_t mem, size_t size, Phdr_t *dynamic,
 	if (__ptr_oob(addr, mem, size))
 		goto err_oob;
 
-	for (i = 0; i < dynamic->p_filesz / sizeof(*d);
-			i++, addr += sizeof(Dyn_t)) {
+	for (i = 0; i < dynamic->p_filesz / sizeof(*d); i++, addr += sizeof(Dyn_t)) {
 		if (__ptr_struct_end_oob(addr, sizeof(Dyn_t), mem, size))
 			goto err_oob;
 		d = (void *)addr;
@@ -215,15 +208,12 @@ typedef unsigned long Hash_t;
 typedef Word_t Hash_t;
 #endif
 
-static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
-		struct vdso_symtable *t, uintptr_t dynsymbol_names,
-		Hash_t *hash, Dyn_t *dyn_symtab)
+static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load, struct vdso_symtable *t,
+			      uintptr_t dynsymbol_names, Hash_t *hash, Dyn_t *dyn_symtab)
 {
 	ARCH_VDSO_SYMBOLS_LIST
 
-	const char *vdso_symbols[VDSO_SYMBOL_MAX] = {
-		ARCH_VDSO_SYMBOLS
-	};
+	const char *vdso_symbols[VDSO_SYMBOL_MAX] = { ARCH_VDSO_SYMBOLS };
 	const size_t vdso_symbol_length = sizeof(t->symbols[0].name) - 1;
 
 	Hash_t nbucket, nchain;
@@ -237,11 +227,11 @@ static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 	bucket = &hash[2];
 	chain = &hash[nbucket + 2];
 
-	pr_debug("nbucket %lx nchain %lx bucket %lx chain %lx\n",
-		 (long)nbucket, (long)nchain, (unsigned long)bucket, (unsigned long)chain);
+	pr_debug("nbucket %lx nchain %lx bucket %lx chain %lx\n", (long)nbucket, (long)nchain, (unsigned long)bucket,
+		 (unsigned long)chain);
 
 	for (i = 0; i < VDSO_SYMBOL_MAX; i++) {
-		const char * symbol = vdso_symbols[i];
+		const char *symbol = vdso_symbols[i];
 		k = elf_hash((const unsigned char *)symbol);
 
 		for (j = bucket[k % nbucket]; j < nchain && j != STN_UNDEF; j = chain[j]) {
@@ -250,13 +240,12 @@ static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 
 			addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
 
-			addr += sizeof(Sym_t)*j;
+			addr += sizeof(Sym_t) * j;
 			if (__ptr_struct_oob(addr, sizeof(Sym_t), mem, size))
 				continue;
 			sym = (void *)addr;
 
-			if (ELF_ST_TYPE(sym->st_info) != STT_FUNC &&
-			    ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
+			if (ELF_ST_TYPE(sym->st_info) != STT_FUNC && ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
 				continue;
 
 			addr = dynsymbol_names + sym->st_name;
@@ -307,8 +296,7 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 	 * needed. Note that we're interested in a small set of tags.
 	 */
 
-	ret = parse_elf_dynamic(mem, size, dynamic,
-			&dyn_strtab, &dyn_symtab, &dyn_hash);
+	ret = parse_elf_dynamic(mem, size, dynamic, &dyn_strtab, &dyn_symtab, &dyn_hash);
 	if (ret < 0)
 		return ret;
 
@@ -330,4 +318,3 @@ err_oob:
 	pr_err("Corrupted Elf symbols/hash\n");
 	return -EFAULT;
 }
-
diff --git a/criu/pie/util.c b/criu/pie/util.c
index 4945483f6..e7a5a9f23 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -13,10 +13,10 @@
 #include "util-pie.h"
 
 #ifdef CR_NOGLIBC
-# include <compel/plugins/std/syscall.h>
-# define __sys(foo)     sys_##foo
+#include <compel/plugins/std/syscall.h>
+#define __sys(foo) sys_##foo
 #else
-# define __sys(foo)     foo
+#define __sys(foo) foo
 #endif
 
 #ifdef CR_NOGLIBC
diff --git a/criu/pipes.c b/criu/pipes.c
index 5787fdc53..43ff06e3d 100644
--- a/criu/pipes.c
+++ b/criu/pipes.c
@@ -46,8 +46,7 @@ static int pipe_data_read(struct cr_img *img, struct pipe_data_rst *r)
 	 * anyway we don't increase memory consumption :)
 	 */
 
-	r->data = mmap(NULL, bytes, PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	r->data = mmap(NULL, bytes, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (r->data == MAP_FAILED) {
 		pr_perror("Can't map mem for pipe buffers");
 		return -1;
@@ -56,8 +55,8 @@ static int pipe_data_read(struct cr_img *img, struct pipe_data_rst *r)
 	return read_img_buf(img, r->data, bytes);
 }
 
-int do_collect_pipe_data(struct pipe_data_rst *r, ProtobufCMessage *msg,
-		struct cr_img *img, struct pipe_data_rst **hash)
+int do_collect_pipe_data(struct pipe_data_rst *r, ProtobufCMessage *msg, struct cr_img *img,
+			 struct pipe_data_rst **hash)
 {
 	int aux;
 
@@ -69,8 +68,7 @@ int do_collect_pipe_data(struct pipe_data_rst *r, ProtobufCMessage *msg,
 	aux = r->pde->pipe_id & PIPE_DATA_HASH_MASK;
 	r->next = hash[aux];
 	hash[aux] = r;
-	pr_info("Collected pipe data for %#x (chain %u)\n",
-			r->pde->pipe_id, aux);
+	pr_info("Collected pipe data for %#x (chain %u)\n", r->pde->pipe_id, aux);
 	return 0;
 }
 
@@ -161,8 +159,7 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash
 	}
 
 	if (pd->pde->has_size) {
-		pr_info("Restoring size %#x for %#x\n",
-				pd->pde->size, pd->pde->pipe_id);
+		pr_info("Restoring size %#x for %#x\n", pd->pde->size, pd->pde->pipe_id);
 		ret = fcntl(pfd, F_SETPIPE_SZ, pd->pde->size);
 		if (ret < 0) {
 			pr_perror("Can't restore pipe size");
@@ -189,8 +186,7 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash
 		}
 
 		if (ret == 0 || ret > iov.iov_len /* sanity */) {
-			pr_err("%#x: Wanted to restore %zu bytes, but got %d\n", id,
-					iov.iov_len, ret);
+			pr_err("%#x: Wanted to restore %zu bytes, but got %d\n", id, iov.iov_len, ret);
 			return -1;
 		}
 
@@ -216,7 +212,7 @@ int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash
 static int userns_reopen(void *_arg, int fd, pid_t pid)
 {
 	char path[PSFDS];
-	int ret, flags = *(int*)_arg;
+	int ret, flags = *(int *)_arg;
 
 	sprintf(path, "/proc/self/fd/%d", fd);
 	ret = open(path, flags);
@@ -237,8 +233,7 @@ static int reopen_pipe(int fd, int flags)
 	if (ret < 0) {
 		if (errno == EACCES) {
 			/* It may be an external pipe from an another userns */
-			ret = userns_call(userns_reopen, UNS_FDOUT,
-						&flags, sizeof(flags), fd);
+			ret = userns_call(userns_reopen, UNS_FDOUT, &flags, sizeof(flags), fd);
 		} else
 			pr_perror("Unable to reopen the pipe %s", path);
 	}
@@ -279,8 +274,7 @@ static char *pipe_d_name(struct file_desc *d, char *buf, size_t s)
 
 	pi = container_of(d, struct pipe_info, d);
 	if (snprintf(buf, s, "pipe:[%u]", pi->pe->pipe_id) >= s) {
-		pr_err("Not enough room for pipe %u identifier string\n",
-				pi->pe->pipe_id);
+		pr_err("Not enough room for pipe %u identifier string\n", pi->pe->pipe_id);
 		return NULL;
 	}
 
@@ -311,8 +305,7 @@ int open_pipe(struct file_desc *d, int *new_fd)
 		return -1;
 	}
 
-	ret = restore_pipe_data(CR_FD_PIPES_DATA, pfd[1],
-			pi->pe->pipe_id, pd_hash_pipes);
+	ret = restore_pipe_data(CR_FD_PIPES_DATA, pfd[1], pi->pe->pipe_id, pd_hash_pipes);
 	if (ret)
 		return -1;
 
@@ -342,9 +335,9 @@ reopen:
 }
 
 static struct file_desc_ops pipe_desc_ops = {
-	.type		= FD_TYPES__PIPE,
-	.open		= open_pipe,
-	.name		= pipe_d_name,
+	.type = FD_TYPES__PIPE,
+	.open = open_pipe,
+	.name = pipe_d_name,
 };
 
 int collect_one_pipe_ops(void *o, ProtobufCMessage *base, struct file_desc_ops *ops)
@@ -355,8 +348,7 @@ int collect_one_pipe_ops(void *o, ProtobufCMessage *base, struct file_desc_ops *
 
 	pi->create = 0;
 	pi->reopen = 1;
-	pr_info("Collected pipe entry ID %#x PIPE ID %#x\n",
-			pi->pe->id, pi->pe->pipe_id);
+	pr_info("Collected pipe entry ID %#x PIPE ID %#x\n", pi->pe->id, pi->pe->pipe_id);
 
 	if (file_desc_add(&pi->d, pi->pe->id, ops))
 		return -1;
@@ -455,10 +447,10 @@ int dump_one_pipe_data(struct pipe_data_dump *pd, int lfd, const struct fd_parms
 		bytes = 0;
 	}
 
-	pde.pipe_id	= pipe_id(p);
-	pde.bytes	= bytes;
-	pde.has_size	= true;
-	pde.size	= pipe_size;
+	pde.pipe_id = pipe_id(p);
+	pde.bytes = bytes;
+	pde.has_size = true;
+	pde.size = pipe_size;
 
 	if (pb_write_one(img, &pde, PB_PIPE_DATA))
 		goto err_close;
@@ -483,25 +475,26 @@ err:
 	return ret;
 }
 
-static struct pipe_data_dump pd_pipes = { .img_type = CR_FD_PIPES_DATA, };
+static struct pipe_data_dump pd_pipes = {
+	.img_type = CR_FD_PIPES_DATA,
+};
 
 static int dump_one_pipe(int lfd, u32 id, const struct fd_parms *p)
 {
 	FileEntry fe = FILE_ENTRY__INIT;
 	PipeEntry pe = PIPE_ENTRY__INIT;
 
-	pr_info("Dumping pipe %d with id %#x pipe_id %#x\n",
-			lfd, id, pipe_id(p));
+	pr_info("Dumping pipe %d with id %#x pipe_id %#x\n", lfd, id, pipe_id(p));
 
 	if ((p->flags & O_DIRECT) && !is_autofs_pipe(pipe_id(p))) {
 		pr_err("The packetized mode for pipes is not supported yet\n");
 		return -1;
 	}
 
-	pe.id		= id;
-	pe.pipe_id	= pipe_id(p);
-	pe.flags	= p->flags & ~O_DIRECT;
-	pe.fown		= (FownEntry *)&p->fown;
+	pe.id = id;
+	pe.pipe_id = pipe_id(p);
+	pe.flags = p->flags & ~O_DIRECT;
+	pe.fown = (FownEntry *)&p->fown;
 
 	fe.type = FD_TYPES__PIPE;
 	fe.id = pe.id;
@@ -514,6 +507,6 @@ static int dump_one_pipe(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops pipe_dump_ops = {
-	.type		= FD_TYPES__PIPE,
-	.dump		= dump_one_pipe,
+	.type = FD_TYPES__PIPE,
+	.dump = dump_one_pipe,
 };
diff --git a/criu/plugin.c b/criu/plugin.c
index f35a04fc9..3fe03c7cd 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -30,29 +30,30 @@ static cr_plugin_desc_t *cr_gen_plugin_desc(void *h, char *path)
 	if (!d)
 		return NULL;
 
-	d->name		= xstrdup(path);
-	d->max_hooks	= CR_PLUGIN_HOOK__MAX;
-	d->version	= CRIU_PLUGIN_VERSION_OLD;
+	d->name = xstrdup(path);
+	d->max_hooks = CR_PLUGIN_HOOK__MAX;
+	d->version = CRIU_PLUGIN_VERSION_OLD;
 
 	pr_warn("Generating dynamic descriptor for plugin `%s'."
 		"Won't work in next version of the program."
-		"Please update your plugin.\n", path);
+		"Please update your plugin.\n",
+		path);
 
-#define __assign_hook(__hook, __name)					\
-	do {								\
-		void *name;						\
-		name = dlsym(h, __name);				\
-		if (name)						\
-			d->hooks[CR_PLUGIN_HOOK__ ##__hook] = name;	\
+#define __assign_hook(__hook, __name)                              \
+	do {                                                       \
+		void *name;                                        \
+		name = dlsym(h, __name);                           \
+		if (name)                                          \
+			d->hooks[CR_PLUGIN_HOOK__##__hook] = name; \
 	} while (0)
 
-	__assign_hook(DUMP_UNIX_SK,		"cr_plugin_dump_unix_sk");
-	__assign_hook(RESTORE_UNIX_SK,		"cr_plugin_restore_unix_sk");
-	__assign_hook(DUMP_EXT_FILE,		"cr_plugin_dump_file");
-	__assign_hook(RESTORE_EXT_FILE,		"cr_plugin_restore_file");
-	__assign_hook(DUMP_EXT_MOUNT,		"cr_plugin_dump_ext_mount");
-	__assign_hook(RESTORE_EXT_MOUNT,	"cr_plugin_restore_ext_mount");
-	__assign_hook(DUMP_EXT_LINK,		"cr_plugin_dump_ext_link");
+	__assign_hook(DUMP_UNIX_SK, "cr_plugin_dump_unix_sk");
+	__assign_hook(RESTORE_UNIX_SK, "cr_plugin_restore_unix_sk");
+	__assign_hook(DUMP_EXT_FILE, "cr_plugin_dump_file");
+	__assign_hook(RESTORE_EXT_FILE, "cr_plugin_restore_file");
+	__assign_hook(DUMP_EXT_MOUNT, "cr_plugin_dump_ext_mount");
+	__assign_hook(RESTORE_EXT_MOUNT, "cr_plugin_restore_ext_mount");
+	__assign_hook(DUMP_EXT_LINK, "cr_plugin_dump_ext_link");
 
 #undef __assign_hook
 
@@ -66,8 +67,7 @@ static void show_plugin_desc(cr_plugin_desc_t *d)
 {
 	size_t i;
 
-	pr_debug("Plugin \"%s\" (version %u hooks %u)\n",
-		 d->name, d->version, d->max_hooks);
+	pr_debug("Plugin \"%s\" (version %u hooks %u)\n", d->name, d->version, d->max_hooks);
 	for (i = 0; i < d->max_hooks; i++) {
 		if (d->hooks[i])
 			pr_debug("\t%4zu -> %p\n", i, d->hooks[i]);
@@ -77,14 +77,13 @@ static void show_plugin_desc(cr_plugin_desc_t *d)
 static int verify_plugin(cr_plugin_desc_t *d)
 {
 	if (d->version > CRIU_PLUGIN_VERSION) {
-		pr_debug("Plugin %s has version %x while max %x supported\n",
-			 d->name, d->version, CRIU_PLUGIN_VERSION);
+		pr_debug("Plugin %s has version %x while max %x supported\n", d->name, d->version, CRIU_PLUGIN_VERSION);
 		return -1;
 	}
 
 	if (d->max_hooks > CR_PLUGIN_HOOK__MAX) {
-		pr_debug("Plugin %s has %u assigned while max %u supported\n",
-			 d->name, d->max_hooks, CR_PLUGIN_HOOK__MAX);
+		pr_debug("Plugin %s has %u assigned while max %u supported\n", d->name, d->max_hooks,
+			 CR_PLUGIN_HOOK__MAX);
 		return -1;
 	}
 
@@ -243,8 +242,7 @@ int cr_plugin_init(int stage)
 		if (len < 3 || strncmp(de->d_name + len - 3, ".so", 3))
 			continue;
 
-		if (snprintf(path, sizeof(path), "%s/%s", opts.libdir, de->d_name) >=
-		    sizeof(path)) {
+		if (snprintf(path, sizeof(path), "%s/%s", opts.libdir, de->d_name) >= sizeof(path)) {
 			pr_err("Unable to build plugin path\n");
 			goto err;
 		}
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index cdfefe361..f3491e781 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -49,19 +49,19 @@
 #include <stdlib.h>
 
 #ifndef SIGEV_SIGNAL
-#define SIGEV_SIGNAL    0       /* notify via signal */
+#define SIGEV_SIGNAL 0 /* notify via signal */
 #endif
 #ifndef SIGEV_NONE
-#define SIGEV_NONE      1       /* other notification: meaningless */
+#define SIGEV_NONE 1 /* other notification: meaningless */
 #endif
 #ifndef SIGEV_THREAD
-#define SIGEV_THREAD    2       /* deliver via thread creation */
+#define SIGEV_THREAD 2 /* deliver via thread creation */
 #endif
 #ifndef SIGEV_THREAD_ID
-#define SIGEV_THREAD_ID 4       /* deliver to thread */
+#define SIGEV_THREAD_ID 4 /* deliver to thread */
 #endif
 
-#define BUF_SIZE	4096	/* Good enough value - can be changed */
+#define BUF_SIZE 4096 /* Good enough value - can be changed */
 
 struct buffer {
 	char buf[BUF_SIZE];
@@ -75,14 +75,12 @@ static char *buf = __buf.buf;
  * This is how AIO ring buffers look like in proc
  */
 
-#define AIO_FNAME	"/[aio]"
+#define AIO_FNAME "/[aio]"
 
 /* check the @line starts with "%lx-%lx" format */
 static bool __is_vma_range_fmt(char *line)
 {
-#define ____is_vma_addr_char(__c)		\
-	(((__c) <= '9' && (__c) >= '0') ||	\
-	((__c) <= 'f' && (__c) >= 'a'))
+#define ____is_vma_addr_char(__c) (((__c) <= '9' && (__c) >= '0') || ((__c) <= 'f' && (__c) >= 'a'))
 
 	while (*line && ____is_vma_addr_char(*line))
 		line++;
@@ -173,8 +171,7 @@ static void parse_vma_vmflags(char *buf, struct vma_area *vma_area)
 	 * only exception is VVAR area that mapped by the kernel as
 	 * VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP
 	 */
-	if (io_pf && !vma_area_is(vma_area, VMA_AREA_VVAR) &&
-	    !vma_entry_is(vma_area->e, VMA_FILE_SHARED))
+	if (io_pf && !vma_area_is(vma_area, VMA_AREA_VVAR) && !vma_entry_is(vma_area->e, VMA_FILE_SHARED))
 		vma_area->e->status |= VMA_UNSUPP;
 
 	if (vma_area->e->madv)
@@ -195,9 +192,7 @@ struct vma_file_info {
 
 static inline int vfi_equal(struct vma_file_info *a, struct vma_file_info *b)
 {
-	return ((a->ino ^ b->ino) |
-			(a->dev_maj ^ b->dev_maj) |
-			(a->dev_min ^ b->dev_min)) == 0;
+	return ((a->ino ^ b->ino) | (a->dev_maj ^ b->dev_maj) | (a->dev_min ^ b->dev_min)) == 0;
 }
 
 static int vma_get_mapfile_flags(struct vma_area *vma, DIR *mfd, char *path)
@@ -209,20 +204,20 @@ static int vma_get_mapfile_flags(struct vma_area *vma, DIR *mfd, char *path)
 			/* Just mapping w/o map_files link */
 			return 0;
 		}
-		pr_perror("Failed fstatat on map %"PRIx64"", vma->e->start);
+		pr_perror("Failed fstatat on map %" PRIx64 "", vma->e->start);
 		return -1;
 	}
 
-	switch(stat.st_mode & 0600) {
-		case 0200:
-			vma->e->fdflags = O_WRONLY;
-			break;
-		case 0400:
-			vma->e->fdflags = O_RDONLY;
-			break;
-		case 0600:
-			vma->e->fdflags = O_RDWR;
-			break;
+	switch (stat.st_mode & 0600) {
+	case 0200:
+		vma->e->fdflags = O_WRONLY;
+		break;
+	case 0400:
+		vma->e->fdflags = O_RDONLY;
+		break;
+	case 0600:
+		vma->e->fdflags = O_RDWR;
+		break;
 	}
 	vma->e->has_fdflags = true;
 	return 0;
@@ -254,16 +249,15 @@ static int vma_stat(struct vma_area *vma, int fd)
 	}
 
 	if (fstat(fd, vma->vmst) < 0) {
-		pr_perror("Failed fstat on map %"PRIx64"", vma->e->start);
+		pr_perror("Failed fstat on map %" PRIx64 "", vma->e->start);
 		return -1;
 	}
 
 	return 0;
 }
 
-static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
-			   struct vma_file_info *vfi, int *vm_file_fd,
-			   const char *path)
+static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct vma_file_info *vfi, int *vm_file_fd,
+				const char *path)
 {
 	int fd;
 	dev_t vfi_dev;
@@ -286,8 +280,7 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 		 */
 
 		if (vfi->dev_maj != 0 || vfi->dev_min != 0 || vfi->ino != 0) {
-			pr_err("Strange file mapped at %lx [%s]:%d.%d.%ld\n",
-			       (unsigned long)vma->e->start, fname,
+			pr_err("Strange file mapped at %lx [%s]:%d.%d.%ld\n", (unsigned long)vma->e->start, fname,
 			       vfi->dev_maj, vfi->dev_min, vfi->ino);
 			return -1;
 		}
@@ -327,7 +320,7 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 		if (!(vma->e->flags & MAP_SHARED))
 			return -1;
 
-		vma->e->flags  |= MAP_ANONYMOUS;
+		vma->e->flags |= MAP_ANONYMOUS;
 		vma->e->status |= VMA_ANON_SHARED;
 		vma->e->shmid = vfi->ino;
 
@@ -353,10 +346,8 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 		return -1;
 	}
 
-	if (vma->vmst->st_dev != vfi_dev ||
-			vma->vmst->st_ino != vfi->ino) {
-		pr_err("Failed to resolve mapping %lx filename\n",
-		       (unsigned long)vma->e->start);
+	if (vma->vmst->st_dev != vfi_dev || vma->vmst->st_ino != vfi->ino) {
+		pr_err("Failed to resolve mapping %lx filename\n", (unsigned long)vma->e->start);
 		close(fd);
 		return -1;
 	}
@@ -365,16 +356,14 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma,
 	return 0;
 }
 
-static int vma_get_mapfile(const char *fname, struct vma_area *vma, DIR *mfd,
-			   struct vma_file_info *vfi,
-			   struct vma_file_info *prev_vfi,
-			   int *vm_file_fd)
+static int vma_get_mapfile(const char *fname, struct vma_area *vma, DIR *mfd, struct vma_file_info *vfi,
+			   struct vma_file_info *prev_vfi, int *vm_file_fd)
 {
 	char path[32];
 	int flags;
 
 	/* Figure out if it's file mapping */
-	snprintf(path, sizeof(path), "%"PRIx64"-%"PRIx64, vma->e->start, vma->e->end);
+	snprintf(path, sizeof(path), "%" PRIx64 "-%" PRIx64, vma->e->start, vma->e->end);
 
 	if (vma_get_mapfile_flags(vma, mfd, path))
 		return -1;
@@ -389,8 +378,7 @@ static int vma_get_mapfile(const char *fname, struct vma_area *vma, DIR *mfd,
 		if (*vm_file_fd < 0)
 			return 0;
 
-		pr_debug("vma %"PRIx64" borrows vfi from previous %"PRIx64"\n",
-				vma->e->start, prev->e->start);
+		pr_debug("vma %" PRIx64 " borrows vfi from previous %" PRIx64 "\n", vma->e->start, prev->e->start);
 		if (prev->e->status & VMA_AREA_SOCKET)
 			vma->e->status |= VMA_AREA_SOCKET | VMA_AREA_REGULAR;
 
@@ -436,7 +424,7 @@ static int vma_get_mapfile(const char *fname, struct vma_area *vma, DIR *mfd,
 				return -1;
 
 			if (S_ISSOCK(buf.st_mode)) {
-				pr_info("Found socket mapping @%"PRIx64"\n", vma->e->start);
+				pr_info("Found socket mapping @%" PRIx64 "\n", vma->e->start);
 				vma->vm_socket_id = buf.st_ino;
 				vma->e->status |= VMA_AREA_SOCKET | VMA_AREA_REGULAR;
 				return 0;
@@ -511,7 +499,7 @@ int parse_self_maps_lite(struct vm_area_list *vms)
 			prev = vma;
 		}
 
-		pr_debug("Parsed %"PRIx64"-%"PRIx64" vma\n", prev->e->start, prev->e->end);
+		pr_debug("Parsed %" PRIx64 "-%" PRIx64 " vma\n", prev->e->start, prev->e->end);
 	}
 
 	bclose(&maps);
@@ -538,21 +526,16 @@ static inline int handle_vvar_vma(struct vma_area *vma)
 	return 0;
 }
 
-static int handle_vma(pid_t pid, struct vma_area *vma_area,
-			const char *file_path, DIR *map_files_dir,
-			struct vma_file_info *vfi,
-			struct vma_file_info *prev_vfi,
-			int *vm_file_fd)
+static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_path, DIR *map_files_dir,
+		      struct vma_file_info *vfi, struct vma_file_info *prev_vfi, int *vm_file_fd)
 {
-	if (vma_get_mapfile(file_path, vma_area, map_files_dir,
-					vfi, prev_vfi, vm_file_fd))
+	if (vma_get_mapfile(file_path, vma_area, map_files_dir, vfi, prev_vfi, vm_file_fd))
 		goto err_bogus_mapfile;
 
 	if (vma_area->e->status != 0)
 		return 0;
 
-	if (!strcmp(file_path, "[vsyscall]") ||
-		   !strcmp(file_path, "[vectors]")) {
+	if (!strcmp(file_path, "[vsyscall]") || !strcmp(file_path, "[vectors]")) {
 		vma_area->e->status |= VMA_AREA_VSYSCALL;
 	} else if (!strcmp(file_path, "[vdso]")) {
 		if (handle_vdso_vma(vma_area))
@@ -599,12 +582,12 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 		else if (S_ISCHR(st_buf->st_mode) && (st_buf->st_rdev == DEVZERO))
 			/* devzero mapping -- also makes sense */;
 		else {
-			pr_err("Can't handle non-regular mapping on %d's map %"PRIx64"\n", pid, vma_area->e->start);
+			pr_err("Can't handle non-regular mapping on %d's map %" PRIx64 "\n", pid, vma_area->e->start);
 			goto err;
 		}
 
 		if (is_anon_shmem_map(st_buf->st_dev) && !strncmp(file_path, "/SYSV", 5)) {
-			vma_area->e->flags  |= MAP_ANONYMOUS;
+			vma_area->e->flags |= MAP_ANONYMOUS;
 			vma_area->e->status |= VMA_ANON_SHARED;
 			vma_area->e->shmid = st_buf->st_ino;
 			if (!(vma_area->e->flags & MAP_SHARED))
@@ -631,8 +614,7 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 		 * mnt_id to -1 to mimic pre-3.15 kernels that didn't
 		 * have mnt_id.
 		 */
-		if (vma_area->mnt_id != -1 &&
-		    get_fd_mntid(*vm_file_fd, &vma_area->mnt_id))
+		if (vma_area->mnt_id != -1 && get_fd_mntid(*vm_file_fd, &vma_area->mnt_id))
 			return -1;
 	} else {
 		/*
@@ -644,37 +626,33 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area,
 		} else {
 			vma_area->e->status |= VMA_ANON_PRIVATE;
 		}
-		vma_area->e->flags  |= MAP_ANONYMOUS;
+		vma_area->e->flags |= MAP_ANONYMOUS;
 	}
 
 	return 0;
 err:
 	return -1;
 err_bogus_mapping:
-	pr_err("Bogus mapping 0x%"PRIx64"-0x%"PRIx64" (flags: %#x vm_file_fd: %d)\n",
-	       vma_area->e->start, vma_area->e->end,
-	       vma_area->e->flags, *vm_file_fd);
+	pr_err("Bogus mapping 0x%" PRIx64 "-0x%" PRIx64 " (flags: %#x vm_file_fd: %d)\n", vma_area->e->start,
+	       vma_area->e->end, vma_area->e->flags, *vm_file_fd);
 	goto err;
 
 err_bogus_mapfile:
-	pr_perror("Can't open %d's mapfile link %"PRIx64, pid, vma_area->e->start);
+	pr_perror("Can't open %d's mapfile link %" PRIx64, pid, vma_area->e->start);
 	goto err;
 }
 
-static int vma_list_add(struct vma_area *vma_area,
-			struct vm_area_list *vma_area_list,
-			unsigned long *prev_end,
+static int vma_list_add(struct vma_area *vma_area, struct vm_area_list *vma_area_list, unsigned long *prev_end,
 			struct vma_file_info *vfi, struct vma_file_info *prev_vfi)
 {
 	if (vma_area->e->status & VMA_UNSUPP) {
-		pr_err("Unsupported mapping found %016"PRIx64"-%016"PRIx64"\n",
-					vma_area->e->start, vma_area->e->end);
+		pr_err("Unsupported mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
+		       vma_area->e->end);
 		return -1;
 	}
 
 	/* Add a guard page only if here is enough space for it */
-	if (vma_has_guard_gap_hidden(vma_area) &&
-	    *prev_end < vma_area->e->start)
+	if (vma_has_guard_gap_hidden(vma_area) && *prev_end < vma_area->e->start)
 		vma_area->e->start -= PAGE_SIZE; /* Guard page */
 	*prev_end = vma_area->e->end;
 
@@ -685,14 +663,12 @@ static int vma_list_add(struct vma_area *vma_area,
 
 		pages = vma_area_len(vma_area) / PAGE_SIZE;
 		vma_area_list->nr_priv_pages += pages;
-		vma_area_list->nr_priv_pages_longest =
-			max(vma_area_list->nr_priv_pages_longest, pages);
+		vma_area_list->nr_priv_pages_longest = max(vma_area_list->nr_priv_pages_longest, pages);
 	} else if (vma_area_is(vma_area, VMA_ANON_SHARED)) {
 		unsigned long pages;
 
 		pages = vma_area_len(vma_area) / PAGE_SIZE;
-		vma_area_list->nr_shared_pages_longest =
-			max(vma_area_list->nr_shared_pages_longest, pages);
+		vma_area_list->nr_shared_pages_longest = max(vma_area_list->nr_shared_pages_longest, pages);
 	}
 
 	*prev_vfi = *vfi;
@@ -710,15 +686,15 @@ static int task_size_check(pid_t pid, VmaEntry *entry)
 #ifdef __s390x__
 	if (entry->end <= kdat.task_size)
 		return 0;
-	pr_err("Can't dump high memory region %lx-%lx of task %d because kernel commit ee71d16d22bb is missing\n", entry->start, entry->end, pid);
+	pr_err("Can't dump high memory region %lx-%lx of task %d because kernel commit ee71d16d22bb is missing\n",
+	       entry->start, entry->end, pid);
 	return -1;
 #else
 	return 0;
 #endif
 }
 
-int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list,
-					dump_filemap_t dump_filemap)
+int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t dump_filemap)
 {
 	struct vma_area *vma_area = NULL;
 	unsigned long start, end, pgoff, prev_end = 0;
@@ -756,8 +732,8 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list,
 		if (!eof && !__is_vma_range_fmt(str)) {
 			if (!strncmp(str, "Nonlinear", 9)) {
 				BUG_ON(!vma_area);
-				pr_err("Nonlinear mapping found %016"PRIx64"-%016"PRIx64"\n",
-				       vma_area->e->start, vma_area->e->end);
+				pr_err("Nonlinear mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
+				       vma_area->e->end);
 				/*
 				 * VMA is already on list and will be
 				 * freed later as list get destroyed.
@@ -772,8 +748,7 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list,
 				continue;
 		}
 
-		if (vma_area && vma_list_add(vma_area, vma_area_list,
-						&prev_end, &vfi, &prev_vfi))
+		if (vma_area && vma_list_add(vma_area, vma_area_list, &prev_end, &vfi, &prev_vfi))
 			goto err;
 
 		if (eof)
@@ -783,18 +758,17 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list,
 		if (!vma_area)
 			goto err;
 
-		num = sscanf(str, "%lx-%lx %c%c%c%c %lx %x:%x %lu %n",
-			     &start, &end, &r, &w, &x, &s, &pgoff,
+		num = sscanf(str, "%lx-%lx %c%c%c%c %lx %x:%x %lu %n", &start, &end, &r, &w, &x, &s, &pgoff,
 			     &vfi.dev_maj, &vfi.dev_min, &vfi.ino, &path_off);
 		if (num < 10) {
 			pr_err("Can't parse: %s\n", str);
 			goto err;
 		}
 
-		vma_area->e->start	= start;
-		vma_area->e->end	= end;
-		vma_area->e->pgoff	= pgoff;
-		vma_area->e->prot	= PROT_NONE;
+		vma_area->e->start = start;
+		vma_area->e->end = end;
+		vma_area->e->pgoff = pgoff;
+		vma_area->e->prot = PROT_NONE;
 
 		if (task_size_check(pid, vma_area->e))
 			goto err;
@@ -815,12 +789,10 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list,
 			goto err;
 		}
 
-		if (handle_vma(pid, vma_area, str + path_off, map_files_dir,
-				&vfi, &prev_vfi, &vm_file_fd))
+		if (handle_vma(pid, vma_area, str + path_off, map_files_dir, &vfi, &prev_vfi, &vm_file_fd))
 			goto err;
 
-		if (vma_entry_is(vma_area->e, VMA_FILE_PRIVATE) ||
-				vma_entry_is(vma_area->e, VMA_FILE_SHARED)) {
+		if (vma_entry_is(vma_area->e, VMA_FILE_PRIVATE) || vma_entry_is(vma_area->e, VMA_FILE_SHARED)) {
 			if (dump_filemap && dump_filemap(vma_area, vm_file_fd))
 				goto err;
 		} else if (vma_entry_is(vma_area->e, VMA_AREA_AIORING))
@@ -839,7 +811,6 @@ err_n:
 
 	xfree(vma_area);
 	return ret;
-
 }
 
 int parse_pid_stat(pid_t pid, struct proc_pid_stat *s)
@@ -879,60 +850,17 @@ int parse_pid_stat(pid_t pid, struct proc_pid_stat *s)
 	strlcpy(s->comm, tok + 1, sizeof(s->comm));
 
 	n = sscanf(p + 1,
-	       " %c %d %d %d %d %d %u %lu %lu %lu %lu "
-	       "%lu %lu %ld %ld %ld %ld %d %d %llu %lu %ld %lu %lu %lu %lu "
-	       "%lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld "
-	       "%lu %lu %lu %lu %lu %lu %lu %d",
-		&s->state,
-		&s->ppid,
-		&s->pgid,
-		&s->sid,
-		&s->tty_nr,
-		&s->tty_pgrp,
-		&s->flags,
-		&s->min_flt,
-		&s->cmin_flt,
-		&s->maj_flt,
-		&s->cmaj_flt,
-		&s->utime,
-		&s->stime,
-		&s->cutime,
-		&s->cstime,
-		&s->priority,
-		&s->nice,
-		&s->num_threads,
-		&s->zero0,
-		&s->start_time,
-		&s->vsize,
-		&s->mm_rss,
-		&s->rsslim,
-		&s->start_code,
-		&s->end_code,
-		&s->start_stack,
-		&s->esp,
-		&s->eip,
-		&s->sig_pending,
-		&s->sig_blocked,
-		&s->sig_ignored,
-		&s->sig_handled,
-		&s->wchan,
-		&s->zero1,
-		&s->zero2,
-		&s->exit_signal,
-		&s->task_cpu,
-		&s->rt_priority,
-		&s->policy,
-		&s->delayacct_blkio_ticks,
-		&s->gtime,
-		&s->cgtime,
-		&s->start_data,
-		&s->end_data,
-		&s->start_brk,
-		&s->arg_start,
-		&s->arg_end,
-		&s->env_start,
-		&s->env_end,
-		&s->exit_code);
+		   " %c %d %d %d %d %d %u %lu %lu %lu %lu "
+		   "%lu %lu %ld %ld %ld %ld %d %d %llu %lu %ld %lu %lu %lu %lu "
+		   "%lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld "
+		   "%lu %lu %lu %lu %lu %lu %lu %d",
+		   &s->state, &s->ppid, &s->pgid, &s->sid, &s->tty_nr, &s->tty_pgrp, &s->flags, &s->min_flt,
+		   &s->cmin_flt, &s->maj_flt, &s->cmaj_flt, &s->utime, &s->stime, &s->cutime, &s->cstime, &s->priority,
+		   &s->nice, &s->num_threads, &s->zero0, &s->start_time, &s->vsize, &s->mm_rss, &s->rsslim,
+		   &s->start_code, &s->end_code, &s->start_stack, &s->esp, &s->eip, &s->sig_pending, &s->sig_blocked,
+		   &s->sig_ignored, &s->sig_handled, &s->wchan, &s->zero1, &s->zero2, &s->exit_signal, &s->task_cpu,
+		   &s->rt_priority, &s->policy, &s->delayacct_blkio_ticks, &s->gtime, &s->cgtime, &s->start_data,
+		   &s->end_data, &s->start_brk, &s->arg_start, &s->arg_end, &s->env_start, &s->env_end, &s->exit_code);
 	if (n < 50)
 		goto err;
 
@@ -955,8 +883,7 @@ int prepare_loginuid(unsigned int value)
 	snprintf(buf, 11, "%u", value);
 
 	if (write(fd, buf, 11) < 0) {
-		pr_warn("Write %s to /proc/self/loginuid failed: %s\n",
-			buf, strerror(errno));
+		pr_warn("Write %s to /proc/self/loginuid failed: %s\n", buf, strerror(errno));
 		ret = -1;
 	}
 	close(fd);
@@ -969,8 +896,7 @@ unsigned int parse_pid_loginuid(pid_t pid, int *err, bool ignore_noent)
 	ssize_t num;
 
 	*err = 0;
-	fd = __open_proc(pid, (ignore_noent) ? ENOENT : 0,
-			O_RDONLY, "loginuid");
+	fd = __open_proc(pid, (ignore_noent) ? ENOENT : 0, O_RDONLY, "loginuid");
 	if (fd < 0)
 		goto out;
 
@@ -1216,9 +1142,8 @@ static bool sb_opt_cb(char *opt, char *unknown, size_t *uoff)
 	return false;
 }
 
-static int do_opt2flag(char *opt, unsigned *flags,
-		const struct opt2flag *opts, char *unknown,
-		bool (*cb)(char *opt, char *unknown, size_t *uoff))
+static int do_opt2flag(char *opt, unsigned *flags, const struct opt2flag *opts, char *unknown,
+		       bool (*cb)(char *opt, char *unknown, size_t *uoff))
 {
 	int i;
 	char *end;
@@ -1263,15 +1188,39 @@ static int do_opt2flag(char *opt, unsigned *flags,
 static int parse_mnt_flags(char *opt, unsigned *flags)
 {
 	static const struct opt2flag mnt_opt2flag[] = {
-		{ "rw",		0,		},
-		{ "ro",		MS_RDONLY,	},
-		{ "nosuid",	MS_NOSUID,	},
-		{ "nodev",	MS_NODEV,	},
-		{ "noexec",	MS_NOEXEC,	},
-		{ "noatime",	MS_NOATIME,	},
-		{ "nodiratime",	MS_NODIRATIME,	},
-		{ "relatime",	MS_RELATIME,	},
-		{ },
+		{
+			"rw",
+			0,
+		},
+		{
+			"ro",
+			MS_RDONLY,
+		},
+		{
+			"nosuid",
+			MS_NOSUID,
+		},
+		{
+			"nodev",
+			MS_NODEV,
+		},
+		{
+			"noexec",
+			MS_NOEXEC,
+		},
+		{
+			"noatime",
+			MS_NOATIME,
+		},
+		{
+			"nodiratime",
+			MS_NODIRATIME,
+		},
+		{
+			"relatime",
+			MS_RELATIME,
+		},
+		{},
 	};
 
 	if (do_opt2flag(opt, flags, mnt_opt2flag, NULL, NULL))
@@ -1287,12 +1236,27 @@ static int parse_mnt_flags(char *opt, unsigned *flags)
 static int parse_sb_opt(char *opt, unsigned *flags, char *uopt)
 {
 	static const struct opt2flag sb_opt2flag[] = {
-		{ "rw",		0,		},
-		{ "ro",		MS_RDONLY,	},
-		{ "sync",	MS_SYNC,	},
-		{ "dirsync",	MS_DIRSYNC,	},
-		{ "mad",	MS_MANDLOCK,	},
-		{ },
+		{
+			"rw",
+			0,
+		},
+		{
+			"ro",
+			MS_RDONLY,
+		},
+		{
+			"sync",
+			MS_SYNC,
+		},
+		{
+			"dirsync",
+			MS_DIRSYNC,
+		},
+		{
+			"mad",
+			MS_MANDLOCK,
+		},
+		{},
 	};
 
 	return do_opt2flag(opt, flags, sb_opt2flag, uopt, sb_opt_cb);
@@ -1360,7 +1324,7 @@ static void cure_path(char *path)
 		if (off)
 			path[i - off] = path[i];
 		continue;
-replace:
+	replace:
 		off += 3;
 		i += 3;
 	}
@@ -1379,10 +1343,8 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 		goto err;
 
 	new->mountpoint[0] = '.';
-	ret = sscanf(str, "%i %i %u:%u %ms %s %ms %n",
-			&new->mnt_id, &new->parent_mnt_id,
-			&kmaj, &kmin, &new->root, new->mountpoint + 1,
-			&opt, &n);
+	ret = sscanf(str, "%i %i %u:%u %ms %s %ms %n", &new->mnt_id, &new->parent_mnt_id, &kmaj, &kmin, &new->root,
+		     new->mountpoint + 1, &opt, &n);
 	if (ret != 7)
 		goto err;
 
@@ -1471,8 +1433,7 @@ struct str_node {
 
 bool add_skip_mount(const char *mountpoint)
 {
-	struct str_node *skip = xmalloc(sizeof(struct str_node) +
-					strlen(mountpoint) + 1);
+	struct str_node *skip = xmalloc(sizeof(struct str_node) + strlen(mountpoint) + 1);
 	if (!skip)
 		return false;
 
@@ -1507,19 +1468,17 @@ int parse_timens_offsets(struct timespec *boff, struct timespec *moff)
 		int64_t sec, nsec;
 		char clockid[10];
 
-		if (sscanf(buf, "%9s %"PRId64" %"PRId64"\n", clockid, &sec, &nsec) != 3) {
+		if (sscanf(buf, "%9s %" PRId64 " %" PRId64 "\n", clockid, &sec, &nsec) != 3) {
 			pr_err("Unable to parse: %s\n", buf);
 			goto out;
 		}
 		clockid[sizeof(clockid) - 1] = 0;
-		if (strcmp(clockid, "monotonic") == 0 ||
-		    strcmp(clockid, __stringify(CLOCK_MONOTONIC)) == 0) {
+		if (strcmp(clockid, "monotonic") == 0 || strcmp(clockid, __stringify(CLOCK_MONOTONIC)) == 0) {
 			moff->tv_sec = sec;
 			moff->tv_nsec = nsec;
 			continue;
 		}
-		if (strcmp(clockid, "boottime") == 0 ||
-		    strcmp(clockid, __stringify(CLOCK_BOOTTIME)) == 0) {
+		if (strcmp(clockid, "boottime") == 0 || strcmp(clockid, __stringify(CLOCK_BOOTTIME)) == 0) {
 			boff->tv_sec = sec;
 			boff->tv_nsec = nsec;
 			continue;
@@ -1565,22 +1524,19 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 		 * depends on this one.
 		 */
 		if (for_dump && should_skip_mount(new->mountpoint + 1)) {
-			pr_info("\tskip %s @ %s\n", fsname,  new->mountpoint);
+			pr_info("\tskip %s @ %s\n", fsname, new->mountpoint);
 			mnt_entry_free(new);
 			new = NULL;
 			goto end;
 		}
 
-		pr_info("\ttype %s source %s mnt_id %d s_dev %#x %s @ %s flags %#x options %s\n",
-				fsname, new->source,
-				new->mnt_id, new->s_dev, new->root, new->mountpoint,
-				new->flags, new->options);
+		pr_info("\ttype %s source %s mnt_id %d s_dev %#x %s @ %s flags %#x options %s\n", fsname, new->source,
+			new->mnt_id, new->s_dev, new->root, new->mountpoint, new->flags, new->options);
 
 		if (new->fstype->parse) {
 			ret = new->fstype->parse(new);
 			if (ret < 0) {
-				pr_err("Failed to parse FS specific data on %s\n",
-						new->mountpoint);
+				pr_err("Failed to parse FS specific data on %s\n", new->mountpoint);
 				mnt_entry_free(new);
 				new = NULL;
 				goto end;
@@ -1592,10 +1548,9 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 				new = NULL;
 				ret = 0;
 				goto end;
-
 			}
 		}
-end:
+	end:
 		if (fsname)
 			free(fsname);
 
@@ -1683,16 +1638,14 @@ static int parse_timerfd(struct bfd *f, char *str, TimerfdEntry *tfy)
 	str = breadline(f);
 	if (IS_ERR_OR_NULL(str))
 		goto nodata;
-	if (sscanf(str, "it_value: (%llu, %llu)",
-		   (unsigned long long *)&tfy->vsec,
+	if (sscanf(str, "it_value: (%llu, %llu)", (unsigned long long *)&tfy->vsec,
 		   (unsigned long long *)&tfy->vnsec) != 2)
 		goto parse_err;
 
 	str = breadline(f);
 	if (IS_ERR_OR_NULL(str))
 		goto nodata;
-	if (sscanf(str, "it_interval: (%llu, %llu)",
-		   (unsigned long long *)&tfy->isec,
+	if (sscanf(str, "it_interval: (%llu, %llu)", (unsigned long long *)&tfy->isec,
 		   (unsigned long long *)&tfy->insec) != 2)
 		goto parse_err;
 	return 0;
@@ -1725,14 +1678,14 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 	 */
 
 	bpfmap_fmt map[] = {
-		{"map_type: %u", &bpf->map_type },
-		{"key_size: %u", &bpf->key_size },
-		{"value_size: %u", &bpf->value_size },
-		{"max_entries: %u", &bpf->max_entries },
-		{"map_flags: %"PRIx32"", &bpf->map_flags },
-		{"memlock: %"PRIu64"", &bpf->memlock },
-		{"map_id: %u", &bpf->map_id },
-		{"frozen: %d", &bpf->frozen },
+		{ "map_type: %u", &bpf->map_type },
+		{ "key_size: %u", &bpf->key_size },
+		{ "value_size: %u", &bpf->value_size },
+		{ "max_entries: %u", &bpf->max_entries },
+		{ "map_flags: %" PRIx32 "", &bpf->map_flags },
+		{ "memlock: %" PRIu64 "", &bpf->memlock },
+		{ "map_id: %u", &bpf->map_id },
+		{ "frozen: %d", &bpf->frozen },
 	};
 
 	size_t n = sizeof(map) / sizeof(bpfmap_fmt);
@@ -1755,10 +1708,9 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 	return 0;
 }
 
-#define fdinfo_field(str, field)	!strncmp(str, field":", sizeof(field))
+#define fdinfo_field(str, field) !strncmp(str, field ":", sizeof(field))
 
-static int parse_file_lock_buf(char *buf, struct file_lock *fl,
-				bool is_blocked);
+static int parse_file_lock_buf(char *buf, struct file_lock *fl, bool is_blocked);
 static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 {
 	struct bfd f;
@@ -1780,9 +1732,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 		if (IS_ERR(str))
 			goto out;
 
-		if (fdinfo_field(str, "pos") ||
-		    fdinfo_field(str, "flags") ||
-		    fdinfo_field(str, "mnt_id")) {
+		if (fdinfo_field(str, "pos") || fdinfo_field(str, "flags") || fdinfo_field(str, "mnt_id")) {
 			unsigned long long val;
 			struct fdinfo_common *fdinfo = arg;
 
@@ -1806,7 +1756,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 		if (fdinfo_field(str, "lock")) {
 			struct file_lock *fl;
 			struct fdinfo_common *fdinfo = arg;
-			char *flock_status = str+sizeof("lock:\t")-1;
+			char *flock_status = str + sizeof("lock:\t") - 1;
 
 			if (type != FD_TYPES__UND)
 				continue;
@@ -1831,11 +1781,8 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 				goto parse_err;
 			}
 
-			pr_info("lockinfo: %lld:%d %x %d %02x:%02x:%ld %lld %s\n",
-				fl->fl_id, fl->fl_kind, fl->fl_ltype,
-				fl->fl_owner, fl->maj, fl->min, fl->i_no,
-				fl->start, fl->end);
-
+			pr_info("lockinfo: %lld:%d %x %d %02x:%02x:%ld %lld %s\n", fl->fl_id, fl->fl_kind, fl->fl_ltype,
+				fl->fl_owner, fl->maj, fl->min, fl->i_no, fl->start, fl->end);
 
 			if (fl->fl_kind == FL_UNKNOWN) {
 				pr_err("Unknown file lock!\n");
@@ -1857,8 +1804,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 
 			if (type != FD_TYPES__EVENTFD)
 				goto parse_err;
-			ret = sscanf(str, "eventfd-count: %"PRIx64,
-					&efd->counter);
+			ret = sscanf(str, "eventfd-count: %" PRIx64, &efd->counter);
 			if (ret != 1)
 				goto parse_err;
 
@@ -1891,11 +1837,11 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 
 			eventpoll_tfd_entry__init(e);
 
-			ret = sscanf(str, "tfd: %d events: %x data: %llx"
+			ret = sscanf(str,
+				     "tfd: %d events: %x data: %llx"
 				     " pos:%lli ino:%lx sdev:%x",
-					&e->tfd, &e->events, (long long *)&e->data,
-					(long long *)&e->pos, (long *)&e->inode,
-					&e->dev);
+				     &e->tfd, &e->events, (long long *)&e->data, (long long *)&e->pos,
+				     (long *)&e->inode, &e->dev);
 			if (ret < 3 || ret > 6) {
 				eventpoll_tfd_entry__free_unpacked(e, NULL);
 				goto parse_err;
@@ -1925,8 +1871,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 
 			if (type != FD_TYPES__SIGNALFD)
 				goto parse_err;
-			ret = sscanf(str, "sigmask: %llx",
-					(unsigned long long *)&sfd->sigmask);
+			ret = sscanf(str, "sigmask: %llx", (unsigned long long *)&sfd->sigmask);
 			if (ret != 1)
 				goto parse_err;
 
@@ -1939,8 +1884,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			if (type != FD_TYPES__FANOTIFY)
 				goto parse_err;
 
-			ret = sscanf(str, "fanotify flags:%x event-flags:%x",
-				     &fe->faflags, &fe->evflags);
+			ret = sscanf(str, "fanotify flags:%x event-flags:%x", &fe->faflags, &fe->evflags);
 			if (ret != 2)
 				goto parse_err;
 			entry_met = true;
@@ -1955,10 +1899,8 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			if (type != FD_TYPES__FANOTIFY)
 				goto parse_err;
 
-			ob = buf = xmalloc(sizeof(FanotifyMarkEntry) +
-					sizeof(FanotifyInodeMarkEntry) +
-					sizeof(FhEntry) +
-					FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
+			ob = buf = xmalloc(sizeof(FanotifyMarkEntry) + sizeof(FanotifyInodeMarkEntry) +
+					   sizeof(FhEntry) + FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
 			if (!buf)
 				goto out;
 
@@ -1969,16 +1911,13 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			me->ie->f_handle = xptr_pull(&buf, FhEntry);
 			fh_entry__init(me->ie->f_handle);
 			me->ie->f_handle->n_handle = FH_ENTRY_SIZES__min_entries;
-			me->ie->f_handle->handle = xptr_pull_s(&buf,
-					FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
+			me->ie->f_handle->handle = xptr_pull_s(&buf, FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
 
 			ret = sscanf(str,
-				     "fanotify ino:%"PRIx64" sdev:%x mflags:%x mask:%x ignored_mask:%x "
+				     "fanotify ino:%" PRIx64 " sdev:%x mflags:%x mask:%x ignored_mask:%x "
 				     "fhandle-bytes:%x fhandle-type:%x f_handle: %n",
-				     &me->ie->i_ino, &me->s_dev,
-				     &me->mflags, &me->mask, &me->ignored_mask,
-				     &me->ie->f_handle->bytes, &me->ie->f_handle->type,
-				     &hoff);
+				     &me->ie->i_ino, &me->s_dev, &me->mflags, &me->mask, &me->ignored_mask,
+				     &me->ie->f_handle->bytes, &me->ie->f_handle->type, &hoff);
 			if (ret != 7 || hoff == 0) {
 				xfree(ob);
 				goto parse_err;
@@ -2006,9 +1945,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			if (type != FD_TYPES__FANOTIFY)
 				goto parse_err;
 
-
-			ob = buf = xmalloc(sizeof(FanotifyMarkEntry) +
-					sizeof(FanotifyMountMarkEntry));
+			ob = buf = xmalloc(sizeof(FanotifyMarkEntry) + sizeof(FanotifyMountMarkEntry));
 			if (!buf)
 				goto out;
 
@@ -2017,10 +1954,8 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			me->me = xptr_pull(&buf, FanotifyMountMarkEntry);
 			fanotify_mount_mark_entry__init(me->me);
 
-			ret = sscanf(str,
-				     "fanotify mnt_id:%x mflags:%x mask:%x ignored_mask:%x",
-				     &me->me->mnt_id, &me->mflags,
-				     &me->mask, &me->ignored_mask);
+			ret = sscanf(str, "fanotify mnt_id:%x mflags:%x mask:%x ignored_mask:%x", &me->me->mnt_id,
+				     &me->mflags, &me->mask, &me->ignored_mask);
 			if (ret != 4) {
 				xfree(ob);
 				goto parse_err;
@@ -2047,9 +1982,8 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			if (type != FD_TYPES__INOTIFY)
 				goto parse_err;
 
-			ob = buf = xmalloc(sizeof(InotifyWdEntry) +
-					sizeof(FhEntry) +
-					FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
+			ob = buf = xmalloc(sizeof(InotifyWdEntry) + sizeof(FhEntry) +
+					   FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
 			if (!buf)
 				goto out;
 
@@ -2058,18 +1992,15 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			ify->f_handle = xptr_pull(&buf, FhEntry);
 			fh_entry__init(ify->f_handle);
 			ify->f_handle->n_handle = FH_ENTRY_SIZES__min_entries;
-			ify->f_handle->handle = xptr_pull_s(&buf,
-					FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
+			ify->f_handle->handle = xptr_pull_s(&buf, FH_ENTRY_SIZES__min_entries * sizeof(uint64_t));
 
 			ret = sscanf(str,
-					"inotify wd:%x ino:%"PRIx64" sdev:%x "
-					"mask:%x ignored_mask:%x "
-					"fhandle-bytes:%x fhandle-type:%x "
-					"f_handle: %n",
-					&ify->wd, &ify->i_ino, &ify->s_dev,
-					&ify->mask, &ify->ignored_mask,
-					&ify->f_handle->bytes, &ify->f_handle->type,
-					&hoff);
+				     "inotify wd:%x ino:%" PRIx64 " sdev:%x "
+				     "mask:%x ignored_mask:%x "
+				     "fhandle-bytes:%x fhandle-type:%x "
+				     "f_handle: %n",
+				     &ify->wd, &ify->i_ino, &ify->s_dev, &ify->mask, &ify->ignored_mask,
+				     &ify->f_handle->bytes, &ify->f_handle->type, &hoff);
 			if (ret != 7) {
 				xfree(ob);
 				goto parse_err;
@@ -2132,7 +2063,7 @@ int parse_fdinfo(int fd, int type, void *arg)
 
 int get_fd_mntid(int fd, int *mnt_id)
 {
-	struct fdinfo_common fdinfo = { .mnt_id = -1};
+	struct fdinfo_common fdinfo = { .mnt_id = -1 };
 
 	if (parse_fdinfo(fd, FD_TYPES__UND, &fdinfo))
 		return -1;
@@ -2141,22 +2072,17 @@ int get_fd_mntid(int fd, int *mnt_id)
 	return 0;
 }
 
-static int parse_file_lock_buf(char *buf, struct file_lock *fl,
-				bool is_blocked)
+static int parse_file_lock_buf(char *buf, struct file_lock *fl, bool is_blocked)
 {
-	int  num;
+	int num;
 	char fl_flag[10], fl_type[15], fl_option[10];
 
 	if (is_blocked) {
-		num = sscanf(buf, "%lld: -> %s %s %s %d %x:%x:%ld %lld %s",
-			&fl->fl_id, fl_flag, fl_type, fl_option,
-			&fl->fl_owner, &fl->maj, &fl->min, &fl->i_no,
-			&fl->start, fl->end);
+		num = sscanf(buf, "%lld: -> %s %s %s %d %x:%x:%ld %lld %s", &fl->fl_id, fl_flag, fl_type, fl_option,
+			     &fl->fl_owner, &fl->maj, &fl->min, &fl->i_no, &fl->start, fl->end);
 	} else {
-		num = sscanf(buf, "%lld:%s %s %s %d %x:%x:%ld %lld %s",
-			&fl->fl_id, fl_flag, fl_type, fl_option,
-			&fl->fl_owner, &fl->maj, &fl->min, &fl->i_no,
-			&fl->start, fl->end);
+		num = sscanf(buf, "%lld:%s %s %s %d %x:%x:%ld %lld %s", &fl->fl_id, fl_flag, fl_type, fl_option,
+			     &fl->fl_owner, &fl->maj, &fl->min, &fl->i_no, &fl->start, fl->end);
 	}
 
 	if (num < 10) {
@@ -2217,9 +2143,9 @@ int parse_file_locks(void)
 {
 	struct file_lock *fl;
 
-	FILE	*fl_locks;
-	int	exit_code = -1;
-	bool	is_blocked;
+	FILE *fl_locks;
+	int exit_code = -1;
+	bool is_blocked;
 
 	if (kdat.has_fdinfo_lock)
 		return 0;
@@ -2242,11 +2168,8 @@ int parse_file_locks(void)
 			goto err;
 		}
 
-		pr_info("lockinfo: %lld:%d %x %d %02x:%02x:%ld %lld %s\n",
-			fl->fl_id, fl->fl_kind, fl->fl_ltype,
-			fl->fl_owner, fl->maj, fl->min, fl->i_no,
-			fl->start, fl->end);
-
+		pr_info("lockinfo: %lld:%d %x %d %02x:%02x:%ld %lld %s\n", fl->fl_id, fl->fl_kind, fl->fl_ltype,
+			fl->fl_owner, fl->maj, fl->min, fl->i_no, fl->start, fl->end);
 
 		if (fl->fl_kind == FL_UNKNOWN) {
 			pr_err("Unknown file lock: %s!\n", buf);
@@ -2264,8 +2187,7 @@ int parse_file_locks(void)
 			continue;
 		}
 
-		if ((fl->fl_kind == FL_POSIX) &&
-				!pid_in_pstree(fl->fl_owner)) {
+		if ((fl->fl_kind == FL_POSIX) && !pid_in_pstree(fl->fl_owner)) {
 			/*
 			 * We only care about tasks which are taken
 			 * into dump, so we only collect file locks
@@ -2332,46 +2254,41 @@ int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat *args)
 			if (timer == NULL)
 				goto err;
 
-			if (sscanf(s, "ID: %ld",
-						&timer->spt.it_id) != 1)
+			if (sscanf(s, "ID: %ld", &timer->spt.it_id) != 1)
 				goto err;
 			break;
 		case 1:
-			if (sscanf(s, "signal: %d/%16s",
-						&timer->spt.si_signo, pbuf) != 2)
+			if (sscanf(s, "signal: %d/%16s", &timer->spt.si_signo, pbuf) != 2)
 				goto err;
 			break;
 		case 2:
-			if (sscanf(s, "notify: %6[a-z]/%3[a-z].%d\n",
-						sigpid, tidpid, &pid_t) != 3)
+			if (sscanf(s, "notify: %6[a-z]/%3[a-z].%d\n", sigpid, tidpid, &pid_t) != 3)
 				goto err;
 			break;
 		case 3:
-			if (sscanf(s, "ClockID: %d\n",
-					&timer->spt.clock_id) != 1)
+			if (sscanf(s, "ClockID: %d\n", &timer->spt.clock_id) != 1)
 				goto err;
 
 			timer->spt.sival_ptr = NULL;
-			if (sscanf(pbuf, "%p", &timer->spt.sival_ptr) != 1 &&
-			    strcmp(pbuf, "(null)")) {
+			if (sscanf(pbuf, "%p", &timer->spt.sival_ptr) != 1 && strcmp(pbuf, "(null)")) {
 				pr_err("Unable to parse '%s'\n", pbuf);
 				goto err;
 			}
 
-			if ( tidpid[0] == 't') {
+			if (tidpid[0] == 't') {
 				timer->spt.it_sigev_notify = SIGEV_THREAD_ID;
 				timer->spt.notify_thread_id = pid_t;
 			} else {
 				switch (sigpid[0]) {
-					case 's' :
-						timer->spt.it_sigev_notify = SIGEV_SIGNAL;
-						break;
-					case 't' :
-						timer->spt.it_sigev_notify = SIGEV_THREAD;
-						break;
-					default :
-						timer->spt.it_sigev_notify = SIGEV_NONE;
-						break;
+				case 's':
+					timer->spt.it_sigev_notify = SIGEV_SIGNAL;
+					break;
+				case 't':
+					timer->spt.it_sigev_notify = SIGEV_THREAD;
+					break;
+				default:
+					timer->spt.it_sigev_notify = SIGEV_NONE;
+					break;
 				}
 			}
 
@@ -2464,7 +2381,7 @@ int parse_cgroup_file(FILE *f, struct list_head *retl, unsigned int *n)
 			xfree(ncc);
 			goto err;
 		}
-			path = strchr(++name, ':');
+		path = strchr(++name, ':');
 		if (!path) {
 			pr_err("Failed parsing cgroup %s\n", buf);
 			xfree(ncc);
@@ -2575,15 +2492,16 @@ int parse_task_cgroup(int pid, struct parasite_dump_cgroup_args *args, struct li
 				continue;
 
 			/* +1 here to chop off the leading / */
-			pos = ext->path + strlen(ext->path) - strlen(intern->path+1);
-			if (strcmp(pos, intern->path+1)) {
-				pr_err("invalid cgroup configuration, %s is not a suffix of %s\n", intern->path, ext->path);
+			pos = ext->path + strlen(ext->path) - strlen(intern->path + 1);
+			if (strcmp(pos, intern->path + 1)) {
+				pr_err("invalid cgroup configuration, %s is not a suffix of %s\n", intern->path,
+				       ext->path);
 				ret = -1;
 				goto out;
 			}
 
 			ext->cgns_prefix = pos - ext->path;
-			if (ext->path[ext->cgns_prefix-1] == '/')
+			if (ext->path[ext->cgns_prefix - 1] == '/')
 				ext->cgns_prefix--;
 		}
 	}
@@ -2669,10 +2587,10 @@ int collect_controllers(struct list_head *cgroups, unsigned int *n_cgroups)
 				if (!n)
 					goto err;
 
-				nc->controllers[nc->n_controllers-1] = n;
+				nc->controllers[nc->n_controllers - 1] = n;
 			}
 
-skip:
+		skip:
 			if (!off)
 				break;
 			controllers = off + 1;
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index 8f601ea24..d1a11b295 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -70,39 +70,56 @@
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];
 
-#define CR_PB_DESC(__type, __vtype, __ftype)		\
-	CR_PB_MDESC_INIT(cr_pb_descs[PB_##__type],	\
-			 __vtype##Entry,		\
-			 __ftype##_entry)
+#define CR_PB_DESC(__type, __vtype, __ftype) CR_PB_MDESC_INIT(cr_pb_descs[PB_##__type], __vtype##Entry, __ftype##_entry)
 
-#define PB_PACK_TYPECHECK(__o, __fn)	({ if (0) __fn##__pack(__o, NULL); (pb_pack_t)&__fn##__pack; })
-#define PB_GPS_TYPECHECK(__o, __fn)	({ if (0) __fn##__get_packed_size(__o); (pb_getpksize_t)&__fn##__get_packed_size; })
-#define PB_UNPACK_TYPECHECK(__op, __fn)	({ if (0) *__op = __fn##__unpack(NULL, 0, NULL); (pb_unpack_t)&__fn##__unpack; })
-#define PB_FREE_TYPECHECK(__o, __fn)	({ if (0) __fn##__free_unpacked(__o, NULL); (pb_free_t)&__fn##__free_unpacked; })
+#define PB_PACK_TYPECHECK(__o, __fn)             \
+	({                                       \
+		if (0)                           \
+			__fn##__pack(__o, NULL); \
+		(pb_pack_t) & __fn##__pack;      \
+	})
+#define PB_GPS_TYPECHECK(__o, __fn)                         \
+	({                                                  \
+		if (0)                                      \
+			__fn##__get_packed_size(__o);       \
+		(pb_getpksize_t) & __fn##__get_packed_size; \
+	})
+#define PB_UNPACK_TYPECHECK(__op, __fn)                        \
+	({                                                     \
+		if (0)                                         \
+			*__op = __fn##__unpack(NULL, 0, NULL); \
+		(pb_unpack_t) & __fn##__unpack;                \
+	})
+#define PB_FREE_TYPECHECK(__o, __fn)                      \
+	({                                                \
+		if (0)                                    \
+			__fn##__free_unpacked(__o, NULL); \
+		(pb_free_t) & __fn##__free_unpacked;      \
+	})
 
 /*
  * This should be explicitly "called" to do type-checking
  */
 
-#define CR_PB_MDESC_INIT(__var, __type, __name)					\
-	do {									\
-		__var.getpksize	= PB_GPS_TYPECHECK((__type *)NULL, __name);	\
-		__var.pack	= PB_PACK_TYPECHECK((__type *)NULL, __name);	\
-		__var.unpack	= PB_UNPACK_TYPECHECK((__type **)NULL, __name);	\
-		__var.free	= PB_FREE_TYPECHECK((__type *)NULL, __name);	\
-		__var.pb_desc	= &__name##__descriptor;			\
+#define CR_PB_MDESC_INIT(__var, __type, __name)                              \
+	do {                                                                 \
+		__var.getpksize = PB_GPS_TYPECHECK((__type *)NULL, __name);  \
+		__var.pack = PB_PACK_TYPECHECK((__type *)NULL, __name);      \
+		__var.unpack = PB_UNPACK_TYPECHECK((__type **)NULL, __name); \
+		__var.free = PB_FREE_TYPECHECK((__type *)NULL, __name);      \
+		__var.pb_desc = &__name##__descriptor;                       \
 	} while (0)
 
 void cr_pb_init(void)
 {
-	CR_PB_DESC(IDS,			TaskKobjIds,	task_kobj_ids);
-	CR_PB_DESC(SIGACT,		Sa,		sa);
-	CR_PB_DESC(SK_QUEUES,		SkPacket,	sk_packet);
-	CR_PB_MDESC_INIT(cr_pb_descs[PB_IPCNS_MSG],	IpcMsg, ipc_msg);
-	CR_PB_DESC(IPCNS_MSG_ENT,	IpcMsg,		ipc_msg);
-	CR_PB_DESC(REMAP_FPATH,		RemapFilePath,	remap_file_path);
-	CR_PB_DESC(NETDEV,		NetDevice,	net_device);
-	CR_PB_MDESC_INIT(cr_pb_descs[PB_PAGEMAP_HEAD],	PagemapHead,	pagemap_head);
+	CR_PB_DESC(IDS, TaskKobjIds, task_kobj_ids);
+	CR_PB_DESC(SIGACT, Sa, sa);
+	CR_PB_DESC(SK_QUEUES, SkPacket, sk_packet);
+	CR_PB_MDESC_INIT(cr_pb_descs[PB_IPCNS_MSG], IpcMsg, ipc_msg);
+	CR_PB_DESC(IPCNS_MSG_ENT, IpcMsg, ipc_msg);
+	CR_PB_DESC(REMAP_FPATH, RemapFilePath, remap_file_path);
+	CR_PB_DESC(NETDEV, NetDevice, net_device);
+	CR_PB_MDESC_INIT(cr_pb_descs[PB_PAGEMAP_HEAD], PagemapHead, pagemap_head);
 
 #include "protobuf-desc-gen.h"
 }
diff --git a/criu/protobuf.c b/criu/protobuf.c
index 206223ca5..ef78bcec7 100644
--- a/criu/protobuf.c
+++ b/criu/protobuf.c
@@ -20,7 +20,7 @@
 #include "protobuf.h"
 #include "util.h"
 
-#define  image_name(img, buf) __image_name(img, buf, sizeof(buf))
+#define image_name(img, buf) __image_name(img, buf, sizeof(buf))
 static char *__image_name(struct cr_img *img, char *image_path, size_t image_path_size)
 {
 	int fd = img->_x.fd;
@@ -55,8 +55,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 	int ret;
 
 	if (!cr_pb_descs[type].pb_desc) {
-		pr_err("Wrong object requested %d on %s\n",
-			type, image_name(img, img_name_buf));
+		pr_err("Wrong object requested %d on %s\n", type, image_name(img, img_name_buf));
 		return -1;
 	}
 
@@ -70,13 +69,11 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 		if (eof) {
 			return 0;
 		} else {
-			pr_err("Unexpected EOF on %s\n",
-			       image_name(img, img_name_buf));
+			pr_err("Unexpected EOF on %s\n", image_name(img, img_name_buf));
 			return -1;
 		}
 	} else if (ret < sizeof(size)) {
-		pr_perror("Read %d bytes while %d expected on %s",
-			  ret, (int)sizeof(size),
+		pr_perror("Read %d bytes while %d expected on %s", ret, (int)sizeof(size),
 			  image_name(img, img_name_buf));
 		return -1;
 	}
@@ -90,12 +87,10 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 
 	ret = bread(&img->_x, buf, size);
 	if (ret < 0) {
-		pr_perror("Can't read %d bytes from file %s",
-			  size, image_name(img, img_name_buf));
+		pr_perror("Can't read %d bytes from file %s", size, image_name(img, img_name_buf));
 		goto err;
 	} else if (ret != size) {
-		pr_perror("Read %d bytes while %d expected from %s",
-			  ret, size, image_name(img, img_name_buf));
+		pr_perror("Read %d bytes while %d expected from %s", ret, size, image_name(img, img_name_buf));
 		ret = -1;
 		goto err;
 	}
@@ -103,8 +98,7 @@ int do_pb_read_one(struct cr_img *img, void **pobj, int type, bool eof)
 	*pobj = cr_pb_descs[type].unpack(NULL, size, buf);
 	if (!*pobj) {
 		ret = -1;
-		pr_err("Failed unpacking object %p from %s\n",
-		       pobj, image_name(img, img_name_buf));
+		pr_err("Failed unpacking object %p from %s\n", pobj, image_name(img, img_name_buf));
 		goto err;
 	}
 
@@ -209,8 +203,7 @@ int collect_image(struct collect_image_info *cinfo)
 	void *(*o_alloc)(size_t size) = malloc;
 	void (*o_free)(void *ptr) = free;
 
-	pr_info("Collecting %d/%d (flags %x)\n",
-			cinfo->fd_type, cinfo->pb_type, cinfo->flags);
+	pr_info("Collecting %d/%d (flags %x)\n", cinfo->fd_type, cinfo->pb_type, cinfo->flags);
 
 	img = open_image(cinfo->fd_type, O_RSTR);
 	if (!img)
diff --git a/criu/pstree.c b/criu/pstree.c
index 3ca8908b4..d5080e515 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -34,7 +34,7 @@ void core_entry_free(CoreEntry *core)
 }
 
 #ifndef RLIM_NLIMITS
-# define RLIM_NLIMITS 16
+#define RLIM_NLIMITS 16
 #endif
 
 CoreEntry *core_entry_alloc(int th, int tsk)
@@ -118,14 +118,14 @@ CoreEntry *core_entry_alloc(int th, int tsk)
 			ce = core->thread_core->creds = xptr_pull(&m, CredsEntry);
 			creds_entry__init(ce);
 
-			ce->n_cap_inh	= CR_CAP_SIZE;
-			ce->n_cap_prm	= CR_CAP_SIZE;
-			ce->n_cap_eff	= CR_CAP_SIZE;
-			ce->n_cap_bnd	= CR_CAP_SIZE;
-			ce->cap_inh	= xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_inh[0]));
-			ce->cap_prm	= xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_prm[0]));
-			ce->cap_eff	= xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_eff[0]));
-			ce->cap_bnd	= xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_bnd[0]));
+			ce->n_cap_inh = CR_CAP_SIZE;
+			ce->n_cap_prm = CR_CAP_SIZE;
+			ce->n_cap_eff = CR_CAP_SIZE;
+			ce->n_cap_bnd = CR_CAP_SIZE;
+			ce->cap_inh = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_inh[0]));
+			ce->cap_prm = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_prm[0]));
+			ce->cap_eff = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_eff[0]));
+			ce->cap_bnd = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_bnd[0]));
 
 			if (arch_alloc_thread_info(core)) {
 				xfree(core);
@@ -294,7 +294,8 @@ int dump_pstree(struct pstree_item *root_item)
 	if (vpid(root_item) != root_item->sid) {
 		if (!opts.shell_job) {
 			pr_err("The root process %d is not a session leader. "
-			       "Consider using --" OPT_SHELL_JOB " option\n", vpid(item));
+			       "Consider using --" OPT_SHELL_JOB " option\n",
+			       vpid(item));
 			return -1;
 		}
 	}
@@ -306,11 +307,11 @@ int dump_pstree(struct pstree_item *root_item)
 	for_each_pstree_item(item) {
 		pr_info("Process: %d(%d)\n", vpid(item), item->pid->real);
 
-		e.pid		= vpid(item);
-		e.ppid		= item->parent ? vpid(item->parent) : 0;
-		e.pgid		= item->pgid;
-		e.sid		= item->sid;
-		e.n_threads	= item->nr_threads;
+		e.pid = vpid(item);
+		e.ppid = item->parent ? vpid(item->parent) : 0;
+		e.pgid = item->pgid;
+		e.sid = item->sid;
+		e.n_threads = item->nr_threads;
 
 		e.threads = xmalloc(sizeof(e.threads[0]) * e.n_threads);
 		if (!e.threads)
@@ -370,13 +371,11 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 
 	old_sid = root_item->sid;
 	if (old_sid != current_sid) {
-		pr_info("Migrating process tree (SID %d->%d)\n",
-			old_sid, current_sid);
+		pr_info("Migrating process tree (SID %d->%d)\n", old_sid, current_sid);
 
 		tmp = pstree_pid_by_virt(current_sid);
 		if (tmp) {
-			pr_err("Current sid %d intersects with pid (%d) in images",
-			       current_sid, tmp->state);
+			pr_err("Current sid %d intersects with pid (%d) in images\n", current_sid, tmp->state);
 			return -1;
 		}
 
@@ -395,13 +394,11 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 
 	old_gid = root_item->pgid;
 	if (old_gid != current_gid) {
-		pr_info("Migrating process tree (GID %d->%d)\n",
-			old_gid, current_gid);
+		pr_info("Migrating process tree (GID %d->%d)\n", old_gid, current_gid);
 
 		tmp = pstree_pid_by_virt(current_gid);
 		if (tmp) {
-			pr_err("Current gid %d intersects with pid (%d) in images",
-			       current_gid, tmp->state);
+			pr_err("Current gid %d intersects with pid (%d) in images\n", current_gid, tmp->state);
 			return -1;
 		}
 
@@ -456,7 +453,7 @@ static struct pid *lookup_create_pid(pid_t pid, struct pid *pid_node)
 
 void pstree_insert_pid(struct pid *pid_node)
 {
-	struct pid* n;
+	struct pid *n;
 
 	n = lookup_create_pid(pid_node->ns[0].virt, pid_node);
 
@@ -567,7 +564,8 @@ static int read_one_pstree_item(struct cr_img *img, pid_t *pid_max)
 	if (e->ppid == 0) {
 		if (root_item) {
 			pr_err("Parent missed on non-root task "
-			       "with pid %d, image corruption!\n", e->pid);
+			       "with pid %d, image corruption!\n",
+			       e->pid);
 			goto err;
 		}
 		root_item = pi;
@@ -641,7 +639,7 @@ static int read_pstree_image(pid_t *pid_max)
 	return ret;
 }
 
-#define RESERVED_PIDS		300
+#define RESERVED_PIDS 300
 static int get_free_pid(void)
 {
 	static struct pid *prev, *next;
@@ -712,8 +710,7 @@ static int prepare_pstree_ids(pid_t pid)
 			helper->parent = leader;
 			list_add(&helper->sibling, &leader->children);
 
-			pr_info("Attach %d to the task %d\n",
-					vpid(helper), vpid(leader));
+			pr_info("Attach %d to the task %d\n", vpid(helper), vpid(leader));
 		} else {
 			helper = leader;
 			helper->sid = item->sid;
@@ -727,8 +724,7 @@ static int prepare_pstree_ids(pid_t pid)
 			return -1;
 		}
 
-		pr_info("Add a helper %d for restoring SID %d\n",
-				vpid(helper), helper->sid);
+		pr_info("Add a helper %d for restoring SID %d\n", vpid(helper), helper->sid);
 
 		child = list_entry(item->sibling.prev, struct pstree_item, sibling);
 		item = child;
@@ -742,8 +738,7 @@ static int prepare_pstree_ids(pid_t pid)
 			if (child->sid == vpid(child))
 				continue;
 
-			pr_info("Attach %d to the temporary task %d\n",
-					vpid(child), vpid(helper));
+			pr_info("Attach %d to the temporary task %d\n", vpid(child), vpid(helper));
 
 			child->parent = helper;
 			list_move(&child->sibling, &helper->children);
@@ -769,8 +764,8 @@ static int prepare_pstree_ids(pid_t pid)
 			while (parent && vpid(parent) != item->sid) {
 				if (parent->born_sid != -1 && parent->born_sid != item->sid) {
 					pr_err("Can't figure out which sid (%d or %d)"
-						"the process %d was born with\n",
-						parent->born_sid, item->sid, vpid(parent));
+					       "the process %d was born with\n",
+					       parent->born_sid, item->sid, vpid(parent));
 					return -1;
 				}
 				parent->born_sid = item->sid;
@@ -826,15 +821,13 @@ static int prepare_pstree_ids(pid_t pid)
 		list_add(&helper->sibling, &item->children);
 		rsti(item)->pgrp_leader = helper;
 
-		pr_info("Add a helper %d for restoring PGID %d\n",
-				vpid(helper), helper->pgid);
+		pr_info("Add a helper %d for restoring PGID %d\n", vpid(helper), helper->pgid);
 	}
 
 	return 0;
 }
 
-static unsigned long get_clone_mask(TaskKobjIdsEntry *i,
-		TaskKobjIdsEntry *p)
+static unsigned long get_clone_mask(TaskKobjIdsEntry *i, TaskKobjIdsEntry *p)
 {
 	unsigned long mask = 0;
 
@@ -985,12 +978,11 @@ int prepare_pstree(void)
 		if (fd == -1)
 			ret = -1;
 		else {
-			snprintf(buf, sizeof(buf), "%u", pid_max+1);
+			snprintf(buf, sizeof(buf), "%u", pid_max + 1);
 			if (write(fd, buf, strlen(buf)) < 0) {
 				pr_perror("Can't set kernel pid_max=%s", buf);
 				ret = -1;
-			}
-			else
+			} else
 				pr_info("kernel pid_max pushed to %s\n", buf);
 			close(fd);
 		}
diff --git a/criu/rbtree.c b/criu/rbtree.c
index 64a38ea76..ad619f371 100644
--- a/criu/rbtree.c
+++ b/criu/rbtree.c
@@ -108,8 +108,7 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root)
 	rb_set_black(root->rb_node);
 }
 
-static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
-			     struct rb_root *root)
+static void __rb_erase_color(struct rb_node *node, struct rb_node *parent, struct rb_root *root)
 {
 	struct rb_node *other;
 
@@ -122,7 +121,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
 				__rb_rotate_left(parent, root);
 				other = parent->rb_right;
 			}
-			if ((!other->rb_left  || rb_is_black(other->rb_left)) &&
+			if ((!other->rb_left || rb_is_black(other->rb_left)) &&
 			    (!other->rb_right || rb_is_black(other->rb_right))) {
 				rb_set_red(other);
 				node = parent;
@@ -149,7 +148,7 @@ static void __rb_erase_color(struct rb_node *node, struct rb_node *parent,
 				__rb_rotate_right(parent, root);
 				other = parent->rb_left;
 			}
-			if ((!other->rb_left  || rb_is_black(other->rb_left)) &&
+			if ((!other->rb_left || rb_is_black(other->rb_left)) &&
 			    (!other->rb_right || rb_is_black(other->rb_right))) {
 				rb_set_red(other);
 				node = parent;
@@ -245,7 +244,7 @@ color:
  */
 struct rb_node *rb_first(const struct rb_root *root)
 {
-	struct rb_node	*n;
+	struct rb_node *n;
 
 	n = root->rb_node;
 	if (!n)
@@ -259,7 +258,7 @@ struct rb_node *rb_first(const struct rb_root *root)
 
 struct rb_node *rb_last(const struct rb_root *root)
 {
-	struct rb_node	*n;
+	struct rb_node *n;
 
 	n = root->rb_node;
 	if (!n)
@@ -285,7 +284,7 @@ struct rb_node *rb_next(const struct rb_node *node)
 	if (node->rb_right) {
 		node = node->rb_right;
 		while (node->rb_left)
-			node=node->rb_left;
+			node = node->rb_left;
 		return (struct rb_node *)node;
 	}
 
@@ -331,9 +330,7 @@ struct rb_node *rb_prev(const struct rb_node *node)
 	return parent;
 }
 
-void rb_replace_node(struct rb_node *victim,
-		     struct rb_node *new,
-		     struct rb_root *root)
+void rb_replace_node(struct rb_node *victim, struct rb_node *new, struct rb_root *root)
 {
 	struct rb_node *parent = rb_parent(victim);
 
diff --git a/criu/rst-malloc.c b/criu/rst-malloc.c
index ff96797e2..edac78137 100644
--- a/criu/rst-malloc.c
+++ b/criu/rst-malloc.c
@@ -43,8 +43,7 @@ static int grow_shared(struct rst_mem_type_s *t, unsigned long size)
 	 * previous chunk location and allocate a
 	 * new one
 	 */
-	aux = mmap(NULL, size, PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	aux = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (aux == MAP_FAILED)
 		return -1;
 
@@ -65,8 +64,7 @@ static int grow_remap(struct rst_mem_type_s *t, int flag, unsigned long size)
 		/*
 		 * Can't call mremap with NULL address :(
 		 */
-		aux = mmap(NULL, size, PROT_READ | PROT_WRITE,
-				flag | MAP_ANONYMOUS, 0, 0);
+		aux = mmap(NULL, size, PROT_READ | PROT_WRITE, flag | MAP_ANONYMOUS, 0, 0);
 	else {
 		if (flag & MAP_SHARED) {
 			/*
@@ -88,8 +86,7 @@ static int grow_remap(struct rst_mem_type_s *t, int flag, unsigned long size)
 		 * a completely new one and force callers use objects'
 		 * cpos-s.
 		 */
-		aux = mremap(t->buf, t->size,
-				t->size + size, MREMAP_MAYMOVE);
+		aux = mremap(t->buf, t->size, t->size + size, MREMAP_MAYMOVE);
 	}
 	if (aux == MAP_FAILED)
 		return -1;
@@ -142,7 +139,7 @@ void rst_mem_align(int type)
 	struct rst_mem_type_s *t = &rst_mems[type];
 	void *ptr;
 
-	ptr = (void *) round_up((unsigned long)t->free_mem, sizeof(void *));
+	ptr = (void *)round_up((unsigned long)t->free_mem, sizeof(void *));
 	t->free_bytes -= (ptr - t->free_mem);
 	t->free_mem = ptr;
 }
@@ -220,8 +217,7 @@ static int rst_mem_remap_one(struct rst_mem_type_s *t, void *to)
 		 */
 		return 0;
 
-	pr_debug("\tcall mremap(%p, %lu, %lu, MAYMOVE | FIXED, %p)\n",
-			t->buf, t->size, t->size, to);
+	pr_debug("\tcall mremap(%p, %lu, %lu, MAYMOVE | FIXED, %p)\n", t->buf, t->size, t->size, to);
 	aux = mremap(t->buf, t->size, t->size, MREMAP_MAYMOVE | MREMAP_FIXED, to);
 	if (aux == MAP_FAILED) {
 		pr_perror("Can't mremap rst mem");
@@ -256,4 +252,3 @@ void shfree_last(void *ptr)
 {
 	rst_mem_free_last(RM_SHARED);
 }
-
diff --git a/criu/seccomp.c b/criu/seccomp.c
index 94e663d40..917f694b6 100644
--- a/criu/seccomp.c
+++ b/criu/seccomp.c
@@ -19,7 +19,7 @@
 #include "protobuf.h"
 #include "images/seccomp.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "seccomp: "
 
 static struct rb_root seccomp_tid_rb_root = RB_ROOT;
@@ -52,7 +52,7 @@ struct seccomp_entry *seccomp_lookup(pid_t tid_real, bool create, bool mandatory
 		if (!entry)
 			return NULL;
 		rb_init_node(&entry->node);
-		entry->tid_real	= tid_real;
+		entry->tid_real = tid_real;
 
 		entry->next = seccomp_tid_entry_root, seccomp_tid_entry_root = entry;
 		rb_link_and_balance(&seccomp_tid_rb_root, &entry->node, parent, new);
@@ -146,8 +146,7 @@ static int collect_filter(struct seccomp_entry *entry)
 			if (errno == ENOENT) {
 				break;
 			} else {
-				pr_perror("Can't fetch filter on tid_real %d i %zu",
-					  entry->tid_real, i);
+				pr_perror("Can't fetch filter on tid_real %d i %zu", entry->tid_real, i);
 				return -1;
 			}
 		}
@@ -225,8 +224,7 @@ static void try_use_tsync(struct seccomp_entry *leader, struct pstree_item *item
 		if (entry == leader)
 			continue;
 
-		if (entry->mode != leader->mode ||
-		    entry->nr_chains != leader->nr_chains)
+		if (entry->mode != leader->mode || entry->nr_chains != leader->nr_chains)
 			return;
 
 		chain_a = leader->chain;
@@ -235,12 +233,10 @@ static void try_use_tsync(struct seccomp_entry *leader, struct pstree_item *item
 		for (j = 0; j < leader->nr_chains; j++) {
 			BUG_ON((!chain_a || !chain_b));
 
-			if (chain_a->filter.filter.len !=
-			    chain_b->filter.filter.len)
+			if (chain_a->filter.filter.len != chain_b->filter.filter.len)
 				return;
 
-			if (memcmp(chain_a->filter.filter.data,
-				   chain_b->filter.filter.data,
+			if (memcmp(chain_a->filter.filter.data, chain_b->filter.filter.data,
 				   chain_a->filter.filter.len))
 				return;
 
@@ -250,8 +246,7 @@ static void try_use_tsync(struct seccomp_entry *leader, struct pstree_item *item
 	}
 
 	/* OK, so threads can be restored with tsync */
-	pr_debug("Use SECCOMP_FILTER_FLAG_TSYNC for tid_real %d\n",
-		 leader->tid_real);
+	pr_debug("Use SECCOMP_FILTER_FLAG_TSYNC for tid_real %d\n", leader->tid_real);
 
 	for (chain_a = leader->chain; chain_a; chain_a = chain_a->prev)
 		chain_a->filter.flags |= SECCOMP_FILTER_FLAG_TSYNC;
@@ -263,8 +258,7 @@ static void try_use_tsync(struct seccomp_entry *leader, struct pstree_item *item
 		if (entry == leader)
 			continue;
 
-		pr_debug("\t Disable filter on tid_rea %d, will be propagated\n",
-			 entry->tid_real);
+		pr_debug("\t Disable filter on tid_rea %d, will be propagated\n", entry->tid_real);
 
 		entry->mode = SECCOMP_MODE_DISABLED;
 		seccomp_free_chain(entry);
@@ -281,16 +275,14 @@ static int collect_filters(struct pstree_item *item)
 
 	leader = seccomp_find_entry(item->pid->real);
 	if (!leader) {
-		pr_err("Can't collect filter on leader tid_real %d\n",
-		       item->pid->real);
+		pr_err("Can't collect filter on leader tid_real %d\n", item->pid->real);
 		return -1;
 	}
 
 	for (i = 0; i < item->nr_threads; i++) {
 		entry = seccomp_find_entry(item->threads[i].real);
 		if (!entry) {
-			pr_err("Can't collect filter on tid_real %d\n",
-			       item->pid->real);
+			pr_err("Can't collect filter on tid_real %d\n", item->pid->real);
 			return -1;
 		}
 
@@ -331,8 +323,7 @@ static int dump_seccomp_filters(void)
 
 		for (chain = entry->chain; chain; chain = chain->prev) {
 			if (img_filter_pos >= nr_chains) {
-				pr_err("Unexpected position %zu > %zu\n",
-				       img_filter_pos, nr_chains);
+				pr_err("Unexpected position %zu > %zu\n", img_filter_pos, nr_chains);
 				xfree(se.seccomp_filters);
 				return -1;
 			}
@@ -408,8 +399,8 @@ void seccomp_rst_reloc(struct thread_restore_args *args)
 		return;
 
 	args->seccomp_filters = rst_mem_remap_ptr(args->seccomp_filters_pos, RM_PRIVATE);
-	args->seccomp_filters_data = (void *)args->seccomp_filters +
-			args->seccomp_filters_n * sizeof(struct thread_seccomp_filter);
+	args->seccomp_filters_data =
+		(void *)args->seccomp_filters + args->seccomp_filters_n * sizeof(struct thread_seccomp_filter);
 
 	for (j = off = 0; j < args->seccomp_filters_n; j++) {
 		struct thread_seccomp_filter *f = &args->seccomp_filters[j];
@@ -429,11 +420,11 @@ int seccomp_prepare_threads(struct pstree_item *item, struct task_restore_args *
 		struct thread_restore_args *args = &args_array[i];
 		SeccompFilter *sf;
 
-		args->seccomp_mode		= SECCOMP_MODE_DISABLED;
-		args->seccomp_filters_pos	= 0;
-		args->seccomp_filters_n		= 0;
-		args->seccomp_filters		= NULL;
-		args->seccomp_filters_data	= NULL;
+		args->seccomp_mode = SECCOMP_MODE_DISABLED;
+		args->seccomp_filters_pos = 0;
+		args->seccomp_filters_n = 0;
+		args->seccomp_filters = NULL;
+		args->seccomp_filters_data = NULL;
 
 		if (thread_core->has_seccomp_mode)
 			args->seccomp_mode = thread_core->seccomp_mode;
@@ -442,16 +433,14 @@ int seccomp_prepare_threads(struct pstree_item *item, struct task_restore_args *
 			continue;
 
 		if (thread_core->seccomp_filter >= seccomp_img_entry->n_seccomp_filters) {
-			pr_err("Corrupted filter index on tid %d (%u > %zu)\n",
-			       item->threads[i].ns[0].virt, thread_core->seccomp_filter,
-			       seccomp_img_entry->n_seccomp_filters);
+			pr_err("Corrupted filter index on tid %d (%u > %zu)\n", item->threads[i].ns[0].virt,
+			       thread_core->seccomp_filter, seccomp_img_entry->n_seccomp_filters);
 			return -1;
 		}
 
 		sf = seccomp_img_entry->seccomp_filters[thread_core->seccomp_filter];
 		if (sf->filter.len % (sizeof(struct sock_filter))) {
-			pr_err("Corrupted filter len on tid %d (index %u)\n",
-			       item->threads[i].ns[0].virt,
+			pr_err("Corrupted filter len on tid %d (index %u)\n", item->threads[i].ns[0].virt,
 			       thread_core->seccomp_filter);
 			return -1;
 		}
@@ -460,16 +449,15 @@ int seccomp_prepare_threads(struct pstree_item *item, struct task_restore_args *
 
 		while (sf->has_prev) {
 			if (sf->prev >= seccomp_img_entry->n_seccomp_filters) {
-				pr_err("Corrupted filter index on tid %d (%u > %zu)\n",
-				       item->threads[i].ns[0].virt, sf->prev,
-				       seccomp_img_entry->n_seccomp_filters);
+				pr_err("Corrupted filter index on tid %d (%u > %zu)\n", item->threads[i].ns[0].virt,
+				       sf->prev, seccomp_img_entry->n_seccomp_filters);
 				return -1;
 			}
 
 			sf = seccomp_img_entry->seccomp_filters[sf->prev];
 			if (sf->filter.len % (sizeof(struct sock_filter))) {
-				pr_err("Corrupted filter len on tid %d (index %u)\n",
-				       item->threads[i].ns[0].virt, sf->prev);
+				pr_err("Corrupted filter len on tid %d (index %u)\n", item->threads[i].ns[0].virt,
+				       sf->prev);
 				return -1;
 			}
 			filters_size += sf->filter.len;
@@ -482,20 +470,20 @@ int seccomp_prepare_threads(struct pstree_item *item, struct task_restore_args *
 		args->seccomp_filters_pos = rst_mem_align_cpos(RM_PRIVATE);
 		args->seccomp_filters = rst_mem_alloc(rst_size, RM_PRIVATE);
 		if (!args->seccomp_filters) {
-			pr_err("Can't allocate %zu bytes for filters on tid %d\n",
-			       rst_size, item->threads[i].ns[0].virt);
+			pr_err("Can't allocate %zu bytes for filters on tid %d\n", rst_size,
+			       item->threads[i].ns[0].virt);
 			return -ENOMEM;
 		}
-		args->seccomp_filters_data = (void *)args->seccomp_filters +
-			nr_filters * sizeof(struct thread_seccomp_filter);
+		args->seccomp_filters_data =
+			(void *)args->seccomp_filters + nr_filters * sizeof(struct thread_seccomp_filter);
 
 		sf = seccomp_img_entry->seccomp_filters[thread_core->seccomp_filter];
 		for (j = off = 0; j < nr_filters; j++) {
 			struct thread_seccomp_filter *f = &args->seccomp_filters[j];
 
-			f->sock_fprog.len	= sf->filter.len / sizeof(struct sock_filter);
-			f->sock_fprog.filter	= args->seccomp_filters_data + off;
-			f->flags		= sf->flags;
+			f->sock_fprog.len = sf->filter.len / sizeof(struct sock_filter);
+			f->sock_fprog.filter = args->seccomp_filters_data + off;
+			f->flags = sf->flags;
 
 			memcpy(f->sock_fprog.filter, sf->filter.data, sf->filter.len);
 
diff --git a/criu/seize.c b/criu/seize.c
index e055a3796..95bf9ef0c 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -26,16 +26,11 @@
 
 #define NR_ATTEMPTS 5
 
-static const char frozen[]	= "FROZEN";
-static const char freezing[]	= "FREEZING";
-static const char thawed[]	= "THAWED";
+static const char frozen[] = "FROZEN";
+static const char freezing[] = "FREEZING";
+static const char thawed[] = "THAWED";
 
-enum freezer_state {
-	FREEZER_ERROR = -1,
-	THAWED,
-	FROZEN,
-	FREEZING
-};
+enum freezer_state { FREEZER_ERROR = -1, THAWED, FROZEN, FREEZING };
 
 /* Track if we are running on cgroup v2 system. */
 static bool cgroup_v2 = false;
@@ -45,8 +40,7 @@ static enum freezer_state get_freezer_v1_state(int fd)
 	char state[32];
 	int ret;
 
-	BUILD_BUG_ON((sizeof(state) < sizeof(frozen))	||
-		     (sizeof(state) < sizeof(freezing))	||
+	BUILD_BUG_ON((sizeof(state) < sizeof(frozen)) || (sizeof(state) < sizeof(freezing)) ||
 		     (sizeof(state) < sizeof(thawed)));
 
 	lseek(fd, 0, SEEK_SET);
@@ -146,23 +140,19 @@ const char *get_real_freezer_state(void)
 
 static int freezer_write_state(int fd, enum freezer_state new_state)
 {
-	char state[32] = {0};
+	char state[32] = { 0 };
 	int ret;
 
 	if (new_state == THAWED) {
 		if (cgroup_v2)
 			state[0] = '0';
-		else
-			if (strlcpy(state, thawed, sizeof(state)) >=
-					sizeof(state))
-				return -1;
+		else if (strlcpy(state, thawed, sizeof(state)) >= sizeof(state))
+			return -1;
 	} else if (new_state == FROZEN) {
 		if (cgroup_v2)
 			state[0] = '1';
-		else
-			if (strlcpy(state, frozen, sizeof(state)) >=
-					sizeof(state))
-				return -1;
+		else if (strlcpy(state, frozen, sizeof(state)) >= sizeof(state))
+			return -1;
 	} else {
 		return -1;
 	}
@@ -173,8 +163,7 @@ static int freezer_write_state(int fd, enum freezer_state new_state)
 		return -1;
 	}
 	if (write(fd, state, sizeof(state)) != sizeof(state)) {
-		pr_perror("Unable to %s tasks",
-				(new_state == THAWED) ? "thaw" : "freeze");
+		pr_perror("Unable to %s tasks", (new_state == THAWED) ? "thaw" : "freeze");
 		return -1;
 	}
 
@@ -188,8 +177,7 @@ static int freezer_open(void)
 	char path[PATH_MAX];
 	int fd;
 
-	snprintf(path, sizeof(path), "%s/%s", opts.freeze_cgroup,
-			cgroup_v2 ? freezer_v2 : freezer_v1);
+	snprintf(path, sizeof(path), "%s/%s", opts.freeze_cgroup, cgroup_v2 ? freezer_v2 : freezer_v1);
 	fd = open(path, O_RDWR);
 	if (fd < 0) {
 		pr_perror("Unable to open %s", path);
@@ -221,8 +209,7 @@ static FILE *freezer_open_thread_list(char *root_path)
 	char path[PATH_MAX];
 	FILE *f;
 
-	snprintf(path, sizeof(path), "%s/%s", root_path,
-			cgroup_v2 ? "cgroup.threads" : "tasks");
+	snprintf(path, sizeof(path), "%s/%s", root_path, cgroup_v2 ? "cgroup.threads" : "tasks");
 	f = fopen(path, "r");
 	if (f == NULL) {
 		pr_perror("Unable to open %s", path);
@@ -425,7 +412,6 @@ static int log_unfrozen_stacks(char *root)
 		stackbuf[ret] = '\0';
 
 		pr_debug("Task %d has stack:\n%s", pid, stackbuf);
-
 	}
 	fclose(f);
 
@@ -472,8 +458,8 @@ static int freeze_processes(void)
 	unsigned long i = 0;
 
 	const struct timespec req = {
-		.tv_nsec	= step_ms * 1000000,
-		.tv_sec		= 0,
+		.tv_nsec = step_ms * 1000000,
+		.tv_sec = 0,
 	};
 
 	if (unlikely(!nr_attempts)) {
@@ -484,8 +470,7 @@ static int freeze_processes(void)
 		nr_attempts = (10 * 1000000) / step_ms;
 	}
 
-	pr_debug("freezing processes: %lu attempts with %lu ms steps\n",
-		 nr_attempts, step_ms);
+	pr_debug("freezing processes: %lu attempts with %lu ms steps\n", nr_attempts, step_ms);
 
 	fd = freezer_open();
 	if (fd < 0)
@@ -676,7 +661,6 @@ static void pstree_wait(struct pstree_item *root_item)
 	int pid, status, i;
 
 	for_each_pstree_item(item) {
-
 		if (item->pid->state == TASK_DEAD)
 			continue;
 
@@ -687,8 +671,7 @@ static void pstree_wait(struct pstree_item *root_item)
 				break;
 			} else {
 				if (!WIFSIGNALED(status) || WTERMSIG(status) != SIGKILL) {
-					pr_err("Unexpected exit code %d of %d: %s\n",
-						status, pid, strsignal(status));
+					pr_err("Unexpected exit code %d of %d: %s\n", status, pid, strsignal(status));
 					BUG();
 				}
 			}
@@ -791,8 +774,7 @@ static int collect_threads(struct pstree_item *item)
 
 		nr_inprogress++;
 
-		pr_info("\tSeizing %d's %d thread\n",
-				item->pid->real, pid);
+		pr_info("\tSeizing %d's %d thread\n", item->pid->real, pid);
 
 		if (!opts.freeze_cgroup && compel_interrupt_task(pid))
 			continue;
@@ -846,8 +828,7 @@ err:
 	return -1;
 }
 
-static int collect_loop(struct pstree_item *item,
-		int (*collect)(struct pstree_item *))
+static int collect_loop(struct pstree_item *item, int (*collect)(struct pstree_item *))
 {
 	int attempts = NR_ATTEMPTS, nr_inprogress = 1;
 
@@ -993,4 +974,3 @@ err:
 	alarm(0);
 	return ret;
 }
-
diff --git a/criu/servicefd.c b/criu/servicefd.c
index 952410a8d..06a8d3eba 100644
--- a/criu/servicefd.c
+++ b/criu/servicefd.c
@@ -17,7 +17,7 @@
 #include "rst_info.h"
 #include "servicefd.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "sfd: "
 
 /* Max potentially possible fd to be open by criu process */
@@ -41,21 +41,21 @@ bool sfds_protected = false;
 const char *sfd_type_name(enum sfd_type type)
 {
 	static const char *names[] = {
-		[SERVICE_FD_MIN]	= __stringify_1(SERVICE_FD_MIN),
-		[LOG_FD_OFF]		= __stringify_1(LOG_FD_OFF),
-		[IMG_FD_OFF]		= __stringify_1(IMG_FD_OFF),
-		[PROC_FD_OFF]		= __stringify_1(PROC_FD_OFF),
-		[PROC_PID_FD_OFF]	= __stringify_1(PROC_PID_FD_OFF),
-		[PROC_SELF_FD_OFF]	= __stringify_1(PROC_SELF_FD_OFF),
-		[CR_PROC_FD_OFF]	= __stringify_1(CR_PROC_FD_OFF),
-		[ROOT_FD_OFF]		= __stringify_1(ROOT_FD_OFF),
-		[CGROUP_YARD]		= __stringify_1(CGROUP_YARD),
-		[USERNSD_SK]		= __stringify_1(USERNSD_SK),
-		[NS_FD_OFF]		= __stringify_1(NS_FD_OFF),
-		[TRANSPORT_FD_OFF]	= __stringify_1(TRANSPORT_FD_OFF),
-		[RPC_SK_OFF]		= __stringify_1(RPC_SK_OFF),
-		[FDSTORE_SK_OFF]	= __stringify_1(FDSTORE_SK_OFF),
-		[SERVICE_FD_MAX]	= __stringify_1(SERVICE_FD_MAX),
+		[SERVICE_FD_MIN] = __stringify_1(SERVICE_FD_MIN),
+		[LOG_FD_OFF] = __stringify_1(LOG_FD_OFF),
+		[IMG_FD_OFF] = __stringify_1(IMG_FD_OFF),
+		[PROC_FD_OFF] = __stringify_1(PROC_FD_OFF),
+		[PROC_PID_FD_OFF] = __stringify_1(PROC_PID_FD_OFF),
+		[PROC_SELF_FD_OFF] = __stringify_1(PROC_SELF_FD_OFF),
+		[CR_PROC_FD_OFF] = __stringify_1(CR_PROC_FD_OFF),
+		[ROOT_FD_OFF] = __stringify_1(ROOT_FD_OFF),
+		[CGROUP_YARD] = __stringify_1(CGROUP_YARD),
+		[USERNSD_SK] = __stringify_1(USERNSD_SK),
+		[NS_FD_OFF] = __stringify_1(NS_FD_OFF),
+		[TRANSPORT_FD_OFF] = __stringify_1(TRANSPORT_FD_OFF),
+		[RPC_SK_OFF] = __stringify_1(RPC_SK_OFF),
+		[FDSTORE_SK_OFF] = __stringify_1(FDSTORE_SK_OFF),
+		[SERVICE_FD_MAX] = __stringify_1(SERVICE_FD_MAX),
 	};
 
 	if (type < ARRAY_SIZE(names))
@@ -145,8 +145,7 @@ int service_fd_min_fd(struct pstree_item *item)
 
 static void sfds_protection_bug(enum sfd_type type)
 {
-	pr_err("Service fd %s is being modified in protected context\n",
-	       sfd_type_name(type));
+	pr_err("Service fd %s is being modified in protected context\n", sfd_type_name(type));
 	print_stack_trace(current ? vpid(current) : 0);
 	BUG();
 }
@@ -173,8 +172,7 @@ int install_service_fd(enum sfd_type type, int fd)
 	else
 		tmp = dup3(fd, sfd, O_CLOEXEC);
 	if (tmp < 0) {
-		pr_perror("%s dup %d -> %d failed",
-			  sfd_type_name(type), fd, sfd);
+		pr_perror("%s dup %d -> %d failed", sfd_type_name(type), fd, sfd);
 		close(fd);
 		return -1;
 	} else if (tmp != sfd) {
@@ -219,7 +217,7 @@ void __close_service_fd(enum sfd_type type)
 static int move_service_fd(struct pstree_item *me, int type, int new_id, int new_base)
 {
 	int old = get_service_fd(type);
-	int new = new_base - type - SERVICE_FD_MAX * new_id;
+	int new = new_base - type - SERVICE_FD_MAX *new_id;
 	int ret;
 
 	if (old < 0)
@@ -230,8 +228,7 @@ static int move_service_fd(struct pstree_item *me, int type, int new_id, int new
 	else
 		ret = dup2(old, new);
 	if (ret == -1) {
-		pr_perror("%s unable to clone %d->%d",
-			  sfd_type_name(type), old, new);
+		pr_perror("%s unable to clone %d->%d", sfd_type_name(type), old, new);
 		return -1;
 	} else if (ret != new) {
 		pr_err("%s busy target %d -> %d\n", sfd_type_name(type), old, new);
@@ -254,8 +251,7 @@ static int choose_service_fd_base(struct pstree_item *me)
 	}
 	/* Now find process's max used fd number */
 	if (!list_empty(&rsti(me)->fds))
-		nr = list_entry(rsti(me)->fds.prev,
-				struct fdinfo_list_entry, ps_list)->fe->fd;
+		nr = list_entry(rsti(me)->fds.prev, struct fdinfo_list_entry, ps_list)->fe->fd;
 	else
 		nr = -1;
 
diff --git a/criu/shmem.c b/criu/shmem.c
index 3de7170b8..1b83327ef 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -28,8 +28,8 @@
 #include "images/pagemap.pb-c.h"
 
 #ifndef SEEK_DATA
-#define SEEK_DATA	3
-#define SEEK_HOLE	4
+#define SEEK_DATA 3
+#define SEEK_HOLE 4
 #endif
 
 /*
@@ -41,23 +41,23 @@
  * any tasks. Thus the heads are private (COW-ed) and the
  * entries are all in shmem.
  */
-#define SHMEM_HASH_SIZE	32
+#define SHMEM_HASH_SIZE 32
 static struct hlist_head shmems_hash[SHMEM_HASH_SIZE];
 
-#define for_each_shmem(_i, _si)					\
-	for (_i = 0; _i < SHMEM_HASH_SIZE; _i++)		\
+#define for_each_shmem(_i, _si)                  \
+	for (_i = 0; _i < SHMEM_HASH_SIZE; _i++) \
 		hlist_for_each_entry(_si, &shmems_hash[_i], h)
 
 struct shmem_info {
 	struct hlist_node h;
-	unsigned long	shmid;
+	unsigned long shmid;
 
 	/*
 	 * Owner PID. This guy creates anon shmem on restore and
 	 * from this the shmem is read on dump
 	 */
-	int		pid;
-	unsigned long	size;
+	int pid;
+	unsigned long size;
 
 	union {
 		struct { /* For restore */
@@ -65,7 +65,7 @@ struct shmem_info {
 			 * Descriptor by which this shmem is opened
 			 * by the creator
 			 */
-			int		fd;
+			int fd;
 
 			/*
 			 * 0. lock is initialized to zero
@@ -74,38 +74,38 @@ struct shmem_info {
 			 * 3. the master waits all slaves on lock. After that
 			 *    it can close the descriptor.
 			 */
-			futex_t		lock;
+			futex_t lock;
 
 			/*
 			 * Here is a problem, that we don't know, which process will restore
 			 * an region. Each time when we	found a process with a smaller pid,
 			 * we reset self_count, so we can't have only one counter.
 			 */
-			int		count;		/* the number of regions */
-			int		self_count;	/* the number of regions, which belongs to "pid" */
+			int count; /* the number of regions */
+			int self_count; /* the number of regions, which belongs to "pid" */
 		};
 
 		struct { /* For sysvipc restore */
 			struct list_head att; /* list of shmem_sysv_att-s */
-			int		 want_write;
+			int want_write;
 		};
 
 		struct { /* For dump */
-			unsigned long	start;
-			unsigned long	end;
-			unsigned long	*pstate_map;
+			unsigned long start;
+			unsigned long end;
+			unsigned long *pstate_map;
 		};
 	};
 };
 
 struct shmem_sysv_att {
 	struct list_head l;
-	VmaEntry	*first;
-	unsigned long	prev_end;
+	VmaEntry *first;
+	unsigned long prev_end;
 };
 
 /* This is the "pid that will restore shmem" value for sysv */
-#define SYSVIPC_SHMEM_PID	(-1)
+#define SYSVIPC_SHMEM_PID (-1)
 
 static inline struct hlist_head *shmem_chain(unsigned long shmid)
 {
@@ -134,12 +134,12 @@ static struct shmem_info *shmem_find(unsigned long shmid)
 }
 
 #define PST_DONT_DUMP 0
-#define PST_DUMP 1
-#define PST_ZERO 2
-#define PST_DIRTY 3
+#define PST_DUMP      1
+#define PST_ZERO      2
+#define PST_DIRTY     3
 
-#define PST_BITS 2
-#define PST_BIT0_IX(pfn) ((pfn) * PST_BITS)
+#define PST_BITS	 2
+#define PST_BIT0_IX(pfn) ((pfn)*PST_BITS)
 #define PST_BIT1_IX(pfn) (PST_BIT0_IX(pfn) + 1)
 
 /*
@@ -169,8 +169,7 @@ static unsigned int get_pstate(unsigned long *pstate_map, unsigned long pfn)
 	return (bit1 << 1) | bit0;
 }
 
-static void set_pstate(unsigned long *pstate_map, unsigned long pfn,
-		unsigned int pstate)
+static void set_pstate(unsigned long *pstate_map, unsigned long pfn, unsigned int pstate)
 {
 	if (pstate & 1)
 		set_bit(PST_BIT0_IX(pfn), pstate_map);
@@ -258,7 +257,8 @@ int fixup_sysv_shmems(void)
 	struct shmem_info *si;
 	struct shmem_sysv_att *att;
 
-	for_each_shmem(i, si) {
+	for_each_shmem(i, si)
+	{
 		/* It can be anon shmem */
 		if (si->pid != SYSVIPC_SHMEM_PID)
 			continue;
@@ -293,13 +293,12 @@ static int open_shmem_sysv(int pid, struct vma_area *vma)
 
 	si = shmem_find(vme->shmid);
 	if (!si) {
-		pr_err("Can't find sysv shmem for %"PRIx64"\n", vme->shmid);
+		pr_err("Can't find sysv shmem for %" PRIx64 "\n", vme->shmid);
 		return -1;
 	}
 
 	if (si->pid != SYSVIPC_SHMEM_PID) {
-		pr_err("SysV shmem vma 0x%"PRIx64" points to anon vma %lx\n",
-				vme->start, si->shmid);
+		pr_err("SysV shmem vma 0x%" PRIx64 " points to anon vma %lx\n", vme->start, si->shmid);
 		return -1;
 	}
 
@@ -360,7 +359,7 @@ static int open_shmem_sysv(int pid, struct vma_area *vma)
 		ret_fd = SYSV_SHMEM_SKIP_FD;
 	}
 
-	pr_info("Note 0x%"PRIx64"-0x%"PRIx64" as %lx sysvshmem\n", vme->start, vme->end, si->shmid);
+	pr_info("Note 0x%" PRIx64 "-0x%" PRIx64 " as %lx sysvshmem\n", vme->start, vme->end, si->shmid);
 
 	att->prev_end = vme->end;
 	if (!vme->has_fdflags || vme->fdflags == O_RDWR)
@@ -394,7 +393,7 @@ int collect_shmem(int pid, struct vma_area *vma)
 	si = shmem_find(vi->shmid);
 	if (si) {
 		if (si->pid == SYSVIPC_SHMEM_PID) {
-			pr_err("Shmem %"PRIx64" already collected as SYSVIPC\n", vi->shmid);
+			pr_err("Shmem %" PRIx64 " already collected as SYSVIPC\n", vi->shmid);
 			return -1;
 		}
 
@@ -415,7 +414,7 @@ int collect_shmem(int pid, struct vma_area *vma)
 			return 0;
 		}
 
-		si->pid	 = pid;
+		si->pid = pid;
 		si->self_count = 1;
 
 		return 0;
@@ -425,13 +424,12 @@ int collect_shmem(int pid, struct vma_area *vma)
 	if (!si)
 		return -1;
 
-	pr_info("Add new shmem 0x%"PRIx64" (%#016"PRIx64"-%#016"PRIx64")\n",
-				vi->shmid, vi->start, vi->end);
+	pr_info("Add new shmem 0x%" PRIx64 " (%#016" PRIx64 "-%#016" PRIx64 ")\n", vi->shmid, vi->start, vi->end);
 
 	si->shmid = vi->shmid;
-	si->pid	  = pid;
-	si->size  = size;
-	si->fd    = -1;
+	si->pid = pid;
+	si->size = size;
+	si->fd = -1;
 	si->count = 1;
 	si->self_count = 1;
 	futex_init(&si->lock);
@@ -448,8 +446,7 @@ static int shmem_wait_and_open(struct shmem_info *si, VmaEntry *vi)
 	pr_info("Waiting for the %lx shmem to appear\n", si->shmid);
 	futex_wait_while(&si->lock, 0);
 
-	snprintf(path, sizeof(path), "/proc/%d/fd/%d",
-		si->pid, si->fd);
+	snprintf(path, sizeof(path), "/proc/%d/fd/%d", si->pid, si->fd);
 
 	pr_info("Opening shmem [%s] \n", path);
 	ret = open_proc_rw(si->pid, "fd/%d", si->fd);
@@ -545,9 +542,9 @@ static int open_shmem(int pid, struct vma_area *vma)
 	int flags;
 
 	si = shmem_find(vi->shmid);
-	pr_info("Search for %#016"PRIx64" shmem 0x%"PRIx64" %p/%d\n", vi->start, vi->shmid, si, si ? si->pid : -1);
+	pr_info("Search for %#016" PRIx64 " shmem 0x%" PRIx64 " %p/%d\n", vi->start, vi->shmid, si, si ? si->pid : -1);
 	if (!si) {
-		pr_err("Can't find my shmem %#016"PRIx64"\n", vi->start);
+		pr_err("Can't find my shmem %#016" PRIx64 "\n", vi->start);
 		return -1;
 	}
 
@@ -591,8 +588,7 @@ static int open_shmem(int pid, struct vma_area *vma)
 	 */
 	addr = mmap(NULL, si->size, PROT_WRITE | PROT_READ, flags, f, 0);
 	if (addr == MAP_FAILED) {
-		pr_perror("Can't mmap shmid=0x%"PRIx64" size=%ld",
-				vi->shmid, si->size);
+		pr_perror("Can't mmap shmid=0x%" PRIx64 " size=%ld", vi->shmid, si->size);
 		goto err;
 	}
 
@@ -602,9 +598,7 @@ static int open_shmem(int pid, struct vma_area *vma)
 	}
 
 	if (f == -1) {
-		f = open_proc_rw(getpid(), "map_files/%lx-%lx",
-				(unsigned long) addr,
-				(unsigned long) addr + si->size);
+		f = open_proc_rw(getpid(), "map_files/%lx-%lx", (unsigned long)addr, (unsigned long)addr + si->size);
 		if (f < 0)
 			goto err;
 	}
@@ -670,9 +664,8 @@ static int dump_pages(struct page_pipe *pp, struct page_xfer *xfer)
 	struct page_pipe_buf *ppb;
 
 	list_for_each_entry(ppb, &pp->bufs, l)
-		if (vmsplice(ppb->p[1], ppb->iov, ppb->nr_segs,
-					SPLICE_F_GIFT | SPLICE_F_NONBLOCK) !=
-				ppb->pages_in * PAGE_SIZE) {
+		if (vmsplice(ppb->p[1], ppb->iov, ppb->nr_segs, SPLICE_F_GIFT | SPLICE_F_NONBLOCK) !=
+		    ppb->pages_in * PAGE_SIZE) {
 			pr_perror("Can't get shmem into page-pipe");
 			return -1;
 		}
@@ -680,13 +673,12 @@ static int dump_pages(struct page_pipe *pp, struct page_xfer *xfer)
 	return page_xfer_dump_pages(xfer, pp);
 }
 
-static int next_data_segment(int fd, unsigned long pfn,
-			unsigned long *next_data_pfn, unsigned long *next_hole_pfn)
+static int next_data_segment(int fd, unsigned long pfn, unsigned long *next_data_pfn, unsigned long *next_hole_pfn)
 {
 	off_t off;
 
 	off = lseek(fd, pfn * PAGE_SIZE, SEEK_DATA);
-	if (off == (off_t) -1) {
+	if (off == (off_t)-1) {
 		if (errno == ENXIO) {
 			*next_data_pfn = ~0UL;
 			*next_hole_pfn = ~0UL;
@@ -698,7 +690,7 @@ static int next_data_segment(int fd, unsigned long pfn,
 	*next_data_pfn = off / PAGE_SIZE;
 
 	off = lseek(fd, off, SEEK_HOLE);
-	if (off == (off_t) -1) {
+	if (off == (off_t)-1) {
 		pr_perror("Unable to lseek(SEEK_HOLE)");
 		return -1;
 	}
@@ -733,8 +725,7 @@ static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si)
 		unsigned long pgaddr;
 		int st = -1;
 
-		if (pfn >= next_hole_pfn &&
-		    next_data_segment(fd, pfn, &next_data_pnf, &next_hole_pfn))
+		if (pfn >= next_hole_pfn && next_data_segment(fd, pfn, &next_data_pnf, &next_hole_pfn))
 			goto err_xfer;
 
 		if (si->pstate_map && is_shmem_tracking_en()) {
@@ -750,7 +741,7 @@ static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si)
 		}
 
 		pgaddr = (unsigned long)addr + pfn * PAGE_SIZE;
-again:
+	again:
 		if (pgstate == PST_ZERO)
 			ret = 0;
 		else if (xfer.parent && page_in_parent(pgstate == PST_DIRTY)) {
@@ -801,8 +792,7 @@ static int dump_one_shmem(struct shmem_info *si)
 
 	addr = mmap(NULL, si->size, PROT_READ, MAP_SHARED, fd, 0);
 	if (addr == MAP_FAILED) {
-		pr_err("Can't map shmem 0x%lx (0x%lx-0x%lx)\n",
-				si->shmid, si->start, si->end);
+		pr_err("Can't map shmem 0x%lx (0x%lx-0x%lx)\n", si->shmid, si->start, si->end);
 		goto errc;
 	}
 
@@ -856,8 +846,7 @@ int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shmid)
 		si = &det;
 	}
 
-	fd = open_proc(PROC_SELF, "map_files/%lx-%lx",
-			(unsigned long)addr, (unsigned long)addr + si->size);
+	fd = open_proc(PROC_SELF, "map_files/%lx-%lx", (unsigned long)addr, (unsigned long)addr + si->size);
 	if (fd < 0)
 		return -1;
 
@@ -871,7 +860,8 @@ int cr_dump_shmem(void)
 	int ret = 0, i;
 	struct shmem_info *si;
 
-	for_each_shmem(i, si) {
+	for_each_shmem(i, si)
+	{
 		if (si->pid == SYSVIPC_SHMEM_PID)
 			continue;
 		ret = dump_one_shmem(si);
diff --git a/criu/sigframe.c b/criu/sigframe.c
index b8798efc3..0f5d891b0 100644
--- a/criu/sigframe.c
+++ b/criu/sigframe.c
@@ -5,23 +5,21 @@
 #include "images/core.pb-c.h"
 
 #ifndef setup_sas
-static inline void setup_sas(struct rt_sigframe* sigframe, ThreadSasEntry *sas)
+static inline void setup_sas(struct rt_sigframe *sigframe, ThreadSasEntry *sas)
 {
 	if (sas) {
-#define UC	RT_SIGFRAME_UC(sigframe)
+#define UC RT_SIGFRAME_UC(sigframe)
 
-		UC->uc_stack.ss_sp	= (void *)decode_pointer((sas)->ss_sp);
-		UC->uc_stack.ss_flags	= (int)(sas)->ss_flags;
-		UC->uc_stack.ss_size	= (size_t)(sas)->ss_size;
+		UC->uc_stack.ss_sp = (void *)decode_pointer((sas)->ss_sp);
+		UC->uc_stack.ss_flags = (int)(sas)->ss_flags;
+		UC->uc_stack.ss_size = (size_t)(sas)->ss_size;
 #undef UC
 	}
 }
 #endif
 
-int construct_sigframe(struct rt_sigframe *sigframe,
-				     struct rt_sigframe *rsigframe,
-				     k_rtsigset_t *blkset,
-				     CoreEntry *core)
+int construct_sigframe(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe, k_rtsigset_t *blkset,
+		       CoreEntry *core)
 {
 	/*
 	 * Copy basic register set in the first place: this will set
diff --git a/criu/signalfd.c b/criu/signalfd.c
index 1bb87d08c..c71ad87c7 100644
--- a/criu/signalfd.c
+++ b/criu/signalfd.c
@@ -15,8 +15,8 @@
 #include "images/signalfd.pb-c.h"
 
 struct signalfd_info {
-	SignalfdEntry		*sfe;
-	struct file_desc	d;
+	SignalfdEntry *sfe;
+	struct file_desc d;
 };
 
 int is_signalfd_link(char *link)
@@ -44,8 +44,8 @@ static int dump_one_signalfd(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops signalfd_dump_ops = {
-	.type		= FD_TYPES__SIGNALFD,
-	.dump		= dump_one_signalfd,
+	.type = FD_TYPES__SIGNALFD,
+	.dump = dump_one_signalfd,
 };
 
 static void sigset_fill(sigset_t *to, unsigned long long from)
@@ -78,8 +78,7 @@ static int signalfd_open(struct file_desc *d, int *new_fd)
 	}
 
 	if (rst_file_params(tmp, info->sfe->fown, info->sfe->flags)) {
-		pr_perror("Can't restore params on signalfd %#08x",
-			  info->sfe->id);
+		pr_perror("Can't restore params on signalfd %#08x", info->sfe->id);
 		goto err_close;
 	}
 
diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index d90c53b17..e52b198c3 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -36,11 +36,11 @@
 
 #include "images/inventory.pb-c.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "inet: "
 
-#define PB_ALEN_INET	1
-#define PB_ALEN_INET6	4
+#define PB_ALEN_INET  1
+#define PB_ALEN_INET6 4
 
 static LIST_HEAD(inet_ports);
 
@@ -87,34 +87,28 @@ static void show_one_inet(const char *act, const struct inet_sk_desc *sk)
 {
 	char src_addr[INET_ADDR_LEN] = "<unknown>";
 
-	if (inet_ntop(sk->sd.family, (void *)sk->src_addr, src_addr,
-		      INET_ADDR_LEN) == NULL) {
+	if (inet_ntop(sk->sd.family, (void *)sk->src_addr, src_addr, INET_ADDR_LEN) == NULL) {
 		pr_perror("Failed to translate address");
 	}
 
 	pr_debug("\t%s: ino %#8x family %-10s type %-14s port %8d "
-		"state %-16s src_addr %s\n", act, sk->sd.ino,
-		___socket_family_name(sk->sd.family),
-		___socket_type_name(sk->type), sk->src_port,
-		___tcp_state_name(sk->state), src_addr);
+		 "state %-16s src_addr %s\n",
+		 act, sk->sd.ino, ___socket_family_name(sk->sd.family), ___socket_type_name(sk->type), sk->src_port,
+		 ___tcp_state_name(sk->state), src_addr);
 }
 
 static void show_one_inet_img(const char *act, const InetSkEntry *e)
 {
 	char src_addr[INET_ADDR_LEN] = "<unknown>";
 
-	if (inet_ntop(e->family, (void *)e->src_addr, src_addr,
-		      INET_ADDR_LEN) == NULL) {
+	if (inet_ntop(e->family, (void *)e->src_addr, src_addr, INET_ADDR_LEN) == NULL) {
 		pr_perror("Failed to translate address");
 	}
 
 	pr_debug("\t%s: family %-10s type %-14s proto %-16s port %d "
-		"state %-16s src_addr %s\n", act,
-		___socket_family_name(e->family),
-		___socket_type_name(e->type),
-		___socket_proto_name(e->proto),
-		e->src_port, ___tcp_state_name(e->state),
-		src_addr);
+		 "state %-16s src_addr %s\n",
+		 act, ___socket_family_name(e->family), ___socket_type_name(e->type), ___socket_proto_name(e->proto),
+		 e->src_port, ___tcp_state_name(e->state), src_addr);
 }
 
 static int can_dump_ipproto(unsigned int ino, int proto, int type)
@@ -145,26 +139,23 @@ static int can_dump_inet_sk(const struct inet_sk_desc *sk)
 	if (sk->type == SOCK_DGRAM) {
 		if (sk->wqlen != 0) {
 			if (sk->cork) {
-				pr_err("Can't dump corked dgram socket %x\n",
-					sk->sd.ino);
+				pr_err("Can't dump corked dgram socket %x\n", sk->sd.ino);
 				return 0;
 			} else {
-				pr_warn("Write queue of the %x socket isn't empty\n",
-					sk->sd.ino);
+				pr_warn("Write queue of the %x socket isn't empty\n", sk->sd.ino);
 			}
 		}
 
 		if (sk->rqlen)
-			pr_warn("Read queue is dropped for socket %x\n",
-					sk->sd.ino);
+			pr_warn("Read queue is dropped for socket %x\n", sk->sd.ino);
 
 		return 1;
 	}
 
 	if (sk->type != SOCK_STREAM && sk->type != SOCK_RAW) {
 		pr_err("Can't dump %d inet socket %x. "
-				"Only stream, dgram and raw are supported.\n",
-				sk->type, sk->sd.ino);
+		       "Only stream, dgram and raw are supported.\n",
+		       sk->type, sk->sd.ino);
 		return 0;
 	}
 
@@ -172,8 +163,7 @@ static int can_dump_inet_sk(const struct inet_sk_desc *sk)
 	case TCP_LISTEN:
 		if (sk->rqlen != 0) {
 			if (opts.tcp_skip_in_flight) {
-				pr_info("Skipping in-flight connection (l) for %x\n",
-						sk->sd.ino);
+				pr_info("Skipping in-flight connection (l) for %x\n", sk->sd.ino);
 				break;
 			}
 			/*
@@ -181,10 +171,10 @@ static int can_dump_inet_sk(const struct inet_sk_desc *sk)
 			 * requests for listen sockets. Need to pick
 			 * those up and fix the connect job respectively
 			 */
-			pr_err("In-flight connection (l) for %x\n",
-					sk->sd.ino);
+			pr_err("In-flight connection (l) for %x\n", sk->sd.ino);
 			pr_err("In-flight connections can be ignored with the "
-					"--%s option.\n", SK_INFLIGHT_PARAM);
+			       "--%s option.\n",
+			       SK_INFLIGHT_PARAM);
 			return 0;
 		}
 		break;
@@ -196,8 +186,7 @@ static int can_dump_inet_sk(const struct inet_sk_desc *sk)
 	case TCP_CLOSING:
 	case TCP_SYN_SENT:
 		if (!opts.tcp_established_ok && !opts.tcp_close) {
-			pr_err("Connected TCP socket, consider using --%s option.\n",
-					SK_EST_PARAM);
+			pr_err("Connected TCP socket, consider using --%s option.\n", SK_EST_PARAM);
 			return 0;
 		}
 		break;
@@ -218,7 +207,8 @@ static int dump_sockaddr(union libsoccr_addr *sa, u32 *pb_port, u32 *pb_addr)
 		memcpy(pb_addr, &sa->v4.sin_addr, sizeof(sa->v4.sin_addr));
 		*pb_port = ntohs(sa->v4.sin_port);
 		return 0;
-	} if (sa->sa.sa_family == AF_INET6) {
+	}
+	if (sa->sa.sa_family == AF_INET6) {
 		*pb_port = ntohs(sa->v6.sin6_port);
 		memcpy(pb_addr, &sa->v6.sin6_addr, sizeof(sa->v6.sin6_addr));
 		return 0;
@@ -232,7 +222,7 @@ static int dump_sockaddr(union libsoccr_addr *sa, u32 *pb_port, u32 *pb_addr)
  */
 static int dump_tcp_uncon_shutdown(int lfd, struct inet_sk_desc *sk)
 {
-	struct pollfd pfd = {.fd = lfd, .events = POLLRDHUP | POLLHUP};
+	struct pollfd pfd = { .fd = lfd, .events = POLLRDHUP | POLLHUP };
 
 	if (poll(&pfd, 1, 0) != 1) {
 		pr_perror("Unable to poll the socket");
@@ -250,9 +240,7 @@ static int dump_tcp_uncon_shutdown(int lfd, struct inet_sk_desc *sk)
 	return 0;
 }
 
-
-static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p,
-					 int proto, int family, int type)
+static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p, int proto, int family, int type)
 {
 	struct inet_sk_desc *sk;
 	union libsoccr_addr address;
@@ -304,12 +292,12 @@ static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p,
 
 	if (type != SOCK_RAW && proto == IPPROTO_TCP) {
 		struct {
-			__u8    tcpi_state;
-			__u8    tcpi_ca_state;
-			__u8    tcpi_retransmits;
-			__u8    tcpi_probes;
-			__u8    tcpi_backoff;
-			__u8    tcpi_options;
+			__u8 tcpi_state;
+			__u8 tcpi_ca_state;
+			__u8 tcpi_retransmits;
+			__u8 tcpi_probes;
+			__u8 tcpi_backoff;
+			__u8 tcpi_options;
 		} info;
 
 		aux = sizeof(info);
@@ -320,8 +308,7 @@ static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p,
 		}
 
 		if (info.tcpi_state != TCP_CLOSE) {
-			pr_err("Socket state %d obtained but expected %d\n",
-			       info.tcpi_state, TCP_CLOSE);
+			pr_err("Socket state %d obtained but expected %d\n", info.tcpi_state, TCP_CLOSE);
 			goto err;
 		}
 
@@ -345,14 +332,11 @@ static int ip_raw_opts_alloc(int family, int proto, IpOptsRawEntry *r)
 {
 	if (proto == IPPROTO_ICMP || proto == IPPROTO_ICMPV6) {
 		if (family == AF_INET6)
-			r->n_icmpv_filter = NELEMS_AS_ARRAY(struct icmp6_filter,
-							    r->icmpv_filter);
+			r->n_icmpv_filter = NELEMS_AS_ARRAY(struct icmp6_filter, r->icmpv_filter);
 		else
-			r->n_icmpv_filter = NELEMS_AS_ARRAY(struct icmp_filter,
-							    r->icmpv_filter);
+			r->n_icmpv_filter = NELEMS_AS_ARRAY(struct icmp_filter, r->icmpv_filter);
 		r->icmpv_filter = xmalloc(pb_repeated_size(r, icmpv_filter));
-		pr_debug("r->n_icmpv_filter %d size %d\n",
-			 (int)r->n_icmpv_filter,
+		pr_debug("r->n_icmpv_filter %d size %d\n", (int)r->n_icmpv_filter,
 			 (int)pb_repeated_size(r, icmpv_filter));
 		if (!r->icmpv_filter)
 			return -ENOMEM;
@@ -384,8 +368,7 @@ static int dump_ip_raw_opts(int sk, int family, int proto, IpOptsRawEntry *r)
 		ret |= dump_opt(sk, SOL_IPV6, IPV6_HDRINCL, &r->hdrincl);
 
 		if (proto == IPPROTO_ICMPV6)
-			ret |= do_dump_opt(sk, SOL_ICMPV6, ICMPV6_FILTER,
-					   r->icmpv_filter,
+			ret |= do_dump_opt(sk, SOL_ICMPV6, ICMPV6_FILTER, r->icmpv_filter,
 					   pb_repeated_size(r, icmpv_filter));
 		else
 			ip_raw_opts_free(r);
@@ -395,8 +378,7 @@ static int dump_ip_raw_opts(int sk, int family, int proto, IpOptsRawEntry *r)
 		r->has_nodefrag = !!r->nodefrag;
 
 		if (proto == IPPROTO_ICMP)
-			ret |= do_dump_opt(sk, SOL_RAW, ICMP_FILTER,
-					   r->icmpv_filter,
+			ret |= do_dump_opt(sk, SOL_RAW, ICMP_FILTER, r->icmpv_filter,
 					   pb_repeated_size(r, icmpv_filter));
 		else
 			ip_raw_opts_free(r);
@@ -429,12 +411,12 @@ static int dump_ip_opts(int sk, int family, int type, int proto, IpOptsEntry *io
  * link local and (multicast + loopback + linklocal) addrs require a
  * scope id.
  */
-#define IPV6_ADDR_SCOPE_NODELOCAL       0x01
-#define IPV6_ADDR_SCOPE_LINKLOCAL       0x02
+#define IPV6_ADDR_SCOPE_NODELOCAL 0x01
+#define IPV6_ADDR_SCOPE_LINKLOCAL 0x02
 static bool needs_scope_id(uint32_t *src_addr)
 {
 	if ((src_addr[0] & htonl(0xFF00000)) == htonl(0xFF000000)) {
-		if (src_addr[1] & (IPV6_ADDR_SCOPE_LINKLOCAL|IPV6_ADDR_SCOPE_NODELOCAL))
+		if (src_addr[1] & (IPV6_ADDR_SCOPE_LINKLOCAL | IPV6_ADDR_SCOPE_NODELOCAL))
 			return true;
 	}
 
@@ -454,8 +436,7 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 	SkOptsEntry skopts = SK_OPTS_ENTRY__INIT;
 	int ret = -1, err = -1, proto, aux, type;
 
-	ret = do_dump_opt(lfd, SOL_SOCKET, SO_PROTOCOL,
-					&proto, sizeof(proto));
+	ret = do_dump_opt(lfd, SOL_SOCKET, SO_PROTOCOL, &proto, sizeof(proto));
 	if (ret)
 		goto err;
 
@@ -502,24 +483,24 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 
 	BUG_ON(sk->sd.already_dumped);
 
-	ie.id		= id;
-	ie.ino		= sk->sd.ino;
+	ie.id = id;
+	ie.ino = sk->sd.ino;
 	if (sk->sd.sk_ns) {
-		ie.ns_id	= sk->sd.sk_ns->id;
-		ie.has_ns_id	= true;
+		ie.ns_id = sk->sd.sk_ns->id;
+		ie.has_ns_id = true;
 	}
-	ie.family	= family;
-	ie.proto	= proto;
-	ie.type		= sk->type;
-	ie.src_port	= sk->src_port;
-	ie.dst_port	= sk->dst_port;
-	ie.backlog	= sk->wqlen;
-	ie.flags	= p->flags;
+	ie.family = family;
+	ie.proto = proto;
+	ie.type = sk->type;
+	ie.src_port = sk->src_port;
+	ie.dst_port = sk->dst_port;
+	ie.backlog = sk->wqlen;
+	ie.flags = p->flags;
 
-	ie.fown		= (FownEntry *)&p->fown;
-	ie.opts		= &skopts;
-	ie.ip_opts	= &ipopts;
-	ie.ip_opts->raw	= &ipopts_raw;
+	ie.fown = (FownEntry *)&p->fown;
+	ie.opts = &skopts;
+	ie.ip_opts = &ipopts;
+	ie.ip_opts->raw = &ipopts_raw;
 
 	ie.n_src_addr = PB_ALEN_INET;
 	ie.n_dst_addr = PB_ALEN_INET;
@@ -620,8 +601,8 @@ static int dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops inet_dump_ops = {
-	.type		= FD_TYPES__INETSK,
-	.dump		= dump_one_inet_fd,
+	.type = FD_TYPES__INETSK,
+	.dump = dump_one_inet_fd,
 };
 
 static int dump_one_inet6_fd(int lfd, u32 id, const struct fd_parms *p)
@@ -630,15 +611,15 @@ static int dump_one_inet6_fd(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops inet6_dump_ops = {
-	.type		= FD_TYPES__INETSK,
-	.dump		= dump_one_inet6_fd,
+	.type = FD_TYPES__INETSK,
+	.dump = dump_one_inet6_fd,
 };
 
 int inet_collect_one(struct nlmsghdr *h, int family, int type, struct ns_id *ns)
 {
 	struct inet_sk_desc *d;
 	struct inet_diag_msg *m = NLMSG_DATA(h);
-	struct nlattr *tb[INET_DIAG_MAX+1];
+	struct nlattr *tb[INET_DIAG_MAX + 1];
 	int ret;
 
 	nlmsg_parse(h, sizeof(struct inet_diag_msg), tb, INET_DIAG_MAX, NULL);
@@ -711,19 +692,15 @@ struct collect_image_info inet_sk_cinfo = {
 static int inet_validate_address(InetSkEntry *ie)
 {
 	if ((ie->family == AF_INET) &&
-			/* v0.1 had 4 in ipv4 addr len */
-			(ie->n_src_addr >= PB_ALEN_INET) &&
-			(ie->n_dst_addr >= PB_ALEN_INET))
+	    /* v0.1 had 4 in ipv4 addr len */
+	    (ie->n_src_addr >= PB_ALEN_INET) && (ie->n_dst_addr >= PB_ALEN_INET))
 		return 0;
 
-	if ((ie->family == AF_INET6) &&
-			(ie->n_src_addr == PB_ALEN_INET6) &&
-			(ie->n_dst_addr == PB_ALEN_INET6))
+	if ((ie->family == AF_INET6) && (ie->n_src_addr == PB_ALEN_INET6) && (ie->n_dst_addr == PB_ALEN_INET6))
 		return 0;
 
-	pr_err("Addr len mismatch f %d ss %zu ds %zu\n", ie->family,
-			pb_repeated_size(ie, src_addr),
-			pb_repeated_size(ie, dst_addr));
+	pr_err("Addr len mismatch f %d ss %zu ds %zu\n", ie->family, pb_repeated_size(ie, src_addr),
+	       pb_repeated_size(ie, dst_addr));
 
 	return -1;
 }
@@ -792,8 +769,8 @@ static int restore_ip_raw_opts(int sk, int family, int proto, IpOptsRawEntry *r)
 	if (r->icmpv_filter) {
 		if (proto == IPPROTO_ICMP || proto == IPPROTO_ICMPV6) {
 			ret |= do_restore_opt(sk, family == AF_INET6 ? SOL_ICMPV6 : SOL_RAW,
-					      family == AF_INET6 ? ICMPV6_FILTER : ICMP_FILTER,
-					      r->icmpv_filter, pb_repeated_size(r, icmpv_filter));
+					      family == AF_INET6 ? ICMPV6_FILTER : ICMP_FILTER, r->icmpv_filter,
+					      pb_repeated_size(r, icmpv_filter));
 		}
 	}
 
@@ -801,8 +778,7 @@ static int restore_ip_raw_opts(int sk, int family, int proto, IpOptsRawEntry *r)
 		ret |= restore_opt(sk, SOL_IP, IP_NODEFRAG, &r->nodefrag);
 	if (r->has_hdrincl)
 		ret |= restore_opt(sk, family == AF_INET6 ? SOL_IPV6 : SOL_IP,
-				   family == AF_INET6 ? IPV6_HDRINCL : IP_HDRINCL,
-				   &r->hdrincl);
+				   family == AF_INET6 ? IPV6_HDRINCL : IP_HDRINCL, &r->hdrincl);
 
 	return ret;
 }
@@ -916,8 +892,7 @@ static int open_inet_sk(struct file_desc *d, int *new_fd)
 		mutex_unlock(&ii->port->reuseaddr_lock);
 	}
 
-	if (ie->dst_port &&
-			inet_connect(sk, ii))
+	if (ie->dst_port && inet_connect(sk, ii))
 		goto err;
 done:
 	dec_users_and_wake(ii->port);
@@ -932,16 +907,15 @@ done:
 		goto err;
 
 	if (ie->has_shutdown &&
-	    (ie->proto == IPPROTO_UDP ||
-	     ie->proto == IPPROTO_UDPLITE || ie->proto == IPPROTO_TCP)) {
+	    (ie->proto == IPPROTO_UDP || ie->proto == IPPROTO_UDPLITE || ie->proto == IPPROTO_TCP)) {
 		if (shutdown(sk, sk_decode_shutdown(ie->shutdown))) {
 			if (ie->state != TCP_CLOSE && errno != ENOTCONN) {
-				pr_perror("Can't shutdown socket into %d",
-					  sk_decode_shutdown(ie->shutdown));
+				pr_perror("Can't shutdown socket into %d", sk_decode_shutdown(ie->shutdown));
 				goto err;
 			} else {
 				pr_debug("Called shutdown on closed socket, "
-					 "proto %d ino %x", ie->proto, ie->ino);
+					 "proto %d ino %x",
+					 ie->proto, ie->ino);
 			}
 		}
 	}
@@ -954,8 +928,7 @@ err:
 	return -1;
 }
 
-int restore_sockaddr(union libsoccr_addr *sa,
-		int family, u32 pb_port, u32 *pb_addr, u32 ifindex)
+int restore_sockaddr(union libsoccr_addr *sa, int family, u32 pb_port, u32 *pb_addr, u32 ifindex)
 {
 	BUILD_BUG_ON(sizeof(sa->v4.sin_addr.s_addr) > PB_ALEN_INET * sizeof(u32));
 	BUILD_BUG_ON(sizeof(sa->v6.sin6_addr.s6_addr) > PB_ALEN_INET6 * sizeof(u32));
@@ -1000,8 +973,7 @@ int inet_bind(int sk, struct inet_sk_info *ii)
 		}
 	}
 
-	addr_size = restore_sockaddr(&addr, ii->ie->family,
-			ii->ie->src_port, ii->ie->src_addr, ifindex);
+	addr_size = restore_sockaddr(&addr, ii->ie->family, ii->ie->src_port, ii->ie->src_addr, ifindex);
 
 	/*
 	 * ipv6 addresses go through a “tentative” phase and
@@ -1048,8 +1020,7 @@ int inet_connect(int sk, struct inet_sk_info *ii)
 	union libsoccr_addr addr;
 	int addr_size;
 
-	addr_size = restore_sockaddr(&addr, ii->ie->family,
-			ii->ie->dst_port, ii->ie->dst_addr, 0);
+	addr_size = restore_sockaddr(&addr, ii->ie->family, ii->ie->dst_port, ii->ie->dst_addr, 0);
 
 	if (connect(sk, (struct sockaddr *)&addr, addr_size) == -1) {
 		pr_perror("Can't connect inet socket back");
diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index 3b86a7d7b..754eed932 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -14,23 +14,23 @@
 #include "libnetlink.h"
 #include "namespaces.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "netlink: "
 
 struct netlink_sk_desc {
-	struct socket_desc	sd;
-	u32			portid;
-	u32			*groups;
-	u32			gsize;
-	u32			dst_portid;
-	u32			dst_group;
-	u8			state;
-	u8			protocol;
+	struct socket_desc sd;
+	u32 portid;
+	u32 *groups;
+	u32 gsize;
+	u32 dst_portid;
+	u32 dst_group;
+	u8 state;
+	u8 protocol;
 };
 
 int netlink_receive_one(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 {
-	struct nlattr *tb[NETLINK_DIAG_MAX+1];
+	struct nlattr *tb[NETLINK_DIAG_MAX + 1];
 	struct netlink_diag_msg *m;
 	struct netlink_sk_desc *sd;
 	unsigned long *groups;
@@ -105,7 +105,6 @@ static int dump_one_netlink_fd(int lfd, u32 id, const struct fd_parms *p)
 		ne.portid = sk->portid;
 		ne.groups = sk->groups;
 
-
 		ne.n_groups = sk->gsize / sizeof(ne.groups[0]);
 		/*
 		 * On 64-bit sk->gsize is multiple to 8 bytes (sizeof(long)),
@@ -164,7 +163,7 @@ static int dump_one_netlink_fd(int lfd, u32 id, const struct fd_parms *p)
 	}
 
 	ne.fown = (FownEntry *)&p->fown;
-	ne.opts	= &skopts;
+	ne.opts = &skopts;
 
 	if (dump_socket_opts(lfd, &skopts))
 		goto err;
@@ -182,8 +181,8 @@ err:
 }
 
 const struct fdtype_ops netlink_dump_ops = {
-	.type		= FD_TYPES__NETLINKSK,
-	.dump		= dump_one_netlink_fd,
+	.type = FD_TYPES__NETLINKSK,
+	.dump = dump_one_netlink_fd,
 };
 
 struct netlink_sock_info {
diff --git a/criu/sk-packet.c b/criu/sk-packet.c
index 0abe84071..1d2e23522 100644
--- a/criu/sk-packet.c
+++ b/criu/sk-packet.c
@@ -22,7 +22,7 @@
 #include "images/fdinfo.pb-c.h"
 #include "namespaces.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "packet: "
 
 struct packet_sock_info {
@@ -31,10 +31,10 @@ struct packet_sock_info {
 };
 
 struct packet_mreq_max {
-	int		mr_ifindex;
-	unsigned short	mr_type;
-	unsigned short	mr_alen;
-	unsigned char	mr_address[MAX_ADDR_LEN];
+	int mr_ifindex;
+	unsigned short mr_type;
+	unsigned short mr_alen;
+	unsigned char mr_address[MAX_ADDR_LEN];
 };
 
 struct packet_sock_desc {
@@ -49,7 +49,7 @@ struct packet_sock_desc {
 	struct packet_diag_ring *rx, *tx;
 };
 
-#define NO_FANOUT	((unsigned int)-1)
+#define NO_FANOUT ((unsigned int)-1)
 
 static int dump_mreqs(PacketSockEntry *psk, struct packet_sock_desc *sd)
 {
@@ -72,8 +72,7 @@ static int dump_mreqs(PacketSockEntry *psk, struct packet_sock_desc *sd)
 			goto err;
 		}
 
-		pr_debug("\tmr%d: idx %d type %d\n", i,
-				m->pdmc_index, m->pdmc_type);
+		pr_debug("\tmr%d: idx %d type %d\n", i, m->pdmc_index, m->pdmc_type);
 
 		im = xmalloc(sizeof(*im));
 		if (!im)
@@ -87,21 +86,21 @@ static int dump_mreqs(PacketSockEntry *psk, struct packet_sock_desc *sd)
 		im->type = m->pdmc_type;
 
 		switch (m->pdmc_type) {
-			case PACKET_MR_MULTICAST:
-			case PACKET_MR_UNICAST:
-				im->addr.len = m->pdmc_alen;
-				im->addr.data = xmalloc(m->pdmc_alen);
-				if (!im->addr.data)
-					goto err;
-
-				memcpy(im->addr.data, m->pdmc_addr, m->pdmc_alen);
-				break;
-			case PACKET_MR_PROMISC:
-			case PACKET_MR_ALLMULTI:
-				break;
-			default:
-				pr_err("Unknown mc membership type %d\n", m->pdmc_type);
+		case PACKET_MR_MULTICAST:
+		case PACKET_MR_UNICAST:
+			im->addr.len = m->pdmc_alen;
+			im->addr.data = xmalloc(m->pdmc_alen);
+			if (!im->addr.data)
 				goto err;
+
+			memcpy(im->addr.data, m->pdmc_addr, m->pdmc_alen);
+			break;
+		case PACKET_MR_PROMISC:
+		case PACKET_MR_ALLMULTI:
+			break;
+		default:
+			pr_err("Unknown mc membership type %d\n", m->pdmc_type);
+			goto err;
 		}
 	}
 
@@ -158,7 +157,7 @@ static int dump_one_packet_fd(int lfd, u32 id, const struct fd_parms *p)
 
 	sd = (struct packet_sock_desc *)lookup_socket(p->stat.st_ino, PF_PACKET, 0);
 	if (IS_ERR_OR_NULL(sd)) {
-		pr_err("Can't find packet socket %"PRIu64"\n", p->stat.st_ino);
+		pr_err("Can't find packet socket %" PRIu64 "\n", p->stat.st_ino);
 		return -1;
 	}
 
@@ -217,8 +216,8 @@ out:
 }
 
 const struct fdtype_ops packet_dump_ops = {
-	.type		= FD_TYPES__PACKETSK,
-	.dump		= dump_one_packet_fd,
+	.type = FD_TYPES__PACKETSK,
+	.dump = dump_one_packet_fd,
 };
 
 int dump_socket_map(struct vma_area *vma)
@@ -236,7 +235,7 @@ int dump_socket_map(struct vma_area *vma)
 		return -1;
 	}
 
-	pr_info("Dumping socket map %x -> %"PRIx64"\n", sd->file_id, vma->e->start);
+	pr_info("Dumping socket map %x -> %" PRIx64 "\n", sd->file_id, vma->e->start);
 	vma->e->shmid = sd->file_id;
 	return 0;
 }
@@ -260,8 +259,7 @@ int packet_receive_one(struct nlmsghdr *hdr, struct ns_id *ns, void *arg)
 	struct packet_sock_desc *sd;
 
 	m = NLMSG_DATA(hdr);
-	nlmsg_parse(hdr, sizeof(struct packet_diag_msg),
-			tb, PACKET_DIAG_MAX, NULL);
+	nlmsg_parse(hdr, sizeof(struct packet_diag_msg), tb, PACKET_DIAG_MAX, NULL);
 	pr_info("Collect packet sock %u %u\n", m->pdiag_ino, (unsigned int)m->pdiag_num);
 
 	if (!tb[PACKET_DIAG_INFO]) {
@@ -321,8 +319,7 @@ static int open_socket_map(int pid, struct vma_area *vm)
 	struct file_desc *fd;
 	struct fdinfo_list_entry *le;
 
-	pr_info("Getting packet socket fd for %d:%x\n",
-			pid, (int)vma->shmid);
+	pr_info("Getting packet socket fd for %d:%x\n", pid, (int)vma->shmid);
 	fd = find_file_desc_raw(FD_TYPES__PACKETSK, vma->shmid);
 	if (!fd) {
 		pr_err("No packet socket %x\n", (int)vma->shmid);
diff --git a/criu/sk-queue.c b/criu/sk-queue.c
index 776eb5aaf..dbd9d1d8b 100644
--- a/criu/sk-queue.c
+++ b/criu/sk-queue.c
@@ -23,15 +23,15 @@
 #include "protobuf.h"
 #include "images/sk-packet.pb-c.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "skqueue: "
 
 struct sk_packet {
-	struct list_head	list;
-	SkPacketEntry		*entry;
-	char			*data;
-	unsigned		scm_len;
-	int			*scm;
+	struct list_head list;
+	SkPacketEntry *entry;
+	char *data;
+	unsigned scm_len;
+	int *scm;
 };
 
 static LIST_HEAD(packets_list);
@@ -43,7 +43,7 @@ static int collect_one_packet(void *obj, ProtobufCMessage *msg, struct cr_img *i
 	pkt->entry = pb_msg(msg, SkPacketEntry);
 	pkt->scm = NULL;
 	pkt->data = xmalloc(pkt->entry->length);
-	if (pkt->data ==NULL)
+	if (pkt->data == NULL)
 		return -1;
 
 	/*
@@ -105,7 +105,7 @@ static int dump_scm_rights(struct cmsghdr *ch, SkPacketEntry *pe)
 	}
 
 	i = pe->n_scm++;
-	if (xrealloc_safe(&pe->scm, pe->n_scm * sizeof(ScmEntry*)))
+	if (xrealloc_safe(&pe->scm, pe->n_scm * sizeof(ScmEntry *)))
 		return -1;
 
 	pe->scm[i] = scme;
@@ -116,7 +116,7 @@ static int dump_scm_rights(struct cmsghdr *ch, SkPacketEntry *pe)
  * Maximum size of the control messages. XXX -- is there any
  * way to get this value out of the kernel?
  * */
-#define CMSG_MAX_SIZE	1024
+#define CMSG_MAX_SIZE 1024
 
 static int dump_packet_cmsg(struct msghdr *mh, SkPacketEntry *pe)
 {
@@ -212,14 +212,14 @@ int dump_sk_queue(int sock_fd, int sock_id)
 	while (1) {
 		char cmsg[CMSG_MAX_SIZE];
 		struct iovec iov = {
-			.iov_base	= data,
-			.iov_len	= size,
+			.iov_base = data,
+			.iov_len = size,
 		};
 		struct msghdr msg = {
-			.msg_iov	= &iov,
-			.msg_iovlen	= 1,
-			.msg_control	= &cmsg,
-			.msg_controllen	= sizeof(cmsg),
+			.msg_iov = &iov,
+			.msg_iovlen = 1,
+			.msg_control = &cmsg,
+			.msg_controllen = sizeof(cmsg),
 		};
 
 		ret = pe.length = recvmsg(sock_fd, &msg, MSG_DONTWAIT | MSG_PEEK);
@@ -312,8 +312,7 @@ static int send_one_pkt(int fd, struct sk_packet *pkt)
 		return -1;
 	}
 	if (ret != entry->length) {
-		pr_err("Restored skb trimmed to %d/%d\n",
-				ret, (unsigned int)entry->length);
+		pr_err("Restored skb trimmed to %d/%d\n", ret, (unsigned int)entry->length);
 		return -1;
 	}
 
@@ -336,8 +335,7 @@ int restore_sk_queue(int fd, unsigned int peer_id)
 		if (entry->id_for != peer_id)
 			continue;
 
-		pr_info("\tRestoring %d-bytes skb for %u\n",
-			(unsigned int)entry->length, peer_id);
+		pr_info("\tRestoring %d-bytes skb for %u\n", (unsigned int)entry->length, peer_id);
 
 		ret = send_one_pkt(fd, pkt);
 		if (ret)
@@ -379,8 +377,7 @@ int prepare_scms(void)
 			ch->cmsg_type = SCM_RIGHTS;
 			ch->cmsg_len = CMSG_LEN(se->n_rights * sizeof(int));
 
-			if (unix_note_scm_rights(pe->id_for, se->rights,
-						(int *)CMSG_DATA(ch), se->n_rights))
+			if (unix_note_scm_rights(pe->id_for, se->rights, (int *)CMSG_DATA(ch), se->n_rights))
 				return -1;
 
 			continue;
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 0409e22c3..8e78fca8c 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -27,7 +27,7 @@
 #include "protobuf.h"
 #include "images/tcp-stream.pb-c.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "tcp: "
 
 static LIST_HEAD(cpt_tcp_repair_sockets);
@@ -120,8 +120,7 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 		goto err_r;
 	}
 	if (ret != sizeof(data)) {
-		pr_err("This libsocr is not supported (%d vs %d)\n",
-				ret, (int)sizeof(data));
+		pr_err("This libsocr is not supported (%d vs %d)\n", ret, (int)sizeof(data));
 		goto err_r;
 	}
 
@@ -147,16 +146,16 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 	}
 
 	if (data.flags & SOCCR_FLAGS_WINDOW) {
-		tse.has_snd_wl1		= true;
-		tse.has_snd_wnd		= true;
-		tse.has_max_window	= true;
-		tse.has_rcv_wnd		= true;
-		tse.has_rcv_wup		= true;
-		tse.snd_wl1		= data.snd_wl1;
-		tse.snd_wnd		= data.snd_wnd;
-		tse.max_window		= data.max_window;
-		tse.rcv_wnd		= data.rcv_wnd;
-		tse.rcv_wup		= data.rcv_wup;
+		tse.has_snd_wl1 = true;
+		tse.has_snd_wnd = true;
+		tse.has_max_window = true;
+		tse.has_rcv_wnd = true;
+		tse.has_rcv_wup = true;
+		tse.snd_wl1 = data.snd_wl1;
+		tse.snd_wnd = data.snd_wnd;
+		tse.max_window = data.max_window;
+		tse.rcv_wnd = data.rcv_wnd;
+		tse.rcv_wup = data.rcv_wup;
 	}
 
 	/*
@@ -260,8 +259,7 @@ int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)
 	return 0;
 }
 
-static int read_tcp_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data,
-		int queue, u32 len, struct cr_img *img)
+static int read_tcp_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, int queue, u32 len, struct cr_img *img)
 {
 	char *buf;
 
@@ -351,13 +349,9 @@ static int restore_tcp_conn_state(int sk, struct libsoccr_sk *socr, struct inet_
 		data.rcv_wup = tse->rcv_wup;
 	}
 
-	if (restore_sockaddr(&sa_src,
-				ii->ie->family, ii->ie->src_port,
-				ii->ie->src_addr, 0) < 0)
+	if (restore_sockaddr(&sa_src, ii->ie->family, ii->ie->src_port, ii->ie->src_addr, 0) < 0)
 		goto err_c;
-	if (restore_sockaddr(&sa_dst,
-				ii->ie->family, ii->ie->dst_port,
-				ii->ie->dst_addr, 0) < 0)
+	if (restore_sockaddr(&sa_dst, ii->ie->family, ii->ie->dst_port, ii->ie->dst_addr, 0) < 0)
 		goto err_c;
 
 	libsoccr_set_addr(socr, 1, &sa_src, 0);
@@ -403,7 +397,7 @@ int prepare_tcp_socks(struct task_restore_args *ta)
 {
 	struct inet_sk_info *ii;
 
-	ta->tcp_socks = (struct rst_tcp_sock *) rst_mem_align_cpos(RM_PRIVATE);
+	ta->tcp_socks = (struct rst_tcp_sock *)rst_mem_align_cpos(RM_PRIVATE);
 	ta->tcp_socks_n = 0;
 
 	list_for_each_entry(ii, &rst_tcp_repair_sockets, rlist) {
@@ -434,11 +428,9 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii)
 
 	pr_info("Restoring TCP connection\n");
 
-	if (opts.tcp_close &&
-	    ii->ie->state != TCP_LISTEN && ii->ie->state != TCP_CLOSE) {
+	if (opts.tcp_close && ii->ie->state != TCP_LISTEN && ii->ie->state != TCP_CLOSE) {
 		if (shutdown(fd, SHUT_RDWR) && errno != ENOTCONN) {
-			pr_perror("Unable to shutdown the socket id %x ino %x",
-				  ii->ie->id, ii->ie->ino);
+			pr_perror("Unable to shutdown the socket id %x ino %x", ii->ie->id, ii->ie->ino);
 		}
 		return 0;
 	}
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index d62cebc46..e6ce3d696 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -38,7 +38,7 @@
 #include "protobuf.h"
 #include "images/sk-unix.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "unix: "
 
 /*
@@ -54,42 +54,42 @@
  * as "external" and require the --ext-unix-sk option.
  */
 
-#define USK_EXTERN	(1 << 0)
-#define USK_SERVICE	(1 << 1)
-#define USK_CALLBACK	(1 << 2)
-#define USK_INHERIT	(1 << 3)
+#define USK_EXTERN   (1 << 0)
+#define USK_SERVICE  (1 << 1)
+#define USK_CALLBACK (1 << 2)
+#define USK_INHERIT  (1 << 3)
 
-#define FAKE_INO	0
+#define FAKE_INO 0
 
 struct unix_sk_desc {
-	struct socket_desc	sd;
-	unsigned int		type;
-	unsigned int		state;
-	unsigned int		peer_ino;
-	unsigned int		rqlen;
-	unsigned int		wqlen;
-	unsigned int		namelen;
-	char			*name;
-	unsigned int		nr_icons;
-	unsigned int		*icons;
+	struct socket_desc sd;
+	unsigned int type;
+	unsigned int state;
+	unsigned int peer_ino;
+	unsigned int rqlen;
+	unsigned int wqlen;
+	unsigned int namelen;
+	char *name;
+	unsigned int nr_icons;
+	unsigned int *icons;
 
-	unsigned int		vfs_dev;
-	unsigned int		vfs_ino;
+	unsigned int vfs_dev;
+	unsigned int vfs_ino;
 
-	unsigned char		shutdown;
-	bool			deleted;
+	unsigned char shutdown;
+	bool deleted;
 
-	mode_t			mode;
-	uid_t			uid;
-	gid_t			gid;
+	mode_t mode;
+	uid_t uid;
+	gid_t gid;
 
-	struct list_head	list;
+	struct list_head list;
 
-	int			fd;
-	struct list_head	peer_list;
-	struct list_head	peer_node;
+	int fd;
+	struct list_head peer_list;
+	struct list_head peer_node;
 
-	UnixSkEntry		*ue;
+	UnixSkEntry *ue;
 };
 
 /*
@@ -101,19 +101,18 @@ static mutex_t *mutex_ghost;
 static LIST_HEAD(unix_sockets);
 static LIST_HEAD(unix_ghost_addr);
 
-static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d,
-			     UnixSkEntry *ue, const struct fd_parms *p);
+static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d, UnixSkEntry *ue, const struct fd_parms *p);
 
 struct unix_sk_info;
 static int unlink_sk(struct unix_sk_info *ui);
 
 struct unix_sk_listen_icon {
-	unsigned int			peer_ino;
-	struct unix_sk_desc		*sk_desc;
-	struct unix_sk_listen_icon	*next;
+	unsigned int peer_ino;
+	struct unix_sk_desc *sk_desc;
+	struct unix_sk_listen_icon *next;
 };
 
-#define SK_HASH_SIZE		32
+#define SK_HASH_SIZE 32
 
 static struct unix_sk_listen_icon *unix_listen_icons[SK_HASH_SIZE];
 
@@ -121,8 +120,7 @@ static struct unix_sk_listen_icon *lookup_unix_listen_icons(unsigned int peer_in
 {
 	struct unix_sk_listen_icon *ic;
 
-	for (ic = unix_listen_icons[peer_ino % SK_HASH_SIZE];
-			ic; ic = ic->next)
+	for (ic = unix_listen_icons[peer_ino % SK_HASH_SIZE]; ic; ic = ic->next)
 		if (ic->peer_ino == peer_ino)
 			return ic;
 	return NULL;
@@ -130,9 +128,8 @@ static struct unix_sk_listen_icon *lookup_unix_listen_icons(unsigned int peer_in
 
 static void show_one_unix(char *act, const struct unix_sk_desc *sk)
 {
-	pr_debug("\t%s: ino %u peer_ino %u family %4d type %4d state %2d name %s\n",
-		act, sk->sd.ino, sk->peer_ino, sk->sd.family, sk->type, sk->state,
-		sk->name ? : "null");
+	pr_debug("\t%s: ino %u peer_ino %u family %4d type %4d state %2d name %s\n", act, sk->sd.ino, sk->peer_ino,
+		 sk->sd.family, sk->type, sk->state, sk->name ?: "null");
 
 	if (sk->nr_icons) {
 		int i;
@@ -144,8 +141,8 @@ static void show_one_unix(char *act, const struct unix_sk_desc *sk)
 
 static void show_one_unix_img(const char *act, const UnixSkEntry *e)
 {
-	pr_info("\t%s: id %#x ino %u peer %u type %d state %d name %d bytes\n",
-		act, e->id, e->ino, e->peer, e->type, e->state, (int)e->name.len);
+	pr_info("\t%s: id %#x ino %u peer %u type %d state %d name %d bytes\n", act, e->id, e->ino, e->peer, e->type,
+		e->state, (int)e->name.len);
 }
 
 static int can_dump_unix_sk(const struct unix_sk_desc *sk)
@@ -155,12 +152,10 @@ static int can_dump_unix_sk(const struct unix_sk_desc *sk)
 	 * that is connected to cr_service. We will dump
 	 * it properly below.
 	 */
-	if (sk->type != SOCK_STREAM &&
-	    sk->type != SOCK_DGRAM &&
-	    sk->type != SOCK_SEQPACKET) {
+	if (sk->type != SOCK_STREAM && sk->type != SOCK_DGRAM && sk->type != SOCK_SEQPACKET) {
 		pr_err("Unsupported type (%d) on socket %d.\n"
-				"Only stream/dgram/seqpacket are supported.\n",
-				sk->type, sk->sd.ino);
+		       "Only stream/dgram/seqpacket are supported.\n",
+		       sk->type, sk->sd.ino);
 		return 0;
 	}
 
@@ -170,8 +165,7 @@ static int can_dump_unix_sk(const struct unix_sk_desc *sk)
 	case TCP_CLOSE:
 		break;
 	default:
-		pr_err("Unknown state %d for unix socket %d\n",
-				sk->state, sk->sd.ino);
+		pr_err("Unknown state %d for unix socket %d\n", sk->state, sk->sd.ino);
 		return 0;
 	}
 
@@ -286,8 +280,7 @@ static int resolve_rel_name(uint32_t id, struct unix_sk_desc *sk, const struct f
 		return -ENOENT;
 	}
 
-	pr_debug("Resolving relative name %s for socket %d\n",
-		 sk->name, sk->sd.ino);
+	pr_debug("Resolving relative name %s for socket %d\n", sk->name, sk->sd.ino);
 
 	for (i = 0; i < ARRAY_SIZE(dirs); i++) {
 		char dir[PATH_MAX], path[PATH_MAX];
@@ -312,16 +305,15 @@ static int resolve_rel_name(uint32_t id, struct unix_sk_desc *sk, const struct f
 			goto err;
 		}
 
-		if ((st.st_ino == sk->vfs_ino) &&
-		    phys_stat_dev_match(st.st_dev, sk->vfs_dev, ns, &path[1])) {
+		if ((st.st_ino == sk->vfs_ino) && phys_stat_dev_match(st.st_dev, sk->vfs_dev, ns, &path[1])) {
 			*pdir = xstrdup(dir);
 			if (!*pdir)
 				return -ENOMEM;
 
 			pr_debug("Resolved relative socket name to dir %s\n", *pdir);
 			sk->mode = st.st_mode;
-			sk->uid	= st.st_uid;
-			sk->gid	= st.st_gid;
+			sk->uid = st.st_uid;
+			sk->gid = st.st_gid;
 			return 0;
 		}
 	}
@@ -340,16 +332,13 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 	FownEntry *fown;
 	void *m;
 
-	m = xmalloc(sizeof(UnixSkEntry) +
-		    sizeof(SkOptsEntry) +
-		    sizeof(FilePermsEntry) +
-		    sizeof(FownEntry));
+	m = xmalloc(sizeof(UnixSkEntry) + sizeof(SkOptsEntry) + sizeof(FilePermsEntry) + sizeof(FownEntry));
 	if (!m)
 		return -ENOMEM;
-	ue	= xptr_pull(&m, UnixSkEntry);
-	skopts	= xptr_pull(&m, SkOptsEntry);
-	perms	= xptr_pull(&m, FilePermsEntry);
-	fown	= xptr_pull(&m, FownEntry);
+	ue = xptr_pull(&m, UnixSkEntry);
+	skopts = xptr_pull(&m, SkOptsEntry);
+	perms = xptr_pull(&m, FilePermsEntry);
+	fown = xptr_pull(&m, FownEntry);
 
 	unix_sk_entry__init(ue);
 	sk_opts_entry__init(skopts);
@@ -368,21 +357,21 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 
 	BUG_ON(sk->sd.already_dumped);
 
-	ue->name.len	= (size_t)sk->namelen;
-	ue->name.data	= (void *)sk->name;
+	ue->name.len = (size_t)sk->namelen;
+	ue->name.data = (void *)sk->name;
 
-	ue->id		= id;
-	ue->ino		= sk->sd.ino;
-	ue->ns_id	= sk->sd.sk_ns->id;
-	ue->has_ns_id	= true;
-	ue->type	= sk->type;
-	ue->state	= sk->state;
-	ue->flags	= p->flags;
-	ue->backlog	= sk->wqlen;
-	ue->peer	= sk->peer_ino;
-	ue->fown	= fown;
-	ue->opts	= skopts;
-	ue->uflags	= 0;
+	ue->id = id;
+	ue->ino = sk->sd.ino;
+	ue->ns_id = sk->sd.sk_ns->id;
+	ue->has_ns_id = true;
+	ue->type = sk->type;
+	ue->state = sk->state;
+	ue->flags = p->flags;
+	ue->backlog = sk->wqlen;
+	ue->peer = sk->peer_ino;
+	ue->fown = fown;
+	ue->opts = skopts;
+	ue->uflags = 0;
 
 	if (unix_resolve_name(lfd, id, sk, ue, p))
 		goto err;
@@ -400,14 +389,14 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 	if (sk->namelen && *sk->name) {
 		ue->file_perms = perms;
 
-		perms->mode	= sk->mode;
-		perms->uid	= userns_uid(sk->uid);
-		perms->gid	= userns_gid(sk->gid);
+		perms->mode = sk->mode;
+		perms->uid = userns_uid(sk->uid);
+		perms->gid = userns_gid(sk->gid);
 	}
 
 	if (sk->deleted) {
 		ue->has_deleted = true;
-		ue->deleted	= sk->deleted;
+		ue->deleted = sk->deleted;
 	}
 
 	sk_encode_shutdown(ue, sk->shutdown);
@@ -418,8 +407,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 	 * accept()-ed. We handle them separately with the "icons"
 	 * (i stands for in-flight, cons -- for connections) things.
 	 */
-	if (sk->rqlen != 0 && !(sk->type == SOCK_STREAM &&
-				sk->state == TCP_LISTEN)) {
+	if (sk->rqlen != 0 && !(sk->type == SOCK_STREAM && sk->state == TCP_LISTEN)) {
 		if (dump_sk_queue(lfd, id))
 			goto err;
 	}
@@ -427,8 +415,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 	if (ue->peer) {
 		peer = (struct unix_sk_desc *)lookup_socket(ue->peer, PF_UNIX, 0);
 		if (IS_ERR_OR_NULL(peer)) {
-			pr_err("Unix socket %u without peer %u\n",
-					ue->ino, ue->peer);
+			pr_err("Unix socket %u without peer %u\n", ue->ino, ue->peer);
 			goto err;
 		}
 
@@ -438,8 +425,8 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 		 */
 		if (peer->peer_ino != ue->ino) {
 			if (!peer->name) {
-				pr_err("Unix socket %u with unreachable peer %u (%u)\n",
-				       ue->ino, ue->peer, peer->peer_ino);
+				pr_err("Unix socket %u with unreachable peer %u (%u)\n", ue->ino, ue->peer,
+				       peer->peer_ino);
 				goto err;
 			}
 		}
@@ -458,13 +445,10 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 			}
 		}
 
-		if ((ue->type != SOCK_DGRAM) && (
-				((ue->shutdown == SK_SHUTDOWN__READ)  &&
-				 (peer->shutdown != SK_SHUTDOWN__WRITE)) ||
-				((ue->shutdown == SK_SHUTDOWN__WRITE) &&
-				 (peer->shutdown != SK_SHUTDOWN__READ))  ||
-				((ue->shutdown == SK_SHUTDOWN__BOTH)  &&
-				 (peer->shutdown != SK_SHUTDOWN__BOTH)) )) {
+		if ((ue->type != SOCK_DGRAM) &&
+		    (((ue->shutdown == SK_SHUTDOWN__READ) && (peer->shutdown != SK_SHUTDOWN__WRITE)) ||
+		     ((ue->shutdown == SK_SHUTDOWN__WRITE) && (peer->shutdown != SK_SHUTDOWN__READ)) ||
+		     ((ue->shutdown == SK_SHUTDOWN__BOTH) && (peer->shutdown != SK_SHUTDOWN__BOTH)))) {
 			/*
 			 * Usually this doesn't happen, however it's possible if
 			 * socket was shut down before connect() (see sockets03.c test).
@@ -473,8 +457,8 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 			 * to check both ends on read()/write(). Thus mismatched sockets behave
 			 * the same way as matched.
 			 */
-			pr_warn("Shutdown mismatch %u:%d -> %u:%d\n",
-					ue->ino, ue->shutdown, peer->sd.ino, peer->shutdown);
+			pr_warn("Shutdown mismatch %u:%d -> %u:%d\n", ue->ino, ue->shutdown, peer->sd.ino,
+				peer->shutdown);
 		}
 	} else if (ue->state == TCP_ESTABLISHED) {
 		const struct unix_sk_listen_icon *e;
@@ -508,14 +492,14 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 		/* e->sk_desc is _never_ NULL */
 		if (e->sk_desc->state != TCP_LISTEN) {
 			pr_err("In-flight connection on "
-				"non-listening socket %d\n", ue->ino);
+			       "non-listening socket %d\n",
+			       ue->ino);
 			goto err;
 		}
 
 		ue->peer = e->sk_desc->sd.ino;
 
-		pr_debug("\t\tFixed inflight socket %u peer %u)\n",
-				ue->ino, ue->peer);
+		pr_debug("\t\tFixed inflight socket %u peer %u)\n", ue->ino, ue->peer);
 	}
 dump:
 	if (dump_socket_opts(lfd, skopts))
@@ -556,12 +540,12 @@ err:
 }
 
 const struct fdtype_ops unix_dump_ops = {
-	.type		= FD_TYPES__UNIXSK,
-	.dump		= dump_one_unix_fd,
+	.type = FD_TYPES__UNIXSK,
+	.dump = dump_one_unix_fd,
 };
 
-static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d,
-				UnixSkEntry *ue, const struct fd_parms *p)
+static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, UnixSkEntry *ue,
+				 const struct fd_parms *p)
 {
 	char *name = d->name;
 	bool deleted = false;
@@ -611,26 +595,22 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d,
 	snprintf(rpath, sizeof(rpath), ".%s", name);
 	if (fstatat(mntns_root, rpath, &st, 0)) {
 		if (errno != ENOENT) {
-			pr_warn("Can't stat socket %#x(%s), skipping: %m (err %d)\n",
-				id, rpath, errno);
+			pr_warn("Can't stat socket %#x(%s), skipping: %m (err %d)\n", id, rpath, errno);
 			goto skip;
 		}
 
-		pr_info("unix: Dropping path %s for unlinked sk %#x\n",
-			name, id);
+		pr_info("unix: Dropping path %s for unlinked sk %#x\n", name, id);
 		deleted = true;
-	} else if ((st.st_ino != d->vfs_ino) ||
-		   !phys_stat_dev_match(st.st_dev, d->vfs_dev, ns, name)) {
+	} else if ((st.st_ino != d->vfs_ino) || !phys_stat_dev_match(st.st_dev, d->vfs_dev, ns, name)) {
 		pr_info("unix: Dropping path %s for unlinked bound "
 			"sk %#x.%d real %#x.%d\n",
-			name, (int)st.st_dev, (int)st.st_ino,
-			(int)d->vfs_dev, (int)d->vfs_ino);
+			name, (int)st.st_dev, (int)st.st_ino, (int)d->vfs_dev, (int)d->vfs_ino);
 		deleted = true;
 	}
 
 	d->mode = st.st_mode;
-	d->uid	= st.st_uid;
-	d->gid	= st.st_gid;
+	d->uid = st.st_uid;
+	d->gid = st.st_gid;
 
 	d->deleted = deleted;
 
@@ -645,8 +625,7 @@ skip:
 	goto out;
 }
 
-static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d,
-				UnixSkEntry *ue, const struct fd_parms *p)
+static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d, UnixSkEntry *ue, const struct fd_parms *p)
 {
 	char *name = d->name;
 	char path[PATH_MAX], tmp[PATH_MAX];
@@ -675,8 +654,8 @@ static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d,
 		return -1;
 	}
 	d->mode = st.st_mode;
-	d->uid	= st.st_uid;
-	d->gid	= st.st_gid;
+	d->uid = st.st_uid;
+	d->gid = st.st_gid;
 
 	proc_fd = get_service_fd(PROC_FD_OFF);
 	if (proc_fd < 0) {
@@ -760,8 +739,7 @@ skip:
 	return 1;
 }
 
-static int unix_collect_one(const struct unix_diag_msg *m,
-			    struct nlattr **tb, struct ns_id *ns)
+static int unix_collect_one(const struct unix_diag_msg *m, struct nlattr **tb, struct ns_id *ns)
 {
 	struct unix_sk_desc *d;
 	int ret = 0;
@@ -770,7 +748,7 @@ static int unix_collect_one(const struct unix_diag_msg *m,
 	if (!d)
 		return -1;
 
-	d->type	 = m->udiag_type;
+	d->type = m->udiag_type;
 	d->state = m->udiag_state;
 	INIT_LIST_HEAD(&d->list);
 
@@ -825,8 +803,8 @@ static int unix_collect_one(const struct unix_diag_msg *m,
 
 			pr_debug("\t\tCollected icon %d\n", d->icons[i]);
 
-			e->peer_ino	= n;
-			e->sk_desc	= d;
+			e->peer_ino = n;
+			e->sk_desc = d;
 		}
 	}
 
@@ -855,15 +833,14 @@ skip:
 int unix_receive_one(struct nlmsghdr *h, struct ns_id *ns, void *arg)
 {
 	struct unix_diag_msg *m = NLMSG_DATA(h);
-	struct nlattr *tb[UNIX_DIAG_MAX+1];
+	struct nlattr *tb[UNIX_DIAG_MAX + 1];
 
 	nlmsg_parse(h, sizeof(struct unix_diag_msg), tb, UNIX_DIAG_MAX, NULL);
 
 	return unix_collect_one(m, tb, ns);
 }
 
-static int __dump_external_socket(struct unix_sk_desc *sk,
-					struct unix_sk_desc *peer)
+static int __dump_external_socket(struct unix_sk_desc *sk, struct unix_sk_desc *peer)
 {
 	int ret;
 
@@ -937,22 +914,21 @@ int fix_external_unix_sockets(void)
 		FownEntry fown = FOWN_ENTRY__INIT;
 		SkOptsEntry skopts = SK_OPTS_ENTRY__INIT;
 
-		if (sk->sd.already_dumped ||
-		    list_empty(&sk->peer_list))
+		if (sk->sd.already_dumped || list_empty(&sk->peer_list))
 			continue;
 
 		show_one_unix("Dumping extern", sk);
 
 		fd_id_generate_special(NULL, &e.id);
-		e.ino		= sk->sd.ino;
-		e.type		= SOCK_DGRAM;
-		e.state		= TCP_LISTEN;
-		e.name.data	= (void *)sk->name;
-		e.name.len	= (size_t)sk->namelen;
-		e.uflags	= USK_EXTERN;
-		e.peer		= 0;
-		e.fown		= &fown;
-		e.opts		= &skopts;
+		e.ino = sk->sd.ino;
+		e.type = SOCK_DGRAM;
+		e.state = TCP_LISTEN;
+		e.name.data = (void *)sk->name;
+		e.name.len = (size_t)sk->namelen;
+		e.uflags = USK_EXTERN;
+		e.peer = 0;
+		e.fown = &fown;
+		e.opts = &skopts;
 
 		fe.type = FD_TYPES__UNIXSK;
 		fe.id = e.id;
@@ -973,36 +949,36 @@ err:
 }
 
 struct unix_sk_info {
-	UnixSkEntry		*ue;
-	struct list_head	list;
-	char			*name;
-	char			*name_dir;
-	unsigned		flags;
-	int			fdstore_id;
-	struct unix_sk_info	*peer;
-	struct pprep_head	peer_resolve; /* XXX : union with the above? */
-	struct file_desc	d;
-	struct hlist_node	hash; /* To lookup socket by ino */
-	struct list_head	connected; /* List of sockets, connected to me */
-	struct list_head	node; /* To link in peer's connected list  */
-	struct list_head	scm_fles;
-	struct list_head	ghost_node;
-	size_t			ghost_dir_pos;
+	UnixSkEntry *ue;
+	struct list_head list;
+	char *name;
+	char *name_dir;
+	unsigned flags;
+	int fdstore_id;
+	struct unix_sk_info *peer;
+	struct pprep_head peer_resolve; /* XXX : union with the above? */
+	struct file_desc d;
+	struct hlist_node hash; /* To lookup socket by ino */
+	struct list_head connected; /* List of sockets, connected to me */
+	struct list_head node; /* To link in peer's connected list  */
+	struct list_head scm_fles;
+	struct list_head ghost_node;
+	size_t ghost_dir_pos;
 
 	/*
 	 * For DGRAM sockets with queues, we should only restore the queue
 	 * once although it may be open by more than one tid. This is the peer
 	 * that should do the queueing.
 	 */
-	struct unix_sk_info	*queuer;
+	struct unix_sk_info *queuer;
 	/*
 	 * These bits are set by task-owner of this unix_sk_info.
 	 * Another tasks can only read them.
 	 */
-	uint8_t			bound:1;
-	uint8_t			listen:1;
-	uint8_t			is_connected:1;
-	uint8_t			peer_queue_restored:1; /* Set in 1 after we restore peer's queue */
+	uint8_t bound : 1;
+	uint8_t listen : 1;
+	uint8_t is_connected : 1;
+	uint8_t peer_queue_restored : 1; /* Set in 1 after we restore peer's queue */
 };
 
 struct scm_fle {
@@ -1010,11 +986,11 @@ struct scm_fle {
 	struct fdinfo_list_entry *fle;
 };
 
-#define USK_PAIR_MASTER		0x1
-#define USK_PAIR_SLAVE		0x2
-#define USK_GHOST_FDSTORE	0x4	/* bound but removed address */
+#define USK_PAIR_MASTER	  0x1
+#define USK_PAIR_SLAVE	  0x2
+#define USK_GHOST_FDSTORE 0x4 /* bound but removed address */
 
-#define SK_INFO_HASH_SIZE	32
+#define SK_INFO_HASH_SIZE 32
 
 static struct hlist_head sk_info_hash[SK_INFO_HASH_SIZE];
 
@@ -1052,8 +1028,7 @@ static struct unix_sk_info *find_queuer_for(int id)
 	return NULL;
 }
 
-static struct fdinfo_list_entry *get_fle_for_task(struct file_desc *tgt,
-		struct pstree_item *owner, bool force_master)
+static struct fdinfo_list_entry *get_fle_for_task(struct file_desc *tgt, struct pstree_item *owner, bool force_master)
 {
 	struct fdinfo_list_entry *fle;
 	FdinfoEntry *e = NULL;
@@ -1268,8 +1243,7 @@ static int revert_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *ro
 	return ret;
 }
 
-static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd,
-			    int *prev_root_fd, int *prev_mntns_fd)
+static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *prev_root_fd, int *prev_mntns_fd)
 {
 	static struct ns_id *root = NULL, *ns;
 	int fd;
@@ -1304,8 +1278,7 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd,
 			ns = lookup_nsid_by_mnt_id(ui->ue->mnt_id);
 		} else {
 			if (root == NULL)
-				root = lookup_ns_by_id(root_item->ids->mnt_ns_id,
-									&mnt_ns_desc);
+				root = lookup_ns_by_id(root_item->ids->mnt_ns_id, &mnt_ns_desc);
 			ns = root;
 		}
 		if (ns == NULL)
@@ -1336,8 +1309,7 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd,
 
 	if (ui->name_dir) {
 		if (chdir(ui->name_dir)) {
-			pr_perror("Can't change working dir %s",
-				  ui->name_dir);
+			pr_perror("Can't change working dir %s", ui->name_dir);
 			goto err;
 		}
 		pr_debug("Change working dir to %s\n", ui->name_dir);
@@ -1360,8 +1332,7 @@ static int post_open_standalone(struct file_desc *d, int fd)
 	int cwd_fd = -1, root_fd = -1, ns_fd = -1;
 
 	ui = container_of(d, struct unix_sk_info, d);
-	BUG_ON((ui->flags & (USK_PAIR_MASTER | USK_PAIR_SLAVE)) ||
-			(ui->ue->uflags & (USK_CALLBACK | USK_INHERIT)));
+	BUG_ON((ui->flags & (USK_PAIR_MASTER | USK_PAIR_SLAVE)) || (ui->ue->uflags & (USK_CALLBACK | USK_INHERIT)));
 
 	if (chk_restored_scms(ui))
 		return 1;
@@ -1428,9 +1399,7 @@ static int post_open_standalone(struct file_desc *d, int fd)
 	revert_unix_sk_cwd(peer, &cwd_fd, &root_fd, &ns_fd);
 
 restore_queue:
-	if (peer->queuer == ui &&
-	    !(peer->ue->uflags & USK_EXTERN) &&
-	    restore_unix_queue(fd, peer))
+	if (peer->queuer == ui && !(peer->ue->uflags & USK_EXTERN) && restore_unix_queue(fd, peer))
 		return -1;
 restore_sk_common:
 	if (ui->queuer && !ui->queuer->peer_queue_restored)
@@ -1478,18 +1447,15 @@ static int keep_deleted(struct unix_sk_info *ui)
 {
 	int fd = open(ui->name, O_PATH);
 	if (fd < 0) {
-		pr_perror("ghost: Can't open id %#x ino %u addr %s",
-			  ui->ue->id, ui->ue->ino, ui->name);
+		pr_perror("ghost: Can't open id %#x ino %u addr %s", ui->ue->id, ui->ue->ino, ui->name);
 		return -1;
 	}
 	ui->fdstore_id = fdstore_add(fd);
-	pr_debug("ghost: id %#x %d fdstore_id %d %s\n",
-		 ui->ue->id, ui->ue->ino, ui->fdstore_id, ui->name);
+	pr_debug("ghost: id %#x %d fdstore_id %d %s\n", ui->ue->id, ui->ue->ino, ui->fdstore_id, ui->name);
 	close(fd);
 	return ui->fdstore_id;
 }
 
-
 #define UNIX_GHOST_FMT "%s.criu-sk-ghost"
 
 /*
@@ -1504,30 +1470,28 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	int ret;
 
 	if (ui->ue->name.len >= UNIX_PATH_MAX) {
-		pr_err("ghost: Too long name for socket id %#x ino %u name %s\n",
-		       ui->ue->id, ui->ue->ino, ui->name);
+		pr_err("ghost: Too long name for socket id %#x ino %u name %s\n", ui->ue->id, ui->ue->ino, ui->name);
 		return -ENOSPC;
 	}
 
 	memcpy(path, ui->name, ui->ue->name.len);
 	path[ui->ue->name.len] = '\0';
 
-	for (pos = strrchr(path, '/'); pos;
-	     pos = strrchr(path, '/')) {
+	for (pos = strrchr(path, '/'); pos; pos = strrchr(path, '/')) {
 		*pos = '\0';
 
 		ret = access(path, R_OK | W_OK | X_OK);
 		if (ret == 0) {
 			ui->ghost_dir_pos = pos - path;
-			pr_debug("ghost: socket id %#x ino %u name %s detected F_OK %s\n",
-				 ui->ue->id, ui->ue->ino, ui->name, path);
+			pr_debug("ghost: socket id %#x ino %u name %s detected F_OK %s\n", ui->ue->id, ui->ue->ino,
+				 ui->name, path);
 			break;
 		}
 
 		if (errno != ENOENT) {
 			ret = -errno;
-			pr_perror("ghost: Can't access %s for socket id %#x ino %u name %s",
-				  path, ui->ue->id, ui->ue->ino, ui->name);
+			pr_perror("ghost: Can't access %s for socket id %#x ino %u name %s", path, ui->ue->id,
+				  ui->ue->ino, ui->name);
 			return ret;
 		}
 	}
@@ -1536,8 +1500,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	path[ui->ue->name.len] = '\0';
 
 	pos = dirname(path);
-	pr_debug("ghost: socket id %#x ino %u name %s creating %s\n",
-		 ui->ue->id, ui->ue->ino, ui->name, pos);
+	pr_debug("ghost: socket id %#x ino %u name %s creating %s\n", ui->ue->id, ui->ue->ino, ui->name, pos);
 	ret = mkdirpat(AT_FDCWD, pos, 0755);
 	if (ret) {
 		errno = -ret;
@@ -1558,25 +1521,22 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 		 * once ghost socket is processed.
 		 */
 		if (unlinkat(AT_FDCWD, path_parked, 0) == 0)
-			pr_debug("ghost: Unlinked stale socket id %#x ino %d name %s\n",
-				 ui->ue->id, ui->ue->ino, path_parked);
+			pr_debug("ghost: Unlinked stale socket id %#x ino %d name %s\n", ui->ue->id, ui->ue->ino,
+				 path_parked);
 		if (rename(ui->name, path_parked)) {
 			ret = -errno;
-			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
-				  ui->ue->id, ui->ue->ino, ui->name, path_parked);
+			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s", ui->ue->id, ui->ue->ino, ui->name,
+				  path_parked);
 			return ret;
 		}
-		pr_debug("ghost: id %#x ino %d renamed %s -> %s\n",
-			 ui->ue->id, ui->ue->ino, ui->name, path_parked);
+		pr_debug("ghost: id %#x ino %d renamed %s -> %s\n", ui->ue->id, ui->ue->ino, ui->name, path_parked);
 		renamed = true;
 	}
 
-	ret = bind(sk, (struct sockaddr *)&addr,
-		   sizeof(addr.sun_family) + ui->ue->name.len);
+	ret = bind(sk, (struct sockaddr *)&addr, sizeof(addr.sun_family) + ui->ue->name.len);
 	if (ret < 0) {
 		ret = -errno;
-		pr_perror("ghost: Can't bind on socket id %#x ino %d addr %s",
-			  ui->ue->id, ui->ue->ino, ui->name);
+		pr_perror("ghost: Can't bind on socket id %#x ino %d addr %s", ui->ue->id, ui->ue->ino, ui->name);
 		goto out_rename;
 	}
 
@@ -1586,8 +1546,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 
 	ret = keep_deleted(ui);
 	if (ret < 0) {
-		pr_err("ghost: Can't save socket %#x ino %u addr %s into fdstore\n",
-		       ui->ue->id, ui->ue->ino, ui->name);
+		pr_err("ghost: Can't save socket %#x ino %u addr %s into fdstore\n", ui->ue->id, ui->ue->ino, ui->name);
 		ret = -EIO;
 	}
 
@@ -1599,19 +1558,18 @@ out:
 	ret = unlinkat(AT_FDCWD, ui->name, 0);
 	if (ret < 0) {
 		ret = -errno;
-		pr_perror("ghost: Can't unlink socket %#x ino %u addr %s",
-			  ui->ue->id, ui->ue->ino, ui->name);
+		pr_perror("ghost: Can't unlink socket %#x ino %u addr %s", ui->ue->id, ui->ue->ino, ui->name);
 	}
 
 out_rename:
 	if (renamed) {
 		if (rename(path_parked, ui->name)) {
 			ret = -errno;
-			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s",
-				  ui->ue->id, ui->ue->ino, path_parked, ui->name);
+			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s", ui->ue->id, ui->ue->ino,
+				  path_parked, ui->name);
 		} else {
-			pr_debug("ghost: id %#x ino %d renamed %s -> %s\n",
-				 ui->ue->id, ui->ue->ino, path_parked,  ui->name);
+			pr_debug("ghost: id %#x ino %d renamed %s -> %s\n", ui->ue->id, ui->ue->ino, path_parked,
+				 ui->name);
 		}
 	}
 
@@ -1624,17 +1582,14 @@ out_rename:
 		memcpy(path, ui->name, ui->ue->name.len);
 		path[ui->ue->name.len] = '\0';
 
-		for (pos = strrchr(path, '/');
-		     pos && (pos - path) > ui->ghost_dir_pos;
-		     pos = strrchr(path, '/')) {
+		for (pos = strrchr(path, '/'); pos && (pos - path) > ui->ghost_dir_pos; pos = strrchr(path, '/')) {
 			*pos = '\0';
 			if (rmdir(path)) {
-				pr_perror("ghost: Can't remove directory %s on id %#x ino %u",
-					  path, ui->ue->id, ui->ue->ino);
+				pr_perror("ghost: Can't remove directory %s on id %#x ino %u", path, ui->ue->id,
+					  ui->ue->ino);
 				return -1;
 			}
-			pr_debug("ghost: Removed %s on id %#x ino %u\n",
-				 path, ui->ue->id, ui->ue->ino);
+			pr_debug("ghost: Removed %s on id %#x ino %u\n", path, ui->ue->id, ui->ue->ino);
 		}
 	}
 
@@ -1681,22 +1636,18 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
 	mutex_lock(mutex_ghost);
 
 	if (ui->flags & USK_GHOST_FDSTORE) {
-		pr_debug("ghost: bind id %#x ino %u addr %s\n",
-			 ui->ue->id, ui->ue->ino, ui->name);
+		pr_debug("ghost: bind id %#x ino %u addr %s\n", ui->ue->id, ui->ue->ino, ui->name);
 		ret = bind_on_deleted(sk, ui);
 		if (ret)
 			errno = -ret;
 	} else {
-		pr_debug("bind id %#x ino %u addr %s\n",
-			 ui->ue->id, ui->ue->ino, ui->name);
-		ret = bind(sk, (struct sockaddr *)&addr,
-			   sizeof(addr.sun_family) + ui->ue->name.len);
+		pr_debug("bind id %#x ino %u addr %s\n", ui->ue->id, ui->ue->ino, ui->name);
+		ret = bind(sk, (struct sockaddr *)&addr, sizeof(addr.sun_family) + ui->ue->name.len);
 		if (ret == 0 && restore_file_perms(ui))
 			goto done;
 	}
 	if (ret < 0) {
-		pr_perror("Can't bind id %#x ino %u addr %s",
-			  ui->ue->id, ui->ue->ino, ui->name);
+		pr_perror("Can't bind id %#x ino %u addr %s", ui->ue->id, ui->ue->ino, ui->name);
 		goto done;
 	}
 
@@ -1741,8 +1692,8 @@ static int post_open_interconnected_master(struct unix_sk_info *ui)
 
 static void pr_info_opening(const char *prefix, struct unix_sk_info *ui, struct fdinfo_list_entry *fle)
 {
-	pr_info("Opening %s (stage %d id %#x ino %u peer %u)\n",
-		prefix, fle->stage, ui->ue->id, ui->ue->ino, ui->ue->peer);
+	pr_info("Opening %s (stage %d id %#x ino %u peer %u)\n", prefix, fle->stage, ui->ue->id, ui->ue->ino,
+		ui->ue->peer);
 }
 
 static int open_unixsk_pair_master(struct unix_sk_info *ui, int *new_fd)
@@ -1899,14 +1850,12 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 		int ret, sks[2];
 
 		if (ui->ue->type != SOCK_STREAM) {
-			pr_err("Non-stream socket %u in established state\n",
-					ui->ue->ino);
+			pr_err("Non-stream socket %u in established state\n", ui->ue->ino);
 			return -1;
 		}
 
 		if (ui->ue->shutdown != SK_SHUTDOWN__BOTH) {
-			pr_err("Wrong shutdown/peer state for %u\n",
-					ui->ue->ino);
+			pr_err("Wrong shutdown/peer state for %u\n", ui->ue->ino);
 			return -1;
 		}
 
@@ -1962,11 +1911,9 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 		 * Connect to external sockets requires
 		 * special option to be passed.
 		 */
-		if (ui->peer && (ui->peer->ue->uflags & USK_EXTERN) &&
-				!(opts.ext_unix_sk)) {
+		if (ui->peer && (ui->peer->ue->uflags & USK_EXTERN) && !(opts.ext_unix_sk)) {
 			pr_err("External socket found in image. "
-					"Consider using the --" USK_EXT_PARAM
-					" option to allow restoring it.\n");
+			       "Consider using the --" USK_EXT_PARAM " option to allow restoring it.\n");
 			return -1;
 		}
 
@@ -2040,8 +1987,7 @@ static char *socket_d_name(struct file_desc *d, char *buf, size_t s)
 	ui = container_of(d, struct unix_sk_info, d);
 
 	if (snprintf(buf, s, "socket:[%u]", ui->ue->ino) >= s) {
-		pr_err("Not enough room for unixsk %d identifier string\n",
-				ui->ue->ino);
+		pr_err("Not enough room for unixsk %d identifier string\n", ui->ue->ino);
 		return NULL;
 	}
 
@@ -2080,17 +2026,13 @@ static int unlink_sk(struct unix_sk_info *ui)
 
 	ret = unlinkat(AT_FDCWD, ui->name, 0) ? -1 : 0;
 	if (ret < 0 && errno != ENOENT) {
-		pr_warn("Can't unlink socket %u peer %u (name %s dir %s)\n",
-			ui->ue->ino, ui->ue->peer,
-			ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-",
-			ui->name_dir ? ui->name_dir : "-");
+		pr_warn("Can't unlink socket %u peer %u (name %s dir %s)\n", ui->ue->ino, ui->ue->peer,
+			ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-", ui->name_dir ? ui->name_dir : "-");
 		ret = -errno;
 		goto out;
 	} else if (ret == 0) {
-		pr_debug("Unlinked socket %u peer %u (name %s dir %s)\n",
-			 ui->ue->ino, ui->ue->peer,
-			 ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-",
-			 ui->name_dir ? ui->name_dir : "-");
+		pr_debug("Unlinked socket %u peer %u (name %s dir %s)\n", ui->ue->ino, ui->ue->peer,
+			 ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-", ui->name_dir ? ui->name_dir : "-");
 	}
 out:
 	revert_unix_sk_cwd(ui, &cwd_fd, &root_fd, &ns_fd);
@@ -2125,14 +2067,14 @@ static int init_unix_sk_info(struct unix_sk_info *ui, UnixSkEntry *ue)
 		ui->name = NULL;
 	ui->name_dir = (void *)ue->name_dir;
 
-	ui->flags		= 0;
-	ui->fdstore_id		= -1;
-	ui->ghost_dir_pos	= 0;
-	ui->peer		= NULL;
-	ui->queuer		= NULL;
-	ui->bound		= 0;
-	ui->listen		= 0;
-	ui->is_connected	= 0;
+	ui->flags = 0;
+	ui->fdstore_id = -1;
+	ui->ghost_dir_pos = 0;
+	ui->peer = NULL;
+	ui->queuer = NULL;
+	ui->bound = 0;
+	ui->listen = 0;
+	ui->is_connected = 0;
 	ui->peer_queue_restored = 0;
 
 	memzero(&ui->peer_resolve, sizeof(ui->peer_resolve));
@@ -2165,11 +2107,9 @@ int unix_prepare_root_shared(void)
 		char tp_name[32];
 		char st_name[32];
 
-		pr_debug("ghost: id %#x type %s state %s ino %u peer %u address %s\n",
-			 ui->ue->id, __socket_type_name(ui->ue->type, tp_name),
-			 __tcp_state_name(ui->ue->state, st_name),
-			 ui->ue->ino, ui->peer ? ui->peer->ue->ino : 0,
-			 ui->name);
+		pr_debug("ghost: id %#x type %s state %s ino %u peer %u address %s\n", ui->ue->id,
+			 __socket_type_name(ui->ue->type, tp_name), __tcp_state_name(ui->ue->state, st_name),
+			 ui->ue->ino, ui->peer ? ui->peer->ue->ino : 0, ui->name);
 
 		/*
 		 * Drop any existing trash on the FS and mark the
@@ -2205,7 +2145,7 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 			int j;
 
 			for (j = 0; j < ulen; j++)
-				s[j] = uname[j] ? : '@';
+				s[j] = uname[j] ?: '@';
 			uname = s;
 		}
 	} else if (ulen == 0) {
@@ -2213,10 +2153,9 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 		uname = "-";
 	}
 
-	pr_info(" `- Got id %#x ino %u type %s state %s peer %u (name %s%.*s dir %s)\n",
-		ui->ue->id, ui->ue->ino, ___socket_type_name(ui->ue->type),
-		___tcp_state_name(ui->ue->state), ui->ue->peer, prefix, ulen,
-		uname, ui->name_dir ? ui->name_dir : "-");
+	pr_info(" `- Got id %#x ino %u type %s state %s peer %u (name %s%.*s dir %s)\n", ui->ue->id, ui->ue->ino,
+		___socket_type_name(ui->ue->type), ___tcp_state_name(ui->ue->state), ui->ue->peer, prefix, ulen, uname,
+		ui->name_dir ? ui->name_dir : "-");
 
 	if (ui->ue->peer || ui->name) {
 		if (ui->ue->peer)
@@ -2241,11 +2180,11 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
 }
 
 struct collect_image_info unix_sk_cinfo = {
-	.fd_type	= CR_FD_UNIXSK,
-	.pb_type	= PB_UNIX_SK,
-	.priv_size	= sizeof(struct unix_sk_info),
-	.collect	= collect_one_unixsk,
-	.flags		= COLLECT_SHARED,
+	.fd_type = CR_FD_UNIXSK,
+	.pb_type = PB_UNIX_SK,
+	.priv_size = sizeof(struct unix_sk_info),
+	.collect = collect_one_unixsk,
+	.flags = COLLECT_SHARED,
 };
 
 static void set_peer(struct unix_sk_info *ui, struct unix_sk_info *peer)
@@ -2267,16 +2206,13 @@ static int add_fake_queuer(struct unix_sk_info *ui)
 	if (ui->ue->ino == FAKE_INO)
 		return 0;
 
-	peer = xzalloc(sizeof(struct unix_sk_info) +
-			sizeof(UnixSkEntry) +
-			sizeof(SkOptsEntry) +
-			sizeof(FownEntry));
+	peer = xzalloc(sizeof(struct unix_sk_info) + sizeof(UnixSkEntry) + sizeof(SkOptsEntry) + sizeof(FownEntry));
 	if (peer == NULL)
 		return -1;
 
-	peer_ue = (void *) peer + sizeof(struct unix_sk_info);
-	skopts = (void *) peer_ue + sizeof(UnixSkEntry);
-	fown = (void *) skopts + sizeof(SkOptsEntry);
+	peer_ue = (void *)peer + sizeof(struct unix_sk_info);
+	skopts = (void *)peer_ue + sizeof(UnixSkEntry);
+	fown = (void *)skopts + sizeof(SkOptsEntry);
 	memcpy(skopts, ui->ue->opts, sizeof(SkOptsEntry));
 	memcpy(fown, ui->ue->fown, sizeof(FownEntry));
 	memcpy(peer_ue, ui->ue, sizeof(UnixSkEntry));
@@ -2309,8 +2245,7 @@ int add_fake_unix_queuers(void)
 	list_for_each_entry(ui, &unix_sockets, list) {
 		if ((ui->ue->uflags & (USK_EXTERN | USK_CALLBACK)) || ui->queuer)
 			continue;
-		if (!(ui->ue->state == TCP_ESTABLISHED && !ui->peer) &&
-		     ui->ue->type != SOCK_DGRAM)
+		if (!(ui->ue->state == TCP_ESTABLISHED && !ui->peer) && ui->ue->type != SOCK_DGRAM)
 			continue;
 		if (add_fake_queuer(ui))
 			return -1;
@@ -2339,8 +2274,7 @@ static int interconnected_pair(struct unix_sk_info *ui, struct unix_sk_info *pee
 	 * which fle->task has no permissions to restore. But
 	 * it has permissions on ui, so it has permissions on peer.
 	 */
-	if (fle->task != fle_peer->task &&
-	    !get_fle_for_task(&peer->d, fle->task, true))
+	if (fle->task != fle_peer->task && !get_fle_for_task(&peer->d, fle->task, true))
 		return -1;
 
 	return 0;
@@ -2351,15 +2285,12 @@ static int fixup_unix_peer(struct unix_sk_info *ui)
 	struct unix_sk_info *peer = ui->peer;
 
 	if (!peer) {
-		pr_err("FATAL: Peer %u unresolved for %u\n",
-				ui->ue->peer, ui->ue->ino);
+		pr_err("FATAL: Peer %u unresolved for %u\n", ui->ue->peer, ui->ue->ino);
 		return -1;
 	}
 
-	if (peer != ui && peer->peer == ui &&
-			!(ui->flags & (USK_PAIR_MASTER | USK_PAIR_SLAVE))) {
-		pr_info("Connected %d -> %d (%d) flags %#x\n",
-				ui->ue->ino, ui->ue->peer, peer->ue->ino, ui->flags);
+	if (peer != ui && peer->peer == ui && !(ui->flags & (USK_PAIR_MASTER | USK_PAIR_SLAVE))) {
+		pr_info("Connected %d -> %d (%d) flags %#x\n", ui->ue->ino, ui->ue->peer, peer->ue->ino, ui->flags);
 		/* socketpair or interconnected sockets */
 		if (interconnected_pair(ui, peer))
 			return -1;
diff --git a/criu/sockets.c b/criu/sockets.c
index a73967e72..9426b5b94 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -30,17 +30,17 @@
 #include "util.h"
 #include "fdstore.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "sockets: "
 
 #ifndef SOCK_DIAG_BY_FAMILY
 #define SOCK_DIAG_BY_FAMILY 20
 #endif
 
-#define SK_HASH_SIZE		32
+#define SK_HASH_SIZE 32
 
 #ifndef SO_GET_FILTER
-#define SO_GET_FILTER	SO_ATTACH_FILTER
+#define SO_GET_FILTER SO_ATTACH_FILTER
 #endif
 
 static const char *__socket_const_name(char *dst, size_t len, const char **a, size_t n, unsigned int v)
@@ -57,21 +57,14 @@ static const char *__socket_const_name(char *dst, size_t len, const char **a, si
 const char *socket_proto_name(unsigned int proto, char *nm, size_t size)
 {
 	static const char *protos[] = {
-		[IPPROTO_IP]		= __stringify_1(IPPROTO_IP),
-		[IPPROTO_ICMP]		= __stringify_1(IPPROTO_ICMP),
-		[IPPROTO_IGMP]		= __stringify_1(IPPROTO_IGMP),
-		[IPPROTO_IPIP]		= __stringify_1(IPPROTO_IPIP),
-		[IPPROTO_TCP]		= __stringify_1(IPPROTO_TCP),
-		[IPPROTO_EGP]		= __stringify_1(IPPROTO_EGP),
-		[IPPROTO_UDP]		= __stringify_1(IPPROTO_UDP),
-		[IPPROTO_DCCP]		= __stringify_1(IPPROTO_DCCP),
-		[IPPROTO_IPV6]		= __stringify_1(IPPROTO_IPV6),
-		[IPPROTO_RSVP]		= __stringify_1(IPPROTO_RSVP),
-		[IPPROTO_GRE]		= __stringify_1(IPPROTO_GRE),
-		[IPPROTO_ESP]		= __stringify_1(IPPROTO_ESP),
-		[IPPROTO_AH]		= __stringify_1(IPPROTO_AH),
-		[IPPROTO_UDPLITE]	= __stringify_1(IPPROTO_UDPLITE),
-		[IPPROTO_RAW]		= __stringify_1(IPPROTO_RAW),
+		[IPPROTO_IP] = __stringify_1(IPPROTO_IP),     [IPPROTO_ICMP] = __stringify_1(IPPROTO_ICMP),
+		[IPPROTO_IGMP] = __stringify_1(IPPROTO_IGMP), [IPPROTO_IPIP] = __stringify_1(IPPROTO_IPIP),
+		[IPPROTO_TCP] = __stringify_1(IPPROTO_TCP),   [IPPROTO_EGP] = __stringify_1(IPPROTO_EGP),
+		[IPPROTO_UDP] = __stringify_1(IPPROTO_UDP),   [IPPROTO_DCCP] = __stringify_1(IPPROTO_DCCP),
+		[IPPROTO_IPV6] = __stringify_1(IPPROTO_IPV6), [IPPROTO_RSVP] = __stringify_1(IPPROTO_RSVP),
+		[IPPROTO_GRE] = __stringify_1(IPPROTO_GRE),   [IPPROTO_ESP] = __stringify_1(IPPROTO_ESP),
+		[IPPROTO_AH] = __stringify_1(IPPROTO_AH),     [IPPROTO_UDPLITE] = __stringify_1(IPPROTO_UDPLITE),
+		[IPPROTO_RAW] = __stringify_1(IPPROTO_RAW),
 	};
 	return __socket_const_name(nm, size, protos, ARRAY_SIZE(protos), proto);
 }
@@ -79,13 +72,10 @@ const char *socket_proto_name(unsigned int proto, char *nm, size_t size)
 const char *socket_family_name(unsigned int family, char *nm, size_t size)
 {
 	static const char *families[] = {
-		[AF_UNIX]		= __stringify_1(AF_UNIX),
-		[AF_INET]		= __stringify_1(AF_INET),
-		[AF_BRIDGE]		= __stringify_1(AF_BRIDGE),
-		[AF_INET6]		= __stringify_1(AF_INET6),
-		[AF_KEY]		= __stringify_1(AF_KEY),
-		[AF_NETLINK]		= __stringify_1(AF_NETLINK),
-		[AF_PACKET]		= __stringify_1(AF_PACKET),
+		[AF_UNIX] = __stringify_1(AF_UNIX),	[AF_INET] = __stringify_1(AF_INET),
+		[AF_BRIDGE] = __stringify_1(AF_BRIDGE), [AF_INET6] = __stringify_1(AF_INET6),
+		[AF_KEY] = __stringify_1(AF_KEY),	[AF_NETLINK] = __stringify_1(AF_NETLINK),
+		[AF_PACKET] = __stringify_1(AF_PACKET),
 	};
 	return __socket_const_name(nm, size, families, ARRAY_SIZE(families), family);
 }
@@ -93,11 +83,9 @@ const char *socket_family_name(unsigned int family, char *nm, size_t size)
 const char *socket_type_name(unsigned int type, char *nm, size_t size)
 {
 	static const char *types[] = {
-		[SOCK_STREAM]		= __stringify_1(SOCK_STREAM),
-		[SOCK_DGRAM]		= __stringify_1(SOCK_DGRAM),
-		[SOCK_RAW]		= __stringify_1(SOCK_RAW),
-		[SOCK_SEQPACKET]	= __stringify_1(SOCK_SEQPACKET),
-		[SOCK_PACKET]		= __stringify_1(SOCK_PACKET),
+		[SOCK_STREAM] = __stringify_1(SOCK_STREAM), [SOCK_DGRAM] = __stringify_1(SOCK_DGRAM),
+		[SOCK_RAW] = __stringify_1(SOCK_RAW),	    [SOCK_SEQPACKET] = __stringify_1(SOCK_SEQPACKET),
+		[SOCK_PACKET] = __stringify_1(SOCK_PACKET),
 	};
 	return __socket_const_name(nm, size, types, ARRAY_SIZE(types), type);
 }
@@ -105,39 +93,38 @@ const char *socket_type_name(unsigned int type, char *nm, size_t size)
 const char *tcp_state_name(unsigned int state, char *nm, size_t size)
 {
 	static const char *states[] = {
-		[TCP_ESTABLISHED]	= __stringify_1(TCP_ESTABLISHED),
-		[TCP_SYN_SENT]		= __stringify_1(TCP_SYN_SENT),
-		[TCP_SYN_RECV]		= __stringify_1(TCP_SYN_RECV),
-		[TCP_FIN_WAIT1]		= __stringify_1(TCP_FIN_WAIT1),
-		[TCP_FIN_WAIT2]		= __stringify_1(TCP_FIN_WAIT2),
-		[TCP_TIME_WAIT]		= __stringify_1(TCP_TIME_WAIT),
-		[TCP_CLOSE]		= __stringify_1(TCP_CLOSE),
-		[TCP_CLOSE_WAIT]	= __stringify_1(TCP_CLOSE_WAIT),
-		[TCP_LAST_ACK]		= __stringify_1(TCP_LAST_ACK),
-		[TCP_LISTEN]		= __stringify_1(TCP_LISTEN),
-		[TCP_CLOSING]		= __stringify_1(TCP_CLOSING),
+		[TCP_ESTABLISHED] = __stringify_1(TCP_ESTABLISHED),
+		[TCP_SYN_SENT] = __stringify_1(TCP_SYN_SENT),
+		[TCP_SYN_RECV] = __stringify_1(TCP_SYN_RECV),
+		[TCP_FIN_WAIT1] = __stringify_1(TCP_FIN_WAIT1),
+		[TCP_FIN_WAIT2] = __stringify_1(TCP_FIN_WAIT2),
+		[TCP_TIME_WAIT] = __stringify_1(TCP_TIME_WAIT),
+		[TCP_CLOSE] = __stringify_1(TCP_CLOSE),
+		[TCP_CLOSE_WAIT] = __stringify_1(TCP_CLOSE_WAIT),
+		[TCP_LAST_ACK] = __stringify_1(TCP_LAST_ACK),
+		[TCP_LISTEN] = __stringify_1(TCP_LISTEN),
+		[TCP_CLOSING] = __stringify_1(TCP_CLOSING),
 	};
 	return __socket_const_name(nm, size, states, ARRAY_SIZE(states), state);
 }
 
 struct sock_diag_greq {
-	u8	family;
-	u8	protocol;
+	u8 family;
+	u8 protocol;
 };
 
 struct sock_diag_req {
 	struct nlmsghdr hdr;
 	union {
-		struct unix_diag_req	u;
-		struct inet_diag_req_v2	i;
-		struct packet_diag_req	p;
+		struct unix_diag_req u;
+		struct inet_diag_req_v2 i;
+		struct packet_diag_req p;
 		struct netlink_diag_req n;
-		struct sock_diag_greq	g;
+		struct sock_diag_greq g;
 	} r;
 };
 
-enum socket_cl_bits
-{
+enum socket_cl_bits {
 	NETLINK_CL_BIT,
 	INET_TCP_CL_BIT,
 	INET_UDP_CL_BIT,
@@ -156,8 +143,7 @@ enum socket_cl_bits
 
 static DECLARE_BITMAP(socket_cl_bits, MAX_CL_BIT);
 
-static inline
-enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsigned int proto)
+static inline enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsigned int proto)
 {
 	if (family == AF_NETLINK)
 		return NETLINK_CL_BIT;
@@ -252,8 +238,8 @@ void preload_socket_modules(void)
 	pr_info("Probing sock diag modules\n");
 
 	memset(&req, 0, sizeof(req));
-	req.hdr.nlmsg_type	= SOCK_DIAG_BY_FAMILY;
-	req.hdr.nlmsg_seq	= CR_NLMSG_SEQ;
+	req.hdr.nlmsg_type = SOCK_DIAG_BY_FAMILY;
+	req.hdr.nlmsg_seq = CR_NLMSG_SEQ;
 
 	/*
 	 * Probe UNIX, netlink and packet diag-s by feeding
@@ -346,10 +332,7 @@ static void encode_filter(struct sock_filter *f, u64 *img, int n)
 	BUILD_BUG_ON(sizeof(*f) != sizeof(*img));
 
 	for (i = 0; i < n; i++)
-		img[i] = ((u64)f[i].code << 48) |
-			 ((u64)f[i].jt << 40) |
-			 ((u64)f[i].jf << 32) |
-			 ((u64)f[i].k << 0);
+		img[i] = ((u64)f[i].code << 48) | ((u64)f[i].jt << 40) | ((u64)f[i].jf << 32) | ((u64)f[i].k << 0);
 }
 
 static void decode_filter(u64 *img, struct sock_filter *f, int n)
@@ -446,12 +429,10 @@ struct socket_desc *lookup_socket_ino(unsigned int ino, int family)
 	return NULL;
 }
 
-
 struct socket_desc *lookup_socket(unsigned int ino, int family, int proto)
 {
 	if (!socket_test_collect_bit(family, proto)) {
-		pr_err("Sockets (family %d proto %d) are not collected\n",
-		       family, proto);
+		pr_err("Sockets (family %d proto %d) are not collected\n", family, proto);
 		return ERR_PTR(-EINVAL);
 	}
 
@@ -462,10 +443,10 @@ int sk_collect_one(unsigned ino, int family, struct socket_desc *d, struct ns_id
 {
 	struct socket_desc **chain;
 
-	d->ino		= ino;
-	d->family	= family;
+	d->ino = ino;
+	d->family = family;
 	d->already_dumped = 0;
-	d->sk_ns	= ns;
+	d->sk_ns = ns;
 
 	chain = &sockets[ino % SK_HASH_SIZE];
 	d->next = *chain;
@@ -517,7 +498,7 @@ int restore_prepare_socket(int sk)
 		pr_perror("Unable to get flags for %d", sk);
 		return -1;
 	}
-	if (fcntl(sk, F_SETFL, flags | O_NONBLOCK) ) {
+	if (fcntl(sk, F_SETFL, flags | O_NONBLOCK)) {
 		pr_perror("Unable to set O_NONBLOCK for %d", sk);
 		return -1;
 	}
@@ -531,7 +512,7 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 	struct timeval tv;
 	struct linger so_linger;
 	/* In kernel a bufsize value is doubled. */
-	u32 bufs[2] = { soe->so_sndbuf / 2, soe->so_rcvbuf / 2};
+	u32 bufs[2] = { soe->so_sndbuf / 2, soe->so_rcvbuf / 2 };
 
 	pr_info("%d restore sndbuf %d rcv buf %d\n", sk, soe->so_sndbuf, soe->so_rcvbuf);
 
@@ -623,8 +604,7 @@ int do_dump_opt(int sk, int level, int name, void *val, int len)
 	}
 
 	if (aux != len) {
-		pr_err("Len mismatch on %d:%d : %d, want %d\n",
-				level, name, aux, len);
+		pr_err("Len mismatch on %d:%d : %d, want %d\n", level, name, aux, len);
 		return -1;
 	}
 
@@ -635,7 +615,7 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 {
 	int ret = 0, val;
 	struct timeval tv;
-	struct linger so_linger = {0, 0};
+	struct linger so_linger = { 0, 0 };
 
 	ret |= dump_opt(sk, SOL_SOCKET, SO_SNDBUF, &soe->so_sndbuf);
 	ret |= dump_opt(sk, SOL_SOCKET, SO_RCVBUF, &soe->so_rcvbuf);
@@ -768,9 +748,8 @@ static int inet_receive_one(struct nlmsghdr *h, struct ns_id *ns, void *arg)
 }
 
 static int do_collect_req(int nl, struct sock_diag_req *req, int size,
-		int (*receive_callback)(struct nlmsghdr *h, struct ns_id *ns, void *),
-		int (*error_callback)(int err, struct ns_id *ns, void *),
-		struct ns_id *ns, void *arg)
+			  int (*receive_callback)(struct nlmsghdr *h, struct ns_id *ns, void *),
+			  int (*error_callback)(int err, struct ns_id *ns, void *), struct ns_id *ns, void *arg)
 {
 	int tmp = do_rtnl_req(nl, req, size, receive_callback, error_callback, ns, arg);
 	if (tmp == 0)
@@ -784,8 +763,7 @@ static int collect_err(int err, struct ns_id *ns, void *arg)
 	char family[32], proto[32];
 	char msg[256];
 
-	snprintf(msg, sizeof(msg),
-		 "Sockects collect procedure family %s proto %s",
+	snprintf(msg, sizeof(msg), "Sockects collect procedure family %s proto %s",
 		 socket_family_name(gr->family, family, sizeof(family)),
 		 socket_proto_name(gr->protocol, proto, sizeof(proto)));
 
@@ -816,9 +794,7 @@ static int collect_err(int err, struct ns_id *ns, void *arg)
 	 * may return EINVAL on older kernels.
 	 */
 	if (err == -EINVAL) {
-		if (gr->family == AF_UNIX ||
-		    gr->family == AF_PACKET ||
-		    gr->family == AF_NETLINK) {
+		if (gr->family == AF_UNIX || gr->family == AF_PACKET || gr->family == AF_NETLINK) {
 			pr_debug("%s: %d\n", msg, err);
 			return -EINVAL;
 		}
@@ -843,112 +819,107 @@ int collect_sockets(struct ns_id *ns)
 	struct sock_diag_req req;
 
 	memset(&req, 0, sizeof(req));
-	req.hdr.nlmsg_len	= sizeof(req);
-	req.hdr.nlmsg_type	= SOCK_DIAG_BY_FAMILY;
-	req.hdr.nlmsg_flags	= NLM_F_DUMP | NLM_F_REQUEST;
-	req.hdr.nlmsg_seq	= CR_NLMSG_SEQ;
+	req.hdr.nlmsg_len = sizeof(req);
+	req.hdr.nlmsg_type = SOCK_DIAG_BY_FAMILY;
+	req.hdr.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST;
+	req.hdr.nlmsg_seq = CR_NLMSG_SEQ;
 
 	/* Collect UNIX sockets */
-	req.r.u.sdiag_family	= AF_UNIX;
-	req.r.u.udiag_states	= -1; /* All */
-	req.r.u.udiag_show	= UDIAG_SHOW_NAME | UDIAG_SHOW_VFS |
-				  UDIAG_SHOW_PEER | UDIAG_SHOW_ICONS |
-				  UDIAG_SHOW_RQLEN;
+	req.r.u.sdiag_family = AF_UNIX;
+	req.r.u.udiag_states = -1; /* All */
+	req.r.u.udiag_show = UDIAG_SHOW_NAME | UDIAG_SHOW_VFS | UDIAG_SHOW_PEER | UDIAG_SHOW_ICONS | UDIAG_SHOW_RQLEN;
 	tmp = do_collect_req(nl, &req, sizeof(req), unix_receive_one, collect_err, ns, &req.r.u);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv4 TCP sockets */
-	req.r.i.sdiag_family	= AF_INET;
-	req.r.i.sdiag_protocol	= IPPROTO_TCP;
-	req.r.i.idiag_ext	= 0;
+	req.r.i.sdiag_family = AF_INET;
+	req.r.i.sdiag_protocol = IPPROTO_TCP;
+	req.r.i.idiag_ext = 0;
 	/* Only listening and established sockets supported yet */
-	req.r.i.idiag_states	= (1 << TCP_LISTEN) | (1 << TCP_ESTABLISHED) |
-					(1 << TCP_FIN_WAIT1) | (1 << TCP_FIN_WAIT2) |
-					(1 << TCP_CLOSE_WAIT) | (1 << TCP_LAST_ACK) |
-					(1 << TCP_CLOSING) | (1 << TCP_SYN_SENT);
+	req.r.i.idiag_states = (1 << TCP_LISTEN) | (1 << TCP_ESTABLISHED) | (1 << TCP_FIN_WAIT1) |
+			       (1 << TCP_FIN_WAIT2) | (1 << TCP_CLOSE_WAIT) | (1 << TCP_LAST_ACK) | (1 << TCP_CLOSING) |
+			       (1 << TCP_SYN_SENT);
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv4 UDP sockets */
-	req.r.i.sdiag_family	= AF_INET;
-	req.r.i.sdiag_protocol	= IPPROTO_UDP;
-	req.r.i.idiag_ext	= 0;
-	req.r.i.idiag_states	= -1; /* All */
+	req.r.i.sdiag_family = AF_INET;
+	req.r.i.sdiag_protocol = IPPROTO_UDP;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv4 UDP-lite sockets */
-	req.r.i.sdiag_family	= AF_INET;
-	req.r.i.sdiag_protocol	= IPPROTO_UDPLITE;
-	req.r.i.idiag_ext	= 0;
-	req.r.i.idiag_states	= -1; /* All */
+	req.r.i.sdiag_family = AF_INET;
+	req.r.i.sdiag_protocol = IPPROTO_UDPLITE;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv4 RAW sockets */
-	req.r.i.sdiag_family	= AF_INET;
-	req.r.i.sdiag_protocol	= IPPROTO_RAW;
-	req.r.i.idiag_ext	= 0;
-	req.r.i.idiag_states	= -1; /* All */
+	req.r.i.sdiag_family = AF_INET;
+	req.r.i.sdiag_protocol = IPPROTO_RAW;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv6 TCP sockets */
-	req.r.i.sdiag_family	= AF_INET6;
-	req.r.i.sdiag_protocol	= IPPROTO_TCP;
-	req.r.i.idiag_ext	= 0;
+	req.r.i.sdiag_family = AF_INET6;
+	req.r.i.sdiag_protocol = IPPROTO_TCP;
+	req.r.i.idiag_ext = 0;
 	/* Only listening sockets supported yet */
-	req.r.i.idiag_states	= (1 << TCP_LISTEN) | (1 << TCP_ESTABLISHED) |
-					(1 << TCP_FIN_WAIT1) | (1 << TCP_FIN_WAIT2) |
-					(1 << TCP_CLOSE_WAIT) | (1 << TCP_LAST_ACK) |
-					(1 << TCP_CLOSING) | (1 << TCP_SYN_SENT);
+	req.r.i.idiag_states = (1 << TCP_LISTEN) | (1 << TCP_ESTABLISHED) | (1 << TCP_FIN_WAIT1) |
+			       (1 << TCP_FIN_WAIT2) | (1 << TCP_CLOSE_WAIT) | (1 << TCP_LAST_ACK) | (1 << TCP_CLOSING) |
+			       (1 << TCP_SYN_SENT);
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv6 UDP sockets */
-	req.r.i.sdiag_family	= AF_INET6;
-	req.r.i.sdiag_protocol	= IPPROTO_UDP;
-	req.r.i.idiag_ext	= 0;
-	req.r.i.idiag_states	= -1; /* All */
+	req.r.i.sdiag_family = AF_INET6;
+	req.r.i.sdiag_protocol = IPPROTO_UDP;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv6 UDP-lite sockets */
-	req.r.i.sdiag_family	= AF_INET6;
-	req.r.i.sdiag_protocol	= IPPROTO_UDPLITE;
-	req.r.i.idiag_ext	= 0;
-	req.r.i.idiag_states	= -1; /* All */
+	req.r.i.sdiag_family = AF_INET6;
+	req.r.i.sdiag_protocol = IPPROTO_UDPLITE;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
 	/* Collect IPv6 RAW sockets */
-	req.r.i.sdiag_family	= AF_INET6;
-	req.r.i.sdiag_protocol	= IPPROTO_RAW;
-	req.r.i.idiag_ext	= 0;
-	req.r.i.idiag_states	= -1; /* All */
+	req.r.i.sdiag_family = AF_INET6;
+	req.r.i.sdiag_protocol = IPPROTO_RAW;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
 	tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, collect_err, ns, &req.r.i);
 	if (tmp)
 		err = tmp;
 
-	req.r.p.sdiag_family	= AF_PACKET;
-	req.r.p.sdiag_protocol	= 0;
-	req.r.p.pdiag_show	= PACKET_SHOW_INFO | PACKET_SHOW_MCLIST |
-					PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG;
+	req.r.p.sdiag_family = AF_PACKET;
+	req.r.p.sdiag_protocol = 0;
+	req.r.p.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MCLIST | PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG;
 	tmp = do_collect_req(nl, &req, sizeof(req), packet_receive_one, collect_err, ns, &req.r.p);
 	if (tmp)
 		err = tmp;
 
-	req.r.n.sdiag_family	= AF_NETLINK;
-	req.r.n.sdiag_protocol	= NDIAG_PROTO_ALL;
-	req.r.n.ndiag_show	= NDIAG_SHOW_GROUPS;
+	req.r.n.sdiag_family = AF_NETLINK;
+	req.r.n.sdiag_protocol = NDIAG_PROTO_ALL;
+	req.r.n.ndiag_show = NDIAG_SHOW_GROUPS;
 	tmp = do_collect_req(nl, &req, sizeof(req), netlink_receive_one, collect_err, ns, &req.r.n);
 	if (tmp)
 		err = tmp;
diff --git a/criu/stats.c b/criu/stats.c
index ed5a19141..0a9b4f5d4 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -17,13 +17,13 @@ struct timing {
 };
 
 struct dump_stats {
-	struct timing	timings[DUMP_TIME_NR_STATS];
-	unsigned long	counts[DUMP_CNT_NR_STATS];
+	struct timing timings[DUMP_TIME_NR_STATS];
+	unsigned long counts[DUMP_CNT_NR_STATS];
 };
 
 struct restore_stats {
-	struct timing	timings[RESTORE_TIME_NS_STATS];
-	atomic_t	counts[RESTORE_CNT_NR_STATS];
+	struct timing timings[RESTORE_TIME_NS_STATS];
+	atomic_t counts[RESTORE_CNT_NR_STATS];
 };
 
 struct dump_stats *dstats;
@@ -53,8 +53,7 @@ void cnt_sub(int c, unsigned long val)
 		BUG();
 }
 
-static void timeval_accumulate(const struct timeval *from, const struct timeval *to,
-		struct timeval *res)
+static void timeval_accumulate(const struct timeval *from, const struct timeval *to, struct timeval *res)
 {
 	suseconds_t usec;
 
@@ -130,23 +129,22 @@ static void display_stats(int what, StatsEntry *stats)
 		if (stats->dump->has_irmap_resolve)
 			pr_msg("IRMAP resolve time: %d us\n", stats->dump->irmap_resolve);
 		pr_msg("Memory pages scanned: %" PRIu64 " (0x%" PRIx64 ")\n", stats->dump->pages_scanned,
-				stats->dump->pages_scanned);
+		       stats->dump->pages_scanned);
 		pr_msg("Memory pages skipped from parent: %" PRIu64 " (0x%" PRIx64 ")\n",
-				stats->dump->pages_skipped_parent,
-				stats->dump->pages_skipped_parent);
+		       stats->dump->pages_skipped_parent, stats->dump->pages_skipped_parent);
 		pr_msg("Memory pages written: %" PRIu64 " (0x%" PRIx64 ")\n", stats->dump->pages_written,
-				stats->dump->pages_written);
+		       stats->dump->pages_written);
 		pr_msg("Lazy memory pages: %" PRIu64 " (0x%" PRIx64 ")\n", stats->dump->pages_lazy,
-				stats->dump->pages_lazy);
+		       stats->dump->pages_lazy);
 	} else if (what == RESTORE_STATS) {
 		pr_msg("Displaying restore stats:\n");
 		pr_msg("Pages compared: %" PRIu64 " (0x%" PRIx64 ")\n", stats->restore->pages_compared,
-				stats->restore->pages_compared);
+		       stats->restore->pages_compared);
 		pr_msg("Pages skipped COW: %" PRIu64 " (0x%" PRIx64 ")\n", stats->restore->pages_skipped_cow,
-				stats->restore->pages_skipped_cow);
+		       stats->restore->pages_skipped_cow);
 		if (stats->restore->has_pages_restored)
 			pr_msg("Pages restored: %" PRIu64 " (0x%" PRIx64 ")\n", stats->restore->pages_restored,
-					stats->restore->pages_restored);
+			       stats->restore->pages_restored);
 		pr_msg("Restore time: %d us\n", stats->restore->restore_time);
 		pr_msg("Forking time: %d us\n", stats->restore->forking_time);
 	} else
diff --git a/criu/string.c b/criu/string.c
index 543c64291..7df0b3e09 100644
--- a/criu/string.c
+++ b/criu/string.c
@@ -52,7 +52,7 @@ size_t strlcat(char *dest, const char *src, size_t count)
 	dest += dsize;
 	count -= dsize;
 	if (len >= count)
-		len = count-1;
+		len = count - 1;
 	memcpy(dest, src, len);
 	dest[len] = 0;
 	return res;
diff --git a/criu/sysctl.c b/criu/sysctl.c
index e48476560..b06688712 100644
--- a/criu/sysctl.c
+++ b/criu/sysctl.c
@@ -16,105 +16,92 @@
 #define KNOWN_NS_MASK (CLONE_NEWUTS | CLONE_NEWNET | CLONE_NEWIPC)
 
 struct sysctl_userns_req {
-	int			op;
-	unsigned int		ns;
-	size_t			nr_req;
-	struct sysctl_req	*reqs;
+	int op;
+	unsigned int ns;
+	size_t nr_req;
+	struct sysctl_req *reqs;
 };
 
-#define __SYSCTL_OP(__ret, __fd, __req, __type, __nr, __op)		\
-do {									\
-	if (__op == CTL_READ)						\
-		__ret = sysctl_read_##__type(__fd, __req,		\
-					     (__type *)(__req)->arg,	\
-					     __nr);			\
-	else if (__op == CTL_WRITE)					\
-		__ret = sysctl_write_##__type(__fd, __req,		\
-					      (__type *)(__req)->arg,	\
-					      __nr);			\
-	else								\
-		__ret = -1;						\
-} while (0)
+#define __SYSCTL_OP(__ret, __fd, __req, __type, __nr, __op)                                       \
+	do {                                                                                      \
+		if (__op == CTL_READ)                                                             \
+			__ret = sysctl_read_##__type(__fd, __req, (__type *)(__req)->arg, __nr);  \
+		else if (__op == CTL_WRITE)                                                       \
+			__ret = sysctl_write_##__type(__fd, __req, (__type *)(__req)->arg, __nr); \
+		else                                                                              \
+			__ret = -1;                                                               \
+	} while (0)
 
-#define GEN_SYSCTL_READ_FUNC(__type, __conv)				\
-static int sysctl_read_##__type(int fd,					\
-				struct sysctl_req *req,			\
-				__type *arg,				\
-				int nr)					\
-{									\
-	char buf[1024] = {0};						\
-	int i, ret = -1;						\
-	char *p = buf;							\
-									\
-	ret = read(fd, buf, sizeof(buf));				\
-	if (ret < 0) {							\
-		pr_perror("Can't read %s", req->name);			\
-		ret = -1;						\
-		goto err;						\
-	}								\
-									\
-	for (i = 0; i < nr && p < buf + sizeof(buf); p++, i++)		\
-		((__type *)arg)[i] = __conv(p, &p, 10);			\
-									\
-	if (i != nr) {							\
-		pr_err("Not enough params for %s (%d != %d)\n",		\
-			req->name, i, nr);				\
-		goto err;						\
-	}								\
-									\
-	ret = 0;							\
-									\
-err:									\
-	return ret;							\
-}
+#define GEN_SYSCTL_READ_FUNC(__type, __conv)                                                 \
+	static int sysctl_read_##__type(int fd, struct sysctl_req *req, __type *arg, int nr) \
+	{                                                                                    \
+		char buf[1024] = { 0 };                                                      \
+		int i, ret = -1;                                                             \
+		char *p = buf;                                                               \
+                                                                                             \
+		ret = read(fd, buf, sizeof(buf));                                            \
+		if (ret < 0) {                                                               \
+			pr_perror("Can't read %s", req->name);                               \
+			ret = -1;                                                            \
+			goto err;                                                            \
+		}                                                                            \
+                                                                                             \
+		for (i = 0; i < nr && p < buf + sizeof(buf); p++, i++)                       \
+			((__type *)arg)[i] = __conv(p, &p, 10);                              \
+                                                                                             \
+		if (i != nr) {                                                               \
+			pr_err("Not enough params for %s (%d != %d)\n", req->name, i, nr);   \
+			goto err;                                                            \
+		}                                                                            \
+                                                                                             \
+		ret = 0;                                                                     \
+                                                                                             \
+	err:                                                                                 \
+		return ret;                                                                  \
+	}
 
-#define GEN_SYSCTL_WRITE_FUNC(__type, __fmt)				\
-static int sysctl_write_##__type(int fd,				\
-				 struct sysctl_req *req,		\
-				 __type *arg,				\
-				 int nr)				\
-{									\
-	char buf[1024];							\
-	int i, ret = -1;						\
-	int off = 0;							\
-									\
-	for (i = 0; i < nr && off < sizeof(buf) - 1; i++) {		\
-		snprintf(&buf[off], sizeof(buf) - off, __fmt, arg[i]);	\
-		off += strlen(&buf[off]);				\
-	}								\
-									\
-	if (i != nr) {							\
-		pr_err("Not enough space for %s (%d != %d)\n",		\
-			req->name, i, nr);				\
-		goto err;						\
-	}								\
-									\
-	/* trailing spaces in format */					\
-	while (off > 0 && isspace(buf[off - 1]))			\
-		off--;							\
-	buf[off + 0] = '\n';						\
-	ret = write(fd, buf, off + 1);					\
-	if (ret < 0) {							\
-		pr_perror("Can't write %s", req->name);			\
-		ret = -1;						\
-		goto err;						\
-	}								\
-									\
-	ret = 0;							\
-err:									\
-	return ret;							\
-}
+#define GEN_SYSCTL_WRITE_FUNC(__type, __fmt)                                                  \
+	static int sysctl_write_##__type(int fd, struct sysctl_req *req, __type *arg, int nr) \
+	{                                                                                     \
+		char buf[1024];                                                               \
+		int i, ret = -1;                                                              \
+		int off = 0;                                                                  \
+                                                                                              \
+		for (i = 0; i < nr && off < sizeof(buf) - 1; i++) {                           \
+			snprintf(&buf[off], sizeof(buf) - off, __fmt, arg[i]);                \
+			off += strlen(&buf[off]);                                             \
+		}                                                                             \
+                                                                                              \
+		if (i != nr) {                                                                \
+			pr_err("Not enough space for %s (%d != %d)\n", req->name, i, nr);     \
+			goto err;                                                             \
+		}                                                                             \
+                                                                                              \
+		/* trailing spaces in format */                                               \
+		while (off > 0 && isspace(buf[off - 1]))                                      \
+			off--;                                                                \
+		buf[off + 0] = '\n';                                                          \
+		ret = write(fd, buf, off + 1);                                                \
+		if (ret < 0) {                                                                \
+			pr_perror("Can't write %s", req->name);                               \
+			ret = -1;                                                             \
+			goto err;                                                             \
+		}                                                                             \
+                                                                                              \
+		ret = 0;                                                                      \
+	err:                                                                                  \
+		return ret;                                                                   \
+	}
 
 GEN_SYSCTL_READ_FUNC(u32, strtoul);
 GEN_SYSCTL_READ_FUNC(u64, strtoull);
 GEN_SYSCTL_READ_FUNC(s32, strtol);
 
 GEN_SYSCTL_WRITE_FUNC(u32, "%u ");
-GEN_SYSCTL_WRITE_FUNC(u64, "%"PRIu64" ");
+GEN_SYSCTL_WRITE_FUNC(u64, "%" PRIu64 " ");
 GEN_SYSCTL_WRITE_FUNC(s32, "%d ");
 
-static int
-sysctl_write_char(int fd, struct sysctl_req *req, char *arg, int nr)
+static int sysctl_write_char(int fd, struct sysctl_req *req, char *arg, int nr)
 {
 	pr_debug("%s nr %d\n", req->name, nr);
 	if (dprintf(fd, "%s\n", arg) < 0)
@@ -123,19 +110,18 @@ sysctl_write_char(int fd, struct sysctl_req *req, char *arg, int nr)
 	return 0;
 }
 
-static int
-sysctl_read_char(int fd, struct sysctl_req *req, char *arg, int nr)
+static int sysctl_read_char(int fd, struct sysctl_req *req, char *arg, int nr)
 {
 	int ret = -1;
 
 	pr_debug("%s nr %d\n", req->name, nr);
 	ret = read(fd, arg, nr - 1);
 	if (ret < 0) {
-		if (errno != EIO ||  !(req->flags & CTL_FLAGS_READ_EIO_SKIP))
+		if (errno != EIO || !(req->flags & CTL_FLAGS_READ_EIO_SKIP))
 			pr_perror("Can't read %s", req->name);
 		goto err;
 	}
-	arg[ret]='\0';
+	arg[ret] = '\0';
 	ret = 0;
 
 err:
@@ -144,7 +130,7 @@ err:
 
 static int sysctl_userns_arg_size(int type)
 {
-	switch(CTL_TYPE(type)) {
+	switch (CTL_TYPE(type)) {
 	case __CTL_U32A:
 		return sizeof(u32) * CTL_LEN(type);
 	case CTL_U32:
@@ -204,7 +190,7 @@ static int __userns_sysctl_op(void *arg, int proc_fd, pid_t pid)
 	pid_t worker;
 
 	// fix up the pointer
-	req = userns_req->reqs = (struct sysctl_req *) &userns_req[1];
+	req = userns_req->reqs = (struct sysctl_req *)&userns_req[1];
 
 	/* For files in the IPC/UTS namespaces, restoring is more complicated
 	 * than for net. Unprivileged users cannot even open these files, so
@@ -234,17 +220,17 @@ static int __userns_sysctl_op(void *arg, int proc_fd, pid_t pid)
 
 	memset(fds, -1, sizeof(int) * userns_req->nr_req);
 
-	for (i = 0; i < userns_req->nr_req; i++)  {
+	for (i = 0; i < userns_req->nr_req; i++) {
 		int arg_len = sysctl_userns_arg_size(req->type);
-		int name_len = strlen((char *) &req[1]) + 1;
+		int name_len = strlen((char *)&req[1]) + 1;
 		int total_len = sizeof(*req) + arg_len + name_len;
 		int flags;
 
 		/* fix up the pointers */
-		req->name = (char *) &req[1];
+		req->name = (char *)&req[1];
 		req->arg = req->name + name_len;
 
-		if (((char *) req) + total_len >= ((char *) userns_req) + MAX_UNSFD_MSG_SIZE) {
+		if (((char *)req) + total_len >= ((char *)userns_req) + MAX_UNSFD_MSG_SIZE) {
 			pr_err("bad sysctl req %s, too big: %d\n", req->name, total_len);
 			goto out;
 		}
@@ -268,7 +254,7 @@ static int __userns_sysctl_op(void *arg, int proc_fd, pid_t pid)
 		reqs[i] = req;
 		fds[i] = fd;
 
-		req = (struct sysctl_req *) (((char *) req) + total_len);
+		req = (struct sysctl_req *)(((char *)req) + total_len);
 	}
 
 	/*
@@ -436,7 +422,7 @@ int sysctl_op(struct sysctl_req *req, size_t nr_req, int op, unsigned int ns)
 	userns_req->op = op;
 	userns_req->nr_req = nr_req;
 	userns_req->ns = ns;
-	userns_req->reqs = (struct sysctl_req *) (&userns_req[1]);
+	userns_req->reqs = (struct sysctl_req *)(&userns_req[1]);
 
 	cur = userns_req->reqs;
 	for (i = 0; i < nr_req; i++) {
@@ -444,7 +430,7 @@ int sysctl_op(struct sysctl_req *req, size_t nr_req, int op, unsigned int ns)
 		int name_len = strlen(req[i].name) + 1;
 		int total_len = sizeof(*cur) + arg_len + name_len;
 
-		if (((char *) cur) + total_len >= ((char *) userns_req) + MAX_UNSFD_MSG_SIZE) {
+		if (((char *)cur) + total_len >= ((char *)userns_req) + MAX_UNSFD_MSG_SIZE) {
 			pr_err("sysctl msg %s too big: %d\n", req[i].name, total_len);
 			return -1;
 		}
@@ -453,13 +439,13 @@ int sysctl_op(struct sysctl_req *req, size_t nr_req, int op, unsigned int ns)
 		cur->type = req[i].type;
 		cur->flags = req[i].flags;
 
-		cur->name = (char *) &cur[1];
+		cur->name = (char *)&cur[1];
 		strcpy(cur->name, req[i].name);
 
 		cur->arg = cur->name + name_len;
 		memcpy(cur->arg, req[i].arg, arg_len);
 
-		cur = (struct sysctl_req *) (((char *) cur) + total_len);
+		cur = (struct sysctl_req *)(((char *)cur) + total_len);
 	}
 
 	fd = open_proc(PROC_SELF, "ns");
diff --git a/criu/sysfs_parse.c b/criu/sysfs_parse.c
index 922e5d41d..6cd765613 100644
--- a/criu/sysfs_parse.c
+++ b/criu/sysfs_parse.c
@@ -67,7 +67,7 @@ static int parse_aufs_sbinfo(struct mount_info *mi, char *sbinfo, int len)
 	}
 
 	/* all ok, copy */
-	if (len < 4) {		/* 4 for "si_" */
+	if (len < 4) { /* 4 for "si_" */
 		pr_err("Buffer of %d bytes too small for sbinfo\n", len);
 		return -1;
 	}
@@ -109,7 +109,7 @@ static int fixup_aufs_path(char *path, int size)
 	}
 
 	if (aufs_branches[n] == NULL)
-		return 0;	/* not in a branch */
+		return 0; /* not in a branch */
 
 	n = snprintf(rpath, PATH_MAX, "%s", &path[blen]);
 	if (n >= min(PATH_MAX, size)) {
@@ -160,7 +160,7 @@ int parse_aufs_branches(struct mount_info *mi)
 	if (aufs_nsid)
 		free_aufs_branches();
 
-	strcpy(path, SYSFS_AUFS);	/* /sys/fs/aufs/ */
+	strcpy(path, SYSFS_AUFS); /* /sys/fs/aufs/ */
 	if (parse_aufs_sbinfo(mi, &path[sizeof SYSFS_AUFS - 1], SBINFO_LEN) < 0)
 		return -1;
 	if ((dp = opendir(path)) == NULL) {
@@ -205,7 +205,7 @@ int parse_aufs_branches(struct mount_info *mi)
 	 * Allocate an array of pointers to branch pathnames to be read.
 	 * Branches are indexed from 0 and we need a NULL pointer at the end.
 	 */
-	aufs_branches = xzalloc((br_max + 2) * sizeof (char *));
+	aufs_branches = xzalloc((br_max + 2) * sizeof(char *));
 	if (!aufs_branches)
 		return -1;
 
@@ -227,8 +227,7 @@ int parse_aufs_branches(struct mount_info *mi)
 			goto err;
 		}
 
-		if (fscanf(fp, "%ms=", &aufs_branches[br_num]) != 1 ||
-		    aufs_branches[br_num] == NULL) {
+		if (fscanf(fp, "%ms=", &aufs_branches[br_num]) != 1 || aufs_branches[br_num] == NULL) {
 			pr_perror("Parse error reading %s", path);
 			goto err;
 		}
@@ -300,8 +299,7 @@ int fixup_aufs_vma_fd(struct vma_area *vma, int vm_file_fd)
 	pr_debug("Saved AUFS paths %s and %s\n", vma->aufs_rpath, vma->aufs_fpath);
 
 	if (stat(vma->aufs_fpath, vma->vmst) < 0) {
-		pr_perror("Failed stat on map %"PRIx64" (%s)",
-				vma->e->start, vma->aufs_fpath);
+		pr_perror("Failed stat on map %" PRIx64 " (%s)", vma->e->start, vma->aufs_fpath);
 		return -1;
 	}
 
diff --git a/criu/timens.c b/criu/timens.c
index f81808abf..5803fc359 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -38,17 +38,16 @@ int dump_time_ns(int ns_id)
 
 static void normalize_timespec(struct timespec *ts)
 {
-        while (ts->tv_nsec >= NSEC_PER_SEC) {
-                ts->tv_nsec -= NSEC_PER_SEC;
-                ++ts->tv_sec;
-        }
-        while (ts->tv_nsec < 0) {
-                ts->tv_nsec += NSEC_PER_SEC;
-                --ts->tv_sec;
-        }
+	while (ts->tv_nsec >= NSEC_PER_SEC) {
+		ts->tv_nsec -= NSEC_PER_SEC;
+		++ts->tv_sec;
+	}
+	while (ts->tv_nsec < 0) {
+		ts->tv_nsec += NSEC_PER_SEC;
+		--ts->tv_sec;
+	}
 }
 
-
 int prepare_timens(int id)
 {
 	int exit_code = -1;
@@ -86,32 +85,30 @@ int prepare_timens(int id)
 		goto err;
 
 	clock_gettime(CLOCK_MONOTONIC, &ts);
-	ts.tv_sec  = ts.tv_sec  - prev_moff.tv_sec;
+	ts.tv_sec = ts.tv_sec - prev_moff.tv_sec;
 	ts.tv_nsec = ts.tv_nsec - prev_moff.tv_nsec;
 
-	ts.tv_sec  = te->monotonic->tv_sec  - ts.tv_sec;
+	ts.tv_sec = te->monotonic->tv_sec - ts.tv_sec;
 	ts.tv_nsec = te->monotonic->tv_nsec - ts.tv_nsec;
 	normalize_timespec(&ts);
 
 	pr_debug("timens: monotonic %ld %ld\n", ts.tv_sec, ts.tv_nsec);
-	if (dprintf(fd, "%d %ld %ld\n",
-		    CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec) < 0) {
+	if (dprintf(fd, "%d %ld %ld\n", CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec) < 0) {
 		pr_perror("Unable to set a monotonic clock offset");
 		goto err;
 	}
 
 	clock_gettime(CLOCK_BOOTTIME, &ts);
 
-	ts.tv_sec  = ts.tv_sec  - prev_boff.tv_sec;
+	ts.tv_sec = ts.tv_sec - prev_boff.tv_sec;
 	ts.tv_nsec = ts.tv_nsec - prev_boff.tv_nsec;
 
-	ts.tv_sec  = te->boottime->tv_sec  - ts.tv_sec;
+	ts.tv_sec = te->boottime->tv_sec - ts.tv_sec;
 	ts.tv_nsec = te->boottime->tv_nsec - ts.tv_nsec;
 	normalize_timespec(&ts);
 
 	pr_debug("timens: boottime %ld %ld\n", ts.tv_sec, ts.tv_nsec);
-	if (dprintf(fd, "%d %ld %ld\n",
-		    CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec) < 0) {
+	if (dprintf(fd, "%d %ld %ld\n", CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec) < 0) {
 		pr_perror("Unable to set a boottime clock offset");
 		goto err;
 	}
@@ -132,5 +129,4 @@ err:
 	return exit_code;
 }
 struct ns_desc time_ns_desc = NS_DESC_ENTRY(CLONE_NEWTIME, "time");
-struct ns_desc time_for_children_ns_desc =
-			NS_DESC_ENTRY(CLONE_NEWTIME, "time_for_children");
+struct ns_desc time_for_children_ns_desc = NS_DESC_ENTRY(CLONE_NEWTIME, "time_for_children");
diff --git a/criu/timerfd.c b/criu/timerfd.c
index b5ee5d8d7..6d637e987 100644
--- a/criu/timerfd.c
+++ b/criu/timerfd.c
@@ -20,19 +20,19 @@
 #include "log.h"
 #include "common/bug.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "timerfd: "
 
 struct timerfd_dump_arg {
-	u32			id;
-	const struct fd_parms	*p;
+	u32 id;
+	const struct fd_parms *p;
 };
 
 struct timerfd_info {
-	TimerfdEntry		*tfe;
-	struct file_desc	d;
-	int			t_fd;
-	struct list_head	rlist;
+	TimerfdEntry *tfe;
+	struct file_desc d;
+	int t_fd;
+	struct list_head rlist;
 };
 
 static LIST_HEAD(rst_timerfds);
@@ -75,9 +75,9 @@ static int dump_one_timerfd(int lfd, u32 id, const struct fd_parms *p)
 	tfe.id = id;
 	tfe.flags = p->flags;
 	tfe.fown = (FownEntry *)&p->fown;
-	pr_info("Dumping id %#x clockid %d it_value(%llu, %llu) it_interval(%llu, %llu)\n",
-		tfe.id, tfe.clockid, (unsigned long long)tfe.vsec, (unsigned long long)tfe.vnsec,
-		(unsigned long long)tfe.isec, (unsigned long long)tfe.insec);
+	pr_info("Dumping id %#x clockid %d it_value(%llu, %llu) it_interval(%llu, %llu)\n", tfe.id, tfe.clockid,
+		(unsigned long long)tfe.vsec, (unsigned long long)tfe.vnsec, (unsigned long long)tfe.isec,
+		(unsigned long long)tfe.insec);
 
 	fe.type = FD_TYPES__TIMERFD;
 	fe.id = tfe.id;
@@ -87,8 +87,8 @@ static int dump_one_timerfd(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops timerfd_dump_ops = {
-	.type		= FD_TYPES__TIMERFD,
-	.dump		= dump_one_timerfd,
+	.type = FD_TYPES__TIMERFD,
+	.dump = dump_one_timerfd,
 };
 
 int prepare_timerfds(struct task_restore_args *ta)
@@ -106,15 +106,15 @@ int prepare_timerfds(struct task_restore_args *ta)
 		if (!t)
 			return -1;
 
-		t->id				= tfe->id;
-		t->fd				= ti->t_fd;
-		t->clockid			= tfe->clockid;
-		t->ticks			= (unsigned long)tfe->ticks;
-		t->settime_flags		= tfe->settime_flags;
-		t->val.it_interval.tv_sec	= (time_t)tfe->isec;
-		t->val.it_interval.tv_nsec	= (long)tfe->insec;
-		t->val.it_value.tv_sec		= (time_t)tfe->vsec;
-		t->val.it_value.tv_nsec		= (long)tfe->vnsec;
+		t->id = tfe->id;
+		t->fd = ti->t_fd;
+		t->clockid = tfe->clockid;
+		t->ticks = (unsigned long)tfe->ticks;
+		t->settime_flags = tfe->settime_flags;
+		t->val.it_interval.tv_sec = (time_t)tfe->isec;
+		t->val.it_interval.tv_nsec = (long)tfe->insec;
+		t->val.it_value.tv_sec = (time_t)tfe->vsec;
+		t->val.it_value.tv_nsec = (long)tfe->vnsec;
 
 		ta->timerfd_n++;
 	}
@@ -133,8 +133,8 @@ static int timerfd_open(struct file_desc *d, int *new_fd)
 	pr_info("Creating timerfd id %#x clockid %d settime_flags %x ticks %llu "
 		"it_value(%llu, %llu) it_interval(%llu, %llu)\n",
 		tfe->id, tfe->clockid, tfe->settime_flags, (unsigned long long)tfe->ticks,
-		(unsigned long long)tfe->vsec, (unsigned long long)tfe->vnsec,
-		(unsigned long long)tfe->isec, (unsigned long long)tfe->insec);
+		(unsigned long long)tfe->vsec, (unsigned long long)tfe->vnsec, (unsigned long long)tfe->isec,
+		(unsigned long long)tfe->insec);
 
 	tmp = timerfd_create(tfe->clockid, 0);
 	if (tmp < 0) {
@@ -159,8 +159,8 @@ err_close:
 }
 
 static struct file_desc_ops timerfd_desc_ops = {
-	.type		= FD_TYPES__TIMERFD,
-	.open		= timerfd_open,
+	.type = FD_TYPES__TIMERFD,
+	.open = timerfd_open,
 };
 
 static int collect_one_timerfd(void *o, ProtobufCMessage *msg, struct cr_img *i)
@@ -179,8 +179,8 @@ static int collect_one_timerfd(void *o, ProtobufCMessage *msg, struct cr_img *i)
 }
 
 struct collect_image_info timerfd_cinfo = {
-	.fd_type	= CR_FD_TIMERFD,
-	.pb_type	= PB_TIMERFD,
-	.priv_size	= sizeof(struct timerfd_info),
-	.collect	= collect_one_timerfd,
+	.fd_type = CR_FD_TIMERFD,
+	.pb_type = PB_TIMERFD,
+	.priv_size = sizeof(struct timerfd_info),
+	.collect = collect_one_timerfd,
 };
diff --git a/criu/tls.c b/criu/tls.c
index e865368c4..60bd105bc 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -10,17 +10,17 @@
 
 /* Compatability with GnuTLS verson <3.5 */
 #ifndef GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR
-# define GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR GNUTLS_E_CERTIFICATE_ERROR
+#define GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR GNUTLS_E_CERTIFICATE_ERROR
 #endif
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "tls: "
 
 #define CRIU_PKI_DIR SYSCONFDIR "/pki"
-#define CRIU_CACERT CRIU_PKI_DIR "/CA/cacert.pem"
-#define CRIU_CACRL CRIU_PKI_DIR "/CA/cacrl.pem"
-#define CRIU_CERT CRIU_PKI_DIR "/criu/cert.pem"
-#define CRIU_KEY CRIU_PKI_DIR "/criu/private/key.pem"
+#define CRIU_CACERT  CRIU_PKI_DIR "/CA/cacert.pem"
+#define CRIU_CACRL   CRIU_PKI_DIR "/CA/cacrl.pem"
+#define CRIU_CERT    CRIU_PKI_DIR "/criu/cert.pem"
+#define CRIU_KEY     CRIU_PKI_DIR "/criu/private/key.pem"
 
 #define SPLICE_BUF_SZ_MAX (PIPE_BUF * 100)
 
@@ -42,7 +42,7 @@ void tls_terminate_session(void)
 		do {
 			/* don't wait for peer to close connection */
 			ret = gnutls_bye(session, GNUTLS_SHUT_WR);
-		} while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
+		} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
 		gnutls_deinit(session);
 	}
 
@@ -60,7 +60,7 @@ ssize_t tls_send(const void *buf, size_t len, int flags)
 	tls_sk_flags = 0;
 
 	if (ret < 0) {
-		switch(ret) {
+		switch (ret) {
 		case GNUTLS_E_AGAIN:
 			errno = EAGAIN;
 			break;
@@ -103,7 +103,7 @@ int tls_send_data_from_fd(int fd, unsigned long len)
 			goto err;
 		}
 
-		for(sent = 0; sent < copied; sent += ret) {
+		for (sent = 0; sent < copied; sent += ret) {
 			ret = tls_send((buf + sent), (copied - sent), 0);
 			if (ret < 0) {
 				tls_perror("Failed sending data", ret);
@@ -126,8 +126,7 @@ ssize_t tls_recv(void *buf, size_t len, int flags)
 	tls_sk_flags = 0;
 
 	/* Check if there are any data to receive in the gnutls buffers. */
-	if (flags == MSG_DONTWAIT
-	    && (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)) {
+	if (flags == MSG_DONTWAIT && (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)) {
 		size_t pending = gnutls_record_check_pending(session);
 		if (pending > 0) {
 			pr_debug("Receiving pending data (%zu bytes)\n", pending);
@@ -177,7 +176,7 @@ int tls_recv_data_to_fd(int fd, unsigned long len)
 		}
 
 		gnutls_packet_get(packet, &pdata, NULL);
-		for(w = 0; w < pdata.size; w += ret) {
+		for (w = 0; w < pdata.size; w += ret) {
 			ret = write(fd, (pdata.data + w), (pdata.size - w));
 			if (ret < 0) {
 				pr_perror("Failed writing to fd");
@@ -219,8 +218,7 @@ static int tls_x509_verify_peer_cert(void)
 
 	if (status != 0) {
 		pr_err("Invalid certificate\n");
-		tls_handshake_verification_status_print(
-			GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR, status);
+		tls_handshake_verification_status_print(GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR, status);
 		return -1;
 	}
 
@@ -300,7 +298,7 @@ static int tls_x509_setup_creds(void)
 	return 0;
 }
 
-static ssize_t _tls_push_cb(void *p, const void* data, size_t sz)
+static ssize_t _tls_push_cb(void *p, const void *data, size_t sz)
 {
 	int fd = *(int *)(p);
 	int ret = send(fd, data, sz, tls_sk_flags);
@@ -312,7 +310,7 @@ static ssize_t _tls_push_cb(void *p, const void* data, size_t sz)
 	return ret;
 }
 
-static ssize_t _tls_pull_cb(void *p, void* data, size_t sz)
+static ssize_t _tls_pull_cb(void *p, void *data, size_t sz)
 {
 	int fd = *(int *)(p);
 	int ret = recv(fd, data, sz, tls_sk_flags);
diff --git a/criu/tty.c b/criu/tty.c
index dee8d46bf..1598ad956 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -73,53 +73,53 @@
  * it depends on "devpts" mount point path.
  */
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "tty: "
 
 struct tty_data_entry {
-	struct list_head		list;
-	TtyDataEntry			*tde;
+	struct list_head list;
+	TtyDataEntry *tde;
 };
 
 struct tty_info {
-	struct list_head		list;
-	struct file_desc		d;
+	struct list_head list;
+	struct file_desc d;
 
-	struct file_desc		*reg_d;
+	struct file_desc *reg_d;
 
-	TtyFileEntry			*tfe;
-	TtyInfoEntry			*tie;
+	TtyFileEntry *tfe;
+	TtyInfoEntry *tie;
 
-	struct list_head		sibling;
-	struct tty_driver		*driver;
+	struct list_head sibling;
+	struct tty_driver *driver;
 
-	bool				create;
-	bool				inherit;
+	bool create;
+	bool inherit;
 
-	struct tty_info			*ctl_tty;
-	struct tty_info			*link;
-	struct tty_data_entry		*tty_data;
+	struct tty_info *ctl_tty;
+	struct tty_info *link;
+	struct tty_data_entry *tty_data;
 
-	int				fdstore_id;
+	int fdstore_id;
 };
 
 struct tty_dump_info {
-	struct list_head		list;
+	struct list_head list;
 
-	u32				id;
-	pid_t				sid;
-	pid_t				pgrp;
-	pid_t				pid_real;
-	int				fd;
-	int				mnt_id;
-	struct tty_driver		*driver;
+	u32 id;
+	pid_t sid;
+	pid_t pgrp;
+	pid_t pid_real;
+	int fd;
+	int mnt_id;
+	struct tty_driver *driver;
 
-	int				index;
-	int				lfd;
-	int				flags;
-	struct tty_dump_info		*link;
-	void				*tty_data;
-	size_t				tty_data_size;
+	int index;
+	int lfd;
+	int flags;
+	struct tty_dump_info *link;
+	void *tty_data;
+	size_t tty_data_size;
 };
 
 static bool stdin_isatty = false;
@@ -136,37 +136,37 @@ static int self_stdin_fdid = -1;
  * Pretty acceptable trade off in a sake of simplicity.
  */
 
-#define MAX_TTYS	1088
+#define MAX_TTYS 1088
 
 /*
  * Custom indices should be even numbers just in case if we
  * need odds for pair numbering someday.
  */
 
-#define MAX_PTY_INDEX	1000
-#define CONSOLE_INDEX	1002
-#define VT_INDEX	1004
-#define CTTY_INDEX	1006
-#define STTY_INDEX	1010
-#define ETTY_INDEX	1012
-#define ETTY_INDEX_MAX	1076
-#define INDEX_ERR	(MAX_TTYS + 1)
+#define MAX_PTY_INDEX  1000
+#define CONSOLE_INDEX  1002
+#define VT_INDEX       1004
+#define CTTY_INDEX     1006
+#define STTY_INDEX     1010
+#define ETTY_INDEX     1012
+#define ETTY_INDEX_MAX 1076
+#define INDEX_ERR      (MAX_TTYS + 1)
 
 static DECLARE_BITMAP(tty_bitmap, (MAX_TTYS << 1));
 static DECLARE_BITMAP(tty_active_pairs, (MAX_TTYS << 1));
 
 struct tty_driver {
-	short				type;
-	short				subtype;
-	char				*name;
-	int				index;
-	int				(*fd_get_index)(int fd, const struct fd_parms *p);
-	int				(*img_get_index)(struct tty_info *ti);
-	int				(*open)(struct tty_info *ti);
+	short type;
+	short subtype;
+	char *name;
+	int index;
+	int (*fd_get_index)(int fd, const struct fd_parms *p);
+	int (*img_get_index)(struct tty_info *ti);
+	int (*open)(struct tty_info *ti);
 };
 
-#define TTY_SUBTYPE_MASTER			0x0001
-#define TTY_SUBTYPE_SLAVE			0x0002
+#define TTY_SUBTYPE_MASTER 0x0001
+#define TTY_SUBTYPE_SLAVE  0x0002
 
 static int ptm_fd_get_index(int fd, const struct fd_parms *p)
 {
@@ -207,51 +207,51 @@ static int ext_fd_get_index(int fd, const struct fd_parms *p)
 static int pty_open_ptmx(struct tty_info *info);
 
 static struct tty_driver ptm_driver = {
-	.type			= TTY_TYPE__PTY,
-	.subtype		= TTY_SUBTYPE_MASTER,
-	.name			= "ptmx",
-	.fd_get_index		= ptm_fd_get_index,
-	.img_get_index		= pty_get_index,
-	.open			= pty_open_ptmx,
+	.type = TTY_TYPE__PTY,
+	.subtype = TTY_SUBTYPE_MASTER,
+	.name = "ptmx",
+	.fd_get_index = ptm_fd_get_index,
+	.img_get_index = pty_get_index,
+	.open = pty_open_ptmx,
 };
 
 static int open_simple_tty(struct tty_info *info);
 
 static struct tty_driver console_driver = {
-	.type			= TTY_TYPE__CONSOLE,
-	.name			= "console",
-	.index			= CONSOLE_INDEX,
-	.open			= open_simple_tty,
+	.type = TTY_TYPE__CONSOLE,
+	.name = "console",
+	.index = CONSOLE_INDEX,
+	.open = open_simple_tty,
 };
 
 static struct tty_driver ctty_driver = {
-	.type			= TTY_TYPE__CTTY,
-	.name			= "ctty",
-	.index			= CTTY_INDEX,
-	.open			= open_simple_tty,
+	.type = TTY_TYPE__CTTY,
+	.name = "ctty",
+	.index = CTTY_INDEX,
+	.open = open_simple_tty,
 };
 
 static struct tty_driver vt_driver = {
-	.type			= TTY_TYPE__VT,
-	.name			= "vt",
-	.index			= VT_INDEX,
-	.open			= open_simple_tty,
+	.type = TTY_TYPE__VT,
+	.name = "vt",
+	.index = VT_INDEX,
+	.open = open_simple_tty,
 };
 
 static int open_ext_tty(struct tty_info *info);
 static struct tty_driver ext_driver = {
-	.type			= TTY_TYPE__EXT_TTY,
-	.name			= "ext",
-	.index			= ETTY_INDEX,
-	.open			= open_ext_tty,
-	.fd_get_index		= ext_fd_get_index,
+	.type = TTY_TYPE__EXT_TTY,
+	.name = "ext",
+	.index = ETTY_INDEX,
+	.open = open_ext_tty,
+	.fd_get_index = ext_fd_get_index,
 };
 
 static struct tty_driver serial_driver = {
-	.type			= TTY_TYPE__SERIAL,
-	.name			= "serial",
-	.index			= STTY_INDEX,
-	.open			= open_simple_tty,
+	.type = TTY_TYPE__SERIAL,
+	.name = "serial",
+	.index = STTY_INDEX,
+	.open = open_simple_tty,
 };
 
 static int pts_fd_get_index(int fd, const struct fd_parms *p)
@@ -275,12 +275,12 @@ static int pts_fd_get_index(int fd, const struct fd_parms *p)
 }
 
 static struct tty_driver pts_driver = {
-	.type			= TTY_TYPE__PTY,
-	.subtype		= TTY_SUBTYPE_SLAVE,
-	.name			= "pts",
-	.fd_get_index		= pts_fd_get_index,
-	.img_get_index		= pty_get_index,
-	.open			= pty_open_ptmx,
+	.type = TTY_TYPE__PTY,
+	.subtype = TTY_SUBTYPE_SLAVE,
+	.name = "pts",
+	.fd_get_index = pts_fd_get_index,
+	.img_get_index = pty_get_index,
+	.open = pty_open_ptmx,
 };
 
 struct tty_driver *get_tty_driver(dev_t rdev, dev_t dev)
@@ -288,7 +288,7 @@ struct tty_driver *get_tty_driver(dev_t rdev, dev_t dev)
 	int major, minor;
 	char id[42];
 
-	snprintf(id, sizeof(id), "tty[%"PRIx64":%"PRIx64"]", rdev, dev);
+	snprintf(id, sizeof(id), "tty[%" PRIx64 ":%" PRIx64 "]", rdev, dev);
 	if (external_lookup_id(id) || inherit_fd_lookup_id(id) >= 0)
 		return &ext_driver;
 
@@ -328,7 +328,7 @@ struct tty_driver *get_tty_driver(dev_t rdev, dev_t dev)
 	case USB_SERIAL_MAJOR:
 	case LOW_DENSE_SERIAL_MAJOR:
 		return &serial_driver;
-	case UNIX98_PTY_MASTER_MAJOR ... (UNIX98_PTY_MASTER_MAJOR + UNIX98_PTY_MAJOR_COUNT - 1):
+	case UNIX98_PTY_MASTER_MAJOR ...(UNIX98_PTY_MASTER_MAJOR + UNIX98_PTY_MAJOR_COUNT - 1):
 		return &ptm_driver;
 	case UNIX98_PTY_SLAVE_MAJOR:
 		return &pts_driver;
@@ -362,26 +362,25 @@ int tty_init_restore(void)
 	return 0;
 }
 
-#define winsize_copy(d, s)				\
-	do {						\
-		ASSIGN_MEMBER((d), (s), ws_row);	\
-		ASSIGN_MEMBER((d), (s), ws_col);	\
-		ASSIGN_MEMBER((d), (s), ws_xpixel);	\
-		ASSIGN_MEMBER((d), (s), ws_ypixel);	\
+#define winsize_copy(d, s)                          \
+	do {                                        \
+		ASSIGN_MEMBER((d), (s), ws_row);    \
+		ASSIGN_MEMBER((d), (s), ws_col);    \
+		ASSIGN_MEMBER((d), (s), ws_xpixel); \
+		ASSIGN_MEMBER((d), (s), ws_ypixel); \
 	} while (0)
 
-#define termios_copy(d, s)				\
-	do {						\
-		struct termios __t;			\
-							\
-		memcpy((d)->c_cc, (s)->c_cc,		\
-		       sizeof(__t.c_cc));		\
-							\
-		ASSIGN_MEMBER((d),(s), c_iflag);	\
-		ASSIGN_MEMBER((d),(s), c_oflag);	\
-		ASSIGN_MEMBER((d),(s), c_cflag);	\
-		ASSIGN_MEMBER((d),(s), c_lflag);	\
-		ASSIGN_MEMBER((d),(s), c_line);		\
+#define termios_copy(d, s)                                      \
+	do {                                                    \
+		struct termios __t;                             \
+                                                                \
+		memcpy((d)->c_cc, (s)->c_cc, sizeof(__t.c_cc)); \
+                                                                \
+		ASSIGN_MEMBER((d), (s), c_iflag);               \
+		ASSIGN_MEMBER((d), (s), c_oflag);               \
+		ASSIGN_MEMBER((d), (s), c_cflag);               \
+		ASSIGN_MEMBER((d), (s), c_lflag);               \
+		ASSIGN_MEMBER((d), (s), c_line);                \
 	} while (0)
 
 static int tty_gen_id(struct tty_driver *driver, int index)
@@ -399,7 +398,8 @@ static int tty_verify_active_pairs(void)
 {
 	unsigned long i, unpaired_slaves = 0;
 
-	for_each_bit(i, tty_active_pairs) {
+	for_each_bit(i, tty_active_pairs)
+	{
 		if ((i % 2) == 0) {
 			if (test_bit(i + 1, tty_active_pairs)) {
 				i++;
@@ -460,18 +460,17 @@ static struct file_desc *pty_alloc_reg(struct tty_info *info, bool add)
 	if (tty_is_master(info))
 		strcpy(r->rfe->name, "/dev/ptmx");
 	else
-		snprintf(r->rfe->name, namelen, "/dev/pts/%u",
-			 info->tie->pty->index);
+		snprintf(r->rfe->name, namelen, "/dev/pts/%u", info->tie->pty->index);
 
 	if (add)
 		file_desc_add(&r->d, tfe->id, &noops);
 	else
 		file_desc_init(&r->d, tfe->id, &noops);
 
-	r->rfe->id	= tfe->id;
-	r->rfe->flags	= tfe->flags;
-	r->rfe->fown	= tfe->fown;
-	r->path		= &r->rfe->name[1];
+	r->rfe->id = tfe->id;
+	r->rfe->flags = tfe->flags;
+	r->rfe->fown = tfe->fown;
+	r->path = &r->rfe->name[1];
 
 	return &r->d;
 }
@@ -495,8 +494,7 @@ static struct reg_file_info *pty_alloc_fake_reg(struct tty_info *info, int subty
 	struct reg_file_info *new, *orig;
 	struct file_desc *fake_desc;
 
-	pr_debug("Allocating fake descriptor for %#x (reg_d %p)\n",
-		 info->tfe->id, info->reg_d);
+	pr_debug("Allocating fake descriptor for %#x (reg_d %p)\n", info->tfe->id, info->reg_d);
 
 	BUG_ON(!info->reg_d);
 	BUG_ON(!is_pty(info->driver));
@@ -526,11 +524,9 @@ static struct reg_file_info *pty_alloc_fake_reg(struct tty_info *info, int subty
 			strcat(inverted_path, "ptmx");
 		} else {
 			if (slash_at >= 3 && strncmp(&inverted_path[slash_at - 3], "pts", 3))
-				snprintf(&inverted_path[slash_at + 1], 10, "pts/%u",
-					 info->tie->pty->index);
+				snprintf(&inverted_path[slash_at + 1], 10, "pts/%u", info->tie->pty->index);
 			else
-				snprintf(&inverted_path[slash_at + 1], 10, "%u",
-					 info->tie->pty->index);
+				snprintf(&inverted_path[slash_at + 1], 10, "%u", info->tie->pty->index);
 		}
 
 		new->rfe->name = inverted_path;
@@ -540,8 +536,8 @@ static struct reg_file_info *pty_alloc_fake_reg(struct tty_info *info, int subty
 	return new;
 }
 
-#define pty_alloc_fake_master(info)	pty_alloc_fake_reg(info, TTY_SUBTYPE_MASTER)
-#define pty_alloc_fake_slave(info)	pty_alloc_fake_reg(info, TTY_SUBTYPE_SLAVE)
+#define pty_alloc_fake_master(info) pty_alloc_fake_reg(info, TTY_SUBTYPE_MASTER)
+#define pty_alloc_fake_slave(info)  pty_alloc_fake_reg(info, TTY_SUBTYPE_SLAVE)
 
 static void pty_free_fake_reg(struct reg_file_info **r)
 {
@@ -590,8 +586,7 @@ static char *path_from_reg(struct file_desc *d)
 	return rfi->path;
 }
 
-static int __pty_open_ptmx_index(int index, int flags,
-			int (*cb)(void *arg, int flags), void *arg, char *path)
+static int __pty_open_ptmx_index(int index, int flags, int (*cb)(void *arg, int flags), void *arg, char *path)
 {
 	int fds[32], i, ret = -1, cur_idx;
 
@@ -607,8 +602,7 @@ static int __pty_open_ptmx_index(int index, int flags,
 		}
 
 		if (ioctl(fds[i], TIOCGPTN, &cur_idx)) {
-			pr_perror("Can't obtain current index on %s",
-				  path);
+			pr_perror("Can't obtain current index on %s", path);
 			break;
 		}
 
@@ -628,8 +622,7 @@ static int __pty_open_ptmx_index(int index, int flags,
 		if (cur_idx < index && (index - cur_idx) < ARRAY_SIZE(fds))
 			continue;
 
-		pr_err("Unable to open %s with specified index %d\n",
-		       path, index);
+		pr_err("Unable to open %s with specified index %d\n", path, index);
 		break;
 	}
 
@@ -648,8 +641,7 @@ static int pty_open_ptmx_index(struct file_desc *d, struct tty_info *info, int f
 	if (info->fdstore_id >= 0)
 		return fdstore_get(info->fdstore_id);
 
-	return __pty_open_ptmx_index(info->tie->pty->index, flags,
-					open_tty_reg, d, path_from_reg(d));
+	return __pty_open_ptmx_index(info->tie->pty->index, flags, open_tty_reg, d, path_from_reg(d));
 }
 
 static int unlock_pty(int fd)
@@ -735,8 +727,7 @@ static int tty_restore_ctl_terminal(struct file_desc *d)
 	}
 
 out:
-	pr_info("Restore session %d by %d tty (index %d)\n",
-		 info->tie->sid, (int)getpid(), index);
+	pr_info("Restore session %d by %d tty (index %d)\n", info->tie->sid, (int)getpid(), index);
 
 	ret = tty_set_sid(slave);
 	if (!ret)
@@ -781,10 +772,9 @@ static bool tty_is_hung(struct tty_info *info)
 
 static bool tty_has_active_pair(struct tty_info *info)
 {
-	int d = tty_is_master(info) ? -1 : + 1;
+	int d = tty_is_master(info) ? -1 : +1;
 
-	return test_bit(info->tfe->tty_info_id + d,
-			tty_active_pairs);
+	return test_bit(info->tfe->tty_info_id + d, tty_active_pairs);
 }
 
 static void tty_show_pty_info(char *prefix, struct tty_info *info)
@@ -797,17 +787,16 @@ static void tty_show_pty_info(char *prefix, struct tty_info *info)
 	else
 		index = driver->index;
 
-	pr_info("%s driver %s id %#x index %d (master %d sid %d pgrp %d inherit %d)\n",
-		prefix, info->driver->name, info->tfe->id, index,
-		tty_is_master(info), info->tie->sid, info->tie->pgrp, info->inherit);
+	pr_info("%s driver %s id %#x index %d (master %d sid %d pgrp %d inherit %d)\n", prefix, info->driver->name,
+		info->tfe->id, index, tty_is_master(info), info->tie->sid, info->tie->pgrp, info->inherit);
 }
 
 struct tty_parms {
 	int tty_id;
 	unsigned has;
-#define HAS_TERMIOS_L	0x1
-#define HAS_TERMIOS	0x2
-#define HAS_WINS	0x4
+#define HAS_TERMIOS_L 0x1
+#define HAS_TERMIOS   0x2
+#define HAS_WINS      0x4
 	struct termios tl;
 	struct termios t;
 	struct winsize w;
@@ -828,16 +817,13 @@ static int do_restore_tty_parms(void *arg, int fd, pid_t pid)
 	 * on termios too. Just to be on the safe side.
 	 */
 
-	if ((p->has & HAS_TERMIOS_L) &&
-			ioctl(fd, TIOCSLCKTRMIOS, &p->tl) < 0)
+	if ((p->has & HAS_TERMIOS_L) && ioctl(fd, TIOCSLCKTRMIOS, &p->tl) < 0)
 		goto err;
 
-	if ((p->has & HAS_TERMIOS) &&
-			ioctl(fd, TCSETS, &p->t) < 0)
+	if ((p->has & HAS_TERMIOS) && ioctl(fd, TCSETS, &p->t) < 0)
 		goto err;
 
-	if ((p->has & HAS_WINS) &&
-			ioctl(fd, TIOCSWINSZ, &p->w) < 0)
+	if ((p->has & HAS_WINS) && ioctl(fd, TIOCSWINSZ, &p->w) < 0)
 		goto err;
 
 	return 0;
@@ -883,9 +869,7 @@ static int restore_tty_params(int fd, struct tty_info *info)
 
 	if (info->tie->has_uid && info->tie->has_gid) {
 		if (fchown(fd, info->tie->uid, info->tie->gid)) {
-			pr_perror("Can't setup uid %d gid %d on %#x",
-				  (int)info->tie->uid,
-				  (int)info->tie->gid,
+			pr_perror("Can't setup uid %d gid %d on %#x", (int)info->tie->uid, (int)info->tie->gid,
 				  info->tfe->id);
 			return -1;
 		}
@@ -906,13 +890,11 @@ static void pty_restore_queued_data(struct tty_info *info, int fd)
 		ProtobufCBinaryData bd = info->tty_data->tde->data;
 		int retval;
 
-		pr_debug("restore queued data on %#x (%zu bytes)\n",
-			 info->tfe->id, (size_t)bd.len);
+		pr_debug("restore queued data on %#x (%zu bytes)\n", info->tfe->id, (size_t)bd.len);
 
 		retval = write(fd, bd.data, bd.len);
 		if (retval != bd.len)
-			pr_err("Restored %d bytes while %zu expected\n",
-			       retval, (size_t)bd.len);
+			pr_err("Restored %d bytes while %zu expected\n", retval, (size_t)bd.len);
 	}
 }
 
@@ -933,8 +915,7 @@ static int pty_open_slaves(struct tty_info *info)
 		if (restore_tty_params(fd, slave))
 			goto err;
 
-		pr_debug("send slave %#x fd %d connected on %s\n",
-			 slave->tfe->id, fd, path_from_reg(slave->reg_d));
+		pr_debug("send slave %#x fd %d connected on %s\n", slave->tfe->id, fd, path_from_reg(slave->reg_d));
 
 		if (send_desc_to_peer(fd, &slave->d)) {
 			pr_err("Can't send file descriptor\n");
@@ -989,17 +970,14 @@ static int pty_open_unpaired_slave(struct file_desc *d, struct tty_info *slave)
 				goto err;
 			master = pty_open_ptmx_index(&fake->d, slave, O_RDWR);
 			if (master < 0) {
-				pr_err("Can't open master pty %x (index %d)\n",
-					  slave->tfe->id, slave->tie->pty->index);
+				pr_err("Can't open master pty %x (index %d)\n", slave->tfe->id, slave->tie->pty->index);
 				goto err;
 			}
 
 			if (unlock_pty(master))
 				goto err;
 
-			if (opts.orphan_pts_master &&
-			    rpc_send_fd(ACT_ORPHAN_PTS_MASTER, master) == 0) {
-
+			if (opts.orphan_pts_master && rpc_send_fd(ACT_ORPHAN_PTS_MASTER, master) == 0) {
 				fd = open_tty_reg(slave->reg_d, slave->tfe->flags);
 				if (fd < 0) {
 					pr_err("Can't open slave pty %s\n", path_from_reg(slave->reg_d));
@@ -1021,16 +999,14 @@ static int pty_open_unpaired_slave(struct file_desc *d, struct tty_info *slave)
 			return -1;
 		}
 
-		pr_info("Migrated slave peer %#x -> to fd %d\n",
-			slave->tfe->id, fd);
+		pr_info("Migrated slave peer %#x -> to fd %d\n", slave->tfe->id, fd);
 	} else {
 		fake = pty_alloc_fake_master(slave);
 		if (!fake)
 			goto err;
 		master = pty_open_ptmx_index(&fake->d, slave, O_RDONLY);
 		if (master < 0) {
-			pr_err("Can't open master pty %#x (index %d)\n",
-				  slave->tfe->id, slave->tie->pty->index);
+			pr_err("Can't open master pty %#x (index %d)\n", slave->tfe->id, slave->tie->pty->index);
 			goto err;
 		}
 
@@ -1042,7 +1018,6 @@ static int pty_open_unpaired_slave(struct file_desc *d, struct tty_info *slave)
 			pr_err("Can't open slave pty %s\n", path_from_reg(slave->reg_d));
 			goto err;
 		}
-
 	}
 
 out:
@@ -1071,8 +1046,7 @@ out:
 				if (tty_set_prgp(fd, root_item->pgid))
 					goto err;
 			} else {
-				pr_debug("Restore inherited group %d\n",
-					getpgid(getppid()));
+				pr_debug("Restore inherited group %d\n", getpgid(getppid()));
 				if (tty_set_prgp(fd, getpgid(getppid())))
 					goto err;
 			}
@@ -1097,8 +1071,7 @@ static int pty_open_ptmx(struct tty_info *info)
 
 	master = pty_open_ptmx_index(info->reg_d, info, info->tfe->flags);
 	if (master < 0) {
-		pr_err("Can't open master pty %#x (index %d)\n",
-			  info->tfe->id, info->tie->pty->index);
+		pr_err("Can't open master pty %#x (index %d)\n", info->tfe->id, info->tie->pty->index);
 		return -1;
 	}
 
@@ -1112,8 +1085,7 @@ static int pty_open_ptmx(struct tty_info *info)
 		int packet_mode = 1;
 
 		if (ioctl(master, TIOCPKT, &packet_mode) < 0) {
-			pr_perror("Can't set packed mode on %#x",
-				  info->tfe->id);
+			pr_perror("Can't set packed mode on %#x", info->tfe->id);
 			goto err;
 		}
 	}
@@ -1138,8 +1110,7 @@ static int open_simple_tty(struct tty_info *info)
 
 	fd = open_tty_reg(info->reg_d, info->tfe->flags);
 	if (fd < 0) {
-		pr_err("Can't open tty %s %#x\n",
-				info->driver->name, info->tfe->id);
+		pr_err("Can't open tty %s %#x\n", info->driver->name, info->tfe->id);
 		return -1;
 	}
 
@@ -1189,8 +1160,7 @@ static bool tty_deps_restored(struct tty_info *info)
 			tmp = container_of(fle->desc, struct tty_info, d);
 
 			/* slaves wait for masters except ctty */
-			if (tmp->driver->type == TTY_TYPE__CTTY ||
-			    !tty_is_master(tmp))
+			if (tmp->driver->type == TTY_TYPE__CTTY || !tty_is_master(tmp))
 				continue;
 			if (fle->stage != FLE_RESTORED)
 				return false;
@@ -1232,9 +1202,9 @@ static char *tty_d_name(struct file_desc *d, char *buf, size_t s)
 }
 
 static struct file_desc_ops tty_desc_ops = {
-	.type		= FD_TYPES__TTY,
-	.open		= tty_open,
-	.name		= tty_d_name,
+	.type = FD_TYPES__TTY,
+	.open = tty_open,
+	.name = tty_d_name,
 };
 
 static struct pstree_item *find_first_sid(int sid)
@@ -1259,9 +1229,9 @@ static int add_fake_fle(struct pstree_item *item, u32 desc_id)
 
 	fdinfo_entry__init(e);
 
-	e->id		= desc_id;
-	e->fd		= find_unused_fd(item, -1);
-	e->type		= FD_TYPES__TTY;
+	e->id = desc_id;
+	e->fd = find_unused_fd(item, -1);
+	e->type = FD_TYPES__TTY;
 
 	if (collect_fd(vpid(item), e, rsti(item), true)) {
 		xfree(e);
@@ -1310,8 +1280,8 @@ static int ctl_tty_open(struct file_desc *d, int *new_fd)
  * fles of type FD_TYPES__TTY indirectly.
  */
 static struct file_desc_ops ctl_tty_desc_ops = {
-	.type		= FD_TYPES__CTL_TTY,
-	.open		= ctl_tty_open,
+	.type = FD_TYPES__CTL_TTY,
+	.open = ctl_tty_open,
 };
 
 static int prepare_ctl_tty(struct pstree_item *item, u32 ctl_tty_id)
@@ -1337,8 +1307,8 @@ static int prepare_ctl_tty(struct pstree_item *item, u32 ctl_tty_id)
 	 * Add a fake ctl_tty depending on the above fake fle, which will
 	 * actually restore the session.
 	 */
-	ctl_tty	= xmalloc(sizeof(*ctl_tty));
-	e	= xmalloc(sizeof(*e));
+	ctl_tty = xmalloc(sizeof(*ctl_tty));
+	e = xmalloc(sizeof(*e));
 
 	if (!ctl_tty || !e)
 		goto err;
@@ -1353,9 +1323,9 @@ static int prepare_ctl_tty(struct pstree_item *item, u32 ctl_tty_id)
 
 	fdinfo_entry__init(e);
 
-	e->id		= ctl_tty_id;
-	e->fd		= find_unused_fd(item, -1);
-	e->type		= FD_TYPES__CTL_TTY;
+	e->id = ctl_tty_id;
+	e->fd = find_unused_fd(item, -1);
+	e->type = FD_TYPES__CTL_TTY;
 
 	if (collect_fd(vpid(item), e, rsti(item), true))
 		goto err;
@@ -1442,8 +1412,7 @@ static int tty_find_restoring_task(struct tty_info *info)
 		 */
 		item = find_first_sid(info->tie->sid);
 		if (item && vpid(item) == item->sid) {
-			pr_info("Set a control terminal %#x to %d\n",
-				info->tfe->id, info->tie->sid);
+			pr_info("Set a control terminal %#x to %d\n", info->tfe->id, info->tie->sid);
 			return prepare_ctl_tty(item, info->tfe->id);
 		}
 
@@ -1501,8 +1470,7 @@ static int tty_setup_orphan_slavery(void)
 
 		if (!has_leader) {
 			m->create = true;
-			pr_debug("Found orphan slave fake leader (%#x)\n",
-				 m->tfe->id);
+			pr_debug("Found orphan slave fake leader (%#x)\n", m->tfe->id);
 		}
 	}
 
@@ -1542,8 +1510,7 @@ static int tty_setup_slavery(void)
 	 * terminal.
 	 */
 	list_for_each_entry(info, &all_ttys, list) {
-		if (!info->tie->sid || info->ctl_tty ||
-		    info->driver->type == TTY_TYPE__CTTY)
+		if (!info->tie->sid || info->ctl_tty || info->driver->type == TTY_TYPE__CTTY)
 			continue;
 
 		if (!tty_is_master(info) && info->link)
@@ -1553,8 +1520,7 @@ static int tty_setup_slavery(void)
 		pr_debug("ctl tty leader %#x\n", info->tfe->id);
 		peer = info;
 		list_for_each_entry_safe_continue(peer, m, &all_ttys, list) {
-			if (!peer->tie->sid || peer->ctl_tty ||
-			    peer->driver->type == TTY_TYPE__CTTY)
+			if (!peer->tie->sid || peer->ctl_tty || peer->driver->type == TTY_TYPE__CTTY)
 				continue;
 			if (peer->tie->sid == info->tie->sid) {
 				pr_debug(" `- slave %#x\n", peer->tfe->id);
@@ -1599,23 +1565,17 @@ static int tty_setup_slavery(void)
 static int verify_termios(u32 id, TermiosEntry *e)
 {
 	if (e && e->n_c_cc < TERMIOS_NCC) {
-		pr_err("pty ID %#x n_c_cc (%d) has wrong value\n",
-		       id, (int)e->n_c_cc);
+		pr_err("pty ID %#x n_c_cc (%d) has wrong value\n", id, (int)e->n_c_cc);
 		return -1;
 	}
 	return 0;
 }
 
-#define term_opts_missing_cmp(tie, op)		\
-	(!(tie)->termios		op	\
-	 !(tie)->termios_locked		op	\
-	 !(tie)->winsize)
+#define term_opts_missing_cmp(tie, op) (!(tie)->termios op !(tie)->termios_locked op !(tie)->winsize)
 
-#define term_opts_missing_any(p)		\
-	term_opts_missing_cmp(p, ||)
+#define term_opts_missing_any(p) term_opts_missing_cmp(p, ||)
 
-#define term_opts_missing_all(p)		\
-	term_opts_missing_cmp(p, &&)
+#define term_opts_missing_all(p) term_opts_missing_cmp(p, &&)
 
 static int verify_info(TtyInfoEntry *tie, struct tty_driver *driver)
 {
@@ -1634,8 +1594,7 @@ static int verify_info(TtyInfoEntry *tie, struct tty_driver *driver)
 		}
 	}
 
-	if (verify_termios(tie->id, tie->termios_locked) ||
-	    verify_termios(tie->id, tie->termios))
+	if (verify_termios(tie->id, tie->termios_locked) || verify_termios(tie->id, tie->termios))
 		return -1;
 
 	if (tie->termios && tie->id > (MAX_TTYS << 1))
@@ -1678,8 +1637,7 @@ static int collect_one_tty_info_entry(void *obj, ProtobufCMessage *msg, struct c
 
 	driver = get_tty_driver(tie->rdev, tie->dev);
 	if (driver == NULL) {
-		pr_err("Unable to find a tty driver (rdev %#x dev %#x)\n",
-				tie->rdev, tie->dev);
+		pr_err("Unable to find a tty driver (rdev %#x dev %#x)\n", tie->rdev, tie->dev);
 		return -1;
 	}
 
@@ -1712,10 +1670,10 @@ static int collect_one_tty_info_entry(void *obj, ProtobufCMessage *msg, struct c
 }
 
 struct collect_image_info tty_info_cinfo = {
-	.fd_type	= CR_FD_TTY_INFO,
-	.pb_type	= PB_TTY_INFO,
-	.collect	= collect_one_tty_info_entry,
-	.flags		= COLLECT_NOFREE,
+	.fd_type = CR_FD_TTY_INFO,
+	.pb_type = PB_TTY_INFO,
+	.collect = collect_one_tty_info_entry,
+	.flags = COLLECT_NOFREE,
 };
 
 static int prep_tty_restore_cb(struct pprep_head *ph)
@@ -1761,8 +1719,7 @@ static int tty_info_setup(struct tty_info *info)
 	 * reg file rectord because they are inherited from
 	 * command line on restore.
 	 */
-	info->reg_d = try_collect_special_file( info->tfe->has_regf_id ?
-			info->tfe->regf_id : info->tfe->id, 1);
+	info->reg_d = try_collect_special_file(info->tfe->has_regf_id ? info->tfe->regf_id : info->tfe->id, 1);
 	if (!info->reg_d) {
 		if (info->driver->type != TTY_TYPE__EXT_TTY) {
 			if (!deprecated_ok("TTY w/o regfile"))
@@ -1771,8 +1728,7 @@ static int tty_info_setup(struct tty_info *info)
 			if (is_pty(info->driver)) {
 				info->reg_d = pty_alloc_reg(info, true);
 				if (!info->reg_d) {
-					pr_err("Can't generate new reg descriptor for id %#x\n",
-					       info->tfe->id);
+					pr_err("Can't generate new reg descriptor for id %#x\n", info->tfe->id);
 					return -1;
 				}
 			} else {
@@ -1791,10 +1747,10 @@ static int tty_info_setup(struct tty_info *info)
 }
 
 struct collect_image_info tty_cinfo = {
-	.fd_type	= CR_FD_TTY_FILES,
-	.pb_type	= PB_TTY_FILE,
-	.priv_size	= sizeof(struct tty_info),
-	.collect	= collect_one_tty,
+	.fd_type = CR_FD_TTY_FILES,
+	.pb_type = PB_TTY_FILE,
+	.priv_size = sizeof(struct tty_info),
+	.collect = collect_one_tty,
 };
 
 static int collect_one_tty_data(void *obj, ProtobufCMessage *msg, struct cr_img *i)
@@ -1803,8 +1759,7 @@ static int collect_one_tty_data(void *obj, ProtobufCMessage *msg, struct cr_img
 	struct tty_info *info;
 
 	tdo->tde = pb_msg(msg, TtyDataEntry);
-	pr_debug("Collected data for id %#x (size %zu bytes)\n",
-		 tdo->tde->tty_id, (size_t)tdo->tde->data.len);
+	pr_debug("Collected data for id %#x (size %zu bytes)\n", tdo->tde->tty_id, (size_t)tdo->tde->data.len);
 
 	list_for_each_entry(info, &all_ttys, list) {
 		if (tdo->tde->tty_id == info->tie->id) {
@@ -1818,10 +1773,10 @@ static int collect_one_tty_data(void *obj, ProtobufCMessage *msg, struct cr_img
 }
 
 struct collect_image_info tty_cdata = {
-	.fd_type	= CR_FD_TTY_DATA,
-	.pb_type	= PB_TTY_DATA,
-	.priv_size	= sizeof(struct tty_data_entry),
-	.collect	= collect_one_tty_data,
+	.fd_type = CR_FD_TTY_DATA,
+	.pb_type = PB_TTY_DATA,
+	.priv_size = sizeof(struct tty_data_entry),
+	.collect = collect_one_tty_data,
 };
 
 /* Make sure the ttys we're dumping do belong our process tree */
@@ -1855,16 +1810,15 @@ int dump_verify_tty_sids(void)
 			if (!item || vpid(item) != dinfo->sid) {
 				if (!opts.shell_job) {
 					pr_err("Found dangling tty with sid %d pgid %d (%s) on peer fd %d.\n",
-					       dinfo->sid, dinfo->pgrp,
-					       dinfo->driver->name, dinfo->fd);
+					       dinfo->sid, dinfo->pgrp, dinfo->driver->name, dinfo->fd);
 					/*
 					 * First thing people do with criu is dump smth
 					 * run from shell. This is typical pitfall, warn
 					 * user about it explicitly.
 					 */
 					pr_msg("Task attached to shell terminal. "
-						"Consider using --" OPT_SHELL_JOB " option. "
-						"More details on http://criu.org/Simple_loop\n");
+					       "Consider using --" OPT_SHELL_JOB " option. "
+					       "More details on http://criu.org/Simple_loop\n");
 					ret = -1;
 				}
 			}
@@ -1876,11 +1830,11 @@ int dump_verify_tty_sids(void)
 
 static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_driver *driver, int index)
 {
-	TtyInfoEntry info		= TTY_INFO_ENTRY__INIT;
-	TermiosEntry termios		= TERMIOS_ENTRY__INIT;
-	TermiosEntry termios_locked	= TERMIOS_ENTRY__INIT;
-	WinsizeEntry winsize		= WINSIZE_ENTRY__INIT;
-	TtyPtyEntry pty			= TTY_PTY_ENTRY__INIT;
+	TtyInfoEntry info = TTY_INFO_ENTRY__INIT;
+	TermiosEntry termios = TERMIOS_ENTRY__INIT;
+	TermiosEntry termios_locked = TERMIOS_ENTRY__INIT;
+	WinsizeEntry winsize = WINSIZE_ENTRY__INIT;
+	TtyPtyEntry pty = TTY_PTY_ENTRY__INIT;
 	struct parasite_tty_args *pti;
 	struct tty_dump_info *dinfo;
 
@@ -1910,14 +1864,14 @@ static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_d
 	if (!dinfo)
 		return -1;
 
-	dinfo->id		= id;
-	dinfo->sid		= pti->sid;
-	dinfo->pgrp		= pti->pgrp;
-	dinfo->pid_real		= p->pid;
-	dinfo->fd		= p->fd;
-	dinfo->mnt_id		= p->mnt_id;
-	dinfo->driver		= driver;
-	dinfo->flags		= p->flags;
+	dinfo->id = id;
+	dinfo->sid = pti->sid;
+	dinfo->pgrp = pti->pgrp;
+	dinfo->pid_real = p->pid;
+	dinfo->fd = p->fd;
+	dinfo->mnt_id = p->mnt_id;
+	dinfo->driver = driver;
+	dinfo->flags = p->flags;
 
 	if (is_pty(driver)) {
 		dinfo->lfd = dup(lfd);
@@ -1926,33 +1880,33 @@ static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_d
 			xfree(dinfo);
 			return -1;
 		}
-		dinfo->index	= index;
+		dinfo->index = index;
 	} else {
-		dinfo->index	= -1;
-		dinfo->lfd	= -1;
+		dinfo->index = -1;
+		dinfo->lfd = -1;
 	}
 
 	list_add_tail(&dinfo->list, &all_ttys);
 
-	info.id			= id;
-	info.sid		= pti->sid;
-	info.pgrp		= pti->pgrp;
-	info.rdev		= p->stat.st_rdev;
-	info.dev		= p->stat.st_dev;
-	info.has_dev		= true;
-	info.locked		= pti->st_lock;
-	info.exclusive		= pti->st_excl;
-	info.packet_mode	= pti->st_pckt;
+	info.id = id;
+	info.sid = pti->sid;
+	info.pgrp = pti->pgrp;
+	info.rdev = p->stat.st_rdev;
+	info.dev = p->stat.st_dev;
+	info.has_dev = true;
+	info.locked = pti->st_lock;
+	info.exclusive = pti->st_excl;
+	info.packet_mode = pti->st_pckt;
 
-	info.has_uid		= true;
-	info.uid		= userns_uid(p->stat.st_uid);
-	info.has_gid		= true;
-	info.gid		= userns_gid(p->stat.st_gid);
+	info.has_uid = true;
+	info.uid = userns_uid(p->stat.st_uid);
+	info.has_gid = true;
+	info.gid = userns_gid(p->stat.st_gid);
 
 	info.type = driver->type;
 	if (info.type == TTY_TYPE__PTY) {
-		info.pty	= &pty;
-		pty.index	= index;
+		info.pty = &pty;
+		pty.index = index;
 	}
 
 	/*
@@ -1973,15 +1927,15 @@ static int dump_tty_info(int lfd, u32 id, const struct fd_parms *p, struct tty_d
 	if (is_pty(driver))
 		tty_test_and_set(id, tty_active_pairs);
 
-	info.termios		= &termios;
-	info.termios_locked	= &termios_locked;
-	info.winsize		= &winsize;
+	info.termios = &termios;
+	info.termios_locked = &termios_locked;
+	info.winsize = &winsize;
 
-	termios.n_c_cc		= TERMIOS_NCC;
-	termios.c_cc		= xmalloc(pb_repeated_size(&termios, c_cc));
+	termios.n_c_cc = TERMIOS_NCC;
+	termios.c_cc = xmalloc(pb_repeated_size(&termios, c_cc));
 
-	termios_locked.n_c_cc	= TERMIOS_NCC;
-	termios_locked.c_cc	= xmalloc(pb_repeated_size(&termios_locked, c_cc));
+	termios_locked.n_c_cc = TERMIOS_NCC;
+	termios_locked.c_cc = xmalloc(pb_repeated_size(&termios_locked, c_cc));
 
 	if (!termios.c_cc || !termios_locked.c_cc)
 		goto out;
@@ -2033,10 +1987,10 @@ static int dump_one_tty(int lfd, u32 id, const struct fd_parms *p)
 		return -1;
 	}
 
-	e.id		= id;
-	e.tty_info_id	= tty_gen_id(driver, index);
-	e.flags		= p->flags;
-	e.fown		= (FownEntry *)&p->fown;
+	e.id = id;
+	e.tty_info_id = tty_gen_id(driver, index);
+	e.flags = p->flags;
+	e.fown = (FownEntry *)&p->fown;
 
 	if (driver->type != TTY_TYPE__EXT_TTY) {
 		u32 rf_id;
@@ -2049,7 +2003,6 @@ static int dump_one_tty(int lfd, u32 id, const struct fd_parms *p)
 		e.regf_id = rf_id;
 	}
 
-
 	/*
 	 * FIXME
 	 *
@@ -2086,8 +2039,8 @@ static int dump_one_tty(int lfd, u32 id, const struct fd_parms *p)
 }
 
 const struct fdtype_ops tty_dump_ops = {
-	.type	= FD_TYPES__TTY,
-	.dump	= dump_one_tty,
+	.type = FD_TYPES__TTY,
+	.dump = dump_one_tty,
 };
 
 static int tty_reblock(int id, int lfd, int flags)
@@ -2142,30 +2095,26 @@ static int tty_do_dump_queued_data(struct tty_dump_info *dinfo)
 	while (1) {
 		ret = read(dinfo->lfd, &buf[off], size - off);
 		if (ret == 0) {
-			pr_debug("No more data on tty (%s %#x)\n",
-				 dinfo->driver->name, dinfo->id);
+			pr_debug("No more data on tty (%s %#x)\n", dinfo->driver->name, dinfo->id);
 			break;
 		} else if (ret < 0) {
 			if (errno == EAGAIN) {
-				pr_debug("Not waiting data tty (%s %#x)\n",
-					 dinfo->driver->name, dinfo->id);
+				pr_debug("Not waiting data tty (%s %#x)\n", dinfo->driver->name, dinfo->id);
 				break;
 			} else {
 				ret = -errno;
-				pr_perror("Can't read data from tty (%s %#x)",
-					  dinfo->driver->name, dinfo->id);
+				pr_perror("Can't read data from tty (%s %#x)", dinfo->driver->name, dinfo->id);
 				xfree(buf);
 				return ret;
 			}
 		}
 
 		off += ret;
-		pr_debug("Read %d bytes (%d) from tty (%s %#x)\n",
-			 ret, (int)off, dinfo->driver->name, dinfo->id);
+		pr_debug("Read %d bytes (%d) from tty (%s %#x)\n", ret, (int)off, dinfo->driver->name, dinfo->id);
 
 		if (off >= size) {
-			pr_err("The tty (%s %#x) queued data overflow %zu bytes limit\n",
-			       dinfo->driver->name, dinfo->id, size);
+			pr_err("The tty (%s %#x) queued data overflow %zu bytes limit\n", dinfo->driver->name,
+			       dinfo->id, size);
 			off = size;
 			break;
 		}
@@ -2175,12 +2124,11 @@ static int tty_do_dump_queued_data(struct tty_dump_info *dinfo)
 		dinfo->tty_data = buf;
 		dinfo->tty_data_size = off;
 
-		e.tty_id	= dinfo->id;
-		e.data.data	= (void *)buf;
-		e.data.len	= off;
+		e.tty_id = dinfo->id;
+		e.data.data = (void *)buf;
+		e.data.len = off;
 
-		ret = pb_write_one(img_from_set(glob_imgset, CR_FD_TTY_DATA),
-				   &e, PB_TTY_DATA);
+		ret = pb_write_one(img_from_set(glob_imgset, CR_FD_TTY_DATA), &e, PB_TTY_DATA);
 	} else {
 		xfree(buf);
 		ret = 0;
@@ -2196,8 +2144,7 @@ static int tty_do_dump_queued_data(struct tty_dump_info *dinfo)
 static void __tty_do_writeback_queued_data(struct tty_dump_info *dinfo)
 {
 	if (dinfo->tty_data) {
-		if (write(dinfo->link->lfd, dinfo->tty_data,
-			  dinfo->tty_data_size) != dinfo->tty_data_size)
+		if (write(dinfo->link->lfd, dinfo->tty_data, dinfo->tty_data_size) != dinfo->tty_data_size)
 			pr_perror("Can't writeback to tty (%#x)", dinfo->id);
 	}
 	tty_reblock(dinfo->link->id, dinfo->link->lfd, dinfo->link->flags);
@@ -2300,9 +2247,7 @@ static int tty_verify_ctty(void)
 			continue;
 
 		list_for_each_entry(p, &all_ttys, list) {
-			if (!is_pty(p->driver)	||
-			    p->sid != d->sid	||
-			    p->pgrp != d->sid)
+			if (!is_pty(p->driver) || p->sid != d->sid || p->pgrp != d->sid)
 				continue;
 			n = p;
 			break;
@@ -2356,7 +2301,7 @@ int tty_prep_fds(void)
 
 static int open_pty(void *arg, int flags)
 {
-	int dfd = (unsigned long) arg;
+	int dfd = (unsigned long)arg;
 	/*
 	 * Never set as a control terminal automatically, all
 	 * ctty magic happens only in tty_set_sid().
@@ -2371,7 +2316,7 @@ static int pty_create_ptmx_index(int dfd, int index, int flags)
 	struct tty_info *info;
 	int fd, id;
 
-	fd = __pty_open_ptmx_index(index, flags, open_pty, (void *)(unsigned long) dfd, "ptmx");
+	fd = __pty_open_ptmx_index(index, flags, open_pty, (void *)(unsigned long)dfd, "ptmx");
 	if (fd < 0)
 		return -1;
 
@@ -2442,8 +2387,7 @@ found:
 	}
 
 	if (master_mp->nsid->type != NS_ROOT) {
-		pr_err("The master for %s isn't from the root mntns\n",
-				m->root);
+		pr_err("The master for %s isn't from the root mntns\n", m->root);
 		return -1;
 	}
 
@@ -2462,7 +2406,6 @@ int devpts_restore(struct mount_info *pm)
 		return -1;
 	}
 
-
 	list_for_each_entry(bm, &pm->mnt_bind, mnt_bind) {
 		int idx;
 		struct stat st;
diff --git a/criu/tun.c b/criu/tun.c
index b13148b0b..2a2f950da 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -24,7 +24,7 @@
 
 #include "images/tun.pb-c.h"
 
-#undef	LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "tun: "
 
 #ifndef IFF_PERSIST
@@ -36,7 +36,7 @@
 #endif
 
 #ifndef TUNSETQUEUE
-#define TUNSETQUEUE  _IOW('T', 217, int)
+#define TUNSETQUEUE	 _IOW('T', 217, int)
 #define IFF_ATTACH_QUEUE 0x0200
 #define IFF_DETACH_QUEUE 0x0400
 #endif
@@ -55,7 +55,7 @@
 #define TUNGETFILTER _IOR('T', 219, struct sock_fprog)
 #endif
 
-#define TUN_DEV_GEN_PATH	"/dev/net/tun"
+#define TUN_DEV_GEN_PATH "/dev/net/tun"
 
 int check_tun_cr(int no_tun_err)
 {
@@ -139,8 +139,7 @@ static struct tun_link *find_tun_link(char *name, unsigned int ns_id)
 	struct tun_link *tl;
 
 	list_for_each_entry(tl, &tun_links, l) {
-		if (!strcmp(tl->name, name) &&
-		    tl->ns_id == ns_id)
+		if (!strcmp(tl->name, name) && tl->ns_id == ns_id)
 			return tl;
 	}
 	return NULL;
@@ -322,7 +321,7 @@ static int dump_tunfile(int lfd, u32 id, const struct fd_parms *p)
 
 	pr_info("Dumping tun-file %d with id %#x\n", lfd, id);
 
-	tfe.id		= id;
+	tfe.id = id;
 	ret = ioctl(lfd, TUNGETIFF, &ifr);
 	if (ret < 0) {
 		if (errno != EBADFD) {
diff --git a/criu/uffd.c b/criu/uffd.c
index 76873797d..18bdc040f 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -42,23 +42,21 @@
 #include "util.h"
 #include "namespaces.h"
 
-#undef  LOG_PREFIX
+#undef LOG_PREFIX
 #define LOG_PREFIX "uffd: "
 
-#define lp_debug(lpi, fmt, arg...) pr_debug("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
-#define lp_info(lpi, fmt, arg...) pr_info("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
-#define lp_warn(lpi, fmt, arg...) pr_warn("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
-#define lp_err(lpi, fmt, arg...) pr_err("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
+#define lp_debug(lpi, fmt, arg...)  pr_debug("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
+#define lp_info(lpi, fmt, arg...)   pr_info("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
+#define lp_warn(lpi, fmt, arg...)   pr_warn("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
+#define lp_err(lpi, fmt, arg...)    pr_err("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
 #define lp_perror(lpi, fmt, arg...) pr_perror("%d-%d: " fmt, lpi->pid, lpi->lpfd.fd, ##arg)
 
-#define NEED_UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK |	    \
-				UFFD_FEATURE_EVENT_REMAP |	    \
-				UFFD_FEATURE_EVENT_UNMAP |	    \
-				UFFD_FEATURE_EVENT_REMOVE)
+#define NEED_UFFD_API_FEATURES \
+	(UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_EVENT_REMOVE)
 
-#define LAZY_PAGES_SOCK_NAME	"lazy-pages.socket"
+#define LAZY_PAGES_SOCK_NAME "lazy-pages.socket"
 
-#define LAZY_PAGES_RESTORE_FINISHED	0x52535446	/* ReSTore Finished */
+#define LAZY_PAGES_RESTORE_FINISHED 0x52535446 /* ReSTore Finished */
 
 /*
  * Backround transfer parameters.
@@ -67,15 +65,15 @@
  * a pipe in the page-server
  */
 #define DEFAULT_XFER_LEN (64 << 10)
-#define MAX_XFER_LEN (4 << 20)
+#define MAX_XFER_LEN	 (4 << 20)
 
 static mutex_t *lazy_sock_mutex;
 
 struct lazy_iov {
 	struct list_head l;
-	unsigned long start;	/* run-time start address, tracks remaps */
-	unsigned long end;	/* run-time end address, tracks remaps */
-	unsigned long img_start;	/* start address at the dump time */
+	unsigned long start; /* run-time start address, tracks remaps */
+	unsigned long end; /* run-time end address, tracks remaps */
+	unsigned long img_start; /* start address at the dump time */
 };
 
 struct lazy_pages_info {
@@ -90,7 +88,7 @@ struct lazy_pages_info {
 
 	struct page_read pr;
 
-	unsigned long xfer_len;	/* in pages */
+	unsigned long xfer_len; /* in pages */
 	unsigned long total_pages;
 	unsigned long copied_pages;
 
@@ -177,7 +175,6 @@ static void lpi_fini(struct lazy_pages_info *lpi)
 	xfree(lpi);
 }
 
-
 static int prepare_sock_addr(struct sockaddr_un *saddr)
 {
 	int len;
@@ -185,8 +182,7 @@ static int prepare_sock_addr(struct sockaddr_un *saddr)
 	memset(saddr, 0, sizeof(struct sockaddr_un));
 
 	saddr->sun_family = AF_UNIX;
-	len = snprintf(saddr->sun_path, sizeof(saddr->sun_path),
-		       "%s", LAZY_PAGES_SOCK_NAME);
+	len = snprintf(saddr->sun_path, sizeof(saddr->sun_path), "%s", LAZY_PAGES_SOCK_NAME);
 	if (len >= sizeof(saddr->sun_path)) {
 		pr_err("Wrong UNIX socket name: %s\n", LAZY_PAGES_SOCK_NAME);
 		return -1;
@@ -279,15 +275,13 @@ int uffd_open(int flags, unsigned long *features, int *err)
 	if (features)
 		uffdio_api.features = *features;
 
-	if (userns_call(uffd_api_ioctl, 0, &uffdio_api, sizeof(uffdio_api),
-			uffd)) {
+	if (userns_call(uffd_api_ioctl, 0, &uffdio_api, sizeof(uffdio_api), uffd)) {
 		pr_perror("Failed to get uffd API");
 		goto close;
 	}
 
 	if (uffdio_api.api != UFFD_API) {
-		pr_err("Incompatible uffd API: expected %Lu, got %Lu\n",
-		       UFFD_API, uffdio_api.api);
+		pr_err("Incompatible uffd API: expected %Lu, got %Lu\n", UFFD_API, uffdio_api.api);
 		goto close;
 	}
 
@@ -351,7 +345,7 @@ int prepare_lazy_pages_socket(void)
 		return -1;
 
 	len = offsetof(struct sockaddr_un, sun_path) + strlen(sun.sun_path);
-	if (connect(fd, (struct sockaddr *) &sun, len) < 0) {
+	if (connect(fd, (struct sockaddr *)&sun, len) < 0) {
 		pr_perror("connect to %s failed", sun.sun_path);
 		goto out;
 	}
@@ -380,7 +374,7 @@ static int server_listen(struct sockaddr_un *saddr)
 
 	len = offsetof(struct sockaddr_un, sun_path) + strlen(saddr->sun_path);
 
-	if (bind(fd, (struct sockaddr *) saddr, len) < 0) {
+	if (bind(fd, (struct sockaddr *)saddr, len) < 0) {
 		goto out;
 	}
 
@@ -414,8 +408,7 @@ static MmEntry *init_mm_entry(struct lazy_pages_info *lpi)
 	return mm;
 }
 
-static struct lazy_iov *find_iov(struct lazy_pages_info *lpi,
-				 unsigned long addr)
+static struct lazy_iov *find_iov(struct lazy_pages_info *lpi, unsigned long addr)
 {
 	struct lazy_iov *iov;
 
@@ -457,8 +450,7 @@ static void iov_list_insert(struct lazy_iov *new, struct list_head *dst)
 			list_move_tail(&new->l, &iov->l);
 			break;
 		}
-		if (list_is_last(&iov->l, dst) &&
-		    new->start > iov->start) {
+		if (list_is_last(&iov->l, dst) && new->start > iov->start) {
 			list_move(&new->l, &iov->l);
 			break;
 		}
@@ -492,7 +484,6 @@ static int __copy_iov_list(struct list_head *src, struct list_head *dst)
 		list_add_tail(&new->l, dst);
 	}
 
-
 	return 0;
 }
 
@@ -594,10 +585,7 @@ static int drop_iovs(struct lazy_pages_info *lpi, unsigned long addr, int len)
 	return 0;
 }
 
-
-static struct lazy_iov *extract_range(struct lazy_iov *iov,
-				      unsigned long start,
-				      unsigned long end)
+static struct lazy_iov *extract_range(struct lazy_iov *iov, unsigned long start, unsigned long end)
 {
 	/* move the IOV tail into a new IOV */
 	if (end < iov->end)
@@ -614,8 +602,7 @@ static struct lazy_iov *extract_range(struct lazy_iov *iov,
 	return list_entry(iov->l.next, struct lazy_iov, l);
 }
 
-static int __remap_iovs(struct list_head *iovs,	unsigned long from,
-			unsigned long to, unsigned long len)
+static int __remap_iovs(struct list_head *iovs, unsigned long from, unsigned long to, unsigned long len)
 {
 	LIST_HEAD(remaps);
 
@@ -660,8 +647,7 @@ static int __remap_iovs(struct list_head *iovs,	unsigned long from,
 	return 0;
 }
 
-static int remap_iovs(struct lazy_pages_info *lpi, unsigned long from,
-		      unsigned long to, unsigned long len)
+static int remap_iovs(struct lazy_pages_info *lpi, unsigned long from, unsigned long to, unsigned long len)
 {
 	if (__remap_iovs(&lpi->iovs, from, to, len))
 		return -1;
@@ -836,8 +822,7 @@ static bool uffd_recoverable_error(int mcopy_rc)
 	return false;
 }
 
-static int uffd_check_op_error(struct lazy_pages_info *lpi, const char *op,
-			       int *nr_pages, long mcopy_rc)
+static int uffd_check_op_error(struct lazy_pages_info *lpi, const char *op, int *nr_pages, long mcopy_rc)
 {
 	if (errno == ENOSPC || errno == ESRCH) {
 		handle_exit(lpi);
@@ -946,8 +931,7 @@ static int uffd_zero(struct lazy_pages_info *lpi, __u64 address, int nr_pages)
 
 	lp_debug(lpi, "zero page at 0x%llx\n", address);
 	if (ioctl(lpi->lpfd.fd, UFFDIO_ZEROPAGE, &uffdio_zeropage) &&
-	    uffd_check_op_error(lpi, "zero", &nr_pages,
-				uffdio_zeropage.zeropage))
+	    uffd_check_op_error(lpi, "zero", &nr_pages, uffdio_zeropage.zeropage))
 		return -1;
 
 	return 0;
@@ -1054,17 +1038,14 @@ static int handle_remove(struct lazy_pages_info *lpi, struct uffd_msg *msg)
 	unreg.start = msg->arg.remove.start;
 	unreg.len = msg->arg.remove.end - msg->arg.remove.start;
 
-	lp_debug(lpi, "%s: %llx(%llx)\n",
-		 msg->event == UFFD_EVENT_REMOVE ? "REMOVE" : "UNMAP",
-		 unreg.start, unreg.len);
+	lp_debug(lpi, "%s: %llx(%llx)\n", msg->event == UFFD_EVENT_REMOVE ? "REMOVE" : "UNMAP", unreg.start, unreg.len);
 
 	/*
 	 * The REMOVE event does not change the VMA, so we need to
 	 * make sure that we won't handle #PFs in the removed
 	 * range. With UNMAP, there's no VMA to worry about
 	 */
-	if (msg->event == UFFD_EVENT_REMOVE &&
-	    ioctl(lpi->lpfd.fd, UFFDIO_UNREGISTER, &unreg)) {
+	if (msg->event == UFFD_EVENT_REMOVE && ioctl(lpi->lpfd.fd, UFFDIO_UNREGISTER, &unreg)) {
 		/*
 		 * The kernel returns -ENOMEM when unregister is
 		 * called after the process has gone
@@ -1074,8 +1055,7 @@ static int handle_remove(struct lazy_pages_info *lpi, struct uffd_msg *msg)
 			return 0;
 		}
 
-		pr_perror("Failed to unregister (%llx - %llx)", unreg.start,
-			  unreg.start + unreg.len);
+		pr_perror("Failed to unregister (%llx - %llx)", unreg.start, unreg.start + unreg.len);
 		return -1;
 	}
 
@@ -1088,7 +1068,7 @@ static int handle_remap(struct lazy_pages_info *lpi, struct uffd_msg *msg)
 	unsigned long to = msg->arg.remap.to;
 	unsigned long len = msg->arg.remap.len;
 
-	lp_debug(lpi, "REMAP: %lx -> %lx (%ld)\n", from , to, len);
+	lp_debug(lpi, "REMAP: %lx -> %lx (%ld)\n", from, to, len);
 
 	return remap_iovs(lpi, from, to, len);
 }
@@ -1248,8 +1228,7 @@ static int handle_uffd_event(struct epoll_rfd *lpfd)
 
 static void lazy_pages_summary(struct lazy_pages_info *lpi)
 {
-	lp_debug(lpi, "UFFD transferred pages: (%ld/%ld)\n",
-		 lpi->copied_pages, lpi->total_pages);
+	lp_debug(lpi, "UFFD transferred pages: (%ld/%ld)\n", lpi->copied_pages, lpi->total_pages);
 
 #if 0
 	if ((lpi->copied_pages != lpi->total_pages) && (lpi->total_pages > 0)) {
@@ -1305,7 +1284,6 @@ static int handle_requests(int epollfd, struct epoll_event **events, int nr_fds)
 
 out:
 	return ret;
-
 }
 
 int lazy_pages_finish_restore(void)
@@ -1395,7 +1373,7 @@ static int prepare_uffds(int listen, int epollfd)
 
 	/* accept new client request */
 	len = sizeof(struct sockaddr_un);
-	if ((client = accept(listen, (struct sockaddr *) &saddr, &len)) < 0) {
+	if ((client = accept(listen, (struct sockaddr *)&saddr, &len)) < 0) {
 		pr_perror("server_accept error");
 		close(listen);
 		return -1;
diff --git a/criu/unittest/unit.c b/criu/unittest/unit.c
index 41eacbffe..3ee141e25 100644
--- a/criu/unittest/unit.c
+++ b/criu/unittest/unit.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-
 #include "log.h"
 #include "criu-log.h"
 
@@ -46,7 +45,6 @@ int main(int argc, char *argv[], char *envp[])
 	assert(!strcmp(configuration[0], "--dsfa"));
 	assert(!strcmp(configuration[1], "aaaaa \"bbbbbb\""));
 
-
 	i = parse_statement(0, "verbosity 4\n", configuration);
 	assert(i == 2);
 	assert(!strcmp(configuration[0], "--verbosity"));
diff --git a/criu/util.c b/criu/util.c
index 86bc22e62..ed4557770 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -47,7 +47,7 @@
 #include "cr-errno.h"
 #include "action-scripts.h"
 
-#define VMA_OPT_LEN	128
+#define VMA_OPT_LEN 128
 
 static int xatol_base(const char *string, long *number, int base)
 {
@@ -56,8 +56,7 @@ static int xatol_base(const char *string, long *number, int base)
 
 	errno = 0;
 	nr = strtol(string, &endptr, base);
-	if ((errno == ERANGE && (nr == LONG_MAX || nr == LONG_MIN))
-			|| (errno != 0 && nr == 0)) {
+	if ((errno == ERANGE && (nr == LONG_MAX || nr == LONG_MIN)) || (errno != 0 && nr == 0)) {
 		pr_perror("failed to convert string '%s'", string);
 		return -EINVAL;
 	}
@@ -75,7 +74,6 @@ int xatol(const char *string, long *number)
 	return xatol_base(string, number, 10);
 }
 
-
 int xatoi(const char *string, int *number)
 {
 	long tmp;
@@ -169,9 +167,10 @@ static void vma_opt_str(const struct vma_area *v, char *opt)
 {
 	int p = 0;
 
-#define opt2s(_o, _s)	do {				\
-		if (v->e->status & _o)			\
-			p += sprintf(opt + p, _s " ");	\
+#define opt2s(_o, _s)                                  \
+	do {                                           \
+		if (v->e->status & _o)                 \
+			p += sprintf(opt + p, _s " "); \
 	} while (0)
 
 	opt[p] = '\0';
@@ -200,16 +199,11 @@ void pr_vma(const struct vma_area *vma_area)
 		return;
 
 	vma_opt_str(vma_area, opt);
-	pr_info("%#"PRIx64"-%#"PRIx64" (%"PRIi64"K) prot %#x flags %#x fdflags %#o st %#x off %#"PRIx64" "
-			"%s shmid: %#"PRIx64"\n",
-			vma_area->e->start, vma_area->e->end,
-			KBYTES(vma_area_len(vma_area)),
-			vma_area->e->prot,
-			vma_area->e->flags,
-			vma_area->e->fdflags,
-			vma_area->e->status,
-			vma_area->e->pgoff,
-			opt, vma_area->e->shmid);
+	pr_info("%#" PRIx64 "-%#" PRIx64 " (%" PRIi64 "K) prot %#x flags %#x fdflags %#o st %#x off %#" PRIx64 " "
+		"%s shmid: %#" PRIx64 "\n",
+		vma_area->e->start, vma_area->e->end, KBYTES(vma_area_len(vma_area)), vma_area->e->prot,
+		vma_area->e->flags, vma_area->e->fdflags, vma_area->e->status, vma_area->e->pgoff, opt,
+		vma_area->e->shmid);
 }
 
 int close_safe(int *fd)
@@ -237,13 +231,11 @@ int reopen_fd_as_safe(char *file, int line, int new_fd, int old_fd, bool allow_r
 		else
 			tmp = dup2(old_fd, new_fd);
 		if (tmp < 0) {
-			pr_perror("Dup %d -> %d failed (called at %s:%d)",
-				  old_fd, new_fd, file, line);
+			pr_perror("Dup %d -> %d failed (called at %s:%d)", old_fd, new_fd, file, line);
 			return tmp;
 		} else if (tmp != new_fd) {
 			close(tmp);
-			pr_err("fd %d already in use (called at %s:%d)\n",
-				new_fd, file, line);
+			pr_err("fd %d already in use (called at %s:%d)\n", new_fd, file, line);
 			return -1;
 		}
 
@@ -459,8 +451,7 @@ int copy_file(int fd_in, int fd_out, size_t bytes)
 
 		if (ret == 0) {
 			if (bytes && (written != bytes)) {
-				pr_err("Ghost file size mismatch %zu/%zu\n",
-						written, bytes);
+				pr_err("Ghost file size mismatch %zu/%zu\n", written, bytes);
 				return -1;
 			}
 			break;
@@ -499,15 +490,15 @@ int is_anon_link_type(char *link, char *type)
 	return !strcmp(link, aux);
 }
 
-#define DUP_SAFE(fd, out)						\
-	({							\
-		int ret__;					\
-		ret__ = dup(fd);				\
-		if (ret__ == -1) {				\
-			pr_perror("dup(%d) failed", fd);	\
-			goto out;				\
-		}						\
-		ret__;						\
+#define DUP_SAFE(fd, out)                                \
+	({                                               \
+		int ret__;                               \
+		ret__ = dup(fd);                         \
+		if (ret__ == -1) {                       \
+			pr_perror("dup(%d) failed", fd); \
+			goto out;                        \
+		}                                        \
+		ret__;                                   \
 	})
 
 /*
@@ -553,8 +544,7 @@ static int close_fds(int minfd)
 	return 0;
 }
 
-int cr_system_userns(int in, int out, int err, char *cmd,
-			char *const argv[], unsigned flags, int userns_pid)
+int cr_system_userns(int in, int out, int err, char *cmd, char *const argv[], unsigned flags, int userns_pid)
 {
 	sigset_t blockmask, oldmask;
 	int ret = -1, status;
@@ -602,8 +592,7 @@ int cr_system_userns(int in, int out, int err, char *cmd,
 		if (out == in)
 			out = DUP_SAFE(out, out_chld);
 
-		if (move_fd_from(&out, STDIN_FILENO) ||
-		    move_fd_from(&err, STDIN_FILENO))
+		if (move_fd_from(&out, STDIN_FILENO) || move_fd_from(&err, STDIN_FILENO))
 			goto out_chld;
 
 		if (in < 0) {
@@ -627,9 +616,9 @@ int cr_system_userns(int in, int out, int err, char *cmd,
 		execvp(cmd, argv);
 
 		/* We can't use pr_error() as log file fd is closed. */
-		fprintf(stderr, "Error (%s:%d): " LOG_PREFIX "execvp(\"%s\", ...) failed: %s\n",
-		       __FILE__, __LINE__, cmd, strerror(errno));
-out_chld:
+		fprintf(stderr, "Error (%s:%d): " LOG_PREFIX "execvp(\"%s\", ...) failed: %s\n", __FILE__, __LINE__,
+			cmd, strerror(errno));
+	out_chld:
 		_exit(1);
 	}
 
@@ -645,8 +634,7 @@ out_chld:
 				pr_err("exited, status=%d\n", WEXITSTATUS(status));
 			break;
 		} else if (WIFSIGNALED(status)) {
-			pr_err("killed by signal %d: %s\n", WTERMSIG(status),
-				strsignal(WTERMSIG(status)));
+			pr_err("killed by signal %d: %s\n", WTERMSIG(status), strsignal(WTERMSIG(status)));
 			break;
 		} else if (WIFSTOPPED(status)) {
 			pr_err("stopped by signal %d\n", WSTOPSIG(status));
@@ -918,7 +906,6 @@ void split(char *str, char token, char ***out, int *n)
 	if (!*out) {
 		*n = -1;
 		return;
-
 	}
 
 	cur = str;
@@ -946,12 +933,12 @@ void split(char *str, char token, char ***out, int *n)
 		}
 
 		i++;
-	} while(cur);
+	} while (cur);
 }
 
 int fd_has_data(int lfd)
 {
-	struct pollfd pfd = {lfd, POLLIN, 0};
+	struct pollfd pfd = { lfd, POLLIN, 0 };
 	int ret;
 
 	ret = poll(&pfd, 1, 0);
@@ -1031,8 +1018,7 @@ void tcp_nodelay(int sk, bool on)
 		pr_perror("Unable to restore TCP_NODELAY (%d)", val);
 }
 
-static int get_sockaddr_in(struct sockaddr_storage *addr, char *host,
-			unsigned short port)
+static int get_sockaddr_in(struct sockaddr_storage *addr, char *host, unsigned short port)
 {
 	memset(addr, 0, sizeof(*addr));
 
@@ -1045,7 +1031,8 @@ static int get_sockaddr_in(struct sockaddr_storage *addr, char *host,
 		addr->ss_family = AF_INET6;
 	} else {
 		pr_err("Invalid server address \"%s\". "
-		"The address must be in IPv4 or IPv6 format.\n", host);
+		       "The address must be in IPv4 or IPv6 format.\n",
+		       host);
 		return -1;
 	}
 
@@ -1078,8 +1065,7 @@ int setup_tcp_server(char *type, char *addr, unsigned short *port)
 		return -1;
 	}
 
-	if (setsockopt(
-		sk, SOL_SOCKET, SO_REUSEADDR, &sockopt, sizeof(sockopt)) == -1) {
+	if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &sockopt, sizeof(sockopt)) == -1) {
 		pr_perror("Unable to set SO_REUSEADDR");
 		goto out;
 	}
@@ -1152,9 +1138,8 @@ int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk)
 			pr_perror("Can't accept connection to server");
 			goto err;
 		} else
-			pr_info("Accepted connection from %s:%u\n",
-					inet_ntoa(caddr.sin_addr),
-					(int)ntohs(caddr.sin_port));
+			pr_info("Accepted connection from %s:%u\n", inet_ntoa(caddr.sin_addr),
+				(int)ntohs(caddr.sin_port));
 		close(sk);
 	}
 
@@ -1190,8 +1175,7 @@ int setup_tcp_client(char *hostname)
 	 * Iterate through addr_list and try to connect. The loop stops if the
 	 * connection is successful or we reach the end of the list.
 	 */
-	for(p = addr_list; p != NULL; p = p->ai_next) {
-
+	for (p = addr_list; p != NULL; p = p->ai_next) {
 		if (p->ai_family == AF_INET) {
 			struct sockaddr_in *ipv4 = (struct sockaddr_in *)p->ai_addr;
 			ip = &(ipv4->sin_addr);
@@ -1344,8 +1328,7 @@ int call_in_child_process(int (*fn)(void *), void *arg)
 	 * Parent freezes till child exit, so child may use the same stack.
 	 * No SIGCHLD flag, so it's not need to block signal.
 	 */
-	pid = clone_noasan(fn, CLONE_VFORK | CLONE_VM | CLONE_FILES |
-			   CLONE_IO | CLONE_SIGHAND | CLONE_SYSVSEM, arg);
+	pid = clone_noasan(fn, CLONE_VFORK | CLONE_VM | CLONE_FILES | CLONE_IO | CLONE_SIGHAND | CLONE_SYSVSEM, arg);
 	if (pid == -1) {
 		pr_perror("Can't clone");
 		return -1;
@@ -1381,7 +1364,6 @@ void rlimit_unlimit_nofile(void)
 	service_fd_rlim_cur = kdat.sysctl_nr_open;
 }
 
-
 #ifdef __GLIBC__
 #include <execinfo.h>
 void print_stack_trace(pid_t pid)
@@ -1426,17 +1408,16 @@ int mount_detached_fs(const char *fsname)
 int strip_deleted(char *name, int len)
 {
 	struct dcache_prepends {
-		const char	*str;
-		size_t		len;
-	} static const prepends[] = {
-		{
-			.str	= " (deleted)",
-			.len	= 10,
-		}, {
-			.str	= "//deleted",
-			.len	= 9,
-		}
-	};
+		const char *str;
+		size_t len;
+	} static const prepends[] = { {
+					      .str = " (deleted)",
+					      .len = 10,
+				      },
+				      {
+					      .str = "//deleted",
+					      .len = 9,
+				      } };
 	size_t i;
 
 	for (i = 0; i < ARRAY_SIZE(prepends); i++) {
@@ -1447,8 +1428,7 @@ int strip_deleted(char *name, int len)
 
 		at = len - prepends[i].len;
 		if (!strcmp(&name[at], prepends[i].str)) {
-			pr_debug("Strip '%s' tag from '%s'\n",
-				 prepends[i].str, name);
+			pr_debug("Strip '%s' tag from '%s'\n", prepends[i].str, name);
 			name[at] = '\0';
 			len -= prepends[i].len;
 			return 1;
@@ -1544,16 +1524,8 @@ char *get_legacy_iptables_bin(bool ipv6)
 	 * 1  - present.
 	 */
 	static int iptables_present[2] = { 0, 0 };
-	char bins[2][2][32] = {
-		{
-			"iptables-save",
-			"iptables-legacy-save"
-		},
-		{
-			"ip6tables-save",
-			"ip6tables-legacy-save"
-		}
-	};
+	char bins[2][2][32] = { { "iptables-save", "iptables-legacy-save" },
+				{ "ip6tables-save", "ip6tables-legacy-save" } };
 	int ret;
 
 	if (iptables_present[ipv6] == -1)
@@ -1570,8 +1542,7 @@ char *get_legacy_iptables_bin(bool ipv6)
 	 * let's try iptables-legacy
 	 */
 	if (ret < 0 || ret == 1) {
-		memcpy(iptables_bin[ipv6], bins[ipv6][1],
-					   strlen(bins[ipv6][1]) + 1);
+		memcpy(iptables_bin[ipv6], bins[ipv6][1], strlen(bins[ipv6][1]) + 1);
 		ret = is_iptables_nft(iptables_bin[ipv6]);
 		if (ret < 0 || ret == 1) {
 			iptables_present[ipv6] = -1;
diff --git a/criu/vdso-compat.c b/criu/vdso-compat.c
index 8f5d19e10..15411ee0e 100644
--- a/criu/vdso-compat.c
+++ b/criu/vdso-compat.c
@@ -34,22 +34,19 @@ static void exit_on(int ret, int err_fd, char *reason)
  * WARN: This helper shouldn't call pr_err() or any syscall with
  *	 Glibc's wrapper function - it may very likely blow up.
  */
-void compat_vdso_helper(struct vdso_maps *native, int pipe_fd,
-		int err_fd, void *vdso_buf, size_t buf_size)
+void compat_vdso_helper(struct vdso_maps *native, int pipe_fd, int err_fd, void *vdso_buf, size_t buf_size)
 {
 	void *vdso_addr;
 	long vdso_size;
 	long ret;
 
 	if (native->vdso_start != VDSO_BAD_ADDR) {
-		ret = syscall(__NR_munmap,
-			native->vdso_start, native->sym.vdso_size);
+		ret = syscall(__NR_munmap, native->vdso_start, native->sym.vdso_size);
 		exit_on(ret, err_fd, "Error: Failed to unmap native vdso\n");
 	}
 
 	if (native->vvar_start != VVAR_BAD_ADDR) {
-		ret = syscall(__NR_munmap,
-			native->vvar_start, native->sym.vvar_size);
+		ret = syscall(__NR_munmap, native->vvar_start, native->sym.vvar_size);
 		exit_on(ret, err_fd, "Error: Failed to unmap native vvar\n");
 	}
 
diff --git a/criu/vdso.c b/criu/vdso.c
index b8a28dd63..dc70513d8 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -23,13 +23,13 @@
 #include <compel/plugins/std/syscall.h>
 
 #ifdef LOG_PREFIX
-# undef LOG_PREFIX
+#undef LOG_PREFIX
 #endif
 #define LOG_PREFIX "vdso: "
 
 u64 vdso_pfn = VDSO_BAD_PFN;
-struct vdso_maps vdso_maps		= VDSO_MAPS_INIT;
-struct vdso_maps vdso_maps_compat	= VDSO_MAPS_INIT;
+struct vdso_maps vdso_maps = VDSO_MAPS_INIT;
+struct vdso_maps vdso_maps_compat = VDSO_MAPS_INIT;
 
 /*
  * Starting with 3.16 the [vdso]/[vvar] marks are reported correctly
@@ -72,8 +72,7 @@ static enum vdso_check_t get_vdso_check_type(struct parasite_ctl *ctl)
 	return VDSO_CHECK_SYMS;
 }
 
-static int check_vdso_by_pfn(int pagemap_fd, struct vma_area *vma,
-			bool *has_vdso_pfn)
+static int check_vdso_by_pfn(int pagemap_fd, struct vma_area *vma, bool *has_vdso_pfn)
 {
 	u64 pfn = VDSO_BAD_PFN;
 
@@ -125,8 +124,7 @@ struct vdso_quarter {
 	unsigned long rt_vvar;
 };
 
-static void drop_rt_vdso(struct vm_area_list *vma_area_list,
-	struct vdso_quarter *addr, struct vma_area *rt_vdso_marked)
+static void drop_rt_vdso(struct vm_area_list *vma_area_list, struct vdso_quarter *addr, struct vma_area *rt_vdso_marked)
 {
 	struct vma_area *rt_vvar_marked = NULL;
 	struct vma_area *vma;
@@ -138,8 +136,8 @@ static void drop_rt_vdso(struct vm_area_list *vma_area_list,
 	 * There is marked vdso, it means such vdso is autogenerated
 	 * and must be dropped from vma list.
 	 */
-	pr_debug("vdso: Found marked at %lx (orig vDSO at %lx VVAR at %lx)\n",
-		(long)rt_vdso_marked->e->start, addr->orig_vdso, addr->orig_vvar);
+	pr_debug("vdso: Found marked at %lx (orig vDSO at %lx VVAR at %lx)\n", (long)rt_vdso_marked->e->start,
+		 addr->orig_vdso, addr->orig_vvar);
 
 	/*
 	 * Don't forget to restore the proxy vdso/vvar status, since
@@ -149,14 +147,11 @@ static void drop_rt_vdso(struct vm_area_list *vma_area_list,
 	list_for_each_entry(vma, &vma_area_list->h, list) {
 		if (vma->e->start == addr->orig_vdso) {
 			vma->e->status |= VMA_AREA_REGULAR | VMA_AREA_VDSO;
-			pr_debug("vdso: Restore orig vDSO status at %lx\n",
-					(long)vma->e->start);
+			pr_debug("vdso: Restore orig vDSO status at %lx\n", (long)vma->e->start);
 		} else if (vma->e->start == addr->orig_vvar) {
 			vma->e->status |= VMA_AREA_REGULAR | VMA_AREA_VVAR;
-			pr_debug("vdso: Restore orig VVAR status at %lx\n",
-					(long)vma->e->start);
-		} else if (addr->rt_vvar != VVAR_BAD_ADDR &&
-				addr->rt_vvar == vma->e->start) {
+			pr_debug("vdso: Restore orig VVAR status at %lx\n", (long)vma->e->start);
+		} else if (addr->rt_vvar != VVAR_BAD_ADDR && addr->rt_vvar == vma->e->start) {
 			BUG_ON(rt_vvar_marked);
 			if (not_vvar_or_vdso(vma)) {
 				pr_warn("Mark in rt-vdso points to vma, that doesn't look like vvar - skipping unmap\n");
@@ -166,15 +161,13 @@ static void drop_rt_vdso(struct vm_area_list *vma_area_list,
 		}
 	}
 
-	pr_debug("vdso: Dropping marked vdso at %lx\n",
-			(long)rt_vdso_marked->e->start);
+	pr_debug("vdso: Dropping marked vdso at %lx\n", (long)rt_vdso_marked->e->start);
 	list_del(&rt_vdso_marked->list);
 	xfree(rt_vdso_marked);
 	vma_area_list->nr--;
 
 	if (rt_vvar_marked) {
-		pr_debug("vdso: Dropping marked vvar at %lx\n",
-				(long)rt_vvar_marked->e->start);
+		pr_debug("vdso: Dropping marked vvar at %lx\n", (long)rt_vvar_marked->e->start);
 		list_del(&rt_vvar_marked->list);
 		xfree(rt_vvar_marked);
 		vma_area_list->nr--;
@@ -190,9 +183,8 @@ static void drop_rt_vdso(struct vm_area_list *vma_area_list,
  * we have to scan the vma zone for vDSO elf structure
  * which gonna be a slow way.
  */
-static int check_if_vma_is_vdso(enum vdso_check_t vcheck, int pagemap_fd,
-	struct parasite_ctl *ctl, struct vma_area *vma,
-	struct vma_area **rt_vdso_marked, struct vdso_quarter *addr)
+static int check_if_vma_is_vdso(enum vdso_check_t vcheck, int pagemap_fd, struct parasite_ctl *ctl,
+				struct vma_area *vma, struct vma_area **rt_vdso_marked, struct vdso_quarter *addr)
 {
 	struct parasite_vdso_vma_entry *args;
 	bool has_vdso_pfn = false;
@@ -220,10 +212,10 @@ static int check_if_vma_is_vdso(enum vdso_check_t vcheck, int pagemap_fd,
 			pr_err("Ow! Second vdso mark detected!\n");
 			return -1;
 		}
-		*rt_vdso_marked	= vma;
-		addr->orig_vdso	= args->orig_vdso_addr;
-		addr->orig_vvar	= args->orig_vvar_addr;
-		addr->rt_vvar	= args->rt_vvar_addr;
+		*rt_vdso_marked = vma;
+		addr->orig_vdso = args->orig_vdso_addr;
+		addr->orig_vvar = args->orig_vvar_addr;
+		addr->rt_vvar = args->rt_vvar_addr;
 		return 0;
 	}
 
@@ -239,14 +231,12 @@ static int check_if_vma_is_vdso(enum vdso_check_t vcheck, int pagemap_fd,
 
 	if (has_vdso_pfn || args->is_vdso) {
 		if (!vma_area_is(vma, VMA_AREA_VDSO)) {
-			pr_debug("Restore vDSO status by pfn/symtable at %lx\n",
-					(long)vma->e->start);
+			pr_debug("Restore vDSO status by pfn/symtable at %lx\n", (long)vma->e->start);
 			vma->e->status |= VMA_AREA_VDSO;
 		}
 	} else {
 		if (unlikely(vma_area_is(vma, VMA_AREA_VDSO))) {
-			pr_debug("Drop mishinted vDSO status at %lx\n",
-					(long)vma->e->start);
+			pr_debug("Drop mishinted vDSO status at %lx\n", (long)vma->e->start);
 			vma->e->status &= ~VMA_AREA_VDSO;
 		}
 	}
@@ -260,8 +250,7 @@ static int check_if_vma_is_vdso(enum vdso_check_t vcheck, int pagemap_fd,
  * them and eliminated from the VMAs list, they will be
  * generated again on restore if needed.
  */
-int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid,
-			struct vm_area_list *vma_area_list)
+int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid, struct vm_area_list *vma_area_list)
 {
 	struct vma_area *rt_vdso_marked = NULL;
 	struct vdso_quarter addr = {
@@ -292,8 +281,7 @@ int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid,
 		 * all vmas and restore potentially remapped vDSO
 		 * area status.
 		 */
-		if (check_if_vma_is_vdso(vcheck, fd, ctl, vma,
-					&rt_vdso_marked, &addr)) {
+		if (check_if_vma_is_vdso(vcheck, fd, ctl, vma, &rt_vdso_marked, &addr)) {
 			close_safe(&fd);
 			return -1;
 		}
@@ -389,8 +377,7 @@ static int validate_vdso_addr(struct vdso_maps *s)
 	 */
 	if (s->vdso_start != VDSO_BAD_ADDR) {
 		if (s->vvar_start != VVAR_BAD_ADDR) {
-			if (vdso_end != s->vvar_start &&
-			    vvar_end != s->vdso_start) {
+			if (vdso_end != s->vvar_start && vvar_end != s->vdso_start) {
 				pr_err("Unexpected rt vDSO area bounds\n");
 				return -1;
 			}
@@ -414,16 +401,14 @@ static int vdso_fill_self_symtable(struct vdso_maps *s)
 	if (validate_vdso_addr(s))
 		return -1;
 
-	pr_debug("rt [vdso] %lx-%lx [vvar] %lx-%lx\n",
-		 s->vdso_start, s->vdso_start + s->sym.vdso_size,
-		 s->vvar_start, s->vvar_start + s->sym.vvar_size);
+	pr_debug("rt [vdso] %lx-%lx [vvar] %lx-%lx\n", s->vdso_start, s->vdso_start + s->sym.vdso_size, s->vvar_start,
+		 s->vvar_start + s->sym.vvar_size);
 
 	return 0;
 }
 
 #ifdef CONFIG_COMPAT
-static int vdso_mmap_compat(struct vdso_maps *native,
-		struct vdso_maps *compat, void *vdso_buf, size_t buf_size)
+static int vdso_mmap_compat(struct vdso_maps *native, struct vdso_maps *compat, void *vdso_buf, size_t buf_size)
 {
 	pid_t pid;
 	int status, ret = -1;
@@ -441,8 +426,7 @@ static int vdso_mmap_compat(struct vdso_maps *native,
 			syscall(__NR_exit, 1);
 		}
 
-		compat_vdso_helper(native, fds[0], log_get_fd(),
-				vdso_buf, buf_size);
+		compat_vdso_helper(native, fds[0], log_get_fd(), vdso_buf, buf_size);
 
 		BUG();
 	}
@@ -454,8 +438,7 @@ static int vdso_mmap_compat(struct vdso_maps *native,
 	waitpid(pid, &status, WUNTRACED);
 
 	if (WIFEXITED(status)) {
-		pr_err("Compat vdso helper exited with %d\n",
-				WEXITSTATUS(status));
+		pr_err("Compat vdso helper exited with %d\n", WEXITSTATUS(status));
 		goto out_kill;
 	}
 
@@ -474,8 +457,7 @@ static int vdso_mmap_compat(struct vdso_maps *native,
 		pr_perror("Failed to kill(SIGCONT) for compat vdso helper");
 		goto out_kill;
 	}
-	if (write(fds[1], &compat->vdso_start, sizeof(void *)) !=
-			sizeof(compat->vdso_start)) {
+	if (write(fds[1], &compat->vdso_start, sizeof(void *)) != sizeof(compat->vdso_start)) {
 		pr_perror("Failed write to pipe");
 		goto out_kill;
 	}
@@ -497,9 +479,8 @@ out_close:
 	return ret;
 }
 
-#define COMPAT_VDSO_BUF_SZ		(PAGE_SIZE*2)
-static int vdso_fill_compat_symtable(struct vdso_maps *native,
-		struct vdso_maps *compat)
+#define COMPAT_VDSO_BUF_SZ (PAGE_SIZE * 2)
+static int vdso_fill_compat_symtable(struct vdso_maps *native, struct vdso_maps *compat)
 {
 	void *vdso_mmap;
 	int ret = -1;
@@ -507,8 +488,7 @@ static int vdso_fill_compat_symtable(struct vdso_maps *native,
 	if (!kdat.compat_cr)
 		return 0;
 
-	vdso_mmap = mmap(NULL, COMPAT_VDSO_BUF_SZ, PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	vdso_mmap = mmap(NULL, COMPAT_VDSO_BUF_SZ, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 	if (vdso_mmap == MAP_FAILED) {
 		pr_perror("Failed to mmap buf for compat vdso");
 		return -1;
@@ -519,15 +499,14 @@ static int vdso_fill_compat_symtable(struct vdso_maps *native,
 		goto out_unmap;
 	}
 
-	if (vdso_fill_symtable_compat((uintptr_t)vdso_mmap,
-				compat->sym.vdso_size, &compat->sym)) {
+	if (vdso_fill_symtable_compat((uintptr_t)vdso_mmap, compat->sym.vdso_size, &compat->sym)) {
 		pr_err("Failed to parse mmaped compatible vdso blob\n");
 		goto out_unmap;
 	}
 
-	pr_debug("compat [vdso] %lx-%lx [vvar] %lx-%lx\n",
-		 compat->vdso_start, compat->vdso_start + compat->sym.vdso_size,
-		 compat->vvar_start, compat->vvar_start + compat->sym.vvar_size);
+	pr_debug("compat [vdso] %lx-%lx [vvar] %lx-%lx\n", compat->vdso_start,
+		 compat->vdso_start + compat->sym.vdso_size, compat->vvar_start,
+		 compat->vvar_start + compat->sym.vvar_size);
 	ret = 0;
 
 out_unmap:
@@ -610,8 +589,8 @@ int vdso_init_restore(void)
 
 	vdso_maps.sym = kdat.vdso_sym;
 #ifdef CONFIG_COMPAT
-	vdso_maps_compat.sym		= kdat.vdso_sym_compat;
-	vdso_maps_compat.compatible	= true;
+	vdso_maps_compat.sym = kdat.vdso_sym_compat;
+	vdso_maps_compat.compatible = true;
 #endif
 
 	return 0;
@@ -641,8 +620,8 @@ int kerndat_vdso_fill_symtable(void)
 		pr_err("Failed to fill compat vdso symtable\n");
 		return -1;
 	}
-	vdso_maps_compat.compatible	= true;
-	kdat.vdso_sym_compat		= vdso_maps_compat.sym;
+	vdso_maps_compat.compatible = true;
+	kdat.vdso_sym_compat = vdso_maps_compat.sym;
 #endif
 
 	return 0;
@@ -676,14 +655,13 @@ int kerndat_vdso_preserves_hint(void)
 		unsigned long vdso_size = vdso_maps.sym.vdso_size;
 		void *new_addr;
 
-		new_addr = mmap(0, vdso_size, PROT_NONE,
-				MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+		new_addr = mmap(0, vdso_size, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 		if (new_addr == MAP_FAILED)
 			exit(1);
 
 		child = getpid();
-		new_addr = (void *)syscall(SYS_mremap, vdso_addr, vdso_size,
-			vdso_size, MREMAP_MAYMOVE | MREMAP_FIXED, new_addr);
+		new_addr = (void *)syscall(SYS_mremap, vdso_addr, vdso_size, vdso_size, MREMAP_MAYMOVE | MREMAP_FIXED,
+					   new_addr);
 		if (new_addr == MAP_FAILED)
 			syscall(SYS_exit, 2);
 		syscall(SYS_kill, child, SIGSTOP);
@@ -699,8 +677,7 @@ int kerndat_vdso_preserves_hint(void)
 	} else if (WIFSIGNALED(status)) {
 		int sig = WTERMSIG(status);
 
-		pr_err("Child unexpectedly signaled with %d: %s\n",
-				sig, strsignal(sig));
+		pr_err("Child unexpectedly signaled with %d: %s\n", sig, strsignal(sig));
 		goto out;
 	} else if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP) {
 		pr_err("Child is unstoppable or was stopped by other means\n");
diff --git a/include/common/scm-code.c b/include/common/scm-code.c
index 351c405b9..d7d732587 100644
--- a/include/common/scm-code.c
+++ b/include/common/scm-code.c
@@ -2,16 +2,15 @@
 #error "The __sys macro is required"
 #endif
 
-static void scm_fdset_init_chunk(struct scm_fdset *fdset, int nr_fds,
-		void *data, unsigned ch_size)
+static void scm_fdset_init_chunk(struct scm_fdset *fdset, int nr_fds, void *data, unsigned ch_size)
 {
 	struct cmsghdr *cmsg;
 	static char dummy;
 
 	fdset->hdr.msg_controllen = CMSG_LEN(sizeof(int) * nr_fds);
 
-	cmsg		= CMSG_FIRSTHDR(&fdset->hdr);
-	cmsg->cmsg_len	= fdset->hdr.msg_controllen;
+	cmsg = CMSG_FIRSTHDR(&fdset->hdr);
+	cmsg->cmsg_len = fdset->hdr.msg_controllen;
 
 	if (data) {
 		fdset->iov.iov_base = data;
@@ -22,33 +21,31 @@ static void scm_fdset_init_chunk(struct scm_fdset *fdset, int nr_fds,
 	}
 }
 
-static int *scm_fdset_init(struct scm_fdset *fdset, struct sockaddr_un *saddr,
-		int saddr_len)
+static int *scm_fdset_init(struct scm_fdset *fdset, struct sockaddr_un *saddr, int saddr_len)
 {
 	struct cmsghdr *cmsg;
 
 	BUILD_BUG_ON(sizeof(fdset->msg_buf) < (CMSG_SPACE(sizeof(int) * CR_SCM_MAX_FD)));
 
-	fdset->iov.iov_base		= (void *)0xdeadbeef;
+	fdset->iov.iov_base = (void *)0xdeadbeef;
 
-	fdset->hdr.msg_iov		= &fdset->iov;
-	fdset->hdr.msg_iovlen		= 1;
-	fdset->hdr.msg_name		= (struct sockaddr *)saddr;
-	fdset->hdr.msg_namelen		= saddr_len;
+	fdset->hdr.msg_iov = &fdset->iov;
+	fdset->hdr.msg_iovlen = 1;
+	fdset->hdr.msg_name = (struct sockaddr *)saddr;
+	fdset->hdr.msg_namelen = saddr_len;
 
-	fdset->hdr.msg_control		= &fdset->msg_buf;
-	fdset->hdr.msg_controllen	= CMSG_LEN(sizeof(int) * CR_SCM_MAX_FD);
+	fdset->hdr.msg_control = &fdset->msg_buf;
+	fdset->hdr.msg_controllen = CMSG_LEN(sizeof(int) * CR_SCM_MAX_FD);
 
-	cmsg				= CMSG_FIRSTHDR(&fdset->hdr);
-	cmsg->cmsg_len			= fdset->hdr.msg_controllen;
-	cmsg->cmsg_level		= SOL_SOCKET;
-	cmsg->cmsg_type			= SCM_RIGHTS;
+	cmsg = CMSG_FIRSTHDR(&fdset->hdr);
+	cmsg->cmsg_len = fdset->hdr.msg_controllen;
+	cmsg->cmsg_level = SOL_SOCKET;
+	cmsg->cmsg_type = SCM_RIGHTS;
 
 	return (int *)CMSG_DATA(cmsg);
 }
 
-int send_fds(int sock, struct sockaddr_un *saddr, int len,
-		int *fds, int nr_fds, void *data, unsigned ch_size)
+int send_fds(int sock, struct sockaddr_un *saddr, int len, int *fds, int nr_fds, void *data, unsigned ch_size)
 {
 	/* In musl_libc the msghdr structure has pads which has to be zeroed */
 	struct scm_fdset fdset = {};
@@ -63,7 +60,7 @@ int send_fds(int sock, struct sockaddr_un *saddr, int len,
 
 		ret = __sys(sendmsg)(sock, &fdset.hdr, 0);
 		if (ret <= 0)
-			return ret ? : -1;
+			return ret ?: -1;
 
 		if (data)
 			data += min_fd * ch_size;
@@ -118,4 +115,3 @@ int __recv_fds(int sock, int *fds, int nr_fds, void *data, unsigned ch_size, int
 
 	return 0;
 }
-
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 6f7c673eb..86c9dedf3 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -21,15 +21,15 @@
 const char *criu_lib_version = CRIU_VERSION;
 
 struct criu_opts {
-	CriuOpts		*rpc;
-	int			(*notify)(char *action, criu_notify_arg_t na);
-	enum criu_service_comm	service_comm;
+	CriuOpts *rpc;
+	int (*notify)(char *action, criu_notify_arg_t na);
+	enum criu_service_comm service_comm;
 	union {
-		const char	*service_address;
-		int		service_fd;
-		const char	*service_binary;
+		const char *service_address;
+		int service_fd;
+		const char *service_binary;
 	};
-	int			swrk_pid;
+	int swrk_pid;
 };
 
 static criu_opts *global_opts;
@@ -38,15 +38,15 @@ static int orphan_pts_master_fd = -1;
 
 void criu_free_service(criu_opts *opts)
 {
-	switch(opts->service_comm) {
-		case CRIU_COMM_SK:
-			free((void*)(opts->service_address));
-			break;
+	switch (opts->service_comm) {
+	case CRIU_COMM_SK:
+		free((void *)(opts->service_address));
+		break;
 	case CRIU_COMM_BIN:
-			free((void*)(opts->service_binary));
-			break;
+		free((void *)(opts->service_binary));
+		break;
 	default:
-			break;
+		break;
 	}
 }
 
@@ -902,7 +902,6 @@ int criu_add_enable_fs(const char *fs)
 	return criu_local_add_enable_fs(global_opts, fs);
 }
 
-
 int criu_local_add_skip_mnt(criu_opts *opts, const char *mnt)
 {
 	int nr;
@@ -1146,7 +1145,7 @@ int criu_set_page_server_address_port(const char *address, int port)
 
 static CriuResp *recv_resp(int socket_fd)
 {
-	struct msghdr msg_hdr = {0};
+	struct msghdr msg_hdr = { 0 };
 	unsigned char *buf = NULL;
 	struct cmsghdr *cmsg;
 	CriuResp *msg = 0;
@@ -1245,7 +1244,7 @@ static int send_req(int socket_fd, CriuReq *req)
 		goto err;
 	}
 
-	if (write(socket_fd, buf, len)  == -1) {
+	if (write(socket_fd, buf, len) == -1) {
 		perror("Can't send request");
 		goto err;
 	}
@@ -1278,7 +1277,7 @@ static int send_notify_ack(int socket_fd, int ret)
 	 * result of acking it.
 	 */
 
-	return ret ? : send_ret;
+	return ret ?: send_ret;
 }
 
 static void swrk_wait(criu_opts *opts)
@@ -1337,7 +1336,7 @@ static int swrk_connect(criu_opts *opts, bool d)
 
 		execlp(opts->service_binary, opts->service_binary, "swrk", fds, NULL);
 		perror("Can't exec criu swrk");
-child_err:
+	child_err:
 		close(sks[1]);
 		exit(1);
 	}
@@ -1384,8 +1383,7 @@ static int criu_connect(criu_opts *opts, bool d)
 
 	addr_len = strlen(opts->service_address);
 	if (addr_len >= sizeof(addr.sun_path)) {
-		fprintf(stderr, "The service address %s is too long",
-					opts->service_address);
+		fprintf(stderr, "The service address %s is too long", opts->service_address);
 		close(fd);
 		return -1;
 	}
@@ -1393,7 +1391,7 @@ static int criu_connect(criu_opts *opts, bool d)
 
 	addr_len += sizeof(addr.sun_family);
 
-	ret = connect(fd, (struct sockaddr *) &addr, addr_len);
+	ret = connect(fd, (struct sockaddr *)&addr, addr_len);
 	if (ret < 0) {
 		saved_errno = errno;
 		perror("Can't connect to socket");
@@ -1429,14 +1427,12 @@ again:
 		if (!ret) {
 			criu_resp__free_unpacked(*resp, NULL);
 			goto again;
-		}
-		else
+		} else
 			goto exit;
 	}
 
 	if ((*resp)->type != req->type) {
-		if ((*resp)->type == CRIU_REQ_TYPE__EMPTY &&
-		    (*resp)->success == false)
+		if ((*resp)->type == CRIU_REQ_TYPE__EMPTY && (*resp)->success == false)
 			ret = -EINVAL;
 		else {
 			perror("Unexpected response type");
@@ -1716,13 +1712,13 @@ int criu_restore_child(void)
 int criu_local_get_version(criu_opts *opts)
 {
 	int ret = -1;
-	CriuReq req	= CRIU_REQ__INIT;
-	CriuResp *resp	= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 
 	saved_errno = 0;
 
-	req.type	= CRIU_REQ_TYPE__VERSION;
-	req.opts	= opts->rpc;
+	req.type = CRIU_REQ_TYPE__VERSION;
+	req.opts = opts->rpc;
 
 	ret = send_req_and_recv_resp(opts, &req, &resp);
 	if (ret)
diff --git a/soccr/soccr.c b/soccr/soccr.c
index 20eabfbd4..f6fb1946b 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -10,21 +10,21 @@
 
 #ifndef SIOCOUTQNSD
 /* MAO - Define SIOCOUTQNSD ioctl if we don't have it */
-#define SIOCOUTQNSD     0x894B
+#define SIOCOUTQNSD 0x894B
 #endif
 
 enum {
 	TCPF_ESTABLISHED = (1 << 1),
-	TCPF_SYN_SENT    = (1 << 2),
-	TCPF_SYN_RECV    = (1 << 3),
-	TCPF_FIN_WAIT1   = (1 << 4),
-	TCPF_FIN_WAIT2   = (1 << 5),
-	TCPF_TIME_WAIT   = (1 << 6),
-	TCPF_CLOSE       = (1 << 7),
-	TCPF_CLOSE_WAIT  = (1 << 8),
-	TCPF_LAST_ACK    = (1 << 9),
-	TCPF_LISTEN      = (1 << 10),
-	TCPF_CLOSING     = (1 << 11),
+	TCPF_SYN_SENT = (1 << 2),
+	TCPF_SYN_RECV = (1 << 3),
+	TCPF_FIN_WAIT1 = (1 << 4),
+	TCPF_FIN_WAIT2 = (1 << 5),
+	TCPF_TIME_WAIT = (1 << 6),
+	TCPF_CLOSE = (1 << 7),
+	TCPF_CLOSE_WAIT = (1 << 8),
+	TCPF_LAST_ACK = (1 << 9),
+	TCPF_LISTEN = (1 << 10),
+	TCPF_CLOSING = (1 << 11),
 };
 
 /*
@@ -55,7 +55,7 @@ enum {
  */
 
 /* Restore a fin packet in a send queue first */
-#define SNDQ_FIRST_FIN	(TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING)
+#define SNDQ_FIRST_FIN (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSING)
 /* Restore fin in a send queue after restoring fi in the receive queue. */
 #define SNDQ_SECOND_FIN (TCPF_LAST_ACK | TCPF_CLOSE)
 #define SNDQ_FIN_ACKED	(TCPF_FIN_WAIT2 | TCPF_CLOSE)
@@ -64,8 +64,7 @@ enum {
 #define RCVQ_SECOND_FIN (TCPF_CLOSING)
 #define RCVQ_FIN_ACKED	(TCPF_CLOSE)
 
-static void (*log)(unsigned int loglevel, const char *format, ...)
-	__attribute__ ((__format__ (__printf__, 2, 3)));
+static void (*log)(unsigned int loglevel, const char *format, ...) __attribute__((__format__(__printf__, 2, 3)));
 static unsigned int log_level = 0;
 
 void libsoccr_set_log(unsigned int level, void (*fn)(unsigned int level, const char *fmt, ...))
@@ -74,9 +73,17 @@ void libsoccr_set_log(unsigned int level, void (*fn)(unsigned int level, const c
 	log = fn;
 }
 
-#define loge(msg, ...) do { if (log && (log_level >= SOCCR_LOG_ERR)) log(SOCCR_LOG_ERR, "Error (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__); } while (0)
+#define loge(msg, ...)                                                                                \
+	do {                                                                                          \
+		if (log && (log_level >= SOCCR_LOG_ERR))                                              \
+			log(SOCCR_LOG_ERR, "Error (%s:%d): " msg, __FILE__, __LINE__, ##__VA_ARGS__); \
+	} while (0)
 #define logerr(msg, ...) loge(msg ": %s\n", ##__VA_ARGS__, strerror(errno))
-#define logd(msg, ...) do { if (log && (log_level >= SOCCR_LOG_DBG)) log(SOCCR_LOG_DBG, "Debug: " msg, ##__VA_ARGS__); } while (0)
+#define logd(msg, ...)                                                    \
+	do {                                                              \
+		if (log && (log_level >= SOCCR_LOG_DBG))                  \
+			log(SOCCR_LOG_DBG, "Debug: " msg, ##__VA_ARGS__); \
+	} while (0)
 
 static int tcp_repair_on(int fd)
 {
@@ -109,10 +116,10 @@ struct libsoccr_sk {
 	union libsoccr_addr *dst_addr;
 };
 
-#define SK_FLAG_FREE_RQ		0x1
-#define SK_FLAG_FREE_SQ		0x2
-#define SK_FLAG_FREE_SA		0x4
-#define SK_FLAG_FREE_DA		0x8
+#define SK_FLAG_FREE_RQ 0x1
+#define SK_FLAG_FREE_SQ 0x2
+#define SK_FLAG_FREE_SA 0x4
+#define SK_FLAG_FREE_DA 0x8
 
 struct libsoccr_sk *libsoccr_pause(int fd)
 {
@@ -158,17 +165,16 @@ void libsoccr_release(struct libsoccr_sk *sk)
 }
 
 struct soccr_tcp_info {
-	__u8	tcpi_state;
-	__u8	tcpi_ca_state;
-	__u8	tcpi_retransmits;
-	__u8	tcpi_probes;
-	__u8	tcpi_backoff;
-	__u8	tcpi_options;
-	__u8	tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+	__u8 tcpi_state;
+	__u8 tcpi_ca_state;
+	__u8 tcpi_retransmits;
+	__u8 tcpi_probes;
+	__u8 tcpi_backoff;
+	__u8 tcpi_options;
+	__u8 tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
 };
 
-static int refresh_sk(struct libsoccr_sk *sk,
-			struct libsoccr_sk_data *data, struct soccr_tcp_info *ti)
+static int refresh_sk(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, struct soccr_tcp_info *ti)
 {
 	int size;
 	socklen_t olen = sizeof(*ti);
@@ -238,8 +244,7 @@ static int refresh_sk(struct libsoccr_sk *sk,
 	return 0;
 }
 
-static int get_stream_options(struct libsoccr_sk *sk,
-		struct libsoccr_sk_data *data, struct soccr_tcp_info *ti)
+static int get_stream_options(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, struct soccr_tcp_info *ti)
 {
 	int ret;
 	socklen_t auxl;
@@ -277,8 +282,7 @@ static int get_window(struct libsoccr_sk *sk, struct libsoccr_sk_data *data)
 	struct tcp_repair_window opt;
 	socklen_t optlen = sizeof(opt);
 
-	if (getsockopt(sk->fd, SOL_TCP,
-			TCP_REPAIR_WINDOW, &opt, &optlen)) {
+	if (getsockopt(sk->fd, SOL_TCP, TCP_REPAIR_WINDOW, &opt, &optlen)) {
 		/* Appeared since 4.8, but TCP_repair itself is since 3.11 */
 		if (errno == ENOPROTOOPT)
 			return 0;
@@ -288,11 +292,11 @@ static int get_window(struct libsoccr_sk *sk, struct libsoccr_sk_data *data)
 	}
 
 	data->flags |= SOCCR_FLAGS_WINDOW;
-	data->snd_wl1		= opt.snd_wl1;
-	data->snd_wnd		= opt.snd_wnd;
-	data->max_window	= opt.max_window;
-	data->rcv_wnd		= opt.rcv_wnd;
-	data->rcv_wup		= opt.rcv_wup;
+	data->snd_wl1 = opt.snd_wl1;
+	data->snd_wnd = opt.snd_wnd;
+	data->max_window = opt.max_window;
+	data->rcv_wnd = opt.rcv_wnd;
+	data->rcv_wup = opt.rcv_wup;
 
 	return 0;
 }
@@ -321,8 +325,7 @@ static int get_window(struct libsoccr_sk *sk, struct libsoccr_sk_data *data)
  *
  */
 
-static int get_queue(int sk, int queue_id,
-		__u32 *seq, __u32 len, char **bufp)
+static int get_queue(int sk, int queue_id, __u32 *seq, __u32 len, char **bufp)
 {
 	int ret, aux;
 	socklen_t auxl;
@@ -373,7 +376,7 @@ err_recv:
 /*
  * This is how much data we've had in the initial libsoccr
  */
-#define SOCR_DATA_MIN_SIZE	(17 * sizeof(__u32))
+#define SOCR_DATA_MIN_SIZE (17 * sizeof(__u32))
 
 int libsoccr_save(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size)
 {
@@ -406,7 +409,7 @@ int libsoccr_save(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigne
 	return sizeof(struct libsoccr_sk_data);
 }
 
-#define GET_Q_FLAGS	(SOCCR_MEM_EXCL)
+#define GET_Q_FLAGS (SOCCR_MEM_EXCL)
 char *libsoccr_get_queue_bytes(struct libsoccr_sk *sk, int queue_id, unsigned flags)
 {
 	char **p, *ret;
@@ -415,14 +418,14 @@ char *libsoccr_get_queue_bytes(struct libsoccr_sk *sk, int queue_id, unsigned fl
 		return NULL;
 
 	switch (queue_id) {
-		case TCP_RECV_QUEUE:
-			p = &sk->recv_queue;
-			break;
-		case TCP_SEND_QUEUE:
-			p = &sk->send_queue;
-			break;
-		default:
-			return NULL;
+	case TCP_RECV_QUEUE:
+		p = &sk->recv_queue;
+		break;
+	case TCP_SEND_QUEUE:
+		p = &sk->send_queue;
+		break;
+	default:
+		return NULL;
 	}
 
 	ret = *p;
@@ -432,7 +435,7 @@ char *libsoccr_get_queue_bytes(struct libsoccr_sk *sk, int queue_id, unsigned fl
 	return ret;
 }
 
-#define GET_SA_FLAGS	(SOCCR_MEM_EXCL)
+#define GET_SA_FLAGS (SOCCR_MEM_EXCL)
 union libsoccr_addr *libsoccr_get_addr(struct libsoccr_sk *sk, int self, unsigned flags)
 {
 	if (flags & ~GET_SA_FLAGS)
@@ -463,8 +466,7 @@ static int set_queue_seq(struct libsoccr_sk *sk, int queue, __u32 seq)
 #define TCPOPT_SACK_PERM TCPOPT_SACK_PERMITTED
 #endif
 
-static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk,
-		struct libsoccr_sk_data *data, unsigned data_size)
+static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size)
 {
 	struct tcp_repair_opt opts[4];
 	int addr_size, mstate;
@@ -505,8 +507,7 @@ static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk,
 	if (mstate & (SNDQ_FIRST_FIN | SNDQ_SECOND_FIN))
 		data->outq_seq--;
 
-	if (set_queue_seq(sk, TCP_RECV_QUEUE,
-				data->inq_seq - data->inq_len))
+	if (set_queue_seq(sk, TCP_RECV_QUEUE, data->inq_seq - data->inq_len))
 		return -2;
 
 	seq = data->outq_seq - data->outq_len;
@@ -524,8 +525,7 @@ static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk,
 	if (data->state == TCP_SYN_SENT && tcp_repair_off(sk->fd))
 		return -1;
 
-	if (connect(sk->fd, &sk->dst_addr->sa, addr_size) == -1 &&
-						errno != EINPROGRESS) {
+	if (connect(sk->fd, &sk->dst_addr->sa, addr_size) == -1 && errno != EINPROGRESS) {
 		logerr("Can't connect inet socket back");
 		return -1;
 	}
@@ -563,15 +563,13 @@ static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk,
 	onr++;
 
 	if (data->state != TCP_SYN_SENT &&
-	    setsockopt(sk->fd, SOL_TCP, TCP_REPAIR_OPTIONS,
-				opts, onr * sizeof(struct tcp_repair_opt)) < 0) {
+	    setsockopt(sk->fd, SOL_TCP, TCP_REPAIR_OPTIONS, opts, onr * sizeof(struct tcp_repair_opt)) < 0) {
 		logerr("Can't repair options");
 		return -2;
 	}
 
 	if (data->opt_mask & TCPI_OPT_TIMESTAMPS) {
-		if (setsockopt(sk->fd, SOL_TCP, TCP_TIMESTAMP,
-				&data->timestamp, sizeof(data->timestamp)) < 0) {
+		if (setsockopt(sk->fd, SOL_TCP, TCP_TIMESTAMP, &data->timestamp, sizeof(data->timestamp)) < 0) {
 			logerr("Can't set timestamp");
 			return -3;
 		}
@@ -586,8 +584,7 @@ static int ipv6_addr_mapped(union libsoccr_addr *addr)
 	return (addr->v6.sin6_addr.s6_addr32[2] == htonl(0x0000ffff));
 }
 
-static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data,
-		unsigned data_size, uint8_t flags)
+static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size, uint8_t flags)
 {
 	uint32_t src_v4 = sk->src_addr->v4.sin_addr.s_addr;
 	uint32_t dst_v4 = sk->dst_addr->v4.sin_addr.s_addr;
@@ -611,10 +608,9 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data,
 	else
 		libnet_type = LIBNET_RAW4;
 
-	l = libnet_init(
-		libnet_type,		/* injection type */
-		NULL,			/* network interface */
-		errbuf);		/* errbuf */
+	l = libnet_init(libnet_type, /* injection type */
+			NULL, /* network interface */
+			errbuf); /* errbuf */
 	if (l == NULL) {
 		loge("libnet_init failed (%s)\n", errbuf);
 		return -1;
@@ -625,20 +621,19 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data,
 		goto err;
 	}
 
-	ret = libnet_build_tcp(
-		ntohs(sk->dst_addr->v4.sin_port),		/* source port */
-		ntohs(sk->src_addr->v4.sin_port),		/* destination port */
-		data->inq_seq,			/* sequence number */
-		data->outq_seq - data->outq_len,	/* acknowledgement num */
-		flags,				/* control flags */
-		data->rcv_wnd,			/* window size */
-		0,				/* checksum */
-		10,				/* urgent pointer */
-		LIBNET_TCP_H + 20,		/* TCP packet size */
-		NULL,				/* payload */
-		0,				/* payload size */
-		l,				/* libnet handle */
-		0);				/* libnet id */
+	ret = libnet_build_tcp(ntohs(sk->dst_addr->v4.sin_port), /* source port */
+			       ntohs(sk->src_addr->v4.sin_port), /* destination port */
+			       data->inq_seq, /* sequence number */
+			       data->outq_seq - data->outq_len, /* acknowledgement num */
+			       flags, /* control flags */
+			       data->rcv_wnd, /* window size */
+			       0, /* checksum */
+			       10, /* urgent pointer */
+			       LIBNET_TCP_H + 20, /* TCP packet size */
+			       NULL, /* payload */
+			       0, /* payload size */
+			       l, /* libnet handle */
+			       0); /* libnet id */
 	if (ret == -1) {
 		loge("Can't build TCP header: %s\n", libnet_geterror(l));
 		goto err;
@@ -650,32 +645,29 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data,
 		memcpy(&dst, &sk->dst_addr->v6.sin6_addr, sizeof(dst));
 		memcpy(&src, &sk->src_addr->v6.sin6_addr, sizeof(src));
 
-		ret = libnet_build_ipv6(
-			0, 0,
-			LIBNET_TCP_H,	/* length */
-			IPPROTO_TCP,	/* protocol */
-			64,		/* hop limit */
-			dst,		/* source IP */
-			src,		/* destination IP */
-			NULL,		/* payload */
-			0,		/* payload size */
-			l,		/* libnet handle */
-			0);		/* libnet id */
+		ret = libnet_build_ipv6(0, 0, LIBNET_TCP_H, /* length */
+					IPPROTO_TCP, /* protocol */
+					64, /* hop limit */
+					dst, /* source IP */
+					src, /* destination IP */
+					NULL, /* payload */
+					0, /* payload size */
+					l, /* libnet handle */
+					0); /* libnet id */
 	} else if (family == AF_INET)
-		ret = libnet_build_ipv4(
-			LIBNET_IPV4_H + LIBNET_TCP_H + 20,	/* length */
-			0,			/* TOS */
-			242,			/* IP ID */
-			0,			/* IP Frag */
-			64,			/* TTL */
-			IPPROTO_TCP,		/* protocol */
-			0,			/* checksum */
-			dst_v4,			/* source IP */
-			src_v4,			/* destination IP */
-			NULL,			/* payload */
-			0,			/* payload size */
-			l,			/* libnet handle */
-			0);			/* libnet id */
+		ret = libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H + 20, /* length */
+					0, /* TOS */
+					242, /* IP ID */
+					0, /* IP Frag */
+					64, /* TTL */
+					IPPROTO_TCP, /* protocol */
+					0, /* checksum */
+					dst_v4, /* source IP */
+					src_v4, /* destination IP */
+					NULL, /* payload */
+					0, /* payload size */
+					l, /* libnet handle */
+					0); /* libnet id */
 	else {
 		loge("Unknown socket family\n");
 		goto err;
@@ -706,8 +698,7 @@ static int restore_fin_in_snd_queue(int sk, int acked)
 	 * If TCP_SEND_QUEUE is set, a fin packet will be
 	 * restored as a sent packet.
 	 */
-	if (acked &&
-	    setsockopt(sk, SOL_TCP, TCP_REPAIR_QUEUE, &queue, sizeof(queue)) < 0) {
+	if (acked && setsockopt(sk, SOL_TCP, TCP_REPAIR_QUEUE, &queue, sizeof(queue)) < 0) {
 		logerr("Can't set repair queue");
 		return -1;
 	}
@@ -717,8 +708,7 @@ static int restore_fin_in_snd_queue(int sk, int acked)
 		logerr("Unable to shut down a socket");
 
 	queue = TCP_NO_QUEUE;
-	if (acked &&
-	    setsockopt(sk, SOL_TCP, TCP_REPAIR_QUEUE, &queue, sizeof(queue)) < 0) {
+	if (acked && setsockopt(sk, SOL_TCP, TCP_REPAIR_QUEUE, &queue, sizeof(queue)) < 0) {
 		logerr("Can't set repair queue");
 		return -1;
 	}
@@ -726,11 +716,10 @@ static int restore_fin_in_snd_queue(int sk, int acked)
 	return ret;
 }
 
-static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size,
-		int queue, char *buf);
+static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size, int queue,
+				  char *buf);
 
-int libsoccr_restore(struct libsoccr_sk *sk,
-		struct libsoccr_sk_data *data, unsigned data_size)
+int libsoccr_restore(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size)
 {
 	int mstate = 1 << data->state;
 
@@ -827,8 +816,7 @@ static int __send_queue(struct libsoccr_sk *sk, int queue, char *buf, __u32 len)
 				continue;
 			}
 
-			logerr("Can't restore %d queue data (%d), want (%d:%d:%d)",
-				  queue, ret, chunk, len, max_chunk);
+			logerr("Can't restore %d queue data (%d), want (%d:%d:%d)", queue, ret, chunk, len, max_chunk);
 			goto err;
 		}
 		off += ret;
@@ -852,8 +840,8 @@ static int send_queue(struct libsoccr_sk *sk, int queue, char *buf, __u32 len)
 	return __send_queue(sk, queue, buf, len);
 }
 
-static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size,
-		int queue, char *buf)
+static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size, int queue,
+				  char *buf)
 {
 	if (!buf)
 		return 0;
@@ -900,29 +888,29 @@ static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_dat
 	return -5;
 }
 
-#define SET_Q_FLAGS	(SOCCR_MEM_EXCL)
+#define SET_Q_FLAGS (SOCCR_MEM_EXCL)
 int libsoccr_set_queue_bytes(struct libsoccr_sk *sk, int queue_id, char *bytes, unsigned flags)
 {
 	if (flags & ~SET_Q_FLAGS)
 		return -1;
 
 	switch (queue_id) {
-		case TCP_RECV_QUEUE:
-			sk->recv_queue = bytes;
-			if (flags & SOCCR_MEM_EXCL)
-				sk->flags |= SK_FLAG_FREE_RQ;
-			return 0;
-		case TCP_SEND_QUEUE:
-			sk->send_queue = bytes;
-			if (flags & SOCCR_MEM_EXCL)
-				sk->flags |= SK_FLAG_FREE_SQ;
-			return 0;
+	case TCP_RECV_QUEUE:
+		sk->recv_queue = bytes;
+		if (flags & SOCCR_MEM_EXCL)
+			sk->flags |= SK_FLAG_FREE_RQ;
+		return 0;
+	case TCP_SEND_QUEUE:
+		sk->send_queue = bytes;
+		if (flags & SOCCR_MEM_EXCL)
+			sk->flags |= SK_FLAG_FREE_SQ;
+		return 0;
 	}
 
 	return -1;
 }
 
-#define SET_SA_FLAGS	(SOCCR_MEM_EXCL)
+#define SET_SA_FLAGS (SOCCR_MEM_EXCL)
 int libsoccr_set_addr(struct libsoccr_sk *sk, int self, union libsoccr_addr *addr, unsigned flags)
 {
 	if (flags & ~SET_SA_FLAGS)
diff --git a/soccr/test/tcp-conn.c b/soccr/test/tcp-conn.c
index cdd75129a..b1e651147 100644
--- a/soccr/test/tcp-conn.c
+++ b/soccr/test/tcp-conn.c
@@ -1,5 +1,5 @@
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for srvaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for srvaddr_in and inet_ntoa() */
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -35,7 +35,7 @@ int main(void)
 
 	libsoccr_set_log(10, pr_printf);
 
-	memset(&addr,0,sizeof(addr));
+	memset(&addr, 0, sizeof(addr));
 
 #ifndef TEST_IPV6
 	addr.v4.sin_family = AF_INET;
@@ -56,11 +56,11 @@ int main(void)
 	}
 
 #ifndef TEST_IPV6
-		addr.v4.sin_port = htons(8765);
+	addr.v4.sin_port = htons(8765);
 #else
-		addr.v6.sin6_port = htons(8765);
+	addr.v6.sin6_port = htons(8765);
 #endif
-	ret = bind(srv, (struct sockaddr *) &addr, sizeof(addr));
+	ret = bind(srv, (struct sockaddr *)&addr, sizeof(addr));
 	if (ret == -1) {
 		pr_perror("bind() failed");
 		return -1;
@@ -81,13 +81,13 @@ int main(void)
 		return -1;
 	}
 
-	if (connect(clnt, (struct sockaddr *) &addr, sizeof(addr))) {
+	if (connect(clnt, (struct sockaddr *)&addr, sizeof(addr))) {
 		pr_perror("connect");
 		return 1;
 	}
 
 	dst_let = sizeof(dst);
-	sock = accept(srv, (struct sockaddr *) &dst, &dst_let);
+	sock = accept(srv, (struct sockaddr *)&dst, &dst_let);
 	if (sock < 0) {
 		pr_perror("accept");
 		return 1;
@@ -100,17 +100,16 @@ int main(void)
 
 	/* Start testing */
 	dst_let = sizeof(addr);
-	if (getsockname(sock, (struct sockaddr *) &addr, &dst_let)) {
+	if (getsockname(sock, (struct sockaddr *)&addr, &dst_let)) {
 		pr_perror("getsockname");
 		return 1;
 	}
 	dst_let = sizeof(addr);
-	if (getpeername(sock, (struct sockaddr *) &dst, &dst_let)) {
+	if (getpeername(sock, (struct sockaddr *)&dst, &dst_let)) {
 		pr_perror("getpeername");
 		return 1;
 	}
 
-
 	so = libsoccr_pause(sock);
 
 	dsize = libsoccr_save(so, &data, sizeof(data));
diff --git a/soccr/test/tcp-constructor.c b/soccr/test/tcp-constructor.c
index 973dbf10c..10d08e553 100644
--- a/soccr/test/tcp-constructor.c
+++ b/soccr/test/tcp-constructor.c
@@ -10,7 +10,11 @@
 
 #include "soccr/soccr.h"
 
-#define pr_perror(fmt, ...) ({ fprintf(stderr, "%s:%d: " fmt " : %m\n", __func__, __LINE__, ##__VA_ARGS__); 1; })
+#define pr_perror(fmt, ...)                                                                  \
+	({                                                                                   \
+		fprintf(stderr, "%s:%d: " fmt " : %m\n", __func__, __LINE__, ##__VA_ARGS__); \
+		1;                                                                           \
+	})
 
 struct tcp {
 	char *addr;
@@ -22,36 +26,28 @@ struct tcp {
 
 static void usage(void)
 {
-	printf(
-		"Usage: --addr ADDR -port PORT --seq SEQ --next --addr ADDR -port PORT --seq SEQ -- CMD ...\n"
-		"\t Describe a source side of a connection, then set the --next option\n"
-		"\t and describe a destination side.\n"
-		"\t --reverse - swap source and destination sides\n"
-		"\t The idea is that the same command line is execute on both sides,\n"
-		"\t but the --reverse is added to one of them.\n"
-		"\n"
-		"\t CMD ... - a user command to handle a socket, which is the descriptor 3.\n"
-		"\n"
-		"\t It prints the \"start\" on stdout when a socket is created and\n"
-		"\t resumes it when you write \"start\" to stdin.\n"
-	);
+	printf("Usage: --addr ADDR -port PORT --seq SEQ --next --addr ADDR -port PORT --seq SEQ -- CMD ...\n"
+	       "\t Describe a source side of a connection, then set the --next option\n"
+	       "\t and describe a destination side.\n"
+	       "\t --reverse - swap source and destination sides\n"
+	       "\t The idea is that the same command line is execute on both sides,\n"
+	       "\t but the --reverse is added to one of them.\n"
+	       "\n"
+	       "\t CMD ... - a user command to handle a socket, which is the descriptor 3.\n"
+	       "\n"
+	       "\t It prints the \"start\" on stdout when a socket is created and\n"
+	       "\t resumes it when you write \"start\" to stdin.\n");
 }
 
 int main(int argc, char **argv)
 {
 	static const char short_opts[] = "";
 	static struct option long_opts[] = {
-		{ "addr",	required_argument, 0, 'a' },
-		{ "port",	required_argument, 0, 'p' },
-		{ "seq",	required_argument, 0, 's' },
-		{ "next",	no_argument, 0, 'n'},
-		{ "reverse",	no_argument, 0, 'r'},
-		{},
+		{ "addr", required_argument, 0, 'a' }, { "port", required_argument, 0, 'p' },
+		{ "seq", required_argument, 0, 's' },  { "next", no_argument, 0, 'n' },
+		{ "reverse", no_argument, 0, 'r' },    {},
 	};
-	struct tcp tcp[2] = {
-				{"127.0.0.1", 12345, 5000000, 1460, 7},
-				{"127.0.0.1", 54321, 6000000, 1460, 7}
-			};
+	struct tcp tcp[2] = { { "127.0.0.1", 12345, 5000000, 1460, 7 }, { "127.0.0.1", 54321, 6000000, 1460, 7 } };
 
 	int sk, yes = 1, val, idx, opt, i, src = 0, dst = 1;
 	union libsoccr_addr src_addr, dst_addr;
@@ -82,7 +78,8 @@ int main(int argc, char **argv)
 				return pr_perror("--next is used twice or more");
 			break;
 		case 'r':
-			src = 1; dst = 0;
+			src = 1;
+			dst = 0;
 			break;
 		default:
 			usage();
diff --git a/test/compel/handle_binary.c b/test/compel/handle_binary.c
index 4ef42ae11..138b2bc71 100644
--- a/test/compel/handle_binary.c
+++ b/test/compel/handle_binary.c
@@ -10,9 +10,7 @@ extern const size_t test_elf_buf_size;
 
 static uintptr_t elf_addr;
 static const char *test_bitness;
-#define ASSERT(expected, fmt, ...)					\
-	launch_test((void *)elf_addr, expected,				\
-		fmt " %s", ##__VA_ARGS__, test_bitness)
+#define ASSERT(expected, fmt, ...) launch_test((void *)elf_addr, expected, fmt " %s", ##__VA_ARGS__, test_bitness)
 
 static const unsigned int sections_nr = 1;
 
@@ -26,12 +24,11 @@ static int test_add_strings_section(Ehdr_t *hdr)
 {
 	Shdr_t *sec_strings_hdr;
 	uintptr_t sections_table = elf_addr + hdr->e_shoff;
-	size_t sections_table_size = sections_nr*sizeof(hdr->e_shentsize);
+	size_t sections_table_size = sections_nr * sizeof(hdr->e_shentsize);
 
 	hdr->e_shnum = sections_nr;
 	hdr->e_shstrndx = sections_nr; /* off-by-one */
-	if (ASSERT(-E_NO_STR_SEC,
-			"strings section's header oob of section table"))
+	if (ASSERT(-E_NO_STR_SEC, "strings section's header oob of section table"))
 		return -1;
 
 	hdr->e_shstrndx = 0;
@@ -42,8 +39,7 @@ static int test_add_strings_section(Ehdr_t *hdr)
 		return -1;
 
 	/* Put strings just right after sections table. */
-	sec_strings_hdr->sh_offset = sections_table - elf_addr +
-						sections_table_size;
+	sec_strings_hdr->sh_offset = sections_table - elf_addr + sections_table_size;
 	return 0;
 }
 
@@ -54,8 +50,8 @@ static int test_prepare_section_table(Ehdr_t *hdr)
 		return -1;
 
 	/* Lets put sections table right after ELF header. */
-	hdr->e_shoff = (Off_t) sizeof(Ehdr_t);
-	hdr->e_shentsize = (Half_t) sizeof(Shdr_t);
+	hdr->e_shoff = (Off_t)sizeof(Ehdr_t);
+	hdr->e_shentsize = (Half_t)sizeof(Shdr_t);
 
 	hdr->e_shnum = (Half_t)-1;
 	if (ASSERT(-E_NO_STR_SEC, "too many sections in table"))
diff --git a/test/others/app-emu/job/job.c b/test/others/app-emu/job/job.c
index 44858a78b..a3c6af74c 100644
--- a/test/others/app-emu/job/job.c
+++ b/test/others/app-emu/job/job.c
@@ -45,8 +45,7 @@ int main(int argc, char *argv[])
 	gid = getgid();
 	sid = getsid(pid);
 
-	printf("pid %d gid %d sid %d\n",
-		pid, gid, sid);
+	printf("pid %d gid %d sid %d\n", pid, gid, sid);
 
 	snprintf(buf, sizeof(buf), "/proc/%d/fd", pid);
 	fd_dir = opendir(buf);
diff --git a/test/others/app-emu/make/tmpl.c b/test/others/app-emu/make/tmpl.c
index 95abdf7b6..5ebb8ff4d 100644
--- a/test/others/app-emu/make/tmpl.c
+++ b/test/others/app-emu/make/tmpl.c
@@ -1,16 +1,16 @@
 int foo(int a, int b)
 {
-#define A0(a, b) ((a)+(b))
-#define A1(a, b) ((a)>(b))?A0((a)-(b), (b)):A0((b)-(a), (a))
-#define A2(a, b) ((a)>(b))?A1((a)-(b), (b)):A1((b)-(a), (a))
-#define A3(a, b) ((a)>(b))?A2((a)-(b), (b)):A2((b)-(a), (a))
-#define A4(a, b) ((a)>(b))?A3((a)-(b), (b)):A3((b)-(a), (a))
-#define A5(a, b) ((a)>(b))?A4((a)-(b), (b)):A4((b)-(a), (a))
-#define A6(a, b) ((a)>(b))?A5((a)-(b), (b)):A5((b)-(a), (a))
-#define A7(a, b) ((a)>(b))?A6((a)-(b), (b)):A6((b)-(a), (a))
-#define A8(a, b) ((a)>(b))?A7((a)-(b), (b)):A7((b)-(a), (a))
-#define A9(a, b) ((a)>(b))?A8((a)-(b), (b)):A8((b)-(a), (a))
-#define A10(a, b) ((a)>(b))?A9((a)-(b), (b)):A9((b)-(a), (a))
-#define A11(a, b) ((a)>(b))?A10((a)-(b), (b)):A10((b)-(a), (a))
+#define A0(a, b)  ((a) + (b))
+#define A1(a, b)  ((a) > (b)) ? A0((a) - (b), (b)) : A0((b) - (a), (a))
+#define A2(a, b)  ((a) > (b)) ? A1((a) - (b), (b)) : A1((b) - (a), (a))
+#define A3(a, b)  ((a) > (b)) ? A2((a) - (b), (b)) : A2((b) - (a), (a))
+#define A4(a, b)  ((a) > (b)) ? A3((a) - (b), (b)) : A3((b) - (a), (a))
+#define A5(a, b)  ((a) > (b)) ? A4((a) - (b), (b)) : A4((b) - (a), (a))
+#define A6(a, b)  ((a) > (b)) ? A5((a) - (b), (b)) : A5((b) - (a), (a))
+#define A7(a, b)  ((a) > (b)) ? A6((a) - (b), (b)) : A6((b) - (a), (a))
+#define A8(a, b)  ((a) > (b)) ? A7((a) - (b), (b)) : A7((b) - (a), (a))
+#define A9(a, b)  ((a) > (b)) ? A8((a) - (b), (b)) : A8((b) - (a), (a))
+#define A10(a, b) ((a) > (b)) ? A9((a) - (b), (b)) : A9((b) - (a), (a))
+#define A11(a, b) ((a) > (b)) ? A10((a) - (b), (b)) : A10((b) - (a), (a))
 	return A10(a, b);
 }
diff --git a/test/others/bers/bers.c b/test/others/bers/bers.c
index bb0c9dbcb..37cf84dd3 100644
--- a/test/others/bers/bers.c
+++ b/test/others/bers/bers.c
@@ -16,71 +16,67 @@
 #include <dirent.h>
 #include <syscall.h>
 
-#define min(x, y) ({				\
-	typeof(x) _min1 = (x);			\
-	typeof(y) _min2 = (y);			\
-	(void) (&_min1 == &_min2);		\
-	_min1 < _min2 ? _min1 : _min2; })
+#define min(x, y)                              \
+	({                                     \
+		typeof(x) _min1 = (x);         \
+		typeof(y) _min2 = (y);         \
+		(void)(&_min1 == &_min2);      \
+		_min1 < _min2 ? _min1 : _min2; \
+	})
 
-#define max(x, y) ({				\
-	typeof(x) _max1 = (x);			\
-	typeof(y) _max2 = (y);			\
-	(void) (&_max1 == &_max2);		\
-	_max1 > _max2 ? _max1 : _max2; })
+#define max(x, y)                              \
+	({                                     \
+		typeof(x) _max1 = (x);         \
+		typeof(y) _max2 = (y);         \
+		(void)(&_max1 == &_max2);      \
+		_max1 > _max2 ? _max1 : _max2; \
+	})
 
-#define MAX_CHUNK		4096
-#define PAGE_SIZE		4096
+#define MAX_CHUNK 4096
+#define PAGE_SIZE 4096
 
-#define pr_info(fmt, ...)				\
-	printf("%8d: " fmt, sys_gettid(), ##__VA_ARGS__)
+#define pr_info(fmt, ...) printf("%8d: " fmt, sys_gettid(), ##__VA_ARGS__)
 
-#define pr_err(fmt, ...)				\
-	printf("%8d: Error (%s:%d): " fmt, sys_gettid(),\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+#define pr_err(fmt, ...) printf("%8d: Error (%s:%d): " fmt, sys_gettid(), __FILE__, __LINE__, ##__VA_ARGS__)
 
-#define pr_perror(fmt, ...)				\
-	pr_err(fmt ": %m\n", ##__VA_ARGS__)
+#define pr_perror(fmt, ...) pr_err(fmt ": %m\n", ##__VA_ARGS__)
 
-#define pr_msg(fmt, ...)				\
-	printf(fmt, ##__VA_ARGS__)
+#define pr_msg(fmt, ...) printf(fmt, ##__VA_ARGS__)
 
-
-#define pr_trace(fmt, ...)				\
-	printf("%8d: %s: " fmt, sys_gettid(), __func__,	\
-		##__VA_ARGS__)
+#define pr_trace(fmt, ...) printf("%8d: %s: " fmt, sys_gettid(), __func__, ##__VA_ARGS__)
 
 enum {
-	MEM_FILL_MODE_NONE	= 0,
-	MEM_FILL_MODE_ALL	= 1,
-	MEM_FILL_MODE_LIGHT	= 2,
-	MEM_FILL_MODE_DIRTIFY	= 3,
+	MEM_FILL_MODE_NONE = 0,
+	MEM_FILL_MODE_ALL = 1,
+	MEM_FILL_MODE_LIGHT = 2,
+	MEM_FILL_MODE_DIRTIFY = 3,
 };
 
 typedef struct {
-	pthread_mutex_t		mutex;
-	pthread_mutexattr_t	mutex_attr;
+	pthread_mutex_t mutex;
+	pthread_mutexattr_t mutex_attr;
 
-	size_t			opt_tasks;
+	size_t opt_tasks;
 
-	size_t			opt_files;
-	size_t			opt_file_size;
-	int			prev_fd[MAX_CHUNK];
+	size_t opt_files;
+	size_t opt_file_size;
+	int prev_fd[MAX_CHUNK];
 
-	size_t			opt_mem;
-	size_t			opt_mem_chunks;
-	size_t			opt_mem_chunk_size;
-	int			opt_mem_fill_mode;
-	int			opt_mem_cycle_mode;
-	unsigned int		opt_refresh_time;
+	size_t opt_mem;
+	size_t opt_mem_chunks;
+	size_t opt_mem_chunk_size;
+	int opt_mem_fill_mode;
+	int opt_mem_cycle_mode;
+	unsigned int opt_refresh_time;
 
-	char			*opt_work_dir;
-	int			work_dir_fd;
-	DIR			*work_dir;
+	char *opt_work_dir;
+	int work_dir_fd;
+	DIR *work_dir;
 
-	pid_t			err_pid;
-	int			err_no;
+	pid_t err_pid;
+	int err_no;
 
-	unsigned long		prev_map[MAX_CHUNK];
+	unsigned long prev_map[MAX_CHUNK];
 } shared_data_t;
 
 static shared_data_t *shared;
@@ -90,8 +86,7 @@ static int sys_gettid(void)
 	return syscall(__NR_gettid);
 }
 
-static void dirtify_memory(unsigned long *chunks, size_t nr_chunks,
-			   size_t chunk_size, int mode, const size_t nr_pages)
+static void dirtify_memory(unsigned long *chunks, size_t nr_chunks, size_t chunk_size, int mode, const size_t nr_pages)
 {
 	size_t i;
 
@@ -164,7 +159,7 @@ static int create_files(shared_data_t *shared, int *fd, size_t nr_files)
 static void work_on_fork(shared_data_t *shared)
 {
 	const size_t nr_pages = shared->opt_mem_chunk_size / PAGE_SIZE;
-	unsigned long chunks[MAX_CHUNK] = { };
+	unsigned long chunks[MAX_CHUNK] = {};
 	int fd[MAX_CHUNK];
 	size_t i;
 	void *mem;
@@ -173,8 +168,7 @@ static void work_on_fork(shared_data_t *shared)
 	pthread_mutex_lock(&shared->mutex);
 	pr_trace("init\n");
 
-	pr_info("\tCreating %lu mmaps each %lu K\n",
-		shared->opt_mem_chunks, shared->opt_mem_chunk_size >> 10);
+	pr_info("\tCreating %lu mmaps each %lu K\n", shared->opt_mem_chunks, shared->opt_mem_chunk_size >> 10);
 
 	for (i = 0; i < shared->opt_mem_chunks; i++) {
 		if (shared->prev_map[i]) {
@@ -183,28 +177,25 @@ static void work_on_fork(shared_data_t *shared)
 		}
 
 		/* If we won't change proto here, the kernel might merge close areas */
-		mem = mmap(NULL, shared->opt_mem_chunk_size,
-			   PROT_READ | PROT_WRITE | ((i % 2) ? PROT_EXEC : 0),
+		mem = mmap(NULL, shared->opt_mem_chunk_size, PROT_READ | PROT_WRITE | ((i % 2) ? PROT_EXEC : 0),
 			   MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 
 		if (mem != (void *)MAP_FAILED) {
 			shared->prev_map[i] = (unsigned long)mem;
 			chunks[i] = (unsigned long)mem;
 
-			pr_info("\t\tMap at %lx\n",(unsigned long)mem);
+			pr_info("\t\tMap at %lx\n", (unsigned long)mem);
 		} else {
 			pr_info("\t\tCan't map\n");
 
-			shared->err_pid	= sys_gettid();
-			shared->err_no	= -errno;
+			shared->err_pid = sys_gettid();
+			shared->err_no = -errno;
 			exit(1);
 		}
 	}
 
 	if (shared->opt_mem_fill_mode)
-		dirtify_memory(chunks, shared->opt_mem_chunks,
-			       shared->opt_mem_chunk_size,
-			       shared->opt_mem_fill_mode,
+		dirtify_memory(chunks, shared->opt_mem_chunks, shared->opt_mem_chunk_size, shared->opt_mem_fill_mode,
 			       nr_pages);
 
 	if (create_files(shared, fd, shared->opt_files))
@@ -213,16 +204,14 @@ static void work_on_fork(shared_data_t *shared)
 	if (shared->opt_file_size)
 		dirtify_files(fd, shared->opt_files, shared->opt_file_size);
 
-		pr_trace("releasing\n");
+	pr_trace("releasing\n");
 	pthread_mutex_unlock(&shared->mutex);
 
 	while (1) {
 		sleep(shared->opt_refresh_time);
 		if (shared->opt_mem_cycle_mode)
-			dirtify_memory(chunks, shared->opt_mem_chunks,
-				       shared->opt_mem_chunk_size,
-				       shared->opt_mem_cycle_mode,
-				       nr_pages);
+			dirtify_memory(chunks, shared->opt_mem_chunks, shared->opt_mem_chunk_size,
+				       shared->opt_mem_cycle_mode, nr_pages);
 		if (shared->opt_file_size)
 			dirtify_files(fd, shared->opt_files, shared->opt_file_size);
 	}
@@ -248,17 +237,17 @@ int main(int argc, char *argv[])
 	/* a - 97, z - 122, A - 65, 90 */
 	static const char short_opts[] = "t:d:f:m:c:h";
 	static struct option long_opts[] = {
-		{"tasks",	required_argument, 0,	't'},
-		{"dir",		required_argument, 0,	'd'},
-		{"files",	required_argument, 0,	'f'},
-		{"memory",	required_argument, 0,	'm'},
-		{"mem-chunks",	required_argument, 0,	'c'},
-		{"help",	no_argument,       0,	'h'},
-		{"mem-fill",	required_argument, 0,	 10},
-		{"mem-cycle",	required_argument, 0,	 11},
-		{"refresh",	required_argument, 0,	 12},
-		{"file-size",	required_argument, 0,	 13},
-		{ },
+		{ "tasks", required_argument, 0, 't' },
+		{ "dir", required_argument, 0, 'd' },
+		{ "files", required_argument, 0, 'f' },
+		{ "memory", required_argument, 0, 'm' },
+		{ "mem-chunks", required_argument, 0, 'c' },
+		{ "help", no_argument, 0, 'h' },
+		{ "mem-fill", required_argument, 0, 10 },
+		{ "mem-cycle", required_argument, 0, 11 },
+		{ "refresh", required_argument, 0, 12 },
+		{ "file-size", required_argument, 0, 13 },
+		{},
 	};
 
 	char workdir[PATH_MAX];
@@ -267,8 +256,7 @@ int main(int argc, char *argv[])
 	pid_t pid;
 	size_t i;
 
-	shared = (void *)mmap(NULL, sizeof(*shared), PROT_READ | PROT_WRITE,
-			      MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	shared = (void *)mmap(NULL, sizeof(*shared), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 	if ((void *)shared == MAP_FAILED) {
 		pr_err("Failed to setup shared data\n");
 		exit(1);
@@ -293,7 +281,7 @@ int main(int argc, char *argv[])
 		if (opt == -1)
 			break;
 
-		switch(opt) {
+		switch (opt) {
 		case 't':
 			shared->opt_tasks = (size_t)atol(optarg);
 			break;
@@ -330,7 +318,7 @@ int main(int argc, char *argv[])
 
 	if (!shared->opt_work_dir) {
 		shared->opt_work_dir = getcwd(workdir, sizeof(workdir));
-		if (!shared->opt_work_dir)	{
+		if (!shared->opt_work_dir) {
 			pr_perror("Can't fetch current working dir");
 			exit(1);
 		}
@@ -345,16 +333,14 @@ int main(int argc, char *argv[])
 
 	shared->work_dir = opendir(shared->opt_work_dir);
 	if (!shared->work_dir) {
-		pr_perror("Can't open working dir `%s'",
-			  shared->opt_work_dir);
+		pr_perror("Can't open working dir `%s'", shared->opt_work_dir);
 		exit(1);
 	}
 	shared->work_dir_fd = dirfd(shared->work_dir);
 
 	shared->opt_mem_chunk_size = shared->opt_mem / shared->opt_mem_chunks;
 
-	if (shared->opt_mem_chunk_size &&
-	    shared->opt_mem_chunk_size < PAGE_SIZE) {
+	if (shared->opt_mem_chunk_size && shared->opt_mem_chunk_size < PAGE_SIZE) {
 		pr_err("Memory chunk size is too small, provide at least %lu M of memory\n",
 		       (shared->opt_mem_chunks * PAGE_SIZE) >> 20ul);
 		exit(1);
@@ -395,8 +381,7 @@ int main(int argc, char *argv[])
 		sleep(1);
 
 err_child:
-	pr_err("Child %d exited with %d\n",
-	       shared->err_pid, shared->err_no);
+	pr_err("Child %d exited with %d\n", shared->err_pid, shared->err_no);
 	return shared->err_no;
 
 usage:
diff --git a/test/others/libcriu/test_errno.c b/test/others/libcriu/test_errno.c
index 8bd19fe2f..4df16c173 100644
--- a/test/others/libcriu/test_errno.c
+++ b/test/others/libcriu/test_errno.c
@@ -90,7 +90,6 @@ err:
 	if (f)
 		fclose(f);
 	return -1;
-
 }
 
 static int process_exists(void)
diff --git a/test/others/libcriu/test_iters.c b/test/others/libcriu/test_iters.c
index 660da9286..2a5ca6def 100644
--- a/test/others/libcriu/test_iters.c
+++ b/test/others/libcriu/test_iters.c
@@ -28,7 +28,7 @@ static int open_imgdir(void)
 	criu_set_images_dir_fd(cur_imgdir);
 }
 
-#define MAX_ITERS	2
+#define MAX_ITERS 2
 
 static int next_iter(criu_predump_info pi)
 {
@@ -46,7 +46,7 @@ static int next_iter(criu_predump_info pi)
 	return cur_iter < MAX_ITERS;
 }
 
-#define SUCC_ECODE	42
+#define SUCC_ECODE 42
 
 int main(int argc, char **argv)
 {
diff --git a/test/others/libcriu/test_notify.c b/test/others/libcriu/test_notify.c
index 54fb255ce..66fe75338 100644
--- a/test/others/libcriu/test_notify.c
+++ b/test/others/libcriu/test_notify.c
@@ -10,7 +10,7 @@
 
 #include "lib.h"
 
-#define SUCC_ECODE	42
+#define SUCC_ECODE 42
 
 static int actions_called = 0;
 static int notify(char *action, criu_notify_arg_t na)
diff --git a/test/others/libcriu/test_self.c b/test/others/libcriu/test_self.c
index 374a4b545..468edc0f7 100644
--- a/test/others/libcriu/test_self.c
+++ b/test/others/libcriu/test_self.c
@@ -9,8 +9,8 @@
 #include <sys/wait.h>
 #include "lib.h"
 
-#define SUCC_DUMP_ECODE	41
-#define SUCC_RSTR_ECODE	43
+#define SUCC_DUMP_ECODE 41
+#define SUCC_RSTR_ECODE 43
 
 int main(int argc, char *argv[])
 {
@@ -105,5 +105,4 @@ errk:
 	kill(pid, SIGKILL);
 err:
 	return 1;
-
 }
diff --git a/test/others/libcriu/test_sub.c b/test/others/libcriu/test_sub.c
index b435f6709..41b685847 100644
--- a/test/others/libcriu/test_sub.c
+++ b/test/others/libcriu/test_sub.c
@@ -15,7 +15,7 @@ static void sh(int sig)
 	stop = 1;
 }
 
-#define SUCC_ECODE	42
+#define SUCC_ECODE 42
 
 int main(int argc, char **argv)
 {
diff --git a/test/others/loop.c b/test/others/loop.c
index 850c5dedf..736e7f8cb 100644
--- a/test/others/loop.c
+++ b/test/others/loop.c
@@ -47,7 +47,7 @@ int main(void)
 		write(start_pipe[1], &res, sizeof(res));
 		close(start_pipe[1]);
 
-		while(1) {
+		while (1) {
 			sleep(1);
 		}
 	}
@@ -56,7 +56,7 @@ int main(void)
 	read(start_pipe[0], &res, sizeof(res));
 	close(start_pipe[0]);
 
- out:
+out:
 	if (res == EXIT_SUCCESS)
 		printf("%d\n", pid);
 	return res;
diff --git a/test/others/mounts/ext/ext-mount.c b/test/others/mounts/ext/ext-mount.c
index e5e974bfc..09347c283 100644
--- a/test/others/mounts/ext/ext-mount.c
+++ b/test/others/mounts/ext/ext-mount.c
@@ -9,7 +9,7 @@
 #include "criu-plugin.h"
 #include "criu-log.h"
 
-#define IMG_NAME	"ext-mount-test-%d.img"
+#define IMG_NAME "ext-mount-test-%d.img"
 
 extern cr_plugin_init_t cr_plugin_init;
 extern cr_plugin_dump_ext_mount_t cr_plugin_dump_ext_mount;
@@ -47,8 +47,7 @@ int cr_plugin_dump_ext_mount(char *mountpoint, int id)
 
 	pr_info("Dumping my mount %d\n", id);
 	sprintf(img, IMG_NAME, id);
-	fd = openat(criu_get_image_dir(), img,
-			O_RDWR | O_CREAT | O_TRUNC, 0600);
+	fd = openat(criu_get_image_dir(), img, O_RDWR | O_CREAT | O_TRUNC, 0600);
 	if (fd < 0) {
 		pr_perror("Can't open image");
 		return -1;
diff --git a/test/others/mounts/ext/ns_init.c b/test/others/mounts/ext/ns_init.c
index e85bf9dde..99bedc70f 100644
--- a/test/others/mounts/ext/ns_init.c
+++ b/test/others/mounts/ext/ns_init.c
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
 		if (chdir(argv[2]))
 			return 1;
 
-		fd = open(argv[3], O_WRONLY|O_CREAT|O_TRUNC|O_APPEND, 0600);
+		fd = open(argv[3], O_WRONLY | O_CREAT | O_TRUNC | O_APPEND, 0600);
 		if (fd < 0)
 			return 1;
 
diff --git a/test/others/pipes/pipe.c b/test/others/pipes/pipe.c
index d693f4b02..07394a92f 100644
--- a/test/others/pipes/pipe.c
+++ b/test/others/pipes/pipe.c
@@ -62,36 +62,37 @@ typedef void (*sighandler_t)(int);
 typedef unsigned long ulong;
 
 /* colors */
-#define CS_PARENT 		"\033[00;32m"
-#define CS_CHILD 		"\033[00;33m"
-#define CS_DUMP 		"\033[00;34m"
-#define CS_RESTORE 		"\033[00;35m"
-#define CE			"\033[0m"
+#define CS_PARENT  "\033[00;32m"
+#define CS_CHILD   "\033[00;33m"
+#define CS_DUMP	   "\033[00;34m"
+#define CS_RESTORE "\033[00;35m"
+#define CE	   "\033[0m"
 
-#define die(fmt, ...) do { \
-	if (!qflag) \
-		fprintf(stderr, fmt ": %m\n", __VA_ARGS__); \
-	if (getpid() == parent_pid) { \
-		(void)kill(0, 9); \
-		exit(1); \
-	} \
-	_exit(1); \
-} while (0)
+#define die(fmt, ...)                                               \
+	do {                                                        \
+		if (!qflag)                                         \
+			fprintf(stderr, fmt ": %m\n", __VA_ARGS__); \
+		if (getpid() == parent_pid) {                       \
+			(void)kill(0, 9);                           \
+			exit(1);                                    \
+		}                                                   \
+		_exit(1);                                           \
+	} while (0)
 
-#define READ_FD		0	/* pipe read fd */
-#define WRITE_FD	1	/* pipe write fd */
-#define CLASH_FD	3	/* force inherit fd clash */
+#define READ_FD	 0 /* pipe read fd */
+#define WRITE_FD 1 /* pipe write fd */
+#define CLASH_FD 3 /* force inherit fd clash */
 
-#define MAX_FORKS	3	/* child, checkpoint, restore */
+#define MAX_FORKS 3 /* child, checkpoint, restore */
 
-#define CRIU_BINARY		"../../../criu/criu"
-#define IMG_DIR			"images"
-#define DUMP_LOG_FILE		"dump.log"
-#define RESTORE_LOG_FILE	"restore.log"
-#define RESTORE_PID_FILE	"restore.pid"
-#define INHERIT_FD_OPTION	"--inherit-fd"
-#define OLD_LOG_FILE		"/tmp/oldlog"
-#define NEW_LOG_FILE		"/tmp/newlog"
+#define CRIU_BINARY	  "../../../criu/criu"
+#define IMG_DIR		  "images"
+#define DUMP_LOG_FILE	  "dump.log"
+#define RESTORE_LOG_FILE  "restore.log"
+#define RESTORE_PID_FILE  "restore.pid"
+#define INHERIT_FD_OPTION "--inherit-fd"
+#define OLD_LOG_FILE	  "/tmp/oldlog"
+#define NEW_LOG_FILE	  "/tmp/newlog"
 
 /*
  * Command line options (see usage()).
@@ -113,21 +114,11 @@ char inh_pipe_arg[64];
 char inh_file_opt[16];
 char inh_file_arg[64];
 
-char *dump_argv[] = {
-	"criu", "dump",
-	"-D", IMG_DIR, "-o", DUMP_LOG_FILE,
-	"-v4",
-	"-t", pid_number,
-	NULL
-};
+char *dump_argv[] = { "criu", "dump", "-D", IMG_DIR, "-o", DUMP_LOG_FILE, "-v4", "-t", pid_number, NULL };
 
 char *restore_argv[] = {
-	"criu", "restore", "-d",
-	"-D", IMG_DIR, "-o", RESTORE_LOG_FILE,
-	"--pidfile", RESTORE_PID_FILE,
-	"-v4",
-	inh_pipe_opt, inh_pipe_arg,
-	inh_file_opt, inh_file_arg,
+	"criu",	     "restore",	       "-d",  "-D",	    IMG_DIR,	  "-o",		RESTORE_LOG_FILE,
+	"--pidfile", RESTORE_PID_FILE, "-v4", inh_pipe_opt, inh_pipe_arg, inh_file_opt, inh_file_arg,
 	NULL
 };
 
@@ -167,11 +158,9 @@ int dup2_safe(int oldfd, int newfd);
 void usage(char *cmd)
 {
 	printf("Usage: %s [%s]\n", cmd, cli_flags);
-	printf("-c\tcause a clash during restore by opening %s as fd %d\n",
-		OLD_LOG_FILE, CLASH_FD);
+	printf("-c\tcause a clash during restore by opening %s as fd %d\n", OLD_LOG_FILE, CLASH_FD);
 	printf("-d\tdup the pipe and write to it\n");
-	printf("-l\tchange log file from %s to %s during restore\n",
-		OLD_LOG_FILE, NEW_LOG_FILE);
+	printf("-l\tchange log file from %s to %s during restore\n", OLD_LOG_FILE, NEW_LOG_FILE);
 
 	printf("\n");
 	printf("The following flags should cause restore failure\n");
@@ -184,28 +173,51 @@ void usage(char *cmd)
 	printf("-h\tprint this help and exit\n");
 	printf("-q\tquiet mode, don't print anything\n");
 	printf("-v\tverbose mode (list contents of /proc/<pid>/fd)\n");
-
 }
 
 int main(int argc, char *argv[])
 {
 	int ret;
-        int opt;
+	int opt;
 	int pipefd[2];
 
 	max_msgs = 4;
 	while ((opt = getopt(argc, argv, cli_flags)) != -1) {
 		switch (opt) {
-		case 'c': cflag++; break;
-		case 'd': dflag++; max_msgs += 4; break;
-		case 'h': usage(argv[0]); return 0;
-		case 'l': lflag++; break;
-		case 'n': nflag++; break;
-		case 'o': oflag++; max_msgs += 4; break;
-		case 'q': qflag++; vflag = 0;break;
-		case 'r': rflag++; break;
-		case 'v': vflag++; qflag = 0; break;
-		default: usage(argv[0]); return 1;
+		case 'c':
+			cflag++;
+			break;
+		case 'd':
+			dflag++;
+			max_msgs += 4;
+			break;
+		case 'h':
+			usage(argv[0]);
+			return 0;
+		case 'l':
+			lflag++;
+			break;
+		case 'n':
+			nflag++;
+			break;
+		case 'o':
+			oflag++;
+			max_msgs += 4;
+			break;
+		case 'q':
+			qflag++;
+			vflag = 0;
+			break;
+		case 'r':
+			rflag++;
+			break;
+		case 'v':
+			vflag++;
+			qflag = 0;
+			break;
+		default:
+			usage(argv[0]);
+			return 1;
 		}
 	}
 
@@ -287,8 +299,7 @@ int parent(int *pipefd)
 			ls_proc_fd(-1);
 
 		if (!qflag) {
-			printf("%s read %s from %s\n", who(0), buf,
-				pipe_name(pipefd[READ_FD]));
+			printf("%s read %s from %s\n", who(0), buf, pipe_name(pipefd[READ_FD]));
 		}
 
 		if (nread == (max_msgs / 2)) {
@@ -296,8 +307,7 @@ int parent(int *pipefd)
 
 			if (!nflag) {
 				/* save the old pipe's name before closing it */
-				snprintf(old_pipe, sizeof old_pipe, "%s",
-					pipe_name(pipefd[READ_FD]));
+				snprintf(old_pipe, sizeof old_pipe, "%s", pipe_name(pipefd[READ_FD]));
 				close_safe(pipefd[READ_FD]);
 
 				/* create a new one */
@@ -340,14 +350,20 @@ int child(int *pipefd, int dupfd, int openfd)
 			ls_proc_fd(-1);
 
 		switch (i % num_wfds) {
-		case 0: fd = pipefd[WRITE_FD]; break;
-		case 1: fd = dflag ? dupfd : openfd; break;
-		case 2: fd = openfd; break;
+		case 0:
+			fd = pipefd[WRITE_FD];
+			break;
+		case 1:
+			fd = dflag ? dupfd : openfd;
+			break;
+		case 2:
+			fd = openfd;
+			break;
 		}
 
-		write_to_fd(fd, pipe_name(pipefd[WRITE_FD]), i+1, 0);
+		write_to_fd(fd, pipe_name(pipefd[WRITE_FD]), i + 1, 0);
 		if (cflag)
-			write_to_fd(CLASH_FD, "log file", i+1, 1);
+			write_to_fd(CLASH_FD, "log file", i + 1, 1);
 
 		/*
 		 * Since sleep will be interrupted by C/R, make sure
@@ -376,8 +392,7 @@ void chld_handler(int signum)
 		status = WEXITSTATUS(status);
 	if (pid == child_pid) {
 		if (!qflag) {
-			printf("%s %s exited with status %d\n", who(0),
-				who(pid), status);
+			printf("%s %s exited with status %d\n", who(0), who(pid), status);
 		}
 		/* if child exited successfully, we're done */
 		if (status == 0)
@@ -402,8 +417,7 @@ void checkpoint_child(int child_pid, int *pipefd)
 		if (WIFEXITED(status))
 			status = WEXITSTATUS(status);
 		if (!qflag) {
-			printf("%s %s exited with status %d\n", who(0),
-				who(pid), status);
+			printf("%s %s exited with status %d\n", who(0), who(pid), status);
 		}
 		if (status)
 			exit(status);
@@ -430,8 +444,7 @@ void restore_child(int *new_pipefd, char *old_pipe_name)
 		if (WIFEXITED(status))
 			status = WEXITSTATUS(status);
 		if (!qflag) {
-			printf("%s %s exited with status %d\n", who(0),
-				who(pid), status);
+			printf("%s %s exited with status %d\n", who(0), who(pid), status);
 		}
 		if (status)
 			exit(status);
@@ -457,20 +470,16 @@ void restore_child(int *new_pipefd, char *old_pipe_name)
 			}
 
 			/* --inherit-fd fd[CLASH_FD]:pipe[xxxxxx] */
-			snprintf(inh_pipe_opt, sizeof inh_pipe_opt,
-				"%s", INHERIT_FD_OPTION);
-			snprintf(inh_pipe_arg, sizeof inh_pipe_arg, "fd[%d]:%s",
-				CLASH_FD, old_pipe_name);
+			snprintf(inh_pipe_opt, sizeof inh_pipe_opt, "%s", INHERIT_FD_OPTION);
+			snprintf(inh_pipe_arg, sizeof inh_pipe_arg, "fd[%d]:%s", CLASH_FD, old_pipe_name);
 
 			if (lflag) {
 				/* create a new log file to replace the old one */
 				int filefd = open_safe(NEW_LOG_FILE, O_WRONLY | O_APPEND | O_CREAT);
 
 				/* --inherit-fd fd[x]:tmp/oldlog */
-				snprintf(inh_file_opt, sizeof inh_file_opt,
-					"%s", INHERIT_FD_OPTION);
-				snprintf(inh_file_arg, sizeof inh_file_arg,
-					"fd[%d]:%s", filefd, OLD_LOG_FILE + 1);
+				snprintf(inh_file_opt, sizeof inh_file_opt, "%s", INHERIT_FD_OPTION);
+				snprintf(inh_file_arg, sizeof inh_file_arg, "fd[%d]:%s", filefd, OLD_LOG_FILE + 1);
 
 				restore_argv[12] = inh_file_opt;
 			} else
@@ -488,7 +497,7 @@ void restore_child(int *new_pipefd, char *old_pipe_name)
 void write_to_fd(int fd, char *name, int i, int newline)
 {
 	int n;
-	char buf[16];	/* fit "hello d\n" for small d */
+	char buf[16]; /* fit "hello d\n" for small d */
 
 	n = snprintf(buf, sizeof buf, "hello %d", i);
 	if (!qflag)
@@ -601,8 +610,7 @@ void close_safe(int fd)
 void write_safe(int fd, char *buf, int count)
 {
 	if (write(fd, buf, count) != count) {
-		die("write: fd=%d buf=\"%s\" count=%d errno=%d",
-			fd, buf, count, errno);
+		die("write: fd=%d buf=\"%s\" count=%d errno=%d", fd, buf, count, errno);
 	}
 }
 
diff --git a/test/others/rpc/test-c.c b/test/others/rpc/test-c.c
index 751f9ba9d..06f13b20f 100644
--- a/test/others/rpc/test-c.c
+++ b/test/others/rpc/test-c.c
@@ -43,7 +43,7 @@ static int send_req(int socket_fd, CriuReq *req)
 		return -1;
 	}
 
-	if (write(socket_fd, buf, len)  == -1) {
+	if (write(socket_fd, buf, len) == -1) {
 		perror("Can't send request");
 		return -1;
 	}
@@ -53,8 +53,8 @@ static int send_req(int socket_fd, CriuReq *req)
 
 int main(int argc, char *argv[])
 {
-	CriuReq req		= CRIU_REQ__INIT;
-	CriuResp *resp		= NULL;
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
 	int fd, dir_fd;
 	int ret = 0;
 	struct sockaddr_un addr;
@@ -81,11 +81,11 @@ int main(int argc, char *argv[])
 	 * Set "DUMP" type of request.
 	 * Allocate CriuDumpReq.
 	 */
-	req.type			= CRIU_REQ_TYPE__DUMP;
-	req.opts			= malloc(sizeof(CriuOpts));
+	req.type = CRIU_REQ_TYPE__DUMP;
+	req.opts = malloc(sizeof(CriuOpts));
 	if (!req.opts) {
-			perror("Can't allocate memory for dump request");
-			return -1;
+		perror("Can't allocate memory for dump request");
+		return -1;
 	}
 
 	criu_opts__init(req.opts);
@@ -94,11 +94,11 @@ int main(int argc, char *argv[])
 	 * Set dump options.
 	 * Checkout more in protobuf/rpc.proto.
 	 */
-	req.opts->has_leave_running	= true;
-	req.opts->leave_running		= true;
-	req.opts->images_dir_fd		= dir_fd;
-	req.opts->has_log_level		= true;
-	req.opts->log_level		= 4;
+	req.opts->has_leave_running = true;
+	req.opts->leave_running = true;
+	req.opts->images_dir_fd = dir_fd;
+	req.opts->has_log_level = true;
+	req.opts->log_level = 4;
 
 	/*
 	 * Connect to service socket
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
 
 	addr_len = strlen(addr.sun_path) + sizeof(addr.sun_family);
 
-	ret = connect(fd, (struct sockaddr *) &addr, addr_len);
+	ret = connect(fd, (struct sockaddr *)&addr, addr_len);
 	if (ret == -1) {
 		perror("Cant connect to socket");
 		goto exit;
diff --git a/test/others/socketpairs/socketpair.c b/test/others/socketpairs/socketpair.c
index d0c1bbd1c..db6bed406 100644
--- a/test/others/socketpairs/socketpair.c
+++ b/test/others/socketpairs/socketpair.c
@@ -25,35 +25,36 @@ typedef void (*sighandler_t)(int);
 typedef unsigned long ulong;
 
 /* colors */
-#define CS_PARENT 		"\033[00;32m"
-#define CS_CHILD 		"\033[00;33m"
-#define CS_DUMP 		"\033[00;34m"
-#define CS_RESTORE 		"\033[00;35m"
-#define CE			"\033[0m"
+#define CS_PARENT  "\033[00;32m"
+#define CS_CHILD   "\033[00;33m"
+#define CS_DUMP	   "\033[00;34m"
+#define CS_RESTORE "\033[00;35m"
+#define CE	   "\033[0m"
 
-#define die(fmt, ...) do { \
-	fprintf(stderr, fmt ": %m\n", __VA_ARGS__); \
-	if (getpid() == parent_pid) { \
-		(void)kill(0, 9); \
-		exit(1); \
-	} \
-	_exit(1); \
-} while (0)
+#define die(fmt, ...)                                       \
+	do {                                                \
+		fprintf(stderr, fmt ": %m\n", __VA_ARGS__); \
+		if (getpid() == parent_pid) {               \
+			(void)kill(0, 9);                   \
+			exit(1);                            \
+		}                                           \
+		_exit(1);                                   \
+	} while (0)
 
-#define READ_FD		0	/* pipe read fd */
-#define WRITE_FD	1	/* pipe write fd */
-#define CLASH_FD	3	/* force inherit fd clash */
+#define READ_FD	 0 /* pipe read fd */
+#define WRITE_FD 1 /* pipe write fd */
+#define CLASH_FD 3 /* force inherit fd clash */
 
-#define MAX_FORKS	3	/* child, checkpoint, restore */
+#define MAX_FORKS 3 /* child, checkpoint, restore */
 
-#define CRIU_BINARY		"../../../criu/criu"
-#define IMG_DIR			"images"
-#define DUMP_LOG_FILE		"dump.log"
-#define RESTORE_LOG_FILE	"restore.log"
-#define RESTORE_PID_FILE	"restore.pid"
-#define INHERIT_FD_OPTION	"--inherit-fd"
-#define OLD_LOG_FILE		"/tmp/oldlog"
-#define NEW_LOG_FILE		"/tmp/newlog"
+#define CRIU_BINARY	  "../../../criu/criu"
+#define IMG_DIR		  "images"
+#define DUMP_LOG_FILE	  "dump.log"
+#define RESTORE_LOG_FILE  "restore.log"
+#define RESTORE_PID_FILE  "restore.pid"
+#define INHERIT_FD_OPTION "--inherit-fd"
+#define OLD_LOG_FILE	  "/tmp/oldlog"
+#define NEW_LOG_FILE	  "/tmp/newlog"
 
 /*
  * Command line options (see usage()).
@@ -70,22 +71,11 @@ char inh_unixsk_arg[64];
 char external_sk_ino[32];
 
 char *dump_argv[] = {
-	"criu", "dump",
-	"-D", IMG_DIR, "-o", DUMP_LOG_FILE,
-	"-v4",
-	external_sk_ino,
-	"-t", pid_number,
-	NULL
+	"criu", "dump", "-D", IMG_DIR, "-o", DUMP_LOG_FILE, "-v4", external_sk_ino, "-t", pid_number, NULL
 };
 
-char *restore_argv[] = {
-	"criu", "restore", "-d",
-	"-D", IMG_DIR, "-o", RESTORE_LOG_FILE,
-	"--pidfile", RESTORE_PID_FILE,
-	"-v4", "-x",
-	inh_unixsk_opt, inh_unixsk_arg,
-	NULL
-};
+char *restore_argv[] = { "criu",      "restore",	"-d",  "-D", IMG_DIR,	     "-o",	     RESTORE_LOG_FILE,
+			 "--pidfile", RESTORE_PID_FILE, "-v4", "-x", inh_unixsk_opt, inh_unixsk_arg, NULL };
 
 int max_forks;
 int parent_pid;
@@ -151,12 +141,9 @@ int main(int argc, char *argv[])
 			break;
 		case '?':
 			if ('m' == optopt)
-				fprintf (stderr, "Option -%c requires an argument.\n", optopt);
+				fprintf(stderr, "Option -%c requires an argument.\n", optopt);
 			else
-			fprintf (
-				stderr,
-				"Unknown option character `\\x%x'.\n",
-				optopt);
+				fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
 			return 1;
 		default:
 			usage(argv[0]);
@@ -177,9 +164,9 @@ int main(int argc, char *argv[])
 		prctl_safe(PR_SET_CHILD_SUBREAPER, 1, 0, 0, 0);
 
 		snprintf(external_sk_ino, sizeof(external_sk_ino), "--ext-unix-sk=%u",
-			(unsigned int)socket_inode(socketfd[WRITE_FD]));
+			 (unsigned int)socket_inode(socketfd[WRITE_FD]));
 
-		char unix_sk_ino[32] = {0};
+		char unix_sk_ino[32] = { 0 };
 		strcpy(unix_sk_ino, socket_name(socketfd[WRITE_FD]));
 		close_safe(socketfd[WRITE_FD]);
 		ret = parent(socketfd, unix_sk_ino);
@@ -224,11 +211,7 @@ int parent(int *socketfd, const char *ino_child_sk)
 		if (vflag && nread == 1)
 			ls_proc_fd(-1);
 
-		printf(
-			"%s read %s from %s\n",
-			who(0), buf,
-			socket_name(socketfd[READ_FD]));
-
+		printf("%s read %s from %s\n", who(0), buf, socket_name(socketfd[READ_FD]));
 
 		if (nread == (max_msgs / 2)) {
 			checkpoint_child(child_pid, socketfd);
@@ -276,12 +259,18 @@ int child(int *socketfd, int dupfd, int openfd)
 			ls_proc_fd(-1);
 
 		switch (i % num_wfds) {
-			case 0: fd = socketfd[WRITE_FD]; break;
-			case 1: fd = openfd; break;
-			case 2: fd = openfd; break;
+		case 0:
+			fd = socketfd[WRITE_FD];
+			break;
+		case 1:
+			fd = openfd;
+			break;
+		case 2:
+			fd = openfd;
+			break;
 		}
 
-		write_to_fd(fd, socket_name(socketfd[WRITE_FD]), i+1, 0);
+		write_to_fd(fd, socket_name(socketfd[WRITE_FD]), i + 1, 0);
 		/*
 		 * Since sleep will be interrupted by C/R, make sure
 		 * to sleep an entire second to minimize the chance of
@@ -307,8 +296,7 @@ void chld_handler(int signum)
 	if (WIFEXITED(status))
 		status = WEXITSTATUS(status);
 	if (pid == child_pid) {
-		printf("%s %s exited with status %d\n", who(0),
-			who(pid), status);
+		printf("%s %s exited with status %d\n", who(0), who(pid), status);
 		/* if child exited successfully, we're done */
 		if (status == 0)
 			exit(0);
@@ -331,8 +319,7 @@ void checkpoint_child(int child_pid, int *socketfd)
 		pid = waitpid_safe(criu_dump_pid, &status, 0, 2);
 		if (WIFEXITED(status))
 			status = WEXITSTATUS(status);
-		printf("%s %s exited with status %d\n", who(0),
-			who(pid), status);
+		printf("%s %s exited with status %d\n", who(0), who(pid), status);
 		if (status)
 			exit(status);
 	} else {
@@ -358,8 +345,7 @@ void restore_child(int *new_socketfd, const char *old_sock_name)
 		if (WIFEXITED(status))
 			status = WEXITSTATUS(status);
 
-		printf("%s %s exited with status %d\n", who(0),
-			who(pid), status);
+		printf("%s %s exited with status %d\n", who(0), who(pid), status);
 
 		if (status)
 			exit(status);
@@ -371,10 +357,8 @@ void restore_child(int *new_socketfd, const char *old_sock_name)
 			move_fd(new_socketfd[WRITE_FD], CLASH_FD);
 
 			/* --inherit-fd fd[CLASH_FD]:socket[xxxxxx] */
-			snprintf(inh_unixsk_opt, sizeof inh_unixsk_opt,
-				"%s", INHERIT_FD_OPTION);
-			snprintf(inh_unixsk_arg, sizeof inh_unixsk_arg, "fd[%d]:%s",
-				CLASH_FD, old_sock_name);
+			snprintf(inh_unixsk_opt, sizeof inh_unixsk_opt, "%s", INHERIT_FD_OPTION);
+			snprintf(inh_unixsk_arg, sizeof inh_unixsk_arg, "fd[%d]:%s", CLASH_FD, old_sock_name);
 
 			restore_argv[11] = inh_unixsk_opt;
 			restore_argv[13] = NULL;
@@ -390,7 +374,7 @@ void restore_child(int *new_socketfd, const char *old_sock_name)
 void write_to_fd(int fd, char *name, int i, int newline)
 {
 	int n;
-	char buf[16];	/* fit "hello d\n" for small d */
+	char buf[16]; /* fit "hello d\n" for small d */
 
 	n = snprintf(buf, sizeof buf, "hello %d", i);
 
@@ -428,12 +412,12 @@ char *socket_name(int fd)
 
 ino_t socket_inode(int fd)
 {
-         struct stat sbuf;
+	struct stat sbuf;
 
-         if (fstat(fd, &sbuf) == -1)
-                 die("fstat: fd=%i", fd);
+	if (fstat(fd, &sbuf) == -1)
+		die("fstat: fd=%i", fd);
 
-         return sbuf.st_ino;
+	return sbuf.st_ino;
 }
 
 /*
@@ -510,8 +494,7 @@ void close_safe(int fd)
 void write_safe(int fd, char *buf, int count)
 {
 	if (write(fd, buf, count) != count) {
-		die("write: fd=%d buf=\"%s\" count=%d errno=%d",
-			fd, buf, count, errno);
+		die("write: fd=%d buf=\"%s\" count=%d errno=%d", fd, buf, count, errno);
 	}
 }
 
diff --git a/test/others/tcp/cln.c b/test/others/tcp/cln.c
index 6275d3728..412eb8209 100644
--- a/test/others/tcp/cln.c
+++ b/test/others/tcp/cln.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <signal.h>
 
-#define BUF_SIZE	(1024)
+#define BUF_SIZE (1024)
 
 static char rbuf[BUF_SIZE];
 static char buf[BUF_SIZE];
@@ -39,8 +39,7 @@ static int check_buf(int sk, char *buf, int count)
 
 	for (i = 0; i < count; i++)
 		if (buf[i] != rbuf[i]) {
-			printf("Mismatch on %d byte %d != %d\n",
-					i, (int)buf[i], (int)rbuf[i]);
+			printf("Mismatch on %d byte %d != %d\n", i, (int)buf[i], (int)rbuf[i]);
 			return 1;
 		}
 
diff --git a/test/others/unix-callback/syslog-lib.c b/test/others/unix-callback/syslog-lib.c
index c7950cad4..a0a9e91ea 100644
--- a/test/others/unix-callback/syslog-lib.c
+++ b/test/others/unix-callback/syslog-lib.c
@@ -21,7 +21,7 @@ int cr_plugin_dump_unix_sk(int sk, int id)
 	char buf[4096];
 	int fd;
 
-	if (getsockname(sk, (struct sockaddr *) &addr, &addr_len) < 0)
+	if (getsockname(sk, (struct sockaddr *)&addr, &addr_len) < 0)
 		return -1;
 
 	if (strncmp(addr.sun_path, "/dev/log", addr_len - sizeof(addr.sun_family)))
@@ -49,7 +49,7 @@ int cr_plugin_restore_unix_sk(int id)
 		return -ENOTSUP;
 	close(fd);
 
-	sk = socket(AF_FILE, SOCK_DGRAM|SOCK_CLOEXEC, 0);
+	sk = socket(AF_FILE, SOCK_DGRAM | SOCK_CLOEXEC, 0);
 	if (sk == -1)
 		return sk;
 
@@ -57,7 +57,7 @@ int cr_plugin_restore_unix_sk(int id)
 	addr_len = strlen("/dev/log");
 	strncpy(addr.sun_path, "/dev/log", addr_len);
 	addr_len += sizeof(addr.sun_family);
-	if (connect(sk, (struct sockaddr *) &addr, addr_len) == -1) {
+	if (connect(sk, (struct sockaddr *)&addr, addr_len) == -1) {
 		close(sk);
 		return -1;
 	}
diff --git a/test/others/unix-callback/unix-client.c b/test/others/unix-callback/unix-client.c
index 676c4adbc..6e57c404d 100644
--- a/test/others/unix-callback/unix-client.c
+++ b/test/others/unix-callback/unix-client.c
@@ -37,7 +37,7 @@ static int create_sock(int i)
 	addr_len = snprintf(addr.sun_path, UNIX_PATH_MAX, "%s%d", SK_NAME, id);
 	addr_len += sizeof(addr.sun_family);
 
-	if (bind(sk, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (bind(sk, (struct sockaddr *)&addr, addr_len) < 0) {
 		perror("bind");
 		return 1;
 	}
@@ -46,7 +46,7 @@ static int create_sock(int i)
 	addr_len = snprintf(addr.sun_path, UNIX_PATH_MAX, SK_NAME);
 	addr_len += sizeof(addr.sun_family);
 
-	if (connect(sk, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (connect(sk, (struct sockaddr *)&addr, addr_len) < 0) {
 		perror("connect");
 		return 1;
 	}
@@ -102,7 +102,7 @@ int main(void)
 	dprintf(fd, "%d\n", getpid());
 	close(fd);
 
-	openlog("test", LOG_NDELAY, LOG_USER );
+	openlog("test", LOG_NDELAY, LOG_USER);
 
 	sigemptyset(&set);
 	sigaddset(&set, SIGTERM);
@@ -118,4 +118,3 @@ int main(void)
 	printf("PASS\n");
 	return 0;
 }
-
diff --git a/test/others/unix-callback/unix-lib.c b/test/others/unix-callback/unix-lib.c
index 44b149848..b2ddf0920 100644
--- a/test/others/unix-callback/unix-lib.c
+++ b/test/others/unix-callback/unix-lib.c
@@ -39,7 +39,7 @@ static int get_srv_socket(void)
 	addr_len += sizeof(addr.sun_family);
 
 	unlink(addr.sun_path);
-	if (bind(skd, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (bind(skd, (struct sockaddr *)&addr, addr_len) < 0) {
 		pr_perror("bind");
 		return 1;
 	}
@@ -48,7 +48,7 @@ static int get_srv_socket(void)
 	addr_len = snprintf(addr.sun_path, UNIX_PATH_MAX, SK_NAME);
 	addr_len += sizeof(addr.sun_family);
 
-	if (connect(skd, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (connect(skd, (struct sockaddr *)&addr, addr_len) < 0) {
 		pr_perror("connect");
 		return -1;
 	}
@@ -69,7 +69,7 @@ int cr_plugin_dump_unix_sk(int sk, int sk_id)
 	int skd, id, ret, fd, len;
 	UnixTest e = UNIX_TEST__INIT;
 
-	if (getpeername(sk, (struct sockaddr *) &addr, &addr_len)) {
+	if (getpeername(sk, (struct sockaddr *)&addr, &addr_len)) {
 		pr_perror("getpeername");
 		return -1;
 	}
@@ -78,8 +78,7 @@ int cr_plugin_dump_unix_sk(int sk, int sk_id)
 	if (addr.sun_path[len - 1] == 0)
 		len--;
 
-	if (len != strlen(SK_NAME) ||
-	    strncmp(addr.sun_path, SK_NAME, strlen(SK_NAME)))
+	if (len != strlen(SK_NAME) || strncmp(addr.sun_path, SK_NAME, strlen(SK_NAME)))
 		return -ENOTSUP;
 
 	pr_info("Dump the socket %x\n", sk_id);
@@ -89,7 +88,7 @@ int cr_plugin_dump_unix_sk(int sk, int sk_id)
 
 	addr_len = sizeof(struct sockaddr_un);
 
-	if (getsockname(sk, (struct sockaddr *) &addr, &addr_len) < 0)
+	if (getsockname(sk, (struct sockaddr *)&addr, &addr_len) < 0)
 		return -1;
 
 	id = atoi(addr.sun_path + strlen(SK_NAME));
@@ -120,7 +119,7 @@ int cr_plugin_dump_unix_sk(int sk, int sk_id)
 		return -1;
 	}
 
-	ret = unix_test__pack(&e, (uint8_t *) buf);
+	ret = unix_test__pack(&e, (uint8_t *)buf);
 	if (write(fd, buf, ret) != ret)
 		return -1;
 	close(fd);
@@ -148,7 +147,7 @@ int cr_plugin_restore_unix_sk(int sk_id)
 	}
 	close(fd);
 
-	e = unix_test__unpack(NULL, ret, (uint8_t *) buf);
+	e = unix_test__unpack(NULL, ret, (uint8_t *)buf);
 	if (e == NULL)
 		return -1;
 
@@ -162,7 +161,7 @@ int cr_plugin_restore_unix_sk(int sk_id)
 	memcpy(addr.sun_path, e->name.data, e->name.len);
 	addr_len = sizeof(addr.sun_family) + e->name.len;
 
-	if (bind(sk, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (bind(sk, (struct sockaddr *)&addr, addr_len) < 0) {
 		pr_perror("bind");
 		return -1;
 	}
@@ -171,7 +170,7 @@ int cr_plugin_restore_unix_sk(int sk_id)
 	addr_len = snprintf(addr.sun_path, UNIX_PATH_MAX, SK_NAME);
 	addr_len += sizeof(addr.sun_family);
 
-	if (connect(sk, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (connect(sk, (struct sockaddr *)&addr, addr_len) < 0) {
 		pr_perror("connect");
 		return -1;
 	}
diff --git a/test/others/unix-callback/unix-server.c b/test/others/unix-callback/unix-server.c
index 47bebd05d..d99bc68df 100644
--- a/test/others/unix-callback/unix-server.c
+++ b/test/others/unix-callback/unix-server.c
@@ -8,8 +8,7 @@
 #include <sys/socket.h>
 #include <linux/un.h>
 
-struct ticket
-{
+struct ticket {
 	struct ticket *next;
 	int val;
 	int id;
@@ -40,7 +39,7 @@ int main(void)
 	addr_len = snprintf(addr.sun_path, UNIX_PATH_MAX, SK_NAME);
 	addr_len += sizeof(addr.sun_family);
 
-	if (bind(sk, (struct sockaddr *) &addr, addr_len) < 0) {
+	if (bind(sk, (struct sockaddr *)&addr, addr_len) < 0) {
 		perror("bind");
 		return 1;
 	}
@@ -49,7 +48,7 @@ int main(void)
 
 	while (1) {
 		addr_len = sizeof(struct sockaddr_un);
-		ret = recvfrom(sk, buf, sizeof(buf), 0, (struct sockaddr *) &addr, &addr_len);
+		ret = recvfrom(sk, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &addr_len);
 		if (ret == 0)
 			return 0;
 		if (ret < 0) {
@@ -60,7 +59,7 @@ int main(void)
 		switch (buf[0]) {
 		case 'l':
 			ret = sprintf(buf, "%ld", st.st_ino);
-			if (sendto(sk, buf, ret + 1, 0, (struct sockaddr *) &addr, addr_len) < 0) {
+			if (sendto(sk, buf, ret + 1, 0, (struct sockaddr *)&addr, addr_len) < 0) {
 				perror("sendto");
 				return -1;
 			}
@@ -74,7 +73,7 @@ int main(void)
 
 			t->val = atoi(buf + 1);
 			t->next = tickets;
-			t->id = atoi(addr.sun_path +strlen(SK_NAME));
+			t->id = atoi(addr.sun_path + strlen(SK_NAME));
 			printf("t: id %d val %d\n", t->id, t->val);
 			tickets = t;
 			break;
@@ -90,7 +89,7 @@ int main(void)
 				return 1;
 			printf("r: id %d val %d\n", id, t->val);
 			ret = sprintf(buf, "%d", t->val);
-			if (sendto(sk, buf, ret + 1, 0, (struct sockaddr *) &addr, addr_len) < 0) {
+			if (sendto(sk, buf, ret + 1, 0, (struct sockaddr *)&addr, addr_len) < 0) {
 				perror("sendto");
 				return 1;
 			}
diff --git a/test/zdtm/lib/bpfmap_zdtm.c b/test/zdtm/lib/bpfmap_zdtm.c
index 73a79b3f5..7fe1ed182 100644
--- a/test/zdtm/lib/bpfmap_zdtm.c
+++ b/test/zdtm/lib/bpfmap_zdtm.c
@@ -39,13 +39,13 @@ int parse_bpfmap_fdinfo(int fd, struct bpfmap_fdinfo_obj *obj, uint32_t expected
 			continue;
 		}
 		if (fdinfo_field(str, "map_flags")) {
-			if (sscanf(str, "map_flags: %"PRIx32"", &obj->map_flags) != 1)
+			if (sscanf(str, "map_flags: %" PRIx32 "", &obj->map_flags) != 1)
 				goto parse_err;
 			met++;
 			continue;
 		}
 		if (fdinfo_field(str, "memlock")) {
-			if (sscanf(str, "memlock: %"PRIu64"", &obj->memlock) != 1)
+			if (sscanf(str, "memlock: %" PRIu64 "", &obj->memlock) != 1)
 				goto parse_err;
 			met++;
 			continue;
@@ -86,17 +86,11 @@ int cmp_bpf_map_info(struct bpf_map_info *old, struct bpf_map_info *new)
 	 * the new BPF map created by CRIU (during restore) will have a different
 	 * map id than the old one
 	 */
-	if ((old->type != new->type)				||
-	    (old->key_size != new->key_size)			||
-	    (old->value_size != new->value_size)		||
-	    (old->max_entries != new->max_entries)		||
-	    (old->map_flags != new->map_flags)			||
-	    (old->ifindex != new->ifindex)			||
-	    (old->netns_dev != new->netns_dev)			||
-	    (old->netns_ino != new->netns_ino)			||
-	    (old->btf_id != new->btf_id)			||
-	    (old->btf_key_type_id != new->btf_key_type_id)	||
-	    (old->btf_value_type_id != new->btf_value_type_id))
+	if ((old->type != new->type) || (old->key_size != new->key_size) || (old->value_size != new->value_size) ||
+	    (old->max_entries != new->max_entries) || (old->map_flags != new->map_flags) ||
+	    (old->ifindex != new->ifindex) || (old->netns_dev != new->netns_dev) ||
+	    (old->netns_ino != new->netns_ino) || (old->btf_id != new->btf_id) ||
+	    (old->btf_key_type_id != new->btf_key_type_id) || (old->btf_value_type_id != new->btf_value_type_id))
 		return -1;
 
 	if (strcmp(old->name, new->name) != 0)
@@ -113,13 +107,9 @@ int cmp_bpfmap_fdinfo(struct bpfmap_fdinfo_obj *old, struct bpfmap_fdinfo_obj *n
 	 * the new BPF map created by CRIU (during restore) will have a different map
 	 * id than the old one
 	 */
-	if ((old->map_type != new->map_type)		||
-	    (old->key_size != new->key_size)		||
-	    (old->value_size != new->value_size)	||
-	    (old->max_entries != new->max_entries)	||
-	    (old->map_flags != new->map_flags)		||
-	    (old->memlock != new->memlock)		||
-	    (old->frozen != new->frozen))
+	if ((old->map_type != new->map_type) || (old->key_size != new->key_size) ||
+	    (old->value_size != new->value_size) || (old->max_entries != new->max_entries) ||
+	    (old->map_flags != new->map_flags) || (old->memlock != new->memlock) || (old->frozen != new->frozen))
 		return -1;
 
 	return 0;
diff --git a/test/zdtm/lib/datagen.c b/test/zdtm/lib/datagen.c
index 83fbea285..1561820c7 100644
--- a/test/zdtm/lib/datagen.c
+++ b/test/zdtm/lib/datagen.c
@@ -120,10 +120,7 @@ int datachk(const uint8_t *buffer, unsigned length, uint32_t *crc)
 	for (; length-- > 4; buffer++)
 		*crc = crc32_le8(*crc, *buffer);
 
-	read_crc = buffer[0] |
-		buffer[1] << 8  |
-		buffer[2] << 16 |
-		buffer[3] << 24;
+	read_crc = buffer[0] | buffer[1] << 8 | buffer[2] << 16 | buffer[3] << 24;
 	if (read_crc != *crc) {
 		test_msg("Read: %x, Expected: %x\n", read_crc, *crc);
 		return 1;
diff --git a/test/zdtm/lib/fs.c b/test/zdtm/lib/fs.c
index e82011ec8..7b8be5f9f 100644
--- a/test/zdtm/lib/fs.c
+++ b/test/zdtm/lib/fs.c
@@ -54,10 +54,7 @@ mnt_info_t *get_cwd_mnt_info(void)
 
 	while (fgets(str, sizeof(str), f)) {
 		char *hyphen = strchr(str, '-');
-		ret = sscanf(str, "%i %i %u:%u %s %s",
-			     &mnt_id, &parent_mnt_id,
-			     &kmaj, &kmin,
-			     root, mountpoint);
+		ret = sscanf(str, "%i %i %u:%u %s %s", &mnt_id, &parent_mnt_id, &kmaj, &kmin, root, mountpoint);
 		if (ret != 6 || !hyphen)
 			goto err;
 		ret = sscanf(hyphen + 1, " %ms", &fsname);
@@ -110,8 +107,7 @@ int get_cwd_check_perm(char **result)
 		       "failed for uid:%d,gid:%d, error: %d(%s). "
 		       "Bit 'x' should be set in all path components of "
 		       "this directory\n",
-		       cwd, getuid(), getgid(), errno, strerror(errno)
-		);
+		       cwd, getuid(), getgid(), errno, strerror(errno));
 		return -1;
 	}
 
diff --git a/test/zdtm/lib/groups.c b/test/zdtm/lib/groups.c
index 83b0938a4..8aa744147 100644
--- a/test/zdtm/lib/groups.c
+++ b/test/zdtm/lib/groups.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Group starter";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Group starter";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/lib/lock.c b/test/zdtm/lib/lock.c
index 3c3691d98..d47fc736f 100644
--- a/test/zdtm/lib/lock.c
+++ b/test/zdtm/lib/lock.c
@@ -8,7 +8,7 @@
 
 #include "zdtmtst.h"
 
-#define TASK_WAITER_INITIAL		0x0fffff
+#define TASK_WAITER_INITIAL 0x0fffff
 
 static long sys_gettid(void)
 {
@@ -34,8 +34,10 @@ void task_waiter_fini(task_waiter_t *t)
 
 void task_waiter_wait4(task_waiter_t *t, unsigned int lockid)
 {
-	struct timespec req = { .tv_nsec = TASK_WAITER_INITIAL, };
-	struct timespec rem = { };
+	struct timespec req = {
+		.tv_nsec = TASK_WAITER_INITIAL,
+	};
+	struct timespec rem = {};
 	unsigned int v;
 
 	for (;;) {
diff --git a/test/zdtm/lib/msg.c b/test/zdtm/lib/msg.c
index fe0994077..1cf92e3e0 100644
--- a/test/zdtm/lib/msg.c
+++ b/test/zdtm/lib/msg.c
@@ -50,8 +50,7 @@ void test_msg(const char *format, ...)
 	gettimeofday(&tv, NULL);
 	tm = localtime(&tv.tv_sec);
 	if (tm == NULL) {
-		fprintf(stderr, "ERROR in %s: localtime() failed: %m\n",
-				__func__);
+		fprintf(stderr, "ERROR in %s: localtime() failed: %m\n", __func__);
 	} else {
 		off += strftime(buf, sizeof(buf), "%H:%M:%S", tm);
 	}
diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 0054a3040..6f6cccc99 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -41,7 +41,7 @@ static int prepare_mntns(void)
 	 * under them. So we need to create another mount for the
 	 * new root.
 	 */
-	if (mount(root, root, NULL, MS_SLAVE , NULL)) {
+	if (mount(root, root, NULL, MS_SLAVE, NULL)) {
 		fprintf(stderr, "Can't bind-mount root: %m\n");
 		return -1;
 	}
@@ -54,8 +54,7 @@ static int prepare_mntns(void)
 	criu_path = getenv("ZDTM_CRIU");
 	if (criu_path) {
 		snprintf(path, sizeof(path), "%s%s", root, criu_path);
-		if (mount(criu_path, path, NULL, MS_BIND, NULL) ||
-		    mount(NULL, path, NULL, MS_PRIVATE, NULL)) {
+		if (mount(criu_path, path, NULL, MS_BIND, NULL) || mount(NULL, path, NULL, MS_PRIVATE, NULL)) {
 			pr_perror("Unable to mount %s", path);
 			return -1;
 		}
@@ -87,7 +86,7 @@ static int prepare_mntns(void)
 		return -1;
 	}
 
-	if (mount("./old", "./old", NULL, MS_SLAVE | MS_REC , NULL)) {
+	if (mount("./old", "./old", NULL, MS_SLAVE | MS_REC, NULL)) {
 		fprintf(stderr, "Can't bind-mount root: %m\n");
 		return -1;
 	}
@@ -159,7 +158,7 @@ static int prepare_namespaces(void)
 	return 0;
 }
 
-#define NS_STACK_SIZE	4096
+#define NS_STACK_SIZE 4096
 
 /* All arguments should be above stack, because it grows down */
 struct ns_exec_args {
@@ -191,13 +190,11 @@ static void ns_sig_hand(int signo)
 				if (futex_get(&sig_received))
 					return;
 				futex_set_and_wake(&sig_received, signo);
-				len = snprintf(buf, sizeof(buf),
-						"All test processes exited\n");
+				len = snprintf(buf, sizeof(buf), "All test processes exited\n");
 			} else {
-				len = snprintf(buf, sizeof(buf),
-						"wait() failed: %m\n");
+				len = snprintf(buf, sizeof(buf), "wait() failed: %m\n");
 			}
-				goto write_out;
+			goto write_out;
 		}
 		if (status)
 			fprintf(stderr, "%d return %d\n", pid, status);
@@ -210,7 +207,7 @@ write_out:
 }
 
 #ifndef CLONE_NEWTIME
-#define CLONE_NEWTIME   0x00000080      /* New time namespace */
+#define CLONE_NEWTIME 0x00000080 /* New time namespace */
 #endif
 
 static inline int _settime(clockid_t clk_id, time_t offset)
@@ -245,7 +242,7 @@ static inline int _settime(clockid_t clk_id, time_t offset)
 #define STATUS_FD 255
 static int ns_exec(void *_arg)
 {
-	struct ns_exec_args *args = (struct ns_exec_args *) _arg;
+	struct ns_exec_args *args = (struct ns_exec_args *)_arg;
 	char buf[4096];
 	int ret;
 
@@ -304,8 +301,8 @@ static int create_timens(void)
 int ns_init(int argc, char **argv)
 {
 	struct sigaction sa = {
-		.sa_handler	= ns_sig_hand,
-		.sa_flags	= SA_RESTART,
+		.sa_handler = ns_sig_hand,
+		.sa_flags = SA_RESTART,
 	};
 	int ret, fd, status_pipe = STATUS_FD;
 	char buf[128], *x;
@@ -372,7 +369,7 @@ int ns_init(int argc, char **argv)
 			break;
 		if (pid < 0) {
 			fprintf(stderr, "waitpid() failed: %m\n");
-			exit (1);
+			exit(1);
 		}
 		if (status)
 			fprintf(stderr, "%d return %d\n", pid, status);
@@ -426,7 +423,6 @@ int ns_init(int argc, char **argv)
 		waitpid(pid, NULL, 0);
 	}
 
-
 	exit(1);
 }
 
@@ -449,8 +445,7 @@ void ns_create(int argc, char **argv)
 		exit(1);
 	}
 
-	flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWUTS |
-		CLONE_NEWNET | CLONE_NEWIPC | SIGCHLD;
+	flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWNET | CLONE_NEWIPC | SIGCHLD;
 
 	if (getenv("ZDTM_USERNS"))
 		flags |= CLONE_NEWUSER;
@@ -521,4 +516,3 @@ void ns_create(int argc, char **argv)
 
 	exit(0);
 }
-
diff --git a/test/zdtm/lib/parseargs.c b/test/zdtm/lib/parseargs.c
index d8aa4ed63..156f5a46c 100644
--- a/test/zdtm/lib/parseargs.c
+++ b/test/zdtm/lib/parseargs.c
@@ -20,17 +20,12 @@ void __push_opt(struct long_opt *opt)
 
 int parse_opt_bool(char *param, void *arg)
 {
-	if (param == NULL ||
-	    !strcmp(param, "on") ||
-	    !strcmp(param, "yes") ||
-	    !strcmp(param, "true")) {
-		* (int *) arg = 1;
+	if (param == NULL || !strcmp(param, "on") || !strcmp(param, "yes") || !strcmp(param, "true")) {
+		*(int *)arg = 1;
 		return 0;
 	}
-	if (!strcmp(param, "off") ||
-	    !strcmp(param, "no") ||
-	    !strcmp(param, "false")) {
-		* (int *) arg = 0;
+	if (!strcmp(param, "off") || !strcmp(param, "no") || !strcmp(param, "false")) {
+		*(int *)arg = 0;
 		return 0;
 	}
 	return -EINVAL;
@@ -41,7 +36,7 @@ int parse_opt_int(char *param, void *arg)
 	char *tail;
 	if (param == NULL || param[0] == '\0')
 		return -EINVAL;
-	* (int *) arg = strtol(param, &tail, 0);
+	*(int *)arg = strtol(param, &tail, 0);
 	if (tail[0] != '\0')
 		return -EINVAL;
 	return 0;
@@ -52,7 +47,7 @@ int parse_opt_uint(char *param, void *arg)
 	char *tail;
 	if (param == NULL || param[0] == '\0')
 		return -EINVAL;
-	* (unsigned int *) arg = strtoul(param, &tail, 0);
+	*(unsigned int *)arg = strtoul(param, &tail, 0);
 	if (tail[0] != '\0')
 		return -EINVAL;
 	return 0;
@@ -63,7 +58,7 @@ int parse_opt_long(char *param, void *arg)
 	char *tail;
 	if (param == NULL || param[0] == '\0')
 		return -EINVAL;
-	* (long *) arg = strtol(param, &tail, 0);
+	*(long *)arg = strtol(param, &tail, 0);
 	if (tail[0] != '\0')
 		return -EINVAL;
 	return 0;
@@ -74,7 +69,7 @@ int parse_opt_ulong(char *param, void *arg)
 	char *tail;
 	if (param == NULL || param[0] == '\0')
 		return -EINVAL;
-	* (unsigned long *) arg = strtoul(param, &tail, 0);
+	*(unsigned long *)arg = strtoul(param, &tail, 0);
 	if (tail[0] != '\0')
 		return -EINVAL;
 	return 0;
@@ -84,7 +79,7 @@ int parse_opt_string(char *param, void *arg)
 {
 	if (param == NULL || param[0] == '\0')
 		return -EINVAL;
-	* (char **) arg = param;
+	*(char **)arg = param;
 	return 0;
 }
 
@@ -97,8 +92,7 @@ static void printopt(const struct long_opt *opt)
 		cbracket = "]";
 	}
 
-	fprintf(stderr, "  %s--%s=%s%s\t%s\n",
-		obracket, opt->name, opt->type, cbracket, opt->doc);
+	fprintf(stderr, "  %s--%s=%s%s\t%s\n", obracket, opt->name, opt->type, cbracket, opt->doc);
 }
 
 static void helpexit(void)
@@ -113,8 +107,8 @@ static void helpexit(void)
 	exit(1);
 }
 
-const char __attribute__((weak)) *test_doc;
-const char __attribute__((weak)) *test_author;
+const char __attribute__((weak)) * test_doc;
+const char __attribute__((weak)) * test_author;
 
 static void prdoc(void)
 {
@@ -124,7 +118,7 @@ static void prdoc(void)
 		fprintf(stderr, "Author: %s\n", test_author);
 }
 
-void parseargs(int argc, char ** argv)
+void parseargs(int argc, char **argv)
 {
 	int i;
 	struct long_opt *opt;
@@ -148,10 +142,9 @@ void parseargs(int argc, char ** argv)
 				if (opt->parse_opt(value, opt->value)) {
 					fprintf(stderr, "%s: failed to parse\n", argv[i]);
 					helpexit();
-				}
-				else
+				} else
 					/* -1 marks fulfilled requirement */
-					opt->is_required = - opt->is_required;
+					opt->is_required = -opt->is_required;
 
 				break;
 			}
diff --git a/test/zdtm/lib/tcp.c b/test/zdtm/lib/tcp.c
index 623994bf8..cbd87521b 100644
--- a/test/zdtm/lib/tcp.c
+++ b/test/zdtm/lib/tcp.c
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 
 #include "zdtmtst.h"
 
@@ -25,11 +25,11 @@ int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts)
 	int sock;
 	int yes = 1, ret;
 
-	memset(&addr,0,sizeof(addr));
+	memset(&addr, 0, sizeof(addr));
 	if (family == AF_INET) {
 		addr.v4.sin_family = family;
 		inet_pton(family, "0.0.0.0", &(addr.v4.sin_addr));
-	} else if (family == AF_INET6){
+	} else if (family == AF_INET6) {
 		addr.v6.sin6_family = family;
 		inet_pton(family, "::0", &(addr.v6.sin6_addr));
 	} else
@@ -41,14 +41,12 @@ int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts)
 		return -1;
 	}
 
-	if (opts->reuseport &&
-	    setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(int)) == -1) {
+	if (opts->reuseport && setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(int)) == -1) {
 		pr_perror("setsockopt(SO_REUSEPORT) failed");
 		return -1;
 	}
 
-	if (opts->reuseaddr &&
-	    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1 ) {
+	if (opts->reuseaddr && setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) {
 		pr_perror("setsockopt(SO_REUSEATTR) failed");
 		return -1;
 	}
@@ -59,7 +57,7 @@ int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts)
 		else if (family == AF_INET6)
 			addr.v6.sin6_port = htons(*port);
 
-		ret = bind(sock, (struct sockaddr *) &addr, sizeof(addr));
+		ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
 
 		/* criu doesn't restore sock opts, so we need this hack */
 		if (ret == -1 && errno == EADDRINUSE) {
@@ -88,10 +86,10 @@ int tcp_accept_server(int sock)
 	int sock2;
 	socklen_t addrlen;
 #ifdef DEBUG
-	test_msg ("Waiting for connection..........\n");
+	test_msg("Waiting for connection..........\n");
 #endif
 	addrlen = sizeof(maddr);
-	sock2 = accept(sock,(struct sockaddr *) &maddr, &addrlen);
+	sock2 = accept(sock, (struct sockaddr *)&maddr, &addrlen);
 
 	if (sock2 == -1) {
 		pr_perror("accept() failed");
@@ -99,7 +97,7 @@ int tcp_accept_server(int sock)
 	}
 
 #ifdef DEBUG
-	test_msg ("Connection!!\n");
+	test_msg("Connection!!\n");
 #endif
 	return sock2;
 }
@@ -123,15 +121,15 @@ int tcp_init_client_with_fd(int sock, int family, char *servIP, unsigned short s
 	/* Construct the server address structure */
 	memset(&servAddr, 0, sizeof(servAddr));
 	if (family == AF_INET) {
-		servAddr.v4.sin_family      = AF_INET;
-		servAddr.v4.sin_port        = htons(servPort);
+		servAddr.v4.sin_family = AF_INET;
+		servAddr.v4.sin_port = htons(servPort);
 		inet_pton(AF_INET, servIP, &servAddr.v4.sin_addr);
 	} else {
-		servAddr.v6.sin6_family      = AF_INET6;
-		servAddr.v6.sin6_port        = htons(servPort);
+		servAddr.v6.sin6_family = AF_INET6;
+		servAddr.v6.sin6_port = htons(servPort);
 		inet_pton(AF_INET6, servIP, &servAddr.v6.sin6_addr);
 	}
-	if (connect(sock, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0) {
+	if (connect(sock, (struct sockaddr *)&servAddr, sizeof(servAddr)) < 0) {
 		pr_perror("can't connect to server");
 		return -1;
 	}
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index e848091c1..81da81eba 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -22,7 +22,7 @@
 futex_t sig_received;
 static struct {
 	futex_t stage;
-} *test_shared_state;
+} * test_shared_state;
 
 enum {
 	TEST_INIT_STAGE = 0,
@@ -74,8 +74,7 @@ static void test_fini(void)
 static void setup_outfile(void)
 {
 	if (!access(outfile, F_OK) || errno != ENOENT) {
-		fprintf(stderr, "Output file %s appears to exist, aborting\n",
-			outfile);
+		fprintf(stderr, "Output file %s appears to exist, aborting\n", outfile);
 		exit(1);
 	}
 
@@ -214,8 +213,8 @@ void test_init(int argc, char **argv)
 	pid_t pid;
 	char *val;
 	struct sigaction sa = {
-		.sa_handler	= sig_hand,
-		.sa_flags	= SA_RESTART,
+		.sa_handler = sig_hand,
+		.sa_flags = SA_RESTART,
 	};
 	sigemptyset(&sa.sa_mask);
 
@@ -302,7 +301,7 @@ void test_init(int argc, char **argv)
 	}
 
 	parent = 1;
-	if (pid) {	/* parent will exit when the child is ready */
+	if (pid) { /* parent will exit when the child is ready */
 		futex_wait_while(&test_shared_state->stage, TEST_INIT_STAGE);
 
 		if (futex_get(&test_shared_state->stage) == TEST_FAIL_STAGE) {
@@ -343,7 +342,7 @@ void test_init(int argc, char **argv)
 		exit(1);
 	}
 
-	srand48(time(NULL));	/* just in case we need it */
+	srand48(time(NULL)); /* just in case we need it */
 }
 
 void test_daemon(void)
@@ -398,12 +397,11 @@ int test_wait_pre_dump_ack(void)
 	return 0;
 }
 
-pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid,
-			void *child_tid, unsigned long newtls)
+pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid, void *child_tid, unsigned long newtls)
 {
 #ifdef __x86_64__
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, child_tid, newtls);
-#elif (__i386__ || __arm__ || __aarch64__ ||__powerpc64__ || __mips__)
+#elif (__i386__ || __arm__ || __aarch64__ || __powerpc64__ || __mips__)
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, newtls, child_tid);
 #elif __s390x__
 	return (pid_t)syscall(__NR_clone, child_stack, flags, parent_tid, child_tid, newtls);
diff --git a/test/zdtm/lib/unix.c b/test/zdtm/lib/unix.c
index c36846cad..49773dedd 100644
--- a/test/zdtm/lib/unix.c
+++ b/test/zdtm/lib/unix.c
@@ -16,4 +16,3 @@ int unix_fill_sock_name(struct sockaddr_un *name, char *relFilename)
 	ssprintf(name->sun_path, "%s/%s", cwd, relFilename);
 	return 0;
 }
-
diff --git a/test/zdtm/static/aio00.c b/test/zdtm/static/aio00.c
index 93ca7aabb..7e7b9978d 100644
--- a/test/zdtm/static/aio00.c
+++ b/test/zdtm/static/aio00.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that plain io_setup works";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that plain io_setup works";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/aio01.c b/test/zdtm/static/aio01.c
index fda7572a1..ed45192b9 100644
--- a/test/zdtm/static/aio01.c
+++ b/test/zdtm/static/aio01.c
@@ -10,20 +10,20 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check head and tail restore correct";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com>";
+const char *test_doc = "Check head and tail restore correct";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 struct aio_ring {
-	unsigned	id;     /* kernel internal index number */
-	unsigned	nr;     /* number of io_events */
-	unsigned	head;   /* Written to by userland or under ring_lock
+	unsigned id; /* kernel internal index number */
+	unsigned nr; /* number of io_events */
+	unsigned head; /* Written to by userland or under ring_lock
 				 * mutex by aio_read_events_ring(). */
-	unsigned	tail;
-	unsigned	magic;
-	unsigned	compat_features;
-	unsigned	incompat_features;
-	unsigned	header_length;	/* size of aio_ring */
-	struct io_event	io_events[0];
+	unsigned tail;
+	unsigned magic;
+	unsigned compat_features;
+	unsigned incompat_features;
+	unsigned header_length; /* size of aio_ring */
+	struct io_event io_events[0];
 }; /* 128 bytes + ring size */
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/apparmor.c b/test/zdtm/static/apparmor.c
index a06589815..713ffaa46 100644
--- a/test/zdtm/static/apparmor.c
+++ b/test/zdtm/static/apparmor.c
@@ -10,8 +10,8 @@
 #include <signal.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that an apparmor profile is restored";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that an apparmor profile is restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #define PROFILE "criu_test"
 
diff --git a/test/zdtm/static/arm-neon00.c b/test/zdtm/static/arm-neon00.c
index c58218a11..43e1d4ca3 100644
--- a/test/zdtm/static/arm-neon00.c
+++ b/test/zdtm/static/arm-neon00.c
@@ -3,14 +3,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Initialize VFP registers before a migration,\n"
-						  "check the VFP state is the same after a restore.";
-const char *test_author	= "Alexander Karatshov <alekskartashov@parallels.com>";
-
+const char *test_doc = "Initialize VFP registers before a migration,\n"
+		       "check the VFP state is the same after a restore.";
+const char *test_author = "Alexander Karatshov <alekskartashov@parallels.com>";
 
 #ifdef __arm__
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int a, b, c, y1, y2;
 
@@ -19,18 +18,17 @@ int main(int argc, char ** argv)
 	a = rand() % 100;
 	b = rand() % 100;
 	c = rand() % 100;
-	y1 = a + b*c;
+	y1 = a + b * c;
 
 	test_init(argc, argv);
 
-	asm (
-		".fpu neon				\n"
-		"vmov.32	d0[0], %0	\n"
-		"vmov.32	d1[0], %1	\n"
-		"vmov.32	d2[0], %2	\n"
-		".fpu softvfp			\n"
-		: : "r"(a), "r"(b), "r"(c)
-	);
+	asm(".fpu neon				\n"
+	    "vmov.32	d0[0], %0	\n"
+	    "vmov.32	d1[0], %1	\n"
+	    "vmov.32	d2[0], %2	\n"
+	    ".fpu softvfp			\n"
+	    :
+	    : "r"(a), "r"(b), "r"(c));
 
 	test_msg("Preparing to wait...\n");
 
@@ -39,14 +37,12 @@ int main(int argc, char ** argv)
 
 	test_msg("Restored.\n");
 
-	asm (
-		".fpu neon				\n"
-		"vmul.I32	d3, d1, d2	\n"
-		"vadd.I32	d4, d0, d3	\n"
-		"vmov.32	%0, d4[0]	\n"
-		".fpu softvfp			\n"
-		: "=r"(y2)
-	);
+	asm(".fpu neon				\n"
+	    "vmul.I32	d3, d1, d2	\n"
+	    "vadd.I32	d4, d0, d3	\n"
+	    "vmov.32	%0, d4[0]	\n"
+	    ".fpu softvfp			\n"
+	    : "=r"(y2));
 
 	if (y1 != y2)
 		fail("VFP restoration failed: result = %d, expected = %d (a = %d, b = %d, c = %d)", y2, y1, a, b, c);
diff --git a/test/zdtm/static/autofs.c b/test/zdtm/static/autofs.c
index 6d261677b..2d6078627 100644
--- a/test/zdtm/static/autofs.c
+++ b/test/zdtm/static/autofs.c
@@ -20,14 +20,14 @@
 #include "auto_dev-ioctl.h"
 
 const char *test_doc = "Autofs (v5) migration test";
-const char *test_author	= "Stanislav Kinsburskii <stanislav.kinsburskiy@virtuozzo.com>";
+const char *test_author = "Stanislav Kinsburskii <stanislav.kinsburskiy@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define AUTOFS_DEV			"/dev/autofs"
+#define AUTOFS_DEV "/dev/autofs"
 
-#define INDIRECT_MNT_DIR		"mnt"
+#define INDIRECT_MNT_DIR "mnt"
 
 int autofs_dev;
 task_waiter_t t;
@@ -53,7 +53,7 @@ static char *xvstrcat(char *str, const char *fmt, va_list args)
 			if (ret >= delta) {
 				/* NOTE: vsnprintf returns the amount of bytes
 				 *                                  * to allocate. */
-				delta = ret +1;
+				delta = ret + 1;
 				str = new;
 				ret = 0;
 			}
@@ -187,53 +187,45 @@ static int check_fd(struct autofs_params *p)
 
 	if (st.st_dev != p->fd_stat.st_dev) {
 		skip("%s: st_dev differs: %llu != %llu "
-		     "(waiting for \"device namespaces\")", p->mountpoint,
-				(long long unsigned)st.st_dev,
-				(long long unsigned)p->fd_stat.st_dev);
-//		ret++;
+		     "(waiting for \"device namespaces\")",
+		     p->mountpoint, (long long unsigned)st.st_dev, (long long unsigned)p->fd_stat.st_dev);
+		//		ret++;
 	}
 	if (st.st_mode != p->fd_stat.st_mode) {
-		pr_err("%s: st_mode differs: 0%o != 0%o\n", p->mountpoint,
-				st.st_mode, p->fd_stat.st_mode);
+		pr_err("%s: st_mode differs: 0%o != 0%o\n", p->mountpoint, st.st_mode, p->fd_stat.st_mode);
 		ret++;
 	}
 	if (st.st_nlink != p->fd_stat.st_nlink) {
-		pr_err("%s: st_nlink differs: %ld != %ld\n", p->mountpoint,
-				(long)st.st_nlink, (long)p->fd_stat.st_nlink);
+		pr_err("%s: st_nlink differs: %ld != %ld\n", p->mountpoint, (long)st.st_nlink,
+		       (long)p->fd_stat.st_nlink);
 		ret++;
 	}
 	if (st.st_uid != p->fd_stat.st_uid) {
-		pr_err("%s: st_uid differs: %u != %u\n", p->mountpoint,
-				st.st_uid, p->fd_stat.st_uid);
+		pr_err("%s: st_uid differs: %u != %u\n", p->mountpoint, st.st_uid, p->fd_stat.st_uid);
 		ret++;
 	}
 	if (st.st_gid != p->fd_stat.st_gid) {
-		pr_err("%s: st_gid differs: %u != %u\n", p->mountpoint,
-				st.st_gid, p->fd_stat.st_gid);
+		pr_err("%s: st_gid differs: %u != %u\n", p->mountpoint, st.st_gid, p->fd_stat.st_gid);
 		ret++;
 	}
 	if (st.st_rdev != p->fd_stat.st_rdev) {
-		pr_err("%s: st_rdev differs: %lld != %lld\n", p->mountpoint,
-				(long long)st.st_rdev,
-				(long long)p->fd_stat.st_rdev);
+		pr_err("%s: st_rdev differs: %lld != %lld\n", p->mountpoint, (long long)st.st_rdev,
+		       (long long)p->fd_stat.st_rdev);
 		ret++;
 	}
 	if (st.st_size != p->fd_stat.st_size) {
-		pr_err("%s: st_size differs: %lld != %lld\n", p->mountpoint,
-				(long long)st.st_size,
-				(long long)p->fd_stat.st_size);
+		pr_err("%s: st_size differs: %lld != %lld\n", p->mountpoint, (long long)st.st_size,
+		       (long long)p->fd_stat.st_size);
 		ret++;
 	}
 	if (st.st_blksize != p->fd_stat.st_blksize) {
-		pr_err("%s: st_blksize differs %lld != %lld:\n", p->mountpoint,
-				(long long)st.st_blksize,
-				(long long)p->fd_stat.st_blksize);
+		pr_err("%s: st_blksize differs %lld != %lld:\n", p->mountpoint, (long long)st.st_blksize,
+		       (long long)p->fd_stat.st_blksize);
 		ret++;
 	}
 	if (st.st_blocks != p->fd_stat.st_blocks) {
-		pr_err("%s: st_blocks differs: %lld != %lld\n", p->mountpoint,
-				(long long)st.st_blocks,
-				(long long)p->fd_stat.st_blocks);
+		pr_err("%s: st_blocks differs: %lld != %lld\n", p->mountpoint, (long long)st.st_blocks,
+		       (long long)p->fd_stat.st_blocks);
 		ret++;
 	}
 
@@ -247,8 +239,7 @@ static int check_automount(struct autofs_params *p)
 
 	err = check_fd(p);
 	if (err) {
-		pr_err("%s: opened file descriptor wasn't migrated properly\n",
-				p->mountpoint);
+		pr_err("%s: opened file descriptor wasn't migrated properly\n", p->mountpoint);
 		return err;
 	}
 
@@ -283,8 +274,7 @@ static int check_automount(struct autofs_params *p)
 	}
 
 	if (close(p->fd)) {
-		pr_perror("%s: failed to close fd %d", mountpoint,
-				p->fd);
+		pr_perror("%s: failed to close fd %d", mountpoint, p->fd);
 		return -errno;
 	}
 
@@ -335,11 +325,10 @@ out:
 	return ret;
 }
 
-static int autofs_report_result(int token, int devid, const char *mountpoint,
-				int result)
+static int autofs_report_result(int token, int devid, const char *mountpoint, int result)
 {
 	int ioctl_fd;
-        struct autofs_dev_ioctl param;
+	struct autofs_dev_ioctl param;
 	int err;
 
 	ioctl_fd = autofs_open_mount(devid, mountpoint);
@@ -378,28 +367,24 @@ static int mount_tmpfs(const char *mountpoint)
 		return 0;
 
 	if (mount("autofs_test", mountpoint, "tmpfs", 0, "size=1M") < 0) {
-		pr_perror("failed to mount tmpfs to %s",
-				mountpoint);
+		pr_perror("failed to mount tmpfs to %s", mountpoint);
 		return -errno;
 	}
 	return 0;
 }
 
-static int autofs_mount_direct(const char *mountpoint,
-			       const struct autofs_v5_packet *packet)
+static int autofs_mount_direct(const char *mountpoint, const struct autofs_v5_packet *packet)
 {
 	int err;
 	const char *direct_mnt = mountpoint;
 
 	err = mount_tmpfs(direct_mnt);
 	if (err)
-		pr_err("%d: failed to mount direct autofs mountpoint\n",
-				getpid());
+		pr_err("%d: failed to mount direct autofs mountpoint\n", getpid());
 	return err;
 }
 
-static int autofs_mount_indirect(const char *mountpoint,
-				 const struct autofs_v5_packet *packet)
+static int autofs_mount_indirect(const char *mountpoint, const struct autofs_v5_packet *packet)
 {
 	char *indirect_mnt;
 	int err;
@@ -417,40 +402,34 @@ static int autofs_mount_indirect(const char *mountpoint,
 
 	err = mount_tmpfs(indirect_mnt);
 	if (err)
-		pr_err("%d: failed to mount indirect autofs mountpoint\n",
-				getpid());
+		pr_err("%d: failed to mount indirect autofs mountpoint\n", getpid());
 	return err;
-
 }
 
-static int automountd_serve(const char *mountpoint, struct autofs_params *p,
-			    const union autofs_v5_packet_union *packet)
+static int automountd_serve(const char *mountpoint, struct autofs_params *p, const union autofs_v5_packet_union *packet)
 {
 	const struct autofs_v5_packet *v5_packet = &packet->v5_packet;
 	int err, res;
 
 	switch (packet->hdr.type) {
-		case autofs_ptype_missing_indirect:
-			res = autofs_mount_indirect(mountpoint, v5_packet);
-			break;
-		case autofs_ptype_missing_direct:
-			res = autofs_mount_direct(mountpoint, v5_packet);
-			break;
-		case autofs_ptype_expire_indirect:
-			pr_err("%d: expire request for indirect mount %s?\n",
-					getpid(), v5_packet->name);
-			return -EINVAL;
-		case autofs_ptype_expire_direct:
-			pr_err("%d: expire request for direct mount?\n",
-					getpid());
-			return -EINVAL;
-		default:
-			pr_err("unknown request type: %d\n", packet->hdr.type);
-			return -EINVAL;
+	case autofs_ptype_missing_indirect:
+		res = autofs_mount_indirect(mountpoint, v5_packet);
+		break;
+	case autofs_ptype_missing_direct:
+		res = autofs_mount_direct(mountpoint, v5_packet);
+		break;
+	case autofs_ptype_expire_indirect:
+		pr_err("%d: expire request for indirect mount %s?\n", getpid(), v5_packet->name);
+		return -EINVAL;
+	case autofs_ptype_expire_direct:
+		pr_err("%d: expire request for direct mount?\n", getpid());
+		return -EINVAL;
+	default:
+		pr_err("unknown request type: %d\n", packet->hdr.type);
+		return -EINVAL;
 	}
 
-	err = autofs_report_result(v5_packet->wait_queue_token, v5_packet->dev,
-				   mountpoint, res);
+	err = autofs_report_result(v5_packet->wait_queue_token, v5_packet->dev, mountpoint, res);
 	if (err)
 		return err;
 	return res;
@@ -481,8 +460,7 @@ static int automountd_loop(int pipe, const char *mountpoint, struct autofs_param
 			continue;
 		}
 		if (bytes != psize) {
-			pr_err("read less than expected: %zd < %zd\n",
-					bytes, psize);
+			pr_err("read less than expected: %zd < %zd\n", bytes, psize);
 			return -EINVAL;
 		}
 		err = automountd_serve(mountpoint, param, packet);
@@ -522,22 +500,21 @@ static int automountd(struct autofs_params *p, int control_fd)
 	}
 
 	switch (p->type) {
-		case AUTOFS_TYPE_DIRECT:
-			type = "direct";
-			break;
-		case AUTOFS_TYPE_INDIRECT:
-			type = "indirect";
-			break;
-		case AUTOFS_TYPE_OFFSET:
-			type = "offset";
-			break;
-		default:
-			pr_err("unknown autofs type: %d\n", p->type);
-			return -EINVAL;
+	case AUTOFS_TYPE_DIRECT:
+		type = "direct";
+		break;
+	case AUTOFS_TYPE_INDIRECT:
+		type = "indirect";
+		break;
+	case AUTOFS_TYPE_OFFSET:
+		type = "offset";
+		break;
+	default:
+		pr_err("unknown autofs type: %d\n", p->type);
+		return -EINVAL;
 	}
 
-	options = xsprintf("fd=%d,pgrp=%d,minproto=5,maxproto=5,%s",
-				pipes[1], getpgrp(), type);
+	options = xsprintf("fd=%d,pgrp=%d,minproto=5,maxproto=5,%s", pipes[1], getpgrp(), type);
 	if (!options) {
 		pr_err("failed to allocate autofs options\n");
 		goto err;
@@ -550,8 +527,7 @@ static int automountd(struct autofs_params *p, int control_fd)
 	}
 
 	if (mount("autofs_test", autofs_path, "autofs", 0, options) < 0) {
-		pr_perror("failed to mount autofs with options \"%s\"",
-				options);
+		pr_perror("failed to mount autofs with options \"%s\"", options);
 		goto err;
 	}
 
@@ -589,12 +565,12 @@ static int start_automounter(struct autofs_params *p)
 
 	pid = test_fork();
 	switch (pid) {
-		case -1:
-			pr_perror("failed to fork");
-			return -1;
-		case 0:
-			close(control_fd[0]);
-			exit(automountd(p, control_fd[1]));
+	case -1:
+		pr_perror("failed to fork");
+		return -1;
+	case 0:
+		close(control_fd[0]);
+		exit(automountd(p, control_fd[1]));
 	}
 	task_waiter_wait4(&t, pid);
 	p->pid = pid;
@@ -608,8 +584,7 @@ static int start_automounter(struct autofs_params *p)
 		return -errno;
 	}
 	if (bytes != sizeof(ret)) {
-		pr_err("received less than expected: %zu. Child %d died?\n",
-				bytes, p->pid);
+		pr_err("received less than expected: %zu. Child %d died?\n", bytes, p->pid);
 		return -EINVAL;
 	}
 	return ret;
@@ -657,8 +632,7 @@ static int reap_catatonic(struct autofs_params *p)
 	err = umount_fs(mountpoint, AUTOFS_SUPER_MAGIC);
 	if (!err) {
 		if (rmdir(mountpoint) < 0) {
-			skip("failed to remove %s directory: %s\n", mountpoint,
-					strerror(errno));
+			skip("failed to remove %s directory: %s\n", mountpoint, strerror(errno));
 			err = -errno;
 		}
 	}
@@ -732,40 +706,34 @@ static int create_catatonic(struct autofs_params *p)
 static void test_exit(void)
 {
 	if (rmdir(dirname) < 0)
-		skip("failed to remove %s directory: %s\n", dirname,
-				strerror(errno));
+		skip("failed to remove %s directory: %s\n", dirname, strerror(errno));
 }
 
-typedef enum {
-	AUTOFS_START,
-	AUTOFS_SETUP,
-	AUTOFS_CHECK,
-	AUTOFS_STOP
-} autfs_test_action;
+typedef enum { AUTOFS_START, AUTOFS_SETUP, AUTOFS_CHECK, AUTOFS_STOP } autfs_test_action;
 
 static int test_action(autfs_test_action act, struct autofs_params *p)
 {
 	int ret = 0;
 
-	while(p->mountpoint) {
-		int (*action)(struct autofs_params *p);
+	while (p->mountpoint) {
+		int (*action)(struct autofs_params * p);
 
 		switch (act) {
-			case AUTOFS_START:
-				action = p->create;
-				break;
-			case AUTOFS_SETUP:
-				action = p->setup;
-				break;
-			case AUTOFS_CHECK:
-				action = p->check;
-				break;
-			case AUTOFS_STOP:
-				action = p->reap;
-				break;
-			default:
-				pr_err("unknown action: %d\n", act);
-				return -1;
+		case AUTOFS_START:
+			action = p->create;
+			break;
+		case AUTOFS_SETUP:
+			action = p->setup;
+			break;
+		case AUTOFS_CHECK:
+			action = p->check;
+			break;
+		case AUTOFS_STOP:
+			action = p->reap;
+			break;
+		default:
+			pr_err("unknown action: %d\n", act);
+			return -1;
 		}
 
 		if (action && action(p))
@@ -793,8 +761,7 @@ static void direct_exit(void)
 		return;
 
 	if (rmdir(mountpoint) < 0)
-		skip("failed to remove %s directory: %s\n", mountpoint,
-				strerror(errno));
+		skip("failed to remove %s directory: %s\n", mountpoint, strerror(errno));
 }
 
 static void indirect_exit(void)
@@ -822,8 +789,7 @@ static void indirect_exit(void)
 		return;
 
 	if (rmdir(mountpoint) < 0)
-		skip("failed to remove %s directory: %s\n", mountpoint,
-				strerror(errno));
+		skip("failed to remove %s directory: %s\n", mountpoint, strerror(errno));
 }
 
 enum autofs_tests {
@@ -940,4 +906,3 @@ err:
 	pass();
 	return 0;
 }
-
diff --git a/test/zdtm/static/bind-mount.c b/test/zdtm/static/bind-mount.c
index 06c5cf173..fed51c59b 100644
--- a/test/zdtm/static/bind-mount.c
+++ b/test/zdtm/static/bind-mount.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check bind-mounts";
-const char *test_author	= "Pavel Emelianov <avagin@parallels.com>";
+const char *test_doc = "Check bind-mounts";
+const char *test_author = "Pavel Emelianov <avagin@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/binfmt_misc.c b/test/zdtm/static/binfmt_misc.c
index 553cc1795..036eb9fe9 100644
--- a/test/zdtm/static/binfmt_misc.c
+++ b/test/zdtm/static/binfmt_misc.c
@@ -9,13 +9,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that binfmt_misc entries remain registered";
-const char *test_author	= "Kirill Tkhai <ktkhai@odin.com";
+const char *test_doc = "Check that binfmt_misc entries remain registered";
+const char *test_author = "Kirill Tkhai <ktkhai@odin.com";
 
-#define MAX_REG_STR 256
-#define MAX_MAGIC 16
+#define MAX_REG_STR	 256
+#define MAX_MAGIC	 16
 #define MAX_MAGIC_OFFSET 128 /* Max magic+offset */
-#define MAX_EXTENSION 128
+#define MAX_EXTENSION	 128
 
 char *dirname = "binfmt_misc.dir";
 TEST_OPTION(dirname, string, "binfmt_misc mount directory name", 1);
@@ -31,7 +31,7 @@ void create_magic_pattern(char *buf, const char *name)
 	int i, magic, mask, offset;
 
 	magic = rand() % (MAX_MAGIC + 1);
-	mask  = (rand() % 2) ? magic : 0;
+	mask = (rand() % 2) ? magic : 0;
 	offset = MAX_MAGIC_OFFSET - magic;
 	offset = rand() % (offset + 1);
 
@@ -83,7 +83,7 @@ int dump_content(const char *path, char **dump)
 		return -1;
 	}
 
-	len = read(fd, p, PAGE_SIZE-1);
+	len = read(fd, p, PAGE_SIZE - 1);
 	close(fd);
 	if (len <= 0) {
 		fail("read");
@@ -98,7 +98,7 @@ int dump_content(const char *path, char **dump)
 int main(int argc, char **argv)
 {
 	char buf[MAX_REG_STR + 1];
-	char path[PATH_MAX*2 + 1];
+	char path[PATH_MAX * 2 + 1];
 	char *dump[2];
 	int i, fd, len;
 
@@ -118,7 +118,10 @@ int main(int argc, char **argv)
 	}
 
 	/* Register binfmt_entries */
-	sprintf(path, "%s/" "register", dirname);
+	sprintf(path,
+		"%s/"
+		"register",
+		dirname);
 	fd = open(path, O_WRONLY);
 	if (fd < 0) {
 		fail("open");
@@ -152,7 +155,7 @@ int main(int argc, char **argv)
 	close(fd);
 
 	/* Dump files content */
-	for (i = 0; i < 2; i ++) {
+	for (i = 0; i < 2; i++) {
 		sprintf(path, "%s/%s", dirname, NAME[i]);
 		if (dump_content(path, &dump[i]))
 			exit(1);
@@ -162,7 +165,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	/* Check */
-	for (i = 0; i < 2; i ++) {
+	for (i = 0; i < 2; i++) {
 		char *tmp;
 
 		sprintf(path, "%s/%s", dirname, NAME[i]);
diff --git a/test/zdtm/static/bpf_array.c b/test/zdtm/static/bpf_array.c
index ca7796bdf..ec74a3e3b 100644
--- a/test/zdtm/static/bpf_array.c
+++ b/test/zdtm/static/bpf_array.c
@@ -5,17 +5,14 @@
 #include "zdtmtst.h"
 #include "bpfmap_zdtm.h"
 
-const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_ARRAY"
-							"is correctly restored";
-const char *test_author	= "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
+const char *test_doc = "Check that data and meta-data for BPF_MAP_TYPE_ARRAY"
+		       "is correctly restored";
+const char *test_author = "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
 
 static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
 {
 	int i, ret;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
-		.elem_flags = 0,
-		.flags = 0,
-	);
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
 
 	for (i = 0; i < max_entries; i++) {
 		keys[i] = i;
@@ -72,17 +69,11 @@ int main(int argc, char **argv)
 		.max_entries = max_entries,
 		.map_flags = BPF_F_NUMA_NODE,
 	};
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
-		.elem_flags = 0,
-		.flags = 0,
-	);
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
 
-	keys = mmap(NULL, max_entries * sizeof(int),
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	values = mmap(NULL, max_entries * sizeof(int),
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	visited = mmap(NULL, max_entries * sizeof(int),
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	keys = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	values = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	visited = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 
 	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
 		pr_perror("Can't mmap()");
diff --git a/test/zdtm/static/bpf_hash.c b/test/zdtm/static/bpf_hash.c
index 4054140b8..612f69665 100644
--- a/test/zdtm/static/bpf_hash.c
+++ b/test/zdtm/static/bpf_hash.c
@@ -5,17 +5,14 @@
 #include "zdtmtst.h"
 #include "bpfmap_zdtm.h"
 
-const char *test_doc	= "Check that data and meta-data for BPF_MAP_TYPE_HASH"
-							"is correctly restored";
-const char *test_author	= "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
+const char *test_doc = "Check that data and meta-data for BPF_MAP_TYPE_HASH"
+		       "is correctly restored";
+const char *test_author = "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
 
 static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
 {
 	int ret;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
-		.elem_flags = 0,
-		.flags = 0,
-	);
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
 
 	for (int i = 0; i < max_entries; i++) {
 		keys[i] = i + 1;
@@ -34,7 +31,6 @@ static int map_batch_verify(int *visited, uint32_t max_entries, int *keys, int *
 {
 	memset(visited, 0, max_entries * sizeof(*visited));
 	for (int i = 0; i < max_entries; i++) {
-
 		if (keys[i] + 1 != values[i]) {
 			pr_err("Key/value checking error: i=%d, key=%d, value=%d\n", i, keys[i], values[i]);
 			return -1;
@@ -71,17 +67,11 @@ int main(int argc, char **argv)
 		.max_entries = max_entries,
 		.map_flags = BPF_F_NO_PREALLOC | BPF_F_NUMA_NODE,
 	};
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts,
-		.elem_flags = 0,
-		.flags = 0,
-	);
+	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
 
-	keys = mmap(NULL, max_entries * sizeof(int),
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	values = mmap(NULL, max_entries * sizeof(int),
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	visited = mmap(NULL, max_entries * sizeof(int),
-			PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	keys = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	values = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	visited = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 
 	if ((keys == MAP_FAILED) || (values == MAP_FAILED) || (visited == MAP_FAILED)) {
 		pr_perror("Can't mmap()");
diff --git a/test/zdtm/static/bridge.c b/test/zdtm/static/bridge.c
index 983c262af..03084a296 100644
--- a/test/zdtm/static/bridge.c
+++ b/test/zdtm/static/bridge.c
@@ -12,8 +12,8 @@
 #include <net/if.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "check that empty bridges are c/r'd correctly";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "check that empty bridges are c/r'd correctly";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #define BRIDGE_NAME "zdtmbr0"
 
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	}
 	addr.sin6_scope_id = if_nametoindex(BRIDGE_NAME);
 
-	if (bind(sk, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
+	if (bind(sk, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		fail("can't bind");
 		goto out;
 	}
diff --git a/test/zdtm/static/busyloop00.c b/test/zdtm/static/busyloop00.c
index e9a065cf7..399516933 100644
--- a/test/zdtm/static/busyloop00.c
+++ b/test/zdtm/static/busyloop00.c
@@ -1,9 +1,9 @@
 #include "zdtmtst.h"
 
-const char *test_doc	= "Run busy loop while migrating";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Run busy loop while migrating";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	test_init(argc, argv);
 
diff --git a/test/zdtm/static/caps00.c b/test/zdtm/static/caps00.c
index 7a256c08a..d652c7626 100644
--- a/test/zdtm/static/caps00.c
+++ b/test/zdtm/static/caps00.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that aps are preserved";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that aps are preserved";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 struct cap_hdr {
 	unsigned int version;
@@ -15,15 +15,15 @@ struct cap_hdr {
 };
 
 struct cap_data {
-	unsigned int	eff;
-	unsigned int	prm;
-	unsigned int	inh;
+	unsigned int eff;
+	unsigned int prm;
+	unsigned int inh;
 };
 
-#define _LINUX_CAPABILITY_VERSION_3     0x20080522
-#define _LINUX_CAPABILITY_U32S_3        2
-#define CAP_CHOWN            0
-#define CAP_DAC_OVERRIDE     1
+#define _LINUX_CAPABILITY_VERSION_3 0x20080522
+#define _LINUX_CAPABILITY_U32S_3    2
+#define CAP_CHOWN		    0
+#define CAP_DAC_OVERRIDE	    1
 
 int capget(struct cap_hdr *hdrp, struct cap_data *datap);
 int capset(struct cap_hdr *hdrp, const struct cap_data *datap);
@@ -131,12 +131,12 @@ int main(int argc, char **argv)
 		}
 
 		if (prctl(PR_CAPBSET_READ, CAP_SETPCAP, 0, 0, 0) != 0) {
-			res='5';
+			res = '5';
 			goto bad;
 		}
 
 		res = '0';
-bad:
+	bad:
 		write(result_pipe[1], &res, 1);
 
 		if (res != '0') {
@@ -163,12 +163,10 @@ bad:
 	else {
 		read(result_pipe[0], data, sizeof(data));
 		read(result_pipe[0], data_2, sizeof(data_2));
-		test_msg("{eff,prm,inh}[]={%08x,%08x,%08x}, {%08x,%08x,%08x}\n",
-			  data[0].eff, data[0].prm, data[0].inh,
-			  data[1].eff, data[1].prm, data[1].inh);
-		test_msg("{eff,prm,inh}[]={%08x,%08x,%08x}, {%08x,%08x,%08x}\n",
-			  data_2[0].eff, data_2[0].prm, data_2[0].inh,
-			  data_2[1].eff, data_2[1].prm, data_2[1].inh);
+		test_msg("{eff,prm,inh}[]={%08x,%08x,%08x}, {%08x,%08x,%08x}\n", data[0].eff, data[0].prm, data[0].inh,
+			 data[1].eff, data[1].prm, data[1].inh);
+		test_msg("{eff,prm,inh}[]={%08x,%08x,%08x}, {%08x,%08x,%08x}\n", data_2[0].eff, data_2[0].prm,
+			 data_2[0].inh, data_2[1].eff, data_2[1].prm, data_2[1].inh);
 		fail("Fail: %c", res);
 	}
 	close(result_pipe[0]);
diff --git a/test/zdtm/static/cgroup00.c b/test/zdtm/static/cgroup00.c
index ee14d1fd3..2ed106094 100644
--- a/test/zdtm/static/cgroup00.c
+++ b/test/zdtm/static/cgroup00.c
@@ -7,14 +7,14 @@
 #include <stdlib.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that cgroups layout is preserved";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that cgroups layout is preserved";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
 static const char *cgname = "zdtmtst";
-#define SUBNAME	"subcg00"
-#define SUBNAME2 SUBNAME"/subsubcg"
+#define SUBNAME	 "subcg00"
+#define SUBNAME2 SUBNAME "/subsubcg"
 
 static int cg_move(char *name)
 {
diff --git a/test/zdtm/static/cgroup01.c b/test/zdtm/static/cgroup01.c
index f0d00f209..bc8515264 100644
--- a/test/zdtm/static/cgroup01.c
+++ b/test/zdtm/static/cgroup01.c
@@ -6,8 +6,8 @@
 #include <sys/mount.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that empty cgroups are preserved";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that empty cgroups are preserved";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
diff --git a/test/zdtm/static/cgroup02.c b/test/zdtm/static/cgroup02.c
index 67cc73d9e..6229a8a08 100644
--- a/test/zdtm/static/cgroup02.c
+++ b/test/zdtm/static/cgroup02.c
@@ -8,8 +8,8 @@
 #include <sys/mount.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that empty cgroups are preserved";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that empty cgroups are preserved";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
@@ -160,7 +160,6 @@ int main(int argc, char **argv)
 	pass();
 	ret = 0;
 
-
 out_close:
 	fclose(cgf);
 out_umount:
diff --git a/test/zdtm/static/cgroup03.c b/test/zdtm/static/cgroup03.c
index 757f0c3b4..78b8b5bee 100644
--- a/test/zdtm/static/cgroup03.c
+++ b/test/zdtm/static/cgroup03.c
@@ -9,8 +9,8 @@
 #include <limits.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that global cgroup settings (+perms) are restored";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that global cgroup settings (+perms) are restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
@@ -137,7 +137,6 @@ int main(int argc, char **argv)
 	if (chownmod(path, O_RDWR) < 0)
 		goto out_umount;
 
-
 	sprintf(path, "%s/%s/test/cgroup.procs", dirname, cgname);
 	if (chownmod(path, O_RDWR) < 0)
 		goto out_umount;
diff --git a/test/zdtm/static/cgroup04.c b/test/zdtm/static/cgroup04.c
index 8ec0cff37..5a424be12 100644
--- a/test/zdtm/static/cgroup04.c
+++ b/test/zdtm/static/cgroup04.c
@@ -10,10 +10,10 @@
 #include <limits.h>
 #include "zdtmtst.h"
 
-#define ARRAY_SIZE(x)           (sizeof(x) / sizeof((x)[0]))
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-const char *test_doc	= "Check that some cgroups properties in kernel controllers are preserved";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that some cgroups properties in kernel controllers are preserved";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
@@ -116,17 +116,8 @@ int main(int argc, char **argv)
 	struct stat sb;
 
 	char *dev_allow[] = {
-		"c *:* m",
-		"b *:* m",
-		"c 1:3 rwm",
-		"c 1:5 rwm",
-		"c 1:7 rwm",
-		"c 5:0 rwm",
-		"c 5:2 rwm",
-		"c 1:8 rwm",
-		"c 1:9 rwm",
-		"c 136:* rwm",
-		"c 10:229 rwm",
+		"c *:* m",   "b *:* m",	  "c 1:3 rwm", "c 1:5 rwm",   "c 1:7 rwm",    "c 5:0 rwm",
+		"c 5:2 rwm", "c 1:8 rwm", "c 1:9 rwm", "c 136:* rwm", "c 10:229 rwm",
 	};
 
 	test_init(argc, argv);
diff --git a/test/zdtm/static/cgroup_ifpriomap.c b/test/zdtm/static/cgroup_ifpriomap.c
index 24ed44f14..5f07d495b 100644
--- a/test/zdtm/static/cgroup_ifpriomap.c
+++ b/test/zdtm/static/cgroup_ifpriomap.c
@@ -10,20 +10,20 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check preserving multiline cgroup controller's property net_prio/net_prio.ifpriomap";
-const char *test_author	= "Dmitry Safonov <dsafonov@virtuozzo.com>";
+const char *test_doc = "Check preserving multiline cgroup controller's property net_prio/net_prio.ifpriomap";
+const char *test_author = "Dmitry Safonov <dsafonov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
 
 static const char *cgname = "zdtmtst";
 
-#define BUF_SZ		1024
-#define PRIOMAPS_SZ	40
+#define BUF_SZ	    1024
+#define PRIOMAPS_SZ 40
 
 struct ifpriomap_t {
-	char		*ifname;
-	uint32_t	prio;
+	char *ifname;
+	uint32_t prio;
 };
 struct ifpriomap_t maps[PRIOMAPS_SZ], new_maps[PRIOMAPS_SZ];
 
@@ -165,8 +165,7 @@ static int write_map(const char *path, struct ifpriomap_t *out, size_t out_sz)
 		if (!p->ifname)
 			break;
 
-		snprintf(buf, BUF_SZ, "%s %lu",
-			p->ifname, (unsigned long)p->prio);
+		snprintf(buf, BUF_SZ, "%s %lu", p->ifname, (unsigned long)p->prio);
 
 		written = write(fd, buf, strlen(buf));
 		if (written < 0) {
@@ -216,10 +215,8 @@ static int compare_maps(void)
 
 			if (strcmp(a->ifname, b->ifname) == 0) {
 				if (a->prio != b->prio) {
-					pr_err("`%s' prio: %lu != %lu\n",
-						a->ifname,
-						(unsigned long)a->prio,
-						(unsigned long)b->prio);
+					pr_err("`%s' prio: %lu != %lu\n", a->ifname, (unsigned long)a->prio,
+					       (unsigned long)b->prio);
 					return -1;
 				}
 			}
@@ -296,11 +293,11 @@ static int get_controller_name(char **name)
 
 		if (strstr(*name, "net_prio")) {
 			/* erasing ':' delimiter */
-			(*name)[len-1] = '\0';
+			(*name)[len - 1] = '\0';
 			ret = 0;
 			goto out_close;
 		}
-	} while(1);
+	} while (1);
 
 	/* self/cgroup has no mount for net_prio - try to map it */
 	*name = "net_prio";
@@ -328,8 +325,7 @@ int main(int argc, char **argv)
 	if (mount_cg(controller_name) < 0)
 		return -1;
 
-	sprintf(path, "%s/%s/%s/net_prio.ifpriomap",
-		dirname, controller_name, cgname);
+	sprintf(path, "%s/%s/%s/net_prio.ifpriomap", dirname, controller_name, cgname);
 
 	if (read_map(path, maps, PRIOMAPS_SZ))
 		goto out_umount;
diff --git a/test/zdtm/static/cgroup_stray.c b/test/zdtm/static/cgroup_stray.c
index a068378ec..0c0ed93cf 100644
--- a/test/zdtm/static/cgroup_stray.c
+++ b/test/zdtm/static/cgroup_stray.c
@@ -13,8 +13,8 @@
 #include <limits.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that stray cgroups are c/r'd correctly";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that stray cgroups are c/r'd correctly";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
@@ -76,7 +76,8 @@ static int add_to_cg(const char *controller, const char *path)
 	return 0;
 }
 
-static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
+static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path)
+{
 	char buf[2048];
 	FILE *f;
 	bool ret = false;
@@ -92,7 +93,7 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 		char *pos, *pid_controller, *pid_path;
 
 		/* chop off trailing \n */
-		buf[strlen(buf)-1] = '\0';
+		buf[strlen(buf) - 1] = '\0';
 
 		/* skip hierarchy no. */
 		pos = strstr(buf, ":");
@@ -113,12 +114,13 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 		pos++;
 		pid_path = pos;
 
-test_msg("comparing %s and %s\n", controller, pid_controller);
+		test_msg("comparing %s and %s\n", controller, pid_controller);
 		if (strcmp(controller, pid_controller))
 			continue;
 
 		if (strcmp(path, pid_path))
-			pr_err("task not in right cg for controller %s expected %s, got %s\n", controller, path, pid_path);
+			pr_err("task not in right cg for controller %s expected %s, got %s\n", controller, path,
+			       pid_path);
 		else
 			ret = true;
 
diff --git a/test/zdtm/static/cgroupns.c b/test/zdtm/static/cgroupns.c
index 68b86b44b..8974f1607 100644
--- a/test/zdtm/static/cgroupns.c
+++ b/test/zdtm/static/cgroupns.c
@@ -14,11 +14,11 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWCGROUP
-#define CLONE_NEWCGROUP		0x02000000
+#define CLONE_NEWCGROUP 0x02000000
 #endif
 
-const char *test_doc	= "Check that cgroup NS is correctly handled.";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that cgroup NS is correctly handled.";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 /* we need dirname before test_init() here */
 char *dirname = "cgroupns.test";
@@ -74,7 +74,8 @@ err_rd:
 	return -1;
 }
 
-static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
+static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path)
+{
 	char buf[2048];
 	FILE *f;
 	bool ret = false;
@@ -90,7 +91,7 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 		char *pos, *pid_controller, *pid_path;
 
 		/* chop off trailing \n */
-		buf[strlen(buf)-1] = '\0';
+		buf[strlen(buf) - 1] = '\0';
 
 		/* skip hierarchy no. */
 		pos = strstr(buf, ":");
@@ -115,7 +116,8 @@ static bool pid_in_cgroup(pid_t pid, const char *controller, const char *path) {
 			continue;
 
 		if (strcmp(path, pid_path))
-			pr_err("task not in right cg for controller %s expected %s, got %s\n", controller, path, pid_path);
+			pr_err("task not in right cg for controller %s expected %s, got %s\n", controller, path,
+			       pid_path);
 		else
 			ret = true;
 
diff --git a/test/zdtm/static/child_opened_proc.c b/test/zdtm/static/child_opened_proc.c
index 2a1fa8c79..2125cd264 100644
--- a/test/zdtm/static/child_opened_proc.c
+++ b/test/zdtm/static/child_opened_proc.c
@@ -9,10 +9,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that tree prior to files opening";
-const char *test_author	= "Stanislav Kinsbursky <skinsbursky@paralles.com";
+const char *test_doc = "Check that tree prior to files opening";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@paralles.com";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pid, err = 0;
 	int proc_fd;
diff --git a/test/zdtm/static/child_subreaper.c b/test/zdtm/static/child_subreaper.c
index 4a27569fc..34d8c7411 100644
--- a/test/zdtm/static/child_subreaper.c
+++ b/test/zdtm/static/child_subreaper.c
@@ -3,8 +3,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that child subreaper attribute is restored";
-const char *test_author	= "Michał Cłapiński <mclapinski@google.com>";
+const char *test_doc = "Check that child subreaper attribute is restored";
+const char *test_author = "Michał Cłapiński <mclapinski@google.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/child_subreaper_and_reparent.c b/test/zdtm/static/child_subreaper_and_reparent.c
index e3955d3d9..ba03517ba 100644
--- a/test/zdtm/static/child_subreaper_and_reparent.c
+++ b/test/zdtm/static/child_subreaper_and_reparent.c
@@ -8,8 +8,8 @@
 #include "zdtmtst.h"
 #include "lock.h"
 
-const char *test_doc	= "Check that child subreaper does not affect reparenting";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check that child subreaper does not affect reparenting";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 enum {
 	TEST_FORK,
@@ -23,7 +23,7 @@ struct shared {
 	futex_t fstate;
 	int parent_before_cr;
 	int parent_after_cr;
-} *sh;
+} * sh;
 
 int orphan(void)
 {
diff --git a/test/zdtm/static/child_subreaper_existing_child.c b/test/zdtm/static/child_subreaper_existing_child.c
index bc0047480..4805aa41d 100644
--- a/test/zdtm/static/child_subreaper_existing_child.c
+++ b/test/zdtm/static/child_subreaper_existing_child.c
@@ -7,8 +7,8 @@
 #include "zdtmtst.h"
 #include "lock.h"
 
-const char *test_doc	= "Check that property is restored for existing children";
-const char *test_author	= "Michał Cłapiński <mclapinski@google.com>";
+const char *test_doc = "Check that property is restored for existing children";
+const char *test_author = "Michał Cłapiński <mclapinski@google.com>";
 
 enum {
 	TEST_FORK,
@@ -21,8 +21,7 @@ enum {
 struct shared {
 	futex_t fstate;
 	int ppid_after_reparent;
-} *sh;
-
+} * sh;
 
 int orphan(void)
 {
diff --git a/test/zdtm/static/chroot-file.c b/test/zdtm/static/chroot-file.c
index 94f584213..d8c0846c7 100644
--- a/test/zdtm/static/chroot-file.c
+++ b/test/zdtm/static/chroot-file.c
@@ -8,15 +8,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that out-of-root file survives";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that out-of-root file survives";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-#define MSG	"out-file-contents"
+#define MSG "out-file-contents"
 
 static int make_file(char *name)
 {
@@ -46,14 +46,14 @@ static int check_file(int fd)
 	return 0;
 }
 
-#define SUCCESS		0
-#define ERR_PIPES	(char)0x7f
+#define SUCCESS	  0
+#define ERR_PIPES (char)0x7f
 /* bitmap of errors */
-#define ERR_IN_FILE	1
-#define ERR_ROOT	2
-#define ERR_DIR		4
-#define ERR_CHDIR	8
-#define ERR_ROOT2	4
+#define ERR_IN_FILE 1
+#define ERR_ROOT    2
+#define ERR_DIR	    4
+#define ERR_CHDIR   8
+#define ERR_ROOT2   4
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/chroot.c b/test/zdtm/static/chroot.c
index 439a8e7dc..861cbab3f 100644
--- a/test/zdtm/static/chroot.c
+++ b/test/zdtm/static/chroot.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that root didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that root didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -17,7 +17,7 @@ char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 static char *filepath;
 
-#define MSG	"chroot-file-contents"
+#define MSG "chroot-file-contents"
 
 static int make_file(char *name)
 {
@@ -47,14 +47,14 @@ static int check_file(int fd)
 	return 0;
 }
 
-#define SUCCESS		0
-#define ERR_PIPES	(char)0x7f
+#define SUCCESS	  0
+#define ERR_PIPES (char)0x7f
 /* bitmap of errors */
-#define ERR_IN_FILE	1
-#define ERR_ROOT	2
-#define ERR_DIR		4
-#define ERR_OPEN	2
-#define ERR_FILE2	4
+#define ERR_IN_FILE 1
+#define ERR_ROOT    2
+#define ERR_DIR	    4
+#define ERR_OPEN    2
+#define ERR_FILE2   4
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/clean_mntns.c b/test/zdtm/static/clean_mntns.c
index 762894611..c529afd11 100644
--- a/test/zdtm/static/clean_mntns.c
+++ b/test/zdtm/static/clean_mntns.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that clean mntns works";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that clean mntns works";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/clone_fs.c b/test/zdtm/static/clone_fs.c
index e368aff99..78edf8095 100644
--- a/test/zdtm/static/clone_fs.c
+++ b/test/zdtm/static/clone_fs.c
@@ -4,7 +4,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc    = "Check that shared FS is migrated properly";
+const char *test_doc = "Check that shared FS is migrated properly";
 const char *test_author = "Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>";
 
 enum kcmp_type {
@@ -26,28 +26,27 @@ static int kcmp(int type, pid_t pid1, pid_t pid2, unsigned long idx1, unsigned l
 	ret = syscall(SYS_kcmp, pid1, pid2, type, idx1, idx2);
 
 	switch (ret) {
-		case 0:
-			break;
-		case 1:
-		case 2:
-			test_msg("FS for pids %d and %d doesn't match: %d\n", pid1, pid2, ret);
-			break;
-		case -1:
-			pr_err("kcmp (type: %d, pid1: %d, pid2: %d, "
-					"idx1: %ld, idx2: %ld) failed: %d\n",
-					type, pid1, pid2, idx1, idx2, errno);
-			break;
-		default:
-			pr_err("kcmp (type: %d, pid1: %d, pid2: %d, "
-					"idx1: %ld, idx2: %ld) returned %d\n",
-					type, pid1, pid2, idx1, idx2, ret);
-			break;
+	case 0:
+		break;
+	case 1:
+	case 2:
+		test_msg("FS for pids %d and %d doesn't match: %d\n", pid1, pid2, ret);
+		break;
+	case -1:
+		pr_err("kcmp (type: %d, pid1: %d, pid2: %d, "
+		       "idx1: %ld, idx2: %ld) failed: %d\n",
+		       type, pid1, pid2, idx1, idx2, errno);
+		break;
+	default:
+		pr_err("kcmp (type: %d, pid1: %d, pid2: %d, "
+		       "idx1: %ld, idx2: %ld) returned %d\n",
+		       type, pid1, pid2, idx1, idx2, ret);
+		break;
 	}
 	return ret;
 }
 
-#define gettid(code)        \
-	        syscall(__NR_gettid)
+#define gettid(code) syscall(__NR_gettid)
 
 static pthread_mutex_t init_lock;
 static pthread_mutex_t exit_lock;
@@ -68,7 +67,7 @@ int main(int argc, char **argv)
 	int ret;
 	pthread_t th;
 
-        test_init(argc, argv);
+	test_init(argc, argv);
 
 	pthread_mutex_init(&init_lock, NULL);
 	pthread_mutex_lock(&init_lock);
diff --git a/test/zdtm/static/cmdlinenv00.c b/test/zdtm/static/cmdlinenv00.c
index 8fffcb3e0..fc2f0a7dc 100644
--- a/test/zdtm/static/cmdlinenv00.c
+++ b/test/zdtm/static/cmdlinenv00.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test that env/cmdline/auxv restored well\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Test that env/cmdline/auxv restored well\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 static char *arg1, *arg2, *arg3;
 
@@ -60,7 +60,7 @@ static int cmp_auxv(const void *auxv_orig, const void *auxv, size_t size)
 	while (size > 0) {
 		if (*new != *old)
 			return -1;
-		new++;
+		new ++;
 		old++;
 		size -= sizeof(*new);
 	}
@@ -76,12 +76,12 @@ int main(int argc, char *argv[])
 	char auxv_orig[1024];
 	char auxv[1024];
 
-	memset(cmdline_orig,	0, sizeof(cmdline_orig));
-	memset(cmdline,		0, sizeof(cmdline));
-	memset(env_orig,	0, sizeof(env_orig));
-	memset(env,		0, sizeof(env));
-	memset(auxv_orig,	0, sizeof(auxv_orig));
-	memset(auxv,		0, sizeof(auxv));
+	memset(cmdline_orig, 0, sizeof(cmdline_orig));
+	memset(cmdline, 0, sizeof(cmdline));
+	memset(env_orig, 0, sizeof(env_orig));
+	memset(env, 0, sizeof(env));
+	memset(auxv_orig, 0, sizeof(auxv_orig));
+	memset(auxv, 0, sizeof(auxv));
 
 	test_init(argc, argv);
 
diff --git a/test/zdtm/static/config_inotify_irmap.c b/test/zdtm/static/config_inotify_irmap.c
index 3cbeba7d3..94585491a 100644
--- a/test/zdtm/static/config_inotify_irmap.c
+++ b/test/zdtm/static/config_inotify_irmap.c
@@ -20,16 +20,19 @@
  * refer to the original test case and it's author.
  */
 
-const char *test_doc	= "Default configuration files usage";
-const char *test_author	= "Veronika Kabatova <vkabatov@redhat.com>";
+const char *test_doc = "Default configuration files usage";
+const char *test_author = "Veronika Kabatova <vkabatov@redhat.com>";
 
-#define TDIR		"/etc"
-char test_files[2][128] = {TDIR"/zdtm-test", TDIR"/zdtm-test1",};
-#define CONFIG_PATH	"../../zdtm_test_config.conf"
+#define TDIR "/etc"
+char test_files[2][128] = {
+	TDIR "/zdtm-test",
+	TDIR "/zdtm-test1",
+};
+#define CONFIG_PATH "../../zdtm_test_config.conf"
 
 #define BUFF_SIZE ((sizeof(struct inotify_event) + PATH_MAX))
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	FILE *configfile;
 	char buf[BUFF_SIZE];
diff --git a/test/zdtm/static/console.c b/test/zdtm/static/console.c
index 026eacb2e..d40332acd 100644
--- a/test/zdtm/static/console.c
+++ b/test/zdtm/static/console.c
@@ -10,20 +10,20 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check c/r for console device";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check c/r for console device";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	struct stat st1, st2;
 	int fd;
 
 	test_init(argc, argv);
 
-	if (mknod(filename, S_IFCHR | S_IRUSR | S_IWUSR, makedev(5,1))) {
+	if (mknod(filename, S_IFCHR | S_IRUSR | S_IWUSR, makedev(5, 1))) {
 		pr_perror("Can't create console %s", filename);
 		return 1;
 	}
@@ -48,9 +48,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (st1.st_rdev != st2.st_rdev) {
-		fail("Console rdev mismatch %x != %x on %s",
-		     (int)st1.st_rdev, (int)st2.st_rdev,
-		     filename);
+		fail("Console rdev mismatch %x != %x on %s", (int)st1.st_rdev, (int)st2.st_rdev, filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/cow00.c b/test/zdtm/static/cow00.c
index 92446a16c..cb0c6733e 100644
--- a/test/zdtm/static/cow00.c
+++ b/test/zdtm/static/cow00.c
@@ -10,13 +10,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that cow memory are restored";
-const char *test_author	= "Andrey Vagin <avagin@parallels.com";
+const char *test_doc = "Check that cow memory are restored";
+const char *test_author = "Andrey Vagin <avagin@parallels.com";
 
 static int is_cow(void *addr, pid_t p1, pid_t p2)
 {
 	char buf[PATH_MAX];
-	unsigned long pfn = (unsigned long) addr / PAGE_SIZE;
+	unsigned long pfn = (unsigned long)addr / PAGE_SIZE;
 	uint64_t map1, map2;
 	int fd1, fd2, ret, i;
 
@@ -63,7 +63,7 @@ static int is_cow(void *addr, pid_t p1, pid_t p2)
 	return map1 == map2;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	void *addr;
 	pid_t pid;
diff --git a/test/zdtm/static/cow01.c b/test/zdtm/static/cow01.c
index ce5745831..268f49e2a 100644
--- a/test/zdtm/static/cow01.c
+++ b/test/zdtm/static/cow01.c
@@ -13,8 +13,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that cow memory are restored";
-const char *test_author	= "Andrey Vagin <avagin@parallels.com";
+const char *test_doc = "Check that cow memory are restored";
+const char *test_author = "Andrey Vagin <avagin@parallels.com";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -22,20 +22,19 @@ TEST_OPTION(filename, string, "file name", 1);
 struct test_case {
 	union {
 		struct {
-			uint8_t b_f_write:1;		/* before fork */
-			uint8_t b_f_read:1;
-			uint8_t a_f_write_child:1;	/* after fork */
-			uint8_t a_f_write_parent:1;
-			uint8_t a_f_read_child:1;
-			uint8_t a_f_read_parent:1;
-#define			TEST_CASES (2 << 6)
+			uint8_t b_f_write : 1; /* before fork */
+			uint8_t b_f_read : 1;
+			uint8_t a_f_write_child : 1; /* after fork */
+			uint8_t a_f_write_parent : 1;
+			uint8_t a_f_read_child : 1;
+			uint8_t a_f_read_parent : 1;
+#define TEST_CASES (2 << 6)
 		};
 		uint8_t num;
 	};
 
 	uint32_t crc_parent;
 	uint32_t crc_child;
-
 };
 
 struct test_cases {
@@ -57,27 +56,28 @@ static pid_t child_pid;
  * file, etc.).  A return code of 1 means failure, it means criu was not able
  * to checkpoint and/or restore the process properly.
  */
-#define EXECUTE_ACTION(func, fd) ({	\
-	int __ret = 0;			\
-	__ret |= func(&sep_tcs, fd);	\
-	__ret |= func(&cow_tcs, fd);	\
-	__ret |= func(&cow_gd_tcs, fd);	\
-	__ret |= func(&file_tcs, fd);	\
-	__ret;				\
-})
+#define EXECUTE_ACTION(func, fd)                \
+	({                                      \
+		int __ret = 0;                  \
+		__ret |= func(&sep_tcs, fd);    \
+		__ret |= func(&cow_tcs, fd);    \
+		__ret |= func(&cow_gd_tcs, fd); \
+		__ret |= func(&file_tcs, fd);   \
+		__ret;                          \
+	})
 
-struct test_cases cow_tcs = {.init = init_cow, .tname = "cow_tcs"},
-		  sep_tcs = {.init = init_sep, .tname = "sep_tcs"},
-		  file_tcs = {.init = init_file, .tname = "file_tcs"},
-		  cow_gd_tcs = {.init = init_cow_gd, .tname = "cow_gd_tcs"};
+struct test_cases cow_tcs = { .init = init_cow, .tname = "cow_tcs" },
+		  sep_tcs = { .init = init_sep, .tname = "sep_tcs" },
+		  file_tcs = { .init = init_file, .tname = "file_tcs" },
+		  cow_gd_tcs = { .init = init_cow_gd, .tname = "cow_gd_tcs" };
 
 uint32_t zero_crc = ~1;
 
-static int is_cow(void *addr, pid_t pid_child, pid_t pid_parent,
-		  uint64_t *map_child_ret, uint64_t *map_parent_ret, int fd)
+static int is_cow(void *addr, pid_t pid_child, pid_t pid_parent, uint64_t *map_child_ret, uint64_t *map_parent_ret,
+		  int fd)
 {
 	char buf[PATH_MAX];
-	unsigned long pfn = (unsigned long) addr / PAGE_SIZE;
+	unsigned long pfn = (unsigned long)addr / PAGE_SIZE;
 	uint64_t map_child, map_parent;
 	int fd_child, fd_parent, ret, i;
 	off_t lseek_ret;
@@ -104,30 +104,26 @@ static int is_cow(void *addr, pid_t pid_child, pid_t pid_parent,
 		void **p = addr;
 
 		lseek_ret = lseek(fd_child, pfn * sizeof(map_child), SEEK_SET);
-		if (lseek_ret == (off_t) -1) {
-			pr_perror("Unable to seek child pagemap to virtual addr %#08lx",
-			    pfn * PAGE_SIZE);
+		if (lseek_ret == (off_t)-1) {
+			pr_perror("Unable to seek child pagemap to virtual addr %#08lx", pfn * PAGE_SIZE);
 			return -1;
 		}
 
 		lseek_ret = lseek(fd_parent, pfn * sizeof(map_parent), SEEK_SET);
-		if (lseek_ret == (off_t) -1) {
-			pr_perror("Unable to seek parent pagemap to virtual addr %#08lx",
-			    pfn * PAGE_SIZE);
+		if (lseek_ret == (off_t)-1) {
+			pr_perror("Unable to seek parent pagemap to virtual addr %#08lx", pfn * PAGE_SIZE);
 			return -1;
 		}
 
 		ret = read(fd_child, &map_child, sizeof(map_child));
 		if (ret != sizeof(map_child)) {
-			pr_perror("Unable to read child pagemap at virtual addr %#08lx",
-			    pfn * PAGE_SIZE);
+			pr_perror("Unable to read child pagemap at virtual addr %#08lx", pfn * PAGE_SIZE);
 			return -1;
 		}
 
 		ret = read(fd_parent, &map_parent, sizeof(map_parent));
 		if (ret != sizeof(map_parent)) {
-			pr_perror("Unable to read parent pagemap at virtual addr %#08lx",
-			    pfn * PAGE_SIZE);
+			pr_perror("Unable to read parent pagemap at virtual addr %#08lx", pfn * PAGE_SIZE);
 			return -1;
 		}
 
@@ -192,8 +188,8 @@ static int child_check(struct test_cases *test_cases, int fd)
 		datasum(addr + i * PAGE_SIZE, PAGE_SIZE, &crc);
 		if (crc != tc->crc_child) {
 			errno = 0;
-			fail("%s[%#x]: %p child data mismatch (expected [%04x] got [%04x])",
-			     test_cases->tname, i, addr + i * PAGE_SIZE, tc->crc_child, crc);
+			fail("%s[%#x]: %p child data mismatch (expected [%04x] got [%04x])", test_cases->tname, i,
+			     addr + i * PAGE_SIZE, tc->crc_child, crc);
 			ret |= 1;
 		}
 	}
@@ -266,29 +262,25 @@ static int parent_check(struct test_cases *test_cases, int fd)
 		datasum(addr + i * PAGE_SIZE, PAGE_SIZE, &crc);
 		if (crc != tc->crc_parent) {
 			errno = 0;
-			fail("%s[%#x]: %p parent data mismatch (expected [%04x] got [%04x])",
-			     test_cases->tname, i, addr + i * PAGE_SIZE, tc->crc_parent, crc);
+			fail("%s[%#x]: %p parent data mismatch (expected [%04x] got [%04x])", test_cases->tname, i,
+			     addr + i * PAGE_SIZE, tc->crc_parent, crc);
 			ret |= 1;
 		}
 
 		if (test_cases == &sep_tcs)
 			continue;
 
-		if (!tc->a_f_write_child &&
-		    !tc->a_f_write_parent &&
-		     tc->b_f_write) {
+		if (!tc->a_f_write_child && !tc->a_f_write_parent && tc->b_f_write) {
 			uint64_t map_child, map_parent;
 			int is_cow_ret;
 
-			is_cow_ret = is_cow(addr + i * PAGE_SIZE, child_pid, getpid(),
-					    &map_child, &map_parent, fd);
+			is_cow_ret = is_cow(addr + i * PAGE_SIZE, child_pid, getpid(), &map_child, &map_parent, fd);
 			ret |= is_cow_ret;
 			if (is_cow_ret == 1) {
 				errno = 0;
 				fail("%s[%#x]: %p is not COW-ed (pagemap of "
-				     "child=[%"PRIx64"], parent=[%"PRIx64"])",
-				     test_cases->tname, i, addr + i * PAGE_SIZE,
-				     map_child, map_parent);
+				     "child=[%" PRIx64 "], parent=[%" PRIx64 "])",
+				     test_cases->tname, i, addr + i * PAGE_SIZE, map_child, map_parent);
 			}
 		}
 	}
@@ -301,9 +293,7 @@ static int __init_cow(struct test_cases *tcs, int flags)
 	int i;
 	void *addr;
 
-	addr = mmap(NULL, PAGE_SIZE * (TEST_CASES + 2),
-				PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	addr = mmap(NULL, PAGE_SIZE * (TEST_CASES + 2), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (addr == MAP_FAILED) {
 		pr_perror("Can't allocate memory");
 		return -1;
@@ -314,12 +304,11 @@ static int __init_cow(struct test_cases *tcs, int flags)
 	 * In parent cow-ed and coinciding regions can be merged, but
 	 * in child they cannot be, so COW will not be restored. FIXME
 	 */
-	mmap(addr, PAGE_SIZE, PROT_NONE,
-			MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+	mmap(addr, PAGE_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
 	addr += PAGE_SIZE;
 	tcs->addr = addr;
-	mmap(addr + PAGE_SIZE * TEST_CASES, PAGE_SIZE, PROT_NONE,
-			MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | flags, -1, 0);
+	mmap(addr + PAGE_SIZE * TEST_CASES, PAGE_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED | flags, -1,
+	     0);
 
 	test_msg("addr[%s]=%p\n", tcs->tname, tcs->addr);
 	for (i = 0; i < TEST_CASES; i++) {
@@ -345,9 +334,7 @@ static int init_sep(struct test_cases *tcs)
 {
 	int i;
 
-	tcs->addr = mmap(NULL, PAGE_SIZE * TEST_CASES,
-				PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	tcs->addr = mmap(NULL, PAGE_SIZE * TEST_CASES, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (tcs->addr == MAP_FAILED) {
 		pr_perror("Can't allocate memory");
 		return -1;
@@ -389,9 +376,7 @@ static int init_file(struct test_cases *tcs)
 		tc->crc_child = crc;
 	}
 
-	tcs->addr = mmap(NULL, PAGE_SIZE * TEST_CASES,
-				PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_FILE, fd, 0);
+	tcs->addr = mmap(NULL, PAGE_SIZE * TEST_CASES, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FILE, fd, 0);
 	if (tcs->addr == MAP_FAILED) {
 		pr_perror("Can't allocate memory");
 		return -1;
@@ -407,9 +392,8 @@ static int child(task_waiter_t *child_waiter, int fd)
 {
 	int ret = 0;
 
-	sep_tcs.addr = mmap(sep_tcs.addr, PAGE_SIZE * TEST_CASES,
-				PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+	sep_tcs.addr = mmap(sep_tcs.addr, PAGE_SIZE * TEST_CASES, PROT_READ | PROT_WRITE,
+			    MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
 	if (sep_tcs.addr == MAP_FAILED) {
 		pr_perror("Can't allocate memory");
 		return -1;
@@ -445,7 +429,7 @@ static int child(task_waiter_t *child_waiter, int fd)
 	return (ret < 0) ? 2 : (ret != 0);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	uint8_t zero_page[PAGE_SIZE];
 	int status = -1, ret = 0;
diff --git a/test/zdtm/static/cr_veth.c b/test/zdtm/static/cr_veth.c
index bc5c0cbd4..f09d52797 100644
--- a/test/zdtm/static/cr_veth.c
+++ b/test/zdtm/static/cr_veth.c
@@ -13,8 +13,8 @@
 #include <net/if.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "check that veth C/R-s right";
-const char *test_author	= "Pavel Emelyanov <xemul@virtuozzo.com>";
+const char *test_doc = "check that veth C/R-s right";
+const char *test_author = "Pavel Emelyanov <xemul@virtuozzo.com>";
 
 #define IF_NAME "zdtmvthc0"
 
diff --git a/test/zdtm/static/cr_veth02.c b/test/zdtm/static/cr_veth02.c
index 9e75906c0..5075e062d 100644
--- a/test/zdtm/static/cr_veth02.c
+++ b/test/zdtm/static/cr_veth02.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Restore with precreated veth devices.";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Restore with precreated veth devices.";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
 #define IF_NAME "zdtmvthc0"
 
diff --git a/test/zdtm/static/criu-rtc.c b/test/zdtm/static/criu-rtc.c
index 8ffb0cd08..9626a6dcc 100644
--- a/test/zdtm/static/criu-rtc.c
+++ b/test/zdtm/static/criu-rtc.c
@@ -37,8 +37,7 @@ int cr_plugin_dump_file(int fd, int id)
 		return -1;
 	}
 
-	if (major(st.st_rdev) != major(st_rtc.st_rdev) ||
-	    minor(st.st_rdev) != 0)
+	if (major(st.st_rdev) != major(st_rtc.st_rdev) || minor(st.st_rdev) != 0)
 		return -ENOTSUP;
 
 	if (ioctl(fd, RTC_IRQP_READ, &irqp) == -1) {
@@ -61,7 +60,7 @@ int cr_plugin_dump_file(int fd, int id)
 
 	criu_rtc__pack(&e, buf);
 
-	ret = write(img_fd,  buf, len);
+	ret = write(img_fd, buf, len);
 	if (ret != len) {
 		pr_perror("Unable to write in %s", img_path);
 		close(img_fd);
diff --git a/test/zdtm/static/cwd00.c b/test/zdtm/static/cwd00.c
index d75fa6a4e..c05174d63 100644
--- a/test/zdtm/static/cwd00.c
+++ b/test/zdtm/static/cwd00.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that cwd didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that cwd didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/cwd01.c b/test/zdtm/static/cwd01.c
index b04032c1c..9d457e9c8 100644
--- a/test/zdtm/static/cwd01.c
+++ b/test/zdtm/static/cwd01.c
@@ -8,11 +8,10 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that removed cwd works";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that removed cwd works";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/cwd02.c b/test/zdtm/static/cwd02.c
index 0d4b276e5..916625b7b 100644
--- a/test/zdtm/static/cwd02.c
+++ b/test/zdtm/static/cwd02.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that removed and opened cwd are kept";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that removed and opened cwd are kept";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -72,8 +72,7 @@ int main(int argc, char **argv)
 		goto cleanup;
 	}
 
-	if (stf.st_ino != std.st_ino ||
-			stf.st_dev != std.st_dev) {
+	if (stf.st_ino != std.st_ino || stf.st_dev != std.st_dev) {
 		fail("cwd and opened fd are not the same");
 		goto cleanup;
 	}
diff --git a/test/zdtm/static/del_standalone_un.c b/test/zdtm/static/del_standalone_un.c
index f1a7a30f6..c9fa84870 100644
--- a/test/zdtm/static/del_standalone_un.c
+++ b/test/zdtm/static/del_standalone_un.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that deleted unix sockets are restored correctly";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that deleted unix sockets are restored correctly";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -26,7 +26,7 @@ static int bind_and_listen(struct sockaddr_un *addr)
 		return -1;
 	}
 
-	if (bind(sk, (struct sockaddr *) addr, sizeof(*addr))) {
+	if (bind(sk, (struct sockaddr *)addr, sizeof(*addr))) {
 		fail("bind %s", addr->sun_path);
 		close(sk);
 		return -1;
diff --git a/test/zdtm/static/deleted_dev.c b/test/zdtm/static/deleted_dev.c
index a850338d9..1819a8886 100644
--- a/test/zdtm/static/deleted_dev.c
+++ b/test/zdtm/static/deleted_dev.c
@@ -8,9 +8,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a device special file "
-			  "open and unlinked before migration";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can migrate with a device special file "
+		       "open and unlinked before migration";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -51,10 +51,8 @@ int main(int argc, char **argv)
 
 	if (st.st_mode != mode || st.st_rdev != dev) {
 		fail("%s is no longer the device file we had", filename);
-		test_msg("mode %x want %x, dev %llx want %llx\n",
-				st.st_mode, mode,
-				(long long unsigned)st.st_rdev,
-				(long long unsigned)dev);
+		test_msg("mode %x want %x, dev %llx want %llx\n", st.st_mode, mode, (long long unsigned)st.st_rdev,
+			 (long long unsigned)dev);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/deleted_unix_sock.c b/test/zdtm/static/deleted_unix_sock.c
index b8856b6fd..342e6586f 100644
--- a/test/zdtm/static/deleted_unix_sock.c
+++ b/test/zdtm/static/deleted_unix_sock.c
@@ -9,10 +9,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create a unix socket, and destroy it before "
-			  "migration; check that the child can write to it "
-			  "and the parent can read from it after migration";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Create a unix socket, and destroy it before "
+		       "migration; check that the child can write to it "
+		       "and the parent can read from it after migration";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -31,7 +31,7 @@ static int setup_srv_sock(void)
 		return -1;
 	}
 
-	if (bind(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0) {
+	if (bind(sock, (struct sockaddr *)&name, SUN_LEN(&name)) < 0) {
 		pr_perror("can't bind to socket \"%s\"", filename);
 		goto err;
 	}
@@ -59,7 +59,7 @@ static int setup_clnt_sock(void)
 	if (sock < 0)
 		return -1;
 
-	if (connect(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0)
+	if (connect(sock, (struct sockaddr *)&name, SUN_LEN(&name)) < 0)
 		goto err;
 
 	return sock;
@@ -68,7 +68,7 @@ err:
 	return -1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int sock, acc_sock, ret;
 	pid_t pid;
@@ -87,7 +87,7 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 
-	if (pid == 0) {	/* child writes to the unlinked socket and returns */
+	if (pid == 0) { /* child writes to the unlinked socket and returns */
 		close(sock);
 
 		sock = setup_clnt_sock();
@@ -157,7 +157,6 @@ int main(int argc, char ** argv)
 		goto out;
 	}
 
-
 	if (close(sock)) {
 		fail("close failed");
 		goto out;
diff --git a/test/zdtm/static/different_creds.c b/test/zdtm/static/different_creds.c
index 44a87c43d..34c5bc648 100644
--- a/test/zdtm/static/different_creds.c
+++ b/test/zdtm/static/different_creds.c
@@ -11,51 +11,51 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that threads with different creds aren't checkpointed";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that threads with different creds aren't checkpointed";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 void *drop_caps_and_wait(void *arg)
 {
-	int fd = *((int *) arg), i;
+	int fd = *((int *)arg), i;
 	void *retcode = (void *)0xdeadbeaf;
 	cap_t caps;
 	char c;
 
 	typedef struct cap_set {
-		cap_flag_value_t	val;
-		cap_flag_value_t	new;
-		cap_flag_t		flag;
-		cap_value_t		bit;
+		cap_flag_value_t val;
+		cap_flag_value_t new;
+		cap_flag_t flag;
+		cap_value_t bit;
 	} cap_set_t;
 
 	cap_set_t src[] = {
 		{
-			.val	= CAP_CLEAR,
-			.flag	= CAP_EFFECTIVE,
-			.bit	= CAP_CHOWN,
+			.val = CAP_CLEAR,
+			.flag = CAP_EFFECTIVE,
+			.bit = CAP_CHOWN,
 		},
 		{
-			.val	= CAP_SET,
-			.flag	= CAP_EFFECTIVE,
-			.bit	= CAP_DAC_OVERRIDE,
+			.val = CAP_SET,
+			.flag = CAP_EFFECTIVE,
+			.bit = CAP_DAC_OVERRIDE,
 		},
 		{
-			.val	= CAP_CLEAR,
-			.flag	= CAP_INHERITABLE,
-			.bit	= CAP_SETPCAP,
+			.val = CAP_CLEAR,
+			.flag = CAP_INHERITABLE,
+			.bit = CAP_SETPCAP,
 		},
 		{
-			.val	= CAP_SET,
-			.flag	= CAP_INHERITABLE,
-			.bit	= CAP_NET_BIND_SERVICE,
+			.val = CAP_SET,
+			.flag = CAP_INHERITABLE,
+			.bit = CAP_NET_BIND_SERVICE,
 		},
 	};
 
-        caps = cap_get_proc();
-        if (!caps) {
-                pr_perror("cap_get_proc");
-                return NULL;
-        }
+	caps = cap_get_proc();
+	if (!caps) {
+		pr_perror("cap_get_proc");
+		return NULL;
+	}
 
 	for (i = 0; i < ARRAY_SIZE(src); i++) {
 		if (cap_set_flag(caps, src[i].flag, 1, &src[i].bit, src[i].val) < 0) {
@@ -64,10 +64,10 @@ void *drop_caps_and_wait(void *arg)
 		}
 	}
 
-        if (cap_set_proc(caps) < 0) {
-                pr_perror("cap_set_proc");
-                goto die;
-        }
+	if (cap_set_proc(caps) < 0) {
+		pr_perror("cap_set_proc");
+		goto die;
+	}
 
 	if (write(fd, "a", 1) != 1) {
 		pr_perror("Unable to send a status");
@@ -93,11 +93,11 @@ void *drop_caps_and_wait(void *arg)
 
 	retcode = NULL;
 die:
-        cap_free(caps);
+	cap_free(caps);
 	return retcode;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pipefd[2];
 	pthread_t thr;
diff --git a/test/zdtm/static/dumpable01.c b/test/zdtm/static/dumpable01.c
index e5dfc9ab7..73ca17073 100644
--- a/test/zdtm/static/dumpable01.c
+++ b/test/zdtm/static/dumpable01.c
@@ -5,7 +5,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc    = "Check dumpable flag handling (dumpable case)";
+const char *test_doc = "Check dumpable flag handling (dumpable case)";
 const char *test_author = "Filipe Brandenburger <filbranden@google.com>";
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/dumpable02.c b/test/zdtm/static/dumpable02.c
index cbcd5ba66..6c7df45db 100644
--- a/test/zdtm/static/dumpable02.c
+++ b/test/zdtm/static/dumpable02.c
@@ -10,10 +10,11 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc    = "Check dumpable flag handling (non-dumpable case)";
+const char *test_doc = "Check dumpable flag handling (non-dumpable case)";
 const char *test_author = "Filipe Brandenburger <filbranden@google.com>";
 
-int dumpable_server(void) {
+int dumpable_server(void)
+{
 	char buf[256];
 	int ret;
 
@@ -27,7 +28,8 @@ int dumpable_server(void) {
 	return 0;
 }
 
-int get_dumpable_from_pipes(int pipe_input, int pipe_output) {
+int get_dumpable_from_pipes(int pipe_input, int pipe_output)
+{
 	char buf[256];
 	int len;
 	long value;
@@ -57,7 +59,6 @@ int get_dumpable_from_pipes(int pipe_input, int pipe_output) {
 	return (int)value;
 }
 
-
 int main(int argc, char **argv)
 {
 	int pipe_input[2];
@@ -156,7 +157,8 @@ int main(int argc, char **argv)
 	close(pipe_output[1]);
 
 	save_dumpable = get_dumpable_from_pipes(pipe_input[1], pipe_output[0]);
-	if (save_dumpable < 0) return 1;
+	if (save_dumpable < 0)
+		return 1;
 #ifdef DEBUG
 	test_msg("DEBUG: before dump: dumpable=%d\n", save_dumpable);
 #endif
@@ -166,7 +168,8 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	dumpable = get_dumpable_from_pipes(pipe_input[1], pipe_output[0]);
-	if (dumpable < 0) return 1;
+	if (dumpable < 0)
+		return 1;
 #ifdef DEBUG
 	test_msg("DEBUG: after restore: dumpable=%d\n", dumpable);
 #endif
@@ -188,18 +191,15 @@ int main(int argc, char **argv)
 	}
 	errno = 0;
 	if (waited != pid) {
-		pr_err("waited pid %d did not match child pid %d\n",
-		    waited, pid);
+		pr_err("waited pid %d did not match child pid %d\n", waited, pid);
 		return 1;
 	}
 	if (!WIFEXITED(status)) {
-		pr_err("child dumpable server returned abnormally with status=%d\n",
-		    status);
+		pr_err("child dumpable server returned abnormally with status=%d\n", status);
 		return 1;
 	}
 	if (WEXITSTATUS(status) != 0) {
-		pr_err("child dumpable server returned rc=%d\n",
-		    WEXITSTATUS(status));
+		pr_err("child dumpable server returned rc=%d\n", WEXITSTATUS(status));
 		return 1;
 	}
 
diff --git a/test/zdtm/static/env00.c b/test/zdtm/static/env00.c
index 5ee995b93..a966c0418 100644
--- a/test/zdtm/static/env00.c
+++ b/test/zdtm/static/env00.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that environment didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that environment didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *envname;
 TEST_OPTION(envname, string, "environment variable name", 1);
diff --git a/test/zdtm/static/epoll.c b/test/zdtm/static/epoll.c
index 5acb54094..6909935b9 100644
--- a/test/zdtm/static/epoll.c
+++ b/test/zdtm/static/epoll.c
@@ -19,10 +19,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for epoll";
-const char *test_author	= "Andrei Vagin <avagin@openvz.org>";
+const char *test_doc = "Check for epoll";
+const char *test_author = "Andrei Vagin <avagin@openvz.org>";
 
-#define DUPFDNO		999
+#define DUPFDNO 999
 
 int main(int argc, char *argv[])
 {
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
 	int i, ret;
 
 	struct {
-		int	pipefd[2];
+		int pipefd[2];
 	} pipes[250];
 
 	test_init(argc, argv);
@@ -108,8 +108,7 @@ int main(int argc, char *argv[])
 			return 1;
 		}
 		if (ev.data.u64 != i) {
-			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n",
-			       ev.data.fd, (long long)ev.data.u64, i);
+			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n", ev.data.fd, (long long)ev.data.u64, i);
 			ret |= 1;
 		}
 
@@ -118,8 +117,7 @@ int main(int argc, char *argv[])
 			return 1;
 		}
 		if (ev.data.u64 != i) {
-			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n",
-			       ev.data.fd, (long long)ev.data.u64, i);
+			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n", ev.data.fd, (long long)ev.data.u64, i);
 			ret |= 1;
 		}
 
diff --git a/test/zdtm/static/epoll01.c b/test/zdtm/static/epoll01.c
index 23d536123..6701dbdff 100644
--- a/test/zdtm/static/epoll01.c
+++ b/test/zdtm/static/epoll01.c
@@ -19,12 +19,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check another case of epoll: This adds three epoll "
-			  "targets on tfd 702 and then adds two epoll targets "
-			  "on tfd 701. This test is for off calculation in "
-			  "dump_one_eventpoll, the reverse order makes qsort "
-			  "to actually work.";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check another case of epoll: This adds three epoll "
+		       "targets on tfd 702 and then adds two epoll targets "
+		       "on tfd 701. This test is for off calculation in "
+		       "dump_one_eventpoll, the reverse order makes qsort "
+		       "to actually work.";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 int main(int argc, char *argv[])
 {
@@ -33,15 +33,11 @@ int main(int argc, char *argv[])
 	int i, ret;
 
 	struct {
-		int	pipefd[2];
-		int	dupfd;
-		bool	close;
+		int pipefd[2];
+		int dupfd;
+		bool close;
 	} pipes[5] = {
-		{ {}, 702, true },
-		{ {}, 702, true },
-		{ {}, 702, false },
-		{ {}, 701, true },
-		{ {}, 701, false },
+		{ {}, 702, true }, { {}, 702, true }, { {}, 702, false }, { {}, 701, true }, { {}, 701, false },
 	};
 
 	test_init(argc, argv);
@@ -102,8 +98,7 @@ int main(int argc, char *argv[])
 		}
 
 		if (ev.data.u64 != i) {
-			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n",
-			       ev.data.fd, (long long)ev.data.u64, i);
+			pr_err("ev.fd=%d ev.data.u64=%#llx (%d expected)\n", ev.data.fd, (long long)ev.data.u64, i);
 			ret |= 1;
 		}
 
diff --git a/test/zdtm/static/eventfs00.c b/test/zdtm/static/eventfs00.c
index 5278777ba..8934f8aca 100644
--- a/test/zdtm/static/eventfs00.c
+++ b/test/zdtm/static/eventfs00.c
@@ -21,14 +21,14 @@
 #include "zdtmtst.h"
 
 #ifndef F_SETSIG
-#define F_SETSIG	10	/* for sockets. */
-#define F_GETSIG	11	/* for sockets. */
+#define F_SETSIG 10 /* for sockets. */
+#define F_GETSIG 11 /* for sockets. */
 #endif
 
-const char *test_doc	= "Check for eventfs";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for eventfs";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
-#define EVENTFD_INITIAL	30
+#define EVENTFD_INITIAL 30
 #define EVENTFD_FINAL	90
 
 int main(int argc, char *argv[])
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	test_msg("created eventfd with %"PRIu64"\n", v);
+	test_msg("created eventfd with %" PRIu64 "\n", v);
 
 	ret = write(efd, &v, sizeof(v));
 	if (ret != sizeof(v)) {
diff --git a/test/zdtm/static/fanotify00.c b/test/zdtm/static/fanotify00.c
index 0251e46d4..69ead43e7 100644
--- a/test/zdtm/static/fanotify00.c
+++ b/test/zdtm/static/fanotify00.c
@@ -17,56 +17,56 @@
 #include "zdtmtst.h"
 
 #ifdef __x86_64__
-# define __NR_fanotify_init	300
-# define __NR_fanotify_mark	301
+#define __NR_fanotify_init 300
+#define __NR_fanotify_mark 301
 #elif defined(__PPC64__)
-# define __NR_fanotify_init	323
-# define __NR_fanotify_mark	324
+#define __NR_fanotify_init 323
+#define __NR_fanotify_mark 324
 #elif __aarch64__
-# define __NR_fanotify_init     262
-# define __NR_fanotify_mark     263
+#define __NR_fanotify_init 262
+#define __NR_fanotify_mark 263
 #elif __s390x__
-# define __NR_fanotify_init     332
-# define __NR_fanotify_mark     333
+#define __NR_fanotify_init 332
+#define __NR_fanotify_mark 333
 #else
-# define __NR_fanotify_init	338
-# define __NR_fanotify_mark	339
+#define __NR_fanotify_init 338
+#define __NR_fanotify_mark 339
 #endif
 
-const char *test_doc	= "Check for fanotify delivery";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for fanotify delivery";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 const char fanotify_path[] = "fanotify-del-after-cr";
 
 #define BUFF_SIZE (8192)
 
 struct fanotify_mark_inode {
-	unsigned long		i_ino;
-	unsigned int		s_dev;
-	unsigned int		mflags;
-	unsigned int		mask;
-	unsigned int		ignored_mask;
-	unsigned int		fhandle_bytes;
-	unsigned int		fhandle_type;
-	unsigned char		fhandle[512];
+	unsigned long i_ino;
+	unsigned int s_dev;
+	unsigned int mflags;
+	unsigned int mask;
+	unsigned int ignored_mask;
+	unsigned int fhandle_bytes;
+	unsigned int fhandle_type;
+	unsigned char fhandle[512];
 };
 
 struct fanotify_mark_mount {
-	unsigned int		mnt_id;
-	unsigned int		mflags;
-	unsigned int		mask;
-	unsigned int		ignored_mask;
+	unsigned int mnt_id;
+	unsigned int mflags;
+	unsigned int mask;
+	unsigned int ignored_mask;
 };
 
 struct fanotify_glob {
-	unsigned int		faflags;
-	unsigned int		evflags;
+	unsigned int faflags;
+	unsigned int evflags;
 };
 
 struct fanotify_obj {
-	struct fanotify_glob		glob;
-	struct fanotify_mark_inode	inode;
-	struct fanotify_mark_mount	mount;
+	struct fanotify_glob glob;
+	struct fanotify_mark_inode inode;
+	struct fanotify_mark_mount mount;
 };
 
 static int fanotify_init(unsigned int flags, unsigned int event_f_flags)
@@ -74,8 +74,7 @@ static int fanotify_init(unsigned int flags, unsigned int event_f_flags)
 	return syscall(__NR_fanotify_init, flags, event_f_flags);
 }
 
-static int fanotify_mark(int fanotify_fd, unsigned int flags, unsigned long mask,
-			 int dfd, const char *pathname)
+static int fanotify_mark(int fanotify_fd, unsigned int flags, unsigned long mask, int dfd, const char *pathname)
 {
 #ifdef __i386__
 	return syscall(__NR_fanotify_mark, fanotify_fd, flags, mask, 0, dfd, pathname);
@@ -84,29 +83,25 @@ static int fanotify_mark(int fanotify_fd, unsigned int flags, unsigned long mask
 #endif
 }
 
-#define fdinfo_field(str, field)	!strncmp(str, field":", sizeof(field))
+#define fdinfo_field(str, field) !strncmp(str, field ":", sizeof(field))
 
 static void show_fanotify_obj(struct fanotify_obj *obj)
 {
 	test_msg("fanotify obj at %p\n", obj);
 
 	test_msg(" glob\n");
-	test_msg("  faflags: %x evflags: %x\n",
-		 obj->glob.faflags, obj->glob.evflags);
+	test_msg("  faflags: %x evflags: %x\n", obj->glob.faflags, obj->glob.evflags);
 
 	test_msg(" inode\n");
 	test_msg("  i_ino: %lx s_dev: %x mflags: %x "
 		 "mask: %x ignored_mask: %x "
 		 "fhandle_bytes: %x fhandle_type: %x "
 		 "fhandle: %s",
-		 obj->inode.i_ino, obj->inode.s_dev,
-		 obj->inode.mflags, obj->inode.mask,
-		 obj->inode.ignored_mask, obj->inode.fhandle_bytes,
-		 obj->inode.fhandle_type, obj->inode.fhandle);
+		 obj->inode.i_ino, obj->inode.s_dev, obj->inode.mflags, obj->inode.mask, obj->inode.ignored_mask,
+		 obj->inode.fhandle_bytes, obj->inode.fhandle_type, obj->inode.fhandle);
 
 	test_msg(" mount\n");
-	test_msg("  mnt_id: %x mflags: %x mask: %x ignored_mask: %x\n",
-		 obj->mount.mnt_id, obj->mount.mflags,
+	test_msg("  mnt_id: %x mflags: %x mask: %x ignored_mask: %x\n", obj->mount.mnt_id, obj->mount.mflags,
 		 obj->mount.mask, obj->mount.ignored_mask);
 }
 
@@ -129,20 +124,15 @@ static int cmp_fanotify_obj(struct fanotify_obj *old, struct fanotify_obj *new)
 	 * moreover the backend (say PLOOP) may be re-mounted during
 	 * c/r, so exclude them.
 	 */
-	if ((old->glob.faflags != new->glob.faflags)			||
-	    (old->glob.evflags != new->glob.evflags)			||
-	    (old->inode.i_ino != new->inode.i_ino)			||
-	    (old->inode.mflags != new->inode.mflags)			||
-	    (old->inode.mask != new->inode.mask)			||
-	    (old->inode.ignored_mask != new->inode.ignored_mask))
+	if ((old->glob.faflags != new->glob.faflags) || (old->glob.evflags != new->glob.evflags) ||
+	    (old->inode.i_ino != new->inode.i_ino) || (old->inode.mflags != new->inode.mflags) ||
+	    (old->inode.mask != new->inode.mask) || (old->inode.ignored_mask != new->inode.ignored_mask))
 		return -1;
 
-	if (memcmp(old->inode.fhandle, new->inode.fhandle,
-		   sizeof(new->inode.fhandle)))
+	if (memcmp(old->inode.fhandle, new->inode.fhandle, sizeof(new->inode.fhandle)))
 		return -2;
 
-	if ((old->mount.mflags != new->mount.mflags)			||
-	    (old->mount.mask != new->mount.mask)			||
+	if ((old->mount.mflags != new->mount.mflags) || (old->mount.mask != new->mount.mask) ||
 	    (old->mount.ignored_mask != new->mount.ignored_mask))
 		return -3;
 
@@ -165,18 +155,15 @@ int parse_fanotify_fdinfo(int fd, struct fanotify_obj *obj, unsigned int expecte
 
 	while (fgets(str, sizeof(str), f)) {
 		if (fdinfo_field(str, "fanotify flags")) {
-			ret = sscanf(str, "fanotify flags:%x event-flags:%x",
-				     &obj->glob.faflags, &obj->glob.evflags);
+			ret = sscanf(str, "fanotify flags:%x event-flags:%x", &obj->glob.faflags, &obj->glob.evflags);
 			if (ret != 2)
 				goto parse_err;
 			met++;
 			continue;
 		}
 		if (fdinfo_field(str, "fanotify mnt_id")) {
-			ret = sscanf(str,
-				     "fanotify mnt_id:%x mflags:%x mask:%x ignored_mask:%x",
-				     &obj->mount.mnt_id, &obj->mount.mflags,
-				     &obj->mount.mask, &obj->mount.ignored_mask);
+			ret = sscanf(str, "fanotify mnt_id:%x mflags:%x mask:%x ignored_mask:%x", &obj->mount.mnt_id,
+				     &obj->mount.mflags, &obj->mount.mask, &obj->mount.ignored_mask);
 			if (ret != 4)
 				goto parse_err;
 			met++;
@@ -187,9 +174,8 @@ int parse_fanotify_fdinfo(int fd, struct fanotify_obj *obj, unsigned int expecte
 			ret = sscanf(str,
 				     "fanotify ino:%lx sdev:%x mflags:%x mask:%x ignored_mask:%x "
 				     "fhandle-bytes:%x fhandle-type:%x f_handle: %n",
-				     &obj->inode.i_ino, &obj->inode.s_dev,
-				     &obj->inode.mflags, &obj->inode.mask, &obj->inode.ignored_mask,
-				     &obj->inode.fhandle_bytes, &obj->inode.fhandle_type,
+				     &obj->inode.i_ino, &obj->inode.s_dev, &obj->inode.mflags, &obj->inode.mask,
+				     &obj->inode.ignored_mask, &obj->inode.fhandle_bytes, &obj->inode.fhandle_type,
 				     &hoff);
 			if (ret != 7)
 				goto parse_err;
@@ -200,8 +186,7 @@ int parse_fanotify_fdinfo(int fd, struct fanotify_obj *obj, unsigned int expecte
 	}
 
 	if (expected_to_meet != met) {
-		pr_perror("Expected to meet %d entries but got %d",
-		    expected_to_meet, met);
+		pr_perror("Expected to meet %d entries but got %d", expected_to_meet, met);
 		return -1;
 	}
 
@@ -212,9 +197,9 @@ parse_err:
 	return -1;
 }
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
-	struct fanotify_obj old = { }, new = { };
+	struct fanotify_obj old = {}, new = {};
 	int fa_fd, fd, del_after;
 	char buf[BUFF_SIZE];
 	ssize_t length;
@@ -232,8 +217,7 @@ int main (int argc, char *argv[])
 		}
 	}
 
-	fa_fd = fanotify_init(FAN_NONBLOCK | FAN_CLASS_NOTIF | FAN_UNLIMITED_QUEUE,
-			      O_RDONLY | O_LARGEFILE);
+	fa_fd = fanotify_init(FAN_NONBLOCK | FAN_CLASS_NOTIF | FAN_UNLIMITED_QUEUE, O_RDONLY | O_LARGEFILE);
 	if (fa_fd < 0) {
 		pr_perror("fanotify_init failed");
 		exit(1);
@@ -245,24 +229,19 @@ int main (int argc, char *argv[])
 		exit(1);
 	}
 
-	if (fanotify_mark(fa_fd, FAN_MARK_ADD,
-			  FAN_MODIFY | FAN_ACCESS | FAN_OPEN | FAN_CLOSE,
-			  AT_FDCWD, fanotify_path)) {
+	if (fanotify_mark(fa_fd, FAN_MARK_ADD, FAN_MODIFY | FAN_ACCESS | FAN_OPEN | FAN_CLOSE, AT_FDCWD,
+			  fanotify_path)) {
 		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
 
-	if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT,
-			  FAN_ONDIR | FAN_OPEN | FAN_CLOSE,
-			  AT_FDCWD, "/tmp")) {
+	if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT, FAN_ONDIR | FAN_OPEN | FAN_CLOSE, AT_FDCWD, "/tmp")) {
 		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
 
-	if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT |
-			  FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY,
-			  FAN_MODIFY | FAN_ACCESS,
-			  AT_FDCWD, "/tmp")) {
+	if (fanotify_mark(fa_fd, FAN_MARK_ADD | FAN_MARK_MOUNT | FAN_MARK_IGNORED_MASK | FAN_MARK_IGNORED_SURV_MODIFY,
+			  FAN_MODIFY | FAN_ACCESS, AT_FDCWD, "/tmp")) {
 		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
@@ -306,9 +285,8 @@ int main (int argc, char *argv[])
 		exit(1);
 	}
 
-	if (fanotify_mark(fa_fd, FAN_MARK_REMOVE | FAN_MARK_MOUNT,
-			  FAN_ONDIR | FAN_OPEN | FAN_CLOSE,
-			  AT_FDCWD, "/tmp")) {
+	if (fanotify_mark(fa_fd, FAN_MARK_REMOVE | FAN_MARK_MOUNT, FAN_ONDIR | FAN_OPEN | FAN_CLOSE, AT_FDCWD,
+			  "/tmp")) {
 		pr_perror("fanotify_mark failed");
 		exit(1);
 	}
diff --git a/test/zdtm/static/fd.c b/test/zdtm/static/fd.c
index bf27eaf44..9059114be 100644
--- a/test/zdtm/static/fd.c
+++ b/test/zdtm/static/fd.c
@@ -10,8 +10,8 @@
 #include "zdtmtst.h"
 #include "lock.h"
 
-const char *test_doc	= "Check that criu closes up all its descriptors";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check that criu closes up all its descriptors";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 int main(int argc, char **argv)
 {
@@ -38,7 +38,6 @@ int main(int argc, char **argv)
 	}
 
 	if (pid == 0) {
-
 		d = opendir("/proc/self/fd");
 		if (d == NULL)
 			return 1;
@@ -98,8 +97,7 @@ int main(int argc, char **argv)
 	}
 
 	if (status != 0) {
-		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status),
-					WIFSIGNALED(status), WTERMSIG(status));
+		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
 		return 1;
 	}
 
diff --git a/test/zdtm/static/fd01.c b/test/zdtm/static/fd01.c
index 4e7875110..3313ac4bd 100644
--- a/test/zdtm/static/fd01.c
+++ b/test/zdtm/static/fd01.c
@@ -14,8 +14,9 @@
 #include "zdtmtst.h"
 #include "lock.h"
 
-const char *test_doc	= "Create file descriptors with different numbers. Check that they do not intersect with service fds";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com>";
+const char *test_doc =
+	"Create file descriptors with different numbers. Check that they do not intersect with service fds";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 int main(int argc, char **argv)
 {
@@ -28,7 +29,7 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	futex = mmap(NULL, sizeof(*futex), PROT_WRITE | PROT_READ, MAP_ANONYMOUS|MAP_SHARED, -1, 0);
+	futex = mmap(NULL, sizeof(*futex), PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 	if (futex == MAP_FAILED) {
 		fail("mmap");
 		exit(1);
@@ -68,7 +69,6 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-
 	for (i = 1; (fd = (1 << i)) < (rlim.rlim_cur >> 1); i++) {
 		FILE *fp = tmpfile();
 		if (!fp) {
diff --git a/test/zdtm/static/fdt_shared.c b/test/zdtm/static/fdt_shared.c
index 6ccd25487..1a0d04ac7 100644
--- a/test/zdtm/static/fdt_shared.c
+++ b/test/zdtm/static/fdt_shared.c
@@ -9,14 +9,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check a shared file descriptor table.";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check a shared file descriptor table.";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-#define STACK_SIZE 4096
-#define TEST_FD 128
+#define STACK_SIZE  4096
+#define TEST_FD	    128
 #define TEST_STRING "Hello World!"
 
 #define CHILDREN 4
@@ -50,8 +50,7 @@ static pid_t clone_child(int (*fn)(void *), int flags)
 	char stack[STACK_SIZE] __stack_aligned__;
 	pid_t pid;
 
-	pid = clone(fn, stack + STACK_SIZE,
-			flags | SIGCHLD, NULL);
+	pid = clone(fn, stack + STACK_SIZE, flags | SIGCHLD, NULL);
 	if (pid == -1) {
 		pr_perror("Unable to clone a new process");
 		return -1;
@@ -134,7 +133,7 @@ static int child(void *_arg)
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int status;
 	pid_t pid, pid2;
diff --git a/test/zdtm/static/fifo-ghost.c b/test/zdtm/static/fifo-ghost.c
index f5e11cfa2..cfe28111b 100644
--- a/test/zdtm/static/fifo-ghost.c
+++ b/test/zdtm/static/fifo-ghost.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that a ghost fifo with data restored";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check that a ghost fifo with data restored";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/fifo-rowo-pair.c b/test/zdtm/static/fifo-rowo-pair.c
index 239634381..54054961b 100644
--- a/test/zdtm/static/fifo-rowo-pair.c
+++ b/test/zdtm/static/fifo-rowo-pair.c
@@ -15,9 +15,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test for fifo ro/wo with "
-			  "fake fifo needed on criu side";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Test for fifo ro/wo with "
+		       "fake fifo needed on criu side";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *name_master;
 TEST_OPTION(name_master, string, "master fifo name", 1);
@@ -25,13 +25,15 @@ TEST_OPTION(name_master, string, "master fifo name", 1);
 char *name_slave;
 TEST_OPTION(name_slave, string, "slave fifo name", 1);
 
-#define TEST_VALUE	(00100)
+#define TEST_VALUE (00100)
 
-#define exit_shot(pid, code)	\
-	do { kill(pid, SIGKILL); exit(code); } while (0)
+#define exit_shot(pid, code)        \
+	do {                        \
+		kill(pid, SIGKILL); \
+		exit(code);         \
+	} while (0)
 
-#define exit_shot_parent(code)	\
-	exit_shot(getppid(), 1)
+#define exit_shot_parent(code) exit_shot(getppid(), 1)
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/fifo.c b/test/zdtm/static/fifo.c
index 91a116619..8c627a7cf 100644
--- a/test/zdtm/static/fifo.c
+++ b/test/zdtm/static/fifo.c
@@ -7,9 +7,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a named pipe "
-			"open";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can migrate with a named pipe "
+		       "open";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/fifo_ro.c b/test/zdtm/static/fifo_ro.c
index d0d2cc48e..24a12f842 100644
--- a/test/zdtm/static/fifo_ro.c
+++ b/test/zdtm/static/fifo_ro.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that a fifo read-only descriptor is restored with data";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check that a fifo read-only descriptor is restored with data";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/fifo_upon_unix_socket00.c b/test/zdtm/static/fifo_upon_unix_socket00.c
index f75965fdd..0ef68bb66 100644
--- a/test/zdtm/static/fifo_upon_unix_socket00.c
+++ b/test/zdtm/static/fifo_upon_unix_socket00.c
@@ -11,8 +11,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that fifo upon ghost socket configuration is restored";
-const char *test_author	= "Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>";
+const char *test_doc = "Check that fifo upon ghost socket configuration is restored";
+const char *test_author = "Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "socket name", 1);
@@ -24,8 +24,7 @@ static int fill_sock_name(struct sockaddr_un *name, const char *filename)
 
 	cwd = get_current_dir_name();
 	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path)) {
-		pr_err("Name %s/%s is too long for socket\n",
-			   cwd, filename);
+		pr_err("Name %s/%s is too long for socket\n", cwd, filename);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/fifo_wronly.c b/test/zdtm/static/fifo_wronly.c
index 64502e187..1083549cb 100644
--- a/test/zdtm/static/fifo_wronly.c
+++ b/test/zdtm/static/fifo_wronly.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a named pipe, "
-			"opened in WRONLY mode";
+const char *test_doc = "Check that we can migrate with a named pipe, "
+		       "opened in WRONLY mode";
 #define BUF_SIZE 256
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -66,7 +66,6 @@ int main(int argc, char **argv)
 		}
 
 	} else {
-
 		fd = open(filename, O_WRONLY);
 		if (fd < 0) {
 			pr_perror("open(%s, O_WRONLY) Failed", filename);
@@ -87,8 +86,7 @@ int main(int argc, char **argv)
 		wait(&chret);
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child exited with non-zero code %d (%s)",
-				chret, strerror(chret));
+			fail("child exited with non-zero code %d (%s)", chret, strerror(chret));
 			return 1;
 		}
 
diff --git a/test/zdtm/static/file_append.c b/test/zdtm/static/file_append.c
index 14f18776c..aa93ae186 100644
--- a/test/zdtm/static/file_append.c
+++ b/test/zdtm/static/file_append.c
@@ -9,8 +9,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check O_APPEND preserved";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check O_APPEND preserved";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/file_attr.c b/test/zdtm/static/file_attr.c
index 752c094bf..f8b3d846e 100644
--- a/test/zdtm/static/file_attr.c
+++ b/test/zdtm/static/file_attr.c
@@ -9,24 +9,27 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that attributes and content of an open, "
-			  "written to, and then unlinked file migrate "
-			  "correctly";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that attributes and content of an open, "
+		       "written to, and then unlinked file migrate "
+		       "correctly";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
-#define DEF_PERMS 06604		/* -rwS--Sr--, really esoteric one */
+#define DEF_PERMS 06604 /* -rwS--Sr--, really esoteric one */
 unsigned int perms = DEF_PERMS;
-TEST_OPTION(perms, uint, "permissions to set on file "
-	    "(default " __stringify(DEF_PERMS) ")", 0);
-#define DEF_MTIME 123456	/* another really esoteric one */
+TEST_OPTION(perms, uint,
+	    "permissions to set on file "
+	    "(default " __stringify(DEF_PERMS) ")",
+	    0);
+#define DEF_MTIME 123456 /* another really esoteric one */
 unsigned int mtime = DEF_MTIME;
-TEST_OPTION(mtime, uint, "mtime to set on file "
-	    "(default " __stringify(DEF_MTIME) ")", 0);
+TEST_OPTION(mtime, uint,
+	    "mtime to set on file "
+	    "(default " __stringify(DEF_MTIME) ")",
+	    0);
 
-
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	struct utimbuf ut;
@@ -49,7 +52,7 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 
-	ut = (struct utimbuf) {
+	ut = (struct utimbuf){
 		.actime = 0,
 		.modtime = mtime,
 	};
diff --git a/test/zdtm/static/file_cloexec.c b/test/zdtm/static/file_cloexec.c
index b8eba39e5..6def8174a 100644
--- a/test/zdtm/static/file_cloexec.c
+++ b/test/zdtm/static/file_cloexec.c
@@ -10,10 +10,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check FD_CLOEXEC flag";
-const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+const char *test_doc = "Check FD_CLOEXEC flag";
+const char *test_author = "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 static void assert_fd_flags(int fd, int mask, int value)
 {
diff --git a/test/zdtm/static/file_fown.c b/test/zdtm/static/file_fown.c
index af20a3174..eb42a826e 100644
--- a/test/zdtm/static/file_fown.c
+++ b/test/zdtm/static/file_fown.c
@@ -15,19 +15,19 @@
 #include "zdtmtst.h"
 
 #ifndef F_SETSIG
-#define F_SETSIG	10	/* for sockets. */
-#define F_GETSIG	11	/* for sockets. */
+#define F_SETSIG 10 /* for sockets. */
+#define F_GETSIG 11 /* for sockets. */
 #endif
 
-const char *test_doc	= "Check for signal delivery on file owners";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for signal delivery on file owners";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 struct params {
-	int	sigio;
-	int	pipe_flags[2];
-	int	pipe_pid[2];
-	int	pipe_sig[2];
-} *shared;
+	int sigio;
+	int pipe_flags[2];
+	int pipe_pid[2];
+	int pipe_sig[2];
+} * shared;
 
 static void signal_handler_io(int status)
 {
@@ -55,18 +55,15 @@ static int cmp_pipe_params(struct params *p1, struct params *p2)
 
 	for (i = 0; i < 2; i++) {
 		if (p1->pipe_flags[i] != p2->pipe_flags[i]) {
-			fail("pipe flags failed [%d] expected %08o got %08o",
-			     i, p1->pipe_flags[i], p2->pipe_flags[i]);
+			fail("pipe flags failed [%d] expected %08o got %08o", i, p1->pipe_flags[i], p2->pipe_flags[i]);
 			return -1;
 		}
 		if (p1->pipe_pid[i] != p2->pipe_pid[i]) {
-			fail("pipe pid failed [%d] expected %d got %d",
-			     i, p1->pipe_pid[i], p2->pipe_pid[i]);
+			fail("pipe pid failed [%d] expected %d got %d", i, p1->pipe_pid[i], p2->pipe_pid[i]);
 			return -1;
 		}
 		if (p1->pipe_sig[i] != p2->pipe_sig[i]) {
-			fail("pipe sig failed [%d] expected %d got %d",
-			     i, p1->pipe_sig[i], p2->pipe_sig[i]);
+			fail("pipe sig failed [%d] expected %d got %d", i, p1->pipe_sig[i], p2->pipe_sig[i]);
 			return -1;
 		}
 	}
@@ -76,8 +73,8 @@ static int cmp_pipe_params(struct params *p1, struct params *p2)
 
 int main(int argc, char *argv[])
 {
-	struct sigaction saio = { };
-	struct params obtained = { };
+	struct sigaction saio = {};
+	struct params obtained = {};
 	uid_t ruid, euid, suid;
 	int status, pipes[2];
 	pid_t pid;
@@ -100,8 +97,8 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	saio.sa_handler	= (sig_t)signal_handler_io;
-	saio.sa_flags	= SA_RESTART;
+	saio.sa_handler = (sig_t)signal_handler_io;
+	saio.sa_flags = SA_RESTART;
 	if (sigaction(SIGIO, &saio, 0)) {
 		fail("sigaction failed");
 		exit(1);
@@ -112,11 +109,9 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (fcntl(pipes[0], F_SETOWN, getpid())					||
-	    fcntl(pipes[1], F_SETOWN, getpid())					||
-	    fcntl(pipes[0], F_SETSIG, SIGIO)					||
-	    fcntl(pipes[1], F_SETSIG, SIGIO)					||
-	    fcntl(pipes[0], F_SETFL, fcntl(pipes[0], F_GETFL) | O_ASYNC)	||
+	if (fcntl(pipes[0], F_SETOWN, getpid()) || fcntl(pipes[1], F_SETOWN, getpid()) ||
+	    fcntl(pipes[0], F_SETSIG, SIGIO) || fcntl(pipes[1], F_SETSIG, SIGIO) ||
+	    fcntl(pipes[0], F_SETFL, fcntl(pipes[0], F_GETFL) | O_ASYNC) ||
 	    fcntl(pipes[1], F_SETFL, fcntl(pipes[1], F_GETFL) | O_ASYNC)) {
 		fail("fcntl failed");
 		exit(1);
@@ -136,7 +131,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (pid == 0) {
-		struct params p = { };
+		struct params p = {};
 
 		test_waitsig();
 
diff --git a/test/zdtm/static/file_lease00.c b/test/zdtm/static/file_lease00.c
index 3fd1a0d88..067d8d6ba 100644
--- a/test/zdtm/static/file_lease00.c
+++ b/test/zdtm/static/file_lease00.c
@@ -62,8 +62,7 @@ int main(int argc, char **argv)
 		pr_err("Can't open files\n");
 		return -1;
 	}
-	if (fcntl(fd_rd, F_SETLEASE, F_RDLCK) < 0 ||
-		fcntl(fd_wr, F_SETLEASE, F_WRLCK) < 0) {
+	if (fcntl(fd_rd, F_SETLEASE, F_RDLCK) < 0 || fcntl(fd_wr, F_SETLEASE, F_WRLCK) < 0) {
 		pr_perror("Can't set leases");
 		close_files(fd_rd, fd_wr);
 		return -1;
diff --git a/test/zdtm/static/file_lease01.c b/test/zdtm/static/file_lease01.c
index 6f3dfe60f..bbb2acf34 100644
--- a/test/zdtm/static/file_lease01.c
+++ b/test/zdtm/static/file_lease01.c
@@ -3,9 +3,9 @@
 
 #include "zdtmtst.h"
 
-#define FD_COUNT 3
-#define FD_LEASED1 0
-#define FD_LEASED2 2
+#define FD_COUNT      3
+#define FD_LEASED1    0
+#define FD_LEASED2    2
 #define FD_LEASE_FREE 1
 
 const char *test_doc = "Check that extra leases are not set after c/r";
@@ -63,8 +63,7 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	if (fcntl(fds[FD_LEASED1], F_SETLEASE, F_RDLCK) < 0 ||
-		fcntl(fds[FD_LEASED2], F_SETLEASE, F_RDLCK) < 0) {
+	if (fcntl(fds[FD_LEASED1], F_SETLEASE, F_RDLCK) < 0 || fcntl(fds[FD_LEASED2], F_SETLEASE, F_RDLCK) < 0) {
 		pr_err("Can't set leases\n");
 		close_files(fds);
 		return -1;
@@ -85,4 +84,3 @@ int main(int argc, char **argv)
 	close_files(fds);
 	return 0;
 }
-
diff --git a/test/zdtm/static/file_lease02.c b/test/zdtm/static/file_lease02.c
index 87c56cfd1..c1d3c4594 100644
--- a/test/zdtm/static/file_lease02.c
+++ b/test/zdtm/static/file_lease02.c
@@ -5,7 +5,7 @@
 
 #include "zdtmtst.h"
 
-#define FD_COUNT 3
+#define FD_COUNT     3
 #define BREAK_SIGNUM SIGIO
 
 const char *test_doc = "Check c/r of breaking leases";
@@ -111,9 +111,7 @@ int main(int argc, char **argv)
 	act.sa_sigaction = break_sigaction;
 	act.sa_flags = SA_SIGINFO;
 
-	if (sigemptyset(&act.sa_mask) ||
-		sigaddset(&act.sa_mask, BREAK_SIGNUM) ||
-		sigaction(BREAK_SIGNUM, &act, NULL)) {
+	if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, BREAK_SIGNUM) || sigaction(BREAK_SIGNUM, &act, NULL)) {
 		pr_perror("Can't set signal action");
 		fail();
 		return -1;
@@ -132,9 +130,8 @@ int main(int argc, char **argv)
 	ret = 0;
 	if (sigaction_error)
 		fail("Ghost signal");
-	else if (check_lease_type(fds[0], F_UNLCK) ||
-		check_lease_type(fds[1], F_RDLCK) ||
-		check_lease_type(fds[2], F_UNLCK))
+	else if (check_lease_type(fds[0], F_UNLCK) || check_lease_type(fds[1], F_RDLCK) ||
+		 check_lease_type(fds[2], F_UNLCK))
 		fail("Lease type doesn't match");
 	else
 		pass();
@@ -142,4 +139,3 @@ done:
 	close_files(fds);
 	return ret;
 }
-
diff --git a/test/zdtm/static/file_lease03.c b/test/zdtm/static/file_lease03.c
index 799c1b1f1..b313c5156 100644
--- a/test/zdtm/static/file_lease03.c
+++ b/test/zdtm/static/file_lease03.c
@@ -89,9 +89,7 @@ int main(int argc, char **argv)
 
 	act.sa_sigaction = break_sigaction;
 	act.sa_flags = SA_SIGINFO;
-	if (sigemptyset(&act.sa_mask) ||
-		sigaddset(&act.sa_mask, BREAK_SIGNUM) ||
-		sigaction(BREAK_SIGNUM, &act, NULL)) {
+	if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, BREAK_SIGNUM) || sigaction(BREAK_SIGNUM, &act, NULL)) {
 		pr_perror("Can't set signal action");
 		return -1;
 	}
@@ -143,4 +141,3 @@ done:
 	unlink(filename);
 	return ret;
 }
-
diff --git a/test/zdtm/static/file_lease04.c b/test/zdtm/static/file_lease04.c
index 4ad9af84f..1c46c24c9 100644
--- a/test/zdtm/static/file_lease04.c
+++ b/test/zdtm/static/file_lease04.c
@@ -89,9 +89,7 @@ int main(int argc, char **argv)
 
 	act.sa_sigaction = break_sigaction;
 	act.sa_flags = SA_SIGINFO;
-	if (sigemptyset(&act.sa_mask) ||
-		sigaddset(&act.sa_mask, BREAK_SIGNUM) ||
-		sigaction(BREAK_SIGNUM, &act, NULL)) {
+	if (sigemptyset(&act.sa_mask) || sigaddset(&act.sa_mask, BREAK_SIGNUM) || sigaction(BREAK_SIGNUM, &act, NULL)) {
 		pr_perror("Can't set signal action");
 		return -1;
 	}
@@ -129,4 +127,3 @@ done:
 	unlink(filename);
 	return ret;
 }
-
diff --git a/test/zdtm/static/file_locks00.c b/test/zdtm/static/file_locks00.c
index fa98a31b3..0b5d1313b 100644
--- a/test/zdtm/static/file_locks00.c
+++ b/test/zdtm/static/file_locks00.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that posix flocks are restored";
-const char *test_author	= "Qiang Huang <h.huangqiang@huawei.com>";
+const char *test_doc = "Check that posix flocks are restored";
+const char *test_author = "Qiang Huang <h.huangqiang@huawei.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -19,35 +19,32 @@ TEST_OPTION(filename, string, "file name", 1);
 char file0[PATH_MAX];
 char file1[PATH_MAX];
 
-static int lock_reg(int fd, int cmd, int type, int whence,
-		off_t offset, off_t len)
+static int lock_reg(int fd, int cmd, int type, int whence, off_t offset, off_t len)
 {
 	struct flock lock;
 
-	lock.l_type   = type;     /* F_RDLCK, F_WRLCK, F_UNLCK */
-	lock.l_whence = whence;   /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start  = offset;   /* byte offset, relative to l_whence */
-	lock.l_len    = len;      /* #bytes (0 means to EOF) */
+	lock.l_type = type; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
+	lock.l_start = offset; /* byte offset, relative to l_whence */
+	lock.l_len = len; /* #bytes (0 means to EOF) */
 
 	errno = 0;
 	return fcntl(fd, cmd, &lock);
 }
 
-#define set_read_lock(fd, whence, offset, len) \
-	lock_reg(fd, F_SETLK, F_RDLCK, whence, offset, len)
-#define set_write_lock(fd, whence, offset, len) \
-	lock_reg(fd, F_SETLK, F_WRLCK, whence, offset, len)
+#define set_read_lock(fd, whence, offset, len)	lock_reg(fd, F_SETLK, F_RDLCK, whence, offset, len)
+#define set_write_lock(fd, whence, offset, len) lock_reg(fd, F_SETLK, F_WRLCK, whence, offset, len)
 
 static int check_read_lock(int fd, int whence, off_t offset, off_t len)
 {
 	struct flock lock;
 	int ret;
 
-	lock.l_type   = F_RDLCK;  /* F_RDLCK, F_WRLCK, F_UNLCK */
-	lock.l_whence = whence;   /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start  = offset;   /* byte offset, relative to l_whence */
-	lock.l_len    = len;      /* #bytes (0 means to EOF) */
-	lock.l_pid    = -1;
+	lock.l_type = F_RDLCK; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
+	lock.l_start = offset; /* byte offset, relative to l_whence */
+	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_pid = -1;
 
 	errno = 0;
 	ret = fcntl(fd, F_GETLK, &lock);
@@ -72,11 +69,11 @@ static int check_write_lock(int fd, int whence, off_t offset, off_t len)
 	int ret;
 	pid_t ppid = getppid();
 
-	lock.l_type   = F_WRLCK;  /* F_RDLCK, F_WRLCK, F_UNLCK */
-	lock.l_whence = whence;   /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start  = offset;   /* byte offset, relative to l_whence */
-	lock.l_len    = len;      /* #bytes (0 means to EOF) */
-	lock.l_pid    = -1;
+	lock.l_type = F_WRLCK; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
+	lock.l_start = offset; /* byte offset, relative to l_whence */
+	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_pid = -1;
 
 	errno = 0;
 	ret = fcntl(fd, F_GETLK, &lock);
@@ -157,7 +154,7 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	if (pid == 0) {	/* child will check father's file locks */
+	if (pid == 0) { /* child will check father's file locks */
 		test_waitsig();
 
 		if (check_file_locks()) {
diff --git a/test/zdtm/static/file_locks01.c b/test/zdtm/static/file_locks01.c
index a57a5b61b..6c2e54ff4 100644
--- a/test/zdtm/static/file_locks01.c
+++ b/test/zdtm/static/file_locks01.c
@@ -18,8 +18,8 @@
 #define LOCK_READ 64
 #endif
 
-const char *test_doc	= "Check that flock locks are restored";
-const char *test_author	= "Qiang Huang <h.huangqiang@huawei.com>";
+const char *test_doc = "Check that flock locks are restored";
+const char *test_author = "Qiang Huang <h.huangqiang@huawei.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -78,9 +78,7 @@ static int open_all_files(int *fd_0, int *fd_1, int *fd_2)
 	return 0;
 }
 
-static int check_file_lock(int fd, char *expected_type,
-			   char *expected_option,
-			   unsigned int expected_dev,
+static int check_file_lock(int fd, char *expected_type, char *expected_option, unsigned int expected_dev,
 			   unsigned long expected_ino)
 {
 	char buf[100], fl_flag[16], fl_type[16], fl_option[16];
@@ -90,8 +88,8 @@ static int check_file_lock(int fd, char *expected_type,
 	unsigned long i_no;
 	int maj, min;
 
-	test_msg("check_file_lock: (fsname %s) expecting fd %d type %s option %s dev %u ino %lu\n",
-		 m->fsname, fd, expected_type, expected_option, expected_dev, expected_ino);
+	test_msg("check_file_lock: (fsname %s) expecting fd %d type %s option %s dev %u ino %lu\n", m->fsname, fd,
+		 expected_type, expected_option, expected_dev, expected_ino);
 
 	snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd);
 	fp_locks = fopen(path, "r");
@@ -109,9 +107,8 @@ static int check_file_lock(int fd, char *expected_type,
 		memset(fl_type, 0, sizeof(fl_type));
 		memset(fl_option, 0, sizeof(fl_option));
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d %x:%x:%ld %*d %*s",
-			     fl_flag, fl_type, fl_option, &fl_owner,
-			     &maj, &min, &i_no);
+		num = sscanf(buf, "%*s %*d:%s %s %s %d %x:%x:%ld %*d %*s", fl_flag, fl_type, fl_option, &fl_owner, &maj,
+			     &min, &i_no);
 		if (num < 7) {
 			pr_err("Invalid lock info\n");
 			break;
diff --git a/test/zdtm/static/file_locks02.c b/test/zdtm/static/file_locks02.c
index 91d13854a..d2049ebaa 100644
--- a/test/zdtm/static/file_locks02.c
+++ b/test/zdtm/static/file_locks02.c
@@ -9,22 +9,21 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that 'shared' flocks work";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check that 'shared' flocks work";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type,
-			   char *expected_option)
+static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type, char *expected_option)
 {
 	char buf[100], fl_flag[16], fl_type[16], fl_option[16];
 	int found = 0, num, fl_owner;
 	FILE *fp_locks = NULL;
 	char path[PATH_MAX];
 
-	test_msg("check_file_lock: (pid %d child %d) expecting fd %d type %s option %s\n",
-		 pid, child, fd, expected_type, expected_option);
+	test_msg("check_file_lock: (pid %d child %d) expecting fd %d type %s option %s\n", pid, child, fd,
+		 expected_type, expected_option);
 
 	snprintf(path, sizeof(path), "/proc/self/fdinfo/%d", fd);
 	fp_locks = fopen(path, "r");
@@ -42,8 +41,7 @@ static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type,
 		memset(fl_type, 0, sizeof(fl_type));
 		memset(fl_option, 0, sizeof(fl_option));
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d",
-			     fl_flag, fl_type, fl_option, &fl_owner);
+		num = sscanf(buf, "%*s %*d:%s %s %s %d", fl_flag, fl_type, fl_option, &fl_owner);
 		if (num < 4) {
 			pr_perror("Invalid lock info.");
 			break;
diff --git a/test/zdtm/static/file_locks03.c b/test/zdtm/static/file_locks03.c
index 19c11dbb6..35ef41a21 100644
--- a/test/zdtm/static/file_locks03.c
+++ b/test/zdtm/static/file_locks03.c
@@ -9,22 +9,21 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that 'inherited' flocks work";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check that 'inherited' flocks work";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type,
-			   char *expected_option)
+static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type, char *expected_option)
 {
 	char buf[100], fl_flag[16], fl_type[16], fl_option[16];
 	int found = 0, num, fl_owner;
 	FILE *fp_locks = NULL;
 	char path[PATH_MAX];
 
-	test_msg("check_file_lock: (pid %d child %d) expecting fd %d type %s option %s\n",
-		 pid, child, fd, expected_type, expected_option);
+	test_msg("check_file_lock: (pid %d child %d) expecting fd %d type %s option %s\n", pid, child, fd,
+		 expected_type, expected_option);
 
 	snprintf(path, sizeof(path), "/proc/%d/fdinfo/%d", child, fd);
 	fp_locks = fopen(path, "r");
@@ -42,8 +41,7 @@ static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type,
 		memset(fl_type, 0, sizeof(fl_type));
 		memset(fl_option, 0, sizeof(fl_option));
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d",
-			     fl_flag, fl_type, fl_option, &fl_owner);
+		num = sscanf(buf, "%*s %*d:%s %s %s %d", fl_flag, fl_type, fl_option, &fl_owner);
 		if (num < 4) {
 			pr_perror("Invalid lock info.");
 			break;
diff --git a/test/zdtm/static/file_locks04.c b/test/zdtm/static/file_locks04.c
index 96170d51e..11d224fa7 100644
--- a/test/zdtm/static/file_locks04.c
+++ b/test/zdtm/static/file_locks04.c
@@ -9,18 +9,18 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that 'overlapping' flocks work";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check that 'overlapping' flocks work";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
 static int check_file_locks(pid_t child_pid, int fd, int child_fd)
 {
-	char		path[PATH_MAX];
-	FILE		*fp_locks = NULL;
-	char		buf[100], fl_flag[16], fl_type[16], fl_option[16];
-	int		found = 0, num, fl_owner;
+	char path[PATH_MAX];
+	FILE *fp_locks = NULL;
+	char buf[100], fl_flag[16], fl_type[16], fl_option[16];
+	int found = 0, num, fl_owner;
 
 	sprintf(path, "/proc/%d/fdinfo/%d", child_pid, child_fd);
 	fp_locks = fopen(path, "r");
@@ -34,9 +34,8 @@ static int check_file_locks(pid_t child_pid, int fd, int child_fd)
 			continue;
 		test_msg("c: %s", buf);
 
-		num = sscanf(buf,
-			"%*s %*d:%s %s %s %d %*02x:%*02x:%*d %*d %*s",
-			fl_flag, fl_type, fl_option, &fl_owner);
+		num = sscanf(buf, "%*s %*d:%s %s %s %d %*02x:%*02x:%*d %*d %*s", fl_flag, fl_type, fl_option,
+			     &fl_owner);
 
 		if (num < 4) {
 			pr_perror("Invalid lock info.");
@@ -48,9 +47,7 @@ static int check_file_locks(pid_t child_pid, int fd, int child_fd)
 			continue;
 		}
 
-		if (!strcmp(fl_flag, "FLOCK") &&
-				!strcmp(fl_type, "ADVISORY") &&
-				!strcmp(fl_option, "WRITE"))
+		if (!strcmp(fl_flag, "FLOCK") && !strcmp(fl_type, "ADVISORY") && !strcmp(fl_option, "WRITE"))
 			found++;
 
 		memset(fl_flag, 0, sizeof(fl_flag));
diff --git a/test/zdtm/static/file_locks05.c b/test/zdtm/static/file_locks05.c
index e9e56acfe..1972617d5 100644
--- a/test/zdtm/static/file_locks05.c
+++ b/test/zdtm/static/file_locks05.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Sanity check for criu lock-test quirk";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Sanity check for criu lock-test quirk";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/file_locks06.c b/test/zdtm/static/file_locks06.c
index 2fb0080c4..ce80113db 100644
--- a/test/zdtm/static/file_locks06.c
+++ b/test/zdtm/static/file_locks06.c
@@ -5,13 +5,12 @@
 #include "ofd_file_locks.h"
 #include "zdtmtst.h"
 
-const char *test_doc    = "Check that OFD lock for the whole file is restored";
+const char *test_doc = "Check that OFD lock for the whole file is restored";
 const char *test_author = "Begunkov Pavel <asml.silence@gmail.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-
 int init_lock(int *fd, struct flock *lck)
 {
 	*fd = open(filename, O_RDWR | O_CREAT, 0666);
@@ -54,8 +53,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	if (check_file_lock_restored(getpid(), fd, &lck) ||
-		check_lock_exists(filename, &lck) < 0)
+	if (check_file_lock_restored(getpid(), fd, &lck) || check_lock_exists(filename, &lck) < 0)
 		fail("OFD file locks check failed");
 	else
 		pass();
diff --git a/test/zdtm/static/file_locks07.c b/test/zdtm/static/file_locks07.c
index 155c1a4a7..0838e35ef 100644
--- a/test/zdtm/static/file_locks07.c
+++ b/test/zdtm/static/file_locks07.c
@@ -5,19 +5,18 @@
 #include "ofd_file_locks.h"
 #include "zdtmtst.h"
 
-const char *test_doc    = "Check that 'overlapping' OFD read locks work";
+const char *test_doc = "Check that 'overlapping' OFD read locks work";
 const char *test_author = "Begunkov Pavel <asml.silence@gmail.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-
 #define FILE_NUM 4
 static int fds[FILE_NUM];
 static struct flock lcks[FILE_NUM];
-static short types[] = {F_RDLCK, F_RDLCK, F_RDLCK, F_RDLCK};
-static off_t starts[] = {0, 10, 0, 70};
-static off_t lens[]  = {20, 30, 100, 200};
+static short types[] = { F_RDLCK, F_RDLCK, F_RDLCK, F_RDLCK };
+static off_t starts[] = { 0, 10, 0, 70 };
+static off_t lens[] = { 20, 30, 100, 200 };
 
 void fill_lock(struct flock *lock, off_t start, off_t len, short int type)
 {
diff --git a/test/zdtm/static/file_locks08.c b/test/zdtm/static/file_locks08.c
index a4fa1feb5..da6c096df 100644
--- a/test/zdtm/static/file_locks08.c
+++ b/test/zdtm/static/file_locks08.c
@@ -7,13 +7,12 @@
 #include "ofd_file_locks.h"
 #include "zdtmtst.h"
 
-const char *test_doc    = "Check that inherited OFD locks work";
+const char *test_doc = "Check that inherited OFD locks work";
 const char *test_author = "Begunkov Pavel <asml.silence@gmail.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-
 int init_file_lock(int *fd, struct flock *lck)
 {
 	*fd = open(filename, O_RDWR | O_CREAT, 0666);
@@ -62,8 +61,7 @@ int main(int argc, char **argv)
 	pid = fork();
 	if (pid == 0) {
 		task_waiter_wait4(&tw, getppid());
-		if (check_file_lock_restored(getpid(), fd, &lck) ||
-			check_lock_exists(filename, &lck) < 0)
+		if (check_file_lock_restored(getpid(), fd, &lck) || check_lock_exists(filename, &lck) < 0)
 			ret = -1;
 		exit(ret);
 	}
@@ -73,8 +71,7 @@ int main(int argc, char **argv)
 
 	task_waiter_complete_current(&tw);
 
-	if (check_file_lock_restored(getpid(), fd, &lck) ||
-		check_lock_exists(filename, &lck) < 0)
+	if (check_file_lock_restored(getpid(), fd, &lck) || check_lock_exists(filename, &lck) < 0)
 		fail("OFD file locks check failed");
 
 	kill(pid, SIGTERM);
diff --git a/test/zdtm/static/file_shared.c b/test/zdtm/static/file_shared.c
index 0e78b07e2..9d896c2e2 100644
--- a/test/zdtm/static/file_shared.c
+++ b/test/zdtm/static/file_shared.c
@@ -7,11 +7,11 @@
 #include <stdio.h>
 
 #include "zdtmtst.h"
-#define OFFSET 1000
+#define OFFSET	1000
 #define OFFSET2 500
 
-const char *test_doc	= "Check shared struct file-s";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Check shared struct file-s";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -46,11 +46,11 @@ int main(int argc, char **argv)
 		test_daemon();
 		test_waitsig();
 		off = lseek(fd, OFFSET, SEEK_SET);
-		if (off == (off_t) -1)
+		if (off == (off_t)-1)
 			return 1;
 
 		off = lseek(fd3, OFFSET2, SEEK_SET);
-		if (off == (off_t) -1)
+		if (off == (off_t)-1)
 			return 1;
 
 		ret = kill(pid, SIGTERM);
diff --git a/test/zdtm/static/fpu00.c b/test/zdtm/static/fpu00.c
index 6cc15a2b2..7687639c4 100644
--- a/test/zdtm/static/fpu00.c
+++ b/test/zdtm/static/fpu00.c
@@ -3,9 +3,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Start a calculation, leaving FPU in a certain state,\n"
-"before migration, continue after";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Start a calculation, leaving FPU in a certain state,\n"
+		       "before migration, continue after";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 #if defined(__i386__) || defined(__x86_64__)
 
@@ -13,25 +13,20 @@ const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
 
 void start(float a, float b, float c, float d)
 {
-	__asm__ volatile (
-			  "flds  %0\n"
-			  "fadds %1\n"
-			  "flds  %2\n"
-			  "fadds %3\n"
-			  "fmulp %%st(1)\n"
-			  :
-			  : "m" (a), "m" (b), "m" (c), "m" (d)
-			 );
+	__asm__ volatile("flds  %0\n"
+			 "fadds %1\n"
+			 "flds  %2\n"
+			 "fadds %3\n"
+			 "fmulp %%st(1)\n"
+			 :
+			 : "m"(a), "m"(b), "m"(c), "m"(d));
 }
 
 float finish(void)
 {
 	float res;
 
-	__asm__ volatile (
-			  "fstps %0\n"
-			  : "=m" (res)
-			 );
+	__asm__ volatile("fstps %0\n" : "=m"(res));
 	return res;
 }
 
@@ -56,7 +51,6 @@ void *run_fpu_test(void *unused)
 	c = drand48();
 	d = drand48();
 
-
 	start(a, b, c, d);
 	res1 = finish();
 
@@ -75,7 +69,7 @@ void *run_fpu_test(void *unused)
 	return (void *)(uintptr_t)(res1 != res2);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	test_init(argc, argv);
 
@@ -84,7 +78,6 @@ int main(int argc, char ** argv)
 		return 1;
 	}
 
-
 #ifdef ZDTM_FPU00_RUN_IN_THREAD
 	/* Check if thread's fpu state is preserved */
 	{
diff --git a/test/zdtm/static/fpu01.c b/test/zdtm/static/fpu01.c
index 11c480546..638a1ad8f 100644
--- a/test/zdtm/static/fpu01.c
+++ b/test/zdtm/static/fpu01.c
@@ -10,8 +10,8 @@
 
 #include "cpuid.h"
 
-const char *test_doc	= "Test if FPU data in YMM registers do survive the c/r";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Test if FPU data in YMM registers do survive the c/r";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 static int verify_cpu(void)
 {
@@ -45,36 +45,22 @@ static int fpu_test(void)
 {
 	int ret = 0;
 
-	asm volatile("vmovapd %0, %%ymm0 \n"
-		     :
-		     : "m" (*ymm1)
-		     : "memory");
+	asm volatile("vmovapd %0, %%ymm0 \n" : : "m"(*ymm1) : "memory");
 
-	asm volatile("vmovapd %0, %%ymm7 \n"
-		     :
-		     : "m" (*ymm2)
-		     : "memory");
+	asm volatile("vmovapd %0, %%ymm7 \n" : : "m"(*ymm2) : "memory");
 
 	test_daemon();
 	test_waitsig();
 
-	asm volatile("vmovapd %%ymm0, %0 \n"
-		     : "=m" (*ymm3)
-		     :
-		     : "memory");
+	asm volatile("vmovapd %%ymm0, %0 \n" : "=m"(*ymm3) : : "memory");
 
-	asm volatile("vmovapd %%ymm7, %0 \n"
-		     : "=m" (*ymm4)
-		     :
-		     : "memory");
+	asm volatile("vmovapd %%ymm7, %0 \n" : "=m"(*ymm4) : : "memory");
 
 	if (memcmp(ymm1, ymm3, 32) || memcmp(ymm2, ymm4, 32)) {
-		test_msg("Data mismatch ('%s' '%s' '%s' '%s')\n",
-			 ymm1, ymm2, ymm3, ymm4);
+		test_msg("Data mismatch ('%s' '%s' '%s' '%s')\n", ymm1, ymm2, ymm3, ymm4);
 		ret = -1;
 	} else {
-		test_msg("Data match ('%s' '%s' '%s' '%s')\n",
-			 ymm1, ymm2, ymm3, ymm4);
+		test_msg("Data match ('%s' '%s' '%s' '%s')\n", ymm1, ymm2, ymm3, ymm4);
 		ret = 0;
 	}
 
diff --git a/test/zdtm/static/fpu02.c b/test/zdtm/static/fpu02.c
index 660fc7d59..b201f8081 100644
--- a/test/zdtm/static/fpu02.c
+++ b/test/zdtm/static/fpu02.c
@@ -10,8 +10,8 @@
 
 #include "cpuid.h"
 
-const char *test_doc	= "Test preserve of mxcsr in FPU";
-const char *test_author	= "Dmitry Safonov <0x7f454c46@gmail.com>";
+const char *test_doc = "Test preserve of mxcsr in FPU";
+const char *test_author = "Dmitry Safonov <0x7f454c46@gmail.com>";
 
 static int verify_cpu(void)
 {
@@ -36,14 +36,12 @@ static int fpu_test(void)
 {
 	uint32_t before, after;
 
-	asm volatile("stmxcsr %0\n"
-		     : "+m"(before));
+	asm volatile("stmxcsr %0\n" : "+m"(before));
 
 	test_daemon();
 	test_waitsig();
 
-	asm volatile("stmxcsr %0\n"
-		     : "+m"(after));
+	asm volatile("stmxcsr %0\n" : "+m"(after));
 
 	test_msg("before: %x, after: %x\n", before, after);
 
diff --git a/test/zdtm/static/futex-rl.c b/test/zdtm/static/futex-rl.c
index a5888a340..e031bfd73 100644
--- a/test/zdtm/static/futex-rl.c
+++ b/test/zdtm/static/futex-rl.c
@@ -10,12 +10,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check the futex robust list c/r";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check the futex robust list c/r";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 struct args {
-	task_waiter_t	waiter;
-	int		result;
+	task_waiter_t waiter;
+	int result;
 };
 
 static pid_t __gettid(void)
diff --git a/test/zdtm/static/futex.c b/test/zdtm/static/futex.c
index 5d1f2de86..30bddb3e6 100644
--- a/test/zdtm/static/futex.c
+++ b/test/zdtm/static/futex.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check (via pthread/NPTL) that futeces behave through migration";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check (via pthread/NPTL) that futeces behave through migration";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 volatile int kid_passed;
 
@@ -22,12 +22,13 @@ void *thread_fn(void *lock)
 	return NULL;
 }
 
-#define DEF_NUM_THREADS	10
-#define MAX_NUM_THREADS	50
+#define DEF_NUM_THREADS 10
+#define MAX_NUM_THREADS 50
 int num_threads = DEF_NUM_THREADS;
-TEST_OPTION(num_threads, int, "number of threads "
-		"(default " __stringify(DEF_NUM_THREADS)
-		" maximum " __stringify(MAX_NUM_THREADS) ")", 0);
+TEST_OPTION(num_threads, int,
+	    "number of threads "
+	    "(default " __stringify(DEF_NUM_THREADS) " maximum " __stringify(MAX_NUM_THREADS) ")",
+	    0);
 
 int main(int argc, char **argv)
 {
@@ -38,8 +39,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	if (num_threads > MAX_NUM_THREADS) {
-		pr_perror("%d threads it too much. max is %d",
-				num_threads, MAX_NUM_THREADS);
+		pr_perror("%d threads it too much. max is %d", num_threads, MAX_NUM_THREADS);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/get_smaps_bits.c b/test/zdtm/static/get_smaps_bits.c
index 3debaa752..31d0d92b2 100644
--- a/test/zdtm/static/get_smaps_bits.c
+++ b/test/zdtm/static/get_smaps_bits.c
@@ -3,19 +3,19 @@
 #include "zdtmtst.h"
 
 #ifndef MAP_HUGETLB
-# define MAP_HUGETLB 0x40000
+#define MAP_HUGETLB 0x40000
 #endif
 
 #ifndef MADV_HUGEPAGE
-# define MADV_HUGEPAGE 14
+#define MADV_HUGEPAGE 14
 #endif
 
 #ifndef MADV_NOHUGEPAGE
-# define MADV_NOHUGEPAGE 15
+#define MADV_NOHUGEPAGE 15
 #endif
 
 #ifndef MADV_DONTDUMP
-# define MADV_DONTDUMP 16
+#define MADV_DONTDUMP 16
 #endif
 
 static void parse_vmflags(char *buf, unsigned long *flags, unsigned long *madv)
@@ -66,10 +66,7 @@ static void parse_vmflags(char *buf, unsigned long *flags, unsigned long *madv)
 #undef _vmflag_match
 }
 
-#define is_hex_digit(c)				\
-	(((c) >= '0' && (c) <= '9')	||	\
-	 ((c) >= 'a' && (c) <= 'f')	||	\
-	 ((c) >= 'A' && (c) <= 'F'))
+#define is_hex_digit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
 
 static int is_vma_range_fmt(char *line, unsigned long *start, unsigned long *end)
 {
diff --git a/test/zdtm/static/ghost_holes00.c b/test/zdtm/static/ghost_holes00.c
index 214a39141..a87642588 100644
--- a/test/zdtm/static/ghost_holes00.c
+++ b/test/zdtm/static/ghost_holes00.c
@@ -10,40 +10,40 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test ghost with one hole in the middle";
+const char *test_doc = "Test ghost with one hole in the middle";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
 /* Buffer that is suitable for hole size */
-#define BUFSIZE	4096
+#define BUFSIZE 4096
 static unsigned char buf4k[BUFSIZE];
 
 #ifndef SEEK_DATA
-#define SEEK_DATA	3
-#define SEEK_HOLE	4
+#define SEEK_DATA 3
+#define SEEK_HOLE 4
 #endif
 
 #ifdef HEAD_HOLE
-#define HH	1
+#define HH 1
 #else
-#define HH	0
+#define HH 0
 #endif
 
 #ifdef TAIL_HOLE
-#define TH	1
+#define TH 1
 #else
-#define TH	0
+#define TH 0
 #endif
 
-#define DATA1_BLK	(HH)
-#define DATA1_OFF	(DATA1_BLK * BUFSIZE)
-#define DATA2_BLK	(HH + 2)
-#define DATA2_OFF	(DATA2_BLK * BUFSIZE)
-#define FILE_BLOCKS	(TH + HH + 1 /* mid hole */ + 2 /* data */)
-#define FILE_SIZE	(FILE_BLOCKS * BUFSIZE)
+#define DATA1_BLK   (HH)
+#define DATA1_OFF   (DATA1_BLK * BUFSIZE)
+#define DATA2_BLK   (HH + 2)
+#define DATA2_OFF   (DATA2_BLK * BUFSIZE)
+#define FILE_BLOCKS (TH + HH + 1 /* mid hole */ + 2 /* data */)
+#define FILE_SIZE   (FILE_BLOCKS * BUFSIZE)
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	struct stat st;
diff --git a/test/zdtm/static/ghost_on_rofs.c b/test/zdtm/static/ghost_on_rofs.c
index 1a7922320..7fef8a366 100644
--- a/test/zdtm/static/ghost_on_rofs.c
+++ b/test/zdtm/static/ghost_on_rofs.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check ghost file on readonly fs mount restores fine";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check ghost file on readonly fs mount restores fine";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 #define GHOST_DATA "Ghost Data"
 
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 	}
 
 	ssprintf(ghost_file, "%s/ghost_file", ro_mount);
-	fd = open(ghost_file, O_CREAT|O_WRONLY, 0600);
+	fd = open(ghost_file, O_CREAT | O_WRONLY, 0600);
 	if (fd < 0) {
 		pr_perror("open");
 		return 1;
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 	}
 
 	ssprintf(ghost_file_bind, "%s/ghost_file_bind", ro_bind_mount);
-	fd_bind = open(ghost_file_bind, O_CREAT|O_WRONLY, 0600);
+	fd_bind = open(ghost_file_bind, O_CREAT | O_WRONLY, 0600);
 	if (fd_bind < 0) {
 		pr_perror("open");
 		return 1;
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (mount(NULL, ro_mount, NULL, MS_RDONLY|MS_REMOUNT|MS_BIND, NULL)) {
+	if (mount(NULL, ro_mount, NULL, MS_RDONLY | MS_REMOUNT | MS_BIND, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
 	 * Need MS_NOSUID flag to check the hunk in do_bind_mount, case of
 	 * different flags for mount and it's ->bind
 	 */
-	if (mount(NULL, ro_bind_mount, NULL, MS_NOSUID|MS_RDONLY|MS_REMOUNT|MS_BIND, NULL)) {
+	if (mount(NULL, ro_bind_mount, NULL, MS_NOSUID | MS_RDONLY | MS_REMOUNT | MS_BIND, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
diff --git a/test/zdtm/static/groups.c b/test/zdtm/static/groups.c
index 01ec3a12b..1ff5c08fa 100644
--- a/test/zdtm/static/groups.c
+++ b/test/zdtm/static/groups.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that supplementary groups are supported";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that supplementary groups are supported";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/grow_map.c b/test/zdtm/static/grow_map.c
index 089ff7d45..6606f972a 100644
--- a/test/zdtm/static/grow_map.c
+++ b/test/zdtm/static/grow_map.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that VMA-s with MAP_GROWSDOWN are restored correctly";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check that VMA-s with MAP_GROWSDOWN are restored correctly";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 int main(int argc, char **argv)
 {
@@ -21,9 +21,8 @@ int main(int argc, char **argv)
 	}
 	munmap(start_addr, PAGE_SIZE * 10);
 
-	fake_grow_down = mmap(start_addr + PAGE_SIZE * 5, PAGE_SIZE,
-			 PROT_READ | PROT_WRITE,
-			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
+	fake_grow_down = mmap(start_addr + PAGE_SIZE * 5, PAGE_SIZE, PROT_READ | PROT_WRITE,
+			      MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
 	if (fake_grow_down == MAP_FAILED) {
 		pr_perror("Can't mal a new region");
 		return 1;
@@ -34,16 +33,14 @@ int main(int argc, char **argv)
 	*p = 'b';
 
 	/* overlap the guard page of fake_grow_down */
-	test_addr = mmap(start_addr + PAGE_SIZE * 3, PAGE_SIZE,
-			 PROT_READ | PROT_WRITE,
+	test_addr = mmap(start_addr + PAGE_SIZE * 3, PAGE_SIZE, PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
 	if (test_addr == MAP_FAILED) {
 		pr_perror("Can't mal a new region");
 		return 1;
 	}
 
-	grow_down = mmap(start_addr + PAGE_SIZE * 2, PAGE_SIZE,
-			 PROT_READ | PROT_WRITE,
+	grow_down = mmap(start_addr + PAGE_SIZE * 2, PAGE_SIZE, PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
 	if (grow_down == MAP_FAILED) {
 		pr_perror("Can't mal a new region");
diff --git a/test/zdtm/static/grow_map02.c b/test/zdtm/static/grow_map02.c
index 0b93714f4..4740947d8 100644
--- a/test/zdtm/static/grow_map02.c
+++ b/test/zdtm/static/grow_map02.c
@@ -7,24 +7,22 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that a few grow-down VMA-s are restored correctly";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check that a few grow-down VMA-s are restored correctly";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 int main(int argc, char **argv)
 {
 	char *start_addr, *grow_down;
 	test_init(argc, argv);
 
-	start_addr = mmap(NULL, PAGE_SIZE * 10, PROT_READ | PROT_WRITE,
-					MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+	start_addr = mmap(NULL, PAGE_SIZE * 10, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	if (start_addr == MAP_FAILED) {
 		pr_perror("Can't mal a new region");
 		return 1;
 	}
 	munmap(start_addr, PAGE_SIZE * 10);
 
-	grow_down = mmap(start_addr + PAGE_SIZE * 3, PAGE_SIZE * 3,
-			 PROT_READ | PROT_WRITE,
+	grow_down = mmap(start_addr + PAGE_SIZE * 3, PAGE_SIZE * 3, PROT_READ | PROT_WRITE,
 			 MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED | MAP_GROWSDOWN, -1, 0);
 	if (grow_down == MAP_FAILED) {
 		pr_perror("Can't mal a new region");
@@ -47,8 +45,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	test_msg("%c %c %c\n", grow_down[0 * PAGE_SIZE],
-		 grow_down[1 * PAGE_SIZE], grow_down[2 * PAGE_SIZE]);
+	test_msg("%c %c %c\n", grow_down[0 * PAGE_SIZE], grow_down[1 * PAGE_SIZE], grow_down[2 * PAGE_SIZE]);
 
 	if (grow_down[0 * PAGE_SIZE] != 'x')
 		return 1;
diff --git a/test/zdtm/static/grow_map03.c b/test/zdtm/static/grow_map03.c
index 6310386a4..d715223af 100644
--- a/test/zdtm/static/grow_map03.c
+++ b/test/zdtm/static/grow_map03.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that VMA-s with MAP_GROWSDOWN are restored correctly";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check that VMA-s with MAP_GROWSDOWN are restored correctly";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 /*
 * This test case creates two consecutive grows down vmas with a hole
@@ -26,8 +26,10 @@ int main(int argc, char **argv)
 	}
 	munmap(start_addr, PAGE_SIZE * 10);
 
-	addr1 = mmap(start_addr + PAGE_SIZE * 5, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE | MAP_GROWSDOWN, -1, 0);
-	addr2 = mmap(start_addr + PAGE_SIZE * 3, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE | MAP_GROWSDOWN, -1, 0);
+	addr1 = mmap(start_addr + PAGE_SIZE * 5, PAGE_SIZE, PROT_READ | PROT_WRITE,
+		     MAP_ANONYMOUS | MAP_PRIVATE | MAP_GROWSDOWN, -1, 0);
+	addr2 = mmap(start_addr + PAGE_SIZE * 3, PAGE_SIZE, PROT_READ | PROT_WRITE,
+		     MAP_ANONYMOUS | MAP_PRIVATE | MAP_GROWSDOWN, -1, 0);
 
 	test_msg("%p %p\n", addr1, addr2);
 
diff --git a/test/zdtm/static/helper_zombie_child.c b/test/zdtm/static/helper_zombie_child.c
index 657d56f27..f4a34e1d0 100644
--- a/test/zdtm/static/helper_zombie_child.c
+++ b/test/zdtm/static/helper_zombie_child.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that a zombie with a helper parent is restored";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that a zombie with a helper parent is restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 void setsid_and_fork(int sk)
 {
diff --git a/test/zdtm/static/inotify00.c b/test/zdtm/static/inotify00.c
index 635c05047..9b24b55be 100644
--- a/test/zdtm/static/inotify00.c
+++ b/test/zdtm/static/inotify00.c
@@ -18,44 +18,29 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for inotify delivery";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for inotify delivery";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_FILE	"inotify-removed"
-#define TEST_LINK	"inotify-hardlink"
+#define TEST_FILE "inotify-removed"
+#define TEST_LINK "inotify-hardlink"
 
 #define BUFF_SIZE ((sizeof(struct inotify_event) + PATH_MAX))
 
 static void decode_event_mask(char *buf, size_t size, unsigned int mask)
 {
 	static const char *names[32] = {
-		[ 0]	= "IN_ACCESS",
-		[ 1]	= "IN_MODIFY",
-		[ 2]	= "IN_ATTRIB",
-		[ 3]	= "IN_CLOSE_WRITE",
-		[ 4]	= "IN_CLOSE_NOWRITE",
-		[ 5]	= "IN_OPEN",
-		[ 6]	= "IN_MOVED_FROM",
-		[ 7]	= "IN_MOVED_TO",
-		[ 8]	= "IN_CREATE",
-		[ 9]	= "IN_DELETE",
-		[10]	= "IN_DELETE_SELF",
-		[11]	= "IN_MOVE_SELF",
+		[0] = "IN_ACCESS",	  [1] = "IN_MODIFY",	   [2] = "IN_ATTRIB",	    [3] = "IN_CLOSE_WRITE",
+		[4] = "IN_CLOSE_NOWRITE", [5] = "IN_OPEN",	   [6] = "IN_MOVED_FROM",   [7] = "IN_MOVED_TO",
+		[8] = "IN_CREATE",	  [9] = "IN_DELETE",	   [10] = "IN_DELETE_SELF", [11] = "IN_MOVE_SELF",
 
-		[13]	= "IN_UNMOUNT",
-		[14]	= "IN_Q_OVERFLOW",
-		[15]	= "IN_IGNORED",
+		[13] = "IN_UNMOUNT",	  [14] = "IN_Q_OVERFLOW",  [15] = "IN_IGNORED",
 
-		[24]	= "IN_ONLYDIR",
-		[25]	= "IN_DONT_FOLLOW",
-		[26]	= "IN_EXCL_UNLINK",
+		[24] = "IN_ONLYDIR",	  [25] = "IN_DONT_FOLLOW", [26] = "IN_EXCL_UNLINK",
 
-		[29]	= "IN_MASK_ADD",
-		[30]	= "IN_ISDIR",
-		[31]	= "IN_ONESHOT",
+		[29] = "IN_MASK_ADD",	  [30] = "IN_ISDIR",	   [31] = "IN_ONESHOT",
 	};
 
 	size_t i, j;
@@ -95,8 +80,7 @@ static int inotify_read_events(char *prefix, int inotify_fd, unsigned int *expec
 
 			event = (void *)(buf + off);
 			decode_event_mask(emask, sizeof(emask), event->mask);
-			test_msg("\t%-16s: event %#10x -> %s\n",
-				 prefix, event->mask, emask);
+			test_msg("\t%-16s: event %#10x -> %s\n", prefix, event->mask, emask);
 			if (expected)
 				*expected &= ~event->mask;
 		}
@@ -107,7 +91,7 @@ out:
 	return ret;
 }
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	unsigned int mask = IN_DELETE | IN_CLOSE_WRITE | IN_DELETE_SELF | IN_CREATE;
 	char test_file_path[PATH_MAX];
@@ -122,51 +106,51 @@ int main (int argc, char *argv[])
 	}
 
 #ifdef INOTIFY01
-{
-	pid_t pid;
-	task_waiter_t t;
-	static char buf[PATH_MAX];
+	{
+		pid_t pid;
+		task_waiter_t t;
+		static char buf[PATH_MAX];
 
-	task_waiter_init(&t);
+		task_waiter_init(&t);
 
-	if (mount(NULL, "/", NULL, MS_PRIVATE | MS_REC, NULL)) {
-		pr_perror("Unable to remount /");
-		return 1;
-	}
-
-	pid = fork();
-	if (pid < 0) {
-		pr_perror("Can't fork a test process");
-		exit(1);
-	}
-	if (pid == 0) {
-		int fd;
-
-		prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
-		if (unshare(CLONE_NEWNS)) {
-			pr_perror("Unable to unshare mount namespace");
-			exit(1);
+		if (mount(NULL, "/", NULL, MS_PRIVATE | MS_REC, NULL)) {
+			pr_perror("Unable to remount /");
+			return 1;
 		}
 
-		if (mount("zdtm", dirname, "tmpfs", 0, NULL)) {
-			pr_perror("Unable to mount tmpfs");
+		pid = fork();
+		if (pid < 0) {
+			pr_perror("Can't fork a test process");
 			exit(1);
 		}
-		fd = open(dirname, O_RDONLY);
-		if (fd < 0) {
-			pr_perror("Unable to open %s", dirname);
+		if (pid == 0) {
+			int fd;
+
+			prctl(PR_SET_PDEATHSIG, SIGKILL, 0, 0, 0);
+			if (unshare(CLONE_NEWNS)) {
+				pr_perror("Unable to unshare mount namespace");
+				exit(1);
+			}
+
+			if (mount("zdtm", dirname, "tmpfs", 0, NULL)) {
+				pr_perror("Unable to mount tmpfs");
+				exit(1);
+			}
+			fd = open(dirname, O_RDONLY);
+			if (fd < 0) {
+				pr_perror("Unable to open %s", dirname);
+				exit(1);
+			}
+			dup2(fd, 100);
+			task_waiter_complete_current(&t);
+			while (1)
+				sleep(1000);
 			exit(1);
 		}
-		dup2(fd, 100);
-		task_waiter_complete_current(&t);
-		while (1)
-			sleep(1000);
-		exit(1);
+		task_waiter_wait4(&t, pid);
+		snprintf(buf, sizeof(buf), "/proc/%d/fd/100", pid);
+		dirname = buf;
 	}
-	task_waiter_wait4(&t, pid);
-	snprintf(buf, sizeof(buf), "/proc/%d/fd/100", pid);
-	dirname = buf;
-}
 #endif
 
 	fd = inotify_init1(IN_NONBLOCK);
@@ -210,8 +194,7 @@ int main (int argc, char *argv[])
 	if (emask) {
 		char emask_bits[128];
 		decode_event_mask(emask_bits, sizeof(emask_bits), emask);
-		pr_perror("Unhandled events in emask %#x -> %s",
-		    emask, emask_bits);
+		pr_perror("Unhandled events in emask %#x -> %s", emask, emask_bits);
 		exit(1);
 	}
 #endif
@@ -226,8 +209,7 @@ int main (int argc, char *argv[])
 	if (emask) {
 		char emask_bits[128];
 		decode_event_mask(emask_bits, sizeof(emask_bits), emask);
-		fail("Unhandled events in emask %#x -> %s",
-		    emask, emask_bits);
+		fail("Unhandled events in emask %#x -> %s", emask, emask_bits);
 		return 1;
 	}
 
@@ -244,8 +226,7 @@ int main (int argc, char *argv[])
 	if (emask) {
 		char emask_bits[128];
 		decode_event_mask(emask_bits, sizeof(emask_bits), emask);
-		fail("Unhandled events in emask %#x -> %s",
-		    emask, emask_bits);
+		fail("Unhandled events in emask %#x -> %s", emask, emask_bits);
 		return 1;
 	}
 #endif
diff --git a/test/zdtm/static/inotify02.c b/test/zdtm/static/inotify02.c
index bedfefac9..44fcdc875 100644
--- a/test/zdtm/static/inotify02.c
+++ b/test/zdtm/static/inotify02.c
@@ -18,8 +18,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for inotify file-handles storm";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for inotify file-handles storm";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -48,7 +48,7 @@ static int num_of_handles(int fd)
 	return ret;
 }
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	const unsigned int mask = IN_DELETE | IN_CLOSE_WRITE | IN_DELETE_SELF | IN_CREATE;
 	const int nr_dirs = 64;
diff --git a/test/zdtm/static/inotify04.c b/test/zdtm/static/inotify04.c
index fb9293024..96f7b215f 100644
--- a/test/zdtm/static/inotify04.c
+++ b/test/zdtm/static/inotify04.c
@@ -8,13 +8,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check inotify does not have trash in queue after c/r";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check inotify does not have trash in queue after c/r";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_FILE	"inotify-testfile"
+#define TEST_FILE "inotify-testfile"
 
 #define BUFF_SIZE ((sizeof(struct inotify_event) + PATH_MAX))
 
@@ -49,7 +49,7 @@ static int inotify_read_events(int inotify_fd, unsigned int *n)
 	return ret;
 }
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	unsigned int mask = IN_ALL_EVENTS;
 	char test_file_path[PATH_MAX];
diff --git a/test/zdtm/static/inotify_irmap.c b/test/zdtm/static/inotify_irmap.c
index cf35886e2..f8e35222c 100644
--- a/test/zdtm/static/inotify_irmap.c
+++ b/test/zdtm/static/inotify_irmap.c
@@ -14,15 +14,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for irmap";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check for irmap";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
-#define TDIR	"/etc"
-char test_files[2][128] = {TDIR"/zdtm-test", TDIR"/zdtm-test1"};
+#define TDIR "/etc"
+char test_files[2][128] = { TDIR "/zdtm-test", TDIR "/zdtm-test1" };
 
 #define BUFF_SIZE ((sizeof(struct inotify_event) + PATH_MAX))
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	char buf[BUFF_SIZE];
 	int fd, wd, i;
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 3d2355436..487062cab 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -13,7 +13,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Inotify on symlink should be checked";
+const char *test_doc = "Inotify on symlink should be checked";
 #ifndef NODEL
 char filename[] = "file";
 char linkname[] = "file.lnk";
@@ -29,34 +29,35 @@ const char *inot_dir = "./inotify.nodel";
 
 #ifndef IN_DONT_FOLLOW
 /* Missed in SLES 10 header */
-#define IN_DONT_FOLLOW		0x02000000
+#define IN_DONT_FOLLOW 0x02000000
 #endif
 
 #define EVENT_MAX 1024
 /* size of the event structure, not counting name */
-#define EVENT_SIZE  (sizeof (struct inotify_event))
+#define EVENT_SIZE (sizeof(struct inotify_event))
 /* reasonable guess as to size of 1024 events */
-#define EVENT_BUF_LEN        (EVENT_MAX * (EVENT_SIZE + 16))
-#define BUF_SIZE 256
+#define EVENT_BUF_LEN (EVENT_MAX * (EVENT_SIZE + 16))
+#define BUF_SIZE      256
 
-#define min_value(a,b) (a<b) ? a : b
-#define handle_event(MASK) (MASK == IN_ACCESS) ? "IN_ACCESS" : \
-(MASK == IN_MODIFY) ? "IN_MODIFY" : \
-(MASK == IN_ATTRIB) ? "IN_ATTRIB" : \
-(MASK == IN_CLOSE) ? "IN_CLOSE" : \
-(MASK == IN_CLOSE_WRITE) ? "IN_CLOSE_WRITE" : \
-(MASK == IN_CLOSE_NOWRITE) ? "IN_CLOSE_NOWRITE" : \
-(MASK == IN_OPEN) ? "IN_OPEN" : \
-(MASK == IN_MOVED_FROM) ? "IN_MOVED_FROM" : \
-(MASK == IN_MOVED_TO) ? "IN_MOVED_TO" : \
-(MASK == IN_DELETE) ? "IN_DELETE" : \
-(MASK == IN_CREATE) ? "IN_CREATE" : \
-(MASK == IN_DELETE_SELF) ? "IN_DELETE_SELF" : \
-(MASK == IN_MOVE_SELF) ? "IN_MOVE_SELF" : \
-(MASK == IN_UNMOUNT) ? "IN_UNMOUNT" : \
-(MASK == IN_Q_OVERFLOW) ? "IN_Q_OVERFLOW" : \
-(MASK == IN_IGNORED) ? "IN_IGNORED" : \
-"UNKNOWN"
+#define min_value(a, b) (a < b) ? a : b
+#define handle_event(MASK)                                \
+	(MASK == IN_ACCESS)	   ? "IN_ACCESS" :        \
+	(MASK == IN_MODIFY)	   ? "IN_MODIFY" :        \
+	(MASK == IN_ATTRIB)	   ? "IN_ATTRIB" :        \
+	(MASK == IN_CLOSE)	   ? "IN_CLOSE" :         \
+	(MASK == IN_CLOSE_WRITE)   ? "IN_CLOSE_WRITE" :   \
+	(MASK == IN_CLOSE_NOWRITE) ? "IN_CLOSE_NOWRITE" : \
+	(MASK == IN_OPEN)	   ? "IN_OPEN" :          \
+	(MASK == IN_MOVED_FROM)	   ? "IN_MOVED_FROM" :    \
+	(MASK == IN_MOVED_TO)	   ? "IN_MOVED_TO" :      \
+	(MASK == IN_DELETE)	   ? "IN_DELETE" :        \
+	(MASK == IN_CREATE)	   ? "IN_CREATE" :        \
+	(MASK == IN_DELETE_SELF)   ? "IN_DELETE_SELF" :   \
+	(MASK == IN_MOVE_SELF)	   ? "IN_MOVE_SELF" :     \
+	(MASK == IN_UNMOUNT)	   ? "IN_UNMOUNT" :       \
+	(MASK == IN_Q_OVERFLOW)	   ? "IN_Q_OVERFLOW" :    \
+	(MASK == IN_IGNORED)	   ? "IN_IGNORED" :       \
+					   "UNKNOWN"
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -68,14 +69,16 @@ typedef struct {
 	int dir;
 } desc;
 
-void do_wait(void) {
+void do_wait(void)
+{
 	test_daemon();
 	test_waitsig();
 }
 
-int createFiles(char *path, char *target, char *link) {
+int createFiles(char *path, char *target, char *link)
+{
 	int fd;
-	fd = open(path,O_CREAT, 0644);
+	fd = open(path, O_CREAT, 0644);
 	if (fd < 0) {
 		pr_perror("can't open %s", path);
 		return -1;
@@ -88,18 +91,19 @@ int createFiles(char *path, char *target, char *link) {
 	return 0;
 }
 
-int addWatcher(int fd, const char *path) {
+int addWatcher(int fd, const char *path)
+{
 	int wd;
 	wd = inotify_add_watch(fd, path, IN_ALL_EVENTS | IN_DONT_FOLLOW);
 	if (wd < 0) {
-		pr_perror("inotify_add_watch(%d, %s, IN_ALL_EVENTS) failed",
-				fd, path);
+		pr_perror("inotify_add_watch(%d, %s, IN_ALL_EVENTS) failed", fd, path);
 		return -1;
 	}
 	return wd;
 }
 
-int fChmod(char *path) {
+int fChmod(char *path)
+{
 	if (chmod(path, 0755) < 0) {
 		pr_perror("chmod(%s, 0755) failed", path);
 		return -1;
@@ -107,7 +111,8 @@ int fChmod(char *path) {
 	return 0;
 }
 
-int fWriteClose(char *path) {
+int fWriteClose(char *path)
+{
 	int fd = open(path, O_RDWR | O_CREAT, 0700);
 	if (fd == -1) {
 		pr_perror("open(%s, O_RDWR|O_CREAT, 0700) failed", path);
@@ -124,10 +129,11 @@ int fWriteClose(char *path) {
 	return 0;
 }
 
-int fNoWriteClose(char *path) {
+int fNoWriteClose(char *path)
+{
 	char buf[BUF_SIZE];
 	int fd = open(path, O_RDONLY);
-	if ( fd < 0 ) {
+	if (fd < 0) {
 		pr_perror("open(%s, O_RDONLY) failed", path);
 		return -1;
 	}
@@ -143,7 +149,8 @@ int fNoWriteClose(char *path) {
 	return 0;
 }
 
-int fMove(char *from, char *to) {
+int fMove(char *from, char *to)
+{
 	if (rename(from, to) == -1) {
 		pr_perror("rename error (from: %s to: %s)", from, to);
 		return -1;
@@ -151,8 +158,9 @@ int fMove(char *from, char *to) {
 	return 0;
 }
 
-desc init_env(const char *dir, char *file_path, char *link_path) {
-	desc in_desc = {-1, -1, -1, -1};
+desc init_env(const char *dir, char *file_path, char *link_path)
+{
+	desc in_desc = { -1, -1, -1, -1 };
 	if (mkdir(dir, 0777) < 0) {
 		pr_perror("mkdir(%s)", dir);
 		return in_desc;
@@ -186,7 +194,8 @@ desc init_env(const char *dir, char *file_path, char *link_path) {
 	return in_desc;
 }
 
-int fDelete(char *path) {
+int fDelete(char *path)
+{
 	if (unlink(path) != 0) {
 		pr_perror("unlink(%s)", path);
 		return -1;
@@ -194,39 +203,34 @@ int fDelete(char *path) {
 	return 0;
 }
 
-int fRemDir(const char *target) {
-	if(rmdir(target)) {
+int fRemDir(const char *target)
+{
+	if (rmdir(target)) {
 		pr_perror("rmdir(%s)", target);
 		return -1;
 	}
 	return 0;
 }
 
-int test_actions(const char *dir, char *file_path, char *link_path) {
-
-	if (
-		fChmod(link_path) == 0 &&
-		fWriteClose(link_path) == 0 &&
-		fNoWriteClose(link_path) == 0 &&
-		fMove(file_path, filename) == 0 &&
-		fMove(filename, file_path) == 0
+int test_actions(const char *dir, char *file_path, char *link_path)
+{
+	if (fChmod(link_path) == 0 && fWriteClose(link_path) == 0 && fNoWriteClose(link_path) == 0 &&
+	    fMove(file_path, filename) == 0 && fMove(filename, file_path) == 0
 #ifndef NODEL
-		&& fDelete(file_path) == 0 &&
-		fDelete(link_path) == 0 &&
-		fRemDir(dir) == 0
+	    && fDelete(file_path) == 0 && fDelete(link_path) == 0 && fRemDir(dir) == 0
 #endif
-	)
-	{
+	) {
 		return 0;
 	}
 	return -1;
 }
 
-void dump_events(char *buf, int len) {
+void dump_events(char *buf, int len)
+{
 	int marker = 0;
 	struct inotify_event *event;
 	while (marker < len) {
-		event = (struct inotify_event *) &buf[marker];
+		event = (struct inotify_event *)&buf[marker];
 		test_msg("\t%s (%x mask, %d len", handle_event(event->mask), event->mask, event->len);
 		if (event->len)
 			test_msg(", '%s' name", event->name);
@@ -238,88 +242,85 @@ void dump_events(char *buf, int len) {
 int harmless(int mask)
 {
 	switch (mask) {
-		case IN_CLOSE_NOWRITE:
-		case IN_ATTRIB:
-			return 1;
+	case IN_CLOSE_NOWRITE:
+	case IN_ATTRIB:
+		return 1;
 	}
 	return 0;
 }
 
-int errors(int exp_len, int len, char *etalon_buf, char *buf) {
-	int marker=0;
-	int error=0;
-	while (marker < len){
+int errors(int exp_len, int len, char *etalon_buf, char *buf)
+{
+	int marker = 0;
+	int error = 0;
+	while (marker < len) {
 		struct inotify_event *event;
 		struct inotify_event *exp_event;
-		event = (struct inotify_event *) &buf[marker];
+		event = (struct inotify_event *)&buf[marker];
 		/* It's OK if some additional events are recevived */
 		if (marker < exp_len)
-			exp_event = (struct inotify_event *) &etalon_buf[marker];
+			exp_event = (struct inotify_event *)&etalon_buf[marker];
 		else {
 			if (!harmless(event->mask)) {
-				fail("got unexpected event %s (%x mask)",
-					handle_event(event->mask), event->mask);
+				fail("got unexpected event %s (%x mask)", handle_event(event->mask), event->mask);
 				error++;
 			}
 			goto next_event;
 		}
 
 		if (event->mask != exp_event->mask) {
-			fail("Handled %s (%x mask), expected %s (%x mask)",
-				handle_event(event->mask), event->mask,
-				handle_event(exp_event->mask),
-				exp_event->mask);
-				error++;
+			fail("Handled %s (%x mask), expected %s (%x mask)", handle_event(event->mask), event->mask,
+			     handle_event(exp_event->mask), exp_event->mask);
+			error++;
 		}
 		if (event->len != exp_event->len) {
 			fail("Incorrect length of field name.");
 			error++;
 			break;
 		} else if (event->len && strncmp(event->name, exp_event->name, event->len)) {
-			fail("Handled file name %s, expected %s",
-				event->name,
-				exp_event->name);
-				error++;
+			fail("Handled file name %s, expected %s", event->name, exp_event->name);
+			error++;
 		}
-next_event:
+	next_event:
 		marker += EVENT_SIZE + event->len;
 	}
 	return error;
 }
 
-int read_set(int inot_fd, char *event_set) {
+int read_set(int inot_fd, char *event_set)
+{
 	int len;
 	if ((len = read(inot_fd, event_set, EVENT_BUF_LEN)) < 0) {
-		pr_perror("read(%d, buf, %lu) failed",
-			inot_fd, (unsigned long)EVENT_BUF_LEN);
+		pr_perror("read(%d, buf, %lu) failed", inot_fd, (unsigned long)EVENT_BUF_LEN);
 		return -1;
 	}
 	return len;
 }
 
-void common_close(desc *descr) {
+void common_close(desc *descr)
+{
 	if (descr->inot > 0) {
 		close(descr->inot);
-		descr->inot=-1;
-		descr->file=-1;
-		descr->dir=-1;
-		descr->link=-1;
+		descr->inot = -1;
+		descr->file = -1;
+		descr->dir = -1;
+		descr->link = -1;
 	}
 }
 
-int get_event_set(char *event_set, int wait) {
+int get_event_set(char *event_set, int wait)
+{
 	int len;
 	char link_path[BUF_SIZE];
 	char file_path[BUF_SIZE];
 	desc common_desc;
 
 	common_desc = init_env(inot_dir, file_path, link_path);
-	if ((common_desc.inot < 0) || (common_desc.file < 0) || \
-			(common_desc.dir < 0) || (common_desc.link < 0)) {
+	if ((common_desc.inot < 0) || (common_desc.file < 0) || (common_desc.dir < 0) || (common_desc.link < 0)) {
 		common_close(&common_desc);
 		return -1;
 	}
-	if(test_actions(inot_dir, file_path, link_path) < 0) {
+	if (test_actions(inot_dir, file_path, link_path) < 0) {
 		common_close(&common_desc);
 		return -1;
 	}
@@ -329,17 +330,15 @@ int get_event_set(char *event_set, int wait) {
 	len = read_set(common_desc.inot, event_set);
 	common_close(&common_desc);
 #ifdef NODEL
-	if (! (fDelete(file_path) == 0 &&
-		fDelete(link_path) == 0 &&
-		fRemDir(inot_dir) == 0))
+	if (!(fDelete(file_path) == 0 && fDelete(link_path) == 0 && fRemDir(inot_dir) == 0))
 		return -1;
 #endif
 	return len;
 }
 
-int check(int len, char *event_set, int exp_len, char *etalon_event_set) {
-
-	if ((exp_len < 0) || (len < 0)){
+int check(int len, char *event_set, int exp_len, char *etalon_event_set)
+{
+	if ((exp_len < 0) || (len < 0)) {
 		fail("Error in preparing event sets.");
 		return -1;
 	}
@@ -358,9 +357,9 @@ int check(int len, char *event_set, int exp_len, char *etalon_event_set) {
 	return -1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
-	int exp_len=-1, len=-1;
+	int exp_len = -1, len = -1;
 	char etalon_event_set[EVENT_BUF_LEN];
 	char event_set[EVENT_BUF_LEN];
 
@@ -376,7 +375,7 @@ int main(int argc, char ** argv)
 }
 #else
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	test_init(argc, argv);
 	skip("Inotify not supported.");
diff --git a/test/zdtm/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index da400db6c..98241d816 100644
--- a/test/zdtm/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
@@ -11,61 +11,61 @@
 
 #include "zdtmtst.h"
 
-#define CLONE_NEWIPC		0x08000000
+#define CLONE_NEWIPC 0x08000000
 
-extern int msgctl (int __msqid, int __cmd, struct msqid_ds *__buf);
-extern int semctl (int __semid, int __semnum, int __cmd, ...);
-extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf);
+extern int msgctl(int __msqid, int __cmd, struct msqid_ds *__buf);
+extern int semctl(int __semid, int __semnum, int __cmd, ...);
+extern int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf);
 
 struct ipc_ids {
-	int in_use;						/* TODO: Check for 0 */
-//	unsigned short seq;
-//	unsigned short seq_max;
-//	struct rw_semaphore rw_mutex;
-//	struct idr ipcs_idr;		/* TODO */
+	int in_use; /* TODO: Check for 0 */
+	//	unsigned short seq;
+	//	unsigned short seq_max;
+	//	struct rw_semaphore rw_mutex;
+	//	struct idr ipcs_idr;		/* TODO */
 };
 
 struct ipc_ns {
-	struct ipc_ids	ids[3];
+	struct ipc_ids ids[3];
 
-	int		sem_ctls[4]; // +
-	int		used_sems;   // +
+	int sem_ctls[4]; // +
+	int used_sems; // +
 
-	int		msg_ctlmax;  // +
-	int		msg_ctlmnb;  // +
-	int		msg_ctlmni;  // +
-	int		msg_bytes;   // +
-	int		msg_hdrs;    // +
-	int		auto_msgmni; // +
-	int		msg_next_id; // +
-	int		sem_next_id; // +
-	int		shm_next_id; // +
+	int msg_ctlmax; // +
+	int msg_ctlmnb; // +
+	int msg_ctlmni; // +
+	int msg_bytes; // +
+	int msg_hdrs; // +
+	int auto_msgmni; // +
+	int msg_next_id; // +
+	int sem_next_id; // +
+	int shm_next_id; // +
 
-	size_t		shm_ctlmax;
-	size_t		shm_ctlall;
-	int		shm_ctlmni;
-	int		shm_tot;
-	int		shm_rmid_forced;
+	size_t shm_ctlmax;
+	size_t shm_ctlall;
+	int shm_ctlmni;
+	int shm_tot;
+	int shm_rmid_forced;
 
-//	struct vfsmount	*mq_mnt;
+	//	struct vfsmount	*mq_mnt;
 
-//	unsigned int    mq_queues_count;
+	//	unsigned int    mq_queues_count;
 
-	unsigned int    mq_queues_max;       /* initialized to DFLT_QUEUESMAX */
-	unsigned int    mq_msg_max;          /* initialized to DFLT_MSGMAX */
-	unsigned int    mq_msgsize_max;      /* initialized to DFLT_MSGSIZEMAX */
-	unsigned int    mq_msg_default;      /* initialized to DFLT_MSG */
-	unsigned int    mq_msgsize_default;  /* initialized to DFLT_MSGSIZE */
+	unsigned int mq_queues_max; /* initialized to DFLT_QUEUESMAX */
+	unsigned int mq_msg_max; /* initialized to DFLT_MSGMAX */
+	unsigned int mq_msgsize_max; /* initialized to DFLT_MSGSIZEMAX */
+	unsigned int mq_msg_default; /* initialized to DFLT_MSG */
+	unsigned int mq_msgsize_default; /* initialized to DFLT_MSGSIZE */
 
 	struct user_ns *user_ns;
 };
 
-#define IPC_SEM_IDS		0
-#define IPC_MSG_IDS		1
-#define IPC_SHM_IDS		2
+#define IPC_SEM_IDS 0
+#define IPC_MSG_IDS 1
+#define IPC_SHM_IDS 2
 
-const char *test_doc	= "Check that ipc ns context migrated successfully";
-const char *test_author	= "Stanislav Kinsbursky <skinsbursky@parallels.com>";
+const char *test_doc = "Check that ipc ns context migrated successfully";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@parallels.com>";
 
 struct ipc_ns ipc_before, ipc_after;
 
@@ -111,32 +111,26 @@ static int get_messages_info(struct ipc_ns *ipc)
 	ipc->msg_hdrs = info.msgmap;
 	ipc->ids[IPC_MSG_IDS].in_use = info.msgpool;
 
-	if (read_ipc_sysctl("/proc/sys/kernel/auto_msgmni",
-			&ipc->auto_msgmni, sizeof(ipc->auto_msgmni)))
+	if (read_ipc_sysctl("/proc/sys/kernel/auto_msgmni", &ipc->auto_msgmni, sizeof(ipc->auto_msgmni)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/kernel/msg_next_id",
-			&ipc->msg_next_id, sizeof(ipc->msg_next_id)))
+	if (read_ipc_sysctl("/proc/sys/kernel/msg_next_id", &ipc->msg_next_id, sizeof(ipc->msg_next_id)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/kernel/sem_next_id",
-			&ipc->sem_next_id, sizeof(ipc->sem_next_id)))
+	if (read_ipc_sysctl("/proc/sys/kernel/sem_next_id", &ipc->sem_next_id, sizeof(ipc->sem_next_id)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/kernel/shm_next_id",
-			&ipc->shm_next_id, sizeof(ipc->shm_next_id)))
+	if (read_ipc_sysctl("/proc/sys/kernel/shm_next_id", &ipc->shm_next_id, sizeof(ipc->shm_next_id)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/fs/mqueue/queues_max",
-			(int *)&ipc->mq_queues_max, sizeof(ipc->mq_queues_max)))
+	if (read_ipc_sysctl("/proc/sys/fs/mqueue/queues_max", (int *)&ipc->mq_queues_max, sizeof(ipc->mq_queues_max)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msg_max",
-			(int *)&ipc->mq_msg_max, sizeof(ipc->mq_msg_max)))
+	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msg_max", (int *)&ipc->mq_msg_max, sizeof(ipc->mq_msg_max)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_max",
-			(int *)&ipc->mq_msgsize_max, sizeof(ipc->mq_msgsize_max)))
+	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_max", (int *)&ipc->mq_msgsize_max,
+			    sizeof(ipc->mq_msgsize_max)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msg_default",
-			(int *)&ipc->mq_msg_default, sizeof(ipc->mq_msg_default)))
+	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msg_default", (int *)&ipc->mq_msg_default,
+			    sizeof(ipc->mq_msg_default)))
 		return -1;
-	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_default",
-			(int *)&ipc->mq_msgsize_default, sizeof(ipc->mq_msgsize_default)))
+	if (read_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_default", (int *)&ipc->mq_msgsize_default,
+			    sizeof(ipc->mq_msgsize_default)))
 		return -1;
 
 	return 0;
@@ -185,14 +179,12 @@ static int get_shared_memory_info(struct ipc_ns *ipc)
 	ipc->shm_tot = u.shminfo.shm_tot;
 	ipc->ids[IPC_SHM_IDS].in_use = u.shminfo.used_ids;
 
-	if (read_ipc_sysctl("/proc/sys/kernel/shm_rmid_forced",
-			&ipc->shm_rmid_forced, sizeof(ipc->shm_rmid_forced)))
+	if (read_ipc_sysctl("/proc/sys/kernel/shm_rmid_forced", &ipc->shm_rmid_forced, sizeof(ipc->shm_rmid_forced)))
 		return -1;
 
 	return 0;
 }
 
-
 int fill_ipc_ns(struct ipc_ns *ipc)
 {
 	int ret;
@@ -238,7 +230,7 @@ static int rand_ipc_sysctl(char *name, unsigned int val)
 	return 0;
 }
 
-#define MAX_MNI (1<<15)
+#define MAX_MNI (1 << 15)
 
 static int rand_ipc_sem(void)
 {
@@ -252,8 +244,8 @@ static int rand_ipc_sem(void)
 		pr_perror("Can't open %s", name);
 		return fd;
 	}
-	sprintf(buf, "%d %d %d %d\n", (unsigned) lrand48(), (unsigned) lrand48(),
-				      (unsigned) lrand48(), (unsigned) lrand48() % MAX_MNI);
+	sprintf(buf, "%d %d %d %d\n", (unsigned)lrand48(), (unsigned)lrand48(), (unsigned)lrand48(),
+		(unsigned)lrand48() % MAX_MNI);
 	ret = write(fd, buf, 128);
 	if (ret < 0) {
 		pr_perror("Can't write %s", name);
@@ -291,17 +283,18 @@ static int rand_ipc_ns(void)
 	if (!ret)
 		ret = rand_ipc_sysctl("/proc/sys/kernel/shm_rmid_forced", (unsigned)lrand48() & 1);
 
-
 	if (!ret)
 		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/queues_max", (((unsigned)lrand48()) % 1023) + 1);
 	if (!ret)
 		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msg_max", ((unsigned)lrand48() % 65536) + 1);
 	if (!ret)
-		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_max", ((unsigned)lrand48() & (8192 * 128 - 1)) | 128);
+		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_max",
+				      ((unsigned)lrand48() & (8192 * 128 - 1)) | 128);
 	if (!ret)
 		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msg_default", ((unsigned)lrand48() % 65536) + 1);
 	if (!ret)
-		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_default", ((unsigned)lrand48() & (8192 * 128 - 1)) | 128);
+		ret = rand_ipc_sysctl("/proc/sys/fs/mqueue/msgsize_default",
+				      ((unsigned)lrand48() & (8192 * 128 - 1)) | 128);
 
 	if (ret < 0)
 		pr_err("Failed to randomize ipc namespace tunables\n");
@@ -315,65 +308,45 @@ static void show_ipc_entry(struct ipc_ns *old, struct ipc_ns *new)
 
 	for (i = 0; i < 3; i++) {
 		if (old->ids[i].in_use != new->ids[i].in_use)
-			pr_err("ids[%d].in_use differs: %d ---> %d\n", i,
-				old->ids[i].in_use, new->ids[i].in_use);
-
+			pr_err("ids[%d].in_use differs: %d ---> %d\n", i, old->ids[i].in_use, new->ids[i].in_use);
 	}
 	for (i = 0; i < 4; i++) {
 		if (old->sem_ctls[i] != new->sem_ctls[i])
-			pr_err("sem_ctls[%d] differs: %d ---> %d\n", i,
-				old->sem_ctls[i], new->sem_ctls[i]);
-
+			pr_err("sem_ctls[%d] differs: %d ---> %d\n", i, old->sem_ctls[i], new->sem_ctls[i]);
 	}
 
 	if (old->msg_ctlmax != new->msg_ctlmax)
-		pr_err("msg_ctlmax differs: %d ---> %d\n",
-			old->msg_ctlmax, new->msg_ctlmax);
+		pr_err("msg_ctlmax differs: %d ---> %d\n", old->msg_ctlmax, new->msg_ctlmax);
 	if (old->msg_ctlmnb != new->msg_ctlmnb)
-		pr_err("msg_ctlmnb differs: %d ---> %d\n",
-			old->msg_ctlmnb, new->msg_ctlmnb);
+		pr_err("msg_ctlmnb differs: %d ---> %d\n", old->msg_ctlmnb, new->msg_ctlmnb);
 	if (old->msg_ctlmni != new->msg_ctlmni)
-		pr_err("msg_ctlmni differs: %d ---> %d\n",
-			old->msg_ctlmni, new->msg_ctlmni);
+		pr_err("msg_ctlmni differs: %d ---> %d\n", old->msg_ctlmni, new->msg_ctlmni);
 	if (old->auto_msgmni != new->auto_msgmni)
-		pr_err("auto_msgmni differs: %d ---> %d\n",
-			old->auto_msgmni, new->auto_msgmni);
+		pr_err("auto_msgmni differs: %d ---> %d\n", old->auto_msgmni, new->auto_msgmni);
 	if (old->msg_next_id != new->msg_next_id)
-		pr_err("msg_next_id differs: %d ---> %d\n",
-			old->msg_next_id, new->msg_next_id);
+		pr_err("msg_next_id differs: %d ---> %d\n", old->msg_next_id, new->msg_next_id);
 	if (old->sem_next_id != new->sem_next_id)
-		pr_err("sem_next_id differs: %d ---> %d\n",
-			old->sem_next_id, new->sem_next_id);
+		pr_err("sem_next_id differs: %d ---> %d\n", old->sem_next_id, new->sem_next_id);
 	if (old->shm_next_id != new->shm_next_id)
-		pr_err("shm_next_id differs: %d ---> %d\n",
-			old->shm_next_id, new->shm_next_id);
+		pr_err("shm_next_id differs: %d ---> %d\n", old->shm_next_id, new->shm_next_id);
 	if (old->shm_ctlmax != new->shm_ctlmax)
-		pr_err("shm_ctlmax differs: %zu ---> %zu\n",
-			old->shm_ctlmax, new->shm_ctlmax);
+		pr_err("shm_ctlmax differs: %zu ---> %zu\n", old->shm_ctlmax, new->shm_ctlmax);
 	if (old->shm_ctlall != new->shm_ctlall)
-		pr_err("shm_ctlall differs: %zu ---> %zu\n",
-			old->shm_ctlall, new->shm_ctlall);
+		pr_err("shm_ctlall differs: %zu ---> %zu\n", old->shm_ctlall, new->shm_ctlall);
 	if (old->shm_ctlmni != new->shm_ctlmni)
-		pr_err("shm_ctlmni differs: %d ---> %d\n",
-			old->shm_ctlmni, new->shm_ctlmni);
+		pr_err("shm_ctlmni differs: %d ---> %d\n", old->shm_ctlmni, new->shm_ctlmni);
 	if (old->shm_rmid_forced != new->shm_rmid_forced)
-		pr_err("shm_rmid_forced differs: %d ---> %d\n",
-			old->shm_rmid_forced, new->shm_rmid_forced);
+		pr_err("shm_rmid_forced differs: %d ---> %d\n", old->shm_rmid_forced, new->shm_rmid_forced);
 	if (old->mq_queues_max != new->mq_queues_max)
-		pr_err("mq_queues_max differs: %d ---> %d\n",
-			old->mq_queues_max, new->mq_queues_max);
+		pr_err("mq_queues_max differs: %d ---> %d\n", old->mq_queues_max, new->mq_queues_max);
 	if (old->mq_msg_max != new->mq_msg_max)
-		pr_err("mq_msg_max differs: %d ---> %d\n",
-			old->mq_msg_max, new->mq_msg_max);
+		pr_err("mq_msg_max differs: %d ---> %d\n", old->mq_msg_max, new->mq_msg_max);
 	if (old->mq_msgsize_max != new->mq_msgsize_max)
-		pr_err("mq_msgsize_max differs: %d ---> %d\n",
-			old->mq_msgsize_max, new->mq_msgsize_max);
+		pr_err("mq_msgsize_max differs: %d ---> %d\n", old->mq_msgsize_max, new->mq_msgsize_max);
 	if (old->mq_msg_default != new->mq_msg_default)
-		pr_err("mq_msg_default differs: %d ---> %d\n",
-			old->mq_msg_default, new->mq_msg_default);
+		pr_err("mq_msg_default differs: %d ---> %d\n", old->mq_msg_default, new->mq_msg_default);
 	if (old->mq_msgsize_default != new->mq_msgsize_default)
-		pr_err("mq_msgsize_default differs: %d ---> %d\n",
-			old->mq_msgsize_default, new->mq_msgsize_default);
+		pr_err("mq_msgsize_default differs: %d ---> %d\n", old->mq_msgsize_default, new->mq_msgsize_default);
 }
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/jobctl00.c b/test/zdtm/static/jobctl00.c
index a14c4a768..e842d418e 100644
--- a/test/zdtm/static/jobctl00.c
+++ b/test/zdtm/static/jobctl00.c
@@ -9,24 +9,27 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that job control migrates correctly";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that job control migrates correctly";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
-#define JOBS_DEF	8
-#define JOBS_MAX	64
+#define JOBS_DEF 8
+#define JOBS_MAX 64
 unsigned int num_jobs = JOBS_DEF;
-TEST_OPTION(num_jobs, uint, "# \"jobs\" in a \"shell\" "
-	    "(default " __stringify(JOBS_DEF)
-	    ", max " __stringify(JOBS_MAX) ")", 0);
+TEST_OPTION(num_jobs, uint,
+	    "# \"jobs\" in a \"shell\" "
+	    "(default " __stringify(JOBS_DEF) ", max " __stringify(JOBS_MAX) ")",
+	    0);
 
-#define PROCS_DEF	4
+#define PROCS_DEF 4
 unsigned int num_procs = PROCS_DEF;
-TEST_OPTION(num_procs, uint, "# processes in a \"job\" "
-	    "(default " __stringify(PROCS_DEF) ")", 0);
+TEST_OPTION(num_procs, uint,
+	    "# processes in a \"job\" "
+	    "(default " __stringify(PROCS_DEF) ")",
+	    0);
 
 static const char wr_string[] = "All you need is love!\n";
 static const char rd_string[] = "We all live in a yellow submarine\n";
-static const char susp_char = '\032';	/* ^Z */
+static const char susp_char = '\032'; /* ^Z */
 
 static volatile sig_atomic_t signo = 0;
 
@@ -47,12 +50,12 @@ static int wait4sig(int sig)
 	sigset_t mask, oldmask;
 	sigemptyset(&mask);
 	sigaddset(&mask, sig);
-	sigaddset(&mask, SIGCHLD);	/* to see our children die */
+	sigaddset(&mask, SIGCHLD); /* to see our children die */
 
 	sigprocmask(SIG_BLOCK, &mask, &oldmask);
 	while (!signo)
-		sigsuspend (&oldmask);
-	sigprocmask (SIG_UNBLOCK, &mask, NULL);
+		sigsuspend(&oldmask);
+	sigprocmask(SIG_UNBLOCK, &mask, NULL);
 
 	return signo != sig;
 }
@@ -68,8 +71,7 @@ static int is_fg(void)
 static int reader(int sig)
 {
 	char str[sizeof(rd_string) + 1];
-	return read(0, str, sizeof(str)) < 0 ||
-		strcmp(str, rd_string);
+	return read(0, str, sizeof(str)) < 0 || strcmp(str, rd_string);
 }
 
 static int post_reader(int fd)
@@ -107,30 +109,30 @@ static struct job_type {
 	int (*action)(int sig);
 	int (*post)(int fd);
 } job_types[] = {
-	{ SIGTTOU,	writer,		post_writer },
-	{ SIGTTIN,	reader,		post_reader },
-	{ SIGCONT,	wait4sig,	NULL },
+	{ SIGTTOU, writer, post_writer },
+	{ SIGTTIN, reader, post_reader },
+	{ SIGCONT, wait4sig, NULL },
 };
 
 static int process(int (*action)(int), int sig)
 {
 	int ret;
-	if (is_fg())		/* we must be in background on entry */
+	if (is_fg()) /* we must be in background on entry */
 		return 1;
 
 	if (signal(sig, record_and_raise_sig) == SIG_ERR)
 		return 2;
 
-	kill(getppid(), SIGUSR2);	/* tell the parent we're ready */
+	kill(getppid(), SIGUSR2); /* tell the parent we're ready */
 
-	ret = action(sig);	/* will be busy doing nothing for the duration of migration */
+	ret = action(sig); /* will be busy doing nothing for the duration of migration */
 	if (ret)
 		return 3;
 
-	if (!is_fg())		/* we must be in foreground now */
+	if (!is_fg()) /* we must be in foreground now */
 		return 4;
 
-	ret = signo != sig;	/* have we got the desired signal? */
+	ret = signo != sig; /* have we got the desired signal? */
 
 	test_waitsig();
 	return ret;
@@ -144,22 +146,22 @@ static int job(int (*action)(int), int sig)
 		return 1;
 
 	for (i = num_procs; i; i--) {
-		pid_t pid  = fork();
+		pid_t pid = fork();
 		if (pid < 0)
-			kill(0, SIGKILL);	/* kill the whole job */
+			kill(0, SIGKILL); /* kill the whole job */
 
 		if (pid == 0)
 			/* the last is worker, others are sleepers */
-			exit(process(i == 1 ?  action : wait4sig, sig));
+			exit(process(i == 1 ? action : wait4sig, sig));
 
 		/* wait for the child to grow up before going to next one
 		 * ignore return code as the child may get stopped and SIGCHILD
 		 * us */
 		wait4sig(SIGUSR2);
-		signo = 0;	/* rearm sighandler */
+		signo = 0; /* rearm sighandler */
 	}
 
-	kill(getppid(), SIGUSR2);	/* tell the parent we're ready */
+	kill(getppid(), SIGUSR2); /* tell the parent we're ready */
 
 	/* we (or our children) will get suspended somehow here, so the rest
 	 * will hopefully happen after migration */
@@ -195,8 +197,7 @@ int start_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 
 	/* the children will signal readiness via SIGUSR2 or get stopped (or
 	 * exit :) and signal that via SIGCHLD */
-	if (signal(SIGUSR2, record_sig) == SIG_ERR ||
-	    signal(SIGCHLD, record_sig) == SIG_ERR) {
+	if (signal(SIGUSR2, record_sig) == SIG_ERR || signal(SIGCHLD, record_sig) == SIG_ERR) {
 		pr_perror("can't install signal handler");
 		return -1;
 	}
@@ -205,7 +206,7 @@ int start_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 		int jtno = i % (sizeof(job_types) / sizeof(job_types[0]));
 
 		jobs[i] = fork();
-		if (jobs[i] < 0) {	/* we're busted - bail out */
+		if (jobs[i] < 0) { /* we're busted - bail out */
 			pr_perror("fork failed");
 			goto killout;
 		}
@@ -222,7 +223,7 @@ int start_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 
 		/* wait for the child to grow up before proceeding */
 		wait4sig(SIGUSR2);
-		signo = 0;	/* rearm sighandler */
+		signo = 0; /* rearm sighandler */
 	}
 
 	return 0;
@@ -236,7 +237,7 @@ int finish_jobs(pid_t *jobs, int njobs, int fdmaster, int fdslave)
 {
 	int i;
 
-	for (i = num_jobs; i--; ) {
+	for (i = num_jobs; i--;) {
 		int ret;
 		int jtno = i % (sizeof(job_types) / sizeof(job_types[0]));
 
@@ -265,7 +266,7 @@ killout:
 	return -1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fdmaster, fdslave;
 	pid_t jobs[JOBS_MAX] = {};
diff --git a/test/zdtm/static/link10.c b/test/zdtm/static/link10.c
index 9deb4a127..a0a00d661 100644
--- a/test/zdtm/static/link10.c
+++ b/test/zdtm/static/link10.c
@@ -9,13 +9,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Migrate two hardlinked, open, and unlinked files";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Migrate two hardlinked, open, and unlinked files";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd, fd2 = 0;
 	struct stat stat, stat2;
@@ -23,8 +23,7 @@ int main(int argc, char ** argv)
 
 	test_init(argc, argv);
 
-	if (snprintf(filename2, sizeof(filename2), "%s.lnk", filename) >=
-	    sizeof(filename2)) {
+	if (snprintf(filename2, sizeof(filename2), "%s.lnk", filename) >= sizeof(filename2)) {
 		pr_perror("filename %s is too long", filename);
 		exit(1);
 	}
@@ -57,11 +56,9 @@ int main(int argc, char ** argv)
 		goto out;
 	}
 
-	if (stat.st_ino != stat2.st_ino ||
-	    stat.st_dev != stat2.st_dev) {
-		fail("files are different: st_ino %lu != %lu or st_dev %lu != %lu",
-		     (long unsigned)stat.st_ino, (long unsigned)stat2.st_ino,
-		     (long unsigned)stat.st_dev, (long unsigned)stat2.st_dev);
+	if (stat.st_ino != stat2.st_ino || stat.st_dev != stat2.st_dev) {
+		fail("files are different: st_ino %lu != %lu or st_dev %lu != %lu", (long unsigned)stat.st_ino,
+		     (long unsigned)stat2.st_ino, (long unsigned)stat.st_dev, (long unsigned)stat2.st_dev);
 	}
 
 	pass();
diff --git a/test/zdtm/static/loginuid.c b/test/zdtm/static/loginuid.c
index dc27eeef3..dcd6ce04b 100644
--- a/test/zdtm/static/loginuid.c
+++ b/test/zdtm/static/loginuid.c
@@ -66,7 +66,6 @@ int set_loginuid(const char *path, uid_t value)
 	return ret;
 }
 
-
 int main(int argc, char *argv[])
 {
 	int ret;
@@ -89,8 +88,7 @@ int main(int argc, char *argv[])
 		return -1;
 
 	if (new_loginuid != test_value) {
-		fail("loginuid value %d is different after restore: %d",
-				test_value, new_loginuid);
+		fail("loginuid value %d is different after restore: %d", test_value, new_loginuid);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/macvlan.c b/test/zdtm/static/macvlan.c
index 0d5feb233..1c78807c8 100644
--- a/test/zdtm/static/macvlan.c
+++ b/test/zdtm/static/macvlan.c
@@ -13,11 +13,11 @@
 #include <net/if.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "check that macvlan interfaces are c/r'd correctly";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "check that macvlan interfaces are c/r'd correctly";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #define BRIDGE_NAME "zdtmbr0"
-#define IF_NAME "zdtmmvlan0"
+#define IF_NAME	    "zdtmmvlan0"
 
 static bool wait_for_macvlan(void)
 {
diff --git a/test/zdtm/static/maps00.c b/test/zdtm/static/maps00.c
index 9ed248d4d..10a4cac79 100644
--- a/test/zdtm/static/maps00.c
+++ b/test/zdtm/static/maps00.c
@@ -10,9 +10,9 @@
 #include <sys/stat.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create all sorts of maps and compare /proc/pid/maps\n"
-					   "before and after migration\n";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Create all sorts of maps and compare /proc/pid/maps\n"
+		       "before and after migration\n";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -23,9 +23,9 @@ const static int map_prots[] = {
 	PROT_READ | PROT_WRITE,
 	PROT_READ | PROT_WRITE | PROT_EXEC,
 };
-#define NUM_MPROTS	sizeof(map_prots) / sizeof(int)
-#define RW_PROT(x)	((x) & (PROT_READ | PROT_WRITE))
-#define X_PROT(x)	((x) & PROT_EXEC)
+#define NUM_MPROTS sizeof(map_prots) / sizeof(int)
+#define RW_PROT(x) ((x) & (PROT_READ | PROT_WRITE))
+#define X_PROT(x)  ((x)&PROT_EXEC)
 
 int check_prot(int src_prot, int dst_prot)
 {
@@ -37,21 +37,15 @@ int check_prot(int src_prot, int dst_prot)
 	 **
 	 * A is a subset of B iff (A & B) == A
 	 */
-	 return (X_PROT(dst_prot) & X_PROT(src_prot)) == X_PROT(dst_prot);
+	return (X_PROT(dst_prot) & X_PROT(src_prot)) == X_PROT(dst_prot);
 }
 
-const static int map_flags[] = {
-	MAP_PRIVATE,
-	MAP_SHARED,
-	MAP_PRIVATE | MAP_ANONYMOUS,
-	MAP_SHARED | MAP_ANONYMOUS
-};
-#define NUM_MFLAGS	sizeof(map_flags) / sizeof(int)
-#define NUM_MAPS	NUM_MPROTS * NUM_MFLAGS
-#define ONE_MAP_SIZE	0x2000
+const static int map_flags[] = { MAP_PRIVATE, MAP_SHARED, MAP_PRIVATE | MAP_ANONYMOUS, MAP_SHARED | MAP_ANONYMOUS };
+#define NUM_MFLAGS   sizeof(map_flags) / sizeof(int)
+#define NUM_MAPS     NUM_MPROTS *NUM_MFLAGS
+#define ONE_MAP_SIZE 0x2000
 
-struct map
-{
+struct map {
 	int prot;
 	int prot_real;
 	int flag;
@@ -75,8 +69,7 @@ static int make_map(struct map *map)
 
 	if (!(map->flag & MAP_ANONYMOUS)) {
 		/* need file */
-		if (snprintf(map->filename, sizeof(map->filename),
-					 "%s-%02d", filename, i++) >= sizeof(map->filename)) {
+		if (snprintf(map->filename, sizeof(map->filename), "%s-%02d", filename, i++) >= sizeof(map->filename)) {
 			pr_perror("filename %s is too long", filename);
 			return -1;
 		}
@@ -107,13 +100,12 @@ static int make_map(struct map *map)
 		datagen(map->ptr, ONE_MAP_SIZE, &crc);
 	}
 
-	test_msg("map: ptr %p flag %8x prot %8x\n",
-		 map->ptr, map->flag, map->prot);
+	test_msg("map: ptr %p flag %8x prot %8x\n", map->ptr, map->flag, map->prot);
 
 	return 0;
 }
 
-static sigjmp_buf segv_ret;		/* we need sig*jmp stuff, otherwise SIGSEGV will reset our handler */
+static sigjmp_buf segv_ret; /* we need sig*jmp stuff, otherwise SIGSEGV will reset our handler */
 static void segfault(int signo)
 {
 	siglongjmp(segv_ret, 1);
@@ -131,19 +123,16 @@ static int check_map(struct map *map)
 {
 	int prot = PROT_WRITE | PROT_READ | PROT_EXEC;
 
-	if (signal(SIGSEGV, segfault) == SIG_ERR)
-	{
+	if (signal(SIGSEGV, segfault) == SIG_ERR) {
 		fail("setting SIGSEGV handler failed");
 		return -1;
 	}
-	if (!sigsetjmp(segv_ret, 1))
-	{
+	if (!sigsetjmp(segv_ret, 1)) {
 		uint32_t crc = ~0;
-		if (datachk(map->ptr, ONE_MAP_SIZE, &crc))	/* perform read access */
+		if (datachk(map->ptr, ONE_MAP_SIZE, &crc)) /* perform read access */
 			if (!(map->flag & MAP_ANONYMOUS) ||
-					(map->prot & PROT_WRITE)) {	/* anon maps could only be filled when r/w */
-				fail("CRC mismatch: ptr %p flag %8x prot %8x",
-				     map->ptr, map->flag, map->prot);
+			    (map->prot & PROT_WRITE)) { /* anon maps could only be filled when r/w */
+				fail("CRC mismatch: ptr %p flag %8x prot %8x", map->ptr, map->flag, map->prot);
 				return -1;
 			}
 		/* prot |= PROT_READ//	need barrier before this line,
@@ -152,33 +141,29 @@ static int check_map(struct map *map)
 	} else
 		prot &= PROT_WRITE | !PROT_READ | PROT_EXEC;
 
-	if (signal(SIGSEGV, segfault) == SIG_ERR)
-	{
+	if (signal(SIGSEGV, segfault) == SIG_ERR) {
 		fail("setting SIGSEGV handler failed");
 		return -1;
 	}
 
-	if (!sigsetjmp(segv_ret, 1))
-	{
-		* (int *) (map->ptr) = 1234;	/* perform write access */
+	if (!sigsetjmp(segv_ret, 1)) {
+		*(int *)(map->ptr) = 1234; /* perform write access */
 	} else
 		prot &= !PROT_WRITE | PROT_READ | PROT_EXEC;
 
-	if (signal(SIGSEGV, segfault) == SIG_ERR)
-	{
+	if (signal(SIGSEGV, segfault) == SIG_ERR) {
 		fail("restoring SIGSEGV handler failed");
 		return -1;
 	}
 
-	if (!sigsetjmp(segv_ret, 1))
-	{
+	if (!sigsetjmp(segv_ret, 1)) {
 		if (map->prot & PROT_WRITE) {
-			memcpy(map->ptr,test_func, getpagesize());
+			memcpy(map->ptr, test_func, getpagesize());
 		} else {
 			if (!(map->flag & MAP_ANONYMOUS)) {
 				uint8_t funlen = (uint8_t *)check_map - (uint8_t *)test_func;
-				lseek(map->fd,0,SEEK_SET);
-				if (write(map->fd,test_func,funlen)<funlen) {
+				lseek(map->fd, 0, SEEK_SET);
+				if (write(map->fd, test_func, funlen) < funlen) {
 					pr_perror("failed to write %s", map->filename);
 					return -1;
 				}
@@ -186,7 +171,7 @@ static int check_map(struct map *map)
 		}
 		if (!(map->flag & MAP_ANONYMOUS) || map->prot & PROT_WRITE)
 			/* Function body has been copied into the mapping */
-			((int (*)(void))map->ptr)();	/* perform exec access */
+			((int (*)(void))map->ptr)(); /* perform exec access */
 		else
 			/* No way to copy function body into mapping,
 			 * clear exec bit from effective protection
@@ -195,8 +180,7 @@ static int check_map(struct map *map)
 	} else
 		prot &= PROT_WRITE | PROT_READ | !PROT_EXEC;
 
-	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR)
-	{
+	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
 		fail("restoring SIGSEGV handler failed");
 		return -1;
 	}
@@ -208,17 +192,15 @@ static void destroy_map(struct map *map)
 {
 	munmap(map->ptr, ONE_MAP_SIZE);
 
-	if (map->fd >= 0)
-	{
+	if (map->fd >= 0) {
 		close(map->fd);
 		unlink(map->filename);
 	}
 }
 
+#define MAPS_LEN 0x10000
 
-#define MAPS_LEN	0x10000
-
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	struct map maps[NUM_MAPS] = {}, maps_compare[NUM_MAPS] = {};
 	int i, j, k;
@@ -237,22 +219,22 @@ int main(int argc, char ** argv)
 	test_waitsig();
 
 	for (i = 0; i < NUM_MAPS; i++)
-		if ((maps[i].prot_real=check_map(maps + i))<0)
+		if ((maps[i].prot_real = check_map(maps + i)) < 0)
 			goto err;
-	k=0;
+	k = 0;
 	for (i = 0; i < NUM_MPROTS; i++)
 		for (j = 0; j < NUM_MFLAGS; j++)
 			init_map(maps_compare + k++, i, j);
 	for (i = 0; i < NUM_MAPS; i++)
-		if (make_map(maps_compare+ i))
+		if (make_map(maps_compare + i))
 			goto err;
 	for (i = 0; i < NUM_MAPS; i++)
-		if ((maps_compare[i].prot_real=check_map(maps_compare + i))<0)
+		if ((maps_compare[i].prot_real = check_map(maps_compare + i)) < 0)
 			goto err;
-	for (i = 0; i< NUM_MAPS; i++)
-		if (!check_prot(maps[i].prot_real, maps_compare[i].prot_real)){
-			fail("protection on %i (flag=%d prot=%d) maps has changed (prot=%d(expected %d))",
-				i, maps[i].flag, maps[i].prot, maps[i].prot_real, maps_compare[i].prot_real);
+	for (i = 0; i < NUM_MAPS; i++)
+		if (!check_prot(maps[i].prot_real, maps_compare[i].prot_real)) {
+			fail("protection on %i (flag=%d prot=%d) maps has changed (prot=%d(expected %d))", i,
+			     maps[i].flag, maps[i].prot, maps[i].prot_real, maps_compare[i].prot_real);
 			goto err;
 		}
 
diff --git a/test/zdtm/static/maps01.c b/test/zdtm/static/maps01.c
index 2bb465a25..9b8019ee2 100644
--- a/test/zdtm/static/maps01.c
+++ b/test/zdtm/static/maps01.c
@@ -11,15 +11,15 @@
 #include <linux/limits.h>
 #include "zdtmtst.h"
 
-#define MEM_SIZE (1LU << 30)
-#define MEM_OFFSET (1LU << 29)
+#define MEM_SIZE    (1LU << 30)
+#define MEM_OFFSET  (1LU << 29)
 #define MEM_OFFSET2 (MEM_SIZE - PAGE_SIZE)
 #define MEM_OFFSET3 (20LU * PAGE_SIZE)
 
-const char *test_doc	= "Test shared memory";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org";
+const char *test_doc = "Test shared memory";
+const char *test_author = "Andrew Vagin <avagin@openvz.org";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	void *m, *m2, *p, *p2;
 	char path[PATH_MAX];
@@ -32,28 +32,23 @@ int main(int argc, char ** argv)
 
 	task_waiter_init(&t);
 
-	m = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ,
-				MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	m = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 
 	if (m == MAP_FAILED) {
-		pr_perror("Failed to mmap %lu Mb shared anonymous R/W memory",
-				MEM_SIZE >> 20);
+		pr_perror("Failed to mmap %lu Mb shared anonymous R/W memory", MEM_SIZE >> 20);
 		goto err;
 	}
 
-	p = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ,
-				MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	p = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 
 	if (p == MAP_FAILED) {
-		pr_perror("Failed to mmap %ld Mb shared anonymous R/W memory",
-				MEM_SIZE >> 20);
+		pr_perror("Failed to mmap %ld Mb shared anonymous R/W memory", MEM_SIZE >> 20);
 		goto err;
 	}
 
 	p2 = mmap(NULL, MEM_OFFSET, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (p2 == MAP_FAILED) {
-		pr_perror("Failed to mmap %lu Mb anonymous memory",
-				MEM_OFFSET >> 20);
+		pr_perror("Failed to mmap %lu Mb anonymous memory", MEM_OFFSET >> 20);
 		goto err;
 	}
 
@@ -64,11 +59,9 @@ int main(int argc, char ** argv)
 	} else if (pid == 0) {
 		void *p3;
 
-		p3 = mmap(NULL, MEM_OFFSET3, PROT_READ | PROT_WRITE,
-					MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+		p3 = mmap(NULL, MEM_OFFSET3, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 		if (p3 == MAP_FAILED) {
-			pr_perror("Failed to mmap %lu Mb anonymous R/W memory",
-					MEM_OFFSET3 >> 20);
+			pr_perror("Failed to mmap %lu Mb anonymous R/W memory", MEM_OFFSET3 >> 20);
 			goto err;
 		}
 
@@ -122,9 +115,7 @@ int main(int argc, char ** argv)
 	if (p2 == MAP_FAILED)
 		goto err;
 
-	snprintf(path, PATH_MAX, "/proc/self/map_files/%lx-%lx",
-						(unsigned long) m,
-						(unsigned long) m + MEM_SIZE);
+	snprintf(path, PATH_MAX, "/proc/self/map_files/%lx-%lx", (unsigned long)m, (unsigned long)m + MEM_SIZE);
 	fd = open(path, O_RDWR);
 	if (fd == -1) {
 		pr_perror("Can't open file %s", path);
diff --git a/test/zdtm/static/maps02.c b/test/zdtm/static/maps02.c
index eb7c09bdc..29f1372c9 100644
--- a/test/zdtm/static/maps02.c
+++ b/test/zdtm/static/maps02.c
@@ -3,26 +3,25 @@
 #include "get_smaps_bits.h"
 
 #ifndef MADV_DONTDUMP
-#define MADV_DONTDUMP   16
+#define MADV_DONTDUMP 16
 #endif
 
-const char *test_doc	= "Test shared memory with advises";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Test shared memory with advises";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 struct mmap_data {
-	void		*start;
-	unsigned long	orig_flags;
-	unsigned long	orig_madv;
-	unsigned long	new_flags;
-	unsigned long	new_madv;
+	void *start;
+	unsigned long orig_flags;
+	unsigned long orig_madv;
+	unsigned long new_flags;
+	unsigned long new_madv;
 };
 
 #define MEM_SIZE (8192)
 
 static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 {
-	m->start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE,
-			flags, -1, 0);
+	m->start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, flags, -1, 0);
 	if (m->start == MAP_FAILED) {
 		pr_perror("mmap failed");
 		return -1;
@@ -32,7 +31,7 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 		if (errno == EINVAL) {
 			test_msg("madvise failed, no kernel support\n");
 			munmap(m->start, MEM_SIZE);
-			*m = (struct mmap_data){ };
+			*m = (struct mmap_data){};
 		} else {
 			pr_perror("madvise failed");
 			return -1;
@@ -44,7 +43,7 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 
 int main(int argc, char **argv)
 {
-	struct mmap_data m[5] = { };
+	struct mmap_data m[5] = {};
 	size_t i;
 
 	test_init(argc, argv);
@@ -70,10 +69,8 @@ int main(int argc, char **argv)
 		return -1;
 
 	test_msg("Fetch existing flags/adv\n");
-	for (i = 0; i < sizeof(m)/sizeof(m[0]); i++) {
-		if (get_smaps_bits((unsigned long)m[i].start,
-				   &m[i].orig_flags,
-				   &m[i].orig_madv))
+	for (i = 0; i < sizeof(m) / sizeof(m[0]); i++) {
+		if (get_smaps_bits((unsigned long)m[i].start, &m[i].orig_flags, &m[i].orig_madv))
 			return -1;
 	}
 
@@ -81,28 +78,23 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	test_msg("Fetch restored flags/adv\n");
-	for (i = 0; i < sizeof(m)/sizeof(m[0]); i++) {
-		if (get_smaps_bits((unsigned long)m[i].start,
-				   &m[i].new_flags,
-				   &m[i].new_madv))
+	for (i = 0; i < sizeof(m) / sizeof(m[0]); i++) {
+		if (get_smaps_bits((unsigned long)m[i].start, &m[i].new_flags, &m[i].new_madv))
 			return -1;
 
 		if (m[i].orig_flags != m[i].new_flags) {
-			pr_perror("Flags are changed %lx %lx -> %lx (%zu)",
-			    (unsigned long)m[i].start,
-			    m[i].orig_flags, m[i].new_flags, i);
+			pr_perror("Flags are changed %lx %lx -> %lx (%zu)", (unsigned long)m[i].start, m[i].orig_flags,
+				  m[i].new_flags, i);
 			fail();
 			return -1;
 		}
 
 		if (m[i].orig_madv != m[i].new_madv) {
-			pr_perror("Madvs are changed %lx %lx -> %lx (%zu)",
-			    (unsigned long)m[i].start,
-			    m[i].orig_madv, m[i].new_madv, i);
+			pr_perror("Madvs are changed %lx %lx -> %lx (%zu)", (unsigned long)m[i].start, m[i].orig_madv,
+				  m[i].new_madv, i);
 			fail();
 			return -1;
 		}
-
 	}
 
 	pass();
diff --git a/test/zdtm/static/maps03.c b/test/zdtm/static/maps03.c
index 17299d551..064811c15 100644
--- a/test/zdtm/static/maps03.c
+++ b/test/zdtm/static/maps03.c
@@ -4,15 +4,15 @@
 #include <limits.h>
 #include "zdtmtst.h"
 
-#if (LONG_MAX == 2147483647L)	/* 32 bit */
+#if (LONG_MAX == 2147483647L) /* 32 bit */
 
 #define TEST_SKIP_REASON "64-bit arch required"
 #include "skip-me.c"
 
 #else
 
-const char *test_doc	= "Test for huge VMA area";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Test for huge VMA area";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 int main(int argc, char **argv)
 {
@@ -21,8 +21,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	test_msg("Alloc huge VMA\n");
-	mem = (void *)mmap(NULL, (10L << 30), PROT_READ | PROT_WRITE,
-			   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	mem = (void *)mmap(NULL, (10L << 30), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if ((void *)mem == MAP_FAILED) {
 		pr_perror("mmap failed");
 		return -1;
diff --git a/test/zdtm/static/maps04.c b/test/zdtm/static/maps04.c
index 780c5667d..dbbb5c644 100644
--- a/test/zdtm/static/maps04.c
+++ b/test/zdtm/static/maps04.c
@@ -13,10 +13,10 @@
 
 #define MEM_SIZE (1L << 29)
 
-const char *test_doc	= "Test big mappings";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org";
+const char *test_doc = "Test big mappings";
+const char *test_author = "Andrew Vagin <avagin@openvz.org";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	void *m;
 	uint32_t crc;
@@ -24,8 +24,7 @@ int main(int argc, char ** argv)
 
 	test_init(argc, argv);
 
-	m = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ,
-				MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	m = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
 	if (m == MAP_FAILED) {
 		fail();
@@ -35,7 +34,7 @@ int main(int argc, char ** argv)
 	crc = ~0;
 	datagen(m, MEM_SIZE, &crc);
 
-	for (i = 0; i < MEM_SIZE / (1<<20); i++)
+	for (i = 0; i < MEM_SIZE / (1 << 20); i++)
 		if (mprotect(m + (lrand48() * PAGE_SIZE % MEM_SIZE), PAGE_SIZE, PROT_NONE)) {
 			pr_perror("mprotect");
 			return 1;
diff --git a/test/zdtm/static/maps05.c b/test/zdtm/static/maps05.c
index faa09ee9a..be8f2309b 100644
--- a/test/zdtm/static/maps05.c
+++ b/test/zdtm/static/maps05.c
@@ -10,20 +10,20 @@
 #include <sys/stat.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create a bunch of small VMAs and test they survive transferring\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Create a bunch of small VMAs and test they survive transferring\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
-#define NR_MAPS		4096
+#define NR_MAPS 4096
 
-#define NR_MAPS_1	(NR_MAPS + 0)
-#define NR_MAPS_2	(NR_MAPS + 1)
+#define NR_MAPS_1 (NR_MAPS + 0)
+#define NR_MAPS_2 (NR_MAPS + 1)
 
-#define MAPS_SIZE_1	(140 << 10)
-#define MAPS_SIZE_2	(8192)
+#define MAPS_SIZE_1 (140 << 10)
+#define MAPS_SIZE_2 (8192)
 
 int main(int argc, char *argv[])
 {
-	void *map[NR_MAPS + 2] = { }, *addr;
+	void *map[NR_MAPS + 2] = {}, *addr;
 	size_t i, summary;
 
 	test_init(argc, argv);
diff --git a/test/zdtm/static/maps06.c b/test/zdtm/static/maps06.c
index 7480d6b24..6f7028ace 100644
--- a/test/zdtm/static/maps06.c
+++ b/test/zdtm/static/maps06.c
@@ -4,13 +4,13 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-const char *test_doc	= "Create a lot of file vma-s";
-const char *test_author	= "Andrei Vagin <avagin@openvz.org>";
+const char *test_doc = "Create a lot of file vma-s";
+const char *test_author = "Andrei Vagin <avagin@openvz.org>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	void *start;
 	int fd, i;
@@ -36,15 +36,12 @@ int main(int argc, char ** argv)
 
 	for (i = 0; i < test_size; i++) {
 		int *addr;
-		addr = mmap(start + i * 3 * ps, ps,
-				PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_FILE | MAP_FIXED, fd, 0);
+		addr = mmap(start + i * 3 * ps, ps, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FILE | MAP_FIXED, fd, 0);
 		if (addr == MAP_FAILED)
 			return 1;
 		addr[0] = i * 2;
-		addr = mmap(start + (i * 3 + 1) * ps, ps,
-				PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+		addr = mmap(start + (i * 3 + 1) * ps, ps, PROT_READ | PROT_WRITE,
+			    MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
 		if (addr == MAP_FAILED)
 			return 1;
 		addr[0] = i;
@@ -59,7 +56,7 @@ int main(int argc, char ** argv)
 		addr = start + i * 3 * ps;
 		if (addr[0] != i * 2)
 			fail();
-		addr = start + (i * 3  + 1) * ps;
+		addr = start + (i * 3 + 1) * ps;
 		if (addr[0] != i)
 			fail();
 	}
diff --git a/test/zdtm/static/maps_file_prot.c b/test/zdtm/static/maps_file_prot.c
index 3b28c1ff1..434cf075f 100644
--- a/test/zdtm/static/maps_file_prot.c
+++ b/test/zdtm/static/maps_file_prot.c
@@ -7,15 +7,19 @@
 #include <linux/limits.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test mappings of same file with different prot";
-const char *test_author	= "Jamie Liu <jamieliu@google.com>";
+const char *test_doc = "Test mappings of same file with different prot";
+const char *test_author = "Jamie Liu <jamieliu@google.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-#define die(fmt, arg...) do { pr_perror(fmt, ## arg); return 1; } while (0)
+#define die(fmt, arg...)               \
+	do {                           \
+		pr_perror(fmt, ##arg); \
+		return 1;              \
+	} while (0)
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	void *ro_map, *rw_map;
 	int fd;
diff --git a/test/zdtm/static/mem-touch.c b/test/zdtm/static/mem-touch.c
index b11c97f53..fb7f13528 100644
--- a/test/zdtm/static/mem-touch.c
+++ b/test/zdtm/static/mem-touch.c
@@ -7,10 +7,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check changing memory";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check changing memory";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
-#define MEM_PAGES	16
+#define MEM_PAGES 16
 
 int main(int argc, char **argv)
 {
@@ -32,7 +32,10 @@ int main(int argc, char **argv)
 	test_daemon();
 	while (test_go()) {
 		unsigned pfn;
-		struct timespec req = { .tv_sec = 0, .tv_nsec = 100000, };
+		struct timespec req = {
+			.tv_sec = 0,
+			.tv_nsec = 100000,
+		};
 
 		pfn = random() % MEM_PAGES;
 		*(unsigned *)(mem + pfn * PAGE_SIZE) = rover;
@@ -46,8 +49,7 @@ int main(int argc, char **argv)
 	test_msg("final rover %u\n", rover);
 	for (i = 0; i < MEM_PAGES; i++)
 		if (backup[i] != *(unsigned *)(mem + i * PAGE_SIZE)) {
-			test_msg("Page %u differs want %u has %u\n", i,
-					backup[i], *(unsigned *)(mem + i * PAGE_SIZE));
+			test_msg("Page %u differs want %u has %u\n", i, backup[i], *(unsigned *)(mem + i * PAGE_SIZE));
 			fail = 1;
 		} else
 			test_msg("Page %u matches %u\n", i, backup[i]);
@@ -59,4 +61,3 @@ int main(int argc, char **argv)
 
 	return 0;
 }
-
diff --git a/test/zdtm/static/memfd00.c b/test/zdtm/static/memfd00.c
index 6b56eca01..d037f6969 100644
--- a/test/zdtm/static/memfd00.c
+++ b/test/zdtm/static/memfd00.c
@@ -12,10 +12,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "memfd file descriptor";
-const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+const char *test_doc = "memfd file descriptor";
+const char *test_author = "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 static int _memfd_create(const char *name, unsigned int flags)
 {
diff --git a/test/zdtm/static/memfd01.c b/test/zdtm/static/memfd01.c
index 7a7853642..90ff80fa2 100644
--- a/test/zdtm/static/memfd01.c
+++ b/test/zdtm/static/memfd01.c
@@ -13,10 +13,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "memfd with different file pointer";
-const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+const char *test_doc = "memfd with different file pointer";
+const char *test_author = "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 static int _memfd_create(const char *name, unsigned int flags)
 {
diff --git a/test/zdtm/static/memfd02.c b/test/zdtm/static/memfd02.c
index 1843e9c9a..12e294921 100644
--- a/test/zdtm/static/memfd02.c
+++ b/test/zdtm/static/memfd02.c
@@ -13,10 +13,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "memfd mmap";
-const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+const char *test_doc = "memfd mmap";
+const char *test_author = "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 static int _memfd_create(const char *name, unsigned int flags)
 {
diff --git a/test/zdtm/static/memfd03.c b/test/zdtm/static/memfd03.c
index faedf9383..c25e211dd 100644
--- a/test/zdtm/static/memfd03.c
+++ b/test/zdtm/static/memfd03.c
@@ -13,35 +13,37 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "memfd seals";
-const char *test_author	= "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
+const char *test_doc = "memfd seals";
+const char *test_author = "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 static int _memfd_create(const char *name, unsigned int flags)
 {
 	return syscall(SYS_memfd_create, name, flags);
 }
 
-
 #ifndef F_LINUX_SPECIFIC_BASE
-# define F_LINUX_SPECIFIC_BASE	1024
+#define F_LINUX_SPECIFIC_BASE 1024
 #endif
 
 #ifndef F_ADD_SEALS
-  #define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
 #endif
 
 #ifndef F_GET_SEALS
-  #define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
 #endif
 
-
 #ifndef F_SEAL_SEAL
-#define F_SEAL_SEAL	0x0001	/* prevent further seals from being set */
-#define F_SEAL_SHRINK	0x0002	/* prevent file from shrinking */
-#define F_SEAL_GROW	0x0004	/* prevent file from growing */
-#define F_SEAL_WRITE	0x0008	/* prevent writes */
+#define F_SEAL_SEAL   0x0001 /* prevent further seals from being set */
+#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
+#define F_SEAL_GROW   0x0004 /* prevent file from growing */
+#define F_SEAL_WRITE  0x0008 /* prevent writes */
 #endif
 
 int main(int argc, char *argv[])
diff --git a/test/zdtm/static/mlock_setuid.c b/test/zdtm/static/mlock_setuid.c
index d8aec8315..86df7fd62 100644
--- a/test/zdtm/static/mlock_setuid.c
+++ b/test/zdtm/static/mlock_setuid.c
@@ -15,15 +15,13 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	test_msg("Alloc vma of size %d\n", MEM_SIZE);
-	start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE,
-	             MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (start == MAP_FAILED) {
 		pr_perror("mmap failed");
 		return -1;
 	}
 
-	test_msg("Lock vma from %p to %lx\n",
-			start, (unsigned long)start + MEM_SIZE);
+	test_msg("Lock vma from %p to %lx\n", start, (unsigned long)start + MEM_SIZE);
 	ret = mlock(start, MEM_SIZE);
 	if (ret < 0) {
 		pr_perror("mlock");
diff --git a/test/zdtm/static/mmx00.c b/test/zdtm/static/mmx00.c
index b736a80a1..cf9419b63 100644
--- a/test/zdtm/static/mmx00.c
+++ b/test/zdtm/static/mmx00.c
@@ -3,43 +3,33 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Start a calculation, leaving MMX in a certain state,\n"
-"before migration, continue after";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Start a calculation, leaving MMX in a certain state,\n"
+		       "before migration, continue after";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 #if defined(__i386__) || defined(__x86_64__)
 void start(uint8_t *bytes, uint16_t *words)
 {
-	__asm__ volatile (
-			  "movq %0, %%mm0\n"
-			  "movq %1, %%mm1\n"
-			  "movq %2, %%mm2\n"
-			  "movq %3, %%mm3\n"
-			  "paddb  %%mm0, %%mm1\n"
-			  "psubw %%mm2, %%mm3\n"
-			  :
-			  : "m" (bytes[0]), "m" (bytes[8]),
-			    "m" (words[0]), "m" (words[4])
-			 );
+	__asm__ volatile("movq %0, %%mm0\n"
+			 "movq %1, %%mm1\n"
+			 "movq %2, %%mm2\n"
+			 "movq %3, %%mm3\n"
+			 "paddb  %%mm0, %%mm1\n"
+			 "psubw %%mm2, %%mm3\n"
+			 :
+			 : "m"(bytes[0]), "m"(bytes[8]), "m"(words[0]), "m"(words[4]));
 }
 
 void finish(uint8_t *bytes, uint16_t *words)
 {
-	__asm__ volatile (
-			  "movq %%mm1, %0\n"
-			  "movq %%mm3, %1\n"
-			  : "=m" (bytes[0]), "=m" (words[0])
-			 );
+	__asm__ volatile("movq %%mm1, %0\n"
+			 "movq %%mm3, %1\n"
+			 : "=m"(bytes[0]), "=m"(words[0]));
 }
 
 static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
-        __asm__("cpuid"
-                : "=a" (*eax),
-                  "=b" (*ebx),
-                  "=c" (*ecx),
-                  "=d" (*edx)
-                : "0" (op), "c"(0));
+	__asm__("cpuid" : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) : "0"(op), "c"(0));
 }
 
 int chk_proc_mmx(void)
@@ -54,12 +44,12 @@ int chk_proc_mmx(void)
 int main(int argc, char **argv)
 {
 #if defined(__i386__) || defined(__x86_64__)
-	uint8_t	 bytes[16];
+	uint8_t bytes[16];
 	uint16_t words[8];
 	uint32_t rnd[8];
 	int i;
 
-	uint8_t	 resbytes1[8], resbytes2[8];
+	uint8_t resbytes1[8], resbytes2[8];
 	uint16_t reswords1[4], reswords2[4];
 #endif
 
@@ -73,8 +63,8 @@ int main(int argc, char **argv)
 	for (i = 0; i < (sizeof(bytes) + sizeof(words)) / 4; i++)
 		rnd[i] = mrand48();
 
-	memcpy((uint8_t *) bytes, (uint8_t *) rnd, sizeof(bytes));
-	memcpy((uint8_t *) words, (uint8_t *) rnd + sizeof(bytes), sizeof(words));
+	memcpy((uint8_t *)bytes, (uint8_t *)rnd, sizeof(bytes));
+	memcpy((uint8_t *)words, (uint8_t *)rnd + sizeof(bytes), sizeof(words));
 
 	start(bytes, words);
 	finish(resbytes1, reswords1);
@@ -86,9 +76,9 @@ int main(int argc, char **argv)
 
 	finish(resbytes2, reswords2);
 
-	if (memcmp((uint8_t *) resbytes1, (uint8_t *) resbytes2, sizeof(resbytes1)))
+	if (memcmp((uint8_t *)resbytes1, (uint8_t *)resbytes2, sizeof(resbytes1)))
 		fail("byte op mismatch");
-	else if (memcmp((uint8_t *) reswords1, (uint8_t *) reswords2, sizeof(reswords2)))
+	else if (memcmp((uint8_t *)reswords1, (uint8_t *)reswords2, sizeof(reswords2)))
 		fail("word op mismatch");
 	else
 		pass();
diff --git a/test/zdtm/static/mnt_enablefs.c b/test/zdtm/static/mnt_enablefs.c
index 3de4c57eb..6f0cb9363 100644
--- a/test/zdtm/static/mnt_enablefs.c
+++ b/test/zdtm/static/mnt_enablefs.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check enabled file systems (--enable-fs)";
-const char *test_author	= "Andrei Vagin <avagin@virtuozzo.com>";
+const char *test_doc = "Check enabled file systems (--enable-fs)";
+const char *test_author = "Andrei Vagin <avagin@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/mnt_ext_auto.c b/test/zdtm/static/mnt_ext_auto.c
index 9181b370a..977dfdbf8 100644
--- a/test/zdtm/static/mnt_ext_auto.c
+++ b/test/zdtm/static/mnt_ext_auto.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check --mnt-ext-map";
-const char *test_author	= "Andrew Vagin <avagin@gmail.com>";
+const char *test_doc = "Check --mnt-ext-map";
+const char *test_author = "Andrew Vagin <avagin@gmail.com>";
 
 #ifdef ZDTM_EXTMAP_MANUAL
 char *dirname = "mnt_ext_manual.test";
@@ -19,25 +19,25 @@ char *dirname_private_shared_bind = "mnt_ext_manual_private_shared_bind.test";
 char *dirname_bind = "mnt_ext_manual_bind.test";
 char *dirname_slave_shared_bind = "mnt_ext_manual_slave_shared_bind.test";
 char *dirname_slave_bind = "mnt_ext_manual_slave_bind.test";
-#define DDIR	"mtest"
+#define DDIR "mtest"
 #else
 char *dirname = "mnt_ext_auto.test";
 char *dirname_private_shared_bind = "mnt_ext_auto_private_shared_bind.test";
 char *dirname_bind = "mnt_ext_auto_bind.test";
 char *dirname_slave_shared_bind = "mnt_ext_auto_slave_shared_bind.test";
 char *dirname_slave_bind = "mnt_ext_auto_slave_bind.test";
-#define DDIR	"atest"
+#define DDIR "atest"
 #endif
 TEST_OPTION(dirname, string, "directory name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	char src[PATH_MAX], dst[PATH_MAX], *root;
-	char dst_bind[PATH_MAX], dst_private_shared_bind[PATH_MAX],
-		dst_slave_shared_bind[PATH_MAX], dst_slave_bind[PATH_MAX];
+	char dst_bind[PATH_MAX], dst_private_shared_bind[PATH_MAX], dst_slave_shared_bind[PATH_MAX],
+		dst_slave_bind[PATH_MAX];
 	char *dname = "/tmp/zdtm_ext_auto.XXXXXX";
 	struct stat sta, stb, bsta, bstb, ssbsta, sbsta, ssbstb, sbstb, psbsta, psbstb;
-	char* zdtm_newns = getenv("ZDTM_NEWNS");
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
 
 	root = getenv("ZDTM_ROOT");
 	if (root == NULL) {
diff --git a/test/zdtm/static/mnt_ext_dev.c b/test/zdtm/static/mnt_ext_dev.c
index 1d60fc92f..2035a4cfb 100644
--- a/test/zdtm/static/mnt_ext_dev.c
+++ b/test/zdtm/static/mnt_ext_dev.c
@@ -11,8 +11,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check mounts of external devices";
-const char *test_author	= "Andrei Vagin <avagin@virtuozzo.com";
+const char *test_doc = "Check mounts of external devices";
+const char *test_author = "Andrei Vagin <avagin@virtuozzo.com";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/mnt_ext_master.c b/test/zdtm/static/mnt_ext_master.c
index 12e9ebab1..5fd8fa8b2 100644
--- a/test/zdtm/static/mnt_ext_master.c
+++ b/test/zdtm/static/mnt_ext_master.c
@@ -11,13 +11,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that mounts with external master peers are c/r'd";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that mounts with external master peers are c/r'd";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname = "mnt_ext_auto.test";
 TEST_OPTION(dirname, string, "directory name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	char src[PATH_MAX], dst[PATH_MAX], *root;
 	char *dname = "/tmp/zdtm_ext_auto.XXXXXX";
@@ -64,7 +64,6 @@ test:
 	test_daemon();
 	test_waitsig();
 
-
 	pass();
 
 	return 0;
diff --git a/test/zdtm/static/mnt_ro_bind.c b/test/zdtm/static/mnt_ro_bind.c
index 1d9881408..2802c87e5 100644
--- a/test/zdtm/static/mnt_ro_bind.c
+++ b/test/zdtm/static/mnt_ro_bind.c
@@ -9,14 +9,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check read-only bind-mounts";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check read-only bind-mounts";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_WORD	"testtest"
-#define TEST_WORD2	"TESTTEST"
+#define TEST_WORD  "testtest"
+#define TEST_WORD2 "TESTTEST"
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/mnt_tracefs.c b/test/zdtm/static/mnt_tracefs.c
index 99d60870a..66a00c02f 100644
--- a/test/zdtm/static/mnt_tracefs.c
+++ b/test/zdtm/static/mnt_tracefs.c
@@ -10,13 +10,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test c/r of tracefs";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Test c/r of tracefs";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname = "mnt_tracefs.test";
 TEST_OPTION(dirname, string, "directory name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	char dst[PATH_MAX];
 
@@ -69,4 +69,3 @@ test:
 	pass();
 	return 0;
 }
-
diff --git a/test/zdtm/static/mntns_deleted.c b/test/zdtm/static/mntns_deleted.c
index 39f9d0b47..aea2be82f 100644
--- a/test/zdtm/static/mntns_deleted.c
+++ b/test/zdtm/static/mntns_deleted.c
@@ -15,20 +15,20 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check the restore of deleted bindmounts";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check the restore of deleted bindmounts";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_DIR_SRC	"test-src"
-#define TEST_DIR_DST	"test-dst"
+#define TEST_DIR_SRC "test-src"
+#define TEST_DIR_DST "test-dst"
 
-#define TEST_FILE_SRC	"mntns-deleted-src"
-#define TEST_FILE_DST	"mntns-deleted-dst"
+#define TEST_FILE_SRC "mntns-deleted-src"
+#define TEST_FILE_DST "mntns-deleted-dst"
 
 int main(int argc, char *argv[])
 {
@@ -56,8 +56,7 @@ int main(int argc, char *argv[])
 	unlink(TEST_FILE_SRC);
 	unlink(TEST_FILE_DST);
 
-	if (mkdir(path_src, 0700) ||
-	    mkdir(path_dst, 0700)) {
+	if (mkdir(path_src, 0700) || mkdir(path_dst, 0700)) {
 		pr_perror("mkdir");
 		return 1;
 	}
diff --git a/test/zdtm/static/mntns_ghost.c b/test/zdtm/static/mntns_ghost.c
index e0d31572a..c8c68382b 100644
--- a/test/zdtm/static/mntns_ghost.c
+++ b/test/zdtm/static/mntns_ghost.c
@@ -15,13 +15,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check ghost and link-remap files in a few mntns";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check ghost and link-remap files in a few mntns";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	task_waiter_t lock;
@@ -102,7 +101,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-
 	kill(pid, SIGTERM);
 	wait(&status);
 	if (status) {
diff --git a/test/zdtm/static/mntns_ghost01.c b/test/zdtm/static/mntns_ghost01.c
index 665e1e162..20397d543 100644
--- a/test/zdtm/static/mntns_ghost01.c
+++ b/test/zdtm/static/mntns_ghost01.c
@@ -9,13 +9,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check ghost file is restored on readonly fs if it was ghost-remaped on writable bind";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check ghost file is restored on readonly fs if it was ghost-remaped on writable bind";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	char ghost_path[PATH_MAX];
@@ -71,7 +70,7 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if (mount(NULL, dirname, NULL, MS_RDONLY|MS_REMOUNT|MS_BIND, NULL)) {
+		if (mount(NULL, dirname, NULL, MS_RDONLY | MS_REMOUNT | MS_BIND, NULL)) {
 			pr_perror("remount");
 			return 1;
 		}
diff --git a/test/zdtm/static/mntns_link_remap.c b/test/zdtm/static/mntns_link_remap.c
index 6ac08191a..7c4acc01a 100644
--- a/test/zdtm/static/mntns_link_remap.c
+++ b/test/zdtm/static/mntns_link_remap.c
@@ -15,17 +15,17 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check ghost and link-remap files in a few mntns";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check ghost and link-remap files in a few mntns";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
-#define MPTS_FILE	"F"
+#define MPTS_FILE "F"
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define NS_STACK_SIZE	4096
+#define NS_STACK_SIZE 4096
 /* All arguments should be above stack, because it grows down */
 struct ns_exec_args {
 	char stack[NS_STACK_SIZE] __stack_aligned__;
@@ -34,8 +34,8 @@ struct ns_exec_args {
 	int sync;
 };
 
-#define AWK_OK		13
-#define AWK_FAIL	42
+#define AWK_OK	 13
+#define AWK_FAIL 42
 
 static int get_mntid(int fd)
 {
@@ -102,7 +102,7 @@ int ns_child(void *_arg)
 
 	id1 = get_mntid(args->fd);
 	id2 = get_mntid(fd2);
-	if (id1 <0 || id2 < 0)
+	if (id1 < 0 || id2 < 0)
 		exit(1);
 
 	if (fstat(args->fd, &st1) || fstat(fd2, &st2)) {
@@ -117,8 +117,7 @@ int ns_child(void *_arg)
 #else
 	if (st1.st_nlink != 0) {
 #endif
-		pr_perror("Wrong number of links: %lu",
-			(long unsigned)st1.st_nlink);
+		pr_perror("Wrong number of links: %lu", (long unsigned)st1.st_nlink);
 		exit(1);
 	}
 
@@ -228,7 +227,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-
 	if (pid > 0) {
 		int status = 1;
 		kill(pid, SIGTERM);
diff --git a/test/zdtm/static/mntns_open.c b/test/zdtm/static/mntns_open.c
index c687080a7..7d8bbbaa4 100644
--- a/test/zdtm/static/mntns_open.c
+++ b/test/zdtm/static/mntns_open.c
@@ -14,18 +14,18 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check that mnt_id is repsected";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that mnt_id is repsected";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define MPTS_FILE	"F"
+#define MPTS_FILE "F"
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 char fpath[PATH_MAX];
 
-#define NS_STACK_SIZE	4096
+#define NS_STACK_SIZE 4096
 /* All arguments should be above stack, because it grows down */
 struct ns_exec_args {
 	char stack[NS_STACK_SIZE] __stack_aligned__;
@@ -33,8 +33,8 @@ struct ns_exec_args {
 	int fd;
 };
 
-#define AWK_OK		13
-#define AWK_FAIL	42
+#define AWK_OK	 13
+#define AWK_FAIL 42
 
 static int get_mntid(int fd)
 {
@@ -74,7 +74,7 @@ int ns_child(void *_arg)
 
 	test_msg("%d %d", id1, id2);
 
-	if (id1 <0 || id2 < 0)
+	if (id1 < 0 || id2 < 0)
 		exit(1);
 	if (id1 > 0 && id1 != id2)
 		exit(AWK_OK);
diff --git a/test/zdtm/static/mntns_overmount.c b/test/zdtm/static/mntns_overmount.c
index ba23afca8..c2a6a72cf 100644
--- a/test/zdtm/static/mntns_overmount.c
+++ b/test/zdtm/static/mntns_overmount.c
@@ -10,13 +10,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check two mounts in the same directory";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check two mounts in the same directory";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	char d1[PATH_MAX], d2[PATH_MAX], f1[PATH_MAX], f2[PATH_MAX];
@@ -27,17 +26,13 @@ int main(int argc, char **argv)
 	snprintf(d1, sizeof(d1), "%s/1/", dirname);
 	snprintf(d2, sizeof(d2), "%s/2/", dirname);
 
-	if (mkdir(dirname, 0700) ||
-	    mkdir(d1, 0777) ||
-	    mkdir(d2, 0700)) {
+	if (mkdir(dirname, 0700) || mkdir(d1, 0777) || mkdir(d2, 0700)) {
 		pr_perror("mkdir");
 		return 1;
 	}
 
-	if (mount("zdtm_d1", d1, "sysfs", 0, NULL) ||
-	    mount(NULL, d1, NULL, MS_SHARED, NULL) ||
-            mount(d1, d2, NULL, MS_BIND, NULL) ||
-            mount(NULL, d2, NULL, MS_SLAVE, NULL)) {
+	if (mount("zdtm_d1", d1, "sysfs", 0, NULL) || mount(NULL, d1, NULL, MS_SHARED, NULL) ||
+	    mount(d1, d2, NULL, MS_BIND, NULL) || mount(NULL, d2, NULL, MS_SLAVE, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
diff --git a/test/zdtm/static/mntns_remap.c b/test/zdtm/static/mntns_remap.c
index fd62cbf40..3ee3b4640 100644
--- a/test/zdtm/static/mntns_remap.c
+++ b/test/zdtm/static/mntns_remap.c
@@ -13,8 +13,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check a case when one mount overmount another one";
-const char *test_author	= "Andrew Vagin <avagin@virtuozzo.com>";
+const char *test_doc = "Check a case when one mount overmount another one";
+const char *test_author = "Andrew Vagin <avagin@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/mntns_ro_root.c b/test/zdtm/static/mntns_ro_root.c
index 8a7971018..82659709e 100644
--- a/test/zdtm/static/mntns_ro_root.c
+++ b/test/zdtm/static/mntns_ro_root.c
@@ -14,13 +14,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check a case when a root is read-only for a sub-mntns";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check a case when a root is read-only for a sub-mntns";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	task_waiter_t lock;
diff --git a/test/zdtm/static/mntns_root_bind.c b/test/zdtm/static/mntns_root_bind.c
index 86c44e197..9e1ba06e6 100644
--- a/test/zdtm/static/mntns_root_bind.c
+++ b/test/zdtm/static/mntns_root_bind.c
@@ -14,16 +14,15 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check bind-mouns of the root mount";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check bind-mouns of the root mount";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	char subdir1[PATH_MAX], path[PATH_MAX], bpath[PATH_MAX], spath[PATH_MAX], bspath[PATH_MAX];
@@ -47,13 +46,8 @@ int main(int argc, char **argv)
 	ssprintf(subdir2, "%s/subdir2", dirname);
 	ssprintf(bsubdir2, "%s/bsubdir2", dirname);
 
-	if (mkdir(dirname, 0700) ||
-	    mkdir(subdir1, 0777) ||
-	    mkdir(subdir2, 0777) ||
-	    mkdir(bsubdir2, 0777) ||
-	    mkdir(path, 0700) ||
-	    mkdir(spath, 0700) ||
-	    mkdir(bpath, 0700)) {
+	if (mkdir(dirname, 0700) || mkdir(subdir1, 0777) || mkdir(subdir2, 0777) || mkdir(bsubdir2, 0777) ||
+	    mkdir(path, 0700) || mkdir(spath, 0700) || mkdir(bpath, 0700)) {
 		pr_perror("mkdir");
 		return 1;
 	}
@@ -81,7 +75,6 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-
 		if (umount2(bpath, MNT_DETACH)) {
 			fail("umount");
 			return 1;
diff --git a/test/zdtm/static/mntns_rw_ro_rw.c b/test/zdtm/static/mntns_rw_ro_rw.c
index 6179c4788..b251964a2 100644
--- a/test/zdtm/static/mntns_rw_ro_rw.c
+++ b/test/zdtm/static/mntns_rw_ro_rw.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test read-only bind mounts";
-const char *test_author	= "Andrey Vagin <xemul@parallels.com>";
+const char *test_doc = "Test read-only bind mounts";
+const char *test_author = "Andrey Vagin <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
 		pr_perror("Unable to bind-mount /proc/sys/net");
 		return 1;
 	}
-	if (mount("/proc/sys/", "/proc/sys", NULL, MS_RDONLY|MS_BIND|MS_REMOUNT, NULL)) {
+	if (mount("/proc/sys/", "/proc/sys", NULL, MS_RDONLY | MS_BIND | MS_REMOUNT, NULL)) {
 		pr_perror("Unable to remount  /proc/sys");
 		return 1;
 	}
diff --git a/test/zdtm/static/mntns_shared_bind.c b/test/zdtm/static/mntns_shared_bind.c
index b0d63af58..7c745606e 100644
--- a/test/zdtm/static/mntns_shared_bind.c
+++ b/test/zdtm/static/mntns_shared_bind.c
@@ -14,16 +14,15 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check shared non-root bind-mounts";
-const char *test_author	= "Andrew Vagin <avagin@gmail.com>";
+const char *test_doc = "Check shared non-root bind-mounts";
+const char *test_author = "Andrew Vagin <avagin@gmail.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	char path[PATH_MAX], bpath[PATH_MAX], spath[PATH_MAX];
@@ -50,16 +49,13 @@ int main(int argc, char **argv)
 
 #ifdef SHARED_BIND02
 	/* */
-	if (mount(dirname, dirname, "tmpfs", 0, NULL) ||
-	    mount(NULL, dirname, NULL, MS_SHARED, NULL)) {
+	if (mount(dirname, dirname, "tmpfs", 0, NULL) || mount(NULL, dirname, NULL, MS_SHARED, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
 #endif
 
-	if (mkdir(path, 0700) ||
-	    mkdir(spath, 0700) ||
-	    mkdir(bpath, 0700)) {
+	if (mkdir(path, 0700) || mkdir(spath, 0700) || mkdir(bpath, 0700)) {
 		pr_perror("mkdir");
 		return 1;
 	}
@@ -99,7 +95,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	test_daemon();
 	test_waitsig();
 
diff --git a/test/zdtm/static/mntns_shared_bind03.c b/test/zdtm/static/mntns_shared_bind03.c
index e75fe6297..3c0ced831 100644
--- a/test/zdtm/static/mntns_shared_bind03.c
+++ b/test/zdtm/static/mntns_shared_bind03.c
@@ -14,16 +14,15 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check shared non-root bind-mounts with different shared groups";
-const char *test_author	= "Andrew Vagin <avagin@gmail.com>";
+const char *test_doc = "Check shared non-root bind-mounts with different shared groups";
+const char *test_author = "Andrew Vagin <avagin@gmail.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	test_init(argc, argv);
@@ -51,22 +50,19 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (mount("1", "1", NULL, MS_BIND, NULL) ||
-	    mount(NULL, "1", NULL, MS_PRIVATE, NULL) ||
+	if (mount("1", "1", NULL, MS_BIND, NULL) || mount(NULL, "1", NULL, MS_PRIVATE, NULL) ||
 	    mount(NULL, "1", NULL, MS_SHARED, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
 
-	if (mount("1", "A", NULL, MS_BIND, NULL) ||
-	    mount(NULL, "A", NULL, MS_PRIVATE, NULL) ||
+	if (mount("1", "A", NULL, MS_BIND, NULL) || mount(NULL, "A", NULL, MS_PRIVATE, NULL) ||
 	    mount(NULL, "A", NULL, MS_SHARED, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
 
-	if (mount("1", "B", NULL, MS_BIND, NULL) ||
-	    mount(NULL, "B", NULL, MS_SLAVE, NULL)) {
+	if (mount("1", "B", NULL, MS_BIND, NULL) || mount(NULL, "B", NULL, MS_SLAVE, NULL)) {
 		pr_perror("mount");
 		return 1;
 	}
diff --git a/test/zdtm/static/mntns_shared_vs_private.c b/test/zdtm/static/mntns_shared_vs_private.c
index 5849bbbdb..c44fb0066 100644
--- a/test/zdtm/static/mntns_shared_vs_private.c
+++ b/test/zdtm/static/mntns_shared_vs_private.c
@@ -14,16 +14,15 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc	= "Check a private mount in a shared mount";
-const char *test_author	= "Andrew Vagin <avagin@gmail.com>";
+const char *test_doc = "Check a private mount in a shared mount";
+const char *test_author = "Andrew Vagin <avagin@gmail.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-
 int main(int argc, char **argv)
 {
 	char path[PATH_MAX];
@@ -106,7 +105,8 @@ int main(int argc, char **argv)
 		}
 
 		if (status) {
-			pr_err("%d/%d/%d/%d\n", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
+			pr_err("%d/%d/%d/%d\n", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status),
+			       WTERMSIG(status));
 			return 1;
 		}
 	}
diff --git a/test/zdtm/static/mount_paths.c b/test/zdtm/static/mount_paths.c
index 2377e9c94..6b9ce1c24 100644
--- a/test/zdtm/static/mount_paths.c
+++ b/test/zdtm/static/mount_paths.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that special characters in paths are handled correctly";
-const char *test_author	= "Andrew Vagin <avagin@virtuozzo.com>";
+const char *test_doc = "Check that special characters in paths are handled correctly";
+const char *test_author = "Andrew Vagin <avagin@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/mountpoints.c b/test/zdtm/static/mountpoints.c
index cf54d1096..b5fd72aad 100644
--- a/test/zdtm/static/mountpoints.c
+++ b/test/zdtm/static/mountpoints.c
@@ -11,12 +11,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that mountpoints (in mount namespace) are supported";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that mountpoints (in mount namespace) are supported";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define MPTS_ROOT	"/zdtm_mpts/"
+#define MPTS_ROOT "/zdtm_mpts/"
 
-#define NS_STACK_SIZE	4096
+#define NS_STACK_SIZE 4096
 /* All arguments should be above stack, because it grows down */
 struct ns_exec_args {
 	char stack[NS_STACK_SIZE] __stack_aligned__;
@@ -32,22 +32,22 @@ int ns_child(void *_arg)
 	pid_t pid;
 	int fd, ufd;
 
-	mkdir(MPTS_ROOT"/dev/mntns2", 0600);
-	if (mount("none", MPTS_ROOT"/dev/mntns2", "tmpfs", 0, "") < 0) {
+	mkdir(MPTS_ROOT "/dev/mntns2", 0600);
+	if (mount("none", MPTS_ROOT "/dev/mntns2", "tmpfs", 0, "") < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/mntns2/test", 0600);
+	mkdir(MPTS_ROOT "/dev/mntns2/test", 0600);
 
-	fd = open(MPTS_ROOT"/dev/mntns2/test/test.file", O_WRONLY | O_CREAT, 0666);
+	fd = open(MPTS_ROOT "/dev/mntns2/test/test.file", O_WRONLY | O_CREAT, 0666);
 	if (fd < 0)
 		return 1;
 
-	ufd = open(MPTS_ROOT"/dev/mntns2/test/test.file.unlinked", O_WRONLY | O_CREAT, 0666);
+	ufd = open(MPTS_ROOT "/dev/mntns2/test/test.file.unlinked", O_WRONLY | O_CREAT, 0666);
 	if (ufd < 0)
 		return 1;
-	unlink(MPTS_ROOT"/dev/mntns2/test/test.file.unlinked");
+	unlink(MPTS_ROOT "/dev/mntns2/test/test.file.unlinked");
 
 	pid = fork();
 
@@ -63,7 +63,7 @@ int ns_child(void *_arg)
 			return 1;
 	}
 
-	if (stat(MPTS_ROOT"/dev/mntns2/test", &st)) {
+	if (stat(MPTS_ROOT "/dev/mntns2/test", &st)) {
 		pr_perror("Can't stat /dev/share-1/test.share/test.share");
 		return 1;
 	}
@@ -92,133 +92,132 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (mount("none", MPTS_ROOT"/dev", "tmpfs", 0, "") < 0) {
+	if (mount("none", MPTS_ROOT "/dev", "tmpfs", 0, "") < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
-	tmpfs_fd = open(MPTS_ROOT"/dev/test", O_WRONLY | O_CREAT);
+	tmpfs_fd = open(MPTS_ROOT "/dev/test", O_WRONLY | O_CREAT);
 	if (write(tmpfs_fd, "hello", 5) <= 0) {
 		pr_perror("write() failed");
 		return 1;
 	}
 
 	/* Check that over-mounted files are restored on tmpfs */
-	mkdir(MPTS_ROOT"/dev/overmount", 0600);
-	fd = open(MPTS_ROOT"/dev/overmount/test.over", O_WRONLY | O_CREAT);
+	mkdir(MPTS_ROOT "/dev/overmount", 0600);
+	fd = open(MPTS_ROOT "/dev/overmount/test.over", O_WRONLY | O_CREAT);
 	if (fd == -1) {
-		pr_perror("Unable to open "MPTS_ROOT"/dev/overmount");
+		pr_perror("Unable to open " MPTS_ROOT "/dev/overmount");
 		return -1;
 	}
 	close(fd);
-	if (mount("none", MPTS_ROOT"/dev/overmount", "tmpfs", 0, "") < 0) {
-		pr_perror("Can't mount "MPTS_ROOT"/dev/overmount");
+	if (mount("none", MPTS_ROOT "/dev/overmount", "tmpfs", 0, "") < 0) {
+		pr_perror("Can't mount " MPTS_ROOT "/dev/overmount");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/non-root", 0600);
-	if (mount(MPTS_ROOT"/dev/non-root", MPTS_ROOT"/module", NULL, MS_BIND, NULL) < 0) {
-		pr_perror("Can't bind-mount %s -> %s", MPTS_ROOT"/dev/tdir", MPTS_ROOT"/module");
+	mkdir(MPTS_ROOT "/dev/non-root", 0600);
+	if (mount(MPTS_ROOT "/dev/non-root", MPTS_ROOT "/module", NULL, MS_BIND, NULL) < 0) {
+		pr_perror("Can't bind-mount %s -> %s", MPTS_ROOT "/dev/tdir", MPTS_ROOT "/module");
 	}
-	mkdir(MPTS_ROOT"/dev/non-root/test", 0600);
+	mkdir(MPTS_ROOT "/dev/non-root/test", 0600);
 
-	mkdir(MPTS_ROOT"/dev/share-1", 0600);
-	if (mount("none", MPTS_ROOT"/dev/share-1/", "tmpfs", 0, "") < 0) {
+	mkdir(MPTS_ROOT "/dev/share-1", 0600);
+	if (mount("none", MPTS_ROOT "/dev/share-1/", "tmpfs", 0, "") < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
-	if (mount("none", MPTS_ROOT"/dev/share-1/", NULL, MS_SHARED, NULL) < 0) {
+	if (mount("none", MPTS_ROOT "/dev/share-1/", NULL, MS_SHARED, NULL) < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 
 //#define CR_NEXT
 #ifdef CR_NEXT
-	mkdir(MPTS_ROOT"/dev/share-1/alone", 0600);
-	if (mount("none", MPTS_ROOT"/dev/share-1/alone", "tmpfs", 0, "") < 0) {
+	mkdir(MPTS_ROOT "/dev/share-1/alone", 0600);
+	if (mount("none", MPTS_ROOT "/dev/share-1/alone", "tmpfs", 0, "") < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 #endif
 
-	mkdir(MPTS_ROOT"/dev/share-2", 0600);
-	if (mount(MPTS_ROOT"/dev/share-1", MPTS_ROOT"/dev/share-2", NULL, MS_BIND, NULL) < 0) {
+	mkdir(MPTS_ROOT "/dev/share-2", 0600);
+	if (mount(MPTS_ROOT "/dev/share-1", MPTS_ROOT "/dev/share-2", NULL, MS_BIND, NULL) < 0) {
 		fail("Can't bind mount a tmpfs directory");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/share-3", 0600);
-	if (mount(MPTS_ROOT"/dev/share-1", MPTS_ROOT"/dev/share-3", NULL, MS_BIND, NULL) < 0) {
+	mkdir(MPTS_ROOT "/dev/share-3", 0600);
+	if (mount(MPTS_ROOT "/dev/share-1", MPTS_ROOT "/dev/share-3", NULL, MS_BIND, NULL) < 0) {
 		fail("Can't bind mount a tmpfs directory");
 		return 1;
 	}
-	mkdir(MPTS_ROOT"/dev/slave", 0600);
-	if (mount(MPTS_ROOT"/dev/share-1", MPTS_ROOT"/dev/slave", NULL, MS_BIND, NULL) < 0) {
+	mkdir(MPTS_ROOT "/dev/slave", 0600);
+	if (mount(MPTS_ROOT "/dev/share-1", MPTS_ROOT "/dev/slave", NULL, MS_BIND, NULL) < 0) {
 		fail("Can't bind mount a tmpfs directory");
 		return 1;
 	}
-	if (mount("none", MPTS_ROOT"/dev/slave", NULL, MS_SLAVE, NULL) < 0) {
+	if (mount("none", MPTS_ROOT "/dev/slave", NULL, MS_SLAVE, NULL) < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/slave2", 0600);
-	if (mount(MPTS_ROOT"/dev/share-3", MPTS_ROOT"/dev/slave2", NULL, MS_BIND, NULL) < 0) {
+	mkdir(MPTS_ROOT "/dev/slave2", 0600);
+	if (mount(MPTS_ROOT "/dev/share-3", MPTS_ROOT "/dev/slave2", NULL, MS_BIND, NULL) < 0) {
 		fail("Can't bind mount a tmpfs directory");
 		return 1;
 	}
-	if (mount("none", MPTS_ROOT"/dev/slave2", NULL, MS_SLAVE, NULL) < 0) {
+	if (mount("none", MPTS_ROOT "/dev/slave2", NULL, MS_SLAVE, NULL) < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/share-1/test.mnt.share", 0600);
-	if (mount("none", MPTS_ROOT"/dev/share-1/test.mnt.share", "tmpfs", 0, "size=1G") < 0) {
+	mkdir(MPTS_ROOT "/dev/share-1/test.mnt.share", 0600);
+	if (mount("none", MPTS_ROOT "/dev/share-1/test.mnt.share", "tmpfs", 0, "size=1G") < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/share-1/test.mnt.share/test.share", 0600);
-	if (umount(MPTS_ROOT"/dev/slave2/test.mnt.share")) {
-		pr_perror("Can't umount "MPTS_ROOT"/dev/slave2/test.mnt.share");
+	mkdir(MPTS_ROOT "/dev/share-1/test.mnt.share/test.share", 0600);
+	if (umount(MPTS_ROOT "/dev/slave2/test.mnt.share")) {
+		pr_perror("Can't umount " MPTS_ROOT "/dev/slave2/test.mnt.share");
 		return 1;
 	}
 
-	mkdir(MPTS_ROOT"/dev/slave/test.mnt.slave", 0600);
-	if (mount("none", MPTS_ROOT"/dev/slave/test.mnt.slave", "tmpfs", 0, "") < 0) {
+	mkdir(MPTS_ROOT "/dev/slave/test.mnt.slave", 0600);
+	if (mount("none", MPTS_ROOT "/dev/slave/test.mnt.slave", "tmpfs", 0, "") < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
-	mkdir(MPTS_ROOT"/dev/slave/test.mnt.slave/test.slave", 0600);
+	mkdir(MPTS_ROOT "/dev/slave/test.mnt.slave/test.slave", 0600);
 
-	fd = open(MPTS_ROOT"/dev/bmfile", O_CREAT | O_WRONLY);
+	fd = open(MPTS_ROOT "/dev/bmfile", O_CREAT | O_WRONLY);
 	if (fd < 0) {
 		pr_perror("Can't create " MPTS_ROOT "/dev/share-1/bmfile");
 		return 1;
 	}
 	close(fd);
 
-	fd = open(MPTS_ROOT"/dev/bmfile-mount", O_CREAT | O_WRONLY);
+	fd = open(MPTS_ROOT "/dev/bmfile-mount", O_CREAT | O_WRONLY);
 	if (fd < 0) {
 		pr_perror("Can't create " MPTS_ROOT "/dev/share-1/bmfile");
 		return 1;
 	}
 	close(fd);
 
-	if (mount(MPTS_ROOT"/dev/bmfile", MPTS_ROOT"/dev/bmfile-mount", NULL, MS_BIND, NULL) < 0) {
+	if (mount(MPTS_ROOT "/dev/bmfile", MPTS_ROOT "/dev/bmfile-mount", NULL, MS_BIND, NULL) < 0) {
 		fail("Can't mount tmpfs");
 		return 1;
 	}
 
-	if (mount("none", MPTS_ROOT"/kernel", "proc", 0, "") < 0) {
+	if (mount("none", MPTS_ROOT "/kernel", "proc", 0, "") < 0) {
 		fail("Can't mount proc");
 		return 1;
 	}
 
-	if (mount("none", MPTS_ROOT"/kernel/sys/fs/binfmt_misc",
-					"binfmt_misc", 0, "") == 0)
+	if (mount("none", MPTS_ROOT "/kernel/sys/fs/binfmt_misc", "binfmt_misc", 0, "") == 0)
 		have_bfmtm = 1;
 
-	fd = open(MPTS_ROOT"/kernel/meminfo", O_RDONLY);
+	fd = open(MPTS_ROOT "/kernel/meminfo", O_RDONLY);
 	if (fd == -1)
 		return 1;
 
@@ -236,32 +235,32 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	/* this checks both -- sys and proc presence */
-	if (access(MPTS_ROOT"/kernel/meminfo", F_OK)) {
+	if (access(MPTS_ROOT "/kernel/meminfo", F_OK)) {
 		fail("No proc after restore");
 		return 1;
 	}
 
-	if (have_bfmtm && access(MPTS_ROOT"/kernel/sys/fs/binfmt_misc/register", F_OK)) {
+	if (have_bfmtm && access(MPTS_ROOT "/kernel/sys/fs/binfmt_misc/register", F_OK)) {
 		fail("No binfmt_misc after restore");
 		return 1;
 	}
 
-	if (umount(MPTS_ROOT"/dev/overmount") == -1) {
-		pr_perror("Can't umount "MPTS_ROOT"/dev/overmount");
+	if (umount(MPTS_ROOT "/dev/overmount") == -1) {
+		pr_perror("Can't umount " MPTS_ROOT "/dev/overmount");
 		return -1;
 	}
-	if (access(MPTS_ROOT"/dev/overmount/test.over", F_OK)) {
-		fail(MPTS_ROOT"/dev/overmount/test.over");
+	if (access(MPTS_ROOT "/dev/overmount/test.over", F_OK)) {
+		fail(MPTS_ROOT "/dev/overmount/test.over");
 		return -1;
 	}
 
 	{
 		struct stat st1, st2;
-		if (stat(MPTS_ROOT"/dev/share-1/test.mnt.share/test.share", &st1)) {
+		if (stat(MPTS_ROOT "/dev/share-1/test.mnt.share/test.share", &st1)) {
 			pr_perror("Can't stat /dev/share-1/test.share/test.share");
 			return 1;
 		}
-		if (stat(MPTS_ROOT"/dev/share-2/test.mnt.share/test.share", &st2)) {
+		if (stat(MPTS_ROOT "/dev/share-2/test.mnt.share/test.share", &st2)) {
 			pr_perror("Can't stat /dev/share-2/test.mnt.share/test.share");
 			return 1;
 		}
@@ -269,7 +268,7 @@ int main(int argc, char **argv)
 			fail("/dev/share-1 and /dev/share-1 is not shared");
 			return 1;
 		}
-		if (stat(MPTS_ROOT"/dev/slave/test.mnt.share/test.share", &st2)) {
+		if (stat(MPTS_ROOT "/dev/slave/test.mnt.share/test.share", &st2)) {
 			pr_perror("Can't stat /dev/slave/test.mnt.share/test.share");
 			return 1;
 		}
@@ -277,15 +276,15 @@ int main(int argc, char **argv)
 			fail("/dev/slave is not slave of /dev/share-1");
 			return 1;
 		}
-		if (stat(MPTS_ROOT"/dev/share-1/test.mnt.slave/test.slave", &st1) != -1 || errno != ENOENT) {
+		if (stat(MPTS_ROOT "/dev/share-1/test.mnt.slave/test.slave", &st1) != -1 || errno != ENOENT) {
 			pr_perror("/dev/share-1/test.mnt.slave/test.slave exists");
 			return 1;
 		}
-		if (stat(MPTS_ROOT"/dev/slave/test.mnt.slave/test.slave", &st2)) {
+		if (stat(MPTS_ROOT "/dev/slave/test.mnt.slave/test.slave", &st2)) {
 			pr_perror("Can't stat /dev/slave/test.mnt.slave/test.slave");
 			return 1;
 		}
-		if (stat(MPTS_ROOT"/dev/non-root/test", &st1)) {
+		if (stat(MPTS_ROOT "/dev/non-root/test", &st1)) {
 			pr_perror("Can't stat /dev/non-root/test");
 			return 1;
 		}
diff --git a/test/zdtm/static/mprotect00.c b/test/zdtm/static/mprotect00.c
index bf852e596..006b64772 100644
--- a/test/zdtm/static/mprotect00.c
+++ b/test/zdtm/static/mprotect00.c
@@ -10,19 +10,19 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that memory protection migrates correctly\n";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that memory protection migrates correctly\n";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 const static int prots[] = {
 	PROT_NONE,
 	PROT_READ,
-	/* PROT_WRITE, */	/* doesn't work w/o READ */
-	PROT_READ | PROT_WRITE,
+	/* PROT_WRITE, */ /* doesn't work w/o READ */
+		PROT_READ | PROT_WRITE,
 	PROT_READ | PROT_WRITE | PROT_EXEC,
 };
-#define NUM_MPROTS	sizeof(prots) / sizeof(int)
+#define NUM_MPROTS sizeof(prots) / sizeof(int)
 
-static sigjmp_buf segv_ret;		/* we need sig*jmp stuff, otherwise SIGSEGV will reset our handler */
+static sigjmp_buf segv_ret; /* we need sig*jmp stuff, otherwise SIGSEGV will reset our handler */
 static void segfault(int signo)
 {
 	siglongjmp(segv_ret, 1);
@@ -44,12 +44,11 @@ static int check_prot(char *ptr, int prot)
 			fail("PROT_READ bypassed");
 			return -1;
 		}
-	}
-	else		/* we come here on return from SIGSEGV handler */
+	} else /* we come here on return from SIGSEGV handler */
 		if (prot & PROT_READ) {
-			fail("PROT_READ rejected");
-			return -1;
-		}
+		fail("PROT_READ rejected");
+		return -1;
+	}
 
 	if (!sigsetjmp(segv_ret, 1)) {
 		ptr[20] = 67;
@@ -57,13 +56,11 @@ static int check_prot(char *ptr, int prot)
 			fail("PROT_WRITE bypassed");
 			return -1;
 		}
-	}
-	else		/* we come here on return from SIGSEGV handler */
+	} else /* we come here on return from SIGSEGV handler */
 		if (prot & PROT_WRITE) {
-			fail("PROT_WRITE rejected");
-			return -1;
-		}
-
+		fail("PROT_WRITE rejected");
+		return -1;
+	}
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
 		fail("restoring SIGSEGV handler failed");
@@ -73,7 +70,7 @@ static int check_prot(char *ptr, int prot)
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	char *ptr, *ptr_aligned;
 	int pagesize;
@@ -93,12 +90,10 @@ int main(int argc, char ** argv)
 		return -1;
 	}
 
-	ptr_aligned = (char *)(((unsigned long) ptr + pagesize - 1) &
-			       ~(pagesize - 1));
+	ptr_aligned = (char *)(((unsigned long)ptr + pagesize - 1) & ~(pagesize - 1));
 
 	for (i = 0; i < NUM_MPROTS; i++)
-		if (mprotect(ptr_aligned + pagesize * i,
-			     pagesize / 2, prots[i]) < 0) {
+		if (mprotect(ptr_aligned + pagesize * i, pagesize / 2, prots[i]) < 0) {
 			pr_perror("mprotect failed");
 			exit(1);
 		}
diff --git a/test/zdtm/static/msgque.c b/test/zdtm/static/msgque.c
index f52307221..933258cf8 100644
--- a/test/zdtm/static/msgque.c
+++ b/test/zdtm/static/msgque.c
@@ -14,18 +14,18 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc="Tests sysv5 msg queues supporting by checkpointing";
-const char *test_author="Stanislav Kinsbursky <skinsbursky@openvz.org>";
+const char *test_doc = "Tests sysv5 msg queues supporting by checkpointing";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@openvz.org>";
 
 struct msg1 {
 	long mtype;
 	char mtext[30];
 };
 #define TEST_STRING "Test sysv5 msg"
-#define MSG_TYPE 1
+#define MSG_TYPE    1
 
 #define ANOTHER_TEST_STRING "Yet another test sysv5 msg"
-#define ANOTHER_MSG_TYPE 26538
+#define ANOTHER_MSG_TYPE    26538
 
 int main(int argc, char **argv)
 {
@@ -102,8 +102,7 @@ int main(int argc, char **argv)
 		wait(&chret);
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("Parent: child exited with non-zero code %d (%s)",
-			     chret, strerror(chret));
+			fail("Parent: child exited with non-zero code %d (%s)", chret, strerror(chret));
 			goto out;
 		}
 
diff --git a/test/zdtm/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
index 90b4d6883..f9a595864 100644
--- a/test/zdtm/static/mtime_mmap.c
+++ b/test/zdtm/static/mtime_mmap.c
@@ -12,12 +12,12 @@
 #include "zdtmtst.h"
 
 const char *test_doc = "file mmaped for write and being written should change mtime\n"
-			"and be migrated with correct new data";
+		       "and be migrated with correct new data";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-#define FILE_SIZE       (16 * 1024)
+#define FILE_SIZE (16 * 1024)
 
 int main(int argc, char **argv)
 {
@@ -27,8 +27,8 @@ int main(int argc, char **argv)
 	int i;
 	char *ptr;
 	struct stat fst;
-	time_t	mtime_old, mtime_new;
-	time_t	ctime_old, ctime_new;
+	time_t mtime_old, mtime_new;
+	time_t ctime_old, ctime_new;
 
 	test_init(argc, argv);
 
@@ -51,8 +51,7 @@ int main(int argc, char **argv)
 		goto failed;
 	}
 
-	ptr = (char *)mmap(NULL, count, PROT_READ | PROT_WRITE,
-			MAP_SHARED, fd, 0);
+	ptr = (char *)mmap(NULL, count, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 	if (ptr == MAP_FAILED) {
 		pr_perror("mmap() failed");
 		goto failed;
@@ -75,20 +74,17 @@ int main(int argc, char **argv)
 		goto failed;
 	}
 
-
 	mtime_new = fst.st_mtime;
 	/* time of last modification */
 	if (mtime_new <= mtime_old) {
-		fail("mtime %ld wasn't updated on mmapped %s file",
-			mtime_new, filename);
+		fail("mtime %ld wasn't updated on mmapped %s file", mtime_new, filename);
 		goto failed;
 	}
 
 	ctime_new = fst.st_ctime;
 	/* time of last status change */
 	if (ctime_new <= ctime_old) {
-		fail("time of last status change of %s file wasn't changed",
-			filename);
+		fail("time of last status change of %s file wasn't changed", filename);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index 46bb90639..e220daa7f 100644
--- a/test/zdtm/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
@@ -4,14 +4,14 @@
 
 #include "zdtmtst.h"
 
-#define LO_CONF_DIR_PATH "/proc/sys/net/ipv4/conf/lo"
-#define DEF_CONF_DIR_PATH "/proc/sys/net/ipv4/conf/default"
-#define ALL_CONF_DIR_PATH "/proc/sys/net/ipv4/conf/all"
-#define LO_CONF6_DIR_PATH "/proc/sys/net/ipv6/conf/lo"
+#define LO_CONF_DIR_PATH   "/proc/sys/net/ipv4/conf/lo"
+#define DEF_CONF_DIR_PATH  "/proc/sys/net/ipv4/conf/default"
+#define ALL_CONF_DIR_PATH  "/proc/sys/net/ipv4/conf/all"
+#define LO_CONF6_DIR_PATH  "/proc/sys/net/ipv6/conf/lo"
 #define DEF_CONF6_DIR_PATH "/proc/sys/net/ipv6/conf/default"
 #define ALL_CONF6_DIR_PATH "/proc/sys/net/ipv6/conf/all"
 
-#define INT_MAX ((int)(~0U>>1))
+#define INT_MAX ((int)(~0U >> 1))
 #define INT_MIN (-INT_MAX - 1)
 
 char *devconfs4[] = {
@@ -55,37 +55,37 @@ struct range {
 };
 
 struct range rand_range4[] = {
-	{0, 1},	/* accept_local */
-	{-1, 0},	/* accept_source_route */
-	{0, 1},	/* arp_accept */
-	{0, 2},	/* arp_announce */
-	{0, 1},	/* arp_filter */
-	{0, 8},	/* arp_ignore */
-	{0, 1},	/* arp_notify */
-	{0, 1},	/* bootp_relay */
-	{0, 1},	/* disable_policy */
-	{0, 1},	/* disable_xfrm */
-	{0, 1},	/* drop_gratuitous_arp */
-	{0, 1},	/* drop_unicast_in_l2_multicast */
-	{0, INT_MAX},	/* force_igmp_version */
-	{0, 1},	/* forwarding */
-	{0, 1},	/* accept_redirects */
-	{0, INT_MAX},	/* igmpv2_unsolicited_report_interval */
-	{0, INT_MAX},	/* igmpv3_unsolicited_report_interval */
-	{0, 1},	/* ignore_routes_with_linkdown */
-	{0, 1},	/* log_martians */
-	{0, 1},	/* mc_forwarding */
-	{-1, INT_MAX},	/* medium_id */
-	{0, 1},	/* promote_secondaries */
-	{0, 1},	/* proxy_arp */
-	{0, 1},	/* proxy_arp_pvlan */
-	{0, 1},	/* route_localnet */
-	{0, 2},	/* rp_filter */
-	{0, 1},	/* secure_redirects */
-	{0, 1},	/* send_redirects */
-	{0, 1},	/* shared_media */
-	{0, 1},	/* src_valid_mark */
-	{INT_MIN, INT_MAX},	/* tag */
+	{ 0, 1 }, /* accept_local */
+	{ -1, 0 }, /* accept_source_route */
+	{ 0, 1 }, /* arp_accept */
+	{ 0, 2 }, /* arp_announce */
+	{ 0, 1 }, /* arp_filter */
+	{ 0, 8 }, /* arp_ignore */
+	{ 0, 1 }, /* arp_notify */
+	{ 0, 1 }, /* bootp_relay */
+	{ 0, 1 }, /* disable_policy */
+	{ 0, 1 }, /* disable_xfrm */
+	{ 0, 1 }, /* drop_gratuitous_arp */
+	{ 0, 1 }, /* drop_unicast_in_l2_multicast */
+	{ 0, INT_MAX }, /* force_igmp_version */
+	{ 0, 1 }, /* forwarding */
+	{ 0, 1 }, /* accept_redirects */
+	{ 0, INT_MAX }, /* igmpv2_unsolicited_report_interval */
+	{ 0, INT_MAX }, /* igmpv3_unsolicited_report_interval */
+	{ 0, 1 }, /* ignore_routes_with_linkdown */
+	{ 0, 1 }, /* log_martians */
+	{ 0, 1 }, /* mc_forwarding */
+	{ -1, INT_MAX }, /* medium_id */
+	{ 0, 1 }, /* promote_secondaries */
+	{ 0, 1 }, /* proxy_arp */
+	{ 0, 1 }, /* proxy_arp_pvlan */
+	{ 0, 1 }, /* route_localnet */
+	{ 0, 2 }, /* rp_filter */
+	{ 0, 1 }, /* secure_redirects */
+	{ 0, 1 }, /* send_redirects */
+	{ 0, 1 }, /* shared_media */
+	{ 0, 1 }, /* src_valid_mark */
+	{ INT_MIN, INT_MAX }, /* tag */
 };
 
 char *devconfs6[] = {
@@ -134,52 +134,52 @@ char *devconfs6[] = {
 };
 
 #define IPV6_MIN_MTU 1280
-#define ROUTER_MAX 60
+#define ROUTER_MAX   60
 /* According to kernel docs do not make max_addresses too large */
 #define MAX_ADDRESSES 128
 
 struct range rand_range6[] = {
-	{0, 2},	/* accept_dad */
-	{0, 2},	/* accept_ra */
-	{0, 1},	/* accept_ra_defrtr */
-	{0, 1},	/* accept_ra_from_local */
-	{0, INT_MAX},	/* accept_ra_min_hop_limit */
-	{0, 1},	/* accept_ra_mtu */
-	{0, 1},	/* accept_ra_pinfo */
-	{0, INT_MAX},	/* accept_ra_rt_info_max_plen */
-	{0, 1},	/* accept_ra_rtr_pref */
-	{-1, 0},	/* accept_source_route */
-	{0, 1},	/* autoconf */
-	{0, INT_MAX},	/* dad_transmits */
-	{0, 1},	/* disable_ipv6 */
-	{0, 1},	/* drop_unicast_in_l2_multicast */
-	{0, 1},	/* drop_unsolicited_na */
-	{0, 2},	/* force_mld_version */
-	{0, 1},	/* force_tllao */
-	{0, 1},	/* forwarding */
-	{0, 1},	/* accept_redirects */
-	{1, 255},	/* hop_limit */
-	{0, 1},	/* ignore_routes_with_linkdown */
-	{-1, 1},	/* keep_addr_on_down */
-	{0, MAX_ADDRESSES},	/* max_addresses */
-	{0, INT_MAX},	/* max_desync_factor */
-	{0, INT_MAX},	/* mldv1_unsolicited_report_interval */
-	{0, INT_MAX},	/* mldv2_unsolicited_report_interval */
-	{IPV6_MIN_MTU, IPV6_MIN_MTU},	/* mtu */
-	{0, 1},	/* ndisc_notify */
-	{0, 1},	/* optimistic_dad */
-	{0, 1},	/* proxy_ndp */
-	{0, INT_MAX},	/* regen_max_retry */
-	{0, ROUTER_MAX},	/* router_probe_interval */
-	{0, ROUTER_MAX},	/* router_solicitation_delay */
-	{0, ROUTER_MAX},	/* router_solicitation_interval */
-	{0, ROUTER_MAX},	/* router_solicitations */
-	{0, 1},	/* suppress_frag_ndisc */
-	{0, INT_MAX},	/* temp_prefered_lft */
-	{0, INT_MAX},	/* temp_valid_lft */
-	{0, 1},	/* use_oif_addrs_only */
-	{0, 1},	/* use_optimistic */
-	{0, 2},	/* use_tempaddr */
+	{ 0, 2 }, /* accept_dad */
+	{ 0, 2 }, /* accept_ra */
+	{ 0, 1 }, /* accept_ra_defrtr */
+	{ 0, 1 }, /* accept_ra_from_local */
+	{ 0, INT_MAX }, /* accept_ra_min_hop_limit */
+	{ 0, 1 }, /* accept_ra_mtu */
+	{ 0, 1 }, /* accept_ra_pinfo */
+	{ 0, INT_MAX }, /* accept_ra_rt_info_max_plen */
+	{ 0, 1 }, /* accept_ra_rtr_pref */
+	{ -1, 0 }, /* accept_source_route */
+	{ 0, 1 }, /* autoconf */
+	{ 0, INT_MAX }, /* dad_transmits */
+	{ 0, 1 }, /* disable_ipv6 */
+	{ 0, 1 }, /* drop_unicast_in_l2_multicast */
+	{ 0, 1 }, /* drop_unsolicited_na */
+	{ 0, 2 }, /* force_mld_version */
+	{ 0, 1 }, /* force_tllao */
+	{ 0, 1 }, /* forwarding */
+	{ 0, 1 }, /* accept_redirects */
+	{ 1, 255 }, /* hop_limit */
+	{ 0, 1 }, /* ignore_routes_with_linkdown */
+	{ -1, 1 }, /* keep_addr_on_down */
+	{ 0, MAX_ADDRESSES }, /* max_addresses */
+	{ 0, INT_MAX }, /* max_desync_factor */
+	{ 0, INT_MAX }, /* mldv1_unsolicited_report_interval */
+	{ 0, INT_MAX }, /* mldv2_unsolicited_report_interval */
+	{ IPV6_MIN_MTU, IPV6_MIN_MTU }, /* mtu */
+	{ 0, 1 }, /* ndisc_notify */
+	{ 0, 1 }, /* optimistic_dad */
+	{ 0, 1 }, /* proxy_ndp */
+	{ 0, INT_MAX }, /* regen_max_retry */
+	{ 0, ROUTER_MAX }, /* router_probe_interval */
+	{ 0, ROUTER_MAX }, /* router_solicitation_delay */
+	{ 0, ROUTER_MAX }, /* router_solicitation_interval */
+	{ 0, ROUTER_MAX }, /* router_solicitations */
+	{ 0, 1 }, /* suppress_frag_ndisc */
+	{ 0, INT_MAX }, /* temp_prefered_lft */
+	{ 0, INT_MAX }, /* temp_valid_lft */
+	{ 0, 1 }, /* use_oif_addrs_only */
+	{ 0, 1 }, /* use_optimistic */
+	{ 0, 2 }, /* use_tempaddr */
 };
 
 struct test_conf {
@@ -191,8 +191,8 @@ struct test_conf {
 	char *dir6;
 } lo, def, all;
 
-static int save_conf(FILE *fp, int *conf, int *conf_rand,
-		struct range *range, char *path) {
+static int save_conf(FILE *fp, int *conf, int *conf_rand, struct range *range, char *path)
+{
 	int ret;
 
 	/*
@@ -207,11 +207,13 @@ static int save_conf(FILE *fp, int *conf, int *conf_rand,
 	return 0;
 }
 
-static int rand_in_small_range(struct range *r) {
+static int rand_in_small_range(struct range *r)
+{
 	return lrand48() % (r->max - r->min + 1) + r->min;
 }
 
-static int rand_in_range(struct range *r) {
+static int rand_in_range(struct range *r)
+{
 	struct range small;
 	int mid = r->max / 2 + r->min / 2;
 	int half = r->max / 2 - r->min / 2;
@@ -230,8 +232,8 @@ static int rand_in_range(struct range *r) {
 	return rand_in_small_range(&small);
 }
 
-static int gen_conf(FILE *fp, int *conf, int *conf_rand,
-		struct range *range, char *path) {
+static int gen_conf(FILE *fp, int *conf, int *conf_rand, struct range *range, char *path)
+{
 	int ret;
 	/*
 	 * Set random value
@@ -249,8 +251,8 @@ static int gen_conf(FILE *fp, int *conf, int *conf_rand,
 
 #define MAX_MSEC_GRANULARITY 10
 
-static int check_conf(FILE *fp, int *conf, int *conf_rand,
-		struct range *range, char *path) {
+static int check_conf(FILE *fp, int *conf, int *conf_rand, struct range *range, char *path)
+{
 	int ret;
 	int val;
 
@@ -264,11 +266,10 @@ static int check_conf(FILE *fp, int *conf, int *conf_rand,
 	}
 
 	if (val != *conf_rand) {
-		fail("Option \"%s\" changed from %d to %d",
-		     path, *conf_rand, val);
-		if ((strstr(path, "mldv1_unsolicited_report_interval")
-		     || strstr(path, "mldv2_unsolicited_report_interval"))
-		    && val - *conf_rand < MAX_MSEC_GRANULARITY)
+		fail("Option \"%s\" changed from %d to %d", path, *conf_rand, val);
+		if ((strstr(path, "mldv1_unsolicited_report_interval") ||
+		     strstr(path, "mldv2_unsolicited_report_interval")) &&
+		    val - *conf_rand < MAX_MSEC_GRANULARITY)
 			return 0;
 		return -1;
 	}
@@ -276,8 +277,8 @@ static int check_conf(FILE *fp, int *conf, int *conf_rand,
 	return 0;
 }
 
-static int restore_conf(FILE *fp, int *conf, int *conf_rand,
-		struct range *range, char *path) {
+static int restore_conf(FILE *fp, int *conf, int *conf_rand, struct range *range, char *path)
+{
 	int ret;
 	/*
 	 * Restore opt
@@ -291,8 +292,9 @@ static int restore_conf(FILE *fp, int *conf, int *conf_rand,
 	return 0;
 }
 
-static int for_each_option_do(int (*f)(FILE *fp, int *conf, int *conf_rand,
-			struct range *range, char *path), struct test_conf *tc) {
+static int for_each_option_do(int (*f)(FILE *fp, int *conf, int *conf_rand, struct range *range, char *path),
+			      struct test_conf *tc)
+{
 	int ret;
 	int i;
 
@@ -356,7 +358,8 @@ static int for_each_option_do(int (*f)(FILE *fp, int *conf, int *conf_rand,
 #define IPV6ADDR_EXAMPLE "2607:f0d0:1002:0051:0000:0000:0000:0004"
 #define MAX_STR_CONF_LEN 200
 
-static int set_stable_secret(struct test_conf *tc) {
+static int set_stable_secret(struct test_conf *tc)
+{
 	int ret;
 	FILE *fp;
 	char path[PATH_MAX];
@@ -388,11 +391,12 @@ static int set_stable_secret(struct test_conf *tc) {
 	return 0;
 }
 
-static int check_stable_secret(struct test_conf *tc) {
+static int check_stable_secret(struct test_conf *tc)
+{
 	int ret;
 	FILE *fp;
 	char path[PATH_MAX];
-	char val[MAX_STR_CONF_LEN+1];
+	char val[MAX_STR_CONF_LEN + 1];
 
 	ret = snprintf(path, sizeof(path), "%s/%s", tc->dir6, "stable_secret");
 	if (ret < 0) {
@@ -418,8 +422,7 @@ static int check_stable_secret(struct test_conf *tc) {
 	}
 
 	if (strcmp(val, IPV6ADDR_EXAMPLE)) {
-		fail("Option \"%s\" changed from %s to %s",
-		     path, IPV6ADDR_EXAMPLE, val);
+		fail("Option \"%s\" changed from %s to %s", path, IPV6ADDR_EXAMPLE, val);
 		fclose(fp);
 		return -1;
 	}
diff --git a/test/zdtm/static/netns-nf.c b/test/zdtm/static/netns-nf.c
index 393f0e732..2d5968503 100644
--- a/test/zdtm/static/netns-nf.c
+++ b/test/zdtm/static/netns-nf.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that netfilter rules (some) are kept";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that netfilter rules (some) are kept";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/netns-nft-ipt.c b/test/zdtm/static/netns-nft-ipt.c
index 02c2a2f58..627500151 100644
--- a/test/zdtm/static/netns-nft-ipt.c
+++ b/test/zdtm/static/netns-nft-ipt.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that both nftables & iptables rules (some) are C/R properly";
-const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+const char *test_doc = "Check that both nftables & iptables rules (some) are C/R properly";
+const char *test_author = "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/netns-nft.c b/test/zdtm/static/netns-nft.c
index f4991afda..673cc007e 100644
--- a/test/zdtm/static/netns-nft.c
+++ b/test/zdtm/static/netns-nft.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that nft rules (some) are kept";
-const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+const char *test_doc = "Check that nft rules (some) are kept";
+const char *test_author = "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/netns.c b/test/zdtm/static/netns.c
index b7a75b6d9..bc7f66319 100644
--- a/test/zdtm/static/netns.c
+++ b/test/zdtm/static/netns.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that network environment (links, addresses and routes) are preserved";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that network environment (links, addresses and routes) are preserved";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/netns_lock.c b/test/zdtm/static/netns_lock.c
index f58ba83da..9b3a4f1c0 100644
--- a/test/zdtm/static/netns_lock.c
+++ b/test/zdtm/static/netns_lock.c
@@ -7,9 +7,9 @@ const char *test_author = "Zeyad Yasser <zeyady98@gmail.com>";
 #include <fcntl.h>
 #include <sched.h>
 
-#define NS_PATH "/var/run/netns/criu-net-lock-test"
+#define NS_PATH	      "/var/run/netns/criu-net-lock-test"
 #define SYNCFILE_PATH "net_lock.sync"
-#define MAX_RETRY 3
+#define MAX_RETRY     3
 
 int main(int argc, char **argv)
 {
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 	 */
 
 	for (i = 0; i < MAX_RETRY; i++) {
-		if (access(SYNCFILE_PATH, F_OK )) {
+		if (access(SYNCFILE_PATH, F_OK)) {
 			/* Netns not created yet by post-start hook */
 			sleep(1);
 			continue;
diff --git a/test/zdtm/static/netns_sub.c b/test/zdtm/static/netns_sub.c
index 9f77bf96b..501e97bd7 100644
--- a/test/zdtm/static/netns_sub.c
+++ b/test/zdtm/static/netns_sub.c
@@ -14,7 +14,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check dump and restore a few network namespaces";
+const char *test_doc = "Check dump and restore a few network namespaces";
 
 static int fill_name(int nsid, struct sockaddr_un *name)
 {
@@ -41,7 +41,7 @@ static int create_socket(int nsid)
 		return -1;
 	}
 
-	if (bind(sk, (struct sockaddr *) &name, len) < 0) {
+	if (bind(sk, (struct sockaddr *)&name, len) < 0) {
 		pr_perror("bind");
 		close(sk);
 		return -1;
@@ -63,7 +63,7 @@ static int check_socket(int nsid, bool success)
 		return -1;
 	}
 
-	if (connect(sk, (struct sockaddr *) &name, len) < 0) {
+	if (connect(sk, (struct sockaddr *)&name, len) < 0) {
 		if (!success && errno == ECONNREFUSED)
 			return 0;
 		pr_perror("connect to %d", nsid);
diff --git a/test/zdtm/static/netns_sub_sysctl.c b/test/zdtm/static/netns_sub_sysctl.c
index bf828e08e..545a17308 100644
--- a/test/zdtm/static/netns_sub_sysctl.c
+++ b/test/zdtm/static/netns_sub_sysctl.c
@@ -3,8 +3,8 @@
 #include "zdtmtst.h"
 #include "sysctl.h"
 
-const char *test_doc	= "Check dump and restore a net.unix.max_dgram_qlen sysctl parameter in subns";
-const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+const char *test_doc = "Check dump and restore a net.unix.max_dgram_qlen sysctl parameter in subns";
+const char *test_author = "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
 
 typedef struct {
 	const char *path;
@@ -12,12 +12,9 @@ typedef struct {
 	int new;
 } sysctl_opt_t;
 
-#define CONF_UNIX_BASE	"/proc/sys/net/unix"
+#define CONF_UNIX_BASE "/proc/sys/net/unix"
 
-static sysctl_opt_t net_unix_params[] = {
-	{CONF_UNIX_BASE"/max_dgram_qlen", 0, 0},
-	{NULL, 0, 0}
-};
+static sysctl_opt_t net_unix_params[] = { { CONF_UNIX_BASE "/max_dgram_qlen", 0, 0 }, { NULL, 0, 0 } };
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/netns_sub_veth.c b/test/zdtm/static/netns_sub_veth.c
index c0a71b337..e072d7816 100644
--- a/test/zdtm/static/netns_sub_veth.c
+++ b/test/zdtm/static/netns_sub_veth.c
@@ -20,12 +20,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check dump and restore a few network namespaces";
+const char *test_doc = "Check dump and restore a few network namespaces";
 
 #ifndef NSIO
-#define NSIO    0xb7
-#define NS_GET_USERNS   _IO(NSIO, 0x1)
-#define NS_GET_PARENT   _IO(NSIO, 0x2)
+#define NSIO	      0xb7
+#define NS_GET_USERNS _IO(NSIO, 0x1)
+#define NS_GET_PARENT _IO(NSIO, 0x2)
 #endif
 
 int main(int argc, char **argv)
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
 	task_waiter_t lock;
 	pid_t pid[2];
 	int status = -1, ret, i;
-        struct rtnl_link *link = NULL, *new;
+	struct rtnl_link *link = NULL, *new;
 	struct nl_sock *sk;
 	int has_index = 1;
 
@@ -77,11 +77,13 @@ int main(int argc, char **argv)
 	for (i = 0; i < 2; i++) {
 		char cmd[4096];
 
-		snprintf(cmd, sizeof(cmd), "ip link add name zdtm%d index %d netns %d type veth peer name zdtm%d index %d",
-				i, i * 10 + 12, pid[i], i, i * 10 + 12);
+		snprintf(cmd, sizeof(cmd),
+			 "ip link add name zdtm%d index %d netns %d type veth peer name zdtm%d index %d", i,
+			 i * 10 + 12, pid[i], i, i * 10 + 12);
 		if (system(cmd)) {
 			has_index = 0;
-			snprintf(cmd, sizeof(cmd), "ip link add name zdtm%d netns %d type veth peer name zdtm%d", i, pid[i], i);
+			snprintf(cmd, sizeof(cmd), "ip link add name zdtm%d netns %d type veth peer name zdtm%d", i,
+				 pid[i], i);
 			if (system(cmd))
 				return 1;
 		}
diff --git a/test/zdtm/static/non_uniform_share_propagation.c b/test/zdtm/static/non_uniform_share_propagation.c
index 7a18247ab..e4f7ee275 100644
--- a/test/zdtm/static/non_uniform_share_propagation.c
+++ b/test/zdtm/static/non_uniform_share_propagation.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check non-uniform shares restore fine";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check non-uniform shares restore fine";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/ofd_file_locks.c b/test/zdtm/static/ofd_file_locks.c
index 5b19532f8..68b6f22f5 100644
--- a/test/zdtm/static/ofd_file_locks.c
+++ b/test/zdtm/static/ofd_file_locks.c
@@ -16,9 +16,7 @@ static int parse_ofd_lock(char *buf, struct flock *lck)
 	if (strncmp(buf, "lock:\t", 6) != 0)
 		return 1; /* isn't lock, skip record */
 
-	num = sscanf(buf,
-		"%*s %*d: %s %s %s %*d %*x:%*x:%*d %lld %s",
-		fl_flag, fl_type, fl_option, &start, fl_end);
+	num = sscanf(buf, "%*s %*d: %s %s %s %*d %*x:%*x:%*d %lld %s", fl_flag, fl_type, fl_option, &start, fl_end);
 
 	if (num < 4) {
 		pr_err("Invalid lock info %s\n", buf);
@@ -118,9 +116,7 @@ out:
 
 static int check_file_locks_match(struct flock *orig_lck, struct flock *lck)
 {
-	return orig_lck->l_start == lck->l_start &&
-		orig_lck->l_len == lck->l_len &&
-		orig_lck->l_type == lck->l_type;
+	return orig_lck->l_start == lck->l_start && orig_lck->l_len == lck->l_len && orig_lck->l_type == lck->l_type;
 }
 
 int check_file_lock_restored(int pid, int fd, struct flock *lck)
@@ -164,30 +160,30 @@ int zdtm_fcntl(int fd, int cmd, struct flock *f)
 {
 #if defined(__i386__)
 #ifndef __NR_fcntl64
-# define __NR_fcntl64 221
+#define __NR_fcntl64 221
 #endif
 	struct flock64 f64 = {};
 	int ret;
 
 	switch (cmd) {
-		case F_OFD_SETLK:
-		case F_OFD_SETLKW:
-			f64.l_type	= f->l_type;
-			f64.l_whence	= f->l_whence;
-			f64.l_start	= f->l_start;
-			f64.l_len	= f->l_len;
-			f64.l_pid	= f->l_pid;
-			return syscall(__NR_fcntl64, fd, cmd, &f64);
-		case F_OFD_GETLK:
-			ret = syscall(__NR_fcntl64, fd, cmd, &f64);
-			f->l_type	= f64.l_type;
-			f->l_whence	= f64.l_whence;
-			f->l_start	= f64.l_start;
-			f->l_len	= f64.l_len;
-			f->l_pid	= f64.l_pid;
-			return ret;
-		default:
-			break;
+	case F_OFD_SETLK:
+	case F_OFD_SETLKW:
+		f64.l_type = f->l_type;
+		f64.l_whence = f->l_whence;
+		f64.l_start = f->l_start;
+		f64.l_len = f->l_len;
+		f64.l_pid = f->l_pid;
+		return syscall(__NR_fcntl64, fd, cmd, &f64);
+	case F_OFD_GETLK:
+		ret = syscall(__NR_fcntl64, fd, cmd, &f64);
+		f->l_type = f64.l_type;
+		f->l_whence = f64.l_whence;
+		f->l_start = f64.l_start;
+		f->l_len = f64.l_len;
+		f->l_pid = f64.l_pid;
+		return ret;
+	default:
+		break;
 	}
 #endif
 	return fcntl(fd, cmd, f);
diff --git a/test/zdtm/static/oom_score_adj.c b/test/zdtm/static/oom_score_adj.c
index 8e9c40782..cbbdfb810 100644
--- a/test/zdtm/static/oom_score_adj.c
+++ b/test/zdtm/static/oom_score_adj.c
@@ -65,7 +65,6 @@ int set_oom_score_adj(const char *path, int value)
 	return ret;
 }
 
-
 int main(int argc, char *argv[])
 {
 	int ret;
@@ -84,8 +83,7 @@ int main(int argc, char *argv[])
 		return -1;
 
 	if (new_oom_score_adj != test_value) {
-		fail("OOM score value %d is different after restore: %d",
-				test_value, new_oom_score_adj);
+		fail("OOM score value %d is different after restore: %d", test_value, new_oom_score_adj);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/opath_file.c b/test/zdtm/static/opath_file.c
index 40e5987c3..779060844 100644
--- a/test/zdtm/static/opath_file.c
+++ b/test/zdtm/static/opath_file.c
@@ -5,13 +5,13 @@
 
 #include "zdtmtst.h"
 
-#define TEST_FILE "test_file"
-#define BUF_SIZE 4096
-#define fdinfo_field(str, field)        !strncmp(str, field":", sizeof(field))
-#define pr_debug(format, arg...) test_msg("DBG: %s:%d: " format, __FILE__, __LINE__, ## arg)
+#define TEST_FILE		 "test_file"
+#define BUF_SIZE		 4096
+#define fdinfo_field(str, field) !strncmp(str, field ":", sizeof(field))
+#define pr_debug(format, arg...) test_msg("DBG: %s:%d: " format, __FILE__, __LINE__, ##arg)
 
-const char *test_doc	= "Check open file with O_PATH preserved";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check open file with O_PATH preserved";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/overmount_dev.c b/test/zdtm/static/overmount_dev.c
index e126d301d..dd16c11a8 100644
--- a/test/zdtm/static/overmount_dev.c
+++ b/test/zdtm/static/overmount_dev.c
@@ -8,10 +8,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a device special file "
-			"open in a directory which has been mounted over by "
-			"another filesystem";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can migrate with a device special file "
+		       "open in a directory which has been mounted over by "
+		       "another filesystem";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/overmount_fifo.c b/test/zdtm/static/overmount_fifo.c
index c73793036..f3693fef6 100644
--- a/test/zdtm/static/overmount_fifo.c
+++ b/test/zdtm/static/overmount_fifo.c
@@ -7,10 +7,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a named pipe "
-			"open in a directory which has been mounted over by "
-			"another filesystem";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can migrate with a named pipe "
+		       "open in a directory which has been mounted over by "
+		       "another filesystem";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/overmount_file.c b/test/zdtm/static/overmount_file.c
index e20d98f93..178b34182 100644
--- a/test/zdtm/static/overmount_file.c
+++ b/test/zdtm/static/overmount_file.c
@@ -7,10 +7,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can't migrate with a file open in a "
-			"directory which has been mounted over by another "
-			"filesystem";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can't migrate with a file open in a "
+		       "directory which has been mounted over by another "
+		       "filesystem";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/overmount_sock.c b/test/zdtm/static/overmount_sock.c
index 8d2d28bf6..6e3ab935b 100644
--- a/test/zdtm/static/overmount_sock.c
+++ b/test/zdtm/static/overmount_sock.c
@@ -10,10 +10,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a unix socket "
-			"bound in a directory which has been mounted over by"
-			" another filesystem";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can migrate with a unix socket "
+		       "bound in a directory which has been mounted over by"
+		       " another filesystem";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -44,7 +44,7 @@ static int setup_srv_sock(const char *filename)
 		return -1;
 	}
 
-	if (bind(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0) {
+	if (bind(sock, (struct sockaddr *)&name, SUN_LEN(&name)) < 0) {
 		pr_perror("can't bind to socket \"%s\"", filename);
 		goto err;
 	}
@@ -72,7 +72,7 @@ static int setup_clnt_sock(const char *filename)
 	if (sock < 0)
 		return -1;
 
-	if (connect(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0)
+	if (connect(sock, (struct sockaddr *)&name, SUN_LEN(&name)) < 0)
 		goto err;
 
 	return sock;
@@ -81,7 +81,7 @@ err:
 	return -1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int sock, acc_sock, ret;
 	char path[256];
@@ -111,7 +111,7 @@ int main(int argc, char ** argv)
 		goto out;
 	}
 
-	if (pid == 0) {	/* child writes to the overmounted socket and returns */
+	if (pid == 0) { /* child writes to the overmounted socket and returns */
 		close(sock);
 
 		sock = setup_clnt_sock(path);
@@ -159,8 +159,7 @@ int main(int argc, char ** argv)
 	if (WIFEXITED(ret)) {
 		ret = WEXITSTATUS(ret);
 		if (ret) {
-			fail("child exited with nonzero code %d (%s)", ret,
-				strerror(ret));
+			fail("child exited with nonzero code %d (%s)", ret, strerror(ret));
 			goto out;
 		}
 	}
diff --git a/test/zdtm/static/overmount_with_shared_parent.c b/test/zdtm/static/overmount_with_shared_parent.c
index 1fcb5a5cb..95b455ec0 100644
--- a/test/zdtm/static/overmount_with_shared_parent.c
+++ b/test/zdtm/static/overmount_with_shared_parent.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check overmount on shared parent works";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check overmount on shared parent works";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/overmounted_file.c b/test/zdtm/static/overmounted_file.c
index ee1d1c58f..c72d27cb8 100644
--- a/test/zdtm/static/overmounted_file.c
+++ b/test/zdtm/static/overmounted_file.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check open file on overmounted mounts doesn't dump";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check open file on overmounted mounts doesn't dump";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 #define DATA "Data"
 
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 	}
 
 	ssprintf(file, "%s/file", overmounted);
-	fd = open(file, O_CREAT|O_WRONLY, 0600);
+	fd = open(file, O_CREAT | O_WRONLY, 0600);
 	if (fd < 0) {
 		pr_perror("open");
 		return 1;
diff --git a/test/zdtm/static/packet_sock.c b/test/zdtm/static/packet_sock.c
index 36516fa99..4a9078f81 100644
--- a/test/zdtm/static/packet_sock.c
+++ b/test/zdtm/static/packet_sock.c
@@ -24,30 +24,27 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 #include <linux/if_packet.h>
 #include <net/ethernet.h>
 
-#define SK_RESERVE	8
-#define DEF_FANOUT	13
+#define SK_RESERVE 8
+#define DEF_FANOUT 13
 
 #ifndef PACKET_FANOUT
-#define PACKET_FANOUT	18
+#define PACKET_FANOUT 18
 #endif
 
 static int test_sockaddr(int n, struct sockaddr_ll *have, struct sockaddr_ll *want)
 {
 	if (have->sll_family != want->sll_family) {
-		fail("%d Family mismatch %d/%d", n,
-				(int)have->sll_family, (int)want->sll_family);
+		fail("%d Family mismatch %d/%d", n, (int)have->sll_family, (int)want->sll_family);
 		return 1;
 	}
 
 	if (have->sll_protocol != want->sll_protocol) {
-		fail("%d Proto mismatch %d/%d", n,
-				(int)have->sll_protocol, (int)want->sll_protocol);
+		fail("%d Proto mismatch %d/%d", n, (int)have->sll_protocol, (int)want->sll_protocol);
 		return 1;
 	}
 
 	if (have->sll_ifindex != want->sll_ifindex) {
-		fail("%d Index mismatch %d/%d", n,
-				have->sll_ifindex, want->sll_ifindex);
+		fail("%d Index mismatch %d/%d", n, have->sll_ifindex, want->sll_ifindex);
 		return 1;
 	}
 
@@ -56,19 +53,19 @@ static int test_sockaddr(int n, struct sockaddr_ll *have, struct sockaddr_ll *wa
 }
 
 #ifndef MAX_ADDR_LEN
-#define MAX_ADDR_LEN	32
+#define MAX_ADDR_LEN 32
 #endif
 
 struct packet_mreq_max {
-	int             mr_ifindex;
-	unsigned short  mr_type;
-	unsigned short  mr_alen;
-	unsigned char   mr_address[MAX_ADDR_LEN];
+	int mr_ifindex;
+	unsigned short mr_type;
+	unsigned short mr_alen;
+	unsigned char mr_address[MAX_ADDR_LEN];
 };
 
-#define LO_ADDR_LEN	6
+#define LO_ADDR_LEN 6
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
 
 struct tpacket_req3 {
 	unsigned int tp_block_size;
diff --git a/test/zdtm/static/packet_sock_mmap.c b/test/zdtm/static/packet_sock_mmap.c
index 93d6ebbf2..2a105582b 100644
--- a/test/zdtm/static/packet_sock_mmap.c
+++ b/test/zdtm/static/packet_sock_mmap.c
@@ -18,7 +18,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 #include <net/ethernet.h>
 #include <sys/mman.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
 
 struct tpacket_req3 {
 	unsigned int tp_block_size;
diff --git a/test/zdtm/static/packet_sock_spkt.c b/test/zdtm/static/packet_sock_spkt.c
index 55cd16518..7aaaabd14 100644
--- a/test/zdtm/static/packet_sock_spkt.c
+++ b/test/zdtm/static/packet_sock_spkt.c
@@ -23,7 +23,7 @@ static int do_bind(int sk)
 	addr.sa_family = AF_PACKET;
 	strcpy(addr.sa_data, "lo");
 
-	return bind(sk, (struct sockaddr *) &addr, sizeof(addr));
+	return bind(sk, (struct sockaddr *)&addr, sizeof(addr));
 }
 
 static int check_socket_binding(int sk, char *dev)
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 
 	sk1 = socket(AF_PACKET, SOCK_PACKET, htons(ETH_P_ALL));
 
-	if (sk1  < 0) {
+	if (sk1 < 0) {
 		pr_perror("Can't create socket 1");
 		return 1;
 	}
diff --git a/test/zdtm/static/pdeath_sig.c b/test/zdtm/static/pdeath_sig.c
index 0f7436f63..d680e4842 100644
--- a/test/zdtm/static/pdeath_sig.c
+++ b/test/zdtm/static/pdeath_sig.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that pdeath sig is preserved";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that pdeath sig is preserved";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 static int sigrecvd = 0;
 static void sigh(int s, siginfo_t *i, void *d)
diff --git a/test/zdtm/static/pid00.c b/test/zdtm/static/pid00.c
index 4fd3e09aa..a60f8af45 100644
--- a/test/zdtm/static/pid00.c
+++ b/test/zdtm/static/pid00.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that p?pid and e?[ug]id didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that p?pid and e?[ug]id didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int setfsuid(uid_t fsuid);
 int setfsgid(uid_t fsgid);
@@ -40,11 +40,12 @@ int main(int argc, char **argv)
 		read(f_p[0], &res, 1);
 		close(f_p[0]);
 
-#define CHECK_ID(__t, __w, __e)	do {			\
-		if (__t##id != w_##__t##__w##id) {	\
-			res = __e;			\
-			goto bad;			\
-		}					\
+#define CHECK_ID(__t, __w, __e)                    \
+	do {                                       \
+		if (__t##id != w_##__t##__w##id) { \
+			res = __e;                 \
+			goto bad;                  \
+		}                                  \
 	} while (0)
 
 		rid = eid = sid = fsid = 0;
@@ -65,7 +66,7 @@ int main(int argc, char **argv)
 		CHECK_ID(fs, g, '8');
 
 		res = '0';
-bad:
+	bad:
 		write(r_p[1], &res, 1);
 		close(r_p[1]);
 		_exit(0);
diff --git a/test/zdtm/static/pid_file.c b/test/zdtm/static/pid_file.c
index 3ee6a3942..bd4df6bfb 100644
--- a/test/zdtm/static/pid_file.c
+++ b/test/zdtm/static/pid_file.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc 	= "Check that environment didn't change";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Check that environment didn't change";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/pipe00.c b/test/zdtm/static/pipe00.c
index dd487d091..492722573 100644
--- a/test/zdtm/static/pipe00.c
+++ b/test/zdtm/static/pipe00.c
@@ -6,12 +6,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Lock inversion";
-const char *test_author	= "Andrey Vagin <avagin@parallels.com>";
+const char *test_doc = "Lock inversion";
+const char *test_author = "Andrey Vagin <avagin@parallels.com>";
 
 #define TEST_STRING "Hello world"
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pipe1[2];
 	int pipe2[2];
@@ -42,7 +42,7 @@ int main(int argc, char ** argv)
 			return 1;
 		}
 	} else {
-		if (dup2(pipe1[0], 12) == -1 ||	dup2(pipe2[1], 11) == -1) {
+		if (dup2(pipe1[0], 12) == -1 || dup2(pipe2[1], 11) == -1) {
 			pr_perror("dup2 failed");
 			goto err;
 		}
diff --git a/test/zdtm/static/pipe01.c b/test/zdtm/static/pipe01.c
index fd51988b5..587f42568 100644
--- a/test/zdtm/static/pipe01.c
+++ b/test/zdtm/static/pipe01.c
@@ -10,12 +10,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test that all data can be restored";
-const char *test_author	= "Andrey Vagin <avagin@parallels.com>";
+const char *test_doc = "Test that all data can be restored";
+const char *test_author = "Andrey Vagin <avagin@parallels.com>";
 
 #define TEST_STRING "Hello world"
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pfd[2], pfd_dup[2], pfd_rop[2];
 	char path[PATH_MAX];
@@ -43,8 +43,7 @@ int main(int argc, char ** argv)
 	snprintf(path, PATH_MAX, "/proc/self/fd/%d", pfd[1]);
 	pfd_rop[1] = open(path, O_WRONLY);
 
-	if (pfd_rop[0] == -1 || pfd_rop[1] == -1 ||
-	    pfd_dup[0] == -1 || pfd_dup[1] == -1) {
+	if (pfd_rop[0] == -1 || pfd_rop[1] == -1 || pfd_dup[0] == -1 || pfd_dup[1] == -1) {
 		pr_perror("dup() failed");
 		return 1;
 	}
diff --git a/test/zdtm/static/pipe02.c b/test/zdtm/static/pipe02.c
index 2a8cca7da..9ee522ea8 100644
--- a/test/zdtm/static/pipe02.c
+++ b/test/zdtm/static/pipe02.c
@@ -10,10 +10,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create two unshared descriptor for the one end of a pipe";
-const char *test_author	= "Andrey Vagin <avagin@parallels.com>";
+const char *test_doc = "Create two unshared descriptor for the one end of a pipe";
+const char *test_author = "Andrey Vagin <avagin@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int p[2], fd;
 	int ret;
diff --git a/test/zdtm/static/pipe03.c b/test/zdtm/static/pipe03.c
index d649007b7..d6c8f74cf 100644
--- a/test/zdtm/static/pipe03.c
+++ b/test/zdtm/static/pipe03.c
@@ -5,11 +5,11 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that pipes with a non-default size can be c/r-ed";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Check that pipes with a non-default size can be c/r-ed";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
 #define DATA_SIZE (1 << 20)
-#define BUF_SIZE (4096)
+#define BUF_SIZE  (4096)
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/poll.c b/test/zdtm/static/poll.c
index 53d801a0b..60eb54f34 100644
--- a/test/zdtm/static/poll.c
+++ b/test/zdtm/static/poll.c
@@ -16,8 +16,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check poll() timeouts";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@parallels.com>";
+const char *test_doc = "Check poll() timeouts";
+const char *test_author = "Cyrill Gorcunov <gorcunov@parallels.com>";
 
 static void show_timestamp(char *prefix, unsigned long tv_sec, unsigned long tv_usec)
 {
@@ -29,8 +29,7 @@ static void show_pollfd(struct pollfd *fds, size_t nfds)
 	size_t i;
 
 	for (i = 0; i < nfds; i++) {
-		test_msg("%2zu) fd: %2d events %2x revents %2x\n",
-			 i, fds[i].fd, fds[i].events, fds[i].revents);
+		test_msg("%2zu) fd: %2d events %2x revents %2x\n", i, fds[i].fd, fds[i].events, fds[i].revents);
 	}
 }
 
@@ -100,11 +99,9 @@ int main(int argc, char *argv[])
 			}
 
 			show_timestamp("Stop", time2.tv_sec, time2.tv_usec);
-			show_timestamp("Diff", time2.tv_sec - time1.tv_sec,
-				       time2.tv_usec - time1.tv_usec);
+			show_timestamp("Diff", time2.tv_sec - time1.tv_sec, time2.tv_usec - time1.tv_usec);
 			if ((time2.tv_sec - time1.tv_sec) > delta) {
-				fail("Delta is too big %lu",
-				     (unsigned long)(time2.tv_sec - time1.tv_sec));
+				fail("Delta is too big %lu", (unsigned long)(time2.tv_sec - time1.tv_sec));
 				exit(1);
 			}
 		}
diff --git a/test/zdtm/static/posix_timers.c b/test/zdtm/static/posix_timers.c
index b88114cdb..b2ed0dcf9 100644
--- a/test/zdtm/static/posix_timers.c
+++ b/test/zdtm/static/posix_timers.c
@@ -8,24 +8,24 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc ="Posix timers migration check";
+const char *test_doc = "Posix timers migration check";
 const char *test_author = "Kinsbursky Stanislav <skinsbursky@parallels.com>";
 
 sigset_t mask;
 
-#define WRONG_SIGNAL		1
-#define WRONG_SI_PTR		2
-#define FAIL_OVERRUN		4
+#define WRONG_SIGNAL 1
+#define WRONG_SI_PTR 2
+#define FAIL_OVERRUN 4
 
-#define MAX_TIMER_DISPLACEMENT	10
+#define MAX_TIMER_DISPLACEMENT 10
 #define NO_PERIODIC
 
 #ifndef CLOCK_MONOTONIC_COARSE
-# define CLOCK_MONOTONIC_COARSE	6
+#define CLOCK_MONOTONIC_COARSE 6
 #endif
 
 #ifndef CLOCK_BOOTTIME
-# define CLOCK_BOOTTIME		7
+#define CLOCK_BOOTTIME 7
 #endif
 
 #ifndef NO_PERIODIC
@@ -115,8 +115,7 @@ static struct posix_timers_info {
 	{ }
 };
 
-static int check_handler_status(struct posix_timers_info *info,
-				struct itimerspec *its, int ms_passed, int delta)
+static int check_handler_status(struct posix_timers_info *info, struct itimerspec *its, int ms_passed, int delta)
 {
 	int displacement;
 	int timer_ms;
@@ -179,7 +178,8 @@ static int check_handler_status(struct posix_timers_info *info,
 	test_msg("%20s: Handler count    : %d\n", info->name, info->handler_cnt);
 
 	if (displacement > MAX_TIMER_DISPLACEMENT) {
-		fail("%32s: Time displacement: %d%% (max alloved: %d%%)", info->name, displacement, MAX_TIMER_DISPLACEMENT);
+		fail("%32s: Time displacement: %d%% (max alloved: %d%%)", info->name, displacement,
+		     MAX_TIMER_DISPLACEMENT);
 		return -EFAULT;
 	}
 	return 0;
@@ -213,14 +213,14 @@ static int check_timers(int delta, struct timespec *sleep_start, struct timespec
 		 * Adjust with @total_sleep_time if needed.
 		 */
 		if (info->clock == CLOCK_BOOTTIME) {
-			info->start.tv_sec	-= sleep_start->tv_sec;
-			info->start.tv_nsec	-= sleep_start->tv_nsec;
-			info->end.tv_sec	-= sleep_end->tv_sec;
-			info->end.tv_nsec	-= sleep_end->tv_nsec;
+			info->start.tv_sec -= sleep_start->tv_sec;
+			info->start.tv_nsec -= sleep_start->tv_nsec;
+			info->end.tv_sec -= sleep_end->tv_sec;
+			info->end.tv_nsec -= sleep_end->tv_nsec;
 		}
 
 		ms_passed = (info->end.tv_sec - info->start.tv_sec) * 1000 +
-			(info->end.tv_nsec - info->start.tv_nsec) / (1000 * 1000);
+			    (info->end.tv_nsec - info->start.tv_nsec) / (1000 * 1000);
 
 		if (check_handler_status(info, &oldval, ms_passed, delta))
 			status--;
@@ -229,8 +229,7 @@ static int check_timers(int delta, struct timespec *sleep_start, struct timespec
 	return status;
 }
 
-static void generic_handler(struct posix_timers_info *info,
-			    struct posix_timers_info *real, int sig)
+static void generic_handler(struct posix_timers_info *info, struct posix_timers_info *real, int sig)
 {
 	int overrun;
 
@@ -256,41 +255,35 @@ static void generic_handler(struct posix_timers_info *info,
 #ifndef NO_PERIODIC
 static void monotonic_periodic_handler(int sig, siginfo_t *si, void *uc)
 {
-	generic_handler(si->si_value.sival_ptr,
-			&posix_timers[MONOTONIC_PERIODIC_INFO], sig);
+	generic_handler(si->si_value.sival_ptr, &posix_timers[MONOTONIC_PERIODIC_INFO], sig);
 }
 
 static void boottime_periodic_handler(int sig, siginfo_t *si, void *uc)
 {
-	generic_handler(si->si_value.sival_ptr,
-			&posix_timers[BOOTTIME_PERIODIC_INFO], sig);
+	generic_handler(si->si_value.sival_ptr, &posix_timers[BOOTTIME_PERIODIC_INFO], sig);
 }
 #endif
 
 static void monotonic_oneshot_handler(int sig, siginfo_t *si, void *uc)
 {
-	generic_handler(si->si_value.sival_ptr,
-			&posix_timers[MONOTONIC_ONESHOT_INFO], sig);
+	generic_handler(si->si_value.sival_ptr, &posix_timers[MONOTONIC_ONESHOT_INFO], sig);
 }
 
 static void boottime_oneshot_handler(int sig, siginfo_t *si, void *uc)
 {
-	generic_handler(si->si_value.sival_ptr,
-			&posix_timers[BOOTTIME_ONESHOT_INFO], sig);
+	generic_handler(si->si_value.sival_ptr, &posix_timers[BOOTTIME_ONESHOT_INFO], sig);
 }
 
 #ifndef NO_PERIODIC
 static void realtime_periodic_handler(int sig, siginfo_t *si, void *uc)
 {
-	generic_handler(si->si_value.sival_ptr,
-			&posix_timers[REALTIME_PERIODIC_INFO], sig);
+	generic_handler(si->si_value.sival_ptr, &posix_timers[REALTIME_PERIODIC_INFO], sig);
 }
 #endif
 
 static void realtime_oneshot_handler(int sig, siginfo_t *si, void *uc)
 {
-	generic_handler(si->si_value.sival_ptr,
-			&posix_timers[REALTIME_ONESHOT_INFO], sig);
+	generic_handler(si->si_value.sival_ptr, &posix_timers[REALTIME_ONESHOT_INFO], sig);
 }
 
 static int setup_timers(void)
@@ -302,7 +295,7 @@ static int setup_timers(void)
 	struct itimerspec its;
 
 	sigemptyset(&mask);
-	while(info->handler) {
+	while (info->handler) {
 		sigaddset(&mask, info->sig);
 		info++;
 	}
@@ -313,18 +306,18 @@ static int setup_timers(void)
 	}
 
 	info = posix_timers;
-	while(info->handler) {
+	while (info->handler) {
 		/* Add and delete fake timers to test restoring 'with holes' */
 		timer_t timeridt;
 		for (i = 0; i < 10; i++) {
 			ret = timer_create(CLOCK_REALTIME, NULL, &timeridt);
 			if (ret < 0) {
-				pr_perror("Can't create temporary posix timer %lx", (long) timeridt);
+				pr_perror("Can't create temporary posix timer %lx", (long)timeridt);
 				return -errno;
 			}
 			ret = timer_delete(timeridt);
 			if (ret < 0) {
-				pr_perror("Can't remove temporaty posix timer %lx", (long) timeridt);
+				pr_perror("Can't remove temporaty posix timer %lx", (long)timeridt);
 				return -errno;
 			}
 		}
@@ -398,10 +391,7 @@ static int get_total_sleep_time(struct timespec *tv, char *type)
 	test_msg("(%6s) boottime %lu "
 		 "boottime-coarse %lu "
 		 "total_sleep_time %lu\n",
-		 type,
-		 (long)boottime.tv_sec,
-		 (long)boottime_coarse.tv_sec,
-		 (long)tv->tv_sec);
+		 type, (long)boottime.tv_sec, (long)boottime_coarse.tv_sec, (long)tv->tv_sec);
 
 	return 0;
 }
@@ -432,9 +422,8 @@ int main(int argc, char **argv)
 	err = get_total_sleep_time(&sleep_end, "end");
 	if (err)
 		return err;
-	err = check_timers((end.tv_sec - start.tv_sec) * 1000 +
-			   (end.tv_nsec - start.tv_nsec) / 1000000,
-			   &sleep_start, &sleep_end);
+	err = check_timers((end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv_nsec) / 1000000, &sleep_start,
+			   &sleep_end);
 	if (err)
 		return err;
 
diff --git a/test/zdtm/static/private_bind_propagation.c b/test/zdtm/static/private_bind_propagation.c
index ee4adbd2d..2b92f7062 100644
--- a/test/zdtm/static/private_bind_propagation.c
+++ b/test/zdtm/static/private_bind_propagation.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check sharing options are restored for bindmounted shared group children";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check sharing options are restored for bindmounted shared group children";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/proc-self.c b/test/zdtm/static/proc-self.c
index 6f0a30e7d..10218c86b 100644
--- a/test/zdtm/static/proc-self.c
+++ b/test/zdtm/static/proc-self.c
@@ -12,8 +12,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for /proc/self/ns path restore";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for /proc/self/ns path restore";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 const char nspath[] = "/proc/self/ns/net";
 
diff --git a/test/zdtm/static/pstree.c b/test/zdtm/static/pstree.c
index ba94a275d..38cc99339 100644
--- a/test/zdtm/static/pstree.c
+++ b/test/zdtm/static/pstree.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that environment didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that environment didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/pthread00.c b/test/zdtm/static/pthread00.c
index 4da824056..adbf74a40 100644
--- a/test/zdtm/static/pthread00.c
+++ b/test/zdtm/static/pthread00.c
@@ -18,35 +18,34 @@
 
 #include "zdtmtst.h"
 
-#define exit_group(code)	\
-	syscall(__NR_exit_group, code)
+#define exit_group(code) syscall(__NR_exit_group, code)
 
-const char *test_doc	= "Create a few pthreads/forks and compare TLS and mmap data on restore\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Create a few pthreads/forks and compare TLS and mmap data on restore\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 static __thread char tls_data[10];
 
-#define TRANSITION_PASSED	4
-#define TRANSITION_FAILED	8
+#define TRANSITION_PASSED 4
+#define TRANSITION_FAILED 8
 
-#define MAP(map, i)		(((int *)map)[i])
+#define MAP(map, i) (((int *)map)[i])
 
-#define SET_PASSED(map, i)	MAP(map, i) = TRANSITION_PASSED
-#define SET_FAILED(map, i)	MAP(map, i) = TRANSITION_FAILED
+#define SET_PASSED(map, i) MAP(map, i) = TRANSITION_PASSED
+#define SET_FAILED(map, i) MAP(map, i) = TRANSITION_FAILED
 
-#define IS_PASSED(map, i)	(MAP(map, i) & TRANSITION_PASSED)
+#define IS_PASSED(map, i) (MAP(map, i) & TRANSITION_PASSED)
 
-#define NR_WAITERS		6
+#define NR_WAITERS 6
 static task_waiter_t waiter[NR_WAITERS];
 
-#define passage(index)							\
-	do {								\
-		task_waiter_complete(&waiter[index], 1);		\
-		task_waiter_wait4(&waiter[index], 2);			\
-		if (memcmp(tls_data, __tls_data, sizeof(tls_data)))	\
-			SET_FAILED(map, index);				\
-		else							\
-			SET_PASSED(map, index);				\
+#define passage(index)                                              \
+	do {                                                        \
+		task_waiter_complete(&waiter[index], 1);            \
+		task_waiter_wait4(&waiter[index], 2);               \
+		if (memcmp(tls_data, __tls_data, sizeof(tls_data))) \
+			SET_FAILED(map, index);                     \
+		else                                                \
+			SET_PASSED(map, index);                     \
 	} while (0)
 
 static void *thread_subfunc_1(void *map)
@@ -171,11 +170,7 @@ int main(int argc, char *argv[])
 	pthread_join(th1, NULL);
 	pthread_join(th2, NULL);
 
-	if (IS_PASSED(map, 0) &&
-	    IS_PASSED(map, 1) &&
-	    IS_PASSED(map, 2) &&
-	    IS_PASSED(map, 3) &&
-	    IS_PASSED(map, 4) &&
+	if (IS_PASSED(map, 0) && IS_PASSED(map, 1) && IS_PASSED(map, 2) && IS_PASSED(map, 3) && IS_PASSED(map, 4) &&
 	    IS_PASSED(map, 5))
 		pass();
 	else
diff --git a/test/zdtm/static/pthread01.c b/test/zdtm/static/pthread01.c
index bdd7c59d8..6aa8d80a8 100644
--- a/test/zdtm/static/pthread01.c
+++ b/test/zdtm/static/pthread01.c
@@ -14,14 +14,14 @@
 
 #include "zdtmtst.h"
 
-#define gettid()	pthread_self()
+#define gettid() pthread_self()
 
-const char *test_doc	= "Create a few pthreads and test TLS + blocked signals\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Create a few pthreads and test TLS + blocked signals\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 static __thread struct tls_data_s {
-	char		*rand_string[10];
-	sigset_t	blk_sigset;
+	char *rand_string[10];
+	sigset_t blk_sigset;
 } tls_data;
 
 static task_waiter_t t1;
@@ -36,19 +36,45 @@ static char *decode_signal(const sigset_t *s, char *buf)
 {
 	buf[0] = '\0';
 
-#define COLLECT(sig)						\
-	do {							\
-		if (sigismember(s, sig))			\
-			strcat(buf, #sig " ");			\
+#define COLLECT(sig)                           \
+	do {                                   \
+		if (sigismember(s, sig))       \
+			strcat(buf, #sig " "); \
 	} while (0)
 
-	COLLECT(SIGHUP); COLLECT(SIGINT); COLLECT(SIGQUIT); COLLECT(SIGILL); COLLECT(SIGTRAP);
-	COLLECT(SIGABRT); COLLECT(SIGIOT); COLLECT(SIGBUS); COLLECT(SIGFPE); COLLECT(SIGKILL);
-	COLLECT(SIGUSR1); COLLECT(SIGSEGV); COLLECT(SIGUSR2); COLLECT(SIGPIPE); COLLECT(SIGALRM);
-	COLLECT(SIGTERM); COLLECT(SIGSTKFLT); COLLECT(SIGCHLD); COLLECT(SIGCONT); COLLECT(SIGSTOP);
-	COLLECT(SIGTSTP); COLLECT(SIGTTIN); COLLECT(SIGTTOU); COLLECT(SIGURG); COLLECT(SIGXCPU);
-	COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
-	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
+	COLLECT(SIGHUP);
+	COLLECT(SIGINT);
+	COLLECT(SIGQUIT);
+	COLLECT(SIGILL);
+	COLLECT(SIGTRAP);
+	COLLECT(SIGABRT);
+	COLLECT(SIGIOT);
+	COLLECT(SIGBUS);
+	COLLECT(SIGFPE);
+	COLLECT(SIGKILL);
+	COLLECT(SIGUSR1);
+	COLLECT(SIGSEGV);
+	COLLECT(SIGUSR2);
+	COLLECT(SIGPIPE);
+	COLLECT(SIGALRM);
+	COLLECT(SIGTERM);
+	COLLECT(SIGSTKFLT);
+	COLLECT(SIGCHLD);
+	COLLECT(SIGCONT);
+	COLLECT(SIGSTOP);
+	COLLECT(SIGTSTP);
+	COLLECT(SIGTTIN);
+	COLLECT(SIGTTOU);
+	COLLECT(SIGURG);
+	COLLECT(SIGXCPU);
+	COLLECT(SIGXFSZ);
+	COLLECT(SIGVTALRM);
+	COLLECT(SIGPROF);
+	COLLECT(SIGWINCH);
+	COLLECT(SIGIO);
+	COLLECT(SIGPOLL);
+	COLLECT(SIGPWR);
+	COLLECT(SIGSYS);
 #undef COLLECT
 
 	return buf;
@@ -56,20 +82,20 @@ static char *decode_signal(const sigset_t *s, char *buf)
 
 static void __show_sigset(int line, const sigset_t *s)
 {
-	char buf[sizeof(sigset_t) * 2 + 1] = { };
+	char buf[sizeof(sigset_t) * 2 + 1] = {};
 
 	decode_signal(s, buf);
 	test_msg("sigset at %4d: %s\n", line, buf);
 }
 
-#define show_sigset(set)	__show_sigset(__LINE__, set)
+#define show_sigset(set) __show_sigset(__LINE__, set)
 
 static void *ch_thread_2(void *arg)
 {
 	char __tls_data[sizeof(tls_data.rand_string)] = "XM5o:?B*[a";
 	int *results_map = arg;
-	sigset_t blk_sigset = { };
-	sigset_t new = { };
+	sigset_t blk_sigset = {};
+	sigset_t new = {};
 
 	memcpy(tls_data.rand_string, __tls_data, sizeof(tls_data.rand_string));
 
@@ -114,8 +140,8 @@ static void *ch_thread_1(void *arg)
 {
 	char __tls_data[sizeof(tls_data.rand_string)] = "pffYQSBo?6";
 	int *results_map = arg;
-	sigset_t blk_sigset = { };
-	sigset_t new = { };
+	sigset_t blk_sigset = {};
+	sigset_t new = {};
 
 	memcpy(tls_data.rand_string, __tls_data, sizeof(tls_data.rand_string));
 
@@ -200,12 +226,8 @@ int main(int argc, char *argv[])
 	pthread_join(thread_1, NULL);
 	pthread_join(thread_2, NULL);
 
-	if (results_map[1] == 1 &&
-	    results_map[2] == 1 &&
-	    results_map[3] == 1 &&
-	    results_map[4] == 1 &&
-	    results_map[5] == 1 &&
-	    results_map[6] == 1)
+	if (results_map[1] == 1 && results_map[2] == 1 && results_map[3] == 1 && results_map[4] == 1 &&
+	    results_map[5] == 1 && results_map[6] == 1)
 		pass();
 	else
 		fail();
diff --git a/test/zdtm/static/pthread02.c b/test/zdtm/static/pthread02.c
index 186271b74..173a55e15 100644
--- a/test/zdtm/static/pthread02.c
+++ b/test/zdtm/static/pthread02.c
@@ -10,9 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create a thread with a dead leader\n";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org";
-
+const char *test_doc = "Create a thread with a dead leader\n";
+const char *test_author = "Andrew Vagin <avagin@openvz.org";
 
 static void *thread_func(void *args)
 {
@@ -28,7 +27,6 @@ int main(int argc, char *argv[])
 
 	test_init(argc, argv);
 
-
 	ret = pthread_create(&th1, NULL, &thread_func, NULL);
 
 	if (ret) {
diff --git a/test/zdtm/static/pthread_timers.c b/test/zdtm/static/pthread_timers.c
index f4b183fc6..ddf41074d 100644
--- a/test/zdtm/static/pthread_timers.c
+++ b/test/zdtm/static/pthread_timers.c
@@ -8,11 +8,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check SIGEV_THREAD timers";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Check SIGEV_THREAD timers";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
 int efd;
-static void timer_func(union sigval sigval) {
+static void timer_func(union sigval sigval)
+{
 	long long int val = 1;
 
 	if (write(efd, &val, sizeof(val)) != sizeof(val)) {
diff --git a/test/zdtm/static/ptrace_sig.c b/test/zdtm/static/ptrace_sig.c
index b70f8f1b0..c77cf1ea0 100644
--- a/test/zdtm/static/ptrace_sig.c
+++ b/test/zdtm/static/ptrace_sig.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check ptrace, if the child process's stopped by signal";
-const char *test_author	= "Andrey Vagin <avagin@parallels.com>";
+const char *test_doc = "Check ptrace, if the child process's stopped by signal";
+const char *test_author = "Andrey Vagin <avagin@parallels.com>";
 
 typedef void (*sighandler_t)(int);
 
@@ -55,7 +55,7 @@ int child(int fd)
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int ret, status = 0;
 	pid_t pid, spid, cpid;
@@ -82,7 +82,7 @@ int main(int argc, char ** argv)
 	close(child_pipe[1]);
 	test_msg("wait while child initialized");
 	ret = read(child_pipe[0], &status, sizeof(status));
-	if  (ret != sizeof(status)) {
+	if (ret != sizeof(status)) {
 		pr_perror("read from child process failed");
 		return 1;
 	}
@@ -122,7 +122,6 @@ int main(int argc, char ** argv)
 		}
 
 		if (WIFSTOPPED(status)) {
-
 			test_msg("pid=%d stopsig=%d\n", pid, WSTOPSIG(status));
 
 			ret = ptrace(PTRACE_GETSIGINFO, pid, 0, &siginfo);
@@ -137,7 +136,7 @@ int main(int argc, char ** argv)
 				pr_perror("ptrace failed");
 
 			ret = read(child_pipe[0], &status, sizeof(status));
-			if  (ret != sizeof(status)) {
+			if (ret != sizeof(status)) {
 				pr_perror("read");
 				return 1;
 			}
diff --git a/test/zdtm/static/pty00.c b/test/zdtm/static/pty00.c
index 2c76d9c3e..f6db95ac0 100644
--- a/test/zdtm/static/pty00.c
+++ b/test/zdtm/static/pty00.c
@@ -9,8 +9,8 @@
 #include <termios.h>
 #include <signal.h>
 
-const char *test_doc	= "Check, that pseudoterminals are restored";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Check, that pseudoterminals are restored";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
 static unsigned int nr_sighups;
 
@@ -19,7 +19,7 @@ static void signal_handler_sighup(int signum)
 	nr_sighups++;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fdm, fds, ret, tty, i;
 	char *slavename;
@@ -77,7 +77,7 @@ int main(int argc, char ** argv)
 	close(fds);
 	fds = 100;
 
-	for (i = 0; i  < 10; i++) {
+	for (i = 0; i < 10; i++) {
 		/* Check connectivity */
 		ret = write(fdm, teststr, sizeof(teststr) - 1);
 		if (ret != sizeof(teststr) - 1) {
@@ -89,7 +89,7 @@ int main(int argc, char ** argv)
 	test_daemon();
 	test_waitsig();
 
-	for (i = 0; i  < 10; i++) {
+	for (i = 0; i < 10; i++) {
 		ret = read(fds, buf, sizeof(teststr) - 1);
 		if (ret != sizeof(teststr) - 1) {
 			pr_perror("read(fds) failed");
diff --git a/test/zdtm/static/pty01.c b/test/zdtm/static/pty01.c
index cb7fff9af..ba0adac17 100644
--- a/test/zdtm/static/pty01.c
+++ b/test/zdtm/static/pty01.c
@@ -13,8 +13,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check two pts on ptmx";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check two pts on ptmx";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 static const char teststr[] = "ping\n";
 
@@ -81,9 +81,8 @@ int main(int argc, char *argv[])
 	}
 
 	if (st.st_uid != new_uid || st.st_gid != new_gid) {
-		fail("UID/GID mismatch (got %d/%d but %d/%d expected)",
-		     (int)st.st_uid, (int)st.st_gid,
-		     (int)new_uid, (int)new_gid);
+		fail("UID/GID mismatch (got %d/%d but %d/%d expected)", (int)st.st_uid, (int)st.st_gid, (int)new_uid,
+		     (int)new_gid);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/pty02.c b/test/zdtm/static/pty02.c
index 041a4e4be..69bac8990 100644
--- a/test/zdtm/static/pty02.c
+++ b/test/zdtm/static/pty02.c
@@ -9,16 +9,18 @@
 #include <termios.h>
 #include <signal.h>
 
-const char *test_doc	= "Check forked master ptmx";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check forked master ptmx";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 static const char teststr[] = "ping\n";
 
-#define exit_shot(pid, code)	\
-	do { kill(pid, SIGKILL); exit(code); } while (0)
+#define exit_shot(pid, code)        \
+	do {                        \
+		kill(pid, SIGKILL); \
+		exit(code);         \
+	} while (0)
 
-#define exit_shot_parent(code)	\
-	exit_shot(getppid(), 1)
+#define exit_shot_parent(code) exit_shot(getppid(), 1)
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/pty03.c b/test/zdtm/static/pty03.c
index 3c2b36369..59672d697 100644
--- a/test/zdtm/static/pty03.c
+++ b/test/zdtm/static/pty03.c
@@ -10,8 +10,8 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 
-const char *test_doc	= "Check a non-opened control terminal";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Check a non-opened control terminal";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
 static const char teststr[] = "ping\n";
 
diff --git a/test/zdtm/static/pty04.c b/test/zdtm/static/pty04.c
index 74d8ab466..406fbee4d 100644
--- a/test/zdtm/static/pty04.c
+++ b/test/zdtm/static/pty04.c
@@ -10,8 +10,8 @@
 #include <signal.h>
 #include <sys/ioctl.h>
 
-const char *test_doc	= "Check two pts with a fake ptmx";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check two pts with a fake ptmx";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/remap_dead_pid.c b/test/zdtm/static/remap_dead_pid.c
index 5d4241fc6..56294654b 100644
--- a/test/zdtm/static/remap_dead_pid.c
+++ b/test/zdtm/static/remap_dead_pid.c
@@ -10,7 +10,7 @@
 #include "zdtmtst.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS     0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
 #ifdef REMAP_PID_ROOT
@@ -19,8 +19,8 @@ const char *proc_path = "/proc/%d";
 const char *proc_path = "/proc/%d/mountinfo";
 #endif
 
-const char *test_doc	= "Check that dead pid's /proc entries are remapped correctly";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that dead pid's /proc entries are remapped correctly";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 int main(int argc, char **argv)
 {
@@ -37,7 +37,7 @@ int main(int argc, char **argv)
 	if (pid == 0) {
 		/* Child process just sleeps until it is killed. All we need
 		 * here is a process to open the mountinfo of. */
-		while(1)
+		while (1)
 			sleep(10);
 	} else {
 		int fd, ret;
diff --git a/test/zdtm/static/rlimits00.c b/test/zdtm/static/rlimits00.c
index 17ea8daea..395d61719 100644
--- a/test/zdtm/static/rlimits00.c
+++ b/test/zdtm/static/rlimits00.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that rlimits are saved";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that rlimits are saved";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
@@ -21,8 +21,7 @@ int main(int argc, char **argv)
 			goto out;
 		}
 
-		if (rlims[r].rlim_cur > 1 &&
-				rlims[r].rlim_cur != RLIM_INFINITY) {
+		if (rlims[r].rlim_cur > 1 && rlims[r].rlim_cur != RLIM_INFINITY) {
 			rlims[r].rlim_cur--;
 
 			if (setrlimit(r, &rlims[r])) {
@@ -63,4 +62,3 @@ int main(int argc, char **argv)
 out:
 	return 0;
 }
-
diff --git a/test/zdtm/static/rmdir_open.c b/test/zdtm/static/rmdir_open.c
index f671ac48f..93b0246bd 100644
--- a/test/zdtm/static/rmdir_open.c
+++ b/test/zdtm/static/rmdir_open.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that opened removed dir works";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that opened removed dir works";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/rtc.c b/test/zdtm/static/rtc.c
index 28a79b1e2..df1f3833a 100644
--- a/test/zdtm/static/rtc.c
+++ b/test/zdtm/static/rtc.c
@@ -10,7 +10,7 @@
 
 #include "zdtmtst.h"
 
-#define TEST_HZ 4
+#define TEST_HZ	 4
 #define NR_FAILS 10
 
 int main(int argc, char **argv)
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 		gettimeofday(&end, NULL);
 		end.tv_usec += end.tv_sec * 1000000;
 		delta = end.tv_usec - start.tv_usec;
-		if (labs(delta - 1000000 / TEST_HZ ) > 100000) {
+		if (labs(delta - 1000000 / TEST_HZ) > 100000) {
 			pr_perror("delta = %ld", delta);
 			fail--;
 			if (fail == 0)
diff --git a/test/zdtm/static/s390x_gs_threads.c b/test/zdtm/static/s390x_gs_threads.c
index 6f6e7de22..3944062e3 100644
--- a/test/zdtm/static/s390x_gs_threads.c
+++ b/test/zdtm/static/s390x_gs_threads.c
@@ -10,13 +10,13 @@
 #include "zdtmtst.h"
 #include "lock.h"
 
-#define NR_THREADS	4
-#define GS_ENABLE	0
-#define GS_SET_BC_CB	2
-#define GS_BROADCAST	4
+#define NR_THREADS   4
+#define GS_ENABLE    0
+#define GS_SET_BC_CB 2
+#define GS_BROADCAST 4
 
 #ifndef __NR_guarded_storage
-#define __NR_guarded_storage   378
+#define __NR_guarded_storage 378
 #endif
 
 const char *test_doc = "Check the guarded storage broadcast";
@@ -60,12 +60,11 @@ static futex_t futex2;
  * Load guarded-storage
  */
 void load_guarded(unsigned long *mem);
-asm(
-	".global load_guarded\n"
-	"load_guarded:\n"
-	"	.insn rxy,0xe3000000004c,%r2,0(%r2)\n"
-	"	br %r14\n"
-	"	.size load_guarded,.-load_guarded\n");
+asm(".global load_guarded\n"
+    "load_guarded:\n"
+    "	.insn rxy,0xe3000000004c,%r2,0(%r2)\n"
+    "	br %r14\n"
+    "	.size load_guarded,.-load_guarded\n");
 
 /*
  * Inline assembly to deal with interrupted context to the call of
@@ -73,23 +72,22 @@ asm(
  * function.
  */
 void gs_handler_asm(void);
-asm(
-	".globl gs_handler_asm\n"
-	"gs_handler_asm:\n"
-	"	lgr	%r14,%r15\n"
-	"	aghi	%r15,-320\n"
-	"	stmg	%r0,%r14,192(%r15)\n"
-	"	stg	%r14,312(%r14)\n"
-	"	la	%r2,160(%r15)\n"
-	"	.insn	rxy,0xe30000000049,0,160(%r15)\n"
-	"	lg	%r14,24(%r2)\n"
-	"	lg	%r14,40(%r14)\n"
-	"	la	%r14,6(%r14)\n"
-	"	stg	%r14,304(%r15)\n"
-	"	brasl	%r14,gs_handler\n"
-	"	lmg	%r0,%r15,192(%r15)\n"
-	"	br	%r14\n"
-	"	.size gs_handler_asm,.-gs_handler_asm\n");
+asm(".globl gs_handler_asm\n"
+    "gs_handler_asm:\n"
+    "	lgr	%r14,%r15\n"
+    "	aghi	%r15,-320\n"
+    "	stmg	%r0,%r14,192(%r15)\n"
+    "	stg	%r14,312(%r14)\n"
+    "	la	%r2,160(%r15)\n"
+    "	.insn	rxy,0xe30000000049,0,160(%r15)\n"
+    "	lg	%r14,24(%r2)\n"
+    "	lg	%r14,40(%r14)\n"
+    "	la	%r14,6(%r14)\n"
+    "	stg	%r14,304(%r15)\n"
+    "	brasl	%r14,gs_handler\n"
+    "	lmg	%r0,%r15,192(%r15)\n"
+    "	br	%r14\n"
+    "	.size gs_handler_asm,.-gs_handler_asm\n");
 
 /*
  * GS handler called when GS event occurs
@@ -123,14 +121,14 @@ static void *thread_run(void *param)
 	}
 	gs_cb->gsd = 0x1234000000UL | 26;
 	gs_cb->gssm = -1UL;
-	gs_cb->gs_epl_a = (unsigned long) gs_epl;
-	gs_epl[1] = (unsigned long) gs_handler_asm;
+	gs_cb->gs_epl_a = (unsigned long)gs_epl;
+	gs_epl[1] = (unsigned long)gs_handler_asm;
 	/* Set the GS broadcast control block */
 	syscall(__NR_guarded_storage, GS_SET_BC_CB, gs_cb);
 	futex_dec_and_wake(&futex);
 	/* Wait for all threads to set the GS broadcast control block */
 	futex_wait_until(&futex, 0);
-	test_msg("Thread %016lx staring loop\n",  syscall(SYS_gettid));
+	test_msg("Thread %016lx staring loop\n", syscall(SYS_gettid));
 	/*
 	 * Designate a guarded-storage section until the main task
 	 * performs the GS_BROADCAST action and the following load_guarded
diff --git a/test/zdtm/static/s390x_mmap_high.c b/test/zdtm/static/s390x_mmap_high.c
index c4bd1c83d..6349113b7 100644
--- a/test/zdtm/static/s390x_mmap_high.c
+++ b/test/zdtm/static/s390x_mmap_high.c
@@ -5,23 +5,22 @@
 
 #include "zdtmtst.h"
 
-#define TASK_SIZE_LEVEL_4	0x20000000000000UL	/* 8 PB */
-#define MAP_SIZE	0x1000
-#define VAL		0x77
+#define TASK_SIZE_LEVEL_4 0x20000000000000UL /* 8 PB */
+#define MAP_SIZE	  0x1000
+#define VAL		  0x77
 
-const char *test_doc	= "Verify that tasks > 4TB can be checkpointed";
-const char *test_author	= "Michael Holzheu <holzheu@linux.vnet.ibm.com>";
+const char *test_doc = "Verify that tasks > 4TB can be checkpointed";
+const char *test_author = "Michael Holzheu <holzheu@linux.vnet.ibm.com>";
 
 /*
  * Map memory at the very end of the 8 PB address space
  */
 int main(int argc, char **argv)
 {
-	void *addr = (void *) TASK_SIZE_LEVEL_4 - MAP_SIZE;
+	void *addr = (void *)TASK_SIZE_LEVEL_4 - MAP_SIZE;
 	char *buf;
 	int i;
 
-
 	test_init(argc, argv);
 
 	/*
@@ -39,8 +38,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Map memory at the very end of the 8 PB address space */
-	buf = mmap(addr, MAP_SIZE, PROT_WRITE | PROT_READ,
-			MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
+	buf = mmap(addr, MAP_SIZE, PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0);
 	if (buf == MAP_FAILED) {
 		pr_perror("Could not create mapping");
 		exit(1);
diff --git a/test/zdtm/static/s390x_regs_check.c b/test/zdtm/static/s390x_regs_check.c
index 9aaf41951..8d6b47997 100644
--- a/test/zdtm/static/s390x_regs_check.c
+++ b/test/zdtm/static/s390x_regs_check.c
@@ -48,7 +48,7 @@ const char *test_author = "Michael Holzheu <holzheu@linux.vnet.ibm.com>";
  *   $ zdtmp.py run --norst --pre 2 -t zdtm/static/s390x_regs_check
  *   $ zdtmp.py run --check-only -t zdtm/static/s390x_regs_check
  */
-#define NR_THREADS 2
+#define NR_THREADS     2
 #define NR_THREADS_ALL (NR_THREADS + 1)
 
 static pid_t thread_pids[NR_THREADS_ALL];
@@ -58,222 +58,198 @@ static int pipefd[2];
  * Generic structure to define a register set and test data
  */
 struct reg_set {
-	const char *name;	/* Name of regset */
-	int nr;			/* Number of regset */
-	void *data;		/* Test data */
-	int len;		/* Number of bytes of test data */
-	bool optional;		/* Not all kernels/machines have this reg set */
-	bool available;		/* Current kernel/machine has this reg set */
+	const char *name; /* Name of regset */
+	int nr; /* Number of regset */
+	void *data; /* Test data */
+	int len; /* Number of bytes of test data */
+	bool optional; /* Not all kernels/machines have this reg set */
+	bool available; /* Current kernel/machine has this reg set */
 };
 
 /*
  * s390 floating point registers
  */
 struct prfpreg {
-	uint32_t	fpc;
-	uint64_t	fprs[16];
+	uint32_t fpc;
+	uint64_t fprs[16];
 };
 
-struct prfpreg prfpreg_data = {
-	.fpc = 0,
-	.fprs = {
-		0x0000000000000000,
-		0x1111111111111110,
-		0x2222222222222220,
-		0x3333333333333330,
-		0x4444444444444440,
-		0x5555555555555550,
-		0x6666666666666660,
-		0x7777777777777770,
-		0x8888888888888880,
-		0x9999999999999990,
-		0xaaaaaaaaaaaaaaa0,
-		0xbbbbbbbbbbbbbbb0,
-		0xccccccccccccccc0,
-		0xddddddddddddddd0,
-		0xeeeeeeeeeeeeeee0,
-		0xfffffffffffffff0,
-	}
-};
+struct prfpreg prfpreg_data = { .fpc = 0,
+				.fprs = {
+					0x0000000000000000,
+					0x1111111111111110,
+					0x2222222222222220,
+					0x3333333333333330,
+					0x4444444444444440,
+					0x5555555555555550,
+					0x6666666666666660,
+					0x7777777777777770,
+					0x8888888888888880,
+					0x9999999999999990,
+					0xaaaaaaaaaaaaaaa0,
+					0xbbbbbbbbbbbbbbb0,
+					0xccccccccccccccc0,
+					0xddddddddddddddd0,
+					0xeeeeeeeeeeeeeee0,
+					0xfffffffffffffff0,
+				} };
 
 struct reg_set reg_set_prfpreg = {
-	.name		= "PRFPREG",
-	.nr		= NT_PRFPREG,
-	.data		= &prfpreg_data,
-	.len		= sizeof(prfpreg_data),
-	.optional	= false,
+	.name = "PRFPREG",
+	.nr = NT_PRFPREG,
+	.data = &prfpreg_data,
+	.len = sizeof(prfpreg_data),
+	.optional = false,
 };
 
 /*
  * s390 vector VXRS_LOW registers
  */
 
-#define NT_S390_VXRS_LOW	0x309
+#define NT_S390_VXRS_LOW 0x309
 
 struct vxrs_low {
-	uint64_t	regs[16];
+	uint64_t regs[16];
 };
 
-struct vxrs_low vxrs_low_data = {
-	.regs = {
-		0x0000000000000001,
-		0x1111111111111111,
-		0x2222222222222221,
-		0x3333333333333331,
-		0x4444444444444441,
-		0x5555555555555551,
-		0x6666666666666661,
-		0x7777777777777771,
-		0x8888888888888881,
-		0x9999999999999991,
-		0xaaaaaaaaaaaaaaa1,
-		0xbbbbbbbbbbbbbbb1,
-		0xccccccccccccccc1,
-		0xddddddddddddddd1,
-		0xeeeeeeeeeeeeeee1,
-		0xfffffffffffffff1,
-	}
-};
+struct vxrs_low vxrs_low_data = { .regs = {
+					  0x0000000000000001,
+					  0x1111111111111111,
+					  0x2222222222222221,
+					  0x3333333333333331,
+					  0x4444444444444441,
+					  0x5555555555555551,
+					  0x6666666666666661,
+					  0x7777777777777771,
+					  0x8888888888888881,
+					  0x9999999999999991,
+					  0xaaaaaaaaaaaaaaa1,
+					  0xbbbbbbbbbbbbbbb1,
+					  0xccccccccccccccc1,
+					  0xddddddddddddddd1,
+					  0xeeeeeeeeeeeeeee1,
+					  0xfffffffffffffff1,
+				  } };
 
 struct reg_set reg_set_vxrs_low = {
-	.name		= "VXRS_LOW",
-	.nr		= NT_S390_VXRS_LOW,
-	.data		= &vxrs_low_data,
-	.len		= sizeof(vxrs_low_data),
-	.optional	= true,
+	.name = "VXRS_LOW",
+	.nr = NT_S390_VXRS_LOW,
+	.data = &vxrs_low_data,
+	.len = sizeof(vxrs_low_data),
+	.optional = true,
 };
 
 /*
  * s390 vector VXRS_HIGH registers
  */
 
-#define NT_S390_VXRS_HIGH	0x30a
+#define NT_S390_VXRS_HIGH 0x30a
 
 struct vxrs_high {
-	uint64_t	regs[32];
+	uint64_t regs[32];
 };
 
-struct vxrs_high vxrs_high_data = {
-	.regs = {
-		0x0000000000000002, 0x0000000000000002,
-		0x1111111111111112, 0x1111111111111112,
-		0x2222222222222222, 0x2222222222222222,
-		0x3333333333333332, 0x3333333333333332,
-		0x4444444444444442, 0x4444444444444442,
-		0x5555555555555552, 0x5555555555555552,
-		0x6666666666666662, 0x6666666666666662,
-		0x7777777777777772, 0x7777777777777772,
-		0x8888888888888882, 0x8888888888888882,
-		0x9999999999999992, 0x9999999999999992,
-		0xaaaaaaaaaaaaaaa2, 0xaaaaaaaaaaaaaaa2,
-		0xbbbbbbbbbbbbbbb2, 0xbbbbbbbbbbbbbbb2,
-		0xccccccccccccccc2, 0xccccccccccccccc2,
-		0xddddddddddddddd2, 0xddddddddddddddd2,
-		0xeeeeeeeeeeeeeee2, 0xeeeeeeeeeeeeeee2,
-		0xfffffffffffffff2, 0xfffffffffffffff2,
-	}
-};
+struct vxrs_high vxrs_high_data = { .regs = {
+					    0x0000000000000002, 0x0000000000000002, 0x1111111111111112,
+					    0x1111111111111112, 0x2222222222222222, 0x2222222222222222,
+					    0x3333333333333332, 0x3333333333333332, 0x4444444444444442,
+					    0x4444444444444442, 0x5555555555555552, 0x5555555555555552,
+					    0x6666666666666662, 0x6666666666666662, 0x7777777777777772,
+					    0x7777777777777772, 0x8888888888888882, 0x8888888888888882,
+					    0x9999999999999992, 0x9999999999999992, 0xaaaaaaaaaaaaaaa2,
+					    0xaaaaaaaaaaaaaaa2, 0xbbbbbbbbbbbbbbb2, 0xbbbbbbbbbbbbbbb2,
+					    0xccccccccccccccc2, 0xccccccccccccccc2, 0xddddddddddddddd2,
+					    0xddddddddddddddd2, 0xeeeeeeeeeeeeeee2, 0xeeeeeeeeeeeeeee2,
+					    0xfffffffffffffff2, 0xfffffffffffffff2,
+				    } };
 
 struct reg_set reg_set_vxrs_high = {
-	.name		= "VXRS_HIGH",
-	.nr		= NT_S390_VXRS_HIGH,
-	.data		= &vxrs_high_data,
-	.len		= sizeof(vxrs_high_data),
-	.optional	= true,
+	.name = "VXRS_HIGH",
+	.nr = NT_S390_VXRS_HIGH,
+	.data = &vxrs_high_data,
+	.len = sizeof(vxrs_high_data),
+	.optional = true,
 };
 
 /*
  * s390 guarded-storage registers
  */
-#define NT_S390_GS_CB		0x30b
-#define NT_S390_GS_BC		0x30c
+#define NT_S390_GS_CB 0x30b
+#define NT_S390_GS_BC 0x30c
 
 struct gs_cb {
 	uint64_t regs[4];
 };
 
-struct gs_cb gs_cb_data = {
-	.regs = {
-		0x0000000000000000,
-		0x000000123400001a,
-		0x5555555555555555,
-		0x000000014b58a010,
-	}
-};
+struct gs_cb gs_cb_data = { .regs = {
+				    0x0000000000000000,
+				    0x000000123400001a,
+				    0x5555555555555555,
+				    0x000000014b58a010,
+			    } };
 
 struct reg_set reg_set_gs_cb = {
-	.name		= "GS_CB",
-	.nr		= NT_S390_GS_CB,
-	.data		= &gs_cb_data,
-	.len		= sizeof(gs_cb_data),
-	.optional	= true,
+	.name = "GS_CB",
+	.nr = NT_S390_GS_CB,
+	.data = &gs_cb_data,
+	.len = sizeof(gs_cb_data),
+	.optional = true,
 };
 
-struct gs_cb gs_bc_data = {
-	.regs = {
-		0x0000000000000000,
-		0x000000123400001a,
-		0xffffffffffffffff,
-		0x0000000aaaaaaaaa,
-	}
-};
+struct gs_cb gs_bc_data = { .regs = {
+				    0x0000000000000000,
+				    0x000000123400001a,
+				    0xffffffffffffffff,
+				    0x0000000aaaaaaaaa,
+			    } };
 
 struct reg_set reg_set_gs_bc = {
-	.name		= "GS_BC_CB",
-	.nr		= NT_S390_GS_BC,
-	.data		= &gs_bc_data,
-	.len		= sizeof(gs_bc_data),
-	.optional	= true,
+	.name = "GS_BC_CB",
+	.nr = NT_S390_GS_BC,
+	.data = &gs_bc_data,
+	.len = sizeof(gs_bc_data),
+	.optional = true,
 };
 
 /*
  * s390 runtime-instrumentation control block
  */
-#define NT_S390_RI_CB		0x30d
+#define NT_S390_RI_CB 0x30d
 
 struct ri_cb {
 	uint64_t regs[8];
 };
 
-struct ri_cb ri_cb_data = {
-	.regs = {
-			0x000002aa13aae000,
-			0x000002aa13aad000,
-			0x000002aa13aadfff,
-			0xe0a1000400000000,
-			0x0000000000000000,
-			0x0000000000004e20,
-			0x0000000000003479,
-			0x0000000000000000,
-	}
-};
+struct ri_cb ri_cb_data = { .regs = {
+				    0x000002aa13aae000,
+				    0x000002aa13aad000,
+				    0x000002aa13aadfff,
+				    0xe0a1000400000000,
+				    0x0000000000000000,
+				    0x0000000000004e20,
+				    0x0000000000003479,
+				    0x0000000000000000,
+			    } };
 
 struct reg_set reg_set_ri_cb = {
-	.name		= "RI_CB",
-	.nr		= NT_S390_RI_CB,
-	.data		= &ri_cb_data,
-	.len		= sizeof(ri_cb_data),
-	.optional	= true,
+	.name = "RI_CB",
+	.nr = NT_S390_RI_CB,
+	.data = &ri_cb_data,
+	.len = sizeof(ri_cb_data),
+	.optional = true,
 };
 
 /*
  * Vector with all regsets
  */
 struct reg_set *reg_set_vec[] = {
-	&reg_set_prfpreg,
-	&reg_set_vxrs_low,
-	&reg_set_vxrs_high,
-	&reg_set_gs_cb,
-	&reg_set_gs_bc,
-	&reg_set_ri_cb,
-	NULL,
+	&reg_set_prfpreg, &reg_set_vxrs_low, &reg_set_vxrs_high, &reg_set_gs_cb, &reg_set_gs_bc, &reg_set_ri_cb, NULL,
 };
 
 /*
  * Print hexdump for buffer with variable group parameter
  */
-void util_hexdump_grp(const char *tag, const void *data, int grp,
-		      int count, int indent)
+void util_hexdump_grp(const char *tag, const void *data, int grp, int count, int indent)
 {
 	char str[1024], *ptr = str;
 	const char *buf = data;
@@ -325,19 +301,16 @@ static int set_regset(pid_t pid, struct reg_set *reg_set)
 		switch (errno) {
 		case EOPNOTSUPP:
 		case ENODEV:
-			test_msg(" REGSET: %12s -> not supported by machine\n",
-				 reg_set->name);
+			test_msg(" REGSET: %12s -> not supported by machine\n", reg_set->name);
 			return 0;
 		case EINVAL:
-			test_msg(" REGSET: %12s -> not supported by kernel\n",
-				 reg_set->name);
+			test_msg(" REGSET: %12s -> not supported by kernel\n", reg_set->name);
 			return 0;
 		default:
 			break;
 		}
 	}
-	pr_perror("PTRACE_SETREGSET for %s failed for pid %d",
-		  reg_set->name, pid);
+	pr_perror("PTRACE_SETREGSET for %s failed for pid %d", reg_set->name, pid);
 	return -1;
 }
 
@@ -373,8 +346,7 @@ static int check_regset(pid_t pid, struct reg_set *reg_set)
 	iov.iov_len = reg_set->len;
 
 	if (ptrace(PTRACE_GETREGSET, pid, reg_set->nr, iov) != 0) {
-		pr_perror("PTRACE_SETREGSET for %s failed for pid %d",
-			  reg_set->name, pid);
+		pr_perror("PTRACE_SETREGSET for %s failed for pid %d", reg_set->name, pid);
 		free(data);
 		return -1;
 	}
@@ -423,14 +395,15 @@ static inline void send_tid_and_loop(int fd)
 {
 	int tid = syscall(__NR_gettid);
 
-	asm volatile(
-		     "lgr	2,%0\n"	/* Arg 1: fd */
+	asm volatile("lgr	2,%0\n" /* Arg 1: fd */
 		     "la	3,%1\n" /* Arg 2: &tid */
-		     "lghi	4,4\n"  /* Arg 3: sizeof(int) */
-		     "svc	4\n"	/* __NR_write SVC: */
+		     "lghi	4,4\n" /* Arg 3: sizeof(int) */
+		     "svc	4\n" /* __NR_write SVC: */
 		     /* After SVC no more registers are changed */
 		     "0:	j 0b\n" /* Loop here */
-		     : : "d" (fd), "Q" (tid) : "2", "3", "4");
+		     :
+		     : "d"(fd), "Q"(tid)
+		     : "2", "3", "4");
 }
 
 /*
@@ -501,8 +474,7 @@ int main(int argc, char *argv[])
 
 	test_init(argc, argv);
 
-	test_msg("------------- START 1 PROCESS + %d THREADS ---------------\n",
-	       NR_THREADS);
+	test_msg("------------- START 1 PROCESS + %d THREADS ---------------\n", NR_THREADS);
 	if (pipe(pipefd) == -1) {
 		perror("pipe failed");
 		exit(EXIT_FAILURE);
diff --git a/test/zdtm/static/s390x_runtime_instr.c b/test/zdtm/static/s390x_runtime_instr.c
index ff692d7c6..e6c55d3ff 100644
--- a/test/zdtm/static/s390x_runtime_instr.c
+++ b/test/zdtm/static/s390x_runtime_instr.c
@@ -19,61 +19,61 @@
 #include "zdtmtst.h"
 
 #ifndef __NR_s390_runtime_instr
-#define __NR_s390_runtime_instr		342
+#define __NR_s390_runtime_instr 342
 #endif
-#define NT_S390_RI_CB			0x30d
+#define NT_S390_RI_CB 0x30d
 
-#define BUF_SIZE (1024*1024)
+#define BUF_SIZE (1024 * 1024)
 
-const char *test_doc	= "Check runtime-instrumentation";
+const char *test_doc = "Check runtime-instrumentation";
 /* Original test provided by Martin Schwidefsky <schwidefsky@de.ibm.com> */
-const char *test_author	= "Alice Frosi <alice@linux.vnet.ibm.com>";
+const char *test_author = "Alice Frosi <alice@linux.vnet.ibm.com>";
 
 struct runtime_instr_cb {
 	unsigned long rca;
 	unsigned long roa;
 	unsigned long rla;
 
-	unsigned int v			: 1;
-	unsigned int s			: 1;
-	unsigned int k			: 1;
-	unsigned int h			: 1;
-	unsigned int a			: 1;
-	unsigned int reserved1		: 3;
-	unsigned int ps		: 1;
-	unsigned int qs		: 1;
-	unsigned int pc		: 1;
-	unsigned int qc		: 1;
-	unsigned int reserved2		: 1;
-	unsigned int g			: 1;
-	unsigned int u			: 1;
-	unsigned int l			: 1;
-	unsigned int key		: 4;
-	unsigned int reserved3		: 8;
-	unsigned int t			: 1;
-	unsigned int rgs		: 3;
+	unsigned int v : 1;
+	unsigned int s : 1;
+	unsigned int k : 1;
+	unsigned int h : 1;
+	unsigned int a : 1;
+	unsigned int reserved1 : 3;
+	unsigned int ps : 1;
+	unsigned int qs : 1;
+	unsigned int pc : 1;
+	unsigned int qc : 1;
+	unsigned int reserved2 : 1;
+	unsigned int g : 1;
+	unsigned int u : 1;
+	unsigned int l : 1;
+	unsigned int key : 4;
+	unsigned int reserved3 : 8;
+	unsigned int t : 1;
+	unsigned int rgs : 3;
 
-	unsigned int m			: 4;
-	unsigned int n			: 1;
-	unsigned int mae		: 1;
-	unsigned int reserved4		: 2;
-	unsigned int c			: 1;
-	unsigned int r			: 1;
-	unsigned int b			: 1;
-	unsigned int j			: 1;
-	unsigned int e			: 1;
-	unsigned int x			: 1;
-	unsigned int reserved5		: 2;
-	unsigned int bpxn		: 1;
-	unsigned int bpxt		: 1;
-	unsigned int bpti		: 1;
-	unsigned int bpni		: 1;
-	unsigned int reserved6		: 2;
+	unsigned int m : 4;
+	unsigned int n : 1;
+	unsigned int mae : 1;
+	unsigned int reserved4 : 2;
+	unsigned int c : 1;
+	unsigned int r : 1;
+	unsigned int b : 1;
+	unsigned int j : 1;
+	unsigned int e : 1;
+	unsigned int x : 1;
+	unsigned int reserved5 : 2;
+	unsigned int bpxn : 1;
+	unsigned int bpxt : 1;
+	unsigned int bpti : 1;
+	unsigned int bpni : 1;
+	unsigned int reserved6 : 2;
 
-	unsigned int d			: 1;
-	unsigned int f			: 1;
-	unsigned int ic		: 4;
-	unsigned int dc		: 4;
+	unsigned int d : 1;
+	unsigned int f : 1;
+	unsigned int ic : 4;
+	unsigned int dc : 4;
 
 	unsigned long reserved7;
 	unsigned long sf;
@@ -88,8 +88,8 @@ static inline unsigned long extract_psw(void)
 {
 	unsigned int reg1, reg2;
 
-	asm volatile("epsw %0,%1" : "=d" (reg1), "=a" (reg2));
-	return (((unsigned long) reg1) << 32) | ((unsigned long) reg2);
+	asm volatile("epsw %0,%1" : "=d"(reg1), "=a"(reg2));
+	return (((unsigned long)reg1) << 32) | ((unsigned long)reg2);
 }
 
 /*
@@ -97,7 +97,7 @@ static inline unsigned long extract_psw(void)
  */
 static inline void rion(void)
 {
-	asm volatile (".word 0xaa01, 0x0000");
+	asm volatile(".word 0xaa01, 0x0000");
 }
 
 /*
@@ -105,7 +105,7 @@ static inline void rion(void)
  */
 static inline void rioff(void)
 {
-	asm volatile (".word 0xaa03, 0x0000");
+	asm volatile(".word 0xaa03, 0x0000");
 }
 
 /*
@@ -113,7 +113,7 @@ static inline void rioff(void)
  */
 static inline void mric(struct runtime_instr_cb *cb)
 {
-	asm volatile(".insn rsy,0xeb0000000062,0,0,%0" : : "Q" (*cb));
+	asm volatile(".insn rsy,0xeb0000000062,0,0,%0" : : "Q"(*cb));
 }
 
 /*
@@ -121,7 +121,7 @@ static inline void mric(struct runtime_instr_cb *cb)
  */
 static inline void stric(struct runtime_instr_cb *cb)
 {
-	asm volatile(".insn rsy,0xeb0000000061,0,0,%0" : "=Q" (*cb) : : "cc");
+	asm volatile(".insn rsy,0xeb0000000061,0,0,%0" : "=Q"(*cb) : : "cc");
 }
 
 /*
@@ -130,8 +130,8 @@ static inline void stric(struct runtime_instr_cb *cb)
 int main(int argc, char **argv)
 {
 	struct runtime_instr_cb ricb, ricb_check;
-	unsigned long *ricb_check_ptr = (unsigned long *) &ricb_check;
-	unsigned long *ricb_ptr = (unsigned long *) &ricb;
+	unsigned long *ricb_check_ptr = (unsigned long *)&ricb_check;
+	unsigned long *ricb_ptr = (unsigned long *)&ricb;
 	unsigned long psw_mask;
 	void *buf;
 	int i;
@@ -155,8 +155,8 @@ int main(int argc, char **argv)
 		return -1;
 	}
 	/* Set buffer for RI */
-	ricb.rca = ricb.roa = (unsigned long) buf;
-	ricb.rla = (unsigned long) buf + BUF_SIZE;
+	ricb.rca = ricb.roa = (unsigned long)buf;
+	ricb.rla = (unsigned long)buf + BUF_SIZE;
 	mric(&ricb);
 	/* Enable RI - afterwards the PSW will have RI bit set */
 	rion();
@@ -204,8 +204,7 @@ int main(int argc, char **argv)
 		/* Skip sf field because its value may change */
 		if (i == 6)
 			continue;
-		fail("%d:Got %016lx expected %016lx",
-		     i, ricb_ptr[i], ricb_check_ptr[i]);
+		fail("%d:Got %016lx expected %016lx", i, ricb_ptr[i], ricb_check_ptr[i]);
 		return -1;
 	}
 
diff --git a/test/zdtm/static/sched_policy00.c b/test/zdtm/static/sched_policy00.c
index 7312abd6b..794c11af2 100644
--- a/test/zdtm/static/sched_policy00.c
+++ b/test/zdtm/static/sched_policy00.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check sched policy to be preserved";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check sched policy to be preserved";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 static const int parm = 3;
 
@@ -23,7 +23,7 @@ static int do_nothing(void)
 	return -1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pid, ret, err = 0;
 	struct sched_param p;
@@ -82,7 +82,6 @@ int main(int argc, char ** argv)
 			fprintf(file, "%d\n", old_rt_runtime_us);
 			fclose(file);
 		}
-
 	}
 	return err;
 }
diff --git a/test/zdtm/static/sched_prio00.c b/test/zdtm/static/sched_prio00.c
index ea4a2ee13..4bc878786 100644
--- a/test/zdtm/static/sched_prio00.c
+++ b/test/zdtm/static/sched_prio00.c
@@ -11,10 +11,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check sched prios to be preserved";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check sched prios to be preserved";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
-#define NRTASKS	3
+#define NRTASKS 3
 
 static int do_nothing(void)
 {
@@ -32,7 +32,7 @@ static void kill_all(int *pid, int n)
 		kill(pid[i], SIGKILL);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pid[NRTASKS], i, parm[NRTASKS], ret;
 
diff --git a/test/zdtm/static/scm00.c b/test/zdtm/static/scm00.c
index de626d9c9..d66975582 100644
--- a/test/zdtm/static/scm00.c
+++ b/test/zdtm/static/scm00.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SCM_RIGHTS are preserved";
-const char *test_author	= "Pavel Emelyanov <xemul@virtuozzo.com>";
+const char *test_doc = "Check that SCM_RIGHTS are preserved";
+const char *test_author = "Pavel Emelyanov <xemul@virtuozzo.com>";
 
 static int send_fd(int via, int fd)
 {
diff --git a/test/zdtm/static/scm03.c b/test/zdtm/static/scm03.c
index cf6049781..a40fc0101 100644
--- a/test/zdtm/static/scm03.c
+++ b/test/zdtm/static/scm03.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SCM_RIGHTS are preserved";
-const char *test_author	= "Pavel Emelyanov <xemul@virtuozzo.com>";
+const char *test_doc = "Check that SCM_RIGHTS are preserved";
+const char *test_author = "Pavel Emelyanov <xemul@virtuozzo.com>";
 
 static int send_fd(int via, int fd1, int fd2)
 {
diff --git a/test/zdtm/static/scm05.c b/test/zdtm/static/scm05.c
index c17bddda3..ebafc93e7 100644
--- a/test/zdtm/static/scm05.c
+++ b/test/zdtm/static/scm05.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SCM_RIGHTS are preserved";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com>";
+const char *test_doc = "Check that SCM_RIGHTS are preserved";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 static int send_fd(int via, int fd)
 {
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 {
 	struct epoll_event event = {
 		.events = EPOLLIN,
-        };
+	};
 	int sk[2], ep, ret;
 
 	test_init(argc, argv);
diff --git a/test/zdtm/static/scm06.c b/test/zdtm/static/scm06.c
index 6c9a78b4d..2d62f6695 100644
--- a/test/zdtm/static/scm06.c
+++ b/test/zdtm/static/scm06.c
@@ -11,8 +11,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check a send of looped unix sockets";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com>";
+const char *test_doc = "Check a send of looped unix sockets";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 static int send_fd(int via, int fd)
 {
@@ -99,8 +99,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < 2; i++) {
 		addr.sun_path[0] = '\0';
 		addr.sun_path[1] = i;
-		if (bind(ska[i], (struct sockaddr *)&addr,
-			 sizeof(addr.sun_family) + 2)) {
+		if (bind(ska[i], (struct sockaddr *)&addr, sizeof(addr.sun_family) + 2)) {
 			fail("Can't bind");
 			exit(1);
 		}
diff --git a/test/zdtm/static/seccomp_filter.c b/test/zdtm/static/seccomp_filter.c
index 501a4941c..757591e24 100644
--- a/test/zdtm/static/seccomp_filter.c
+++ b/test/zdtm/static/seccomp_filter.c
@@ -18,8 +18,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SECCOMP_MODE_FILTER is restored";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that SECCOMP_MODE_FILTER is restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #ifdef __NR_seccomp
 
@@ -52,14 +52,14 @@ int get_seccomp_mode(pid_t pid)
 int filter_syscall(int syscall_nr)
 {
 	struct sock_filter filter[] = {
-		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
-		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, syscall_nr, 0, 1),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW),
+		BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(struct seccomp_data, nr)),
+		BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, syscall_nr, 0, 1),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_KILL),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ALLOW),
 	};
 
 	struct sock_fprog bpf_prog = {
-		.len = (unsigned short)(sizeof(filter)/sizeof(filter[0])),
+		.len = (unsigned short)(sizeof(filter) / sizeof(filter[0])),
 		.filter = filter,
 	};
 
@@ -71,7 +71,7 @@ int filter_syscall(int syscall_nr)
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	pid_t pid;
 	int mode, status;
@@ -92,7 +92,6 @@ int main(int argc, char ** argv)
 	}
 
 	if (pid == 0) {
-
 		sk = sk_pair[1];
 		close(sk_pair[0]);
 
diff --git a/test/zdtm/static/seccomp_filter_inheritance.c b/test/zdtm/static/seccomp_filter_inheritance.c
index 3129185ea..7a86cd85e 100644
--- a/test/zdtm/static/seccomp_filter_inheritance.c
+++ b/test/zdtm/static/seccomp_filter_inheritance.c
@@ -11,15 +11,15 @@
 #include <sys/syscall.h>
 
 #ifdef __NR_seccomp
-# include <linux/seccomp.h>
-# include <linux/filter.h>
-# include <linux/limits.h>
+#include <linux/seccomp.h>
+#include <linux/filter.h>
+#include <linux/limits.h>
 #endif
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SECCOMP_MODE_FILTER is restored";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that SECCOMP_MODE_FILTER is restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #ifdef __NR_seccomp
 
@@ -52,14 +52,14 @@ int get_seccomp_mode(pid_t pid)
 int filter_syscall(int syscall_nr)
 {
 	struct sock_filter filter[] = {
-		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
-		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, syscall_nr, 0, 1),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_KILL),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW),
+		BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(struct seccomp_data, nr)),
+		BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, syscall_nr, 0, 1),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_KILL),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ALLOW),
 	};
 
 	struct sock_fprog bpf_prog = {
-		.len = (unsigned short)(sizeof(filter)/sizeof(filter[0])),
+		.len = (unsigned short)(sizeof(filter) / sizeof(filter[0])),
 		.filter = filter,
 	};
 
@@ -71,7 +71,7 @@ int filter_syscall(int syscall_nr)
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	pid_t pid;
 	int mode, status;
@@ -92,7 +92,6 @@ int main(int argc, char ** argv)
 	}
 
 	if (pid == 0) {
-
 		pid_t pid2;
 
 		sk = sk_pair[1];
@@ -112,7 +111,6 @@ int main(int argc, char ** argv)
 			_exit(1);
 
 		if (!pid2) {
-
 			if (write(sk, &c, 1) != 1) {
 				pr_perror("write");
 				_exit(1);
@@ -181,7 +179,6 @@ err:
 	return 1;
 }
 
-
 #else /* __NR_seccomp */
 
 #define TEST_SKIP_REASON "incompatible kernel (no seccomp)"
diff --git a/test/zdtm/static/seccomp_filter_threads.c b/test/zdtm/static/seccomp_filter_threads.c
index 8d5b77d16..6c84ada1f 100644
--- a/test/zdtm/static/seccomp_filter_threads.c
+++ b/test/zdtm/static/seccomp_filter_threads.c
@@ -12,10 +12,10 @@
 #include <sys/mman.h>
 
 #ifdef __NR_seccomp
-# include <linux/seccomp.h>
-# include <linux/filter.h>
-# include <linux/limits.h>
-# include <pthread.h>
+#include <linux/seccomp.h>
+#include <linux/filter.h>
+#include <linux/limits.h>
+#include <pthread.h>
 #endif
 
 #include "zdtmtst.h"
@@ -29,12 +29,15 @@
 #define SECCOMP_FILTER_FLAG_TSYNC 1
 #endif
 
-const char *test_doc	= "Check threads to carry different seccomps";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check threads to carry different seccomps";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 #ifdef __NR_seccomp
 
-static long sys_gettid(void) { return syscall(__NR_gettid); }
+static long sys_gettid(void)
+{
+	return syscall(__NR_gettid);
+}
 
 static futex_t *wait_rdy;
 static futex_t *wait_run;
@@ -70,14 +73,14 @@ int get_seccomp_mode(pid_t pid)
 int filter_syscall(int syscall_nr, unsigned int flags)
 {
 	struct sock_filter filter[] = {
-		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
-		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, syscall_nr, 0, 1),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ERRNO | (SECCOMP_RET_DATA & magic)),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW),
+		BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(struct seccomp_data, nr)),
+		BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, syscall_nr, 0, 1),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ERRNO | (SECCOMP_RET_DATA & magic)),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ALLOW),
 	};
 
 	struct sock_fprog bpf_prog = {
-		.len = (unsigned short)(sizeof(filter)/sizeof(filter[0])),
+		.len = (unsigned short)(sizeof(filter) / sizeof(filter[0])),
 		.filter = filter,
 	};
 
@@ -89,21 +92,28 @@ int filter_syscall(int syscall_nr, unsigned int flags)
 	return 0;
 }
 
-int tigger_ptrace(void) { return ptrace(PTRACE_TRACEME); }
-int trigger_prctl(void) { return prctl(PR_SET_PDEATHSIG, 9, 0, 0, 0); }
-int trigger_mincore(void) { return mincore(NULL, 0, NULL); }
-
-#define gen_param(__syscall_nr, __trigger)		\
-{							\
-	.syscall_name	= # __syscall_nr,		\
-	.syscall_nr	= __syscall_nr,			\
-	.trigger	= __trigger,			\
+int tigger_ptrace(void)
+{
+	return ptrace(PTRACE_TRACEME);
+}
+int trigger_prctl(void)
+{
+	return prctl(PR_SET_PDEATHSIG, 9, 0, 0, 0);
+}
+int trigger_mincore(void)
+{
+	return mincore(NULL, 0, NULL);
 }
 
+#define gen_param(__syscall_nr, __trigger)                                                       \
+	{                                                                                        \
+		.syscall_name = #__syscall_nr, .syscall_nr = __syscall_nr, .trigger = __trigger, \
+	}
+
 struct {
-	char		*syscall_name;
-	unsigned int	syscall_nr;
-	int		(*trigger)(void);
+	char *syscall_name;
+	unsigned int syscall_nr;
+	int (*trigger)(void);
 } pthread_seccomp_params[] = {
 	gen_param(__NR_ptrace, tigger_ptrace),
 	gen_param(__NR_prctl, trigger_prctl),
@@ -115,21 +125,17 @@ struct {
 void *thread_main(void *arg)
 {
 	int ret;
-	size_t nr = (long) arg;
+	size_t nr = (long)arg;
 
 	if (filter_syscall(pthread_seccomp_params[nr].syscall_nr, 0) < 0)
 		pthread_exit((void *)1);
 
-	test_msg("%s filtered inside a sole thread %lu\n",
-		 pthread_seccomp_params[nr].syscall_name,
-		 sys_gettid());
+	test_msg("%s filtered inside a sole thread %lu\n", pthread_seccomp_params[nr].syscall_name, sys_gettid());
 
 	futex_inc_and_wake(wait_rdy);
 	futex_wait_while_lt(wait_run, 1);
 
-	test_msg("Triggering %zu %s thread %lu\n",
-		 nr, pthread_seccomp_params[nr].syscall_name,
-		 sys_gettid());
+	test_msg("Triggering %zu %s thread %lu\n", nr, pthread_seccomp_params[nr].syscall_name, sys_gettid());
 
 	ret = pthread_seccomp_params[nr].trigger();
 	if (ret == -1 && errno == magic)
@@ -139,7 +145,7 @@ void *thread_main(void *arg)
 	return (void *)1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int ret, mode, status;
 	size_t i;
@@ -147,10 +153,8 @@ int main(int argc, char ** argv)
 
 	test_init(argc, argv);
 
-	wait_rdy = mmap(NULL, sizeof(*wait_rdy), PROT_READ | PROT_WRITE,
-			MAP_ANONYMOUS | MAP_SHARED, -1, 0);
-	wait_run = mmap(NULL, sizeof(*wait_rdy), PROT_READ | PROT_WRITE,
-			MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	wait_rdy = mmap(NULL, sizeof(*wait_rdy), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	wait_run = mmap(NULL, sizeof(*wait_rdy), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 
 	if (wait_rdy == MAP_FAILED || wait_run == MAP_FAILED) {
 		pr_perror("mmap failed");
@@ -169,7 +173,6 @@ int main(int argc, char ** argv)
 		return -1;
 	}
 
-
 	if (pid == 0) {
 		pthread_t thread[ARRAY_SIZE(pthread_seccomp_params)];
 		void *ret;
diff --git a/test/zdtm/static/seccomp_filter_tsync.c b/test/zdtm/static/seccomp_filter_tsync.c
index 739ea96f7..41be83426 100644
--- a/test/zdtm/static/seccomp_filter_tsync.c
+++ b/test/zdtm/static/seccomp_filter_tsync.c
@@ -11,10 +11,10 @@
 #include <sys/syscall.h>
 
 #ifdef __NR_seccomp
-# include <linux/seccomp.h>
-# include <linux/filter.h>
-# include <linux/limits.h>
-# include <pthread.h>
+#include <linux/seccomp.h>
+#include <linux/filter.h>
+#include <linux/limits.h>
+#include <pthread.h>
 #endif
 
 #include "zdtmtst.h"
@@ -27,8 +27,8 @@
 #define SECCOMP_FILTER_FLAG_TSYNC 1
 #endif
 
-const char *test_doc	= "Check that SECCOMP_FILTER_FLAG_TSYNC works correctly after restore";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that SECCOMP_FILTER_FLAG_TSYNC works correctly after restore";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #ifdef __NR_seccomp
 
@@ -65,14 +65,14 @@ int get_seccomp_mode(pid_t pid)
 int filter_syscall(int syscall_nr, unsigned int flags)
 {
 	struct sock_filter filter[] = {
-		BPF_STMT(BPF_LD+BPF_W+BPF_ABS, offsetof(struct seccomp_data, nr)),
-		BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, syscall_nr, 0, 1),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ERRNO | (SECCOMP_RET_DATA & magic)),
-		BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW),
+		BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(struct seccomp_data, nr)),
+		BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, syscall_nr, 0, 1),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ERRNO | (SECCOMP_RET_DATA & magic)),
+		BPF_STMT(BPF_RET + BPF_K, SECCOMP_RET_ALLOW),
 	};
 
 	struct sock_fprog bpf_prog = {
-		.len = (unsigned short)(sizeof(filter)/sizeof(filter[0])),
+		.len = (unsigned short)(sizeof(filter) / sizeof(filter[0])),
 		.filter = filter,
 	};
 
@@ -101,7 +101,7 @@ void *wait_and_getpid(void *arg)
 	return ((void *)1);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	pid_t pid;
 	int mode, status;
diff --git a/test/zdtm/static/seccomp_strict.c b/test/zdtm/static/seccomp_strict.c
index 9042924b2..74bb6e9b8 100644
--- a/test/zdtm/static/seccomp_strict.c
+++ b/test/zdtm/static/seccomp_strict.c
@@ -9,14 +9,14 @@
 #include <sys/syscall.h>
 
 #ifdef __NR_seccomp
-# include <linux/seccomp.h>
-# include <linux/limits.h>
+#include <linux/seccomp.h>
+#include <linux/limits.h>
 #endif
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SECCOMP_MODE_STRICT is restored";
-const char *test_author	= "Tycho Andersen <tycho.andersen@canonical.com>";
+const char *test_doc = "Check that SECCOMP_MODE_STRICT is restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 #ifdef __NR_seccomp
 
@@ -46,7 +46,7 @@ int get_seccomp_mode(pid_t pid)
 	return -1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	pid_t pid;
 	int mode, status;
diff --git a/test/zdtm/static/selfexe00.c b/test/zdtm/static/selfexe00.c
index bc6117248..4839ea18b 100644
--- a/test/zdtm/static/selfexe00.c
+++ b/test/zdtm/static/selfexe00.c
@@ -16,10 +16,10 @@
 
 #include "zdtmtst.h"
 
-#define gettid()	pthread_self()
+#define gettid() pthread_self()
 
-const char *test_doc	= "Check if /proc/self/exe points to same location after restore\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Check if /proc/self/exe points to same location after restore\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/selinux00.c b/test/zdtm/static/selinux00.c
index be647834d..00aaeb53c 100644
--- a/test/zdtm/static/selinux00.c
+++ b/test/zdtm/static/selinux00.c
@@ -12,8 +12,8 @@
 
 /* Enabling the right policy happens in selinux00.hook and selinx00.checkskip */
 
-const char *test_doc	= "Check that a SELinux profile is restored";
-const char *test_author	= "Adrian Reber <areber@redhat.com>";
+const char *test_doc = "Check that a SELinux profile is restored";
+const char *test_author = "Adrian Reber <areber@redhat.com>";
 
 /* This is all based on Tycho's apparmor code */
 
@@ -60,7 +60,6 @@ int checkprofile(void)
 	char context[1024];
 	int len;
 
-
 	fd = open("/proc/self/attr/current", O_RDONLY);
 	if (fd < 0) {
 		fail("Could not open /proc/self/attr/current");
@@ -70,8 +69,7 @@ int checkprofile(void)
 	len = read(fd, context, strlen(CONTEXT));
 	close(fd);
 	if (len != strlen(CONTEXT)) {
-		fail("SELinux context has unexpected length %d, expected %zd",
-			len, strlen(CONTEXT));
+		fail("SELinux context has unexpected length %d, expected %zd", len, strlen(CONTEXT));
 		return -1;
 	}
 
diff --git a/test/zdtm/static/selinux01.c b/test/zdtm/static/selinux01.c
index 14e99c739..b9e0a58fc 100644
--- a/test/zdtm/static/selinux01.c
+++ b/test/zdtm/static/selinux01.c
@@ -14,8 +14,8 @@
 
 /* Enabling the right policy happens in selinux00.hook and selinx00.checkskip */
 
-const char *test_doc	= "Check that a SELinux socket context is restored";
-const char *test_author	= "Adrian Reber <areber@redhat.com>";
+const char *test_doc = "Check that a SELinux socket context is restored";
+const char *test_author = "Adrian Reber <areber@redhat.com>";
 
 /* This is all based on Tycho's apparmor code */
 
@@ -83,7 +83,6 @@ int check_sockcreate(void)
 	char context[1024];
 	int len;
 
-
 	fd = open("/proc/self/attr/sockcreate", O_RDONLY);
 	if (fd < 0) {
 		fail("Could not open /proc/self/attr/sockcreate");
@@ -93,8 +92,7 @@ int check_sockcreate(void)
 	len = read(fd, context, strlen(CONTEXT));
 	close(fd);
 	if (len != strlen(CONTEXT)) {
-		fail("SELinux context has unexpected length %d, expected %zd",
-			len, strlen(CONTEXT));
+		fail("SELinux context has unexpected length %d, expected %zd", len, strlen(CONTEXT));
 		return -1;
 	}
 
diff --git a/test/zdtm/static/sem.c b/test/zdtm/static/sem.c
index 257dd84ca..a3335dcfe 100644
--- a/test/zdtm/static/sem.c
+++ b/test/zdtm/static/sem.c
@@ -13,12 +13,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc="Tests IPC semaphores migrates fine";
-const char *test_author="Stanislav Kinsbursky <skinsbursky@parallels.com>";
+const char *test_doc = "Tests IPC semaphores migrates fine";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@parallels.com>";
 
-static int sem_test(int id,
-		    struct sembuf *lock, struct sembuf *unlock,
-		    int lock_ops, int unlock_ops)
+static int sem_test(int id, struct sembuf *lock, struct sembuf *unlock, int lock_ops, int unlock_ops)
 {
 	if (semop(id, lock, lock_ops) == -1) {
 		fail("Failed to lock semaphore");
@@ -38,27 +36,25 @@ static int check_sem_by_key(int key, int num)
 	int id;
 	struct sembuf lock[2] = {
 		{
-		.sem_num = num,
-		.sem_op = 0,
-		.sem_flg = 0,
+			.sem_num = num,
+			.sem_op = 0,
+			.sem_flg = 0,
 		},
 		{
-		.sem_num = num,
-		.sem_op = 1,
-		.sem_flg = 0,
+			.sem_num = num,
+			.sem_op = 1,
+			.sem_flg = 0,
 		},
 	};
-	struct sembuf unlock[1] = {
-		{
+	struct sembuf unlock[1] = { {
 		.sem_num = num,
 		.sem_op = -1,
 		.sem_flg = 0,
-		}
-	};
+	} };
 	int val;
 
 	id = semget(key, NSEMS, 0777);
-	if (id  == -1) {
+	if (id == -1) {
 		fail("Can't get sem");
 		return -errno;
 	}
@@ -69,9 +65,7 @@ static int check_sem_by_key(int key, int num)
 		return -errno;
 	}
 
-	return sem_test(id, lock, unlock,
-			sizeof(lock)/sizeof(struct sembuf),
-			sizeof(unlock)/sizeof(struct sembuf));
+	return sem_test(id, lock, unlock, sizeof(lock) / sizeof(struct sembuf), sizeof(unlock) / sizeof(struct sembuf));
 }
 
 static int check_sem_by_id(int id, int num, int val)
@@ -79,18 +73,16 @@ static int check_sem_by_id(int id, int num, int val)
 	int curr;
 	struct sembuf lock[] = {
 		{
-		.sem_num = num,
-		.sem_op = val,
-		.sem_flg = 0,
+			.sem_num = num,
+			.sem_op = val,
+			.sem_flg = 0,
 		},
 	};
-	struct sembuf unlock[] = {
-		{
+	struct sembuf unlock[] = { {
 		.sem_num = num,
-		.sem_op = - val * 2,
+		.sem_op = -val * 2,
 		.sem_flg = 0,
-		}
-	};
+	} };
 
 	curr = semctl(id, num, GETVAL);
 	if (curr < 0) {
@@ -101,9 +93,7 @@ static int check_sem_by_id(int id, int num, int val)
 		fail("Sem has wrong value: %d instead of %d", curr, val);
 		return -EFAULT;
 	}
-	return sem_test(id, lock, unlock,
-			sizeof(lock)/sizeof(struct sembuf),
-			sizeof(unlock)/sizeof(struct sembuf));
+	return sem_test(id, lock, unlock, sizeof(lock) / sizeof(struct sembuf), sizeof(unlock) / sizeof(struct sembuf));
 }
 
 int main(int argc, char **argv)
@@ -112,10 +102,10 @@ int main(int argc, char **argv)
 	int i;
 	/* See man semctl */
 	union semun {
-		int		val;
-		struct		semid_ds *buf;
-		unsigned short	*array;
-		struct seminfo	*__buf;
+		int val;
+		struct semid_ds *buf;
+		unsigned short *array;
+		struct seminfo *__buf;
 	} val[NSEMS];
 	int ret, fail_count = 0;
 
@@ -128,7 +118,7 @@ int main(int argc, char **argv)
 	}
 
 	id = semget(key, NSEMS, 0777 | IPC_CREAT | IPC_EXCL);
-	if (id  == -1) {
+	if (id == -1) {
 		fail_count++;
 		pr_perror("Can't get sem array");
 		goto out;
diff --git a/test/zdtm/static/session00.c b/test/zdtm/static/session00.c
index f65b3cdef..147ecfb0a 100644
--- a/test/zdtm/static/session00.c
+++ b/test/zdtm/static/session00.c
@@ -4,13 +4,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test that sid, pgid are restored";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Test that sid, pgid are restored";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
-#define DETACH		1
-#define NEWSID		2
-#define CHANGESID	4
-#define DOUBLE_CHANGESID	8
+#define DETACH		 1
+#define NEWSID		 2
+#define CHANGESID	 4
+#define DOUBLE_CHANGESID 8
 
 struct testcase {
 	int flags;
@@ -18,14 +18,24 @@ struct testcase {
 	pid_t sid;
 };
 
-static struct testcase testcases[] = {
-			{DETACH, },
-			{NEWSID, },
-			{0, },
-			{DETACH|NEWSID, },
-			{CHANGESID, },
-			{DOUBLE_CHANGESID | CHANGESID, }
-		};
+static struct testcase testcases[] = { {
+					       DETACH,
+				       },
+				       {
+					       NEWSID,
+				       },
+				       {
+					       0,
+				       },
+				       {
+					       DETACH | NEWSID,
+				       },
+				       {
+					       CHANGESID,
+				       },
+				       {
+					       DOUBLE_CHANGESID | CHANGESID,
+				       } };
 /*
     2     2 session00
     4     4  \_ session00               # {NEWSID, },
@@ -91,8 +101,8 @@ static int fork_child(int i)
 			close(p[1]);
 			wait(NULL);
 			if (getsid(0) != sid) {
-				fail("The process %d (%x) has SID=%d (expected %d)",
-					pid, testcases[i].flags, sid, testcases[i].sid);
+				fail("The process %d (%x) has SID=%d (expected %d)", pid, testcases[i].flags, sid,
+				     testcases[i].sid);
 				exit(1);
 			}
 			exit(0);
@@ -118,14 +128,14 @@ static int fork_child(int i)
 			close(p[1]);
 			wait(NULL);
 			if (getsid(0) != sid) {
-				fail("The process %d (%x) has SID=%d (expected %d)",
-					pid, testcases[i].flags, sid, testcases[i].sid);
+				fail("The process %d (%x) has SID=%d (expected %d)", pid, testcases[i].flags, sid,
+				     testcases[i].sid);
 				exit(1);
 			}
 			exit(0);
 		}
 
-child:
+	child:
 		pid = getpid();
 		write(p[1], &pid, sizeof(pid));
 		close(p[1]);
@@ -171,7 +181,7 @@ child:
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int i, ret, err = 0, status;
 	pid_t pid;
@@ -198,8 +208,8 @@ int main(int argc, char ** argv)
 		pid_t sid = getsid(pid);
 
 		if (sid != testcases[i].sid) {
-			fail("The process %d (%x) has SID=%d (expected %d)",
-				pid, testcases[i].flags, sid, testcases[i].sid);
+			fail("The process %d (%x) has SID=%d (expected %d)", pid, testcases[i].flags, sid,
+			     testcases[i].sid);
 			err++;
 		}
 
diff --git a/test/zdtm/static/session01.c b/test/zdtm/static/session01.c
index 48cfb26de..0f727a9a6 100644
--- a/test/zdtm/static/session01.c
+++ b/test/zdtm/static/session01.c
@@ -7,8 +7,8 @@
 #include "zdtmtst.h"
 #include "lock.h"
 
-const char *test_doc	= "Test that sid, pgid are restored";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Test that sid, pgid are restored";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
 struct master {
 	pid_t pid;
@@ -40,27 +40,33 @@ enum {
 static struct testcase *testcases;
 static futex_t *fstate;
 static struct testcase __testcases[] = {
-	{ 2,  1,  2,  1,  2, 1 },  /* session00			*/
-	{ 4,  2,  4,  2,  4, 1 },  /*  |\_session00		*/
-	{15,  4,  4,  4, 15, 1 },  /*  |  |\_session00		*/
-	{16,  4,  4,  4, 15, 1 },  /*  |   \_session00		*/
-	{17,  4,  4,  4, 17, 0 },  /*  |  |\_session00		*/
-	{18,  4,  4,  4, 17, 1 },  /*  |   \_session00		*/
-	{ 5,  2,  2,  2,  2, 1 },  /*  |\_session00		*/
-	{ 8,  2,  8,  2,  8, 1 },  /*  |\_session00		*/
-	{ 9,  8,  2,  2,  2, 1 },  /*  |   \_session00		*/
-	{10,  2, 10,  2, 10, 1 },  /*  |\_session00		*/
-	{11, 10, 11,  2, 11, 1 },  /*  |    \_session00		*/
-	{12, 11,  2,  2,  2, 1 },  /*  |        \_session00	*/
-	{13,  2,  2,  2,  2, 0 },  /*   \_session00		*/
-	{ 3, 13,  2,  2,  2, 1 },  /* session00			*/
-	{ 6,  2,  6,  2,  6, 0 },  /*   \_session00		*/
-	{14,  6,  6,  6,  6, 1 },  /* session00			*/
+	{ 2, 1, 2, 1, 2, 1 }, /* session00			*/
+	{ 4, 2, 4, 2, 4, 1 }, /*  |\_session00		*/
+	{ 15, 4, 4, 4, 15, 1 }, /*  |  |\_session00		*/
+	{ 16, 4, 4, 4, 15, 1 }, /*  |   \_session00		*/
+	{ 17, 4, 4, 4, 17, 0 }, /*  |  |\_session00		*/
+	{ 18, 4, 4, 4, 17, 1 }, /*  |   \_session00		*/
+	{ 5, 2, 2, 2, 2, 1 }, /*  |\_session00		*/
+	{ 8, 2, 8, 2, 8, 1 }, /*  |\_session00		*/
+	{ 9, 8, 2, 2, 2, 1 }, /*  |   \_session00		*/
+	{ 10, 2, 10, 2, 10, 1 }, /*  |\_session00		*/
+	{ 11, 10, 11, 2, 11, 1 }, /*  |    \_session00		*/
+	{ 12, 11, 2, 2, 2, 1 }, /*  |        \_session00	*/
+	{ 13, 2, 2, 2, 2, 0 }, /*   \_session00		*/
+	{ 3, 13, 2, 2, 2, 1 }, /* session00			*/
+	{ 6, 2, 6, 2, 6, 0 }, /*   \_session00		*/
+	{ 14, 6, 6, 6, 6, 1 }, /* session00			*/
 };
 
 #define TESTS (sizeof(__testcases) / sizeof(struct testcase))
 
-#define check(n, a, b) do { if ((a) != (b)) { pr_perror("%s mismatch %d != %d", n, a, b); goto err; } } while (0)
+#define check(n, a, b)                                              \
+	do {                                                        \
+		if ((a) != (b)) {                                   \
+			pr_perror("%s mismatch %d != %d", n, a, b); \
+			goto err;                                   \
+		}                                                   \
+	} while (0)
 
 static int child(const int c);
 static int fork_children(struct testcase *t, int leader)
@@ -73,7 +79,7 @@ static int fork_children(struct testcase *t, int leader)
 			continue;
 
 		if (leader ^ (t->pid == testcases[i].born_sid))
-				continue;
+			continue;
 
 		cid = test_fork_id(i);
 		if (cid < 0)
@@ -135,7 +141,7 @@ static int child(const int c)
 				goto err;
 			}
 
-		t->master.pgid	= testcases[i].master.pid;
+		t->master.pgid = testcases[i].master.pid;
 		break;
 	}
 
@@ -160,17 +166,17 @@ static int child(const int c)
 	futex_wait_until(fstate, TEST_MASTER);
 
 	/* Save the master copy */
-	t->master.ppid	= getppid();
-	t->master.sid	= getsid(0);
+	t->master.ppid = getppid();
+	t->master.sid = getsid(0);
 
 	futex_set_and_wake(&t->futex, c);
 
 	futex_wait_until(fstate, TEST_CHECK);
 
-	check("pid", t->master.pid,	getpid());
-	check("ppid", t->master.ppid,	getppid());
-	check("sid", t->master.sid,	getsid(0));
-	check("pgid", t->master.pgid,	getpgid(0));
+	check("pid", t->master.pid, getpid());
+	check("ppid", t->master.ppid, getppid());
+	check("sid", t->master.sid, getsid(0));
+	check("pgid", t->master.pgid, getpgid(0));
 
 	futex_set_and_wake(&t->futex, c);
 
@@ -183,7 +189,7 @@ err:
 	return 1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int i, err, ret;
 	void *ptr;
@@ -238,8 +244,7 @@ int main(int argc, char ** argv)
 			continue;
 		if (testcases[i].alive)
 			continue;
-		test_msg("Wait porcess %d (pid %d)\n",
-				i, testcases[i].master.pid);
+		test_msg("Wait porcess %d (pid %d)\n", i, testcases[i].master.pid);
 		waitpid(testcases[i].master.pid, NULL, 0);
 	}
 
@@ -272,28 +277,24 @@ int main(int argc, char ** argv)
 			struct testcase *p = testcases + j;
 			/* sanity check */
 			if (p->pid == t->sid && t->master.sid != p->master.pid) {
-				pr_perror("session mismatch (%d) %d != (%d) %d",
-					i, t->master.sid, j, p->master.pid);
+				pr_perror("session mismatch (%d) %d != (%d) %d", i, t->master.sid, j, p->master.pid);
 				err++;
 			}
 			if (p->pid == t->pgid && t->master.pgid != p->master.pid) {
-				pr_perror("pgid mismatch (%d) %d != (%d) %d",
-					i, t->master.pgid, j, p->master.pid);
+				pr_perror("pgid mismatch (%d) %d != (%d) %d", i, t->master.pgid, j, p->master.pid);
 				err++;
 			}
 		}
 
 		sid = getsid(t->master.pid);
 		if (t->master.sid != sid) {
-			pr_perror("%d: session mismatch %d (expected %d)",
-						i, sid, t->master.sid);
+			pr_perror("%d: session mismatch %d (expected %d)", i, sid, t->master.sid);
 			err++;
 		}
 
 		pgid = getpgid(t->master.pid);
 		if (t->master.pgid != pgid) {
-			pr_perror("%d: pgid mismatch %d (expected %d)",
-						i, t->master.pgid, pgid);
+			pr_perror("%d: pgid mismatch %d (expected %d)", i, t->master.pgid, pgid);
 			err++;
 		}
 	}
diff --git a/test/zdtm/static/session02.c b/test/zdtm/static/session02.c
index f5c81df16..0967e04b2 100644
--- a/test/zdtm/static/session02.c
+++ b/test/zdtm/static/session02.c
@@ -10,11 +10,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create a crazy process tree";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Create a crazy process tree";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
-struct process
-{
+struct process {
 	pid_t pid;
 	pid_t sid;
 	int sks[2];
@@ -39,20 +38,12 @@ static void cleanup(void)
 	}
 }
 
-enum commands
-{
-	TEST_FORK,
-	TEST_WAIT,
-	TEST_SUBREAPER,
-	TEST_SETSID,
-	TEST_DIE
-};
+enum commands { TEST_FORK, TEST_WAIT, TEST_SUBREAPER, TEST_SETSID, TEST_DIE };
 
-struct command
-{
-	enum commands	cmd;
-	int		arg1;
-	int		arg2;
+struct command {
+	enum commands cmd;
+	int arg1;
+	int arg2;
 };
 
 static void handle_command(void);
@@ -63,7 +54,7 @@ static void mainloop(void)
 		handle_command();
 }
 
-#define CLONE_STACK_SIZE	4096
+#define CLONE_STACK_SIZE 4096
 /* All arguments should be above stack, because it grows down */
 struct clone_args {
 	char stack[CLONE_STACK_SIZE] __stack_aligned__;
@@ -73,7 +64,7 @@ struct clone_args {
 
 static int clone_func(void *_arg)
 {
-	struct clone_args *args = (struct clone_args *) _arg;
+	struct clone_args *args = (struct clone_args *)_arg;
 
 	current = args->id;
 
@@ -89,8 +80,7 @@ static int make_child(int id, int flags)
 
 	args.id = id;
 
-	cid = clone(clone_func, args.stack_ptr,
-			flags | SIGCHLD, &args);
+	cid = clone(clone_func, args.stack_ptr, flags | SIGCHLD, &args);
 
 	if (cid < 0)
 		pr_perror("clone(%d, %d)", id, flags);
@@ -112,24 +102,20 @@ static void handle_command(void)
 	}
 
 	switch (cmd.cmd) {
-	case TEST_FORK:
-		{
-			pid_t pid;
+	case TEST_FORK: {
+		pid_t pid;
 
-			pid = make_child(cmd.arg1, cmd.arg2);
-			if (pid == -1) {
-				status = -1;
-				goto err;
-			}
-
-			test_msg("%3d: fork(%d, %x) = %d\n",
-					current, cmd.arg1, cmd.arg2, pid);
-			processes[cmd.arg1].pid = pid;
+		pid = make_child(cmd.arg1, cmd.arg2);
+		if (pid == -1) {
+			status = -1;
+			goto err;
 		}
-		break;
+
+		test_msg("%3d: fork(%d, %x) = %d\n", current, cmd.arg1, cmd.arg2, pid);
+		processes[cmd.arg1].pid = pid;
+	} break;
 	case TEST_WAIT:
-		test_msg("%3d: wait(%d) = %d\n", current,
-				cmd.arg1, processes[cmd.arg1].pid);
+		test_msg("%3d: wait(%d) = %d\n", current, cmd.arg1, processes[cmd.arg1].pid);
 
 		if (waitpid(processes[cmd.arg1].pid, NULL, 0) == -1) {
 			pr_perror("waitpid(%d)", processes[cmd.arg1].pid);
@@ -145,7 +131,7 @@ static void handle_command(void)
 		break;
 	case TEST_SETSID:
 		test_msg("%3d: setsid()\n", current);
-		if(setsid() == -1) {
+		if (setsid() == -1) {
 			pr_perror("setsid");
 			status = -1;
 		}
@@ -175,7 +161,7 @@ err:
 static int send_command(int id, enum commands op, int arg1, int arg2)
 {
 	int sk = processes[id].sks[1], ret, status;
-	struct command cmd = {op, arg1, arg2};
+	struct command cmd = { op, arg1, arg2 };
 
 	if (op == TEST_FORK) {
 		if (processes[arg1].pid) {
@@ -208,15 +194,14 @@ err:
 	exit(1);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pid, i;
 	int fail_cnt = 0;
 
 	test_init(argc, argv);
 
-	processes = mmap(NULL, PAGE_SIZE, PROT_WRITE | PROT_READ,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	processes = mmap(NULL, PAGE_SIZE, PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (processes == NULL) {
 		pr_perror("Unable to map share memory");
 		return 1;
@@ -243,39 +228,39 @@ int main(int argc, char ** argv)
 	 * 13    12          \_ session02	( 8)
 	*/
 
-	send_command(0, TEST_SUBREAPER,	1, 0);
-	send_command(0, TEST_SETSID,	0, 0);
+	send_command(0, TEST_SUBREAPER, 1, 0);
+	send_command(0, TEST_SETSID, 0, 0);
 
-	send_command(0, TEST_FORK,	1, 0);
-	send_command(1, TEST_FORK,	2, 0);
+	send_command(0, TEST_FORK, 1, 0);
+	send_command(1, TEST_FORK, 2, 0);
 
-	send_command(2, TEST_SETSID,	0, 0);
-	send_command(2, TEST_FORK,	3, CLONE_PARENT);
-	send_command(2, TEST_DIE,	0, 0);
-	send_command(1, TEST_WAIT,	2, 0);
+	send_command(2, TEST_SETSID, 0, 0);
+	send_command(2, TEST_FORK, 3, CLONE_PARENT);
+	send_command(2, TEST_DIE, 0, 0);
+	send_command(1, TEST_WAIT, 2, 0);
 
-	send_command(3, TEST_FORK,	4, 0);
-	send_command(4, TEST_FORK,	5, 0);
-	send_command(5, TEST_FORK,	6, 0);
+	send_command(3, TEST_FORK, 4, 0);
+	send_command(4, TEST_FORK, 5, 0);
+	send_command(5, TEST_FORK, 6, 0);
 
-	send_command(5, TEST_FORK,	7, 0);
-	send_command(7, TEST_SETSID,	0, 0);
-	send_command(7, TEST_FORK,	8, CLONE_PARENT);
-	send_command(7, TEST_FORK,	9, CLONE_PARENT);
-	send_command(7, TEST_DIE,	0, 0);
-	send_command(5, TEST_WAIT,	7, 0);
+	send_command(5, TEST_FORK, 7, 0);
+	send_command(7, TEST_SETSID, 0, 0);
+	send_command(7, TEST_FORK, 8, CLONE_PARENT);
+	send_command(7, TEST_FORK, 9, CLONE_PARENT);
+	send_command(7, TEST_DIE, 0, 0);
+	send_command(5, TEST_WAIT, 7, 0);
 
-	send_command(9, TEST_FORK,	10, 0);
-	send_command(1, TEST_SUBREAPER,	1, 0);
-	send_command(9, TEST_DIE,	0, 0);
-	send_command(5, TEST_WAIT,	9, 0);
-	send_command(1, TEST_SUBREAPER,	0, 0);
+	send_command(9, TEST_FORK, 10, 0);
+	send_command(1, TEST_SUBREAPER, 1, 0);
+	send_command(9, TEST_DIE, 0, 0);
+	send_command(5, TEST_WAIT, 9, 0);
+	send_command(1, TEST_SUBREAPER, 0, 0);
 
-	send_command(4, TEST_DIE,	0, 0);
-	send_command(3, TEST_WAIT,	4, 0);
+	send_command(4, TEST_DIE, 0, 0);
+	send_command(3, TEST_WAIT, 4, 0);
 
-	send_command(1, TEST_SETSID,	0, 0);
-	send_command(5, TEST_SETSID,	0, 0);
+	send_command(1, TEST_SETSID, 0, 0);
+	send_command(5, TEST_SETSID, 0, 0);
 
 	for (i = 0; i < nr_processes; i++) {
 		if (processes[i].dead)
@@ -309,8 +294,7 @@ int main(int argc, char ** argv)
 		}
 
 		if (sid != processes[i].sid) {
-			fail("%d, %d: wrong sid %d (expected %d)",
-				i, processes[i].pid, sid, processes[i].sid);
+			fail("%d, %d: wrong sid %d (expected %d)", i, processes[i].pid, sid, processes[i].sid);
 			fail_cnt++;
 		}
 	}
diff --git a/test/zdtm/static/session03.c b/test/zdtm/static/session03.c
index 8ca16e410..6e6f948ab 100644
--- a/test/zdtm/static/session03.c
+++ b/test/zdtm/static/session03.c
@@ -10,11 +10,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create a crazy process tree";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Create a crazy process tree";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
-struct process
-{
+struct process {
 	pid_t pid;
 	pid_t sid;
 	int sks[2];
@@ -23,7 +22,7 @@ struct process
 };
 
 #define MEM_SIZE (2 * PAGE_SIZE)
-#define PR_MAX (MEM_SIZE / sizeof(struct process))
+#define PR_MAX	 (MEM_SIZE / sizeof(struct process))
 
 struct process *processes;
 int nr_processes = 0;
@@ -60,17 +59,9 @@ static void cleanup(void)
 	}
 }
 
-enum commands
-{
-	TEST_FORK,
-	TEST_DIE_WAIT,
-	TEST_DIE,
-	TEST_SUBREAPER,
-	TEST_SETSID,
-	TEST_MAX
-};
+enum commands { TEST_FORK, TEST_DIE_WAIT, TEST_DIE, TEST_SUBREAPER, TEST_SETSID, TEST_MAX };
 
-int cmd_weght[TEST_MAX] = {10, 3, 1, 10, 7};
+int cmd_weght[TEST_MAX] = { 10, 3, 1, 10, 7 };
 int sum_weight = 0;
 static int get_rnd_op(void)
 {
@@ -90,11 +81,10 @@ static int get_rnd_op(void)
 	return -1;
 }
 
-struct command
-{
-	enum commands	cmd;
-	int		arg1;
-	int		arg2;
+struct command {
+	enum commands cmd;
+	int arg1;
+	int arg2;
 };
 
 static void handle_command(void);
@@ -105,7 +95,7 @@ static void mainloop(void)
 		handle_command();
 }
 
-#define CLONE_STACK_SIZE	4096
+#define CLONE_STACK_SIZE 4096
 /* All arguments should be above stack, because it grows down */
 struct clone_args {
 	char stack[CLONE_STACK_SIZE] __stack_aligned__;
@@ -115,7 +105,7 @@ struct clone_args {
 
 static int clone_func(void *_arg)
 {
-	struct clone_args *args = (struct clone_args *) _arg;
+	struct clone_args *args = (struct clone_args *)_arg;
 
 	current = args->id;
 
@@ -131,8 +121,7 @@ static int make_child(int id, int flags)
 
 	args.id = id;
 
-	cid = clone(clone_func, args.stack_ptr,
-			flags | SIGCHLD, &args);
+	cid = clone(clone_func, args.stack_ptr, flags | SIGCHLD, &args);
 
 	if (cid < 0)
 		pr_perror("clone(%d, %d)", id, flags);
@@ -154,21 +143,18 @@ static void handle_command(void)
 	}
 
 	switch (cmd.cmd) {
-	case TEST_FORK:
-		{
-			pid_t pid;
+	case TEST_FORK: {
+		pid_t pid;
 
-			pid = make_child(cmd.arg1, cmd.arg2 ? CLONE_PARENT : 0);
-			if (pid < 0) {
-				status = -1;
-				goto err;
-			}
-
-			test_msg("%3d: fork(%d, %x) = %d\n",
-					current, cmd.arg1, cmd.arg2, pid);
-			processes[cmd.arg1].pid = pid;
+		pid = make_child(cmd.arg1, cmd.arg2 ? CLONE_PARENT : 0);
+		if (pid < 0) {
+			status = -1;
+			goto err;
 		}
-		break;
+
+		test_msg("%3d: fork(%d, %x) = %d\n", current, cmd.arg1, cmd.arg2, pid);
+		processes[cmd.arg1].pid = pid;
+	} break;
 	case TEST_SUBREAPER:
 		test_msg("%3d: subreaper(%d)\n", current, cmd.arg1);
 		if (prctl(PR_SET_CHILD_SUBREAPER, cmd.arg1, 0, 0, 0) == -1) {
@@ -180,7 +166,7 @@ static void handle_command(void)
 		if (getsid(0) == getpid())
 			break;
 		test_msg("%3d: setsid()\n", current);
-		if(setsid() == -1) {
+		if (setsid() == -1) {
 			pr_perror("setsid");
 			status = -1;
 		}
@@ -218,7 +204,7 @@ err:
 static int send_command(int id, enum commands op, int arg)
 {
 	int sk = processes[id].sks[1], ret, status;
-	struct command cmd = {op, arg};
+	struct command cmd = { op, arg };
 
 	if (op == TEST_FORK) {
 		cmd.arg1 = nr_processes;
@@ -236,8 +222,7 @@ static int send_command(int id, enum commands op, int arg)
 
 	status = 0;
 	ret = read(sk, &status, sizeof(status));
-	if (ret != sizeof(status) &&
-	    !(status == 0 && (op == TEST_DIE || op == TEST_DIE_WAIT))) {
+	if (ret != sizeof(status) && !(status == 0 && (op == TEST_DIE || op == TEST_DIE_WAIT))) {
 		pr_perror("Unable to get answer");
 		goto err;
 	}
@@ -253,7 +238,7 @@ err:
 	exit(1);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	struct sigaction act;
 	int pid, i, ret;
@@ -283,8 +268,7 @@ int main(int argc, char ** argv)
 		return -1;
 	}
 
-	processes = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ,
-				MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	processes = mmap(NULL, MEM_SIZE, PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (processes == NULL) {
 		pr_perror("Unable to map share memory");
 		return 1;
@@ -302,7 +286,7 @@ int main(int argc, char ** argv)
 	if (pid < 0)
 		return -1;
 
-	while(nr_processes < PR_MAX) {
+	while (nr_processes < PR_MAX) {
 		int op, id;
 		int flags = lrand48() % 2;
 
@@ -357,8 +341,7 @@ int main(int argc, char ** argv)
 		}
 
 		if (sid != processes[i].sid) {
-			fail("%d, %d: wrong sid %d (expected %d)",
-				i, processes[i].pid, sid, processes[i].sid);
+			fail("%d, %d: wrong sid %d (expected %d)", i, processes[i].pid, sid, processes[i].sid);
 			fail_cnt++;
 		}
 	}
diff --git a/test/zdtm/static/shared_mount_propagation.c b/test/zdtm/static/shared_mount_propagation.c
index 4e81b9ec6..47ffa8263 100644
--- a/test/zdtm/static/shared_mount_propagation.c
+++ b/test/zdtm/static/shared_mount_propagation.c
@@ -5,8 +5,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check mounts are propagated to shared mounts";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check mounts are propagated to shared mounts";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/shared_slave_mount_children.c b/test/zdtm/static/shared_slave_mount_children.c
index 75c2513c6..172a61a60 100644
--- a/test/zdtm/static/shared_slave_mount_children.c
+++ b/test/zdtm/static/shared_slave_mount_children.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check non-uniform shares restore fine";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check non-uniform shares restore fine";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/shm-mp.c b/test/zdtm/static/shm-mp.c
index a7c87962d..1929dac19 100644
--- a/test/zdtm/static/shm-mp.c
+++ b/test/zdtm/static/shm-mp.c
@@ -8,10 +8,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc="Tests mprotected SYSVIPC shmems";
-const char *test_author="Pavel Emelyanov <xemul@openvz.org>";
+const char *test_doc = "Tests mprotected SYSVIPC shmems";
+const char *test_author = "Pavel Emelyanov <xemul@openvz.org>";
 
-static sigjmp_buf segv_ret;		/* we need sig*jmp stuff, otherwise SIGSEGV will reset our handler */
+static sigjmp_buf segv_ret; /* we need sig*jmp stuff, otherwise SIGSEGV will reset our handler */
 static void segfault(int signo)
 {
 	siglongjmp(segv_ret, 1);
@@ -33,11 +33,11 @@ static int check_prot(char *ptr, char val, int prot)
 			fail("PROT_READ bypassed");
 			return -1;
 		}
-	} else		/* we come here on return from SIGSEGV handler */
+	} else /* we come here on return from SIGSEGV handler */
 		if (prot & PROT_READ) {
-			fail("PROT_READ rejected");
-			return -1;
-		}
+		fail("PROT_READ rejected");
+		return -1;
+	}
 
 	if (!sigsetjmp(segv_ret, 1)) {
 		*ptr = val;
@@ -45,11 +45,11 @@ static int check_prot(char *ptr, char val, int prot)
 			fail("PROT_WRITE bypassed");
 			return -1;
 		}
-	} else		/* we come here on return from SIGSEGV handler */
+	} else /* we come here on return from SIGSEGV handler */
 		if (prot & PROT_WRITE) {
-			fail("PROT_WRITE rejected");
-			return -1;
-		}
+		fail("PROT_WRITE rejected");
+		return -1;
+	}
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
 		fail("restoring SIGSEGV handler failed");
@@ -100,7 +100,6 @@ int main(int argc, char **argv)
 	if (check_prot(mem + PAGE_SIZE, 'W', PROT_READ | PROT_WRITE))
 		f++;
 
-
 	if (!f)
 		pass();
 	else
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index 320211bfc..3da29daeb 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -13,14 +13,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc="Tests detached shmems migrate fine";
-const char *test_author="Stanislav Kinsbursky <skinsbursky@parallels.com>";
+const char *test_doc = "Tests detached shmems migrate fine";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@parallels.com>";
 
-#define DEF_MEM_SIZE	(40960)
+#define DEF_MEM_SIZE (40960)
 unsigned int shmem_size = DEF_MEM_SIZE;
 TEST_OPTION(shmem_size, uint, "Size of shared memory segment", 0);
 
-#define INIT_CRC	(~0)
+#define INIT_CRC (~0)
 
 static int fill_shm_seg(int id, size_t size)
 {
diff --git a/test/zdtm/static/shmemfd-priv.c b/test/zdtm/static/shmemfd-priv.c
index bbdb46905..0f6e817cc 100644
--- a/test/zdtm/static/shmemfd-priv.c
+++ b/test/zdtm/static/shmemfd-priv.c
@@ -9,10 +9,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test C/R of shared memory file descriptors";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Test C/R of shared memory file descriptors";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 int main(int argc, char *argv[])
 {
@@ -28,12 +32,11 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	*(int *) addr = 1;
-	*(int *) (addr + PAGE_SIZE) = 11;
-	*(int *) (addr +  2 * PAGE_SIZE) = 111;
+	*(int *)addr = 1;
+	*(int *)(addr + PAGE_SIZE) = 11;
+	*(int *)(addr + 2 * PAGE_SIZE) = 111;
 
-	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx",
-					(long)addr, (long)addr + 5 * PAGE_SIZE);
+	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx", (long)addr, (long)addr + 5 * PAGE_SIZE);
 	fd = open(path, O_RDWR | O_LARGEFILE);
 	if (fd < 0)
 		err(1, "Can't open %s", path);
@@ -50,30 +53,30 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	*(int *) (priv_addr + PAGE_SIZE) = 22;
+	*(int *)(priv_addr + PAGE_SIZE) = 22;
 
 	test_daemon();
 	test_waitsig();
 
-	if (*(int *) (priv_addr + PAGE_SIZE) != 22) {
+	if (*(int *)(priv_addr + PAGE_SIZE) != 22) {
 		fail("the second page of the private mapping is corrupted");
 		return 1;
 	}
-	if (*(int *) (priv_addr) != 11) {
+	if (*(int *)(priv_addr) != 11) {
 		fail("the first page of the private mapping is corrupted");
 		return 1;
 	}
-	if (*(int *) (addr2) != 111) {
+	if (*(int *)(addr2) != 111) {
 		fail("the first page of the second shared mapping is corrupted");
 		return 1;
 	}
-	*(int *) (addr2) = 333;
-	if (*(int *) (addr + 2 * PAGE_SIZE) != 333) {
+	*(int *)(addr2) = 333;
+	if (*(int *)(addr + 2 * PAGE_SIZE) != 333) {
 		fail("the first page of the second shared mapping isn't shared");
 		return 1;
 	}
-	*(int *) (addr + 3 * PAGE_SIZE) = 444;
-	if (*(int *) (priv_addr + 2 * PAGE_SIZE) != 444) {
+	*(int *)(addr + 3 * PAGE_SIZE) = 444;
+	if (*(int *)(priv_addr + 2 * PAGE_SIZE) != 444) {
 		fail("the third page of the private mapping is corrupted");
 		return 1;
 	}
diff --git a/test/zdtm/static/shmemfd.c b/test/zdtm/static/shmemfd.c
index b65faa2e1..8a5232bbd 100644
--- a/test/zdtm/static/shmemfd.c
+++ b/test/zdtm/static/shmemfd.c
@@ -9,10 +9,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test C/R of shared memory file descriptors";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Test C/R of shared memory file descriptors";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
-#define err(exitcode, msg, ...) ({ pr_perror(msg, ##__VA_ARGS__); exit(exitcode); })
+#define err(exitcode, msg, ...)                \
+	({                                     \
+		pr_perror(msg, ##__VA_ARGS__); \
+		exit(exitcode);                \
+	})
 
 int main(int argc, char *argv[])
 {
@@ -31,8 +35,7 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx",
-					(long)addr, (long)addr + PAGE_SIZE);
+	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx", (long)addr, (long)addr + PAGE_SIZE);
 	fd = open(path, O_RDWR | O_LARGEFILE);
 	if (fd < 0)
 		err(1, "Can't open %s", path);
diff --git a/test/zdtm/static/sigaltstack.c b/test/zdtm/static/sigaltstack.c
index 13602d3a1..dd7c82d39 100644
--- a/test/zdtm/static/sigaltstack.c
+++ b/test/zdtm/static/sigaltstack.c
@@ -11,8 +11,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for alternate signal stack";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check for alternate signal stack";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 #define TESTSIGSTKSZ 16384
 
@@ -31,20 +31,17 @@ static stack_t sas_state[SAS_MAX];
 
 static task_waiter_t t;
 
-#define exit_group(code)	syscall(__NR_exit_group, code)
-#define gettid()		syscall(__NR_gettid)
+#define exit_group(code) syscall(__NR_exit_group, code)
+#define gettid()	 syscall(__NR_gettid)
 
 static int sascmp(stack_t *old, stack_t *new)
 {
-	return old->ss_size != new->ss_size	||
-		old->ss_sp != new->ss_sp	||
-		old->ss_flags != new->ss_flags;
+	return old->ss_size != new->ss_size || old->ss_sp != new->ss_sp || old->ss_flags != new->ss_flags;
 }
 
 static void show_ss(char *prefix, stack_t *s)
 {
-	test_msg("%20s: at %p (size %8zu flags %#2x)\n",
-		 prefix, s->ss_sp, s->ss_size, s->ss_flags);
+	test_msg("%20s: at %p (size %8zu flags %#2x)\n", prefix, s->ss_sp, s->ss_size, s->ss_flags);
 }
 
 void thread_sigaction(int signo, siginfo_t *info, void *context)
@@ -64,14 +61,14 @@ void thread_sigaction(int signo, siginfo_t *info, void *context)
 static void *thread_func(void *arg)
 {
 	struct sigaction sa = {
-		.sa_sigaction	= thread_sigaction,
-		.sa_flags	= SA_RESTART | SA_ONSTACK,
+		.sa_sigaction = thread_sigaction,
+		.sa_flags = SA_RESTART | SA_ONSTACK,
 	};
 
-	sas_state[SAS_THRD_OLD] = (stack_t) {
-		.ss_size	= sizeof(stack_thread) - 8,
-		.ss_sp		= stack_thread,
-		.ss_flags	= 0,
+	sas_state[SAS_THRD_OLD] = (stack_t){
+		.ss_size = sizeof(stack_thread) - 8,
+		.ss_sp = stack_thread,
+		.ss_flags = 0,
 	};
 
 	sigemptyset(&sa.sa_mask);
@@ -106,14 +103,14 @@ int main(int argc, char *argv[])
 	pthread_t thread;
 
 	struct sigaction sa = {
-		.sa_sigaction	= leader_sigaction,
-		.sa_flags	= SA_RESTART | SA_ONSTACK,
+		.sa_sigaction = leader_sigaction,
+		.sa_flags = SA_RESTART | SA_ONSTACK,
 	};
 
-	sas_state[SAS_MAIN_OLD] = (stack_t) {
-		.ss_size	= sizeof(stack_main) - 8,
-		.ss_sp		= stack_main,
-		.ss_flags	= 0,
+	sas_state[SAS_MAIN_OLD] = (stack_t){
+		.ss_size = sizeof(stack_main) - 8,
+		.ss_sp = stack_main,
+		.ss_flags = 0,
 	};
 
 	sigemptyset(&sa.sa_mask);
diff --git a/test/zdtm/static/signalfd00.c b/test/zdtm/static/signalfd00.c
index 61b1f0398..b98372885 100644
--- a/test/zdtm/static/signalfd00.c
+++ b/test/zdtm/static/signalfd00.c
@@ -18,8 +18,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check for signalfd without signals";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check for signalfd without signals";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/sigpending.c b/test/zdtm/static/sigpending.c
index 4d174588c..1641fdd86 100644
--- a/test/zdtm/static/sigpending.c
+++ b/test/zdtm/static/sigpending.c
@@ -9,13 +9,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check pending signals";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check pending signals";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 static pid_t child;
 static int numsig;
 
-#define TESTSIG (SIGRTMAX)
+#define TESTSIG	  (SIGRTMAX)
 #define THREADSIG (SIGRTMIN)
 static siginfo_t share_infos[2];
 static siginfo_t self_infos[64]; /* self */
@@ -25,7 +25,7 @@ static int self_nr;
 static int thread_nr;
 
 #ifndef offsetof
-# define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define offsetof(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
 #endif
 
 /* cr_siginfo is declared to get an offset of _sifields */
@@ -59,7 +59,7 @@ typedef union cr_siginfo cr_siginfo_t;
  *	  } _rt;
  * Look at __copy_siginfo_to_user32() for more information.
  */
-# define _si_fields_sz 12
+#define _si_fields_sz  12
 #define siginfo_filled (offsetof(cr_siginfo_t, _info._sifields) + _si_fields_sz)
 
 static pthread_mutex_t exit_lock;
@@ -78,9 +78,7 @@ static void sig_handler(int signal, siginfo_t *info, void *data)
 
 	switch (signal) {
 	case SIGCHLD:
-		if ((info->si_code & CLD_EXITED) &&
-		    (info->si_pid == child) &&
-		    (info->si_status == 5))
+		if ((info->si_code & CLD_EXITED) && (info->si_pid == child) && (info->si_status == 5))
 			numsig++;
 		else {
 			fail("Wrong siginfo");
@@ -104,12 +102,12 @@ static void sig_handler(int signal, siginfo_t *info, void *data)
 		}
 
 		crc = ~0;
-		if (datachk((uint8_t *) siginf_body(info), _si_fields_sz, &crc)) {
+		if (datachk((uint8_t *)siginf_body(info), _si_fields_sz, &crc)) {
 			fail("CRC mismatch");
 			return;
 		}
 
-		 if (memcmp(info, src, siginfo_filled)) {
+		if (memcmp(info, src, siginfo_filled)) {
 			fail("Source and received info are differ");
 			return;
 		}
@@ -186,7 +184,7 @@ int send_siginfo(int signo, pid_t pid, pid_t tid, int group, siginfo_t *info)
 	info->si_code = si_code;
 	si_code--;
 	info->si_signo = signo;
-	datagen((uint8_t *) siginf_body(info), _si_fields_sz, &crc);
+	datagen((uint8_t *)siginf_body(info), _si_fields_sz, &crc);
 
 	sent_sigs++;
 
@@ -196,7 +194,7 @@ int send_siginfo(int signo, pid_t pid, pid_t tid, int group, siginfo_t *info)
 		return syscall(SYS_rt_tgsigqueueinfo, pid, tid, signo, info);
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	sigset_t blockmask, oldset, newset;
 	struct sigaction act;
@@ -239,7 +237,7 @@ int main(int argc, char ** argv)
 		return -1;
 	}
 
-	if(child == 0)
+	if (child == 0)
 		return 5; /* SIGCHLD */
 	if (waitid(P_PID, child, &infop, WNOWAIT | WEXITED)) {
 		pr_perror("waitid");
diff --git a/test/zdtm/static/sigtrap.c b/test/zdtm/static/sigtrap.c
index 659213cf5..6bd30aad4 100644
--- a/test/zdtm/static/sigtrap.c
+++ b/test/zdtm/static/sigtrap.c
@@ -18,10 +18,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that a pending SIGTRAP handled correctly";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Check that a pending SIGTRAP handled correctly";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
-static void sigh(int signo) {}
+static void sigh(int signo)
+{
+}
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/sigtrap01.c b/test/zdtm/static/sigtrap01.c
index a63e55d6a..a61f4368e 100644
--- a/test/zdtm/static/sigtrap01.c
+++ b/test/zdtm/static/sigtrap01.c
@@ -5,15 +5,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that a signal handler for SIGTRAP is restored";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Check that a signal handler for SIGTRAP is restored";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
 static int sigtrap = 0;
-static void sigh(int signo) {
+static void sigh(int signo)
+{
 	sigtrap = 1;
 }
 
-
 int main(int argc, char **argv)
 {
 	test_init(argc, argv);
diff --git a/test/zdtm/static/sit.c b/test/zdtm/static/sit.c
index 07c36ab5d..8deb2901d 100644
--- a/test/zdtm/static/sit.c
+++ b/test/zdtm/static/sit.c
@@ -13,12 +13,12 @@
 #include <net/if.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "check sit devices";
-const char *test_author	= "Pavel Emelyanov <xemul@virtuozzo.com>";
+const char *test_doc = "check sit devices";
+const char *test_author = "Pavel Emelyanov <xemul@virtuozzo.com>";
 
-#define IF_NAME "zdtmsit0"
-#define LOCAL_ADDR	"1.1.1.2"
-#define REMOT_ADDR	"2.2.2.1"
+#define IF_NAME	   "zdtmsit0"
+#define LOCAL_ADDR "1.1.1.2"
+#define REMOT_ADDR "2.2.2.1"
 
 int main(int argc, char **argv)
 {
@@ -55,4 +55,3 @@ int main(int argc, char **argv)
 out:
 	return ret;
 }
-
diff --git a/test/zdtm/static/sk-freebind.c b/test/zdtm/static/sk-freebind.c
index de30329c9..0fc719f6c 100644
--- a/test/zdtm/static/sk-freebind.c
+++ b/test/zdtm/static/sk-freebind.c
@@ -2,12 +2,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that IP_FREEBIND is restored";
-const char *test_author	= "Andrew Vagin <avagin@virtuozzo.com>";
+const char *test_doc = "Check that IP_FREEBIND is restored";
+const char *test_author = "Andrew Vagin <avagin@virtuozzo.com>";
 
 union sockaddr_inet {
 	struct sockaddr_in v4;
@@ -40,18 +40,18 @@ int main(int argc, char **argv)
 		return -1;
 	}
 	val = 1;
-	if (setsockopt(sock, SOL_IP, IP_FREEBIND, &val, sizeof(int)) == -1 ) {
+	if (setsockopt(sock, SOL_IP, IP_FREEBIND, &val, sizeof(int)) == -1) {
 		pr_perror("setsockopt() error");
 		return -1;
 	}
-	if (bind(sock, (struct sockaddr *) &addr, sizeof(addr))) {
+	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr))) {
 		pr_perror("bind()");
 		return -1;
 	}
 
 	if (!fb_keep) {
 		val = 0;
-		if (setsockopt(sock, SOL_IP, IP_FREEBIND, &val, sizeof(int)) == -1 ) {
+		if (setsockopt(sock, SOL_IP, IP_FREEBIND, &val, sizeof(int)) == -1) {
 			pr_perror("setsockopt() error");
 			return -1;
 		}
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	len = sizeof(int);
-	if (getsockopt(sock, SOL_IP, IP_FREEBIND, &val, &len) == -1 ) {
+	if (getsockopt(sock, SOL_IP, IP_FREEBIND, &val, &len) == -1) {
 		pr_perror("setsockopt() error");
 		return -1;
 	}
diff --git a/test/zdtm/static/sk-netlink.c b/test/zdtm/static/sk-netlink.c
index 7f06f0259..b79ac0cf7 100644
--- a/test/zdtm/static/sk-netlink.c
+++ b/test/zdtm/static/sk-netlink.c
@@ -7,15 +7,15 @@
 #include "zdtmtst.h"
 
 #ifndef SOL_NETLINK
-#define SOL_NETLINK     270
+#define SOL_NETLINK 270
 #endif
 
-#define	UDEV_MONITOR_TEST 32
+#define UDEV_MONITOR_TEST 32
 
-const char *test_doc	= "Support of netlink sockets";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Support of netlink sockets";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int ssk, bsk, csk, dsk;
 	struct sockaddr_nl addr;
@@ -64,21 +64,21 @@ int main(int argc, char ** argv)
 	addr.nl_family = AF_NETLINK;
 	addr.nl_groups = 0;
 	addr.nl_pid = getpid();
-	if (bind(ssk, (struct sockaddr *) &addr, sizeof(struct sockaddr_nl))) {
+	if (bind(ssk, (struct sockaddr *)&addr, sizeof(struct sockaddr_nl))) {
 		pr_perror("bind");
 		return 1;
 	}
 
 	addr.nl_groups = 1 << (UDEV_MONITOR_TEST - 1);
 	addr.nl_pid = 0;
-	if (bind(bsk, (struct sockaddr *) &addr, sizeof(struct sockaddr_nl))) {
+	if (bind(bsk, (struct sockaddr *)&addr, sizeof(struct sockaddr_nl))) {
 		pr_perror("bind");
 		return 1;
 	}
 
 	addr.nl_pid = getpid();
 	addr.nl_groups = 1 << (UDEV_MONITOR_TEST - 1);
-	if (connect(csk, (struct sockaddr *) &addr, sizeof(struct sockaddr_nl))) {
+	if (connect(csk, (struct sockaddr *)&addr, sizeof(struct sockaddr_nl))) {
 		pr_perror("connect");
 		return 1;
 	}
@@ -87,18 +87,18 @@ int main(int argc, char ** argv)
 
 	test_waitsig();
 
-	req.hdr.nlmsg_len       = sizeof(req);
-	req.hdr.nlmsg_type      = 0x1234;
-	req.hdr.nlmsg_flags     = NLM_F_DUMP | NLM_F_REQUEST;
-	req.hdr.nlmsg_seq       = 0xabcd;
+	req.hdr.nlmsg_len = sizeof(req);
+	req.hdr.nlmsg_type = 0x1234;
+	req.hdr.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST;
+	req.hdr.nlmsg_seq = 0xabcd;
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_namelen = 0;
-	msg.msg_iov     = &iov;
-	msg.msg_iovlen  = 1;
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 
-	iov.iov_base    = (void *) &req;
-	iov.iov_len     = sizeof(req);
+	iov.iov_base = (void *)&req;
+	iov.iov_len = sizeof(req);
 
 	if (sendmsg(csk, &msg, 0) < 0) {
 		pr_perror("Can't send request message");
@@ -107,11 +107,11 @@ int main(int argc, char ** argv)
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_namelen = 0;
-	msg.msg_iov     = &iov;
-	msg.msg_iovlen  = 1;
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 
-	iov.iov_base    = buf;
-	iov.iov_len     = sizeof(buf);
+	iov.iov_base = buf;
+	iov.iov_len = sizeof(buf);
 
 	if (recvmsg(ssk, &msg, 0) < 0) {
 		pr_perror("Can't recv request message");
@@ -129,12 +129,12 @@ int main(int argc, char ** argv)
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_namelen = sizeof(addr);
-	msg.msg_name	= &addr;
-	msg.msg_iov     = &iov;
-	msg.msg_iovlen  = 1;
+	msg.msg_name = &addr;
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 
-	iov.iov_base    = (void *) &req;
-	iov.iov_len     = sizeof(req);
+	iov.iov_base = (void *)&req;
+	iov.iov_len = sizeof(req);
 
 	if (sendmsg(dsk, &msg, 0) < 0) {
 		pr_perror("Can't send request message");
@@ -143,11 +143,11 @@ int main(int argc, char ** argv)
 
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_namelen = 0;
-	msg.msg_iov     = &iov;
-	msg.msg_iovlen  = 1;
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
 
-	iov.iov_base    = buf;
-	iov.iov_len     = sizeof(buf);
+	iov.iov_base = buf;
+	iov.iov_len = sizeof(buf);
 
 	if (recvmsg(ssk, &msg, 0) < 0) {
 		pr_perror("Can't recv request message");
diff --git a/test/zdtm/static/sk-unix-dgram-ghost.c b/test/zdtm/static/sk-unix-dgram-ghost.c
index a726d6a64..fdf8fb18b 100644
--- a/test/zdtm/static/sk-unix-dgram-ghost.c
+++ b/test/zdtm/static/sk-unix-dgram-ghost.c
@@ -1,5 +1,5 @@
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
 #include <stdlib.h>
@@ -18,8 +18,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check data of bound ghost DGRAM unix socket and possibility to connect";
-const char *test_author	= "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
+const char *test_doc = "Check data of bound ghost DGRAM unix socket and possibility to connect";
+const char *test_author = "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
 
 /*
  * PROCESS_NUM | FREEZE_FREQ
@@ -41,8 +41,7 @@ static int fill_sock_name(struct sockaddr_un *name, const char *filename)
 
 	cwd = get_current_dir_name();
 	if (strlen(filename) + strlen(cwd) + 1 >= sizeof(name->sun_path)) {
-		pr_err("Name %s/%s is too long for socket\n",
-		       cwd, filename);
+		pr_err("Name %s/%s is too long for socket\n", cwd, filename);
 		return -1;
 	}
 
@@ -67,7 +66,7 @@ static int client(int i, task_waiter_t t)
 		return 1;
 	}
 
-	if (connect(sk, (struct sockaddr *) &addr, sizeof(struct sockaddr_un)) < 0) {
+	if (connect(sk, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) {
 		pr_perror("connect failed %d", i);
 		return 1;
 	}
@@ -163,7 +162,7 @@ int main(int argc, char **argv)
 		goto clean;
 	}
 
-	if (bind(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_un))) {
+	if (bind(srv, (struct sockaddr *)&addr, sizeof(struct sockaddr_un))) {
 		pr_perror("bind srv");
 		ret = 1;
 		goto clean;
diff --git a/test/zdtm/static/sk-unix-mntns.c b/test/zdtm/static/sk-unix-mntns.c
index 46376ff50..cd37b8d02 100644
--- a/test/zdtm/static/sk-unix-mntns.c
+++ b/test/zdtm/static/sk-unix-mntns.c
@@ -15,8 +15,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test that unix sockets are restored in proper mount namespaces\n";
-const char *test_author	= "Andrei Vagin <avagin@openvz.org>";
+const char *test_doc = "Test that unix sockets are restored in proper mount namespaces\n";
+const char *test_author = "Andrei Vagin <avagin@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "socket file name", 1);
@@ -87,13 +87,13 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = bind(sk, (struct sockaddr *) &addr, addrlen);
+	ret = bind(sk, (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("bind");
 		exit(1);
 	}
 
-	if (connect(csk, (struct sockaddr *) &addr, addrlen)) {
+	if (connect(csk, (struct sockaddr *)&addr, addrlen)) {
 		fail("connect");
 		exit(1);
 	}
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
 			pr_perror("socket");
 			exit(1);
 		}
-		if (connect(csk, (struct sockaddr *) &addr, addrlen)) {
+		if (connect(csk, (struct sockaddr *)&addr, addrlen)) {
 			pr_perror("connect");
 			exit(1);
 		}
diff --git a/test/zdtm/static/sk-unix-rel.c b/test/zdtm/static/sk-unix-rel.c
index a62a5c92d..10c19080a 100644
--- a/test/zdtm/static/sk-unix-rel.c
+++ b/test/zdtm/static/sk-unix-rel.c
@@ -15,8 +15,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test unix stream sockets with relative name\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Test unix stream sockets with relative name\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 #define SK_DATA "packet"
 
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = bind(sock[0], (struct sockaddr *) &addr, addrlen);
+	ret = bind(sock[0], (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("bind");
 		exit(1);
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 	test_daemon();
 	test_waitsig();
 
-	if (connect(sock[1], (struct sockaddr *) &addr, addrlen)) {
+	if (connect(sock[1], (struct sockaddr *)&addr, addrlen)) {
 		fail("connect");
 		exit(1);
 	}
diff --git a/test/zdtm/static/sk-unix-unconn.c b/test/zdtm/static/sk-unix-unconn.c
index 91e3d433b..caad3d315 100644
--- a/test/zdtm/static/sk-unix-unconn.c
+++ b/test/zdtm/static/sk-unix-unconn.c
@@ -6,10 +6,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check unconnected unix sockets";
-const char *test_author	= "Vagin Andrew <avagin@parallels.com>";
+const char *test_doc = "Check unconnected unix sockets";
+const char *test_author = "Vagin Andrew <avagin@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int sk, skc;
 	int ret, len;
@@ -43,7 +43,7 @@ int main(int argc, char ** argv)
 	addr.sun_path[0] = 0;
 	addr.sun_path[len - 1] = 0;
 
-	ret = bind(sk, (struct sockaddr *) &addr, addrlen);
+	ret = bind(sk, (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("bind");
 		return 1;
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
 		return 1;
 	}
 
-	if (connect(skc, (struct sockaddr *) &addr, addrlen) == -1) {
+	if (connect(skc, (struct sockaddr *)&addr, addrlen) == -1) {
 		fail("Unable to connect");
 		return 1;
 	}
diff --git a/test/zdtm/static/sk-unix01.c b/test/zdtm/static/sk-unix01.c
index 0e9006a15..c2bb8b9ed 100644
--- a/test/zdtm/static/sk-unix01.c
+++ b/test/zdtm/static/sk-unix01.c
@@ -1,5 +1,5 @@
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
 #include <stdlib.h>
@@ -18,8 +18,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that deleted unix sockets with dirs are restored correctly";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Check that deleted unix sockets with dirs are restored correctly";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -62,16 +62,16 @@ static int sk_alloc_connect(int type, struct sockaddr_un *addr)
 	return sk;
 }
 
-#define write_int(__f, __p)					\
-	({							\
-		ssize_t __r = write(__f, __p, sizeof(*(__p)));	\
-		(__r == sizeof(*(__p))) ? 0 : -1;		\
+#define write_int(__f, __p)                                    \
+	({                                                     \
+		ssize_t __r = write(__f, __p, sizeof(*(__p))); \
+		(__r == sizeof(*(__p))) ? 0 : -1;              \
 	})
 
-#define read_int(__f, __p)					\
-	({							\
-		ssize_t __r = read(__f, __p, sizeof(*(__p)));	\
-		(__r == sizeof(*(__p))) ? 0 : -1;		\
+#define read_int(__f, __p)                                    \
+	({                                                    \
+		ssize_t __r = read(__f, __p, sizeof(*(__p))); \
+		(__r == sizeof(*(__p))) ? 0 : -1;             \
 	})
 
 int main(int argc, char **argv)
@@ -215,8 +215,7 @@ int main(int argc, char **argv)
 		pr_perror("Can't create dgram pair");
 		return 1;
 	}
-	test_msg("sk-dgp: sockpair %d %d\n",
-		 sk_dgram_pair[0], sk_dgram_pair[1]);
+	test_msg("sk-dgp: sockpair %d %d\n", sk_dgram_pair[0], sk_dgram_pair[1]);
 	ssprintf(filename, "%s/%s", subdir_dg, "sk-dtp");
 
 	if (unix_fill_sock_name(&addr, filename)) {
@@ -303,39 +302,35 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	if (write_int(sk_dgram[1], &c1)	|| read_int(sk_dgram[0], &c2) ||
-	    write_int(sk_dgram[3], &c3)	|| read_int(sk_dgram[2], &c4)) {
+	if (write_int(sk_dgram[1], &c1) || read_int(sk_dgram[0], &c2) || write_int(sk_dgram[3], &c3) ||
+	    read_int(sk_dgram[2], &c4)) {
 		fail("Unable to send/receive a message on dgram");
 		return 1;
 	}
 
 	if (c1 != c2 || c3 != c4) {
-		fail("Vals mismatch on dgram: c1 %d c2 %d c3 %d c4 %d",
-		     c1, c2, c3, c4);
+		fail("Vals mismatch on dgram: c1 %d c2 %d c3 %d c4 %d", c1, c2, c3, c4);
 		return 1;
 	}
 
-	if (write_int(sk_dgram_pair[1], &c9) ||
-	    read_int(sk_dgram_pair[0], &c10)) {
+	if (write_int(sk_dgram_pair[1], &c9) || read_int(sk_dgram_pair[0], &c10)) {
 		fail("Unable to send/receive a message on paired dgram");
 		return 1;
 	}
 
 	if (c9 != c10) {
-		fail("Vals mismatch on dgram: c9 %d c10 %d",
-		     c9, c10);
+		fail("Vals mismatch on dgram: c9 %d c10 %d", c9, c10);
 		return 1;
 	}
 
-	if (write_int(sk_st[2], &c5) || read_int(sk_st[1], &c6) ||
-	    write_int(sk_st[4], &c7) || read_int(sk_st[3], &c8)) {
+	if (write_int(sk_st[2], &c5) || read_int(sk_st[1], &c6) || write_int(sk_st[4], &c7) ||
+	    read_int(sk_st[3], &c8)) {
 		fail("Unable to send/receive a message on stream");
 		return 1;
 	}
 
 	if (c5 != c6 || c7 != c8) {
-		fail("Vals mismatch on stream: c5 %d c6 %d c7 %d c8 %d",
-		     c5, c6, c7, c8);
+		fail("Vals mismatch on stream: c5 %d c6 %d c7 %d c8 %d", c5, c6, c7, c8);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/skip-me.c b/test/zdtm/static/skip-me.c
index 9a552761e..a7f3e8d33 100644
--- a/test/zdtm/static/skip-me.c
+++ b/test/zdtm/static/skip-me.c
@@ -1,4 +1,4 @@
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	test_init(argc, argv);
 
diff --git a/test/zdtm/static/sleeping00.c b/test/zdtm/static/sleeping00.c
index f59ffaf1f..fb45ebc46 100644
--- a/test/zdtm/static/sleeping00.c
+++ b/test/zdtm/static/sleeping00.c
@@ -2,10 +2,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Suspend while migrating";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Suspend while migrating";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	test_init(argc, argv);
 
diff --git a/test/zdtm/static/sock_filter00.c b/test/zdtm/static/sock_filter00.c
index 7c408220c..abaabc4ee 100644
--- a/test/zdtm/static/sock_filter00.c
+++ b/test/zdtm/static/sock_filter00.c
@@ -8,17 +8,17 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check socket filter";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check socket filter";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 #ifndef SO_GET_FILTER
-#define SO_GET_FILTER           SO_ATTACH_FILTER
+#define SO_GET_FILTER SO_ATTACH_FILTER
 #endif
 
 #ifdef SOCK_FILTER01
-#define SFLEN	4
+#define SFLEN 4
 #else
-#define SFLEN	14
+#define SFLEN 14
 #endif
 
 int main(int argc, char **argv)
@@ -27,27 +27,18 @@ int main(int argc, char **argv)
 	struct sock_fprog p;
 #ifdef SOCK_FILTER01
 	struct sock_filter f[SFLEN] = {
-		{ 0x6,  0, 0, 0x0000ffff },
-		{ 0x6,  0, 0, 0x0000ffff },
-		{ 0x6,  0, 0, 0x0000ffff },
-		{ 0x6,  0, 0, 0x0000ffff },
+		{ 0x6, 0, 0, 0x0000ffff },
+		{ 0x6, 0, 0, 0x0000ffff },
+		{ 0x6, 0, 0, 0x0000ffff },
+		{ 0x6, 0, 0, 0x0000ffff },
 	};
 #else
 	struct sock_filter f[SFLEN] = {
-		{ 0x28, 0, 0, 0x0000000c },
-		{ 0x15, 0, 4, 0x00000800 },
-		{ 0x20, 0, 0, 0x0000001a },
-		{ 0x15, 8, 0, 0x7f000001 },
-		{ 0x20, 0, 0, 0x0000001e },
-		{ 0x15, 6, 7, 0x7f000001 },
-		{ 0x15, 1, 0, 0x00000806 },
-		{ 0x15, 0, 5, 0x00008035 },
-		{ 0x20, 0, 0, 0x0000001c },
-		{ 0x15, 2, 0, 0x7f000001 },
-		{ 0x20, 0, 0, 0x00000026 },
-		{ 0x15, 0, 1, 0x7f000001 },
-		{ 0x6,  0, 0, 0x0000ffff },
-		{ 0x6,  0, 0, 0x00000000 },
+		{ 0x28, 0, 0, 0x0000000c }, { 0x15, 0, 4, 0x00000800 }, { 0x20, 0, 0, 0x0000001a },
+		{ 0x15, 8, 0, 0x7f000001 }, { 0x20, 0, 0, 0x0000001e }, { 0x15, 6, 7, 0x7f000001 },
+		{ 0x15, 1, 0, 0x00000806 }, { 0x15, 0, 5, 0x00008035 }, { 0x20, 0, 0, 0x0000001c },
+		{ 0x15, 2, 0, 0x7f000001 }, { 0x20, 0, 0, 0x00000026 }, { 0x15, 0, 1, 0x7f000001 },
+		{ 0x6, 0, 0, 0x0000ffff },  { 0x6, 0, 0, 0x00000000 },
 	};
 #endif
 	struct sock_filter f2[SFLEN], f3[SFLEN];
@@ -125,4 +116,3 @@ int main(int argc, char **argv)
 
 	return 0;
 }
-
diff --git a/test/zdtm/static/sock_opts00.c b/test/zdtm/static/sock_opts00.c
index e02a2e7ba..5b4624f6d 100644
--- a/test/zdtm/static/sock_opts00.c
+++ b/test/zdtm/static/sock_opts00.c
@@ -6,15 +6,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check various socket options to work";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check various socket options to work";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 #define TEST_PORT 59687
 #define TEST_ADDR INADDR_ANY
 
-#define NOPTS	8
+#define NOPTS 8
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int sock, ret = 0, vname[NOPTS], val[NOPTS], rval, i;
 	socklen_t len = sizeof(int);
@@ -59,8 +59,7 @@ int main(int argc, char ** argv)
 
 		if (rval != val[i]) {
 			if (rval + 1 == val[i]) {
-				pr_perror("can't reset option %d want %d have %d", i,
-						val[i], rval);
+				pr_perror("can't reset option %d want %d have %d", i, val[i], rval);
 				return 1;
 			}
 
diff --git a/test/zdtm/static/sock_opts01.c b/test/zdtm/static/sock_opts01.c
index 7dfce2257..2709d8586 100644
--- a/test/zdtm/static/sock_opts01.c
+++ b/test/zdtm/static/sock_opts01.c
@@ -8,10 +8,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that SO_BINDTODEVICE option works";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Check that SO_BINDTODEVICE option works";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int sock, ret;
 	char dev[IFNAMSIZ], dev2[IFNAMSIZ];
diff --git a/test/zdtm/static/sock_peercred.c b/test/zdtm/static/sock_peercred.c
index 23c709bb5..5ebfe757a 100644
--- a/test/zdtm/static/sock_peercred.c
+++ b/test/zdtm/static/sock_peercred.c
@@ -12,10 +12,10 @@
 #include "zdtmtst.h"
 
 #define STACK_SIZE (1024 * 1024)
-#define GID_INC 1
-#define UID_INC 1
+#define GID_INC	   1
+#define UID_INC	   1
 
-const char *test_doc    = "Check peercred of a unix socket remains the same";
+const char *test_doc = "Check peercred of a unix socket remains the same";
 const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 static int child_func(void *fd_p)
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 		goto out;
 	}
 
-	pid = clone(child_func, stack + STACK_SIZE, CLONE_FILES|SIGCHLD, (void *)(unsigned long)fd);
+	pid = clone(child_func, stack + STACK_SIZE, CLONE_FILES | SIGCHLD, (void *)(unsigned long)fd);
 	if (pid == -1) {
 		pr_perror("clone");
 		goto out;
@@ -113,15 +113,14 @@ int main(int argc, char **argv)
 		goto out;
 	}
 
-	if (ucred.pid != pid || ucred.gid != getuid() + UID_INC ||
-			        ucred.gid != getgid() + GID_INC) {
+	if (ucred.pid != pid || ucred.gid != getuid() + UID_INC || ucred.gid != getgid() + GID_INC) {
 		fail("Wrong pid, uid or gid");
 		goto out;
 	}
 
 	pass();
 	exit_code = 0;
- out:
+out:
 	free(stack);
 	return exit_code;
 }
diff --git a/test/zdtm/static/socket-ext.c b/test/zdtm/static/socket-ext.c
index 88e70559f..6ebe02b1d 100644
--- a/test/zdtm/static/socket-ext.c
+++ b/test/zdtm/static/socket-ext.c
@@ -14,8 +14,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test external sockets\n";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org";
+const char *test_doc = "Test external sockets\n";
+const char *test_author = "Andrey Vagin <avagin@openvz.org";
 
 #define SK_DATA "packet"
 
@@ -50,8 +50,7 @@ int main(int argc, char *argv[])
 	}
 	chmod(dir, 0777);
 	addr.sun_family = AF_UNIX;
-	snprintf(addr.sun_path, sizeof(addr.sun_path),
-			"%s/%s", dir, "sock");
+	snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", dir, "sock");
 	path = addr.sun_path;
 	addrlen = sizeof(addr.sun_family) + strlen(path);
 
@@ -70,7 +69,7 @@ int main(int argc, char *argv[])
 			pr_perror("Can't create socket");
 			return 1;
 		}
-		ret = bind(sk, (struct sockaddr *) &addr, addrlen);
+		ret = bind(sk, (struct sockaddr *)&addr, addrlen);
 		if (ret < 0) {
 			pr_perror("Can't bind socket to %s", path);
 			return 1;
@@ -97,13 +96,12 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	ret = connect(sk, (struct sockaddr *) &addr, addrlen);
+	ret = connect(sk, (struct sockaddr *)&addr, addrlen);
 	if (ret < 0) {
 		pr_perror("Can't connect socket");
 		return 1;
 	}
 
-
 	test_daemon();
 	test_waitsig();
 
diff --git a/test/zdtm/static/socket-linger.c b/test/zdtm/static/socket-linger.c
index b512745ca..ffa01f91f 100644
--- a/test/zdtm/static/socket-linger.c
+++ b/test/zdtm/static/socket-linger.c
@@ -5,13 +5,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check SO_LINGER socket option";
-const char *test_author	= "Radostin Stoyanov <rstoyanov1@gmail.com>";
+const char *test_doc = "Check SO_LINGER socket option";
+const char *test_author = "Radostin Stoyanov <rstoyanov1@gmail.com>";
 
 int main(int argc, char **argv)
 {
 	int sk;
-	struct linger dump = {true, 30}, restore = {0, 0};
+	struct linger dump = { true, 30 }, restore = { 0, 0 };
 	socklen_t optlen = sizeof(restore);
 
 	test_init(argc, argv);
@@ -36,14 +36,12 @@ int main(int argc, char **argv)
 	}
 
 	if (restore.l_onoff != dump.l_onoff) {
-		fail("linger.l_onoff has incorrect value (%d != %d)",
-			restore.l_onoff, dump.l_onoff);
+		fail("linger.l_onoff has incorrect value (%d != %d)", restore.l_onoff, dump.l_onoff);
 		return 1;
 	}
 
 	if (restore.l_linger != dump.l_linger) {
-		fail("linger.l_linger has incorrect value (%d != %d)",
-			restore.l_linger, dump.l_linger);
+		fail("linger.l_linger has incorrect value (%d != %d)", restore.l_linger, dump.l_linger);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/socket-raw.c b/test/zdtm/static/socket-raw.c
index 7382bf7c4..3bcfc3db6 100644
--- a/test/zdtm/static/socket-raw.c
+++ b/test/zdtm/static/socket-raw.c
@@ -29,36 +29,36 @@
  * http://www.binarytides.com/raw-udp-sockets-c-linux/
  */
 
-const char *test_doc		= "Test RAW sockets (IPv4,6)\n";
-const char *test_author		= "Cyrill Gorcunov <gorcunov@openvz.org>";
+const char *test_doc = "Test RAW sockets (IPv4,6)\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 #ifndef SO_IP_SET
-# define SO_IP_SET		83
+#define SO_IP_SET 83
 #endif
 
 #ifndef IP_SET_OP_VERSION
-# define IP_SET_OP_VERSION	0x00000100	/* Ask kernel version */
+#define IP_SET_OP_VERSION 0x00000100 /* Ask kernel version */
 #endif
 
-#define pr_debug(format, arg...) test_msg("DBG: %s:%d: " format, __FILE__, __LINE__, ## arg)
+#define pr_debug(format, arg...) test_msg("DBG: %s:%d: " format, __FILE__, __LINE__, ##arg)
 
 struct ip_set_req_version {
-	unsigned int	op;
-	unsigned int	version;
+	unsigned int op;
+	unsigned int version;
 };
 
 struct pseudo_header {
-	uint32_t	source_address;
-	uint32_t	dest_address;
-	uint8_t		placeholder;
-	uint8_t		protocol;
-	uint16_t	udp_length;
+	uint32_t source_address;
+	uint32_t dest_address;
+	uint8_t placeholder;
+	uint8_t protocol;
+	uint16_t udp_length;
 };
 
 static int stop_icmp(int sk_icmp, int sk_icmpv6)
 {
-	struct icmp6_filter filter6 = { };
-	struct icmp_filter filter = { };
+	struct icmp6_filter filter6 = {};
+	struct icmp_filter filter = {};
 	socklen_t aux;
 	int ret = 0;
 
@@ -70,8 +70,7 @@ static int stop_icmp(int sk_icmp, int sk_icmpv6)
 	}
 
 	if (filter.data != (1 << ICMP_TIMESTAMP)) {
-		pr_err("data mismatch on icmp filter %d != %d\n",
-		       filter.data, (1 << ICMP_TIMESTAMP));
+		pr_err("data mismatch on icmp filter %d != %d\n", filter.data, (1 << ICMP_TIMESTAMP));
 		return -1;
 	}
 
@@ -83,27 +82,25 @@ static int stop_icmp(int sk_icmp, int sk_icmpv6)
 	}
 
 	if (filter6.data[0] != (1 << ICMP_TIMESTAMP)) {
-		pr_err("data mismatch on icmp filter %d != %d\n",
-		       filter6.data[0], (1 << ICMP_TIMESTAMP));
+		pr_err("data mismatch on icmp filter %d != %d\n", filter6.data[0], (1 << ICMP_TIMESTAMP));
 		return -1;
 	}
 
 	return ret;
 }
 
-static int start_icmp(int sk_icmp, int sk_icmpv6,
-		      const char *a4, const char *a6, int port)
+static int start_icmp(int sk_icmp, int sk_icmpv6, const char *a4, const char *a6, int port)
 {
 	struct sockaddr_in addr_client;
-	struct icmp6_filter filter6 = { };
-	struct icmp_filter filter = { };
+	struct icmp6_filter filter6 = {};
+	struct icmp_filter filter = {};
 	int ret = 0;
 
 	memset(&addr_client, 0, sizeof(addr_client));
 
-	addr_client.sin_family		= AF_INET;
-	addr_client.sin_port		= htons(port);
-	addr_client.sin_addr.s_addr	= inet_addr(a4);
+	addr_client.sin_family = AF_INET;
+	addr_client.sin_port = htons(port);
+	addr_client.sin_addr.s_addr = inet_addr(a4);
 
 	ret = bind(sk_icmp, (struct sockaddr *)&addr_client, sizeof(addr_client));
 	if (ret < 0) {
@@ -164,7 +161,6 @@ static void raw_socks_storm(void)
 	int sk6[IPPROTO_MAX];
 	size_t i;
 
-
 	for (i = 1; i < ARRAY_SIZE(sk4); i++) {
 		sk4[i] = socket(PF_INET, SOCK_RAW | SOCK_NONBLOCK, i);
 		if (sk4[i] >= 0)
@@ -265,13 +261,13 @@ int main(int argc, char *argv[])
 	memset(&addr_serv, 0, sizeof(addr_serv));
 	memset(&addr_client, 0, sizeof(addr_client));
 
-	addr_client.sin_family		= AF_INET;
-	addr_client.sin_port		= htons(port_client);
-	addr_client.sin_addr.s_addr	= inet_addr(string_client_ip);
+	addr_client.sin_family = AF_INET;
+	addr_client.sin_port = htons(port_client);
+	addr_client.sin_addr.s_addr = inet_addr(string_client_ip);
 
-	addr_serv.sin_family		= AF_INET;
-	addr_serv.sin_port		= htons(port_serv);
-	addr_serv.sin_addr.s_addr	= inet_addr(string_serv_ip);
+	addr_serv.sin_family = AF_INET;
+	addr_serv.sin_port = htons(port_serv);
+	addr_serv.sin_addr.s_addr = inet_addr(string_serv_ip);
 
 	ret = bind(sk_udp_serv, (struct sockaddr *)&addr_serv, sizeof(addr_serv));
 	if (ret < 0) {
@@ -287,36 +283,35 @@ int main(int argc, char *argv[])
 	}
 	pr_debug("Bound sk_udp\n");
 
-	if (start_icmp(sk_icmp, sk_icmpv6, string_client_icmp_ip,
-		       string_client_icmpv6_ip, port_client))
+	if (start_icmp(sk_icmp, sk_icmpv6, string_client_icmp_ip, string_client_icmpv6_ip, port_client))
 		return 1;
 
 	data = datagram + sizeof(struct iphdr) + sizeof(struct udphdr);
 	strcpy(data, string_data);
 
-	iph->ihl	= 5;
-	iph->version	= 4;
-	iph->tos	= 0;
-	iph->tot_len	= sizeof(struct iphdr) + sizeof(struct udphdr) + strlen(string_data);
-	iph->id		= htonl(54321);
-	iph->frag_off	= 0;
-	iph->ttl	= 255;
-	iph->protocol	= IPPROTO_UDP;
-	iph->check	= 0;
-	iph->saddr	= inet_addr(string_client_ip);
-	iph->daddr	= addr_serv.sin_addr.s_addr;
-	iph->check	= csum((unsigned short *)datagram, sizeof(struct iphdr));
+	iph->ihl = 5;
+	iph->version = 4;
+	iph->tos = 0;
+	iph->tot_len = sizeof(struct iphdr) + sizeof(struct udphdr) + strlen(string_data);
+	iph->id = htonl(54321);
+	iph->frag_off = 0;
+	iph->ttl = 255;
+	iph->protocol = IPPROTO_UDP;
+	iph->check = 0;
+	iph->saddr = inet_addr(string_client_ip);
+	iph->daddr = addr_serv.sin_addr.s_addr;
+	iph->check = csum((unsigned short *)datagram, sizeof(struct iphdr));
 
-	udph->source	= htons(port_client);
-	udph->dest	= htons(port_serv);
-	udph->len	= htons(8 + strlen(data));
-	udph->check	= 0;
+	udph->source = htons(port_client);
+	udph->dest = htons(port_serv);
+	udph->len = htons(8 + strlen(data));
+	udph->check = 0;
 
-	psh.source_address	= inet_addr(string_client_ip);
-	psh.dest_address	= addr_serv.sin_addr.s_addr;
-	psh.placeholder		= 0;
-	psh.protocol		= IPPROTO_UDP;
-	psh.udp_length		= htons(sizeof(struct udphdr) + strlen(string_data));
+	psh.source_address = inet_addr(string_client_ip);
+	psh.dest_address = addr_serv.sin_addr.s_addr;
+	psh.placeholder = 0;
+	psh.protocol = IPPROTO_UDP;
+	psh.udp_length = htons(sizeof(struct udphdr) + strlen(string_data));
 
 	psize = sizeof(psh) + sizeof(struct udphdr) + strlen(string_data);
 	pseudogram = malloc(psize);
@@ -325,7 +320,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	memcpy(pseudogram, (char *)&psh , sizeof(psh));
+	memcpy(pseudogram, (char *)&psh, sizeof(psh));
 	memcpy(pseudogram + sizeof(psh), udph, sizeof(*udph) + strlen(string_data));
 
 	udph->check = csum((unsigned short *)pseudogram, psize);
@@ -340,8 +335,7 @@ int main(int argc, char *argv[])
 	if (pid == 0) {
 		task_waiter_wait4(&waiter, 2);
 		pr_debug("Gonna read data\n");
-		ret = recvfrom(sk_udp_serv, receiver, sizeof(receiver), 0,
-			       (struct sockaddr *)&addr_client, &len);
+		ret = recvfrom(sk_udp_serv, receiver, sizeof(receiver), 0, (struct sockaddr *)&addr_client, &len);
 		if (ret < 0) {
 			task_waiter_complete(&waiter, 2);
 			fail("Can't read data");
@@ -353,8 +347,7 @@ int main(int argc, char *argv[])
 		task_waiter_complete(&waiter, 3);
 
 		if (strcmp(receiver, string_data)) {
-			pr_err("Data mismatch (got %s but expected %s)\n",
-			       receiver, string_data);
+			pr_err("Data mismatch (got %s but expected %s)\n", receiver, string_data);
 			exit(1);
 		} else
 			pr_debug("Data match\n");
@@ -369,8 +362,7 @@ int main(int argc, char *argv[])
 	test_daemon();
 	test_waitsig();
 
-	if (sendto(sk_udp, datagram, iph->tot_len, 0,
-		   (struct sockaddr *)&addr_serv, sizeof(addr_serv)) < 0) {
+	if (sendto(sk_udp, datagram, iph->tot_len, 0, (struct sockaddr *)&addr_serv, sizeof(addr_serv)) < 0) {
 		kill(pid, SIGKILL);
 		fail("Can't send RAW data");
 		exit(1);
diff --git a/test/zdtm/static/socket-tcp-close-wait.c b/test/zdtm/static/socket-tcp-close-wait.c
index 152dcf31f..6e5ccdbeb 100644
--- a/test/zdtm/static/socket-tcp-close-wait.c
+++ b/test/zdtm/static/socket-tcp-close-wait.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -169,8 +169,7 @@ int main(int argc, char **argv)
 		if (size < 0)
 			return 1;
 #else
-		if (read(fd, buf, sizeof(buf)) != sizeof(TEST_MSG) ||
-		    strncmp(buf, TEST_MSG, sizeof(TEST_MSG))) {
+		if (read(fd, buf, sizeof(buf)) != sizeof(TEST_MSG) || strncmp(buf, TEST_MSG, sizeof(TEST_MSG))) {
 			pr_perror("read");
 			return 1;
 		}
diff --git a/test/zdtm/static/socket-tcp-close0.c b/test/zdtm/static/socket-tcp-close0.c
index 270965cbd..96ac2b38a 100644
--- a/test/zdtm/static/socket-tcp-close0.c
+++ b/test/zdtm/static/socket-tcp-close0.c
@@ -18,7 +18,7 @@ static int check_socket_closed(int sk)
 {
 	int err, buffer = 0;
 	struct {
-		__u8    tcpi_state;
+		__u8 tcpi_state;
 	} info;
 	socklen_t len = sizeof(info);
 	struct pollfd pollfd = {};
diff --git a/test/zdtm/static/socket-tcp-close1.c b/test/zdtm/static/socket-tcp-close1.c
index 49a34a6ef..d5e473bee 100644
--- a/test/zdtm/static/socket-tcp-close1.c
+++ b/test/zdtm/static/socket-tcp-close1.c
@@ -15,7 +15,7 @@ static int check_socket_state(int sk, int state)
 {
 	int err;
 	struct {
-		__u8    tcpi_state;
+		__u8 tcpi_state;
 	} info;
 	socklen_t len = sizeof(info);
 
diff --git a/test/zdtm/static/socket-tcp-closed.c b/test/zdtm/static/socket-tcp-closed.c
index e8fc25c56..f9516357c 100644
--- a/test/zdtm/static/socket-tcp-closed.c
+++ b/test/zdtm/static/socket-tcp-closed.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
diff --git a/test/zdtm/static/socket-tcp-closing.c b/test/zdtm/static/socket-tcp-closing.c
index 84ff6be9d..87e1d7533 100644
--- a/test/zdtm/static/socket-tcp-closing.c
+++ b/test/zdtm/static/socket-tcp-closing.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
diff --git a/test/zdtm/static/socket-tcp-fin-wait1.c b/test/zdtm/static/socket-tcp-fin-wait1.c
index 4bc7b3238..9b8488904 100644
--- a/test/zdtm/static/socket-tcp-fin-wait1.c
+++ b/test/zdtm/static/socket-tcp-fin-wait1.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -202,7 +202,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	test_daemon();
 	test_waitsig();
 
@@ -211,8 +210,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if (recv(fd, buf, sizeof(buf), MSG_WAITALL) != sizeof(TEST_MSG) ||
-	    strncmp(buf, TEST_MSG, sizeof(TEST_MSG))) {
+	if (recv(fd, buf, sizeof(buf), MSG_WAITALL) != sizeof(TEST_MSG) || strncmp(buf, TEST_MSG, sizeof(TEST_MSG))) {
 		pr_perror("recv: expected %s, got %s", TEST_MSG, buf);
 		return 1;
 	}
diff --git a/test/zdtm/static/socket-tcp-listen.c b/test/zdtm/static/socket-tcp-listen.c
index 52d21d894..da3dcb8cf 100644
--- a/test/zdtm/static/socket-tcp-listen.c
+++ b/test/zdtm/static/socket-tcp-listen.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -65,7 +65,6 @@ int main(int argc, char **argv)
 	int val;
 	socklen_t optlen;
 
-
 	test_init(argc, argv);
 
 	if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
@@ -87,7 +86,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	clt = tcp_init_client_with_fd(clt, ZDTM_FAMILY, "localhost", port);
-	if (clt  < 0)
+	if (clt < 0)
 		return 1;
 
 	/*
diff --git a/test/zdtm/static/socket-tcp-reseted.c b/test/zdtm/static/socket-tcp-reseted.c
index 07ad36009..ad382e38e 100644
--- a/test/zdtm/static/socket-tcp-reseted.c
+++ b/test/zdtm/static/socket-tcp-reseted.c
@@ -2,19 +2,19 @@
 #include "zdtmtst.h"
 #include <string.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <signal.h>
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -46,11 +46,10 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	clt = tcp_init_client(ZDTM_FAMILY, "localhost", port);
 	if (clt < 0) {
 		pr_perror("Unable to create a client socket");
-	        return 1;
+		return 1;
 	}
 
 	/*
@@ -65,7 +64,8 @@ int main(int argc, char **argv)
 		pr_perror("Unable to write into a socket");
 		return 1;
 	}
-	snprintf(cmd, sizeof(cmd), "iptables -w -t filter --protocol tcp -A INPUT --dport %d -j REJECT --reject-with tcp-reset", port);
+	snprintf(cmd, sizeof(cmd),
+		 "iptables -w -t filter --protocol tcp -A INPUT --dport %d -j REJECT --reject-with tcp-reset", port);
 	if (system(cmd))
 		return 1;
 
@@ -74,7 +74,8 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	snprintf(cmd, sizeof(cmd), "iptables -w -t filter --protocol tcp -D INPUT --dport %d -j REJECT --reject-with tcp-reset", port);
+	snprintf(cmd, sizeof(cmd),
+		 "iptables -w -t filter --protocol tcp -D INPUT --dport %d -j REJECT --reject-with tcp-reset", port);
 	if (system(cmd))
 		return 1;
 
diff --git a/test/zdtm/static/socket-tcp-reuseport.c b/test/zdtm/static/socket-tcp-reuseport.c
index a085ab503..25e0493d4 100644
--- a/test/zdtm/static/socket-tcp-reuseport.c
+++ b/test/zdtm/static/socket-tcp-reuseport.c
@@ -19,7 +19,7 @@ const char *test_author = "Andrey Vagin <avagin@parallels.com";
 #include <sched.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 
 #define BUF_SIZE 4096
 
@@ -54,9 +54,7 @@ int write_data(int fd, const unsigned char *buf, int size)
 
 int main(int argc, char **argv)
 {
-	struct zdtm_tcp_opts opts = { .reuseaddr = false,
-					.reuseport = true,
-					.flags = SOCK_NONBLOCK};
+	struct zdtm_tcp_opts opts = { .reuseaddr = false, .reuseport = true, .flags = SOCK_NONBLOCK };
 	unsigned char buf[BUF_SIZE];
 	int port = 8880, port2;
 	int fd, fd_s, fd_s2, clt, i;
@@ -79,12 +77,11 @@ int main(int argc, char **argv)
 	if (port != port2)
 		return 1;
 
-	if (setsockopt(fd_s, SOL_SOCKET, SO_REUSEPORT, &no, sizeof(int)) == -1 ) {
+	if (setsockopt(fd_s, SOL_SOCKET, SO_REUSEPORT, &no, sizeof(int)) == -1) {
 		pr_perror("Unable to set SO_REUSEPORT");
 		return -1;
 	}
 
-
 	clt = tcp_init_client(ZDTM_FAMILY, "localhost", port);
 	if (clt < 0)
 		return 1;
@@ -103,7 +100,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-
 	optlen = sizeof(val);
 	if (getsockopt(fd_s, SOL_SOCKET, SO_REUSEPORT, &val, &optlen)) {
 		pr_perror("getsockopt");
@@ -123,7 +119,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	for (i = 0; ; i++) {
+	for (i = 0;; i++) {
 		crc = 0;
 		datagen(buf, BUF_SIZE, &crc);
 		if (write_data(fd, buf, BUF_SIZE)) {
diff --git a/test/zdtm/static/socket-tcp-skip-in-flight.c b/test/zdtm/static/socket-tcp-skip-in-flight.c
index 99ca03ac5..51d74d2ce 100644
--- a/test/zdtm/static/socket-tcp-skip-in-flight.c
+++ b/test/zdtm/static/socket-tcp-skip-in-flight.c
@@ -24,7 +24,6 @@ const char *test_author = "Radostin Stoyanov <rstoyanov1@gmail.com>";
 #include <unistd.h>
 #include <fcntl.h>
 
-
 int main(int argc, char **argv)
 {
 	struct pollfd poll_set[1];
diff --git a/test/zdtm/static/socket-tcp-syn-sent.c b/test/zdtm/static/socket-tcp-syn-sent.c
index 755532a8a..8265d5fb7 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.c
+++ b/test/zdtm/static/socket-tcp-syn-sent.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -52,7 +52,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	if ((sock = socket(ZDTM_FAMILY, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP)) < 0) {
 		pr_perror("can't create socket");
 		return -1;
@@ -61,13 +60,13 @@ int main(int argc, char **argv)
 	/* Construct the server address structure */
 	memset(&addr, 0, sizeof(addr));
 	if (ZDTM_FAMILY == AF_INET) {
-		addr.v4.sin_family      = AF_INET;
+		addr.v4.sin_family = AF_INET;
 		inet_pton(AF_INET, "localhost", &addr.v4.sin_addr);
 	} else {
-		addr.v6.sin6_family      = AF_INET6;
+		addr.v6.sin6_family = AF_INET6;
 		inet_pton(AF_INET6, "localhost", &addr.v6.sin6_addr);
 	}
-	if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		pr_perror("can't connect to server");
 		return -1;
 	}
@@ -79,17 +78,17 @@ int main(int argc, char **argv)
 	/* Construct the server address structure */
 	memset(&addr, 0, sizeof(addr));
 	if (ZDTM_FAMILY == AF_INET) {
-		addr.v4.sin_family      = AF_INET;
-		addr.v4.sin_port        = htons(port);
+		addr.v4.sin_family = AF_INET;
+		addr.v4.sin_port = htons(port);
 		inet_pton(AF_INET, "localhost", &addr.v4.sin_addr);
 	} else {
-		addr.v6.sin6_family      = AF_INET6;
-		addr.v6.sin6_port        = htons(port);
+		addr.v6.sin6_family = AF_INET6;
+		addr.v6.sin6_port = htons(port);
 		inet_pton(AF_INET6, "localhost", &addr.v6.sin6_addr);
 	}
 
 	errno = 0;
-	if (connect(sock, (struct sockaddr *) &addr, sizeof(addr)) == 0 || errno != EINPROGRESS) {
+	if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0 || errno != EINPROGRESS) {
 		pr_perror("can't connect to server");
 		return -1;
 	}
@@ -137,7 +136,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	pass();
 	return 0;
 }
diff --git a/test/zdtm/static/socket-tcp-unconn.c b/test/zdtm/static/socket-tcp-unconn.c
index 1b3e1a660..bfb0cdb8e 100644
--- a/test/zdtm/static/socket-tcp-unconn.c
+++ b/test/zdtm/static/socket-tcp-unconn.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -51,7 +51,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	if ((sock = socket(ZDTM_FAMILY, SOCK_STREAM, IPPROTO_TCP)) < 0) {
 		pr_perror("can't create socket");
 		return -1;
@@ -60,13 +59,13 @@ int main(int argc, char **argv)
 	/* Construct the server address structure */
 	memset(&addr, 0, sizeof(addr));
 	if (ZDTM_FAMILY == AF_INET) {
-		addr.v4.sin_family      = AF_INET;
+		addr.v4.sin_family = AF_INET;
 		inet_pton(AF_INET, "localhost", &addr.v4.sin_addr);
 	} else {
-		addr.v6.sin6_family      = AF_INET6;
+		addr.v6.sin6_family = AF_INET6;
 		inet_pton(AF_INET6, "localhost", &addr.v6.sin6_addr);
 	}
-	if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		pr_perror("can't connect to server");
 		return -1;
 	}
@@ -93,15 +92,15 @@ int main(int argc, char **argv)
 	/* Construct the server address structure */
 	memset(&addr, 0, sizeof(addr));
 	if (ZDTM_FAMILY == AF_INET) {
-		addr.v4.sin_family      = AF_INET;
-		addr.v4.sin_port        = htons(port);
+		addr.v4.sin_family = AF_INET;
+		addr.v4.sin_port = htons(port);
 		inet_pton(AF_INET, "localhost", &addr.v4.sin_addr);
 	} else {
-		addr.v6.sin6_family      = AF_INET6;
-		addr.v6.sin6_port        = htons(port);
+		addr.v6.sin6_family = AF_INET6;
+		addr.v6.sin6_port = htons(port);
 		inet_pton(AF_INET6, "localhost", &addr.v6.sin6_addr);
 	}
-	if (connect(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+	if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		pr_perror("can't connect to server");
 		return -1;
 	}
@@ -116,7 +115,6 @@ int main(int argc, char **argv)
 	}
 	close(fd_s);
 
-
 	pass();
 	return 0;
 }
diff --git a/test/zdtm/static/socket-tcp.c b/test/zdtm/static/socket-tcp.c
index 80c2e7b3b..f6ef47385 100644
--- a/test/zdtm/static/socket-tcp.c
+++ b/test/zdtm/static/socket-tcp.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
diff --git a/test/zdtm/static/socket-tcpbuf.c b/test/zdtm/static/socket-tcpbuf.c
index fbb4043f1..0ed69c09a 100644
--- a/test/zdtm/static/socket-tcpbuf.c
+++ b/test/zdtm/static/socket-tcpbuf.c
@@ -22,7 +22,7 @@ const char *test_author = "Andrey Vagin <avagin@parallels.com";
 
 static int port = 8880;
 
-#define BUF_SIZE 4096
+#define BUF_SIZE    4096
 #define TCP_MAX_BUF (100 << 20)
 
 static void read_safe(int fd, void *buf, size_t size)
@@ -236,15 +236,13 @@ int main(int argc, char **argv)
 	}
 
 	sk_bsize = TCP_MAX_BUF;
-	if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF,
-			&sk_bsize, sizeof(sk_bsize)) == -1) {
+	if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sk_bsize, sizeof(sk_bsize)) == -1) {
 		pr_perror("Can't set snd buf");
 		return 1;
 	}
 
 	sk_bsize = TCP_MAX_BUF;
-	if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF,
-			&sk_bsize, sizeof(sk_bsize)) == -1) {
+	if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sk_bsize, sizeof(sk_bsize)) == -1) {
 		pr_perror("Can't set snd buf");
 		return 1;
 	}
diff --git a/test/zdtm/static/socket6_udp.c b/test/zdtm/static/socket6_udp.c
index b81a6afee..15f1239c0 100644
--- a/test/zdtm/static/socket6_udp.c
+++ b/test/zdtm/static/socket6_udp.c
@@ -12,7 +12,7 @@ const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>\n";
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/wait.h>
 
 static int port = 8880;
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 
 	memset(&addr2, 0, sizeof(addr2));
 	addr2.sin6_family = AF_INET6;
-	addr2.sin6_port = htons(port+1);
+	addr2.sin6_port = htons(port + 1);
 	inet_pton(AF_INET6, "::1", &addr2.sin6_addr);
 
 	ret = bind(sk2, (struct sockaddr *)&addr2, len);
@@ -72,8 +72,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	ret = sendto(sk1, MSG1, sizeof(MSG1), 0,
-			(struct sockaddr *)&addr2, len);
+	ret = sendto(sk1, MSG1, sizeof(MSG1), 0, (struct sockaddr *)&addr2, len);
 	if (ret < 0) {
 		fail("Can't send");
 		return 1;
@@ -85,8 +84,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = recvfrom(sk1, buf, sizeof(buf), 0,
-			(struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk1, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		fail("Can't recv C");
 		return 1;
@@ -102,8 +100,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = recvfrom(sk2, buf, sizeof(buf), 0,
-			(struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk2, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		fail("Can't recv");
 		return 1;
diff --git a/test/zdtm/static/socket_aio.c b/test/zdtm/static/socket_aio.c
index 1dcdfec42..a545483e1 100644
--- a/test/zdtm/static/socket_aio.c
+++ b/test/zdtm/static/socket_aio.c
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 	int status;
 	pid_t pid;
 	int ret, res;
-	const struct aiocb   *aioary[1];
+	const struct aiocb *aioary[1];
 	task_waiter_t child_waiter;
 
 	test_init(argc, argv);
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 		test_msg(".");
 #endif
 		res = 0;
-again:
+	again:
 		if (aio_suspend(aioary, 1, NULL) < 0 && errno != EINTR) {
 			pr_perror("aio_suspend failed");
 			res = 1;
@@ -125,7 +125,6 @@ again:
 	}
 	close(fd);
 
-
 	if (wait(&status) < 0) {
 		pr_perror("wait failed");
 		goto error;
diff --git a/test/zdtm/static/socket_close_data.c b/test/zdtm/static/socket_close_data.c
index de552ada9..301896443 100644
--- a/test/zdtm/static/socket_close_data.c
+++ b/test/zdtm/static/socket_close_data.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check one end of socketpair with data";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org";
+const char *test_doc = "Check one end of socketpair with data";
+const char *test_author = "Andrew Vagin <avagin@openvz.org";
 
 #define MSG "hello"
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/socket_close_data01.c b/test/zdtm/static/socket_close_data01.c
index df4b894b2..7ffbd7f21 100644
--- a/test/zdtm/static/socket_close_data01.c
+++ b/test/zdtm/static/socket_close_data01.c
@@ -9,8 +9,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check data of bound socket and possibility to connect";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo";
+const char *test_doc = "Check data of bound socket and possibility to connect";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo";
 
 #define MSG "hello"
 char *filename;
@@ -30,7 +30,7 @@ static int client(const char *iter)
 	addr.sun_family = AF_UNIX;
 	strcpy(addr.sun_path, filename);
 
-	if (connect(sk, (struct sockaddr *) &addr, sizeof(struct sockaddr_un)) < 0) {
+	if (connect(sk, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) {
 		pr_perror("connect failed %s", iter);
 		return 1;
 	}
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
 	addr.sun_family = AF_UNIX;
 	strcpy(addr.sun_path, filename);
 
-	if (bind(srv, (struct sockaddr *) &addr, sizeof(struct sockaddr_un))) {
+	if (bind(srv, (struct sockaddr *)&addr, sizeof(struct sockaddr_un))) {
 		pr_perror("bind srv");
 		exit(1);
 	}
diff --git a/test/zdtm/static/socket_dgram_data.c b/test/zdtm/static/socket_dgram_data.c
index 0f29af0ad..d555050a4 100644
--- a/test/zdtm/static/socket_dgram_data.c
+++ b/test/zdtm/static/socket_dgram_data.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that data in dgram socket are restored correctly";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org";
+const char *test_doc = "Check that data in dgram socket are restored correctly";
+const char *test_author = "Andrew Vagin <avagin@openvz.org";
 
 #define SK_SRV "\0socket_dgram_srv"
 
@@ -42,15 +42,15 @@ int main(int argc, char **argv)
 	memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
 	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
 
-	if (bind(srv, (struct sockaddr *) &addr, addrlen)) {
+	if (bind(srv, (struct sockaddr *)&addr, addrlen)) {
 		fail("bind");
 		exit(1);
 	}
-	if (connect(clnt1, (struct sockaddr *) &addr, addrlen)) {
+	if (connect(clnt1, (struct sockaddr *)&addr, addrlen)) {
 		fail("connect");
 		exit(1);
 	}
-	if (connect(clnt2, (struct sockaddr *) &addr, addrlen)) {
+	if (connect(clnt2, (struct sockaddr *)&addr, addrlen)) {
 		fail("connect");
 		exit(1);
 	}
diff --git a/test/zdtm/static/socket_listen.c b/test/zdtm/static/socket_listen.c
index a4d3e66bd..519107d01 100644
--- a/test/zdtm/static/socket_listen.c
+++ b/test/zdtm/static/socket_listen.c
@@ -1,13 +1,13 @@
 #include "zdtmtst.h"
 
 #ifdef ZDTM_IPV4V6
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET6
 #elif defined(ZDTM_IPV6)
-#define ZDTM_FAMILY AF_INET6
+#define ZDTM_FAMILY	AF_INET6
 #define ZDTM_SRV_FAMILY AF_INET6
 #else
-#define ZDTM_FAMILY AF_INET
+#define ZDTM_FAMILY	AF_INET
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
@@ -31,7 +31,9 @@ static int port = 8880;
 
 #define BUF_SIZE 1024
 
-static void sig_hand(int signo) {}
+static void sig_hand(int signo)
+{
+}
 
 int main(int argc, char **argv)
 {
@@ -42,7 +44,7 @@ int main(int argc, char **argv)
 	int res;
 	uint32_t crc;
 	struct sigaction sa = {
-		.sa_handler	= sig_hand,
+		.sa_handler = sig_hand,
 		/* don't set SA_RESTART */
 	};
 
@@ -103,7 +105,6 @@ int main(int argc, char **argv)
 	}
 	close(fd);
 
-
 	if (wait(&status) < 0) {
 		pr_perror("wait failed");
 		goto error;
diff --git a/test/zdtm/static/socket_queues.c b/test/zdtm/static/socket_queues.c
index 86e052db7..e30bca0e1 100644
--- a/test/zdtm/static/socket_queues.c
+++ b/test/zdtm/static/socket_queues.c
@@ -16,8 +16,8 @@
 
 /* FIXME Need gram sockets tests */
 
-const char *test_doc	= "Test unix sockets queues (2 messages in queue)\n";
-const char *test_author	= "Stanislav Kinsbursky <skinsbursky@parallels.com>\n";
+const char *test_doc = "Test unix sockets queues (2 messages in queue)\n";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@parallels.com>\n";
 
 #define SK_DATA_S1 "packet stream left"
 #define SK_DATA_S2 "packet stream right"
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 		fail("data corrupted");
 		exit(1);
 	}
-	read(ssk_pair_d[0], buf_right,strlen(SK_DATA_D1) + 1);
+	read(ssk_pair_d[0], buf_right, strlen(SK_DATA_D1) + 1);
 	if (strcmp(buf_right, SK_DATA_D1)) {
 		fail("data corrupted");
 		exit(1);
diff --git a/test/zdtm/static/socket_snd_addr.c b/test/zdtm/static/socket_snd_addr.c
index 89a0a1762..a78af3a70 100644
--- a/test/zdtm/static/socket_snd_addr.c
+++ b/test/zdtm/static/socket_snd_addr.c
@@ -7,16 +7,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that sender addresses are restored";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org";
+const char *test_doc = "Check that sender addresses are restored";
+const char *test_author = "Andrew Vagin <avagin@openvz.org";
 
-#define SK_SRV "\0socket_snd_srv"
+#define SK_SRV	"\0socket_snd_srv"
 #define SK_NAME "\0A-socket_snd_clnt"
 
 char sk_names[2][128] = {
-		SK_NAME,
-		SK_NAME,
-	};
+	SK_NAME,
+	SK_NAME,
+};
 
 #define MSG "hello"
 int main(int argc, char **argv)
@@ -26,15 +26,15 @@ int main(int argc, char **argv)
 	int srv, clnt = -1, ret, i;
 	char buf[1024];
 	struct iovec iov = {
-			.iov_base = &buf,
-			.iov_len = sizeof(buf),
-		};
+		.iov_base = &buf,
+		.iov_len = sizeof(buf),
+	};
 	struct msghdr hdr = {
-			.msg_name = &addr,
-			.msg_namelen = sizeof(addr),
-			.msg_iov = &iov,
-			.msg_iovlen = 1,
-		};
+		.msg_name = &addr,
+		.msg_namelen = sizeof(addr),
+		.msg_iov = &iov,
+		.msg_iovlen = 1,
+	};
 
 	test_init(argc, argv);
 
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 	memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
 	addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
 
-	if (bind(srv, (struct sockaddr *) &addr, addrlen)) {
+	if (bind(srv, (struct sockaddr *)&addr, addrlen)) {
 		fail("bind");
 		exit(1);
 	}
@@ -58,14 +58,14 @@ int main(int argc, char **argv)
 		memcpy(addr.sun_path, sk_names[i], sizeof(SK_NAME));
 		addrlen = sizeof(addr.sun_family) + sizeof(SK_NAME);
 
-		if (bind(clnt, (struct sockaddr *) &addr, addrlen)) {
+		if (bind(clnt, (struct sockaddr *)&addr, addrlen)) {
 			fail("bind");
 			exit(1);
 		}
 
 		memcpy(addr.sun_path, SK_SRV, sizeof(SK_SRV));
 		addrlen = sizeof(addr.sun_family) + sizeof(SK_SRV);
-		if (connect(clnt, (struct sockaddr *) &addr, addrlen)) {
+		if (connect(clnt, (struct sockaddr *)&addr, addrlen)) {
 			fail("connect");
 			exit(1);
 		}
diff --git a/test/zdtm/static/socket_udp-corked.c b/test/zdtm/static/socket_udp-corked.c
index 540b9456a..f502ec7ea 100644
--- a/test/zdtm/static/socket_udp-corked.c
+++ b/test/zdtm/static/socket_udp-corked.c
@@ -17,7 +17,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/wait.h>
 #include <netinet/udp.h>
 
@@ -70,7 +70,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-
 	pass();
 	return 0;
 }
diff --git a/test/zdtm/static/socket_udp.c b/test/zdtm/static/socket_udp.c
index cce29fc96..c38bcb6fd 100644
--- a/test/zdtm/static/socket_udp.c
+++ b/test/zdtm/static/socket_udp.c
@@ -17,7 +17,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/wait.h>
 
 static int port = 8880;
@@ -77,8 +77,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	ret = sendto(sk1, MSG1, sizeof(MSG1), 0,
-			(struct sockaddr *)&addr2, len);
+	ret = sendto(sk1, MSG1, sizeof(MSG1), 0, (struct sockaddr *)&addr2, len);
 	if (ret < 0) {
 		fail("Can't send");
 		return 1;
@@ -90,8 +89,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = recvfrom(sk1, buf, sizeof(buf), 0,
-			(struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk1, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		fail("Can't recv C");
 		return 1;
@@ -107,8 +105,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = recvfrom(sk2, buf, sizeof(buf), 0,
-			(struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk2, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		fail("Can't recv");
 		return 1;
diff --git a/test/zdtm/static/socket_udp_shutdown.c b/test/zdtm/static/socket_udp_shutdown.c
index 5d65348ea..91dc8f30a 100644
--- a/test/zdtm/static/socket_udp_shutdown.c
+++ b/test/zdtm/static/socket_udp_shutdown.c
@@ -7,13 +7,13 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/wait.h>
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "static test for UDP shutdown'ed socket";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@virtuozzo.com>";
+const char *test_doc = "static test for UDP shutdown'ed socket";
+const char *test_author = "Cyrill Gorcunov <gorcunov@virtuozzo.com>";
 
 static int port = 8881;
 
@@ -39,41 +39,36 @@ int main(int argc, char **argv)
 	memset(&addr1, 0, sizeof(addr1));
 	memset(&addr2, 0, sizeof(addr1));
 
-	addr1.sin_family	= AF_INET;
-	addr1.sin_addr.s_addr	= inet_addr("127.0.0.10");
-	addr1.sin_port		= htons(port);
+	addr1.sin_family = AF_INET;
+	addr1.sin_addr.s_addr = inet_addr("127.0.0.10");
+	addr1.sin_port = htons(port);
 
-	addr2.sin_family	= AF_INET;
-	addr2.sin_addr.s_addr	= inet_addr("127.0.0.10");
-	addr2.sin_port		= htons(port + 1);
+	addr2.sin_family = AF_INET;
+	addr2.sin_addr.s_addr = inet_addr("127.0.0.10");
+	addr2.sin_port = htons(port + 1);
 
-	if (bind(sk1, (struct sockaddr *)&addr1, len) < 0 ||
-	    bind(sk2, (struct sockaddr *)&addr2, len) < 0) {
+	if (bind(sk1, (struct sockaddr *)&addr1, len) < 0 || bind(sk2, (struct sockaddr *)&addr2, len) < 0) {
 		pr_perror("Can't bind socket");
 		return 1;
 	}
 
-	if (connect(sk1, (struct sockaddr *)&addr2, len) ||
-	    connect(sk2, (struct sockaddr *)&addr1, len)) {
+	if (connect(sk1, (struct sockaddr *)&addr2, len) || connect(sk2, (struct sockaddr *)&addr1, len)) {
 		pr_perror("Can't connect");
 		return 1;
 	}
 
-	if (shutdown(sk1, SHUT_WR) ||
-	    shutdown(sk2, SHUT_RD)) {
+	if (shutdown(sk1, SHUT_WR) || shutdown(sk2, SHUT_RD)) {
 		pr_perror("Can't shutdown");
 		return 1;
 	}
 
-	ret = sendto(sk2, MSG1, sizeof(MSG1), 0,
-		     (struct sockaddr *)&addr1, len);
+	ret = sendto(sk2, MSG1, sizeof(MSG1), 0, (struct sockaddr *)&addr1, len);
 	if (ret < 0) {
 		pr_perror("Can't send");
 		return 1;
 	}
 
-	ret = recvfrom(sk1, buf, sizeof(buf), 0,
-		       (struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk1, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		pr_perror("Can't receive data");
 		return 1;
@@ -92,15 +87,13 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	ret = sendto(sk2, MSG1, sizeof(MSG1), 0,
-		     (struct sockaddr *)&addr1, len);
+	ret = sendto(sk2, MSG1, sizeof(MSG1), 0, (struct sockaddr *)&addr1, len);
 	if (ret < 0) {
 		pr_perror("Can't send");
 		return 1;
 	}
 
-	ret = recvfrom(sk1, buf, sizeof(buf), 0,
-		       (struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk1, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		pr_perror("Can't receive data");
 		return 1;
@@ -116,8 +109,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = sendto(sk1, MSG1, sizeof(MSG1), 0,
-		     (struct sockaddr *)&addr2, len);
+	ret = sendto(sk1, MSG1, sizeof(MSG1), 0, (struct sockaddr *)&addr2, len);
 	if (ret >= 0) {
 		fail("Sent to write-shutdown'ed socket");
 		return 1;
diff --git a/test/zdtm/static/socket_udplite.c b/test/zdtm/static/socket_udplite.c
index 763df319b..886317455 100644
--- a/test/zdtm/static/socket_udplite.c
+++ b/test/zdtm/static/socket_udplite.c
@@ -17,7 +17,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/wait.h>
 
 static int port = 8890;
@@ -133,8 +133,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	ret = sendto(sk1, MSG1, sizeof(MSG1), 0,
-			(struct sockaddr *)&addr2, len);
+	ret = sendto(sk1, MSG1, sizeof(MSG1), 0, (struct sockaddr *)&addr2, len);
 	if (ret < 0) {
 		fail("Can't send");
 		return 1;
@@ -146,8 +145,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = recvfrom(sk1, buf, sizeof(buf), 0,
-			(struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk1, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		fail("Can't recv C");
 		return 1;
@@ -163,8 +161,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ret = recvfrom(sk2, buf, sizeof(buf), 0,
-			(struct sockaddr *)&addr, &len);
+	ret = recvfrom(sk2, buf, sizeof(buf), 0, (struct sockaddr *)&addr, &len);
 	if (ret <= 0) {
 		fail("Can't recv");
 		return 1;
diff --git a/test/zdtm/static/sockets00.c b/test/zdtm/static/sockets00.c
index 4aa8ae098..53890077b 100644
--- a/test/zdtm/static/sockets00.c
+++ b/test/zdtm/static/sockets00.c
@@ -15,8 +15,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test unix stream sockets\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Test unix stream sockets\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 #define SK_DATA "packet"
 
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = bind(ssk_icon[0], (struct sockaddr *) &addr, addrlen);
+	ret = bind(ssk_icon[0], (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("bind");
 		exit(1);
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = connect(ssk_icon[2], (struct sockaddr *) &addr, addrlen);
+	ret = connect(ssk_icon[2], (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("connect");
 		exit(1);
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = connect(ssk_icon[1], (struct sockaddr *) &addr, addrlen);
+	ret = connect(ssk_icon[1], (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("connect");
 		exit(1);
@@ -124,14 +124,12 @@ int main(int argc, char *argv[])
 	}
 
 	if (st_b.st_mode != st_a.st_mode) {
-		fail("The file permissions for %s were changed %o %o",
-					path, st_b.st_mode, st_a.st_mode);
+		fail("The file permissions for %s were changed %o %o", path, st_b.st_mode, st_a.st_mode);
 		exit(1);
 	}
 
 	if (st_b.st_uid != uid || st_b.st_gid != gid) {
-		fail("Owner user or group for %s corrupted, uid=%d, gid=%d",
-		    path, st_b.st_uid, st_b.st_gid);
+		fail("Owner user or group for %s corrupted, uid=%d, gid=%d", path, st_b.st_uid, st_b.st_gid);
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/sockets01.c b/test/zdtm/static/sockets01.c
index 12650536f..e35a31fec 100644
--- a/test/zdtm/static/sockets01.c
+++ b/test/zdtm/static/sockets01.c
@@ -13,13 +13,21 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test unix sockets shutdown";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>";
+const char *test_doc = "Test unix sockets shutdown";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
-#define fin(msg)	do { pr_perror(msg); exit(1); } while (0)
-#define ffin(msg)	do { fail(msg); exit(1); } while (0)
+#define fin(msg)                \
+	do {                    \
+		pr_perror(msg); \
+		exit(1);        \
+	} while (0)
+#define ffin(msg)          \
+	do {               \
+		fail(msg); \
+		exit(1);   \
+	} while (0)
 
-#define TEST_MSG	"test-message"
+#define TEST_MSG "test-message"
 static char buf[sizeof(TEST_MSG)];
 
 int main(int argc, char *argv[])
diff --git a/test/zdtm/static/sockets02.c b/test/zdtm/static/sockets02.c
index a227c88ae..2729ade2c 100644
--- a/test/zdtm/static/sockets02.c
+++ b/test/zdtm/static/sockets02.c
@@ -13,8 +13,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test semi-closed unix stream connection\n";
-const char *test_author	= "Pavel Emelyanov <xemul@parallels.com>\n";
+const char *test_doc = "Test semi-closed unix stream connection\n";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com>\n";
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/sockets03.c b/test/zdtm/static/sockets03.c
index cbc46ca27..cd6f60831 100644
--- a/test/zdtm/static/sockets03.c
+++ b/test/zdtm/static/sockets03.c
@@ -14,8 +14,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test unix stream sockets with mismatch in shutdown state\n";
-const char *test_author	= "Andrey Ryabinin <aryabinin@virtuozzo.com>";
+const char *test_doc = "Test unix stream sockets with mismatch in shutdown state\n";
+const char *test_author = "Andrey Ryabinin <aryabinin@virtuozzo.com>";
 
 #define SK_DATA "packet"
 
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = bind(sk[0], (struct sockaddr *) &addr, addrlen);
+	ret = bind(sk[0], (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("bind");
 		exit(1);
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	ret = connect(sk[1], (struct sockaddr *) &addr, addrlen);
+	ret = connect(sk[1], (struct sockaddr *)&addr, addrlen);
 	if (ret) {
 		fail("connect");
 		exit(1);
diff --git a/test/zdtm/static/sockets_dgram.c b/test/zdtm/static/sockets_dgram.c
index 35ee88244..e88b43f89 100644
--- a/test/zdtm/static/sockets_dgram.c
+++ b/test/zdtm/static/sockets_dgram.c
@@ -13,12 +13,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test unix dgram sockets\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Test unix dgram sockets\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
-#define SK_DATA_BOUND		"data-packet-bound"
-#define SK_DATA_CONN		"data-packet-conn"
-#define SK_DATA_BOUND_CONN	"data-packet-bound-conn"
+#define SK_DATA_BOUND	   "data-packet-bound"
+#define SK_DATA_CONN	   "data-packet-conn"
+#define SK_DATA_BOUND_CONN "data-packet-bound-conn"
 
 char *filename;
 TEST_OPTION(filename, string, "socket file name", 1);
@@ -55,19 +55,15 @@ int main(int argc, char *argv[])
 	snprintf(path, sizeof(path), "%s/%s", dirname, filename);
 	unlink(path);
 
-	sk_dgram_bound_client	= socket(AF_UNIX, SOCK_DGRAM, 0);
-	sk_dgram_bound_server	= socket(AF_UNIX, SOCK_DGRAM, 0);
-	sk_dgram_conn_client	= socket(AF_UNIX, SOCK_DGRAM, 0);
-	sk_dgram_conn_client2	= socket(AF_UNIX, SOCK_DGRAM, 0);
-	sk_dgram_conn_server	= socket(AF_UNIX, SOCK_DGRAM, 0);
-	sk_dgram_bound_conn	= socket(AF_UNIX, SOCK_DGRAM, 0);
+	sk_dgram_bound_client = socket(AF_UNIX, SOCK_DGRAM, 0);
+	sk_dgram_bound_server = socket(AF_UNIX, SOCK_DGRAM, 0);
+	sk_dgram_conn_client = socket(AF_UNIX, SOCK_DGRAM, 0);
+	sk_dgram_conn_client2 = socket(AF_UNIX, SOCK_DGRAM, 0);
+	sk_dgram_conn_server = socket(AF_UNIX, SOCK_DGRAM, 0);
+	sk_dgram_bound_conn = socket(AF_UNIX, SOCK_DGRAM, 0);
 
-	if (sk_dgram_conn_server < 0	||
-	    sk_dgram_bound_server < 0	||
-	    sk_dgram_conn_client < 0	||
-	    sk_dgram_conn_client2 < 0	||
-	    sk_dgram_conn_server < 0	||
-	    sk_dgram_bound_conn < 0) {
+	if (sk_dgram_conn_server < 0 || sk_dgram_bound_server < 0 || sk_dgram_conn_client < 0 ||
+	    sk_dgram_conn_client2 < 0 || sk_dgram_conn_server < 0 || sk_dgram_bound_conn < 0) {
 		fail("socket");
 		exit(1);
 	}
@@ -94,54 +90,54 @@ int main(int argc, char *argv[])
 
 	snprintf(path, sizeof(path), "%s/%s.bound-conn", dirname, filename);
 	unlink(path);
-       if (strlen(path) >= sizeof(name_bound_conn.sun_path)) {
-               fail("too long path");
-               exit(1);
-       }
+	if (strlen(path) >= sizeof(name_bound_conn.sun_path)) {
+		fail("too long path");
+		exit(1);
+	}
 
 	name_bound_conn.sun_family = AF_UNIX;
 	strncpy(name_bound_conn.sun_path, path, sizeof(name_bound_conn.sun_path));
 
-	ret = bind(sk_dgram_bound_server, (struct sockaddr *) &name_bound, sizeof(name_bound));
+	ret = bind(sk_dgram_bound_server, (struct sockaddr *)&name_bound, sizeof(name_bound));
 	if (ret) {
 		fail("bind");
 		exit(1);
 	}
 
-	ret = bind(sk_dgram_conn_server, (struct sockaddr *) &name_conn, sizeof(name_conn));
+	ret = bind(sk_dgram_conn_server, (struct sockaddr *)&name_conn, sizeof(name_conn));
 	if (ret) {
 		fail("bind");
 		exit(1);
 	}
 
-	ret = connect(sk_dgram_conn_client, (struct sockaddr *) &name_conn, sizeof(name_conn));
+	ret = connect(sk_dgram_conn_client, (struct sockaddr *)&name_conn, sizeof(name_conn));
 	if (ret) {
 		fail("connect");
 		exit(1);
 	}
 
-	ret = connect(sk_dgram_conn_client2, (struct sockaddr *) &name_conn, sizeof(name_conn));
+	ret = connect(sk_dgram_conn_client2, (struct sockaddr *)&name_conn, sizeof(name_conn));
 	if (ret) {
 		fail("connect");
 		exit(1);
 	}
 
-	ret = bind(sk_dgram_bound_conn, (struct sockaddr *) &name_bound_conn, sizeof(name_bound_conn));
+	ret = bind(sk_dgram_bound_conn, (struct sockaddr *)&name_bound_conn, sizeof(name_bound_conn));
 	if (ret) {
 		fail("bind");
 		exit(1);
 	}
 
 	/* Note, it's already bound, so make it more idiotic! */
-	ret = connect(sk_dgram_bound_conn, (struct sockaddr *) &name_bound_conn, sizeof(name_bound_conn));
+	ret = connect(sk_dgram_bound_conn, (struct sockaddr *)&name_bound_conn, sizeof(name_bound_conn));
 	if (ret) {
 		fail("connect");
 		exit(1);
 	}
 
 	memset(buf, 0, sizeof(buf));
-	sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0,
-	       (struct sockaddr *) &name_bound, sizeof(name_bound));
+	sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0, (struct sockaddr *)&name_bound,
+	       sizeof(name_bound));
 	read(sk_dgram_bound_server, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_BOUND)) {
 		fail("data corrupted");
@@ -171,8 +167,8 @@ int main(int argc, char *argv[])
 	test_waitsig();
 
 	memset(buf, 0, sizeof(buf));
-	sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0,
-	       (struct sockaddr *) &name_bound, sizeof(name_bound));
+	sendto(sk_dgram_bound_client, SK_DATA_BOUND, sizeof(SK_DATA_BOUND), 0, (struct sockaddr *)&name_bound,
+	       sizeof(name_bound));
 	read(sk_dgram_bound_server, &buf, sizeof(buf));
 	if (strcmp(buf, SK_DATA_BOUND)) {
 		fail("data corrupted");
diff --git a/test/zdtm/static/sockets_spair.c b/test/zdtm/static/sockets_spair.c
index a67cdb312..2dbb132aa 100644
--- a/test/zdtm/static/sockets_spair.c
+++ b/test/zdtm/static/sockets_spair.c
@@ -13,8 +13,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test unix stream socketpair\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Test unix stream socketpair\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 #define SK_DATA "packet"
 
diff --git a/test/zdtm/static/sse00.c b/test/zdtm/static/sse00.c
index c2d601948..737f40f21 100644
--- a/test/zdtm/static/sse00.c
+++ b/test/zdtm/static/sse00.c
@@ -3,40 +3,31 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Start a calculation, leaving SSE in a certain state,\n"
-			  "before migration, continue after";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Start a calculation, leaving SSE in a certain state,\n"
+		       "before migration, continue after";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 #if defined(__i386__) || defined(__x86_64__)
 void start(float *in)
 {
-	__asm__ volatile (
-			"movaps	%0, %%xmm0\n"
-			"movaps	%1, %%xmm1\n"
-			"addps	%%xmm0, %%xmm1\n"
-			"sqrtps	%%xmm1, %%xmm2\n"
-			:
-			: "m" (in[0]), "m" (in[4])
-		);
+	__asm__ volatile("movaps	%0, %%xmm0\n"
+			 "movaps	%1, %%xmm1\n"
+			 "addps	%%xmm0, %%xmm1\n"
+			 "sqrtps	%%xmm1, %%xmm2\n"
+			 :
+			 : "m"(in[0]), "m"(in[4]));
 }
 
 void finish(float *out)
 {
-	__asm__ volatile (
-			"movaps	%%xmm1, %0\n"
-			"movaps	%%xmm2, %1\n"
-			: "=m" (out[0]), "=m" (out[4])
-		);
+	__asm__ volatile("movaps	%%xmm1, %0\n"
+			 "movaps	%%xmm2, %1\n"
+			 : "=m"(out[0]), "=m"(out[4]));
 }
 
 static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
-        __asm__("cpuid"
-                : "=a" (*eax),
-                  "=b" (*ebx),
-                  "=c" (*ecx),
-                  "=d" (*edx)
-                : "0" (op), "c"(0));
+	__asm__("cpuid" : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) : "0"(op), "c"(0));
 }
 
 int chk_proc_sse(void)
@@ -77,7 +68,7 @@ int main(int argc, char **argv)
 
 	finish(res2);
 
-	if (memcmp((uint8_t *) res1, (uint8_t *) res2, sizeof(res1)))
+	if (memcmp((uint8_t *)res1, (uint8_t *)res2, sizeof(res1)))
 		fail("results differ");
 	else
 		pass();
diff --git a/test/zdtm/static/sse20.c b/test/zdtm/static/sse20.c
index 1958eedfa..bfe3a37b2 100644
--- a/test/zdtm/static/sse20.c
+++ b/test/zdtm/static/sse20.c
@@ -3,40 +3,31 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Start a calculation, leaving SSE2 in a certain state,\n"
-			  "before migration, continue after";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Start a calculation, leaving SSE2 in a certain state,\n"
+		       "before migration, continue after";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 #if defined(__i386__) || defined(__x86_64__)
 void start(double *in)
 {
-	__asm__ volatile (
-			"movapd	%0, %%xmm0\n"
-			"movapd	%1, %%xmm1\n"
-			"addpd	%%xmm0, %%xmm1\n"
-			"sqrtpd	%%xmm1, %%xmm2\n"
-			:
-			: "m" (in[0]), "m" (in[2])
-		);
+	__asm__ volatile("movapd	%0, %%xmm0\n"
+			 "movapd	%1, %%xmm1\n"
+			 "addpd	%%xmm0, %%xmm1\n"
+			 "sqrtpd	%%xmm1, %%xmm2\n"
+			 :
+			 : "m"(in[0]), "m"(in[2]));
 }
 
 void finish(double *out)
 {
-	__asm__ volatile (
-			"movapd	%%xmm1, %0\n"
-			"movapd	%%xmm2, %1\n"
-			: "=m" (out[0]), "=m" (out[2])
-		);
+	__asm__ volatile("movapd	%%xmm1, %0\n"
+			 "movapd	%%xmm2, %1\n"
+			 : "=m"(out[0]), "=m"(out[2]));
 }
 
 static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
-        __asm__("cpuid"
-                : "=a" (*eax),
-                  "=b" (*ebx),
-                  "=c" (*ecx),
-                  "=d" (*edx)
-                : "0" (op), "c"(0));
+	__asm__("cpuid" : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) : "0"(op), "c"(0));
 }
 
 int chk_proc_sse2(void)
@@ -77,7 +68,7 @@ int main(int argc, char **argv)
 
 	finish(res2);
 
-	if (memcmp((uint8_t *) res1, (uint8_t *) res2, sizeof(res1)))
+	if (memcmp((uint8_t *)res1, (uint8_t *)res2, sizeof(res1)))
 		fail("results differ");
 	else
 		pass();
diff --git a/test/zdtm/static/stopped.c b/test/zdtm/static/stopped.c
index 9bb849363..059a2a92a 100644
--- a/test/zdtm/static/stopped.c
+++ b/test/zdtm/static/stopped.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check, that stopped tasts are restored correctly";
-const char *test_author	= "Andrew Vagin <avagin@parallels.com>";
+const char *test_doc = "Check, that stopped tasts are restored correctly";
+const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 int main(int argc, char **argv)
 {
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
 
 	if (WIFSTOPPED(status))
 		test_msg("The procces stopped\n");
-	else{
+	else {
 		fail("The process doesn't stopped");
 		goto out;
 	}
diff --git a/test/zdtm/static/symlink.c b/test/zdtm/static/symlink.c
index 074c80052..fb34db3a7 100644
--- a/test/zdtm/static/symlink.c
+++ b/test/zdtm/static/symlink.c
@@ -7,11 +7,11 @@
 
 #include "zdtmtst.h"
 
-#define TEST_FILE "test_file"
+#define TEST_FILE    "test_file"
 #define TEST_SYMLINK "test_symlink"
 
-const char *test_doc	= "Check open symlink preserved";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check open symlink preserved";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/tempfs.c b/test/zdtm/static/tempfs.c
index 8a103be6d..e03576e2b 100644
--- a/test/zdtm/static/tempfs.c
+++ b/test/zdtm/static/tempfs.c
@@ -8,14 +8,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check tmpfs mount";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check tmpfs mount";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_WORD	"testtest"
-#define TEST_WORD2	"TESTTEST"
+#define TEST_WORD  "testtest"
+#define TEST_WORD2 "TESTTEST"
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/tempfs_overmounted.c b/test/zdtm/static/tempfs_overmounted.c
index ed329bf99..41577e19d 100644
--- a/test/zdtm/static/tempfs_overmounted.c
+++ b/test/zdtm/static/tempfs_overmounted.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check tmpfs mount";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check tmpfs mount";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/tempfs_overmounted01.c b/test/zdtm/static/tempfs_overmounted01.c
index 5a7250903..c0ecba5d5 100644
--- a/test/zdtm/static/tempfs_overmounted01.c
+++ b/test/zdtm/static/tempfs_overmounted01.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check how file systems are dumped if some mount points are overmounted";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com>";
+const char *test_doc = "Check how file systems are dumped if some mount points are overmounted";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
@@ -50,8 +50,7 @@ int main(int argc, char **argv)
 		/* Create a chain when a parent mount is overmounted */
 		mkdir("a", 0700);
 		mkdir("b", 0700);
-		if (mount("zdtm1", "a", "tmpfs", 0, "") ||
-		    mount("a", "b", NULL, MS_BIND, "")) {
+		if (mount("zdtm1", "a", "tmpfs", 0, "") || mount("a", "b", NULL, MS_BIND, "")) {
 			pr_perror("Can't mount tmpfs");
 			return 1;
 		}
@@ -75,8 +74,7 @@ int main(int argc, char **argv)
 		}
 		mkdir("b/b", 0700);
 		mkdir("b/b/z", 0700);
-		if (mount("b", "b/b", NULL, MS_BIND, NULL) ||
-		    mount("b/b/b", "b/b", NULL, MS_BIND, NULL)) {
+		if (mount("b", "b/b", NULL, MS_BIND, NULL) || mount("b/b/b", "b/b", NULL, MS_BIND, NULL)) {
 			pr_perror("can't mount tmpfs");
 			return 1;
 		}
@@ -88,8 +86,7 @@ int main(int argc, char **argv)
 			pr_perror("umount");
 			return 1;
 		}
-		if (umount2("b/b", MNT_DETACH) ||
-		    umount2("b/b", MNT_DETACH)) {
+		if (umount2("b/b", MNT_DETACH) || umount2("b/b", MNT_DETACH)) {
 			pr_perror("umount");
 			return 1;
 		}
diff --git a/test/zdtm/static/tempfs_ro.c b/test/zdtm/static/tempfs_ro.c
index f30ae8dc5..4c823d8fd 100644
--- a/test/zdtm/static/tempfs_ro.c
+++ b/test/zdtm/static/tempfs_ro.c
@@ -8,13 +8,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check read-only tmpfs mount";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check read-only tmpfs mount";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_WORD	"testtest"
+#define TEST_WORD "testtest"
 
 int main(int argc, char **argv)
 {
@@ -50,7 +50,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-
 	fd = open(fname, O_RDONLY);
 	if (fd < 0) {
 		pr_perror("open failed");
diff --git a/test/zdtm/static/tempfs_ro02.c b/test/zdtm/static/tempfs_ro02.c
index 7b70b866e..d313aff86 100644
--- a/test/zdtm/static/tempfs_ro02.c
+++ b/test/zdtm/static/tempfs_ro02.c
@@ -8,13 +8,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check read-only tmpfs mount";
-const char *test_author	= "Andrew Vagin <avagin@openvz.org>";
+const char *test_doc = "Check read-only tmpfs mount";
+const char *test_author = "Andrew Vagin <avagin@openvz.org>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
-#define TEST_WORD	"testtest"
+#define TEST_WORD "testtest"
 
 int main(int argc, char **argv)
 {
@@ -34,7 +34,6 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-
 	fd = open(fname, O_RDWR | O_CREAT, 0777);
 	if (fd >= 0 || errno != EROFS) {
 		pr_perror("open failed -> %d", fd);
diff --git a/test/zdtm/static/tempfs_subns.c b/test/zdtm/static/tempfs_subns.c
index 610f427d7..ed3ef9a3a 100644
--- a/test/zdtm/static/tempfs_subns.c
+++ b/test/zdtm/static/tempfs_subns.c
@@ -10,8 +10,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check tmpfs in a non-root mntns";
-const char *test_author	= "Andrew Vagin <avagin@virtuozzo.com";
+const char *test_doc = "Check tmpfs in a non-root mntns";
+const char *test_author = "Andrew Vagin <avagin@virtuozzo.com";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/thp_disable.c b/test/zdtm/static/thp_disable.c
index a809caaff..ab88120c2 100644
--- a/test/zdtm/static/thp_disable.c
+++ b/test/zdtm/static/thp_disable.c
@@ -4,11 +4,11 @@
 #include "get_smaps_bits.h"
 
 #ifndef MADV_DONTDUMP
-#define MADV_DONTDUMP   16
+#define MADV_DONTDUMP 16
 #endif
 
-const char *test_doc	= "Test prctl(THP_DISABLE) behaviour";
-const char *test_author	= "Mike Rapoport <rppt@linux.ibm.com>";
+const char *test_doc = "Test prctl(THP_DISABLE) behaviour";
+const char *test_author = "Mike Rapoport <rppt@linux.ibm.com>";
 
 #define MEM_SIZE (2 << 20)
 
@@ -20,8 +20,7 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	area = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE,
-		    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+	area = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 	if (area == MAP_FAILED) {
 		pr_perror("mmap failed");
 		return -1;
diff --git a/test/zdtm/static/thread_different_uid_gid.c b/test/zdtm/static/thread_different_uid_gid.c
index 4344654e7..3a0b6291b 100644
--- a/test/zdtm/static/thread_different_uid_gid.c
+++ b/test/zdtm/static/thread_different_uid_gid.c
@@ -15,16 +15,15 @@
 
 #include "zdtmtst.h"
 
-#define exit_group(code)	\
-	syscall(__NR_exit_group, code)
+#define exit_group(code) syscall(__NR_exit_group, code)
 
-const char *test_doc	= "Acquire UID/GID setting caps, create thread and drop thread to non-root by changing UID/GID\n";
-const char *test_author	= "Vitaly Ostrosablin <vostrosablin@virtuozzo.com>";
+const char *test_doc = "Acquire UID/GID setting caps, create thread and drop thread to non-root by changing UID/GID\n";
+const char *test_author = "Vitaly Ostrosablin <vostrosablin@virtuozzo.com>";
 
 unsigned int gid;
 unsigned int uid;
-pthread_mutex_t mutex  = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t  cond   = PTHREAD_COND_INITIALIZER;
+pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 task_waiter_t t;
 
 int done = 0;
diff --git a/test/zdtm/static/time.c b/test/zdtm/static/time.c
index d37e2a8f8..3f9c4c99b 100644
--- a/test/zdtm/static/time.c
+++ b/test/zdtm/static/time.c
@@ -5,16 +5,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check monotonic and boot clocks";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com";
-
+const char *test_doc = "Check monotonic and boot clocks";
+const char *test_author = "Andrei Vagin <avagin@gmail.com";
 
 #define NSEC_PER_SEC 1000000000ULL
 
 int main(int argc, char **argv)
 {
 	struct timespec tss[2], ts;
-	int clocks[] = {CLOCK_MONOTONIC, CLOCK_BOOTTIME};
+	int clocks[] = { CLOCK_MONOTONIC, CLOCK_BOOTTIME };
 	unsigned long long a, b;
 	int i;
 
diff --git a/test/zdtm/static/timens_for_kids.c b/test/zdtm/static/timens_for_kids.c
index 72543486b..7712147f7 100644
--- a/test/zdtm/static/timens_for_kids.c
+++ b/test/zdtm/static/timens_for_kids.c
@@ -9,12 +9,11 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check nested time namespaces";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com";
-
+const char *test_doc = "Check nested time namespaces";
+const char *test_author = "Andrei Vagin <avagin@gmail.com";
 
 #ifndef CLONE_NEWTIME
-#define CLONE_NEWTIME   0x00000080
+#define CLONE_NEWTIME 0x00000080
 #endif
 
 int main(int argc, char **argv)
@@ -26,7 +25,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
 	test_daemon();
 	test_waitsig();
 
diff --git a/test/zdtm/static/timens_nested.c b/test/zdtm/static/timens_nested.c
index 3f4b0e821..05214f6be 100644
--- a/test/zdtm/static/timens_nested.c
+++ b/test/zdtm/static/timens_nested.c
@@ -10,12 +10,11 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check nested time namespaces";
-const char *test_author	= "Andrei Vagin <avagin@gmail.com";
-
+const char *test_doc = "Check nested time namespaces";
+const char *test_author = "Andrei Vagin <avagin@gmail.com";
 
 #ifndef CLONE_NEWTIME
-#define CLONE_NEWTIME   0x00000080
+#define CLONE_NEWTIME 0x00000080
 #endif
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/timerfd.c b/test/zdtm/static/timerfd.c
index 132c3acd8..a4ff9c73c 100644
--- a/test/zdtm/static/timerfd.c
+++ b/test/zdtm/static/timerfd.c
@@ -11,26 +11,21 @@
 const char *test_doc = "Checks timerfd survives checkpoint/restore\n";
 const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
-#define TIMERFD_VNSEC	50000
-#define TIMERFD_ISEC	4
+#define TIMERFD_VNSEC 50000
+#define TIMERFD_ISEC  4
 
 struct timerfd_status {
-	int			clockid;
-	uint64_t		ticks;
-	int			settime_flags;
-	struct itimerspec	v;
+	int clockid;
+	uint64_t ticks;
+	int settime_flags;
+	struct itimerspec v;
 };
 
 static void show_timerfd(char *prefix, struct timerfd_status *s)
 {
-	test_msg("\t%s clockid %d ticks %llu settime_flags %d it_value(%llu, %llu) it_interval(%llu, %llu)\n",
-		 prefix,
-		 s->clockid,
-		 (unsigned long long)s->ticks,
-		 s->settime_flags,
-		 (unsigned long long)s->v.it_value.tv_sec,
-		 (unsigned long long)s->v.it_value.tv_nsec,
-		 (unsigned long long)s->v.it_interval.tv_sec,
+	test_msg("\t%s clockid %d ticks %llu settime_flags %d it_value(%llu, %llu) it_interval(%llu, %llu)\n", prefix,
+		 s->clockid, (unsigned long long)s->ticks, s->settime_flags, (unsigned long long)s->v.it_value.tv_sec,
+		 (unsigned long long)s->v.it_value.tv_nsec, (unsigned long long)s->v.it_interval.tv_sec,
 		 (unsigned long long)s->v.it_interval.tv_nsec);
 }
 
@@ -58,7 +53,7 @@ static int parse_self_fdinfo(int fd, struct timerfd_status *s)
 	 */
 	while (fgets(buf, sizeof(buf), f)) {
 		if (strncmp(buf, "clockid:", 8))
-		    continue;
+			continue;
 
 		if (sscanf(buf, "clockid: %d", &s->clockid) != 1)
 			goto parse_err;
@@ -75,15 +70,13 @@ static int parse_self_fdinfo(int fd, struct timerfd_status *s)
 
 		if (!fgets(buf, sizeof(buf), f))
 			goto parse_err;
-		if (sscanf(buf, "it_value: (%llu, %llu)",
-			   (unsigned long long *)&s->v.it_value.tv_sec,
+		if (sscanf(buf, "it_value: (%llu, %llu)", (unsigned long long *)&s->v.it_value.tv_sec,
 			   (unsigned long long *)&s->v.it_value.tv_nsec) != 2)
 			goto parse_err;
 
 		if (!fgets(buf, sizeof(buf), f))
 			goto parse_err;
-		if (sscanf(buf, "it_interval: (%llu, %llu)",
-			   (unsigned long long *)&s->v.it_interval.tv_sec,
+		if (sscanf(buf, "it_interval: (%llu, %llu)", (unsigned long long *)&s->v.it_interval.tv_sec,
 			   (unsigned long long *)&s->v.it_interval.tv_nsec) != 2)
 			goto parse_err;
 
@@ -110,11 +103,8 @@ static int check_timerfd(int fd, struct timerfd_status *old)
 		return -1;
 	show_timerfd("restored", &new);
 
-	if (old->clockid != new.clockid				||
-	    old->settime_flags != new.settime_flags		||
-	    old->ticks > new.ticks				||
-	    old->v.it_value.tv_sec > new.v.it_value.tv_sec	||
-	    old->v.it_interval.tv_sec != new.v.it_interval.tv_sec)
+	if (old->clockid != new.clockid || old->settime_flags != new.settime_flags || old->ticks > new.ticks ||
+	    old->v.it_value.tv_sec > new.v.it_value.tv_sec || old->v.it_interval.tv_sec != new.v.it_interval.tv_sec)
 		return -1;
 
 	return 0;
diff --git a/test/zdtm/static/timers.c b/test/zdtm/static/timers.c
index 256a5c1be..e5f7f2a02 100644
--- a/test/zdtm/static/timers.c
+++ b/test/zdtm/static/timers.c
@@ -11,14 +11,15 @@ static struct {
 	const int timer_type;
 	const int signal;
 	volatile sig_atomic_t count;
-} timer_tests[] = {	/* from slowest to fastest */
-	{ ITIMER_VIRTUAL,	SIGVTALRM	},
-	{ ITIMER_PROF,		SIGPROF		},
-	{ ITIMER_REAL,		SIGALRM		},
+} timer_tests[] = {
+	/* from slowest to fastest */
+	{ ITIMER_VIRTUAL, SIGVTALRM },
+	{ ITIMER_PROF, SIGPROF },
+	{ ITIMER_REAL, SIGALRM },
 };
 
 #define NUM_TIMERS	(sizeof(timer_tests) / sizeof(timer_tests[0]))
-#define MAX_TIMER_COUNT	10
+#define MAX_TIMER_COUNT 10
 
 static void timer_tick(int sig)
 {
@@ -36,14 +37,8 @@ static void setup_timers(void)
 {
 	int i;
 	struct itimerval tv = {
-		.it_interval = {
-			.tv_sec = 0,
-			.tv_usec = 100000
-		},
-		.it_value = {
-			.tv_sec = 0,
-			.tv_usec = 100
-		},
+		.it_interval = { .tv_sec = 0, .tv_usec = 100000 },
+		.it_value = { .tv_sec = 0, .tv_usec = 100 },
 	};
 
 	for (i = 0; i < NUM_TIMERS; i++) {
@@ -62,14 +57,15 @@ static void setup_timers(void)
 static void check_timers(void)
 {
 	int i;
-	volatile unsigned int j;	/* avoid optimizing the loop away */
+	volatile unsigned int j; /* avoid optimizing the loop away */
 
-	for (i = 0; i < NUM_TIMERS; i++)	/* reset counters first */
+	for (i = 0; i < NUM_TIMERS; i++) /* reset counters first */
 		timer_tests[i].count = 0;
 
 	/* waste some real and CPU time: run for MAX_TIMER_COUNT ticks or until
 	 * j overflows */
-	for (j = 1; j && timer_tests[0].count < MAX_TIMER_COUNT; j++);
+	for (j = 1; j && timer_tests[0].count < MAX_TIMER_COUNT; j++)
+		;
 
 	for (i = 0; i < NUM_TIMERS; i++)
 		if (!timer_tests[i].count) {
diff --git a/test/zdtm/static/tty00.c b/test/zdtm/static/tty00.c
index 473650cdd..080f8d4b0 100644
--- a/test/zdtm/static/tty00.c
+++ b/test/zdtm/static/tty00.c
@@ -10,8 +10,8 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-const char *test_doc	= "Check that a control terminal is restored";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Check that a control terminal is restored";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
 static int sighup = 0;
 static void sighup_handler(int signo)
@@ -20,7 +20,7 @@ static void sighup_handler(int signo)
 	sighup = 1;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fdm, fds, status;
 	task_waiter_t t;
diff --git a/test/zdtm/static/tty02.c b/test/zdtm/static/tty02.c
index bac0d82be..e0ff11203 100644
--- a/test/zdtm/static/tty02.c
+++ b/test/zdtm/static/tty02.c
@@ -9,10 +9,10 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-const char *test_doc	= "Check a non-controling terminal";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Check a non-controling terminal";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fdm, fds;
 	char *slavename;
diff --git a/test/zdtm/static/tty03.c b/test/zdtm/static/tty03.c
index a582f1031..6abd1e61a 100644
--- a/test/zdtm/static/tty03.c
+++ b/test/zdtm/static/tty03.c
@@ -9,10 +9,10 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 
-const char *test_doc	= "Check a controlling terminal, if a proper fd belongs to another session leader";
-const char *test_author	= "Andrey Vagin <avagin@openvz.org>";
+const char *test_doc = "Check a controlling terminal, if a proper fd belongs to another session leader";
+const char *test_author = "Andrey Vagin <avagin@openvz.org>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fdm, fds, exit_code = 1, status;
 	task_waiter_t t;
diff --git a/test/zdtm/static/tun.c b/test/zdtm/static/tun.c
index f6bfeb91b..85c504c5d 100644
--- a/test/zdtm/static/tun.c
+++ b/test/zdtm/static/tun.c
@@ -9,19 +9,19 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test TUN/TAP devices\n";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Test TUN/TAP devices\n";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define TUN_DEVICE	"/dev/net/tun"
+#define TUN_DEVICE "/dev/net/tun"
 #ifndef IFF_MULTI_QUEUE
-#define IFF_MULTI_QUEUE  0x0100
+#define IFF_MULTI_QUEUE	 0x0100
 #define IFF_ATTACH_QUEUE 0x0200
 #define IFF_DETACH_QUEUE 0x0400
-#define IFF_PERSIST      0x0800
+#define IFF_PERSIST	 0x0800
 #endif
 
 #ifndef TUNSETQUEUE
-#define TUNSETQUEUE  _IOW('T', 217, int)
+#define TUNSETQUEUE _IOW('T', 217, int)
 #endif
 
 static int any_fail = 0;
@@ -39,7 +39,9 @@ static int __open_tun(void)
 
 static int set_tun_queue(int fd, const char *name, unsigned flags)
 {
-	struct ifreq ifr = { .ifr_flags = flags, };
+	struct ifreq ifr = {
+		.ifr_flags = flags,
+	};
 
 	if (ioctl(fd, TUNSETQUEUE, &ifr) < 0) {
 		pr_perror("Can't set queue on %s", name);
@@ -51,9 +53,11 @@ static int set_tun_queue(int fd, const char *name, unsigned flags)
 
 static int __attach_tun(int fd, const char *name, unsigned flags)
 {
-	struct ifreq ifr = { .ifr_flags = flags, };
+	struct ifreq ifr = {
+		.ifr_flags = flags,
+	};
 
-	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)-1);
+	strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name) - 1);
 
 	if (ioctl(fd, TUNSETIFF, &ifr) < 0) {
 		if (!(flags & IFF_TUN_EXCL))
@@ -77,7 +81,7 @@ static int open_tun(const char *name, unsigned flags)
 
 static void check_tun(int fd, const char *name, unsigned flags)
 {
-	struct ifreq ifr = { };
+	struct ifreq ifr = {};
 
 	if (ioctl(fd, TUNGETIFF, &ifr) > 0) {
 		any_fail = 1;
@@ -97,7 +101,7 @@ static void check_tun(int fd, const char *name, unsigned flags)
 
 static int dev_get_hwaddr(int fd, const char *name, char *a)
 {
-	struct ifreq ifr = { };
+	struct ifreq ifr = {};
 
 	if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) {
 		pr_perror("Can't get hwaddr on %s", name);
@@ -225,9 +229,7 @@ int main(int argc, char **argv)
 		pr_perror("No hwaddr for tap? (2)");
 		any_fail = 1;
 	} else if (memcmp(addr, a2, sizeof(addr))) {
-		fail("Address mismatch on tap %x:%x -> %x:%x",
-				(int)addr[0], (int)addr[1],
-				(int)a2[0], (int)a2[1]);
+		fail("Address mismatch on tap %x:%x -> %x:%x", (int)addr[0], (int)addr[1], (int)a2[0], (int)a2[1]);
 		any_fail = 1;
 	}
 
diff --git a/test/zdtm/static/uffd-events.c b/test/zdtm/static/uffd-events.c
index 5a46d7e6d..c811bcf4c 100644
--- a/test/zdtm/static/uffd-events.c
+++ b/test/zdtm/static/uffd-events.c
@@ -11,11 +11,11 @@
 #include <linux/limits.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test uffd events";
-const char *test_author	= "Mike Rapoport <rppt@linux.vnet.ibm.com>";
+const char *test_doc = "Test uffd events";
+const char *test_author = "Mike Rapoport <rppt@linux.vnet.ibm.com>";
 
-#define NR_MAPS		5
-#define MAP_SIZE	(1 << 20)
+#define NR_MAPS	 5
+#define MAP_SIZE (1 << 20)
 
 static void *map[NR_MAPS];
 
@@ -25,8 +25,7 @@ static int create_mappings(void)
 	int i;
 
 	for (i = 0; i < NR_MAPS; i++) {
-		map[i] = mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE,
-			      MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+		map[i] = mmap(NULL, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 		if (map[i] == MAP_FAILED) {
 			fail("mmap failed");
 			return 1;
@@ -134,7 +133,7 @@ static int check_swapped_mappings(int idx)
 	return 0;
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	uint32_t crc;
 	int pid;
diff --git a/test/zdtm/static/umask00.c b/test/zdtm/static/umask00.c
index 5acf5a39b..9d50b98de 100644
--- a/test/zdtm/static/umask00.c
+++ b/test/zdtm/static/umask00.c
@@ -2,8 +2,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that umask didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that umask didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 unsigned int mask;
 TEST_OPTION(mask, uint, "umask", 1);
diff --git a/test/zdtm/static/unbindable.c b/test/zdtm/static/unbindable.c
index 2f7b38164..6966d4181 100644
--- a/test/zdtm/static/unbindable.c
+++ b/test/zdtm/static/unbindable.c
@@ -6,8 +6,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check unbindable flag does not break mount restore";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check unbindable flag does not break mount restore";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/unbound_sock.c b/test/zdtm/static/unbound_sock.c
index f1d610d20..98f9a710a 100644
--- a/test/zdtm/static/unbound_sock.c
+++ b/test/zdtm/static/unbound_sock.c
@@ -6,19 +6,19 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Create a socket before migration, and bind to it after\n";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Create a socket before migration, and bind to it after\n";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 #define TEST_PORT 59687
 #define TEST_ADDR INADDR_ANY
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int sock;
 	struct sockaddr_in name = {
-		.sin_family		= AF_INET,
-		.sin_port		= htons(TEST_PORT),
-		.sin_addr.s_addr	= htonl(TEST_ADDR),
+		.sin_family = AF_INET,
+		.sin_port = htons(TEST_PORT),
+		.sin_addr.s_addr = htonl(TEST_ADDR),
 	};
 
 	test_init(argc, argv);
@@ -32,7 +32,7 @@ int main(int argc, char ** argv)
 	test_daemon();
 	test_waitsig();
 
-	if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0)
+	if (bind(sock, (struct sockaddr *)&name, sizeof(name)) < 0)
 		fail("can't bind to a socket");
 	else
 		pass();
diff --git a/test/zdtm/static/unhashed_proc.c b/test/zdtm/static/unhashed_proc.c
index 75fe881ce..c6c94803c 100644
--- a/test/zdtm/static/unhashed_proc.c
+++ b/test/zdtm/static/unhashed_proc.c
@@ -9,10 +9,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Chdir into unhashed proc entry";
-const char *test_author	= "Konstantin Khlebnikov <khlebnikov@openvz.org>";
+const char *test_doc = "Chdir into unhashed proc entry";
+const char *test_author = "Konstantin Khlebnikov <khlebnikov@openvz.org>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int pid, len;
 	char cwd1[PATH_MAX], cwd2[PATH_MAX];
@@ -65,7 +65,7 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 
-	len = readlink("/proc/self/cwd", cwd2, sizeof(cwd2)-1);
+	len = readlink("/proc/self/cwd", cwd2, sizeof(cwd2) - 1);
 	if (len < 0) {
 		fail("can't read cwd symlink");
 		exit(1);
diff --git a/test/zdtm/static/unlink_fifo.c b/test/zdtm/static/unlink_fifo.c
index ff36edacf..9cddc0f53 100644
--- a/test/zdtm/static/unlink_fifo.c
+++ b/test/zdtm/static/unlink_fifo.c
@@ -7,9 +7,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a named pipe "
-			"open and then unlinked";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Check that we can migrate with a named pipe "
+		       "open and then unlinked";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/unlink_fifo_wronly.c b/test/zdtm/static/unlink_fifo_wronly.c
index c5c4b206e..fe4d05847 100644
--- a/test/zdtm/static/unlink_fifo_wronly.c
+++ b/test/zdtm/static/unlink_fifo_wronly.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that we can migrate with a named pipe, "
-			"opened in WRONLY mode and then unlinked";
+const char *test_doc = "Check that we can migrate with a named pipe, "
+		       "opened in WRONLY mode and then unlinked";
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
@@ -26,8 +26,7 @@ int main(int argc, char **argv)
 
 	fd = open(filename, O_RDONLY | O_NONBLOCK);
 	if (fd < 0) {
-		pr_perror("open(%s, O_RDONLY | O_NONBLOCK) Failed",
-			filename);
+		pr_perror("open(%s, O_RDONLY | O_NONBLOCK) Failed", filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat00.c b/test/zdtm/static/unlink_fstat00.c
index 9f8e30188..8a9841bfa 100644
--- a/test/zdtm/static/unlink_fstat00.c
+++ b/test/zdtm/static/unlink_fstat00.c
@@ -17,7 +17,7 @@
 #define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
 #endif
 
-const char *test_doc	= "Open, unlink, change size, seek, migrate, check size";
+const char *test_doc = "Open, unlink, change size, seek, migrate, check size";
 
 #ifdef UNLINK_FSTAT04
 char *dirname;
@@ -27,10 +27,10 @@ char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 #endif
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
-	size_t fsize=1000;
+	size_t fsize = 1000;
 	mode_t mode;
 	uid_t uid;
 	gid_t gid;
@@ -125,14 +125,12 @@ int main(int argc, char ** argv)
 
 	/* Check file size */
 	if (fst.st_size != fsize) {
-		fail("(via fstat): file size changed to %ld",
-				(long)fst.st_size);
+		fail("(via fstat): file size changed to %ld", (long)fst.st_size);
 		goto failed;
 	}
 	fst.st_size = lseek(fd, 0, SEEK_END);
 	if (fst.st_size != fsize) {
-		fail("(via lseek): file size changed to %ld",
-				(long)fst.st_size);
+		fail("(via lseek): file size changed to %ld", (long)fst.st_size);
 		goto failed;
 	}
 	/* Check mode */
@@ -142,8 +140,7 @@ int main(int argc, char ** argv)
 	}
 	/* Check uid, gid */
 	if (fst.st_uid != uid || fst.st_gid != gid) {
-		fail("u(g)id changed: uid=%d(%d), gid=%d(%d)",
-				fst.st_uid, uid, fst.st_gid, gid);
+		fail("u(g)id changed: uid=%d(%d), gid=%d(%d)", fst.st_uid, uid, fst.st_gid, gid);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat01.c b/test/zdtm/static/unlink_fstat01.c
index 43ea6b9f6..bf2341482 100644
--- a/test/zdtm/static/unlink_fstat01.c
+++ b/test/zdtm/static/unlink_fstat01.c
@@ -8,15 +8,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Open, unlink, change size, migrate, check size";
+const char *test_doc = "Open, unlink, change size, migrate, check size";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
-	size_t fsize=1000;
+	size_t fsize = 1000;
 	uint8_t buf[fsize];
 	struct stat fst;
 
@@ -44,15 +44,15 @@ int main(int argc, char ** argv)
 	}
 
 #ifdef UNLINK_OVER
-{
-	int fdo;
+	{
+		int fdo;
 
-	fdo = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-	if (fdo < 0) {
-		pr_perror("can't open %s", filename);
-		exit(1);
+		fdo = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+		if (fdo < 0) {
+			pr_perror("can't open %s", filename);
+			exit(1);
+		}
 	}
-}
 #endif
 
 	memset(buf, '0', sizeof(buf));
@@ -70,15 +70,13 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != fsize) {
-		fail("(via fstat): file size changed to %lld",
-			(long long)fst.st_size);
+		fail("(via fstat): file size changed to %lld", (long long)fst.st_size);
 		goto failed;
 	}
 
 	fst.st_size = lseek(fd, 0, SEEK_END);
 	if (fst.st_size != fsize) {
-		fail("(via lseek): file size changed to %lld",
-			(long long)fst.st_size);
+		fail("(via lseek): file size changed to %lld", (long long)fst.st_size);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat02.c b/test/zdtm/static/unlink_fstat02.c
index 3d75db3e0..613e52bc8 100644
--- a/test/zdtm/static/unlink_fstat02.c
+++ b/test/zdtm/static/unlink_fstat02.c
@@ -8,16 +8,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Open, link, unlink x2, change size, migrate, check size";
+const char *test_doc = "Open, link, unlink x2, change size, migrate, check size";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 static char link_name[1024];
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd[2];
-	size_t fsize=1000;
+	size_t fsize = 1000;
 	uint8_t buf[fsize];
 	struct stat fst, fst2;
 
@@ -47,8 +47,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != 0) {
-		pr_perror("%s file size eq %lld",
-				filename, (long long)fst.st_size);
+		pr_perror("%s file size eq %lld", filename, (long long)fst.st_size);
 		goto failed;
 	}
 
@@ -87,15 +86,13 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != fsize) {
-		fail("(via fstat): file size changed to %lld",
-				(long long)fst.st_size);
+		fail("(via fstat): file size changed to %lld", (long long)fst.st_size);
 		goto failed;
 	}
 
 	fst.st_size = lseek(fd[0], 0, SEEK_END);
 	if (fst.st_size != fsize) {
-		fail("(via lseek): file size changed to %lld",
-				(long long)fst.st_size);
+		fail("(via lseek): file size changed to %lld", (long long)fst.st_size);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_fstat03.c b/test/zdtm/static/unlink_fstat03.c
index 64d069970..b46bfc33a 100644
--- a/test/zdtm/static/unlink_fstat03.c
+++ b/test/zdtm/static/unlink_fstat03.c
@@ -10,16 +10,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Open, link, unlink former, change size, migrate, check size";
+const char *test_doc = "Open, link, unlink former, change size, migrate, check size";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 static char link_name[1024];
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
-	size_t fsize=1000;
+	size_t fsize = 1000;
 	uint8_t buf[fsize];
 	struct stat fst, fst2;
 	struct statfs fsst;
@@ -44,8 +44,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst.st_size != 0) {
-		pr_perror("%s file size eq %lld", filename,
-				(long long)fst.st_size);
+		pr_perror("%s file size eq %lld", filename, (long long)fst.st_size);
 		goto failed;
 	}
 
@@ -85,15 +84,13 @@ int main(int argc, char ** argv)
 	}
 
 	if (fst2.st_size != fsize) {
-		fail("(via fstat): file size changed to %lld",
-				(long long)fst.st_size);
+		fail("(via fstat): file size changed to %lld", (long long)fst.st_size);
 		goto failed;
 	}
 
 	fst2.st_size = lseek(fd, 0, SEEK_END);
 	if (fst2.st_size != fsize) {
-		fail("(via lseek): file size changed to %lld",
-				(long long)fst.st_size);
+		fail("(via lseek): file size changed to %lld", (long long)fst.st_size);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_largefile.c b/test/zdtm/static/unlink_largefile.c
index f47391238..4baacafff 100644
--- a/test/zdtm/static/unlink_largefile.c
+++ b/test/zdtm/static/unlink_largefile.c
@@ -12,11 +12,11 @@ const char *test_doc = "Checkpointing/restore of big (2Gb) unlinked files";
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	char buf[1000000];
-	off64_t offset= 0x80002000ULL;
+	off64_t offset = 0x80002000ULL;
 	size_t count;
 
 	test_init(argc, argv);
@@ -28,8 +28,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (lseek64(fd, offset, SEEK_SET) < 0) {
-		pr_perror("can't lseek %s, offset= %llx", filename,
-				(long long unsigned)offset);
+		pr_perror("can't lseek %s, offset= %llx", filename, (long long unsigned)offset);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/unlink_mmap00.c b/test/zdtm/static/unlink_mmap00.c
index 03509aabc..405157dac 100644
--- a/test/zdtm/static/unlink_mmap00.c
+++ b/test/zdtm/static/unlink_mmap00.c
@@ -9,13 +9,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test mmaped and unlinked files";
+const char *test_doc = "Test mmaped and unlinked files";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
 #ifndef PAGE_SIZE
-#define PAGE_SIZE	4096
+#define PAGE_SIZE 4096
 #endif
 
 static void touch_file_page(int fd, unsigned long off, char c)
@@ -31,7 +31,7 @@ static void touch_file_page(int fd, unsigned long off, char c)
 	}
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	char *mem_a, *mem_b;
@@ -44,7 +44,6 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 
-
 	touch_file_page(fd, 0, 'a');
 	touch_file_page(fd, PAGE_SIZE, 'b');
 	touch_file_page(fd, 2 * PAGE_SIZE - 1, 'c'); /* for aligned file */
diff --git a/test/zdtm/static/unlink_mmap01.c b/test/zdtm/static/unlink_mmap01.c
index 66c1bc353..d43246b79 100644
--- a/test/zdtm/static/unlink_mmap01.c
+++ b/test/zdtm/static/unlink_mmap01.c
@@ -11,14 +11,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test mmaped and unlinked files (2, with hard links)";
+const char *test_doc = "Test mmaped and unlinked files (2, with hard links)";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 static char linkname[4096];
 
 #ifndef PAGE_SIZE
-#define PAGE_SIZE	4096
+#define PAGE_SIZE 4096
 #endif
 
 static void touch_file_page(int fd, unsigned long off, char c)
@@ -34,7 +34,7 @@ static void touch_file_page(int fd, unsigned long off, char c)
 	}
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	char *mem_a, *mem_b;
@@ -48,7 +48,7 @@ int main(int argc, char ** argv)
 	}
 
 	touch_file_page(fd, 0, 'a');
-	touch_file_page(fd, PAGE_SIZE - 1, 'b');/* for aligned file */
+	touch_file_page(fd, PAGE_SIZE - 1, 'b'); /* for aligned file */
 
 	mem_a = mmap(NULL, PAGE_SIZE, PROT_READ, MAP_PRIVATE | MAP_FILE, fd, 0);
 	if (mem_a == MAP_FAILED) {
diff --git a/test/zdtm/static/unlink_mmap02.c b/test/zdtm/static/unlink_mmap02.c
index 85d6b3887..a6b1841b3 100644
--- a/test/zdtm/static/unlink_mmap02.c
+++ b/test/zdtm/static/unlink_mmap02.c
@@ -9,13 +9,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Test mmaped, opened and unlinked files";
+const char *test_doc = "Test mmaped, opened and unlinked files";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
 #ifndef PAGE_SIZE
-#define PAGE_SIZE	4096
+#define PAGE_SIZE 4096
 #endif
 
 static void touch_file_page(int fd, unsigned long off, char c)
@@ -31,7 +31,7 @@ static void touch_file_page(int fd, unsigned long off, char c)
 	}
 }
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	char *mem_a, *mem_b;
@@ -44,7 +44,6 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 
-
 	touch_file_page(fd, 2 * PAGE_SIZE - 1, 'c'); /* for aligned file */
 
 	/* map with different prots to create 2 regions */
diff --git a/test/zdtm/static/unlink_multiple_largefiles.c b/test/zdtm/static/unlink_multiple_largefiles.c
index 2f9248c2f..e475e739f 100644
--- a/test/zdtm/static/unlink_multiple_largefiles.c
+++ b/test/zdtm/static/unlink_multiple_largefiles.c
@@ -12,10 +12,9 @@
 #include <linux/fiemap.h>
 #include "zdtmtst.h"
 
-
-#define FSIZE 0x3B600000ULL
-#define NFILES 10
-#define BUFSIZE (1<<20)
+#define FSIZE	0x3B600000ULL
+#define NFILES	10
+#define BUFSIZE (1 << 20)
 
 const char *test_doc = "C/R of ten big (951MiB) unlinked files in root dir";
 const char *test_author = "Vitaly Ostrosablin <vostrosablin@virtuozzo.com>";
@@ -86,23 +85,19 @@ void check_extent_map(struct fiemap *map)
 	test_msg("Verifying extent map...\n");
 
 	for (i = 0; i < map->fm_mapped_extents; i++) {
-		test_msg("Extent %d, start %llx, length %llx\n",
-			i,
-			(long long) map->fm_extents[i].fe_logical,
-			(long long) map->fm_extents[i].fe_length);
+		test_msg("Extent %d, start %llx, length %llx\n", i, (long long)map->fm_extents[i].fe_logical,
+			 (long long)map->fm_extents[i].fe_length);
 
 		if (i == 0)
 			holesize = map->fm_extents[i].fe_logical;
 		datasize += map->fm_extents[i].fe_length;
 	}
 	if (holesize != FSIZE) {
-		pr_err("Unexpected hole size %llx != %llx\n",
-			  (long long) holesize, (unsigned long long) FSIZE);
+		pr_err("Unexpected hole size %llx != %llx\n", (long long)holesize, (unsigned long long)FSIZE);
 		exit(1);
 	}
 	if (datasize != BUFSIZE) {
-		pr_err("Unexpected data size %llx != %llx\n",
-			  (long long) datasize, (unsigned long long) BUFSIZE);
+		pr_err("Unexpected data size %llx != %llx\n", (long long)datasize, (unsigned long long)BUFSIZE);
 		exit(1);
 	}
 }
@@ -207,7 +202,7 @@ failed:
 
 int main(int argc, char **argv)
 {
-	int fd[NFILES] = {0};
+	int fd[NFILES] = { 0 };
 	char links[NFILES][PATH_MAX];
 	char link[PATH_MAX];
 	int count = 0;
@@ -217,13 +212,11 @@ int main(int argc, char **argv)
 
 	/* We need to create 10 unlinked files, each is around 1GB in size */
 	for (count = 0; count < NFILES; count++) {
-
 		test_msg("Creating unlinked file %d/%d\n", count + 1, NFILES);
 		tempfd = create_unlinked_file(count);
 
 		if (tempfd < 0) {
-			pr_err("Cannot create unlinked file %d/%d\n",
-				  count + 1, NFILES);
+			pr_err("Cannot create unlinked file %d/%d\n", count + 1, NFILES);
 			return 1;
 		}
 
@@ -248,8 +241,7 @@ int main(int argc, char **argv)
 		read_proc_fd_link(fd[count], &link[0]);
 
 		if (strcmp(&links[count][0], &link[0])) {
-			pr_err("Symlink target %s has changed to %s\n",
-				  links[count], link);
+			pr_err("Symlink target %s has changed to %s\n", links[count], link);
 			return 1;
 		}
 
diff --git a/test/zdtm/static/unlink_regular00.c b/test/zdtm/static/unlink_regular00.c
index 383fabbf0..2c93c8986 100644
--- a/test/zdtm/static/unlink_regular00.c
+++ b/test/zdtm/static/unlink_regular00.c
@@ -11,16 +11,16 @@
 #include "zdtmtst.h"
 
 const char *test_doc = "Checkpointing/restore of unlinked file inside unlinked directory";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com>";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
 #define SUBDIR "subdir"
-#define FNAME "testfile"
-#define MSG "Hello!!!111"
+#define FNAME  "testfile"
+#define MSG    "Hello!!!111"
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	char subdir[PATH_MAX], fname[PATH_MAX], lname[PATH_MAX];
 	char buf[sizeof(MSG) + 1];
@@ -88,8 +88,7 @@ int main(int argc, char ** argv)
 	}
 
 	if (strcmp(buf, MSG)) {
-		fail("content differs: %s, %s, sizeof=%zu",
-				buf, MSG, sizeof(MSG));
+		fail("content differs: %s, %s, sizeof=%zu", buf, MSG, sizeof(MSG));
 		goto close_file;
 	}
 
diff --git a/test/zdtm/static/unsupported_children_collision.c b/test/zdtm/static/unsupported_children_collision.c
index 15e8f3ba0..176f7080c 100644
--- a/test/zdtm/static/unsupported_children_collision.c
+++ b/test/zdtm/static/unsupported_children_collision.c
@@ -4,8 +4,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check unsupported children collision for mounts";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check unsupported children collision for mounts";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
diff --git a/test/zdtm/static/uptime_grow.c b/test/zdtm/static/uptime_grow.c
index ce262c4fc..5cb4b8671 100644
--- a/test/zdtm/static/uptime_grow.c
+++ b/test/zdtm/static/uptime_grow.c
@@ -1,15 +1,12 @@
 #include "zdtmtst.h"
 
-const char *test_doc    = "test to ensure that monotonic clock doesn't decrease";
+const char *test_doc = "test to ensure that monotonic clock doesn't decrease";
 const char *test_author = "Evgeny Antysev <eantyshev@parallels.com>";
 
 #include <time.h>
 #include <stdlib.h>
 
-# define tv_ge(a, b) \
-  (((a)->tv_sec == (b)->tv_sec) ? \
-   ((a)->tv_nsec >= (b)->tv_nsec) : \
-   ((a)->tv_sec > (b)->tv_sec))
+#define tv_ge(a, b) (((a)->tv_sec == (b)->tv_sec) ? ((a)->tv_nsec >= (b)->tv_nsec) : ((a)->tv_sec > (b)->tv_sec))
 
 int main(int argc, char **argv)
 {
@@ -33,8 +30,7 @@ int main(int argc, char **argv)
 			exit(1);
 		}
 		if (!tv_ge(&tm, &tm_old)) {
-			diff_nsec = (tm_old.tv_sec - tm.tv_sec) * 1.0E9 +\
-				(tm_old.tv_nsec - tm.tv_nsec);
+			diff_nsec = (tm_old.tv_sec - tm.tv_sec) * 1.0E9 + (tm_old.tv_nsec - tm.tv_nsec);
 			fail("clock step backward for %e nsec", diff_nsec);
 			exit(1);
 		}
diff --git a/test/zdtm/static/utsname.c b/test/zdtm/static/utsname.c
index 964548a8f..4c96942f2 100644
--- a/test/zdtm/static/utsname.c
+++ b/test/zdtm/static/utsname.c
@@ -5,12 +5,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that utsname hasn't changed";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that utsname hasn't changed";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 static struct utsname after;
 
-#define ZDTM_NODE "zdtm.nodename.ru"
+#define ZDTM_NODE   "zdtm.nodename.ru"
 #define ZDTM_DOMAIN "zdtm.nodename.ru"
 
 int main(int argc, char **argv)
diff --git a/test/zdtm/static/vdso-proxy.c b/test/zdtm/static/vdso-proxy.c
index f5ff21bd9..43334974f 100644
--- a/test/zdtm/static/vdso-proxy.c
+++ b/test/zdtm/static/vdso-proxy.c
@@ -4,17 +4,18 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Compare mappings before/after C/R for vdso/vvar presence. Should run iterative under vdso proxy fault-injection.\n";
-const char *test_author	= "Dmitry Safonov <dsafonov@virtuozzo.com>";
+const char *test_doc =
+	"Compare mappings before/after C/R for vdso/vvar presence. Should run iterative under vdso proxy fault-injection.\n";
+const char *test_author = "Dmitry Safonov <dsafonov@virtuozzo.com>";
 
-#define BUILD_BUG_ON(condition)	((void)sizeof(char[1 - 2*!!(condition)]))
-#define VSYSCALL_START 0xffffffffff600000ULL
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)]))
+#define VSYSCALL_START		0xffffffffff600000ULL
 /*
  * Use constant MAX_VMAS - to minimize the risk of allocating a new
  * mapping or changing the size of existent VMA with realloc()
  */
-#define MAX_VMAS		80
-#define BUF_SIZE		1024
+#define MAX_VMAS 80
+#define BUF_SIZE 1024
 
 /*
  * After C/R with vdso trampolines insertion, there should
@@ -69,8 +70,7 @@ static int parse_maps(struct vm_area *vmas)
 #endif
 		v->is_vvar_or_vdso |= strstr(buf, "[vdso]") != NULL;
 		v->is_vvar_or_vdso |= strstr(buf, "[vvar]") != NULL;
-		test_msg("[NOTE]\tVMA: [%#" PRIx64 ", %#" PRIx64 "]\n",
-				v->start, v->end);
+		test_msg("[NOTE]\tVMA: [%#" PRIx64 ", %#" PRIx64 "]\n", v->start, v->end);
 	}
 
 	if (fclose(maps)) {
@@ -110,9 +110,8 @@ static int check_vvar_vdso(struct vm_area *before, struct vm_area *after)
 		if (cmp == 0)
 			continue;
 
-		if (cmp < 0) {/* Lost mapping */
-			test_msg("[NOTE]\tLost mapping: %#" PRIx64 "-%#" PRIx64 "\n",
-				before[i].start, before[i].end);
+		if (cmp < 0) { /* Lost mapping */
+			test_msg("[NOTE]\tLost mapping: %#" PRIx64 "-%#" PRIx64 "\n", before[i].start, before[i].end);
 			j--;
 			if (before[i].is_vvar_or_vdso) {
 				fail("Lost vvar/vdso mapping");
@@ -121,8 +120,7 @@ static int check_vvar_vdso(struct vm_area *before, struct vm_area *after)
 			continue;
 		}
 
-		test_msg("[NOTE]\tNew mapping appeared: %#" PRIx64 "-%#" PRIx64 "\n",
-			after[j].start, after[j].end);
+		test_msg("[NOTE]\tNew mapping appeared: %#" PRIx64 "-%#" PRIx64 "\n", after[j].start, after[j].end);
 		i--;
 	}
 
diff --git a/test/zdtm/static/vdso00.c b/test/zdtm/static/vdso00.c
index 8ac4ccad9..a9bef4dbd 100644
--- a/test/zdtm/static/vdso00.c
+++ b/test/zdtm/static/vdso00.c
@@ -7,8 +7,8 @@
 #include <sys/types.h>
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check if we can use vDSO after restore\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Check if we can use vDSO after restore\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 int main(int argc, char *argv[])
 {
diff --git a/test/zdtm/static/vdso01.c b/test/zdtm/static/vdso01.c
index 269688c5e..d8d64155a 100644
--- a/test/zdtm/static/vdso01.c
+++ b/test/zdtm/static/vdso01.c
@@ -15,67 +15,68 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check if we can use vDSO using direct vDSO calls\n";
-const char *test_author	= "Cyrill Gorcunov <gorcunov@openvz.org";
+const char *test_doc = "Check if we can use vDSO using direct vDSO calls\n";
+const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 #ifdef __i386__
 
-# define Ehdr_t		Elf32_Ehdr
-# define Sym_t		Elf32_Sym
-# define Phdr_t		Elf32_Phdr
-# define Word_t		Elf32_Word
-# define Dyn_t		Elf32_Dyn
+#define Ehdr_t Elf32_Ehdr
+#define Sym_t  Elf32_Sym
+#define Phdr_t Elf32_Phdr
+#define Word_t Elf32_Word
+#define Dyn_t  Elf32_Dyn
 
-# define ELF_ST_TYPE	ELF32_ST_TYPE
-# define ELF_ST_BIND	ELF32_ST_BIND
+#define ELF_ST_TYPE ELF32_ST_TYPE
+#define ELF_ST_BIND ELF32_ST_BIND
 
 const char elf_ident[] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 #else /* non-i386 */
 
-# define Ehdr_t		Elf64_Ehdr
-# define Sym_t		Elf64_Sym
-# define Phdr_t		Elf64_Phdr
-# define Word_t		Elf64_Word
-# define Dyn_t		Elf64_Dyn
+#define Ehdr_t Elf64_Ehdr
+#define Sym_t  Elf64_Sym
+#define Phdr_t Elf64_Phdr
+#define Word_t Elf64_Word
+#define Dyn_t  Elf64_Dyn
 
-# ifndef ELF_ST_TYPE
-#  define ELF_ST_TYPE	ELF64_ST_TYPE
-# endif
-# ifndef ELF_ST_BIND
-#  define ELF_ST_BIND	ELF64_ST_BIND
-# endif
+#ifndef ELF_ST_TYPE
+#define ELF_ST_TYPE ELF64_ST_TYPE
+#endif
+#ifndef ELF_ST_BIND
+#define ELF_ST_BIND ELF64_ST_BIND
+#endif
 
 /*
  * See Elf specification for this magic values.
  */
 const char elf_ident[] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 #endif
 
-typedef int (__vdso_clock_gettime_t)(clockid_t clock, struct timespec *ts);
-typedef long (__vdso_getcpu_t)(unsigned *cpu, unsigned *node, void *unused);
-typedef int (__vdso_gettimeofday_t)(struct timeval *tv, struct timezone *tz);
-typedef time_t (__vdso_time_t)(time_t *t);
+typedef int(__vdso_clock_gettime_t)(clockid_t clock, struct timespec *ts);
+typedef long(__vdso_getcpu_t)(unsigned *cpu, unsigned *node, void *unused);
+typedef int(__vdso_gettimeofday_t)(struct timeval *tv, struct timezone *tz);
+typedef time_t(__vdso_time_t)(time_t *t);
 
-#define TIME_DELTA_SEC		(3)
+#define TIME_DELTA_SEC (3)
 
-#define BUILD_BUG_ON(condition)	((void)sizeof(char[1 - 2*!!(condition)]))
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)]))
 
-#define VDSO_BAD_ADDR		(-1ul)
+#define VDSO_BAD_ADDR (-1ul)
 
 struct vdso_symbol {
-	char			name[32];
-	unsigned long		offset;
+	char name[32];
+	unsigned long offset;
 };
 
-#define VDSO_SYMBOL_INIT	{ .offset = VDSO_BAD_ADDR, }
+#define VDSO_SYMBOL_INIT                 \
+	{                                \
+		.offset = VDSO_BAD_ADDR, \
+	}
 
 /* Check if symbol present in symtable */
 static inline bool vdso_symbol_empty(struct vdso_symbol *s)
@@ -93,26 +94,24 @@ enum {
 };
 
 const char *vdso_symbols[VDSO_SYMBOL_MAX] = {
-	[VDSO_SYMBOL_CLOCK_GETTIME]	= "__vdso_clock_gettime",
-	[VDSO_SYMBOL_GETCPU]		= "__vdso_getcpu",
-	[VDSO_SYMBOL_GETTIMEOFDAY]	= "__vdso_gettimeofday",
-	[VDSO_SYMBOL_TIME]		= "__vdso_time",
+	[VDSO_SYMBOL_CLOCK_GETTIME] = "__vdso_clock_gettime",
+	[VDSO_SYMBOL_GETCPU] = "__vdso_getcpu",
+	[VDSO_SYMBOL_GETTIMEOFDAY] = "__vdso_gettimeofday",
+	[VDSO_SYMBOL_TIME] = "__vdso_time",
 };
 
 struct vdso_symtable {
-	unsigned long		vma_start;
-	unsigned long		vma_end;
-	struct vdso_symbol	symbols[VDSO_SYMBOL_MAX];
+	unsigned long vma_start;
+	unsigned long vma_end;
+	struct vdso_symbol symbols[VDSO_SYMBOL_MAX];
 };
 
-#define VDSO_SYMTABLE_INIT						\
-	{								\
-		.vma_start	= VDSO_BAD_ADDR,			\
-		.vma_end	= VDSO_BAD_ADDR,			\
-		.symbols		= {				\
-			[0 ... VDSO_SYMBOL_MAX - 1] =			\
-				(struct vdso_symbol)VDSO_SYMBOL_INIT,	\
-			},						\
+#define VDSO_SYMTABLE_INIT                                                                  \
+	{                                                                                   \
+		.vma_start = VDSO_BAD_ADDR, .vma_end = VDSO_BAD_ADDR,                       \
+		.symbols = {                                                                \
+			[0 ... VDSO_SYMBOL_MAX - 1] = (struct vdso_symbol)VDSO_SYMBOL_INIT, \
+		},                                                                          \
 	}
 
 static bool __ptr_oob(void *ptr, void *start, size_t size)
@@ -240,8 +239,7 @@ static int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
 	bucket = &hash[2];
 	chain = &hash[nbucket + 2];
 
-	test_msg("nbucket %lu nchain %lu bucket %p chain %p\n",
-	       (long)nbucket, (long)nchain, bucket, chain);
+	test_msg("nbucket %lu nchain %lu bucket %p chain %p\n", (long)nbucket, (long)nchain, bucket, chain);
 
 	for (i = 0; i < ARRAY_SIZE(vdso_symbols); i++) {
 		k = elf_hash((const unsigned char *)vdso_symbols[i]);
@@ -254,8 +252,7 @@ static int vdso_fill_symtable(char *mem, size_t size, struct vdso_symtable *t)
 			if (__ptr_oob(sym, mem, size))
 				continue;
 
-			if (ELF_ST_TYPE(sym->st_info) != STT_FUNC &&
-			    ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
+			if (ELF_ST_TYPE(sym->st_info) != STT_FUNC && ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
 				continue;
 
 			name = &dynsymbol_names[sym->st_name];
@@ -327,8 +324,7 @@ static int vdso_clock_gettime_handler(void *func)
 	clock_gettime(CLOCK_REALTIME, &ts1);
 	vdso_clock_gettime(CLOCK_REALTIME, &ts2);
 
-	test_msg("clock_gettime: tv_sec %li vdso_clock_gettime: tv_sec %li\n",
-		 ts1.tv_sec, ts2.tv_sec);
+	test_msg("clock_gettime: tv_sec %li vdso_clock_gettime: tv_sec %li\n", ts1.tv_sec, ts2.tv_sec);
 
 	if (labs(ts1.tv_sec - ts2.tv_sec) > TIME_DELTA_SEC) {
 		pr_perror("Delta is too big");
@@ -358,8 +354,7 @@ static int vdso_gettimeofday_handler(void *func)
 	gettimeofday(&tv1, &tz);
 	vdso_gettimeofday(&tv2, &tz);
 
-	test_msg("gettimeofday: tv_sec %li vdso_gettimeofday: tv_sec %li\n",
-		 tv1.tv_sec, tv2.tv_sec);
+	test_msg("gettimeofday: tv_sec %li vdso_gettimeofday: tv_sec %li\n", tv1.tv_sec, tv2.tv_sec);
 
 	if (labs(tv1.tv_sec - tv2.tv_sec) > TIME_DELTA_SEC) {
 		pr_perror("Delta is too big");
@@ -389,12 +384,12 @@ static int vdso_time_handler(void *func)
 
 static int call_handlers(struct vdso_symtable *symtable)
 {
-	typedef int (handler_t)(void *func);
+	typedef int(handler_t)(void *func);
 	handler_t *handlers[VDSO_SYMBOL_MAX] = {
-		[VDSO_SYMBOL_CLOCK_GETTIME]	= vdso_clock_gettime_handler,
-		[VDSO_SYMBOL_GETCPU]		= vdso_getcpu_handler,
-		[VDSO_SYMBOL_GETTIMEOFDAY]	= vdso_gettimeofday_handler,
-		[VDSO_SYMBOL_TIME]		= vdso_time_handler,
+		[VDSO_SYMBOL_CLOCK_GETTIME] = vdso_clock_gettime_handler,
+		[VDSO_SYMBOL_GETCPU] = vdso_getcpu_handler,
+		[VDSO_SYMBOL_GETTIMEOFDAY] = vdso_gettimeofday_handler,
+		[VDSO_SYMBOL_TIME] = vdso_time_handler,
 	};
 	size_t i;
 
diff --git a/test/zdtm/static/vdso02.c b/test/zdtm/static/vdso02.c
index f0047bc2c..ea28c4453 100644
--- a/test/zdtm/static/vdso02.c
+++ b/test/zdtm/static/vdso02.c
@@ -6,10 +6,11 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Restoring task with unmapped vDSO blob. Poor man's test for C/R on vdso64_enabled=0 booted kernel.\n";
-const char *test_author	= "Dmitry Safonov <dsafonov@virtuozzo.com>";
+const char *test_doc =
+	"Restoring task with unmapped vDSO blob. Poor man's test for C/R on vdso64_enabled=0 booted kernel.\n";
+const char *test_author = "Dmitry Safonov <dsafonov@virtuozzo.com>";
 
-#define BUILD_BUG_ON(condition)	((void)sizeof(char[1 - 2*!!(condition)]))
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)]))
 #define VDSO_BAD_ADDR		(-1ul)
 #define VVAR_BAD_ADDR		(-1ul)
 #define BUF_SZ			1024
@@ -34,10 +35,10 @@ static int find_blobs(pid_t pid, struct vm_area *vdso, struct vm_area *vvar)
 	int ret = -1;
 	FILE *maps;
 
-	vdso->start	= VDSO_BAD_ADDR;
-	vdso->end	= VDSO_BAD_ADDR;
-	vvar->start	= VVAR_BAD_ADDR;
-	vvar->end	= VVAR_BAD_ADDR;
+	vdso->start = VDSO_BAD_ADDR;
+	vdso->end = VDSO_BAD_ADDR;
+	vvar->start = VVAR_BAD_ADDR;
+	vvar->end = VVAR_BAD_ADDR;
 
 	if (snprintf(buf, BUF_SZ, "/proc/%d/maps", pid) < 0) {
 		pr_perror("snprintf() failure for path");
@@ -73,28 +74,25 @@ err:
  * On i386 syscalls for speed are optimized trough vdso,
  * call raw int80 as vdso is unmapped.
  */
-#define __NR32_munmap	91
-#define __NR32_kill	37
-#define __NR32_exit	1
+#define __NR32_munmap 91
+#define __NR32_kill   37
+#define __NR32_exit   1
 struct syscall_args32 {
 	uint32_t nr, arg0, arg1;
 };
 
 static inline void do_full_int80(struct syscall_args32 *args)
 {
-	asm volatile (
-			"int $0x80\n\t"
-		      : "+a" (args->nr),
-			"+b" (args->arg0), "+c" (args->arg1));
+	asm volatile("int $0x80\n\t" : "+a"(args->nr), "+b"(args->arg0), "+c"(args->arg1));
 }
 
 int sys_munmap(void *addr, size_t len)
 {
-	struct syscall_args32 s = {0};
+	struct syscall_args32 s = { 0 };
 
-	s.nr    = __NR32_munmap;
-	s.arg0  = (uint32_t)(uintptr_t)addr;
-	s.arg1  = (uint32_t)len;
+	s.nr = __NR32_munmap;
+	s.arg0 = (uint32_t)(uintptr_t)addr;
+	s.arg1 = (uint32_t)len;
 
 	do_full_int80(&s);
 
@@ -103,11 +101,11 @@ int sys_munmap(void *addr, size_t len)
 
 int sys_kill(pid_t pid, int sig)
 {
-	struct syscall_args32 s = {0};
+	struct syscall_args32 s = { 0 };
 
-	s.nr    = __NR32_kill;
-	s.arg0  = (uint32_t)pid;
-	s.arg1  = (uint32_t)sig;
+	s.nr = __NR32_kill;
+	s.arg0 = (uint32_t)pid;
+	s.arg1 = (uint32_t)sig;
 
 	do_full_int80(&s);
 
@@ -116,10 +114,10 @@ int sys_kill(pid_t pid, int sig)
 
 void sys_exit(int status)
 {
-	struct syscall_args32 s = {0};
+	struct syscall_args32 s = { 0 };
 
-	s.nr    = __NR32_exit;
-	s.arg0  = (uint32_t)status;
+	s.nr = __NR32_exit;
+	s.arg0 = (uint32_t)status;
 
 	do_full_int80(&s);
 }
@@ -152,12 +150,12 @@ static int unmap_blobs(void)
 		return -1;
 
 	if (vdso.start != VDSO_BAD_ADDR) {
-		ret = sys_munmap((void*)vdso.start, vdso.end - vdso.start);
+		ret = sys_munmap((void *)vdso.start, vdso.end - vdso.start);
 		if (ret)
 			return ret;
 	}
 	if (vvar.start != VVAR_BAD_ADDR) {
-		ret = sys_munmap((void*)vvar.start, vvar.end - vvar.start);
+		ret = sys_munmap((void *)vvar.start, vvar.end - vvar.start);
 		if (ret)
 			return ret;
 	}
@@ -196,8 +194,7 @@ int main(int argc, char *argv[])
 	} else if (WIFSIGNALED(status)) {
 		int sig = WTERMSIG(status);
 
-		pr_err("Child unexpectedly signaled with %d: %s\n",
-				sig, strsignal(sig));
+		pr_err("Child unexpectedly signaled with %d: %s\n", sig, strsignal(sig));
 		goto out_kill;
 	} else if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP) {
 		pr_err("Child is unstoppable or was stopped by other means\n");
diff --git a/test/zdtm/static/vfork00.c b/test/zdtm/static/vfork00.c
index 6abc5c6ac..12dd890bc 100644
--- a/test/zdtm/static/vfork00.c
+++ b/test/zdtm/static/vfork00.c
@@ -9,10 +9,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Block migration by a pending (non-exec()-ed) vfork()";
-const char *test_author	= "Pavel Emelianov <xemul@sw.ru>";
+const char *test_doc = "Block migration by a pending (non-exec()-ed) vfork()";
+const char *test_author = "Pavel Emelianov <xemul@sw.ru>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int ret = 0;
 	pid_t pid;
diff --git a/test/zdtm/static/vsx.c b/test/zdtm/static/vsx.c
index e7d81b12c..3c1d669a0 100644
--- a/test/zdtm/static/vsx.c
+++ b/test/zdtm/static/vsx.c
@@ -30,20 +30,21 @@ int main(int argc, char *argv[])
  * their content.
  */
 
-const char *test_doc	= "Test if data in vector registers do survive the c/r";
-const char *test_author	= "Laurent Dufour <ldufour@linux.vnet.ibm.com>";
+const char *test_doc = "Test if data in vector registers do survive the c/r";
+const char *test_author = "Laurent Dufour <ldufour@linux.vnet.ibm.com>";
 
 int is_test_doable(void)
 {
 	unsigned long val;
 
 	val = getauxval(AT_HWCAP);
-#define CHECK_FEATURE(f) do {						\
-		if (!(val & f)) {					\
-			test_msg("CPU feature " #f " is missing\n");	\
-			return 0;					\
-		}							\
-	} while(0)
+#define CHECK_FEATURE(f)                                             \
+	do {                                                         \
+		if (!(val & f)) {                                    \
+			test_msg("CPU feature " #f " is missing\n"); \
+			return 0;                                    \
+		}                                                    \
+	} while (0)
 
 	CHECK_FEATURE(PPC_FEATURE_64);
 	CHECK_FEATURE(PPC_FEATURE_HAS_ALTIVEC);
@@ -53,318 +54,315 @@ int is_test_doable(void)
 
 void fill_vsx(uint64_t *pt)
 {
-	asm volatile(
-	    "lis	3, 0		\n"
+	asm volatile("lis	3, 0		\n"
 
-	    "lxvd2x	0, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	1, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	2, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	3, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	4, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	5, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	6, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	7, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	8, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	9, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	0, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	1, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	2, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	3, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	4, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	5, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	6, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	7, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	8, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	9, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "lxvd2x	10, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	11, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	12, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	13, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	14, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	15, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	16, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	17, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	18, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	19, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	10, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	11, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	12, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	13, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	14, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	15, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	16, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	17, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	18, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	19, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "lxvd2x	20, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	21, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	22, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	23, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	24, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	25, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	26, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	27, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	28, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	29, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	20, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	21, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	22, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	23, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	24, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	25, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	26, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	27, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	28, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	29, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "lxvd2x	30, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	31, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	32, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	33, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	34, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	35, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	36, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	37, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	38, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	39, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	30, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	31, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	32, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	33, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	34, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	35, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	36, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	37, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	38, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	39, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "lxvd2x	40, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	41, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	42, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	43, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	44, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	45, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	46, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	47, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	48, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	49, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	40, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	41, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	42, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	43, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	44, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	45, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	46, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	47, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	48, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	49, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "lxvd2x	50, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	51, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	52, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	53, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	54, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	55, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	56, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	57, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	58, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	59, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	50, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	51, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	52, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	53, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	54, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	55, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	56, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	57, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	58, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	59, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "lxvd2x	60, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	61, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	62, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "lxvd2x	63, 3, %0	\n"
-	    : /* no output */
-	    : "r" (pt)
-	    : "3");
+		     "lxvd2x	60, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	61, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	62, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "lxvd2x	63, 3, %0	\n"
+		     : /* no output */
+		     : "r"(pt)
+		     : "3");
 }
 
 void read_vsx(uint64_t *pt)
 {
-	asm volatile(
-	    "lis	3, 0		\n"
+	asm volatile("lis	3, 0		\n"
 
-	    "stxvd2x	0, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	1, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	2, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	3, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	4, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	5, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	6, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	7, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	8, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	9, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	0, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	1, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	2, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	3, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	4, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	5, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	6, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	7, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	8, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	9, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "stxvd2x	10, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	11, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	12, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	13, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	14, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	15, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	16, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	17, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	18, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	19, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	10, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	11, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	12, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	13, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	14, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	15, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	16, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	17, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	18, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	19, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "stxvd2x	20, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	21, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	22, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	23, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	24, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	25, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	26, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	27, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	28, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	29, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	20, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	21, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	22, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	23, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	24, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	25, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	26, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	27, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	28, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	29, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "stxvd2x	30, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	31, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	32, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	33, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	34, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	35, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	36, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	37, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	38, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	39, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	30, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	31, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	32, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	33, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	34, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	35, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	36, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	37, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	38, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	39, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "stxvd2x	40, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	41, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	42, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	43, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	44, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	45, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	46, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	47, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	48, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	49, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	40, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	41, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	42, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	43, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	44, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	45, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	46, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	47, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	48, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	49, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "stxvd2x	50, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	51, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	52, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	53, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	54, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	55, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	56, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	57, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	58, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	59, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	50, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	51, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	52, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	53, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	54, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	55, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	56, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	57, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	58, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	59, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
 
-	    "stxvd2x	60, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	61, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	62, 3, %0	\n"
-	    "addi	3, 3, 16	\n" /* move to the next qword */
-	    "stxvd2x	63, 3, %0	\n"
+		     "stxvd2x	60, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	61, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	62, 3, %0	\n"
+		     "addi	3, 3, 16	\n" /* move to the next qword */
+		     "stxvd2x	63, 3, %0	\n"
 
-	    : /* no output */
-	    : "r" (pt)
-	    : "3");
+		     : /* no output */
+		     : "r"(pt)
+		     : "3");
 }
 
 int main(int argc, char *argv[])
 {
 	/* A random buffer of 1024 bytes (64 * 128bit registers to fill) */
-	static const char ibuffer[128/8*64]=
-		"sahwoleiGun9loosliz0Aech9aiph5eiIengei7Ogh8zu7ye"
-		"Aeshie6vai0thaehool1ooK6ayaj3Neitahn8yeeh5ahfuiT"
-		"uCeir1bife4ieceema8choo2Wengaec1seDaidohteipa4ai"
-		"aequee7AiriejaeJar1giak8Gei2uathloh5uemaeG6EiSoo"
-		"PhaenaethoPhej8nEecheegeihosho8Zohroo8ea6Juuheif"
-		"nu2Hahvai1tuf0Zeeeveephu2EitaexiVaekieboac7Nushu"
-		"aeTh6Quoo3iozeisaudaGheed0aPah2Schoog0eiChaeN5su"
-		"xoo1phoic1mahXohSai1thoogo0oesooeaxai7eBahHahMue"
-		"quiloh2ooPahpiujeithae0Dau0shuwicobinaaYooj0ajiw"
-		"iiheeS4awoh3haevlaiGe8phaev3eiluaChaF6ieng4aith4"
-		"aif3TooYo1aigoomZiuhai8eesoo4maiLahr3PoM8Eir5ooz"
-		"Iequ9ahre4Op4bahaiso6ohnah8Shokimooch1Oafahf5aih"
-		"xohphee1pi5Iecaiaigh7Eisah2uew5acie7wi6Zo0Eelah9"
-		"woi8QueerohfeiThaBoh5jaic3peiPohAhng0bu5shoop7ca"
-		"Qui5kodaika8quioahmohreeVe8loquaeeLi5ze3oceiHa0l"
-		"roh8Ooxae7uish9ioog7ieS3aibeo2thOosiuvaiS5lohp4U"
-		"emieG0eit6Bien8EzaiwiTh3geighaexshee8eHiec1TooH2"
-		"Eeceacai0inaejieboo8NeishieweiraHooj9apeecooy0th"
-		"daThei6aexeisahdsei3keik0diPheejchais6ezo0iep5Ae"
-		"Wiqu6aepeing4ba8diek3aev9waYooveAebai9eef6Iex6vo"
-		"Quee9MeitahMighoHuo3seveeMoh3ohtoxaib6ootaiF5EeT"
-		"Ohb9eijoonoh6ich";
-	char obuffer[128/8*64];
+	static const char ibuffer[128 / 8 * 64] = "sahwoleiGun9loosliz0Aech9aiph5eiIengei7Ogh8zu7ye"
+						  "Aeshie6vai0thaehool1ooK6ayaj3Neitahn8yeeh5ahfuiT"
+						  "uCeir1bife4ieceema8choo2Wengaec1seDaidohteipa4ai"
+						  "aequee7AiriejaeJar1giak8Gei2uathloh5uemaeG6EiSoo"
+						  "PhaenaethoPhej8nEecheegeihosho8Zohroo8ea6Juuheif"
+						  "nu2Hahvai1tuf0Zeeeveephu2EitaexiVaekieboac7Nushu"
+						  "aeTh6Quoo3iozeisaudaGheed0aPah2Schoog0eiChaeN5su"
+						  "xoo1phoic1mahXohSai1thoogo0oesooeaxai7eBahHahMue"
+						  "quiloh2ooPahpiujeithae0Dau0shuwicobinaaYooj0ajiw"
+						  "iiheeS4awoh3haevlaiGe8phaev3eiluaChaF6ieng4aith4"
+						  "aif3TooYo1aigoomZiuhai8eesoo4maiLahr3PoM8Eir5ooz"
+						  "Iequ9ahre4Op4bahaiso6ohnah8Shokimooch1Oafahf5aih"
+						  "xohphee1pi5Iecaiaigh7Eisah2uew5acie7wi6Zo0Eelah9"
+						  "woi8QueerohfeiThaBoh5jaic3peiPohAhng0bu5shoop7ca"
+						  "Qui5kodaika8quioahmohreeVe8loquaeeLi5ze3oceiHa0l"
+						  "roh8Ooxae7uish9ioog7ieS3aibeo2thOosiuvaiS5lohp4U"
+						  "emieG0eit6Bien8EzaiwiTh3geighaexshee8eHiec1TooH2"
+						  "Eeceacai0inaejieboo8NeishieweiraHooj9apeecooy0th"
+						  "daThei6aexeisahdsei3keik0diPheejchais6ezo0iep5Ae"
+						  "Wiqu6aepeing4ba8diek3aev9waYooveAebai9eef6Iex6vo"
+						  "Quee9MeitahMighoHuo3seveeMoh3ohtoxaib6ootaiF5EeT"
+						  "Ohb9eijoonoh6ich";
+	char obuffer[128 / 8 * 64];
 	int do_test;
 
 	test_init(argc, argv);
diff --git a/test/zdtm/static/vt.c b/test/zdtm/static/vt.c
index 6c96fceba..08490584a 100644
--- a/test/zdtm/static/vt.c
+++ b/test/zdtm/static/vt.c
@@ -9,16 +9,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check c/r of a virtual terminal";
-const char *test_author	= "Ruslan Kuprieiev <kupruser@gmail.com>";
+const char *test_doc = "Check c/r of a virtual terminal";
+const char *test_author = "Ruslan Kuprieiev <kupruser@gmail.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
 #ifdef __s390x__
-#define MINOR	65 /* ttysclp0 */
+#define MINOR 65 /* ttysclp0 */
 #else
-#define MINOR	5
+#define MINOR 5
 #endif
 
 int main(int argc, char **argv)
@@ -53,9 +53,7 @@ int main(int argc, char **argv)
 	}
 
 	if (st1.st_rdev != st2.st_rdev) {
-		fail("Virtual terminal rdev mismatch %x != %x on %s",
-		     (int)st1.st_rdev, (int)st2.st_rdev,
-		     filename);
+		fail("Virtual terminal rdev mismatch %x != %x on %s", (int)st1.st_rdev, (int)st2.st_rdev, filename);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/wait00.c b/test/zdtm/static/wait00.c
index e16cd5bd7..f2e561742 100644
--- a/test/zdtm/static/wait00.c
+++ b/test/zdtm/static/wait00.c
@@ -8,10 +8,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "See if we can wait() for a child after migration";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "See if we can wait() for a child after migration";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int ret;
 	pid_t pid;
diff --git a/test/zdtm/static/write_read00.c b/test/zdtm/static/write_read00.c
index 2b7bdd4ad..86ec99c74 100644
--- a/test/zdtm/static/write_read00.c
+++ b/test/zdtm/static/write_read00.c
@@ -5,13 +5,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Write file before migration, read after";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Write file before migration, read after";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	uint32_t crc;
diff --git a/test/zdtm/static/write_read01.c b/test/zdtm/static/write_read01.c
index abb481117..866067c4b 100644
--- a/test/zdtm/static/write_read01.c
+++ b/test/zdtm/static/write_read01.c
@@ -5,13 +5,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Write and half way read file before migration, complete after";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Write and half way read file before migration, complete after";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd;
 	int len;
diff --git a/test/zdtm/static/write_read02.c b/test/zdtm/static/write_read02.c
index 59ff4ce2f..09b9e5e6d 100644
--- a/test/zdtm/static/write_read02.c
+++ b/test/zdtm/static/write_read02.c
@@ -5,13 +5,13 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Write file half way before migration, complete and read after";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Write file half way before migration, complete and read after";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd, fd1;
 	int len, full_len;
diff --git a/test/zdtm/static/write_read10.c b/test/zdtm/static/write_read10.c
index f4ef9bb16..fff4b8f95 100644
--- a/test/zdtm/static/write_read10.c
+++ b/test/zdtm/static/write_read10.c
@@ -8,15 +8,15 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Open r/w and unlink file, and fork before migration;\n"
-			  "check that the child can write to it and the parent\n"
-			  "can read from it after migration";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Open r/w and unlink file, and fork before migration;\n"
+		       "check that the child can write to it and the parent\n"
+		       "can read from it after migration";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int fd, child_fd, ret;
 	pid_t pid;
@@ -51,7 +51,7 @@ int main(int argc, char ** argv)
 		exit(1);
 	}
 
-	if (pid == 0) {	/* child writes to the unlinked file and returns */
+	if (pid == 0) { /* child writes to the unlinked file and returns */
 		close(fd);
 		task_waiter_complete_current(&t);
 		test_waitsig();
@@ -109,15 +109,13 @@ int main(int argc, char ** argv)
 		goto out;
 	}
 
-
 	if (close(fd)) {
 		fail("close failed");
 		goto out_noclose;
 	}
 
 	if (unlink(filename) != -1 || errno != ENOENT) {
-		fail("file %s should have been deleted before migration: unlink",
-				filename);
+		fail("file %s should have been deleted before migration: unlink", filename);
 		goto out_noclose;
 	}
 
diff --git a/test/zdtm/static/xids00.c b/test/zdtm/static/xids00.c
index 0e8f324f6..4831d9a37 100644
--- a/test/zdtm/static/xids00.c
+++ b/test/zdtm/static/xids00.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that environment didn't change";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Check that environment didn't change";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 int main(int argc, char **argv)
 {
@@ -86,8 +86,8 @@ int main(int argc, char **argv)
 			pr_perror("Unable to wait P2 %d", pid);
 			exit(3);
 		} else if (!WIFEXITED(stat) || WEXITSTATUS(stat)) {
-			pr_perror("P2 stat %d/%d/%d/%d", WIFEXITED(stat), WEXITSTATUS(stat),
-							WIFSIGNALED(stat), WTERMSIG(stat));
+			pr_perror("P2 stat %d/%d/%d/%d", WIFEXITED(stat), WEXITSTATUS(stat), WIFSIGNALED(stat),
+				  WTERMSIG(stat));
 			exit(3);
 		}
 
@@ -112,8 +112,8 @@ int main(int argc, char **argv)
 			pr_perror("Unable to wait %d", pids[i]);
 			fail = 1;
 		} else if (!WIFEXITED(stat) || WEXITSTATUS(stat)) {
-			pr_perror("P%d stat %d/%d/%d/%d", i, WIFEXITED(stat), WEXITSTATUS(stat),
-							WIFSIGNALED(stat), WTERMSIG(stat));
+			pr_perror("P%d stat %d/%d/%d/%d", i, WIFEXITED(stat), WEXITSTATUS(stat), WIFSIGNALED(stat),
+				  WTERMSIG(stat));
 			fail = 1;
 		}
 	}
diff --git a/test/zdtm/static/zombie00.c b/test/zdtm/static/zombie00.c
index def2c8892..c40efcadc 100644
--- a/test/zdtm/static/zombie00.c
+++ b/test/zdtm/static/zombie00.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "See if we can wait() for a zombified child after migration";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "See if we can wait() for a zombified child after migration";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
 struct zombie {
 	int pid;
@@ -17,9 +17,9 @@ struct zombie {
 	int exitcode;
 };
 
-#define NR_ZOMBIES	4
+#define NR_ZOMBIES 4
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	int i, status;
 	struct zombie zombie[NR_ZOMBIES];
@@ -56,8 +56,7 @@ int main(int argc, char ** argv)
 			_exit(13); /* just in case */
 		}
 
-		test_msg("kid %d will %d/%d\n", zombie[i].pid,
-				zombie[i].exited, zombie[i].exitcode);
+		test_msg("kid %d will %d/%d\n", zombie[i].pid, zombie[i].exited, zombie[i].exitcode);
 	}
 
 	/*
diff --git a/test/zdtm/static/zombie01.c b/test/zdtm/static/zombie01.c
index 6e904c047..8cdb5bf4e 100644
--- a/test/zdtm/static/zombie01.c
+++ b/test/zdtm/static/zombie01.c
@@ -8,8 +8,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check that zombie pgid is restored";
-const char *test_author	= "Kirill Tkhai <ktkhai@virtuozzo.com>";
+const char *test_doc = "Check that zombie pgid is restored";
+const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 int main(int argc, char **argv)
 {
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 			fail("setpgid");
 			exit(1);
 		}
-		pid = sys_clone_unified(CLONE_PARENT|SIGCHLD, NULL, NULL, NULL, 0);
+		pid = sys_clone_unified(CLONE_PARENT | SIGCHLD, NULL, NULL, NULL, 0);
 		if (pid < 0) {
 			fail("fork");
 			exit(1);
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (waitid(P_ALL, 0, &info, WEXITED|WNOWAIT) < 0) {
+	if (waitid(P_ALL, 0, &info, WEXITED | WNOWAIT) < 0) {
 		fail("waitpid");
 		exit(1);
 	}
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	if (waitid(P_ALL, 0, &info, WEXITED|WNOWAIT) < 0) {
+	if (waitid(P_ALL, 0, &info, WEXITED | WNOWAIT) < 0) {
 		fail("waitpid");
 		exit(1);
 	}
diff --git a/test/zdtm/static/zombie_leader.c b/test/zdtm/static/zombie_leader.c
index 1928687cd..e835ba689 100644
--- a/test/zdtm/static/zombie_leader.c
+++ b/test/zdtm/static/zombie_leader.c
@@ -7,8 +7,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Check non-empty session with zombie leader";
-const char *test_author	= "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+const char *test_doc = "Check non-empty session with zombie leader";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 
 int child(void)
 {
@@ -44,8 +44,7 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	cpid = (int *)mmap(NULL, sizeof(int), PROT_READ | PROT_WRITE,
-			   MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	cpid = (int *)mmap(NULL, sizeof(int), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
 	*cpid = 0;
 
 	pid = fork();
diff --git a/test/zdtm/transition/epoll.c b/test/zdtm/transition/epoll.c
index 098eeb1fd..fdd492ab2 100644
--- a/test/zdtm/transition/epoll.c
+++ b/test/zdtm/transition/epoll.c
@@ -13,9 +13,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "migrate application using epoll";
+const char *test_doc = "migrate application using epoll";
 
-#define MAX_SCALE	128
+#define MAX_SCALE 128
 
 enum child_exit_codes {
 	SUCCESS = 0,
@@ -25,11 +25,7 @@ enum child_exit_codes {
 	MAX_EXIT_CODE
 };
 
-static char *child_fail_reason[] = {
-	"Success",
-	"Can't get time",
-	"Can't write"
-};
+static char *child_fail_reason[] = { "Success", "Can't get time", "Can't write" };
 
 int scale = 13;
 TEST_OPTION(scale, int, "How many children should perform testing", 0);
@@ -58,7 +54,7 @@ static void run_child(int num)
 {
 	int fd = fds[num][1];
 	uint32_t crc = ~0;
-	size_t buf_size=512;
+	size_t buf_size = 512;
 	uint8_t buf[buf_size];
 	struct timeval tv;
 	struct timespec ts;
@@ -80,15 +76,15 @@ static void run_child(int num)
 		ts.tv_nsec = rand() % 999999999;
 		nanosleep(&ts, &ts);
 		if (write(fd, buf, buf_size) < 0 &&
-			(!stop /* signal SIGUSR2 NOT received */ ||
-				(errno != EINTR && errno != EPIPE))) {
+		    (!stop /* signal SIGUSR2 NOT received */ || (errno != EINTR && errno != EPIPE))) {
 			fail("child write");
 			rv = WRITEERROR;
 			goto out;
 		}
 	}
 	rv = SUCCESS;
-out:	close(fds[num][1]);
+out:
+	close(fds[num][1]);
 	exit(rv);
 }
 
@@ -97,11 +93,9 @@ int main(int argc, char **argv)
 	int rv, i;
 	int counter = 0;
 	int efd;
-	size_t buf_size=512;
+	size_t buf_size = 512;
 	char buf[buf_size];
-	struct epoll_event event = {
-		.events = EPOLLIN
-	}, *events;
+	struct epoll_event event = { .events = EPOLLIN }, *events;
 
 	test_init(argc, argv);
 
@@ -149,7 +143,7 @@ int main(int argc, char **argv)
 		pids[i] = rv;
 	}
 
-	if ((events = (struct epoll_event*) malloc (sizeof(struct epoll_event)*scale)) == NULL) {
+	if ((events = (struct epoll_event *)malloc(sizeof(struct epoll_event) * scale)) == NULL) {
 		pr_perror("Can't allocate memory");
 		killall();
 		exit(1);
@@ -164,7 +158,8 @@ int main(int argc, char **argv)
 			exit(1);
 		}
 		for (i = 0; i < rv; i++) {
-			while (read(events[i].data.fd, buf, buf_size) > 0);
+			while (read(events[i].data.fd, buf, buf_size) > 0)
+				;
 			if (errno != EAGAIN && errno != 0 && errno) {
 				pr_perror("read error");
 				killall();
@@ -184,8 +179,7 @@ int main(int argc, char **argv)
 		} else {
 			rv = WEXITSTATUS(rv);
 			if (rv < MAX_EXIT_CODE && rv > SUCCESS) {
-				fail("Child failed: %s (%d)",
-						child_fail_reason[rv], rv);
+				fail("Child failed: %s (%d)", child_fail_reason[rv], rv);
 				counter++;
 			} else if (rv != SUCCESS) {
 				fail("Unknown exitcode from child: %d", rv);
diff --git a/test/zdtm/transition/fifo_dyn.c b/test/zdtm/transition/fifo_dyn.c
index d72e1e6cd..09f337536 100644
--- a/test/zdtm/transition/fifo_dyn.c
+++ b/test/zdtm/transition/fifo_dyn.c
@@ -12,10 +12,10 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "dynamic FIFO test";
+const char *test_doc = "dynamic FIFO test";
 
-#define PROCS_DEF	2 /* 0 - parent, 1 - child */
-#define BUF_SIZE	256
+#define PROCS_DEF 2 /* 0 - parent, 1 - child */
+#define BUF_SIZE  256
 unsigned int num_procs = PROCS_DEF;
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
@@ -70,8 +70,7 @@ int main(int argc, char **argv)
 
 		if (pipe_in2out(readfd, writefd, buf, sizeof(buf)) < 0)
 			/* pass errno as exit code to the parent */
-			if (test_go() /* signal NOT delivered */ ||
-					(errno != EINTR && errno != EPIPE))
+			if (test_go() /* signal NOT delivered */ || (errno != EINTR && errno != EPIPE))
 				ret = errno;
 		close(readfd);
 		close(writefd);
@@ -138,8 +137,7 @@ int main(int argc, char **argv)
 	wait(&chret);
 	chret = WEXITSTATUS(chret);
 	if (chret) {
-		fail("child exited with non-zero code %d (%s)",
-			chret, strerror(chret));
+		fail("child exited with non-zero code %d (%s)", chret, strerror(chret));
 		return 1;
 	}
 	if (!ret)
diff --git a/test/zdtm/transition/fifo_loop.c b/test/zdtm/transition/fifo_loop.c
index 51f93f645..a8f5e79be 100644
--- a/test/zdtm/transition/fifo_loop.c
+++ b/test/zdtm/transition/fifo_loop.c
@@ -12,12 +12,14 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Multi-process fifo loop";
-#define BUF_SIZE	256
-#define PROCS_DEF	4
+const char *test_doc = "Multi-process fifo loop";
+#define BUF_SIZE  256
+#define PROCS_DEF 4
 unsigned int num_procs = PROCS_DEF;
-TEST_OPTION(num_procs, uint, "# processes to create "
-	"(default " __stringify(PROCS_DEF) ")", 0);
+TEST_OPTION(num_procs, uint,
+	    "# processes to create "
+	    "(default " __stringify(PROCS_DEF) ")",
+	    0);
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
@@ -60,7 +62,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		pid = test_fork();
 		if (pid < 0) {
 			pr_perror("Can't fork");
@@ -71,16 +73,14 @@ int main(int argc, char **argv)
 			file_path = path[i - 1];
 			readfd = open(file_path, O_RDONLY);
 			if (readfd < 0) {
-				pr_perror("open(%s, O_RDONLY) failed",
-					file_path);
+				pr_perror("open(%s, O_RDONLY) failed", file_path);
 				ret = errno;
 				return ret;
 			}
 			file_path = path[i];
 			writefd = open(file_path, O_WRONLY);
 			if (writefd < 0) {
-				pr_perror("open(%s, O_WRONLY) failed",
-					file_path);
+				pr_perror("open(%s, O_WRONLY) failed", file_path);
 				ret = errno;
 				return ret;
 			}
@@ -95,8 +95,7 @@ int main(int argc, char **argv)
 			signal(SIGPIPE, SIG_IGN);
 			if (pipe_in2out(readfd, writefd, buf, sizeof(buf)) < 0)
 				/* pass errno as exit code to the parent */
-				if (test_go() /* signal NOT delivered */ ||
-						(errno != EINTR && errno != EPIPE))
+				if (test_go() /* signal NOT delivered */ || (errno != EINTR && errno != EPIPE))
 					ret = errno;
 			close(readfd);
 			close(writefd);
@@ -181,11 +180,11 @@ int main(int argc, char **argv)
 
 	if (kill(0, SIGTERM)) {
 		fail("failed to send SIGTERM to my process group");
-		return 1;	/* shouldn't wait() in this case */
+		return 1; /* shouldn't wait() in this case */
 	}
 	close(readfd);
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		int chret;
 		if (waitpid(pids[i], &chret, 0) < 0) {
 			fail("waitpid error");
@@ -195,8 +194,7 @@ int main(int argc, char **argv)
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child %d exited with non-zero code %d (%s)",
-				i, chret, strerror(chret));
+			fail("child %d exited with non-zero code %d (%s)", i, chret, strerror(chret));
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/file_aio.c b/test/zdtm/transition/file_aio.c
index 4a76c9390..74146c918 100644
--- a/test/zdtm/transition/file_aio.c
+++ b/test/zdtm/transition/file_aio.c
@@ -1,6 +1,6 @@
 #include "zdtmtst.h"
 
-const char *test_doc    = "test for AIO";
+const char *test_doc = "test for AIO";
 const char *test_author = "Andrew Vagin <avagin@parallels.com>";
 
 #include <stdio.h>
@@ -20,8 +20,8 @@ int main(int argc, char **argv)
 	char buf[BUF_SIZE];
 	int fd;
 	struct aiocb aiocb;
-	const struct aiocb   *aioary[1];
-	char tmpfname[256]="/tmp/file_aio.XXXXXX";
+	const struct aiocb *aioary[1];
+	char tmpfname[256] = "/tmp/file_aio.XXXXXX";
 	int ret;
 
 	test_init(argc, argv);
@@ -62,10 +62,10 @@ int main(int argc, char **argv)
 		}
 		/* Wait for request completion */
 		aioary[0] = &aiocb;
-again:
+	again:
 		ret = aio_suspend(aioary, 1, NULL);
 		if (ret < 0) {
-			if ((errno == EINTR) && (! test_go()))
+			if ((errno == EINTR) && (!test_go()))
 				break;
 			if (errno != EINTR) {
 				pr_perror("aio_suspend failed");
diff --git a/test/zdtm/transition/file_read.c b/test/zdtm/transition/file_read.c
index 9b5670c65..7729e9f61 100644
--- a/test/zdtm/transition/file_read.c
+++ b/test/zdtm/transition/file_read.c
@@ -11,12 +11,12 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Fill/read file continuously to check"
-			"it's migrated at the right moment";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Fill/read file continuously to check"
+		       "it's migrated at the right moment";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define MAX_SCALE	128
-#define FILE_SIZE	(16 * 1024)
+#define MAX_SCALE 128
+#define FILE_SIZE (16 * 1024)
 
 enum kids_exit_codes {
 	SUCCESS = 0,
@@ -31,16 +31,14 @@ enum kids_exit_codes {
 	MAX_EXIT_CODE_VAL
 };
 
-static char *kids_fail_reasons[] = {
-	"Success",
-	/* 1 */ "File corrupted",
-	/* 2 */ "Map failed",
-	/* 3 */ "Open (create) failed",
-	/* 4 */ "Write failed",
-	/* 5 */ "Read failed",
-	/* 6 */ "Fsync failed",
-	/* 7 */ "Lseek failed"
-};
+static char *kids_fail_reasons[] = { "Success",
+				     /* 1 */ "File corrupted",
+				     /* 2 */ "Map failed",
+				     /* 3 */ "Open (create) failed",
+				     /* 4 */ "Write failed",
+				     /* 5 */ "Read failed",
+				     /* 6 */ "Fsync failed",
+				     /* 7 */ "Lseek failed" };
 
 int scale = 13;
 TEST_OPTION(scale, int, "How many children should perform testing", 0);
@@ -120,8 +118,7 @@ static void chew_some_file(int num)
 	int fd, rv;
 	char chew_file[PATH_MAX];
 
-	buf = mmap(NULL, FILE_SIZE, PROT_READ | PROT_WRITE,
-			MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	buf = mmap(NULL, FILE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 	rv = MMAP_FAILED;
 	if (buf == MAP_FAILED)
 		goto out_exit;
@@ -157,8 +154,7 @@ static void chew_some_file(int num)
 		case -2:
 			rv = SEEK_FAILED;
 			goto out_exit;
-		case 1:
-			{
+		case 1: {
 			int fd1;
 			char str[PATH_MAX];
 
@@ -170,7 +166,7 @@ static void chew_some_file(int num)
 				pr_perror("can't write %s", str);
 			close(fd1);
 			goto out_exit;
-			}
+		}
 		}
 	}
 	rv = SUCCESS;
@@ -227,8 +223,7 @@ int main(int argc, char **argv)
 		} else {
 			rv = WEXITSTATUS(rv);
 			if (rv < MAX_EXIT_CODE_VAL && rv > SUCCESS) {
-				fail("Kid failed: %s (%d)",
-						kids_fail_reasons[rv], rv);
+				fail("Kid failed: %s (%d)", kids_fail_reasons[rv], rv);
 				counter++;
 			} else if (rv != SUCCESS) {
 				fail("Unknown exitcode from kid: %d", rv);
diff --git a/test/zdtm/transition/fork.c b/test/zdtm/transition/fork.c
index 9ab160599..4f0049a29 100644
--- a/test/zdtm/transition/fork.c
+++ b/test/zdtm/transition/fork.c
@@ -86,7 +86,6 @@ int main(int argc, char **argv)
 				goto out;
 			}
 		}
-
 	}
 	pass();
 out:
diff --git a/test/zdtm/transition/ipc.c b/test/zdtm/transition/ipc.c
index be52d7396..0f16dbc68 100644
--- a/test/zdtm/transition/ipc.c
+++ b/test/zdtm/transition/ipc.c
@@ -14,8 +14,8 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc="Tests ipc sems and shmems migrate fine";
-const char *test_author="Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Tests ipc sems and shmems migrate fine";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 static struct sembuf unlock = {
 	.sem_op = 1,
@@ -29,13 +29,13 @@ static struct sembuf lock = {
 	.sem_flg = 0,
 };
 
-#define DEF_MEM_SIZE	(40960)
+#define DEF_MEM_SIZE (40960)
 unsigned int shmem_size = DEF_MEM_SIZE;
 TEST_OPTION(shmem_size, uint, "Size of shared memory segment", 0);
 
-#define INIT_CRC	(~0)
+#define INIT_CRC (~0)
 
-#define POISON		0xac
+#define POISON 0xac
 static inline void poison_area(int *mem)
 {
 	memset(mem, POISON, shmem_size);
@@ -68,7 +68,8 @@ static int child(key_t key)
 		}
 		crc = INIT_CRC;
 		datagen(mem, shmem_size, &crc);
-		while ((ret = semop(sem, &unlock, 1)) && (errno == EINTR));
+		while ((ret = semop(sem, &unlock, 1)) && (errno == EINTR))
+			;
 		if (ret) {
 			fail("Error in semop unlock");
 			res = errno;
@@ -97,7 +98,7 @@ int main(int argc, char **argv)
 	}
 
 	sem = semget(key, 1, 0777 | IPC_CREAT | IPC_EXCL);
-	if (sem  == -1) {
+	if (sem == -1) {
 		pr_perror("Can't get sem");
 		goto out;
 	}
@@ -154,13 +155,14 @@ int main(int argc, char **argv)
 			if (datachk(mem, shmem_size, &crc)) {
 				fail_count++;
 				fail("Semaphore protection is broken or "
-						"shmem pages are messed");
+				     "shmem pages are messed");
 				semop(sem, &unlock, 1);
 				break;
 			}
 			poison_area((int *)mem);
 		}
-		while ((ret = semop(sem, &unlock, 1)) && (errno == EINTR));
+		while ((ret = semop(sem, &unlock, 1)) && (errno == EINTR))
+			;
 		if (ret) {
 			fail_count++;
 			fail("Error in semop unlock");
diff --git a/test/zdtm/transition/lazy-thp.c b/test/zdtm/transition/lazy-thp.c
index 01075d773..2bf99dc4c 100644
--- a/test/zdtm/transition/lazy-thp.c
+++ b/test/zdtm/transition/lazy-thp.c
@@ -13,12 +13,12 @@
 
 #define N_PAGES 1024
 
-const char *test_doc	= "Test interaction between THP and lazy-pages";
+const char *test_doc = "Test interaction between THP and lazy-pages";
 
 /* The test is based on example by Adrian Reber <areber@redhat.com> */
-const char *test_author	= "Mike Rapoport <rppt@linux.vnet.ibm.com>";
+const char *test_author = "Mike Rapoport <rppt@linux.vnet.ibm.com>";
 
-int main(int argc, char ** argv)
+int main(int argc, char **argv)
 {
 	char *mem, *org, *m;
 	int count;
@@ -44,7 +44,7 @@ int main(int argc, char ** argv)
 		}
 
 		for (count = 0; count < N_PAGES; count++) {
-			m = mem+(count*PAGE_SIZE);
+			m = mem + (count * PAGE_SIZE);
 			org[128] = (count % 2 == 0) ? count : 0x42;
 
 			if (memcmp(org, m, PAGE_SIZE)) {
diff --git a/test/zdtm/transition/maps007.c b/test/zdtm/transition/maps007.c
index ee5e7c7f7..8a605cfe0 100644
--- a/test/zdtm/transition/maps007.c
+++ b/test/zdtm/transition/maps007.c
@@ -15,12 +15,12 @@
 #define MAP_SIZE (1UL << 20)
 #define MEM_SIZE (1UL << 29)
 
-const char *test_doc	= "create random mappings and touch memory";
+const char *test_doc = "create random mappings and touch memory";
 
 int sys_process_vm_readv(pid_t pid, void *addr, void *buf, int size)
 {
-	struct iovec lvec = {.iov_base = buf, .iov_len = size };
-	struct iovec rvec = {.iov_base = addr, .iov_len = size };
+	struct iovec lvec = { .iov_base = buf, .iov_len = size };
+	struct iovec rvec = { .iov_base = addr, .iov_len = size };
 	/* workaround bug in glibc with sixth argument of syscall */
 	char nop[PAGE_SIZE];
 
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 	struct {
 		futex_t delta;
 		futex_t stop;
-	} *shm;
+	} * shm;
 	uint32_t v;
 	unsigned long long count = 0;
 	int i;
@@ -84,8 +84,7 @@ int main(int argc, char **argv)
 				/* shm->delta must be always bigger than MAX_DELTA */
 				futex_wait_while_lt(&shm->delta, MAX_DELTA + 2);
 			else if (count % 100 == 0)
-				test_msg("count %llu delta %d\n",
-						count, futex_get(&shm->delta)); /* heartbeat */
+				test_msg("count %llu delta %d\n", count, futex_get(&shm->delta)); /* heartbeat */
 
 			if (futex_get(&shm->stop) && atomic_get(&shm->delta.raw) == MAX_DELTA)
 				break;
@@ -173,6 +172,6 @@ int main(int argc, char **argv)
 	return 0;
 err:
 	kill(child, SIGSEGV);
-	*((volatile int *) 0) = 0;
+	*((volatile int *)0) = 0;
 	return 1;
 }
diff --git a/test/zdtm/transition/maps008.c b/test/zdtm/transition/maps008.c
index 851814c11..e5aa236ef 100644
--- a/test/zdtm/transition/maps008.c
+++ b/test/zdtm/transition/maps008.c
@@ -62,8 +62,7 @@ static void cont_and_wait_child(pid_t pid)
 
 static void *mmap_ashmem(size_t size)
 {
-	void *mem = mmap(NULL, size, PROT_WRITE | PROT_READ,
-			MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	void *mem = mmap(NULL, size, PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 	if (mem == MAP_FAILED) {
 		pr_perror("Can't map shmem %zx", size);
 		exit(1);
@@ -71,15 +70,13 @@ static void *mmap_ashmem(size_t size)
 	return mem;
 }
 
-static void *mmap_proc_mem(pid_t pid, unsigned long addr,
-		unsigned long size)
+static void *mmap_proc_mem(pid_t pid, unsigned long addr, unsigned long size)
 {
 	int fd;
 	void *mem;
 	char path[PATH_MAX];
 
-	snprintf(path, PATH_MAX, "/proc/%d/map_files/%lx-%lx",
-			(int)pid, addr, addr + size);
+	snprintf(path, PATH_MAX, "/proc/%d/map_files/%lx-%lx", (int)pid, addr, addr + size);
 	fd = open(path, O_RDWR);
 	if (fd == -1) {
 		pr_perror("Can't open file %s", path);
@@ -100,8 +97,7 @@ static void check_mem_eq(void *addr1, size_t size1, void *addr2, size_t size2)
 	unsigned long min_size = size1 < size2 ? size1 : size2;
 
 	if (memcmp(addr1, addr2, min_size)) {
-		pr_err("Mem differs %lx %lx %lx", (unsigned long)addr1,
-			(unsigned long)addr2, min_size);
+		pr_err("Mem differs %lx %lx %lx\n", (unsigned long)addr1, (unsigned long)addr2, min_size);
 		exit(1);
 	}
 }
@@ -114,8 +110,7 @@ static void xmunmap(void *map, size_t size)
 	}
 }
 
-static void chk_proc_mem_eq(pid_t pid1, void *addr1, unsigned long size1,
-		pid_t pid2, void *addr2, unsigned long size2)
+static void chk_proc_mem_eq(pid_t pid1, void *addr1, unsigned long size1, pid_t pid2, void *addr2, unsigned long size2)
 {
 	void *map1, *map2;
 
@@ -136,14 +131,14 @@ static void chk_proc_mem_eq(pid_t pid1, void *addr1, unsigned long size1,
  */
 #define PROC_CNT 7
 
-#define PROC1_PGIX 0
-#define PROC11_PGIX 1
-#define PROC12_PGIX 2
-#define PROC13_PGIX 3
+#define PROC1_PGIX   0
+#define PROC11_PGIX  1
+#define PROC12_PGIX  2
+#define PROC13_PGIX  3
 #define PROC111_PGIX 4
 #define PROC112_PGIX 5
 #define PROC131_PGIX 6
-#define ZERO_PGIX 7
+#define ZERO_PGIX    7
 /* unused pgix: 8 */
 #define MEM_PERIOD (9 * PAGE_SIZE)
 
@@ -278,12 +273,9 @@ static int proc13_func(task_waiter_t *setup_waiter)
 
 	mems_datachck_each_pgix(PROC13_PGIX);
 
-	chk_proc_mem_eq(pstree->proc13, mem1, mem1_size,
-		pstree->proc131, mem1, mem1_size);
-	chk_proc_mem_eq(pstree->proc13, mem2, mem2_size,
-		pstree->proc131, mem2, mem2_size);
-	chk_proc_mem_eq(pstree->proc13, mem3, mem3_size,
-		pstree->proc131, mem3, mem3_size);
+	chk_proc_mem_eq(pstree->proc13, mem1, mem1_size, pstree->proc131, mem1, mem1_size);
+	chk_proc_mem_eq(pstree->proc13, mem2, mem2_size, pstree->proc131, mem2, mem2_size);
+	chk_proc_mem_eq(pstree->proc13, mem3, mem3_size, pstree->proc131, mem3, mem3_size);
 
 	cont_and_wait_child(pstree->proc131);
 	return 0;
@@ -368,23 +360,16 @@ static int proc11_func(task_waiter_t *setup_waiter)
 
 	mems_datachck_each_pgix(PROC11_PGIX);
 
-	chk_proc_mem_eq(pstree->proc11, mem1, mem1_size,
-		pstree->proc111, mem1, mem1_size);
-	chk_proc_mem_eq(pstree->proc11, mem1, mem1_size,
-		pstree->proc112, mem1, mem1_size);
+	chk_proc_mem_eq(pstree->proc11, mem1, mem1_size, pstree->proc111, mem1, mem1_size);
+	chk_proc_mem_eq(pstree->proc11, mem1, mem1_size, pstree->proc112, mem1, mem1_size);
 
-	chk_proc_mem_eq(pstree->proc11, mem2, mem2_size,
-		pstree->proc111, mem2, mem2_size);
-	chk_proc_mem_eq(pstree->proc11, mem2, mem2_size,
-		pstree->proc112, mem2, mem2_size);
+	chk_proc_mem_eq(pstree->proc11, mem2, mem2_size, pstree->proc111, mem2, mem2_size);
+	chk_proc_mem_eq(pstree->proc11, mem2, mem2_size, pstree->proc112, mem2, mem2_size);
 
-	chk_proc_mem_eq(pstree->proc11, mem3, mem3_size,
-		pstree->proc111, mem3, mem3_size + MEM3_END_CUT);
-	chk_proc_mem_eq(pstree->proc11, mem3, mem3_size,
-		pstree->proc112, mem3, mem3_size + MEM3_END_CUT);
+	chk_proc_mem_eq(pstree->proc11, mem3, mem3_size, pstree->proc111, mem3, mem3_size + MEM3_END_CUT);
+	chk_proc_mem_eq(pstree->proc11, mem3, mem3_size, pstree->proc112, mem3, mem3_size + MEM3_END_CUT);
 
-	proc1_mem3 = mmap_proc_mem(pstree->proc1,
-			(unsigned long)mem3_old, mem3_size_old);
+	proc1_mem3 = mmap_proc_mem(pstree->proc1, (unsigned long)mem3_old, mem3_size_old);
 	check_mem_eq(mem3, mem3_size, proc1_mem3 + MEM3_START_CUT, mem3_size);
 	xmunmap(proc1_mem3, mem3_size_old);
 
@@ -394,7 +379,7 @@ static int proc11_func(task_waiter_t *setup_waiter)
 }
 
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MB(n) ((n) * (1UL << 20))
+#define MB(n)	  ((n) * (1UL << 20))
 
 static int proc1_func(void)
 {
@@ -423,8 +408,7 @@ static int proc1_func(void)
 	fork_and_setup(proc13_func);
 
 	xmunmap(mem1, mem1_size);
-	if (mremap(mem2, mem2_size, mem1_size, MREMAP_MAYMOVE | MREMAP_FIXED,
-				mem1) != mem1) {
+	if (mremap(mem2, mem2_size, mem1_size, MREMAP_MAYMOVE | MREMAP_FIXED, mem1) != mem1) {
 		pr_perror("proc1 mem2 remap");
 		exit(1);
 	}
@@ -441,13 +425,10 @@ static int proc1_func(void)
 
 	mems_datachck_each_pgix(PROC1_PGIX);
 
-	chk_proc_mem_eq(pstree->proc1, mem1, mem1_size,
-		pstree->proc11, mem2_old, mem2_size);
-	chk_proc_mem_eq(pstree->proc1, mem1, mem1_size,
-		pstree->proc12, mem2_old, mem2_size);
+	chk_proc_mem_eq(pstree->proc1, mem1, mem1_size, pstree->proc11, mem2_old, mem2_size);
+	chk_proc_mem_eq(pstree->proc1, mem1, mem1_size, pstree->proc12, mem2_old, mem2_size);
 
-	chk_proc_mem_eq(pstree->proc1, mem3, mem3_size,
-		pstree->proc12, mem3, mem3_size);
+	chk_proc_mem_eq(pstree->proc1, mem3, mem3_size, pstree->proc12, mem3, mem3_size);
 
 	cont_and_wait_child(pstree->proc11);
 	cont_and_wait_child(pstree->proc12);
@@ -490,10 +471,7 @@ static void sigchld_hand(int signo, siginfo_t *info, void *ucontext)
 
 int main(int argc, char **argv)
 {
-	struct sigaction sa = {
-		.sa_sigaction = sigchld_hand,
-		.sa_flags = SA_RESTART | SA_SIGINFO | SA_NOCLDSTOP
-	};
+	struct sigaction sa = { .sa_sigaction = sigchld_hand, .sa_flags = SA_RESTART | SA_SIGINFO | SA_NOCLDSTOP };
 	sigemptyset(&sa.sa_mask);
 
 	test_init(argc, argv);
diff --git a/test/zdtm/transition/netlink00.c b/test/zdtm/transition/netlink00.c
index 8e7d33c95..2bc4aebd3 100644
--- a/test/zdtm/transition/netlink00.c
+++ b/test/zdtm/transition/netlink00.c
@@ -25,14 +25,14 @@
 #undef DEBUG
 //#define DEBUG
 
-const char *test_doc    = "Netlink socket loop";
+const char *test_doc = "Netlink socket loop";
 const char *test_author = "Andrew Vagin (avagin@parallels.com)";
 
 //buffer to hold the RTNETLINK request
 struct {
-	struct nlmsghdr	nl;
-	struct rtmsg	rt;
-	char		buf[8192];
+	struct nlmsghdr nl;
+	struct rtmsg rt;
+	char buf[8192];
 } req;
 
 // variables used for
@@ -46,7 +46,7 @@ int rtn;
 // buffer to hold the RTNETLINK reply(ies)
 char buf[8192];
 char dsts[24] = "192.168.0.255";
-int pn = 32;//network prefix
+int pn = 32; //network prefix
 
 // RTNETLINK message pointers & lengths
 // used when processing messages
@@ -63,8 +63,7 @@ int form_request_del(void);
 int read_reply(void);
 typedef int (*cmd_t)(void);
 #define CMD_NUM 2
-cmd_t cmd[CMD_NUM]={form_request_add, form_request_del};
-
+cmd_t cmd[CMD_NUM] = { form_request_add, form_request_del };
 
 int main(int argc, char *argv[])
 {
@@ -73,7 +72,7 @@ int main(int argc, char *argv[])
 	test_init(argc, argv);
 
 	fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-	if (fd<0){
+	if (fd < 0) {
 		pr_perror("socket");
 		goto out;
 	}
@@ -82,7 +81,7 @@ int main(int argc, char *argv[])
 	bzero(&la, sizeof(la));
 	la.nl_family = AF_NETLINK;
 	la.nl_pid = getpid();
-	if (bind(fd, (struct sockaddr*) &la, sizeof(la))){
+	if (bind(fd, (struct sockaddr *)&la, sizeof(la))) {
 		pr_perror("bind failed");
 		goto out;
 	}
@@ -93,20 +92,20 @@ int main(int argc, char *argv[])
 
 	test_daemon();
 
-	while (test_go()){
-		for (i=0; i < CMD_NUM; i++){
+	while (test_go()) {
+		for (i = 0; i < CMD_NUM; i++) {
 			cmd[i]();
-			if (send_request() < 0){
+			if (send_request() < 0) {
 				fail("send_request failed");
 				goto out;
 			};
-			if (recv_reply() < 0){
+			if (recv_reply() < 0) {
 				fail("RTNETLINK answers");
 				goto out;
 			};
 
 #ifdef DEBUG
-			if (read_reply() < 0){
+			if (read_reply() < 0) {
 				fail("read_reply failed");
 				goto out;
 			}
@@ -129,17 +128,17 @@ int send_request(void)
 	// initialize & create the struct msghdr supplied
 	// to the sendmsg() function
 	bzero(&msg, sizeof(msg));
-	msg.msg_name = (void *) &pa;
+	msg.msg_name = (void *)&pa;
 	msg.msg_namelen = sizeof(pa);
 	// place the pointer & size of the RTNETLINK
 	// message in the struct msghdr
-	iov.iov_base = (void *) &req.nl;
+	iov.iov_base = (void *)&req.nl;
 	iov.iov_len = req.nl.nlmsg_len;
 	msg.msg_iov = &iov;
 	msg.msg_iovlen = 1;
 	// send the RTNETLINK message to kernel
 	rtn = sendmsg(fd, &msg, 0);
-	if (rtn<0){
+	if (rtn < 0) {
 		pr_perror("sendmsg failed");
 		return -1;
 	}
@@ -155,7 +154,7 @@ int recv_reply(void)
 	// read from the socket until the NLMSG_DONE is
 	// returned in the type of the RTNETLINK message
 	// or if it was a monitoring socket
-	while(1) {
+	while (1) {
 		rtn = recv(fd, p, sizeof(buf) - nll, 0);
 		if (rtn < 0) {
 			pr_perror("recv failed");
@@ -167,12 +166,12 @@ int recv_reply(void)
 			return -1;
 		}
 
-		nlp = (struct nlmsghdr *) p;
-		if(nlp->nlmsg_type == NLMSG_DONE)
+		nlp = (struct nlmsghdr *)p;
+		if (nlp->nlmsg_type == NLMSG_DONE)
 			return 0;
 		if (nlp->nlmsg_type == NLMSG_ERROR) {
-			struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(nlp);
-			errno=-err->error;
+			struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(nlp);
+			errno = -err->error;
 			if (errno) {
 				return -1;
 			}
@@ -184,8 +183,7 @@ int recv_reply(void)
 		// increment the total size by the size of
 		// the last received message
 		nll += rtn;
-		if((la.nl_groups & RTMGRP_IPV4_ROUTE)
-				== RTMGRP_IPV4_ROUTE)
+		if ((la.nl_groups & RTMGRP_IPV4_ROUTE) == RTMGRP_IPV4_ROUTE)
 			break;
 	}
 	return 0;
@@ -199,14 +197,13 @@ int read_reply(void)
 	// outer loop: loops thru all the NETLINK
 	// headers that also include the route entry
 	// header
-	nlp = (struct nlmsghdr *) buf;
-	for(; NLMSG_OK(nlp, nll); nlp = NLMSG_NEXT(nlp, nll))
-	{
+	nlp = (struct nlmsghdr *)buf;
+	for (; NLMSG_OK(nlp, nll); nlp = NLMSG_NEXT(nlp, nll)) {
 		// get route entry header
-		rtp = (struct rtmsg *) NLMSG_DATA(nlp);
+		rtp = (struct rtmsg *)NLMSG_DATA(nlp);
 		// we are only concerned about the
 		// main route table
-		if(rtp->rtm_table != RT_TABLE_MAIN)
+		if (rtp->rtm_table != RT_TABLE_MAIN)
 			continue;
 		// init all the strings
 		bzero(dsts, sizeof(dsts));
@@ -215,40 +212,33 @@ int read_reply(void)
 		bzero(ms, sizeof(ms));
 		// inner loop: loop thru all the attributes of
 		// one route entry
-		rtap = (struct rtattr *) RTM_RTA(rtp);
+		rtap = (struct rtattr *)RTM_RTA(rtp);
 		rtl = RTM_PAYLOAD(nlp);
-		for( ; RTA_OK(rtap, rtl); rtap = RTA_NEXT(rtap,rtl))
-		{
-			switch(rtap->rta_type)
-			{
-				// destination IPv4 address
-				case RTA_DST:
-					inet_ntop(AF_INET, RTA_DATA(rtap),
-							dsts, 24);
-					break;
-					// next hop IPv4 address
-				case RTA_GATEWAY:
-					inet_ntop(AF_INET, RTA_DATA(rtap),
-							gws, 24);
-					break;
-					// unique ID associated with the network
-					// interface
-				case RTA_OIF:
-					sprintf(ifs, "%d",
-							*((int *) RTA_DATA(rtap)));
-				default:
-					break;
+		for (; RTA_OK(rtap, rtl); rtap = RTA_NEXT(rtap, rtl)) {
+			switch (rtap->rta_type) {
+			// destination IPv4 address
+			case RTA_DST:
+				inet_ntop(AF_INET, RTA_DATA(rtap), dsts, 24);
+				break;
+				// next hop IPv4 address
+			case RTA_GATEWAY:
+				inet_ntop(AF_INET, RTA_DATA(rtap), gws, 24);
+				break;
+				// unique ID associated with the network
+				// interface
+			case RTA_OIF:
+				sprintf(ifs, "%d", *((int *)RTA_DATA(rtap)));
+			default:
+				break;
 			}
 		}
 		sprintf(ms, "%d", rtp->rtm_dst_len);
-		test_msg("dst %s/%s gw %s if %s\n",
-				dsts, ms, gws, ifs);
+		test_msg("dst %s/%s gw %s if %s\n", dsts, ms, gws, ifs);
 	}
 	return 0;
 }
 
-#define NLMSG_TAIL(nmsg) \
-        ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+#define NLMSG_TAIL(nmsg) ((struct rtattr *)(((void *)(nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 
 int form_request_del(void)
 {
@@ -258,8 +248,7 @@ int form_request_del(void)
 	rtap = NLMSG_TAIL(&req.nl);
 	rtap->rta_type = RTA_DST;
 	rtap->rta_len = RTA_LENGTH(4);
-	inet_pton(AF_INET, dsts,
-			((char *)rtap) + sizeof(struct rtattr));
+	inet_pton(AF_INET, dsts, ((char *)rtap) + sizeof(struct rtattr));
 	req.nl.nlmsg_len = NLMSG_ALIGN(req.nl.nlmsg_len) + RTA_ALIGN(rtap->rta_len);
 	req.nl.nlmsg_flags = NLM_F_CREATE | NLM_F_ACK | NLM_F_REQUEST;
 	req.nl.nlmsg_type = RTM_DELROUTE;
@@ -281,15 +270,13 @@ int form_request_add(void)
 	rtap = NLMSG_TAIL(&req.nl);
 	rtap->rta_type = RTA_DST;
 	rtap->rta_len = RTA_LENGTH(4);
-	inet_pton(AF_INET, dsts,
-			((char *)rtap) + sizeof(struct rtattr));
+	inet_pton(AF_INET, dsts, ((char *)rtap) + sizeof(struct rtattr));
 	req.nl.nlmsg_len = NLMSG_ALIGN(req.nl.nlmsg_len) + RTA_ALIGN(rtap->rta_len);
 
 	rtap = NLMSG_TAIL(&req.nl);
-	rtap->rta_type = RTA_OIF;//Output interface index
+	rtap->rta_type = RTA_OIF; //Output interface index
 	rtap->rta_len = RTA_LENGTH(sizeof(int));
-	memcpy(((char *)rtap) + sizeof(struct rtattr),
-			&ifcn, sizeof(int));
+	memcpy(((char *)rtap) + sizeof(struct rtattr), &ifcn, sizeof(int));
 
 	req.nl.nlmsg_len = NLMSG_ALIGN(req.nl.nlmsg_len) + RTA_ALIGN(rtap->rta_len);
 	req.nl.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_ACK;
diff --git a/test/zdtm/transition/pipe_loop00.c b/test/zdtm/transition/pipe_loop00.c
index 73e05e217..fa1f0eee4 100644
--- a/test/zdtm/transition/pipe_loop00.c
+++ b/test/zdtm/transition/pipe_loop00.c
@@ -10,15 +10,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Multi-process pipe loop";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Multi-process pipe loop";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define PROCS_DEF	4
-#define PROCS_MAX	64
+#define PROCS_DEF 4
+#define PROCS_MAX 64
 unsigned int num_procs = PROCS_DEF;
-TEST_OPTION(num_procs, uint, "# processes to create "
-	    "(default " __stringify(PROCS_DEF)
-	    ", max " __stringify(PROCS_MAX) ")", 0);
+TEST_OPTION(num_procs, uint,
+	    "# processes to create "
+	    "(default " __stringify(PROCS_DEF) ", max " __stringify(PROCS_MAX) ")",
+	    0);
 
 volatile sig_atomic_t num_exited = 0;
 void inc_num_exited(int signo)
@@ -53,7 +54,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		pid = test_fork();
 		if (pid < 0) {
 			pr_perror("Can't fork");
@@ -72,11 +73,10 @@ int main(int argc, char **argv)
 			signal(SIGPIPE, SIG_IGN);
 			if (pipe_in2out(pipes[in], pipes[out], buf, sizeof(buf)) < 0)
 				/* pass errno as exit code to the parent */
-				if (test_go() /* signal NOT delivered */ ||
-						(errno != EINTR && errno != EPIPE))
+				if (test_go() /* signal NOT delivered */ || (errno != EINTR && errno != EPIPE))
 					ret = errno;
 
-			test_waitsig();	/* even if failed, wait for migration to complete */
+			test_waitsig(); /* even if failed, wait for migration to complete */
 
 			close(pipes[in]);
 			close(pipes[out]);
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 	out = pipes[num_procs * 2 - 1];
 
 	/* don't block on writing, _do_ block on reading */
-	if (set_nonblock(out,1) < 0) {
+	if (set_nonblock(out, 1) < 0) {
 		pr_perror("setting O_NONBLOCK failed");
 		exit(1);
 	}
@@ -143,14 +143,14 @@ int main(int argc, char **argv)
 
 	close(out);
 
-	test_waitsig();	/* even if failed, wait for migration to complete */
+	test_waitsig(); /* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
 		fail("failed to send SIGTERM to my process group");
-		goto out;	/* shouldn't wait() in this case */
+		goto out; /* shouldn't wait() in this case */
 	}
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
 			fail("can't wait for a child");
@@ -160,8 +160,7 @@ int main(int argc, char **argv)
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child %d exited with non-zero code %d (%s)",
-			     i, chret, strerror(chret));
+			fail("child %d exited with non-zero code %d (%s)", i, chret, strerror(chret));
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/pipe_shared00.c b/test/zdtm/transition/pipe_shared00.c
index d1dcd665d..421a8d0bf 100644
--- a/test/zdtm/transition/pipe_shared00.c
+++ b/test/zdtm/transition/pipe_shared00.c
@@ -10,15 +10,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Multi-process pipe split";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Multi-process pipe split";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define PROCS_DEF	4
-#define PROCS_MAX	64
+#define PROCS_DEF 4
+#define PROCS_MAX 64
 unsigned int num_procs = PROCS_DEF;
-TEST_OPTION(num_procs, uint, "# processes to create "
-	    "(default " __stringify(PROCS_DEF)
-	    ", max " __stringify(PROCS_MAX) ")", 0);
+TEST_OPTION(num_procs, uint,
+	    "# processes to create "
+	    "(default " __stringify(PROCS_DEF) ", max " __stringify(PROCS_MAX) ")",
+	    0);
 
 volatile sig_atomic_t num_exited = 0;
 void inc_num_exited(int signo)
@@ -53,7 +54,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		pid = test_fork();
 		if (pid < 0) {
 			pr_perror("can't fork");
@@ -69,7 +70,7 @@ int main(int argc, char **argv)
 				if (rlen == 0)
 					break;
 				else if (rlen < 0) {
-					ret = errno;	/* pass errno as exit code to the parent */
+					ret = errno; /* pass errno as exit code to the parent */
 					break;
 				}
 
@@ -81,7 +82,7 @@ int main(int argc, char **argv)
 				}
 			}
 
-			test_waitsig();	/* even if failed, wait for migration to complete */
+			test_waitsig(); /* even if failed, wait for migration to complete */
 
 			close(pipes[0]);
 			exit(ret);
@@ -99,23 +100,23 @@ int main(int argc, char **argv)
 	test_daemon();
 
 	memset(buf, SND_CHR, sizeof(buf));
-	while(test_go())
+	while (test_go())
 		if (write(pipes[1], buf, sizeof(buf)) < 0 &&
-		    (errno != EINTR || test_go())) {	/* only SIGTERM may stop us */
+		    (errno != EINTR || test_go())) { /* only SIGTERM may stop us */
 			fail("write failed");
 			ret = 1;
 			break;
 		}
 	close(pipes[1]);
 
-	test_waitsig();	/* even if failed, wait for migration to complete */
+	test_waitsig(); /* even if failed, wait for migration to complete */
 
 	if (kill(0, SIGTERM)) {
 		fail("failed to send SIGTERM to my process group");
-		goto out;	/* shouldn't wait() in this case */
+		goto out; /* shouldn't wait() in this case */
 	}
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
 			fail("can't wait for a child");
@@ -125,8 +126,7 @@ int main(int argc, char **argv)
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child exited with non-zero code %d (%s)",
-			     chret, strerror(chret));
+			fail("child exited with non-zero code %d (%s)", chret, strerror(chret));
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/ptrace.c b/test/zdtm/transition/ptrace.c
index 29e2e01d9..bf6344f1c 100644
--- a/test/zdtm/transition/ptrace.c
+++ b/test/zdtm/transition/ptrace.c
@@ -15,7 +15,7 @@
 const char *test_doc = "Tests that ptraced thread do not escape from tracing";
 const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define NR_THREADS	2
+#define NR_THREADS 2
 unsigned int nr_threads = NR_THREADS;
 TEST_OPTION(nr_threads, uint, "Number of threads", 0);
 
@@ -30,17 +30,15 @@ static void *thread(void *arg)
 int main(int argc, char **argv)
 {
 	int pid, status, i, stopped;
-#define PT_REGS_SIZE	4096	/* big enough for any arch */
-#define PT_REGS_ALIGN	16	/* big enough for any arch */
+#define PT_REGS_SIZE  4096 /* big enough for any arch */
+#define PT_REGS_ALIGN 16 /* big enough for any arch */
 	char regs[PT_REGS_SIZE] __attribute__((aligned(PT_REGS_ALIGN)));
 
 	int *pids;
 
 	test_init(argc, argv);
 
-	pids = (int *)mmap(NULL, sizeof(int) * nr_threads,
-			PROT_READ | PROT_WRITE,
-			MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	pids = (int *)mmap(NULL, sizeof(int) * nr_threads, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	if (pids == MAP_FAILED) {
 		pr_perror("Can't map");
 		exit(1);
@@ -62,8 +60,8 @@ int main(int argc, char **argv)
 			}
 		}
 		thread(pids + i);
-out_th:
-		for (i--; i >=0; i--) {
+	out_th:
+		for (i--; i >= 0; i--) {
 			pthread_kill(pt[i], SIGKILL);
 			pthread_join(pt[i], NULL);
 		}
diff --git a/test/zdtm/transition/shmem.c b/test/zdtm/transition/shmem.c
index 39ccfbe9b..bca0f06c8 100644
--- a/test/zdtm/transition/shmem.c
+++ b/test/zdtm/transition/shmem.c
@@ -7,9 +7,9 @@
 
 #include "zdtmtst.h"
 
-const char *test_author	= "Andrei Vagin <avagin@virtuozzo.com>";
+const char *test_author = "Andrei Vagin <avagin@virtuozzo.com>";
 
-#define MEM_SIZE (1<<25)
+#define MEM_SIZE (1 << 25)
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/transition/socket_loop00.c b/test/zdtm/transition/socket_loop00.c
index 85dba1155..5a13ecb34 100644
--- a/test/zdtm/transition/socket_loop00.c
+++ b/test/zdtm/transition/socket_loop00.c
@@ -11,15 +11,16 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Multi-process socket loop";
-const char *test_author	= "Pavel Emelianov <xemul@parallels.com>";
+const char *test_doc = "Multi-process socket loop";
+const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
-#define PROCS_DEF	4
-#define PROCS_MAX	64
+#define PROCS_DEF 4
+#define PROCS_MAX 64
 unsigned int num_procs = PROCS_DEF;
-TEST_OPTION(num_procs, uint, "# processes to create "
-	    "(default " __stringify(PROCS_DEF)
-	    ", max " __stringify(PROCS_MAX) ")", 0);
+TEST_OPTION(num_procs, uint,
+	    "# processes to create "
+	    "(default " __stringify(PROCS_DEF) ", max " __stringify(PROCS_MAX) ")",
+	    0);
 
 volatile sig_atomic_t num_exited = 0;
 void inc_num_exited(int signo)
@@ -54,7 +55,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		pid = test_fork();
 		if (pid < 0) {
 			pr_perror("Can't fork");
@@ -74,11 +75,10 @@ int main(int argc, char **argv)
 			if (pipe_in2out(socks[in], socks[out], buf, sizeof(buf)) < 0)
 				/* pass errno as exit code to the parent */
 				if (test_go() /* signal NOT delivered */ ||
-					(errno != EINTR && errno != EPIPE
-						&& errno != ECONNRESET))
+				    (errno != EINTR && errno != EPIPE && errno != ECONNRESET))
 					ret = errno;
 
-			test_waitsig();	/* even if failed, wait for migration to complete */
+			test_waitsig(); /* even if failed, wait for migration to complete */
 
 			close(socks[in]);
 			close(socks[out]);
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	out = socks[num_procs * 2 - 1];
 
 	/* don't block on writing, _do_ block on reading */
-	if (set_nonblock(out,1) < 0) {
+	if (set_nonblock(out, 1) < 0) {
 		pr_perror("setting O_NONBLOCK failed");
 		exit(1);
 	}
@@ -143,15 +143,14 @@ int main(int argc, char **argv)
 		}
 	}
 
-
-	test_waitsig();	/* even if failed, wait for migration to complete */
+	test_waitsig(); /* even if failed, wait for migration to complete */
 
 	/* We expect that write(2) in child may return error only after signal
 	 * has been received. Thus, send signal before closing parent fds.
 	 */
 	if (kill(0, SIGTERM)) {
 		fail("failed to send SIGTERM to my process group");
-		goto out;	/* shouldn't wait() in this case */
+		goto out; /* shouldn't wait() in this case */
 	}
 	if (close(out))
 		fail("Failed to close parent fd 'out'");
@@ -162,7 +161,7 @@ int main(int argc, char **argv)
 	if (close(in))
 		fail("failed to close parent fd 'in'");
 
-	for (i = 1; i < num_procs; i++) {	/* i = 0 - parent */
+	for (i = 1; i < num_procs; i++) { /* i = 0 - parent */
 		int chret;
 		if (wait(&chret) < 0) {
 			fail("can't wait for a child");
@@ -172,8 +171,7 @@ int main(int argc, char **argv)
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child %d exited with non-zero code %d (%s)",
-			     i, chret, strerror(chret));
+			fail("child %d exited with non-zero code %d (%s)", i, chret, strerror(chret));
 			ret = 1;
 			continue;
 		}
diff --git a/test/zdtm/transition/thread-bomb.c b/test/zdtm/transition/thread-bomb.c
index c1b825be7..c101f85d4 100644
--- a/test/zdtm/transition/thread-bomb.c
+++ b/test/zdtm/transition/thread-bomb.c
@@ -8,8 +8,7 @@
 
 #include "zdtmtst.h"
 
-#define exit_group(code)	\
-	syscall(__NR_exit_group, code)
+#define exit_group(code) syscall(__NR_exit_group, code)
 
 static pthread_attr_t attr;
 /* Having in mind setup with 64 Kb large pages */
diff --git a/test/zdtm/transition/unix_sock.c b/test/zdtm/transition/unix_sock.c
index 1fb61139d..caa5a4a57 100644
--- a/test/zdtm/transition/unix_sock.c
+++ b/test/zdtm/transition/unix_sock.c
@@ -13,20 +13,21 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc	= "Multi-client - server app";
-const char *test_author	= "Roman Kagan <rkagan@parallels.com>";
+const char *test_doc = "Multi-client - server app";
+const char *test_author = "Roman Kagan <rkagan@parallels.com>";
 
-#define PROCS_DEF	4
-#define PROCS_MAX	64
+#define PROCS_DEF 4
+#define PROCS_MAX 64
 unsigned int num_procs = PROCS_DEF;
-TEST_OPTION(num_procs, uint, "# processes to create "
-	    "(default " __stringify(PROCS_DEF)
-	    ", max " __stringify(PROCS_MAX) ")", 0);
+TEST_OPTION(num_procs, uint,
+	    "# processes to create "
+	    "(default " __stringify(PROCS_DEF) ", max " __stringify(PROCS_MAX) ")",
+	    0);
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
 
-#define ACCEPT_TIMEOUT 100	/* max delay for the child to connect */
+#define ACCEPT_TIMEOUT 100 /* max delay for the child to connect */
 
 static int fill_sock_name(struct sockaddr_un *name, const char *filename)
 {
@@ -54,7 +55,7 @@ static int setup_srv_sock(void)
 		return -1;
 	}
 
-	if (bind(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0) {
+	if (bind(sock, (struct sockaddr *)&name, SUN_LEN(&name)) < 0) {
 		pr_perror("can't bind to socket \"%s\"", filename);
 		goto err;
 	}
@@ -121,7 +122,7 @@ static int setup_clnt_sock(void)
 		return ret;
 	}
 
-	if (connect(sock, (struct sockaddr *) &name, SUN_LEN(&name)) < 0) {
+	if (connect(sock, (struct sockaddr *)&name, SUN_LEN(&name)) < 0) {
 		ret = -errno;
 		pr_perror("can't connect");
 		goto err;
@@ -150,10 +151,8 @@ static int child(void)
 	signal(SIGPIPE, SIG_IGN);
 	while (test_go()) {
 		datagen(buf, sizeof(buf), &crc);
-		if (write(sock, buf, sizeof(buf)) < 0 &&
-			(test_go() /* signal NOT received */ ||
-				(errno != EINTR && errno != EPIPE && \
-					errno != ECONNRESET))) {
+		if (write(sock, buf, sizeof(buf)) < 0 && (test_go() /* signal NOT received */ ||
+							  (errno != EINTR && errno != EPIPE && errno != ECONNRESET))) {
 			ret = errno;
 			fail("child write");
 			goto out;
@@ -212,13 +211,12 @@ int main(int argc, char **argv)
 		FD_SET(child_desc[nproc].sock, &active_fds);
 	}
 
-	close(sock);	/* no more connections */
+	close(sock); /* no more connections */
 	test_daemon();
 
 	while (test_go()) {
 		read_fds = active_fds;
-		if (select(FD_SETSIZE, &read_fds, NULL, NULL, NULL) < 0 &&
-		    errno != EINTR) {
+		if (select(FD_SETSIZE, &read_fds, NULL, NULL, NULL) < 0 && errno != EINTR) {
 			fail("error waiting for data");
 			goto out;
 		}
@@ -226,7 +224,7 @@ int main(int argc, char **argv)
 		for (i = 0; i < num_procs; i++)
 			if (FD_ISSET(child_desc[i].sock, &read_fds)) {
 				if (read(child_desc[i].sock, buf, sizeof(buf)) < 0) {
-					if(errno == EINTR)	/* we're asked to stop */
+					if (errno == EINTR) /* we're asked to stop */
 						break;
 					else {
 						fail("error reading data from socket");
@@ -241,13 +239,12 @@ int main(int argc, char **argv)
 			}
 	}
 
-
 out:
 	test_waitsig();
 
 	if (kill(0, SIGTERM)) {
 		fail("failed to send SIGTERM to my process group");
-		goto cleanup;	/* shouldn't wait() in this case */
+		goto cleanup; /* shouldn't wait() in this case */
 	}
 
 	while (nproc-- > 0) {
@@ -258,7 +255,7 @@ out:
 		 * signal to child, child has checked for signal & found none
 		 * (not yet delivered), then called write(), blocking forever.
 		 */
-		if(close(child_desc[nproc].sock))
+		if (close(child_desc[nproc].sock))
 			fail("Can't close server socket");
 
 		if (wait(&chret) < 0) {
@@ -268,8 +265,7 @@ out:
 
 		chret = WEXITSTATUS(chret);
 		if (chret) {
-			fail("child exited with non-zero code %d (%s)",
-			     chret, strerror(chret));
+			fail("child exited with non-zero code %d (%s)", chret, strerror(chret));
 			goto cleanup;
 		}
 	}
diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index 60aa40334..e8d45a9e7 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -12,33 +12,33 @@
 #include <sys/utsname.h>
 
 #ifndef CLONE_NEWTIME
-#define CLONE_NEWTIME   0x00000080      /* New time namespace */
+#define CLONE_NEWTIME 0x00000080 /* New time namespace */
 #endif
 
 static inline int _settime(clockid_t clk_id, time_t offset)
 {
-        int fd, len;
-        char buf[4096];
+	int fd, len;
+	char buf[4096];
 
-        if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
-                clk_id = CLOCK_MONOTONIC;
+	if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
+		clk_id = CLOCK_MONOTONIC;
 
-        len = snprintf(buf, sizeof(buf), "%d %ld 0", clk_id, offset);
+	len = snprintf(buf, sizeof(buf), "%d %ld 0", clk_id, offset);
 
-        fd = open("/proc/self/timens_offsets", O_WRONLY);
-        if (fd < 0) {
-                fprintf(stderr, "/proc/self/timens_offsets: %m");
+	fd = open("/proc/self/timens_offsets", O_WRONLY);
+	if (fd < 0) {
+		fprintf(stderr, "/proc/self/timens_offsets: %m");
 		return -1;
 	}
 
-        if (write(fd, buf, len) != len) {
-                fprintf(stderr, "/proc/self/timens_offsets: %m");
+	if (write(fd, buf, len) != len) {
+		fprintf(stderr, "/proc/self/timens_offsets: %m");
 		return -1;
 	}
 
-        close(fd);
+	close(fd);
 
-        return 0;
+	return 0;
 }
 
 static int create_timens()
@@ -117,13 +117,11 @@ int main(int argc, char **argv)
 			fprintf(stderr, "mount(/proc): %m");
 			return 1;
 		}
-		if (mount("zdtm_devpts", "/dev/pts", "devpts", 0,
-					"newinstance,ptmxmode=0666")) {
+		if (mount("zdtm_devpts", "/dev/pts", "devpts", 0, "newinstance,ptmxmode=0666")) {
 			fprintf(stderr, "mount(pts): %m");
 			return 1;
 		}
-		if (mount("zdtm_binfmt", "/proc/sys/fs/binfmt_misc", "binfmt_misc", 0,
-					NULL)) {
+		if (mount("zdtm_binfmt", "/proc/sys/fs/binfmt_misc", "binfmt_misc", 0, NULL)) {
 			fprintf(stderr, "mount(binfmt_misc): %m");
 			return 1;
 		}

From 70833bcf29e7fbb93592225ecc04ac95bb4d6378 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 19 Jul 2021 07:39:51 +0000
Subject: [PATCH 0698/1854] Run 'make indent' on header files

Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .../plugins/include/asm/syscall-types.h       |  16 +-
 .../plugins/std/syscalls/syscall-aux.h        |   2 +-
 .../arch/aarch64/src/lib/include/handle-elf.h |   4 +-
 compel/arch/aarch64/src/lib/include/syscall.h |   6 +-
 .../aarch64/src/lib/include/uapi/asm/cpu.h    |   3 +-
 .../src/lib/include/uapi/asm/infect-types.h   |  28 +-
 .../src/lib/include/uapi/asm/sigframe.h       |  56 +-
 .../arm/plugins/include/asm/syscall-types.h   |  16 +-
 .../arm/plugins/std/syscalls/syscall-aux.h    |  14 +-
 compel/arch/arm/src/lib/include/handle-elf.h  |   4 +-
 compel/arch/arm/src/lib/include/syscall.h     |   6 +-
 .../arch/arm/src/lib/include/uapi/asm/cpu.h   |   3 +-
 .../src/lib/include/uapi/asm/infect-types.h   |  75 +--
 .../lib/include/uapi/asm/processor-flags.h    |  56 +-
 .../arm/src/lib/include/uapi/asm/sigframe.h   |  89 ++-
 .../arch/mips/plugins/include/asm/prologue.h  |  17 +-
 .../mips/plugins/include/asm/syscall-types.h  |  18 +-
 compel/arch/mips/src/lib/include/handle-elf.h |   2 +-
 compel/arch/mips/src/lib/include/ldsodefs.h   | 130 ++---
 compel/arch/mips/src/lib/include/syscall.h    |   2 +-
 .../arch/mips/src/lib/include/uapi/asm/cpu.h  |   3 +-
 .../src/lib/include/uapi/asm/infect-types.h   |  34 +-
 .../mips/src/lib/include/uapi/asm/sigframe.h  |  31 +-
 .../mips/src/lib/include/uapi/asm/siginfo.h   |  41 +-
 .../ppc64/plugins/include/asm/syscall-types.h |  18 +-
 .../arch/ppc64/src/lib/include/handle-elf.h   |   4 +-
 compel/arch/ppc64/src/lib/include/syscall.h   |   6 +-
 .../arch/ppc64/src/lib/include/uapi/asm/cpu.h |   2 +-
 .../src/lib/include/uapi/asm/infect-types.h   |  66 ++-
 .../ppc64/src/lib/include/uapi/asm/sigframe.h |  58 +-
 .../s390/plugins/include/asm/syscall-types.h  |  18 +-
 compel/arch/s390/src/lib/include/handle-elf.h |   4 +-
 compel/arch/s390/src/lib/include/syscall.h    |   3 +-
 .../arch/s390/src/lib/include/uapi/asm/cpu.h  |   2 +-
 .../src/lib/include/uapi/asm/infect-types.h   |  50 +-
 .../s390/src/lib/include/uapi/asm/sigframe.h  |  28 +-
 .../arch/x86/plugins/include/asm/prologue.h   |  17 +-
 .../x86/plugins/include/asm/syscall-types.h   |  46 +-
 compel/arch/x86/src/lib/include/cpu.h         |  20 +-
 compel/arch/x86/src/lib/include/handle-elf.h  |   8 +-
 compel/arch/x86/src/lib/include/syscall.h     |   2 +-
 .../arch/x86/src/lib/include/uapi/asm/cpu.h   | 552 +++++++++---------
 .../arch/x86/src/lib/include/uapi/asm/fpu.h   | 204 ++++---
 .../src/lib/include/uapi/asm/infect-types.h   | 125 ++--
 .../lib/include/uapi/asm/processor-flags.h    |   4 +-
 .../x86/src/lib/include/uapi/asm/sigframe.h   | 190 +++---
 compel/include/elf32-types.h                  |  18 +-
 compel/include/elf64-types.h                  |  18 +-
 compel/include/errno.h                        |   8 +-
 compel/include/infect-priv.h                  |  73 ++-
 compel/include/log.h                          |  65 +--
 compel/include/piegen.h                       |  18 +-
 compel/include/ptrace.h                       |   2 +-
 compel/include/rpc-pie-priv.h                 |  40 +-
 compel/include/shmem.h                        |   1 -
 compel/include/uapi/handle-elf.h              |  26 +-
 compel/include/uapi/infect-rpc.h              |   3 +-
 compel/include/uapi/infect.h                  | 111 ++--
 compel/include/uapi/loglevels.h               |  15 +-
 compel/include/uapi/plugins.h                 |  34 +-
 compel/include/uapi/ptrace.h                  |  34 +-
 compel/include/uapi/sigframe-common.h         |  46 +-
 compel/include/uapi/task-state.h              |  13 +-
 compel/plugins/include/uapi/std/infect.h      |   2 +-
 compel/plugins/include/uapi/std/log.h         |   6 +-
 compel/plugins/include/uapi/std/string.h      |  16 +-
 .../plugins/include/uapi/std/syscall-types.h  |   5 +-
 criu/arch/aarch64/include/asm/dump.h          |   1 -
 criu/arch/aarch64/include/asm/kerndat.h       |   4 +-
 criu/arch/aarch64/include/asm/parasite.h      |   2 +-
 criu/arch/aarch64/include/asm/restore.h       |   3 +-
 criu/arch/aarch64/include/asm/restorer.h      |  16 +-
 criu/arch/aarch64/include/asm/types.h         |  12 +-
 criu/arch/aarch64/include/asm/vdso.h          |  20 +-
 criu/arch/arm/include/asm/dump.h              |   1 -
 criu/arch/arm/include/asm/kerndat.h           |   4 +-
 criu/arch/arm/include/asm/parasite.h          |   2 +-
 criu/arch/arm/include/asm/restore.h           |   3 +-
 criu/arch/arm/include/asm/restorer.h          |  40 +-
 criu/arch/arm/include/asm/types.h             |  14 +-
 criu/arch/arm/include/asm/vdso.h              |  14 +-
 criu/arch/mips/include/asm/kerndat.h          |   4 +-
 criu/arch/mips/include/asm/restore.h          |   3 +-
 criu/arch/mips/include/asm/restorer.h         |  32 +-
 criu/arch/mips/include/asm/types.h            |  15 +-
 criu/arch/mips/include/asm/vdso.h             |  18 +-
 criu/arch/ppc64/include/asm/dump.h            |   1 -
 criu/arch/ppc64/include/asm/kerndat.h         |   4 +-
 criu/arch/ppc64/include/asm/parasite.h        |   5 +-
 criu/arch/ppc64/include/asm/restore.h         |   2 +
 criu/arch/ppc64/include/asm/restorer.h        |  22 +-
 criu/arch/ppc64/include/asm/types.h           |  20 +-
 criu/arch/ppc64/include/asm/vdso.h            |  40 +-
 criu/arch/s390/include/asm/dump.h             |   4 +-
 criu/arch/s390/include/asm/kerndat.h          |   4 +-
 criu/arch/s390/include/asm/parasite.h         |   5 +-
 criu/arch/s390/include/asm/restore.h          |   2 +
 criu/arch/s390/include/asm/restorer.h         |  21 +-
 criu/arch/s390/include/asm/types.h            |  18 +-
 criu/arch/s390/include/asm/vdso.h             |  20 +-
 criu/arch/x86/include/asm/compat.h            |  40 +-
 criu/arch/x86/include/asm/dump.h              |   3 +-
 criu/arch/x86/include/asm/parasite.h          |   5 +-
 criu/arch/x86/include/asm/restore.h           |   3 +-
 criu/arch/x86/include/asm/restorer.h          |  33 +-
 criu/arch/x86/include/asm/types.h             |  24 +-
 criu/arch/x86/include/asm/vdso.h              |  41 +-
 criu/include/aio.h                            |  18 +-
 criu/include/asm-generic/int.h                |  16 +-
 criu/include/asm-generic/vdso.h               |  16 +-
 criu/include/autofs.h                         | 126 ++--
 criu/include/bfd.h                            |   6 +-
 criu/include/bpfmap.h                         |  20 +-
 criu/include/cgroup-props.h                   |   6 +-
 criu/include/cgroup.h                         |  40 +-
 criu/include/clone-noasan.h                   |   3 +-
 criu/include/cr-errno.h                       |   4 +-
 criu/include/cr_options.h                     | 201 ++++---
 criu/include/criu-plugin.h                    | 114 ++--
 criu/include/crtools.h                        |  18 +-
 criu/include/fault-injection.h                |   4 +-
 criu/include/fcntl.h                          |  24 +-
 criu/include/file-ids.h                       |   4 +-
 criu/include/file-lock.h                      |  67 +--
 criu/include/files-reg.h                      |  19 +-
 criu/include/files.h                          |  99 ++--
 criu/include/filesystems.h                    |   3 +-
 criu/include/fs-magic.h                       |  22 +-
 criu/include/fsnotify.h                       |   2 +-
 criu/include/image-desc.h                     |   6 +-
 criu/include/image.h                          |  66 +--
 criu/include/imgset.h                         |   6 +-
 criu/include/inet_diag.h                      |  85 ++-
 criu/include/irmap.h                          |   6 +-
 criu/include/kcmp-ids.h                       |  30 +-
 criu/include/kcmp.h                           |   6 +-
 criu/include/kerndat.h                        |   8 +-
 criu/include/libnetlink.h                     |  15 +-
 criu/include/linux/mount.h                    |  16 +-
 criu/include/linux/userfaultfd.h              | 121 ++--
 criu/include/log.h                            |  65 +--
 criu/include/lsm.h                            |   9 +-
 criu/include/magic.h                          | 178 +++---
 criu/include/mem.h                            |  34 +-
 criu/include/memfd.h                          |   6 +-
 criu/include/mman.h                           |   8 +-
 criu/include/mount.h                          |  95 +--
 criu/include/namespaces.h                     |  89 ++-
 criu/include/net.h                            |   2 +-
 criu/include/netlink_diag.h                   |  36 +-
 criu/include/packet_diag.h                    |  78 +--
 criu/include/page-pipe.h                      |  59 +-
 criu/include/page-xfer.h                      |   5 +-
 criu/include/pagemap-cache.h                  |  21 +-
 criu/include/pagemap.h                        |  51 +-
 criu/include/parasite-syscall.h               |  18 +-
 criu/include/parasite-vdso.h                  |  51 +-
 criu/include/parasite.h                       | 101 ++--
 criu/include/path.h                           |   3 +-
 criu/include/pid.h                            |  17 +-
 criu/include/pipes.h                          |  36 +-
 criu/include/plugin.h                         |  47 +-
 criu/include/posix-timer.h                    |   4 +-
 criu/include/prctl.h                          |  84 +--
 criu/include/proc_parse.h                     | 120 ++--
 criu/include/protobuf-desc.h                  |  26 +-
 criu/include/protobuf.h                       |  19 +-
 criu/include/pstree.h                         |  36 +-
 criu/include/ptrace-compat.h                  |   4 +-
 criu/include/rbtree.h                         |  60 +-
 criu/include/restorer.h                       | 231 ++++----
 criu/include/rst-malloc.h                     |   7 +-
 criu/include/rst_info.h                       |  48 +-
 criu/include/sched.h                          |   4 +-
 criu/include/seccomp.h                        |  18 +-
 criu/include/servicefd.h                      |  13 +-
 criu/include/shmem.h                          |   3 +-
 criu/include/sigframe.h                       |   4 +-
 criu/include/sk-inet.h                        |  53 +-
 criu/include/sk-packet.h                      |   4 +-
 criu/include/sockets.h                        |  49 +-
 criu/include/stats.h                          |   4 +-
 criu/include/string.h                         |   2 +-
 criu/include/sysctl.h                         |  34 +-
 criu/include/sysfs_parse.h                    |   7 +-
 criu/include/timerfd.h                        |  21 +-
 criu/include/tls.h                            |  12 +-
 criu/include/tty.h                            |   8 +-
 criu/include/tun.h                            |   2 +-
 criu/include/unix_diag.h                      |  46 +-
 criu/include/util-pie.h                       |   5 +-
 criu/include/util-vdso.h                      |  69 +--
 criu/include/util.h                           | 257 ++++----
 criu/include/vdso.h                           |   6 +-
 criu/include/vma.h                            |  76 ++-
 include/common/arch/aarch64/asm/atomic.h      |  72 +--
 include/common/arch/aarch64/asm/linkage.h     |  21 +-
 include/common/arch/aarch64/asm/page.h        |   8 +-
 include/common/arch/arm/asm/atomic.h          |  72 ++-
 include/common/arch/arm/asm/linkage.h         |  25 +-
 include/common/arch/arm/asm/page.h            |  10 +-
 include/common/arch/arm/asm/processor.h       |  19 +-
 include/common/arch/mips/asm/atomic.h         |  91 ++-
 include/common/arch/mips/asm/bitops.h         |  22 +-
 include/common/arch/mips/asm/bitsperlong.h    |   2 +-
 include/common/arch/mips/asm/cmpxchg.h        | 108 ++--
 include/common/arch/mips/asm/linkage.h        |  88 ++-
 include/common/arch/mips/asm/page.h           |  10 +-
 include/common/arch/mips/asm/utils.h          |  14 +-
 include/common/arch/ppc64/asm/atomic.h        |  13 +-
 include/common/arch/ppc64/asm/bitops.h        | 140 +++--
 include/common/arch/ppc64/asm/cmpxchg.h       |  67 +--
 include/common/arch/ppc64/asm/linkage.h       | 426 +++++++-------
 include/common/arch/ppc64/asm/page.h          |   8 +-
 include/common/arch/s390/asm/atomic.h         |  39 +-
 include/common/arch/s390/asm/atomic_ops.h     |  32 +-
 include/common/arch/s390/asm/bitops.h         |  40 +-
 include/common/arch/s390/asm/linkage.h        |  15 +-
 include/common/arch/s390/asm/page.h           |  10 +-
 include/common/arch/x86/asm/asm.h             |  18 +-
 include/common/arch/x86/asm/atomic.h          |  27 +-
 include/common/arch/x86/asm/bitops.h          |  55 +-
 include/common/arch/x86/asm/bitsperlong.h     |   4 +-
 include/common/arch/x86/asm/cmpxchg.h         | 148 +++--
 include/common/arch/x86/asm/linkage.h         |  25 +-
 include/common/arch/x86/asm/page.h            |  10 +-
 include/common/asm-generic/bitops.h           |  35 +-
 include/common/bitops.h                       |   4 +-
 include/common/bug.h                          |  36 +-
 include/common/compiler.h                     | 134 +++--
 include/common/err.h                          |   2 +-
 include/common/list.h                         | 228 ++++----
 include/common/lock.h                         |  81 +--
 include/common/scm.h                          |  21 +-
 include/common/xmalloc.h                      |  63 +-
 lib/c/criu.h                                  |  13 +-
 soccr/soccr.h                                 |  68 +--
 .../arm/include/arch_test_handle_binary.h     |   1 -
 .../x86/include/arch_test_handle_binary.h     |   4 +-
 .../lib/arch/aarch64/include/asm/atomic.h     |  51 +-
 test/zdtm/lib/arch/arm/include/asm/atomic.h   |  55 +-
 test/zdtm/lib/arch/mips/include/asm/atomic.h  | 110 ++--
 test/zdtm/lib/arch/ppc64/include/asm/atomic.h |  61 +-
 test/zdtm/lib/arch/s390/include/asm/atomic.h  |  43 +-
 test/zdtm/lib/arch/x86/include/asm/atomic.h   |  56 +-
 test/zdtm/lib/bpfmap_zdtm.h                   |  18 +-
 test/zdtm/lib/cpuid.h                         |  18 +-
 test/zdtm/lib/fs.h                            |  20 +-
 test/zdtm/lib/lock.h                          |  77 +--
 test/zdtm/lib/zdtmtst.h                       |  82 +--
 test/zdtm/static/auto_dev-ioctl.h             | 127 ++--
 test/zdtm/static/ofd_file_locks.h             |   6 +-
 252 files changed, 4746 insertions(+), 5011 deletions(-)
 mode change 100755 => 100644 include/common/arch/mips/asm/atomic.h
 mode change 100755 => 100644 include/common/arch/mips/asm/bitsperlong.h
 mode change 100755 => 100644 include/common/arch/mips/asm/cmpxchg.h
 mode change 100755 => 100644 include/common/arch/mips/asm/page.h

diff --git a/compel/arch/aarch64/plugins/include/asm/syscall-types.h b/compel/arch/aarch64/plugins/include/asm/syscall-types.h
index ee0e2185d..45fd57af6 100644
--- a/compel/arch/aarch64/plugins/include/asm/syscall-types.h
+++ b/compel/arch/aarch64/plugins/include/asm/syscall-types.h
@@ -1,7 +1,7 @@
 #ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
 #define COMPEL_ARCH_SYSCALL_TYPES_H__
 
-#define SA_RESTORER   0x04000000
+#define SA_RESTORER 0x04000000
 
 typedef void rt_signalfn_t(int, siginfo_t *, void *);
 typedef rt_signalfn_t *rt_sighandler_t;
@@ -9,20 +9,20 @@ typedef rt_signalfn_t *rt_sighandler_t;
 typedef void rt_restorefn_t(void);
 typedef rt_restorefn_t *rt_sigrestore_t;
 
-#define _KNSIG		64
-#define _NSIG_BPW	64
+#define _KNSIG	  64
+#define _NSIG_BPW 64
 
-#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
 
 typedef struct {
 	unsigned long sig[_KNSIG_WORDS];
 } k_rtsigset_t;
 
 typedef struct {
-	rt_sighandler_t	rt_sa_handler;
-	unsigned long	rt_sa_flags;
-	rt_sigrestore_t	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t;
 
 #endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/aarch64/plugins/std/syscalls/syscall-aux.h b/compel/arch/aarch64/plugins/std/syscalls/syscall-aux.h
index 6272bf3a8..3c7124856 100644
--- a/compel/arch/aarch64/plugins/std/syscalls/syscall-aux.h
+++ b/compel/arch/aarch64/plugins/std/syscalls/syscall-aux.h
@@ -1,3 +1,3 @@
 #ifndef __NR_openat
-# define __NR_openat 56
+#define __NR_openat 56
 #endif
diff --git a/compel/arch/aarch64/src/lib/include/handle-elf.h b/compel/arch/aarch64/src/lib/include/handle-elf.h
index 0f64b34cb..9f1a75081 100644
--- a/compel/arch/aarch64/src/lib/include/handle-elf.h
+++ b/compel/arch/aarch64/src/lib/include/handle-elf.h
@@ -3,8 +3,8 @@
 
 #include "elf64-types.h"
 
-#define __handle_elf				handle_elf_aarch64
-#define arch_is_machine_supported(e_machine)   (e_machine == EM_AARCH64)
+#define __handle_elf			     handle_elf_aarch64
+#define arch_is_machine_supported(e_machine) (e_machine == EM_AARCH64)
 
 extern int handle_elf_aarch64(void *mem, size_t size);
 
diff --git a/compel/arch/aarch64/src/lib/include/syscall.h b/compel/arch/aarch64/src/lib/include/syscall.h
index 30290667a..13ee906e1 100644
--- a/compel/arch/aarch64/src/lib/include/syscall.h
+++ b/compel/arch/aarch64/src/lib/include/syscall.h
@@ -1,4 +1,8 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 #endif
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/cpu.h b/compel/arch/aarch64/src/lib/include/uapi/asm/cpu.h
index c35460e15..12e749508 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/cpu.h
@@ -1,6 +1,7 @@
 #ifndef UAPI_COMPEL_ASM_CPU_H__
 #define UAPI_COMPEL_ASM_CPU_H__
 
-typedef struct { } compel_cpuinfo_t;
+typedef struct {
+} compel_cpuinfo_t;
 
 #endif /* UAPI_COMPEL_ASM_CPU_H__ */
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index b52f7a766..f91e73dc4 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -6,8 +6,8 @@
 #include <sys/mman.h>
 #include <asm/ptrace.h>
 
-#define SIGMAX			64
-#define SIGMAX_OLD		31
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
 
 /*
  * Copied from the Linux kernel header arch/arm64/include/uapi/asm/ptrace.h
@@ -15,23 +15,27 @@
  * A thread ARM CPU context
  */
 
-typedef struct user_pt_regs		user_regs_struct_t;
-typedef struct user_fpsimd_state	user_fpregs_struct_t;
+typedef struct user_pt_regs user_regs_struct_t;
+typedef struct user_fpsimd_state user_fpregs_struct_t;
 
 #define __compel_arch_fetch_thread_area(tid, th) 0
-#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
-#define REG_RES(r)			((uint64_t)(r).regs[0])
-#define REG_IP(r)			((uint64_t)(r).pc)
-#define REG_SP(r)			((uint64_t)((r).sp))
-#define REG_SYSCALL_NR(r)		((uint64_t)(r).regs[8])
+#define REG_RES(r)	  ((uint64_t)(r).regs[0])
+#define REG_IP(r)	  ((uint64_t)(r).pc)
+#define REG_SP(r)	  ((uint64_t)((r).sp))
+#define REG_SYSCALL_NR(r) ((uint64_t)(r).regs[8])
 
-#define user_regs_native(pregs)			true
+#define user_regs_native(pregs) true
 
-#define ARCH_SI_TRAP		TRAP_BRKPT
+#define ARCH_SI_TRAP TRAP_BRKPT
 
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
index bff714cca..f8ec55d6c 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
@@ -8,30 +8,31 @@
 
 /* Copied from the kernel header arch/arm64/include/uapi/asm/sigcontext.h */
 
-#define FPSIMD_MAGIC			0x46508001
+#define FPSIMD_MAGIC 0x46508001
 
-typedef struct fpsimd_context		fpu_state_t;
+typedef struct fpsimd_context fpu_state_t;
 
 struct aux_context {
-	struct fpsimd_context		fpsimd;
+	struct fpsimd_context fpsimd;
 	/* additional context to be added before "end" */
-	struct _aarch64_ctx		end;
+	struct _aarch64_ctx end;
 };
 
 // XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
-#define rt_sigcontext			sigcontext
+#define rt_sigcontext sigcontext
 
 #include <compel/sigframe-common.h>
 
 /* Copied from the kernel source arch/arm64/kernel/signal.c */
 
 struct rt_sigframe {
-	siginfo_t			info;
-	ucontext_t			uc;
-	uint64_t			fp;
-	uint64_t			lr;
+	siginfo_t info;
+	ucontext_t uc;
+	uint64_t fp;
+	uint64_t lr;
 };
 
+/* clang-format off */
 #define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)					\
 	asm volatile(								\
 			"mov sp, %0					\n"	\
@@ -40,30 +41,29 @@ struct rt_sigframe {
 			:							\
 			: "r"(new_sp)						\
 			: "x8", "memory")
+/* clang-format on */
 
 /* cr_sigcontext is copied from arch/arm64/include/uapi/asm/sigcontext.h */
 struct cr_sigcontext {
-        __u64 fault_address;
-        /* AArch64 registers */
-        __u64 regs[31];
-        __u64 sp;
-        __u64 pc;
-        __u64 pstate;
-        /* 4K reserved for FP/SIMD state and future expansion */
-        __u8 __reserved[4096] __attribute__((__aligned__(16)));
+	__u64 fault_address;
+	/* AArch64 registers */
+	__u64 regs[31];
+	__u64 sp;
+	__u64 pc;
+	__u64 pstate;
+	/* 4K reserved for FP/SIMD state and future expansion */
+	__u8 __reserved[4096] __attribute__((__aligned__(16)));
 };
 
-#define RT_SIGFRAME_UC(rt_sigframe)		(&rt_sigframe->uc)
-#define RT_SIGFRAME_REGIP(rt_sigframe)		((long unsigned int)(rt_sigframe)->uc.uc_mcontext.pc)
-#define RT_SIGFRAME_HAS_FPU(rt_sigframe)	(1)
-#define RT_SIGFRAME_SIGCONTEXT(rt_sigframe)	((struct cr_sigcontext *)&(rt_sigframe)->uc.uc_mcontext)
-#define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)	((struct aux_context*)&(RT_SIGFRAME_SIGCONTEXT(rt_sigframe)->__reserved))
-#define RT_SIGFRAME_FPU(rt_sigframe)		(&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
-#define RT_SIGFRAME_OFFSET(rt_sigframe)		0
+#define RT_SIGFRAME_UC(rt_sigframe)	     (&rt_sigframe->uc)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	     ((long unsigned int)(rt_sigframe)->uc.uc_mcontext.pc)
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe)     (1)
+#define RT_SIGFRAME_SIGCONTEXT(rt_sigframe)  ((struct cr_sigcontext *)&(rt_sigframe)->uc.uc_mcontext)
+#define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context *)&(RT_SIGFRAME_SIGCONTEXT(rt_sigframe)->__reserved))
+#define RT_SIGFRAME_FPU(rt_sigframe)	     (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
+#define RT_SIGFRAME_OFFSET(rt_sigframe)	     0
 
-#define rt_sigframe_erase_sigset(sigframe)				\
-	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
-#define rt_sigframe_copy_sigset(sigframe, from)				\
-	memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
+#define rt_sigframe_erase_sigset(sigframe)	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from) memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
 
 #endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/arm/plugins/include/asm/syscall-types.h b/compel/arch/arm/plugins/include/asm/syscall-types.h
index cdb03ef4c..acc03de52 100644
--- a/compel/arch/arm/plugins/include/asm/syscall-types.h
+++ b/compel/arch/arm/plugins/include/asm/syscall-types.h
@@ -1,7 +1,7 @@
 #ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
 #define COMPEL_ARCH_SYSCALL_TYPES_H__
 
-#define SA_RESTORER   0x04000000
+#define SA_RESTORER 0x04000000
 
 typedef void rt_signalfn_t(int, siginfo_t *, void *);
 typedef rt_signalfn_t *rt_sighandler_t;
@@ -9,20 +9,20 @@ typedef rt_signalfn_t *rt_sighandler_t;
 typedef void rt_restorefn_t(void);
 typedef rt_restorefn_t *rt_sigrestore_t;
 
-#define _KNSIG		64
-#define _NSIG_BPW	32
+#define _KNSIG	  64
+#define _NSIG_BPW 32
 
-#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
 
 typedef struct {
 	unsigned long sig[_KNSIG_WORDS];
 } k_rtsigset_t;
 
 typedef struct {
-	rt_sighandler_t	rt_sa_handler;
-	unsigned long	rt_sa_flags;
-	rt_sigrestore_t	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t;
 
 #endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/arm/plugins/std/syscalls/syscall-aux.h b/compel/arch/arm/plugins/std/syscalls/syscall-aux.h
index 3d2056b5a..7418546e1 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall-aux.h
+++ b/compel/arch/arm/plugins/std/syscalls/syscall-aux.h
@@ -1,27 +1,27 @@
 #ifndef __NR_mmap2
-# define __NR_mmap2 192
+#define __NR_mmap2 192
 #endif
 
 #ifndef __ARM_NR_BASE
-# define __ARM_NR_BASE			0x0f0000
+#define __ARM_NR_BASE 0x0f0000
 #endif
 
 #ifndef __ARM_NR_breakpoint
-# define __ARM_NR_breakpoint		(__ARM_NR_BASE+1)
+#define __ARM_NR_breakpoint (__ARM_NR_BASE + 1)
 #endif
 
 #ifndef __ARM_NR_cacheflush
-# define __ARM_NR_cacheflush		(__ARM_NR_BASE+2)
+#define __ARM_NR_cacheflush (__ARM_NR_BASE + 2)
 #endif
 
 #ifndef __ARM_NR_usr26
-# define __ARM_NR_usr26			(__ARM_NR_BASE+3)
+#define __ARM_NR_usr26 (__ARM_NR_BASE + 3)
 #endif
 
 #ifndef __ARM_NR_usr32
-# define __ARM_NR_usr32			(__ARM_NR_BASE+4)
+#define __ARM_NR_usr32 (__ARM_NR_BASE + 4)
 #endif
 
 #ifndef __ARM_NR_set_tls
-# define __ARM_NR_set_tls		(__ARM_NR_BASE+5)
+#define __ARM_NR_set_tls (__ARM_NR_BASE + 5)
 #endif
diff --git a/compel/arch/arm/src/lib/include/handle-elf.h b/compel/arch/arm/src/lib/include/handle-elf.h
index e5971f37b..4b5e1457a 100644
--- a/compel/arch/arm/src/lib/include/handle-elf.h
+++ b/compel/arch/arm/src/lib/include/handle-elf.h
@@ -3,8 +3,8 @@
 
 #include "elf32-types.h"
 
-#define __handle_elf				handle_elf_arm
-#define arch_is_machine_supported(e_machine)   (e_machine == EM_ARM)
+#define __handle_elf			     handle_elf_arm
+#define arch_is_machine_supported(e_machine) (e_machine == EM_ARM)
 
 extern int handle_elf_arm(void *mem, size_t size);
 
diff --git a/compel/arch/arm/src/lib/include/syscall.h b/compel/arch/arm/src/lib/include/syscall.h
index 30290667a..13ee906e1 100644
--- a/compel/arch/arm/src/lib/include/syscall.h
+++ b/compel/arch/arm/src/lib/include/syscall.h
@@ -1,4 +1,8 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 #endif
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/cpu.h b/compel/arch/arm/src/lib/include/uapi/asm/cpu.h
index c35460e15..12e749508 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/cpu.h
@@ -1,6 +1,7 @@
 #ifndef UAPI_COMPEL_ASM_CPU_H__
 #define UAPI_COMPEL_ASM_CPU_H__
 
-typedef struct { } compel_cpuinfo_t;
+typedef struct {
+} compel_cpuinfo_t;
 
 #endif /* UAPI_COMPEL_ASM_CPU_H__ */
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
index 5e05ef53d..159b6a9fb 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
@@ -4,8 +4,8 @@
 #include <stdint.h>
 #include <sys/mman.h>
 
-#define SIGMAX			64
-#define SIGMAX_OLD		31
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
 
 /*
  * Copied from the Linux kernel header arch/arm/include/asm/ptrace.h
@@ -14,58 +14,61 @@
  */
 
 typedef struct {
-	long			uregs[18];
+	long uregs[18];
 } user_regs_struct_t;
 
 #define __compel_arch_fetch_thread_area(tid, th) 0
-#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
-typedef struct user_vfp		user_fpregs_struct_t;
-
-#define ARM_cpsr		uregs[16]
-#define ARM_pc			uregs[15]
-#define ARM_lr			uregs[14]
-#define ARM_sp			uregs[13]
-#define ARM_ip			uregs[12]
-#define ARM_fp			uregs[11]
-#define ARM_r10			uregs[10]
-#define ARM_r9			uregs[9]
-#define ARM_r8			uregs[8]
-#define ARM_r7			uregs[7]
-#define ARM_r6			uregs[6]
-#define ARM_r5			uregs[5]
-#define ARM_r4			uregs[4]
-#define ARM_r3			uregs[3]
-#define ARM_r2			uregs[2]
-#define ARM_r1			uregs[1]
-#define ARM_r0			uregs[0]
-#define ARM_ORIG_r0		uregs[17]
+typedef struct user_vfp user_fpregs_struct_t;
 
+#define ARM_cpsr    uregs[16]
+#define ARM_pc	    uregs[15]
+#define ARM_lr	    uregs[14]
+#define ARM_sp	    uregs[13]
+#define ARM_ip	    uregs[12]
+#define ARM_fp	    uregs[11]
+#define ARM_r10	    uregs[10]
+#define ARM_r9	    uregs[9]
+#define ARM_r8	    uregs[8]
+#define ARM_r7	    uregs[7]
+#define ARM_r6	    uregs[6]
+#define ARM_r5	    uregs[5]
+#define ARM_r4	    uregs[4]
+#define ARM_r3	    uregs[3]
+#define ARM_r2	    uregs[2]
+#define ARM_r1	    uregs[1]
+#define ARM_r0	    uregs[0]
+#define ARM_ORIG_r0 uregs[17]
 
 /* Copied from arch/arm/include/asm/user.h */
 
 struct user_vfp {
-	unsigned long long	fpregs[32];
-	unsigned long		fpscr;
+	unsigned long long fpregs[32];
+	unsigned long fpscr;
 };
 
 struct user_vfp_exc {
-	unsigned long		fpexc;
-	unsigned long		fpinst;
-	unsigned long		fpinst2;
+	unsigned long fpexc;
+	unsigned long fpinst;
+	unsigned long fpinst2;
 };
 
-#define REG_RES(regs)		((regs).ARM_r0)
-#define REG_IP(regs)		((regs).ARM_pc)
-#define REG_SP(regs)		((regs).ARM_sp)
-#define REG_SYSCALL_NR(regs)	((regs).ARM_r7)
+#define REG_RES(regs)	     ((regs).ARM_r0)
+#define REG_IP(regs)	     ((regs).ARM_pc)
+#define REG_SP(regs)	     ((regs).ARM_sp)
+#define REG_SYSCALL_NR(regs) ((regs).ARM_r7)
 
-#define user_regs_native(pregs)			true
+#define user_regs_native(pregs) true
 
-#define ARCH_SI_TRAP		TRAP_BRKPT
+#define ARCH_SI_TRAP TRAP_BRKPT
 
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/processor-flags.h b/compel/arch/arm/src/lib/include/uapi/asm/processor-flags.h
index 8745f4459..36edf231a 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/processor-flags.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/processor-flags.h
@@ -6,37 +6,37 @@
 /*
  * PSR bits
  */
-#define USR26_MODE	0x00000000
-#define FIQ26_MODE	0x00000001
-#define IRQ26_MODE	0x00000002
-#define SVC26_MODE	0x00000003
-#define USR_MODE	0x00000010
-#define FIQ_MODE	0x00000011
-#define IRQ_MODE	0x00000012
-#define SVC_MODE	0x00000013
-#define ABT_MODE	0x00000017
-#define UND_MODE	0x0000001b
-#define SYSTEM_MODE	0x0000001f
-#define MODE32_BIT	0x00000010
-#define MODE_MASK	0x0000001f
-#define PSR_T_BIT	0x00000020
-#define PSR_F_BIT	0x00000040
-#define PSR_I_BIT	0x00000080
-#define PSR_A_BIT	0x00000100
-#define PSR_E_BIT	0x00000200
-#define PSR_J_BIT	0x01000000
-#define PSR_Q_BIT	0x08000000
-#define PSR_V_BIT	0x10000000
-#define PSR_C_BIT	0x20000000
-#define PSR_Z_BIT	0x40000000
-#define PSR_N_BIT	0x80000000
+#define USR26_MODE  0x00000000
+#define FIQ26_MODE  0x00000001
+#define IRQ26_MODE  0x00000002
+#define SVC26_MODE  0x00000003
+#define USR_MODE    0x00000010
+#define FIQ_MODE    0x00000011
+#define IRQ_MODE    0x00000012
+#define SVC_MODE    0x00000013
+#define ABT_MODE    0x00000017
+#define UND_MODE    0x0000001b
+#define SYSTEM_MODE 0x0000001f
+#define MODE32_BIT  0x00000010
+#define MODE_MASK   0x0000001f
+#define PSR_T_BIT   0x00000020
+#define PSR_F_BIT   0x00000040
+#define PSR_I_BIT   0x00000080
+#define PSR_A_BIT   0x00000100
+#define PSR_E_BIT   0x00000200
+#define PSR_J_BIT   0x01000000
+#define PSR_Q_BIT   0x08000000
+#define PSR_V_BIT   0x10000000
+#define PSR_C_BIT   0x20000000
+#define PSR_Z_BIT   0x40000000
+#define PSR_N_BIT   0x80000000
 
 /*
  * Groups of PSR bits
  */
-#define PSR_f		0xff000000	/* Flags	*/
-#define PSR_s		0x00ff0000	/* Status	*/
-#define PSR_x		0x0000ff00	/* Extension	*/
-#define PSR_c		0x000000ff	/* Control	*/
+#define PSR_f 0xff000000 /* Flags	*/
+#define PSR_s 0x00ff0000 /* Status	*/
+#define PSR_x 0x0000ff00 /* Extension	*/
+#define PSR_c 0x000000ff /* Control	*/
 
 #endif
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h b/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
index 23ada50aa..3db9978d0 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
@@ -6,42 +6,42 @@
 /* Copied from the Linux kernel header arch/arm/include/asm/sigcontext.h */
 
 struct rt_sigcontext {
-	unsigned long		trap_no;
-	unsigned long		error_code;
-	unsigned long		oldmask;
-	unsigned long		arm_r0;
-	unsigned long		arm_r1;
-	unsigned long		arm_r2;
-	unsigned long		arm_r3;
-	unsigned long		arm_r4;
-	unsigned long		arm_r5;
-	unsigned long		arm_r6;
-	unsigned long		arm_r7;
-	unsigned long		arm_r8;
-	unsigned long		arm_r9;
-	unsigned long		arm_r10;
-	unsigned long		arm_fp;
-	unsigned long		arm_ip;
-	unsigned long		arm_sp;
-	unsigned long		arm_lr;
-	unsigned long		arm_pc;
-	unsigned long		arm_cpsr;
-	unsigned long		fault_address;
+	unsigned long trap_no;
+	unsigned long error_code;
+	unsigned long oldmask;
+	unsigned long arm_r0;
+	unsigned long arm_r1;
+	unsigned long arm_r2;
+	unsigned long arm_r3;
+	unsigned long arm_r4;
+	unsigned long arm_r5;
+	unsigned long arm_r6;
+	unsigned long arm_r7;
+	unsigned long arm_r8;
+	unsigned long arm_r9;
+	unsigned long arm_r10;
+	unsigned long arm_fp;
+	unsigned long arm_ip;
+	unsigned long arm_sp;
+	unsigned long arm_lr;
+	unsigned long arm_pc;
+	unsigned long arm_cpsr;
+	unsigned long fault_address;
 };
 
 /* Copied from the Linux kernel header arch/arm/include/asm/ucontext.h */
 
-#define VFP_MAGIC		0x56465001
-#define VFP_STORAGE_SIZE	sizeof(struct vfp_sigframe)
+#define VFP_MAGIC	 0x56465001
+#define VFP_STORAGE_SIZE sizeof(struct vfp_sigframe)
 
 struct vfp_sigframe {
-	unsigned long		magic;
-	unsigned long		size;
-	struct user_vfp		ufp;
-	struct user_vfp_exc	ufp_exc;
+	unsigned long magic;
+	unsigned long size;
+	struct user_vfp ufp;
+	struct user_vfp_exc ufp_exc;
 };
 
-typedef struct vfp_sigframe	fpu_state_t;
+typedef struct vfp_sigframe fpu_state_t;
 
 struct aux_sigframe {
 	/*
@@ -49,23 +49,23 @@ struct aux_sigframe {
 	struct iwmmxt_sigframe  iwmmxt;
 	*/
 
-	struct vfp_sigframe	vfp;
-	unsigned long		end_magic;
+	struct vfp_sigframe vfp;
+	unsigned long end_magic;
 } __attribute__((aligned(8)));
 
 #include <compel/sigframe-common.h>
 
 struct sigframe {
-	struct rt_ucontext	uc;
-	unsigned long		retcode[2];
+	struct rt_ucontext uc;
+	unsigned long retcode[2];
 };
 
 struct rt_sigframe {
-	struct rt_siginfo	info;
-	struct sigframe		sig;
+	struct rt_siginfo info;
+	struct sigframe sig;
 };
 
-
+/* clang-format off */
 #define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)				\
 	asm volatile(							\
 		     "mov sp, %0				    \n"	\
@@ -74,17 +74,16 @@ struct rt_sigframe {
 		     :							\
 		     : "r"(new_sp)					\
 		     : "memory")
+/* clang-format on */
 
-#define RT_SIGFRAME_UC(rt_sigframe)		(&rt_sigframe->sig.uc)
-#define RT_SIGFRAME_REGIP(rt_sigframe)		(rt_sigframe)->sig.uc.uc_mcontext.arm_ip
-#define RT_SIGFRAME_HAS_FPU(rt_sigframe)	1
-#define RT_SIGFRAME_AUX_SIGFRAME(rt_sigframe)	((struct aux_sigframe *)&(rt_sigframe)->sig.uc.uc_regspace)
-#define RT_SIGFRAME_FPU(rt_sigframe)		(&RT_SIGFRAME_AUX_SIGFRAME(rt_sigframe)->vfp)
-#define RT_SIGFRAME_OFFSET(rt_sigframe)		0
+#define RT_SIGFRAME_UC(rt_sigframe)	      (&rt_sigframe->sig.uc)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	      (rt_sigframe)->sig.uc.uc_mcontext.arm_ip
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe)      1
+#define RT_SIGFRAME_AUX_SIGFRAME(rt_sigframe) ((struct aux_sigframe *)&(rt_sigframe)->sig.uc.uc_regspace)
+#define RT_SIGFRAME_FPU(rt_sigframe)	      (&RT_SIGFRAME_AUX_SIGFRAME(rt_sigframe)->vfp)
+#define RT_SIGFRAME_OFFSET(rt_sigframe)	      0
 
-#define rt_sigframe_erase_sigset(sigframe)				\
-	memset(&sigframe->sig.uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
-#define rt_sigframe_copy_sigset(sigframe, from)				\
-	memcpy(&sigframe->sig.uc.uc_sigmask, from, sizeof(k_rtsigset_t))
+#define rt_sigframe_erase_sigset(sigframe)	memset(&sigframe->sig.uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from) memcpy(&sigframe->sig.uc.uc_sigmask, from, sizeof(k_rtsigset_t))
 
 #endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/mips/plugins/include/asm/prologue.h b/compel/arch/mips/plugins/include/asm/prologue.h
index 9d812eec9..c19ce54d7 100644
--- a/compel/arch/mips/plugins/include/asm/prologue.h
+++ b/compel/arch/mips/plugins/include/asm/prologue.h
@@ -9,17 +9,16 @@
 
 #include <errno.h>
 
-#define sys_recv(sockfd, ubuf, size, flags)	\
-	sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
+#define sys_recv(sockfd, ubuf, size, flags) sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
 
 typedef struct prologue_init_args {
-	struct sockaddr_un	ctl_sock_addr;
-	unsigned int		ctl_sock_addr_len;
+	struct sockaddr_un ctl_sock_addr;
+	unsigned int ctl_sock_addr_len;
 
-	unsigned int		arg_s;
-	void			*arg_p;
+	unsigned int arg_s;
+	void *arg_p;
 
-	void			*sigframe;
+	void *sigframe;
 } prologue_init_args_t;
 
 #endif /* __ASSEMBLY__ */
@@ -29,8 +28,8 @@ typedef struct prologue_init_args {
  *
  * FIXME It is rather should be taken from sigframe header.
  */
-#define PROLOGUE_SGFRAME_SIZE	4096
+#define PROLOGUE_SGFRAME_SIZE 4096
 
-#define PROLOGUE_INIT_ARGS_SIZE	1024
+#define PROLOGUE_INIT_ARGS_SIZE 1024
 
 #endif /* __ASM_PROLOGUE_H__ */
diff --git a/compel/arch/mips/plugins/include/asm/syscall-types.h b/compel/arch/mips/plugins/include/asm/syscall-types.h
index 64daf2c7a..bd7e8dfb3 100644
--- a/compel/arch/mips/plugins/include/asm/syscall-types.h
+++ b/compel/arch/mips/plugins/include/asm/syscall-types.h
@@ -8,13 +8,13 @@ typedef rt_signalfn_t *rt_sighandler_t;
 typedef void rt_restorefn_t(void);
 typedef rt_restorefn_t *rt_sigrestore_t;
 
-#define SA_RESTORER	0x04000000
+#define SA_RESTORER 0x04000000
 
 /** refer to linux-3.10/arch/mips/include/uapi/asm/signal.h*/
-#define _KNSIG		128
-#define _NSIG_BPW	64
+#define _KNSIG	  128
+#define _NSIG_BPW 64
 
-#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
 
 /*
  * Note: as k_rtsigset_t is the same size for 32-bit and 64-bit,
@@ -23,14 +23,14 @@ typedef rt_restorefn_t *rt_sigrestore_t;
  */
 
 typedef struct {
-	uint64_t	sig[_KNSIG_WORDS];
+	uint64_t sig[_KNSIG_WORDS];
 } k_rtsigset_t;
 
 typedef struct {
-	rt_sighandler_t	rt_sa_handler;
-	unsigned long	rt_sa_flags;
-	rt_sigrestore_t	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t;
 
 #endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/mips/src/lib/include/handle-elf.h b/compel/arch/mips/src/lib/include/handle-elf.h
index f28188136..aa650a2f6 100644
--- a/compel/arch/mips/src/lib/include/handle-elf.h
+++ b/compel/arch/mips/src/lib/include/handle-elf.h
@@ -3,6 +3,6 @@
 
 #include "elf64-types.h"
 
-#define arch_is_machine_supported(e_machine)	(e_machine == EM_MIPS)
+#define arch_is_machine_supported(e_machine) (e_machine == EM_MIPS)
 
 #endif /* COMPEL_HANDLE_ELF_H__ */
diff --git a/compel/arch/mips/src/lib/include/ldsodefs.h b/compel/arch/mips/src/lib/include/ldsodefs.h
index 54faa4668..8cfde2496 100644
--- a/compel/arch/mips/src/lib/include/ldsodefs.h
+++ b/compel/arch/mips/src/lib/include/ldsodefs.h
@@ -28,39 +28,27 @@ struct La_mips_32_retval;
 struct La_mips_64_regs;
 struct La_mips_64_retval;
 
-#define ARCH_PLTENTER_MEMBERS							\
-	Elf32_Addr (*mips_o32_gnu_pltenter) (Elf32_Sym *, unsigned int,		\
-					 uintptr_t *, uintptr_t *,		\
-					 struct La_mips_32_regs *,		\
-					 unsigned int *, const char *name,	\
-					 long int *framesizep);			\
-	Elf32_Addr (*mips_n32_gnu_pltenter) (Elf32_Sym *, unsigned int,		\
-					 uintptr_t *, uintptr_t *,		\
-					 struct La_mips_64_regs *,		\
-					 unsigned int *, const char *name,	\
-					 long int *framesizep);			\
-	Elf64_Addr (*mips_n64_gnu_pltenter) (Elf64_Sym *, unsigned int,		\
-					 uintptr_t *, uintptr_t *,		\
-					 struct La_mips_64_regs *,		\
-					 unsigned int *, const char *name,	\
-					 long int *framesizep);
+#define ARCH_PLTENTER_MEMBERS                                                                           \
+	Elf32_Addr (*mips_o32_gnu_pltenter)(Elf32_Sym *, unsigned int, uintptr_t *, uintptr_t *,        \
+					    struct La_mips_32_regs *, unsigned int *, const char *name, \
+					    long int *framesizep);                                      \
+	Elf32_Addr (*mips_n32_gnu_pltenter)(Elf32_Sym *, unsigned int, uintptr_t *, uintptr_t *,        \
+					    struct La_mips_64_regs *, unsigned int *, const char *name, \
+					    long int *framesizep);                                      \
+	Elf64_Addr (*mips_n64_gnu_pltenter)(Elf64_Sym *, unsigned int, uintptr_t *, uintptr_t *,        \
+					    struct La_mips_64_regs *, unsigned int *, const char *name, \
+					    long int *framesizep);
 
-#define ARCH_PLTEXIT_MEMBERS							\
-	unsigned int (*mips_o32_gnu_pltexit) (Elf32_Sym *, unsigned int,	\
-					  uintptr_t *, uintptr_t *,		\
-					  const struct La_mips_32_regs *,	\
-					  struct La_mips_32_retval *,		\
-					  const char *);			\
-	unsigned int (*mips_n32_gnu_pltexit) (Elf32_Sym *, unsigned int,	\
-					  uintptr_t *, uintptr_t *,		\
-					  const struct La_mips_64_regs *,	\
-					  struct La_mips_64_retval *,		\
-					  const char *);			\
-	unsigned int (*mips_n64_gnu_pltexit) (Elf64_Sym *, unsigned int,	\
-					  uintptr_t *, uintptr_t *,		\
-					  const struct La_mips_64_regs *,	\
-					  struct La_mips_64_retval *,		\
-					  const char *);
+#define ARCH_PLTEXIT_MEMBERS                                                                             \
+	unsigned int (*mips_o32_gnu_pltexit)(Elf32_Sym *, unsigned int, uintptr_t *, uintptr_t *,        \
+					     const struct La_mips_32_regs *, struct La_mips_32_retval *, \
+					     const char *);                                              \
+	unsigned int (*mips_n32_gnu_pltexit)(Elf32_Sym *, unsigned int, uintptr_t *, uintptr_t *,        \
+					     const struct La_mips_64_regs *, struct La_mips_64_retval *, \
+					     const char *);                                              \
+	unsigned int (*mips_n64_gnu_pltexit)(Elf64_Sym *, unsigned int, uintptr_t *, uintptr_t *,        \
+					     const struct La_mips_64_regs *, struct La_mips_64_retval *, \
+					     const char *);
 
 /* The MIPS ABI specifies that the dynamic section has to be read-only.  */
 
@@ -80,77 +68,63 @@ struct La_mips_64_retval;
 
 /* An entry in a 64 bit SHT_REL section.  */
 
-typedef struct
-{
-	Elf32_Word    r_sym;		/* Symbol index */
-	unsigned char r_ssym;		/* Special symbol for 2nd relocation */
-	unsigned char r_type3;	/* 3rd relocation type */
-	unsigned char r_type2;	/* 2nd relocation type */
-	unsigned char r_type1;	/* 1st relocation type */
+typedef struct {
+	Elf32_Word r_sym; /* Symbol index */
+	unsigned char r_ssym; /* Special symbol for 2nd relocation */
+	unsigned char r_type3; /* 3rd relocation type */
+	unsigned char r_type2; /* 2nd relocation type */
+	unsigned char r_type1; /* 1st relocation type */
 } _Elf64_Mips_R_Info;
 
-typedef union
-{
-	Elf64_Xword	r_info_number;
+typedef union {
+	Elf64_Xword r_info_number;
 	_Elf64_Mips_R_Info r_info_fields;
 } _Elf64_Mips_R_Info_union;
 
-typedef struct
-{
-	Elf64_Addr	r_offset;		/* Address */
-	_Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
+typedef struct {
+	Elf64_Addr r_offset; /* Address */
+	_Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */
 } Elf64_Mips_Rel;
 
-typedef struct
-{
-	Elf64_Addr	r_offset;		/* Address */
-	_Elf64_Mips_R_Info_union r_info;	/* Relocation type and symbol index */
-	Elf64_Sxword	r_addend;		/* Addend */
+typedef struct {
+	Elf64_Addr r_offset; /* Address */
+	_Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */
+	Elf64_Sxword r_addend; /* Addend */
 } Elf64_Mips_Rela;
 
-#define ELF64_MIPS_R_SYM(i) \
-	((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
+#define ELF64_MIPS_R_SYM(i) ((__extension__(_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
 
-#define ELF64_MIPS_R_TYPE(i) \
-	(((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 \
-	| ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
-			).r_info_fields.r_type2 << 8) \
-	| ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
-			).r_info_fields.r_type3 << 16) \
-	| ((Elf32_Word)(__extension__ (_Elf64_Mips_R_Info_union)(i) \
-			).r_info_fields.r_ssym << 24))
+#define ELF64_MIPS_R_TYPE(i)                                                                      \
+	(((_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1 |                                  \
+	 ((Elf32_Word)(__extension__(_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type2 << 8) |  \
+	 ((Elf32_Word)(__extension__(_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type3 << 16) | \
+	 ((Elf32_Word)(__extension__(_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_ssym << 24))
 
-#define ELF64_MIPS_R_INFO(sym, type) \
-	(__extension__ (_Elf64_Mips_R_Info_union) \
-	(__extension__ (_Elf64_Mips_R_Info) \
-	{ (sym), ELF64_MIPS_R_SSYM (type), \
-		ELF64_MIPS_R_TYPE3 (type), \
-		ELF64_MIPS_R_TYPE2 (type), \
-		ELF64_MIPS_R_TYPE1 (type) \
-	}).r_info_number)
+#define ELF64_MIPS_R_INFO(sym, type)                                                                          \
+	(__extension__(_Elf64_Mips_R_Info_union)(                                                             \
+		 __extension__(_Elf64_Mips_R_Info){ (sym), ELF64_MIPS_R_SSYM(type), ELF64_MIPS_R_TYPE3(type), \
+						    ELF64_MIPS_R_TYPE2(type), ELF64_MIPS_R_TYPE1(type) })     \
+		 .r_info_number)
 
 /*
  * These macros decompose the value returned by ELF64_MIPS_R_TYPE, and
  * compose it back into a value that it can be used as an argument to
  * ELF64_MIPS_R_INFO.
  */
-#define ELF64_MIPS_R_SSYM(i) (((i) >> 24) & 0xff)
+#define ELF64_MIPS_R_SSYM(i)  (((i) >> 24) & 0xff)
 #define ELF64_MIPS_R_TYPE3(i) (((i) >> 16) & 0xff)
 #define ELF64_MIPS_R_TYPE2(i) (((i) >> 8) & 0xff)
-#define ELF64_MIPS_R_TYPE1(i) ((i) & 0xff)
+#define ELF64_MIPS_R_TYPE1(i) ((i)&0xff)
 #define ELF64_MIPS_R_TYPEENC(type1, type2, type3, ssym) \
-	((type1) \
-	| ((Elf32_Word)(type2) << 8) \
-	| ((Elf32_Word)(type3) << 16) \
-	| ((Elf32_Word)(ssym) << 24))
+	((type1) | ((Elf32_Word)(type2) << 8) | ((Elf32_Word)(type3) << 16) | ((Elf32_Word)(ssym) << 24))
 
 #undef ELF64_R_SYM
-#define ELF64_R_SYM(i) ELF64_MIPS_R_SYM (i)
+#define ELF64_R_SYM(i) ELF64_MIPS_R_SYM(i)
 #undef ELF64_R_TYPE
 
 /*fixme*/
-#define ELF64_R_TYPE(i) (ELF64_MIPS_R_TYPE (i) & 0x00ff)
+#define ELF64_R_TYPE(i) (ELF64_MIPS_R_TYPE(i) & 0x00ff)
 #undef ELF64_R_INFO
-#define ELF64_R_INFO(sym, type) ELF64_MIPS_R_INFO ((sym), (type))
+#define ELF64_R_INFO(sym, type) ELF64_MIPS_R_INFO((sym), (type))
 
 #endif
diff --git a/compel/arch/mips/src/lib/include/syscall.h b/compel/arch/mips/src/lib/include/syscall.h
index 704080172..6cad7ca73 100644
--- a/compel/arch/mips/src/lib/include/syscall.h
+++ b/compel/arch/mips/src/lib/include/syscall.h
@@ -2,6 +2,6 @@
 #define __COMPEL_SYSCALL_H__
 
 #ifndef SIGSTKFLT
-#define SIGSTKFLT	16
+#define SIGSTKFLT 16
 #endif
 #endif
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/cpu.h b/compel/arch/mips/src/lib/include/uapi/asm/cpu.h
index 329b9529b..e568df789 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/cpu.h
@@ -1,5 +1,6 @@
 #ifndef __CR_ASM_CPU_H__
 #define __CR_ASM_CPU_H__
 
-typedef struct { } compel_cpuinfo_t;
+typedef struct {
+} compel_cpuinfo_t;
 #endif /* __CR_ASM_CPU_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
index 2a85dd402..70b3f85a5 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
@@ -6,8 +6,8 @@
 #include <signal.h>
 #include <compel/plugins/std/asm/syscall-types.h>
 #include <linux/types.h>
-#define SIGMAX			64
-#define SIGMAX_OLD		31
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
 
 /*
  * Copied from the Linux kernel header arch/mips/include/asm/ptrace.h
@@ -35,35 +35,33 @@ typedef struct {
 	__u32 fpu_fcr31;
 	__u32 fpu_id;
 
-
 } user_fpregs_struct_t;
 
-#define MIPS_a0			regs[4] //arguments a0-a3
-#define MIPS_t0			regs[8] //temporaries t0-t7
-#define MIPS_v0			regs[2]
-#define MIPS_v1			regs[3]
-#define MIPS_sp			regs[29]
-#define MIPS_ra			regs[31]
+#define MIPS_a0 regs[4] //arguments a0-a3
+#define MIPS_t0 regs[8] //temporaries t0-t7
+#define MIPS_v0 regs[2]
+#define MIPS_v1 regs[3]
+#define MIPS_sp regs[29]
+#define MIPS_ra regs[31]
 
-
-#define NATIVE_MAGIC	0x0A
-#define COMPAT_MAGIC	0x0C
+#define NATIVE_MAGIC 0x0A
+#define COMPAT_MAGIC 0x0C
 static inline bool user_regs_native(user_regs_struct_t *pregs)
 {
 	return true;
 }
 
 #define __compel_arch_fetch_thread_area(tid, th) 0
-#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
-#define REG_RES(regs)		((regs).MIPS_v0)
-#define REG_IP(regs)		((regs).cp0_epc)
-#define REG_SP(regs)		((regs).MIPS_sp)
-#define REG_SYSCALL_NR(regs)	((regs).MIPS_v0)
+#define REG_RES(regs)	     ((regs).MIPS_v0)
+#define REG_IP(regs)	     ((regs).cp0_epc)
+#define REG_SP(regs)	     ((regs).MIPS_sp)
+#define REG_SYSCALL_NR(regs) ((regs).MIPS_v0)
 
 //#define __NR(syscall, compat)	((compat) ? __NR32_##syscall : __NR_##syscall)
-#define __NR(syscall, compat)	__NR_##syscall
+#define __NR(syscall, compat) __NR_##syscall
 
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
index c08fe06a3..5d0a0628e 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/sigframe.h
@@ -11,13 +11,12 @@
 #define u32 __u32
 
 /* sigcontext defined in /usr/include/asm/sigcontext.h*/
-#define rt_sigcontext			sigcontext
-
+#define rt_sigcontext sigcontext
 
 #include <compel/sigframe-common.h>
 
 /* refer to linux-3.10/include/uapi/asm-generic/ucontext.h */
-struct k_ucontext{
+struct k_ucontext {
 	unsigned long uc_flags;
 	struct k_ucontext *uc_link;
 	stack_t uc_stack;
@@ -27,23 +26,21 @@ struct k_ucontext{
 
 /* Copy from the kernel source arch/mips/kernel/signal.c */
 struct rt_sigframe {
-	u32 rs_ass[4];		/* argument save space for o32 */
-	u32 rs_pad[2];		/* Was: signal trampoline */
+	u32 rs_ass[4]; /* argument save space for o32 */
+	u32 rs_pad[2]; /* Was: signal trampoline */
 	siginfo_t rs_info;
 	struct k_ucontext rs_uc;
 };
 
-
-#define RT_SIGFRAME_UC(rt_sigframe)		(&rt_sigframe->rs_uc)
-#define RT_SIGFRAME_UC_SIGMASK(rt_sigframe) 	((k_rtsigset_t *)(void *)&rt_sigframe->rs_uc.uc_sigmask)
-#define RT_SIGFRAME_REGIP(rt_sigframe)	((long unsigned int)0x00)
+#define RT_SIGFRAME_UC(rt_sigframe)	    (&rt_sigframe->rs_uc)
+#define RT_SIGFRAME_UC_SIGMASK(rt_sigframe) ((k_rtsigset_t *)(void *)&rt_sigframe->rs_uc.uc_sigmask)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	    ((long unsigned int)0x00)
 #define RT_SIGFRAME_FPU(rt_sigframe)
 #define RT_SIGFRAME_HAS_FPU(rt_sigframe) 1
 
+#define RT_SIGFRAME_OFFSET(rt_sigframe) 0
 
-#define RT_SIGFRAME_OFFSET(rt_sigframe)	0
-
-
+/* clang-format off */
 #define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)			\
 	asm volatile(						\
 	"move $29, %0					\n"	\
@@ -52,12 +49,10 @@ struct rt_sigframe {
 	:							\
 	: "r"(new_sp)						\
 	: "$2","memory")
+/* clang-format on */
 
-int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
-		struct rt_sigframe *rsigframe);
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe);
 
-#define rt_sigframe_erase_sigset(sigframe)				\
-	memset(&sigframe->rs_uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
-#define rt_sigframe_copy_sigset(sigframe, from)				\
-	memcpy(&sigframe->rs_uc.uc_sigmask, from, sizeof(k_rtsigset_t))
+#define rt_sigframe_erase_sigset(sigframe)	memset(&sigframe->rs_uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from) memcpy(&sigframe->rs_uc.uc_sigmask, from, sizeof(k_rtsigset_t))
 #endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
index 519aea1a6..82ae6096b 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
@@ -9,8 +9,7 @@
 #ifndef _UAPI_ASM_SIGINFO_H
 #define _UAPI_ASM_SIGINFO_H
 
-
-#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2*sizeof(int))
+#define __ARCH_SIGEV_PREAMBLE_SIZE (sizeof(long) + 2 * sizeof(int))
 #undef __ARCH_SI_TRAPNO /* exception code needs to fill this ...  */
 
 #define HAVE_ARCH_SIGINFO_T
@@ -25,10 +24,10 @@
 
 #define SI_MAX_SIZE	128
 #define SI_PAD_SIZE	((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
-#define __ARCH_SI_UID_T	__kernel_uid32_t
+#define __ARCH_SI_UID_T __kernel_uid32_t
 
 #ifndef __ARCH_SI_UID_T
-#define __ARCH_SI_UID_T	__kernel_uid32_t
+#define __ARCH_SI_UID_T __kernel_uid32_t
 #endif
 
 #ifndef __ARCH_SI_BAND_T
@@ -53,31 +52,31 @@ typedef struct siginfo {
 
 		/* kill() */
 		struct {
-			__kernel_pid_t _pid;	/* sender's pid */
-			__ARCH_SI_UID_T _uid;	/* sender's uid */
+			__kernel_pid_t _pid; /* sender's pid */
+			__ARCH_SI_UID_T _uid; /* sender's uid */
 		} _kill;
 
 		/* POSIX.1b timers */
 		struct {
-			__kernel_timer_t _tid;	/* timer id */
-			int _overrun;		/* overrun count */
-			char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)];
-			sigval_t _sigval;	/* same as below */
-			int _sys_private;       /* not to be passed to user */
+			__kernel_timer_t _tid; /* timer id */
+			int _overrun; /* overrun count */
+			char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
+			sigval_t _sigval; /* same as below */
+			int _sys_private; /* not to be passed to user */
 		} _timer;
 
 		/* POSIX.1b signals */
 		struct {
-			__kernel_pid_t _pid;	/* sender's pid */
-			__ARCH_SI_UID_T _uid;	/* sender's uid */
+			__kernel_pid_t _pid; /* sender's pid */
+			__ARCH_SI_UID_T _uid; /* sender's uid */
 			sigval_t _sigval;
 		} _rt;
 
 		/* SIGCHLD */
 		struct {
-			__kernel_pid_t _pid;	/* which child */
-			__ARCH_SI_UID_T _uid;	/* sender's uid */
-			int _status;		/* exit code */
+			__kernel_pid_t _pid; /* which child */
+			__ARCH_SI_UID_T _uid; /* sender's uid */
+			int _status; /* exit code */
 			__ARCH_SI_CLOCK_T _utime;
 			__ARCH_SI_CLOCK_T _stime;
 		} _sigchld;
@@ -86,7 +85,7 @@ typedef struct siginfo {
 		struct {
 			void *_addr; /* faulting insn/memory ref. */
 #ifdef __ARCH_SI_TRAPNO
-			int _trapno;	/* TRAP # which caused the signal */
+			int _trapno; /* TRAP # which caused the signal */
 #endif
 			short _addr_lsb; /* LSB of the reported address */
 #ifndef __GENKSYMS__
@@ -99,15 +98,15 @@ typedef struct siginfo {
 
 		/* SIGPOLL */
 		struct {
-			__ARCH_SI_BAND_T _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
+			__ARCH_SI_BAND_T _band; /* POLL_IN, POLL_OUT, POLL_MSG */
 			int _fd;
 		} _sigpoll;
 
 		/* SIGSYS */
 		struct {
 			void *_call_addr; /* calling user insn */
-			int _syscall;	/* triggering system call number */
-			unsigned int _arch;	/* AUDIT_ARCH_* of syscall */
+			int _syscall; /* triggering system call number */
+			unsigned int _arch; /* AUDIT_ARCH_* of syscall */
 		} _sigsys;
 	} _sifields;
 } __ARCH_SI_ATTRIBUTES siginfo_t;
@@ -119,6 +118,6 @@ typedef struct siginfo {
 #undef SI_ASYNCIO
 #undef SI_TIMER
 #undef SI_MESGQ
-#define SI_ASYNCIO	-2	/* sent by AIO completion */
+#define SI_ASYNCIO -2 /* sent by AIO completion */
 
 #endif /* _UAPI_ASM_SIGINFO_H */
diff --git a/compel/arch/ppc64/plugins/include/asm/syscall-types.h b/compel/arch/ppc64/plugins/include/asm/syscall-types.h
index 7754721e2..1bea8496b 100644
--- a/compel/arch/ppc64/plugins/include/asm/syscall-types.h
+++ b/compel/arch/ppc64/plugins/include/asm/syscall-types.h
@@ -1,7 +1,7 @@
 #ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
 #define COMPEL_ARCH_SYSCALL_TYPES_H__
 
-#define SA_RESTORER     0x04000000U
+#define SA_RESTORER 0x04000000U
 
 typedef void rt_signalfn_t(int, siginfo_t *, void *);
 typedef rt_signalfn_t *rt_sighandler_t;
@@ -9,20 +9,20 @@ typedef rt_signalfn_t *rt_sighandler_t;
 typedef void rt_restorefn_t(void);
 typedef rt_restorefn_t *rt_sigrestore_t;
 
-#define _KNSIG		64
-#define _NSIG_BPW	64
+#define _KNSIG	  64
+#define _NSIG_BPW 64
 
-#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
 
 typedef struct {
-	unsigned long	sig[_KNSIG_WORDS];
+	unsigned long sig[_KNSIG_WORDS];
 } k_rtsigset_t;
 
 typedef struct {
-	rt_sighandler_t	rt_sa_handler;
-	unsigned long	rt_sa_flags;
-	rt_sigrestore_t	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t;
 
 #endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/ppc64/src/lib/include/handle-elf.h b/compel/arch/ppc64/src/lib/include/handle-elf.h
index 1a8217e6b..ae20186a2 100644
--- a/compel/arch/ppc64/src/lib/include/handle-elf.h
+++ b/compel/arch/ppc64/src/lib/include/handle-elf.h
@@ -5,8 +5,8 @@
 
 #define ELF_PPC64
 
-#define __handle_elf				handle_elf_ppc64
-#define arch_is_machine_supported(e_machine)	(e_machine == EM_PPC64)
+#define __handle_elf			     handle_elf_ppc64
+#define arch_is_machine_supported(e_machine) (e_machine == EM_PPC64)
 
 extern int handle_elf_ppc64(void *mem, size_t size);
 
diff --git a/compel/arch/ppc64/src/lib/include/syscall.h b/compel/arch/ppc64/src/lib/include/syscall.h
index 30290667a..13ee906e1 100644
--- a/compel/arch/ppc64/src/lib/include/syscall.h
+++ b/compel/arch/ppc64/src/lib/include/syscall.h
@@ -1,4 +1,8 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 #endif
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/cpu.h b/compel/arch/ppc64/src/lib/include/uapi/asm/cpu.h
index 59925868c..475e2bd59 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/cpu.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 typedef struct {
-	uint64_t	hwcap[2];
+	uint64_t hwcap[2];
 } compel_cpuinfo_t;
 
 #endif /* UAPI_COMPEL_ASM_CPU_H__ */
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
index b65c942ee..fe6192e20 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
@@ -5,8 +5,8 @@
 #include <signal.h>
 #include <stdint.h>
 
-#define SIGMAX_OLD	31
-#define SIGMAX		64
+#define SIGMAX_OLD 31
+#define SIGMAX	   64
 
 /*
  * Copied from kernel header arch/powerpc/include/uapi/asm/ptrace.h
@@ -15,44 +15,44 @@ typedef struct {
 	unsigned long gpr[32];
 	unsigned long nip;
 	unsigned long msr;
-	unsigned long orig_gpr3;	/* Used for restarting system calls */
+	unsigned long orig_gpr3; /* Used for restarting system calls */
 	unsigned long ctr;
 	unsigned long link;
 	unsigned long xer;
 	unsigned long ccr;
-	unsigned long softe;		/* Soft enabled/disabled */
-	unsigned long trap;		/* Reason for being here */
+	unsigned long softe; /* Soft enabled/disabled */
+	unsigned long trap; /* Reason for being here */
 	/*
 	 * N.B. for critical exceptions on 4xx, the dar and dsisr
 	 * fields are overloaded to hold srr0 and srr1.
 	 */
-	unsigned long dar;		/* Fault registers */
-	unsigned long dsisr;		/* on 4xx/Book-E used for ESR */
-	unsigned long result;		/* Result of a system call */
+	unsigned long dar; /* Fault registers */
+	unsigned long dsisr; /* on 4xx/Book-E used for ESR */
+	unsigned long result; /* Result of a system call */
 } user_regs_struct_t;
 
-#define NVSXREG	32
+#define NVSXREG 32
 
-#define USER_FPREGS_FL_FP	0x00001
-#define USER_FPREGS_FL_ALTIVEC	0x00002
-#define USER_FPREGS_FL_VSX	0x00004
-#define USER_FPREGS_FL_TM	0x00010
+#define USER_FPREGS_FL_FP      0x00001
+#define USER_FPREGS_FL_ALTIVEC 0x00002
+#define USER_FPREGS_FL_VSX     0x00004
+#define USER_FPREGS_FL_TM      0x00010
 
 #ifndef NT_PPC_TM_SPR
-# define NT_PPC_TM_CGPR		0x108		/* TM checkpointed GPR Registers */
-# define NT_PPC_TM_CFPR		0x109		/* TM checkpointed FPR Registers */
-# define NT_PPC_TM_CVMX		0x10a		/* TM checkpointed VMX Registers */
-# define NT_PPC_TM_CVSX		0x10b		/* TM checkpointed VSX Registers */
-# define NT_PPC_TM_SPR		0x10c		/* TM Special Purpose Registers */
+#define NT_PPC_TM_CGPR 0x108 /* TM checkpointed GPR Registers */
+#define NT_PPC_TM_CFPR 0x109 /* TM checkpointed FPR Registers */
+#define NT_PPC_TM_CVMX 0x10a /* TM checkpointed VMX Registers */
+#define NT_PPC_TM_CVSX 0x10b /* TM checkpointed VSX Registers */
+#define NT_PPC_TM_SPR  0x10c /* TM Special Purpose Registers */
 #endif
 
-#define MSR_TMA			(1UL<<34)	/* bit 29 Trans Mem state: Transactional */
-#define MSR_TMS			(1UL<<33)	/* bit 30 Trans Mem state: Suspended */
-#define MSR_TM			(1UL<<32)	/* bit 31 Trans Mem Available */
-#define MSR_VEC			(1UL<<25)
-#define MSR_VSX			(1UL<<23)
+#define MSR_TMA (1UL << 34) /* bit 29 Trans Mem state: Transactional */
+#define MSR_TMS (1UL << 33) /* bit 30 Trans Mem state: Suspended */
+#define MSR_TM	(1UL << 32) /* bit 31 Trans Mem Available */
+#define MSR_VEC (1UL << 25)
+#define MSR_VSX (1UL << 23)
 
-#define MSR_TM_ACTIVE(x) ((((x) & MSR_TM) && ((x)&(MSR_TMA|MSR_TMS))) != 0)
+#define MSR_TM_ACTIVE(x) ((((x)&MSR_TM) && ((x) & (MSR_TMA | MSR_TMS))) != 0)
 
 typedef struct {
 	uint64_t fpregs[NFPREG];
@@ -72,19 +72,23 @@ typedef struct {
 	} tm;
 } user_fpregs_struct_t;
 
-#define REG_RES(regs)		((uint64_t)(regs).gpr[3])
-#define REG_IP(regs)		((uint64_t)(regs).nip)
-#define REG_SP(regs)		((uint64_t)(regs).gpr[1])
-#define REG_SYSCALL_NR(regs)	((uint64_t)(regs).gpr[0])
+#define REG_RES(regs)	     ((uint64_t)(regs).gpr[3])
+#define REG_IP(regs)	     ((uint64_t)(regs).nip)
+#define REG_SP(regs)	     ((uint64_t)(regs).gpr[1])
+#define REG_SYSCALL_NR(regs) ((uint64_t)(regs).gpr[0])
 
-#define user_regs_native(pregs)			true
+#define user_regs_native(pregs) true
 
 #define ARCH_SI_TRAP TRAP_BRKPT
 
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 
 #define __compel_arch_fetch_thread_area(tid, th) 0
-#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
index 5c98b199d..eb12c9f7c 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
@@ -19,30 +19,31 @@
 
 #include <compel/sigframe-common.h>
 
-#define RT_SIGFRAME_OFFSET(rt_sigframe)	0
+#define RT_SIGFRAME_OFFSET(rt_sigframe) 0
 
 /* Copied from the Linux kernel header arch/powerpc/include/asm/ptrace.h */
-#define USER_REDZONE_SIZE		512
+#define USER_REDZONE_SIZE 512
 
 /* Copied from the Linux kernel source file arch/powerpc/kernel/signal_64.c */
-#define TRAMP_SIZE			6
+#define TRAMP_SIZE 6
 
 /*
  * ucontext_t defined in /usr/include/powerpc64le-linux-gnu/sys/ucontext.h
  */
 struct rt_sigframe {
-        /* sys_rt_sigreturn requires the ucontext be the first field */
-        ucontext_t			uc;
-        ucontext_t			uc_transact; /* Transactional state	 */
-        unsigned long			_unused[2];
-        unsigned int			tramp[TRAMP_SIZE];
-        struct rt_siginfo		*pinfo;
-        void				*puc;
-        struct rt_siginfo		info;
-        /* New 64 bit little-endian ABI allows redzone of 512 bytes below sp */
-        char				abigap[USER_REDZONE_SIZE];
+	/* sys_rt_sigreturn requires the ucontext be the first field */
+	ucontext_t uc;
+	ucontext_t uc_transact; /* Transactional state	 */
+	unsigned long _unused[2];
+	unsigned int tramp[TRAMP_SIZE];
+	struct rt_siginfo *pinfo;
+	void *puc;
+	struct rt_siginfo info;
+	/* New 64 bit little-endian ABI allows redzone of 512 bytes below sp */
+	char abigap[USER_REDZONE_SIZE];
 } __attribute__((aligned(16)));
 
+/* clang-format off */
 #define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)			\
         asm volatile(						\
 		"mr 1, %0 \n"					\
@@ -51,29 +52,28 @@ struct rt_sigframe {
 		:						\
 		: "r"(new_sp)					\
 		: "memory")
+/* clang-format on */
 
 #if _CALL_ELF != 2
-# error Only supporting ABIv2.
+#error Only supporting ABIv2.
 #else
-# define FRAME_MIN_SIZE_PARM		96
+#define FRAME_MIN_SIZE_PARM 96
 #endif
 
-#define RT_SIGFRAME_UC(rt_sigframe)		(&(rt_sigframe)->uc)
-#define RT_SIGFRAME_REGIP(rt_sigframe)		((long unsigned int)(rt_sigframe)->uc.uc_mcontext.gp_regs[PT_NIP])
-#define RT_SIGFRAME_HAS_FPU(rt_sigframe)	(1)
-#define RT_SIGFRAME_FPU(rt_sigframe)		(&(rt_sigframe)->uc.uc_mcontext)
+#define RT_SIGFRAME_UC(rt_sigframe)	 (&(rt_sigframe)->uc)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	 ((long unsigned int)(rt_sigframe)->uc.uc_mcontext.gp_regs[PT_NIP])
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe) (1)
+#define RT_SIGFRAME_FPU(rt_sigframe)	 (&(rt_sigframe)->uc.uc_mcontext)
 
-#define rt_sigframe_erase_sigset(sigframe)				\
-	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
-#define rt_sigframe_copy_sigset(sigframe, from)				\
-	memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
+#define rt_sigframe_erase_sigset(sigframe)	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from) memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
 
-#define MSR_TMA (1UL<<34)	/* bit 29 Trans Mem state: Transactional */
-#define MSR_TMS (1UL<<33)	/* bit 30 Trans Mem state: Suspended */
-#define MSR_TM  (1UL<<32)	/* bit 31 Trans Mem Available */
-#define MSR_VEC (1UL<<25)
-#define MSR_VSX (1UL<<23)
+#define MSR_TMA (1UL << 34) /* bit 29 Trans Mem state: Transactional */
+#define MSR_TMS (1UL << 33) /* bit 30 Trans Mem state: Suspended */
+#define MSR_TM	(1UL << 32) /* bit 31 Trans Mem Available */
+#define MSR_VEC (1UL << 25)
+#define MSR_VSX (1UL << 23)
 
-#define MSR_TM_ACTIVE(x) ((((x) & MSR_TM) && ((x)&(MSR_TMA|MSR_TMS))) != 0)
+#define MSR_TM_ACTIVE(x) ((((x)&MSR_TM) && ((x) & (MSR_TMA | MSR_TMS))) != 0)
 
 #endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/s390/plugins/include/asm/syscall-types.h b/compel/arch/s390/plugins/include/asm/syscall-types.h
index 55d7ddb61..dd635399d 100644
--- a/compel/arch/s390/plugins/include/asm/syscall-types.h
+++ b/compel/arch/s390/plugins/include/asm/syscall-types.h
@@ -1,7 +1,7 @@
 #ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
 #define COMPEL_ARCH_SYSCALL_TYPES_H__
 
-#define SA_RESTORER     0x04000000U
+#define SA_RESTORER 0x04000000U
 
 typedef void rt_signalfn_t(int, siginfo_t *, void *);
 typedef rt_signalfn_t *rt_sighandler_t;
@@ -9,13 +9,13 @@ typedef rt_signalfn_t *rt_sighandler_t;
 typedef void rt_restorefn_t(void);
 typedef rt_restorefn_t *rt_sigrestore_t;
 
-#define _KNSIG		64
-#define _NSIG_BPW	64
+#define _KNSIG	  64
+#define _NSIG_BPW 64
 
-#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
 
 typedef struct {
-	unsigned long	sig[_KNSIG_WORDS];
+	unsigned long sig[_KNSIG_WORDS];
 } k_rtsigset_t;
 
 /*
@@ -23,10 +23,10 @@ typedef struct {
  * include/linux/signal.h.
  */
 typedef struct {
-	rt_sighandler_t	rt_sa_handler;
-	unsigned long	rt_sa_flags;
-	rt_sigrestore_t	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t;
 
 struct mmap_arg_struct;
diff --git a/compel/arch/s390/src/lib/include/handle-elf.h b/compel/arch/s390/src/lib/include/handle-elf.h
index cd1357401..597d8059f 100644
--- a/compel/arch/s390/src/lib/include/handle-elf.h
+++ b/compel/arch/s390/src/lib/include/handle-elf.h
@@ -5,8 +5,8 @@
 
 #define ELF_S390
 
-#define __handle_elf				handle_elf_s390
-#define arch_is_machine_supported(e_machine)	(e_machine == EM_S390)
+#define __handle_elf			     handle_elf_s390
+#define arch_is_machine_supported(e_machine) (e_machine == EM_S390)
 
 int handle_elf_s390(void *mem, size_t size);
 
diff --git a/compel/arch/s390/src/lib/include/syscall.h b/compel/arch/s390/src/lib/include/syscall.h
index 57d49121f..828f29e4b 100644
--- a/compel/arch/s390/src/lib/include/syscall.h
+++ b/compel/arch/s390/src/lib/include/syscall.h
@@ -1,8 +1,7 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
 
-unsigned long sys_mmap(void *addr, unsigned long len, unsigned long prot,
-		       unsigned long flags, unsigned long fd,
+unsigned long sys_mmap(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd,
 		       unsigned long offset);
 
 #endif
diff --git a/compel/arch/s390/src/lib/include/uapi/asm/cpu.h b/compel/arch/s390/src/lib/include/uapi/asm/cpu.h
index b01db511d..c2652b2f4 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/cpu.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 typedef struct {
-	uint64_t		hwcap[2];
+	uint64_t hwcap[2];
 } compel_cpuinfo_t;
 
 #endif /* __CR_ASM_CPU_H__ */
diff --git a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
index 807be5a9a..896d70ed1 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
@@ -7,8 +7,8 @@
 #include <asm/ptrace.h>
 #include "common/page.h"
 
-#define SIGMAX			64
-#define SIGMAX_OLD		31
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
 
 /*
  * Definitions from /usr/include/asm/ptrace.h:
@@ -33,28 +33,28 @@ typedef struct {
 } vector128_t;
 
 struct prfpreg {
-	uint32_t	fpc;
-	uint64_t	fprs[16];
+	uint32_t fpc;
+	uint64_t fprs[16];
 };
 
-#define USER_FPREGS_VXRS	0x000000001
+#define USER_FPREGS_VXRS 0x000000001
 /* Guarded-storage control block */
-#define USER_GS_CB		0x000000002
+#define USER_GS_CB 0x000000002
 /* Guarded-storage broadcast control block */
-#define USER_GS_BC		0x000000004
+#define USER_GS_BC 0x000000004
 /* Runtime-instrumentation control block */
-#define USER_RI_CB		0x000000008
+#define USER_RI_CB 0x000000008
 /* Runtime-instrumentation bit set */
-#define USER_RI_ON		0x000000010
+#define USER_RI_ON 0x000000010
 
 typedef struct {
-	uint32_t	flags;
-	struct prfpreg	prfpreg;
-	uint64_t	vxrs_low[16];
-	vector128_t	vxrs_high[16];
-	uint64_t	gs_cb[4];
-	uint64_t	gs_bc[4];
-	uint64_t	ri_cb[8];
+	uint32_t flags;
+	struct prfpreg prfpreg;
+	uint64_t vxrs_low[16];
+	vector128_t vxrs_high[16];
+	uint64_t gs_cb[4];
+	uint64_t gs_bc[4];
+	uint64_t ri_cb[8];
 } user_fpregs_struct_t;
 
 typedef struct {
@@ -62,18 +62,22 @@ typedef struct {
 	uint32_t system_call;
 } user_regs_struct_t;
 
-#define REG_RES(r)			((uint64_t)(r).prstatus.gprs[2])
-#define REG_IP(r)			((uint64_t)(r).prstatus.psw.addr)
-#define REG_SP(r)			((uint64_t)(r).prstatus.gprs[15])
+#define REG_RES(r) ((uint64_t)(r).prstatus.gprs[2])
+#define REG_IP(r)  ((uint64_t)(r).prstatus.psw.addr)
+#define REG_SP(r)  ((uint64_t)(r).prstatus.gprs[15])
 /*
  * We assume that REG_SYSCALL_NR() is only used for pie code where we
  * always use svc 0 with opcode in %r1.
  */
-#define REG_SYSCALL_NR(r)		((uint64_t)(r).prstatus.gprs[1])
+#define REG_SYSCALL_NR(r) ((uint64_t)(r).prstatus.gprs[1])
 
-#define user_regs_native(pregs)		true
+#define user_regs_native(pregs) true
 
-#define __NR(syscall, compat) ({ (void)compat; __NR_##syscall; })
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
 
 struct mmap_arg_struct {
 	unsigned long addr;
@@ -85,7 +89,7 @@ struct mmap_arg_struct {
 };
 
 #define __compel_arch_fetch_thread_area(tid, th) 0
-#define compel_arch_fetch_thread_area(tctl) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
diff --git a/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h b/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
index c599ef3ab..965fef102 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
@@ -36,14 +36,14 @@ typedef struct {
  * From /usr/include/uapi/asm/ucontext.h
  */
 struct ucontext_extended {
-	unsigned long     uc_flags;
-	ucontext_t       *uc_link;
-	stack_t           uc_stack;
-	_sigregs          uc_mcontext;
-	sigset_t          uc_sigmask;
+	unsigned long uc_flags;
+	ucontext_t *uc_link;
+	stack_t uc_stack;
+	_sigregs uc_mcontext;
+	sigset_t uc_sigmask;
 	/* Allow for uc_sigmask growth.  Glibc uses a 1024-bit sigset_t.  */
-	unsigned char     __unused[128 - sizeof(sigset_t)];
-	_sigregs_ext      uc_mcontext_ext;
+	unsigned char __unused[128 - sizeof(sigset_t)];
+	_sigregs_ext uc_mcontext_ext;
 };
 
 /*
@@ -59,6 +59,7 @@ struct rt_sigframe {
 /*
  * Do rt_sigreturn SVC
  */
+/* clang-format off */
 #define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)			\
 	asm volatile(						\
 		"lgr	%%r15,%0\n"				\
@@ -67,14 +68,13 @@ struct rt_sigframe {
 		:						\
 		: "d" (new_sp)					\
 		: "memory")
+/* clang-format on */
 
-#define RT_SIGFRAME_UC(rt_sigframe) (&rt_sigframe->uc)
-#define RT_SIGFRAME_REGIP(rt_sigframe) (rt_sigframe)->uc.uc_mcontext.regs.psw.addr
-#define RT_SIGFRAME_HAS_FPU(rt_sigframe)	(1)
+#define RT_SIGFRAME_UC(rt_sigframe)	 (&rt_sigframe->uc)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	 (rt_sigframe)->uc.uc_mcontext.regs.psw.addr
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe) (1)
 
-#define rt_sigframe_erase_sigset(sigframe)				\
-	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
-#define rt_sigframe_copy_sigset(sigframe, from)				\
-	memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
+#define rt_sigframe_erase_sigset(sigframe)	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from) memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
 
 #endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/x86/plugins/include/asm/prologue.h b/compel/arch/x86/plugins/include/asm/prologue.h
index 9d812eec9..c19ce54d7 100644
--- a/compel/arch/x86/plugins/include/asm/prologue.h
+++ b/compel/arch/x86/plugins/include/asm/prologue.h
@@ -9,17 +9,16 @@
 
 #include <errno.h>
 
-#define sys_recv(sockfd, ubuf, size, flags)	\
-	sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
+#define sys_recv(sockfd, ubuf, size, flags) sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
 
 typedef struct prologue_init_args {
-	struct sockaddr_un	ctl_sock_addr;
-	unsigned int		ctl_sock_addr_len;
+	struct sockaddr_un ctl_sock_addr;
+	unsigned int ctl_sock_addr_len;
 
-	unsigned int		arg_s;
-	void			*arg_p;
+	unsigned int arg_s;
+	void *arg_p;
 
-	void			*sigframe;
+	void *sigframe;
 } prologue_init_args_t;
 
 #endif /* __ASSEMBLY__ */
@@ -29,8 +28,8 @@ typedef struct prologue_init_args {
  *
  * FIXME It is rather should be taken from sigframe header.
  */
-#define PROLOGUE_SGFRAME_SIZE	4096
+#define PROLOGUE_SGFRAME_SIZE 4096
 
-#define PROLOGUE_INIT_ARGS_SIZE	1024
+#define PROLOGUE_INIT_ARGS_SIZE 1024
 
 #endif /* __ASM_PROLOGUE_H__ */
diff --git a/compel/arch/x86/plugins/include/asm/syscall-types.h b/compel/arch/x86/plugins/include/asm/syscall-types.h
index 9874fd0be..101d1eb6e 100644
--- a/compel/arch/x86/plugins/include/asm/syscall-types.h
+++ b/compel/arch/x86/plugins/include/asm/syscall-types.h
@@ -8,12 +8,12 @@ typedef rt_signalfn_t *rt_sighandler_t;
 typedef void rt_restorefn_t(void);
 typedef rt_restorefn_t *rt_sigrestore_t;
 
-#define SA_RESTORER	0x04000000
+#define SA_RESTORER 0x04000000
 
-#define _KNSIG		64
-#define _NSIG_BPW	64
+#define _KNSIG	  64
+#define _NSIG_BPW 64
 
-#define _KNSIG_WORDS	(_KNSIG / _NSIG_BPW)
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
 
 /*
  * Note: as k_rtsigset_t is the same size for 32-bit and 64-bit,
@@ -21,14 +21,14 @@ typedef rt_restorefn_t *rt_sigrestore_t;
  * purpose if we ever going to support native 32-bit compilation.
  */
 typedef struct {
-	uint64_t	sig[_KNSIG_WORDS];
+	uint64_t sig[_KNSIG_WORDS];
 } k_rtsigset_t;
 
 typedef struct {
-	rt_sighandler_t	rt_sa_handler;
-	unsigned long	rt_sa_flags;
-	rt_sigrestore_t	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t;
 
 /*
@@ -37,24 +37,24 @@ typedef struct {
  * with unaligned rt_sa_mask.
  */
 typedef struct __attribute__((packed)) {
-	unsigned int	rt_sa_handler;
-	unsigned int	rt_sa_flags;
-	unsigned int	rt_sa_restorer;
-	k_rtsigset_t	rt_sa_mask;
+	unsigned int rt_sa_handler;
+	unsigned int rt_sa_flags;
+	unsigned int rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
 } rt_sigaction_t_compat;
 
 /* Types for set_thread_area, get_thread_area syscalls */
 typedef struct {
-	unsigned int	entry_number;
-	unsigned int	base_addr;
-	unsigned int	limit;
-	unsigned int	seg_32bit:1;
-	unsigned int	contents:2;
-	unsigned int	read_exec_only:1;
-	unsigned int	limit_in_pages:1;
-	unsigned int	seg_not_present:1;
-	unsigned int	useable:1;
-	unsigned int	lm:1;
+	unsigned int entry_number;
+	unsigned int base_addr;
+	unsigned int limit;
+	unsigned int seg_32bit : 1;
+	unsigned int contents : 2;
+	unsigned int read_exec_only : 1;
+	unsigned int limit_in_pages : 1;
+	unsigned int seg_not_present : 1;
+	unsigned int useable : 1;
+	unsigned int lm : 1;
 } user_desc_t;
 
 #endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/x86/src/lib/include/cpu.h b/compel/arch/x86/src/lib/include/cpu.h
index 60b7d24d4..de3b0a0ff 100644
--- a/compel/arch/x86/src/lib/include/cpu.h
+++ b/compel/arch/x86/src/lib/include/cpu.h
@@ -1,31 +1,21 @@
 #ifndef __COMPEL_ASM_CPU_H__
 #define __COMPEL_ASM_CPU_H__
 
-static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
-				unsigned int *ecx, unsigned int *edx)
+static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
 	/* ecx is often an input as well as an output. */
-	asm volatile("cpuid"
-	    : "=a" (*eax),
-	      "=b" (*ebx),
-	      "=c" (*ecx),
-	      "=d" (*edx)
-	    : "0" (*eax), "2" (*ecx)
-	    : "memory");
+	asm volatile("cpuid" : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) : "0"(*eax), "2"(*ecx) : "memory");
 }
 
-static inline void cpuid(unsigned int op,
-			 unsigned int *eax, unsigned int *ebx,
-			 unsigned int *ecx, unsigned int *edx)
+static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
 	*eax = op;
 	*ecx = 0;
 	native_cpuid(eax, ebx, ecx, edx);
 }
 
-static inline void cpuid_count(unsigned int op, int count,
-			       unsigned int *eax, unsigned int *ebx,
-			       unsigned int *ecx, unsigned int *edx)
+static inline void cpuid_count(unsigned int op, int count, unsigned int *eax, unsigned int *ebx, unsigned int *ecx,
+			       unsigned int *edx)
 {
 	*eax = op;
 	*ecx = count;
diff --git a/compel/arch/x86/src/lib/include/handle-elf.h b/compel/arch/x86/src/lib/include/handle-elf.h
index e68fe3bcf..f3150f3f1 100644
--- a/compel/arch/x86/src/lib/include/handle-elf.h
+++ b/compel/arch/x86/src/lib/include/handle-elf.h
@@ -6,15 +6,15 @@
 #define ELF_X86_64
 
 #ifndef R_X86_64_GOTPCRELX
-# define R_X86_64_GOTPCRELX			41
+#define R_X86_64_GOTPCRELX 41
 #endif
 
 #ifndef R_X86_64_REX_GOTPCRELX
-# define R_X86_64_REX_GOTPCRELX			42
+#define R_X86_64_REX_GOTPCRELX 42
 #endif
 
-#define __handle_elf				handle_elf_x86_64
-#define arch_is_machine_supported(e_machine)	(e_machine == EM_X86_64)
+#define __handle_elf			     handle_elf_x86_64
+#define arch_is_machine_supported(e_machine) (e_machine == EM_X86_64)
 
 extern int handle_elf_x86_32(void *mem, size_t size);
 extern int handle_elf_x86_64(void *mem, size_t size);
diff --git a/compel/arch/x86/src/lib/include/syscall.h b/compel/arch/x86/src/lib/include/syscall.h
index 9af1b1f99..a1b742b11 100644
--- a/compel/arch/x86/src/lib/include/syscall.h
+++ b/compel/arch/x86/src/lib/include/syscall.h
@@ -1,6 +1,6 @@
 #ifndef __COMPEL_SYSCALL_H__
 #define __COMPEL_SYSCALL_H__
-#define __NR(syscall, compat)	((compat) ? __NR32_##syscall : __NR_##syscall)
+#define __NR(syscall, compat) ((compat) ? __NR32_##syscall : __NR_##syscall)
 
 /*
  * For x86_32 __NR_mmap inside the kernel represents old_mmap system
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/cpu.h b/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
index bb1914da4..8d54516af 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
@@ -15,334 +15,334 @@
  * to keep it here, since it's an ABI now.
  */
 enum cpuid_leafs {
-	CPUID_1_EDX		= 0,
-	CPUID_8000_0001_EDX	= 1,
-	CPUID_8086_0001_EDX	= 2,
-	CPUID_LNX_1		= 3,
-	CPUID_1_ECX		= 4,
-	CPUID_C000_0001_EDX	= 5,
-	CPUID_8000_0001_ECX	= 6,
-	CPUID_LNX_2		= 7,
-	CPUID_LNX_3		= 8,
-	CPUID_7_0_EBX		= 9,
-	CPUID_D_1_EAX		= 10,
-	CPUID_7_0_ECX		= 11,
-	CPUID_F_1_EDX		= 12,
-	CPUID_8000_0008_EBX	= 13,
-	CPUID_6_EAX		= 14,
-	CPUID_8000_000A_EDX	= 15,
-	CPUID_F_0_EDX		= 16,
-	CPUID_8000_0007_EBX	= 17,
-	CPUID_7_0_EDX		= 18,
+	CPUID_1_EDX = 0,
+	CPUID_8000_0001_EDX = 1,
+	CPUID_8086_0001_EDX = 2,
+	CPUID_LNX_1 = 3,
+	CPUID_1_ECX = 4,
+	CPUID_C000_0001_EDX = 5,
+	CPUID_8000_0001_ECX = 6,
+	CPUID_LNX_2 = 7,
+	CPUID_LNX_3 = 8,
+	CPUID_7_0_EBX = 9,
+	CPUID_D_1_EAX = 10,
+	CPUID_7_0_ECX = 11,
+	CPUID_F_1_EDX = 12,
+	CPUID_8000_0008_EBX = 13,
+	CPUID_6_EAX = 14,
+	CPUID_8000_000A_EDX = 15,
+	CPUID_F_0_EDX = 16,
+	CPUID_8000_0007_EBX = 17,
+	CPUID_7_0_EDX = 18,
 };
 
-#define NCAPINTS_V1		12
-#define NCAPINTS_V2		19
+#define NCAPINTS_V1 12
+#define NCAPINTS_V2 19
 
-#define NCAPINTS			(NCAPINTS_V2) /* N 32-bit words worth of info */
-#define NCAPINTS_BITS			(NCAPINTS * 32)
+#define NCAPINTS      (NCAPINTS_V2) /* N 32-bit words worth of info */
+#define NCAPINTS_BITS (NCAPINTS * 32)
 
 /* Intel-defined CPU features, CPUID level 0x00000001 (EDX), word 0 */
-#define X86_FEATURE_FPU			(0*32+ 0) /* Onboard FPU */
-#define X86_FEATURE_VME			(0*32+ 1) /* Virtual Mode Extensions */
-#define X86_FEATURE_DE			(0*32+ 2) /* Debugging Extensions */
-#define X86_FEATURE_PSE			(0*32+ 3) /* Page Size Extensions */
-#define X86_FEATURE_TSC			(0*32+ 4) /* Time Stamp Counter */
-#define X86_FEATURE_MSR			(0*32+ 5) /* Model-Specific Registers */
-#define X86_FEATURE_PAE			(0*32+ 6) /* Physical Address Extensions */
-#define X86_FEATURE_MCE			(0*32+ 7) /* Machine Check Exception */
-#define X86_FEATURE_CX8			(0*32+ 8) /* CMPXCHG8 instruction */
-#define X86_FEATURE_APIC		(0*32+ 9) /* Onboard APIC */
-#define X86_FEATURE_SEP			(0*32+11) /* SYSENTER/SYSEXIT */
-#define X86_FEATURE_MTRR		(0*32+12) /* Memory Type Range Registers */
-#define X86_FEATURE_PGE			(0*32+13) /* Page Global Enable */
-#define X86_FEATURE_MCA			(0*32+14) /* Machine Check Architecture */
-#define X86_FEATURE_CMOV		(0*32+15) /* CMOV instructions (plus FCMOVcc, FCOMI with FPU) */
-#define X86_FEATURE_PAT			(0*32+16) /* Page Attribute Table */
-#define X86_FEATURE_PSE36		(0*32+17) /* 36-bit PSEs */
-#define X86_FEATURE_PN			(0*32+18) /* Processor serial number */
-#define X86_FEATURE_CLFLUSH		(0*32+19) /* CLFLUSH instruction */
-#define X86_FEATURE_DS			(0*32+21) /* "dts" Debug Store */
-#define X86_FEATURE_ACPI		(0*32+22) /* ACPI via MSR */
-#define X86_FEATURE_MMX			(0*32+23) /* Multimedia Extensions */
-#define X86_FEATURE_FXSR		(0*32+24) /* FXSAVE/FXRSTOR, CR4.OSFXSR */
-#define X86_FEATURE_XMM			(0*32+25) /* "sse" */
-#define X86_FEATURE_XMM2		(0*32+26) /* "sse2" */
-#define X86_FEATURE_SELFSNOOP		(0*32+27) /* "ss" CPU self snoop */
-#define X86_FEATURE_HT			(0*32+28) /* Hyper-Threading */
-#define X86_FEATURE_ACC			(0*32+29) /* "tm" Automatic clock control */
-#define X86_FEATURE_IA64		(0*32+30) /* IA-64 processor */
-#define X86_FEATURE_PBE			(0*32+31) /* Pending Break Enable */
+#define X86_FEATURE_FPU	      (0 * 32 + 0) /* Onboard FPU */
+#define X86_FEATURE_VME	      (0 * 32 + 1) /* Virtual Mode Extensions */
+#define X86_FEATURE_DE	      (0 * 32 + 2) /* Debugging Extensions */
+#define X86_FEATURE_PSE	      (0 * 32 + 3) /* Page Size Extensions */
+#define X86_FEATURE_TSC	      (0 * 32 + 4) /* Time Stamp Counter */
+#define X86_FEATURE_MSR	      (0 * 32 + 5) /* Model-Specific Registers */
+#define X86_FEATURE_PAE	      (0 * 32 + 6) /* Physical Address Extensions */
+#define X86_FEATURE_MCE	      (0 * 32 + 7) /* Machine Check Exception */
+#define X86_FEATURE_CX8	      (0 * 32 + 8) /* CMPXCHG8 instruction */
+#define X86_FEATURE_APIC      (0 * 32 + 9) /* Onboard APIC */
+#define X86_FEATURE_SEP	      (0 * 32 + 11) /* SYSENTER/SYSEXIT */
+#define X86_FEATURE_MTRR      (0 * 32 + 12) /* Memory Type Range Registers */
+#define X86_FEATURE_PGE	      (0 * 32 + 13) /* Page Global Enable */
+#define X86_FEATURE_MCA	      (0 * 32 + 14) /* Machine Check Architecture */
+#define X86_FEATURE_CMOV      (0 * 32 + 15) /* CMOV instructions (plus FCMOVcc, FCOMI with FPU) */
+#define X86_FEATURE_PAT	      (0 * 32 + 16) /* Page Attribute Table */
+#define X86_FEATURE_PSE36     (0 * 32 + 17) /* 36-bit PSEs */
+#define X86_FEATURE_PN	      (0 * 32 + 18) /* Processor serial number */
+#define X86_FEATURE_CLFLUSH   (0 * 32 + 19) /* CLFLUSH instruction */
+#define X86_FEATURE_DS	      (0 * 32 + 21) /* "dts" Debug Store */
+#define X86_FEATURE_ACPI      (0 * 32 + 22) /* ACPI via MSR */
+#define X86_FEATURE_MMX	      (0 * 32 + 23) /* Multimedia Extensions */
+#define X86_FEATURE_FXSR      (0 * 32 + 24) /* FXSAVE/FXRSTOR, CR4.OSFXSR */
+#define X86_FEATURE_XMM	      (0 * 32 + 25) /* "sse" */
+#define X86_FEATURE_XMM2      (0 * 32 + 26) /* "sse2" */
+#define X86_FEATURE_SELFSNOOP (0 * 32 + 27) /* "ss" CPU self snoop */
+#define X86_FEATURE_HT	      (0 * 32 + 28) /* Hyper-Threading */
+#define X86_FEATURE_ACC	      (0 * 32 + 29) /* "tm" Automatic clock control */
+#define X86_FEATURE_IA64      (0 * 32 + 30) /* IA-64 processor */
+#define X86_FEATURE_PBE	      (0 * 32 + 31) /* Pending Break Enable */
 
 /* AMD-defined CPU features, CPUID level 0x80000001, word 1 */
 /* Don't duplicate feature flags which are redundant with Intel! */
-#define X86_FEATURE_SYSCALL		(1*32+11) /* SYSCALL/SYSRET */
-#define X86_FEATURE_MP			(1*32+19) /* MP Capable */
-#define X86_FEATURE_NX			(1*32+20) /* Execute Disable */
-#define X86_FEATURE_MMXEXT		(1*32+22) /* AMD MMX extensions */
-#define X86_FEATURE_FXSR_OPT		(1*32+25) /* FXSAVE/FXRSTOR optimizations */
-#define X86_FEATURE_GBPAGES		(1*32+26) /* "pdpe1gb" GB pages */
-#define X86_FEATURE_RDTSCP		(1*32+27) /* RDTSCP */
-#define X86_FEATURE_LM			(1*32+29) /* Long Mode (x86-64, 64-bit support) */
-#define X86_FEATURE_3DNOWEXT		(1*32+30) /* AMD 3DNow extensions */
-#define X86_FEATURE_3DNOW		(1*32+31) /* 3DNow */
+#define X86_FEATURE_SYSCALL  (1 * 32 + 11) /* SYSCALL/SYSRET */
+#define X86_FEATURE_MP	     (1 * 32 + 19) /* MP Capable */
+#define X86_FEATURE_NX	     (1 * 32 + 20) /* Execute Disable */
+#define X86_FEATURE_MMXEXT   (1 * 32 + 22) /* AMD MMX extensions */
+#define X86_FEATURE_FXSR_OPT (1 * 32 + 25) /* FXSAVE/FXRSTOR optimizations */
+#define X86_FEATURE_GBPAGES  (1 * 32 + 26) /* "pdpe1gb" GB pages */
+#define X86_FEATURE_RDTSCP   (1 * 32 + 27) /* RDTSCP */
+#define X86_FEATURE_LM	     (1 * 32 + 29) /* Long Mode (x86-64, 64-bit support) */
+#define X86_FEATURE_3DNOWEXT (1 * 32 + 30) /* AMD 3DNow extensions */
+#define X86_FEATURE_3DNOW    (1 * 32 + 31) /* 3DNow */
 
 /* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */
-#define X86_FEATURE_RECOVERY		(2*32+ 0) /* CPU in recovery mode */
-#define X86_FEATURE_LONGRUN		(2*32+ 1) /* Longrun power control */
-#define X86_FEATURE_LRTI		(2*32+ 3) /* LongRun table interface */
+#define X86_FEATURE_RECOVERY (2 * 32 + 0) /* CPU in recovery mode */
+#define X86_FEATURE_LONGRUN  (2 * 32 + 1) /* Longrun power control */
+#define X86_FEATURE_LRTI     (2 * 32 + 3) /* LongRun table interface */
 
 /* Other features, Linux-defined mapping, word 3 */
 /* This range is used for feature bits which conflict or are synthesized */
-#define X86_FEATURE_CXMMX		(3*32+ 0) /* Cyrix MMX extensions */
-#define X86_FEATURE_K6_MTRR		(3*32+ 1) /* AMD K6 nonstandard MTRRs */
-#define X86_FEATURE_CYRIX_ARR		(3*32+ 2) /* Cyrix ARRs (= MTRRs) */
-#define X86_FEATURE_CENTAUR_MCR		(3*32+ 3) /* Centaur MCRs (= MTRRs) */
+#define X86_FEATURE_CXMMX	(3 * 32 + 0) /* Cyrix MMX extensions */
+#define X86_FEATURE_K6_MTRR	(3 * 32 + 1) /* AMD K6 nonstandard MTRRs */
+#define X86_FEATURE_CYRIX_ARR	(3 * 32 + 2) /* Cyrix ARRs (= MTRRs) */
+#define X86_FEATURE_CENTAUR_MCR (3 * 32 + 3) /* Centaur MCRs (= MTRRs) */
 
 /* CPU types for specific tunings: */
-#define X86_FEATURE_K8			(3*32+ 4) /* "" Opteron, Athlon64 */
-#define X86_FEATURE_K7			(3*32+ 5) /* "" Athlon */
-#define X86_FEATURE_P3			(3*32+ 6) /* "" P3 */
-#define X86_FEATURE_P4			(3*32+ 7) /* "" P4 */
-#define X86_FEATURE_CONSTANT_TSC	(3*32+ 8) /* TSC ticks at a constant rate */
-#define X86_FEATURE_UP			(3*32+ 9) /* SMP kernel running on UP */
-#define X86_FEATURE_ART			(3*32+10) /* Always running timer (ART) */
-#define X86_FEATURE_ARCH_PERFMON	(3*32+11) /* Intel Architectural PerfMon */
-#define X86_FEATURE_PEBS		(3*32+12) /* Precise-Event Based Sampling */
-#define X86_FEATURE_BTS			(3*32+13) /* Branch Trace Store */
-#define X86_FEATURE_SYSCALL32		(3*32+14) /* "" syscall in IA32 userspace */
-#define X86_FEATURE_SYSENTER32		(3*32+15) /* "" sysenter in IA32 userspace */
-#define X86_FEATURE_REP_GOOD		(3*32+16) /* REP microcode works well */
-#define X86_FEATURE_MFENCE_RDTSC	(3*32+17) /* "" MFENCE synchronizes RDTSC */
-#define X86_FEATURE_LFENCE_RDTSC	(3*32+18) /* "" LFENCE synchronizes RDTSC */
-#define X86_FEATURE_ACC_POWER		(3*32+19) /* AMD Accumulated Power Mechanism */
-#define X86_FEATURE_NOPL		(3*32+20) /* The NOPL (0F 1F) instructions */
-#define X86_FEATURE_ALWAYS		(3*32+21) /* "" Always-present feature */
-#define X86_FEATURE_XTOPOLOGY		(3*32+22) /* CPU topology enum extensions */
-#define X86_FEATURE_TSC_RELIABLE	(3*32+23) /* TSC is known to be reliable */
-#define X86_FEATURE_NONSTOP_TSC		(3*32+24) /* TSC does not stop in C states */
-#define X86_FEATURE_CPUID		(3*32+25) /* CPU has CPUID instruction itself */
-#define X86_FEATURE_EXTD_APICID		(3*32+26) /* Extended APICID (8 bits) */
-#define X86_FEATURE_AMD_DCM		(3*32+27) /* AMD multi-node processor */
-#define X86_FEATURE_APERFMPERF		(3*32+28) /* P-State hardware coordination feedback capability (APERF/MPERF MSRs) */
-#define X86_FEATURE_NONSTOP_TSC_S3	(3*32+30) /* TSC doesn't stop in S3 state */
-#define X86_FEATURE_TSC_KNOWN_FREQ	(3*32+31) /* TSC has known frequency */
+#define X86_FEATURE_K8		   (3 * 32 + 4) /* "" Opteron, Athlon64 */
+#define X86_FEATURE_K7		   (3 * 32 + 5) /* "" Athlon */
+#define X86_FEATURE_P3		   (3 * 32 + 6) /* "" P3 */
+#define X86_FEATURE_P4		   (3 * 32 + 7) /* "" P4 */
+#define X86_FEATURE_CONSTANT_TSC   (3 * 32 + 8) /* TSC ticks at a constant rate */
+#define X86_FEATURE_UP		   (3 * 32 + 9) /* SMP kernel running on UP */
+#define X86_FEATURE_ART		   (3 * 32 + 10) /* Always running timer (ART) */
+#define X86_FEATURE_ARCH_PERFMON   (3 * 32 + 11) /* Intel Architectural PerfMon */
+#define X86_FEATURE_PEBS	   (3 * 32 + 12) /* Precise-Event Based Sampling */
+#define X86_FEATURE_BTS		   (3 * 32 + 13) /* Branch Trace Store */
+#define X86_FEATURE_SYSCALL32	   (3 * 32 + 14) /* "" syscall in IA32 userspace */
+#define X86_FEATURE_SYSENTER32	   (3 * 32 + 15) /* "" sysenter in IA32 userspace */
+#define X86_FEATURE_REP_GOOD	   (3 * 32 + 16) /* REP microcode works well */
+#define X86_FEATURE_MFENCE_RDTSC   (3 * 32 + 17) /* "" MFENCE synchronizes RDTSC */
+#define X86_FEATURE_LFENCE_RDTSC   (3 * 32 + 18) /* "" LFENCE synchronizes RDTSC */
+#define X86_FEATURE_ACC_POWER	   (3 * 32 + 19) /* AMD Accumulated Power Mechanism */
+#define X86_FEATURE_NOPL	   (3 * 32 + 20) /* The NOPL (0F 1F) instructions */
+#define X86_FEATURE_ALWAYS	   (3 * 32 + 21) /* "" Always-present feature */
+#define X86_FEATURE_XTOPOLOGY	   (3 * 32 + 22) /* CPU topology enum extensions */
+#define X86_FEATURE_TSC_RELIABLE   (3 * 32 + 23) /* TSC is known to be reliable */
+#define X86_FEATURE_NONSTOP_TSC	   (3 * 32 + 24) /* TSC does not stop in C states */
+#define X86_FEATURE_CPUID	   (3 * 32 + 25) /* CPU has CPUID instruction itself */
+#define X86_FEATURE_EXTD_APICID	   (3 * 32 + 26) /* Extended APICID (8 bits) */
+#define X86_FEATURE_AMD_DCM	   (3 * 32 + 27) /* AMD multi-node processor */
+#define X86_FEATURE_APERFMPERF	   (3 * 32 + 28) /* P-State hardware coordination feedback capability (APERF/MPERF MSRs) */
+#define X86_FEATURE_NONSTOP_TSC_S3 (3 * 32 + 30) /* TSC doesn't stop in S3 state */
+#define X86_FEATURE_TSC_KNOWN_FREQ (3 * 32 + 31) /* TSC has known frequency */
 
 /* Intel-defined CPU features, CPUID level 0x00000001 (ECX), word 4 */
-#define X86_FEATURE_XMM3		(4*32+ 0) /* "pni" SSE-3 */
-#define X86_FEATURE_PCLMULQDQ		(4*32+ 1) /* PCLMULQDQ instruction */
-#define X86_FEATURE_DTES64		(4*32+ 2) /* 64-bit Debug Store */
-#define X86_FEATURE_MWAIT		(4*32+ 3) /* "monitor" MONITOR/MWAIT support */
-#define X86_FEATURE_DSCPL		(4*32+ 4) /* "ds_cpl" CPL-qualified (filtered) Debug Store */
-#define X86_FEATURE_VMX			(4*32+ 5) /* Hardware virtualization */
-#define X86_FEATURE_SMX			(4*32+ 6) /* Safer Mode eXtensions */
-#define X86_FEATURE_EST			(4*32+ 7) /* Enhanced SpeedStep */
-#define X86_FEATURE_TM2			(4*32+ 8) /* Thermal Monitor 2 */
-#define X86_FEATURE_SSSE3		(4*32+ 9) /* Supplemental SSE-3 */
-#define X86_FEATURE_CID			(4*32+10) /* Context ID */
-#define X86_FEATURE_SDBG		(4*32+11) /* Silicon Debug */
-#define X86_FEATURE_FMA			(4*32+12) /* Fused multiply-add */
-#define X86_FEATURE_CX16		(4*32+13) /* CMPXCHG16B instruction */
-#define X86_FEATURE_XTPR		(4*32+14) /* Send Task Priority Messages */
-#define X86_FEATURE_PDCM		(4*32+15) /* Perf/Debug Capabilities MSR */
-#define X86_FEATURE_PCID		(4*32+17) /* Process Context Identifiers */
-#define X86_FEATURE_DCA			(4*32+18) /* Direct Cache Access */
-#define X86_FEATURE_XMM4_1		(4*32+19) /* "sse4_1" SSE-4.1 */
-#define X86_FEATURE_XMM4_2		(4*32+20) /* "sse4_2" SSE-4.2 */
-#define X86_FEATURE_X2APIC		(4*32+21) /* X2APIC */
-#define X86_FEATURE_MOVBE		(4*32+22) /* MOVBE instruction */
-#define X86_FEATURE_POPCNT		(4*32+23) /* POPCNT instruction */
-#define X86_FEATURE_TSC_DEADLINE_TIMER	(4*32+24) /* TSC deadline timer */
-#define X86_FEATURE_AES			(4*32+25) /* AES instructions */
-#define X86_FEATURE_XSAVE		(4*32+26) /* XSAVE/XRSTOR/XSETBV/XGETBV instructions */
-#define X86_FEATURE_OSXSAVE		(4*32+27) /* "" XSAVE instruction enabled in the OS */
-#define X86_FEATURE_AVX			(4*32+28) /* Advanced Vector Extensions */
-#define X86_FEATURE_F16C		(4*32+29) /* 16-bit FP conversions */
-#define X86_FEATURE_RDRAND		(4*32+30) /* RDRAND instruction */
-#define X86_FEATURE_HYPERVISOR		(4*32+31) /* Running on a hypervisor */
+#define X86_FEATURE_XMM3	       (4 * 32 + 0) /* "pni" SSE-3 */
+#define X86_FEATURE_PCLMULQDQ	       (4 * 32 + 1) /* PCLMULQDQ instruction */
+#define X86_FEATURE_DTES64	       (4 * 32 + 2) /* 64-bit Debug Store */
+#define X86_FEATURE_MWAIT	       (4 * 32 + 3) /* "monitor" MONITOR/MWAIT support */
+#define X86_FEATURE_DSCPL	       (4 * 32 + 4) /* "ds_cpl" CPL-qualified (filtered) Debug Store */
+#define X86_FEATURE_VMX		       (4 * 32 + 5) /* Hardware virtualization */
+#define X86_FEATURE_SMX		       (4 * 32 + 6) /* Safer Mode eXtensions */
+#define X86_FEATURE_EST		       (4 * 32 + 7) /* Enhanced SpeedStep */
+#define X86_FEATURE_TM2		       (4 * 32 + 8) /* Thermal Monitor 2 */
+#define X86_FEATURE_SSSE3	       (4 * 32 + 9) /* Supplemental SSE-3 */
+#define X86_FEATURE_CID		       (4 * 32 + 10) /* Context ID */
+#define X86_FEATURE_SDBG	       (4 * 32 + 11) /* Silicon Debug */
+#define X86_FEATURE_FMA		       (4 * 32 + 12) /* Fused multiply-add */
+#define X86_FEATURE_CX16	       (4 * 32 + 13) /* CMPXCHG16B instruction */
+#define X86_FEATURE_XTPR	       (4 * 32 + 14) /* Send Task Priority Messages */
+#define X86_FEATURE_PDCM	       (4 * 32 + 15) /* Perf/Debug Capabilities MSR */
+#define X86_FEATURE_PCID	       (4 * 32 + 17) /* Process Context Identifiers */
+#define X86_FEATURE_DCA		       (4 * 32 + 18) /* Direct Cache Access */
+#define X86_FEATURE_XMM4_1	       (4 * 32 + 19) /* "sse4_1" SSE-4.1 */
+#define X86_FEATURE_XMM4_2	       (4 * 32 + 20) /* "sse4_2" SSE-4.2 */
+#define X86_FEATURE_X2APIC	       (4 * 32 + 21) /* X2APIC */
+#define X86_FEATURE_MOVBE	       (4 * 32 + 22) /* MOVBE instruction */
+#define X86_FEATURE_POPCNT	       (4 * 32 + 23) /* POPCNT instruction */
+#define X86_FEATURE_TSC_DEADLINE_TIMER (4 * 32 + 24) /* TSC deadline timer */
+#define X86_FEATURE_AES		       (4 * 32 + 25) /* AES instructions */
+#define X86_FEATURE_XSAVE	       (4 * 32 + 26) /* XSAVE/XRSTOR/XSETBV/XGETBV instructions */
+#define X86_FEATURE_OSXSAVE	       (4 * 32 + 27) /* "" XSAVE instruction enabled in the OS */
+#define X86_FEATURE_AVX		       (4 * 32 + 28) /* Advanced Vector Extensions */
+#define X86_FEATURE_F16C	       (4 * 32 + 29) /* 16-bit FP conversions */
+#define X86_FEATURE_RDRAND	       (4 * 32 + 30) /* RDRAND instruction */
+#define X86_FEATURE_HYPERVISOR	       (4 * 32 + 31) /* Running on a hypervisor */
 
 /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
-#define X86_FEATURE_XSTORE		(5*32+ 2) /* "rng" RNG present (xstore) */
-#define X86_FEATURE_XSTORE_EN		(5*32+ 3) /* "rng_en" RNG enabled */
-#define X86_FEATURE_XCRYPT		(5*32+ 6) /* "ace" on-CPU crypto (xcrypt) */
-#define X86_FEATURE_XCRYPT_EN		(5*32+ 7) /* "ace_en" on-CPU crypto enabled */
-#define X86_FEATURE_ACE2		(5*32+ 8) /* Advanced Cryptography Engine v2 */
-#define X86_FEATURE_ACE2_EN		(5*32+ 9) /* ACE v2 enabled */
-#define X86_FEATURE_PHE			(5*32+10) /* PadLock Hash Engine */
-#define X86_FEATURE_PHE_EN		(5*32+11) /* PHE enabled */
-#define X86_FEATURE_PMM			(5*32+12) /* PadLock Montgomery Multiplier */
-#define X86_FEATURE_PMM_EN		(5*32+13) /* PMM enabled */
+#define X86_FEATURE_XSTORE    (5 * 32 + 2) /* "rng" RNG present (xstore) */
+#define X86_FEATURE_XSTORE_EN (5 * 32 + 3) /* "rng_en" RNG enabled */
+#define X86_FEATURE_XCRYPT    (5 * 32 + 6) /* "ace" on-CPU crypto (xcrypt) */
+#define X86_FEATURE_XCRYPT_EN (5 * 32 + 7) /* "ace_en" on-CPU crypto enabled */
+#define X86_FEATURE_ACE2      (5 * 32 + 8) /* Advanced Cryptography Engine v2 */
+#define X86_FEATURE_ACE2_EN   (5 * 32 + 9) /* ACE v2 enabled */
+#define X86_FEATURE_PHE	      (5 * 32 + 10) /* PadLock Hash Engine */
+#define X86_FEATURE_PHE_EN    (5 * 32 + 11) /* PHE enabled */
+#define X86_FEATURE_PMM	      (5 * 32 + 12) /* PadLock Montgomery Multiplier */
+#define X86_FEATURE_PMM_EN    (5 * 32 + 13) /* PMM enabled */
 
 /* More extended AMD flags: CPUID level 0x80000001, ECX, word 6 */
-#define X86_FEATURE_LAHF_LM		(6*32+ 0) /* LAHF/SAHF in long mode */
-#define X86_FEATURE_CMP_LEGACY		(6*32+ 1) /* If yes HyperThreading not valid */
-#define X86_FEATURE_SVM			(6*32+ 2) /* Secure Virtual Machine */
-#define X86_FEATURE_EXTAPIC		(6*32+ 3) /* Extended APIC space */
-#define X86_FEATURE_CR8_LEGACY		(6*32+ 4) /* CR8 in 32-bit mode */
-#define X86_FEATURE_ABM			(6*32+ 5) /* Advanced bit manipulation */
-#define X86_FEATURE_SSE4A		(6*32+ 6) /* SSE-4A */
-#define X86_FEATURE_MISALIGNSSE		(6*32+ 7) /* Misaligned SSE mode */
-#define X86_FEATURE_3DNOWPREFETCH	(6*32+ 8) /* 3DNow prefetch instructions */
-#define X86_FEATURE_OSVW		(6*32+ 9) /* OS Visible Workaround */
-#define X86_FEATURE_IBS			(6*32+10) /* Instruction Based Sampling */
-#define X86_FEATURE_XOP			(6*32+11) /* extended AVX instructions */
-#define X86_FEATURE_SKINIT		(6*32+12) /* SKINIT/STGI instructions */
-#define X86_FEATURE_WDT			(6*32+13) /* Watchdog timer */
-#define X86_FEATURE_LWP			(6*32+15) /* Light Weight Profiling */
-#define X86_FEATURE_FMA4		(6*32+16) /* 4 operands MAC instructions */
-#define X86_FEATURE_TCE			(6*32+17) /* Translation Cache Extension */
-#define X86_FEATURE_NODEID_MSR		(6*32+19) /* NodeId MSR */
-#define X86_FEATURE_TBM			(6*32+21) /* Trailing Bit Manipulations */
-#define X86_FEATURE_TOPOEXT		(6*32+22) /* Topology extensions CPUID leafs */
-#define X86_FEATURE_PERFCTR_CORE	(6*32+23) /* Core performance counter extensions */
-#define X86_FEATURE_PERFCTR_NB		(6*32+24) /* NB performance counter extensions */
-#define X86_FEATURE_BPEXT		(6*32+26) /* Data breakpoint extension */
-#define X86_FEATURE_PTSC		(6*32+27) /* Performance time-stamp counter */
-#define X86_FEATURE_PERFCTR_LLC		(6*32+28) /* Last Level Cache performance counter extensions */
-#define X86_FEATURE_MWAITX		(6*32+29) /* MWAIT extension (MONITORX/MWAITX instructions) */
+#define X86_FEATURE_LAHF_LM	  (6 * 32 + 0) /* LAHF/SAHF in long mode */
+#define X86_FEATURE_CMP_LEGACY	  (6 * 32 + 1) /* If yes HyperThreading not valid */
+#define X86_FEATURE_SVM		  (6 * 32 + 2) /* Secure Virtual Machine */
+#define X86_FEATURE_EXTAPIC	  (6 * 32 + 3) /* Extended APIC space */
+#define X86_FEATURE_CR8_LEGACY	  (6 * 32 + 4) /* CR8 in 32-bit mode */
+#define X86_FEATURE_ABM		  (6 * 32 + 5) /* Advanced bit manipulation */
+#define X86_FEATURE_SSE4A	  (6 * 32 + 6) /* SSE-4A */
+#define X86_FEATURE_MISALIGNSSE	  (6 * 32 + 7) /* Misaligned SSE mode */
+#define X86_FEATURE_3DNOWPREFETCH (6 * 32 + 8) /* 3DNow prefetch instructions */
+#define X86_FEATURE_OSVW	  (6 * 32 + 9) /* OS Visible Workaround */
+#define X86_FEATURE_IBS		  (6 * 32 + 10) /* Instruction Based Sampling */
+#define X86_FEATURE_XOP		  (6 * 32 + 11) /* extended AVX instructions */
+#define X86_FEATURE_SKINIT	  (6 * 32 + 12) /* SKINIT/STGI instructions */
+#define X86_FEATURE_WDT		  (6 * 32 + 13) /* Watchdog timer */
+#define X86_FEATURE_LWP		  (6 * 32 + 15) /* Light Weight Profiling */
+#define X86_FEATURE_FMA4	  (6 * 32 + 16) /* 4 operands MAC instructions */
+#define X86_FEATURE_TCE		  (6 * 32 + 17) /* Translation Cache Extension */
+#define X86_FEATURE_NODEID_MSR	  (6 * 32 + 19) /* NodeId MSR */
+#define X86_FEATURE_TBM		  (6 * 32 + 21) /* Trailing Bit Manipulations */
+#define X86_FEATURE_TOPOEXT	  (6 * 32 + 22) /* Topology extensions CPUID leafs */
+#define X86_FEATURE_PERFCTR_CORE  (6 * 32 + 23) /* Core performance counter extensions */
+#define X86_FEATURE_PERFCTR_NB	  (6 * 32 + 24) /* NB performance counter extensions */
+#define X86_FEATURE_BPEXT	  (6 * 32 + 26) /* Data breakpoint extension */
+#define X86_FEATURE_PTSC	  (6 * 32 + 27) /* Performance time-stamp counter */
+#define X86_FEATURE_PERFCTR_LLC	  (6 * 32 + 28) /* Last Level Cache performance counter extensions */
+#define X86_FEATURE_MWAITX	  (6 * 32 + 29) /* MWAIT extension (MONITORX/MWAITX instructions) */
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */
-#define X86_FEATURE_FSGSBASE		(9*32+ 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
-#define X86_FEATURE_TSC_ADJUST		(9*32+ 1) /* TSC adjustment MSR 0x3B */
-#define X86_FEATURE_BMI1		(9*32+ 3) /* 1st group bit manipulation extensions */
-#define X86_FEATURE_HLE			(9*32+ 4) /* Hardware Lock Elision */
-#define X86_FEATURE_AVX2		(9*32+ 5) /* AVX2 instructions */
-#define X86_FEATURE_SMEP		(9*32+ 7) /* Supervisor Mode Execution Protection */
-#define X86_FEATURE_BMI2		(9*32+ 8) /* 2nd group bit manipulation extensions */
-#define X86_FEATURE_ERMS		(9*32+ 9) /* Enhanced REP MOVSB/STOSB instructions */
-#define X86_FEATURE_INVPCID		(9*32+10) /* Invalidate Processor Context ID */
-#define X86_FEATURE_RTM			(9*32+11) /* Restricted Transactional Memory */
-#define X86_FEATURE_CQM			(9*32+12) /* Cache QoS Monitoring */
-#define X86_FEATURE_MPX			(9*32+14) /* Memory Protection Extension */
-#define X86_FEATURE_RDT_A		(9*32+15) /* Resource Director Technology Allocation */
-#define X86_FEATURE_AVX512F		(9*32+16) /* AVX-512 Foundation */
-#define X86_FEATURE_AVX512DQ		(9*32+17) /* AVX-512 DQ (Double/Quad granular) Instructions */
-#define X86_FEATURE_RDSEED		(9*32+18) /* RDSEED instruction */
-#define X86_FEATURE_ADX			(9*32+19) /* ADCX and ADOX instructions */
-#define X86_FEATURE_SMAP		(9*32+20) /* Supervisor Mode Access Prevention */
-#define X86_FEATURE_AVX512IFMA		(9*32+21) /* AVX-512 Integer Fused Multiply-Add instructions */
-#define X86_FEATURE_CLFLUSHOPT		(9*32+23) /* CLFLUSHOPT instruction */
-#define X86_FEATURE_CLWB		(9*32+24) /* CLWB instruction */
-#define X86_FEATURE_INTEL_PT		(9*32+25) /* Intel Processor Trace */
-#define X86_FEATURE_AVX512PF		(9*32+26) /* AVX-512 Prefetch */
-#define X86_FEATURE_AVX512ER		(9*32+27) /* AVX-512 Exponential and Reciprocal */
-#define X86_FEATURE_AVX512CD		(9*32+28) /* AVX-512 Conflict Detection */
-#define X86_FEATURE_SHA_NI		(9*32+29) /* SHA1/SHA256 Instruction Extensions */
-#define X86_FEATURE_AVX512BW		(9*32+30) /* AVX-512 BW (Byte/Word granular) Instructions */
-#define X86_FEATURE_AVX512VL		(9*32+31) /* AVX-512 VL (128/256 Vector Length) Extensions */
+#define X86_FEATURE_FSGSBASE   (9 * 32 + 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
+#define X86_FEATURE_TSC_ADJUST (9 * 32 + 1) /* TSC adjustment MSR 0x3B */
+#define X86_FEATURE_BMI1       (9 * 32 + 3) /* 1st group bit manipulation extensions */
+#define X86_FEATURE_HLE	       (9 * 32 + 4) /* Hardware Lock Elision */
+#define X86_FEATURE_AVX2       (9 * 32 + 5) /* AVX2 instructions */
+#define X86_FEATURE_SMEP       (9 * 32 + 7) /* Supervisor Mode Execution Protection */
+#define X86_FEATURE_BMI2       (9 * 32 + 8) /* 2nd group bit manipulation extensions */
+#define X86_FEATURE_ERMS       (9 * 32 + 9) /* Enhanced REP MOVSB/STOSB instructions */
+#define X86_FEATURE_INVPCID    (9 * 32 + 10) /* Invalidate Processor Context ID */
+#define X86_FEATURE_RTM	       (9 * 32 + 11) /* Restricted Transactional Memory */
+#define X86_FEATURE_CQM	       (9 * 32 + 12) /* Cache QoS Monitoring */
+#define X86_FEATURE_MPX	       (9 * 32 + 14) /* Memory Protection Extension */
+#define X86_FEATURE_RDT_A      (9 * 32 + 15) /* Resource Director Technology Allocation */
+#define X86_FEATURE_AVX512F    (9 * 32 + 16) /* AVX-512 Foundation */
+#define X86_FEATURE_AVX512DQ   (9 * 32 + 17) /* AVX-512 DQ (Double/Quad granular) Instructions */
+#define X86_FEATURE_RDSEED     (9 * 32 + 18) /* RDSEED instruction */
+#define X86_FEATURE_ADX	       (9 * 32 + 19) /* ADCX and ADOX instructions */
+#define X86_FEATURE_SMAP       (9 * 32 + 20) /* Supervisor Mode Access Prevention */
+#define X86_FEATURE_AVX512IFMA (9 * 32 + 21) /* AVX-512 Integer Fused Multiply-Add instructions */
+#define X86_FEATURE_CLFLUSHOPT (9 * 32 + 23) /* CLFLUSHOPT instruction */
+#define X86_FEATURE_CLWB       (9 * 32 + 24) /* CLWB instruction */
+#define X86_FEATURE_INTEL_PT   (9 * 32 + 25) /* Intel Processor Trace */
+#define X86_FEATURE_AVX512PF   (9 * 32 + 26) /* AVX-512 Prefetch */
+#define X86_FEATURE_AVX512ER   (9 * 32 + 27) /* AVX-512 Exponential and Reciprocal */
+#define X86_FEATURE_AVX512CD   (9 * 32 + 28) /* AVX-512 Conflict Detection */
+#define X86_FEATURE_SHA_NI     (9 * 32 + 29) /* SHA1/SHA256 Instruction Extensions */
+#define X86_FEATURE_AVX512BW   (9 * 32 + 30) /* AVX-512 BW (Byte/Word granular) Instructions */
+#define X86_FEATURE_AVX512VL   (9 * 32 + 31) /* AVX-512 VL (128/256 Vector Length) Extensions */
 
 /* Extended state features, CPUID level 0x0000000d:1 (EAX), word 10 */
-#define X86_FEATURE_XSAVEOPT		(10*32+ 0) /* XSAVEOPT instruction */
-#define X86_FEATURE_XSAVEC		(10*32+ 1) /* XSAVEC instruction */
-#define X86_FEATURE_XGETBV1		(10*32+ 2) /* XGETBV with ECX = 1 instruction */
-#define X86_FEATURE_XSAVES		(10*32+ 3) /* XSAVES/XRSTORS instructions */
+#define X86_FEATURE_XSAVEOPT (10 * 32 + 0) /* XSAVEOPT instruction */
+#define X86_FEATURE_XSAVEC   (10 * 32 + 1) /* XSAVEC instruction */
+#define X86_FEATURE_XGETBV1  (10 * 32 + 2) /* XGETBV with ECX = 1 instruction */
+#define X86_FEATURE_XSAVES   (10 * 32 + 3) /* XSAVES/XRSTORS instructions */
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ECX), word 11 */
-#define X86_FEATURE_PREFETCHWT1		(11*32+ 0) /* PREFETCHWT1 Intel® Xeon PhiTM only */
-#define X86_FEATURE_AVX512VBMI		(11*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/
-#define X86_FEATURE_UMIP		(11*32+ 2) /* User Mode Instruction Protection */
-#define X86_FEATURE_PKU			(11*32+ 3) /* Protection Keys for Userspace */
-#define X86_FEATURE_OSPKE		(11*32+ 4) /* OS Protection Keys Enable */
-#define X86_FEATURE_AVX512_VBMI2	(11*32+ 6) /* Additional AVX512 Vector Bit Manipulation Instructions */
-#define X86_FEATURE_GFNI		(11*32+ 8) /* Galois Field New Instructions */
-#define X86_FEATURE_VAES		(11*32+ 9) /* Vector AES */
-#define X86_FEATURE_VPCLMULQDQ		(11*32+10) /* Carry-Less Multiplication Double Quadword */
-#define X86_FEATURE_AVX512_VNNI		(11*32+11) /* Vector Neural Network Instructions */
-#define X86_FEATURE_AVX512_BITALG	(11*32+12) /* Support for VPOPCNT[B,W] and VPSHUF-BITQMB instructions */
-#define X86_FEATURE_TME			(11*32+13) /* Intel Total Memory Encryption */
-#define X86_FEATURE_AVX512_VPOPCNTDQ	(11*32+14) /* POPCNT for vectors of DW/QW */
-#define X86_FEATURE_LA57		(11*32+16) /* 5-level page tables */
-#define X86_FEATURE_RDPID		(11*32+22) /* RDPID instruction */
-#define X86_FEATURE_CLDEMOTE		(11*32+25) /* CLDEMOTE instruction */
+#define X86_FEATURE_PREFETCHWT1	     (11 * 32 + 0) /* PREFETCHWT1 Intel® Xeon PhiTM only */
+#define X86_FEATURE_AVX512VBMI	     (11 * 32 + 1) /* AVX512 Vector Bit Manipulation instructions*/
+#define X86_FEATURE_UMIP	     (11 * 32 + 2) /* User Mode Instruction Protection */
+#define X86_FEATURE_PKU		     (11 * 32 + 3) /* Protection Keys for Userspace */
+#define X86_FEATURE_OSPKE	     (11 * 32 + 4) /* OS Protection Keys Enable */
+#define X86_FEATURE_AVX512_VBMI2     (11 * 32 + 6) /* Additional AVX512 Vector Bit Manipulation Instructions */
+#define X86_FEATURE_GFNI	     (11 * 32 + 8) /* Galois Field New Instructions */
+#define X86_FEATURE_VAES	     (11 * 32 + 9) /* Vector AES */
+#define X86_FEATURE_VPCLMULQDQ	     (11 * 32 + 10) /* Carry-Less Multiplication Double Quadword */
+#define X86_FEATURE_AVX512_VNNI	     (11 * 32 + 11) /* Vector Neural Network Instructions */
+#define X86_FEATURE_AVX512_BITALG    (11 * 32 + 12) /* Support for VPOPCNT[B,W] and VPSHUF-BITQMB instructions */
+#define X86_FEATURE_TME		     (11 * 32 + 13) /* Intel Total Memory Encryption */
+#define X86_FEATURE_AVX512_VPOPCNTDQ (11 * 32 + 14) /* POPCNT for vectors of DW/QW */
+#define X86_FEATURE_LA57	     (11 * 32 + 16) /* 5-level page tables */
+#define X86_FEATURE_RDPID	     (11 * 32 + 22) /* RDPID instruction */
+#define X86_FEATURE_CLDEMOTE	     (11 * 32 + 25) /* CLDEMOTE instruction */
 
 /* Intel-defined CPU QoS Sub-leaf, CPUID level 0x0000000F:1 (EDX), word 12 */
-#define X86_FEATURE_CQM_OCCUP_LLC	(12*32+ 0) /* LLC occupancy monitoring */
-#define X86_FEATURE_CQM_MBM_TOTAL	(12*32+ 1) /* LLC Total MBM monitoring */
-#define X86_FEATURE_CQM_MBM_LOCAL	(12*32+ 2) /* LLC Local MBM monitoring */
+#define X86_FEATURE_CQM_OCCUP_LLC (12 * 32 + 0) /* LLC occupancy monitoring */
+#define X86_FEATURE_CQM_MBM_TOTAL (12 * 32 + 1) /* LLC Total MBM monitoring */
+#define X86_FEATURE_CQM_MBM_LOCAL (12 * 32 + 2) /* LLC Local MBM monitoring */
 
 /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */
-#define X86_FEATURE_CLZERO		(13*32+ 0) /* CLZERO instruction */
-#define X86_FEATURE_IRPERF		(13*32+ 1) /* Instructions Retired Count */
-#define X86_FEATURE_XSAVEERPTR		(13*32+ 2) /* Always save/restore FP error pointers */
-#define X86_FEATURE_IBPB		(13*32+12) /* Indirect Branch Prediction Barrier */
-#define X86_FEATURE_IBRS		(13*32+14) /* Indirect Branch Restricted Speculation */
-#define X86_FEATURE_STIBP		(13*32+15) /* Single Thread Indirect Branch Predictors */
+#define X86_FEATURE_CLZERO     (13 * 32 + 0) /* CLZERO instruction */
+#define X86_FEATURE_IRPERF     (13 * 32 + 1) /* Instructions Retired Count */
+#define X86_FEATURE_XSAVEERPTR (13 * 32 + 2) /* Always save/restore FP error pointers */
+#define X86_FEATURE_IBPB       (13 * 32 + 12) /* Indirect Branch Prediction Barrier */
+#define X86_FEATURE_IBRS       (13 * 32 + 14) /* Indirect Branch Restricted Speculation */
+#define X86_FEATURE_STIBP      (13 * 32 + 15) /* Single Thread Indirect Branch Predictors */
 
 /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
-#define X86_FEATURE_DTHERM		(14*32+ 0) /* Digital Thermal Sensor */
-#define X86_FEATURE_IDA			(14*32+ 1) /* Intel Dynamic Acceleration */
-#define X86_FEATURE_ARAT		(14*32+ 2) /* Always Running APIC Timer */
-#define X86_FEATURE_PLN			(14*32+ 4) /* Intel Power Limit Notification */
-#define X86_FEATURE_PTS			(14*32+ 6) /* Intel Package Thermal Status */
-#define X86_FEATURE_HWP			(14*32+ 7) /* Intel Hardware P-states */
-#define X86_FEATURE_HWP_NOTIFY		(14*32+ 8) /* HWP Notification */
-#define X86_FEATURE_HWP_ACT_WINDOW	(14*32+ 9) /* HWP Activity Window */
-#define X86_FEATURE_HWP_EPP		(14*32+10) /* HWP Energy Perf. Preference */
-#define X86_FEATURE_HWP_PKG_REQ		(14*32+11) /* HWP Package Level Request */
-#define X86_FEATURE_HDC			(14*32+13) /* HDC base registers present */
+#define X86_FEATURE_DTHERM	   (14 * 32 + 0) /* Digital Thermal Sensor */
+#define X86_FEATURE_IDA		   (14 * 32 + 1) /* Intel Dynamic Acceleration */
+#define X86_FEATURE_ARAT	   (14 * 32 + 2) /* Always Running APIC Timer */
+#define X86_FEATURE_PLN		   (14 * 32 + 4) /* Intel Power Limit Notification */
+#define X86_FEATURE_PTS		   (14 * 32 + 6) /* Intel Package Thermal Status */
+#define X86_FEATURE_HWP		   (14 * 32 + 7) /* Intel Hardware P-states */
+#define X86_FEATURE_HWP_NOTIFY	   (14 * 32 + 8) /* HWP Notification */
+#define X86_FEATURE_HWP_ACT_WINDOW (14 * 32 + 9) /* HWP Activity Window */
+#define X86_FEATURE_HWP_EPP	   (14 * 32 + 10) /* HWP Energy Perf. Preference */
+#define X86_FEATURE_HWP_PKG_REQ	   (14 * 32 + 11) /* HWP Package Level Request */
+#define X86_FEATURE_HDC		   (14 * 32 + 13) /* HDC base registers present */
 
 /* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 */
-#define X86_FEATURE_NPT			(15*32+ 0) /* Nested Page Table support */
-#define X86_FEATURE_LBRV		(15*32+ 1) /* LBR Virtualization support */
-#define X86_FEATURE_SVML		(15*32+ 2) /* "svm_lock" SVM locking MSR */
-#define X86_FEATURE_NRIPS		(15*32+ 3) /* "nrip_save" SVM next_rip save */
-#define X86_FEATURE_TSCRATEMSR		(15*32+ 4) /* "tsc_scale" TSC scaling support */
-#define X86_FEATURE_VMCBCLEAN		(15*32+ 5) /* "vmcb_clean" VMCB clean bits support */
-#define X86_FEATURE_FLUSHBYASID		(15*32+ 6) /* flush-by-ASID support */
-#define X86_FEATURE_DECODEASSISTS	(15*32+ 7) /* Decode Assists support */
-#define X86_FEATURE_PAUSEFILTER		(15*32+10) /* filtered pause intercept */
-#define X86_FEATURE_PFTHRESHOLD		(15*32+12) /* pause filter threshold */
-#define X86_FEATURE_AVIC		(15*32+13) /* Virtual Interrupt Controller */
-#define X86_FEATURE_V_VMSAVE_VMLOAD	(15*32+15) /* Virtual VMSAVE VMLOAD */
-#define X86_FEATURE_VGIF		(15*32+16) /* Virtual GIF */
+#define X86_FEATURE_NPT		    (15 * 32 + 0) /* Nested Page Table support */
+#define X86_FEATURE_LBRV	    (15 * 32 + 1) /* LBR Virtualization support */
+#define X86_FEATURE_SVML	    (15 * 32 + 2) /* "svm_lock" SVM locking MSR */
+#define X86_FEATURE_NRIPS	    (15 * 32 + 3) /* "nrip_save" SVM next_rip save */
+#define X86_FEATURE_TSCRATEMSR	    (15 * 32 + 4) /* "tsc_scale" TSC scaling support */
+#define X86_FEATURE_VMCBCLEAN	    (15 * 32 + 5) /* "vmcb_clean" VMCB clean bits support */
+#define X86_FEATURE_FLUSHBYASID	    (15 * 32 + 6) /* flush-by-ASID support */
+#define X86_FEATURE_DECODEASSISTS   (15 * 32 + 7) /* Decode Assists support */
+#define X86_FEATURE_PAUSEFILTER	    (15 * 32 + 10) /* filtered pause intercept */
+#define X86_FEATURE_PFTHRESHOLD	    (15 * 32 + 12) /* pause filter threshold */
+#define X86_FEATURE_AVIC	    (15 * 32 + 13) /* Virtual Interrupt Controller */
+#define X86_FEATURE_V_VMSAVE_VMLOAD (15 * 32 + 15) /* Virtual VMSAVE VMLOAD */
+#define X86_FEATURE_VGIF	    (15 * 32 + 16) /* Virtual GIF */
 
 /* Intel-defined CPU QoS Sub-leaf, CPUID level 0x0000000F:0 (EDX), word 16 */
-#define X86_FEATURE_CQM_LLC		(16*32+ 1) /* LLC QoS if 1 */
+#define X86_FEATURE_CQM_LLC (16 * 32 + 1) /* LLC QoS if 1 */
 
 /* AMD-defined CPU features, CPUID level 0x80000007 (EBX), word 17 */
-#define X86_FEATURE_OVERFLOW_RECOV	(17*32+ 0) /* MCA overflow recovery support */
-#define X86_FEATURE_SUCCOR		(17*32+ 1) /* Uncorrectable error containment and recovery */
-#define X86_FEATURE_SMCA		(17*32+ 3) /* Scalable MCA */
+#define X86_FEATURE_OVERFLOW_RECOV (17 * 32 + 0) /* MCA overflow recovery support */
+#define X86_FEATURE_SUCCOR	   (17 * 32 + 1) /* Uncorrectable error containment and recovery */
+#define X86_FEATURE_SMCA	   (17 * 32 + 3) /* Scalable MCA */
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
-#define X86_FEATURE_AVX512_4VNNIW	(18*32+ 2) /* AVX-512 Neural Network Instructions */
-#define X86_FEATURE_AVX512_4FMAPS	(18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */
-#define X86_FEATURE_PCONFIG		(18*32+18) /* Intel PCONFIG */
-#define X86_FEATURE_SPEC_CTRL		(18*32+26) /* "" Speculation Control (IBRS + IBPB) */
-#define X86_FEATURE_INTEL_STIBP		(18*32+27) /* "" Single Thread Indirect Branch Predictors */
-#define X86_FEATURE_ARCH_CAPABILITIES	(18*32+29) /* IA32_ARCH_CAPABILITIES MSR (Intel) */
-#define X86_FEATURE_SPEC_CTRL_SSBD	(18*32+31) /* "" Speculative Store Bypass Disable */
+#define X86_FEATURE_AVX512_4VNNIW     (18 * 32 + 2) /* AVX-512 Neural Network Instructions */
+#define X86_FEATURE_AVX512_4FMAPS     (18 * 32 + 3) /* AVX-512 Multiply Accumulation Single precision */
+#define X86_FEATURE_PCONFIG	      (18 * 32 + 18) /* Intel PCONFIG */
+#define X86_FEATURE_SPEC_CTRL	      (18 * 32 + 26) /* "" Speculation Control (IBRS + IBPB) */
+#define X86_FEATURE_INTEL_STIBP	      (18 * 32 + 27) /* "" Single Thread Indirect Branch Predictors */
+#define X86_FEATURE_ARCH_CAPABILITIES (18 * 32 + 29) /* IA32_ARCH_CAPABILITIES MSR (Intel) */
+#define X86_FEATURE_SPEC_CTRL_SSBD    (18 * 32 + 31) /* "" Speculative Store Bypass Disable */
 
 enum {
-	X86_VENDOR_INTEL	= 0,
-	X86_VENDOR_AMD		= 1,
+	X86_VENDOR_INTEL = 0,
+	X86_VENDOR_AMD = 1,
 
 	X86_VENDOR_MAX
 };
 
 struct cpuinfo_x86 {
 	/* cpu context */
-	uint8_t			x86_family;
-	uint8_t			x86_vendor;
-	uint8_t			x86_model;
-	uint8_t			x86_mask;
-	uint32_t		x86_capability[NCAPINTS];
-	uint32_t		x86_power;
-	uint32_t		extended_cpuid_level;
-	int			cpuid_level;
-	char			x86_vendor_id[16];
-	char			x86_model_id[64];
+	uint8_t x86_family;
+	uint8_t x86_vendor;
+	uint8_t x86_model;
+	uint8_t x86_mask;
+	uint32_t x86_capability[NCAPINTS];
+	uint32_t x86_power;
+	uint32_t extended_cpuid_level;
+	int cpuid_level;
+	char x86_vendor_id[16];
+	char x86_model_id[64];
 
 	/* fpu context */
-	uint64_t		xfeatures_mask;
-	uint32_t		xsave_size_max;
-	uint32_t		xsave_size;
-	uint32_t		xstate_offsets[XFEATURE_MAX];
-	uint32_t		xstate_sizes[XFEATURE_MAX];
+	uint64_t xfeatures_mask;
+	uint32_t xsave_size_max;
+	uint32_t xsave_size;
+	uint32_t xstate_offsets[XFEATURE_MAX];
+	uint32_t xstate_sizes[XFEATURE_MAX];
 
-	uint32_t		xsaves_size;
-	uint32_t		xstate_comp_offsets[XFEATURE_MAX];
-	uint32_t		xstate_comp_sizes[XFEATURE_MAX];
+	uint32_t xsaves_size;
+	uint32_t xstate_comp_offsets[XFEATURE_MAX];
+	uint32_t xstate_comp_sizes[XFEATURE_MAX];
 };
 
 typedef struct cpuinfo_x86 compel_cpuinfo_t;
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index 8985ad7f6..d740e3c04 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -7,27 +7,27 @@
 
 #include <compel/common/compiler.h>
 
-#define FP_MIN_ALIGN_BYTES		64
-#define FXSAVE_ALIGN_BYTES		16
+#define FP_MIN_ALIGN_BYTES 64
+#define FXSAVE_ALIGN_BYTES 16
 
-#define FP_XSTATE_MAGIC1		0x46505853U
-#define FP_XSTATE_MAGIC2		0x46505845U
+#define FP_XSTATE_MAGIC1 0x46505853U
+#define FP_XSTATE_MAGIC2 0x46505845U
 #ifndef FP_XSTATE_MAGIC2_SIZE
-#define FP_XSTATE_MAGIC2_SIZE		sizeof(FP_XSTATE_MAGIC2)
+#define FP_XSTATE_MAGIC2_SIZE sizeof(FP_XSTATE_MAGIC2)
 #endif
 
-#define XSTATE_FP			0x1
-#define XSTATE_SSE			0x2
-#define XSTATE_YMM			0x4
+#define XSTATE_FP  0x1
+#define XSTATE_SSE 0x2
+#define XSTATE_YMM 0x4
 
-#define FXSAVE_SIZE			512
-#define XSAVE_SIZE			4096
+#define FXSAVE_SIZE 512
+#define XSAVE_SIZE  4096
 
-#define XSAVE_HDR_SIZE			64
-#define XSAVE_HDR_OFFSET		FXSAVE_SIZE
+#define XSAVE_HDR_SIZE	 64
+#define XSAVE_HDR_OFFSET FXSAVE_SIZE
 
-#define XSAVE_YMM_SIZE			256
-#define XSAVE_YMM_OFFSET		(XSAVE_HDR_SIZE + XSAVE_HDR_OFFSET)
+#define XSAVE_YMM_SIZE	 256
+#define XSAVE_YMM_OFFSET (XSAVE_HDR_SIZE + XSAVE_HDR_OFFSET)
 
 /*
  * List of XSAVE features Linux knows about:
@@ -52,91 +52,88 @@ enum xfeature {
 	XFEATURE_MAX,
 };
 
-#define XSTATE_CPUID			0x0000000d
+#define XSTATE_CPUID 0x0000000d
 
-#define XFEATURE_MASK_FP		(1 << XFEATURE_FP)
-#define XFEATURE_MASK_SSE		(1 << XFEATURE_SSE)
-#define XFEATURE_MASK_YMM		(1 << XFEATURE_YMM)
-#define XFEATURE_MASK_BNDREGS		(1 << XFEATURE_BNDREGS)
-#define XFEATURE_MASK_BNDCSR		(1 << XFEATURE_BNDCSR)
-#define XFEATURE_MASK_OPMASK		(1 << XFEATURE_OPMASK)
-#define XFEATURE_MASK_ZMM_Hi256		(1 << XFEATURE_ZMM_Hi256)
-#define XFEATURE_MASK_Hi16_ZMM		(1 << XFEATURE_Hi16_ZMM)
-#define XFEATURE_MASK_PT		(1 << XFEATURE_PT)
-#define XFEATURE_MASK_PKRU		(1 << XFEATURE_PKRU)
-#define XFEATURE_MASK_HDC		(1 << XFEATURE_HDC)
-#define XFEATURE_MASK_MAX		(1 << XFEATURE_MAX)
+#define XFEATURE_MASK_FP	(1 << XFEATURE_FP)
+#define XFEATURE_MASK_SSE	(1 << XFEATURE_SSE)
+#define XFEATURE_MASK_YMM	(1 << XFEATURE_YMM)
+#define XFEATURE_MASK_BNDREGS	(1 << XFEATURE_BNDREGS)
+#define XFEATURE_MASK_BNDCSR	(1 << XFEATURE_BNDCSR)
+#define XFEATURE_MASK_OPMASK	(1 << XFEATURE_OPMASK)
+#define XFEATURE_MASK_ZMM_Hi256 (1 << XFEATURE_ZMM_Hi256)
+#define XFEATURE_MASK_Hi16_ZMM	(1 << XFEATURE_Hi16_ZMM)
+#define XFEATURE_MASK_PT	(1 << XFEATURE_PT)
+#define XFEATURE_MASK_PKRU	(1 << XFEATURE_PKRU)
+#define XFEATURE_MASK_HDC	(1 << XFEATURE_HDC)
+#define XFEATURE_MASK_MAX	(1 << XFEATURE_MAX)
 
-#define XFEATURE_MASK_FPSSE		(XFEATURE_MASK_FP | XFEATURE_MASK_SSE)
-#define XFEATURE_MASK_AVX512		(XFEATURE_MASK_OPMASK | XFEATURE_MASK_ZMM_Hi256 | XFEATURE_MASK_Hi16_ZMM)
+#define XFEATURE_MASK_FPSSE  (XFEATURE_MASK_FP | XFEATURE_MASK_SSE)
+#define XFEATURE_MASK_AVX512 (XFEATURE_MASK_OPMASK | XFEATURE_MASK_ZMM_Hi256 | XFEATURE_MASK_Hi16_ZMM)
 
-#define FIRST_EXTENDED_XFEATURE		XFEATURE_YMM
+#define FIRST_EXTENDED_XFEATURE XFEATURE_YMM
 
 /* Supervisor features */
-#define XFEATURE_MASK_SUPERVISOR	(XFEATURE_MASK_PT | XFEATURE_HDC)
+#define XFEATURE_MASK_SUPERVISOR (XFEATURE_MASK_PT | XFEATURE_HDC)
 
 /* All currently supported features */
-#define XFEATURE_MASK_USER						  \
-	(XFEATURE_MASK_FP		| XFEATURE_MASK_SSE		| \
-	 XFEATURE_MASK_YMM		| XFEATURE_MASK_OPMASK		| \
-	 XFEATURE_MASK_ZMM_Hi256	| XFEATURE_MASK_Hi16_ZMM	| \
-	 XFEATURE_MASK_PKRU		| XFEATURE_MASK_BNDREGS		| \
-	 XFEATURE_MASK_BNDCSR)
+#define XFEATURE_MASK_USER                                                                                           \
+	(XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | XFEATURE_MASK_OPMASK | XFEATURE_MASK_ZMM_Hi256 | \
+	 XFEATURE_MASK_Hi16_ZMM | XFEATURE_MASK_PKRU | XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)
 
 struct fpx_sw_bytes {
-	uint32_t			magic1;
-	uint32_t			extended_size;
-	uint64_t			xstate_bv;
-	uint32_t			xstate_size;
-	uint32_t			padding[7];
+	uint32_t magic1;
+	uint32_t extended_size;
+	uint64_t xstate_bv;
+	uint32_t xstate_size;
+	uint32_t padding[7];
 };
 
 struct i387_fxsave_struct {
-	uint16_t			cwd; /* Control Word			*/
-	uint16_t			swd; /* Status Word			*/
-	uint16_t			twd; /* Tag Word			*/
-	uint16_t			fop; /* Last Instruction Opcode		*/
+	uint16_t cwd; /* Control Word			*/
+	uint16_t swd; /* Status Word			*/
+	uint16_t twd; /* Tag Word			*/
+	uint16_t fop; /* Last Instruction Opcode		*/
 	union {
 		struct {
-			uint64_t	rip; /* Instruction Pointer		*/
-			uint64_t	rdp; /* Data Pointer			*/
+			uint64_t rip; /* Instruction Pointer		*/
+			uint64_t rdp; /* Data Pointer			*/
 		};
 		struct {
-			uint32_t	fip; /* FPU IP Offset			*/
-			uint32_t	fcs; /* FPU IP Selector			*/
-			uint32_t	foo; /* FPU Operand Offset		*/
-			uint32_t	fos; /* FPU Operand Selector		*/
+			uint32_t fip; /* FPU IP Offset			*/
+			uint32_t fcs; /* FPU IP Selector			*/
+			uint32_t foo; /* FPU Operand Offset		*/
+			uint32_t fos; /* FPU Operand Selector		*/
 		};
 	};
-	uint32_t			mxcsr;		/* MXCSR Register State */
-	uint32_t			mxcsr_mask;	/* MXCSR Mask		*/
+	uint32_t mxcsr; /* MXCSR Register State */
+	uint32_t mxcsr_mask; /* MXCSR Mask		*/
 
 	/* 8*16 bytes for each FP-reg = 128 bytes				*/
-	uint32_t			st_space[32];
+	uint32_t st_space[32];
 
 	/* 16*16 bytes for each XMM-reg = 256 bytes				*/
-	uint32_t			xmm_space[64];
+	uint32_t xmm_space[64];
 
-	uint32_t			padding[12];
+	uint32_t padding[12];
 
 	union {
-		uint32_t		padding1[12];
-		uint32_t		sw_reserved[12];
+		uint32_t padding1[12];
+		uint32_t sw_reserved[12];
 	};
 
 } __aligned(FXSAVE_ALIGN_BYTES);
 
 struct xsave_hdr_struct {
-	uint64_t			xstate_bv;
-	uint64_t			xcomp_bv;
-	uint64_t			reserved[6];
+	uint64_t xstate_bv;
+	uint64_t xcomp_bv;
+	uint64_t reserved[6];
 } __packed;
 
 /*
  * xstate_header.xcomp_bv[63] indicates that the extended_state_area
  * is in compacted format.
  */
-#define XCOMP_BV_COMPACTED_FORMAT	((uint64_t)1 << 63)
+#define XCOMP_BV_COMPACTED_FORMAT ((uint64_t)1 << 63)
 
 /*
  * State component 2:
@@ -149,21 +146,21 @@ struct xsave_hdr_struct {
  * The high 128 bits are stored here.
  */
 struct ymmh_struct {
-	uint32_t			ymmh_space[64];
+	uint32_t ymmh_space[64];
 } __packed;
 
 /* Intel MPX support: */
 
 struct mpx_bndreg {
-	uint64_t			lower_bound;
-	uint64_t			upper_bound;
+	uint64_t lower_bound;
+	uint64_t upper_bound;
 } __packed;
 
 /*
  * State component 3 is used for the 4 128-bit bounds registers
  */
 struct mpx_bndreg_state {
-	struct mpx_bndreg		bndreg[4];
+	struct mpx_bndreg bndreg[4];
 } __packed;
 
 /*
@@ -172,8 +169,8 @@ struct mpx_bndreg_state {
  * register BNDSTATUS.  We call the pair "BNDCSR".
  */
 struct mpx_bndcsr {
-	uint64_t			bndcfgu;
-	uint64_t			bndstatus;
+	uint64_t bndcfgu;
+	uint64_t bndstatus;
 } __packed;
 
 /*
@@ -181,8 +178,8 @@ struct mpx_bndcsr {
  */
 struct mpx_bndcsr_state {
 	union {
-		struct mpx_bndcsr	bndcsr;
-		uint8_t			pad_to_64_bytes[64];
+		struct mpx_bndcsr bndcsr;
+		uint8_t pad_to_64_bytes[64];
 	};
 } __packed;
 
@@ -193,7 +190,7 @@ struct mpx_bndcsr_state {
  * k0-k7 (opmask state).
  */
 struct avx_512_opmask_state {
-	uint64_t			opmask_reg[8];
+	uint64_t opmask_reg[8];
 } __packed;
 
 /*
@@ -202,7 +199,7 @@ struct avx_512_opmask_state {
  * ZMM0_H-ZMM15_H (ZMM_Hi256 state).
  */
 struct avx_512_zmm_uppers_state {
-	uint64_t			zmm_upper[16 * 4];
+	uint64_t zmm_upper[16 * 4];
 } __packed;
 
 /*
@@ -210,7 +207,7 @@ struct avx_512_zmm_uppers_state {
  * ZMM16-ZMM31 (Hi16_ZMM state).
  */
 struct avx_512_hi16_state {
-	uint64_t			hi16_zmm[16 * 8];
+	uint64_t hi16_zmm[16 * 8];
 } __packed;
 
 /*
@@ -218,8 +215,8 @@ struct avx_512_hi16_state {
  * 8 bytes long but only 4 bytes is used currently.
  */
 struct pkru_state {
-	uint32_t			pkru;
-	uint32_t			pad;
+	uint32_t pkru;
+	uint32_t pad;
 } __packed;
 
 /*
@@ -234,34 +231,34 @@ struct pkru_state {
  *
  * One page should be enough for the whole xsave state ;-)
  */
-#define EXTENDED_STATE_AREA_SIZE	(4096 - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct))
+#define EXTENDED_STATE_AREA_SIZE (4096 - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct))
 
 /*
  * cpu requires it to be 64 byte aligned
  */
 struct xsave_struct {
-	struct i387_fxsave_struct	i387;
-	struct xsave_hdr_struct		xsave_hdr;
+	struct i387_fxsave_struct i387;
+	struct xsave_hdr_struct xsave_hdr;
 	union {
 		/*
 		 * This ymmh is unndeed, for
 		 * backward compatibility.
 		 */
-		struct ymmh_struct	ymmh;
-		uint8_t			extended_state_area[EXTENDED_STATE_AREA_SIZE];
+		struct ymmh_struct ymmh;
+		uint8_t extended_state_area[EXTENDED_STATE_AREA_SIZE];
 	};
 } __aligned(FP_MIN_ALIGN_BYTES) __packed;
 
 struct xsave_struct_ia32 {
-	struct i387_fxsave_struct	i387;
-	struct xsave_hdr_struct		xsave_hdr;
+	struct i387_fxsave_struct i387;
+	struct xsave_hdr_struct xsave_hdr;
 	union {
 		/*
 		 * This ymmh is unndeed, for
 		 * backward compatibility.
 		 */
-		struct ymmh_struct	ymmh;
-		uint8_t			extended_state_area[EXTENDED_STATE_AREA_SIZE];
+		struct ymmh_struct ymmh;
+		uint8_t extended_state_area[EXTENDED_STATE_AREA_SIZE];
 	};
 };
 
@@ -272,34 +269,34 @@ typedef struct {
 	 */
 
 	union {
-		struct xsave_struct	xsave;
-		uint8_t			__pad[sizeof(struct xsave_struct) + FP_XSTATE_MAGIC2_SIZE];
+		struct xsave_struct xsave;
+		uint8_t __pad[sizeof(struct xsave_struct) + FP_XSTATE_MAGIC2_SIZE];
 	};
 
 	uint8_t has_fpu;
 } fpu_state_64_t;
 
 struct user_i387_ia32_struct {
-	uint32_t			cwd;		/* FPU Control Word		*/
-	uint32_t			swd;		/* FPU Status Word		*/
-	uint32_t			twd;		/* FPU Tag Word			*/
-	uint32_t			fip;		/* FPU IP Offset		*/
-	uint32_t			fcs;		/* FPU IP Selector		*/
-	uint32_t			foo;		/* FPU Operand Pointer Offset	*/
-	uint32_t			fos;		/* FPU Operand Pointer Selector	*/
-	uint32_t			st_space[20];   /* 8*10 bytes for each FP-reg = 80 bytes */
+	uint32_t cwd; /* FPU Control Word		*/
+	uint32_t swd; /* FPU Status Word		*/
+	uint32_t twd; /* FPU Tag Word			*/
+	uint32_t fip; /* FPU IP Offset		*/
+	uint32_t fcs; /* FPU IP Selector		*/
+	uint32_t foo; /* FPU Operand Pointer Offset	*/
+	uint32_t fos; /* FPU Operand Pointer Selector	*/
+	uint32_t st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */
 };
 
 typedef struct {
 	struct {
-		struct user_i387_ia32_struct	i387_ia32;
+		struct user_i387_ia32_struct i387_ia32;
 
 		/* Software status information [not touched by FSAVE]:		*/
-		uint32_t			status;
+		uint32_t status;
 	} fregs_state;
 	union {
-		struct xsave_struct_ia32	xsave;
-		uint8_t				__pad[sizeof(struct xsave_struct) + FP_XSTATE_MAGIC2_SIZE];
+		struct xsave_struct_ia32 xsave;
+		uint8_t __pad[sizeof(struct xsave_struct) + FP_XSTATE_MAGIC2_SIZE];
 	} __aligned(FXSAVE_ALIGN_BYTES);
 } __aligned(FXSAVE_ALIGN_BYTES) fpu_state_ia32_t;
 
@@ -308,18 +305,17 @@ typedef struct {
  */
 typedef struct {
 	union {
-		fpu_state_64_t			fpu_state_64;
+		fpu_state_64_t fpu_state_64;
 		struct {
 			/* fpu_state_ia32->xsave has to be 64-byte aligned. */
-			uint32_t		__pad[2];
-			fpu_state_ia32_t	fpu_state_ia32;
+			uint32_t __pad[2];
+			fpu_state_ia32_t fpu_state_ia32;
 		};
 	};
 
 	uint8_t has_fpu;
 } fpu_state_t;
 
-extern void compel_convert_from_fxsr(struct user_i387_ia32_struct *env,
-				     struct i387_fxsave_struct *fxsave);
+extern void compel_convert_from_fxsr(struct user_i387_ia32_struct *env, struct i387_fxsave_struct *fxsave);
 
 #endif /* __CR_ASM_FPU_H__ */
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
index 470a1b0fd..34b3ad061 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
@@ -6,8 +6,8 @@
 #include <signal.h>
 #include <compel/plugins/std/asm/syscall-types.h>
 
-#define SIGMAX			64
-#define SIGMAX_OLD		31
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
 
 #define ARCH_HAS_PTRACE_GET_THREAD_AREA
 
@@ -17,11 +17,11 @@
  * For 64-bit x86 those GDT offsets are the same
  * for native and compat tasks.
  */
-#define GDT_ENTRY_TLS_MIN		12
-#define GDT_ENTRY_TLS_MAX		14
-#define GDT_ENTRY_TLS_NUM		3
+#define GDT_ENTRY_TLS_MIN 12
+#define GDT_ENTRY_TLS_MAX 14
+#define GDT_ENTRY_TLS_NUM 3
 typedef struct {
-	user_desc_t		desc[GDT_ENTRY_TLS_NUM];
+	user_desc_t desc[GDT_ENTRY_TLS_NUM];
 } tls_t;
 
 struct thread_ctx;
@@ -33,53 +33,53 @@ extern void compel_arch_get_tls_thread(struct parasite_thread_ctl *tctl, tls_t *
 extern void compel_arch_get_tls_task(struct parasite_ctl *ctl, tls_t *out);
 
 typedef struct {
-	uint64_t	r15;
-	uint64_t	r14;
-	uint64_t	r13;
-	uint64_t	r12;
-	uint64_t	bp;
-	uint64_t	bx;
-	uint64_t	r11;
-	uint64_t	r10;
-	uint64_t	r9;
-	uint64_t	r8;
-	uint64_t	ax;
-	uint64_t	cx;
-	uint64_t	dx;
-	uint64_t	si;
-	uint64_t	di;
-	uint64_t	orig_ax;
-	uint64_t	ip;
-	uint64_t	cs;
-	uint64_t	flags;
-	uint64_t	sp;
-	uint64_t	ss;
-	uint64_t	fs_base;
-	uint64_t	gs_base;
-	uint64_t	ds;
-	uint64_t	es;
-	uint64_t	fs;
-	uint64_t	gs;
+	uint64_t r15;
+	uint64_t r14;
+	uint64_t r13;
+	uint64_t r12;
+	uint64_t bp;
+	uint64_t bx;
+	uint64_t r11;
+	uint64_t r10;
+	uint64_t r9;
+	uint64_t r8;
+	uint64_t ax;
+	uint64_t cx;
+	uint64_t dx;
+	uint64_t si;
+	uint64_t di;
+	uint64_t orig_ax;
+	uint64_t ip;
+	uint64_t cs;
+	uint64_t flags;
+	uint64_t sp;
+	uint64_t ss;
+	uint64_t fs_base;
+	uint64_t gs_base;
+	uint64_t ds;
+	uint64_t es;
+	uint64_t fs;
+	uint64_t gs;
 } user_regs_struct64;
 
 typedef struct {
-	uint32_t	bx;
-	uint32_t	cx;
-	uint32_t	dx;
-	uint32_t	si;
-	uint32_t	di;
-	uint32_t	bp;
-	uint32_t	ax;
-	uint32_t	ds;
-	uint32_t	es;
-	uint32_t	fs;
-	uint32_t	gs;
-	uint32_t	orig_ax;
-	uint32_t	ip;
-	uint32_t	cs;
-	uint32_t	flags;
-	uint32_t	sp;
-	uint32_t	ss;
+	uint32_t bx;
+	uint32_t cx;
+	uint32_t dx;
+	uint32_t si;
+	uint32_t di;
+	uint32_t bp;
+	uint32_t ax;
+	uint32_t ds;
+	uint32_t es;
+	uint32_t fs;
+	uint32_t gs;
+	uint32_t orig_ax;
+	uint32_t ip;
+	uint32_t cs;
+	uint32_t flags;
+	uint32_t sp;
+	uint32_t ss;
 } user_regs_struct32;
 
 /*
@@ -96,22 +96,17 @@ typedef struct {
 	short __is_native; /* use user_regs_native macro to check it */
 } user_regs_struct_t;
 
-#define NATIVE_MAGIC	0x0A
-#define COMPAT_MAGIC	0x0C
+#define NATIVE_MAGIC 0x0A
+#define COMPAT_MAGIC 0x0C
 static inline bool user_regs_native(user_regs_struct_t *pregs)
 {
 	return pregs->__is_native == NATIVE_MAGIC;
 }
 
-#define get_user_reg(pregs, name)			\
-	((user_regs_native(pregs))		?	\
-	 ((pregs)->native.name)			:	\
-	 ((pregs)->compat.name))
+#define get_user_reg(pregs, name) ((user_regs_native(pregs)) ? ((pregs)->native.name) : ((pregs)->compat.name))
 
-#define set_user_reg(pregs, name, val)			\
-	((user_regs_native(pregs))		?	\
-	 ((pregs)->native.name = (val))		:	\
-	 ((pregs)->compat.name = (val)))
+#define set_user_reg(pregs, name, val) \
+	((user_regs_native(pregs)) ? ((pregs)->native.name = (val)) : ((pregs)->compat.name = (val)))
 
 #if 0
 typedef struct {
@@ -132,12 +127,12 @@ typedef struct {
 
 typedef struct xsave_struct user_fpregs_struct_t;
 
-#define REG_RES(regs)		get_user_reg(&regs, ax)
-#define REG_IP(regs)		get_user_reg(&regs, ip)
-#define REG_SP(regs)		get_user_reg(&regs, sp)
-#define REG_SYSCALL_NR(regs)	get_user_reg(&regs, orig_ax)
+#define REG_RES(regs)	     get_user_reg(&regs, ax)
+#define REG_IP(regs)	     get_user_reg(&regs, ip)
+#define REG_SP(regs)	     get_user_reg(&regs, sp)
+#define REG_SYSCALL_NR(regs) get_user_reg(&regs, orig_ax)
 
-#define __NR(syscall, compat)	((compat) ? __NR32_##syscall : __NR_##syscall)
+#define __NR(syscall, compat) ((compat) ? __NR32_##syscall : __NR_##syscall)
 
 /*
  * For x86_32 __NR_mmap inside the kernel represents old_mmap system
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/processor-flags.h b/compel/arch/x86/src/lib/include/uapi/asm/processor-flags.h
index 9f1bccdbe..caa784557 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/processor-flags.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/processor-flags.h
@@ -7,7 +7,7 @@
  * EFLAGS bits
  */
 #define X86_EFLAGS_CF	0x00000001 /* Carry Flag */
-#define X86_EFLAGS_BIT1	0x00000002 /* Bit 1 - always on */
+#define X86_EFLAGS_BIT1 0x00000002 /* Bit 1 - always on */
 #define X86_EFLAGS_PF	0x00000004 /* Parity Flag */
 #define X86_EFLAGS_AF	0x00000010 /* Auxiliary carry Flag */
 #define X86_EFLAGS_ZF	0x00000040 /* Zero Flag */
@@ -16,7 +16,7 @@
 #define X86_EFLAGS_IF	0x00000200 /* Interrupt Flag */
 #define X86_EFLAGS_DF	0x00000400 /* Direction Flag */
 #define X86_EFLAGS_OF	0x00000800 /* Overflow Flag */
-#define X86_EFLAGS_IOPL	0x00003000 /* IOPL mask */
+#define X86_EFLAGS_IOPL 0x00003000 /* IOPL mask */
 #define X86_EFLAGS_NT	0x00004000 /* Nested Task */
 #define X86_EFLAGS_RF	0x00010000 /* Resume Flag */
 #define X86_EFLAGS_VM	0x00020000 /* Virtual Mode */
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
index 486c0c8e0..ec8c156fa 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
@@ -11,60 +11,60 @@
 #define SIGFRAME_MAX_OFFSET 8
 
 struct rt_sigcontext {
-	uint64_t			r8;
-	uint64_t			r9;
-	uint64_t			r10;
-	uint64_t			r11;
-	uint64_t			r12;
-	uint64_t			r13;
-	uint64_t			r14;
-	uint64_t			r15;
-	uint64_t			rdi;
-	uint64_t			rsi;
-	uint64_t			rbp;
-	uint64_t			rbx;
-	uint64_t			rdx;
-	uint64_t			rax;
-	uint64_t			rcx;
-	uint64_t			rsp;
-	uint64_t			rip;
-	uint64_t			eflags;
-	uint16_t			cs;
-	uint16_t			gs;
-	uint16_t			fs;
-	uint16_t			ss;
-	uint64_t			err;
-	uint64_t			trapno;
-	uint64_t			oldmask;
-	uint64_t			cr2;
-	uint64_t			fpstate;
-	uint64_t			reserved1[8];
+	uint64_t r8;
+	uint64_t r9;
+	uint64_t r10;
+	uint64_t r11;
+	uint64_t r12;
+	uint64_t r13;
+	uint64_t r14;
+	uint64_t r15;
+	uint64_t rdi;
+	uint64_t rsi;
+	uint64_t rbp;
+	uint64_t rbx;
+	uint64_t rdx;
+	uint64_t rax;
+	uint64_t rcx;
+	uint64_t rsp;
+	uint64_t rip;
+	uint64_t eflags;
+	uint16_t cs;
+	uint16_t gs;
+	uint16_t fs;
+	uint16_t ss;
+	uint64_t err;
+	uint64_t trapno;
+	uint64_t oldmask;
+	uint64_t cr2;
+	uint64_t fpstate;
+	uint64_t reserved1[8];
 };
 
 struct rt_sigcontext_32 {
-	uint32_t			gs;
-	uint32_t			fs;
-	uint32_t			es;
-	uint32_t			ds;
-	uint32_t			di;
-	uint32_t			si;
-	uint32_t			bp;
-	uint32_t			sp;
-	uint32_t			bx;
-	uint32_t			dx;
-	uint32_t			cx;
-	uint32_t			ax;
-	uint32_t			trapno;
-	uint32_t			err;
-	uint32_t			ip;
-	uint32_t			cs;
-	uint32_t			flags;
-	uint32_t			sp_at_signal;
-	uint32_t			ss;
+	uint32_t gs;
+	uint32_t fs;
+	uint32_t es;
+	uint32_t ds;
+	uint32_t di;
+	uint32_t si;
+	uint32_t bp;
+	uint32_t sp;
+	uint32_t bx;
+	uint32_t dx;
+	uint32_t cx;
+	uint32_t ax;
+	uint32_t trapno;
+	uint32_t err;
+	uint32_t ip;
+	uint32_t cs;
+	uint32_t flags;
+	uint32_t sp_at_signal;
+	uint32_t ss;
 
-	uint32_t			fpstate;
-	uint32_t			oldmask;
-	uint32_t			cr2;
+	uint32_t fpstate;
+	uint32_t oldmask;
+	uint32_t cr2;
 };
 
 #include <compel/sigframe-common.h>
@@ -74,71 +74,70 @@ struct rt_sigcontext_32 {
  *      when (if) other architectures will support compatible C/R
  */
 
-typedef uint32_t			compat_uptr_t;
-typedef uint32_t			compat_size_t;
-typedef uint32_t			compat_sigset_word;
+typedef uint32_t compat_uptr_t;
+typedef uint32_t compat_size_t;
+typedef uint32_t compat_sigset_word;
 
 typedef struct compat_siginfo {
-	int	si_signo;
-	int	si_errno;
-	int	si_code;
-	int	_pad[128/sizeof(int) - 3];
+	int si_signo;
+	int si_errno;
+	int si_code;
+	int _pad[128 / sizeof(int) - 3];
 } compat_siginfo_t;
 
 typedef struct compat_sigaltstack {
-	compat_uptr_t		ss_sp;
-	int			ss_flags;
-	compat_size_t		ss_size;
+	compat_uptr_t ss_sp;
+	int ss_flags;
+	compat_size_t ss_size;
 } compat_stack_t;
 
-#define _COMPAT_NSIG		64
-#define _COMPAT_NSIG_BPW	32
-#define _COMPAT_NSIG_WORDS	(_COMPAT_NSIG / _COMPAT_NSIG_BPW)
+#define _COMPAT_NSIG	   64
+#define _COMPAT_NSIG_BPW   32
+#define _COMPAT_NSIG_WORDS (_COMPAT_NSIG / _COMPAT_NSIG_BPW)
 
 typedef struct {
-	compat_sigset_word	sig[_COMPAT_NSIG_WORDS];
+	compat_sigset_word sig[_COMPAT_NSIG_WORDS];
 } compat_sigset_t;
 
 struct ucontext_ia32 {
-	unsigned int		uc_flags;
-	unsigned int		uc_link;
-	compat_stack_t		uc_stack;
-	struct rt_sigcontext_32	uc_mcontext;
-	compat_sigset_t		uc_sigmask; /* mask last for extensibility */
+	unsigned int uc_flags;
+	unsigned int uc_link;
+	compat_stack_t uc_stack;
+	struct rt_sigcontext_32 uc_mcontext;
+	compat_sigset_t uc_sigmask; /* mask last for extensibility */
 };
 
 struct rt_sigframe_ia32 {
-	uint32_t		pretcode;
-	int32_t			sig;
-	uint32_t		pinfo;
-	uint32_t		puc;
-	compat_siginfo_t	info;
-	struct ucontext_ia32	uc;
-	char			retcode[8];
+	uint32_t pretcode;
+	int32_t sig;
+	uint32_t pinfo;
+	uint32_t puc;
+	compat_siginfo_t info;
+	struct ucontext_ia32 uc;
+	char retcode[8];
 
 	/* fp state follows here */
-	fpu_state_t		fpu_state;
+	fpu_state_t fpu_state;
 };
 
 struct rt_sigframe_64 {
-	char			*pretcode;
-	struct rt_ucontext	uc;
-	struct rt_siginfo	info;
+	char *pretcode;
+	struct rt_ucontext uc;
+	struct rt_siginfo info;
 
 	/* fp state follows here */
-	fpu_state_t		fpu_state;
+	fpu_state_t fpu_state;
 };
 
 struct rt_sigframe {
 	union {
-		struct rt_sigframe_ia32	compat;
-		struct rt_sigframe_64	native;
+		struct rt_sigframe_ia32 compat;
+		struct rt_sigframe_64 native;
 	};
 	bool is_native;
 };
 
-static inline
-void rt_sigframe_copy_sigset(struct rt_sigframe *to, k_rtsigset_t *from)
+static inline void rt_sigframe_copy_sigset(struct rt_sigframe *to, k_rtsigset_t *from)
 {
 	size_t sz = sizeof(k_rtsigset_t);
 
@@ -149,8 +148,7 @@ void rt_sigframe_copy_sigset(struct rt_sigframe *to, k_rtsigset_t *from)
 		memcpy(&to->compat.uc.uc_sigmask, from, sz);
 }
 
-static inline
-void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
+static inline void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
 {
 	size_t sz = sizeof(k_rtsigset_t);
 
@@ -160,15 +158,11 @@ void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
 		memset(&sigframe->compat.uc.uc_sigmask, 0, sz);
 }
 
-#define RT_SIGFRAME_REGIP(rt_sigframe)					\
-	((rt_sigframe->is_native)			?		\
-	(rt_sigframe)->native.uc.uc_mcontext.rip :			\
-	(rt_sigframe)->compat.uc.uc_mcontext.ip)
+#define RT_SIGFRAME_REGIP(rt_sigframe) \
+	((rt_sigframe->is_native) ? (rt_sigframe)->native.uc.uc_mcontext.rip : (rt_sigframe)->compat.uc.uc_mcontext.ip)
 
-#define RT_SIGFRAME_FPU(rt_sigframe)					\
-	((rt_sigframe->is_native)			?		\
-	(&(rt_sigframe)->native.fpu_state)		:		\
-	 (&(rt_sigframe)->compat.fpu_state))
+#define RT_SIGFRAME_FPU(rt_sigframe) \
+	((rt_sigframe->is_native) ? (&(rt_sigframe)->native.fpu_state) : (&(rt_sigframe)->compat.fpu_state))
 
 #define RT_SIGFRAME_HAS_FPU(rt_sigframe) (RT_SIGFRAME_FPU(rt_sigframe)->has_fpu)
 
@@ -178,10 +172,11 @@ void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
  * - compatible is in sys32_rt_sigreturn at arch/x86/ia32/ia32_signal.c
  * - native is in sys_rt_sigreturn at arch/x86/kernel/signal.c
  */
-#define RT_SIGFRAME_OFFSET(rt_sigframe)	(((rt_sigframe)->is_native) ? 8 : 4 )
+#define RT_SIGFRAME_OFFSET(rt_sigframe) (((rt_sigframe)->is_native) ? 8 : 4)
 
-#define USER32_CS		0x23
+#define USER32_CS 0x23
 
+/* clang-format off */
 #define ARCH_RT_SIGRETURN_NATIVE(new_sp)				\
 	asm volatile(							\
 		     "movq %0, %%rax				    \n"	\
@@ -215,6 +210,7 @@ do {									\
 	else								\
 		ARCH_RT_SIGRETURN_COMPAT(new_sp);			\
 } while (0)
+/* clang-format off */
 
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
 		struct rt_sigframe *rsigframe);
diff --git a/compel/include/elf32-types.h b/compel/include/elf32-types.h
index b516ba17e..8f6c59960 100644
--- a/compel/include/elf32-types.h
+++ b/compel/include/elf32-types.h
@@ -1,16 +1,16 @@
 #ifndef COMPEL_ELF32_TYPES_H__
 #define COMPEL_ELF32_TYPES_H__
 
-#define Elf_Ehdr	Elf32_Ehdr
-#define Elf_Shdr	Elf32_Shdr
-#define Elf_Sym		Elf32_Sym
-#define Elf_Rel		Elf32_Rel
-#define Elf_Rela	Elf32_Rela
+#define Elf_Ehdr Elf32_Ehdr
+#define Elf_Shdr Elf32_Shdr
+#define Elf_Sym	 Elf32_Sym
+#define Elf_Rel	 Elf32_Rel
+#define Elf_Rela Elf32_Rela
 
-#define ELF_ST_TYPE	ELF32_ST_TYPE
-#define ELF_ST_BIND	ELF32_ST_BIND
+#define ELF_ST_TYPE ELF32_ST_TYPE
+#define ELF_ST_BIND ELF32_ST_BIND
 
-#define ELF_R_SYM	ELF32_R_SYM
-#define ELF_R_TYPE	ELF32_R_TYPE
+#define ELF_R_SYM  ELF32_R_SYM
+#define ELF_R_TYPE ELF32_R_TYPE
 
 #endif /* COMPEL_ELF32_TYPES_H__ */
diff --git a/compel/include/elf64-types.h b/compel/include/elf64-types.h
index c4d5f1c72..ce11a2a61 100644
--- a/compel/include/elf64-types.h
+++ b/compel/include/elf64-types.h
@@ -1,16 +1,16 @@
 #ifndef COMPEL_ELF64_TYPES_H__
 #define COMPEL_ELF64_TYPES_H__
 
-#define Elf_Ehdr	Elf64_Ehdr
-#define Elf_Shdr	Elf64_Shdr
-#define Elf_Sym		Elf64_Sym
-#define Elf_Rel		Elf64_Rel
-#define Elf_Rela	Elf64_Rela
+#define Elf_Ehdr Elf64_Ehdr
+#define Elf_Shdr Elf64_Shdr
+#define Elf_Sym	 Elf64_Sym
+#define Elf_Rel	 Elf64_Rel
+#define Elf_Rela Elf64_Rela
 
-#define ELF_ST_TYPE	ELF64_ST_TYPE
-#define ELF_ST_BIND	ELF64_ST_BIND
+#define ELF_ST_TYPE ELF64_ST_TYPE
+#define ELF_ST_BIND ELF64_ST_BIND
 
-#define ELF_R_SYM	ELF64_R_SYM
-#define ELF_R_TYPE	ELF64_R_TYPE
+#define ELF_R_SYM  ELF64_R_SYM
+#define ELF_R_TYPE ELF64_R_TYPE
 
 #endif /* COMPEL_ELF64_TYPES_H__ */
diff --git a/compel/include/errno.h b/compel/include/errno.h
index d41fd5391..b4ad1f086 100644
--- a/compel/include/errno.h
+++ b/compel/include/errno.h
@@ -1,9 +1,9 @@
 #ifndef __COMPEL_ERRNO_H__
 #define __COMPEL_ERRNO_H__
 
-#define ERESTARTSYS		512
-#define ERESTARTNOINTR		513
-#define ERESTARTNOHAND		514
-#define ERESTART_RESTARTBLOCK	516
+#define ERESTARTSYS	      512
+#define ERESTARTNOINTR	      513
+#define ERESTARTNOHAND	      514
+#define ERESTART_RESTARTBLOCK 516
 
 #endif /* __CR_ERRNO_H__ */
diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index d4f19307d..1c03f4486 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -3,64 +3,63 @@
 
 #include <stdbool.h>
 
-#define BUILTIN_SYSCALL_SIZE	8
+#define BUILTIN_SYSCALL_SIZE 8
 
 struct thread_ctx {
-	k_rtsigset_t		sigmask;
-	user_regs_struct_t	regs;
+	k_rtsigset_t sigmask;
+	user_regs_struct_t regs;
 #ifdef ARCH_HAS_PTRACE_GET_THREAD_AREA
-	tls_t			tls;
+	tls_t tls;
 #endif
-	user_fpregs_struct_t	ext_regs;
+	user_fpregs_struct_t ext_regs;
 };
 
 /* parasite control block */
 struct parasite_ctl {
-	int			rpid;					/* Real pid of the victim */
-	void			*remote_map;
-	void			*local_map;
-	void			*sigreturn_addr;			/* A place for the breakpoint */
-	unsigned long		map_length;
+	int rpid; /* Real pid of the victim */
+	void *remote_map;
+	void *local_map;
+	void *sigreturn_addr; /* A place for the breakpoint */
+	unsigned long map_length;
 
-	struct infect_ctx	ictx;
+	struct infect_ctx ictx;
 
 	/* thread leader data */
-	bool			daemonized;
+	bool daemonized;
 
-	struct thread_ctx	orig;
+	struct thread_ctx orig;
 
-	void			*rstack;				/* thread leader stack*/
-	struct rt_sigframe	*sigframe;
-	struct rt_sigframe	*rsigframe;				/* address in a parasite */
+	void *rstack; /* thread leader stack*/
+	struct rt_sigframe *sigframe;
+	struct rt_sigframe *rsigframe; /* address in a parasite */
 
-	void			*r_thread_stack;			/* stack for non-leader threads */
+	void *r_thread_stack; /* stack for non-leader threads */
 
-	unsigned long		parasite_ip;				/* service routine start ip */
+	unsigned long parasite_ip; /* service routine start ip */
 
-	unsigned int		*cmd;					/* address for command */
-	void			*args;					/* address for arguments */
-	unsigned long		args_size;
-	int			tsock;					/* transport socket for transferring fds */
+	unsigned int *cmd; /* address for command */
+	void *args; /* address for arguments */
+	unsigned long args_size;
+	int tsock; /* transport socket for transferring fds */
 
 	struct parasite_blob_desc pblob;
 };
 
 struct parasite_thread_ctl {
-	int			tid;
-	struct parasite_ctl	*ctl;
-	struct thread_ctx	th;
+	int tid;
+	struct parasite_ctl *ctl;
+	struct thread_ctx th;
 };
 
-#define MEMFD_FNAME	"CRIUMFD"
-#define MEMFD_FNAME_SZ	sizeof(MEMFD_FNAME)
+#define MEMFD_FNAME    "CRIUMFD"
+#define MEMFD_FNAME_SZ sizeof(MEMFD_FNAME)
 
 struct ctl_msg;
 int parasite_wait_ack(int sockfd, unsigned int cmd, struct ctl_msg *m);
 
 extern void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs);
-extern void *remote_mmap(struct parasite_ctl *ctl,
-		void *addr, size_t length, int prot,
-		int flags, int fd, off_t offset);
+extern void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd,
+			 off_t offset);
 extern bool arch_can_dump_task(struct parasite_ctl *ctl);
 /*
  * @regs:	general purpose registers
@@ -70,16 +69,12 @@ extern bool arch_can_dump_task(struct parasite_ctl *ctl);
  * @flags:	see INFECT_* in infect_ctx::flags
  * @pid:	mystery
  */
-extern int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs,
-			user_fpregs_struct_t *ext_regs, save_regs_t save,
-			void *arg, unsigned long flags);
+extern int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+				void *arg, unsigned long flags);
 extern int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs);
 extern int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s);
-extern int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe,
-				     user_regs_struct_t *regs,
+extern int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs,
 				     user_fpregs_struct_t *fpregs);
-extern int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe,
-					  struct rt_sigframe *rsigframe);
-extern int compel_execute_syscall(struct parasite_ctl *ctl,
-		user_regs_struct_t *regs, const char *code_syscall);
+extern int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe);
+extern int compel_execute_syscall(struct parasite_ctl *ctl, user_regs_struct_t *regs, const char *code_syscall);
 #endif
diff --git a/compel/include/log.h b/compel/include/log.h
index 49e65bb50..0e33976b1 100644
--- a/compel/include/log.h
+++ b/compel/include/log.h
@@ -4,60 +4,47 @@
 #include "uapi/compel/log.h"
 
 #ifndef LOG_PREFIX
-# define LOG_PREFIX
+#define LOG_PREFIX
 #endif
 
 static inline int pr_quelled(unsigned int loglevel)
 {
-	return compel_log_get_loglevel() < loglevel
-		&& loglevel != COMPEL_LOG_MSG;
+	return compel_log_get_loglevel() < loglevel && loglevel != COMPEL_LOG_MSG;
 }
 
-extern void compel_print_on_level(unsigned int loglevel,
-		const char *format, ...)
-		__attribute__ ((__format__ (__printf__, 2, 3)));
+extern void compel_print_on_level(unsigned int loglevel, const char *format, ...)
+	__attribute__((__format__(__printf__, 2, 3)));
 
-#define pr_msg(fmt, ...)						\
-	compel_print_on_level(COMPEL_LOG_MSG,				\
-		       fmt, ##__VA_ARGS__)
+#define pr_msg(fmt, ...) compel_print_on_level(COMPEL_LOG_MSG, fmt, ##__VA_ARGS__)
 
-#define pr_info(fmt, ...)						\
-	compel_print_on_level(COMPEL_LOG_INFO,				\
-		       LOG_PREFIX fmt, ##__VA_ARGS__)
+#define pr_info(fmt, ...) compel_print_on_level(COMPEL_LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
 
-#define pr_err(fmt, ...)						\
-	compel_print_on_level(COMPEL_LOG_ERROR,				\
-		       "Error (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+#define pr_err(fmt, ...) \
+	compel_print_on_level(COMPEL_LOG_ERROR, "Error (%s:%d): " LOG_PREFIX fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 
-#define pr_err_once(fmt, ...)						\
-	do {								\
-		static bool __printed;					\
-		if (!__printed) {					\
-			pr_err(fmt, ##__VA_ARGS__);			\
-			__printed = 1;					\
-		}							\
+#define pr_err_once(fmt, ...)                       \
+	do {                                        \
+		static bool __printed;              \
+		if (!__printed) {                   \
+			pr_err(fmt, ##__VA_ARGS__); \
+			__printed = 1;              \
+		}                                   \
 	} while (0)
 
-#define pr_warn(fmt, ...)						\
-	compel_print_on_level(COMPEL_LOG_WARN,				\
-		       "Warn  (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+#define pr_warn(fmt, ...) \
+	compel_print_on_level(COMPEL_LOG_WARN, "Warn  (%s:%d): " LOG_PREFIX fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 
-#define pr_warn_once(fmt, ...)						\
-	do {								\
-		static bool __printed;					\
-		if (!__printed) {					\
-			pr_warn(fmt, ##__VA_ARGS__);			\
-			__printed = 1;					\
-		}							\
+#define pr_warn_once(fmt, ...)                       \
+	do {                                         \
+		static bool __printed;               \
+		if (!__printed) {                    \
+			pr_warn(fmt, ##__VA_ARGS__); \
+			__printed = 1;               \
+		}                                    \
 	} while (0)
 
-#define pr_debug(fmt, ...)						\
-	compel_print_on_level(COMPEL_LOG_DEBUG,				\
-		       LOG_PREFIX fmt, ##__VA_ARGS__)
+#define pr_debug(fmt, ...) compel_print_on_level(COMPEL_LOG_DEBUG, LOG_PREFIX fmt, ##__VA_ARGS__)
 
-#define pr_perror(fmt, ...)						\
-	pr_err(fmt ": %m\n", ##__VA_ARGS__)
+#define pr_perror(fmt, ...) pr_err(fmt ": %m\n", ##__VA_ARGS__)
 
 #endif /* COMPEL_LOG_H__ */
diff --git a/compel/include/piegen.h b/compel/include/piegen.h
index fd72f9c22..d445d5349 100644
--- a/compel/include/piegen.h
+++ b/compel/include/piegen.h
@@ -9,19 +9,19 @@
 #include "common/compiler.h"
 
 typedef struct {
-	char		*input_filename;
-	char		*output_filename;
-	char		*prefix;
-	FILE		*fout;
+	char *input_filename;
+	char *output_filename;
+	char *prefix;
+	FILE *fout;
 } piegen_opt_t;
 
 extern piegen_opt_t opts;
 
-#define pr_out(fmt, ...)							\
-do {										\
-	if (opts.fout)								\
-		fprintf(opts.fout, fmt, ##__VA_ARGS__);				\
-} while (0)
+#define pr_out(fmt, ...)                                        \
+	do {                                                    \
+		if (opts.fout)                                  \
+			fprintf(opts.fout, fmt, ##__VA_ARGS__); \
+	} while (0)
 
 extern int handle_binary(void *mem, size_t size);
 
diff --git a/compel/include/ptrace.h b/compel/include/ptrace.h
index 01f55c45a..bf2701e63 100644
--- a/compel/include/ptrace.h
+++ b/compel/include/ptrace.h
@@ -5,7 +5,7 @@
 #include <compel/asm/infect-types.h>
 #include <compel/ptrace.h>
 
-#define PTRACE_SI_EVENT(_si_code)	(((_si_code) & 0xFFFF) >> 8)
+#define PTRACE_SI_EVENT(_si_code) (((_si_code)&0xFFFF) >> 8)
 
 extern int ptrace_get_regs(pid_t pid, user_regs_struct_t *regs);
 extern int ptrace_set_regs(pid_t pid, user_regs_struct_t *regs);
diff --git a/compel/include/rpc-pie-priv.h b/compel/include/rpc-pie-priv.h
index 15f5b14ca..2a239c613 100644
--- a/compel/include/rpc-pie-priv.h
+++ b/compel/include/rpc-pie-priv.h
@@ -1,16 +1,22 @@
 #ifndef __COMPEL_RPC_H__
 #define __COMPEL_RPC_H__
 struct ctl_msg {
-	uint32_t	cmd;			/* command itself */
-	uint32_t	ack;			/* ack on command */
-	int32_t		err;			/* error code on reply */
+	uint32_t cmd; /* command itself */
+	uint32_t ack; /* ack on command */
+	int32_t err; /* error code on reply */
 };
 
-#define ctl_msg_cmd(_cmd)		\
-	(struct ctl_msg){.cmd = _cmd, }
+#define ctl_msg_cmd(_cmd)    \
+	(struct ctl_msg)     \
+	{                    \
+		.cmd = _cmd, \
+	}
 
-#define ctl_msg_ack(_cmd, _err)	\
-	(struct ctl_msg){.cmd = _cmd, .ack = _cmd, .err = _err, }
+#define ctl_msg_ack(_cmd, _err)                        \
+	(struct ctl_msg)                               \
+	{                                              \
+		.cmd = _cmd, .ack = _cmd, .err = _err, \
+	}
 
 /*
  * NOTE: each command's args should be arch-independed sized.
@@ -18,7 +24,7 @@ struct ctl_msg {
  * alternative type for compatible tasks in parasite-compat.h
  */
 enum {
-	PARASITE_CMD_IDLE		= 0,
+	PARASITE_CMD_IDLE = 0,
 	PARASITE_CMD_ACK,
 
 	PARASITE_CMD_INIT_DAEMON,
@@ -32,19 +38,19 @@ enum {
 };
 
 struct parasite_init_args {
-	int32_t				h_addr_len;
-	struct sockaddr_un		h_addr;
-	int32_t				log_level;
-	uint64_t			sigreturn_addr;
-	uint64_t			sigframe; /* pointer to sigframe */
-	futex_t				daemon_connected;
+	int32_t h_addr_len;
+	struct sockaddr_un h_addr;
+	int32_t log_level;
+	uint64_t sigreturn_addr;
+	uint64_t sigframe; /* pointer to sigframe */
+	futex_t daemon_connected;
 #ifdef ARCH_HAS_LONG_PAGES
-	uint32_t			page_size;
+	uint32_t page_size;
 #endif
 };
 
 struct parasite_unmap_args {
-	uint64_t	parasite_start;
-	uint64_t	parasite_len;
+	uint64_t parasite_start;
+	uint64_t parasite_len;
 };
 #endif
diff --git a/compel/include/shmem.h b/compel/include/shmem.h
index b6f994617..a38599625 100644
--- a/compel/include/shmem.h
+++ b/compel/include/shmem.h
@@ -7,4 +7,3 @@ struct shmem_plugin_msg {
 };
 
 #endif /* __COMPEL_PLUGIN_SHMEM_PRIV_H__ */
-
diff --git a/compel/include/uapi/handle-elf.h b/compel/include/uapi/handle-elf.h
index ba40be57f..3b6d5bfee 100644
--- a/compel/include/uapi/handle-elf.h
+++ b/compel/include/uapi/handle-elf.h
@@ -1,22 +1,22 @@
 #ifndef __COMPEL_UAPI_HANDLE_ELF__
 #define __COMPEL_UAPI_HANDLE_ELF__
 
-#define COMPEL_TYPE_INT		(1u << 0)
-#define COMPEL_TYPE_LONG	(1u << 1)
-#define COMPEL_TYPE_GOTPCREL	(1u << 2)
+#define COMPEL_TYPE_INT	     (1u << 0)
+#define COMPEL_TYPE_LONG     (1u << 1)
+#define COMPEL_TYPE_GOTPCREL (1u << 2)
 #ifdef CONFIG_MIPS
-#define COMPEL_TYPE_MIPS_26	  (1u << 3)
-#define COMPEL_TYPE_MIPS_HI16	  (1u << 4)
-#define COMPEL_TYPE_MIPS_LO16	  (1u << 5)
-#define COMPEL_TYPE_MIPS_HIGHER	  (1u << 6)
-#define COMPEL_TYPE_MIPS_HIGHEST  (1u << 7)
-#define COMPEL_TYPE_MIPS_64	  (1u << 8)
+#define COMPEL_TYPE_MIPS_26	 (1u << 3)
+#define COMPEL_TYPE_MIPS_HI16	 (1u << 4)
+#define COMPEL_TYPE_MIPS_LO16	 (1u << 5)
+#define COMPEL_TYPE_MIPS_HIGHER	 (1u << 6)
+#define COMPEL_TYPE_MIPS_HIGHEST (1u << 7)
+#define COMPEL_TYPE_MIPS_64	 (1u << 8)
 #endif
 typedef struct {
-	unsigned int	offset;
-	unsigned int	type;
-	long		addend;
-	long		value;
+	unsigned int offset;
+	unsigned int type;
+	long addend;
+	long value;
 } compel_reloc_t;
 
 #endif
diff --git a/compel/include/uapi/infect-rpc.h b/compel/include/uapi/infect-rpc.h
index 5fcdb56ff..d0f853859 100644
--- a/compel/include/uapi/infect-rpc.h
+++ b/compel/include/uapi/infect-rpc.h
@@ -13,7 +13,6 @@ extern int __must_check compel_rpc_call(unsigned int cmd, struct parasite_ctl *c
 extern int __must_check compel_rpc_call_sync(unsigned int cmd, struct parasite_ctl *ctl);
 extern int compel_rpc_sock(struct parasite_ctl *ctl);
 
-#define PARASITE_USER_CMDS	64
-
+#define PARASITE_USER_CMDS 64
 
 #endif
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 65564ae8f..c3d2ee6a6 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -11,23 +11,23 @@
 
 #include "common/compiler.h"
 
-#define PARASITE_START_AREA_MIN	(4096)
+#define PARASITE_START_AREA_MIN (4096)
 
 extern int __must_check compel_interrupt_task(int pid);
 
 struct seize_task_status {
-	unsigned long long	sigpnd;
-	unsigned long long	shdpnd;
-	char			state;
-	int			vpid;
-	int			ppid;
-	int			seccomp_mode;
+	unsigned long long sigpnd;
+	unsigned long long shdpnd;
+	char state;
+	int vpid;
+	int ppid;
+	int seccomp_mode;
 };
 
 extern int __must_check compel_wait_task(int pid, int ppid,
-		int (*get_status)(int pid, struct seize_task_status *, void *data),
-		void (*free_status)(int pid, struct seize_task_status *, void *data),
-		struct seize_task_status *st, void *data);
+					 int (*get_status)(int pid, struct seize_task_status *, void *data),
+					 void (*free_status)(int pid, struct seize_task_status *, void *data),
+					 struct seize_task_status *st, void *data);
 
 extern int __must_check compel_stop_task(int pid);
 extern int compel_resume_task(pid_t pid, int orig_state, int state);
@@ -37,8 +37,7 @@ struct parasite_thread_ctl;
 
 extern struct parasite_ctl __must_check *compel_prepare(int pid);
 extern struct parasite_ctl __must_check *compel_prepare_noctx(int pid);
-extern int __must_check compel_infect(struct parasite_ctl *ctl,
-		unsigned long nr_threads, unsigned long args_size);
+extern int __must_check compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size);
 extern struct parasite_thread_ctl __must_check *compel_prepare_thread(struct parasite_ctl *ctl, int pid);
 extern void compel_release_thread(struct parasite_thread_ctl *);
 
@@ -47,27 +46,22 @@ extern int __must_check compel_cure_remote(struct parasite_ctl *ctl);
 extern int __must_check compel_cure_local(struct parasite_ctl *ctl);
 extern int __must_check compel_cure(struct parasite_ctl *ctl);
 
-#define PARASITE_ARG_SIZE_MIN	( 1 << 12)
+#define PARASITE_ARG_SIZE_MIN (1 << 12)
 
-#define compel_parasite_args(ctl, type)					\
-	({								\
-	 	void *___ret;						\
-		BUILD_BUG_ON(sizeof(type) > PARASITE_ARG_SIZE_MIN);	\
-		___ret = compel_parasite_args_p(ctl);			\
-	 	___ret;							\
+#define compel_parasite_args(ctl, type)                             \
+	({                                                          \
+		void *___ret;                                       \
+		BUILD_BUG_ON(sizeof(type) > PARASITE_ARG_SIZE_MIN); \
+		___ret = compel_parasite_args_p(ctl);               \
+		___ret;                                             \
 	})
 
 extern void *compel_parasite_args_p(struct parasite_ctl *ctl);
 extern void *compel_parasite_args_s(struct parasite_ctl *ctl, unsigned long args_size);
 
-extern int __must_check compel_syscall(struct parasite_ctl *ctl,
-		int nr, long *ret,
-		unsigned long arg1,
-		unsigned long arg2,
-		unsigned long arg3,
-		unsigned long arg4,
-		unsigned long arg5,
-		unsigned long arg6);
+extern int __must_check compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1,
+				       unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5,
+				       unsigned long arg6);
 extern int __must_check compel_run_in_thread(struct parasite_thread_ctl *tctl, unsigned int cmd);
 extern int __must_check compel_run_at(struct parasite_ctl *ctl, unsigned long ip, user_regs_struct_t *ret_regs);
 
@@ -83,11 +77,9 @@ enum trace_flags {
 	TRACE_EXIT,
 };
 
-extern int __must_check compel_stop_on_syscall(int tasks, int sys_nr,
-		int sys_nr_compat, enum trace_flags trace);
+extern int __must_check compel_stop_on_syscall(int tasks, int sys_nr, int sys_nr_compat, enum trace_flags trace);
 
-extern int __must_check compel_stop_pie(pid_t pid, void *addr,
-		enum trace_flags *tf, bool no_bp);
+extern int __must_check compel_stop_pie(pid_t pid, void *addr, enum trace_flags *tf, bool no_bp);
 
 extern int __must_check compel_unmap(struct parasite_ctl *ctl, unsigned long addr);
 
@@ -98,69 +90,68 @@ extern k_rtsigset_t *compel_thread_sigmask(struct parasite_thread_ctl *tctl);
 
 struct rt_sigframe;
 
-typedef int (*open_proc_fn)(int pid, int mode, const char *fmt, ...)
-	__attribute__ ((__format__ (__printf__, 3, 4)));
+typedef int (*open_proc_fn)(int pid, int mode, const char *fmt, ...) __attribute__((__format__(__printf__, 3, 4)));
 typedef int (*save_regs_t)(void *, user_regs_struct_t *, user_fpregs_struct_t *);
 typedef int (*make_sigframe_t)(void *, struct rt_sigframe *, struct rt_sigframe *, k_rtsigset_t *);
 
 struct infect_ctx {
-	int	sock;
+	int sock;
 
 	/*
 	 * Regs manipulation context.
 	 */
-	save_regs_t		save_regs;
-	make_sigframe_t		make_sigframe;
+	save_regs_t save_regs;
+	make_sigframe_t make_sigframe;
 	void *regs_arg;
 
-	unsigned long		task_size;
-	unsigned long		syscall_ip;				/* entry point of infection */
-	unsigned long		flags;			/* fine-tune (e.g. faults) */
+	unsigned long task_size;
+	unsigned long syscall_ip; /* entry point of infection */
+	unsigned long flags; /* fine-tune (e.g. faults) */
 
-	void (*child_handler)(int, siginfo_t *, void *);	/* hander for SIGCHLD deaths */
-	struct sigaction	orig_handler;
+	void (*child_handler)(int, siginfo_t *, void *); /* hander for SIGCHLD deaths */
+	struct sigaction orig_handler;
 
 	open_proc_fn open_proc;
 
-	int			log_fd;	/* fd for parasite code to send messages to */
+	int log_fd; /* fd for parasite code to send messages to */
 };
 
 extern struct infect_ctx *compel_infect_ctx(struct parasite_ctl *);
 
 /* Don't use memfd() */
-#define INFECT_NO_MEMFD			(1UL << 0)
+#define INFECT_NO_MEMFD (1UL << 0)
 /* Make parasite connect() fail */
-#define INFECT_FAIL_CONNECT		(1UL << 1)
+#define INFECT_FAIL_CONNECT (1UL << 1)
 /* No breakpoints in pie tracking */
-#define INFECT_NO_BREAKPOINTS		(1UL << 2)
+#define INFECT_NO_BREAKPOINTS (1UL << 2)
 /* Can run parasite inside compat tasks */
-#define INFECT_COMPATIBLE		(1UL << 3)
+#define INFECT_COMPATIBLE (1UL << 3)
 /* Workaround for ptrace bug on Skylake CPUs with kernels older than v4.14 */
-#define INFECT_X86_PTRACE_MXCSR_BUG	(1UL << 4)
+#define INFECT_X86_PTRACE_MXCSR_BUG (1UL << 4)
 /* After infecting - corrupt extended registers (fault-injection) */
-#define INFECT_CORRUPT_EXTREGS		(1UL << 5)
+#define INFECT_CORRUPT_EXTREGS (1UL << 5)
 
 /*
  * There are several ways to describe a blob to compel
  * library. The simplest one derived from criu is to
  * provide it from .h files.
  */
-#define COMPEL_BLOB_CHEADER	0x1
+#define COMPEL_BLOB_CHEADER 0x1
 
 struct parasite_blob_desc {
-	unsigned		parasite_type;
+	unsigned parasite_type;
 	union {
 		struct {
-			const void		*mem;
-			size_t			bsize;
-			unsigned long		parasite_ip_off;
-			unsigned long		cmd_off;
-			unsigned long		args_ptr_off;
-			unsigned long		got_off;
-			unsigned long		args_off;
-			unsigned long		data_off;
-			compel_reloc_t		*relocs;
-			unsigned int		nr_relocs;
+			const void *mem;
+			size_t bsize;
+			unsigned long parasite_ip_off;
+			unsigned long cmd_off;
+			unsigned long args_ptr_off;
+			unsigned long got_off;
+			unsigned long args_off;
+			unsigned long data_off;
+			compel_reloc_t *relocs;
+			unsigned int nr_relocs;
 		} hdr;
 	};
 };
diff --git a/compel/include/uapi/loglevels.h b/compel/include/uapi/loglevels.h
index 7bf88475d..e76c15657 100644
--- a/compel/include/uapi/loglevels.h
+++ b/compel/include/uapi/loglevels.h
@@ -6,15 +6,14 @@
  * also by log functions in the std plugin.
  */
 
-enum __compel_log_levels
-{
-	COMPEL_LOG_MSG,		/* Print message regardless of log level */
-	COMPEL_LOG_ERROR,	/* Errors only, when we're in trouble */
-	COMPEL_LOG_WARN,	/* Warnings */
-	COMPEL_LOG_INFO,	/* Informative, everything is fine */
-	COMPEL_LOG_DEBUG,	/* Debug only */
+enum __compel_log_levels {
+	COMPEL_LOG_MSG, /* Print message regardless of log level */
+	COMPEL_LOG_ERROR, /* Errors only, when we're in trouble */
+	COMPEL_LOG_WARN, /* Warnings */
+	COMPEL_LOG_INFO, /* Informative, everything is fine */
+	COMPEL_LOG_DEBUG, /* Debug only */
 
-	COMPEL_DEFAULT_LOGLEVEL	= COMPEL_LOG_WARN
+	COMPEL_DEFAULT_LOGLEVEL = COMPEL_LOG_WARN
 };
 
 #endif /* UAPI_COMPEL_LOGLEVELS_H__ */
diff --git a/compel/include/uapi/plugins.h b/compel/include/uapi/plugins.h
index e9ebfb67f..658c95fc9 100644
--- a/compel/include/uapi/plugins.h
+++ b/compel/include/uapi/plugins.h
@@ -1,33 +1,31 @@
 #ifndef UAPI_COMPEL_PLUGIN_H__
 #define UAPI_COMPEL_PLUGIN_H__
 
-#define __init	__attribute__((__used__)) __attribute__ ((__section__(".compel.init")))
-#define __exit	__attribute__((__used__)) __attribute__ ((__section__(".compel.exit")))
+#define __init __attribute__((__used__)) __attribute__((__section__(".compel.init")))
+#define __exit __attribute__((__used__)) __attribute__((__section__(".compel.exit")))
 
 #ifndef __ASSEMBLY__
 
 typedef struct {
-	const char	*name;
-	int		(*init)(void);
-	void		(*exit)(void);
+	const char *name;
+	int (*init)(void);
+	void (*exit)(void);
 } plugin_init_t;
 
-#define plugin_register(___desc)				\
-	static const plugin_init_t * const			\
-	___ptr__##___desc __init = &___desc;
+#define plugin_register(___desc) static const plugin_init_t *const ___ptr__##___desc __init = &___desc;
 
-#define PLUGIN_REGISTER(___id, ___name, ___init, ___exit)	\
-	static const plugin_init_t __plugin_desc_##___id = {	\
-		.name = ___name,				\
-		.init = ___init,				\
-		.exit = ___exit,				\
-	};							\
+#define PLUGIN_REGISTER(___id, ___name, ___init, ___exit)    \
+	static const plugin_init_t __plugin_desc_##___id = { \
+		.name = ___name,                             \
+		.init = ___init,                             \
+		.exit = ___exit,                             \
+	};                                                   \
 	plugin_register(__plugin_desc_##___id);
 
-#define PLUGIN_REGISTER_DUMMY(___id)				\
-	static const plugin_init_t __plugin_desc_##___id = {	\
-		.name = #___id,					\
-	};							\
+#define PLUGIN_REGISTER_DUMMY(___id)                         \
+	static const plugin_init_t __plugin_desc_##___id = { \
+		.name = #___id,                              \
+	};                                                   \
 	plugin_register(__plugin_desc_##___id);
 
 #endif /* __ASSEMBLY__ */
diff --git a/compel/include/uapi/ptrace.h b/compel/include/uapi/ptrace.h
index 13eed7232..c5291d20d 100644
--- a/compel/include/uapi/ptrace.h
+++ b/compel/include/uapi/ptrace.h
@@ -19,40 +19,40 @@
  */
 
 #ifndef PTRACE_SEIZE
-# define PTRACE_SEIZE		0x4206
+#define PTRACE_SEIZE 0x4206
 #endif
 
 #ifndef PTRACE_O_SUSPEND_SECCOMP
-# define PTRACE_O_SUSPEND_SECCOMP (1 << 21)
+#define PTRACE_O_SUSPEND_SECCOMP (1 << 21)
 #endif
 
 #ifndef PTRACE_INTERRUPT
-# define PTRACE_INTERRUPT	0x4207
+#define PTRACE_INTERRUPT 0x4207
 #endif
 
 #ifndef PTRACE_PEEKSIGINFO
-#define PTRACE_PEEKSIGINFO      0x4209
+#define PTRACE_PEEKSIGINFO 0x4209
 
 /* Read signals from a shared (process wide) queue */
-#define PTRACE_PEEKSIGINFO_SHARED       (1 << 0)
+#define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
 #endif
 
 #ifndef PTRACE_GETREGSET
-# define PTRACE_GETREGSET	0x4204
-# define PTRACE_SETREGSET	0x4205
+#define PTRACE_GETREGSET 0x4204
+#define PTRACE_SETREGSET 0x4205
 #endif
 
 #ifndef PTRACE_GETSIGMASK
-# define PTRACE_GETSIGMASK	0x420a
-# define PTRACE_SETSIGMASK	0x420b
+#define PTRACE_GETSIGMASK 0x420a
+#define PTRACE_SETSIGMASK 0x420b
 #endif
 
 #ifndef PTRACE_SECCOMP_GET_FILTER
-#define PTRACE_SECCOMP_GET_FILTER	0x420c
+#define PTRACE_SECCOMP_GET_FILTER 0x420c
 #endif
 
 #ifndef PTRACE_SECCOMP_GET_METADATA
-# define PTRACE_SECCOMP_GET_METADATA	0x420d
+#define PTRACE_SECCOMP_GET_METADATA 0x420d
 #endif /* PTRACE_SECCOMP_GET_METADATA */
 
 /*
@@ -61,17 +61,17 @@
  * own identical definition for a while.
  */
 typedef struct {
-	uint64_t	filter_off;	/* Input: which filter */
-	uint64_t	flags;		/* Output: filter's flags */
+	uint64_t filter_off; /* Input: which filter */
+	uint64_t flags; /* Output: filter's flags */
 } seccomp_metadata_t;
 
 #ifdef PTRACE_EVENT_STOP
-# if PTRACE_EVENT_STOP == 7 /* Bad value from Linux 3.1-3.3, fixed in 3.4 */
-#  undef PTRACE_EVENT_STOP
-# endif
+#if PTRACE_EVENT_STOP == 7 /* Bad value from Linux 3.1-3.3, fixed in 3.4 */
+#undef PTRACE_EVENT_STOP
+#endif
 #endif
 #ifndef PTRACE_EVENT_STOP
-# define PTRACE_EVENT_STOP	128
+#define PTRACE_EVENT_STOP 128
 #endif
 
 extern int ptrace_suspend_seccomp(pid_t pid);
diff --git a/compel/include/uapi/sigframe-common.h b/compel/include/uapi/sigframe-common.h
index 177bf4c48..3062d1d38 100644
--- a/compel/include/uapi/sigframe-common.h
+++ b/compel/include/uapi/sigframe-common.h
@@ -5,7 +5,7 @@
 #define UAPI_COMPEL_SIGFRAME_COMMON_H__
 
 #ifndef UAPI_COMPEL_ASM_SIGFRAME_H__
-# error "Direct inclusion is forbidden, use <compel/asm/sigframe.h> instead"
+#error "Direct inclusion is forbidden, use <compel/asm/sigframe.h> instead"
 #endif
 
 #include "common/compiler.h"
@@ -15,49 +15,47 @@
 struct rt_sigframe;
 
 #ifndef SIGFRAME_MAX_OFFSET
-# define SIGFRAME_MAX_OFFSET		RT_SIGFRAME_OFFSET(0)
+#define SIGFRAME_MAX_OFFSET RT_SIGFRAME_OFFSET(0)
 #endif
 
-#define RESTORE_STACK_ALIGN(x, a)	(((x) + (a) - 1) & ~((a) - 1))
+#define RESTORE_STACK_ALIGN(x, a) (((x) + (a)-1) & ~((a)-1))
 
 /* sigframe should be aligned on 64 byte for x86 and 8 bytes for arm */
-#define RESTORE_STACK_SIGFRAME		\
-	RESTORE_STACK_ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_MAX_OFFSET, 64)
+#define RESTORE_STACK_SIGFRAME RESTORE_STACK_ALIGN(sizeof(struct rt_sigframe) + SIGFRAME_MAX_OFFSET, 64)
 
 #ifndef __ARCH_SI_PREAMBLE_SIZE
-# define __ARCH_SI_PREAMBLE_SIZE	(3 * sizeof(int))
+#define __ARCH_SI_PREAMBLE_SIZE (3 * sizeof(int))
 #endif
 
-#define SI_MAX_SIZE	128
+#define SI_MAX_SIZE 128
 
 #ifndef SI_PAD_SIZE
-# define SI_PAD_SIZE			((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
+#define SI_PAD_SIZE ((SI_MAX_SIZE - __ARCH_SI_PREAMBLE_SIZE) / sizeof(int))
 #endif
 
 typedef struct rt_siginfo {
-	int	si_signo;
-	int	si_errno;
-	int	si_code;
-	int	_pad[SI_PAD_SIZE];
+	int si_signo;
+	int si_errno;
+	int si_code;
+	int _pad[SI_PAD_SIZE];
 } rt_siginfo_t;
 
 typedef struct rt_sigaltstack {
-	void	*ss_sp;
-	int	ss_flags;
-	size_t	ss_size;
+	void *ss_sp;
+	int ss_flags;
+	size_t ss_size;
 } rt_stack_t;
 
 struct rt_ucontext {
-	unsigned long		uc_flags;
-	struct rt_ucontext	*uc_link;
-	rt_stack_t		uc_stack;
-	struct rt_sigcontext	uc_mcontext;
-	k_rtsigset_t		uc_sigmask;	/* mask last for extensibility */
-	int			_unused[32 - (sizeof (k_rtsigset_t) / sizeof (int))];
-	unsigned long		uc_regspace[128] __attribute__((aligned(8)));
+	unsigned long uc_flags;
+	struct rt_ucontext *uc_link;
+	rt_stack_t uc_stack;
+	struct rt_sigcontext uc_mcontext;
+	k_rtsigset_t uc_sigmask; /* mask last for extensibility */
+	int _unused[32 - (sizeof(k_rtsigset_t) / sizeof(int))];
+	unsigned long uc_regspace[128] __attribute__((aligned(8)));
 };
 
-extern int __must_check sigreturn_prep_fpu_frame(struct rt_sigframe *frame,
-						 struct rt_sigframe *rframe);
+extern int __must_check sigreturn_prep_fpu_frame(struct rt_sigframe *frame, struct rt_sigframe *rframe);
 
 #endif /* UAPI_COMPEL_SIGFRAME_COMMON_H__ */
diff --git a/compel/include/uapi/task-state.h b/compel/include/uapi/task-state.h
index 84a2a0ba5..ac1baafb5 100644
--- a/compel/include/uapi/task-state.h
+++ b/compel/include/uapi/task-state.h
@@ -5,15 +5,14 @@
  * Task state, as returned by compel_wait_task()
  * and used in arguments to compel_resume_task().
  */
-enum __compel_task_state
-{
-	COMPEL_TASK_ALIVE	= 0x01,
-	COMPEL_TASK_DEAD	= 0x02,
-	COMPEL_TASK_STOPPED	= 0x03,
-	COMPEL_TASK_ZOMBIE	= 0x06,
+enum __compel_task_state {
+	COMPEL_TASK_ALIVE = 0x01,
+	COMPEL_TASK_DEAD = 0x02,
+	COMPEL_TASK_STOPPED = 0x03,
+	COMPEL_TASK_ZOMBIE = 0x06,
 	/* Don't ever change the above values, they are used by CRIU! */
 
-	COMPEL_TASK_MAX		= 0x7f
+	COMPEL_TASK_MAX = 0x7f
 };
 
 #endif /* __COMPEL_UAPI_TASK_STATE_H__ */
diff --git a/compel/plugins/include/uapi/std/infect.h b/compel/plugins/include/uapi/std/infect.h
index 78de781b2..08a5a7a80 100644
--- a/compel/plugins/include/uapi/std/infect.h
+++ b/compel/plugins/include/uapi/std/infect.h
@@ -6,7 +6,7 @@
 extern int parasite_get_rpc_sock(void);
 
 extern unsigned int __export_parasite_service_cmd;
-extern void * __export_parasite_service_args_ptr;
+extern void *__export_parasite_service_args_ptr;
 extern int __must_check parasite_service(void);
 
 /*
diff --git a/compel/plugins/include/uapi/std/log.h b/compel/plugins/include/uapi/std/log.h
index 91462c85b..0b53567a0 100644
--- a/compel/plugins/include/uapi/std/log.h
+++ b/compel/plugins/include/uapi/std/log.h
@@ -4,7 +4,7 @@
 #include "compel/loglevels.h"
 #include "common/compiler.h"
 
-#define STD_LOG_SIMPLE_CHUNK	256
+#define STD_LOG_SIMPLE_CHUNK 256
 
 extern void std_log_set_fd(int fd);
 extern void std_log_set_loglevel(enum __compel_log_levels level);
@@ -23,8 +23,8 @@ extern int std_gettimeofday(struct timeval *tv, struct timezone *tz);
 
 extern int std_vprint_num(char *buf, int blen, int num, char **ps);
 extern void std_sprintf(char output[STD_LOG_SIMPLE_CHUNK], const char *format, ...)
-	__attribute__ ((__format__ (__printf__, 2, 3)));
+	__attribute__((__format__(__printf__, 2, 3)));
 extern void print_on_level(unsigned int loglevel, const char *format, ...)
-	__attribute__ ((__format__ (__printf__, 2, 3)));
+	__attribute__((__format__(__printf__, 2, 3)));
 
 #endif /* COMPEL_PLUGIN_STD_LOG_H__ */
diff --git a/compel/plugins/include/uapi/std/string.h b/compel/plugins/include/uapi/std/string.h
index c2e4b9345..1c68cb5f4 100644
--- a/compel/plugins/include/uapi/std/string.h
+++ b/compel/plugins/include/uapi/std/string.h
@@ -6,20 +6,18 @@
 #include <stdarg.h>
 
 /* Standard file descriptors.  */
-#define	STDIN_FILENO	0	/* Standard input.  */
-#define	STDOUT_FILENO	1	/* Standard output.  */
-#define	STDERR_FILENO	2	/* Standard error output.  */
-
+#define STDIN_FILENO  0 /* Standard input.  */
+#define STDOUT_FILENO 1 /* Standard output.  */
+#define STDERR_FILENO 2 /* Standard error output.  */
 
 extern void std_dputc(int fd, char c);
 extern void std_dputs(int fd, const char *s);
 extern void std_vdprintf(int fd, const char *format, va_list args);
-extern void std_dprintf(int fd, const char *format, ...)
-	__attribute__ ((__format__ (__printf__, 2, 3)));
+extern void std_dprintf(int fd, const char *format, ...) __attribute__((__format__(__printf__, 2, 3)));
 
-#define std_printf(fmt, ...)	std_dprintf(STDOUT_FILENO, fmt, ##__VA_ARGS__)
-#define std_puts(s)		std_dputs(STDOUT_FILENO, s)
-#define std_putchar(c)		std_dputc(STDOUT_FILENO, c)
+#define std_printf(fmt, ...) std_dprintf(STDOUT_FILENO, fmt, ##__VA_ARGS__)
+#define std_puts(s)	     std_dputs(STDOUT_FILENO, s)
+#define std_putchar(c)	     std_dputc(STDOUT_FILENO, c)
 
 extern unsigned long std_strtoul(const char *nptr, char **endptr, int base);
 extern int std_strcmp(const char *cs, const char *ct);
diff --git a/compel/plugins/include/uapi/std/syscall-types.h b/compel/plugins/include/uapi/std/syscall-types.h
index 031e773bb..cc1969c01 100644
--- a/compel/plugins/include/uapi/std/syscall-types.h
+++ b/compel/plugins/include/uapi/std/syscall-types.h
@@ -44,7 +44,7 @@ struct clone_args;
 typedef unsigned long aio_context_t;
 
 #ifndef F_GETFD
-# define F_GETFD 1
+#define F_GETFD 1
 #endif
 
 struct krlimit {
@@ -57,7 +57,6 @@ typedef int kernel_timer_t;
 
 #include <compel/plugins/std/asm/syscall-types.h>
 
-
 extern long sys_preadv_raw(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h);
 
 static inline long sys_preadv(int fd, struct iovec *iov, unsigned long nr, off_t off)
@@ -67,7 +66,7 @@ static inline long sys_preadv(int fd, struct iovec *iov, unsigned long nr, off_t
 #elif BITS_PER_LONG == 32
 	return sys_preadv_raw(fd, iov, nr, off, ((uint64_t)off) >> 32);
 #else
-#	error "BITS_PER_LONG isn't defined"
+#error "BITS_PER_LONG isn't defined"
 #endif
 }
 
diff --git a/criu/arch/aarch64/include/asm/dump.h b/criu/arch/aarch64/include/asm/dump.h
index bc3dbcf3a..90cd8bca8 100644
--- a/criu/arch/aarch64/include/asm/dump.h
+++ b/criu/arch/aarch64/include/asm/dump.h
@@ -5,7 +5,6 @@ extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
-
 static inline void core_put_tls(CoreEntry *core, tls_t tls)
 {
 	core->ti_aarch64->tls = tls;
diff --git a/criu/arch/aarch64/include/asm/kerndat.h b/criu/arch/aarch64/include/asm/kerndat.h
index 60956b573..bb70cf6cf 100644
--- a/criu/arch/aarch64/include/asm/kerndat.h
+++ b/criu/arch/aarch64/include/asm/kerndat.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_KERNDAT_H__
 #define __CR_ASM_KERNDAT_H__
 
-#define kdat_compatible_cr()			0
-#define kdat_can_map_vdso()			0
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
 
 #endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/aarch64/include/asm/parasite.h b/criu/arch/aarch64/include/asm/parasite.h
index 2a1e1c12e..cdcbc7909 100644
--- a/criu/arch/aarch64/include/asm/parasite.h
+++ b/criu/arch/aarch64/include/asm/parasite.h
@@ -4,7 +4,7 @@
 static inline void arch_get_tls(tls_t *ptls)
 {
 	tls_t tls;
-	asm("mrs %0, tpidr_el0" : "=r" (tls));
+	asm("mrs %0, tpidr_el0" : "=r"(tls));
 	*ptls = tls;
 }
 
diff --git a/criu/arch/aarch64/include/asm/restore.h b/criu/arch/aarch64/include/asm/restore.h
index 3d794ffb5..75e87996a 100644
--- a/criu/arch/aarch64/include/asm/restore.h
+++ b/criu/arch/aarch64/include/asm/restore.h
@@ -5,6 +5,7 @@
 
 #include "images/core.pb-c.h"
 
+/* clang-format off */
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,	\
 			      task_args)			\
 	asm volatile(						\
@@ -16,13 +17,13 @@
 			  "r"(restore_task_exec_start),		\
 			  "r"(task_args)			\
 			: "x0", "memory")
+/* clang-format on */
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {
 	*ptls = pcore->ti_aarch64->tls;
 }
 
-
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
 
 #endif
diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index 120fa8fb2..64a9c24eb 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -9,6 +9,7 @@
 
 #include <compel/asm/sigframe.h>
 
+/* clang-format off */
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,		\
 			     thread_args, clone_restore_fn)			\
 	asm volatile(								\
@@ -112,20 +113,25 @@
 			:					\
 			: "r"(ret)				\
 			: "sp", "x0", "memory")
+/* clang-format on */
 
-
-#define arch_map_vdso(map, compat)		-1
+#define arch_map_vdso(map, compat) -1
 
 int restore_gpregs(struct rt_sigframe *f, UserAarch64RegsEntry *r);
 int restore_nonsigframe_gpregs(UserAarch64RegsEntry *r);
 
 static inline void restore_tls(tls_t *ptls)
 {
-	asm("msr tpidr_el0, %0" : : "r" (*ptls));
+	asm("msr tpidr_el0, %0" : : "r"(*ptls));
 }
 
-static inline void *alloc_compat_syscall_stack(void) { return NULL; }
-static inline void free_compat_syscall_stack(void *stack32) { }
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
 {
 	return -1;
diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index e79f86698..c860af1cf 100644
--- a/criu/arch/aarch64/include/asm/types.h
+++ b/criu/arch/aarch64/include/asm/types.h
@@ -12,7 +12,7 @@
 
 #include <compel/plugins/std/asm/syscall-types.h>
 
-#define core_is_compat(core)			false
+#define core_is_compat(core) false
 
 typedef UserAarch64RegsEntry UserRegsEntry;
 
@@ -22,8 +22,14 @@ typedef UserAarch64RegsEntry UserRegsEntry;
 
 #define TI_SP(core) ((core)->ti_aarch64->gpregs->sp)
 
-static inline void *decode_pointer(uint64_t v) { return (void*)v; }
-static inline uint64_t encode_pointer(void *p) { return (uint64_t)p; }
+static inline void *decode_pointer(uint64_t v)
+{
+	return (void *)v;
+}
+static inline uint64_t encode_pointer(void *p)
+{
+	return (uint64_t)p;
+}
 
 #define AT_VECTOR_SIZE 40
 typedef uint64_t auxv_t;
diff --git a/criu/arch/aarch64/include/asm/vdso.h b/criu/arch/aarch64/include/asm/vdso.h
index 97a2440ee..e77d04cd5 100644
--- a/criu/arch/aarch64/include/asm/vdso.h
+++ b/criu/arch/aarch64/include/asm/vdso.h
@@ -9,24 +9,20 @@
  * This is a minimal amount of symbols
  * we should support at the moment.
  */
-#define VDSO_SYMBOL_MAX		4
-#define VDSO_SYMBOL_GTOD	2
+#define VDSO_SYMBOL_MAX	 4
+#define VDSO_SYMBOL_GTOD 2
 
 /*
  * Workaround for VDSO array symbol table's relocation.
  * XXX: remove when compel/piegen will support aarch64.
  */
-#define ARCH_VDSO_SYMBOLS_LIST \
-	const char* aarch_vdso_symbol1 = "__kernel_clock_getres"; \
-	const char* aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
-	const char* aarch_vdso_symbol3 = "__kernel_gettimeofday"; \
-	const char* aarch_vdso_symbol4 = "__kernel_rt_sigreturn";
+#define ARCH_VDSO_SYMBOLS_LIST                                     \
+	const char *aarch_vdso_symbol1 = "__kernel_clock_getres";  \
+	const char *aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
+	const char *aarch_vdso_symbol3 = "__kernel_gettimeofday";  \
+	const char *aarch_vdso_symbol4 = "__kernel_rt_sigreturn";
 
-#define ARCH_VDSO_SYMBOLS \
-	aarch_vdso_symbol1, \
-	aarch_vdso_symbol2, \
-	aarch_vdso_symbol3, \
-	aarch_vdso_symbol4
+#define ARCH_VDSO_SYMBOLS aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3, aarch_vdso_symbol4
 
 extern void write_intraprocedure_branch(unsigned long to, unsigned long from);
 
diff --git a/criu/arch/arm/include/asm/dump.h b/criu/arch/arm/include/asm/dump.h
index 2382ba42c..485986065 100644
--- a/criu/arch/arm/include/asm/dump.h
+++ b/criu/arch/arm/include/asm/dump.h
@@ -5,7 +5,6 @@ extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
-
 static inline void core_put_tls(CoreEntry *core, tls_t tls)
 {
 	core->ti_arm->tls = tls;
diff --git a/criu/arch/arm/include/asm/kerndat.h b/criu/arch/arm/include/asm/kerndat.h
index 60956b573..bb70cf6cf 100644
--- a/criu/arch/arm/include/asm/kerndat.h
+++ b/criu/arch/arm/include/asm/kerndat.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_KERNDAT_H__
 #define __CR_ASM_KERNDAT_H__
 
-#define kdat_compatible_cr()			0
-#define kdat_can_map_vdso()			0
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
 
 #endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/arm/include/asm/parasite.h b/criu/arch/arm/include/asm/parasite.h
index 7f1e219c6..5911ef6b7 100644
--- a/criu/arch/arm/include/asm/parasite.h
+++ b/criu/arch/arm/include/asm/parasite.h
@@ -4,7 +4,7 @@
 /* kuser_get_tls() kernel-provided user-helper, the address is emulated */
 static inline void arch_get_tls(tls_t *ptls)
 {
-	*ptls = ((tls_t (*)(void))0xffff0fe0)();
+	*ptls = ((tls_t(*)(void))0xffff0fe0)();
 }
 
 #endif
diff --git a/criu/arch/arm/include/asm/restore.h b/criu/arch/arm/include/asm/restore.h
index c3b64c5b7..09ff691a5 100644
--- a/criu/arch/arm/include/asm/restore.h
+++ b/criu/arch/arm/include/asm/restore.h
@@ -5,6 +5,7 @@
 
 #include "images/core.pb-c.h"
 
+/* clang-format off */
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,		\
 			      task_args)				\
 	asm volatile(							\
@@ -17,13 +18,13 @@
 		       "r"(restore_task_exec_start),			\
 		       "r"(task_args)					\
 		     : "r0", "r1", "memory")
+/* clang-format on */
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {
 	*ptls = pcore->ti_arm->tls;
 }
 
-
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
 
 #endif
diff --git a/criu/arch/arm/include/asm/restorer.h b/criu/arch/arm/include/asm/restorer.h
index 13ed15b26..d35fda4bc 100644
--- a/criu/arch/arm/include/asm/restorer.h
+++ b/criu/arch/arm/include/asm/restorer.h
@@ -6,6 +6,7 @@
 
 #include <compel/asm/sigframe.h>
 
+/* clang-format off */
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
 			     thread_args, clone_restore_fn)		\
 	asm volatile(							\
@@ -108,32 +109,35 @@
 		     :						\
 		     : "r"(ret)					\
 		     : "memory")
+/* clang-format on */
 
-
-#define arch_map_vdso(map, compat)		-1
+#define arch_map_vdso(map, compat) -1
 
 int restore_gpregs(struct rt_sigframe *f, UserArmRegsEntry *r);
 int restore_nonsigframe_gpregs(UserArmRegsEntry *r);
 #define ARCH_HAS_SHMAT_HOOK
-unsigned long arch_shmat(int shmid, void *shmaddr,
-			int shmflg, unsigned long size);
+unsigned long arch_shmat(int shmid, void *shmaddr, int shmflg, unsigned long size);
 
-static inline void restore_tls(tls_t *ptls) {
-	asm (
-	     "mov r7, #15	\n"
-	     "lsl r7, #16	\n"
-	     "mov r0, #5	\n"
-	     "add r7, r0	\n"	/* r7 = 0xF005 */
-	     "ldr r0, [%0]	\n"
-	     "svc #0		\n"
-	     :
-	     : "r"(ptls)
-	     : "r0", "r7"
-	     );
+static inline void restore_tls(tls_t *ptls)
+{
+	asm("mov r7, #15	\n"
+	    "lsl r7, #16	\n"
+	    "mov r0, #5	\n"
+	    "add r7, r0	\n" /* r7 = 0xF005 */
+	    "ldr r0, [%0]	\n"
+	    "svc #0		\n"
+	    :
+	    : "r"(ptls)
+	    : "r0", "r7");
 }
 
-static inline void *alloc_compat_syscall_stack(void) { return NULL; }
-static inline void free_compat_syscall_stack(void *stack32) { }
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
 {
 	return -1;
diff --git a/criu/arch/arm/include/asm/types.h b/criu/arch/arm/include/asm/types.h
index 32612a692..cfcb8a136 100644
--- a/criu/arch/arm/include/asm/types.h
+++ b/criu/arch/arm/include/asm/types.h
@@ -11,7 +11,7 @@
 
 #include <compel/plugins/std/asm/syscall-types.h>
 
-#define core_is_compat(core)			false
+#define core_is_compat(core) false
 
 typedef UserArmRegsEntry UserRegsEntry;
 
@@ -21,10 +21,16 @@ typedef UserArmRegsEntry UserRegsEntry;
 
 #define TI_SP(core) ((core)->ti_arm->gpregs->sp)
 
-static inline void *decode_pointer(u64 v) { return (void*)(u32)v; }
-static inline u64 encode_pointer(void *p) { return (u32)p; }
+static inline void *decode_pointer(u64 v)
+{
+	return (void *)(u32)v;
+}
+static inline u64 encode_pointer(void *p)
+{
+	return (u32)p;
+}
 
-#define AT_VECTOR_SIZE		40
+#define AT_VECTOR_SIZE 40
 typedef uint32_t auxv_t;
 typedef uint32_t tls_t;
 
diff --git a/criu/arch/arm/include/asm/vdso.h b/criu/arch/arm/include/asm/vdso.h
index e96514e0e..5787bfe17 100644
--- a/criu/arch/arm/include/asm/vdso.h
+++ b/criu/arch/arm/include/asm/vdso.h
@@ -9,13 +9,11 @@
  *
  * Poke from kernel file arch/arm/vdso/vdso.lds.S
  */
-#define VDSO_SYMBOL_MAX		2
-#define VDSO_SYMBOL_GTOD	1
-#define ARCH_VDSO_SYMBOLS_LIST \
-	const char* aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
-	const char* aarch_vdso_symbol2 = "__vdso_gettimeofday";
-#define ARCH_VDSO_SYMBOLS \
-	aarch_vdso_symbol1, \
-	aarch_vdso_symbol2,
+#define VDSO_SYMBOL_MAX	 2
+#define VDSO_SYMBOL_GTOD 1
+#define ARCH_VDSO_SYMBOLS_LIST                                   \
+	const char *aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
+	const char *aarch_vdso_symbol2 = "__vdso_gettimeofday";
+#define ARCH_VDSO_SYMBOLS aarch_vdso_symbol1, aarch_vdso_symbol2,
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/mips/include/asm/kerndat.h b/criu/arch/mips/include/asm/kerndat.h
index 60956b573..bb70cf6cf 100644
--- a/criu/arch/mips/include/asm/kerndat.h
+++ b/criu/arch/mips/include/asm/kerndat.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_KERNDAT_H__
 #define __CR_ASM_KERNDAT_H__
 
-#define kdat_compatible_cr()			0
-#define kdat_can_map_vdso()			0
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
 
 #endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/mips/include/asm/restore.h b/criu/arch/mips/include/asm/restore.h
index 04a9551a0..c40b46999 100644
--- a/criu/arch/mips/include/asm/restore.h
+++ b/criu/arch/mips/include/asm/restore.h
@@ -4,6 +4,7 @@
 #include "asm/restorer.h"
 #include "images/core.pb-c.h"
 
+/* clang-format off */
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, task_args) \
 	asm volatile(							\
 		"move $4, %0					\n"	\
@@ -16,13 +17,13 @@
 		:"r"(task_args),"r"(restore_task_exec_start),		\
 		 "g"(new_sp)						\
 		: "$25", "$4","$5")
+/* clang-format on */
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {
 	*ptls = pcore->ti_mips->tls;
 }
 
-
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
 
 #endif
diff --git a/criu/arch/mips/include/asm/restorer.h b/criu/arch/mips/include/asm/restorer.h
index 28a9c523f..ac4258eae 100644
--- a/criu/arch/mips/include/asm/restorer.h
+++ b/criu/arch/mips/include/asm/restorer.h
@@ -7,14 +7,16 @@
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/sigframe.h>
 
-static inline void restore_tls(tls_t *ptls) {
-	asm volatile(
-		     "move $4, %0				    \n"
-		     "li $2,  "__stringify(__NR_set_thread_area)"  \n"
-		     "syscall					    \n"
+static inline void restore_tls(tls_t *ptls)
+{
+	/* clang-format off */
+	asm volatile("move $4, %0					\n"
+		     "li $2,  " __stringify(__NR_set_thread_area) "	\n"
+		     "syscall						\n"
 		     :
 		     : "r"(*ptls)
-		     : "$4","$2","memory");
+		     : "$4", "$2", "memory");
+	/* clang-format on */
 }
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
 {
@@ -25,6 +27,7 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 	return -1;
 }
 
+/* clang-format off */
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,      \
 			     thread_args, clone_restore_fn)      \
     asm volatile(						 \
@@ -67,17 +70,22 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 	pr_err("This architecture does not support clone3() with set_tid, yet!\n"); \
 	ret = -1; \
 } while (0)
+/* clang-format on */
 
-#define kdat_compatible_cr()			0
-#define arch_map_vdso(map, compat)		-1
+#define kdat_compatible_cr()	   0
+#define arch_map_vdso(map, compat) -1
 
-static inline void *alloc_compat_syscall_stack(void) { return NULL; }
-static inline void free_compat_syscall_stack(void *stack32) { }
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
 int restore_gpregs(struct rt_sigframe *f, UserMipsRegsEntry *r);
 int restore_nonsigframe_gpregs(UserMipsRegsEntry *r);
 
 #define ARCH_HAS_SHMAT_HOOK
-unsigned long arch_shmat(int shmid, void *shmaddr,
-			int shmflg, unsigned long size);
+unsigned long arch_shmat(int shmid, void *shmaddr, int shmflg, unsigned long size);
 
 #endif
diff --git a/criu/arch/mips/include/asm/types.h b/criu/arch/mips/include/asm/types.h
index 8366e0540..237471f3c 100644
--- a/criu/arch/mips/include/asm/types.h
+++ b/criu/arch/mips/include/asm/types.h
@@ -12,7 +12,7 @@
 
 #include "images/core.pb-c.h"
 
-#define core_is_compat(core)			false
+#define core_is_compat(core) false
 
 #define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__MIPS
 
@@ -20,11 +20,16 @@
 
 typedef UserMipsRegsEntry UserRegsEntry;
 
-static inline u64 encode_pointer(void *p) { return (u64)p; }
-static inline void *decode_pointer(u64 v) { return (void*)v; }
+static inline u64 encode_pointer(void *p)
+{
+	return (u64)p;
+}
+static inline void *decode_pointer(u64 v)
+{
+	return (void *)v;
+}
 
-
-#define AT_VECTOR_SIZE			44
+#define AT_VECTOR_SIZE 44
 typedef uint64_t auxv_t;
 typedef unsigned long tls_t;
 
diff --git a/criu/arch/mips/include/asm/vdso.h b/criu/arch/mips/include/asm/vdso.h
index c3e9b0176..294c369ca 100644
--- a/criu/arch/mips/include/asm/vdso.h
+++ b/criu/arch/mips/include/asm/vdso.h
@@ -12,16 +12,12 @@
  * This is a minimal amount of symbols
  * we should support at the moment.
  */
-#define VDSO_SYMBOL_MAX	3
-#define VDSO_SYMBOL_GTOD	0
-#define ARCH_VDSO_SYMBOLS_LIST \
-	const char* aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
-	const char* aarch_vdso_symbol2 = "__vdso_gettimeofday"; \
-	const char* aarch_vdso_symbol3 = "__vdso_clock_getres";
-#define ARCH_VDSO_SYMBOLS \
-	aarch_vdso_symbol1, \
-	aarch_vdso_symbol2, \
-	aarch_vdso_symbol3,
-
+#define VDSO_SYMBOL_MAX	 3
+#define VDSO_SYMBOL_GTOD 0
+#define ARCH_VDSO_SYMBOLS_LIST                                   \
+	const char *aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
+	const char *aarch_vdso_symbol2 = "__vdso_gettimeofday";  \
+	const char *aarch_vdso_symbol3 = "__vdso_clock_getres";
+#define ARCH_VDSO_SYMBOLS aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3,
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/ppc64/include/asm/dump.h b/criu/arch/ppc64/include/asm/dump.h
index a81ee02bd..eb488900a 100644
--- a/criu/arch/ppc64/include/asm/dump.h
+++ b/criu/arch/ppc64/include/asm/dump.h
@@ -5,7 +5,6 @@ extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
-
 #define core_put_tls(core, tls)
 
 #define get_task_futex_robust_list_compat(pid, info) -1
diff --git a/criu/arch/ppc64/include/asm/kerndat.h b/criu/arch/ppc64/include/asm/kerndat.h
index 60956b573..bb70cf6cf 100644
--- a/criu/arch/ppc64/include/asm/kerndat.h
+++ b/criu/arch/ppc64/include/asm/kerndat.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_KERNDAT_H__
 #define __CR_ASM_KERNDAT_H__
 
-#define kdat_compatible_cr()			0
-#define kdat_can_map_vdso()			0
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
 
 #endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/ppc64/include/asm/parasite.h b/criu/arch/ppc64/include/asm/parasite.h
index fdbc340b0..45cfc632d 100644
--- a/criu/arch/ppc64/include/asm/parasite.h
+++ b/criu/arch/ppc64/include/asm/parasite.h
@@ -2,6 +2,9 @@
 #define __ASM_PARASITE_H__
 
 /* TLS is accessed through r13, which is already processed */
-static inline void arch_get_tls(tls_t *ptls) { (void)ptls; }
+static inline void arch_get_tls(tls_t *ptls)
+{
+	(void)ptls;
+}
 
 #endif
diff --git a/criu/arch/ppc64/include/asm/restore.h b/criu/arch/ppc64/include/asm/restore.h
index f065ec3a0..8148015fd 100644
--- a/criu/arch/ppc64/include/asm/restore.h
+++ b/criu/arch/ppc64/include/asm/restore.h
@@ -9,6 +9,7 @@
  * Set R2 to blob + 8000 which is the default value
  * Jump to restore_task_exec_start + 8 since R2 is already set (local call)
  */
+/* clang-format off */
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,		\
 			      task_args)				\
 	asm volatile(							\
@@ -22,6 +23,7 @@
 		  "r"((unsigned long)restore_task_exec_start),		\
 		  "r"(task_args)					\
 		: "3", "12")
+/* clang-format on */
 
 /* There is nothing to do since TLS is accessed through r13 */
 #define core_get_tls(pcore, ptls)
diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index c447eefea..1ca91140b 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/criu/arch/ppc64/include/asm/restorer.h
@@ -14,9 +14,10 @@
  *
  * See glibc sysdeps/powerpc/powerpc64/sysdep.h for FRAME_MIN_SIZE defines
  */
-#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, 	\
+/* clang-format off */
+#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
 			     thread_args, clone_restore_fn)		\
-	asm volatile( 							\
+	asm volatile(							\
 		"clone_emul:					\n"	\
 		"/* Save fn, args, stack across syscall. */ 	\n"	\
 		"mr	14, %5	/* clone_restore_fn in r14 */ 	\n"	\
@@ -88,22 +89,31 @@
 		  "r"(clone_restore_fn),	/* %3 */		\
 		  "r"(args)			/* %4 */		\
 		: "memory","0","3","4","5","14","15")
+/* clang-format on */
 
-#define arch_map_vdso(map, compat)		-1
+#define arch_map_vdso(map, compat) -1
 
 int restore_gpregs(struct rt_sigframe *f, UserPpc64RegsEntry *r);
 int restore_nonsigframe_gpregs(UserPpc64RegsEntry *r);
 
 /* Nothing to do, TLS is accessed through r13 */
-static inline void restore_tls(tls_t *ptls) { (void)ptls; }
+static inline void restore_tls(tls_t *ptls)
+{
+	(void)ptls;
+}
 
 /*
  * Defined in arch/ppc64/syscall-common-ppc64.S
  */
 unsigned long sys_shmat(int shmid, const void *shmaddr, int shmflg);
 
-static inline void *alloc_compat_syscall_stack(void) { return NULL; }
-static inline void free_compat_syscall_stack(void *stack32) { }
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
 {
 	return -1;
diff --git a/criu/arch/ppc64/include/asm/types.h b/criu/arch/ppc64/include/asm/types.h
index 8f3af86a9..fedeff22a 100644
--- a/criu/arch/ppc64/include/asm/types.h
+++ b/criu/arch/ppc64/include/asm/types.h
@@ -13,14 +13,20 @@
 
 typedef UserPpc64RegsEntry UserRegsEntry;
 
-#define CORE_ENTRY__MARCH	CORE_ENTRY__MARCH__PPC64
+#define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__PPC64
 
-#define core_is_compat(core)			false
+#define core_is_compat(core) false
 
 #define CORE_THREAD_ARCH_INFO(core) core->ti_ppc64
 
-static inline void *decode_pointer(uint64_t v) { return (void*)v; }
-static inline uint64_t encode_pointer(void *p) { return (uint64_t)p; }
+static inline void *decode_pointer(uint64_t v)
+{
+	return (void *)v;
+}
+static inline uint64_t encode_pointer(void *p)
+{
+	return (uint64_t)p;
+}
 
 /*
  * Copied from the following kernel header files :
@@ -28,11 +34,11 @@ static inline uint64_t encode_pointer(void *p) { return (uint64_t)p; }
  *	arch/powerpc/include/uapi/asm/auxvec.h
  *	include/linux/mm_types.h
  */
-#define AT_VECTOR_SIZE_BASE	20
+#define AT_VECTOR_SIZE_BASE 20
 #if !defined AT_VECTOR_SIZE_ARCH
-#define AT_VECTOR_SIZE_ARCH	6
+#define AT_VECTOR_SIZE_ARCH 6
 #endif
-#define AT_VECTOR_SIZE		(2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
+#define AT_VECTOR_SIZE (2 * (AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
 
 typedef uint64_t auxv_t;
 
diff --git a/criu/arch/ppc64/include/asm/vdso.h b/criu/arch/ppc64/include/asm/vdso.h
index fe0433665..b73927bb6 100644
--- a/criu/arch/ppc64/include/asm/vdso.h
+++ b/criu/arch/ppc64/include/asm/vdso.h
@@ -12,30 +12,22 @@
  * Note that '__kernel_datapage_offset' is not a service but mostly a data
  * inside the text page which should not be used as is from user space.
  */
-#define VDSO_SYMBOL_MAX		10
-#define VDSO_SYMBOL_GTOD	5
-#define ARCH_VDSO_SYMBOLS_LIST \
-	const char* aarch_vdso_symbol1 = "__kernel_clock_getres"; \
-	const char* aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
-	const char* aarch_vdso_symbol3 = "__kernel_get_syscall_map"; \
-	const char* aarch_vdso_symbol4 = "__kernel_get_tbfreq"; \
-	const char* aarch_vdso_symbol5 = "__kernel_getcpu"; \
-	const char* aarch_vdso_symbol6 = "__kernel_gettimeofday"; \
-	const char* aarch_vdso_symbol7 = "__kernel_sigtramp_rt64"; \
-	const char* aarch_vdso_symbol8 = "__kernel_sync_dicache"; \
-	const char* aarch_vdso_symbol9 = "__kernel_sync_dicache_p5"; \
-	const char* aarch_vdso_symbol10 = "__kernel_time";
+#define VDSO_SYMBOL_MAX	 10
+#define VDSO_SYMBOL_GTOD 5
+#define ARCH_VDSO_SYMBOLS_LIST                                       \
+	const char *aarch_vdso_symbol1 = "__kernel_clock_getres";    \
+	const char *aarch_vdso_symbol2 = "__kernel_clock_gettime";   \
+	const char *aarch_vdso_symbol3 = "__kernel_get_syscall_map"; \
+	const char *aarch_vdso_symbol4 = "__kernel_get_tbfreq";      \
+	const char *aarch_vdso_symbol5 = "__kernel_getcpu";          \
+	const char *aarch_vdso_symbol6 = "__kernel_gettimeofday";    \
+	const char *aarch_vdso_symbol7 = "__kernel_sigtramp_rt64";   \
+	const char *aarch_vdso_symbol8 = "__kernel_sync_dicache";    \
+	const char *aarch_vdso_symbol9 = "__kernel_sync_dicache_p5"; \
+	const char *aarch_vdso_symbol10 = "__kernel_time";
 
-#define ARCH_VDSO_SYMBOLS \
-	aarch_vdso_symbol1, \
-	aarch_vdso_symbol2, \
-	aarch_vdso_symbol3, \
-	aarch_vdso_symbol4, \
-	aarch_vdso_symbol5, \
-	aarch_vdso_symbol6, \
-	aarch_vdso_symbol7, \
-	aarch_vdso_symbol8, \
-	aarch_vdso_symbol9, \
-	aarch_vdso_symbol10
+#define ARCH_VDSO_SYMBOLS                                                                                   \
+	aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3, aarch_vdso_symbol4, aarch_vdso_symbol5, \
+		aarch_vdso_symbol6, aarch_vdso_symbol7, aarch_vdso_symbol8, aarch_vdso_symbol9, aarch_vdso_symbol10
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/s390/include/asm/dump.h b/criu/arch/s390/include/asm/dump.h
index 53aaac9c4..c200724d7 100644
--- a/criu/arch/s390/include/asm/dump.h
+++ b/criu/arch/s390/include/asm/dump.h
@@ -5,7 +5,9 @@ int save_task_regs(void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f);
 int arch_alloc_thread_info(CoreEntry *core);
 void arch_free_thread_info(CoreEntry *core);
 
-static inline void core_put_tls(CoreEntry *core, tls_t tls) { }
+static inline void core_put_tls(CoreEntry *core, tls_t tls)
+{
+}
 
 #define get_task_futex_robust_list_compat(pid, info) -1
 
diff --git a/criu/arch/s390/include/asm/kerndat.h b/criu/arch/s390/include/asm/kerndat.h
index 60956b573..bb70cf6cf 100644
--- a/criu/arch/s390/include/asm/kerndat.h
+++ b/criu/arch/s390/include/asm/kerndat.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_KERNDAT_H__
 #define __CR_ASM_KERNDAT_H__
 
-#define kdat_compatible_cr()			0
-#define kdat_can_map_vdso()			0
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
 
 #endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/s390/include/asm/parasite.h b/criu/arch/s390/include/asm/parasite.h
index 0b0268936..752753023 100644
--- a/criu/arch/s390/include/asm/parasite.h
+++ b/criu/arch/s390/include/asm/parasite.h
@@ -2,6 +2,9 @@
 #define __ASM_PARASITE_H__
 
 /* TLS is accessed through %a01, which is already processed */
-static inline void arch_get_tls(tls_t *ptls) { (void)ptls; }
+static inline void arch_get_tls(tls_t *ptls)
+{
+	(void)ptls;
+}
 
 #endif
diff --git a/criu/arch/s390/include/asm/restore.h b/criu/arch/s390/include/asm/restore.h
index b77e36c77..07ff49246 100644
--- a/criu/arch/s390/include/asm/restore.h
+++ b/criu/arch/s390/include/asm/restore.h
@@ -7,6 +7,7 @@
 /*
  * Load stack to %r15, return address in %r14 and argument 1 into %r2
  */
+/* clang-format off */
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,		\
 			      task_args)				\
 	asm volatile(							\
@@ -19,6 +20,7 @@
 		  "d"((unsigned long)restore_task_exec_start),		\
 		  "d" (task_args)					\
 		: "2", "14", "memory")
+/* clang-format on */
 
 /* There is nothing to do since TLS is accessed through %a01 */
 #define core_get_tls(pcore, ptls)
diff --git a/criu/arch/s390/include/asm/restorer.h b/criu/arch/s390/include/asm/restorer.h
index 2fc266535..668f9a413 100644
--- a/criu/arch/s390/include/asm/restorer.h
+++ b/criu/arch/s390/include/asm/restorer.h
@@ -11,6 +11,7 @@
 /*
  * Clone trampoline - see glibc sysdeps/unix/sysv/linux/s390/s390-64/clone.S
  */
+/* clang-format off */
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
 			     thread_args, clone_restore_fn)		\
 	asm volatile(							\
@@ -75,20 +76,28 @@
 	  "d"(clone_restore_fn),					\
 	  "d"(args)							\
 	: "0", "1", "2", "3", "4", "5", "cc", "memory")
+/* clang-format on */
 
-#define arch_map_vdso(map, compat)		-1
+#define arch_map_vdso(map, compat) -1
 
 int restore_gpregs(struct rt_sigframe *f, UserS390RegsEntry *r);
 int restore_nonsigframe_gpregs(UserS390RegsEntry *r);
 
 unsigned long sys_shmat(int shmid, const void *shmaddr, int shmflg);
-unsigned long sys_mmap(void *addr, unsigned long len, unsigned long prot,
-		       unsigned long flags, unsigned long fd,
+unsigned long sys_mmap(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd,
 		       unsigned long offset);
 
-static inline void restore_tls(tls_t *ptls) { (void)ptls; }
-static inline void *alloc_compat_syscall_stack(void) { return NULL; }
-static inline void free_compat_syscall_stack(void *stack32) { }
+static inline void restore_tls(tls_t *ptls)
+{
+	(void)ptls;
+}
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
 {
 	return -1;
diff --git a/criu/arch/s390/include/asm/types.h b/criu/arch/s390/include/asm/types.h
index 4f36c1309..7522cf2cd 100644
--- a/criu/arch/s390/include/asm/types.h
+++ b/criu/arch/s390/include/asm/types.h
@@ -15,21 +15,27 @@ typedef UserS390RegsEntry UserRegsEntry;
 
 #define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__S390
 
-#define core_is_compat(core)                  false
+#define core_is_compat(core) false
 
 #define CORE_THREAD_ARCH_INFO(core) core->ti_s390
 
-static inline u64 encode_pointer(void *p) { return (u64) p; }
-static inline void *decode_pointer(u64 v) { return (void *) v; }
+static inline u64 encode_pointer(void *p)
+{
+	return (u64)p;
+}
+static inline void *decode_pointer(u64 v)
+{
+	return (void *)v;
+}
 
 /*
  * See also:
  *   * arch/s390/include/uapi/asm/auxvec.h
  *   * include/linux/auxvec.h
  */
-#define AT_VECTOR_SIZE_BASE	20
-#define AT_VECTOR_SIZE_ARCH	1
-#define AT_VECTOR_SIZE		(2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
+#define AT_VECTOR_SIZE_BASE 20
+#define AT_VECTOR_SIZE_ARCH 1
+#define AT_VECTOR_SIZE	    (2 * (AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
 
 typedef uint64_t auxv_t;
 typedef uint64_t tls_t;
diff --git a/criu/arch/s390/include/asm/vdso.h b/criu/arch/s390/include/asm/vdso.h
index ac71f5981..72b3dca97 100644
--- a/criu/arch/s390/include/asm/vdso.h
+++ b/criu/arch/s390/include/asm/vdso.h
@@ -8,22 +8,18 @@
  * This is a minimal amount of symbols
  * we should support at the moment.
  */
-#define VDSO_SYMBOL_MAX		4
-#define VDSO_SYMBOL_GTOD	0
+#define VDSO_SYMBOL_MAX	 4
+#define VDSO_SYMBOL_GTOD 0
 
 /*
  * These definitions are used in pie/util-vdso.c to initialize the vdso symbol
  * name string table 'vdso_symbols'
  */
-#define ARCH_VDSO_SYMBOLS_LIST \
-	const char* aarch_vdso_symbol1 = "__kernel_gettimeofday"; \
-	const char* aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
-	const char* aarch_vdso_symbol3 = "__kernel_clock_getres"; \
-	const char* aarch_vdso_symbol4 = "__kernel_getcpu";
-#define ARCH_VDSO_SYMBOLS \
-	aarch_vdso_symbol1, \
-	aarch_vdso_symbol2, \
-	aarch_vdso_symbol3, \
-	aarch_vdso_symbol4
+#define ARCH_VDSO_SYMBOLS_LIST                                     \
+	const char *aarch_vdso_symbol1 = "__kernel_gettimeofday";  \
+	const char *aarch_vdso_symbol2 = "__kernel_clock_gettime"; \
+	const char *aarch_vdso_symbol3 = "__kernel_clock_getres";  \
+	const char *aarch_vdso_symbol4 = "__kernel_getcpu";
+#define ARCH_VDSO_SYMBOLS aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3, aarch_vdso_symbol4
 
 #endif /* __CR_ASM_VDSO_H__ */
diff --git a/criu/arch/x86/include/asm/compat.h b/criu/arch/x86/include/asm/compat.h
index acd552fb3..867357fa2 100644
--- a/criu/arch/x86/include/asm/compat.h
+++ b/criu/arch/x86/include/asm/compat.h
@@ -2,19 +2,19 @@
 #define __CR_ASM_COMPAT_H__
 
 #ifdef CR_NOGLIBC
-# include <compel/plugins/std/syscall.h>
-# include <compel/plugins/std/syscall-codes.h>
+#include <compel/plugins/std/syscall.h>
+#include <compel/plugins/std/syscall-codes.h>
 #else
-# define sys_mmap mmap
-# define sys_munmap munmap
+#define sys_mmap   mmap
+#define sys_munmap munmap
 #endif
 
 #include <sys/mman.h>
 
 static inline void *alloc_compat_syscall_stack(void)
 {
-	void *mem = (void*)sys_mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE,
-			MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+	void *mem = (void *)sys_mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE,
+				     -1, 0);
 
 	if ((uintptr_t)mem % PAGE_SIZE) {
 		int err = (~(uint32_t)(uintptr_t)mem) + 1;
@@ -30,8 +30,7 @@ static inline void free_compat_syscall_stack(void *mem)
 	long int ret = sys_munmap(mem, PAGE_SIZE);
 
 	if (ret)
-		pr_err("munmap() of compat addr %p failed with %ld\n",
-				mem, ret);
+		pr_err("munmap() of compat addr %p failed with %ld\n", mem, ret);
 }
 
 struct syscall_args32 {
@@ -65,23 +64,22 @@ static inline uint32_t do_full_int80(struct syscall_args32 *args)
 	 */
 	uint32_t ret;
 
-	asm volatile ("sub $128, %%rsp\n\t"
-		      "pushq %%rbp\n\t"
-		      "mov %7, %%ebp\n\t"
-		      "int $0x80\n\t"
-		      "popq %%rbp\n\t"
-		      "add $128, %%rsp\n\t"
-		      : "=a" (ret)
-		      : "a" (args->nr),
-			"b" (args->arg0), "c" (args->arg1), "d" (args->arg2),
-			"S" (args->arg3), "D" (args->arg4), "g" (args->arg5)
-		      : "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15");
+	asm volatile("sub $128, %%rsp\n\t"
+		     "pushq %%rbp\n\t"
+		     "mov %7, %%ebp\n\t"
+		     "int $0x80\n\t"
+		     "popq %%rbp\n\t"
+		     "add $128, %%rsp\n\t"
+		     : "=a"(ret)
+		     : "a"(args->nr), "b"(args->arg0), "c"(args->arg1), "d"(args->arg2), "S"(args->arg3),
+		       "D"(args->arg4), "g"(args->arg5)
+		     : "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15");
 	return ret;
 }
 
 #ifndef CR_NOGLIBC
-# undef sys_mmap
-# undef sys_munmap
+#undef sys_mmap
+#undef sys_munmap
 #endif
 
 #endif
diff --git a/criu/arch/x86/include/asm/dump.h b/criu/arch/x86/include/asm/dump.h
index c79e0dfa9..03715e003 100644
--- a/criu/arch/x86/include/asm/dump.h
+++ b/criu/arch/x86/include/asm/dump.h
@@ -11,8 +11,7 @@ static inline void core_put_tls(CoreEntry *core, tls_t tls)
 	ThreadInfoX86 *ti = core->thread_info;
 	int i;
 
-	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++)
-	{
+	for (i = 0; i < GDT_ENTRY_TLS_NUM; i++) {
 		user_desc_t *from = &tls.desc[i];
 		UserDescT *to = ti->tls[i];
 
diff --git a/criu/arch/x86/include/asm/parasite.h b/criu/arch/x86/include/asm/parasite.h
index 678fc75e2..7064f1df1 100644
--- a/criu/arch/x86/include/asm/parasite.h
+++ b/criu/arch/x86/include/asm/parasite.h
@@ -5,6 +5,9 @@
  * TLS is accessed through PTRACE_GET_THREAD_AREA,
  * see compel_arch_fetch_thread_area().
  */
-static inline void arch_get_tls(tls_t *ptls) { (void)ptls; }
+static inline void arch_get_tls(tls_t *ptls)
+{
+	(void)ptls;
+}
 
 #endif
diff --git a/criu/arch/x86/include/asm/restore.h b/criu/arch/x86/include/asm/restore.h
index 21787a7c8..7cb725d98 100644
--- a/criu/arch/x86/include/asm/restore.h
+++ b/criu/arch/x86/include/asm/restore.h
@@ -5,6 +5,7 @@
 
 #include "images/core.pb-c.h"
 
+/* clang-format off */
 #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,		\
 			      task_args)				\
 	asm volatile(							\
@@ -18,6 +19,7 @@
 		       "g"(restore_task_exec_start),			\
 		       "g"(task_args)					\
 		     : "rdi", "rsi", "rbx", "rax", "memory")
+/* clang-format on */
 
 static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 {
@@ -52,7 +54,6 @@ static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 	}
 }
 
-
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
 
 #endif
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 6ba074020..23438314f 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -11,11 +11,12 @@
 
 #ifdef CONFIG_COMPAT
 extern void restore_tls(tls_t *ptls);
-extern int arch_compat_rt_sigaction(void *stack32, int sig,
-		rt_sigaction_t_compat *act);
+extern int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act);
 extern int set_compat_robust_list(uint32_t head_ptr, uint32_t len);
 #else /* CONFIG_COMPAT */
-static inline void restore_tls(tls_t *ptls) { }
+static inline void restore_tls(tls_t *ptls)
+{
+}
 static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
 {
 	return -1;
@@ -41,6 +42,7 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
  *           unsigned long tls);
  */
 
+/* clang-format off */
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
 			     thread_args, clone_restore_fn)		\
 	asm volatile(							\
@@ -143,7 +145,7 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 	 */								\
 									\
 		     "clone3_end:				\n"	\
-		     : "=r"(ret)		 			\
+		     : "=r"(ret)					\
 	/*
 	 * This uses the "r" modifier for all parameters
 	 * as clang complained if using "g".
@@ -164,30 +166,29 @@ static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
 		     :						\
 		     : "r"(ret)					\
 		     : "memory")
+/* clang-format on */
 
-static inline void
-__setup_sas_compat(struct ucontext_ia32* uc, ThreadSasEntry *sas)
+static inline void __setup_sas_compat(struct ucontext_ia32 *uc, ThreadSasEntry *sas)
 {
-	uc->uc_stack.ss_sp	= (compat_uptr_t)(sas)->ss_sp;
-	uc->uc_stack.ss_flags	= (int)(sas)->ss_flags;
-	uc->uc_stack.ss_size	= (compat_size_t)(sas)->ss_size;
+	uc->uc_stack.ss_sp = (compat_uptr_t)(sas)->ss_sp;
+	uc->uc_stack.ss_flags = (int)(sas)->ss_flags;
+	uc->uc_stack.ss_size = (compat_size_t)(sas)->ss_size;
 }
 
-static inline void
-__setup_sas(struct rt_sigframe* sigframe, ThreadSasEntry *sas)
+static inline void __setup_sas(struct rt_sigframe *sigframe, ThreadSasEntry *sas)
 {
 	if (sigframe->is_native) {
-		struct rt_ucontext *uc	= &sigframe->native.uc;
+		struct rt_ucontext *uc = &sigframe->native.uc;
 
-		uc->uc_stack.ss_sp	= (void *)decode_pointer((sas)->ss_sp);
-		uc->uc_stack.ss_flags	= (int)(sas)->ss_flags;
-		uc->uc_stack.ss_size	= (size_t)(sas)->ss_size;
+		uc->uc_stack.ss_sp = (void *)decode_pointer((sas)->ss_sp);
+		uc->uc_stack.ss_flags = (int)(sas)->ss_flags;
+		uc->uc_stack.ss_size = (size_t)(sas)->ss_size;
 	} else {
 		__setup_sas_compat(&sigframe->compat.uc, sas);
 	}
 }
 
-static inline void _setup_sas(struct rt_sigframe* sigframe, ThreadSasEntry *sas)
+static inline void _setup_sas(struct rt_sigframe *sigframe, ThreadSasEntry *sas)
 {
 	if (sas)
 		__setup_sas(sigframe, sas);
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index 012358949..a0a8ed987 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -15,12 +15,12 @@
 static inline int core_is_compat(CoreEntry *c)
 {
 	switch (c->thread_info->gpregs->mode) {
-		case USER_X86_REGS_MODE__NATIVE:
-			return 0;
-		case USER_X86_REGS_MODE__COMPAT:
-			return 1;
-		default:
-			return -1;
+	case USER_X86_REGS_MODE__NATIVE:
+		return 0;
+	case USER_X86_REGS_MODE__COMPAT:
+		return 1;
+	default:
+		return -1;
 	}
 }
 
@@ -30,10 +30,16 @@ static inline int core_is_compat(CoreEntry *c)
 
 typedef UserX86RegsEntry UserRegsEntry;
 
-static inline u64 encode_pointer(void *p) { return (u64)(long)p; }
-static inline void *decode_pointer(u64 v) { return (void*)(long)v; }
+static inline u64 encode_pointer(void *p)
+{
+	return (u64)(long)p;
+}
+static inline void *decode_pointer(u64 v)
+{
+	return (void *)(long)v;
+}
 
-#define AT_VECTOR_SIZE			44
+#define AT_VECTOR_SIZE 44
 typedef uint64_t auxv_t;
 
 #endif /* __CR_ASM_TYPES_H__ */
diff --git a/criu/arch/x86/include/asm/vdso.h b/criu/arch/x86/include/asm/vdso.h
index 54d1fba69..3b3f292bd 100644
--- a/criu/arch/x86/include/asm/vdso.h
+++ b/criu/arch/x86/include/asm/vdso.h
@@ -12,8 +12,8 @@
  * This is a minimal amount of symbols
  * we should support at the moment.
  */
-#define VDSO_SYMBOL_MAX		6
-#define VDSO_SYMBOL_GTOD	2
+#define VDSO_SYMBOL_MAX	 6
+#define VDSO_SYMBOL_GTOD 2
 
 /*
  * XXX: we don't patch __kernel_vsyscall as it's too small:
@@ -36,41 +36,34 @@
  * https://github.com/checkpoint-restore/criu/issues/512
  */
 
-#define ARCH_VDSO_SYMBOLS_LIST \
-	const char* aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
-	const char* aarch_vdso_symbol2 = "__vdso_getcpu"; \
-	const char* aarch_vdso_symbol3 = "__vdso_gettimeofday"; \
-	const char* aarch_vdso_symbol4 = "__vdso_time"; \
-	const char* aarch_vdso_symbol5 = "__kernel_sigreturn"; \
-	const char* aarch_vdso_symbol6 = "__kernel_rt_sigreturn";
+#define ARCH_VDSO_SYMBOLS_LIST                                   \
+	const char *aarch_vdso_symbol1 = "__vdso_clock_gettime"; \
+	const char *aarch_vdso_symbol2 = "__vdso_getcpu";        \
+	const char *aarch_vdso_symbol3 = "__vdso_gettimeofday";  \
+	const char *aarch_vdso_symbol4 = "__vdso_time";          \
+	const char *aarch_vdso_symbol5 = "__kernel_sigreturn";   \
+	const char *aarch_vdso_symbol6 = "__kernel_rt_sigreturn";
 
-#define ARCH_VDSO_SYMBOLS \
-	aarch_vdso_symbol1, \
-	aarch_vdso_symbol2, \
-	aarch_vdso_symbol3, \
-	aarch_vdso_symbol4, \
-	aarch_vdso_symbol5, \
-	aarch_vdso_symbol6
+#define ARCH_VDSO_SYMBOLS                                                                                   \
+	aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3, aarch_vdso_symbol4, aarch_vdso_symbol5, \
+		aarch_vdso_symbol6
 
 /*	"__kernel_vsyscall",			*/
 
 #ifndef ARCH_MAP_VDSO_32
-# define ARCH_MAP_VDSO_32		0x2002
+#define ARCH_MAP_VDSO_32 0x2002
 #endif
 
 #ifndef ARCH_MAP_VDSO_64
-# define ARCH_MAP_VDSO_64		0x2003
+#define ARCH_MAP_VDSO_64 0x2003
 #endif
 
 #if defined(CONFIG_COMPAT) && !defined(__ASSEMBLY__)
 struct vdso_symtable;
-extern int vdso_fill_symtable(uintptr_t mem, size_t size,
-			      struct vdso_symtable *t);
-extern int vdso_fill_symtable_compat(uintptr_t mem, size_t size,
-				     struct vdso_symtable *t);
+extern int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t);
+extern int vdso_fill_symtable_compat(uintptr_t mem, size_t size, struct vdso_symtable *t);
 
-static inline int __vdso_fill_symtable(uintptr_t mem, size_t size,
-			struct vdso_symtable *t, bool compat_vdso)
+static inline int __vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t, bool compat_vdso)
 {
 	if (compat_vdso)
 		return vdso_fill_symtable_compat(mem, size, t);
diff --git a/criu/include/aio.h b/criu/include/aio.h
index 858ccd3cf..f8a59dfdf 100644
--- a/criu/include/aio.h
+++ b/criu/include/aio.h
@@ -13,18 +13,18 @@ struct task_restore_args;
 int prepare_aios(struct pstree_item *t, struct task_restore_args *ta);
 
 struct aio_ring {
-	unsigned	id;	/* kernel internal index number */
-	unsigned	nr;	/* number of io_events */
-	unsigned	head;	/* Written to by userland or under ring_lock
+	unsigned id; /* kernel internal index number */
+	unsigned nr; /* number of io_events */
+	unsigned head; /* Written to by userland or under ring_lock
 				 * mutex by aio_read_events_ring(). */
-	unsigned	tail;
+	unsigned tail;
 
-	unsigned	magic;
-	unsigned	compat_features;
-	unsigned	incompat_features;
-	unsigned	header_length;  /* size of aio_ring */
+	unsigned magic;
+	unsigned compat_features;
+	unsigned incompat_features;
+	unsigned header_length; /* size of aio_ring */
 
-	struct io_event		io_events[0];
+	struct io_event io_events[0];
 };
 
 struct rst_aio_ring {
diff --git a/criu/include/asm-generic/int.h b/criu/include/asm-generic/int.h
index ac3088d5a..5bf484776 100644
--- a/criu/include/asm-generic/int.h
+++ b/criu/include/asm-generic/int.h
@@ -3,13 +3,13 @@
 
 #include <stdint.h>
 
-typedef uint64_t	u64;
-typedef int64_t		s64;
-typedef uint32_t	u32;
-typedef int32_t		s32;
-typedef uint16_t	u16;
-typedef int16_t		s16;
-typedef uint8_t		u8;
-typedef int8_t		s8;
+typedef uint64_t u64;
+typedef int64_t s64;
+typedef uint32_t u32;
+typedef int32_t s32;
+typedef uint16_t u16;
+typedef int16_t s16;
+typedef uint8_t u8;
+typedef int8_t s8;
 
 #endif /* __CR_INT_H__ */
diff --git a/criu/include/asm-generic/vdso.h b/criu/include/asm-generic/vdso.h
index 6c3e3d137..cddd1a7f0 100644
--- a/criu/include/asm-generic/vdso.h
+++ b/criu/include/asm-generic/vdso.h
@@ -1,15 +1,15 @@
 #ifndef __CR_ASM_GENERIC_VDSO_H__
 #define __CR_ASM_GENERIC_VDSO_H__
 
-#define VDSO_PROT		(PROT_READ | PROT_EXEC)
-#define VVAR_PROT		(PROT_READ)
+#define VDSO_PROT (PROT_READ | PROT_EXEC)
+#define VVAR_PROT (PROT_READ)
 
 /* Just in case of LPAE system PFN is u64. */
-#define VDSO_BAD_PFN		(-1ull)
-#define VVAR_BAD_PFN		(-1ull)
-#define VDSO_BAD_ADDR		(-1ul)
-#define VVAR_BAD_ADDR		(-1ul)
-#define VDSO_BAD_SIZE		(-1ul)
-#define VVAR_BAD_SIZE		(-1ul)
+#define VDSO_BAD_PFN  (-1ull)
+#define VVAR_BAD_PFN  (-1ull)
+#define VDSO_BAD_ADDR (-1ul)
+#define VVAR_BAD_ADDR (-1ul)
+#define VDSO_BAD_SIZE (-1ul)
+#define VVAR_BAD_SIZE (-1ul)
 
 #endif /* __CR_ASM_GENERIC_VDSO_H__ */
diff --git a/criu/include/autofs.h b/criu/include/autofs.h
index c4618859b..c4e0f23ed 100644
--- a/criu/include/autofs.h
+++ b/criu/include/autofs.h
@@ -2,7 +2,7 @@
 #define __CR_AUTOFS_H__
 
 #ifndef AUTOFS_MINOR
-#define AUTOFS_MINOR	235
+#define AUTOFS_MINOR 235
 #endif
 
 #include <stdbool.h>
@@ -12,78 +12,76 @@ bool is_autofs_pipe(unsigned long inode);
 struct mount_info;
 int autofs_parse(struct mount_info *pm);
 int autofs_dump(struct mount_info *pm);
-int autofs_mount(struct mount_info *mi, const char *source, const
-		 char *filesystemtype, unsigned long mountflags);
+int autofs_mount(struct mount_info *mi, const char *source, const char *filesystemtype, unsigned long mountflags);
 
 #include <linux/limits.h>
 #include <linux/auto_fs.h>
 
 #include <string.h>
 
-#define AUTOFS_DEVICE_NAME		"autofs"
+#define AUTOFS_DEVICE_NAME "autofs"
 
 #define AUTOFS_DEV_IOCTL_VERSION_MAJOR 1
 #define AUTOFS_DEV_IOCTL_VERSION_MINOR 0
 
-#define AUTOFS_DEVID_LEN		16
+#define AUTOFS_DEVID_LEN 16
 
-#define AUTOFS_DEV_IOCTL_SIZE		sizeof(struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_SIZE sizeof(struct autofs_dev_ioctl)
 
 /*
  * An ioctl interface for autofs mount point control.
  */
 
 struct args_protover {
-	__u32	version;
+	__u32 version;
 };
 
 struct args_protosubver {
-	__u32	sub_version;
+	__u32 sub_version;
 };
 
 struct args_openmount {
-	__u32	devid;
+	__u32 devid;
 };
 
 struct args_ready {
-	__u32	token;
+	__u32 token;
 };
 
 struct args_fail {
-	__u32	token;
-	__s32	status;
+	__u32 token;
+	__s32 status;
 };
 
 struct args_setpipefd {
-	__s32	pipefd;
+	__s32 pipefd;
 };
 
 struct args_timeout {
-	__u64	timeout;
+	__u64 timeout;
 };
 
 struct args_requester {
-	__u32	uid;
-	__u32	gid;
+	__u32 uid;
+	__u32 gid;
 };
 
 struct args_expire {
-	__u32	how;
+	__u32 how;
 };
 
-
 struct args_askumount {
-	__u32	may_umount;
+	__u32 may_umount;
 };
 
 struct args_ismountpoint {
 	union {
 		struct args_in {
-			__u32	type;
+			__u32 type;
 		} in;
 		struct args_out {
-			__u32	devid;
-			__u32	magic;
+			__u32 devid;
+			__u32 magic;
 		} out;
 	};
 };
@@ -98,24 +96,24 @@ struct args_ismountpoint {
 struct autofs_dev_ioctl {
 	__u32 ver_major;
 	__u32 ver_minor;
-	__u32 size;		/* total size of data passed in
+	__u32 size; /* total size of data passed in
 				 * including this struct */
-	__s32 ioctlfd;		/* automount command fd */
+	__s32 ioctlfd; /* automount command fd */
 
 	/* Command parameters */
 
 	union {
-		struct args_protover		protover;
-		struct args_protosubver		protosubver;
-		struct args_openmount		openmount;
-		struct args_ready		ready;
-		struct args_fail		fail;
-		struct args_setpipefd		setpipefd;
-		struct args_timeout		timeout;
-		struct args_requester		requester;
-		struct args_expire		expire;
-		struct args_askumount		askumount;
-		struct args_ismountpoint	ismountpoint;
+		struct args_protover protover;
+		struct args_protosubver protosubver;
+		struct args_openmount openmount;
+		struct args_ready ready;
+		struct args_fail fail;
+		struct args_setpipefd setpipefd;
+		struct args_timeout timeout;
+		struct args_requester requester;
+		struct args_expire expire;
+		struct args_askumount askumount;
+		struct args_ismountpoint ismountpoint;
 	};
 
 	char path[0];
@@ -131,7 +129,6 @@ static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in)
 	return;
 }
 
-
 /*
  * If you change this make sure you make the corresponding change
  * to autofs-dev-ioctl.c:lookup_ioctl()
@@ -174,61 +171,32 @@ enum {
 
 #define AUTOFS_IOCTL 0x93
 
-#define AUTOFS_DEV_IOCTL_VERSION \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_VERSION _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_PROTOVER \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_PROTOVER_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_PROTOVER _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_PROTOVER_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_PROTOSUBVER \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_PROTOSUBVER _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_OPENMOUNT \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_OPENMOUNT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_OPENMOUNT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_OPENMOUNT_CMD, struct autofs_dev_ioctl)
 
+#define AUTOFS_DEV_IOCTL_CLOSEMOUNT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_CLOSEMOUNT \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_READY _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_READY_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_READY \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_READY_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_FAIL _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_FAIL_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_FAIL \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_FAIL_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_SETPIPEFD _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_SETPIPEFD_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_SETPIPEFD \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_SETPIPEFD_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_CATATONIC _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_CATATONIC_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_CATATONIC \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_CATATONIC_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_TIMEOUT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_TIMEOUT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_TIMEOUT \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_TIMEOUT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_REQUESTER _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_REQUESTER_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_REQUESTER \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_REQUESTER_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_EXPIRE _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_EXPIRE_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_EXPIRE \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_EXPIRE_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_ASKUMOUNT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_ASKUMOUNT \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD, struct autofs_dev_ioctl)
-
-#define AUTOFS_DEV_IOCTL_ISMOUNTPOINT \
-	_IOWR(AUTOFS_IOCTL, \
-			AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_ISMOUNTPOINT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD, struct autofs_dev_ioctl)
 
 #endif
diff --git a/criu/include/bfd.h b/criu/include/bfd.h
index 9f4bdb27b..4268f74d4 100644
--- a/criu/include/bfd.h
+++ b/criu/include/bfd.h
@@ -5,9 +5,9 @@
 
 struct bfd_buf;
 struct xbuf {
-	char *mem;		/* buffer */
-	char *data;		/* position we see bytes at */
-	unsigned int sz;	/* bytes sitting after b->pos */
+	char *mem; /* buffer */
+	char *data; /* position we see bytes at */
+	unsigned int sz; /* bytes sitting after b->pos */
 	struct bfd_buf *buf;
 };
 
diff --git a/criu/include/bpfmap.h b/criu/include/bpfmap.h
index 2d83f44d2..8ab2d3ce6 100644
--- a/criu/include/bpfmap.h
+++ b/criu/include/bpfmap.h
@@ -6,24 +6,24 @@
 #include "bpfmap-data.pb-c.h"
 
 struct bpfmap_file_info {
-	BpfmapFileEntry		*bpfe;
-	struct file_desc	d;
+	BpfmapFileEntry *bpfe;
+	struct file_desc d;
 };
 
 struct bpfmap_data_rst {
-	BpfmapDataEntry			*bde;
-	void				*data;
-	struct bpfmap_data_rst		*next;
+	BpfmapDataEntry *bde;
+	void *data;
+	struct bpfmap_data_rst *next;
 };
 
-#define BPFMAP_DATA_HASH_BITS	5
-#define BPFMAP_DATA_TABLE_SIZE	(1 << BPFMAP_DATA_HASH_BITS)
-#define BPFMAP_DATA_HASH_MASK	(BPFMAP_DATA_TABLE_SIZE - 1)
+#define BPFMAP_DATA_HASH_BITS  5
+#define BPFMAP_DATA_TABLE_SIZE (1 << BPFMAP_DATA_HASH_BITS)
+#define BPFMAP_DATA_HASH_MASK  (BPFMAP_DATA_TABLE_SIZE - 1)
 
 extern int is_bpfmap_link(char *link);
 extern int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p);
-extern int do_collect_bpfmap_data(struct bpfmap_data_rst *, ProtobufCMessage *,
-		struct cr_img *, struct bpfmap_data_rst **);
+extern int do_collect_bpfmap_data(struct bpfmap_data_rst *, ProtobufCMessage *, struct cr_img *,
+				  struct bpfmap_data_rst **);
 extern int restore_bpfmap_data(int, uint32_t, struct bpfmap_data_rst **);
 
 extern const struct fdtype_ops bpfmap_dump_ops;
diff --git a/criu/include/cgroup-props.h b/criu/include/cgroup-props.h
index 0e5201098..11b677548 100644
--- a/criu/include/cgroup-props.h
+++ b/criu/include/cgroup-props.h
@@ -4,9 +4,9 @@
 #include <stdbool.h>
 
 typedef struct {
-	const char	*name;
-	size_t		nr_props;
-	const char	**props;
+	const char *name;
+	size_t nr_props;
+	const char **props;
 } cgp_t;
 
 extern cgp_t cgp_global;
diff --git a/criu/include/cgroup.h b/criu/include/cgroup.h
index 949266d40..2e9b8933c 100644
--- a/criu/include/cgroup.h
+++ b/criu/include/cgroup.h
@@ -19,47 +19,47 @@ void fini_cgroup(void);
 struct cg_controller;
 
 struct cgroup_prop {
-	char			*name;
-	char			*value;
-	mode_t			mode;
-	uid_t			uid;
-	gid_t			gid;
-	struct list_head	list;
+	char *name;
+	char *value;
+	mode_t mode;
+	uid_t uid;
+	gid_t gid;
+	struct list_head list;
 };
 
 /* This describes a particular cgroup path, e.g. the '/lxc/u1' part of
  * 'blkio/lxc/u1' and any properties it has.
  */
 struct cgroup_dir {
-	char			*path;
-	mode_t			mode;
-	uid_t			uid;
-	gid_t			gid;
+	char *path;
+	mode_t mode;
+	uid_t uid;
+	gid_t gid;
 
-	struct list_head	properties;
-	unsigned int		n_properties;
+	struct list_head properties;
+	unsigned int n_properties;
 
 	/* this is how children are linked together */
-	struct list_head	siblings;
+	struct list_head siblings;
 
 	/* more cgroup_dirs */
-	struct list_head	children;
-	unsigned int		n_children;
+	struct list_head children;
+	unsigned int n_children;
 };
 
 /* This describes a particular cgroup controller, e.g. blkio or cpuset.
  * The heads are subdirectories organized in their tree format.
  */
 struct cg_controller {
-	unsigned int		n_controllers;
-	char			**controllers;
+	unsigned int n_controllers;
+	char **controllers;
 
 	/* cgroup_dirs */
-	struct list_head 	heads;
-	unsigned int		n_heads;
+	struct list_head heads;
+	unsigned int n_heads;
 
 	/* for cgroup list in cgroup.c */
-	struct list_head	l;
+	struct list_head l;
 };
 struct cg_controller *new_controller(const char *name);
 
diff --git a/criu/include/clone-noasan.h b/criu/include/clone-noasan.h
index 0cfdaa1d9..aff773296 100644
--- a/criu/include/clone-noasan.h
+++ b/criu/include/clone-noasan.h
@@ -2,7 +2,6 @@
 #define __CR_CLONE_NOASAN_H__
 
 int clone_noasan(int (*fn)(void *), int flags, void *arg);
-int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags,
-			   int exit_signal, pid_t pid);
+int clone3_with_pid_noasan(int (*fn)(void *), void *arg, int flags, int exit_signal, pid_t pid);
 
 #endif /* __CR_CLONE_NOASAN_H__ */
diff --git a/criu/include/cr-errno.h b/criu/include/cr-errno.h
index 1f94988cf..0c7c1796e 100644
--- a/criu/include/cr-errno.h
+++ b/criu/include/cr-errno.h
@@ -11,7 +11,7 @@ int get_cr_errno(void);
  * EBADRQC	- bad options
  */
 
-#define set_task_cr_err(new_err)	atomic_cmpxchg(&task_entries->cr_err, 0, new_err)
-#define get_task_cr_err()		atomic_read(&task_entries->cr_err)
+#define set_task_cr_err(new_err) atomic_cmpxchg(&task_entries->cr_err, 0, new_err)
+#define get_task_cr_err()	 atomic_read(&task_entries->cr_err)
 
 #endif /* __CR_ERRNO_H__ */
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index dc6c95503..6836e8114 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -7,13 +7,13 @@
 #include "common/list.h"
 
 /* Configuration and CLI parsing order defines */
-#define PARSING_GLOBAL_CONF	1
-#define PARSING_USER_CONF	2
-#define PARSING_ENV_CONF	3
-#define PARSING_CMDLINE_CONF	4
-#define PARSING_ARGV		5
-#define PARSING_RPC_CONF	6
-#define PARSING_LAST		7
+#define PARSING_GLOBAL_CONF  1
+#define PARSING_USER_CONF    2
+#define PARSING_ENV_CONF     3
+#define PARSING_CMDLINE_CONF 4
+#define PARSING_ARGV	     5
+#define PARSING_RPC_CONF     6
+#define PARSING_LAST	     7
 
 #define SET_CHAR_OPTS(__dest, __src)              \
 	do {                                      \
@@ -25,13 +25,13 @@
 /*
  * CPU capability options.
  */
-#define CPU_CAP_NONE		(0u << 0)	/* Don't check capability at all */
-#define CPU_CAP_FPU		(1u << 0)	/* Only FPU capability required */
-#define CPU_CAP_CPU		(1u << 1)	/* Strict CPU capability required */
-#define CPU_CAP_INS		(1u << 2)	/* Instructions CPU capability */
-#define CPU_CAP_IMAGE		(1u << 3)	/* Write capability on dump and read on restore*/
-#define CPU_CAP_ALL		(CPU_CAP_FPU | CPU_CAP_CPU | CPU_CAP_INS)
-#define CPU_CAP_DEFAULT		(CPU_CAP_FPU | CPU_CAP_INS)
+#define CPU_CAP_NONE	(0u << 0) /* Don't check capability at all */
+#define CPU_CAP_FPU	(1u << 0) /* Only FPU capability required */
+#define CPU_CAP_CPU	(1u << 1) /* Strict CPU capability required */
+#define CPU_CAP_INS	(1u << 2) /* Instructions CPU capability */
+#define CPU_CAP_IMAGE	(1u << 3) /* Write capability on dump and read on restore*/
+#define CPU_CAP_ALL	(CPU_CAP_FPU | CPU_CAP_CPU | CPU_CAP_INS)
+#define CPU_CAP_DEFAULT (CPU_CAP_FPU | CPU_CAP_INS)
 
 struct cg_root_opt {
 	struct list_head node;
@@ -42,30 +42,29 @@ struct cg_root_opt {
 /*
  * Pre-dump variants
  */
-#define PRE_DUMP_SPLICE		1		/* Pre-dump using parasite */
-#define PRE_DUMP_READ			2		/* Pre-dump using process_vm_readv syscall */
+#define PRE_DUMP_SPLICE 1 /* Pre-dump using parasite */
+#define PRE_DUMP_READ	2 /* Pre-dump using process_vm_readv syscall */
 
 /*
  * Cgroup management options.
  */
-#define CG_MODE_IGNORE		(0u << 0)	/* Zero is important here */
-#define CG_MODE_NONE		(1u << 0)
-#define CG_MODE_PROPS		(1u << 1)
-#define CG_MODE_SOFT		(1u << 2)
-#define CG_MODE_FULL		(1u << 3)
-#define CG_MODE_STRICT		(1u << 4)
+#define CG_MODE_IGNORE (0u << 0) /* Zero is important here */
+#define CG_MODE_NONE   (1u << 0)
+#define CG_MODE_PROPS  (1u << 1)
+#define CG_MODE_SOFT   (1u << 2)
+#define CG_MODE_FULL   (1u << 3)
+#define CG_MODE_STRICT (1u << 4)
 
-#define CG_MODE_DEFAULT		(CG_MODE_SOFT)
+#define CG_MODE_DEFAULT (CG_MODE_SOFT)
 
 /*
  * Ghost file size we allow to carry by default.
  */
-#define DEFAULT_GHOST_LIMIT	(1 << 20)
+#define DEFAULT_GHOST_LIMIT (1 << 20)
 
-#define DEFAULT_TIMEOUT		10
+#define DEFAULT_TIMEOUT 10
 
-enum FILE_VALIDATION_OPTIONS
-{
+enum FILE_VALIDATION_OPTIONS {
 	/*
 	 * This constant indicates that the file validation should be tried with the
 	 * file size method by default.
@@ -80,7 +79,7 @@ enum FILE_VALIDATION_OPTIONS
 };
 
 /* This constant dictates which file validation method should be tried by default. */
-#define FILE_VALIDATION_DEFAULT			FILE_VALIDATION_BUILD_ID
+#define FILE_VALIDATION_DEFAULT FILE_VALIDATION_BUILD_ID
 
 struct irmap;
 
@@ -90,67 +89,67 @@ struct irmap_path_opt {
 };
 
 struct cr_options {
-	int			final_state;
-	int			check_extra_features;
-	int			check_experimental_features;
+	int final_state;
+	int check_extra_features;
+	int check_experimental_features;
 	union {
-		int		restore_detach;
-		bool		daemon_mode;
+		int restore_detach;
+		bool daemon_mode;
 	};
-	int			restore_sibling;
-	bool			ext_unix_sk;
-	int			shell_job;
-	int			handle_file_locks;
-	int			tcp_established_ok;
-	int			tcp_close;
-	int			evasive_devices;
-	int			link_remap_ok;
-	int			log_file_per_pid;
-	int			pre_dump_mode;
-	bool			swrk_restore;
-	char			*output;
-	char			*root;
-	char			*pidfile;
-	char			*freeze_cgroup;
-	struct list_head	ext_mounts;
-	struct list_head	inherit_fds;
-	struct list_head	external;
-	struct list_head	join_ns;
-	char			*libdir;
-	int			use_page_server;
-	unsigned short		port;
-	char			*addr;
-	int			ps_socket;
-	int			track_mem;
-	char			*img_parent;
-	int			auto_dedup;
-	unsigned int		cpu_cap;
-	int			force_irmap;
-	char			**exec_cmd;
-	unsigned int		manage_cgroups;
-	char			*new_global_cg_root;
-	char			*cgroup_props;
-	char			*cgroup_props_file;
-	struct list_head	new_cgroup_roots;
-	char			*cgroup_yard;
-	bool			autodetect_ext_mounts;
-	int			enable_external_sharing;
-	int			enable_external_masters;
-	bool			aufs;		/* auto-detected, not via cli */
-	bool			overlayfs;
+	int restore_sibling;
+	bool ext_unix_sk;
+	int shell_job;
+	int handle_file_locks;
+	int tcp_established_ok;
+	int tcp_close;
+	int evasive_devices;
+	int link_remap_ok;
+	int log_file_per_pid;
+	int pre_dump_mode;
+	bool swrk_restore;
+	char *output;
+	char *root;
+	char *pidfile;
+	char *freeze_cgroup;
+	struct list_head ext_mounts;
+	struct list_head inherit_fds;
+	struct list_head external;
+	struct list_head join_ns;
+	char *libdir;
+	int use_page_server;
+	unsigned short port;
+	char *addr;
+	int ps_socket;
+	int track_mem;
+	char *img_parent;
+	int auto_dedup;
+	unsigned int cpu_cap;
+	int force_irmap;
+	char **exec_cmd;
+	unsigned int manage_cgroups;
+	char *new_global_cg_root;
+	char *cgroup_props;
+	char *cgroup_props_file;
+	struct list_head new_cgroup_roots;
+	char *cgroup_yard;
+	bool autodetect_ext_mounts;
+	int enable_external_sharing;
+	int enable_external_masters;
+	bool aufs; /* auto-detected, not via cli */
+	bool overlayfs;
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
-	bool			has_binfmt_misc; /* auto-detected */
+	bool has_binfmt_misc; /* auto-detected */
 #endif
-	size_t			ghost_limit;
-	struct list_head	irmap_scan_paths;
-	bool			lsm_supplied;
-	char			*lsm_profile;
-	char			*lsm_mount_context;
-	unsigned int		timeout;
-	unsigned int		empty_ns;
-	int			tcp_skip_in_flight;
-	bool			lazy_pages;
-	char			*work_dir;
+	size_t ghost_limit;
+	struct list_head irmap_scan_paths;
+	bool lsm_supplied;
+	char *lsm_profile;
+	char *lsm_mount_context;
+	unsigned int timeout;
+	unsigned int empty_ns;
+	int tcp_skip_in_flight;
+	bool lazy_pages;
+	char *work_dir;
 
 	/*
 	 * When we scheduler for removal some functionality we first
@@ -158,24 +157,24 @@ struct cr_options {
 	 * the deprecated stuff is not working, but it's still possible
 	 * to turn one ON while the code is in.
 	 */
-	int			deprecated_ok;
-	int			display_stats;
-	int			weak_sysctls;
-	int			status_fd;
-	bool			orphan_pts_master;
-	int			stream;
-	pid_t			tree_id;
-	int			log_level;
-	char			*imgs_dir;
-	char			*tls_cacert;
-	char			*tls_cacrl;
-	char			*tls_cert;
-	char			*tls_key;
-	int			tls;
-	int			tls_no_cn_verify;
+	int deprecated_ok;
+	int display_stats;
+	int weak_sysctls;
+	int status_fd;
+	bool orphan_pts_master;
+	int stream;
+	pid_t tree_id;
+	int log_level;
+	char *imgs_dir;
+	char *tls_cacert;
+	char *tls_cacrl;
+	char *tls_cert;
+	char *tls_key;
+	int tls;
+	int tls_no_cn_verify;
 
 	/* This stores which method to use for file validation. */
-	int			file_validation_method;
+	int file_validation_method;
 };
 
 extern struct cr_options opts;
diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index b76f5f839..897666ecd 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -23,38 +23,35 @@
 #include <limits.h>
 #include <stdbool.h>
 
-#define CRIU_PLUGIN_GEN_VERSION(a,b,c)	(((a) << 16) + ((b) << 8) + (c))
-#define CRIU_PLUGIN_VERSION_MAJOR	0
-#define CRIU_PLUGIN_VERSION_MINOR	2
-#define CRIU_PLUGIN_VERSION_SUBLEVEL	0
+#define CRIU_PLUGIN_GEN_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
+#define CRIU_PLUGIN_VERSION_MAJOR	 0
+#define CRIU_PLUGIN_VERSION_MINOR	 2
+#define CRIU_PLUGIN_VERSION_SUBLEVEL	 0
 
-#define CRIU_PLUGIN_VERSION_OLD		CRIU_PLUGIN_GEN_VERSION(0,1,0)
+#define CRIU_PLUGIN_VERSION_OLD CRIU_PLUGIN_GEN_VERSION(0, 1, 0)
 
-#define CRIU_PLUGIN_VERSION					\
-	CRIU_PLUGIN_GEN_VERSION(CRIU_PLUGIN_VERSION_MAJOR,	\
-				CRIU_PLUGIN_VERSION_MINOR,	\
-				CRIU_PLUGIN_VERSION_SUBLEVEL)
+#define CRIU_PLUGIN_VERSION \
+	CRIU_PLUGIN_GEN_VERSION(CRIU_PLUGIN_VERSION_MAJOR, CRIU_PLUGIN_VERSION_MINOR, CRIU_PLUGIN_VERSION_SUBLEVEL)
 
 /*
  * Plugin hook points and their arguments in hooks.
  */
 enum {
-	CR_PLUGIN_HOOK__DUMP_UNIX_SK		= 0,
-	CR_PLUGIN_HOOK__RESTORE_UNIX_SK		= 1,
+	CR_PLUGIN_HOOK__DUMP_UNIX_SK = 0,
+	CR_PLUGIN_HOOK__RESTORE_UNIX_SK = 1,
 
-	CR_PLUGIN_HOOK__DUMP_EXT_FILE		= 2,
-	CR_PLUGIN_HOOK__RESTORE_EXT_FILE	= 3,
+	CR_PLUGIN_HOOK__DUMP_EXT_FILE = 2,
+	CR_PLUGIN_HOOK__RESTORE_EXT_FILE = 3,
 
-	CR_PLUGIN_HOOK__DUMP_EXT_MOUNT		= 4,
-	CR_PLUGIN_HOOK__RESTORE_EXT_MOUNT	= 5,
+	CR_PLUGIN_HOOK__DUMP_EXT_MOUNT = 4,
+	CR_PLUGIN_HOOK__RESTORE_EXT_MOUNT = 5,
 
-	CR_PLUGIN_HOOK__DUMP_EXT_LINK		= 6,
+	CR_PLUGIN_HOOK__DUMP_EXT_LINK = 6,
 
 	CR_PLUGIN_HOOK__MAX
 };
 
-#define DECLARE_PLUGIN_HOOK_ARGS(__hook, ...)	\
-	typedef int (__hook ##_t)(__VA_ARGS__)
+#define DECLARE_PLUGIN_HOOK_ARGS(__hook, ...) typedef int(__hook##_t)(__VA_ARGS__)
 
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_UNIX_SK, int fd, int id);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_UNIX_SK, int id);
@@ -76,42 +73,47 @@ enum {
  * Plugin descriptor.
  */
 typedef struct {
-	const char		*name;
-	int			(*init)(int stage);
-	void			(*exit)(int stage, int ret);
-	unsigned int		version;
-	unsigned int		max_hooks;
-	void			*hooks[CR_PLUGIN_HOOK__MAX];
+	const char *name;
+	int (*init)(int stage);
+	void (*exit)(int stage, int ret);
+	unsigned int version;
+	unsigned int max_hooks;
+	void *hooks[CR_PLUGIN_HOOK__MAX];
 } cr_plugin_desc_t;
 
 extern cr_plugin_desc_t CR_PLUGIN_DESC;
 
-#define CR_PLUGIN_REGISTER(___name, ___init, ___exit)					\
-	cr_plugin_desc_t CR_PLUGIN_DESC = {						\
-		.name		= ___name,						\
-		.init		= ___init,						\
-		.exit		= ___exit,						\
-		.version	= CRIU_PLUGIN_VERSION,					\
-		.max_hooks	= CR_PLUGIN_HOOK__MAX,					\
+#define CR_PLUGIN_REGISTER(___name, ___init, ___exit) \
+	cr_plugin_desc_t CR_PLUGIN_DESC = {           \
+		.name = ___name,                      \
+		.init = ___init,                      \
+		.exit = ___exit,                      \
+		.version = CRIU_PLUGIN_VERSION,       \
+		.max_hooks = CR_PLUGIN_HOOK__MAX,     \
 	};
 
-static inline int cr_plugin_dummy_init(int stage) { return 0; }
-static inline void cr_plugin_dummy_exit(int stage, int ret) { }
-
-#define CR_PLUGIN_REGISTER_DUMMY(___name)						\
-	cr_plugin_desc_t CR_PLUGIN_DESC = {						\
-		.name		= ___name,						\
-		.init		= cr_plugin_dummy_init,					\
-		.exit		= cr_plugin_dummy_exit,					\
-		.version	= CRIU_PLUGIN_VERSION,					\
-		.max_hooks	= CR_PLUGIN_HOOK__MAX,					\
-	};
-
-#define CR_PLUGIN_REGISTER_HOOK(__hook, __func)						\
-static void __attribute__((constructor)) cr_plugin_register_hook_##__func (void)	\
-{											\
-	CR_PLUGIN_DESC.hooks[__hook] = (void *)__func;					\
+static inline int cr_plugin_dummy_init(int stage)
+{
+	return 0;
 }
+static inline void cr_plugin_dummy_exit(int stage, int ret)
+{
+}
+
+#define CR_PLUGIN_REGISTER_DUMMY(___name)         \
+	cr_plugin_desc_t CR_PLUGIN_DESC = {       \
+		.name = ___name,                  \
+		.init = cr_plugin_dummy_init,     \
+		.exit = cr_plugin_dummy_exit,     \
+		.version = CRIU_PLUGIN_VERSION,   \
+		.max_hooks = CR_PLUGIN_HOOK__MAX, \
+	};
+
+#define CR_PLUGIN_REGISTER_HOOK(__hook, __func)                                         \
+	static void __attribute__((constructor)) cr_plugin_register_hook_##__func(void) \
+	{                                                                               \
+		CR_PLUGIN_DESC.hooks[__hook] = (void *)__func;                          \
+	}
 
 /* Public API */
 extern int criu_get_image_dir(void);
@@ -119,14 +121,14 @@ extern int criu_get_image_dir(void);
 /*
  * Deprecated, will be removed in next version.
  */
-typedef int (cr_plugin_init_t)(void);
-typedef void (cr_plugin_fini_t)(void);
-typedef int (cr_plugin_dump_unix_sk_t)(int fd, int id);
-typedef int (cr_plugin_restore_unix_sk_t)(int id);
-typedef int (cr_plugin_dump_file_t)(int fd, int id);
-typedef int (cr_plugin_restore_file_t)(int id);
-typedef int (cr_plugin_dump_ext_mount_t)(char *mountpoint, int id);
-typedef int (cr_plugin_restore_ext_mount_t)(int id, char *mountpoint, char *old_root, int *is_file);
-typedef int (cr_plugin_dump_ext_link_t)(int index, int type, char *kind);
+typedef int(cr_plugin_init_t)(void);
+typedef void(cr_plugin_fini_t)(void);
+typedef int(cr_plugin_dump_unix_sk_t)(int fd, int id);
+typedef int(cr_plugin_restore_unix_sk_t)(int id);
+typedef int(cr_plugin_dump_file_t)(int fd, int id);
+typedef int(cr_plugin_restore_file_t)(int id);
+typedef int(cr_plugin_dump_ext_mount_t)(char *mountpoint, int id);
+typedef int(cr_plugin_restore_ext_mount_t)(int id, char *mountpoint, char *old_root, int *is_file);
+typedef int(cr_plugin_dump_ext_link_t)(int index, int type, char *kind);
 
 #endif /* __CRIU_PLUGIN_H__ */
diff --git a/criu/include/crtools.h b/criu/include/crtools.h
index 740bf1737..b9309654f 100644
--- a/criu/include/crtools.h
+++ b/criu/include/crtools.h
@@ -8,7 +8,7 @@
 
 #include "images/inventory.pb-c.h"
 
-#define CR_FD_PERM		(S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
+#define CR_FD_PERM (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
 
 extern int check_img_inventory(bool restore);
 extern int write_img_inventory(InventoryEntry *he);
@@ -32,16 +32,18 @@ extern int cr_lazy_pages(bool daemon);
 extern int check_add_feature(char *arg);
 extern void pr_check_features(const char *offset, const char *sep, int width);
 
-#define PPREP_HEAD_INACTIVE	((struct pprep_head *)-1)
+#define PPREP_HEAD_INACTIVE ((struct pprep_head *)-1)
 
-#define add_post_prepare_cb_once(phead) do {		 \
-		if ((phead)->next == PPREP_HEAD_INACTIVE)\
-			add_post_prepare_cb(phead);	 \
+#define add_post_prepare_cb_once(phead)                   \
+	do {                                              \
+		if ((phead)->next == PPREP_HEAD_INACTIVE) \
+			add_post_prepare_cb(phead);       \
 	} while (0)
 
-#define MAKE_PPREP_HEAD(name) struct pprep_head name = {	\
-			.next = PPREP_HEAD_INACTIVE,		\
-			.actor = name##_cb,			\
+#define MAKE_PPREP_HEAD(name)                \
+	struct pprep_head name = {           \
+		.next = PPREP_HEAD_INACTIVE, \
+		.actor = name##_cb,          \
 	}
 
 #endif /* __CR_CRTOOLS_H__ */
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 0fd9b512d..f33918de8 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -35,12 +35,12 @@ static inline bool __fault_injected(enum faults f, enum faults fi_strategy)
 	return fi_strategy == f;
 }
 
-#define FI_HUGE_ANON_SHMEM_ID_BASE	(0xfffffffflu)
+#define FI_HUGE_ANON_SHMEM_ID_BASE (0xfffffffflu)
 
 #ifndef CR_NOGLIBC
 
 extern enum faults fi_strategy;
-#define fault_injected(f)	__fault_injected(f, fi_strategy)
+#define fault_injected(f) __fault_injected(f, fi_strategy)
 
 extern int fault_injection_init(void);
 
diff --git a/criu/include/fcntl.h b/criu/include/fcntl.h
index ea9d48c72..35f880523 100644
--- a/criu/include/fcntl.h
+++ b/criu/include/fcntl.h
@@ -5,49 +5,49 @@
 #include <fcntl.h>
 
 #ifndef F_SETOWN_EX
-#define F_SETOWN_EX	15
-#define F_GETOWN_EX	16
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
 
 struct f_owner_ex {
-	int	type;
-	pid_t	pid;
+	int type;
+	pid_t pid;
 };
 
 #endif
 
 #ifndef F_GETOWNER_UIDS
-#define F_GETOWNER_UIDS	17
+#define F_GETOWNER_UIDS 17
 #endif
 
 /*
  * These things are required to compile on CentOS-6
  */
 #ifndef F_LINUX_SPECIFIC_BASE
-# define F_LINUX_SPECIFIC_BASE	1024
+#define F_LINUX_SPECIFIC_BASE 1024
 #endif
 
 #ifndef F_SETPIPE_SZ
-# define F_SETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 7)
+#define F_SETPIPE_SZ (F_LINUX_SPECIFIC_BASE + 7)
 #endif
 
 #ifndef F_GETPIPE_SZ
-# define F_GETPIPE_SZ	(F_LINUX_SPECIFIC_BASE + 8)
+#define F_GETPIPE_SZ (F_LINUX_SPECIFIC_BASE + 8)
 #endif
 
 #ifndef F_ADD_SEALS
-# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
+#define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
 #endif
 
 #ifndef F_GET_SEALS
-# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
+#define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
 #endif
 
 #ifndef O_PATH
-# define O_PATH		010000000
+#define O_PATH 010000000
 #endif
 
 #ifndef __O_TMPFILE
-#define __O_TMPFILE     020000000
+#define __O_TMPFILE 020000000
 #endif
 
 #ifndef O_TMPFILE
diff --git a/criu/include/file-ids.h b/criu/include/file-ids.h
index 9a39f0d2d..4479a9b37 100644
--- a/criu/include/file-ids.h
+++ b/criu/include/file-ids.h
@@ -6,8 +6,8 @@
 
 #include "images/fdinfo.pb-c.h"
 
-#define FD_PID_INVALID		(-2U)
-#define FD_DESC_INVALID		(-3U)
+#define FD_PID_INVALID	(-2U)
+#define FD_DESC_INVALID (-3U)
 
 struct fdinfo_entry;
 struct stat;
diff --git a/criu/include/file-lock.h b/criu/include/file-lock.h
index dc4f38216..0ce2fa340 100644
--- a/criu/include/file-lock.h
+++ b/criu/include/file-lock.h
@@ -6,57 +6,58 @@
 #include "protobuf.h"
 #include "images/file-lock.pb-c.h"
 
-#define FL_UNKNOWN	-1
-#define FL_POSIX	1
-#define FL_FLOCK	2
-#define FL_OFD		4
-#define FL_LEASE	8
+#define FL_UNKNOWN -1
+#define FL_POSIX   1
+#define FL_FLOCK   2
+#define FL_OFD	   4
+#define FL_LEASE   8
 
 /* for posix fcntl() and lockf() */
 #ifndef F_RDLCK
-#define F_RDLCK		0
-#define F_WRLCK		1
-#define F_UNLCK		2
+#define F_RDLCK 0
+#define F_WRLCK 1
+#define F_UNLCK 2
 #endif
 
 /* for OFD locks fcntl() */
 #ifndef F_OFD_GETLK
-#define F_OFD_GETLK	36
-#define F_OFD_SETLK	37
-#define F_OFD_SETLKW	38
+#define F_OFD_GETLK  36
+#define F_OFD_SETLK  37
+#define F_OFD_SETLKW 38
 #endif
 
 /* operations for bsd flock(), also used by the kernel implementation */
-#define LOCK_SH		1	/* shared lock */
-#define LOCK_EX		2	/* exclusive lock */
-#define LOCK_NB		4	/* or'd with one of the above to prevent
+#define LOCK_SH 1 /* shared lock */
+#define LOCK_EX 2 /* exclusive lock */
+#define LOCK_NB \
+	4 /* or'd with one of the above to prevent
 				   blocking */
-#define LOCK_UN		8	/* remove lock */
+#define LOCK_UN 8 /* remove lock */
 
-#define LOCK_MAND	32	/* This is a mandatory flock ... */
-#define LOCK_READ	64	/* which allows concurrent read operations */
-#define LOCK_WRITE	128	/* which allows concurrent write operations */
-#define LOCK_RW		192	/* which allows concurrent read & write ops */
+#define LOCK_MAND  32 /* This is a mandatory flock ... */
+#define LOCK_READ  64 /* which allows concurrent read operations */
+#define LOCK_WRITE 128 /* which allows concurrent write operations */
+#define LOCK_RW	   192 /* which allows concurrent read & write ops */
 
 /* for leases */
-#define LEASE_BREAKING	4
+#define LEASE_BREAKING 4
 
 struct file_lock {
-	long long	fl_id;
-	int		fl_kind;
-	int		fl_ltype;
+	long long fl_id;
+	int fl_kind;
+	int fl_ltype;
 
-	pid_t		fl_owner; /* process, which created the lock */
-	pid_t		fl_holder; /* pid of fd on whose the lock is found */
-	int		maj, min;
-	unsigned long	i_no;
-	long long	start;
-	char		end[32];
+	pid_t fl_owner; /* process, which created the lock */
+	pid_t fl_holder; /* pid of fd on whose the lock is found */
+	int maj, min;
+	unsigned long i_no;
+	long long start;
+	char end[32];
 
-	struct list_head list;		/* list of all file locks */
+	struct list_head list; /* list of all file locks */
 
-	int		real_owner;
-	int		owners_fd;
+	int real_owner;
+	int owners_fd;
 };
 
 extern struct list_head file_lock_list;
@@ -74,6 +75,6 @@ extern int correct_file_leases_type(struct pid *, int fd, int lfd);
 extern int note_file_lock(struct pid *, int fd, int lfd, struct fd_parms *);
 extern int dump_file_locks(void);
 
-#define OPT_FILE_LOCKS	"file-locks"
+#define OPT_FILE_LOCKS "file-locks"
 
 #endif /* __FILE_LOCK_H__ */
diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h
index 0cb67c51a..953d50288 100644
--- a/criu/include/files-reg.h
+++ b/criu/include/files-reg.h
@@ -13,24 +13,23 @@ struct fd_parms;
 struct file_remap {
 	char *rpath;
 	bool is_dir;
-	int  rmnt_id;
+	int rmnt_id;
 	uid_t uid;
 	gid_t gid;
 };
 
 struct reg_file_info {
-	struct file_desc	d;
-	RegFileEntry		*rfe;
-	struct file_remap	*remap;
-	bool			size_mode_checked;
-	bool			is_dir;
-	char			*path;
+	struct file_desc d;
+	RegFileEntry *rfe;
+	struct file_remap *remap;
+	bool size_mode_checked;
+	bool is_dir;
+	char *path;
 };
 
 extern int open_reg_by_id(u32 id);
 extern int open_reg_fd(struct file_desc *);
-extern int open_path(struct file_desc *, int (*open_cb)(int ns_root_fd,
-			struct reg_file_info *, void *), void *arg);
+extern int open_path(struct file_desc *, int (*open_cb)(int ns_root_fd, struct reg_file_info *, void *), void *arg);
 
 extern const struct fdtype_ops regfile_dump_ops;
 extern int do_open_reg_noseek_flags(int ns_root_fd, struct reg_file_info *rfi, void *arg);
@@ -39,7 +38,7 @@ extern int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p);
 extern struct file_remap *lookup_ghost_remap(u32 dev, u32 ino);
 
 extern struct file_desc *try_collect_special_file(u32 id, int optional);
-#define collect_special_file(id)	try_collect_special_file(id, 0)
+#define collect_special_file(id) try_collect_special_file(id, 0)
 extern int collect_filemap(struct vma_area *);
 extern void filemap_ctx_init(bool auto_close);
 extern void filemap_ctx_fini(void);
diff --git a/criu/include/files.h b/criu/include/files.h
index 2c1e1e723..96face71b 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -26,8 +26,8 @@ struct fd_link {
 	union {
 		/* Link info for generic file (path) */
 		struct {
-			char	name[PATH_MAX];
-			size_t	len;
+			char name[PATH_MAX];
+			size_t len;
 		};
 
 		/* Link info for proc-ns file */
@@ -39,28 +39,26 @@ struct fd_link {
 };
 
 struct fd_parms {
-	int		fd;
-	off_t		pos;
-	unsigned int	flags;
-	char		fd_flags;
-	struct stat	stat;
-	pid_t		pid;
-	FownEntry	fown;
-	struct fd_link	*link;
-	long		fs_type;
-	int		mnt_id;
+	int fd;
+	off_t pos;
+	unsigned int flags;
+	char fd_flags;
+	struct stat stat;
+	pid_t pid;
+	FownEntry fown;
+	struct fd_link *link;
+	long fs_type;
+	int mnt_id;
 
 	struct parasite_ctl *fd_ctl;
 	struct parasite_drain_fd *dfds;
 };
 
-#define FD_PARMS_INIT			\
-(struct fd_parms) {			\
-	.fd	= FD_DESC_INVALID,	\
-	.fown	= FOWN_ENTRY__INIT,	\
-	.link	= NULL,			\
-	.mnt_id = -1,			\
-}
+#define FD_PARMS_INIT                                                                        \
+	(struct fd_parms)                                                                    \
+	{                                                                                    \
+		.fd = FD_DESC_INVALID, .fown = FOWN_ENTRY__INIT, .link = NULL, .mnt_id = -1, \
+	}
 
 extern int fill_fdlink(int lfd, const struct fd_parms *p, struct fd_link *link);
 extern uint32_t make_gen_id(uint32_t st_dev, uint32_t st_ino, uint64_t pos);
@@ -83,15 +81,15 @@ enum {
 };
 
 struct fdinfo_list_entry {
-	struct list_head	desc_list;	/* To chain on  @fd_info_head */
-	struct file_desc	*desc;		/* Associated file descriptor */
-	struct list_head	ps_list;	/* To chain  per-task files */
-	struct pstree_item	*task;
-	FdinfoEntry		*fe;
-	int			pid;
-	u8			received:1;
-	u8			stage:3;
-	u8			fake:1;
+	struct list_head desc_list; /* To chain on  @fd_info_head */
+	struct file_desc *desc; /* Associated file descriptor */
+	struct list_head ps_list; /* To chain  per-task files */
+	struct pstree_item *task;
+	FdinfoEntry *fe;
+	int pid;
+	u8 received : 1;
+	u8 stage : 3;
+	u8 fake : 1;
 };
 
 extern int inh_fd_max;
@@ -99,55 +97,50 @@ extern int inh_fd_max;
 /* reports whether fd_a takes prio over fd_b */
 static inline int fdinfo_rst_prio(struct fdinfo_list_entry *fd_a, struct fdinfo_list_entry *fd_b)
 {
-	return pid_rst_prio(fd_a->pid, fd_b->pid) ||
-		((fd_a->pid == fd_b->pid) && (fd_a->fe->fd < fd_b->fe->fd));
+	return pid_rst_prio(fd_a->pid, fd_b->pid) || ((fd_a->pid == fd_b->pid) && (fd_a->fe->fd < fd_b->fe->fd));
 }
 
 struct file_desc_ops {
 	/* fd_types from images/fdinfo.proto */
-	unsigned int		type;
+	unsigned int type;
 	/*
 	 * Opens a file by whatever syscall is required for that.
 	 * The returned descriptor may be closed (dup2-ed to another)
 	 * so it shouldn't be saved for any post-actions.
 	 */
-	int			(*open)(struct file_desc *d, int *new_fd);
-	char *			(*name)(struct file_desc *, char *b, size_t s);
+	int (*open)(struct file_desc *d, int *new_fd);
+	char *(*name)(struct file_desc *, char *b, size_t s);
 };
 
 int collect_fd(int pid, FdinfoEntry *e, struct rst_info *rst_info, bool ghost);
-struct fdinfo_list_entry *collect_fd_to(int pid, FdinfoEntry *e,
-		struct rst_info *rst_info, struct file_desc *fdesc,
-		bool fake, bool force_master);
+struct fdinfo_list_entry *collect_fd_to(int pid, FdinfoEntry *e, struct rst_info *rst_info, struct file_desc *fdesc,
+					bool fake, bool force_master);
 
 u32 find_unused_file_desc_id(void);
 unsigned int find_unused_fd(struct pstree_item *, int hint_fd);
 struct fdinfo_list_entry *find_used_fd(struct pstree_item *, int fd);
 
 struct file_desc {
-	u32			id;		/* File id, unique */
-	struct hlist_node	hash;		/* Descriptor hashing and lookup */
-	struct list_head	fd_info_head;	/* Chain of fdinfo_list_entry-s with same ID and type but different pids */
-	struct file_desc_ops	*ops;		/* Associated operations */
-	struct list_head	fake_master_list;/* To chain in the list of file_desc, which don't
+	u32 id; /* File id, unique */
+	struct hlist_node hash; /* Descriptor hashing and lookup */
+	struct list_head fd_info_head; /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
+	struct file_desc_ops *ops; /* Associated operations */
+	struct list_head fake_master_list; /* To chain in the list of file_desc, which don't
 						    have a fle in a task, that having permissions */
 };
 
 struct fdtype_ops {
-	unsigned int		type;
-	int			(*dump)(int lfd, u32 id, const struct fd_parms *p);
-	int			(*pre_dump)(int pid, int lfd);
+	unsigned int type;
+	int (*dump)(int lfd, u32 id, const struct fd_parms *p);
+	int (*pre_dump)(int pid, int lfd);
 };
 
 struct cr_img;
 
 extern int dump_my_file(int lfd, u32 *, int *type);
-extern int do_dump_gen_file(struct fd_parms *p, int lfd,
-			    const struct fdtype_ops *ops,
-			    FdinfoEntry *e);
+extern int do_dump_gen_file(struct fd_parms *p, int lfd, const struct fdtype_ops *ops, FdinfoEntry *e);
 struct parasite_drain_fd;
-int dump_task_files_seized(struct parasite_ctl *ctl, struct pstree_item *item,
-		struct parasite_drain_fd *dfds);
+int dump_task_files_seized(struct parasite_ctl *ctl, struct pstree_item *item, struct parasite_drain_fd *dfds);
 int predump_task_files(int pid);
 
 extern void file_desc_init(struct file_desc *d, u32 id, struct file_desc_ops *ops);
@@ -179,13 +172,12 @@ extern int close_old_fds(void);
 #define AT_EMPTY_PATH 0x1000
 #endif
 
-#define LREMAP_PARAM	"link-remap"
+#define LREMAP_PARAM "link-remap"
 
 extern int shared_fdt_prepare(struct pstree_item *item);
 
 extern struct collect_image_info ext_file_cinfo;
-extern int dump_unsupp_fd(struct fd_parms *p, int lfd,
-		char *more, char *info, FdinfoEntry *);
+extern int dump_unsupp_fd(struct fd_parms *p, int lfd, char *more, char *info, FdinfoEntry *);
 
 extern int inherit_fd_parse(char *optarg);
 extern int inherit_fd_add(int fd, char *key);
@@ -197,8 +189,7 @@ extern int inherit_fd_lookup_id(char *id);
 extern bool inherited_fd(struct file_desc *, int *fdp);
 
 extern FdinfoEntry *dup_fdinfo(FdinfoEntry *old, int fd, unsigned flags);
-int dup_fle(struct pstree_item *task, struct fdinfo_list_entry *ple,
-	    int fd, unsigned flags);
+int dup_fle(struct pstree_item *task, struct fdinfo_list_entry *ple, int fd, unsigned flags);
 
 extern int open_transport_socket(void);
 extern int set_fds_event(pid_t virt);
diff --git a/criu/include/filesystems.h b/criu/include/filesystems.h
index bd798062d..251e9e2aa 100644
--- a/criu/include/filesystems.h
+++ b/criu/include/filesystems.h
@@ -5,8 +5,7 @@ extern struct fstype *decode_fstype(u32 fst);
 extern bool add_fsname_auto(const char *names);
 
 struct mount_info;
-typedef int (*mount_fn_t)(struct mount_info *mi, const char *src, const
-			  char *fstype, unsigned long mountflags);
+typedef int (*mount_fn_t)(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags);
 
 struct fstype {
 	char *name;
diff --git a/criu/include/fs-magic.h b/criu/include/fs-magic.h
index ced3377f9..46ac8aa27 100644
--- a/criu/include/fs-magic.h
+++ b/criu/include/fs-magic.h
@@ -10,47 +10,47 @@
  */
 
 #ifndef NFS_SUPER_MAGIC
-# define NFS_SUPER_MAGIC	0x6969
+#define NFS_SUPER_MAGIC 0x6969
 #endif
 
 #ifndef PIPEFS_MAGIC
-# define PIPEFS_MAGIC		0x50495045
+#define PIPEFS_MAGIC 0x50495045
 #endif
 
 #ifndef ANON_INODE_FS_MAGIC
-# define ANON_INODE_FS_MAGIC	0x09041934
+#define ANON_INODE_FS_MAGIC 0x09041934
 #endif
 
 #ifndef TMPFS_MAGIC
-# define TMPFS_MAGIC		0x01021994
+#define TMPFS_MAGIC 0x01021994
 #endif
 
 #ifndef SOCKFS_MAGIC
-# define SOCKFS_MAGIC		0x534f434b
+#define SOCKFS_MAGIC 0x534f434b
 #endif
 
 #ifndef DEVPTS_SUPER_MAGIC
-#define DEVPTS_SUPER_MAGIC	0x1cd1
+#define DEVPTS_SUPER_MAGIC 0x1cd1
 #endif
 
 #ifndef BTRFS_SUPER_MAGIC
-#define BTRFS_SUPER_MAGIC	0x9123683E
+#define BTRFS_SUPER_MAGIC 0x9123683E
 #endif
 
 #ifndef AUFS_SUPER_MAGIC
-#define AUFS_SUPER_MAGIC	0x61756673
+#define AUFS_SUPER_MAGIC 0x61756673
 #endif
 
 #ifndef PROC_SUPER_MAGIC
-#define PROC_SUPER_MAGIC	0x9fa0
+#define PROC_SUPER_MAGIC 0x9fa0
 #endif
 
 #ifndef BINFMTFS_MAGIC
-#define BINFMTFS_MAGIC		0x42494e4d
+#define BINFMTFS_MAGIC 0x42494e4d
 #endif
 
 #ifndef AUTOFS_SUPER_MAGIC
-#define AUTOFS_SUPER_MAGIC	0x0187
+#define AUTOFS_SUPER_MAGIC 0x0187
 #endif
 
 #endif /* __CR_FS_MAGIC_H__ */
diff --git a/criu/include/fsnotify.h b/criu/include/fsnotify.h
index 935dd60f4..3435f0c86 100644
--- a/criu/include/fsnotify.h
+++ b/criu/include/fsnotify.h
@@ -9,7 +9,7 @@
 #define KERNEL_FS_EVENT_ON_CHILD 0x08000000
 
 #ifndef INOTIFY_IOC_SETNEXTWD
-#define INOTIFY_IOC_SETNEXTWD  _IOW('I', 0, __s32)
+#define INOTIFY_IOC_SETNEXTWD _IOW('I', 0, __s32)
 #endif
 
 extern int is_inotify_link(char *link);
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index f69cc5824..384d6d07b 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -120,9 +120,9 @@ enum {
 
 /* file descriptors template */
 struct cr_fd_desc_tmpl {
-	const char	*fmt;			/* format for the name */
-	u32		magic;			/* magic in the header */
-	int		oflags;			/* flags for image_open */
+	const char *fmt; /* format for the name */
+	u32 magic; /* magic in the header */
+	int oflags; /* flags for image_open */
 };
 
 extern struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX];
diff --git a/criu/include/image.h b/criu/include/image.h
index 7c45381db..14659dbd2 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -12,14 +12,14 @@
 #include "log.h"
 #include "common/bug.h"
 
-#define PAGE_RSS	1
-#define PAGE_ANON	2
+#define PAGE_RSS  1
+#define PAGE_ANON 2
 
 /*
  * Top bit set in the tgt id means we've remapped
  * to a ghost file.
  */
-#define REMAP_GHOST	(1 << 31)
+#define REMAP_GHOST (1 << 31)
 
 /*
  * VMA_AREA status:
@@ -67,30 +67,30 @@
  *  	are part of image ABI, this particular one must never
  *  	be used in image.
  */
-#define VMA_AREA_NONE		(0 <<  0)
-#define VMA_AREA_REGULAR	(1 <<  0)
-#define VMA_AREA_STACK		(1 <<  1)
-#define VMA_AREA_VSYSCALL	(1 <<  2)
-#define VMA_AREA_VDSO		(1 <<  3)
-#define VMA_AREA_HEAP		(1 <<  5)
+#define VMA_AREA_NONE	  (0 << 0)
+#define VMA_AREA_REGULAR  (1 << 0)
+#define VMA_AREA_STACK	  (1 << 1)
+#define VMA_AREA_VSYSCALL (1 << 2)
+#define VMA_AREA_VDSO	  (1 << 3)
+#define VMA_AREA_HEAP	  (1 << 5)
 
-#define VMA_FILE_PRIVATE	(1 <<  6)
-#define VMA_FILE_SHARED		(1 <<  7)
-#define VMA_ANON_SHARED		(1 <<  8)
-#define VMA_ANON_PRIVATE	(1 <<  9)
+#define VMA_FILE_PRIVATE (1 << 6)
+#define VMA_FILE_SHARED	 (1 << 7)
+#define VMA_ANON_SHARED	 (1 << 8)
+#define VMA_ANON_PRIVATE (1 << 9)
 
-#define VMA_AREA_SYSVIPC	(1 <<  10)
-#define VMA_AREA_SOCKET		(1 <<  11)
-#define VMA_AREA_VVAR		(1 <<  12)
-#define VMA_AREA_AIORING	(1 <<  13)
-#define VMA_AREA_MEMFD		(1 <<  14)
+#define VMA_AREA_SYSVIPC (1 << 10)
+#define VMA_AREA_SOCKET	 (1 << 11)
+#define VMA_AREA_VVAR	 (1 << 12)
+#define VMA_AREA_AIORING (1 << 13)
+#define VMA_AREA_MEMFD	 (1 << 14)
 
-#define VMA_CLOSE		(1 <<  28)
-#define VMA_NO_PROT_WRITE	(1 <<  29)
-#define VMA_PREMMAPED		(1 <<  30)
-#define VMA_UNSUPP		(1 <<  31)
+#define VMA_CLOSE	  (1 << 28)
+#define VMA_NO_PROT_WRITE (1 << 29)
+#define VMA_PREMMAPED	  (1 << 30)
+#define VMA_UNSUPP	  (1 << 31)
 
-#define CR_CAP_SIZE	2
+#define CR_CAP_SIZE 2
 
 #define TASK_COMM_LEN 16
 
@@ -99,11 +99,11 @@
 extern bool ns_per_id;
 extern bool img_common_magic;
 
-#define O_NOBUF		(O_DIRECT)
-#define O_SERVICE	(O_DIRECTORY)
-#define O_DUMP		(O_WRONLY | O_CREAT | O_TRUNC)
-#define O_RSTR		(O_RDONLY)
-#define O_FORCE_LOCAL	(O_SYNC)
+#define O_NOBUF	      (O_DIRECT)
+#define O_SERVICE     (O_DIRECTORY)
+#define O_DUMP	      (O_WRONLY | O_CREAT | O_TRUNC)
+#define O_RSTR	      (O_RDONLY)
+#define O_FORCE_LOCAL (O_SYNC)
 
 struct cr_img {
 	union {
@@ -117,8 +117,8 @@ struct cr_img {
 	};
 };
 
-#define EMPTY_IMG_FD	(-404)
-#define LAZY_IMG_FD	(-505)
+#define EMPTY_IMG_FD (-404)
+#define LAZY_IMG_FD  (-505)
 
 static inline bool empty_image(struct cr_img *img)
 {
@@ -164,11 +164,11 @@ extern void up_page_ids_base(void);
 extern struct cr_img *img_from_fd(int fd); /* for cr-show mostly */
 
 extern int write_img_buf(struct cr_img *, const void *ptr, int size);
-#define write_img(img, ptr)	write_img_buf((img), (ptr), sizeof(*(ptr)))
+#define write_img(img, ptr) write_img_buf((img), (ptr), sizeof(*(ptr)))
 extern int read_img_buf_eof(struct cr_img *, void *ptr, int size);
-#define read_img_eof(img, ptr)	read_img_buf_eof((img), (ptr), sizeof(*(ptr)))
+#define read_img_eof(img, ptr) read_img_buf_eof((img), (ptr), sizeof(*(ptr)))
 extern int read_img_buf(struct cr_img *, void *ptr, int size);
-#define read_img(img, ptr)	read_img_buf((img), (ptr), sizeof(*(ptr)))
+#define read_img(img, ptr) read_img_buf((img), (ptr), sizeof(*(ptr)))
 extern int read_img_str(struct cr_img *, char **pstr, int size);
 
 extern void close_image(struct cr_img *);
diff --git a/criu/include/imgset.h b/criu/include/imgset.h
index 02ad169df..9846f6cdc 100644
--- a/criu/include/imgset.h
+++ b/criu/include/imgset.h
@@ -27,10 +27,8 @@ extern struct cr_imgset *glob_imgset;
 extern struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX];
 
 extern struct cr_imgset *cr_task_imgset_open(int pid, int mode);
-extern struct cr_imgset *cr_imgset_open_range(int pid, int from, int to,
-					    unsigned long flags);
-#define cr_imgset_open(pid, type, flags) cr_imgset_open_range(pid, \
-		_CR_FD_##type##_FROM, _CR_FD_##type##_TO, flags)
+extern struct cr_imgset *cr_imgset_open_range(int pid, int from, int to, unsigned long flags);
+#define cr_imgset_open(pid, type, flags) cr_imgset_open_range(pid, _CR_FD_##type##_FROM, _CR_FD_##type##_TO, flags)
 extern struct cr_imgset *cr_glob_imgset_open(int mode);
 
 extern void close_cr_imgset(struct cr_imgset **cr_imgset);
diff --git a/criu/include/inet_diag.h b/criu/include/inet_diag.h
index 95be2c19d..ea6f5e14e 100644
--- a/criu/include/inet_diag.h
+++ b/criu/include/inet_diag.h
@@ -4,42 +4,42 @@
 #include <linux/types.h>
 
 /* Just some random number */
-#define TCPDIAG_GETSOCK 18
+#define TCPDIAG_GETSOCK	 18
 #define DCCPDIAG_GETSOCK 19
 
 #define INET_DIAG_GETSOCK_MAX 24
 
 /* Socket identity */
 struct inet_diag_sockid {
-	__be16	idiag_sport;
-	__be16	idiag_dport;
-	__be32	idiag_src[4];
-	__be32	idiag_dst[4];
-	__u32	idiag_if;
-	__u32	idiag_cookie[2];
+	__be16 idiag_sport;
+	__be16 idiag_dport;
+	__be32 idiag_src[4];
+	__be32 idiag_dst[4];
+	__u32 idiag_if;
+	__u32 idiag_cookie[2];
 #define INET_DIAG_NOCOOKIE (~0U)
 };
 
 /* Request structure */
 
 struct inet_diag_req_compat {
-	__u8	idiag_family;		/* Family of addresses. */
-	__u8	idiag_src_len;
-	__u8	idiag_dst_len;
-	__u8	idiag_ext;		/* Query extended information */
+	__u8 idiag_family; /* Family of addresses. */
+	__u8 idiag_src_len;
+	__u8 idiag_dst_len;
+	__u8 idiag_ext; /* Query extended information */
 
 	struct inet_diag_sockid id;
 
-	__u32	idiag_states;		/* States to dump */
-	__u32	idiag_dbs;		/* Tables to dump (NI) */
+	__u32 idiag_states; /* States to dump */
+	__u32 idiag_dbs; /* Tables to dump (NI) */
 };
 
 struct inet_diag_req_v2 {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u8	idiag_ext;
-	__u8	pad;
-	__u32	idiag_states;
+	__u8 sdiag_family;
+	__u8 sdiag_protocol;
+	__u8 idiag_ext;
+	__u8 pad;
+	__u32 idiag_states;
 	struct inet_diag_sockid id;
 };
 
@@ -57,9 +57,9 @@ enum {
  */
 
 struct inet_diag_bc_op {
-	unsigned char	code;
-	unsigned char	yes;
-	unsigned short	no;
+	unsigned char code;
+	unsigned char yes;
+	unsigned short no;
 };
 
 enum {
@@ -75,27 +75,27 @@ enum {
 };
 
 struct inet_diag_hostcond {
-	__u8	family;
-	__u8	prefix_len;
-	int	port;
-	__be32	addr[0];
+	__u8 family;
+	__u8 prefix_len;
+	int port;
+	__be32 addr[0];
 };
 
 /* Base info structure. It contains socket identity (addrs/ports/cookie)
  * and, alas, the information shown by netstat. */
 struct inet_diag_msg {
-	__u8	idiag_family;
-	__u8	idiag_state;
-	__u8	idiag_timer;
-	__u8	idiag_retrans;
+	__u8 idiag_family;
+	__u8 idiag_state;
+	__u8 idiag_timer;
+	__u8 idiag_retrans;
 
 	struct inet_diag_sockid id;
 
-	__u32	idiag_expires;
-	__u32	idiag_rqueue;
-	__u32	idiag_wqueue;
-	__u32	idiag_uid;
-	__u32	idiag_inode;
+	__u32 idiag_expires;
+	__u32 idiag_rqueue;
+	__u32 idiag_wqueue;
+	__u32 idiag_uid;
+	__u32 idiag_inode;
 };
 
 /* Extensions */
@@ -114,23 +114,22 @@ enum {
 
 #define INET_DIAG_MAX INET_DIAG_SHUTDOWN
 
-
 /* INET_DIAG_MEM */
 
 struct inet_diag_meminfo {
-	__u32	idiag_rmem;
-	__u32	idiag_wmem;
-	__u32	idiag_fmem;
-	__u32	idiag_tmem;
+	__u32 idiag_rmem;
+	__u32 idiag_wmem;
+	__u32 idiag_fmem;
+	__u32 idiag_tmem;
 };
 
 /* INET_DIAG_VEGASINFO */
 
 struct tcpvegas_info {
-	__u32	tcpv_enabled;
-	__u32	tcpv_rttcnt;
-	__u32	tcpv_rtt;
-	__u32	tcpv_minrtt;
+	__u32 tcpv_enabled;
+	__u32 tcpv_rttcnt;
+	__u32 tcpv_rtt;
+	__u32 tcpv_minrtt;
 };
 
 #endif /* __CR_INET_DIAG_H__ */
diff --git a/criu/include/irmap.h b/criu/include/irmap.h
index 188d753f4..e668952b8 100644
--- a/criu/include/irmap.h
+++ b/criu/include/irmap.h
@@ -4,12 +4,10 @@
 #include "images/fh.pb-c.h"
 
 char *irmap_lookup(unsigned int s_dev, unsigned long i_ino);
-int irmap_queue_cache(unsigned int dev, unsigned long ino,
-		FhEntry *fh);
+int irmap_queue_cache(unsigned int dev, unsigned long ino, FhEntry *fh);
 int irmap_predump_prep(void);
 int irmap_predump_run(void);
-int check_open_handle(unsigned int s_dev, unsigned long i_ino,
-		FhEntry *f_handle);
+int check_open_handle(unsigned int s_dev, unsigned long i_ino, FhEntry *f_handle);
 int irmap_load_cache(void);
 int irmap_scan_path_add(char *path);
 #endif
diff --git a/criu/include/kcmp-ids.h b/criu/include/kcmp-ids.h
index a37622c50..b6cdbb262 100644
--- a/criu/include/kcmp-ids.h
+++ b/criu/include/kcmp-ids.h
@@ -7,30 +7,26 @@
 #include "kcmp.h"
 
 struct kid_tree {
-	struct rb_root		root;
-	unsigned int		kcmp_type;
-	unsigned long		subid;
-
+	struct rb_root root;
+	unsigned int kcmp_type;
+	unsigned long subid;
 };
 
-#define DECLARE_KCMP_TREE(name, type)		\
-	struct kid_tree name = {		\
-		.root		= RB_ROOT,	\
-		.kcmp_type	= type,		\
-		.subid		= 1,		\
+#define DECLARE_KCMP_TREE(name, type) \
+	struct kid_tree name = {      \
+		.root = RB_ROOT,      \
+		.kcmp_type = type,    \
+		.subid = 1,           \
 	}
 
 struct kid_elem {
-	pid_t		pid;
-	unsigned int	genid;
-	unsigned int	idx;
+	pid_t pid;
+	unsigned int genid;
+	unsigned int idx;
 };
 
-extern uint32_t kid_generate_gen(struct kid_tree *tree,
-				 struct kid_elem *elem, int *new_id);
+extern uint32_t kid_generate_gen(struct kid_tree *tree, struct kid_elem *elem, int *new_id);
 
-extern struct kid_elem *kid_lookup_epoll_tfd(struct kid_tree *tree,
-					     struct kid_elem *elem,
-					     kcmp_epoll_slot_t *slot);
+extern struct kid_elem *kid_lookup_epoll_tfd(struct kid_tree *tree, struct kid_elem *elem, kcmp_epoll_slot_t *slot);
 
 #endif /* __CR_KCMP_IDS_H__ */
diff --git a/criu/include/kcmp.h b/criu/include/kcmp.h
index f1c898d71..a6774be47 100644
--- a/criu/include/kcmp.h
+++ b/criu/include/kcmp.h
@@ -18,9 +18,9 @@ enum kcmp_type {
 
 /* Slot for KCMP_EPOLL_TFD */
 typedef struct {
-	uint32_t	efd;	/* epoll file descriptor */
-	uint32_t	tfd;	/* target file number */
-	uint32_t	toff;	/* target offset within same numbered sequence */
+	uint32_t efd; /* epoll file descriptor */
+	uint32_t tfd; /* target file number */
+	uint32_t toff; /* target offset within same numbered sequence */
 } kcmp_epoll_slot_t;
 
 #endif /* __CR_KCMP_H__ */
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 97dbd17b3..3fb3b2492 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -18,8 +18,8 @@ extern int kerndat_init(void);
 
 enum pagemap_func {
 	PM_UNKNOWN,
-	PM_DISABLED,	/* /proc/pid/pagemap doesn't open (user mode) */
-	PM_FLAGS_ONLY,	/* pagemap zeroes pfn part (user mode) */
+	PM_DISABLED, /* /proc/pid/pagemap doesn't open (user mode) */
+	PM_FLAGS_ONLY, /* pagemap zeroes pfn part (user mode) */
 	PM_FULL,
 };
 
@@ -55,9 +55,9 @@ struct kerndat_s {
 	bool has_thp_disable;
 	bool can_map_vdso;
 	bool vdso_hint_reliable;
-	struct vdso_symtable	vdso_sym;
+	struct vdso_symtable vdso_sym;
 #ifdef CONFIG_COMPAT
-	struct vdso_symtable	vdso_sym_compat;
+	struct vdso_symtable vdso_sym_compat;
 #endif
 	bool has_nsid;
 	bool has_link_nsid;
diff --git a/criu/include/libnetlink.h b/criu/include/libnetlink.h
index f21a0e750..2cdb543c0 100644
--- a/criu/include/libnetlink.h
+++ b/criu/include/libnetlink.h
@@ -1,24 +1,21 @@
 #ifndef __CR_LIBNETLINK_H__
 #define __CR_LIBNETLINK_H__
 
-#define CR_NLMSG_SEQ		24680	/* arbitrary chosen */
+#define CR_NLMSG_SEQ 24680 /* arbitrary chosen */
 
 struct ns_id;
 extern int do_rtnl_req(int nl, void *req, int size,
-		int (*receive_callback)(struct nlmsghdr *h, struct ns_id *ns, void *),
-		int (*error_callback)(int err, struct ns_id *ns, void *), struct ns_id *ns, void *);
+		       int (*receive_callback)(struct nlmsghdr *h, struct ns_id *ns, void *),
+		       int (*error_callback)(int err, struct ns_id *ns, void *), struct ns_id *ns, void *);
 
-extern int addattr_l(struct nlmsghdr *n, int maxlen, int type,
-		const void *data, int alen);
+extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, int alen);
 
 extern int32_t nla_get_s32(const struct nlattr *nla);
 
-#define NLMSG_TAIL(nmsg) \
-	((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+#define NLMSG_TAIL(nmsg) ((struct rtattr *)(((void *)(nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 
 #ifndef NETNS_RTA
-#define NETNS_RTA(r) \
-	((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
+#define NETNS_RTA(r) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
 #endif
 
 #endif /* __CR_LIBNETLINK_H__ */
diff --git a/criu/include/linux/mount.h b/criu/include/linux/mount.h
index aa6be69ec..840d6277e 100644
--- a/criu/include/linux/mount.h
+++ b/criu/include/linux/mount.h
@@ -8,14 +8,14 @@
 #include <linux/mount.h>
 #else
 enum fsconfig_command {
-        FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
-        FSCONFIG_SET_STRING     = 1,    /* Set parameter, supplying a string value */
-        FSCONFIG_SET_BINARY     = 2,    /* Set parameter, supplying a binary blob value */
-        FSCONFIG_SET_PATH       = 3,    /* Set parameter, supplying an object by path */
-        FSCONFIG_SET_PATH_EMPTY = 4,    /* Set parameter, supplying an object by (empty) path */
-        FSCONFIG_SET_FD         = 5,    /* Set parameter, supplying an object by fd */
-        FSCONFIG_CMD_CREATE     = 6,    /* Invoke superblock creation */
-        FSCONFIG_CMD_RECONFIGURE = 7,   /* Invoke superblock reconfiguration */
+	FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
+	FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
+	FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
+	FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
+	FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
+	FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
+	FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
+	FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
 };
 #endif
 
diff --git a/criu/include/linux/userfaultfd.h b/criu/include/linux/userfaultfd.h
index 3b059530d..cfcf48571 100644
--- a/criu/include/linux/userfaultfd.h
+++ b/criu/include/linux/userfaultfd.h
@@ -18,23 +18,12 @@
  * means the userland is reading).
  */
 #define UFFD_API ((__u64)0xAA)
-#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK |		\
-			   UFFD_FEATURE_EVENT_REMAP |		\
-			   UFFD_FEATURE_EVENT_REMOVE |	\
-			   UFFD_FEATURE_EVENT_UNMAP |		\
-			   UFFD_FEATURE_MISSING_HUGETLBFS |	\
-			   UFFD_FEATURE_MISSING_SHMEM)
-#define UFFD_API_IOCTLS				\
-	((__u64)1 << _UFFDIO_REGISTER |		\
-	 (__u64)1 << _UFFDIO_UNREGISTER |	\
-	 (__u64)1 << _UFFDIO_API)
-#define UFFD_API_RANGE_IOCTLS			\
-	((__u64)1 << _UFFDIO_WAKE |		\
-	 (__u64)1 << _UFFDIO_COPY |		\
-	 (__u64)1 << _UFFDIO_ZEROPAGE)
-#define UFFD_API_RANGE_IOCTLS_BASIC		\
-	((__u64)1 << _UFFDIO_WAKE |		\
-	 (__u64)1 << _UFFDIO_COPY)
+#define UFFD_API_FEATURES                                                                                            \
+	(UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_REMOVE | UFFD_FEATURE_EVENT_UNMAP | \
+	 UFFD_FEATURE_MISSING_HUGETLBFS | UFFD_FEATURE_MISSING_SHMEM)
+#define UFFD_API_IOCTLS		    ((__u64)1 << _UFFDIO_REGISTER | (__u64)1 << _UFFDIO_UNREGISTER | (__u64)1 << _UFFDIO_API)
+#define UFFD_API_RANGE_IOCTLS	    ((__u64)1 << _UFFDIO_WAKE | (__u64)1 << _UFFDIO_COPY | (__u64)1 << _UFFDIO_ZEROPAGE)
+#define UFFD_API_RANGE_IOCTLS_BASIC ((__u64)1 << _UFFDIO_WAKE | (__u64)1 << _UFFDIO_COPY)
 
 /*
  * Valid ioctl command number range with this API is from 0x00 to
@@ -44,62 +33,56 @@
  * which ioctl the running kernel implements through the ioctl command
  * bitmask written by the UFFDIO_API.
  */
-#define _UFFDIO_REGISTER		(0x00)
-#define _UFFDIO_UNREGISTER		(0x01)
-#define _UFFDIO_WAKE			(0x02)
-#define _UFFDIO_COPY			(0x03)
-#define _UFFDIO_ZEROPAGE		(0x04)
-#define _UFFDIO_API			(0x3F)
+#define _UFFDIO_REGISTER   (0x00)
+#define _UFFDIO_UNREGISTER (0x01)
+#define _UFFDIO_WAKE	   (0x02)
+#define _UFFDIO_COPY	   (0x03)
+#define _UFFDIO_ZEROPAGE   (0x04)
+#define _UFFDIO_API	   (0x3F)
 
 /* userfaultfd ioctl ids */
-#define UFFDIO 0xAA
-#define UFFDIO_API		_IOWR(UFFDIO, _UFFDIO_API,	\
-				      struct uffdio_api)
-#define UFFDIO_REGISTER		_IOWR(UFFDIO, _UFFDIO_REGISTER, \
-				      struct uffdio_register)
-#define UFFDIO_UNREGISTER	_IOR(UFFDIO, _UFFDIO_UNREGISTER,	\
-				     struct uffdio_range)
-#define UFFDIO_WAKE		_IOR(UFFDIO, _UFFDIO_WAKE,	\
-				     struct uffdio_range)
-#define UFFDIO_COPY		_IOWR(UFFDIO, _UFFDIO_COPY,	\
-				      struct uffdio_copy)
-#define UFFDIO_ZEROPAGE		_IOWR(UFFDIO, _UFFDIO_ZEROPAGE,	\
-				      struct uffdio_zeropage)
+#define UFFDIO		  0xAA
+#define UFFDIO_API	  _IOWR(UFFDIO, _UFFDIO_API, struct uffdio_api)
+#define UFFDIO_REGISTER	  _IOWR(UFFDIO, _UFFDIO_REGISTER, struct uffdio_register)
+#define UFFDIO_UNREGISTER _IOR(UFFDIO, _UFFDIO_UNREGISTER, struct uffdio_range)
+#define UFFDIO_WAKE	  _IOR(UFFDIO, _UFFDIO_WAKE, struct uffdio_range)
+#define UFFDIO_COPY	  _IOWR(UFFDIO, _UFFDIO_COPY, struct uffdio_copy)
+#define UFFDIO_ZEROPAGE	  _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, struct uffdio_zeropage)
 
 /* read() structure */
 struct uffd_msg {
-	__u8	event;
+	__u8 event;
 
-	__u8	reserved1;
-	__u16	reserved2;
-	__u32	reserved3;
+	__u8 reserved1;
+	__u16 reserved2;
+	__u32 reserved3;
 
 	union {
 		struct {
-			__u64	flags;
-			__u64	address;
+			__u64 flags;
+			__u64 address;
 		} pagefault;
 
 		struct {
-			__u32	ufd;
+			__u32 ufd;
 		} fork;
 
 		struct {
-			__u64	from;
-			__u64	to;
-			__u64	len;
+			__u64 from;
+			__u64 to;
+			__u64 len;
 		} remap;
 
 		struct {
-			__u64	start;
-			__u64	end;
+			__u64 start;
+			__u64 end;
 		} remove;
 
 		struct {
 			/* unused reserved fields */
-			__u64	reserved1;
-			__u64	reserved2;
-			__u64	reserved3;
+			__u64 reserved1;
+			__u64 reserved2;
+			__u64 reserved3;
 		} reserved;
 	} arg;
 } __packed;
@@ -107,15 +90,15 @@ struct uffd_msg {
 /*
  * Start at 0x12 and not at 0 to be more strict against bugs.
  */
-#define UFFD_EVENT_PAGEFAULT	0x12
-#define UFFD_EVENT_FORK		0x13
-#define UFFD_EVENT_REMAP	0x14
-#define UFFD_EVENT_REMOVE	0x15
-#define UFFD_EVENT_UNMAP	0x16
+#define UFFD_EVENT_PAGEFAULT 0x12
+#define UFFD_EVENT_FORK	     0x13
+#define UFFD_EVENT_REMAP     0x14
+#define UFFD_EVENT_REMOVE    0x15
+#define UFFD_EVENT_UNMAP     0x16
 
 /* flags for UFFD_EVENT_PAGEFAULT */
-#define UFFD_PAGEFAULT_FLAG_WRITE	(1<<0)	/* If this was a write fault */
-#define UFFD_PAGEFAULT_FLAG_WP		(1<<1)	/* If reason is VM_UFFD_WP */
+#define UFFD_PAGEFAULT_FLAG_WRITE (1 << 0) /* If this was a write fault */
+#define UFFD_PAGEFAULT_FLAG_WP	  (1 << 1) /* If reason is VM_UFFD_WP */
 
 struct uffdio_api {
 	/* userland asks for an API number and the features to enable */
@@ -154,13 +137,13 @@ struct uffdio_api {
 	 * UFFD_FEATURE_MISSING_HUGETLBFS, but it applies to shmem
 	 * (i.e. tmpfs and other shmem based APIs).
 	 */
-#define UFFD_FEATURE_PAGEFAULT_FLAG_WP		(1<<0)
-#define UFFD_FEATURE_EVENT_FORK			(1<<1)
-#define UFFD_FEATURE_EVENT_REMAP		(1<<2)
-#define UFFD_FEATURE_EVENT_REMOVE		(1<<3)
-#define UFFD_FEATURE_MISSING_HUGETLBFS		(1<<4)
-#define UFFD_FEATURE_MISSING_SHMEM		(1<<5)
-#define UFFD_FEATURE_EVENT_UNMAP		(1<<6)
+#define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1 << 0)
+#define UFFD_FEATURE_EVENT_FORK	       (1 << 1)
+#define UFFD_FEATURE_EVENT_REMAP       (1 << 2)
+#define UFFD_FEATURE_EVENT_REMOVE      (1 << 3)
+#define UFFD_FEATURE_MISSING_HUGETLBFS (1 << 4)
+#define UFFD_FEATURE_MISSING_SHMEM     (1 << 5)
+#define UFFD_FEATURE_EVENT_UNMAP       (1 << 6)
 	__u64 features;
 
 	__u64 ioctls;
@@ -173,8 +156,8 @@ struct uffdio_range {
 
 struct uffdio_register {
 	struct uffdio_range range;
-#define UFFDIO_REGISTER_MODE_MISSING	((__u64)1<<0)
-#define UFFDIO_REGISTER_MODE_WP		((__u64)1<<1)
+#define UFFDIO_REGISTER_MODE_MISSING ((__u64)1 << 0)
+#define UFFDIO_REGISTER_MODE_WP	     ((__u64)1 << 1)
 	__u64 mode;
 
 	/*
@@ -194,7 +177,7 @@ struct uffdio_copy {
 	 * available if the wrprotection ioctl are implemented for the
 	 * range according to the uffdio_register.ioctls.
 	 */
-#define UFFDIO_COPY_MODE_DONTWAKE		((__u64)1<<0)
+#define UFFDIO_COPY_MODE_DONTWAKE ((__u64)1 << 0)
 	__u64 mode;
 
 	/*
@@ -206,7 +189,7 @@ struct uffdio_copy {
 
 struct uffdio_zeropage {
 	struct uffdio_range range;
-#define UFFDIO_ZEROPAGE_MODE_DONTWAKE		((__u64)1<<0)
+#define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64)1 << 0)
 	__u64 mode;
 
 	/*
diff --git a/criu/include/log.h b/criu/include/log.h
index 58d012337..85e6dc2e7 100644
--- a/criu/include/log.h
+++ b/criu/include/log.h
@@ -11,71 +11,54 @@
 
 #endif /* CR_NOGLIBC */
 
-#define LOG_UNSET	(-1)
-#define LOG_MSG		(0) /* Print message regardless of log level */
-#define LOG_ERROR	(1) /* Errors only, when we're in trouble */
-#define LOG_WARN	(2) /* Warnings, dazen and confused but trying to continue */
-#define LOG_INFO	(3) /* Informative, everything is fine */
-#define LOG_DEBUG	(4) /* Debug only */
+#define LOG_UNSET (-1)
+#define LOG_MSG	  (0) /* Print message regardless of log level */
+#define LOG_ERROR (1) /* Errors only, when we're in trouble */
+#define LOG_WARN  (2) /* Warnings, dazen and confused but trying to continue */
+#define LOG_INFO  (3) /* Informative, everything is fine */
+#define LOG_DEBUG (4) /* Debug only */
 
-#define DEFAULT_LOGLEVEL	LOG_WARN
+#define DEFAULT_LOGLEVEL LOG_WARN
 
 /*
  * This is low-level printing helper, try hard not to use it directly
  * and use the pr_foo() helpers below.
  */
 extern void print_on_level(unsigned int loglevel, const char *format, ...)
-	__attribute__ ((__format__ (__printf__, 2, 3)));
+	__attribute__((__format__(__printf__, 2, 3)));
 
 #ifndef LOG_PREFIX
-# define LOG_PREFIX
+#define LOG_PREFIX
 #endif
 
 void flush_early_log_buffer(int fd);
 
-#define print_once(loglevel, fmt, ...)					\
-	do {								\
-		static bool __printed;					\
-		if (!__printed) {					\
-			print_on_level(loglevel, fmt, ##__VA_ARGS__);	\
-			__printed = 1;					\
-		}							\
+#define print_once(loglevel, fmt, ...)                                \
+	do {                                                          \
+		static bool __printed;                                \
+		if (!__printed) {                                     \
+			print_on_level(loglevel, fmt, ##__VA_ARGS__); \
+			__printed = 1;                                \
+		}                                                     \
 	} while (0)
 
-#define pr_msg(fmt, ...)						\
-	print_on_level(LOG_MSG,						\
-		       fmt, ##__VA_ARGS__)
+#define pr_msg(fmt, ...) print_on_level(LOG_MSG, fmt, ##__VA_ARGS__)
 
-#define pr_info(fmt, ...)						\
-	print_on_level(LOG_INFO,					\
-		       LOG_PREFIX fmt, ##__VA_ARGS__)
+#define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
 
-#define pr_err(fmt, ...)						\
-	print_on_level(LOG_ERROR,					\
-		       "Error (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+#define pr_err(fmt, ...) print_on_level(LOG_ERROR, "Error (%s:%d): " LOG_PREFIX fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 
-#define pr_err_once(fmt, ...)						\
-	print_once(LOG_ERROR, fmt, ##__VA_ARGS__)
+#define pr_err_once(fmt, ...) print_once(LOG_ERROR, fmt, ##__VA_ARGS__)
 
-#define pr_warn(fmt, ...)						\
-	print_on_level(LOG_WARN,					\
-		       "Warn  (%s:%d): " LOG_PREFIX fmt,		\
-		       __FILE__, __LINE__, ##__VA_ARGS__)
+#define pr_warn(fmt, ...) print_on_level(LOG_WARN, "Warn  (%s:%d): " LOG_PREFIX fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 
-#define pr_warn_once(fmt, ...)						\
-       print_once(LOG_WARN,						\
-			"Warn  (%s:%d): " LOG_PREFIX fmt,		\
-			__FILE__, __LINE__, ##__VA_ARGS__)
+#define pr_warn_once(fmt, ...) print_once(LOG_WARN, "Warn  (%s:%d): " LOG_PREFIX fmt, __FILE__, __LINE__, ##__VA_ARGS__)
 
-#define pr_debug(fmt, ...)						\
-	print_on_level(LOG_DEBUG,					\
-		       LOG_PREFIX fmt, ##__VA_ARGS__)
+#define pr_debug(fmt, ...) print_on_level(LOG_DEBUG, LOG_PREFIX fmt, ##__VA_ARGS__)
 
 #ifndef CR_NOGLIBC
 
-#define pr_perror(fmt, ...)						\
-	pr_err(fmt ": %s\n", ##__VA_ARGS__, strerror(errno))
+#define pr_perror(fmt, ...) pr_err(fmt ": %s\n", ##__VA_ARGS__, strerror(errno))
 
 #endif /* CR_NOGLIBC */
 
diff --git a/criu/include/lsm.h b/criu/include/lsm.h
index a41915a4c..0004caafb 100644
--- a/criu/include/lsm.h
+++ b/criu/include/lsm.h
@@ -41,13 +41,16 @@ int dump_xattr_security_selinux(int fd, FdinfoEntry *e);
 int run_setsockcreatecon(FdinfoEntry *e);
 int reset_setsockcreatecon(void);
 #else
-static inline int dump_xattr_security_selinux(int fd, FdinfoEntry *e) {
+static inline int dump_xattr_security_selinux(int fd, FdinfoEntry *e)
+{
 	return 0;
 }
-static inline int run_setsockcreatecon(FdinfoEntry *e) {
+static inline int run_setsockcreatecon(FdinfoEntry *e)
+{
 	return 0;
 }
-static inline int reset_setsockcreatecon(void) {
+static inline int reset_setsockcreatecon(void)
+{
 	return 0;
 }
 #endif
diff --git a/criu/include/magic.h b/criu/include/magic.h
index ec87c82bf..50e3b6b35 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -5,127 +5,127 @@
  * Basic multi-file images
  */
 
-#define CRTOOLS_IMAGES_V1	1
+#define CRTOOLS_IMAGES_V1 1
 /*
  * v1.1 has common magic in the head of each image file,
  * except for inventory
  */
-#define CRTOOLS_IMAGES_V1_1	2
+#define CRTOOLS_IMAGES_V1_1 2
 
 /*
  * Raw images are images in which data is stored in some
  * non-crtool format (ip tool dumps, tarballs, etc.)
  */
 
-#define RAW_IMAGE_MAGIC		0x0
+#define RAW_IMAGE_MAGIC 0x0
 
 /*
  * Images have the IMG_COMMON_MAGIC in the head. Service files
  * such as stats and irmap-cache have the IMG_SERVICE_MAGIC.
  */
 
-#define IMG_COMMON_MAGIC	0x54564319 /* Sarov (a.k.a. Arzamas-16) */
-#define IMG_SERVICE_MAGIC	0x55105940 /* Zlatoust */
+#define IMG_COMMON_MAGIC  0x54564319 /* Sarov (a.k.a. Arzamas-16) */
+#define IMG_SERVICE_MAGIC 0x55105940 /* Zlatoust */
 
 /*
  * The magic-s below correspond to coordinates
  * of various Russian towns in the NNNNEEEE form.
  */
 
-#define INVENTORY_MAGIC		0x58313116 /* Veliky Novgorod */
-#define PSTREE_MAGIC		0x50273030 /* Kyiv */
-#define FDINFO_MAGIC		0x56213732 /* Dmitrov */
-#define PAGEMAP_MAGIC		0x56084025 /* Vladimir */
-#define SHMEM_PAGEMAP_MAGIC	PAGEMAP_MAGIC
-#define PAGES_MAGIC		RAW_IMAGE_MAGIC
-#define CORE_MAGIC		0x55053847 /* Kolomna */
-#define IDS_MAGIC		0x54432030 /* Konigsberg */
-#define VMAS_MAGIC		0x54123737 /* Tula */
-#define PIPES_MAGIC		0x56513555 /* Tver */
-#define PIPES_DATA_MAGIC	0x56453709 /* Dubna */
-#define FIFO_MAGIC		0x58364939 /* Kirov */
-#define FIFO_DATA_MAGIC		0x59333054 /* Tosno */
-#define SIGACT_MAGIC		0x55344201 /* Murom */
-#define UNIXSK_MAGIC		0x54373943 /* Ryazan */
-#define INETSK_MAGIC		0x56443851 /* Pereslavl */
-#define PACKETSK_MAGIC		0x60454618 /* Veliky Ustyug */
-#define ITIMERS_MAGIC		0x57464056 /* Kostroma */
-#define POSIX_TIMERS_MAGIC	0x52603957 /* Lipetsk */
-#define SK_QUEUES_MAGIC		0x56264026 /* Suzdal */
-#define UTSNS_MAGIC		0x54473203 /* Smolensk */
-#define CREDS_MAGIC		0x54023547 /* Kozelsk */
-#define IPC_VAR_MAGIC		0x53115007 /* Samara */
-#define IPCNS_SHM_MAGIC		0x46283044 /* Odessa */
-#define IPCNS_MSG_MAGIC		0x55453737 /* Moscow */
-#define IPCNS_SEM_MAGIC		0x59573019 /* St. Petersburg */
-#define REG_FILES_MAGIC		0x50363636 /* Belgorod */
-#define EXT_FILES_MAGIC		0x59255641 /* Usolye */
-#define FS_MAGIC		0x51403912 /* Voronezh */
-#define MM_MAGIC		0x57492820 /* Pskov */
-#define REMAP_FPATH_MAGIC	0x59133954 /* Vologda */
-#define GHOST_FILE_MAGIC	0x52583605 /* Oryol */
-#define TCP_STREAM_MAGIC	0x51465506 /* Orenburg */
-#define EVENTFD_FILE_MAGIC	0x44523722 /* Anapa */
-#define EVENTPOLL_FILE_MAGIC	0x45023858 /* Krasnodar */
-#define EVENTPOLL_TFD_MAGIC	0x44433746 /* Novorossiysk */
-#define SIGNALFD_MAGIC		0x57323820 /* Uglich */
-#define INOTIFY_FILE_MAGIC	0x48424431 /* Volgograd */
-#define INOTIFY_WD_MAGIC	0x54562009 /* Svetlogorsk (Rauschen) */
-#define MNTS_MAGIC		0x55563928 /* Petushki */
-#define NETDEV_MAGIC		0x57373951 /* Yaroslavl */
-#define NETNS_MAGIC		0x55933752 /* Dolgoprudny */
-#define TTY_FILES_MAGIC		0x59433025 /* Pushkin */
-#define TTY_INFO_MAGIC		0x59453036 /* Kolpino */
-#define TTY_DATA_MAGIC		0x59413026 /* Pavlovsk */
-#define FILE_LOCKS_MAGIC	0x54323616 /* Kaluga */
-#define RLIMIT_MAGIC		0x57113925 /* Rostov */
-#define FANOTIFY_FILE_MAGIC	0x55096122 /* Chelyabinsk */
-#define FANOTIFY_MARK_MAGIC	0x56506035 /* Yekaterinburg */
-#define SIGNAL_MAGIC		0x59255647 /* Berezniki */
-#define PSIGNAL_MAGIC		SIGNAL_MAGIC
-#define NETLINK_SK_MAGIC	0x58005614 /* Perm */
-#define NS_FILES_MAGIC		0x61394011 /* Nyandoma */
-#define TUNFILE_MAGIC		0x57143751 /* Kalyazin */
-#define CGROUP_MAGIC		0x59383330 /* Tikhvin */
-#define TIMERFD_MAGIC		0x50493712 /* Korocha */
-#define CPUINFO_MAGIC		0x61404013 /* Nyandoma */
-#define USERNS_MAGIC		0x55474906 /* Kazan */
-#define SECCOMP_MAGIC		0x64413049 /* Kostomuksha */
-#define BINFMT_MISC_MAGIC	0x67343323 /* Apatity */
-#define AUTOFS_MAGIC		0x49353943 /* Sochi */
-#define FILES_MAGIC		0x56303138 /* Toropets */
-#define MEMFD_INODE_MAGIC	0x48453499 /* Dnipro */
-#define TIMENS_MAGIC		0x43114433 /* Beslan */
-#define PIDNS_MAGIC		0x61157326 /* Surgut */
-#define BPFMAP_FILE_MAGIC	0x57506142 /* Alapayevsk */
-#define BPFMAP_DATA_MAGIC	0x64324033 /* Arkhangelsk */
+#define INVENTORY_MAGIC	     0x58313116 /* Veliky Novgorod */
+#define PSTREE_MAGIC	     0x50273030 /* Kyiv */
+#define FDINFO_MAGIC	     0x56213732 /* Dmitrov */
+#define PAGEMAP_MAGIC	     0x56084025 /* Vladimir */
+#define SHMEM_PAGEMAP_MAGIC  PAGEMAP_MAGIC
+#define PAGES_MAGIC	     RAW_IMAGE_MAGIC
+#define CORE_MAGIC	     0x55053847 /* Kolomna */
+#define IDS_MAGIC	     0x54432030 /* Konigsberg */
+#define VMAS_MAGIC	     0x54123737 /* Tula */
+#define PIPES_MAGIC	     0x56513555 /* Tver */
+#define PIPES_DATA_MAGIC     0x56453709 /* Dubna */
+#define FIFO_MAGIC	     0x58364939 /* Kirov */
+#define FIFO_DATA_MAGIC	     0x59333054 /* Tosno */
+#define SIGACT_MAGIC	     0x55344201 /* Murom */
+#define UNIXSK_MAGIC	     0x54373943 /* Ryazan */
+#define INETSK_MAGIC	     0x56443851 /* Pereslavl */
+#define PACKETSK_MAGIC	     0x60454618 /* Veliky Ustyug */
+#define ITIMERS_MAGIC	     0x57464056 /* Kostroma */
+#define POSIX_TIMERS_MAGIC   0x52603957 /* Lipetsk */
+#define SK_QUEUES_MAGIC	     0x56264026 /* Suzdal */
+#define UTSNS_MAGIC	     0x54473203 /* Smolensk */
+#define CREDS_MAGIC	     0x54023547 /* Kozelsk */
+#define IPC_VAR_MAGIC	     0x53115007 /* Samara */
+#define IPCNS_SHM_MAGIC	     0x46283044 /* Odessa */
+#define IPCNS_MSG_MAGIC	     0x55453737 /* Moscow */
+#define IPCNS_SEM_MAGIC	     0x59573019 /* St. Petersburg */
+#define REG_FILES_MAGIC	     0x50363636 /* Belgorod */
+#define EXT_FILES_MAGIC	     0x59255641 /* Usolye */
+#define FS_MAGIC	     0x51403912 /* Voronezh */
+#define MM_MAGIC	     0x57492820 /* Pskov */
+#define REMAP_FPATH_MAGIC    0x59133954 /* Vologda */
+#define GHOST_FILE_MAGIC     0x52583605 /* Oryol */
+#define TCP_STREAM_MAGIC     0x51465506 /* Orenburg */
+#define EVENTFD_FILE_MAGIC   0x44523722 /* Anapa */
+#define EVENTPOLL_FILE_MAGIC 0x45023858 /* Krasnodar */
+#define EVENTPOLL_TFD_MAGIC  0x44433746 /* Novorossiysk */
+#define SIGNALFD_MAGIC	     0x57323820 /* Uglich */
+#define INOTIFY_FILE_MAGIC   0x48424431 /* Volgograd */
+#define INOTIFY_WD_MAGIC     0x54562009 /* Svetlogorsk (Rauschen) */
+#define MNTS_MAGIC	     0x55563928 /* Petushki */
+#define NETDEV_MAGIC	     0x57373951 /* Yaroslavl */
+#define NETNS_MAGIC	     0x55933752 /* Dolgoprudny */
+#define TTY_FILES_MAGIC	     0x59433025 /* Pushkin */
+#define TTY_INFO_MAGIC	     0x59453036 /* Kolpino */
+#define TTY_DATA_MAGIC	     0x59413026 /* Pavlovsk */
+#define FILE_LOCKS_MAGIC     0x54323616 /* Kaluga */
+#define RLIMIT_MAGIC	     0x57113925 /* Rostov */
+#define FANOTIFY_FILE_MAGIC  0x55096122 /* Chelyabinsk */
+#define FANOTIFY_MARK_MAGIC  0x56506035 /* Yekaterinburg */
+#define SIGNAL_MAGIC	     0x59255647 /* Berezniki */
+#define PSIGNAL_MAGIC	     SIGNAL_MAGIC
+#define NETLINK_SK_MAGIC     0x58005614 /* Perm */
+#define NS_FILES_MAGIC	     0x61394011 /* Nyandoma */
+#define TUNFILE_MAGIC	     0x57143751 /* Kalyazin */
+#define CGROUP_MAGIC	     0x59383330 /* Tikhvin */
+#define TIMERFD_MAGIC	     0x50493712 /* Korocha */
+#define CPUINFO_MAGIC	     0x61404013 /* Nyandoma */
+#define USERNS_MAGIC	     0x55474906 /* Kazan */
+#define SECCOMP_MAGIC	     0x64413049 /* Kostomuksha */
+#define BINFMT_MISC_MAGIC    0x67343323 /* Apatity */
+#define AUTOFS_MAGIC	     0x49353943 /* Sochi */
+#define FILES_MAGIC	     0x56303138 /* Toropets */
+#define MEMFD_INODE_MAGIC    0x48453499 /* Dnipro */
+#define TIMENS_MAGIC	     0x43114433 /* Beslan */
+#define PIDNS_MAGIC	     0x61157326 /* Surgut */
+#define BPFMAP_FILE_MAGIC    0x57506142 /* Alapayevsk */
+#define BPFMAP_DATA_MAGIC    0x64324033 /* Arkhangelsk */
 
-#define IFADDR_MAGIC		RAW_IMAGE_MAGIC
-#define ROUTE_MAGIC		RAW_IMAGE_MAGIC
-#define ROUTE6_MAGIC		RAW_IMAGE_MAGIC
-#define RULE_MAGIC		RAW_IMAGE_MAGIC
-#define TMPFS_IMG_MAGIC		RAW_IMAGE_MAGIC
-#define TMPFS_DEV_MAGIC		RAW_IMAGE_MAGIC
-#define IPTABLES_MAGIC		RAW_IMAGE_MAGIC
-#define IP6TABLES_MAGIC		RAW_IMAGE_MAGIC
-#define NFTABLES_MAGIC		RAW_IMAGE_MAGIC
-#define NETNF_CT_MAGIC		RAW_IMAGE_MAGIC
-#define NETNF_EXP_MAGIC		RAW_IMAGE_MAGIC
+#define IFADDR_MAGIC	RAW_IMAGE_MAGIC
+#define ROUTE_MAGIC	RAW_IMAGE_MAGIC
+#define ROUTE6_MAGIC	RAW_IMAGE_MAGIC
+#define RULE_MAGIC	RAW_IMAGE_MAGIC
+#define TMPFS_IMG_MAGIC RAW_IMAGE_MAGIC
+#define TMPFS_DEV_MAGIC RAW_IMAGE_MAGIC
+#define IPTABLES_MAGIC	RAW_IMAGE_MAGIC
+#define IP6TABLES_MAGIC RAW_IMAGE_MAGIC
+#define NFTABLES_MAGIC	RAW_IMAGE_MAGIC
+#define NETNF_CT_MAGIC	RAW_IMAGE_MAGIC
+#define NETNF_EXP_MAGIC RAW_IMAGE_MAGIC
 
-#define PAGES_OLD_MAGIC		PAGEMAP_MAGIC
-#define SHM_PAGES_OLD_MAGIC	PAGEMAP_MAGIC
-#define BINFMT_MISC_OLD_MAGIC	BINFMT_MISC_MAGIC
+#define PAGES_OLD_MAGIC	      PAGEMAP_MAGIC
+#define SHM_PAGES_OLD_MAGIC   PAGEMAP_MAGIC
+#define BINFMT_MISC_OLD_MAGIC BINFMT_MISC_MAGIC
 
 /*
  * These are special files, not exactly images
  */
-#define STATS_MAGIC		0x57093306 /* Ostashkov */
-#define IRMAP_CACHE_MAGIC	0x57004059 /* Ivanovo */
+#define STATS_MAGIC	  0x57093306 /* Ostashkov */
+#define IRMAP_CACHE_MAGIC 0x57004059 /* Ivanovo */
 
 /*
  * Main magic for kerndat_s structure.
  */
 
-#define KDAT_MAGIC		0x57023458 /* Torzhok */
+#define KDAT_MAGIC 0x57023458 /* Torzhok */
 
 #endif /* __CR_MAGIC_H__ */
diff --git a/criu/include/mem.h b/criu/include/mem.h
index 251cb1a9e..03574ea3d 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -15,10 +15,10 @@ struct pstree_item;
 struct vma_area;
 
 struct mem_dump_ctl {
-	bool			pre_dump;
-	bool			lazy;
-	struct proc_pid_stat	*stat;
-	InventoryEntry		*parent_ie;
+	bool pre_dump;
+	bool lazy;
+	struct proc_pid_stat *stat;
+	InventoryEntry *parent_ie;
 };
 
 extern bool vma_has_guard_gap_hidden(struct vma_area *vma);
@@ -28,21 +28,19 @@ extern int prepare_mm_pid(struct pstree_item *i);
 extern void prepare_cow_vmas(void);
 extern int do_task_reset_dirty_track(int pid);
 extern unsigned long dump_pages_args_size(struct vm_area_list *vmas);
-extern int parasite_dump_pages_seized(struct pstree_item *item,
-				      struct vm_area_list *vma_area_list,
-				      struct mem_dump_ctl *mdc,
-				      struct parasite_ctl *ctl);
+extern int parasite_dump_pages_seized(struct pstree_item *item, struct vm_area_list *vma_area_list,
+				      struct mem_dump_ctl *mdc, struct parasite_ctl *ctl);
 
-#define PME_PRESENT		(1ULL << 63)
-#define PME_SWAP		(1ULL << 62)
-#define PME_FILE		(1ULL << 61)
-#define PME_SOFT_DIRTY		(1ULL << 55)
-#define PME_PSHIFT_BITS		(6)
-#define PME_STATUS_BITS		(3)
-#define PME_STATUS_OFFSET	(64 - PME_STATUS_BITS)
-#define PME_PSHIFT_OFFSET	(PME_STATUS_OFFSET - PME_PSHIFT_BITS)
-#define PME_PFRAME_MASK		((1ULL << PME_PSHIFT_OFFSET) - 1)
-#define PME_PFRAME(x)		((x) & PME_PFRAME_MASK)
+#define PME_PRESENT	  (1ULL << 63)
+#define PME_SWAP	  (1ULL << 62)
+#define PME_FILE	  (1ULL << 61)
+#define PME_SOFT_DIRTY	  (1ULL << 55)
+#define PME_PSHIFT_BITS	  (6)
+#define PME_STATUS_BITS	  (3)
+#define PME_STATUS_OFFSET (64 - PME_STATUS_BITS)
+#define PME_PSHIFT_OFFSET (PME_STATUS_OFFSET - PME_PSHIFT_BITS)
+#define PME_PFRAME_MASK	  ((1ULL << PME_PSHIFT_OFFSET) - 1)
+#define PME_PFRAME(x)	  ((x)&PME_PFRAME_MASK)
 
 struct task_restore_args;
 int open_vmas(struct pstree_item *t);
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
index 3074a5c0f..1b1dc79bb 100644
--- a/criu/include/memfd.h
+++ b/criu/include/memfd.h
@@ -20,10 +20,10 @@ extern int apply_memfd_seals(void);
 extern int prepare_memfd_inodes(void);
 
 #ifdef CONFIG_HAS_MEMFD_CREATE
-# include <sys/mman.h>
+#include <sys/mman.h>
 #else
-# include <sys/syscall.h>
-# include <linux/memfd.h>
+#include <sys/syscall.h>
+#include <linux/memfd.h>
 static inline int memfd_create(const char *name, unsigned int flags)
 {
 	return syscall(SYS_memfd_create, name, flags);
diff --git a/criu/include/mman.h b/criu/include/mman.h
index 340d36927..8ca71fadf 100644
--- a/criu/include/mman.h
+++ b/criu/include/mman.h
@@ -2,16 +2,16 @@
 #define __CR_MMAN_H__
 
 #ifndef MAP_HUGETLB
-# define MAP_HUGETLB		0x40000
+#define MAP_HUGETLB 0x40000
 #endif
 #ifndef MADV_HUGEPAGE
-# define MADV_HUGEPAGE		14
+#define MADV_HUGEPAGE 14
 #endif
 #ifndef MADV_NOHUGEPAGE
-# define MADV_NOHUGEPAGE	15
+#define MADV_NOHUGEPAGE 15
 #endif
 #ifndef MADV_DONTDUMP
-# define MADV_DONTDUMP		16
+#define MADV_DONTDUMP 16
 #endif
 
 #endif /* __CR_MMAN_H__ */
diff --git a/criu/include/mount.h b/criu/include/mount.h
index d204e40d6..29d80c2a7 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -10,7 +10,7 @@ struct pstree_item;
 struct fstype;
 struct ns_id;
 
-#define MOUNT_INVALID_DEV	(0)
+#define MOUNT_INVALID_DEV (0)
 
 #define MNT_UNREACHABLE INT_MIN
 
@@ -27,11 +27,11 @@ struct ns_id;
 #define REMOUNTED_RW_SERVICE 2
 
 struct mount_info {
-	int			mnt_id;
-	int			parent_mnt_id;
-	unsigned int		s_dev;
-	unsigned int		s_dev_rt;
-	char			*root;
+	int mnt_id;
+	int parent_mnt_id;
+	unsigned int s_dev;
+	unsigned int s_dev_rt;
+	char *root;
 	/*
 	 * During dump mountpoint contains path with dot at the
 	 * beginning. It allows to use openat, statat, etc without
@@ -42,51 +42,51 @@ struct mount_info {
 	 * mount tree is constructed. Check mnt_roots for details.
 	 * The ns_mountpoint contains path w/o this prefix.
 	 */
-	char			*mountpoint;
-	char			*ns_mountpoint;
-	int			fd;
-	unsigned		flags;
-	unsigned		sb_flags;
-	int			master_id;
-	int			shared_id;
-	struct fstype		*fstype;
-	char			*source;
-	char			*options;
-	char			*fsname;
+	char *mountpoint;
+	char *ns_mountpoint;
+	int fd;
+	unsigned flags;
+	unsigned sb_flags;
+	int master_id;
+	int shared_id;
+	struct fstype *fstype;
+	char *source;
+	char *options;
+	char *fsname;
 	union {
-		bool		mounted;
-		bool		dumped;
+		bool mounted;
+		bool dumped;
 	};
-	bool			need_plugin;
-	bool			is_ns_root;
-	bool			deleted;
-	struct mount_info	*next;
-	struct ns_id		*nsid;
+	bool need_plugin;
+	bool is_ns_root;
+	bool deleted;
+	struct mount_info *next;
+	struct ns_id *nsid;
 
-	char			*external;
-	bool			internal_sharing;
+	char *external;
+	bool internal_sharing;
 
 	/* tree linkage */
-	struct mount_info	*parent;
-	struct mount_info	*bind;
-	struct list_head	children;
-	struct list_head	siblings;
+	struct mount_info *parent;
+	struct mount_info *bind;
+	struct list_head children;
+	struct list_head siblings;
 
-	struct list_head	mnt_bind;	/* circular list of derivatives of one real mount */
-	struct list_head	mnt_share;	/* circular list of shared mounts */
-	struct list_head	mnt_slave_list;	/* list of slave mounts */
-	struct list_head	mnt_slave;	/* slave list entry */
-	struct mount_info	*mnt_master;	/* slave is on master->mnt_slave_list */
-	struct list_head	mnt_propagate;	/* circular list of mounts which propagate from each other */
-	struct list_head	mnt_notprop;	/* temporary list used in can_mount_now */
-	struct list_head	mnt_unbindable;	/* list of mounts with delayed unbindable */
+	struct list_head mnt_bind; /* circular list of derivatives of one real mount */
+	struct list_head mnt_share; /* circular list of shared mounts */
+	struct list_head mnt_slave_list; /* list of slave mounts */
+	struct list_head mnt_slave; /* slave list entry */
+	struct mount_info *mnt_master; /* slave is on master->mnt_slave_list */
+	struct list_head mnt_propagate; /* circular list of mounts which propagate from each other */
+	struct list_head mnt_notprop; /* temporary list used in can_mount_now */
+	struct list_head mnt_unbindable; /* list of mounts with delayed unbindable */
 
-	struct list_head	postpone;
+	struct list_head postpone;
 
-	int			is_overmounted;
-	int			remounted_rw;
+	int is_overmounted;
+	int remounted_rw;
 
-	void			*private;	/* associated filesystem data */
+	void *private; /* associated filesystem data */
 };
 
 extern struct mount_info *mntinfo;
@@ -94,7 +94,10 @@ extern struct ns_desc mnt_ns_desc;
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 extern int collect_binfmt_misc(void);
 #else
-static inline int collect_binfmt_misc(void) { return 0; }
+static inline int collect_binfmt_misc(void)
+{
+	return 0;
+}
 #endif
 
 extern struct mount_info *mnt_entry_alloc(void);
@@ -115,14 +118,12 @@ extern int prepare_mnt_ns(void);
 
 extern int pivot_root(const char *new_root, const char *put_old);
 
-extern struct mount_info *lookup_overlayfs(char *rpath, unsigned int s_dev,
-					   unsigned int st_ino, unsigned int mnt_id);
+extern struct mount_info *lookup_overlayfs(char *rpath, unsigned int s_dev, unsigned int st_ino, unsigned int mnt_id);
 extern struct mount_info *lookup_mnt_id(unsigned int id);
 extern struct mount_info *lookup_mnt_sdev(unsigned int s_dev);
 
 extern dev_t phys_stat_resolve_dev(struct ns_id *, dev_t st_dev, const char *path);
-extern bool phys_stat_dev_match(dev_t st_dev, dev_t phys_dev,
-				struct ns_id *, const char *path);
+extern bool phys_stat_dev_match(dev_t st_dev, dev_t phys_dev, struct ns_id *, const char *path);
 
 extern int restore_task_mnt_ns(struct pstree_item *current);
 extern void fini_restore_mntns(void);
diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index e570aa0ab..ddf0dbabb 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -7,67 +7,67 @@
 #include "images/netdev.pb-c.h"
 
 #ifndef CLONE_NEWNS
-#define CLONE_NEWNS	0x00020000
+#define CLONE_NEWNS 0x00020000
 #endif
 
 #ifndef CLONE_NEWPID
-#define CLONE_NEWPID	0x20000000
+#define CLONE_NEWPID 0x20000000
 #endif
 
 #ifndef CLONE_NEWUTS
-#define CLONE_NEWUTS	0x04000000
+#define CLONE_NEWUTS 0x04000000
 #endif
 
 #ifndef CLONE_NEWIPC
-#define CLONE_NEWIPC	0x08000000
+#define CLONE_NEWIPC 0x08000000
 #endif
 
 #ifndef CLONE_NEWNET
-#define CLONE_NEWNET	0x40000000
+#define CLONE_NEWNET 0x40000000
 #endif
 
 #ifndef CLONE_NEWUSER
-#define CLONE_NEWUSER	0x10000000
+#define CLONE_NEWUSER 0x10000000
 #endif
 
 #ifndef CLONE_NEWCGROUP
-#define CLONE_NEWCGROUP	0x02000000
+#define CLONE_NEWCGROUP 0x02000000
 #endif
 
 #ifndef CLONE_NEWTIME
-#define CLONE_NEWTIME   0x00000080
+#define CLONE_NEWTIME 0x00000080
 #endif
 
-#define CLONE_ALLNS	(CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | \
-			 CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER | \
-			 CLONE_NEWCGROUP | CLONE_NEWTIME)
+#define CLONE_ALLNS                                                                                                  \
+	(CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWUTS | CLONE_NEWNS | CLONE_NEWUSER | CLONE_NEWCGROUP | \
+	 CLONE_NEWTIME)
 
 /* Nested namespaces are supported only for these types */
-#define CLONE_SUBNS	(CLONE_NEWNS | CLONE_NEWNET)
+#define CLONE_SUBNS (CLONE_NEWNS | CLONE_NEWNET)
 
-#define EXTRA_SIZE	20
+#define EXTRA_SIZE 20
 
 struct ns_desc {
-	unsigned int	cflag;
-	char		*str;
-	size_t		len;
+	unsigned int cflag;
+	char *str;
+	size_t len;
 };
 
 struct user_ns_extra {
-	char	*uid;
-	char	*gid;
+	char *uid;
+	char *gid;
 };
 
 /* struct join_ns is used for storing parameters specified by --join-ns */
 struct join_ns {
-	struct list_head	list;
-	char			*ns_file;
-	struct ns_desc		*nd;	/* namespace descriptor */
-	int			ns_fd;
+	struct list_head list;
+	char *ns_file;
+	struct ns_desc *nd; /* namespace descriptor */
+	int ns_fd;
 	/* extra options of --join-ns, like uid&gid in user namespace */
 	union {
-		struct user_ns_extra	user_extra;
-		char			*common_extra;
+		struct user_ns_extra user_extra;
+		char *common_extra;
 	} extra_opts;
 };
 
@@ -79,15 +79,15 @@ enum ns_type {
 };
 
 struct netns_id {
-	unsigned		target_ns_id;
-	unsigned		netnsid_value;
-	struct list_head	node;
+	unsigned target_ns_id;
+	unsigned netnsid_value;
+	struct list_head node;
 };
 
 struct net_link {
-	NetDeviceEntry		*nde;
-	bool			created;
-	struct list_head	node;
+	NetDeviceEntry *nde;
+	bool created;
+	struct list_head node;
 };
 
 struct ns_id {
@@ -116,7 +116,6 @@ struct ns_id {
 		} mnt;
 
 		struct {
-
 			/*
 			 * ns_fd is used when network namespaces are being
 			 * restored. On this stage we access these file
@@ -128,11 +127,11 @@ struct ns_id {
 			 * with restored file descriptors.
 			 */
 			union {
-				int nsfd_id;	/* a namespace descriptor id in fdstore */
-				int ns_fd;	/* a namespace file descriptor */
+				int nsfd_id; /* a namespace descriptor id in fdstore */
+				int ns_fd; /* a namespace file descriptor */
 			};
-			int nlsk;	/* for sockets collection */
-			int seqsk;	/* to talk to parasite daemons */
+			int nlsk; /* for sockets collection */
+			int seqsk; /* to talk to parasite daemons */
 			struct list_head ids;
 			struct list_head links;
 			NetnsEntry *netns;
@@ -141,11 +140,9 @@ struct ns_id {
 };
 extern struct ns_id *ns_ids;
 
-#define NS_DESC_ENTRY(_cflag, _str)			\
-	{						\
-		.cflag		= _cflag,		\
-		.str		= _str,			\
-		.len		= sizeof(_str) - 1,	\
+#define NS_DESC_ENTRY(_cflag, _str)                                    \
+	{                                                              \
+		.cflag = _cflag, .str = _str, .len = sizeof(_str) - 1, \
 	}
 
 extern bool check_ns_proc(struct fd_link *link);
@@ -197,12 +194,12 @@ typedef int (*uns_call_t)(void *arg, int fd, pid_t pid);
  * W/o flag the call is synchronous -- this function returns
  * strictly after the call finishes.
  */
-#define UNS_ASYNC	0x1
+#define UNS_ASYNC 0x1
 /*
  * The call returns an FD which should be sent back. Conflicts
  * with UNS_ASYNC.
  */
-#define UNS_FDOUT	0x2
+#define UNS_FDOUT 0x2
 
 #define MAX_UNSFD_MSG_SIZE 8192
 
@@ -215,12 +212,10 @@ typedef int (*uns_call_t)(void *arg, int fd, pid_t pid);
  * In case we're not in userns, just call the callback immediately
  * in the context of calling task.
  */
-extern int __userns_call(const char *func_name, uns_call_t call, int flags,
-			 void *arg, size_t arg_size, int fd);
+extern int __userns_call(const char *func_name, uns_call_t call, int flags, void *arg, size_t arg_size, int fd);
 
-#define userns_call(__call, __flags, __arg, __arg_size, __fd)	\
-	__userns_call(__stringify(__call), __call, __flags,	\
-		      __arg, __arg_size, __fd)
+#define userns_call(__call, __flags, __arg, __arg_size, __fd) \
+	__userns_call(__stringify(__call), __call, __flags, __arg, __arg_size, __fd)
 
 extern int add_ns_shared_cb(int (*actor)(void *data), void *data);
 
diff --git a/criu/include/net.h b/criu/include/net.h
index c83c79377..0da4cad13 100644
--- a/criu/include/net.h
+++ b/criu/include/net.h
@@ -7,7 +7,7 @@
 #include "external.h"
 
 #ifndef RTM_GETNSID
-#define RTM_GETNSID		90
+#define RTM_GETNSID 90
 #endif
 
 struct cr_imgset;
diff --git a/criu/include/netlink_diag.h b/criu/include/netlink_diag.h
index 14ca403b8..65ff938c0 100644
--- a/criu/include/netlink_diag.h
+++ b/criu/include/netlink_diag.h
@@ -4,25 +4,25 @@
 #include <linux/types.h>
 
 struct netlink_diag_req {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u16	pad;
-	__u32	ndiag_ino;
-	__u32	ndiag_show;
-	__u32	ndiag_cookie[2];
+	__u8 sdiag_family;
+	__u8 sdiag_protocol;
+	__u16 pad;
+	__u32 ndiag_ino;
+	__u32 ndiag_show;
+	__u32 ndiag_cookie[2];
 };
 
 struct netlink_diag_msg {
-	__u8	ndiag_family;
-	__u8	ndiag_type;
-	__u8	ndiag_protocol;
-	__u8	ndiag_state;
+	__u8 ndiag_family;
+	__u8 ndiag_type;
+	__u8 ndiag_protocol;
+	__u8 ndiag_state;
 
-	__u32	ndiag_portid;
-	__u32	ndiag_dst_portid;
-	__u32	ndiag_dst_group;
-	__u32	ndiag_ino;
-	__u32	ndiag_cookie[2];
+	__u32 ndiag_portid;
+	__u32 ndiag_dst_portid;
+	__u32 ndiag_dst_group;
+	__u32 ndiag_ino;
+	__u32 ndiag_cookie[2];
 };
 
 enum {
@@ -34,9 +34,9 @@ enum {
 
 #define NETLINK_DIAG_MAX (__NETLINK_DIAG_MAX - 1)
 
-#define NDIAG_PROTO_ALL		((__u8) ~0)
+#define NDIAG_PROTO_ALL ((__u8)~0)
 
-#define NDIAG_SHOW_MEMINFO	0x00000001 /* show memory info of a socket */
-#define NDIAG_SHOW_GROUPS	0x00000002 /* show groups of a netlink socket */
+#define NDIAG_SHOW_MEMINFO 0x00000001 /* show memory info of a socket */
+#define NDIAG_SHOW_GROUPS  0x00000002 /* show groups of a netlink socket */
 
 #endif /* __CR_NETLINK_DIAG_H__ */
diff --git a/criu/include/packet_diag.h b/criu/include/packet_diag.h
index 287de84ec..69e317adc 100644
--- a/criu/include/packet_diag.h
+++ b/criu/include/packet_diag.h
@@ -4,26 +4,26 @@
 #include <linux/types.h>
 
 struct packet_diag_req {
-	__u8	sdiag_family;
-	__u8	sdiag_protocol;
-	__u16	pad;
-	__u32	pdiag_ino;
-	__u32	pdiag_show;
-	__u32	pdiag_cookie[2];
+	__u8 sdiag_family;
+	__u8 sdiag_protocol;
+	__u16 pad;
+	__u32 pdiag_ino;
+	__u32 pdiag_show;
+	__u32 pdiag_cookie[2];
 };
 
-#define PACKET_SHOW_INFO	0x00000001 /* Basic packet_sk information */
-#define PACKET_SHOW_MCLIST	0x00000002 /* A set of packet_diag_mclist-s */
-#define PACKET_SHOW_RING_CFG	0x00000004 /* Rings configuration parameters */
-#define PACKET_SHOW_FANOUT	0x00000008
+#define PACKET_SHOW_INFO     0x00000001 /* Basic packet_sk information */
+#define PACKET_SHOW_MCLIST   0x00000002 /* A set of packet_diag_mclist-s */
+#define PACKET_SHOW_RING_CFG 0x00000004 /* Rings configuration parameters */
+#define PACKET_SHOW_FANOUT   0x00000008
 
 struct packet_diag_msg {
-	__u8	pdiag_family;
-	__u8	pdiag_type;
-	__u16	pdiag_num;
+	__u8 pdiag_family;
+	__u8 pdiag_type;
+	__u16 pdiag_num;
 
-	__u32	pdiag_ino;
-	__u32	pdiag_cookie[2];
+	__u32 pdiag_ino;
+	__u32 pdiag_cookie[2];
 };
 
 enum {
@@ -37,40 +37,40 @@ enum {
 };
 
 struct packet_diag_info {
-	__u32	pdi_index;
-	__u32	pdi_version;
-	__u32	pdi_reserve;
-	__u32	pdi_copy_thresh;
-	__u32	pdi_tstamp;
-	__u32	pdi_flags;
+	__u32 pdi_index;
+	__u32 pdi_version;
+	__u32 pdi_reserve;
+	__u32 pdi_copy_thresh;
+	__u32 pdi_tstamp;
+	__u32 pdi_flags;
 
-#define PDI_RUNNING	0x1
-#define PDI_AUXDATA	0x2
-#define PDI_ORIGDEV	0x4
-#define PDI_VNETHDR	0x8
-#define PDI_LOSS	0x10
+#define PDI_RUNNING 0x1
+#define PDI_AUXDATA 0x2
+#define PDI_ORIGDEV 0x4
+#define PDI_VNETHDR 0x8
+#define PDI_LOSS    0x10
 };
 
 #ifndef MAX_ADDR_LEN
-#define MAX_ADDR_LEN	32
+#define MAX_ADDR_LEN 32
 #endif
 
 struct packet_diag_mclist {
-	__u32	pdmc_index;
-	__u32	pdmc_count;
-	__u16	pdmc_type;
-	__u16	pdmc_alen;
-	__u8	pdmc_addr[MAX_ADDR_LEN];
+	__u32 pdmc_index;
+	__u32 pdmc_count;
+	__u16 pdmc_type;
+	__u16 pdmc_alen;
+	__u8 pdmc_addr[MAX_ADDR_LEN];
 };
 
 struct packet_diag_ring {
-	__u32	pdr_block_size;
-	__u32	pdr_block_nr;
-	__u32	pdr_frame_size;
-	__u32	pdr_frame_nr;
-	__u32	pdr_retire_tmo;
-	__u32	pdr_sizeof_priv;
-	__u32	pdr_features;
+	__u32 pdr_block_size;
+	__u32 pdr_block_nr;
+	__u32 pdr_frame_size;
+	__u32 pdr_frame_nr;
+	__u32 pdr_retire_tmo;
+	__u32 pdr_sizeof_priv;
+	__u32 pdr_features;
 };
 
 #endif /* __CR_PACKET_DIAG_H__ */
diff --git a/criu/include/page-pipe.h b/criu/include/page-pipe.h
index decd14321..a5f97678e 100644
--- a/criu/include/page-pipe.h
+++ b/criu/include/page-pipe.h
@@ -19,8 +19,7 @@ struct kernel_pipe_buffer {
  * fails very often, so we need to restrict the pipe capacity to not
  * allocate big chunks.
  */
-#define PIPE_MAX_SIZE ((1 << PAGE_ALLOC_COSTLY_ORDER) * PAGE_SIZE /	\
-			sizeof(struct kernel_pipe_buffer))
+#define PIPE_MAX_SIZE ((1 << PAGE_ALLOC_COSTLY_ORDER) * PAGE_SIZE / sizeof(struct kernel_pipe_buffer))
 
 /* The number of pipes for one chunk */
 #define NR_PIPES_PER_CHUNK 8
@@ -91,15 +90,15 @@ struct kernel_pipe_buffer {
  */
 
 struct page_pipe_buf {
-	int			p[2];		/* pipe with pages */
-	unsigned int		pipe_size;	/* how many pages can be fit into pipe */
-	unsigned int		pipe_off;	/* where this buf is started in a pipe */
-	unsigned int		pages_in;	/* how many pages are there */
-	unsigned int		nr_segs;	/* how many iov-s are busy */
+	int p[2]; /* pipe with pages */
+	unsigned int pipe_size; /* how many pages can be fit into pipe */
+	unsigned int pipe_off; /* where this buf is started in a pipe */
+	unsigned int pages_in; /* how many pages are there */
+	unsigned int nr_segs; /* how many iov-s are busy */
 #define PPB_LAZY (1 << 0)
-	unsigned int		flags;
-	struct iovec		*iov;		/* vaddr:len map */
-	struct list_head	l;		/* links into page_pipe->bufs */
+	unsigned int flags;
+	struct iovec *iov; /* vaddr:len map */
+	struct list_head l; /* links into page_pipe->bufs */
 };
 
 /*
@@ -109,38 +108,37 @@ struct page_pipe_buf {
  * Currently we have 2 types: the buffers that are always stored in
  * the images and the buffers that are lazily migrated
  */
-#define PP_PIPE_TYPES	2
+#define PP_PIPE_TYPES 2
 
 #define PP_HOLE_PARENT (1 << 0)
 
 struct page_pipe {
-	unsigned int		nr_pipes;		/* how many page_pipe_bufs in there */
-	struct list_head	bufs;			/* list of bufs */
-	struct list_head	free_bufs;		/* list of bufs */
-	struct page_pipe_buf	*prev[PP_PIPE_TYPES];	/* last ppb of each type for pipe sharing */
-	unsigned int		nr_iovs;		/* number of iovs */
-	unsigned int		free_iov;		/* first free iov */
+	unsigned int nr_pipes; /* how many page_pipe_bufs in there */
+	struct list_head bufs; /* list of bufs */
+	struct list_head free_bufs; /* list of bufs */
+	struct page_pipe_buf *prev[PP_PIPE_TYPES]; /* last ppb of each type for pipe sharing */
+	unsigned int nr_iovs; /* number of iovs */
+	unsigned int free_iov; /* first free iov */
 
-	struct iovec		*iovs;			/* iovs. They are provided into create_page_pipe
+	struct iovec *iovs; /* iovs. They are provided into create_page_pipe
 							   and all bufs have their iov-s in there */
 
-	unsigned int		nr_holes;		/* number of holes allocated */
-	unsigned int		free_hole;		/* number of holes in use */
-	struct iovec		*holes;			/* holes */
-	unsigned int		*hole_flags;
-	unsigned int		flags;			/* PP_FOO flags below */
+	unsigned int nr_holes; /* number of holes allocated */
+	unsigned int free_hole; /* number of holes in use */
+	struct iovec *holes; /* holes */
+	unsigned int *hole_flags;
+	unsigned int flags; /* PP_FOO flags below */
 };
 
-#define PP_CHUNK_MODE	0x1	/* Restrict the maximum buffer size of pipes
+#define PP_CHUNK_MODE \
+	0x1 /* Restrict the maximum buffer size of pipes
 				   and dump memory for a few iterations */
-#define PP_OWN_IOVS	0x4	/* create_page_pipe allocated IOVs memory */
+#define PP_OWN_IOVS 0x4 /* create_page_pipe allocated IOVs memory */
 
 struct page_pipe *create_page_pipe(unsigned int nr_segs, struct iovec *iovs, unsigned flags);
 extern void destroy_page_pipe(struct page_pipe *p);
-extern int page_pipe_add_page(struct page_pipe *p, unsigned long addr,
-			      unsigned int flags);
-extern int page_pipe_add_hole(struct page_pipe *pp, unsigned long addr,
-			      unsigned int flags);
+extern int page_pipe_add_page(struct page_pipe *p, unsigned long addr, unsigned int flags);
+extern int page_pipe_add_hole(struct page_pipe *pp, unsigned long addr, unsigned int flags);
 
 extern void debug_show_page_pipe(struct page_pipe *pp);
 void page_pipe_reinit(struct page_pipe *pp);
@@ -153,8 +151,7 @@ struct pipe_read_dest {
 };
 
 extern int pipe_read_dest_init(struct pipe_read_dest *prd);
-extern int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd,
-			  unsigned long addr, unsigned int *nr_pages,
+extern int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned long addr, unsigned int *nr_pages,
 			  unsigned int ppb_flags);
 
 #endif /* __CR_PAGE_PIPE_H__ */
diff --git a/criu/include/page-xfer.h b/criu/include/page-xfer.h
index 98061e2d3..e0303dfe0 100644
--- a/criu/include/page-xfer.h
+++ b/criu/include/page-xfer.h
@@ -36,7 +36,7 @@ struct page_xfer {
 	union {
 		struct /* local */ {
 			struct cr_img *pmi; /* pagemaps */
-			struct cr_img *pi;  /* pages */
+			struct cr_img *pi; /* pages */
 		};
 
 		struct /* page-server */ {
@@ -72,7 +72,6 @@ extern int check_parent_page_xfer(int fd_type, unsigned long id);
 extern int request_remote_pages(unsigned long img_id, unsigned long addr, int nr_pages);
 
 typedef int (*ps_async_read_complete)(unsigned long img_id, unsigned long vaddr, int nr_pages, void *);
-extern int page_server_start_read(void *buf, int nr_pages,
-		ps_async_read_complete complete, void *priv, unsigned flags);
+extern int page_server_start_read(void *buf, int nr_pages, ps_async_read_complete complete, void *priv, unsigned flags);
 
 #endif /* __CR_PAGE_XFER__H__ */
diff --git a/criu/include/pagemap-cache.h b/criu/include/pagemap-cache.h
index d3ace242a..7612ee0f4 100644
--- a/criu/include/pagemap-cache.h
+++ b/criu/include/pagemap-cache.h
@@ -8,19 +8,22 @@
 
 struct vma_area;
 
-#define PAGEMAP_PFN_OFF(addr)	(PAGE_PFN(addr) * sizeof(u64))
+#define PAGEMAP_PFN_OFF(addr) (PAGE_PFN(addr) * sizeof(u64))
 
 typedef struct {
-	pid_t			pid;		/* which process it belongs */
-	unsigned long		start;		/* start of area */
-	unsigned long		end;		/* end of area */
-	const struct list_head	*vma_head;	/* list head of VMAs we're serving */
-	u64			*map;		/* local buffer */
-	size_t			map_len;	/* length of a buffer */
-	int			fd;		/* file to read PMs from */
+	pid_t pid; /* which process it belongs */
+	unsigned long start; /* start of area */
+	unsigned long end; /* end of area */
+	const struct list_head *vma_head; /* list head of VMAs we're serving */
+	u64 *map; /* local buffer */
+	size_t map_len; /* length of a buffer */
+	int fd; /* file to read PMs from */
 } pmc_t;
 
-#define PMC_INIT (pmc_t){ }
+#define PMC_INIT \
+	(pmc_t)  \
+	{        \
+	}
 
 extern int pmc_init(pmc_t *pmc, pid_t pid, const struct list_head *vma_head, size_t size);
 extern u64 *pmc_get_map(pmc_t *pmc, const struct vma_area *vma);
diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index 45284b87d..c39c25d0c 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -44,8 +44,7 @@
 
 struct page_read {
 	/* reads page from current pagemap */
-	int (*read_pages)(struct page_read *, unsigned long vaddr, int nr,
-			  void *, unsigned flags);
+	int (*read_pages)(struct page_read *, unsigned long vaddr, int nr, void *, unsigned flags);
 	/* Advance page_read to the next entry */
 	int (*advance)(struct page_read *pr);
 	void (*close)(struct page_read *);
@@ -54,8 +53,7 @@ struct page_read {
 	int (*seek_pagemap)(struct page_read *pr, unsigned long vaddr);
 	void (*reset)(struct page_read *pr);
 	int (*io_complete)(struct page_read *, unsigned long vaddr, int nr);
-	int (*maybe_read_page)(struct page_read *pr, unsigned long vaddr,
-			       int nr, void *buf, unsigned flags);
+	int (*maybe_read_page)(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags);
 
 	/* Whether or not pages can be read in PIE code */
 	bool pieok;
@@ -65,37 +63,37 @@ struct page_read {
 	struct cr_img *pi;
 	u32 pages_img_id;
 
-	PagemapEntry *pe;		/* current pagemap we are on */
-	struct page_read *parent;	/* parent pagemap (if ->in_parent
+	PagemapEntry *pe; /* current pagemap we are on */
+	struct page_read *parent; /* parent pagemap (if ->in_parent
 					   pagemap is met in image, then
 					   go to this guy for page, see
 					   read_pagemap_page */
-	unsigned long cvaddr;		/* vaddr we are on */
-	off_t pi_off;			/* current offset in pages file */
+	unsigned long cvaddr; /* vaddr we are on */
+	off_t pi_off; /* current offset in pages file */
 
-	struct iovec bunch;		/* record consequent neighbour
+	struct iovec bunch; /* record consequent neighbour
 					   iovecs to punch together */
-	unsigned id;			/* for logging */
-	unsigned long img_id;		/* pagemap image file ID */
+	unsigned id; /* for logging */
+	unsigned long img_id; /* pagemap image file ID */
 
 	PagemapEntry **pmes;
 	int nr_pmes;
 	int curr_pme;
 
-	struct list_head	async;
+	struct list_head async;
 };
 
 /* flags for ->read_pages */
-#define PR_ASYNC	0x1 /* may exit w/o data in the buffer */
-#define PR_ASAP		0x2 /* PR_ASYNC, but start the IO right now */
+#define PR_ASYNC 0x1 /* may exit w/o data in the buffer */
+#define PR_ASAP	 0x2 /* PR_ASYNC, but start the IO right now */
 
 /* flags for open_page_read */
-#define PR_SHMEM	0x1
-#define PR_TASK		0x2
+#define PR_SHMEM 0x1
+#define PR_TASK	 0x2
 
-#define PR_TYPE_MASK	0x3
-#define PR_MOD		0x4	/* Will need to modify */
-#define PR_REMOTE	0x8
+#define PR_TYPE_MASK 0x3
+#define PR_MOD	     0x4 /* Will need to modify */
+#define PR_REMOTE    0x8
 
 /*
  * -1 -- error
@@ -103,13 +101,11 @@ struct page_read {
  *  1 -- opened
  */
 extern int open_page_read(unsigned long id, struct page_read *, int pr_flags);
-extern int open_page_read_at(int dfd, unsigned long id, struct page_read *pr,
-		int pr_flags);
+extern int open_page_read_at(int dfd, unsigned long id, struct page_read *pr, int pr_flags);
 
 struct task_restore_args;
 
-int pagemap_enqueue_iovec(struct page_read *pr, void *buf,
-			      unsigned long len, struct list_head *to);
+int pagemap_enqueue_iovec(struct page_read *pr, void *buf, unsigned long len, struct list_head *to);
 int pagemap_render_iovec(struct list_head *from, struct task_restore_args *ta);
 
 /*
@@ -119,8 +115,7 @@ int pagemap_render_iovec(struct list_head *from, struct task_restore_args *ta);
  */
 extern void dup_page_read(struct page_read *src, struct page_read *dst);
 
-extern int dedup_one_iovec(struct page_read *pr, unsigned long base,
-			   unsigned long len);
+extern int dedup_one_iovec(struct page_read *pr, unsigned long base, unsigned long len);
 
 static inline unsigned long pagemap_len(PagemapEntry *pe)
 {
@@ -133,9 +128,9 @@ static inline bool page_read_has_parent(struct page_read *pr)
 }
 
 /* Pagemap flags */
-#define PE_PARENT	(1 << 0)	/* pages are in parent snapshot */
-#define PE_LAZY		(1 << 1)	/* pages can be lazily restored */
-#define PE_PRESENT	(1 << 2)	/* pages are present in pages*img */
+#define PE_PARENT  (1 << 0) /* pages are in parent snapshot */
+#define PE_LAZY	   (1 << 1) /* pages can be lazily restored */
+#define PE_PRESENT (1 << 2) /* pages are present in pages*img */
 
 static inline bool pagemap_in_parent(PagemapEntry *pe)
 {
diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h
index afba95a9e..4540e11ee 100644
--- a/criu/include/parasite-syscall.h
+++ b/criu/include/parasite-syscall.h
@@ -25,25 +25,21 @@ extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_
 extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *);
 
 struct proc_posix_timers_stat;
-extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args,
-		struct parasite_ctl *ctl, struct pstree_item *);
+extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
+					     struct pstree_item *);
 
 extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
 extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce);
 extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core);
-extern int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl,
-				       struct parasite_ctl *ctl, int id,
+extern int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, struct parasite_ctl *ctl, int id,
 				       struct pid *tid, CoreEntry *core);
-extern int dump_thread_core(int pid, CoreEntry *core,
-					const struct parasite_dump_thread *dt);
+extern int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread *dt);
 
-extern int parasite_drain_fds_seized(struct parasite_ctl *ctl,
-					struct parasite_drain_fd *dfds, int nr_fds, int off,
-					int *lfds, struct fd_opts *flags);
+extern int parasite_drain_fds_seized(struct parasite_ctl *ctl, struct parasite_drain_fd *dfds, int nr_fds, int off,
+				     int *lfds, struct fd_opts *flags);
 extern int parasite_get_proc_fd_seized(struct parasite_ctl *ctl);
 
-extern struct parasite_ctl *parasite_infect_seized(pid_t pid,
-						   struct pstree_item *item,
+extern struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 						   struct vm_area_list *vma_area_list);
 extern void parasite_ensure_args_size(unsigned long sz);
 extern unsigned long get_exec_start(struct vm_area_list *);
diff --git a/criu/include/parasite-vdso.h b/criu/include/parasite-vdso.h
index 9ee32f2a7..a50594d2a 100644
--- a/criu/include/parasite-vdso.h
+++ b/criu/include/parasite-vdso.h
@@ -32,28 +32,28 @@ static inline bool vdso_symbol_empty(struct vdso_symbol *s)
  * from list of VMAs to save in images, we save rt-vvar address also.
  */
 struct vdso_mark {
-	u64			signature;
-	unsigned long		orig_vdso_addr;
-	unsigned long		version;
-	unsigned long		orig_vvar_addr;
-	unsigned long		rt_vvar_addr;
+	u64 signature;
+	unsigned long orig_vdso_addr;
+	unsigned long version;
+	unsigned long orig_vvar_addr;
+	unsigned long rt_vvar_addr;
 };
 
-#define VDSO_MARK_SIGNATURE_V1	(0x6f73647675697263ULL)	/* Magic number (criuvdso) */
-#define VDSO_MARK_SIGNATURE_V2	(0x4f53447675697263ULL)	/* Magic number (criuvDSO) */
-#define VDSO_MARK_SIGNATURE_V3	(0x4f53447655495243ULL)	/* Magic number (CRIUvDSO) */
-#define VDSO_MARK_CUR_VERSION	(3)
+#define VDSO_MARK_SIGNATURE_V1 (0x6f73647675697263ULL) /* Magic number (criuvdso) */
+#define VDSO_MARK_SIGNATURE_V2 (0x4f53447675697263ULL) /* Magic number (criuvDSO) */
+#define VDSO_MARK_SIGNATURE_V3 (0x4f53447655495243ULL) /* Magic number (CRIUvDSO) */
+#define VDSO_MARK_CUR_VERSION  (3)
 
-static inline void vdso_put_mark(void *where, unsigned long rt_vvar_addr,
-		unsigned long orig_vdso_addr, unsigned long orig_vvar_addr)
+static inline void vdso_put_mark(void *where, unsigned long rt_vvar_addr, unsigned long orig_vdso_addr,
+				 unsigned long orig_vvar_addr)
 {
 	struct vdso_mark *m = where;
 
-	m->signature		= VDSO_MARK_SIGNATURE_V3;
-	m->orig_vdso_addr	= orig_vdso_addr;
-	m->version		= VDSO_MARK_CUR_VERSION;
-	m->orig_vvar_addr	= orig_vvar_addr;
-	m->rt_vvar_addr		= rt_vvar_addr;
+	m->signature = VDSO_MARK_SIGNATURE_V3;
+	m->orig_vdso_addr = orig_vdso_addr;
+	m->version = VDSO_MARK_CUR_VERSION;
+	m->orig_vvar_addr = orig_vvar_addr;
+	m->rt_vvar_addr = rt_vvar_addr;
 }
 
 static inline bool is_vdso_mark(void *addr)
@@ -68,13 +68,11 @@ static inline bool is_vdso_mark(void *addr)
 	 * to the version we support.
 	 */
 	case VDSO_MARK_SIGNATURE_V2:
-		vdso_put_mark(m, VVAR_BAD_ADDR,
-				m->orig_vdso_addr, m->orig_vvar_addr);
+		vdso_put_mark(m, VVAR_BAD_ADDR, m->orig_vdso_addr, m->orig_vvar_addr);
 		return true;
 
 	case VDSO_MARK_SIGNATURE_V1:
-		vdso_put_mark(m, VVAR_BAD_ADDR,
-				m->orig_vdso_addr, VVAR_BAD_ADDR);
+		vdso_put_mark(m, VVAR_BAD_ADDR, m->orig_vdso_addr, VVAR_BAD_ADDR);
 		return true;
 	}
 
@@ -82,14 +80,11 @@ static inline bool is_vdso_mark(void *addr)
 }
 
 extern void vdso_update_gtod_addr(struct vdso_maps *rt);
-extern int vdso_do_park(struct vdso_maps *rt, unsigned long park_at,
-			unsigned long park_size);
+extern int vdso_do_park(struct vdso_maps *rt, unsigned long park_at, unsigned long park_size);
 extern int vdso_map_compat(unsigned long map_at);
-extern int vdso_proxify(struct vdso_maps *rt, bool *added_proxy,
-			VmaEntry *vmas, size_t nr_vmas,
-			bool compat_vdso, bool force_trampolines);
-extern int vdso_redirect_calls(unsigned long base_to, unsigned long base_from,
-			struct vdso_symtable *to, struct vdso_symtable *from,
-			bool compat_vdso);
+extern int vdso_proxify(struct vdso_maps *rt, bool *added_proxy, VmaEntry *vmas, size_t nr_vmas, bool compat_vdso,
+			bool force_trampolines);
+extern int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *to,
+			       struct vdso_symtable *from, bool compat_vdso);
 
 #endif /* __CR_PARASITE_VDSO_H__ */
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index d9570948a..8107aa49d 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -1,7 +1,7 @@
 #ifndef __CR_PARASITE_H__
 #define __CR_PARASITE_H__
 
-#define PARASITE_MAX_SIZE	(64 << 10)
+#define PARASITE_MAX_SIZE (64 << 10)
 
 #ifndef __ASSEMBLY__
 
@@ -39,30 +39,29 @@ enum {
 	PARASITE_CMD_MAX,
 };
 
-struct parasite_vma_entry
-{
-	unsigned long	start;
-	unsigned long	len;
-	int		prot;
+struct parasite_vma_entry {
+	unsigned long start;
+	unsigned long len;
+	int prot;
 };
 
 struct parasite_vdso_vma_entry {
-	unsigned long	start;
-	unsigned long	len;
-	unsigned long	orig_vdso_addr;
-	unsigned long	orig_vvar_addr;
-	unsigned long	rt_vvar_addr;
-	int		is_marked;
-	bool		try_fill_symtable;
-	bool		is_vdso;
+	unsigned long start;
+	unsigned long len;
+	unsigned long orig_vdso_addr;
+	unsigned long orig_vvar_addr;
+	unsigned long rt_vvar_addr;
+	int is_marked;
+	bool try_fill_symtable;
+	bool is_vdso;
 };
 
 struct parasite_dump_pages_args {
-	unsigned int	nr_vmas;
-	unsigned int	add_prot;
-	unsigned int	off;
-	unsigned int	nr_segs;
-	unsigned int	nr_pages;
+	unsigned int nr_vmas;
+	unsigned int add_prot;
+	unsigned int off;
+	unsigned int nr_segs;
+	unsigned int nr_pages;
 };
 
 static inline struct parasite_vma_entry *pargs_vmas(struct parasite_dump_pages_args *a)
@@ -117,7 +116,7 @@ static inline int posix_timers_dump_size(int timer_n)
  */
 
 struct parasite_dump_misc {
-	unsigned long		brk;
+	unsigned long brk;
 
 	u32 pid;
 	u32 sid;
@@ -133,22 +132,22 @@ struct parasite_dump_misc {
  * Calculate how long we can make the groups array in parasite_dump_creds
  * and still fit the struct in one page
  */
-#define PARASITE_MAX_GROUPS							\
-	((PAGE_SIZE - sizeof(struct parasite_dump_thread) -			\
-	 offsetof(struct parasite_dump_creds, groups)) / sizeof(unsigned int)) /* groups */
+#define PARASITE_MAX_GROUPS                                                                                 \
+	((PAGE_SIZE - sizeof(struct parasite_dump_thread) - offsetof(struct parasite_dump_creds, groups)) / \
+	 sizeof(unsigned int)) /* groups */
 
 struct parasite_dump_creds {
-	unsigned int		cap_last_cap;
+	unsigned int cap_last_cap;
 
-	u32			cap_inh[CR_CAP_SIZE];
-	u32			cap_prm[CR_CAP_SIZE];
-	u32			cap_eff[CR_CAP_SIZE];
-	u32			cap_bnd[CR_CAP_SIZE];
+	u32 cap_inh[CR_CAP_SIZE];
+	u32 cap_prm[CR_CAP_SIZE];
+	u32 cap_eff[CR_CAP_SIZE];
+	u32 cap_bnd[CR_CAP_SIZE];
 
-	int			uids[4];
-	int			gids[4];
-	unsigned int		secbits;
-	unsigned int		ngroups;
+	int uids[4];
+	int gids[4];
+	unsigned int secbits;
+	unsigned int ngroups;
 	/*
 	 * FIXME -- this structure is passed to parasite code
 	 * through parasite args area so in parasite_dump_creds()
@@ -162,17 +161,17 @@ struct parasite_dump_creds {
 	 * of memory in use doesn't exceed the PAGE_SIZE and the
 	 * args area is at least one page (PARASITE_ARG_SIZE_MIN).
 	 */
-	unsigned int		groups[0];
+	unsigned int groups[0];
 };
 
 struct parasite_dump_thread {
-	unsigned int			*tid_addr;
-	pid_t				tid;
-	tls_t				tls;
-	stack_t				sas;
-	int				pdeath_sig;
-	char				comm[TASK_COMM_LEN];
-	struct parasite_dump_creds	creds[0];
+	unsigned int *tid_addr;
+	pid_t tid;
+	tls_t tls;
+	stack_t sas;
+	int pdeath_sig;
+	char comm[TASK_COMM_LEN];
+	struct parasite_dump_creds creds[0];
 };
 
 static inline void copy_sas(ThreadSasEntry *dst, const stack_t *src)
@@ -190,11 +189,11 @@ static inline void copy_sas(ThreadSasEntry *dst, const stack_t *src)
  *    are transferred with help of send_fds and recv_fds.
  * 3) criu should work with a default value of the file limit (1024)
  */
-#define PARASITE_MAX_FDS	CR_SCM_MAX_FD * 3
+#define PARASITE_MAX_FDS CR_SCM_MAX_FD * 3
 
 struct parasite_drain_fd {
-	int	nr_fds;
-	int	fds[0];
+	int nr_fds;
+	int fds[0];
 };
 
 struct fd_opts {
@@ -215,16 +214,16 @@ static inline int drain_fds_size(struct parasite_drain_fd *dfds)
 }
 
 struct parasite_tty_args {
-	int	fd;
-	int	type;
+	int fd;
+	int type;
 
-	int	sid;
-	int	pgrp;
-	bool	hangup;
+	int sid;
+	int pgrp;
+	bool hangup;
 
-	int	st_pckt;
-	int	st_lock;
-	int	st_excl;
+	int st_pckt;
+	int st_lock;
+	int st_excl;
 };
 
 struct parasite_dump_cgroup_args {
diff --git a/criu/include/path.h b/criu/include/path.h
index c475986eb..70e09587d 100644
--- a/criu/include/path.h
+++ b/criu/include/path.h
@@ -35,7 +35,6 @@ char *cut_root_for_bind(char *target_root, char *source_root);
  * Get a mount point for a sibling of m if m->parent and p are in the same
  * shared group.
  */
-char *mnt_get_sibling_path(struct mount_info *m,
-			   struct mount_info *p, char *buf, int len);
+char *mnt_get_sibling_path(struct mount_info *m, struct mount_info *p, char *buf, int len);
 
 #endif
diff --git a/criu/include/pid.h b/criu/include/pid.h
index c749176fa..49cb2d322 100644
--- a/criu/include/pid.h
+++ b/criu/include/pid.h
@@ -8,18 +8,17 @@
 /*
  * Task states, used in e.g. struct pid's state.
  */
-enum __criu_task_state
-{
+enum __criu_task_state {
 	/* Values shared with compel */
-	TASK_ALIVE		= COMPEL_TASK_ALIVE,
-	TASK_DEAD		= COMPEL_TASK_DEAD,
-	TASK_STOPPED		= COMPEL_TASK_STOPPED,
-	TASK_ZOMBIE		= COMPEL_TASK_ZOMBIE,
+	TASK_ALIVE = COMPEL_TASK_ALIVE,
+	TASK_DEAD = COMPEL_TASK_DEAD,
+	TASK_STOPPED = COMPEL_TASK_STOPPED,
+	TASK_ZOMBIE = COMPEL_TASK_ZOMBIE,
 	/* Own internal states */
-	TASK_HELPER		= COMPEL_TASK_MAX + 1,
+	TASK_HELPER = COMPEL_TASK_MAX + 1,
 	TASK_THREAD,
 	/* new values are to be added before this line */
-	TASK_UNDEF		= 0xff
+	TASK_UNDEF = 0xff
 };
 
 struct pid {
@@ -31,7 +30,7 @@ struct pid {
 	 */
 	pid_t real;
 
-	int state;	/* TASK_XXX constants */
+	int state; /* TASK_XXX constants */
 
 	/*
 	 * The @virt pid is one which used in the image itself and keeps
diff --git a/criu/include/pipes.h b/criu/include/pipes.h
index 83fb71cfc..6e6310e14 100644
--- a/criu/include/pipes.h
+++ b/criu/include/pipes.h
@@ -13,28 +13,28 @@ static inline u32 pipe_id(const struct fd_parms *p)
 	return p->stat.st_ino;
 }
 
-#define NR_PIPES_WITH_DATA	1024
+#define NR_PIPES_WITH_DATA 1024
 
 struct pipe_data_dump {
-	int		img_type;
-	unsigned int	nr;
-	u32		ids[NR_PIPES_WITH_DATA];
+	int img_type;
+	unsigned int nr;
+	u32 ids[NR_PIPES_WITH_DATA];
 };
 
 extern int dump_one_pipe_data(struct pipe_data_dump *pd, int lfd, const struct fd_parms *p);
 
 struct pipe_data_rst {
-	PipeDataEntry		*pde;
+	PipeDataEntry *pde;
 	void *data;
-	struct pipe_data_rst	*next;
+	struct pipe_data_rst *next;
 };
 
-#define PIPE_DATA_HASH_BITS	5
-#define PIPE_DATA_HASH_SIZE	(1 << PIPE_DATA_HASH_BITS)
-#define PIPE_DATA_HASH_MASK	(PIPE_DATA_HASH_SIZE - 1)
+#define PIPE_DATA_HASH_BITS 5
+#define PIPE_DATA_HASH_SIZE (1 << PIPE_DATA_HASH_BITS)
+#define PIPE_DATA_HASH_MASK (PIPE_DATA_HASH_SIZE - 1)
 
-extern int do_collect_pipe_data(struct pipe_data_rst *,
-		ProtobufCMessage *, struct cr_img *, struct pipe_data_rst **hash);
+extern int do_collect_pipe_data(struct pipe_data_rst *, ProtobufCMessage *, struct cr_img *,
+				struct pipe_data_rst **hash);
 extern int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst **hash);
 
 /*
@@ -47,17 +47,15 @@ extern int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst
 #include "images/pipe.pb-c.h"
 
 struct pipe_info {
-	PipeEntry		*pe;
-	struct list_head	pipe_list;	/* All pipe_info with the same pipe_id
+	PipeEntry *pe;
+	struct list_head pipe_list; /* All pipe_info with the same pipe_id
 						 * This is pure circular list without head */
-	struct list_head	list;		/* global list of pipes */
-	struct file_desc	d;
-	unsigned int		create : 1,
-				reopen : 1;
+	struct list_head list; /* global list of pipes */
+	struct file_desc d;
+	unsigned int create : 1, reopen : 1;
 };
 
-extern int collect_one_pipe_ops(void *o, ProtobufCMessage *base,
-				struct file_desc_ops *ops);
+extern int collect_one_pipe_ops(void *o, ProtobufCMessage *base, struct file_desc_ops *ops);
 extern int open_pipe(struct file_desc *d, int *new_fd);
 
 #endif /* __CR_PIPES_H__ */
diff --git a/criu/include/plugin.h b/criu/include/plugin.h
index 82a6723d0..bbb3eb858 100644
--- a/criu/include/plugin.h
+++ b/criu/include/plugin.h
@@ -11,36 +11,35 @@ void cr_plugin_fini(int stage, int err);
 int cr_plugin_init(int stage);
 
 typedef struct {
-	struct list_head	head;
-	struct list_head	hook_chain[CR_PLUGIN_HOOK__MAX];
+	struct list_head head;
+	struct list_head hook_chain[CR_PLUGIN_HOOK__MAX];
 } cr_plugin_ctl_t;
 
 extern cr_plugin_ctl_t cr_plugin_ctl;
 
 typedef struct {
-	cr_plugin_desc_t	*d;
-	struct list_head	list;
-	void			*dlhandle;
-	struct list_head	link[CR_PLUGIN_HOOK__MAX];
+	cr_plugin_desc_t *d;
+	struct list_head list;
+	void *dlhandle;
+	struct list_head link[CR_PLUGIN_HOOK__MAX];
 } plugin_desc_t;
 
-#define run_plugins(__hook, ...)								\
-({												\
-	plugin_desc_t *this;									\
-	int __ret = -ENOTSUP;									\
-												\
-	list_for_each_entry(this, &cr_plugin_ctl.hook_chain[CR_PLUGIN_HOOK__ ##__hook],		\
-			    link[CR_PLUGIN_HOOK__ ##__hook]) {					\
-		pr_debug("plugin: `%s' hook %u -> %p\n",					\
-			 this->d->name, CR_PLUGIN_HOOK__ ##__hook,				\
-			 this->d->hooks[CR_PLUGIN_HOOK__ ##__hook]);				\
-		__ret = ((CR_PLUGIN_HOOK__ ##__hook ##_t *)					\
-			 this->d->hooks[CR_PLUGIN_HOOK__ ##__hook])(__VA_ARGS__);		\
-		if (__ret == -ENOTSUP)								\
-			continue;								\
-		break;										\
-	}											\
-	__ret;											\
-})
+#define run_plugins(__hook, ...)                                                                          \
+	({                                                                                                \
+		plugin_desc_t *this;                                                                      \
+		int __ret = -ENOTSUP;                                                                     \
+                                                                                                          \
+		list_for_each_entry(this, &cr_plugin_ctl.hook_chain[CR_PLUGIN_HOOK__##__hook],            \
+				    link[CR_PLUGIN_HOOK__##__hook]) {                                     \
+			pr_debug("plugin: `%s' hook %u -> %p\n", this->d->name, CR_PLUGIN_HOOK__##__hook, \
+				 this->d->hooks[CR_PLUGIN_HOOK__##__hook]);                               \
+			__ret = ((CR_PLUGIN_HOOK__##__hook##_t *)this->d                                  \
+					 ->hooks[CR_PLUGIN_HOOK__##__hook])(__VA_ARGS__);                 \
+			if (__ret == -ENOTSUP)                                                            \
+				continue;                                                                 \
+			break;                                                                            \
+		}                                                                                         \
+		__ret;                                                                                    \
+	})
 
 #endif
diff --git a/criu/include/posix-timer.h b/criu/include/posix-timer.h
index 139f5c9a5..b1f4b1ab6 100644
--- a/criu/include/posix-timer.h
+++ b/criu/include/posix-timer.h
@@ -9,7 +9,7 @@ struct str_posix_timer {
 	int si_signo;
 	int it_sigev_notify;
 	int notify_thread_id;
-	void * sival_ptr;
+	void *sival_ptr;
 };
 
 struct proc_posix_timer {
@@ -22,7 +22,7 @@ struct proc_posix_timers_stat {
 	struct list_head timers;
 };
 
-extern int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat * args);
+extern int parse_posix_timers(pid_t pid, struct proc_posix_timers_stat *args);
 void free_posix_timers(struct proc_posix_timers_stat *st);
 
 #endif /* __CR_PROC_POSIX_TIMER_H__ */
diff --git a/criu/include/prctl.h b/criu/include/prctl.h
index 8e7fef317..c843f40a7 100644
--- a/criu/include/prctl.h
+++ b/criu/include/prctl.h
@@ -4,82 +4,82 @@
 #include "int.h"
 
 #ifndef PR_SET_NAME
-# define PR_SET_NAME		15
+#define PR_SET_NAME 15
 #endif
 #ifndef PR_GET_NAME
-# define PR_GET_NAME		16
+#define PR_GET_NAME 16
 #endif
 #ifndef PR_SET_SECCOMP
-# define PR_SET_SECCOMP		22
+#define PR_SET_SECCOMP 22
 #endif
 #ifndef PR_CAPBSET_READ
-# define PR_CAPBSET_READ	23
+#define PR_CAPBSET_READ 23
 #endif
 #ifndef PR_CAPBSET_DROP
-# define PR_CAPBSET_DROP	24
+#define PR_CAPBSET_DROP 24
 #endif
 #ifndef PR_GET_SECUREBITS
-# define PR_GET_SECUREBITS	27
+#define PR_GET_SECUREBITS 27
 #endif
 #ifndef PR_SET_SECUREBITS
-# define PR_SET_SECUREBITS	28
+#define PR_SET_SECUREBITS 28
 #endif
 #ifndef PR_GET_DUMPABLE
-# define PR_GET_DUMPABLE	3
+#define PR_GET_DUMPABLE 3
 #endif
 #ifndef PR_SET_DUMPABLE
-# define PR_SET_DUMPABLE	4
+#define PR_SET_DUMPABLE 4
 #endif
 
 #ifndef PR_SET_MM
-#define PR_SET_MM		35
-# define PR_SET_MM_START_CODE		1
-# define PR_SET_MM_END_CODE		2
-# define PR_SET_MM_START_DATA		3
-# define PR_SET_MM_END_DATA		4
-# define PR_SET_MM_START_STACK		5
-# define PR_SET_MM_START_BRK		6
-# define PR_SET_MM_BRK			7
-# define PR_SET_MM_ARG_START		8
-# define PR_SET_MM_ARG_END		9
-# define PR_SET_MM_ENV_START		10
-# define PR_SET_MM_ENV_END		11
-# define PR_SET_MM_AUXV			12
-# define PR_SET_MM_EXE_FILE		13
+#define PR_SET_MM	      35
+#define PR_SET_MM_START_CODE  1
+#define PR_SET_MM_END_CODE    2
+#define PR_SET_MM_START_DATA  3
+#define PR_SET_MM_END_DATA    4
+#define PR_SET_MM_START_STACK 5
+#define PR_SET_MM_START_BRK   6
+#define PR_SET_MM_BRK	      7
+#define PR_SET_MM_ARG_START   8
+#define PR_SET_MM_ARG_END     9
+#define PR_SET_MM_ENV_START   10
+#define PR_SET_MM_ENV_END     11
+#define PR_SET_MM_AUXV	      12
+#define PR_SET_MM_EXE_FILE    13
 #endif
 
 #ifndef PR_SET_MM_MAP
-# define PR_SET_MM_MAP			14
-# define PR_SET_MM_MAP_SIZE		15
+#define PR_SET_MM_MAP	   14
+#define PR_SET_MM_MAP_SIZE 15
 
 struct prctl_mm_map {
-	u64	start_code;
-	u64	end_code;
-	u64	start_data;
-	u64	end_data;
-	u64	start_brk;
-	u64	brk;
-	u64	start_stack;
-	u64	arg_start;
-	u64	arg_end;
-	u64	env_start;
-	u64	env_end;
-	u64	*auxv;
-	u32	auxv_size;
-	u32	exe_fd;
+	u64 start_code;
+	u64 end_code;
+	u64 start_data;
+	u64 end_data;
+	u64 start_brk;
+	u64 brk;
+	u64 start_stack;
+	u64 arg_start;
+	u64 arg_end;
+	u64 env_start;
+	u64 env_end;
+	u64 *auxv;
+	u32 auxv_size;
+	u32 exe_fd;
 };
 #endif
 
 #ifndef PR_GET_TID_ADDRESS
-# define PR_GET_TID_ADDRESS	40
+#define PR_GET_TID_ADDRESS 40
 #endif
 
 #ifndef PR_SET_THP_DISABLE
-# define PR_SET_THP_DISABLE	41
+#define PR_SET_THP_DISABLE 41
 #endif
 
 #ifndef PR_GET_THP_DISABLE
-# define PR_GET_THP_DISABLE	42
+#define PR_GET_THP_DISABLE 42
 #endif
 
 #endif /* __CR_PRCTL_H__ */
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index c043804b4..0c334a190 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -5,65 +5,65 @@
 
 #include "compel/infect.h"
 
-#define PROC_TASK_COMM_LEN	32
-#define PROC_TASK_COMM_LEN_FMT	"(%31s"
+#define PROC_TASK_COMM_LEN     32
+#define PROC_TASK_COMM_LEN_FMT "(%31s"
 
 struct proc_pid_stat {
-	int			pid;
-	char			comm[PROC_TASK_COMM_LEN];
-	char			state;
-	int			ppid;
-	int			pgid;
-	int			sid;
-	int			tty_nr;
-	int			tty_pgrp;
-	unsigned int		flags;
-	unsigned long		min_flt;
-	unsigned long		cmin_flt;
-	unsigned long		maj_flt;
-	unsigned long		cmaj_flt;
-	unsigned long		utime;
-	unsigned long		stime;
-	long			cutime;
-	long			cstime;
-	long			priority;
-	long			nice;
-	int			num_threads;
-	int			zero0;
-	unsigned long long	start_time;
-	unsigned long		vsize;
-	long			mm_rss;
-	unsigned long		rsslim;
-	unsigned long		start_code;
-	unsigned long		end_code;
-	unsigned long		start_stack;
-	unsigned long		esp;
-	unsigned long		eip;
-	unsigned long		sig_pending;
-	unsigned long		sig_blocked;
-	unsigned long		sig_ignored;
-	unsigned long		sig_handled;
-	unsigned long		wchan;
-	unsigned long		zero1;
-	unsigned long		zero2;
-	int			exit_signal;
-	int			task_cpu;
-	unsigned int		rt_priority;
-	unsigned int		policy;
-	unsigned long long	delayacct_blkio_ticks;
-	unsigned long		gtime;
-	long			cgtime;
-	unsigned long		start_data;
-	unsigned long		end_data;
-	unsigned long		start_brk;
-	unsigned long		arg_start;
-	unsigned long		arg_end;
-	unsigned long		env_start;
-	unsigned long		env_end;
-	int			exit_code;
+	int pid;
+	char comm[PROC_TASK_COMM_LEN];
+	char state;
+	int ppid;
+	int pgid;
+	int sid;
+	int tty_nr;
+	int tty_pgrp;
+	unsigned int flags;
+	unsigned long min_flt;
+	unsigned long cmin_flt;
+	unsigned long maj_flt;
+	unsigned long cmaj_flt;
+	unsigned long utime;
+	unsigned long stime;
+	long cutime;
+	long cstime;
+	long priority;
+	long nice;
+	int num_threads;
+	int zero0;
+	unsigned long long start_time;
+	unsigned long vsize;
+	long mm_rss;
+	unsigned long rsslim;
+	unsigned long start_code;
+	unsigned long end_code;
+	unsigned long start_stack;
+	unsigned long esp;
+	unsigned long eip;
+	unsigned long sig_pending;
+	unsigned long sig_blocked;
+	unsigned long sig_ignored;
+	unsigned long sig_handled;
+	unsigned long wchan;
+	unsigned long zero1;
+	unsigned long zero2;
+	int exit_signal;
+	int task_cpu;
+	unsigned int rt_priority;
+	unsigned int policy;
+	unsigned long long delayacct_blkio_ticks;
+	unsigned long gtime;
+	long cgtime;
+	unsigned long start_data;
+	unsigned long end_data;
+	unsigned long start_brk;
+	unsigned long arg_start;
+	unsigned long arg_end;
+	unsigned long env_start;
+	unsigned long env_end;
+	int exit_code;
 };
 
-#define PROC_CAP_SIZE	2
+#define PROC_CAP_SIZE 2
 
 struct proc_status_creds {
 	struct seize_task_status s;
@@ -71,16 +71,16 @@ struct proc_status_creds {
 	unsigned int uids[4];
 	unsigned int gids[4];
 
-	u32			last_filter;
+	u32 last_filter;
 
 	/*
 	 * Keep them at the end of structure
 	 * for fast comparison reason.
 	 */
-	u32			cap_inh[PROC_CAP_SIZE];
-	u32			cap_prm[PROC_CAP_SIZE];
-	u32			cap_eff[PROC_CAP_SIZE];
-	u32			cap_bnd[PROC_CAP_SIZE];
+	u32 cap_inh[PROC_CAP_SIZE];
+	u32 cap_prm[PROC_CAP_SIZE];
+	u32 cap_eff[PROC_CAP_SIZE];
+	u32 cap_bnd[PROC_CAP_SIZE];
 };
 
 #define INVALID_UID ((uid_t)-1)
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 35fa1a90b..87f20d23a 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -6,7 +6,7 @@
 
 enum {
 	/* PB_AUTOGEN_START */
-	PB_INVENTORY,		/* 0 */
+	PB_INVENTORY, /* 0 */
 	PB_STATS,
 	PB_FDINFO,
 	PB_CORE,
@@ -16,7 +16,7 @@ enum {
 	PB_POSIX_TIMER,
 	PB_CREDS,
 	PB_FS,
-	PB_UTSNS,		/* 10 */
+	PB_UTSNS, /* 10 */
 	PB_IPC_VAR,
 	PB_IPC_SHM,
 	PB_IPC_SEM,
@@ -26,7 +26,7 @@ enum {
 	PB_TCP_STREAM,
 	PB_REG_FILE,
 	PB_EXT_FILE,
-	PB_NS_FILE,		/* 20 */
+	PB_NS_FILE, /* 20 */
 	PB_INET_SK,
 	PB_UNIX_SK,
 	PB_PACKET_SOCK,
@@ -36,7 +36,7 @@ enum {
 	PB_PIPE_DATA,
 	PB_EVENTFD_FILE,
 	PB_EVENTPOLL_FILE,
-	PB_EVENTPOLL_TFD,	/* 30 */
+	PB_EVENTPOLL_TFD, /* 30 */
 	PB_SIGNALFD,
 	PB_INOTIFY_FILE,
 	PB_INOTIFY_WD,
@@ -46,7 +46,7 @@ enum {
 	PB_TTY_INFO,
 	PB_FILE_LOCK,
 	PB_RLIMIT,
-	PB_PAGEMAP,		/* 40 */
+	PB_PAGEMAP, /* 40 */
 	PB_SIGINFO,
 	PB_TUNFILE,
 	PB_IRMAP_CACHE,
@@ -56,7 +56,7 @@ enum {
 	PB_CPUINFO,
 	PB_USERNS,
 	PB_NETNS,
-	PB_BINFMT_MISC,		/* 50 */
+	PB_BINFMT_MISC, /* 50 */
 	PB_TTY_DATA,
 	PB_AUTOFS,
 	PB_GHOST_CHUNK,
@@ -86,15 +86,15 @@ enum {
 
 typedef size_t (*pb_getpksize_t)(void *obj);
 typedef size_t (*pb_pack_t)(void *obj, void *where);
-typedef void  *(*pb_unpack_t)(void *allocator, size_t size, void *from);
-typedef void   (*pb_free_t)(void *obj, void *allocator);
+typedef void *(*pb_unpack_t)(void *allocator, size_t size, void *from);
+typedef void (*pb_free_t)(void *obj, void *allocator);
 
 struct cr_pb_message_desc {
-	pb_getpksize_t				getpksize;
-	pb_pack_t				pack;
-	pb_unpack_t				unpack;
-	pb_free_t				free;
-	const ProtobufCMessageDescriptor	*pb_desc;
+	pb_getpksize_t getpksize;
+	pb_pack_t pack;
+	pb_unpack_t unpack;
+	pb_free_t free;
+	const ProtobufCMessageDescriptor *pb_desc;
 };
 
 extern void cr_pb_init(void);
diff --git a/criu/include/protobuf.h b/criu/include/protobuf.h
index 0b6d8c150..11cca1564 100644
--- a/criu/include/protobuf.h
+++ b/criu/include/protobuf.h
@@ -11,19 +11,16 @@ struct cr_img;
 
 extern int do_pb_read_one(struct cr_img *, void **objp, int type, bool eof);
 
-#define pb_read_one(fd, objp, type) do_pb_read_one(fd, (void **)objp, type, false)
+#define pb_read_one(fd, objp, type)	do_pb_read_one(fd, (void **)objp, type, false)
 #define pb_read_one_eof(fd, objp, type) do_pb_read_one(fd, (void **)objp, type, true)
 
 extern int pb_write_one(struct cr_img *, void *obj, int type);
 
-#define pb_pksize(__obj, __proto_message_name)						\
-	(__proto_message_name ##__get_packed_size(__obj) + sizeof(u32))
+#define pb_pksize(__obj, __proto_message_name) (__proto_message_name##__get_packed_size(__obj) + sizeof(u32))
 
-#define pb_repeated_size(__obj, __member)						\
-	((size_t)(sizeof(*(__obj)->__member) * (__obj)->n_ ##__member))
+#define pb_repeated_size(__obj, __member) ((size_t)(sizeof(*(__obj)->__member) * (__obj)->n_##__member))
 
-#define pb_msg(__base, __type)			\
-	container_of(__base, __type, base)
+#define pb_msg(__base, __type) container_of(__base, __type, base)
 
 #include <google/protobuf-c/protobuf-c.h>
 
@@ -35,9 +32,9 @@ struct collect_image_info {
 	unsigned flags;
 };
 
-#define COLLECT_SHARED		0x1	/* use shared memory for obj-s */
-#define COLLECT_NOFREE		0x2	/* don't free entry after callback */
-#define COLLECT_HAPPENED	0x4	/* image was opened and collected */
+#define COLLECT_SHARED	 0x1 /* use shared memory for obj-s */
+#define COLLECT_NOFREE	 0x2 /* don't free entry after callback */
+#define COLLECT_HAPPENED 0x4 /* image was opened and collected */
 
 extern int collect_image(struct collect_image_info *);
 extern int collect_entry(ProtobufCMessage *base, struct collect_image_info *cinfo);
@@ -57,6 +54,6 @@ static inline int collect_images(struct collect_image_info **array, unsigned siz
  * by providing space on stack, this should
  * be more than enough for most objects.
  */
-#define PB_PKOBJ_LOCAL_SIZE	1024
+#define PB_PKOBJ_LOCAL_SIZE 1024
 
 #endif /* __CR_PROTOBUF_H__ */
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 17d22e791..faf359073 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -11,24 +11,24 @@
  * That's the init process which usually inherit
  * all orphaned children in the system.
  */
-#define INIT_PID	(1)
+#define INIT_PID (1)
 struct pstree_item {
-	struct pstree_item	*parent;
-	struct list_head	children;	/* list of my children */
-	struct list_head	sibling;	/* linkage in my parent's children list */
+	struct pstree_item *parent;
+	struct list_head children; /* list of my children */
+	struct list_head sibling; /* linkage in my parent's children list */
 
-	struct pid		*pid;
-	pid_t			pgid;
-	pid_t			sid;
-	pid_t			born_sid;
+	struct pid *pid;
+	pid_t pgid;
+	pid_t sid;
+	pid_t born_sid;
 
-	int			nr_threads;	/* number of threads */
-	struct pid		*threads;	/* array of threads */
-	CoreEntry		**core;
-	TaskKobjIdsEntry	*ids;
+	int nr_threads; /* number of threads */
+	struct pid *threads; /* array of threads */
+	CoreEntry **core;
+	TaskKobjIdsEntry *ids;
 	union {
-		futex_t		task_st;
-		unsigned long	task_st_le_bits;
+		futex_t task_st;
+		unsigned long task_st_le_bits;
 	};
 };
 
@@ -38,7 +38,7 @@ static inline pid_t vpid(const struct pstree_item *i)
 }
 
 enum {
-	FDS_EVENT_BIT	= 0,
+	FDS_EVENT_BIT = 0,
 };
 #define FDS_EVENT (1 << FDS_EVENT_BIT)
 
@@ -68,8 +68,7 @@ static inline struct dmp_info *dmpi(const struct pstree_item *i)
 /* ids is allocated and initialized for all alive tasks */
 static inline int shared_fdtable(struct pstree_item *item)
 {
-	return (item->parent &&
-		item->ids->files_id == item->parent->ids->files_id);
+	return (item->parent && item->ids->files_id == item->parent->ids->files_id);
 }
 
 static inline bool is_alive_state(int state)
@@ -93,8 +92,7 @@ extern struct pid *pstree_pid_by_virt(pid_t pid);
 
 extern struct pstree_item *root_item;
 extern struct pstree_item *pstree_item_next(struct pstree_item *item);
-#define for_each_pstree_item(pi) \
-	for (pi = root_item; pi != NULL; pi = pstree_item_next(pi))
+#define for_each_pstree_item(pi) for (pi = root_item; pi != NULL; pi = pstree_item_next(pi))
 
 extern bool restore_before_setsid(struct pstree_item *child);
 extern int prepare_pstree(void);
diff --git a/criu/include/ptrace-compat.h b/criu/include/ptrace-compat.h
index e16fef036..a2f211129 100644
--- a/criu/include/ptrace-compat.h
+++ b/criu/include/ptrace-compat.h
@@ -7,9 +7,9 @@
 
 #ifndef CONFIG_HAS_PTRACE_PEEKSIGINFO
 struct ptrace_peeksiginfo_args {
-	__u64 off;	/* from which siginfo to start */
+	__u64 off; /* from which siginfo to start */
 	__u32 flags;
-	__u32 nr;	/* how may siginfos to take */
+	__u32 nr; /* how may siginfos to take */
 };
 #endif
 
diff --git a/criu/include/rbtree.h b/criu/include/rbtree.h
index 007950638..ba0a8100e 100644
--- a/criu/include/rbtree.h
+++ b/criu/include/rbtree.h
@@ -9,26 +9,32 @@
 
 #include "common/compiler.h"
 
-#define	RB_RED		0
-#define	RB_BLACK	1
-#define RB_MASK		3
+#define RB_RED	 0
+#define RB_BLACK 1
+#define RB_MASK	 3
 
 struct rb_node {
-	unsigned long	rb_parent_color; /* Keeps both parent anc color */
-	struct rb_node	*rb_right;
-	struct rb_node	*rb_left;
+	unsigned long rb_parent_color; /* Keeps both parent anc color */
+	struct rb_node *rb_right;
+	struct rb_node *rb_left;
 } __aligned(sizeof(long));
 
 struct rb_root {
-	struct rb_node	*rb_node;
+	struct rb_node *rb_node;
 };
 
-#define rb_parent(r)	((struct rb_node *)((r)->rb_parent_color & ~RB_MASK))
-#define rb_color(r)	((r)->rb_parent_color & RB_BLACK)
-#define rb_is_red(r)	(!rb_color(r))
-#define rb_is_black(r)	(rb_color(r))
-#define rb_set_red(r)	do { (r)->rb_parent_color &= ~RB_BLACK; } while (0)
-#define rb_set_black(r)	do { (r)->rb_parent_color |= RB_BLACK; } while (0)
+#define rb_parent(r)   ((struct rb_node *)((r)->rb_parent_color & ~RB_MASK))
+#define rb_color(r)    ((r)->rb_parent_color & RB_BLACK)
+#define rb_is_red(r)   (!rb_color(r))
+#define rb_is_black(r) (rb_color(r))
+#define rb_set_red(r)                              \
+	do {                                       \
+		(r)->rb_parent_color &= ~RB_BLACK; \
+	} while (0)
+#define rb_set_black(r)                           \
+	do {                                      \
+		(r)->rb_parent_color |= RB_BLACK; \
+	} while (0)
 
 static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p)
 {
@@ -40,16 +46,20 @@ static inline void rb_set_color(struct rb_node *rb, int color)
 	rb->rb_parent_color = (rb->rb_parent_color & ~RB_BLACK) | color;
 }
 
-#define RB_ROOT				(struct rb_root){ NULL, }
-#define	rb_entry(ptr, type, member)	container_of(ptr, type, member)
+#define RB_ROOT          \
+	(struct rb_root) \
+	{                \
+		NULL,    \
+	}
+#define rb_entry(ptr, type, member) container_of(ptr, type, member)
 
-#define RB_EMPTY_ROOT(root)		((root)->rb_node == NULL)
-#define RB_EMPTY_NODE(node)		(rb_parent(node) == node)
-#define RB_CLEAR_NODE(node)		(rb_set_parent(node, node))
+#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)
+#define RB_EMPTY_NODE(node) (rb_parent(node) == node)
+#define RB_CLEAR_NODE(node) (rb_set_parent(node, node))
 
 static inline void rb_init_node(struct rb_node *node)
 {
-	*node = (struct rb_node){ };
+	*node = (struct rb_node){};
 
 	RB_CLEAR_NODE(node);
 }
@@ -64,11 +74,9 @@ extern struct rb_node *rb_next(const struct rb_node *node);
 extern struct rb_node *rb_prev(const struct rb_node *node);
 
 /* Fast replacement of a single node without remove/rebalance/add/rebalance */
-extern void rb_replace_node(struct rb_node *victim, struct rb_node *new,
-			    struct rb_root *root);
+extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, struct rb_root *root);
 
-static inline void rb_link_node(struct rb_node *node, struct rb_node *parent,
-			 struct rb_node **rb_link)
+static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, struct rb_node **rb_link)
 {
 	node->rb_parent_color = (unsigned long)parent;
 	node->rb_left = node->rb_right = NULL;
@@ -76,10 +84,8 @@ static inline void rb_link_node(struct rb_node *node, struct rb_node *parent,
 	*rb_link = node;
 }
 
-static inline void rb_link_and_balance(struct rb_root *root,
-				struct rb_node *node,
-				struct rb_node *parent,
-				struct rb_node **rb_link)
+static inline void rb_link_and_balance(struct rb_root *root, struct rb_node *node, struct rb_node *parent,
+				       struct rb_node **rb_link)
 {
 	rb_link_node(node, parent, rb_link);
 	rb_insert_color(node, root);
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index dfb4e6b71..934d60cf9 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -28,14 +28,14 @@
 /*
  * These *must* be power of two values.
  */
-#define RESTORE_ARGS_SIZE		(512)
-#define RESTORE_STACK_REDZONE		(128)
-#define RESTORE_STACK_SIZE		(KILO(32))
+#define RESTORE_ARGS_SIZE     (512)
+#define RESTORE_STACK_REDZONE (128)
+#define RESTORE_STACK_SIZE    (KILO(32))
 
 struct restore_mem_zone {
-	u8				redzone[RESTORE_STACK_REDZONE];
-	u8				stack[RESTORE_STACK_SIZE];
-	u8				rt_sigframe[RESTORE_STACK_SIGFRAME];
+	u8 redzone[RESTORE_STACK_REDZONE];
+	u8 stack[RESTORE_STACK_SIZE];
+	u8 rt_sigframe[RESTORE_STACK_SIGFRAME];
 } __stack_aligned__;
 
 struct rst_sched_param {
@@ -57,66 +57,66 @@ struct restore_posix_timer {
  */
 
 struct thread_creds_args {
-	CredsEntry			creds;
+	CredsEntry creds;
 
-	unsigned int			cap_last_cap;
+	unsigned int cap_last_cap;
 
-	u32				cap_inh[CR_CAP_SIZE];
-	u32				cap_prm[CR_CAP_SIZE];
-	u32				cap_eff[CR_CAP_SIZE];
-	u32				cap_bnd[CR_CAP_SIZE];
+	u32 cap_inh[CR_CAP_SIZE];
+	u32 cap_prm[CR_CAP_SIZE];
+	u32 cap_eff[CR_CAP_SIZE];
+	u32 cap_bnd[CR_CAP_SIZE];
 
-	unsigned int			secbits;
-	char				*lsm_profile;
-	unsigned int			*groups;
-	char				*lsm_sockcreate;
+	unsigned int secbits;
+	char *lsm_profile;
+	unsigned int *groups;
+	char *lsm_sockcreate;
 
-	unsigned long			mem_lsm_profile_pos;
-	unsigned long			mem_lsm_sockcreate_pos;
-	unsigned long			mem_groups_pos;
+	unsigned long mem_lsm_profile_pos;
+	unsigned long mem_lsm_sockcreate_pos;
+	unsigned long mem_groups_pos;
 
-	unsigned long			mem_pos_next;
+	unsigned long mem_pos_next;
 };
 
 struct thread_seccomp_filter {
-	struct sock_fprog		sock_fprog;
-	unsigned int			flags;
+	struct sock_fprog sock_fprog;
+	unsigned int flags;
 };
 
 struct thread_restore_args {
-	struct restore_mem_zone		*mz;
+	struct restore_mem_zone *mz;
 
-	int				pid;
-	UserRegsEntry			gpregs;
-	u64				clear_tid_addr;
+	int pid;
+	UserRegsEntry gpregs;
+	u64 clear_tid_addr;
 
-	u64				futex_rla;
-	u32				futex_rla_len;
+	u64 futex_rla;
+	u32 futex_rla_len;
 
-	struct rst_sched_param		sp;
+	struct rst_sched_param sp;
 
-	struct task_restore_args	*ta;
+	struct task_restore_args *ta;
 
-	tls_t				tls;
+	tls_t tls;
 
-	siginfo_t			*siginfo;
-	unsigned int			siginfo_n;
+	siginfo_t *siginfo;
+	unsigned int siginfo_n;
 
-	int				pdeath_sig;
+	int pdeath_sig;
 
-	struct thread_creds_args	*creds_args;
+	struct thread_creds_args *creds_args;
 
-	int				seccomp_mode;
-	unsigned long			seccomp_filters_pos;
-	struct thread_seccomp_filter	*seccomp_filters;
-	void				*seccomp_filters_data;
-	unsigned int			seccomp_filters_n;
-	bool				seccomp_force_tsync;
+	int seccomp_mode;
+	unsigned long seccomp_filters_pos;
+	struct thread_seccomp_filter *seccomp_filters;
+	void *seccomp_filters_data;
+	unsigned int seccomp_filters_n;
+	bool seccomp_force_tsync;
 
-	char				comm[TASK_COMM_LEN];
+	char comm[TASK_COMM_LEN];
 } __aligned(64);
 
-typedef long (*thread_restore_fcall_t) (struct thread_restore_args *args);
+typedef long (*thread_restore_fcall_t)(struct thread_restore_args *args);
 
 struct restore_vma_io {
 	int nr_iovs;
@@ -124,112 +124,111 @@ struct restore_vma_io {
 	struct iovec iovs[0];
 };
 
-#define RIO_SIZE(niovs)	(sizeof(struct restore_vma_io) + (niovs) * sizeof(struct iovec))
+#define RIO_SIZE(niovs) (sizeof(struct restore_vma_io) + (niovs) * sizeof(struct iovec))
 
 struct task_restore_args {
-	struct thread_restore_args	*t;			/* thread group leader */
+	struct thread_restore_args *t; /* thread group leader */
 
-	int				fd_exe_link;		/* opened self->exe file */
-	int				logfd;
-	unsigned int			loglevel;
-	struct timeval			logstart;
+	int fd_exe_link; /* opened self->exe file */
+	int logfd;
+	unsigned int loglevel;
+	struct timeval logstart;
 
-	int				uffd;
-	bool				has_thp_enabled;
+	int uffd;
+	bool has_thp_enabled;
 
 	/* threads restoration */
-	int				nr_threads;		/* number of threads */
-	thread_restore_fcall_t		clone_restore_fn;	/* helper address for clone() call */
-	struct thread_restore_args	*thread_args;		/* array of thread arguments */
-	struct task_entries		*task_entries;
-	void				*rst_mem;
-	unsigned long			rst_mem_size;
+	int nr_threads; /* number of threads */
+	thread_restore_fcall_t clone_restore_fn; /* helper address for clone() call */
+	struct thread_restore_args *thread_args; /* array of thread arguments */
+	struct task_entries *task_entries;
+	void *rst_mem;
+	unsigned long rst_mem_size;
 
 	/* Below arrays get remapped from RM_PRIVATE in sigreturn_restore */
-	VmaEntry			*vmas;
-	unsigned int			vmas_n;
+	VmaEntry *vmas;
+	unsigned int vmas_n;
 
-	int				vma_ios_fd;
-	struct restore_vma_io		*vma_ios;
-	unsigned int			vma_ios_n;
+	int vma_ios_fd;
+	struct restore_vma_io *vma_ios;
+	unsigned int vma_ios_n;
 
-	struct restore_posix_timer	*posix_timers;
-	unsigned int			posix_timers_n;
+	struct restore_posix_timer *posix_timers;
+	unsigned int posix_timers_n;
 
-	struct restore_timerfd		*timerfd;
-	unsigned int			timerfd_n;
+	struct restore_timerfd *timerfd;
+	unsigned int timerfd_n;
 
-	siginfo_t			*siginfo;
-	unsigned int			siginfo_n;
+	siginfo_t *siginfo;
+	unsigned int siginfo_n;
 
-	struct rst_tcp_sock		*tcp_socks;
-	unsigned int			tcp_socks_n;
+	struct rst_tcp_sock *tcp_socks;
+	unsigned int tcp_socks_n;
 
-	struct rst_aio_ring		*rings;
-	unsigned int			rings_n;
+	struct rst_aio_ring *rings;
+	unsigned int rings_n;
 
-	struct rlimit64			*rlims;
-	unsigned int			rlims_n;
+	struct rlimit64 *rlims;
+	unsigned int rlims_n;
 
-	pid_t				*helpers /* the TASK_HELPERS to wait on at the end of restore */;
-	unsigned int			helpers_n;
+	pid_t *helpers /* the TASK_HELPERS to wait on at the end of restore */;
+	unsigned int helpers_n;
 
-	pid_t				*zombies;
-	unsigned int			zombies_n;
+	pid_t *zombies;
+	unsigned int zombies_n;
 
-	int				*inotify_fds; /* fds to cleanup inotify events at CR_STATE_RESTORE_SIGCHLD stage */
-	unsigned int			inotify_fds_n;
+	int *inotify_fds; /* fds to cleanup inotify events at CR_STATE_RESTORE_SIGCHLD stage */
+	unsigned int inotify_fds_n;
 
 	/* * * * * * * * * * * * * * * * * * * * */
 
-	unsigned long			task_size;
-	unsigned long			premmapped_addr;
-	unsigned long			premmapped_len;
-	rt_sigaction_t			sigchld_act;
+	unsigned long task_size;
+	unsigned long premmapped_addr;
+	unsigned long premmapped_len;
+	rt_sigaction_t sigchld_act;
 
-	void				*bootstrap_start;
-	unsigned long			bootstrap_len;
+	void *bootstrap_start;
+	unsigned long bootstrap_len;
 
-	struct itimerval		itimers[3];
+	struct itimerval itimers[3];
 
-	MmEntry				mm;
-	auxv_t				mm_saved_auxv[AT_VECTOR_SIZE];
-	u32				mm_saved_auxv_size;
-	char				comm[TASK_COMM_LEN];
+	MmEntry mm;
+	auxv_t mm_saved_auxv[AT_VECTOR_SIZE];
+	u32 mm_saved_auxv_size;
+	char comm[TASK_COMM_LEN];
 
 	/*
 	 * proc_fd is a handle to /proc that the restorer blob can use to open
 	 * files there, because some of them can't be opened before the
 	 * restorer blob is called.
 	 */
-	int				proc_fd;
+	int proc_fd;
 
-	int				seccomp_mode;
+	int seccomp_mode;
 
-	bool				compatible_mode;
+	bool compatible_mode;
 
-	bool				can_map_vdso;
-	bool				auto_dedup;
-	unsigned long			vdso_rt_size;
-	struct vdso_maps		vdso_maps_rt;		/* runtime vdso symbols */
-	unsigned long			vdso_rt_parked_at;	/* safe place to keep vdso */
-	void				**breakpoint;
+	bool can_map_vdso;
+	bool auto_dedup;
+	unsigned long vdso_rt_size;
+	struct vdso_maps vdso_maps_rt; /* runtime vdso symbols */
+	unsigned long vdso_rt_parked_at; /* safe place to keep vdso */
+	void **breakpoint;
 
-	enum faults			fault_strategy;
+	enum faults fault_strategy;
 #ifdef ARCH_HAS_LONG_PAGES
-	unsigned			page_size;
+	unsigned page_size;
 #endif
-	int				lsm_type;
-	int				child_subreaper;
-	bool				has_clone3_set_tid;
+	int lsm_type;
+	int child_subreaper;
+	bool has_clone3_set_tid;
 } __aligned(64);
 
 /*
  * For arm64 stack needs to aligned to 16 bytes.
  * Hence align to 16 bytes for all
 */
-#define RESTORE_ALIGN_STACK(start, size)	\
-	(ALIGN((start) + (size) - 16, 16))
+#define RESTORE_ALIGN_STACK(start, size) (ALIGN((start) + (size)-16, 16))
 
 static inline unsigned long restorer_stack(struct restore_mem_zone *mz)
 {
@@ -245,12 +244,12 @@ enum {
 	 * The first stated stage is CR_STATE_ROOT_TASK which is started
 	 * right before calling fork_with_pid() for the root_item.
 	 */
-	CR_STATE_FAIL		= -1,
+	CR_STATE_FAIL = -1,
 	/*
 	 * Root task is created and does some pre-checks.
 	 * After the stage ACT_SETUP_NS scripts are performed.
 	 */
-	CR_STATE_ROOT_TASK	= 0,
+	CR_STATE_ROOT_TASK = 0,
 	/*
 	 * The prepare_namespace() is called.
 	 * After the stage criu opens root task's mntns and
@@ -304,14 +303,14 @@ enum {
 	CR_STATE_COMPLETE
 };
 
-#define restore_finish_stage(__v, __stage) ({			\
-		futex_dec_and_wake(&(__v)->nr_in_progress);	\
-		futex_wait_while(&(__v)->start, __stage);	\
-		(s32) futex_get(&(__v)->start);			\
+#define restore_finish_stage(__v, __stage)                  \
+	({                                                  \
+		futex_dec_and_wake(&(__v)->nr_in_progress); \
+		futex_wait_while(&(__v)->start, __stage);   \
+		(s32) futex_get(&(__v)->start);             \
 	})
 
-
-#define __r_sym(name)			restorer_sym ## name
-#define restorer_sym(rblob, name)	(void*)(rblob + __r_sym(name))
+#define __r_sym(name)		  restorer_sym##name
+#define restorer_sym(rblob, name) (void *)(rblob + __r_sym(name))
 
 #endif /* __CR_RESTORER_H__ */
diff --git a/criu/include/rst-malloc.h b/criu/include/rst-malloc.h
index 67391ba77..918359a93 100644
--- a/criu/include/rst-malloc.h
+++ b/criu/include/rst-malloc.h
@@ -52,9 +52,10 @@ extern void rst_mem_switch_to_private(void);
  */
 extern unsigned long rst_mem_align_cpos(int type);
 extern void *rst_mem_remap_ptr(unsigned long pos, int type);
-#define RST_MEM_FIXUP_PPTR(ptr) do {				\
-	ptr = rst_mem_remap_ptr((unsigned long)ptr, RM_PRIVATE);\
-} while (0)
+#define RST_MEM_FIXUP_PPTR(ptr)                                          \
+	do {                                                             \
+		ptr = rst_mem_remap_ptr((unsigned long)ptr, RM_PRIVATE); \
+	} while (0)
 
 /*
  * Allocate and free objects. We don't need to free arbitrary
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 3dc119a93..2e2107b0e 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -17,59 +17,59 @@ struct task_entries {
 };
 
 struct fdt {
-	int			nr;		/* How many tasks share this fd table */
-	pid_t			pid;		/* Who should restore this fd table */
+	int nr; /* How many tasks share this fd table */
+	pid_t pid; /* Who should restore this fd table */
 	/*
 	 * The fd table is ready for restoing, if fdt_lock is equal to nr
 	 * The fdt table was restrored, if fdt_lock is equal to nr + 1
 	 */
-	futex_t			fdt_lock;
+	futex_t fdt_lock;
 };
 
 struct rst_info {
-	struct list_head	fds;
+	struct list_head fds;
 
-	void			*premmapped_addr;
-	unsigned long		premmapped_len;
-	unsigned long		clone_flags;
+	void *premmapped_addr;
+	unsigned long premmapped_len;
+	unsigned long clone_flags;
 
-	void			*munmap_restorer;
+	void *munmap_restorer;
 
 	int service_fd_id;
-	struct fdt		*fdt;
+	struct fdt *fdt;
 
-	struct vm_area_list	vmas;
-	MmEntry		*mm;
-	struct list_head	vma_io;
-	unsigned int		pages_img_id;
+	struct vm_area_list vmas;
+	MmEntry *mm;
+	struct list_head vma_io;
+	unsigned int pages_img_id;
 
-	u32			cg_set;
+	u32 cg_set;
 
 	union {
-		struct pstree_item	*pgrp_leader;
-		futex_t			pgrp_set;
+		struct pstree_item *pgrp_leader;
+		futex_t pgrp_set;
 	};
 
-	struct file_desc	*cwd;
-	struct file_desc	*root;
-	bool			has_umask;
-	u32			umask;
+	struct file_desc *cwd;
+	struct file_desc *root;
+	bool has_umask;
+	u32 umask;
 
 	/*
 	 * We set this flag when process has seccomp filters
 	 * so that we know to suspend them before we unmap the
 	 * restorer blob.
 	 */
-	bool			has_seccomp;
+	bool has_seccomp;
 	/*
 	 * To be compatible with old images where filters
 	 * are bound to group leader and we need to use tsync flag.
 	 */
-	bool			has_old_seccomp_filter;
+	bool has_old_seccomp_filter;
 
-	bool			has_thp_enabled;
+	bool has_thp_enabled;
 
-	void			*breakpoint;
+	void *breakpoint;
 };
 
 extern struct task_entries *task_entries;
diff --git a/criu/include/sched.h b/criu/include/sched.h
index 78f65e3b7..9f9f993ce 100644
--- a/criu/include/sched.h
+++ b/criu/include/sched.h
@@ -4,10 +4,10 @@
 #include <linux/types.h>
 
 #ifndef ptr_to_u64
-#define ptr_to_u64(ptr)	((__u64)((uintptr_t)(ptr)))
+#define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
 #endif
 #ifndef u64_to_ptr
-#define u64_to_ptr(x)	((void *)(uintptr_t)x)
+#define u64_to_ptr(x) ((void *)(uintptr_t)x)
 #endif
 
 /*
diff --git a/criu/include/seccomp.h b/criu/include/seccomp.h
index 8e200124e..e20b9d655 100644
--- a/criu/include/seccomp.h
+++ b/criu/include/seccomp.h
@@ -45,19 +45,19 @@ struct rb_node;
  * which has no filters yet.
  */
 struct seccomp_filter_chain {
-	struct seccomp_filter_chain	*prev;
-	SeccompFilter			filter;
+	struct seccomp_filter_chain *prev;
+	SeccompFilter filter;
 };
 
 struct seccomp_entry {
-	struct rb_node			node;
-	struct seccomp_entry		*next;
-	pid_t				tid_real;
-	size_t				img_filter_pos;
-	unsigned int			mode;
+	struct rb_node node;
+	struct seccomp_entry *next;
+	pid_t tid_real;
+	size_t img_filter_pos;
+	unsigned int mode;
 
-	struct seccomp_filter_chain	*chain;
-	size_t				nr_chains;
+	struct seccomp_filter_chain *chain;
+	size_t nr_chains;
 };
 
 extern struct seccomp_entry *seccomp_lookup(pid_t tid_real, bool create, bool mandatory);
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index b03bdaf59..e75e8444c 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -15,18 +15,18 @@ enum sfd_type {
 	LOG_FD_OFF,
 	IMG_FD_OFF,
 	IMG_STREAMER_FD_OFF,
-	PROC_FD_OFF,		/* fd with /proc for all proc_ calls */
+	PROC_FD_OFF, /* fd with /proc for all proc_ calls */
 	PROC_PID_FD_OFF,
 	PROC_SELF_FD_OFF,
-	CR_PROC_FD_OFF,		/* some other's proc fd:
+	CR_PROC_FD_OFF, /* some other's proc fd:
 				 *  - For dump -- target ns' proc
 				 *  - For restore -- CRIU ns' proc
 				 */
-	ROOT_FD_OFF,		/* Root of the namespace we dump/restore */
+	ROOT_FD_OFF, /* Root of the namespace we dump/restore */
 	CGROUP_YARD,
-	USERNSD_SK,		/* Socket for usernsd */
-	NS_FD_OFF,		/* Node's net namespace fd */
-	TRANSPORT_FD_OFF,	/* to transfer file descriptors */
+	USERNSD_SK, /* Socket for usernsd */
+	NS_FD_OFF, /* Node's net namespace fd */
+	TRANSPORT_FD_OFF, /* to transfer file descriptors */
 	RPC_SK_OFF,
 	FDSTORE_SK_OFF,
 
@@ -36,7 +36,6 @@ enum sfd_type {
 struct pstree_item;
 extern bool sfds_protected;
 
-
 extern const char *sfd_type_name(enum sfd_type type);
 extern int init_service_fd(void);
 extern int get_service_fd(enum sfd_type type);
diff --git a/criu/include/shmem.h b/criu/include/shmem.h
index 798e28f34..813ef630e 100644
--- a/criu/include/shmem.h
+++ b/criu/include/shmem.h
@@ -17,7 +17,6 @@ extern int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shm
 extern int restore_sysv_shmem_content(void *addr, unsigned long size, unsigned long shmid);
 extern int restore_memfd_shmem_content(int fd, unsigned long shmid, unsigned long size);
 
-
-#define SYSV_SHMEM_SKIP_FD	(0x7fffffff)
+#define SYSV_SHMEM_SKIP_FD (0x7fffffff)
 
 #endif /* __CR_SHMEM_H__ */
diff --git a/criu/include/sigframe.h b/criu/include/sigframe.h
index b63d9f0e5..539d7b17c 100644
--- a/criu/include/sigframe.h
+++ b/criu/include/sigframe.h
@@ -8,9 +8,7 @@
 #include <compel/asm/sigframe.h>
 #include "images/core.pb-c.h"
 
-extern int construct_sigframe(struct rt_sigframe *sigframe,
-			      struct rt_sigframe *rsigframe,
-			      k_rtsigset_t *blkset,
+extern int construct_sigframe(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe, k_rtsigset_t *blkset,
 			      CoreEntry *core);
 
 #endif /* __CR_SIGFRAME_H__ */
diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index dec67ca6c..c832d6387 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -8,39 +8,39 @@
 #include "common/list.h"
 #include "images/sk-inet.pb-c.h"
 
-#define INET_ADDR_LEN		48 /* max of INET_ADDRSTRLEN and INET6_ADDRSTRLEN */
+#define INET_ADDR_LEN 48 /* max of INET_ADDRSTRLEN and INET6_ADDRSTRLEN */
 #ifndef TCP_REPAIR
-#define TCP_REPAIR		19      /* TCP sock is under repair right now */
-#define TCP_REPAIR_QUEUE	20
-#define TCP_QUEUE_SEQ		21
-#define TCP_REPAIR_OPTIONS	22
+#define TCP_REPAIR	   19 /* TCP sock is under repair right now */
+#define TCP_REPAIR_QUEUE   20
+#define TCP_QUEUE_SEQ	   21
+#define TCP_REPAIR_OPTIONS 22
 #endif
 
 #ifndef IP_HDRINCL
-# define IP_HDRINCL		3
+#define IP_HDRINCL 3
 #endif
 
 #ifndef IP_NODEFRAG
-# define IP_NODEFRAG		22
+#define IP_NODEFRAG 22
 #endif
 
 #ifndef IPV6_HDRINCL
-# define IPV6_HDRINCL		36
+#define IPV6_HDRINCL 36
 #endif
 
 struct inet_sk_desc {
-	struct socket_desc	sd;
-	unsigned int		type;
-	unsigned int		src_port;
-	unsigned int		dst_port;
-	unsigned int		state;
-	unsigned int		rqlen;
-	unsigned int		wqlen; /* sent + unsent data */
-	unsigned int		uwqlen; /* unsent data */
-	unsigned int		src_addr[4];
-	unsigned int		dst_addr[4];
-	unsigned short		shutdown;
-	bool			cork;
+	struct socket_desc sd;
+	unsigned int type;
+	unsigned int src_port;
+	unsigned int dst_port;
+	unsigned int state;
+	unsigned int rqlen;
+	unsigned int wqlen; /* sent + unsent data */
+	unsigned int uwqlen; /* unsent data */
+	unsigned int src_addr[4];
+	unsigned int dst_addr[4];
+	unsigned short shutdown;
+	bool cork;
 
 	int rfd;
 	int cpt_reuseaddr;
@@ -68,7 +68,7 @@ extern int inet_bind(int sk, struct inet_sk_info *);
 extern int inet_connect(int sk, struct inet_sk_info *);
 
 #ifdef CR_NOGLIBC
-#define setsockopt	sys_setsockopt
+#define setsockopt sys_setsockopt
 #endif
 static inline void tcp_repair_off(int fd)
 {
@@ -86,20 +86,19 @@ extern void cpt_unlock_tcp_connections(void);
 extern int dump_one_tcp(int sk, struct inet_sk_desc *sd, SkOptsEntry *soe);
 extern int restore_one_tcp(int sk, struct inet_sk_info *si);
 
-#define SK_EST_PARAM	"tcp-established"
+#define SK_EST_PARAM	  "tcp-established"
 #define SK_INFLIGHT_PARAM "skip-in-flight"
-#define SK_CLOSE_PARAM	"tcp-close"
+#define SK_CLOSE_PARAM	  "tcp-close"
 
 struct task_restore_args;
 int prepare_tcp_socks(struct task_restore_args *);
 
 struct rst_tcp_sock {
-	int	sk;
-	bool	reuseaddr;
+	int sk;
+	bool reuseaddr;
 };
 
 union libsoccr_addr;
-int restore_sockaddr(union libsoccr_addr *sa,
-		int family, u32 pb_port, u32 *pb_addr, u32 ifindex);
+int restore_sockaddr(union libsoccr_addr *sa, int family, u32 pb_port, u32 *pb_addr, u32 ifindex);
 
 #endif /* __CR_SK_INET_H__ */
diff --git a/criu/include/sk-packet.h b/criu/include/sk-packet.h
index a0738ae0c..5fe6d3d62 100644
--- a/criu/include/sk-packet.h
+++ b/criu/include/sk-packet.h
@@ -2,7 +2,7 @@
 #define __CR_SK_PACKET_H__
 
 #ifndef PACKET_TIMESTAMP
-#define PACKET_TIMESTAMP	17
+#define PACKET_TIMESTAMP 17
 #endif
 
 struct cr_imgset;
@@ -22,7 +22,7 @@ extern int packet_receive_one(struct nlmsghdr *h, struct ns_id *ns, void *arg);
 #endif
 
 #ifndef PACKET_FANOUT
-#define PACKET_FANOUT	18
+#define PACKET_FANOUT 18
 #endif
 
 #ifndef TPACKET3_HDRLEN
diff --git a/criu/include/sockets.h b/criu/include/sockets.h
index e971f3efd..3e8f3d601 100644
--- a/criu/include/sockets.h
+++ b/criu/include/sockets.h
@@ -17,11 +17,11 @@ struct nlmsghdr;
 struct cr_img;
 
 struct socket_desc {
-	unsigned int		family;
-	unsigned int		ino;
-	struct socket_desc	*next;
-	struct ns_id		*sk_ns;
-	int			already_dumped;
+	unsigned int family;
+	unsigned int ino;
+	struct socket_desc *next;
+	struct ns_id *sk_ns;
+	int already_dumped;
 };
 
 extern int dump_socket(struct fd_parms *p, int lfd, FdinfoEntry *);
@@ -65,23 +65,24 @@ extern int unix_prepare_root_shared(void);
 extern void init_sk_info_hash(void);
 
 extern int do_dump_opt(int sk, int level, int name, void *val, int len);
-#define dump_opt(s, l, n, f)	do_dump_opt(s, l, n, f, sizeof(*f))
+#define dump_opt(s, l, n, f) do_dump_opt(s, l, n, f, sizeof(*f))
 extern int do_restore_opt(int sk, int level, int name, void *val, int len);
-#define restore_opt(s, l, n, f)	do_restore_opt(s, l, n, f, sizeof(*f))
+#define restore_opt(s, l, n, f) do_restore_opt(s, l, n, f, sizeof(*f))
 
-#define sk_encode_shutdown(img, mask) do {			\
+#define sk_encode_shutdown(img, mask)                     \
+	do {                                              \
 		/*						\
 		 * protobuf SK_SHUTDOWN__ bits match those	\
 		 * reported by kernel				\
-		 */						\
-		(img)->shutdown = mask;				\
-		if ((img)->shutdown != SK_SHUTDOWN__NONE)	\
-			(img)->has_shutdown = true;		\
+		 */                                 \
+		(img)->shutdown = mask;                   \
+		if ((img)->shutdown != SK_SHUTDOWN__NONE) \
+			(img)->has_shutdown = true;       \
 	} while (0)
 
 static inline int sk_decode_shutdown(int val)
 {
-	static const int hows[] = {-1, SHUT_RD, SHUT_WR, SHUT_RDWR};
+	static const int hows[] = { -1, SHUT_RD, SHUT_WR, SHUT_RDWR };
 	return hows[val];
 }
 
@@ -94,7 +95,7 @@ static inline int sk_decode_shutdown(int val)
 extern int set_netns(uint32_t ns_id);
 
 #ifndef SIOCGSKNS
-#define SIOCGSKNS	0x894C		/* get socket network namespace */
+#define SIOCGSKNS 0x894C /* get socket network namespace */
 #endif
 
 extern int kerndat_socket_netns(void);
@@ -107,19 +108,19 @@ extern const char *socket_proto_name(unsigned int proto, char *nm, size_t size);
 
 #define __tcp_state_name(state, a)	tcp_state_name(state, a, sizeof(a))
 #define __socket_type_name(type, a)	socket_type_name(type, a, sizeof(a))
-#define __socket_family_name(family, a)	socket_family_name(family, a, sizeof(a))
+#define __socket_family_name(family, a) socket_family_name(family, a, sizeof(a))
 #define __socket_proto_name(proto, a)	socket_proto_name(proto, a, sizeof(a))
 
-#define __socket_info_helper(__h, __v)				\
-	({							\
-		char *__nm = alloca(32);			\
-		const char *__r = __h(__v, __nm, 32);		\
-		__r;						\
+#define __socket_info_helper(__h, __v)                \
+	({                                            \
+		char *__nm = alloca(32);              \
+		const char *__r = __h(__v, __nm, 32); \
+		__r;                                  \
 	})
 
-#define ___tcp_state_name(state)	__socket_info_helper(tcp_state_name, state)
-#define ___socket_type_name(type)	__socket_info_helper(socket_type_name, type)
-#define ___socket_family_name(family)	__socket_info_helper(socket_family_name, family)
-#define ___socket_proto_name(proto)	__socket_info_helper(socket_proto_name, proto)
+#define ___tcp_state_name(state)      __socket_info_helper(tcp_state_name, state)
+#define ___socket_type_name(type)     __socket_info_helper(socket_type_name, type)
+#define ___socket_family_name(family) __socket_info_helper(socket_family_name, family)
+#define ___socket_proto_name(proto)   __socket_info_helper(socket_proto_name, proto)
 
 #endif /* __CR_SOCKETS_H__ */
diff --git a/criu/include/stats.h b/criu/include/stats.h
index 5d408b7b1..d8dd15998 100644
--- a/criu/include/stats.h
+++ b/criu/include/stats.h
@@ -47,8 +47,8 @@ enum {
 extern void cnt_add(int c, unsigned long val);
 extern void cnt_sub(int c, unsigned long val);
 
-#define DUMP_STATS	1
-#define RESTORE_STATS	2
+#define DUMP_STATS    1
+#define RESTORE_STATS 2
 
 extern int init_stats(int what);
 extern void write_stats(int what);
diff --git a/criu/include/string.h b/criu/include/string.h
index bc5f9d219..e11a42058 100644
--- a/criu/include/string.h
+++ b/criu/include/string.h
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 
 #ifdef CONFIG_HAS_LIBBSD
-# include <bsd/string.h>
+#include <bsd/string.h>
 #endif
 
 #include "common/config.h"
diff --git a/criu/include/sysctl.h b/criu/include/sysctl.h
index e271f5ead..ac7924dcd 100644
--- a/criu/include/sysctl.h
+++ b/criu/include/sysctl.h
@@ -2,10 +2,10 @@
 #define __CR_SYSCTL_H__
 
 struct sysctl_req {
-	char	*name;
-	void	*arg;
-	int	type;
-	int	flags;
+	char *name;
+	void *arg;
+	int type;
+	int flags;
 };
 
 extern int sysctl_op(struct sysctl_req *req, size_t nr_req, int op, unsigned int ns);
@@ -15,27 +15,27 @@ enum {
 	CTL_WRITE,
 };
 
-#define CTL_SHIFT	4	/* Up to 16 types */
+#define CTL_SHIFT 4 /* Up to 16 types */
 
-#define CTL_U32		1	/* Single u32 */
-#define CTL_U64		2	/* Single u64 */
-#define __CTL_U32A	3	/* Array of u32 */
-#define __CTL_U64A	4	/* Array of u64 */
-#define __CTL_STR	5	/* String */
-#define CTL_32		6	/* Single s32 */
+#define CTL_U32	   1 /* Single u32 */
+#define CTL_U64	   2 /* Single u64 */
+#define __CTL_U32A 3 /* Array of u32 */
+#define __CTL_U64A 4 /* Array of u64 */
+#define __CTL_STR  5 /* String */
+#define CTL_32	   6 /* Single s32 */
 
-#define CTL_U32A(n)	(__CTL_U32A | ((n)   << CTL_SHIFT))
-#define CTL_U64A(n)	(__CTL_U64A | ((n)   << CTL_SHIFT))
-#define CTL_STR(len)	(__CTL_STR  | ((len) << CTL_SHIFT))
+#define CTL_U32A(n)  (__CTL_U32A | ((n) << CTL_SHIFT))
+#define CTL_U64A(n)  (__CTL_U64A | ((n) << CTL_SHIFT))
+#define CTL_STR(len) (__CTL_STR | ((len) << CTL_SHIFT))
 
-#define CTL_LEN(t)	((t) >> CTL_SHIFT)
-#define CTL_TYPE(t)	((t) & ((1 << CTL_SHIFT) - 1))
+#define CTL_LEN(t)  ((t) >> CTL_SHIFT)
+#define CTL_TYPE(t) ((t) & ((1 << CTL_SHIFT) - 1))
 
 /*
  * Some entries might be missing mark them as optional.
  */
 #define CTL_FLAGS_OPTIONAL	1
 #define CTL_FLAGS_HAS		2
-#define CTL_FLAGS_READ_EIO_SKIP	4
+#define CTL_FLAGS_READ_EIO_SKIP 4
 
 #endif /* __CR_SYSCTL_H__ */
diff --git a/criu/include/sysfs_parse.h b/criu/include/sysfs_parse.h
index 3ba06ed56..ff0e61148 100644
--- a/criu/include/sysfs_parse.h
+++ b/criu/include/sysfs_parse.h
@@ -2,9 +2,9 @@
 #define __CR_SYSFS_PARSE_H__
 
 #define SYSFS_AUFS	"/sys/fs/aufs/"
-#define SBINFO_LEN	(3 + 16 + 1)			/* si_%lx */
-#define SBINFO_PATH_LEN	(sizeof SYSFS_AUFS + SBINFO_LEN) /* /sys/fs/aufs/<sbinfo> */
-#define AUFSBR_PATH_LEN	(SBINFO_PATH_LEN + 6 + 1)	/* /sys/fs/aufs/<sbinfo>/br%3d */
+#define SBINFO_LEN	(3 + 16 + 1) /* si_%lx */
+#define SBINFO_PATH_LEN (sizeof SYSFS_AUFS + SBINFO_LEN) /* /sys/fs/aufs/<sbinfo> */
+#define AUFSBR_PATH_LEN (SBINFO_PATH_LEN + 6 + 1) /* /sys/fs/aufs/<sbinfo>/br%3d */
 
 struct mount_info;
 struct vma_area;
@@ -14,4 +14,3 @@ extern int fixup_aufs_vma_fd(struct vma_area *vma, int vm_file_fd);
 extern void free_aufs_branches(void);
 
 #endif /* __CR_SYSFS_PARSE_H__ */
-
diff --git a/criu/include/timerfd.h b/criu/include/timerfd.h
index 2e42a74fa..866cb13c7 100644
--- a/criu/include/timerfd.h
+++ b/criu/include/timerfd.h
@@ -11,12 +11,12 @@
 struct pstree_item;
 
 struct restore_timerfd {
-	int			id;
-	int			fd;
-	int			clockid;
-	int			settime_flags;
-	unsigned long		ticks;
-	struct itimerspec	val;
+	int id;
+	int fd;
+	int clockid;
+	int settime_flags;
+	unsigned long ticks;
+	struct itimerspec val;
 };
 
 extern const struct fdtype_ops timerfd_dump_ops;
@@ -29,18 +29,16 @@ extern int check_timerfd(void);
 extern int is_timerfd_link(char *link);
 
 #ifndef TFD_TIMER_ABSTIME
-# define TFD_TIMER_ABSTIME	(1 << 0)
+#define TFD_TIMER_ABSTIME (1 << 0)
 #endif
 
 #ifndef TFD_IOC_SET_TICKS
-# define TFD_IOC_SET_TICKS	_IOW('T', 0, u64)
+#define TFD_IOC_SET_TICKS _IOW('T', 0, u64)
 #endif
 
 static inline int verify_timerfd(TimerfdEntry *tfe)
 {
-	if (tfe->clockid != CLOCK_REALTIME &&
-	    tfe->clockid != CLOCK_BOOTTIME &&
-	    tfe->clockid != CLOCK_MONOTONIC) {
+	if (tfe->clockid != CLOCK_REALTIME && tfe->clockid != CLOCK_BOOTTIME && tfe->clockid != CLOCK_MONOTONIC) {
 		pr_err("Unknown clock type %d for %#x\n", tfe->clockid, tfe->id);
 		return -1;
 	}
@@ -48,5 +46,4 @@ static inline int verify_timerfd(TimerfdEntry *tfe)
 	return 0;
 }
 
-
 #endif /* __CR_TIMERFD_H__ */
diff --git a/criu/include/tls.h b/criu/include/tls.h
index b48e4b480..26f9976fd 100644
--- a/criu/include/tls.h
+++ b/criu/include/tls.h
@@ -1,7 +1,7 @@
 #ifndef __CR_TLS_H__
 #define __CR_TLS_H__
 
-# ifdef CONFIG_GNUTLS
+#ifdef CONFIG_GNUTLS
 
 int tls_x509_init(int sockfd, bool is_server);
 void tls_terminate_session(void);
@@ -12,13 +12,13 @@ ssize_t tls_recv(void *buf, size_t len, int flags);
 int tls_send_data_from_fd(int fd, unsigned long len);
 int tls_recv_data_to_fd(int fd, unsigned long len);
 
-# else /* CONFIG_GNUTLS */
+#else /* CONFIG_GNUTLS */
 
 #define tls_x509_init(sockfd, is_server) (0)
-#define tls_send(buf, len, flags) (-1)
-#define tls_recv(buf, len, flags) (-1)
-#define tls_send_data_from_fd(fd, len) (-1)
-#define tls_recv_data_to_fd(fd, len) (-1)
+#define tls_send(buf, len, flags)	 (-1)
+#define tls_recv(buf, len, flags)	 (-1)
+#define tls_send_data_from_fd(fd, len)	 (-1)
+#define tls_recv_data_to_fd(fd, len)	 (-1)
 #define tls_terminate_session()
 
 #endif /* CONFIG_HAS_GNUTLS */
diff --git a/criu/include/tty.h b/criu/include/tty.h
index 8419593e5..3f9c53116 100644
--- a/criu/include/tty.h
+++ b/criu/include/tty.h
@@ -7,11 +7,11 @@
 #include "files.h"
 
 /* Kernel's limit */
-#define TERMIOS_NCC	19
+#define TERMIOS_NCC 19
 
 /* Popular serial console's majors, which not defined in <linux/major.h> */
-#define USB_SERIAL_MAJOR	188
-#define LOW_DENSE_SERIAL_MAJOR	204
+#define USB_SERIAL_MAJOR       188
+#define LOW_DENSE_SERIAL_MAJOR 204
 
 extern const struct fdtype_ops tty_dump_ops;
 
@@ -36,6 +36,6 @@ extern int tty_init_restore(void);
 
 extern int devpts_check_bindmount(struct mount_info *m);
 
-#define OPT_SHELL_JOB	"shell-job"
+#define OPT_SHELL_JOB "shell-job"
 
 #endif /* __CR_TTY_H__ */
diff --git a/criu/include/tun.h b/criu/include/tun.h
index b82c445a7..200ead22b 100644
--- a/criu/include/tun.h
+++ b/criu/include/tun.h
@@ -2,7 +2,7 @@
 #define __CR_TUN_H__
 
 #ifndef TUN_MINOR
-#define TUN_MINOR	200
+#define TUN_MINOR 200
 #endif
 
 extern struct ns_id *ns;
diff --git a/criu/include/unix_diag.h b/criu/include/unix_diag.h
index d88d52fd3..cf612b248 100644
--- a/criu/include/unix_diag.h
+++ b/criu/include/unix_diag.h
@@ -2,30 +2,30 @@
 #define __CR_UNIX_DIAG_H__
 
 struct unix_diag_req {
-	u8	sdiag_family;
-	u8	sdiag_protocol;
-	u16	pad;
-	u32	udiag_states;
-	u32	udiag_ino;
-	u32	udiag_show;
-	u32	udiag_cookie[2];
+	u8 sdiag_family;
+	u8 sdiag_protocol;
+	u16 pad;
+	u32 udiag_states;
+	u32 udiag_ino;
+	u32 udiag_show;
+	u32 udiag_cookie[2];
 };
 
-#define UDIAG_SHOW_NAME		0x00000001	/* show name (not path) */
-#define UDIAG_SHOW_VFS		0x00000002	/* show VFS inode info */
-#define UDIAG_SHOW_PEER		0x00000004	/* show peer socket info */
-#define UDIAG_SHOW_ICONS	0x00000008	/* show pending connections */
-#define UDIAG_SHOW_RQLEN	0x00000010	/* show skb receive queue len */
-#define UDIAG_SHOW_MEMINFO	0x00000020	/* show memory info of a socket */
+#define UDIAG_SHOW_NAME	   0x00000001 /* show name (not path) */
+#define UDIAG_SHOW_VFS	   0x00000002 /* show VFS inode info */
+#define UDIAG_SHOW_PEER	   0x00000004 /* show peer socket info */
+#define UDIAG_SHOW_ICONS   0x00000008 /* show pending connections */
+#define UDIAG_SHOW_RQLEN   0x00000010 /* show skb receive queue len */
+#define UDIAG_SHOW_MEMINFO 0x00000020 /* show memory info of a socket */
 
 struct unix_diag_msg {
-	u8	udiag_family;
-	u8	udiag_type;
-	u8	udiag_state;
-	u8	pad;
+	u8 udiag_family;
+	u8 udiag_type;
+	u8 udiag_state;
+	u8 pad;
 
-	u32	udiag_ino;
-	u32	udiag_cookie[2];
+	u32 udiag_ino;
+	u32 udiag_cookie[2];
 };
 
 enum {
@@ -53,13 +53,13 @@ enum {
 };
 
 struct unix_diag_vfs {
-	u32	udiag_vfs_ino;
-	u32	udiag_vfs_dev;
+	u32 udiag_vfs_ino;
+	u32 udiag_vfs_dev;
 };
 
 struct unix_diag_rqlen {
-	u32	udiag_rqueue;
-	u32	udiag_wqueue;
+	u32 udiag_rqueue;
+	u32 udiag_wqueue;
 };
 
 #endif /* __CR_UNIX_DIAG_H__ */
diff --git a/criu/include/util-pie.h b/criu/include/util-pie.h
index a8137f441..4c622a440 100644
--- a/criu/include/util-pie.h
+++ b/criu/include/util-pie.h
@@ -5,12 +5,11 @@
 #include <sys/un.h>
 
 #ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - \
-			(size_t)((struct sockaddr_un *) 0)->sun_path)
+#define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - (size_t)((struct sockaddr_un *)0)->sun_path)
 #endif
 
 #ifndef SO_PEEK_OFF
-#define SO_PEEK_OFF		42
+#define SO_PEEK_OFF 42
 #endif
 
 #include "common/scm.h"
diff --git a/criu/include/util-vdso.h b/criu/include/util-vdso.h
index 046cd96d7..c4386cf8e 100644
--- a/criu/include/util-vdso.h
+++ b/criu/include/util-vdso.h
@@ -23,22 +23,22 @@
 #include "asm/vdso.h"
 
 struct vdso_symbol {
-	char			name[32];
-	unsigned long		offset;
+	char name[32];
+	unsigned long offset;
 };
 
 struct vdso_symtable {
-	unsigned long		vdso_size;
-	unsigned long		vvar_size;
-	struct vdso_symbol	symbols[VDSO_SYMBOL_MAX];
-	bool			vdso_before_vvar; /* order of vdso/vvar pair */
+	unsigned long vdso_size;
+	unsigned long vvar_size;
+	struct vdso_symbol symbols[VDSO_SYMBOL_MAX];
+	bool vdso_before_vvar; /* order of vdso/vvar pair */
 };
 
 struct vdso_maps {
-	unsigned long		vdso_start;
-	unsigned long		vvar_start;
-	struct vdso_symtable	sym;
-	bool			compatible;
+	unsigned long vdso_start;
+	unsigned long vvar_start;
+	struct vdso_symtable sym;
+	bool compatible;
 };
 
 static inline bool vdso_is_present(struct vdso_maps *m)
@@ -46,56 +46,57 @@ static inline bool vdso_is_present(struct vdso_maps *m)
 	return m->vdso_start != VDSO_BAD_ADDR;
 }
 
-#define VDSO_SYMBOL_INIT	{ .offset = VDSO_BAD_ADDR, }
+#define VDSO_SYMBOL_INIT                 \
+	{                                \
+		.offset = VDSO_BAD_ADDR, \
+	}
 
-#define VDSO_SYMTABLE_INIT						\
-	{								\
+#define VDSO_SYMTABLE_INIT                      \
+	{                                       \
 		.vdso_size	= VDSO_BAD_SIZE,			\
 		.vvar_size	= VVAR_BAD_SIZE,			\
 		.symbols		= {				\
 			[0 ... VDSO_SYMBOL_MAX - 1] =			\
 				(struct vdso_symbol)VDSO_SYMBOL_INIT,	\
 			},						\
-		.vdso_before_vvar	= false,			\
+		.vdso_before_vvar	= false, \
 	}
 
-#define VDSO_MAPS_INIT							\
-	{								\
-		.vdso_start	= VDSO_BAD_ADDR,			\
-		.vvar_start	= VVAR_BAD_ADDR,			\
-		.sym		= VDSO_SYMTABLE_INIT,			\
+#define VDSO_MAPS_INIT                                                                               \
+	{                                                                                            \
+		.vdso_start = VDSO_BAD_ADDR, .vvar_start = VVAR_BAD_ADDR, .sym = VDSO_SYMTABLE_INIT, \
 	}
 
 #ifdef CONFIG_VDSO_32
 
-#define Ehdr_t		Elf32_Ehdr
-#define Sym_t		Elf32_Sym
-#define Phdr_t		Elf32_Phdr
-#define Word_t		Elf32_Word
-#define Dyn_t		Elf32_Dyn
+#define Ehdr_t Elf32_Ehdr
+#define Sym_t  Elf32_Sym
+#define Phdr_t Elf32_Phdr
+#define Word_t Elf32_Word
+#define Dyn_t  Elf32_Dyn
 
 #ifndef ELF_ST_TYPE
-#define ELF_ST_TYPE	ELF32_ST_TYPE
+#define ELF_ST_TYPE ELF32_ST_TYPE
 #endif
 #ifndef ELF_ST_BIND
-#define ELF_ST_BIND	ELF32_ST_BIND
+#define ELF_ST_BIND ELF32_ST_BIND
 #endif
 
-# define vdso_fill_symtable vdso_fill_symtable_compat
+#define vdso_fill_symtable vdso_fill_symtable_compat
 
 #else /* CONFIG_VDSO_32 */
 
-#define Ehdr_t		Elf64_Ehdr
-#define Sym_t		Elf64_Sym
-#define Phdr_t		Elf64_Phdr
-#define Word_t		Elf64_Word
-#define Dyn_t		Elf64_Dyn
+#define Ehdr_t Elf64_Ehdr
+#define Sym_t  Elf64_Sym
+#define Phdr_t Elf64_Phdr
+#define Word_t Elf64_Word
+#define Dyn_t  Elf64_Dyn
 
 #ifndef ELF_ST_TYPE
-#define ELF_ST_TYPE	ELF64_ST_TYPE
+#define ELF_ST_TYPE ELF64_ST_TYPE
 #endif
 #ifndef ELF_ST_BIND
-#define ELF_ST_BIND	ELF64_ST_BIND
+#define ELF_ST_BIND ELF64_ST_BIND
 #endif
 
 #endif /* CONFIG_VDSO_32 */
diff --git a/criu/include/util.h b/criu/include/util.h
index 3c6027c27..a8bae990e 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -21,18 +21,18 @@
 #include "log.h"
 #include "common/err.h"
 
-#define PREF_SHIFT_OP(pref, op, size)	((size) op (pref ##BYTES_SHIFT))
-#define KBYTES_SHIFT	10
-#define MBYTES_SHIFT	20
-#define GBYTES_SHIFT	30
+#define PREF_SHIFT_OP(pref, op, size) ((size)op(pref##BYTES_SHIFT))
+#define KBYTES_SHIFT		      10
+#define MBYTES_SHIFT		      20
+#define GBYTES_SHIFT		      30
 
-#define KBYTES(size)	PREF_SHIFT_OP(K, >>, size)
-#define MBYTES(size)	PREF_SHIFT_OP(M, >>, size)
-#define GBYTES(size)	PREF_SHIFT_OP(G, >>, size)
+#define KBYTES(size) PREF_SHIFT_OP(K, >>, size)
+#define MBYTES(size) PREF_SHIFT_OP(M, >>, size)
+#define GBYTES(size) PREF_SHIFT_OP(G, >>, size)
 
-#define KILO(size)	PREF_SHIFT_OP(K, <<, size)
-#define MEGA(size)	PREF_SHIFT_OP(M, <<, size)
-#define GIGA(size)	PREF_SHIFT_OP(G, <<, size)
+#define KILO(size) PREF_SHIFT_OP(K, <<, size)
+#define MEGA(size) PREF_SHIFT_OP(M, <<, size)
+#define GIGA(size) PREF_SHIFT_OP(G, <<, size)
 
 struct vma_area;
 struct list_head;
@@ -41,30 +41,30 @@ extern int service_fd_rlim_cur;
 
 extern void pr_vma(const struct vma_area *vma_area);
 
-#define pr_info_vma(vma_area)	pr_vma(vma_area)
+#define pr_info_vma(vma_area) pr_vma(vma_area)
 
-#define pr_vma_list(head)					\
-	do {							\
-		struct vma_area *vma;				\
-		list_for_each_entry(vma, head, list)		\
-			pr_vma(vma);				\
+#define pr_vma_list(head)                            \
+	do {                                         \
+		struct vma_area *vma;                \
+		list_for_each_entry(vma, head, list) \
+			pr_vma(vma);                 \
 	} while (0)
-#define pr_info_vma_list(head)	pr_vma_list(head)
+#define pr_info_vma_list(head) pr_vma_list(head)
 
 extern int move_fd_from(int *img_fd, int want_fd);
 extern int close_safe(int *fd);
 
 extern int reopen_fd_as_safe(char *file, int line, int new_fd, int old_fd, bool allow_reuse_fd);
-#define reopen_fd_as(new_fd, old_fd)		reopen_fd_as_safe(__FILE__, __LINE__, new_fd, old_fd, false)
-#define reopen_fd_as_nocheck(new_fd, old_fd)	reopen_fd_as_safe(__FILE__, __LINE__, new_fd, old_fd, true)
+#define reopen_fd_as(new_fd, old_fd)	     reopen_fd_as_safe(__FILE__, __LINE__, new_fd, old_fd, false)
+#define reopen_fd_as_nocheck(new_fd, old_fd) reopen_fd_as_safe(__FILE__, __LINE__, new_fd, old_fd, true)
 
 extern void close_proc(void);
 extern int open_pid_proc(pid_t pid);
 extern int close_pid_proc(void);
 extern int set_proc_fd(int fd);
 
-extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid,
-			       void *child_tid, unsigned long newtls);
+extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid, void *child_tid,
+			       unsigned long newtls);
 
 /*
  * Values for pid argument of the proc opening routines below.
@@ -73,72 +73,66 @@ extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *par
  * NONE is internal, don't use it ;)
  */
 
-#define PROC_SELF	0
-#define PROC_GEN	-1
-#define PROC_NONE	-2
+#define PROC_SELF 0
+#define PROC_GEN  -1
+#define PROC_NONE -2
 
-extern int do_open_proc(pid_t pid, int flags, const char *fmt, ...)
-	__attribute__ ((__format__ (__printf__, 3, 4)));
+extern int do_open_proc(pid_t pid, int flags, const char *fmt, ...) __attribute__((__format__(__printf__, 3, 4)));
 
-#define __open_proc(pid, ier, flags, fmt, ...)				\
-	({								\
-		int __fd = do_open_proc(pid, flags,			\
-					fmt, ##__VA_ARGS__);		\
-		if (__fd < 0 && (errno != (ier)))			\
-			pr_perror("Can't open %d/" fmt " on procfs",	\
-					pid, ##__VA_ARGS__);		\
-									\
-		__fd;							\
+#define __open_proc(pid, ier, flags, fmt, ...)                                            \
+	({                                                                                \
+		int __fd = do_open_proc(pid, flags, fmt, ##__VA_ARGS__);                  \
+		if (__fd < 0 && (errno != (ier)))                                         \
+			pr_perror("Can't open %d/" fmt " on procfs", pid, ##__VA_ARGS__); \
+                                                                                          \
+		__fd;                                                                     \
 	})
 
 /* int open_proc(pid_t pid, const char *fmt, ...); */
-#define open_proc(pid, fmt, ...)				\
-	__open_proc(pid, 0, O_RDONLY, fmt, ##__VA_ARGS__)
+#define open_proc(pid, fmt, ...) __open_proc(pid, 0, O_RDONLY, fmt, ##__VA_ARGS__)
 
 /* int open_proc_rw(pid_t pid, const char *fmt, ...); */
-#define open_proc_rw(pid, fmt, ...)				\
-	__open_proc(pid, 0, O_RDWR, fmt, ##__VA_ARGS__)
+#define open_proc_rw(pid, fmt, ...) __open_proc(pid, 0, O_RDWR, fmt, ##__VA_ARGS__)
 
-#define open_proc_path(pid, fmt, ...)				\
-	__open_proc(pid, 0, O_PATH, fmt, ##__VA_ARGS__)
+#define open_proc_path(pid, fmt, ...) __open_proc(pid, 0, O_PATH, fmt, ##__VA_ARGS__)
 
 /* DIR *opendir_proc(pid_t pid, const char *fmt, ...); */
-#define opendir_proc(pid, fmt, ...)					\
-	({								\
-		int __fd = open_proc(pid, fmt, ##__VA_ARGS__);		\
-		DIR *__d = NULL;					\
-									\
-		if (__fd >= 0) {					\
-			__d = fdopendir(__fd);				\
-			if (__d == NULL)				\
-				pr_perror("Can't fdopendir %d "		\
-					"(%d/" fmt " on procfs)",	\
-					__fd, pid, ##__VA_ARGS__);	\
-		}							\
-		__d;							\
-	 })
+#define opendir_proc(pid, fmt, ...)                                  \
+	({                                                           \
+		int __fd = open_proc(pid, fmt, ##__VA_ARGS__);       \
+		DIR *__d = NULL;                                     \
+                                                                     \
+		if (__fd >= 0) {                                     \
+			__d = fdopendir(__fd);                       \
+			if (__d == NULL)                             \
+				pr_perror("Can't fdopendir %d "      \
+					  "(%d/" fmt " on procfs)",  \
+					  __fd, pid, ##__VA_ARGS__); \
+		}                                                    \
+		__d;                                                 \
+	})
 
 /* FILE *fopen_proc(pid_t pid, const char *fmt, ...); */
-#define fopen_proc(pid, fmt, ...)					\
-	({								\
-		int __fd = open_proc(pid,  fmt, ##__VA_ARGS__);		\
-		FILE *__f = NULL;					\
-									\
-		if (__fd >= 0) {					\
-			__f = fdopen(__fd, "r");			\
-			if (__f == NULL)				\
-				pr_perror("Can't fdopen %d "		\
-					"(%d/" fmt " on procfs)",	\
-					__fd, pid, ##__VA_ARGS__);	\
-		}							\
-		__f;							\
-	 })
+#define fopen_proc(pid, fmt, ...)                                    \
+	({                                                           \
+		int __fd = open_proc(pid, fmt, ##__VA_ARGS__);       \
+		FILE *__f = NULL;                                    \
+                                                                     \
+		if (__fd >= 0) {                                     \
+			__f = fdopen(__fd, "r");                     \
+			if (__f == NULL)                             \
+				pr_perror("Can't fdopen %d "         \
+					  "(%d/" fmt " on procfs)",  \
+					  __fd, pid, ##__VA_ARGS__); \
+		}                                                    \
+		__f;                                                 \
+	})
 
-#define DEVZERO		(makedev(1, 5))
+#define DEVZERO (makedev(1, 5))
 
-#define KDEV_MINORBITS	20
-#define KDEV_MINORMASK	((1UL << KDEV_MINORBITS) - 1)
-#define MKKDEV(ma, mi)	(((ma) << KDEV_MINORBITS) | (mi))
+#define KDEV_MINORBITS 20
+#define KDEV_MINORMASK ((1UL << KDEV_MINORBITS) - 1)
+#define MKKDEV(ma, mi) (((ma) << KDEV_MINORBITS) | (mi))
 
 static inline u32 kdev_major(u32 kdev)
 {
@@ -166,16 +160,12 @@ static inline dev_t kdev_to_odev(u32 kdev)
 extern int copy_file(int fd_in, int fd_out, size_t bytes);
 extern int is_anon_link_type(char *link, char *type);
 
-#define is_hex_digit(c)				\
-	(((c) >= '0' && (c) <= '9')	||	\
-	 ((c) >= 'a' && (c) <= 'f')	||	\
-	 ((c) >= 'A' && (c) <= 'F'))
+#define is_hex_digit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
 
-#define CRS_CAN_FAIL	0x1 /* cmd can validly exit with non zero code */
+#define CRS_CAN_FAIL 0x1 /* cmd can validly exit with non zero code */
 
 extern int cr_system(int in, int out, int err, char *cmd, char *const argv[], unsigned flags);
-extern int cr_system_userns(int in, int out, int err, char *cmd,
-				char *const argv[], unsigned flags, int userns_pid);
+extern int cr_system_userns(int in, int out, int err, char *cmd, char *const argv[], unsigned flags, int userns_pid);
 extern int cr_daemon(int nochdir, int noclose, int close_fd);
 extern int status_ready(void);
 extern int is_root_user(void);
@@ -193,12 +183,12 @@ extern int is_empty_dir(int dirfd);
  * Size of buffer to carry the worst case or /proc/self/fd/N
  * path. Since fd is an integer, we can easily estimate one :)
  */
-#define PSFDS	(sizeof("/proc/self/fd/2147483647"))
+#define PSFDS (sizeof("/proc/self/fd/2147483647"))
 
 extern int read_fd_link(int lfd, char *buf, size_t size);
 
-#define USEC_PER_SEC	1000000L
-#define NSEC_PER_SEC    1000000000L
+#define USEC_PER_SEC 1000000L
+#define NSEC_PER_SEC 1000000000L
 
 int vaddr_to_pfn(int fd, unsigned long vaddr, u64 *pfn);
 
@@ -211,7 +201,7 @@ static inline bool strstartswith2(const char *str, const char *sub, char *end)
 	while (1) {
 		if (*sub == '\0') /* end of sub -- match */ {
 			if (end) {
-				if (*(sub-1) == '/') /* "/", "./" or "path/" */
+				if (*(sub - 1) == '/') /* "/", "./" or "path/" */
 					*end = '/';
 				else
 					*end = *str;
@@ -248,8 +238,7 @@ static inline bool strstartswith(const char *str, const char *sub)
 static inline bool issubpath(const char *path, const char *sub_path)
 {
 	char end;
-	return strstartswith2(path, sub_path, &end) &&
-		(end == '/' || end == '\0');
+	return strstartswith2(path, sub_path, &end) && (end == '/' || end == '\0');
 }
 
 int strip_deleted(char *path, int len);
@@ -275,7 +264,7 @@ int make_yard(char *path);
 
 static inline int sk_wait_data(int sk)
 {
-	struct pollfd pfd = {sk, POLLIN, 0};
+	struct pollfd pfd = { sk, POLLIN, 0 };
 	return poll(&pfd, 1, -1);
 }
 
@@ -288,37 +277,37 @@ const char *ns_to_string(unsigned int ns);
 int xatol(const char *string, long *number);
 int xatoi(const char *string, int *number);
 
-char *xstrcat(char *str, const char *fmt, ...)
-	__attribute__ ((__format__ (__printf__, 2, 3)));
-char *xsprintf(const char *fmt, ...)
-	__attribute__ ((__format__ (__printf__, 1, 2)));
+char *xstrcat(char *str, const char *fmt, ...) __attribute__((__format__(__printf__, 2, 3)));
+char *xsprintf(const char *fmt, ...) __attribute__((__format__(__printf__, 1, 2)));
 
 int setup_tcp_server(char *type, char *addr, unsigned short *port);
 int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk);
 int setup_tcp_client(char *hostname);
 
-#define LAST_PID_PATH		"sys/kernel/ns_last_pid"
-#define PID_MAX_PATH		"sys/kernel/pid_max"
+#define LAST_PID_PATH "sys/kernel/ns_last_pid"
+#define PID_MAX_PATH  "sys/kernel/pid_max"
 
-#define block_sigmask(saved_mask, sig_mask)	({					\
-		sigset_t ___blocked_mask;						\
-		int ___ret = 0;								\
-		sigemptyset(&___blocked_mask);						\
-		sigaddset(&___blocked_mask, sig_mask);					\
-		if (sigprocmask(SIG_BLOCK, &___blocked_mask, saved_mask) == -1) {	\
-			pr_perror("Can not set mask of blocked signals");		\
-			___ret = -1;							\
-		}									\
-		___ret;									\
+#define block_sigmask(saved_mask, sig_mask)                                       \
+	({                                                                        \
+		sigset_t ___blocked_mask;                                         \
+		int ___ret = 0;                                                   \
+		sigemptyset(&___blocked_mask);                                    \
+		sigaddset(&___blocked_mask, sig_mask);                            \
+		if (sigprocmask(SIG_BLOCK, &___blocked_mask, saved_mask) == -1) { \
+			pr_perror("Can not set mask of blocked signals");         \
+			___ret = -1;                                              \
+		}                                                                 \
+		___ret;                                                           \
 	})
 
-#define restore_sigmask(saved_mask)	({						\
-		int ___ret = 0;								\
-		if (sigprocmask(SIG_SETMASK, saved_mask, NULL) == -1) {			\
-			pr_perror("Can not unset mask of blocked signals");		\
-			___ret = -1;							\
-		}									\
-		___ret;									\
+#define restore_sigmask(saved_mask)                                         \
+	({                                                                  \
+		int ___ret = 0;                                             \
+		if (sigprocmask(SIG_SETMASK, saved_mask, NULL) == -1) {     \
+			pr_perror("Can not unset mask of blocked signals"); \
+			___ret = -1;                                        \
+		}                                                           \
+		___ret;                                                     \
 	})
 
 /*
@@ -357,28 +346,32 @@ extern int call_in_child_process(int (*fn)(void *), void *arg);
 #ifdef __GLIBC__
 extern void print_stack_trace(pid_t pid);
 #else
-static inline void print_stack_trace(pid_t pid) {}
+static inline void print_stack_trace(pid_t pid)
+{
+}
 #endif
 
-#define block_sigmask(saved_mask, sig_mask)	({					\
-		sigset_t ___blocked_mask;						\
-		int ___ret = 0;								\
-		sigemptyset(&___blocked_mask);						\
-		sigaddset(&___blocked_mask, sig_mask);					\
-		if (sigprocmask(SIG_BLOCK, &___blocked_mask, saved_mask) == -1) {	\
-			pr_perror("Can not set mask of blocked signals");		\
-			___ret = -1;							\
-		}									\
-		___ret;									\
+#define block_sigmask(saved_mask, sig_mask)                                       \
+	({                                                                        \
+		sigset_t ___blocked_mask;                                         \
+		int ___ret = 0;                                                   \
+		sigemptyset(&___blocked_mask);                                    \
+		sigaddset(&___blocked_mask, sig_mask);                            \
+		if (sigprocmask(SIG_BLOCK, &___blocked_mask, saved_mask) == -1) { \
+			pr_perror("Can not set mask of blocked signals");         \
+			___ret = -1;                                              \
+		}                                                                 \
+		___ret;                                                           \
 	})
 
-#define restore_sigmask(saved_mask)	({						\
-		int ___ret = 0;								\
-		if (sigprocmask(SIG_SETMASK, saved_mask, NULL) == -1) {			\
-			pr_perror("Can not unset mask of blocked signals");		\
-			___ret = -1;							\
-		}									\
-		___ret;									\
+#define restore_sigmask(saved_mask)                                         \
+	({                                                                  \
+		int ___ret = 0;                                             \
+		if (sigprocmask(SIG_SETMASK, saved_mask, NULL) == -1) {     \
+			pr_perror("Can not unset mask of blocked signals"); \
+			___ret = -1;                                        \
+		}                                                           \
+		___ret;                                                     \
 	})
 
 extern int mount_detached_fs(const char *fsname);
@@ -388,11 +381,11 @@ extern char *get_legacy_iptables_bin(bool ipv6);
 extern ssize_t read_all(int fd, void *buf, size_t size);
 extern ssize_t write_all(int fd, const void *buf, size_t size);
 
-#define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
-static inline void cleanup_freep (void *p)
+#define cleanup_free __attribute__((cleanup(cleanup_freep)))
+static inline void cleanup_freep(void *p)
 {
-	void **pp = (void **) p;
-	free (*pp);
+	void **pp = (void **)p;
+	free(*pp);
 }
 
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/include/vdso.h b/criu/include/vdso.h
index fd30772b4..83a04a39e 100644
--- a/criu/include/vdso.h
+++ b/criu/include/vdso.h
@@ -15,12 +15,10 @@ extern int vdso_init_restore(void);
 extern int kerndat_vdso_fill_symtable(void);
 extern int kerndat_vdso_preserves_hint(void);
 
-extern int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid,
-			       struct vm_area_list *vma_area_list);
+extern int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid, struct vm_area_list *vma_area_list);
 
 #ifdef CONFIG_COMPAT
-extern void compat_vdso_helper(struct vdso_maps *native, int pipe_fd,
-		int err_fd, void *vdso_buf, size_t buf_size);
+extern void compat_vdso_helper(struct vdso_maps *native, int pipe_fd, int err_fd, void *vdso_buf, size_t buf_size);
 #endif
 
 #endif /* __CR_VDSO_H__ */
diff --git a/criu/include/vma.h b/criu/include/vma.h
index 5e3f3527b..ed9f31ef6 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -10,15 +10,15 @@
 #include <string.h>
 
 struct vm_area_list {
-	struct list_head	h;			/* list of VMAs */
-	unsigned		nr;			/* nr of all VMAs in the list */
-	unsigned int		nr_aios;		/* nr of AIOs VMAs in the list */
+	struct list_head h; /* list of VMAs */
+	unsigned nr; /* nr of all VMAs in the list */
+	unsigned int nr_aios; /* nr of AIOs VMAs in the list */
 	union {
-		unsigned long	nr_priv_pages;		/* dmp: nr of pages in private VMAs */
-		unsigned long	rst_priv_size;		/* rst: size of private VMAs */
+		unsigned long nr_priv_pages; /* dmp: nr of pages in private VMAs */
+		unsigned long rst_priv_size; /* rst: size of private VMAs */
 	};
-	unsigned long		nr_priv_pages_longest;	/* nr of pages in longest private VMA */
-	unsigned long		nr_shared_pages_longest;/* nr of pages in longest shared VMA */
+	unsigned long nr_priv_pages_longest; /* nr of pages in longest private VMA */
+	unsigned long nr_shared_pages_longest; /* nr of pages in longest shared VMA */
 };
 
 static inline void vm_area_list_init(struct vm_area_list *vml)
@@ -30,32 +30,32 @@ static inline void vm_area_list_init(struct vm_area_list *vml)
 struct file_desc;
 
 struct vma_area {
-	struct list_head	list;
-	VmaEntry		*e;
+	struct list_head list;
+	VmaEntry *e;
 
 	union {
 		struct /* for dump */ {
-			int		vm_socket_id;
+			int vm_socket_id;
 
-			char		*aufs_rpath;	/* path from aufs root */
-			char		*aufs_fpath;	/* full path from global root */
+			char *aufs_rpath; /* path from aufs root */
+			char *aufs_fpath; /* full path from global root */
 
 			/*
 			 * When several subsequent vmas have the same
 			 * dev:ino pair all 'tail' ones set this to true
 			 * and the vmst points to the head's stat buf.
 			 */
-			bool		file_borrowed;
-			struct stat	*vmst;
-			int		mnt_id;
+			bool file_borrowed;
+			struct stat *vmst;
+			int mnt_id;
 		};
 
 		struct /* for restore */ {
 			int (*vm_open)(int pid, struct vma_area *vma);
 			struct file_desc *vmfd;
-			struct vma_area	*pvma;		/* parent for inherited VMAs */
-			unsigned long	*page_bitmap;	/* existent pages */
-			unsigned long	premmaped_addr;	/* restore only */
+			struct vma_area *pvma; /* parent for inherited VMAs */
+			unsigned long *page_bitmap; /* existent pages */
+			unsigned long premmaped_addr; /* restore only */
 
 			/*
 			 * Some notes about pvma, page_bitmap and premmaped_addr bits
@@ -72,22 +72,21 @@ struct vma_area {
 	};
 };
 
-#define VMA_COW_ROOT	((struct vma_area *)1)
+#define VMA_COW_ROOT ((struct vma_area *)1)
 
 typedef int (*dump_filemap_t)(struct vma_area *vma_area, int fd);
 
 extern struct vma_area *alloc_vma_area(void);
-extern int collect_mappings(pid_t pid,
-		struct vm_area_list *vma_area_list, dump_filemap_t cb);
+extern int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t cb);
 extern void free_mappings(struct vm_area_list *vma_area_list);
 
 extern int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t cb);
 extern int parse_self_maps_lite(struct vm_area_list *vms);
 
-#define vma_area_is(vma_area, s)	vma_entry_is((vma_area)->e, s)
-#define vma_area_len(vma_area)		vma_entry_len((vma_area)->e)
-#define vma_entry_is(vma, s)		(((vma)->status & (s)) == (s))
-#define vma_entry_len(vma)		((vma)->end - (vma)->start)
+#define vma_area_is(vma_area, s) vma_entry_is((vma_area)->e, s)
+#define vma_area_len(vma_area)	 vma_entry_len((vma_area)->e)
+#define vma_entry_is(vma, s)	 (((vma)->status & (s)) == (s))
+#define vma_entry_len(vma)	 ((vma)->end - (vma)->start)
 
 /*
  * vma_premmaped_start() can be used only in restorer.
@@ -95,26 +94,22 @@ extern int parse_self_maps_lite(struct vm_area_list *vms);
  * This hack is required, because vma_area isn't transferred in restorer and
  * shmid is used to determine which vma-s are cowed.
  */
-#define vma_premmaped_start(vma)	((vma)->shmid)
+#define vma_premmaped_start(vma) ((vma)->shmid)
 
 static inline int in_vma_area(struct vma_area *vma, unsigned long addr)
 {
-	return addr >= (unsigned long)vma->e->start &&
-		addr < (unsigned long)vma->e->end;
+	return addr >= (unsigned long)vma->e->start && addr < (unsigned long)vma->e->end;
 }
 
-static inline bool vma_entry_is_private(VmaEntry *entry,
-					unsigned long task_size)
+static inline bool vma_entry_is_private(VmaEntry *entry, unsigned long task_size)
 {
-	return (vma_entry_is(entry, VMA_AREA_REGULAR)	&&
-		(vma_entry_is(entry, VMA_ANON_PRIVATE)	||
-		 vma_entry_is(entry, VMA_FILE_PRIVATE)) &&
-		 (entry->end <= task_size)) ||
-		vma_entry_is(entry, VMA_AREA_AIORING);
+	return (vma_entry_is(entry, VMA_AREA_REGULAR) &&
+		(vma_entry_is(entry, VMA_ANON_PRIVATE) || vma_entry_is(entry, VMA_FILE_PRIVATE)) &&
+		(entry->end <= task_size)) ||
+	       vma_entry_is(entry, VMA_AREA_AIORING);
 }
 
-static inline bool vma_area_is_private(struct vma_area *vma,
-				       unsigned long task_size)
+static inline bool vma_area_is_private(struct vma_area *vma, unsigned long task_size)
 {
 	return vma_entry_is_private(vma->e, task_size);
 }
@@ -126,11 +121,8 @@ static inline struct vma_area *vma_next(struct vma_area *vma)
 
 static inline bool vma_entry_can_be_lazy(VmaEntry *e)
 {
-	return ((e->flags & MAP_ANONYMOUS) &&
-		(e->flags & MAP_PRIVATE) &&
-		!(e->flags & MAP_LOCKED) &&
-		!(vma_entry_is(e, VMA_AREA_VDSO)) &&
-		!(vma_entry_is(e, VMA_AREA_VSYSCALL)));
+	return ((e->flags & MAP_ANONYMOUS) && (e->flags & MAP_PRIVATE) && !(e->flags & MAP_LOCKED) &&
+		!(vma_entry_is(e, VMA_AREA_VDSO)) && !(vma_entry_is(e, VMA_AREA_VSYSCALL)));
 }
 
 #endif /* __CR_VMA_H__ */
diff --git a/include/common/arch/aarch64/asm/atomic.h b/include/common/arch/aarch64/asm/atomic.h
index 11785c3aa..8861d9aa4 100644
--- a/include/common/arch/aarch64/asm/atomic.h
+++ b/include/common/arch/aarch64/asm/atomic.h
@@ -5,11 +5,9 @@ typedef struct {
 	int counter;
 } atomic_t;
 
-
 /* Copied from the Linux header arch/arm/include/asm/barrier.h */
 
-#define smp_mb()	asm volatile("dmb ish" : : : "memory")
-
+#define smp_mb() asm volatile("dmb ish" : : : "memory")
 
 /* Copied from the Linux kernel header arch/arm64/include/asm/atomic.h */
 
@@ -25,20 +23,18 @@ static inline void atomic_set(atomic_t *v, int i)
 
 #define atomic_get atomic_read
 
-
 static inline int atomic_add_return(int i, atomic_t *v)
 {
 	unsigned long tmp;
 	int result;
 
-	asm volatile(
-"1:	ldxr	%w0, %2\n"
-"	add	%w0, %w0, %w3\n"
-"	stlxr	%w1, %w0, %2\n"
-"	cbnz	%w1, 1b"
-	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)
-	: "Ir" (i)
-	: "cc", "memory");
+	asm volatile("1:	ldxr	%w0, %2\n"
+		     "	add	%w0, %w0, %w3\n"
+		     "	stlxr	%w1, %w0, %2\n"
+		     "	cbnz	%w1, 1b"
+		     : "=&r"(result), "=&r"(tmp), "+Q"(v->counter)
+		     : "Ir"(i)
+		     : "cc", "memory");
 
 	smp_mb();
 	return result;
@@ -49,30 +45,38 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 	unsigned long tmp;
 	int result;
 
-	asm volatile(
-"1:	ldxr	%w0, %2\n"
-"	sub	%w0, %w0, %w3\n"
-"	stlxr	%w1, %w0, %2\n"
-"	cbnz	%w1, 1b"
-	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)
-	: "Ir" (i)
-	: "cc", "memory");
+	asm volatile("1:	ldxr	%w0, %2\n"
+		     "	sub	%w0, %w0, %w3\n"
+		     "	stlxr	%w1, %w0, %2\n"
+		     "	cbnz	%w1, 1b"
+		     : "=&r"(result), "=&r"(tmp), "+Q"(v->counter)
+		     : "Ir"(i)
+		     : "cc", "memory");
 
 	smp_mb();
 	return result;
 }
 
-static inline int atomic_inc(atomic_t *v) { return atomic_add_return(1, v) - 1; }
+static inline int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
 
-static inline int atomic_add(int val, atomic_t *v) { return atomic_add_return(val, v) - val; }
+static inline int atomic_add(int val, atomic_t *v)
+{
+	return atomic_add_return(val, v) - val;
+}
 
-static inline int atomic_dec(atomic_t *v) { return atomic_sub_return(1, v) + 1; }
+static inline int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
 
 /* true if the result is 0, or false for all other cases. */
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
-#define atomic_dec_return(v)  (atomic_sub_return(1, v))
+#define atomic_dec_return(v)   (atomic_sub_return(1, v))
 
-#define atomic_inc_return(v)	(atomic_add_return(1, v))
+#define atomic_inc_return(v) (atomic_add_return(1, v))
 
 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 {
@@ -82,15 +86,15 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 	smp_mb();
 
 	asm volatile("// atomic_cmpxchg\n"
-"1:	ldxr	%w1, %2\n"
-"	cmp	%w1, %w3\n"
-"	b.ne	2f\n"
-"	stxr	%w0, %w4, %2\n"
-"	cbnz	%w0, 1b\n"
-"2:"
-	: "=&r" (tmp), "=&r" (oldval), "+Q" (ptr->counter)
-	: "Ir" (old), "r" (new)
-	: "cc");
+		     "1:	ldxr	%w1, %2\n"
+		     "	cmp	%w1, %w3\n"
+		     "	b.ne	2f\n"
+		     "	stxr	%w0, %w4, %2\n"
+		     "	cbnz	%w0, 1b\n"
+		     "2:"
+		     : "=&r"(tmp), "=&r"(oldval), "+Q"(ptr->counter)
+		     : "Ir"(old), "r"(new)
+		     : "cc");
 
 	smp_mb();
 	return oldval;
diff --git a/include/common/arch/aarch64/asm/linkage.h b/include/common/arch/aarch64/asm/linkage.h
index 738064233..23862db17 100644
--- a/include/common/arch/aarch64/asm/linkage.h
+++ b/include/common/arch/aarch64/asm/linkage.h
@@ -3,22 +3,21 @@
 
 #ifdef __ASSEMBLY__
 
-#define __ALIGN		.align 4, 0x00
-#define __ALIGN_STR	".align 4, 0x00"
+#define __ALIGN	    .align 4, 0x00
+#define __ALIGN_STR ".align 4, 0x00"
 
-#define GLOBAL(name)		\
-	.globl name;		\
+#define GLOBAL(name) \
+	.globl name; \
 	name:
 
-#define ENTRY(name)		\
-	.globl name;		\
-	.type name, #function;	\
-	__ALIGN;		\
+#define ENTRY(name)            \
+	.globl name;           \
+	.type name, #function; \
+	__ALIGN;               \
 	name:
 
-#define END(sym)		\
-	.size sym, . - sym
+#define END(sym) .size sym, .- sym
 
-#endif  /* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
 
 #endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/aarch64/asm/page.h b/include/common/arch/aarch64/asm/page.h
index bd8fe8f71..90670d126 100644
--- a/include/common/arch/aarch64/asm/page.h
+++ b/include/common/arch/aarch64/asm/page.h
@@ -29,11 +29,11 @@ static inline unsigned page_shift(void)
  * on aarch64, then we need refrain using PAGE_SIZE in criu and use
  * page_size() across sources (as it may differ on aarch64).
  */
-#define PAGE_SIZE	page_size()
-#define PAGE_MASK	(~(PAGE_SIZE - 1))
-#define PAGE_SHIFT	page_shift()
+#define PAGE_SIZE  page_size()
+#define PAGE_MASK  (~(PAGE_SIZE - 1))
+#define PAGE_SHIFT page_shift()
 
-#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
 
 #else /* CR_NOGLIBC */
 
diff --git a/include/common/arch/arm/asm/atomic.h b/include/common/arch/arm/asm/atomic.h
index 7998a20f2..bcdd3be73 100644
--- a/include/common/arch/arm/asm/atomic.h
+++ b/include/common/arch/arm/asm/atomic.h
@@ -7,12 +7,11 @@ typedef struct {
 	int counter;
 } atomic_t;
 
-
 /* Copied from the Linux kernel header arch/arm/include/asm/atomic.h */
 
 #if defined(CONFIG_ARMV7)
 
-#define smp_mb() __asm__ __volatile__ ("dmb" : : : "memory")
+#define smp_mb() __asm__ __volatile__("dmb" : : : "memory")
 
 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 {
@@ -24,14 +23,14 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 
 	do {
 		__asm__ __volatile__("@ atomic_cmpxchg\n"
-		"ldrex	%1, [%3]\n"
-		"mov	%0, #0\n"
-		"teq	%1, %4\n"
-		"it	eq\n"
-		"strexeq %0, %5, [%3]\n"
-			: "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
-			: "r" (&ptr->counter), "Ir" (old), "r" (new)
-			: "cc");
+				     "ldrex	%1, [%3]\n"
+				     "mov	%0, #0\n"
+				     "teq	%1, %4\n"
+				     "it	eq\n"
+				     "strexeq %0, %5, [%3]\n"
+				     : "=&r"(res), "=&r"(oldval), "+Qo"(ptr->counter)
+				     : "r"(&ptr->counter), "Ir"(old), "r"(new)
+				     : "cc");
 	} while (res);
 
 	smp_mb();
@@ -43,7 +42,7 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
 
 /* SMP isn't supported for ARMv6 */
 
-#define smp_mb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5"	: : "r" (0) : "memory")
+#define smp_mb() __asm__ __volatile__("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
 
 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
 {
@@ -82,14 +81,14 @@ static inline int atomic_add_return(int i, atomic_t *v)
 	smp_mb();
 
 	__asm__ __volatile__("@ atomic_add_return\n"
-"1:	ldrex	%0, [%3]\n"
-"	add	%0, %0, %4\n"
-"	strex	%1, %0, [%3]\n"
-"	teq	%1, #0\n"
-"	bne	1b\n"
-	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-	: "r" (&v->counter), "Ir" (i)
-	: "cc");
+			     "1:	ldrex	%0, [%3]\n"
+			     "	add	%0, %0, %4\n"
+			     "	strex	%1, %0, [%3]\n"
+			     "	teq	%1, #0\n"
+			     "	bne	1b\n"
+			     : "=&r"(result), "=&r"(tmp), "+Qo"(v->counter)
+			     : "r"(&v->counter), "Ir"(i)
+			     : "cc");
 
 	smp_mb();
 
@@ -104,30 +103,39 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 	smp_mb();
 
 	__asm__ __volatile__("@ atomic_sub_return\n"
-"1:	ldrex	%0, [%3]\n"
-"	sub	%0, %0, %4\n"
-"	strex	%1, %0, [%3]\n"
-"	teq	%1, #0\n"
-"	bne	1b\n"
-	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-	: "r" (&v->counter), "Ir" (i)
-	: "cc");
+			     "1:	ldrex	%0, [%3]\n"
+			     "	sub	%0, %0, %4\n"
+			     "	strex	%1, %0, [%3]\n"
+			     "	teq	%1, #0\n"
+			     "	bne	1b\n"
+			     : "=&r"(result), "=&r"(tmp), "+Qo"(v->counter)
+			     : "r"(&v->counter), "Ir"(i)
+			     : "cc");
 
 	smp_mb();
 
 	return result;
 }
 
-static inline int atomic_inc(atomic_t *v) { return atomic_add_return(1, v) - 1; }
+static inline int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
 
-static inline int atomic_add(int val, atomic_t *v) { return atomic_add_return(val, v) - val; }
+static inline int atomic_add(int val, atomic_t *v)
+{
+	return atomic_add_return(val, v) - val;
+}
 
-static inline int atomic_dec(atomic_t *v) { return atomic_sub_return(1, v) + 1; }
+static inline int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
 
 /* true if the result is 0, or false for all other cases. */
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
-#define atomic_dec_return(v)  (atomic_sub_return(1, v))
+#define atomic_dec_return(v)   (atomic_sub_return(1, v))
 
-#define atomic_inc_return(v)	(atomic_add_return(1, v))
+#define atomic_inc_return(v) (atomic_add_return(1, v))
 
 #endif /* __CR_ATOMIC_H__ */
diff --git a/include/common/arch/arm/asm/linkage.h b/include/common/arch/arm/asm/linkage.h
index a93898be5..de6b82a9b 100644
--- a/include/common/arch/arm/asm/linkage.h
+++ b/include/common/arch/arm/asm/linkage.h
@@ -3,26 +3,25 @@
 
 #ifdef __ASSEMBLY__
 
-#define __ALIGN		.align 4, 0x00
-#define __ALIGN_STR	".align 4, 0x00"
+#define __ALIGN	    .align 4, 0x00
+#define __ALIGN_STR ".align 4, 0x00"
 
-#define GLOBAL(name)		\
-	.globl name;		\
+#define GLOBAL(name) \
+	.globl name; \
 	name:
 
-#define ENTRY(name)		\
-	.globl name;		\
-	.type name, #function;	\
-	__ALIGN;		\
+#define ENTRY(name)            \
+	.globl name;           \
+	.type name, #function; \
+	__ALIGN;               \
 	name:
 
-#define END(sym)		\
-	.size sym, . - sym
+#define END(sym) .size sym, .- sym
 
-#define ALIAS(sym_new, sym_old)	\
-	.globl sym_new;		\
+#define ALIAS(sym_new, sym_old) \
+	.globl sym_new;         \
 	.set sym_new, sym_old
 
-#endif  /* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
 
 #endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/arm/asm/page.h b/include/common/arch/arm/asm/page.h
index 134835556..d31e82c60 100644
--- a/include/common/arch/arm/asm/page.h
+++ b/include/common/arch/arm/asm/page.h
@@ -2,18 +2,18 @@
 #define __CR_ASM_PAGE_H__
 
 #ifndef PAGE_SHIFT
-# define PAGE_SHIFT	12
+#define PAGE_SHIFT 12
 #endif
 
 #ifndef PAGE_SIZE
-# define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#define PAGE_SIZE (1UL << PAGE_SHIFT)
 #endif
 
 #ifndef PAGE_MASK
-# define PAGE_MASK	(~(PAGE_SIZE - 1))
+#define PAGE_MASK (~(PAGE_SIZE - 1))
 #endif
 
-#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
-#define page_size()	PAGE_SIZE
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
+#define page_size()    PAGE_SIZE
 
 #endif /* __CR_ASM_PAGE_H__ */
diff --git a/include/common/arch/arm/asm/processor.h b/include/common/arch/arm/asm/processor.h
index a390cfd32..9c5f102f4 100644
--- a/include/common/arch/arm/asm/processor.h
+++ b/include/common/arch/arm/asm/processor.h
@@ -3,26 +3,21 @@
 
 /* Copied from linux kernel arch/arm/include/asm/unified.h */
 
-#define WASM(instr)     #instr
+#define WASM(instr) #instr
 
 /* Copied from linux kernel arch/arm/include/asm/processor.h */
 
-#define __ALT_SMP_ASM(smp, up)						\
-	"9998:	" smp "\n"						\
-	"	.pushsection \".alt.smp.init\", \"a\"\n"		\
-	"	.long	9998b\n"					\
-	"	" up "\n"						\
+#define __ALT_SMP_ASM(smp, up)                     \
+	"9998:	" smp "\n"                         \
+	"	.pushsection \".alt.smp.init\", \"a\"\n" \
+	"	.long	9998b\n"                           \
+	"	" up "\n"                          \
 	"	.popsection\n"
 
 static inline void prefetchw(const void *ptr)
 {
 	__asm__ __volatile__(
-		".arch_extension	mp\n"
-		__ALT_SMP_ASM(
-			WASM(pldw)		"\t%a0",
-			WASM(pld)		"\t%a0"
-		)
-		:: "p" (ptr));
+		".arch_extension	mp\n" __ALT_SMP_ASM(WASM(pldw) "\t%a0", WASM(pld) "\t%a0")::"p"(ptr));
 }
 
 #endif /* __CR_PROCESSOR_H__ */
diff --git a/include/common/arch/mips/asm/atomic.h b/include/common/arch/mips/asm/atomic.h
old mode 100755
new mode 100644
index 600e3a70f..d51800055
--- a/include/common/arch/mips/asm/atomic.h
+++ b/include/common/arch/mips/asm/atomic.h
@@ -12,7 +12,7 @@
  *
  * Atomically reads the value of @v.
  */
-#define atomic_read(v)		(*(volatile int *)&(v)->counter)
+#define atomic_read(v) (*(volatile int *)&(v)->counter)
 
 /*
  * atomic_set - set atomic variable
@@ -21,7 +21,7 @@
  *
  * Atomically sets the value of @v to @i.
  */
-#define atomic_set(v, i)		((v)->counter = (i))
+#define atomic_set(v, i) ((v)->counter = (i))
 /*
  * atomic_add - add integer to atomic variable
  * @i: integer value to add
@@ -30,20 +30,19 @@
  * Atomically adds @i to @v.
  */
 
-static __inline__ void atomic_add(int i, atomic_t * v)
+static __inline__ void atomic_add(int i, atomic_t *v)
 {
-    int temp;
+	int temp;
 
-    do {
-	__asm__ __volatile__(
-			     "	.set	mips3				\n"
-			     "	ll	%0, %1		# atomic_add	\n"
-			     "	addu	%0, %2				\n"
-			     "	sc	%0, %1				\n"
-			     "	.set	mips0				\n"
-			     : "=&r" (temp), "+m" (v->counter)
-			     : "Ir" (i));
-    } while (unlikely(!temp));
+	do {
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%0, %1		# atomic_add	\n"
+				     "	addu	%0, %2				\n"
+				     "	sc	%0, %1				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(temp), "+m"(v->counter)
+				     : "Ir"(i));
+	} while (unlikely(!temp));
 }
 
 /*
@@ -53,43 +52,40 @@ static __inline__ void atomic_add(int i, atomic_t * v)
  *
  * Atomically subtracts @i from @v.
  */
-static __inline__ void atomic_sub(int i, atomic_t * v)
+static __inline__ void atomic_sub(int i, atomic_t *v)
 {
-    int temp;
+	int temp;
 
-    do {
-	__asm__ __volatile__(
-			     "	.set	mips3				\n"
-			     "	ll	%0, %1		# atomic_sub	\n"
-			     "	subu	%0, %2				\n"
-			     "	sc	%0, %1				\n"
-			     "	.set	mips0				\n"
-			     : "=&r" (temp), "+m" (v->counter)
-			     : "Ir" (i));
-    } while (unlikely(!temp));
+	do {
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%0, %1		# atomic_sub	\n"
+				     "	subu	%0, %2				\n"
+				     "	sc	%0, %1				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(temp), "+m"(v->counter)
+				     : "Ir"(i));
+	} while (unlikely(!temp));
 }
 
 /*
  * Same as above, but return the result value
  */
-static __inline__ int atomic_add_return(int i, atomic_t * v)
+static __inline__ int atomic_add_return(int i, atomic_t *v)
 {
 	int result;
 
 	smp_mb__before_llsc();
 
-
 	int temp;
 
 	do {
-	    __asm__ __volatile__(
-				 "	.set	mips3				\n"
-				 "	ll	%1, %2	# atomic_add_return	\n"
-				 "	addu	%0, %1, %3			\n"
-				 "	sc	%0, %2				\n"
-				 "	.set	mips0				\n"
-				 : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-				 : "Ir" (i));
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%1, %2	# atomic_add_return	\n"
+				     "	addu	%0, %1, %3			\n"
+				     "	sc	%0, %2				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(result), "=&r"(temp), "+m"(v->counter)
+				     : "Ir"(i));
 	} while (unlikely(!result));
 
 	result = temp + i;
@@ -99,7 +95,7 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
 	return result;
 }
 
-static __inline__ int atomic_sub_return(int i, atomic_t * v)
+static __inline__ int atomic_sub_return(int i, atomic_t *v)
 {
 	int result;
 
@@ -108,14 +104,13 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
 	int temp;
 
 	do {
-	    __asm__ __volatile__(
-				 "	.set	mips3				\n"
-				 "	ll	%1, %2	# atomic_sub_return	\n"
-				 "	subu	%0, %1, %3			\n"
-				 "	sc	%0, %2				\n"
-				 "	.set	mips0				\n"
-				 : "=&r" (result), "=&r" (temp), "+m" (v->counter)
-				 : "Ir" (i));
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%1, %2	# atomic_sub_return	\n"
+				     "	subu	%0, %1, %3			\n"
+				     "	sc	%0, %2				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(result), "=&r"(temp), "+m"(v->counter)
+				     : "Ir"(i));
 	} while (unlikely(!result));
 
 	result = temp - i;
@@ -126,8 +121,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
 }
 
 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
-#define atomic_dec_return(v) atomic_sub_return(1, (v))
-#define atomic_inc_return(v) atomic_add_return(1, (v))
+#define atomic_dec_return(v)	atomic_sub_return(1, (v))
+#define atomic_inc_return(v)	atomic_add_return(1, (v))
 
 /*
  * atomic_inc - increment atomic variable
@@ -135,7 +130,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
  *
  * Atomically increments @v by 1.
  */
-#define atomic_inc( v) atomic_add(1, (v))
+#define atomic_inc(v) atomic_add(1, (v))
 
 /*
  * atomic_dec - decrement and test
diff --git a/include/common/arch/mips/asm/bitops.h b/include/common/arch/mips/asm/bitops.h
index 874845e45..096ed4a23 100644
--- a/include/common/arch/mips/asm/bitops.h
+++ b/include/common/arch/mips/asm/bitops.h
@@ -13,24 +13,22 @@
  * It also implies a memory barrier.
  */
 
-static inline int test_and_set_bit(unsigned long nr,
-	volatile unsigned long *addr)
+static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *addr)
 {
-	unsigned long *m = ((unsigned long *) addr) + (nr >> 6);
+	unsigned long *m = ((unsigned long *)addr) + (nr >> 6);
 	unsigned long temp = 0;
 	unsigned long res;
 	int bit = nr & 63UL;
 
 	do {
-	    __asm__ __volatile__(
-				 "	.set	mips3				\n"
-				 "	lld     %0, %1	# test_and_set_bit	\n"
-				 "	or	%2, %0, %3			\n"
-				 "	scd	%2, %1				\n"
-				 "	.set	mips0				\n"
-				 : "=&r" (temp), "+m" (*m), "=&r" (res)
-				 : "r" (1UL << bit)
-				 : "memory");
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	lld     %0, %1	# test_and_set_bit	\n"
+				     "	or	%2, %0, %3			\n"
+				     "	scd	%2, %1				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(temp), "+m"(*m), "=&r"(res)
+				     : "r"(1UL << bit)
+				     : "memory");
 	} while (unlikely(!res));
 
 	res = temp & (1UL << bit);
diff --git a/include/common/arch/mips/asm/bitsperlong.h b/include/common/arch/mips/asm/bitsperlong.h
old mode 100755
new mode 100644
index 31aece3b6..d95727d19
--- a/include/common/arch/mips/asm/bitsperlong.h
+++ b/include/common/arch/mips/asm/bitsperlong.h
@@ -1,6 +1,6 @@
 #ifndef __CR_BITSPERLONG_H__
 #define __CR_BITSPERLONG_H__
 
-# define BITS_PER_LONG 64
+#define BITS_PER_LONG 64
 
 #endif /* __CR_BITSPERLONG_H__ */
diff --git a/include/common/arch/mips/asm/cmpxchg.h b/include/common/arch/mips/asm/cmpxchg.h
old mode 100755
new mode 100644
index bdc41390b..85cd482c3
--- a/include/common/arch/mips/asm/cmpxchg.h
+++ b/include/common/arch/mips/asm/cmpxchg.h
@@ -1,67 +1,65 @@
 #ifndef __CR_CMPXCHG_H__
 #define __CR_CMPXCHG_H__
 
-#define __cmpxchg_asm(ld, st, m, old, new)				\
-({									\
-	__typeof(*(m)) __ret;						\
-									\
-	if (kernel_uses_llsc) {						\
-		__asm__ __volatile__(					\
-		"	.set	push				\n"	\
-		"	.set	noat				\n"	\
-		"	.set	mips3				\n"	\
-		"1:	" ld "	%0, %2		# __cmpxchg_asm \n"	\
-		"	bne	%0, %z3, 2f			\n"	\
-		"	.set	mips0				\n"	\
-		"	move	$1, %z4				\n"	\
-		"	.set	mips3				\n"	\
-		"	" st "	$1, %1				\n"	\
-		"	beqz	$1, 1b				\n"	\
-		"	.set	pop				\n"	\
-		"2:						\n"	\
-		: "=&r" (__ret), "=R" (*m)				\
-		: "R" (*m), "Jr" (old), "Jr" (new)			\
-		: "memory");						\
-	} else {                                                        \
-	}								\
-									\
-	__ret;								\
-})
+#define __cmpxchg_asm(ld, st, m, old, new)                                                 \
+	({                                                                                 \
+		__typeof(*(m)) __ret;                                                      \
+                                                                                           \
+		if (kernel_uses_llsc) {                                                    \
+			__asm__ __volatile__("	.set	push				\n"                            \
+					     "	.set	noat				\n"                            \
+					     "	.set	mips3				\n"                           \
+					     "1:	" ld "	%0, %2		# __cmpxchg_asm \n" \
+					     "	bne	%0, %z3, 2f			\n"                       \
+					     "	.set	mips0				\n"                           \
+					     "	move	$1, %z4				\n"                         \
+					     "	.set	mips3				\n"                           \
+					     "	" st "	$1, %1				\n"                       \
+					     "	beqz	$1, 1b				\n"                          \
+					     "	.set	pop				\n"                             \
+					     "2:						\n"                                  \
+					     : "=&r"(__ret), "=R"(*m)                      \
+					     : "R"(*m), "Jr"(old), "Jr"(new)               \
+					     : "memory");                                  \
+		} else {                                                                   \
+		}                                                                          \
+                                                                                           \
+		__ret;                                                                     \
+	})
 /*
  * This function doesn't exist, so you'll get a linker error
  * if something tries to do an invalid cmpxchg().
  */
 extern void __cmpxchg_called_with_bad_pointer(void);
 
-#define __cmpxchg(ptr, old, new, pre_barrier, post_barrier)		\
-({									\
-	__typeof__(ptr) __ptr = (ptr);					\
-	__typeof__(*(ptr)) __old = (old);				\
-	__typeof__(*(ptr)) __new = (new);				\
-	__typeof__(*(ptr)) __res = 0;					\
-									\
-	pre_barrier;							\
-									\
-	switch (sizeof(*(__ptr))) {					\
-	case 4:								\
-		__res = __cmpxchg_asm("ll", "sc", __ptr, __old, __new); \
-		break;							\
-	case 8:								\
-		if (sizeof(long) == 8) {				\
-			__res = __cmpxchg_asm("lld", "scd", __ptr,	\
-					   __old, __new);		\
-			break;						\
-		}							\
-	default:							\
-		__cmpxchg_called_with_bad_pointer();			\
-		break;							\
-	}								\
-									\
-	post_barrier;							\
-									\
-	__res;								\
-})
+#define __cmpxchg(ptr, old, new, pre_barrier, post_barrier)                               \
+	({                                                                                \
+		__typeof__(ptr) __ptr = (ptr);                                            \
+		__typeof__(*(ptr)) __old = (old);                                         \
+		__typeof__(*(ptr)) __new = (new);                                         \
+		__typeof__(*(ptr)) __res = 0;                                             \
+                                                                                          \
+		pre_barrier;                                                              \
+                                                                                          \
+		switch (sizeof(*(__ptr))) {                                               \
+		case 4:                                                                   \
+			__res = __cmpxchg_asm("ll", "sc", __ptr, __old, __new);           \
+			break;                                                            \
+		case 8:                                                                   \
+			if (sizeof(long) == 8) {                                          \
+				__res = __cmpxchg_asm("lld", "scd", __ptr, __old, __new); \
+				break;                                                    \
+			}                                                                 \
+		default:                                                                  \
+			__cmpxchg_called_with_bad_pointer();                              \
+			break;                                                            \
+		}                                                                         \
+                                                                                          \
+		post_barrier;                                                             \
+                                                                                          \
+		__res;                                                                    \
+	})
 
-#define cmpxchg(ptr, old, new)		__cmpxchg(ptr, old, new, smp_mb__before_llsc(), smp_llsc_mb())
+#define cmpxchg(ptr, old, new) __cmpxchg(ptr, old, new, smp_mb__before_llsc(), smp_llsc_mb())
 
 #endif /* __CR_CMPXCHG_H__ */
diff --git a/include/common/arch/mips/asm/linkage.h b/include/common/arch/mips/asm/linkage.h
index 87bfcffa8..4d5b184cc 100644
--- a/include/common/arch/mips/asm/linkage.h
+++ b/include/common/arch/mips/asm/linkage.h
@@ -1,58 +1,56 @@
 #ifndef __CR_LINKAGE_H__
 #define __CR_LINKAGE_H__
 
-#define zero    $0      /* wired zero */
-#define AT      $1      /* assembler temp  - uppercase because of ".set at" */
-#define v0 	$2
-#define v1 	$3
+#define zero $0 /* wired zero */
+#define AT   $1 /* assembler temp  - uppercase because of ".set at" */
+#define v0   $2
+#define v1   $3
 
-#define a0 	$4
-#define a1      $5
-#define a2      $6
-#define a3      $7
-#define a4      $8
-#define a5      $9
-#define a6      $10
-#define a7      $11
-#define t0      $12
-#define t1      $13
-#define t2      $14
-#define t3      $15
+#define a0 $4
+#define a1 $5
+#define a2 $6
+#define a3 $7
+#define a4 $8
+#define a5 $9
+#define a6 $10
+#define a7 $11
+#define t0 $12
+#define t1 $13
+#define t2 $14
+#define t3 $15
 
-#define s0      $16     /* callee saved */
-#define s1      $17
-#define s2      $18
-#define s3      $19
-#define s4      $20
-#define s5      $21
-#define s6      $22
-#define s7      $23
-#define t8      $24     /* caller saved */
-#define t9      $25
-#define jp      $25     /* PIC jump register */
-#define k0      $26     /* kernel scratch */
-#define k1      $27
-#define gp      $28     /* global pointer */
-#define sp      $29     /* stack pointer */
-#define fp      $30     /* frame pointer */
-#define s8	$30	/* same like fp! */
-#define ra      $31     /* return address */
+#define s0 $16 /* callee saved */
+#define s1 $17
+#define s2 $18
+#define s3 $19
+#define s4 $20
+#define s5 $21
+#define s6 $22
+#define s7 $23
+#define t8 $24 /* caller saved */
+#define t9 $25
+#define jp $25 /* PIC jump register */
+#define k0 $26 /* kernel scratch */
+#define k1 $27
+#define gp $28 /* global pointer */
+#define sp $29 /* stack pointer */
+#define fp $30 /* frame pointer */
+#define s8 $30 /* same like fp! */
+#define ra $31 /* return address */
 
-#define __ALIGN		.align 8
-#define __ALIGN_STR	".align 8"
+#define __ALIGN	    .align 8
+#define __ALIGN_STR ".align 8"
 
-#define GLOBAL(name)		\
-	.globl name;		\
+#define GLOBAL(name) \
+	.globl name; \
 	name:
 
-#define ENTRY(name)		\
-	.globl name;		\
-	__ALIGN;		\
-	.type name, @function;	\
+#define ENTRY(name)            \
+	.globl name;           \
+	__ALIGN;               \
+	.type name, @function; \
 	name:
 
-#define END(sym)		\
-	.size sym, . - sym
-
+#define END(sym) .size sym, .- sym
 
 #endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/mips/asm/page.h b/include/common/arch/mips/asm/page.h
old mode 100755
new mode 100644
index bf27420f7..25bdbc141
--- a/include/common/arch/mips/asm/page.h
+++ b/include/common/arch/mips/asm/page.h
@@ -13,7 +13,7 @@ static unsigned __page_shift;
 static inline unsigned page_size(void)
 {
 	if (!__page_size)
-	    __page_size = sysconf(_SC_PAGESIZE);
+		__page_size = sysconf(_SC_PAGESIZE);
 	return __page_size;
 }
 
@@ -24,11 +24,11 @@ static inline unsigned page_shift(void)
 	return __page_shift;
 }
 
-#define PAGE_SIZE	page_size()
-#define PAGE_SHIFT	page_shift()
-#define PAGE_MASK	(~(PAGE_SIZE - 1))
+#define PAGE_SIZE  page_size()
+#define PAGE_SHIFT page_shift()
+#define PAGE_MASK  (~(PAGE_SIZE - 1))
 
-#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
 #else /* CR_NOGLIBC */
 
 extern unsigned page_size(void);
diff --git a/include/common/arch/mips/asm/utils.h b/include/common/arch/mips/asm/utils.h
index 6415bf485..76c5f8654 100644
--- a/include/common/arch/mips/asm/utils.h
+++ b/include/common/arch/mips/asm/utils.h
@@ -1,24 +1,22 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__
 
-
-# define kernel_uses_llsc	1
+#define kernel_uses_llsc 1
 
 typedef struct {
 	int counter;
-}atomic_t;
-
+} atomic_t;
 
 /*
  * FIXME: detect with compel_cpu_has_feature() if LL/SC implicitly
  * provide a memory barrier.
 */
-#define __WEAK_LLSC_MB		"	sync	\n"
+#define __WEAK_LLSC_MB "	sync	\n"
 
-#define smp_llsc_mb()	__asm__ __volatile__(__WEAK_LLSC_MB : : :"memory")
+#define smp_llsc_mb() __asm__ __volatile__(__WEAK_LLSC_MB : : : "memory")
 
-#define smp_mb__before_llsc() smp_llsc_mb()
-#define smp_mb__before_atomic()	smp_mb__before_llsc()
+#define smp_mb__before_llsc()	smp_llsc_mb()
+#define smp_mb__before_atomic() smp_mb__before_llsc()
 #define smp_mb__after_atomic()	smp_llsc_mb()
 
 #endif /* __UTILS_H__ */
diff --git a/include/common/arch/ppc64/asm/atomic.h b/include/common/arch/ppc64/asm/atomic.h
index 4c6477412..223dca195 100644
--- a/include/common/arch/ppc64/asm/atomic.h
+++ b/include/common/arch/ppc64/asm/atomic.h
@@ -13,10 +13,13 @@ typedef struct {
 
 #include "common/arch/ppc64/asm/cmpxchg.h"
 
-#define PPC_ATOMIC_ENTRY_BARRIER	"lwsync \n"
-#define PPC_ATOMIC_EXIT_BARRIER		"sync  	\n"
+#define PPC_ATOMIC_ENTRY_BARRIER "lwsync \n"
+#define PPC_ATOMIC_EXIT_BARRIER	 "sync  	\n"
 
-#define ATOMIC_INIT(i)		{ (i) }
+#define ATOMIC_INIT(i) \
+	{              \
+		(i)    \
+	}
 
 static __inline__ int atomic_read(const atomic_t *v)
 {
@@ -32,6 +35,7 @@ static __inline__ void atomic_set(atomic_t *v, int i)
 	__asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
 }
 
+/* clang-format off */
 #define ATOMIC_OP(op, asm_op)						\
 static __inline__ void atomic_##op(int a, atomic_t *v)			\
 {									\
@@ -124,10 +128,11 @@ static __inline__ int atomic_sub_return(int a, atomic_t *v)
 
 	return t;
 }
+/* clang-format on */
 
 /* true if the result is 0, or false for all other cases. */
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
-#define atomic_dec_return(v)  (atomic_sub_return(1, v))
+#define atomic_dec_return(v)   (atomic_sub_return(1, v))
 
 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
 
diff --git a/include/common/arch/ppc64/asm/bitops.h b/include/common/arch/ppc64/asm/bitops.h
index f9a327ccd..704668263 100644
--- a/include/common/arch/ppc64/asm/bitops.h
+++ b/include/common/arch/ppc64/asm/bitops.h
@@ -42,37 +42,36 @@
 
 #include "common/asm/bitsperlong.h"
 
-#define DIV_ROUND_UP(n,d)       (((n) + (d) - 1) / (d))
-#define BITS_TO_LONGS(nr)       DIV_ROUND_UP(nr, BITS_PER_LONG)
+#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
+#define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
 
-#define DECLARE_BITMAP(name,bits) \
-        unsigned long name[BITS_TO_LONGS(bits)]
+#define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
 
 #define __stringify_in_c(...) #__VA_ARGS__
 #define stringify_in_c(...)   __stringify_in_c(__VA_ARGS__) " "
 
-#define BIT_MASK(nr)            (1UL << ((nr) % BITS_PER_LONG))
-#define BIT_WORD(nr)            ((nr) / BITS_PER_LONG)
+#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
+#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
 
 /* PPC bit number conversion */
-#define PPC_BITLSHIFT(be)       (BITS_PER_LONG - 1 - (be))
-#define PPC_BIT(bit)            (1UL << PPC_BITLSHIFT(bit))
-#define PPC_BITMASK(bs, be)     ((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs))
+#define PPC_BITLSHIFT(be)   (BITS_PER_LONG - 1 - (be))
+#define PPC_BIT(bit)	    (1UL << PPC_BITLSHIFT(bit))
+#define PPC_BITMASK(bs, be) ((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs))
 
-#define PPC_INST_LDARX		0x7c0000a8
-#define ___PPC_RA(a)		(((a) & 0x1f) << 16)
-#define ___PPC_RB(b)		(((b) & 0x1f) << 11)
-#define ___PPC_RS(s)		(((s) & 0x1f) << 21)
-#define __PPC_EH(eh)		(((eh) & 0x1) << 0)
-#define ___PPC_RT(t)		___PPC_RS(t)
+#define PPC_INST_LDARX 0x7c0000a8
+#define ___PPC_RA(a)   (((a)&0x1f) << 16)
+#define ___PPC_RB(b)   (((b)&0x1f) << 11)
+#define ___PPC_RS(s)   (((s)&0x1f) << 21)
+#define __PPC_EH(eh)   (((eh)&0x1) << 0)
+#define ___PPC_RT(t)   ___PPC_RS(t)
 
-#define PPC_LDARX(t, a, b, eh)  stringify_in_c(.long PPC_INST_LDARX | \
-					___PPC_RT(t) | ___PPC_RA(a) | \
-					___PPC_RB(b) | __PPC_EH(eh))
-#define PPC_LLARX(t, a, b, eh)  PPC_LDARX(t, a, b, eh)
+#define PPC_LDARX(t, a, b, eh) \
+	stringify_in_c(.long PPC_INST_LDARX | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b) | __PPC_EH(eh))
+#define PPC_LLARX(t, a, b, eh) PPC_LDARX(t, a, b, eh)
 
+/* clang-format off */
 /* Macro for generating the ***_bits() functions */
-#define DEFINE_BITOP(fn, op)            	\
+#define DEFINE_BITOP(fn, op)			\
 static __inline__ void fn(unsigned long mask,   \
                 volatile unsigned long *_p)     \
 {                                               \
@@ -87,6 +86,7 @@ static __inline__ void fn(unsigned long mask,   \
         : "r" (mask), "r" (p)                   \
         : "cc", "memory");                      \
 }
+/* clang-format on */
 
 DEFINE_BITOP(set_bits, or)
 DEFINE_BITOP(clear_bits, andc)
@@ -94,26 +94,27 @@ DEFINE_BITOP(change_bits, xor)
 
 static __inline__ void set_bit(int nr, volatile unsigned long *addr)
 {
-        set_bits(BIT_MASK(nr), addr + BIT_WORD(nr));
+	set_bits(BIT_MASK(nr), addr + BIT_WORD(nr));
 }
 
 static __inline__ void clear_bit(int nr, volatile unsigned long *addr)
 {
-        clear_bits(BIT_MASK(nr), addr + BIT_WORD(nr));
+	clear_bits(BIT_MASK(nr), addr + BIT_WORD(nr));
 }
 
 static __inline__ void change_bit(int nr, volatile unsigned long *addr)
 {
-        change_bits(BIT_MASK(nr), addr + BIT_WORD(nr));
+	change_bits(BIT_MASK(nr), addr + BIT_WORD(nr));
 }
 
 static inline int test_bit(int nr, const volatile unsigned long *addr)
 {
-        return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));
+	return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG - 1)));
 }
 
 /* Like DEFINE_BITOP(), with changes to the arguments to 'op' and the output
  * operands. */
+/* clang-format off */
 #define DEFINE_TESTOP(fn, op, prefix, postfix, eh)	\
 static __inline__ unsigned long fn(			\
 		unsigned long mask,			\
@@ -133,11 +134,11 @@ static __inline__ unsigned long fn(			\
 	: "cc", "memory");				\
 	return (old & mask);				\
 }
+/* clang-format on */
 
 DEFINE_TESTOP(test_and_set_bits, or, "\nLWSYNC\n", "\nsync\n", 0)
 
-static __inline__ int test_and_set_bit(unsigned long nr,
-				       volatile unsigned long *addr)
+static __inline__ int test_and_set_bit(unsigned long nr, volatile unsigned long *addr)
 {
 	return test_and_set_bits(BIT_MASK(nr), addr + BIT_WORD(nr)) != 0;
 }
@@ -146,70 +147,63 @@ static __inline__ int test_and_set_bit(unsigned long nr,
  * Return the zero-based bit position (LE, not IBM bit numbering) of
  * the most significant 1-bit in a double word.
  */
-static __inline__ __attribute__((const))
-int __ilog2(unsigned long x)
+static __inline__ __attribute__((const)) int __ilog2(unsigned long x)
 {
-        int lz;
+	int lz;
 
-        asm ("cntlzd	%0,%1" : "=r" (lz) : "r" (x));
-        return BITS_PER_LONG - 1 - lz;
+	asm("cntlzd	%0,%1" : "=r"(lz) : "r"(x));
+	return BITS_PER_LONG - 1 - lz;
 }
 
-
 static __inline__ unsigned long __ffs(unsigned long x)
 {
-        return __ilog2(x & -x);
+	return __ilog2(x & -x);
 }
 
-
-#define BITOP_WORD(nr)          ((nr) / BITS_PER_LONG)
+#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
 /*
  * Find the next set bit in a memory region.
  */
-static inline
-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
-                            unsigned long offset)
+static inline unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset)
 {
-        const unsigned long *p = addr + BITOP_WORD(offset);
-        unsigned long result = offset & ~(BITS_PER_LONG-1);
-        unsigned long tmp;
+	const unsigned long *p = addr + BITOP_WORD(offset);
+	unsigned long result = offset & ~(BITS_PER_LONG - 1);
+	unsigned long tmp;
 
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset %= BITS_PER_LONG;
-        if (offset) {
-                tmp = *(p++);
-                tmp &= (~0UL << offset);
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-        while (size & ~(BITS_PER_LONG-1)) {
-                if ((tmp = *(p++)))
-                        goto found_middle;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
+	if (offset >= size)
+		return size;
+	size -= result;
+	offset %= BITS_PER_LONG;
+	if (offset) {
+		tmp = *(p++);
+		tmp &= (~0UL << offset);
+		if (size < BITS_PER_LONG)
+			goto found_first;
+		if (tmp)
+			goto found_middle;
+		size -= BITS_PER_LONG;
+		result += BITS_PER_LONG;
+	}
+	while (size & ~(BITS_PER_LONG - 1)) {
+		if ((tmp = *(p++)))
+			goto found_middle;
+		result += BITS_PER_LONG;
+		size -= BITS_PER_LONG;
+	}
+	if (!size)
+		return result;
+	tmp = *p;
 
 found_first:
-        tmp &= (~0UL >> (BITS_PER_LONG - size));
-        if (tmp == 0UL)         /* Are any bits set? */
-                return result + size;   /* Nope. */
+	tmp &= (~0UL >> (BITS_PER_LONG - size));
+	if (tmp == 0UL) /* Are any bits set? */
+		return result + size; /* Nope. */
 found_middle:
-        return result + __ffs(tmp);
+	return result + __ffs(tmp);
 }
 
-#define for_each_bit(i, bitmask)                                \
-        for (i = find_next_bit(bitmask, sizeof(bitmask), 0);    \
-             i < sizeof(bitmask);                               \
-             i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
-
+#define for_each_bit(i, bitmask)                                                  \
+	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
+	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
 
 #endif /* __CR_BITOPS_H__ */
diff --git a/include/common/arch/ppc64/asm/cmpxchg.h b/include/common/arch/ppc64/asm/cmpxchg.h
index b93fbdef0..ba204a3f2 100644
--- a/include/common/arch/ppc64/asm/cmpxchg.h
+++ b/include/common/arch/ppc64/asm/cmpxchg.h
@@ -5,54 +5,44 @@
  * Copied from kernel header file arch/powerpc/include/asm/cmpxchg.h
  */
 
-#define PPC_ACQUIRE_BARRIER		"isync	\n"
-#define PPC_RELEASE_BARRIER		"lwsync	\n"
+#define PPC_ACQUIRE_BARRIER "isync	\n"
+#define PPC_RELEASE_BARRIER "lwsync	\n"
 
 /*
  * Compare and exchange - if *p == old, set it to new,
  * and return the old value of *p.
  */
 
-static __always_inline unsigned long
-__cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)
+static __always_inline unsigned long __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new)
 {
 	unsigned int prev;
 
-	__asm__ __volatile__ (
-	PPC_RELEASE_BARRIER \
-"1:	lwarx	%0,0,%2		# __cmpxchg_u32\n\
+	__asm__ __volatile__(PPC_RELEASE_BARRIER "1:	lwarx	%0,0,%2		# __cmpxchg_u32\n\
 	cmpw	0,%0,%3\n\
 	bne-	2f\n"
-"	stwcx.	%4,0,%2\n\
-	bne-	1b \n" \
-	PPC_ACQUIRE_BARRIER
-	"\n\
+						 "	stwcx.	%4,0,%2\n\
+	bne-	1b \n" PPC_ACQUIRE_BARRIER "\n\
 2:"
-	: "=&r" (prev), "+m" (*p)
-	: "r" (p), "r" (old), "r" (new)
-	: "cc", "memory");
+			     : "=&r"(prev), "+m"(*p)
+			     : "r"(p), "r"(old), "r"(new)
+			     : "cc", "memory");
 
 	return prev;
 }
 
-static __always_inline unsigned long
-__cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new)
+static __always_inline unsigned long __cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new)
 {
 	unsigned long prev;
 
-	__asm__ __volatile__ (
-	PPC_RELEASE_BARRIER \
-"1:	ldarx	%0,0,%2		# __cmpxchg_u64\n\
+	__asm__ __volatile__(PPC_RELEASE_BARRIER "1:	ldarx	%0,0,%2		# __cmpxchg_u64\n\
 	cmpd	0,%0,%3\n\
 	bne-	2f\n\
 	stdcx.	%4,0,%2\n\
-	bne-	1b \n" \
-	PPC_ACQUIRE_BARRIER
-	"\n\
+	bne-	1b \n" PPC_ACQUIRE_BARRIER "\n\
 2:"
-	: "=&r" (prev), "+m" (*p)
-	: "r" (p), "r" (old), "r" (new)
-	: "cc", "memory");
+			     : "=&r"(prev), "+m"(*p)
+			     : "r"(p), "r"(old), "r"(new)
+			     : "cc", "memory");
 
 	return prev;
 }
@@ -62,18 +52,18 @@ __cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new)
 #ifdef CR_DEBUG
 static inline void __cmpxchg_called_with_bad_pointer(void)
 {
-	__asm__ __volatile__ (
-		"1:	twi 	31,0,0	# trap\n"
-		"	b 	1b"
-		: : : "memory");
+	__asm__ __volatile__("1:	twi 	31,0,0	# trap\n"
+			     "	b 	1b"
+			     :
+			     :
+			     : "memory");
 }
 #else
 extern void __cmpxchg_called_with_bad_pointer(void);
 #endif
 
-static __always_inline unsigned long
-__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,
-	  unsigned int size)
+static __always_inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,
+					       unsigned int size)
 {
 	switch (size) {
 	case 4:
@@ -85,12 +75,11 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new,
 	return old;
 }
 
-#define cmpxchg(ptr, o, n)						 \
-  ({									 \
-     __typeof__(*(ptr)) _o_ = (o);					 \
-     __typeof__(*(ptr)) _n_ = (n);					 \
-     (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_,		 \
-				    (unsigned long)_n_, sizeof(*(ptr))); \
-  })
+#define cmpxchg(ptr, o, n)                                                                                    \
+	({                                                                                                    \
+		__typeof__(*(ptr)) _o_ = (o);                                                                 \
+		__typeof__(*(ptr)) _n_ = (n);                                                                 \
+		(__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)_o_, (unsigned long)_n_, sizeof(*(ptr))); \
+	})
 
 #endif /* __CR_CMPXCHG_H__ */
diff --git a/include/common/arch/ppc64/asm/linkage.h b/include/common/arch/ppc64/asm/linkage.h
index 01a47ab1a..8e388c105 100644
--- a/include/common/arch/ppc64/asm/linkage.h
+++ b/include/common/arch/ppc64/asm/linkage.h
@@ -10,36 +10,33 @@
 
 #ifdef __ASSEMBLY__
 
-#define GLOBAL(name)		\
-	.globl name;		\
+#define GLOBAL(name) \
+	.globl name; \
 	name:
 
-#define ENTRY(name)		\
-	.globl name;		\
-	.type name, @function;	\
+#define ENTRY(name)            \
+	.globl name;           \
+	.type name, @function; \
 	name:
 
-#define END(sym)		\
-	.size sym, . - sym
-
+#define END(sym) .size sym, .- sym
 
 #define STACKFRAMESIZE 256
-#define __STK_REG(i)   (112 + ((i)-14)*8)
+#define __STK_REG(i)   (112 + ((i)-14) * 8)
 #define STK_REG(i)     __STK_REG(__REG_##i)
 
 /* The boring bits... */
 
 /* Condition Register Bit Fields */
 
-#define	cr0	0
-#define	cr1	1
-#define	cr2	2
-#define	cr3	3
-#define	cr4	4
-#define	cr5	5
-#define	cr6	6
-#define	cr7	7
-
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
 
 /*
  * General Purpose Registers (GPRs)
@@ -49,6 +46,7 @@
  * Use R0-31 only when really nessesary.
  */
 
+/* clang-format off */
 #define	r0	%r0
 #define	r1	%r1
 #define	r2	%r2
@@ -81,221 +79,219 @@
 #define	r29	%r29
 #define	r30	%r30
 #define	r31	%r31
-
+/* clang-format on */
 
 /* Floating Point Registers (FPRs) */
 
-#define	fr0	0
-#define	fr1	1
-#define	fr2	2
-#define	fr3	3
-#define	fr4	4
-#define	fr5	5
-#define	fr6	6
-#define	fr7	7
-#define	fr8	8
-#define	fr9	9
-#define	fr10	10
-#define	fr11	11
-#define	fr12	12
-#define	fr13	13
-#define	fr14	14
-#define	fr15	15
-#define	fr16	16
-#define	fr17	17
-#define	fr18	18
-#define	fr19	19
-#define	fr20	20
-#define	fr21	21
-#define	fr22	22
-#define	fr23	23
-#define	fr24	24
-#define	fr25	25
-#define	fr26	26
-#define	fr27	27
-#define	fr28	28
-#define	fr29	29
-#define	fr30	30
-#define	fr31	31
+#define fr0  0
+#define fr1  1
+#define fr2  2
+#define fr3  3
+#define fr4  4
+#define fr5  5
+#define fr6  6
+#define fr7  7
+#define fr8  8
+#define fr9  9
+#define fr10 10
+#define fr11 11
+#define fr12 12
+#define fr13 13
+#define fr14 14
+#define fr15 15
+#define fr16 16
+#define fr17 17
+#define fr18 18
+#define fr19 19
+#define fr20 20
+#define fr21 21
+#define fr22 22
+#define fr23 23
+#define fr24 24
+#define fr25 25
+#define fr26 26
+#define fr27 27
+#define fr28 28
+#define fr29 29
+#define fr30 30
+#define fr31 31
 
 /* AltiVec Registers (VPRs) */
 
-#define	vr0	0
-#define	vr1	1
-#define	vr2	2
-#define	vr3	3
-#define	vr4	4
-#define	vr5	5
-#define	vr6	6
-#define	vr7	7
-#define	vr8	8
-#define	vr9	9
-#define	vr10	10
-#define	vr11	11
-#define	vr12	12
-#define	vr13	13
-#define	vr14	14
-#define	vr15	15
-#define	vr16	16
-#define	vr17	17
-#define	vr18	18
-#define	vr19	19
-#define	vr20	20
-#define	vr21	21
-#define	vr22	22
-#define	vr23	23
-#define	vr24	24
-#define	vr25	25
-#define	vr26	26
-#define	vr27	27
-#define	vr28	28
-#define	vr29	29
-#define	vr30	30
-#define	vr31	31
+#define vr0  0
+#define vr1  1
+#define vr2  2
+#define vr3  3
+#define vr4  4
+#define vr5  5
+#define vr6  6
+#define vr7  7
+#define vr8  8
+#define vr9  9
+#define vr10 10
+#define vr11 11
+#define vr12 12
+#define vr13 13
+#define vr14 14
+#define vr15 15
+#define vr16 16
+#define vr17 17
+#define vr18 18
+#define vr19 19
+#define vr20 20
+#define vr21 21
+#define vr22 22
+#define vr23 23
+#define vr24 24
+#define vr25 25
+#define vr26 26
+#define vr27 27
+#define vr28 28
+#define vr29 29
+#define vr30 30
+#define vr31 31
 
 /* VSX Registers (VSRs) */
 
-#define	vsr0	0
-#define	vsr1	1
-#define	vsr2	2
-#define	vsr3	3
-#define	vsr4	4
-#define	vsr5	5
-#define	vsr6	6
-#define	vsr7	7
-#define	vsr8	8
-#define	vsr9	9
-#define	vsr10	10
-#define	vsr11	11
-#define	vsr12	12
-#define	vsr13	13
-#define	vsr14	14
-#define	vsr15	15
-#define	vsr16	16
-#define	vsr17	17
-#define	vsr18	18
-#define	vsr19	19
-#define	vsr20	20
-#define	vsr21	21
-#define	vsr22	22
-#define	vsr23	23
-#define	vsr24	24
-#define	vsr25	25
-#define	vsr26	26
-#define	vsr27	27
-#define	vsr28	28
-#define	vsr29	29
-#define	vsr30	30
-#define	vsr31	31
-#define	vsr32	32
-#define	vsr33	33
-#define	vsr34	34
-#define	vsr35	35
-#define	vsr36	36
-#define	vsr37	37
-#define	vsr38	38
-#define	vsr39	39
-#define	vsr40	40
-#define	vsr41	41
-#define	vsr42	42
-#define	vsr43	43
-#define	vsr44	44
-#define	vsr45	45
-#define	vsr46	46
-#define	vsr47	47
-#define	vsr48	48
-#define	vsr49	49
-#define	vsr50	50
-#define	vsr51	51
-#define	vsr52	52
-#define	vsr53	53
-#define	vsr54	54
-#define	vsr55	55
-#define	vsr56	56
-#define	vsr57	57
-#define	vsr58	58
-#define	vsr59	59
-#define	vsr60	60
-#define	vsr61	61
-#define	vsr62	62
-#define	vsr63	63
+#define vsr0  0
+#define vsr1  1
+#define vsr2  2
+#define vsr3  3
+#define vsr4  4
+#define vsr5  5
+#define vsr6  6
+#define vsr7  7
+#define vsr8  8
+#define vsr9  9
+#define vsr10 10
+#define vsr11 11
+#define vsr12 12
+#define vsr13 13
+#define vsr14 14
+#define vsr15 15
+#define vsr16 16
+#define vsr17 17
+#define vsr18 18
+#define vsr19 19
+#define vsr20 20
+#define vsr21 21
+#define vsr22 22
+#define vsr23 23
+#define vsr24 24
+#define vsr25 25
+#define vsr26 26
+#define vsr27 27
+#define vsr28 28
+#define vsr29 29
+#define vsr30 30
+#define vsr31 31
+#define vsr32 32
+#define vsr33 33
+#define vsr34 34
+#define vsr35 35
+#define vsr36 36
+#define vsr37 37
+#define vsr38 38
+#define vsr39 39
+#define vsr40 40
+#define vsr41 41
+#define vsr42 42
+#define vsr43 43
+#define vsr44 44
+#define vsr45 45
+#define vsr46 46
+#define vsr47 47
+#define vsr48 48
+#define vsr49 49
+#define vsr50 50
+#define vsr51 51
+#define vsr52 52
+#define vsr53 53
+#define vsr54 54
+#define vsr55 55
+#define vsr56 56
+#define vsr57 57
+#define vsr58 58
+#define vsr59 59
+#define vsr60 60
+#define vsr61 61
+#define vsr62 62
+#define vsr63 63
 
 /* SPE Registers (EVPRs) */
 
-#define	evr0	0
-#define	evr1	1
-#define	evr2	2
-#define	evr3	3
-#define	evr4	4
-#define	evr5	5
-#define	evr6	6
-#define	evr7	7
-#define	evr8	8
-#define	evr9	9
-#define	evr10	10
-#define	evr11	11
-#define	evr12	12
-#define	evr13	13
-#define	evr14	14
-#define	evr15	15
-#define	evr16	16
-#define	evr17	17
-#define	evr18	18
-#define	evr19	19
-#define	evr20	20
-#define	evr21	21
-#define	evr22	22
-#define	evr23	23
-#define	evr24	24
-#define	evr25	25
-#define	evr26	26
-#define	evr27	27
-#define	evr28	28
-#define	evr29	29
-#define	evr30	30
-#define	evr31	31
+#define evr0  0
+#define evr1  1
+#define evr2  2
+#define evr3  3
+#define evr4  4
+#define evr5  5
+#define evr6  6
+#define evr7  7
+#define evr8  8
+#define evr9  9
+#define evr10 10
+#define evr11 11
+#define evr12 12
+#define evr13 13
+#define evr14 14
+#define evr15 15
+#define evr16 16
+#define evr17 17
+#define evr18 18
+#define evr19 19
+#define evr20 20
+#define evr21 21
+#define evr22 22
+#define evr23 23
+#define evr24 24
+#define evr25 25
+#define evr26 26
+#define evr27 27
+#define evr28 28
+#define evr29 29
+#define evr30 30
+#define evr31 31
 
 /* some stab codes */
 #define N_FUN	36
 #define N_RSYM	64
-#define N_SLINE	68
+#define N_SLINE 68
 #define N_SO	100
 
-#define __REG_R0	0
-#define __REG_R1	1
-#define __REG_R2	2
-#define __REG_R3	3
-#define __REG_R4	4
-#define __REG_R5	5
-#define __REG_R6	6
-#define __REG_R7	7
-#define __REG_R8	8
-#define __REG_R9	9
-#define __REG_R10	10
-#define __REG_R11	11
-#define __REG_R12	12
-#define __REG_R13	13
-#define __REG_R14	14
-#define __REG_R15	15
-#define __REG_R16	16
-#define __REG_R17	17
-#define __REG_R18	18
-#define __REG_R19	19
-#define __REG_R20	20
-#define __REG_R21	21
-#define __REG_R22	22
-#define __REG_R23	23
-#define __REG_R24	24
-#define __REG_R25	25
-#define __REG_R26	26
-#define __REG_R27	27
-#define __REG_R28	28
-#define __REG_R29	29
-#define __REG_R30	30
-#define __REG_R31	31
+#define __REG_R0  0
+#define __REG_R1  1
+#define __REG_R2  2
+#define __REG_R3  3
+#define __REG_R4  4
+#define __REG_R5  5
+#define __REG_R6  6
+#define __REG_R7  7
+#define __REG_R8  8
+#define __REG_R9  9
+#define __REG_R10 10
+#define __REG_R11 11
+#define __REG_R12 12
+#define __REG_R13 13
+#define __REG_R14 14
+#define __REG_R15 15
+#define __REG_R16 16
+#define __REG_R17 17
+#define __REG_R18 18
+#define __REG_R19 19
+#define __REG_R20 20
+#define __REG_R21 21
+#define __REG_R22 22
+#define __REG_R23 23
+#define __REG_R24 24
+#define __REG_R25 25
+#define __REG_R26 26
+#define __REG_R27 27
+#define __REG_R28 28
+#define __REG_R29 29
+#define __REG_R30 30
+#define __REG_R31 31
 
-
-
-#endif  /* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
 
 #endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/ppc64/asm/page.h b/include/common/arch/ppc64/asm/page.h
index 5107cb8e0..a1ff6718a 100644
--- a/include/common/arch/ppc64/asm/page.h
+++ b/include/common/arch/ppc64/asm/page.h
@@ -29,11 +29,11 @@ static inline unsigned page_shift(void)
  * on ppc64, then we need refrain using PAGE_SIZE in criu and use
  * page_size() across sources (as it may differ on ppc64).
  */
-#define PAGE_SIZE	page_size()
-#define PAGE_MASK	(~(PAGE_SIZE - 1))
-#define PAGE_SHIFT	page_shift()
+#define PAGE_SIZE  page_size()
+#define PAGE_MASK  (~(PAGE_SIZE - 1))
+#define PAGE_SHIFT page_shift()
 
-#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
 
 #else /* CR_NOGLIBC */
 
diff --git a/include/common/arch/s390/asm/atomic.h b/include/common/arch/s390/asm/atomic.h
index dfdba1296..a132ebe05 100644
--- a/include/common/arch/s390/asm/atomic.h
+++ b/include/common/arch/s390/asm/atomic.h
@@ -4,7 +4,10 @@
 #include "common/arch/s390/asm/atomic_ops.h"
 #include "common/compiler.h"
 
-#define ATOMIC_INIT(i)  { (i) }
+#define ATOMIC_INIT(i) \
+	{              \
+		(i)    \
+	}
 
 typedef struct {
 	int counter;
@@ -14,17 +17,13 @@ static inline int atomic_read(const atomic_t *v)
 {
 	int c;
 
-	asm volatile(
-		"	l	%0,%1\n"
-		: "=d" (c) : "Q" (v->counter));
+	asm volatile("	l	%0,%1\n" : "=d"(c) : "Q"(v->counter));
 	return c;
 }
 
 static inline void atomic_set(atomic_t *v, int i)
 {
-	asm volatile(
-		"	st	%1,%0\n"
-		: "=Q" (v->counter) : "d" (i));
+	asm volatile("	st	%1,%0\n" : "=Q"(v->counter) : "d"(i));
 }
 
 static inline int atomic_add_return(int i, atomic_t *v)
@@ -32,25 +31,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
 	return __atomic_add_barrier(i, &v->counter) + i;
 }
 
-
 static inline void atomic_add(int i, atomic_t *v)
 {
 	__atomic_add(i, &v->counter);
 }
 
-#define atomic_inc(_v)			atomic_add(1, _v)
-#define atomic_inc_return(_v)		atomic_add_return(1, _v)
-#define atomic_sub(_i, _v)		atomic_add(-(int)(_i), _v)
-#define atomic_sub_return(_i, _v)	atomic_add_return(-(int)(_i), _v)
-#define atomic_dec(_v)			atomic_sub(1, _v)
-#define atomic_dec_return(_v)		atomic_sub_return(1, _v)
-#define atomic_dec_and_test(_v)		(atomic_sub_return(1, _v) == 0)
+#define atomic_inc(_v)		  atomic_add(1, _v)
+#define atomic_inc_return(_v)	  atomic_add_return(1, _v)
+#define atomic_sub(_i, _v)	  atomic_add(-(int)(_i), _v)
+#define atomic_sub_return(_i, _v) atomic_add_return(-(int)(_i), _v)
+#define atomic_dec(_v)		  atomic_sub(1, _v)
+#define atomic_dec_return(_v)	  atomic_sub_return(1, _v)
+#define atomic_dec_and_test(_v)	  (atomic_sub_return(1, _v) == 0)
 
-#define ATOMIC_OPS(op)							\
-static inline void atomic_##op(int i, atomic_t *v)			\
-{									\
-	__atomic_##op(i, &v->counter);					\
-}									\
+#define ATOMIC_OPS(op)                                     \
+	static inline void atomic_##op(int i, atomic_t *v) \
+	{                                                  \
+		__atomic_##op(i, &v->counter);             \
+	}
 
 ATOMIC_OPS(and)
 ATOMIC_OPS(or)
@@ -64,4 +62,3 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
 }
 
 #endif /* __ARCH_S390_ATOMIC__  */
-
diff --git a/include/common/arch/s390/asm/atomic_ops.h b/include/common/arch/s390/asm/atomic_ops.h
index ff0e1e3da..e04d66e3c 100644
--- a/include/common/arch/s390/asm/atomic_ops.h
+++ b/include/common/arch/s390/asm/atomic_ops.h
@@ -1,6 +1,7 @@
 #ifndef __ARCH_S390_ATOMIC_OPS__
 #define __ARCH_S390_ATOMIC_OPS__
 
+/* clang-format off */
 #define __ATOMIC_OP(op_name, op_string)					\
 static inline int op_name(int val, int *ptr)				\
 {									\
@@ -15,18 +16,20 @@ static inline int op_name(int val, int *ptr)				\
 		: [val] "d" (val), "0" (*ptr) : "cc", "memory");	\
 	return old;							\
 }
+/* clang-format on */
 
-#define __ATOMIC_OPS(op_name, op_string)				\
-	__ATOMIC_OP(op_name, op_string)					\
+#define __ATOMIC_OPS(op_name, op_string) \
+	__ATOMIC_OP(op_name, op_string)  \
 	__ATOMIC_OP(op_name##_barrier, op_string)
 
 __ATOMIC_OPS(__atomic_add, "ar")
 __ATOMIC_OPS(__atomic_and, "nr")
-__ATOMIC_OPS(__atomic_or,  "or")
+__ATOMIC_OPS(__atomic_or, "or")
 __ATOMIC_OPS(__atomic_xor, "xr")
 
 #undef __ATOMIC_OPS
 
+/* clang-format off */
 #define __ATOMIC64_OP(op_name, op_string)				\
 static inline long op_name(long val, long *ptr)				\
 {									\
@@ -41,33 +44,34 @@ static inline long op_name(long val, long *ptr)				\
 		: [val] "d" (val), "0" (*ptr) : "cc", "memory");	\
 	return old;							\
 }
+/* clang-format on */
 
-#define __ATOMIC64_OPS(op_name, op_string)				\
-	__ATOMIC64_OP(op_name, op_string)				\
+#define __ATOMIC64_OPS(op_name, op_string) \
+	__ATOMIC64_OP(op_name, op_string)  \
 	__ATOMIC64_OP(op_name##_barrier, op_string)
 
 __ATOMIC64_OPS(__atomic64_add, "agr")
 __ATOMIC64_OPS(__atomic64_and, "ngr")
-__ATOMIC64_OPS(__atomic64_or,  "ogr")
+__ATOMIC64_OPS(__atomic64_or, "ogr")
 __ATOMIC64_OPS(__atomic64_xor, "xgr")
 
 #undef __ATOMIC64_OPS
 
 static inline int __atomic_cmpxchg(int *ptr, int old, int new)
 {
-	asm volatile(
-		"	cs	%[old],%[new],%[ptr]"
-		: [old] "+d" (old), [ptr] "+Q" (*ptr)
-		: [new] "d" (new) : "cc", "memory");
+	asm volatile("	cs	%[old],%[new],%[ptr]"
+		     : [old] "+d"(old), [ptr] "+Q"(*ptr)
+		     : [new] "d"(new)
+		     : "cc", "memory");
 	return old;
 }
 
 static inline long __atomic64_cmpxchg(long *ptr, long old, long new)
 {
-	asm volatile(
-		"	csg	%[old],%[new],%[ptr]"
-		: [old] "+d" (old), [ptr] "+Q" (*ptr)
-		: [new] "d" (new) : "cc", "memory");
+	asm volatile("	csg	%[old],%[new],%[ptr]"
+		     : [old] "+d"(old), [ptr] "+Q"(*ptr)
+		     : [new] "d"(new)
+		     : "cc", "memory");
 	return old;
 }
 
diff --git a/include/common/arch/s390/asm/bitops.h b/include/common/arch/s390/asm/bitops.h
index 648d898d1..f396721e9 100644
--- a/include/common/arch/s390/asm/bitops.h
+++ b/include/common/arch/s390/asm/bitops.h
@@ -5,15 +5,13 @@
 #include "common/compiler.h"
 #include "common/arch/s390/asm/atomic_ops.h"
 
-#define DIV_ROUND_UP(n, d)	(((n) + (d) - 1) / (d))
-#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
-#define __BITOPS_WORDS(bits)	(((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)
+#define DIV_ROUND_UP(n, d)   (((n) + (d)-1) / (d))
+#define BITS_TO_LONGS(nr)    DIV_ROUND_UP(nr, BITS_PER_LONG)
+#define __BITOPS_WORDS(bits) (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)
 
-#define DECLARE_BITMAP(name,bits) \
-	unsigned long name[BITS_TO_LONGS(bits)]
+#define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
 
-static inline unsigned long *
-__bitops_word(unsigned long nr, volatile unsigned long *ptr)
+static inline unsigned long *__bitops_word(unsigned long nr, volatile unsigned long *ptr)
 {
 	unsigned long addr;
 
@@ -21,8 +19,7 @@ __bitops_word(unsigned long nr, volatile unsigned long *ptr)
 	return (unsigned long *)addr;
 }
 
-static inline unsigned char *
-__bitops_byte(unsigned long nr, volatile unsigned long *ptr)
+static inline unsigned char *__bitops_byte(unsigned long nr, volatile unsigned long *ptr)
 {
 	return ((unsigned char *)ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
 }
@@ -33,7 +30,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *ptr)
 	unsigned long mask;
 
 	mask = 1UL << (nr & (BITS_PER_LONG - 1));
-	__atomic64_or((long) mask, (long *) addr);
+	__atomic64_or((long)mask, (long *)addr);
 }
 
 static inline void clear_bit(unsigned long nr, volatile unsigned long *ptr)
@@ -42,7 +39,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *ptr)
 	unsigned long mask;
 
 	mask = ~(1UL << (nr & (BITS_PER_LONG - 1)));
-	__atomic64_and((long) mask, (long *) addr);
+	__atomic64_and((long)mask, (long *)addr);
 }
 
 static inline void change_bit(unsigned long nr, volatile unsigned long *ptr)
@@ -51,17 +48,16 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *ptr)
 	unsigned long mask;
 
 	mask = 1UL << (nr & (BITS_PER_LONG - 1));
-	__atomic64_xor((long) mask, (long *) addr);
+	__atomic64_xor((long)mask, (long *)addr);
 }
 
-static inline int
-test_and_set_bit(unsigned long nr, volatile unsigned long *ptr)
+static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *ptr)
 {
 	unsigned long *addr = __bitops_word(nr, ptr);
 	unsigned long old, mask;
 
 	mask = 1UL << (nr & (BITS_PER_LONG - 1));
-	old = __atomic64_or_barrier((long) mask, (long *) addr);
+	old = __atomic64_or_barrier((long)mask, (long *)addr);
 	return (old & mask) != 0;
 }
 
@@ -118,9 +114,8 @@ static inline unsigned long __ffs(unsigned long word)
 
 #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
 
-static inline unsigned long _find_next_bit(const unsigned long *addr,
-				    unsigned long nbits, unsigned long start,
-				    unsigned long invert)
+static inline unsigned long _find_next_bit(const unsigned long *addr, unsigned long nbits, unsigned long start,
+					   unsigned long invert)
 {
 	unsigned long tmp;
 
@@ -143,16 +138,13 @@ static inline unsigned long _find_next_bit(const unsigned long *addr,
 	return min(start + __ffs(tmp), nbits);
 }
 
-static inline unsigned long find_next_bit(const unsigned long *addr,
-					  unsigned long size,
-					  unsigned long offset)
+static inline unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset)
 {
 	return _find_next_bit(addr, size, offset, 0UL);
 }
 
-#define for_each_bit(i, bitmask)				\
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0);	\
-	     i < sizeof(bitmask);				\
+#define for_each_bit(i, bitmask)                                                  \
+	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
 	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
 
 #endif /* _S390_BITOPS_H */
diff --git a/include/common/arch/s390/asm/linkage.h b/include/common/arch/s390/asm/linkage.h
index 99895ced5..4587b09ca 100644
--- a/include/common/arch/s390/asm/linkage.h
+++ b/include/common/arch/s390/asm/linkage.h
@@ -5,18 +5,17 @@
 
 #define __ALIGN .align 4, 0x07
 
-#define GLOBAL(name)		\
-	.globl name;		\
+#define GLOBAL(name) \
+	.globl name; \
 	name:
 
-#define ENTRY(name)		\
-	.globl name;		\
-	.type name, @function;	\
-	__ALIGN;		\
+#define ENTRY(name)            \
+	.globl name;           \
+	.type name, @function; \
+	__ALIGN;               \
 	name:
 
-#define END(name)		\
-	.size name, . - name
+#define END(name) .size name, .- name
 
 #endif /* __ASSEMBLY__ */
 #endif
diff --git a/include/common/arch/s390/asm/page.h b/include/common/arch/s390/asm/page.h
index 8e8c6491b..d31e82c60 100644
--- a/include/common/arch/s390/asm/page.h
+++ b/include/common/arch/s390/asm/page.h
@@ -2,18 +2,18 @@
 #define __CR_ASM_PAGE_H__
 
 #ifndef PAGE_SHIFT
-#define PAGE_SHIFT	12
+#define PAGE_SHIFT 12
 #endif
 
 #ifndef PAGE_SIZE
-#define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#define PAGE_SIZE (1UL << PAGE_SHIFT)
 #endif
 
 #ifndef PAGE_MASK
-#define PAGE_MASK	(~(PAGE_SIZE - 1))
+#define PAGE_MASK (~(PAGE_SIZE - 1))
 #endif
 
-#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
-#define page_size()	PAGE_SIZE
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
+#define page_size()    PAGE_SIZE
 
 #endif /* __CR_ASM_PAGE_H__ */
diff --git a/include/common/arch/x86/asm/asm.h b/include/common/arch/x86/asm/asm.h
index af324c6e2..49abe00bd 100644
--- a/include/common/arch/x86/asm/asm.h
+++ b/include/common/arch/x86/asm/asm.h
@@ -2,27 +2,27 @@
 #define __CR_ASM_H__
 
 #ifdef __GCC_ASM_FLAG_OUTPUTS__
-# define CC_SET(c) "\n\t/* output condition code " #c "*/\n"
-# define CC_OUT(c) "=@cc" #c
+#define CC_SET(c) "\n\t/* output condition code " #c "*/\n"
+#define CC_OUT(c) "=@cc" #c
 #else
-# define CC_SET(c) "\n\tset" #c " %[_cc_" #c "]\n"
-# define CC_OUT(c) [_cc_ ## c] "=qm"
+#define CC_SET(c) "\n\tset" #c " %[_cc_" #c "]\n"
+#define CC_OUT(c) [_cc_##c] "=qm"
 #endif
 
 #ifdef __ASSEMBLY__
-# define __ASM_FORM(x)	x
+#define __ASM_FORM(x) x
 #else
-# define __ASM_FORM(x)	" " #x " "
+#define __ASM_FORM(x) " " #x " "
 #endif
 
 #ifndef __x86_64__
 /* 32 bit */
-# define __ASM_SEL(a,b) __ASM_FORM(a)
+#define __ASM_SEL(a, b) __ASM_FORM(a)
 #else
 /* 64 bit */
-# define __ASM_SEL(a,b) __ASM_FORM(b)
+#define __ASM_SEL(a, b) __ASM_FORM(b)
 #endif
 
-#define __ASM_SIZE(inst, ...)	__ASM_SEL(inst##l##__VA_ARGS__, inst##q##__VA_ARGS__)
+#define __ASM_SIZE(inst, ...) __ASM_SEL(inst##l##__VA_ARGS__, inst##q##__VA_ARGS__)
 
 #endif /* __CR_ASM_H__ */
diff --git a/include/common/arch/x86/asm/atomic.h b/include/common/arch/x86/asm/atomic.h
index ec178e7cf..a0df6b125 100644
--- a/include/common/arch/x86/asm/atomic.h
+++ b/include/common/arch/x86/asm/atomic.h
@@ -7,7 +7,10 @@ typedef struct {
 	int counter;
 } atomic_t;
 
-#define ATOMIC_INIT(i)	{ (i) }
+#define ATOMIC_INIT(i) \
+	{              \
+		(i)    \
+	}
 
 static inline int atomic_read(const atomic_t *v)
 {
@@ -21,37 +24,29 @@ static inline void atomic_set(atomic_t *v, int i)
 
 static inline void atomic_add(int i, atomic_t *v)
 {
-	asm volatile(LOCK_PREFIX "addl %1,%0"
-		     : "+m" (v->counter)
-		     : "ir" (i));
+	asm volatile(LOCK_PREFIX "addl %1,%0" : "+m"(v->counter) : "ir"(i));
 }
 
 static inline void atomic_sub(int i, atomic_t *v)
 {
-	asm volatile(LOCK_PREFIX "subl %1,%0"
-		     : "+m" (v->counter)
-		     : "ir" (i));
+	asm volatile(LOCK_PREFIX "subl %1,%0" : "+m"(v->counter) : "ir"(i));
 }
 
 static inline void atomic_inc(atomic_t *v)
 {
-	asm volatile(LOCK_PREFIX "incl %0"
-		     : "+m" (v->counter));
+	asm volatile(LOCK_PREFIX "incl %0" : "+m"(v->counter));
 }
 
 static inline void atomic_dec(atomic_t *v)
 {
-	asm volatile(LOCK_PREFIX "decl %0"
-		     : "+m" (v->counter));
+	asm volatile(LOCK_PREFIX "decl %0" : "+m"(v->counter));
 }
 
 static inline int atomic_dec_and_test(atomic_t *v)
 {
 	unsigned char c;
 
-	asm volatile(LOCK_PREFIX "decl %0; sete %1"
-		     : "+m" (v->counter), "=qm" (c)
-		     : : "memory");
+	asm volatile(LOCK_PREFIX "decl %0; sete %1" : "+m"(v->counter), "=qm"(c) : : "memory");
 	return c != 0;
 }
 
@@ -65,8 +60,8 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 	return atomic_add_return(-i, v);
 }
 
-#define atomic_inc_return(v)  (atomic_add_return(1, v))
-#define atomic_dec_return(v)  (atomic_sub_return(1, v))
+#define atomic_inc_return(v) (atomic_add_return(1, v))
+#define atomic_dec_return(v) (atomic_sub_return(1, v))
 
 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
 {
diff --git a/include/common/arch/x86/asm/bitops.h b/include/common/arch/x86/asm/bitops.h
index 9c7aeb5d7..d7a60589b 100644
--- a/include/common/arch/x86/asm/bitops.h
+++ b/include/common/arch/x86/asm/bitops.h
@@ -6,47 +6,46 @@
 #include "common/arch/x86/asm/asm.h"
 #include "common/asm/bitsperlong.h"
 
-#define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
-#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
+#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
+#define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
 
-#define DECLARE_BITMAP(name, bits)		\
-	unsigned long name[BITS_TO_LONGS(bits)]
+#define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
 /* Technically wrong, but this avoids compilation errors on some gcc
    versions. */
-#define BITOP_ADDR(x) "=m" (*(volatile long *) (x))
+#define BITOP_ADDR(x) "=m"(*(volatile long *)(x))
 #else
-#define BITOP_ADDR(x) "+m" (*(volatile long *) (x))
+#define BITOP_ADDR(x) "+m"(*(volatile long *)(x))
 #endif
 
-#define ADDR				BITOP_ADDR(addr)
+#define ADDR BITOP_ADDR(addr)
 
 static inline void set_bit(long nr, volatile unsigned long *addr)
 {
-	asm volatile(__ASM_SIZE(bts) " %1,%0" : ADDR : "Ir" (nr) : "memory");
+	asm volatile(__ASM_SIZE(bts) " %1,%0" : ADDR : "Ir"(nr) : "memory");
 }
 
 static inline void change_bit(long nr, volatile unsigned long *addr)
 {
-	asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr));
+	asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir"(nr));
 }
 
 static inline bool test_bit(long nr, volatile const unsigned long *addr)
 {
 	bool oldbit;
 
-	asm volatile(__ASM_SIZE(bt) " %2,%1"
-		     CC_SET(c)
-		     : CC_OUT(c) (oldbit)
-		     : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");
+	asm volatile(__ASM_SIZE(bt) " %2,%1" CC_SET(c)
+		     : CC_OUT(c)(oldbit)
+		     : "m"(*(unsigned long *)addr), "Ir"(nr)
+		     : "memory");
 
 	return oldbit;
 }
 
 static inline void clear_bit(long nr, volatile unsigned long *addr)
 {
-	asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr));
+	asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir"(nr));
 }
 
 /**
@@ -61,10 +60,7 @@ static inline bool test_and_set_bit(long nr, volatile unsigned long *addr)
 {
 	bool oldbit;
 
-	asm(__ASM_SIZE(bts) " %2,%1"
-	    CC_SET(c)
-	    : CC_OUT(c) (oldbit)
-	    : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");
+	asm(__ASM_SIZE(bts) " %2,%1" CC_SET(c) : CC_OUT(c)(oldbit) : "m"(*(unsigned long *)addr), "Ir"(nr) : "memory");
 	return oldbit;
 }
 
@@ -76,23 +72,19 @@ static inline bool test_and_set_bit(long nr, volatile unsigned long *addr)
  */
 static inline unsigned long __ffs(unsigned long word)
 {
-	asm("bsf %1,%0"
-		: "=r" (word)
-		: "rm" (word));
+	asm("bsf %1,%0" : "=r"(word) : "rm"(word));
 	return word;
 }
 
-#define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)
+#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
 
 /*
  * Find the next set bit in a memory region.
  */
-static inline
-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
-			    unsigned long offset)
+static inline unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset)
 {
 	const unsigned long *p = addr + BITOP_WORD(offset);
-	unsigned long result = offset & ~(BITS_PER_LONG-1);
+	unsigned long result = offset & ~(BITS_PER_LONG - 1);
 	unsigned long tmp;
 
 	if (offset >= size)
@@ -109,7 +101,7 @@ unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
 		size -= BITS_PER_LONG;
 		result += BITS_PER_LONG;
 	}
-	while (size & ~(BITS_PER_LONG-1)) {
+	while (size & ~(BITS_PER_LONG - 1)) {
 		if ((tmp = *(p++)))
 			goto found_middle;
 		result += BITS_PER_LONG;
@@ -121,15 +113,14 @@ unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
 
 found_first:
 	tmp &= (~0UL >> (BITS_PER_LONG - size));
-	if (tmp == 0UL)		/* Are any bits set? */
-		return result + size;	/* Nope. */
+	if (tmp == 0UL) /* Are any bits set? */
+		return result + size; /* Nope. */
 found_middle:
 	return result + __ffs(tmp);
 }
 
-#define for_each_bit(i, bitmask)				\
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0);	\
-	     i < sizeof(bitmask);				\
+#define for_each_bit(i, bitmask)                                                  \
+	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
 	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
 
 #endif /* __CR_BITOPS_H__ */
diff --git a/include/common/arch/x86/asm/bitsperlong.h b/include/common/arch/x86/asm/bitsperlong.h
index 7e0a71e8d..2a88b0a37 100644
--- a/include/common/arch/x86/asm/bitsperlong.h
+++ b/include/common/arch/x86/asm/bitsperlong.h
@@ -2,9 +2,9 @@
 #define __CR_BITSPERLONG_H__
 
 #ifdef CONFIG_X86_64
-# define BITS_PER_LONG 64
+#define BITS_PER_LONG 64
 #else
-# define BITS_PER_LONG 32
+#define BITS_PER_LONG 32
 #endif
 
 #endif /* __CR_BITSPERLONG_H__ */
diff --git a/include/common/arch/x86/asm/cmpxchg.h b/include/common/arch/x86/asm/cmpxchg.h
index fa5eccf09..ca3c9622c 100644
--- a/include/common/arch/x86/asm/cmpxchg.h
+++ b/include/common/arch/x86/asm/cmpxchg.h
@@ -5,46 +5,38 @@
 
 #define LOCK_PREFIX "\n\tlock; "
 
-#define __X86_CASE_B	1
-#define __X86_CASE_W	2
-#define __X86_CASE_L	4
-#define __X86_CASE_Q	8
+#define __X86_CASE_B 1
+#define __X86_CASE_W 2
+#define __X86_CASE_L 4
+#define __X86_CASE_Q 8
 
 /*
  * An exchange-type operation, which takes a value and a pointer, and
  * returns the old value. Make sure you never reach non-case statement
  * here, otherwise behaviour is undefined.
  */
-#define __xchg_op(ptr, arg, op, lock)					\
-	({								\
-		__typeof__ (*(ptr)) __ret = (arg);			\
-		switch (sizeof(*(ptr))) {				\
-		case __X86_CASE_B:					\
-			asm volatile (lock #op "b %b0, %1\n"		\
-				      : "+q" (__ret), "+m" (*(ptr))	\
-				      : : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_W:					\
-			asm volatile (lock #op "w %w0, %1\n"		\
-				      : "+r" (__ret), "+m" (*(ptr))	\
-				      : : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_L:					\
-			asm volatile (lock #op "l %0, %1\n"		\
-				      : "+r" (__ret), "+m" (*(ptr))	\
-				      : : "memory", "cc");		\
-			break;						\
-		case __X86_CASE_Q:					\
-			asm volatile (lock #op "q %q0, %1\n"		\
-				      : "+r" (__ret), "+m" (*(ptr))	\
-				      : : "memory", "cc");		\
-			break;						\
-		}							\
-		__ret;							\
+#define __xchg_op(ptr, arg, op, lock)                                                                        \
+	({                                                                                                   \
+		__typeof__(*(ptr)) __ret = (arg);                                                            \
+		switch (sizeof(*(ptr))) {                                                                    \
+		case __X86_CASE_B:                                                                           \
+			asm volatile(lock #op "b %b0, %1\n" : "+q"(__ret), "+m"(*(ptr)) : : "memory", "cc"); \
+			break;                                                                               \
+		case __X86_CASE_W:                                                                           \
+			asm volatile(lock #op "w %w0, %1\n" : "+r"(__ret), "+m"(*(ptr)) : : "memory", "cc"); \
+			break;                                                                               \
+		case __X86_CASE_L:                                                                           \
+			asm volatile(lock #op "l %0, %1\n" : "+r"(__ret), "+m"(*(ptr)) : : "memory", "cc");  \
+			break;                                                                               \
+		case __X86_CASE_Q:                                                                           \
+			asm volatile(lock #op "q %q0, %1\n" : "+r"(__ret), "+m"(*(ptr)) : : "memory", "cc"); \
+			break;                                                                               \
+		}                                                                                            \
+		__ret;                                                                                       \
 	})
 
-#define __xadd(ptr, inc, lock)	__xchg_op((ptr), (inc), xadd, lock)
-#define xadd(ptr, inc)		__xadd((ptr), (inc), "lock ;")
+#define __xadd(ptr, inc, lock) __xchg_op((ptr), (inc), xadd, lock)
+#define xadd(ptr, inc)	       __xadd((ptr), (inc), "lock ;")
 
 /* Borrowed from linux kernel arch/x86/include/asm/cmpxchg.h */
 
@@ -53,55 +45,49 @@
  * store NEW in MEM.  Return the initial value in MEM.  Success is
  * indicated by comparing RETURN with OLD.
  */
-#define __raw_cmpxchg(ptr, old, new, size, lock)			\
-({									\
-	__typeof__(*(ptr)) __ret;					\
-	__typeof__(*(ptr)) __old = (old);				\
-	__typeof__(*(ptr)) __new = (new);				\
-	switch (size) {							\
-	case __X86_CASE_B:						\
-	{								\
-		volatile uint8_t *__ptr = (volatile uint8_t *)(ptr);	\
-		asm volatile(lock "cmpxchgb %2,%1"			\
-			     : "=a" (__ret), "+m" (*__ptr)		\
-			     : "q" (__new), "0" (__old)			\
-			     : "memory");				\
-		break;							\
-	}								\
-	case __X86_CASE_W:						\
-	{								\
-		volatile uint16_t *__ptr = (volatile uint16_t *)(ptr);	\
-		asm volatile(lock "cmpxchgw %2,%1"			\
-			     : "=a" (__ret), "+m" (*__ptr)		\
-			     : "r" (__new), "0" (__old)			\
-			     : "memory");				\
-		break;							\
-	}								\
-	case __X86_CASE_L:						\
-	{								\
-		volatile uint32_t *__ptr = (volatile uint32_t *)(ptr);	\
-		asm volatile(lock "cmpxchgl %2,%1"			\
-			     : "=a" (__ret), "+m" (*__ptr)		\
-			     : "r" (__new), "0" (__old)			\
-			     : "memory");				\
-		break;							\
-	}								\
-	case __X86_CASE_Q:						\
-	{								\
-		volatile uint64_t *__ptr = (volatile uint64_t *)(ptr);	\
-		asm volatile(lock "cmpxchgq %2,%1"			\
-			     : "=a" (__ret), "+m" (*__ptr)		\
-			     : "r" (__new), "0" (__old)			\
-			     : "memory");				\
-		break;							\
-	}								\
-	}								\
-	__ret;								\
-})
+#define __raw_cmpxchg(ptr, old, new, size, lock)                               \
+	({                                                                     \
+		__typeof__(*(ptr)) __ret;                                      \
+		__typeof__(*(ptr)) __old = (old);                              \
+		__typeof__(*(ptr)) __new = (new);                              \
+		switch (size) {                                                \
+		case __X86_CASE_B: {                                           \
+			volatile uint8_t *__ptr = (volatile uint8_t *)(ptr);   \
+			asm volatile(lock "cmpxchgb %2,%1"                     \
+				     : "=a"(__ret), "+m"(*__ptr)               \
+				     : "q"(__new), "0"(__old)                  \
+				     : "memory");                              \
+			break;                                                 \
+		}                                                              \
+		case __X86_CASE_W: {                                           \
+			volatile uint16_t *__ptr = (volatile uint16_t *)(ptr); \
+			asm volatile(lock "cmpxchgw %2,%1"                     \
+				     : "=a"(__ret), "+m"(*__ptr)               \
+				     : "r"(__new), "0"(__old)                  \
+				     : "memory");                              \
+			break;                                                 \
+		}                                                              \
+		case __X86_CASE_L: {                                           \
+			volatile uint32_t *__ptr = (volatile uint32_t *)(ptr); \
+			asm volatile(lock "cmpxchgl %2,%1"                     \
+				     : "=a"(__ret), "+m"(*__ptr)               \
+				     : "r"(__new), "0"(__old)                  \
+				     : "memory");                              \
+			break;                                                 \
+		}                                                              \
+		case __X86_CASE_Q: {                                           \
+			volatile uint64_t *__ptr = (volatile uint64_t *)(ptr); \
+			asm volatile(lock "cmpxchgq %2,%1"                     \
+				     : "=a"(__ret), "+m"(*__ptr)               \
+				     : "r"(__new), "0"(__old)                  \
+				     : "memory");                              \
+			break;                                                 \
+		}                                                              \
+		}                                                              \
+		__ret;                                                         \
+	})
 
-#define __cmpxchg(ptr, old, new, size)					\
-	__raw_cmpxchg((ptr), (old), (new), (size), LOCK_PREFIX)
-#define cmpxchg(ptr, old, new)						\
-	__cmpxchg(ptr, old, new, sizeof(*(ptr)))
+#define __cmpxchg(ptr, old, new, size) __raw_cmpxchg((ptr), (old), (new), (size), LOCK_PREFIX)
+#define cmpxchg(ptr, old, new)	       __cmpxchg(ptr, old, new, sizeof(*(ptr)))
 
 #endif /* __CR_CMPXCHG_H__ */
diff --git a/include/common/arch/x86/asm/linkage.h b/include/common/arch/x86/asm/linkage.h
index 5eaf450db..2088b2e0a 100644
--- a/include/common/arch/x86/asm/linkage.h
+++ b/include/common/arch/x86/asm/linkage.h
@@ -3,25 +3,24 @@
 
 #ifdef __ASSEMBLY__
 
-#define __ALIGN		.align 4, 0x90
-#define __ALIGN_STR	".align 4, 0x90"
+#define __ALIGN	    .align 4, 0x90
+#define __ALIGN_STR ".align 4, 0x90"
 
-#define GLOBAL(name)		\
-	.globl name;		\
+#define GLOBAL(name) \
+	.globl name; \
 	name:
 
-#define ENTRY(name)		\
-	.globl name;		\
-	.type name, @function;	\
-	__ALIGN;		\
+#define ENTRY(name)            \
+	.globl name;           \
+	.type name, @function; \
+	__ALIGN;               \
 	name:
 
-#define END(sym)		\
-	.size sym, . - sym
+#define END(sym) .size sym, .- sym
 
-#endif  /* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
 
-#define __USER32_CS	0x23
-#define __USER_CS	0x33
+#define __USER32_CS 0x23
+#define __USER_CS   0x33
 
 #endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/x86/asm/page.h b/include/common/arch/x86/asm/page.h
index 134835556..d31e82c60 100644
--- a/include/common/arch/x86/asm/page.h
+++ b/include/common/arch/x86/asm/page.h
@@ -2,18 +2,18 @@
 #define __CR_ASM_PAGE_H__
 
 #ifndef PAGE_SHIFT
-# define PAGE_SHIFT	12
+#define PAGE_SHIFT 12
 #endif
 
 #ifndef PAGE_SIZE
-# define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#define PAGE_SIZE (1UL << PAGE_SHIFT)
 #endif
 
 #ifndef PAGE_MASK
-# define PAGE_MASK	(~(PAGE_SIZE - 1))
+#define PAGE_MASK (~(PAGE_SIZE - 1))
 #endif
 
-#define PAGE_PFN(addr)	((addr) / PAGE_SIZE)
-#define page_size()	PAGE_SIZE
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
+#define page_size()    PAGE_SIZE
 
 #endif /* __CR_ASM_PAGE_H__ */
diff --git a/include/common/asm-generic/bitops.h b/include/common/asm-generic/bitops.h
index 0d861bdcc..064ba4cc4 100644
--- a/include/common/asm-generic/bitops.h
+++ b/include/common/asm-generic/bitops.h
@@ -10,23 +10,23 @@
 
 #include "common/asm/bitsperlong.h"
 
-#define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
-#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
+#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
+#define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
 
-#define DECLARE_BITMAP(name, bits)		\
-	unsigned long name[BITS_TO_LONGS(bits)]
+#define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
 /* Technically wrong, but this avoids compilation errors on some gcc
    versions. */
-#define BITOP_ADDR(x) "=m" (*(volatile long *) (x))
+#define BITOP_ADDR(x) "=m"(*(volatile long *)(x))
 #else
-#define BITOP_ADDR(x) "+m" (*(volatile long *) (x))
+#define BITOP_ADDR(x) "+m"(*(volatile long *)(x))
 #endif
 
-#define ADDR				BITOP_ADDR(addr)
+#define ADDR BITOP_ADDR(addr)
 
-static inline void set_bit(int nr, volatile unsigned long *addr) {
+static inline void set_bit(int nr, volatile unsigned long *addr)
+{
 	addr += nr / BITS_PER_LONG;
 	*addr |= (1UL << (nr % BITS_PER_LONG));
 }
@@ -60,17 +60,15 @@ static inline unsigned long __ffs(unsigned long word)
 	return __builtin_ffsl(word) - 1;
 }
 
-#define BITOP_WORD(nr)		((nr) / BITS_PER_LONG)
+#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
 
 /*
  * Find the next set bit in a memory region.
  */
-static inline
-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
-			    unsigned long offset)
+static inline unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset)
 {
 	const unsigned long *p = addr + BITOP_WORD(offset);
-	unsigned long result = offset & ~(BITS_PER_LONG-1);
+	unsigned long result = offset & ~(BITS_PER_LONG - 1);
 	unsigned long tmp;
 
 	if (offset >= size)
@@ -87,7 +85,7 @@ unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
 		size -= BITS_PER_LONG;
 		result += BITS_PER_LONG;
 	}
-	while (size & ~(BITS_PER_LONG-1)) {
+	while (size & ~(BITS_PER_LONG - 1)) {
 		if ((tmp = *(p++)))
 			goto found_middle;
 		result += BITS_PER_LONG;
@@ -99,15 +97,14 @@ unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
 
 found_first:
 	tmp &= (~0UL >> (BITS_PER_LONG - size));
-	if (tmp == 0UL)		/* Are any bits set? */
-		return result + size;	/* Nope. */
+	if (tmp == 0UL) /* Are any bits set? */
+		return result + size; /* Nope. */
 found_middle:
 	return result + __ffs(tmp);
 }
 
-#define for_each_bit(i, bitmask)				\
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0);	\
-	     i < sizeof(bitmask);				\
+#define for_each_bit(i, bitmask)                                                  \
+	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
 	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
 
 #endif /* __CR_GENERIC_BITOPS_H__ */
diff --git a/include/common/bitops.h b/include/common/bitops.h
index 1e6411243..a1000cd13 100644
--- a/include/common/bitops.h
+++ b/include/common/bitops.h
@@ -6,9 +6,9 @@
 #include <endian.h>
 
 #if __BYTE_ORDER == __BIG_ENDIAN
-#define BITOP_LE_SWIZZLE	((BITS_PER_LONG-1) & ~0x7)
+#define BITOP_LE_SWIZZLE ((BITS_PER_LONG - 1) & ~0x7)
 #else
-#define BITOP_LE_SWIZZLE	0
+#define BITOP_LE_SWIZZLE 0
 #endif
 
 static inline int test_and_set_bit_le(int nr, void *addr)
diff --git a/include/common/bug.h b/include/common/bug.h
index bacbf566b..fca3cadc6 100644
--- a/include/common/bug.h
+++ b/include/common/bug.h
@@ -9,34 +9,34 @@
 #ifndef BUG_ON_HANDLER
 
 #ifdef CR_NOGLIBC
-# define __raise()
+#define __raise()
 #else
-# define __raise() raise(SIGABRT)
+#define __raise() raise(SIGABRT)
 #endif
 
 #ifndef __clang_analyzer__
-# ifndef pr_err
-#  error pr_err macro must be defined
-# endif
-# define BUG_ON_HANDLER(condition)							\
-	do {										\
-		if ((condition)) {							\
-			pr_err("BUG at %s:%d\n", __FILE__, __LINE__);			\
-			__raise();							\
-			*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__;	\
-			__builtin_unreachable();					\
-		}									\
+#ifndef pr_err
+#error pr_err macro must be defined
+#endif
+#define BUG_ON_HANDLER(condition)                                                \
+	do {                                                                     \
+		if ((condition)) {                                               \
+			pr_err("BUG at %s:%d\n", __FILE__, __LINE__);            \
+			__raise();                                               \
+			*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__; \
+			__builtin_unreachable();                                 \
+		}                                                                \
 	} while (0)
 #else
-# define BUG_ON_HANDLER(condition)	\
-	do {				\
-		assert(!condition);	\
+#define BUG_ON_HANDLER(condition)   \
+	do {                        \
+		assert(!condition); \
 	} while (0)
 #endif
 
 #endif /* BUG_ON_HANDLER */
 
-#define BUG_ON(condition)	BUG_ON_HANDLER((condition))
-#define BUG()			BUG_ON(true)
+#define BUG_ON(condition) BUG_ON_HANDLER((condition))
+#define BUG()		  BUG_ON(true)
 
 #endif /* __CR_BUG_H__ */
diff --git a/include/common/compiler.h b/include/common/compiler.h
index f19292989..bd3de01df 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -8,97 +8,113 @@
  */
 
 #define ARRAY_SIZE(x)		(sizeof(x) / sizeof((x)[0]))
-#define NELEMS_AS_ARRAY(x,y)	(sizeof(x) / sizeof((y)[0]))
-#define BUILD_BUG_ON(condition)	((void)sizeof(char[1 - 2*!!(condition)]))
+#define NELEMS_AS_ARRAY(x, y)	(sizeof(x) / sizeof((y)[0]))
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2 * !!(condition)]))
 
-#define ASSIGN_TYPED(a, b)	do { (a) = (typeof(a))(b); } while (0)
-#define ASSIGN_MEMBER(a, b, m)	do { ASSIGN_TYPED((a)->m, (b)->m); } while (0)
+#define ASSIGN_TYPED(a, b)            \
+	do {                          \
+		(a) = (typeof(a))(b); \
+	} while (0)
+#define ASSIGN_MEMBER(a, b, m)                \
+	do {                                  \
+		ASSIGN_TYPED((a)->m, (b)->m); \
+	} while (0)
 
-#define __stringify_1(x...)	#x
-#define __stringify(x...)	__stringify_1(x)
+#define __stringify_1(x...) #x
+#define __stringify(x...)   __stringify_1(x)
 
-#define NORETURN		__attribute__((__noreturn__))
-#define __packed		__attribute__((__packed__))
-#define __used			__attribute__((__used__))
-#define __maybe_unused		__attribute__((unused))
-#define __always_unused		__attribute__((unused))
-#define __must_check		__attribute__((__warn_unused_result__))
+#define NORETURN	__attribute__((__noreturn__))
+#define __packed	__attribute__((__packed__))
+#define __used		__attribute__((__used__))
+#define __maybe_unused	__attribute__((unused))
+#define __always_unused __attribute__((unused))
+#define __must_check	__attribute__((__warn_unused_result__))
 
-#define __section(S)		__attribute__ ((__section__(#S)))
+#define __section(S) __attribute__((__section__(#S)))
 
 #ifndef __always_inline
-# define __always_inline	inline __attribute__((always_inline))
+#define __always_inline inline __attribute__((always_inline))
 #endif
 
-#define likely(x)		__builtin_expect(!!(x), 1)
-#define unlikely(x)		__builtin_expect(!!(x), 0)
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 
 #ifndef always_inline
-# define always_inline		__always_inline
+#define always_inline __always_inline
 #endif
 
 #ifndef noinline
-# define noinline		__attribute__((noinline))
+#define noinline __attribute__((noinline))
 #endif
 
-#define __aligned(x)		__attribute__((aligned(x)))
+#define __aligned(x) __attribute__((aligned(x)))
 
 /*
  * Macro to define stack alignment.
  * aarch64 requires stack to be aligned to 16 bytes.
  */
-#define __stack_aligned__	__attribute__((aligned(16)))
+#define __stack_aligned__ __attribute__((aligned(16)))
 
 #ifndef offsetof
-# define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define offsetof(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
 #endif
 
-#define barrier()		asm volatile("" ::: "memory")
+#define barrier() asm volatile("" ::: "memory")
 
-#define container_of(ptr, type, member) ({			\
-	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
-	(type *)( (char *)__mptr - offsetof(type,member) );})
+#define container_of(ptr, type, member)                            \
+	({                                                         \
+		const typeof(((type *)0)->member) *__mptr = (ptr); \
+		(type *)((char *)__mptr - offsetof(type, member)); \
+	})
 
 #ifndef FIELD_SIZEOF
-# define FIELD_SIZEOF(t, f)	(sizeof(((t*)0)->f))
+#define FIELD_SIZEOF(t, f) (sizeof(((t *)0)->f))
 #endif
 
-#define __round_mask(x, y)	((__typeof__(x))((y) - 1))
-#define round_up(x, y)		((((x) - 1) | __round_mask(x, y)) + 1)
-#define round_down(x, y)	((x) & ~__round_mask(x, y))
-#define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
-#define ALIGN(x, a)		(((x) + (a) - 1) & ~((a) - 1))
+#define __round_mask(x, y) ((__typeof__(x))((y)-1))
+#define round_up(x, y)	   ((((x)-1) | __round_mask(x, y)) + 1)
+#define round_down(x, y)   ((x) & ~__round_mask(x, y))
+#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
+#define ALIGN(x, a)	   (((x) + (a)-1) & ~((a)-1))
 
-#define min(x, y) ({				\
-	typeof(x) _min1 = (x);			\
-	typeof(y) _min2 = (y);			\
-	(void) (&_min1 == &_min2);		\
-	_min1 < _min2 ? _min1 : _min2; })
+#define min(x, y)                              \
+	({                                     \
+		typeof(x) _min1 = (x);         \
+		typeof(y) _min2 = (y);         \
+		(void)(&_min1 == &_min2);      \
+		_min1 < _min2 ? _min1 : _min2; \
+	})
 
-#define max(x, y) ({				\
-	typeof(x) _max1 = (x);			\
-	typeof(y) _max2 = (y);			\
-	(void) (&_max1 == &_max2);		\
-	_max1 > _max2 ? _max1 : _max2; })
+#define max(x, y)                              \
+	({                                     \
+		typeof(x) _max1 = (x);         \
+		typeof(y) _max2 = (y);         \
+		(void)(&_max1 == &_max2);      \
+		_max1 > _max2 ? _max1 : _max2; \
+	})
 
-#define min_t(type, x, y) ({			\
-	type __min1 = (x);			\
-	type __min2 = (y);			\
-	__min1 < __min2 ? __min1: __min2; })
+#define min_t(type, x, y)                          \
+	({                                         \
+		type __min1 = (x);                 \
+		type __min2 = (y);                 \
+		__min1 < __min2 ? __min1 : __min2; \
+	})
 
-#define max_t(type, x, y) ({			\
-	type __max1 = (x);			\
-	type __max2 = (y);			\
-	__max1 > __max2 ? __max1: __max2; })
+#define max_t(type, x, y)                          \
+	({                                         \
+		type __max1 = (x);                 \
+		type __max2 = (y);                 \
+		__max1 > __max2 ? __max1 : __max2; \
+	})
 
-#define SWAP(x, y)				\
-	do {					\
-		typeof(x) ____val = x;		\
-		x = y;				\
-		y = ____val;			\
+#define SWAP(x, y)                     \
+	do {                           \
+		typeof(x) ____val = x; \
+		x = y;                 \
+		y = ____val;           \
 	} while (0)
 
-#define is_log2(v)		(((v) & ((v) - 1)) == 0)
+#define is_log2(v) (((v) & ((v)-1)) == 0)
 
 /*
  * Use "__ignore_value" to avoid a warning when using a function declared with
@@ -121,9 +137,13 @@
  * (See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 for the details)
  */
 #if 3 < __GNUC__ + (4 <= __GNUC_MINOR__)
-# define __ignore_value(x)	({ __typeof__ (x) __x = (x); (void) __x; })
+#define __ignore_value(x)                \
+	({                               \
+		__typeof__(x) __x = (x); \
+		(void)__x;               \
+	})
 #else
-# define __ignore_value(x) ((void) (x))
+#define __ignore_value(x) ((void)(x))
 #endif
 
 #endif /* __CR_COMPILER_H__ */
diff --git a/include/common/err.h b/include/common/err.h
index a370daf6b..d2473d228 100644
--- a/include/common/err.h
+++ b/include/common/err.h
@@ -12,7 +12,7 @@
  *
  * Thus we may encode error number in low bits.
  */
-#define MAX_ERRNO	4095
+#define MAX_ERRNO 4095
 
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
 
diff --git a/include/common/list.h b/include/common/list.h
index b8b57c784..b1506d5d9 100644
--- a/include/common/list.h
+++ b/include/common/list.h
@@ -9,15 +9,18 @@
 #include "common/compiler.h"
 
 #define POISON_POINTER_DELTA 0
-#define LIST_POISON1  ((void *) 0x00100100 + POISON_POINTER_DELTA)
-#define LIST_POISON2  ((void *) 0x00200200 + POISON_POINTER_DELTA)
+#define LIST_POISON1	     ((void *)0x00100100 + POISON_POINTER_DELTA)
+#define LIST_POISON2	     ((void *)0x00200200 + POISON_POINTER_DELTA)
 
 struct list_head {
 	struct list_head *prev, *next;
 };
 
-#define LIST_HEAD_INIT(name)	{ &(name), &(name) }
-#define LIST_HEAD(name)		struct list_head name = LIST_HEAD_INIT(name)
+#define LIST_HEAD_INIT(name)     \
+	{                        \
+		&(name), &(name) \
+	}
+#define LIST_HEAD(name) struct list_head name = LIST_HEAD_INIT(name)
 
 static inline void INIT_LIST_HEAD(struct list_head *list)
 {
@@ -25,14 +28,12 @@ static inline void INIT_LIST_HEAD(struct list_head *list)
 	list->prev = list;
 }
 
-static inline void __list_add(struct list_head *new,
-			      struct list_head *prev,
-			      struct list_head *next)
+static inline void __list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
 {
-	next->prev	= new;
-	new->next	= next;
-	new->prev	= prev;
-	prev->next	= new;
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
 }
 
 static inline void list_add(struct list_head *new, struct list_head *head)
@@ -45,7 +46,7 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head)
 	__list_add(new, head->prev, head);
 }
 
-static inline void __list_del(struct list_head * prev, struct list_head * next)
+static inline void __list_del(struct list_head *prev, struct list_head *next)
 {
 	next->prev = prev;
 	prev->next = next;
@@ -63,17 +64,15 @@ static inline void list_del(struct list_head *entry)
 	entry->prev = LIST_POISON2;
 }
 
-static inline void list_replace(struct list_head *old,
-				struct list_head *new)
+static inline void list_replace(struct list_head *old, struct list_head *new)
 {
-	new->next		= old->next;
-	new->next->prev		= new;
-	new->prev		= old->prev;
-	new->prev->next		= new;
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
 }
 
-static inline void list_replace_init(struct list_head *old,
-					struct list_head *new)
+static inline void list_replace_init(struct list_head *old, struct list_head *new)
 {
 	list_replace(old, new);
 	INIT_LIST_HEAD(old);
@@ -91,21 +90,18 @@ static inline void list_move(struct list_head *list, struct list_head *head)
 	list_add(list, head);
 }
 
-static inline void list_move_tail(struct list_head *list,
-				  struct list_head *head)
+static inline void list_move_tail(struct list_head *list, struct list_head *head)
 {
 	__list_del_entry(list);
 	list_add_tail(list, head);
 }
 
-static inline int list_is_last(const struct list_head *list,
-				const struct list_head *head)
+static inline int list_is_last(const struct list_head *list, const struct list_head *head)
 {
 	return list->next == head;
 }
 
-static inline int list_is_first(const struct list_head *list,
-				const struct list_head *head)
+static inline int list_is_first(const struct list_head *list, const struct list_head *head)
 {
 	return list->prev == head;
 }
@@ -135,8 +131,7 @@ static inline int list_is_singular(const struct list_head *head)
 	return !list_empty(head) && (head->next == head->prev);
 }
 
-static inline void __list_cut_position(struct list_head *list,
-		struct list_head *head, struct list_head *entry)
+static inline void __list_cut_position(struct list_head *list, struct list_head *head, struct list_head *entry)
 {
 	struct list_head *new_first = entry->next;
 	list->next = head->next;
@@ -147,13 +142,11 @@ static inline void __list_cut_position(struct list_head *list,
 	new_first->prev = head;
 }
 
-static inline void list_cut_position(struct list_head *list,
-		struct list_head *head, struct list_head *entry)
+static inline void list_cut_position(struct list_head *list, struct list_head *head, struct list_head *entry)
 {
 	if (list_empty(head))
 		return;
-	if (list_is_singular(head) &&
-		(head->next != entry && head != entry))
+	if (list_is_singular(head) && (head->next != entry && head != entry))
 		return;
 	if (entry == head)
 		INIT_LIST_HEAD(list);
@@ -161,36 +154,31 @@ static inline void list_cut_position(struct list_head *list,
 		__list_cut_position(list, head, entry);
 }
 
-static inline void __list_splice(const struct list_head *list,
-				 struct list_head *prev,
-				 struct list_head *next)
+static inline void __list_splice(const struct list_head *list, struct list_head *prev, struct list_head *next)
 {
 	struct list_head *first = list->next;
 	struct list_head *last = list->prev;
 
-	first->prev	= prev;
-	prev->next	= first;
+	first->prev = prev;
+	prev->next = first;
 
-	last->next	= next;
-	next->prev	= last;
+	last->next = next;
+	next->prev = last;
 }
 
-static inline void list_splice(const struct list_head *list,
-				struct list_head *head)
+static inline void list_splice(const struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list))
 		__list_splice(list, head, head->next);
 }
 
-static inline void list_splice_tail(struct list_head *list,
-				struct list_head *head)
+static inline void list_splice_tail(struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list))
 		__list_splice(list, head->prev, head);
 }
 
-static inline void list_splice_init(struct list_head *list,
-				    struct list_head *head)
+static inline void list_splice_init(struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list)) {
 		__list_splice(list, head, head->next);
@@ -198,8 +186,7 @@ static inline void list_splice_init(struct list_head *list,
 	}
 }
 
-static inline void list_splice_tail_init(struct list_head *list,
-					 struct list_head *head)
+static inline void list_splice_tail_init(struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list)) {
 		__list_splice(list, head->prev, head);
@@ -207,79 +194,60 @@ static inline void list_splice_tail_init(struct list_head *list,
 	}
 }
 
-#define list_entry(ptr, type, member)				\
-	container_of(ptr, type, member)
+#define list_entry(ptr, type, member) container_of(ptr, type, member)
 
-#define list_first_entry(ptr, type, member)			\
-	list_entry((ptr)->next, type, member)
+#define list_first_entry(ptr, type, member) list_entry((ptr)->next, type, member)
 
-#define list_for_each(pos, head)				\
-	for (pos = (head)->next; pos != (head); pos = pos->next)
+#define list_for_each(pos, head) for (pos = (head)->next; pos != (head); pos = pos->next)
 
-#define list_for_each_prev(pos, head)				\
-	for (pos = (head)->prev; pos != (head); pos = pos->prev)
+#define list_for_each_prev(pos, head) for (pos = (head)->prev; pos != (head); pos = pos->prev)
 
-#define list_for_each_safe(pos, n, head)			\
-	for (pos = (head)->next, n = pos->next; pos != (head);	\
-		pos = n, n = pos->next)
+#define list_for_each_safe(pos, n, head) for (pos = (head)->next, n = pos->next; pos != (head); pos = n, n = pos->next)
 
-#define list_for_each_prev_safe(pos, n, head)			\
-	for (pos = (head)->prev, n = pos->prev;			\
-	     pos != (head);					\
-	     pos = n, n = pos->prev)
+#define list_for_each_prev_safe(pos, n, head) \
+	for (pos = (head)->prev, n = pos->prev; pos != (head); pos = n, n = pos->prev)
 
-#define list_for_each_entry(pos, head, member)				\
-	for (pos = list_entry((head)->next, typeof(*pos), member);	\
-	     &pos->member != (head);					\
+#define list_for_each_entry(pos, head, member)                                             \
+	for (pos = list_entry((head)->next, typeof(*pos), member); &pos->member != (head); \
 	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
-#define list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
-	     &pos->member != (head);					\
+#define list_for_each_entry_reverse(pos, head, member)                                     \
+	for (pos = list_entry((head)->prev, typeof(*pos), member); &pos->member != (head); \
 	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
-#define list_prepare_entry(pos, head, member)				\
-	((pos) ? : list_entry(head, typeof(*pos), member))
+#define list_prepare_entry(pos, head, member) ((pos) ?: list_entry(head, typeof(*pos), member))
 
-#define list_for_each_entry_continue(pos, head, member)			\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head);					\
+#define list_for_each_entry_continue(pos, head, member)                                        \
+	for (pos = list_entry(pos->member.next, typeof(*pos), member); &pos->member != (head); \
 	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
-#define list_for_each_entry_continue_reverse(pos, head, member)		\
-	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
-	     &pos->member != (head);					\
+#define list_for_each_entry_continue_reverse(pos, head, member)                                \
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member); &pos->member != (head); \
 	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
-#define list_for_each_entry_from(pos, head, member)			\
-	for (; &pos->member != (head);					\
-	     pos = list_entry(pos->member.next, typeof(*pos), member))
+#define list_for_each_entry_from(pos, head, member) \
+	for (; &pos->member != (head); pos = list_entry(pos->member.next, typeof(*pos), member))
 
-#define list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = list_entry((head)->next, typeof(*pos), member),	\
-		n = list_entry(pos->member.next, typeof(*pos), member);	\
-	     &pos->member != (head);					\
+#define list_for_each_entry_safe(pos, n, head, member)              \
+	for (pos = list_entry((head)->next, typeof(*pos), member),  \
+	    n = list_entry(pos->member.next, typeof(*pos), member); \
+	     &pos->member != (head); pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+#define list_for_each_entry_safe_continue(pos, n, head, member)        \
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), \
+	    n = list_entry(pos->member.next, typeof(*pos), member);    \
+	     &pos->member != (head); pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+#define list_for_each_entry_safe_from(pos, n, head, member)                                  \
+	for (n = list_entry(pos->member.next, typeof(*pos), member); &pos->member != (head); \
 	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
-#define list_for_each_entry_safe_continue(pos, n, head, member)			\
-	for (pos = list_entry(pos->member.next, typeof(*pos), member),		\
-		n = list_entry(pos->member.next, typeof(*pos), member);		\
-	     &pos->member != (head);						\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+#define list_for_each_entry_safe_reverse(pos, n, head, member)      \
+	for (pos = list_entry((head)->prev, typeof(*pos), member),  \
+	    n = list_entry(pos->member.prev, typeof(*pos), member); \
+	     &pos->member != (head); pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
-#define list_for_each_entry_safe_from(pos, n, head, member)			\
-	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
-	     &pos->member != (head);						\
-	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
-	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
-		n = list_entry(pos->member.prev, typeof(*pos), member);	\
-	     &pos->member != (head);					\
-	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
-
-#define list_safe_reset_next(pos, n, member)				\
-	n = list_entry(pos->member.next, typeof(*pos), member)
+#define list_safe_reset_next(pos, n, member) n = list_entry(pos->member.next, typeof(*pos), member)
 
 /*
  * Double linked lists with a single pointer list head.
@@ -293,9 +261,12 @@ struct hlist_node {
 	struct hlist_node *next, **pprev;
 };
 
-#define HLIST_HEAD_INIT		{ .first = NULL }
-#define HLIST_HEAD(name)	struct hlist_head name = {  .first = NULL }
-#define INIT_HLIST_HEAD(ptr)	((ptr)->first = NULL)
+#define HLIST_HEAD_INIT       \
+	{                     \
+		.first = NULL \
+	}
+#define HLIST_HEAD(name)     struct hlist_head name = { .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
 
 static inline void INIT_HLIST_NODE(struct hlist_node *h)
 {
@@ -348,8 +319,7 @@ static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 }
 
 /* next must be != NULL */
-static inline void hlist_add_before(struct hlist_node *n,
-				    struct hlist_node *next)
+static inline void hlist_add_before(struct hlist_node *n, struct hlist_node *next)
 {
 	n->pprev = next->pprev;
 	n->next = next;
@@ -357,15 +327,14 @@ static inline void hlist_add_before(struct hlist_node *n,
 	*(n->pprev) = n;
 }
 
-static inline void hlist_add_after(struct hlist_node *n,
-				   struct hlist_node *next)
+static inline void hlist_add_after(struct hlist_node *n, struct hlist_node *next)
 {
 	next->next = n->next;
 	n->next = next;
 	next->pprev = &n->next;
 
 	if (next->next)
-		next->next->pprev  = &next->next;
+		next->next->pprev = &next->next;
 }
 
 /* after that we'll appear to be on some hlist and hlist_del will work */
@@ -378,8 +347,7 @@ static inline void hlist_add_fake(struct hlist_node *n)
  * Move a list from one list head to another. Fixup the pprev
  * reference of the first entry if it exists.
  */
-static inline void hlist_move_list(struct hlist_head *old,
-				   struct hlist_head *new)
+static inline void hlist_move_list(struct hlist_head *old, struct hlist_head *new)
 {
 	new->first = old->first;
 	if (new->first)
@@ -387,35 +355,35 @@ static inline void hlist_move_list(struct hlist_head *old,
 	old->first = NULL;
 }
 
-#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
+#define hlist_entry(ptr, type, member) container_of(ptr, type, member)
 
-#define hlist_for_each(pos, head)						\
-	for (pos = (head)->first; pos ; pos = pos->next)
+#define hlist_for_each(pos, head) for (pos = (head)->first; pos; pos = pos->next)
 
-#define hlist_for_each_safe(pos, n, head)					\
-	for (pos = (head)->first; pos && ({ n = pos->next; 1; });		\
+#define hlist_for_each_safe(pos, n, head)                \
+	for (pos = (head)->first; pos && ({              \
+					  n = pos->next; \
+					  1;             \
+				  });                    \
 	     pos = n)
 
-#define hlist_entry_safe(ptr, type, member)					\
-	(ptr) ? hlist_entry(ptr, type, member) : NULL
+#define hlist_entry_safe(ptr, type, member) (ptr) ? hlist_entry(ptr, type, member) : NULL
 
-#define hlist_for_each_entry(pos, head, member)					\
-	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);	\
-	     pos;								\
+#define hlist_for_each_entry(pos, head, member)                                  \
+	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member); pos; \
 	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
 
-#define hlist_for_each_entry_continue(pos, member)				\
-	for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member);\
-	     pos;								\
+#define hlist_for_each_entry_continue(pos, member)                                    \
+	for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member); pos; \
 	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
 
-#define hlist_for_each_entry_from(pos, member)					\
-	for (; pos;								\
-	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+#define hlist_for_each_entry_from(pos, member) \
+	for (; pos; pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
 
-#define hlist_for_each_entry_safe(pos, n, head, member)				\
-	for (pos = hlist_entry_safe((head)->first, typeof(*pos), member);	\
-	     pos && ({ n = pos->member.next; 1; });				\
+#define hlist_for_each_entry_safe(pos, n, head, member)                                                 \
+	for (pos = hlist_entry_safe((head)->first, typeof(*pos), member); pos && ({                     \
+										  n = pos->member.next; \
+										  1;                    \
+									  });                           \
 	     pos = hlist_entry_safe(n, typeof(*pos), member))
 
 #endif /* __CR_LIST_H__ */
diff --git a/include/common/lock.h b/include/common/lock.h
index 6baece25f..4fbe42c63 100644
--- a/include/common/lock.h
+++ b/include/common/lock.h
@@ -11,23 +11,24 @@
 
 /* scan-build complains about derefencing a NULL pointer here. */
 #ifndef __clang_analyzer__
-#define LOCK_BUG_ON(condition)							\
-	if ((condition))							\
-		*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__
-#define LOCK_BUG()	LOCK_BUG_ON(1)
+#define LOCK_BUG_ON(condition) \
+	if ((condition))       \
+	*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__
+#define LOCK_BUG() LOCK_BUG_ON(1)
 #endif /* __clang_analyzer__ */
 
 #ifdef CR_NOGLIBC
-# include <compel/plugins/std/syscall.h>
+#include <compel/plugins/std/syscall.h>
 #else
-# include <unistd.h>
-# include <sys/syscall.h>
-static inline long sys_futex (uint32_t *addr1, int op, uint32_t val1,
-			      struct timespec *timeout, uint32_t *addr2, uint32_t val3)
+#include <unistd.h>
+#include <sys/syscall.h>
+static inline long sys_futex(uint32_t *addr1, int op, uint32_t val1, struct timespec *timeout, uint32_t *addr2,
+			     uint32_t val3)
 {
-       int rc = syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
-       if (rc == -1) rc = -errno;
-       return rc;
+	int rc = syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
+	if (rc == -1)
+		rc = -errno;
+	return rc;
 }
 #endif
 
@@ -35,8 +36,8 @@ typedef struct {
 	atomic_t raw;
 } __aligned(sizeof(int)) futex_t;
 
-#define FUTEX_ABORT_FLAG	(0x80000000)
-#define FUTEX_ABORT_RAW		(-1U)
+#define FUTEX_ABORT_FLAG (0x80000000)
+#define FUTEX_ABORT_RAW	 (-1U)
 
 /* Get current futex @f value */
 static inline uint32_t futex_get(futex_t *f)
@@ -50,29 +51,27 @@ static inline void futex_set(futex_t *f, uint32_t v)
 	atomic_set(&f->raw, (int)v);
 }
 
-#define futex_init(f)	futex_set(f, 0)
+#define futex_init(f) futex_set(f, 0)
 
 /* Wait on futex @__f value @__v become in condition @__c */
-#define futex_wait_if_cond(__f, __v, __cond)			\
-	do {							\
-		int ret;					\
-		uint32_t tmp;					\
-								\
-		while (1) {					\
-			struct timespec to = {.tv_sec = 120};	\
-			tmp = futex_get(__f);			\
-			if ((tmp & FUTEX_ABORT_FLAG) ||		\
-			    (tmp __cond (__v)))			\
-				break;				\
-			ret = sys_futex((uint32_t *)&(__f)->raw.counter, FUTEX_WAIT,\
-					tmp, &to, NULL, 0);	\
-			if (ret == -ETIMEDOUT)			\
-				continue;			\
-			if (ret == -EINTR || ret == -EWOULDBLOCK) \
-				continue;			\
-			if (ret < 0)				\
-				LOCK_BUG();			\
-		}						\
+#define futex_wait_if_cond(__f, __v, __cond)                                                             \
+	do {                                                                                             \
+		int ret;                                                                                 \
+		uint32_t tmp;                                                                            \
+                                                                                                         \
+		while (1) {                                                                              \
+			struct timespec to = { .tv_sec = 120 };                                          \
+			tmp = futex_get(__f);                                                            \
+			if ((tmp & FUTEX_ABORT_FLAG) || (tmp __cond(__v)))                               \
+				break;                                                                   \
+			ret = sys_futex((uint32_t *)&(__f)->raw.counter, FUTEX_WAIT, tmp, &to, NULL, 0); \
+			if (ret == -ETIMEDOUT)                                                           \
+				continue;                                                                \
+			if (ret == -EINTR || ret == -EWOULDBLOCK)                                        \
+				continue;                                                                \
+			if (ret < 0)                                                                     \
+				LOCK_BUG();                                                              \
+		}                                                                                        \
 	} while (0)
 
 /* Set futex @f to @v and wake up all waiters */
@@ -110,10 +109,16 @@ static inline void futex_inc_and_wake(futex_t *f)
 }
 
 /* Plain increment futex @f value */
-static inline void futex_inc(futex_t *f) { atomic_inc(&f->raw); }
+static inline void futex_inc(futex_t *f)
+{
+	atomic_inc(&f->raw);
+}
 
 /* Plain decrement futex @f value */
-static inline void futex_dec(futex_t *f) { atomic_dec(&f->raw); }
+static inline void futex_dec(futex_t *f)
+{
+	atomic_dec(&f->raw);
+}
 
 /* Wait until futex @f value become @v */
 #define futex_wait_until(f, v) futex_wait_if_cond(f, v, ==)
@@ -137,7 +142,7 @@ static inline void futex_wait_while(futex_t *f, uint32_t v)
 }
 
 typedef struct {
-	atomic_t	raw;
+	atomic_t raw;
 } mutex_t;
 
 static inline void mutex_init(mutex_t *m)
diff --git a/include/common/scm.h b/include/common/scm.h
index a8eb9ec4c..bcb198882 100644
--- a/include/common/scm.h
+++ b/include/common/scm.h
@@ -14,25 +14,22 @@
  * the pressue on kernel memory manager and use predefined
  * known to work well size of the message buffer.
  */
-#define CR_SCM_MSG_SIZE		(1024)
-#define CR_SCM_MAX_FD		(252)
+#define CR_SCM_MSG_SIZE (1024)
+#define CR_SCM_MAX_FD	(252)
 
 struct scm_fdset {
-	struct msghdr	hdr;
-	struct iovec	iov;
-	char		msg_buf[CR_SCM_MSG_SIZE];
+	struct msghdr hdr;
+	struct iovec iov;
+	char msg_buf[CR_SCM_MSG_SIZE];
 };
 
 #ifndef F_GETOWNER_UIDS
-#define F_GETOWNER_UIDS	17
+#define F_GETOWNER_UIDS 17
 #endif
 
-extern int send_fds(int sock, struct sockaddr_un *saddr, int len,
-		int *fds, int nr_fds, void *data, unsigned ch_size);
-extern int __recv_fds(int sock, int *fds, int nr_fds,
-		void *data, unsigned ch_size, int flags);
-static inline int recv_fds(int sock, int *fds, int nr_fds,
-		void *data, unsigned ch_size)
+extern int send_fds(int sock, struct sockaddr_un *saddr, int len, int *fds, int nr_fds, void *data, unsigned ch_size);
+extern int __recv_fds(int sock, int *fds, int nr_fds, void *data, unsigned ch_size, int flags);
+static inline int recv_fds(int sock, int *fds, int nr_fds, void *data, unsigned ch_size)
 {
 	return __recv_fds(sock, fds, nr_fds, data, ch_size, 0);
 }
diff --git a/include/common/xmalloc.h b/include/common/xmalloc.h
index d377c83a0..42893a8b5 100644
--- a/include/common/xmalloc.h
+++ b/include/common/xmalloc.h
@@ -8,43 +8,42 @@
 #error "Macro pr_err is needed."
 #endif
 
-#define __xalloc(op, size, ...)						\
-	({								\
-		void *___p = op( __VA_ARGS__ );				\
-		if (!___p)						\
-			pr_err("%s: Can't allocate %li bytes\n",	\
-			       __func__, (long)(size));			\
-		___p;							\
+#define __xalloc(op, size, ...)                                                           \
+	({                                                                                \
+		void *___p = op(__VA_ARGS__);                                             \
+		if (!___p)                                                                \
+			pr_err("%s: Can't allocate %li bytes\n", __func__, (long)(size)); \
+		___p;                                                                     \
 	})
 
-#define xstrdup(str)		__xalloc(strdup, strlen(str) + 1, str)
-#define xmalloc(size)		__xalloc(malloc, size, size)
-#define xzalloc(size)		__xalloc(calloc, size, 1, size)
-#define xrealloc(p, size)	__xalloc(realloc, size, p, size)
+#define xstrdup(str)	  __xalloc(strdup, strlen(str) + 1, str)
+#define xmalloc(size)	  __xalloc(malloc, size, size)
+#define xzalloc(size)	  __xalloc(calloc, size, 1, size)
+#define xrealloc(p, size) __xalloc(realloc, size, p, size)
 
-#define xfree(p)		free(p)
+#define xfree(p) free(p)
 
-#define xrealloc_safe(pptr, size)					\
-	({								\
-		int __ret = -1;						\
-		void *new = xrealloc(*pptr, size);			\
-		if (new) {						\
-			*pptr = new;					\
-			__ret = 0;					\
-		}							\
-		__ret;							\
-	 })
+#define xrealloc_safe(pptr, size)                  \
+	({                                         \
+		int __ret = -1;                    \
+		void *new = xrealloc(*pptr, size); \
+		if (new) {                         \
+			*pptr = new;               \
+			__ret = 0;                 \
+		}                                  \
+		__ret;                             \
+	})
 
-#define xmemdup(ptr, size)						\
-	({								\
-		void *new = xmalloc(size);				\
-		if (new)						\
-			memcpy(new, ptr, size);				\
-		new;							\
-	 })
+#define xmemdup(ptr, size)                      \
+	({                                      \
+		void *new = xmalloc(size);      \
+		if (new)                        \
+			memcpy(new, ptr, size); \
+		new;                            \
+	})
 
-#define memzero_p(p)		memset(p, 0, sizeof(*p))
-#define memzero(p, size)	memset(p, 0, size)
+#define memzero_p(p)	 memset(p, 0, sizeof(*p))
+#define memzero(p, size) memset(p, 0, size)
 
 /*
  * Helper for allocating trees with single xmalloc.
@@ -64,6 +63,6 @@ static inline void *xptr_pull_s(void **m, size_t s)
 	return ret;
 }
 
-#define xptr_pull(m, type)	xptr_pull_s(m, sizeof(type))
+#define xptr_pull(m, type) xptr_pull_s(m, sizeof(type))
 
 #endif /* __CR_XMALLOC_H__ */
diff --git a/lib/c/criu.h b/lib/c/criu.h
index d2bfbf958..044e5373d 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -25,14 +25,10 @@
 #include "rpc.pb-c.h"
 
 #ifdef __GNUG__
-	extern "C" {
+extern "C" {
 #endif
 
-enum criu_service_comm {
-	CRIU_COMM_SK,
-	CRIU_COMM_FD,
-	CRIU_COMM_BIN
-};
+enum criu_service_comm { CRIU_COMM_SK, CRIU_COMM_FD, CRIU_COMM_BIN };
 
 enum criu_cg_mode {
 	CRIU_CG_MODE_IGNORE,
@@ -44,10 +40,7 @@ enum criu_cg_mode {
 	CRIU_CG_MODE_DEFAULT,
 };
 
-enum criu_pre_dump_mode {
-	CRIU_PRE_DUMP_SPLICE =	1,
-	CRIU_PRE_DUMP_READ =	2
-};
+enum criu_pre_dump_mode { CRIU_PRE_DUMP_SPLICE = 1, CRIU_PRE_DUMP_READ = 2 };
 
 int criu_set_service_address(const char *path);
 void criu_set_service_fd(int fd);
diff --git a/soccr/soccr.h b/soccr/soccr.h
index e3cfb7955..934d43827 100644
--- a/soccr/soccr.h
+++ b/soccr/soccr.h
@@ -1,9 +1,9 @@
 #ifndef __LIBSOCCR_H__
 #define __LIBSOCCR_H__
-#include <netinet/in.h>		/* sockaddr_in, sockaddr_in6 */
-#include <netinet/tcp.h>	/* TCP_REPAIR_WINDOW, TCP_TIMESTAMP */
-#include <stdint.h>		/* uint32_t */
-#include <sys/socket.h>		/* sockaddr */
+#include <netinet/in.h> /* sockaddr_in, sockaddr_in6 */
+#include <netinet/tcp.h> /* TCP_REPAIR_WINDOW, TCP_TIMESTAMP */
+#include <stdint.h> /* uint32_t */
+#include <sys/socket.h> /* sockaddr */
 
 #include "common/config.h"
 
@@ -12,12 +12,12 @@
 
 #ifndef CONFIG_HAS_TCP_REPAIR_WINDOW
 struct tcp_repair_window {
-	uint32_t   snd_wl1;
-	uint32_t   snd_wnd;
-	uint32_t   max_window;
+	uint32_t snd_wl1;
+	uint32_t snd_wnd;
+	uint32_t max_window;
 
-	uint32_t   rcv_wnd;
-	uint32_t   rcv_wup;
+	uint32_t rcv_wnd;
+	uint32_t rcv_wup;
 };
 #endif
 
@@ -30,8 +30,8 @@ struct tcp_repair_window {
  * our own.
  */
 struct tcp_repair_opt {
-	uint32_t	opt_code;
-	uint32_t	opt_val;
+	uint32_t opt_code;
+	uint32_t opt_val;
 };
 
 enum {
@@ -43,17 +43,17 @@ enum {
 #endif
 
 #ifndef TCP_TIMESTAMP
-#define TCP_TIMESTAMP	24
+#define TCP_TIMESTAMP 24
 #endif
 
 #ifndef TCP_REPAIR_WINDOW
-#define TCP_REPAIR_WINDOW       29
+#define TCP_REPAIR_WINDOW 29
 #endif
 
 void libsoccr_set_log(unsigned int level, void (*fn)(unsigned int level, const char *fmt, ...));
 
-#define SOCCR_LOG_ERR	1
-#define SOCCR_LOG_DBG	2
+#define SOCCR_LOG_ERR 1
+#define SOCCR_LOG_DBG 2
 
 /*
  * An opaque handler for C/R-ing a TCP socket.
@@ -71,24 +71,24 @@ union libsoccr_addr {
  * socket and given back into the library in two steps (see below).
  */
 struct libsoccr_sk_data {
-	uint32_t	state;
-	uint32_t	inq_len;
-	uint32_t	inq_seq;
-	uint32_t	outq_len;
-	uint32_t	outq_seq;
-	uint32_t	unsq_len;
-	uint32_t	opt_mask;
-	uint32_t	mss_clamp;
-	uint32_t	snd_wscale;
-	uint32_t	rcv_wscale;
-	uint32_t	timestamp;
+	uint32_t state;
+	uint32_t inq_len;
+	uint32_t inq_seq;
+	uint32_t outq_len;
+	uint32_t outq_seq;
+	uint32_t unsq_len;
+	uint32_t opt_mask;
+	uint32_t mss_clamp;
+	uint32_t snd_wscale;
+	uint32_t rcv_wscale;
+	uint32_t timestamp;
 
-	uint32_t	flags; /* SOCCR_FLAGS_... below */
-	uint32_t	snd_wl1;
-	uint32_t	snd_wnd;
-	uint32_t	max_window;
-	uint32_t	rcv_wnd;
-	uint32_t	rcv_wup;
+	uint32_t flags; /* SOCCR_FLAGS_... below */
+	uint32_t snd_wl1;
+	uint32_t snd_wnd;
+	uint32_t max_window;
+	uint32_t rcv_wnd;
+	uint32_t rcv_wup;
 };
 
 /*
@@ -105,7 +105,7 @@ struct libsoccr_sk_data {
  * Window parameters. Mark snd_wl1, snd_wnd, max_window, rcv_wnd
  * and rcv_wup fields.
  */
-#define SOCCR_FLAGS_WINDOW	0x1
+#define SOCCR_FLAGS_WINDOW 0x1
 
 /*
  * These two calls pause and resume the socket for and after C/R
@@ -136,7 +136,7 @@ void libsoccr_release(struct libsoccr_sk *sk);
  * the former will free() one, when given to the library, the latter
  * is to free() it.
  */
-#define SOCCR_MEM_EXCL		0x1
+#define SOCCR_MEM_EXCL 0x1
 
 /*
  * CHECKPOINTING calls
diff --git a/test/compel/arch/arm/include/arch_test_handle_binary.h b/test/compel/arch/arm/include/arch_test_handle_binary.h
index 234bd384a..84a958511 100644
--- a/test/compel/arch/arm/include/arch_test_handle_binary.h
+++ b/test/compel/arch/arm/include/arch_test_handle_binary.h
@@ -17,5 +17,4 @@ static __maybe_unused void arch_test_set_elf_hdr_machine(Ehdr_t *hdr)
 	hdr->e_machine = EM_ARM;
 }
 
-
 #endif /* __ARCH_TEST_HANDLE_BINARY__ */
diff --git a/test/compel/arch/x86/include/arch_test_handle_binary.h b/test/compel/arch/x86/include/arch_test_handle_binary.h
index ae16ac57e..596de931b 100644
--- a/test/compel/arch/x86/include/arch_test_handle_binary.h
+++ b/test/compel/arch/x86/include/arch_test_handle_binary.h
@@ -5,7 +5,7 @@
 
 #ifdef CONFIG_X86_64
 #include "uapi/elf64-types.h"
-#define __run_tests	run_tests_64
+#define __run_tests run_tests_64
 
 static __maybe_unused void arch_test_set_elf_hdr_ident(void *mem)
 {
@@ -20,7 +20,7 @@ static __maybe_unused void arch_test_set_elf_hdr_machine(Ehdr_t *hdr)
 #else /* !CONFIG_X86_64 */
 
 #include "uapi/elf32-types.h"
-#define __run_tests	run_tests_32
+#define __run_tests run_tests_32
 
 static __maybe_unused void arch_test_set_elf_hdr_ident(void *mem)
 {
diff --git a/test/zdtm/lib/arch/aarch64/include/asm/atomic.h b/test/zdtm/lib/arch/aarch64/include/asm/atomic.h
index ddf4ad9f6..d59e53f4a 100644
--- a/test/zdtm/lib/arch/aarch64/include/asm/atomic.h
+++ b/test/zdtm/lib/arch/aarch64/include/asm/atomic.h
@@ -3,11 +3,9 @@
 
 typedef uint32_t atomic_t;
 
-
 /* Copied from the Linux header arch/arm/include/asm/barrier.h */
 
-#define smp_mb()	asm volatile("dmb ish" : : : "memory")
-
+#define smp_mb() asm volatile("dmb ish" : : : "memory")
 
 /* Copied from the Linux kernel header arch/arm64/include/asm/atomic.h */
 
@@ -28,14 +26,13 @@ static inline int atomic_add_return(int i, atomic_t *v)
 	unsigned long tmp;
 	int result;
 
-	asm volatile(
-"1:	ldxr	%w0, %2\n"
-"	add	%w0, %w0, %w3\n"
-"	stlxr	%w1, %w0, %2\n"
-"	cbnz	%w1, 1b"
-	: "=&r" (result), "=&r" (tmp), "+Q" (*v)
-	: "Ir" (i)
-	: "cc", "memory");
+	asm volatile("1:	ldxr	%w0, %2\n"
+		     "	add	%w0, %w0, %w3\n"
+		     "	stlxr	%w1, %w0, %2\n"
+		     "	cbnz	%w1, 1b"
+		     : "=&r"(result), "=&r"(tmp), "+Q"(*v)
+		     : "Ir"(i)
+		     : "cc", "memory");
 
 	smp_mb();
 	return result;
@@ -46,28 +43,36 @@ static inline int atomic_sub_return(int i, atomic_t *v)
 	unsigned long tmp;
 	int result;
 
-	asm volatile(
-"1:	ldxr	%w0, %2\n"
-"	sub	%w0, %w0, %w3\n"
-"	stlxr	%w1, %w0, %2\n"
-"	cbnz	%w1, 1b"
-	: "=&r" (result), "=&r" (tmp), "+Q" (*v)
-	: "Ir" (i)
-	: "cc", "memory");
+	asm volatile("1:	ldxr	%w0, %2\n"
+		     "	sub	%w0, %w0, %w3\n"
+		     "	stlxr	%w1, %w0, %2\n"
+		     "	cbnz	%w1, 1b"
+		     : "=&r"(result), "=&r"(tmp), "+Q"(*v)
+		     : "Ir"(i)
+		     : "cc", "memory");
 
 	smp_mb();
 	return result;
 }
 
-static inline int atomic_inc(atomic_t *v) { return atomic_add_return(1, v) - 1; }
+static inline int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
 
-static inline int atomic_add(int val, atomic_t *v) { return atomic_add_return(val, v) - val; }
+static inline int atomic_add(int val, atomic_t *v)
+{
+	return atomic_add_return(val, v) - val;
+}
 
-static inline int atomic_dec(atomic_t *v) { return atomic_sub_return(1, v) + 1; }
+static inline int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
 
 /* true if the result is 0, or false for all other cases. */
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
 
-#define atomic_inc_return(v)	(atomic_add_return(1, v))
+#define atomic_inc_return(v) (atomic_add_return(1, v))
 
 #endif /* __CR_ATOMIC_H__ */
diff --git a/test/zdtm/lib/arch/arm/include/asm/atomic.h b/test/zdtm/lib/arch/arm/include/asm/atomic.h
index 0ff76408d..bed1816a2 100644
--- a/test/zdtm/lib/arch/arm/include/asm/atomic.h
+++ b/test/zdtm/lib/arch/arm/include/asm/atomic.h
@@ -1,16 +1,14 @@
 #ifndef __CR_ATOMIC_H__
 #define __CR_ATOMIC_H__
 
-
 typedef uint32_t atomic_t;
 
-
 /* Copied from the Linux kernel header arch/arm/include/asm/atomic.h */
 
-#define smp_mb() __asm__ __volatile__ ("dmb" : : : "memory")
+#define smp_mb() __asm__ __volatile__("dmb" : : : "memory")
 
-#define atomic_set(mem,v) (*(mem) = (v))
-#define atomic_get(v) (*(volatile uint32_t *)v)
+#define atomic_set(mem, v) (*(mem) = (v))
+#define atomic_get(v)	   (*(volatile uint32_t *)v)
 
 static inline unsigned int atomic_add_return(int i, atomic_t *v)
 {
@@ -20,14 +18,14 @@ static inline unsigned int atomic_add_return(int i, atomic_t *v)
 	smp_mb();
 
 	__asm__ __volatile__("@ atomic_add_return\n"
-"1:	ldrex	%0, [%3]\n"
-"	add	%0, %0, %4\n"
-"	strex	%1, %0, [%3]\n"
-"	teq	%1, #0\n"
-"	bne	1b\n"
-	: "=&r" (result), "=&r" (tmp), "+Qo" (*v)
-        : "r" (v), "Ir" (i)
-	: "cc");
+			     "1:	ldrex	%0, [%3]\n"
+			     "	add	%0, %0, %4\n"
+			     "	strex	%1, %0, [%3]\n"
+			     "	teq	%1, #0\n"
+			     "	bne	1b\n"
+			     : "=&r"(result), "=&r"(tmp), "+Qo"(*v)
+			     : "r"(v), "Ir"(i)
+			     : "cc");
 
 	smp_mb();
 
@@ -42,25 +40,34 @@ static inline unsigned int atomic_sub_return(int i, atomic_t *v)
 	smp_mb();
 
 	__asm__ __volatile__("@ atomic_sub_return\n"
-"1:	ldrex	%0, [%3]\n"
-"	sub	%0, %0, %4\n"
-"	strex	%1, %0, [%3]\n"
-"	teq	%1, #0\n"
-"	bne	1b\n"
-	: "=&r" (result), "=&r" (tmp), "+Qo" (*v)
-	: "r" (v), "Ir" (i)
-	: "cc");
+			     "1:	ldrex	%0, [%3]\n"
+			     "	sub	%0, %0, %4\n"
+			     "	strex	%1, %0, [%3]\n"
+			     "	teq	%1, #0\n"
+			     "	bne	1b\n"
+			     : "=&r"(result), "=&r"(tmp), "+Qo"(*v)
+			     : "r"(v), "Ir"(i)
+			     : "cc");
 
 	smp_mb();
 
 	return result;
 }
 
-static inline unsigned int atomic_inc(atomic_t *v) { return atomic_add_return(1, v) - 1; }
+static inline unsigned int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
 
-static inline unsigned int atomic_add(int val, atomic_t *v) { return atomic_add_return(val, v) - val; }
+static inline unsigned int atomic_add(int val, atomic_t *v)
+{
+	return atomic_add_return(val, v) - val;
+}
 
-static inline unsigned int atomic_dec(atomic_t *v) { return atomic_sub_return(1, v) + 1; }
+static inline unsigned int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
 
 /* true if the result is 0, or false for all other cases. */
 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
diff --git a/test/zdtm/lib/arch/mips/include/asm/atomic.h b/test/zdtm/lib/arch/mips/include/asm/atomic.h
index acf4c03cd..1db8c98a5 100644
--- a/test/zdtm/lib/arch/mips/include/asm/atomic.h
+++ b/test/zdtm/lib/arch/mips/include/asm/atomic.h
@@ -11,19 +11,19 @@ typedef uint32_t atomic_t;
 /* 	int counter; */
 /* }atomic_t; */
 
-#define __WEAK_LLSC_MB		"	sync	\n"
+#define __WEAK_LLSC_MB "	sync	\n"
 
-#define smp_llsc_mb()	__asm__ __volatile__(__WEAK_LLSC_MB : : :"memory")
+#define smp_llsc_mb() __asm__ __volatile__(__WEAK_LLSC_MB : : : "memory")
 
-#define smp_mb__before_llsc() smp_llsc_mb()
-#define smp_mb__before_atomic()	smp_mb__before_llsc()
+#define smp_mb__before_llsc()	smp_llsc_mb()
+#define smp_mb__before_atomic() smp_mb__before_llsc()
 #define smp_mb__after_atomic()	smp_llsc_mb()
 
-#define likely(x)		__builtin_expect(!!(x), 1)
-#define unlikely(x)		__builtin_expect(!!(x), 0)
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 
-#define atomic_get(v)		(*(volatile int *)v)
-#define atomic_set(v, i)		((*v) = (i))
+#define atomic_get(v)	 (*(volatile int *)v)
+#define atomic_set(v, i) ((*v) = (i))
 
 //#define atomic_get atomic_read
 
@@ -35,20 +35,19 @@ typedef uint32_t atomic_t;
  * Atomically adds @i to @v.
  */
 
-static __inline__ void atomic_add(int i, atomic_t * v)
+static __inline__ void atomic_add(int i, atomic_t *v)
 {
-    int temp;
+	int temp;
 
-    do {
-	__asm__ __volatile__(
-			     "	.set	mips3				\n"
-			     "	ll	%0, %1		# atomic_add	\n"
-			     "	addu	%0, %2				\n"
-			     "	sc	%0, %1				\n"
-			     "	.set	mips0				\n"
-			     : "=&r" (temp), "+m" (*v)
-			     : "Ir" (i));
-    } while (unlikely(!temp));
+	do {
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%0, %1		# atomic_add	\n"
+				     "	addu	%0, %2				\n"
+				     "	sc	%0, %1				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(temp), "+m"(*v)
+				     : "Ir"(i));
+	} while (unlikely(!temp));
 }
 
 /*
@@ -58,26 +57,25 @@ static __inline__ void atomic_add(int i, atomic_t * v)
  *
  * Atomically subtracts @i from @v.
  */
-static __inline__ void atomic_sub(int i, atomic_t * v)
+static __inline__ void atomic_sub(int i, atomic_t *v)
 {
-    int temp;
+	int temp;
 
-    do {
-	__asm__ __volatile__(
-			     "	.set	mips3				\n"
-			     "	ll	%0, %1		# atomic_sub	\n"
-			     "	subu	%0, %2				\n"
-			     "	sc	%0, %1				\n"
-			     "	.set	mips0				\n"
-			     : "=&r" (temp), "+m" (*v)
-			     : "Ir" (i));
-    } while (unlikely(!temp));
+	do {
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%0, %1		# atomic_sub	\n"
+				     "	subu	%0, %2				\n"
+				     "	sc	%0, %1				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(temp), "+m"(*v)
+				     : "Ir"(i));
+	} while (unlikely(!temp));
 }
 
 /*
  * Same as above, but return the result value
  */
-static __inline__ int atomic_add_return(int i, atomic_t * v)
+static __inline__ int atomic_add_return(int i, atomic_t *v)
 {
 	int result;
 	int temp;
@@ -85,14 +83,13 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
 	smp_mb__before_llsc();
 
 	do {
-	    __asm__ __volatile__(
-				 "	.set	mips3				\n"
-				 "	ll	%1, %2	# atomic_add_return	\n"
-				 "	addu	%0, %1, %3			\n"
-				 "	sc	%0, %2				\n"
-				 "	.set	mips0				\n"
-				 : "=&r" (result), "=&r" (temp), "+m" (*v)
-				 : "Ir" (i));
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%1, %2	# atomic_add_return	\n"
+				     "	addu	%0, %1, %3			\n"
+				     "	sc	%0, %2				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(result), "=&r"(temp), "+m"(*v)
+				     : "Ir"(i));
 	} while (unlikely(!result));
 
 	result = temp + i;
@@ -102,7 +99,7 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
 	return result;
 }
 
-static __inline__ int atomic_sub_return(int i, atomic_t * v)
+static __inline__ int atomic_sub_return(int i, atomic_t *v)
 {
 	int result;
 	int temp;
@@ -110,14 +107,13 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
 	smp_mb__before_llsc();
 
 	do {
-	    __asm__ __volatile__(
-				 "	.set	mips3				\n"
-				 "	ll	%1, %2	# atomic_sub_return	\n"
-				 "	subu	%0, %1, %3			\n"
-				 "	sc	%0, %2				\n"
-				 "	.set	mips0				\n"
-				 : "=&r" (result), "=&r" (temp), "+m" (*v)
-				 : "Ir" (i));
+		__asm__ __volatile__("	.set	mips3				\n"
+				     "	ll	%1, %2	# atomic_sub_return	\n"
+				     "	subu	%0, %1, %3			\n"
+				     "	sc	%0, %2				\n"
+				     "	.set	mips0				\n"
+				     : "=&r"(result), "=&r"(temp), "+m"(*v)
+				     : "Ir"(i));
 	} while (unlikely(!result));
 
 	result = temp - i;
@@ -128,9 +124,15 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
 }
 
 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
-#define atomic_dec_return(v) atomic_sub_return(1, (v))
-#define atomic_inc_return(v) atomic_add_return(1, (v))
+#define atomic_dec_return(v)	atomic_sub_return(1, (v))
+#define atomic_inc_return(v)	atomic_add_return(1, (v))
 
-static inline unsigned int atomic_inc(atomic_t *v) { return atomic_add_return(1, v) - 1; }
-static inline unsigned int atomic_dec(atomic_t *v) { return atomic_sub_return(1, v) + 1; }
+static inline unsigned int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
+static inline unsigned int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
 #endif /* __CR_ATOMIC_H__ */
diff --git a/test/zdtm/lib/arch/ppc64/include/asm/atomic.h b/test/zdtm/lib/arch/ppc64/include/asm/atomic.h
index bd14cc059..fc52160e8 100644
--- a/test/zdtm/lib/arch/ppc64/include/asm/atomic.h
+++ b/test/zdtm/lib/arch/ppc64/include/asm/atomic.h
@@ -8,10 +8,13 @@
  */
 typedef uint32_t atomic_t;
 
-#define PPC_ATOMIC_ENTRY_BARRIER	"lwsync \n"
-#define PPC_ATOMIC_EXIT_BARRIER		"sync  	\n"
+#define PPC_ATOMIC_ENTRY_BARRIER "lwsync \n"
+#define PPC_ATOMIC_EXIT_BARRIER	 "sync  	\n"
 
-#define ATOMIC_INIT(i)		{ (i) }
+#define ATOMIC_INIT(i) \
+	{              \
+		(i)    \
+	}
 
 static __inline__ int atomic_get(const atomic_t *v)
 {
@@ -27,20 +30,18 @@ static __inline__ void atomic_set(atomic_t *v, int i)
 	__asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(*v) : "r"(i));
 }
 
-#define ATOMIC_OP(op, asm_op)						\
-static __inline__ void atomic_##op(int a, atomic_t *v)			\
-{									\
-	int t;								\
-									\
-	__asm__ __volatile__(						\
-"1:	lwarx	%0,0,%3		# atomic_" #op "\n"			\
-	#asm_op " %0,%2,%0\n"						\
-"	stwcx.	%0,0,%3 \n"						\
-"	bne-	1b\n"							\
-	: "=&r" (t), "+m" (*v)					\
-	: "r" (a), "r" (v)					\
-	: "cc");							\
-}									\
+#define ATOMIC_OP(op, asm_op)                                                                                     \
+	static __inline__ void atomic_##op(int a, atomic_t *v)                                                    \
+	{                                                                                                         \
+		int t;                                                                                            \
+                                                                                                                  \
+		__asm__ __volatile__("1:	lwarx	%0,0,%3		# atomic_" #op "\n" #asm_op " %0,%2,%0\n" \
+				     "	stwcx.	%0,0,%3 \n"                                                         \
+				     "	bne-	1b\n"                                                                 \
+				     : "=&r"(t), "+m"(*v)                                                         \
+				     : "r"(a), "r"(v)                                                             \
+				     : "cc");                                                                     \
+	}
 
 ATOMIC_OP(add, add)
 ATOMIC_OP(sub, subf)
@@ -51,16 +52,13 @@ static __inline__ int atomic_inc_return(atomic_t *v)
 {
 	int t;
 
-	__asm__ __volatile__(
-	PPC_ATOMIC_ENTRY_BARRIER \
-"1:	lwarx	%0,0,%1		# atomic_inc_return\n\
+	__asm__ __volatile__(PPC_ATOMIC_ENTRY_BARRIER "1:	lwarx	%0,0,%1		# atomic_inc_return\n\
 	addic	%0,%0,1\n"
-"	stwcx.	%0,0,%1 \n\
-	bne-	1b \n" \
-	PPC_ATOMIC_EXIT_BARRIER
-	: "=&r" (t)
-	: "r" (v)
-	: "cc", "xer", "memory");
+						      "	stwcx.	%0,0,%1 \n\
+	bne-	1b \n" PPC_ATOMIC_EXIT_BARRIER
+			     : "=&r"(t)
+			     : "r"(v)
+			     : "cc", "xer", "memory");
 
 	return t;
 }
@@ -74,14 +72,13 @@ static __inline__ void atomic_dec(atomic_t *v)
 {
 	int t;
 
-	__asm__ __volatile__(
-"1:	lwarx	%0,0,%2		# atomic_dec\n\
+	__asm__ __volatile__("1:	lwarx	%0,0,%2		# atomic_dec\n\
 	addic	%0,%0,-1\n"
-"	stwcx.	%0,0,%2\n\
+			     "	stwcx.	%0,0,%2\n\
 	bne-	1b"
-	: "=&r" (t), "+m" (*v)
-	: "r" (v)
-	: "cc", "xer");
+			     : "=&r"(t), "+m"(*v)
+			     : "r"(v)
+			     : "cc", "xer");
 }
 
 #endif /* __CR_ATOMIC_H__ */
diff --git a/test/zdtm/lib/arch/s390/include/asm/atomic.h b/test/zdtm/lib/arch/s390/include/asm/atomic.h
index b7c4b2c53..4472501ff 100644
--- a/test/zdtm/lib/arch/s390/include/asm/atomic.h
+++ b/test/zdtm/lib/arch/s390/include/asm/atomic.h
@@ -5,23 +5,22 @@
 
 typedef uint32_t atomic_t;
 
-#define __ATOMIC_OP(op_name, op_type, op_string)			\
-static inline op_type op_name(op_type val, op_type *ptr)		\
-{									\
-	op_type old, new;						\
-									\
-	asm volatile(							\
-		"0:	lr	%[new],%[old]\n"			\
-		op_string "	%[new],%[val]\n"			\
-		"	cs	%[old],%[new],%[ptr]\n"			\
-		"	jl	0b"					\
-		: [old] "=d" (old), [new] "=&d" (new), [ptr] "+Q" (*ptr)\
-		: [val] "d" (val), "0" (*ptr) : "cc", "memory");	\
-	return old;							\
-}
+#define __ATOMIC_OP(op_name, op_type, op_string)                                              \
+	static inline op_type op_name(op_type val, op_type *ptr)                              \
+	{                                                                                     \
+		op_type old, new;                                                             \
+                                                                                              \
+		asm volatile("0:	lr	%[new],%[old]\n" op_string "	%[new],%[val]\n" \
+			     "	cs	%[old],%[new],%[ptr]\n"                                     \
+			     "	jl	0b"                                                         \
+			     : [old] "=d"(old), [new] "=&d"(new), [ptr] "+Q"(*ptr)            \
+			     : [val] "d"(val), "0"(*ptr)                                      \
+			     : "cc", "memory");                                               \
+		return old;                                                                   \
+	}
 
-#define __ATOMIC_OPS(op_name, op_type, op_string)			\
-	__ATOMIC_OP(op_name, op_type, op_string)			\
+#define __ATOMIC_OPS(op_name, op_type, op_string) \
+	__ATOMIC_OP(op_name, op_type, op_string)  \
 	__ATOMIC_OP(op_name##_barrier, op_type, op_string)
 
 __ATOMIC_OPS(__atomic_add, uint32_t, "ar")
@@ -33,17 +32,13 @@ static inline int atomic_get(const atomic_t *v)
 {
 	int c;
 
-	asm volatile(
-		"	l	%0,%1\n"
-		: "=d" (c) : "Q" (*v));
+	asm volatile("	l	%0,%1\n" : "=d"(c) : "Q"(*v));
 	return c;
 }
 
 static inline void atomic_set(atomic_t *v, int i)
 {
-	asm volatile(
-		"	st	%1,%0\n"
-		: "=Q" (*v) : "d" (i));
+	asm volatile("	st	%1,%0\n" : "=Q"(*v) : "d"(i));
 }
 
 static inline int atomic_add_return(int i, atomic_t *v)
@@ -56,13 +51,13 @@ static inline void atomic_add(int i, atomic_t *v)
 	__atomic_add(i, v);
 }
 
-#define atomic_sub(_i, _v)		atomic_add(-(int)(_i), _v)
+#define atomic_sub(_i, _v) atomic_add(-(int)(_i), _v)
 
 static inline int atomic_inc(atomic_t *v)
 {
 	return atomic_add_return(1, v) - 1;
 }
 
-#define atomic_dec(_v)			atomic_sub(1, _v)
+#define atomic_dec(_v) atomic_sub(1, _v)
 
 #endif /* __ARCH_S390_ATOMIC__  */
diff --git a/test/zdtm/lib/arch/x86/include/asm/atomic.h b/test/zdtm/lib/arch/x86/include/asm/atomic.h
index 7621df09c..40a9c1836 100644
--- a/test/zdtm/lib/arch/x86/include/asm/atomic.h
+++ b/test/zdtm/lib/arch/x86/include/asm/atomic.h
@@ -1,49 +1,29 @@
 #ifndef ATOMIC_H__
 #define ATOMIC_H__
 
-#define atomic_set(mem, v)					\
-	({							\
-		asm volatile ("lock xchg %0, %1\n"		\
-				: "+r" (v), "+m" (*mem)		\
-				:				\
-				: "cc", "memory");		\
+#define atomic_set(mem, v) ({ asm volatile("lock xchg %0, %1\n" : "+r"(v), "+m"(*mem) : : "cc", "memory"); })
+
+#define atomic_get(mem)                                                                          \
+	({                                                                                       \
+		uint32_t ret__ = 0;                                                              \
+		asm volatile("lock xadd %0, %1\n" : "+r"(ret__), "+m"(*mem) : : "cc", "memory"); \
+		ret__;                                                                           \
 	})
 
-#define atomic_get(mem)						\
-	({							\
-		uint32_t ret__ = 0;					\
-		asm volatile ("lock xadd %0, %1\n"		\
-				: "+r" (ret__),	"+m" (*mem)	\
-				:				\
-				: "cc", "memory");		\
-		ret__;						\
+#define atomic_inc(mem)                                                                          \
+	({                                                                                       \
+		uint32_t ret__ = 1;                                                              \
+		asm volatile("lock xadd %0, %1\n" : "+r"(ret__), "+m"(*mem) : : "cc", "memory"); \
+		ret__;                                                                           \
 	})
 
-#define atomic_inc(mem)						\
-	({							\
-		uint32_t ret__ = 1;					\
-		asm volatile ("lock xadd %0, %1\n"		\
-				: "+r" (ret__),	"+m" (*mem)	\
-				:				\
-				: "cc", "memory");		\
-		ret__;						\
+#define atomic_dec(mem)                                                                          \
+	({                                                                                       \
+		uint32_t ret__ = -1;                                                             \
+		asm volatile("lock xadd %0, %1\n" : "+r"(ret__), "+m"(*mem) : : "cc", "memory"); \
+		ret__;                                                                           \
 	})
 
-#define atomic_dec(mem)						\
-	({							\
-		uint32_t ret__ = -1;					\
-		asm volatile ("lock xadd %0, %1\n"		\
-				: "+r" (ret__),	"+m" (*mem)	\
-				:				\
-				: "cc", "memory");		\
-		ret__;						\
-	})
-
-#define atomic_add(i, mem)					\
-({								\
-	asm volatile("lock addl %1,%0"				\
-		     : "+m" (*mem)				\
-		     : "ir" (i));				\
-})
+#define atomic_add(i, mem) ({ asm volatile("lock addl %1,%0" : "+m"(*mem) : "ir"(i)); })
 
 #endif /* ATOMIC_H__ */
diff --git a/test/zdtm/lib/bpfmap_zdtm.h b/test/zdtm/lib/bpfmap_zdtm.h
index b8b1ecd0b..75b494c51 100644
--- a/test/zdtm/lib/bpfmap_zdtm.h
+++ b/test/zdtm/lib/bpfmap_zdtm.h
@@ -3,17 +3,17 @@
 
 #include "zdtmtst.h"
 
-#define fdinfo_field(str, field)	!strncmp(str, field":", sizeof(field))
+#define fdinfo_field(str, field) !strncmp(str, field ":", sizeof(field))
 
 struct bpfmap_fdinfo_obj {
-	uint32_t	map_type;
-	uint32_t	key_size;
-	uint32_t	value_size;
-	uint32_t	max_entries;
-	uint32_t	map_flags;
-	uint64_t	memlock;
-	uint32_t	map_id;
-	uint32_t	frozen;
+	uint32_t map_type;
+	uint32_t key_size;
+	uint32_t value_size;
+	uint32_t max_entries;
+	uint32_t map_flags;
+	uint64_t memlock;
+	uint32_t map_id;
+	uint32_t frozen;
 };
 
 extern int parse_bpfmap_fdinfo(int, struct bpfmap_fdinfo_obj *, uint32_t);
diff --git a/test/zdtm/lib/cpuid.h b/test/zdtm/lib/cpuid.h
index f87d1acb7..0acae6fe9 100644
--- a/test/zdtm/lib/cpuid.h
+++ b/test/zdtm/lib/cpuid.h
@@ -5,30 +5,20 @@
  * Adopted from linux kernel code.
  */
 
-static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
-				unsigned int *ecx, unsigned int *edx)
+static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
 	/* ecx is often an input as well as an output. */
-	asm volatile("cpuid"
-	    : "=a" (*eax),
-	      "=b" (*ebx),
-	      "=c" (*ecx),
-	      "=d" (*edx)
-	    : "0"  (*eax), "2" (*ecx)
-	    : "memory");
+	asm volatile("cpuid" : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx) : "0"(*eax), "2"(*ecx) : "memory");
 }
 
-static inline void cpuid(unsigned int op,
-			 unsigned int *eax, unsigned int *ebx,
-			 unsigned int *ecx, unsigned int *edx)
+static inline void cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
 {
 	*eax = op;
 	*ecx = 0;
 	native_cpuid(eax, ebx, ecx, edx);
 }
 
-static inline void cpuid_count(unsigned int op, unsigned int count,
-			       unsigned int *eax, unsigned int *ebx,
+static inline void cpuid_count(unsigned int op, unsigned int count, unsigned int *eax, unsigned int *ebx,
 			       unsigned int *ecx, unsigned int *edx)
 {
 	*eax = op;
diff --git a/test/zdtm/lib/fs.h b/test/zdtm/lib/fs.h
index af7a665fb..315fe71be 100644
--- a/test/zdtm/lib/fs.h
+++ b/test/zdtm/lib/fs.h
@@ -2,7 +2,7 @@
 #define ZDTM_FS_H_
 
 #ifndef _BSD_SOURCE
-# define _BSD_SOURCE
+#define _BSD_SOURCE
 #endif
 
 #include <sys/types.h>
@@ -10,9 +10,9 @@
 
 #include <limits.h>
 
-#define KDEV_MINORBITS	20
-#define KDEV_MINORMASK	((1UL << KDEV_MINORBITS) - 1)
-#define MKKDEV(ma, mi)	(((ma) << KDEV_MINORBITS) | (mi))
+#define KDEV_MINORBITS 20
+#define KDEV_MINORMASK ((1UL << KDEV_MINORBITS) - 1)
+#define MKKDEV(ma, mi) (((ma) << KDEV_MINORBITS) | (mi))
 
 static inline unsigned int kdev_major(unsigned int kdev)
 {
@@ -38,12 +38,12 @@ static inline dev_t kdev_to_odev(unsigned int kdev)
 }
 
 typedef struct {
-	int			mnt_id;
-	int			parent_mnt_id;
-	unsigned int		s_dev;
-	char			root[PATH_MAX];
-	char			mountpoint[PATH_MAX];
-	char			fsname[64];
+	int mnt_id;
+	int parent_mnt_id;
+	unsigned int s_dev;
+	char root[PATH_MAX];
+	char mountpoint[PATH_MAX];
+	char fsname[64];
 } mnt_info_t;
 
 extern mnt_info_t *mnt_info_alloc(void);
diff --git a/test/zdtm/lib/lock.h b/test/zdtm/lib/lock.h
index 9c0831d46..2b23550be 100644
--- a/test/zdtm/lib/lock.h
+++ b/test/zdtm/lib/lock.h
@@ -9,22 +9,22 @@
 #include <errno.h>
 #include "asm/atomic.h"
 
-#define BUG_ON(condition)						\
-	do {								\
-		if ((condition)) {					\
-			raise(SIGABRT);					\
+#define BUG_ON(condition)                                                        \
+	do {                                                                     \
+		if ((condition)) {                                               \
+			raise(SIGABRT);                                          \
 			*(volatile unsigned long *)NULL = 0xdead0000 + __LINE__; \
-		}							\
+		}                                                                \
 	} while (0)
 typedef struct {
-	uint32_t	raw;
+	uint32_t raw;
 } futex_t;
 
-#define FUTEX_ABORT_FLAG	(0x80000000)
-#define FUTEX_ABORT_RAW		(-1U)
+#define FUTEX_ABORT_FLAG (0x80000000)
+#define FUTEX_ABORT_RAW	 (-1U)
 
-static inline int sys_futex(uint32_t *uaddr, int op, uint32_t val, const struct timespec *timeout,
-                 uint32_t *uaddr2, uint32_t val3)
+static inline int sys_futex(uint32_t *uaddr, int op, uint32_t val, const struct timespec *timeout, uint32_t *uaddr2,
+			    uint32_t val3)
 {
 	return syscall(__NR_futex, uaddr, op, val, timeout, uaddr2, val3);
 }
@@ -48,26 +48,23 @@ static inline void futex_add_and_wake(futex_t *f, uint32_t v)
 	BUG_ON(sys_futex(&f->raw, FUTEX_WAKE, INT_MAX, NULL, NULL, 0) < 0);
 }
 
-
-#define futex_init(f)	futex_set(f, 0)
+#define futex_init(f) futex_set(f, 0)
 
 /* Wait on futex @__f value @__v become in condition @__c */
-#define futex_wait_if_cond(__f, __v, __cond)			\
-	do {							\
-		int ret;					\
-		uint32_t tmp;					\
-								\
-		while (1) {					\
-			tmp = (__f)->raw;			\
-			if ((tmp & FUTEX_ABORT_FLAG) ||		\
-			    (tmp __cond (__v)))			\
-				break;				\
-			ret = sys_futex(&(__f)->raw, FUTEX_WAIT,\
-					tmp, NULL, NULL, 0);	\
-			if (ret < 0 && (errno == EAGAIN || errno == EINTR)) \
-				continue;			\
-			BUG_ON(ret < 0 && errno != EWOULDBLOCK);	\
-		}						\
+#define futex_wait_if_cond(__f, __v, __cond)                                          \
+	do {                                                                          \
+		int ret;                                                              \
+		uint32_t tmp;                                                         \
+                                                                                      \
+		while (1) {                                                           \
+			tmp = (__f)->raw;                                             \
+			if ((tmp & FUTEX_ABORT_FLAG) || (tmp __cond(__v)))            \
+				break;                                                \
+			ret = sys_futex(&(__f)->raw, FUTEX_WAIT, tmp, NULL, NULL, 0); \
+			if (ret < 0 && (errno == EAGAIN || errno == EINTR))           \
+				continue;                                             \
+			BUG_ON(ret < 0 && errno != EWOULDBLOCK);                      \
+		}                                                                     \
 	} while (0)
 
 /* Set futex @f to @v and wake up all waiters */
@@ -98,22 +95,34 @@ static inline void futex_inc_and_wake(futex_t *f)
 }
 
 /* Plain increment futex @f value */
-static inline void futex_inc(futex_t *f) { atomic_inc(&f->raw); }
+static inline void futex_inc(futex_t *f)
+{
+	atomic_inc(&f->raw);
+}
 
 /* Plain decrement futex @f value */
-static inline void futex_dec(futex_t *f) { atomic_dec(&f->raw); }
+static inline void futex_dec(futex_t *f)
+{
+	atomic_dec(&f->raw);
+}
 
 /* Wait until futex @f value become @v */
 static inline void futex_wait_until(futex_t *f, uint32_t v)
-{ futex_wait_if_cond(f, v, ==); }
+{
+	futex_wait_if_cond(f, v, ==);
+}
 
 /* Wait while futex @f value is greater than @v */
 static inline void futex_wait_while_gt(futex_t *f, uint32_t v)
-{ futex_wait_if_cond(f, v, <=); }
+{
+	futex_wait_if_cond(f, v, <=);
+}
 
 /* Wait while futex @f value is less than @v */
 static inline void futex_wait_while_lt(futex_t *f, uint32_t v)
-{ futex_wait_if_cond(f, v, >=); }
+{
+	futex_wait_if_cond(f, v, >=);
+}
 /* Wait while futex @f value is @v */
 static inline uint32_t futex_wait_while(futex_t *f, uint32_t v)
 {
@@ -128,7 +137,7 @@ static inline uint32_t futex_wait_while(futex_t *f, uint32_t v)
 }
 
 typedef struct {
-	uint32_t	raw;
+	uint32_t raw;
 } mutex_t;
 
 static void inline mutex_init(mutex_t *m)
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index ec6c110a2..c6d77011d 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -9,11 +9,11 @@
 #define INPROGRESS ".inprogress"
 
 #ifndef PAGE_SIZE
-# define PAGE_SIZE (unsigned int)(sysconf(_SC_PAGESIZE))
+#define PAGE_SIZE (unsigned int)(sysconf(_SC_PAGESIZE))
 #endif
 
 #ifndef PR_SET_CHILD_SUBREAPER
-# define PR_SET_CHILD_SUBREAPER 36
+#define PR_SET_CHILD_SUBREAPER 36
 #endif
 
 /* set up test */
@@ -28,15 +28,14 @@ extern void test_init(int argc, char **argv);
 #define CLONE_NEWIPC 0x08000000
 #endif
 
-#define TEST_MSG_BUFFER_SIZE	2048
+#define TEST_MSG_BUFFER_SIZE 2048
 /*wrapper for fork: init log offset*/
 #define test_fork() test_fork_id(-1)
 extern int test_fork_id(int id);
 /* finish setting up the test, write out pid file, and go to background */
 extern void test_daemon(void);
 /* store a message to a static buffer */
-extern void test_msg(const char *format, ...)
-	__attribute__ ((__format__ (__printf__, 1, 2)));
+extern void test_msg(const char *format, ...) __attribute__((__format__(__printf__, 1, 2)));
 /* tell if SIGTERM hasn't been received yet */
 extern int test_go(void);
 /* sleep until SIGTERM is delivered */
@@ -77,16 +76,21 @@ struct long_opt {
 
 extern void __push_opt(struct long_opt *opt);
 
-#define TEST_OPTION(name, type, doc, is_required)				\
-	param_check_##type(name, &(name));					\
-	static struct long_opt __long_opt_##name = {				\
-		#name, #type, doc, is_required, parse_opt_##type, &name };	\
-	static void __init_opt_##name(void) __attribute__ ((constructor));	\
-	static void __init_opt_##name(void) \
-	{ (void)__check_##name; __push_opt(&__long_opt_##name); }
+#define TEST_OPTION(name, type, doc, is_required)                                                               \
+	param_check_##type(name, &(name));                                                                      \
+	static struct long_opt __long_opt_##name = { #name, #type, doc, is_required, parse_opt_##type, &name }; \
+	static void __init_opt_##name(void) __attribute__((constructor));                                       \
+	static void __init_opt_##name(void)                                                                     \
+	{                                                                                                       \
+		(void)__check_##name;                                                                           \
+		__push_opt(&__long_opt_##name);                                                                 \
+	}
 
-#define __param_check(name, p, type) \
-	static inline type *__check_##name(void) { return(p); }
+#define __param_check(name, p, type)             \
+	static inline type *__check_##name(void) \
+	{                                        \
+		return (p);                      \
+	}
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -110,34 +114,29 @@ extern int write_pidfile(int pid);
 #include <errno.h>
 #include <string.h>
 
-#define __stringify_1(x)        #x
-#define __stringify(x)          __stringify_1(x)
+#define __stringify_1(x) #x
+#define __stringify(x)	 __stringify_1(x)
 
 /*
  * Macro to define stack alignment.
  * aarch64 requires stack to be aligned to 16 bytes.
  */
-#define __stack_aligned__	__attribute__((aligned(16)))
+#define __stack_aligned__ __attribute__((aligned(16)))
 
 /* message helpers */
 extern int test_log_init(const char *outfile, const char *suffix);
 extern int zdtm_seccomp;
-#define pr_err(format, arg...) \
-	test_msg("ERR: %s:%d: " format, __FILE__, __LINE__, ## arg)
-#define pr_perror(format, arg...)	\
-	test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", \
-		__FILE__, __LINE__, ## arg, errno, strerror(errno))
-#define fail(format, arg...)	\
-	test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", \
-		 __FILE__, __LINE__, ## arg, errno, strerror(errno))
-#define skip(format, arg...)	\
-	test_msg("SKIP: %s:%d: " format "\n", \
-		 __FILE__, __LINE__, ## arg)
-#define pass()	test_msg("PASS\n")
+#define pr_err(format, arg...) test_msg("ERR: %s:%d: " format, __FILE__, __LINE__, ##arg)
+#define pr_perror(format, arg...) \
+	test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
+#define fail(format, arg...) \
+	test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
+#define skip(format, arg...) test_msg("SKIP: %s:%d: " format "\n", __FILE__, __LINE__, ##arg)
+#define pass()		     test_msg("PASS\n")
 
 typedef struct {
-	unsigned long	seed;
-	int		pipes[2];
+	unsigned long seed;
+	int pipes[2];
 } task_waiter_t;
 
 extern void task_waiter_init(task_waiter_t *t);
@@ -163,16 +162,17 @@ extern const char *test_author;
 extern const char *test_doc;
 
 extern int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts);
-extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid,
-			       void *child_tid, unsigned long newtls);
+extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid, void *child_tid,
+			       unsigned long newtls);
 
-#define ssprintf(s, fmt, ...) ({ 						\
-	int ___ret;								\
-										\
-	___ret = snprintf(s, sizeof(s), fmt, ##__VA_ARGS__);			\
-	if (___ret >= sizeof(s))						\
-		abort();								\
-	___ret;									\
-})
+#define ssprintf(s, fmt, ...)                                        \
+	({                                                           \
+		int ___ret;                                          \
+                                                                     \
+		___ret = snprintf(s, sizeof(s), fmt, ##__VA_ARGS__); \
+		if (___ret >= sizeof(s))                             \
+			abort();                                     \
+		___ret;                                              \
+	})
 
 #endif /* _VIMITESU_H_ */
diff --git a/test/zdtm/static/auto_dev-ioctl.h b/test/zdtm/static/auto_dev-ioctl.h
index aeaeb3ea7..e65259b30 100644
--- a/test/zdtm/static/auto_dev-ioctl.h
+++ b/test/zdtm/static/auto_dev-ioctl.h
@@ -18,69 +18,69 @@
 #include <string.h>
 #endif /* __KERNEL__ */
 
-#define AUTOFS_DEVICE_NAME		"autofs"
+#define AUTOFS_DEVICE_NAME "autofs"
 
-#define AUTOFS_DEV_IOCTL_VERSION_MAJOR	1
-#define AUTOFS_DEV_IOCTL_VERSION_MINOR	0
+#define AUTOFS_DEV_IOCTL_VERSION_MAJOR 1
+#define AUTOFS_DEV_IOCTL_VERSION_MINOR 0
 
-#define AUTOFS_DEVID_LEN		16
+#define AUTOFS_DEVID_LEN 16
 
-#define AUTOFS_DEV_IOCTL_SIZE		sizeof(struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_SIZE sizeof(struct autofs_dev_ioctl)
 
 /*
  * An ioctl interface for autofs mount point control.
  */
 
 struct args_protover {
-	__u32	version;
+	__u32 version;
 };
 
 struct args_protosubver {
-	__u32	sub_version;
+	__u32 sub_version;
 };
 
 struct args_openmount {
-	__u32	devid;
+	__u32 devid;
 };
 
 struct args_ready {
-	__u32	token;
+	__u32 token;
 };
 
 struct args_fail {
-	__u32	token;
-	__s32	status;
+	__u32 token;
+	__s32 status;
 };
 
 struct args_setpipefd {
-	__s32	pipefd;
+	__s32 pipefd;
 };
 
 struct args_timeout {
-	__u64	timeout;
+	__u64 timeout;
 };
 
 struct args_requester {
-	__u32	uid;
-	__u32	gid;
+	__u32 uid;
+	__u32 gid;
 };
 
 struct args_expire {
-	__u32	how;
+	__u32 how;
 };
 
 struct args_askumount {
-	__u32	may_umount;
+	__u32 may_umount;
 };
 
 struct args_ismountpoint {
 	union {
 		struct args_in {
-			__u32	type;
+			__u32 type;
 		} in;
 		struct args_out {
-			__u32	devid;
-			__u32	magic;
+			__u32 devid;
+			__u32 magic;
 		} out;
 	};
 };
@@ -95,30 +95,31 @@ struct args_ismountpoint {
 struct autofs_dev_ioctl {
 	__u32 ver_major;
 	__u32 ver_minor;
-	__u32 size;		/* total size of data passed in
+	__u32 size; /* total size of data passed in
 				 * including this struct */
-	__s32 ioctlfd;		/* automount command fd */
+	__s32 ioctlfd; /* automount command fd */
 
 	/* Command parameters */
 
 	union {
-		struct args_protover		protover;
-		struct args_protosubver		protosubver;
-		struct args_openmount		openmount;
-		struct args_ready		ready;
-		struct args_fail		fail;
-		struct args_setpipefd		setpipefd;
-		struct args_timeout		timeout;
-		struct args_requester		requester;
-		struct args_expire		expire;
-		struct args_askumount		askumount;
-		struct args_ismountpoint	ismountpoint;
+		struct args_protover protover;
+		struct args_protosubver protosubver;
+		struct args_openmount openmount;
+		struct args_ready ready;
+		struct args_fail fail;
+		struct args_setpipefd setpipefd;
+		struct args_timeout timeout;
+		struct args_requester requester;
+		struct args_expire expire;
+		struct args_askumount askumount;
+		struct args_ismountpoint ismountpoint;
 	};
 
 	char path[0];
 };
 
-static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in) {
+static inline void init_autofs_dev_ioctl(struct autofs_dev_ioctl *in)
+{
 	memset(in, 0, sizeof(struct autofs_dev_ioctl));
 	in->ver_major = AUTOFS_DEV_IOCTL_VERSION_MAJOR;
 	in->ver_minor = AUTOFS_DEV_IOCTL_VERSION_MINOR;
@@ -169,60 +170,32 @@ enum {
 
 #define AUTOFS_IOCTL 0x93
 
-#define AUTOFS_DEV_IOCTL_VERSION \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_VERSION _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_VERSION_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_PROTOVER \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_PROTOVER_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_PROTOVER _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_PROTOVER_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_PROTOSUBVER \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_PROTOSUBVER _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_OPENMOUNT \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_OPENMOUNT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_OPENMOUNT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_OPENMOUNT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_CLOSEMOUNT \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_CLOSEMOUNT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_READY \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_READY_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_READY _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_READY_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_FAIL \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_FAIL_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_FAIL _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_FAIL_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_SETPIPEFD \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_SETPIPEFD_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_SETPIPEFD _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_SETPIPEFD_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_CATATONIC \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_CATATONIC_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_CATATONIC _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_CATATONIC_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_TIMEOUT \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_TIMEOUT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_TIMEOUT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_TIMEOUT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_REQUESTER \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_REQUESTER_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_REQUESTER _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_REQUESTER_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_EXPIRE \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_EXPIRE_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_EXPIRE _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_EXPIRE_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_ASKUMOUNT \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_ASKUMOUNT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_ASKUMOUNT_CMD, struct autofs_dev_ioctl)
 
-#define AUTOFS_DEV_IOCTL_ISMOUNTPOINT \
-	_IOWR(AUTOFS_IOCTL, \
-	      AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD, struct autofs_dev_ioctl)
+#define AUTOFS_DEV_IOCTL_ISMOUNTPOINT _IOWR(AUTOFS_IOCTL, AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD, struct autofs_dev_ioctl)
 
-#endif	/* _LINUX_AUTO_DEV_IOCTL_H */
+#endif /* _LINUX_AUTO_DEV_IOCTL_H */
diff --git a/test/zdtm/static/ofd_file_locks.h b/test/zdtm/static/ofd_file_locks.h
index 1b206a238..99095d648 100644
--- a/test/zdtm/static/ofd_file_locks.h
+++ b/test/zdtm/static/ofd_file_locks.h
@@ -4,9 +4,9 @@
 #include <sys/file.h>
 
 #ifndef F_OFD_GETLK
-#define F_OFD_GETLK	36
-#define F_OFD_SETLK	37
-#define F_OFD_SETLKW	38
+#define F_OFD_GETLK  36
+#define F_OFD_SETLK  37
+#define F_OFD_SETLKW 38
 #endif
 
 /*

From e2a45d7867c1f3b70447d245909b23cfd3f0c0e7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 19 Jul 2021 10:01:19 +0000
Subject: [PATCH 0699/1854] ci: extend lint run to run 'make indent'

Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/lint.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9b5e90368..220fb97ec 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,9 +5,21 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: registry.fedoraproject.org/fedora:latest
     steps:
-    - uses: actions/checkout@v2
     - name: Install tools
-      run: sudo apt-get install -qqy flake8 shellcheck
+      run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils
+    - uses: actions/checkout@v2
     - name: Run make lint
       run: make lint
+    - name: Run make indent
+      run: >
+        make indent &&
+        STATUS=$(git status --porcelain) &&
+        if [ ! -z "$STATUS" ]; then
+          echo "FAIL: some files are not correctly formatted.";
+          echo "$STATUS"
+          echo "FAIL: please run 'make indent'";
+          exit 1;
+        fi

From 6085c37ba25629d692f1631c821807d4b41bc07d Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Thu, 8 Apr 2021 10:44:53 +0200
Subject: [PATCH 0700/1854] lsm: change when LSM profiles are collected

Instead of collecting profiles right at thread dump time, let's collect
them all at a single point. This way, when we add support for suspending
LSMs, we know what profiles if any we need to suspend.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/cr-dump.c        | 33 +++++++++++++++----------
 criu/include/lsm.h    |  6 ++---
 criu/include/pstree.h | 12 +++++++++
 criu/lsm.c            | 57 ++++++++++++++++++++++++++++++++++---------
 4 files changed, 80 insertions(+), 28 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 54a426cc1..521701e3f 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -687,19 +687,16 @@ int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread
 	int ret;
 	ThreadCoreEntry *tc = core->thread_core;
 
-	ret = collect_lsm_profile(pid, tc->creds);
-	if (!ret) {
-		/*
-		 * XXX: It's possible to set two: 32-bit and 64-bit
-		 * futex list's heads. That makes about no sense, but
-		 * it's possible. Until we meet such application, dump
-		 * only one: native or compat futex's list pointer.
-		 */
-		if (!core_is_compat(core))
-			ret = get_task_futex_robust_list(pid, tc);
-		else
-			ret = get_task_futex_robust_list_compat(pid, tc);
-	}
+	/*
+	 * XXX: It's possible to set two: 32-bit and 64-bit
+	 * futex list's heads. That makes about no sense, but
+	 * it's possible. Until we meet such application, dump
+	 * only one: native or compat futex's list pointer.
+	 */
+	if (!core_is_compat(core))
+		ret = get_task_futex_robust_list(pid, tc);
+	else
+		ret = get_task_futex_robust_list_compat(pid, tc);
 	if (!ret)
 		ret = dump_sched_info(pid, tc);
 	if (!ret) {
@@ -748,6 +745,9 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 	core->tc->task_state = item->pid->state;
 	core->tc->exit_code = 0;
 
+	core->thread_core->creds->lsm_profile = dmpi(item)->thread_lsms[0]->profile;
+	core->thread_core->creds->lsm_sockcreate = dmpi(item)->thread_lsms[0]->sockcreate;
+
 	ret = parasite_dump_thread_leader_seized(ctl, pid, core);
 	if (ret)
 		goto err;
@@ -854,6 +854,9 @@ static int dump_task_thread(struct parasite_ctl *parasite_ctl, const struct pstr
 	}
 	pstree_insert_pid(tid);
 
+	core->thread_core->creds->lsm_profile = dmpi(item)->thread_lsms[id]->profile;
+	core->thread_core->creds->lsm_sockcreate = dmpi(item)->thread_lsms[0]->sockcreate;
+
 	img = open_image(CR_FD_CORE, O_DUMP, tid->ns[0].virt);
 	if (!img)
 		goto err;
@@ -1743,6 +1746,7 @@ static int cr_dump_finish(int ret)
 	 *    start rollback procedure and cleanup everything.
 	 */
 	if (ret || post_dump_ret || opts.final_state == TASK_ALIVE) {
+		unsuspend_lsm();
 		network_unlock();
 		delete_link_remaps();
 		clean_cr_time_mounts();
@@ -1872,6 +1876,9 @@ int cr_dump_tasks(pid_t pid)
 	/* Errors handled later in detect_pid_reuse */
 	parent_ie = get_parent_inventory();
 
+	if (collect_and_suspend_lsm() < 0)
+		goto err;
+
 	for_each_pstree_item(item) {
 		if (dump_one_task(item, parent_ie))
 			goto err;
diff --git a/criu/include/lsm.h b/criu/include/lsm.h
index 0004caafb..81676e3bf 100644
--- a/criu/include/lsm.h
+++ b/criu/include/lsm.h
@@ -17,10 +17,8 @@ extern Lsmtype host_lsm_type(void);
  */
 extern void kerndat_lsm(void);
 
-/*
- * Read the LSM profile for the pstree item
- */
-extern int collect_lsm_profile(pid_t, CredsEntry *);
+int collect_and_suspend_lsm(void);
+int unsuspend_lsm(void);
 
 /*
  * Validate that the LSM profiles can be correctly applied (must happen after
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index faf359073..c5b0fa7ea 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -51,6 +51,11 @@ static inline struct rst_info *rsti(struct pstree_item *i)
 	return (struct rst_info *)(i + 1);
 }
 
+struct thread_lsm {
+	char *profile;
+	char *sockcreate;
+};
+
 struct ns_id;
 struct dmp_info {
 	struct ns_id *netns;
@@ -58,6 +63,13 @@ struct dmp_info {
 	struct parasite_ctl *parasite_ctl;
 	struct parasite_thread_ctl **thread_ctls;
 	uint64_t *thread_sp;
+
+	/*
+	 * Although we don't support dumping different struct creds in general,
+	 * we do for threads. Let's keep track of their profiles here; a NULL
+	 * entry means there was no LSM profile for this thread.
+	 */
+	struct thread_lsm **thread_lsms;
 };
 
 static inline struct dmp_info *dmpi(const struct pstree_item *i)
diff --git a/criu/lsm.c b/criu/lsm.c
index a352f9adf..85966a191 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -250,26 +250,23 @@ Lsmtype host_lsm_type(void)
 	return kdat.lsm;
 }
 
-int collect_lsm_profile(pid_t pid, CredsEntry *ce)
+static int collect_lsm_profile(pid_t pid, struct thread_lsm *lsm)
 {
 	int ret;
 
-	ce->lsm_profile = NULL;
-	ce->lsm_sockcreate = NULL;
-
 	switch (kdat.lsm) {
 	case LSMTYPE__NO_LSM:
 		ret = 0;
 		break;
 	case LSMTYPE__APPARMOR:
-		ret = apparmor_get_label(pid, &ce->lsm_profile);
+		ret = apparmor_get_label(pid, &lsm->profile);
 		break;
 #ifdef CONFIG_HAS_SELINUX
 	case LSMTYPE__SELINUX:
-		ret = selinux_get_label(pid, &ce->lsm_profile);
+		ret = selinux_get_label(pid, &lsm->profile);
 		if (ret)
 			break;
-		ret = selinux_get_sockcreate_label(pid, &ce->lsm_sockcreate);
+		ret = selinux_get_sockcreate_label(pid, &lsm->sockcreate);
 		break;
 #endif
 	default:
@@ -278,14 +275,52 @@ int collect_lsm_profile(pid_t pid, CredsEntry *ce)
 		break;
 	}
 
-	if (ce->lsm_profile)
-		pr_info("%d has lsm profile %s\n", pid, ce->lsm_profile);
-	if (ce->lsm_sockcreate)
-		pr_info("%d has lsm sockcreate label %s\n", pid, ce->lsm_sockcreate);
+	if (lsm->profile)
+		pr_info("%d has lsm profile %s\n", pid, lsm->profile);
+	if (lsm->sockcreate)
+		pr_info("%d has lsm sockcreate label %s\n", pid, lsm->sockcreate);
 
 	return ret;
 }
 
+int collect_and_suspend_lsm(void)
+{
+	struct pstree_item *item;
+
+	for_each_pstree_item(item) {
+		struct thread_lsm **thread_lsms;
+		int i;
+
+		thread_lsms = xzalloc((item->nr_threads + 1) * sizeof(thread_lsms));
+		if (!thread_lsms)
+			return -1;
+		dmpi(item)->thread_lsms = thread_lsms;
+
+		for (i = 0; i < item->nr_threads; i++) {
+			thread_lsms[i] = xzalloc(sizeof(**thread_lsms));
+			if (!thread_lsms[i])
+				return -1;
+
+			if (collect_lsm_profile(item->threads[i].real, thread_lsms[i]) < 0)
+				return -1;
+		}
+	}
+
+	/* now, suspend the LSM; this is where code that implements something
+	 * like PTRACE_O_SUSPEND_LSM should live. */
+	switch (kdat.lsm) {
+	default:
+		pr_warn("don't know how to suspend LSM %d\n", kdat.lsm);
+	}
+
+	return 0;
+}
+
+int unsuspend_lsm(void)
+{
+	return 0;
+}
+
 // in inventory.c
 extern Lsmtype image_lsm;
 

From 0db135ac4f237f6506e597e6204632cd8a696cc8 Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Fri, 9 Apr 2021 11:36:38 +0200
Subject: [PATCH 0701/1854] util: add rm -rf function

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/include/util.h |  3 +++
 criu/util.c         | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index a8bae990e..58c70b9fe 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -284,6 +284,9 @@ int setup_tcp_server(char *type, char *addr, unsigned short *port);
 int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk);
 int setup_tcp_client(char *hostname);
 
+/* *dir should be writable and at least PATH_MAX long */
+int rm_rf(char *dir);
+
 #define LAST_PID_PATH "sys/kernel/ns_last_pid"
 #define PID_MAX_PATH  "sys/kernel/pid_max"
 
diff --git a/criu/util.c b/criu/util.c
index ed4557770..1c3c3c67b 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1611,3 +1611,43 @@ ssize_t write_all(int fd, const void *buf, size_t size)
 	}
 	return n;
 }
+
+int rm_rf(char *target)
+{
+	int offset = strlen(target);
+	DIR *dir = NULL;
+	struct dirent *de;
+	int ret = -1;
+
+	dir = opendir(target);
+	if (!dir) {
+		pr_perror("unable to open %s", target);
+		return -1;
+	}
+
+	while ((de = readdir(dir))) {
+		int n;
+
+		if (dir_dots(de))
+			continue;
+
+		n = snprintf(target + offset, PATH_MAX - offset, "/%s", de->d_name);
+		if (n < 0 || n >= PATH_MAX) {
+			pr_err("snprintf failed\n");
+			goto out;
+		}
+
+		if (de->d_type == DT_DIR && rm_rf(target))
+			goto out;
+
+		if (remove(target) < 0) {
+			pr_perror("unable to remove %s", target);
+			goto out;
+		}
+	}
+
+	ret = 0;
+out:
+	target[offset] = 0;
+	return ret;
+}

From 8d992a680ef328166ebdf6de01cf7cf514f1b77a Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Fri, 9 Apr 2021 11:48:58 +0200
Subject: [PATCH 0702/1854] lsm: support checkpoint/restore of stacked apparmor
 profiles

Support for apparmor namespaces and stacking is coming to Ubuntu kernels in
16.10, and should hopefully be upstreamed Soon (TM) :).

The basic idea is similar to how cgroups are done: we can restore the
apparmor namespace and profile blobs independently of the tasks, and then
at the end we can just set the task's label appropriately. This means the
code that moves tasks under a label stays the same, and the only new code
is the stuff that dumps and restores the policy blobs that are in the
namespace that were loaded by the container.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/Makefile.crtools        |   1 +
 criu/apparmor.c              | 541 +++++++++++++++++++++++++++++++++++
 criu/cr-dump.c               |   5 +
 criu/cr-restore.c            |   4 +
 criu/image-desc.c            |   1 +
 criu/include/image-desc.h    |   1 +
 criu/include/kerndat.h       |   1 +
 criu/include/magic.h         |   1 +
 criu/include/protobuf-desc.h |   1 +
 criu/lsm.c                   |   9 +
 criu/protobuf-desc.c         |   1 +
 images/Makefile              |   1 +
 images/apparmor.proto        |  16 ++
 images/creds.proto           |   1 +
 include/apparmor.h           |  11 +
 lib/py/images/images.py      |   1 +
 16 files changed, 596 insertions(+)
 create mode 100644 criu/apparmor.c
 create mode 100644 images/apparmor.proto
 create mode 100644 include/apparmor.h

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 624eeb0a2..50a2fa9c5 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -5,6 +5,7 @@ ldflags-y		+= -r
 obj-y			+= action-scripts.o
 obj-y			+= external.o
 obj-y			+= aio.o
+obj-y			+= apparmor.o
 obj-y			+= bfd.o
 obj-y			+= bitmap.o
 obj-y			+= cgroup.o
diff --git a/criu/apparmor.c b/criu/apparmor.c
new file mode 100644
index 000000000..d5c8b7638
--- /dev/null
+++ b/criu/apparmor.c
@@ -0,0 +1,541 @@
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <ftw.h>
+
+#include "common/config.h"
+#include "imgset.h"
+#include "pstree.h"
+#include "util.h"
+#include "string.h"
+#include "lsm.h"
+#include "cr_options.h"
+#include "kerndat.h"
+
+#include "protobuf.h"
+#include "images/inventory.pb-c.h"
+#include "images/apparmor.pb-c.h"
+
+/*
+ * Apparmor stacked profile checkpoint restore. Previously, we just saved the
+ * profile that was in use by the task, and we expected it to be present on the
+ * target host. Now with stacking, containers are able to load their own
+ * profiles, so we can't rely on this.
+ *
+ * The basic idea here is that there is some (collection) of (potentially
+ * nested) namespaces that a container uses. We don't collect everything on the
+ * host level, but we *do* collect everything inside the namespace; a container
+ * could have loaded a profile but not yet used it when we start to checkpoint.
+ *
+ * Thus, the old code that saves and restores AA profiles is still relevant, we
+ * just need to add the new code in this file to walk the namespace and dump
+ * any blobs in that AA namespace, and then restore these blobs on restore so
+ * that the profiles the old code tries to use are actualy present.
+ */
+
+static AaNamespace **namespaces = NULL;
+static int n_namespaces = 0;
+
+static AaNamespace *new_namespace(char *name, AaNamespace *parent)
+{
+	void *m;
+	AaNamespace *ret;
+
+	ret = xmalloc(sizeof(*ret));
+	if (!ret)
+		return NULL;
+	aa_namespace__init(ret);
+
+	ret->name = xstrdup(name);
+	if (!ret->name) {
+		xfree(ret);
+		return NULL;
+	}
+
+	if (parent) {
+		m = xrealloc(parent->namespaces, sizeof(*parent->namespaces) * (parent->n_namespaces + 1));
+		if (!m) {
+			xfree(ret->name);
+			xfree(ret);
+			return NULL;
+		}
+
+		parent->namespaces = m;
+		parent->namespaces[parent->n_namespaces++] = ret;
+	}
+
+	m = xrealloc(namespaces, sizeof(*namespaces) * (n_namespaces + 1));
+	if (!m) {
+		if (parent)
+			parent->n_namespaces--;
+
+		xfree(ret->name);
+		xfree(ret);
+		return NULL;
+	}
+
+	namespaces = m;
+	namespaces[n_namespaces++] = ret;
+
+	return ret;
+}
+
+static int collect_profile(char *path, int offset, char *dir, AaNamespace *ns)
+{
+	AaPolicy *cur;
+	int fd, my_offset, ret;
+	struct stat sb;
+	ssize_t n;
+	void *m;
+	FILE *f;
+
+	my_offset = snprintf(path + offset, PATH_MAX - offset, "%s/", dir);
+	if (my_offset < 0 || my_offset >= PATH_MAX - offset) {
+		pr_err("snprintf failed\n");
+		return -1;
+	}
+	my_offset += offset;
+
+	pr_info("dumping profile %s\n", path);
+
+	cur = xmalloc(sizeof(*cur));
+	if (!cur)
+		return -1;
+	aa_policy__init(cur);
+
+	strlcat(path + my_offset, "name", PATH_MAX - my_offset);
+	f = fopen(path, "r");
+	if (!f) {
+		xfree(cur);
+		pr_perror("failed to open %s", path);
+		return -1;
+	}
+
+	ret = fscanf(f, "%ms", &cur->name);
+	fclose(f);
+	if (ret != 1) {
+		xfree(cur);
+		pr_perror("couldn't scanf %s", path);
+		return -1;
+	}
+
+	strlcpy(path + my_offset, "raw_data", PATH_MAX - my_offset);
+	fd = open(path, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("failed to open aa policy %s", path);
+		goto err;
+	}
+
+	if (fstat(fd, &sb) < 0) {
+		pr_perror("failed to stat %s", path);
+		goto close;
+	}
+
+	cur->blob.len = sb.st_size;
+	cur->blob.data = xmalloc(sb.st_size);
+	if (!cur->blob.data)
+		goto close;
+
+	n = read(fd, cur->blob.data, sb.st_size);
+	if (n < 0) {
+		pr_perror("failed to read %s", path);
+		goto close;
+	}
+
+	if (n != sb.st_size) {
+		pr_err("didn't read all of %s\n", path);
+		goto close;
+	}
+
+	close(fd);
+
+	m = xrealloc(ns->policies, sizeof(*ns->policies) * (ns->n_policies + 1));
+	if (!m)
+		goto err;
+	ns->policies = m;
+	ns->policies[ns->n_policies++] = cur;
+
+	return 0;
+
+close:
+	close(fd);
+
+err:
+	xfree(cur->name);
+	xfree(cur);
+	return -1;
+}
+
+char *ns_path;
+int sort_err;
+
+static int no_dirdots(const struct dirent *de)
+{
+	return !dir_dots(de);
+}
+
+static int by_time(const struct dirent **de1, const struct dirent **de2)
+{
+	char path[PATH_MAX];
+	struct stat sb1, sb2;
+
+	snprintf(path, sizeof(path), "%s/%s", ns_path, (*de1)->d_name);
+	if (stat(path, &sb1) < 0) {
+		pr_perror("couldn't stat %s", path);
+		sort_err = errno;
+		return 0;
+	}
+
+	snprintf(path, sizeof(path), "%s/%s", ns_path, (*de2)->d_name);
+	if (stat(path, &sb2) < 0) {
+		pr_perror("couldn't state %s", path);
+		sort_err = errno;
+		return 0;
+	}
+
+	if (sb1.st_mtim.tv_sec == sb2.st_mtim.tv_sec) {
+		if (sb1.st_mtim.tv_nsec < sb2.st_mtim.tv_nsec)
+			return -1;
+		if (sb1.st_mtim.tv_nsec == sb2.st_mtim.tv_nsec)
+			return 0;
+		return 1;
+	} else {
+		if (sb1.st_mtim.tv_sec < sb2.st_mtim.tv_sec)
+			return -1;
+		if (sb1.st_mtim.tv_sec == sb2.st_mtim.tv_sec)
+			return 0;
+		return 1;
+	}
+}
+
+static int walk_namespace(char *path, size_t offset, AaNamespace *ns)
+{
+	DIR *dir = NULL;
+	struct dirent *de, **namelist = NULL;
+	int ret = -1, n_names = 0, i;
+	size_t my_offset;
+
+	/* collect all the child namespaces */
+	strcat(path, "/namespaces/");
+	my_offset = offset + 12;
+
+	dir = opendir(path);
+	if (!dir)
+		goto out;
+
+	while ((de = readdir(dir))) {
+		AaNamespace *cur;
+
+		if (dir_dots(de))
+			continue;
+
+		path[my_offset] = '\0';
+		strcat(path, de->d_name);
+
+		cur = new_namespace(de->d_name, ns);
+		if (!cur)
+			goto out;
+
+		if (walk_namespace(path, my_offset + strlen(de->d_name), cur) < 0) {
+			aa_namespace__free_unpacked(cur, NULL);
+			ns->n_namespaces--;
+			goto out;
+		}
+	}
+
+	closedir(dir);
+	dir = NULL;
+
+	/* now collect the profiles for this namespace */
+	path[offset] = '\0';
+	strcat(path, "/profiles/");
+	my_offset = offset + 10;
+
+	sort_err = 0;
+	ns_path = path;
+	n_names = scandir(path, &namelist, no_dirdots, by_time);
+	if (n_names < 0 || sort_err != 0) {
+		pr_perror("scandir failed");
+		goto out;
+	}
+
+	for (i = 0; i < n_names; i++) {
+		de = namelist[i];
+
+		path[my_offset] = 0;
+		if (collect_profile(path, my_offset, de->d_name, ns) < 0)
+			goto out;
+	}
+
+	ret = 0;
+out:
+	if (dir)
+		closedir(dir);
+
+	if (namelist) {
+		for (i = 0; i < n_names; i++)
+			xfree(namelist[i]);
+		xfree(namelist);
+	}
+
+	return ret;
+}
+
+int collect_aa_namespace(char *profile)
+{
+	char path[PATH_MAX], *namespace, *end;
+	int ret, i;
+	AaNamespace *ns;
+
+	if (!profile)
+		return 0;
+
+	namespace = strchr(profile, ':');
+	if (!namespace)
+		return 0; /* no namespace to dump */
+	namespace ++;
+
+	if (!kdat.apparmor_ns_dumping_enabled) {
+		pr_warn("Apparmor namespace present but dumping not enabled\n");
+		return 0;
+	}
+
+	/* XXX: this is not strictly correct; if something is using namespace
+	 * views, extra //s can indicate a namespace separation. However, I
+	 * think only the apparmor developers use this feature :)
+	 */
+	end = strchr(namespace, ':');
+	if (!end) {
+		pr_err("couldn't find AA namespace end in: %s\n", namespace);
+		return -1;
+	}
+
+	*end = '\0';
+
+	for (i = 0; i < n_namespaces; i++) {
+		/* did we already dump this namespace? */
+		if (!strcmp(namespaces[i]->name, namespace)) {
+			*end = ':';
+			return 0;
+		}
+	}
+
+	pr_info("dumping AA namespace %s\n", namespace);
+
+	ns = new_namespace(namespace, NULL);
+	*end = ':';
+	if (!ns)
+		return -1;
+
+	ret = snprintf(path, sizeof(path), AA_SECURITYFS_PATH "/policy/namespaces/%s", ns->name);
+	if (ret < 0 || ret >= sizeof(path)) {
+		pr_err("snprintf failed?\n");
+		goto err;
+	}
+
+	if (walk_namespace(path, ret, ns) < 0) {
+		pr_err("walking AA namespace %s failed\n", ns->name);
+		goto err;
+	}
+
+	return 0;
+
+err:
+	aa_namespace__free_unpacked(ns, NULL);
+	n_namespaces--;
+	return -1;
+}
+
+int dump_aa_namespaces(void)
+{
+	ApparmorEntry *ae = NULL;
+	int ret;
+
+	if (n_namespaces == 0)
+		return 0;
+
+	ae = xmalloc(sizeof(*ae));
+	if (!ae)
+		return -1;
+	apparmor_entry__init(ae);
+
+	ae->n_namespaces = n_namespaces;
+	ae->namespaces = namespaces;
+
+	ret = pb_write_one(img_from_set(glob_imgset, CR_FD_APPARMOR), ae, PB_APPARMOR);
+
+	apparmor_entry__free_unpacked(ae, NULL);
+	n_namespaces = -1;
+	namespaces = NULL;
+
+	return ret;
+}
+
+bool check_aa_ns_dumping(void)
+{
+	char contents[48];
+	int major, minor, ret;
+	FILE *f;
+
+	f = fopen(AA_SECURITYFS_PATH "/features/domain/stack", "r");
+	if (!f)
+		return false;
+
+	ret = fscanf(f, "%48s", contents);
+	fclose(f);
+	if (ret != 1) {
+		pr_err("scanning aa stack feature failed\n");
+		return false;
+	}
+
+	if (strcmp("yes", contents)) {
+		pr_warn("aa stack featured disabled: %s\n", contents);
+		return false;
+	}
+
+	f = fopen(AA_SECURITYFS_PATH "/features/domain/version", "r");
+	if (!f)
+		return false;
+
+	ret = fscanf(f, "%d.%d", &major, &minor);
+	fclose(f);
+	if (ret != 2) {
+		pr_err("scanning aa stack version failed\n");
+		return false;
+	}
+
+	return major >= 1 && minor >= 2;
+}
+
+static int restore_aa_namespace(AaNamespace *ns, char *path, int offset)
+{
+	pid_t pid;
+	int status;
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("fork failed");
+		return -1;
+	}
+
+	if (!pid) {
+		int i, my_offset, ret, fd;
+		char buf[1024];
+
+		ret = snprintf(buf, sizeof(buf), "changeprofile :%s:", ns->name);
+		if (ret < 0 || ret >= sizeof(buf)) {
+			pr_err("profile %s too big\n", ns->name);
+			exit(1);
+		}
+
+		my_offset = snprintf(path + offset, PATH_MAX - offset, "/namespaces/%s", ns->name);
+		if (my_offset < 0 || my_offset >= PATH_MAX - offset) {
+			pr_err("snprintf'd too many characters\n");
+			exit(1);
+		}
+
+		if (mkdir(path, 0755) < 0) {
+			if (errno == EEXIST) {
+				pr_warn("apparmor namespace %s already exists, restoring into it\n", path);
+			} else {
+				pr_perror("failed to create namespace %s", path);
+				exit(1);
+			}
+		}
+
+		fd = open_proc_rw(PROC_SELF, "attr/current");
+		if (fd < 0) {
+			pr_perror("couldn't open attr/current");
+			goto fail;
+		}
+
+		errno = 0;
+		ret = write(fd, buf, strlen(buf));
+		close(fd);
+		if (ret != strlen(buf)) {
+			pr_perror("failed to change aa namespace %s", buf);
+			goto fail;
+		}
+
+		for (i = 0; i < ns->n_namespaces; i++) {
+			if (restore_aa_namespace(ns, path, offset + my_offset) < 0)
+				goto fail;
+		}
+
+		for (i = 0; i < ns->n_policies; i++) {
+			int fd, n;
+			AaPolicy *p = ns->policies[i];
+
+			fd = open(AA_SECURITYFS_PATH "/.replace", O_WRONLY);
+			if (fd < 0) {
+				pr_perror("couldn't open apparmor load file");
+				goto fail;
+			}
+
+			n = write(fd, p->blob.data, p->blob.len);
+			close(fd);
+			if (n != p->blob.len) {
+				pr_perror("write AA policy failed");
+				goto fail;
+			}
+		}
+
+		exit(0);
+	fail:
+		rmdir(path);
+		exit(1);
+	}
+
+	if (waitpid(pid, &status, 0) < 0) {
+		pr_perror("waitpid failed");
+		return -1;
+	}
+
+	if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+		return 0;
+
+	pr_err("failed to restore aa namespace, worker exited: %d\n", status);
+	return -1;
+}
+
+int prepare_apparmor_namespaces(void)
+{
+	struct cr_img *img;
+	int ret, i;
+	ApparmorEntry *ae;
+
+	img = open_image(CR_FD_APPARMOR, O_RSTR);
+	if (!img)
+		return -1;
+
+	ret = pb_read_one_eof(img, &ae, PB_APPARMOR);
+	close_image(img);
+	if (ret <= 0)
+		return 0; /* there was no AA namespace entry */
+
+	if (!ae) {
+		pr_err("missing aa namespace entry\n");
+		return -1;
+	}
+
+	/* no real reason we couldn't do this in parallel, but in usually we
+	 * expect one namespace so there's probably not a lot to be gained.
+	 */
+	for (i = 0; i < ae->n_namespaces; i++) {
+		char path[PATH_MAX] = AA_SECURITYFS_PATH "/policy";
+
+		if (restore_aa_namespace(ae->namespaces[i], path, strlen(path)) < 0) {
+			ret = -1;
+			goto out;
+		}
+	}
+
+	ret = 0;
+out:
+	apparmor_entry__free_unpacked(ae, NULL);
+	return ret;
+}
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 521701e3f..1782d8bf6 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -83,6 +83,8 @@
 #include "timens.h"
 #include "img-streamer.h"
 #include "pidfd-store.h"
+#include "apparmor.h"
+#include "asm/dump.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
@@ -1936,6 +1938,9 @@ int cr_dump_tasks(pid_t pid)
 			goto err;
 	}
 
+	if (dump_aa_namespaces() < 0)
+		goto err;
+
 	ret = dump_cgroups();
 	if (ret)
 		goto err;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 82dbaa0dc..dec4e6097 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -78,6 +78,7 @@
 #include "memfd.h"
 #include "timens.h"
 #include "bpfmap.h"
+#include "apparmor.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
@@ -250,6 +251,9 @@ static int crtools_prepare_shared(void)
 	if (tty_prep_fds())
 		return -1;
 
+	if (prepare_apparmor_namespaces())
+		return -1;
+
 	return 0;
 }
 
diff --git a/criu/image-desc.c b/criu/image-desc.c
index 03842934f..d65d9c098 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -106,6 +106,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY(PIDNS,		"pidns-%u"),
 	FD_ENTRY_F(BPFMAP_FILE,	"bpfmap-file", O_NOBUF),
 	FD_ENTRY_F(BPFMAP_DATA,	"bpfmap-data", O_NOBUF),
+	FD_ENTRY(APPARMOR,	"apparmor"),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 384d6d07b..5045baee8 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -67,6 +67,7 @@ enum {
 	CR_FD_CGROUP,
 	CR_FD_FILE_LOCKS,
 	CR_FD_SECCOMP,
+	CR_FD_APPARMOR,
 	CR_FD_MEMFD_INODE,
 	CR_FD_BPFMAP_FILE,
 	CR_FD_BPFMAP_DATA,
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 3fb3b2492..b2f5d4305 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -50,6 +50,7 @@ struct kerndat_s {
 	bool has_tcp_half_closed;
 	bool stack_guard_gap_hidden;
 	int lsm;
+	bool apparmor_ns_dumping_enabled;
 	bool has_uffd;
 	unsigned long uffd_features;
 	bool has_thp_disable;
diff --git a/criu/include/magic.h b/criu/include/magic.h
index 50e3b6b35..22d7218e4 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -99,6 +99,7 @@
 #define PIDNS_MAGIC	     0x61157326 /* Surgut */
 #define BPFMAP_FILE_MAGIC    0x57506142 /* Alapayevsk */
 #define BPFMAP_DATA_MAGIC    0x64324033 /* Arkhangelsk */
+#define APPARMOR_MAGIC	     0x59423047 /* Nikolskoye */
 
 #define IFADDR_MAGIC	RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC	RAW_IMAGE_MAGIC
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 87f20d23a..3824de101 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -69,6 +69,7 @@ enum {
 	PB_PIDNS,
 	PB_BPFMAP_FILE,
 	PB_BPFMAP_DATA,
+	PB_APPARMOR,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/lsm.c b/criu/lsm.c
index 85966a191..6f7e6d8d2 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -13,6 +13,7 @@
 #include "cr_options.h"
 #include "lsm.h"
 #include "fdstore.h"
+#include "apparmor.h"
 
 #include "protobuf.h"
 #include "images/inventory.pb-c.h"
@@ -58,6 +59,13 @@ static int apparmor_get_label(pid_t pid, char **profile_name)
 		*profile_name = NULL;
 	}
 
+	if (*profile_name && collect_aa_namespace(*profile_name) < 0) {
+		free(*profile_name);
+		*profile_name = NULL;
+		pr_err("failed to collect AA namespace\n");
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -215,6 +223,7 @@ void kerndat_lsm(void)
 {
 	if (access(AA_SECURITYFS_PATH, F_OK) == 0) {
 		kdat.lsm = LSMTYPE__APPARMOR;
+		kdat.apparmor_ns_dumping_enabled = check_aa_ns_dumping();
 		return;
 	}
 
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index d1a11b295..ff16b9f5b 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -67,6 +67,7 @@
 #include "images/img-streamer.pb-c.h"
 #include "images/bpfmap-file.pb-c.h"
 #include "images/bpfmap-data.pb-c.h"
+#include "images/apparmor.pb-c.h"
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];
 
diff --git a/images/Makefile b/images/Makefile
index 34bc36792..2eaeb7cad 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -70,6 +70,7 @@ proto-obj-y	+= timens.o
 proto-obj-y	+= img-streamer.o
 proto-obj-y	+= bpfmap-file.o
 proto-obj-y	+= bpfmap-data.o
+proto-obj-y	+= apparmor.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/apparmor.proto b/images/apparmor.proto
new file mode 100644
index 000000000..0c84f80a6
--- /dev/null
+++ b/images/apparmor.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+
+message aa_policy {
+	required string		name	= 1;
+	required bytes		blob	= 2;
+}
+
+message aa_namespace {
+	required string		name			= 1;
+	repeated aa_policy	policies		= 2;
+	repeated aa_namespace	namespaces		= 3;
+}
+
+message apparmor_entry {
+	repeated aa_namespace	namespaces		= 1;
+}
diff --git a/images/creds.proto b/images/creds.proto
index 0007fb46d..6228f7fcb 100644
--- a/images/creds.proto
+++ b/images/creds.proto
@@ -23,4 +23,5 @@ message creds_entry {
 
 	optional string lsm_profile = 15;
 	optional string lsm_sockcreate = 16;
+	optional bytes	apparmor_data	= 17;
 }
diff --git a/include/apparmor.h b/include/apparmor.h
new file mode 100644
index 000000000..bccf928d5
--- /dev/null
+++ b/include/apparmor.h
@@ -0,0 +1,11 @@
+#ifndef __CR_APPARMOR_H__
+#define __CR_APPARMOR_H__
+
+int collect_aa_namespace(char *profile);
+int dump_aa_namespaces(void);
+
+bool check_aa_ns_dumping(void);
+
+int prepare_apparmor_namespaces(void);
+
+#endif /* __CR_APPARMOR_H__ */
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 3ab52d56a..300b1cc69 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -561,6 +561,7 @@ handlers = {
     'BPFMAP_FILE': entry_handler(pb.bpfmap_file_entry),
     'BPFMAP_DATA': entry_handler(pb.bpfmap_data_entry,
                                 bpfmap_data_extra_handler()),
+    'APPARMOR': entry_handler(pb.apparmor_entry),
 }
 
 

From 8723e3f998d1ec5f125e6600436a96f7ff9c1631 Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Fri, 9 Apr 2021 11:55:13 +0200
Subject: [PATCH 0703/1854] check: add a feature test for apparmor_stacking

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/apparmor.c    | 428 +++++++++++++++++++++++++++++++++++----------
 criu/cr-check.c    |  14 ++
 criu/cr-restore.c  |   2 -
 criu/include/lsm.h |   3 +-
 criu/lsm.c         |  14 +-
 include/apparmor.h |  10 ++
 6 files changed, 369 insertions(+), 102 deletions(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index d5c8b7638..85005ed41 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -4,6 +4,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/mman.h>
 #include <unistd.h>
 #include <ftw.h>
 
@@ -45,7 +46,7 @@ static AaNamespace *new_namespace(char *name, AaNamespace *parent)
 	void *m;
 	AaNamespace *ret;
 
-	ret = xmalloc(sizeof(*ret));
+	ret = xzalloc(sizeof(*ret));
 	if (!ret)
 		return NULL;
 	aa_namespace__init(ret);
@@ -350,6 +351,267 @@ err:
 	return -1;
 }
 
+/* An AA profile that allows everything that the parasite needs to do */
+#define PARASITE_PROFILE   \
+	("profile %s {\n"  \
+	 "	/** rwmlkix,\n" \
+	 "	unix,\n"        \
+	 "	capability,\n"  \
+	 "	signal,\n"      \
+	 "}\n")
+
+char policydir[PATH_MAX] = ".criu.temp-aa-policy.XXXXXX";
+
+static void *get_suspend_policy(char *name, off_t *len)
+{
+	char policy[1024], file[PATH_MAX], cache[PATH_MAX], clean_name[PATH_MAX];
+	void *ret = NULL;
+	int n, fd, policy_len, i;
+	struct stat sb;
+	char *cmd[] = {
+		"apparmor_parser", "-QWL", cache, file, NULL,
+	};
+
+	*len = 0;
+
+	policy_len = snprintf(policy, sizeof(policy), PARASITE_PROFILE, name);
+	if (policy_len < 0 || policy_len >= sizeof(policy)) {
+		pr_err("policy name %s too long\n", name);
+		return NULL;
+	}
+
+	/* policy names can have /s, but file paths can't */
+	for (i = 0; name[i]; i++) {
+		if (i == PATH_MAX) {
+			pr_err("name %s too long\n", name);
+			return NULL;
+		}
+
+		clean_name[i] = name[i] == '/' ? '.' : name[i];
+	}
+	clean_name[i] = 0;
+
+	n = snprintf(file, sizeof(file), "%s/%s", policydir, clean_name);
+	if (n < 0 || n >= sizeof(policy)) {
+		pr_err("policy name %s too long\n", clean_name);
+		return NULL;
+	}
+
+	n = snprintf(cache, sizeof(cache), "%s/cache", policydir);
+	if (n < 0 || n >= sizeof(policy)) {
+		pr_err("policy dir too long\n");
+		return NULL;
+	}
+
+	fd = open(file, O_CREAT | O_WRONLY, 0600);
+	if (fd < 0) {
+		pr_perror("couldn't create %s", file);
+		return NULL;
+	}
+
+	n = write(fd, policy, policy_len);
+	close(fd);
+	if (n < 0 || n != policy_len) {
+		pr_perror("couldn't write policy for %s", file);
+		return NULL;
+	}
+
+	n = cr_system(-1, -1, -1, cmd[0], cmd, 0);
+	if (n < 0 || !WIFEXITED(n) || WEXITSTATUS(n)) {
+		pr_err("apparmor parsing failed %d\n", n);
+		return NULL;
+	}
+
+	n = snprintf(file, sizeof(file), "%s/cache/%s", policydir, clean_name);
+	if (n < 0 || n >= sizeof(policy)) {
+		pr_err("policy name %s too long\n", clean_name);
+		return NULL;
+	}
+
+	fd = open(file, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("couldn't open %s", file);
+		return NULL;
+	}
+
+	if (fstat(fd, &sb) < 0) {
+		pr_perror("couldn't stat fd");
+		goto out;
+	}
+
+	ret = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+	if (ret == MAP_FAILED) {
+		pr_perror("mmap of %s failed", file);
+		goto out;
+	}
+
+	*len = sb.st_size;
+out:
+	close(fd);
+	return ret;
+}
+
+#define NEXT_AA_TOKEN(pos)                                                                               \
+	while (*pos) {                                                                                   \
+		if (*pos == '/' && *(pos + 1) && *(pos + 1) == '/' && *(pos + 2) && *(pos + 2) == '&') { \
+			pos += 3;                                                                        \
+			break;                                                                           \
+		}                                                                                        \
+		if (*pos == ':' && *(pos + 1) && *(pos + 1) == '/' && *(pos + 2) && *(pos + 2) == '/') { \
+			pos += 3;                                                                        \
+			break;                                                                           \
+		}                                                                                        \
+		pos++;                                                                                   \
+	}
+
+static int write_aa_policy(AaNamespace *ns, char *path, int offset, char *rewrite, bool suspend)
+{
+	int i, my_offset, ret;
+	char *rewrite_pos = rewrite, namespace[PATH_MAX];
+
+	if (rewrite && suspend) {
+		pr_err("requesting aa rewriting and suspension at the same time is not supported\n");
+		return -1;
+	}
+
+	if (!rewrite) {
+		strncpy(namespace, ns->name, sizeof(namespace) - 1);
+	} else {
+		NEXT_AA_TOKEN(rewrite_pos);
+
+		switch (*rewrite_pos) {
+		case ':': {
+			char tmp, *end;
+
+			end = strchr(rewrite_pos + 1, ':');
+			if (!end) {
+				pr_err("invalid namespace %s\n", rewrite_pos);
+				return -1;
+			}
+
+			tmp = *end;
+			*end = 0;
+			strlcpy(namespace, rewrite_pos + 1, sizeof(namespace));
+			*end = tmp;
+
+			break;
+		}
+		default:
+			strlcpy(namespace, ns->name, sizeof(namespace));
+			for (i = 0; i < ns->n_policies; i++) {
+				if (strcmp(ns->policies[i]->name, rewrite_pos))
+					pr_warn("binary rewriting of apparmor policies not supported right now, not renaming %s to %s\n",
+						ns->policies[i]->name, rewrite_pos);
+			}
+		}
+	}
+
+	my_offset = snprintf(path + offset, PATH_MAX - offset, "/namespaces/%s", ns->name);
+	if (my_offset < 0 || my_offset >= PATH_MAX - offset) {
+		pr_err("snprintf'd too many characters\n");
+		return -1;
+	}
+
+	if (!suspend && mkdir(path, 0755) < 0 && errno != EEXIST) {
+		pr_perror("failed to create namespace %s", path);
+		goto fail;
+	}
+
+	for (i = 0; i < ns->n_namespaces; i++) {
+		if (write_aa_policy(ns, path, offset + my_offset, rewrite_pos, suspend) < 0)
+			goto fail;
+	}
+
+	ret = snprintf(path + offset + my_offset, sizeof(path) - offset - my_offset, "/.replace");
+	if (ret < 0 || ret >= sizeof(path) - offset - my_offset) {
+		pr_err("snprintf failed\n");
+		goto fail;
+	}
+
+	for (i = 0; i < ns->n_policies; i++) {
+		AaPolicy *p = ns->policies[i];
+		void *data = p->blob.data;
+		int fd, n;
+		off_t len = p->blob.len;
+
+		fd = open(path, O_WRONLY);
+		if (fd < 0) {
+			pr_perror("couldn't open apparmor load file %s", path);
+			goto fail;
+		}
+
+		if (suspend) {
+			pr_info("suspending policy %s\n", p->name);
+			data = get_suspend_policy(p->name, &len);
+			if (!data) {
+				close(fd);
+				goto fail;
+			}
+		}
+
+		n = write(fd, data, len);
+		close(fd);
+		if (suspend && munmap(data, len) < 0) {
+			pr_perror("failed to munmap");
+			goto fail;
+		}
+
+		if (n != len) {
+			pr_perror("write AA policy %s in %s failed", p->name, namespace);
+			goto fail;
+		}
+
+		if (!suspend)
+			pr_info("wrote aa policy %s: %s %d\n", path, p->name, n);
+	}
+
+	return 0;
+
+fail:
+	if (!suspend) {
+		path[offset + my_offset] = 0;
+		rmdir(path);
+	}
+
+	pr_err("failed to write policy in AA namespace %s\n", namespace);
+	return -1;
+}
+
+static int do_suspend(bool suspend)
+{
+	int i;
+
+	for (i = 0; i < n_namespaces; i++) {
+		AaNamespace *ns = namespaces[i];
+		char path[PATH_MAX] = AA_SECURITYFS_PATH "/policy";
+
+		if (write_aa_policy(ns, path, strlen(path), opts.lsm_profile, false) < 0)
+			return -1;
+	}
+
+	return 0;
+}
+
+int suspend_aa(void)
+{
+	int ret;
+	if (!mkdtemp(policydir)) {
+		pr_perror("failed to make AA policy dir");
+		return -1;
+	}
+
+	ret = do_suspend(true);
+	if (rm_rf(policydir) < 0)
+		pr_err("failed removing policy dir %s\n", policydir);
+
+	return ret;
+}
+
+int unsuspend_aa(void)
+{
+	return do_suspend(false);
+}
+
 int dump_aa_namespaces(void)
 {
 	ApparmorEntry *ae = NULL;
@@ -411,97 +673,6 @@ bool check_aa_ns_dumping(void)
 	return major >= 1 && minor >= 2;
 }
 
-static int restore_aa_namespace(AaNamespace *ns, char *path, int offset)
-{
-	pid_t pid;
-	int status;
-
-	pid = fork();
-	if (pid < 0) {
-		pr_perror("fork failed");
-		return -1;
-	}
-
-	if (!pid) {
-		int i, my_offset, ret, fd;
-		char buf[1024];
-
-		ret = snprintf(buf, sizeof(buf), "changeprofile :%s:", ns->name);
-		if (ret < 0 || ret >= sizeof(buf)) {
-			pr_err("profile %s too big\n", ns->name);
-			exit(1);
-		}
-
-		my_offset = snprintf(path + offset, PATH_MAX - offset, "/namespaces/%s", ns->name);
-		if (my_offset < 0 || my_offset >= PATH_MAX - offset) {
-			pr_err("snprintf'd too many characters\n");
-			exit(1);
-		}
-
-		if (mkdir(path, 0755) < 0) {
-			if (errno == EEXIST) {
-				pr_warn("apparmor namespace %s already exists, restoring into it\n", path);
-			} else {
-				pr_perror("failed to create namespace %s", path);
-				exit(1);
-			}
-		}
-
-		fd = open_proc_rw(PROC_SELF, "attr/current");
-		if (fd < 0) {
-			pr_perror("couldn't open attr/current");
-			goto fail;
-		}
-
-		errno = 0;
-		ret = write(fd, buf, strlen(buf));
-		close(fd);
-		if (ret != strlen(buf)) {
-			pr_perror("failed to change aa namespace %s", buf);
-			goto fail;
-		}
-
-		for (i = 0; i < ns->n_namespaces; i++) {
-			if (restore_aa_namespace(ns, path, offset + my_offset) < 0)
-				goto fail;
-		}
-
-		for (i = 0; i < ns->n_policies; i++) {
-			int fd, n;
-			AaPolicy *p = ns->policies[i];
-
-			fd = open(AA_SECURITYFS_PATH "/.replace", O_WRONLY);
-			if (fd < 0) {
-				pr_perror("couldn't open apparmor load file");
-				goto fail;
-			}
-
-			n = write(fd, p->blob.data, p->blob.len);
-			close(fd);
-			if (n != p->blob.len) {
-				pr_perror("write AA policy failed");
-				goto fail;
-			}
-		}
-
-		exit(0);
-	fail:
-		rmdir(path);
-		exit(1);
-	}
-
-	if (waitpid(pid, &status, 0) < 0) {
-		pr_perror("waitpid failed");
-		return -1;
-	}
-
-	if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
-		return 0;
-
-	pr_err("failed to restore aa namespace, worker exited: %d\n", status);
-	return -1;
-}
-
 int prepare_apparmor_namespaces(void)
 {
 	struct cr_img *img;
@@ -528,7 +699,7 @@ int prepare_apparmor_namespaces(void)
 	for (i = 0; i < ae->n_namespaces; i++) {
 		char path[PATH_MAX] = AA_SECURITYFS_PATH "/policy";
 
-		if (restore_aa_namespace(ae->namespaces[i], path, strlen(path)) < 0) {
+		if (write_aa_policy(ae->namespaces[i], path, strlen(path), opts.lsm_profile, false) < 0) {
 			ret = -1;
 			goto out;
 		}
@@ -539,3 +710,74 @@ out:
 	apparmor_entry__free_unpacked(ae, NULL);
 	return ret;
 }
+
+int render_aa_profile(char **out, const char *cur)
+{
+	const char *pos;
+	int n_namespaces = 0, n_profiles = 0;
+	bool last_namespace = false;
+
+	/* no rewriting necessary */
+	if (!opts.lsm_supplied) {
+		*out = xsprintf("changeprofile %s", cur);
+		if (!*out)
+			return -1;
+
+		return 0;
+	}
+
+	/* user asked to re-write to an unconfined profile */
+	if (!opts.lsm_profile) {
+		*out = NULL;
+		return 0;
+	}
+
+	pos = opts.lsm_profile;
+	while (*pos) {
+		switch (*pos) {
+		case ':':
+			n_namespaces++;
+			break;
+		default:
+			n_profiles++;
+		}
+
+		NEXT_AA_TOKEN(pos);
+	}
+
+	/* special case: there is no namespacing or stacking; we can just
+	 * changeprofile to the rewritten string
+	 */
+	if (n_profiles == 1 && n_namespaces == 0) {
+		*out = xsprintf("changeprofile %s", opts.lsm_profile);
+		if (!*out)
+			return -1;
+
+		pr_info("rewrote apparmor profile from %s to %s\n", cur, *out);
+		return 0;
+	}
+
+	pos = cur;
+	while (*pos) {
+		switch (*pos) {
+		case ':':
+			n_namespaces--;
+			last_namespace = true;
+			break;
+		default:
+			n_profiles--;
+		}
+
+		NEXT_AA_TOKEN(pos);
+
+		if (n_profiles == 0 && n_namespaces == 0)
+			break;
+	}
+
+	*out = xsprintf("changeprofile %s//%s%s", opts.lsm_profile, last_namespace ? "" : "&", pos);
+	if (!*out)
+		return -1;
+
+	pr_info("rewrote apparmor profile from %s to %s\n", cur, *out);
+	return 0;
+}
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 6583b6ea0..8fab51ca4 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -45,12 +45,16 @@
 #include "tun.h"
 #include "namespaces.h"
 #include "pstree.h"
+#include "lsm.h"
+#include "apparmor.h"
 #include "cr_options.h"
 #include "libnetlink.h"
 #include "net.h"
 #include "restorer.h"
 #include "uffd.h"
 
+#include "images/inventory.pb-c.h"
+
 static char *feature_name(int (*func)(void));
 
 static int check_tty(void)
@@ -98,6 +102,14 @@ out:
 	return ret;
 }
 
+static int check_apparmor_stacking(void)
+{
+	if (!check_aa_ns_dumping())
+		return -1;
+
+	return 0;
+}
+
 static int check_map_files(void)
 {
 	int ret;
@@ -1466,6 +1478,7 @@ int cr_check(void)
 		ret |= check_newifindex();
 		ret |= check_pidfd_store();
 		ret |= check_ns_pid();
+		ret |= check_apparmor_stacking();
 	}
 
 	/*
@@ -1576,6 +1589,7 @@ static struct feature_list feature_list[] = {
 	{ "has_ipt_legacy", check_ipt_legacy },
 	{ "pidfd_store", check_pidfd_store },
 	{ "ns_pid", check_ns_pid },
+	{ "apparmor_stacking", check_apparmor_stacking },
 	{ NULL, NULL },
 };
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index dec4e6097..9d2d957f8 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3236,8 +3236,6 @@ static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned lo
 		char *rendered = NULL, *profile;
 
 		profile = ce->lsm_profile;
-		if (opts.lsm_supplied)
-			profile = opts.lsm_profile;
 
 		if (validate_lsm(profile) < 0)
 			return ERR_PTR(-EINVAL);
diff --git a/criu/include/lsm.h b/criu/include/lsm.h
index 81676e3bf..b4891b4b3 100644
--- a/criu/include/lsm.h
+++ b/criu/include/lsm.h
@@ -28,7 +28,8 @@ int validate_lsm(char *profile);
 
 /*
  * Render the profile name in the way that the LSM wants it written to
- * /proc/<pid>/attr/current.
+ * /proc/<pid>/attr/current, according to whatever is in the images and
+ * specified by --lsm-profile.
  */
 int render_lsm_profile(char *profile, char **val);
 
diff --git a/criu/lsm.c b/criu/lsm.c
index 6f7e6d8d2..f49cc976e 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -318,6 +318,10 @@ int collect_and_suspend_lsm(void)
 	/* now, suspend the LSM; this is where code that implements something
 	 * like PTRACE_O_SUSPEND_LSM should live. */
 	switch (kdat.lsm) {
+	case LSMTYPE__APPARMOR:
+		if (suspend_aa() < 0)
+			return -1;
+		break;
 	default:
 		pr_warn("don't know how to suspend LSM %d\n", kdat.lsm);
 	}
@@ -327,6 +331,9 @@ int collect_and_suspend_lsm(void)
 
 int unsuspend_lsm(void)
 {
+	if (kdat.lsm == LSMTYPE__APPARMOR && unsuspend_aa())
+		return -1;
+
 	return 0;
 }
 
@@ -357,12 +364,7 @@ int render_lsm_profile(char *profile, char **val)
 
 	switch (kdat.lsm) {
 	case LSMTYPE__APPARMOR:
-		if (strcmp(profile, "unconfined") != 0 && asprintf(val, "changeprofile %s", profile) < 0) {
-			pr_err("allocating lsm profile failed\n");
-			*val = NULL;
-			return -1;
-		}
-		break;
+		return render_aa_profile(val, profile);
 	case LSMTYPE__SELINUX:
 		if (asprintf(val, "%s", profile) < 0) {
 			*val = NULL;
diff --git a/include/apparmor.h b/include/apparmor.h
index bccf928d5..5e707bff4 100644
--- a/include/apparmor.h
+++ b/include/apparmor.h
@@ -4,8 +4,18 @@
 int collect_aa_namespace(char *profile);
 int dump_aa_namespaces(void);
 
+/*
+ * This is an operation similar to PTRACE_O_SUSPEND_SECCOMP but for apparmor,
+ * done entirely from userspace. All the namespaces to be dumped should be
+ * collected via collect_aa_namespaces() before calling this.
+ */
+int suspend_aa(void);
+int unsuspend_aa(void);
+
 bool check_aa_ns_dumping(void);
 
 int prepare_apparmor_namespaces(void);
 
+int render_aa_profile(char **out, const char *cur);
+
 #endif /* __CR_APPARMOR_H__ */

From 06b5d2fa8dc8824dd37612d63c778258853c0d05 Mon Sep 17 00:00:00 2001
From: Tycho Andersen <tycho.andersen@canonical.com>
Date: Tue, 20 Sep 2016 22:34:22 +0000
Subject: [PATCH 0704/1854] tests: add a test for apparmor_stacking

v2: use a profile that doesn't have "unix" to test the suspend feature too
v3: use "/" in the profile names to make sure this works

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 test/zdtm/static/Makefile                  |   1 +
 test/zdtm/static/apparmor_stacking.c       | 148 +++++++++++++++++++++
 test/zdtm/static/apparmor_stacking.desc    |   1 +
 test/zdtm/static/apparmor_stacking.hook    |  10 ++
 test/zdtm/static/apparmor_stacking.profile |   3 +
 5 files changed, 163 insertions(+)
 create mode 100644 test/zdtm/static/apparmor_stacking.c
 create mode 100644 test/zdtm/static/apparmor_stacking.desc
 create mode 100755 test/zdtm/static/apparmor_stacking.hook
 create mode 100644 test/zdtm/static/apparmor_stacking.profile

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 01624705e..df0a3b7e2 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -193,6 +193,7 @@ TST_NOFILE	:=				\
 		fd				\
 		fd01				\
 		apparmor				\
+		apparmor_stacking				\
 		seccomp_strict			\
 		seccomp_filter			\
 		seccomp_filter_tsync			\
diff --git a/test/zdtm/static/apparmor_stacking.c b/test/zdtm/static/apparmor_stacking.c
new file mode 100644
index 000000000..ac55a1d0e
--- /dev/null
+++ b/test/zdtm/static/apparmor_stacking.c
@@ -0,0 +1,148 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <linux/limits.h>
+#include <signal.h>
+#include "zdtmtst.h"
+
+const char *test_doc = "Check apparmor stacking is correctly restored";
+const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
+
+static int setprofile(char *to)
+{
+	char profile[1024];
+	int fd, len;
+
+	len = snprintf(profile, sizeof(profile), "changeprofile %s", to);
+	if (len < 0 || len >= sizeof(profile)) {
+		fail("bad sprintf");
+		return -1;
+	}
+
+	fd = open("/proc/self/attr/current", O_WRONLY);
+	if (fd < 0) {
+		fail("couldn't open fd");
+		return -1;
+	}
+
+	len = write(fd, profile, len);
+	close(fd);
+
+	if (len < 0) {
+		fail("couldn't write profile");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int checkprofile(pid_t pid, char *expected)
+{
+	FILE *f;
+	char path[PATH_MAX], profile[1024];
+	int len;
+
+	sprintf(path, "/proc/%d/attr/current", pid);
+
+	f = fopen(path, "r");
+	if (!f) {
+		fail("couldn't open lsm current");
+		return -1;
+	}
+
+	len = fscanf(f, "%[^ \n]s", profile);
+	fclose(f);
+	if (len != 1) {
+		fail("wrong number of items scanned %d", len);
+		return -1;
+	}
+
+	if (strcmp(profile, expected) != 0) {
+		fail("bad profile .%s. expected .%s.", profile, expected);
+		return -1;
+	}
+
+	return 0;
+}
+
+static void prepare_namespace(int sk)
+{
+	if (mkdir("/sys/kernel/security/apparmor/policy/namespaces/criu_stacking_test", 0755) && errno != EEXIST) {
+		fail("mkdir");
+		exit(1);
+	}
+
+	if (setprofile(":criu_stacking_test:") < 0)
+		exit(1);
+
+	if (system("apparmor_parser -r apparmor_stacking.profile") < 0) {
+		fail("system");
+		exit(1);
+	}
+
+	if (setprofile("criu/stacking/test") < 0)
+		exit(1);
+
+	if (write(sk, "d", 1) != 1) {
+		fail("write");
+		exit(1);
+	}
+
+	while (1)
+		sleep(1000);
+}
+
+int main(int argc, char **argv)
+{
+	pid_t pid;
+	int sk_pair[2], sk, ret = 1;
+	char c;
+
+	test_init(argc, argv);
+
+	if (socketpair(PF_LOCAL, SOCK_SEQPACKET, 0, sk_pair)) {
+		fail("socketpair");
+		return 1;
+	}
+
+	pid = fork();
+	if (pid < 0) {
+		fail("fork");
+		return 1;
+	}
+
+	if (!pid) {
+		sk = sk_pair[1];
+		close(sk_pair[0]);
+
+		prepare_namespace(sk);
+	}
+
+	sk = sk_pair[0];
+	close(sk_pair[1]);
+
+	if ((ret = read(sk, &c, 1)) != 1) {
+		pr_perror("read %d", ret);
+		goto out;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (checkprofile(pid, ":criu_stacking_test://criu/stacking/test") < 0)
+		goto out;
+
+	ret = 0;
+	pass();
+
+out:
+	kill(pid, SIGKILL);
+	rmdir("/sys/kernel/security/apparmor/policy/namespaces/criu_stacking_test");
+	return ret;
+}
diff --git a/test/zdtm/static/apparmor_stacking.desc b/test/zdtm/static/apparmor_stacking.desc
new file mode 100644
index 000000000..669320221
--- /dev/null
+++ b/test/zdtm/static/apparmor_stacking.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'flags': 'suid', 'feature': 'apparmor_stacking'}
diff --git a/test/zdtm/static/apparmor_stacking.hook b/test/zdtm/static/apparmor_stacking.hook
new file mode 100755
index 000000000..db39c2e7b
--- /dev/null
+++ b/test/zdtm/static/apparmor_stacking.hook
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+[ "$1" == "--clean" -o "$1" == "--pre-restore" ] || exit 0
+
+dir="/sys/kernel/security/apparmor/policy/namespaces/criu_stacking_test"
+
+echo "Cleaning $dir"
+if [ -d $dir ]; then
+  rmdir $dir
+fi
diff --git a/test/zdtm/static/apparmor_stacking.profile b/test/zdtm/static/apparmor_stacking.profile
new file mode 100644
index 000000000..4b499982f
--- /dev/null
+++ b/test/zdtm/static/apparmor_stacking.profile
@@ -0,0 +1,3 @@
+# vim:syntax=apparmor
+
+profile criu/stacking/test {}

From ea1c891476f592d17e39dd10a85b67e05dcb63b0 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 16 Jun 2021 10:50:41 +0200
Subject: [PATCH 0705/1854] lsm: handle SELinux LSM correctly

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/lsm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/lsm.c b/criu/lsm.c
index f49cc976e..35a3d8ddb 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -322,6 +322,8 @@ int collect_and_suspend_lsm(void)
 		if (suspend_aa() < 0)
 			return -1;
 		break;
+	case LSMTYPE__SELINUX:
+		break;
 	default:
 		pr_warn("don't know how to suspend LSM %d\n", kdat.lsm);
 	}

From dc4c3cd48bf8169584bbc8b606ed0812d1dabf93 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 16 Jun 2021 15:03:35 +0200
Subject: [PATCH 0706/1854] apparmor: actually enable suspend for AppArmor

The original patches didn't pass down the "suspend" boolean into
write_aa_policy() and so suspend never really happened. Pass it down.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/apparmor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index 85005ed41..8c999b3f5 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -585,7 +585,7 @@ static int do_suspend(bool suspend)
 		AaNamespace *ns = namespaces[i];
 		char path[PATH_MAX] = AA_SECURITYFS_PATH "/policy";
 
-		if (write_aa_policy(ns, path, strlen(path), opts.lsm_profile, false) < 0)
+		if (write_aa_policy(ns, path, strlen(path), opts.lsm_profile, suspend) < 0)
 			return -1;
 	}
 

From 9422383b6bac87f09686dbadbf90633e14513e3e Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 16 Jun 2021 15:04:53 +0200
Subject: [PATCH 0707/1854] zdtm/apparmor_stacking: don't include optional
 AppArmor namespace separator

AppArmor namespaces are officially colon-separated. The double-slash
syntax is just convenience:

"The trailing : separates the namespace name from the profile name and
the optional / and // separators are provided as a convenience for those
familiar with ssh and protocol urls." (see [1])

[1]: https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorNamespaces
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 test/zdtm/static/apparmor_stacking.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/apparmor_stacking.c b/test/zdtm/static/apparmor_stacking.c
index ac55a1d0e..76de8b8b4 100644
--- a/test/zdtm/static/apparmor_stacking.c
+++ b/test/zdtm/static/apparmor_stacking.c
@@ -135,7 +135,7 @@ int main(int argc, char **argv)
 	test_daemon();
 	test_waitsig();
 
-	if (checkprofile(pid, ":criu_stacking_test://criu/stacking/test") < 0)
+	if (checkprofile(pid, ":criu_stacking_test:criu/stacking/test") < 0)
 		goto out;
 
 	ret = 0;

From 5dc373385de37d67d5c4063fb7404741eb963e42 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 16 Jun 2021 14:41:45 +0200
Subject: [PATCH 0708/1854] util: add run_command()

Make it easy to run commands and capture the output in a user provided
buffer.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
 criu/apparmor.c     |  39 +++++++++--
 criu/include/util.h |   2 +
 criu/util.c         | 164 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 200 insertions(+), 5 deletions(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index 8c999b3f5..328fc606b 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -361,6 +361,28 @@ err:
 	 "}\n")
 
 char policydir[PATH_MAX] = ".criu.temp-aa-policy.XXXXXX";
+char cachedir[PATH_MAX];
+
+struct apparmor_parser_args {
+	char *cache;
+	char *file;
+};
+
+static int apparmor_parser_exec(void *data)
+{
+	struct apparmor_parser_args *args = data;
+
+	execlp("apparmor_parser", "apparmor_parser", "-QWL", args->cache, args->file, NULL);
+
+	return -1;
+}
+
+static int apparmor_cache_exec(void *data)
+{
+	execlp("apparmor_parser", "apparmor_parser", "--cache-loc", "/", "--print-cache-dir", (char *)NULL);
+
+	return -1;
+}
 
 static void *get_suspend_policy(char *name, off_t *len)
 {
@@ -368,8 +390,9 @@ static void *get_suspend_policy(char *name, off_t *len)
 	void *ret = NULL;
 	int n, fd, policy_len, i;
 	struct stat sb;
-	char *cmd[] = {
-		"apparmor_parser", "-QWL", cache, file, NULL,
+	struct apparmor_parser_args args = {
+		.cache = cache,
+		.file = file,
 	};
 
 	*len = 0;
@@ -416,13 +439,19 @@ static void *get_suspend_policy(char *name, off_t *len)
 		return NULL;
 	}
 
-	n = cr_system(-1, -1, -1, cmd[0], cmd, 0);
-	if (n < 0 || !WIFEXITED(n) || WEXITSTATUS(n)) {
+	n = run_command(cachedir, sizeof(cachedir), apparmor_cache_exec, NULL);
+	if (n < 0) {
 		pr_err("apparmor parsing failed %d\n", n);
 		return NULL;
 	}
 
-	n = snprintf(file, sizeof(file), "%s/cache/%s", policydir, clean_name);
+	n = run_command(NULL, 0, apparmor_parser_exec, &args);
+	if (n < 0) {
+		pr_err("apparmor parsing failed %d\n", n);
+		return NULL;
+	}
+
+	n = snprintf(file, sizeof(file), "%s/cache/%s/%s", policydir, cachedir, clean_name);
 	if (n < 0 || n >= sizeof(policy)) {
 		pr_err("policy name %s too long\n", clean_name);
 		return NULL;
diff --git a/criu/include/util.h b/criu/include/util.h
index 58c70b9fe..a2dac2233 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -391,4 +391,6 @@ static inline void cleanup_freep(void *p)
 	free(*pp);
 }
 
+extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args);
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/util.c b/criu/util.c
index 1c3c3c67b..06124c220 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -43,6 +43,7 @@
 #include "cr-service.h"
 #include "files.h"
 #include "pstree.h"
+#include "sched.h"
 
 #include "cr-errno.h"
 #include "action-scripts.h"
@@ -1651,3 +1652,166 @@ out:
 	target[offset] = 0;
 	return ret;
 }
+
+__attribute__((returns_twice)) static pid_t raw_legacy_clone(unsigned long flags, int *pidfd)
+{
+#if defined(__s390x__) || defined(__s390__) || defined(__CRIS__)
+	/* On s390/s390x and cris the order of the first and second arguments
+	 * of the system call is reversed.
+	 */
+	return syscall(__NR_clone, NULL, flags | SIGCHLD, pidfd);
+#elif defined(__sparc__) && defined(__arch64__)
+	{
+		/*
+		 * sparc64 always returns the other process id in %o0, and a
+		 * boolean flag whether this is the child or the parent in %o1.
+		 * Inline assembly is needed to get the flag returned in %o1.
+		 */
+		register long g1 asm("g1") = __NR_clone;
+		register long o0 asm("o0") = flags | SIGCHLD;
+		register long o1 asm("o1") = 0; /* is parent/child indicator */
+		register long o2 asm("o2") = (unsigned long)pidfd;
+		long is_error, retval, in_child;
+		pid_t child_pid;
+
+		asm volatile(
+#if defined(__arch64__)
+			"t 0x6d\n\t" /* 64-bit trap */
+#else
+			"t 0x10\n\t" /* 32-bit trap */
+#endif
+			/*
+		     * catch errors: On sparc, the carry bit (csr) in the
+		     * processor status register (psr) is used instead of a
+		     * full register.
+		     */
+			"addx %%g0, 0, %%g1"
+			: "=r"(g1), "=r"(o0), "=r"(o1), "=r"(o2) /* outputs */
+			: "r"(g1), "r"(o0), "r"(o1), "r"(o2) /* inputs */
+			: "%cc"); /* clobbers */
+
+		is_error = g1;
+		retval = o0;
+		in_child = o1;
+
+		if (is_error) {
+			errno = retval;
+			return -1;
+		}
+
+		if (in_child)
+			return 0;
+
+		child_pid = retval;
+		return child_pid;
+	}
+#elif defined(__ia64__)
+	/* On ia64 the stack and stack size are passed as separate arguments. */
+	return syscall(__NR_clone, flags | SIGCHLD, NULL, 0, pidfd);
+#else
+	return syscall(__NR_clone, flags | SIGCHLD, NULL, pidfd);
+#endif
+}
+
+__attribute__((returns_twice)) static pid_t raw_clone(unsigned long flags, int *pidfd)
+{
+	pid_t pid;
+	struct _clone_args args = {
+		.flags = flags,
+		.pidfd = ptr_to_u64(pidfd),
+	};
+
+	if (flags & (CLONE_VM | CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | CLONE_SETTLS))
+		return -EINVAL;
+
+	/* On CLONE_PARENT we inherit the parent's exit signal. */
+	if (!(flags & CLONE_PARENT))
+		args.exit_signal = SIGCHLD;
+
+	pid = syscall(__NR_clone3, &args, sizeof(args));
+	if (pid < 0 && errno == ENOSYS)
+		return raw_legacy_clone(flags, pidfd);
+
+	return pid;
+}
+
+static int wait_for_pid(pid_t pid)
+{
+	int status, ret;
+
+again:
+	ret = waitpid(pid, &status, 0);
+	if (ret == -1) {
+		if (errno == EINTR)
+			goto again;
+
+		return -1;
+	}
+
+	if (ret != pid)
+		goto again;
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+		return -1;
+
+	return 0;
+}
+
+int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args)
+{
+	pid_t child;
+	int ret, fret, pipefd[2];
+	ssize_t bytes;
+
+	/* Make sure our callers do not receive uninitialized memory. */
+	if (buf_size > 0 && buf)
+		buf[0] = '\0';
+
+	if (pipe(pipefd) < 0)
+		return -1;
+
+	child = raw_clone(0, NULL);
+	if (child < 0) {
+		close(pipefd[0]);
+		close(pipefd[1]);
+		return -1;
+	}
+
+	if (child == 0) {
+		/* Close the read-end of the pipe. */
+		close(pipefd[0]);
+
+		/* Redirect std{err,out} to write-end of the
+		 * pipe.
+		 */
+		ret = dup2(pipefd[1], STDOUT_FILENO);
+		if (ret >= 0)
+			ret = dup2(pipefd[1], STDERR_FILENO);
+
+		/* Close the write-end of the pipe. */
+		close(pipefd[1]);
+
+		if (ret < 0)
+			_exit(EXIT_FAILURE);
+
+		/* Does not return. */
+		child_fn(args);
+		_exit(EXIT_FAILURE);
+	}
+
+	/* close the write-end of the pipe */
+	close(pipefd[1]);
+
+	if (buf && buf_size > 0) {
+		bytes = read_all(pipefd[0], buf, buf_size - 1);
+		if (bytes > 0)
+			buf[bytes - 1] = '\0';
+	}
+
+	fret = wait_for_pid(child);
+
+	/* close the read-end of the pipe */
+	close(pipefd[0]);
+
+	return fret;
+}

From 78eb0dabf909615d3471c4c2b5f4306c647ed840 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 8 Aug 2021 12:41:13 -0700
Subject: [PATCH 0709/1854] dump: suspend/resume lsm on pre-dump

Otherwise, criu pre-dump can fail with errors like this:
lib/infect.c:650: Unable to connect a transport socket: Permission denied'

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dump.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 1782d8bf6..940f62246 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1565,6 +1565,9 @@ static int cr_pre_dump_finish(int status)
 	}
 
 err:
+	if (unsuspend_lsm())
+		ret = -1;
+
 	if (disconnect_from_page_server())
 		ret = -1;
 
@@ -1642,6 +1645,9 @@ int cr_pre_dump_tasks(pid_t pid)
 	if (collect_namespaces(false) < 0)
 		goto err;
 
+	if (collect_and_suspend_lsm() < 0)
+		goto err;
+
 	/* Errors handled later in detect_pid_reuse */
 	parent_ie = get_parent_inventory();
 

From e936a0f8ad6c905fc0eedd4d56de2925963102ee Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 30 Jul 2021 07:24:13 +0100
Subject: [PATCH 0710/1854] docker-test: refactor test scenario

The following error occurs when creating a checkpoint of
a container immediately after the container has been restored
from another checkpoint.

Error response from daemon: Cannot checkpoint container cr: content
sha256:12c69b7a9d25695dd5f9d37d4e858e2f7c3f9da738ccf86f8d3042f6973af1df:
already exists

In this patch we add a healthcheck to the test container and update the
test to perform a checkpoint only when the container is in a 'healthy'
state. In addition, this patch adds a scenario to test the
checkpoint/restore of multiple containers.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 80 +++++++++++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 15 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index c1baf9eb5..d4b11bd55 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -51,21 +51,44 @@ docker info
 
 criu --version
 
-# shellcheck disable=SC2016
-docker run --tmpfs /tmp --tmpfs /run --read-only --security-opt seccomp=unconfined --name cr -d alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
+run_container () {
+	docker run \
+		--tmpfs /tmp \
+		--tmpfs /run \
+		--read-only \
+		--name cr \
+		--health-cmd='sleep 1' \
+		--health-interval=1s \
+		-d \
+		alpine \
+		/bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
+}
 
-sleep 1
-for i in $(seq 50); do
-	# docker start returns 0 silently if a container is already started
-	# docker checkpoint doesn't wait when docker updates a container state
-	# Due to both these points, we need to sleep after docker checkpoint to
-	# avoid races with docker start.
-	docker exec cr ps axf &&
-	docker checkpoint create cr checkpoint"$i" &&
-	sleep 1 &&
-	docker ps &&
-	(docker exec cr true && exit 1 || exit 0) &&
-	docker start --checkpoint checkpoint"$i" cr 2>&1 | tee log || {
+wait_running () {
+	until [ "$(docker inspect -f '{{.State.Running}}' cr)" = "true" ]; do
+		sleep 1;
+	done;
+}
+
+wait_healthy () {
+	until [ "$(docker inspect -f '{{.State.Health.Status}}' cr)" = "healthy" ]; do
+		sleep 1;
+	done;
+}
+
+checkpoint_container () {
+	CHECKPOINT_NAME=$1
+
+	docker checkpoint create cr "$CHECKPOINT_NAME" &&
+	(docker exec cr true >> /dev/null 2>&1 && exit 1 || exit 0) &&
+	# wait for container to stop
+	docker wait cr
+}
+
+restore_container () {
+	CHECKPOINT_NAME=$1
+
+	docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log || {
 	cat "$(grep log 'log file:' | sed 's/log file:\s*//')" || true
 		docker logs cr || true
 		cat $CRIU_LOG || true
@@ -73,7 +96,34 @@ for i in $(seq 50); do
 		docker ps
 		exit 1
 	}
+}
+
+# Scenario: Create multiple containers and checkpoint and restore them once
+for i in $(seq 10); do
+	run_container
+	wait_running
+
 	docker ps
-	sleep 1
+	checkpoint_container checkpoint
+
+	docker ps
+	restore_container checkpoint
+
+	docker ps
+	docker rm -f cr
 done
 
+# Scenario: Create container and checkpoint and restore it multiple times
+run_container
+wait_running
+
+for i in $(seq 5); do
+	docker ps
+	checkpoint_container checkpoint"${i}"
+
+	docker ps
+	restore_container checkpoint"${i}"
+
+	# Wait for healthy state before creating another checkpoint
+	wait_healthy
+done

From dd0e66149f08541ca4c0403c37007c9b37819752 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 9 Aug 2021 08:51:12 +0000
Subject: [PATCH 0711/1854] ci: fix 'crit.sh: 3: source: not found'

Jenkins test runs are failing with:

 ./test/jenkins/run_ct ./test/jenkins/crit.sh
 ./test/jenkins/crit.sh: 3: source: not found

Switch to bash which has 'source'.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/jenkins/_run_ct | 2 +-
 test/jenkins/run_ct  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jenkins/_run_ct b/test/jenkins/_run_ct
index 88b5b6cb4..689c6008d 100755
--- a/test/jenkins/_run_ct
+++ b/test/jenkins/_run_ct
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 mount --make-rslave /
diff --git a/test/jenkins/run_ct b/test/jenkins/run_ct
index 5992b2ee5..930a1c3c3 100755
--- a/test/jenkins/run_ct
+++ b/test/jenkins/run_ct
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 
 unshare --mount --pid --fork -- $(readlink -f `dirname $0`/_run_ct) "$@"

From 90e175d52f5a91c752a906c57b065b66f7060e9e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 9 Aug 2021 14:42:36 +0300
Subject: [PATCH 0712/1854] zdtm/pthread_timers: make sure glibc allocated
 SIGEV_THREAD's stack

On Virtuozzo7 jenkins we see a fail of criu-dev zdtm:

  ===================== Run zdtm/static/pthread_timers in ns =====================
  Start test
  ./pthread_timers --pidfile=pthread_timers.pid --outfile=pthread_timers.out
  Run criu dump
  =[log]=> dump/zdtm/static/pthread_timers/112/1/dump.log
  ------------------------ grep Error ------------------------
  (00.004817) netlink: Collect netlink sock 0x1cad6e21
  (00.004821) netlink: Collect netlink sock 0x1cad6e22
  (00.004831) Collecting pidns 9/112
  (00.004886) No parent images directory provided
  (00.004903) Warn  (criu/lsm.c:328): don't know how to suspend LSM 0
  ------------------------ ERROR OVER ------------------------
  Run criu restore
  4: Old maps lost: set([])
  4: New maps appeared: set([u'7fe4c54ca000-7fe4c54cb000 ---p', u'7fe4c0000000-7fe4c0021000 rw-p', u'7fe4c0021000-7fe4c4000000 ---p', u'7fe4c54cb000-7fe4c5ccb000 rw-p'])
  ############# Test zdtm/static/pthread_timers FAIL at maps compare #############

https://ci.openvz.org/job/CRIU/job/CRIU-virtuozzo/job/criu-dev/8032/consoleFull

First thing to mention is that this is not related to criu. I can manage
to reproduce it with "--nocr", problem is that some mapping appears a
bit later when we do pre-cr get_visible_state().

By debugging SIGEV_THREAD thread with gdb I can see that addresses from
this unexpectedly appearing mapping are used by glibc here as "struct
pthread *pd":

 clone()
  start_thread()
   timer_helper_thread()
    __pthread_create_2_1()

So the mapping looks allocated by allocate_stack(), and it is only
gets done after first timer trigger (we have glibc-2.17 on vz7):

https://github.com/bminor/glibc/blob/release/2.17/master/nptl/sysdeps/unix/sysv/linux/timer_routines.c#L92

So let's wait at least 1 timer trigger so that memory outfit of the test
become permanent and our check_visible_state zdtm check would not be
false negative.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/pthread_timers.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/zdtm/static/pthread_timers.c b/test/zdtm/static/pthread_timers.c
index ddf41074d..5246a985f 100644
--- a/test/zdtm/static/pthread_timers.c
+++ b/test/zdtm/static/pthread_timers.c
@@ -54,6 +54,12 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
+	/* Read one event to make sure glibc allocated SIGEV_THREAD's stack */
+	if (read(efd, &val, sizeof(val)) != sizeof(val)) {
+		pr_perror("read");
+		return 1;
+	}
+
 	test_daemon();
 	test_waitsig();
 

From 960f26f90744e2a7eab45c723df7fd2001f7abd4 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 9 Aug 2021 09:10:00 +0000
Subject: [PATCH 0713/1854] files-reg: do not print a warning if a file has no
 build_id

On systems where there is no build_id we get a warning for each run

 Warn  (criu/files-reg.c:1458): Couldn't find the build-id note for file with fd 15

Change the log level to debug for this message as the file just does not have
a build_id and printing a warning clutters the CI logs.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/files-reg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index b4d6f6f9a..ee54d1d7d 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1365,7 +1365,7 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id, co
 	}
 
 	if (!note_header) {
-		pr_warn("Couldn't find the build-id note for file with fd %d\n", fd);
+		pr_debug("Couldn't find the build-id note for file with fd %d\n", fd);
 		return -1;
 	}
 
@@ -1455,7 +1455,7 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id, co
 	}
 
 	if (!note_header) {
-		pr_warn("Couldn't find the build-id note for file with fd %d\n", fd);
+		pr_debug("Couldn't find the build-id note for file with fd %d\n", fd);
 		return -1;
 	}
 

From 399a53a43f6fc29be1dc19f19967ac6c25918fca Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 9 Aug 2021 08:46:22 +0000
Subject: [PATCH 0714/1854] lsm: do not print a warning if no LSM has been
 detected

Without any LSM detected CRIU would print a warning for every run:

 Warn  (criu/lsm.c:328): don't know how to suspend LSM 0

Which clutters up the CI logs.

Change the message to a debug message.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/lsm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/lsm.c b/criu/lsm.c
index 35a3d8ddb..d1b73cc79 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -324,8 +324,10 @@ int collect_and_suspend_lsm(void)
 		break;
 	case LSMTYPE__SELINUX:
 		break;
+	case LSMTYPE__NO_LSM:
+		break;
 	default:
-		pr_warn("don't know how to suspend LSM %d\n", kdat.lsm);
+		pr_debug("don't know how to suspend LSM %d\n", kdat.lsm);
 	}
 
 	return 0;

From 546a6dfd0e929991e6136c07c489213916db8fa4 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 26 Jul 2021 05:38:17 +0300
Subject: [PATCH 0715/1854] configs: fix used after free cases

We have some code written with the assumption that argv is never
destroyed, but when we handle configs, we construct an argv-like array
for each config, parse it and release it.

I am still not sure that we need to release memory of per-config argv
arrays... The current scheme is going to be a source of used-after-free
bugs. When we will add the non-privileged mode, all these bugs will be
serious security issues.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/action-scripts.c     |  8 ++++++--
 criu/cgroup.c             | 14 ++++++++++++--
 criu/config.c             |  1 -
 criu/external.c           | 22 +++++++++++++---------
 criu/filesystems.c        |  6 ++++--
 criu/include/cr_options.h |  4 +++-
 criu/namespaces.c         |  8 +++++++-
 7 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index cc0118353..1ce6d9c10 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -147,9 +147,13 @@ int add_script(char *path)
 
 	script = xmalloc(sizeof(struct script));
 	if (script == NULL)
-		return 1;
+		return -1;
 
-	script->path = path;
+	script->path = xstrdup(path);
+	if (!script->path) {
+		xfree(script);
+		return -1;
+	}
 	list_add(&script->node, &scripts);
 
 	return 0;
diff --git a/criu/cgroup.c b/criu/cgroup.c
index 73461d6a0..ccac37fcc 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1994,10 +1994,20 @@ int new_cg_root_add(char *controller, char *newroot)
 	if (!o)
 		return -1;
 
-	o->controller = controller;
-	o->newroot = newroot;
+	o->controller = xstrdup(controller);
+	if (!o->controller)
+		goto err_ctrl;
+	o->newroot = xstrdup(newroot);
+	if (!o->newroot)
+		goto err_newroot;
 	list_add(&o->node, &opts.new_cgroup_roots);
+
 	return 0;
+err_newroot:
+	xfree(o->controller);
+err_ctrl:
+	xfree(o);
+	return -1;
 }
 
 struct ns_desc cgroup_ns_desc = NS_DESC_ENTRY(CLONE_NEWCGROUP, "cgroup");
diff --git a/criu/config.c b/criu/config.c
index 4561c3d70..4e332d546 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -854,7 +854,6 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 			return 1;
 		case 'L':
 			SET_CHAR_OPTS(libdir, optarg);
-			opts.libdir = optarg;
 			break;
 		case 1059:
 			*has_exec_cmd = true;
diff --git a/criu/external.c b/criu/external.c
index 96e676849..bbbcd17cb 100644
--- a/criu/external.c
+++ b/criu/external.c
@@ -12,24 +12,28 @@ int add_external(char *key)
 {
 	struct external *ext;
 
+	if (strstartswith(key, "mnt[]"))
+		return ext_mount_parse_auto(key + 5);
+
 	ext = xmalloc(sizeof(*ext));
 	if (!ext)
 		return -1;
-	ext->id = key;
 
-	if (strstartswith(key, "macvlan") && macvlan_ext_add(ext) < 0) {
-		xfree(ext);
-		return -1;
-	}
+	ext->id = xstrdup(key);
+	if (!ext->id)
+		goto err_id;
 
-	if (strstartswith(key, "mnt[]")) {
-		xfree(ext);
-		return ext_mount_parse_auto(key + 5);
-	}
+	if (strstartswith(key, "macvlan") && macvlan_ext_add(ext) < 0)
+		goto err;
 
 	list_add(&ext->node, &opts.external);
 
 	return 0;
+err:
+	xfree(ext->id);
+err_id:
+	xfree(ext);
+	return -1;
 }
 
 bool external_lookup_id(char *id)
diff --git a/criu/filesystems.c b/criu/filesystems.c
index ee766a2f4..3e0ec2eb3 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -829,9 +829,11 @@ bool add_fsname_auto(const char *names)
 
 	if (css_contains(names, fsauto_all))
 		fsauto_names = fsauto_all;
-	else if (!old)
+	else if (!old) {
 		fsauto_names = xstrdup(names);
-	else {
+		if (!fsauto_names)
+			abort();
+	} else {
 		if (asprintf(&fsauto_names, "%s,%s", old, names) < 0)
 			fsauto_names = NULL;
 	}
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 6836e8114..d46049cc9 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -18,7 +18,9 @@
 #define SET_CHAR_OPTS(__dest, __src)              \
 	do {                                      \
 		char *__src_dup = xstrdup(__src); \
-		free(opts.__dest);                \
+		if (!__src_dup)                   \
+			abort();                  \
+		xfree(opts.__dest);               \
 		opts.__dest = __src_dup;          \
 	} while (0)
 
diff --git a/criu/namespaces.c b/criu/namespaces.c
index b1a15dde8..92e0ed31a 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -147,7 +147,12 @@ int join_ns_add(const char *type, char *ns_file, char *extra_opts)
 	if (!jn)
 		return -1;
 
-	jn->ns_file = ns_file;
+	jn->ns_file = xstrdup(ns_file);
+	if (!jn->ns_file) {
+		xfree(jn);
+		return -1;
+	}
+
 	if (!strncmp(type, "net", 4)) {
 		jn->nd = &net_ns_desc;
 		join_ns_flags |= CLONE_NEWNET;
@@ -182,6 +187,7 @@ int join_ns_add(const char *type, char *ns_file, char *extra_opts)
 	pr_info("Added %s:%s join namespace\n", type, ns_file);
 	return 0;
 err:
+	xfree(jn->ns_file);
 	xfree(jn);
 	return -1;
 }

From 03cdbc4c025fc67c84ee393245a4ef8ba7dad22b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 14 Aug 2021 20:43:14 +0300
Subject: [PATCH 0716/1854] criu/config: fix use-after-free in parse_join_ns

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/config.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 4e332d546..a851f69df 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -548,8 +548,13 @@ static size_t parse_size(char *optarg)
 static int parse_join_ns(const char *ptr)
 {
 	char *aux, *ns_file, *extra_opts = NULL;
+	char *ns;
 
-	aux = strchr(ptr, ':');
+	ns = xstrdup(ptr);
+	if (ns == NULL)
+		return -1;
+
+	aux = strchr(ns, ':');
 	if (aux == NULL)
 		return -1;
 	*aux = '\0';
@@ -562,7 +567,7 @@ static int parse_join_ns(const char *ptr)
 	} else {
 		extra_opts = NULL;
 	}
-	if (join_ns_add(ptr, ns_file, extra_opts))
+	if (join_ns_add(ns, ns_file, extra_opts))
 		return -1;
 
 	return 0;

From cf2b67375a61cba26638a30be1d566d044d359de Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 14 Aug 2021 21:00:05 +0300
Subject: [PATCH 0717/1854] workflows/lint: show changes

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 220fb97ec..50b241e9f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -20,6 +20,7 @@ jobs:
         if [ ! -z "$STATUS" ]; then
           echo "FAIL: some files are not correctly formatted.";
           echo "$STATUS"
+          git diff
           echo "FAIL: please run 'make indent'";
           exit 1;
         fi

From ef7af1dd15e51e77bffc6904957b4a7c748096f8 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 14 Aug 2021 21:08:25 +0300
Subject: [PATCH 0718/1854] Run 'make indent' on criu/include/plugin.h

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/plugin.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/criu/include/plugin.h b/criu/include/plugin.h
index bbb3eb858..a1796b641 100644
--- a/criu/include/plugin.h
+++ b/criu/include/plugin.h
@@ -24,22 +24,22 @@ typedef struct {
 	struct list_head link[CR_PLUGIN_HOOK__MAX];
 } plugin_desc_t;
 
-#define run_plugins(__hook, ...)                                                                          \
-	({                                                                                                \
-		plugin_desc_t *this;                                                                      \
-		int __ret = -ENOTSUP;                                                                     \
-                                                                                                          \
-		list_for_each_entry(this, &cr_plugin_ctl.hook_chain[CR_PLUGIN_HOOK__##__hook],            \
-				    link[CR_PLUGIN_HOOK__##__hook]) {                                     \
-			pr_debug("plugin: `%s' hook %u -> %p\n", this->d->name, CR_PLUGIN_HOOK__##__hook, \
-				 this->d->hooks[CR_PLUGIN_HOOK__##__hook]);                               \
-			__ret = ((CR_PLUGIN_HOOK__##__hook##_t *)this->d                                  \
-					 ->hooks[CR_PLUGIN_HOOK__##__hook])(__VA_ARGS__);                 \
-			if (__ret == -ENOTSUP)                                                            \
-				continue;                                                                 \
-			break;                                                                            \
-		}                                                                                         \
-		__ret;                                                                                    \
+#define run_plugins(__hook, ...)                                                                            \
+	({                                                                                                  \
+		plugin_desc_t *this;                                                                        \
+		int __ret = -ENOTSUP;                                                                       \
+                                                                                                            \
+		list_for_each_entry(this, &cr_plugin_ctl.hook_chain[CR_PLUGIN_HOOK__##__hook],              \
+				    link[CR_PLUGIN_HOOK__##__hook]) {                                       \
+			pr_debug("plugin: `%s' hook %u -> %p\n", this->d->name, CR_PLUGIN_HOOK__##__hook,   \
+				 this->d->hooks[CR_PLUGIN_HOOK__##__hook]);                                 \
+			__ret = ((CR_PLUGIN_HOOK__##__hook##_t *)this->d->hooks[CR_PLUGIN_HOOK__##__hook])( \
+				__VA_ARGS__);                                                               \
+			if (__ret == -ENOTSUP)                                                              \
+				continue;                                                                   \
+			break;                                                                              \
+		}                                                                                           \
+		__ret;                                                                                      \
 	})
 
 #endif

From 2e30db5c3d467b57c8a0343bdd66e0c871bd74c7 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 9 Jul 2021 14:16:52 +0200
Subject: [PATCH 0719/1854] criu: add --network-lock option to allow nftables
 alternative

This adds the option to choose the networking locking method.

CRIU currently uses iptables-restore cli for network locking/unlocking
but nftables support will be added later.

There have been reports from users that iptables-restore fails in some
way and an nftables based approach using libnftables could avoid this
external dependency.

v2: remove dependency details in man page for --network-lock.
v3: remove --network-lock from restore section in docs because it is
    automatically detected from the inventory image now.
v4: add message that --network-lock will be ignored during restore
    and value from dump will be used.
v5: run make indent

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 Documentation/criu.txt    | 13 +++++++++++++
 criu/config.c             | 19 +++++++++++++++++++
 criu/crtools.c            |  3 +++
 criu/include/cr_options.h | 11 +++++++++++
 4 files changed, 46 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 037257190..690f61e14 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -420,6 +420,19 @@ The 'mode' may be one of the following:
                 build-ID cannot be obtained, 'chksm-first' method will be
                 used. This is the default if mode is unspecified.
 
+*--network-lock* ['mode']::
+    Set the method to be used for network locking/unlocking. Locking is done
+    to ensure that tcp packets are dropped between dump and restore. This is
+    done to avoid the kernel sending RST when a packet arrives destined for
+    the dumped process.
++
+The 'mode' may be one of the following:
+
+    *iptables*::: Use iptables rules to drop the packets.
+    This is the default if 'mode' is not specified.
+
+    *nftables*::: Use nftables rules to drop the packets.
+
 *restore*
 ~~~~~~~~~
 Restores previously checkpointed processes.
diff --git a/criu/config.c b/criu/config.c
index a851f69df..91fb0b64d 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -428,6 +428,7 @@ void init_opts(void)
 	opts.log_level = DEFAULT_LOGLEVEL;
 	opts.pre_dump_mode = PRE_DUMP_SPLICE;
 	opts.file_validation_method = FILE_VALIDATION_DEFAULT;
+	opts.network_lock_method = NETWORK_LOCK_DEFAULT;
 }
 
 bool deprecated_ok(char *what)
@@ -606,6 +607,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 	char *cfg_file = NULL;
 	char **_argv = NULL;
 	int _argc = 0;
+	bool has_network_lock_opt = false;
 
 #define BOOL_OPT(OPT_NAME, SAVE_TO)                         \
 	{ OPT_NAME, no_argument, SAVE_TO, true },           \
@@ -694,6 +696,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		{ "pre-dump-mode", required_argument, 0, 1097 },
 		{ "file-validation", required_argument, 0, 1098 },
 		{ "lsm-mount-context", required_argument, 0, 1099 },
+		{ "network-lock", required_argument, 0, 1100 },
 		{},
 	};
 
@@ -1018,6 +1021,17 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		case 1099:
 			SET_CHAR_OPTS(lsm_mount_context, optarg);
 			break;
+		case 1100:
+			has_network_lock_opt = true;
+			if (!strcmp("iptables", optarg)) {
+				opts.network_lock_method = NETWORK_LOCK_IPTABLES;
+			} else if (!strcmp("nftables", optarg)) {
+				opts.network_lock_method = NETWORK_LOCK_NFTABLES;
+			} else {
+				pr_err("Invalid value for --network-lock: %s\n", optarg);
+				return 1;
+			}
+			break;
 		case 'V':
 			pr_msg("Version: %s\n", CRIU_VERSION);
 			if (strcmp(CRIU_GITID, "0"))
@@ -1031,6 +1045,11 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		}
 	}
 
+	if (has_network_lock_opt && !strcmp(argv[optind], "restore")) {
+		pr_warn("--network-lock will be ignored in restore command\n");
+		pr_info("Network lock method from dump will be used in restore\n");
+	}
+
 	return 0;
 
 bad_arg:
diff --git a/criu/crtools.c b/criu/crtools.c
index ba41d382d..9c96691d9 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -354,6 +354,9 @@ usage:
 	       "                        in lazy-pages mode: 'criu lazy-pages -D DIR'\n"
 	       "                        --lazy-pages and lazy-pages mode require userfaultfd\n"
 	       "  --stream              dump/restore images using criu-image-streamer\n"
+	       "  --network-lock METHOD\n"
+	       "                      network locking/unlocking method; argument\n"
+	       "                      can be 'nftables' or 'iptables' (default).\n"
 	       "\n"
 	       "* External resources support:\n"
 	       "  --external RES        dump objects from this list as external resources:\n"
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index d46049cc9..a34f8dbbf 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -59,6 +59,16 @@ struct cg_root_opt {
 
 #define CG_MODE_DEFAULT (CG_MODE_SOFT)
 
+/*
+ * Network locking method
+ */
+enum NETWORK_LOCK_METHOD {
+	NETWORK_LOCK_IPTABLES,
+	NETWORK_LOCK_NFTABLES,
+};
+
+#define NETWORK_LOCK_DEFAULT NETWORK_LOCK_IPTABLES
+
 /*
  * Ghost file size we allow to carry by default.
  */
@@ -152,6 +162,7 @@ struct cr_options {
 	int tcp_skip_in_flight;
 	bool lazy_pages;
 	char *work_dir;
+	int network_lock_method;
 
 	/*
 	 * When we scheduler for removal some functionality we first

From b85fad797c983ebc840534a64e3f6f29ca659297 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Sat, 12 Jun 2021 20:45:03 +0200
Subject: [PATCH 0720/1854] cr-service: add network_lock option to RPC and
 libcriu

v2: run make indent

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-service.c | 13 +++++++++++++
 images/rpc.proto  |  6 ++++++
 lib/c/criu.c      | 15 +++++++++++++++
 lib/c/criu.h      |  7 +++++++
 4 files changed, 41 insertions(+)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 38a8ea365..0f8bc4cc1 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -502,6 +502,19 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		}
 	}
 
+	if (req->has_network_lock) {
+		switch (req->network_lock) {
+		case CRIU_NETWORK_LOCK_METHOD__IPTABLES:
+			opts.network_lock_method = NETWORK_LOCK_IPTABLES;
+			break;
+		case CRIU_NETWORK_LOCK_METHOD__NFTABLES:
+			opts.network_lock_method = NETWORK_LOCK_NFTABLES;
+			break;
+		default:
+			goto err;
+		}
+	}
+
 	if (req->ps) {
 		opts.port = (short)req->ps->port;
 
diff --git a/images/rpc.proto b/images/rpc.proto
index 61e1b24f4..a9f51ac4b 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -49,6 +49,11 @@ enum criu_cg_mode {
 	DEFAULT = 6;
 };
 
+enum criu_network_lock_method {
+	IPTABLES = 	1;
+	NFTABLES = 	2;
+};
+
 enum criu_pre_dump_mode {
 	SPLICE = 	1;
 	VM_READ =	2;
@@ -131,6 +136,7 @@ message criu_opts {
 	optional criu_pre_dump_mode	pre_dump_mode		= 61 [default = SPLICE];
 	optional int32			pidfd_store_sk		= 62;
 	optional string			lsm_mount_context	= 63;
+	optional criu_network_lock_method	network_lock		= 64 [default = IPTABLES];
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 86c9dedf3..75f168799 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1789,3 +1789,18 @@ void criu_set_pidfd_store_sk(int sk)
 {
 	criu_local_set_pidfd_store_sk(global_opts, sk);
 }
+
+int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method)
+{
+	opts->rpc->has_network_lock = true;
+	if (method == CRIU_NETWORK_LOCK_IPTABLES || method == CRIU_NETWORK_LOCK_NFTABLES) {
+		opts->rpc->network_lock = (CriuNetworkLockMethod)method;
+		return 0;
+	}
+	return -1;
+}
+
+int criu_set_network_lock(enum criu_network_lock_method method)
+{
+	return criu_local_set_network_lock(global_opts, method);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 044e5373d..258e33a19 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -40,6 +40,11 @@ enum criu_cg_mode {
 	CRIU_CG_MODE_DEFAULT,
 };
 
+enum criu_network_lock_method {
+	CRIU_NETWORK_LOCK_IPTABLES = 1,
+	CRIU_NETWORK_LOCK_NFTABLES = 2,
+};
+
 enum criu_pre_dump_mode { CRIU_PRE_DUMP_SPLICE = 1, CRIU_PRE_DUMP_READ = 2 };
 
 int criu_set_service_address(const char *path);
@@ -97,6 +102,7 @@ int criu_add_external(const char *key);
 int criu_set_page_server_address_port(const char *address, int port);
 int criu_set_pre_dump_mode(enum criu_pre_dump_mode mode);
 void criu_set_pidfd_store_sk(int sk);
+int criu_set_network_lock(enum criu_network_lock_method method);
 
 /*
  * The criu_notify_arg_t na argument is an opaque
@@ -256,6 +262,7 @@ int criu_local_add_external(criu_opts *opts, const char *key);
 int criu_local_set_page_server_address_port(criu_opts *opts, const char *address, int port);
 int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode);
 void criu_local_set_pidfd_store_sk(criu_opts *opts, int sk);
+int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method);
 
 void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_notify_arg_t na));
 

From e9d24a2ba33b2dd72c1f787da60abc5fb70ad51b Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Thu, 1 Jul 2021 21:30:42 +0200
Subject: [PATCH 0721/1854] cr-check: add check for nftables based network
 locking

Nftables based network locking/unlocking will be added later.

Nftables sets will be used to load the connection tuples that
will be locked, to be able to store those tuples we need to
check "Set Concatenations" support.

https://wiki.nftables.org/wiki-nftables/index.php/Concatenations

v2: fix 'has_nftables_concat=true' when adding CRIU table fails
v3: add better message when CRIU is build without libnftables support
v4: run make indent

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/cr-check.c          | 12 ++++++++++++
 criu/include/kerndat.h   |  1 +
 criu/include/netfilter.h |  8 ++++++++
 criu/kerndat.c           | 41 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 8fab51ca4..3575fb3b3 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1362,6 +1362,16 @@ static int check_ns_pid(void)
 	return 0;
 }
 
+static int check_network_lock_nftables(void)
+{
+	if (!kdat.has_nftables_concat) {
+		pr_warn("Nftables based locking requires libnftables and set concatenations support\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1479,6 +1489,7 @@ int cr_check(void)
 		ret |= check_pidfd_store();
 		ret |= check_ns_pid();
 		ret |= check_apparmor_stacking();
+		ret |= check_network_lock_nftables();
 	}
 
 	/*
@@ -1590,6 +1601,7 @@ static struct feature_list feature_list[] = {
 	{ "pidfd_store", check_pidfd_store },
 	{ "ns_pid", check_ns_pid },
 	{ "apparmor_stacking", check_apparmor_stacking },
+	{ "network_lock_nftables", check_network_lock_nftables },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index b2f5d4305..80bad7f11 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -73,6 +73,7 @@ struct kerndat_s {
 	bool has_pidfd_open;
 	bool has_pidfd_getfd;
 	bool has_nspid;
+	bool has_nftables_concat;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/netfilter.h b/criu/include/netfilter.h
index 35ef26205..5f58c41b7 100644
--- a/criu/include/netfilter.h
+++ b/criu/include/netfilter.h
@@ -10,4 +10,12 @@ extern int nf_unlock_connection_info(struct inet_sk_info *);
 
 extern void preload_netfilter_modules(void);
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
+#define NFT_RUN_CMD(nft, cmd) nft_run_cmd_from_buffer(nft, cmd, strlen(cmd))
+#elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+#define NFT_RUN_CMD(nft, cmd) nft_run_cmd_from_buffer(nft, cmd)
+#else
+#define NFT_RUN_CMD(nft, cmd) BUILD_BUG_ON(1)
+#endif
+
 #endif /* __CR_NETFILTER_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 4d28dac98..da3732261 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -14,6 +14,10 @@
 #include <sys/prctl.h>
 #include <sys/inotify.h>
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+#include <nftables/libnftables.h>
+#endif
+
 #include "common/config.h"
 #include "int.h"
 #include "log.h"
@@ -1146,6 +1150,39 @@ close:
 	return ret;
 }
 
+static int kerndat_has_nftables_concat(void)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	struct nft_ctx *nft;
+	int ret = 0;
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		return -1;
+
+	if (NFT_RUN_CMD(nft, "add table inet CRIU")) {
+		ret = -1;
+		goto nft_ctx_free_out;
+	}
+
+	if (NFT_RUN_CMD(nft, "add set inet CRIU conn { type ipv4_addr . inet_service ;}"))
+		kdat.has_nftables_concat = false;
+	else
+		kdat.has_nftables_concat = true;
+
+	/* Clean up */
+	NFT_RUN_CMD(nft, "delete table inet CRIU");
+
+nft_ctx_free_out:
+	nft_ctx_free(nft);
+	return ret;
+#else
+	pr_warn("CRIU was built without libnftables support\n");
+	kdat.has_nftables_concat = false;
+	return 0;
+#endif
+}
+
 int kerndat_init(void)
 {
 	int ret;
@@ -1293,6 +1330,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_nspid failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_nftables_concat()) {
+		pr_err("kerndat_has_nftables_concat failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From f246ca56c081a54899d740b06440618b6c640758 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 9 Jul 2021 16:11:34 +0200
Subject: [PATCH 0722/1854] criu: rename iptables network locking/unlocking
 functions

Related to the new --network-lock option, other methods for network
locking/unlocking will be added as an alternative to iptables like
nftables.

This option is used in the core network locking/unlocking hooks to
decide which method should be used, making it easier to add new
methods later smoothly.
i.e.
	- network_lock_internal
	- network_unlock_internal
	- lock_connection (renamed from nf_lock_connection)
	- unlock_connection (renamed from nf_unlock_connection)
	- unlock_connection_info (renamed from unlock_connection_info)

nf_* functions are renamed to iptables_* to avoid confusion with
other netfilter methods in the future like nftables.

v2: run make indent
v3: make error messages more descriptive

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/include/netfilter.h |  6 +++---
 criu/net.c               | 38 +++++++++++++++++++++++++++++---------
 criu/netfilter.c         | 40 ++++++++++++++++++++--------------------
 criu/sk-tcp.c            | 38 ++++++++++++++++++++++++++++++++------
 4 files changed, 84 insertions(+), 38 deletions(-)

diff --git a/criu/include/netfilter.h b/criu/include/netfilter.h
index 5f58c41b7..f6cc88f93 100644
--- a/criu/include/netfilter.h
+++ b/criu/include/netfilter.h
@@ -2,11 +2,11 @@
 #define __CR_NETFILTER_H__
 
 struct inet_sk_desc;
-extern int nf_lock_connection(struct inet_sk_desc *);
-extern int nf_unlock_connection(struct inet_sk_desc *);
+extern int iptables_lock_connection(struct inet_sk_desc *);
+extern int iptables_unlock_connection(struct inet_sk_desc *);
 
 struct inet_sk_info;
-extern int nf_unlock_connection_info(struct inet_sk_info *);
+extern int iptables_unlock_connection_info(struct inet_sk_info *);
 
 extern void preload_netfilter_modules(void);
 
diff --git a/criu/net.c b/criu/net.c
index 144e9b5c5..182b487ce 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3014,7 +3014,7 @@ err:
 	return ret;
 }
 
-int network_lock_internal(void)
+static int iptables_network_lock_internal(void)
 {
 	char conf[] = "*filter\n"
 		      ":CRIU - [0:0]\n"
@@ -3023,10 +3023,7 @@ int network_lock_internal(void)
 		      "-A CRIU -m mark --mark " __stringify(SOCCR_MARK) " -j ACCEPT\n"
 									"-A CRIU -j DROP\n"
 									"COMMIT\n";
-	int ret = 0, nsret;
-
-	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
-		return -1;
+	int ret = 0;
 
 	ret |= iptables_restore(false, conf, sizeof(conf) - 1);
 	if (kdat.ipv6)
@@ -3039,13 +3036,26 @@ int network_lock_internal(void)
 		       "option.\n",
 		       ret);
 
+	return ret;
+}
+
+int network_lock_internal(void)
+{
+	int ret = 0, nsret;
+
+	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
+		return -1;
+
+	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
+		ret = iptables_network_lock_internal();
+
 	if (restore_ns(nsret, &net_ns_desc))
 		ret = -1;
 
 	return ret;
 }
 
-static int network_unlock_internal(void)
+static int iptables_network_unlock_internal(void)
 {
 	char conf[] = "*filter\n"
 		      ":CRIU - [0:0]\n"
@@ -3053,14 +3063,24 @@ static int network_unlock_internal(void)
 		      "-D OUTPUT -j CRIU\n"
 		      "-X CRIU\n"
 		      "COMMIT\n";
+	int ret = 0;
+
+	ret |= iptables_restore(false, conf, sizeof(conf) - 1);
+	if (kdat.ipv6)
+		ret |= iptables_restore(true, conf, sizeof(conf) - 1);
+
+	return ret;
+}
+
+static int network_unlock_internal(void)
+{
 	int ret = 0, nsret;
 
 	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
 		return -1;
 
-	ret |= iptables_restore(false, conf, sizeof(conf) - 1);
-	if (kdat.ipv6)
-		ret |= iptables_restore(true, conf, sizeof(conf) - 1);
+	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
+		ret = iptables_network_unlock_internal();
 
 	if (restore_ns(nsret, &net_ns_desc))
 		ret = -1;
diff --git a/criu/netfilter.c b/criu/netfilter.c
index b9b013456..a1d7ebd4b 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -22,7 +22,7 @@ static char buf[512];
  * Any brave soul to write it using xtables-devel?
  */
 
-#define NF_CONN_CMD                             \
+#define IPTABLES_CONN_CMD                       \
 	"%s %s -t filter %s %s --protocol tcp " \
 	"-m mark ! --mark " __stringify(SOCCR_MARK) " --source %s --sport %d --destination %s --dport %d -j DROP"
 
@@ -52,8 +52,8 @@ static int ipv6_addr_mapped(u32 *addr)
 	return (addr[2] == htonl(0x0000ffff));
 }
 
-static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port, u32 *dst_addr, u16 dst_port, bool input,
-				    bool lock)
+static int iptables_connection_switch_raw(int family, u32 *src_addr, u16 src_port, u32 *dst_addr, u16 dst_port,
+					  bool input, bool lock)
 {
 	char sip[INET_ADDR_LEN], dip[INET_ADDR_LEN];
 	char *cmd;
@@ -84,7 +84,7 @@ static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port, u32
 		return -1;
 	}
 
-	snprintf(buf, sizeof(buf), NF_CONN_CMD, cmd, kdat.has_xtlocks ? "-w" : "", lock ? "-I" : "-D",
+	snprintf(buf, sizeof(buf), IPTABLES_CONN_CMD, cmd, kdat.has_xtlocks ? "-w" : "", lock ? "-I" : "-D",
 		 input ? "INPUT" : "OUTPUT", dip, (int)dst_port, sip, (int)src_port);
 
 	pr_debug("\tRunning iptables [%s]\n", buf);
@@ -103,41 +103,41 @@ static int nf_connection_switch_raw(int family, u32 *src_addr, u16 src_port, u32
 	return 0;
 }
 
-static int nf_connection_switch(struct inet_sk_desc *sk, bool lock)
+static int iptables_connection_switch(struct inet_sk_desc *sk, bool lock)
 {
 	int ret = 0;
 
-	ret = nf_connection_switch_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port, true,
-				       lock);
+	ret = iptables_connection_switch_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port,
+					     true, lock);
 	if (ret)
 		return -1;
 
-	ret = nf_connection_switch_raw(sk->sd.family, sk->dst_addr, sk->dst_port, sk->src_addr, sk->src_port, false,
-				       lock);
+	ret = iptables_connection_switch_raw(sk->sd.family, sk->dst_addr, sk->dst_port, sk->src_addr, sk->src_port,
+					     false, lock);
 	if (ret) /* rollback */
-		nf_connection_switch_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port, true,
-					 !lock);
+		iptables_connection_switch_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port,
+					       true, !lock);
 	return ret;
 }
 
-int nf_lock_connection(struct inet_sk_desc *sk)
+int iptables_lock_connection(struct inet_sk_desc *sk)
 {
-	return nf_connection_switch(sk, true);
+	return iptables_connection_switch(sk, true);
 }
 
-int nf_unlock_connection(struct inet_sk_desc *sk)
+int iptables_unlock_connection(struct inet_sk_desc *sk)
 {
-	return nf_connection_switch(sk, false);
+	return iptables_connection_switch(sk, false);
 }
 
-int nf_unlock_connection_info(struct inet_sk_info *si)
+int iptables_unlock_connection_info(struct inet_sk_info *si)
 {
 	int ret = 0;
 
-	ret |= nf_connection_switch_raw(si->ie->family, si->ie->src_addr, si->ie->src_port, si->ie->dst_addr,
-					si->ie->dst_port, true, false);
-	ret |= nf_connection_switch_raw(si->ie->family, si->ie->dst_addr, si->ie->dst_port, si->ie->src_addr,
-					si->ie->src_port, false, false);
+	ret |= iptables_connection_switch_raw(si->ie->family, si->ie->src_addr, si->ie->src_port, si->ie->dst_addr,
+					      si->ie->dst_port, true, false);
+	ret |= iptables_connection_switch_raw(si->ie->family, si->ie->dst_addr, si->ie->dst_port, si->ie->src_addr,
+					      si->ie->src_port, false, false);
 	/*
 	 * rollback nothing in case of any error,
 	 * because nobody checks errors of this function
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 8e78fca8c..5bd37ae75 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -33,6 +33,22 @@
 static LIST_HEAD(cpt_tcp_repair_sockets);
 static LIST_HEAD(rst_tcp_repair_sockets);
 
+static int lock_connection(struct inet_sk_desc *sk)
+{
+	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
+		return iptables_lock_connection(sk);
+
+	return -1;
+}
+
+static int unlock_connection(struct inet_sk_desc *sk)
+{
+	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
+		return iptables_unlock_connection(sk);
+
+	return -1;
+}
+
 static int tcp_repair_established(int fd, struct inet_sk_desc *sk)
 {
 	int ret;
@@ -51,9 +67,11 @@ static int tcp_repair_established(int fd, struct inet_sk_desc *sk)
 	}
 
 	if (!(root_ns_mask & CLONE_NEWNET)) {
-		ret = nf_lock_connection(sk);
-		if (ret < 0)
+		ret = lock_connection(sk);
+		if (ret < 0) {
+			pr_err("Failed to lock TCP connection %x\n", sk->sd.ino);
 			goto err2;
+		}
 	}
 
 	socr = libsoccr_pause(sk->rfd);
@@ -66,7 +84,7 @@ static int tcp_repair_established(int fd, struct inet_sk_desc *sk)
 
 err3:
 	if (!(root_ns_mask & CLONE_NEWNET))
-		nf_unlock_connection(sk);
+		unlock_connection(sk);
 err2:
 	close(sk->rfd);
 err1:
@@ -80,9 +98,9 @@ static void tcp_unlock_one(struct inet_sk_desc *sk)
 	list_del(&sk->rlist);
 
 	if (!(root_ns_mask & CLONE_NEWNET)) {
-		ret = nf_unlock_connection(sk);
+		ret = unlock_connection(sk);
 		if (ret < 0)
-			pr_perror("Failed to unlock TCP connection");
+			pr_err("Failed to unlock TCP connection %x\n", sk->sd.ino);
 	}
 
 	libsoccr_resume(sk->priv);
@@ -453,6 +471,14 @@ void tcp_locked_conn_add(struct inet_sk_info *ii)
 	ii->sk_fd = -1;
 }
 
+static int unlock_connection_info(struct inet_sk_info *si)
+{
+	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
+		return iptables_unlock_connection_info(si);
+
+	return -1;
+}
+
 void rst_unlock_tcp_connections(void)
 {
 	struct inet_sk_info *ii;
@@ -465,5 +491,5 @@ void rst_unlock_tcp_connections(void)
 		return;
 
 	list_for_each_entry(ii, &rst_tcp_repair_sockets, rlist)
-		nf_unlock_connection_info(ii);
+		unlock_connection_info(ii);
 }

From 19cc0bfa6529ad99bdc62cecab8b55620ce46030 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 9 Jul 2021 16:36:23 +0200
Subject: [PATCH 0723/1854] criu: add nftables netns-wide locking/unlocking

This adds nftables based internal network locking as an
alernative for iptables. This avoid the external dependency
of iptables-restore.

v2: fix indentation & rename 'free' lable to 'out'
v3: add better message when CRIU is build without libnftables support
v4:
	- move 'ret = -1' below err: lable to avoid redundancy
	- fix nft ctx memory leak in case of success in
	  nftables_network_unlock()
v5: add better error message on lock failure

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/net.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/criu/net.c b/criu/net.c
index 182b487ce..125d4ea1e 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -45,6 +45,7 @@
 #include "util.h"
 #include "external.h"
 #include "fdstore.h"
+#include "netfilter.h"
 
 #include "protobuf.h"
 #include "images/netdev.pb-c.h"
@@ -3014,6 +3015,47 @@ err:
 	return ret;
 }
 
+static inline int nftables_lock_network_internal(void)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	struct nft_ctx *nft;
+	int ret = 0;
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		return -1;
+
+	if (NFT_RUN_CMD(nft, "add table inet CRIU"))
+		goto err2;
+
+	if (NFT_RUN_CMD(nft, "add chain inet CRIU output { type filter hook output priority 0; policy drop; }"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU output meta mark " __stringify(SOCCR_MARK) " accept"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add chain inet CRIU input { type filter hook input priority 0; policy drop; }"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU input meta mark " __stringify(SOCCR_MARK) " accept"))
+		goto err1;
+
+	goto out;
+
+err1:
+	NFT_RUN_CMD(nft, "delete table inet CRIU");
+err2:
+	ret = -1;
+	pr_err("Locking network failed using nftables\n");
+out:
+	nft_ctx_free(nft);
+	return ret;
+#else
+	pr_err("CRIU was built without libnftables support\n");
+	return -1;
+#endif
+}
+
 static int iptables_network_lock_internal(void)
 {
 	char conf[] = "*filter\n"
@@ -3048,6 +3090,8 @@ int network_lock_internal(void)
 
 	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
 		ret = iptables_network_lock_internal();
+	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
+		ret = nftables_lock_network_internal();
 
 	if (restore_ns(nsret, &net_ns_desc))
 		ret = -1;
@@ -3055,6 +3099,27 @@ int network_lock_internal(void)
 	return ret;
 }
 
+static inline int nftables_network_unlock(void)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	int ret = 0;
+	struct nft_ctx *nft;
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		return -1;
+
+	if (NFT_RUN_CMD(nft, "delete table inet CRIU"))
+		ret = -1;
+
+	nft_ctx_free(nft);
+	return ret;
+#else
+	pr_err("CRIU was built without libnftables support\n");
+	return -1;
+#endif
+}
+
 static int iptables_network_unlock_internal(void)
 {
 	char conf[] = "*filter\n"
@@ -3081,6 +3146,8 @@ static int network_unlock_internal(void)
 
 	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
 		ret = iptables_network_unlock_internal();
+	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
+		ret = nftables_network_unlock();
 
 	if (restore_ns(nsret, &net_ns_desc))
 		ret = -1;

From c15327656ab4b3723c5c9966e222d28c6f80c7d5 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Fri, 9 Jul 2021 18:30:50 +0200
Subject: [PATCH 0724/1854] zdtm: add nftables network namespace locking test

This is just a symlink to the original static/netns_lock test with
the right options passed to use nftables instead.

v2:
	- make static/netns_lock test iptables explicitly
	- prevent netns_lock tests from running in parallel because
	  netns & sync files creation were conflicting in both tests.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/Makefile                                  | 3 ++-
 test/zdtm/static/{netns_lock.c => netns_lock_iptables.c}   | 0
 .../static/{netns_lock.desc => netns_lock_iptables.desc}   | 4 ++--
 .../static/{netns_lock.hook => netns_lock_iptables.hook}   | 0
 test/zdtm/static/netns_lock_nftables.c                     | 1 +
 test/zdtm/static/netns_lock_nftables.desc                  | 7 +++++++
 test/zdtm/static/netns_lock_nftables.hook                  | 1 +
 7 files changed, 13 insertions(+), 3 deletions(-)
 rename test/zdtm/static/{netns_lock.c => netns_lock_iptables.c} (100%)
 rename test/zdtm/static/{netns_lock.desc => netns_lock_iptables.desc} (50%)
 rename test/zdtm/static/{netns_lock.hook => netns_lock_iptables.hook} (100%)
 create mode 120000 test/zdtm/static/netns_lock_nftables.c
 create mode 100644 test/zdtm/static/netns_lock_nftables.desc
 create mode 120000 test/zdtm/static/netns_lock_nftables.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index df0a3b7e2..4f499ace9 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -217,7 +217,8 @@ TST_NOFILE	:=				\
 		uffd-events			\
 		thread_different_uid_gid	\
 		pipe03				\
-		netns_lock			\
+		netns_lock_iptables			\
+		netns_lock_nftables			\
 		netns_sub			\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
diff --git a/test/zdtm/static/netns_lock.c b/test/zdtm/static/netns_lock_iptables.c
similarity index 100%
rename from test/zdtm/static/netns_lock.c
rename to test/zdtm/static/netns_lock_iptables.c
diff --git a/test/zdtm/static/netns_lock.desc b/test/zdtm/static/netns_lock_iptables.desc
similarity index 50%
rename from test/zdtm/static/netns_lock.desc
rename to test/zdtm/static/netns_lock_iptables.desc
index 79362790e..08664b53d 100644
--- a/test/zdtm/static/netns_lock.desc
+++ b/test/zdtm/static/netns_lock_iptables.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid',
-    'opts': '--tcp-established',
+    'flags': 'suid excl',
+    'opts': '--tcp-established --network-lock iptables',
     'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
 }
diff --git a/test/zdtm/static/netns_lock.hook b/test/zdtm/static/netns_lock_iptables.hook
similarity index 100%
rename from test/zdtm/static/netns_lock.hook
rename to test/zdtm/static/netns_lock_iptables.hook
diff --git a/test/zdtm/static/netns_lock_nftables.c b/test/zdtm/static/netns_lock_nftables.c
new file mode 120000
index 000000000..75bf3de71
--- /dev/null
+++ b/test/zdtm/static/netns_lock_nftables.c
@@ -0,0 +1 @@
+netns_lock_iptables.c
\ No newline at end of file
diff --git a/test/zdtm/static/netns_lock_nftables.desc b/test/zdtm/static/netns_lock_nftables.desc
new file mode 100644
index 000000000..5e67f45dd
--- /dev/null
+++ b/test/zdtm/static/netns_lock_nftables.desc
@@ -0,0 +1,7 @@
+{
+    'flavor': 'h',
+    'flags': 'suid excl',
+    'feature': 'network_lock_nftables',
+    'opts': '--tcp-established --network-lock nftables',
+    'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
+}
diff --git a/test/zdtm/static/netns_lock_nftables.hook b/test/zdtm/static/netns_lock_nftables.hook
new file mode 120000
index 000000000..decf8d1c0
--- /dev/null
+++ b/test/zdtm/static/netns_lock_nftables.hook
@@ -0,0 +1 @@
+netns_lock_iptables.hook
\ No newline at end of file

From 6e59b2bd77ee740ee560a791cc4879e2519d2e3d Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Sat, 17 Jul 2021 18:59:47 +0200
Subject: [PATCH 0725/1854] zdtm: add iptables per-socket locking test

When criu dumps a process with --tcp-established opt it locks
the open tcp connections so that no packets from peer enters
the stack, otherwise RST will be sent by a kernel causing the
connection to fail.

Post-start hook creates a connection with the test server and
creates a background thread that stays alive for the duration
of the test. This background thread sends data to the test
server at three stages:
- Pre-dump: Should send normally
- Pre-restore:
	If connection is locked properly, packets will be dropped
	and TCP will just retry, which will eventually be sent when
	the process is restored and the network is unlocked.
- Post-restore: Should send normally

Data sent at the three stages is then checked at the server's side.

v2:
	- remove unused imports and constants
	- delete sync file in wait_sync_file() instead of --clean
v3:
	- add comments

Co-developed-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/Makefile                     |  1 +
 test/zdtm/static/net_lock_socket_iptables.c   | 54 +++++++++++++
 .../zdtm/static/net_lock_socket_iptables.desc |  5 ++
 .../zdtm/static/net_lock_socket_iptables.hook | 78 +++++++++++++++++++
 4 files changed, 138 insertions(+)
 create mode 100644 test/zdtm/static/net_lock_socket_iptables.c
 create mode 100644 test/zdtm/static/net_lock_socket_iptables.desc
 create mode 100755 test/zdtm/static/net_lock_socket_iptables.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 4f499ace9..6eeb6a4de 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -219,6 +219,7 @@ TST_NOFILE	:=				\
 		pipe03				\
 		netns_lock_iptables			\
 		netns_lock_nftables			\
+		net_lock_socket_iptables		\
 		netns_sub			\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
diff --git a/test/zdtm/static/net_lock_socket_iptables.c b/test/zdtm/static/net_lock_socket_iptables.c
new file mode 100644
index 000000000..cc30bc2f9
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_iptables.c
@@ -0,0 +1,54 @@
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that sockets are locked between dump and restore\n";
+const char *test_author = "Zeyad Yasser <zeyady98@gmail.com>";
+
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <sys/socket.h>
+
+static int port = 8880;
+#define SYNCFILE_PATH "socket_lock.sync"
+
+int main(int argc, char **argv)
+{
+	char buf[5];
+	int fd_s, fd_sock, fd_sync, buf_len;
+
+	test_init(argc, argv);
+
+	if ((fd_s = tcp_init_server(AF_INET, &port)) < 0) {
+		pr_err("initializing server failed\n");
+		return 1;
+	}
+
+	// Server is ready to accept sockets
+	fd_sync = open(SYNCFILE_PATH, O_CREAT, 0444);
+	if (fd_sync == -1) {
+		pr_perror("cannot create sync file");
+		return 1;
+	}
+	close(fd_sync);
+
+	fd_sock = tcp_accept_server(fd_s);
+
+	test_daemon();
+	test_waitsig();
+
+	buf_len = recv(fd_sock, buf, 3, MSG_WAITALL);
+	if (buf_len < 0) {
+		pr_perror("read less then have to");
+		return 1;
+	}
+
+	if (!strncmp(buf, "ABC", 3))
+		pass();
+	else
+		fail();
+
+	close(fd_sock);
+	close(fd_s);
+
+	return 0;
+}
diff --git a/test/zdtm/static/net_lock_socket_iptables.desc b/test/zdtm/static/net_lock_socket_iptables.desc
new file mode 100644
index 000000000..7231886da
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_iptables.desc
@@ -0,0 +1,5 @@
+{
+    'flavor': 'h',
+    'flags': 'suid excl',
+    'opts': '--tcp-established --network-lock iptables',
+}
diff --git a/test/zdtm/static/net_lock_socket_iptables.hook b/test/zdtm/static/net_lock_socket_iptables.hook
new file mode 100755
index 000000000..22baf7b3c
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_iptables.hook
@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+
+import socket
+import time
+import sys
+import os
+
+PORT = 8880
+TIMEOUT = 0.1
+INTERNAL_SERVER = "\0internal_server"
+SYNCFILE = "zdtm/static/socket_lock.sync"
+
+def wait_sync_file():
+    for _ignore in range(3):
+        if os.path.exists(SYNCFILE):
+            os.remove(SYNCFILE)
+            return
+        time.sleep(1)
+
+    raise TimeoutError("Sync timeout: file ({}) not found".format(SYNCFILE))
+
+if sys.argv[1] == "--post-start":
+    internal_sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    internal_sock.bind(INTERNAL_SERVER)
+    internal_sock.listen(1)
+
+    # Wait for test server to be ready
+    wait_sync_file()
+
+    pid = os.fork()
+    if pid == 0:
+        os.setsid()  # Detach from parent
+
+        test_sock = socket.create_connection(("127.0.0.1", PORT), TIMEOUT)
+
+        while True:
+            internal_conn, _ignore = internal_sock.accept()
+            hook = internal_conn.recv(100).decode()
+
+            try:
+                if hook == "--pre-dump":
+                    test_sock.sendall(str.encode("A"))
+
+                elif hook == "--pre-restore":
+                    # Data sent while TCP socket is "locked" should be retransmitted.
+                    test_sock.sendall(str.encode("B"))
+
+                elif hook == "--post-restore":
+                    test_sock.sendall(str.encode("C"))
+
+                elif hook == "--clean":
+                    break
+
+                internal_conn.sendall(str.encode("pass"))
+            except Exception as e:
+                internal_conn.sendall(str.encode("fail"))
+                raise e
+            finally:
+                internal_conn.close()
+
+    internal_sock.close()
+
+if sys.argv[1] in ["--pre-dump", "--pre-restore", "--post-restore"]:
+    internal_conn = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    internal_conn.connect(INTERNAL_SERVER)
+    internal_conn.sendall(str.encode(sys.argv[1]))
+
+    status = internal_conn.recv(100).decode()
+    if status != "pass":
+        sys.exit(1)
+
+    internal_conn.close()
+
+if sys.argv[1] == "--clean":
+    # Clean up internal server
+    internal_conn = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    internal_conn.connect(INTERNAL_SERVER)
+    internal_conn.sendall(str.encode(sys.argv[1]))

From 826d3d7407bafa9e1ee30fc3f53379ed8de02434 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 20 Jul 2021 15:45:04 +0200
Subject: [PATCH 0726/1854] criu: add nftables connection locking/unlocking

This adds nftables based connection locking as an alernative
for iptables. This avoid the external dependency of
iptables-restore.

It works by creating a 'connection set', which is a set of
connection identifying tuples. Rules are added to drop packets that
match the connection tuples in the set. Locking is now reduced to
just adding the connection identifying tuple to the set.

Unlocking is just as simple as deleteing the CRIU table.

v2: split ip string conversion into two if conditions
v3: add better message when CRIU is build without libnftables support
v4: fix indentation in nftables_lock_connection_raw()
v5: move 'ret = -1' below err: lable to avoid redundancy
v6: add better error message on lock failure
v7: run make indent

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/include/netfilter.h |   3 +
 criu/net.c               |   7 ++-
 criu/netfilter.c         | 125 +++++++++++++++++++++++++++++++++++++++
 criu/sk-tcp.c            |   8 +++
 4 files changed, 142 insertions(+), 1 deletion(-)

diff --git a/criu/include/netfilter.h b/criu/include/netfilter.h
index f6cc88f93..c2ac7a0df 100644
--- a/criu/include/netfilter.h
+++ b/criu/include/netfilter.h
@@ -10,6 +10,9 @@ extern int iptables_unlock_connection_info(struct inet_sk_info *);
 
 extern void preload_netfilter_modules(void);
 
+extern int nftables_init_connection_lock(void);
+extern int nftables_lock_connection(struct inet_sk_desc *);
+
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
 #define NFT_RUN_CMD(nft, cmd) nft_run_cmd_from_buffer(nft, cmd, strlen(cmd))
 #elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
diff --git a/criu/net.c b/criu/net.c
index 125d4ea1e..fd4d781bd 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3160,8 +3160,11 @@ int network_lock(void)
 	pr_info("Lock network\n");
 
 	/* Each connection will be locked on dump */
-	if (!(root_ns_mask & CLONE_NEWNET))
+	if (!(root_ns_mask & CLONE_NEWNET)) {
+		if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
+			nftables_init_connection_lock();
 		return 0;
+	}
 
 	if (run_scripts(ACT_NET_LOCK))
 		return -1;
@@ -3180,6 +3183,8 @@ void network_unlock(void)
 		/* coverity[check_return] */
 		run_scripts(ACT_NET_UNLOCK);
 		network_unlock_internal();
+	} else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES) {
+		nftables_network_unlock();
 	}
 }
 
diff --git a/criu/netfilter.c b/criu/netfilter.c
index a1d7ebd4b..90944b431 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -5,6 +5,10 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+#include <nftables/libnftables.h>
+#endif
+
 #include "../soccr/soccr.h"
 
 #include "util.h"
@@ -17,6 +21,8 @@
 
 static char buf[512];
 
+#define NFTABLES_CONN_CMD "add element inet CRIU conns%c { %s . %d . %s . %d }"
+
 /*
  * Need to configure simple netfilter rules for blocking connections
  * Any brave soul to write it using xtables-devel?
@@ -145,3 +151,122 @@ int iptables_unlock_connection_info(struct inet_sk_info *si)
 
 	return ret;
 }
+
+int nftables_init_connection_lock(void)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	struct nft_ctx *nft;
+	int ret = 0;
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		return -1;
+
+	if (NFT_RUN_CMD(nft, "add table inet CRIU"))
+		goto err2;
+
+	if (NFT_RUN_CMD(nft, "add chain inet CRIU output { type filter hook output priority 0; }"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU output meta mark " __stringify(SOCCR_MARK) " accept"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add chain inet CRIU input { type filter hook input priority 0; }"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU input meta mark " __stringify(SOCCR_MARK) " accept"))
+		goto err1;
+
+	/* IPv4 */
+	if (NFT_RUN_CMD(nft, "add set inet CRIU conns4 { type ipv4_addr . inet_service . ipv4_addr . inet_service ; }"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU output ip saddr . tcp sport . ip daddr . tcp dport @conns4 drop"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU input ip saddr . tcp sport . ip daddr . tcp dport @conns4 drop"))
+		goto err1;
+
+	/* IPv6 */
+	if (NFT_RUN_CMD(nft, "add set inet CRIU conns6 { type ipv6_addr . inet_service . ipv6_addr . inet_service ; }"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU output ip6 saddr . tcp sport . ip6 daddr . tcp dport @conns6 drop"))
+		goto err1;
+
+	if (NFT_RUN_CMD(nft, "add rule inet CRIU input ip6 saddr . tcp sport . ip6 daddr . tcp dport @conns6 drop"))
+		goto err1;
+
+	goto out;
+
+err1:
+	NFT_RUN_CMD(nft, "delete table inet CRIU");
+	pr_err("Locking network failed using nftables\n");
+err2:
+	ret = -1;
+out:
+	nft_ctx_free(nft);
+	return ret;
+#else
+	pr_err("CRIU was built without libnftables support\n");
+	return -1;
+#endif
+}
+
+static int nftables_lock_connection_raw(int family, u32 *src_addr, u16 src_port, u32 *dst_addr, u16 dst_port)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	struct nft_ctx *nft;
+	int ret = 0;
+	char sip[INET_ADDR_LEN], dip[INET_ADDR_LEN];
+
+	if (family == AF_INET6 && ipv6_addr_mapped(dst_addr)) {
+		family = AF_INET;
+		src_addr = &src_addr[3];
+		dst_addr = &dst_addr[3];
+	}
+
+	if (!inet_ntop(family, (void *)src_addr, sip, INET_ADDR_LEN)) {
+		pr_perror("nf: Can't convert src ip addr");
+		return -1;
+	}
+
+	if (!inet_ntop(family, (void *)dst_addr, dip, INET_ADDR_LEN)) {
+		pr_perror("nf: Can't convert dst ip addr");
+		return -1;
+	}
+
+	nft = nft_ctx_new(NFT_CTX_DEFAULT);
+	if (!nft)
+		return -1;
+
+	snprintf(buf, sizeof(buf), NFTABLES_CONN_CMD, family == AF_INET ? '4' : '6', dip, (int)dst_port, sip,
+		 (int)src_port);
+
+	pr_debug("\tRunning nftables [%s]\n", buf);
+
+	if (NFT_RUN_CMD(nft, buf)) {
+		ret = -1;
+		pr_err("Locking connection failed using nftables\n");
+	}
+
+	nft_ctx_free(nft);
+	return ret;
+#else
+	pr_err("CRIU was built without libnftables support\n");
+	return -1;
+#endif
+}
+
+int nftables_lock_connection(struct inet_sk_desc *sk)
+{
+	int ret = 0;
+
+	ret = nftables_lock_connection_raw(sk->sd.family, sk->src_addr, sk->src_port, sk->dst_addr, sk->dst_port);
+	if (ret)
+		return -1;
+
+	ret = nftables_lock_connection_raw(sk->sd.family, sk->dst_addr, sk->dst_port, sk->src_addr, sk->src_port);
+
+	return ret;
+}
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 5bd37ae75..0afecd2d6 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -37,6 +37,8 @@ static int lock_connection(struct inet_sk_desc *sk)
 {
 	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
 		return iptables_lock_connection(sk);
+	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
+		return nftables_lock_connection(sk);
 
 	return -1;
 }
@@ -45,6 +47,9 @@ static int unlock_connection(struct inet_sk_desc *sk)
 {
 	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
 		return iptables_unlock_connection(sk);
+	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
+		/* All connections will be unlocked in network_unlock(void) */
+		return 0;
 
 	return -1;
 }
@@ -475,6 +480,9 @@ static int unlock_connection_info(struct inet_sk_info *si)
 {
 	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
 		return iptables_unlock_connection_info(si);
+	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
+		/* All connections will be unlocked in network_unlock(void) */
+		return 0;
 
 	return -1;
 }

From 212db1d9a69ef33e35649a771c101edb456693c0 Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 20 Jul 2021 15:55:56 +0200
Subject: [PATCH 0727/1854] zdtm: add nftables per-socket locking test

This is just a symlink to the original static/net_lock_socket_iptables
test with the right options passed to use nftables instead.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/Makefile                      | 1 +
 test/zdtm/static/net_lock_socket_nftables.c    | 1 +
 test/zdtm/static/net_lock_socket_nftables.desc | 6 ++++++
 test/zdtm/static/net_lock_socket_nftables.hook | 1 +
 4 files changed, 9 insertions(+)
 create mode 120000 test/zdtm/static/net_lock_socket_nftables.c
 create mode 100644 test/zdtm/static/net_lock_socket_nftables.desc
 create mode 120000 test/zdtm/static/net_lock_socket_nftables.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 6eeb6a4de..ec408c4ea 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -220,6 +220,7 @@ TST_NOFILE	:=				\
 		netns_lock_iptables			\
 		netns_lock_nftables			\
 		net_lock_socket_iptables		\
+		net_lock_socket_nftables		\
 		netns_sub			\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
diff --git a/test/zdtm/static/net_lock_socket_nftables.c b/test/zdtm/static/net_lock_socket_nftables.c
new file mode 120000
index 000000000..8e229da81
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_nftables.c
@@ -0,0 +1 @@
+net_lock_socket_iptables.c
\ No newline at end of file
diff --git a/test/zdtm/static/net_lock_socket_nftables.desc b/test/zdtm/static/net_lock_socket_nftables.desc
new file mode 100644
index 000000000..fd8a431ed
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_nftables.desc
@@ -0,0 +1,6 @@
+{
+    'flavor': 'h',
+    'flags': 'suid excl',
+    'feature': 'network_lock_nftables',
+    'opts': '--tcp-established --network-lock nftables',
+}
diff --git a/test/zdtm/static/net_lock_socket_nftables.hook b/test/zdtm/static/net_lock_socket_nftables.hook
new file mode 120000
index 000000000..ecf65f7c4
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_nftables.hook
@@ -0,0 +1 @@
+net_lock_socket_iptables.hook
\ No newline at end of file

From cd1570b15ee0b0fea89f3a8651640b24117d513a Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Thu, 29 Jul 2021 20:18:21 +0200
Subject: [PATCH 0728/1854] zdtm: add ipv6 variants of net_lock_socket_* tests

v2: remove unnecessary elif and else after return in
    wait_server_addr()
v3: use IOError instead of FileNotFoundError for python2
    compatibility

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/Makefile                     |  4 +++
 test/zdtm/static/net_lock_socket_iptables.c   | 25 +++++++++++++++----
 .../zdtm/static/net_lock_socket_iptables.hook | 22 +++++++++++-----
 test/zdtm/static/net_lock_socket_iptables6.c  |  1 +
 .../static/net_lock_socket_iptables6.desc     |  5 ++++
 .../static/net_lock_socket_iptables6.hook     |  1 +
 test/zdtm/static/net_lock_socket_nftables6.c  |  1 +
 .../static/net_lock_socket_nftables6.desc     |  6 +++++
 .../static/net_lock_socket_nftables6.hook     |  1 +
 9 files changed, 55 insertions(+), 11 deletions(-)
 create mode 120000 test/zdtm/static/net_lock_socket_iptables6.c
 create mode 100644 test/zdtm/static/net_lock_socket_iptables6.desc
 create mode 120000 test/zdtm/static/net_lock_socket_iptables6.hook
 create mode 120000 test/zdtm/static/net_lock_socket_nftables6.c
 create mode 100644 test/zdtm/static/net_lock_socket_nftables6.desc
 create mode 120000 test/zdtm/static/net_lock_socket_nftables6.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ec408c4ea..c9e6589f0 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -220,7 +220,9 @@ TST_NOFILE	:=				\
 		netns_lock_iptables			\
 		netns_lock_nftables			\
 		net_lock_socket_iptables		\
+		net_lock_socket_iptables6		\
 		net_lock_socket_nftables		\
+		net_lock_socket_nftables6		\
 		netns_sub			\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
@@ -583,6 +585,8 @@ clone_fs:		LDLIBS += -pthread
 # we have to explicitly specify both .o and .d for this case:
 netns_sub_veth.o netns_sub_veth.d: CPPFLAGS += $(call pkg-cflags, libnl-3.0)
 netns_sub_veth:		LDLIBS += $(call pkg-libs, libnl-route-3.0 libnl-3.0)
+net_lock_socket_iptables6:	CFLAGS += -D ZDTM_IPV6
+net_lock_socket_nftables6:	CFLAGS += -D ZDTM_IPV6
 symlink01:		CFLAGS += -DZDTM_UNLINK_SYMLINK
 
 socket-tcp-fin-wait1:	CFLAGS += -D ZDTM_TCP_FIN_WAIT1
diff --git a/test/zdtm/static/net_lock_socket_iptables.c b/test/zdtm/static/net_lock_socket_iptables.c
index cc30bc2f9..d9c438c4c 100644
--- a/test/zdtm/static/net_lock_socket_iptables.c
+++ b/test/zdtm/static/net_lock_socket_iptables.c
@@ -1,5 +1,11 @@
 #include "zdtmtst.h"
 
+#if defined(ZDTM_IPV6)
+#define ZDTM_FAMILY AF_INET6
+#else
+#define ZDTM_FAMILY AF_INET
+#endif
+
 const char *test_doc = "Check that sockets are locked between dump and restore\n";
 const char *test_author = "Zeyad Yasser <zeyady98@gmail.com>";
 
@@ -14,22 +20,31 @@ static int port = 8880;
 int main(int argc, char **argv)
 {
 	char buf[5];
-	int fd_s, fd_sock, fd_sync, buf_len;
+	int fd_s, fd_sock, buf_len;
+	FILE *f_sync;
 
 	test_init(argc, argv);
 
-	if ((fd_s = tcp_init_server(AF_INET, &port)) < 0) {
+	if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) {
 		pr_err("initializing server failed\n");
 		return 1;
 	}
 
 	// Server is ready to accept sockets
-	fd_sync = open(SYNCFILE_PATH, O_CREAT, 0444);
-	if (fd_sync == -1) {
+	f_sync = fopen(SYNCFILE_PATH, "w");
+	if (f_sync == NULL) {
 		pr_perror("cannot create sync file");
 		return 1;
 	}
-	close(fd_sync);
+#if defined(ZDTM_IPV6)
+	if (fprintf(f_sync, "ipv6") < 0) {
+#else
+	if (fprintf(f_sync, "ipv4") < 0) {
+#endif
+		pr_perror("cannot write to sync file");
+		return 1;
+	}
+	fclose(f_sync);
 
 	fd_sock = tcp_accept_server(fd_s);
 
diff --git a/test/zdtm/static/net_lock_socket_iptables.hook b/test/zdtm/static/net_lock_socket_iptables.hook
index 22baf7b3c..0ee147eb2 100755
--- a/test/zdtm/static/net_lock_socket_iptables.hook
+++ b/test/zdtm/static/net_lock_socket_iptables.hook
@@ -10,12 +10,22 @@ TIMEOUT = 0.1
 INTERNAL_SERVER = "\0internal_server"
 SYNCFILE = "zdtm/static/socket_lock.sync"
 
-def wait_sync_file():
+def wait_server_addr():
     for _ignore in range(3):
-        if os.path.exists(SYNCFILE):
+        try:
+            with open(SYNCFILE, "r") as f:
+                addr = f.read(4)
             os.remove(SYNCFILE)
-            return
-        time.sleep(1)
+
+            if addr == "ipv4":
+                return "127.0.0.1"
+
+            if addr == "ipv6":
+                return "::1"
+
+            raise Exception("Invalid address type")
+        except IOError:
+            time.sleep(1)
 
     raise TimeoutError("Sync timeout: file ({}) not found".format(SYNCFILE))
 
@@ -25,13 +35,13 @@ if sys.argv[1] == "--post-start":
     internal_sock.listen(1)
 
     # Wait for test server to be ready
-    wait_sync_file()
+    server_addr = wait_server_addr()
 
     pid = os.fork()
     if pid == 0:
         os.setsid()  # Detach from parent
 
-        test_sock = socket.create_connection(("127.0.0.1", PORT), TIMEOUT)
+        test_sock = socket.create_connection((server_addr, PORT), TIMEOUT)
 
         while True:
             internal_conn, _ignore = internal_sock.accept()
diff --git a/test/zdtm/static/net_lock_socket_iptables6.c b/test/zdtm/static/net_lock_socket_iptables6.c
new file mode 120000
index 000000000..8e229da81
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_iptables6.c
@@ -0,0 +1 @@
+net_lock_socket_iptables.c
\ No newline at end of file
diff --git a/test/zdtm/static/net_lock_socket_iptables6.desc b/test/zdtm/static/net_lock_socket_iptables6.desc
new file mode 100644
index 000000000..7231886da
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_iptables6.desc
@@ -0,0 +1,5 @@
+{
+    'flavor': 'h',
+    'flags': 'suid excl',
+    'opts': '--tcp-established --network-lock iptables',
+}
diff --git a/test/zdtm/static/net_lock_socket_iptables6.hook b/test/zdtm/static/net_lock_socket_iptables6.hook
new file mode 120000
index 000000000..ecf65f7c4
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_iptables6.hook
@@ -0,0 +1 @@
+net_lock_socket_iptables.hook
\ No newline at end of file
diff --git a/test/zdtm/static/net_lock_socket_nftables6.c b/test/zdtm/static/net_lock_socket_nftables6.c
new file mode 120000
index 000000000..8e229da81
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_nftables6.c
@@ -0,0 +1 @@
+net_lock_socket_iptables.c
\ No newline at end of file
diff --git a/test/zdtm/static/net_lock_socket_nftables6.desc b/test/zdtm/static/net_lock_socket_nftables6.desc
new file mode 100644
index 000000000..fd8a431ed
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_nftables6.desc
@@ -0,0 +1,6 @@
+{
+    'flavor': 'h',
+    'flags': 'suid excl',
+    'feature': 'network_lock_nftables',
+    'opts': '--tcp-established --network-lock nftables',
+}
diff --git a/test/zdtm/static/net_lock_socket_nftables6.hook b/test/zdtm/static/net_lock_socket_nftables6.hook
new file mode 120000
index 000000000..ecf65f7c4
--- /dev/null
+++ b/test/zdtm/static/net_lock_socket_nftables6.hook
@@ -0,0 +1 @@
+net_lock_socket_iptables.hook
\ No newline at end of file

From ca3e3c50bec92390a6d57f827f9685b48ec6200c Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Sun, 1 Aug 2021 13:03:28 +0200
Subject: [PATCH 0729/1854] inventory: save network lock method to reuse in
 restore

When the network is locked using a specific method like iptables
or nftables there is no need to require passing the same method
during restore.

We save the lock method during dump in the inventory image and
use that in restore.

This always overwrites the restore --network-lock option.

v2: store opts.network_lock_method directly to avoid dependency
    on rpc.proto's 'enum criu_network_lock_method'.
v3: fall back to iptables if image is generated with an older
    version of CRIU.
v4: remove --network-lock from netns_lock_* from restore

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/image.c                                  | 19 +++++++++++++++++++
 images/inventory.proto                        |  1 +
 .../zdtm/static/net_lock_socket_iptables.desc |  3 ++-
 .../static/net_lock_socket_iptables6.desc     |  3 ++-
 .../zdtm/static/net_lock_socket_nftables.desc |  3 ++-
 .../static/net_lock_socket_nftables6.desc     |  3 ++-
 test/zdtm/static/netns_lock_iptables.desc     |  3 ++-
 test/zdtm/static/netns_lock_nftables.desc     |  3 ++-
 8 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/criu/image.c b/criu/image.c
index 3a85eb532..353de48e8 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -86,6 +86,21 @@ int check_img_inventory(bool restore)
 		goto out_err;
 	}
 
+	if (restore) {
+		if (!he->has_network_lock_method) {
+			/*
+			 * Image files were generated with an older version of CRIU
+			 * so we should fall back to iptables because this is the
+			 * network-lock mechanism used in older versions.
+			 */
+			pr_info("Network lock method not found in inventory image\n");
+			pr_info("Falling back to iptables network lock method\n");
+			opts.network_lock_method = NETWORK_LOCK_IPTABLES;
+		} else {
+			opts.network_lock_method = he->network_lock_method;
+		}
+	}
+
 	ret = 0;
 
 out_err:
@@ -223,6 +238,10 @@ int prepare_inventory(InventoryEntry *he)
 		he->has_tcp_close = true;
 	}
 
+	/* Save network lock method to reuse in restore */
+	he->has_network_lock_method = true;
+	he->network_lock_method = opts.network_lock_method;
+
 	return 0;
 }
 
diff --git a/images/inventory.proto b/images/inventory.proto
index 56e85a80a..a735bad1d 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -20,4 +20,5 @@ message inventory_entry {
 	optional uint64			dump_uptime	= 8;
 	optional uint32			pre_dump_mode	= 9;
 	optional bool			tcp_close	= 10;
+	optional uint32			network_lock_method	= 11;
 }
diff --git a/test/zdtm/static/net_lock_socket_iptables.desc b/test/zdtm/static/net_lock_socket_iptables.desc
index 7231886da..1e233132d 100644
--- a/test/zdtm/static/net_lock_socket_iptables.desc
+++ b/test/zdtm/static/net_lock_socket_iptables.desc
@@ -1,5 +1,6 @@
 {
     'flavor': 'h',
     'flags': 'suid excl',
-    'opts': '--tcp-established --network-lock iptables',
+    'dopts': '--tcp-established --network-lock iptables',
+    'ropts': '--tcp-established',
 }
diff --git a/test/zdtm/static/net_lock_socket_iptables6.desc b/test/zdtm/static/net_lock_socket_iptables6.desc
index 7231886da..1e233132d 100644
--- a/test/zdtm/static/net_lock_socket_iptables6.desc
+++ b/test/zdtm/static/net_lock_socket_iptables6.desc
@@ -1,5 +1,6 @@
 {
     'flavor': 'h',
     'flags': 'suid excl',
-    'opts': '--tcp-established --network-lock iptables',
+    'dopts': '--tcp-established --network-lock iptables',
+    'ropts': '--tcp-established',
 }
diff --git a/test/zdtm/static/net_lock_socket_nftables.desc b/test/zdtm/static/net_lock_socket_nftables.desc
index fd8a431ed..d3b82067f 100644
--- a/test/zdtm/static/net_lock_socket_nftables.desc
+++ b/test/zdtm/static/net_lock_socket_nftables.desc
@@ -2,5 +2,6 @@
     'flavor': 'h',
     'flags': 'suid excl',
     'feature': 'network_lock_nftables',
-    'opts': '--tcp-established --network-lock nftables',
+    'dopts': '--tcp-established --network-lock nftables',
+    'ropts': '--tcp-established',
 }
diff --git a/test/zdtm/static/net_lock_socket_nftables6.desc b/test/zdtm/static/net_lock_socket_nftables6.desc
index fd8a431ed..d3b82067f 100644
--- a/test/zdtm/static/net_lock_socket_nftables6.desc
+++ b/test/zdtm/static/net_lock_socket_nftables6.desc
@@ -2,5 +2,6 @@
     'flavor': 'h',
     'flags': 'suid excl',
     'feature': 'network_lock_nftables',
-    'opts': '--tcp-established --network-lock nftables',
+    'dopts': '--tcp-established --network-lock nftables',
+    'ropts': '--tcp-established',
 }
diff --git a/test/zdtm/static/netns_lock_iptables.desc b/test/zdtm/static/netns_lock_iptables.desc
index 08664b53d..52d4177e0 100644
--- a/test/zdtm/static/netns_lock_iptables.desc
+++ b/test/zdtm/static/netns_lock_iptables.desc
@@ -1,6 +1,7 @@
 {
     'flavor': 'h',
     'flags': 'suid excl',
-    'opts': '--tcp-established --network-lock iptables',
+    'opts': '--tcp-established',
+    'dopts': '--network-lock iptables',
     'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
 }
diff --git a/test/zdtm/static/netns_lock_nftables.desc b/test/zdtm/static/netns_lock_nftables.desc
index 5e67f45dd..7ed5b3358 100644
--- a/test/zdtm/static/netns_lock_nftables.desc
+++ b/test/zdtm/static/netns_lock_nftables.desc
@@ -2,6 +2,7 @@
     'flavor': 'h',
     'flags': 'suid excl',
     'feature': 'network_lock_nftables',
-    'opts': '--tcp-established --network-lock nftables',
+    'opts': '--tcp-established',
+    'dopts': '--network-lock nftables',
     'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
 }

From 9838d34ded282d94654fd986ca7c38fe0915d08c Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Thu, 12 Aug 2021 22:07:00 +0200
Subject: [PATCH 0730/1854] criu: use unique table names for nftables based
 locking

During network locking CRIU creates an nftables table to
add needed rules. If more than one instance of CRIU run
in parallel, those tables' names would conflict.

Solution is to append root task pid to the nftables table
name as a postfix (e.g. inet CRIU-3231).

We also need to use `create table` instead of `add table`
because using `create` returns an error in case table name
already exists so we could detect conflicts if they happen.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/include/netfilter.h |  1 +
 criu/kerndat.c           |  6 ++--
 criu/net.c               | 31 +++++++++++++++-----
 criu/netfilter.c         | 63 +++++++++++++++++++++++++++++++---------
 4 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/criu/include/netfilter.h b/criu/include/netfilter.h
index c2ac7a0df..005573a4f 100644
--- a/criu/include/netfilter.h
+++ b/criu/include/netfilter.h
@@ -12,6 +12,7 @@ extern void preload_netfilter_modules(void);
 
 extern int nftables_init_connection_lock(void);
 extern int nftables_lock_connection(struct inet_sk_desc *);
+extern int nftables_get_table(char *table, int n);
 
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
 #define NFT_RUN_CMD(nft, cmd) nft_run_cmd_from_buffer(nft, cmd, strlen(cmd))
diff --git a/criu/kerndat.c b/criu/kerndat.c
index da3732261..b2e5650cf 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1160,18 +1160,18 @@ static int kerndat_has_nftables_concat(void)
 	if (!nft)
 		return -1;
 
-	if (NFT_RUN_CMD(nft, "add table inet CRIU")) {
+	if (NFT_RUN_CMD(nft, "create table inet CRIU-kerndat-test")) {
 		ret = -1;
 		goto nft_ctx_free_out;
 	}
 
-	if (NFT_RUN_CMD(nft, "add set inet CRIU conn { type ipv4_addr . inet_service ;}"))
+	if (NFT_RUN_CMD(nft, "add set inet CRIU-kerndat-test conn { type ipv4_addr . inet_service ;}"))
 		kdat.has_nftables_concat = false;
 	else
 		kdat.has_nftables_concat = true;
 
 	/* Clean up */
-	NFT_RUN_CMD(nft, "delete table inet CRIU");
+	NFT_RUN_CMD(nft, "delete table inet CRIU-kerndat-test");
 
 nft_ctx_free_out:
 	nft_ctx_free(nft);
diff --git a/criu/net.c b/criu/net.c
index fd4d781bd..7b45f0633 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3020,30 +3020,41 @@ static inline int nftables_lock_network_internal(void)
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 	struct nft_ctx *nft;
 	int ret = 0;
+	char table[32];
+	char buf[128];
+
+	if (nftables_get_table(table, sizeof(table)))
+		return -1;
 
 	nft = nft_ctx_new(NFT_CTX_DEFAULT);
 	if (!nft)
 		return -1;
 
-	if (NFT_RUN_CMD(nft, "add table inet CRIU"))
+	snprintf(buf, sizeof(buf), "create table %s", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err2;
 
-	if (NFT_RUN_CMD(nft, "add chain inet CRIU output { type filter hook output priority 0; policy drop; }"))
+	snprintf(buf, sizeof(buf), "add chain %s output { type filter hook output priority 0; policy drop; }", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU output meta mark " __stringify(SOCCR_MARK) " accept"))
+	snprintf(buf, sizeof(buf), "add rule %s output meta mark " __stringify(SOCCR_MARK) " accept", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add chain inet CRIU input { type filter hook input priority 0; policy drop; }"))
+	snprintf(buf, sizeof(buf), "add chain %s input { type filter hook input priority 0; policy drop; }", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU input meta mark " __stringify(SOCCR_MARK) " accept"))
+	snprintf(buf, sizeof(buf), "add rule %s input meta mark " __stringify(SOCCR_MARK) " accept", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
 	goto out;
 
 err1:
-	NFT_RUN_CMD(nft, "delete table inet CRIU");
+	snprintf(buf, sizeof(buf), "delete table %s", table);
+	NFT_RUN_CMD(nft, buf);
 err2:
 	ret = -1;
 	pr_err("Locking network failed using nftables\n");
@@ -3104,12 +3115,18 @@ static inline int nftables_network_unlock(void)
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 	int ret = 0;
 	struct nft_ctx *nft;
+	char table[32];
+	char buf[128];
+
+	if (nftables_get_table(table, sizeof(table)))
+		return -1;
 
 	nft = nft_ctx_new(NFT_CTX_DEFAULT);
 	if (!nft)
 		return -1;
 
-	if (NFT_RUN_CMD(nft, "delete table inet CRIU"))
+	snprintf(buf, sizeof(buf), "delete table %s", table);
+	if (NFT_RUN_CMD(nft, buf))
 		ret = -1;
 
 	nft_ctx_free(nft);
diff --git a/criu/netfilter.c b/criu/netfilter.c
index 90944b431..2212fd9f2 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -18,10 +18,11 @@
 #include "sockets.h"
 #include "sk-inet.h"
 #include "kerndat.h"
+#include "pstree.h"
 
 static char buf[512];
 
-#define NFTABLES_CONN_CMD "add element inet CRIU conns%c { %s . %d . %s . %d }"
+#define NFTABLES_CONN_CMD "add element %s conns%c { %s . %d . %s . %d }"
 
 /*
  * Need to configure simple netfilter rules for blocking connections
@@ -157,50 +158,71 @@ int nftables_init_connection_lock(void)
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 	struct nft_ctx *nft;
 	int ret = 0;
+	char table[32];
+
+	if (nftables_get_table(table, sizeof(table)))
+		return -1;
 
 	nft = nft_ctx_new(NFT_CTX_DEFAULT);
 	if (!nft)
 		return -1;
 
-	if (NFT_RUN_CMD(nft, "add table inet CRIU"))
+	snprintf(buf, sizeof(buf), "create table %s", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err2;
 
-	if (NFT_RUN_CMD(nft, "add chain inet CRIU output { type filter hook output priority 0; }"))
+	snprintf(buf, sizeof(buf), "add chain %s output { type filter hook output priority 0; }", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU output meta mark " __stringify(SOCCR_MARK) " accept"))
+	snprintf(buf, sizeof(buf), "add rule %s output meta mark " __stringify(SOCCR_MARK) " accept", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add chain inet CRIU input { type filter hook input priority 0; }"))
+	snprintf(buf, sizeof(buf), "add chain %s input { type filter hook input priority 0; }", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU input meta mark " __stringify(SOCCR_MARK) " accept"))
+	snprintf(buf, sizeof(buf), "add rule %s input meta mark " __stringify(SOCCR_MARK) " accept", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
 	/* IPv4 */
-	if (NFT_RUN_CMD(nft, "add set inet CRIU conns4 { type ipv4_addr . inet_service . ipv4_addr . inet_service ; }"))
+	snprintf(buf, sizeof(buf), "add set %s conns4 { type ipv4_addr . inet_service . ipv4_addr . inet_service; }",
+		 table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU output ip saddr . tcp sport . ip daddr . tcp dport @conns4 drop"))
+	snprintf(buf, sizeof(buf), "add rule %s output ip saddr . tcp sport . ip daddr . tcp dport @conns4 drop",
+		 table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU input ip saddr . tcp sport . ip daddr . tcp dport @conns4 drop"))
+	snprintf(buf, sizeof(buf), "add rule %s input ip saddr . tcp sport . ip daddr . tcp dport @conns4 drop", table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
 	/* IPv6 */
-	if (NFT_RUN_CMD(nft, "add set inet CRIU conns6 { type ipv6_addr . inet_service . ipv6_addr . inet_service ; }"))
+	snprintf(buf, sizeof(buf), "add set %s conns6 { type ipv6_addr . inet_service . ipv6_addr . inet_service; }",
+		 table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU output ip6 saddr . tcp sport . ip6 daddr . tcp dport @conns6 drop"))
+	snprintf(buf, sizeof(buf), "add rule %s output ip6 saddr . tcp sport . ip6 daddr . tcp dport @conns6 drop",
+		 table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	if (NFT_RUN_CMD(nft, "add rule inet CRIU input ip6 saddr . tcp sport . ip6 daddr . tcp dport @conns6 drop"))
+	snprintf(buf, sizeof(buf), "add rule %s input ip6 saddr . tcp sport . ip6 daddr . tcp dport @conns6 drop",
+		 table);
+	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
 	goto out;
 
 err1:
-	NFT_RUN_CMD(nft, "delete table inet CRIU");
+	snprintf(buf, sizeof(buf), "delete table %s", table);
+	NFT_RUN_CMD(nft, buf);
 	pr_err("Locking network failed using nftables\n");
 err2:
 	ret = -1;
@@ -219,6 +241,10 @@ static int nftables_lock_connection_raw(int family, u32 *src_addr, u16 src_port,
 	struct nft_ctx *nft;
 	int ret = 0;
 	char sip[INET_ADDR_LEN], dip[INET_ADDR_LEN];
+	char table[32];
+
+	if (nftables_get_table(table, sizeof(table)))
+		return -1;
 
 	if (family == AF_INET6 && ipv6_addr_mapped(dst_addr)) {
 		family = AF_INET;
@@ -240,7 +266,7 @@ static int nftables_lock_connection_raw(int family, u32 *src_addr, u16 src_port,
 	if (!nft)
 		return -1;
 
-	snprintf(buf, sizeof(buf), NFTABLES_CONN_CMD, family == AF_INET ? '4' : '6', dip, (int)dst_port, sip,
+	snprintf(buf, sizeof(buf), NFTABLES_CONN_CMD, table, family == AF_INET ? '4' : '6', dip, (int)dst_port, sip,
 		 (int)src_port);
 
 	pr_debug("\tRunning nftables [%s]\n", buf);
@@ -270,3 +296,12 @@ int nftables_lock_connection(struct inet_sk_desc *sk)
 
 	return ret;
 }
+
+int nftables_get_table(char *table, int n)
+{
+	if (snprintf(table, n, "inet CRIU-%d", root_item->pid->real) < 0) {
+		pr_err("Cannot generate CRIU's nftables table name\n");
+		return -1;
+	}
+	return 0;
+}

From aa772bf286e6c082fb97b61d8079c0afcc9fb49c Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Tue, 17 Aug 2021 22:15:26 +0200
Subject: [PATCH 0731/1854] zdtm: fix network lock tests when run with --norst

In test/jenkins/{crit.sh,criu-dump}, ZDTM is run with --norst,
Causing tests to only go through dump wihtout restoring.

The network locking tests are highly dependant on dump/restore hooks
causing them to hang when run with --norst.

We just add a reqrst flag to all network lock tests.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 test/zdtm/static/net_lock_socket_iptables.desc  | 2 +-
 test/zdtm/static/net_lock_socket_iptables6.desc | 2 +-
 test/zdtm/static/net_lock_socket_nftables.desc  | 2 +-
 test/zdtm/static/net_lock_socket_nftables6.desc | 2 +-
 test/zdtm/static/netns_lock_iptables.desc       | 2 +-
 test/zdtm/static/netns_lock_nftables.desc       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/zdtm/static/net_lock_socket_iptables.desc b/test/zdtm/static/net_lock_socket_iptables.desc
index 1e233132d..936ff8702 100644
--- a/test/zdtm/static/net_lock_socket_iptables.desc
+++ b/test/zdtm/static/net_lock_socket_iptables.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid excl',
+    'flags': 'suid excl reqrst',
     'dopts': '--tcp-established --network-lock iptables',
     'ropts': '--tcp-established',
 }
diff --git a/test/zdtm/static/net_lock_socket_iptables6.desc b/test/zdtm/static/net_lock_socket_iptables6.desc
index 1e233132d..936ff8702 100644
--- a/test/zdtm/static/net_lock_socket_iptables6.desc
+++ b/test/zdtm/static/net_lock_socket_iptables6.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid excl',
+    'flags': 'suid excl reqrst',
     'dopts': '--tcp-established --network-lock iptables',
     'ropts': '--tcp-established',
 }
diff --git a/test/zdtm/static/net_lock_socket_nftables.desc b/test/zdtm/static/net_lock_socket_nftables.desc
index d3b82067f..c34398a4a 100644
--- a/test/zdtm/static/net_lock_socket_nftables.desc
+++ b/test/zdtm/static/net_lock_socket_nftables.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid excl',
+    'flags': 'suid excl reqrst',
     'feature': 'network_lock_nftables',
     'dopts': '--tcp-established --network-lock nftables',
     'ropts': '--tcp-established',
diff --git a/test/zdtm/static/net_lock_socket_nftables6.desc b/test/zdtm/static/net_lock_socket_nftables6.desc
index d3b82067f..c34398a4a 100644
--- a/test/zdtm/static/net_lock_socket_nftables6.desc
+++ b/test/zdtm/static/net_lock_socket_nftables6.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid excl',
+    'flags': 'suid excl reqrst',
     'feature': 'network_lock_nftables',
     'dopts': '--tcp-established --network-lock nftables',
     'ropts': '--tcp-established',
diff --git a/test/zdtm/static/netns_lock_iptables.desc b/test/zdtm/static/netns_lock_iptables.desc
index 52d4177e0..69020f34e 100644
--- a/test/zdtm/static/netns_lock_iptables.desc
+++ b/test/zdtm/static/netns_lock_iptables.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid excl',
+    'flags': 'suid excl reqrst',
     'opts': '--tcp-established',
     'dopts': '--network-lock iptables',
     'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
diff --git a/test/zdtm/static/netns_lock_nftables.desc b/test/zdtm/static/netns_lock_nftables.desc
index 7ed5b3358..fe1a86e4f 100644
--- a/test/zdtm/static/netns_lock_nftables.desc
+++ b/test/zdtm/static/netns_lock_nftables.desc
@@ -1,6 +1,6 @@
 {
     'flavor': 'h',
-    'flags': 'suid excl',
+    'flags': 'suid excl reqrst',
     'feature': 'network_lock_nftables',
     'opts': '--tcp-established',
     'dopts': '--network-lock nftables',

From d87922099612324356bdc36dd49d716fac4e2c0e Mon Sep 17 00:00:00 2001
From: Zeyad Yasser <zeyady98@gmail.com>
Date: Mon, 23 Aug 2021 20:59:11 +0200
Subject: [PATCH 0732/1854] kerndat: create separate netns for
 has_nftables_concat check

There was a race window in kerndat_has_nftables_concat(void) when
two or more instances of CRIU are running in parallel.
One instance would create the table normally, and another would
fail when trying to create a table with the same name and wrongly
set kdat.has_nftables_concat = false, and will save it to kerndat
cache.

A separate netns is created to avoid table collisions.

v2: use call_in_child_process helper instead of fork

Co-developed-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
---
 criu/kerndat.c | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index b2e5650cf..0e88ba43e 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -13,6 +13,7 @@
 #include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
 #include <sys/prctl.h>
 #include <sys/inotify.h>
+#include <sched.h>
 
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 #include <nftables/libnftables.h>
@@ -1150,32 +1151,56 @@ close:
 	return ret;
 }
 
-static int kerndat_has_nftables_concat(void)
-{
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+static int __has_nftables_concat(void *arg)
+{
+	bool *has = (bool *)arg;
 	struct nft_ctx *nft;
-	int ret = 0;
+	int ret = 1;
+
+	/*
+	 * Create a separate network namespace to avoid
+	 * collisions between two CRIU instances.
+	 */
+	if (unshare(CLONE_NEWNET)) {
+		pr_perror("Unable create a network namespace");
+		return 1;
+	}
 
 	nft = nft_ctx_new(NFT_CTX_DEFAULT);
 	if (!nft)
-		return -1;
+		return 1;
 
-	if (NFT_RUN_CMD(nft, "create table inet CRIU-kerndat-test")) {
-		ret = -1;
+	if (NFT_RUN_CMD(nft, "create table inet CRIU")) {
+		pr_err("Can't create nftables table\n");
 		goto nft_ctx_free_out;
 	}
 
-	if (NFT_RUN_CMD(nft, "add set inet CRIU-kerndat-test conn { type ipv4_addr . inet_service ;}"))
-		kdat.has_nftables_concat = false;
+	if (NFT_RUN_CMD(nft, "add set inet CRIU conn { type ipv4_addr . inet_service ;}"))
+		*has = false; /* kdat.has_nftables_concat = false */
 	else
-		kdat.has_nftables_concat = true;
+		*has = true; /* kdat.has_nftables_concat = true */
 
 	/* Clean up */
-	NFT_RUN_CMD(nft, "delete table inet CRIU-kerndat-test");
+	NFT_RUN_CMD(nft, "delete table inet CRIU");
 
+	ret = 0;
 nft_ctx_free_out:
 	nft_ctx_free(nft);
 	return ret;
+}
+#endif
+
+static int kerndat_has_nftables_concat(void)
+{
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	bool has;
+
+	if (call_in_child_process(__has_nftables_concat, (void *)&has))
+		return -1;
+
+	kdat.has_nftables_concat = has;
+	return 0;
 #else
 	pr_warn("CRIU was built without libnftables support\n");
 	kdat.has_nftables_concat = false;

From 41f44896822f1e43751f4bec37c2a4939733b727 Mon Sep 17 00:00:00 2001
From: liuchao173 <55137861+liuchao173@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:11:51 +0800
Subject: [PATCH 0733/1854] remove tls parameter description if without GnuTLS
 support

Signed-off-by: SuperSix173 <liuchao173@huawei.com>
---
 criu/crtools.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/crtools.c b/criu/crtools.c
index 9c96691d9..6a75cd1ea 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -484,12 +484,14 @@ usage:
 	       "  -d|--daemon           run in the background after creating socket\n"
 	       "  --status-fd FD        write \\0 to the FD and close it once process is ready\n"
 	       "                        to handle requests\n"
+#ifdef CONFIG_GNUTLS
 	       "  --tls-cacert FILE     trust certificates signed only by this CA\n"
 	       "  --tls-cacrl FILE      path to CA certificate revocation list file\n"
 	       "  --tls-cert FILE       path to TLS certificate file\n"
 	       "  --tls-key FILE        path to TLS private key file\n"
 	       "  --tls                 use TLS to secure remote connection\n"
 	       "  --tls-no-cn-verify    do not verify common name in server certificate\n"
+#endif
 	       "\n"
 	       "Configuration file options:\n"
 	       "  --config FILEPATH     pass a specific configuration file\n"

From eea63587e692fa1dc44c2d96c0a53788835fac7d Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Thu, 2 Sep 2021 11:10:41 +0800
Subject: [PATCH 0734/1854] namespaces: add helpers to switch/restore mnt ns

When restoring mnt, we should restore current work directory.

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/include/namespaces.h |  2 ++
 criu/namespaces.c         | 45 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index ddf0dbabb..034605917 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -165,8 +165,10 @@ extern int prepare_namespace(struct pstree_item *item, unsigned long clone_flags
 extern int prepare_userns_creds(void);
 
 extern int switch_ns(int pid, struct ns_desc *nd, int *rst);
+extern int switch_mnt_ns(int pid, int *rst, int *cwd_fd);
 extern int switch_ns_by_fd(int nsfd, struct ns_desc *nd, int *rst);
 extern int restore_ns(int rst, struct ns_desc *nd);
+extern int restore_mnt_ns(int rst, int *cwd_fd);
 
 extern int dump_task_ns_ids(struct pstree_item *);
 extern int predump_task_ns_ids(struct pstree_item *);
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 92e0ed31a..7fa58682b 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -282,6 +282,51 @@ int restore_ns(int rst, struct ns_desc *nd)
 	return ret;
 }
 
+int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
+{
+	int ret;
+	int fd;
+
+	if (!cwd_fd)
+		return switch_ns(pid, &mnt_ns_desc, rst);
+
+	fd = open(".", O_PATH);
+	if (fd < 0) {
+		pr_perror("unable to open current directory");
+		return fd;
+	}
+
+	ret = switch_ns(pid, &mnt_ns_desc, rst);
+	if (ret < 0) {
+		close(fd);
+		return ret;
+	}
+
+	*cwd_fd = fd;
+	return 0;
+}
+
+int restore_mnt_ns(int rst, int *cwd_fd)
+{
+	int ret = -1;
+
+	ret = restore_ns(rst, &mnt_ns_desc);
+	if (ret < 0)
+		goto err_restore;
+
+	if (cwd_fd) {
+		ret = fchdir(*cwd_fd);
+		if (ret)
+			pr_perror("unable to restore current directory");
+	}
+
+err_restore:
+	if (cwd_fd)
+		close_safe(cwd_fd);
+
+	return ret;
+}
+
 struct ns_id *ns_ids = NULL;
 static unsigned int ns_next_id = 1;
 unsigned long root_ns_mask = 0;

From f79d15c44dac5381411ffddaab784ce86a7e65f3 Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Sun, 22 Aug 2021 08:06:01 +0800
Subject: [PATCH 0735/1854] binfmt_misc: restore current work directory after
 restoring mnt ns

Restore current work directory after restoring mnt ns, otherwise
"stats-dump" will been written to /

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/mount.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 9bd3b27d9..20e052a9e 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1511,10 +1511,10 @@ err:
 static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_dev, const char *source,
 					      const char *target, const char *type)
 {
-	int mnt_fd, ret, exit_code = 0;
+	int mnt_fd, cwd_fd, ret, exit_code = 0;
 	struct stat st;
 
-	ret = switch_ns(ns->ns_pid, &mnt_ns_desc, &mnt_fd);
+	ret = switch_mnt_ns(ns->ns_pid, &mnt_fd, &cwd_fd);
 	if (ret < 0) {
 		pr_err("Can't switch mnt_ns\n");
 		goto out;
@@ -1536,7 +1536,7 @@ static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_
 	}
 
 restore_ns:
-	ret = restore_ns(mnt_fd, &mnt_ns_desc);
+	ret = restore_mnt_ns(mnt_fd, &cwd_fd);
 out:
 	return ret < 0 ? 0 : exit_code;
 }

From 45409c35d6cb8efb116b05833964d954316c4ebb Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Sun, 22 Aug 2021 08:08:04 +0800
Subject: [PATCH 0736/1854] mount: use swich_mnt_ns/restore_mnt_ns helpers to
 simplify code

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/mount.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 20e052a9e..36806622e 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1358,13 +1358,8 @@ int open_mountpoint(struct mount_info *pm)
 	 * In both cases we can't do the thing from criu's mount namespace, so
 	 * we need to switch to mount's mount namespace, and later switch back.
 	 */
-	cwd_fd = open(".", O_DIRECTORY);
-	if (cwd_fd < 0) {
-		pr_perror("Unable to open cwd");
-		return -1;
-	}
 
-	if (switch_ns(pm->nsid->ns_pid, &mnt_ns_desc, &ns_old) < 0)
+	if (switch_mnt_ns(pm->nsid->ns_pid, &ns_old, &cwd_fd) < 0)
 		goto err;
 
 	if (!mnt_is_overmounted(pm)) {
@@ -1406,28 +1401,17 @@ int open_mountpoint(struct mount_info *pm)
 		}
 	}
 
-	if (restore_ns(ns_old, &mnt_ns_desc)) {
+	if (restore_mnt_ns(ns_old, &cwd_fd)) {
 		ns_old = -1;
 		goto err;
 	}
 
-	if (fchdir(cwd_fd)) {
-		pr_perror("Unable to restore cwd");
-		close(cwd_fd);
-		close(fd);
-		return -1;
-	}
-	close(cwd_fd);
-
 	return __open_mountpoint(pm, fd);
 err:
 	if (ns_old >= 0)
 		/* coverity[check_return] */
-		restore_ns(ns_old, &mnt_ns_desc);
+		restore_mnt_ns(ns_old, &cwd_fd);
 	close_safe(&fd);
-	if (fchdir(cwd_fd))
-		pr_perror("Unable to restore cwd");
-	close(cwd_fd);
 	return -1;
 }
 

From 776f3cff7ce8e56be908e375b388bd2829de5b9f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 24 Aug 2021 14:03:08 +0300
Subject: [PATCH 0737/1854] autofs: restore current work directory after
 restoring mnt ns

Else criu would change cwd while dumping autofs mounts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/autofs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index 046d51d48..71edc7bce 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -391,7 +391,7 @@ static int access_autofs_mount(struct mount_info *pm)
 	const char *mnt_path = pm->mountpoint + 1;
 	dev_t dev_id = pm->s_dev;
 	int new_pid_ns = -1, old_pid_ns = -1;
-	int old_mnt_ns;
+	int old_mnt_ns, old_cwd_fd;
 	int autofs_mnt;
 	int err = -1;
 	int pid, status;
@@ -409,7 +409,7 @@ static int access_autofs_mount(struct mount_info *pm)
 	if (old_pid_ns < 0)
 		goto close_new_pid_ns;
 
-	if (switch_ns(pm->nsid->ns_pid, &mnt_ns_desc, &old_mnt_ns)) {
+	if (switch_mnt_ns(pm->nsid->ns_pid, &old_mnt_ns, &old_cwd_fd)) {
 		pr_err("failed to switch to mount namespace\n");
 		goto close_old_pid_ns;
 	}
@@ -451,7 +451,7 @@ restore_pid_ns:
 	}
 	old_pid_ns = -1;
 restore_mnt_ns:
-	if (restore_ns(old_mnt_ns, &mnt_ns_desc)) {
+	if (restore_mnt_ns(old_mnt_ns, &old_cwd_fd)) {
 		pr_err("failed to restore mount namespace\n");
 		err = -1;
 	}

From f0e968ffed40d878a65efe57b322604cda1f8c16 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 24 Aug 2021 14:13:06 +0300
Subject: [PATCH 0738/1854] binfmt_misc: restore current work directory after
 restoring mnt ns

Else criu would change cwd while binfmt_misc leftover mount cleanup.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 36806622e..3670be9ae 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3749,12 +3749,14 @@ int dump_mnt_namespaces(void)
 void clean_cr_time_mounts(void)
 {
 	struct mount_info *mi;
-	int mnt_fd, ret;
+	int ns_old, ret;
 
 	for (mi = mntinfo; mi; mi = mi->next) {
+		int cwd_fd;
+
 		if (mi->mnt_id != CRTIME_MNT_ID)
 			continue;
-		ret = switch_ns(mi->nsid->ns_pid, &mnt_ns_desc, &mnt_fd);
+		ret = switch_mnt_ns(mi->nsid->ns_pid, &ns_old, &cwd_fd);
 		if (ret) {
 			pr_err("Can't switch to pid's %u mnt_ns\n", mi->nsid->ns_pid);
 			continue;
@@ -3763,7 +3765,7 @@ void clean_cr_time_mounts(void)
 		if (umount(mi->mountpoint) < 0)
 			pr_perror("Can't umount forced mount %s", mi->mountpoint);
 
-		if (restore_ns(mnt_fd, &mnt_ns_desc)) {
+		if (restore_mnt_ns(ns_old, &cwd_fd)) {
 			pr_err("cleanup_forced_mounts exiting with wrong mnt_ns\n");
 			return;
 		}

From c6b5e7d9232aa6033adda242d224a6c2b7ecd563 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 24 Aug 2021 14:20:35 +0300
Subject: [PATCH 0739/1854] sk-unix: fix prep_unix_sk_cwd root and cwd
 restoring

If we save root and cwd after we've already switched to mntns we save
different root and cwd from what we had before prep_unix_sk_cwd, we just
save default root/cwd for new mntns... Let's fix it by proper order.

Also while on it lets fix ns_fd leak on switch_ns_by_fd error path.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index e6ce3d696..f3fe60c6e 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1248,31 +1248,41 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *prev
 	static struct ns_id *root = NULL, *ns;
 	int fd;
 
+	*prev_cwd_fd = open(".", O_RDONLY);
+	if (*prev_cwd_fd < 0) {
+		pr_perror("Can't open current dir");
+		return -1;
+	}
+
+	if (prev_root_fd && (root_ns_mask & CLONE_NEWNS)) {
+		*prev_root_fd = open("/", O_RDONLY);
+		if (*prev_root_fd < 0) {
+			pr_perror("Can't open current root");
+			goto err;
+		}
+	}
+
 	if (prev_mntns_fd && ui->name[0] && ui->ue->mnt_id >= 0) {
 		struct ns_id *mntns = lookup_nsid_by_mnt_id(ui->ue->mnt_id);
 		int ns_fd;
 
 		if (mntns == NULL) {
 			pr_err("Unable to find the %d mount\n", ui->ue->mnt_id);
-			return -1;
+			goto err;
 		}
 
 		ns_fd = fdstore_get(mntns->mnt.nsfd_id);
 		if (ns_fd < 0)
-			return -1;
+			goto err;
 
-		if (switch_ns_by_fd(ns_fd, &mnt_ns_desc, prev_mntns_fd))
-			return -1;
+		if (switch_ns_by_fd(ns_fd, &mnt_ns_desc, prev_mntns_fd)) {
+			close(ns_fd);
+			goto err;
+		}
 
 		close(ns_fd);
 	}
 
-	*prev_cwd_fd = open(".", O_RDONLY);
-	if (*prev_cwd_fd < 0) {
-		pr_perror("Can't open current dir");
-		return -1;
-	}
-
 	if (prev_root_fd && (root_ns_mask & CLONE_NEWNS)) {
 		if (ui->ue->mnt_id >= 0) {
 			ns = lookup_nsid_by_mnt_id(ui->ue->mnt_id);
@@ -1283,11 +1293,6 @@ static int prep_unix_sk_cwd(struct unix_sk_info *ui, int *prev_cwd_fd, int *prev
 		}
 		if (ns == NULL)
 			goto err;
-		*prev_root_fd = open("/", O_RDONLY);
-		if (*prev_root_fd < 0) {
-			pr_perror("Can't open current root");
-			goto err;
-		}
 
 		fd = fdstore_get(ns->mnt.root_fd_id);
 		if (fd < 0) {

From 6a15dbdefa5c23a75eb3d1137681404588a16efa Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Fri, 3 Sep 2021 14:14:41 +0100
Subject: [PATCH 0740/1854] lib: install images/rpc.pb-c.h

Since commit 1c25914 compiling crun with libcriu also requires
/usr/include/criu/rpc.pb-c.h

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Makefile b/lib/Makefile
index f9b66701e..575a7bad3 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,6 @@
 CRIU_SO			:= libcriu.so
 CRIU_A			:= libcriu.a
-UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto criu/include/version.h
+UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h
 
 #
 # File to keep track of files installed by setup.py

From 4db8ef15cee0b97a18e9f28b12e3ceefaa696bda Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Fri, 3 Sep 2021 16:20:11 +0100
Subject: [PATCH 0741/1854] podman-test: use crun from git repository

This patch allows to test the integration of libcriu
with the upstream crun.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 scripts/ci/podman-test.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 5187c8d32..5e5eb764d 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -11,6 +11,22 @@ make install
 
 criu --version
 
+# Install crun build dependencies
+scripts/ci/apt-install libyajl-dev libseccomp-dev libsystemd-dev
+
+# Install crun from source to test libcriu integration
+tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
+pushd "${tmp_dir}"
+git clone --depth=1 https://github.com/containers/crun
+cd crun
+./autogen.sh && ./configure --prefix=/usr
+make -j"$(nproc)"
+make install
+popd
+rm -rf "${tmp_dir}"
+
+podman info
+
 # shellcheck disable=SC2016
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
 

From bea9580e3cf75ed7f3429dd938a4ec9aaf5fe422 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Thu, 9 Sep 2021 09:12:51 +0100
Subject: [PATCH 0742/1854] gitignore: add build directory

The build directory is generated when running make install.

build/ was initially added to gitignore with commit 967797a (Add build
directory to gitignore) and it was accidentally removed.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b9cd7cdc7..d5135f5f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ lib/.crit-setup.files
 compel/include/asm
 include/common/asm
 include/common/config.h
+build/

From 0b2a7223bbb2dd5b8ea150e6c5f22ec6b3072fcc Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 10 Sep 2021 16:53:22 +0000
Subject: [PATCH 0743/1854] mount: fix double-dump file system bug

In the function dump_one_fs(), there's a comment that says "mnt_bind is
a cycled list, so list_for_each can't be used here." That means that the
list head of the list is also a node of the list.

The subsequent list_for_each_entry() marks all the mount info nodes as
dumped, except it skips the list head, which is also a mount info.
This is the bug we fix.

This bug made CRIU dump a file system twice.
See https://github.com/checkpoint-restore/criu-image-streamer/issues/8

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/mount.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/mount.c b/criu/mount.c
index 3670be9ae..ec31f02c2 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1549,6 +1549,7 @@ static int dump_one_fs(struct mount_info *mi)
 		if (ret < 0)
 			return ret;
 
+		pm->dumped = true;
 		list_for_each_entry(t, &pm->mnt_bind, mnt_bind)
 			t->dumped = true;
 		return 0;

From 8567a0952459ddcdaa7762f12927861c5e533e45 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Mon, 20 Sep 2021 08:52:37 +0100
Subject: [PATCH 0744/1854] ci: Update openj9 container images

The AdoptOpenJDK docker images have been deprecated in favor of
eclipse-temurin.

https://github.com/AdoptOpenJDK/openjdk-docker/pull/604

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 scripts/build/Dockerfile.openj9-alpine | 2 ++
 scripts/build/Dockerfile.openj9-ubuntu | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.openj9-alpine
index cf60756b8..f92011283 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.openj9-alpine
@@ -1,3 +1,5 @@
+# FIXME: Replace with eclipse-temurin once Alpine support has been added.
+# https://github.com/adoptium/containers/pull/60
 FROM adoptopenjdk/openjdk8-openj9:alpine
 ARG CC=gcc
 
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 1e2eb41c0..8936adf81 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8-openj9:latest
+FROM docker.io/library/eclipse-temurin:8-focal
 ARG CC=gcc
 
 COPY scripts/ci/apt-install /bin/apt-install

From 000ea82669a0e6d62787a0a1ed8a297a7c1426a7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 2 Jul 2021 13:22:49 +0000
Subject: [PATCH 0745/1854] criu: Version 3.16

Amongst a huge number of fixes all over the place and the move away from
Travis this release introduces:

* better support for restoring containers into existing pods
* pidfd based pid reuse detection for RPC clients
* allow restoring of precreated veth devices
* license change for all files in the images/ directory to MIT
* criu-ns helper script
* use clang-format for automatic code indentation
* support checkpoint/restore of stacked apparmor profiles
* [GSoC] Add nftables based network locking/unlocking (Zeyad Yasser)

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile.versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 493ae9ac8..32f2e95ce 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 15
+CRIU_VERSION_MINOR	:= 16
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Titanium Falcon
+CRIU_VERSION_NAME	:= Petrified Puffin
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From a15a63fce0ad4d1a9119771577fa7ef562bbfd6b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Mon, 27 Sep 2021 18:57:14 +0100
Subject: [PATCH 0746/1854] criu-ns: change python shebang to python3

PEP 394 recommends changing python shebangs to python3 when Python 3.x
is supported. This is similar to `crit-python3`.

https://www.python.org/dev/peps/pep-0394/

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index a97c0002b..d76db3606 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import ctypes
 import ctypes.util
 import errno

From f2cdb062aa4e653c95b41c3965ba0ecd437bfc5c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Tue, 28 Sep 2021 09:49:23 +0100
Subject: [PATCH 0747/1854] Makefile: install criu-ns only with python3

Python 2 has been deprecated since January 1, 2020 and linux distributions
already support Python 3. Thus, to simplify maintenance and packaging
we could support criu-ns as Python 3 only.

v2: Add a message for criu-ns installation

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 Documentation/Makefile | 2 ++
 criu/Makefile          | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index edadfb81c..82257c66a 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -12,7 +12,9 @@ endif
 
 FOOTER		:= footer.txt
 SRC1		+= crit.txt
+ifeq ($(PYTHON),python3)
 SRC1		+= criu-ns.txt
+endif
 SRC1		+= compel.txt
 SRC8		+= criu.txt
 SRC		:= $(SRC1) $(SRC8)
diff --git a/criu/Makefile b/criu/Makefile
index c7ac94d6a..db4e9d81f 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -144,7 +144,10 @@ install: $(obj)/criu
 	$(Q) install -m 644 $(UAPI_HEADERS) $(DESTDIR)$(INCLUDEDIR)/criu/
 	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/criu/scripts
 	$(Q) install -m 755 scripts/systemd-autofs-restart.sh $(DESTDIR)$(LIBEXECDIR)/criu/scripts
+ifeq ($(PYTHON),python3)
+	$(E) "  INSTALL " scripts/criu-ns
 	$(Q) install -m 755 scripts/criu-ns $(DESTDIR)$(SBINDIR)
+endif
 .PHONY: install
 
 uninstall:

From 5ec2a6aaad525b808556d41feb872db1aa66fe44 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Fri, 17 Sep 2021 14:15:04 +0100
Subject: [PATCH 0748/1854] libcriu: add join_ns API

In runc we use the join-ns RPC API to enable checkpoint/restore of
containers with shared namespaces. Shared namespaces are often used
when containers run inside Kubernetes Pod.

In crun we use libcriu to interface with CRIU, however it currently
doesn't provide an API for join-ns. This patch adds the necessary
libcriu API to enable checkpoint/restore of containers with shared
namespaces with crun.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 lib/c/criu.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/c/criu.h |  2 ++
 2 files changed, 93 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index 75f168799..ddc6e0731 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -214,6 +214,18 @@ void criu_local_free_opts(criu_opts *opts)
 	}
 	opts->rpc->n_external = 0;
 
+	if (opts->rpc->join_ns) {
+		for (i = 0; i < opts->rpc->n_join_ns; i++) {
+			free(opts->rpc->join_ns[i]->ns);
+			free(opts->rpc->join_ns[i]->ns_file);
+			if (opts->rpc->join_ns[i]->extra_opt) {
+				free(opts->rpc->join_ns[i]->extra_opt);
+			}
+			free(opts->rpc->join_ns[i]);
+		}
+	}
+	opts->rpc->n_join_ns = 0;
+
 	if (opts->rpc->ps) {
 		free(opts->rpc->ps->address);
 		free(opts->rpc->ps);
@@ -1804,3 +1816,82 @@ int criu_set_network_lock(enum criu_network_lock_method method)
 {
 	return criu_local_set_network_lock(global_opts, method);
 }
+
+int criu_local_join_ns_add(criu_opts *opts, const char *ns, const char *ns_file, const char *extra_opt)
+{
+	int n_join_ns;
+	char *_ns = NULL, *_ns_file = NULL, *_extra_opt = NULL;
+	JoinNamespace **join_ns_arr, *join_ns = NULL;
+
+	if (!ns) {
+		fprintf(stderr, "ns parameter for join_ns is not specified");
+		goto err;
+	}
+
+	_ns = strdup(ns);
+	if (!_ns) {
+		perror("Can't allocate memory for ns");
+		goto err;
+	}
+
+	if (!ns_file) {
+		fprintf(stderr, "ns parameter for join_ns is not specified");
+		goto err;
+	}
+
+	_ns_file = strdup(ns_file);
+	if (!_ns_file) {
+		perror("Can't allocate memory for ns_file");
+		goto err;
+	}
+
+	if (extra_opt) {
+		_extra_opt = strdup(extra_opt);
+		if (!_extra_opt) {
+			perror("Can't allocate memory for extra_opt");
+			goto err;
+		}
+	}
+
+	join_ns = malloc(sizeof(JoinNamespace));
+	if (!join_ns) {
+		perror("Can't allocate memory for join_ns");
+		goto err;
+	}
+
+	n_join_ns = opts->rpc->n_join_ns + 1;
+	join_ns_arr = realloc(opts->rpc->join_ns, n_join_ns * sizeof(join_ns));
+	if (!join_ns_arr) {
+		perror("Can't allocate memory for join_ns_arr");
+		goto err;
+	}
+
+	join_namespace__init(join_ns);
+	join_ns->ns = _ns;
+	join_ns->ns_file = _ns_file;
+	if (_extra_opt) {
+		join_ns->extra_opt = _extra_opt;
+	}
+
+	join_ns_arr[n_join_ns - 1] = join_ns;
+	opts->rpc->join_ns = join_ns_arr;
+	opts->rpc->n_join_ns = n_join_ns;
+
+	return 0;
+
+err:
+	if (_ns)
+		free(_ns);
+	if (_ns_file)
+		free(_ns_file);
+	if (_extra_opt)
+		free(_extra_opt);
+	if (join_ns)
+		free(join_ns);
+	return -1;
+}
+
+int criu_join_ns_add(const char *ns, const char *ns_file, const char *extra_opt)
+{
+	return criu_local_join_ns_add(global_opts, ns, ns_file, extra_opt);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 258e33a19..c32f66418 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -103,6 +103,7 @@ int criu_set_page_server_address_port(const char *address, int port);
 int criu_set_pre_dump_mode(enum criu_pre_dump_mode mode);
 void criu_set_pidfd_store_sk(int sk);
 int criu_set_network_lock(enum criu_network_lock_method method);
+int criu_join_ns_add(const char *ns, const char *ns_file, const char *extra_opt);
 
 /*
  * The criu_notify_arg_t na argument is an opaque
@@ -263,6 +264,7 @@ int criu_local_set_page_server_address_port(criu_opts *opts, const char *address
 int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode);
 void criu_local_set_pidfd_store_sk(criu_opts *opts, int sk);
 int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method);
+int criu_local_join_ns_add(criu_opts *opts, const char *ns, const char *ns_file, const char *extra_opt);
 
 void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_notify_arg_t na));
 

From a8c5efe4c1e8ae4de4fd8b9ece1d0ca0328dfd16 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Fri, 17 Sep 2021 19:23:32 +0100
Subject: [PATCH 0749/1854] libcriu: define log level constants

Replace magic numbers used to set log level in libcriu
with constants.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 lib/c/criu.h                      | 7 +++++++
 test/others/libcriu/test_iters.c  | 4 ++--
 test/others/libcriu/test_notify.c | 2 +-
 test/others/libcriu/test_self.c   | 2 +-
 test/others/libcriu/test_sub.c    | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/c/criu.h b/lib/c/criu.h
index c32f66418..949902f55 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -28,6 +28,13 @@
 extern "C" {
 #endif
 
+#define CRIU_LOG_UNSET (-1)
+#define CRIU_LOG_MSG   (0) /* Print message regardless of log level */
+#define CRIU_LOG_ERROR (1) /* Errors only */
+#define CRIU_LOG_WARN  (2) /* Warnings */
+#define CRIU_LOG_INFO  (3) /* Informative */
+#define CRIU_LOG_DEBUG (4) /* Debug only */
+
 enum criu_service_comm { CRIU_COMM_SK, CRIU_COMM_FD, CRIU_COMM_BIN };
 
 enum criu_cg_mode {
diff --git a/test/others/libcriu/test_iters.c b/test/others/libcriu/test_iters.c
index 2a5ca6def..b7e325abb 100644
--- a/test/others/libcriu/test_iters.c
+++ b/test/others/libcriu/test_iters.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 	criu_set_service_binary(argv[1]);
 	criu_set_pid(pid);
 	criu_set_log_file("dump.log");
-	criu_set_log_level(4);
+	criu_set_log_level(CRIU_LOG_DEBUG);
 
 	open_imgdir();
 	ret = criu_dump_iters(next_iter);
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
 
 	printf("--- Restore loop ---\n");
 	criu_init_opts();
-	criu_set_log_level(4);
+	criu_set_log_level(CRIU_LOG_DEBUG);
 	criu_set_log_file("restore.log");
 	criu_set_images_dir_fd(cur_imgdir);
 
diff --git a/test/others/libcriu/test_notify.c b/test/others/libcriu/test_notify.c
index 66fe75338..9a54b812a 100644
--- a/test/others/libcriu/test_notify.c
+++ b/test/others/libcriu/test_notify.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 	criu_set_service_binary(argv[1]);
 	criu_set_pid(pid);
 	criu_set_log_file("dump.log");
-	criu_set_log_level(4);
+	criu_set_log_level(CRIU_LOG_DEBUG);
 	criu_set_notify_cb(notify);
 	fd = open(argv[2], O_DIRECTORY);
 	criu_set_images_dir_fd(fd);
diff --git a/test/others/libcriu/test_self.c b/test/others/libcriu/test_self.c
index 468edc0f7..0a7e63a58 100644
--- a/test/others/libcriu/test_self.c
+++ b/test/others/libcriu/test_self.c
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
 	}
 
 	criu_set_images_dir_fd(fd);
-	criu_set_log_level(4);
+	criu_set_log_level(CRIU_LOG_DEBUG);
 
 	printf("--- Start child ---\n");
 	pid = fork();
diff --git a/test/others/libcriu/test_sub.c b/test/others/libcriu/test_sub.c
index 41b685847..697abf5d5 100644
--- a/test/others/libcriu/test_sub.c
+++ b/test/others/libcriu/test_sub.c
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 	criu_set_service_binary(argv[1]);
 	criu_set_pid(pid);
 	criu_set_log_file("dump.log");
-	criu_set_log_level(4);
+	criu_set_log_level(CRIU_LOG_DEBUG);
 	fd = open(argv[2], O_DIRECTORY);
 	criu_set_images_dir_fd(fd);
 
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 
 	printf("--- Restore loop ---\n");
 	criu_init_opts();
-	criu_set_log_level(4);
+	criu_set_log_level(CRIU_LOG_DEBUG);
 	criu_set_log_file("restore.log");
 	criu_set_images_dir_fd(fd);
 

From 53bf82bcfc492205aa953a9f8886c9747514a8f6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Mon, 20 Sep 2021 23:05:11 +0100
Subject: [PATCH 0750/1854] test/libcriu: add test case for join-ns

This test case aims to verify that CRIU correctly
restores a process in IPC, UTS and Time namespaces
with criu_join_ns_add() libcriu API.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 test/others/libcriu/.gitignore     |   2 +
 test/others/libcriu/Makefile       |   3 +-
 test/others/libcriu/run.sh         |   1 +
 test/others/libcriu/test_join_ns.c | 243 +++++++++++++++++++++++++++++
 4 files changed, 248 insertions(+), 1 deletion(-)
 create mode 100644 test/others/libcriu/test_join_ns.c

diff --git a/test/others/libcriu/.gitignore b/test/others/libcriu/.gitignore
index 6424681ab..608f2209d 100644
--- a/test/others/libcriu/.gitignore
+++ b/test/others/libcriu/.gitignore
@@ -3,4 +3,6 @@ test_iters
 test_notify
 test_self
 test_sub
+test_join_ns
 wdir
+libcriu.so.*
diff --git a/test/others/libcriu/Makefile b/test/others/libcriu/Makefile
index 226396e6a..734e66c1a 100644
--- a/test/others/libcriu/Makefile
+++ b/test/others/libcriu/Makefile
@@ -1,10 +1,11 @@
 include ../../../../criu/Makefile.versions
 
-TESTS += test_sub 
+TESTS += test_sub
 TESTS += test_self
 TESTS += test_notify
 TESTS += test_iters
 TESTS += test_errno
+TESTS += test_join_ns
 
 all: $(TESTS)
 .PHONY: all
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 5a0dca46b..42760d978 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -53,6 +53,7 @@ if [ "$(uname -m)" == "x86_64" ]; then
 	run_test test_iters
 fi
 run_test test_errno
+run_test test_join_ns
 
 echo "== Tests done"
 make libcriu_clean
diff --git a/test/others/libcriu/test_join_ns.c b/test/others/libcriu/test_join_ns.c
new file mode 100644
index 000000000..50a4cf295
--- /dev/null
+++ b/test/others/libcriu/test_join_ns.c
@@ -0,0 +1,243 @@
+#define _GNU_SOURCE
+#include <errno.h>
+#include <fcntl.h>
+#include <sched.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "criu.h"
+#include "lib.h"
+
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME 0x00000080 /* New time namespace */
+#endif
+
+static pid_t child_pid;
+static int pipefd[2];
+
+static int dir_fd;
+static char *criu_bin;
+
+static bool timens_support(void)
+{
+	return access("/proc/self/ns/time", F_OK) == 0;
+}
+
+static void create_child_process(void)
+{
+	pid_t pid = fork();
+	if (pid < 0) {
+		perror("fork failed");
+		exit(1);
+	}
+
+	if (pid == 0) {
+		if (setsid() < 0)
+			exit(1);
+		pid = getpid();
+		write(pipefd[1], &pid, sizeof(pid));
+		while (1)
+			sleep(1);
+	}
+}
+
+static void unshare_namespaces(void)
+{
+	int flags = CLONE_NEWIPC | CLONE_NEWUTS;
+	if (unshare(flags)) {
+		perror("Can't unshare namespaces");
+		exit(1);
+	}
+
+	if (timens_support() && unshare(CLONE_NEWTIME)) {
+		perror("unshare(CLONE_NEWTIME) failed");
+		exit(1);
+	}
+}
+
+static void init_criu_request(void)
+{
+	if (criu_init_opts()) {
+		fprintf(stderr, "failed to initialise request options\n");
+		exit(1);
+	}
+	criu_set_service_binary(criu_bin);
+	criu_set_images_dir_fd(dir_fd);
+	criu_set_log_level(CRIU_LOG_DEBUG);
+}
+
+static void checkpoint_test(void)
+{
+	int pid, ret;
+
+	pipe(pipefd);
+
+	pid = fork();
+	if (pid < 0) {
+		perror("fork failed");
+		exit(1);
+	}
+
+	if (pid == 0) {
+		unshare_namespaces();
+		/* Close unused read end */
+		close(pipefd[0]);
+		create_child_process();
+		exit(0);
+	}
+
+	/* Close unused write end */
+	close(pipefd[1]);
+	/* Read child PID */
+	read(pipefd[0], &child_pid, sizeof(child_pid));
+
+	init_criu_request();
+	criu_set_log_file("dump.log");
+	criu_set_pid(child_pid);
+
+	ret = criu_dump();
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		exit(1);
+	}
+
+	kill(pid, SIGKILL);
+	if (waitpid(pid, NULL, 0) < 0) {
+		perror("Can't wait pid");
+		exit(1);
+	}
+}
+
+static void join_ns(const char *ns, pid_t pid)
+{
+	char ns_file[PATH_MAX];
+	snprintf(ns_file, sizeof(ns_file), "/proc/%d/ns/%s", pid, ns);
+	criu_join_ns_add(ns, ns_file, NULL);
+}
+
+static pid_t create_namespaces(void)
+{
+	pid_t pid = fork();
+	if (pid < 0) {
+		perror("fork failed");
+		exit(1);
+	}
+
+	if (pid == 0) {
+		unshare_namespaces();
+		while (1)
+			sleep(1);
+	}
+
+	return pid;
+}
+
+static int get_ns_ino(pid_t pid, const char *nsname, ino_t *ino)
+{
+	struct stat st;
+	char path[PATH_MAX];
+
+	snprintf(path, sizeof(path), "/proc/%d/ns/%s", pid, nsname);
+	printf("Stat %s\n", path);
+	if (stat(path, &st))
+		return -errno;
+	*ino = st.st_ino;
+
+	return 0;
+}
+
+static int compare_namespace(const char *nsname, pid_t parent_pid)
+{
+	ino_t child_ns_ino, parent_ns_ino;
+
+	printf("Compare %s ns for %d and %d\n", nsname, child_pid, parent_pid);
+
+	if (get_ns_ino(child_pid, nsname, &child_ns_ino)) {
+		perror("Failed to get child ns inode");
+		return -1;
+	}
+
+	if (get_ns_ino(parent_pid, nsname, &parent_ns_ino)) {
+		perror("Failed to get parent ns inode");
+		return -1;
+	}
+
+	return child_ns_ino != parent_ns_ino;
+}
+
+static int restore_test(void)
+{
+	int ret;
+	pid_t parent_pid = create_namespaces();
+
+	init_criu_request();
+	criu_set_log_file("restore.log");
+
+	join_ns("ipc", parent_pid);
+	join_ns("uts", parent_pid);
+	if (timens_support())
+		join_ns("time", parent_pid);
+
+	ret = criu_restore_child();
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		exit(1);
+	}
+
+	/* Verify that the child process has joined correct namespaces */
+
+	if (compare_namespace("ipc", parent_pid)) {
+		fprintf(stderr, "Error: IPC ns doesn't match\n");
+		exit(1);
+	}
+
+	if (compare_namespace("uts", parent_pid)) {
+		fprintf(stderr, "Error: UTS ns doesn't match\n");
+		exit(1);
+	}
+
+	if (timens_support() && compare_namespace("time", parent_pid)) {
+		fprintf(stderr, "Error: Time ns doesn't match\n");
+		exit(1);
+	}
+
+	kill(child_pid, SIGKILL);
+	if (waitpid(child_pid, NULL, 0) < 0) {
+		perror("Can't wait child pid");
+		exit(1);
+	}
+
+	kill(parent_pid, SIGKILL);
+	if (waitpid(parent_pid, NULL, 0) < 0) {
+		perror("Can't wait parent pid");
+		exit(1);
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	int exit_code;
+
+	criu_bin = argv[1];
+	dir_fd = open(argv[2], O_DIRECTORY);
+	if (dir_fd < 0) {
+		perror("Can't open images dir");
+		return -1;
+	}
+
+	checkpoint_test();
+	exit_code = restore_test();
+
+	close(dir_fd);
+	return exit_code;
+}

From 59d0dfba965dea72e7e5c72832978a42196f3335 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sat, 25 Sep 2021 12:24:29 +0100
Subject: [PATCH 0751/1854] test/libcriu: print logs on fail

run_test was trying to read criu logs on build failure
instead of runtime error.

This patch also removes the unnecessary subfolder with name "i"
and resolves some of issues reported by shellcheck.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 test/others/libcriu/.gitignore |  2 +-
 test/others/libcriu/run.sh     | 56 +++++++++++++++++++---------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/test/others/libcriu/.gitignore b/test/others/libcriu/.gitignore
index 608f2209d..cf1342de2 100644
--- a/test/others/libcriu/.gitignore
+++ b/test/others/libcriu/.gitignore
@@ -4,5 +4,5 @@ test_notify
 test_self
 test_sub
 test_join_ns
-wdir
+output/
 libcriu.so.*
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 42760d978..f7d2f5c6f 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -1,45 +1,51 @@
 #!/bin/bash
 
 set -x
-source ../env.sh || exit 1
+
+MAIN_DIR=$(dirname "$0")
+OUTPUT_DIR="${MAIN_DIR}/output"
+TEST_DIR="${OUTPUT_DIR}/$1"
+TEST_LOG="${TEST_DIR}/test.log"
+DUMP_LOG="${TEST_DIR}/dump.log"
+RESTORE_LOG="${TEST_DIR}/restore.log"
+
+source "${MAIN_DIR}/../env.sh" || exit 1
 
 echo "== Clean"
 make clean
 make libcriu
-rm -rf wdir
 
-echo "== Prepare"
-mkdir -p wdir/i/
+rm -rf "${OUTPUT_DIR}"
 
 echo "== Run tests"
 export LD_LIBRARY_PATH=.
-export PATH="`dirname ${BASH_SOURCE[0]}`/../../../criu:$PATH"
+export PATH="${MAIN_DIR}/../../../criu:${PATH}"
 
 RESULT=0
 
-function run_test {
+run_test() {
 	echo "== Build $1"
-	if ! make $1; then
+	if ! make "$1"; then
 		echo "FAIL build $1"
-		echo "** Output of $1/test.log"
-		cat wdir/i/$1/test.log
-		echo "---------------"
-		if [ -f wdir/i/$1/dump.log ]; then
-			echo "** Contents of dump.log"
-			cat wdir/i/$1/dump.log
-			echo "---------------"
-		fi
-		if [ -f wdir/i/$1/restore.log ]; then
-			echo "** Contents of restore.log"
-			cat wdir/i/$1/restore.log
-			echo "---------------"
-		fi
 		RESULT=1;
 	else
 		echo "== Test $1"
-		mkdir wdir/i/$1/
-		if ! setsid ./$1 ${CRIU} wdir/i/$1/ < /dev/null &>> wdir/i/$1/test.log; then
+		mkdir -p "${TEST_DIR}"
+		if ! setsid ./"$1" "${CRIU}" "${TEST_DIR}" < /dev/null &>> "${TEST_LOG}"; then
 			echo "$1: FAIL"
+			echo "** Output of ${TEST_LOG}"
+			cat "${TEST_LOG}"
+			echo "---------------"
+			if [ -f "${DUMP_LOG}" ]; then
+				echo "** Contents of dump.log"
+				cat "${DUMP_LOG}"
+				echo "---------------"
+			fi
+			if [ -f "${RESTORE_LOG}" ]; then
+				echo "** Contents of restore.log"
+				cat "${RESTORE_LOG}"
+				echo "---------------"
+			fi
 			RESULT=1
 		fi
 	fi
@@ -48,7 +54,7 @@ function run_test {
 run_test test_sub
 run_test test_self
 run_test test_notify
-if [ "$(uname -m)" == "x86_64" ]; then
+if [ "$(uname -m)" = "x86_64" ]; then
 	# Skip this on aarch64 as aarch64 has no dirty page tracking
 	run_test test_iters
 fi
@@ -57,5 +63,5 @@ run_test test_join_ns
 
 echo "== Tests done"
 make libcriu_clean
-[ $RESULT -eq 0 ] && echo "Success" || echo "FAIL"
-exit $RESULT
+[ "${RESULT}" -eq 0 ] && echo "Success" || echo "FAIL"
+exit "${RESULT}"

From 62b3779574b90b4f42b6463bd89fc35975298065 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Tue, 28 Sep 2021 10:17:55 +0100
Subject: [PATCH 0752/1854] Makefile: add shellcheck test/others/libcriu/*.sh

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 Makefile                   | 1 +
 test/others/libcriu/run.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 17e40bbf4..08761efed 100644
--- a/Makefile
+++ b/Makefile
@@ -413,6 +413,7 @@ lint:
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 	shellcheck test/others/crit/*.sh
+	shellcheck test/others/libcriu/*.sh
 	shellcheck test/others/config-file/*.sh
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index f7d2f5c6f..48f25a5f6 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -9,6 +9,7 @@ TEST_LOG="${TEST_DIR}/test.log"
 DUMP_LOG="${TEST_DIR}/dump.log"
 RESTORE_LOG="${TEST_DIR}/restore.log"
 
+# shellcheck disable=1091
 source "${MAIN_DIR}/../env.sh" || exit 1
 
 echo "== Clean"

From 4a1731891e91e62f15c40c361aff2a8a54d91bb3 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 13 Oct 2021 13:59:13 +0000
Subject: [PATCH 0753/1854] criu: Version 3.16.1

 * Switch criu-ns from unversioned 'python' to 'python3'
   for easier distribution packaging
 * Add '--join-ns' interface to libcriu to allow joining
   namespaces via libcriu like CLI and RPC already allow

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile.versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.versions b/Makefile.versions
index 32f2e95ce..49ac7a138 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -2,7 +2,7 @@
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
 CRIU_VERSION_MINOR	:= 16
-CRIU_VERSION_SUBLEVEL	:=
+CRIU_VERSION_SUBLEVEL	:= 1
 CRIU_VERSION_EXTRA	:=
 CRIU_VERSION_NAME	:= Petrified Puffin
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))

From be239109a82c56e3ba5c477081d6b54e293f204e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 6 Apr 2022 10:55:52 -0700
Subject: [PATCH 0754/1854] github: update the stale version

https://github.com/actions/stale/issues/708
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index beb6774e4..76d55d4c9 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'A friendly reminder that this issue had no activity for 30 days.'

From dd46e791965cae911e00f793faa3f8db8651ef0e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Mon, 20 Sep 2021 13:50:08 +0100
Subject: [PATCH 0755/1854] criu(8): add --external net option

Support for external net namespaces has been introduced with
commit c2b21fbf (criu: add support for external net namespaces).

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 Documentation/criu.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 690f61e14..3c4c1eaf8 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -242,6 +242,12 @@ In other words, do not use it unless really needed.
     Tell *criu* that one end of a pair of UNIX sockets (created by
     *socketpair*(2)) with the given _id_ is OK to be disconnected.
 
+*--external* **net[**__inode__**]:**__name__::
+    Mark a network namespace as external and do not include it in the
+    checkpoint. The label 'name' can be used with *--inherit-fd* during
+    restore to specify a file descriptor to a preconfigured network
+    namespace.
+
 *--external* **pid[**__inode__**]:**__name__::
     Mark a PID namespace as external. This can be later used to restore
     a process into an existing PID namespace. The label 'name' can be

From 17e2a8c7099c8a5f2ee336202cb26e949a688812 Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Thu, 15 Apr 2021 12:04:45 -0400
Subject: [PATCH 0756/1854] criu: Introduce new device file plugin hooks

Currently CRIU cannot handle Checkpoint Restore operations when a device
file is involved in a process, however, CRIU allows flexible extensions
via special plugins but still, for certain complex devices such as a GPU,
the existing hooks are not sufficient. This introduces few new hooks
that will be used to support Checkpoint Restore operation with AMD GPU
devices and potentially to other similar devices too.

 - HANDLE_DEVICE_VMA
 - UPDATE_VMA_MAP
 - RESUME_DEVICES_LATE

 *HANDLE_DEVICE_VMA:
	Hook to detect a suitable plugin to handle device file VMA with
	PF | IO mappings.

 *UPDATE_VMA_MAP:
	Hook to handle VMAs during a device file restore.

	When restoring VMAs for the device files, criu runs sys_mmap in
	the pie restore context but the offsets and file path within a
	device file may change during restore operation so it needs to be
	adjusted properly.

 *RESUME_DEVICES_LATE:
	Hook to do some special handling in late restore phase.

	During criu restore phase when a device is getting restored with
	the help of a plugin, some device specific operations might need
	to be delayed until criu finalizes the VMA placements in address
	space of the target process. But by the time criu finalizes this,
	its too late since pie phase is over and control is back to criu
	master process. This hook allows an external trigger to each
	resuming task to check whether it has a device specific operation
	pending such as issuing an ioctl call? Since this is called from
	criu master process context, supply the pid of the target process
	and give a chance to each plugin registered to run device
	specific operation if the target pid is valid.

A future patch will add consumers for these plugin hooks to support AMD
GPUs.

Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
---
 criu/cr-restore.c          | 23 +++++++++++++++++++
 criu/files-reg.c           | 17 ++++++++++++++
 criu/include/criu-plugin.h | 16 +++++++++++++
 criu/plugin.c              |  3 +++
 criu/proc_parse.c          | 47 +++++++++++++++++++++++++++++++++-----
 5 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9d2d957f8..ed62cc5a2 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2388,6 +2388,29 @@ skip_ns_bouncing:
 		pr_err("Unable to flush breakpoints\n");
 
 	finalize_restore();
+	/*
+	 * Some external devices such as GPUs might need a very late
+	 * trigger to kick-off some events, memory notifiers and for
+	 * restarting the previously restored queues during criu restore
+	 * stage. This is needed since criu pie code may shuffle VMAs
+	 * around so things such as registering MMU notifiers (for GPU
+	 * mapped memory) could be done sanely once the pie code hands
+	 * over the control to master process.
+	 */
+	for_each_pstree_item(item) {
+		pr_info("Run late stage hook from criu master for external devices\n");
+		ret = run_plugins(RESUME_DEVICES_LATE, item->pid->real);
+		/*
+		 * This may not really be an error. Only certain plugin hooks
+		 * (if available) will return success such as amdgpu_plugin that
+		 * validates the pid of the resuming tasks in the kernel mode.
+		 * Most of the times, it'll be -ENOTSUP and in few cases, it
+		 * might actually be a true error code but that would be also
+		 * captured in the plugin so no need to print the error here.
+		 */
+		if (ret < 0)
+			pr_debug("restore late stage hook for external plugin failed\n");
+	}
 
 	ret = run_scripts(ACT_PRE_RESUME);
 	if (ret)
diff --git a/criu/files-reg.c b/criu/files-reg.c
index ee54d1d7d..2b0347575 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2267,6 +2267,23 @@ static int open_filemap(int pid, struct vma_area *vma)
 	BUG_ON((vma->vmfd == NULL) || !vma->e->has_fdflags);
 	flags = vma->e->fdflags;
 
+	/* update the new device file page offsets and file paths set during restore */
+	if (vma->e->status & VMA_UNSUPP) {
+		uint64_t new_pgoff;
+		char new_path[PATH_MAX];
+		int ret;
+
+		struct reg_file_info *rfi = container_of(vma->vmfd, struct reg_file_info, d);
+		ret = run_plugins(UPDATE_VMA_MAP, rfi->rfe->name, new_path, vma->e->start, vma->e->pgoff, &new_pgoff);
+		if (ret == 1) {
+			pr_info("New mmap %#016" PRIx64 "->%#016" PRIx64 " path %s\n", vma->e->pgoff, new_pgoff,
+				new_path);
+			vma->e->pgoff = new_pgoff;
+			rfi->path = xstrdup(new_path);
+			pr_debug("Updated rfi->path %s\n", rfi->path);
+		}
+	}
+
 	if (ctx.flags != flags || ctx.desc != vma->vmfd) {
 		if (vma->e->status & VMA_AREA_MEMFD)
 			ret = memfd_open(vma->vmfd, &flags);
diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index 897666ecd..0bc7a4255 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -22,6 +22,8 @@
 
 #include <limits.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <sys/stat.h>
 
 #define CRIU_PLUGIN_GEN_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
 #define CRIU_PLUGIN_VERSION_MAJOR	 0
@@ -48,6 +50,12 @@ enum {
 
 	CR_PLUGIN_HOOK__DUMP_EXT_LINK = 6,
 
+	CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA = 7,
+
+	CR_PLUGIN_HOOK__UPDATE_VMA_MAP = 8,
+
+	CR_PLUGIN_HOOK__RESUME_DEVICES_LATE = 9,
+
 	CR_PLUGIN_HOOK__MAX
 };
 
@@ -60,6 +68,10 @@ DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_EXT_FILE, int id);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_MOUNT, char *mountpoint, int id);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_EXT_MOUNT, int id, char *mountpoint, char *old_root, int *is_file);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_LINK, int index, int type, char *kind);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, int fd, const struct stat *stat);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, const char *old_path, char *new_path, const uint64_t addr,
+			 const uint64_t old_pgoff, uint64_t *new_pgoff);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, int pid);
 
 enum {
 	CR_PLUGIN_STAGE__DUMP,
@@ -130,5 +142,9 @@ typedef int(cr_plugin_restore_file_t)(int id);
 typedef int(cr_plugin_dump_ext_mount_t)(char *mountpoint, int id);
 typedef int(cr_plugin_restore_ext_mount_t)(int id, char *mountpoint, char *old_root, int *is_file);
 typedef int(cr_plugin_dump_ext_link_t)(int index, int type, char *kind);
+typedef int(cr_plugin_handle_device_vma_t)(int fd, const struct stat *stat);
+typedef int(cr_plugin_update_vma_map_t)(const char *old_path, char *new_path, const uint64_t addr,
+					const uint64_t old_pgoff, uint64_t *new_pgoff);
+typedef int(cr_plugin_resume_devices_late_t)(int pid);
 
 #endif /* __CRIU_PLUGIN_H__ */
diff --git a/criu/plugin.c b/criu/plugin.c
index 3fe03c7cd..f3fea2856 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -54,6 +54,9 @@ static cr_plugin_desc_t *cr_gen_plugin_desc(void *h, char *path)
 	__assign_hook(DUMP_EXT_MOUNT, "cr_plugin_dump_ext_mount");
 	__assign_hook(RESTORE_EXT_MOUNT, "cr_plugin_restore_ext_mount");
 	__assign_hook(DUMP_EXT_LINK, "cr_plugin_dump_ext_link");
+	__assign_hook(HANDLE_DEVICE_VMA, "cr_plugin_handle_device_vma");
+	__assign_hook(UPDATE_VMA_MAP, "cr_plugin_update_vma_map");
+	__assign_hook(RESUME_DEVICES_LATE, "cr_plugin_resume_devices_late");
 
 #undef __assign_hook
 
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index f3491e781..8a9ce3a37 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -45,6 +45,7 @@
 #include "protobuf.h"
 #include "images/fdinfo.pb-c.h"
 #include "images/mnt.pb-c.h"
+#include "plugin.h"
 
 #include <stdlib.h>
 
@@ -103,6 +104,19 @@ bool is_vma_range_fmt(char *line)
 	return __is_vma_range_fmt(line);
 }
 
+bool handle_vma_plugin(int *fd, struct stat *stat)
+{
+	int ret;
+
+	ret = run_plugins(HANDLE_DEVICE_VMA, *fd, stat);
+	if (ret < 0) {
+		pr_perror("handle_device_vma plugin failed");
+		return false;
+	}
+
+	return true;
+}
+
 static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf)
 {
 	char *tok;
@@ -188,6 +202,7 @@ struct vma_file_info {
 	int dev_min;
 	unsigned long ino;
 	struct vma_area *vma;
+	bool has_device_plugin;
 };
 
 static inline int vfi_equal(struct vma_file_info *a, struct vma_file_info *b)
@@ -577,11 +592,17 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 	} else if (*vm_file_fd >= 0) {
 		struct stat *st_buf = vma_area->vmst;
 
-		if (S_ISREG(st_buf->st_mode))
+		if (S_ISREG(st_buf->st_mode)) {
 			/* regular file mapping -- supported */;
-		else if (S_ISCHR(st_buf->st_mode) && (st_buf->st_rdev == DEVZERO))
+			pr_debug("Found regular file mapping, OK\n");
+		} else if (S_ISCHR(st_buf->st_mode) && (st_buf->st_rdev == DEVZERO)) {
 			/* devzero mapping -- also makes sense */;
-		else {
+			pr_debug("Found devzero mapping, OK\n");
+		} else if (handle_vma_plugin(vm_file_fd, st_buf)) {
+			pr_info("Found device file mapping, plugin is available\n");
+			vfi->has_device_plugin = true;
+		} else {
+			/* non-regular mapping with no supporting plugin */
 			pr_err("Can't handle non-regular mapping on %d's map %" PRIx64 "\n", pid, vma_area->e->start);
 			goto err;
 		}
@@ -646,9 +667,23 @@ static int vma_list_add(struct vma_area *vma_area, struct vm_area_list *vma_area
 			struct vma_file_info *vfi, struct vma_file_info *prev_vfi)
 {
 	if (vma_area->e->status & VMA_UNSUPP) {
-		pr_err("Unsupported mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
-		       vma_area->e->end);
-		return -1;
+		if (vfi->has_device_plugin) {
+			/* Unsupported VMAs that provide special plugins for
+			 * backup can be treated as regular VMAs and criu
+			 * should only save their metadata in the dump files.
+			 * There can be several special backup plugins hooks
+			 * that might run at different stages during checkpoint
+			 * and restore.
+			 */
+			pr_debug("Device file mapping %016" PRIx64 "-%016" PRIx64 " "
+				 "must be supported via device plugins\n",
+				 vma_area->e->start, vma_area->e->end);
+
+		} else {
+			pr_err("Unsupported mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
+			       vma_area->e->end);
+			return -1;
+		}
 	}
 
 	/* Add a guard page only if here is enough space for it */

From 7b6239b6dd10ec4a68c859319a0a3836b7334f66 Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Thu, 15 Jul 2021 01:34:08 -0400
Subject: [PATCH 0757/1854] criu/plugin: Implement dummy amdgpu plugin hooks

This is just a placeholder dummy plugin and will be replaced by a proper
plugin that implements support for AMD GPU devices. This just
facilitates the initial pull request and CI build test trigger for early
code review of CRIU specific changes. Future PRs will bring in more
support for amdgpu_plugin to enable CRIU with AMD ROCm.

Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
---
 Makefile                      | 12 ++++++++++--
 Makefile.install              |  8 +++++++-
 plugins/amdgpu/Makefile       | 13 +++++++++++++
 plugins/amdgpu/dummy_plugin.c | 36 +++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 plugins/amdgpu/Makefile
 create mode 100644 plugins/amdgpu/dummy_plugin.c

diff --git a/Makefile b/Makefile
index 08761efed..c2c387e3a 100644
--- a/Makefile
+++ b/Makefile
@@ -284,15 +284,19 @@ clean mrproper:
 	$(Q) $(MAKE) $(build)=crit $@
 .PHONY: clean mrproper
 
+clean-dummy_amdgpu_plugin:
+	$(Q) $(MAKE) -C plugins/amdgpu clean
+.PHONY: clean dummy_amdgpu_plugin
+
 clean-top:
 	$(Q) $(MAKE) -C Documentation clean
 	$(Q) $(MAKE) $(build)=test/compel clean
 	$(Q) $(RM) .gitid
 .PHONY: clean-top
 
-clean: clean-top
+clean: clean-top clean-dummy_amdgpu_plugin
 
-mrproper-top: clean-top
+mrproper-top: clean-top clean-dummy_amdgpu_plugin
 	$(Q) $(RM) $(CONFIG_HEADER)
 	$(Q) $(RM) $(VERSION_HEADER)
 	$(Q) $(RM) $(COMPEL_VERSION_HEADER)
@@ -320,6 +324,10 @@ test: zdtm
 	$(Q) $(MAKE) -C test
 .PHONY: test
 
+dummy_amdgpu_plugin:
+	$(Q) $(MAKE) -C plugins/amdgpu all
+.PHONY: dummy_amdgpu_plugin
+
 #
 # Generating tar requires tag matched CRIU_VERSION.
 # If not found then simply use GIT's describe with
diff --git a/Makefile.install b/Makefile.install
index 3987bcc6f..52e8c06da 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -7,6 +7,7 @@ MANDIR		?= $(PREFIX)/share/man
 INCLUDEDIR	?= $(PREFIX)/include
 LIBEXECDIR	?= $(PREFIX)/libexec
 RUNDIR		?= /run
+PLUGINDIR	?= /var/lib/criu
 
 #
 # For recent Debian/Ubuntu with multiarch support.
@@ -26,7 +27,7 @@ endif
 LIBDIR ?= $(PREFIX)/lib
 
 export PREFIX BINDIR SBINDIR MANDIR RUNDIR
-export LIBDIR INCLUDEDIR LIBEXECDIR
+export LIBDIR INCLUDEDIR LIBEXECDIR PLUGINDIR
 
 install-man:
 	$(Q) $(MAKE) -C Documentation install
@@ -40,6 +41,10 @@ install-criu: criu
 	$(Q) $(MAKE) $(build)=criu install
 .PHONY: install-criu
 
+install-dummy_amdgpu_plugin: dummy_amdgpu_plugin
+	$(Q) $(MAKE) -C plugins/amdgpu install
+.PHONY: install-dummy_amdgpu_plugin
+
 install-compel: $(compel-install-targets)
 	$(Q) $(MAKE) $(build)=compel install
 	$(Q) $(MAKE) $(build)=compel/plugins install
@@ -54,4 +59,5 @@ uninstall:
 	$(Q) $(MAKE) $(build)=criu $@
 	$(Q) $(MAKE) $(build)=compel $@
 	$(Q) $(MAKE) $(build)=compel/plugins $@
+	$(Q) $(MAKE) -C plugins/amdgpu $@
 .PHONY: uninstall
diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
new file mode 100644
index 000000000..45a9ec611
--- /dev/null
+++ b/plugins/amdgpu/Makefile
@@ -0,0 +1,13 @@
+all: dummy_plugin.so
+
+dummy_plugin.so: dummy_plugin.c
+	gcc -g -Werror -D _GNU_SOURCE -Wall -shared -nostartfiles dummy_plugin.c -o dummy_plugin.so -iquote ../../../criu/include -iquote ../../criu/include -fPIC
+
+clean:
+	$(Q) $(RM) dummy_plugin.so
+install:
+	$(Q) mkdir -p $(PLUGINDIR)
+	$(Q) install -m 644 dummy_plugin.so $(PLUGINDIR)
+
+uninstall:
+	$(Q) $(RM) $(PLUGINDIR)/dummy_plugin.so
diff --git a/plugins/amdgpu/dummy_plugin.c b/plugins/amdgpu/dummy_plugin.c
new file mode 100644
index 000000000..872276095
--- /dev/null
+++ b/plugins/amdgpu/dummy_plugin.c
@@ -0,0 +1,36 @@
+#include <sys/stat.h>
+
+#include "criu-log.h"
+#include "criu-plugin.h"
+
+int dummy_plugin_handle_device_vma(int fd, const struct stat *stat)
+{
+	pr_info("dummy_plugin: Inside %s for fd = %d\n", __func__, fd);
+	/* let criu report failure for the unsupported mapping */
+	return -ENOTSUP;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, dummy_plugin_handle_device_vma)
+
+int dummy_plugin_resume_devices_late(int target_pid)
+{
+	pr_info("dummy_plugin: Inside %s for target pid = %d\n", __func__, target_pid);
+	return -ENOTSUP;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, dummy_plugin_resume_devices_late)
+
+/*
+ * return 0 if no match found
+ * return -1 for error or -ENOTSUP.
+ * return 1 if vmap map must be adjusted.
+ */
+int dummy_plugin_update_vmamap(const char *old_path, char *new_path, const uint64_t addr, const uint64_t old_offset,
+			       uint64_t *new_offset)
+{
+	uint64_t temp = 100;
+
+	*new_offset = temp;
+	pr_info("dummy_plugin: old_pgoff= 0x%lu new_pgoff = 0x%lx old_path = %s new_path = %s addr = 0x%lu\n",
+		old_offset, *new_offset, old_path, new_path, addr);
+	return -ENOTSUP;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, dummy_plugin_update_vmamap)

From 74d1233b596c52ae8dc5da4730e6e3e48152023e Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Tue, 27 Apr 2021 19:08:57 -0400
Subject: [PATCH 0758/1854] criu/files: Don't cache fd ids for device files

Restore operation fails when we perform CR operation of multiple
independent proceses that have device files  because criu caches
the ids for the device files with same mnt_ids, inode pair. This
change ensures that even in case of a cached id found for a device, a
unique subid is generated and returned which is used for dumping.

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
---
 criu/file-ids.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/criu/file-ids.c b/criu/file-ids.c
index 1b9d68888..772bd92cf 100644
--- a/criu/file-ids.c
+++ b/criu/file-ids.c
@@ -77,8 +77,14 @@ int fd_id_generate_special(struct fd_parms *p, u32 *id)
 
 		fi = fd_id_cache_lookup(p);
 		if (fi) {
-			*id = fi->id;
-			return 0;
+			if (p->stat.st_mode & (S_IFCHR | S_IFBLK)) {
+				/* Don't cache the id for mapped devices */
+				*id = fd_tree.subid++;
+				return 1;
+			} else {
+				*id = fi->id;
+				return 0;
+			}
 		}
 	}
 

From 7959730551c49c5743240e6fd4c3e81468e4dab4 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 12 Aug 2021 11:05:09 +0000
Subject: [PATCH 0759/1854] tcp: Skip restoring TCP state when dumping with
 --tcp-close

Since commit e42f5e0 ("tcp: allow to specify --tcp-close on dump"),
--tcp-close option can be used when checkpointing. This option skips
checkpointing established socket's state (including once established
but now closed socket). However, when restoring, we still try to
restore closed socket's state. As a result, a non-existent protobuf
image is opened.

This commit skips TCP_CLOSE socket when restoring established TCP
connection and removes the redundant check for TCP_LISTEN socket as
TCP_LISTEN socket cannot reach this function.

Suggested-by: Andrei Vagin <avagin@gmail.com>
Suggested-by: Radostin Stoyanov <radostin@redhat.com>
Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/sk-tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 0afecd2d6..96d5d13bf 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -451,7 +451,7 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii)
 
 	pr_info("Restoring TCP connection\n");
 
-	if (opts.tcp_close && ii->ie->state != TCP_LISTEN && ii->ie->state != TCP_CLOSE) {
+	if (opts.tcp_close) {
 		if (shutdown(fd, SHUT_RDWR) && errno != ENOTCONN) {
 			pr_perror("Unable to shutdown the socket id %x ino %x", ii->ie->id, ii->ie->ino);
 		}

From abf6b15c14a84f141e04a4344cf37b38e91c352a Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Mon, 20 Sep 2021 20:57:03 +0700
Subject: [PATCH 0760/1854] zdtm: Dumping/restoring with --tcp-close on
 TCP_CLOSE socket

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile               |  1 +
 test/zdtm/static/socket-tcp-close2.c    | 67 +++++++++++++++++++++++++
 test/zdtm/static/socket-tcp-close2.desc |  1 +
 3 files changed, 69 insertions(+)
 create mode 100644 test/zdtm/static/socket-tcp-close2.c
 create mode 100644 test/zdtm/static/socket-tcp-close2.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index c9e6589f0..b6aa621c7 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -107,6 +107,7 @@ TST_NOFILE	:=				\
 		socket-tcp4v6-closed		\
 		socket-tcp-close0 		\
 		socket-tcp-close1 		\
+		socket-tcp-close2		\
 		socket-dump-tcp-close 		\
 		socket-tcp-unconn		\
 		socket-tcp6-unconn		\
diff --git a/test/zdtm/static/socket-tcp-close2.c b/test/zdtm/static/socket-tcp-close2.c
new file mode 100644
index 000000000..697c99f39
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-close2.c
@@ -0,0 +1,67 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+#include <linux/types.h>
+#include <signal.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check both dump and restore with tcp_close on TCP_CLOSE sockets";
+const char *test_author = "Bui Quang Minh <minhquangbui99@gmail.com>";
+
+static int port = 8880;
+
+int main(int argc, char **argv)
+{
+	int fd_s, fd, client;
+	char c;
+
+	test_init(argc, argv);
+	signal(SIGPIPE, SIG_IGN);
+
+	fd_s = tcp_init_server(AF_INET, &port);
+	if (fd_s < 0) {
+		pr_err("Server initializations failed\n");
+		return 1;
+	}
+
+	client = tcp_init_client(AF_INET, "localhost", port);
+	if (client < 0) {
+		pr_err("Client initializations failed\n");
+		return 1;
+	}
+
+	fd = tcp_accept_server(fd_s);
+	if (fd < 0) {
+		pr_err("Can't accept client\n");
+		return 1;
+	}
+	close(fd_s);
+
+	shutdown(client, SHUT_WR);
+	shutdown(fd, SHUT_WR);
+
+	test_daemon();
+	test_waitsig();
+
+	if (read(fd, &c, 1) != 0) {
+		fail("read server");
+		return 1;
+	}
+	if (read(client, &c, 1) != 0) {
+		fail("read client");
+		return 1;
+	}
+	if (write(client, &c, 1) != -1) {
+		fail("write client");
+		return 1;
+	}
+	if (write(fd, &c, 1) != -1) {
+		fail("write server");
+		return 1;
+	}
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/socket-tcp-close2.desc b/test/zdtm/static/socket-tcp-close2.desc
new file mode 100644
index 000000000..c53a1f315
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-close2.desc
@@ -0,0 +1 @@
+{'opts': '--tcp-close', 'flags': 'reqrst '}

From f24360658f316b49cf54bba2edbb5281e38341f1 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Mon, 4 Oct 2021 20:38:34 +0700
Subject: [PATCH 0761/1854] criu(8): Add more detailed description about
 --tcp-close dump option

The expected behavior of --tcp-close option when dumpping is to close
all established tcp connections including connection that is once
established but now closed. This adds an explicit description about
that behavior.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 Documentation/criu.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 3c4c1eaf8..4c6885fc9 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -334,7 +334,8 @@ mount -t cgroup -o devices,freezer none devices,freezer
     Checkpoint established TCP connections.
 
 *--tcp-close*::
-    Don't dump the state of, or block, established tcp connections.
+    Don't dump the state of, or block, established tcp connections
+    (including the connection is once established but now closed).
     This is useful when tcp connections are not going to be restored.
 
 *--skip-in-flight*::

From 3180d35fa4f15e918bd1caf51d7fa75278c4f74b Mon Sep 17 00:00:00 2001
From: Andrey Vyazovtsev <viazovtsev.av@phystech.edu>
Date: Thu, 26 Aug 2021 22:22:33 +0300
Subject: [PATCH 0762/1854] Add support for python3 in criu-coredump

Resolve the following python3 portability issues:

1) Python 3 needs explicit relative import path.

2) Coredumps are binary data, not unicode strings. Use byte strings
(b"" instead of "") and open files in binary format.

3) Some functions (for example: filter) return a list in python 2,
but an iterator in python 3. Port code to a common subset of python 2
and python 3 using itertool.

4) Division operator / changed meaning in Python 3. Use explicit
integer division (//) where appropriate.

Signed-off-by: Andrey Vyazovtsev <viazovtsev.av@phystech.edu>
---
 coredump/criu-coredump             |  4 +-
 coredump/criu_coredump/__init__.py |  4 +-
 coredump/criu_coredump/coredump.py | 68 ++++++++++++++++++------------
 coredump/criu_coredump/elf.py      |  2 +-
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/coredump/criu-coredump b/coredump/criu-coredump
index 25c188c6b..d3113d372 100755
--- a/coredump/criu-coredump
+++ b/coredump/criu-coredump
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 import argparse
 import os
 
@@ -10,7 +10,7 @@ def coredump(opts):
 	for pid in cores:
 		if opts['pid'] and pid != opts['pid']:
 			continue
-		with open(os.path.realpath(opts['out'])+"/core."+str(pid), 'w+') as f:
+		with open(os.path.realpath(opts['out'])+"/core."+str(pid), 'wb+') as f:
 			cores[pid].write(f)
 
 
diff --git a/coredump/criu_coredump/__init__.py b/coredump/criu_coredump/__init__.py
index 213af42ec..7f947518e 100644
--- a/coredump/criu_coredump/__init__.py
+++ b/coredump/criu_coredump/__init__.py
@@ -1,2 +1,2 @@
-from coredump import *
-import elf
+from .coredump import *
+from . import elf
diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index b37ef2291..d67c335c1 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -29,9 +29,14 @@
 #    4) VMAs contents;
 #
 import io
-import elf
+import sys
+from . import elf
 import ctypes
 from pycriu import images
+try:
+    from itertools import ifilter as filter
+except ImportError:
+    pass
 
 # Some memory-related constants
 PAGESIZE = 4096
@@ -88,7 +93,7 @@ class coredump:
         for note in self.notes:
             buf.write(note.nhdr)
             buf.write(note.owner)
-            buf.write("\0" * (8 - len(note.owner)))
+            buf.write(b"\0" * (8 - len(note.owner)))
             buf.write(note.data)
 
         offset = ctypes.sizeof(elf.Elf64_Ehdr())
@@ -136,7 +141,7 @@ class coredump_generator:
             path += "-" + str(pid)
         path += ".img"
 
-        with open(path) as f:
+        with open(path, 'rb') as f:
             img = images.load(f)
 
         if single:
@@ -177,7 +182,7 @@ class coredump_generator:
         for p in self.coredumps:
             if pid and p != pid:
                 continue
-            with open(coredumps_dir + "/" + "core." + str(p), 'w+') as f:
+            with open(coredumps_dir + "/" + "core." + str(p), 'wb+') as f:
                 self.coredumps[p].write(f)
 
     def _gen_coredump(self, pid):
@@ -295,7 +300,7 @@ class coredump_generator:
             prpsinfo.pr_state = 3
         # Don't even ask me why it is so, just borrowed from linux
         # source and made pr_state match.
-        prpsinfo.pr_sname = '.' if prpsinfo.pr_state > 5 else "RSDTZW" [
+        prpsinfo.pr_sname = b'.' if prpsinfo.pr_state > 5 else b"RSDTZW" [
             prpsinfo.pr_state]
         prpsinfo.pr_zomb = 1 if prpsinfo.pr_state == 4 else 0
         prpsinfo.pr_nice = core["thread_core"][
@@ -307,8 +312,12 @@ class coredump_generator:
         prpsinfo.pr_ppid = pstree["ppid"]
         prpsinfo.pr_pgrp = pstree["pgid"]
         prpsinfo.pr_sid = pstree["sid"]
-        prpsinfo.pr_fname = core["tc"]["comm"]
         prpsinfo.pr_psargs = self._gen_cmdline(pid)
+        if (sys.version_info > (3, 0)):
+            prpsinfo.pr_fname = core["tc"]["comm"].encode()
+        else:
+            prpsinfo.pr_fname = core["tc"]["comm"]
+
 
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
@@ -317,7 +326,7 @@ class coredump_generator:
 
         note = elf_note()
         note.data = prpsinfo
-        note.owner = "CORE"
+        note.owner = b"CORE"
         note.nhdr = nhdr
 
         return note
@@ -375,7 +384,7 @@ class coredump_generator:
 
         note = elf_note()
         note.data = prstatus
-        note.owner = "CORE"
+        note.owner = b"CORE"
         note.nhdr = nhdr
 
         return note
@@ -411,7 +420,7 @@ class coredump_generator:
 
         note = elf_note()
         note.data = fpregset
-        note.owner = "CORE"
+        note.owner = b"CORE"
         note.nhdr = nhdr
 
         return note
@@ -452,7 +461,7 @@ class coredump_generator:
 
         note = elf_note()
         note.data = data
-        note.owner = "LINUX"
+        note.owner = b"LINUX"
         note.nhdr = nhdr
 
         return note
@@ -472,7 +481,7 @@ class coredump_generator:
 
         note = elf_note()
         note.data = siginfo
-        note.owner = "CORE"
+        note.owner = b"CORE"
         note.nhdr = nhdr
 
         return note
@@ -482,7 +491,7 @@ class coredump_generator:
         Generate NT_AUXV note for thread tid of process pid.
         """
         mm = self.mms[pid]
-        num_auxv = len(mm["mm_saved_auxv"]) / 2
+        num_auxv = len(mm["mm_saved_auxv"]) // 2
 
         class elf_auxv(ctypes.Structure):
             _fields_ = [("auxv", elf.Elf64_auxv_t * num_auxv)]
@@ -499,7 +508,7 @@ class coredump_generator:
 
         note = elf_note()
         note.data = auxv
-        note.owner = "CORE"
+        note.owner = b"CORE"
         note.nhdr = nhdr
 
         return note
@@ -523,10 +532,10 @@ class coredump_generator:
                 continue
 
             shmid = vma["shmid"]
-            off = vma["pgoff"] / PAGESIZE
+            off = vma["pgoff"] // PAGESIZE
 
             files = self.reg_files
-            fname = filter(lambda x: x["id"] == shmid, files)[0]["name"]
+            fname = next(filter(lambda x: x["id"] == shmid, files))["name"]
 
             info = mmaped_file_info()
             info.start = vma["start"]
@@ -569,7 +578,10 @@ class coredump_generator:
             setattr(data, "start" + str(i), info.start)
             setattr(data, "end" + str(i), info.end)
             setattr(data, "file_ofs" + str(i), info.file_ofs)
-            setattr(data, "name" + str(i), info.name)
+            if (sys.version_info > (3, 0)):
+                setattr(data, "name" + str(i), info.name.encode())
+            else:
+                setattr(data, "name" + str(i), info.name)
 
         nhdr = elf.Elf64_Nhdr()
 
@@ -579,7 +591,7 @@ class coredump_generator:
 
         note = elf_note()
         note.nhdr = nhdr
-        note.owner = "CORE"
+        note.owner = b"CORE"
         note.data = data
 
         return note
@@ -644,7 +656,7 @@ class coredump_generator:
                 ppid = self.pstree[pid]["ppid"]
                 return self._get_page(ppid, page_no)
             else:
-                with open(self._imgs_dir + "/pages-%s.img" % pages_id) as f:
+                with open(self._imgs_dir + "/pages-%s.img" % pages_id, 'rb') as f:
                     f.seek(off * PAGESIZE)
                     return f.read(PAGESIZE)
 
@@ -657,16 +669,16 @@ class coredump_generator:
         f = None
 
         if size == 0:
-            return ""
+            return b""
 
         if vma["status"] & status["VMA_AREA_VVAR"]:
             #FIXME this is what gdb does, as vvar vma
             # is not readable from userspace?
-            return "\0" * size
+            return b"\0" * size
         elif vma["status"] & status["VMA_AREA_VSYSCALL"]:
             #FIXME need to dump it with criu or read from
             # current process.
-            return "\0" * size
+            return b"\0" * size
 
         if vma["status"] & status["VMA_FILE_SHARED"] or \
            vma["status"] & status["VMA_FILE_PRIVATE"]:
@@ -675,9 +687,9 @@ class coredump_generator:
             off = vma["pgoff"]
 
             files = self.reg_files
-            fname = filter(lambda x: x["id"] == shmid, files)[0]["name"]
+            fname = next(filter(lambda x: x["id"] == shmid, files))["name"]
 
-            f = open(fname)
+            f = open(fname, 'rb')
             f.seek(off)
 
         start = vma["start"]
@@ -699,10 +711,10 @@ class coredump_generator:
         # a file, and changed ones -- from pages.img.
         # Finally, if no page is found neither in pages.img nor
         # in file, hole in inserted -- a page filled with zeroes.
-        start_page = start / PAGESIZE
-        end_page = end / PAGESIZE
+        start_page = start // PAGESIZE
+        end_page = end // PAGESIZE
 
-        buf = ""
+        buf = b""
         for page_no in range(start_page, end_page + 1):
             page = None
 
@@ -720,7 +732,7 @@ class coredump_generator:
 
             if page is None:
                 # Hole
-                page = PAGESIZE * "\0"
+                page = PAGESIZE * b"\0"
 
             # If it is a start or end page, we need to read
             # only part of it.
@@ -762,7 +774,7 @@ class coredump_generator:
         chunk = self._gen_mem_chunk(pid, vma, size)
 
         # Replace all '\0's with spaces.
-        return chunk.replace('\0', ' ')
+        return chunk.replace(b'\0', b' ')
 
     def _get_vma_dump_size(self, vma):
         """
diff --git a/coredump/criu_coredump/elf.py b/coredump/criu_coredump/elf.py
index e65919e6b..a670ae866 100644
--- a/coredump/criu_coredump/elf.py
+++ b/coredump/criu_coredump/elf.py
@@ -368,7 +368,7 @@ elf_fpregset_t = user_fpregs_struct
 # siginfo_t related constants.
 
 _SI_MAX_SIZE = 128
-_SI_PAD_SIZE = (_SI_MAX_SIZE / ctypes.sizeof(ctypes.c_int)) - 4
+_SI_PAD_SIZE = (_SI_MAX_SIZE // ctypes.sizeof(ctypes.c_int)) - 4
 
 
 #          /* kill().  */

From 1c866dbb51b3f5211b836705ba339380540dd604 Mon Sep 17 00:00:00 2001
From: AndreyVV-100 <viazovtsev.av@phystech.edu>
Date: Fri, 23 Jul 2021 12:48:03 +0300
Subject: [PATCH 0763/1854] Add new files for running criu-coredump via python
 2 or 3

Previous commit added support for python3 in criu-coredump. For convenience,
add two files (coredump-python2 and coredump-python3) that start
criu-coredump with respective python version. Edit env.sh accordingly.

Signed-off-by: Andrey Vyazovtsev <viazovtsev.av@phystech.edu>
---
 coredump/coredump-python2               | 6 ++++++
 coredump/coredump-python3               | 6 ++++++
 coredump/{criu-coredump => coredump.py} | 1 -
 test/others/env.sh                      | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100755 coredump/coredump-python2
 create mode 100755 coredump/coredump-python3
 rename coredump/{criu-coredump => coredump.py} (97%)

diff --git a/coredump/coredump-python2 b/coredump/coredump-python2
new file mode 100755
index 000000000..3a15c90a3
--- /dev/null
+++ b/coredump/coredump-python2
@@ -0,0 +1,6 @@
+#!/usr/bin/env python2
+
+import coredump
+
+if __name__ == '__main__':
+	coredump.main()
diff --git a/coredump/coredump-python3 b/coredump/coredump-python3
new file mode 100755
index 000000000..82ec6b855
--- /dev/null
+++ b/coredump/coredump-python3
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+import coredump
+
+if __name__ == '__main__':
+	coredump.main()
diff --git a/coredump/criu-coredump b/coredump/coredump.py
similarity index 97%
rename from coredump/criu-coredump
rename to coredump/coredump.py
index d3113d372..56ba54083 100755
--- a/coredump/criu-coredump
+++ b/coredump/coredump.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import argparse
 import os
 
diff --git a/test/others/env.sh b/test/others/env.sh
index b514e87d9..e2f63eee3 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -13,5 +13,5 @@ fi
 #export PYTHON
 CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
 crit=$CRIT
-CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu-coredump/criu-coredump)
+CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu-coredump/coredump-"${PYTHON}")
 criu_coredump=$CRIU_COREDUMP

From a0b738cb8fd299900123d90c626c419644f1160c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:31:12 +0100
Subject: [PATCH 0764/1854] coredump: remove unused import

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/__init__.py | 3 +--
 scripts/flake8.cfg                 | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/coredump/criu_coredump/__init__.py b/coredump/criu_coredump/__init__.py
index 7f947518e..c1a437cf4 100644
--- a/coredump/criu_coredump/__init__.py
+++ b/coredump/criu_coredump/__init__.py
@@ -1,2 +1 @@
-from .coredump import *
-from . import elf
+from .coredump import coredump_generator
diff --git a/scripts/flake8.cfg b/scripts/flake8.cfg
index b6a587729..bd4f95bb2 100644
--- a/scripts/flake8.cfg
+++ b/scripts/flake8.cfg
@@ -2,3 +2,5 @@
 # E501 line too long
 # W504 line break after binary operator
 ignore = E501,W504
+# F401: imported but unused
+per-file-ignores = __init__.py:F401

From bf8a3c9f62302f73099223de93b6bdd7e2b13a18 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:32:17 +0100
Subject: [PATCH 0765/1854] coredump: sort imports

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index d67c335c1..9b4aad5ff 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -30,9 +30,12 @@
 #
 import io
 import sys
-from . import elf
 import ctypes
+
 from pycriu import images
+from . import elf
+
+
 try:
     from itertools import ifilter as filter
 except ImportError:

From c71a81a6bdeb943bbe8311177bbc0001bc5196df Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:34:00 +0100
Subject: [PATCH 0766/1854] coredump: convert indentation to spaces

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/coredump-python2 |  2 +-
 coredump/coredump-python3 |  2 +-
 coredump/coredump.py      | 52 ++++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/coredump/coredump-python2 b/coredump/coredump-python2
index 3a15c90a3..564c05ce9 100755
--- a/coredump/coredump-python2
+++ b/coredump/coredump-python2
@@ -3,4 +3,4 @@
 import coredump
 
 if __name__ == '__main__':
-	coredump.main()
+    coredump.main()
diff --git a/coredump/coredump-python3 b/coredump/coredump-python3
index 82ec6b855..3032dbadf 100755
--- a/coredump/coredump-python3
+++ b/coredump/coredump-python3
@@ -3,4 +3,4 @@
 import coredump
 
 if __name__ == '__main__':
-	coredump.main()
+    coredump.main()
diff --git a/coredump/coredump.py b/coredump/coredump.py
index 56ba54083..e63abf951 100755
--- a/coredump/coredump.py
+++ b/coredump/coredump.py
@@ -3,37 +3,39 @@ import os
 
 import criu_coredump
 
+
 def coredump(opts):
-	generator = criu_coredump.coredump_generator()
-	cores = generator(os.path.realpath(opts['in']))
-	for pid in cores:
-		if opts['pid'] and pid != opts['pid']:
-			continue
-		with open(os.path.realpath(opts['out'])+"/core."+str(pid), 'wb+') as f:
-			cores[pid].write(f)
+    generator = criu_coredump.coredump_generator()
+    cores = generator(os.path.realpath(opts['in']))
+    for pid in cores:
+        if opts['pid'] and pid != opts['pid']:
+            continue
+        with open(os.path.realpath(opts['out'])+"/core."+str(pid), 'wb+') as f:
+            cores[pid].write(f)
 
 
 def main():
-	desc = 'CRIU core dump'
-	parser = argparse.ArgumentParser(description=desc,
-			formatter_class=argparse.RawTextHelpFormatter)
+    desc = 'CRIU core dump'
+    parser = argparse.ArgumentParser(description=desc,
+                                     formatter_class=argparse.RawTextHelpFormatter)
 
-	parser.add_argument('-i',
-			    '--in',
-			    default = '.',
-			    help = 'directory where to get images from')
-	parser.add_argument('-p',
-			    '--pid',
-			    type = int,
-			    help = 'generate coredump for specific pid(all pids py default)')
-	parser.add_argument('-o',
-			    '--out',
-			    default = '.',
-			    help = 'directory to write coredumps to')
+    parser.add_argument('-i',
+                        '--in',
+                        default='.',
+                        help='directory where to get images from')
+    parser.add_argument('-p',
+                        '--pid',
+                        type=int,
+                        help='generate coredump for specific pid(all pids py default)')
+    parser.add_argument('-o',
+                        '--out',
+                        default='.',
+                        help='directory to write coredumps to')
 
-	opts = vars(parser.parse_args())
+    opts = vars(parser.parse_args())
+
+    coredump(opts)
 
-	coredump(opts)
 
 if __name__ == '__main__':
-	main()
+    main()

From a92a7887a6d44d3eb947cfccc96b309b1bfc8d79 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:36:10 +0100
Subject: [PATCH 0767/1854] python: replace equality with identity test

PEP8 recommends for comparisons to singletons like None to always be
done with 'is' or 'is not', never the equality operators.

https://python.org/dev/peps/pep-0008/#programming-recommendations

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py |  6 +++---
 test/exhaustive/pipe.py            | 12 ++++++------
 test/exhaustive/unix.py            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 9b4aad5ff..a9a8bb27c 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -725,10 +725,10 @@ class coredump_generator:
             # and choose appropriate.
             page_mem = self._get_page(pid, page_no)
 
-            if f != None:
+            if f is not None:
                 page = f.read(PAGESIZE)
 
-            if page_mem != None:
+            if page_mem is not None:
                 # Page from pages.img has higher priority
                 # than one from maped file on disk.
                 page = page_mem
@@ -755,7 +755,7 @@ class coredump_generator:
             buf += page[n_skip:n_skip + n_read]
 
         # Don't forget to close file.
-        if f != None:
+        if f is not None:
             f.close()
 
         return buf
diff --git a/test/exhaustive/pipe.py b/test/exhaustive/pipe.py
index fdadc480c..7f1c53d34 100755
--- a/test/exhaustive/pipe.py
+++ b/test/exhaustive/pipe.py
@@ -75,7 +75,7 @@ def get_pipe_rw(pid, fd):
 
 def check_pipe_y(pid, fd, rw, inos):
     ino = get_pipe_ino(pid, fd)
-    if ino == None:
+    if ino is None:
         return 'missing '
     if not inos.has_key(fd):
         inos[fd] = ino
@@ -89,7 +89,7 @@ def check_pipe_y(pid, fd, rw, inos):
 
 def check_pipe_n(pid, fd):
     ino = get_pipe_ino(pid, fd)
-    if ino == None:
+    if ino is None:
         return None
     else:
         return 'present '
@@ -102,7 +102,7 @@ def check_pipe_end(kids, fd, comb, rw, inos):
             res = check_pipe_y(t_pid, fd, rw, inos)
         else:
             res = check_pipe_n(t_pid, fd)
-        if res != None:
+        if res is not None:
             return res + 'kid(%d)' % t_nr
         t_nr += 1
     return None
@@ -111,7 +111,7 @@ def check_pipe_end(kids, fd, comb, rw, inos):
 def check_pipe(kids, fds, comb, inos):
     for e in (0, 1):  # 0 == R, 1 == W, see get_pipe_rw()
         res = check_pipe_end(kids, fds[e], comb[e], e, inos)
-        if res != None:
+        if res is not None:
             return res + 'end(%d)' % e
     return None
 
@@ -124,7 +124,7 @@ def check_pipes(kids, pipes, comb):
     p_inos = {}
     for p_fds in pipes:
         res = check_pipe(kids, p_fds, comb[p_nr], p_inos)
-        if res != None:
+        if res is not None:
             return res + 'pipe(%d)' % p_nr
         p_nr += 1
 
@@ -182,7 +182,7 @@ def make_comb(comb, opts, status_pipe):
         if v == '0':
             print('\tCheck pipes')
             res = check_pipes(kids, pipes, comb)
-            if res == None:
+            if res is None:
                 ex_code = 0
             else:
                 print('\tFAIL %s' % res)
diff --git a/test/exhaustive/unix.py b/test/exhaustive/unix.py
index 98dbbb7b0..114bf957b 100755
--- a/test/exhaustive/unix.py
+++ b/test/exhaustive/unix.py
@@ -304,7 +304,7 @@ class sock:
         for psk in st.sockets:
             if psk == self:
                 continue
-            if psk.peer != None and psk.peer != self.sk_id:
+            if psk.peer is not None and psk.peer != self.sk_id:
                 # Peer by someone else, can do nothing
                 continue
 

From 1b368238b59b08089d86662e64349000dc5b071a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:38:06 +0100
Subject: [PATCH 0768/1854] coredump: drop unused variable

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index a9a8bb27c..42c2fed19 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -834,8 +834,6 @@ class coredump_generator:
 
         vmas = []
         for vma in mm["vmas"]:
-            size = self._get_vma_dump_size(vma)
-
             v = vma_class()
             v.filesz = self._get_vma_dump_size(vma)
             v.data = self._gen_mem_chunk(pid, vma, v.filesz)

From 06306c8b1e9e1b0b628387570c93a341d8d84184 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:42:46 +0100
Subject: [PATCH 0769/1854] coredump: drop exec permission

The shebang line in this file was removed in a previous commit and the
file should be non-executable.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/coredump.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 coredump/coredump.py

diff --git a/coredump/coredump.py b/coredump/coredump.py
old mode 100755
new mode 100644

From 579066633ba3f2c3b9c6e4dfe1d8182cebb600ec Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 21:53:06 +0100
Subject: [PATCH 0770/1854] coredump: lint fix for block comments

Block comment should start with '# '
https://www.flake8rules.com/rules/E265.html

Inline comment should start with '# '
https://www.flake8rules.com/rules/E262.html

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py |  11 +-
 coredump/criu_coredump/elf.py      | 987 +++++++++++++++++------------
 2 files changed, 578 insertions(+), 420 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 42c2fed19..274889800 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -223,7 +223,7 @@ class coredump_generator:
         ehdr.e_phoff = ctypes.sizeof(elf.Elf64_Ehdr())
         ehdr.e_ehsize = ctypes.sizeof(elf.Elf64_Ehdr())
         ehdr.e_phentsize = ctypes.sizeof(elf.Elf64_Phdr())
-        #FIXME Case len(phdrs) > PN_XNUM should be handled properly.
+        # FIXME Case len(phdrs) > PN_XNUM should be handled properly.
         # See fs/binfmt_elf.c from linux kernel.
         ehdr.e_phnum = len(phdrs)
 
@@ -346,7 +346,7 @@ class coredump_generator:
 
         ctypes.memset(ctypes.addressof(prstatus), 0, ctypes.sizeof(prstatus))
 
-        #FIXME setting only some of the fields for now. Revisit later.
+        # FIXME setting only some of the fields for now. Revisit later.
         prstatus.pr_pid = tid
         prstatus.pr_ppid = pstree["ppid"]
         prstatus.pr_pgrp = pstree["pgid"]
@@ -414,7 +414,6 @@ class coredump_generator:
             *regs["st_space"])
         fpregset.xmm_space = (ctypes.c_uint * len(regs["xmm_space"]))(
             *regs["xmm_space"])
-        #fpregset.padding    = regs["padding"] unused
 
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
@@ -588,7 +587,7 @@ class coredump_generator:
 
         nhdr = elf.Elf64_Nhdr()
 
-        nhdr.n_namesz = 5  #XXX strlen + 1
+        nhdr.n_namesz = 5  # strlen + 1
         nhdr.n_descsz = ctypes.sizeof(elf_files())
         nhdr.n_type = elf.NT_FILE
 
@@ -675,11 +674,11 @@ class coredump_generator:
             return b""
 
         if vma["status"] & status["VMA_AREA_VVAR"]:
-            #FIXME this is what gdb does, as vvar vma
+            # FIXME this is what gdb does, as vvar vma
             # is not readable from userspace?
             return b"\0" * size
         elif vma["status"] & status["VMA_AREA_VSYSCALL"]:
-            #FIXME need to dump it with criu or read from
+            # FIXME need to dump it with criu or read from
             # current process.
             return b"\0" * size
 
diff --git a/coredump/criu_coredump/elf.py b/coredump/criu_coredump/elf.py
index a670ae866..092b47857 100644
--- a/coredump/criu_coredump/elf.py
+++ b/coredump/criu_coredump/elf.py
@@ -16,16 +16,13 @@ EI_MAG0 = 0  # #define EI_MAG0         0               /* File identification by
 ELFMAG0 = 0x7f  # #define ELFMAG0         0x7f            /* Magic number byte 0 */
 
 EI_MAG1 = 1  # #define EI_MAG1         1               /* File identification byte 1 index */
-ELFMAG1 = ord(
-    'E')  # #define ELFMAG1         'E'             /* Magic number byte 1 */
+ELFMAG1 = ord('E')  # #define ELFMAG1  'E'             /* Magic number byte 1 */
 
 EI_MAG2 = 2  # #define EI_MAG2         2               /* File identification byte 2 index */
-ELFMAG2 = ord(
-    'L')  # #define ELFMAG2         'L'             /* Magic number byte 2 */
+ELFMAG2 = ord('L')  # #define ELFMAG2  'L'             /* Magic number byte 2 */
 
 EI_MAG3 = 3  # #define EI_MAG3         3               /* File identification byte 3 index */
-ELFMAG3 = ord(
-    'F')  # #define ELFMAG3         'F'             /* Magic number byte 3 */
+ELFMAG3 = ord('F')  # #define ELFMAG3  'F'             /* Magic number byte 3 */
 
 EI_CLASS = 4  # #define EI_CLASS        4               /* File class byte index */
 
@@ -48,22 +45,22 @@ EV_CURRENT = 1  # #define EV_CURRENT      1               /* Current version */
 
 
 class Elf64_Ehdr(ctypes.Structure):  # typedef struct
-    _fields_ = [  # {
+    _fields_ = [
         ("e_ident",
-         ctypes.c_ubyte * EI_NIDENT),  #   unsigned char e_ident[EI_NIDENT];
-        ("e_type", Elf64_Half),  #   Elf64_Half e_type;
-        ("e_machine", Elf64_Half),  #   Elf64_Half e_machine;
-        ("e_version", Elf64_Word),  #   Elf64_Word e_version;
-        ("e_entry", Elf64_Addr),  #   Elf64_Addr e_entry;
-        ("e_phoff", Elf64_Off),  #   Elf64_Off e_phoff;
-        ("e_shoff", Elf64_Off),  #   Elf64_Off e_shoff;
-        ("e_flags", Elf64_Word),  #   Elf64_Word e_flags;
-        ("e_ehsize", Elf64_Half),  #   Elf64_Half e_ehsize;
-        ("e_phentsize", Elf64_Half),  #   Elf64_Half e_phentsize;
-        ("e_phnum", Elf64_Half),  #   Elf64_Half e_phnum;
-        ("e_shentsize", Elf64_Half),  #   Elf64_Half e_shentsize;
-        ("e_shnum", Elf64_Half),  #   Elf64_Half e_shnum;
-        ("e_shstrndx", Elf64_Half)  #   Elf64_Half e_shstrndx;
+         ctypes.c_ubyte * EI_NIDENT),  # unsigned char e_ident[EI_NIDENT];
+        ("e_type", Elf64_Half),  # Elf64_Half e_type;
+        ("e_machine", Elf64_Half),  # Elf64_Half e_machine;
+        ("e_version", Elf64_Word),  # Elf64_Word e_version;
+        ("e_entry", Elf64_Addr),  # Elf64_Addr e_entry;
+        ("e_phoff", Elf64_Off),  # Elf64_Off e_phoff;
+        ("e_shoff", Elf64_Off),  # Elf64_Off e_shoff;
+        ("e_flags", Elf64_Word),  # Elf64_Word e_flags;
+        ("e_ehsize", Elf64_Half),  # Elf64_Half e_ehsize;
+        ("e_phentsize", Elf64_Half),  # Elf64_Half e_phentsize;
+        ("e_phnum", Elf64_Half),  # Elf64_Half e_phnum;
+        ("e_shentsize", Elf64_Half),  # Elf64_Half e_shentsize;
+        ("e_shnum", Elf64_Half),  # Elf64_Half e_shnum;
+        ("e_shstrndx", Elf64_Half)  # Elf64_Half e_shstrndx;
     ]  # } Elf64_Ehdr;
 
 
@@ -80,15 +77,15 @@ PF_R = 1 << 2  # #define PF_R            (1 << 2)        /* Segment is readable
 
 
 class Elf64_Phdr(ctypes.Structure):  # typedef struct
-    _fields_ = [  # {
-        ("p_type", Elf64_Word),  #   Elf64_Word p_type;
-        ("p_flags", Elf64_Word),  #   Elf64_Word p_flags;
-        ("p_offset", Elf64_Off),  #   Elf64_Off p_offset;
-        ("p_vaddr", Elf64_Addr),  #   Elf64_Addr p_vaddr;
-        ("p_paddr", Elf64_Addr),  #   Elf64_Addr p_paddr;
-        ("p_filesz", Elf64_Xword),  #   Elf64_Xword p_filesz;
-        ("p_memsz", Elf64_Xword),  #   Elf64_Xword p_memsz;
-        ("p_align", Elf64_Xword),  #   Elf64_Xword p_align;
+    _fields_ = [
+        ("p_type", Elf64_Word),  # Elf64_Word p_type;
+        ("p_flags", Elf64_Word),  # Elf64_Word p_flags;
+        ("p_offset", Elf64_Off),  # Elf64_Off p_offset;
+        ("p_vaddr", Elf64_Addr),  # Elf64_Addr p_vaddr;
+        ("p_paddr", Elf64_Addr),  # Elf64_Addr p_paddr;
+        ("p_filesz", Elf64_Xword),  # Elf64_Xword p_filesz;
+        ("p_memsz", Elf64_Xword),  # Elf64_Xword p_memsz;
+        ("p_align", Elf64_Xword),  # Elf64_Xword p_align;
     ]  # } Elf64_Phdr;
 
 
@@ -100,78 +97,89 @@ class _Elf64_auxv_t_U(ctypes.Union):
 
 
 class Elf64_auxv_t(ctypes.Structure):  # typedef struct
-    _fields_ = [  # {
+    _fields_ = [
         ("a_type",
-         ctypes.c_uint64),  #   uint64_t a_type;              /* Entry type */
-        ("a_un", _Elf64_auxv_t_U)  #   union
-        #     {
-        #       uint64_t a_val;           /* Integer value */
-        #       /* We use to have pointer elements added here.  We cannot do that,
-        #          though, since it does not work when using 32-bit definitions
-        #          on 64-bit platforms and vice versa.  */
-        #     } a_un;
+         ctypes.c_uint64),  # uint64_t a_type;              /* Entry type */
+        ("a_un", _Elf64_auxv_t_U)  # union
+
+        # uint64_t a_val;           /* Integer value */
+        # /* We use to have pointer elements added here.  We cannot do that,
+        # though, since it does not work when using 32-bit definitions
+        # on 64-bit platforms and vice versa.  */
+        # } a_un;
     ]  # } Elf64_auxv_t;
 
 
 # Elf64_Nhdr related constants.
 
-NT_PRSTATUS = 1  # #define NT_PRSTATUS     1               /* Contains copy of prstatus struct */
-NT_FPREGSET = 2  # #define NT_FPREGSET     2               /* Contains copy of fpregset struct */
-NT_PRPSINFO = 3  # #define NT_PRPSINFO     3               /* Contains copy of prpsinfo struct */
-NT_AUXV = 6  # #define NT_AUXV         6               /* Contains copy of auxv array */
-NT_SIGINFO = 0x53494749  # #define NT_SIGINFO      0x53494749      /* Contains copy of siginfo_t,
-#                                         size might increase */
-NT_FILE = 0x46494c45  # #define NT_FILE         0x46494c45      /* Contains information about mapped
-#                                         files */
-NT_X86_XSTATE = 0x202  # #define NT_X86_XSTATE   0x202           /* x86 extended state using xsave */
+NT_PRSTATUS = 1  # #define NT_PRSTATUS  1  /* Contains copy of prstatus struct */
+NT_FPREGSET = 2  # #define NT_FPREGSET  2  /* Contains copy of fpregset struct */
+NT_PRPSINFO = 3  # #define NT_PRPSINFO  3  /* Contains copy of prpsinfo struct */
+NT_AUXV = 6  # #define NT_AUXV  6  /* Contains copy of auxv array */
+NT_SIGINFO = 0x53494749  # #define NT_SIGINFO  0x53494749  /* Contains copy of siginfo_t, size might increase */
+NT_FILE = 0x46494c45  # #define NT_FILE  0x46494c45  /* Contains information about mapped files */
+NT_X86_XSTATE = 0x202  # #define NT_X86_XSTATE  0x202  /* x86 extended state using xsave */
 
 
 class Elf64_Nhdr(ctypes.Structure):  # typedef struct
-    _fields_ = [  # {
+    _fields_ = [
         (
             "n_namesz", Elf64_Word
-        ),  #   Elf64_Word n_namesz;                  /* Length of the note's name.  */
+        ),  # Elf64_Word n_namesz;  /* Length of the note's name.  */
         (
             "n_descsz", Elf64_Word
-        ),  #   Elf64_Word n_descsz;                  /* Length of the note's descriptor.  */
+        ),  # Elf64_Word n_descsz;  /* Length of the note's descriptor.  */
         ("n_type", Elf64_Word
-         ),  #   Elf64_Word n_type;                    /* Type of the note.  */
+         ),  # Elf64_Word n_type;  /* Type of the note.  */
     ]  # } Elf64_Nhdr;
 
 
 # Elf64_Shdr related constants.
 
 
-class Elf64_Shdr(ctypes.Structure):  # typedef struct
-    _fields_ = [  # {
+class Elf64_Shdr(ctypes.Structure):
+    _fields_ = [
         (
+            # Section name (string tbl index)
             "sh_name", Elf64_Word
-        ),  #   Elf64_Word    sh_name;                /* Section name (string tbl index) */
-        ("sh_type", Elf64_Word
-         ),  #   Elf64_Word    sh_type;                /* Section type */
-        ("sh_flags", Elf64_Xword
-         ),  #   Elf64_Xword   sh_flags;               /* Section flags */
+        ),
         (
+            # Section type
+            "sh_type", Elf64_Word
+        ),
+        (
+            # Section flags
+            "sh_flags", Elf64_Xword
+        ),
+        (
+            # Section virtual addr at execution
             "sh_addr", Elf64_Addr
-        ),  #   Elf64_Addr    sh_addr;                /* Section virtual addr at execution */
+        ),
         (
+            # Section file offset
             "sh_offset", Elf64_Off
-        ),  #   Elf64_Off     sh_offset;              /* Section file offset */
+        ),
         (
+            # Section size in bytes
             "sh_size", Elf64_Xword
-        ),  #   Elf64_Xword   sh_size;                /* Section size in bytes */
+        ),
         (
+            # Link to another section
             "sh_link", Elf64_Word
-        ),  #   Elf64_Word    sh_link;                /* Link to another section */
+        ),
         (
+            # Additional section information
             "sh_info", Elf64_Word
-        ),  #   Elf64_Word    sh_info;                /* Additional section information */
-        ("sh_addralign", Elf64_Xword
-         ),  #   Elf64_Xword   sh_addralign;           /* Section alignment */
+        ),
         (
+            # Section alignment
+            "sh_addralign", Elf64_Xword
+        ),
+        (
+            # Entry size if section holds table
             "sh_entsize", Elf64_Xword
-        )  #   Elf64_Xword   sh_entsize;             /* Entry size if section holds table */
-    ]  # } Elf64_Shdr;
+        )
+    ]
 
 
 # elf_prstatus related constants.
@@ -179,188 +187,264 @@ class Elf64_Shdr(ctypes.Structure):  # typedef struct
 
 # Signal info.
 class elf_siginfo(ctypes.Structure):  # struct elf_siginfo
-    _fields_ = [  #   {
-        ("si_signo", ctypes.c_int
-         ),  #     int si_signo;                       /* Signal number.  */
-        ("si_code", ctypes.c_int
-         ),  #     int si_code;                        /* Extra code.  */
-        ("si_errno", ctypes.c_int
-         )  #     int si_errno;                       /* Errno.  */
-    ]  #   };
+    _fields_ = [
+        (
+            # Signal number
+            "si_signo", ctypes.c_int
+        ),
+        (
+            # Extra code
+            "si_code", ctypes.c_int
+        ),
+        (
+            # Errno
+            "si_errno", ctypes.c_int
+        )
+    ]
 
 
 # A time value that is accurate to the nearest
 # microsecond but also has a range of years.
 class timeval(ctypes.Structure):  # struct timeval
-    _fields_ = [  #   {
-        ("tv_sec",
-         ctypes.c_long),  #     __time_t tv_sec;            /* Seconds.  */
-        ("tv_usec", ctypes.c_long
-         )  #     __suseconds_t tv_usec;      /* Microseconds.  */
-    ]  #   };
+    _fields_ = [
+        (
+            # __time_t tv_sec;            /* Seconds.  */
+            "tv_sec", ctypes.c_long
+        ),
+        (
+            # __suseconds_t tv_usec;      /* Microseconds.  */
+            "tv_usec", ctypes.c_long
+        )
+    ]
 
 
 class user_regs_struct(ctypes.Structure):  # struct user_regs_struct
-    _fields_ = [  # {
+    _fields_ = [
         ("r15",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r15;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r15;
         ("r14",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r14;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r14;
         ("r13",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r13;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r13;
         ("r12",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r12;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r12;
         ("rbp",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rbp;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rbp;
         ("rbx",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rbx;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rbx;
         ("r11",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r11;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r11;
         ("r10",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r10;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r10;
         ("r9",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r9;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r9;
         ("r8",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int r8;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int r8;
         ("rax",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rax;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rax;
         ("rcx",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rcx;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rcx;
         ("rdx",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rdx;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rdx;
         ("rsi",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rsi;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rsi;
         ("rdi",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rdi;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rdi;
         ("orig_rax", ctypes.c_ulonglong
-         ),  #   __extension__ unsigned long long int orig_rax;
+         ),  # __extension__ unsigned long long int orig_rax;
         ("rip",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rip;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rip;
         ("cs",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int cs;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int cs;
         ("eflags",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int eflags;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int eflags;
         ("rsp",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rsp;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int rsp;
         ("ss",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int ss;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int ss;
         ("fs_base", ctypes.c_ulonglong
-         ),  #   __extension__ unsigned long long int fs_base;
+         ),  # __extension__ unsigned long long int fs_base;
         ("gs_base", ctypes.c_ulonglong
-         ),  #   __extension__ unsigned long long int gs_base;
+         ),  # __extension__ unsigned long long int gs_base;
         ("ds",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int ds;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int ds;
         ("es",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int es;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int es;
         ("fs",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int fs;
+         ctypes.c_ulonglong),  # __extension__ unsigned long long int fs;
         ("gs", ctypes.c_ulonglong
-         )  #   __extension__ unsigned long long int gs;
-    ]  # };
+         )  # __extension__ unsigned long long int gs;
+    ]
 
 
-#elf_greg_t    = ctypes.c_ulonglong
-#ELF_NGREG = ctypes.sizeof(user_regs_struct)/ctypes.sizeof(elf_greg_t)
-#elf_gregset_t = elf_greg_t*ELF_NGREG
+# elf_greg_t    = ctypes.c_ulonglong
+# ELF_NGREG = ctypes.sizeof(user_regs_struct)/ctypes.sizeof(elf_greg_t)
+# elf_gregset_t = elf_greg_t*ELF_NGREG
 elf_gregset_t = user_regs_struct
 
 
 class elf_prstatus(ctypes.Structure):  # struct elf_prstatus
-    _fields_ = [  #   {
+    _fields_ = [
         (
+            # Info associated with signal
+            # struct elf_siginfo pr_info;
             "pr_info", elf_siginfo
-        ),  #     struct elf_siginfo pr_info;         /* Info associated with signal.  */
-        ("pr_cursig", ctypes.c_short
-         ),  #     short int pr_cursig;                /* Current signal.  */
+        ),
         (
+            # Current signal
+            # short int pr_cursig;
+            "pr_cursig", ctypes.c_short
+        ),
+        (
+            # Set of pending signals
+            # unsigned long int pr_sigpend;
             "pr_sigpend", ctypes.c_ulong
-        ),  #     unsigned long int pr_sigpend;       /* Set of pending signals.  */
+        ),
         (
+            # Set of held signals
+            # unsigned long int pr_sighold;
             "pr_sighold", ctypes.c_ulong
-        ),  #     unsigned long int pr_sighold;       /* Set of held signals.  */
-        ("pr_pid", ctypes.c_int),  #     __pid_t pr_pid;
-        ("pr_ppid", ctypes.c_int),  #     __pid_t pr_ppid;
-        ("pr_pgrp", ctypes.c_int),  #     __pid_t pr_pgrp;
-        ("pr_sid", ctypes.c_int),  #     __pid_t pr_sid;
-        ("pr_utime",
-         timeval),  #     struct timeval pr_utime;            /* User time.  */
-        ("pr_stime", timeval
-         ),  #     struct timeval pr_stime;            /* System time.  */
+        ),
         (
+            # Process ID
+            # __pid_t pr_pid;
+            "pr_pid", ctypes.c_int
+        ),
+        (
+            # Parent process ID
+            # __pid_t pr_ppid;
+            "pr_ppid", ctypes.c_int
+        ),
+        (
+            # Parent group ID
+            # __pid_t pr_pgrp;
+            "pr_pgrp", ctypes.c_int
+        ),
+        (
+            # Parent session ID
+            # __pid_t pr_sid;
+            "pr_sid", ctypes.c_int
+        ),
+        (
+            # User time
+            # struct timeval pr_utime;
+            "pr_utime", timeval
+        ),
+        (
+            # System time
+            # struct timeval pr_stime;
+            "pr_stime", timeval
+        ),
+        (
+            # Cumulative user time
+            # struct timeval pr_cutime;
             "pr_cutime", timeval
-        ),  #     struct timeval pr_cutime;           /* Cumulative user time.  */
+        ),
         (
+            # Cumulative system time
+            # struct timeval pr_cstime;
             "pr_cstime", timeval
-        ),  #     struct timeval pr_cstime;           /* Cumulative system time.  */
-        ("pr_reg", elf_gregset_t
-         ),  #     elf_gregset_t pr_reg;               /* GP registers.  */
+        ),
         (
+            # GP registers
+            # elf_gregset_t pr_reg;
+            "pr_reg", elf_gregset_t
+        ),
+        (
+            # True if math copro being used
+            # int pr_fpvalid;
             "pr_fpvalid", ctypes.c_int
-        )  #     int pr_fpvalid;                     /* True if math copro being used.  */
-    ]  #   };
+        )
+    ]
 
 
 # elf_prpsinfo related constants.
 
-ELF_PRARGSZ = 80  # #define ELF_PRARGSZ     (80)    /* Number of chars for args.  */
+# Number of chars for args
+# #define ELF_PRARGSZ     (80)
+ELF_PRARGSZ = 80
 
 
 class elf_prpsinfo(ctypes.Structure):  # struct elf_prpsinfo
-    _fields_ = [  #   {
+    _fields_ = [
         (
+            # Numeric process state
+            # char pr_state;
             "pr_state", ctypes.c_byte
-        ),  #     char pr_state;                      /* Numeric process state.  */
+        ),
         (
+            # Char for pr_state
+            # char pr_sname;
             "pr_sname", ctypes.c_char
-        ),  #     char pr_sname;                      /* Char for pr_state.  */
-        ("pr_zomb", ctypes.c_byte
-         ),  #     char pr_zomb;                       /* Zombie.  */
-        ("pr_nice", ctypes.c_byte
-         ),  #     char pr_nice;                       /* Nice val.  */
-        ("pr_flag", ctypes.c_ulong
-         ),  #     unsigned long int pr_flag;          /* Flags.  */
-        # #if __WORDSIZE == 32
-        #     unsigned short int pr_uid;
-        #     unsigned short int pr_gid;
-        # #else
-        ("pr_uid", ctypes.c_uint),  #     unsigned int pr_uid;
-        ("pr_gid", ctypes.c_uint),  #     unsigned int pr_gid;
-        # #endif
-        ("pr_pid", ctypes.c_int),  #     int pr_pid, pr_ppid, pr_pgrp, pr_sid;
+        ),
+        (
+            # Zombie
+            # char pr_zomb;
+            "pr_zomb", ctypes.c_byte
+        ),
+        (
+            # Nice value
+            # char pr_nice;
+            "pr_nice", ctypes.c_byte
+        ),
+        (
+            # Flags
+            # unsigned long int pr_flag;
+            "pr_flag", ctypes.c_ulong
+        ),
+        (
+            # User ID
+            # unsigned int pr_uid;
+            "pr_uid", ctypes.c_uint
+        ),
+        (
+            # Group ID
+            # unsigned int pr_gid;
+            "pr_gid", ctypes.c_uint
+        ),
+        ("pr_pid", ctypes.c_int),
         ("pr_ppid", ctypes.c_int),
         ("pr_pgrp", ctypes.c_int),
         ("pr_sid", ctypes.c_int),
-        #     /* Lots missing */
+        # /* Lots missing */
         (
+            # Filename of executable
+            # char pr_fname[16];
             "pr_fname", ctypes.c_char * 16
-        ),  #     char pr_fname[16];                  /* Filename of executable.  */
+        ),
         (
+            # Initial part of arg list
+            # char pr_psargs[ELF_PRARGSZ];
             "pr_psargs", ctypes.c_char * ELF_PRARGSZ
-        )  #     char pr_psargs[ELF_PRARGSZ];        /* Initial part of arg list.  */
-    ]  #   };
+        )
+    ]
 
 
 class user_fpregs_struct(ctypes.Structure):  # struct user_fpregs_struct
-    _fields_ = [  # {
-        ("cwd", ctypes.c_ushort),  #   unsigned short int    cwd;
-        ("swd", ctypes.c_ushort),  #   unsigned short int    swd;
-        ("ftw", ctypes.c_ushort),  #   unsigned short int    ftw;
-        ("fop", ctypes.c_ushort),  #   unsigned short int    fop;
-        ("rip",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rip;
-        ("rdp",
-         ctypes.c_ulonglong),  #   __extension__ unsigned long long int rdp;
-        ("mxcsr", ctypes.c_uint),  #   unsigned int          mxcsr;
-        ("mxcr_mask", ctypes.c_uint),  #   unsigned int          mxcr_mask;
-        (
-            "st_space", ctypes.c_uint * 32
-        ),  #   unsigned int          st_space[32];   /* 8*16 bytes for each FP-reg = 128 bytes */
-        (
-            "xmm_space", ctypes.c_uint * 64
-        ),  #   unsigned int          xmm_space[64];  /* 16*16 bytes for each XMM-reg = 256 bytes */
-        ("padding",
-         ctypes.c_uint * 24),  #   unsigned int          padding[24];
-    ]  # };
+    _fields_ = [
+        # unsigned short int cwd;
+        ("cwd", ctypes.c_ushort),
+        # unsigned short int swd;
+        ("swd", ctypes.c_ushort),
+        # unsigned short int ftw;
+        ("ftw", ctypes.c_ushort),
+        # unsigned short int fop;
+        ("fop", ctypes.c_ushort),
+        # __extension__ unsigned long long int rip;
+        ("rip", ctypes.c_ulonglong),
+        # __extension__ unsigned long long int rdp;
+        ("rdp", ctypes.c_ulonglong),
+        # unsigned int mxcsr;
+        ("mxcsr", ctypes.c_uint),
+        # unsigned int mxcr_mask;
+        ("mxcr_mask", ctypes.c_uint),
+        # unsigned int st_space[32];   /* 8*16 bytes for each FP-reg = 128 bytes */
+        ("st_space", ctypes.c_uint * 32),
+        # unsigned int xmm_space[64];  /* 16*16 bytes for each XMM-reg = 256 bytes */
+        ("xmm_space", ctypes.c_uint * 64),
+        # unsigned int padding[24];
+        ("padding", ctypes.c_uint * 24),
+    ]
 
 
 elf_fpregset_t = user_fpregs_struct
@@ -371,315 +455,390 @@ _SI_MAX_SIZE = 128
 _SI_PAD_SIZE = (_SI_MAX_SIZE // ctypes.sizeof(ctypes.c_int)) - 4
 
 
-#          /* kill().  */
-class _siginfo_t_U_kill(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
-        ("si_pid", ctypes.c_int
-         ),  #             __pid_t si_pid;     /* Sending process ID.  */
+# /* kill().  */
+class _siginfo_t_U_kill(ctypes.Structure):  # struct
+    _fields_ = [
         (
+            # Sending process ID
+            # __pid_t si_pid;
+            "si_pid", ctypes.c_int
+        ),
+        (
+            # Real user ID of sending process
+            # __uid_t si_uid;
             "si_uid", ctypes.c_uint
-        )  #             __uid_t si_uid;     /* Real user ID of sending process.  */
-    ]  #           } _kill;
+        )
+    ]  # } _kill;
 
 
 # Type for data associated with a signal.
 class sigval_t(ctypes.Union):  # typedef union sigval
-    _fields_ = [  #   {
-        ("sival_int", ctypes.c_int),  #     int sival_int;
-        ("sical_ptr", ctypes.c_void_p),  #     void *sival_ptr;
-    ]  #   } sigval_t;
+    _fields_ = [
+        ("sival_int", ctypes.c_int),  # int sival_int;
+        ("sical_ptr", ctypes.c_void_p),  # void *sival_ptr;
+    ]  # } sigval_t;
 
 
-    #         /* POSIX.1b timers.  */
-class _siginfo_t_U_timer(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
-        ("si_tid",
-         ctypes.c_int),  #             int si_tid;         /* Timer ID.  */
-        ("si_overrun", ctypes.c_int
-         ),  #             int si_overrun;     /* Overrun count.  */
-        ("si_sigval", sigval_t
-         )  #             sigval_t si_sigval; /* Signal value.  */
-    ]  #           } _timer;
-
-
-    #         /* POSIX.1b signals.  */
-class _siginfo_t_U_rt(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
-        ("si_pid", ctypes.c_int
-         ),  #             __pid_t si_pid;     /* Sending process ID.  */
+# /* POSIX.1b timers.  */
+class _siginfo_t_U_timer(ctypes.Structure):  # struct
+    _fields_ = [
         (
+            # Timer ID
+            # int si_tid;
+            "si_tid", ctypes.c_int
+        ),
+        (
+            # Overrun count
+            # int si_overrun;
+            "si_overrun", ctypes.c_int
+        ),
+        (
+            # Signal value
+            # sigval_t si_sigval;
+            "si_sigval", sigval_t
+        )
+    ]  # } _timer;
+
+
+# /* POSIX.1b signals.  */
+class _siginfo_t_U_rt(ctypes.Structure):  # struct
+    _fields_ = [
+        (
+            # Sending process ID
+            # __pid_t si_pid;
+            "si_pid", ctypes.c_int
+        ),
+        (
+            # Real user ID of sending process
+            # __uid_t si_uid;
             "si_uid", ctypes.c_uint
-        ),  #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        ("si_sigval", sigval_t
-         )  #             sigval_t si_sigval; /* Signal value.  */
-    ]  #           } _rt;
-
-
-    #         /* SIGCHLD.  */
-class _siginfo_t_U_sigchld(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
-        ("si_pid",
-         ctypes.c_int),  #             __pid_t si_pid;     /* Which child.  */
+        ),
         (
+            # Signal value
+            # sigval_t si_sigval;
+            "si_sigval", sigval_t
+        )
+    ]  # } _rt;
+
+
+# /* SIGCHLD.  */
+class _siginfo_t_U_sigchld(ctypes.Structure):  # struct
+    _fields_ = [
+        (
+            # Which child
+            # __pid_t si_pid;
+            "si_pid", ctypes.c_int
+        ),
+        (
+            # Real user ID of sending process
+            # __uid_t si_uid;
             "si_uid", ctypes.c_uint
-        ),  #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        ("si_status", ctypes.c_int
-         ),  #             int si_status;      /* Exit value or signal.  */
-        ("si_utime", ctypes.c_long),  #             __sigchld_clock_t si_utime;
-        ("si_stime", ctypes.c_long)  #             __sigchld_clock_t si_stime;
-    ]  #           } _sigchld;
-
-
-    #         /* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
-class _siginfo_t_U_sigfault(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
-        ("si_addr", ctypes.c_void_p
-         ),  #             void *si_addr;      /* Faulting insn/memory ref.  */
+        ),
         (
+            # Exit value or signal
+            # int si_status;
+            "si_status", ctypes.c_int
+        ),
+        (
+            # __sigchld_clock_t si_utime;
+            "si_utime", ctypes.c_long
+        ),
+        (
+            # __sigchld_clock_t si_stime;
+            "si_stime", ctypes.c_long
+        )
+    ]  # } _sigchld;
+
+
+# /* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
+class _siginfo_t_U_sigfault(ctypes.Structure):  # struct
+    _fields_ = [
+        (
+            # Faulting insn/memory ref
+            # void *si_addr;
+            "si_addr", ctypes.c_void_p
+        ),
+        (
+            # Valid LSB of the reported address
+            # short int si_addr_lsb;
             "si_addr_lsb", ctypes.c_short
-        )  #             short int si_addr_lsb;      /* Valid LSB of the reported address.  */
-    ]  #           } _sigfault;
+        )
+    ]  # } _sigfault;
 
 
-    #         /* SIGPOLL.  */
-class _siginfo_t_U_sigpoll(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
-        ("si_band", ctypes.c_long
-         ),  #             long int si_band;   /* Band event for SIGPOLL.  */
-        ("si_fd", ctypes.c_int)  #             int si_fd;
-    ]  #           } _sigpoll;
+# /* SIGPOLL.  */
+class _siginfo_t_U_sigpoll(ctypes.Structure):  # struct
+    _fields_ = [
+        (
+            # Band event for SIGPOLL
+            # long int si_band;
+            "si_band", ctypes.c_long
+        ),
+        (
+            # int si_fd;
+            "si_fd", ctypes.c_int
+        )
+    ]  # } _sigpoll;
 
 
-    #             /* SIGSYS.  */
-class _siginfo_t_U_sigsys(ctypes.Structure):  #         struct
-    _fields_ = [  #           {
+# /* SIGSYS.  */
+class _siginfo_t_U_sigsys(ctypes.Structure):  # struct
+    _fields_ = [
         ("_call_addr", ctypes.c_void_p
-         ),  #             void *_call_addr;   /* Calling user insn.  */
+         ),  # void *_call_addr;   /* Calling user insn.  */
         (
             "_syscall", ctypes.c_int
-        ),  #             int _syscall;       /* Triggering system call number.  */
+        ),  # int _syscall;       /* Triggering system call number.  */
         ("_arch", ctypes.c_uint
-         )  #             unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
-    ]  #           } _sigsys;
+         )  # unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
+    ]  # } _sigsys;
 
 
-class _siginfo_t_U(ctypes.Union):  #     union
-    _fields_ = [  #       {
+class _siginfo_t_U(ctypes.Union):  # union
+    _fields_ = [
         ("_pad",
-         ctypes.c_int * _SI_PAD_SIZE),  #         int _pad[__SI_PAD_SIZE];
-        #
-        #          /* kill().  */
-        ("_kill", _siginfo_t_U_kill),  #         struct
-        #           {
-        #             __pid_t si_pid;     /* Sending process ID.  */
-        #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        #           } _kill;
-        #
-        #         /* POSIX.1b timers.  */
-        ("_timer", _siginfo_t_U_timer),  #         struct
-        #           {
-        #             int si_tid;         /* Timer ID.  */
-        #             int si_overrun;     /* Overrun count.  */
-        #             sigval_t si_sigval; /* Signal value.  */
-        #           } _timer;
-        #
-        #         /* POSIX.1b signals.  */
-        ("_rt", _siginfo_t_U_rt),  #         struct
-        #           {
-        #             __pid_t si_pid;     /* Sending process ID.  */
-        #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        #             sigval_t si_sigval; /* Signal value.  */
-        #           } _rt;
-        #
-        #         /* SIGCHLD.  */
-        ("_sigchld", _siginfo_t_U_sigchld),  #         struct
-        #           {
-        #             __pid_t si_pid;     /* Which child.  */
-        #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        #             int si_status;      /* Exit value or signal.  */
-        #             __sigchld_clock_t si_utime;
-        #             __sigchld_clock_t si_stime;
-        #           } _sigchld;
-        #
-        #         /* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
-        ("_sigfault", _siginfo_t_U_sigfault),  #         struct
-        #           {
-        #             void *si_addr;      /* Faulting insn/memory ref.  */
-        #             short int si_addr_lsb;      /* Valid LSB of the reported address.  */
-        #           } _sigfault;
-        #
-        #         /* SIGPOLL.  */
-        ("_sigpoll", _siginfo_t_U_sigpoll),  #         struct
-        #           {
-        #             long int si_band;   /* Band event for SIGPOLL.  */
-        #             int si_fd;
-        #           } _sigpoll;
-        #
-        #             /* SIGSYS.  */
-        ("_sigsys", _siginfo_t_U_sigpoll)  #         struct
-        #           {
-        #             void *_call_addr;   /* Calling user insn.  */
-        #             int _syscall;       /* Triggering system call number.  */
-        #             unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
-        #           } _sigsys;
-    ]  #       } _sifields;
+         ctypes.c_int * _SI_PAD_SIZE),  # int _pad[__SI_PAD_SIZE];
+
+        # /* kill().  */
+        ("_kill", _siginfo_t_U_kill),  # struct
+
+        # __pid_t si_pid;     /* Sending process ID.  */
+        # __uid_t si_uid;     /* Real user ID of sending process.  */
+        # } _kill;
+
+        # /* POSIX.1b timers.  */
+        ("_timer", _siginfo_t_U_timer),  # struct
+
+        # int si_tid;         /* Timer ID.  */
+        # int si_overrun;     /* Overrun count.  */
+        # sigval_t si_sigval; /* Signal value.  */
+        # } _timer;
+
+        # /* POSIX.1b signals.  */
+        ("_rt", _siginfo_t_U_rt),  # struct
+
+        # __pid_t si_pid;     /* Sending process ID.  */
+        # __uid_t si_uid;     /* Real user ID of sending process.  */
+        # sigval_t si_sigval; /* Signal value.  */
+        # } _rt;
+
+        # /* SIGCHLD.  */
+        ("_sigchld", _siginfo_t_U_sigchld),  # struct
+
+        # __pid_t si_pid;     /* Which child.  */
+        # __uid_t si_uid;     /* Real user ID of sending process.  */
+        # int si_status;      /* Exit value or signal.  */
+        # __sigchld_clock_t si_utime;
+        # __sigchld_clock_t si_stime;
+        # } _sigchld;
+
+        # /* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
+        ("_sigfault", _siginfo_t_U_sigfault),  # struct
+
+        # void *si_addr;      /* Faulting insn/memory ref.  */
+        # short int si_addr_lsb;      /* Valid LSB of the reported address.  */
+        # } _sigfault;
+
+        # /* SIGPOLL.  */
+        ("_sigpoll", _siginfo_t_U_sigpoll),  # struct
+
+        # long int si_band;   /* Band event for SIGPOLL.  */
+        # int si_fd;
+        # } _sigpoll;
+
+        # /* SIGSYS.  */
+        ("_sigsys", _siginfo_t_U_sigpoll)  # struct
+
+        # void *_call_addr;   /* Calling user insn.  */
+        # int _syscall;       /* Triggering system call number.  */
+        # unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
+        # } _sigsys;
+    ]  # } _sifields;
 
 
 class siginfo_t(ctypes.Structure):  # typedef struct
-    _fields_ = [  #   {
-        ("si_signo", ctypes.c_int
-         ),  #     int si_signo;               /* Signal number.  */
+    _fields_ = [
         (
+            # Signal number
+            # int si_signo;
+            "si_signo", ctypes.c_int
+        ),
+        (
+            # If non-zero, an errno value associated with
+            # int si_errno;
             "si_errno", ctypes.c_int
-        ),  #     int si_errno;               /* If non-zero, an errno value associated with
-        #                                    this signal, as defined in <errno.h>.  */
-        ("si_code", ctypes.c_int
-         ),  #     int si_code;                /* Signal code.  */
+        ),
+        (
+            # Signal code - this signal, as defined in <errno.h>
+            # int si_code;
+            "si_code", ctypes.c_int
+        ),
+        (
+            # Union
+            "_sifields", _siginfo_t_U
+        )
+
+        # int _pad[__SI_PAD_SIZE];
         #
-        ("_sifields", _siginfo_t_U)  #     union
-        #       {
-        #         int _pad[__SI_PAD_SIZE];
+        # /* kill().  */
+        # struct
+
+        # __pid_t si_pid;     /* Sending process ID.  */
+        # __uid_t si_uid;     /* Real user ID of sending process.  */
+        # } _kill;
         #
-        #          /* kill().  */
-        #         struct
-        #           {
-        #             __pid_t si_pid;     /* Sending process ID.  */
-        #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        #           } _kill;
+        # /* POSIX.1b timers.  */
+        # struct
+
+        # int si_tid;         /* Timer ID.  */
+        # int si_overrun;     /* Overrun count.  */
+        # sigval_t si_sigval; /* Signal value.  */
+        # } _timer;
         #
-        #         /* POSIX.1b timers.  */
-        #         struct
-        #           {
-        #             int si_tid;         /* Timer ID.  */
-        #             int si_overrun;     /* Overrun count.  */
-        #             sigval_t si_sigval; /* Signal value.  */
-        #           } _timer;
+        # /* POSIX.1b signals.  */
+        # struct
+
+        # __pid_t si_pid;     /* Sending process ID.  */
+        # __uid_t si_uid;     /* Real user ID of sending process.  */
+        # sigval_t si_sigval; /* Signal value.  */
+        # } _rt;
         #
-        #         /* POSIX.1b signals.  */
-        #         struct
-        #           {
-        #             __pid_t si_pid;     /* Sending process ID.  */
-        #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        #             sigval_t si_sigval; /* Signal value.  */
-        #           } _rt;
+        # /* SIGCHLD.  */
+        # struct
+
+        # __pid_t si_pid;     /* Which child.  */
+        # __uid_t si_uid;     /* Real user ID of sending process.  */
+        # int si_status;      /* Exit value or signal.  */
+        # __sigchld_clock_t si_utime;
+        # __sigchld_clock_t si_stime;
+        # } _sigchld;
         #
-        #         /* SIGCHLD.  */
-        #         struct
-        #           {
-        #             __pid_t si_pid;     /* Which child.  */
-        #             __uid_t si_uid;     /* Real user ID of sending process.  */
-        #             int si_status;      /* Exit value or signal.  */
-        #             __sigchld_clock_t si_utime;
-        #             __sigchld_clock_t si_stime;
-        #           } _sigchld;
+        # /* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
+        # struct
+
+        # void *si_addr;      /* Faulting insn/memory ref.  */
+        # short int si_addr_lsb;      /* Valid LSB of the reported address.  */
+        # } _sigfault;
         #
-        #         /* SIGILL, SIGFPE, SIGSEGV, SIGBUS.  */
-        #         struct
-        #           {
-        #             void *si_addr;      /* Faulting insn/memory ref.  */
-        #             short int si_addr_lsb;      /* Valid LSB of the reported address.  */
-        #           } _sigfault;
+        # /* SIGPOLL.  */
+        # struct
+
+        # long int si_band;   /* Band event for SIGPOLL.  */
+        # int si_fd;
+        # } _sigpoll;
         #
-        #         /* SIGPOLL.  */
-        #         struct
-        #           {
-        #             long int si_band;   /* Band event for SIGPOLL.  */
-        #             int si_fd;
-        #           } _sigpoll;
-        #
-        #             /* SIGSYS.  */
-        #         struct
-        #           {
-        #             void *_call_addr;   /* Calling user insn.  */
-        #             int _syscall;       /* Triggering system call number.  */
-        #             unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
-        #           } _sigsys;
-        #       } _sifields;
-    ]  #   } siginfo_t __SI_ALIGNMENT;
+        # /* SIGSYS.  */
+        # struct
+
+        # void *_call_addr;   /* Calling user insn.  */
+        # int _syscall;       /* Triggering system call number.  */
+        # unsigned int _arch; /* AUDIT_ARCH_* of syscall.  */
+        # } _sigsys;
+        # } _sifields;
+    ]  # } siginfo_t __SI_ALIGNMENT;
 
 
 # xsave related.
 
 
 class ymmh_struct(ctypes.Structure):  # struct ymmh_struct {
-    _fields_ = [("ymmh_space", 64 * ctypes.c_uint
-                 )  #         u32                             ymmh_space[64];
-                ]  # } __packed;
+    _fields_ = [
+        # u32 ymmh_space[64];
+        ("ymmh_space", 64 * ctypes.c_uint)
+    ]  # } __packed;
 
 
 class xsave_hdr_struct(ctypes.Structure):  # struct xsave_hdr_struct {
     _fields_ = [
-        ("xstate_bv", ctypes.c_ulonglong
-         ),  #         u64                             xstate_bv;
-        ("reserved1", ctypes.c_ulonglong *
-         2),  #         u64                             reserved1[2];
-        ("reserved2", ctypes.c_ulonglong * 5
-         )  #         u64                             reserved2[5];
+        # u64 xstate_bv;
+        ("xstate_bv", ctypes.c_ulonglong),
+        # u64 reserved1[2];
+        ("reserved1", ctypes.c_ulonglong * 2),
+        # u64 reserved2[5];
+        ("reserved2", ctypes.c_ulonglong * 5)
     ]  # } __packed;
 
 
 class i387_fxsave_struct(ctypes.Structure):  # struct i387_fxsave_struct {
     _fields_ = [
         (
+            # Control Word
+            # u16 cwd;
             "cwd", ctypes.c_ushort
-        ),  #         u16                             cwd; /* Control Word                    */
+        ),
         (
+            # Status Word
+            # u16 swd;
             "swd", ctypes.c_ushort
-        ),  #         u16                             swd; /* Status Word                     */
+        ),
         (
+            # Tag Word
+            # u16 twd;
             "twd", ctypes.c_ushort
-        ),  #         u16                             twd; /* Tag Word                        */
+        ),
         (
+            # Last Instruction Opcode
+            # u16 fop;
             "fop", ctypes.c_ushort
-        ),  #         u16                             fop; /* Last Instruction Opcode         */
-        #         union {
-        #                 struct {
+        ),
+        # union {
+        # struct {
         (
+            # Instruction Pointer
+            # u64 rip;
             "rip", ctypes.c_ulonglong
-        ),  #                         u64             rip; /* Instruction Pointer             */
+        ),
         (
+            # Data Pointer
+            # u64 rdp;
             "rdp", ctypes.c_ulonglong
-        ),  #                         u64             rdp; /* Data Pointer                    */
-        #                 };
-        #                 struct {
-        #                         u32             fip; /* FPU IP Offset                   */
-        #                         u32             fcs; /* FPU IP Selector                 */
-        #                         u32             foo; /* FPU Operand Offset              */
-        #                         u32             fos; /* FPU Operand Selector            */
-        #                 };
-        #         };
+        ),
+
+        # struct {
+        # u32             fip; /* FPU IP Offset                   */
+        # u32             fcs; /* FPU IP Selector                 */
+        # u32             foo; /* FPU Operand Offset              */
+        # u32             fos; /* FPU Operand Selector            */
+
         (
+            # MXCSR Register State
+            # u32 mxcsr;
             "mxcsr", ctypes.c_uint
-        ),  #         u32                             mxcsr;          /* MXCSR Register State */
+        ),
         (
+            # MXCSR Mask
+            # u32 mxcsr_mask;
             "mxcsr_mask", ctypes.c_uint
-        ),  #         u32                             mxcsr_mask;     /* MXCSR Mask           */
-        #
-        #         /* 8*16 bytes for each FP-reg = 128 bytes                               */
-        ("st_space", ctypes.c_uint * 32
-         ),  #         u32                             st_space[32];
-        #
-        #         /* 16*16 bytes for each XMM-reg = 256 bytes                             */
-        ("xmm_space", ctypes.c_uint * 64
-         ),  #         u32                             xmm_space[64];
-        #
-        ("padding", ctypes.c_uint * 12
-         ),  #         u32                             padding[12];
-        #
-        #         union {
-        ("padding1", ctypes.c_uint * 12
-         )  #                 u32                     padding1[12];
-        #                 u32                     sw_reserved[12];
-        #         };
-        #
+        ),
+        # 8*16 bytes for each FP-reg = 128 bytes
+        (
+            # u32 st_space[32];
+            "st_space", ctypes.c_uint * 32
+        ),
+        # 16*16 bytes for each XMM-reg = 256 bytes
+        (
+            # u32 xmm_space[64];
+            "xmm_space", ctypes.c_uint * 64
+        ),
+        (
+            # u32 padding[12];
+            "padding", ctypes.c_uint * 12
+        ),
+        # union {
+        (
+            # u32 padding1[12];
+            "padding1", ctypes.c_uint * 12
+        )
+        # u32                     sw_reserved[12];
     ]  # } __aligned(16);
 
 
 class elf_xsave_struct(ctypes.Structure):  # struct xsave_struct {
     _fields_ = [
-        ("i387",
-         i387_fxsave_struct),  #         struct i387_fxsave_struct       i387;
-        ("xsave_hdr", xsave_hdr_struct
-         ),  #         struct xsave_hdr_struct         xsave_hdr;
-        ("ymmh", ymmh_struct)  #         struct ymmh_struct              ymmh;
+        # struct i387_fxsave_struct i387;
+        ("i387", i387_fxsave_struct),
+        # struct xsave_hdr_struct xsave_hdr;
+        ("xsave_hdr", xsave_hdr_struct),
+        # struct ymmh_struct              ymmh;
+        ("ymmh", ymmh_struct)
     ]  # } __aligned(FP_MIN_ALIGN_BYTES) __packed;

From baad88d5ecf3e683948a33eee926b4cefeb2cd97 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 22:37:26 +0100
Subject: [PATCH 0771/1854] coredump: fix missing whitespace around operator

Missing whitespace around arithmetic operator
https://www.flake8rules.com/rules/E226.html

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/coredump.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coredump/coredump.py b/coredump/coredump.py
index e63abf951..5e63d2138 100644
--- a/coredump/coredump.py
+++ b/coredump/coredump.py
@@ -10,7 +10,7 @@ def coredump(opts):
     for pid in cores:
         if opts['pid'] and pid != opts['pid']:
             continue
-        with open(os.path.realpath(opts['out'])+"/core."+str(pid), 'wb+') as f:
+        with open(os.path.realpath(opts['out']) + "/core." + str(pid), 'wb+') as f:
             cores[pid].write(f)
 
 

From c1eab7d06a9bc6c480ea216c7268cd22a1a1229d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 22:39:50 +0100
Subject: [PATCH 0772/1854] coredump: fix too many blank lines

https://www.flake8rules.com/rules/E303.html

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 274889800..a232132fd 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -321,7 +321,6 @@ class coredump_generator:
         else:
             prpsinfo.pr_fname = core["tc"]["comm"]
 
-
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
         nhdr.n_descsz = ctypes.sizeof(elf.elf_prpsinfo())

From 3a689ed9a626e60183e52e5abc2d7cf765efe6cc Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 22:42:19 +0100
Subject: [PATCH 0773/1854] coredump: fix comparison to true

Comparison to true should be 'if cond is true:' or 'if cond:'
https://www.flake8rules.com/rules/E712.html

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index a232132fd..41d102db7 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -653,7 +653,7 @@ class coredump_generator:
             if not found:
                 continue
 
-            if "in_parent" in m and m["in_parent"] == True:
+            if "in_parent" in m and m["in_parent"]:
                 ppid = self.pstree[pid]["ppid"]
                 return self._get_page(ppid, page_no)
             else:

From 0b3cf5c9e5c6e40c671f426e45afa0a401158db9 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 22:47:59 +0100
Subject: [PATCH 0774/1854] coredump: lint fix visually indented line

Continuation line over-indented for visual indent
https://www.flake8rules.com/rules/E127.html

Visually indented line with same indent as next logical line
https://www.flake8rules.com/rules/E129.html

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 coredump/criu_coredump/coredump.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 41d102db7..881c40b0a 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -781,19 +781,19 @@ class coredump_generator:
         """
         Calculate amount of vma to put into core dump.
         """
-        if vma["status"] & status["VMA_AREA_VVAR"] or \
-           vma["status"] & status["VMA_AREA_VSYSCALL"] or \
-           vma["status"] & status["VMA_AREA_VDSO"]:
+        if (vma["status"] & status["VMA_AREA_VVAR"] or
+                vma["status"] & status["VMA_AREA_VSYSCALL"] or
+                vma["status"] & status["VMA_AREA_VDSO"]):
             size = vma["end"] - vma["start"]
         elif vma["prot"] == 0:
             size = 0
-        elif vma["prot"] & prot["PROT_READ"] and \
-             vma["prot"] & prot["PROT_EXEC"]:
+        elif (vma["prot"] & prot["PROT_READ"] and
+              vma["prot"] & prot["PROT_EXEC"]):
             size = PAGESIZE
-        elif vma["status"] & status["VMA_ANON_SHARED"] or \
-             vma["status"] & status["VMA_FILE_SHARED"] or \
-             vma["status"] & status["VMA_ANON_PRIVATE"] or \
-             vma["status"] & status["VMA_FILE_PRIVATE"]:
+        elif (vma["status"] & status["VMA_ANON_SHARED"] or
+              vma["status"] & status["VMA_FILE_SHARED"] or
+              vma["status"] & status["VMA_ANON_PRIVATE"] or
+              vma["status"] & status["VMA_FILE_PRIVATE"]):
             size = vma["end"] - vma["start"]
         else:
             size = 0

From 8aa7694558f5196f3e8018df21789e36e0d126c8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Mon, 6 Sep 2021 00:20:58 +0100
Subject: [PATCH 0775/1854] test/coredump: fix shellcheck errors

ShellCheck reports the following problems:

SC2086: Double quote to prevent globbing and word splitting.
SC2035: Use ./*glob* or -- *glob* so names with dashes won't become options.
SC1091: Not following: ../env.sh was not specified as input (see shellcheck -x).

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 test/others/criu-coredump/test.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index 62d9f7edc..dd774e298 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -1,4 +1,8 @@
-source ../env.sh
+#!/bin/bash
+
+set -x
+# shellcheck disable=SC1091
+source ../env.sh || exit 1
 
 function gen_imgs {
 	PID=$(../loop)
@@ -9,7 +13,7 @@ function gen_imgs {
 		exit 1
 	fi
 
-	images_list=$(ls -1 *.img)
+	images_list=$(ls -1 ./*.img)
 	if [ -z "$images_list" ]; then
 		echo "Failed to generate images"
 		exit 1
@@ -32,7 +36,7 @@ function run_test {
 	for x in $cores
 	do
 		echo "=== try readelf $x"
-		readelf -a $x || exit $?
+		readelf -a "$x" || exit $?
 		echo "=== done"
 	done
 

From bf8382a8008a89af77245877849f4fc40032dede Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 22:55:24 +0100
Subject: [PATCH 0776/1854] make: enable lint for coredump

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index c2c387e3a..5592482b9 100644
--- a/Makefile
+++ b/Makefile
@@ -417,11 +417,13 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	flake8 --config=scripts/flake8.cfg scripts/criu-ns
+	flake8 --config=scripts/flake8.cfg coredump/
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
 	shellcheck test/others/crit/*.sh
 	shellcheck test/others/libcriu/*.sh
+	shellcheck test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck test/others/config-file/*.sh
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'

From bffaa7d072e08254950e0033eb1f56dd768a0317 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sun, 5 Sep 2021 23:06:56 +0100
Subject: [PATCH 0777/1854] ci: enable coredump tests

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 3 +++
 test/others/env.sh         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7c66e6802..51aa7db9e 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -259,6 +259,9 @@ ip net add test
 # more crit testing
 make -C test/others/crit run
 
+# coredump testing
+make -C test/others/criu-coredump run
+
 # libcriu testing
 make -C test/others/libcriu run
 
diff --git a/test/others/env.sh b/test/others/env.sh
index e2f63eee3..45066f760 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -13,5 +13,5 @@ fi
 #export PYTHON
 CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
 crit=$CRIT
-CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu-coredump/coredump-"${PYTHON}")
+CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump-"${PYTHON}")
 criu_coredump=$CRIU_COREDUMP

From 7ba4d3bf1d5fe5d48d97fa1f1037bf8b455f137c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 21 Oct 2021 11:47:01 +0300
Subject: [PATCH 0778/1854] pie/restorer: remove excess hash printf specifier

We use here "%#x" printf specifier in pie code, but sbuf_printf core pie
printing function knows nothing about '#' specifier. More over simple
"%x" in pie does same as "%#x" in stdio printf, see print_hex* functions
add "0x" before hex numbers.

We've got this error on vzt-cpt runs in Virtuozzo:

(04.750271) pie: 158: Adjust id
Error: Unknown printf format %#

So to fix it we can just remove '#'.

Fixes: ecd432fe2 ("timerfd: Implement c/r procedure")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pie/restorer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 4304691bb..0051452e4 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1013,7 +1013,7 @@ static int timerfd_arm(struct task_restore_args *args)
 
 			t->val.it_value.tv_sec += (time_t)ts.tv_sec;
 
-			pr_debug("Adjust id %#x it_value(%llu, %llu) -> it_value(%llu, %llu)\n", t->id,
+			pr_debug("Adjust id %x it_value(%llu, %llu) -> it_value(%llu, %llu)\n", t->id,
 				 (unsigned long long)ts.tv_sec, (unsigned long long)ts.tv_nsec,
 				 (unsigned long long)t->val.it_value.tv_sec,
 				 (unsigned long long)t->val.it_value.tv_nsec);

From 485a83c110bef1b2700acec0bd63bad4518aa62f Mon Sep 17 00:00:00 2001
From: "fu.lin" <fulin10@huawei.com>
Date: Fri, 17 Sep 2021 17:16:48 +0800
Subject: [PATCH 0779/1854] tty: fix the null pointer of get_tty_driver

v2: split error checking from index variable initialization
v3: use PRIx64 for printing dev_t

Signed-off-by: fu.lin <fulin10@huawei.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/tty.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/tty.c b/criu/tty.c
index 1598ad956..1462193c5 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -1977,6 +1977,12 @@ static int dump_one_tty(int lfd, u32 id, const struct fd_parms *p)
 	pr_info("Dumping tty %d with id %#x\n", lfd, id);
 
 	driver = get_tty_driver(p->stat.st_rdev, p->stat.st_dev);
+	if (driver == NULL) {
+		pr_err("Unable to find a tty driver (rdev %#" PRIx64 " dev %#" PRIx64 ")\n", p->stat.st_rdev,
+		       p->stat.st_dev);
+		return -1;
+	}
+
 	if (driver->fd_get_index)
 		index = driver->fd_get_index(lfd, p);
 	else

From c750e62caca4791dafc00f0e7e112f5b696d56fa Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 22 Oct 2021 17:56:37 +0300
Subject: [PATCH 0780/1854] util: use nftw in rmrf helper

This simplifies the code by removing excess recursion and reusing
standard function to walk over file-tree instead of opencoding it.

This addresses problem mentioned in my review comment:
https://github.com/checkpoint-restore/criu/pull/1495#discussion_r677554523

Fixes: 0db135ac4 ("util: add rm -rf function")

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/apparmor.c     |  2 +-
 criu/include/util.h |  4 ++--
 criu/util.c         | 46 ++++++++++++++-------------------------------
 3 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index 328fc606b..f9ad79619 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -630,7 +630,7 @@ int suspend_aa(void)
 	}
 
 	ret = do_suspend(true);
-	if (rm_rf(policydir) < 0)
+	if (rmrf(policydir) < 0)
 		pr_err("failed removing policy dir %s\n", policydir);
 
 	return ret;
diff --git a/criu/include/util.h b/criu/include/util.h
index a2dac2233..19d378fc5 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -284,8 +284,8 @@ int setup_tcp_server(char *type, char *addr, unsigned short *port);
 int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk);
 int setup_tcp_client(char *hostname);
 
-/* *dir should be writable and at least PATH_MAX long */
-int rm_rf(char *dir);
+/* path should be writable and no more than PATH_MAX long */
+int rmrf(char *path);
 
 #define LAST_PID_PATH "sys/kernel/ns_last_pid"
 #define PID_MAX_PATH  "sys/kernel/pid_max"
diff --git a/criu/util.c b/criu/util.c
index 06124c220..414879971 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1,4 +1,4 @@
-#define _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sched.h>
+#include <ftw.h>
 
 #include "linux/mount.h"
 
@@ -1613,44 +1614,25 @@ ssize_t write_all(int fd, const void *buf, size_t size)
 	return n;
 }
 
-int rm_rf(char *target)
+static int remove_one(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf)
 {
-	int offset = strlen(target);
-	DIR *dir = NULL;
-	struct dirent *de;
-	int ret = -1;
+	int ret;
 
-	dir = opendir(target);
-	if (!dir) {
-		pr_perror("unable to open %s", target);
+	ret = remove(fpath);
+	if (ret) {
+		pr_perror("rmrf: unable to remove %s", fpath);
 		return -1;
 	}
 
-	while ((de = readdir(dir))) {
-		int n;
+	return 0;
+}
 
-		if (dir_dots(de))
-			continue;
+#define NFTW_FD_MAX 64
 
-		n = snprintf(target + offset, PATH_MAX - offset, "/%s", de->d_name);
-		if (n < 0 || n >= PATH_MAX) {
-			pr_err("snprintf failed\n");
-			goto out;
-		}
-
-		if (de->d_type == DT_DIR && rm_rf(target))
-			goto out;
-
-		if (remove(target) < 0) {
-			pr_perror("unable to remove %s", target);
-			goto out;
-		}
-	}
-
-	ret = 0;
-out:
-	target[offset] = 0;
-	return ret;
+int rmrf(char *path)
+{
+	pr_debug("rmrf: removing %s\n", path);
+	return nftw(path, remove_one, NFTW_FD_MAX, FTW_DEPTH | FTW_PHYS);
 }
 
 __attribute__((returns_twice)) static pid_t raw_legacy_clone(unsigned long flags, int *pidfd)

From e3a853ab99a5ebd2faa646b2233c3ca6a3889986 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 18 Oct 2021 18:43:14 +0300
Subject: [PATCH 0781/1854] criu-ns: make pidns init first do setsid

We see that on criu-ns dump/restore/dump of the process which initially
was not a session leader (with --shell-job option) we see sid == 0 for
it and fail with something like:

Error (criu/cr-dump.c:1333): A session leader of 41585(41585) is outside of its pid namespace

Note: We should not dump processes with sid 0 (even with --shell-job) as
on restore we can can put such processes from multiple sessions into
one, which is wrong.

Fixes: #232

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 scripts/criu-ns | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index d76db3606..72c0753e5 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -102,6 +102,7 @@ def wrap_restore():
 
     criu_pid = os.fork()
     if criu_pid == 0:
+        os.setsid()
         _mount_new_proc()
         run_criu(restore_args)
 

From c1659c386d5b2e3625558eeb9a7da6c7863fbb52 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Thu, 28 Oct 2021 21:05:57 +0000
Subject: [PATCH 0782/1854] net: optimize restore_rule() to not open the
 CR_FD_RULE image file twice

Previously, `open_image(CR_FD_RULE, O_RSTR, pid)` was called twice.
Opening an image file twice is not allowed when streaming the image.
This commit optimizes the code to only open the image file once.

Also improved the error path in restore_ip_dump().

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/net.c | 51 ++++++++++++++++++---------------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 7b45f0633..02115c4de 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2250,12 +2250,12 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 	sockfd = img_raw_fd(img);
 	if (sockfd < 0) {
 		pr_err("Getting raw FD failed\n");
-		return -1;
+		goto out_image;
 	}
 	tmp_file = tmpfile();
 	if (!tmp_file) {
 		pr_perror("Failed to open tmpfile");
-		return -1;
+		goto out_image;
 	}
 
 	while ((n = read(sockfd, buf, 1024)) > 0) {
@@ -2264,25 +2264,34 @@ static int restore_ip_dump(int type, int pid, char *cmd)
 			pr_perror("Failed to write to tmpfile "
 				  "[written: %d; total: %d]",
 				  written, n);
-			goto close;
+			goto out_tmp_file;
 		}
 	}
 
 	if (fseek(tmp_file, 0, SEEK_SET)) {
 		pr_perror("Failed to set file position to beginning of tmpfile");
-		goto close;
+		goto out_tmp_file;
 	}
 
-	if (img) {
-		ret = run_ip_tool(cmd, "restore", NULL, NULL, fileno(tmp_file), -1, 0);
-		close_image(img);
+	if (type == CR_FD_RULE) {
+		/*
+		 * Delete 3 default rules to prevent duplicates. See kernel's
+		 * function fib_default_rules_init() for the details.
+		 */
+		run_ip_tool("rule", "flush", NULL, NULL, -1, -1, 0);
+		run_ip_tool("rule", "delete", "table", "local", -1, -1, 0);
 	}
 
-close:
+	ret = run_ip_tool(cmd, "restore", NULL, NULL, fileno(tmp_file), -1, 0);
+
+out_tmp_file:
 	if (fclose(tmp_file)) {
 		pr_perror("Failed to close tmpfile");
 	}
 
+out_image:
+	close_image(img);
+
 	return ret;
 }
 
@@ -2304,31 +2313,7 @@ static inline int restore_route(int pid)
 
 static inline int restore_rule(int pid)
 {
-	struct cr_img *img;
-	int ret = 0;
-
-	img = open_image(CR_FD_RULE, O_RSTR, pid);
-	if (!img) {
-		ret = -1;
-		goto out;
-	}
-
-	if (empty_image(img))
-		goto close;
-
-	/*
-	 * Delete 3 default rules to prevent duplicates. See kernel's
-	 * function fib_default_rules_init() for the details.
-	 */
-	run_ip_tool("rule", "flush", NULL, NULL, -1, -1, 0);
-	run_ip_tool("rule", "delete", "table", "local", -1, -1, 0);
-
-	if (restore_ip_dump(CR_FD_RULE, pid, "rule"))
-		ret = -1;
-close:
-	close_image(img);
-out:
-	return ret;
+	return restore_ip_dump(CR_FD_RULE, pid, "rule");
 }
 
 /*

From d17eb325c66708b165e48876ef8637e50d28cc61 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 27 Oct 2021 07:27:22 +0000
Subject: [PATCH 0783/1854] ci: replace deprecated codecov bash uploader

Replace deprecated codecov bash uploader with new version:

https://about.codecov.io/blog/introducing-codecovs-new-uploader/

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/gcov-test.yml | 2 ++
 Makefile                        | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gcov-test.yml b/.github/workflows/gcov-test.yml
index f1b38e77e..f782c5b9d 100644
--- a/.github/workflows/gcov-test.yml
+++ b/.github/workflows/gcov-test.yml
@@ -10,5 +10,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Run Coverage Tests
       run: sudo -E make -C scripts/ci local GCOV=1
+    - name: Run gcov
+      run: sudo -E find . -name '*gcda' -type f -print0 | sudo -E xargs --null --max-args 128 --max-procs 4 gcov
     - name: Run Coverage Analysis
       run: sudo -E make codecov
diff --git a/Makefile b/Makefile
index 5592482b9..8055e05ff 100644
--- a/Makefile
+++ b/Makefile
@@ -439,7 +439,9 @@ lint:
 
 codecov: SHELL := $(shell which bash)
 codecov:
-	bash <(curl -s https://codecov.io/bash)
+	curl -Os https://uploader.codecov.io/latest/linux/codecov
+	chmod +x codecov
+	./codecov
 .PHONY: codecov
 
 fetch-clang-format: .FORCE

From f7bc3bdc9181189fc095c166a9464b4557ec1e18 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 4 Nov 2021 09:10:38 +0000
Subject: [PATCH 0784/1854] ci: fix userfaultfd test failures

Newer kernels (5.11) require echo 1 > /proc/sys/vm/unprivileged_userfaultfd

Without the 'echo 1' the kernel prints a message like this:

 uffd: Set unprivileged_userfaultfd sysctl knob to 1 if kernel faults must be handled without obtaining CAP_SYS_PTRACE capability

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 51aa7db9e..096f907fb 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -197,6 +197,12 @@ fi
 # shellcheck disable=SC2086
 ./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
 
+# Newer kernels are blocking access to userfaultfd:
+# uffd: Set unprivileged_userfaultfd sysctl knob to 1 if kernel faults must be handled without obtaining CAP_SYS_PTRACE capability
+if [ -e /proc/sys/vm/unprivileged_userfaultfd ]; then
+	echo 1 > /proc/sys/vm/unprivileged_userfaultfd
+fi
+
 LAZY_EXCLUDE="-x maps04 -x cmdlinenv00 -x maps007"
 
 LAZY_TESTS='.*(maps0|uffd-events|lazy-thp|futex|fork).*'

From dae0704b617e71f66c68b546865b3396074c202e Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 4 Nov 2021 09:18:31 +0000
Subject: [PATCH 0785/1854] ci: use Fedora 34 for lint CI runs

Fedora 35 comes with clang 13 which provides different results for
clang-format than clang 12 in Fedora 34.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50b241e9f..49eb6aaac 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: registry.fedoraproject.org/fedora:latest
+      image: registry.fedoraproject.org/fedora:34
     steps:
     - name: Install tools
       run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils

From 37a8090d8c7912e835399e68d1acf0fb7c0d4616 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 29 Oct 2021 02:49:31 +0000
Subject: [PATCH 0786/1854] tests: improve the image streamer process control

When exceptions are raised during testing, the image streamer process
should be terminated as opposed to being left hanging.
This could lead to the whole test suite to be left hanging as it waits
for all child processes to exit.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 test/zdtm.py | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 0a52e1b96..fc7b8a183 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1039,6 +1039,7 @@ class criu:
         self.__lazy_pages_p = None
         self.__page_server_p = None
         self.__dump_process = None
+        self.__img_streamer_process = None
         self.__tls = self.__tls_options() if opts['tls'] else []
         self.__criu_bin = opts['criu_bin']
         self.__crit_bin = opts['crit_bin']
@@ -1065,6 +1066,11 @@ class criu:
             self.__dump_process = None
             if ret:
                 raise test_fail_exc("criu dump exited with %s" % ret)
+        if self.__img_streamer_process:
+            ret = self.wait_for_criu_image_streamer()
+            if ret:
+                raise test_fail_exc("criu-image-streamer exited with %s" % ret)
+
         return
 
     def logs(self):
@@ -1219,8 +1225,10 @@ class criu:
                 stent['pages_written'])
 
         if self.__stream:
-            p = self.spawn_criu_image_streamer("extract")
-            p.wait()
+            self.spawn_criu_image_streamer("extract")
+            ret = self.wait_for_criu_image_streamer()
+            if ret:
+                raise test_fail_exc("criu-image-streamer (extract) exited with %s" % ret)
 
         real_written = 0
         for f in os.listdir(self.__ddir()):
@@ -1262,6 +1270,8 @@ class criu:
                    "--progress-fd {progress_fd}",
                    action]
 
+        log = open(os.path.join(self.__ddir(), "img-streamer.log"), "w")
+
         # * As we are using a shell pipe command, we want to use pipefail.
         # Otherwise, failures stay unnoticed. For this, we use bash as sh
         # doesn't support that feature.
@@ -1270,7 +1280,9 @@ class criu:
             progress_fd=progress_w,
             images_dir=self.__ddir(),
             img_file=os.path.join(self.__ddir(), STREAMED_IMG_FILE_NAME)
-        )], close_fds=False)
+        )], stderr=log, close_fds=False)
+
+        log.close()
 
         os.close(progress_w)
         progress = os.fdopen(progress_r, "r")
@@ -1287,7 +1299,15 @@ class criu:
                 raise test_fail_exc(
                     "criu-image-streamer is not starting (exit_code=%d)" % p.wait())
 
-        return p
+        progress.close()
+
+        self.__img_streamer_process = p
+
+    def wait_for_criu_image_streamer(self):
+        ret = self.__img_streamer_process.wait()
+        grep_errors(os.path.join(self.__ddir(), "img-streamer.log"))
+        self.__img_streamer_process = None
+        return ret
 
     def dump(self, action, opts=[]):
         self.__iter += 1
@@ -1319,7 +1339,7 @@ class criu:
         a_opts += self.__test.getdopts()
 
         if self.__stream:
-            streamer_p = self.spawn_criu_image_streamer("capture")
+            self.spawn_criu_image_streamer("capture")
             a_opts += ["--stream"]
 
         if self.__dedup:
@@ -1347,9 +1367,9 @@ class criu:
                                               opts=a_opts + opts,
                                               nowait=nowait)
         if self.__stream:
-            ret = streamer_p.wait()
+            ret = self.wait_for_criu_image_streamer()
             if ret:
-                raise test_fail_exc("criu-image-streamer exited with %d" % ret)
+                raise test_fail_exc("criu-image-streamer (capture) exited with %d" % ret)
 
         if self.__mdedup and self.__iter > 1:
             self.__criu_act("dedup", opts=[])
@@ -1382,7 +1402,7 @@ class criu:
             r_opts += ['--action-script', os.getcwd() + '/empty-netns-prep.sh']
 
         if self.__stream:
-            streamer_p = self.spawn_criu_image_streamer("serve")
+            self.spawn_criu_image_streamer("serve")
             r_opts += ["--stream"]
 
         if self.__dedup:
@@ -1419,9 +1439,9 @@ class criu:
 
         self.__criu_act("restore", opts=r_opts + ["--restore-detached"])
         if self.__stream:
-            ret = streamer_p.wait()
+            ret = self.wait_for_criu_image_streamer()
             if ret:
-                raise test_fail_exc("criu-image-streamer exited with %d" % ret)
+                raise test_fail_exc("criu-image-streamer (serve) exited with %d" % ret)
 
         self.show_stats("restore")
 
@@ -1466,6 +1486,10 @@ class criu:
             print("criu dump exited with %s" % self.__dump_process.wait())
             grep_errors(os.path.join(self.__ddir(), "dump.log"))
             self.__dump_process = None
+        if self.__img_streamer_process:
+            self.__img_streamer_process.terminate()
+            ret = self.wait_for_criu_image_streamer()
+            print("criu-image-streamer exited with %s" % ret)
 
 
 def try_run_hook(test, args):

From 2bd709664ffa16fd56487b320e79f9308f3662b8 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 29 Jul 2021 14:21:37 +0300
Subject: [PATCH 0787/1854] sockets: don't call sk_setbufs asyncronously

We want to also c/r socket buf locks (SO_BUF_LOCKS) which are also
implicitly set by setsockopt(SO_{SND,RCV}BUF*), so we need to order
these two properly. That's why we need to wait for sk_setbufs to finish.
And there is no much point in seting buffer sizes asyncronously anyway.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sockets.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index 9426b5b94..65aa82950 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -517,7 +517,7 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 	pr_info("%d restore sndbuf %d rcv buf %d\n", sk, soe->so_sndbuf, soe->so_rcvbuf);
 
 	/* setsockopt() multiplies the input values by 2 */
-	ret |= userns_call(sk_setbufs, UNS_ASYNC, bufs, sizeof(bufs), sk);
+	ret |= userns_call(sk_setbufs, 0, bufs, sizeof(bufs), sk);
 
 	if (soe->has_so_priority) {
 		pr_debug("\trestore priority %d for socket\n", soe->so_priority);

From ce5ce285a81d45a62355301cd68085bb236667fd Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 29 Jul 2021 14:57:17 +0300
Subject: [PATCH 0788/1854] kerndat: check for set/getsockopt SO_BUF_LOCK
 availability

This is a new kernel feature to let criu restore sockets with kernel
auto-adjusted buffer sizes.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-check.c        | 10 ++++++++++
 criu/include/kerndat.h |  1 +
 criu/include/sockets.h |  4 ++++
 criu/kerndat.c         | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 3575fb3b3..3e268c439 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1372,6 +1372,14 @@ static int check_network_lock_nftables(void)
 	return 0;
 }
 
+static int check_sockopt_buf_lock(void)
+{
+	if (!kdat.has_sockopt_buf_lock)
+		return -1;
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1490,6 +1498,7 @@ int cr_check(void)
 		ret |= check_ns_pid();
 		ret |= check_apparmor_stacking();
 		ret |= check_network_lock_nftables();
+		ret |= check_sockopt_buf_lock();
 	}
 
 	/*
@@ -1602,6 +1611,7 @@ static struct feature_list feature_list[] = {
 	{ "ns_pid", check_ns_pid },
 	{ "apparmor_stacking", check_apparmor_stacking },
 	{ "network_lock_nftables", check_network_lock_nftables },
+	{ "sockopt_buf_lock", check_sockopt_buf_lock },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 80bad7f11..2ded7d1da 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -74,6 +74,7 @@ struct kerndat_s {
 	bool has_pidfd_getfd;
 	bool has_nspid;
 	bool has_nftables_concat;
+	bool has_sockopt_buf_lock;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/sockets.h b/criu/include/sockets.h
index 3e8f3d601..399d38664 100644
--- a/criu/include/sockets.h
+++ b/criu/include/sockets.h
@@ -123,4 +123,8 @@ extern const char *socket_proto_name(unsigned int proto, char *nm, size_t size);
 #define ___socket_family_name(family) __socket_info_helper(socket_family_name, family)
 #define ___socket_proto_name(proto)   __socket_info_helper(socket_proto_name, proto)
 
+#ifndef SO_BUF_LOCK
+#define SO_BUF_LOCK 72
+#endif
+
 #endif /* __CR_SOCKETS_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 0e88ba43e..9f6a6ec42 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -816,6 +816,35 @@ static int kerndat_x86_has_ptrace_fpu_xsave_bug(void)
 	return 0;
 }
 
+int kerndat_sockopt_buf_lock(void)
+{
+	int exit_code = -1;
+	socklen_t len;
+	u32 buf_lock;
+	int sock;
+
+	sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (sock < 0) {
+		pr_perror("Unable to create a socket");
+		return -1;
+	}
+
+	len = sizeof(buf_lock);
+	if (getsockopt(sock, SOL_SOCKET, SO_BUF_LOCK, &buf_lock, &len)) {
+		if (errno != ENOPROTOOPT) {
+			pr_perror("Unable to get SO_BUF_LOCK with getsockopt");
+			goto err;
+		}
+		kdat.has_sockopt_buf_lock = false;
+	} else
+		kdat.has_sockopt_buf_lock = true;
+
+	exit_code = 0;
+err:
+	close(sock);
+	return exit_code;
+}
+
 #define KERNDAT_CACHE_FILE     KDAT_RUNDIR "/criu.kdat"
 #define KERNDAT_CACHE_FILE_TMP KDAT_RUNDIR "/.criu.kdat"
 
@@ -1359,6 +1388,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_nftables_concat failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_sockopt_buf_lock()) {
+		pr_err("kerndat_sockopt_buf_lock failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From e69be16db7deae018902b0ceb62db8eaf7b74437 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 29 Jul 2021 11:27:13 +0300
Subject: [PATCH 0789/1854] sockets: c/r bufer size locks

When one sets socket buffer sizes with setsockopt(SO_{SND,RCV}BUF*),
kernel sets coresponding SOCK_SNDBUF_LOCK or SOCK_RCVBUF_LOCK flags on
struct sock. It means that such a socket with explicitly changed buffer
size can not be auto-adjusted by kernel (e.g. if there is free memory
kernel can auto-increase default socket buffers to improve perfomance).
(see tcp_fixup_rcvbuf() and tcp_sndbuf_expand())

CRIU is always changing buf sizes on restore, that means that all
sockets receive lock flags on struct sock and become non-auto-adjusted
after migration. In some cases it can decrease perfomance of network
connections quite a lot.

So let's c/r socket buf locks (SO_BUF_LOCKS), so that sockets for which
auto-adjustment is available does not lose it.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sockets.c       | 8 ++++++++
 images/sk-opts.proto | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/criu/sockets.c b/criu/sockets.c
index 65aa82950..db772707b 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -519,6 +519,10 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 	/* setsockopt() multiplies the input values by 2 */
 	ret |= userns_call(sk_setbufs, 0, bufs, sizeof(bufs), sk);
 
+	if (soe->has_so_buf_lock) {
+		pr_debug("\trestore buf_lock %d for socket\n", soe->so_buf_lock);
+		ret |= restore_opt(sk, SOL_SOCKET, SO_BUF_LOCK, &soe->so_buf_lock);
+	}
 	if (soe->has_so_priority) {
 		pr_debug("\trestore priority %d for socket\n", soe->so_priority);
 		ret |= restore_opt(sk, SOL_SOCKET, SO_PRIORITY, &soe->so_priority);
@@ -619,6 +623,10 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 
 	ret |= dump_opt(sk, SOL_SOCKET, SO_SNDBUF, &soe->so_sndbuf);
 	ret |= dump_opt(sk, SOL_SOCKET, SO_RCVBUF, &soe->so_rcvbuf);
+	if (kdat.has_sockopt_buf_lock) {
+		soe->has_so_buf_lock = true;
+		ret |= dump_opt(sk, SOL_SOCKET, SO_BUF_LOCK, &soe->so_buf_lock);
+	}
 	soe->has_so_priority = true;
 	ret |= dump_opt(sk, SOL_SOCKET, SO_PRIORITY, &soe->so_priority);
 	soe->has_so_rcvlowat = true;
diff --git a/images/sk-opts.proto b/images/sk-opts.proto
index 2377f6b62..1d24d47cc 100644
--- a/images/sk-opts.proto
+++ b/images/sk-opts.proto
@@ -31,6 +31,8 @@ message sk_opts_entry {
 	optional uint32		tcp_keepintvl	= 22;
 	optional uint32		so_oobinline	= 23;
 	optional uint32		so_linger	= 24;
+
+	optional uint32		so_buf_lock	= 25;
 }
 
 enum sk_shutdown {

From 3a875cc4c72411f772116bb53a9f6d8caeb84e36 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 29 Jul 2021 16:16:12 +0300
Subject: [PATCH 0790/1854] zdtm: add test for socket buffer size locks

Just set all possible values 0-3 and chack if it persists.

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile         |  1 +
 test/zdtm/static/sock_opts02.c    | 73 +++++++++++++++++++++++++++++++
 test/zdtm/static/sock_opts02.desc |  1 +
 3 files changed, 75 insertions(+)
 create mode 100644 test/zdtm/static/sock_opts02.c
 create mode 100644 test/zdtm/static/sock_opts02.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index b6aa621c7..3e1e0a498 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -117,6 +117,7 @@ TST_NOFILE	:=				\
 		socket-linger			\
 		sock_opts00			\
 		sock_opts01			\
+		sock_opts02			\
 		sk-unix-unconn			\
 		ipc_namespace			\
 		selfexe00			\
diff --git a/test/zdtm/static/sock_opts02.c b/test/zdtm/static/sock_opts02.c
new file mode 100644
index 000000000..21a81a28f
--- /dev/null
+++ b/test/zdtm/static/sock_opts02.c
@@ -0,0 +1,73 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that SO_BUF_LOCK option dumped";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+#ifndef SO_BUF_LOCK
+#define SO_BUF_LOCK 72
+#endif
+
+#define NSOCK 4
+
+int main(int argc, char **argv)
+{
+	int sock[NSOCK];
+	uint32_t val[NSOCK];
+	int ret, i;
+	int exit_code = 1;
+
+	test_init(argc, argv);
+
+	for (i = 0; i < NSOCK; i++) {
+		sock[i] = -1;
+		val[i] = i;
+	}
+
+	for (i = 0; i < NSOCK; i++) {
+		sock[i] = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+		if (sock[i] < 0) {
+			pr_perror("can't create socket %d", i);
+			goto err;
+		}
+
+		ret = setsockopt(sock[i], SOL_SOCKET, SO_BUF_LOCK, &val[i], sizeof(val[i]));
+		if (ret < 0) {
+			pr_perror("can't set SO_BUF_LOCK (%u) on socket %d", val[i], i);
+			goto err;
+		}
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	for (i = 0; i < NSOCK; i++) {
+		uint32_t tmp;
+		socklen_t len;
+
+		len = sizeof(tmp);
+		ret = getsockopt(sock[i], SOL_SOCKET, SO_BUF_LOCK, &tmp, &len);
+		if (ret < 0) {
+			pr_perror("can't get SO_BUF_LOCK from socket %d", i);
+			goto err;
+		}
+
+		if (tmp != val[i]) {
+			fail("SO_BUF_LOCK missmatch %u != %u", tmp, val[i]);
+			goto err;
+		}
+	}
+
+	pass();
+	exit_code = 0;
+err:
+	for (i = 0; i < NSOCK; i++)
+		close(sock[i]);
+
+	return exit_code;
+}
diff --git a/test/zdtm/static/sock_opts02.desc b/test/zdtm/static/sock_opts02.desc
new file mode 100644
index 000000000..37d3a6354
--- /dev/null
+++ b/test/zdtm/static/sock_opts02.desc
@@ -0,0 +1 @@
+{'flags': 'suid', 'feature': 'sockopt_buf_lock'}

From 718f4cae2cb1bebea8ae56694df20692a5cfce4c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 3 Aug 2021 13:05:32 +0300
Subject: [PATCH 0791/1854] zdtm: make sock_opts02 also check lock change by
 SO_*BUF*

Reviewed-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/sock_opts02.c | 63 +++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/test/zdtm/static/sock_opts02.c b/test/zdtm/static/sock_opts02.c
index 21a81a28f..7ea98744a 100644
--- a/test/zdtm/static/sock_opts02.c
+++ b/test/zdtm/static/sock_opts02.c
@@ -13,32 +13,77 @@ const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 #define SO_BUF_LOCK 72
 #endif
 
-#define NSOCK 4
+#ifndef SOCK_SNDBUF_LOCK
+#define SOCK_SNDBUF_LOCK 1
+#endif
+#ifndef SOCK_RCVBUF_LOCK
+#define SOCK_RCVBUF_LOCK 2
+#endif
+
+#define BUFSIZE 16384
+
+struct sk_opt {
+	int type;
+	uint32_t val;
+	uint32_t lock;
+} sk_opts[] = { { SO_BUF_LOCK, 0, 0 },
+		{ SO_BUF_LOCK, SOCK_SNDBUF_LOCK, SOCK_SNDBUF_LOCK },
+		{ SO_BUF_LOCK, SOCK_RCVBUF_LOCK, SOCK_RCVBUF_LOCK },
+		{ SO_BUF_LOCK, SOCK_SNDBUF_LOCK | SOCK_RCVBUF_LOCK, SOCK_SNDBUF_LOCK | SOCK_RCVBUF_LOCK },
+		{ SO_SNDBUF, BUFSIZE, SOCK_SNDBUF_LOCK },
+		{ SO_RCVBUF, BUFSIZE, SOCK_RCVBUF_LOCK } };
+
+#define NSOCK ARRAY_SIZE(sk_opts)
+
+char *type_to_str(int type)
+{
+	switch (type) {
+	case SO_BUF_LOCK:
+		return "SO_BUF_LOCK";
+	case SO_SNDBUFFORCE:
+		return "SO_SNDBUFFORCE";
+	case SO_RCVBUFFORCE:
+		return "SO_RCVBUFFORCE";
+	}
+	return NULL;
+}
 
 int main(int argc, char **argv)
 {
 	int sock[NSOCK];
-	uint32_t val[NSOCK];
 	int ret, i;
 	int exit_code = 1;
 
 	test_init(argc, argv);
 
-	for (i = 0; i < NSOCK; i++) {
+	for (i = 0; i < NSOCK; i++)
 		sock[i] = -1;
-		val[i] = i;
-	}
 
 	for (i = 0; i < NSOCK; i++) {
+		uint32_t tmp;
+		socklen_t len;
+
 		sock[i] = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 		if (sock[i] < 0) {
 			pr_perror("can't create socket %d", i);
 			goto err;
 		}
 
-		ret = setsockopt(sock[i], SOL_SOCKET, SO_BUF_LOCK, &val[i], sizeof(val[i]));
+		ret = setsockopt(sock[i], SOL_SOCKET, sk_opts[i].type, &sk_opts[i].val, sizeof(sk_opts[i].val));
 		if (ret < 0) {
-			pr_perror("can't set SO_BUF_LOCK (%u) on socket %d", val[i], i);
+			pr_perror("can't set %s (%u) on socket %d", type_to_str(sk_opts[i].type), sk_opts[i].val, i);
+			goto err;
+		}
+
+		len = sizeof(tmp);
+		ret = getsockopt(sock[i], SOL_SOCKET, SO_BUF_LOCK, &tmp, &len);
+		if (ret < 0) {
+			pr_perror("can't get SO_BUF_LOCK from socket %d", i);
+			goto err;
+		}
+
+		if (tmp != sk_opts[i].lock) {
+			fail("SO_BUF_LOCK missmatch %u != %u", tmp, sk_opts[i].lock);
 			goto err;
 		}
 	}
@@ -57,8 +102,8 @@ int main(int argc, char **argv)
 			goto err;
 		}
 
-		if (tmp != val[i]) {
-			fail("SO_BUF_LOCK missmatch %u != %u", tmp, val[i]);
+		if (tmp != sk_opts[i].lock) {
+			fail("SO_BUF_LOCK missmatch %u != %u", tmp, sk_opts[i].lock);
 			goto err;
 		}
 	}

From bbfd9031a3f2b0f18168a01c399da05644f94fbc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 28 Oct 2021 17:15:52 +0300
Subject: [PATCH 0792/1854] clang-format: enable AlignTrailingComments

Code becomes much more human-readable after enabling it.

Example 1:

Before:
```
struct file_desc {
	u32 id; /* File id, unique */
	struct hlist_node hash; /* Descriptor hashing and lookup */
	struct list_head fd_info_head; /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
	struct file_desc_ops *ops; /* Associated operations */
	struct list_head fake_master_list; /* To chain in the list of file_desc, which don't
						    have a fle in a task, that having permissions */
};
```
After:
```
struct file_desc {
	u32 id;                            /* File id, unique */
	struct hlist_node hash;            /* Descriptor hashing and lookup */
	struct list_head fd_info_head;     /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
	struct file_desc_ops *ops;         /* Associated operations */
	struct list_head fake_master_list; /* To chain in the list of file_desc, which don't
					    * have a fle in a task, that having permissions */
};
```

Example 2:

Before:
```
enum fsconfig_command {
	FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
	FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
	FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
	FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
	FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
	FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
	FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
	FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
};
```
After:
```
enum fsconfig_command {
	FSCONFIG_SET_FLAG = 0,        /* Set parameter, supplying no value */
	FSCONFIG_SET_STRING = 1,      /* Set parameter, supplying a string value */
	FSCONFIG_SET_BINARY = 2,      /* Set parameter, supplying a binary blob value */
	FSCONFIG_SET_PATH = 3,        /* Set parameter, supplying an object by path */
	FSCONFIG_SET_PATH_EMPTY = 4,  /* Set parameter, supplying an object by (empty) path */
	FSCONFIG_SET_FD = 5,          /* Set parameter, supplying an object by fd */
	FSCONFIG_CMD_CREATE = 6,      /* Invoke superblock creation */
	FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
};
```

Example 3:

Before:
```
	ret = libnet_build_tcp(ntohs(sk->dst_addr->v4.sin_port), /* source port */
			       ntohs(sk->src_addr->v4.sin_port), /* destination port */
			       data->inq_seq, /* sequence number */
			       data->outq_seq - data->outq_len, /* acknowledgement num */
			       flags, /* control flags */
			       data->rcv_wnd, /* window size */
			       0, /* checksum */
			       10, /* urgent pointer */
			       LIBNET_TCP_H + 20, /* TCP packet size */
			       NULL, /* payload */
			       0, /* payload size */
			       l, /* libnet handle */
			       0); /* libnet id */
```
After:
```
	ret = libnet_build_tcp(ntohs(sk->dst_addr->v4.sin_port), /* source port */
			       ntohs(sk->src_addr->v4.sin_port), /* destination port */
			       data->inq_seq,                    /* sequence number */
			       data->outq_seq - data->outq_len,  /* acknowledgement num */
			       flags,                            /* control flags */
			       data->rcv_wnd,                    /* window size */
			       0,                                /* checksum */
			       10,                               /* urgent pointer */
			       LIBNET_TCP_H + 20,                /* TCP packet size */
			       NULL,                             /* payload */
			       0,                                /* payload size */
			       l,                                /* libnet handle */
			       0);                               /* libnet id */
```

Example 4:

Before:
```
static struct testcase __testcases[] = {
	{ 2, 1, 2, 1, 2, 1 }, /* session00                      */
	{ 4, 2, 4, 2, 4, 1 }, /*  |\_session00          */
	{ 15, 4, 4, 4, 15, 1 }, /*  |  |\_session00             */
	{ 16, 4, 4, 4, 15, 1 }, /*  |   \_session00             */
	{ 17, 4, 4, 4, 17, 0 }, /*  |  |\_session00             */
	{ 18, 4, 4, 4, 17, 1 }, /*  |   \_session00             */
	{ 5, 2, 2, 2, 2, 1 }, /*  |\_session00          */
	{ 8, 2, 8, 2, 8, 1 }, /*  |\_session00          */
	{ 9, 8, 2, 2, 2, 1 }, /*  |   \_session00               */
	{ 10, 2, 10, 2, 10, 1 }, /*  |\_session00               */
	{ 11, 10, 11, 2, 11, 1 }, /*  |    \_session00          */
	{ 12, 11, 2, 2, 2, 1 }, /*  |        \_session00        */
	{ 13, 2, 2, 2, 2, 0 }, /*   \_session00         */
	{ 3, 13, 2, 2, 2, 1 }, /* session00                     */
	{ 6, 2, 6, 2, 6, 0 }, /*   \_session00          */
	{ 14, 6, 6, 6, 6, 1 }, /* session00                     */
};
```
After:
```
static struct testcase __testcases[] = {
	{ 2, 1, 2, 1, 2, 1 },     /* session00                  */
	{ 4, 2, 4, 2, 4, 1 },     /*  |\_session00              */
	{ 15, 4, 4, 4, 15, 1 },   /*  |  |\_session00           */
	{ 16, 4, 4, 4, 15, 1 },   /*  |   \_session00           */
	{ 17, 4, 4, 4, 17, 0 },   /*  |  |\_session00           */
	{ 18, 4, 4, 4, 17, 1 },   /*  |   \_session00           */
	{ 5, 2, 2, 2, 2, 1 },     /*  |\_session00              */
	{ 8, 2, 8, 2, 8, 1 },     /*  |\_session00              */
	{ 9, 8, 2, 2, 2, 1 },     /*  |   \_session00           */
	{ 10, 2, 10, 2, 10, 1 },  /*  |\_session00              */
	{ 11, 10, 11, 2, 11, 1 }, /*  |    \_session00          */
	{ 12, 11, 2, 2, 2, 1 },   /*  |        \_session00      */
	{ 13, 2, 2, 2, 2, 0 },    /*   \_session00              */
	{ 3, 13, 2, 2, 2, 1 },    /* session00                  */
	{ 6, 2, 6, 2, 6, 0 },     /*   \_session00              */
	{ 14, 6, 6, 6, 6, 1 },    /* session00                  */
};
```

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .clang-format                 | 2 +-
 scripts/fetch-clang-format.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index dd4ade370..96ba5909f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -15,7 +15,7 @@ AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left # Unknown to clang-format-4.0
 AlignOperands: true
-AlignTrailingComments: false
+AlignTrailingComments: true
 AlignConsecutiveMacros: true
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
index c9006c518..0e9545f2d 100755
--- a/scripts/fetch-clang-format.sh
+++ b/scripts/fetch-clang-format.sh
@@ -12,4 +12,5 @@ curl -s "${URL}" | sed -e "
 	s,Intended for clang-format >= 4,Intended for clang-format >= 11,g;
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;
 	s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
+	s,AlignTrailingComments: false,AlignTrailingComments: true,g;
 "  > .clang-format

From 2064793225b28900deb87d03973c824d6721263c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 28 Oct 2021 17:17:44 +0300
Subject: [PATCH 0793/1854] clang-format: do several manual comment fixups

Automatic AlignTrailingComments fails to make those comments look right,
so let's do it manually, so that they both satisfy AlignTrailingComments
and also are human-readable.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/files.h             | 10 +++++-----
 criu/include/page-pipe.h         |  6 ++----
 criu/include/pagemap.h           | 17 +++++++----------
 criu/include/pipes.h             |  4 ++--
 criu/shmem.c                     |  3 ++-
 test/zdtm/static/ipc_namespace.c | 31 ++++++++++++++++---------------
 6 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/criu/include/files.h b/criu/include/files.h
index 96face71b..26ce1f42a 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -121,12 +121,12 @@ unsigned int find_unused_fd(struct pstree_item *, int hint_fd);
 struct fdinfo_list_entry *find_used_fd(struct pstree_item *, int fd);
 
 struct file_desc {
-	u32 id; /* File id, unique */
-	struct hlist_node hash; /* Descriptor hashing and lookup */
-	struct list_head fd_info_head; /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
-	struct file_desc_ops *ops; /* Associated operations */
+	u32 id;				   /* File id, unique */
+	struct hlist_node hash;		   /* Descriptor hashing and lookup */
+	struct list_head fd_info_head;	   /* Chain of fdinfo_list_entry-s with same ID and type but different pids */
+	struct file_desc_ops *ops;	   /* Associated operations */
 	struct list_head fake_master_list; /* To chain in the list of file_desc, which don't
-						    have a fle in a task, that having permissions */
+					    * have a fle in a task, that having permissions */
 };
 
 struct fdtype_ops {
diff --git a/criu/include/page-pipe.h b/criu/include/page-pipe.h
index a5f97678e..0917869d9 100644
--- a/criu/include/page-pipe.h
+++ b/criu/include/page-pipe.h
@@ -130,10 +130,8 @@ struct page_pipe {
 	unsigned int flags; /* PP_FOO flags below */
 };
 
-#define PP_CHUNK_MODE \
-	0x1 /* Restrict the maximum buffer size of pipes
-				   and dump memory for a few iterations */
-#define PP_OWN_IOVS 0x4 /* create_page_pipe allocated IOVs memory */
+#define PP_CHUNK_MODE 0x1 /* Restrict the maximum buffer size of pipes and dump memory for a few iterations */
+#define PP_OWN_IOVS   0x4 /* create_page_pipe allocated IOVs memory */
 
 struct page_pipe *create_page_pipe(unsigned int nr_segs, struct iovec *iovs, unsigned flags);
 extern void destroy_page_pipe(struct page_pipe *p);
diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index c39c25d0c..8c7180559 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -63,17 +63,14 @@ struct page_read {
 	struct cr_img *pi;
 	u32 pages_img_id;
 
-	PagemapEntry *pe; /* current pagemap we are on */
-	struct page_read *parent; /* parent pagemap (if ->in_parent
-					   pagemap is met in image, then
-					   go to this guy for page, see
-					   read_pagemap_page */
-	unsigned long cvaddr; /* vaddr we are on */
-	off_t pi_off; /* current offset in pages file */
+	PagemapEntry *pe;	  /* current pagemap we are on */
+	struct page_read *parent; /* parent pagemap (if ->in_parent pagemap is met in image,
+				   * then go to this guy for page, see read_pagemap_page */
+	unsigned long cvaddr;	  /* vaddr we are on */
+	off_t pi_off;		  /* current offset in pages file */
 
-	struct iovec bunch; /* record consequent neighbour
-					   iovecs to punch together */
-	unsigned id; /* for logging */
+	struct iovec bunch;   /* record consequent neighbour iovecs to punch together */
+	unsigned id;	      /* for logging */
 	unsigned long img_id; /* pagemap image file ID */
 
 	PagemapEntry **pmes;
diff --git a/criu/include/pipes.h b/criu/include/pipes.h
index 6e6310e14..f442d7f65 100644
--- a/criu/include/pipes.h
+++ b/criu/include/pipes.h
@@ -49,8 +49,8 @@ extern int restore_pipe_data(int img_type, int pfd, u32 id, struct pipe_data_rst
 struct pipe_info {
 	PipeEntry *pe;
 	struct list_head pipe_list; /* All pipe_info with the same pipe_id
-						 * This is pure circular list without head */
-	struct list_head list; /* global list of pipes */
+				     * This is pure circular list without head */
+	struct list_head list;	    /* global list of pipes */
 	struct file_desc d;
 	unsigned int create : 1, reopen : 1;
 };
diff --git a/criu/shmem.c b/criu/shmem.c
index 1b83327ef..bb48e436b 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -85,7 +85,8 @@ struct shmem_info {
 			int self_count; /* the number of regions, which belongs to "pid" */
 		};
 
-		struct { /* For sysvipc restore */
+		/* For sysvipc restore */
+		struct {
 			struct list_head att; /* list of shmem_sysv_att-s */
 			int want_write;
 		};
diff --git a/test/zdtm/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index 98241d816..4273951ae 100644
--- a/test/zdtm/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
@@ -19,27 +19,28 @@ extern int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf);
 
 struct ipc_ids {
 	int in_use; /* TODO: Check for 0 */
-	//	unsigned short seq;
-	//	unsigned short seq_max;
-	//	struct rw_semaphore rw_mutex;
-	//	struct idr ipcs_idr;		/* TODO */
+
+	// unsigned short seq;
+	// unsigned short seq_max;
+	// struct rw_semaphore rw_mutex;
+	// struct idr ipcs_idr; /* TODO */
 };
 
 struct ipc_ns {
 	struct ipc_ids ids[3];
 
-	int sem_ctls[4]; // +
-	int used_sems; // +
+	int sem_ctls[4];
+	int used_sems;
 
-	int msg_ctlmax; // +
-	int msg_ctlmnb; // +
-	int msg_ctlmni; // +
-	int msg_bytes; // +
-	int msg_hdrs; // +
-	int auto_msgmni; // +
-	int msg_next_id; // +
-	int sem_next_id; // +
-	int shm_next_id; // +
+	int msg_ctlmax;
+	int msg_ctlmnb;
+	int msg_ctlmni;
+	int msg_bytes;
+	int msg_hdrs;
+	int auto_msgmni;
+	int msg_next_id;
+	int sem_next_id;
+	int shm_next_id;
 
 	size_t shm_ctlmax;
 	size_t shm_ctlall;

From 26db7adbbbb14fd88e1472ba3d15ee580813e68e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 28 Oct 2021 18:10:14 +0300
Subject: [PATCH 0794/1854] clang-format: do automatic comment fixups

Result of `make indent` after enabling AlignTrailingComments.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 compel/arch/aarch64/src/lib/infect.c          |   2 +-
 compel/arch/arm/src/lib/infect.c              |   2 +-
 compel/arch/mips/src/lib/include/ldsodefs.h   |  10 +-
 .../mips/src/lib/include/uapi/asm/siginfo.h   |  14 +-
 compel/arch/mips/src/lib/infect.c             |   2 +-
 .../src/lib/include/uapi/asm/infect-types.h   |   6 +-
 compel/arch/ppc64/src/lib/infect.c            |   2 +-
 compel/arch/s390/src/lib/infect.c             |   4 +-
 .../arch/x86/plugins/std/syscalls/syscall32.c |   6 +-
 .../arch/x86/src/lib/include/uapi/asm/cpu.h   | 158 +++++++++---------
 .../arch/x86/src/lib/include/uapi/asm/fpu.h   |  16 +-
 compel/arch/x86/src/lib/infect.c              |   4 +-
 compel/include/infect-priv.h                  |   2 +-
 compel/include/rpc-pie-priv.h                 |   2 +-
 compel/include/uapi/infect.h                  |   2 +-
 compel/include/uapi/loglevels.h               |   6 +-
 compel/include/uapi/ptrace.h                  |   2 +-
 compel/src/lib/handle-elf.c                   |   2 +-
 criu/arch/ppc64/restorer.c                    |   6 +-
 criu/arch/ppc64/vdso-pie.c                    |   4 +-
 criu/arch/s390/restorer.c                     |   6 +-
 criu/arch/s390/vdso-pie.c                     |   6 +-
 criu/arch/x86/include/asm/restorer.h          |   2 +-
 criu/arch/x86/sigaction_compat.c              |   4 +-
 criu/cgroup.c                                 |   4 +-
 criu/cr-check.c                               |   2 +-
 criu/cr-dump.c                                |   2 +-
 criu/files-reg.c                              |   4 +-
 criu/files.c                                  |   4 +-
 criu/include/aio.h                            |   4 +-
 criu/include/autofs.h                         |   2 +-
 criu/include/bfd.h                            |   4 +-
 criu/include/file-lock.h                      |   8 +-
 criu/include/files.h                          |   4 +-
 criu/include/image-desc.h                     |   4 +-
 criu/include/inet_diag.h                      |   2 +-
 criu/include/kcmp.h                           |   4 +-
 criu/include/kerndat.h                        |   2 +-
 criu/include/linux/mount.h                    |  14 +-
 criu/include/mount.h                          |  12 +-
 criu/include/namespaces.h                     |   4 +-
 criu/include/page-pipe.h                      |  24 +--
 criu/include/page-xfer.h                      |   2 +-
 criu/include/pagemap-cache.h                  |  12 +-
 criu/include/pstree.h                         |   4 +-
 criu/include/restorer.h                       |   4 +-
 criu/include/rst_info.h                       |   2 +-
 criu/include/servicefd.h                      |   6 +-
 criu/include/sk-inet.h                        |   2 +-
 criu/include/sysfs_parse.h                    |   4 +-
 criu/include/vma.h                            |  10 +-
 criu/irmap.c                                  |   4 +-
 criu/mount.c                                  |   2 +-
 criu/net.c                                    |   4 +-
 criu/pagemap.c                                |   6 +-
 criu/shmem.c                                  |   2 +-
 criu/sk-unix.c                                |   4 +-
 criu/uffd.c                                   |   4 +-
 criu/util.c                                   |   4 +-
 include/common/arch/ppc64/asm/bitops.h        |   2 +-
 include/common/arch/x86/asm/bitops.h          |   2 +-
 include/common/asm-generic/bitops.h           |   2 +-
 soccr/soccr.c                                 |  66 ++++----
 soccr/soccr.h                                 |   6 +-
 test/zdtm/static/aio01.c                      |   4 +-
 test/zdtm/static/auto_dev-ioctl.h             |   2 +-
 test/zdtm/static/file_locks00.c               |  18 +-
 test/zdtm/static/ipc_namespace.c              |   8 +-
 test/zdtm/static/netns-dev.c                  | 140 ++++++++--------
 test/zdtm/static/s390x_regs_check.c           |  14 +-
 test/zdtm/static/session01.c                  |  30 ++--
 test/zdtm/static/sigpending.c                 |   2 +-
 test/zdtm/transition/ptrace.c                 |   2 +-
 73 files changed, 374 insertions(+), 374 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 7cfa637eb..bd1ed0da3 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -19,7 +19,7 @@ unsigned __page_shift = 0;
  */
 const char code_syscall[] = {
 	0x01, 0x00, 0x00, 0xd4, /* SVC #0 */
-	0x00, 0x00, 0x20, 0xd4 /* BRK #0 */
+	0x00, 0x00, 0x20, 0xd4	/* BRK #0 */
 };
 
 static const int code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index 6715afdb3..7700f52ca 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -18,7 +18,7 @@
  */
 const char code_syscall[] = {
 	0x00, 0x00, 0x00, 0xef, /* SVC #0  */
-	0xf0, 0x01, 0xf0, 0xe7 /* UDF #32 */
+	0xf0, 0x01, 0xf0, 0xe7	/* UDF #32 */
 };
 
 static const int code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
diff --git a/compel/arch/mips/src/lib/include/ldsodefs.h b/compel/arch/mips/src/lib/include/ldsodefs.h
index 8cfde2496..97e79755d 100644
--- a/compel/arch/mips/src/lib/include/ldsodefs.h
+++ b/compel/arch/mips/src/lib/include/ldsodefs.h
@@ -69,8 +69,8 @@ struct La_mips_64_retval;
 /* An entry in a 64 bit SHT_REL section.  */
 
 typedef struct {
-	Elf32_Word r_sym; /* Symbol index */
-	unsigned char r_ssym; /* Special symbol for 2nd relocation */
+	Elf32_Word r_sym;      /* Symbol index */
+	unsigned char r_ssym;  /* Special symbol for 2nd relocation */
 	unsigned char r_type3; /* 3rd relocation type */
 	unsigned char r_type2; /* 2nd relocation type */
 	unsigned char r_type1; /* 1st relocation type */
@@ -82,14 +82,14 @@ typedef union {
 } _Elf64_Mips_R_Info_union;
 
 typedef struct {
-	Elf64_Addr r_offset; /* Address */
+	Elf64_Addr r_offset;		 /* Address */
 	_Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */
 } Elf64_Mips_Rel;
 
 typedef struct {
-	Elf64_Addr r_offset; /* Address */
+	Elf64_Addr r_offset;		 /* Address */
 	_Elf64_Mips_R_Info_union r_info; /* Relocation type and symbol index */
-	Elf64_Sxword r_addend; /* Addend */
+	Elf64_Sxword r_addend;		 /* Addend */
 } Elf64_Mips_Rela;
 
 #define ELF64_MIPS_R_SYM(i) ((__extension__(_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym)
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
index 82ae6096b..6db1ddbd3 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/siginfo.h
@@ -52,14 +52,14 @@ typedef struct siginfo {
 
 		/* kill() */
 		struct {
-			__kernel_pid_t _pid; /* sender's pid */
+			__kernel_pid_t _pid;  /* sender's pid */
 			__ARCH_SI_UID_T _uid; /* sender's uid */
 		} _kill;
 
 		/* POSIX.1b timers */
 		struct {
 			__kernel_timer_t _tid; /* timer id */
-			int _overrun; /* overrun count */
+			int _overrun;	       /* overrun count */
 			char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
 			sigval_t _sigval; /* same as below */
 			int _sys_private; /* not to be passed to user */
@@ -67,16 +67,16 @@ typedef struct siginfo {
 
 		/* POSIX.1b signals */
 		struct {
-			__kernel_pid_t _pid; /* sender's pid */
+			__kernel_pid_t _pid;  /* sender's pid */
 			__ARCH_SI_UID_T _uid; /* sender's uid */
 			sigval_t _sigval;
 		} _rt;
 
 		/* SIGCHLD */
 		struct {
-			__kernel_pid_t _pid; /* which child */
+			__kernel_pid_t _pid;  /* which child */
 			__ARCH_SI_UID_T _uid; /* sender's uid */
-			int _status; /* exit code */
+			int _status;	      /* exit code */
 			__ARCH_SI_CLOCK_T _utime;
 			__ARCH_SI_CLOCK_T _stime;
 		} _sigchld;
@@ -104,8 +104,8 @@ typedef struct siginfo {
 
 		/* SIGSYS */
 		struct {
-			void *_call_addr; /* calling user insn */
-			int _syscall; /* triggering system call number */
+			void *_call_addr;   /* calling user insn */
+			int _syscall;	    /* triggering system call number */
 			unsigned int _arch; /* AUDIT_ARCH_* of syscall */
 		} _sigsys;
 	} _sifields;
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index 68d0a2728..afa0f5ed5 100644
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -24,7 +24,7 @@
  */
 const char code_syscall[] = {
 	0x0c, 0x00, 0x00, 0x00, /* syscall    */
-	0x0d, 0x00, 0x00, 0x00 /*  break      */
+	0x0d, 0x00, 0x00, 0x00	/*  break      */
 };
 
 /* 10-byte legacy floating point register */
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
index fe6192e20..8cf8a135f 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
@@ -21,13 +21,13 @@ typedef struct {
 	unsigned long xer;
 	unsigned long ccr;
 	unsigned long softe; /* Soft enabled/disabled */
-	unsigned long trap; /* Reason for being here */
+	unsigned long trap;  /* Reason for being here */
 	/*
 	 * N.B. for critical exceptions on 4xx, the dar and dsisr
 	 * fields are overloaded to hold srr0 and srr1.
 	 */
-	unsigned long dar; /* Fault registers */
-	unsigned long dsisr; /* on 4xx/Book-E used for ESR */
+	unsigned long dar;    /* Fault registers */
+	unsigned long dsisr;  /* on 4xx/Book-E used for ESR */
 	unsigned long result; /* Result of a system call */
 } user_regs_struct_t;
 
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index fc174d0dd..61cd6e985 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -30,7 +30,7 @@ unsigned __page_shift = 0;
  */
 const uint32_t code_syscall[] = {
 	0x44000002, /* sc 		*/
-	0x0fe00000 /* twi 31,0,0	*/
+	0x0fe00000  /* twi 31,0,0	*/
 };
 
 static inline __always_unused void __check_code_syscall(void)
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 77ace713a..3cd25e71d 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -624,8 +624,8 @@ enum kernel_ts_level {
 };
 
 /* See arch/s390/include/asm/processor.h */
-#define TASK_SIZE_LEVEL_3 0x40000000000UL /* 4 TB */
-#define TASK_SIZE_LEVEL_4 0x20000000000000UL /* 8 PB */
+#define TASK_SIZE_LEVEL_3 0x40000000000UL      /* 4 TB */
+#define TASK_SIZE_LEVEL_4 0x20000000000000UL   /* 8 PB */
 #define TASK_SIZE_LEVEL_5 0xffffffffffffefffUL /* 16 EB - 0x1000 */
 
 /*
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall32.c b/compel/arch/x86/plugins/std/syscalls/syscall32.c
index 0f2fec3ff..d09fd38c7 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall32.c
+++ b/compel/arch/x86/plugins/std/syscalls/syscall32.c
@@ -1,9 +1,9 @@
 #include "asm/types.h"
 #include "syscall-32.h"
 
-#define SYS_SOCKET     1 /* sys_socket(2)		*/
-#define SYS_BIND       2 /* sys_bind(2)			*/
-#define SYS_CONNECT    3 /* sys_connect(2)		*/
+#define SYS_SOCKET     1  /* sys_socket(2)		*/
+#define SYS_BIND       2  /* sys_bind(2)			*/
+#define SYS_CONNECT    3  /* sys_connect(2)		*/
 #define SYS_SENDTO     11 /* sys_sendto(2)		*/
 #define SYS_RECVFROM   12 /* sys_recvfrom(2)		*/
 #define SYS_SHUTDOWN   13 /* sys_shutdown(2)		*/
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/cpu.h b/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
index 8d54516af..63ff83dbe 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
@@ -43,16 +43,16 @@ enum cpuid_leafs {
 #define NCAPINTS_BITS (NCAPINTS * 32)
 
 /* Intel-defined CPU features, CPUID level 0x00000001 (EDX), word 0 */
-#define X86_FEATURE_FPU	      (0 * 32 + 0) /* Onboard FPU */
-#define X86_FEATURE_VME	      (0 * 32 + 1) /* Virtual Mode Extensions */
-#define X86_FEATURE_DE	      (0 * 32 + 2) /* Debugging Extensions */
-#define X86_FEATURE_PSE	      (0 * 32 + 3) /* Page Size Extensions */
-#define X86_FEATURE_TSC	      (0 * 32 + 4) /* Time Stamp Counter */
-#define X86_FEATURE_MSR	      (0 * 32 + 5) /* Model-Specific Registers */
-#define X86_FEATURE_PAE	      (0 * 32 + 6) /* Physical Address Extensions */
-#define X86_FEATURE_MCE	      (0 * 32 + 7) /* Machine Check Exception */
-#define X86_FEATURE_CX8	      (0 * 32 + 8) /* CMPXCHG8 instruction */
-#define X86_FEATURE_APIC      (0 * 32 + 9) /* Onboard APIC */
+#define X86_FEATURE_FPU	      (0 * 32 + 0)  /* Onboard FPU */
+#define X86_FEATURE_VME	      (0 * 32 + 1)  /* Virtual Mode Extensions */
+#define X86_FEATURE_DE	      (0 * 32 + 2)  /* Debugging Extensions */
+#define X86_FEATURE_PSE	      (0 * 32 + 3)  /* Page Size Extensions */
+#define X86_FEATURE_TSC	      (0 * 32 + 4)  /* Time Stamp Counter */
+#define X86_FEATURE_MSR	      (0 * 32 + 5)  /* Model-Specific Registers */
+#define X86_FEATURE_PAE	      (0 * 32 + 6)  /* Physical Address Extensions */
+#define X86_FEATURE_MCE	      (0 * 32 + 7)  /* Machine Check Exception */
+#define X86_FEATURE_CX8	      (0 * 32 + 8)  /* CMPXCHG8 instruction */
+#define X86_FEATURE_APIC      (0 * 32 + 9)  /* Onboard APIC */
 #define X86_FEATURE_SEP	      (0 * 32 + 11) /* SYSENTER/SYSEXIT */
 #define X86_FEATURE_MTRR      (0 * 32 + 12) /* Memory Type Range Registers */
 #define X86_FEATURE_PGE	      (0 * 32 + 13) /* Page Global Enable */
@@ -100,12 +100,12 @@ enum cpuid_leafs {
 #define X86_FEATURE_CENTAUR_MCR (3 * 32 + 3) /* Centaur MCRs (= MTRRs) */
 
 /* CPU types for specific tunings: */
-#define X86_FEATURE_K8		   (3 * 32 + 4) /* "" Opteron, Athlon64 */
-#define X86_FEATURE_K7		   (3 * 32 + 5) /* "" Athlon */
-#define X86_FEATURE_P3		   (3 * 32 + 6) /* "" P3 */
-#define X86_FEATURE_P4		   (3 * 32 + 7) /* "" P4 */
-#define X86_FEATURE_CONSTANT_TSC   (3 * 32 + 8) /* TSC ticks at a constant rate */
-#define X86_FEATURE_UP		   (3 * 32 + 9) /* SMP kernel running on UP */
+#define X86_FEATURE_K8		   (3 * 32 + 4)	 /* "" Opteron, Athlon64 */
+#define X86_FEATURE_K7		   (3 * 32 + 5)	 /* "" Athlon */
+#define X86_FEATURE_P3		   (3 * 32 + 6)	 /* "" P3 */
+#define X86_FEATURE_P4		   (3 * 32 + 7)	 /* "" P4 */
+#define X86_FEATURE_CONSTANT_TSC   (3 * 32 + 8)	 /* TSC ticks at a constant rate */
+#define X86_FEATURE_UP		   (3 * 32 + 9)	 /* SMP kernel running on UP */
 #define X86_FEATURE_ART		   (3 * 32 + 10) /* Always running timer (ART) */
 #define X86_FEATURE_ARCH_PERFMON   (3 * 32 + 11) /* Intel Architectural PerfMon */
 #define X86_FEATURE_PEBS	   (3 * 32 + 12) /* Precise-Event Based Sampling */
@@ -129,16 +129,16 @@ enum cpuid_leafs {
 #define X86_FEATURE_TSC_KNOWN_FREQ (3 * 32 + 31) /* TSC has known frequency */
 
 /* Intel-defined CPU features, CPUID level 0x00000001 (ECX), word 4 */
-#define X86_FEATURE_XMM3	       (4 * 32 + 0) /* "pni" SSE-3 */
-#define X86_FEATURE_PCLMULQDQ	       (4 * 32 + 1) /* PCLMULQDQ instruction */
-#define X86_FEATURE_DTES64	       (4 * 32 + 2) /* 64-bit Debug Store */
-#define X86_FEATURE_MWAIT	       (4 * 32 + 3) /* "monitor" MONITOR/MWAIT support */
-#define X86_FEATURE_DSCPL	       (4 * 32 + 4) /* "ds_cpl" CPL-qualified (filtered) Debug Store */
-#define X86_FEATURE_VMX		       (4 * 32 + 5) /* Hardware virtualization */
-#define X86_FEATURE_SMX		       (4 * 32 + 6) /* Safer Mode eXtensions */
-#define X86_FEATURE_EST		       (4 * 32 + 7) /* Enhanced SpeedStep */
-#define X86_FEATURE_TM2		       (4 * 32 + 8) /* Thermal Monitor 2 */
-#define X86_FEATURE_SSSE3	       (4 * 32 + 9) /* Supplemental SSE-3 */
+#define X86_FEATURE_XMM3	       (4 * 32 + 0)  /* "pni" SSE-3 */
+#define X86_FEATURE_PCLMULQDQ	       (4 * 32 + 1)  /* PCLMULQDQ instruction */
+#define X86_FEATURE_DTES64	       (4 * 32 + 2)  /* 64-bit Debug Store */
+#define X86_FEATURE_MWAIT	       (4 * 32 + 3)  /* "monitor" MONITOR/MWAIT support */
+#define X86_FEATURE_DSCPL	       (4 * 32 + 4)  /* "ds_cpl" CPL-qualified (filtered) Debug Store */
+#define X86_FEATURE_VMX		       (4 * 32 + 5)  /* Hardware virtualization */
+#define X86_FEATURE_SMX		       (4 * 32 + 6)  /* Safer Mode eXtensions */
+#define X86_FEATURE_EST		       (4 * 32 + 7)  /* Enhanced SpeedStep */
+#define X86_FEATURE_TM2		       (4 * 32 + 8)  /* Thermal Monitor 2 */
+#define X86_FEATURE_SSSE3	       (4 * 32 + 9)  /* Supplemental SSE-3 */
 #define X86_FEATURE_CID		       (4 * 32 + 10) /* Context ID */
 #define X86_FEATURE_SDBG	       (4 * 32 + 11) /* Silicon Debug */
 #define X86_FEATURE_FMA		       (4 * 32 + 12) /* Fused multiply-add */
@@ -162,28 +162,28 @@ enum cpuid_leafs {
 #define X86_FEATURE_HYPERVISOR	       (4 * 32 + 31) /* Running on a hypervisor */
 
 /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */
-#define X86_FEATURE_XSTORE    (5 * 32 + 2) /* "rng" RNG present (xstore) */
-#define X86_FEATURE_XSTORE_EN (5 * 32 + 3) /* "rng_en" RNG enabled */
-#define X86_FEATURE_XCRYPT    (5 * 32 + 6) /* "ace" on-CPU crypto (xcrypt) */
-#define X86_FEATURE_XCRYPT_EN (5 * 32 + 7) /* "ace_en" on-CPU crypto enabled */
-#define X86_FEATURE_ACE2      (5 * 32 + 8) /* Advanced Cryptography Engine v2 */
-#define X86_FEATURE_ACE2_EN   (5 * 32 + 9) /* ACE v2 enabled */
+#define X86_FEATURE_XSTORE    (5 * 32 + 2)  /* "rng" RNG present (xstore) */
+#define X86_FEATURE_XSTORE_EN (5 * 32 + 3)  /* "rng_en" RNG enabled */
+#define X86_FEATURE_XCRYPT    (5 * 32 + 6)  /* "ace" on-CPU crypto (xcrypt) */
+#define X86_FEATURE_XCRYPT_EN (5 * 32 + 7)  /* "ace_en" on-CPU crypto enabled */
+#define X86_FEATURE_ACE2      (5 * 32 + 8)  /* Advanced Cryptography Engine v2 */
+#define X86_FEATURE_ACE2_EN   (5 * 32 + 9)  /* ACE v2 enabled */
 #define X86_FEATURE_PHE	      (5 * 32 + 10) /* PadLock Hash Engine */
 #define X86_FEATURE_PHE_EN    (5 * 32 + 11) /* PHE enabled */
 #define X86_FEATURE_PMM	      (5 * 32 + 12) /* PadLock Montgomery Multiplier */
 #define X86_FEATURE_PMM_EN    (5 * 32 + 13) /* PMM enabled */
 
 /* More extended AMD flags: CPUID level 0x80000001, ECX, word 6 */
-#define X86_FEATURE_LAHF_LM	  (6 * 32 + 0) /* LAHF/SAHF in long mode */
-#define X86_FEATURE_CMP_LEGACY	  (6 * 32 + 1) /* If yes HyperThreading not valid */
-#define X86_FEATURE_SVM		  (6 * 32 + 2) /* Secure Virtual Machine */
-#define X86_FEATURE_EXTAPIC	  (6 * 32 + 3) /* Extended APIC space */
-#define X86_FEATURE_CR8_LEGACY	  (6 * 32 + 4) /* CR8 in 32-bit mode */
-#define X86_FEATURE_ABM		  (6 * 32 + 5) /* Advanced bit manipulation */
-#define X86_FEATURE_SSE4A	  (6 * 32 + 6) /* SSE-4A */
-#define X86_FEATURE_MISALIGNSSE	  (6 * 32 + 7) /* Misaligned SSE mode */
-#define X86_FEATURE_3DNOWPREFETCH (6 * 32 + 8) /* 3DNow prefetch instructions */
-#define X86_FEATURE_OSVW	  (6 * 32 + 9) /* OS Visible Workaround */
+#define X86_FEATURE_LAHF_LM	  (6 * 32 + 0)	/* LAHF/SAHF in long mode */
+#define X86_FEATURE_CMP_LEGACY	  (6 * 32 + 1)	/* If yes HyperThreading not valid */
+#define X86_FEATURE_SVM		  (6 * 32 + 2)	/* Secure Virtual Machine */
+#define X86_FEATURE_EXTAPIC	  (6 * 32 + 3)	/* Extended APIC space */
+#define X86_FEATURE_CR8_LEGACY	  (6 * 32 + 4)	/* CR8 in 32-bit mode */
+#define X86_FEATURE_ABM		  (6 * 32 + 5)	/* Advanced bit manipulation */
+#define X86_FEATURE_SSE4A	  (6 * 32 + 6)	/* SSE-4A */
+#define X86_FEATURE_MISALIGNSSE	  (6 * 32 + 7)	/* Misaligned SSE mode */
+#define X86_FEATURE_3DNOWPREFETCH (6 * 32 + 8)	/* 3DNow prefetch instructions */
+#define X86_FEATURE_OSVW	  (6 * 32 + 9)	/* OS Visible Workaround */
 #define X86_FEATURE_IBS		  (6 * 32 + 10) /* Instruction Based Sampling */
 #define X86_FEATURE_XOP		  (6 * 32 + 11) /* extended AVX instructions */
 #define X86_FEATURE_SKINIT	  (6 * 32 + 12) /* SKINIT/STGI instructions */
@@ -202,14 +202,14 @@ enum cpuid_leafs {
 #define X86_FEATURE_MWAITX	  (6 * 32 + 29) /* MWAIT extension (MONITORX/MWAITX instructions) */
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */
-#define X86_FEATURE_FSGSBASE   (9 * 32 + 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
-#define X86_FEATURE_TSC_ADJUST (9 * 32 + 1) /* TSC adjustment MSR 0x3B */
-#define X86_FEATURE_BMI1       (9 * 32 + 3) /* 1st group bit manipulation extensions */
-#define X86_FEATURE_HLE	       (9 * 32 + 4) /* Hardware Lock Elision */
-#define X86_FEATURE_AVX2       (9 * 32 + 5) /* AVX2 instructions */
-#define X86_FEATURE_SMEP       (9 * 32 + 7) /* Supervisor Mode Execution Protection */
-#define X86_FEATURE_BMI2       (9 * 32 + 8) /* 2nd group bit manipulation extensions */
-#define X86_FEATURE_ERMS       (9 * 32 + 9) /* Enhanced REP MOVSB/STOSB instructions */
+#define X86_FEATURE_FSGSBASE   (9 * 32 + 0)  /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
+#define X86_FEATURE_TSC_ADJUST (9 * 32 + 1)  /* TSC adjustment MSR 0x3B */
+#define X86_FEATURE_BMI1       (9 * 32 + 3)  /* 1st group bit manipulation extensions */
+#define X86_FEATURE_HLE	       (9 * 32 + 4)  /* Hardware Lock Elision */
+#define X86_FEATURE_AVX2       (9 * 32 + 5)  /* AVX2 instructions */
+#define X86_FEATURE_SMEP       (9 * 32 + 7)  /* Supervisor Mode Execution Protection */
+#define X86_FEATURE_BMI2       (9 * 32 + 8)  /* 2nd group bit manipulation extensions */
+#define X86_FEATURE_ERMS       (9 * 32 + 9)  /* Enhanced REP MOVSB/STOSB instructions */
 #define X86_FEATURE_INVPCID    (9 * 32 + 10) /* Invalidate Processor Context ID */
 #define X86_FEATURE_RTM	       (9 * 32 + 11) /* Restricted Transactional Memory */
 #define X86_FEATURE_CQM	       (9 * 32 + 12) /* Cache QoS Monitoring */
@@ -238,14 +238,14 @@ enum cpuid_leafs {
 #define X86_FEATURE_XSAVES   (10 * 32 + 3) /* XSAVES/XRSTORS instructions */
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ECX), word 11 */
-#define X86_FEATURE_PREFETCHWT1	     (11 * 32 + 0) /* PREFETCHWT1 Intel® Xeon PhiTM only */
-#define X86_FEATURE_AVX512VBMI	     (11 * 32 + 1) /* AVX512 Vector Bit Manipulation instructions*/
-#define X86_FEATURE_UMIP	     (11 * 32 + 2) /* User Mode Instruction Protection */
-#define X86_FEATURE_PKU		     (11 * 32 + 3) /* Protection Keys for Userspace */
-#define X86_FEATURE_OSPKE	     (11 * 32 + 4) /* OS Protection Keys Enable */
-#define X86_FEATURE_AVX512_VBMI2     (11 * 32 + 6) /* Additional AVX512 Vector Bit Manipulation Instructions */
-#define X86_FEATURE_GFNI	     (11 * 32 + 8) /* Galois Field New Instructions */
-#define X86_FEATURE_VAES	     (11 * 32 + 9) /* Vector AES */
+#define X86_FEATURE_PREFETCHWT1	     (11 * 32 + 0)  /* PREFETCHWT1 Intel® Xeon PhiTM only */
+#define X86_FEATURE_AVX512VBMI	     (11 * 32 + 1)  /* AVX512 Vector Bit Manipulation instructions*/
+#define X86_FEATURE_UMIP	     (11 * 32 + 2)  /* User Mode Instruction Protection */
+#define X86_FEATURE_PKU		     (11 * 32 + 3)  /* Protection Keys for Userspace */
+#define X86_FEATURE_OSPKE	     (11 * 32 + 4)  /* OS Protection Keys Enable */
+#define X86_FEATURE_AVX512_VBMI2     (11 * 32 + 6)  /* Additional AVX512 Vector Bit Manipulation Instructions */
+#define X86_FEATURE_GFNI	     (11 * 32 + 8)  /* Galois Field New Instructions */
+#define X86_FEATURE_VAES	     (11 * 32 + 9)  /* Vector AES */
 #define X86_FEATURE_VPCLMULQDQ	     (11 * 32 + 10) /* Carry-Less Multiplication Double Quadword */
 #define X86_FEATURE_AVX512_VNNI	     (11 * 32 + 11) /* Vector Neural Network Instructions */
 #define X86_FEATURE_AVX512_BITALG    (11 * 32 + 12) /* Support for VPOPCNT[B,W] and VPSHUF-BITQMB instructions */
@@ -261,35 +261,35 @@ enum cpuid_leafs {
 #define X86_FEATURE_CQM_MBM_LOCAL (12 * 32 + 2) /* LLC Local MBM monitoring */
 
 /* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */
-#define X86_FEATURE_CLZERO     (13 * 32 + 0) /* CLZERO instruction */
-#define X86_FEATURE_IRPERF     (13 * 32 + 1) /* Instructions Retired Count */
-#define X86_FEATURE_XSAVEERPTR (13 * 32 + 2) /* Always save/restore FP error pointers */
+#define X86_FEATURE_CLZERO     (13 * 32 + 0)  /* CLZERO instruction */
+#define X86_FEATURE_IRPERF     (13 * 32 + 1)  /* Instructions Retired Count */
+#define X86_FEATURE_XSAVEERPTR (13 * 32 + 2)  /* Always save/restore FP error pointers */
 #define X86_FEATURE_IBPB       (13 * 32 + 12) /* Indirect Branch Prediction Barrier */
 #define X86_FEATURE_IBRS       (13 * 32 + 14) /* Indirect Branch Restricted Speculation */
 #define X86_FEATURE_STIBP      (13 * 32 + 15) /* Single Thread Indirect Branch Predictors */
 
 /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */
-#define X86_FEATURE_DTHERM	   (14 * 32 + 0) /* Digital Thermal Sensor */
-#define X86_FEATURE_IDA		   (14 * 32 + 1) /* Intel Dynamic Acceleration */
-#define X86_FEATURE_ARAT	   (14 * 32 + 2) /* Always Running APIC Timer */
-#define X86_FEATURE_PLN		   (14 * 32 + 4) /* Intel Power Limit Notification */
-#define X86_FEATURE_PTS		   (14 * 32 + 6) /* Intel Package Thermal Status */
-#define X86_FEATURE_HWP		   (14 * 32 + 7) /* Intel Hardware P-states */
-#define X86_FEATURE_HWP_NOTIFY	   (14 * 32 + 8) /* HWP Notification */
-#define X86_FEATURE_HWP_ACT_WINDOW (14 * 32 + 9) /* HWP Activity Window */
+#define X86_FEATURE_DTHERM	   (14 * 32 + 0)  /* Digital Thermal Sensor */
+#define X86_FEATURE_IDA		   (14 * 32 + 1)  /* Intel Dynamic Acceleration */
+#define X86_FEATURE_ARAT	   (14 * 32 + 2)  /* Always Running APIC Timer */
+#define X86_FEATURE_PLN		   (14 * 32 + 4)  /* Intel Power Limit Notification */
+#define X86_FEATURE_PTS		   (14 * 32 + 6)  /* Intel Package Thermal Status */
+#define X86_FEATURE_HWP		   (14 * 32 + 7)  /* Intel Hardware P-states */
+#define X86_FEATURE_HWP_NOTIFY	   (14 * 32 + 8)  /* HWP Notification */
+#define X86_FEATURE_HWP_ACT_WINDOW (14 * 32 + 9)  /* HWP Activity Window */
 #define X86_FEATURE_HWP_EPP	   (14 * 32 + 10) /* HWP Energy Perf. Preference */
 #define X86_FEATURE_HWP_PKG_REQ	   (14 * 32 + 11) /* HWP Package Level Request */
 #define X86_FEATURE_HDC		   (14 * 32 + 13) /* HDC base registers present */
 
 /* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 */
-#define X86_FEATURE_NPT		    (15 * 32 + 0) /* Nested Page Table support */
-#define X86_FEATURE_LBRV	    (15 * 32 + 1) /* LBR Virtualization support */
-#define X86_FEATURE_SVML	    (15 * 32 + 2) /* "svm_lock" SVM locking MSR */
-#define X86_FEATURE_NRIPS	    (15 * 32 + 3) /* "nrip_save" SVM next_rip save */
-#define X86_FEATURE_TSCRATEMSR	    (15 * 32 + 4) /* "tsc_scale" TSC scaling support */
-#define X86_FEATURE_VMCBCLEAN	    (15 * 32 + 5) /* "vmcb_clean" VMCB clean bits support */
-#define X86_FEATURE_FLUSHBYASID	    (15 * 32 + 6) /* flush-by-ASID support */
-#define X86_FEATURE_DECODEASSISTS   (15 * 32 + 7) /* Decode Assists support */
+#define X86_FEATURE_NPT		    (15 * 32 + 0)  /* Nested Page Table support */
+#define X86_FEATURE_LBRV	    (15 * 32 + 1)  /* LBR Virtualization support */
+#define X86_FEATURE_SVML	    (15 * 32 + 2)  /* "svm_lock" SVM locking MSR */
+#define X86_FEATURE_NRIPS	    (15 * 32 + 3)  /* "nrip_save" SVM next_rip save */
+#define X86_FEATURE_TSCRATEMSR	    (15 * 32 + 4)  /* "tsc_scale" TSC scaling support */
+#define X86_FEATURE_VMCBCLEAN	    (15 * 32 + 5)  /* "vmcb_clean" VMCB clean bits support */
+#define X86_FEATURE_FLUSHBYASID	    (15 * 32 + 6)  /* flush-by-ASID support */
+#define X86_FEATURE_DECODEASSISTS   (15 * 32 + 7)  /* Decode Assists support */
 #define X86_FEATURE_PAUSEFILTER	    (15 * 32 + 10) /* filtered pause intercept */
 #define X86_FEATURE_PFTHRESHOLD	    (15 * 32 + 12) /* pause filter threshold */
 #define X86_FEATURE_AVIC	    (15 * 32 + 13) /* Virtual Interrupt Controller */
@@ -305,8 +305,8 @@ enum cpuid_leafs {
 #define X86_FEATURE_SMCA	   (17 * 32 + 3) /* Scalable MCA */
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */
-#define X86_FEATURE_AVX512_4VNNIW     (18 * 32 + 2) /* AVX-512 Neural Network Instructions */
-#define X86_FEATURE_AVX512_4FMAPS     (18 * 32 + 3) /* AVX-512 Multiply Accumulation Single precision */
+#define X86_FEATURE_AVX512_4VNNIW     (18 * 32 + 2)  /* AVX-512 Neural Network Instructions */
+#define X86_FEATURE_AVX512_4FMAPS     (18 * 32 + 3)  /* AVX-512 Multiply Accumulation Single precision */
 #define X86_FEATURE_PCONFIG	      (18 * 32 + 18) /* Intel PCONFIG */
 #define X86_FEATURE_SPEC_CTRL	      (18 * 32 + 26) /* "" Speculation Control (IBRS + IBPB) */
 #define X86_FEATURE_INTEL_STIBP	      (18 * 32 + 27) /* "" Single Thread Indirect Branch Predictors */
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index d740e3c04..a16b658af 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -105,7 +105,7 @@ struct i387_fxsave_struct {
 			uint32_t fos; /* FPU Operand Selector		*/
 		};
 	};
-	uint32_t mxcsr; /* MXCSR Register State */
+	uint32_t mxcsr;	     /* MXCSR Register State */
 	uint32_t mxcsr_mask; /* MXCSR Mask		*/
 
 	/* 8*16 bytes for each FP-reg = 128 bytes				*/
@@ -277,13 +277,13 @@ typedef struct {
 } fpu_state_64_t;
 
 struct user_i387_ia32_struct {
-	uint32_t cwd; /* FPU Control Word		*/
-	uint32_t swd; /* FPU Status Word		*/
-	uint32_t twd; /* FPU Tag Word			*/
-	uint32_t fip; /* FPU IP Offset		*/
-	uint32_t fcs; /* FPU IP Selector		*/
-	uint32_t foo; /* FPU Operand Pointer Offset	*/
-	uint32_t fos; /* FPU Operand Pointer Selector	*/
+	uint32_t cwd;	       /* FPU Control Word		*/
+	uint32_t swd;	       /* FPU Status Word		*/
+	uint32_t twd;	       /* FPU Tag Word			*/
+	uint32_t fip;	       /* FPU IP Offset		*/
+	uint32_t fcs;	       /* FPU IP Selector		*/
+	uint32_t foo;	       /* FPU Operand Pointer Offset	*/
+	uint32_t fos;	       /* FPU Operand Pointer Selector	*/
 	uint32_t st_space[20]; /* 8*10 bytes for each FP-reg = 80 bytes */
 };
 
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 1e344bf3a..2f6c557d0 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -34,12 +34,12 @@
  * Injected syscall instruction
  */
 const char code_syscall[] = {
-	0x0f, 0x05, /* syscall    */
+	0x0f, 0x05,			   /* syscall    */
 	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc /* int 3, ... */
 };
 
 const char code_int_80[] = {
-	0xcd, 0x80, /* int $0x80  */
+	0xcd, 0x80,			   /* int $0x80  */
 	0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc /* int 3, ... */
 };
 
diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index 1c03f4486..9d3442839 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -38,7 +38,7 @@ struct parasite_ctl {
 	unsigned long parasite_ip; /* service routine start ip */
 
 	unsigned int *cmd; /* address for command */
-	void *args; /* address for arguments */
+	void *args;	   /* address for arguments */
 	unsigned long args_size;
 	int tsock; /* transport socket for transferring fds */
 
diff --git a/compel/include/rpc-pie-priv.h b/compel/include/rpc-pie-priv.h
index 2a239c613..5a6b337b2 100644
--- a/compel/include/rpc-pie-priv.h
+++ b/compel/include/rpc-pie-priv.h
@@ -3,7 +3,7 @@
 struct ctl_msg {
 	uint32_t cmd; /* command itself */
 	uint32_t ack; /* ack on command */
-	int32_t err; /* error code on reply */
+	int32_t err;  /* error code on reply */
 };
 
 #define ctl_msg_cmd(_cmd)    \
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index c3d2ee6a6..7fa0bd8a0 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -106,7 +106,7 @@ struct infect_ctx {
 
 	unsigned long task_size;
 	unsigned long syscall_ip; /* entry point of infection */
-	unsigned long flags; /* fine-tune (e.g. faults) */
+	unsigned long flags;	  /* fine-tune (e.g. faults) */
 
 	void (*child_handler)(int, siginfo_t *, void *); /* hander for SIGCHLD deaths */
 	struct sigaction orig_handler;
diff --git a/compel/include/uapi/loglevels.h b/compel/include/uapi/loglevels.h
index e76c15657..7a49825d2 100644
--- a/compel/include/uapi/loglevels.h
+++ b/compel/include/uapi/loglevels.h
@@ -7,10 +7,10 @@
  */
 
 enum __compel_log_levels {
-	COMPEL_LOG_MSG, /* Print message regardless of log level */
+	COMPEL_LOG_MSG,	  /* Print message regardless of log level */
 	COMPEL_LOG_ERROR, /* Errors only, when we're in trouble */
-	COMPEL_LOG_WARN, /* Warnings */
-	COMPEL_LOG_INFO, /* Informative, everything is fine */
+	COMPEL_LOG_WARN,  /* Warnings */
+	COMPEL_LOG_INFO,  /* Informative, everything is fine */
 	COMPEL_LOG_DEBUG, /* Debug only */
 
 	COMPEL_DEFAULT_LOGLEVEL = COMPEL_LOG_WARN
diff --git a/compel/include/uapi/ptrace.h b/compel/include/uapi/ptrace.h
index c5291d20d..533e0569f 100644
--- a/compel/include/uapi/ptrace.h
+++ b/compel/include/uapi/ptrace.h
@@ -62,7 +62,7 @@
  */
 typedef struct {
 	uint64_t filter_off; /* Input: which filter */
-	uint64_t flags; /* Output: filter's flags */
+	uint64_t flags;	     /* Output: filter's flags */
 } seccomp_metadata_t;
 
 #ifdef PTRACE_EVENT_STOP
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 9662751e0..22c8f2978 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -554,7 +554,7 @@ int __handle_elf(void *mem, size_t size)
 #endif /* ELF_PPC64 */
 
 #ifdef ELF_X86_64
-			case R_X86_64_32: /* Symbol + Addend (4 bytes) */
+			case R_X86_64_32:  /* Symbol + Addend (4 bytes) */
 			case R_X86_64_32S: /* Symbol + Addend (4 bytes) */
 				pr_debug("\t\t\t\tR_X86_64_32       at 0x%-4lx val 0x%x\n", place, value32);
 				pr_out("	{ .offset = 0x%-8x, .type = COMPEL_TYPE_INT,  "
diff --git a/criu/arch/ppc64/restorer.c b/criu/arch/ppc64/restorer.c
index c17ba1669..56c09391e 100644
--- a/criu/arch/ppc64/restorer.c
+++ b/criu/arch/ppc64/restorer.c
@@ -45,10 +45,10 @@ unsigned long sys_shmat(int shmid, const void *shmaddr, int shmflg)
 	unsigned long raddr;
 	int ret;
 
-	ret = sys_ipc(21 /*SHMAT */, shmid, /* first 		*/
-		      shmflg, /* second 		*/
+	ret = sys_ipc(21 /*SHMAT */, shmid,  /* first 		*/
+		      shmflg,		     /* second 		*/
 		      (unsigned long)&raddr, /* third 		*/
-		      shmaddr, /* ptr			*/
+		      shmaddr,		     /* ptr			*/
 		      0 /* fifth not used 	*/);
 
 	if (ret)
diff --git a/criu/arch/ppc64/vdso-pie.c b/criu/arch/ppc64/vdso-pie.c
index f01123efe..a84ae776b 100644
--- a/criu/arch/ppc64/vdso-pie.c
+++ b/criu/arch/ppc64/vdso-pie.c
@@ -110,9 +110,9 @@ static inline void put_trampoline_call(unsigned long at, unsigned long to, unsig
 {
 	uint32_t *addr = (uint32_t *)at;
 
-	*addr++ = 0x7C0802a6; /* mflr	r0 */
+	*addr++ = 0x7C0802a6;					  /* mflr	r0 */
 	*addr++ = 0x48000001 | ((long)(tr - at - 4) & 0x3fffffc); /* bl tr */
-	*(uint64_t *)addr = to; /* the address to read by the trampoline */
+	*(uint64_t *)addr = to;					  /* the address to read by the trampoline */
 
 	invalidate_caches(at);
 }
diff --git a/criu/arch/s390/restorer.c b/criu/arch/s390/restorer.c
index 6907ad75b..8b3bc44ba 100644
--- a/criu/arch/s390/restorer.c
+++ b/criu/arch/s390/restorer.c
@@ -23,10 +23,10 @@ unsigned long sys_shmat(int shmid, const void *shmaddr, int shmflg)
 	unsigned long raddr;
 	int ret;
 
-	ret = sys_ipc(21 /*SHMAT */, shmid, /* first		*/
-		      shmflg, /* second		*/
+	ret = sys_ipc(21 /*SHMAT */, shmid,  /* first		*/
+		      shmflg,		     /* second		*/
 		      (unsigned long)&raddr, /* third		*/
-		      shmaddr, /* ptr			*/
+		      shmaddr,		     /* ptr			*/
 		      0 /* fifth not used	*/);
 
 	if (ret)
diff --git a/criu/arch/s390/vdso-pie.c b/criu/arch/s390/vdso-pie.c
index ad504beda..bf0366b0e 100644
--- a/criu/arch/s390/vdso-pie.c
+++ b/criu/arch/s390/vdso-pie.c
@@ -18,9 +18,9 @@
  */
 typedef struct {
 	u8 larl[6]; /* Load relative address of imm64 */
-	u8 lg[6]; /* Load %r1 with imm64 */
-	u8 br[2]; /* Branch to %r1 */
-	u64 addr; /* Jump address */
+	u8 lg[6];   /* Load %r1 with imm64 */
+	u8 br[2];   /* Branch to %r1 */
+	u64 addr;   /* Jump address */
 	u32 guards; /* Guard bytes */
 } __packed jmp_t;
 
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 23438314f..f7a6d5058 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -13,7 +13,7 @@
 extern void restore_tls(tls_t *ptls);
 extern int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act);
 extern int set_compat_robust_list(uint32_t head_ptr, uint32_t len);
-#else /* CONFIG_COMPAT */
+#else  /* CONFIG_COMPAT */
 static inline void restore_tls(tls_t *ptls)
 {
 }
diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c
index f02b2cc0e..506a8d1bb 100644
--- a/criu/arch/x86/sigaction_compat.c
+++ b/criu/arch/x86/sigaction_compat.c
@@ -44,8 +44,8 @@ int arch_compat_rt_sigaction(void *stack32, int sig, rt_sigaction_t_compat *act)
 	memcpy(stack32, act, sizeof(rt_sigaction_t_compat));
 	arg.nr = __NR32_rt_sigaction;
 	arg.arg0 = sig;
-	arg.arg1 = (uint32_t)act_stack; /* act */
-	arg.arg2 = 0; /* oldact */
+	arg.arg1 = (uint32_t)act_stack;		      /* act */
+	arg.arg2 = 0;				      /* oldact */
 	arg.arg3 = (uint32_t)sizeof(act->rt_sa_mask); /* sigsetsize */
 
 	return do_full_int80(&arg);
diff --git a/criu/cgroup.c b/criu/cgroup.c
index ccac37fcc..82d9b16a2 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -81,7 +81,7 @@ static bool cg_set_compare(struct cg_set *set, struct list_head *ctls, int what)
 		if (l2->next != ctls)
 			c2 = list_first_entry(l2, struct cg_ctl, l);
 
-		if (!c1 || !c2) /* Nowhere to move next */
+		if (!c1 || !c2)		   /* Nowhere to move next */
 			return !c1 && !c2; /* Both lists scanned -- match */
 
 		if (strcmp(c1->name, c2->name))
@@ -860,7 +860,7 @@ static int dump_cg_dirs(struct list_head *dirs, size_t n_dirs, CgroupDirEntry **
 		cde->dir_perms->gid = cur->gid;
 
 		cde->dir_name = cur->path + poff;
-		if (poff != 1) /* parent isn't "/" */
+		if (poff != 1)		 /* parent isn't "/" */
 			cde->dir_name++; /* leading / */
 		cde->n_children = cur->n_children;
 		if (cur->n_children > 0)
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 3e268c439..e46c93815 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1631,7 +1631,7 @@ void pr_check_features(const char *offset, const char *sep, int width)
 		}
 		pr_msg("%s", fl->name); // no \n
 		pos += len;
-		if ((fl + 1)->name) { // not the last item
+		if ((fl + 1)->name) {	   // not the last item
 			pr_msg("%s", sep); // no \n
 			pos += sep_len;
 		}
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 940f62246..ecc99f116 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -615,7 +615,7 @@ static int dump_task_kobj_ids(struct pstree_item *item)
 	TaskKobjIdsEntry *ids = item->ids;
 
 	elem.pid = pid;
-	elem.idx = 0; /* really 0 for all */
+	elem.idx = 0;	/* really 0 for all */
 	elem.genid = 0; /* FIXME optimize */
 
 	new = 0;
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 2b0347575..679477c1c 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2236,8 +2236,8 @@ static struct filemap_ctx ctx;
 void filemap_ctx_init(bool auto_close)
 {
 	ctx.desc = NULL; /* to fail the first comparison in open_ */
-	ctx.fd = -1; /* not to close random fd in _fini */
-	ctx.vma = NULL; /* not to put spurious VMA_CLOSE in _fini */
+	ctx.fd = -1;	 /* not to close random fd in _fini */
+	ctx.vma = NULL;	 /* not to put spurious VMA_CLOSE in _fini */
 	/* flags may remain any */
 	ctx.close = auto_close;
 }
diff --git a/criu/files.c b/criu/files.c
index 93754fb44..69ebc2e82 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -506,7 +506,7 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 	}
 
 	p.fd_ctl = ctl; /* Some dump_opts require this to talk to parasite */
-	p.dfds = dfds; /* epoll needs to verify if target fd exist */
+	p.dfds = dfds;	/* epoll needs to verify if target fd exist */
 
 	if (S_ISSOCK(p.stat.st_mode))
 		return dump_socket(&p, lfd, e);
@@ -1486,7 +1486,7 @@ int shared_fdt_prepare(struct pstree_item *item)
 struct inherit_fd {
 	struct list_head inh_list;
 	char *inh_id; /* file identifier */
-	int inh_fd; /* criu's descriptor to inherit */
+	int inh_fd;   /* criu's descriptor to inherit */
 	int inh_fd_id;
 };
 
diff --git a/criu/include/aio.h b/criu/include/aio.h
index f8a59dfdf..d1655739d 100644
--- a/criu/include/aio.h
+++ b/criu/include/aio.h
@@ -13,8 +13,8 @@ struct task_restore_args;
 int prepare_aios(struct pstree_item *t, struct task_restore_args *ta);
 
 struct aio_ring {
-	unsigned id; /* kernel internal index number */
-	unsigned nr; /* number of io_events */
+	unsigned id;   /* kernel internal index number */
+	unsigned nr;   /* number of io_events */
 	unsigned head; /* Written to by userland or under ring_lock
 				 * mutex by aio_read_events_ring(). */
 	unsigned tail;
diff --git a/criu/include/autofs.h b/criu/include/autofs.h
index c4e0f23ed..b158025c7 100644
--- a/criu/include/autofs.h
+++ b/criu/include/autofs.h
@@ -96,7 +96,7 @@ struct args_ismountpoint {
 struct autofs_dev_ioctl {
 	__u32 ver_major;
 	__u32 ver_minor;
-	__u32 size; /* total size of data passed in
+	__u32 size;    /* total size of data passed in
 				 * including this struct */
 	__s32 ioctlfd; /* automount command fd */
 
diff --git a/criu/include/bfd.h b/criu/include/bfd.h
index 4268f74d4..2846ec628 100644
--- a/criu/include/bfd.h
+++ b/criu/include/bfd.h
@@ -5,8 +5,8 @@
 
 struct bfd_buf;
 struct xbuf {
-	char *mem; /* buffer */
-	char *data; /* position we see bytes at */
+	char *mem;	 /* buffer */
+	char *data;	 /* position we see bytes at */
 	unsigned int sz; /* bytes sitting after b->pos */
 	struct bfd_buf *buf;
 };
diff --git a/criu/include/file-lock.h b/criu/include/file-lock.h
index 0ce2fa340..9ab79b66b 100644
--- a/criu/include/file-lock.h
+++ b/criu/include/file-lock.h
@@ -30,12 +30,12 @@
 #define LOCK_SH 1 /* shared lock */
 #define LOCK_EX 2 /* exclusive lock */
 #define LOCK_NB \
-	4 /* or'd with one of the above to prevent
+	4	  /* or'd with one of the above to prevent
 				   blocking */
 #define LOCK_UN 8 /* remove lock */
 
-#define LOCK_MAND  32 /* This is a mandatory flock ... */
-#define LOCK_READ  64 /* which allows concurrent read operations */
+#define LOCK_MAND  32  /* This is a mandatory flock ... */
+#define LOCK_READ  64  /* which allows concurrent read operations */
 #define LOCK_WRITE 128 /* which allows concurrent write operations */
 #define LOCK_RW	   192 /* which allows concurrent read & write ops */
 
@@ -47,7 +47,7 @@ struct file_lock {
 	int fl_kind;
 	int fl_ltype;
 
-	pid_t fl_owner; /* process, which created the lock */
+	pid_t fl_owner;	 /* process, which created the lock */
 	pid_t fl_holder; /* pid of fd on whose the lock is found */
 	int maj, min;
 	unsigned long i_no;
diff --git a/criu/include/files.h b/criu/include/files.h
index 26ce1f42a..aadc09f73 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -82,8 +82,8 @@ enum {
 
 struct fdinfo_list_entry {
 	struct list_head desc_list; /* To chain on  @fd_info_head */
-	struct file_desc *desc; /* Associated file descriptor */
-	struct list_head ps_list; /* To chain  per-task files */
+	struct file_desc *desc;	    /* Associated file descriptor */
+	struct list_head ps_list;   /* To chain  per-task files */
 	struct pstree_item *task;
 	FdinfoEntry *fe;
 	int pid;
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 5045baee8..9f369be64 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -122,8 +122,8 @@ enum {
 /* file descriptors template */
 struct cr_fd_desc_tmpl {
 	const char *fmt; /* format for the name */
-	u32 magic; /* magic in the header */
-	int oflags; /* flags for image_open */
+	u32 magic;	 /* magic in the header */
+	int oflags;	 /* flags for image_open */
 };
 
 extern struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX];
diff --git a/criu/include/inet_diag.h b/criu/include/inet_diag.h
index ea6f5e14e..4996dd556 100644
--- a/criu/include/inet_diag.h
+++ b/criu/include/inet_diag.h
@@ -31,7 +31,7 @@ struct inet_diag_req_compat {
 	struct inet_diag_sockid id;
 
 	__u32 idiag_states; /* States to dump */
-	__u32 idiag_dbs; /* Tables to dump (NI) */
+	__u32 idiag_dbs;    /* Tables to dump (NI) */
 };
 
 struct inet_diag_req_v2 {
diff --git a/criu/include/kcmp.h b/criu/include/kcmp.h
index a6774be47..575135f80 100644
--- a/criu/include/kcmp.h
+++ b/criu/include/kcmp.h
@@ -18,8 +18,8 @@ enum kcmp_type {
 
 /* Slot for KCMP_EPOLL_TFD */
 typedef struct {
-	uint32_t efd; /* epoll file descriptor */
-	uint32_t tfd; /* target file number */
+	uint32_t efd;  /* epoll file descriptor */
+	uint32_t tfd;  /* target file number */
 	uint32_t toff; /* target offset within same numbered sequence */
 } kcmp_epoll_slot_t;
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 2ded7d1da..a28a95802 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -18,7 +18,7 @@ extern int kerndat_init(void);
 
 enum pagemap_func {
 	PM_UNKNOWN,
-	PM_DISABLED, /* /proc/pid/pagemap doesn't open (user mode) */
+	PM_DISABLED,   /* /proc/pid/pagemap doesn't open (user mode) */
 	PM_FLAGS_ONLY, /* pagemap zeroes pfn part (user mode) */
 	PM_FULL,
 };
diff --git a/criu/include/linux/mount.h b/criu/include/linux/mount.h
index 840d6277e..9a3a28b10 100644
--- a/criu/include/linux/mount.h
+++ b/criu/include/linux/mount.h
@@ -8,13 +8,13 @@
 #include <linux/mount.h>
 #else
 enum fsconfig_command {
-	FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
-	FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
-	FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
-	FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
-	FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
-	FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
-	FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
+	FSCONFIG_SET_FLAG = 0,	      /* Set parameter, supplying no value */
+	FSCONFIG_SET_STRING = 1,      /* Set parameter, supplying a string value */
+	FSCONFIG_SET_BINARY = 2,      /* Set parameter, supplying a binary blob value */
+	FSCONFIG_SET_PATH = 3,	      /* Set parameter, supplying an object by path */
+	FSCONFIG_SET_PATH_EMPTY = 4,  /* Set parameter, supplying an object by (empty) path */
+	FSCONFIG_SET_FD = 5,	      /* Set parameter, supplying an object by fd */
+	FSCONFIG_CMD_CREATE = 6,      /* Invoke superblock creation */
 	FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
 };
 #endif
diff --git a/criu/include/mount.h b/criu/include/mount.h
index 29d80c2a7..833a75ca0 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -72,13 +72,13 @@ struct mount_info {
 	struct list_head children;
 	struct list_head siblings;
 
-	struct list_head mnt_bind; /* circular list of derivatives of one real mount */
-	struct list_head mnt_share; /* circular list of shared mounts */
+	struct list_head mnt_bind;	 /* circular list of derivatives of one real mount */
+	struct list_head mnt_share;	 /* circular list of shared mounts */
 	struct list_head mnt_slave_list; /* list of slave mounts */
-	struct list_head mnt_slave; /* slave list entry */
-	struct mount_info *mnt_master; /* slave is on master->mnt_slave_list */
-	struct list_head mnt_propagate; /* circular list of mounts which propagate from each other */
-	struct list_head mnt_notprop; /* temporary list used in can_mount_now */
+	struct list_head mnt_slave;	 /* slave list entry */
+	struct mount_info *mnt_master;	 /* slave is on master->mnt_slave_list */
+	struct list_head mnt_propagate;	 /* circular list of mounts which propagate from each other */
+	struct list_head mnt_notprop;	 /* temporary list used in can_mount_now */
 	struct list_head mnt_unbindable; /* list of mounts with delayed unbindable */
 
 	struct list_head postpone;
diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index 034605917..e2ea6e17f 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -128,9 +128,9 @@ struct ns_id {
 			 */
 			union {
 				int nsfd_id; /* a namespace descriptor id in fdstore */
-				int ns_fd; /* a namespace file descriptor */
+				int ns_fd;   /* a namespace file descriptor */
 			};
-			int nlsk; /* for sockets collection */
+			int nlsk;  /* for sockets collection */
 			int seqsk; /* to talk to parasite daemons */
 			struct list_head ids;
 			struct list_head links;
diff --git a/criu/include/page-pipe.h b/criu/include/page-pipe.h
index 0917869d9..15178c015 100644
--- a/criu/include/page-pipe.h
+++ b/criu/include/page-pipe.h
@@ -90,14 +90,14 @@ struct kernel_pipe_buffer {
  */
 
 struct page_pipe_buf {
-	int p[2]; /* pipe with pages */
+	int p[2];		/* pipe with pages */
 	unsigned int pipe_size; /* how many pages can be fit into pipe */
-	unsigned int pipe_off; /* where this buf is started in a pipe */
-	unsigned int pages_in; /* how many pages are there */
-	unsigned int nr_segs; /* how many iov-s are busy */
+	unsigned int pipe_off;	/* where this buf is started in a pipe */
+	unsigned int pages_in;	/* how many pages are there */
+	unsigned int nr_segs;	/* how many iov-s are busy */
 #define PPB_LAZY (1 << 0)
 	unsigned int flags;
-	struct iovec *iov; /* vaddr:len map */
+	struct iovec *iov;  /* vaddr:len map */
 	struct list_head l; /* links into page_pipe->bufs */
 };
 
@@ -113,19 +113,19 @@ struct page_pipe_buf {
 #define PP_HOLE_PARENT (1 << 0)
 
 struct page_pipe {
-	unsigned int nr_pipes; /* how many page_pipe_bufs in there */
-	struct list_head bufs; /* list of bufs */
-	struct list_head free_bufs; /* list of bufs */
+	unsigned int nr_pipes;			   /* how many page_pipe_bufs in there */
+	struct list_head bufs;			   /* list of bufs */
+	struct list_head free_bufs;		   /* list of bufs */
 	struct page_pipe_buf *prev[PP_PIPE_TYPES]; /* last ppb of each type for pipe sharing */
-	unsigned int nr_iovs; /* number of iovs */
-	unsigned int free_iov; /* first free iov */
+	unsigned int nr_iovs;			   /* number of iovs */
+	unsigned int free_iov;			   /* first free iov */
 
 	struct iovec *iovs; /* iovs. They are provided into create_page_pipe
 							   and all bufs have their iov-s in there */
 
-	unsigned int nr_holes; /* number of holes allocated */
+	unsigned int nr_holes;	/* number of holes allocated */
 	unsigned int free_hole; /* number of holes in use */
-	struct iovec *holes; /* holes */
+	struct iovec *holes;	/* holes */
 	unsigned int *hole_flags;
 	unsigned int flags; /* PP_FOO flags below */
 };
diff --git a/criu/include/page-xfer.h b/criu/include/page-xfer.h
index e0303dfe0..1bcd4ff20 100644
--- a/criu/include/page-xfer.h
+++ b/criu/include/page-xfer.h
@@ -36,7 +36,7 @@ struct page_xfer {
 	union {
 		struct /* local */ {
 			struct cr_img *pmi; /* pagemaps */
-			struct cr_img *pi; /* pages */
+			struct cr_img *pi;  /* pages */
 		};
 
 		struct /* page-server */ {
diff --git a/criu/include/pagemap-cache.h b/criu/include/pagemap-cache.h
index 7612ee0f4..1d8bbffaf 100644
--- a/criu/include/pagemap-cache.h
+++ b/criu/include/pagemap-cache.h
@@ -11,13 +11,13 @@ struct vma_area;
 #define PAGEMAP_PFN_OFF(addr) (PAGE_PFN(addr) * sizeof(u64))
 
 typedef struct {
-	pid_t pid; /* which process it belongs */
-	unsigned long start; /* start of area */
-	unsigned long end; /* end of area */
+	pid_t pid;			  /* which process it belongs */
+	unsigned long start;		  /* start of area */
+	unsigned long end;		  /* end of area */
 	const struct list_head *vma_head; /* list head of VMAs we're serving */
-	u64 *map; /* local buffer */
-	size_t map_len; /* length of a buffer */
-	int fd; /* file to read PMs from */
+	u64 *map;			  /* local buffer */
+	size_t map_len;			  /* length of a buffer */
+	int fd;				  /* file to read PMs from */
 } pmc_t;
 
 #define PMC_INIT \
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index c5b0fa7ea..c1c79867b 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -15,14 +15,14 @@
 struct pstree_item {
 	struct pstree_item *parent;
 	struct list_head children; /* list of my children */
-	struct list_head sibling; /* linkage in my parent's children list */
+	struct list_head sibling;  /* linkage in my parent's children list */
 
 	struct pid *pid;
 	pid_t pgid;
 	pid_t sid;
 	pid_t born_sid;
 
-	int nr_threads; /* number of threads */
+	int nr_threads;	     /* number of threads */
 	struct pid *threads; /* array of threads */
 	CoreEntry **core;
 	TaskKobjIdsEntry *ids;
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 934d60cf9..308a0b79b 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -138,7 +138,7 @@ struct task_restore_args {
 	bool has_thp_enabled;
 
 	/* threads restoration */
-	int nr_threads; /* number of threads */
+	int nr_threads;				 /* number of threads */
 	thread_restore_fcall_t clone_restore_fn; /* helper address for clone() call */
 	struct thread_restore_args *thread_args; /* array of thread arguments */
 	struct task_entries *task_entries;
@@ -211,7 +211,7 @@ struct task_restore_args {
 	bool can_map_vdso;
 	bool auto_dedup;
 	unsigned long vdso_rt_size;
-	struct vdso_maps vdso_maps_rt; /* runtime vdso symbols */
+	struct vdso_maps vdso_maps_rt;	 /* runtime vdso symbols */
 	unsigned long vdso_rt_parked_at; /* safe place to keep vdso */
 	void **breakpoint;
 
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 2e2107b0e..9664e0a1c 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -17,7 +17,7 @@ struct task_entries {
 };
 
 struct fdt {
-	int nr; /* How many tasks share this fd table */
+	int nr;	   /* How many tasks share this fd table */
 	pid_t pid; /* Who should restore this fd table */
 	/*
 	 * The fd table is ready for restoing, if fdt_lock is equal to nr
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index e75e8444c..c6979de7f 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -22,10 +22,10 @@ enum sfd_type {
 				 *  - For dump -- target ns' proc
 				 *  - For restore -- CRIU ns' proc
 				 */
-	ROOT_FD_OFF, /* Root of the namespace we dump/restore */
+	ROOT_FD_OFF,	/* Root of the namespace we dump/restore */
 	CGROUP_YARD,
-	USERNSD_SK, /* Socket for usernsd */
-	NS_FD_OFF, /* Node's net namespace fd */
+	USERNSD_SK,	  /* Socket for usernsd */
+	NS_FD_OFF,	  /* Node's net namespace fd */
 	TRANSPORT_FD_OFF, /* to transfer file descriptors */
 	RPC_SK_OFF,
 	FDSTORE_SK_OFF,
diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index c832d6387..5dd2a6551 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -35,7 +35,7 @@ struct inet_sk_desc {
 	unsigned int dst_port;
 	unsigned int state;
 	unsigned int rqlen;
-	unsigned int wqlen; /* sent + unsent data */
+	unsigned int wqlen;  /* sent + unsent data */
 	unsigned int uwqlen; /* unsent data */
 	unsigned int src_addr[4];
 	unsigned int dst_addr[4];
diff --git a/criu/include/sysfs_parse.h b/criu/include/sysfs_parse.h
index ff0e61148..f987d622f 100644
--- a/criu/include/sysfs_parse.h
+++ b/criu/include/sysfs_parse.h
@@ -2,9 +2,9 @@
 #define __CR_SYSFS_PARSE_H__
 
 #define SYSFS_AUFS	"/sys/fs/aufs/"
-#define SBINFO_LEN	(3 + 16 + 1) /* si_%lx */
+#define SBINFO_LEN	(3 + 16 + 1)			 /* si_%lx */
 #define SBINFO_PATH_LEN (sizeof SYSFS_AUFS + SBINFO_LEN) /* /sys/fs/aufs/<sbinfo> */
-#define AUFSBR_PATH_LEN (SBINFO_PATH_LEN + 6 + 1) /* /sys/fs/aufs/<sbinfo>/br%3d */
+#define AUFSBR_PATH_LEN (SBINFO_PATH_LEN + 6 + 1)	 /* /sys/fs/aufs/<sbinfo>/br%3d */
 
 struct mount_info;
 struct vma_area;
diff --git a/criu/include/vma.h b/criu/include/vma.h
index ed9f31ef6..541d6d6fd 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -10,14 +10,14 @@
 #include <string.h>
 
 struct vm_area_list {
-	struct list_head h; /* list of VMAs */
-	unsigned nr; /* nr of all VMAs in the list */
+	struct list_head h;   /* list of VMAs */
+	unsigned nr;	      /* nr of all VMAs in the list */
 	unsigned int nr_aios; /* nr of AIOs VMAs in the list */
 	union {
 		unsigned long nr_priv_pages; /* dmp: nr of pages in private VMAs */
 		unsigned long rst_priv_size; /* rst: size of private VMAs */
 	};
-	unsigned long nr_priv_pages_longest; /* nr of pages in longest private VMA */
+	unsigned long nr_priv_pages_longest;   /* nr of pages in longest private VMA */
 	unsigned long nr_shared_pages_longest; /* nr of pages in longest shared VMA */
 };
 
@@ -53,8 +53,8 @@ struct vma_area {
 		struct /* for restore */ {
 			int (*vm_open)(int pid, struct vma_area *vma);
 			struct file_desc *vmfd;
-			struct vma_area *pvma; /* parent for inherited VMAs */
-			unsigned long *page_bitmap; /* existent pages */
+			struct vma_area *pvma;	      /* parent for inherited VMAs */
+			unsigned long *page_bitmap;   /* existent pages */
 			unsigned long premmaped_addr; /* restore only */
 
 			/*
diff --git a/criu/irmap.c b/criu/irmap.c
index 09570c593..7b9d77bc1 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -160,8 +160,8 @@ static int irmap_update_dir(struct irmap *t)
 
 		k = &t->kids[nr - 1];
 
-		k->kids = NULL; /* for xrealloc above */
-		k->ino = 0; /* for irmap_update_stat */
+		k->kids = NULL;	 /* for xrealloc above */
+		k->ino = 0;	 /* for irmap_update_stat */
 		k->nr_kids = -1; /* for irmap_update_dir */
 		k->path = xsprintf("%s/%s", t->path, de->d_name);
 		if (!k->path)
diff --git a/criu/mount.c b/criu/mount.c
index ec31f02c2..93725e526 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2561,7 +2561,7 @@ static LIST_HEAD(mnt_remap_list);
 static int remap_id;
 
 struct mnt_remap_entry {
-	struct mount_info *mi; /* child is remaped into the root yards */
+	struct mount_info *mi;	   /* child is remaped into the root yards */
 	struct mount_info *parent; /* the origin parent for the child*/
 	struct list_head node;
 };
diff --git a/criu/net.c b/criu/net.c
index 02115c4de..50655559d 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1172,7 +1172,7 @@ struct newlink_req {
  * request.
  */
 struct newlink_extras {
-	int link; /* IFLA_LINK */
+	int link;	  /* IFLA_LINK */
 	int target_netns; /* IFLA_NET_NS_FD */
 };
 
@@ -1744,7 +1744,7 @@ static int __restore_link(struct ns_id *ns, struct net_link *link, int nlsk)
 
 	switch (nde->type) {
 	case ND_TYPE__LOOPBACK: /* fallthrough */
-	case ND_TYPE__EXTLINK: /* see comment in images/netdev.proto */
+	case ND_TYPE__EXTLINK:	/* see comment in images/netdev.proto */
 		return restore_link_parms(link, nlsk);
 	case ND_TYPE__VENET:
 		return restore_one_link(ns, link, nlsk, venet_link_info, NULL);
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 77e519dd1..d996db7fc 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -30,10 +30,10 @@
  * One "job" for the preadv() syscall in pagemap.c
  */
 struct page_read_iov {
-	off_t from; /* offset in pi file where to start reading from */
-	off_t end; /* the end of the read == sum to.iov_len -s */
+	off_t from;	  /* offset in pi file where to start reading from */
+	off_t end;	  /* the end of the read == sum to.iov_len -s */
 	struct iovec *to; /* destination iovs */
-	unsigned int nr; /* their number */
+	unsigned int nr;  /* their number */
 
 	struct list_head l;
 };
diff --git a/criu/shmem.c b/criu/shmem.c
index bb48e436b..a9ee8d7eb 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -81,7 +81,7 @@ struct shmem_info {
 			 * an region. Each time when we	found a process with a smaller pid,
 			 * we reset self_count, so we can't have only one counter.
 			 */
-			int count; /* the number of regions */
+			int count;	/* the number of regions */
 			int self_count; /* the number of regions, which belongs to "pid" */
 		};
 
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index f3fe60c6e..a819473b4 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -958,9 +958,9 @@ struct unix_sk_info {
 	struct unix_sk_info *peer;
 	struct pprep_head peer_resolve; /* XXX : union with the above? */
 	struct file_desc d;
-	struct hlist_node hash; /* To lookup socket by ino */
+	struct hlist_node hash;	    /* To lookup socket by ino */
 	struct list_head connected; /* List of sockets, connected to me */
-	struct list_head node; /* To link in peer's connected list  */
+	struct list_head node;	    /* To link in peer's connected list  */
 	struct list_head scm_fles;
 	struct list_head ghost_node;
 	size_t ghost_dir_pos;
diff --git a/criu/uffd.c b/criu/uffd.c
index 18bdc040f..f01e6999b 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -71,8 +71,8 @@ static mutex_t *lazy_sock_mutex;
 
 struct lazy_iov {
 	struct list_head l;
-	unsigned long start; /* run-time start address, tracks remaps */
-	unsigned long end; /* run-time end address, tracks remaps */
+	unsigned long start;	 /* run-time start address, tracks remaps */
+	unsigned long end;	 /* run-time end address, tracks remaps */
 	unsigned long img_start; /* start address at the dump time */
 };
 
diff --git a/criu/util.c b/criu/util.c
index 414879971..2917102fd 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1669,8 +1669,8 @@ __attribute__((returns_twice)) static pid_t raw_legacy_clone(unsigned long flags
 		     */
 			"addx %%g0, 0, %%g1"
 			: "=r"(g1), "=r"(o0), "=r"(o1), "=r"(o2) /* outputs */
-			: "r"(g1), "r"(o0), "r"(o1), "r"(o2) /* inputs */
-			: "%cc"); /* clobbers */
+			: "r"(g1), "r"(o0), "r"(o1), "r"(o2)	 /* inputs */
+			: "%cc");				 /* clobbers */
 
 		is_error = g1;
 		retval = o0;
diff --git a/include/common/arch/ppc64/asm/bitops.h b/include/common/arch/ppc64/asm/bitops.h
index 704668263..dbfa6be7f 100644
--- a/include/common/arch/ppc64/asm/bitops.h
+++ b/include/common/arch/ppc64/asm/bitops.h
@@ -196,7 +196,7 @@ static inline unsigned long find_next_bit(const unsigned long *addr, unsigned lo
 
 found_first:
 	tmp &= (~0UL >> (BITS_PER_LONG - size));
-	if (tmp == 0UL) /* Are any bits set? */
+	if (tmp == 0UL)		      /* Are any bits set? */
 		return result + size; /* Nope. */
 found_middle:
 	return result + __ffs(tmp);
diff --git a/include/common/arch/x86/asm/bitops.h b/include/common/arch/x86/asm/bitops.h
index d7a60589b..c13c1eb45 100644
--- a/include/common/arch/x86/asm/bitops.h
+++ b/include/common/arch/x86/asm/bitops.h
@@ -113,7 +113,7 @@ static inline unsigned long find_next_bit(const unsigned long *addr, unsigned lo
 
 found_first:
 	tmp &= (~0UL >> (BITS_PER_LONG - size));
-	if (tmp == 0UL) /* Are any bits set? */
+	if (tmp == 0UL)		      /* Are any bits set? */
 		return result + size; /* Nope. */
 found_middle:
 	return result + __ffs(tmp);
diff --git a/include/common/asm-generic/bitops.h b/include/common/asm-generic/bitops.h
index 064ba4cc4..004da4c4e 100644
--- a/include/common/asm-generic/bitops.h
+++ b/include/common/asm-generic/bitops.h
@@ -97,7 +97,7 @@ static inline unsigned long find_next_bit(const unsigned long *addr, unsigned lo
 
 found_first:
 	tmp &= (~0UL >> (BITS_PER_LONG - size));
-	if (tmp == 0UL) /* Are any bits set? */
+	if (tmp == 0UL)		      /* Are any bits set? */
 		return result + size; /* Nope. */
 found_middle:
 	return result + __ffs(tmp);
diff --git a/soccr/soccr.c b/soccr/soccr.c
index f6fb1946b..8be2d28e1 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -609,8 +609,8 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsig
 		libnet_type = LIBNET_RAW4;
 
 	l = libnet_init(libnet_type, /* injection type */
-			NULL, /* network interface */
-			errbuf); /* errbuf */
+			NULL,	     /* network interface */
+			errbuf);     /* errbuf */
 	if (l == NULL) {
 		loge("libnet_init failed (%s)\n", errbuf);
 		return -1;
@@ -623,17 +623,17 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsig
 
 	ret = libnet_build_tcp(ntohs(sk->dst_addr->v4.sin_port), /* source port */
 			       ntohs(sk->src_addr->v4.sin_port), /* destination port */
-			       data->inq_seq, /* sequence number */
-			       data->outq_seq - data->outq_len, /* acknowledgement num */
-			       flags, /* control flags */
-			       data->rcv_wnd, /* window size */
-			       0, /* checksum */
-			       10, /* urgent pointer */
-			       LIBNET_TCP_H + 20, /* TCP packet size */
-			       NULL, /* payload */
-			       0, /* payload size */
-			       l, /* libnet handle */
-			       0); /* libnet id */
+			       data->inq_seq,			 /* sequence number */
+			       data->outq_seq - data->outq_len,	 /* acknowledgement num */
+			       flags,				 /* control flags */
+			       data->rcv_wnd,			 /* window size */
+			       0,				 /* checksum */
+			       10,				 /* urgent pointer */
+			       LIBNET_TCP_H + 20,		 /* TCP packet size */
+			       NULL,				 /* payload */
+			       0,				 /* payload size */
+			       l,				 /* libnet handle */
+			       0);				 /* libnet id */
 	if (ret == -1) {
 		loge("Can't build TCP header: %s\n", libnet_geterror(l));
 		goto err;
@@ -646,28 +646,28 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsig
 		memcpy(&src, &sk->src_addr->v6.sin6_addr, sizeof(src));
 
 		ret = libnet_build_ipv6(0, 0, LIBNET_TCP_H, /* length */
-					IPPROTO_TCP, /* protocol */
-					64, /* hop limit */
-					dst, /* source IP */
-					src, /* destination IP */
-					NULL, /* payload */
-					0, /* payload size */
-					l, /* libnet handle */
-					0); /* libnet id */
+					IPPROTO_TCP,	    /* protocol */
+					64,		    /* hop limit */
+					dst,		    /* source IP */
+					src,		    /* destination IP */
+					NULL,		    /* payload */
+					0,		    /* payload size */
+					l,		    /* libnet handle */
+					0);		    /* libnet id */
 	} else if (family == AF_INET)
 		ret = libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H + 20, /* length */
-					0, /* TOS */
-					242, /* IP ID */
-					0, /* IP Frag */
-					64, /* TTL */
-					IPPROTO_TCP, /* protocol */
-					0, /* checksum */
-					dst_v4, /* source IP */
-					src_v4, /* destination IP */
-					NULL, /* payload */
-					0, /* payload size */
-					l, /* libnet handle */
-					0); /* libnet id */
+					0,				   /* TOS */
+					242,				   /* IP ID */
+					0,				   /* IP Frag */
+					64,				   /* TTL */
+					IPPROTO_TCP,			   /* protocol */
+					0,				   /* checksum */
+					dst_v4,				   /* source IP */
+					src_v4,				   /* destination IP */
+					NULL,				   /* payload */
+					0,				   /* payload size */
+					l,				   /* libnet handle */
+					0);				   /* libnet id */
 	else {
 		loge("Unknown socket family\n");
 		goto err;
diff --git a/soccr/soccr.h b/soccr/soccr.h
index 934d43827..e7091e591 100644
--- a/soccr/soccr.h
+++ b/soccr/soccr.h
@@ -1,9 +1,9 @@
 #ifndef __LIBSOCCR_H__
 #define __LIBSOCCR_H__
-#include <netinet/in.h> /* sockaddr_in, sockaddr_in6 */
+#include <netinet/in.h>	 /* sockaddr_in, sockaddr_in6 */
 #include <netinet/tcp.h> /* TCP_REPAIR_WINDOW, TCP_TIMESTAMP */
-#include <stdint.h> /* uint32_t */
-#include <sys/socket.h> /* sockaddr */
+#include <stdint.h>	 /* uint32_t */
+#include <sys/socket.h>	 /* sockaddr */
 
 #include "common/config.h"
 
diff --git a/test/zdtm/static/aio01.c b/test/zdtm/static/aio01.c
index ed45192b9..100069b03 100644
--- a/test/zdtm/static/aio01.c
+++ b/test/zdtm/static/aio01.c
@@ -14,8 +14,8 @@ const char *test_doc = "Check head and tail restore correct";
 const char *test_author = "Kirill Tkhai <ktkhai@virtuozzo.com>";
 
 struct aio_ring {
-	unsigned id; /* kernel internal index number */
-	unsigned nr; /* number of io_events */
+	unsigned id;   /* kernel internal index number */
+	unsigned nr;   /* number of io_events */
 	unsigned head; /* Written to by userland or under ring_lock
 				 * mutex by aio_read_events_ring(). */
 	unsigned tail;
diff --git a/test/zdtm/static/auto_dev-ioctl.h b/test/zdtm/static/auto_dev-ioctl.h
index e65259b30..1b35fe2f7 100644
--- a/test/zdtm/static/auto_dev-ioctl.h
+++ b/test/zdtm/static/auto_dev-ioctl.h
@@ -95,7 +95,7 @@ struct args_ismountpoint {
 struct autofs_dev_ioctl {
 	__u32 ver_major;
 	__u32 ver_minor;
-	__u32 size; /* total size of data passed in
+	__u32 size;    /* total size of data passed in
 				 * including this struct */
 	__s32 ioctlfd; /* automount command fd */
 
diff --git a/test/zdtm/static/file_locks00.c b/test/zdtm/static/file_locks00.c
index 0b5d1313b..01782fa7a 100644
--- a/test/zdtm/static/file_locks00.c
+++ b/test/zdtm/static/file_locks00.c
@@ -23,10 +23,10 @@ static int lock_reg(int fd, int cmd, int type, int whence, off_t offset, off_t l
 {
 	struct flock lock;
 
-	lock.l_type = type; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_type = type;	/* F_RDLCK, F_WRLCK, F_UNLCK */
 	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start = offset; /* byte offset, relative to l_whence */
-	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_start = offset;	/* byte offset, relative to l_whence */
+	lock.l_len = len;	/* #bytes (0 means to EOF) */
 
 	errno = 0;
 	return fcntl(fd, cmd, &lock);
@@ -40,10 +40,10 @@ static int check_read_lock(int fd, int whence, off_t offset, off_t len)
 	struct flock lock;
 	int ret;
 
-	lock.l_type = F_RDLCK; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_type = F_RDLCK;	/* F_RDLCK, F_WRLCK, F_UNLCK */
 	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start = offset; /* byte offset, relative to l_whence */
-	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_start = offset;	/* byte offset, relative to l_whence */
+	lock.l_len = len;	/* #bytes (0 means to EOF) */
 	lock.l_pid = -1;
 
 	errno = 0;
@@ -69,10 +69,10 @@ static int check_write_lock(int fd, int whence, off_t offset, off_t len)
 	int ret;
 	pid_t ppid = getppid();
 
-	lock.l_type = F_WRLCK; /* F_RDLCK, F_WRLCK, F_UNLCK */
+	lock.l_type = F_WRLCK;	/* F_RDLCK, F_WRLCK, F_UNLCK */
 	lock.l_whence = whence; /* SEEK_SET, SEEK_CUR, SEEK_END */
-	lock.l_start = offset; /* byte offset, relative to l_whence */
-	lock.l_len = len; /* #bytes (0 means to EOF) */
+	lock.l_start = offset;	/* byte offset, relative to l_whence */
+	lock.l_len = len;	/* #bytes (0 means to EOF) */
 	lock.l_pid = -1;
 
 	errno = 0;
diff --git a/test/zdtm/static/ipc_namespace.c b/test/zdtm/static/ipc_namespace.c
index 4273951ae..b13b357ba 100644
--- a/test/zdtm/static/ipc_namespace.c
+++ b/test/zdtm/static/ipc_namespace.c
@@ -52,10 +52,10 @@ struct ipc_ns {
 
 	//	unsigned int    mq_queues_count;
 
-	unsigned int mq_queues_max; /* initialized to DFLT_QUEUESMAX */
-	unsigned int mq_msg_max; /* initialized to DFLT_MSGMAX */
-	unsigned int mq_msgsize_max; /* initialized to DFLT_MSGSIZEMAX */
-	unsigned int mq_msg_default; /* initialized to DFLT_MSG */
+	unsigned int mq_queues_max;	 /* initialized to DFLT_QUEUESMAX */
+	unsigned int mq_msg_max;	 /* initialized to DFLT_MSGMAX */
+	unsigned int mq_msgsize_max;	 /* initialized to DFLT_MSGSIZEMAX */
+	unsigned int mq_msg_default;	 /* initialized to DFLT_MSG */
 	unsigned int mq_msgsize_default; /* initialized to DFLT_MSGSIZE */
 
 	struct user_ns *user_ns;
diff --git a/test/zdtm/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index e220daa7f..1e6ee1dea 100644
--- a/test/zdtm/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
@@ -55,36 +55,36 @@ struct range {
 };
 
 struct range rand_range4[] = {
-	{ 0, 1 }, /* accept_local */
-	{ -1, 0 }, /* accept_source_route */
-	{ 0, 1 }, /* arp_accept */
-	{ 0, 2 }, /* arp_announce */
-	{ 0, 1 }, /* arp_filter */
-	{ 0, 8 }, /* arp_ignore */
-	{ 0, 1 }, /* arp_notify */
-	{ 0, 1 }, /* bootp_relay */
-	{ 0, 1 }, /* disable_policy */
-	{ 0, 1 }, /* disable_xfrm */
-	{ 0, 1 }, /* drop_gratuitous_arp */
-	{ 0, 1 }, /* drop_unicast_in_l2_multicast */
-	{ 0, INT_MAX }, /* force_igmp_version */
-	{ 0, 1 }, /* forwarding */
-	{ 0, 1 }, /* accept_redirects */
-	{ 0, INT_MAX }, /* igmpv2_unsolicited_report_interval */
-	{ 0, INT_MAX }, /* igmpv3_unsolicited_report_interval */
-	{ 0, 1 }, /* ignore_routes_with_linkdown */
-	{ 0, 1 }, /* log_martians */
-	{ 0, 1 }, /* mc_forwarding */
-	{ -1, INT_MAX }, /* medium_id */
-	{ 0, 1 }, /* promote_secondaries */
-	{ 0, 1 }, /* proxy_arp */
-	{ 0, 1 }, /* proxy_arp_pvlan */
-	{ 0, 1 }, /* route_localnet */
-	{ 0, 2 }, /* rp_filter */
-	{ 0, 1 }, /* secure_redirects */
-	{ 0, 1 }, /* send_redirects */
-	{ 0, 1 }, /* shared_media */
-	{ 0, 1 }, /* src_valid_mark */
+	{ 0, 1 },	      /* accept_local */
+	{ -1, 0 },	      /* accept_source_route */
+	{ 0, 1 },	      /* arp_accept */
+	{ 0, 2 },	      /* arp_announce */
+	{ 0, 1 },	      /* arp_filter */
+	{ 0, 8 },	      /* arp_ignore */
+	{ 0, 1 },	      /* arp_notify */
+	{ 0, 1 },	      /* bootp_relay */
+	{ 0, 1 },	      /* disable_policy */
+	{ 0, 1 },	      /* disable_xfrm */
+	{ 0, 1 },	      /* drop_gratuitous_arp */
+	{ 0, 1 },	      /* drop_unicast_in_l2_multicast */
+	{ 0, INT_MAX },	      /* force_igmp_version */
+	{ 0, 1 },	      /* forwarding */
+	{ 0, 1 },	      /* accept_redirects */
+	{ 0, INT_MAX },	      /* igmpv2_unsolicited_report_interval */
+	{ 0, INT_MAX },	      /* igmpv3_unsolicited_report_interval */
+	{ 0, 1 },	      /* ignore_routes_with_linkdown */
+	{ 0, 1 },	      /* log_martians */
+	{ 0, 1 },	      /* mc_forwarding */
+	{ -1, INT_MAX },      /* medium_id */
+	{ 0, 1 },	      /* promote_secondaries */
+	{ 0, 1 },	      /* proxy_arp */
+	{ 0, 1 },	      /* proxy_arp_pvlan */
+	{ 0, 1 },	      /* route_localnet */
+	{ 0, 2 },	      /* rp_filter */
+	{ 0, 1 },	      /* secure_redirects */
+	{ 0, 1 },	      /* send_redirects */
+	{ 0, 1 },	      /* shared_media */
+	{ 0, 1 },	      /* src_valid_mark */
 	{ INT_MIN, INT_MAX }, /* tag */
 };
 
@@ -139,47 +139,47 @@ char *devconfs6[] = {
 #define MAX_ADDRESSES 128
 
 struct range rand_range6[] = {
-	{ 0, 2 }, /* accept_dad */
-	{ 0, 2 }, /* accept_ra */
-	{ 0, 1 }, /* accept_ra_defrtr */
-	{ 0, 1 }, /* accept_ra_from_local */
-	{ 0, INT_MAX }, /* accept_ra_min_hop_limit */
-	{ 0, 1 }, /* accept_ra_mtu */
-	{ 0, 1 }, /* accept_ra_pinfo */
-	{ 0, INT_MAX }, /* accept_ra_rt_info_max_plen */
-	{ 0, 1 }, /* accept_ra_rtr_pref */
-	{ -1, 0 }, /* accept_source_route */
-	{ 0, 1 }, /* autoconf */
-	{ 0, INT_MAX }, /* dad_transmits */
-	{ 0, 1 }, /* disable_ipv6 */
-	{ 0, 1 }, /* drop_unicast_in_l2_multicast */
-	{ 0, 1 }, /* drop_unsolicited_na */
-	{ 0, 2 }, /* force_mld_version */
-	{ 0, 1 }, /* force_tllao */
-	{ 0, 1 }, /* forwarding */
-	{ 0, 1 }, /* accept_redirects */
-	{ 1, 255 }, /* hop_limit */
-	{ 0, 1 }, /* ignore_routes_with_linkdown */
-	{ -1, 1 }, /* keep_addr_on_down */
-	{ 0, MAX_ADDRESSES }, /* max_addresses */
-	{ 0, INT_MAX }, /* max_desync_factor */
-	{ 0, INT_MAX }, /* mldv1_unsolicited_report_interval */
-	{ 0, INT_MAX }, /* mldv2_unsolicited_report_interval */
+	{ 0, 2 },			/* accept_dad */
+	{ 0, 2 },			/* accept_ra */
+	{ 0, 1 },			/* accept_ra_defrtr */
+	{ 0, 1 },			/* accept_ra_from_local */
+	{ 0, INT_MAX },			/* accept_ra_min_hop_limit */
+	{ 0, 1 },			/* accept_ra_mtu */
+	{ 0, 1 },			/* accept_ra_pinfo */
+	{ 0, INT_MAX },			/* accept_ra_rt_info_max_plen */
+	{ 0, 1 },			/* accept_ra_rtr_pref */
+	{ -1, 0 },			/* accept_source_route */
+	{ 0, 1 },			/* autoconf */
+	{ 0, INT_MAX },			/* dad_transmits */
+	{ 0, 1 },			/* disable_ipv6 */
+	{ 0, 1 },			/* drop_unicast_in_l2_multicast */
+	{ 0, 1 },			/* drop_unsolicited_na */
+	{ 0, 2 },			/* force_mld_version */
+	{ 0, 1 },			/* force_tllao */
+	{ 0, 1 },			/* forwarding */
+	{ 0, 1 },			/* accept_redirects */
+	{ 1, 255 },			/* hop_limit */
+	{ 0, 1 },			/* ignore_routes_with_linkdown */
+	{ -1, 1 },			/* keep_addr_on_down */
+	{ 0, MAX_ADDRESSES },		/* max_addresses */
+	{ 0, INT_MAX },			/* max_desync_factor */
+	{ 0, INT_MAX },			/* mldv1_unsolicited_report_interval */
+	{ 0, INT_MAX },			/* mldv2_unsolicited_report_interval */
 	{ IPV6_MIN_MTU, IPV6_MIN_MTU }, /* mtu */
-	{ 0, 1 }, /* ndisc_notify */
-	{ 0, 1 }, /* optimistic_dad */
-	{ 0, 1 }, /* proxy_ndp */
-	{ 0, INT_MAX }, /* regen_max_retry */
-	{ 0, ROUTER_MAX }, /* router_probe_interval */
-	{ 0, ROUTER_MAX }, /* router_solicitation_delay */
-	{ 0, ROUTER_MAX }, /* router_solicitation_interval */
-	{ 0, ROUTER_MAX }, /* router_solicitations */
-	{ 0, 1 }, /* suppress_frag_ndisc */
-	{ 0, INT_MAX }, /* temp_prefered_lft */
-	{ 0, INT_MAX }, /* temp_valid_lft */
-	{ 0, 1 }, /* use_oif_addrs_only */
-	{ 0, 1 }, /* use_optimistic */
-	{ 0, 2 }, /* use_tempaddr */
+	{ 0, 1 },			/* ndisc_notify */
+	{ 0, 1 },			/* optimistic_dad */
+	{ 0, 1 },			/* proxy_ndp */
+	{ 0, INT_MAX },			/* regen_max_retry */
+	{ 0, ROUTER_MAX },		/* router_probe_interval */
+	{ 0, ROUTER_MAX },		/* router_solicitation_delay */
+	{ 0, ROUTER_MAX },		/* router_solicitation_interval */
+	{ 0, ROUTER_MAX },		/* router_solicitations */
+	{ 0, 1 },			/* suppress_frag_ndisc */
+	{ 0, INT_MAX },			/* temp_prefered_lft */
+	{ 0, INT_MAX },			/* temp_valid_lft */
+	{ 0, 1 },			/* use_oif_addrs_only */
+	{ 0, 1 },			/* use_optimistic */
+	{ 0, 2 },			/* use_tempaddr */
 };
 
 struct test_conf {
diff --git a/test/zdtm/static/s390x_regs_check.c b/test/zdtm/static/s390x_regs_check.c
index 8d6b47997..40c480b3f 100644
--- a/test/zdtm/static/s390x_regs_check.c
+++ b/test/zdtm/static/s390x_regs_check.c
@@ -59,11 +59,11 @@ static int pipefd[2];
  */
 struct reg_set {
 	const char *name; /* Name of regset */
-	int nr; /* Number of regset */
-	void *data; /* Test data */
-	int len; /* Number of bytes of test data */
-	bool optional; /* Not all kernels/machines have this reg set */
-	bool available; /* Current kernel/machine has this reg set */
+	int nr;		  /* Number of regset */
+	void *data;	  /* Test data */
+	int len;	  /* Number of bytes of test data */
+	bool optional;	  /* Not all kernels/machines have this reg set */
+	bool available;	  /* Current kernel/machine has this reg set */
 };
 
 /*
@@ -397,8 +397,8 @@ static inline void send_tid_and_loop(int fd)
 
 	asm volatile("lgr	2,%0\n" /* Arg 1: fd */
 		     "la	3,%1\n" /* Arg 2: &tid */
-		     "lghi	4,4\n" /* Arg 3: sizeof(int) */
-		     "svc	4\n" /* __NR_write SVC: */
+		     "lghi	4,4\n"	/* Arg 3: sizeof(int) */
+		     "svc	4\n"	/* __NR_write SVC: */
 		     /* After SVC no more registers are changed */
 		     "0:	j 0b\n" /* Loop here */
 		     :
diff --git a/test/zdtm/static/session01.c b/test/zdtm/static/session01.c
index 0f727a9a6..31a617de9 100644
--- a/test/zdtm/static/session01.c
+++ b/test/zdtm/static/session01.c
@@ -40,22 +40,22 @@ enum {
 static struct testcase *testcases;
 static futex_t *fstate;
 static struct testcase __testcases[] = {
-	{ 2, 1, 2, 1, 2, 1 }, /* session00			*/
-	{ 4, 2, 4, 2, 4, 1 }, /*  |\_session00		*/
-	{ 15, 4, 4, 4, 15, 1 }, /*  |  |\_session00		*/
-	{ 16, 4, 4, 4, 15, 1 }, /*  |   \_session00		*/
-	{ 17, 4, 4, 4, 17, 0 }, /*  |  |\_session00		*/
-	{ 18, 4, 4, 4, 17, 1 }, /*  |   \_session00		*/
-	{ 5, 2, 2, 2, 2, 1 }, /*  |\_session00		*/
-	{ 8, 2, 8, 2, 8, 1 }, /*  |\_session00		*/
-	{ 9, 8, 2, 2, 2, 1 }, /*  |   \_session00		*/
-	{ 10, 2, 10, 2, 10, 1 }, /*  |\_session00		*/
+	{ 2, 1, 2, 1, 2, 1 },	  /* session00			*/
+	{ 4, 2, 4, 2, 4, 1 },	  /*  |\_session00		*/
+	{ 15, 4, 4, 4, 15, 1 },	  /*  |  |\_session00		*/
+	{ 16, 4, 4, 4, 15, 1 },	  /*  |   \_session00		*/
+	{ 17, 4, 4, 4, 17, 0 },	  /*  |  |\_session00		*/
+	{ 18, 4, 4, 4, 17, 1 },	  /*  |   \_session00		*/
+	{ 5, 2, 2, 2, 2, 1 },	  /*  |\_session00		*/
+	{ 8, 2, 8, 2, 8, 1 },	  /*  |\_session00		*/
+	{ 9, 8, 2, 2, 2, 1 },	  /*  |   \_session00		*/
+	{ 10, 2, 10, 2, 10, 1 },  /*  |\_session00		*/
 	{ 11, 10, 11, 2, 11, 1 }, /*  |    \_session00		*/
-	{ 12, 11, 2, 2, 2, 1 }, /*  |        \_session00	*/
-	{ 13, 2, 2, 2, 2, 0 }, /*   \_session00		*/
-	{ 3, 13, 2, 2, 2, 1 }, /* session00			*/
-	{ 6, 2, 6, 2, 6, 0 }, /*   \_session00		*/
-	{ 14, 6, 6, 6, 6, 1 }, /* session00			*/
+	{ 12, 11, 2, 2, 2, 1 },	  /*  |        \_session00	*/
+	{ 13, 2, 2, 2, 2, 0 },	  /*   \_session00		*/
+	{ 3, 13, 2, 2, 2, 1 },	  /* session00			*/
+	{ 6, 2, 6, 2, 6, 0 },	  /*   \_session00		*/
+	{ 14, 6, 6, 6, 6, 1 },	  /* session00			*/
 };
 
 #define TESTS (sizeof(__testcases) / sizeof(struct testcase))
diff --git a/test/zdtm/static/sigpending.c b/test/zdtm/static/sigpending.c
index 1641fdd86..ce03ff55c 100644
--- a/test/zdtm/static/sigpending.c
+++ b/test/zdtm/static/sigpending.c
@@ -18,7 +18,7 @@ static int numsig;
 #define TESTSIG	  (SIGRTMAX)
 #define THREADSIG (SIGRTMIN)
 static siginfo_t share_infos[2];
-static siginfo_t self_infos[64]; /* self */
+static siginfo_t self_infos[64];  /* self */
 static siginfo_t thread_infos[3]; /* thread */
 static int share_nr;
 static int self_nr;
diff --git a/test/zdtm/transition/ptrace.c b/test/zdtm/transition/ptrace.c
index bf6344f1c..ee10c8004 100644
--- a/test/zdtm/transition/ptrace.c
+++ b/test/zdtm/transition/ptrace.c
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 {
 	int pid, status, i, stopped;
 #define PT_REGS_SIZE  4096 /* big enough for any arch */
-#define PT_REGS_ALIGN 16 /* big enough for any arch */
+#define PT_REGS_ALIGN 16   /* big enough for any arch */
 	char regs[PT_REGS_SIZE] __attribute__((aligned(PT_REGS_ALIGN)));
 
 	int *pids;

From 4ff252656d93a8f18b0a67d8acc73208b1c44e5b Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Mon, 1 Nov 2021 20:50:58 +0800
Subject: [PATCH 0795/1854] cr-dump: fail dumping when zombie process with sid
 0

A zombie process with 0 sid has a session leader in
outer pidns and has ignored SIGHUP. Criu has no idea
to restore this type of process, so fail the dumpping.

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/cr-dump.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index ecc99f116..c972e343a 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1129,6 +1129,13 @@ static int dump_zombies(void)
 		item->pgid = pps_buf.pgid;
 
 		BUG_ON(!list_empty(&item->children));
+
+		if (!item->sid) {
+			pr_err("A session leader of zombie process %d(%d) is outside of its pid namespace\n",
+			       item->pid->real, vpid(item));
+			goto err;
+		}
+
 		if (dump_one_zombie(item, &pps_buf) < 0)
 			goto err;
 	}

From a9d9fb8aa580c3ab648ec1a49d6c3dfab749a6f1 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 Oct 2021 10:35:28 +0300
Subject: [PATCH 0796/1854] clang-format: make x86_ins_capability_mask
 human-readable

There is no option in clang not to merge as much binary operands as it
fits in column limit, but here we need each bit on new line to make it
readable, so let's disable clang-format for x86_ins_capability_masks.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/arch/x86/cpu.c | 127 +++++++++++++++++++++++++++++---------------
 1 file changed, 83 insertions(+), 44 deletions(-)

diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index d02f4abd5..b3a7ca636 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -107,64 +107,103 @@ int cpu_dump_cpuinfo(void)
 
 #define __ins_bit(__l, __v) (1u << ((__v)-32u * (__l)))
 
+// clang-format off
 static uint32_t x86_ins_capability_mask[NCAPINTS] = {
-	[CPUID_1_EDX] = __ins_bit(CPUID_1_EDX, X86_FEATURE_FPU) | __ins_bit(CPUID_1_EDX, X86_FEATURE_TSC) |
-			__ins_bit(CPUID_1_EDX, X86_FEATURE_CX8) | __ins_bit(CPUID_1_EDX, X86_FEATURE_SEP) |
-			__ins_bit(CPUID_1_EDX, X86_FEATURE_CMOV) | __ins_bit(CPUID_1_EDX, X86_FEATURE_CLFLUSH) |
-			__ins_bit(CPUID_1_EDX, X86_FEATURE_MMX) | __ins_bit(CPUID_1_EDX, X86_FEATURE_FXSR) |
-			__ins_bit(CPUID_1_EDX, X86_FEATURE_XMM) | __ins_bit(CPUID_1_EDX, X86_FEATURE_XMM2),
+	[CPUID_1_EDX] =
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_FPU) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_TSC) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_CX8) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_SEP) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_CMOV) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_CLFLUSH) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_MMX) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_FXSR) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_XMM) |
+	__ins_bit(CPUID_1_EDX, X86_FEATURE_XMM2),
 
-	[CPUID_8000_0001_EDX] = __ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_SYSCALL) |
-				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_MMXEXT) |
-				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_RDTSCP) |
-				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOWEXT) |
-				__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOW),
+	[CPUID_8000_0001_EDX] =
+	__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_SYSCALL) |
+	__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_MMXEXT) |
+	__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_RDTSCP) |
+	__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOWEXT) |
+	__ins_bit(CPUID_8000_0001_EDX, X86_FEATURE_3DNOW),
 
-	[CPUID_LNX_1] = __ins_bit(CPUID_LNX_1, X86_FEATURE_REP_GOOD) | __ins_bit(CPUID_LNX_1, X86_FEATURE_NOPL),
+	[CPUID_LNX_1] =
+	__ins_bit(CPUID_LNX_1, X86_FEATURE_REP_GOOD) |
+	__ins_bit(CPUID_LNX_1, X86_FEATURE_NOPL),
 
-	[CPUID_1_ECX] = __ins_bit(CPUID_1_ECX, X86_FEATURE_XMM3) | __ins_bit(CPUID_1_ECX, X86_FEATURE_PCLMULQDQ) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_MWAIT) | __ins_bit(CPUID_1_ECX, X86_FEATURE_SSSE3) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_CX16) | __ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_1) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_2) | __ins_bit(CPUID_1_ECX, X86_FEATURE_MOVBE) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_POPCNT) | __ins_bit(CPUID_1_ECX, X86_FEATURE_AES) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_XSAVE) | __ins_bit(CPUID_1_ECX, X86_FEATURE_OSXSAVE) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_AVX) | __ins_bit(CPUID_1_ECX, X86_FEATURE_F16C) |
-			__ins_bit(CPUID_1_ECX, X86_FEATURE_RDRAND),
+	[CPUID_1_ECX] =
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM3) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_PCLMULQDQ) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_MWAIT) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_SSSE3) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_CX16) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_1) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_XMM4_2) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_MOVBE) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_POPCNT) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_AES) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_XSAVE) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_OSXSAVE) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_AVX) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_F16C) |
+	__ins_bit(CPUID_1_ECX, X86_FEATURE_RDRAND),
 
 	[CPUID_8000_0001_ECX] =
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_ABM) | __ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_SSE4A) |
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_MISALIGNSSE) |
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_3DNOWPREFETCH) |
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_XOP) | __ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_FMA4) |
-		__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_TBM),
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_ABM) |
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_SSE4A) |
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_MISALIGNSSE) |
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_3DNOWPREFETCH) |
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_XOP) |
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_FMA4) |
+	__ins_bit(CPUID_8000_0001_ECX, X86_FEATURE_TBM),
 
 	[CPUID_7_0_EBX] =
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_FSGSBASE) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI1) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_HLE) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX2) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI2) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_ERMS) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RTM) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_MPX) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512F) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512DQ) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RDSEED) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_ADX) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_CLFLUSHOPT) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512PF) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512ER) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512CD) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_SHA_NI) | __ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512BW) |
-		__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512VL),
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_FSGSBASE) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI1) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_HLE) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX2) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_BMI2) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_ERMS) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RTM) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_MPX) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512F) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512DQ) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_RDSEED) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_ADX) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_CLFLUSHOPT) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512PF) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512ER) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512CD) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_SHA_NI) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512BW) |
+	__ins_bit(CPUID_7_0_EBX, X86_FEATURE_AVX512VL),
 
-	[CPUID_D_1_EAX] = __ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEOPT) |
-			  __ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEC) | __ins_bit(CPUID_D_1_EAX, X86_FEATURE_XGETBV1),
+	[CPUID_D_1_EAX] =
+	__ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEOPT) |
+	__ins_bit(CPUID_D_1_EAX, X86_FEATURE_XSAVEC) |
+	__ins_bit(CPUID_D_1_EAX, X86_FEATURE_XGETBV1),
 
 	[CPUID_7_0_ECX] =
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512VBMI) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VBMI2) |
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_GFNI) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_VAES) |
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_VPCLMULQDQ) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VNNI) |
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_BITALG) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_TME) |
-		__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VPOPCNTDQ) | __ins_bit(CPUID_7_0_ECX, X86_FEATURE_RDPID),
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512VBMI) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VBMI2) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_GFNI) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_VAES) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_VPCLMULQDQ) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VNNI) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_BITALG) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_TME) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_AVX512_VPOPCNTDQ) |
+	__ins_bit(CPUID_7_0_ECX, X86_FEATURE_RDPID),
 
-	[CPUID_8000_0008_EBX] = __ins_bit(CPUID_8000_0008_EBX, X86_FEATURE_CLZERO),
+	[CPUID_8000_0008_EBX] =
+	__ins_bit(CPUID_8000_0008_EBX, X86_FEATURE_CLZERO),
 
-	[CPUID_7_0_EDX] = __ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4VNNIW) |
-			  __ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4FMAPS),
+	[CPUID_7_0_EDX] =
+	__ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4VNNIW) |
+	__ins_bit(CPUID_7_0_EDX, X86_FEATURE_AVX512_4FMAPS),
 };
+// clang-format on
 
 #undef __ins_bit
 

From 1f9e2c4204377e67cb8f2bb8a3dacf1471f93b62 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 19 Nov 2021 10:08:37 +0300
Subject: [PATCH 0797/1854] ci: disable socket-raw test on centos8

We see error in centos8 ci on restore of socket-raw test:

  inet: \tRestore: family AF_INET type SOCK_RAW proto 66
  port 66 state TCP_CLOSE src_addr 0.0.0.0
  Error (criu/sk-inet.c:834): inet: Can't create inet socket:
  Protocol not supported

Centos 8 kernel replaces IPPROTO_MPTCP(262) with "in-kernel" value
IPPROTO_MPTCP_KERN(66) on inet_create(), but later shows this inkernel
value to criu when listing sockets info. Same code in inet_create()
returns EPROTONOSUPPORT on the attempr to create socket with
IPPROTO_MPTCP_KERN. So this ci error is completely rh8 kernel related.
Kernel should not show "in-kernel" value to userspace. But anyway this
is already changed in Centos 9 kernel, so we can just skip socket-raw
test on Centos 8.

v2: use cirrus.yml

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 671178d8b..235b9821e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -47,7 +47,7 @@ task:
     pip3 install junit_xml
 
   build_script: |
-    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1
+    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_OPTS="-x zdtm/static/socket-raw"
 
 task:
   name: CentOS 7 based test

From 94092ce0025bd4339d7c58386be4ae826934933e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 3 Nov 2021 18:34:11 +0300
Subject: [PATCH 0798/1854] zdtm.py: make tests with --link_remap exclusive

We see that tests mntns_ghost01 and unlink_fstat03 can run
simultaneousely and thus the former sees leftover link_remap.* files in
the test directory created by the latter, and the latter is still
running so it's ok to have link_remap.* at this point.

Let's implicitly make all --link-remap tests exclusive (not running in
parallel).

Fixes: #1633

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index fc7b8a183..b62136e96 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1997,7 +1997,22 @@ class Launcher:
             raise Exception("The kernel is tainted: %r (%r)" %
                             (taint, self.__taint))
 
-        if test_flag(desc, 'excl'):
+        '''
+        The option --link-remap allows criu to hardlink open files back to the
+        file-system on dump (should be removed on restore) and we have a sanity
+        check in check_visible_state that they were actually removed at least
+        from the root test directory after restore.
+
+        As zdtm runs all tests from the same cwd (e.g.: test/zdtm/static) in
+        parallel, hardlinks from one test can mess up with sanity checks of
+        another test or even one test can by mistake use hardlinks created by
+        another test which is even worse.
+
+        So let's make all tests using --link-remap option non parallel.
+        '''
+        link_remap_excl = '--link-remap' in desc.get('opts', '').split() + desc.get('dopts', '').split() + desc.get('ropts', '').split()
+
+        if test_flag(desc, 'excl') or link_remap_excl:
             self.wait_all()
 
         self.__nr += 1
@@ -2030,7 +2045,7 @@ class Launcher:
             "start": time.time()
         }
 
-        if test_flag(desc, 'excl'):
+        if test_flag(desc, 'excl') or link_remap_excl:
             self.wait()
 
     def __wait_one(self, flags):

From d2b6faf8fd2e1c593fdd2cc5dbeee4062cb5128a Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 29 Oct 2021 03:01:14 +0000
Subject: [PATCH 0799/1854] tests: improve the deterministic behavior of the
 test suite

Various I/O objects are unclosed when the object falls out of scope.
This can lead to non-deterministic behavior.

Also fixed a few missing list(). It doesn't play way with python3.
e.g., `random.shuffle(filter(...))` doesn't work.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 test/zdtm.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index b62136e96..b98770079 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -202,6 +202,8 @@ class ns_flavor:
 
     def __copy_libs(self, binary):
         ldd = subprocess.Popen(["ldd", binary], stdout=subprocess.PIPE)
+        stdout, _ = ldd.communicate()
+
         xl = re.compile(
             r'^(linux-gate.so|linux-vdso(64)?.so|not a dynamic|.*\s*ldd\s)')
 
@@ -216,11 +218,9 @@ class ns_flavor:
                     map(
                         lambda x: str(x).strip(),
                         filter(lambda x: str(x).startswith('\t'),
-                               ldd.stdout.read().decode(
+                               stdout.decode(
                                    'ascii').splitlines())))))
 
-        ldd.wait()
-
         for lib in libs:
             if not os.access(lib, os.F_OK):
                 raise test_fail_exc("Can't find lib %s required by %s" %
@@ -331,8 +331,7 @@ def decode_flav(i):
 
 def tail(path):
     p = subprocess.Popen(['tail', '-n1', path], stdout=subprocess.PIPE)
-    out = p.stdout.readline()
-    p.wait()
+    out, _ = p.communicate()
     return out.decode()
 
 
@@ -801,7 +800,7 @@ class groups_test(zdtm_test):
         if flavor.ns:
             self.__real_name = name
             with open(name) as fd:
-                self.__subs = map(lambda x: x.strip(), fd.readlines())
+                self.__subs = list(map(lambda x: x.strip(), fd.readlines()))
             print("Subs:\n%s" % '\n'.join(self.__subs))
         else:
             self.__real_name = ''
@@ -819,8 +818,8 @@ class groups_test(zdtm_test):
         subprocess.check_call(s_args + [tname + '.cleanout'])
         s = subprocess.Popen(s_args + ['--dry-run', tname + '.pid'],
                              stdout=subprocess.PIPE)
-        cmd = s.stdout.readlines().pop().strip()
-        s.wait()
+        out, _ = s.communicate()
+        cmd = out.decode().splitlines()[-1].strip()
 
         return 'cd /' + tdir + ' && ' + cmd
 
@@ -2045,6 +2044,9 @@ class Launcher:
             "start": time.time()
         }
 
+        if log:
+            log.close()
+
         if test_flag(desc, 'excl') or link_remap_excl:
             self.wait()
 
@@ -2068,6 +2070,9 @@ class Launcher:
         self.__runtest += 1
         if pid != 0:
             sub = self.__subs.pop(pid)
+            # The following wait() is not useful for our domain logic.
+            # It's useful for taming warnings in subprocess.Popen.__del__()
+            sub['sub'].wait()
             tc = None
             if self.__junit_test_cases is not None:
                 tc = TestCase(sub['name'],
@@ -2168,9 +2173,9 @@ def all_tests(opts):
                 continue
             files.append(fp)
     excl = list(map(lambda x: os.path.join(desc['dir'], x), desc['exclude']))
-    tlist = filter(
+    tlist = list(filter(
         lambda x: not x.endswith('.checkskip') and not x.endswith('.hook') and
-        x not in excl, map(lambda x: x.strip(), files))
+        x not in excl, map(lambda x: x.strip(), files)))
     return tlist
 
 

From 781676f102ff06fd607f95a2ab1ce16edcec46ab Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 23 Nov 2021 15:06:03 +0300
Subject: [PATCH 0800/1854] clang-format/zdtm: fix clang complains about
 strange elseifs

Clang-format v13 on my Fedora 35 complains about these hunks, more over
reading the formating we had before is a pain:

} else /* comment */
	if (smth) {
	fail("")
	return -1;
}

Let's make explicit {} braces for else, this way it looks much better.

Fixes: 93dd984ca ("Run 'make indent' on all C files")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mprotect00.c | 16 ++++++++++------
 test/zdtm/static/shm-mp.c     | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/test/zdtm/static/mprotect00.c b/test/zdtm/static/mprotect00.c
index 006b64772..717b7ddcf 100644
--- a/test/zdtm/static/mprotect00.c
+++ b/test/zdtm/static/mprotect00.c
@@ -44,10 +44,12 @@ static int check_prot(char *ptr, int prot)
 			fail("PROT_READ bypassed");
 			return -1;
 		}
-	} else /* we come here on return from SIGSEGV handler */
+	} else {
+		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_READ) {
-		fail("PROT_READ rejected");
-		return -1;
+			fail("PROT_READ rejected");
+			return -1;
+		}
 	}
 
 	if (!sigsetjmp(segv_ret, 1)) {
@@ -56,10 +58,12 @@ static int check_prot(char *ptr, int prot)
 			fail("PROT_WRITE bypassed");
 			return -1;
 		}
-	} else /* we come here on return from SIGSEGV handler */
+	} else {
+		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_WRITE) {
-		fail("PROT_WRITE rejected");
-		return -1;
+			fail("PROT_WRITE rejected");
+			return -1;
+		}
 	}
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {
diff --git a/test/zdtm/static/shm-mp.c b/test/zdtm/static/shm-mp.c
index 1929dac19..c95f3d84c 100644
--- a/test/zdtm/static/shm-mp.c
+++ b/test/zdtm/static/shm-mp.c
@@ -33,10 +33,12 @@ static int check_prot(char *ptr, char val, int prot)
 			fail("PROT_READ bypassed");
 			return -1;
 		}
-	} else /* we come here on return from SIGSEGV handler */
+	} else {
+		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_READ) {
-		fail("PROT_READ rejected");
-		return -1;
+			fail("PROT_READ rejected");
+			return -1;
+		}
 	}
 
 	if (!sigsetjmp(segv_ret, 1)) {
@@ -45,10 +47,12 @@ static int check_prot(char *ptr, char val, int prot)
 			fail("PROT_WRITE bypassed");
 			return -1;
 		}
-	} else /* we come here on return from SIGSEGV handler */
+	} else {
+		/* we come here on return from SIGSEGV handler */
 		if (prot & PROT_WRITE) {
-		fail("PROT_WRITE rejected");
-		return -1;
+			fail("PROT_WRITE rejected");
+			return -1;
+		}
 	}
 
 	if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {

From eb0dee4082d309a75f5a2ff5ada9a23488dc6820 Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Fri, 5 Nov 2021 17:08:51 +0800
Subject: [PATCH 0801/1854] seize: restore cgroup freezer to right state

The new freezer_state is a complete equivalent of old freezer_thawed
except for the initial value. If old freezer_thawed was not initialized
it was 0 and in freezer_restore_state were threated as if we need to
freeze cgroup "back", thus before this patch if criu dump failed before
freezing dumpee, criu always freeze dumpee in cr_dump_finish which is
wrong. Switching to freezer_state initialized with FREEZER_ERROR fixes
the problem.

v2: improve description, rename to origin_freezer_state

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/seize.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index 95bf9ef0c..58564ca74 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -131,11 +131,11 @@ static enum freezer_state get_freezer_state(int fd)
 	return get_freezer_v1_state(fd);
 }
 
-static bool freezer_thawed;
+static enum freezer_state origin_freezer_state = FREEZER_ERROR;
 
 const char *get_real_freezer_state(void)
 {
-	return freezer_thawed ? thawed : frozen;
+	return origin_freezer_state == THAWED ? thawed : frozen;
 }
 
 static int freezer_write_state(int fd, enum freezer_state new_state)
@@ -192,7 +192,7 @@ static int freezer_restore_state(void)
 	int fd;
 	int ret;
 
-	if (!opts.freeze_cgroup || freezer_thawed)
+	if (!opts.freeze_cgroup || origin_freezer_state != FROZEN)
 		return 0;
 
 	fd = freezer_open();
@@ -481,9 +481,10 @@ static int freeze_processes(void)
 		close(fd);
 		return -1;
 	}
-	if (state == THAWED) {
-		freezer_thawed = true;
 
+	origin_freezer_state = state == FREEZING ? FROZEN : state;
+
+	if (state == THAWED) {
 		if (freezer_write_state(fd, FROZEN)) {
 			close(fd);
 			return -1;
@@ -534,7 +535,7 @@ static int freeze_processes(void)
 	}
 
 err:
-	if (exit_code == 0 || freezer_thawed)
+	if (exit_code == 0 || origin_freezer_state == THAWED)
 		exit_code = freezer_write_state(fd, THAWED);
 
 	if (close(fd)) {

From a491706cce766a61c96e6739a60d9ee329d9dab8 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 24 Nov 2021 11:37:58 +0300
Subject: [PATCH 0802/1854] ci: Use latest Fedora for lint ci runs again

Now when we fixed clang-format complains in zdtm, let's switch to lates
clang-format available. This is effectively a revert of commit 07a2f0265
("ci: use Fedora 34 for lint CI runs").

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 49eb6aaac..50b241e9f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: registry.fedoraproject.org/fedora:34
+      image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
       run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils

From c2fd819039d15f0e29853666fbd9731ffd0d608e Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Thu, 4 Nov 2021 10:04:22 +0800
Subject: [PATCH 0803/1854] crtools: ignore SIGPIPE in swrk mode

Criu ignores SIGPIPE in most cases except swrk mode. And in the
following situtation criu get killed by SIGPIPE and have no chance
to do cleanup: Connection to page server is lost when we do disk-less
migration, criu send PS_IOV_FLUSH via a broken connction in
disconnect_from_page_server.

This patch let criu ignore SIGPIPE in all paths .

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/crtools.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 6a75cd1ea..81c0aa963 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -106,6 +106,24 @@ int main(int argc, char *argv[], char *envp[])
 
 	log_set_loglevel(opts.log_level);
 
+	/*
+	 * There kernel might send us lethal signals in the following cases:
+	 * 1) Writing a pipe which reader has disappeared.
+	 * 2) Writing to a socket of type SOCK_STREAM which is no longer connected.
+	 * We deal with write()/Send() failures on our own, and prefer not to get killed.
+	 * So we ignore SIGPIPEs.
+	 *
+	 * Pipes are used in various places:
+	 * 1) Receiving application page data
+	 * 2) Transmitting data to the image streamer
+	 * 3) Emitting logs (potentially to a pipe).
+	 * Sockets are mainly used in transmitting memory data.
+	 */
+	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+		pr_perror("Failed to set a SIGPIPE signal ignore.");
+		return 1;
+	}
+
 	if (optind < argc && !strcmp(argv[optind], "swrk")) {
 		if (argc != optind + 2) {
 			fprintf(stderr, "Usage: criu swrk <fd>\n");
@@ -175,21 +193,6 @@ int main(int argc, char *argv[], char *envp[])
 		}
 	}
 
-	/*
-	 * The kernel might send us lethal signals when writing to a pipe
-	 * which reader has disappeared. We deal with write() failures on our
-	 * own, and prefer not to get killed. So we ignore SIGPIPEs.
-	 *
-	 * Pipes are used in various places:
-	 * 1) Receiving application page data
-	 * 2) Transmitting data to the image streamer
-	 * 3) Emitting logs (potentially to a pipe).
-	 */
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-		pr_perror("Failed to set a SIGPIPE signal ignore.");
-		return 1;
-	}
-
 	/*
 	 * When a process group becomes an orphan,
 	 * its processes are sent a SIGHUP signal

From 156cce78c5ec0cf257ab2319ba42d41c22858e0d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 24 Nov 2021 16:13:01 +0000
Subject: [PATCH 0804/1854] ci: switch to centos-stream-8

CentOS 8 goes EOL at the end of 2021. This switches our CentOS 8 based
tests to CentOS Stream 8 which should be supported until 2024.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 235b9821e..ef0de54e9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,7 +27,7 @@ task:
 
   compute_engine_instance:
     image_project: centos-cloud
-    image: family/centos-8
+    image: family/centos-stream-8
     platform: linux
     cpu: 4
     memory: 8G

From 64b58b51413b06bd99e4b922c1c690845134e290 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Fri, 19 Nov 2021 20:58:13 +0000
Subject: [PATCH 0805/1854] check: cleanup child processes

Always wait() for forked child processes. It avoid zombie processes in
containers that don't have an init process reaping orphans.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 criu/cr-check.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index e46c93815..0320b445a 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -575,6 +575,7 @@ static pid_t fork_and_ptrace_attach(int (*child_setup)(void))
 	if (read(sk, &c, 1) != 1) {
 		close(sk);
 		kill(pid, SIGKILL);
+		waitpid(pid, NULL, 0);
 		pr_perror("read");
 		return -1;
 	}
@@ -584,6 +585,7 @@ static pid_t fork_and_ptrace_attach(int (*child_setup)(void))
 	if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) {
 		pr_perror("Unable to ptrace the child");
 		kill(pid, SIGKILL);
+		waitpid(pid, NULL, 0);
 		return -1;
 	}
 
@@ -618,6 +620,7 @@ static int check_ptrace_peeksiginfo(void)
 	}
 
 	kill(pid, SIGKILL);
+	waitpid(pid, NULL, 0);
 	return ret;
 }
 
@@ -768,6 +771,7 @@ static int check_special_mapping_mremap(void)
 		/* Probably, we're interrupted with a signal - cleanup */
 		pr_err("Failed to wait for a child %d\n", errno);
 		kill(child, SIGKILL);
+		waitpid(child, NULL, 0);
 		return -1;
 	}
 
@@ -806,6 +810,7 @@ static int check_ptrace_suspend_seccomp(void)
 	}
 
 	kill(pid, SIGKILL);
+	waitpid(pid, NULL, 0);
 	return ret;
 }
 
@@ -846,6 +851,7 @@ static int check_ptrace_dump_seccomp_filters(void)
 	}
 
 	kill(pid, SIGKILL);
+	waitpid(pid, NULL, 0);
 	return ret;
 }
 

From 5a0943c900caf9ba195e14e18acaa707d72bed1a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Feb 2020 10:43:14 +0300
Subject: [PATCH 0806/1854] files-reg: fix error handling in open_path

1) On error paths need to close fd and unlock mutex.
2) Make rfi_remap return special return code to identify EEXIST from
   linkat_hard, all other errors should be reported up.
3) Report unlinkat error as criu should not corrupt fs.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/fe1d0be14

Changes: use close_safe(), fix order in "Fake %s -> %s link" error
message.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 679477c1c..4560f253e 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1867,6 +1867,9 @@ out:
  * This routine properly resolves d's path handling ghost/link-remaps.
  * The open_cb is a routine that does actual open, it differs for
  * files, directories, fifos, etc.
+ *
+ * Return 0 on success, -1 on error and 1 to indicate soft error, which can be
+ * retried.
  */
 
 static int rfi_remap(struct reg_file_info *rfi, int *level)
@@ -1932,6 +1935,8 @@ out_root:
 		int errno_saved = errno;
 		rm_parent_dirs(mntns_root, path, *level);
 		errno = errno_saved;
+		if (errno == EEXIST)
+			return 1;
 		return -1;
 	}
 
@@ -2008,11 +2013,12 @@ static bool validate_file(const int fd, const struct stat *fd_status, const stru
 
 int open_path(struct file_desc *d, int (*open_cb)(int mntns_root, struct reg_file_info *, void *), void *arg)
 {
-	int tmp, mntns_root, level = 0;
+	int tmp = -1, mntns_root, level = 0;
 	struct reg_file_info *rfi;
 	char *orig_path = NULL;
 	char path[PATH_MAX];
 	int inh_fd = -1;
+	int ret;
 
 	if (inherited_fd(d, &tmp))
 		return tmp;
@@ -2049,14 +2055,9 @@ int open_path(struct file_desc *d, int (*open_cb)(int mntns_root, struct reg_fil
 			 */
 			orig_path = rfi->path;
 			rfi->path = rfi->remap->rpath;
-		} else if (rfi_remap(rfi, &level) < 0) {
+		} else if ((ret = rfi_remap(rfi, &level)) == 1) {
 			static char tmp_path[PATH_MAX];
 
-			if (errno != EEXIST) {
-				pr_perror("Can't link %s -> %s", rfi->remap->rpath, rfi->path);
-				return -1;
-			}
-
 			/*
 			 * The file whose name we're trying to create
 			 * exists. Need to pick some other one, we're
@@ -2070,12 +2071,15 @@ int open_path(struct file_desc *d, int (*open_cb)(int mntns_root, struct reg_fil
 			orig_path = rfi->path;
 			rfi->path = tmp_path;
 			snprintf(tmp_path, sizeof(tmp_path), "%s.cr_link", orig_path);
-			pr_debug("Fake %s -> %s link\n", rfi->path, rfi->remap->rpath);
+			pr_debug("Fake %s -> %s link\n", rfi->remap->rpath, rfi->path);
 
-			if (rfi_remap(rfi, &level) < 0) {
+			if (rfi_remap(rfi, &level)) {
 				pr_perror("Can't create even fake link!");
-				return -1;
+				goto err;
 			}
+		} else if (ret < 0) {
+			pr_perror("Can't link %s -> %s", rfi->remap->rpath, rfi->path);
+			goto err;
 		}
 	}
 
@@ -2085,7 +2089,7 @@ ext:
 	if (tmp < 0) {
 		pr_perror("Can't open file %s", rfi->path);
 		close_safe(&inh_fd);
-		return -1;
+		goto err;
 	}
 	close_safe(&inh_fd);
 
@@ -2094,15 +2098,15 @@ ext:
 
 		if (fstat(tmp, &st) < 0) {
 			pr_perror("Can't fstat opened file");
-			return -1;
+			goto err;
 		}
 
 		if (!validate_file(tmp, &st, rfi))
-			return -1;
+			goto err;
 
 		if (rfi->rfe->has_mode && (st.st_mode != rfi->rfe->mode)) {
 			pr_err("File %s has bad mode 0%o (expect 0%o)\n", rfi->path, (int)st.st_mode, rfi->rfe->mode);
-			return -1;
+			goto err;
 		}
 
 		/*
@@ -2115,7 +2119,11 @@ ext:
 
 	if (rfi->remap) {
 		if (!rfi->remap->is_dir) {
-			unlinkat(mntns_root, rfi->path, 0);
+			pr_debug("Unlink: %d:%s\n", rfi->rfe->mnt_id, rfi->path);
+			if (unlinkat(mntns_root, rfi->path, 0)) {
+				pr_perror("Failed to unlink the remap file");
+				goto err;
+			}
 			rm_parent_dirs(mntns_root, rfi->path, level);
 		}
 
@@ -2124,10 +2132,17 @@ ext:
 	if (orig_path)
 		rfi->path = orig_path;
 
-	if (restore_fown(tmp, rfi->rfe->fown))
+	if (restore_fown(tmp, rfi->rfe->fown)) {
+		close(tmp);
 		return -1;
+	}
 
 	return tmp;
+err:
+	if (rfi->remap)
+		mutex_unlock(remap_open_lock);
+	close_safe(&tmp);
+	return -1;
 }
 
 int do_open_reg_noseek_flags(int ns_root_fd, struct reg_file_info *rfi, void *arg)

From cfed6f35e140f7863c0cb1fe99b99ef8a4d8c2a0 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Feb 2020 13:03:12 +0300
Subject: [PATCH 0807/1854] files-reg: fix error handling of rm_parent_dirs

If unlinkat fails it means that fs is in "corrupted" state - spoiled
with non-unlinked auxiliary directories.

While on it add fixme note as this function can be racy and BUG_ON if
path contains double slashes.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/b7b4e69fd

Changes: simplify while loop condition, remove confusing FIXME, remove
excess !count check in favour of while loop condition check

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 4560f253e..0e126a32e 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1792,30 +1792,42 @@ out:
 	return ret;
 }
 
-static void rm_parent_dirs(int mntns_root, char *path, int count)
+static int rm_parent_dirs(int mntns_root, char *path, int count)
 {
 	char *p, *prev = NULL;
+	int ret = -1;
 
-	if (!count)
-		return;
-
-	while (count > 0) {
-		count -= 1;
+	while (count-- > 0) {
 		p = strrchr(path, '/');
-		if (p)
+		if (p) {
+			/* We don't handle "//" in path */
+			BUG_ON(prev && (prev - p == 1));
 			*p = '\0';
+		} else {
+			/* Inconsistent path and count */
+			pr_perror("Can't strrchr \"/\" in \"%s\"/\"%s\"]"
+				  " left count=%d\n",
+				  path, prev ? prev + 1 : "", count + 1);
+			goto err;
+		}
+
 		if (prev)
 			*prev = '/';
-
-		if (unlinkat(mntns_root, path, AT_REMOVEDIR))
-			pr_perror("Can't remove %s AT %d", path, mntns_root);
-		else
-			pr_debug("Unlinked parent dir: %s AT %d\n", path, mntns_root);
 		prev = p;
+
+		if (unlinkat(mntns_root, path, AT_REMOVEDIR)) {
+			pr_perror("Can't remove %s AT %d", path, mntns_root);
+			goto err;
+		}
+		pr_debug("Unlinked parent dir: %s AT %d\n", path, mntns_root);
 	}
 
+	ret = 0;
+err:
 	if (prev)
 		*prev = '/';
+
+	return ret;
 }
 
 /* Construct parent dir name and mkdir parent/grandparents if they're not exist */
@@ -1847,6 +1859,7 @@ static int make_parent_dirs_if_need(int mntns_root, char *path)
 		err = mkdirat(mntns_root, path, 0777);
 		if (err && errno != EEXIST) {
 			pr_perror("Can't create dir: %s AT %d", path, mntns_root);
+			/* Failing anyway -> no retcode check */
 			rm_parent_dirs(mntns_root, path, count);
 			count = -1;
 			goto out;
@@ -1933,10 +1946,11 @@ out_root:
 
 	if (linkat_hard(mntns_root, rpath, mntns_root, path, rfi->remap->uid, rfi->remap->gid, 0) < 0) {
 		int errno_saved = errno;
-		rm_parent_dirs(mntns_root, path, *level);
-		errno = errno_saved;
-		if (errno == EEXIST)
+
+		if (!rm_parent_dirs(mntns_root, path, *level) && errno_saved == EEXIST) {
+			errno = errno_saved;
 			return 1;
+		}
 		return -1;
 	}
 
@@ -2124,7 +2138,8 @@ ext:
 				pr_perror("Failed to unlink the remap file");
 				goto err;
 			}
-			rm_parent_dirs(mntns_root, rfi->path, level);
+			if (rm_parent_dirs(mntns_root, rfi->path, level))
+				goto err;
 		}
 
 		mutex_unlock(remap_open_lock);

From bd219b69a66406f5860b380977bf7378881b8801 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Feb 2020 18:28:15 +0300
Subject: [PATCH 0808/1854] ghost/mount: allocate remounted_rw in shmem to get
 info from other processes

Previousely remounted_rw was not shared between all processes on
restore, thus cleanup didn't got this info from rfi_remap and these
mounts were wrongly left writable after restore.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/3a1a592e7

Fixes: fd0a3cd9efb9 ("mount: remount ro mounts writable before
ghost-file restore")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  4 ++--
 criu/mount.c         | 32 ++++++++++++++++++++++----------
 criu/proc_parse.c    |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 833a75ca0..7705279e4 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -84,7 +84,7 @@ struct mount_info {
 	struct list_head postpone;
 
 	int is_overmounted;
-	int remounted_rw;
+	int *remounted_rw;
 
 	void *private; /* associated filesystem data */
 };
@@ -100,7 +100,7 @@ static inline int collect_binfmt_misc(void)
 }
 #endif
 
-extern struct mount_info *mnt_entry_alloc(void);
+extern struct mount_info *mnt_entry_alloc(bool rst);
 extern void mnt_entry_free(struct mount_info *mi);
 
 extern int __mntns_get_root_fd(pid_t pid);
diff --git a/criu/mount.c b/criu/mount.c
index 93725e526..d75ca5598 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -27,6 +27,7 @@
 #include "external.h"
 #include "clone-noasan.h"
 #include "fdstore.h"
+#include "rst-malloc.h"
 
 #include "images/mnt.pb-c.h"
 
@@ -1415,7 +1416,8 @@ err:
 	return -1;
 }
 
-static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsname, const char *path, unsigned int s_dev)
+static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsname, const char *path, unsigned int s_dev,
+					    bool rst)
 {
 	struct mount_info *mi, *t, *parent;
 	bool add_slash = false;
@@ -1434,7 +1436,7 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 		}
 	}
 
-	mi = mnt_entry_alloc();
+	mi = mnt_entry_alloc(rst);
 	if (!mi)
 		return -1;
 
@@ -2723,7 +2725,7 @@ err_root:
 	return exit_code;
 }
 
-struct mount_info *mnt_entry_alloc()
+struct mount_info *mnt_entry_alloc(bool rst)
 {
 	struct mount_info *new;
 
@@ -2734,6 +2736,13 @@ struct mount_info *mnt_entry_alloc()
 
 	new = xzalloc(sizeof(struct mount_info));
 	if (new) {
+		if (rst) {
+			new->remounted_rw = shmalloc(sizeof(int));
+			if (!new->remounted_rw) {
+				xfree(new);
+				return NULL;
+			}
+		}
 		new->fd = -1;
 		new->is_overmounted = -1;
 		INIT_LIST_HEAD(&new->children);
@@ -2956,7 +2965,7 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 		if (ret <= 0)
 			break;
 
-		pm = mnt_entry_alloc();
+		pm = mnt_entry_alloc(true);
 		if (!pm)
 			goto err;
 
@@ -3234,7 +3243,7 @@ static int populate_mnt_ns(void)
 {
 	int ret;
 
-	root_yard_mp = mnt_entry_alloc();
+	root_yard_mp = mnt_entry_alloc(true);
 	if (!root_yard_mp)
 		return -1;
 
@@ -3247,7 +3256,7 @@ static int populate_mnt_ns(void)
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 	if (!opts.has_binfmt_misc && !list_empty(&binfmt_misc_list)) {
 		/* Add to mount tree. Generic code will mount it later */
-		ret = add_cr_time_mount(root_yard_mp, "binfmt_misc", BINFMT_MISC_HOME, 0);
+		ret = add_cr_time_mount(root_yard_mp, "binfmt_misc", BINFMT_MISC_HOME, 0, true);
 		if (ret)
 			return -1;
 	}
@@ -3697,7 +3706,7 @@ int collect_mnt_namespaces(bool for_dump)
 				ret = -1;
 				goto err;
 			} else if (ret > 0 && add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc", BINFMT_MISC_HOME,
-								s_dev) < 0) {
+								s_dev, false) < 0) {
 				ret = -1;
 				goto err;
 			}
@@ -3838,7 +3847,10 @@ int try_remount_writable(struct mount_info *mi, bool ns)
 	if (!ns)
 		remounted = REMOUNTED_RW_SERVICE;
 
-	if (mi->flags & MS_RDONLY && !(mi->remounted_rw & remounted)) {
+	/* All mounts in mntinfo list should have it on restore */
+	BUG_ON(mi->remounted_rw == NULL);
+
+	if (mi->flags & MS_RDONLY && !(*mi->remounted_rw & remounted)) {
 		if (mnt_is_overmounted(mi)) {
 			pr_err("The mount %d is overmounted so paths are invisible\n", mi->mnt_id);
 			return -1;
@@ -3861,7 +3873,7 @@ int try_remount_writable(struct mount_info *mi, bool ns)
 			if (call_helper_process(ns_remount_writable, mi))
 				return -1;
 		}
-		mi->remounted_rw |= remounted;
+		*mi->remounted_rw |= remounted;
 	}
 
 	return 0;
@@ -3876,7 +3888,7 @@ static int __remount_readonly_mounts(struct ns_id *ns)
 		if (ns && mi->nsid != ns)
 			continue;
 
-		if (!(mi->remounted_rw && REMOUNTED_RW))
+		if (!(*mi->remounted_rw && REMOUNTED_RW))
 			continue;
 
 		/*
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 8a9ce3a37..094f9b84e 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1541,7 +1541,7 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 		int ret = -1;
 		char *fsname = NULL;
 
-		new = mnt_entry_alloc();
+		new = mnt_entry_alloc(false);
 		if (!new)
 			goto end;
 

From 17357d67fe73b2aa586479b3c9782434cb79c93d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Feb 2020 18:26:52 +0300
Subject: [PATCH 0809/1854] files-reg: temporary remount writable the mount we
 do unlink on

Previousely I din't mention this case because we had bad error handling
in ghost cleanup path.

Without these patch but with proper error handling for unlink we have an
error in mntns_ghost01 test:

Error (criu/files-reg.c:2269): Failed to unlink the remap file:
Read-only file system

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/151c859e1

Changes: check lookup_mnt_id return for NULL

Fixes: fd0a3cd9efb9 ("mount: remount ro mounts writable before
ghost-file restore")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 0e126a32e..57403d2c6 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2133,6 +2133,11 @@ ext:
 
 	if (rfi->remap) {
 		if (!rfi->remap->is_dir) {
+			struct mount_info *mi = lookup_mnt_id(rfi->rfe->mnt_id);
+
+			if (mi && try_remount_writable(mi, true))
+				goto err;
+
 			pr_debug("Unlink: %d:%s\n", rfi->rfe->mnt_id, rfi->path);
 			if (unlinkat(mntns_root, rfi->path, 0)) {
 				pr_perror("Failed to unlink the remap file");

From 85800248382df12622180559b36e6d6c69d30543 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 30 Nov 2021 19:03:29 +0300
Subject: [PATCH 0810/1854] zdtm: add ro-mount check after c/r to mntns_ghost01

This is a test for "ghost/mount: allocate remounted_rw in shmem to get
info from other processes" patch, without the patch test fails with:

  ############# Test zdtm/static/mntns_ghost01 FAIL at result check ##############
  Test output: ================================
  16:15:19.607:     5: ERR: mntns_ghost01.c:95: open for write on rofs -> 7 (errno = 11 (Resource temporarily unavailable))
  16:15:19.607:     4: FAIL: mntns_ghost01.c:121: Test died (errno = 11 (Resource temporarily unavailable))

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mntns_ghost01.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/zdtm/static/mntns_ghost01.c b/test/zdtm/static/mntns_ghost01.c
index 20397d543..2cc2270dd 100644
--- a/test/zdtm/static/mntns_ghost01.c
+++ b/test/zdtm/static/mntns_ghost01.c
@@ -6,6 +6,7 @@
 #include <sched.h>
 #include <sys/wait.h>
 #include <limits.h>
+#include <errno.h>
 
 #include "zdtmtst.h"
 
@@ -89,6 +90,13 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
+		fd = open(ghost_path, O_CREAT | O_WRONLY, 0600);
+		if (fd >= 0 || errno != EROFS) {
+			pr_perror("open for write on rofs -> %d", fd);
+			close(fd);
+			return 1;
+		}
+
 		return 0;
 	}
 

From 718eb06be3e8bebd15bbcecbfa4b7279ce9a8f2d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 25 Nov 2021 16:51:55 +0300
Subject: [PATCH 0811/1854] clang-format: disable wrong struct pointer
 declaration format

When we declare struct and at the same time declare variable pointer of
this struct type, it looks like clang-format threats "*" as a
multiplication operator instead of indirection (pointer declaration)
operator and puts spaces on both sides, which looks wrong.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/fdstore.c                                    | 4 +++-
 test/zdtm/lib/test.c                              | 4 +++-
 test/zdtm/static/child_subreaper_and_reparent.c   | 4 +++-
 test/zdtm/static/child_subreaper_existing_child.c | 4 +++-
 test/zdtm/static/file_fown.c                      | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/criu/fdstore.c b/criu/fdstore.c
index 77935484f..65264a511 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -13,10 +13,12 @@
 #include "rst-malloc.h"
 #include "log.h"
 
+/* clang-format off */
 static struct fdstore_desc {
 	int next_id;
 	mutex_t lock; /* to protect a peek offset */
-} * desc;
+} *desc;
+/* clang-format on */
 
 int fdstore_init(void)
 {
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index 81da81eba..57eb42046 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -20,9 +20,11 @@
 #include "ns.h"
 
 futex_t sig_received;
+/* clang-format off */
 static struct {
 	futex_t stage;
-} * test_shared_state;
+} *test_shared_state;
+/* clang-format on */
 
 enum {
 	TEST_INIT_STAGE = 0,
diff --git a/test/zdtm/static/child_subreaper_and_reparent.c b/test/zdtm/static/child_subreaper_and_reparent.c
index ba03517ba..c71778ae9 100644
--- a/test/zdtm/static/child_subreaper_and_reparent.c
+++ b/test/zdtm/static/child_subreaper_and_reparent.c
@@ -19,11 +19,13 @@ enum {
 	TEST_EXIT,
 };
 
+/* clang-format off */
 struct shared {
 	futex_t fstate;
 	int parent_before_cr;
 	int parent_after_cr;
-} * sh;
+} *sh;
+/* clang-format on */
 
 int orphan(void)
 {
diff --git a/test/zdtm/static/child_subreaper_existing_child.c b/test/zdtm/static/child_subreaper_existing_child.c
index 4805aa41d..92d22bc4a 100644
--- a/test/zdtm/static/child_subreaper_existing_child.c
+++ b/test/zdtm/static/child_subreaper_existing_child.c
@@ -18,10 +18,12 @@ enum {
 	TEST_EXIT,
 };
 
+/* clang-format off */
 struct shared {
 	futex_t fstate;
 	int ppid_after_reparent;
-} * sh;
+} *sh;
+/* clang-format on */
 
 int orphan(void)
 {
diff --git a/test/zdtm/static/file_fown.c b/test/zdtm/static/file_fown.c
index eb42a826e..2c5ba82c2 100644
--- a/test/zdtm/static/file_fown.c
+++ b/test/zdtm/static/file_fown.c
@@ -22,12 +22,14 @@
 const char *test_doc = "Check for signal delivery on file owners";
 const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
+/* clang-format off */
 struct params {
 	int sigio;
 	int pipe_flags[2];
 	int pipe_pid[2];
 	int pipe_sig[2];
-} * shared;
+} *shared;
+/* clang-format on */
 
 static void signal_handler_io(int status)
 {

From 4c1330bb0ccf3ea86c2ecd6b1bb2c9f117079d2f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sat, 4 Dec 2021 16:18:26 +0000
Subject: [PATCH 0812/1854] ci: Run cross compile on debian stable

The current debian stable release is Bullseye, not Buster. However, we
can use the 'stable' release instead. This would allow the CI to
automatically pick up updates in the future.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 .github/workflows/cross-compile-daily.yml                    | 2 +-
 .github/workflows/cross-compile.yml                          | 2 +-
 scripts/build/Dockerfile.aarch64-cross.tmpl                  | 1 -
 ...aarch64-cross.hdr => Dockerfile.aarch64-stable-cross.hdr} | 0
 scripts/build/Dockerfile.aarch64-stable-cross.tmpl           | 1 +
 scripts/build/Dockerfile.armv7-cross.tmpl                    | 1 -
 ...ile.armv7-cross.hdr => Dockerfile.armv7-stable-cross.hdr} | 0
 scripts/build/Dockerfile.armv7-stable-cross.tmpl             | 1 +
 scripts/build/Dockerfile.mips64el-cross.tmpl                 | 1 -
 ...ps64el-cross.hdr => Dockerfile.mips64el-stable-cross.hdr} | 0
 scripts/build/Dockerfile.mips64el-stable-cross.tmpl          | 1 +
 scripts/build/Dockerfile.ppc64-cross.tmpl                    | 1 -
 ...ile.ppc64-cross.hdr => Dockerfile.ppc64-stable-cross.hdr} | 0
 scripts/build/Dockerfile.ppc64-stable-cross.tmpl             | 1 +
 .../{Dockerfile.cross.tmpl => Dockerfile.stable-cross.tmpl}  | 5 ++---
 scripts/build/Makefile                                       | 2 +-
 16 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 120000 scripts/build/Dockerfile.aarch64-cross.tmpl
 rename scripts/build/{Dockerfile.aarch64-cross.hdr => Dockerfile.aarch64-stable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.aarch64-stable-cross.tmpl
 delete mode 120000 scripts/build/Dockerfile.armv7-cross.tmpl
 rename scripts/build/{Dockerfile.armv7-cross.hdr => Dockerfile.armv7-stable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.armv7-stable-cross.tmpl
 delete mode 120000 scripts/build/Dockerfile.mips64el-cross.tmpl
 rename scripts/build/{Dockerfile.mips64el-cross.hdr => Dockerfile.mips64el-stable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.mips64el-stable-cross.tmpl
 delete mode 120000 scripts/build/Dockerfile.ppc64-cross.tmpl
 rename scripts/build/{Dockerfile.ppc64-cross.hdr => Dockerfile.ppc64-stable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.ppc64-stable-cross.tmpl
 rename scripts/build/{Dockerfile.cross.tmpl => Dockerfile.stable-cross.tmpl} (88%)

diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
index 701213276..927ddced2 100644
--- a/.github/workflows/cross-compile-daily.yml
+++ b/.github/workflows/cross-compile-daily.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+        target: [armv7-stable-cross, aarch64-stable-cross, ppc64-stable-cross, mips64el-stable-cross]
         branches: [criu-dev, master]
 
     steps:
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 90862e7ab..c6745d43e 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-cross, aarch64-cross, ppc64-cross, mips64el-cross]
+        target: [armv7-stable-cross, aarch64-stable-cross, ppc64-stable-cross, mips64el-stable-cross]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/scripts/build/Dockerfile.aarch64-cross.tmpl b/scripts/build/Dockerfile.aarch64-cross.tmpl
deleted file mode 120000
index 50eff9213..000000000
--- a/scripts/build/Dockerfile.aarch64-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.aarch64-cross.hdr b/scripts/build/Dockerfile.aarch64-stable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.aarch64-cross.hdr
rename to scripts/build/Dockerfile.aarch64-stable-cross.hdr
diff --git a/scripts/build/Dockerfile.aarch64-stable-cross.tmpl b/scripts/build/Dockerfile.aarch64-stable-cross.tmpl
new file mode 120000
index 000000000..81ef22980
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-stable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.stable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.armv7-cross.tmpl b/scripts/build/Dockerfile.armv7-cross.tmpl
deleted file mode 120000
index 50eff9213..000000000
--- a/scripts/build/Dockerfile.armv7-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.armv7-cross.hdr b/scripts/build/Dockerfile.armv7-stable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.armv7-cross.hdr
rename to scripts/build/Dockerfile.armv7-stable-cross.hdr
diff --git a/scripts/build/Dockerfile.armv7-stable-cross.tmpl b/scripts/build/Dockerfile.armv7-stable-cross.tmpl
new file mode 120000
index 000000000..81ef22980
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-stable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.stable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.mips64el-cross.tmpl b/scripts/build/Dockerfile.mips64el-cross.tmpl
deleted file mode 120000
index 50eff9213..000000000
--- a/scripts/build/Dockerfile.mips64el-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.mips64el-cross.hdr b/scripts/build/Dockerfile.mips64el-stable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.mips64el-cross.hdr
rename to scripts/build/Dockerfile.mips64el-stable-cross.hdr
diff --git a/scripts/build/Dockerfile.mips64el-stable-cross.tmpl b/scripts/build/Dockerfile.mips64el-stable-cross.tmpl
new file mode 120000
index 000000000..81ef22980
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-stable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.stable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64-cross.tmpl b/scripts/build/Dockerfile.ppc64-cross.tmpl
deleted file mode 120000
index 50eff9213..000000000
--- a/scripts/build/Dockerfile.ppc64-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64-cross.hdr b/scripts/build/Dockerfile.ppc64-stable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.ppc64-cross.hdr
rename to scripts/build/Dockerfile.ppc64-stable-cross.hdr
diff --git a/scripts/build/Dockerfile.ppc64-stable-cross.tmpl b/scripts/build/Dockerfile.ppc64-stable-cross.tmpl
new file mode 120000
index 000000000..81ef22980
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-stable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.stable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.cross.tmpl b/scripts/build/Dockerfile.stable-cross.tmpl
similarity index 88%
rename from scripts/build/Dockerfile.cross.tmpl
rename to scripts/build/Dockerfile.stable-cross.tmpl
index 8b95fbb1c..6a68cd1ca 100644
--- a/scripts/build/Dockerfile.cross.tmpl
+++ b/scripts/build/Dockerfile.stable-cross.tmpl
@@ -1,9 +1,8 @@
 COPY scripts/ci/apt-install /bin/apt-install
 
 # Add the cross compiler sources
-RUN echo "deb http://deb.debian.org/debian/ buster main" >> /etc/apt/sources.list && \
-  dpkg --add-architecture ${DEBIAN_ARCH} && \
-  apt-install emdebian-archive-keyring
+RUN echo "deb http://deb.debian.org/debian/ stable main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture ${DEBIAN_ARCH}
 
 RUN apt-install \
 	crossbuild-essential-${DEBIAN_ARCH}	\
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 62e3a9920..a436c2839 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,5 +1,5 @@
 ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
-NON_CLANG := armv7-cross aarch64-cross ppc64-cross mips64el-cross
+NON_CLANG := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross
 CREATE_DOCKERFILES := $(ARCHES) $(NON_CLANG)
 TARGETS := $(ARCHES) alpine archlinux
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)

From d514bacb4083e4fa8ed8d3a96381474a8819a53d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Sat, 4 Dec 2021 16:31:34 +0000
Subject: [PATCH 0813/1854] ci: Run cross compile with debian testing

Debian testing has newer compiler version and running
cross compilation tests would allow us to catch any compilation
errors early.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 .github/workflows/cross-compile.yml           | 11 ++++-
 .../Dockerfile.aarch64-testing-cross.hdr      |  5 +++
 .../Dockerfile.aarch64-testing-cross.tmpl     |  1 +
 .../build/Dockerfile.armv7-testing-cross.hdr  |  6 +++
 .../build/Dockerfile.armv7-testing-cross.tmpl |  1 +
 .../Dockerfile.mips64el-testing-cross.hdr     |  6 +++
 .../Dockerfile.mips64el-testing-cross.tmpl    |  1 +
 .../build/Dockerfile.ppc64-testing-cross.hdr  |  5 +++
 .../build/Dockerfile.ppc64-testing-cross.tmpl |  1 +
 scripts/build/Dockerfile.testing-cross.tmpl   | 42 +++++++++++++++++++
 scripts/build/Makefile                        |  4 +-
 11 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 scripts/build/Dockerfile.aarch64-testing-cross.hdr
 create mode 120000 scripts/build/Dockerfile.aarch64-testing-cross.tmpl
 create mode 100644 scripts/build/Dockerfile.armv7-testing-cross.hdr
 create mode 120000 scripts/build/Dockerfile.armv7-testing-cross.tmpl
 create mode 100644 scripts/build/Dockerfile.mips64el-testing-cross.hdr
 create mode 120000 scripts/build/Dockerfile.mips64el-testing-cross.tmpl
 create mode 100644 scripts/build/Dockerfile.ppc64-testing-cross.hdr
 create mode 120000 scripts/build/Dockerfile.ppc64-testing-cross.tmpl
 create mode 100644 scripts/build/Dockerfile.testing-cross.tmpl

diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index c6745d43e..eec6eb577 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -8,7 +8,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-stable-cross, aarch64-stable-cross, ppc64-stable-cross, mips64el-stable-cross]
+        target: [
+          armv7-stable-cross,
+          armv7-testing-cross,
+          aarch64-stable-cross,
+          aarch64-testing-cross,
+          ppc64-stable-cross,
+          ppc64-testing-cross,
+          mips64el-stable-cross,
+          mips64el-testing-cross
+        ]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/scripts/build/Dockerfile.aarch64-testing-cross.hdr b/scripts/build/Dockerfile.aarch64-testing-cross.hdr
new file mode 100644
index 000000000..c61d2af27
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-testing-cross.hdr
@@ -0,0 +1,5 @@
+FROM docker.io/dockcross/base:latest
+
+ENV ARCH=aarch64
+ENV DEBIAN_ARCH=arm64
+ENV CROSS_TRIPLET=aarch64-linux-gnu
diff --git a/scripts/build/Dockerfile.aarch64-testing-cross.tmpl b/scripts/build/Dockerfile.aarch64-testing-cross.tmpl
new file mode 120000
index 000000000..c1dd38b21
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-testing-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.armv7-testing-cross.hdr b/scripts/build/Dockerfile.armv7-testing-cross.hdr
new file mode 100644
index 000000000..f96dc51f7
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-testing-cross.hdr
@@ -0,0 +1,6 @@
+FROM docker.io/dockcross/base:latest
+
+ENV ARCH=arm
+ENV SUBARCH=armv7
+ENV DEBIAN_ARCH=armhf
+ENV CROSS_TRIPLET=arm-linux-gnueabihf
diff --git a/scripts/build/Dockerfile.armv7-testing-cross.tmpl b/scripts/build/Dockerfile.armv7-testing-cross.tmpl
new file mode 120000
index 000000000..c1dd38b21
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-testing-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.mips64el-testing-cross.hdr b/scripts/build/Dockerfile.mips64el-testing-cross.hdr
new file mode 100644
index 000000000..e78c94aa5
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-testing-cross.hdr
@@ -0,0 +1,6 @@
+FROM dockcross/base:latest
+
+ENV ARCH=mips
+ENV SUBARCH=mips
+ENV DEBIAN_ARCH=mips64el
+ENV CROSS_TRIPLET=mips64el-linux-gnuabi64
diff --git a/scripts/build/Dockerfile.mips64el-testing-cross.tmpl b/scripts/build/Dockerfile.mips64el-testing-cross.tmpl
new file mode 120000
index 000000000..c1dd38b21
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-testing-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64-testing-cross.hdr b/scripts/build/Dockerfile.ppc64-testing-cross.hdr
new file mode 100644
index 000000000..38547ac55
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-testing-cross.hdr
@@ -0,0 +1,5 @@
+FROM dockcross/base:latest
+
+ENV ARCH=ppc64
+ENV DEBIAN_ARCH=ppc64el
+ENV CROSS_TRIPLET=powerpc64le-linux-gnu
diff --git a/scripts/build/Dockerfile.ppc64-testing-cross.tmpl b/scripts/build/Dockerfile.ppc64-testing-cross.tmpl
new file mode 120000
index 000000000..c1dd38b21
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-testing-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.testing-cross.tmpl b/scripts/build/Dockerfile.testing-cross.tmpl
new file mode 100644
index 000000000..1d5565310
--- /dev/null
+++ b/scripts/build/Dockerfile.testing-cross.tmpl
@@ -0,0 +1,42 @@
+COPY scripts/ci/apt-install /bin/apt-install
+
+# Add the cross compiler sources
+RUN echo "deb http://deb.debian.org/debian/ testing main" >> /etc/apt/sources.list && \
+  dpkg --add-architecture ${DEBIAN_ARCH}
+
+RUN apt-install \
+	crossbuild-essential-${DEBIAN_ARCH}	\
+	libc6-dev-${DEBIAN_ARCH}-cross		\
+	libc6-${DEBIAN_ARCH}-cross		\
+	libbz2-dev:${DEBIAN_ARCH}		\
+	libexpat1-dev:${DEBIAN_ARCH}		\
+	ncurses-dev:${DEBIAN_ARCH}		\
+	libssl-dev:${DEBIAN_ARCH}		\
+	protobuf-c-compiler			\
+	protobuf-compiler			\
+	python3-protobuf			\
+	libnl-3-dev:${DEBIAN_ARCH}		\
+	libprotobuf-dev:${DEBIAN_ARCH}		\
+	libnet-dev:${DEBIAN_ARCH}		\
+	libprotobuf-c-dev:${DEBIAN_ARCH}	\
+	libcap-dev:${DEBIAN_ARCH}		\
+	libaio-dev:${DEBIAN_ARCH}		\
+	libnl-route-3-dev:${DEBIAN_ARCH}
+
+ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
+	AS=/usr/bin/${CROSS_TRIPLET}-as				\
+	AR=/usr/bin/${CROSS_TRIPLET}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLET}-gcc			\
+	CPP=/usr/bin/${CROSS_TRIPLET}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLET}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLET}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLET}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLET}/pkgconfig
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index a436c2839..b24fc80ea 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,5 +1,7 @@
 ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
-NON_CLANG := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross
+STABLE_CROSS_ARCHES := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross
+TESTING_CROSS_ARCHES := armv7-testing-cross aarch64-testing-cross ppc64-testing-cross mips64el-testing-cross
+NON_CLANG := $(TESTING_CROSS_ARCHES) $(STABLE_CROSS_ARCHES)
 CREATE_DOCKERFILES := $(ARCHES) $(NON_CLANG)
 TARGETS := $(ARCHES) alpine archlinux
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)

From 4ab2facb24a5ed5814044d0f18c1d6847ab156e9 Mon Sep 17 00:00:00 2001
From: Salvatore Bonaccorso <carnil@debian.org>
Date: Sat, 4 Dec 2021 16:59:51 +0000
Subject: [PATCH 0814/1854] make: Explicitly enable FPU on ARMv7 builds

Starting with gcc-11, Debian's armhf compiler no longer builds with
a default -mfpu= option. Instead it enables the FPU via an extension
to the -march flag (--with-arch=armv7-a+fp). criu's Makefile explicitly
passes its own -march=armv7-a setting, which overrides the +fp default,
so we end up with no FPU:

    cc1: error: '-mfloat-abi=hard': selected architecture lacks an FPU

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 Makefile               | 2 +-
 test/zdtm/Makefile.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8055e05ff..3f12ad3a0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ ifeq ($(ARCH),arm)
         endif
 
         ifeq ($(ARMV),7)
-                USERCFLAGS += -march=armv7-a
+                USERCFLAGS += -march=armv7-a+fp
         endif
 
         ifeq ($(ARMV),8)
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 69154fdc9..d34523315 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -25,7 +25,7 @@ ifeq ($(ARCH),arm)
         ifeq ($(ARMV),6)
                 USERCFLAGS += -march=armv6
         else ifeq ($(ARMV),7)
-                USERCFLAGS += -march=armv7-a
+                USERCFLAGS += -march=armv7-a+fp
         else ifeq ($(ARMV),8)
                 # To build aarch32 on armv8 Travis-CI (see criu Makefile)
                 USERCFLAGS += -march=armv7-a

From a52185ffe3b349389e7dbce206342a3525f2d0d1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 3 Dec 2021 16:48:36 +0000
Subject: [PATCH 0815/1854] ci: disable broken tests until fixed

Broken tests are being tracked at

 * https://github.com/checkpoint-restore/criu/issues/1669
 * https://github.com/checkpoint-restore/criu/issues/1635

This also enables previously disabled BPF related tests:

 * https://github.com/checkpoint-restore/criu/issues/1354

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh      | 6 +++---
 test/jenkins/criu-fault.sh | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 839b100c8..25343f96c 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -50,9 +50,9 @@ fedora-no-vdso() {
 	vagrant reload
 	ssh default cat /proc/cmdline
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
-	# BPF tests are failing see: https://github.com/checkpoint-restore/criu/issues/1354
-	# Needs to be fixed, skip for now
-	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going -x zdtm/static/bpf_hash -x zdtm/static/bpf_array'
+	# Disabling tests which are broken on 5.15
+	# https://github.com/checkpoint-restore/criu/issues/1669
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going -x zdtm/static/socket_close_data -x zdtm/static/socket_close_data01 -x zdtm/static/fifo_upon_unix_socket01 -x zdtm/static/sk-unix-mntns -x zdtm/static/fifo_upon_unix_socket00 -x zdtm/static/socket-ext -x zdtm/static/sk-unix01 -x zdtm/static/socket_dgram_data -x zdtm/static/sockets_dgram -x zdtm/static/sk-unix-dgram-ghost'
 	# This test (pidfd_store_sk) requires pidfd_getfd syscall which is guaranteed in Fedora 33.
 	# It is also skipped from -a because it runs in RPC mode only
 	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2'
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index a8c3a5cf7..bff40aed5 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -28,6 +28,14 @@ fi
 ./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --keep-going --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/static/maps01 --fault 132 -f h || fail
+
+# Error injection with --fault 134 fails on newer CPUs used in Circle CI on EC2
+# Skip the --fault 134 tests
+# https://github.com/checkpoint-restore/criu/issues/1635
+if [ -n "$CIRCLECI" ]; then
+	exit 0
+fi
+
 # 134 is corrupting extended registers set, should run in a sub-thread (fpu03)
 # without restore (that will check if parasite corrupts extended registers)
 ./test/zdtm.py run -t zdtm/static/fpu03 --fault 134 -f h --norst || fail

From 14075baf72808574cde9485e91bc2570e52f5d61 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 5 Dec 2021 16:45:20 +0000
Subject: [PATCH 0816/1854] test: do not use --keep-going for single zdtm tests

Looking at CI logs there are often messages like:

 "[WARNING] Option --keep-going is more useful when running multiple tests"

This commit removes '--keep-going' from single zdtm test runs.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/jenkins/criu-dedup.sh | 10 +++++-----
 test/jenkins/criu-fault.sh | 18 +++++++++---------
 test/jenkins/criu-fcg.sh   | 12 ++++++------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh
index 0041496d8..edb1b653d 100755
--- a/test/jenkins/criu-dedup.sh
+++ b/test/jenkins/criu-dedup.sh
@@ -9,8 +9,8 @@ prep
 # Additionally run these tests as they touch a lot of
 # memory and it makes sense to additionally check it
 # with delays between iterations
-./test/zdtm.py run -t zdtm/transition/maps007 --keep-going --report report -f h --pre 8:.1 --dedup || fail
-./test/zdtm.py run -t zdtm/static/mem-touch   --keep-going --report report -f h --pre 8:.1 --dedup || fail
-./test/zdtm.py run -t zdtm/transition/maps008 --keep-going --report report -f h --pre 8:.1 --dedup || fail
-./test/zdtm.py run -t zdtm/transition/maps007 --keep-going --report report -f h --pre 8:.1 --noauto-dedup || fail
-./test/zdtm.py run -t zdtm/static/mem-touch   --keep-going --report report -f h --pre 8:.1 --noauto-dedup || fail
+./test/zdtm.py run -t zdtm/transition/maps007 --report report -f h --pre 8:.1 --dedup || fail
+./test/zdtm.py run -t zdtm/static/mem-touch   --report report -f h --pre 8:.1 --dedup || fail
+./test/zdtm.py run -t zdtm/transition/maps008 --report report -f h --pre 8:.1 --dedup || fail
+./test/zdtm.py run -t zdtm/transition/maps007 --report report -f h --pre 8:.1 --noauto-dedup || fail
+./test/zdtm.py run -t zdtm/static/mem-touch   --report report -f h --pre 8:.1 --noauto-dedup || fail
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index bff40aed5..0c5c180e9 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -4,10 +4,10 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run -t zdtm/static/env00 --fault 1 --keep-going --report report -f h || fail
-./test/zdtm.py run -t zdtm/static/unlink_fstat00 --fault 2 --keep-going --report report -f h || fail
-./test/zdtm.py run -t zdtm/static/maps00 --fault 3 --keep-going --report report -f h || fail
-./test/zdtm.py run -t zdtm/static/inotify_irmap --fault 128 --keep-going --pre 2 -f uns || fail
+./test/zdtm.py run -t zdtm/static/env00 --fault 1 --report report -f h || fail
+./test/zdtm.py run -t zdtm/static/unlink_fstat00 --fault 2 --report report -f h || fail
+./test/zdtm.py run -t zdtm/static/maps00 --fault 3 --report report -f h || fail
+./test/zdtm.py run -t zdtm/static/inotify_irmap --fault 128 --pre 2 -f uns || fail
 ./test/zdtm.py run -t zdtm/static/env00 --fault 129 -f uns || fail
 ./test/zdtm.py run -t zdtm/transition/fork --fault 130 -f h || fail
 ./test/zdtm.py run -t zdtm/static/vdso01 --fault 127 || fail
@@ -17,16 +17,16 @@ if [ "${COMPAT_TEST}" != "y" ] ; then
 	./test/zdtm.py run -t zdtm/static/vdso01 --fault 133 -f h || fail
 fi
 
-./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 2 --keep-going --report report || fail
-./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 4 --keep-going --report report || fail
+./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 2 --report report || fail
+./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 4 --report report || fail
 
 ./test/zdtm.py run -t zdtm/static/mntns_ghost --fault 6 --report report || fail
 ./test/zdtm.py run -t zdtm/static/mntns_link_remap --fault 6 --report report || fail
 ./test/zdtm.py run -t zdtm/static/unlink_fstat03 --fault 6 --report report || fail
 
-./test/zdtm.py run -t zdtm/static/env00 --fault 5 --keep-going --report report || fail
-./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --keep-going --report report --pre 2:1 || fail
-./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --keep-going --report report --pre 2:1 || fail
+./test/zdtm.py run -t zdtm/static/env00 --fault 5 --report report || fail
+./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --report report --pre 2:1 || fail
+./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/static/maps01 --fault 132 -f h || fail
 
 # Error injection with --fault 134 fails on newer CPUs used in Circle CI on EC2
diff --git a/test/jenkins/criu-fcg.sh b/test/jenkins/criu-fcg.sh
index ca5054f5e..81395b7ba 100755
--- a/test/jenkins/criu-fcg.sh
+++ b/test/jenkins/criu-fcg.sh
@@ -6,10 +6,10 @@ source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
 
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:f || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:f --pre 3 || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:f --norst || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:f || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:f --pre 3 || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:f --norst || fail
 
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:t || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:t --pre 3 || fail
-./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --keep-going --report report --freezecg zdtm:t --norst || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:t || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:t --pre 3 || fail
+./test/zdtm.py run -t zdtm/transition/thread-bomb -f h --report report --freezecg zdtm:t --norst || fail

From d57f27bc94f2af4d6f4a8f9d0822a071036bebf6 Mon Sep 17 00:00:00 2001
From: ianlang <ianlang@tencent.com>
Date: Fri, 3 Dec 2021 15:15:30 +0800
Subject: [PATCH 0817/1854] files-reg: try dump_ghost_remap if link-remap
 failed with error ENOENT

An issue with dumping deleted reg files in overlayfs:

After deleting a file originated from lower layer in merged dir,
fstat() on the /proc/$pid/map_files symlink returns st_nlink=1, while
linkat() fails with errno ENOENT.

Signed-off-by: langyenan <ianlang@tencent.com>
---
 criu/files-reg.c        | 42 +++++++++++++++++++++++++++++++++++------
 criu/include/fs-magic.h |  4 ++++
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 57403d2c6..6759e00e5 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -959,7 +959,25 @@ void free_link_remaps(void)
 }
 static int linkat_hard(int odir, char *opath, int ndir, char *npath, uid_t uid, gid_t gid, int flags);
 
-static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_id *nsid, const struct stat *st)
+static void check_overlayfs_fallback(char *path, const struct fd_parms *parms, bool *fallback)
+{
+	if (!fallback || parms->fs_type != OVERLAYFS_SUPER_MAGIC)
+		return;
+
+	/*
+	 * In overlayFS, linkat() fails with ENOENT if the removed file is
+	 * originated from lower layer. The cause of failure is that linkat()
+	 * sees the file has st_nlink=0, which is different than st_nlink=1 we
+	 * got from earlier fstat() on lfd. By setting *fb=true, we will fall
+	 * back to dump_ghost_remap() as it is what should have been done to
+	 * removed files with st_nlink=0.
+	 */
+	pr_info("Unable to link-remap %s on overlayFS, fall back to dump_ghost_remap\n", path);
+	*fallback = true;
+}
+
+static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_id *nsid, const struct fd_parms *parms,
+			     bool *fallback)
 {
 	char link_name[PATH_MAX], *tmp;
 	FileEntry fe = FILE_ENTRY__INIT;
@@ -967,6 +985,7 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_i
 	FownEntry fwn = FOWN_ENTRY__INIT;
 	int mntns_root;
 	int ret;
+	const struct stat *ost = &parms->stat;
 
 	if (!opts.link_remap_ok) {
 		pr_err("Can't create link remap for %s. "
@@ -1005,11 +1024,12 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_i
 	mntns_root = mntns_get_root_fd(nsid);
 
 again:
-	ret = linkat_hard(lfd, "", mntns_root, link_name, st->st_uid, st->st_gid, AT_EMPTY_PATH);
+	ret = linkat_hard(lfd, "", mntns_root, link_name, ost->st_uid, ost->st_gid, AT_EMPTY_PATH);
 	if (ret < 0 && errno == ENOENT) {
 		/* Use grand parent, if parent directory does not exist. */
 		if (trim_last_parent(link_name) < 0) {
 			pr_err("trim failed: @%s@\n", link_name);
+			check_overlayfs_fallback(path, parms, fallback);
 			return -1;
 		}
 		goto again;
@@ -1028,12 +1048,13 @@ again:
 	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
 }
 
-static int dump_linked_remap(char *path, int len, const struct stat *ost, int lfd, u32 id, struct ns_id *nsid)
+static int dump_linked_remap(char *path, int len, const struct fd_parms *parms, int lfd, u32 id, struct ns_id *nsid,
+			     bool *fallback)
 {
 	u32 lid;
 	RemapFilePathEntry rpe = REMAP_FILE_PATH_ENTRY__INIT;
 
-	if (create_link_remap(path, len, lfd, &lid, nsid, ost))
+	if (create_link_remap(path, len, lfd, &lid, nsid, parms, fallback))
 		return -1;
 
 	rpe.orig_id = id;
@@ -1150,6 +1171,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 	struct stat pst;
 	const struct stat *ost = &parms->stat;
 	int flags = 0;
+	bool fallback = false;
 
 	if (parms->fs_type == PROC_SUPER_MAGIC) {
 		/* The file points to /proc/pid/<foo> where pid is a dead
@@ -1239,7 +1261,7 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 		 * links on it) to have some persistent name at hands.
 		 */
 		pr_debug("Dump silly-rename linked remap for %x\n", id);
-		return dump_linked_remap(rpath + 1, plen - 1, ost, lfd, id, nsid);
+		return dump_linked_remap(rpath + 1, plen - 1, parms, lfd, id, nsid, NULL);
 	}
 
 	mntns_root = mntns_get_root_fd(nsid);
@@ -1260,7 +1282,15 @@ static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
 
 		if (errno == ENOENT) {
 			link_strip_deleted(link);
-			return dump_linked_remap(rpath + 1, plen - 1, ost, lfd, id, nsid);
+			ret = dump_linked_remap(rpath + 1, plen - 1, parms, lfd, id, nsid, &fallback);
+			if (ret < 0 && fallback) {
+				/* fallback is true only if following conditions are true:
+				 * 1. linkat() inside dump_linked_remap() failed with ENOENT
+				 * 2. parms->fs_type == overlayFS
+				 */
+				return dump_ghost_remap(rpath + 1, ost, lfd, id, nsid);
+			}
+			return ret;
 		}
 
 		pr_perror("Can't stat path");
diff --git a/criu/include/fs-magic.h b/criu/include/fs-magic.h
index 46ac8aa27..ad34f4891 100644
--- a/criu/include/fs-magic.h
+++ b/criu/include/fs-magic.h
@@ -53,4 +53,8 @@
 #define AUTOFS_SUPER_MAGIC 0x0187
 #endif
 
+#ifndef OVERLAYFS_SUPER_MAGIC
+#define OVERLAYFS_SUPER_MAGIC 0x794c7630
+#endif
+
 #endif /* __CR_FS_MAGIC_H__ */

From 6930d6a32d672a6ccca9f29d9db1fdce4651dba5 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 7 Dec 2021 09:10:14 +0000
Subject: [PATCH 0818/1854] util: make page-server IPv6 safe

The function run_tcp_server() was the last place CRIU was still using
the IPv4 only function inet_ntoa(). It was only used during a print, so
that it did not really break anything, but with this commit the output
is now no longer:

 Accepted connection from 0.0.0.0:58396

but correctly displaying the IPv6 address

 Accepted connection from ::1:58398

if connecting via IPv6.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/util.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/criu/util.c b/criu/util.c
index 2917102fd..822822186 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1107,7 +1107,7 @@ out:
 int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk)
 {
 	int ret;
-	struct sockaddr_in caddr;
+	struct sockaddr_storage caddr;
 	socklen_t clen = sizeof(caddr);
 
 	if (daemon_mode) {
@@ -1135,13 +1135,20 @@ int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk)
 		return -1;
 
 	if (sk >= 0) {
+		char port[6];
+		char address[INET6_ADDRSTRLEN];
 		*ask = accept(sk, (struct sockaddr *)&caddr, &clen);
 		if (*ask < 0) {
 			pr_perror("Can't accept connection to server");
 			goto err;
-		} else
-			pr_info("Accepted connection from %s:%u\n", inet_ntoa(caddr.sin_addr),
-				(int)ntohs(caddr.sin_port));
+		}
+		ret = getnameinfo((struct sockaddr *)&caddr, clen, address, sizeof(address), port, sizeof(port),
+				  NI_NUMERICHOST | NI_NUMERICSERV);
+		if (ret) {
+			pr_err("Failed converting address: %s\n", gai_strerror(ret));
+			goto err;
+		}
+		pr_info("Accepted connection from %s:%s\n", address, port);
 		close(sk);
 	}
 

From 94111596f8d8ae5e55e313cba1eb1b76c6c2607d Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 2 Dec 2021 23:01:33 +0700
Subject: [PATCH 0819/1854] sk-unix: Fix TCP_ESTABLISHED checks in unix sockets

Since commit 83301b5367a98 ("af_unix: Set TCP_ESTABLISHED for datagram sockets
too") in Linux kernel, SOCK_DGRAM unix sockets can have TCP_ESTABLISHED state
when connected. So we need to fix checks that assume SOCK_DRAM sockets cannot
have TCP_ESTABLISHED state.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/sk-unix.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index a819473b4..d3402c3ac 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -460,7 +460,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 			pr_warn("Shutdown mismatch %u:%d -> %u:%d\n", ue->ino, ue->shutdown, peer->sd.ino,
 				peer->shutdown);
 		}
-	} else if (ue->state == TCP_ESTABLISHED) {
+	} else if (ue->state == TCP_ESTABLISHED && ue->type != SOCK_DGRAM) {
 		const struct unix_sk_listen_icon *e;
 
 		e = lookup_unix_listen_icons(ue->ino);
@@ -1851,14 +1851,10 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 
 		close(sks[1]);
 		sk = sks[0];
-	} else if (ui->ue->state == TCP_ESTABLISHED && queuer && queuer->ue->ino == FAKE_INO) {
+	} else if ((ui->ue->state == TCP_ESTABLISHED && ui->ue->type == SOCK_STREAM) && queuer &&
+		   queuer->ue->ino == FAKE_INO) {
 		int ret, sks[2];
 
-		if (ui->ue->type != SOCK_STREAM) {
-			pr_err("Non-stream socket %u in established state\n", ui->ue->ino);
-			return -1;
-		}
-
 		if (ui->ue->shutdown != SK_SHUTDOWN__BOTH) {
 			pr_err("Wrong shutdown/peer state for %u\n", ui->ue->ino);
 			return -1;

From 3eba68089e11b11b07b5aa94c7b60305d9c0cf5f Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 7 Dec 2021 23:40:12 +0700
Subject: [PATCH 0820/1854] ci: Enable disabled unix socket related tests

As the unix socket broken tests have been fixed in the pull request

https://github.com/checkpoint-restore/criu/pull/1680

We re-enable these tests.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 scripts/ci/vagrant.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 25343f96c..40c8416e1 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -50,9 +50,7 @@ fedora-no-vdso() {
 	vagrant reload
 	ssh default cat /proc/cmdline
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
-	# Disabling tests which are broken on 5.15
-	# https://github.com/checkpoint-restore/criu/issues/1669
-	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going -x zdtm/static/socket_close_data -x zdtm/static/socket_close_data01 -x zdtm/static/fifo_upon_unix_socket01 -x zdtm/static/sk-unix-mntns -x zdtm/static/fifo_upon_unix_socket00 -x zdtm/static/socket-ext -x zdtm/static/sk-unix01 -x zdtm/static/socket_dgram_data -x zdtm/static/sockets_dgram -x zdtm/static/sk-unix-dgram-ghost'
+	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going'
 	# This test (pidfd_store_sk) requires pidfd_getfd syscall which is guaranteed in Fedora 33.
 	# It is also skipped from -a because it runs in RPC mode only
 	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2'

From d79d73e3a07045646954dbc8860b9484caef5181 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Fri, 10 Dec 2021 15:35:29 +0000
Subject: [PATCH 0821/1854] ci: install procps in Alpine

The version of ps in Alpine image by default is very limited.
It is based on the one from busybox and doesn't support options
such as '-p'.

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 scripts/build/Dockerfile.alpine | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index a6579c0bb..cab72e8a1 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -6,6 +6,7 @@ RUN apk update && apk add \
 	bash \
 	build-base \
 	coreutils \
+	procps \
 	git \
 	gnutls-dev \
 	libaio-dev \

From 6186bfa0c7fc90131634e1f26826208e6afb60a4 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 3 Dec 2021 16:59:56 +0000
Subject: [PATCH 0822/1854] test: another try to correctly fix the kernel
 version

We try to disable time namespace based testing for kernels older than
5.11. But we fail to come up with the correct if condition.

This changes (major <= 5) to (major < 5). There are no kernels with
major > 5 so currently the time namespace based are never run. This
should finally change it to run time namespace based tests on kernel
versions newer than 5.10.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm_ct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index e8d45a9e7..e4b17a512 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -61,7 +61,7 @@ static int create_timens()
 	if (sscanf(buf.release, "%u.%u", &major, &minor) != 2)
 		return -1;
 
-	if ((major <= 5) || (major == 5 && minor < 11)) {
+	if ((major < 5) || (major == 5 && minor < 11)) {
 		fprintf(stderr, "timens isn't supported on %s\n", buf.release);
 		return 0;
 	}

From fc1eb01ff3eb5efbe93e3f1ae582520f1bdd32a2 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 13 Dec 2021 15:19:50 +0300
Subject: [PATCH 0823/1854] x86/compel/fault-inject: bound xsave features set

Since
e2e8be37 ("x86/compel/fault-inject: Add a fault-injection for corrupting extended regset")
we doing fault-injection test for C/R of threads register set by filling tasks
xsave structures with the garbage. But there are some features for which that's not
safe. It leads to failures like described in #1635

In this particular case we meet the problem with PKRU feature, the problem
that after corrupting pkru registers we may restrict access to some vma areas,
so, after that process with the parasite injected get's segfault and crashes.

Let's manually specify which features is save to fill with the garbage by
keeping proper XFEATURE_MASK_FAULTINJ mask value.

Fixes: e2e8be37 ("x86/compel/fault-inject: Add a fault-injection for corrupting extended regset")

https://github.com/checkpoint-restore/criu/issues/1635

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 compel/arch/x86/src/lib/include/uapi/asm/fpu.h | 5 +++++
 compel/arch/x86/src/lib/infect.c               | 1 +
 2 files changed, 6 insertions(+)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index a16b658af..c8ebda097 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -80,6 +80,11 @@ enum xfeature {
 	(XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | XFEATURE_MASK_OPMASK | XFEATURE_MASK_ZMM_Hi256 | \
 	 XFEATURE_MASK_Hi16_ZMM | XFEATURE_MASK_PKRU | XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)
 
+/* xsave structure features which is safe to fill with garbage (see validate_random_xstate()) */
+#define XFEATURE_MASK_FAULTINJ                                                                                       \
+	(XFEATURE_MASK_FP | XFEATURE_MASK_SSE | XFEATURE_MASK_YMM | XFEATURE_MASK_OPMASK | XFEATURE_MASK_ZMM_Hi256 | \
+	 XFEATURE_MASK_Hi16_ZMM)
+
 struct fpx_sw_bytes {
 	uint32_t magic1;
 	uint32_t extended_size;
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 2f6c557d0..37b0ee327 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -254,6 +254,7 @@ static void validate_random_xstate(struct xsave_struct *xsave)
 	/* No unknown or supervisor features may be set */
 	hdr->xstate_bv &= XFEATURE_MASK_USER;
 	hdr->xstate_bv &= ~XFEATURE_MASK_SUPERVISOR;
+	hdr->xstate_bv &= XFEATURE_MASK_FAULTINJ;
 
 	for (i = 0; i < XFEATURE_MAX; i++) {
 		if (!compel_fpu_has_feature(i))

From 1ba443982ab37b94c598f9df8cd23b15f5e10bd2 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 13 Dec 2021 15:32:00 +0300
Subject: [PATCH 0824/1854] x86/compel/fault-inject: print the initial seed

Fixes: e2e8be37 ("x86/compel/fault-inject: Add a fault-injection for corrupting extended regset")

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 compel/arch/x86/src/lib/infect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 37b0ee327..de9013c27 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -283,10 +283,10 @@ static int corrupt_extregs(pid_t pid)
 	bool use_xsave = compel_cpu_has_feature(X86_FEATURE_OSXSAVE);
 	user_fpregs_struct_t ext_regs;
 	int *rand_to = (int *)&ext_regs;
-	unsigned int seed;
+	unsigned int seed, init_seed;
 	size_t i;
 
-	seed = time(NULL);
+	init_seed = seed = time(NULL);
 	for (i = 0; i < sizeof(ext_regs) / sizeof(int); i++)
 		*rand_to++ = rand_r(&seed);
 
@@ -296,7 +296,7 @@ static int corrupt_extregs(pid_t pid)
 	 *  - zdtm.py will grep it auto-magically from logs
 	 *    (and the seed will be known from an automatical testing)
 	 */
-	pr_err("Corrupting %s for %d, seed %u\n", use_xsave ? "xsave" : "fpuregs", pid, seed);
+	pr_err("Corrupting %s for %d, seed %u\n", use_xsave ? "xsave" : "fpuregs", pid, init_seed);
 
 	if (!use_xsave) {
 		if (ptrace(PTRACE_SETFPREGS, pid, NULL, &ext_regs)) {

From 583e8ca0559205bc457cce8d7c5655ae0e3a1319 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 13 Dec 2021 15:46:47 +0300
Subject: [PATCH 0825/1854] ci: enable x86 xsave fault injection tests back

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/jenkins/criu-fault.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 0c5c180e9..9f20091cc 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -28,14 +28,6 @@ fi
 ./test/zdtm.py run -t zdtm/static/maps04 --fault 131 --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/transition/maps008 --fault 131 --report report --pre 2:1 || fail
 ./test/zdtm.py run -t zdtm/static/maps01 --fault 132 -f h || fail
-
-# Error injection with --fault 134 fails on newer CPUs used in Circle CI on EC2
-# Skip the --fault 134 tests
-# https://github.com/checkpoint-restore/criu/issues/1635
-if [ -n "$CIRCLECI" ]; then
-	exit 0
-fi
-
 # 134 is corrupting extended registers set, should run in a sub-thread (fpu03)
 # without restore (that will check if parasite corrupts extended registers)
 ./test/zdtm.py run -t zdtm/static/fpu03 --fault 134 -f h --norst || fail

From efe5d9a12df7d52561feeb361769247300075f97 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Tue, 14 Dec 2021 12:54:19 +0000
Subject: [PATCH 0826/1854] Add documentation for --timeout option

The --timeout option was introduced in [1] to prevent criu dump from
being able to hang indefinitely and allow users to adjust the time limit
in seconds for collecting tasks during the dump operation.

[1] https://github.com/checkpoint-restore/criu/commit/d0ff730

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 Documentation/criu.txt | 4 ++++
 criu/crtools.c         | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 4c6885fc9..f41b1898c 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -367,6 +367,10 @@ mount -t cgroup -o devices,freezer none devices,freezer
     Allows to link unlinked files back, if possible (modifies filesystem
     during *restore*).
 
+*--timeout* 'number'::
+    Set a time limit in seconds for collecting tasks during the
+    dump operation. The timeout is 10 seconds by default.
+
 *--ghost-limit* 'size'::
     Set the maximum size of deleted file to be carried inside image.
     By default, up to 1M file is allowed. Using this
diff --git a/criu/crtools.c b/criu/crtools.c
index 81c0aa963..da47bd684 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -391,6 +391,8 @@ usage:
 	       "  -j|--" OPT_SHELL_JOB "        allow one to dump and restore shell jobs\n"
 	       "  -l|--" OPT_FILE_LOCKS "       handle file locks, for safety, only used for container\n"
 	       "  -L|--libdir           path to a plugin directory (by default " CR_PLUGIN_DEFAULT ")\n"
+	       "  --timeout NUM         a timeout (in seconds) on collecting tasks during dump\n"
+	       "                        (default 10 seconds)\n"
 	       "  --force-irmap         force resolving names for inotify/fsnotify watches\n"
 	       "  --irmap-scan-path FILE\n"
 	       "                        add a path the irmap hints to scan\n"

From af298353dc200f596051c29cf7c3477f87d6cf04 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Tue, 14 Dec 2021 08:19:16 -0800
Subject: [PATCH 0827/1854] usernsd: UNS_FDOUT should not require an input
 descriptor

UNS_FDOUT means only that a userns call will return a file descriptor.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/namespaces.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 7fa58682b..c36e631cf 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1330,11 +1330,6 @@ static int usernsd(int sk)
 		unsc_msg_pid_fd(&um, &pid, &fd);
 		pr_debug("uns: daemon calls %p (%d, %d, %x)\n", call, pid, fd, flags);
 
-		if (fd < 0 && flags & UNS_FDOUT) {
-			pr_err("uns: bad flags/fd %p %d %x\n", call, fd, flags);
-			BUG();
-		}
-
 		/*
 		 * Caller has sent us bare address of the routine it
 		 * wants to call. Since the caller is fork()-ed from the

From 0e04a3c6a6f0aec894b62984308693270ddf356c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 1 Dec 2021 11:08:53 +0000
Subject: [PATCH 0828/1854] libcriu: add setting lsm-mount-context to libcriu

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/c/criu.c | 15 +++++++++++++++
 lib/c/criu.h |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index ddc6e0731..4ee189aca 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -238,6 +238,7 @@ void criu_local_free_opts(criu_opts *opts)
 	free(opts->rpc->freeze_cgroup);
 	free(opts->rpc->log_file);
 	free(opts->rpc->lsm_profile);
+	free(opts->rpc->lsm_mount_context);
 	free(opts->rpc);
 	criu_free_service(opts);
 	free(opts);
@@ -651,6 +652,20 @@ int criu_set_lsm_profile(const char *name)
 	return criu_local_set_lsm_profile(global_opts, name);
 }
 
+int criu_local_set_lsm_mount_context(criu_opts *opts, const char *name)
+{
+	opts->rpc->lsm_mount_context = strdup(name);
+	if (opts->rpc->lsm_mount_context == NULL) {
+		return -ENOMEM;
+	}
+	return 0;
+}
+
+int criu_set_lsm_mount_context(const char *name)
+{
+	return criu_local_set_lsm_mount_context(global_opts, name);
+}
+
 void criu_local_set_timeout(criu_opts *opts, unsigned int timeout)
 {
 	opts->rpc->timeout = timeout;
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 949902f55..a374b37f8 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -92,6 +92,7 @@ void criu_set_manage_cgroups(bool manage);
 void criu_set_manage_cgroups_mode(enum criu_cg_mode mode);
 int criu_set_freeze_cgroup(const char *name);
 int criu_set_lsm_profile(const char *name);
+int criu_set_lsm_mount_context(const char *name);
 void criu_set_timeout(unsigned int timeout);
 void criu_set_auto_ext_mnt(bool val);
 void criu_set_ext_sharing(bool val);
@@ -249,6 +250,7 @@ void criu_local_set_manage_cgroups(criu_opts *opts, bool manage);
 void criu_local_set_manage_cgroups_mode(criu_opts *opts, enum criu_cg_mode mode);
 int criu_local_set_freeze_cgroup(criu_opts *opts, const char *name);
 int criu_local_set_lsm_profile(criu_opts *opts, const char *name);
+int criu_local_set_lsm_mount_context(criu_opts *opts, const char *name);
 void criu_local_set_timeout(criu_opts *opts, unsigned int timeout);
 void criu_local_set_auto_ext_mnt(criu_opts *opts, bool val);
 void criu_local_set_ext_sharing(criu_opts *opts, bool val);

From 9fd000c58d41b99687eb9ae0279cf11896477977 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 18 Dec 2021 17:25:17 +0000
Subject: [PATCH 0829/1854] ci: use unstable release for cross-compile

We added cross-compile tests with testing debian release to be able to
replicate the error reported in #1653, however, installing build
dependencies in this release currently fails with the following error:

libc6-dev:armhf : Breaks: libc6-dev-armhf-cross (< 2.33~) but 2.32-1cross4 is to be installed

This is not something we can fix, therefore using the debian unstable
release (instead of testing) could be more reliable option for our CI.
This would still replicate the problem reported in #1653.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/cross-compile.yml                       | 8 ++++----
 scripts/build/Dockerfile.aarch64-testing-cross.tmpl       | 1 -
 ...ng-cross.hdr => Dockerfile.aarch64-unstable-cross.hdr} | 0
 scripts/build/Dockerfile.aarch64-unstable-cross.tmpl      | 1 +
 scripts/build/Dockerfile.armv7-testing-cross.tmpl         | 1 -
 ...ting-cross.hdr => Dockerfile.armv7-unstable-cross.hdr} | 0
 scripts/build/Dockerfile.armv7-unstable-cross.tmpl        | 1 +
 scripts/build/Dockerfile.mips64el-testing-cross.tmpl      | 1 -
 ...g-cross.hdr => Dockerfile.mips64el-unstable-cross.hdr} | 0
 scripts/build/Dockerfile.mips64el-unstable-cross.tmpl     | 1 +
 scripts/build/Dockerfile.ppc64-testing-cross.tmpl         | 1 -
 ...ting-cross.hdr => Dockerfile.ppc64-unstable-cross.hdr} | 0
 scripts/build/Dockerfile.ppc64-unstable-cross.tmpl        | 1 +
 ....testing-cross.tmpl => Dockerfile.unstable-cross.tmpl} | 2 +-
 scripts/build/Makefile                                    | 4 ++--
 15 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 120000 scripts/build/Dockerfile.aarch64-testing-cross.tmpl
 rename scripts/build/{Dockerfile.aarch64-testing-cross.hdr => Dockerfile.aarch64-unstable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.aarch64-unstable-cross.tmpl
 delete mode 120000 scripts/build/Dockerfile.armv7-testing-cross.tmpl
 rename scripts/build/{Dockerfile.armv7-testing-cross.hdr => Dockerfile.armv7-unstable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.armv7-unstable-cross.tmpl
 delete mode 120000 scripts/build/Dockerfile.mips64el-testing-cross.tmpl
 rename scripts/build/{Dockerfile.mips64el-testing-cross.hdr => Dockerfile.mips64el-unstable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.mips64el-unstable-cross.tmpl
 delete mode 120000 scripts/build/Dockerfile.ppc64-testing-cross.tmpl
 rename scripts/build/{Dockerfile.ppc64-testing-cross.hdr => Dockerfile.ppc64-unstable-cross.hdr} (100%)
 create mode 120000 scripts/build/Dockerfile.ppc64-unstable-cross.tmpl
 rename scripts/build/{Dockerfile.testing-cross.tmpl => Dockerfile.unstable-cross.tmpl} (93%)

diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index eec6eb577..461a6e618 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -10,13 +10,13 @@ jobs:
       matrix:
         target: [
           armv7-stable-cross,
-          armv7-testing-cross,
+          armv7-unstable-cross,
           aarch64-stable-cross,
-          aarch64-testing-cross,
+          aarch64-unstable-cross,
           ppc64-stable-cross,
-          ppc64-testing-cross,
+          ppc64-unstable-cross,
           mips64el-stable-cross,
-          mips64el-testing-cross
+          mips64el-unstable-cross
         ]
 
     steps:
diff --git a/scripts/build/Dockerfile.aarch64-testing-cross.tmpl b/scripts/build/Dockerfile.aarch64-testing-cross.tmpl
deleted file mode 120000
index c1dd38b21..000000000
--- a/scripts/build/Dockerfile.aarch64-testing-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.aarch64-testing-cross.hdr b/scripts/build/Dockerfile.aarch64-unstable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.aarch64-testing-cross.hdr
rename to scripts/build/Dockerfile.aarch64-unstable-cross.hdr
diff --git a/scripts/build/Dockerfile.aarch64-unstable-cross.tmpl b/scripts/build/Dockerfile.aarch64-unstable-cross.tmpl
new file mode 120000
index 000000000..955ae1fd4
--- /dev/null
+++ b/scripts/build/Dockerfile.aarch64-unstable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.unstable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.armv7-testing-cross.tmpl b/scripts/build/Dockerfile.armv7-testing-cross.tmpl
deleted file mode 120000
index c1dd38b21..000000000
--- a/scripts/build/Dockerfile.armv7-testing-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.armv7-testing-cross.hdr b/scripts/build/Dockerfile.armv7-unstable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.armv7-testing-cross.hdr
rename to scripts/build/Dockerfile.armv7-unstable-cross.hdr
diff --git a/scripts/build/Dockerfile.armv7-unstable-cross.tmpl b/scripts/build/Dockerfile.armv7-unstable-cross.tmpl
new file mode 120000
index 000000000..955ae1fd4
--- /dev/null
+++ b/scripts/build/Dockerfile.armv7-unstable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.unstable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.mips64el-testing-cross.tmpl b/scripts/build/Dockerfile.mips64el-testing-cross.tmpl
deleted file mode 120000
index c1dd38b21..000000000
--- a/scripts/build/Dockerfile.mips64el-testing-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.mips64el-testing-cross.hdr b/scripts/build/Dockerfile.mips64el-unstable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.mips64el-testing-cross.hdr
rename to scripts/build/Dockerfile.mips64el-unstable-cross.hdr
diff --git a/scripts/build/Dockerfile.mips64el-unstable-cross.tmpl b/scripts/build/Dockerfile.mips64el-unstable-cross.tmpl
new file mode 120000
index 000000000..955ae1fd4
--- /dev/null
+++ b/scripts/build/Dockerfile.mips64el-unstable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.unstable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64-testing-cross.tmpl b/scripts/build/Dockerfile.ppc64-testing-cross.tmpl
deleted file mode 120000
index c1dd38b21..000000000
--- a/scripts/build/Dockerfile.ppc64-testing-cross.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-Dockerfile.testing-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.ppc64-testing-cross.hdr b/scripts/build/Dockerfile.ppc64-unstable-cross.hdr
similarity index 100%
rename from scripts/build/Dockerfile.ppc64-testing-cross.hdr
rename to scripts/build/Dockerfile.ppc64-unstable-cross.hdr
diff --git a/scripts/build/Dockerfile.ppc64-unstable-cross.tmpl b/scripts/build/Dockerfile.ppc64-unstable-cross.tmpl
new file mode 120000
index 000000000..955ae1fd4
--- /dev/null
+++ b/scripts/build/Dockerfile.ppc64-unstable-cross.tmpl
@@ -0,0 +1 @@
+Dockerfile.unstable-cross.tmpl
\ No newline at end of file
diff --git a/scripts/build/Dockerfile.testing-cross.tmpl b/scripts/build/Dockerfile.unstable-cross.tmpl
similarity index 93%
rename from scripts/build/Dockerfile.testing-cross.tmpl
rename to scripts/build/Dockerfile.unstable-cross.tmpl
index 1d5565310..dacfd96ef 100644
--- a/scripts/build/Dockerfile.testing-cross.tmpl
+++ b/scripts/build/Dockerfile.unstable-cross.tmpl
@@ -1,7 +1,7 @@
 COPY scripts/ci/apt-install /bin/apt-install
 
 # Add the cross compiler sources
-RUN echo "deb http://deb.debian.org/debian/ testing main" >> /etc/apt/sources.list && \
+RUN echo "deb http://deb.debian.org/debian/ unstable main" >> /etc/apt/sources.list && \
   dpkg --add-architecture ${DEBIAN_ARCH}
 
 RUN apt-install \
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index b24fc80ea..2c006ad87 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,7 +1,7 @@
 ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
 STABLE_CROSS_ARCHES := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross
-TESTING_CROSS_ARCHES := armv7-testing-cross aarch64-testing-cross ppc64-testing-cross mips64el-testing-cross
-NON_CLANG := $(TESTING_CROSS_ARCHES) $(STABLE_CROSS_ARCHES)
+UNSTABLE_CROSS_ARCHES := armv7-unstable-cross aarch64-unstable-cross ppc64-unstable-cross mips64el-unstable-cross
+NON_CLANG := $(UNSTABLE_CROSS_ARCHES) $(STABLE_CROSS_ARCHES)
 CREATE_DOCKERFILES := $(ARCHES) $(NON_CLANG)
 TARGETS := $(ARCHES) alpine archlinux
 TARGETS_CLANG := $(addsuffix $(TARGETS),-clang)

From 119a7988568ede335ce03d86ef404b4ea6820b62 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 17 Dec 2021 03:01:49 +0000
Subject: [PATCH 0830/1854] ci: disable glibc rseq support

This patch sets the glibc.pthread.rseq tunable [1] to disable rseq
support in glibc as a temporary solution for the problem described in
[2]. This would allow us to run CI tests until CRIU has rseq support.

This commit also disables the rpc tests as they fail even
when GLIBC_TUNABLES is set.

[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=e3e589829d16af9f7e73c7b70f74f3c5d5003e45
[2] https://github.com/checkpoint-restore/criu/issues/1696

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.fedora.tmpl | 3 +++
 scripts/ci/run-ci-tests.sh           | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 9d3bb0f87..fd4ba4aef 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -1,5 +1,8 @@
 ARG CC=gcc
 
+# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696
+ENV GLIBC_TUNABLES=glibc.pthread.rseq=0
+
 COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
 RUN /bin/prepare-for-fedora-rawhide.sh
 
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 096f907fb..bf7331142 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -235,7 +235,12 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run
 fi
-make -C test/others/rpc/ run
+
+# FIXME: rpc tests fail even with set glibc tunable
+# https://github.com/checkpoint-restore/criu/issues/1696
+if [ "$GLIBC_TUNABLES" != "glibc.pthread.rseq=0" ]; then
+	make -C test/others/rpc/ run
+fi
 
 ./test/zdtm.py run -t zdtm/static/env00 --sibling
 

From 51a1adbc03f1860881721d4fe2094e4f6a229203 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 3 Dec 2021 14:32:33 +0000
Subject: [PATCH 0831/1854] libcriu: add single pre-dump support

In contrast to the CLI it is not possible to do a single pre-dump via
RPC and thus libcriu. In cr-service.c pre-dump always goes into a
pre-dump loop followed by a final dump. runc already works around this
to only do a single pre-dump by killing the CRIU process waiting for the
message for the final dump.

Trying to implement pre-dump in crun via libcriu it is not as easy to
work around CRIU's pre-dump loop expectations as with runc that directly
talks to CRIU via RPC.

We know that LXC/LXD also does single pre-dumps using the CLI and runc
also only does single pre-dumps by misusing the pre-dump loop interface.

With this commit it is possible to trigger a single pre-dump via RPC and
libcriu without misusing the interface provided via cr-service.c. So
this commit basically updates CRIU to the existing use cases.

The existing pre-dump loop still sounds like a very good idea, but so
far most tools have decided to implement the pre-dump loop themselves.

With this change we can implement pre-dump in crun to match what is
currently implemented in runc.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-service.c | 13 ++++++++-----
 images/rpc.proto  |  2 ++
 lib/c/criu.c      | 21 ++++++++++++++++++---
 lib/c/criu.h      |  2 ++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 0f8bc4cc1..80d12c7b0 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -169,11 +169,11 @@ int send_criu_dump_resp(int socket_fd, bool success, bool restored)
 	return send_criu_msg(socket_fd, &msg);
 }
 
-static int send_criu_pre_dump_resp(int socket_fd, bool success)
+static int send_criu_pre_dump_resp(int socket_fd, bool success, bool single)
 {
 	CriuResp msg = CRIU_RESP__INIT;
 
-	msg.type = CRIU_REQ_TYPE__PRE_DUMP;
+	msg.type = single ? CRIU_REQ_TYPE__SINGLE_PRE_DUMP : CRIU_REQ_TYPE__PRE_DUMP;
 	msg.success = success;
 	set_resp_err(&msg);
 
@@ -845,7 +845,7 @@ out:
 	return send_criu_msg(sk, &resp);
 }
 
-static int pre_dump_using_req(int sk, CriuOpts *req)
+static int pre_dump_using_req(int sk, CriuOpts *req, bool single)
 {
 	int pid, status;
 	bool success = false;
@@ -886,7 +886,7 @@ static int pre_dump_using_req(int sk, CriuOpts *req)
 
 	success = true;
 out:
-	if (send_criu_pre_dump_resp(sk, success) == -1) {
+	if (send_criu_pre_dump_resp(sk, success, single) == -1) {
 		pr_perror("Can't send pre-dump resp");
 		success = false;
 	}
@@ -899,7 +899,7 @@ static int pre_dump_loop(int sk, CriuReq *msg)
 	int ret;
 
 	do {
-		ret = pre_dump_using_req(sk, msg->opts);
+		ret = pre_dump_using_req(sk, msg->opts, false);
 		if (ret < 0)
 			return ret;
 
@@ -1271,6 +1271,9 @@ more:
 	case CRIU_REQ_TYPE__VERSION:
 		ret = handle_version(sk, msg);
 		break;
+	case CRIU_REQ_TYPE__SINGLE_PRE_DUMP:
+		ret = pre_dump_using_req(sk, msg->opts, true);
+		break;
 
 	default:
 		send_criu_err(sk, "Invalid req");
diff --git a/images/rpc.proto b/images/rpc.proto
index a9f51ac4b..1d3befd23 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -172,6 +172,8 @@ enum criu_req_type {
 
 	WAIT_PID	= 11;
 	PAGE_SERVER_CHLD = 12;
+
+	SINGLE_PRE_DUMP = 13;
 }
 
 /*
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 4ee189aca..500574e33 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1527,7 +1527,7 @@ int criu_check(void)
 	return criu_local_check(global_opts);
 }
 
-int criu_local_dump(criu_opts *opts)
+static int dump(bool pre_dump, criu_opts *opts)
 {
 	int ret = -1;
 	CriuReq req = CRIU_REQ__INIT;
@@ -1535,7 +1535,7 @@ int criu_local_dump(criu_opts *opts)
 
 	saved_errno = 0;
 
-	req.type = CRIU_REQ_TYPE__DUMP;
+	req.type = pre_dump ? CRIU_REQ_TYPE__SINGLE_PRE_DUMP : CRIU_REQ_TYPE__DUMP;
 	req.opts = opts->rpc;
 
 	ret = send_req_and_recv_resp(opts, &req, &resp);
@@ -1543,7 +1543,7 @@ int criu_local_dump(criu_opts *opts)
 		goto exit;
 
 	if (resp->success) {
-		if (resp->dump->has_restored && resp->dump->restored)
+		if (!pre_dump && resp->dump->has_restored && resp->dump->restored)
 			ret = 1;
 		else
 			ret = 0;
@@ -1561,11 +1561,26 @@ exit:
 	return ret;
 }
 
+int criu_local_dump(criu_opts *opts)
+{
+	return dump(false, opts);
+}
+
 int criu_dump(void)
 {
 	return criu_local_dump(global_opts);
 }
 
+int criu_local_pre_dump(criu_opts *opts)
+{
+	return dump(true, opts);
+}
+
+int criu_pre_dump(void)
+{
+	return criu_local_pre_dump(global_opts);
+}
+
 int criu_local_dump_iters(criu_opts *opts, int (*more)(criu_predump_info pi))
 {
 	int ret = -1, fd = -1, uret;
diff --git a/lib/c/criu.h b/lib/c/criu.h
index a374b37f8..c6d4f50a8 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -161,6 +161,7 @@ int criu_get_orphan_pts_master_fd(void);
  */
 int criu_check(void);
 int criu_dump(void);
+int criu_pre_dump(void);
 int criu_restore(void);
 int criu_restore_child(void);
 
@@ -279,6 +280,7 @@ void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_noti
 
 int criu_local_check(criu_opts *opts);
 int criu_local_dump(criu_opts *opts);
+int criu_local_pre_dump(criu_opts *opts);
 int criu_local_restore(criu_opts *opts);
 int criu_local_restore_child(criu_opts *opts);
 int criu_local_dump_iters(criu_opts *opts, int (*more)(criu_predump_info pi));

From af4b265193de688ac570dfd2553d9fe4906d0125 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 14 Dec 2021 13:09:19 +0000
Subject: [PATCH 0832/1854] tests: added test for single pre-dump support

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/libcriu/.gitignore      |   1 +
 test/others/libcriu/Makefile        |   1 +
 test/others/libcriu/lib.h           |   2 +
 test/others/libcriu/run.sh          |   1 +
 test/others/libcriu/test_iters.c    |   2 -
 test/others/libcriu/test_notify.c   |   2 -
 test/others/libcriu/test_pre_dump.c | 151 ++++++++++++++++++++++++++++
 test/others/libcriu/test_sub.c      |   2 -
 8 files changed, 156 insertions(+), 6 deletions(-)
 create mode 100644 test/others/libcriu/test_pre_dump.c

diff --git a/test/others/libcriu/.gitignore b/test/others/libcriu/.gitignore
index cf1342de2..15abf07ac 100644
--- a/test/others/libcriu/.gitignore
+++ b/test/others/libcriu/.gitignore
@@ -4,5 +4,6 @@ test_notify
 test_self
 test_sub
 test_join_ns
+test_pre_dump
 output/
 libcriu.so.*
diff --git a/test/others/libcriu/Makefile b/test/others/libcriu/Makefile
index 734e66c1a..581574da0 100644
--- a/test/others/libcriu/Makefile
+++ b/test/others/libcriu/Makefile
@@ -6,6 +6,7 @@ TESTS += test_notify
 TESTS += test_iters
 TESTS += test_errno
 TESTS += test_join_ns
+TESTS += test_pre_dump
 
 all: $(TESTS)
 .PHONY: all
diff --git a/test/others/libcriu/lib.h b/test/others/libcriu/lib.h
index 6fdf8aef2..59372fca5 100644
--- a/test/others/libcriu/lib.h
+++ b/test/others/libcriu/lib.h
@@ -1,3 +1,5 @@
 void what_err_ret_mean(int ret);
 int chk_exit(int status, int want);
 int get_version(void);
+
+#define SUCC_ECODE 42
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 48f25a5f6..1b6c73448 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -58,6 +58,7 @@ run_test test_notify
 if [ "$(uname -m)" = "x86_64" ]; then
 	# Skip this on aarch64 as aarch64 has no dirty page tracking
 	run_test test_iters
+	run_test test_pre_dump
 fi
 run_test test_errno
 run_test test_join_ns
diff --git a/test/others/libcriu/test_iters.c b/test/others/libcriu/test_iters.c
index b7e325abb..edbaf87f6 100644
--- a/test/others/libcriu/test_iters.c
+++ b/test/others/libcriu/test_iters.c
@@ -46,8 +46,6 @@ static int next_iter(criu_predump_info pi)
 	return cur_iter < MAX_ITERS;
 }
 
-#define SUCC_ECODE 42
-
 int main(int argc, char **argv)
 {
 	int pid, ret, p[2];
diff --git a/test/others/libcriu/test_notify.c b/test/others/libcriu/test_notify.c
index 9a54b812a..80ad3ffdc 100644
--- a/test/others/libcriu/test_notify.c
+++ b/test/others/libcriu/test_notify.c
@@ -10,8 +10,6 @@
 
 #include "lib.h"
 
-#define SUCC_ECODE 42
-
 static int actions_called = 0;
 static int notify(char *action, criu_notify_arg_t na)
 {
diff --git a/test/others/libcriu/test_pre_dump.c b/test/others/libcriu/test_pre_dump.c
new file mode 100644
index 000000000..ed9cd2125
--- /dev/null
+++ b/test/others/libcriu/test_pre_dump.c
@@ -0,0 +1,151 @@
+#include "criu.h"
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include "lib.h"
+
+static int wdir_fd, cur_imgdir = -1;
+
+static int stop = 0;
+static void sh(int sig)
+{
+	stop = 1;
+}
+
+static void open_imgdir(void)
+{
+	char p[10];
+	static int id = 0;
+
+	if (id > 0) {
+		sprintf(p, "../dir-%d", id);
+		criu_set_parent_images(p);
+	}
+	if (cur_imgdir != -1)
+		close(cur_imgdir);
+	sprintf(p, "dir-%d", ++id);
+	mkdirat(wdir_fd, p, 0700);
+	cur_imgdir = openat(wdir_fd, p, O_DIRECTORY);
+	criu_set_images_dir_fd(cur_imgdir);
+}
+
+int main(int argc, char **argv)
+{
+	int pid, ret, p[2];
+
+	wdir_fd = open(argv[2], O_DIRECTORY);
+	if (wdir_fd < 0) {
+		perror("Can't open wdir");
+		return 1;
+	}
+
+	printf("--- Start loop ---\n");
+	pipe(p);
+	pid = fork();
+	if (pid < 0) {
+		perror("Can't");
+		return -1;
+	}
+
+	if (!pid) {
+		printf("   `- loop: initializing\n");
+		if (setsid() < 0)
+			exit(1);
+		if (signal(SIGUSR1, sh) == SIG_ERR)
+			exit(1);
+
+		close(0);
+		close(1);
+		close(2);
+		close(p[0]);
+
+		ret = SUCC_ECODE;
+		write(p[1], &ret, sizeof(ret));
+		close(p[1]);
+
+		while (!stop)
+			sleep(1);
+		exit(SUCC_ECODE);
+	}
+
+	close(p[1]);
+
+	/* Wait for kid to start */
+	ret = -1;
+	read(p[0], &ret, sizeof(ret));
+	if (ret != SUCC_ECODE) {
+		printf("Error starting loop\n");
+		goto err;
+	}
+
+	/* Wait for pipe to get closed, then dump */
+	read(p[0], &ret, 1);
+	close(p[0]);
+
+	printf("--- Dump loop ---\n");
+	criu_init_opts();
+	criu_set_service_binary(argv[1]);
+	criu_set_pid(pid);
+	criu_set_log_file("dump.log");
+	criu_set_log_level(CRIU_LOG_DEBUG);
+	criu_set_track_mem(true);
+
+	open_imgdir();
+	ret = criu_pre_dump();
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		kill(pid, SIGKILL);
+		goto err;
+	}
+
+	printf("   `- Pre Dump 1 succeeded\n");
+
+	open_imgdir();
+	ret = criu_pre_dump();
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		kill(pid, SIGKILL);
+		goto err;
+	}
+
+	printf("   `- Pre Dump 2 succeeded\n");
+
+	open_imgdir();
+	ret = criu_dump();
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		kill(pid, SIGKILL);
+		goto err;
+	}
+
+	printf("   `- Final Dump succeeded\n");
+	waitpid(pid, NULL, 0);
+
+	printf("--- Restore ---\n");
+	criu_init_opts();
+	criu_set_log_level(CRIU_LOG_DEBUG);
+	criu_set_log_file("restore.log");
+	criu_set_images_dir_fd(cur_imgdir);
+
+	pid = criu_restore_child();
+	if (pid <= 0) {
+		what_err_ret_mean(pid);
+		return -1;
+	}
+
+	printf("   `- Restore returned pid %d\n", pid);
+	kill(pid, SIGUSR1);
+err:
+	if (waitpid(pid, &ret, 0) < 0) {
+		perror("   Can't wait kid");
+		return -1;
+	}
+
+	return chk_exit(ret, SUCC_ECODE);
+}
diff --git a/test/others/libcriu/test_sub.c b/test/others/libcriu/test_sub.c
index 697abf5d5..af1e09408 100644
--- a/test/others/libcriu/test_sub.c
+++ b/test/others/libcriu/test_sub.c
@@ -15,8 +15,6 @@ static void sh(int sig)
 	stop = 1;
 }
 
-#define SUCC_ECODE 42
-
 int main(int argc, char **argv)
 {
 	int pid, ret, fd, p[2];

From e62e05c2d22d095154f256582e12bd05fde22340 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Sat, 18 Dec 2021 10:40:11 +0300
Subject: [PATCH 0833/1854] zdtm.py: clean up MAKEFLAGS env variable before
 running make instance

In most cases we run tests as:
./test/zdtm.py run -a

But it's also possible to run tests from root makefile:
make test

In this case, if criu tree have no ./test/umount2 binary
built we get the error like:
make[3]: *** No rule to make target 'umount2'. Stop.

It's worth to mention this "3". That's because we have
build process tree like this:
make -> make -> make -> zdtm.py -> make umount2
and also we have MAKEFLAGS variable set to:
build=-r -R -f ...

And that's bad because "-r" option means no builtin
rules and -R means no builtin variables. That makes
`make umount2` not working. Let's just cleanup this
variable to make things work properly.

Fixes: #1699
https://github.com/checkpoint-restore/criu/issues/1699

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index b98770079..086ae0285 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -607,9 +607,11 @@ class zdtm_test:
     @staticmethod
     def available():
         if not os.access("umount2", os.X_OK):
-            subprocess.check_call(["make", "umount2"])
+            subprocess.check_call(
+                ["make", "umount2"], env=dict(os.environ, MAKEFLAGS=""))
         if not os.access("zdtm_ct", os.X_OK):
-            subprocess.check_call(["make", "zdtm_ct"])
+            subprocess.check_call(
+                ["make", "zdtm_ct"], env=dict(os.environ, MAKEFLAGS=""))
         if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
             subprocess.check_call(["make", "-C", "zdtm/"])
         subprocess.check_call(

From f92c7f1af86909c8fac99692eee922c9d12c5e7a Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Sat, 18 Dec 2021 11:03:53 +0300
Subject: [PATCH 0834/1854] zdtm: zdtm_ct fix compilation error with
 strict-prototypes on
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

zdtm_ct.c:44:12: error: function declaration isn’t a prototype [-Werror=strict-prototypes]
   44 | static int create_timens()

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm_ct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index e4b17a512..0e8eeff8a 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -41,7 +41,7 @@ static inline int _settime(clockid_t clk_id, time_t offset)
 	return 0;
 }
 
-static int create_timens()
+static int create_timens(void)
 {
 	struct utsname buf;
 	unsigned major, minor;

From be092e25a9ac654c177259d5809f026a8803daa2 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 17 Dec 2021 15:33:55 +0300
Subject: [PATCH 0835/1854] zdtm: remove mntns-deleted-dst test leftover from
 git

Looks like in commit [1] we've non-intentionally added this tmp file to
git, let's remove it.

Fixes: 01ee29702 ("s390:zdtm: Enable zdtm for s390") [1]
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mntns-deleted-dst | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test/zdtm/static/mntns-deleted-dst

diff --git a/test/zdtm/static/mntns-deleted-dst b/test/zdtm/static/mntns-deleted-dst
deleted file mode 100644
index e69de29bb..000000000

From 1b015df9bacd784493b0ef5b9c1e256489ba06e4 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 10 Dec 2021 15:34:19 +0300
Subject: [PATCH 0836/1854] crtools: remove excess always true condition

Several lines above if (optind >= argc) we go to usage label and fail,
thus we don't need to check (optind < argc) here as it is always true.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/crtools.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index da47bd684..3adfb190f 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -124,7 +124,7 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	if (optind < argc && !strcmp(argv[optind], "swrk")) {
+	if (!strcmp(argv[optind], "swrk")) {
 		if (argc != optind + 2) {
 			fprintf(stderr, "Usage: criu swrk <fd>\n");
 			return 1;

From 3fa85bcdcc0a7d1042dd8774ebc105397cd4aac4 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 10 Dec 2021 12:13:06 +0300
Subject: [PATCH 0837/1854] crtools/rpc: export current criu mode to opts.mode

We have multiple options which are valid only on restore or only on dump
or in any other specific criu mode, so it would be useful to have info
about current mode in opts so that we can validate other options against
current mode.

Plan is to use it for mount-v2 option as it is only valid on restore,
and this would make handling of different types mountpoints much easier.

Realization is a bit different for general code and rpc:

- When criu mode is set from main() we just parse mode from argv[optind]
just after parse_options() found optind of the command. Note that
opts.mode is available before check_options().

- For rpc service we reset opts.mode to CR_SWRK each time we restart
cr_service_work(), in the original service process we still have
CR_SERVICE to differentiate between them, and each request handling
function which does setup_opts_from_req sets opts.mode in accordance
with the processed request type. And it is also available before
check_options().

Now in check_options we can add filters on one mode only options.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-service.c         |  8 +++++
 criu/crtools.c            | 73 +++++++++++++++++++++++++++++----------
 criu/include/cr_options.h | 19 ++++++++++
 3 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 80d12c7b0..59f46b320 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -735,6 +735,7 @@ static int dump_using_req(int sk, CriuOpts *req)
 	bool success = false;
 	bool self_dump = !req->pid;
 
+	opts.mode = CR_DUMP;
 	if (setup_opts_from_req(sk, req))
 		goto exit;
 
@@ -777,6 +778,7 @@ static int restore_using_req(int sk, CriuOpts *req)
 
 	opts.restore_detach = true;
 
+	opts.mode = CR_RESTORE;
 	if (setup_opts_from_req(sk, req))
 		goto exit;
 
@@ -828,6 +830,7 @@ static int check(int sk, CriuOpts *req)
 	if (pid == 0) {
 		setproctitle("check --rpc");
 
+		opts.mode = CR_CHECK;
 		if (setup_opts_from_req(sk, req))
 			exit(1);
 
@@ -859,6 +862,7 @@ static int pre_dump_using_req(int sk, CriuOpts *req, bool single)
 	if (pid == 0) {
 		int ret = 1;
 
+		opts.mode = CR_PRE_DUMP;
 		if (setup_opts_from_req(sk, req))
 			goto cout;
 
@@ -936,6 +940,7 @@ static int start_page_server_req(int sk, CriuOpts *req, bool daemon_mode)
 	if (pid == 0) {
 		close(start_pipe[0]);
 
+		opts.mode = CR_PAGE_SERVER;
 		if (setup_opts_from_req(sk, req))
 			goto out_ch;
 
@@ -1182,6 +1187,7 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 	if (pid == 0) {
 		int ret = 1;
 
+		opts.mode = CR_CPUINFO;
 		if (setup_opts_from_req(sk, msg->opts))
 			goto cout;
 
@@ -1231,6 +1237,8 @@ int cr_service_work(int sk)
 	CriuReq *msg = 0;
 
 more:
+	opts.mode = CR_SWRK;
+
 	if (recv_criu_msg(sk, &msg) != 0) {
 		pr_perror("Can't recv request");
 		goto err;
diff --git a/criu/crtools.c b/criu/crtools.c
index 3adfb190f..d10d7f7d0 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -67,6 +67,38 @@ static int image_dir_mode(char *argv[], int optind)
 	return -1;
 }
 
+static int parse_criu_mode(char *mode)
+{
+	if (!strcmp(mode, "dump"))
+		opts.mode = CR_DUMP;
+	else if (!strcmp(mode, "pre-dump"))
+		opts.mode = CR_PRE_DUMP;
+	else if (!strcmp(mode, "restore"))
+		opts.mode = CR_RESTORE;
+	else if (!strcmp(mode, "lazy-pages"))
+		opts.mode = CR_LAZY_PAGES;
+	else if (!strcmp(mode, "check"))
+		opts.mode = CR_CHECK;
+	else if (!strcmp(mode, "page-server"))
+		opts.mode = CR_PAGE_SERVER;
+	else if (!strcmp(mode, "service"))
+		opts.mode = CR_SERVICE;
+	else if (!strcmp(mode, "swrk"))
+		opts.mode = CR_SWRK;
+	else if (!strcmp(mode, "dedup"))
+		opts.mode = CR_DEDUP;
+	else if (!strcmp(mode, "cpuinfo"))
+		opts.mode = CR_CPUINFO;
+	else if (!strcmp(mode, "exec"))
+		opts.mode = CR_EXEC_DEPRECATED;
+	else if (!strcmp(mode, "show"))
+		opts.mode = CR_SHOW_DEPRECATED;
+	else
+		return -1;
+
+	return 0;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 	int ret = -1;
@@ -124,7 +156,12 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	if (!strcmp(argv[optind], "swrk")) {
+	if (parse_criu_mode(argv[optind])) {
+		pr_err("unknown command: %s\n", argv[optind]);
+		goto usage;
+	}
+
+	if (opts.mode == CR_SWRK) {
 		if (argc != optind + 2) {
 			fprintf(stderr, "Usage: criu swrk <fd>\n");
 			return 1;
@@ -156,7 +193,7 @@ int main(int argc, char *argv[], char *envp[])
 			goto usage;
 		}
 
-		if (strcmp(argv[optind], "restore")) {
+		if (opts.mode != CR_RESTORE) {
 			pr_err("--exec-cmd is available for the restore command only\n");
 			goto usage;
 		}
@@ -173,7 +210,7 @@ int main(int argc, char *argv[], char *envp[])
 		opts.exec_cmd[argc - optind - 1] = NULL;
 	} else {
 		/* No subcommands except for cpuinfo and restore --exec-cmd */
-		if (strcmp(argv[optind], "cpuinfo") && has_sub_command) {
+		if (opts.mode != CR_CPUINFO && has_sub_command) {
 			pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", argv[optind]);
 			goto usage;
 		}
@@ -185,7 +222,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	/* We must not open imgs dir, if service is called */
-	if (strcmp(argv[optind], "service")) {
+	if (opts.mode != CR_SERVICE) {
 		ret = open_image_dir(opts.imgs_dir, image_dir_mode(argv, optind));
 		if (ret < 0) {
 			pr_err("Couldn't open image dir %s\n", opts.imgs_dir);
@@ -197,8 +234,7 @@ int main(int argc, char *argv[], char *envp[])
 	 * When a process group becomes an orphan,
 	 * its processes are sent a SIGHUP signal
 	 */
-	if (!strcmp(argv[optind], "restore") && opts.restore_detach && opts.final_state == TASK_STOPPED &&
-	    opts.shell_job)
+	if (opts.mode == CR_RESTORE && opts.restore_detach && opts.final_state == TASK_STOPPED && opts.shell_job)
 		pr_warn("Stopped and detached shell job will get SIGHUP from OS.\n");
 
 	if (chdir(opts.work_dir)) {
@@ -218,7 +254,7 @@ int main(int argc, char *argv[], char *envp[])
 		kdat.can_map_vdso = 0;
 
 	if (!list_empty(&opts.inherit_fds)) {
-		if (strcmp(argv[optind], "restore")) {
+		if (opts.mode != CR_RESTORE) {
 			pr_err("--inherit-fd is restore-only option\n");
 			return 1;
 		}
@@ -229,13 +265,14 @@ int main(int argc, char *argv[], char *envp[])
 	if (opts.img_parent)
 		pr_info("Will do snapshot from %s\n", opts.img_parent);
 
-	if (!strcmp(argv[optind], "dump")) {
+	if (opts.mode == CR_DUMP) {
 		if (!opts.tree_id)
 			goto opt_pid_missing;
+
 		return cr_dump_tasks(opts.tree_id);
 	}
 
-	if (!strcmp(argv[optind], "pre-dump")) {
+	if (opts.mode == CR_PRE_DUMP) {
 		if (!opts.tree_id)
 			goto opt_pid_missing;
 
@@ -247,7 +284,7 @@ int main(int argc, char *argv[], char *envp[])
 		return cr_pre_dump_tasks(opts.tree_id) != 0;
 	}
 
-	if (!strcmp(argv[optind], "restore")) {
+	if (opts.mode == CR_RESTORE) {
 		if (opts.tree_id)
 			pr_warn("Using -t with criu restore is obsoleted\n");
 
@@ -262,22 +299,22 @@ int main(int argc, char *argv[], char *envp[])
 		return ret != 0;
 	}
 
-	if (!strcmp(argv[optind], "lazy-pages"))
+	if (opts.mode == CR_LAZY_PAGES)
 		return cr_lazy_pages(opts.daemon_mode) != 0;
 
-	if (!strcmp(argv[optind], "check"))
+	if (opts.mode == CR_CHECK)
 		return cr_check() != 0;
 
-	if (!strcmp(argv[optind], "page-server"))
+	if (opts.mode == CR_PAGE_SERVER)
 		return cr_page_server(opts.daemon_mode, false, -1) != 0;
 
-	if (!strcmp(argv[optind], "service"))
+	if (opts.mode == CR_SERVICE)
 		return cr_service(opts.daemon_mode);
 
-	if (!strcmp(argv[optind], "dedup"))
+	if (opts.mode == CR_DEDUP)
 		return cr_dedup() != 0;
 
-	if (!strcmp(argv[optind], "cpuinfo")) {
+	if (opts.mode == CR_CPUINFO) {
 		if (!argv[optind + 1]) {
 			pr_err("cpuinfo requires an action: dump or check\n");
 			goto usage;
@@ -288,12 +325,12 @@ int main(int argc, char *argv[], char *envp[])
 			return cpuinfo_check();
 	}
 
-	if (!strcmp(argv[optind], "exec")) {
+	if (opts.mode == CR_EXEC_DEPRECATED) {
 		pr_err("The \"exec\" action is deprecated by the Compel library.\n");
 		return -1;
 	}
 
-	if (!strcmp(argv[optind], "show")) {
+	if (opts.mode == CR_SHOW_DEPRECATED) {
 		pr_err("The \"show\" action is deprecated by the CRIT utility.\n");
 		pr_err("To view an image use the \"crit decode -i $name --pretty\" command.\n");
 		return -1;
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index a34f8dbbf..85648bf1c 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -100,6 +100,22 @@ struct irmap_path_opt {
 	struct irmap *ir;
 };
 
+enum criu_mode {
+	CR_UNSET = 0,
+	CR_DUMP,
+	CR_PRE_DUMP,
+	CR_RESTORE,
+	CR_LAZY_PAGES,
+	CR_CHECK,
+	CR_PAGE_SERVER,
+	CR_SERVICE,
+	CR_SWRK,
+	CR_DEDUP,
+	CR_CPUINFO,
+	CR_EXEC_DEPRECATED,
+	CR_SHOW_DEPRECATED,
+};
+
 struct cr_options {
 	int final_state;
 	int check_extra_features;
@@ -188,6 +204,9 @@ struct cr_options {
 
 	/* This stores which method to use for file validation. */
 	int file_validation_method;
+
+	/* Shows the mode criu is running at the moment: dump/pre-dump/restore/... */
+	enum criu_mode mode;
 };
 
 extern struct cr_options opts;

From 233f1f1d0c2c8ae8b6ea7a60ddf32cd2b1a195fb Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 15 Dec 2021 10:49:42 +0300
Subject: [PATCH 0838/1854] crtools: use new opts.mode in image_dir_mode

Also while on it there is no "cpuinfo restore", let's remove it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/crtools.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index d10d7f7d0..7bf92ffd0 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -56,14 +56,23 @@ void flush_early_log_to_stderr(void)
 
 static int image_dir_mode(char *argv[], int optind)
 {
-	if (!strcmp(argv[optind], "dump") || !strcmp(argv[optind], "pre-dump") ||
-	    (!strcmp(argv[optind], "cpuinfo") && !strcmp(argv[optind + 1], "dump")))
+	switch (opts.mode) {
+	case CR_DUMP:
+		/* fallthrough */
+	case CR_PRE_DUMP:
 		return O_DUMP;
-
-	if (!strcmp(argv[optind], "restore") ||
-	    (!strcmp(argv[optind], "cpuinfo") && !strcmp(argv[optind + 1], "restore")))
+	case CR_RESTORE:
 		return O_RSTR;
+	case CR_CPUINFO:
+		if (!strcmp(argv[optind + 1], "dump"))
+			return O_DUMP;
+		/* fallthrough */
+	default:
+		return -1;
+	}
 
+	/* never reached */
+	BUG();
 	return -1;
 }
 

From 3d618d0f4d9ece05f8f422783c84f60b839a539b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Dec 2021 18:05:01 +0300
Subject: [PATCH 0839/1854] crtools: check that cpuinfo command has sub-command

This fixes segfault on empty sub-command for cpuinfo.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/crtools.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/crtools.c b/criu/crtools.c
index 7bf92ffd0..0752800f6 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -222,6 +222,9 @@ int main(int argc, char *argv[], char *envp[])
 		if (opts.mode != CR_CPUINFO && has_sub_command) {
 			pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", argv[optind]);
 			goto usage;
+		} else if (opts.mode == CR_CPUINFO && !has_sub_command) {
+			pr_err("cpuinfo requires an action: dump or check\n");
+			goto usage;
 		}
 	}
 

From 530ad9c89d85803cf516dcff5b4b897967602711 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 14 Dec 2021 22:28:27 +0700
Subject: [PATCH 0840/1854] sk-unix: Add support for SOCK_SEQPACKET unix
 sockets

Adjust some SOCK_STREAM cases to handle SOCK_SEQPACKET too.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/sk-unix.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index d3402c3ac..194193dff 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -402,12 +402,12 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 	sk_encode_shutdown(ue, sk->shutdown);
 
 	/*
-	 * If a stream listening socket has non-zero rqueue, this
-	 * means there are in-flight connections waiting to get
+	 * If a stream/seqpacket listening socket has non-zero rqueue,
+	 * this means there are in-flight connections waiting to get
 	 * accept()-ed. We handle them separately with the "icons"
 	 * (i stands for in-flight, cons -- for connections) things.
 	 */
-	if (sk->rqlen != 0 && !(sk->type == SOCK_STREAM && sk->state == TCP_LISTEN)) {
+	if (sk->rqlen != 0 && sk->state != TCP_LISTEN) {
 		if (dump_sk_queue(lfd, id))
 			goto err;
 	}
@@ -1610,7 +1610,7 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
 	if (ui->ue->name.len == 0)
 		return 0;
 
-	if ((ui->ue->type == SOCK_STREAM) && (ui->ue->state == TCP_ESTABLISHED)) {
+	if ((ui->ue->type != SOCK_DGRAM) && (ui->ue->state == TCP_ESTABLISHED)) {
 		/*
 		 * FIXME this can be done, but for doing this properly we
 		 * need to bind socket to its name, then rename one to
@@ -1851,7 +1851,7 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
 
 		close(sks[1]);
 		sk = sks[0];
-	} else if ((ui->ue->state == TCP_ESTABLISHED && ui->ue->type == SOCK_STREAM) && queuer &&
+	} else if ((ui->ue->state == TCP_ESTABLISHED && ui->ue->type != SOCK_DGRAM) && queuer &&
 		   queuer->ue->ino == FAKE_INO) {
 		int ret, sks[2];
 

From 0da88b6dad4033b4c226ee44a82fad4d6f01dc61 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 16 Dec 2021 09:35:25 +0700
Subject: [PATCH 0841/1854] zdtm: Add SOCK_SEQPACKET variants to unix socket
 tests

This commit simply makes copies of SOCK_STREAM unix socket tests and uses
SOCK_SEQPACKET instead.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile                     | 23 +++++++++++++++++++
 test/zdtm/static/del_standalone_un.c          |  8 ++++++-
 .../zdtm/static/del_standalone_un_seqpacket.c |  1 +
 test/zdtm/static/scm03-seqpacket.c            |  1 +
 test/zdtm/static/scm03.c                      |  8 ++++++-
 test/zdtm/static/sk-unix-rel-seqpacket.c      |  1 +
 test/zdtm/static/sk-unix-rel.c                | 10 ++++++--
 test/zdtm/static/sk-unix-unconn-seqpacket.c   |  1 +
 test/zdtm/static/sk-unix-unconn.c             | 10 ++++++--
 test/zdtm/static/sk-unix01-seqpacket.c        |  1 +
 test/zdtm/static/sk-unix01-seqpacket.desc     |  1 +
 test/zdtm/static/sk-unix01.c                  | 12 +++++++---
 test/zdtm/static/socket_queues.c              |  8 ++++++-
 test/zdtm/static/socket_queues_seqpacket.c    |  1 +
 test/zdtm/static/sockets00-seqpacket.c        |  1 +
 test/zdtm/static/sockets00-seqpacket.desc     |  1 +
 test/zdtm/static/sockets00.c                  | 12 +++++++---
 test/zdtm/static/sockets01-seqpacket.c        |  1 +
 test/zdtm/static/sockets01.c                  | 10 ++++++--
 test/zdtm/static/sockets02-seqpacket.c        |  1 +
 test/zdtm/static/sockets02.c                  |  8 ++++++-
 test/zdtm/static/sockets03-seqpacket.c        |  1 +
 test/zdtm/static/sockets03-seqpacket.desc     |  1 +
 test/zdtm/static/sockets03.c                  | 10 ++++++--
 test/zdtm/static/sockets_spair.c              |  8 ++++++-
 test/zdtm/static/sockets_spair_seqpacket.c    |  1 +
 26 files changed, 122 insertions(+), 19 deletions(-)
 create mode 120000 test/zdtm/static/del_standalone_un_seqpacket.c
 create mode 120000 test/zdtm/static/scm03-seqpacket.c
 create mode 120000 test/zdtm/static/sk-unix-rel-seqpacket.c
 create mode 120000 test/zdtm/static/sk-unix-unconn-seqpacket.c
 create mode 120000 test/zdtm/static/sk-unix01-seqpacket.c
 create mode 120000 test/zdtm/static/sk-unix01-seqpacket.desc
 create mode 120000 test/zdtm/static/socket_queues_seqpacket.c
 create mode 120000 test/zdtm/static/sockets00-seqpacket.c
 create mode 120000 test/zdtm/static/sockets00-seqpacket.desc
 create mode 120000 test/zdtm/static/sockets01-seqpacket.c
 create mode 120000 test/zdtm/static/sockets02-seqpacket.c
 create mode 120000 test/zdtm/static/sockets03-seqpacket.c
 create mode 120000 test/zdtm/static/sockets03-seqpacket.desc
 create mode 120000 test/zdtm/static/sockets_spair_seqpacket.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 3e1e0a498..4a21978b5 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -68,9 +68,13 @@ TST_NOFILE	:=				\
 		utsname				\
 		pstree				\
 		sockets01			\
+		sockets01-seqpacket		\
 		sockets02			\
+		sockets02-seqpacket		\
 		sockets_spair			\
+		sockets_spair_seqpacket		\
 		socket_queues			\
+		socket_queues_seqpacket		\
 		socket-raw			\
 		socket-tcp			\
 		socket-tcp-listen		\
@@ -119,6 +123,7 @@ TST_NOFILE	:=				\
 		sock_opts01			\
 		sock_opts02			\
 		sk-unix-unconn			\
+		sk-unix-unconn-seqpacket	\
 		ipc_namespace			\
 		selfexe00			\
 		sem				\
@@ -187,6 +192,7 @@ TST_NOFILE	:=				\
 		scm01				\
 		scm02				\
 		scm03				\
+		scm03-seqpacket			\
 		scm04				\
 		scm05				\
 		scm06				\
@@ -284,6 +290,7 @@ TST_FILE	=				\
 		file_attr			\
 		deleted_unix_sock		\
 		sk-unix-rel			\
+		sk-unix-rel-seqpacket		\
 		deleted_dev			\
 		unlink_fstat00			\
 		unlink_fstat01			\
@@ -311,7 +318,9 @@ TST_FILE	=				\
 		cow01				\
 		fdt_shared			\
 		sockets00			\
+		sockets00-seqpacket		\
 		sockets03			\
+		sockets03-seqpacket		\
 		sockets_dgram			\
 		file_lease00			\
 		file_lease01			\
@@ -394,8 +403,10 @@ TST_DIR		=				\
 		mnt_enablefs			\
 		autofs				\
 		del_standalone_un		\
+		del_standalone_un_seqpacket	\
 		sk-unix-mntns			\
 		sk-unix01			\
+		sk-unix01-seqpacket		\
 		sk-unix-dgram-ghost		\
 		unsupported_children_collision  \
 		shared_slave_mount_children	\
@@ -607,6 +618,18 @@ socket-tcp6-unconn:	CFLAGS += -D ZDTM_IPV6
 socket-tcp4v6-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK -D ZDTM_IPV4V6
 socket-tcp4v6-closing:	CFLAGS += -D ZDTM_IPV4V6
 
+sockets00-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sockets01-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sockets02-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sockets03-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sk-unix01-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sk-unix-rel-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sockets_spair_seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+socket_queues_seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+del_standalone_un_seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+sk-unix-unconn-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+scm03-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
+
 pty-console:		CFLAGS += -D ZDTM_DEV_CONSOLE
 
 shm-unaligned:		CFLAGS += -DZDTM_SHM_UNALIGNED
diff --git a/test/zdtm/static/del_standalone_un.c b/test/zdtm/static/del_standalone_un.c
index c9fa84870..b4f99e260 100644
--- a/test/zdtm/static/del_standalone_un.c
+++ b/test/zdtm/static/del_standalone_un.c
@@ -16,11 +16,17 @@ const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 static int bind_and_listen(struct sockaddr_un *addr)
 {
 	int sk;
 
-	sk = socket(PF_UNIX, SOCK_STREAM, 0);
+	sk = socket(PF_UNIX, SOCK_TYPE, 0);
 	if (sk < 0) {
 		fail("socket");
 		return -1;
diff --git a/test/zdtm/static/del_standalone_un_seqpacket.c b/test/zdtm/static/del_standalone_un_seqpacket.c
new file mode 120000
index 000000000..d88fcbad8
--- /dev/null
+++ b/test/zdtm/static/del_standalone_un_seqpacket.c
@@ -0,0 +1 @@
+del_standalone_un.c
\ No newline at end of file
diff --git a/test/zdtm/static/scm03-seqpacket.c b/test/zdtm/static/scm03-seqpacket.c
new file mode 120000
index 000000000..f1f86dd8b
--- /dev/null
+++ b/test/zdtm/static/scm03-seqpacket.c
@@ -0,0 +1 @@
+scm03.c
\ No newline at end of file
diff --git a/test/zdtm/static/scm03.c b/test/zdtm/static/scm03.c
index a40fc0101..4453f7e93 100644
--- a/test/zdtm/static/scm03.c
+++ b/test/zdtm/static/scm03.c
@@ -9,6 +9,12 @@
 const char *test_doc = "Check that SCM_RIGHTS are preserved";
 const char *test_author = "Pavel Emelyanov <xemul@virtuozzo.com>";
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_DGRAM
+#endif
+
 static int send_fd(int via, int fd1, int fd2)
 {
 	struct msghdr h = {};
@@ -105,7 +111,7 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	if (socketpair(PF_UNIX, SOCK_DGRAM, 0, sk) < 0) {
+	if (socketpair(PF_UNIX, SOCK_TYPE, 0, sk) < 0) {
 		pr_perror("Can't make unix pair");
 		exit(1);
 	}
diff --git a/test/zdtm/static/sk-unix-rel-seqpacket.c b/test/zdtm/static/sk-unix-rel-seqpacket.c
new file mode 120000
index 000000000..1f98e3845
--- /dev/null
+++ b/test/zdtm/static/sk-unix-rel-seqpacket.c
@@ -0,0 +1 @@
+sk-unix-rel.c
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix-rel.c b/test/zdtm/static/sk-unix-rel.c
index 10c19080a..7e4aeafe6 100644
--- a/test/zdtm/static/sk-unix-rel.c
+++ b/test/zdtm/static/sk-unix-rel.c
@@ -25,6 +25,12 @@ TEST_OPTION(filename, string, "socket file name", 1);
 
 #define TEST_MODE 0640
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	struct sockaddr_un addr;
@@ -54,8 +60,8 @@ int main(int argc, char *argv[])
 	memcpy(addr.sun_path, filename, addrlen);
 	addrlen += sizeof(addr.sun_family);
 
-	sock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
-	sock[1] = socket(AF_UNIX, SOCK_STREAM, 0);
+	sock[0] = socket(AF_UNIX, SOCK_TYPE, 0);
+	sock[1] = socket(AF_UNIX, SOCK_TYPE, 0);
 	if (sock[0] < 0 || sock[1] < 0) {
 		fail("socket");
 		exit(1);
diff --git a/test/zdtm/static/sk-unix-unconn-seqpacket.c b/test/zdtm/static/sk-unix-unconn-seqpacket.c
new file mode 120000
index 000000000..f5c276186
--- /dev/null
+++ b/test/zdtm/static/sk-unix-unconn-seqpacket.c
@@ -0,0 +1 @@
+sk-unix-unconn.c
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix-unconn.c b/test/zdtm/static/sk-unix-unconn.c
index caad3d315..62e48247f 100644
--- a/test/zdtm/static/sk-unix-unconn.c
+++ b/test/zdtm/static/sk-unix-unconn.c
@@ -9,6 +9,12 @@
 const char *test_doc = "Check unconnected unix sockets";
 const char *test_author = "Vagin Andrew <avagin@parallels.com>";
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char **argv)
 {
 	int sk, skc;
@@ -19,13 +25,13 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	sk = socket(AF_UNIX, SOCK_STREAM, 0);
+	sk = socket(AF_UNIX, SOCK_TYPE, 0);
 	if (sk == -1) {
 		pr_perror("socket");
 		return 1;
 	}
 
-	skc = socket(AF_UNIX, SOCK_STREAM, 0);
+	skc = socket(AF_UNIX, SOCK_TYPE, 0);
 	if (skc == -1) {
 		pr_perror("socket");
 		return 1;
diff --git a/test/zdtm/static/sk-unix01-seqpacket.c b/test/zdtm/static/sk-unix01-seqpacket.c
new file mode 120000
index 000000000..bef734ed6
--- /dev/null
+++ b/test/zdtm/static/sk-unix01-seqpacket.c
@@ -0,0 +1 @@
+sk-unix01.c
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix01-seqpacket.desc b/test/zdtm/static/sk-unix01-seqpacket.desc
new file mode 120000
index 000000000..7a30da25c
--- /dev/null
+++ b/test/zdtm/static/sk-unix01-seqpacket.desc
@@ -0,0 +1 @@
+sk-unix01.desc
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix01.c b/test/zdtm/static/sk-unix01.c
index c2bb8b9ed..5146c027f 100644
--- a/test/zdtm/static/sk-unix01.c
+++ b/test/zdtm/static/sk-unix01.c
@@ -24,6 +24,12 @@ const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 char *dirname;
 TEST_OPTION(dirname, string, "directory name", 1);
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 static int sk_alloc_bind(int type, struct sockaddr_un *addr)
 {
 	int sk;
@@ -256,7 +262,7 @@ int main(int argc, char **argv)
 
 	unlink(addr.sun_path);
 
-	sk_st[0] = sk_alloc_bind(SOCK_STREAM, &addr);
+	sk_st[0] = sk_alloc_bind(SOCK_TYPE, &addr);
 	if (sk_st[0] < 0)
 		return 1;
 	test_msg("sk-st: alloc/bind/listen %d\n", sk_st[0]);
@@ -266,7 +272,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	sk_st[1] = sk_alloc_connect(SOCK_STREAM, &addr);
+	sk_st[1] = sk_alloc_connect(SOCK_TYPE, &addr);
 	if (sk_st[1] < 0)
 		return 1;
 	test_msg("sk-st: alloc/connect %d\n", sk_st[1]);
@@ -279,7 +285,7 @@ int main(int argc, char **argv)
 	}
 	test_msg("sk-st: accept %d\n", sk_st[2]);
 
-	sk_st[3] = sk_alloc_connect(SOCK_STREAM, &addr);
+	sk_st[3] = sk_alloc_connect(SOCK_TYPE, &addr);
 	if (sk_st[3] < 0)
 		return 1;
 	test_msg("sk-st: alloc/connect %d\n", sk_st[3]);
diff --git a/test/zdtm/static/socket_queues.c b/test/zdtm/static/socket_queues.c
index e30bca0e1..44495f06b 100644
--- a/test/zdtm/static/socket_queues.c
+++ b/test/zdtm/static/socket_queues.c
@@ -24,6 +24,12 @@ const char *test_author = "Stanislav Kinsbursky <skinsbursky@parallels.com>\n";
 #define SK_DATA_D1 "packet dgram left"
 #define SK_DATA_D2 "packet dgram right"
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	int ssk_pair_d[2];
@@ -32,7 +38,7 @@ int main(int argc, char *argv[])
 
 	test_init(argc, argv);
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, 0, ssk_pair_s) == -1) {
+	if (socketpair(AF_UNIX, SOCK_TYPE, 0, ssk_pair_s) == -1) {
 		fail("socketpair");
 		exit(1);
 	}
diff --git a/test/zdtm/static/socket_queues_seqpacket.c b/test/zdtm/static/socket_queues_seqpacket.c
new file mode 120000
index 000000000..0f3f93ea6
--- /dev/null
+++ b/test/zdtm/static/socket_queues_seqpacket.c
@@ -0,0 +1 @@
+socket_queues.c
\ No newline at end of file
diff --git a/test/zdtm/static/sockets00-seqpacket.c b/test/zdtm/static/sockets00-seqpacket.c
new file mode 120000
index 000000000..4bce9fc31
--- /dev/null
+++ b/test/zdtm/static/sockets00-seqpacket.c
@@ -0,0 +1 @@
+sockets00.c
\ No newline at end of file
diff --git a/test/zdtm/static/sockets00-seqpacket.desc b/test/zdtm/static/sockets00-seqpacket.desc
new file mode 120000
index 000000000..4beea2642
--- /dev/null
+++ b/test/zdtm/static/sockets00-seqpacket.desc
@@ -0,0 +1 @@
+sockets00.desc
\ No newline at end of file
diff --git a/test/zdtm/static/sockets00.c b/test/zdtm/static/sockets00.c
index 53890077b..ac5d7d6fe 100644
--- a/test/zdtm/static/sockets00.c
+++ b/test/zdtm/static/sockets00.c
@@ -25,6 +25,12 @@ TEST_OPTION(filename, string, "socket file name", 1);
 
 #define TEST_MODE 0640
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	int ssk_icon[4];
@@ -58,9 +64,9 @@ int main(int argc, char *argv[])
 	memcpy(addr.sun_path, path, addrlen);
 	addrlen += sizeof(addr.sun_family);
 
-	ssk_icon[0] = socket(AF_UNIX, SOCK_STREAM, 0);
-	ssk_icon[1] = socket(AF_UNIX, SOCK_STREAM, 0);
-	ssk_icon[2] = socket(AF_UNIX, SOCK_STREAM, 0);
+	ssk_icon[0] = socket(AF_UNIX, SOCK_TYPE, 0);
+	ssk_icon[1] = socket(AF_UNIX, SOCK_TYPE, 0);
+	ssk_icon[2] = socket(AF_UNIX, SOCK_TYPE, 0);
 	if (ssk_icon[0] < 0 || ssk_icon[1] < 0 || ssk_icon[2] < 0) {
 		fail("socket");
 		exit(1);
diff --git a/test/zdtm/static/sockets01-seqpacket.c b/test/zdtm/static/sockets01-seqpacket.c
new file mode 120000
index 000000000..8d51121e1
--- /dev/null
+++ b/test/zdtm/static/sockets01-seqpacket.c
@@ -0,0 +1 @@
+sockets01.c
\ No newline at end of file
diff --git a/test/zdtm/static/sockets01.c b/test/zdtm/static/sockets01.c
index e35a31fec..f56cd219e 100644
--- a/test/zdtm/static/sockets01.c
+++ b/test/zdtm/static/sockets01.c
@@ -30,6 +30,12 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 #define TEST_MSG "test-message"
 static char buf[sizeof(TEST_MSG)];
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	int spu[2], spb[2], dpu[2], dpb[2], dpd[2];
@@ -40,14 +46,14 @@ int main(int argc, char *argv[])
 	signal(SIGPIPE, SIG_IGN);
 
 	/* spu -- stream pair, unidirectional shutdown */
-	if (socketpair(PF_UNIX, SOCK_STREAM, 0, spu) < 0)
+	if (socketpair(PF_UNIX, SOCK_TYPE, 0, spu) < 0)
 		fin("no stream pair 1");
 
 	if (shutdown(spu[0], SHUT_RD) < 0)
 		fin("no stream shutdown 1");
 
 	/* spb -- stream pair, bidirectional shutdown */
-	if (socketpair(PF_UNIX, SOCK_STREAM, 0, spb) < 0)
+	if (socketpair(PF_UNIX, SOCK_TYPE, 0, spb) < 0)
 		fin("no stream pair 2");
 
 	if (shutdown(spb[0], SHUT_RDWR) < 0)
diff --git a/test/zdtm/static/sockets02-seqpacket.c b/test/zdtm/static/sockets02-seqpacket.c
new file mode 120000
index 000000000..b95831599
--- /dev/null
+++ b/test/zdtm/static/sockets02-seqpacket.c
@@ -0,0 +1 @@
+sockets02.c
\ No newline at end of file
diff --git a/test/zdtm/static/sockets02.c b/test/zdtm/static/sockets02.c
index 2729ade2c..d7d84d815 100644
--- a/test/zdtm/static/sockets02.c
+++ b/test/zdtm/static/sockets02.c
@@ -16,6 +16,12 @@
 const char *test_doc = "Test semi-closed unix stream connection\n";
 const char *test_author = "Pavel Emelyanov <xemul@parallels.com>\n";
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	int ssk_pair[2], ret;
@@ -25,7 +31,7 @@ int main(int argc, char *argv[])
 
 	data = (char)lrand48();
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, 0, ssk_pair) == -1) {
+	if (socketpair(AF_UNIX, SOCK_TYPE, 0, ssk_pair) == -1) {
 		fail("socketpair");
 		exit(1);
 	}
diff --git a/test/zdtm/static/sockets03-seqpacket.c b/test/zdtm/static/sockets03-seqpacket.c
new file mode 120000
index 000000000..997cce673
--- /dev/null
+++ b/test/zdtm/static/sockets03-seqpacket.c
@@ -0,0 +1 @@
+sockets03.c
\ No newline at end of file
diff --git a/test/zdtm/static/sockets03-seqpacket.desc b/test/zdtm/static/sockets03-seqpacket.desc
new file mode 120000
index 000000000..3798a8242
--- /dev/null
+++ b/test/zdtm/static/sockets03-seqpacket.desc
@@ -0,0 +1 @@
+sockets03.desc
\ No newline at end of file
diff --git a/test/zdtm/static/sockets03.c b/test/zdtm/static/sockets03.c
index cd6f60831..6b0915aaa 100644
--- a/test/zdtm/static/sockets03.c
+++ b/test/zdtm/static/sockets03.c
@@ -22,6 +22,12 @@ const char *test_author = "Andrey Ryabinin <aryabinin@virtuozzo.com>";
 char *filename;
 TEST_OPTION(filename, string, "socket file name", 1);
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	int sk[3];
@@ -52,8 +58,8 @@ int main(int argc, char *argv[])
 	memcpy(addr.sun_path, path, addrlen);
 	addrlen += sizeof(addr.sun_family);
 
-	sk[0] = socket(AF_UNIX, SOCK_STREAM, 0);
-	sk[1] = socket(AF_UNIX, SOCK_STREAM, 0);
+	sk[0] = socket(AF_UNIX, SOCK_TYPE, 0);
+	sk[1] = socket(AF_UNIX, SOCK_TYPE, 0);
 	if (sk[0] < 0 || sk[1] < 0) {
 		fail("socket");
 		exit(1);
diff --git a/test/zdtm/static/sockets_spair.c b/test/zdtm/static/sockets_spair.c
index 2dbb132aa..202c2e790 100644
--- a/test/zdtm/static/sockets_spair.c
+++ b/test/zdtm/static/sockets_spair.c
@@ -18,6 +18,12 @@ const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org";
 
 #define SK_DATA "packet"
 
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
 int main(int argc, char *argv[])
 {
 	int ssk_pair[2];
@@ -25,7 +31,7 @@ int main(int argc, char *argv[])
 
 	test_init(argc, argv);
 
-	if (socketpair(AF_UNIX, SOCK_STREAM, 0, ssk_pair) == -1) {
+	if (socketpair(AF_UNIX, SOCK_TYPE, 0, ssk_pair) == -1) {
 		fail("socketpair");
 		exit(1);
 	}
diff --git a/test/zdtm/static/sockets_spair_seqpacket.c b/test/zdtm/static/sockets_spair_seqpacket.c
new file mode 120000
index 000000000..a52ccb6c9
--- /dev/null
+++ b/test/zdtm/static/sockets_spair_seqpacket.c
@@ -0,0 +1 @@
+sockets_spair.c
\ No newline at end of file

From 89e8e8e69771225c841c23e17c4ee2f3e3295c5a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Tue, 7 Dec 2021 21:29:44 +0000
Subject: [PATCH 0842/1854] tls: fix typo

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 criu/tls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/tls.c b/criu/tls.c
index 60bd105bc..6a7b523ac 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -8,7 +8,7 @@
 #include "cr_options.h"
 #include "xmalloc.h"
 
-/* Compatability with GnuTLS verson <3.5 */
+/* Compatability with GnuTLS version < 3.5 */
 #ifndef GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR
 #define GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR GNUTLS_E_CERTIFICATE_ERROR
 #endif

From 5a2250b1af92a9f9c5a972f0e1aa2d697371a0cb Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Tue, 7 Dec 2021 22:32:54 +0000
Subject: [PATCH 0843/1854] tls: use ssize_t for return value

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 criu/tls.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/criu/tls.c b/criu/tls.c
index 6a7b523ac..626e529f8 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -53,7 +53,7 @@ void tls_terminate_session(void)
 
 ssize_t tls_send(const void *buf, size_t len, int flags)
 {
-	int ret;
+	ssize_t ret;
 
 	tls_sk_flags = flags;
 	ret = gnutls_record_send(session, buf, len);
@@ -95,7 +95,7 @@ int tls_send_data_from_fd(int fd, unsigned long len)
 		return -1;
 
 	while (len > 0) {
-		int ret, sent;
+		ssize_t ret, sent;
 
 		copied = read(fd, buf, min(len, buf_size));
 		if (copied <= 0) {
@@ -119,7 +119,7 @@ err:
 
 ssize_t tls_recv(void *buf, size_t len, int flags)
 {
-	int ret;
+	ssize_t ret;
 
 	tls_sk_flags = flags;
 	ret = gnutls_record_recv(session, buf, len);
@@ -163,7 +163,7 @@ int tls_recv_data_to_fd(int fd, unsigned long len)
 	gnutls_packet_t packet;
 
 	while (len > 0) {
-		int ret, w;
+		ssize_t ret, w;
 		gnutls_datum_t pdata;
 
 		ret = gnutls_record_recv_packet(session, &packet);
@@ -301,7 +301,7 @@ static int tls_x509_setup_creds(void)
 static ssize_t _tls_push_cb(void *p, const void *data, size_t sz)
 {
 	int fd = *(int *)(p);
-	int ret = send(fd, data, sz, tls_sk_flags);
+	ssize_t ret = send(fd, data, sz, tls_sk_flags);
 	if (ret < 0 && errno != EAGAIN) {
 		int _errno = errno;
 		pr_perror("Push callback send failed");
@@ -313,7 +313,7 @@ static ssize_t _tls_push_cb(void *p, const void *data, size_t sz)
 static ssize_t _tls_pull_cb(void *p, void *data, size_t sz)
 {
 	int fd = *(int *)(p);
-	int ret = recv(fd, data, sz, tls_sk_flags);
+	ssize_t ret = recv(fd, data, sz, tls_sk_flags);
 	if (ret < 0 && errno != EAGAIN) {
 		int _errno = errno;
 		pr_perror("Pull callback recv failed");

From 4fdf3db31ecbe687ff794a7e75dad6e8efdd09bf Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Thu, 16 Dec 2021 14:26:53 +0000
Subject: [PATCH 0844/1854] tls: add more comments

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 criu/tls.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/criu/tls.c b/criu/tls.c
index 626e529f8..9985b037d 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -40,13 +40,19 @@ void tls_terminate_session(void)
 
 	if (session) {
 		do {
-			/* don't wait for peer to close connection */
+			/*
+			 * Initiate a connection shutdown but don't
+			 * wait for peer to close connection.
+			 */
 			ret = gnutls_bye(session, GNUTLS_SHUT_WR);
 		} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
+		/* Free the session object */
 		gnutls_deinit(session);
 	}
 
 	tls_sk = -1;
+
+	/* Free the credentials object */
 	if (x509_cred)
 		gnutls_certificate_free_credentials(x509_cred);
 }
@@ -229,6 +235,7 @@ static int tls_handshake(void)
 {
 	int ret = -1;
 	while (ret != GNUTLS_E_SUCCESS) {
+		/* Establish TLS session */
 		ret = gnutls_handshake(session);
 		if (gnutls_error_is_fatal(ret)) {
 			tls_perror("TLS handshake failed", ret);
@@ -257,6 +264,7 @@ static int tls_x509_setup_creds(void)
 	if (opts.tls_key)
 		key = opts.tls_key;
 
+	/* Load the trusted CA certificates */
 	ret = gnutls_certificate_allocate_credentials(&x509_cred);
 	if (ret != GNUTLS_E_SUCCESS) {
 		tls_perror("Failed to allocate x509 credentials", ret);
@@ -298,6 +306,10 @@ static int tls_x509_setup_creds(void)
 	return 0;
 }
 
+/**
+ * A function used by gnutls to send data. It returns a positive
+ * number indicating the bytes sent, and -1 on error.
+ */
 static ssize_t _tls_push_cb(void *p, const void *data, size_t sz)
 {
 	int fd = *(int *)(p);
@@ -310,6 +322,11 @@ static ssize_t _tls_push_cb(void *p, const void *data, size_t sz)
 	return ret;
 }
 
+/**
+ * A callback function used by gnutls to receive data.
+ * It returns 0 on connection termination, a positive number
+ * indicating the number of bytes received, and -1 on error.
+ */
 static ssize_t _tls_pull_cb(void *p, void *data, size_t sz)
 {
 	int fd = *(int *)(p);
@@ -326,26 +343,33 @@ static int tls_x509_setup_session(unsigned int flags)
 {
 	int ret;
 
+	/* Create the session object */
 	ret = gnutls_init(&session, flags);
 	if (ret != GNUTLS_E_SUCCESS) {
 		tls_perror("Failed to initialize session", ret);
 		return -1;
 	}
 
+	/* Install the trusted certificates */
 	ret = gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 	if (ret != GNUTLS_E_SUCCESS) {
 		tls_perror("Failed to set session credentials", ret);
 		return -1;
 	}
 
+	/* Configure the cipher preferences */
 	ret = gnutls_set_default_priority(session);
 	if (ret != GNUTLS_E_SUCCESS) {
 		tls_perror("Failed to set priority", ret);
 		return -1;
 	}
 
+	/* Associate the socket with the session object */
 	gnutls_transport_set_ptr(session, &tls_sk);
+
+	/* Set a push function for gnutls to use to send data */
 	gnutls_transport_set_push_function(session, _tls_push_cb);
+	/* set a pull function for gnutls to use to receive data */
 	gnutls_transport_set_pull_function(session, _tls_pull_cb);
 
 	if (flags == GNUTLS_SERVER) {

From 73d1d076962b0818a3cdb77cbc203131cb9dc6a6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 21 Dec 2021 21:59:13 -0800
Subject: [PATCH 0845/1854] uffd: call disconnect_from_page_server to shutdown
 a page-server connection

We need to be sure that page-server doesn't wait for a new command when we
call gnutls_bye() that sends an alert containing a close request.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/uffd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index f01e6999b..45ac8ba77 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1468,7 +1468,7 @@ int cr_lazy_pages(bool daemon)
 
 	ret = handle_requests(epollfd, &events, nr_fds);
 
-	tls_terminate_session();
+	disconnect_from_page_server();
 
 	xfree(events);
 	return ret;

From 13b726ebc3b64d6b13f9b44f0cb17318df92d62e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 22 Dec 2021 09:36:09 -0800
Subject: [PATCH 0846/1854] tls: allow to terminate connections synchronously

GNUTLS_SHUT_RDWR sends an alert containing a close request and waits for
the peer to reply with the same message.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/tls.h | 4 ++--
 criu/page-xfer.c   | 5 +++--
 criu/tls.c         | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/criu/include/tls.h b/criu/include/tls.h
index 26f9976fd..f563c092c 100644
--- a/criu/include/tls.h
+++ b/criu/include/tls.h
@@ -4,7 +4,7 @@
 #ifdef CONFIG_GNUTLS
 
 int tls_x509_init(int sockfd, bool is_server);
-void tls_terminate_session(void);
+void tls_terminate_session(bool async);
 
 ssize_t tls_send(const void *buf, size_t len, int flags);
 ssize_t tls_recv(void *buf, size_t len, int flags);
@@ -19,7 +19,7 @@ int tls_recv_data_to_fd(int fd, unsigned long len);
 #define tls_recv(buf, len, flags)	 (-1)
 #define tls_send_data_from_fd(fd, len)	 (-1)
 #define tls_recv_data_to_fd(fd, len)	 (-1)
-#define tls_terminate_session()
+#define tls_terminate_session(async)
 
 #endif /* CONFIG_HAS_GNUTLS */
 
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 9adf2c8b2..7ff07680f 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -1259,6 +1259,8 @@ static int page_server_serve(int sk)
 		ret = -1;
 	}
 
+	tls_terminate_session(ret != 0);
+
 	if (ret == 0 && opts.ps_socket == -1) {
 		char c;
 
@@ -1272,7 +1274,6 @@ static int page_server_serve(int sk)
 		}
 	}
 
-	tls_terminate_session();
 	page_server_close();
 
 	pr_info("Session over\n");
@@ -1504,7 +1505,7 @@ int disconnect_from_page_server(void)
 
 	ret = 0;
 out:
-	tls_terminate_session();
+	tls_terminate_session(ret != 0);
 	close_safe(&page_server_sk);
 
 	return ret ?: status;
diff --git a/criu/tls.c b/criu/tls.c
index 9985b037d..4feaf613b 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -31,7 +31,7 @@ static gnutls_certificate_credentials_t x509_cred;
 static int tls_sk = -1;
 static int tls_sk_flags = 0;
 
-void tls_terminate_session(void)
+void tls_terminate_session(bool async)
 {
 	int ret;
 
@@ -44,7 +44,7 @@ void tls_terminate_session(void)
 			 * Initiate a connection shutdown but don't
 			 * wait for peer to close connection.
 			 */
-			ret = gnutls_bye(session, GNUTLS_SHUT_WR);
+			ret = gnutls_bye(session, async ? GNUTLS_SHUT_WR : GNUTLS_SHUT_RDWR);
 		} while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
 		/* Free the session object */
 		gnutls_deinit(session);
@@ -399,6 +399,6 @@ int tls_x509_init(int sockfd, bool is_server)
 
 	return 0;
 err:
-	tls_terminate_session();
+	tls_terminate_session(true);
 	return -1;
 }

From c59abfa81a8a8bf54045ccff39057e49f66a9f47 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 22 Dec 2021 09:59:11 -0800
Subject: [PATCH 0847/1854] page-xfer: stop waiting for a new command after a
 close command

There is no reason to do that and in case of tls, __recv returns EAGAIN
instead of 0.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/page-xfer.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 7ff07680f..60c793009 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -50,8 +50,8 @@ static void psi2iovec(struct page_server_iov *ps, struct iovec *iov)
 #define PS_IOV_ADD_F  6
 #define PS_IOV_GET    7
 
-#define PS_IOV_FLUSH	     0x1023
-#define PS_IOV_FLUSH_N_CLOSE 0x1024
+#define PS_IOV_CLOSE	   0x1023
+#define PS_IOV_FORCE_CLOSE 0x1024
 
 #define PS_CMD_BITS 16
 #define PS_CMD_MASK ((1 << PS_CMD_BITS) - 1)
@@ -1223,8 +1223,8 @@ static int page_server_serve(int sk)
 			ret = page_server_add(sk, &pi, flags);
 			break;
 		}
-		case PS_IOV_FLUSH:
-		case PS_IOV_FLUSH_N_CLOSE: {
+		case PS_IOV_CLOSE:
+		case PS_IOV_FORCE_CLOSE: {
 			int32_t status = 0;
 
 			ret = 0;
@@ -1250,7 +1250,9 @@ static int page_server_serve(int sk)
 			break;
 		}
 
-		if (ret || (pi.cmd == PS_IOV_FLUSH_N_CLOSE))
+		if (ret)
+			break;
+		if (pi.cmd == PS_IOV_CLOSE || pi.cmd == PS_IOV_FORCE_CLOSE)
 			break;
 	}
 
@@ -1491,9 +1493,9 @@ int disconnect_from_page_server(void)
 		 * the parent process) so we must order the
 		 * page-server to terminate itself.
 		 */
-		pi.cmd = PS_IOV_FLUSH_N_CLOSE;
+		pi.cmd = PS_IOV_FORCE_CLOSE;
 	else
-		pi.cmd = PS_IOV_FLUSH;
+		pi.cmd = PS_IOV_CLOSE;
 
 	if (send_psi(page_server_sk, &pi))
 		goto out;

From 8775cf3a50c11cb2cf4dda615b81567fd2d71d28 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 22 Dec 2021 17:03:04 -0800
Subject: [PATCH 0848/1854] ci: reenable the lazy-thp test in the lazy-remote
 mode

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/ci/run-ci-tests.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index bf7331142..7eab9f2dc 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -212,10 +212,8 @@ LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
 ./test/zdtm.py run $LAZY_OPTS --lazy-pages
 # shellcheck disable=SC2086
 ./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages
-# FIXME: post-copy migration of THP over TLS (sometimes) fails with:
-#     Error (criu/tls.c:321): tls: Pull callback recv failed: Connection reset by peer
 # shellcheck disable=SC2086
-./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls -x lazy-thp
+./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
 
 bash -x ./test/jenkins/criu-fault.sh
 if [ "$UNAME_M" == "x86_64" ]; then

From f650987469d1b9d2ccd8d1713420603e74d9d868 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 22 Dec 2021 17:06:21 -0800
Subject: [PATCH 0849/1854] test: log testname.out.inprogress if a test has
 failed

This is required if the test failed by timeout.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 086ae0285..c0e24a41a 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -589,11 +589,12 @@ class zdtm_test:
             os.unlink(self.__pidfile())
 
     def print_output(self):
-        if os.access(self.__name + '.out', os.R_OK):
-            print("Test output: " + "=" * 32)
-            with open(self.__name + '.out') as output:
-                print(output.read())
-            print(" <<< " + "=" * 32)
+        for postfix in ['.out', '.out.inprogress']:
+            if os.access(self.__name + postfix, os.R_OK):
+                print("Test output: " + "=" * 32)
+                with open(self.__name + postfix) as output:
+                    print(output.read())
+                print(" <<< " + "=" * 32)
 
     def static(self):
         return self.__name.split('/')[1] == 'static'

From ebd03383f2b55cf56af0c0515387c28e37e9c98f Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 22 Dec 2021 17:08:16 -0800
Subject: [PATCH 0850/1854] zdtm: print tails of all logs if a test has failed

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index c0e24a41a..14e6aa1b0 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1475,17 +1475,17 @@ class criu:
             self.__lazy_pages_p.terminate()
             print("criu lazy-pages exited with %s" %
                   self.__lazy_pages_p.wait())
-            grep_errors(os.path.join(self.__ddir(), "lazy-pages.log"))
+            grep_errors(os.path.join(self.__ddir(), "lazy-pages.log"), err=True)
             self.__lazy_pages_p = None
         if self.__page_server_p:
             self.__page_server_p.terminate()
             print("criu page-server exited with %s" %
                   self.__page_server_p.wait())
-            grep_errors(os.path.join(self.__ddir(), "page-server.log"))
+            grep_errors(os.path.join(self.__ddir(), "page-server.log"), err=True)
             self.__page_server_p = None
         if self.__dump_process:
             self.__dump_process.terminate()
-            print("criu dump exited with %s" % self.__dump_process.wait())
+            print("criu dump exited with %s" % self.__dump_process.wait(), err=True)
             grep_errors(os.path.join(self.__ddir(), "dump.log"))
             self.__dump_process = None
         if self.__img_streamer_process:

From 1b912802ddad17207667a367edc88bcff218cbb8 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 22 Dec 2021 17:08:42 -0800
Subject: [PATCH 0851/1854] zdtm/static/uffd-events: add more log messages

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/uffd-events.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/zdtm/static/uffd-events.c b/test/zdtm/static/uffd-events.c
index c811bcf4c..edd6c09ca 100644
--- a/test/zdtm/static/uffd-events.c
+++ b/test/zdtm/static/uffd-events.c
@@ -153,28 +153,30 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	test_msg("For a child process\n");
 	pid = fork();
 	if (pid < 0) {
 		fail("Can't fork");
 		return 1;
 	}
 
-	/* check madvise(MADV_DONTNEED) */
+	test_msg("Check madvise(MADV_DONTNEED)\n");
 	if (check_madv_dn(1))
 		return 1;
 
-	/* check growing mremap */
+	test_msg("Check growing mremap\n");
 	if (check_mremap_grow(2))
 		return 1;
 
-	/* check swapped mappings */
+	test_msg("Check swapped mappings\n");
 	if (check_swapped_mappings(3))
 		return 1;
 
 	if (pid) {
-		int status;
+		int status = -1;
 
-		waitpid(-1, &status, 0);
+		test_msg("Wait for the child %d\n", pid);
+		waitpid(pid, &status, 0);
 		if (status) {
 			fail("child failed");
 			return status;

From 1e7c62047ab152d818c32e6593cdf949b24c48fa Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 17 Dec 2021 14:58:47 +0300
Subject: [PATCH 0852/1854] mount: split check_mountpoint_fd from
 __open_mountpoint

Now we can reuse "check" part separately in other places.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/mount.c         | 64 ++++++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 7705279e4..23448d5fc 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -109,6 +109,7 @@ extern int mntns_get_root_by_mnt_id(int mnt_id);
 extern struct ns_id *lookup_nsid_by_mnt_id(int mnt_id);
 
 extern int open_mount(unsigned int s_dev);
+extern int check_mountpoint_fd(struct mount_info *pm, int mnt_fd);
 extern int __open_mountpoint(struct mount_info *pm, int mnt_fd);
 extern int mnt_is_dir(struct mount_info *pm);
 extern int open_mountpoint(struct mount_info *pm);
diff --git a/criu/mount.c b/criu/mount.c
index d75ca5598..f6347fd9d 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1018,16 +1018,44 @@ int mnt_is_dir(struct mount_info *pm)
 	return 0;
 }
 
+int check_mountpoint_fd(struct mount_info *pm, int mnt_fd)
+{
+	struct stat st;
+	int ret, dev;
+
+	ret = fstat(mnt_fd, &st);
+	if (ret < 0) {
+		pr_perror("fstat(%s) failed", pm->ns_mountpoint);
+		return -1;
+	}
+
+	if (pm->s_dev_rt == MOUNT_INVALID_DEV) {
+		pr_err("Resolving over invalid device for %#x %s %s\n", pm->s_dev, pm->fstype->name, pm->ns_mountpoint);
+		return -1;
+	}
+
+	dev = MKKDEV(major(st.st_dev), minor(st.st_dev));
+	/*
+	 * Always check for @s_dev_rt here, because the @s_dev
+	 * from the image (in case of restore) has all rights
+	 * to not match the device (say it's migrated and kernel
+	 * allocates new device ID).
+	 */
+	if (dev != pm->s_dev_rt) {
+		pr_err("The file system %#x %#x (%#x) %s %s is inaccessible\n", pm->s_dev, pm->s_dev_rt, dev,
+		       pm->fstype->name, pm->ns_mountpoint);
+		return -1;
+	}
+
+	return 0;
+}
+
 /*
  * mnt_fd is a file descriptor on the mountpoint, which is closed in an error case.
  * If mnt_fd is -1, the mountpoint will be opened by this function.
  */
 int __open_mountpoint(struct mount_info *pm, int mnt_fd)
 {
-	struct stat st;
-	int dev;
-	int ret;
-
 	if (mnt_fd == -1) {
 		int mntns_root;
 
@@ -1042,34 +1070,12 @@ int __open_mountpoint(struct mount_info *pm, int mnt_fd)
 		}
 	}
 
-	ret = fstat(mnt_fd, &st);
-	if (ret < 0) {
-		pr_perror("fstat(%s) failed", pm->ns_mountpoint);
-		goto err;
-	}
-
-	if (pm->s_dev_rt == MOUNT_INVALID_DEV) {
-		pr_err("Resolving over invalid device for %#x %s %s\n", pm->s_dev, pm->fstype->name, pm->ns_mountpoint);
-		goto err;
-	}
-
-	dev = MKKDEV(major(st.st_dev), minor(st.st_dev));
-	/*
-	 * Always check for @s_dev_rt here, because the @s_dev
-	 * from the image (in case of restore) has all rights
-	 * to not match the device (say it's migrated and kernel
-	 * allocates new device ID).
-	 */
-	if (dev != pm->s_dev_rt) {
-		pr_err("The file system %#x %#x (%#x) %s %s is inaccessible\n", pm->s_dev, pm->s_dev_rt, dev,
-		       pm->fstype->name, pm->ns_mountpoint);
-		goto err;
+	if (check_mountpoint_fd(pm, mnt_fd)) {
+		close(mnt_fd);
+		return -1;
 	}
 
 	return mnt_fd;
-err:
-	close(mnt_fd);
-	return -1;
 }
 
 int open_mount(unsigned int s_dev)

From 15c42696cff291a18c6d57130a428f7f0a895ebb Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 17 Dec 2021 15:13:35 +0300
Subject: [PATCH 0853/1854] mount: remove mnt_fd argument of __open_mountpoint

Only place where we used __open_mountpoint with non -1 mnt_fd is
open_mountpoint. Let's use check_mountpoint_fd for this case, so that we
now can remove mnt_id argument. Also now __open_mountpoint actually
always does open.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/fsnotify.c      |  4 ++--
 criu/include/mount.h |  2 +-
 criu/mount.c         | 26 ++++++++++++--------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index b5dd15dd8..22fb74973 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -132,7 +132,7 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 		if (!mnt_is_dir(m))
 			continue;
 
-		mntfd = __open_mountpoint(m, -1);
+		mntfd = __open_mountpoint(m);
 		pr_debug("\t\tTrying via mntid %d root %s ns_mountpoint @%s (%d)\n", m->mnt_id, m->root,
 			 m->ns_mountpoint, mntfd);
 		if (mntfd < 0)
@@ -206,7 +206,7 @@ static int open_handle(unsigned int s_dev, unsigned long i_ino, FhEntry *f_handl
 		if (m->s_dev != s_dev || !mnt_is_dir(m))
 			continue;
 
-		mntfd = __open_mountpoint(m, -1);
+		mntfd = __open_mountpoint(m);
 		if (mntfd < 0) {
 			pr_warn("Can't open mount for s_dev %x, continue\n", s_dev);
 			continue;
diff --git a/criu/include/mount.h b/criu/include/mount.h
index 23448d5fc..3f3a67afa 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -110,7 +110,7 @@ extern struct ns_id *lookup_nsid_by_mnt_id(int mnt_id);
 
 extern int open_mount(unsigned int s_dev);
 extern int check_mountpoint_fd(struct mount_info *pm, int mnt_fd);
-extern int __open_mountpoint(struct mount_info *pm, int mnt_fd);
+extern int __open_mountpoint(struct mount_info *pm);
 extern int mnt_is_dir(struct mount_info *pm);
 extern int open_mountpoint(struct mount_info *pm);
 
diff --git a/criu/mount.c b/criu/mount.c
index f6347fd9d..ab6d3ed10 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1054,20 +1054,18 @@ int check_mountpoint_fd(struct mount_info *pm, int mnt_fd)
  * mnt_fd is a file descriptor on the mountpoint, which is closed in an error case.
  * If mnt_fd is -1, the mountpoint will be opened by this function.
  */
-int __open_mountpoint(struct mount_info *pm, int mnt_fd)
+int __open_mountpoint(struct mount_info *pm)
 {
-	if (mnt_fd == -1) {
-		int mntns_root;
+	int mntns_root, mnt_fd;
 
-		mntns_root = mntns_get_root_fd(pm->nsid);
-		if (mntns_root < 0)
-			return -1;
+	mntns_root = mntns_get_root_fd(pm->nsid);
+	if (mntns_root < 0)
+		return -1;
 
-		mnt_fd = openat(mntns_root, pm->ns_mountpoint, O_RDONLY);
-		if (mnt_fd < 0) {
-			pr_perror("Can't open %s", pm->ns_mountpoint);
-			return -1;
-		}
+	mnt_fd = openat(mntns_root, pm->ns_mountpoint, O_RDONLY);
+	if (mnt_fd < 0) {
+		pr_perror("Can't open %s", pm->ns_mountpoint);
+		return -1;
 	}
 
 	if (check_mountpoint_fd(pm, mnt_fd)) {
@@ -1086,7 +1084,7 @@ int open_mount(unsigned int s_dev)
 	if (!m)
 		return -ENOENT;
 
-	return __open_mountpoint(m, -1);
+	return __open_mountpoint(m);
 }
 
 /* Bind-mount a mount point in a temporary place without children */
@@ -1350,7 +1348,7 @@ int open_mountpoint(struct mount_info *pm)
 
 	/* No overmounts and children - the entire mount is visible */
 	if (list_empty(&pm->children) && !mnt_is_overmounted(pm))
-		return __open_mountpoint(pm, -1);
+		return __open_mountpoint(pm);
 
 	pr_info("Mount is not fully visible %s\n", pm->mountpoint);
 
@@ -1413,7 +1411,7 @@ int open_mountpoint(struct mount_info *pm)
 		goto err;
 	}
 
-	return __open_mountpoint(pm, fd);
+	return fd < 0 ? __open_mountpoint(pm) : check_mountpoint_fd(pm, fd);
 err:
 	if (ns_old >= 0)
 		/* coverity[check_return] */

From bbf5f642decaf7d58dedbeea9f346b36ef3c95bc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Dec 2021 16:14:41 +0300
Subject: [PATCH 0854/1854] proc_parse: add helper to resolve sdev from fd

New get_sdev_from_fd helper first gets mnt_id from fd using fdinfo and
then converts mnt_id to sdev using mountinfo.

By default mnt_id to sdev conversion only works for mounts in mntinfo.

If parse_mountinfo argument is true, will also parse current process
mountinfo when looking for mount sdev, this should be used only with
temporary mounts just created by criu in current mntns.

v3: add argument to parse self mountinfo for auxiliary mounts

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/proc_parse.c    | 53 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 3f3a67afa..9c0d7c010 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -140,6 +140,7 @@ extern void clean_cr_time_mounts(void);
 
 extern bool add_skip_mount(const char *mountpoint);
 struct ns_id;
+extern int get_sdev_from_fd(int fd, unsigned int *sdev, bool parse_mountinfo);
 extern struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump);
 
 extern int check_mnt_id(void);
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 094f9b84e..3017a64e1 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1527,6 +1527,59 @@ out:
 	return exit_code;
 }
 
+static int get_mountinfo_sdev_from_mntid(int mnt_id, unsigned int *sdev)
+{
+	int exit_code = -1;
+	FILE *f;
+
+	f = fopen_proc(PROC_SELF, "mountinfo");
+	if (!f)
+		return -1;
+
+	while (fgets(buf, BUF_SIZE, f)) {
+		unsigned int kmaj, kmin;
+		int id;
+
+		if (sscanf(buf, "%i %*i %u:%u", &id, &kmaj, &kmin) != 3) {
+			pr_err("Failed to parse mountinfo line %s\n", buf);
+			goto err;
+		}
+
+		if (id == mnt_id) {
+			*sdev = MKKDEV(kmaj, kmin);
+			exit_code = 0;
+			break;
+		}
+	}
+err:
+	fclose(f);
+	return exit_code;
+}
+
+/* This works even on btrfs where stat does not show right sdev */
+int get_sdev_from_fd(int fd, unsigned int *sdev, bool parse_mountinfo)
+{
+	struct mount_info *mi;
+	int ret, mnt_id;
+
+	ret = get_fd_mntid(fd, &mnt_id);
+	if (ret < 0)
+		return -1;
+
+	/* Simple case mnt_id is in dumped mntns */
+	mi = lookup_mnt_id(mnt_id);
+	if (mi) {
+		*sdev = mi->s_dev_rt;
+		return 0;
+	}
+
+	if (!parse_mountinfo)
+		return -1;
+
+	/* Complex case mnt_id is in mntns created by criu */
+	return get_mountinfo_sdev_from_mntid(mnt_id, sdev);
+}
+
 struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 {
 	struct mount_info *list = NULL;

From 8ec214d3cbc60567f4083b4e9422600acd52bc5e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Dec 2021 12:57:23 +0300
Subject: [PATCH 0855/1854] mount/btrfs: make check_mountpoint_fd fallback to
 get_sdev_from_fd

We face that btrfs returns anonymous device in stat instead of real
superblock dev for volumes, thus all btrfs volume mounts does not pass
check_mountpoint_fd due to dev missmatch between stat and mountinfo. We
can use special helper get_sdev_from_fd instead of stat to try to get
real dev of fd for btrfs.

We move check_mountpoint_fd from open_mountpoint into get_clean_fd and
ns_open_mountpoint to the point where temporary mount we open fd to is
still in mountinfo, thus get_sdev_from_fd would be able to find tmp
mount in mountinfo.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/mount.c         | 49 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 9c0d7c010..b959d131c 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -109,6 +109,7 @@ extern int mntns_get_root_by_mnt_id(int mnt_id);
 extern struct ns_id *lookup_nsid_by_mnt_id(int mnt_id);
 
 extern int open_mount(unsigned int s_dev);
+extern int __check_mountpoint_fd(struct mount_info *pm, int mnt_fd, bool parse_mountinfo);
 extern int check_mountpoint_fd(struct mount_info *pm, int mnt_fd);
 extern int __open_mountpoint(struct mount_info *pm);
 extern int mnt_is_dir(struct mount_info *pm);
diff --git a/criu/mount.c b/criu/mount.c
index ab6d3ed10..4b57ac703 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1018,10 +1018,11 @@ int mnt_is_dir(struct mount_info *pm)
 	return 0;
 }
 
-int check_mountpoint_fd(struct mount_info *pm, int mnt_fd)
+int __check_mountpoint_fd(struct mount_info *pm, int mnt_fd, bool parse_mountinfo)
 {
 	struct stat st;
-	int ret, dev;
+	unsigned int dev;
+	int ret;
 
 	ret = fstat(mnt_fd, &st);
 	if (ret < 0) {
@@ -1042,6 +1043,14 @@ int check_mountpoint_fd(struct mount_info *pm, int mnt_fd)
 	 * allocates new device ID).
 	 */
 	if (dev != pm->s_dev_rt) {
+		/*
+		 * For btrfs device numbers in stat and mountinfo can be
+		 * different, fallback to get_sdev_from_fd to get right dev.
+		 */
+		if (!strcmp(pm->fstype->name, "btrfs") && !get_sdev_from_fd(mnt_fd, &dev, parse_mountinfo) &&
+		    dev == pm->s_dev_rt)
+			return 0;
+
 		pr_err("The file system %#x %#x (%#x) %s %s is inaccessible\n", pm->s_dev, pm->s_dev_rt, dev,
 		       pm->fstype->name, pm->ns_mountpoint);
 		return -1;
@@ -1050,6 +1059,11 @@ int check_mountpoint_fd(struct mount_info *pm, int mnt_fd)
 	return 0;
 }
 
+int check_mountpoint_fd(struct mount_info *pm, int mnt_fd)
+{
+	return __check_mountpoint_fd(pm, mnt_fd, false);
+}
+
 /*
  * mnt_fd is a file descriptor on the mountpoint, which is closed in an error case.
  * If mnt_fd is -1, the mountpoint will be opened by this function.
@@ -1114,12 +1128,34 @@ static int get_clean_fd(struct mount_info *mi)
 	char *mnt_path = NULL;
 	char mnt_path_tmp[] = "/tmp/cr-tmpfs.XXXXXX";
 	char mnt_path_root[] = "/cr-tmpfs.XXXXXX";
+	int fd;
 
 	mnt_path = get_clean_mnt(mi, mnt_path_tmp, mnt_path_root);
 	if (!mnt_path)
 		return -1;
 
-	return open_detach_mount(mnt_path);
+	fd = open(mnt_path, O_RDONLY | O_DIRECTORY, 0);
+	if (fd < 0) {
+		pr_perror("Can't open directory %s", mnt_path);
+	} else {
+		if (__check_mountpoint_fd(mi, fd, true))
+			goto err_close;
+	}
+
+	if (umount2(mnt_path, MNT_DETACH)) {
+		pr_perror("Can't detach mount %s", mnt_path);
+		goto err_close;
+	}
+
+	if (rmdir(mnt_path)) {
+		pr_perror("Can't remove tmp dir %s", mnt_path);
+		goto err_close;
+	}
+
+	return fd;
+err_close:
+	close_safe(&fd);
+	return -1;
 }
 
 /*
@@ -1337,6 +1373,11 @@ int ns_open_mountpoint(void *arg)
 		goto err;
 	}
 
+	if (__check_mountpoint_fd(mi, *fd, true)) {
+		close(*fd);
+		goto err;
+	}
+
 	return 0;
 err:
 	return 1;
@@ -1411,7 +1452,7 @@ int open_mountpoint(struct mount_info *pm)
 		goto err;
 	}
 
-	return fd < 0 ? __open_mountpoint(pm) : check_mountpoint_fd(pm, fd);
+	return fd < 0 ? __open_mountpoint(pm) : fd;
 err:
 	if (ns_old >= 0)
 		/* coverity[check_return] */

From 6f9d62eb38165d4b9adbfd794ee3b32b013fb769 Mon Sep 17 00:00:00 2001
From: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
Date: Tue, 28 Dec 2021 19:30:09 +0000
Subject: [PATCH 0856/1854] ci: test criu-image-streamer with all tests

All the bugs that were in the way got fixed. We can enable all tests.

Signed-off-by: Nicolas Viennot <Nicolas.Viennot@twosigma.com>
---
 scripts/ci/run-ci-tests.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7eab9f2dc..d0cd55f7c 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -62,11 +62,9 @@ ci_prep () {
 }
 
 test_stream() {
-	# We must test CRIU features that dump content into an image file to ensure
-	# streaming compatibility.
-	STREAM_TEST_PATTERN='.*(ghost|fifo|unlink|memfd|shmem|socket_queue).*'
+	# Testing CRIU streaming to criu-image-streamer
 	# shellcheck disable=SC2086
-	./test/zdtm.py run --stream -p 2 --keep-going -T "$STREAM_TEST_PATTERN" $ZDTM_OPTS
+	./test/zdtm.py run --stream -p 2 --keep-going -a $ZDTM_OPTS
 }
 
 print_header() {

From 29e221bb7a5ec921008998033486c1b0b198aad3 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 10 Jan 2022 10:37:19 +0000
Subject: [PATCH 0857/1854] readme: add docker test badge

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd86b2c15..6b86cac9e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 ![X86_64 GCC Test](https://github.com/checkpoint-restore/criu/workflows/X86_64%20GCC%20Test/badge.svg)
-![Podman Test](https://github.com/checkpoint-restore/criu/workflows/Podman%20Test/badge.svg)
+![Docker Test](https://github.com/checkpoint-restore/criu/actions/workflows/docker-test.yml/badge.svg)
+![Podman Test](https://github.com/checkpoint-restore/criu/actions/workflows/podman-test.yml/badge.svg)
 [![CircleCI](https://circleci.com/gh/checkpoint-restore/criu.svg?style=svg)](https://circleci.com/gh/checkpoint-restore/criu)
 
 <p align="center"><img src="https://criu.org/w/images/1/1c/CRIU.svg" width="256px"/></p>

From 7400d91f83cfbefa91f1d2207bcd65fc06a3cbbb Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 10 Jan 2022 10:37:52 +0000
Subject: [PATCH 0858/1854] contributing: remove old badges and logo

CI badges and logo are already present in the readme file.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 CONTRIBUTING.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 96972296e..864caf93e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,3 @@
-[![master](https://travis-ci.org/checkpoint-restore/criu.svg?branch=master)](https://travis-ci.org/checkpoint-restore/criu)
-[![development](https://travis-ci.org/checkpoint-restore/criu.svg?branch=criu-dev)](https://travis-ci.org/checkpoint-restore/criu)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/55251ec7db28421da4481fc7c1cb0cee)](https://www.codacy.com/app/xemul/criu?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=xemul/criu&amp;utm_campaign=Badge_Grade)
-<p align="center"><img src="https://criu.org/w/images/1/1c/CRIU.svg" width="128px"/></p>
-
 ## How to contribute to CRIU
 
 CRIU project is (almost) the never-ending story, because we have to always keep up with the

From 7f4265dc0bf5d01823163f89d583ef96db2d4b0f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 3 Dec 2021 17:13:27 +0000
Subject: [PATCH 0859/1854] ci: update to latest Vagrant and Fedora images

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 40c8416e1..4a4a16445 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# This script is used to run vagrant based tests on Travis.
-# This script is started via sudo from .travis.yml
+# This script is used to run vagrant based tests on Cirrus CI.
+# This script is started via .cirrus.yml
 
 set -e
 set -x
 
-VAGRANT_VERSION=2.2.16
-FEDORA_VERSION=34
-FEDORA_BOX_VERSION=34.20210423.0
+VAGRANT_VERSION=2.2.19
+FEDORA_VERSION=35
+FEDORA_BOX_VERSION=35.20211026.0
 
 setup() {
 	if [ -n "$TRAVIS" ]; then

From 4c4b2159deffa14bce1eeb27621caa583a858f5c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 16 Jan 2022 11:17:33 +0000
Subject: [PATCH 0860/1854] ci: added .lgtm.yml file

A couple of months (or years) ago I looked into lgtm.com for CRIU. Today
on a pull request I saw result from lgtm.com for the first time and it
failed. Not sure what triggered the lgtm.com message into the CRIU
repository, but with the .lgtm.yml file in this commit lgtm.com can
actually build CRIU.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .lgtm.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .lgtm.yml

diff --git a/.lgtm.yml b/.lgtm.yml
new file mode 100644
index 000000000..a28c35de0
--- /dev/null
+++ b/.lgtm.yml
@@ -0,0 +1,30 @@
+extraction:
+  cpp:
+    prepare:
+      packages:
+      - "protobuf-c-compiler"
+      - "libprotobuf-c-dev"
+      - "libprotobuf-dev"
+      - "build-essential"
+      - "libprotobuf-dev"
+      - "libprotobuf-c-dev"
+      - "protobuf-c-compiler"
+      - "protobuf-compiler"
+      - "python3-protobuf"
+      - "libnet-dev"
+      - "pkg-config"
+      - "libnl-3-dev"
+      - "libbsd0"
+      - "libbsd-dev"
+      - "iproute2"
+      - "libcap-dev"
+      - "libaio-dev"
+      - "python3-yaml"
+      - "libnl-route-3-dev"
+      - "python-future"
+      - "gnutls-dev"
+    configure:
+      command:
+      - "ls -laR images/google"
+      - "ln -s /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto"
+      - "ls -laR images/google"

From b00b61f0e688bf124b6e4444db331c8be90fe257 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 6 Dec 2021 16:51:21 +0000
Subject: [PATCH 0861/1854] lib: introduce feature check in libcriu

This commit adds feature check support to libcriu. It already exists in
the CLI and RPC and this just extends it to libcriu.

This commit provides one function to do all possible feature checks in
one call. The parameter to the feature check function is a structure and
the user can enable which features should be checked.

Using a structure makes the function extensible without the need to
break the API/ABI in the future.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/c/criu.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/c/criu.h | 29 +++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index 500574e33..dea5896f7 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1925,3 +1925,75 @@ int criu_join_ns_add(const char *ns, const char *ns_file, const char *extra_opt)
 {
 	return criu_local_join_ns_add(global_opts, ns, ns_file, extra_opt);
 }
+
+int criu_local_feature_check(criu_opts *opts, struct criu_feature_check *features, size_t size)
+{
+	CriuFeatures criu_features = CRIU_FEATURES__INIT;
+	struct criu_feature_check features_copy = { 0 };
+	CriuReq req = CRIU_REQ__INIT;
+	CriuResp *resp = NULL;
+	int ret = -1;
+
+	saved_errno = 0;
+
+	if (!features)
+		goto exit;
+
+	if (size > sizeof(struct criu_feature_check))
+		goto exit;
+
+	memcpy(&features_copy, features, size);
+
+	req.type = CRIU_REQ_TYPE__FEATURE_CHECK;
+	req.opts = opts->rpc;
+
+	if (features_copy.mem_track) {
+		criu_features.has_mem_track = true;
+		criu_features.mem_track = true;
+	}
+	if (features_copy.lazy_pages) {
+		criu_features.has_lazy_pages = true;
+		criu_features.lazy_pages = true;
+	}
+	if (features_copy.pidfd_store) {
+		criu_features.has_pidfd_store = true;
+		criu_features.pidfd_store = true;
+	}
+	req.features = &criu_features;
+
+	ret = send_req_and_recv_resp(opts, &req, &resp);
+	if (ret)
+		goto exit;
+
+	memset(&features_copy, 0, sizeof(struct criu_feature_check));
+
+	if (resp->success) {
+		if (resp->features->has_mem_track) {
+			features_copy.mem_track = resp->features->mem_track;
+		}
+		if (resp->features->has_lazy_pages) {
+			features_copy.lazy_pages = resp->features->lazy_pages;
+		}
+		if (resp->features->has_pidfd_store) {
+			features_copy.pidfd_store = resp->features->pidfd_store;
+		}
+		memcpy(features, &features_copy, size);
+	} else {
+		ret = -EBADE;
+	}
+
+exit:
+	if (resp)
+		criu_resp__free_unpacked(resp, NULL);
+
+	swrk_wait(opts);
+
+	errno = saved_errno;
+
+	return ret;
+}
+
+int criu_feature_check(struct criu_feature_check *features, size_t size)
+{
+	return criu_local_feature_check(global_opts, features, size);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index c6d4f50a8..aed2c3481 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -288,6 +288,35 @@ int criu_local_dump_iters(criu_opts *opts, int (*more)(criu_predump_info pi));
 int criu_local_get_version(criu_opts *opts);
 int criu_local_check_version(criu_opts *opts, int minimum);
 
+/*
+ * Feature checking allows the user to check if CRIU supports
+ * certain features. There are CRIU features which do not depend
+ * on the version of CRIU but on kernel features or architecture.
+ *
+ * One example is memory tracking. Memory tracking can be disabled
+ * in the kernel or there are architectures which do not support
+ * it (aarch64 for example). By using the feature check a libcriu
+ * user can easily query CRIU if a certain feature is available.
+ *
+ * The features which should be checked can be marked in the
+ * structure 'struct criu_feature_check'. Each structure member
+ * that is set to true will result in CRIU checking for the
+ * availability of that feature in the current combination of
+ * CRIU/kernel/architecture.
+ *
+ * Available features will be set to true when the function
+ * returns successfully. Missing features will be set to false.
+ */
+
+struct criu_feature_check {
+	bool mem_track;
+	bool lazy_pages;
+	bool pidfd_store;
+};
+
+int criu_feature_check(struct criu_feature_check *features, size_t size);
+int criu_local_feature_check(criu_opts *opts, struct criu_feature_check *features, size_t size);
+
 #ifdef __GNUG__
 }
 #endif

From 908e5dd95ddb4fb81be750e4c6dff6fbb444de29 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 6 Dec 2021 16:51:21 +0000
Subject: [PATCH 0862/1854] lib: added tests for feature check in libcriu

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/libcriu/.gitignore           |  1 +
 test/others/libcriu/Makefile             |  1 +
 test/others/libcriu/run.sh               | 10 ++++
 test/others/libcriu/test_feature_check.c | 65 ++++++++++++++++++++++++
 4 files changed, 77 insertions(+)
 create mode 100644 test/others/libcriu/test_feature_check.c

diff --git a/test/others/libcriu/.gitignore b/test/others/libcriu/.gitignore
index 15abf07ac..0f6e52bb4 100644
--- a/test/others/libcriu/.gitignore
+++ b/test/others/libcriu/.gitignore
@@ -5,5 +5,6 @@ test_self
 test_sub
 test_join_ns
 test_pre_dump
+test_feature_check
 output/
 libcriu.so.*
diff --git a/test/others/libcriu/Makefile b/test/others/libcriu/Makefile
index 581574da0..ae7330533 100644
--- a/test/others/libcriu/Makefile
+++ b/test/others/libcriu/Makefile
@@ -7,6 +7,7 @@ TESTS += test_iters
 TESTS += test_errno
 TESTS += test_join_ns
 TESTS += test_pre_dump
+TESTS += test_feature_check
 
 all: $(TESTS)
 .PHONY: all
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 1b6c73448..77bdfb87e 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -62,6 +62,16 @@ if [ "$(uname -m)" = "x86_64" ]; then
 fi
 run_test test_errno
 run_test test_join_ns
+if criu check --feature mem_dirty_track > /dev/null; then
+	export CRIU_FEATURE_MEM_TRACK=1
+fi
+if criu check --feature uffd-noncoop > /dev/null; then
+	export CRIU_FEATURE_LAZY_PAGES=1
+fi
+if criu check --feature pidfd_store > /dev/null; then
+	export CRIU_FEATURE_PIDFD_STORE=1
+fi
+run_test test_feature_check
 
 echo "== Tests done"
 make libcriu_clean
diff --git a/test/others/libcriu/test_feature_check.c b/test/others/libcriu/test_feature_check.c
new file mode 100644
index 000000000..d88e0de23
--- /dev/null
+++ b/test/others/libcriu/test_feature_check.c
@@ -0,0 +1,65 @@
+#include "criu.h"
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include "lib.h"
+
+int main(int argc, char **argv)
+{
+	int ret;
+	char *env;
+	bool mem_track = 0;
+	bool lazy_pages = 0;
+	bool pidfd_store = 0;
+	struct criu_feature_check features = {
+		.mem_track = true,
+		.lazy_pages = true,
+		.pidfd_store = true,
+	};
+
+	printf("--- Start feature check ---\n");
+	criu_init_opts();
+	criu_set_service_binary(argv[1]);
+
+	env = getenv("CRIU_FEATURE_MEM_TRACK");
+	if (env) {
+		mem_track = true;
+	}
+	env = getenv("CRIU_FEATURE_LAZY_PAGES");
+	if (env) {
+		lazy_pages = true;
+	}
+	env = getenv("CRIU_FEATURE_PIDFD_STORE");
+	if (env) {
+		pidfd_store = true;
+	}
+
+	ret = criu_feature_check(&features, sizeof(features) + 1);
+	printf("   `- passing too large structure to libcriu should return -1: %d\n", ret);
+	if (ret != -1)
+		return -1;
+
+	ret = criu_feature_check(&features, sizeof(features));
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		return ret;
+	}
+
+	printf("   `- mem_track  : %d - expected : %d\n", features.mem_track, mem_track);
+	if (features.mem_track != mem_track)
+		return -1;
+	printf("   `- lazy_pages : %d - expected : %d\n", features.lazy_pages, lazy_pages);
+	if (features.lazy_pages != lazy_pages)
+		return -1;
+	printf("   `- pidfd_store: %d - expected : %d\n", features.pidfd_store, pidfd_store);
+	if (features.pidfd_store != pidfd_store)
+		return -1;
+
+	return 0;
+}

From 6cfad77f0005133a142e50cb52b07f4f07563dce Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Thu, 6 Jan 2022 20:44:21 +0800
Subject: [PATCH 0863/1854] pagemap: tiny fix on truncating memory image

When requested iovs are huge, criu needs to invoke more then one
preadv()s. In this situation criu truncates memory image with
offset of first preadv() and length of last one, which leads
to leakage of memory image. This patch fixs truncating with right
offset and length.

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/pagemap.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/criu/pagemap.c b/criu/pagemap.c
index d996db7fc..83f69bba3 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -535,7 +535,6 @@ static int process_async_reads(struct page_read *pr)
 	fd = img_raw_fd(pr->pi);
 	list_for_each_entry_safe(piov, n, &pr->async, l) {
 		ssize_t ret;
-		off_t start = piov->from;
 		struct iovec *iovs = piov->to;
 
 		pr_debug("Read piov iovs %d, from %ju, len %ju, first %p:%zu\n", piov->nr, piov->from,
@@ -554,13 +553,16 @@ static int process_async_reads(struct page_read *pr)
 			}
 		}
 
-		if (ret != piov->end - piov->from) {
-			if (ret < 0) {
-				pr_err("Can't read async pr bytes (%zd / %ju read, %ju off, %d iovs)\n", ret,
-				       piov->end - piov->from, piov->from, piov->nr);
-				return -1;
-			}
+		if (ret < 0) {
+			pr_err("Can't read async pr bytes (%zd / %ju read, %ju off, %d iovs)\n", ret,
+			       piov->end - piov->from, piov->from, piov->nr);
+			return -1;
+		}
 
+		if (opts.auto_dedup && punch_hole(pr, piov->from, ret, false))
+			return -1;
+
+		if (ret != piov->end - piov->from) {
 			/*
 			 * The preadv() can return less than requested. It's
 			 * valid and doesn't mean error or EOF. We should advance
@@ -574,9 +576,6 @@ static int process_async_reads(struct page_read *pr)
 			goto more;
 		}
 
-		if (opts.auto_dedup && punch_hole(pr, start, ret, false))
-			return -1;
-
 		BUG_ON(pr->io_complete); /* FIXME -- implement once needed */
 
 		list_del(&piov->l);

From 6be10a232d46512e58304cf75497abbbbe68eb75 Mon Sep 17 00:00:00 2001
From: "fu.lin" <fulin10@huawei.com>
Date: Sun, 16 Jan 2022 18:37:09 +0800
Subject: [PATCH 0864/1854] zdtm: fix zdtm/static/maps00 case in arm64

This case sometimes will cause SIGILL signal in arm64 platform.

<<ARM Coretex-A series Programmer's Guide for ARMv8-A>> notes:
  The ARM architecture does not require the hardware to ensure coherency
  between instruction caches and memory, even for locations of shared
  memory.

Therefore, we need flush dcache and icache for self-modifying code.

- https://developer.arm.com/documentation/den0024/a/Caches/Point-of-coherency-and-unification

Signed-off-by: fu.lin <fulin10@huawei.com>
---
 test/zdtm/static/maps00.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/maps00.c b/test/zdtm/static/maps00.c
index 10a4cac79..b1e55e861 100644
--- a/test/zdtm/static/maps00.c
+++ b/test/zdtm/static/maps00.c
@@ -158,7 +158,13 @@ static int check_map(struct map *map)
 
 	if (!sigsetjmp(segv_ret, 1)) {
 		if (map->prot & PROT_WRITE) {
-			memcpy(map->ptr, test_func, getpagesize());
+			memcpy(map->ptr, test_func, ONE_MAP_SIZE);
+			/* The ARM ARM architecture does not require the
+			 * hardware to ensure coherency between instruction
+			 * caches and memory, flushing dcache and icache is
+			 * necessory to prevent SIGILL signal.
+			 */
+			__builtin___clear_cache(map->ptr, map->ptr + ONE_MAP_SIZE);
 		} else {
 			if (!(map->flag & MAP_ANONYMOUS)) {
 				uint8_t funlen = (uint8_t *)check_map - (uint8_t *)test_func;

From bf6975c3e582a02192ea52756aab92f69c478b9c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 18 Jan 2022 16:49:40 +0000
Subject: [PATCH 0865/1854] compel: fix GCC 12 failure (out of bounds)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a confusing change as it seems the original code was just wrong.
GCC 12 complains with:

In function ‘__conv_val’,
    inlined from ‘std_strtoul’ at compel/plugins/std/string.c:202:7:
compel/plugins/std/string.c:154:24: error: array subscript 97 is above array bounds of ‘const char[37]’ [-Werror=array-bounds]
  154 |                 return &conv_tab[__tolower(c)] - conv_tab;
      |                        ^~~~~~~~~~~~~~~~~~~~~~~
compel/plugins/std/string.c: In function ‘std_strtoul’:
compel/plugins/std/string.c:10:19: note: while referencing ‘conv_tab’
   10 | static const char conv_tab[] = "0123456789abcdefghijklmnopqrstuvwxyz";
      |                   ^~~~~~~~
cc1: all warnings being treated as errors

Which sounds correct. The array conv_tab has just 37 elements.

If I understand the code correctly we are trying to convert anything
that is character between a-z and A-Z to a number for cases where
the base is larger than 10. For a base 11 conversion b|B should return 11.
For a base 35 conversion z|Z should return 35. This is all for a strtoul()
implementation.

The original code was:

  static const char conv_tab[] = "0123456789abcdefghijklmnopqrstuvwxyz";

  return &conv_tab[__tolower(c)] - conv_tab;

and that seems wrong. If conv_tab would have been some kind of hash it could
have worked, but '__tolower()' will always return something larger than
97 ('a') which will always overflow the array.

But maybe I just don't get that part of the code.

I replaced it with

  return __tolower(c) - 'a' + 10;

which does the right thing: 'A' = 10, 'B' = 11 ... 'Z' = 35

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/plugins/std/string.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/compel/plugins/std/string.c b/compel/plugins/std/string.c
index bde1bc68b..d67e0d1a9 100644
--- a/compel/plugins/std/string.c
+++ b/compel/plugins/std/string.c
@@ -151,7 +151,12 @@ static unsigned int __conv_val(unsigned char c)
 	if (__isdigit(c))
 		return c - '0';
 	else if (__isalpha(c))
-		return &conv_tab[__tolower(c)] - conv_tab;
+		/**
+		 * If we want the value of something which __isalpha() == true
+		 * it has to be base > 10. 'A' = 10, 'B' = 11 ... 'Z' = 35
+		 */
+		return __tolower(c) - 'a' + 10;
+
 	return -1u;
 }
 

From db352ca4883097da811001c344d346324a4da24a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 18 Jan 2022 17:20:35 +0000
Subject: [PATCH 0866/1854] criu: fix configuration file scanner with GCC 12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes:

criu/config.c: In function ‘parse_statement’:
criu/config.c:232:43: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘*(configuration + (sizetype)((long unsigned int)i * 8)) + ((sizetype)offset + 1)’ must not be NULL [-Werror=address]
  232 |         if (configuration[i] + offset + 1 != 0 && strchr(configuration[i] + offset, ' ')) {
      |                                           ^~

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/config.c b/criu/config.c
index 91fb0b64d..33f2820a1 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -229,7 +229,7 @@ out:
 		tmp_string[0] = 0;
 
 	/* Check for unsupported configuration file entries */
-	if (configuration[i] + offset + 1 != 0 && strchr(configuration[i] + offset, ' ')) {
+	if (strchr(configuration[i] + offset, ' ')) {
 		int j;
 		len = strlen(configuration[i] + offset);
 		for (j = 0; j < len - 1; j++) {

From 0568889ee368c2bc2682aae5c69d67ac16eac675 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 18 Jan 2022 17:22:46 +0000
Subject: [PATCH 0867/1854] compel: fix parasite with GCC 12

Parasite creation started to fail with GCC 12:

On x86_64 with:
 ./compel/compel-host hgen -f criu/pie/restorer.built-in.o -o criu/pie/restorer-blob.h
 Error (compel/src/lib/handle-elf-host.c:337): Unexpected undefined symbol: `strlen'. External symbol in PIE?

On aarch64 with:
 ld: criu/pie/restorer.o: in function `lsm_set_label':
 /drone/src/criu/pie/restorer.c:174: undefined reference to `strlen'

Line 174 is: "for (len = 0; label[len]; len++)"

Adding '-ffreestanding' to parasite compilation fixes these errors
because, according to GCC developers:

"strlen is a standard C function, so I don't see any bug in that being used
unless you do a freestanding compilation (-nostdlib isn't that)."

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/src/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compel/src/main.c b/compel/src/main.c
index a9a50959f..f461ff04d 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -19,6 +19,7 @@
 
 #define CFLAGS_DEFAULT_SET     \
 	"-Wstrict-prototypes " \
+	"-ffreestanding "      \
 	"-fno-stack-protector -nostdlib -fomit-frame-pointer "
 
 #define COMPEL_CFLAGS_PIE   CFLAGS_DEFAULT_SET "-fpie"

From 4d31105c76ab043df3a0643c526f39d99ab37a35 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 27 Jan 2022 22:13:33 +0000
Subject: [PATCH 0868/1854] ci: set continue-on-error for cross-compile

Running cross compile tests with Debian unstable sometimes
fails due to missing or outdated packages.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/cross-compile.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 461a6e618..be8e7f09c 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -6,18 +6,26 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: false
       matrix:
+        experimental: [false]
         target: [
           armv7-stable-cross,
-          armv7-unstable-cross,
           aarch64-stable-cross,
-          aarch64-unstable-cross,
           ppc64-stable-cross,
-          ppc64-unstable-cross,
           mips64el-stable-cross,
-          mips64el-unstable-cross
         ]
+        include:
+          - experimental: true
+            target: armv7-unstable-cross
+          - experimental: true
+            target: aarch64-unstable-cross
+          - experimental: true
+            target: ppc64-unstable-cross
+          - experimental: true
+            target: mips64el-unstable-cross
 
     steps:
     - uses: actions/checkout@v2

From 73d6a2c0ee42bd7689511ce8db86cfbbc33c789b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 27 Jan 2022 14:49:41 +0000
Subject: [PATCH 0869/1854] test/autofs: fix use-after-free

autofs.c:66:17: error: pointer 'str' may be used after 'realloc' [-Werror=use-after-free]

autofs.c: In function 'check_automount':
../lib/zdtmtst.h:131:9: error: pointer 'mountpoint' may be used after 'free' [-Werror=use-after-free]
  131 |         test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
autofs.c:277:17: note: in expansion of macro 'pr_perror'
  277 |                 pr_perror("%s: failed to close fd %d", mountpoint, p->fd);
      |                 ^~~~~~~~~
autofs.c:268:9: note: call to 'free' here
  268 |         free(mountpoint);
      |         ^~~~~~~~~~~~~~~~

Fixes: #1731

v2: (@Snorch) always update `str` after successful realloc()

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/autofs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/autofs.c b/test/zdtm/static/autofs.c
index 2d6078627..ad1795842 100644
--- a/test/zdtm/static/autofs.c
+++ b/test/zdtm/static/autofs.c
@@ -47,6 +47,7 @@ static char *xvstrcat(char *str, const char *fmt, va_list args)
 		ret = -ENOMEM;
 		new = realloc(str, offset + delta);
 		if (new) {
+			str = new;
 			va_copy(tmp, args);
 			ret = vsnprintf(new + offset, delta, fmt, tmp);
 			va_end(tmp);
@@ -54,7 +55,6 @@ static char *xvstrcat(char *str, const char *fmt, va_list args)
 				/* NOTE: vsnprintf returns the amount of bytes
 				 *                                  * to allocate. */
 				delta = ret + 1;
-				str = new;
 				ret = 0;
 			}
 		}
@@ -266,6 +266,7 @@ static int check_automount(struct autofs_params *p)
 		return err;
 
 	free(mountpoint);
+	mountpoint = NULL;
 
 	err = p->setup(p);
 	if (err) {
@@ -274,7 +275,7 @@ static int check_automount(struct autofs_params *p)
 	}
 
 	if (close(p->fd)) {
-		pr_perror("%s: failed to close fd %d", mountpoint, p->fd);
+		pr_perror("mountpoint failed to close fd %d", p->fd);
 		return -errno;
 	}
 

From 48d53b6994980e0bf84da632c5200f96f923d598 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@redhat.com>
Date: Wed, 26 Jan 2022 14:14:38 -0500
Subject: [PATCH 0870/1854] Fix formatting in criu documentation

Signed-off-by: Ashutosh Mehra <asmehra@redhat.com>
---
 Documentation/criu.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index f41b1898c..57b791138 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -419,7 +419,7 @@ By default the option is set to *fpu* and *ins*.
     Set the method to be used to validate open files. Validation is done
     to ensure that the version of the file being restored is the same
     version when it was dumped.
-
++
 The 'mode' may be one of the following:
 
     *filesize*:::
@@ -532,7 +532,7 @@ usually need to be escaped from shell.
     Restore cgroups configuration associated with a task from the image.
     Controllers are always restored in an optimistic way -- if already present
     in system, *criu* reuses it, otherwise it will be created.
-
++
 The 'mode' may be one of the following:
 
     *none*:::   Do not restore cgroup properties but require cgroup to
@@ -656,7 +656,7 @@ are not adequate, but this can be suppressed by using *--cpu-cap=none*.
     Set the method to be used to validate open files. Validation is done
     to ensure that the version of the file being restored is the same
     version when it was dumped.
-
++
 The 'mode' may be one of the following:
 
     *filesize*:::

From 89267dbcc8efbc29adcf0215c7573cf03f6fb75d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 1 Feb 2022 15:59:14 +0000
Subject: [PATCH 0871/1854] ci: install libbsd dependency

The libbsd dependency is used to enable support for `setproctitle()`
and `strlcpy()`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                              | 4 ++--
 .lgtm.yml                                | 1 +
 scripts/ci/prepare-for-fedora-rawhide.sh | 1 +
 scripts/ci/vagrant.sh                    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ef0de54e9..588cf3e82 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -36,7 +36,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
     yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf xmlto
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf xmlto
     alternatives --set python /usr/bin/python3
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed
@@ -64,7 +64,7 @@ task:
 
   setup_script: |
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
-    yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
+    yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
     # Even with selinux in permissive mode the selinux tests will be executed
     # The Cirrus CI user runs as a service from selinux point of view and is
     # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
diff --git a/.lgtm.yml b/.lgtm.yml
index a28c35de0..a884a53ef 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -19,6 +19,7 @@ extraction:
       - "iproute2"
       - "libcap-dev"
       - "libaio-dev"
+      - "libbsd-dev"
       - "python3-yaml"
       - "libnl-route-3-dev"
       - "python-future"
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index e5900e563..f4d3155f9 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -17,6 +17,7 @@ dnf install -y \
 	libcap-devel \
 	libnet-devel \
 	libnl3-devel \
+	libbsd-devel \
 	make \
 	procps-ng \
 	protobuf-c-devel \
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 4a4a16445..0440193bc 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -37,7 +37,7 @@ setup() {
 	vagrant ssh-config >> /root/.ssh/config
 	ssh default sudo dnf upgrade -y
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
-		libasan libcap-devel libnet-devel libnl3-devel make protobuf-c-devel \
+		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
 		protobuf-devel python3-flake8 python3-future python3-protobuf \
 		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel libbpf-devel
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket

From fdf4fda20014c6862c91f167c191338cc3a11b14 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 27 Jan 2022 10:28:29 +0300
Subject: [PATCH 0872/1854] pstree: when updating sid for shell job also update
 matching pgid

If we replace old_sid with current_sid we should also do same
replacement for matching pgid (=old_sid).

Reported in CRIU gitter by Younes Manton (@ymanton)

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pstree.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/pstree.c b/criu/pstree.c
index d5080e515..d29de730a 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -382,6 +382,9 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 		for_each_pstree_item(pi) {
 			if (pi->sid == old_sid)
 				pi->sid = current_sid;
+
+			if (pi->pgid == old_sid)
+				pi->pgid = current_sid;
 		}
 
 		if (lookup_create_item(current_sid) == NULL)

From bb1b1681abd5b48b2252066556da6b608914a450 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 1 Feb 2022 13:44:42 +0000
Subject: [PATCH 0873/1854] criu-ns: fix exit code o for criu dump

Fixes: #1739

Reported-by: @PavloMykhailyshyn
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 72c0753e5..6aa618218 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -203,7 +203,7 @@ def wrap_dump():
     criu_pid = os.fork()
     if criu_pid == 0:
         run_criu(sys.argv[1:])
-    return _wait_for_process_status(pid)
+    return _wait_for_process_status(criu_pid)
 
 
 def show_usage():

From 7177938e60b81752a44a8116b3e7e399c24c4fcb Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 4 Feb 2022 20:41:07 +0000
Subject: [PATCH 0874/1854] criu-ns: use os.waitstatus_to_exitcode()

os.WEXITSTATUS() returns the process exit status and it should be used
only if WIFEXITED() is true, i.e., the process terminated normally.

os.waitstatus_to_exitcode() does the same as os.WEXITSTATUS() but it
also handles the case when the process has been terminated by a signal.

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 6aa618218..930d20c80 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -68,7 +68,7 @@ def _wait_for_process_status(criu_pid):
         try:
             (pid, status) = os.wait()
             if pid == criu_pid:
-                return os.WEXITSTATUS(status)
+                return os.waitstatus_to_exitcode(status)
         except OSError:
             return -251
 

From b2ba14a15d3a549c94bac34d231aad857097d8b3 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sat, 5 Feb 2022 14:23:38 +0700
Subject: [PATCH 0875/1854] restorer: Fix sys_mmap's returned value check

As we call mmap syscall directly, the returned value in error case is the error
number not -1 like in libc wrapper. Use IS_ERR for correct checking in error
case.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/pie/restorer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 0051452e4..7aa788181 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -952,7 +952,7 @@ static int vma_remap(VmaEntry *vma_entry, int uffd)
 
 		/* Move src to non-overlapping place (step 3) */
 		addr = sys_mmap(NULL, len, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-		if (addr == (unsigned long)MAP_FAILED) {
+		if (IS_ERR((void *)addr)) {
 			pr_err("Unable to reserve memory (%lx)\n", addr);
 			return -1;
 		}

From b13b95e522ef7231bdf341a4627cb996cdea7831 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <rppt@linux.ibm.com>
Date: Sun, 13 Feb 2022 08:48:07 +0200
Subject: [PATCH 0876/1854] compel: fix how PTRACE_GET_THREAD_AREA errors are
 handled

When PTRACE_GET_THREAD_AREA errors on kernels with
!CONFIG_IA32_EMULATION beacuse of missing support (-EIO), compel should
ignore uch errors in native mode.

However the check for error type uses return value of ptrace rather than
errno, which will always result in error propagation.

Use errno to detect type of error to fix this.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
 compel/arch/x86/src/lib/thread_area.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/compel/arch/x86/src/lib/thread_area.c b/compel/arch/x86/src/lib/thread_area.c
index 4750c6cdd..271d89dcd 100644
--- a/compel/arch/x86/src/lib/thread_area.c
+++ b/compel/arch/x86/src/lib/thread_area.c
@@ -53,15 +53,16 @@ int __compel_arch_fetch_thread_area(int tid, struct thread_ctx *th)
 		user_desc_t *d = &ptls->desc[i];
 
 		err = ptrace(PTRACE_GET_THREAD_AREA, tid, GDT_ENTRY_TLS_MIN + i, d);
-		/*
-		 * Ignoring absent syscall on !CONFIG_IA32_EMULATION
-		 * where such mixed code can't run.
-		 * XXX: Add compile CONFIG_X86_IGNORE_64BIT_TLS
-		 * (for x86_64 systems with CONFIG_IA32_EMULATION)
-		 */
-		if (err == -EIO && native_mode)
-			return 0;
 		if (err) {
+			/*
+			 * Ignoring absent syscall on !CONFIG_IA32_EMULATION
+			 * where such mixed code can't run.
+			 * XXX: Add compile CONFIG_X86_IGNORE_64BIT_TLS
+			 * (for x86_64 systems with CONFIG_IA32_EMULATION)
+			 */
+			if (errno == EIO && native_mode)
+				return 0;
+
 			pr_perror("get_thread_area failed for %d", tid);
 			return err;
 		}

From 408a7d82d644e8be19579c57596c7f6dd5ec3f7e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 12 Feb 2022 17:17:27 -0800
Subject: [PATCH 0877/1854] util: add an unique ID of the current criu run

This ID will be used to generate resource ID-s that can conflicts with
other CRIU processes.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/crtools.c      |  2 ++
 criu/include/util.h |  6 ++++++
 criu/util.c         | 11 +++++++++++
 3 files changed, 19 insertions(+)

diff --git a/criu/crtools.c b/criu/crtools.c
index 0752800f6..3c3491603 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -254,6 +254,8 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
+	util_init();
+
 	if (log_init(opts.output))
 		return 1;
 
diff --git a/criu/include/util.h b/criu/include/util.h
index 19d378fc5..ca934dea0 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -393,4 +393,10 @@ static inline void cleanup_freep(void *p)
 
 extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args);
 
+/*
+ * criu_run_id is a unique value of the current run. It can be used to
+ * generate resource ID-s to avoid conflicts with other CRIU processes.
+ */
+extern uint64_t criu_run_id;
+extern void util_init(void);
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/util.c b/criu/util.c
index 822822186..d83be0c0d 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -27,6 +27,7 @@
 #include <netinet/tcp.h>
 #include <sched.h>
 #include <ftw.h>
+#include <time.h>
 
 #include "linux/mount.h"
 
@@ -1804,3 +1805,13 @@ int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args)
 
 	return fret;
 }
+
+uint64_t criu_run_id;
+
+void util_init()
+{
+	struct timespec tp;
+
+	clock_gettime(CLOCK_MONOTONIC, &tp);
+	criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec;
+}

From e8087fcff6feae2384c00b0145bf13e168785cc2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 12 Feb 2022 17:24:07 -0800
Subject: [PATCH 0878/1854] files: generate unique transport socket names

Transport socket names have to be unique for each criu run.

Fixes #1735 #1720

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/files.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/files.c b/criu/files.c
index 69ebc2e82..429493ccb 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -957,7 +957,7 @@ static int receive_fd(struct fdinfo_list_entry *fle);
 static void transport_name_gen(struct sockaddr_un *addr, int *len, int pid)
 {
 	addr->sun_family = AF_UNIX;
-	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/crtools-fd-%d", pid);
+	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/crtools-fd-%d-%" PRIx64, pid, criu_run_id);
 	*len = SUN_LEN(addr);
 	*addr->sun_path = '\0';
 }

From 9c7bbfa698802b1f68a5ba6a4d5eb3213b60babf Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 15 Dec 2021 22:15:21 +0700
Subject: [PATCH 0879/1854] check: Add a check for using memfd with hugetlb

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cr-check.c        | 10 ++++++++++
 criu/include/kerndat.h |  1 +
 criu/kerndat.c         | 27 +++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 0320b445a..ced084df2 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1368,6 +1368,14 @@ static int check_ns_pid(void)
 	return 0;
 }
 
+static int check_memfd_hugetlb(void)
+{
+	if (!kdat.has_memfd_hugetlb)
+		return -1;
+
+	return 0;
+}
+
 static int check_network_lock_nftables(void)
 {
 	if (!kdat.has_nftables_concat) {
@@ -1505,6 +1513,7 @@ int cr_check(void)
 		ret |= check_apparmor_stacking();
 		ret |= check_network_lock_nftables();
 		ret |= check_sockopt_buf_lock();
+		ret |= check_memfd_hugetlb();
 	}
 
 	/*
@@ -1618,6 +1627,7 @@ static struct feature_list feature_list[] = {
 	{ "apparmor_stacking", check_apparmor_stacking },
 	{ "network_lock_nftables", check_network_lock_nftables },
 	{ "sockopt_buf_lock", check_sockopt_buf_lock },
+	{ "memfd_hugetlb", check_memfd_hugetlb },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index a28a95802..0de5eb778 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -36,6 +36,7 @@ struct kerndat_s {
 	u64 zero_page_pfn;
 	bool has_dirty_track;
 	bool has_memfd;
+	bool has_memfd_hugetlb;
 	bool has_fdinfo_lock;
 	unsigned long task_size;
 	bool ipv6;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 9f6a6ec42..b13ebee81 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -420,6 +420,29 @@ static bool kerndat_has_memfd_create(void)
 	return 0;
 }
 
+static bool kerndat_has_memfd_hugetlb(void)
+{
+	int ret;
+
+	if (!kdat.has_memfd) {
+		kdat.has_memfd_hugetlb = false;
+		return 0;
+	}
+
+	ret = memfd_create("", MFD_HUGETLB);
+	if (ret >= 0) {
+		kdat.has_memfd_hugetlb = true;
+		close(ret);
+	} else if (ret == -1 && errno == EINVAL) {
+		kdat.has_memfd_hugetlb = false;
+	} else {
+		pr_perror("Unexpected error from memfd_create(\"\", MFD_HUGETLB)");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int get_task_size(void)
 {
 	kdat.task_size = compel_task_size();
@@ -1320,6 +1343,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_memfd_create failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_memfd_hugetlb()) {
+		pr_err("kerndat_has_memfd_hugetlb failed when initializing kerndat.\n");
+		ret = -1;
+	}
 	if (!ret && kerndat_detect_stack_guard_gap()) {
 		pr_err("kerndat_detect_stack_guard_gap failed when initializing kerndat.\n");
 		ret = -1;

From f69c36591679bb5dbfd3dbf28057446fc61ad9c5 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 15 Dec 2021 22:26:08 +0700
Subject: [PATCH 0880/1854] kerndat: Collect hugetlb device numbers

These numbers are used to determine whether a memory mapping is backed by
hugetlb and its page size.

As the hugepage can be allocated more after the first time we collect kerndat,
we need to collect the missing device numbers every time we load the kerndat
cache.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/Makefile.crtools  |   1 +
 criu/hugetlb.c         |  47 +++++++++++++++
 criu/include/hugetlb.h |  55 +++++++++++++++++
 criu/include/kerndat.h |   2 +
 criu/include/sizes.h   |  50 ++++++++++++++++
 criu/kerndat.c         | 130 ++++++++++++++++++++++++++++++++++++-----
 6 files changed, 269 insertions(+), 16 deletions(-)
 create mode 100644 criu/hugetlb.c
 create mode 100644 criu/include/hugetlb.h
 create mode 100644 criu/include/sizes.h

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 50a2fa9c5..46d7fd424 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -96,6 +96,7 @@ CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
 obj-$(CONFIG_COMPAT)	+= vdso-compat.o
 CFLAGS_REMOVE_vdso-compat.o	+= $(CFLAGS-ASAN) $(CFLAGS-GCOV)
 obj-y			+= pidfd-store.o
+obj-y			+= hugetlb.o
 
 PROTOBUF_GEN := scripts/protobuf-gen.sh
 
diff --git a/criu/hugetlb.c b/criu/hugetlb.c
new file mode 100644
index 000000000..aa98662d8
--- /dev/null
+++ b/criu/hugetlb.c
@@ -0,0 +1,47 @@
+#include "hugetlb.h"
+#include "kerndat.h"
+#include "sizes.h"
+
+// clang-format off
+struct htlb_info hugetlb_info[HUGETLB_MAX] = {
+	[HUGETLB_16KB] = { SZ_16K, MAP_HUGETLB_16KB },
+	[HUGETLB_64KB] = { SZ_64K, MAP_HUGETLB_64KB },
+	[HUGETLB_512KB] = { SZ_512K, MAP_HUGETLB_512KB },
+	[HUGETLB_1MB] = { SZ_1M, MAP_HUGETLB_1MB },
+	[HUGETLB_2MB] = { SZ_2M, MAP_HUGETLB_2MB },
+	[HUGETLB_8MB] = { SZ_8M, MAP_HUGETLB_8MB },
+	[HUGETLB_16MB] = { SZ_16M, MAP_HUGETLB_16MB },
+	[HUGETLB_32MB] = { SZ_32M, MAP_HUGETLB_32MB },
+	[HUGETLB_256MB] = { SZ_256M, MAP_HUGETLB_256MB },
+	[HUGETLB_512MB] = { SZ_512M, MAP_HUGETLB_512MB },
+	[HUGETLB_1GB] = { SZ_1G, MAP_HUGETLB_1GB },
+	[HUGETLB_2GB] = { SZ_2G, MAP_HUGETLB_2GB },
+	[HUGETLB_16GB] = { SZ_16G, MAP_HUGETLB_16GB },
+};
+// clang-format on
+
+int is_hugetlb_dev(dev_t dev, int *hugetlb_size_flag)
+{
+	int i;
+
+	for (i = 0; i < HUGETLB_MAX; i++) {
+		if (kdat.hugetlb_dev[i] == dev) {
+			if (hugetlb_size_flag)
+				*hugetlb_size_flag = hugetlb_info[i].flag;
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+unsigned long get_size_from_hugetlb_flag(int flag)
+{
+	int i;
+
+	for (i = 0; i < HUGETLB_MAX; i++)
+		if (flag == hugetlb_info[i].flag)
+			return hugetlb_info[i].size;
+
+	return -1;
+}
diff --git a/criu/include/hugetlb.h b/criu/include/hugetlb.h
new file mode 100644
index 000000000..c0e83652b
--- /dev/null
+++ b/criu/include/hugetlb.h
@@ -0,0 +1,55 @@
+#ifndef __CR_HUGETLB_H_
+#define __CR_HUGETLB_H_
+
+#include <sys/types.h>
+#include <stddef.h>
+
+enum hugepage_size {
+	HUGETLB_16KB,
+	HUGETLB_64KB,
+	HUGETLB_512KB,
+	HUGETLB_1MB,
+	HUGETLB_2MB,
+	HUGETLB_8MB,
+	HUGETLB_16MB,
+	HUGETLB_32MB,
+	HUGETLB_256MB,
+	HUGETLB_512MB,
+	HUGETLB_1GB,
+	HUGETLB_2GB,
+	HUGETLB_16GB,
+	HUGETLB_MAX
+};
+
+#define MAP_HUGETLB_SHIFT     26
+#define MAP_HUGETLB_SIZE_MASK (0x3f << MAP_HUGETLB_SHIFT)
+
+#define MAP_HUGETLB_16KB  (14 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_64KB  (16 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_512KB (19 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_1MB	  (20 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_2MB	  (21 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_8MB	  (23 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_16MB  (24 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_32MB  (25 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_256MB (28 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_512MB (29 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_1GB	  (30 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_2GB	  (31 << MAP_HUGETLB_SHIFT)
+#define MAP_HUGETLB_16GB  (34 << MAP_HUGETLB_SHIFT)
+
+struct htlb_info {
+	unsigned long long size;
+	int flag;
+};
+
+extern struct htlb_info hugetlb_info[HUGETLB_MAX];
+
+int is_hugetlb_dev(dev_t dev, int *hugetlb_size_flag);
+unsigned long get_size_from_hugetlb_flag(int flag);
+
+#ifndef MFD_HUGETLB
+#define MFD_HUGETLB 4
+#endif
+
+#endif
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 0de5eb778..25825ee51 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -6,6 +6,7 @@
 #include "common/config.h"
 #include "asm/kerndat.h"
 #include "util-vdso.h"
+#include "hugetlb.h"
 
 struct stat;
 
@@ -76,6 +77,7 @@ struct kerndat_s {
 	bool has_nspid;
 	bool has_nftables_concat;
 	bool has_sockopt_buf_lock;
+	dev_t hugetlb_dev[HUGETLB_MAX];
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/sizes.h b/criu/include/sizes.h
new file mode 100644
index 000000000..0ec977fc0
--- /dev/null
+++ b/criu/include/sizes.h
@@ -0,0 +1,50 @@
+#ifndef __CR_SIZES_H__
+#define __CR_SIZES_H__
+
+/*
+ * Copied from the Linux kernel header include/linux/sizes.h
+ */
+
+#define SZ_1   0x00000001
+#define SZ_2   0x00000002
+#define SZ_4   0x00000004
+#define SZ_8   0x00000008
+#define SZ_16  0x00000010
+#define SZ_32  0x00000020
+#define SZ_64  0x00000040
+#define SZ_128 0x00000080
+#define SZ_256 0x00000100
+#define SZ_512 0x00000200
+
+#define SZ_1K	0x00000400
+#define SZ_2K	0x00000800
+#define SZ_4K	0x00001000
+#define SZ_8K	0x00002000
+#define SZ_16K	0x00004000
+#define SZ_32K	0x00008000
+#define SZ_64K	0x00010000
+#define SZ_128K 0x00020000
+#define SZ_256K 0x00040000
+#define SZ_512K 0x00080000
+
+#define SZ_1M	0x00100000
+#define SZ_2M	0x00200000
+#define SZ_4M	0x00400000
+#define SZ_8M	0x00800000
+#define SZ_16M	0x01000000
+#define SZ_32M	0x02000000
+#define SZ_64M	0x04000000
+#define SZ_128M 0x08000000
+#define SZ_256M 0x10000000
+#define SZ_512M 0x20000000
+
+#define SZ_1G 0x40000000
+#define SZ_2G 0x80000000
+
+#define SZ_4G  0x100000000ULL
+#define SZ_8G  0x200000000ULL
+#define SZ_16G 0x400000000ULL
+#define SZ_32G 0x800000000ULL
+#define SZ_64T 0x400000000000ULL
+
+#endif /* __CR_SIZES_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index b13ebee81..da1fb5511 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -183,20 +183,12 @@ static int kerndat_files_stat(void)
 	return 0;
 }
 
-static int kerndat_get_shmemdev(void)
+static int kerndat_get_dev(dev_t *dev, char *map, size_t size)
 {
-	void *map;
 	char maps[128];
 	struct stat buf;
-	dev_t dev;
 
-	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
-	if (map == MAP_FAILED) {
-		pr_perror("Can't mmap memory for shmemdev test");
-		return -1;
-	}
-
-	sprintf(maps, "/proc/self/map_files/%lx-%lx", (unsigned long)map, (unsigned long)map + page_size());
+	sprintf(maps, "/proc/self/map_files/%lx-%lx", (unsigned long)map, (unsigned long)map + size);
 	if (stat(maps, &buf) < 0) {
 		int e = errno;
 		if (errno == EPERM) {
@@ -205,16 +197,34 @@ static int kerndat_get_shmemdev(void)
 			 * OK, let's go the slower route.
 			 */
 
-			if (parse_self_maps((unsigned long)map, &dev) < 0) {
+			if (parse_self_maps((unsigned long)map, dev) < 0) {
 				pr_err("Can't read self maps\n");
-				goto err;
+				return -1;
 			}
 		} else {
 			pr_perror("Can't stat self map_files %d", e);
-			goto err;
+			return -1;
 		}
-	} else
-		dev = buf.st_dev;
+	} else {
+		*dev = buf.st_dev;
+	}
+
+	return 0;
+}
+
+static int kerndat_get_shmemdev(void)
+{
+	void *map;
+	dev_t dev;
+
+	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (map == MAP_FAILED) {
+		pr_perror("Can't mmap memory for shmemdev test");
+		return -1;
+	}
+
+	if (kerndat_get_dev(&dev, map, PAGE_SIZE))
+		goto err;
 
 	munmap(map, PAGE_SIZE);
 	kdat.shmem_dev = dev;
@@ -226,6 +236,60 @@ err:
 	return -1;
 }
 
+/* Return -1 -- error
+ * Return 0 -- successful but can't get any new device's numbers
+ * Return 1 -- successful and get new device's numbers
+ *
+ * At first, all kdat.hugetlb_dev elements are initialized to 0.
+ * When the function finishes,
+ * kdat.hugetlb_dev[i] == -1 -- this hugetlb page size is not supported
+ * kdat.hugetlb_dev[i] == 0  -- this hugetlb page size is supported but can't collect device's number
+ * Otherwise, kdat.hugetlb_dev[i] contains the corresponding device's number
+ *
+ * Next time the function is called, it only tries to collect the device's number of hugetlb page size
+ * that is supported but can't be collected in the previous call (kdat.hugetlb_dev[i] == 0)
+ */
+static int kerndat_get_hugetlb_dev(void)
+{
+	void *map;
+	int i, flag, ret = 0;
+	unsigned long long size;
+	dev_t dev;
+
+	for (i = 0; i < HUGETLB_MAX; i++) {
+		/* Skip if this hugetlb size is not supported or the device's number has been collected */
+		if (kdat.hugetlb_dev[i])
+			continue;
+
+		size = hugetlb_info[i].size;
+		flag = hugetlb_info[i].flag;
+		map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | flag, 0, 0);
+		if (map == MAP_FAILED) {
+			if (errno == EINVAL) {
+				kdat.hugetlb_dev[i] = (dev_t)-1;
+				continue;
+			} else if (errno == ENOMEM) {
+				pr_info("Hugetlb size %llu Mb is supported but cannot get dev's number\n", size >> 20);
+				continue;
+			} else {
+				pr_perror("Unexpected result when get hugetlb dev");
+				return -1;
+			}
+		}
+
+		if (kerndat_get_dev(&dev, map, size)) {
+			munmap(map, size);
+			return -1;
+		}
+
+		munmap(map, size);
+		kdat.hugetlb_dev[i] = dev;
+		ret = 1;
+		pr_info("Found hugetlb device at %" PRIx64 "\n", kdat.hugetlb_dev[i]);
+	}
+	return ret;
+}
+
 static dev_t get_host_dev(unsigned int which)
 {
 	static struct kst {
@@ -1260,13 +1324,43 @@ static int kerndat_has_nftables_concat(void)
 #endif
 }
 
+/*
+ * Some features depend on resource that can be dynamically changed
+ * at the OS runtime. There are cases that we cannot determine the
+ * availability of those features at the first time we run kerndat
+ * check. So in later kerndat checks, we need to retry to get those
+ * information. This function contains calls to those kerndat checks.
+ *
+ * Those kerndat checks must
+ * Return -1 on error
+ * Return 0 when the check is successful but no new information
+ * Return 1 when the check is successful and there is new information
+ */
+int kerndat_try_load_new(void)
+{
+	int ret;
+
+	ret = kerndat_get_hugetlb_dev();
+	if (ret < 0)
+		return ret;
+
+	/* New information is found, we need to save to the cache */
+	if (ret)
+		kerndat_save_cache();
+	return 0;
+}
+
 int kerndat_init(void)
 {
 	int ret;
 
 	ret = kerndat_try_load_cache();
-	if (ret <= 0)
+	if (ret < 0)
 		return ret;
+
+	if (ret == 0)
+		return kerndat_try_load_new();
+
 	ret = 0;
 
 	/* kerndat_try_load_cache can leave some trash in kdat */
@@ -1283,6 +1377,10 @@ int kerndat_init(void)
 		pr_err("kerndat_get_shmemdev failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_get_hugetlb_dev() < 0) {
+		pr_err("kerndat_get_hugetlb_dev failed when initializing kerndat.\n");
+		ret = -1;
+	}
 	if (!ret && kerndat_get_dirty_track()) {
 		pr_err("kerndat_get_dirty_track failed when initializing kerndat.\n");
 		ret = -1;

From 4d77b19eb3f8f9ace4a1d67eb28d2986a36a7732 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 15 Dec 2021 22:53:09 +0700
Subject: [PATCH 0881/1854] ipc: Add support for checkpoint/restore hugetlb
 System V shared memory

Attach the System V shared memory segments to the address space via shmat() to
determine if they are backed by hugetlb and their page size. Use these
information for setting the correct flags on restore.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/ipc_ns.c        | 48 ++++++++++++++++++++++++++++++++++++++++++--
 images/ipc-shm.proto |  1 +
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index a2eb72f28..4fe082fbb 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -15,6 +15,7 @@
 #include "sysctl.h"
 #include "ipc_ns.h"
 #include "shmem.h"
+#include "types.h"
 
 #include "protobuf.h"
 #include "images/ipc-var.pb-c.h"
@@ -354,6 +355,42 @@ static int dump_ipc_shm_pages(const IpcShmEntry *shm)
 	return ret;
 }
 
+static int dump_shm_hugetlb_flag(IpcShmEntry *shm, int id, unsigned long size)
+{
+	void *addr;
+	int ret, hugetlb_flag, exit_code = -1;
+	struct stat st;
+	char path[64];
+
+	addr = shmat(id, NULL, SHM_RDONLY);
+	if (addr == (void *)-1) {
+		pr_perror("Failed to attach shm");
+		return -1;
+	}
+
+	/* The shm segment size may not be aligned,
+	 * we need to align it up to next page size
+	 */
+	size = (size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
+	snprintf(path, sizeof(path), "/proc/self/map_files/%lx-%lx", (unsigned long)addr, (unsigned long)addr + size);
+
+	ret = stat(path, &st);
+	if (ret < 0) {
+		pr_perror("Can't stat map_files");
+		goto detach;
+	}
+
+	if (is_hugetlb_dev(st.st_dev, &hugetlb_flag)) {
+		shm->has_hugetlb_flag = true;
+		shm->hugetlb_flag = hugetlb_flag | SHM_HUGETLB;
+	}
+
+	exit_code = 0;
+detach:
+	shmdt(addr);
+	return exit_code;
+}
+
 static int dump_ipc_shm_seg(struct cr_img *img, int id, const struct shmid_ds *ds)
 {
 	IpcShmEntry shm = IPC_SHM_ENTRY__INIT;
@@ -364,6 +401,10 @@ static int dump_ipc_shm_seg(struct cr_img *img, int id, const struct shmid_ds *d
 	shm.size = ds->shm_segsz;
 	shm.has_in_pagemaps = true;
 	shm.in_pagemaps = true;
+
+	if (dump_shm_hugetlb_flag(&shm, id, ds->shm_segsz))
+		return -1;
+
 	fill_ipc_desc(id, shm.desc, &ds->shm_perm);
 	pr_info_ipc_shm(&shm);
 
@@ -798,7 +839,7 @@ static int prepare_ipc_shm_pages(struct cr_img *img, const IpcShmEntry *shm)
 
 static int prepare_ipc_shm_seg(struct cr_img *img, const IpcShmEntry *shm)
 {
-	int ret, id;
+	int ret, id, hugetlb_flag = 0;
 	struct sysctl_req req[] = {
 		{ "kernel/shm_next_id", &shm->desc->id, CTL_U32 },
 	};
@@ -813,7 +854,10 @@ static int prepare_ipc_shm_seg(struct cr_img *img, const IpcShmEntry *shm)
 		return ret;
 	}
 
-	id = shmget(shm->desc->key, shm->size, shm->desc->mode | IPC_CREAT | IPC_EXCL);
+	if (shm->has_hugetlb_flag)
+		hugetlb_flag = shm->hugetlb_flag;
+
+	id = shmget(shm->desc->key, shm->size, hugetlb_flag | shm->desc->mode | IPC_CREAT | IPC_EXCL);
 	if (id == -1) {
 		pr_perror("Failed to create shm set");
 		return -errno;
diff --git a/images/ipc-shm.proto b/images/ipc-shm.proto
index 7865dad8d..c5feebac0 100644
--- a/images/ipc-shm.proto
+++ b/images/ipc-shm.proto
@@ -8,4 +8,5 @@ message ipc_shm_entry {
 	required ipc_desc_entry		desc	= 1;
 	required uint64			size	= 2;
 	optional bool			in_pagemaps = 3;
+	optional uint32			hugetlb_flag = 4;
 }

From e4fb1dd5f5e192b9df91b2cec8fa391b91c45858 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 15 Dec 2021 23:01:29 +0700
Subject: [PATCH 0882/1854] memfd, shmem: Add support for checkpoint/restore
 memfd and anon shared memory

Co-developed-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/memfd.c       | 15 +++++++++------
 criu/shmem.c       | 32 ++++++++++++++++++++++++++++----
 images/memfd.proto |  1 +
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index cb3704499..84ea00c95 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -18,6 +18,7 @@
 #include "file-ids.h"
 #include "namespaces.h"
 #include "shmem.h"
+#include "hugetlb.h"
 
 #include "protobuf.h"
 #include "images/memfd.pb-c.h"
@@ -57,18 +58,13 @@ static u32 memfd_inode_ids = 1;
 
 int is_memfd(dev_t dev)
 {
-	/*
-	 * TODO When MAP_HUGETLB is used, the file device is not shmem_dev,
-	 * Note that other parts of CRIU have similar issues, see
-	 * is_anon_shmem_map().
-	 */
 	return dev == kdat.shmem_dev;
 }
 
 static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode, const char *name, const struct stat *st)
 {
 	MemfdInodeEntry mie = MEMFD_INODE_ENTRY__INIT;
-	int ret = -1;
+	int ret = -1, flag;
 	u32 shmid;
 
 	/*
@@ -91,6 +87,10 @@ static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode, const char *
 	mie.name = (char *)name;
 	mie.size = st->st_size;
 	mie.shmid = shmid;
+	if (is_hugetlb_dev(inode->dev, &flag)) {
+		mie.has_hugetlb_flag = true;
+		mie.hugetlb_flag = flag | MFD_HUGETLB;
+	}
 
 	mie.seals = fcntl(fd, F_GET_SEALS);
 	if (mie.seals == -1)
@@ -258,6 +258,9 @@ static int memfd_open_inode_nocache(struct memfd_restore_inode *inode)
 		flags = MFD_ALLOW_SEALING;
 	}
 
+	if (mie->has_hugetlb_flag)
+		flags |= mie->hugetlb_flag;
+
 	fd = memfd_create(mie->name, flags);
 	if (fd < 0) {
 		pr_perror("Can't create memfd:%s", mie->name);
diff --git a/criu/shmem.c b/criu/shmem.c
index a9ee8d7eb..81e701586 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -26,6 +26,7 @@
 #include "memfd.h"
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
+#include "namespaces.h"
 
 #ifndef SEEK_DATA
 #define SEEK_DATA 3
@@ -534,13 +535,24 @@ out:
 	return ret;
 }
 
+struct open_map_file_args {
+	unsigned long addr, size;
+};
+
+static int open_map_file(void *args, int fd, pid_t pid)
+{
+	struct open_map_file_args *vma = args;
+
+	return open_proc_rw(pid, "map_files/%lx-%lx", vma->addr, vma->addr + vma->size);
+}
+
 static int open_shmem(int pid, struct vma_area *vma)
 {
 	VmaEntry *vi = vma->e;
 	struct shmem_info *si;
 	void *addr = MAP_FAILED;
 	int f = -1;
-	int flags;
+	int flags, is_hugetlb, memfd_flag = 0;
 
 	si = shmem_find(vi->shmid);
 	pr_info("Search for %#016" PRIx64 " shmem 0x%" PRIx64 " %p/%d\n", vi->start, vi->shmid, si, si ? si->pid : -1);
@@ -564,9 +576,17 @@ static int open_shmem(int pid, struct vma_area *vma)
 		goto out;
 	}
 
+	is_hugetlb = vi->flags & MAP_HUGETLB;
+
 	flags = MAP_SHARED;
-	if (kdat.has_memfd) {
-		f = memfd_create("", 0);
+	if (is_hugetlb) {
+		int size_flag = vi->flags & MAP_HUGETLB_SIZE_MASK;
+		flags |= MAP_HUGETLB | size_flag;
+		memfd_flag |= MFD_HUGETLB | size_flag;
+	}
+
+	if (kdat.has_memfd && (!is_hugetlb || kdat.has_memfd_hugetlb)) {
+		f = memfd_create("", memfd_flag);
 		if (f < 0) {
 			pr_perror("Unable to create memfd");
 			goto err;
@@ -599,7 +619,11 @@ static int open_shmem(int pid, struct vma_area *vma)
 	}
 
 	if (f == -1) {
-		f = open_proc_rw(getpid(), "map_files/%lx-%lx", (unsigned long)addr, (unsigned long)addr + si->size);
+		struct open_map_file_args args = {
+			.addr = (unsigned long)addr,
+			.size = si->size,
+		};
+		f = userns_call(open_map_file, UNS_FDOUT, &args, sizeof(args), -1);
 		if (f < 0)
 			goto err;
 	}
diff --git a/images/memfd.proto b/images/memfd.proto
index a944f145d..0e625416a 100644
--- a/images/memfd.proto
+++ b/images/memfd.proto
@@ -21,4 +21,5 @@ message memfd_inode_entry {
 	required uint32		shmid		= 5;
 	required uint32		seals		= 6 [(criu).flags = "seals.flags"];
 	required uint64		inode_id	= 7;
+	optional uint32		hugetlb_flag	= 8;
 };

From 8941b63a4bf9c57bbb63443101d9a3f1e6a82d1b Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 15 Dec 2021 23:03:29 +0700
Subject: [PATCH 0883/1854] proc_parse, files: Add support for hugetlb memory
 mapping

When memfd can be used with hugetlb, we use memfd for checkpoint/restore
anonymous shared memory. Otherwise, map_files symlinks is used for
checkpoint/restore anonymous shared memory.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/files.c      |  3 ++-
 criu/proc_parse.c | 38 +++++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/criu/files.c b/criu/files.c
index 429493ccb..7f4b90086 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -548,7 +548,8 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 
 		p.link = &link;
 
-		if (is_memfd(p.stat.st_dev))
+		/* TODO: Dump for hugetlb fd when memfd hugetlb is not supported */
+		if (is_memfd(p.stat.st_dev) || (kdat.has_memfd_hugetlb && is_hugetlb_dev(p.stat.st_dev, NULL)))
 			ops = &memfd_dump_ops;
 		else if (link.name[1] == '/')
 			ops = &regfile_dump_ops;
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 3017a64e1..b068e9754 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -41,6 +41,7 @@
 #include "path.h"
 #include "fault-injection.h"
 #include "memfd.h"
+#include "hugetlb.h"
 
 #include "protobuf.h"
 #include "images/fdinfo.pb-c.h"
@@ -274,7 +275,7 @@ static int vma_stat(struct vma_area *vma, int fd)
 static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct vma_file_info *vfi, int *vm_file_fd,
 				const char *path)
 {
-	int fd;
+	int fd, hugetlb_flag = 0;
 	dev_t vfi_dev;
 
 	/*
@@ -331,17 +332,19 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct
 		return -1;
 	}
 
-	if (is_anon_shmem_map(vfi_dev)) {
+	if (is_hugetlb_dev(vfi_dev, &hugetlb_flag) || is_anon_shmem_map(vfi_dev)) {
 		if (!(vma->e->flags & MAP_SHARED))
-			return -1;
+			vma->e->status |= VMA_ANON_PRIVATE;
+		else
+			vma->e->status |= VMA_ANON_SHARED;
 
 		vma->e->flags |= MAP_ANONYMOUS;
-		vma->e->status |= VMA_ANON_SHARED;
 		vma->e->shmid = vfi->ino;
+		vma->e->flags |= hugetlb_flag;
 
 		if (!strncmp(fname, "/SYSV", 5)) {
 			vma->e->status |= VMA_AREA_SYSVIPC;
-		} else {
+		} else if (vma->e->flags & MAP_SHARED) {
 			if (fault_injected(FI_HUGE_ANON_SHMEM_ID))
 				vma->e->shmid += FI_HUGE_ANON_SHMEM_ID_BASE;
 		}
@@ -591,6 +594,7 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 		}
 	} else if (*vm_file_fd >= 0) {
 		struct stat *st_buf = vma_area->vmst;
+		int hugetlb_flag = 0;
 
 		if (S_ISREG(st_buf->st_mode)) {
 			/* regular file mapping -- supported */;
@@ -607,7 +611,8 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 			goto err;
 		}
 
-		if (is_anon_shmem_map(st_buf->st_dev) && !strncmp(file_path, "/SYSV", 5)) {
+		if ((is_anon_shmem_map(st_buf->st_dev) || is_hugetlb_dev(st_buf->st_dev, NULL)) &&
+		    !strncmp(file_path, "/SYSV", 5)) {
 			vma_area->e->flags |= MAP_ANONYMOUS;
 			vma_area->e->status |= VMA_ANON_SHARED;
 			vma_area->e->shmid = st_buf->st_ino;
@@ -616,10 +621,29 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 			pr_info("path: %s\n", file_path);
 			vma_area->e->status |= VMA_AREA_SYSVIPC;
 		} else {
-			if (is_anon_shmem_map(st_buf->st_dev)) {
+			/* Dump shmem dev, hugetlb dev (private and share) mappings the same way as memfd
+			 * when possible.
+			 */
+			if (is_memfd(st_buf->st_dev) || is_anon_shmem_map(st_buf->st_dev) ||
+			    (kdat.has_memfd_hugetlb && is_hugetlb_dev(st_buf->st_dev, &hugetlb_flag))) {
 				vma_area->e->status |= VMA_AREA_MEMFD;
+				vma_area->e->flags |= hugetlb_flag;
 				if (fault_injected(FI_HUGE_ANON_SHMEM_ID))
 					vma_area->e->shmid += FI_HUGE_ANON_SHMEM_ID_BASE;
+			} else if (is_hugetlb_dev(st_buf->st_dev, &hugetlb_flag)) {
+				/* hugetlb mapping but memfd does not support HUGETLB */
+				vma_area->e->flags |= hugetlb_flag;
+				vma_area->e->flags |= MAP_ANONYMOUS;
+
+				if (vma_area->e->flags & MAP_SHARED) {
+					vma_area->e->status |= VMA_ANON_SHARED;
+					vma_area->e->shmid = st_buf->st_ino;
+				} else {
+					vma_area->e->status |= VMA_ANON_PRIVATE;
+				}
+
+				close_safe(vm_file_fd);
+				return 0;
 			}
 
 			if (vma_area->e->flags & MAP_PRIVATE)

From 456e50b59b0c899f1bc6cf3bae75ec13bd9220a8 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 9 Feb 2022 22:11:51 +0700
Subject: [PATCH 0884/1854] mem: Skip premapping hugetlb mapping

As we cannot use mremap() to move the hugetlb mapping around until Linux kernel
version 5.16, we need to skip premapping hugetlb mapping.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/mem.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/mem.c b/criu/mem.c
index ca74bfbb6..6b7e4be4b 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -733,6 +733,9 @@ static inline bool check_cow_vmas(struct vma_area *vma, struct vma_area *pvma)
 		return false;
 	if (!vma_area_is_private(pvma, kdat.task_size))
 		return false;
+	/* ... but not hugetlb mappings */
+	if (vma->e->flags & MAP_HUGETLB || pvma->e->flags & MAP_HUGETLB)
+		return false;
 	/* ... have growsdown and anon flags coincide */
 	if ((vma->e->flags ^ pvma->e->flags) & (MAP_GROWSDOWN | MAP_ANONYMOUS))
 		return false;
@@ -971,6 +974,9 @@ static int premap_priv_vmas(struct pstree_item *t, struct vm_area_list *vmas, vo
 		if (!vma_area_is_private(vma, kdat.task_size))
 			continue;
 
+		if (vma->e->flags & MAP_HUGETLB)
+			continue;
+
 		if (vma->pvma == NULL && pr->pieok && !vma_force_premap(vma, &vmas->h)) {
 			/*
 			 * VMA in question is not shared with anyone. We'll

From a26b692c42fae063dcec8180c795e95fd65398c1 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 9 Feb 2022 22:12:53 +0700
Subject: [PATCH 0885/1854] uffd: Skip lazy-mode restore on hugetlb mappings

As hugetlb mappings are not premapped, they are not registered to uffd service
in restorer code. We must not mark these mappings as PPB_LAZY in generate_iovs()
otherwise when restoring content of these mappings, we will keep looking for in
uffd and get ENOENT because they are not registered.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/include/vma.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/include/vma.h b/criu/include/vma.h
index 541d6d6fd..106c56af2 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -122,7 +122,8 @@ static inline struct vma_area *vma_next(struct vma_area *vma)
 static inline bool vma_entry_can_be_lazy(VmaEntry *e)
 {
 	return ((e->flags & MAP_ANONYMOUS) && (e->flags & MAP_PRIVATE) && !(e->flags & MAP_LOCKED) &&
-		!(vma_entry_is(e, VMA_AREA_VDSO)) && !(vma_entry_is(e, VMA_AREA_VSYSCALL)));
+		!(vma_entry_is(e, VMA_AREA_VDSO)) && !(vma_entry_is(e, VMA_AREA_VSYSCALL)) &&
+		!(e->flags & MAP_HUGETLB));
 }
 
 #endif /* __CR_VMA_H__ */

From ffa2688969a1697cc69382334017b58c5ff23cdd Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 26 Oct 2021 22:22:08 +0700
Subject: [PATCH 0886/1854] zdtm: Add MAP_HUGETLB memory mapping test

This commit add a test for checkpoint/restore MAP_HUGETLB memory mappings.
A new zdtm helper get_mapping_dev() is added to get the device number of
the memory mapping.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm.py              | 15 +++++++
 test/zdtm/lib/Makefile    |  2 +-
 test/zdtm/lib/mem.c       | 32 ++++++++++++++
 test/zdtm/lib/zdtmtst.h   |  1 +
 test/zdtm/static/Makefile |  1 +
 test/zdtm/static/maps09.c | 89 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/lib/mem.c
 create mode 100644 test/zdtm/static/maps09.c

diff --git a/test/zdtm.py b/test/zdtm.py
index 14e6aa1b0..cf73a17ae 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2566,6 +2566,17 @@ def clean_stuff(opts):
             f.clean()
 
 
+def set_nr_hugepages(nr):
+    orig_hugepages = 0
+    with open("/proc/sys/vm/nr_hugepages", "r") as f:
+        orig_hugepages = int(f.read())
+
+    with open("/proc/sys/vm/nr_hugepages", "w") as f:
+        f.write("{}\n".format(nr))
+
+    return orig_hugepages
+
+
 #
 # main() starts here
 #
@@ -2738,7 +2749,11 @@ if opts['action'] == 'run':
 for tst in test_classes.values():
     tst.available()
 
+orig_hugepages = set_nr_hugepages(20)
+
 opts['action'](opts)
 
+set_nr_hugepages(orig_hugepages)
+
 for tst in test_classes.values():
     tst.cleanup()
diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index ceec2b878..3ec58dfaf 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -4,7 +4,7 @@ CFLAGS	+= $(USERCFLAGS)
 
 LIB	:= libzdtmtst.a
 
-LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
+LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c mem.c
 
 PKG_CONFIG ?= pkg-config
 pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
diff --git a/test/zdtm/lib/mem.c b/test/zdtm/lib/mem.c
new file mode 100644
index 000000000..f612e7a15
--- /dev/null
+++ b/test/zdtm/lib/mem.c
@@ -0,0 +1,32 @@
+#include <sys/sysmacros.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "zdtmtst.h"
+
+dev_t get_mapping_dev(void *addr)
+{
+	char buf[1024];
+	FILE *f;
+	unsigned int major, minor;
+	int ret;
+
+	f = fopen("/proc/self/maps", "r");
+	if (f == NULL) {
+		pr_perror("Failed to open maps file");
+		return (dev_t)-1;
+	}
+
+	while (fgets(buf, sizeof(buf), f)) {
+		if ((unsigned long)addr == strtoul(buf, NULL, 16)) {
+			ret = sscanf(buf, "%*x-%*x %*c%*c%*c%*c %*x %x:%x", &major, &minor);
+			if (ret != 2) {
+				pr_err("Can't parse /proc/self/maps\n");
+				return (dev_t)-1;
+			}
+			return makedev(major, minor);
+		}
+	}
+
+	return (dev_t)-1;
+}
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index c6d77011d..803d33e3d 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -164,6 +164,7 @@ extern const char *test_doc;
 extern int tcp_init_server_with_opts(int family, int *port, struct zdtm_tcp_opts *opts);
 extern pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid, void *child_tid,
 			       unsigned long newtls);
+extern dev_t get_mapping_dev(void *addr);
 
 #define ssprintf(s, fmt, ...)                                        \
 	({                                                           \
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 4a21978b5..0e5f096fa 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -131,6 +131,7 @@ TST_NOFILE	:=				\
 		maps02				\
 		maps04				\
 		maps05				\
+		maps09				\
 		mlock_setuid			\
 		xids00				\
 		groups				\
diff --git a/test/zdtm/static/maps09.c b/test/zdtm/static/maps09.c
new file mode 100644
index 000000000..216263b4c
--- /dev/null
+++ b/test/zdtm/static/maps09.c
@@ -0,0 +1,89 @@
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+
+#define MEM_SIZE   (4UL * (1UL << 20)) /* 4MB */
+#define MEM_OFFSET (MEM_SIZE - PAGE_SIZE)
+
+const char *test_doc = "Test MAP_HUGETLB mapping";
+const char *test_author = "Bui Quang Minh <minhquangbui99@gmail.com>";
+
+int main(int argc, char **argv)
+{
+	void *m1, *m2;
+	dev_t dev1, dev2;
+	uint32_t crc;
+
+	test_init(argc, argv);
+	m1 = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_HUGETLB | MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	if (m1 == MAP_FAILED) {
+		pr_perror("Failed to mmap %lu Mb anonymous shared memory", MEM_SIZE >> 20);
+		return 1;
+	}
+
+	dev1 = get_mapping_dev(m1);
+	if (dev1 == (dev_t)-1) {
+		fail("Can't get mapping dev");
+		return 1;
+	}
+
+	m2 = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	if (m2 == MAP_FAILED) {
+		pr_perror("Failed to mmap %lu Mb anonymous private memory", MEM_SIZE >> 20);
+		return 1;
+	}
+
+	dev2 = get_mapping_dev(m2);
+	if (dev2 == (dev_t)-1) {
+		fail("Can't get mapping dev");
+		return 1;
+	}
+
+	crc = ~0;
+	datagen(m1, PAGE_SIZE, &crc);
+	crc = ~0;
+	datagen(m1 + MEM_OFFSET, PAGE_SIZE, &crc);
+	crc = ~0;
+	datagen(m2, PAGE_SIZE, &crc);
+	crc = ~0;
+	datagen(m2 + MEM_OFFSET, PAGE_SIZE, &crc);
+	crc = ~0;
+
+	test_daemon();
+	test_waitsig();
+
+	crc = ~0;
+	if (datachk(m1, PAGE_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+	crc = ~0;
+	if (datachk(m1 + MEM_OFFSET, PAGE_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+	crc = ~0;
+	if (datachk(m2, PAGE_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+	crc = ~0;
+	if (datachk(m2 + MEM_OFFSET, PAGE_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+
+	if (dev1 != get_mapping_dev(m1)) {
+		fail("Mapping dev mismatch");
+		return 1;
+	}
+
+	if (dev2 != get_mapping_dev(m2)) {
+		fail("Mapping dev mismatch");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+}

From d22e472cf21871de09ad49fed30a625c01499938 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 26 Oct 2021 22:31:44 +0700
Subject: [PATCH 0887/1854] zdtm: Add memfd hugetlb test

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile             |  2 ++
 test/zdtm/static/memfd02-hugetlb.c    |  1 +
 test/zdtm/static/memfd02-hugetlb.desc |  1 +
 test/zdtm/static/memfd02.c            | 52 +++++++++++++++++++++++----
 4 files changed, 50 insertions(+), 6 deletions(-)
 create mode 120000 test/zdtm/static/memfd02-hugetlb.c
 create mode 100644 test/zdtm/static/memfd02-hugetlb.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 0e5f096fa..3b244e52d 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -248,6 +248,7 @@ TST_NOFILE	:=				\
 		memfd00				\
 		memfd01				\
 		memfd02				\
+		memfd02-hugetlb			\
 		memfd03				\
 		shmemfd				\
 		shmemfd-priv			\
@@ -618,6 +619,7 @@ socket-tcp6-closing:	CFLAGS += -D ZDTM_IPV6
 socket-tcp6-unconn:	CFLAGS += -D ZDTM_IPV6
 socket-tcp4v6-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK -D ZDTM_IPV4V6
 socket-tcp4v6-closing:	CFLAGS += -D ZDTM_IPV4V6
+memfd02-hugetlb:	CFLAGS += -D ZDTM_HUGETLB
 
 sockets00-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
 sockets01-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
diff --git a/test/zdtm/static/memfd02-hugetlb.c b/test/zdtm/static/memfd02-hugetlb.c
new file mode 120000
index 000000000..db0820633
--- /dev/null
+++ b/test/zdtm/static/memfd02-hugetlb.c
@@ -0,0 +1 @@
+memfd02.c
\ No newline at end of file
diff --git a/test/zdtm/static/memfd02-hugetlb.desc b/test/zdtm/static/memfd02-hugetlb.desc
new file mode 100644
index 000000000..f88ad828b
--- /dev/null
+++ b/test/zdtm/static/memfd02-hugetlb.desc
@@ -0,0 +1 @@
+{'feature': 'memfd_hugetlb'}
diff --git a/test/zdtm/static/memfd02.c b/test/zdtm/static/memfd02.c
index 12e294921..8950e38e2 100644
--- a/test/zdtm/static/memfd02.c
+++ b/test/zdtm/static/memfd02.c
@@ -13,6 +13,10 @@
 
 #include "zdtmtst.h"
 
+#ifndef MFD_HUGETLB
+#define MFD_HUGETLB 4
+#endif
+
 const char *test_doc = "memfd mmap";
 const char *test_author = "Nicolas Viennot <Nicolas.Viennot@twosigma.com>";
 
@@ -29,14 +33,24 @@ static int _memfd_create(const char *name, unsigned int flags)
 
 int main(int argc, char *argv[])
 {
+#ifdef ZDTM_HUGETLB
+#define LEN (2 * (1 << 20)) /* 2MB */
+#else
 #define LEN 6
-	int fd;
+#endif
+
+	int fd, flag = 0;
 	void *addr_shared, *addr_private;
 	char buf[LEN];
+	dev_t dev1, dev2;
 
 	test_init(argc, argv);
 
-	fd = _memfd_create("somename", MFD_CLOEXEC);
+#ifdef ZDTM_HUGETLB
+	flag = MFD_HUGETLB;
+#endif
+
+	fd = _memfd_create("somename", MFD_CLOEXEC | flag);
 	if (fd < 0)
 		err(1, "Can't call memfd_create");
 
@@ -47,16 +61,32 @@ int main(int argc, char *argv[])
 	if (addr_shared == MAP_FAILED)
 		err(1, "Can't mmap");
 
+	dev1 = get_mapping_dev(addr_shared);
+	if (dev1 == (dev_t)-1) {
+		fail("Can't get mapping dev");
+		return 1;
+	}
+
+#ifdef ZDTM_HUGETLB
+	strcpy(addr_shared, "write1");
+#else
 	write(fd, "write1", LEN);
+#endif
 
 	addr_private = mmap(NULL, LEN, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
 	if (addr_private == MAP_FAILED)
 		err(1, "Can't mmap");
 
+	dev2 = get_mapping_dev(addr_private);
+	if (dev2 == (dev_t)-1) {
+		fail("Can't get mapping dev");
+		return 1;
+	}
+
 	test_daemon();
 	test_waitsig();
 
-	if (memcmp(addr_shared, "write1", LEN)) {
+	if (strncmp(addr_shared, "write1", LEN)) {
 		fail("content mismatch (shared)");
 		return 1;
 	}
@@ -68,23 +98,33 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if (memcmp(buf, "write2", LEN)) {
+	if (strncmp(buf, "write2", LEN)) {
 		fail("content mismatch (shared)");
 		return 1;
 	}
 
-	if (memcmp(addr_private, "write2", LEN)) {
+	if (strncmp(addr_private, "write2", LEN)) {
 		fail("content mismatch (private)");
 		return 1;
 	}
 
 	strcpy(addr_private, "write3");
 
-	if (memcmp(addr_shared, "write2", LEN)) {
+	if (strncmp(addr_shared, "write2", LEN)) {
 		fail("content mismatch (shared)");
 		return 1;
 	}
 
+	if (dev1 != get_mapping_dev(addr_shared)) {
+		fail("Mapping dev mismatch");
+		return 1;
+	}
+
+	if (dev2 != get_mapping_dev(addr_private)) {
+		fail("Mapping dev mismatch");
+		return 1;
+	}
+
 	pass();
 
 	return 0;

From 87a5694b4a75ce7c1c2440d2114d86e24a569082 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 26 Oct 2021 22:34:22 +0700
Subject: [PATCH 0888/1854] zdtm: Add shm hugetlb test

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile         |  5 +++++
 test/zdtm/static/shm-hugetlb.c    |  1 +
 test/zdtm/static/shm-hugetlb.desc |  1 +
 test/zdtm/static/shm.c            | 22 +++++++++++++++++++---
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 120000 test/zdtm/static/shm-hugetlb.c
 create mode 100644 test/zdtm/static/shm-hugetlb.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 3b244e52d..48aa8587d 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -436,6 +436,7 @@ TST		=				\
 		umask00				\
 		cmdlinenv00			\
 		shm-unaligned			\
+		shm-hugetlb			\
 
 TST_STATE	=				\
 		conntracks			\
@@ -475,6 +476,9 @@ cmdlinenv00.pid: cmdlinenv00
 shm-unaligned.pid: shm-unaligned
 	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --shmem_size=5000
 
+shm-hugetlb.pid: shm-hugetlb
+	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --shmem_size=4194304
+
 env00.pid:	env00
 	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --envname=ENV_00_TEST
 umask00.pid:	umask00
@@ -636,6 +640,7 @@ scm03-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
 pty-console:		CFLAGS += -D ZDTM_DEV_CONSOLE
 
 shm-unaligned:		CFLAGS += -DZDTM_SHM_UNALIGNED
+shm-hugetlb:		CFLAGS += -DZDTM_HUGETLB
 
 s390x_regs_check:	LDFLAGS += -pthread
 s390x_gs_threads:	LDFLAGS += -pthread
diff --git a/test/zdtm/static/shm-hugetlb.c b/test/zdtm/static/shm-hugetlb.c
new file mode 120000
index 000000000..7e1c916a3
--- /dev/null
+++ b/test/zdtm/static/shm-hugetlb.c
@@ -0,0 +1 @@
+shm.c
\ No newline at end of file
diff --git a/test/zdtm/static/shm-hugetlb.desc b/test/zdtm/static/shm-hugetlb.desc
new file mode 100644
index 000000000..dfe829b84
--- /dev/null
+++ b/test/zdtm/static/shm-hugetlb.desc
@@ -0,0 +1 @@
+{'flavor': 'ns', 'flags': 'suid'}
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index 3da29daeb..423658397 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -56,13 +56,17 @@ static int get_shm_seg(int key, size_t size, unsigned int flags)
 
 static int prepare_shm(int key, size_t size)
 {
-	int id;
+	int id, flag = 0;
 
-	id = get_shm_seg(key, shmem_size, IPC_CREAT | IPC_EXCL);
+#ifdef ZDTM_HUGETLB
+	flag = SHM_HUGETLB;
+#endif
+
+	id = get_shm_seg(key, size, IPC_CREAT | IPC_EXCL | flag);
 	if (id == -1) {
 		return -1;
 	}
-	if (fill_shm_seg(id, shmem_size) < 0)
+	if (fill_shm_seg(id, size) < 0)
 		return -1;
 	return id;
 }
@@ -105,6 +109,7 @@ int main(int argc, char **argv)
 	int shm;
 	int fail_count = 0;
 	int ret = -1;
+	dev_t dev;
 
 	void *mem;
 	uint32_t crc = INIT_CRC;
@@ -133,6 +138,12 @@ int main(int argc, char **argv)
 		goto out;
 	}
 
+	dev = get_mapping_dev(mem);
+	if (dev == (dev_t)-1) {
+		fail("Can't get mapping dev");
+		return -1;
+	}
+
 	test_daemon();
 	test_waitsig();
 
@@ -155,6 +166,11 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+	if (dev != get_mapping_dev(mem)) {
+		fail("Mapping dev mismatch");
+		return -1;
+	}
+
 	if (shmdt(mem) < 0) {
 		pr_perror("Can't detach shm");
 		return -1;

From 2dc6d146b924ab2937790ff8805719f73957cdcf Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Fri, 31 Dec 2021 17:15:18 +0700
Subject: [PATCH 0889/1854] zdtm: Add MAP_HUGETLB mappings test for
 parent-child relationship processes

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile |   1 +
 test/zdtm/static/maps10.c | 136 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 100644 test/zdtm/static/maps10.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 48aa8587d..1b057c70c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -132,6 +132,7 @@ TST_NOFILE	:=				\
 		maps04				\
 		maps05				\
 		maps09				\
+		maps10				\
 		mlock_setuid			\
 		xids00				\
 		groups				\
diff --git a/test/zdtm/static/maps10.c b/test/zdtm/static/maps10.c
new file mode 100644
index 000000000..51e37863b
--- /dev/null
+++ b/test/zdtm/static/maps10.c
@@ -0,0 +1,136 @@
+#include <stdint.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include "zdtmtst.h"
+
+const char *test_doc = "Test MAP_HUGETLB mapping in parent-child relationship processes";
+const char *test_author = "Bui Quang Minh <minhquangbui99@gmail.com>";
+
+#define MEM_SIZE (2UL * (1UL << 20)) /* 2MB */
+
+int main(int argc, char **argv)
+{
+	void *p1, *p2, *s1;
+	task_waiter_t t;
+	pid_t pid;
+	uint32_t crc, tmp_crc;
+	int status;
+
+	test_init(argc, argv);
+	task_waiter_init(&t);
+
+	p1 = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, 0, 0);
+	if (p1 == MAP_FAILED) {
+		pr_perror("Map failed");
+		return 1;
+	}
+
+	p2 = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, 0, 0);
+	if (p2 == MAP_FAILED) {
+		pr_perror("Map failed");
+		return 1;
+	}
+
+	s1 = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS | MAP_HUGETLB, 0, 0);
+	if (s1 == MAP_FAILED) {
+		pr_perror("Map failed");
+		return 1;
+	}
+
+	crc = ~0;
+	datagen(p1, MEM_SIZE, &crc);
+	crc = ~0;
+	datagen(p2, MEM_SIZE, &crc);
+	tmp_crc = crc;
+
+	pid = test_fork();
+	if (pid < 0) {
+		pr_perror("fork failed");
+		return 1;
+	}
+
+	if (pid == 0) {
+		crc = ~0;
+		datagen(p2, MEM_SIZE, &crc);
+		tmp_crc = crc;
+		crc = ~0;
+		datagen(s1, MEM_SIZE, &crc);
+
+		task_waiter_complete(&t, 1);
+		test_waitsig();
+
+		crc = ~0;
+		if (datachk(p1, MEM_SIZE, &crc)) {
+			fail("Data mismatch");
+			return 1;
+		}
+
+		crc = ~0;
+		if (datachk(p2, MEM_SIZE, &crc)) {
+			fail("Data mismatch");
+			return 1;
+		}
+
+		if (crc != tmp_crc) {
+			fail("Data mismatch");
+			return 1;
+		}
+
+		crc = ~0;
+		if (datachk(s1, MEM_SIZE, &crc)) {
+			fail("Data mismatch");
+			return 1;
+		}
+
+		return 0;
+	}
+
+	task_waiter_wait4(&t, 1);
+
+	test_daemon();
+	test_waitsig();
+
+	kill(pid, SIGTERM);
+	wait(&status);
+	if (WIFEXITED(status)) {
+		if (WEXITSTATUS(status))
+			goto err;
+	} else {
+		goto err;
+	}
+
+	crc = ~0;
+	if (datachk(p1, MEM_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+
+	crc = ~0;
+	if (datachk(p2, MEM_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+
+	if (crc != tmp_crc) {
+		fail("Data mismatch");
+		return 1;
+	}
+
+	crc = ~0;
+	if (datachk(s1, MEM_SIZE, &crc)) {
+		fail("Data mismatch");
+		return 1;
+	}
+
+	pass();
+
+	return 0;
+err:
+	if (waitpid(-1, NULL, WNOHANG) == 0) {
+		kill(pid, SIGTERM);
+		wait(NULL);
+	}
+	return 1;
+}
\ No newline at end of file

From 56df8aeeb547af97969601b29f18cf6d034d7b0c Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sat, 12 Feb 2022 16:00:39 +0700
Subject: [PATCH 0890/1854] ci: skip MAP_HUGETLB tests in stream test

Currently, hugetlb mappings is not premapped so in the restore content phase, we
skip page read these pages, enqueue the iovec for later reading in restorer and
eventually close the page read. However, image-streamer expects the whole image
to be read and the image is not re-opened, sent twice. These MAP_HUGETLB test
cases will result in EPIPE error. Temporarily disable these test cases for now.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 scripts/ci/run-ci-tests.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index d0cd55f7c..50216634e 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -63,8 +63,15 @@ ci_prep () {
 
 test_stream() {
 	# Testing CRIU streaming to criu-image-streamer
+
+	# FIXME: Currently, hugetlb mappings is not premapped, so in the restore content
+	# phase, we skip page read these pages, enqueue the iovec for later reading in
+	# restorer and eventually close the page read. However, image-streamer expects the
+	# whole image to be read and the image is not reopened, sent twice. These MAP_HUGETLB
+	# test cases will result in EPIPE error at the moment.
+	STREAM_TEST_EXCLUDE="-x maps09 -x maps10"
 	# shellcheck disable=SC2086
-	./test/zdtm.py run --stream -p 2 --keep-going -a $ZDTM_OPTS
+	./test/zdtm.py run --stream -p 2 --keep-going -a $STREAM_TEST_EXCLUDE $ZDTM_OPTS
 }
 
 print_header() {

From 247cdc90dbe7cd6f0bd3452b59d99d31585f0497 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 15 Feb 2022 16:55:45 +0000
Subject: [PATCH 0891/1854] bpfmap: handle new field in fdinfo

Starting with Linux Kernel release 5.16 the fdinfo proc entry contains
a map_extra field which breaks CRIU parsing of bpfmap entries.

This commit adds the map_extra as a possible field to CRIU. The value of
map_extra is not passed to the kernel on restore as it does not seem to
be evaluated in the code paths CRIU restore is using for BPF.

This fixes CRIU CI using Fedora with 5.16.

See Linux commit 9330986c03006ab1d33d243b7cfe598a7a3c1baa
 "bpf: Add bloom filter map implementation"

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/bpfmap.c            |  3 +++
 criu/proc_parse.c        | 36 +++++++++++++++++++++++++++---------
 images/bpfmap-file.proto |  1 +
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index 55b381c18..64071d382 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -292,6 +292,9 @@ static int bpfmap_open(struct file_desc *d, int *new_fd)
 		return -1;
 	}
 
+	if (bpfe->has_map_extra && bpfe->map_extra)
+		pr_warn("bpfmap map_extra has non-zero value. This will not be restored.\n");
+
 	if (restore_bpfmap_data(bpfmap_fd, bpfe->map_id, bpfmap_data_hash_table))
 		return -1;
 
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index b068e9754..9af067c9e 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1772,6 +1772,12 @@ nodata:
 typedef struct bpfmap_fmt {
 	char *fmt;
 	void *value;
+	/*
+	 * If newer kernels are adding additional entries, these entries need
+	 * to be marked as optional in the protobuf definition and the parsing
+	 * must be able to ignore it if running on an older kernel.
+	 */
+	protobuf_c_boolean *optional;
 } bpfmap_fmt;
 
 static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
@@ -1784,27 +1790,36 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 	 * uint32_t value_size
 	 * uint32_t max_entries
 	 * uint32_t map_flags
+	 * uint64_t map_extra
 	 * uint64_t memlock
 	 * uint32_t map_id
 	 * boolean frozen
 	 */
 
+	/* This needs to be in the same order as in the fdinfo entry. */
 	bpfmap_fmt map[] = {
-		{ "map_type: %u", &bpf->map_type },
-		{ "key_size: %u", &bpf->key_size },
-		{ "value_size: %u", &bpf->value_size },
-		{ "max_entries: %u", &bpf->max_entries },
-		{ "map_flags: %" PRIx32 "", &bpf->map_flags },
-		{ "memlock: %" PRIu64 "", &bpf->memlock },
-		{ "map_id: %u", &bpf->map_id },
-		{ "frozen: %d", &bpf->frozen },
+		{ "map_type: %u", &bpf->map_type, NULL },
+		{ "key_size: %u", &bpf->key_size, NULL },
+		{ "value_size: %u", &bpf->value_size, NULL },
+		{ "max_entries: %u", &bpf->max_entries, NULL },
+		{ "map_flags: %" PRIx32 "", &bpf->map_flags, NULL },
+		{ "map_extra: %" PRIx64 "", &bpf->map_extra, &bpf->has_map_extra },
+		{ "memlock: %" PRIu64 "", &bpf->memlock, NULL },
+		{ "map_id: %u", &bpf->map_id, NULL },
+		{ "frozen: %d", &bpf->frozen, NULL },
 	};
 
 	size_t n = sizeof(map) / sizeof(bpfmap_fmt);
 	int i;
 
 	for (i = 0; i < n; i++) {
-		if (sscanf(str, map[i].fmt, map[i].value) != 1)
+		bool parsing_failed = false;
+		if (sscanf(str, map[i].fmt, map[i].value) != 1) {
+			parsing_failed = true;
+		}
+		if (map[i].optional && !parsing_failed)
+			*map[i].optional = true;
+		if (!map[i].optional && parsing_failed)
 			return -1;
 
 		if (i == n - 1)
@@ -1817,6 +1832,9 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 		}
 	}
 
+	if (bpf->has_map_extra && bpf->map_extra)
+		pr_warn("Non-zero value for fdinfo map_extra entry found. This will not be restored.\n");
+
 	return 0;
 }
 
diff --git a/images/bpfmap-file.proto b/images/bpfmap-file.proto
index 34a6c1dd2..895321e13 100644
--- a/images/bpfmap-file.proto
+++ b/images/bpfmap-file.proto
@@ -21,4 +21,5 @@ message bpfmap_file_entry {
 	required string		map_name	= 13;
 	required uint32		ifindex		= 14 [default = 0];
 	optional sint32		mnt_id		= 15 [default = -1];
+	optional uint64		map_extra	= 16;
 }

From 51099d2bb66739364abd2408f1d6c07d726214c1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 15 Feb 2022 17:01:32 +0000
Subject: [PATCH 0892/1854] test: remove test for LOCK_MAND flock

Linux Kernel release 5.16 removed support for LOCK_MAND flock and so the
test to verify if LOCK_MAND works started to fail with 5.16.

The kernel also logs following message:

 Attempt to set a LOCK_MAND lock via flock(2). This support has been removed and the request ignored.

This fixes CRIU CI using Fedora with 5.16.

See Linux Kernel commit 90f7d7a0d0d68623b5f7df5621a8d54d9518fcc4
 "locks: remove LOCK_MAND flock lock support"

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/file_locks01.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/test/zdtm/static/file_locks01.c b/test/zdtm/static/file_locks01.c
index 6c2e54ff4..beea171f5 100644
--- a/test/zdtm/static/file_locks01.c
+++ b/test/zdtm/static/file_locks01.c
@@ -159,7 +159,6 @@ int main(int argc, char **argv)
 
 	flock(fd_0, LOCK_SH);
 	flock(fd_1, LOCK_EX);
-	flock(fd_2, LOCK_MAND | LOCK_READ);
 
 	test_daemon();
 	test_waitsig();
@@ -172,11 +171,6 @@ int main(int argc, char **argv)
 		fail("Failed on fd %d", fd_1);
 		ret |= 1;
 	}
-	if (check_file_lock(fd_2, "MSNFS", "READ", dev, inodes[2])) {
-		fail("Failed on fd %d", fd_2);
-		ret |= 1;
-	}
-
 	if (!ret)
 		pass();
 

From 6b842635bdccc956c11e8cef4c17d4e637b147a6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 15 Feb 2022 18:09:27 +0000
Subject: [PATCH 0893/1854] test: disable rseq also on Archlinux

Seems like Archlinux also uses rseq now and that breaks CRIU.
Also disable rseq on Archlinux.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/build/Dockerfile.archlinux | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index d226244ee..b226d5701 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -1,5 +1,8 @@
 FROM docker.io/library/archlinux:latest
 
+# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696
+ENV GLIBC_TUNABLES=glibc.pthread.rseq=0
+
 ARG CC=gcc
 
 RUN pacman -Syu --noconfirm \

From ef98a71b1657dd0012be69f1e51f4ba72bc2fd35 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 18 Feb 2022 18:13:14 +0300
Subject: [PATCH 0894/1854] zdtm: fix missplacement of err=True

There is no 'err' argument for print(), it should be in grep_errors() in
line below.

Fixes: bed670f62 ("zdtm: print tails of all logs if a test has failed")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index cf73a17ae..daad1b687 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1485,8 +1485,8 @@ class criu:
             self.__page_server_p = None
         if self.__dump_process:
             self.__dump_process.terminate()
-            print("criu dump exited with %s" % self.__dump_process.wait(), err=True)
-            grep_errors(os.path.join(self.__ddir(), "dump.log"))
+            print("criu dump exited with %s" % self.__dump_process.wait())
+            grep_errors(os.path.join(self.__ddir(), "dump.log"), err=True)
             self.__dump_process = None
         if self.__img_streamer_process:
             self.__img_streamer_process.terminate()

From 97a99856734c87b046cad04e5e5b2840f974989c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 9 Mar 2022 08:40:35 +0000
Subject: [PATCH 0895/1854] compel: set mxcsr during error injection to zero

During error injection tests there are random values loaded in some of
the registers. The kernel, however, has the following check:

    if (mxcsr[0] & ~mxcsr_feature_mask)
        return -EINVAL;

So depending on the random values loaded mxcsr might have values that
the kernel rejects with EINVAL. Setting mxcsr to zero during the tests
lets the error injection test pass.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 compel/arch/x86/src/lib/infect.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index de9013c27..0d3e9e9a0 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -272,6 +272,17 @@ static void validate_random_xstate(struct xsave_struct *xsave)
 
 	/* No reserved bits may be set */
 	memset(&hdr->reserved, 0, sizeof(hdr->reserved));
+
+	/*
+	 * While using PTRACE_SETREGSET the kernel checks that
+	 * "Reserved bits in MXCSR must be zero."
+	 * if (mxcsr[0] & ~mxcsr_feature_mask)
+	 *	return -EINVAL;
+	 *
+	 * As the mxcsr_feature_mask depends on the CPU the easiest solution for
+	 * this error injection test is to set mxcsr just to zero.
+	 */
+	xsave->i387.mxcsr = 0;
 }
 
 /*

From be78b853da7edc49cff5b24c7153a1f0a2893bb0 Mon Sep 17 00:00:00 2001
From: anatasluo <luolongjuna@gmail.com>
Date: Tue, 8 Mar 2022 08:34:14 +0000
Subject: [PATCH 0896/1854] proc_smaps: remove useless nonlinear check

nonlinear information has been removed since commit
1da4b35b001481df99 in kernel.

Signed-off-by: anatasluo <luolongjuna@gmail.com>
---
 criu/proc_parse.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 9af067c9e..3fec71d4d 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -789,17 +789,7 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t du
 		eof = (str == NULL);
 
 		if (!eof && !__is_vma_range_fmt(str)) {
-			if (!strncmp(str, "Nonlinear", 9)) {
-				BUG_ON(!vma_area);
-				pr_err("Nonlinear mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
-				       vma_area->e->end);
-				/*
-				 * VMA is already on list and will be
-				 * freed later as list get destroyed.
-				 */
-				vma_area = NULL;
-				goto err;
-			} else if (!strncmp(str, "VmFlags: ", 9)) {
+			if (!strncmp(str, "VmFlags: ", 9)) {
 				BUG_ON(!vma_area);
 				parse_vma_vmflags(&str[9], vma_area);
 				continue;

From 2747bb2a7cbdaf7a5ad22cce5e06be8e81a1d568 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 9 Mar 2022 14:32:25 +0300
Subject: [PATCH 0897/1854] mount: fix e_str leak in ext_mount_add

coverity CID 389202:
54int ext_mount_add(char *key, char *val)
 55{
 56        char *e_str;
 57
   1. alloc_fn: Storage is returned from allocation function malloc.
   2. var_assign: Assigning: ___p = storage returned from malloc(strlen(key) + strlen(val) + 8UL).
   3. Condition !___p, taking false branch.
   4. leaked_storage: Variable ___p going out of scope leaks the storage it points to.
   5. var_assign: Assigning: e_str = ({...; ___p;}).
 58        e_str = xmalloc(strlen(key) + strlen(val) + 8);
   6. Condition !e_str, taking false branch.
 59        if (!e_str)
 60                return -1;
...
   7. noescape: Resource e_str is not freed or pointed-to in sprintf.
 73        sprintf(e_str, "mnt[%s]:%s", key, val);
   8. noescape: Resource e_str is not freed or pointed-to in add_external. [show details]
   CID 389202 (#1 of 1): Resource leak (RESOURCE_LEAK)9. leaked_storage: Variable e_str going out of scope leaks the storage it points to.
 74        return add_external(e_str);
 75}

We need to free e_str after add_external used it.

v2: use cleanup_free attribute (@adrianreber)

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 4b57ac703..c301aaeeb 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -55,7 +55,7 @@ static LIST_HEAD(delayed_unbindable);
 
 int ext_mount_add(char *key, char *val)
 {
-	char *e_str;
+	cleanup_free char *e_str = NULL;
 
 	e_str = xmalloc(strlen(key) + strlen(val) + 8);
 	if (!e_str)

From 7e9a9dc34258fa087d12a9063a36cf84d8fee63f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 9 Mar 2022 15:14:50 +0300
Subject: [PATCH 0898/1854] cr-dump: fix cr_imgset leak in dump_one_task

coverity CID 389194:

1238static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
1239{
...
1245        struct cr_imgset *cr_imgset = NULL;
...
    11. alloc_fn: Storage is returned from allocation function cr_task_imgset_open. [show details]
    12. var_assign: Assigning: cr_imgset = storage returned from cr_task_imgset_open(vpid(item), 577).
1355        cr_imgset = cr_task_imgset_open(vpid(item), O_DUMP);
    13. Condition !cr_imgset, taking false branch.
1356        if (!cr_imgset)
1357                goto err_cure;
1358
...
    25. Condition opts.lazy_pages, taking false branch.
1427        if (opts.lazy_pages)
1428                ret = compel_cure_remote(parasite_ctl);
1429        else
1430                ret = compel_cure(parasite_ctl);
    26. Condition ret, taking true branch.
1431        if (ret) {
1432                pr_err("Can't cure (pid: %d) from parasite\n", pid);
    27. Jumping to label err.
1433                goto err;
1434        }
...
1448        close_cr_imgset(&cr_imgset);
1449        exit_code = 0;
1450err:
1451        close_pid_proc();
1452        free_mappings(&vmas);
1453        xfree(dfds);
    CID 389194 (#1 of 1): Resource leak (RESOURCE_LEAK)28. leaked_storage: Variable cr_imgset going out of scope leaks the storage it points to.
1454        return exit_code;
1455
1456err_cure:
1457        close_cr_imgset(&cr_imgset);
1458err_cure_imgset:
1459        ret = compel_cure(parasite_ctl);
1460        if (ret)
1461                pr_err("Can't cure (pid: %d) from parasite\n", pid);
1462        goto err;
1463}

On compel_cure() error path we do not do close_cr_imgset() thich leads
to leaked cr_imgset, let's move corresponding close_cr_imgset below err
label. Also now we can merge remove close_cr_imgset() in err_cure label
as it goes to err label later anyway. Separate err_cure_imgset label is
not needed as close_cr_imgset() is ready for cr_imgset == NULL.

v2: remove excess close_cr_imgset() in label err_cure (@adrianreber)

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-dump.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index c972e343a..eb1fb5e9a 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1315,29 +1315,29 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 		pfd = parasite_get_proc_fd_seized(parasite_ctl);
 		if (pfd < 0) {
 			pr_err("Can't get proc fd (pid: %d)\n", pid);
-			goto err_cure_imgset;
+			goto err_cure;
 		}
 
 		if (install_service_fd(CR_PROC_FD_OFF, pfd) < 0)
-			goto err_cure_imgset;
+			goto err_cure;
 	}
 
 	ret = parasite_fixup_vdso(parasite_ctl, pid, &vmas);
 	if (ret) {
 		pr_err("Can't fixup vdso VMAs (pid: %d)\n", pid);
-		goto err_cure_imgset;
+		goto err_cure;
 	}
 
 	ret = parasite_collect_aios(parasite_ctl, &vmas); /* FIXME -- merge with above */
 	if (ret) {
 		pr_err("Failed to check aio rings (pid: %d)\n", pid);
-		goto err_cure_imgset;
+		goto err_cure;
 	}
 
 	ret = parasite_dump_misc_seized(parasite_ctl, &misc);
 	if (ret) {
 		pr_err("Can't dump misc (pid: %d)\n", pid);
-		goto err_cure_imgset;
+		goto err_cure;
 	}
 
 	item->pid->ns[0].virt = misc.pid;
@@ -1445,17 +1445,15 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 		goto err;
 	}
 
-	close_cr_imgset(&cr_imgset);
 	exit_code = 0;
 err:
+	close_cr_imgset(&cr_imgset);
 	close_pid_proc();
 	free_mappings(&vmas);
 	xfree(dfds);
 	return exit_code;
 
 err_cure:
-	close_cr_imgset(&cr_imgset);
-err_cure_imgset:
 	ret = compel_cure(parasite_ctl);
 	if (ret)
 		pr_err("Can't cure (pid: %d) from parasite\n", pid);

From 09fa32a755070d29f8501875d42ea4baf2b7da01 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 9 Mar 2022 13:52:00 +0300
Subject: [PATCH 0899/1854] tun: fix tun_link leak in dump_tun_link

coverity CID 389205:

452int dump_tun_link(NetDeviceEntry *nde, struct cr_imgset *fds, struct nlattr **info)
453{
...
458        struct tun_link *tl;
...
   2. alloc_fn: Storage is returned from allocation function get_tun_link_fd. [show details]
   3. var_assign: Assigning: tl = storage returned from get_tun_link_fd(nde->name, nde->peer_nsid, tle.flags).
475        tl = get_tun_link_fd(nde->name, nde->peer_nsid, tle.flags);
   4. Condition !tl, taking false branch.
476        if (!tl)
477                return ret;
478
479        tle.vnethdr = tl->dmp.vnethdr;
480        tle.sndbuf = tl->dmp.sndbuf;
481
482        nde->tun = &tle;
   CID 389205 (#1 of 1): Resource leak (RESOURCE_LEAK)5. leaked_storage: Variable tl going out of scope leaks the storage it points to.
483        return write_netdev_img(nde, fds, info);
484}

Function get_tun_link_fd() can both return tun_link entry from tun_links
list and a newly allocated one. So we should not free entry if it is
from list and should free it when it is a new one to fix leak.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/tun.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/criu/tun.c b/criu/tun.c
index 2a2f950da..bc84604b3 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -155,6 +155,7 @@ static struct tun_link *__dump_tun_link_fd(int fd, char *name, unsigned ns_id, u
 		goto err;
 	strlcpy(tl->name, name, sizeof(tl->name));
 	tl->ns_id = ns_id;
+	INIT_LIST_HEAD(&tl->l);
 
 	if (ioctl(fd, TUNGETVNETHDRSZ, &tl->dmp.vnethdr) < 0) {
 		pr_perror("Can't dump vnethdr size for %s", name);
@@ -479,6 +480,14 @@ int dump_tun_link(NetDeviceEntry *nde, struct cr_imgset *fds, struct nlattr **in
 	tle.vnethdr = tl->dmp.vnethdr;
 	tle.sndbuf = tl->dmp.sndbuf;
 
+	/*
+	 * Function get_tun_link_fd() can return either entry
+	 * from tun_links list or a newly allocated one, need to
+	 * free it only if not in list.
+	 */
+	if (list_empty(&tl->l))
+		xfree(tl);
+
 	nde->tun = &tle;
 	return write_netdev_img(nde, fds, info);
 }

From 1b4a9df9c0920fad3a64550c765999da6aad043f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 10 Mar 2022 13:35:50 +0300
Subject: [PATCH 0900/1854] sk-unix: fix uint32_t id variable printf format
 specifier

coverity CID 389193:
CID 389193 (#1 of 1): Printf format string issue (PW.BAD_PRINTF_FORMAT_STRING)
1. bad_printf_format_string: invalid format string conversion
598 pr_warn("Can't stat socket %#x(%s), skipping: %m (err %d)\n", id, rpath, errno);

Specifier "%#x" is wrong for id as it is of type uint32_t, let's change
it to "%#" PRIx32 "" to fix the problem.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 194193dff..90c9eb11b 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -595,7 +595,7 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 	snprintf(rpath, sizeof(rpath), ".%s", name);
 	if (fstatat(mntns_root, rpath, &st, 0)) {
 		if (errno != ENOENT) {
-			pr_warn("Can't stat socket %#x(%s), skipping: %m (err %d)\n", id, rpath, errno);
+			pr_warn("Can't stat socket %#" PRIx32 "(%s), skipping: %m (err %d)\n", id, rpath, errno);
 			goto skip;
 		}
 

From 0b7965397340af39dc48275fea4e92ad2bd2303e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 24 Jul 2021 12:19:22 +0100
Subject: [PATCH 0901/1854] zdtm: refactor main

This patch improves the readability of zdtm by refactoring the top-level
code into a main function.

https://docs.python.org/3/library/__main__.html

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm.py | 360 ++++++++++++++++++++++++++-------------------------
 1 file changed, 184 insertions(+), 176 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index daad1b687..9ad9ab24e 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -28,8 +28,6 @@ import pycriu as crpc
 
 import yaml
 
-os.chdir(os.path.dirname(os.path.abspath(__file__)))
-
 # File to store content of streamed images
 STREAMED_IMG_FILE_NAME = "img.criu"
 
@@ -40,9 +38,6 @@ def alarm(*args):
     print("==== ALARM ====")
 
 
-signal.signal(signal.SIGALRM, alarm)
-
-
 def traceit(f, e, a):
     if e == "line":
         lineno = f.f_lineno
@@ -2511,19 +2506,19 @@ class group:
         self.__dump_meta(fname, '.hook')
 
 
-def group_tests(opts):
+def group_tests(cli_opts):
     excl = None
     groups = []
     pend_groups = []
-    maxs = int(opts['max_size'])
+    maxs = int(cli_opts['max_size'])
 
     if not os.access("groups", os.F_OK):
         os.mkdir("groups")
 
-    tlist = all_tests(opts)
+    tlist = all_tests(cli_opts)
     random.shuffle(tlist)
-    if opts['exclude']:
-        excl = re.compile(".*(" + "|".join(opts['exclude']) + ")")
+    if cli_opts['exclude']:
+        excl = re.compile(".*(" + "|".join(cli_opts['exclude']) + ")")
         print("Compiled exclusion list")
 
     for t in tlist:
@@ -2545,7 +2540,7 @@ def group_tests(opts):
     groups += pend_groups
 
     nr = 0
-    suf = opts['name'] or 'group'
+    suf = cli_opts['name'] or 'group'
 
     for g in groups:
         if maxs > 1 and g.size() == 1:  # Not much point in group test for this
@@ -2570,190 +2565,203 @@ def set_nr_hugepages(nr):
     orig_hugepages = 0
     with open("/proc/sys/vm/nr_hugepages", "r") as f:
         orig_hugepages = int(f.read())
-
     with open("/proc/sys/vm/nr_hugepages", "w") as f:
         f.write("{}\n".format(nr))
-
     return orig_hugepages
 
 
-#
-# main() starts here
-#
+def get_cli_args():
+    """
+    Parse command-line arguments
+    """
+    p = argparse.ArgumentParser("CRIU test suite")
+    p.add_argument("--debug",
+                   help="Print what's being executed",
+                   action='store_true')
+    p.add_argument("--set", help="Which set of tests to use", default='zdtm')
 
-if 'CR_CT_TEST_INFO' in os.environ:
-    # Fork here, since we're new pidns init and are supposed to
-    # collect this namespace's zombies
-    status = 0
-    pid = os.fork()
-    if pid == 0:
-        tinfo = eval(os.environ['CR_CT_TEST_INFO'])
-        do_run_test(tinfo[0], tinfo[1], tinfo[2], tinfo[3])
-    else:
-        while True:
-            wpid, status = os.wait()
-            if wpid == pid:
-                if os.WIFEXITED(status):
-                    status = os.WEXITSTATUS(status)
-                else:
-                    status = 1
-                break
+    sp = p.add_subparsers(help="Use --help for list of actions")
 
-    sys.exit(status)
+    rp = sp.add_parser("run", help="Run test(s)")
+    rp.set_defaults(action=run_tests)
+    rp.add_argument("-a", "--all", action='store_true')
+    rp.add_argument("-t", "--test", help="Test name", action='append')
+    rp.add_argument("-T", "--tests", help="Regexp")
+    rp.add_argument("-F", "--from", help="From file")
+    rp.add_argument("-f", "--flavor", help="Flavor to run")
+    rp.add_argument("-x",
+                    "--exclude",
+                    help="Exclude tests from --all run",
+                    action='append')
 
-p = argparse.ArgumentParser("CRIU test suite")
-p.add_argument("--debug",
-               help="Print what's being executed",
-               action='store_true')
-p.add_argument("--set", help="Which set of tests to use", default='zdtm')
+    rp.add_argument("--sibling",
+                    help="Restore tests as siblings",
+                    action='store_true')
+    rp.add_argument("--join-ns",
+                    help="Restore tests and join existing namespace",
+                    action='store_true')
+    rp.add_argument("--empty-ns",
+                    help="Restore tests in empty net namespace",
+                    action='store_true')
+    rp.add_argument("--pre", help="Do some pre-dumps before dump (n[:pause])")
+    rp.add_argument("--snaps",
+                    help="Instead of pre-dumps do full dumps",
+                    action='store_true')
+    rp.add_argument("--dedup",
+                    help="Auto-deduplicate images on iterations",
+                    action='store_true')
+    rp.add_argument("--noauto-dedup",
+                    help="Manual deduplicate images on iterations",
+                    action='store_true')
+    rp.add_argument("--nocr",
+                    help="Do not CR anything, just check test works",
+                    action='store_true')
+    rp.add_argument("--norst",
+                    help="Don't restore tasks, leave them running after dump",
+                    action='store_true')
+    rp.add_argument("--stop",
+                    help="Check that --leave-stopped option stops ps tree.",
+                    action='store_true')
+    rp.add_argument("--iters",
+                    help="Do CR cycle several times before check (n[:pause])")
+    rp.add_argument("--fault", help="Test fault injection")
+    rp.add_argument(
+        "--sat",
+        help="Generate criu strace-s for sat tool (restore is fake, images are kept)",
+        action='store_true')
+    rp.add_argument(
+        "--sbs",
+        help="Do step-by-step execution, asking user for keypress to continue",
+        action='store_true')
+    rp.add_argument("--freezecg", help="Use freeze cgroup (path:state)")
+    rp.add_argument("--user", help="Run CRIU as regular user",
+                    action='store_true')
+    rp.add_argument("--rpc",
+                    help="Run CRIU via RPC rather than CLI",
+                    action='store_true')
 
-sp = p.add_subparsers(help="Use --help for list of actions")
+    rp.add_argument("--page-server",
+                    help="Use page server dump",
+                    action='store_true')
+    rp.add_argument("--stream",
+                    help="Use criu-image-streamer",
+                    action='store_true')
+    rp.add_argument("-p", "--parallel", help="Run test in parallel")
+    rp.add_argument("--dry-run",
+                    help="Don't run tests, just pretend to",
+                    action='store_true')
+    rp.add_argument("--script", help="Add script to get notified by criu")
+    rp.add_argument("-k",
+                    "--keep-img",
+                    help="Whether or not to keep images after test",
+                    choices=['always', 'never', 'failed'],
+                    default='failed')
+    rp.add_argument("--report", help="Generate summary report in directory")
+    rp.add_argument("--keep-going",
+                    help="Keep running tests in spite of failures",
+                    action='store_true')
+    rp.add_argument("--ignore-taint",
+                    help="Don't care about a non-zero kernel taint flag",
+                    action='store_true')
+    rp.add_argument("--lazy-pages",
+                    help="restore pages on demand",
+                    action='store_true')
+    rp.add_argument("--lazy-migrate",
+                    help="restore pages on demand",
+                    action='store_true')
+    rp.add_argument("--remote-lazy-pages",
+                    help="simulate lazy migration",
+                    action='store_true')
+    rp.add_argument("--tls", help="use TLS for migration", action='store_true')
+    rp.add_argument("--title", help="A test suite title", default="criu")
+    rp.add_argument("--show-stats",
+                    help="Show criu statistics",
+                    action='store_true')
+    rp.add_argument("--criu-bin",
+                    help="Path to criu binary",
+                    default='../criu/criu')
+    rp.add_argument("--crit-bin",
+                    help="Path to crit binary",
+                    default='../crit/crit')
+    rp.add_argument("--criu-image-streamer-dir",
+                    help="Directory where the criu-image-streamer binary is located",
+                    default="../../criu-image-streamer")
+    rp.add_argument("--pre-dump-mode",
+                    help="Use splice or read mode of pre-dumping",
+                    choices=['splice', 'read'],
+                    default='splice')
 
-rp = sp.add_parser("run", help="Run test(s)")
-rp.set_defaults(action=run_tests)
-rp.add_argument("-a", "--all", action='store_true')
-rp.add_argument("-t", "--test", help="Test name", action='append')
-rp.add_argument("-T", "--tests", help="Regexp")
-rp.add_argument("-F", "--from", help="From file")
-rp.add_argument("-f", "--flavor", help="Flavor to run")
-rp.add_argument("-x",
-                "--exclude",
-                help="Exclude tests from --all run",
-                action='append')
+    lp = sp.add_parser("list", help="List tests")
+    lp.set_defaults(action=list_tests)
+    lp.add_argument('-i',
+                    '--info',
+                    help="Show more info about tests",
+                    action='store_true')
 
-rp.add_argument("--sibling",
-                help="Restore tests as siblings",
-                action='store_true')
-rp.add_argument("--join-ns",
-                help="Restore tests and join existing namespace",
-                action='store_true')
-rp.add_argument("--empty-ns",
-                help="Restore tests in empty net namespace",
-                action='store_true')
-rp.add_argument("--pre", help="Do some pre-dumps before dump (n[:pause])")
-rp.add_argument("--snaps",
-                help="Instead of pre-dumps do full dumps",
-                action='store_true')
-rp.add_argument("--dedup",
-                help="Auto-deduplicate images on iterations",
-                action='store_true')
-rp.add_argument("--noauto-dedup",
-                help="Manual deduplicate images on iterations",
-                action='store_true')
-rp.add_argument("--nocr",
-                help="Do not CR anything, just check test works",
-                action='store_true')
-rp.add_argument("--norst",
-                help="Don't restore tasks, leave them running after dump",
-                action='store_true')
-rp.add_argument("--stop",
-                help="Check that --leave-stopped option stops ps tree.",
-                action='store_true')
-rp.add_argument("--iters",
-                help="Do CR cycle several times before check (n[:pause])")
-rp.add_argument("--fault", help="Test fault injection")
-rp.add_argument(
-    "--sat",
-    help="Generate criu strace-s for sat tool (restore is fake, images are kept)",
-    action='store_true')
-rp.add_argument(
-    "--sbs",
-    help="Do step-by-step execution, asking user for keypress to continue",
-    action='store_true')
-rp.add_argument("--freezecg", help="Use freeze cgroup (path:state)")
-rp.add_argument("--user", help="Run CRIU as regular user", action='store_true')
-rp.add_argument("--rpc",
-                help="Run CRIU via RPC rather than CLI",
-                action='store_true')
+    gp = sp.add_parser("group", help="Generate groups")
+    gp.set_defaults(action=group_tests)
+    gp.add_argument("-m", "--max-size",
+                    help="Maximum number of tests in group")
+    gp.add_argument("-n", "--name", help="Common name for group tests")
+    gp.add_argument("-x",
+                    "--exclude",
+                    help="Exclude tests from --all run",
+                    action='append')
 
-rp.add_argument("--page-server",
-                help="Use page server dump",
-                action='store_true')
-rp.add_argument("--stream",
-                help="Use criu-image-streamer",
-                action='store_true')
-rp.add_argument("-p", "--parallel", help="Run test in parallel")
-rp.add_argument("--dry-run",
-                help="Don't run tests, just pretend to",
-                action='store_true')
-rp.add_argument("--script", help="Add script to get notified by criu")
-rp.add_argument("-k",
-                "--keep-img",
-                help="Whether or not to keep images after test",
-                choices=['always', 'never', 'failed'],
-                default='failed')
-rp.add_argument("--report", help="Generate summary report in directory")
-rp.add_argument("--keep-going",
-                help="Keep running tests in spite of failures",
-                action='store_true')
-rp.add_argument("--ignore-taint",
-                help="Don't care about a non-zero kernel taint flag",
-                action='store_true')
-rp.add_argument("--lazy-pages",
-                help="restore pages on demand",
-                action='store_true')
-rp.add_argument("--lazy-migrate",
-                help="restore pages on demand",
-                action='store_true')
-rp.add_argument("--remote-lazy-pages",
-                help="simulate lazy migration",
-                action='store_true')
-rp.add_argument("--tls", help="use TLS for migration", action='store_true')
-rp.add_argument("--title", help="A test suite title", default="criu")
-rp.add_argument("--show-stats",
-                help="Show criu statistics",
-                action='store_true')
-rp.add_argument("--criu-bin",
-                help="Path to criu binary",
-                default='../criu/criu')
-rp.add_argument("--crit-bin",
-                help="Path to crit binary",
-                default='../crit/crit')
-rp.add_argument("--criu-image-streamer-dir",
-                help="Directory where the criu-image-streamer binary is located",
-                default="../../criu-image-streamer")
-rp.add_argument("--pre-dump-mode",
-                help="Use splice or read mode of pre-dumping",
-                choices=['splice', 'read'],
-                default='splice')
+    cp = sp.add_parser("clean", help="Clean something")
+    cp.set_defaults(action=clean_stuff)
+    cp.add_argument("what", choices=['nsroot'])
 
-lp = sp.add_parser("list", help="List tests")
-lp.set_defaults(action=list_tests)
-lp.add_argument('-i',
-                '--info',
-                help="Show more info about tests",
-                action='store_true')
+    return vars(p.parse_args())
 
-gp = sp.add_parser("group", help="Generate groups")
-gp.set_defaults(action=group_tests)
-gp.add_argument("-m", "--max-size", help="Maximum number of tests in group")
-gp.add_argument("-n", "--name", help="Common name for group tests")
-gp.add_argument("-x",
-                "--exclude",
-                help="Exclude tests from --all run",
-                action='append')
 
-cp = sp.add_parser("clean", help="Clean something")
-cp.set_defaults(action=clean_stuff)
-cp.add_argument("what", choices=['nsroot'])
+def waitpid_and_rip_zombies(pid):
+    """
+    Collect this namespace's zombies
+    """
+    while True:
+        wpid, status = os.wait()
+        if wpid == pid:
+            if os.WIFEXITED(status):
+                return os.WEXITSTATUS(status)
+            return 1
 
-opts = vars(p.parse_args())
-if opts.get('sat', False):
-    opts['keep_img'] = 'always'
 
-if opts['debug']:
-    sys.settrace(traceit)
+def fork_zdtm():
+    """
+    Fork here, since we're new pidns init and are supposed to
+    collect this namespace's zombies
+    """
+    if 'CR_CT_TEST_INFO' in os.environ:
+        status = 0
+        pid = os.fork()
+        if pid == 0:
+            tinfo = eval(os.environ['CR_CT_TEST_INFO'])
+            do_run_test(tinfo[0], tinfo[1], tinfo[2], tinfo[3])
+        else:
+            status = waitpid_and_rip_zombies(pid)
+        sys.exit(status)
 
-if opts['action'] == 'run':
-    criu.available()
-for tst in test_classes.values():
-    tst.available()
 
-orig_hugepages = set_nr_hugepages(20)
+if __name__ == '__main__':
+    os.chdir(os.path.dirname(os.path.abspath(__file__)))
+    signal.signal(signal.SIGALRM, alarm)
+    fork_zdtm()
+    opts = get_cli_args()
+    if opts.get('sat', False):
+        opts['keep_img'] = 'always'
 
-opts['action'](opts)
+    if opts['debug']:
+        sys.settrace(traceit)
 
-set_nr_hugepages(orig_hugepages)
+    if opts['action'] == 'run':
+        criu.available()
+    for tst in test_classes.values():
+        tst.available()
 
-for tst in test_classes.values():
-    tst.cleanup()
+    orig_hugepages = set_nr_hugepages(20)
+    opts['action'](opts)
+    set_nr_hugepages(orig_hugepages)
+
+    for tst in test_classes.values():
+        tst.cleanup()

From 0734fc807f3d589013a7b490b335d6c5a39c3900 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 15 Aug 2021 10:27:37 +0100
Subject: [PATCH 0902/1854] zdtm: sort import lines

These changes have been auto-generated with:

    pip3 install isort autoflake
    isort -rc -sl zdtm.py
    autoflake --remove-all-unused-imports -i zdtm.py
    isort -rc -m 3 zdtm.py

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 9ad9ab24e..bb4a4c3b9 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import (
+    absolute_import,
+    division,
+    print_function,
+    unicode_literals
+)
 
 import argparse
 import atexit
@@ -14,6 +19,7 @@ import random
 import re
 import shutil
 import signal
+import socket
 import stat
 import string
 import struct
@@ -21,13 +27,12 @@ import subprocess
 import sys
 import tempfile
 import time
-import socket
-from builtins import (input, int, open, range, str, zip)
-
-import pycriu as crpc
+from builtins import input, int, open, range, str, zip
 
 import yaml
 
+import pycriu as crpc
+
 # File to store content of streamed images
 STREAMED_IMG_FILE_NAME = "img.criu"
 
@@ -1933,7 +1938,7 @@ class Launcher:
 
         if opts['report'] and (opts['keep_going'] or self.__total == 1):
             global TestSuite, TestCase
-            from junit_xml import TestSuite, TestCase
+            from junit_xml import TestCase, TestSuite
             now = datetime.datetime.now()
             att = 0
             reportname = os.path.join(report_dir, "criu-testreport.tap")

From fc38a01e5e628c7430fc6bf19f59aa53dfe3709a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 15 Aug 2021 10:53:29 +0100
Subject: [PATCH 0903/1854] zdtm: use long form cli options

Using long-form command-line options would allows us to provide
them via config file to CRIU.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index bb4a4c3b9..d02b42814 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -560,7 +560,7 @@ class zdtm_test:
             opts += ["--root", self.__flavor.root]
         if test_flag(self.__desc, 'crlib'):
             opts += [
-                "-L",
+                "--libdir",
                 os.path.dirname(os.path.realpath(self.__name)) + '/lib'
             ]
         return opts
@@ -899,14 +899,14 @@ class criu_rpc:
     def __set_opts(criu, args, ctx):
         while len(args) != 0:
             arg = args.pop(0)
-            if "-v4" == arg:
+            if "--verbosity=4" == arg:
                 criu.opts.log_level = 4
-            elif "-o" == arg:
+            elif "--log-file" == arg:
                 criu.opts.log_file = args.pop(0)
-            elif "-D" == arg:
+            elif "--images-dir" == arg:
                 criu.opts.images_dir_fd = os.open(args.pop(0), os.O_DIRECTORY)
                 ctx['imgd'] = criu.opts.images_dir_fd
-            elif "-t" == arg:
+            elif "--tree" == arg:
                 criu.opts.pid = int(args.pop(0))
             elif "--pidfile" == arg:
                 ctx['pidf'] = args.pop(0)
@@ -1118,7 +1118,8 @@ class criu:
         if not log:
             log = action + ".log"
 
-        s_args = ["-o", log, "-D", self.__ddir(), "-v4"] + opts
+        s_args = ["--log-file", log, "--images-dir", self.__ddir(),
+                  "--verbosity=4"] + opts
 
         with open(os.path.join(self.__ddir(), action + '.cropt'), 'w') as f:
             f.write(' '.join(s_args) + '\n')
@@ -1316,7 +1317,7 @@ class criu:
         os.mkdir(self.__ddir())
         os.chmod(self.__ddir(), 0o777)
 
-        a_opts = ["-t", self.__test.getpid()]
+        a_opts = ["--tree", self.__test.getpid()]
         if self.__prev_dump_iter:
             a_opts += [
                 "--prev-images-dir",
@@ -1461,7 +1462,8 @@ class criu:
                 return False
 
         return criu_cli.run(
-            "check", ["--no-default-config", "-v0", "--feature", feature],
+            "check",
+            ["--no-default-config", "--verbosity=0", "--feature", feature],
             opts['criu_bin']) == 0
 
     @staticmethod

From d2073cd4d78bb995355de800a9cc919695523fdf Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 15 Aug 2021 10:58:32 +0100
Subject: [PATCH 0904/1854] zdtm: add --criu-config option

The --criu-config option allows to run test with CRIU options provided
via configuration files instead of command-line arguments.

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm.py             | 16 ++++++++++++---
 test/zdtm/__init__.py    |  0
 test/zdtm/criu_config.py | 42 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 test/zdtm/__init__.py
 create mode 100644 test/zdtm/criu_config.py

diff --git a/test/zdtm.py b/test/zdtm.py
index d02b42814..3fbdb8a18 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -32,6 +32,7 @@ from builtins import input, int, open, range, str, zip
 import yaml
 
 import pycriu as crpc
+from zdtm.criu_config import criu_config
 
 # File to store content of streamed images
 STREAMED_IMG_FILE_NAME = "img.criu"
@@ -1036,7 +1037,6 @@ class criu:
         self.__user = bool(opts['user'])
         self.__leave_stopped = bool(opts['stop'])
         self.__stream = bool(opts['stream'])
-        self.__criu = (opts['rpc'] and criu_rpc or criu_cli)
         self.__show_stats = bool(opts['show_stats'])
         self.__lazy_pages_p = None
         self.__page_server_p = None
@@ -1047,6 +1047,13 @@ class criu:
         self.__crit_bin = opts['crit_bin']
         self.__pre_dump_mode = opts['pre_dump_mode']
 
+        if opts['rpc']:
+            self.__criu = criu_rpc
+        elif opts['criu_config']:
+            self.__criu = criu_config
+        else:
+            self.__criu = criu_cli
+
     def fini(self):
         if self.__lazy_migrate:
             ret = self.__dump_process.wait()
@@ -2024,8 +2031,8 @@ class Launcher:
 
         nd = ('nocr', 'norst', 'pre', 'iters', 'page_server', 'sibling',
               'stop', 'empty_ns', 'fault', 'keep_img', 'report', 'snaps',
-              'sat', 'script', 'rpc', 'lazy_pages', 'join_ns', 'dedup', 'sbs',
-              'freezecg', 'user', 'dry_run', 'noauto_dedup',
+              'sat', 'script', 'rpc', 'criu_config', 'lazy_pages', 'join_ns',
+              'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
               'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
@@ -2647,6 +2654,9 @@ def get_cli_args():
                     help="Run CRIU via RPC rather than CLI",
                     action='store_true')
 
+    rp.add_argument("--criu-config",
+                    help="Use config file to set CRIU options",
+                    action='store_true')
     rp.add_argument("--page-server",
                     help="Use page server dump",
                     action='store_true')
diff --git a/test/zdtm/__init__.py b/test/zdtm/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/zdtm/criu_config.py b/test/zdtm/criu_config.py
new file mode 100644
index 000000000..487becfb4
--- /dev/null
+++ b/test/zdtm/criu_config.py
@@ -0,0 +1,42 @@
+import os
+import tempfile
+import subprocess
+
+
+class criu_config:
+    @staticmethod
+    def run(action,
+            args,
+            criu_bin,
+            fault=None,
+            strace=[],
+            preexec=None,
+            nowait=False):
+
+        config_path = tempfile.mktemp(".conf", "criu-%s-" % action)
+        with open(config_path, "w") as config_fd:
+            for arg in args:
+                if arg.startswith("--"):
+                    config_fd.write("\n")
+                    arg = arg.strip("-")
+                config_fd.write("%s " % arg)
+
+        env = dict(
+            os.environ,
+            ASAN_OPTIONS="log_path=asan.log:disable_coredump=0:detect_leaks=0"
+        )
+
+        if fault:
+            print("Forcing %s fault" % fault)
+            env['CRIU_FAULT'] = fault
+
+        cr = subprocess.Popen(
+            strace +
+            [criu_bin, action, "--no-default-config", "--config", config_path],
+            env=env,
+            close_fds=False,
+            preexec_fn=preexec
+        )
+        if nowait:
+            return cr
+        return cr.wait()

From 1c54c45fc524eb158edcbd397d1858b706c1abe4 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 15 Aug 2021 11:16:28 +0100
Subject: [PATCH 0905/1854] zdtm: drop redundant config_inotify_irmap test

The config_inotify_irmap test duplicates inotify_irmap with slight
change to add the --force-irmap and --irmap-scan-path options in
a configuration file.

The --criu-config option of ZDTM provides more general solution
for testing CRIU options provided in configuration files.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/Makefile                        |  2 +-
 test/Makefile                              |  2 +-
 test/zdtm/static/Makefile                  |  1 -
 test/zdtm/static/config_inotify_irmap.c    | 95 ----------------------
 test/zdtm/static/config_inotify_irmap.desc |  3 -
 5 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 test/zdtm/static/config_inotify_irmap.c
 delete mode 100644 test/zdtm/static/config_inotify_irmap.desc

diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 02b4d871c..3e4d59430 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -18,7 +18,7 @@ export UNAME
 CONTAINER_RUNTIME := docker
 export CONTAINER_RUNTIME
 
-alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00 -x zdtm/static/config_inotify_irmap
+alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00
 
 define DOCKER_JSON
 {
diff --git a/test/Makefile b/test/Makefile
index cf7dacac4..9938015e0 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -51,7 +51,7 @@ clean_root:
 .PHONY: clean_root
 
 clean: clean_root
-	$(RM) zdtm_ct zdtm-tst-list umount2 zdtm_test_config.conf
+	$(RM) zdtm_ct zdtm-tst-list umount2
 	$(Q) $(RM) *.log
 	$(Q) $(RM) -r ./dump/
 	$(Q) $(MAKE) -C zdtm cleandep clean cleanout
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1b057c70c..33e15f85a 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -237,7 +237,6 @@ TST_NOFILE	:=				\
 		netns_sub_veth			\
 		netns_sub_sysctl	\
 		unlink_multiple_largefiles	\
-		config_inotify_irmap		\
 		thp_disable			\
 		pid_file			\
 		selinux00			\
diff --git a/test/zdtm/static/config_inotify_irmap.c b/test/zdtm/static/config_inotify_irmap.c
deleted file mode 100644
index 94585491a..000000000
--- a/test/zdtm/static/config_inotify_irmap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <unistd.h>
-#include <limits.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/inotify.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "zdtmtst.h"
-
-/*
- * This test reuses inotify_irmap test for testing configuration files
- * functionality. For parts not related to configuration files, please
- * refer to the original test case and it's author.
- */
-
-const char *test_doc = "Default configuration files usage";
-const char *test_author = "Veronika Kabatova <vkabatov@redhat.com>";
-
-#define TDIR "/etc"
-char test_files[2][128] = {
-	TDIR "/zdtm-test",
-	TDIR "/zdtm-test1",
-};
-#define CONFIG_PATH "../../zdtm_test_config.conf"
-
-#define BUFF_SIZE ((sizeof(struct inotify_event) + PATH_MAX))
-
-int main(int argc, char *argv[])
-{
-	FILE *configfile;
-	char buf[BUFF_SIZE];
-	int fd, wd, i;
-
-	test_init(argc, argv);
-
-	for (i = 0; i < 2; i++) {
-		unlink(test_files[i]);
-		if (creat(test_files[i], 0600) < 0) {
-			pr_perror("Can't make test file");
-			exit(1);
-		}
-	}
-	fd = inotify_init1(IN_NONBLOCK);
-	if (fd < 0) {
-		pr_perror("inotify_init failed");
-		goto err;
-	}
-	for (i = 0; i < 2; i++) {
-		wd = inotify_add_watch(fd, test_files[i], IN_OPEN);
-		if (wd < 0) {
-			pr_perror("inotify_add_watch failed");
-			goto err;
-		}
-	}
-
-	configfile = fopen(CONFIG_PATH, "w");
-	if (configfile == NULL) {
-		pr_perror("Unable to create configuration file %s", CONFIG_PATH);
-		goto err;
-	}
-	fprintf(configfile, "force-irmap\t\nirmap-scan-path /zdtm/static\n");
-	fclose(configfile);
-
-	test_daemon();
-	test_waitsig();
-
-	for (i = 0; i < 2; i++) {
-		memset(buf, 0, sizeof(buf));
-		wd = open(test_files[i], O_RDONLY);
-		if (read(fd, buf, sizeof(buf)) <= 0) {
-			fail("No events in queue");
-			unlink(CONFIG_PATH);
-			goto err;
-		}
-	}
-
-	close(wd);
-	close(fd);
-	for (i = 0; i < 2; i++)
-		unlink(test_files[i]);
-	unlink(CONFIG_PATH);
-	pass();
-	return 0;
-err:
-	for (i = 0; i < 2; i++)
-		unlink(test_files[i]);
-	return 1;
-}
diff --git a/test/zdtm/static/config_inotify_irmap.desc b/test/zdtm/static/config_inotify_irmap.desc
deleted file mode 100644
index 591ae7191..000000000
--- a/test/zdtm/static/config_inotify_irmap.desc
+++ /dev/null
@@ -1,3 +0,0 @@
-(lambda confpath:
-{'flags': 'suid', 'opts': '--config %s' % (confpath)
-}) (os.path.abspath('./zdtm_test_config.conf'))

From a8dd7d2909327d97f8e0b4ebe7b6b68da19c49d7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 15 Aug 2021 11:29:22 +0100
Subject: [PATCH 0906/1854] ci: run criu-config tests

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh | 3 +++
 test/Makefile              | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 50216634e..5ef3965db 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -202,6 +202,9 @@ fi
 # shellcheck disable=SC2086
 ./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
 
+# shellcheck disable=SC2086
+./test/zdtm.py run -a -p 2 --keep-going --criu-config $ZDTM_OPTS
+
 # Newer kernels are blocking access to userfaultfd:
 # uffd: Set unprivileged_userfaultfd sysctl knob to 1 if kernel faults must be handled without obtaining CAP_SYS_PTRACE capability
 if [ -e /proc/sys/vm/unprivileged_userfaultfd ]; then
diff --git a/test/Makefile b/test/Makefile
index 9938015e0..8416b1961 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,6 +5,7 @@ export ZDTM_ARGS
 
 all:
 	$(MAKE) zdtm
+	$(MAKE) zdtm-config
 	$(MAKE) zdtm-pre-dump
 	$(MAKE) zdtm-snapshot
 	$(MAKE) zdtm-iter
@@ -23,6 +24,10 @@ zdtm:
 	./zdtm.py run -a --parallel 2
 .PHONY: zdtm
 
+zdtm-config:
+	./zdtm.py run -a --parallel 2 --criu-config
+.PHONY: zdtm-config
+
 zdtm-pre-dump:
 	./zdtm.py run --pre 2:1 -t zdtm/transition/fork -f uns
 .PHONY: zdtm-pre-dump

From 2856d06e37475a481846e60ac7c8bb81f0724919 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 10 Mar 2022 14:15:23 +0300
Subject: [PATCH 0907/1854] config: fix ns leak in parse_join_ns

coverity CID 389192:

550static int parse_join_ns(const char *ptr)
551{
...
553        char *ns;
554
   1. alloc_fn: Storage is returned from allocation function strdup.
   2. var_assign: Assigning: ___p = storage returned from strdup(ptr).
   3. Condition !___p, taking false branch.
   4. leaked_storage: Variable ___p going out of scope leaks the storage it points to.
   5. var_assign: Assigning: ns = ({...; ___p;}).
555        ns = xstrdup(ptr);
   6. Condition ns == NULL, taking false branch.
556        if (ns == NULL)
557                return -1;
558
   7. noescape: Resource ns is not freed or pointed-to in strchr.
559        aux = strchr(ns, ':');
   8. Condition aux == NULL, taking true branch.
560        if (aux == NULL)
   CID 389192 (#1 of 1): Resource leak (RESOURCE_LEAK)9. leaked_storage: Variable ns going out of scope leaks the storage it points to.
561                return -1;

We should free ns string after we finish it's use in parse_join_ns,
easiest way to do it is to use cleanup_free attribute.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/config.c b/criu/config.c
index 33f2820a1..4a8338423 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -549,7 +549,7 @@ static size_t parse_size(char *optarg)
 static int parse_join_ns(const char *ptr)
 {
 	char *aux, *ns_file, *extra_opts = NULL;
-	char *ns;
+	cleanup_free char *ns = NULL;
 
 	ns = xstrdup(ptr);
 	if (ns == NULL)

From 06056704219fb11500b8233d0c047b73bd7947c3 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 11 Mar 2022 19:57:06 +0300
Subject: [PATCH 0908/1854] net: fix e_str leak in veth_pair_add

coverity CID 389187:

3193int veth_pair_add(char *in, char *out)
3194{
3195        char *e_str;
3196
    1. alloc_fn: Storage is returned from allocation function malloc.
    2. var_assign: Assigning: ___p = storage returned from malloc(200UL).
    3. Condition !___p, taking false branch.
    4. leaked_storage: Variable ___p going out of scope leaks the storage it points to.
    5. var_assign: Assigning: e_str = ({...; ___p;}).
3197        e_str = xmalloc(200); /* For 3 IFNAMSIZ + 8 service characters */
    6. Condition !e_str, taking false branch.
3198        if (!e_str)
3199                return -1;
    7. noescape: Resource e_str is not freed or pointed-to in snprintf.
3200        snprintf(e_str, 200, "veth[%s]:%s", in, out);
    8. noescape: Resource e_str is not freed or pointed-to in add_external. [show details]
    CID 389187 (#1 of 1): Resource leak (RESOURCE_LEAK)9. leaked_storage: Variable e_str going out of scope leaks the storage it points to.
3201        return add_external(e_str);
3202}

We should free e_str string after we finish it's use in veth_pair_add,
easiest way to do it is to use cleanup_free attribute.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index 50655559d..c82054037 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3192,7 +3192,7 @@ void network_unlock(void)
 
 int veth_pair_add(char *in, char *out)
 {
-	char *e_str;
+	cleanup_free char *e_str = NULL;
 
 	e_str = xmalloc(200); /* For 3 IFNAMSIZ + 8 service characters */
 	if (!e_str)

From 5b0a639a554cfecbbddbdff291065fbe13be8716 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 11 Mar 2022 18:45:37 +0300
Subject: [PATCH 0909/1854] files: fix inh leak in inherit_fd_add

coverity CID 389190:

1538int inherit_fd_add(int fd, char *key)
1539{
1540        struct inherit_fd *inh;
...
    2. alloc_fn: Storage is returned from allocation function malloc.
    3. var_assign: Assigning: ___p = storage returned from malloc(32UL).
    4. Condition !___p, taking false branch.
    5. leaked_storage: Variable ___p going out of scope leaks the storage it points to.
    6. var_assign: Assigning: inh = ({...; ___p;}).
1548        inh = xmalloc(sizeof *inh);
    7. Condition inh == NULL, taking false branch.
1549        if (inh == NULL)
1550                return -1;
1551
...
    9. Condition !___p, taking true branch.
1555        inh->inh_id = xstrdup(key);
    10. Condition inh->inh_id == NULL, taking true branch.
1556        if (inh->inh_id == NULL)
    CID 389190 (#1 of 1): Resource leak (RESOURCE_LEAK)11. leaked_storage: Variable inh going out of scope leaks the storage it points to.
1557                return -1;

We should free inh on inh_id allocation error path in inherit_fd_add.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/files.c b/criu/files.c
index 7f4b90086..d317bc9ab 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1553,8 +1553,10 @@ int inherit_fd_add(int fd, char *key)
 		inh_fd_max = fd;
 
 	inh->inh_id = xstrdup(key);
-	if (inh->inh_id == NULL)
+	if (inh->inh_id == NULL) {
+		xfree(inh);
 		return -1;
+	}
 
 	inh->inh_fd = fd;
 	list_add_tail(&inh->inh_list, &opts.inherit_fds);

From 653eefea0c715d737b5d478bf64bdc205fbd2189 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Tue, 28 Sep 2021 09:38:13 -0400
Subject: [PATCH 0910/1854] criu/plugin: Do not reopen vma fd for plugins

Some device drivers (e.g DRM) only allow the file descriptor that was
used to create the vma to be used when calling mmap.
In this case, instead of opening a new FD, the plugin will return a
valid FD that can be used for mmap later. The plugin needs to close the
returned FD later. Copies of the returned FD that are created using dup
or fnctl(..,F_DUPFD,..) are references to the same struct file inside
kernel so they are also allowed to mmap.
The plugin does not need to update the path anymore as the plugin can
return a FD for the correct path.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 criu/files-reg.c           | 26 ++++++++++++++++++--------
 criu/include/criu-plugin.h |  8 ++++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 6759e00e5..c339876b4 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2322,6 +2322,7 @@ static int open_filemap(int pid, struct vma_area *vma)
 {
 	u32 flags;
 	int ret;
+	int plugin_fd = -1;
 
 	/*
 	 * The vma->fd should have been assigned in collect_filemap
@@ -2335,25 +2336,34 @@ static int open_filemap(int pid, struct vma_area *vma)
 	/* update the new device file page offsets and file paths set during restore */
 	if (vma->e->status & VMA_UNSUPP) {
 		uint64_t new_pgoff;
-		char new_path[PATH_MAX];
 		int ret;
 
 		struct reg_file_info *rfi = container_of(vma->vmfd, struct reg_file_info, d);
-		ret = run_plugins(UPDATE_VMA_MAP, rfi->rfe->name, new_path, vma->e->start, vma->e->pgoff, &new_pgoff);
+		ret = run_plugins(UPDATE_VMA_MAP, rfi->rfe->name, vma->e->start, vma->e->pgoff, &new_pgoff, &plugin_fd);
 		if (ret == 1) {
-			pr_info("New mmap %#016" PRIx64 "->%#016" PRIx64 " path %s\n", vma->e->pgoff, new_pgoff,
-				new_path);
+			pr_info("New mmap %#016" PRIx64 ":%#016" PRIx64 "->%#016" PRIx64 " fd %d\n", vma->e->start,
+				vma->e->pgoff, new_pgoff, plugin_fd);
 			vma->e->pgoff = new_pgoff;
-			rfi->path = xstrdup(new_path);
-			pr_debug("Updated rfi->path %s\n", rfi->path);
 		}
+		/* Device plugin will restore vma contents, so no need for write permission */
+		vma->e->status |= VMA_NO_PROT_WRITE;
 	}
 
 	if (ctx.flags != flags || ctx.desc != vma->vmfd) {
-		if (vma->e->status & VMA_AREA_MEMFD)
+		if (plugin_fd >= 0) {
+			/*
+			 * Vma handled by device plugin.
+			 * Some device drivers (e.g DRM) only allow the file descriptor that was used to create vma to
+			 * be used when calling mmap. In this case, use the FD returned by plugin. FD can be copied
+			 * using dup because dup returns a reference to the same struct file inside kernel, but we
+			 * cannot open a new FD.
+			 */
+			ret = dup(plugin_fd);
+		} else if (vma->e->status & VMA_AREA_MEMFD) {
 			ret = memfd_open(vma->vmfd, &flags);
-		else
+		} else {
 			ret = open_path(vma->vmfd, do_open_reg_noseek_flags, &flags);
+		}
 		if (ret < 0)
 			return ret;
 
diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index 0bc7a4255..886832eaa 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -69,8 +69,8 @@ DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_MOUNT, char *mountpoint, int i
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_EXT_MOUNT, int id, char *mountpoint, char *old_root, int *is_file);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_LINK, int index, int type, char *kind);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, int fd, const struct stat *stat);
-DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, const char *old_path, char *new_path, const uint64_t addr,
-			 const uint64_t old_pgoff, uint64_t *new_pgoff);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, const char *path, const uint64_t addr,
+			 const uint64_t old_pgoff, uint64_t *new_pgoff, int *plugin_fd);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, int pid);
 
 enum {
@@ -143,8 +143,8 @@ typedef int(cr_plugin_dump_ext_mount_t)(char *mountpoint, int id);
 typedef int(cr_plugin_restore_ext_mount_t)(int id, char *mountpoint, char *old_root, int *is_file);
 typedef int(cr_plugin_dump_ext_link_t)(int index, int type, char *kind);
 typedef int(cr_plugin_handle_device_vma_t)(int fd, const struct stat *stat);
-typedef int(cr_plugin_update_vma_map_t)(const char *old_path, char *new_path, const uint64_t addr,
-					const uint64_t old_pgoff, uint64_t *new_pgoff);
+typedef int(cr_plugin_update_vma_map_t)(const char *path, const uint64_t addr, const uint64_t old_pgoff,
+					uint64_t *new_pgoff, int *plugin_fd);
 typedef int(cr_plugin_resume_devices_late_t)(int pid);
 
 #endif /* __CRIU_PLUGIN_H__ */

From e04db024119bd146ce088bfeb80a42e8e0d13e01 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Mon, 27 Sep 2021 14:16:35 -0400
Subject: [PATCH 0911/1854] criu/files: Add function to return unused FD by pid

Add a new global function to return unused FD based on the pid. This
function can be used in situations where we need a FD that will not
conflict with FDs used by target restore process, but
struct pstree_item is not available (e.g plugins)

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 criu/files.c         | 12 ++++++++++++
 criu/include/files.h |  1 +
 2 files changed, 13 insertions(+)

diff --git a/criu/files.c b/criu/files.c
index d317bc9ab..5a9268526 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -183,6 +183,18 @@ out:
 	return fd;
 }
 
+int find_unused_fd_pid(pid_t pid)
+{
+	struct pstree_item *task;
+
+	task = pstree_item_by_virt(pid);
+	if (!task) {
+		pr_err("Invalid pid:%d\n", pid);
+		return -1;
+	}
+	return find_unused_fd(task, -1);
+}
+
 int set_fds_event(pid_t virt)
 {
 	struct pstree_item *item;
diff --git a/criu/include/files.h b/criu/include/files.h
index aadc09f73..31ebb0ca0 100644
--- a/criu/include/files.h
+++ b/criu/include/files.h
@@ -195,4 +195,5 @@ extern int open_transport_socket(void);
 extern int set_fds_event(pid_t virt);
 extern void wait_fds_event(void);
 
+int find_unused_fd_pid(pid_t pid);
 #endif /* __CR_FILES_H__ */

From 63e127fc8035de915852137a1bb7e40871e2ae08 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Thu, 30 Sep 2021 16:46:06 -0400
Subject: [PATCH 0912/1854] criu/plugin: Add dedicated flag for plugins

Adding a dedicated flag for vma's that are handled by an external plugin
as previously used VMA_UNSUPP flag depends on vma not having
VMA_FILE_SHARED flag.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 criu/files-reg.c     |  2 +-
 criu/include/image.h |  1 +
 criu/proc_parse.c    | 35 +++++++++++++++--------------------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index c339876b4..95f84a29f 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2334,7 +2334,7 @@ static int open_filemap(int pid, struct vma_area *vma)
 	flags = vma->e->fdflags;
 
 	/* update the new device file page offsets and file paths set during restore */
-	if (vma->e->status & VMA_UNSUPP) {
+	if (vma->e->status & VMA_EXT_PLUGIN) {
 		uint64_t new_pgoff;
 		int ret;
 
diff --git a/criu/include/image.h b/criu/include/image.h
index 14659dbd2..5cb01bde2 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -85,6 +85,7 @@
 #define VMA_AREA_AIORING (1 << 13)
 #define VMA_AREA_MEMFD	 (1 << 14)
 
+#define VMA_EXT_PLUGIN	  (1 << 27)
 #define VMA_CLOSE	  (1 << 28)
 #define VMA_NO_PROT_WRITE (1 << 29)
 #define VMA_PREMMAPED	  (1 << 30)
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 3fec71d4d..f7abd4d52 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -203,7 +203,6 @@ struct vma_file_info {
 	int dev_min;
 	unsigned long ino;
 	struct vma_area *vma;
-	bool has_device_plugin;
 };
 
 static inline int vfi_equal(struct vma_file_info *a, struct vma_file_info *b)
@@ -604,7 +603,7 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 			pr_debug("Found devzero mapping, OK\n");
 		} else if (handle_vma_plugin(vm_file_fd, st_buf)) {
 			pr_info("Found device file mapping, plugin is available\n");
-			vfi->has_device_plugin = true;
+			vma_area->e->status |= VMA_EXT_PLUGIN;
 		} else {
 			/* non-regular mapping with no supporting plugin */
 			pr_err("Can't handle non-regular mapping on %d's map %" PRIx64 "\n", pid, vma_area->e->start);
@@ -690,24 +689,20 @@ err_bogus_mapfile:
 static int vma_list_add(struct vma_area *vma_area, struct vm_area_list *vma_area_list, unsigned long *prev_end,
 			struct vma_file_info *vfi, struct vma_file_info *prev_vfi)
 {
-	if (vma_area->e->status & VMA_UNSUPP) {
-		if (vfi->has_device_plugin) {
-			/* Unsupported VMAs that provide special plugins for
-			 * backup can be treated as regular VMAs and criu
-			 * should only save their metadata in the dump files.
-			 * There can be several special backup plugins hooks
-			 * that might run at different stages during checkpoint
-			 * and restore.
-			 */
-			pr_debug("Device file mapping %016" PRIx64 "-%016" PRIx64 " "
-				 "must be supported via device plugins\n",
-				 vma_area->e->start, vma_area->e->end);
-
-		} else {
-			pr_err("Unsupported mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
-			       vma_area->e->end);
-			return -1;
-		}
+	if (vma_area->e->status & VMA_EXT_PLUGIN) {
+		/* Unsupported VMAs that provide special plugins for
+		 * backup can be treated as regular VMAs and criu
+		 * should only save their metadata in the dump files.
+		 * There can be several special backup plugins hooks
+		 * that might run at different stages during checkpoint
+		 * and restore.
+		 */
+		pr_debug("Device file mapping %016" PRIx64 "-%016" PRIx64 " supported via device plugins\n",
+			 vma_area->e->start, vma_area->e->end);
+	} else if (vma_area->e->status & VMA_UNSUPP) {
+		pr_err("Unsupported mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
+		       vma_area->e->end);
+		return -1;
 	}
 
 	/* Add a guard page only if here is enough space for it */

From 91157315b24ee6544d807d92ad5924d19ff4bda7 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Fri, 7 Jan 2022 18:57:30 -0500
Subject: [PATCH 0913/1854] criu/plugin: Skip plugin vmas during premap

During premap phase, skip vmas that are handled by external plugins as
their offsets may change when the plugin restores them. This change is
needed when running with criu image streamer.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 criu/mem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/mem.c b/criu/mem.c
index 6b7e4be4b..136439518 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -977,6 +977,10 @@ static int premap_priv_vmas(struct pstree_item *t, struct vm_area_list *vmas, vo
 		if (vma->e->flags & MAP_HUGETLB)
 			continue;
 
+		/* VMA offset may change due to plugin so we cannot premap */
+		if (vma->e->status & VMA_EXT_PLUGIN)
+			continue;
+
 		if (vma->pvma == NULL && pr->pieok && !vma_force_premap(vma, &vmas->h)) {
 			/*
 			 * VMA in question is not shared with anyone. We'll

From 71ff9cc045634c86d446fd4c13df43895f39bd28 Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Tue, 4 May 2021 12:02:15 -0400
Subject: [PATCH 0914/1854] criu/plugin: Initialize AMD KFD header

kfd_ioctl.h contains the definitions for the APIs and required arguments
to call the ioctls so simply copy the header as is for amdgpu plugin.

Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/kfd_ioctl.h | 785 +++++++++++++++++++++++++++++++++++++
 1 file changed, 785 insertions(+)
 create mode 100644 plugins/amdgpu/kfd_ioctl.h

diff --git a/plugins/amdgpu/kfd_ioctl.h b/plugins/amdgpu/kfd_ioctl.h
new file mode 100644
index 000000000..b88fe20cf
--- /dev/null
+++ b/plugins/amdgpu/kfd_ioctl.h
@@ -0,0 +1,785 @@
+/*
+ * Copyright 2014 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef KFD_IOCTL_H_INCLUDED
+#define KFD_IOCTL_H_INCLUDED
+
+#include <drm/drm.h>
+#include <linux/ioctl.h>
+
+/*
+ * - 1.1 - initial version
+ * - 1.3 - Add SMI events support
+ * - 1.4 - Indicate new SRAM EDC bit in device properties
+ * - 1.5 - Add SVM API
+ * - 1.6 - Query clear flags in SVM get_attr API
+ * - 1.7 - Checkpoint Restore (CRIU) API
+ * - 1.8 - CRIU - Support for SDMA transfers with GTT BOs
+ */
+#define KFD_IOCTL_MAJOR_VERSION 1
+#define KFD_IOCTL_MINOR_VERSION 8
+
+struct kfd_ioctl_get_version_args {
+	__u32 major_version; /* from KFD */
+	__u32 minor_version; /* from KFD */
+};
+
+/* For kfd_ioctl_create_queue_args.queue_type. */
+#define KFD_IOC_QUEUE_TYPE_COMPUTE     0x0
+#define KFD_IOC_QUEUE_TYPE_SDMA	       0x1
+#define KFD_IOC_QUEUE_TYPE_COMPUTE_AQL 0x2
+#define KFD_IOC_QUEUE_TYPE_SDMA_XGMI   0x3
+
+#define KFD_MAX_QUEUE_PERCENTAGE 100
+#define KFD_MAX_QUEUE_PRIORITY	 15
+
+struct kfd_ioctl_create_queue_args {
+	__u64 ring_base_address;     /* to KFD */
+	__u64 write_pointer_address; /* from KFD */
+	__u64 read_pointer_address;  /* from KFD */
+	__u64 doorbell_offset;	     /* from KFD */
+
+	__u32 ring_size;	/* to KFD */
+	__u32 gpu_id;		/* to KFD */
+	__u32 queue_type;	/* to KFD */
+	__u32 queue_percentage; /* to KFD */
+	__u32 queue_priority;	/* to KFD */
+	__u32 queue_id;		/* from KFD */
+
+	__u64 eop_buffer_address;	/* to KFD */
+	__u64 eop_buffer_size;		/* to KFD */
+	__u64 ctx_save_restore_address; /* to KFD */
+	__u32 ctx_save_restore_size;	/* to KFD */
+	__u32 ctl_stack_size;		/* to KFD */
+};
+
+struct kfd_ioctl_destroy_queue_args {
+	__u32 queue_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_update_queue_args {
+	__u64 ring_base_address; /* to KFD */
+
+	__u32 queue_id;		/* to KFD */
+	__u32 ring_size;	/* to KFD */
+	__u32 queue_percentage; /* to KFD */
+	__u32 queue_priority;	/* to KFD */
+};
+
+struct kfd_ioctl_set_cu_mask_args {
+	__u32 queue_id;	   /* to KFD */
+	__u32 num_cu_mask; /* to KFD */
+	__u64 cu_mask_ptr; /* to KFD */
+};
+
+struct kfd_ioctl_get_queue_wave_state_args {
+	__u64 ctl_stack_address;   /* to KFD */
+	__u32 ctl_stack_used_size; /* from KFD */
+	__u32 save_area_used_size; /* from KFD */
+	__u32 queue_id;		   /* to KFD */
+	__u32 pad;
+};
+
+/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
+#define KFD_IOC_CACHE_POLICY_COHERENT	 0
+#define KFD_IOC_CACHE_POLICY_NONCOHERENT 1
+
+struct kfd_ioctl_set_memory_policy_args {
+	__u64 alternate_aperture_base; /* to KFD */
+	__u64 alternate_aperture_size; /* to KFD */
+
+	__u32 gpu_id;		/* to KFD */
+	__u32 default_policy;	/* to KFD */
+	__u32 alternate_policy; /* to KFD */
+	__u32 pad;
+};
+
+/*
+ * All counters are monotonic. They are used for profiling of compute jobs.
+ * The profiling is done by userspace.
+ *
+ * In case of GPU reset, the counter should not be affected.
+ */
+
+struct kfd_ioctl_get_clock_counters_args {
+	__u64 gpu_clock_counter;    /* from KFD */
+	__u64 cpu_clock_counter;    /* from KFD */
+	__u64 system_clock_counter; /* from KFD */
+	__u64 system_clock_freq;    /* from KFD */
+
+	__u32 gpu_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_process_device_apertures {
+	__u64 lds_base;	     /* from KFD */
+	__u64 lds_limit;     /* from KFD */
+	__u64 scratch_base;  /* from KFD */
+	__u64 scratch_limit; /* from KFD */
+	__u64 gpuvm_base;    /* from KFD */
+	__u64 gpuvm_limit;   /* from KFD */
+	__u32 gpu_id;	     /* from KFD */
+	__u32 pad;
+};
+
+/*
+ * AMDKFD_IOC_GET_PROCESS_APERTURES is deprecated. Use
+ * AMDKFD_IOC_GET_PROCESS_APERTURES_NEW instead, which supports an
+ * unlimited number of GPUs.
+ */
+#define NUM_OF_SUPPORTED_GPUS 7
+struct kfd_ioctl_get_process_apertures_args {
+	struct kfd_process_device_apertures process_apertures[NUM_OF_SUPPORTED_GPUS]; /* from KFD */
+
+	/* from KFD, should be in the range [1 - NUM_OF_SUPPORTED_GPUS] */
+	__u32 num_of_nodes;
+	__u32 pad;
+};
+
+struct kfd_ioctl_get_process_apertures_new_args {
+	/* User allocated. Pointer to struct kfd_process_device_apertures
+	 * filled in by Kernel
+	 */
+	__u64 kfd_process_device_apertures_ptr;
+	/* to KFD - indicates amount of memory present in kfd_process_device_apertures_ptr
+	 * from KFD - Number of entries filled by KFD.
+	 */
+	__u32 num_of_nodes;
+	__u32 pad;
+};
+
+#define MAX_ALLOWED_NUM_POINTS	  100
+#define MAX_ALLOWED_AW_BUFF_SIZE  4096
+#define MAX_ALLOWED_WAC_BUFF_SIZE 128
+
+struct kfd_ioctl_dbg_register_args {
+	__u32 gpu_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_dbg_unregister_args {
+	__u32 gpu_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_dbg_address_watch_args {
+	__u64 content_ptr;	 /* a pointer to the actual content */
+	__u32 gpu_id;		 /* to KFD */
+	__u32 buf_size_in_bytes; /*including gpu_id and buf_size */
+};
+
+struct kfd_ioctl_dbg_wave_control_args {
+	__u64 content_ptr;	 /* a pointer to the actual content */
+	__u32 gpu_id;		 /* to KFD */
+	__u32 buf_size_in_bytes; /*including gpu_id and buf_size */
+};
+
+#define KFD_INVALID_FD 0xffffffff
+
+/* Matching HSA_EVENTTYPE */
+#define KFD_IOC_EVENT_SIGNAL		0
+#define KFD_IOC_EVENT_NODECHANGE	1
+#define KFD_IOC_EVENT_DEVICESTATECHANGE 2
+#define KFD_IOC_EVENT_HW_EXCEPTION	3
+#define KFD_IOC_EVENT_SYSTEM_EVENT	4
+#define KFD_IOC_EVENT_DEBUG_EVENT	5
+#define KFD_IOC_EVENT_PROFILE_EVENT	6
+#define KFD_IOC_EVENT_QUEUE_EVENT	7
+#define KFD_IOC_EVENT_MEMORY		8
+
+#define KFD_IOC_WAIT_RESULT_COMPLETE 0
+#define KFD_IOC_WAIT_RESULT_TIMEOUT  1
+#define KFD_IOC_WAIT_RESULT_FAIL     2
+
+#define KFD_SIGNAL_EVENT_LIMIT 4096
+
+/* For kfd_event_data.hw_exception_data.reset_type. */
+#define KFD_HW_EXCEPTION_WHOLE_GPU_RESET  0
+#define KFD_HW_EXCEPTION_PER_ENGINE_RESET 1
+
+/* For kfd_event_data.hw_exception_data.reset_cause. */
+#define KFD_HW_EXCEPTION_GPU_HANG 0
+#define KFD_HW_EXCEPTION_ECC	  1
+
+/* For kfd_hsa_memory_exception_data.ErrorType */
+#define KFD_MEM_ERR_NO_RAS	    0
+#define KFD_MEM_ERR_SRAM_ECC	    1
+#define KFD_MEM_ERR_POISON_CONSUMED 2
+#define KFD_MEM_ERR_GPU_HANG	    3
+
+struct kfd_ioctl_create_event_args {
+	__u64 event_page_offset;  /* from KFD */
+	__u32 event_trigger_data; /* from KFD - signal events only */
+	__u32 event_type;	  /* to KFD */
+	__u32 auto_reset;	  /* to KFD */
+	__u32 node_id;		  /* to KFD - only valid for certain event types */
+	__u32 event_id;		  /* from KFD */
+	__u32 event_slot_index;	  /* from KFD */
+};
+
+struct kfd_ioctl_destroy_event_args {
+	__u32 event_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_set_event_args {
+	__u32 event_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_reset_event_args {
+	__u32 event_id; /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_memory_exception_failure {
+	__u32 NotPresent; /* Page not present or supervisor privilege */
+	__u32 ReadOnly;	  /* Write access to a read-only page */
+	__u32 NoExecute;  /* Execute access to a page marked NX */
+	__u32 imprecise;  /* Can't determine the exact fault address */
+};
+
+/* memory exception data */
+struct kfd_hsa_memory_exception_data {
+	struct kfd_memory_exception_failure failure;
+	__u64 va;
+	__u32 gpu_id;
+	__u32 ErrorType; /* 0 = no RAS error,
+			  * 1 = ECC_SRAM,
+			  * 2 = Link_SYNFLOOD (poison),
+			  * 3 = GPU hang (not attributable to a specific cause),
+			  * other values reserved
+			  */
+};
+
+/* hw exception data */
+struct kfd_hsa_hw_exception_data {
+	__u32 reset_type;
+	__u32 reset_cause;
+	__u32 memory_lost;
+	__u32 gpu_id;
+};
+
+/* Event data */
+struct kfd_event_data {
+	union {
+		struct kfd_hsa_memory_exception_data memory_exception_data;
+		struct kfd_hsa_hw_exception_data hw_exception_data;
+	};			  /* From KFD */
+	__u64 kfd_event_data_ext; /* pointer to an extension structure for future exception types */
+	__u32 event_id;		  /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_wait_events_args {
+	__u64 events_ptr;   /* pointed to struct kfd_event_data array, to KFD */
+	__u32 num_events;   /* to KFD */
+	__u32 wait_for_all; /* to KFD */
+	__u32 timeout;	    /* to KFD */
+	__u32 wait_result;  /* from KFD */
+};
+
+struct kfd_ioctl_set_scratch_backing_va_args {
+	__u64 va_addr; /* to KFD */
+	__u32 gpu_id;  /* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_get_tile_config_args {
+	/* to KFD: pointer to tile array */
+	__u64 tile_config_ptr;
+	/* to KFD: pointer to macro tile array */
+	__u64 macro_tile_config_ptr;
+	/* to KFD: array size allocated by user mode
+	 * from KFD: array size filled by kernel
+	 */
+	__u32 num_tile_configs;
+	/* to KFD: array size allocated by user mode
+	 * from KFD: array size filled by kernel
+	 */
+	__u32 num_macro_tile_configs;
+
+	__u32 gpu_id;	      /* to KFD */
+	__u32 gb_addr_config; /* from KFD */
+	__u32 num_banks;      /* from KFD */
+	__u32 num_ranks;      /* from KFD */
+
+	/* struct size can be extended later if needed without breaking ABI compatibility */
+};
+
+struct kfd_ioctl_set_trap_handler_args {
+	__u64 tba_addr; /* to KFD */
+	__u64 tma_addr; /* to KFD */
+	__u32 gpu_id;	/* to KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_acquire_vm_args {
+	__u32 drm_fd; /* to KFD */
+	__u32 gpu_id; /* to KFD */
+};
+
+/* Allocation flags: memory types */
+#define KFD_IOC_ALLOC_MEM_FLAGS_VRAM	   (1 << 0)
+#define KFD_IOC_ALLOC_MEM_FLAGS_GTT	   (1 << 1)
+#define KFD_IOC_ALLOC_MEM_FLAGS_USERPTR	   (1 << 2)
+#define KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL   (1 << 3)
+#define KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP (1 << 4)
+/* Allocation flags: attributes/access options */
+#define KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE      (1 << 31)
+#define KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE    (1 << 30)
+#define KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC	      (1 << 29)
+#define KFD_IOC_ALLOC_MEM_FLAGS_NO_SUBSTITUTE (1 << 28)
+#define KFD_IOC_ALLOC_MEM_FLAGS_AQL_QUEUE_MEM (1 << 27)
+#define KFD_IOC_ALLOC_MEM_FLAGS_COHERENT      (1 << 26)
+#define KFD_IOC_ALLOC_MEM_FLAGS_UNCACHED      (1 << 25)
+
+/* Allocate memory for later SVM (shared virtual memory) mapping.
+ *
+ * @va_addr:     virtual address of the memory to be allocated
+ *               all later mappings on all GPUs will use this address
+ * @size:        size in bytes
+ * @handle:      buffer handle returned to user mode, used to refer to
+ *               this allocation for mapping, unmapping and freeing
+ * @mmap_offset: for CPU-mapping the allocation by mmapping a render node
+ *               for userptrs this is overloaded to specify the CPU address
+ * @gpu_id:      device identifier
+ * @flags:       memory type and attributes. See KFD_IOC_ALLOC_MEM_FLAGS above
+ */
+struct kfd_ioctl_alloc_memory_of_gpu_args {
+	__u64 va_addr;	   /* to KFD */
+	__u64 size;	   /* to KFD */
+	__u64 handle;	   /* from KFD */
+	__u64 mmap_offset; /* to KFD (userptr), from KFD (mmap offset) */
+	__u32 gpu_id;	   /* to KFD */
+	__u32 flags;
+};
+
+/* Free memory allocated with kfd_ioctl_alloc_memory_of_gpu
+ *
+ * @handle: memory handle returned by alloc
+ */
+struct kfd_ioctl_free_memory_of_gpu_args {
+	__u64 handle; /* to KFD */
+};
+
+/* Map memory to one or more GPUs
+ *
+ * @handle:                memory handle returned by alloc
+ * @device_ids_array_ptr:  array of gpu_ids (__u32 per device)
+ * @n_devices:             number of devices in the array
+ * @n_success:             number of devices mapped successfully
+ *
+ * @n_success returns information to the caller how many devices from
+ * the start of the array have mapped the buffer successfully. It can
+ * be passed into a subsequent retry call to skip those devices. For
+ * the first call the caller should initialize it to 0.
+ *
+ * If the ioctl completes with return code 0 (success), n_success ==
+ * n_devices.
+ */
+struct kfd_ioctl_map_memory_to_gpu_args {
+	__u64 handle;		    /* to KFD */
+	__u64 device_ids_array_ptr; /* to KFD */
+	__u32 n_devices;	    /* to KFD */
+	__u32 n_success;	    /* to/from KFD */
+};
+
+/* Unmap memory from one or more GPUs
+ *
+ * same arguments as for mapping
+ */
+struct kfd_ioctl_unmap_memory_from_gpu_args {
+	__u64 handle;		    /* to KFD */
+	__u64 device_ids_array_ptr; /* to KFD */
+	__u32 n_devices;	    /* to KFD */
+	__u32 n_success;	    /* to/from KFD */
+};
+
+/* Allocate GWS for specific queue
+ *
+ * @queue_id:    queue's id that GWS is allocated for
+ * @num_gws:     how many GWS to allocate
+ * @first_gws:   index of the first GWS allocated.
+ *               only support contiguous GWS allocation
+ */
+struct kfd_ioctl_alloc_queue_gws_args {
+	__u32 queue_id;	 /* to KFD */
+	__u32 num_gws;	 /* to KFD */
+	__u32 first_gws; /* from KFD */
+	__u32 pad;
+};
+
+struct kfd_ioctl_get_dmabuf_info_args {
+	__u64 size;	     /* from KFD */
+	__u64 metadata_ptr;  /* to KFD */
+	__u32 metadata_size; /* to KFD (space allocated by user)
+			      * from KFD (actual metadata size)
+			      */
+	__u32 gpu_id;	     /* from KFD */
+	__u32 flags;	     /* from KFD (KFD_IOC_ALLOC_MEM_FLAGS) */
+	__u32 dmabuf_fd;     /* to KFD */
+};
+
+struct kfd_ioctl_import_dmabuf_args {
+	__u64 va_addr;	 /* to KFD */
+	__u64 handle;	 /* from KFD */
+	__u32 gpu_id;	 /* to KFD */
+	__u32 dmabuf_fd; /* to KFD */
+};
+
+/*
+ * KFD SMI(System Management Interface) events
+ */
+enum kfd_smi_event {
+	KFD_SMI_EVENT_NONE = 0,	   /* not used */
+	KFD_SMI_EVENT_VMFAULT = 1, /* event start counting at 1 */
+	KFD_SMI_EVENT_THERMAL_THROTTLE = 2,
+	KFD_SMI_EVENT_GPU_PRE_RESET = 3,
+	KFD_SMI_EVENT_GPU_POST_RESET = 4,
+};
+
+#define KFD_SMI_EVENT_MASK_FROM_INDEX(i) (1ULL << ((i)-1))
+#define KFD_SMI_EVENT_MSG_SIZE		 96
+
+struct kfd_ioctl_smi_events_args {
+	__u32 gpuid;   /* to KFD */
+	__u32 anon_fd; /* from KFD */
+};
+
+/**************************************************************************************************
+ * CRIU IOCTLs (Checkpoint Restore In Userspace)
+ *
+ * When checkpointing a process, the userspace application will perform:
+ * 1. PROCESS_INFO op to determine current process information. This pauses execution and evicts
+ *    all the queues.
+ * 2. CHECKPOINT op to checkpoint process contents (BOs, queues, events, svm-ranges)
+ * 3. UNPAUSE op to un-evict all the queues
+ *
+ * When restoring a process, the CRIU userspace application will perform:
+ *
+ * 1. RESTORE op to restore process contents
+ * 2. RESUME op to start the process
+ *
+ * Note: Queues are forced into an evicted state after a successful PROCESS_INFO. User
+ * application needs to perform an UNPAUSE operation after calling PROCESS_INFO.
+ */
+
+enum kfd_criu_op {
+	KFD_CRIU_OP_PROCESS_INFO,
+	KFD_CRIU_OP_CHECKPOINT,
+	KFD_CRIU_OP_UNPAUSE,
+	KFD_CRIU_OP_RESTORE,
+	KFD_CRIU_OP_RESUME,
+};
+
+/**
+ * kfd_ioctl_criu_args - Arguments perform CRIU operation
+ * @devices:		[in/out] User pointer to memory location for devices information.
+ * 			This is an array of type kfd_criu_device_bucket.
+ * @bos:		[in/out] User pointer to memory location for BOs information
+ * 			This is an array of type kfd_criu_bo_bucket.
+ * @priv_data:		[in/out] User pointer to memory location for private data
+ * @priv_data_size:	[in/out] Size of priv_data in bytes
+ * @num_devices:	[in/out] Number of GPUs used by process. Size of @devices array.
+ * @num_bos		[in/out] Number of BOs used by process. Size of @bos array.
+ * @num_objects:	[in/out] Number of objects used by process. Objects are opaque to user application.
+ * @pid:		[in/out] PID of the process being checkpointed
+ * @op			[in] Type of operation (kfd_criu_op)
+ *
+ * Return: 0 on success, -errno on failure
+ */
+struct kfd_ioctl_criu_args {
+	__u64 devices;	      /* Used during ops: CHECKPOINT, RESTORE */
+	__u64 bos;	      /* Used during ops: CHECKPOINT, RESTORE */
+	__u64 priv_data;      /* Used during ops: CHECKPOINT, RESTORE */
+	__u64 priv_data_size; /* Used during ops: PROCESS_INFO, RESTORE */
+	__u32 num_devices;    /* Used during ops: PROCESS_INFO, RESTORE */
+	__u32 num_bos;	      /* Used during ops: PROCESS_INFO, RESTORE */
+	__u32 num_objects;    /* Used during ops: PROCESS_INFO, RESTORE */
+	__u32 pid;	      /* Used during ops: PROCESS_INFO, RESUME */
+	__u32 op;
+};
+
+struct kfd_criu_device_bucket {
+	__u32 user_gpu_id;
+	__u32 actual_gpu_id;
+	__u32 drm_fd;
+	__u32 pad;
+};
+
+struct kfd_criu_bo_bucket {
+	__u64 addr;
+	__u64 size;
+	__u64 offset;
+	__u64 restored_offset; /* During restore, updated offset for BO */
+	__u32 gpu_id;	       /* This is the user_gpu_id */
+	__u32 alloc_flags;
+	__u32 dmabuf_fd;
+	__u32 pad;
+};
+
+/* CRIU IOCTLs - END */
+/**************************************************************************************************/
+
+/* Register offset inside the remapped mmio page
+ */
+enum kfd_mmio_remap {
+	KFD_MMIO_REMAP_HDP_MEM_FLUSH_CNTL = 0,
+	KFD_MMIO_REMAP_HDP_REG_FLUSH_CNTL = 4,
+};
+
+/* Guarantee host access to memory */
+#define KFD_IOCTL_SVM_FLAG_HOST_ACCESS 0x00000001
+/* Fine grained coherency between all devices with access */
+#define KFD_IOCTL_SVM_FLAG_COHERENT 0x00000002
+/* Use any GPU in same hive as preferred device */
+#define KFD_IOCTL_SVM_FLAG_HIVE_LOCAL 0x00000004
+/* GPUs only read, allows replication */
+#define KFD_IOCTL_SVM_FLAG_GPU_RO 0x00000008
+/* Allow execution on GPU */
+#define KFD_IOCTL_SVM_FLAG_GPU_EXEC 0x00000010
+/* GPUs mostly read, may allow similar optimizations as RO, but writes fault */
+#define KFD_IOCTL_SVM_FLAG_GPU_READ_MOSTLY 0x00000020
+
+/**
+ * kfd_ioctl_svm_op - SVM ioctl operations
+ *
+ * @KFD_IOCTL_SVM_OP_SET_ATTR: Modify one or more attributes
+ * @KFD_IOCTL_SVM_OP_GET_ATTR: Query one or more attributes
+ */
+enum kfd_ioctl_svm_op { KFD_IOCTL_SVM_OP_SET_ATTR, KFD_IOCTL_SVM_OP_GET_ATTR };
+
+/** kfd_ioctl_svm_location - Enum for preferred and prefetch locations
+ *
+ * GPU IDs are used to specify GPUs as preferred and prefetch locations.
+ * Below definitions are used for system memory or for leaving the preferred
+ * location unspecified.
+ */
+enum kfd_ioctl_svm_location { KFD_IOCTL_SVM_LOCATION_SYSMEM = 0, KFD_IOCTL_SVM_LOCATION_UNDEFINED = 0xffffffff };
+
+/**
+ * kfd_ioctl_svm_attr_type - SVM attribute types
+ *
+ * @KFD_IOCTL_SVM_ATTR_PREFERRED_LOC: gpuid of the preferred location, 0 for
+ *                                    system memory
+ * @KFD_IOCTL_SVM_ATTR_PREFETCH_LOC: gpuid of the prefetch location, 0 for
+ *                                   system memory. Setting this triggers an
+ *                                   immediate prefetch (migration).
+ * @KFD_IOCTL_SVM_ATTR_ACCESS:
+ * @KFD_IOCTL_SVM_ATTR_ACCESS_IN_PLACE:
+ * @KFD_IOCTL_SVM_ATTR_NO_ACCESS: specify memory access for the gpuid given
+ *                                by the attribute value
+ * @KFD_IOCTL_SVM_ATTR_SET_FLAGS: bitmask of flags to set (see
+ *                                KFD_IOCTL_SVM_FLAG_...)
+ * @KFD_IOCTL_SVM_ATTR_CLR_FLAGS: bitmask of flags to clear
+ * @KFD_IOCTL_SVM_ATTR_GRANULARITY: migration granularity
+ *                                  (log2 num pages)
+ */
+enum kfd_ioctl_svm_attr_type {
+	KFD_IOCTL_SVM_ATTR_PREFERRED_LOC,
+	KFD_IOCTL_SVM_ATTR_PREFETCH_LOC,
+	KFD_IOCTL_SVM_ATTR_ACCESS,
+	KFD_IOCTL_SVM_ATTR_ACCESS_IN_PLACE,
+	KFD_IOCTL_SVM_ATTR_NO_ACCESS,
+	KFD_IOCTL_SVM_ATTR_SET_FLAGS,
+	KFD_IOCTL_SVM_ATTR_CLR_FLAGS,
+	KFD_IOCTL_SVM_ATTR_GRANULARITY
+};
+
+/**
+ * kfd_ioctl_svm_attribute - Attributes as pairs of type and value
+ *
+ * The meaning of the @value depends on the attribute type.
+ *
+ * @type: attribute type (see enum @kfd_ioctl_svm_attr_type)
+ * @value: attribute value
+ */
+struct kfd_ioctl_svm_attribute {
+	__u32 type;
+	__u32 value;
+};
+
+/**
+ * kfd_ioctl_svm_args - Arguments for SVM ioctl
+ *
+ * @op specifies the operation to perform (see enum
+ * @kfd_ioctl_svm_op).  @start_addr and @size are common for all
+ * operations.
+ *
+ * A variable number of attributes can be given in @attrs.
+ * @nattr specifies the number of attributes. New attributes can be
+ * added in the future without breaking the ABI. If unknown attributes
+ * are given, the function returns -EINVAL.
+ *
+ * @KFD_IOCTL_SVM_OP_SET_ATTR sets attributes for a virtual address
+ * range. It may overlap existing virtual address ranges. If it does,
+ * the existing ranges will be split such that the attribute changes
+ * only apply to the specified address range.
+ *
+ * @KFD_IOCTL_SVM_OP_GET_ATTR returns the intersection of attributes
+ * over all memory in the given range and returns the result as the
+ * attribute value. If different pages have different preferred or
+ * prefetch locations, 0xffffffff will be returned for
+ * @KFD_IOCTL_SVM_ATTR_PREFERRED_LOC or
+ * @KFD_IOCTL_SVM_ATTR_PREFETCH_LOC resepctively. For
+ * @KFD_IOCTL_SVM_ATTR_SET_FLAGS, flags of all pages will be
+ * aggregated by bitwise AND. That means, a flag will be set in the
+ * output, if that flag is set for all pages in the range. For
+ * @KFD_IOCTL_SVM_ATTR_CLR_FLAGS, flags of all pages will be
+ * aggregated by bitwise NOR. That means, a flag will be set in the
+ * output, if that flag is clear for all pages in the range.
+ * The minimum migration granularity throughout the range will be
+ * returned for @KFD_IOCTL_SVM_ATTR_GRANULARITY.
+ *
+ * Querying of accessibility attributes works by initializing the
+ * attribute type to @KFD_IOCTL_SVM_ATTR_ACCESS and the value to the
+ * GPUID being queried. Multiple attributes can be given to allow
+ * querying multiple GPUIDs. The ioctl function overwrites the
+ * attribute type to indicate the access for the specified GPU.
+ */
+struct kfd_ioctl_svm_args {
+	__u64 start_addr;
+	__u64 size;
+	__u32 op;
+	__u32 nattr;
+	/* Variable length array of attributes */
+	struct kfd_ioctl_svm_attribute attrs[0];
+};
+
+/**
+ * kfd_ioctl_set_xnack_mode_args - Arguments for set_xnack_mode
+ *
+ * @xnack_enabled:       [in/out] Whether to enable XNACK mode for this process
+ *
+ * @xnack_enabled indicates whether recoverable page faults should be
+ * enabled for the current process. 0 means disabled, positive means
+ * enabled, negative means leave unchanged. If enabled, virtual address
+ * translations on GFXv9 and later AMD GPUs can return XNACK and retry
+ * the access until a valid PTE is available. This is used to implement
+ * device page faults.
+ *
+ * On output, @xnack_enabled returns the (new) current mode (0 or
+ * positive). Therefore, a negative input value can be used to query
+ * the current mode without changing it.
+ *
+ * The XNACK mode fundamentally changes the way SVM managed memory works
+ * in the driver, with subtle effects on application performance and
+ * functionality.
+ *
+ * Enabling XNACK mode requires shader programs to be compiled
+ * differently. Furthermore, not all GPUs support changing the mode
+ * per-process. Therefore changing the mode is only allowed while no
+ * user mode queues exist in the process. This ensure that no shader
+ * code is running that may be compiled for the wrong mode. And GPUs
+ * that cannot change to the requested mode will prevent the XNACK
+ * mode from occurring. All GPUs used by the process must be in the
+ * same XNACK mode.
+ *
+ * GFXv8 or older GPUs do not support 48 bit virtual addresses or SVM.
+ * Therefore those GPUs are not considered for the XNACK mode switch.
+ *
+ * Return: 0 on success, -errno on failure
+ */
+struct kfd_ioctl_set_xnack_mode_args {
+	__s32 xnack_enabled;
+};
+
+#define AMDKFD_IOCTL_BASE     'K'
+#define AMDKFD_IO(nr)	      _IO(AMDKFD_IOCTL_BASE, nr)
+#define AMDKFD_IOR(nr, type)  _IOR(AMDKFD_IOCTL_BASE, nr, type)
+#define AMDKFD_IOW(nr, type)  _IOW(AMDKFD_IOCTL_BASE, nr, type)
+#define AMDKFD_IOWR(nr, type) _IOWR(AMDKFD_IOCTL_BASE, nr, type)
+
+#define AMDKFD_IOC_GET_VERSION AMDKFD_IOR(0x01, struct kfd_ioctl_get_version_args)
+
+#define AMDKFD_IOC_CREATE_QUEUE AMDKFD_IOWR(0x02, struct kfd_ioctl_create_queue_args)
+
+#define AMDKFD_IOC_DESTROY_QUEUE AMDKFD_IOWR(0x03, struct kfd_ioctl_destroy_queue_args)
+
+#define AMDKFD_IOC_SET_MEMORY_POLICY AMDKFD_IOW(0x04, struct kfd_ioctl_set_memory_policy_args)
+
+#define AMDKFD_IOC_GET_CLOCK_COUNTERS AMDKFD_IOWR(0x05, struct kfd_ioctl_get_clock_counters_args)
+
+#define AMDKFD_IOC_GET_PROCESS_APERTURES AMDKFD_IOR(0x06, struct kfd_ioctl_get_process_apertures_args)
+
+#define AMDKFD_IOC_UPDATE_QUEUE AMDKFD_IOW(0x07, struct kfd_ioctl_update_queue_args)
+
+#define AMDKFD_IOC_CREATE_EVENT AMDKFD_IOWR(0x08, struct kfd_ioctl_create_event_args)
+
+#define AMDKFD_IOC_DESTROY_EVENT AMDKFD_IOW(0x09, struct kfd_ioctl_destroy_event_args)
+
+#define AMDKFD_IOC_SET_EVENT AMDKFD_IOW(0x0A, struct kfd_ioctl_set_event_args)
+
+#define AMDKFD_IOC_RESET_EVENT AMDKFD_IOW(0x0B, struct kfd_ioctl_reset_event_args)
+
+#define AMDKFD_IOC_WAIT_EVENTS AMDKFD_IOWR(0x0C, struct kfd_ioctl_wait_events_args)
+
+#define AMDKFD_IOC_DBG_REGISTER_DEPRECATED AMDKFD_IOW(0x0D, struct kfd_ioctl_dbg_register_args)
+
+#define AMDKFD_IOC_DBG_UNREGISTER_DEPRECATED AMDKFD_IOW(0x0E, struct kfd_ioctl_dbg_unregister_args)
+
+#define AMDKFD_IOC_DBG_ADDRESS_WATCH_DEPRECATED AMDKFD_IOW(0x0F, struct kfd_ioctl_dbg_address_watch_args)
+
+#define AMDKFD_IOC_DBG_WAVE_CONTROL_DEPRECATED AMDKFD_IOW(0x10, struct kfd_ioctl_dbg_wave_control_args)
+
+#define AMDKFD_IOC_SET_SCRATCH_BACKING_VA AMDKFD_IOWR(0x11, struct kfd_ioctl_set_scratch_backing_va_args)
+
+#define AMDKFD_IOC_GET_TILE_CONFIG AMDKFD_IOWR(0x12, struct kfd_ioctl_get_tile_config_args)
+
+#define AMDKFD_IOC_SET_TRAP_HANDLER AMDKFD_IOW(0x13, struct kfd_ioctl_set_trap_handler_args)
+
+#define AMDKFD_IOC_GET_PROCESS_APERTURES_NEW AMDKFD_IOWR(0x14, struct kfd_ioctl_get_process_apertures_new_args)
+
+#define AMDKFD_IOC_ACQUIRE_VM AMDKFD_IOW(0x15, struct kfd_ioctl_acquire_vm_args)
+
+#define AMDKFD_IOC_ALLOC_MEMORY_OF_GPU AMDKFD_IOWR(0x16, struct kfd_ioctl_alloc_memory_of_gpu_args)
+
+#define AMDKFD_IOC_FREE_MEMORY_OF_GPU AMDKFD_IOW(0x17, struct kfd_ioctl_free_memory_of_gpu_args)
+
+#define AMDKFD_IOC_MAP_MEMORY_TO_GPU AMDKFD_IOWR(0x18, struct kfd_ioctl_map_memory_to_gpu_args)
+
+#define AMDKFD_IOC_UNMAP_MEMORY_FROM_GPU AMDKFD_IOWR(0x19, struct kfd_ioctl_unmap_memory_from_gpu_args)
+
+#define AMDKFD_IOC_SET_CU_MASK AMDKFD_IOW(0x1A, struct kfd_ioctl_set_cu_mask_args)
+
+#define AMDKFD_IOC_GET_QUEUE_WAVE_STATE AMDKFD_IOWR(0x1B, struct kfd_ioctl_get_queue_wave_state_args)
+
+#define AMDKFD_IOC_GET_DMABUF_INFO AMDKFD_IOWR(0x1C, struct kfd_ioctl_get_dmabuf_info_args)
+
+#define AMDKFD_IOC_IMPORT_DMABUF AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)
+
+#define AMDKFD_IOC_ALLOC_QUEUE_GWS AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args)
+
+#define AMDKFD_IOC_SMI_EVENTS AMDKFD_IOWR(0x1F, struct kfd_ioctl_smi_events_args)
+
+#define AMDKFD_IOC_SVM AMDKFD_IOWR(0x20, struct kfd_ioctl_svm_args)
+
+#define AMDKFD_IOC_SET_XNACK_MODE AMDKFD_IOWR(0x21, struct kfd_ioctl_set_xnack_mode_args)
+
+#define AMDKFD_IOC_CRIU_OP AMDKFD_IOWR(0x22, struct kfd_ioctl_criu_args)
+
+#define AMDKFD_COMMAND_START 0x01
+#define AMDKFD_COMMAND_END   0x23
+
+#endif

From 55a5993bc73a6d2e9551f275c78e0907c5dff686 Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Wed, 15 Dec 2021 14:18:02 -0500
Subject: [PATCH 0915/1854] criu/plugin: Support AMD ROCm Checkpoint Restore
 with KFD

To support Checkpoint Restore with AMDGPUs for ROCm workloads, introduce
a new plugin to assist CRIU with the help of AMD KFD kernel driver. This
initial commit just provides the basic framework to build up further
capabilities. Like CRIU, the amdgpu plugin also uses protobuf to
serialize
and save the amdkfd data which is mostly VRAM contents with some
metadata.
We generate a data file "amdgpu-kfd-<id>.img" during the dump stage. On restore
this file is read and extracted to re-create various types of buffer
objects that belonged to the previously checkpointed process. Upon
restore the mmap page offset within a device file might change so we use
the new hook to update and adjust the mmap offsets for newly created
target process. This is needed for sys_mmap call in pie restorer phase.
Support for queues and events is added in future patches of this series.

With the current implementation (amdgpu_plugin), we support:
     - Only compute workloads such (Non Gfx) are supported
     - GPU visible inside a container
     - AMD GPU Gfx 9 Family
     - Pytorch Benchmarks such as BERT Base

amdgpu plugin dependes on libdrm and libdrm_amdgpu which are typically
installed with libdrm-dev package. We build amdgpu_plugin only when the
dependencies are met on the target system and when user intends to
install the amdgpu plugin and not by default with criu build.

Suggested-by: Felix Kuehling <felix.kuehling@amd.com>
Co-authored-by: David Yat Sin <david.yatsin@amd.com>
Signed-off-by: David Yat Sin <david.yatsin@amd.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
---
 Documentation/Makefile           |   1 +
 Documentation/amdgpu_plugin.txt  |  45 ++
 Makefile                         |  13 +-
 Makefile.config                  |   8 +
 Makefile.install                 |   6 +-
 plugins/amdgpu/Makefile          |  50 +-
 plugins/amdgpu/amdgpu_plugin.c   | 930 +++++++++++++++++++++++++++++++
 plugins/amdgpu/criu-amdgpu.proto |  28 +
 plugins/amdgpu/dummy_plugin.c    |  36 --
 9 files changed, 1065 insertions(+), 52 deletions(-)
 create mode 100644 Documentation/amdgpu_plugin.txt
 create mode 100644 plugins/amdgpu/amdgpu_plugin.c
 create mode 100644 plugins/amdgpu/criu-amdgpu.proto
 delete mode 100644 plugins/amdgpu/dummy_plugin.c

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 82257c66a..508551450 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -16,6 +16,7 @@ ifeq ($(PYTHON),python3)
 SRC1		+= criu-ns.txt
 endif
 SRC1		+= compel.txt
+SRC1            += amdgpu_plugin.txt
 SRC8		+= criu.txt
 SRC		:= $(SRC1) $(SRC8)
 XMLS		:= $(patsubst %.txt,%.xml,$(SRC))
diff --git a/Documentation/amdgpu_plugin.txt b/Documentation/amdgpu_plugin.txt
new file mode 100644
index 000000000..4b731cf9a
--- /dev/null
+++ b/Documentation/amdgpu_plugin.txt
@@ -0,0 +1,45 @@
+ROCM Support(1)
+===============
+
+NAME
+----
+amdgpu_plugin - A plugin extension to CRIU to support checkpoint/restore in
+userspace for AMD GPUs.
+
+
+CURRENT SUPPORT
+---------------
+Single GPU systems (Gfx9)
+Checkpoint / Restore on same system
+Checkpoint / Restore inside a docker container
+Pytorch
+
+DESCRIPTION
+-----------
+Though *criu* is a great tool for checkpointing and restoring running
+applications, it has certain limitations such as it cannot handle
+applications that have device files open. In order to support *ROCm* based
+workloads with *criu* we need to augment criu's core functionality with a
+plugin based extension mechanism. *amdgpu_plugin* provides the necessary support
+to criu to allow Checkpoint / Restore with ROCm.
+
+
+Dependencies
+~~~~~~~~~~~~~~
+*amdkfd support*::
+    In order to snapshot the *VRAM* and other *GPU* device states, we require
+    an updated version of amdkfd(amdgpu) driver. The kernel patches are under
+    review currently.
+
+*criu 3.16*::
+    This work is rebased on latest criu release available at this time.
+
+
+AUTHOR
+------
+The AMDKFD team.
+
+
+COPYRIGHT
+---------
+Copyright \(C) 2020-2021, Advanced Micro Devices, Inc. (AMD)
diff --git a/Makefile b/Makefile
index 3f12ad3a0..9bb221796 100644
--- a/Makefile
+++ b/Makefile
@@ -284,9 +284,9 @@ clean mrproper:
 	$(Q) $(MAKE) $(build)=crit $@
 .PHONY: clean mrproper
 
-clean-dummy_amdgpu_plugin:
+clean-amdgpu_plugin:
 	$(Q) $(MAKE) -C plugins/amdgpu clean
-.PHONY: clean dummy_amdgpu_plugin
+.PHONY: clean-amdgpu_plugin
 
 clean-top:
 	$(Q) $(MAKE) -C Documentation clean
@@ -294,9 +294,9 @@ clean-top:
 	$(Q) $(RM) .gitid
 .PHONY: clean-top
 
-clean: clean-top clean-dummy_amdgpu_plugin
+clean: clean-top clean-amdgpu_plugin
 
-mrproper-top: clean-top clean-dummy_amdgpu_plugin
+mrproper-top: clean-top clean-amdgpu_plugin
 	$(Q) $(RM) $(CONFIG_HEADER)
 	$(Q) $(RM) $(VERSION_HEADER)
 	$(Q) $(RM) $(COMPEL_VERSION_HEADER)
@@ -324,9 +324,9 @@ test: zdtm
 	$(Q) $(MAKE) -C test
 .PHONY: test
 
-dummy_amdgpu_plugin:
+amdgpu_plugin: criu
 	$(Q) $(MAKE) -C plugins/amdgpu all
-.PHONY: dummy_amdgpu_plugin
+.PHONY: amdgpu_plugin
 
 #
 # Generating tar requires tag matched CRIU_VERSION.
@@ -408,6 +408,7 @@ help:
 	@echo '      unittest        - Run unit tests'
 	@echo '      lint            - Run code linters'
 	@echo '      indent          - Indent C code'
+	@echo '      amdgpu_plugin   - Make AMD GPU plugin'
 .PHONY: help
 
 lint:
diff --git a/Makefile.config b/Makefile.config
index 6e3e1b062..66f1654ae 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -21,6 +21,14 @@ ifeq ($(call pkg-config-check,libbpf),y)
         export CONFIG_HAS_LIBBPF := y
 endif
 
+ifeq ($(call pkg-config-check,libdrm),y)
+        export CONFIG_AMDGPU := y
+        $(info Note: Building criu with amdgpu_plugin.)
+else
+        $(info Note: Building criu without amdgpu_plugin.)
+        $(info Note: libdrm and libdrm_amdgpu are required to build amdgpu_plugin.)
+endif
+
 ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
         LIBS_FEATURES	+= -lgnutls
         export CONFIG_GNUTLS := y
diff --git a/Makefile.install b/Makefile.install
index 52e8c06da..aafb95469 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -41,16 +41,16 @@ install-criu: criu
 	$(Q) $(MAKE) $(build)=criu install
 .PHONY: install-criu
 
-install-dummy_amdgpu_plugin: dummy_amdgpu_plugin
+install-amdgpu_plugin: amdgpu_plugin
 	$(Q) $(MAKE) -C plugins/amdgpu install
-.PHONY: install-dummy_amdgpu_plugin
+.PHONY: install-amdgpu_plugin
 
 install-compel: $(compel-install-targets)
 	$(Q) $(MAKE) $(build)=compel install
 	$(Q) $(MAKE) $(build)=compel/plugins install
 .PHONY: install-compel
 
-install: install-man install-lib install-criu install-compel ;
+install: install-man install-lib install-criu install-compel install-amdgpu_plugin ;
 .PHONY: install
 
 uninstall:
diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 45a9ec611..0d802d096 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -1,13 +1,49 @@
-all: dummy_plugin.so
+PLUGIN_NAME		:= amdgpu_plugin
+PLUGIN_SOBJ		:= amdgpu_plugin.so
 
-dummy_plugin.so: dummy_plugin.c
-	gcc -g -Werror -D _GNU_SOURCE -Wall -shared -nostartfiles dummy_plugin.c -o dummy_plugin.so -iquote ../../../criu/include -iquote ../../criu/include -fPIC
+PLUGIN_INC		:= ../../../criu/include
+PLUGIN_INC_EXTRA	:= ../../criu/include
+PLUGIN_INCLUDE		:= -iquote$(PLUGIN_INC) -iquote$(PLUGIN_INC_EXTRA)
+LIBDRM_INC             := -I/usr/include/libdrm
+DEPS_OK 		:= amdgpu_plugin.so
+DEPS_NOK 		:= ;
+
+include $(__nmk_dir)msg.mk
+
+CC      		:= gcc
+PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC
+
+ifeq ($(CONFIG_AMDGPU),y)
+        all: $(DEPS_OK)
+else
+        all: $(DEPS_NOK)
+endif
+
+criu-amdgpu.pb-c.c: criu-amdgpu.proto
+		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
+
+amdgpu_plugin.so: amdgpu_plugin.c criu-amdgpu.pb-c.c
+	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE)
+
+amdgpu_plugin_clean:
+	$(call msg-clean, $@)
+	$(Q) $(RM) amdgpu_plugin.so criu-amdgpu.pb-c*
+.PHONY: amdgpu_plugin_clean
+clean: amdgpu_plugin_clean
+
+mrproper: clean
 
-clean:
-	$(Q) $(RM) dummy_plugin.so
 install:
 	$(Q) mkdir -p $(PLUGINDIR)
-	$(Q) install -m 644 dummy_plugin.so $(PLUGINDIR)
+ifeq ($(CONFIG_AMDGPU),y)
+	$(E) "  INSTALL " $(PLUGIN_NAME)
+	$(Q) install -m 644 $(PLUGIN_SOBJ) $(PLUGINDIR)
+endif
+.PHONY: install
 
 uninstall:
-	$(Q) $(RM) $(PLUGINDIR)/dummy_plugin.so
+ifeq ($(CONFIG_AMDGPU),y)
+	$(E) " UNINSTALL" $(PLUGIN_NAME)
+	$(Q) $(RM) $(PLUGINDIR)/$(PLUGIN_SOBJ)
+endif
+.PHONY: uninstall
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
new file mode 100644
index 000000000..427885530
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -0,0 +1,930 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <linux/limits.h>
+
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <stdint.h>
+
+#include "criu-plugin.h"
+#include "plugin.h"
+#include "criu-amdgpu.pb-c.h"
+
+#include "kfd_ioctl.h"
+#include "xmalloc.h"
+#include "criu-log.h"
+
+#include "common/list.h"
+
+#define DRM_FIRST_RENDER_NODE 128
+#define DRM_LAST_RENDER_NODE  255
+
+#define AMDGPU_KFD_DEVICE "/dev/kfd"
+#define PROCPIDMEM	  "/proc/%d/mem"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
+#ifdef LOG_PREFIX
+#undef LOG_PREFIX
+#endif
+#define LOG_PREFIX "amdgpu_plugin: "
+
+#ifdef DEBUG
+#define plugin_log_msg(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
+#else
+#define plugin_log_msg(fmt, ...) \
+	{                        \
+	}
+#endif
+
+struct vma_metadata {
+	struct list_head list;
+	uint64_t old_pgoff;
+	uint64_t new_pgoff;
+	uint64_t vma_entry;
+};
+
+static LIST_HEAD(update_vma_info_list);
+
+int open_drm_render_device(int minor)
+{
+	char path[128];
+	int fd;
+
+	if (minor < DRM_FIRST_RENDER_NODE || minor > DRM_LAST_RENDER_NODE) {
+		pr_perror("DRM render minor %d out of range [%d, %d]", minor, DRM_FIRST_RENDER_NODE,
+			  DRM_LAST_RENDER_NODE);
+		return -EINVAL;
+	}
+
+	sprintf(path, "/dev/dri/renderD%d", minor);
+	fd = open(path, O_RDWR | O_CLOEXEC);
+	if (fd < 0) {
+		if (errno != ENOENT && errno != EPERM) {
+			pr_err("Failed to open %s: %s\n", path, strerror(errno));
+			if (errno == EACCES)
+				pr_err("Check user is in \"video\" group\n");
+		}
+		return -EBADFD;
+	}
+
+	return fd;
+}
+
+int write_file(const char *file_path, const void *buf, const size_t buf_len)
+{
+	int fd;
+	FILE *fp;
+	size_t len_wrote;
+
+	fd = openat(criu_get_image_dir(), file_path, O_WRONLY | O_CREAT, 0600);
+	if (fd < 0) {
+		pr_perror("Cannot open %s", file_path);
+		return -errno;
+	}
+
+	fp = fdopen(fd, "w");
+	if (!fp) {
+		pr_perror("Cannot fdopen %s", file_path);
+		return -errno;
+	}
+
+	len_wrote = fwrite(buf, 1, buf_len, fp);
+	if (len_wrote != buf_len) {
+		pr_perror("Unable to write %s (wrote:%ld buf_len:%ld)", file_path, len_wrote, buf_len);
+		fclose(fp);
+		return -EIO;
+	}
+
+	pr_info("Wrote file:%s (%ld bytes)\n", file_path, buf_len);
+	/* this will also close fd */
+	fclose(fp);
+	return 0;
+}
+
+int read_file(const char *file_path, void *buf, const size_t buf_len)
+{
+	int fd;
+	FILE *fp;
+	size_t len_read;
+
+	fd = openat(criu_get_image_dir(), file_path, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("Cannot open %s", file_path);
+		return -errno;
+	}
+
+	fp = fdopen(fd, "r");
+	if (!fp) {
+		pr_perror("Cannot fdopen %s", file_path);
+		return -errno;
+	}
+
+	len_read = fread(buf, 1, buf_len, fp);
+	if (len_read != buf_len) {
+		pr_perror("Unable to read %s", file_path);
+		fclose(fp);
+		return -EIO;
+	}
+
+	pr_info("Read file:%s (%ld bytes)\n", file_path, buf_len);
+
+	/* this will also close fd */
+	fclose(fp);
+	return 0;
+}
+
+/* Call ioctl, restarting if it is interrupted */
+int kmtIoctl(int fd, unsigned long request, void *arg)
+{
+	int ret, max_retries = 200;
+
+	do {
+		ret = ioctl(fd, request, arg);
+	} while (ret == -1 && max_retries-- > 0 && (errno == EINTR || errno == EAGAIN));
+
+	if (ret == -1 && errno == EBADF)
+		/* In case pthread_atfork didn't catch it, this will
+		 * make any subsequent hsaKmt calls fail in CHECK_KFD_OPEN.
+		 */
+		pr_perror("KFD file descriptor not valid in this process");
+	return ret;
+}
+
+static void free_e(CriuKfd *e)
+{
+	for (int i = 0; i < e->n_bo_entries; i++) {
+		if (e->bo_entries[i]) {
+			if (e->bo_entries[i]->rawdata.data)
+				xfree(e->bo_entries[i]->rawdata.data);
+
+			xfree(e->bo_entries[i]);
+		}
+	}
+
+	for (int i = 0; i < e->n_device_entries; i++) {
+		if (e->device_entries[i])
+			xfree(e->device_entries[i]);
+	}
+	xfree(e);
+}
+
+static int allocate_device_entries(CriuKfd *e, int num_of_devices)
+{
+	e->device_entries = xmalloc(sizeof(DeviceEntry *) * num_of_devices);
+	if (!e->device_entries) {
+		pr_err("Failed to allocate device_entries\n");
+		return -ENOMEM;
+	}
+
+	for (int i = 0; i < num_of_devices; i++) {
+		DeviceEntry *entry = xzalloc(sizeof(*entry));
+
+		if (!entry) {
+			pr_err("Failed to allocate entry\n");
+			return -ENOMEM;
+		}
+
+		device_entry__init(entry);
+
+		e->device_entries[i] = entry;
+		e->n_device_entries++;
+	}
+	return 0;
+}
+
+static int allocate_bo_entries(CriuKfd *e, int num_bos, struct kfd_criu_bo_bucket *bo_bucket_ptr)
+{
+	e->bo_entries = xmalloc(sizeof(BoEntry *) * num_bos);
+	if (!e->bo_entries) {
+		pr_err("Failed to allocate bo_info\n");
+		return -ENOMEM;
+	}
+
+	for (int i = 0; i < num_bos; i++) {
+		BoEntry *entry = xzalloc(sizeof(*entry));
+
+		if (!entry) {
+			pr_err("Failed to allocate botest\n");
+			return -ENOMEM;
+		}
+
+		bo_entry__init(entry);
+
+		if ((bo_bucket_ptr)[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM ||
+		    (bo_bucket_ptr)[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
+			entry->rawdata.data = xmalloc((bo_bucket_ptr)[i].size);
+			entry->rawdata.len = (bo_bucket_ptr)[i].size;
+		}
+
+		e->bo_entries[i] = entry;
+		e->n_bo_entries++;
+	}
+	return 0;
+}
+
+int amdgpu_plugin_init(int stage)
+{
+	pr_info("amdgpu_plugin: initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
+
+	return 0;
+}
+
+void amdgpu_plugin_fini(int stage, int ret)
+{
+	pr_info("amdgpu_plugin: finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
+}
+
+CR_PLUGIN_REGISTER("amdgpu_plugin", amdgpu_plugin_init, amdgpu_plugin_fini)
+
+int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
+{
+	struct stat st_kfd, st_dri_min;
+	char img_path[128];
+	int ret = 0;
+
+	pr_debug("amdgpu_plugin: Enter %s\n", __func__);
+	ret = stat(AMDGPU_KFD_DEVICE, &st_kfd);
+	if (ret == -1) {
+		pr_perror("stat error for /dev/kfd");
+		return ret;
+	}
+
+	snprintf(img_path, sizeof(img_path), "/dev/dri/renderD%d", DRM_FIRST_RENDER_NODE);
+
+	ret = stat(img_path, &st_dri_min);
+	if (ret == -1) {
+		pr_perror("stat error for %s", img_path);
+		return ret;
+	}
+
+	if (major(st_buf->st_rdev) == major(st_kfd.st_rdev) || ((major(st_buf->st_rdev) == major(st_dri_min.st_rdev)) &&
+								(minor(st_buf->st_rdev) >= minor(st_dri_min.st_rdev) &&
+								 minor(st_buf->st_rdev) >= DRM_FIRST_RENDER_NODE))) {
+		pr_debug("Known non-regular mapping, kfd-renderD%d -> OK\n", minor(st_buf->st_rdev));
+		pr_debug("AMD KFD(maj) = %d, DRI(maj,min) = %d:%d VMA Device fd(maj,min) = %d:%d\n",
+			 major(st_kfd.st_rdev), major(st_dri_min.st_rdev), minor(st_dri_min.st_rdev),
+			 major(st_buf->st_rdev), minor(st_buf->st_rdev));
+		/* VMA belongs to kfd */
+		return 0;
+	}
+
+	pr_perror("amdgpu_plugin: Can't handle the VMA mapping");
+	return -ENOTSUP;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, amdgpu_plugin_handle_device_vma)
+
+static int unpause_process(int fd)
+{
+	int ret = 0;
+	struct kfd_ioctl_criu_args args = { 0 };
+
+	args.op = KFD_CRIU_OP_UNPAUSE;
+
+	ret = kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args);
+	if (ret) {
+		pr_perror("amdgpu_plugin: Failed to unpause process");
+		goto exit;
+	}
+
+exit:
+	pr_info("Process unpaused %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
+
+	return ret;
+}
+
+static int save_devices(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_device_bucket *device_buckets,
+			CriuKfd *e)
+{
+	int ret = 0;
+
+	pr_debug("Dumping %d devices\n", args->num_devices);
+
+	e->num_of_gpus = args->num_devices;
+
+	ret = allocate_device_entries(e, e->num_of_gpus);
+	if (ret) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	plugin_log_msg("Number of GPUs:%d\n", e->num_of_gpus);
+
+exit:
+	pr_info("Dumped devices %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
+	return ret;
+}
+
+static int save_bos(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
+{
+	int ret = 0, i;
+	char *fname;
+
+	pr_debug("Dumping %d BOs\n", args->num_bos);
+
+	e->num_of_bos = args->num_bos;
+	ret = allocate_bo_entries(e, e->num_of_bos, bo_buckets);
+	if (ret)
+		goto exit;
+
+	for (i = 0; i < e->num_of_bos; i++) {
+		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
+		BoEntry *boinfo = e->bo_entries[i];
+
+		boinfo->gpu_id = bo_bucket->gpu_id;
+		boinfo->addr = bo_bucket->addr;
+		boinfo->size = bo_bucket->size;
+		boinfo->offset = bo_bucket->offset;
+		boinfo->alloc_flags = bo_bucket->alloc_flags;
+
+		if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM ||
+		    bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
+			if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) {
+				void *addr;
+
+				pr_info("amdgpu_plugin: large bar read possible\n");
+
+				addr = mmap(NULL, boinfo->size, PROT_READ, MAP_SHARED, fd, boinfo->offset);
+				if (addr == MAP_FAILED) {
+					pr_perror("amdgpu_plugin: mmap failed\n");
+					ret = -errno;
+					goto exit;
+				}
+
+				/* direct memcpy is possible on large bars */
+				memcpy(boinfo->rawdata.data, addr, boinfo->size);
+				munmap(addr, boinfo->size);
+			} else {
+				size_t bo_size;
+				int mem_fd;
+
+				pr_info("Now try reading BO contents with /proc/pid/mem\n");
+				if (asprintf(&fname, PROCPIDMEM, args->pid) < 0) {
+					pr_perror("failed in asprintf, %s", fname);
+					ret = -1;
+					goto exit;
+				}
+
+				mem_fd = open(fname, O_RDONLY);
+				if (mem_fd < 0) {
+					pr_perror("Can't open %s for pid %d", fname, args->pid);
+					free(fname);
+					close(mem_fd);
+					ret = -1;
+					goto exit;
+				}
+
+				pr_info("Opened %s file for pid = %d\n", fname, args->pid);
+				free(fname);
+
+				if (lseek(mem_fd, (off_t)bo_bucket->addr, SEEK_SET) == -1) {
+					pr_perror("Can't lseek for bo_offset for pid = %d", args->pid);
+					close(mem_fd);
+					ret = -1;
+					goto exit;
+				}
+
+				bo_size = read(mem_fd, boinfo->rawdata.data, boinfo->size);
+				if (bo_size != boinfo->size) {
+					close(mem_fd);
+					pr_perror("Can't read buffer");
+					ret = -1;
+					goto exit;
+				}
+				close(mem_fd);
+			}
+		}
+	}
+exit:
+	pr_info("Dumped bos %s (ret:%d)\n", ret ? "failed" : "ok", ret);
+	return ret;
+}
+
+int amdgpu_plugin_dump_file(int fd, int id)
+{
+	struct kfd_ioctl_criu_args args = { 0 };
+	char img_path[PATH_MAX];
+	struct stat st, st_kfd;
+	unsigned char *buf;
+	CriuKfd *e = NULL;
+	int ret = 0;
+	size_t len;
+
+	if (fstat(fd, &st) == -1) {
+		pr_perror("amdgpu_plugin: fstat error");
+		return -1;
+	}
+
+	ret = stat(AMDGPU_KFD_DEVICE, &st_kfd);
+	if (ret == -1) {
+		pr_perror("amdgpu_plugin: fstat error for /dev/kfd");
+		return -1;
+	}
+
+	/* Check whether this plugin was called for kfd or render nodes */
+	if (major(st.st_rdev) != major(st_kfd.st_rdev) || minor(st.st_rdev) != 0) {
+		/* This is RenderD dumper plugin, for now just save renderD
+		 * minor number to be used during restore. In later phases this
+		 * needs to save more data for video decode etc.
+		 */
+
+		CriuRenderNode rd = CRIU_RENDER_NODE__INIT;
+
+		pr_info("amdgpu_plugin: Dumper called for /dev/dri/renderD%d, FD = %d, ID = %d\n", minor(st.st_rdev),
+			fd, id);
+
+		rd.minor_number = minor(st.st_rdev);
+
+		len = criu_render_node__get_packed_size(&rd);
+		buf = xmalloc(len);
+		if (!buf)
+			return -ENOMEM;
+
+		criu_render_node__pack(&rd, buf);
+
+		snprintf(img_path, sizeof(img_path), "amdgpu-renderD-%d.img", id);
+		ret = write_file(img_path, buf, len);
+		if (ret) {
+			xfree(buf);
+			return ret;
+		}
+
+		xfree(buf);
+		/* Need to return success here so that criu can call plugins for renderD nodes */
+		return ret;
+	}
+
+	pr_info("amdgpu_plugin: %s : %s() called for fd = %d\n", CR_PLUGIN_DESC.name, __func__, major(st.st_rdev));
+
+	args.op = KFD_CRIU_OP_PROCESS_INFO;
+	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
+		pr_perror("amdgpu_plugin: Failed to call process info ioctl");
+		ret = -1;
+		goto exit;
+	}
+
+	pr_info("amdgpu_plugin: devices:%d bos:%d objects:%d priv_data:%lld\n", args.num_devices, args.num_bos,
+		args.num_objects, args.priv_data_size);
+
+	e = xmalloc(sizeof(*e));
+	if (!e) {
+		pr_err("Failed to allocate proto structure\n");
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	criu_kfd__init(e);
+	e->pid = args.pid;
+
+	args.devices = (uintptr_t)xzalloc((args.num_devices * sizeof(struct kfd_criu_device_bucket)));
+	if (!args.devices) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	args.bos = (uintptr_t)xzalloc((args.num_bos * sizeof(struct kfd_criu_bo_bucket)));
+	if (!args.bos) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	args.priv_data = (uintptr_t)xzalloc((args.priv_data_size));
+	if (!args.priv_data) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	args.op = KFD_CRIU_OP_CHECKPOINT;
+	ret = kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args);
+	if (ret) {
+		pr_perror("amdgpu_plugin: Failed to call dumper (process) ioctl");
+		goto exit;
+	}
+
+	ret = save_devices(fd, &args, (struct kfd_criu_device_bucket *)args.devices, e);
+	if (ret)
+		goto exit;
+
+	ret = save_bos(fd, &args, (struct kfd_criu_bo_bucket *)args.bos, e);
+	if (ret)
+		goto exit;
+
+	e->num_of_objects = args.num_objects;
+
+	e->priv_data.data = (void *)args.priv_data;
+	e->priv_data.len = args.priv_data_size;
+
+	snprintf(img_path, sizeof(img_path), "amdgpu-kfd-%d.img", id);
+	pr_info("amdgpu_plugin: img_path = %s\n", img_path);
+
+	len = criu_kfd__get_packed_size(e);
+
+	pr_info("amdgpu_plugin: Len = %ld\n", len);
+
+	buf = xmalloc(len);
+	if (!buf) {
+		pr_perror("Failed to allocate memory to store protobuf");
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	criu_kfd__pack(e, buf);
+
+	ret = write_file(img_path, buf, len);
+
+	xfree(buf);
+exit:
+	/* Restore all queues */
+	unpause_process(fd);
+
+	xfree((void *)args.devices);
+	xfree((void *)args.bos);
+	xfree((void *)args.priv_data);
+
+	free_e(e);
+
+	if (ret)
+		pr_err("amdgpu_plugin: Failed to dump (ret:%d)\n", ret);
+	else
+		pr_info("amdgpu_plugin: Dump successful\n");
+
+	return ret;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__DUMP_EXT_FILE, amdgpu_plugin_dump_file)
+
+/* Restore per-device information */
+static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
+{
+	struct kfd_criu_device_bucket *device_buckets;
+	int ret = 0, bucket_index = 0;
+
+	pr_debug("Restoring %d devices\n", e->num_of_gpus);
+
+	args->num_devices = e->num_of_gpus;
+	device_buckets = xzalloc(sizeof(*device_buckets) * args->num_devices);
+	if (!device_buckets)
+		return -ENOMEM;
+
+	args->devices = (uintptr_t)device_buckets;
+
+	for (int i = 0; i < e->num_of_gpus; i++) {
+		struct kfd_criu_device_bucket *device_bucket;
+		DeviceEntry *devinfo = e->device_entries[i];
+
+		device_bucket = &device_buckets[bucket_index++];
+
+		device_bucket->user_gpu_id = devinfo->gpu_id;
+
+		device_bucket->drm_fd = open_drm_render_device(i + DRM_FIRST_RENDER_NODE);
+		if (device_bucket->drm_fd < 0) {
+			pr_perror("amdgpu_plugin: Can't pass NULL drm render fd to driver");
+			goto exit;
+		} else {
+			pr_info("amdgpu_plugin: passing drm render fd = %d to driver\n", device_bucket->drm_fd);
+		}
+	}
+
+exit:
+	pr_info("Restore devices %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
+	return ret;
+}
+
+static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
+{
+	struct kfd_criu_bo_bucket *bo_buckets;
+
+	pr_debug("Restoring %ld BOs\n", e->num_of_bos);
+
+	args->num_bos = e->num_of_bos;
+	bo_buckets = xzalloc(sizeof(*bo_buckets) * args->num_bos);
+	if (!bo_buckets)
+		return -ENOMEM;
+
+	args->bos = (uintptr_t)bo_buckets;
+
+	for (int i = 0; i < args->num_bos; i++) {
+		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
+		BoEntry *bo_entry = e->bo_entries[i];
+
+		bo_bucket->gpu_id = bo_entry->gpu_id;
+		bo_bucket->addr = bo_entry->addr;
+		bo_bucket->size = bo_entry->size;
+		bo_bucket->offset = bo_entry->offset;
+		bo_bucket->alloc_flags = bo_entry->alloc_flags;
+
+		plugin_log_msg("BO [%d] gpu_id:%x addr:%llx size:%llx offset:%llx\n", i, bo_bucket->gpu_id,
+			       bo_bucket->addr, bo_bucket->size, bo_bucket->offset);
+	}
+
+	pr_info("Restore BOs Ok\n");
+	return 0;
+}
+
+static int restore_bo_data(int fd, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
+{
+	int mem_fd = -1;
+
+	for (int i = 0; i < e->num_of_bos; i++) {
+		void *addr;
+
+		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
+		BoEntry *bo_entry = e->bo_entries[i];
+
+		if (bo_bucket->alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT |
+					      KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP | KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL)) {
+			struct vma_metadata *vma_md;
+
+			vma_md = xmalloc(sizeof(*vma_md));
+			if (!vma_md)
+				return -ENOMEM;
+
+			vma_md->old_pgoff = bo_bucket->offset;
+			vma_md->vma_entry = bo_bucket->addr;
+			vma_md->new_pgoff = bo_bucket->restored_offset;
+
+			plugin_log_msg("amdgpu_plugin: adding vma_entry:addr:0x%lx old-off:0x%lx "
+				       "new_off:0x%lx new_minor:%d\n",
+				       vma_md->vma_entry, vma_md->old_pgoff, vma_md->new_pgoff, vma_md->new_minor);
+
+			list_add_tail(&vma_md->list, &update_vma_info_list);
+		}
+
+		if (bo_bucket->alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) {
+			pr_info("amdgpu_plugin: Trying mmap in stage 2\n");
+			if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC ||
+			    bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
+				plugin_log_msg("amdgpu_plugin: large bar write possible\n");
+				addr = mmap(NULL, bo_bucket->size, PROT_WRITE, MAP_SHARED, fd,
+					    bo_bucket->restored_offset);
+				if (addr == MAP_FAILED) {
+					pr_perror("amdgpu_plugin: mmap failed");
+					fd = -EBADFD;
+					goto exit;
+				}
+
+				/* direct memcpy is possible on large bars */
+				memcpy(addr, (void *)bo_entry->rawdata.data, bo_entry->size);
+				munmap(addr, bo_entry->size);
+			} else {
+				size_t bo_size;
+				char *fname;
+				/* Use indirect host data path via /proc/pid/mem
+				 * on small pci bar GPUs or for Buffer Objects
+				 * that don't have HostAccess permissions.
+				 */
+				plugin_log_msg("amdgpu_plugin: using PROCPIDMEM to restore BO contents\n");
+				addr = mmap(NULL, bo_bucket->size, PROT_NONE, MAP_SHARED, fd,
+					    bo_bucket->restored_offset);
+				if (addr == MAP_FAILED) {
+					pr_perror("amdgpu_plugin: mmap failed");
+					fd = -EBADFD;
+					goto exit;
+				}
+
+				if (asprintf(&fname, PROCPIDMEM, e->pid) < 0) {
+					pr_perror("failed in asprintf, %s", fname);
+					munmap(addr, bo_bucket->size);
+					fd = -EBADFD;
+					goto exit;
+				}
+
+				mem_fd = open(fname, O_RDWR);
+				if (mem_fd < 0) {
+					pr_perror("Can't open %s for pid %d", fname, e->pid);
+					free(fname);
+					munmap(addr, bo_bucket->size);
+					fd = -EBADFD;
+					goto exit;
+				}
+
+				plugin_log_msg("Opened %s file for pid = %d", fname, e->pid);
+				free(fname);
+
+				if (lseek(mem_fd, (off_t)addr, SEEK_SET) == -1) {
+					pr_perror("Can't lseek for bo_offset for pid = %d", e->pid);
+					munmap(addr, bo_entry->size);
+					fd = -EBADFD;
+					goto exit;
+				}
+
+				plugin_log_msg("Attempt writing now");
+				bo_size = write(mem_fd, bo_entry->rawdata.data, bo_entry->size);
+				if (bo_size != bo_entry->size) {
+					pr_perror("Can't write buffer");
+					munmap(addr, bo_entry->size);
+					fd = -EBADFD;
+					goto exit;
+				}
+				munmap(addr, bo_entry->size);
+				close(mem_fd);
+			}
+		} else {
+			plugin_log_msg("Not a VRAM BO\n");
+			continue;
+		}
+	}
+
+exit:
+	if (mem_fd > 0)
+		close(mem_fd);
+
+	return 0;
+}
+
+int amdgpu_plugin_restore_file(int id)
+{
+	int ret = 0, fd;
+	char img_path[PATH_MAX];
+	struct stat filestat;
+	unsigned char *buf;
+	CriuRenderNode *rd;
+	CriuKfd *e = NULL;
+	struct kfd_ioctl_criu_args args = { 0 };
+
+	pr_info("amdgpu_plugin: Initialized kfd plugin restorer with ID = %d\n", id);
+
+	snprintf(img_path, sizeof(img_path), "amdgpu-kfd-%d.img", id);
+
+	if (stat(img_path, &filestat) == -1) {
+		pr_perror("open(%s)", img_path);
+		/* This is restorer plugin for renderD nodes. Since criu doesn't
+		 * gurantee that they will be called before the plugin is called
+		 * for kfd file descriptor, we need to make sure we open the render
+		 * nodes only once and before /dev/kfd is open, the render nodes
+		 * are open too. Generally, it is seen that during checkpoint and
+		 * restore both, the kfd plugin gets called first.
+		 */
+		snprintf(img_path, sizeof(img_path), "amdgpu-renderD-%d.img", id);
+
+		if (stat(img_path, &filestat) == -1) {
+			pr_perror("Failed to read file stats");
+			return -1;
+		}
+		pr_info("renderD file size on disk = %ld\n", filestat.st_size);
+
+		buf = xmalloc(filestat.st_size);
+		if (!buf) {
+			pr_perror("Failed to allocate memory");
+			return -ENOMEM;
+		}
+
+		if (read_file(img_path, buf, filestat.st_size)) {
+			pr_perror("Unable to read from %s", img_path);
+			xfree(buf);
+			return -1;
+		}
+
+		rd = criu_render_node__unpack(NULL, filestat.st_size, buf);
+		if (rd == NULL) {
+			pr_perror("Unable to parse the KFD message %d", id);
+			xfree(buf);
+			return -1;
+		}
+
+		pr_info("amdgpu_plugin: render node minor num = %d\n", rd->minor_number);
+		fd = open_drm_render_device(rd->minor_number);
+		criu_render_node__free_unpacked(rd, NULL);
+		xfree(buf);
+		return fd;
+	}
+
+	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
+	if (fd < 0) {
+		pr_perror("failed to open kfd in plugin");
+		return -1;
+	}
+
+	pr_info("amdgpu_plugin: Opened kfd, fd = %d\n", fd);
+
+	pr_info("kfd img file size on disk = %ld\n", filestat.st_size);
+
+	buf = xmalloc(filestat.st_size);
+	if (!buf) {
+		pr_perror("Failed to allocate memory");
+		return -ENOMEM;
+	}
+
+	if (read_file(img_path, buf, filestat.st_size)) {
+		pr_perror("Unable to read from %s", img_path);
+		xfree(buf);
+		return -1;
+	}
+	e = criu_kfd__unpack(NULL, filestat.st_size, buf);
+	if (e == NULL) {
+		pr_err("Unable to parse the KFD message %#x\n", id);
+		xfree(buf);
+		return -1;
+	}
+
+	plugin_log_msg("amdgpu_plugin: read image file data\n");
+
+	ret = restore_devices(&args, e);
+	if (ret)
+		goto exit;
+
+	ret = restore_bos(&args, e);
+	if (ret)
+		goto exit;
+
+	args.num_objects = e->num_of_objects;
+	args.priv_data_size = e->priv_data.len;
+	args.priv_data = (uintptr_t)e->priv_data.data;
+
+	args.op = KFD_CRIU_OP_RESTORE;
+	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
+		pr_perror("Restore ioctl failed");
+		ret = -1;
+		goto exit;
+	}
+
+	ret = restore_bo_data(fd, (struct kfd_criu_bo_bucket *)args.bos, e);
+	if (ret)
+		goto exit;
+
+exit:
+	if (e)
+		criu_kfd__free_unpacked(e, NULL);
+
+	xfree((void *)args.devices);
+	xfree((void *)args.bos);
+	xfree(buf);
+
+	if (ret) {
+		pr_err("amdgpu_plugin: Failed to restore (ret:%d)\n", ret);
+		fd = ret;
+	} else {
+		pr_info("amdgpu_plugin: Restore successful (fd:%d)\n", fd);
+	}
+
+	return fd;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESTORE_EXT_FILE, amdgpu_plugin_restore_file)
+
+/* return 0 if no match found
+ * return -1 for error.
+ * return 1 if vmap map must be adjusted.
+ */
+int amdgpu_plugin_update_vmamap(const char *path, const uint64_t addr, const uint64_t old_offset, uint64_t *new_offset,
+				int *updated_fd)
+{
+	struct vma_metadata *vma_md;
+
+	plugin_log_msg("amdgpu_plugin: Enter %s\n", __func__);
+
+	/*
+	 * On newer versions of AMD KFD driver, only the file descriptor that was used to open the
+	 * device can be used for mmap, so we will have to return the proper file descriptor here
+	 */
+	*updated_fd = -1;
+
+	list_for_each_entry(vma_md, &update_vma_info_list, list) {
+		if (addr == vma_md->vma_entry && old_offset == vma_md->old_pgoff) {
+			*new_offset = vma_md->new_pgoff;
+
+			plugin_log_msg("amdgpu_plugin: old_pgoff= 0x%lx new_pgoff = 0x%lx path = %s\n",
+				       vma_md->old_pgoff, vma_md->new_pgoff, path);
+
+			return 1;
+		}
+	}
+	pr_info("No match for addr:0x%lx offset:%lx\n", addr, old_offset);
+	return 0;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, amdgpu_plugin_update_vmamap)
+
+int amdgpu_plugin_resume_devices_late(int target_pid)
+{
+	struct kfd_ioctl_criu_args args = { 0 };
+	int fd, ret = 0;
+
+	pr_info("amdgpu_plugin: Inside %s for target pid = %d\n", __func__, target_pid);
+
+	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
+	if (fd < 0) {
+		pr_perror("failed to open kfd in plugin");
+		return -1;
+	}
+
+	args.pid = target_pid;
+	args.op = KFD_CRIU_OP_RESUME;
+	pr_info("amdgpu_plugin: Calling IOCTL to start notifiers and queues\n");
+	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
+		pr_perror("restore late ioctl failed");
+		ret = -1;
+	}
+
+	close(fd);
+	return ret;
+}
+
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
new file mode 100644
index 000000000..308f768f9
--- /dev/null
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -0,0 +1,28 @@
+syntax = "proto2";
+
+message device_entry {
+	required uint32 gpu_id = 1;
+}
+
+message bo_entry {
+	required uint64	addr = 1;
+	required uint64	size = 2;
+	required uint64	offset = 3;
+	required uint32 alloc_flags = 4;
+	required uint32 gpu_id = 5;
+	required bytes rawdata = 6;
+}
+
+message criu_kfd {
+	required uint32 pid = 1;
+	required uint32 num_of_gpus = 2;
+	repeated device_entry device_entries = 3;
+	required uint64	num_of_bos = 4;
+	repeated bo_entry bo_entries = 5;
+	required uint32	num_of_objects = 6;
+	required bytes priv_data = 7;
+}
+
+message criu_render_node {
+	required uint32 minor_number = 1;
+}
diff --git a/plugins/amdgpu/dummy_plugin.c b/plugins/amdgpu/dummy_plugin.c
deleted file mode 100644
index 872276095..000000000
--- a/plugins/amdgpu/dummy_plugin.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <sys/stat.h>
-
-#include "criu-log.h"
-#include "criu-plugin.h"
-
-int dummy_plugin_handle_device_vma(int fd, const struct stat *stat)
-{
-	pr_info("dummy_plugin: Inside %s for fd = %d\n", __func__, fd);
-	/* let criu report failure for the unsupported mapping */
-	return -ENOTSUP;
-}
-CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, dummy_plugin_handle_device_vma)
-
-int dummy_plugin_resume_devices_late(int target_pid)
-{
-	pr_info("dummy_plugin: Inside %s for target pid = %d\n", __func__, target_pid);
-	return -ENOTSUP;
-}
-CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, dummy_plugin_resume_devices_late)
-
-/*
- * return 0 if no match found
- * return -1 for error or -ENOTSUP.
- * return 1 if vmap map must be adjusted.
- */
-int dummy_plugin_update_vmamap(const char *old_path, char *new_path, const uint64_t addr, const uint64_t old_offset,
-			       uint64_t *new_offset)
-{
-	uint64_t temp = 100;
-
-	*new_offset = temp;
-	pr_info("dummy_plugin: old_pgoff= 0x%lu new_pgoff = 0x%lx old_path = %s new_path = %s addr = 0x%lu\n",
-		old_offset, *new_offset, old_path, new_path, addr);
-	return -ENOTSUP;
-}
-CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, dummy_plugin_update_vmamap)

From c4e3ac7feff2b5f7e135fc4e17b25dcbb2bba7e6 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Mon, 17 Jan 2022 10:47:45 -0500
Subject: [PATCH 0916/1854] criu/plugin: Adding check for kernel IOCTL version

Adding check for minimum kernel IOCTL version before attempting to
checkpoint.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/amdgpu_plugin.c | 50 ++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 427885530..58ef05291 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -30,6 +30,9 @@
 #define AMDGPU_KFD_DEVICE "/dev/kfd"
 #define PROCPIDMEM	  "/proc/%d/mem"
 
+#define KFD_IOCTL_MAJOR_VERSION	    1
+#define MIN_KFD_IOCTL_MINOR_VERSION 7
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
@@ -410,6 +413,42 @@ exit:
 	return ret;
 }
 
+bool kernel_supports_criu(int fd)
+{
+	struct kfd_ioctl_get_version_args args = { 0 };
+	bool close_fd = false, ret = true;
+
+	if (fd < 0) {
+		fd = open(AMDGPU_KFD_DEVICE, O_RDONLY);
+		if (fd < 0) {
+			pr_perror("failed to open kfd in plugin");
+			return false;
+		}
+		close_fd = true;
+	}
+
+	if (kmtIoctl(fd, AMDKFD_IOC_GET_VERSION, &args) == -1) {
+		pr_perror("amdgpu_plugin: Failed to call get version ioctl");
+		ret = false;
+		goto exit;
+	}
+
+	pr_debug("Kernel IOCTL version:%d.%02d\n", args.major_version, args.minor_version);
+
+	if (args.major_version != KFD_IOCTL_MAJOR_VERSION || args.minor_version < MIN_KFD_IOCTL_MINOR_VERSION) {
+		pr_err("amdgpu_plugin: CR not supported on current kernel (current:%02d.%02d min:%02d.%02d)\n",
+		       args.major_version, args.minor_version, KFD_IOCTL_MAJOR_VERSION, MIN_KFD_IOCTL_MINOR_VERSION);
+		ret = false;
+		goto exit;
+	}
+
+exit:
+	if (close_fd)
+		close(fd);
+
+	return ret;
+}
+
 int amdgpu_plugin_dump_file(int fd, int id)
 {
 	struct kfd_ioctl_criu_args args = { 0 };
@@ -466,6 +505,14 @@ int amdgpu_plugin_dump_file(int fd, int id)
 
 	pr_info("amdgpu_plugin: %s : %s() called for fd = %d\n", CR_PLUGIN_DESC.name, __func__, major(st.st_rdev));
 
+	/* KFD only allows ioctl calls from the same process that opened the KFD file descriptor.
+	 * The existing /dev/kfd file descriptor that is passed in is only allowed to do IOCTL calls with
+	 * CAP_CHECKPOINT_RESTORE/CAP_SYS_ADMIN. So kernel_supports_criu() needs to open its own file descriptor to
+	 * perform the AMDKFD_IOC_GET_VERSION ioctl.
+	 */
+	if (!kernel_supports_criu(-1))
+		return -ENOTSUP;
+
 	args.op = KFD_CRIU_OP_PROCESS_INFO;
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
 		pr_perror("amdgpu_plugin: Failed to call process info ioctl");
@@ -808,6 +855,9 @@ int amdgpu_plugin_restore_file(int id)
 
 	pr_info("kfd img file size on disk = %ld\n", filestat.st_size);
 
+	if (!kernel_supports_criu(fd))
+		return -ENOTSUP;
+
 	buf = xmalloc(filestat.st_size);
 	if (!buf) {
 		pr_perror("Failed to allocate memory");

From 6e99fea2fa143f6f7aa27e24465838afa723f9ea Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Mon, 14 Feb 2022 12:00:58 -0500
Subject: [PATCH 0917/1854] criu/plugin: Implement system topology parsing

Parse local system topology in /sys/class/kfd/kfd/topology/nodes/ and
store properties for each gpu in the CRIU image files. The gpu
properties can then be used later during restore to make the process is
restored on gpu's with similar properties.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/Makefile                 |   2 +-
 plugins/amdgpu/amdgpu_plugin.c          | 202 ++++++-
 plugins/amdgpu/amdgpu_plugin_topology.c | 720 ++++++++++++++++++++++++
 plugins/amdgpu/amdgpu_plugin_topology.h | 119 ++++
 plugins/amdgpu/criu-amdgpu.proto        |  49 +-
 5 files changed, 1072 insertions(+), 20 deletions(-)
 create mode 100644 plugins/amdgpu/amdgpu_plugin_topology.c
 create mode 100644 plugins/amdgpu/amdgpu_plugin_topology.h

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 0d802d096..abcf888d0 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -22,7 +22,7 @@ endif
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
 
-amdgpu_plugin.so: amdgpu_plugin.c criu-amdgpu.pb-c.c
+amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_topology.c criu-amdgpu.pb-c.c
 	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE)
 
 amdgpu_plugin_clean:
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 58ef05291..9c883d31a 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -23,9 +23,7 @@
 #include "criu-log.h"
 
 #include "common/list.h"
-
-#define DRM_FIRST_RENDER_NODE 128
-#define DRM_LAST_RENDER_NODE  255
+#include "amdgpu_plugin_topology.h"
 
 #define AMDGPU_KFD_DEVICE "/dev/kfd"
 #define PROCPIDMEM	  "/proc/%d/mem"
@@ -57,7 +55,15 @@ struct vma_metadata {
 	uint64_t vma_entry;
 };
 
+/************************************ Global Variables ********************************************/
+struct tp_system src_topology;
+struct tp_system dest_topology;
+
+struct device_maps checkpoint_maps;
+struct device_maps restore_maps;
+
 static LIST_HEAD(update_vma_info_list);
+/**************************************************************************************************/
 
 int open_drm_render_device(int minor)
 {
@@ -70,7 +76,7 @@ int open_drm_render_device(int minor)
 		return -EINVAL;
 	}
 
-	sprintf(path, "/dev/dri/renderD%d", minor);
+	snprintf(path, sizeof(path), "/dev/dri/renderD%d", minor);
 	fd = open(path, O_RDWR | O_CLOEXEC);
 	if (fd < 0) {
 		if (errno != ENOENT && errno != EPERM) {
@@ -176,8 +182,12 @@ static void free_e(CriuKfd *e)
 	}
 
 	for (int i = 0; i < e->n_device_entries; i++) {
-		if (e->device_entries[i])
+		if (e->device_entries[i]) {
+			for (int j = 0; j < e->device_entries[i]->n_iolinks; j++)
+				xfree(e->device_entries[i]->iolinks[j]);
+
 			xfree(e->device_entries[i]);
+		}
 	}
 	xfree(e);
 }
@@ -236,16 +246,148 @@ static int allocate_bo_entries(CriuKfd *e, int num_bos, struct kfd_criu_bo_bucke
 	return 0;
 }
 
+int topology_to_devinfo(struct tp_system *sys, struct device_maps *maps, DeviceEntry **deviceEntries)
+{
+	uint32_t devinfo_index = 0;
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		DeviceEntry *devinfo = deviceEntries[devinfo_index++];
+
+		devinfo->node_id = node->id;
+
+		if (NODE_IS_GPU(node)) {
+			devinfo->gpu_id = node->gpu_id;
+
+			devinfo->simd_count = node->simd_count;
+			devinfo->mem_banks_count = node->mem_banks_count;
+			devinfo->caches_count = node->caches_count;
+			devinfo->io_links_count = node->io_links_count;
+			devinfo->max_waves_per_simd = node->max_waves_per_simd;
+			devinfo->lds_size_in_kb = node->lds_size_in_kb;
+			devinfo->num_gws = node->num_gws;
+			devinfo->wave_front_size = node->wave_front_size;
+			devinfo->array_count = node->array_count;
+			devinfo->simd_arrays_per_engine = node->simd_arrays_per_engine;
+			devinfo->cu_per_simd_array = node->cu_per_simd_array;
+			devinfo->simd_per_cu = node->simd_per_cu;
+			devinfo->max_slots_scratch_cu = node->max_slots_scratch_cu;
+			devinfo->vendor_id = node->vendor_id;
+			devinfo->device_id = node->device_id;
+			devinfo->domain = node->domain;
+			devinfo->drm_render_minor = node->drm_render_minor;
+			devinfo->hive_id = node->hive_id;
+			devinfo->num_sdma_engines = node->num_sdma_engines;
+			devinfo->num_sdma_xgmi_engines = node->num_sdma_xgmi_engines;
+			devinfo->num_sdma_queues_per_engine = node->num_sdma_queues_per_engine;
+			devinfo->num_cp_queues = node->num_cp_queues;
+			devinfo->fw_version = node->fw_version;
+			devinfo->capability = node->capability;
+			devinfo->sdma_fw_version = node->sdma_fw_version;
+			devinfo->vram_public = node->vram_public;
+			devinfo->vram_size = node->vram_size;
+		} else {
+			devinfo->cpu_cores_count = node->cpu_cores_count;
+		}
+
+		if (node->num_valid_iolinks) {
+			struct tp_iolink *iolink;
+			uint32_t iolink_index = 0;
+
+			devinfo->iolinks = xmalloc(sizeof(DevIolink *) * node->num_valid_iolinks);
+			if (!devinfo->iolinks)
+				return -ENOMEM;
+
+			list_for_each_entry(iolink, &node->iolinks, listm) {
+				if (!iolink->valid)
+					continue;
+
+				devinfo->iolinks[iolink_index] = xmalloc(sizeof(DevIolink));
+				if (!devinfo->iolinks[iolink_index])
+					return -ENOMEM;
+
+				dev_iolink__init(devinfo->iolinks[iolink_index]);
+
+				devinfo->iolinks[iolink_index]->type = iolink->type;
+				devinfo->iolinks[iolink_index]->node_to_id = iolink->node_to_id;
+				iolink_index++;
+			}
+			devinfo->n_iolinks = iolink_index;
+		}
+	}
+	return 0;
+}
+
+int devinfo_to_topology(DeviceEntry *devinfos[], uint32_t num_devices, struct tp_system *sys)
+{
+	for (int i = 0; i < num_devices; i++) {
+		struct tp_node *node;
+		DeviceEntry *devinfo = devinfos[i];
+
+		node = sys_add_node(sys, devinfo->node_id, devinfo->gpu_id);
+		if (!node)
+			return -ENOMEM;
+
+		if (devinfo->cpu_cores_count) {
+			node->cpu_cores_count = devinfo->cpu_cores_count;
+		} else {
+			node->simd_count = devinfo->simd_count;
+			node->mem_banks_count = devinfo->mem_banks_count;
+			node->caches_count = devinfo->caches_count;
+			node->io_links_count = devinfo->io_links_count;
+			node->max_waves_per_simd = devinfo->max_waves_per_simd;
+			node->lds_size_in_kb = devinfo->lds_size_in_kb;
+			node->num_gws = devinfo->num_gws;
+			node->wave_front_size = devinfo->wave_front_size;
+			node->array_count = devinfo->array_count;
+			node->simd_arrays_per_engine = devinfo->simd_arrays_per_engine;
+			node->cu_per_simd_array = devinfo->cu_per_simd_array;
+			node->simd_per_cu = devinfo->simd_per_cu;
+			node->max_slots_scratch_cu = devinfo->max_slots_scratch_cu;
+			node->vendor_id = devinfo->vendor_id;
+			node->device_id = devinfo->device_id;
+			node->domain = devinfo->domain;
+			node->drm_render_minor = devinfo->drm_render_minor;
+			node->hive_id = devinfo->hive_id;
+			node->num_sdma_engines = devinfo->num_sdma_engines;
+			node->num_sdma_xgmi_engines = devinfo->num_sdma_xgmi_engines;
+			node->num_sdma_queues_per_engine = devinfo->num_sdma_queues_per_engine;
+			node->num_cp_queues = devinfo->num_cp_queues;
+			node->fw_version = devinfo->fw_version;
+			node->capability = devinfo->capability;
+			node->sdma_fw_version = devinfo->sdma_fw_version;
+			node->vram_public = devinfo->vram_public;
+			node->vram_size = devinfo->vram_size;
+		}
+
+		for (int j = 0; j < devinfo->n_iolinks; j++) {
+			struct tp_iolink *iolink;
+			DevIolink *devlink = (devinfo->iolinks[j]);
+
+			iolink = node_add_iolink(node, devlink->type, devlink->node_to_id);
+			if (!iolink)
+				return -ENOMEM;
+		}
+	}
+	return 0;
+}
+
 int amdgpu_plugin_init(int stage)
 {
 	pr_info("amdgpu_plugin: initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
+	topology_init(&src_topology);
+	topology_init(&dest_topology);
+
 	return 0;
 }
 
 void amdgpu_plugin_fini(int stage, int ret)
 {
 	pr_info("amdgpu_plugin: finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
+
+	topology_free(&src_topology);
+	topology_free(&dest_topology);
 }
 
 CR_PLUGIN_REGISTER("amdgpu_plugin", amdgpu_plugin_init, amdgpu_plugin_fini)
@@ -314,14 +456,21 @@ static int save_devices(int fd, struct kfd_ioctl_criu_args *args, struct kfd_cri
 	pr_debug("Dumping %d devices\n", args->num_devices);
 
 	e->num_of_gpus = args->num_devices;
+	e->num_of_cpus = src_topology.num_nodes - args->num_devices;
 
-	ret = allocate_device_entries(e, e->num_of_gpus);
-	if (ret) {
-		ret = -ENOMEM;
+	/* The ioctl will only return entries for GPUs, but we also store entries for CPUs and the
+	 * information for CPUs is obtained from parsing system topology
+	 */
+	ret = allocate_device_entries(e, src_topology.num_nodes);
+	if (ret)
 		goto exit;
-	}
 
-	plugin_log_msg("Number of GPUs:%d\n", e->num_of_gpus);
+	pr_debug("Number of CPUs:%d GPUs:%d\n", e->num_of_cpus, e->num_of_gpus);
+
+	/* Store topology information that was obtained from parsing /sys/class/kfd/kfd/topology/ */
+	ret = topology_to_devinfo(&src_topology, &checkpoint_maps, e->device_entries);
+	if (ret)
+		goto exit;
 
 exit:
 	pr_info("Dumped devices %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
@@ -470,6 +619,17 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		return -1;
 	}
 
+	if (topology_parse(&src_topology, "Checkpoint"))
+		return -1;
+
+	/* We call topology_determine_iolinks to validate io_links. If io_links are not valid
+	 * we do not store them inside the checkpointed images
+	 */
+	if (topology_determine_iolinks(&src_topology)) {
+		pr_err("Failed to determine iolinks from topology\n");
+		return -1;
+	}
+
 	/* Check whether this plugin was called for kfd or render nodes */
 	if (major(st.st_rdev) != major(st_kfd.st_rdev) || minor(st.st_rdev) != 0) {
 		/* This is RenderD dumper plugin, for now just save renderD
@@ -624,15 +784,18 @@ static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 	args->devices = (uintptr_t)device_buckets;
 
-	for (int i = 0; i < e->num_of_gpus; i++) {
+	for (int entries_i = 0; entries_i < e->num_of_cpus + e->num_of_gpus; entries_i++) {
 		struct kfd_criu_device_bucket *device_bucket;
-		DeviceEntry *devinfo = e->device_entries[i];
+		DeviceEntry *devinfo = e->device_entries[entries_i];
+
+		if (!devinfo->gpu_id)
+			continue;
 
 		device_bucket = &device_buckets[bucket_index++];
 
 		device_bucket->user_gpu_id = devinfo->gpu_id;
 
-		device_bucket->drm_fd = open_drm_render_device(i + DRM_FIRST_RENDER_NODE);
+		device_bucket->drm_fd = open_drm_render_device(bucket_index + DRM_FIRST_RENDER_NODE);
 		if (device_bucket->drm_fd < 0) {
 			pr_perror("amdgpu_plugin: Can't pass NULL drm render fd to driver");
 			goto exit;
@@ -878,6 +1041,19 @@ int amdgpu_plugin_restore_file(int id)
 
 	plugin_log_msg("amdgpu_plugin: read image file data\n");
 
+	ret = devinfo_to_topology(e->device_entries, e->num_of_gpus + e->num_of_cpus, &src_topology);
+	if (ret) {
+		pr_err("Failed to convert stored device information to topology\n");
+		ret = -EINVAL;
+		goto exit;
+	}
+
+	ret = topology_parse(&dest_topology, "Local");
+	if (ret) {
+		pr_err("Failed to parse local system topology\n");
+		goto exit;
+	}
+
 	ret = restore_devices(&args, e);
 	if (ret)
 		goto exit;
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
new file mode 100644
index 000000000..5ef98010f
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -0,0 +1,720 @@
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <linux/limits.h>
+
+#include <dirent.h>
+#include "common/list.h"
+
+#include "xmalloc.h"
+#include "kfd_ioctl.h"
+#include "amdgpu_plugin_topology.h"
+
+#define TOPOLOGY_PATH "/sys/class/kfd/kfd/topology/nodes/"
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
+#ifdef DEBUG
+#define plugin_log_msg(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
+#else
+#define plugin_log_msg(fmt, ...) \
+	{                        \
+	}
+#endif
+
+static const char *link_type(uint32_t type)
+{
+	switch (type) {
+	case TOPO_IOLINK_TYPE_PCIE:
+		return "PCIe";
+	case TOPO_IOLINK_TYPE_XGMI:
+		return "XGMI";
+	}
+	return "Unsupported";
+}
+
+static struct tp_node *p2pgroup_get_node_by_gpu_id(const struct tp_p2pgroup *group, const uint32_t gpu_id)
+{
+	struct tp_node *node;
+
+	list_for_each_entry(node, &group->nodes, listm_p2pgroup) {
+		if (node->gpu_id == gpu_id)
+			return node;
+	}
+	return NULL;
+}
+
+struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor)
+{
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		if (node->drm_render_minor == drm_render_minor)
+			return node;
+	}
+	return NULL;
+}
+
+struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32_t gpu_id)
+{
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		if (node->gpu_id == gpu_id)
+			return node;
+	}
+	return NULL;
+}
+
+static struct tp_node *sys_get_node_by_node_id(const struct tp_system *sys, const uint32_t node_id)
+{
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		if (node->id == node_id)
+			return node;
+	}
+	return NULL;
+}
+
+static struct tp_p2pgroup *sys_get_p2pgroup_with_gpu_id(const struct tp_system *sys, const int type,
+							const uint32_t gpu_id)
+{
+	struct tp_p2pgroup *p2pgroup;
+
+	list_for_each_entry(p2pgroup, &sys->xgmi_groups, listm_system) {
+		if (p2pgroup->type != type)
+			continue;
+
+		if (p2pgroup_get_node_by_gpu_id(p2pgroup, gpu_id))
+			return p2pgroup;
+	}
+	return NULL;
+}
+
+static struct tp_iolink *get_tp_peer_iolink(const struct tp_node *from_node, const struct tp_node *to_node,
+					    const uint8_t type)
+{
+	struct tp_iolink *iolink;
+
+	list_for_each_entry(iolink, &from_node->iolinks, listm) {
+		if (iolink->node_to_id == to_node->id && iolink->type == type)
+			return iolink;
+	}
+	return NULL;
+}
+
+struct tp_iolink *node_add_iolink(struct tp_node *node, uint32_t type, uint32_t node_to_id)
+{
+	struct tp_iolink *iolink = xzalloc(sizeof(*iolink));
+
+	if (!iolink)
+		return NULL;
+
+	iolink->type = type;
+	/* iolink->node_to will be filled in topology_determine_iolinks */
+	iolink->node_to_id = node_to_id;
+	iolink->node_from = node;
+
+	list_add_tail(&iolink->listm, &node->iolinks);
+	return iolink;
+}
+
+struct tp_p2pgroup *sys_add_group(struct tp_system *sys, uint32_t type)
+{
+	struct tp_p2pgroup *group;
+
+	group = xzalloc(sizeof(*group));
+	if (!group)
+		return NULL;
+
+	INIT_LIST_HEAD(&group->nodes);
+	group->type = type;
+	list_add_tail(&group->listm_system, &sys->xgmi_groups);
+	if (type == TOPO_IOLINK_TYPE_XGMI)
+		sys->num_xgmi_groups++;
+
+	return group;
+}
+
+struct tp_node *sys_add_node(struct tp_system *sys, uint32_t id, uint32_t gpu_id)
+{
+	struct tp_node *node = NULL;
+
+	node = xzalloc(sizeof(*node));
+	if (!node)
+		return NULL;
+
+	node->id = id;
+	node->gpu_id = gpu_id;
+	node->drm_fd = -1;
+	INIT_LIST_HEAD(&node->iolinks);
+	list_add_tail(&node->listm_system, &sys->nodes);
+	sys->num_nodes++;
+
+	return node;
+}
+
+static bool get_prop(char *line, char *name, uint64_t *value)
+{
+	if (sscanf(line, " %29s %lu", name, value) != 2)
+		return false;
+	return true;
+}
+
+/* Parse node properties in /sys/class/kfd/kfd/topology/nodes/N/properties */
+static int parse_topo_node_properties(struct tp_node *dev, const char *dir_path)
+{
+	FILE *file;
+	char path[300];
+	char line[300];
+
+	sprintf(path, "%s/properties", dir_path);
+	file = fopen(path, "r");
+	if (!file) {
+		pr_perror("Failed to access %s", path);
+		return -EFAULT;
+	}
+
+	while (fgets(line, sizeof(line), file)) {
+		char name[30];
+		uint64_t value;
+
+		memset(name, 0, sizeof(name));
+		if (!get_prop(line, name, &value))
+			goto fail;
+
+		if (!strcmp(name, "cpu_cores_count"))
+			dev->cpu_cores_count = (uint32_t)value;
+		else if (!strcmp(name, "simd_count"))
+			dev->simd_count = (uint32_t)value;
+		else if (!strcmp(name, "mem_banks_count"))
+			dev->mem_banks_count = (uint32_t)value;
+		else if (!strcmp(name, "caches_count"))
+			dev->caches_count = (uint32_t)value;
+		else if (!strcmp(name, "io_links_count"))
+			dev->io_links_count = (uint32_t)value;
+		else if (!strcmp(name, "max_waves_per_simd"))
+			dev->max_waves_per_simd = (uint32_t)value;
+		else if (!strcmp(name, "lds_size_in_kb"))
+			dev->lds_size_in_kb = (uint32_t)value;
+		else if (!strcmp(name, "num_gws"))
+			dev->num_gws = (uint32_t)value;
+		else if (!strcmp(name, "wave_front_size"))
+			dev->wave_front_size = (uint32_t)value;
+		else if (!strcmp(name, "array_count"))
+			dev->array_count = (uint32_t)value;
+		else if (!strcmp(name, "simd_arrays_per_engine"))
+			dev->simd_arrays_per_engine = (uint32_t)value;
+		else if (!strcmp(name, "cu_per_simd_array"))
+			dev->cu_per_simd_array = (uint32_t)value;
+		else if (!strcmp(name, "simd_per_cu"))
+			dev->simd_per_cu = (uint32_t)value;
+		else if (!strcmp(name, "max_slots_scratch_cu"))
+			dev->max_slots_scratch_cu = (uint32_t)value;
+		else if (!strcmp(name, "vendor_id"))
+			dev->vendor_id = (uint32_t)value;
+		else if (!strcmp(name, "device_id"))
+			dev->device_id = (uint32_t)value;
+		else if (!strcmp(name, "domain"))
+			dev->domain = (uint32_t)value;
+		else if (!strcmp(name, "drm_render_minor"))
+			dev->drm_render_minor = (uint32_t)value;
+		else if (!strcmp(name, "hive_id"))
+			dev->hive_id = value;
+		else if (!strcmp(name, "num_sdma_engines"))
+			dev->num_sdma_engines = (uint32_t)value;
+		else if (!strcmp(name, "num_sdma_xgmi_engines"))
+			dev->num_sdma_xgmi_engines = (uint32_t)value;
+		else if (!strcmp(name, "num_sdma_queues_per_engine"))
+			dev->num_sdma_queues_per_engine = (uint32_t)value;
+		else if (!strcmp(name, "num_cp_queues"))
+			dev->num_cp_queues = (uint32_t)value;
+		else if (!strcmp(name, "fw_version"))
+			dev->fw_version = (uint32_t)value;
+		else if (!strcmp(name, "capability"))
+			dev->capability = (uint32_t)value;
+		else if (!strcmp(name, "sdma_fw_version"))
+			dev->sdma_fw_version = (uint32_t)value;
+
+		if (!dev->gpu_id && dev->cpu_cores_count >= 1) {
+			/* This is a CPU - we do not need to parse the other information */
+			break;
+		}
+	}
+
+	fclose(file);
+	return 0;
+fail:
+	pr_err("Failed to parse line = %s\n", line);
+	fclose(file);
+	return -EINVAL;
+}
+
+/* Parse node memory properties in /sys/class/kfd/kfd/topology/nodes/N/mem_banks */
+static int parse_topo_node_mem_banks(struct tp_node *node, const char *dir_path)
+{
+	struct dirent *dirent_node;
+	DIR *d_node;
+	char path[300];
+	FILE *file = NULL;
+	uint32_t heap_type = 0;
+	uint64_t mem_size = 0;
+	int ret;
+
+	if (!NODE_IS_GPU(node))
+		return 0;
+
+	sprintf(path, "%s/mem_banks", dir_path);
+
+	d_node = opendir(path);
+	if (!d_node) {
+		pr_perror("Can't open %s", path);
+		return -EACCES;
+	}
+
+	while ((dirent_node = readdir(d_node)) != NULL) {
+		char line[300];
+		char bank_path[1024];
+		struct stat st;
+		int id;
+
+		heap_type = 0;
+		mem_size = 0;
+
+		/* Only parse numeric directories */
+		if (sscanf(dirent_node->d_name, "%d", &id) != 1)
+			continue;
+
+		snprintf(bank_path, sizeof(bank_path), "%s/%s", path, dirent_node->d_name);
+		if (stat(bank_path, &st)) {
+			pr_err("Cannot to access %s\n", path);
+			ret = -EACCES;
+			goto fail;
+		}
+		if ((st.st_mode & S_IFMT) == S_IFDIR) {
+			char properties_path[PATH_MAX];
+
+			snprintf(properties_path, sizeof(properties_path), "%s/properties", bank_path);
+
+			file = fopen(properties_path, "r");
+			if (!file) {
+				pr_perror("Failed to access %s", properties_path);
+				ret = -EACCES;
+				goto fail;
+			}
+
+			while (fgets(line, sizeof(line), file)) {
+				char name[30];
+				uint64_t value;
+
+				memset(name, 0, sizeof(name));
+				if (!get_prop(line, name, &value)) {
+					ret = -EINVAL;
+					goto fail;
+				}
+
+				if (!strcmp(name, "heap_type"))
+					heap_type = (uint32_t)value;
+				if (!strcmp(name, "size_in_bytes"))
+					mem_size = value;
+			}
+
+			fclose(file);
+			file = NULL;
+		}
+
+		if (heap_type == TOPO_HEAP_TYPE_PUBLIC || heap_type == TOPO_HEAP_TYPE_PRIVATE)
+			break;
+	}
+
+	if ((heap_type != TOPO_HEAP_TYPE_PUBLIC && heap_type != TOPO_HEAP_TYPE_PRIVATE) || !mem_size) {
+		pr_err("Failed to determine memory type and size for device in %s\n", dir_path);
+		ret = -EINVAL;
+		goto fail;
+	}
+
+	node->vram_public = (heap_type == TOPO_HEAP_TYPE_PUBLIC);
+	node->vram_size = mem_size;
+	closedir(d_node);
+	return 0;
+fail:
+	if (file)
+		fclose(file);
+	closedir(d_node);
+	return ret;
+}
+
+/* Parse node iolinks properties in /sys/class/kfd/kfd/topology/nodes/N/io_links */
+static int parse_topo_node_iolinks(struct tp_node *node, const char *dir_path)
+{
+	struct dirent *dirent_node;
+	DIR *d_node;
+	char path[300];
+	FILE *file = NULL;
+	int ret = 0;
+
+	snprintf(path, sizeof(path), "%s/io_links", dir_path);
+
+	d_node = opendir(path);
+	if (!d_node) {
+		pr_perror("Can't open %s", path);
+		return -EACCES;
+	}
+
+	while ((dirent_node = readdir(d_node)) != NULL) {
+		char line[300];
+		char iolink_path[1024];
+		struct stat st;
+		int id;
+
+		uint32_t iolink_type = 0;
+		uint32_t node_to_id = 0;
+
+		/* Only parse numeric directories */
+		if (sscanf(dirent_node->d_name, "%d", &id) != 1)
+			continue;
+
+		snprintf(iolink_path, sizeof(iolink_path), "%s/%s", path, dirent_node->d_name);
+		if (stat(iolink_path, &st)) {
+			pr_err("Cannot to access %s\n", path);
+			ret = -EACCES;
+			goto fail;
+		}
+		if ((st.st_mode & S_IFMT) == S_IFDIR) {
+			char properties_path[PATH_MAX];
+
+			snprintf(properties_path, sizeof(properties_path), "%s/properties", iolink_path);
+
+			file = fopen(properties_path, "r");
+			if (!file) {
+				pr_perror("Failed to access %s", properties_path);
+				ret = -EACCES;
+				goto fail;
+			}
+
+			while (fgets(line, sizeof(line), file)) {
+				char name[30];
+				uint64_t value;
+
+				memset(name, 0, sizeof(name));
+				if (!get_prop(line, name, &value)) {
+					ret = -EINVAL;
+					goto fail;
+				}
+
+				if (!strcmp(name, "type"))
+					iolink_type = (uint32_t)value;
+				if (!strcmp(name, "node_to"))
+					node_to_id = (uint32_t)value;
+			}
+			fclose(file);
+			file = NULL;
+		}
+
+		/* We only store the link information for now, then once all topology parsing is
+		 * finished we will confirm iolinks
+		 */
+		if (iolink_type == TOPO_IOLINK_TYPE_PCIE || iolink_type == TOPO_IOLINK_TYPE_XGMI) {
+			if (!node_add_iolink(node, iolink_type, node_to_id)) {
+				ret = -ENOMEM;
+				goto fail;
+			}
+		}
+	}
+	closedir(d_node);
+	return 0;
+fail:
+	if (file)
+		fclose(file);
+
+	closedir(d_node);
+	return ret;
+}
+
+/* Parse a node (CPU or GPU) in /sys/class/kfd/kfd/topology/nodes/N */
+static int parse_topo_node(struct tp_node *node, const char *dir_path)
+{
+	if (parse_topo_node_properties(node, dir_path)) {
+		pr_err("Failed to parse node properties\n");
+		return -EINVAL;
+	}
+	if (parse_topo_node_mem_banks(node, dir_path)) {
+		pr_err("Failed to parse node mem_banks\n");
+		return -EINVAL;
+	}
+	if (parse_topo_node_iolinks(node, dir_path)) {
+		pr_err("Failed to parse node iolinks\n");
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static const char *p2pgroup_to_str(struct tp_p2pgroup *group)
+{
+	static char topology_printstr[200];
+	struct tp_node *node;
+	size_t str_len = 0;
+
+	topology_printstr[0] = '\0';
+	str_len += sprintf(&topology_printstr[str_len], "type:%s:", link_type(group->type));
+
+	list_for_each_entry(node, &group->nodes, listm_p2pgroup) {
+		str_len += sprintf(&topology_printstr[str_len], "0x%04X ", node->gpu_id);
+	}
+	return topology_printstr;
+}
+
+void topology_print(const struct tp_system *sys, const char *message)
+{
+	struct tp_node *node;
+	struct tp_p2pgroup *xgmi_group;
+
+	pr_info("===System Topology=[%12s]==================================\n", message);
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		struct tp_iolink *iolink;
+
+		if (!NODE_IS_GPU(node)) {
+			pr_info("[%d] CPU\n", node->id);
+			pr_info("     cpu_cores_count:%u\n", node->cpu_cores_count);
+		} else {
+			pr_info("[%d] GPU gpu_id:0x%04X\n", node->id, node->gpu_id);
+			pr_info("     vendor_id:%u device_id:%u\n", node->vendor_id, node->device_id);
+			pr_info("     vram_public:%c vram_size:%lu\n", node->vram_public ? 'Y' : 'N', node->vram_size);
+			pr_info("     io_links_count:%u capability:%u\n", node->io_links_count, node->capability);
+			pr_info("     mem_banks_count:%u caches_count:%d lds_size_in_kb:%u\n", node->mem_banks_count,
+				node->caches_count, node->lds_size_in_kb);
+			pr_info("     simd_count:%u max_waves_per_simd:%u\n", node->simd_count,
+				node->max_waves_per_simd);
+			pr_info("     num_gws:%u wave_front_size:%u array_count:%u\n", node->num_gws,
+				node->wave_front_size, node->array_count);
+			pr_info("     simd_arrays_per_engine:%u simd_per_cu:%u\n", node->simd_arrays_per_engine,
+				node->simd_per_cu);
+			pr_info("     max_slots_scratch_cu:%u cu_per_simd_array:%u\n", node->max_slots_scratch_cu,
+				node->cu_per_simd_array);
+			pr_info("     num_sdma_engines:%u\n", node->num_sdma_engines);
+			pr_info("     num_sdma_xgmi_engines:%u num_sdma_queues_per_engine:%u\n",
+				node->num_sdma_xgmi_engines, node->num_sdma_queues_per_engine);
+			pr_info("     num_cp_queues:%u fw_version:%u sdma_fw_version:%u\n", node->num_cp_queues,
+				node->fw_version, node->sdma_fw_version);
+		}
+		list_for_each_entry(iolink, &node->iolinks, listm) {
+			if (!iolink->valid)
+				continue;
+
+			pr_info("     iolink type:%s node-to:%d (0x%04X) node-from:%d bi-dir:%s\n",
+				link_type(iolink->type), iolink->node_to_id, iolink->node_to->gpu_id,
+				iolink->node_from->id, iolink->peer ? "Y" : "N");
+		}
+	}
+
+	pr_info("===Groups==========================================================\n");
+	list_for_each_entry(xgmi_group, &sys->xgmi_groups, listm_system)
+		pr_info("%s\n", p2pgroup_to_str(xgmi_group));
+	pr_info("===================================================================\n");
+}
+
+void topology_init(struct tp_system *sys)
+{
+	memset(sys, 0, sizeof(*sys));
+	INIT_LIST_HEAD(&sys->nodes);
+	INIT_LIST_HEAD(&sys->xgmi_groups);
+}
+
+void topology_free(struct tp_system *sys)
+{
+	while (!list_empty(&sys->nodes)) {
+		struct tp_node *node = list_first_entry(&sys->nodes, struct tp_node, listm_system);
+
+		list_del(&node->listm_system);
+
+		while (!list_empty(&node->iolinks)) {
+			struct tp_iolink *iolink = list_first_entry(&node->iolinks, struct tp_iolink, listm);
+
+			list_del(&iolink->listm);
+			xfree(iolink);
+		}
+		xfree(node);
+	}
+
+	while (!list_empty(&sys->xgmi_groups)) {
+		struct tp_p2pgroup *p2pgroup = list_first_entry(&sys->xgmi_groups, struct tp_p2pgroup, listm_system);
+
+		list_del(&p2pgroup->listm_system);
+		xfree(p2pgroup);
+	}
+}
+
+/**
+ * @brief Validates iolinks and determine XGMI hives in a system topology
+ *
+ * On some systems, some GPUs may not be accessible because they are masked by cgroups, but the
+ * iolinks to these GPUs are still visible. If the peer GPU is not accessible, we consider that link
+ * invalid.
+ * In a XGMI hive, each GPU will have a bi-directional iolink to every other GPU. So we create a
+ * XGMI group (hive) and add all the GPUs in that hive to the group when iterating over the first
+ * GPU in that group.
+ *
+ * @param sys system topology
+ * @return 0 if successful, errno if failed.
+ */
+int topology_determine_iolinks(struct tp_system *sys)
+{
+	int ret = 0;
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		struct tp_iolink *iolink;
+
+		list_for_each_entry(iolink, &node->iolinks, listm) {
+			struct tp_p2pgroup *group = NULL;
+			struct tp_node *peer_node = NULL;
+			struct tp_iolink *peer_iolink = NULL;
+
+			peer_node = sys_get_node_by_node_id(sys, iolink->node_to_id);
+			if (!peer_node) {
+				/* node not accessible, usually because it is masked by cgroups */
+				iolink->valid = false;
+				continue;
+			}
+			iolink->valid = true;
+			node->num_valid_iolinks++;
+
+			iolink->node_to = peer_node;
+			peer_iolink = get_tp_peer_iolink(peer_node, node, iolink->type);
+			if (!peer_iolink)
+				continue; /* This is a one-dir link */
+
+			/* We confirmed both sides have same type of iolink */
+			iolink->peer = peer_iolink;
+			peer_iolink->peer = iolink;
+
+			if (iolink->type == TOPO_IOLINK_TYPE_XGMI) {
+				group = sys_get_p2pgroup_with_gpu_id(sys, iolink->type, node->gpu_id);
+				if (!group) {
+					/* This GPU does not already belong to a group so we create
+					 * a new group
+					 */
+					group = sys_add_group(sys, iolink->type);
+					if (!group) {
+						ret = -ENOMEM;
+						goto fail;
+					}
+					list_add_tail(&node->listm_p2pgroup, &group->nodes);
+				}
+
+				/* Also add peer GPU to this group */
+				if (!p2pgroup_get_node_by_gpu_id(group, peer_node->gpu_id))
+					list_add_tail(&peer_node->listm_p2pgroup, &group->nodes);
+			}
+		}
+	}
+
+fail:
+	/* In case of failure, caller function will call topology_free which will free groups that
+	 * were successfully allocated
+	 */
+	return ret;
+}
+
+/**
+ * @brief Parse system topology
+ *
+ * Parse system topology exposed by the drivers in /sys/class/kfd/kfd/topology and fill in the
+ * system topology structure.
+ *
+ * @param sys system topology structure to be filled by this function
+ * @param message print this message when printing the topology to logs
+ * @return 0 if successful, errno if failed.
+ */
+int topology_parse(struct tp_system *sys, const char *message)
+{
+	struct dirent *dirent_system;
+	DIR *d_system;
+	char path[300];
+	int ret;
+
+	if (sys->parsed)
+		return 0;
+
+	sys->parsed = true;
+	INIT_LIST_HEAD(&sys->nodes);
+	INIT_LIST_HEAD(&sys->xgmi_groups);
+
+	d_system = opendir(TOPOLOGY_PATH);
+	if (!d_system) {
+		pr_perror("Can't open %s", TOPOLOGY_PATH);
+		return -EACCES;
+	}
+
+	while ((dirent_system = readdir(d_system)) != NULL) {
+		struct stat stbuf;
+		int id, fd;
+
+		/* Only parse numeric directories */
+		if (sscanf(dirent_system->d_name, "%d", &id) != 1)
+			continue;
+
+		sprintf(path, "%s%s", TOPOLOGY_PATH, dirent_system->d_name);
+		if (stat(path, &stbuf)) {
+			/* When cgroup is masking some devices, the path exists, but it is not
+			 * accessible, this is not an error
+			 */
+			pr_info("Cannot to access %s\n", path);
+			continue;
+		}
+
+		if ((stbuf.st_mode & S_IFMT) == S_IFDIR) {
+			struct tp_node *node;
+			int len;
+			char gpu_id_path[300];
+			char read_buf[7]; /* Max gpu_id len is 6 chars */
+			unsigned int gpu_id;
+
+			sprintf(gpu_id_path, "%s/%s/gpu_id", TOPOLOGY_PATH, dirent_system->d_name);
+			fd = open(gpu_id_path, O_RDONLY);
+			if (fd < 0) {
+				pr_perror("Failed to access %s", gpu_id_path);
+				continue;
+			}
+
+			len = read(fd, read_buf, sizeof(read_buf) - 1);
+			close(fd);
+			if (len < 0)
+				continue;
+
+			read_buf[len] = '\0';
+
+			if (sscanf(read_buf, "%d", &gpu_id) != 1)
+				continue;
+
+			node = sys_add_node(sys, id, gpu_id);
+			if (!node) {
+				ret = -ENOMEM;
+				goto fail;
+			}
+
+			if (parse_topo_node(node, path)) {
+				pr_err("Failed to parse node %s\n", path);
+				ret = -EINVAL;
+				goto fail;
+			}
+		}
+	}
+	closedir(d_system);
+	return 0;
+
+fail:
+	topology_free(sys);
+	return ret;
+}
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
new file mode 100644
index 000000000..434956e9d
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -0,0 +1,119 @@
+#ifndef __KFD_PLUGIN_TOPOLOGY_H__
+#define __KFD_PLUGIN_TOPOLOGY_H__
+
+#define DRM_FIRST_RENDER_NODE 128
+#define DRM_LAST_RENDER_NODE  255
+
+#define TOPO_HEAP_TYPE_PUBLIC  1 /* HSA_HEAPTYPE_FRAME_BUFFER_PUBLIC */
+#define TOPO_HEAP_TYPE_PRIVATE 2 /* HSA_HEAPTYPE_FRAME_BUFFER_PRIVATE */
+
+#define TOPO_IOLINK_TYPE_ANY  0	 /* HSA_IOLINKTYPE_UNDEFINED */
+#define TOPO_IOLINK_TYPE_PCIE 2	 /* HSA_IOLINKTYPE_PCIEXPRESS */
+#define TOPO_IOLINK_TYPE_XGMI 11 /* HSA_IOLINK_TYPE_XGMI */
+
+#define NODE_IS_GPU(node) ((node)->gpu_id != 0)
+#define INVALID_CPU_ID	  0xFFFF
+
+/*************************************** Structures ***********************************************/
+struct tp_node;
+
+struct tp_iolink {
+	struct list_head listm;
+	uint32_t type;
+	uint32_t node_to_id;
+	struct tp_node *node_to;
+	struct tp_node *node_from;
+	bool valid;		/* Set to false if target node is not accessible */
+	struct tp_iolink *peer; /* If link is bi-directional, peer link */
+};
+
+struct tp_node {
+	uint32_t id;
+	uint32_t gpu_id;
+	uint32_t cpu_cores_count;
+	uint32_t simd_count;
+	uint32_t mem_banks_count;
+	uint32_t caches_count;
+	uint32_t io_links_count;
+	uint32_t max_waves_per_simd;
+	uint32_t lds_size_in_kb;
+	uint32_t num_gws;
+	uint32_t wave_front_size;
+	uint32_t array_count;
+	uint32_t simd_arrays_per_engine;
+	uint32_t cu_per_simd_array;
+	uint32_t simd_per_cu;
+	uint32_t max_slots_scratch_cu;
+	uint32_t vendor_id;
+	uint32_t device_id;
+	uint32_t domain;
+	uint32_t drm_render_minor;
+	uint64_t hive_id;
+	uint32_t num_sdma_engines;
+	uint32_t num_sdma_xgmi_engines;
+	uint32_t num_sdma_queues_per_engine;
+	uint32_t num_cp_queues;
+	uint32_t fw_version;
+	uint32_t capability;
+	uint32_t sdma_fw_version;
+	bool vram_public;
+	uint64_t vram_size;
+
+	struct list_head listm_system;
+	struct list_head listm_p2pgroup;
+	struct list_head listm_mapping; /* Used only during device mapping */
+
+	uint32_t num_valid_iolinks;
+	struct list_head iolinks;
+
+	int drm_fd;
+};
+
+struct tp_p2pgroup {
+	uint32_t type;
+	uint32_t num_nodes;
+	struct list_head listm_system;
+	struct list_head nodes;
+};
+
+struct tp_system {
+	bool parsed;
+	uint32_t num_nodes;
+	struct list_head nodes;
+	uint32_t num_xgmi_groups;
+	struct list_head xgmi_groups;
+};
+
+struct id_map {
+	uint32_t src;
+	uint32_t dest;
+
+	struct list_head listm;
+};
+
+struct device_maps {
+	struct list_head cpu_maps; /* CPUs are mapped using node_id */
+	struct list_head gpu_maps;
+
+	struct list_head *tail_cpu; /* GPUs are mapped using gpu_id */
+	struct list_head *tail_gpu;
+};
+
+/**************************************** Functions ***********************************************/
+void topology_init(struct tp_system *sys);
+void topology_free(struct tp_system *topology);
+
+int topology_parse(struct tp_system *topology, const char *msg);
+int topology_determine_iolinks(struct tp_system *sys);
+void topology_print(const struct tp_system *sys, const char *msg);
+
+struct tp_node *sys_add_node(struct tp_system *sys, uint32_t id, uint32_t gpu_id);
+struct tp_iolink *node_add_iolink(struct tp_node *node, uint32_t type, uint32_t node_to_id);
+
+struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32_t gpu_id);
+struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor);
+
+void maps_init(struct device_maps *maps);
+void maps_free(struct device_maps *maps);
+
+#endif /* __KFD_PLUGIN_TOPOLOGY_H__ */
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index 308f768f9..140b2951b 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -1,7 +1,43 @@
 syntax = "proto2";
 
+message dev_iolink {
+	required uint32 type = 1;
+	required uint32 node_to_id = 2;
+}
+
 message device_entry {
-	required uint32 gpu_id = 1;
+	required uint32 node_id = 1;
+	required uint32 gpu_id = 2;
+	required uint32 cpu_cores_count = 3;
+	required uint32 simd_count = 4;
+	required uint32 mem_banks_count = 5;
+	required uint32 caches_count = 6;
+	required uint32 io_links_count = 7;
+	required uint32 max_waves_per_simd = 8;
+	required uint32 lds_size_in_kb = 9;
+	required uint32 gds_size_in_kb = 10;
+	required uint32 num_gws = 11;
+	required uint32 wave_front_size = 12;
+	required uint32 array_count = 13;
+	required uint32 simd_arrays_per_engine = 14;
+	required uint32 cu_per_simd_array = 15;
+	required uint32 simd_per_cu = 16;
+	required uint32 max_slots_scratch_cu = 17;
+	required uint32 vendor_id = 18;
+	required uint32 device_id = 19;
+	required uint32 domain = 20;
+	required uint32 drm_render_minor = 21;
+	required uint64 hive_id = 22;
+	required uint32 num_sdma_engines = 23;
+	required uint32 num_sdma_xgmi_engines = 24;
+	required uint32 num_sdma_queues_per_engine = 25;
+	required uint32 num_cp_queues = 26;
+	required uint32 fw_version = 27;
+	required uint32 capability = 28;
+	required uint32 sdma_fw_version = 29;
+	required uint32 vram_public = 30;
+	required uint64 vram_size = 31;
+	repeated dev_iolink iolinks = 32;
 }
 
 message bo_entry {
@@ -16,11 +52,12 @@ message bo_entry {
 message criu_kfd {
 	required uint32 pid = 1;
 	required uint32 num_of_gpus = 2;
-	repeated device_entry device_entries = 3;
-	required uint64	num_of_bos = 4;
-	repeated bo_entry bo_entries = 5;
-	required uint32	num_of_objects = 6;
-	required bytes priv_data = 7;
+	required uint32 num_of_cpus = 3;
+	repeated device_entry device_entries = 4;
+	required uint64	num_of_bos = 5;
+	repeated bo_entry bo_entries = 6;
+	required uint32	num_of_objects = 7;
+	required bytes priv_data = 8;
 }
 
 message criu_render_node {

From 72905c9c9b829e29ae7fa90840b9eb4ba44d2a88 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Tue, 15 Feb 2022 21:41:05 -0500
Subject: [PATCH 0918/1854] criu/plugin: Remap GPUs on checkpoint restore

The device topology on the restore node can be different from the
topology on the checkpointed node. The GPUs on the restore node may
have different gpu_ids, minor number. or some GPUs may have different
properties as checkpointed node. During restore, the CRIU plugin
determines the target GPUs to avoid restore failures caused by trying
to restore a process on a gpu that is different.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 Documentation/amdgpu_plugin.txt         |   4 +-
 plugins/amdgpu/amdgpu_plugin.c          | 162 +++++-
 plugins/amdgpu/amdgpu_plugin_topology.c | 678 +++++++++++++++++++++++-
 plugins/amdgpu/amdgpu_plugin_topology.h |   9 +
 plugins/amdgpu/criu-amdgpu.proto        |   2 +-
 5 files changed, 827 insertions(+), 28 deletions(-)

diff --git a/Documentation/amdgpu_plugin.txt b/Documentation/amdgpu_plugin.txt
index 4b731cf9a..8ba602cce 100644
--- a/Documentation/amdgpu_plugin.txt
+++ b/Documentation/amdgpu_plugin.txt
@@ -9,8 +9,8 @@ userspace for AMD GPUs.
 
 CURRENT SUPPORT
 ---------------
-Single GPU systems (Gfx9)
-Checkpoint / Restore on same system
+Single and Multi GPU systems (Gfx9)
+Checkpoint / Restore on different system
 Checkpoint / Restore inside a docker container
 Pytorch
 
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 9c883d31a..235f839f8 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -53,6 +53,8 @@ struct vma_metadata {
 	uint64_t old_pgoff;
 	uint64_t new_pgoff;
 	uint64_t vma_entry;
+	uint32_t new_minor;
+	int fd;
 };
 
 /************************************ Global Variables ********************************************/
@@ -257,7 +259,9 @@ int topology_to_devinfo(struct tp_system *sys, struct device_maps *maps, DeviceE
 		devinfo->node_id = node->id;
 
 		if (NODE_IS_GPU(node)) {
-			devinfo->gpu_id = node->gpu_id;
+			devinfo->gpu_id = maps_get_dest_gpu(maps, node->gpu_id);
+			if (!devinfo->gpu_id)
+				return -EINVAL;
 
 			devinfo->simd_count = node->simd_count;
 			devinfo->mem_banks_count = node->mem_banks_count;
@@ -378,6 +382,8 @@ int amdgpu_plugin_init(int stage)
 
 	topology_init(&src_topology);
 	topology_init(&dest_topology);
+	maps_init(&checkpoint_maps);
+	maps_init(&restore_maps);
 
 	return 0;
 }
@@ -386,6 +392,9 @@ void amdgpu_plugin_fini(int stage, int ret)
 {
 	pr_info("amdgpu_plugin: finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
+	maps_free(&checkpoint_maps);
+	maps_free(&restore_maps);
+
 	topology_free(&src_topology);
 	topology_free(&dest_topology);
 }
@@ -455,6 +464,15 @@ static int save_devices(int fd, struct kfd_ioctl_criu_args *args, struct kfd_cri
 
 	pr_debug("Dumping %d devices\n", args->num_devices);
 
+	/* When checkpointing on a node where there was already a checkpoint-restore before, the
+	 * user_gpu_id and actual_gpu_id will be different.
+	 *
+	 * We store the user_gpu_id in the stored image files so that the stored images always have
+	 * the gpu_id's of the node where the application was first launched.
+	 */
+	for (int i = 0; i < args->num_devices; i++)
+		maps_add_gpu_entry(&checkpoint_maps, device_buckets[i].actual_gpu_id, device_buckets[i].user_gpu_id);
+
 	e->num_of_gpus = args->num_devices;
 	e->num_of_cpus = src_topology.num_nodes - args->num_devices;
 
@@ -638,11 +656,21 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		 */
 
 		CriuRenderNode rd = CRIU_RENDER_NODE__INIT;
+		struct tp_node *tp_node;
 
 		pr_info("amdgpu_plugin: Dumper called for /dev/dri/renderD%d, FD = %d, ID = %d\n", minor(st.st_rdev),
 			fd, id);
 
-		rd.minor_number = minor(st.st_rdev);
+		tp_node = sys_get_node_by_render_minor(&src_topology, minor(st.st_rdev));
+		if (!tp_node) {
+			pr_err("amdgpu_plugin: Failed to find a device with minor number = %d\n", minor(st.st_rdev));
+
+			return -ENODEV;
+		}
+
+		rd.gpu_id = maps_get_dest_gpu(&checkpoint_maps, tp_node->gpu_id);
+		if (!rd.gpu_id)
+			return -ENODEV;
 
 		len = criu_render_node__get_packed_size(&rd);
 		buf = xmalloc(len);
@@ -787,6 +815,7 @@ static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 	for (int entries_i = 0; entries_i < e->num_of_cpus + e->num_of_gpus; entries_i++) {
 		struct kfd_criu_device_bucket *device_bucket;
 		DeviceEntry *devinfo = e->device_entries[entries_i];
+		struct tp_node *tp_node;
 
 		if (!devinfo->gpu_id)
 			continue;
@@ -794,8 +823,19 @@ static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 		device_bucket = &device_buckets[bucket_index++];
 
 		device_bucket->user_gpu_id = devinfo->gpu_id;
+		device_bucket->actual_gpu_id = maps_get_dest_gpu(&restore_maps, devinfo->gpu_id);
+		if (!device_bucket->actual_gpu_id) {
+			ret = -ENODEV;
+			goto exit;
+		}
 
-		device_bucket->drm_fd = open_drm_render_device(bucket_index + DRM_FIRST_RENDER_NODE);
+		tp_node = sys_get_node_by_gpu_id(&dest_topology, device_bucket->actual_gpu_id);
+		if (!tp_node) {
+			ret = -ENODEV;
+			goto exit;
+		}
+
+		device_bucket->drm_fd = node_get_drm_render_device(tp_node);
 		if (device_bucket->drm_fd < 0) {
 			pr_perror("amdgpu_plugin: Can't pass NULL drm render fd to driver");
 			goto exit;
@@ -842,25 +882,42 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 static int restore_bo_data(int fd, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
-	int mem_fd = -1;
+	int mem_fd = -1, ret = 0;
 
 	for (int i = 0; i < e->num_of_bos; i++) {
 		void *addr;
-
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
+		struct tp_node *tp_node;
 		BoEntry *bo_entry = e->bo_entries[i];
 
 		if (bo_bucket->alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT |
 					      KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP | KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL)) {
 			struct vma_metadata *vma_md;
+			uint32_t target_gpu_id; /* actual gpu_id where the BO will be restored */
 
 			vma_md = xmalloc(sizeof(*vma_md));
-			if (!vma_md)
-				return -ENOMEM;
+			if (!vma_md) {
+				ret = -ENOMEM;
+				goto exit;
+			}
+
+			memset(vma_md, 0, sizeof(*vma_md));
 
 			vma_md->old_pgoff = bo_bucket->offset;
 			vma_md->vma_entry = bo_bucket->addr;
+
+			target_gpu_id = maps_get_dest_gpu(&restore_maps, bo_bucket->gpu_id);
+
+			tp_node = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+			if (!tp_node) {
+				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+				ret = -ENODEV;
+				goto exit;
+			}
+
+			vma_md->new_minor = tp_node->drm_render_minor;
 			vma_md->new_pgoff = bo_bucket->restored_offset;
+			vma_md->fd = node_get_drm_render_device(tp_node);
 
 			plugin_log_msg("amdgpu_plugin: adding vma_entry:addr:0x%lx old-off:0x%lx "
 				       "new_off:0x%lx new_minor:%d\n",
@@ -948,7 +1005,7 @@ exit:
 	if (mem_fd > 0)
 		close(mem_fd);
 
-	return 0;
+	return ret;
 }
 
 int amdgpu_plugin_restore_file(int id)
@@ -966,15 +1023,16 @@ int amdgpu_plugin_restore_file(int id)
 	snprintf(img_path, sizeof(img_path), "amdgpu-kfd-%d.img", id);
 
 	if (stat(img_path, &filestat) == -1) {
+		struct tp_node *tp_node;
+		uint32_t target_gpu_id;
+
 		pr_perror("open(%s)", img_path);
-		/* This is restorer plugin for renderD nodes. Since criu doesn't
-		 * gurantee that they will be called before the plugin is called
-		 * for kfd file descriptor, we need to make sure we open the render
-		 * nodes only once and before /dev/kfd is open, the render nodes
-		 * are open too. Generally, it is seen that during checkpoint and
-		 * restore both, the kfd plugin gets called first.
+		/* This is restorer plugin for renderD nodes. Criu doesn't guarantee that they will
+		 * be called before the plugin is called for kfd file descriptor.
+		 * TODO: Currently, this code will only work if this function is called for /dev/kfd
+		 * first as we assume restore_maps is already filled. Need to fix this later.
 		 */
-		snprintf(img_path, sizeof(img_path), "amdgpu-renderD-%d.img", id);
+		snprintf(img_path, sizeof(img_path), "renderDXXX.%d.img", id);
 
 		if (stat(img_path, &filestat) == -1) {
 			pr_perror("Failed to read file stats");
@@ -1001,8 +1059,26 @@ int amdgpu_plugin_restore_file(int id)
 			return -1;
 		}
 
-		pr_info("amdgpu_plugin: render node minor num = %d\n", rd->minor_number);
-		fd = open_drm_render_device(rd->minor_number);
+		pr_info("amdgpu_plugin: render node gpu_id = 0x%04x\n", rd->gpu_id);
+
+		target_gpu_id = maps_get_dest_gpu(&restore_maps, rd->gpu_id);
+		if (!target_gpu_id) {
+			fd = -ENODEV;
+			goto fail;
+		}
+
+		tp_node = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+		if (!tp_node) {
+			fd = -ENODEV;
+			goto fail;
+		}
+
+		pr_info("amdgpu_plugin: render node destination gpu_id = 0x%04x\n", tp_node->gpu_id);
+
+		fd = node_get_drm_render_device(tp_node);
+		if (fd < 0)
+			pr_err("amdgpu_plugin: Failed to open render device (minor:%d)\n", tp_node->drm_render_minor);
+	fail:
 		criu_render_node__free_unpacked(rd, NULL);
 		xfree(buf);
 		return fd;
@@ -1054,6 +1130,12 @@ int amdgpu_plugin_restore_file(int id)
 		goto exit;
 	}
 
+	ret = set_restore_gpu_maps(&src_topology, &dest_topology, &restore_maps);
+	if (ret) {
+		pr_err("Failed to map GPUs\n");
+		goto exit;
+	}
+
 	ret = restore_devices(&args, e);
 	if (ret)
 		goto exit;
@@ -1078,6 +1160,8 @@ int amdgpu_plugin_restore_file(int id)
 		goto exit;
 
 exit:
+	sys_close_drm_render_devices(&dest_topology);
+
 	if (e)
 		criu_kfd__free_unpacked(e, NULL);
 
@@ -1100,25 +1184,55 @@ CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESTORE_EXT_FILE, amdgpu_plugin_restore_
  * return -1 for error.
  * return 1 if vmap map must be adjusted.
  */
-int amdgpu_plugin_update_vmamap(const char *path, const uint64_t addr, const uint64_t old_offset, uint64_t *new_offset,
-				int *updated_fd)
+int amdgpu_plugin_update_vmamap(const char *in_path, const uint64_t addr, const uint64_t old_offset,
+				uint64_t *new_offset, int *updated_fd)
 {
 	struct vma_metadata *vma_md;
+	char path[PATH_MAX];
+	char *p_begin;
+	char *p_end;
+	bool is_kfd = false, is_renderD = false;
 
 	plugin_log_msg("amdgpu_plugin: Enter %s\n", __func__);
 
+	strncpy(path, in_path, sizeof(path));
+
+	p_begin = path;
+	p_end = p_begin + strlen(path);
+
 	/*
-	 * On newer versions of AMD KFD driver, only the file descriptor that was used to open the
-	 * device can be used for mmap, so we will have to return the proper file descriptor here
+	 * Paths sometimes have double forward slashes (e.g //dev/dri/renderD*)
+	 * replace all '//' with '/'.
 	 */
-	*updated_fd = -1;
+	while (p_begin < p_end - 1) {
+		if (*p_begin == '/' && *(p_begin + 1) == '/')
+			memmove(p_begin, p_begin + 1, p_end - p_begin);
+		else
+			p_begin++;
+	}
+
+	if (!strncmp(path, "/dev/dri/renderD", strlen("/dev/dri/renderD")))
+		is_renderD = true;
+
+	if (!strcmp(path, AMDGPU_KFD_DEVICE))
+		is_kfd = true;
+
+	if (!is_renderD && !is_kfd) {
+		pr_info("Skipping unsupported path:%s addr:%lx old_offset:%lx\n", in_path, addr, old_offset);
+		return 0;
+	}
 
 	list_for_each_entry(vma_md, &update_vma_info_list, list) {
 		if (addr == vma_md->vma_entry && old_offset == vma_md->old_pgoff) {
 			*new_offset = vma_md->new_pgoff;
 
-			plugin_log_msg("amdgpu_plugin: old_pgoff= 0x%lx new_pgoff = 0x%lx path = %s\n",
-				       vma_md->old_pgoff, vma_md->new_pgoff, path);
+			if (is_renderD)
+				*updated_fd = vma_md->fd;
+			else
+				*updated_fd = -1;
+
+			plugin_log_msg("amdgpu_plugin: old_pgoff=0x%lx new_pgoff=0x%lx fd=%d\n", vma_md->old_pgoff,
+				       vma_md->new_pgoff, *updated_fd);
 
 			return 1;
 		}
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 5ef98010f..b7a618631 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -32,6 +32,31 @@
 	}
 #endif
 
+static int open_drm_render_device(int minor)
+{
+	char path[128];
+	int fd;
+
+	if (minor < DRM_FIRST_RENDER_NODE || minor > DRM_LAST_RENDER_NODE) {
+		pr_perror("DRM render minor %d out of range [%d, %d]", minor, DRM_FIRST_RENDER_NODE,
+			  DRM_LAST_RENDER_NODE);
+		return -EINVAL;
+	}
+
+	snprintf(path, sizeof(path), "/dev/dri/renderD%d", minor);
+	fd = open(path, O_RDWR | O_CLOEXEC);
+	if (fd < 0) {
+		if (errno != ENOENT && errno != EPERM) {
+			pr_err("Failed to open %s: %s\n", path, strerror(errno));
+			if (errno == EACCES)
+				pr_err("Check user is in \"video\" group\n");
+		}
+		return -EBADFD;
+	}
+
+	return fd;
+}
+
 static const char *link_type(uint32_t type)
 {
 	switch (type) {
@@ -54,6 +79,38 @@ static struct tp_node *p2pgroup_get_node_by_gpu_id(const struct tp_p2pgroup *gro
 	return NULL;
 }
 
+int node_get_drm_render_device(struct tp_node *node)
+{
+	if (node->drm_fd < 0)
+		node->drm_fd = open_drm_render_device(node->drm_render_minor);
+
+	return node->drm_fd;
+}
+
+void sys_close_drm_render_devices(struct tp_system *sys)
+{
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		if (node->drm_fd >= 0) {
+			close(node->drm_fd);
+			node->drm_fd = -1;
+		}
+	}
+}
+
+static struct tp_iolink *node_get_iolink_to_node_id(const struct tp_node *node, const uint32_t type,
+						    const uint32_t node_id)
+{
+	struct tp_iolink *iolink;
+
+	list_for_each_entry(iolink, &node->iolinks, listm) {
+		if (iolink->node_to_id == node_id && iolink->type == type)
+			return iolink;
+	}
+	return NULL;
+}
+
 struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor)
 {
 	struct tp_node *node;
@@ -114,6 +171,167 @@ static struct tp_iolink *get_tp_peer_iolink(const struct tp_node *from_node, con
 	return NULL;
 }
 
+static bool maps_dest_cpu_mapped(const struct device_maps *maps, const uint32_t dest_id)
+{
+	struct id_map *id_map;
+
+	list_for_each_entry(id_map, &maps->cpu_maps, listm) {
+		if (id_map->dest == dest_id)
+			return true;
+	}
+	return false;
+}
+
+static uint32_t maps_get_dest_cpu(const struct device_maps *maps, const uint32_t src_id)
+{
+	struct id_map *id_map;
+
+	list_for_each_entry(id_map, &maps->cpu_maps, listm) {
+		if (id_map->src == src_id)
+			return id_map->dest;
+	}
+	return INVALID_CPU_ID;
+}
+
+bool maps_dest_gpu_mapped(const struct device_maps *maps, const uint32_t dest_id)
+{
+	struct id_map *id_map;
+
+	list_for_each_entry(id_map, &maps->gpu_maps, listm) {
+		if (id_map->dest == dest_id)
+			return true;
+	}
+	return false;
+}
+
+uint32_t maps_get_dest_gpu(const struct device_maps *maps, const uint32_t src_id)
+{
+	struct id_map *id_map;
+
+	list_for_each_entry(id_map, &maps->gpu_maps, listm) {
+		if (id_map->src == src_id)
+			return id_map->dest;
+	}
+	return 0;
+}
+
+static struct id_map *maps_add_cpu_entry(struct device_maps *maps, const uint32_t src_id, const uint32_t dest_id)
+{
+	struct id_map *id_map = xzalloc(sizeof(*id_map));
+
+	if (!id_map) {
+		pr_err("Failed to allocate memory for id_map\n");
+		return NULL;
+	}
+
+	id_map->src = src_id;
+	id_map->dest = dest_id;
+
+	list_add_tail(&id_map->listm, &maps->cpu_maps);
+
+	maps->tail_cpu = &id_map->listm;
+
+	pr_debug("Added CPU mapping [%02d -> %02d]\n", src_id, dest_id);
+	return id_map;
+}
+
+struct id_map *maps_add_gpu_entry(struct device_maps *maps, const uint32_t src_id, const uint32_t dest_id)
+{
+	struct id_map *id_map = xzalloc(sizeof(*id_map));
+
+	if (!id_map) {
+		pr_err("Failed to allocate memory for id_map\n");
+		return NULL;
+	}
+
+	id_map->src = src_id;
+	id_map->dest = dest_id;
+
+	list_add_tail(&id_map->listm, &maps->gpu_maps);
+
+	maps->tail_gpu = &id_map->listm;
+
+	pr_debug("Added GPU mapping [0x%04X -> 0x%04X]\n", src_id, dest_id);
+	return id_map;
+}
+
+static void maps_print(struct device_maps *maps)
+{
+	struct id_map *id_map;
+
+	pr_info("===Maps===============\n");
+	list_for_each_entry(id_map, &maps->gpu_maps, listm)
+		pr_info("GPU: 0x%04X -> 0x%04X\n", id_map->src, id_map->dest);
+
+	list_for_each_entry(id_map, &maps->cpu_maps, listm)
+		pr_info("CPU: %02d -> %02d\n", id_map->src, id_map->dest);
+	pr_info("======================\n");
+}
+
+void maps_init(struct device_maps *maps)
+{
+	INIT_LIST_HEAD(&maps->cpu_maps);
+	INIT_LIST_HEAD(&maps->gpu_maps);
+	maps->tail_cpu = 0;
+	maps->tail_gpu = 0;
+}
+
+void maps_free(struct device_maps *maps)
+{
+	while (!list_empty(&maps->cpu_maps)) {
+		struct id_map *map = list_first_entry(&maps->cpu_maps, struct id_map, listm);
+
+		list_del(&map->listm);
+		xfree(map);
+	}
+	while (!list_empty(&maps->gpu_maps)) {
+		struct id_map *map = list_first_entry(&maps->gpu_maps, struct id_map, listm);
+
+		list_del(&map->listm);
+		xfree(map);
+	}
+}
+
+static void maps_pop(struct device_maps *maps, struct device_maps *remove)
+{
+	if (remove->tail_cpu)
+		list_cut_position(&remove->cpu_maps, &maps->cpu_maps, remove->tail_cpu);
+
+	if (remove->tail_gpu)
+		list_cut_position(&remove->gpu_maps, &maps->gpu_maps, remove->tail_gpu);
+
+	maps_free(remove);
+}
+
+static int maps_push(struct device_maps *maps, struct device_maps *new)
+{
+	struct id_map *src_id_map, *dest_id_map;
+
+	list_for_each_entry(src_id_map, &new->cpu_maps, listm) {
+		list_for_each_entry(dest_id_map, &maps->cpu_maps, listm) {
+			if (src_id_map->src == dest_id_map->src || src_id_map->dest == dest_id_map->dest) {
+				pr_err("CPU mapping already exists src [%02d->%02d] new [%02d->%02d]\n",
+				       src_id_map->src, src_id_map->dest, dest_id_map->src, dest_id_map->dest);
+				return -EINVAL;
+			}
+		}
+	}
+	list_for_each_entry(src_id_map, &new->gpu_maps, listm) {
+		list_for_each_entry(dest_id_map, &maps->gpu_maps, listm) {
+			if (src_id_map->src == dest_id_map->src || src_id_map->dest == dest_id_map->dest) {
+				pr_err("GPU mapping already exists src [0x%04X -> 0x%04X] new [0x%04X -> 0x%04X]\n",
+				       src_id_map->src, src_id_map->dest, dest_id_map->src, dest_id_map->dest);
+				return -EINVAL;
+			}
+		}
+	}
+
+	list_splice(&new->cpu_maps, &maps->cpu_maps);
+	list_splice(&new->gpu_maps, &maps->gpu_maps);
+
+	return 0;
+}
+
 struct tp_iolink *node_add_iolink(struct tp_node *node, uint32_t type, uint32_t node_to_id)
 {
 	struct tp_iolink *iolink = xzalloc(sizeof(*iolink));
@@ -475,6 +693,19 @@ static const char *p2pgroup_to_str(struct tp_p2pgroup *group)
 	return topology_printstr;
 }
 
+static const char *mapping_list_to_str(struct list_head *node_list)
+{
+	static char topology_printstr[200];
+	struct tp_node *node;
+	size_t str_len = 0;
+
+	topology_printstr[0] = '\0';
+	list_for_each_entry(node, node_list, listm_mapping)
+		str_len += sprintf(&topology_printstr[str_len], "0x%04X ", node->gpu_id);
+
+	return topology_printstr;
+}
+
 void topology_print(const struct tp_system *sys, const char *message)
 {
 	struct tp_node *node;
@@ -717,4 +948,449 @@ int topology_parse(struct tp_system *sys, const char *message)
 fail:
 	topology_free(sys);
 	return ret;
-}
\ No newline at end of file
+}
+
+static bool device_properties_match(struct tp_node *src, struct tp_node *dest)
+{
+	if (src->simd_count == dest->simd_count && src->mem_banks_count == dest->mem_banks_count &&
+	    src->io_links_count == dest->io_links_count && src->max_waves_per_simd == dest->max_waves_per_simd &&
+	    src->lds_size_in_kb == dest->lds_size_in_kb && src->wave_front_size == dest->wave_front_size &&
+	    src->array_count == dest->array_count && src->simd_arrays_per_engine == dest->simd_arrays_per_engine &&
+	    src->cu_per_simd_array == dest->cu_per_simd_array && src->simd_per_cu == dest->simd_per_cu &&
+	    src->max_slots_scratch_cu == dest->max_slots_scratch_cu && src->vendor_id == dest->vendor_id &&
+	    src->device_id == dest->device_id && src->num_sdma_engines == dest->num_sdma_engines &&
+	    src->num_sdma_xgmi_engines == dest->num_sdma_xgmi_engines &&
+	    src->num_sdma_queues_per_engine == dest->num_sdma_queues_per_engine &&
+	    src->num_cp_queues == dest->num_cp_queues && src->capability == dest->capability &&
+	    src->vram_public == dest->vram_public && src->vram_size <= dest->vram_size &&
+	    src->num_gws <= dest->num_gws && src->caches_count <= dest->caches_count &&
+	    src->fw_version <= dest->fw_version && src->sdma_fw_version <= dest->sdma_fw_version) {
+		return true;
+	}
+	return false;
+}
+
+/**
+ * @brief Determines whether iolink dest can be used to replace src
+ *
+ * @param src source iolink
+ * @param dest destination iolink
+ * @return true if dest can replace src
+ */
+static bool iolink_match(struct tp_iolink *src, struct tp_iolink *dest)
+{
+	if (!src->valid)
+		return true;
+
+	if (!dest->valid)
+		return false;
+
+	if (NODE_IS_GPU(src->node_to) != NODE_IS_GPU(dest->node_to))
+		return false;
+
+	/* XGMI link can replace PCIE links */
+	if (src->type == TOPO_IOLINK_TYPE_XGMI && dest->type == TOPO_IOLINK_TYPE_PCIE)
+		return false;
+
+	/* bi-directional links can replace uni-directional links */
+	if (src->peer != NULL && dest->peer == NULL)
+		return false;
+
+	return true;
+}
+
+/**
+ * @brief Determines whether src_node can be mapped to dest_node
+ *
+ * Nodes compatibility are determined by:
+ * 1. Comparing the node properties
+ * 2. Making sure iolink mappings to CPUs would be compabitle with existing iolink mappings in maps
+ *
+ * If src_node and dest_node are mappable, then map_device will push the new mapping
+ * for src_node -> dest_node into new_maps.
+ * @param src_sys system topology information on source system
+ * @param dest_sys system topology information on destination system
+ * @param src_node source GPU
+ * @param dest_node destination GPU
+ * @param maps list of existing device maps
+ * @param new_maps if nodes are mappable, then GPU and CPU mappings will be added to this list
+ * @return true if src_node and dest_node are mappable
+ */
+static bool map_device(struct tp_system *src_sys, struct tp_system *dest_sys, struct tp_node *src_node,
+		       struct tp_node *dest_node, struct device_maps *maps, struct device_maps *new_maps)
+{
+	struct tp_iolink *src_iolink;
+
+	pr_debug("Evaluating mapping nodes [0x%04X -> 0x%04X]\n", src_node->gpu_id, dest_node->gpu_id);
+
+	/* Compare GPU properties from /sys/class/kfd/kfd/topology/nodes/N/properties */
+	if (!device_properties_match(src_node, dest_node)) {
+		pr_debug("[0x%04X -> 0x%04X] Device properties do not match\n", src_node->gpu_id, dest_node->gpu_id);
+		return false;
+	}
+
+	if (src_node->num_valid_iolinks > dest_node->num_valid_iolinks) {
+		pr_debug("[0x%04X -> 0x%04X] Mismatch between number of iolinks\n", src_node->gpu_id,
+			 dest_node->gpu_id);
+		return false;
+	}
+
+	list_for_each_entry(src_iolink, &src_node->iolinks, listm) {
+		/* Go through list of iolinks to CPU and compare them */
+
+		if (!NODE_IS_GPU(src_iolink->node_to)) {
+			bool matched_iolink = false;
+			/* This is a iolink to CPU */
+			pr_debug("Found link to CPU node:%02d\n", src_iolink->node_to->id);
+
+			uint32_t dest_cpu_node_id;
+
+			dest_cpu_node_id = maps_get_dest_cpu(maps, src_iolink->node_to->id);
+			if (dest_cpu_node_id == INVALID_CPU_ID)
+				dest_cpu_node_id = maps_get_dest_cpu(new_maps, src_iolink->node_to->id);
+
+			if (dest_cpu_node_id == INVALID_CPU_ID) {
+				struct tp_iolink *dest_iolink;
+
+				list_for_each_entry(dest_iolink, &dest_node->iolinks, listm) {
+					if (iolink_match(src_iolink, dest_iolink) &&
+					    !maps_dest_cpu_mapped(maps, dest_iolink->node_to->id) &&
+					    !maps_dest_cpu_mapped(new_maps, dest_iolink->node_to->id)) {
+						if (!maps_add_cpu_entry(new_maps, src_iolink->node_to->id,
+									dest_iolink->node_to->id))
+							/* This is a critical error because we
+							 * are out of memory
+							 */
+							return false;
+
+						matched_iolink = true;
+						break;
+					}
+				}
+			} else {
+				pr_debug("Existing CPU mapping found [%02d-%02d]\n", src_iolink->node_to->id,
+					 dest_cpu_node_id);
+				/* Confirm that the link to this CPU is same or better */
+
+				struct tp_iolink *dest_iolink =
+					node_get_iolink_to_node_id(dest_node, src_iolink->type, dest_cpu_node_id);
+
+				if (dest_iolink && iolink_match(src_iolink, dest_iolink))
+					matched_iolink = true;
+			}
+			if (!matched_iolink) {
+				pr_debug("[0x%04X -> 0x%04X] Mismatch between iolink to CPU\n", src_node->gpu_id,
+					 dest_node->gpu_id);
+
+				return false;
+			}
+		} else {
+			/* If GPUs have P2P-PCIe iolinks to this GPU, then at least one CPU will
+			 * also have a P2P-PCIe iolink to this GPU, so it seems that we do not need
+			 * to consider P2P-PCIe iolinks from GPU to GPU for now. Once P2P-PCIe
+			 * iolinks are exposed via p2p_links we may have to add additional code here
+			 * to validate P2P-PCIe links between GPUs.
+			 */
+		}
+	}
+	pr_debug("[0x%04X -> 0x%04X] Map is possible\n", src_node->gpu_id, dest_node->gpu_id);
+
+	if (!maps_add_gpu_entry(new_maps, src_node->gpu_id, dest_node->gpu_id)) {
+		/* This is a critical error because we are out of memory */
+		return false;
+	}
+	maps_print(new_maps);
+	return true;
+}
+
+/**
+ * @brief Determines whether list of GPUs in src_nodes are mappable to dest_nodes
+ *
+ * This function will pick the first node from src_nodes and iterate through all the nodes in
+ * dest_nodes and call map_device to determine whether the node is mappable.
+ * If a node from dest_nodes is mappable to the first node from src_nodes:
+ * 1. This function will remove the first node from src_nodes and the node from dest_nodes
+ * 2. Push sub-mappings (new_maps) generated by map_device into existing mappings (maps)
+ * 3. Recursively check whether remaining nodes in src_nodes and dest_nodes are mappable.
+ *
+ * Once src_nodes is empty then we have successfully mapped all the nodes and maps contains a full
+ * list of GPU mappings.
+ *
+ * If there are no nodes in dest_nodes that can be mapped to the first node in src_nodes, then this
+ * means we cannot build a full mapping list with the current list of mappings. We backtrack by
+ * popping the newly generated sub-mappings(new_maps) from existing mappings (maps) and add the two
+ * nodes back to src_nodes and dest_nodes and return false. When this function returns false, the
+ * caller function will try a different path by trying to map the first node from src_nodes to the
+ * next node in dest_nodes.
+ *
+ * @param src_sys system topology information on source system
+ * @param dest_sys system topology information on destination system
+ * @param src_node list of source GPUs that need to be mapped
+ * @param dest_node list of destination GPUs that need to be mapped
+ * @param maps list of device maps based on current map path
+ * @return true if all nodes from src_nodes and dest_nodes are mappable
+ */
+static bool map_devices(struct tp_system *src_sys, struct tp_system *dest_sys, struct list_head *src_nodes,
+			struct list_head *dest_nodes, struct device_maps *maps)
+{
+	struct tp_node *src_node, *dest_node, *dest_node_tmp;
+	struct device_maps new_maps;
+
+	/* Pick the first src node from the list of nodes and look for a dest node that is mappable.
+	 * If we find a mappable destination node, then we add src node and dest node mapping to
+	 * device_maps and recursively try to map the remaining nodes in the list.
+	 * If there are no more src nodes in the list, then we have found a successful combination
+	 * of src to dest nodes that are mappable.
+	 */
+	if (list_empty(src_nodes)) {
+		pr_debug("All nodes mapped successfully\n");
+		return true;
+	}
+
+	pr_debug("Mapping list src nodes [%s]\n", mapping_list_to_str(src_nodes));
+	pr_debug("Mapping list dest nodes [%s]\n", mapping_list_to_str(dest_nodes));
+
+	src_node = list_first_entry(src_nodes, struct tp_node, listm_mapping);
+	pr_debug("Looking for match for node 0x%04X\n", src_node->gpu_id);
+
+	list_del(&src_node->listm_mapping);
+
+	list_for_each_entry_safe(dest_node, dest_node_tmp, dest_nodes, listm_mapping) {
+		maps_init(&new_maps);
+		if (map_device(src_sys, dest_sys, src_node, dest_node, maps, &new_maps)) {
+			pr_debug("Matched destination node 0x%04X\n", dest_node->gpu_id);
+
+			/* src node and dest node are mappable, add device_maps generated by
+			 * map_device to list of current valid device_maps, and recursively try to
+			 * map remaining nodes in the list.
+			 */
+
+			list_del(&dest_node->listm_mapping);
+			if (maps_push(maps, &new_maps))
+				return false;
+
+			if (map_devices(src_sys, dest_sys, src_nodes, dest_nodes, maps)) {
+				pr_debug("Matched nodes 0x%04X and after\n", dest_node->gpu_id);
+				return true;
+			} else {
+				/* We could not map remaining nodes in the list. Add dest node back
+				 * to list and try to map next dest ndoe in list to current src
+				 * node.
+				 */
+				pr_debug("Nodes after [0x%04X -> 0x%04X] did not match, "
+					 "adding list back\n",
+					 src_node->gpu_id, dest_node->gpu_id);
+
+				list_add(&dest_node->listm_mapping, dest_nodes);
+				maps_pop(maps, &new_maps);
+			}
+		}
+	}
+	pr_debug("Failed to map nodes 0x%04X and after\n", src_node->gpu_id);
+
+	/* Either: We could not find a mappable dest node for current node, or we could not build a
+	 * combination from the remaining nodes in the lists. Add src node back to the list and
+	 * caller function will try next possible combination.
+	 */
+	list_add(&src_node->listm_mapping, src_nodes);
+
+	return false;
+}
+
+/**
+ * @brief Determines whether list of GPUs in src_xgmi_groups are mappable to list of GPUs in
+ * dest_xgmi_groups
+ *
+ * This function will pick the first XGMI group (hive) from src_xgmi_groups and iterate through the
+ * XGMI groups in dest_xgmi_groups. If the group in dest_xgmi_groups is mappable then this function
+ * will remove the hives from src_xgmi_groups and dest_xgmi_groups and recursively try to map the
+ * remaining hives in src_xgmi_groups and dest_xgmi_groups.
+ *
+ * If src_xgmi_groups is empty, then this means that we have successfully mapped all the XGMI hives
+ * and we have a full list of GPU mappings in maps.
+ *
+ * If we cannot find a hive inside dest_xgmi_groups that is mappable to the first hive from
+ * src_xgmi_groups, then this means that this path is not valid and we need to backtrack. We
+ * backtrack by adding the hives back into src_xgmi_groups and dest_xgmi_groups and returning false.
+ * The caller function will then try a different path by trying to map the first hive in
+ * src_xgmi_groups to the next hive in dest_xgmi_groups.
+ *
+ * @param src_sys system topology information on source system
+ * @param dest_sys system topology information on destination system
+ * @param src_xgmi_groups list of source XGMI hives that need to be mapped
+ * @param dest_xgmi_groups list of destination XGMI hives that need to be mapped
+ * @param maps list of device maps based on current map path
+ * @return true if all nodes from src_nodes and dest_nodes are mappable
+ */
+bool match_xgmi_groups(struct tp_system *src_sys, struct tp_system *dest_sys, struct list_head *src_xgmi_groups,
+		       struct list_head *dest_xgmi_groups, struct device_maps *maps)
+{
+	struct tp_p2pgroup *src_group;
+	struct tp_p2pgroup *dest_group;
+	struct tp_p2pgroup *dest_group_tmp;
+
+	if (list_empty(src_xgmi_groups)) {
+		pr_debug("All groups matched successfully\n");
+		return true;
+	}
+
+	/* Pick the first src XGMI group from the list. Then try to match src XGMI group with a
+	 * dest XGMI group. If we have a dest XGMI group that is mappable, then we try to
+	 * recursively map the next src XGMI group in the list, with remaining dest XGMI groups.
+	 * If there are no more src XGMI groups in the list, then this means we have successfully
+	 * mapped all the groups and we have a valid device_maps
+	 */
+	src_group = list_first_entry(src_xgmi_groups, struct tp_p2pgroup, listm_system);
+	pr_debug("Looking for match for group [%s]\n", p2pgroup_to_str(src_group));
+
+	list_del(&src_group->listm_system);
+
+	list_for_each_entry_safe(dest_group, dest_group_tmp, dest_xgmi_groups, listm_system) {
+		struct tp_node *node;
+
+		LIST_HEAD(src_nodes);
+		LIST_HEAD(dest_nodes);
+
+		if (src_group->num_nodes > dest_group->num_nodes)
+			continue;
+
+		pr_debug("Trying destination group [%s]\n", p2pgroup_to_str(dest_group));
+
+		list_for_each_entry(node, &src_group->nodes, listm_p2pgroup)
+			list_add_tail(&node->listm_mapping, &src_nodes);
+
+		list_for_each_entry(node, &dest_group->nodes, listm_p2pgroup)
+			list_add_tail(&node->listm_mapping, &dest_nodes);
+
+		/* map_devices will populate maps if successful */
+		if (map_devices(src_sys, dest_sys, &src_nodes, &dest_nodes, maps)) {
+			/* All the nodes in current src XGMI group are mappable with nodes in
+			 * current dest XGMI group. Remove the current groups from the lists
+			 * and recursively try to match remaining groups
+			 */
+			list_del(&dest_group->listm_system);
+			pr_debug("Matched destination group [%s]\n", p2pgroup_to_str(dest_group));
+			if (match_xgmi_groups(src_sys, dest_sys, src_xgmi_groups, dest_xgmi_groups, maps)) {
+				pr_debug("Matched subgroups of [%s]\n", p2pgroup_to_str(dest_group));
+
+				xfree(src_group);
+				xfree(dest_group);
+				return true;
+			} else {
+				/* We were not able to map the remaining XGMI groups so we add the
+				 * current dest XGMI group back to the list of unmapped groups, and
+				 * try to map current src XGMI group with the next dest XGMI in the
+				 * list of XGMI groups
+				 */
+				list_add(&dest_group->listm_system, dest_xgmi_groups);
+			}
+		}
+	}
+
+	/* We have not found a mappable dest XGMI group. We discard this combination. If this is
+	 * the first src XGMI group in the list, then it is not possible to match the XGMI groups.
+	 * If this was a recursive call, then the calling instance of function will try the next
+	 * combination of XGMI groups
+	 */
+
+	pr_debug("Failed to match groups [%s]\n", p2pgroup_to_str(src_group));
+	list_add_tail(&src_group->listm_system, src_xgmi_groups);
+
+	return false;
+}
+
+/**
+ * @brief Builds a list of GPU mappings from source topology to destination topology
+ *
+ * The topology on the destination system may not be identical to the topology on the source
+ * system, e.g There can be GPUs with different device ID's and they may be enumerated in a
+ * different order. This function builds a list of GPU mappings from the source topology to the
+ * destination topology and stores it in maps.
+ *
+ * The function will first validate all the iolinks and determine XGMI groups (hives) by calling the
+ * topology_determine_iolinks(). It will then try to match the GPUs that belong to XGMI hives and
+ * after that, match the remaining GPUs.
+ *
+ * @param src_sys system topology information on source system
+ * @param dest_sys system topology information on destination system
+ * @param maps list of device maps that was generated by this function
+ * @return true if we were able to build a full list of GPU mappings.
+ */
+int set_restore_gpu_maps(struct tp_system *src_sys, struct tp_system *dest_sys, struct device_maps *maps)
+{
+	struct tp_node *node;
+	int ret = 0;
+	int src_num_gpus = 0;
+	int dest_num_gpus = 0;
+
+	maps_init(maps);
+
+	ret = topology_determine_iolinks(src_sys);
+	if (ret) {
+		pr_err("Failed to determine iolinks from source (checkpointed) topology\n");
+		return ret;
+	}
+	topology_print(src_sys, "Source    ");
+
+	ret = topology_determine_iolinks(dest_sys);
+	if (ret) {
+		pr_err("Failed to determine iolinks from destination (local) topology\n");
+		return ret;
+	}
+	topology_print(dest_sys, "Destination");
+
+	/* Make sure we have same number of GPUs in src and dest */
+	list_for_each_entry(node, &src_sys->nodes, listm_system) {
+		if (NODE_IS_GPU(node))
+			src_num_gpus++;
+	}
+	list_for_each_entry(node, &dest_sys->nodes, listm_system) {
+		if (NODE_IS_GPU(node))
+			dest_num_gpus++;
+	}
+
+	if (src_num_gpus != dest_num_gpus) {
+		pr_err("Number of devices mismatch (checkpointed:%d local:%d)\n", src_num_gpus, dest_num_gpus);
+		return -EINVAL;
+	}
+
+	if (src_sys->num_xgmi_groups > dest_sys->num_xgmi_groups) {
+		pr_err("Number of xgmi groups mismatch (checkpointed:%d local:%d)\n", src_sys->num_xgmi_groups,
+		       dest_sys->num_xgmi_groups);
+		return -EINVAL;
+	}
+
+	/* First try to match the XGMI hives */
+	if (src_sys->num_xgmi_groups) {
+		if (!match_xgmi_groups(src_sys, dest_sys, &src_sys->xgmi_groups, &dest_sys->xgmi_groups, maps)) {
+			pr_err("Failed to match all GPU groups\n");
+			return -EINVAL;
+		}
+		pr_info("Current maps after XGMI groups matched\n");
+		maps_print(maps);
+	}
+
+	/* We matched all the XGMI hives, now match remaining GPUs */
+	LIST_HEAD(src_nodes);
+	LIST_HEAD(dest_nodes);
+
+	list_for_each_entry(node, &src_sys->nodes, listm_system) {
+		if (NODE_IS_GPU(node) && !maps_get_dest_gpu(maps, node->gpu_id))
+			list_add(&node->listm_mapping, &src_nodes);
+	}
+
+	list_for_each_entry(node, &dest_sys->nodes, listm_system) {
+		if (NODE_IS_GPU(node) && !maps_dest_gpu_mapped(maps, node->gpu_id))
+			list_add(&node->listm_mapping, &dest_nodes);
+	}
+
+	if (!map_devices(src_sys, dest_sys, &src_nodes, &dest_nodes, maps)) {
+		pr_err("Failed to match remaining nodes\n");
+		return -EINVAL;
+	}
+
+	pr_info("Maps after all nodes matched\n");
+	maps_print(maps);
+
+	return ret;
+}
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
index 434956e9d..c032af696 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.h
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -107,12 +107,21 @@ int topology_parse(struct tp_system *topology, const char *msg);
 int topology_determine_iolinks(struct tp_system *sys);
 void topology_print(const struct tp_system *sys, const char *msg);
 
+struct id_map *maps_add_gpu_entry(struct device_maps *maps, const uint32_t src_id, const uint32_t dest_id);
+
 struct tp_node *sys_add_node(struct tp_system *sys, uint32_t id, uint32_t gpu_id);
 struct tp_iolink *node_add_iolink(struct tp_node *node, uint32_t type, uint32_t node_to_id);
 
 struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32_t gpu_id);
 struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor);
 
+int node_get_drm_render_device(struct tp_node *node);
+void sys_close_drm_render_devices(struct tp_system *sys);
+
+int set_restore_gpu_maps(struct tp_system *tp_checkpoint, struct tp_system *tp_local, struct device_maps *maps);
+
+uint32_t maps_get_dest_gpu(const struct device_maps *maps, const uint32_t src_id);
+
 void maps_init(struct device_maps *maps);
 void maps_free(struct device_maps *maps);
 
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index 140b2951b..498321738 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -61,5 +61,5 @@ message criu_kfd {
 }
 
 message criu_render_node {
-	required uint32 minor_number = 1;
+	required uint32 gpu_id = 1;
 }

From 4856e0d4d0449f730f07d1c74ae722f057139b7e Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Tue, 15 Feb 2022 21:46:13 -0500
Subject: [PATCH 0919/1854] criu/plugin: Add parameters to override mapping

Add optional parameters to override default behavior during restore.
These parameters are passed in as environment variables before executing
CRIU.

List of parameters:

KFD_FW_VER_CHECK - disable firmware version check
KFD_SDMA_FW_VER_CHECK - disable SDMA firmware version check
KFD_CACHES_COUNT_CHECK - disable caches count check
KFD_NUM_GWS_CHECK - disable num_gws check
KFD_VRAM_SIZE_CHECK - disable VRAM size check
KFD_NUMA_CHECK - preserve NUMA regions
KFD_CAPABILITY_CHECK - disable capability check

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 Documentation/amdgpu_plugin.txt         | 61 +++++++++++++++++
 plugins/amdgpu/amdgpu_plugin.c          | 42 ++++++++++++
 plugins/amdgpu/amdgpu_plugin_topology.c | 87 ++++++++++++++++---------
 3 files changed, 160 insertions(+), 30 deletions(-)

diff --git a/Documentation/amdgpu_plugin.txt b/Documentation/amdgpu_plugin.txt
index 8ba602cce..cdc614bbf 100644
--- a/Documentation/amdgpu_plugin.txt
+++ b/Documentation/amdgpu_plugin.txt
@@ -34,6 +34,67 @@ Dependencies
 *criu 3.16*::
     This work is rebased on latest criu release available at this time.
 
+OPTIONS
+-------
+Optional parameters can be passed in as environment variables before
+executing criu command.
+
+*KFD_FW_VER_CHECK*::
+    Enable or disable firmware version check.
+    If enabled, firmware version on restored gpu needs to be greater than or
+    equal firmware version on checkpointed GPU. Default:Enabled
+
+    E.g:
+    KFD_FW_VER_CHECK=0
+
+*KFD_SDMA_FW_VER_CHECK*::
+    Enable or disable SDMA firmware version check.
+    If enabled, SDMA firmware version on restored gpu needs to be greater than or
+    equal firmware version on checkpointed GPU. Default:Enabled
+
+    E.g:
+    KFD_SDMA_FW_VER_CHECK=0
+
+*KFD_CACHES_COUNT_CHECK*::
+    Enable or disable caches count check. If enabled, the caches count on
+    restored GPU needs to be greater than or equal caches count on checkpointed
+    GPU. Default:Enabled
+
+    E.g:
+    KFD_CACHES_COUNT_CHECK=0
+
+*KFD_NUM_GWS_CHECK*::
+    Enable or disable num_gws check. If enabled, the num_gws on
+    restored GPU needs to be greater than or equal num_gws on checkpointed
+    GPU. Default:Enabled
+
+    E.g:
+    KFD_NUM_GWS_CHECK=0
+
+*KFD_VRAM_SIZE_CHECK*::
+    Enable or disable VRAM size check. If enabled, the VRAM size on
+    restored GPU needs to be greater than or equal VRAM size on checkpointed
+    GPU. Default:Enabled
+
+    E.g:
+    KFD_VRAM_SIZE_CHECK=0
+
+*KFD_NUMA_CHECK*::
+    Enable or disable NUMA CPU region check. If enabled, the plugin will restore
+    GPUs that belong to one CPU NUMA region to the same CPU NUMA region.
+    Default:Enabled
+
+    E.g:
+    KFD_NUMA_CHECK=1
+
+*KFD_CAPABILITY_CHECK*::
+    Enable or disable capability check. If enabled, the capability on
+    restored GPU needs to be equal to the capability on the checkpointed GPU.
+    Default:Enabled
+
+    E.g:
+    KFD_CAPABILITY_CHECK=1
+
 
 AUTHOR
 ------
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 235f839f8..ab2cac20c 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -65,6 +65,15 @@ struct device_maps checkpoint_maps;
 struct device_maps restore_maps;
 
 static LIST_HEAD(update_vma_info_list);
+
+extern bool kfd_fw_version_check;
+extern bool kfd_sdma_fw_version_check;
+extern bool kfd_caches_count_check;
+extern bool kfd_num_gws_check;
+extern bool kfd_vram_size_check;
+extern bool kfd_numa_check;
+extern bool kfd_capability_check;
+
 /**************************************************************************************************/
 
 int open_drm_render_device(int minor)
@@ -376,6 +385,21 @@ int devinfo_to_topology(DeviceEntry *devinfos[], uint32_t num_devices, struct tp
 	return 0;
 }
 
+void getenv_bool(const char *var, bool *value)
+{
+	char *value_str = getenv(var);
+
+	if (value_str) {
+		if (!strcmp(value_str, "0") || !strcasecmp(value_str, "NO"))
+			*value = false;
+		else if (!strcmp(value_str, "1") || !strcasecmp(value_str, "YES"))
+			*value = true;
+		else
+			pr_err("Ignoring invalid value for %s=%s, expecting (YES/NO)\n", var, value_str);
+	}
+	pr_info("param: %s:%s\n", var, *value ? "Y" : "N");
+}
+
 int amdgpu_plugin_init(int stage)
 {
 	pr_info("amdgpu_plugin: initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
@@ -385,6 +409,24 @@ int amdgpu_plugin_init(int stage)
 	maps_init(&checkpoint_maps);
 	maps_init(&restore_maps);
 
+	if (stage == CR_PLUGIN_STAGE__RESTORE) {
+		/* Default Values */
+		kfd_fw_version_check = true;
+		kfd_sdma_fw_version_check = true;
+		kfd_caches_count_check = true;
+		kfd_num_gws_check = true;
+		kfd_vram_size_check = true;
+		kfd_numa_check = true;
+		kfd_capability_check = true;
+
+		getenv_bool("KFD_FW_VER_CHECK", &kfd_fw_version_check);
+		getenv_bool("KFD_SDMA_FW_VER_CHECK", &kfd_sdma_fw_version_check);
+		getenv_bool("KFD_CACHES_COUNT_CHECK", &kfd_caches_count_check);
+		getenv_bool("KFD_NUM_GWS_CHECK", &kfd_num_gws_check);
+		getenv_bool("KFD_VRAM_SIZE_CHECK", &kfd_vram_size_check);
+		getenv_bool("KFD_NUMA_CHECK", &kfd_numa_check);
+		getenv_bool("KFD_CAPABILITY_CHECK", &kfd_capability_check);
+	}
 	return 0;
 }
 
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index b7a618631..77d680378 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -32,6 +32,22 @@
 	}
 #endif
 
+/* User override options */
+/* Skip firmware version check */
+bool kfd_fw_version_check;
+/* Skip SDMA firmware version check */
+bool kfd_sdma_fw_version_check;
+/* Skip caches count check */
+bool kfd_caches_count_check;
+/* Skip num gws check */
+bool kfd_num_gws_check;
+/* Skip vram size check */
+bool kfd_vram_size_check;
+/* Preserve NUMA regions */
+bool kfd_numa_check;
+/* Skip capability check */
+bool kfd_capability_check;
+
 static int open_drm_render_device(int minor)
 {
 	char path[128];
@@ -961,10 +977,13 @@ static bool device_properties_match(struct tp_node *src, struct tp_node *dest)
 	    src->device_id == dest->device_id && src->num_sdma_engines == dest->num_sdma_engines &&
 	    src->num_sdma_xgmi_engines == dest->num_sdma_xgmi_engines &&
 	    src->num_sdma_queues_per_engine == dest->num_sdma_queues_per_engine &&
-	    src->num_cp_queues == dest->num_cp_queues && src->capability == dest->capability &&
-	    src->vram_public == dest->vram_public && src->vram_size <= dest->vram_size &&
-	    src->num_gws <= dest->num_gws && src->caches_count <= dest->caches_count &&
-	    src->fw_version <= dest->fw_version && src->sdma_fw_version <= dest->sdma_fw_version) {
+	    src->num_cp_queues == dest->num_cp_queues && src->vram_public == dest->vram_public &&
+	    (!kfd_capability_check || (src->capability == dest->capability)) &&
+	    (!kfd_vram_size_check || (src->vram_size <= dest->vram_size)) &&
+	    (!kfd_num_gws_check || (src->num_gws <= dest->num_gws)) &&
+	    (!kfd_caches_count_check || (src->caches_count <= dest->caches_count)) &&
+	    (!kfd_fw_version_check || (src->fw_version <= dest->fw_version)) &&
+	    (!kfd_sdma_fw_version_check || (src->sdma_fw_version <= dest->sdma_fw_version))) {
 		return true;
 	}
 	return false;
@@ -1043,40 +1062,48 @@ static bool map_device(struct tp_system *src_sys, struct tp_system *dest_sys, st
 			/* This is a iolink to CPU */
 			pr_debug("Found link to CPU node:%02d\n", src_iolink->node_to->id);
 
-			uint32_t dest_cpu_node_id;
-
-			dest_cpu_node_id = maps_get_dest_cpu(maps, src_iolink->node_to->id);
-			if (dest_cpu_node_id == INVALID_CPU_ID)
-				dest_cpu_node_id = maps_get_dest_cpu(new_maps, src_iolink->node_to->id);
-
-			if (dest_cpu_node_id == INVALID_CPU_ID) {
+			if (!kfd_numa_check) {
 				struct tp_iolink *dest_iolink;
 
 				list_for_each_entry(dest_iolink, &dest_node->iolinks, listm) {
-					if (iolink_match(src_iolink, dest_iolink) &&
-					    !maps_dest_cpu_mapped(maps, dest_iolink->node_to->id) &&
-					    !maps_dest_cpu_mapped(new_maps, dest_iolink->node_to->id)) {
-						if (!maps_add_cpu_entry(new_maps, src_iolink->node_to->id,
-									dest_iolink->node_to->id))
-							/* This is a critical error because we
-							 * are out of memory
-							 */
-							return false;
-
+					if (iolink_match(src_iolink, dest_iolink))
 						matched_iolink = true;
-						break;
-					}
 				}
 			} else {
-				pr_debug("Existing CPU mapping found [%02d-%02d]\n", src_iolink->node_to->id,
-					 dest_cpu_node_id);
-				/* Confirm that the link to this CPU is same or better */
+				uint32_t dest_cpu_node_id;
 
-				struct tp_iolink *dest_iolink =
-					node_get_iolink_to_node_id(dest_node, src_iolink->type, dest_cpu_node_id);
+				dest_cpu_node_id = maps_get_dest_cpu(maps, src_iolink->node_to->id);
+				if (dest_cpu_node_id == INVALID_CPU_ID)
+					dest_cpu_node_id = maps_get_dest_cpu(new_maps, src_iolink->node_to->id);
 
-				if (dest_iolink && iolink_match(src_iolink, dest_iolink))
-					matched_iolink = true;
+				if (dest_cpu_node_id == INVALID_CPU_ID) {
+					struct tp_iolink *dest_iolink;
+					list_for_each_entry(dest_iolink, &dest_node->iolinks, listm) {
+						if (iolink_match(src_iolink, dest_iolink) &&
+						    !maps_dest_cpu_mapped(maps, dest_iolink->node_to->id) &&
+						    !maps_dest_cpu_mapped(new_maps, dest_iolink->node_to->id)) {
+							if (!maps_add_cpu_entry(new_maps, src_iolink->node_to->id,
+										dest_iolink->node_to->id))
+								/* This is a critical error because
+								 * we are out of memory
+								 */
+								return false;
+
+							matched_iolink = true;
+							break;
+						}
+					}
+				} else {
+					pr_debug("Existing CPU mapping found [%02d-%02d]\n", src_iolink->node_to->id,
+						 dest_cpu_node_id);
+					/* Confirm that the link to this CPU is same or better */
+
+					struct tp_iolink *dest_iolink = node_get_iolink_to_node_id(
+						dest_node, src_iolink->type, dest_cpu_node_id);
+
+					if (dest_iolink && iolink_match(src_iolink, dest_iolink))
+						matched_iolink = true;
+				}
 			}
 			if (!matched_iolink) {
 				pr_debug("[0x%04X -> 0x%04X] Mismatch between iolink to CPU\n", src_node->gpu_id,

From ba9c62df24160743d8082cfc5f6af4e92a4e629a Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Tue, 18 May 2021 12:15:48 -0400
Subject: [PATCH 0920/1854] criu/plugin: Add unit tests for GPU remapping

Adding unit tests for GPU remapping code when checkpointing and
restoring on different nodes with different topologies.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/Makefile                    |   15 +-
 plugins/amdgpu/amdgpu_plugin_topology.c    |   27 +-
 plugins/amdgpu/tests/test_topology_remap.c | 1119 ++++++++++++++++++++
 3 files changed, 1152 insertions(+), 9 deletions(-)
 create mode 100644 plugins/amdgpu/tests/test_topology_remap.c

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index abcf888d0..daaab35aa 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -5,7 +5,7 @@ PLUGIN_INC		:= ../../../criu/include
 PLUGIN_INC_EXTRA	:= ../../criu/include
 PLUGIN_INCLUDE		:= -iquote$(PLUGIN_INC) -iquote$(PLUGIN_INC_EXTRA)
 LIBDRM_INC             := -I/usr/include/libdrm
-DEPS_OK 		:= amdgpu_plugin.so
+DEPS_OK 		:= amdgpu_plugin.so amdgpu_plugin_test
 DEPS_NOK 		:= ;
 
 include $(__nmk_dir)msg.mk
@@ -29,7 +29,18 @@ amdgpu_plugin_clean:
 	$(call msg-clean, $@)
 	$(Q) $(RM) amdgpu_plugin.so criu-amdgpu.pb-c*
 .PHONY: amdgpu_plugin_clean
-clean: amdgpu_plugin_clean
+
+test_topology_remap: amdgpu_plugin_topology.c tests/test_topology_remap.c
+	$(CC) $^ -o $@ -DCOMPILE_TESTS $(PLUGIN_INCLUDE) -I .
+
+amdgpu_plugin_test:  test_topology_remap
+.PHONY: amdgpu_plugin_test
+
+amdgpu_plugin_test_clean:
+	$(Q) $(RM) test_topology_remap
+.PHONY: amdgpu_plugin_test_clean
+
+clean: amdgpu_plugin_clean amdgpu_plugin_test_clean
 
 mrproper: clean
 
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 77d680378..0bd620c62 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -24,6 +24,19 @@
 #define _GNU_SOURCE 1
 #endif
 
+#ifdef COMPILE_TESTS
+#undef pr_err
+#define pr_err(format, arg...) fprintf(stdout, "%s:%d ERROR:" format, __FILE__, __LINE__, ##arg)
+#undef pr_info
+#define pr_info(format, arg...) fprintf(stdout, "%s:%d INFO:" format, __FILE__, __LINE__, ##arg)
+#undef pr_debug
+#define pr_debug(format, arg...) fprintf(stdout, "%s:%d DBG:" format, __FILE__, __LINE__, ##arg)
+
+#undef pr_perror
+#define pr_perror(format, arg...) \
+	fprintf(stdout, "%s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
+#endif
+
 #ifdef DEBUG
 #define plugin_log_msg(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
 #else
@@ -34,19 +47,19 @@
 
 /* User override options */
 /* Skip firmware version check */
-bool kfd_fw_version_check;
+bool kfd_fw_version_check = true;
 /* Skip SDMA firmware version check */
-bool kfd_sdma_fw_version_check;
+bool kfd_sdma_fw_version_check = true;
 /* Skip caches count check */
-bool kfd_caches_count_check;
+bool kfd_caches_count_check = true;
 /* Skip num gws check */
-bool kfd_num_gws_check;
+bool kfd_num_gws_check = true;
 /* Skip vram size check */
-bool kfd_vram_size_check;
+bool kfd_vram_size_check = true;
 /* Preserve NUMA regions */
-bool kfd_numa_check;
+bool kfd_numa_check = true;
 /* Skip capability check */
-bool kfd_capability_check;
+bool kfd_capability_check = true;
 
 static int open_drm_render_device(int minor)
 {
diff --git a/plugins/amdgpu/tests/test_topology_remap.c b/plugins/amdgpu/tests/test_topology_remap.c
new file mode 100644
index 000000000..69c2a4827
--- /dev/null
+++ b/plugins/amdgpu/tests/test_topology_remap.c
@@ -0,0 +1,1119 @@
+/**************************************************************************************************
+ * GPU groups remapping unit tests
+ *
+ * Test cases for GPU topology group remapping when there are P2P iolinks between the GPUs. GPUs are
+ * considered to be grouped when they are connected via a XGMI bridge.
+ *
+ * When a GPU has large BAR enabled and its full address space can be accessed by another GPU (i.e
+ * its address is within 40/44/48-bits address limitation of the other GPU), then
+ * the other GPU will have an P2P-PCIe to this GPU.
+ *
+ * When GPUs have large BAR, but one GPU cannot address the full address another, then there is no
+ * iolink-PCIe from this GPU to the other GPU. This GPU still has to be remapped to a GPU with
+ * large BAR on restore. The other GPU could still have an iolink-PCIe to this GPU. This would
+ * result in a uni-directional P2P-PCIe.
+ *
+ *
+ * In general, the GPU ID's have the following format to ease debugging:
+ * WXYZ where:
+ * W = A in the source topology, B in the destination topology
+ * X = Unused
+ * Y = Hive number
+ * Z = GPU number
+ *
+ * e.g A017 = GPU in source topology, Hive number 1 (2nd hive), GPU number 7 (8th GPU)
+ *
+ *
+ * Test 0: 8 GPUs in 2 XGMI hives (full P2P-PCIe)
+ *	2 XGMI hives of 4 GPUs
+ *	Each hives have different type of GPUs
+ *	All 8 GPUs have P2P-PCIe links
+ *	2 CPU's - each cpu can access alternate GPUs
+ *
+ *	Src Topology:
+ *	  Hive-0 has 4 GPUs device-id 0xD000
+ *	  Hive-1 has 4 GPUs device-id 0xD001
+ *
+ *	Dest Topology:
+ *	  Hive-0 has 4 GPUs device-id 0xD001
+ *	  Hive-1 has 4 GPUs device-id 0xD000
+ *
+ *      EXPECT: SUCCESS
+ *	  GPUs in Hive-0 in Src Topology should be mapped to GPUs in Hive-1 in Dest Topology and
+ *	  GPUs in Hive-1 in Src Topology should be mapped to GPUs in Hive-0. So that the device-id's
+ *	  match.
+ *
+ *
+ * Test 1: 8 GPUs in 2 XGMI hives (partial P2P-PCIe case 1)
+ *	2 XGMI hives of 4 GPUs
+ *	All 8 GPUs have the same device-id
+ *
+ *	Src Topology:
+ *	  Hive-0 has 4 GPUs
+ *	  Hive-1 has 4 GPUs
+ *	  GPUs 0, 1, 2, 3, 4, 5 have P2P-PCIe links
+ *	  GPUs 7, 8 do not have P2P-PCIe links
+ *
+ *	Dest Topology:
+ *	  Same as Src Topology
+ *
+ *	EXPECT: SUCCESS
+ *
+ *
+ * Test 2: 8 GPUs in 2 XGMI hives (partial P2P-PCIe case 1)
+ *	Same as test 1 but each hive have different device-id's for each hive.
+ *
+ *	Src Topology:
+ *	  Hive-0 has 4 GPUs with device-id 0xD000
+ *	  Hive-1 has 4 GPUs with device-id 0xD001
+ *	  GPUs 0, 1, 2, 3, 4, 5 have P2P-PCIe links
+ *	  GPUs 7, 8 do not have P2P-PCIe links
+ *
+ *	Dest Topology:
+ *	  Hive-0 has 4 GPUs with device-id 0xD001
+ *	  Hive-1 has 4 GPUs with device-id 0xD000
+ *	  GPUs 0, 1, 2, 3, 4, 5 have P2P-PCIe links
+ *	  GPUs 7, 8 do not have P2P-PCIe links
+ *
+ *	EXPECT: FAIL
+ *	  It is not possible to map the GPUs because Src:Hive-0 would have to be mapped to
+ *	  Dest:Hive-1 to be able to match the P2P-PCIe links, but Src:Hive-0 and Dest:Hive-1 have
+ *	  different device-id's.
+ *
+ *
+ * Test 3:8 GPUs in 2 XGMI hives (partial P2P-PCIe case 2)
+ *	2 XGMI hives of 4 GPUs
+ *	1 GPU in each hive has a P2P-PCIe link but at different indexes within the hive.
+ *
+ *	Src Topology:
+ *	  Hive-0: Has 4 GPUs with device-id 0xD000.
+ *		  Only GPU-2(A002) has bi-directional P2P-PCIe link.
+ *
+ *	  Hive-1: Has 4 GPUs with device-id 0xD001.
+ *		  Only GPU-7(A017) has bi-directional P2P-PCIe link.
+ *
+ *	Dest Topology:
+ *	  Hive-0: Has 4 GPUs with device-id 0xD000.
+ *		  Only GPU-0(B000) has bi-directional P2P-PCIe link.
+ *
+ *	  Hive-1: Has 4 GPUs with device-id 0xD001.
+ *		  Only GPU-5(B015) has bi-directional P2P-PCIe link.
+ *
+ *
+ *	EXPECT: SUCCESS
+ *	  Only possible map for A002 is B000 because B000 is the only dest GPU with device-id 0xD000
+ *	  that has a P2P-PCIe link.
+ *	  Only possible map for A017 is B015 because B015 is the only dest GPU with device-id 0xD001
+ *	  that has a P2P-PCIe link.
+ *
+ *
+ * Test 4:8 GPU's in 2 XGMI hives (partial P2P-PCIe case 2)
+ *	Similar to Test 3 but not possible to map because one CPU iolink is uni-directional
+ *
+ *	Src Topology:
+ *	  Hive-0: Has 4 GPUs with device-id 0xD000.
+ *		  Only GPU-2(A002) has bi-directional P2P-PCIe link.
+ *
+ *	  Hive-1: Has 4 GPUs with device-id 0xD001.
+ *		  Only GPU-7(A017) has bi-directional P2P-PCIe link.
+ *
+ *	Dest Topology:
+ *	  Hive-0: Has 4 GPUs with device-id 0xD000.
+ *		  Only GPU-0(B000) has bi-directional P2P-PCIe link.
+ *
+ *	  Hive-1: Has 4 GPUs with device-id 0xD001.
+ *		  Only GPU-5(B014) has uni-directional P2P-PCIe link.
+ *
+ *	EXPECT: FAIL
+ *
+ *
+ * Test 5: 8 GPUs with 1 XGMI hive
+ *	4 GPUs in 1 XGMI hive, 4 GPUs have no XGMI bridge. Tests combination of XGMI and non-XGMI.
+ *	All 8 GPUs have P2P-PCIe links
+ *
+ *	Src Topology:
+ *	  Hive-0: Has 4 GPUs
+ *	  4 Other GPUs are not part of a XGMI hive
+ *
+ *	Dest Topology:
+ *	   Same as src topology
+ *
+ *	EXPECT: SUCCESS
+ *
+ *
+ * Test 6: 5 GPUs (mix and match GPU types and partial P2P-PCIe links)
+ *	No XGMI bridges
+ *	First 4 GPUs have P2P-PCIe links
+ *	1 GPU has different device-id's at different locations
+ *
+ *	Src Topology:
+ *	  GPU-0, GPU-1, GPU-3 has device-id 0xD000
+ *	  GPU-2, GPU-4 has device-id 0xD001
+ *
+ *	Dest Topology:
+ *	  GPU-0, GPU-2, GPU-3 has device-id 0xD000
+ *	  GPU-1, GPU-4 has device-id 0xD001
+ *
+ *	EXPECT: SUCCESS
+ *	  Mapping needs to be able to map A001->B002 and A002->B001.
+ *
+ *
+ **************************************************************************************************
+ * Tests where restore node is more capable than checkpointed node
+ * In the following tests, the destination topology is more P2P-links than the source topology, so
+ * the mapping should succeed, even though the user application will probably not be able to take
+ * advantage of the extra links.
+ *
+ * Test 7: 8 GPUs (ignore XGMI bridge on restore node)
+ *
+ *	Src Topology:
+ *	  Hive-0: GPU-0, GPU-1, GPU-2, GPU-3
+ *	  No XGMI bridge: GPU-4, GPU-5, GPU-6, GPU-7
+ *
+ *	Dest Topology:
+ *	  Hive-0: GPU-0, GPU-1, GPU-2, GPU-3
+ *	  Hive-1: GPU-4, GPU-5, GPU-6, GPU-7
+ *
+ *	EXPECT: SUCCESS
+ *	  Mapping should succeed, because destination GPUs GPU-4, GPU-5, GPU-6, GPU-7 are more
+ *	  capable than source GPUs GPU-4, GPU-5, GPU-6, GPU-7.
+ *	  User application will probably not take advantage of XGMI links in Hive-1.
+ *
+ *
+ * Test 8: 5 GPUs (4 GPUs with P2P-PCIe links vs 3 GPUs with P2P-PCIe links)
+ *
+ *	Src Topology:
+ *	  GPU-0, GPU-1, GPU-2 have bi-directional links
+ *	  GPU-3, GPU-4 have unidirectional links
+ *
+ *	Dest Topology:
+ *	  GPU-0, GPU-1, GPU-2, GPU-3 have bi-directional links
+ *	  GPU-4 have unidirectional links
+ *
+ *	EXPECT: SUCCESS
+ *	  Mapping should succeed because destination GPU-3 can replace source GPU-3.
+ *
+ **************************************************************************************************/
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <errno.h>
+#include "common/list.h"
+
+#include "amdgpu_plugin_topology.h"
+
+#define pr_err(...)   fprintf(stdout, "ERR:" __VA_ARGS__)
+#define pr_info(...)  fprintf(stdout, "INFO:" __VA_ARGS__)
+#define pr_debug(...) fprintf(stdout, "DBG:" __VA_ARGS__)
+
+int verify_maps(const struct device_maps *maps, uint32_t num_cpus, uint32_t num_gpus)
+{
+	struct id_map *map;
+
+	/* TODO: This merely checks that all nodes have been mapped. We should add individual
+	 * verification functions for each test to tests the mappings are correct
+	 */
+
+	list_for_each_entry(map, &maps->cpu_maps, listm) {
+		if (num_cpus-- == 0) {
+			pr_err("Results had more mappings than number of CPUs\n");
+			return -EINVAL;
+		}
+	}
+	if (num_cpus > 0) {
+		pr_err("Results did not map all CPUs\n");
+		return -EINVAL;
+	}
+
+	list_for_each_entry(map, &maps->gpu_maps, listm) {
+		if (num_gpus-- == 0) {
+			pr_err("Results had more mappings than number of GPUs\n");
+			return -EINVAL;
+		}
+	}
+	if (num_gpus > 0) {
+		pr_err("Results did not map all GPUs\n");
+		return -EINVAL;
+	}
+	return 0;
+}
+
+int test_0(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 10; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 10; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_1(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 8; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD000;
+
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		if (i < 6)
+			node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 8; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD000;
+
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		if (i < 6)
+			node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_2(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 8; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD001;
+
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		if (i < 6)
+			node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 8; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD000;
+
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		if (i < 6)
+			node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_3(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+	}
+
+	node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, 4);
+	node_add_iolink(node_cpus[1], TOPO_IOLINK_TYPE_PCIE, 9);
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+	}
+
+	node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_cpus[1], TOPO_IOLINK_TYPE_PCIE, 7);
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_4(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+	}
+
+	node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, 4);
+	node_add_iolink(node_cpus[1], TOPO_IOLINK_TYPE_PCIE, 9);
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD001;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+	}
+
+	node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_cpus[1], TOPO_IOLINK_TYPE_PCIE, 6);
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_5(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 10; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+		for (int j = 6; j < 10; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+		node_add_iolink(node_cpus[i & 1], TOPO_IOLINK_TYPE_PCIE, i + 2);
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, ((i + j) % 4) + 6);
+		for (int j = 2; j < 6; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, j);
+	}
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_6(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[5];
+	struct tp_node *node_cpus[1];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 5; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 1, 0xA000 + i);
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, 0);
+		node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, i + 1);
+	}
+	node_gpus[0]->device_id = 0xD000;
+	node_gpus[1]->device_id = 0xD000;
+	node_gpus[2]->device_id = 0xD001;
+	node_gpus[3]->device_id = 0xD000;
+	node_gpus[4]->device_id = 0xD001;
+
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 5; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 1, 0xB000 + i);
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, 0);
+		node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, i + 1);
+	}
+	node_gpus[0]->device_id = 0xD000;
+	node_gpus[1]->device_id = 0xD001;
+	node_gpus[2]->device_id = 0xD000;
+	node_gpus[3]->device_id = 0xD000;
+	node_gpus[4]->device_id = 0xD001;
+
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_7(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[8];
+	struct tp_node *node_cpus[2];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_src, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 2, 0xA010 + i);
+		node_gpus[i]->device_id = 0xD000;
+	}
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+	node_cpus[1] = sys_add_node(&tp_dest, 1, 0);
+	node_cpus[1]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 4; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, i & 1);
+	}
+	for (int i = 0; i < 4; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 2);
+	}
+
+	for (int i = 4; i < 8; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 2, 0xB010 + i);
+		node_gpus[i]->device_id = 0xD000;
+	}
+	for (int i = 4; i < 8; i++) {
+		for (int j = 1; j < 4; j++)
+			node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_XGMI, ((i + j) % 4) + 6);
+	}
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+int test_8(void)
+{
+	int ret = 0;
+	struct device_maps maps;
+
+	struct tp_node *node_gpus[5];
+	struct tp_node *node_cpus[1];
+
+	struct tp_system tp_src = { 0 };
+	struct tp_system tp_dest = { 0 };
+
+	/* Fill src struct */
+	topology_init(&tp_src);
+	tp_src.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_src, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 5; i++) {
+		node_gpus[i] = sys_add_node(&tp_src, i + 1, 0xA000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, 0);
+		node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, i + 1);
+	}
+
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 2);
+
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	/* Fill dest struct */
+	topology_init(&tp_dest);
+	tp_dest.parsed = true;
+
+	node_cpus[0] = sys_add_node(&tp_dest, 0, 0);
+	node_cpus[0]->cpu_cores_count = 1;
+
+	for (int i = 0; i < 5; i++) {
+		node_gpus[i] = sys_add_node(&tp_dest, i + 1, 0xB000 + i);
+		node_gpus[i]->device_id = 0xD000;
+		node_add_iolink(node_gpus[i], TOPO_IOLINK_TYPE_PCIE, 0);
+		node_add_iolink(node_cpus[0], TOPO_IOLINK_TYPE_PCIE, i + 1);
+	}
+
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[0], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[1], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[2], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[3], TOPO_IOLINK_TYPE_PCIE, 3);
+
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 1);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 2);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 3);
+	node_add_iolink(node_gpus[4], TOPO_IOLINK_TYPE_PCIE, 4);
+
+	ret = set_restore_gpu_maps(&tp_src, &tp_dest, &maps);
+
+	if (!ret) {
+		if (verify_maps(&maps, ARRAY_SIZE(node_cpus), ARRAY_SIZE(node_gpus))) {
+			pr_err("Mapping returned success, but results had errors\n");
+			ret = -1;
+		}
+	}
+	topology_free(&tp_src);
+	topology_free(&tp_dest);
+	maps_free(&maps);
+	return ret;
+}
+
+struct test {
+	int (*test_func)(void);
+	bool success; /* true if we expect function to return 0 */
+};
+
+int main(int argc, char **argv)
+{
+	int ret;
+	int result = 0;
+
+	struct test tests[] = {
+		{ test_0, true }, { test_1, true }, { test_2, false }, { test_3, true }, { test_4, false },
+		{ test_5, true }, { test_6, true }, { test_7, true },  { test_8, true },
+	};
+
+	if (argc > 1) {
+		int run;
+
+		if (sscanf(argv[1], "%d", &run) != 1 || (run >= ARRAY_SIZE(tests))) {
+			pr_err("Usage: test_topology_remap [test_number]\n");
+			pr_err("       Test number range:0-%ld\n", ARRAY_SIZE(tests) - 1);
+			pr_err("       Return codes:\n");
+			pr_err("         0 All tests pass\n");
+			pr_err("         1 At least one test failed\n");
+			pr_err("         2 Invalid parameters\n");
+			return 2;
+		}
+		pr_info("======================================================================\n");
+		pr_info("Starting test %d\n", run);
+		ret = tests[run].test_func();
+		pr_info("\n\nTest %d: %s\n", run, (!ret == tests[run].success) ? "PASS" : "FAILED");
+		pr_info("======================================================================\n");
+		return (!ret == tests[run].success) ? 0 : 1;
+	}
+
+	for (int i = 0; i < ARRAY_SIZE(tests); i++) {
+		pr_info("======================================================================\n");
+		pr_info("Starting test %d\n", i);
+		ret = tests[i].test_func();
+		pr_info("\n\nTest %d: %s\n", i, (!ret == tests[i].success) ? "PASS" : "FAILED");
+		pr_info("======================================================================\n");
+		if (!ret != tests[i].success)
+			result = 1;
+	}
+	return result;
+}

From a218fe0baa0ec652ab5f226c736f2e2f72b27bdc Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Wed, 22 Dec 2021 02:48:45 -0500
Subject: [PATCH 0921/1854] criu/plugin: Read and write BO contents in parallel

Implement multi-threaded code to read and write contents of each GPU
VRAM BOs in parallel in order to speed up dumping process when using
multiple GPUs.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
---
 plugins/amdgpu/Makefile                 |   3 +-
 plugins/amdgpu/amdgpu_plugin.c          | 423 ++++++++++++++++--------
 plugins/amdgpu/amdgpu_plugin_topology.c |  11 +
 plugins/amdgpu/amdgpu_plugin_topology.h |   1 +
 4 files changed, 303 insertions(+), 135 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index daaab35aa..e2f6b8a69 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -12,6 +12,7 @@ include $(__nmk_dir)msg.mk
 
 CC      		:= gcc
 PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC
+PLUGIN_LDFLAGS		:= -lpthread
 
 ifeq ($(CONFIG_AMDGPU),y)
         all: $(DEPS_OK)
@@ -23,7 +24,7 @@ criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
 
 amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_topology.c criu-amdgpu.pb-c.c
-	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE)
+	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
 
 amdgpu_plugin_clean:
 	$(call msg-clean, $@)
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index ab2cac20c..07c89d92c 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -13,6 +13,7 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <stdint.h>
+#include <pthread.h>
 
 #include "criu-plugin.h"
 #include "plugin.h"
@@ -443,6 +444,17 @@ void amdgpu_plugin_fini(int stage, int ret)
 
 CR_PLUGIN_REGISTER("amdgpu_plugin", amdgpu_plugin_init, amdgpu_plugin_fini)
 
+struct thread_data {
+	pthread_t thread;
+	uint64_t num_of_bos;
+	uint32_t gpu_id;
+	pid_t pid;
+	struct kfd_criu_bo_bucket *bo_buckets;
+	BoEntry **bo_entries;
+	int drm_fd;
+	int ret;
+};
+
 int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 {
 	struct stat st_kfd, st_dri_min;
@@ -480,6 +492,181 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, amdgpu_plugin_handle_device_vma)
 
+void *dump_bo_contents(void *_thread_data)
+{
+	int i, ret = 0;
+	int num_bos = 0;
+	struct thread_data *thread_data = (struct thread_data *)_thread_data;
+	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
+	BoEntry **bo_info = thread_data->bo_entries;
+	char *fname;
+	int mem_fd = -1;
+
+	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
+
+	if (asprintf(&fname, PROCPIDMEM, thread_data->pid) < 0) {
+		pr_perror("failed in asprintf, %s", fname);
+		ret = -1;
+		goto exit;
+	}
+	mem_fd = open(fname, O_RDONLY);
+	if (mem_fd < 0) {
+		pr_perror("Can't open %s for pid %d", fname, thread_data->pid);
+		free(fname);
+		ret = -errno;
+		goto exit;
+	}
+	plugin_log_msg("Opened %s file for pid = %d\n", fname, thread_data->pid);
+	free(fname);
+
+	for (i = 0; i < thread_data->num_of_bos; i++) {
+		if (bo_buckets[i].gpu_id != thread_data->gpu_id)
+			continue;
+
+		num_bos++;
+		if (!(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) &&
+		    !(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT))
+			continue;
+
+		if (bo_info[i]->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) {
+			void *addr;
+
+			plugin_log_msg("amdgpu_plugin: large bar read possible\n");
+
+			addr = mmap(NULL, bo_buckets[i].size, PROT_READ, MAP_SHARED, thread_data->drm_fd,
+				    bo_buckets[i].offset);
+			if (addr == MAP_FAILED) {
+				pr_perror("amdgpu_plugin: mmap failed");
+				ret = -errno;
+				goto exit;
+			}
+
+			/* direct memcpy is possible on large bars */
+			memcpy(bo_info[i]->rawdata.data, addr, bo_buckets[i].size);
+			munmap(addr, bo_buckets[i].size);
+		} else {
+			size_t bo_size;
+			plugin_log_msg("Reading BO contents with /proc/pid/mem\n");
+			if (lseek(mem_fd, (off_t)bo_buckets[i].addr, SEEK_SET) == -1) {
+				pr_perror("Can't lseek for BO offset for pid = %d", thread_data->pid);
+				ret = -errno;
+				goto exit;
+			}
+
+			bo_size = read(mem_fd, bo_info[i]->rawdata.data, bo_info[i]->size);
+			if (bo_size != bo_info[i]->size) {
+				pr_perror("Can't read buffer");
+				ret = -errno;
+				goto exit;
+			}
+		} /* PROCPIDMEM read done */
+	}
+
+exit:
+	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
+
+	if (mem_fd >= 0)
+		close(mem_fd);
+
+	thread_data->ret = ret;
+	return NULL;
+};
+
+void *restore_bo_contents(void *_thread_data)
+{
+	int i, ret = 0;
+	int num_bos = 0;
+	struct thread_data *thread_data = (struct thread_data *)_thread_data;
+	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
+	BoEntry **bo_info = thread_data->bo_entries;
+	char *fname;
+	int mem_fd = -1;
+
+	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
+
+	if (asprintf(&fname, PROCPIDMEM, thread_data->pid) < 0) {
+		pr_perror("failed in asprintf, %s", fname);
+		ret = -1;
+		goto exit;
+	}
+
+	mem_fd = open(fname, O_RDWR);
+	if (mem_fd < 0) {
+		pr_perror("Can't open %s for pid %d", fname, thread_data->pid);
+		free(fname);
+		ret = -errno;
+		goto exit;
+	}
+	plugin_log_msg("Opened %s file for pid = %d\n", fname, thread_data->pid);
+	free(fname);
+
+	for (i = 0; i < thread_data->num_of_bos; i++) {
+		void *addr;
+
+		if (bo_buckets[i].gpu_id != thread_data->gpu_id)
+			continue;
+
+		num_bos++;
+
+		if (!(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) &&
+		    !(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT))
+			continue;
+
+		if (bo_info[i]->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) {
+			plugin_log_msg("amdgpu_plugin: large bar write possible\n");
+
+			addr = mmap(NULL, bo_buckets[i].size, PROT_WRITE, MAP_SHARED, thread_data->drm_fd,
+				    bo_buckets[i].restored_offset);
+			if (addr == MAP_FAILED) {
+				pr_perror("amdgpu_plugin: mmap failed");
+				ret = -errno;
+				goto exit;
+			}
+
+			/* direct memcpy is possible on large bars */
+			memcpy(addr, (void *)bo_info[i]->rawdata.data, bo_info[i]->size);
+			munmap(addr, bo_info[i]->size);
+		} else {
+			size_t bo_size;
+			/* Use indirect host data path via /proc/pid/mem on small pci bar GPUs or
+			 * for Buffer Objects that don't have HostAccess permissions.
+			 */
+			plugin_log_msg("amdgpu_plugin: using PROCPIDMEM to restore BO contents\n");
+			addr = mmap(NULL, bo_info[i]->size, PROT_NONE, MAP_SHARED, thread_data->drm_fd,
+				    bo_buckets[i].restored_offset);
+
+			if (addr == MAP_FAILED) {
+				pr_perror("amdgpu_plugin: mmap failed");
+				ret = -errno;
+				goto exit;
+			}
+
+			if (lseek(mem_fd, (off_t)addr, SEEK_SET) == -1) {
+				pr_perror("Can't lseek for BO offset for pid = %d", thread_data->pid);
+				ret = -errno;
+				goto exit;
+			}
+
+			plugin_log_msg("Attempt writing now\n");
+			bo_size = write(mem_fd, bo_info[i]->rawdata.data, bo_info[i]->size);
+			if (bo_size != bo_info[i]->size) {
+				pr_perror("Can't write buffer");
+				ret = -errno;
+				goto exit;
+			}
+			munmap(addr, bo_info[i]->size);
+		}
+	}
+
+exit:
+	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
+
+	if (mem_fd >= 0)
+		close(mem_fd);
+	thread_data->ret = ret;
+	return NULL;
+};
+
 static int unpause_process(int fd)
 {
 	int ret = 0;
@@ -539,11 +726,17 @@ exit:
 
 static int save_bos(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
+	struct thread_data *thread_datas;
 	int ret = 0, i;
-	char *fname;
 
 	pr_debug("Dumping %d BOs\n", args->num_bos);
 
+	thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
+	if (!thread_datas) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+
 	e->num_of_bos = args->num_bos;
 	ret = allocate_bo_entries(e, e->num_of_bos, bo_buckets);
 	if (ret)
@@ -558,66 +751,48 @@ static int save_bos(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo
 		boinfo->size = bo_bucket->size;
 		boinfo->offset = bo_bucket->offset;
 		boinfo->alloc_flags = bo_bucket->alloc_flags;
+	}
 
-		if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM ||
-		    bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
-			if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) {
-				void *addr;
+	for (int i = 0; i < e->num_of_gpus; i++) {
+		struct tp_node *dev;
+		int ret_thread = 0;
 
-				pr_info("amdgpu_plugin: large bar read possible\n");
+		dev = sys_get_node_by_index(&src_topology, i);
+		if (!dev) {
+			ret = -ENODEV;
+			goto exit;
+		}
 
-				addr = mmap(NULL, boinfo->size, PROT_READ, MAP_SHARED, fd, boinfo->offset);
-				if (addr == MAP_FAILED) {
-					pr_perror("amdgpu_plugin: mmap failed\n");
-					ret = -errno;
-					goto exit;
-				}
+		thread_datas[i].gpu_id = dev->gpu_id;
+		thread_datas[i].bo_buckets = bo_buckets;
+		thread_datas[i].bo_entries = e->bo_entries;
+		thread_datas[i].pid = e->pid;
+		thread_datas[i].num_of_bos = args->num_bos;
+		thread_datas[i].drm_fd = node_get_drm_render_device(dev);
+		if (thread_datas[i].drm_fd < 0) {
+			ret = thread_datas[i].drm_fd;
+			goto exit;
+		}
 
-				/* direct memcpy is possible on large bars */
-				memcpy(boinfo->rawdata.data, addr, boinfo->size);
-				munmap(addr, boinfo->size);
-			} else {
-				size_t bo_size;
-				int mem_fd;
+		ret_thread = pthread_create(&thread_datas[i].thread, NULL, dump_bo_contents, (void *)&thread_datas[i]);
+		if (ret_thread) {
+			pr_err("Failed to create thread[%i]\n", i);
+			ret = -ret_thread;
+			goto exit;
+		}
+	}
 
-				pr_info("Now try reading BO contents with /proc/pid/mem\n");
-				if (asprintf(&fname, PROCPIDMEM, args->pid) < 0) {
-					pr_perror("failed in asprintf, %s", fname);
-					ret = -1;
-					goto exit;
-				}
+	for (int i = 0; i < e->num_of_gpus; i++) {
+		pthread_join(thread_datas[i].thread, NULL);
+		pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
 
-				mem_fd = open(fname, O_RDONLY);
-				if (mem_fd < 0) {
-					pr_perror("Can't open %s for pid %d", fname, args->pid);
-					free(fname);
-					close(mem_fd);
-					ret = -1;
-					goto exit;
-				}
-
-				pr_info("Opened %s file for pid = %d\n", fname, args->pid);
-				free(fname);
-
-				if (lseek(mem_fd, (off_t)bo_bucket->addr, SEEK_SET) == -1) {
-					pr_perror("Can't lseek for bo_offset for pid = %d", args->pid);
-					close(mem_fd);
-					ret = -1;
-					goto exit;
-				}
-
-				bo_size = read(mem_fd, boinfo->rawdata.data, boinfo->size);
-				if (bo_size != boinfo->size) {
-					close(mem_fd);
-					pr_perror("Can't read buffer");
-					ret = -1;
-					goto exit;
-				}
-				close(mem_fd);
-			}
+		if (thread_datas[i].ret) {
+			ret = thread_datas[i].ret;
+			goto exit;
 		}
 	}
 exit:
+	xfree(thread_datas);
 	pr_info("Dumped bos %s (ret:%d)\n", ret ? "failed" : "ok", ret);
 	return ret;
 }
@@ -922,15 +1097,20 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 	return 0;
 }
 
-static int restore_bo_data(int fd, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
+static int restore_bo_data(struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
-	int mem_fd = -1, ret = 0;
+	struct thread_data *thread_datas;
+	int thread_i, ret = 0;
+
+	thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
+	if (!thread_datas) {
+		ret = -ENOMEM;
+		goto exit;
+	}
 
 	for (int i = 0; i < e->num_of_bos; i++) {
-		void *addr;
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
 		struct tp_node *tp_node;
-		BoEntry *bo_entry = e->bo_entries[i];
 
 		if (bo_bucket->alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT |
 					      KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP | KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL)) {
@@ -967,86 +1147,61 @@ static int restore_bo_data(int fd, struct kfd_criu_bo_bucket *bo_buckets, CriuKf
 
 			list_add_tail(&vma_md->list, &update_vma_info_list);
 		}
-
-		if (bo_bucket->alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) {
-			pr_info("amdgpu_plugin: Trying mmap in stage 2\n");
-			if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC ||
-			    bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
-				plugin_log_msg("amdgpu_plugin: large bar write possible\n");
-				addr = mmap(NULL, bo_bucket->size, PROT_WRITE, MAP_SHARED, fd,
-					    bo_bucket->restored_offset);
-				if (addr == MAP_FAILED) {
-					pr_perror("amdgpu_plugin: mmap failed");
-					fd = -EBADFD;
-					goto exit;
-				}
-
-				/* direct memcpy is possible on large bars */
-				memcpy(addr, (void *)bo_entry->rawdata.data, bo_entry->size);
-				munmap(addr, bo_entry->size);
-			} else {
-				size_t bo_size;
-				char *fname;
-				/* Use indirect host data path via /proc/pid/mem
-				 * on small pci bar GPUs or for Buffer Objects
-				 * that don't have HostAccess permissions.
-				 */
-				plugin_log_msg("amdgpu_plugin: using PROCPIDMEM to restore BO contents\n");
-				addr = mmap(NULL, bo_bucket->size, PROT_NONE, MAP_SHARED, fd,
-					    bo_bucket->restored_offset);
-				if (addr == MAP_FAILED) {
-					pr_perror("amdgpu_plugin: mmap failed");
-					fd = -EBADFD;
-					goto exit;
-				}
-
-				if (asprintf(&fname, PROCPIDMEM, e->pid) < 0) {
-					pr_perror("failed in asprintf, %s", fname);
-					munmap(addr, bo_bucket->size);
-					fd = -EBADFD;
-					goto exit;
-				}
-
-				mem_fd = open(fname, O_RDWR);
-				if (mem_fd < 0) {
-					pr_perror("Can't open %s for pid %d", fname, e->pid);
-					free(fname);
-					munmap(addr, bo_bucket->size);
-					fd = -EBADFD;
-					goto exit;
-				}
-
-				plugin_log_msg("Opened %s file for pid = %d", fname, e->pid);
-				free(fname);
-
-				if (lseek(mem_fd, (off_t)addr, SEEK_SET) == -1) {
-					pr_perror("Can't lseek for bo_offset for pid = %d", e->pid);
-					munmap(addr, bo_entry->size);
-					fd = -EBADFD;
-					goto exit;
-				}
-
-				plugin_log_msg("Attempt writing now");
-				bo_size = write(mem_fd, bo_entry->rawdata.data, bo_entry->size);
-				if (bo_size != bo_entry->size) {
-					pr_perror("Can't write buffer");
-					munmap(addr, bo_entry->size);
-					fd = -EBADFD;
-					goto exit;
-				}
-				munmap(addr, bo_entry->size);
-				close(mem_fd);
-			}
-		} else {
-			plugin_log_msg("Not a VRAM BO\n");
-			continue;
-		}
 	}
 
-exit:
-	if (mem_fd > 0)
-		close(mem_fd);
+	thread_i = 0;
+	for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
+		struct tp_node *dev;
+		int ret_thread = 0;
+		uint32_t target_gpu_id;
 
+		if (!e->device_entries[i]->gpu_id)
+			continue;
+
+		/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
+		target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+
+		/* We need the fd for actual_gpu_id */
+		dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+		if (!dev) {
+			pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+			ret = -ENODEV;
+			goto exit;
+		}
+
+		thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
+		thread_datas[thread_i].bo_buckets = bo_buckets;
+		thread_datas[thread_i].bo_entries = e->bo_entries;
+		thread_datas[thread_i].pid = e->pid;
+		thread_datas[thread_i].num_of_bos = e->num_of_bos;
+
+		thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
+		if (thread_datas[thread_i].drm_fd < 0) {
+			ret = -thread_datas[thread_i].drm_fd;
+			goto exit;
+		}
+
+		ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
+					    (void *)&thread_datas[thread_i]);
+		if (ret_thread) {
+			pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
+			ret = -ret_thread;
+			goto exit;
+		}
+		thread_i++;
+	}
+
+	for (int i = 0; i < e->num_of_gpus; i++) {
+		pthread_join(thread_datas[i].thread, NULL);
+		pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
+
+		if (thread_datas[i].ret) {
+			ret = thread_datas[i].ret;
+			goto exit;
+		}
+	}
+exit:
+	xfree(thread_datas);
 	return ret;
 }
 
@@ -1197,7 +1352,7 @@ int amdgpu_plugin_restore_file(int id)
 		goto exit;
 	}
 
-	ret = restore_bo_data(fd, (struct kfd_criu_bo_bucket *)args.bos, e);
+	ret = restore_bo_data((struct kfd_criu_bo_bucket *)args.bos, e);
 	if (ret)
 		goto exit;
 
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 0bd620c62..04b495bd8 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -151,6 +151,17 @@ struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const
 	return NULL;
 }
 
+struct tp_node *sys_get_node_by_index(const struct tp_system *sys, uint32_t index)
+{
+	struct tp_node *node;
+
+	list_for_each_entry(node, &sys->nodes, listm_system) {
+		if (NODE_IS_GPU(node) && index-- == 0)
+			return node;
+	}
+	return NULL;
+}
+
 struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32_t gpu_id)
 {
 	struct tp_node *node;
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
index c032af696..9d99cda1c 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.h
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -114,6 +114,7 @@ struct tp_iolink *node_add_iolink(struct tp_node *node, uint32_t type, uint32_t
 
 struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32_t gpu_id);
 struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor);
+struct tp_node *sys_get_node_by_index(const struct tp_system *sys, uint32_t index);
 
 int node_get_drm_render_device(struct tp_node *node);
 void sys_close_drm_render_devices(struct tp_system *sys);

From 6d79266229ec4938be6ecce976bcee278a7c6952 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Thu, 10 Jun 2021 15:07:13 -0400
Subject: [PATCH 0922/1854] criu/plugin: Restore libhsakmt shared memory files

Libhsakmt(thunk) uses a shared memory file in /dev/shm/hsakmt_shared_mem
and its semaphore in /dev/shm/hsakmt_shared_mem. Adding a check during
checkpoint to see if these two files exist. If they exist then the
plugin will try to restore them during restore.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/Makefile          |  2 +-
 plugins/amdgpu/amdgpu_plugin.c   | 76 ++++++++++++++++++++++++++++++++
 plugins/amdgpu/criu-amdgpu.proto |  4 +-
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index e2f6b8a69..8f192a3a0 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -12,7 +12,7 @@ include $(__nmk_dir)msg.mk
 
 CC      		:= gcc
 PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC
-PLUGIN_LDFLAGS		:= -lpthread
+PLUGIN_LDFLAGS		:= -lpthread -lrt
 
 ifeq ($(CONFIG_AMDGPU),y)
         all: $(DEPS_OK)
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 07c89d92c..67caac2fc 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -14,6 +14,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <pthread.h>
+#include <semaphore.h>
 
 #include "criu-plugin.h"
 #include "plugin.h"
@@ -28,6 +29,10 @@
 
 #define AMDGPU_KFD_DEVICE "/dev/kfd"
 #define PROCPIDMEM	  "/proc/%d/mem"
+#define HSAKMT_SHM_PATH	  "/dev/shm/hsakmt_shared_mem"
+#define HSAKMT_SHM	  "/hsakmt_shared_mem"
+#define HSAKMT_SEM_PATH	  "/dev/shm/sem.hsakmt_semaphore"
+#define HSAKMT_SEM	  "hsakmt_semaphore"
 
 #define KFD_IOCTL_MAJOR_VERSION	    1
 #define MIN_KFD_IOCTL_MINOR_VERSION 7
@@ -667,6 +672,71 @@ exit:
 	return NULL;
 };
 
+int check_hsakmt_shared_mem(uint64_t *shared_mem_size, uint32_t *shared_mem_magic)
+{
+	int ret;
+	struct stat st;
+
+	ret = stat(HSAKMT_SHM_PATH, &st);
+	if (ret) {
+		*shared_mem_size = 0;
+		return 0;
+	}
+
+	*shared_mem_size = st.st_size;
+
+	/* First 4 bytes of shared file is the magic */
+	ret = read_file(HSAKMT_SHM_PATH, shared_mem_magic, sizeof(*shared_mem_magic));
+	if (ret)
+		pr_perror("amdgpu_plugin: Failed to read shared mem magic");
+	else
+		plugin_log_msg("amdgpu_plugin: Shared mem magic:0x%x\n", *shared_mem_magic);
+
+	return 0;
+}
+
+int restore_hsakmt_shared_mem(const uint64_t shared_mem_size, const uint32_t shared_mem_magic)
+{
+	int ret, fd;
+	struct stat st;
+	sem_t *sem = SEM_FAILED;
+
+	if (!shared_mem_size)
+		return 0;
+
+	if (!stat(HSAKMT_SHM_PATH, &st)) {
+		pr_debug("amdgpu_plugin: %s already exists\n", HSAKMT_SHM_PATH);
+	} else {
+		pr_info("Warning:%s was missing. Re-creating new file but we may lose perf counters\n",
+			HSAKMT_SHM_PATH);
+		fd = shm_open(HSAKMT_SHM, O_CREAT | O_RDWR, 0666);
+
+		ret = ftruncate(fd, shared_mem_size);
+		if (ret < 0) {
+			pr_err("amdgpu_plugin: Failed to truncate shared mem %s\n", HSAKMT_SHM);
+			close(fd);
+			return -errno;
+		}
+
+		ret = write(fd, &shared_mem_magic, sizeof(shared_mem_magic));
+		if (ret != sizeof(shared_mem_magic)) {
+			pr_perror("amdgpu_plugin: Failed to restore shared mem magic");
+			close(fd);
+			return -errno;
+		}
+
+		close(fd);
+	}
+
+	sem = sem_open(HSAKMT_SEM, O_CREAT, 0666, 1);
+	if (sem == SEM_FAILED) {
+		pr_perror("Failed to create %s", HSAKMT_SEM);
+		return -EACCES;
+	}
+	sem_close(sem);
+	return 0;
+}
+
 static int unpause_process(int fd)
 {
 	int ret = 0;
@@ -976,6 +1046,10 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	e->priv_data.data = (void *)args.priv_data;
 	e->priv_data.len = args.priv_data_size;
 
+	ret = check_hsakmt_shared_mem(&e->shared_mem_size, &e->shared_mem_magic);
+	if (ret)
+		goto exit;
+
 	snprintf(img_path, sizeof(img_path), "amdgpu-kfd-%d.img", id);
 	pr_info("amdgpu_plugin: img_path = %s\n", img_path);
 
@@ -1356,6 +1430,8 @@ int amdgpu_plugin_restore_file(int id)
 	if (ret)
 		goto exit;
 
+	ret = restore_hsakmt_shared_mem(e->shared_mem_size, e->shared_mem_magic);
+
 exit:
 	sys_close_drm_render_devices(&dest_topology);
 
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index 498321738..ae11b5867 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -57,7 +57,9 @@ message criu_kfd {
 	required uint64	num_of_bos = 5;
 	repeated bo_entry bo_entries = 6;
 	required uint32	num_of_objects = 7;
-	required bytes priv_data = 8;
+	required uint64 shared_mem_size = 8;
+	required uint32 shared_mem_magic = 9;
+	required bytes priv_data = 10;
 }
 
 message criu_render_node {

From bd83330095600adf5ea92c610e699c20a9693218 Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Fri, 25 Jun 2021 11:29:17 -0400
Subject: [PATCH 0923/1854] criu/plugin: Implement sDMA based buffer access

AMD Radeon GPUs have special sDMA (system dma engines) IPs that can be
used to speed up the read write operations from the VRAM and GTT memory.

Depends on:

* The kernel mode driver (kfd) creating the dmabuf objects for the kfd
  BOs in both checkpoint and restore operation.
* libdrm and libdrm_amdgpu libraries

Suggested-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/Makefile        |   4 +-
 plugins/amdgpu/amdgpu_plugin.c | 530 +++++++++++++++++++++++++--------
 2 files changed, 414 insertions(+), 120 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 8f192a3a0..288f2a450 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -12,7 +12,7 @@ include $(__nmk_dir)msg.mk
 
 CC      		:= gcc
 PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC
-PLUGIN_LDFLAGS		:= -lpthread -lrt
+PLUGIN_LDFLAGS		:= -lpthread -lrt -ldrm -ldrm_amdgpu
 
 ifeq ($(CONFIG_AMDGPU),y)
         all: $(DEPS_OK)
@@ -24,7 +24,7 @@ criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
 
 amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_topology.c criu-amdgpu.pb-c.c
-	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
+	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
 	$(call msg-clean, $@)
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 67caac2fc..7aa5450c3 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -16,6 +16,10 @@
 #include <pthread.h>
 #include <semaphore.h>
 
+#include <xf86drm.h>
+#include <libdrm/amdgpu.h>
+#include <libdrm/amdgpu_drm.h>
+
 #include "criu-plugin.h"
 #include "plugin.h"
 #include "criu-amdgpu.pb-c.h"
@@ -35,7 +39,7 @@
 #define HSAKMT_SEM	  "hsakmt_semaphore"
 
 #define KFD_IOCTL_MAJOR_VERSION	    1
-#define MIN_KFD_IOCTL_MINOR_VERSION 7
+#define MIN_KFD_IOCTL_MINOR_VERSION 8
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
@@ -54,6 +58,18 @@
 	}
 #endif
 
+#define SDMA_PACKET(op, sub_op, e) ((((e)&0xFFFF) << 16) | (((sub_op)&0xFF) << 8) | (((op)&0xFF) << 0))
+
+#define SDMA_OPCODE_COPY	    1
+#define SDMA_COPY_SUB_OPCODE_LINEAR 0
+#define SDMA_NOP		    0
+#define SDMA_LINEAR_COPY_MAX_SIZE   (1ULL << 21)
+
+enum sdma_op_type {
+	SDMA_OP_VRAM_READ,
+	SDMA_OP_VRAM_WRITE,
+};
+
 struct vma_metadata {
 	struct list_head list;
 	uint64_t old_pgoff;
@@ -497,81 +513,389 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, amdgpu_plugin_handle_device_vma)
 
+int alloc_and_map(amdgpu_device_handle h_dev, uint64_t size, uint32_t domain, amdgpu_bo_handle *ph_bo,
+		  amdgpu_va_handle *ph_va, uint64_t *p_gpu_addr, void **p_cpu_addr)
+{
+	struct amdgpu_bo_alloc_request alloc_req;
+	amdgpu_bo_handle h_bo;
+	amdgpu_va_handle h_va;
+	uint64_t gpu_addr;
+	void *cpu_addr;
+	int err;
+
+	memset(&alloc_req, 0, sizeof(alloc_req));
+	alloc_req.alloc_size = size;
+	alloc_req.phys_alignment = 0x1000;
+	alloc_req.preferred_heap = domain;
+	alloc_req.flags = 0;
+	err = amdgpu_bo_alloc(h_dev, &alloc_req, &h_bo);
+	if (err) {
+		pr_perror("failed to alloc BO");
+		return err;
+	}
+	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, size, 0x1000, 0, &gpu_addr, &h_va, 0);
+	if (err) {
+		pr_perror("failed to alloc VA");
+		goto err_va;
+	}
+	err = amdgpu_bo_va_op(h_bo, 0, size, gpu_addr, 0, AMDGPU_VA_OP_MAP);
+	if (err) {
+		pr_perror("failed to GPU map BO");
+		goto err_gpu_map;
+	}
+	if (p_cpu_addr) {
+		err = amdgpu_bo_cpu_map(h_bo, &cpu_addr);
+		if (err) {
+			pr_perror("failed to CPU map BO");
+			goto err_cpu_map;
+		}
+		*p_cpu_addr = cpu_addr;
+	}
+
+	*ph_bo = h_bo;
+	*ph_va = h_va;
+	*p_gpu_addr = gpu_addr;
+
+	return 0;
+
+err_cpu_map:
+	amdgpu_bo_va_op(h_bo, 0, size, gpu_addr, 0, AMDGPU_VA_OP_UNMAP);
+err_gpu_map:
+	amdgpu_va_range_free(h_va);
+err_va:
+	amdgpu_bo_free(h_bo);
+	return err;
+}
+
+void free_and_unmap(uint64_t size, amdgpu_bo_handle h_bo, amdgpu_va_handle h_va, uint64_t gpu_addr, void *cpu_addr)
+{
+	if (cpu_addr)
+		amdgpu_bo_cpu_unmap(h_bo);
+	amdgpu_bo_va_op(h_bo, 0, size, gpu_addr, 0, AMDGPU_VA_OP_UNMAP);
+	amdgpu_va_range_free(h_va);
+	amdgpu_bo_free(h_bo);
+}
+
+int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, BoEntry **bo_info_test, int i, amdgpu_device_handle h_dev,
+		 uint64_t max_copy_size, enum sdma_op_type type)
+{
+	uint64_t size, gpu_addr_src, gpu_addr_dest, gpu_addr_ib;
+	uint64_t gpu_addr_src_orig, gpu_addr_dest_orig;
+	amdgpu_va_handle h_va_src, h_va_dest, h_va_ib;
+	amdgpu_bo_handle h_bo_src, h_bo_dest, h_bo_ib;
+	struct amdgpu_bo_import_result res = { 0 };
+	uint64_t copy_size, bytes_remain, j = 0;
+	uint64_t n_packets;
+	struct amdgpu_cs_ib_info ib_info;
+	amdgpu_bo_list_handle h_bo_list;
+	struct amdgpu_cs_request cs_req;
+	amdgpu_bo_handle resources[3];
+	struct amdgpu_cs_fence fence;
+	uint32_t expired;
+	amdgpu_context_handle h_ctx;
+	void *userptr = NULL;
+	uint32_t *ib = NULL;
+	int err, shared_fd;
+
+	shared_fd = bo_buckets[i].dmabuf_fd;
+	size = bo_buckets[i].size;
+
+	plugin_log_msg("Enter %s\n", __func__);
+
+	/* prepare src buffer */
+	switch (type) {
+	case SDMA_OP_VRAM_WRITE:
+		/* create the userptr BO and prepare the src buffer */
+		posix_memalign(&userptr, sysconf(_SC_PAGE_SIZE), size);
+		if (!userptr) {
+			pr_perror("failed to alloc memory for userptr");
+			return -ENOMEM;
+		}
+
+		memcpy(userptr, bo_info_test[i]->rawdata.data, size);
+		plugin_log_msg("data copied to userptr from protobuf buffer\n");
+
+		err = amdgpu_create_bo_from_user_mem(h_dev, userptr, size, &h_bo_src);
+		if (err) {
+			pr_perror("failed to create userptr for sdma");
+			free(userptr);
+			return -EFAULT;
+		}
+
+		break;
+
+	case SDMA_OP_VRAM_READ:
+		err = amdgpu_bo_import(h_dev, amdgpu_bo_handle_type_dma_buf_fd, shared_fd, &res);
+		if (err) {
+			pr_perror("failed to import dmabuf handle from libdrm");
+			return -EFAULT;
+		}
+
+		h_bo_src = res.buf_handle;
+		break;
+
+	default:
+		pr_perror("Invalid sdma operation");
+		return -EINVAL;
+	}
+
+	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, size, 0x1000, 0, &gpu_addr_src, &h_va_src, 0);
+	if (err) {
+		pr_perror("failed to alloc VA for src bo");
+		goto err_src_va;
+	}
+	err = amdgpu_bo_va_op(h_bo_src, 0, size, gpu_addr_src, 0, AMDGPU_VA_OP_MAP);
+	if (err) {
+		pr_perror("failed to GPU map the src BO");
+		goto err_src_bo_map;
+	}
+	plugin_log_msg("Source BO: GPU VA: %lx, size: %lx\n", gpu_addr_src, size);
+	/* prepare dest buffer */
+	switch (type) {
+	case SDMA_OP_VRAM_WRITE:
+		err = amdgpu_bo_import(h_dev, amdgpu_bo_handle_type_dma_buf_fd, shared_fd, &res);
+		if (err) {
+			pr_perror("failed to import dmabuf handle from libdrm");
+			goto err_dest_bo_prep;
+		}
+
+		h_bo_dest = res.buf_handle;
+		break;
+
+	case SDMA_OP_VRAM_READ:
+		posix_memalign(&userptr, sysconf(_SC_PAGE_SIZE), size);
+		if (!userptr) {
+			pr_perror("failed to alloc memory for userptr");
+			goto err_dest_bo_prep;
+		}
+		memset(userptr, 0, size);
+		err = amdgpu_create_bo_from_user_mem(h_dev, userptr, size, &h_bo_dest);
+		if (err) {
+			pr_perror("failed to create userptr for sdma");
+			free(userptr);
+			goto err_dest_bo_prep;
+		}
+		break;
+
+	default:
+		pr_perror("Invalid sdma operation");
+		goto err_dest_bo_prep;
+	}
+
+	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, size, 0x1000, 0, &gpu_addr_dest, &h_va_dest, 0);
+	if (err) {
+		pr_perror("failed to alloc VA for dest bo");
+		goto err_dest_va;
+	}
+	err = amdgpu_bo_va_op(h_bo_dest, 0, size, gpu_addr_dest, 0, AMDGPU_VA_OP_MAP);
+	if (err) {
+		pr_perror("failed to GPU map the dest BO");
+		goto err_dest_bo_map;
+	}
+	plugin_log_msg("Dest BO: GPU VA: %lx, size: %lx\n", gpu_addr_dest, size);
+
+	n_packets = (size + max_copy_size) / max_copy_size;
+	/* prepare ring buffer/indirect buffer for command submission
+	 * each copy packet is 7 dwords so we need to alloc 28x size for ib
+	 */
+	err = alloc_and_map(h_dev, n_packets * 28, AMDGPU_GEM_DOMAIN_GTT, &h_bo_ib, &h_va_ib, &gpu_addr_ib,
+			    (void **)&ib);
+	if (err) {
+		pr_perror("failed to allocate and map ib/rb");
+		goto err_ib_gpu_alloc;
+	}
+
+	plugin_log_msg("Indirect BO: GPU VA: %lx, size: %lx\n", gpu_addr_ib, n_packets * 28);
+
+	resources[0] = h_bo_src;
+	resources[1] = h_bo_dest;
+	resources[2] = h_bo_ib;
+	err = amdgpu_bo_list_create(h_dev, 3, resources, NULL, &h_bo_list);
+	if (err) {
+		pr_perror("failed to create BO resources list");
+		goto err_bo_list;
+	}
+
+	memset(&cs_req, 0, sizeof(cs_req));
+	memset(&fence, 0, sizeof(fence));
+	memset(ib, 0, n_packets * 28);
+
+	plugin_log_msg("setting up sdma packets for command submission\n");
+	bytes_remain = size;
+	gpu_addr_src_orig = gpu_addr_src;
+	gpu_addr_dest_orig = gpu_addr_dest;
+	while (bytes_remain > 0) {
+		copy_size = min(bytes_remain, max_copy_size);
+
+		ib[j++] = SDMA_PACKET(SDMA_OPCODE_COPY, SDMA_COPY_SUB_OPCODE_LINEAR, 0);
+		ib[j++] = copy_size;
+		ib[j++] = 0;
+		ib[j++] = 0xffffffff & gpu_addr_src;
+		ib[j++] = (0xffffffff00000000 & gpu_addr_src) >> 32;
+		ib[j++] = 0xffffffff & gpu_addr_dest;
+		ib[j++] = (0xffffffff00000000 & gpu_addr_dest) >> 32;
+
+		gpu_addr_src += copy_size;
+		gpu_addr_dest += copy_size;
+		bytes_remain -= copy_size;
+	}
+
+	gpu_addr_src = gpu_addr_src_orig;
+	gpu_addr_dest = gpu_addr_dest_orig;
+	plugin_log_msg("pad the IB to align on 8 dw boundary\n");
+	/* pad the IB to the required number of dw with SDMA_NOP */
+	while (j & 7)
+		ib[j++] = SDMA_NOP;
+
+	ib_info.ib_mc_address = gpu_addr_ib;
+	ib_info.size = j;
+
+	cs_req.ip_type = AMDGPU_HW_IP_DMA;
+	/* possible future optimization: may use other rings, info available in
+	 * amdgpu_query_hw_ip_info()
+	 */
+	cs_req.ring = 0;
+	cs_req.number_of_ibs = 1;
+	cs_req.ibs = &ib_info;
+	cs_req.resources = h_bo_list;
+	cs_req.fence_info.handle = NULL;
+
+	plugin_log_msg("create the context\n");
+	err = amdgpu_cs_ctx_create(h_dev, &h_ctx);
+	if (err) {
+		pr_perror("failed to create context for SDMA command submission");
+		goto err_ctx;
+	}
+
+	plugin_log_msg("initiate sdma command submission\n");
+	err = amdgpu_cs_submit(h_ctx, 0, &cs_req, 1);
+	if (err) {
+		pr_perror("failed to submit command for SDMA IB");
+		goto err_cs_submit_ib;
+	}
+
+	fence.context = h_ctx;
+	fence.ip_type = AMDGPU_HW_IP_DMA;
+	fence.ip_instance = 0;
+	fence.ring = 0;
+	fence.fence = cs_req.seq_no;
+	err = amdgpu_cs_query_fence_status(&fence, AMDGPU_TIMEOUT_INFINITE, 0, &expired);
+	if (err) {
+		pr_perror("failed to query fence status");
+		goto err_cs_submit_ib;
+	}
+
+	if (!expired) {
+		pr_err("IB execution did not complete\n");
+		err = -EBUSY;
+		goto err_cs_submit_ib;
+	}
+
+	plugin_log_msg("done querying fence status\n");
+
+	if (type == SDMA_OP_VRAM_READ) {
+		memcpy(bo_info_test[i]->rawdata.data, userptr, size);
+		plugin_log_msg("data copied to protobuf buffer\n");
+	}
+
+err_cs_submit_ib:
+	amdgpu_cs_ctx_free(h_ctx);
+err_ctx:
+	amdgpu_bo_list_destroy(h_bo_list);
+err_bo_list:
+	free_and_unmap(n_packets * 28, h_bo_ib, h_va_ib, gpu_addr_ib, ib);
+err_ib_gpu_alloc:
+	err = amdgpu_bo_va_op(h_bo_dest, 0, size, gpu_addr_dest, 0, AMDGPU_VA_OP_UNMAP);
+	if (err)
+		pr_perror("failed to GPU unmap the dest BO %lx, size = %lx", gpu_addr_dest, size);
+err_dest_bo_map:
+	err = amdgpu_va_range_free(h_va_dest);
+	if (err)
+		pr_perror("dest range free failed");
+err_dest_va:
+	err = amdgpu_bo_free(h_bo_dest);
+	if (err)
+		pr_perror("dest bo free failed");
+
+	if (userptr && (type == SDMA_OP_VRAM_READ)) {
+		free(userptr);
+		userptr = NULL;
+	}
+
+err_dest_bo_prep:
+	err = amdgpu_bo_va_op(h_bo_src, 0, size, gpu_addr_src, 0, AMDGPU_VA_OP_UNMAP);
+	if (err)
+		pr_perror("failed to GPU unmap the src BO %lx, size = %lx", gpu_addr_src, size);
+err_src_bo_map:
+	err = amdgpu_va_range_free(h_va_src);
+	if (err)
+		pr_perror("src range free failed");
+err_src_va:
+	err = amdgpu_bo_free(h_bo_src);
+	if (err)
+		pr_perror("src bo free failed");
+
+	if (userptr && (type == SDMA_OP_VRAM_WRITE)) {
+		free(userptr);
+		userptr = NULL;
+	}
+
+	plugin_log_msg("Leaving sdma_copy_bo, err = %d\n", err);
+	return err;
+}
+
 void *dump_bo_contents(void *_thread_data)
 {
-	int i, ret = 0;
-	int num_bos = 0;
 	struct thread_data *thread_data = (struct thread_data *)_thread_data;
 	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
 	BoEntry **bo_info = thread_data->bo_entries;
-	char *fname;
-	int mem_fd = -1;
+	struct amdgpu_gpu_info gpu_info = { 0 };
+	amdgpu_device_handle h_dev;
+	uint64_t max_copy_size;
+	uint32_t major, minor;
+	int num_bos = 0;
+	int i, ret = 0;
 
 	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
 
-	if (asprintf(&fname, PROCPIDMEM, thread_data->pid) < 0) {
-		pr_perror("failed in asprintf, %s", fname);
-		ret = -1;
+	ret = amdgpu_device_initialize(thread_data->drm_fd, &major, &minor, &h_dev);
+	if (ret) {
+		pr_perror("failed to initialize device");
 		goto exit;
 	}
-	mem_fd = open(fname, O_RDONLY);
-	if (mem_fd < 0) {
-		pr_perror("Can't open %s for pid %d", fname, thread_data->pid);
-		free(fname);
-		ret = -errno;
+	plugin_log_msg("libdrm initialized successfully\n");
+
+	ret = amdgpu_query_gpu_info(h_dev, &gpu_info);
+	if (ret) {
+		pr_perror("failed to query gpuinfo via libdrm");
 		goto exit;
 	}
-	plugin_log_msg("Opened %s file for pid = %d\n", fname, thread_data->pid);
-	free(fname);
+
+	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
+									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id != thread_data->gpu_id)
 			continue;
 
-		num_bos++;
-		if (!(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) &&
-		    !(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT))
+		if (!(bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)))
 			continue;
 
-		if (bo_info[i]->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) {
-			void *addr;
+		num_bos++;
 
-			plugin_log_msg("amdgpu_plugin: large bar read possible\n");
-
-			addr = mmap(NULL, bo_buckets[i].size, PROT_READ, MAP_SHARED, thread_data->drm_fd,
-				    bo_buckets[i].offset);
-			if (addr == MAP_FAILED) {
-				pr_perror("amdgpu_plugin: mmap failed");
-				ret = -errno;
-				goto exit;
-			}
-
-			/* direct memcpy is possible on large bars */
-			memcpy(bo_info[i]->rawdata.data, addr, bo_buckets[i].size);
-			munmap(addr, bo_buckets[i].size);
-		} else {
-			size_t bo_size;
-			plugin_log_msg("Reading BO contents with /proc/pid/mem\n");
-			if (lseek(mem_fd, (off_t)bo_buckets[i].addr, SEEK_SET) == -1) {
-				pr_perror("Can't lseek for BO offset for pid = %d", thread_data->pid);
-				ret = -errno;
-				goto exit;
-			}
-
-			bo_size = read(mem_fd, bo_info[i]->rawdata.data, bo_info[i]->size);
-			if (bo_size != bo_info[i]->size) {
-				pr_perror("Can't read buffer");
-				ret = -errno;
-				goto exit;
-			}
-		} /* PROCPIDMEM read done */
+		/* perform sDMA based vram copy */
+		ret = sdma_copy_bo(bo_buckets, bo_info, i, h_dev, max_copy_size, SDMA_OP_VRAM_READ);
+		if (ret) {
+			pr_err("Failed to drain the BO using sDMA: bo_buckets[%d]\n", i);
+			break;
+		}
+		plugin_log_msg("** Successfully drained the BO using sDMA: bo_buckets[%d] **\n", i);
 	}
 
 exit:
 	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
 
-	if (mem_fd >= 0)
-		close(mem_fd);
+	amdgpu_device_deinitialize(h_dev);
 
 	thread_data->ret = ret;
 	return NULL;
@@ -579,95 +903,55 @@ exit:
 
 void *restore_bo_contents(void *_thread_data)
 {
-	int i, ret = 0;
-	int num_bos = 0;
 	struct thread_data *thread_data = (struct thread_data *)_thread_data;
 	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
 	BoEntry **bo_info = thread_data->bo_entries;
-	char *fname;
-	int mem_fd = -1;
+	struct amdgpu_gpu_info gpu_info = { 0 };
+	amdgpu_device_handle h_dev;
+	uint64_t max_copy_size;
+	uint32_t major, minor;
+	int num_bos = 0;
+	int i, ret = 0;
 
 	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
 
-	if (asprintf(&fname, PROCPIDMEM, thread_data->pid) < 0) {
-		pr_perror("failed in asprintf, %s", fname);
-		ret = -1;
+	ret = amdgpu_device_initialize(thread_data->drm_fd, &major, &minor, &h_dev);
+	if (ret) {
+		pr_perror("failed to initialize device");
+		goto exit;
+	}
+	plugin_log_msg("libdrm initialized successfully\n");
+
+	ret = amdgpu_query_gpu_info(h_dev, &gpu_info);
+	if (ret) {
+		pr_perror("failed to query gpuinfo via libdrm");
 		goto exit;
 	}
 
-	mem_fd = open(fname, O_RDWR);
-	if (mem_fd < 0) {
-		pr_perror("Can't open %s for pid %d", fname, thread_data->pid);
-		free(fname);
-		ret = -errno;
-		goto exit;
-	}
-	plugin_log_msg("Opened %s file for pid = %d\n", fname, thread_data->pid);
-	free(fname);
+	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
+									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
 	for (i = 0; i < thread_data->num_of_bos; i++) {
-		void *addr;
-
 		if (bo_buckets[i].gpu_id != thread_data->gpu_id)
 			continue;
 
+		if (!(bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)))
+			continue;
+
 		num_bos++;
 
-		if (!(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) &&
-		    !(bo_buckets[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT))
-			continue;
-
-		if (bo_info[i]->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) {
-			plugin_log_msg("amdgpu_plugin: large bar write possible\n");
-
-			addr = mmap(NULL, bo_buckets[i].size, PROT_WRITE, MAP_SHARED, thread_data->drm_fd,
-				    bo_buckets[i].restored_offset);
-			if (addr == MAP_FAILED) {
-				pr_perror("amdgpu_plugin: mmap failed");
-				ret = -errno;
-				goto exit;
-			}
-
-			/* direct memcpy is possible on large bars */
-			memcpy(addr, (void *)bo_info[i]->rawdata.data, bo_info[i]->size);
-			munmap(addr, bo_info[i]->size);
-		} else {
-			size_t bo_size;
-			/* Use indirect host data path via /proc/pid/mem on small pci bar GPUs or
-			 * for Buffer Objects that don't have HostAccess permissions.
-			 */
-			plugin_log_msg("amdgpu_plugin: using PROCPIDMEM to restore BO contents\n");
-			addr = mmap(NULL, bo_info[i]->size, PROT_NONE, MAP_SHARED, thread_data->drm_fd,
-				    bo_buckets[i].restored_offset);
-
-			if (addr == MAP_FAILED) {
-				pr_perror("amdgpu_plugin: mmap failed");
-				ret = -errno;
-				goto exit;
-			}
-
-			if (lseek(mem_fd, (off_t)addr, SEEK_SET) == -1) {
-				pr_perror("Can't lseek for BO offset for pid = %d", thread_data->pid);
-				ret = -errno;
-				goto exit;
-			}
-
-			plugin_log_msg("Attempt writing now\n");
-			bo_size = write(mem_fd, bo_info[i]->rawdata.data, bo_info[i]->size);
-			if (bo_size != bo_info[i]->size) {
-				pr_perror("Can't write buffer");
-				ret = -errno;
-				goto exit;
-			}
-			munmap(addr, bo_info[i]->size);
+		ret = sdma_copy_bo(bo_buckets, bo_info, i, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+		if (ret) {
+			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
+			break;
 		}
+		plugin_log_msg("** Successfully filled the BO using sDMA: bo_buckets[%d] **\n", i);
 	}
 
 exit:
 	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
 
-	if (mem_fd >= 0)
-		close(mem_fd);
+	amdgpu_device_deinitialize(h_dev);
 	thread_data->ret = ret;
 	return NULL;
 };
@@ -862,6 +1146,11 @@ static int save_bos(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo
 		}
 	}
 exit:
+	for (int i = 0; i < e->num_of_bos; i++) {
+		if (bo_buckets[i].dmabuf_fd != KFD_INVALID_FD)
+			close(bo_buckets[i].dmabuf_fd);
+	}
+
 	xfree(thread_datas);
 	pr_info("Dumped bos %s (ret:%d)\n", ret ? "failed" : "ok", ret);
 	return ret;
@@ -1275,6 +1564,11 @@ static int restore_bo_data(struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 		}
 	}
 exit:
+	for (int i = 0; i < e->num_of_bos; i++) {
+		if (bo_buckets[i].dmabuf_fd != KFD_INVALID_FD)
+			close(bo_buckets[i].dmabuf_fd);
+	}
+
 	xfree(thread_datas);
 	return ret;
 }

From 2095de9f0369a547a478751506efbc719bb23e80 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Wed, 29 Sep 2021 08:26:04 -0400
Subject: [PATCH 0924/1854] criu/plugin: Fix for FDs not allowed to mmap

On newer kernel's (> 5.13), KFD & DRM drivers will only allow the
/dev/renderD* file descriptors that were used during the CRIU_RESTORE
ioctl when calling mmap for the vma's.
During restore, after opening /dev/renderD*, amdgpu_plugin keeps the
FDs opened and instead returns a copy of the FDs to CRIU. The same FDs
are then returned during the UPDATE_VMAMAP hooks so that they can be
used by CRIU to call mmap. Duplicated FDs created using dup are
references to the same struct file inside the kernel so they are also
allowed to mmap.
To prevent the opened FDs inside amdgpu_plugin from conflicting with
FDs used by the target restore application, we make sure that the
lowest-numbered FD that amdgpu_plugin will use is greater than the
highest-numbered FD that is used by the target application.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/Makefile                 | 14 ++++---
 plugins/amdgpu/amdgpu_plugin.c          | 56 ++++++++++++-------------
 plugins/amdgpu/amdgpu_plugin_topology.c | 20 ++++++++-
 3 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 288f2a450..84b9f8714 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -1,10 +1,14 @@
 PLUGIN_NAME		:= amdgpu_plugin
 PLUGIN_SOBJ		:= amdgpu_plugin.so
 
-PLUGIN_INC		:= ../../../criu/include
-PLUGIN_INC_EXTRA	:= ../../criu/include
-PLUGIN_INCLUDE		:= -iquote$(PLUGIN_INC) -iquote$(PLUGIN_INC_EXTRA)
-LIBDRM_INC             := -I/usr/include/libdrm
+
+PLUGIN_INCLUDE  	:= -iquote../../../criu/include
+PLUGIN_INCLUDE  	+= -iquote../../criu/include
+PLUGIN_INCLUDE  	+= -iquote../../criu/arch/$(ARCH)/include/
+PLUGIN_INCLUDE  	+= -iquote../../
+
+COMPEL                 := ../../compel/compel-host
+LIBDRM_INC 		:= -I/usr/include/libdrm
 DEPS_OK 		:= amdgpu_plugin.so amdgpu_plugin_test
 DEPS_NOK 		:= ;
 
@@ -24,7 +28,7 @@ criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
 
 amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_topology.c criu-amdgpu.pb-c.c
-	$(CC) $(PLUGIN_CFLAGS) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
+	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
 	$(call msg-clean, $@)
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 7aa5450c3..13fb80aa2 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -27,6 +27,7 @@
 #include "kfd_ioctl.h"
 #include "xmalloc.h"
 #include "criu-log.h"
+#include "files.h"
 
 #include "common/list.h"
 #include "amdgpu_plugin_topology.h"
@@ -86,6 +87,8 @@ struct tp_system dest_topology;
 struct device_maps checkpoint_maps;
 struct device_maps restore_maps;
 
+extern int fd_next;
+
 static LIST_HEAD(update_vma_info_list);
 
 extern bool kfd_fw_version_check;
@@ -98,31 +101,6 @@ extern bool kfd_capability_check;
 
 /**************************************************************************************************/
 
-int open_drm_render_device(int minor)
-{
-	char path[128];
-	int fd;
-
-	if (minor < DRM_FIRST_RENDER_NODE || minor > DRM_LAST_RENDER_NODE) {
-		pr_perror("DRM render minor %d out of range [%d, %d]", minor, DRM_FIRST_RENDER_NODE,
-			  DRM_LAST_RENDER_NODE);
-		return -EINVAL;
-	}
-
-	snprintf(path, sizeof(path), "/dev/dri/renderD%d", minor);
-	fd = open(path, O_RDWR | O_CLOEXEC);
-	if (fd < 0) {
-		if (errno != ENOENT && errno != EPERM) {
-			pr_err("Failed to open %s: %s\n", path, strerror(errno));
-			if (errno == EACCES)
-				pr_err("Check user is in \"video\" group\n");
-		}
-		return -EBADFD;
-	}
-
-	return fd;
-}
-
 int write_file(const char *file_path, const void *buf, const size_t buf_len)
 {
 	int fd;
@@ -456,6 +434,9 @@ void amdgpu_plugin_fini(int stage, int ret)
 {
 	pr_info("amdgpu_plugin: finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
+	if (stage == CR_PLUGIN_STAGE__RESTORE)
+		sys_close_drm_render_devices(&dest_topology);
+
 	maps_free(&checkpoint_maps);
 	maps_free(&restore_maps);
 
@@ -1362,6 +1343,7 @@ exit:
 	/* Restore all queues */
 	unpause_process(fd);
 
+	sys_close_drm_render_devices(&src_topology);
 	xfree((void *)args.devices);
 	xfree((void *)args.bos);
 	xfree((void *)args.priv_data);
@@ -1646,7 +1628,15 @@ int amdgpu_plugin_restore_file(int id)
 	fail:
 		criu_render_node__free_unpacked(rd, NULL);
 		xfree(buf);
-		return fd;
+		/*
+		 * We need to use the file descriptor used to create the BOs for mmap later, otherwise the kernel DRM
+		 * drivers will not allow the mmap. Therefore, we keep a copy of the file descriptor (stored in tp_node)
+		 * so that we can return it in amdgpu_plugin_update_vmamap later. Also, CRIU core will dup and close the
+		 * returned fd after this function returns, and this will make our fd invalid. So we return a dup'ed
+		 * copy of the fd. CRIU core owns the duplicated returned fd, and amdgpu_plugin owns the fd stored in
+		 * tp_node.
+		 */
+		return dup(fd);
 	}
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
@@ -1682,6 +1672,18 @@ int amdgpu_plugin_restore_file(int id)
 
 	plugin_log_msg("amdgpu_plugin: read image file data\n");
 
+	/*
+	 * Initialize fd_next to be 1 greater than the biggest file descriptor in use by the target restore process.
+	 * This way, we know that the file descriptors we store will not conflict with file descriptors inside core
+	 * CRIU.
+	 */
+	fd_next = find_unused_fd_pid(e->pid);
+	if (fd_next <= 0) {
+		pr_err("Failed to find unused fd (fd:%d)\n", fd_next);
+		ret = -EINVAL;
+		goto exit;
+	}
+
 	ret = devinfo_to_topology(e->device_entries, e->num_of_gpus + e->num_of_cpus, &src_topology);
 	if (ret) {
 		pr_err("Failed to convert stored device information to topology\n");
@@ -1727,8 +1729,6 @@ int amdgpu_plugin_restore_file(int id)
 	ret = restore_hsakmt_shared_mem(e->shared_mem_size, e->shared_mem_magic);
 
 exit:
-	sys_close_drm_render_devices(&dest_topology);
-
 	if (e)
 		criu_kfd__free_unpacked(e, NULL);
 
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 04b495bd8..1a6ed059f 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -61,10 +61,17 @@ bool kfd_numa_check = true;
 /* Skip capability check */
 bool kfd_capability_check = true;
 
+/*
+ * During dump, we can use any fd value so fd_next is always -1.
+ * During restore, we have to use a fd value that does not conflict with fd values in use by the target restore process.
+ * fd_next is initialized as 1 greather than the highest-numbered file descriptor used by the target restore process.
+ */
+int fd_next = -1;
+
 static int open_drm_render_device(int minor)
 {
 	char path[128];
-	int fd;
+	int fd, ret_fd;
 
 	if (minor < DRM_FIRST_RENDER_NODE || minor > DRM_LAST_RENDER_NODE) {
 		pr_perror("DRM render minor %d out of range [%d, %d]", minor, DRM_FIRST_RENDER_NODE,
@@ -83,7 +90,16 @@ static int open_drm_render_device(int minor)
 		return -EBADFD;
 	}
 
-	return fd;
+	if (fd_next < 0)
+		return fd;
+
+	ret_fd = fcntl(fd, F_DUPFD, fd_next++);
+	close(fd);
+
+	if (ret_fd < 0)
+		pr_perror("Failed to duplicate fd for minor:%d (fd_next:%d)", minor, fd_next);
+
+	return ret_fd;
 }
 
 static const char *link_type(uint32_t type)

From 99a2380fc0c5df2e9b575c8002c366221bab7123 Mon Sep 17 00:00:00 2001
From: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Date: Tue, 20 Apr 2021 01:39:55 -0400
Subject: [PATCH 0925/1854] criu/plugin: Dockerfile for amdgpu_plugin

This sets up the pytorch environment for BERT Transformers and also sets
up CRIU along with all its dependencies including amdgpu plugin for
supporting CR with AMDGPUs.

Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 scripts/build/Dockerfile.amd-rocm | 97 +++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 scripts/build/Dockerfile.amd-rocm

diff --git a/scripts/build/Dockerfile.amd-rocm b/scripts/build/Dockerfile.amd-rocm
new file mode 100644
index 000000000..c0d181b03
--- /dev/null
+++ b/scripts/build/Dockerfile.amd-rocm
@@ -0,0 +1,97 @@
+FROM rocm/pytorch:latest
+
+ARG CC=gcc
+
+# Environment
+ENV BRANCH=$BRANCH \
+    DEBIAN_FRONTEND=noninteractive \
+    LC_ALL=en_US.UTF-8 \
+    LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8
+
+#
+# Package installation
+#
+RUN apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-install-recommends \
+	--no-upgrade -yq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+	apt-utils \
+	apt-transport-https\
+	gnupg \
+	gnupg2 \
+	gettext \
+	locales \
+	iproute2 \
+	iputils-ping \
+	moreutils \
+	net-tools \
+	psmisc\
+	supervisor \
+	cifs-utils \
+	nfs-common \
+	systemd \
+	fuse \
+	xmlto \
+	autossh \
+	netbase \
+	libnet-dev \
+	libnl-route-3-dev \
+	$CC \
+	bsdmainutils \
+	ca-certificates \
+	build-essential \
+	git-core \
+	iptables \
+	libaio-dev \
+	libbsd-dev \
+	libcap-dev \
+	libgnutls28-dev \
+	libgnutls30 \
+	libnl-3-dev \
+	libprotobuf-c-dev \
+	libprotobuf-dev \
+	libselinux-dev \
+	pkg-config \
+	protobuf-c-compiler \
+	protobuf-compiler \
+	python-protobuf \
+	python3-minimal \
+	python3-future \
+	python-ipaddress \
+	curl \
+	wget \
+	vim \
+	openssl \
+	openssh-server \
+	python \
+	sudo \
+	libnuma1 \
+	libdrm-dev \
+	libdrm-amdgpu1 \
+	asciidoc \
+	&& \
+	rm -rf /var/lib/apt/lists/* && \
+	apt-get purge --auto-remove && \
+	apt-get clean
+
+# Clone latest criu code
+COPY . /criu
+WORKDIR /criu
+
+RUN make mrproper && date && \
+# Check single object build
+	make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
+# Compile criu
+	make -j $(nproc) CC="$CC" && \
+	date && echo BUILD_OK && \
+# Install criu
+	make -j $(nproc) install && \
+	date && echo INSTALL_OK
+
+WORKDIR /root/criu_build_dir
+RUN	git clone --recursive -b  cl/rocm-transformers https://github.com/lcskrishna/transformers.git && \
+	cd transformers && wget https://rajpurkar.github.io/SQuAD-explorer/dataset/train-v1.1.json && \
+	wget https://rajpurkar.github.io/SQuAD-explorer/dataset/dev-v1.1.json && \
+	wget https://github.com/allenai/bi-att-flow/blob/master/squad/evaluate-v1.1.py
+ENV SQUAD_DIR=/root/criu_build_dir/transformers
+WORKDIR /root/criu_build_dir/transformers
+RUN pip3 install tensorboard tensorboardX && pip3 install .

From ecdf740fa3815392202eb32ff10e95aec98e9732 Mon Sep 17 00:00:00 2001
From: Felix Kuehling <Felix.Kuehling@amd.com>
Date: Fri, 30 Apr 2021 04:20:48 -0400
Subject: [PATCH 0926/1854] criu/plugin: Add whitepaper document

Adding whitepaper document

Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 plugins/amdgpu/README.md | 274 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 274 insertions(+)
 create mode 100644 plugins/amdgpu/README.md

diff --git a/plugins/amdgpu/README.md b/plugins/amdgpu/README.md
new file mode 100644
index 000000000..030029e7a
--- /dev/null
+++ b/plugins/amdgpu/README.md
@@ -0,0 +1,274 @@
+Supporting ROCm with CRIU
+=========================
+
+_Felix Kuehling <Felix.Kuehling@amd.com>_<br>
+_Rajneesh Bardwaj <Rajneesh.Bhardwaj@amd.com>_<br>
+_David Yat Sin <David.YatSin@amd.com>_
+
+# Introduction
+
+ROCm is the Radeon Open Compute Platform developed by AMD to support
+high-performance computing and machine learning on AMD GPUs. It is a nearly
+fully open-source software stack starting from the kernel mode GPU driver,
+including compilers and language runtimes, all the way up to optimized
+mathematics libraries, machine learning frameworks and communication libraries.
+
+Documentation for the ROCm platform can be found here:
+https://rocmdocs.amd.com/en/latest/
+
+CRIU is a tool for freezing and checkpointing running applications or
+containers and later restoring them on the same or a different system. The
+process is transparent to the application being checkpointed. It is mostly
+implemented in user mode and relies heavily on Linux kernel features, e.g.
+cgroups, ptrace, vmsplice, and more. It can checkpoint and restore most
+applications relying on standard libraries. However, it is not able to
+checkpoint and restore applications using device drivers, with their own
+per-application kernel mode state, out of the box. This includes ROCm
+applications using the KFD device driver to access GPU hardware resources. CRIU
+includes some plugin hooks to allow extending it to add such support in the
+future.
+
+A common environment for ROCm applications is in data centers and compute
+clusters. In this environment, migrating applications using CRIU would be
+beneficial and desirable. This paper outlines AMDs plans for adding ROCm
+support to CRIU.
+
+# State associated with ROCm applications
+
+ROCm applications communicate with the kernel mode driver “amdgpu.ko” through
+the Thunk library “libhsakmt.so” to enumerate available GPUs, manage
+GPU-accessible memory, user mode queues for submitting work to the GPUs, and
+events for synchronizing with GPUs. Many of those APIs create and manipulate
+state maintained in the kernel mode driver that would need to be saved and
+restored by CRIU.
+
+## Memory
+
+ROCm manages memory in the form of buffer objects (BOs). We are also working on
+a new memory management API that will be based on virtual address ranges. For
+now, we are focusing on the buffer-object based memory management.
+
+There are different types of buffer objects supported:
+
+* VRAM (device memory managed by the kernel mode driver)
+* GTT (system memory managed by the kernel mode driver)
+* Userptr (normal system memory managed by user mode driver or application)
+* Doorbell (special aperture for sending signals to the GPU for user mode command submissions)
+* MMIO (special aperture for accessing GPU control registers, used for certain cache flushing operations)
+
+All these BOs are typically mapped into the GPU page tables for access by GPUs.
+Most of them are also mapped for CPU access. The following BO properties need
+to be saved and restored for CRIU to work with ROCm applications:
+
+* Buffer type
+* Buffer handle
+* Buffer size (page aligned)
+* Virtual address for GPU mapping (page aligned)
+* Device file offset for CPU mapping (for VRAM and GTT BOs)
+* Memory contents (for VRAM and GTT BOs)
+
+## Queues
+
+ROCm uses user mode queues to submit work to the GPUs. There are several memory
+buffers associated with queues. At the language runtime or application level,
+they expose the ring buffer as well as a signal object to tell the GPU about
+new commands added to the queue. The signal is mapped to a doorbell (a 64-bit
+entry in the doorbell aperture mapped by the doorbell BO). Internally there are
+other buffers needed for dispatch completion tracking, shader state saving
+during queue preemption and the queue state itself. Some of these buffers are
+managed in user mode, others are managed in kernel mode.
+
+When an application is checkpointed, we need to preempt all user mode queues
+belonging to the process, and then save their state, including:
+
+* Queue type (compute or DMA)
+* MQD (memory queue descriptor managed in kernel mode), with state such as
+  * ring buffer address
+  * read and write pointers
+  * doorbell offset
+  * pointer to AQL queue data structure
+* Control stack (kernel-managed piece of state needed for resuming preempted queue)
+
+The rest of the queue state is contained in user-managed buffer objects that
+will be saved by the memory state handling described above:
+
+* Ring buffer (userptr BO containing commands sent to the GPU)
+* AQL queue data structure (userptr BO containing `struct hsa_queue_t`)
+* EOP buffer (VRAM BO used for dispatch completion tracking by the command processor)
+* Context save area (userptr BO for saving shader state of preempted wavefronts)
+
+## Events
+
+Events are used to implement interrupt-based sleeping/waiting for signals sent
+from the GPU to the host. Signals are represented by some data structures in
+KFD and an entry in a user-allocated, GPU-accessible BO with event slots. We
+need to save the allocated set of event IDs and each event’s signaling state.
+The contents of the event slots will be saved by the memory state handling
+described above.
+
+## Topology
+
+When ROCm applications are started, they enumerate the device topology to find
+available GPUs, their capabilities and connectivity. An application can be
+checkpointed at any time, so it will not be at a safe place to re-enumerate the
+topology when it is restored. Therefore, we can only support restoring
+applications on systems with a very similar topology:
+
+* Same number of GPUs
+* Same type of GPUs (i.e. instruction set, cache sizes, number of compute units, etc.)
+* Same or larger memory size
+* Same VRAM accessibility by the host
+* Same connectivity and P2P memory support between GPUs
+
+At the KFD ioctl level, GPUs are identified by GPUIDs, which are unique
+identifiers created by hashing various GPU properties. That way a GPUID will
+not change during the lifetime of a process, even in a future where GPUs may be
+added or removed dynamically. When restoring a process on a different system,
+the GPUID may have changed. Or it may be desirable to restore a process using a
+different subset of GPUs on the same system (using cgroups). Therefore, we will
+need a translation of GPUIDs for restored processes that applies to all KFD
+ioctl calls after an application was restored.
+
+# CRIU plugins
+
+CRIU provides plugin hooks for device files:
+
+    int cr_plugin_dump_file(int fd, int id);
+    int cr_plugin_restore_file(int id);
+
+In a ROCm process, it will be invoked for `/dev/kfd` and `/dev/dri/renderD*`
+device nodes. `/dev/kfd` is used for KFD ioctl calls to manage memory, queues,
+signals and other functionality for all GPUs through a single device file
+descriptor. `/dev/dri/renderD*` are per GPU device files, called render nodes,
+that are used mostly for CPU mapping of VRAM and GTT BOs. Each BO is given a
+unique offset in the render node of the corresponding GPU at allocation time.
+
+Render nodes are also used for memory management and command submission by the
+Mesa user mode driver for video decoding and post processing. These use cases
+are relevant even in data centers. Support for this is not an immediate
+priority but planned for the future. This will require saving additional state
+as well as synchronization with any outstanding jobs. For now, there is no
+kernel-mode state associated with `/dev/renderD*`.
+
+The two existing plugins can be used for saving and restoring most state
+associated with ROCm applications. We are planning to add new ioctl calls to
+`/dev/kfd` to help with this.
+
+## Dumping
+
+At the “dump” stage, the ioctl will execute in the context of the CRIU dumper
+process. But the file descriptor (fd) is “drained” from the process being saved
+by the parasite code that CRIU injects into its target. This allows the plugin
+to make an ioctl call with enough context to allow KFD to access all the kernel
+mode state associated with the target process. CRIU is ptrace attached to the
+target process. KFD can use that fact to authorize access to the target
+process' information.
+
+The contents of GTT and VRAM BOs are not automatically saved by CRIU. CRIU can
+only support saving the contents of normal pageable mappings. GTT and VRAM BOs
+are special device file IO mappings. Therefore, our dumper plugin will need to
+save the contents of these BOs. In the initial implementation they can be
+accessed through `/proc/<pid>/mem`. For better performance we can use a DMA
+engine in the GPU to copy the data to system memory.
+
+## Restoring
+
+At the “restore” stage we first need to ensure that the topology of visible
+devices (in the cgroup) is compatible with the topology that was saved. Once
+this is confirmed, we can use a new ioctl to load the saved state back into
+KFD. This ioctl will run in the context of the process being restored, so no
+special authorization is needed. However, some of the data being copied back
+into kernel mode could have been tampered with. MQDs and control stacks provide
+access to privileged GPU registers. Therefore, the restore ioctl will only be
+allowed to run with root privileges.
+
+## Remapping render nodes and mmap offsets
+
+BOs are mapped for CPU access by mmapping the GPU's render node at a specific
+offset. The offset within the render node device file identifies the BO.
+However, when we recreate the BOs, we cannot guarantee that they will be
+restored with the same mmap offset that was saved, because the mmap offset
+address space per device is shared system wide.
+
+When a process is restored on a different GPU, it will need to map the BOs from
+a different render node device file altogether.
+
+A new plugin call will be needed to translate device file names and mmap
+offsets to the newly allocated ones, before CRIU's PIE code restores the VMA
+mappings. Fortunately, ROCm user mode does not remember the file names and mmap
+offsets after establishing the mappings, so changing the device files and mmap
+offsets under the hood will not be noticed by ROCm user mode.
+
+*This new plugin is enabled by the new hook `__UPDATE_VMA_MAP` in our RFC patch
+series.*
+
+## Resuming GPU execution
+
+At the time of running the `cr_plugin_restore_file` plugin, it is too early to
+restore userptr GPU page table mappings and their MMU notifiers. These mappings
+mirror CPU page tables into GPU page tables using the HMM mirror API in the
+kernel. The MMU notifiers notify the driver when the virtual address mapping
+changes so that the GPU mapping can be updated.
+
+This needs to happen after the restorer PIE code has restored all the VMAs at
+their correct virtual addresses. Otherwise, the HMM mirroring will simply fail.
+Before all the GPU memory mappings are in place, it is also too early to resume
+the user mode queue execution on the GPUs.
+
+Therefore, a new plugin is needed that runs in the context of the master
+restore process after the restorer PIE code has restored all the VMAs and
+returned control to all the restored processes via sigreturn. It needs to be
+called once for each restored target process to finalize userptr mappings and
+to resume execution on the GPUs.
+
+*This new plugin is enabled by the new hook `__RESUME_DEVICES_LATE` in our RFC
+patch series.*
+
+## Other CRIU changes
+
+In addition to the new plugins, we need to make some changes to CRIU itself to
+support device file VMAs. Currently CRIU will simply fail to dump a process
+that has such PFN or IO memory mappings. While CRIU will not need to save the
+contents of those VMAs, we do need CRIU to save and restore the VMAs
+themselves, with translated mmap offsets (see “Remapping mmap offsets” above).
+
+## Security considerations
+
+The new “dump” ioctl we are adding to `/dev/kfd` will expose information about
+remote processes. This is a potential security threat. CRIU will be
+ptrace-attached to the target process, which gives it full access to the state
+of the process being dumped. KFD can use ptrace attachment to authorize the use
+of the new ioctl on a specific target process.
+
+The new “restore” ioctl will load privileged information from user mode back
+into the kernel driver and the hardware. This includes MQD contents, which will
+eventually be loaded into HQD registers, as well as a control stack, which is a
+series of low-level commands that will be executed by the command processor.
+Therefore, we are limiting this ioctl to the root user. If CRIU restore must be
+possible for non-root users, we need to sanitize the privileged state to ensure
+it cannot be used to circumvent system security policies (e.g. arbitrary code
+execution in privileged contexts with access to page tables etc.).
+
+Modified mmap offsets could potentially be used to access BOs belonging to
+different processes. This potential threat is not new with CRIU. `amdgpu.ko`
+already implements checking of mmap offsets to ensure a context (represented by
+a render node file descriptor) is only allowed access to its own BOs.
+
+# Glossary
+
+Term | Definition
+--- | ---
+CRIU | Checkpoint/Restore In Userspace
+ROCm | Radeon Open Compute Platform
+Thunk | User-mode API interface  to interact with amdgpu.ko
+KFD | AMD Kernel Fusion Driver
+Mesa | Open source OpenGL implementation
+GTT | Graphis Translation Table, also used to denote kernel-managed system memory for GPU access
+VRAM | Video RAM
+BO | Buffer Object
+HMM | Heterogenous Memory Management
+AQL | Architected Queueing Language
+EOP | End of pipe (event indicating shader dispatch completion)
+MQD | Memory Queue Descriptors
+HQD | Hardware Queue Descriptors
+PIE | Position Independent Executable

From 55370b720e67da5d950413bbc6283248e0e63bda Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Mon, 25 Oct 2021 13:57:12 -0400
Subject: [PATCH 0927/1854] criu/plugin: Store BO contents directly to file

Store BO contents directly to file (1 per GPU) instead of using
protobuf.

Bug Fix:
Fixes an issue where we could not handle BOs bigger than 4GB because
protobuf has an internal limit of 4GB for the Bytes structure.

Performance Improvements:
This significantly reduces CR duration on multi-GPU systems as it allows
reading and writing to disk in parallel. During checkpoint, instead of
waiting for all the BO contents to be read from the one protobuf file,
we can now start writing the BO contents as soon as the first BO is read
from disk. During restore, we can start writing BO contents to disk
after the first BO from VRAM. This also reduces the peak amount of
system memory used as we only need to keep 1 BO content in memory per
GPU at a time instead of all the BO contents.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 Documentation/amdgpu_plugin.txt  |   1 +
 plugins/amdgpu/amdgpu_plugin.c   | 208 +++++++++++++++++++------------
 plugins/amdgpu/criu-amdgpu.proto |   1 -
 3 files changed, 126 insertions(+), 84 deletions(-)

diff --git a/Documentation/amdgpu_plugin.txt b/Documentation/amdgpu_plugin.txt
index cdc614bbf..218d0f751 100644
--- a/Documentation/amdgpu_plugin.txt
+++ b/Documentation/amdgpu_plugin.txt
@@ -13,6 +13,7 @@ Single and Multi GPU systems (Gfx9)
 Checkpoint / Restore on different system
 Checkpoint / Restore inside a docker container
 Pytorch
+Tensorflow
 
 DESCRIPTION
 -----------
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 13fb80aa2..f9337e942 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -42,6 +42,10 @@
 #define KFD_IOCTL_MAJOR_VERSION	    1
 #define MIN_KFD_IOCTL_MINOR_VERSION 8
 
+#define IMG_KFD_FILE	 "amdgpu-kfd-%d.img"
+#define IMG_RENDERD_FILE "amdgpu-renderD-%d.img"
+#define IMG_PAGES_FILE	 "amdgpu-pages-%d-%04x.img"
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
@@ -101,11 +105,34 @@ extern bool kfd_capability_check;
 
 /**************************************************************************************************/
 
+int write_fp(FILE *fp, const void *buf, const size_t buf_len)
+{
+	size_t len_write;
+
+	len_write = fwrite(buf, 1, buf_len, fp);
+	if (len_write != buf_len) {
+		pr_perror("Unable to write file (wrote:%ld buf_len:%ld)", len_write, buf_len);
+		return -EIO;
+	}
+	return 0;
+}
+
+int read_fp(FILE *fp, void *buf, const size_t buf_len)
+{
+	size_t len_read;
+
+	len_read = fread(buf, 1, buf_len, fp);
+	if (len_read != buf_len) {
+		pr_perror("Unable to read file (read:%ld buf_len:%ld)", len_read, buf_len);
+		return -EIO;
+	}
+	return 0;
+}
+
 int write_file(const char *file_path, const void *buf, const size_t buf_len)
 {
-	int fd;
+	int fd, ret;
 	FILE *fp;
-	size_t len_wrote;
 
 	fd = openat(criu_get_image_dir(), file_path, O_WRONLY | O_CREAT, 0600);
 	if (fd < 0) {
@@ -119,24 +146,15 @@ int write_file(const char *file_path, const void *buf, const size_t buf_len)
 		return -errno;
 	}
 
-	len_wrote = fwrite(buf, 1, buf_len, fp);
-	if (len_wrote != buf_len) {
-		pr_perror("Unable to write %s (wrote:%ld buf_len:%ld)", file_path, len_wrote, buf_len);
-		fclose(fp);
-		return -EIO;
-	}
-
-	pr_info("Wrote file:%s (%ld bytes)\n", file_path, buf_len);
-	/* this will also close fd */
-	fclose(fp);
-	return 0;
+	ret = write_fp(fp, buf, buf_len);
+	fclose(fp); /* this will also close fd */
+	return ret;
 }
 
 int read_file(const char *file_path, void *buf, const size_t buf_len)
 {
-	int fd;
+	int fd, ret;
 	FILE *fp;
-	size_t len_read;
 
 	fd = openat(criu_get_image_dir(), file_path, O_RDONLY);
 	if (fd < 0) {
@@ -150,18 +168,9 @@ int read_file(const char *file_path, void *buf, const size_t buf_len)
 		return -errno;
 	}
 
-	len_read = fread(buf, 1, buf_len, fp);
-	if (len_read != buf_len) {
-		pr_perror("Unable to read %s", file_path);
-		fclose(fp);
-		return -EIO;
-	}
-
-	pr_info("Read file:%s (%ld bytes)\n", file_path, buf_len);
-
-	/* this will also close fd */
-	fclose(fp);
-	return 0;
+	ret = read_fp(fp, buf, buf_len);
+	fclose(fp); /* this will also close fd */
+	return ret;
 }
 
 /* Call ioctl, restarting if it is interrupted */
@@ -184,12 +193,8 @@ int kmtIoctl(int fd, unsigned long request, void *arg)
 static void free_e(CriuKfd *e)
 {
 	for (int i = 0; i < e->n_bo_entries; i++) {
-		if (e->bo_entries[i]) {
-			if (e->bo_entries[i]->rawdata.data)
-				xfree(e->bo_entries[i]->rawdata.data);
-
+		if (e->bo_entries[i])
 			xfree(e->bo_entries[i]);
-		}
 	}
 
 	for (int i = 0; i < e->n_device_entries; i++) {
@@ -245,12 +250,6 @@ static int allocate_bo_entries(CriuKfd *e, int num_bos, struct kfd_criu_bo_bucke
 
 		bo_entry__init(entry);
 
-		if ((bo_bucket_ptr)[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM ||
-		    (bo_bucket_ptr)[i].alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {
-			entry->rawdata.data = xmalloc((bo_bucket_ptr)[i].size);
-			entry->rawdata.len = (bo_bucket_ptr)[i].size;
-		}
-
 		e->bo_entries[i] = entry;
 		e->n_bo_entries++;
 	}
@@ -455,6 +454,7 @@ struct thread_data {
 	BoEntry **bo_entries;
 	int drm_fd;
 	int ret;
+	int id; /* File ID used by CRIU to identify KFD image for this process */
 };
 
 int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
@@ -557,7 +557,7 @@ void free_and_unmap(uint64_t size, amdgpu_bo_handle h_bo, amdgpu_va_handle h_va,
 	amdgpu_bo_free(h_bo);
 }
 
-int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, BoEntry **bo_info_test, int i, amdgpu_device_handle h_dev,
+int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, void *userptr, int i, amdgpu_device_handle h_dev,
 		 uint64_t max_copy_size, enum sdma_op_type type)
 {
 	uint64_t size, gpu_addr_src, gpu_addr_dest, gpu_addr_ib;
@@ -574,7 +574,6 @@ int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, BoEntry **bo_info_test,
 	struct amdgpu_cs_fence fence;
 	uint32_t expired;
 	amdgpu_context_handle h_ctx;
-	void *userptr = NULL;
 	uint32_t *ib = NULL;
 	int err, shared_fd;
 
@@ -586,20 +585,9 @@ int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, BoEntry **bo_info_test,
 	/* prepare src buffer */
 	switch (type) {
 	case SDMA_OP_VRAM_WRITE:
-		/* create the userptr BO and prepare the src buffer */
-		posix_memalign(&userptr, sysconf(_SC_PAGE_SIZE), size);
-		if (!userptr) {
-			pr_perror("failed to alloc memory for userptr");
-			return -ENOMEM;
-		}
-
-		memcpy(userptr, bo_info_test[i]->rawdata.data, size);
-		plugin_log_msg("data copied to userptr from protobuf buffer\n");
-
 		err = amdgpu_create_bo_from_user_mem(h_dev, userptr, size, &h_bo_src);
 		if (err) {
 			pr_perror("failed to create userptr for sdma");
-			free(userptr);
 			return -EFAULT;
 		}
 
@@ -644,16 +632,9 @@ int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, BoEntry **bo_info_test,
 		break;
 
 	case SDMA_OP_VRAM_READ:
-		posix_memalign(&userptr, sysconf(_SC_PAGE_SIZE), size);
-		if (!userptr) {
-			pr_perror("failed to alloc memory for userptr");
-			goto err_dest_bo_prep;
-		}
-		memset(userptr, 0, size);
 		err = amdgpu_create_bo_from_user_mem(h_dev, userptr, size, &h_bo_dest);
 		if (err) {
 			pr_perror("failed to create userptr for sdma");
-			free(userptr);
 			goto err_dest_bo_prep;
 		}
 		break;
@@ -774,11 +755,6 @@ int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, BoEntry **bo_info_test,
 
 	plugin_log_msg("done querying fence status\n");
 
-	if (type == SDMA_OP_VRAM_READ) {
-		memcpy(bo_info_test[i]->rawdata.data, userptr, size);
-		plugin_log_msg("data copied to protobuf buffer\n");
-	}
-
 err_cs_submit_ib:
 	amdgpu_cs_ctx_free(h_ctx);
 err_ctx:
@@ -798,11 +774,6 @@ err_dest_va:
 	if (err)
 		pr_perror("dest bo free failed");
 
-	if (userptr && (type == SDMA_OP_VRAM_READ)) {
-		free(userptr);
-		userptr = NULL;
-	}
-
 err_dest_bo_prep:
 	err = amdgpu_bo_va_op(h_bo_src, 0, size, gpu_addr_src, 0, AMDGPU_VA_OP_UNMAP);
 	if (err)
@@ -816,11 +787,6 @@ err_src_va:
 	if (err)
 		pr_perror("src bo free failed");
 
-	if (userptr && (type == SDMA_OP_VRAM_WRITE)) {
-		free(userptr);
-		userptr = NULL;
-	}
-
 	plugin_log_msg("Leaving sdma_copy_bo, err = %d\n", err);
 	return err;
 }
@@ -836,6 +802,10 @@ void *dump_bo_contents(void *_thread_data)
 	uint32_t major, minor;
 	int num_bos = 0;
 	int i, ret = 0;
+	FILE *bo_contents_fp = NULL;
+	void *buffer;
+	char img_path[40];
+	size_t max_bo_size = 0;
 
 	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
 
@@ -855,6 +825,30 @@ void *dump_bo_contents(void *_thread_data)
 	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
 									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
+	for (i = 0; i < thread_data->num_of_bos; i++) {
+		if (bo_buckets[i].gpu_id == thread_data->gpu_id &&
+		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) &&
+		    bo_buckets[i].size > max_bo_size) {
+			max_bo_size = bo_buckets[i].size;
+		}
+	}
+
+	/* Allocate buffer to fit biggest BO */
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), max_bo_size);
+	if (!buffer) {
+		pr_perror("Failed to alloc aligned memory");
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
+	bo_contents_fp = fopen(img_path, "w");
+	if (!bo_contents_fp) {
+		pr_perror("Cannot fopen %s", img_path);
+		ret = -EIO;
+		goto exit;
+	}
+
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id != thread_data->gpu_id)
 			continue;
@@ -865,17 +859,25 @@ void *dump_bo_contents(void *_thread_data)
 		num_bos++;
 
 		/* perform sDMA based vram copy */
-		ret = sdma_copy_bo(bo_buckets, bo_info, i, h_dev, max_copy_size, SDMA_OP_VRAM_READ);
+		ret = sdma_copy_bo(bo_buckets, buffer, i, h_dev, max_copy_size, SDMA_OP_VRAM_READ);
 		if (ret) {
 			pr_err("Failed to drain the BO using sDMA: bo_buckets[%d]\n", i);
 			break;
 		}
 		plugin_log_msg("** Successfully drained the BO using sDMA: bo_buckets[%d] **\n", i);
+		ret = write_fp(bo_contents_fp, buffer, bo_info[i]->size);
+		if (ret)
+			break;
 	}
 
 exit:
 	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
 
+	if (bo_contents_fp)
+		fclose(bo_contents_fp);
+
+	xfree(buffer);
+
 	amdgpu_device_deinitialize(h_dev);
 
 	thread_data->ret = ret;
@@ -891,6 +893,10 @@ void *restore_bo_contents(void *_thread_data)
 	amdgpu_device_handle h_dev;
 	uint64_t max_copy_size;
 	uint32_t major, minor;
+	FILE *bo_contents_fp = NULL;
+	size_t max_bo_size = 0;
+	void *buffer;
+	char img_path[40];
 	int num_bos = 0;
 	int i, ret = 0;
 
@@ -912,6 +918,31 @@ void *restore_bo_contents(void *_thread_data)
 	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
 									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
+	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
+	bo_contents_fp = fopen(img_path, "r");
+	if (!bo_contents_fp) {
+		pr_perror("Cannot fopen %s", img_path);
+		ret = -errno;
+		goto exit;
+	}
+
+	/* Allocate buffer to fit biggest BO */
+	for (i = 0; i < thread_data->num_of_bos; i++) {
+		if (bo_buckets[i].gpu_id == thread_data->gpu_id &&
+		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) &&
+		    bo_buckets[i].size > max_bo_size) {
+			max_bo_size = bo_buckets[i].size;
+		}
+	}
+
+	/* Allocate buffer to fit biggest BO */
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), max_bo_size);
+	if (!buffer) {
+		pr_perror("Failed to alloc aligned memory");
+		ret = -ENOMEM;
+		goto exit;
+	}
+
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id != thread_data->gpu_id)
 			continue;
@@ -921,7 +952,11 @@ void *restore_bo_contents(void *_thread_data)
 
 		num_bos++;
 
-		ret = sdma_copy_bo(bo_buckets, bo_info, i, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+		ret = read_fp(bo_contents_fp, buffer, bo_info[i]->size);
+		if (ret)
+			goto exit;
+
+		ret = sdma_copy_bo(bo_buckets, buffer, i, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
 		if (ret) {
 			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
 			break;
@@ -932,6 +967,11 @@ void *restore_bo_contents(void *_thread_data)
 exit:
 	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
 
+	if (bo_contents_fp)
+		fclose(bo_contents_fp);
+
+	xfree(buffer);
+
 	amdgpu_device_deinitialize(h_dev);
 	thread_data->ret = ret;
 	return NULL;
@@ -1059,7 +1099,7 @@ exit:
 	return ret;
 }
 
-static int save_bos(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
+static int save_bos(int id, int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
 	struct thread_data *thread_datas;
 	int ret = 0, i;
@@ -1098,6 +1138,7 @@ static int save_bos(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_bo
 			goto exit;
 		}
 
+		thread_datas[i].id = id;
 		thread_datas[i].gpu_id = dev->gpu_id;
 		thread_datas[i].bo_buckets = bo_buckets;
 		thread_datas[i].bo_entries = e->bo_entries;
@@ -1236,7 +1277,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 
 		criu_render_node__pack(&rd, buf);
 
-		snprintf(img_path, sizeof(img_path), "amdgpu-renderD-%d.img", id);
+		snprintf(img_path, sizeof(img_path), IMG_RENDERD_FILE, id);
 		ret = write_file(img_path, buf, len);
 		if (ret) {
 			xfree(buf);
@@ -1307,7 +1348,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	if (ret)
 		goto exit;
 
-	ret = save_bos(fd, &args, (struct kfd_criu_bo_bucket *)args.bos, e);
+	ret = save_bos(id, fd, &args, (struct kfd_criu_bo_bucket *)args.bos, e);
 	if (ret)
 		goto exit;
 
@@ -1320,7 +1361,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	if (ret)
 		goto exit;
 
-	snprintf(img_path, sizeof(img_path), "amdgpu-kfd-%d.img", id);
+	snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
 	pr_info("amdgpu_plugin: img_path = %s\n", img_path);
 
 	len = criu_kfd__get_packed_size(e);
@@ -1442,7 +1483,7 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 	return 0;
 }
 
-static int restore_bo_data(struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
+static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
 	struct thread_data *thread_datas;
 	int thread_i, ret = 0;
@@ -1514,6 +1555,7 @@ static int restore_bo_data(struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 			goto exit;
 		}
 
+		thread_datas[thread_i].id = id;
 		thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
 		thread_datas[thread_i].bo_buckets = bo_buckets;
 		thread_datas[thread_i].bo_entries = e->bo_entries;
@@ -1567,7 +1609,7 @@ int amdgpu_plugin_restore_file(int id)
 
 	pr_info("amdgpu_plugin: Initialized kfd plugin restorer with ID = %d\n", id);
 
-	snprintf(img_path, sizeof(img_path), "amdgpu-kfd-%d.img", id);
+	snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
 
 	if (stat(img_path, &filestat) == -1) {
 		struct tp_node *tp_node;
@@ -1579,7 +1621,7 @@ int amdgpu_plugin_restore_file(int id)
 		 * TODO: Currently, this code will only work if this function is called for /dev/kfd
 		 * first as we assume restore_maps is already filled. Need to fix this later.
 		 */
-		snprintf(img_path, sizeof(img_path), "renderDXXX.%d.img", id);
+		snprintf(img_path, sizeof(img_path), IMG_RENDERD_FILE, id);
 
 		if (stat(img_path, &filestat) == -1) {
 			pr_perror("Failed to read file stats");
@@ -1722,7 +1764,7 @@ int amdgpu_plugin_restore_file(int id)
 		goto exit;
 	}
 
-	ret = restore_bo_data((struct kfd_criu_bo_bucket *)args.bos, e);
+	ret = restore_bo_data(id, (struct kfd_criu_bo_bucket *)args.bos, e);
 	if (ret)
 		goto exit;
 
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index ae11b5867..81d00d3ff 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -46,7 +46,6 @@ message bo_entry {
 	required uint64	offset = 3;
 	required uint32 alloc_flags = 4;
 	required uint32 gpu_id = 5;
-	required bytes rawdata = 6;
 }
 
 message criu_kfd {

From 87d37351453c186515625ea435deea26d3254814 Mon Sep 17 00:00:00 2001
From: David Yat Sin <david.yatsin@amd.com>
Date: Wed, 27 Oct 2021 23:26:33 -0400
Subject: [PATCH 0928/1854] criu/plugin: Add support for criu image streamer

Modifications to support criu image streamer when using amdgpu_plugin.
When running with criu image streamer, fseek/lseek is not available so
we store the file size in the first 8-bytes of the actual file.

Signed-off-by: David Yat Sin <david.yatsin@amd.com>
---
 Documentation/amdgpu_plugin.txt |   1 +
 plugins/amdgpu/amdgpu_plugin.c  | 164 ++++++++++++++++++++++----------
 2 files changed, 117 insertions(+), 48 deletions(-)

diff --git a/Documentation/amdgpu_plugin.txt b/Documentation/amdgpu_plugin.txt
index 218d0f751..0d490b429 100644
--- a/Documentation/amdgpu_plugin.txt
+++ b/Documentation/amdgpu_plugin.txt
@@ -14,6 +14,7 @@ Checkpoint / Restore on different system
 Checkpoint / Restore inside a docker container
 Pytorch
 Tensorflow
+Using CRIU Image Streamer
 
 DESCRIPTION
 -----------
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index f9337e942..e48c8988b 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -32,6 +32,10 @@
 #include "common/list.h"
 #include "amdgpu_plugin_topology.h"
 
+#include "img-streamer.h"
+#include "image.h"
+#include "cr_options.h"
+
 #define AMDGPU_KFD_DEVICE "/dev/kfd"
 #define PROCPIDMEM	  "/proc/%d/mem"
 #define HSAKMT_SHM_PATH	  "/dev/shm/hsakmt_shared_mem"
@@ -129,23 +133,75 @@ int read_fp(FILE *fp, void *buf, const size_t buf_len)
 	return 0;
 }
 
-int write_file(const char *file_path, const void *buf, const size_t buf_len)
+/**
+ * @brief Open an image file
+ *
+ * We store the size of the actual contents in the first 8-bytes of the file. This allows us to
+ * determine the file size when using criu_image_streamer when fseek and fstat are not available.
+ * The FILE * returned is already at the location of the first actual contents.
+ *
+ * @param path The file path
+ * @param write False for read, true for write
+ * @param size Size of actual contents
+ * @return FILE *if successful, NULL if failed
+ */
+FILE *open_img_file(char *path, bool write, size_t *size)
 {
+	FILE *fp = NULL;
 	int fd, ret;
-	FILE *fp;
 
-	fd = openat(criu_get_image_dir(), file_path, O_WRONLY | O_CREAT, 0600);
+	if (opts.stream)
+		fd = img_streamer_open(path, write ? O_DUMP : O_RSTR);
+	else
+		fd = openat(criu_get_image_dir(), path, write ? (O_WRONLY | O_CREAT) : O_RDONLY, 0600);
+
 	if (fd < 0) {
-		pr_perror("Cannot open %s", file_path);
-		return -errno;
+		pr_perror("%s: Failed to open for %s", path, write ? "write" : "read");
+		return NULL;
 	}
 
-	fp = fdopen(fd, "w");
+	fp = fdopen(fd, write ? "w" : "r");
 	if (!fp) {
-		pr_perror("Cannot fdopen %s", file_path);
-		return -errno;
+		pr_perror("%s: Failed get pointer for %s", path, write ? "write" : "read");
+		return NULL;
 	}
 
+	if (write)
+		ret = write_fp(fp, size, sizeof(*size));
+	else
+		ret = read_fp(fp, size, sizeof(*size));
+
+	if (ret) {
+		pr_perror("%s:Failed to access file size", path);
+		fclose(fp);
+		return NULL;
+	}
+
+	pr_debug("%s:Opened file for %s with size:%ld\n", path, write ? "write" : "read", *size);
+	return fp;
+}
+
+/**
+ * @brief Write an image file
+ *
+ * We store the size of the actual contents in the first 8-bytes of the file. This allows us to
+ * determine the file size when using criu_image_streamer when fseek and fstat are not available.
+ *
+ * @param path The file path
+ * @param buf pointer to data to be written
+ * @param buf_len size of buf
+ * @return 0 if successful. -errno on failure
+ */
+int write_img_file(char *path, const void *buf, const size_t buf_len)
+{
+	int ret;
+	FILE *fp;
+	size_t len = buf_len;
+
+	fp = open_img_file(path, true, &len);
+	if (!fp)
+		return -errno;
+
 	ret = write_fp(fp, buf, buf_len);
 	fclose(fp); /* this will also close fd */
 	return ret;
@@ -153,18 +209,12 @@ int write_file(const char *file_path, const void *buf, const size_t buf_len)
 
 int read_file(const char *file_path, void *buf, const size_t buf_len)
 {
-	int fd, ret;
+	int ret;
 	FILE *fp;
 
-	fd = openat(criu_get_image_dir(), file_path, O_RDONLY);
-	if (fd < 0) {
-		pr_perror("Cannot open %s", file_path);
-		return -errno;
-	}
-
-	fp = fdopen(fd, "r");
+	fp = fopen(file_path, "r");
 	if (!fp) {
-		pr_perror("Cannot fdopen %s", file_path);
+		pr_perror("Cannot fopen %s", file_path);
 		return -errno;
 	}
 
@@ -798,6 +848,7 @@ void *dump_bo_contents(void *_thread_data)
 	BoEntry **bo_info = thread_data->bo_entries;
 	struct amdgpu_gpu_info gpu_info = { 0 };
 	amdgpu_device_handle h_dev;
+	size_t max_bo_size = 0, image_size = 0;
 	uint64_t max_copy_size;
 	uint32_t major, minor;
 	int num_bos = 0;
@@ -805,7 +856,6 @@ void *dump_bo_contents(void *_thread_data)
 	FILE *bo_contents_fp = NULL;
 	void *buffer;
 	char img_path[40];
-	size_t max_bo_size = 0;
 
 	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
 
@@ -827,9 +877,10 @@ void *dump_bo_contents(void *_thread_data)
 
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id == thread_data->gpu_id &&
-		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) &&
-		    bo_buckets[i].size > max_bo_size) {
-			max_bo_size = bo_buckets[i].size;
+		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT))) {
+			image_size += bo_buckets[i].size;
+			if (bo_buckets[i].size > max_bo_size)
+				max_bo_size = bo_buckets[i].size;
 		}
 	}
 
@@ -842,7 +893,7 @@ void *dump_bo_contents(void *_thread_data)
 	}
 
 	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
-	bo_contents_fp = fopen(img_path, "w");
+	bo_contents_fp = open_img_file(img_path, true, &image_size);
 	if (!bo_contents_fp) {
 		pr_perror("Cannot fopen %s", img_path);
 		ret = -EIO;
@@ -888,13 +939,13 @@ void *restore_bo_contents(void *_thread_data)
 {
 	struct thread_data *thread_data = (struct thread_data *)_thread_data;
 	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
+	size_t image_size = 0, total_bo_size = 0, max_bo_size = 0;
 	BoEntry **bo_info = thread_data->bo_entries;
 	struct amdgpu_gpu_info gpu_info = { 0 };
 	amdgpu_device_handle h_dev;
 	uint64_t max_copy_size;
 	uint32_t major, minor;
 	FILE *bo_contents_fp = NULL;
-	size_t max_bo_size = 0;
 	void *buffer;
 	char img_path[40];
 	int num_bos = 0;
@@ -919,7 +970,7 @@ void *restore_bo_contents(void *_thread_data)
 									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
 	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
-	bo_contents_fp = fopen(img_path, "r");
+	bo_contents_fp = open_img_file(img_path, false, &image_size);
 	if (!bo_contents_fp) {
 		pr_perror("Cannot fopen %s", img_path);
 		ret = -errno;
@@ -929,12 +980,22 @@ void *restore_bo_contents(void *_thread_data)
 	/* Allocate buffer to fit biggest BO */
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id == thread_data->gpu_id &&
-		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) &&
-		    bo_buckets[i].size > max_bo_size) {
-			max_bo_size = bo_buckets[i].size;
+		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT))) {
+			total_bo_size += bo_buckets[i].size;
+
+			if (bo_buckets[i].size > max_bo_size)
+				max_bo_size = bo_buckets[i].size;
 		}
 	}
 
+	if (total_bo_size != image_size) {
+		pr_err("amdgpu_plugin: %s size mismatch (current:%ld:expected:%ld)\n", img_path, image_size,
+		       total_bo_size);
+
+		ret = -EINVAL;
+		goto exit;
+	}
+
 	/* Allocate buffer to fit biggest BO */
 	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), max_bo_size);
 	if (!buffer) {
@@ -1278,7 +1339,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		criu_render_node__pack(&rd, buf);
 
 		snprintf(img_path, sizeof(img_path), IMG_RENDERD_FILE, id);
-		ret = write_file(img_path, buf, len);
+		ret = write_img_file(img_path, buf, len);
 		if (ret) {
 			xfree(buf);
 			return ret;
@@ -1377,7 +1438,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 
 	criu_kfd__pack(e, buf);
 
-	ret = write_file(img_path, buf, len);
+	ret = write_img_file(img_path, buf, len);
 
 	xfree(buf);
 exit:
@@ -1601,52 +1662,56 @@ int amdgpu_plugin_restore_file(int id)
 {
 	int ret = 0, fd;
 	char img_path[PATH_MAX];
-	struct stat filestat;
 	unsigned char *buf;
 	CriuRenderNode *rd;
 	CriuKfd *e = NULL;
 	struct kfd_ioctl_criu_args args = { 0 };
+	size_t img_size;
+	FILE *img_fp = NULL;
 
 	pr_info("amdgpu_plugin: Initialized kfd plugin restorer with ID = %d\n", id);
 
 	snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
 
-	if (stat(img_path, &filestat) == -1) {
+	img_fp = open_img_file(img_path, false, &img_size);
+	if (!img_fp) {
 		struct tp_node *tp_node;
 		uint32_t target_gpu_id;
 
-		pr_perror("open(%s)", img_path);
 		/* This is restorer plugin for renderD nodes. Criu doesn't guarantee that they will
 		 * be called before the plugin is called for kfd file descriptor.
 		 * TODO: Currently, this code will only work if this function is called for /dev/kfd
 		 * first as we assume restore_maps is already filled. Need to fix this later.
 		 */
 		snprintf(img_path, sizeof(img_path), IMG_RENDERD_FILE, id);
+		pr_info("Restoring RenderD %s\n", img_path);
 
-		if (stat(img_path, &filestat) == -1) {
-			pr_perror("Failed to read file stats");
-			return -1;
-		}
-		pr_info("renderD file size on disk = %ld\n", filestat.st_size);
+		img_fp = open_img_file(img_path, false, &img_size);
+		if (!img_fp)
+			return -EINVAL;
 
-		buf = xmalloc(filestat.st_size);
+		pr_debug("RenderD Image file size:%ld\n", img_size);
+		buf = xmalloc(img_size);
 		if (!buf) {
 			pr_perror("Failed to allocate memory");
 			return -ENOMEM;
 		}
 
-		if (read_file(img_path, buf, filestat.st_size)) {
+		ret = read_fp(img_fp, buf, img_size);
+		if (ret) {
 			pr_perror("Unable to read from %s", img_path);
 			xfree(buf);
 			return -1;
 		}
 
-		rd = criu_render_node__unpack(NULL, filestat.st_size, buf);
+		rd = criu_render_node__unpack(NULL, img_size, buf);
 		if (rd == NULL) {
-			pr_perror("Unable to parse the KFD message %d", id);
+			pr_perror("Unable to parse the RenderD message %d", id);
 			xfree(buf);
+			fclose(img_fp);
 			return -1;
 		}
+		fclose(img_fp);
 
 		pr_info("amdgpu_plugin: render node gpu_id = 0x%04x\n", rd->gpu_id);
 
@@ -1689,23 +1754,26 @@ int amdgpu_plugin_restore_file(int id)
 
 	pr_info("amdgpu_plugin: Opened kfd, fd = %d\n", fd);
 
-	pr_info("kfd img file size on disk = %ld\n", filestat.st_size);
-
 	if (!kernel_supports_criu(fd))
 		return -ENOTSUP;
 
-	buf = xmalloc(filestat.st_size);
+	pr_info("KFD Image file size:%ld\n", img_size);
+	buf = xmalloc(img_size);
 	if (!buf) {
-		pr_perror("Failed to allocate memory");
+		fclose(img_fp);
 		return -ENOMEM;
 	}
 
-	if (read_file(img_path, buf, filestat.st_size)) {
+	ret = read_fp(img_fp, buf, img_size);
+	if (ret) {
 		pr_perror("Unable to read from %s", img_path);
+		fclose(img_fp);
 		xfree(buf);
-		return -1;
+		return ret;
 	}
-	e = criu_kfd__unpack(NULL, filestat.st_size, buf);
+
+	fclose(img_fp);
+	e = criu_kfd__unpack(NULL, img_size, buf);
 	if (e == NULL) {
 		pr_err("Unable to parse the KFD message %#x\n", id);
 		xfree(buf);

From 9e747351607e82ffb541bc0d3be9646b0a150c1c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 11 Mar 2022 18:36:55 +0300
Subject: [PATCH 0929/1854] sk-unix: fix e_str leak in unix_sk_id_add

coverity CID 389191:

int unix_sk_id_add(unsigned int ino)
2327{
2328        char *e_str;
2329
    1. alloc_fn: Storage is returned from allocation function malloc.
    2. var_assign: Assigning: ___p = storage returned from malloc(20UL).
    3. Condition !___p, taking false branch.
    4. leaked_storage: Variable ___p going out of scope leaks the storage it points to.
    5. var_assign: Assigning: e_str = ({...; ___p;}).
2330        e_str = xmalloc(20);
    6. Condition !e_str, taking false branch.
2331        if (!e_str)
2332                return -1;
    7. noescape: Resource e_str is not freed or pointed-to in snprintf.
2333        snprintf(e_str, 20, "unix[%u]", ino);
    8. noescape: Resource e_str is not freed or pointed-to in add_external. [show details]
    CID 389191 (#1 of 1): Resource leak (RESOURCE_LEAK)9. leaked_storage: Variable e_str going out of scope leaks the storage it points to.
2334        return add_external(e_str);
2335}

We should free e_str string after we finish it's use in unix_sk_id_add,
easiest way to do it is to use cleanup_free attribute.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 90c9eb11b..b2c2aaca0 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -2325,7 +2325,7 @@ static void try_resolve_unix_peer(struct unix_sk_info *ui)
 
 int unix_sk_id_add(unsigned int ino)
 {
-	char *e_str;
+	cleanup_free char *e_str = NULL;
 
 	e_str = xmalloc(20);
 	if (!e_str)

From 5a8fd343f57c0a38d171c5158e2ffed1980a0978 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 11 Mar 2022 17:31:07 +0300
Subject: [PATCH 0930/1854] uffd: fix __u64 print format specifier

coverity CID 389197:

CID 389197 (#1 of 1): Invalid printf format string (PRINTF_ARGS)
format_error: Length modifier L not applicable to conversion specifier in %Lu. [show details]
284 pr_err("Incompatible uffd API: expected %Lu, got %Lu\n", UFFD_API, uffdio_api.api);

Looking on C11 standard it seems that "%Lu" is undefined, we better not
use this, see:

"L Specifies that a following a, A, e, E, f, F, g, or G conversion
specifier applies to a long double argument."
http://port70.net/~nsz/c/c11/n1570.html#7.21.6.1p7

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/uffd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/uffd.c b/criu/uffd.c
index 45ac8ba77..b551698f8 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -281,7 +281,7 @@ int uffd_open(int flags, unsigned long *features, int *err)
 	}
 
 	if (uffdio_api.api != UFFD_API) {
-		pr_err("Incompatible uffd API: expected %Lu, got %Lu\n", UFFD_API, uffdio_api.api);
+		pr_err("Incompatible uffd API: expected %llu, got %llu\n", UFFD_API, uffdio_api.api);
 		goto close;
 	}
 

From 9649356e3aaf4079e402b10d3dacf479d6311ed0 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 30 Dec 2019 16:17:54 +0300
Subject: [PATCH 0931/1854] zdtm: fix mnt_ext_master test to correspond to it's
 name

Before these change the on-host-"zdtm_auto_ext_mnt" mount with
mountpoint "/tmp/zdtm_ext_auto.XXXXXX" was private/shared depending on
it's parent mount "/tmp". And e.g. on my setup the parent mount on
"/tmp" is private and our "host" mount becomes private too. So
in-container-"zdtm_auto_ext_mnt" external mount is also private but test
name hints it should be slave.

E.g. If I ran mnt_ext_master before this patch, in mnt_ext_master
process mntns we see that our "external" mount is private but not slave:

[root@fedora criu]# grep zdtm_auto_ext_mnt /proc/167077/mountinfo
1239 1238 0:138 /test /ext_mounts rw,relatime - tmpfs zdtm_auto_ext_mnt rw,seclabel,inode64

After this patch:

[root@fedora criu]# grep zdtm_auto_ext_mnt /proc/166385/mountinfo
1239 1238 0:138 /test /ext_mounts rw,relatime master:413 - tmpfs zdtm_auto_ext_mnt rw,seclabel,inode64
                                              ^^^^^^^^^^

So we just explicitly make on-host-"zdtm_auto_ext_mnt" shared, and this
makes in-container-"zdtm_auto_ext_mnt" external mount slave.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/a1a221fe9

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mnt_ext_master.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/zdtm/static/mnt_ext_master.c b/test/zdtm/static/mnt_ext_master.c
index 5fd8fa8b2..dbadef0b8 100644
--- a/test/zdtm/static/mnt_ext_master.c
+++ b/test/zdtm/static/mnt_ext_master.c
@@ -39,6 +39,10 @@ int main(int argc, char **argv)
 		pr_perror("mount");
 		return 1;
 	}
+	if (mount(NULL, dname, NULL, MS_SHARED, NULL)) {
+		pr_perror("shared");
+		return 1;
+	}
 
 	mkdir(src, 755);
 	mkdir(dst, 755);

From eda1e5fdbd6fdf3ccf5063b728073a5c3ea92ed3 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Date: Sun, 12 Apr 2020 20:53:54 +0300
Subject: [PATCH 0932/1854] mount: add mntinfo_add_list_before helper for
 adding to mntinfo list

Use this helper everywhere instead of manually adding mounts to the head
of the list, this way it is much easier to track all places where we do
add to mntinfo list.

Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/7bca9397b

Changes: skip hunk adding root_yard_mp to the list because root yard has
not fully initialized mountinfo structure (can break code which uses
mntinfo fallback in lookup_nsid_by_mnt_id), let's only have real mounts
in mntinfo list. Also skip cr_time mount from mntinfo list for the same
reason.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  3 +++
 criu/mount.c         | 11 +++++++----
 criu/proc_parse.c    |  6 ++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index b959d131c..f180fe58d 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -90,6 +90,9 @@ struct mount_info {
 };
 
 extern struct mount_info *mntinfo;
+
+extern void mntinfo_add_list_before(struct mount_info **head, struct mount_info *new);
+
 extern struct ns_desc mnt_ns_desc;
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 extern int collect_binfmt_misc(void);
diff --git a/criu/mount.c b/criu/mount.c
index c301aaeeb..7035d992a 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -127,6 +127,12 @@ static void mntinfo_add_list(struct mount_info *new)
 	}
 }
 
+void mntinfo_add_list_before(struct mount_info **head, struct mount_info *new)
+{
+	new->next = *head;
+	*head = new;
+}
+
 static struct mount_info *__lookup_overlayfs(struct mount_info *list, char *rpath, unsigned int st_dev,
 					     unsigned int st_ino, unsigned int mnt_id)
 {
@@ -1527,8 +1533,6 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 	mi->nsid = parent->nsid;
 	mi->parent = parent;
 	mi->parent_mnt_id = parent->mnt_id;
-	mi->next = parent->next;
-	parent->next = mi;
 	list_add(&mi->siblings, &parent->children);
 	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n", mi->mountpoint, parent->mountpoint, parent->mnt_id);
 	return 0;
@@ -3015,8 +3019,7 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 			goto err;
 
 		pm->nsid = nsid;
-		pm->next = *head;
-		*head = pm;
+		mntinfo_add_list_before(head, pm);
 		if (!*tail)
 			*tail = pm;
 
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index f7abd4d52..7955d50a6 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1651,10 +1651,8 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 		if (fsname)
 			free(fsname);
 
-		if (new) {
-			new->next = list;
-			list = new;
-		}
+		if (new)
+			mntinfo_add_list_before(&list, new);
 
 		if (ret)
 			goto err;

From e17c1cc1289d66267bbdf95acb9b19ae258cf2a5 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Jan 2020 12:36:08 +0300
Subject: [PATCH 0933/1854] mount: do not detect non-fsroot mounts as
 device-external

Device-external mounts are restored via do_new_mount(), but function
do_new_mount only allows creating mounts with root "/", as it does
simple mount (not bind) without any later root change. Restoring
non-root mounts via do_new_mount is just imposible.

So let's detect mounts as device-external only when they have fsroot
root, all other non-fsroot binds of this device would be restored as
bindmounts of fsroot ones.

This is a cosmetic change as though non-root mounts were detected as
device-external before this patch they anyway would not be created with
do_new_mount() because of fsroot/bind check in can_mount_now orders them
to be restored as binds.

Cherry-picked one hunk from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/afd899539

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 7035d992a..7c42c1fc9 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -476,7 +476,7 @@ static int try_resolve_ext_mount(struct mount_info *info)
 
 	snprintf(devstr, sizeof(devstr), "dev[%d/%d]", kdev_major(info->s_dev), kdev_minor(info->s_dev));
 
-	if (info->fstype->code == FSTYPE__UNSUPPORTED) {
+	if (info->fstype->code == FSTYPE__UNSUPPORTED && fsroot_mounted(info)) {
 		char *val;
 
 		val = external_lookup_by_key(devstr);

From 8d5300aa9baac565b9020d920d3db2b681096317 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 16 Sep 2019 18:07:32 +0300
Subject: [PATCH 0934/1854] mount: mark mounts of external devices external

Previously only autodetected and mountpoint external mounts had
mount_info->external field set, let's fix this injustice so that we can
operate all external mounts in a similar manner.

Also:

Print info message when device external mount is detected similar to
mountpoint external mounts detection.

Add helper mnt_is_nodev_external to let do_mount_one, can_mount_now and
do_bind_mount handle device external mounts separately as it was before.

Handle device external mount right in get_mp_root to set ->external on
restore. (note: calling ext_mount_lookup is only meaningfull for
mountpoint external mounts)

Add helper mnt_is_dev_external to use in resolve_source to make it more
clear that it is a device external mount restore path.

All other "if (mi->external)" checks now also handle device external
mounts, but they all look safe to do so and could've done it initially,
here is a list: fusectl_dump, mnt_is_external, dump_one_mountpoint,
propagate_mount.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/afd899539

Changes: cleanup commit message, add some helpers.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h | 19 +++++++++++++++++++
 criu/mount.c         | 42 ++++++++++++++++++++++++++----------------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index f180fe58d..b49b55f3f 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -93,6 +93,25 @@ extern struct mount_info *mntinfo;
 
 extern void mntinfo_add_list_before(struct mount_info **head, struct mount_info *new);
 
+/*
+ * Put a : in here since those are invalid on
+ * the cli, so we know it's autogenerated in
+ * debugging.
+ */
+#define AUTODETECTED_MOUNT "CRIU:AUTOGENERATED"
+#define EXTERNAL_DEV_MOUNT "CRIU:EXTERNAL_DEV"
+#define NO_ROOT_MOUNT	   "CRIU:NO_ROOT"
+
+static inline bool mnt_is_dev_external(struct mount_info *mi)
+{
+	return mi->external && !strcmp(mi->external, EXTERNAL_DEV_MOUNT);
+}
+
+static inline bool mnt_is_nodev_external(struct mount_info *mi)
+{
+	return mi->external && strcmp(mi->external, EXTERNAL_DEV_MOUNT);
+}
+
 extern struct ns_desc mnt_ns_desc;
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 extern int collect_binfmt_misc(void);
diff --git a/criu/mount.c b/criu/mount.c
index 7c42c1fc9..9fea5f395 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -31,14 +31,7 @@
 
 #include "images/mnt.pb-c.h"
 
-/*
- * Put a : in here since those are invalid on
- * the cli, so we know it's autogenerated in
- * debugging.
- */
-#define AUTODETECTED_MOUNT "CRIU:AUTOGENERATED"
-#define NO_ROOT_MOUNT	   "CRIU:NO_ROOT"
-#define MS_PROPAGATE	   (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
+#define MS_PROPAGATE (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
 
 #undef LOG_PREFIX
 #define LOG_PREFIX "mnt: "
@@ -484,6 +477,9 @@ static int try_resolve_ext_mount(struct mount_info *info)
 			char *source;
 			int len;
 
+			pr_info("Found %s dev-mapping for %s(%d) mountpoint\n", val, info->ns_mountpoint, info->mnt_id);
+			info->external = EXTERNAL_DEV_MOUNT;
+
 			len = strlen(val) + sizeof("dev[]");
 			source = xrealloc(info->source, len);
 			if (source == NULL)
@@ -1827,7 +1823,11 @@ static char *resolve_source(struct mount_info *mi)
 		 */
 		return mi->source;
 
-	if (mi->fstype->code == FSTYPE__AUTO) {
+	/*
+	 * FSTYPE__AUTO check is a fallback for old images which do not have
+	 * explicit EXTERNAL_DEV_MOUNT mark, but still have "dev[key]" in source.
+	 */
+	if (mnt_is_dev_external(mi) || mi->fstype->code == FSTYPE__AUTO) {
 		struct stat st;
 		char *val;
 
@@ -2217,7 +2217,7 @@ static int do_bind_mount(struct mount_info *mi)
 		goto out;
 	}
 
-	if (mi->external) {
+	if (mnt_is_nodev_external(mi)) {
 		/*
 		 * We have / pointing to criu's ns root still,
 		 * so just use the mapping's path. The mountpoint
@@ -2376,7 +2376,7 @@ static bool can_mount_now(struct mount_info *mi)
 	/* Parent should be mounted already, that's how mnt_tree_for_each works */
 	BUG_ON(mi->parent && !mi->parent->mounted);
 
-	if (mi->external)
+	if (mnt_is_nodev_external(mi))
 		goto shared;
 
 	/*
@@ -2551,10 +2551,11 @@ static int do_mount_one(struct mount_info *mi)
 			return -1;
 		mi->mounted = true;
 		ret = 0;
-	} else if (!mi->bind && !mi->need_plugin && !mi->external)
+	} else if (!mi->bind && !mi->need_plugin && !mnt_is_nodev_external(mi)) {
 		ret = do_new_mount(mi);
-	else
+	} else {
 		ret = do_bind_mount(mi);
+	}
 
 	if (ret == 0 && fetch_rt_stat(mi, mi->mountpoint))
 		return -1;
@@ -2882,10 +2883,11 @@ static int get_mp_root(MntEntry *me, struct mount_info *mi)
 	 * from the command line and put into root's place
 	 */
 
-	ext = ext_mount_lookup(me->ext_key);
-	if (!ext) {
+	if (!strcmp(me->ext_key, AUTODETECTED_MOUNT)) {
 		if (!opts.autodetect_ext_mounts) {
-			pr_err("No mapping for %s mountpoint\n", me->mountpoint);
+			pr_err("Mount %d:%s is autodetected external mount. "
+			       "Try \"--ext-mount-map auto\" to allow them.\n",
+			       mi->mnt_id, mi->mountpoint);
 			return -1;
 		}
 
@@ -2899,6 +2901,14 @@ static int get_mp_root(MntEntry *me, struct mount_info *mi)
 		 */
 
 		ext = mi->source;
+	} else if (!strcmp(me->ext_key, EXTERNAL_DEV_MOUNT)) {
+		ext = EXTERNAL_DEV_MOUNT;
+	} else {
+		ext = ext_mount_lookup(me->ext_key);
+		if (!ext) {
+			pr_err("No mapping for %d:%s mountpoint\n", mi->mnt_id, mi->mountpoint);
+			return -1;
+		}
 	}
 
 	mi->external = ext;

From 30261a75157568b897dfb479ebdfdc320235da05 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
Date: Tue, 21 Apr 2020 18:12:00 +0300
Subject: [PATCH 0935/1854] mount: skip fstype and source checks for external
 mounts in mounts_sb_equal

Fstype and source fields can be changed by resolve_external_mounts() or
by try_resolve_ext_mount() for external mounts, but we can have other
mounts from same superblock which are not detected as external, for
instance bind of subdirectory from device-external or bind of
mountpoint-external mount to other mountpoint. So we need to still be
able to find bindmounts between mounts with changed fstype or source and
unchanged mounts.

So let's make fstype/source checks in mounts_sb_equal ignored for
external mounts. Leave only fstype->sb_equal checks if have them.

Signed-off-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/fadc38d84
Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/f9700cb12

Changes: merge two commits in one and rework, remove ":)", reword
commit-message to make patch self-sufficient.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 9fea5f395..9d560a0b2 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -294,17 +294,30 @@ bool phys_stat_dev_match(dev_t st_dev, dev_t phys_dev, struct ns_id *ns, const c
  */
 static bool mounts_sb_equal(struct mount_info *a, struct mount_info *b)
 {
-	if (a->fstype != b->fstype)
-		return false;
-
 	if (a->s_dev != b->s_dev)
 		return false;
 
-	if (strcmp(a->source, b->source) != 0)
-		return false;
+	/*
+	 * If one of compared mounts is external its mount info can have fstype
+	 * and source fields changed by resolve_external_mounts() or
+	 * try_resolve_ext_mount(), but we still want to detect bindmounts of
+	 * this external mount, so let's skip source and fstype checks for it.
+	 */
+	if (!a->external && !b->external) {
+		if (strcmp(a->source, b->source) != 0)
+			return false;
 
-	if (a->fstype->sb_equal) /* :) */
-		return b->fstype->sb_equal(a, b);
+		if (a->fstype != b->fstype)
+			return false;
+
+		if (a->fstype->sb_equal)
+			return a->fstype->sb_equal(a, b);
+	} else {
+		if (a->fstype->sb_equal)
+			return a->fstype->sb_equal(a, b);
+		else if (b->fstype->sb_equal)
+			return b->fstype->sb_equal(a, b);
+	}
 
 	if (strcmp(a->options, b->options))
 		return false;

From 261b7a8fd46341583b13a72e931412a69b07167d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 Dec 2019 17:26:07 +0300
Subject: [PATCH 0936/1854] mount: setup mnt_bind list before using it in
 mnt_is_external

Before this patch mnt_is_external() used non-populated mnt_bind list
when called from resolve_shared_mounts(), thus it could work not as
intended.

Let's add separate helper search_bindmounts() for populating mnt_bind
list, and add mnt_bind_is_populated to differentiate between
non-populated list and just empty populated list. This way we can add a
BUG_ON to mnt_is_external to catch such order problems in future.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e464c1c6d
Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/8b22b30d5
Cherry-picked one hunk from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/ca9de41e3

Changes: simplify commit message, merge fixups: search bindmounts
earlier so that we have bindmounts info as early as possible, rename
mnt_no_bind to mnt_bind_is_populated and simplify it's logic a bit.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/mount.c         | 64 +++++++++++++++++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index b49b55f3f..03959e1b0 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -73,6 +73,7 @@ struct mount_info {
 	struct list_head siblings;
 
 	struct list_head mnt_bind;	 /* circular list of derivatives of one real mount */
+	bool mnt_bind_is_populated;	 /* indicate that mnt_bind list is ready to use */
 	struct list_head mnt_share;	 /* circular list of shared mounts */
 	struct list_head mnt_slave_list; /* list of slave mounts */
 	struct list_head mnt_slave;	 /* slave list entry */
diff --git a/criu/mount.c b/criu/mount.c
index 9d560a0b2..de6722e69 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -571,6 +571,11 @@ static bool mnt_is_external(struct mount_info *m)
 				if (t->external)
 					return 1;
 
+		/*
+		 * Shouldn't use mnt_bind list before it was populated in search_bindmounts
+		 */
+		BUG_ON(!m->mnt_bind_is_populated);
+
 		if (m->master_id <= 0 && !list_empty(&m->mnt_bind))
 			list_for_each_entry(t, &m->mnt_bind, mnt_bind)
 				if (issubpath(m->root, t->root) && t->external)
@@ -892,6 +897,43 @@ static int same_propagation_group(struct mount_info *a, struct mount_info *b)
 	return 0;
 }
 
+/*
+ * Note: Only valid if called consequently on all mounts in mntinfo list.
+ *
+ * Note: We may want to iterate over all bindmounts of some mount, and we would
+ * use ->mnt_bind list for this, but iterating over ->mnt_bind list is
+ * obviously meaningless before search_bindmounts had actually put bindmounts
+ * in it. That's why we have ->mnt_bind_is_populated to protect from misuse of
+ * ->mnt_bind. (As ->mnt_bind list can validly be empty when mount has no
+ *  bindmounts we need separate field to indicate population.)
+ */
+static void __search_bindmounts(struct mount_info *mi)
+{
+	struct mount_info *t;
+
+	if (mi->mnt_bind_is_populated)
+		return;
+
+	for (t = mi->next; t; t = t->next) {
+		if (mounts_sb_equal(mi, t)) {
+			list_add(&t->mnt_bind, &mi->mnt_bind);
+			t->mnt_bind_is_populated = true;
+			pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n", t->mnt_id, mi->mnt_id, t->mountpoint,
+				 mi->mountpoint);
+		}
+	}
+
+	mi->mnt_bind_is_populated = true;
+}
+
+static void search_bindmounts(void)
+{
+	struct mount_info *mi;
+
+	for (mi = mntinfo; mi; mi = mi->next)
+		__search_bindmounts(mi);
+}
+
 static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 {
 	struct mount_info *m, *t;
@@ -944,21 +986,6 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 			       m->mnt_id, m->mountpoint, m->master_id, m->shared_id);
 			return -1;
 		}
-
-		/* Search bind-mounts */
-		if (list_empty(&m->mnt_bind)) {
-			/*
-			 * A first mounted point will be set up as a source point
-			 * for others. Look at propagate_mount()
-			 */
-			for (t = m->next; t; t = t->next) {
-				if (mounts_sb_equal(m, t)) {
-					list_add(&t->mnt_bind, &m->mnt_bind);
-					pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n", t->mnt_id, m->mnt_id,
-						 t->mountpoint, m->mountpoint);
-				}
-			}
-		}
 	}
 
 	/* Search propagation groups */
@@ -1539,6 +1566,7 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 			break;
 	}
 
+	mi->mnt_bind_is_populated = true;
 	mi->nsid = parent->nsid;
 	mi->parent = parent;
 	mi->parent_mnt_id = parent->mnt_id;
@@ -3143,6 +3171,9 @@ int read_mnt_ns_img(void)
 	}
 
 	mntinfo = pms;
+
+	search_bindmounts();
+
 	return 0;
 }
 
@@ -3320,6 +3351,7 @@ static int populate_mnt_ns(void)
 
 	root_yard_mp->mountpoint = mnt_roots;
 	root_yard_mp->mounted = true;
+	root_yard_mp->mnt_bind_is_populated = true;
 
 	if (merge_mount_trees(root_yard_mp))
 		return -1;
@@ -3756,6 +3788,8 @@ int collect_mnt_namespaces(bool for_dump)
 	if (ret)
 		goto err;
 
+	search_bindmounts();
+
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 	if (for_dump && !opts.has_binfmt_misc) {
 		unsigned int s_dev = 0;

From 97bd9511cad7b8d1b752b54eaf2bcfbc5bc73b0a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 14 May 2020 13:50:20 +0300
Subject: [PATCH 0937/1854] util: add get_relative_path helper

This is a smart way of getting relative paths:

1) Always returns relative path, no unexpected starting '/';
2) Detects subpath even if path formats are different, only real directory
and file names matter;
3) No path modiffication/allocation, returns shifted pointer to the
orignal path.

We have many places where we need to cut subpath from path. Different code
blocks doing this job spread widely across the codebase for instance see:
cut_root_for_bind and root_path_from_parent. But those implementations rely on
the fact that subpath's and path's formats are the same.

When we modify or concatenate paths we can accidentally get strange
path formats, paths given by user can have strange format, and the job
to manually maintain all paths in "simple" format everywhere is too
hard. So let's just add a tool to compare "strange" paths.

E.g.:

get_relative_path("./a////.///./b//././c", "///./a/b") == "c"

Note: ".." in path is not supported, and we just can't support it right
without full filesystem tree information to resolve paths like
"../../a", so we just treat ".." as a directory name which should work
in simple cases.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/73a771348

Changes: add other useful robust path comparison helpers is_sub_path and
is_same_path based on get_relative_path, fix clang-format.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/util.h |  4 +++
 criu/util.c         | 72 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index ca934dea0..0df1fe266 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -241,6 +241,10 @@ static inline bool issubpath(const char *path, const char *sub_path)
 	return strstartswith2(path, sub_path, &end) && (end == '/' || end == '\0');
 }
 
+extern char *get_relative_path(char *path, char *sub_path);
+extern bool is_sub_path(char *path, char *sub_path);
+extern bool is_same_path(char *path1, char *path2);
+
 int strip_deleted(char *path, int len);
 int cut_path_ending(char *path, char *sub_path);
 
diff --git a/criu/util.c b/criu/util.c
index d83be0c0d..f14e6467f 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1815,3 +1815,75 @@ void util_init()
 	clock_gettime(CLOCK_MONOTONIC, &tp);
 	criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec;
 }
+
+/*
+ * This function cuts sub_path from the path.
+ * 1) It asumes all relative paths given are relative to "/":
+ * 	/a/b/c is the same as a/b/c
+ * 2) It can handle paths with multiple consequent slashes:
+ * 	///a///b///c is the same as /a/b/c
+ * 3) It always returns relative path, with no leading slash:
+ * 	get_relative_path("/a/b/c", "/") would be "a/b/c"
+ * 	get_relative_path("/a/b/c", "/a/b") would be "c"
+ * 	get_relative_path("/", "/") would be ""
+ * 4) It can handle paths with single dots:
+ * 	get_relative_path("./a/b", "a/") would be "b"
+ * 5) Note ".." in paths are not supported and handled as normal directory name
+ */
+char *get_relative_path(char *path, char *sub_path)
+{
+	bool skip_slashes = true;
+
+	while (1) {
+		if ((*path == '/' || *path == '\0') && (*sub_path == '/' || *sub_path == '\0'))
+			skip_slashes = true;
+
+		if (skip_slashes) {
+			while (*path == '/' || (path[0] == '.' && (path[1] == '/' || path[1] == '\0')))
+				path++;
+			while (*sub_path == '/' || (sub_path[0] == '.' && (sub_path[1] == '/' || sub_path[1] == '\0')))
+				sub_path++;
+		}
+
+		if (*sub_path == '\0') {
+			if (skip_slashes)
+				return path;
+			return NULL;
+		}
+		skip_slashes = false;
+
+		if (*path == '\0')
+			return NULL;
+
+		if (*path != *sub_path)
+			return NULL;
+
+		path++;
+		sub_path++;
+	}
+
+	/* will never get here */
+	return NULL;
+}
+
+bool is_sub_path(char *path, char *sub_path)
+{
+	char *rel_path;
+
+	rel_path = get_relative_path(path, sub_path);
+	if (!rel_path)
+		return false;
+
+	return true;
+}
+
+bool is_same_path(char *path1, char *path2)
+{
+	char *rel_path;
+
+	rel_path = get_relative_path(path1, path2);
+	if (!rel_path || *rel_path != '\0')
+		return false;
+
+	return true;
+}

From 9d1f39f28acd949ad1d4e0fcb6e62f1567010a37 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 19 Jan 2022 12:34:51 +0300
Subject: [PATCH 0938/1854] unittest: add some tests for get_relative_path
 helper

v2: let's also mock kerndat_s.sysctl_nr_open field, to make aarch64
clang ci happy

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/Makefile        |  1 +
 criu/unittest/mock.c | 39 +++++++++++++++++++++++++++++++++++++++
 criu/unittest/unit.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/criu/Makefile b/criu/Makefile
index db4e9d81f..55bdb1b7a 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -87,6 +87,7 @@ $(obj)/criu: $(PROGRAM-BUILTINS)
 	$(call msg-link, $@)
 	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) $(WRAPFLAGS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
 
+UNIT-BUILTINS		+= $(obj)/util.o
 UNIT-BUILTINS		+= $(obj)/config.o
 UNIT-BUILTINS		+= $(obj)/log.o
 UNIT-BUILTINS		+= $(obj)/string.o
diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c
index fb9d38494..127cc7498 100644
--- a/criu/unittest/mock.c
+++ b/criu/unittest/mock.c
@@ -97,3 +97,42 @@ int close_service_fd(int type)
 void compel_log_init(int log_fn, unsigned int level)
 {
 }
+
+void set_cr_errno(int new_err)
+{
+}
+
+struct ns_desc {
+};
+struct ns_desc user_ns_desc;
+int switch_ns(int pid, struct ns_desc *nd, int *rst)
+{
+	return -1;
+}
+
+enum script_actions { ACT_FAKE };
+int run_scripts(enum script_actions act)
+{
+	return -1;
+}
+
+typedef struct VmaEntry VmaEntry;
+struct VmaEntry {
+};
+void vma_entry__init(VmaEntry *message)
+{
+}
+
+int clone_noasan(int (*fn)(void *), int flags, void *arg)
+{
+	return -1;
+}
+
+struct kerndat_s {
+	unsigned int sysctl_nr_open;
+};
+struct kerndat_s kdat = {};
+
+int service_fd_rlim_cur;
+
+unsigned __page_size;
diff --git a/criu/unittest/unit.c b/criu/unittest/unit.c
index 3ee141e25..54769e6f2 100644
--- a/criu/unittest/unit.c
+++ b/criu/unittest/unit.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 
 #include "log.h"
+#include "util.h"
 #include "criu-log.h"
 
 int parse_statement(int i, char *line, char **configuration);
@@ -100,6 +101,48 @@ int main(int argc, char *argv[], char *envp[])
 	i = parse_statement(0, "a b c d e f g h i\n", configuration);
 	assert(i == -1);
 
+	/* get_relative_path */
+	/* different kinds of representation of "/" */
+	assert(!strcmp(get_relative_path("/", "/"), ""));
+	assert(!strcmp(get_relative_path("/", ""), ""));
+	assert(!strcmp(get_relative_path("", "/"), ""));
+	assert(!strcmp(get_relative_path(".", "/"), ""));
+	assert(!strcmp(get_relative_path("/", "."), ""));
+	assert(!strcmp(get_relative_path("/", "./"), ""));
+	assert(!strcmp(get_relative_path("./", "/"), ""));
+	assert(!strcmp(get_relative_path("/.", "./"), ""));
+	assert(!strcmp(get_relative_path("./", "/."), ""));
+	assert(!strcmp(get_relative_path(".//////.", ""), ""));
+	assert(!strcmp(get_relative_path("/./", ""), ""));
+
+	/* all relative paths given are assumed relative to "/" */
+	assert(!strcmp(get_relative_path("/a/b/c", "a/b/c"), ""));
+
+	/* multiple slashes are ignored, only directory names matter */
+	assert(!strcmp(get_relative_path("///alfa///beta///gamma///", "//alfa//beta//gamma//"), ""));
+
+	/* returned path is always relative */
+	assert(!strcmp(get_relative_path("/a/b/c", "/"), "a/b/c"));
+	assert(!strcmp(get_relative_path("/a/b/c", "/a/b"), "c"));
+
+	/* single dots supported */
+	assert(!strcmp(get_relative_path("./a/b", "a/"), "b"));
+
+	/* double dots are partially supported */
+	assert(!strcmp(get_relative_path("a/../b", "a"), "../b"));
+	assert(!strcmp(get_relative_path("a/../b", "a/.."), "b"));
+	assert(!get_relative_path("a/../b/c", "b"));
+
+	/* if second path is not subpath - NULL returned */
+	assert(!get_relative_path("/a/b/c", "/a/b/d"));
+	assert(!get_relative_path("/a/b", "/a/b/c"));
+	assert(!get_relative_path("/a/b/c/d", "b/c/d"));
+
+	assert(!strcmp(get_relative_path("./a////.///./b//././c", "///./a/b"), "c"));
+
+	/* leaves punctuation in returned string as is */
+	assert(!strcmp(get_relative_path("./a////.///./b//././c", "a"), "b//././c"));
+
 	pr_msg("OK\n");
 	return 0;
 }

From c09bd89419c7ea5f5f6032d1c2bc17c0e1329ac7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 29 Nov 2021 12:54:51 +0300
Subject: [PATCH 0939/1854] mount: add mnt_bind_pick helper to pick the desired
 bind

Adding different pick functions we would be able to search different
things like mounted bind with wider root, or external bind, or external
bind with same sharing group and so on and so forth.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  2 ++
 criu/mount.c         | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 03959e1b0..c782d84bb 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -173,4 +173,6 @@ extern int remount_readonly_mounts(void);
 extern int try_remount_writable(struct mount_info *mi, bool ns);
 extern bool mnt_is_overmounted(struct mount_info *mi);
 
+extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
+					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
 #endif /* __CR_MOUNT_H__ */
diff --git a/criu/mount.c b/criu/mount.c
index de6722e69..fcdf06d50 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -934,6 +934,27 @@ static void search_bindmounts(void)
 		__search_bindmounts(mi);
 }
 
+struct mount_info *mnt_bind_pick(struct mount_info *mi, bool (*pick)(struct mount_info *mi, struct mount_info *bind))
+{
+	struct mount_info *bind;
+
+	BUG_ON(!mi);
+
+	if (pick(mi, mi))
+		return mi;
+
+	/*
+	 * Shouldn't use mnt_bind list before it was populated in search_bindmounts
+	 */
+	BUG_ON(!mi->mnt_bind_is_populated);
+
+	list_for_each_entry(bind, &mi->mnt_bind, mnt_bind)
+		if (pick(mi, bind))
+			return bind;
+
+	return NULL;
+}
+
 static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 {
 	struct mount_info *m, *t;

From 3b2b8081286aed194fa0dba47501107d6ed3297d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 18 Dec 2019 13:45:22 +0300
Subject: [PATCH 0940/1854] mount: split mnt_is_external(_bind) and
 can_receive_master_from_external

We use mnt_is_external():

1) In validate_mounts() to skip fsroot existence check for mounts which
will be bind-mounted from external mounts.

2) In resolve_shared_mounts() to skip error on slave mounts without
master mount, if they can receive these master_id through external
mount.

3) In dump_one_fs to skip dump of mounts which will be bind-mounted from
external mounts.

Cases (1) and (3) are the same, but case (2) is quiet different. Lets
split these cases thus making things simplier.

Effectively these patch does not change criu's behaviour at all. While
I can't say that old mnt_is_external was wrong, it was too complex and
hard for understanding, so it's worth to switch to lookup across
bindmounts list via general mnt_bind_pick() helper. And now when it is
obvious that mnt_is_external looks for external bindmount, let's also
change it's name to mnt_is_external_bind.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/494b52ba8

Changes: use mnt_bind_pick helper, use is_sub_path helper to be more
robust, rename mnt_is_external to mnt_is_external_bind, fix
clang-format, export to mount.h, use mnt_is_nodev_external as we can not
inherit master from device-external mounts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  2 ++
 criu/mount.c         | 57 ++++++++++++++++++++------------------------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index c782d84bb..b21c23975 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -173,6 +173,8 @@ extern int remount_readonly_mounts(void);
 extern int try_remount_writable(struct mount_info *mi, bool ns);
 extern bool mnt_is_overmounted(struct mount_info *mi);
 
+extern bool mnt_is_external_bind(struct mount_info *mi);
+
 extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
 #endif /* __CR_MOUNT_H__ */
diff --git a/criu/mount.c b/criu/mount.c
index fcdf06d50..ef50d0fa2 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -552,39 +552,34 @@ static bool mnt_needs_remap(struct mount_info *m)
 	return false;
 }
 
-/*
- * Say mount is external if it was explicitly specified as an
- * external or it will be bind from such an explicit external
- * mount, we set bind in propagate_mount and propagate_siblings
- */
-
-static bool mnt_is_external(struct mount_info *m)
+static bool __mnt_is_external_bind(struct mount_info *mi, struct mount_info *bind)
 {
-	struct mount_info *t;
+	if (bind->external && is_sub_path(mi->root, bind->root))
+		return true;
 
-	while (m) {
-		if (m->external)
-			return 1;
+	return false;
+}
 
-		if (!list_empty(&m->mnt_share))
-			list_for_each_entry(t, &m->mnt_share, mnt_share)
-				if (t->external)
-					return 1;
+/*
+ * Say mount is external if it was explicitly specified as an external or it
+ * can be bind-mounted from such an explicit external mount.
+ */
+bool mnt_is_external_bind(struct mount_info *mi)
+{
+	return mnt_bind_pick(mi, __mnt_is_external_bind);
+}
 
-		/*
-		 * Shouldn't use mnt_bind list before it was populated in search_bindmounts
-		 */
-		BUG_ON(!m->mnt_bind_is_populated);
+static bool __can_receive_master_from_external(struct mount_info *mi, struct mount_info *bind)
+{
+	if (mnt_is_nodev_external(bind) && bind->master_id == mi->master_id && is_sub_path(mi->root, bind->root))
+		return true;
 
-		if (m->master_id <= 0 && !list_empty(&m->mnt_bind))
-			list_for_each_entry(t, &m->mnt_bind, mnt_bind)
-				if (issubpath(m->root, t->root) && t->external)
-					return 1;
+	return false;
+}
 
-		m = m->mnt_master;
-	}
-
-	return 0;
+static struct mount_info *can_receive_master_from_external(struct mount_info *mi)
+{
+	return mnt_bind_pick(mi, __can_receive_master_from_external);
 }
 
 /*
@@ -627,7 +622,7 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 		if (validate_children_collision(m))
 			return -1;
 
-		if (mnt_is_external(m))
+		if (mnt_is_external_bind(m))
 			continue;
 
 		/*
@@ -1001,7 +996,7 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 		 * If we haven't already determined this mount is external,
 		 * or bind of external, then we don't know where it came from.
 		 */
-		if (need_master && m->parent && !mnt_is_external(m)) {
+		if (need_master && m->parent && !can_receive_master_from_external(m)) {
 			pr_err("Mount %d %s (master_id: %d shared_id: %d) "
 			       "has unreachable sharing. Try --enable-external-masters.\n",
 			       m->mnt_id, m->mountpoint, m->master_id, m->shared_id);
@@ -1640,7 +1635,7 @@ static int dump_one_fs(struct mount_info *mi)
 	struct mount_info *t;
 	bool first = true;
 
-	if (mi->is_ns_root || mi->need_plugin || mnt_is_external(mi) || !mi->fstype->dump)
+	if (mi->is_ns_root || mi->need_plugin || mnt_is_external_bind(mi) || !mi->fstype->dump)
 		return 0;
 
 	/* mnt_bind is a cycled list, so list_for_each can't be used here. */
@@ -2925,7 +2920,7 @@ static int get_mp_root(MntEntry *me, struct mount_info *mi)
 		me->ext_key = me->root;
 		/*
 		 * Putting the id of external mount which is provided by user,
-		 * to ->root can confuse mnt_is_external and other functions
+		 * to ->root can confuse mnt_is_external_bind and other functions
 		 * which expect to see the path in the file system to the root
 		 * of these mount (mounts_equal, mnt_build_ids_tree,
 		 * find_fsroot_mount_for, find_best_external_match, etc.)

From 685a53eecab5c942e08cad6c4d92abb6213f8c60 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 12 Jan 2022 13:34:39 +0300
Subject: [PATCH 0941/1854] mount: rework skipping external mounts in
 dump_one_mountpoint

Function dump_one_fs already has mnt_is_external_bind check inside, so
there is no point to check pm->external one more time.

Function check_bindmount is intended to check devpts bindmount's master
was opened in right mount namespace, but if bindmount is external mount
there is no point to check this. Let's also skip check for bindmounts of
external mounts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index ef50d0fa2..844f52e4d 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1674,13 +1674,12 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 	if (me.fstype == FSTYPE__AUTO)
 		me.fsname = pm->fsname;
 
-	if (!pm->external) {
-		if (!pm->dumped && dump_one_fs(pm))
-			return -1;
+	if (!pm->dumped && dump_one_fs(pm))
+		return -1;
 
-		if (!fsroot_mounted(pm) && pm->fstype->check_bindmount && pm->fstype->check_bindmount(pm))
-			return -1;
-	}
+	if (!mnt_is_external_bind(pm) && !fsroot_mounted(pm) && pm->fstype->check_bindmount &&
+	    pm->fstype->check_bindmount(pm))
+		return -1;
 
 	if (pm->mnt_id == CRTIME_MNT_ID) {
 		pr_info("Skip dumping cr-time mountpoint: %s\n", pm->mountpoint);

From d5cb7764e43f8b477b6424100b4acb798c2f79f2 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 12 Sep 2019 10:10:37 +0300
Subject: [PATCH 0942/1854] mount: show more info about why we can't mount

Currently if we have mount deadlock it is hard to understand which
mounts lock each other, these makes it easier.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/8ba8499e2
Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/48d044ae11

Changes: merge newline fixup.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 844f52e4d..f1c970da6 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2426,8 +2426,10 @@ static bool rst_mnt_is_root(struct mount_info *m)
 
 static bool can_mount_now(struct mount_info *mi)
 {
-	if (rst_mnt_is_root(mi))
+	if (rst_mnt_is_root(mi)) {
+		pr_debug("%s: true as %d is mntns root\n", __func__, mi->mnt_id);
 		return true;
+	}
 
 	/* Parent should be mounted already, that's how mnt_tree_for_each works */
 	BUG_ON(mi->parent && !mi->parent->mounted);
@@ -2444,21 +2446,35 @@ static bool can_mount_now(struct mount_info *mi)
 	if (mi->mnt_master) {
 		struct mount_info *c, *s;
 
-		if (mi->bind == NULL)
+		if (mi->bind == NULL) {
+			pr_debug("%s: false as %d is slave with unmounted master %d\n", __func__, mi->mnt_id,
+				 mi->mnt_master->mnt_id);
 			return false;
+		}
 
-		list_for_each_entry(c, &mi->mnt_master->children, siblings)
-			if (!c->mounted)
+		list_for_each_entry(c, &mi->mnt_master->children, siblings) {
+			if (!c->mounted) {
+				pr_debug("%s: false as %d is slave with unmounted master's children %d\n", __func__,
+					 mi->mnt_id, c->mnt_id);
 				return false;
+			}
+		}
 
-		list_for_each_entry(s, &mi->mnt_master->mnt_share, mnt_share)
-			list_for_each_entry(c, &s->children, siblings)
-				if (!c->mounted)
+		list_for_each_entry(s, &mi->mnt_master->mnt_share, mnt_share) {
+			list_for_each_entry(c, &s->children, siblings) {
+				if (!c->mounted) {
+					pr_debug("%s: false as %d is slave with unmounted children of master's share\n",
+						 __func__, mi->mnt_id);
 					return false;
+				}
+			}
+		}
 	}
 
-	if (!fsroot_mounted(mi) && (mi->bind == NULL && !mi->need_plugin))
+	if (!fsroot_mounted(mi) && (mi->bind == NULL && !mi->need_plugin)) {
+		pr_debug("%s: false as %d is non-root without bind or plugin\n", __func__, mi->mnt_id);
 		return false;
+	}
 
 shared:
 	/* Mount only after all parents of our propagation group mounted */
@@ -2467,8 +2483,11 @@ shared:
 
 		list_for_each_entry(p, &mi->mnt_propagate, mnt_propagate) {
 			BUG_ON(!p->parent);
-			if (!p->parent->mounted)
+			if (!p->parent->mounted) {
+				pr_debug("%s: false as %d has unmounted parent %d of its propagation group\n", __func__,
+					 mi->mnt_id, p->parent->mnt_id);
 				return false;
+			}
 		}
 	}
 
@@ -2515,8 +2534,11 @@ shared:
 
 		/* Check not propagated mounts mounted and cleanup list */
 		list_for_each_entry_safe(p, t, &mi_notprop, mnt_notprop) {
-			if (!p->mounted)
+			if (!p->mounted) {
+				pr_debug("%s: false as %d has unmounted 'anti'-propagation mount %d\n", __func__,
+					 mi->mnt_id, p->mnt_id);
 				can = false;
+			}
 			list_del_init(&p->mnt_notprop);
 		}
 

From 4f94149346119d30c6c38933e0cdb4bb1dd85fca Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 17 Feb 2020 11:58:41 +0300
Subject: [PATCH 0943/1854] mount: mount external mount before mounting it's
 binds

The problem when we don't order these mounts we can get to mounting
non-external bind first via do_new_mount and fail c/r. For instance for
tmpfs we would fail on no image to get contents from. See the test
mnt_ext_root for more info.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/baf3f8db8

Changes: switch to mnt_bind_pick helper, export to mount.h, make check
in can_mount_now skip mounts with ->bind set.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  2 ++
 criu/mount.c         | 27 ++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index b21c23975..7dffe5b2c 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -173,7 +173,9 @@ extern int remount_readonly_mounts(void);
 extern int try_remount_writable(struct mount_info *mi, bool ns);
 extern bool mnt_is_overmounted(struct mount_info *mi);
 
+extern struct mount_info *mnt_get_external_bind(struct mount_info *mi);
 extern bool mnt_is_external_bind(struct mount_info *mi);
+extern bool has_mounted_external_bind(struct mount_info *mi);
 
 extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
diff --git a/criu/mount.c b/criu/mount.c
index f1c970da6..968b6dc03 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -564,11 +564,16 @@ static bool __mnt_is_external_bind(struct mount_info *mi, struct mount_info *bin
  * Say mount is external if it was explicitly specified as an external or it
  * can be bind-mounted from such an explicit external mount.
  */
-bool mnt_is_external_bind(struct mount_info *mi)
+struct mount_info *mnt_get_external_bind(struct mount_info *mi)
 {
 	return mnt_bind_pick(mi, __mnt_is_external_bind);
 }
 
+bool mnt_is_external_bind(struct mount_info *mi)
+{
+	return mnt_get_external_bind(mi);
+}
+
 static bool __can_receive_master_from_external(struct mount_info *mi, struct mount_info *bind)
 {
 	if (mnt_is_nodev_external(bind) && bind->master_id == mi->master_id && is_sub_path(mi->root, bind->root))
@@ -582,6 +587,19 @@ static struct mount_info *can_receive_master_from_external(struct mount_info *mi
 	return mnt_bind_pick(mi, __can_receive_master_from_external);
 }
 
+static bool __has_mounted_external_bind(struct mount_info *mi, struct mount_info *bind)
+{
+	if (bind->external && bind->mounted && is_sub_path(mi->root, bind->root))
+		return true;
+
+	return false;
+}
+
+bool has_mounted_external_bind(struct mount_info *mi)
+{
+	return mnt_bind_pick(mi, __has_mounted_external_bind);
+}
+
 /*
  * Having two children with same mountpoint is unsupported. That can happen in
  * case of mount propagation inside of shared mounts, in that case it is hard
@@ -2426,6 +2444,8 @@ static bool rst_mnt_is_root(struct mount_info *m)
 
 static bool can_mount_now(struct mount_info *mi)
 {
+	struct mount_info *ext;
+
 	if (rst_mnt_is_root(mi)) {
 		pr_debug("%s: true as %d is mntns root\n", __func__, mi->mnt_id);
 		return true;
@@ -2437,6 +2457,11 @@ static bool can_mount_now(struct mount_info *mi)
 	if (mnt_is_nodev_external(mi))
 		goto shared;
 
+	if (!mi->bind && !mi->external && (ext = mnt_get_external_bind(mi)) && !has_mounted_external_bind(mi)) {
+		pr_debug("%s: false as %d's external %d is not mounted\n", __func__, mi->mnt_id, ext->mnt_id);
+		return false;
+	}
+
 	/*
 	 * We're the slave peer:
 	 *   - Make sure the master peer is already mounted

From 007501f985822c90fc7417f22f16283daf419a51 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 18 Feb 2020 13:41:18 +0300
Subject: [PATCH 0944/1854] zdtm: add new mnt_ext_root test

This test simply creates a) root external mount and b) "deeper"
bindmount for it (deeper in terms of mnt_depth). Our mount restore code
tries to mount (b) first and fails (without previous patch ordering
external mounts before their binds).

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/d31954669

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile          |  1 +
 test/zdtm/static/mnt_ext_root.c    | 88 ++++++++++++++++++++++++++++++
 test/zdtm/static/mnt_ext_root.desc |  5 ++
 test/zdtm/static/mnt_ext_root.hook | 12 ++++
 4 files changed, 106 insertions(+)
 create mode 100644 test/zdtm/static/mnt_ext_root.c
 create mode 100644 test/zdtm/static/mnt_ext_root.desc
 create mode 100755 test/zdtm/static/mnt_ext_root.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 33e15f85a..a64c51cd0 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -399,6 +399,7 @@ TST_DIR		=				\
 		mnt_ext_auto			\
 		mnt_ext_master			\
 		mnt_ext_dev			\
+		mnt_ext_root			\
 		mnt_tracefs			\
 		mntns_deleted			\
 		unlink_regular00		\
diff --git a/test/zdtm/static/mnt_ext_root.c b/test/zdtm/static/mnt_ext_root.c
new file mode 100644
index 000000000..9f9554d51
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_root.c
@@ -0,0 +1,88 @@
+#include <sched.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check root external mount with \"deepper\" bind";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *source = "zdtm_ext_root";
+char *dirname = "mnt_ext_root.test";
+TEST_OPTION(dirname, string, "directory name", 1);
+
+#define BUF_SIZE 4096
+
+int main(int argc, char **argv)
+{
+	char *root, testdir[PATH_MAX];
+	char dst[PATH_MAX], deep_bind[PATH_MAX];
+	char *tmp = "/tmp/zdtm_ext_root.tmp";
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
+
+	root = getenv("ZDTM_ROOT");
+	if (root == NULL) {
+		pr_perror("root");
+		return 1;
+	}
+
+	if (!zdtm_newns) {
+		pr_perror("ZDTM_NEWNS is not set");
+		return 1;
+	} else if (strcmp(zdtm_newns, "1")) {
+		goto test;
+	}
+
+	/* Prepare directories in test root */
+	sprintf(testdir, "%s/%s", root, dirname);
+	mkdir(testdir, 0755);
+
+	sprintf(dst, "%s/%s/dst", root, dirname);
+	mkdir(dst, 0755);
+	sprintf(deep_bind, "%s/%s/deep", root, dirname);
+	mkdir(deep_bind, 0755);
+	sprintf(deep_bind, "%s/%s/deep/bind", root, dirname);
+	mkdir(deep_bind, 0755);
+
+	/* Prepare mount in criu root */
+	mkdir(tmp, 0755);
+	if (mount(source, tmp, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		return 1;
+	}
+	if (mount(NULL, tmp, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		return 1;
+	}
+
+	/*
+	 * Create temporary mntns, next mounts will not show up in criu mntns
+	 */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	/*
+	 * Populate to the tests mntns root mounts
+	 */
+	if (mount(tmp, dst, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+
+	if (mount(tmp, deep_bind, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+
+test:
+	test_init(argc, argv);
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_ext_root.desc b/test/zdtm/static/mnt_ext_root.desc
new file mode 100644
index 000000000..121dbb0a7
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_root.desc
@@ -0,0 +1,5 @@
+{   'dopts': '--external mnt[/mnt_ext_root.test/dst]:ZDTM',
+    'feature': 'mnt_id',
+    'flavor': 'ns uns',
+    'flags': 'suid',
+    'ropts': '--external mnt[ZDTM]:/tmp/zdtm_ext_root.tmp'}
diff --git a/test/zdtm/static/mnt_ext_root.hook b/test/zdtm/static/mnt_ext_root.hook
new file mode 100755
index 000000000..c022f91ad
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_root.hook
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+[ "$1" == "--clean" ] || exit 0
+
+TMP="/tmp/zdtm_ext_root.tmp"
+echo "Cleanup mnt_ext_sharing"
+umount "$TMP"
+rm -rf $TMP
+
+rm -rf "mnt_ext_root.test"
+
+exit 0

From a963ceb7702466f068c808fabc4741068ce20704 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 26 Nov 2021 12:53:41 +0300
Subject: [PATCH 0945/1854] mount: restrict mp-external mount map to init
 container mntns only

We resolve mountpoint-external mounts on dump by mountpoint comparison,
so if we have other mount (other superblock e.g. in nested mntns) with
same mountpoint we would also resolve this mount as external and restore
it as external: replacing it completely with different mount... That's
wrong, so to make this interface more robust let's only resolve
mountpoint-external mounts in root mntns of container, not in all
mntnses as it was before.

Note: if actual external mount (bind of external) gets to nested mntns
it's ok not to resolve it as external as criu would bind it from the
resolved mount in root mntns. So external mounts in nested mntns are
still supported after this patch.

Cherry-picked one hunk from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/034498b28

Changes: apply mntns check only to mountpoint-external mounts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 968b6dc03..ff9b9b591 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -470,14 +470,23 @@ static void mnt_tree_show(struct mount_info *tree, int off)
 /* Returns -1 on error, 1 if external mount resolved, 0 otherwise */
 static int try_resolve_ext_mount(struct mount_info *info)
 {
-	char *ext;
 	char devstr[64];
 
-	ext = ext_mount_lookup(info->mountpoint + 1 /* trim the . */);
-	if (ext) {
-		pr_info("Found %s mapping for %s mountpoint\n", ext, info->mountpoint);
-		info->external = ext;
-		return 1;
+	/*
+	 * Only allow mountpoint-external mounts in root mntns. Their lookup is
+	 * based on mountpoint path, but in nested mntns we can have completely
+	 * different mount tree and at same mountpoint we can have completely
+	 * different mount.
+	 */
+	if (info->nsid->type == NS_ROOT) {
+		char *ext;
+
+		ext = ext_mount_lookup(info->mountpoint + 1 /* trim the . */);
+		if (ext) {
+			pr_info("Found %s mapping for %s mountpoint\n", ext, info->mountpoint);
+			info->external = ext;
+			return 1;
+		}
 	}
 
 	snprintf(devstr, sizeof(devstr), "dev[%d/%d]", kdev_major(info->s_dev), kdev_minor(info->s_dev));

From e50abbd3b38539c1dc72b67940e5fd5604934199 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 12 Jan 2022 16:00:56 +0300
Subject: [PATCH 0946/1854] zdtm: add mnt_ext_collision test

This test creates two mount namespaces, one "root" with external mount
at /mnt_ext_collision.test/dst and one "nested" with different internal
mount at /mnt_ext_collision.test/dst instead.

This case is important for nested containers, if we dump a container
with some external mount in /mnt we should not also replace mounts in
/mnt for nested containers with the external one. (One example is docker
containers inside Virtuozzo containers.)

Without previous patch which restricts external mounts resolution to
only root mntns of container this test fails as internal mount is
replaced by external one after migration.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile               |   1 +
 test/zdtm/static/mnt_ext_collision.c    | 194 ++++++++++++++++++++++++
 test/zdtm/static/mnt_ext_collision.desc |   5 +
 test/zdtm/static/mnt_ext_collision.hook |  12 ++
 4 files changed, 212 insertions(+)
 create mode 100644 test/zdtm/static/mnt_ext_collision.c
 create mode 100644 test/zdtm/static/mnt_ext_collision.desc
 create mode 100755 test/zdtm/static/mnt_ext_collision.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a64c51cd0..565b32400 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -400,6 +400,7 @@ TST_DIR		=				\
 		mnt_ext_master			\
 		mnt_ext_dev			\
 		mnt_ext_root			\
+		mnt_ext_collision		\
 		mnt_tracefs			\
 		mntns_deleted			\
 		unlink_regular00		\
diff --git a/test/zdtm/static/mnt_ext_collision.c b/test/zdtm/static/mnt_ext_collision.c
new file mode 100644
index 000000000..324a3484c
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_collision.c
@@ -0,0 +1,194 @@
+#include <sched.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check external mount mountpoint collide with different mount in nested mntns";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname = "mnt_ext_collision.test";
+TEST_OPTION(dirname, string, "directory name", 1);
+
+char *source = "zdtm_ext_collision";
+char *source2 = "zdtm_ext_collision_2";
+
+enum {
+	TEST_INIT = 0,
+	TEST_CHILD,
+	TEST_CHECK,
+	TEST_EXIT,
+	EMERGENCY_ABORT,
+};
+
+futex_t *futex;
+
+#define BUF_SIZE 4096
+
+static int child(void)
+{
+	char dst[PATH_MAX], dst_file[PATH_MAX];
+	int fd;
+
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		goto err;
+	}
+
+	/*
+	 * Umount external mount copy
+	 */
+	sprintf(dst, "/%s/dst", dirname);
+	if (umount(dst)) {
+		pr_perror("umount");
+		goto err;
+	}
+
+	/*
+	 * Mount tmpfs in its place
+	 */
+	if (mount(source2, dst, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		goto err;
+	}
+
+	sprintf(dst_file, "/%s/dst/file", dirname);
+	fd = open(dst_file, O_RDWR | O_CREAT | O_EXCL, 0666);
+	if (fd < 0) {
+		pr_perror("open");
+		goto err;
+	}
+	close(fd);
+
+	futex_set_and_wake(futex, TEST_CHILD);
+	futex_wait_while_lt(futex, TEST_CHECK);
+
+	if (access(dst_file, F_OK)) {
+		pr_perror("access");
+		goto err;
+	}
+
+	futex_set_and_wake(futex, TEST_EXIT);
+	return 0;
+err:
+	futex_set_and_wake(futex, EMERGENCY_ABORT);
+	return 1;
+}
+
+int main(int argc, char **argv)
+{
+	char *root, testdir[PATH_MAX];
+	char lckd[PATH_MAX], dst[PATH_MAX];
+	char *tmp = "/tmp/zdtm_ext_collision.tmp";
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
+	int pid;
+
+	root = getenv("ZDTM_ROOT");
+	if (root == NULL) {
+		pr_perror("root");
+		return 1;
+	}
+
+	if (!zdtm_newns) {
+		pr_perror("ZDTM_NEWNS is not set");
+		return 1;
+	} else if (strcmp(zdtm_newns, "1")) {
+		goto test;
+	}
+
+	/* Prepare directories in test root */
+	sprintf(testdir, "%s/%s", root, dirname);
+	mkdir(testdir, 0755);
+
+	sprintf(lckd, "%s/%s/lckd", root, dirname);
+	mkdir(lckd, 0755);
+	sprintf(dst, "%s/%s/dst", root, dirname);
+	mkdir(dst, 0755);
+
+	/* Prepare mount in criu root */
+	mkdir(tmp, 0755);
+	if (mount(source, tmp, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		return 1;
+	}
+	if (mount(NULL, tmp, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		return 1;
+	}
+
+	/*
+	 * Create temporary mntns, next mounts will not show up in criu mntns
+	 */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	/*
+	 * Populate external mount to the tests mntns root
+	 * (in uns flavour this would become locked)
+	 */
+	if (mount(tmp, lckd, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+test:
+	test_init(argc, argv);
+
+	/*
+	 * Hack to create unlocked external mount without pivot_root+bind thing
+	 */
+	sprintf(lckd, "/%s/lckd", dirname);
+	sprintf(dst, "/%s/dst", dirname);
+	if (mount(lckd, dst, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+
+	/*
+	 * Setup futex for processes syncronization
+	 */
+	futex = mmap(NULL, sizeof(futex), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (futex == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+	futex_init(futex);
+
+	/*
+	 * Fork child which would have nested mntns
+	 */
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("fork");
+		return 1;
+	} else if (pid == 0) {
+		exit(child());
+	}
+
+	futex_wait_while_lt(futex, TEST_CHILD);
+	if (futex_get(futex) == EMERGENCY_ABORT) {
+		pr_err("Fail in child\n");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	futex_set_and_wake(futex, TEST_CHECK);
+	futex_wait_while_lt(futex, TEST_EXIT);
+	if (futex_get(futex) == EMERGENCY_ABORT) {
+		fail("Fail in child on check stage");
+		return 1;
+	}
+
+	waitpid(pid, NULL, 0);
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_ext_collision.desc b/test/zdtm/static/mnt_ext_collision.desc
new file mode 100644
index 000000000..9b68a4ae0
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_collision.desc
@@ -0,0 +1,5 @@
+{   'dopts': '--external mnt[/mnt_ext_collision.test/dst]:ZDTM',
+    'feature': 'mnt_id',
+    'flavor': 'ns uns',
+    'flags': 'suid',
+    'ropts': '--external mnt[ZDTM]:/tmp/zdtm_ext_collision.tmp'}
diff --git a/test/zdtm/static/mnt_ext_collision.hook b/test/zdtm/static/mnt_ext_collision.hook
new file mode 100755
index 000000000..31c908d67
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_collision.hook
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+[ "$1" == "--clean" ] || exit 0
+
+TMP="/tmp/zdtm_ext_collision.tmp"
+echo "Cleanup mnt_ext_collision"
+umount "$TMP"
+rm -rf $TMP
+
+rm -rf "mnt_ext_collision.test"
+
+exit 0

From cf6fe2d48b4787cad27543b63c41264d257b4a58 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 8 May 2020 14:33:13 +0300
Subject: [PATCH 0947/1854] mount: add mnt_is_root_bind helper

Helper mnt_is_root_bind indicates that mount can be bind-mounted from
the root mount (which in it's turn from opts.root).

Use it in validate_mounts: we should skip unsupported mount from fsroot check
if we know it will be bindmounted from root mount, is_ns_root check was wrong.

Also fix root mount check in dump_one_fs, root mounts in non root mntns should
be dumped normally if they are not bind-mounts of root mount.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/25d078971

Changes: switch to mnt_bind_pick helper, export to mount.h, also add
mnt_get_root_bind helper for future use in mount-v2, remove excess root
yard hunk.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  3 +++
 criu/mount.c         | 37 +++++++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 7dffe5b2c..1ceb394b6 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -176,6 +176,9 @@ extern bool mnt_is_overmounted(struct mount_info *mi);
 extern struct mount_info *mnt_get_external_bind(struct mount_info *mi);
 extern bool mnt_is_external_bind(struct mount_info *mi);
 extern bool has_mounted_external_bind(struct mount_info *mi);
+extern bool rst_mnt_is_root(struct mount_info *mi);
+extern struct mount_info *mnt_get_root_bind(struct mount_info *mi);
+extern bool mnt_is_root_bind(struct mount_info *mi);
 
 extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
diff --git a/criu/mount.c b/criu/mount.c
index ff9b9b591..5591bb67c 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -609,6 +609,29 @@ bool has_mounted_external_bind(struct mount_info *mi)
 	return mnt_bind_pick(mi, __has_mounted_external_bind);
 }
 
+bool rst_mnt_is_root(struct mount_info *mi)
+{
+	return (mi->is_ns_root && mi->nsid->id == root_item->ids->mnt_ns_id);
+}
+
+static bool __mnt_is_root_bind(struct mount_info *mi, struct mount_info *bind)
+{
+	if (rst_mnt_is_root(bind) && is_sub_path(mi->root, bind->root))
+		return true;
+
+	return false;
+}
+
+struct mount_info *mnt_get_root_bind(struct mount_info *mi)
+{
+	return mnt_bind_pick(mi, __mnt_is_root_bind);
+}
+
+bool mnt_is_root_bind(struct mount_info *mi)
+{
+	return mnt_get_root_bind(mi);
+}
+
 /*
  * Having two children with same mountpoint is unsupported. That can happen in
  * case of mount propagation inside of shared mounts, in that case it is hard
@@ -642,16 +665,15 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 	struct mount_info *m, *t;
 
 	for (m = info; m; m = m->next) {
-		if (m->parent == NULL || m->is_ns_root)
-			/* root mount can be any */
-			continue;
-
 		if (validate_children_collision(m))
 			return -1;
 
 		if (mnt_is_external_bind(m))
 			continue;
 
+		if (mnt_is_root_bind(m))
+			continue;
+
 		/*
 		 * Mountpoint can point to / of an FS. In that case this FS
 		 * should be of some known type so that we can just mount one.
@@ -1662,7 +1684,7 @@ static int dump_one_fs(struct mount_info *mi)
 	struct mount_info *t;
 	bool first = true;
 
-	if (mi->is_ns_root || mi->need_plugin || mnt_is_external_bind(mi) || !mi->fstype->dump)
+	if (mnt_is_root_bind(mi) || mi->need_plugin || mnt_is_external_bind(mi) || !mi->fstype->dump)
 		return 0;
 
 	/* mnt_bind is a cycled list, so list_for_each can't be used here. */
@@ -2446,11 +2468,6 @@ err:
 	return exit_code;
 }
 
-static bool rst_mnt_is_root(struct mount_info *m)
-{
-	return (m->is_ns_root && m->nsid->id == root_item->ids->mnt_ns_id);
-}
-
 static bool can_mount_now(struct mount_info *mi)
 {
 	struct mount_info *ext;

From 2fdb4993a06f7b8f025d10ea3b7afc6da334427a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 27 Apr 2020 18:24:54 +0300
Subject: [PATCH 0948/1854] mount: allow nested mount namespaces with different
 roots

Only root in root-mntns is special (see rst_mnt_is_root) all other
mounts are mounted regulary there is no difference between ns root and
any other mount or bind-mount.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/f41e41dd5

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 5591bb67c..97a903934 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3362,7 +3362,6 @@ void fini_restore_mntns(void)
 
 static int merge_mount_trees(struct mount_info *root_yard)
 {
-	struct mount_info *first = NULL;
 	struct ns_id *nsid;
 
 	/* Merge mount trees together under root_yard */
@@ -3374,16 +3373,6 @@ static int merge_mount_trees(struct mount_info *root_yard)
 
 		root = nsid->mnt.mntinfo_tree;
 
-		if (!first)
-			first = root;
-		else if (!mounts_sb_equal(root, first) || strcmp(root->root, first->root)) {
-			pr_err("Nested mount namespaces with different "
-			       "roots %d (@%s %s) %d (@%s %s) are not supported yet\n",
-			       root->mnt_id, root->mountpoint, root->root, first->mnt_id, first->mountpoint,
-			       first->root);
-			return -1;
-		}
-
 		pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->mountpoint);
 		root->parent = root_yard;
 		list_add(&root->siblings, &root_yard->children);

From 77f67973f20353fe0759c3135afe69c74d239b44 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 12 Jan 2022 19:30:07 +0300
Subject: [PATCH 0949/1854] zdtm: add mntns_pivot_root test

This creates nested mntns and does pivot_root to tmpfs mount, so that
roots of original test mntns and in nested mntns are different.

Before allowing nested mntnses with different roots in previous patch
this would fail.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile              |   1 +
 test/zdtm/static/mntns_pivot_root.c    | 150 +++++++++++++++++++++++++
 test/zdtm/static/mntns_pivot_root.desc |   1 +
 3 files changed, 152 insertions(+)
 create mode 100644 test/zdtm/static/mntns_pivot_root.c
 create mode 100644 test/zdtm/static/mntns_pivot_root.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 565b32400..a22a0540f 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -401,6 +401,7 @@ TST_DIR		=				\
 		mnt_ext_dev			\
 		mnt_ext_root			\
 		mnt_ext_collision		\
+		mntns_pivot_root		\
 		mnt_tracefs			\
 		mntns_deleted			\
 		unlink_regular00		\
diff --git a/test/zdtm/static/mntns_pivot_root.c b/test/zdtm/static/mntns_pivot_root.c
new file mode 100644
index 000000000..987b0da3b
--- /dev/null
+++ b/test/zdtm/static/mntns_pivot_root.c
@@ -0,0 +1,150 @@
+#include <sched.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <linux/limits.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check nested mntns with different root";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname = "mntns_pivot_root.test";
+TEST_OPTION(dirname, string, "directory name", 1);
+
+char *source = "mntns_pivot_root";
+
+enum {
+	TEST_INIT = 0,
+	TEST_CHILD,
+	TEST_CHECK,
+	TEST_EXIT,
+	EMERGENCY_ABORT,
+};
+
+futex_t *futex;
+
+static int sys_pivot_root(const char *new_root, const char *put_old)
+{
+	return syscall(SYS_pivot_root, new_root, put_old);
+}
+
+#define BUF_SIZE 4096
+
+static int child(void)
+{
+	char *put_root = "put_root";
+	char *testfile = "testfile";
+	int fd;
+
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		goto err;
+	}
+	/*
+	 * Setup new root
+	 */
+	mkdir(dirname, 0755);
+
+	if (mount(source, dirname, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		goto err;
+	}
+
+	if (mount(NULL, dirname, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		goto err;
+	}
+
+	if (chdir(dirname)) {
+		pr_perror("chdir");
+		goto err;
+	}
+
+	mkdir(put_root, 0755);
+
+	if (sys_pivot_root(".", put_root)) {
+		pr_perror("pivot_root");
+		goto err;
+	}
+
+	if (umount2(put_root, MNT_DETACH)) {
+		pr_perror("umount2");
+		goto err;
+	}
+
+	fd = open(testfile, O_RDWR | O_CREAT | O_EXCL, 0666);
+	if (fd < 0) {
+		pr_perror("open");
+		goto err;
+	}
+	close(fd);
+
+	futex_set_and_wake(futex, TEST_CHILD);
+	futex_wait_while_lt(futex, TEST_CHECK);
+
+	if (access(testfile, F_OK)) {
+		pr_perror("access");
+		goto err;
+	}
+
+	futex_set_and_wake(futex, TEST_EXIT);
+	return 0;
+err:
+	futex_set_and_wake(futex, EMERGENCY_ABORT);
+	return 1;
+}
+
+int main(int argc, char **argv)
+{
+	int pid;
+
+	test_init(argc, argv);
+
+	/*
+	 * Setup futex for processes syncronization
+	 */
+	futex = mmap(NULL, sizeof(futex), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (futex == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+	futex_init(futex);
+
+	/*
+	 * Fork child which would have nested mntns
+	 */
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("fork");
+		return 1;
+	} else if (pid == 0) {
+		exit(child());
+	}
+
+	futex_wait_while_lt(futex, TEST_CHILD);
+	if (futex_get(futex) == EMERGENCY_ABORT) {
+		pr_err("Fail in child\n");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	futex_set_and_wake(futex, TEST_CHECK);
+	futex_wait_while_lt(futex, TEST_EXIT);
+	if (futex_get(futex) == EMERGENCY_ABORT) {
+		fail("Fail in child on check stage");
+		return 1;
+	}
+
+	waitpid(pid, NULL, 0);
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/mntns_pivot_root.desc b/test/zdtm/static/mntns_pivot_root.desc
new file mode 100644
index 000000000..7657ba45c
--- /dev/null
+++ b/test/zdtm/static/mntns_pivot_root.desc
@@ -0,0 +1 @@
+{'flavor': 'ns uns', 'flags': 'suid'}

From 2a3d2bc28422c50e35e2ad031d7d54ad25b66728 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 27 May 2020 13:43:49 +0300
Subject: [PATCH 0950/1854] mount: apply superblock flags to nested ns roots

Before this change we didn't apply sb-flags if we mount the root mount of
non-root mntns. There is no point in it, if we got to do_new_mount this root
mount is not external bind, so we won't change sb-flags on host if we change it
for this mount. So we just loose sb-flags on some regular container mount for
no reason. Fix it.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e7ffe4c60

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 97a903934..dc846a68e 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2213,7 +2213,7 @@ static int do_new_mount(struct mount_info *mi)
 		goto out;
 	}
 
-	if (!mi->is_ns_root && remount_ro) {
+	if (remount_ro) {
 		int fd;
 
 		fd = open(mi->mountpoint, O_PATH);

From a379d4d945fb7feb082572bf3231774334e2ba48 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Jan 2022 10:46:44 +0300
Subject: [PATCH 0951/1854] zdtm: add mntns_pivot_root_ro test

This checks that superblock readonly flag is applied to nested mntns
roots on restore.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile                 |  2 ++
 test/zdtm/static/mntns_pivot_root.c       | 31 +++++++++++++++++++++++
 test/zdtm/static/mntns_pivot_root_ro.c    |  1 +
 test/zdtm/static/mntns_pivot_root_ro.desc |  1 +
 4 files changed, 35 insertions(+)
 create mode 120000 test/zdtm/static/mntns_pivot_root_ro.c
 create mode 120000 test/zdtm/static/mntns_pivot_root_ro.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a22a0540f..bf7462756 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -402,6 +402,7 @@ TST_DIR		=				\
 		mnt_ext_root			\
 		mnt_ext_collision		\
 		mntns_pivot_root		\
+		mntns_pivot_root_ro		\
 		mnt_tracefs			\
 		mntns_deleted			\
 		unlink_regular00		\
@@ -580,6 +581,7 @@ socket-tcp-closed-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK
 socket-tcp-skip-in-flight:	CFLAGS += -D ZDTM_IPV4V6
 tun_ns:			CFLAGS += -DTUN_NS
 mnt_ext_manual:		CFLAGS += -D ZDTM_EXTMAP_MANUAL
+mntns_pivot_root_ro:	CFLAGS += -DMNTNS_PIVOT_ROOT_RO
 sigpending:		LDLIBS += -lrt
 vdso01:			LDLIBS += -lrt
 scm01:			CFLAGS += -DKEEP_SENT_FD
diff --git a/test/zdtm/static/mntns_pivot_root.c b/test/zdtm/static/mntns_pivot_root.c
index 987b0da3b..9826efde4 100644
--- a/test/zdtm/static/mntns_pivot_root.c
+++ b/test/zdtm/static/mntns_pivot_root.c
@@ -8,6 +8,7 @@
 #include <linux/limits.h>
 #include <sys/syscall.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "zdtmtst.h"
 #include "lock.h"
@@ -86,6 +87,21 @@ static int child(void)
 	}
 	close(fd);
 
+#ifdef MNTNS_PIVOT_ROOT_RO
+	/*
+	 * Hack to make cr_pivot_root work on readonly mntns root,
+	 * normally nested containers have /tmp directory
+	 */
+	mkdir("tmp", 0755);
+	/*
+	 * Make superblock readonly
+	 */
+	if (mount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY, NULL)) {
+		pr_perror("remount_ro");
+		goto err;
+	}
+#endif
+
 	futex_set_and_wake(futex, TEST_CHILD);
 	futex_wait_while_lt(futex, TEST_CHECK);
 
@@ -94,6 +110,21 @@ static int child(void)
 		goto err;
 	}
 
+#ifdef MNTNS_PIVOT_ROOT_RO
+	/*
+	 * Check superblock readonly
+	 */
+	fd = open(testfile, O_WRONLY);
+	if (fd >= 0) {
+		pr_err("Open on readonly superblock should fail\n");
+		close(fd);
+		goto err;
+	} else if (errno != EROFS) {
+		pr_perror("open write");
+		goto err;
+	}
+#endif
+
 	futex_set_and_wake(futex, TEST_EXIT);
 	return 0;
 err:
diff --git a/test/zdtm/static/mntns_pivot_root_ro.c b/test/zdtm/static/mntns_pivot_root_ro.c
new file mode 120000
index 000000000..d352a6369
--- /dev/null
+++ b/test/zdtm/static/mntns_pivot_root_ro.c
@@ -0,0 +1 @@
+mntns_pivot_root.c
\ No newline at end of file
diff --git a/test/zdtm/static/mntns_pivot_root_ro.desc b/test/zdtm/static/mntns_pivot_root_ro.desc
new file mode 120000
index 000000000..8708421ed
--- /dev/null
+++ b/test/zdtm/static/mntns_pivot_root_ro.desc
@@ -0,0 +1 @@
+mntns_pivot_root.desc
\ No newline at end of file

From 16085b5e67c10ea7127cb5ac4997f068206c8cea Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 23 Jul 2019 18:33:59 +0300
Subject: [PATCH 0952/1854] mount/restore: create auxiliary binfmt_misc mount
 in the root yard

Put our auxiliary binfmt_misc mount in "<root_yard>/binfmt_misc" instead
of "<root_yard>/<mntns>/proc/sys/fs/binfmt_misc". Thus we can restore
binfmt_misc without altering actual mount tree, which looks much more
safe.

For that we need to remove "fake top mount_info" handling from
add_cr_time_mount as now we intentionally add binfmt_misc mount as a
child of ("fake") root yard. On dump this does not change anything.
Also we need to create mountpoint for binfmt_misc in root yard.

As now mount is out of restored mount tree we don't need to umount it,
so remove corresponding CRTIME_MNT_ID umount hunk in do_new_mount.

Note: to make binfmt_misc c/r work criu should be compiled with
CONFIG_BINFMT_MISC_VIRTUALIZED and binfmt_misc should be actually
virtualized and this is only done in Virtuozzo kernel per ve.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/2eb535843
Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/d79c7f441
Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/34002bef4
Cherry-picked one hunk from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/45bf6f0ee

Changes: merge all fixups together to one consistent patch.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 52 ++++++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index dc846a68e..72b17bc1b 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1568,29 +1568,16 @@ err:
 	return -1;
 }
 
-static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsname, const char *path, unsigned int s_dev,
-					    bool rst)
+static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *root, char *fsname, const char *path,
+							   unsigned int s_dev, bool rst)
 {
 	struct mount_info *mi, *t, *parent;
 	bool add_slash = false;
 	int len;
 
-	if (!root->nsid) {
-		/* On restore we have fake top mount_info. Find real NS_ROOT */
-		list_for_each_entry(t, &root->children, siblings)
-			if (t->nsid->type == NS_ROOT) {
-				root = t;
-				break;
-			}
-		if (!root->nsid) {
-			pr_err("Can't find NS_ROOT\n");
-			return -1;
-		}
-	}
-
 	mi = mnt_entry_alloc(rst);
 	if (!mi)
-		return -1;
+		return NULL;
 
 	len = strlen(root->mountpoint);
 	/* It may be "./" or "./path/to/dir" */
@@ -1637,11 +1624,11 @@ static __maybe_unused int add_cr_time_mount(struct mount_info *root, char *fsnam
 	mi->parent_mnt_id = parent->mnt_id;
 	list_add(&mi->siblings, &parent->children);
 	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n", mi->mountpoint, parent->mountpoint, parent->mnt_id);
-	return 0;
+	return mi;
 
 err:
 	mnt_entry_free(mi);
-	return -1;
+	return NULL;
 }
 
 /* Returns 1 in case of success, -errno in case of mount fail, and 0 on other errors */
@@ -2204,15 +2191,6 @@ static int do_new_mount(struct mount_info *mi)
 	if (tp->restore && tp->restore(mi))
 		return -1;
 
-	if (mi->mnt_id == CRTIME_MNT_ID) {
-		/* C-r time mountpoint, umount it */
-		if (umount(mi->mountpoint) < 0) {
-			pr_perror("Can't umount %s", mi->mountpoint);
-			return -1;
-		}
-		goto out;
-	}
-
 	if (remount_ro) {
 		int fd;
 
@@ -2242,7 +2220,7 @@ static int do_new_mount(struct mount_info *mi)
 	BUG_ON(mi->master_id);
 	if (restore_shared_options(mi, !mi->shared_id, mi->shared_id, 0))
 		return -1;
-out:
+
 	mi->mounted = true;
 
 	return 0;
@@ -3384,7 +3362,7 @@ static int merge_mount_trees(struct mount_info *root_yard)
 /*
  * All nested mount namespaces are restore as sub-trees of the root namespace.
  */
-static int populate_roots_yard(void)
+static int populate_roots_yard(struct mount_info *cr_time)
 {
 	struct mnt_remap_entry *r;
 	char path[PATH_MAX];
@@ -3415,11 +3393,17 @@ static int populate_roots_yard(void)
 		}
 	}
 
+	if (cr_time && mkdirpat(AT_FDCWD, cr_time->mountpoint, 0755)) {
+		pr_perror("Unable to create %s", cr_time->mountpoint);
+		return -1;
+	}
+
 	return 0;
 }
 
 static int populate_mnt_ns(void)
 {
+	struct mount_info *cr_time = NULL;
 	int ret;
 
 	root_yard_mp = mnt_entry_alloc(true);
@@ -3436,8 +3420,8 @@ static int populate_mnt_ns(void)
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 	if (!opts.has_binfmt_misc && !list_empty(&binfmt_misc_list)) {
 		/* Add to mount tree. Generic code will mount it later */
-		ret = add_cr_time_mount(root_yard_mp, "binfmt_misc", BINFMT_MISC_HOME, 0, true);
-		if (ret)
+		cr_time = add_cr_time_mount(root_yard_mp, "binfmt_misc", "binfmt_misc", 0, true);
+		if (!cr_time)
 			return -1;
 	}
 #endif
@@ -3453,7 +3437,7 @@ static int populate_mnt_ns(void)
 	if (find_remap_mounts(root_yard_mp))
 		return -1;
 
-	if (populate_roots_yard())
+	if (populate_roots_yard(cr_time))
 		return -1;
 
 	if (mount_clean_path())
@@ -3887,8 +3871,8 @@ int collect_mnt_namespaces(bool for_dump)
 			} else if (ret == 0) {
 				ret = -1;
 				goto err;
-			} else if (ret > 0 && add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc", BINFMT_MISC_HOME,
-								s_dev, false) < 0) {
+			} else if (ret > 0 && !add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc", BINFMT_MISC_HOME,
+								 s_dev, false)) {
 				ret = -1;
 				goto err;
 			}

From 4736a7240e84ef77ef94d1be25a39c0fcdfe72d7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Jan 2022 17:45:46 +0300
Subject: [PATCH 0953/1854] mount/restore: leave ns_mountpoint NULL for aux
 binfmt_misc mount

On dump, yes, mountpoint and ns_mountpoint are the same, but on restore
they don't and puting something like "<root_yard>/binfmt_misc" to
ns_mountpoint is wrong, let's leave ns_mountpoint NULL, this mount
should not be compared by ns_mountpoint with other mounts anyway.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 72b17bc1b..3b57622b6 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1589,7 +1589,8 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
 	mi->mountpoint = xmalloc(len + strlen(path) + 1);
 	if (!mi->mountpoint)
 		goto err;
-	mi->ns_mountpoint = mi->mountpoint;
+	if (!rst)
+		mi->ns_mountpoint = mi->mountpoint;
 	if (!add_slash)
 		sprintf(mi->mountpoint, "%s%s", root->mountpoint, path);
 	else

From b52fcb284a6fe26d60ce92d77c2d23bece00123f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 7 May 2020 16:13:02 +0300
Subject: [PATCH 0954/1854] mount: replace CRTIME_MNT_ID with HELPER_MNT_ID

Root yard mount also has mnt_id == 0 so it will look better with a new
name. Let's explicitly initialize root yard mnt_id to HELPER_MNT_ID
for the sake of code readability.

Also in near future we might want to create additional mount helpers to support
mounts in CT with no fsroot mounted.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/45bf6f0ee

Changes: split umount hunk to previous patch, set HELPER_MNT_ID for root
yard.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 3b57622b6..1bdd69478 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -37,7 +37,8 @@
 #define LOG_PREFIX "mnt: "
 
 #define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc"
-#define CRTIME_MNT_ID	 0
+
+#define HELPER_MNT_ID 0
 
 #define CONTEXT_OPT "context="
 
@@ -1595,7 +1596,7 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
 		sprintf(mi->mountpoint, "%s%s", root->mountpoint, path);
 	else
 		sprintf(mi->mountpoint, "%s/%s", root->mountpoint, path);
-	mi->mnt_id = CRTIME_MNT_ID;
+	mi->mnt_id = HELPER_MNT_ID;
 	mi->flags = mi->sb_flags = 0;
 	mi->root = xstrdup("/");
 	mi->fsname = xstrdup(fsname);
@@ -1718,8 +1719,8 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 	    pm->fstype->check_bindmount(pm))
 		return -1;
 
-	if (pm->mnt_id == CRTIME_MNT_ID) {
-		pr_info("Skip dumping cr-time mountpoint: %s\n", pm->mountpoint);
+	if (pm->mnt_id == HELPER_MNT_ID) {
+		pr_info("Skip dumping helper mountpoint: %s\n", pm->mountpoint);
 		return 0;
 	}
 
@@ -3414,6 +3415,7 @@ static int populate_mnt_ns(void)
 	root_yard_mp->mountpoint = mnt_roots;
 	root_yard_mp->mounted = true;
 	root_yard_mp->mnt_bind_is_populated = true;
+	root_yard_mp->mnt_id = HELPER_MNT_ID;
 
 	if (merge_mount_trees(root_yard_mp))
 		return -1;
@@ -3931,7 +3933,7 @@ void clean_cr_time_mounts(void)
 	for (mi = mntinfo; mi; mi = mi->next) {
 		int cwd_fd;
 
-		if (mi->mnt_id != CRTIME_MNT_ID)
+		if (mi->mnt_id != HELPER_MNT_ID)
 			continue;
 		ret = switch_mnt_ns(mi->nsid->ns_pid, &ns_old, &cwd_fd);
 		if (ret) {

From ef79912c1d79133cf8301cb7196f5e79c4144dce Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 30 Dec 2021 15:24:30 +0300
Subject: [PATCH 0955/1854] mount: add can_receive_master_from_root helper

If mount has external master_id it can inherit it as a bind of external
mount, but also it can inherit it as a bind of container root mount, so
let's add similar condition to allow such mounts.

Note: need_master is false for binds of root mount which can inherit
master_id from root mounts yet, this would change in next patch.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 1bdd69478..03d0e6da1 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -633,6 +633,19 @@ bool mnt_is_root_bind(struct mount_info *mi)
 	return mnt_get_root_bind(mi);
 }
 
+static bool __can_receive_master_from_root(struct mount_info *mi, struct mount_info *bind)
+{
+	if (rst_mnt_is_root(bind) && bind->master_id == mi->master_id && is_sub_path(mi->root, bind->root))
+		return true;
+
+	return false;
+}
+
+static struct mount_info *can_receive_master_from_root(struct mount_info *mi)
+{
+	return mnt_bind_pick(mi, __can_receive_master_from_root);
+}
+
 /*
  * Having two children with same mountpoint is unsupported. That can happen in
  * case of mount propagation inside of shared mounts, in that case it is hard
@@ -1043,10 +1056,14 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 		}
 
 		/*
-		 * If we haven't already determined this mount is external,
-		 * or bind of external, then we don't know where it came from.
+		 * External master detected
 		 */
-		if (need_master && m->parent && !can_receive_master_from_external(m)) {
+		if (need_master) {
+			if (can_receive_master_from_external(m))
+				continue;
+			if (can_receive_master_from_root(m))
+				continue;
+
 			pr_err("Mount %d %s (master_id: %d shared_id: %d) "
 			       "has unreachable sharing. Try --enable-external-masters.\n",
 			       m->mnt_id, m->mountpoint, m->master_id, m->shared_id);

From 4f156f32ba31768c366b50ca0ce4076370a3d3be Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 20 Feb 2020 10:50:42 +0300
Subject: [PATCH 0956/1854] mount: put external slavery mounts to separate
 mnt_ext_slave list

We need to put mounts which need to inherit master_id from external
mounts or from root mount into separate list, so that we can set ->bind
on them right in propagate_siblings.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/ea592cf6e

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/mount.c         | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 1ceb394b6..071c0246e 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -77,6 +77,7 @@ struct mount_info {
 	struct list_head mnt_share;	 /* circular list of shared mounts */
 	struct list_head mnt_slave_list; /* list of slave mounts */
 	struct list_head mnt_slave;	 /* slave list entry */
+	struct list_head mnt_ext_slave;	 /* external slave list entry */
 	struct mount_info *mnt_master;	 /* slave is on master->mnt_slave_list */
 	struct list_head mnt_propagate;	 /* circular list of mounts which propagate from each other */
 	struct list_head mnt_notprop;	 /* temporary list used in can_mount_now */
diff --git a/criu/mount.c b/criu/mount.c
index 03d0e6da1..22c062e36 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1059,10 +1059,12 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 		 * External master detected
 		 */
 		if (need_master) {
-			if (can_receive_master_from_external(m))
-				continue;
-			if (can_receive_master_from_root(m))
+			if ((t = can_receive_master_from_external(m)) || (t = can_receive_master_from_root(m))) {
+				pr_debug("Detected external slavery for %d via %d\n", m->mnt_id, t->mnt_id);
+				if (m != t)
+					list_add(&m->mnt_ext_slave, &t->mnt_ext_slave);
 				continue;
+			}
 
 			pr_err("Mount %d %s (master_id: %d shared_id: %d) "
 			       "has unreachable sharing. Try --enable-external-masters.\n",
@@ -2056,6 +2058,14 @@ static int propagate_siblings(struct mount_info *mi)
 		t->s_dev_rt = mi->s_dev_rt;
 	}
 
+	list_for_each_entry(t, &mi->mnt_ext_slave, mnt_ext_slave) {
+		if (t->mounted || t->bind)
+			continue;
+		pr_debug("\t\tBind ext-slave %s(%d)\n", t->ns_mountpoint, t->mnt_id);
+		t->bind = mi;
+		t->s_dev_rt = mi->s_dev_rt;
+	}
+
 	return 0;
 }
 
@@ -2924,6 +2934,7 @@ struct mount_info *mnt_entry_alloc(bool rst)
 		INIT_LIST_HEAD(&new->children);
 		INIT_LIST_HEAD(&new->siblings);
 		INIT_LIST_HEAD(&new->mnt_slave_list);
+		INIT_LIST_HEAD(&new->mnt_ext_slave);
 		INIT_LIST_HEAD(&new->mnt_share);
 		INIT_LIST_HEAD(&new->mnt_bind);
 		INIT_LIST_HEAD(&new->mnt_propagate);

From 0fd0e03a216535eb7b2a08646c59af7634559da7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 14 Jan 2022 14:33:30 +0300
Subject: [PATCH 0957/1854] mount: do not override master_id to -1 for root
 binds

There is no point to lose this information, having -1 everywhere in
mount images instead of acutall master id can be confusing.

Note that now need_master is true for bindmounts of root mounts with
same master_id as root mount, so now they are handled with a common
code, we've added can_receive_master_from_root check specially to handle
this case right. Also note that in propagate_mount we no more set ->bind
for this case, this is handled by mnt_ext_slave list related code.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/b3c9dc05e

Stripped only master_id relative part of original patch, add
preparational patches before this one.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 22c062e36..8d0a17d96 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1013,7 +1013,7 @@ struct mount_info *mnt_bind_pick(struct mount_info *mi, bool (*pick)(struct moun
 	return NULL;
 }
 
-static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
+static int resolve_shared_mounts(struct mount_info *info)
 {
 	struct mount_info *m, *t;
 
@@ -1026,12 +1026,8 @@ static int resolve_shared_mounts(struct mount_info *info, int root_master_id)
 	for (m = info; m; m = m->next) {
 		bool need_share, need_master;
 
-		/* the root master_id can be ignored, because it's already created */
-		if (root_master_id && root_master_id == m->master_id)
-			m->master_id = -1;
-
 		need_share = m->shared_id && list_empty(&m->mnt_share);
-		need_master = m->master_id > 0;
+		need_master = m->master_id;
 
 		pr_debug("Inspecting sharing on %2d shared_id %d master_id %d (@%s)\n", m->mnt_id, m->shared_id,
 			 m->master_id, m->mountpoint);
@@ -2110,7 +2106,7 @@ skip_parent:
 				continue;
 			if (t->bind)
 				continue;
-			if (t->master_id > 0)
+			if (t->master_id)
 				continue;
 			if (!issubpath(t->root, mi->root))
 				continue;
@@ -3457,7 +3453,7 @@ static int populate_mnt_ns(void)
 	}
 #endif
 
-	if (resolve_shared_mounts(mntinfo, 0))
+	if (resolve_shared_mounts(mntinfo))
 		return -1;
 
 	if (validate_mounts(mntinfo, false))
@@ -3845,7 +3841,6 @@ int mntns_get_root_by_mnt_id(int mnt_id)
 struct collect_mntns_arg {
 	bool need_to_validate;
 	bool for_dump;
-	int root_master_id;
 };
 
 static int collect_mntns(struct ns_id *ns, void *__arg)
@@ -3862,9 +3857,6 @@ static int collect_mntns(struct ns_id *ns, void *__arg)
 
 	mntinfo_add_list(pms);
 
-	if (arg->need_to_validate && ns->id == root_item->ids->mnt_ns_id)
-		arg->root_master_id = ns->mnt.mntinfo_tree->master_id;
-
 	return 0;
 }
 
@@ -3918,7 +3910,7 @@ int collect_mnt_namespaces(bool for_dump)
 	if (arg.need_to_validate) {
 		ret = -1;
 
-		if (resolve_shared_mounts(mntinfo, arg.root_master_id))
+		if (resolve_shared_mounts(mntinfo))
 			goto err;
 		if (validate_mounts(mntinfo, true))
 			goto err;

From 83bbf1b051ead582e5106475dd380dff78dc4ad7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 27 May 2020 11:50:34 +0300
Subject: [PATCH 0958/1854] mount: add helper mnt_get_external_bind_nodev

Will use it to find shared mount we can bind from and also can inherit
external slavery. Device-external can't give us external slavery.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/dcd952c4c

Changes: switch to mnt_bind_pick helper.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  1 +
 criu/mount.c         | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 071c0246e..050141058 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -180,6 +180,7 @@ extern bool has_mounted_external_bind(struct mount_info *mi);
 extern bool rst_mnt_is_root(struct mount_info *mi);
 extern struct mount_info *mnt_get_root_bind(struct mount_info *mi);
 extern bool mnt_is_root_bind(struct mount_info *mi);
+extern struct mount_info *mnt_get_external_bind_nodev(struct mount_info *mi);
 
 extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
diff --git a/criu/mount.c b/criu/mount.c
index 8d0a17d96..632da6f5c 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -646,6 +646,19 @@ static struct mount_info *can_receive_master_from_root(struct mount_info *mi)
 	return mnt_bind_pick(mi, __can_receive_master_from_root);
 }
 
+static bool __mnt_is_external_bind_nodev(struct mount_info *mi, struct mount_info *bind)
+{
+	if (bind->external && !mnt_is_dev_external(bind) && is_sub_path(mi->root, bind->root))
+		return true;
+
+	return false;
+}
+
+struct mount_info *mnt_get_external_bind_nodev(struct mount_info *mi)
+{
+	return mnt_bind_pick(mi, __mnt_is_external_bind_nodev);
+}
+
 /*
  * Having two children with same mountpoint is unsupported. That can happen in
  * case of mount propagation inside of shared mounts, in that case it is hard

From 770cdbfb9f24220275782659fbd6fcea881bad05 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 10:27:05 +0300
Subject: [PATCH 0959/1854] mount: prepare is_overmounted as early as possible

Function mnt_is_overmounted is designed to detect if mount is overmounted in
current tree using comparison of mountpoints of neighbour mounts for detection.
We want to get actual overmounts in dumped tree, we don't expect that helper
mounts we add or merging will introduce new overmounts. So let's do overmount
detection earlier before adding helpers.

Set is_overmounted = false for root yard and binfmt helper mounts.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e98e1456d

Changes: rename set_is_overmounted to prepare_is_overmounted, move it
just after collecting mounts from images to mount tree, handle helper
mounts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  2 ++
 criu/mount.c         | 31 +++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 050141058..519a34d2a 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -184,4 +184,6 @@ extern struct mount_info *mnt_get_external_bind_nodev(struct mount_info *mi);
 
 extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
+
+extern int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *));
 #endif /* __CR_MOUNT_H__ */
diff --git a/criu/mount.c b/criu/mount.c
index 632da6f5c..30872f1ce 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1347,13 +1347,35 @@ exit:
 	return mi->is_overmounted;
 }
 
-static int set_is_overmounted(struct mount_info *mi)
+static int __set_is_overmounted(struct mount_info *mi)
 {
 	/* coverity[check_return] */
 	mnt_is_overmounted(mi);
 	return 0;
 }
 
+/*
+ * mnt_is_overmounted is intended to detect overmounts in original dumped mount
+ * tree, so we pre-save it just after loading mount tree from images, so that
+ * it does not mess up with any helper mounts or tree changes we can do.
+ */
+static void prepare_is_overmounted(void)
+{
+	struct ns_id *nsid;
+
+	for (nsid = ns_ids; nsid; nsid = nsid->next) {
+		struct mount_info *root;
+
+		if (nsid->nd != &mnt_ns_desc)
+			continue;
+
+		root = nsid->mnt.mntinfo_tree;
+
+		BUG_ON(root->parent);
+		mnt_tree_for_each(root, __set_is_overmounted);
+	}
+}
+
 /*
  * __umount_children_overmounts() assumes that the mountpoint and
  * it's ancestors have no sibling-overmounts, so we can see children
@@ -1649,6 +1671,7 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
 	}
 
 	mi->mnt_bind_is_populated = true;
+	mi->is_overmounted = false;
 	mi->nsid = parent->nsid;
 	mi->parent = parent;
 	mi->parent_mnt_id = parent->mnt_id;
@@ -1893,7 +1916,7 @@ err:
 
 #define MNT_WALK_NONE 0 &&
 
-static int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *))
+int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *))
 {
 	struct mount_info *tmp;
 	LIST_HEAD(postpone);
@@ -3278,6 +3301,7 @@ int read_mnt_ns_img(void)
 	mntinfo = pms;
 
 	search_bindmounts();
+	prepare_is_overmounted();
 
 	return 0;
 }
@@ -3452,6 +3476,7 @@ static int populate_mnt_ns(void)
 	root_yard_mp->mountpoint = mnt_roots;
 	root_yard_mp->mounted = true;
 	root_yard_mp->mnt_bind_is_populated = true;
+	root_yard_mp->is_overmounted = false;
 	root_yard_mp->mnt_id = HELPER_MNT_ID;
 
 	if (merge_mount_trees(root_yard_mp))
@@ -3472,8 +3497,6 @@ static int populate_mnt_ns(void)
 	if (validate_mounts(mntinfo, false))
 		return -1;
 
-	mnt_tree_for_each(root_yard_mp, set_is_overmounted);
-
 	if (find_remap_mounts(root_yard_mp))
 		return -1;
 

From 71824704549e0c08f2c715c7cb85c26b6f55965c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 29 Jun 2020 18:04:41 +0300
Subject: [PATCH 0960/1854] mount: move root yard tree merge as early as
 possible

Let's merge mount trees under root_yard just after reading from image.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/8e8ecdfdc

Changes: split only root yard part as a separate patch, and put root
yard alloc into merge_mount_trees.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 68 ++++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 30872f1ce..b2810b7a5 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -3271,6 +3271,37 @@ err:
 	return -1;
 }
 
+static int merge_mount_trees(void)
+{
+	struct ns_id *nsid;
+
+	root_yard_mp = mnt_entry_alloc(true);
+	if (!root_yard_mp)
+		return -1;
+
+	root_yard_mp->mountpoint = mnt_roots;
+	root_yard_mp->mounted = true;
+	root_yard_mp->mnt_bind_is_populated = true;
+	root_yard_mp->is_overmounted = false;
+	root_yard_mp->mnt_id = HELPER_MNT_ID;
+
+	/* Merge mount trees together under root_yard_mp */
+	for (nsid = ns_ids; nsid; nsid = nsid->next) {
+		struct mount_info *root;
+
+		if (nsid->nd != &mnt_ns_desc)
+			continue;
+
+		root = nsid->mnt.mntinfo_tree;
+
+		pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->mountpoint);
+		root->parent = root_yard_mp;
+		list_add(&root->siblings, &root_yard_mp->children);
+	}
+
+	return 0;
+}
+
 int read_mnt_ns_img(void)
 {
 	struct mount_info *pms = NULL;
@@ -3303,6 +3334,9 @@ int read_mnt_ns_img(void)
 	search_bindmounts();
 	prepare_is_overmounted();
 
+	if (merge_mount_trees())
+		return -1;
+
 	return 0;
 }
 
@@ -3401,27 +3435,6 @@ void fini_restore_mntns(void)
 	}
 }
 
-static int merge_mount_trees(struct mount_info *root_yard)
-{
-	struct ns_id *nsid;
-
-	/* Merge mount trees together under root_yard */
-	for (nsid = ns_ids; nsid; nsid = nsid->next) {
-		struct mount_info *root;
-
-		if (nsid->nd != &mnt_ns_desc)
-			continue;
-
-		root = nsid->mnt.mntinfo_tree;
-
-		pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->mountpoint);
-		root->parent = root_yard;
-		list_add(&root->siblings, &root_yard->children);
-	}
-
-	return 0;
-}
-
 /*
  * All nested mount namespaces are restore as sub-trees of the root namespace.
  */
@@ -3469,19 +3482,6 @@ static int populate_mnt_ns(void)
 	struct mount_info *cr_time = NULL;
 	int ret;
 
-	root_yard_mp = mnt_entry_alloc(true);
-	if (!root_yard_mp)
-		return -1;
-
-	root_yard_mp->mountpoint = mnt_roots;
-	root_yard_mp->mounted = true;
-	root_yard_mp->mnt_bind_is_populated = true;
-	root_yard_mp->is_overmounted = false;
-	root_yard_mp->mnt_id = HELPER_MNT_ID;
-
-	if (merge_mount_trees(root_yard_mp))
-		return -1;
-
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 	if (!opts.has_binfmt_misc && !list_empty(&binfmt_misc_list)) {
 		/* Add to mount tree. Generic code will mount it later */

From 0c41c1187ba55fde6299d01c94c99fb4fe51a08d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 8 Jul 2020 09:57:33 +0300
Subject: [PATCH 0961/1854] mount: fix broken remounted_rw check

Expression (x && REMOUNTED_RW) is always same as just (x).

It should've been (x & REMOUNTED_RW) to check if mount is marked as
temporary remounted writable and requires to be switched back.

By fixing this check we eliminate excess readonly remounts.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/167f8ac67

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index b2810b7a5..3421ef491 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -4113,7 +4113,7 @@ static int __remount_readonly_mounts(struct ns_id *ns)
 		if (ns && mi->nsid != ns)
 			continue;
 
-		if (!(*mi->remounted_rw && REMOUNTED_RW))
+		if (!(*mi->remounted_rw & REMOUNTED_RW))
 			continue;
 
 		/*

From 7a67949e55d1669799ddbd1aa89fbbc846885fb9 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 16 Jun 2020 16:19:42 +0300
Subject: [PATCH 0962/1854] mount: make general place for shared variables on
 mount-info on restore

Put remounted_rw to it. This allows us to easily add some more of such
variables without allocating each one of them separately.

Due to existance of shfree_last shmalloc'ed region can be inherited from
the previous caller so it needs to be explicitly zero initialized.

Fixes: 0a2d380e6 ("ghost/mount: allocate remounted_rw in shmem to get
info from other processes")

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/6750e5793

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  7 ++++++-
 criu/mount.c         | 13 +++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 519a34d2a..3067e4088 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -26,6 +26,10 @@ struct ns_id;
  */
 #define REMOUNTED_RW_SERVICE 2
 
+struct rst_mount_info {
+	int remounted_rw;
+};
+
 struct mount_info {
 	int mnt_id;
 	int parent_mnt_id;
@@ -86,7 +90,8 @@ struct mount_info {
 	struct list_head postpone;
 
 	int is_overmounted;
-	int *remounted_rw;
+
+	struct rst_mount_info *rmi;
 
 	void *private; /* associated filesystem data */
 };
diff --git a/criu/mount.c b/criu/mount.c
index 3421ef491..5fdd60cda 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2955,11 +2955,12 @@ struct mount_info *mnt_entry_alloc(bool rst)
 	new = xzalloc(sizeof(struct mount_info));
 	if (new) {
 		if (rst) {
-			new->remounted_rw = shmalloc(sizeof(int));
-			if (!new->remounted_rw) {
+			new->rmi = shmalloc(sizeof(struct rst_mount_info));
+			if (!new->rmi) {
 				xfree(new);
 				return NULL;
 			}
+			memset(new->rmi, 0, sizeof(struct rst_mount_info));
 		}
 		new->fd = -1;
 		new->is_overmounted = -1;
@@ -4073,9 +4074,9 @@ int try_remount_writable(struct mount_info *mi, bool ns)
 		remounted = REMOUNTED_RW_SERVICE;
 
 	/* All mounts in mntinfo list should have it on restore */
-	BUG_ON(mi->remounted_rw == NULL);
+	BUG_ON(mi->rmi == NULL);
 
-	if (mi->flags & MS_RDONLY && !(*mi->remounted_rw & remounted)) {
+	if (mi->flags & MS_RDONLY && !(mi->rmi->remounted_rw & remounted)) {
 		if (mnt_is_overmounted(mi)) {
 			pr_err("The mount %d is overmounted so paths are invisible\n", mi->mnt_id);
 			return -1;
@@ -4098,7 +4099,7 @@ int try_remount_writable(struct mount_info *mi, bool ns)
 			if (call_helper_process(ns_remount_writable, mi))
 				return -1;
 		}
-		*mi->remounted_rw |= remounted;
+		mi->rmi->remounted_rw |= remounted;
 	}
 
 	return 0;
@@ -4113,7 +4114,7 @@ static int __remount_readonly_mounts(struct ns_id *ns)
 		if (ns && mi->nsid != ns)
 			continue;
 
-		if (!(*mi->remounted_rw & REMOUNTED_RW))
+		if (!(mi->rmi->remounted_rw & REMOUNTED_RW))
 			continue;
 
 		/*

From b954e5136056a48922300b97e7e7089e68c6bd03 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 26 May 2020 16:40:57 +0300
Subject: [PATCH 0963/1854] autofs: use ns_mountpoint in autofs_create_dentries

Replace ->mountpoint with ->ns_mountpoint for determining relations
between mounts.

Also let's use get_relative_path in autofs_create_dentries as it is more
robust, before that we've missed the case where mountpoint of child of
autofs mount is multilevel subdirectory of parent mountpoint, and always
created them as single level subdirectory.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/5d5462202

Changes: skip children overmount as it does not need a subdirectory.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/autofs.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index 71edc7bce..9d146b92b 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -725,14 +725,19 @@ static int autofs_create_dentries(const struct mount_info *mi, char *mnt_path)
 	struct mount_info *c;
 
 	list_for_each_entry(c, &mi->children, siblings) {
-		char *path, *basename;
+		char *path, *rel_path;
 
-		basename = strrchr(c->mountpoint, '/');
-		if (!basename) {
-			pr_info("%s: mount path \"%s\" doesn't have '/'\n", __func__, c->mountpoint);
+		rel_path = get_relative_path(c->ns_mountpoint, mi->ns_mountpoint);
+		if (!rel_path) {
+			pr_err("Can't get path %s relative to %s\n", c->ns_mountpoint, mi->ns_mountpoint);
 			return -1;
 		}
-		path = xsprintf("%s%s", mnt_path, basename);
+
+		/* Skip children-overmount */
+		if (*rel_path == '\0')
+			continue;
+
+		path = xsprintf("%s/%s", mnt_path, rel_path);
 		if (!path)
 			return -1;
 		if (mkdir(path, 0555) < 0) {

From e8de10a4fb995c36c03b7d8130bca4345bb8746c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 30 Nov 2021 12:11:02 +0300
Subject: [PATCH 0964/1854] mount: use ns_mountpoint in mnt_is_overmounted

Let's use ->ns_mountpoint in comparison as ->mountpoint can change (e.g.
see how we add ns root in get_mp_mountpoint and in do_remap_mount we can
change it again). We plan to get rid of ->mountpoint everywhere where we
can use unchanged ->ns_mountpoint.

Cherry-picked hunks from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e98e1456d

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 5fdd60cda..83baef4f3 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1322,7 +1322,7 @@ bool mnt_is_overmounted(struct mount_info *mi)
 		list_for_each_entry(t, &m->parent->children, siblings) {
 			if (m == t)
 				continue;
-			if (issubpath(m->mountpoint, t->mountpoint)) {
+			if (issubpath(m->ns_mountpoint, t->ns_mountpoint)) {
 				mi->is_overmounted = 1;
 				goto exit;
 			}
@@ -1338,7 +1338,7 @@ bool mnt_is_overmounted(struct mount_info *mi)
 
 	/* Check there is no children-overmount */
 	list_for_each_entry(c, &mi->children, siblings)
-		if (!strcmp(c->mountpoint, mi->mountpoint)) {
+		if (!strcmp(c->ns_mountpoint, mi->ns_mountpoint)) {
 			mi->is_overmounted = 1;
 			goto exit;
 		}

From 07eb01593d835ad044cde822e1f04b7a8f8ecea3 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 12:40:52 +0300
Subject: [PATCH 0965/1854] mount: skip root yard children from mnt_needs_remap
 check

There is no point of remaping ns root mounts they can't overmount anybody.

This also allows us to switch mnt_needs_remap from ->mountpoint to
->ns_mountpoint for mount comparison in overmount detection.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/9475bf843

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 83baef4f3..fffebe801 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -541,13 +541,13 @@ static bool mnt_needs_remap(struct mount_info *m)
 {
 	struct mount_info *t;
 
-	if (!m->parent)
+	if (!m->parent || m->parent == root_yard_mp)
 		return false;
 
 	list_for_each_entry(t, &m->parent->children, siblings) {
 		if (m == t)
 			continue;
-		if (issubpath(t->mountpoint, m->mountpoint))
+		if (issubpath(t->ns_mountpoint, m->ns_mountpoint))
 			return true;
 	}
 
@@ -556,7 +556,7 @@ static bool mnt_needs_remap(struct mount_info *m)
 	 * remapped too, else fixup_remap_mounts() won't be able to move parent
 	 * to it's real place, it will move child instead.
 	 */
-	if (!strcmp(m->parent->mountpoint, m->mountpoint))
+	if (!strcmp(m->parent->ns_mountpoint, m->ns_mountpoint))
 		return mnt_needs_remap(m->parent);
 
 	return false;

From 010295b8fa4ce0b5a8617c937f10b227abb2203a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 13:00:48 +0300
Subject: [PATCH 0966/1854] mount: use ns_mountpoint in
 validate_children_collision

Function validate_children_collision is both called on dump and on
restore. On dump mountpoint and ns_mountpoint are the same. On restore
as we never call validate_children_collision on helper mounts
(root_yard_mp and cr_time are not in mntinfo list), for all other mounts
strcmp results would be the same with mountpoint and ns_mountpoint.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/8f4fda5ac

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index fffebe801..3e907172d 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -676,7 +676,7 @@ static int validate_children_collision(struct mount_info *mnt)
 		list_for_each_entry(chj, &mnt->children, siblings) {
 			if (chj == chi)
 				break;
-			if (!strcmp(chj->mountpoint, chi->mountpoint)) {
+			if (!strcmp(chj->ns_mountpoint, chi->ns_mountpoint)) {
 				pr_err("Mount %d has two children with same "
 				       "mountpoint: %d %d\n",
 				       mnt->mnt_id, chj->mnt_id, chi->mnt_id);

From c17695cb113e7b5eafc06ce6023c036bf0f4a274 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 13:39:10 +0300
Subject: [PATCH 0967/1854] mount: use ns_mountpoint in root_path_from_parent

Fail root_path_from_parent if parent is root_yard, we want to only
lookup root path in real parent mounts.

Now it is safe to use ns_mountpoint instead of mountpoint as both
children and parent have it and they are relative.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e58a91883

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 3e907172d..516752a98 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -905,11 +905,11 @@ static int root_path_from_parent(struct mount_info *m, char *buf, int size)
 	bool head_slash = false, tail_slash = false;
 	int p_len, m_len, len;
 
-	if (!m->parent)
+	if (!m->parent || m->parent == root_yard_mp)
 		return -1;
 
-	p_len = strlen(m->parent->mountpoint);
-	m_len = strlen(m->mountpoint);
+	p_len = strlen(m->parent->ns_mountpoint);
+	m_len = strlen(m->ns_mountpoint);
 
 	len = snprintf(buf, size, "%s", m->parent->root);
 	if (len >= size)
@@ -925,11 +925,11 @@ static int root_path_from_parent(struct mount_info *m, char *buf, int size)
 	len = m_len - p_len;
 	BUG_ON(len < 0);
 	if (len) {
-		if (m->mountpoint[p_len] == '/')
+		if (m->ns_mountpoint[p_len] == '/')
 			head_slash = true;
 
 		len = snprintf(buf, size, "%s%s", (!tail_slash && !head_slash) ? "/" : "",
-			       m->mountpoint + p_len + (tail_slash && head_slash));
+			       m->ns_mountpoint + p_len + (tail_slash && head_slash));
 		if (len >= size)
 			return -1;
 	}

From abbc70adc97f9ddeccabd5de343d22f3c4917dd5 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 13:52:45 +0300
Subject: [PATCH 0968/1854] mount: use ns_mountpoint for children-overmount
 check

We need to skip root_yard_mp parent as it has no ns_mountpoint, it also
has no children overmounts so we are safe, all others can be compared by
ns_mountpoints.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e5665c976

Changes: add mi->parent pre-check, reword commit message.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 516752a98..b0c43e3ca 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2675,7 +2675,7 @@ static int do_mount_one(struct mount_info *mi)
 		return 1;
 	}
 
-	if (!strcmp(mi->parent->mountpoint, mi->mountpoint)) {
+	if ((mi->parent && mi->parent != root_yard_mp) && !strcmp(mi->parent->ns_mountpoint, mi->ns_mountpoint)) {
 		mi->parent->fd = open(mi->parent->mountpoint, O_PATH);
 		if (mi->parent->fd < 0) {
 			pr_perror("Unable to open %s", mi->mountpoint);

From f2bf6597caed5bd48c54c489290bc42adf2618fa Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 1 Dec 2021 12:52:27 +0300
Subject: [PATCH 0969/1854] path: simplify mnt_get_sibling_path via
 get_relative_path

Previous code did:

1) get rpath: mount's mountpoint relative to it's parent mountpoint
2) get cut_root: parent's root relative to parent's slave root or vice
versa (will be "-" if parents root is wider of "+" if thicker)
3) return parent's slave mountpoint +/- cut_root + rpath

It can be done more robust with get_relative_path:

1) get rpath: mount's mountpoint relative to it's parent mountpoint
2) get fsrpath: add rpath to parent's root (path relative to fs root)
3) get rpath: fsrpath relative to parent's slave root
4) return parent's slave mountpoint + rpath

In the latter approach we do not need to open code workarounds for
consequent slashes in paths (get_relative_path would do this for us),
and we also do not need to have complex logic with +/-.

While on it let's also switch ->mountpoint to ->ns_mountpoint where
possible, as mountpoint can have unexpected prefixes.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/0fd09f8571

Changes: rework mnt_get_sibling_path more.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c |  4 +++-
 criu/path.c  | 65 +++++++++++++---------------------------------------
 2 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index b0c43e3ca..1ffd3da8d 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2040,6 +2040,8 @@ static int umount_from_slaves(struct mount_info *mi)
 	struct mount_info *t;
 	char *mpath, buf[PATH_MAX];
 
+	BUG_ON(mi->parent == root_yard_mp);
+
 	list_for_each_entry(t, &mi->parent->mnt_slave_list, mnt_slave) {
 		if (!t->mounted)
 			continue;
@@ -2107,7 +2109,7 @@ static int propagate_mount(struct mount_info *mi)
 
 	propagate_siblings(mi);
 
-	if (!mi->parent)
+	if (!mi->parent || mi->parent == root_yard_mp)
 		goto skip_parent;
 
 	umount_from_slaves(mi);
diff --git a/criu/path.c b/criu/path.c
index 1b71c4cb1..54f5483b9 100644
--- a/criu/path.c
+++ b/criu/path.c
@@ -6,6 +6,7 @@
 #include "mount.h"
 #include "path.h"
 #include "log.h"
+#include "util.h"
 #include "common/bug.h"
 
 char *cut_root_for_bind(char *target_root, char *source_root)
@@ -41,64 +42,30 @@ out:
 char *mnt_get_sibling_path(struct mount_info *m, struct mount_info *p, char *buf, int len)
 {
 	struct mount_info *pa = m->parent;
-	char *rpath, *cut_root, *path = buf;
-	int off = 0;
+	char *rpath, fsrpath[PATH_MAX];
 
 	if (pa == NULL)
 		return NULL;
 
-	rpath = m->mountpoint + strlen(pa->mountpoint);
-	if (rpath[0] == '/')
-		rpath++;
-
-	/*
-	 * Get a path to a sibling of "m" with parent "p",
-	 * return NULL is p can't have a sibling of m.
-	 *
-	 * Here are two cases:
-	 * When a parent of "m" has longer root than "p":
-	 * /    pm->root            / rpath
-	 *               | cut_root |
-	 * /    p->root  /
-	 * In this case, a sibling path is a sum of p->mountpoint,
-	 * cut_root and rpath.
-	 *
-	 * When a parent of m has shorter root than "p":
-	 * /    pm->root /            rpath
-	 *               | cut_root |
-	 * /    p->root             / rpath +strlen(cut_root)
-	 * In this case, a sibling path is a sum of p->mountpoint and
-	 * rpath - strlen(cut_root).
-	 */
-
-	cut_root = cut_root_for_bind(pa->root, p->root);
-	if (cut_root == NULL)
+	rpath = get_relative_path(m->ns_mountpoint, pa->ns_mountpoint);
+	if (!rpath) {
+		pr_warn("child - parent mountpoint missmatch %s - %s\n", m->ns_mountpoint, pa->ns_mountpoint);
 		return NULL;
-	if (p->mountpoint[1] != 0) /* not "/" */ {
-		off = snprintf(path, len, "%s", p->mountpoint);
-		if (path[off - 1] == '/') /* p->mountpoint = "./" */
-			off--;
 	}
-	len -= off;
-	path += off;
 
-	if (strlen(pa->root) > strlen(p->root)) {
-		off = snprintf(path, len, "/%s", cut_root);
-		len -= off;
-		path += off;
-	} else {
-		int length = strlen(cut_root);
-		if (strncmp(rpath, cut_root, length))
-			return NULL;
-		rpath += strlen(cut_root);
-		if (length > 0 && (rpath[0] && rpath[0] != '/'))
-			return NULL;
+	if (snprintf(fsrpath, sizeof(fsrpath), "%s/%s", pa->root, rpath) >= sizeof(fsrpath)) {
+		pr_warn("snrptintf truncation \"%s / %s\"\n", pa->root, rpath);
+		return NULL;
 	}
-	if (rpath[0] == '/')
-		rpath++;
 
-	if (rpath[0] != '\0')
-		snprintf(path, len, "/%s", rpath);
+	rpath = get_relative_path(fsrpath, p->root);
+	if (!rpath)
+		return NULL;
+
+	if (snprintf(buf, len, "%s/%s", p->ns_mountpoint, rpath) >= sizeof(fsrpath)) {
+		pr_warn("snrptintf truncation \"%s / %s\"\n", p->ns_mountpoint, rpath);
+		return NULL;
+	}
 
 	return buf;
 }

From 7b968ceeab2ef8376c9a560e223accc954119bbf Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 14:34:03 +0300
Subject: [PATCH 0970/1854] mount: use ns_mountpoint in collect_mntinfo

At this point ns_mountpoint is equal to mountpoint.

More over let's use robust is_same_path helper in should_skip_mount so
that we don't need to rely on ->mountpoint + 1 hacks.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/d4c4271a0

Changes: use is_same_path helper.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/proc_parse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 7955d50a6..1ec051e6a 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1486,12 +1486,12 @@ bool add_skip_mount(const char *mountpoint)
 	return true;
 }
 
-static bool should_skip_mount(const char *mountpoint)
+static bool should_skip_mount(char *mountpoint)
 {
 	struct str_node *pos;
 
 	list_for_each_entry(pos, &skip_mount_list, node) {
-		if (strcmp(mountpoint, pos->string) == 0)
+		if (is_same_path(mountpoint, pos->string))
 			return true;
 	}
 
@@ -1620,8 +1620,8 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 		 * fail loudly at "dump" stage if an opened file or another mnt
 		 * depends on this one.
 		 */
-		if (for_dump && should_skip_mount(new->mountpoint + 1)) {
-			pr_info("\tskip %s @ %s\n", fsname, new->mountpoint);
+		if (for_dump && should_skip_mount(new->ns_mountpoint)) {
+			pr_info("\tskip %s @ %s\n", fsname, new->ns_mountpoint);
 			mnt_entry_free(new);
 			new = NULL;
 			goto end;

From ae0b218c30b6ce5cb02c02e64c4790cd28dd4de5 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 14:40:01 +0300
Subject: [PATCH 0971/1854] mount: use ns_mountpoint in aufs_parse

At this point ns_mountpoint is equal to mountpoint.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/c70bd7de0

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/proc_parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 1ec051e6a..a599297f7 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -2737,7 +2737,7 @@ int aufs_parse(struct mount_info *new)
 {
 	int ret = 0;
 
-	if (!strcmp(new->mountpoint, "./")) {
+	if (!strcmp(new->ns_mountpoint, "./")) {
 		opts.aufs = true;
 		ret = parse_aufs_branches(new);
 	}

From eedbc6f478d28d5e67cbdae27e1124e178d4b5ff Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 15:18:10 +0300
Subject: [PATCH 0972/1854] mount: use ns_mountpoint in mnt_depth

Function mnt_depth is only used on real mounts when building mount tree for
single namespace, thats why we can compare those mounts with ns_mountpoint
safely.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/2be0ff276

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 1ffd3da8d..0c1a67aab 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -392,7 +392,7 @@ static unsigned int mnt_depth(struct mount_info *m)
 	unsigned int depth = 0;
 	char *c;
 
-	for (c = m->mountpoint; *c != '\0'; c++)
+	for (c = m->ns_mountpoint; *c != '\0'; c++)
 		if (*c == '/')
 			depth++;
 

From 65967a84b9055a5978bd8cb20dbf35162b645123 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 29 May 2020 12:02:16 +0300
Subject: [PATCH 0973/1854] mount: use ns_mountpoint instead of mountpoint
 where possible

On dump ->mountpoint and ->ns_mountpoint is the same, but on restore
->mountpoint can be changed by mount tree yard setup and remap (and who
knows what else =) ). It is not good to use ->mountpoint for path
comparison between mounts if we are not explictly need to compare
"changed" paths. Imagine the remap change will make two mounts have
different prefixes in ->mountpoint and we won't be able so understand
that those mounts originally were subpaths.

This patch handles 2 simple cases:

a) These functions called ONLY ON DUMP so for them there is no effective
change: fixup_overlayfs, fusectl_dump, check_one_mark, __lookup_overlayfs,
mount_resolve_path, try_resolve_ext_mount, validate_mounts (first and third),
resolve_external_mounts, get_clean_mnt, __umount_children_overmounts,
__umount_overmounts, ns_open_mountpoint, open_mountpoint, dump_one_fs,
dump_one_mountpoint, clean_cr_time_mounts, collect_unix_bindmounts.

b) In these functions ONLY LOGS changed, so no algorithm change:
always_fail, mnt_build_ids_tree, mnt_tree_show, unsupported_nfs_bindmounts,
unsupported_nfs_mount, unsupported_mount, validate_mounts (second),
__search_bindmounts, resolve_shared_mounts, mnt_tree_for_each, resolve_source,
propagate_siblings, propagate_mount, do_mount_one, get_mp_root,
collect_mnt_from_image, merge_mount_trees, ns_remount_writable,
__remount_readonly_mounts, parse_mountinfo.

All complex cases are handled in separate patches.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/4972888dd

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files.c       |   4 +-
 criu/filesystems.c |   4 +-
 criu/fsnotify.c    |   2 +-
 criu/mount.c       | 119 +++++++++++++++++++++++----------------------
 criu/proc_parse.c  |   2 +-
 5 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/criu/files.c b/criu/files.c
index 5a9268526..93c34108f 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -298,12 +298,12 @@ static int fixup_overlayfs(struct fd_parms *p, struct fd_link *link)
 	 * If the bug is present, the file path from /proc/<pid>/fd
 	 * does not include the mountpoint, so we prepend it ourselves.
 	 */
-	if (strcmp("./", m->mountpoint) != 0) {
+	if (strcmp("./", m->ns_mountpoint) != 0) {
 		char buf[PATH_MAX];
 		int n;
 
 		strlcpy(buf, link->name, PATH_MAX);
-		n = snprintf(link->name, PATH_MAX, "%s/%s", m->mountpoint, buf + 2);
+		n = snprintf(link->name, PATH_MAX, "%s/%s", m->ns_mountpoint, buf + 2);
 		if (n >= PATH_MAX) {
 			pr_err("Not enough space to replace %s\n", buf);
 			return -1;
diff --git a/criu/filesystems.c b/criu/filesystems.c
index 3e0ec2eb3..439735204 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -548,7 +548,7 @@ static int fusectl_dump(struct mount_info *pm)
 
 		for (it = mntinfo; it; it = it->next) {
 			if (it->fstype->code == FSTYPE__FUSE && id == kdev_minor(it->s_dev) && !it->external) {
-				pr_err("%s is a fuse mount but not external\n", it->mountpoint);
+				pr_err("%s is a fuse mount but not external\n", it->ns_mountpoint);
 				goto out;
 			}
 		}
@@ -659,7 +659,7 @@ static int dump_empty_fs(struct mount_info *pm)
  */
 static int always_fail(struct mount_info *pm)
 {
-	pr_err("failed to dump fs %s (%s): always fail\n", pm->mountpoint, pm->fstype->name);
+	pr_err("failed to dump fs %s (%s): always fail\n", pm->ns_mountpoint, pm->fstype->name);
 	return -1;
 }
 
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 22fb74973..fd2e8d84e 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -404,7 +404,7 @@ static int check_one_mark(FanotifyMarkEntry *fme)
 			return -1;
 		}
 		if (!(root_ns_mask & CLONE_NEWNS))
-			fme->me->path = m->mountpoint + 1;
+			fme->me->path = m->ns_mountpoint + 1;
 		fme->s_dev = m->s_dev;
 
 		pr_info("mark: s_dev %#08x mnt_id  %#08x mask %#08x\n", fme->s_dev, fme->me->mnt_id, fme->mask);
diff --git a/criu/mount.c b/criu/mount.c
index 0c1a67aab..980288818 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -159,15 +159,18 @@ static struct mount_info *__lookup_overlayfs(struct mount_info *list, char *rpat
 			}
 		}
 
-		/* Concatenates m->mountpoint with rpath and attempts to stat the resulting path */
+		/*
+		 * Concatenates m->ns_mountpoint with rpath and attempts
+		 * to stat the resulting path at mntns_root
+		 */
 		if (is_root_mount(m)) {
 			ret_stat = fstatat(mntns_root, rpath, &f_stat, 0);
 		} else {
 			char _full_path[PATH_MAX];
-			int n = snprintf(_full_path, PATH_MAX, "%s/%s", m->mountpoint, rpath);
+			int n = snprintf(_full_path, PATH_MAX, "%s/%s", m->ns_mountpoint, rpath);
 
 			if (n >= PATH_MAX) {
-				pr_err("Not enough space to concatenate %s and %s\n", m->mountpoint, rpath);
+				pr_err("Not enough space to concatenate %s and %s\n", m->ns_mountpoint, rpath);
 				return ERR_PTR(-ENOSPC);
 			}
 			ret_stat = fstatat(mntns_root, _full_path, &f_stat, 0);
@@ -249,11 +252,11 @@ static struct mount_info *mount_resolve_path(struct mount_info *mntinfo_tree, co
 		list_for_each_entry(c, &m->children, siblings) {
 			size_t n;
 
-			n = strlen(c->mountpoint + 1);
+			n = strlen(c->ns_mountpoint + 1);
 			if (n > pathlen)
 				continue;
 
-			if (strncmp(c->mountpoint + 1, path, min(n, pathlen)))
+			if (strncmp(c->ns_mountpoint + 1, path, min(n, pathlen)))
 				continue;
 			if (n < pathlen && path[n] != '/')
 				continue;
@@ -265,7 +268,7 @@ static struct mount_info *mount_resolve_path(struct mount_info *mntinfo_tree, co
 			break;
 	}
 
-	pr_debug("Path `%s' resolved to `%s' mountpoint\n", path, m->mountpoint);
+	pr_debug("Path `%s' resolved to `%s' mountpoint\n", path, m->ns_mountpoint);
 	return m;
 }
 
@@ -371,7 +374,7 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
 				continue;
 			}
 
-			pr_err("No parent found for mountpoint %d (@%s)\n", m->mnt_id, m->mountpoint);
+			pr_err("No parent found for mountpoint %d (@%s)\n", m->mnt_id, m->ns_mountpoint);
 			return NULL;
 		}
 
@@ -460,7 +463,7 @@ static void mnt_tree_show(struct mount_info *tree, int off)
 {
 	struct mount_info *m;
 
-	pr_info("%*s[%s](%d->%d)\n", off, "", tree->mountpoint, tree->mnt_id, tree->parent_mnt_id);
+	pr_info("%*s[%s](%d->%d)\n", off, "", tree->ns_mountpoint, tree->mnt_id, tree->parent_mnt_id);
 
 	list_for_each_entry(m, &tree->children, siblings)
 		mnt_tree_show(m, off + 1);
@@ -482,9 +485,9 @@ static int try_resolve_ext_mount(struct mount_info *info)
 	if (info->nsid->type == NS_ROOT) {
 		char *ext;
 
-		ext = ext_mount_lookup(info->mountpoint + 1 /* trim the . */);
+		ext = ext_mount_lookup(info->ns_mountpoint + 1 /* trim the . */);
 		if (ext) {
-			pr_info("Found %s mapping for %s mountpoint\n", ext, info->mountpoint);
+			pr_info("Found %s mapping for %s mountpoint\n", ext, info->ns_mountpoint);
 			info->external = ext;
 			return 1;
 		}
@@ -714,7 +717,7 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 
 		if (fsroot_mounted(m)) {
 			if (m->fstype->code == FSTYPE__UNSUPPORTED) {
-				pr_err("FS mnt %s dev %#x root %s unsupported id %d\n", m->mountpoint, m->s_dev,
+				pr_err("FS mnt %s dev %#x root %s unsupported id %d\n", m->ns_mountpoint, m->s_dev,
 				       m->root, m->mnt_id);
 				return -1;
 			}
@@ -730,7 +733,7 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 				 */
 
 				if (for_dump) {
-					ret = run_plugins(DUMP_EXT_MOUNT, m->mountpoint, m->mnt_id);
+					ret = run_plugins(DUMP_EXT_MOUNT, m->ns_mountpoint, m->mnt_id);
 					if (ret == 0)
 						m->need_plugin = true;
 				} else
@@ -744,7 +747,7 @@ static int validate_mounts(struct mount_info *info, bool for_dump)
 				if (ret < 0) {
 					if (ret == -ENOTSUP)
 						pr_err("%d:%s doesn't have a proper root mount\n", m->mnt_id,
-						       m->mountpoint);
+						       m->ns_mountpoint);
 					return -1;
 				}
 			}
@@ -881,7 +884,7 @@ static int resolve_external_mounts(struct mount_info *info)
 
 		cut_root = cut_root_for_bind(m->root, match->root);
 
-		p = xsprintf("%s/%s", match->mountpoint + 1, cut_root);
+		p = xsprintf("%s/%s", match->ns_mountpoint + 1, cut_root);
 		if (!p)
 			return -1;
 
@@ -894,7 +897,7 @@ static int resolve_external_mounts(struct mount_info *info)
 		xfree(m->source);
 		m->source = p;
 
-		pr_info("autodetected external mount %s for %s\n", p, m->mountpoint);
+		pr_info("autodetected external mount %s for %s(%d)\n", p, m->ns_mountpoint, m->mnt_id);
 	}
 
 	return 0;
@@ -989,8 +992,8 @@ static void __search_bindmounts(struct mount_info *mi)
 		if (mounts_sb_equal(mi, t)) {
 			list_add(&t->mnt_bind, &mi->mnt_bind);
 			t->mnt_bind_is_populated = true;
-			pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n", t->mnt_id, mi->mnt_id, t->mountpoint,
-				 mi->mountpoint);
+			pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n", t->mnt_id, mi->mnt_id,
+				 t->ns_mountpoint, mi->ns_mountpoint);
 		}
 	}
 
@@ -1043,14 +1046,14 @@ static int resolve_shared_mounts(struct mount_info *info)
 		need_master = m->master_id;
 
 		pr_debug("Inspecting sharing on %2d shared_id %d master_id %d (@%s)\n", m->mnt_id, m->shared_id,
-			 m->master_id, m->mountpoint);
+			 m->master_id, m->ns_mountpoint);
 
 		for (t = info; t && (need_share || need_master); t = t->next) {
 			if (t == m)
 				continue;
 			if (need_master && t->shared_id == m->master_id) {
 				pr_debug("\tThe mount %3d is slave for %3d (@%s -> @%s)\n", m->mnt_id, t->mnt_id,
-					 m->mountpoint, t->mountpoint);
+					 m->ns_mountpoint, t->ns_mountpoint);
 				list_add(&m->mnt_slave, &t->mnt_slave_list);
 				m->mnt_master = t;
 				need_master = false;
@@ -1059,7 +1062,7 @@ static int resolve_shared_mounts(struct mount_info *info)
 			/* Collect all mounts from this group */
 			if (need_share && t->shared_id == m->shared_id) {
 				pr_debug("\tMount %3d is shared with %3d group %3d (@%s -> @%s)\n", m->mnt_id,
-					 t->mnt_id, m->shared_id, t->mountpoint, m->mountpoint);
+					 t->mnt_id, m->shared_id, t->ns_mountpoint, m->ns_mountpoint);
 				list_add(&t->mnt_share, &m->mnt_share);
 			}
 		}
@@ -1077,7 +1080,7 @@ static int resolve_shared_mounts(struct mount_info *info)
 
 			pr_err("Mount %d %s (master_id: %d shared_id: %d) "
 			       "has unreachable sharing. Try --enable-external-masters.\n",
-			       m->mnt_id, m->mountpoint, m->master_id, m->shared_id);
+			       m->mnt_id, m->ns_mountpoint, m->master_id, m->shared_id);
 			return -1;
 		}
 	}
@@ -1104,7 +1107,7 @@ static int resolve_shared_mounts(struct mount_info *info)
 				else if (ret) {
 					BUG_ON(!mounts_equal(m, schild));
 					pr_debug("\tMount %3d is in same propagation group with %3d (@%s ~ @%s)\n",
-						 m->mnt_id, schild->mnt_id, m->mountpoint, schild->mountpoint);
+						 m->mnt_id, schild->mnt_id, m->ns_mountpoint, schild->ns_mountpoint);
 					list_add(&schild->mnt_propagate, &m->mnt_propagate);
 				}
 			}
@@ -1250,8 +1253,8 @@ static char *get_clean_mnt(struct mount_info *mi, char *mnt_path_tmp, char *mnt_
 		return NULL;
 	}
 
-	if (mount(mi->mountpoint, mnt_path, NULL, MS_BIND, NULL)) {
-		pr_warn("Can't bind-mount %d:%s to %s: %s\n", mi->mnt_id, mi->mountpoint, mnt_path, strerror(errno));
+	if (mount(mi->ns_mountpoint, mnt_path, NULL, MS_BIND, NULL)) {
+		pr_perror("Can't bind-mount %d:%s to %s", mi->mnt_id, mi->ns_mountpoint, mnt_path);
 		rmdir(mnt_path);
 		return NULL;
 	}
@@ -1392,7 +1395,7 @@ static int __umount_children_overmounts(struct mount_info *mi)
 	 */
 again:
 	list_for_each_entry(c, &m->children, siblings) {
-		if (!strcmp(c->mountpoint, m->mountpoint)) {
+		if (!strcmp(c->ns_mountpoint, m->ns_mountpoint)) {
 			m = c;
 			goto again;
 		}
@@ -1400,8 +1403,8 @@ again:
 
 	/* Unmout children-overmounts in the order of visibility */
 	while (m != mi) {
-		if (umount2(m->mountpoint, MNT_DETACH)) {
-			pr_perror("Unable to umount child-overmount %s", m->mountpoint);
+		if (umount2(m->ns_mountpoint, MNT_DETACH)) {
+			pr_perror("Unable to umount child-overmount %s", m->ns_mountpoint);
 			return -1;
 		}
 		BUG_ON(!m->parent);
@@ -1431,12 +1434,12 @@ static int __umount_overmounts(struct mount_info *m)
 	/* Unmount sibling-overmounts in visibility order */
 next:
 	ovm = NULL;
-	ovm_len = strlen(m->mountpoint) + 1;
+	ovm_len = strlen(m->ns_mountpoint) + 1;
 	list_for_each_entry(t, &m->parent->children, siblings) {
 		if (m == t)
 			continue;
-		if (issubpath(m->mountpoint, t->mountpoint)) {
-			int t_len = strlen(t->mountpoint);
+		if (issubpath(m->ns_mountpoint, t->ns_mountpoint)) {
+			int t_len = strlen(t->ns_mountpoint);
 
 			if (t_len < ovm_len && t_len > ovm_len_min) {
 				ovm = t;
@@ -1452,8 +1455,8 @@ next:
 		if (__umount_children_overmounts(ovm))
 			return -1;
 
-		if (umount2(ovm->mountpoint, MNT_DETACH)) {
-			pr_perror("Unable to umount %s", ovm->mountpoint);
+		if (umount2(ovm->ns_mountpoint, MNT_DETACH)) {
+			pr_perror("Unable to umount %s", ovm->ns_mountpoint + 1);
 			return -1;
 		}
 
@@ -1525,9 +1528,9 @@ int ns_open_mountpoint(void *arg)
 	 * explicitly as when last process exits mntns all mounts in it are
 	 * cleaned from their children, and we are exactly the last process.
 	 */
-	*fd = open(mi->mountpoint, O_DIRECTORY | O_RDONLY);
+	*fd = open(mi->ns_mountpoint, O_DIRECTORY | O_RDONLY);
 	if (*fd < 0) {
-		pr_perror("Unable to open %s", mi->mountpoint);
+		pr_perror("Unable to open %s(%d)", mi->ns_mountpoint, mi->mnt_id);
 		goto err;
 	}
 
@@ -1549,7 +1552,7 @@ int open_mountpoint(struct mount_info *pm)
 	if (list_empty(&pm->children) && !mnt_is_overmounted(pm))
 		return __open_mountpoint(pm);
 
-	pr_info("Mount is not fully visible %s\n", pm->mountpoint);
+	pr_info("Mount is not fully visible %s(%d)\n", pm->ns_mountpoint, pm->mnt_id);
 
 	/*
 	 * We do two things below:
@@ -1567,7 +1570,7 @@ int open_mountpoint(struct mount_info *pm)
 		goto err;
 
 	if (!mnt_is_overmounted(pm)) {
-		pr_info("\tmount has children %s\n", pm->mountpoint);
+		pr_info("\tmount has children %s(%d)\n", pm->ns_mountpoint, pm->mnt_id);
 		fd = get_clean_fd(pm);
 	}
 
@@ -1579,7 +1582,7 @@ int open_mountpoint(struct mount_info *pm)
 		int pid, status;
 		struct clone_arg ca = { .mi = pm, .fd = &fd };
 
-		pr_info("\tmount is overmounted or has children %s\n", pm->mountpoint);
+		pr_info("\tmount is overmounted or has children %s(%d)\n", pm->ns_mountpoint, pm->mnt_id);
 
 		/*
 		 * We are overmounted - not accessible in a regular way. We
@@ -1748,7 +1751,7 @@ static int dump_one_fs(struct mount_info *mi)
 		return 0;
 	}
 
-	pr_err("Unable to dump a file system for %d:%s\n", mi->mnt_id, mi->mountpoint);
+	pr_err("Unable to dump a file system for %d:%s\n", mi->mnt_id, mi->ns_mountpoint);
 	return -1;
 }
 
@@ -1756,7 +1759,7 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 {
 	MntEntry me = MNT_ENTRY__INIT;
 
-	pr_info("\t%d: %x:%s @ %s\n", pm->mnt_id, pm->s_dev, pm->root, pm->mountpoint);
+	pr_info("\t%d: %x:%s @ %s\n", pm->mnt_id, pm->s_dev, pm->root, pm->ns_mountpoint);
 
 	me.fstype = pm->fstype->code;
 
@@ -1771,7 +1774,7 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 		return -1;
 
 	if (pm->mnt_id == HELPER_MNT_ID) {
-		pr_info("Skip dumping helper mountpoint: %s\n", pm->mountpoint);
+		pr_info("Skip dumping helper mountpoint: %s\n", pm->ns_mountpoint);
 		return 0;
 	}
 
@@ -1781,7 +1784,7 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 	me.flags = pm->flags;
 	me.sb_flags = pm->sb_flags;
 	me.has_sb_flags = true;
-	me.mountpoint = pm->mountpoint + 1;
+	me.mountpoint = pm->ns_mountpoint + 1;
 	me.source = pm->source;
 	me.options = pm->options;
 	me.shared_id = pm->shared_id;
@@ -1923,7 +1926,7 @@ int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *))
 	LIST_HEAD(postpone2);
 	int progress;
 
-	pr_debug("Start with %d:%s\n", start->mnt_id, start->mountpoint);
+	pr_debug("Start with %d:%s\n", start->mnt_id, start->ns_mountpoint);
 	list_add(&start->postpone, &postpone);
 
 again:
@@ -1937,7 +1940,7 @@ again:
 
 		pr_err("A few mount points can't be mounted\n");
 		list_for_each_entry(m, &postpone2, postpone) {
-			pr_err("%d:%d %s %s %s\n", m->mnt_id, m->parent_mnt_id, m->root, m->mountpoint, m->source);
+			pr_err("%d:%d %s %s %s\n", m->mnt_id, m->parent_mnt_id, m->root, m->ns_mountpoint, m->source);
 		}
 		return -1;
 	}
@@ -1985,7 +1988,7 @@ static char *resolve_source(struct mount_info *mi)
 			return mi->source;
 	}
 
-	pr_err("No device for %s mount\n", mi->mountpoint);
+	pr_err("No device for %s(%d) mount\n", mi->ns_mountpoint, mi->mnt_id);
 	return NULL;
 }
 
@@ -2079,7 +2082,7 @@ static int propagate_siblings(struct mount_info *mi)
 			continue;
 		if (t->bind && t->bind->shared_id == t->shared_id)
 			continue;
-		pr_debug("\t\tBind share %s\n", t->mountpoint);
+		pr_debug("\t\tBind share %s(%d)\n", t->ns_mountpoint, t->mnt_id);
 		t->bind = mi;
 		t->s_dev_rt = mi->s_dev_rt;
 	}
@@ -2087,7 +2090,7 @@ static int propagate_siblings(struct mount_info *mi)
 	list_for_each_entry(t, &mi->mnt_slave_list, mnt_slave) {
 		if (t->mounted || t->bind)
 			continue;
-		pr_debug("\t\tBind slave %s\n", t->mountpoint);
+		pr_debug("\t\tBind slave %s(%d)\n", t->ns_mountpoint, t->mnt_id);
 		t->bind = mi;
 		t->s_dev_rt = mi->s_dev_rt;
 	}
@@ -2118,7 +2121,7 @@ static int propagate_mount(struct mount_info *mi)
 	list_for_each_entry(p, &mi->mnt_propagate, mnt_propagate) {
 		/* Should not propagate the same mount twice */
 		BUG_ON(p->mounted);
-		pr_debug("\t\tPropagate %s\n", p->mountpoint);
+		pr_debug("\t\tPropagate %s(%d)\n", p->ns_mountpoint, p->mnt_id);
 
 		/*
 		 * When a mount is propagated, the result mount
@@ -2148,7 +2151,7 @@ skip_parent:
 				continue;
 			if (!issubpath(t->root, mi->root))
 				continue;
-			pr_debug("\t\tBind private %s\n", t->mountpoint);
+			pr_debug("\t\tBind private %s(%d)\n", t->ns_mountpoint, t->mnt_id);
 			t->bind = mi;
 			t->s_dev_rt = mi->s_dev_rt;
 		}
@@ -2673,7 +2676,7 @@ static int do_mount_one(struct mount_info *mi)
 		return 0;
 
 	if (!can_mount_now(mi)) {
-		pr_debug("Postpone slave %s\n", mi->mountpoint);
+		pr_debug("Postpone mount %s(%d)\n", mi->ns_mountpoint, mi->mnt_id);
 		return 1;
 	}
 
@@ -3059,7 +3062,7 @@ static int get_mp_root(MntEntry *me, struct mount_info *mi)
 		if (!opts.autodetect_ext_mounts) {
 			pr_err("Mount %d:%s is autodetected external mount. "
 			       "Try \"--ext-mount-map auto\" to allow them.\n",
-			       mi->mnt_id, mi->mountpoint);
+			       mi->mnt_id, mi->ns_mountpoint);
 			return -1;
 		}
 
@@ -3078,7 +3081,7 @@ static int get_mp_root(MntEntry *me, struct mount_info *mi)
 	} else {
 		ext = ext_mount_lookup(me->ext_key);
 		if (!ext) {
-			pr_err("No mapping for %d:%s mountpoint\n", mi->mnt_id, mi->mountpoint);
+			pr_err("No mapping for %d:%s mountpoint\n", mi->mnt_id, mi->ns_mountpoint);
 			return -1;
 		}
 	}
@@ -3260,7 +3263,7 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 		if (get_mp_mountpoint(me->mountpoint, pm, root, root_len))
 			goto err;
 
-		pr_debug("\tRead %d mp @ %s\n", pm->mnt_id, pm->mountpoint);
+		pr_debug("\tRead %d mp @ %s\n", pm->mnt_id, pm->ns_mountpoint);
 	}
 
 	if (me)
@@ -3297,7 +3300,7 @@ static int merge_mount_trees(void)
 
 		root = nsid->mnt.mntinfo_tree;
 
-		pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->mountpoint);
+		pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->ns_mountpoint);
 		root->parent = root_yard_mp;
 		list_add(&root->siblings, &root_yard_mp->children);
 	}
@@ -4000,8 +4003,8 @@ void clean_cr_time_mounts(void)
 			continue;
 		}
 
-		if (umount(mi->mountpoint) < 0)
-			pr_perror("Can't umount forced mount %s", mi->mountpoint);
+		if (umount(mi->ns_mountpoint) < 0)
+			pr_perror("Can't umount forced mount %s", mi->ns_mountpoint);
 
 		if (restore_mnt_ns(ns_old, &cwd_fd)) {
 			pr_err("cleanup_forced_mounts exiting with wrong mnt_ns\n");
@@ -4058,7 +4061,7 @@ static int ns_remount_writable(void *arg)
 
 	if (mount(NULL, mi->ns_mountpoint, NULL, MS_REMOUNT | MS_BIND | (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)),
 		  NULL) == -1) {
-		pr_perror("Failed to remount %d:%s writable", mi->mnt_id, mi->mountpoint);
+		pr_perror("Failed to remount %d:%s writable", mi->mnt_id, mi->ns_mountpoint);
 		return 1;
 	}
 	return 0;
@@ -4131,9 +4134,9 @@ static int __remount_readonly_mounts(struct ns_id *ns)
 			pr_debug("Switched to mntns %u:%u\n", ns->id, ns->kid);
 		}
 
-		pr_info("Remount %d:%s back to readonly\n", mi->mnt_id, mi->mountpoint);
+		pr_info("Remount %d:%s back to readonly\n", mi->mnt_id, mi->ns_mountpoint);
 		if (mount(NULL, mi->ns_mountpoint, NULL, MS_REMOUNT | MS_BIND | (mi->flags & ~MS_PROPAGATE), NULL)) {
-			pr_perror("Failed to restore %d:%s mount flags %x", mi->mnt_id, mi->mountpoint, mi->flags);
+			pr_perror("Failed to restore %d:%s mount flags %x", mi->mnt_id, mi->ns_mountpoint, mi->flags);
 			return -1;
 		}
 	}
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index a599297f7..774a2812b 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1628,7 +1628,7 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 		}
 
 		pr_info("\ttype %s source %s mnt_id %d s_dev %#x %s @ %s flags %#x options %s\n", fsname, new->source,
-			new->mnt_id, new->s_dev, new->root, new->mountpoint, new->flags, new->options);
+			new->mnt_id, new->s_dev, new->root, new->ns_mountpoint, new->flags, new->options);
 
 		if (new->fstype->parse) {
 			ret = new->fstype->parse(new);

From 9fb3984a7ebd762d1c8f5657ed7d72c23f772c37 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 28 May 2020 11:14:39 +0300
Subject: [PATCH 0974/1854] mount: add service_mountpoint getter for
 ->mountpoint

This getter should be used when we wan't to access the mount on the filesystem.
In next patches we want to be able to change the location of the mount on
restore in service mount namespace, while not changing ->mountpoint string.
All places where we don't want to access the mount but instead want to
determine relations between mounts in the initial mount tree or just print path
should use ns_mountpoint.

This change effectively brings no change of behaviour everything is the same
for now.

Still leave ->mountpoint references for remap, cr_time and initialization which
need to work with exact variable.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/235c761e0

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/autofs.c        |  22 ++++----
 criu/filesystems.c   |   4 +-
 criu/include/mount.h |   2 +
 criu/mount.c         | 121 +++++++++++++++++++++++--------------------
 criu/proc_parse.c    |   4 +-
 criu/tty.c           |   4 +-
 6 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index 9d146b92b..c662bea60 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -388,7 +388,7 @@ free_str:
  */
 static int access_autofs_mount(struct mount_info *pm)
 {
-	const char *mnt_path = pm->mountpoint + 1;
+	const char *mnt_path = service_mountpoint(pm) + 1;
 	dev_t dev_id = pm->s_dev;
 	int new_pid_ns = -1, old_pid_ns = -1;
 	int old_mnt_ns, old_cwd_fd;
@@ -498,7 +498,7 @@ static int autofs_create_entry(struct mount_info *pm, AutofsEntry *entry)
 			 * options, then we can read them again and dump it.
 			 */
 			if (access_autofs_mount(pm)) {
-				pr_err("failed to access autofs %s\n", pm->mountpoint + 1);
+				pr_err("failed to access autofs %s\n", service_mountpoint(pm) + 1);
 				return -1;
 			}
 			if (parse_options(pm->options, entry, &pipe_ino))
@@ -755,7 +755,7 @@ static int autofs_populate_mount(const struct mount_info *mi, const AutofsEntry
 	if (entry->mode != AUTOFS_MODE_INDIRECT)
 		return 0;
 
-	return autofs_create_dentries(mi, mi->mountpoint);
+	return autofs_create_dentries(mi, service_mountpoint(mi));
 }
 
 static int autofs_post_mount(const char *mnt_path, dev_t mnt_dev, time_t timeout)
@@ -1031,10 +1031,10 @@ int autofs_mount(struct mount_info *mi, const char *source, const char *filesyst
 		goto close_pipe;
 	}
 
-	pr_info("autofs: mounting to %s with options: \"%s\"\n", mi->mountpoint, opts);
+	pr_info("autofs: mounting to %s with options: \"%s\"\n", service_mountpoint(mi), opts);
 
-	if (mount(source, mi->mountpoint, filesystemtype, mountflags, opts) < 0) {
-		pr_perror("Failed to mount autofs to %s", mi->mountpoint);
+	if (mount(source, service_mountpoint(mi), filesystemtype, mountflags, opts) < 0) {
+		pr_perror("Failed to mount autofs to %s", service_mountpoint(mi));
 		goto free_opts;
 	}
 
@@ -1049,8 +1049,8 @@ int autofs_mount(struct mount_info *mi, const char *source, const char *filesyst
 	 * data is not ready yet. So, let's put in on mi->private and copy to
 	 * shared data in autofs_add_mount_info().
 	 */
-	if (stat(mi->mountpoint, &buf) < 0) {
-		pr_perror("Failed to stat %s", mi->mountpoint);
+	if (stat(service_mountpoint(mi), &buf) < 0) {
+		pr_perror("Failed to stat %s", service_mountpoint(mi));
 		goto free_info;
 	}
 	info->mnt_dev = buf.st_dev;
@@ -1061,7 +1061,7 @@ int autofs_mount(struct mount_info *mi, const char *source, const char *filesyst
 		goto free_info;
 
 	/* In case of catatonic mounts all we need as the function call below */
-	ret = autofs_post_mount(mi->mountpoint, buf.st_dev, entry->timeout);
+	ret = autofs_post_mount(service_mountpoint(mi), buf.st_dev, entry->timeout);
 	if (ret < 0)
 		goto free_info;
 
@@ -1084,7 +1084,7 @@ close_pipe:
 free_info:
 	free(info);
 umount:
-	if (umount(mi->mountpoint) < 0)
-		pr_perror("Failed to umount %s", mi->mountpoint);
+	if (umount(service_mountpoint(mi)) < 0)
+		pr_perror("Failed to umount %s", service_mountpoint(mi));
 	goto close_pipe;
 }
diff --git a/criu/filesystems.c b/criu/filesystems.c
index 439735204..890d5d06d 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -290,7 +290,7 @@ static int binfmt_misc_restore_bme(struct mount_info *mi, BinfmtMiscEntry *bme,
 		goto bad_dump;
 
 	pr_debug("binfmt_misc_pattern=%s\n", buf);
-	ret = write_binfmt_misc_entry(mi->mountpoint, buf, bme);
+	ret = write_binfmt_misc_entry(service_mountpoint(mi), buf, bme);
 
 	return ret;
 
@@ -452,7 +452,7 @@ static int tmpfs_restore(struct mount_info *pm)
 
 	ret = cr_system(img_raw_fd(img), -1, -1, "tar",
 			(char *[]){ "tar", "--extract", "--gzip", "--no-unquote", "--no-wildcards", "--directory",
-				    pm->mountpoint, NULL },
+				    service_mountpoint(pm), NULL },
 			0);
 	close_image(img);
 
diff --git a/criu/include/mount.h b/criu/include/mount.h
index 3067e4088..8eb4ddf9b 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -191,4 +191,6 @@ extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 					bool (*pick)(struct mount_info *mi, struct mount_info *bind));
 
 extern int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *));
+
+extern char *service_mountpoint(const struct mount_info *mi);
 #endif /* __CR_MOUNT_H__ */
diff --git a/criu/mount.c b/criu/mount.c
index 980288818..bddfe2e7f 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -47,6 +47,11 @@ static struct mount_info *root_yard_mp = NULL;
 
 static LIST_HEAD(delayed_unbindable);
 
+char *service_mountpoint(const struct mount_info *mi)
+{
+	return mi->mountpoint;
+}
+
 int ext_mount_add(char *key, char *val)
 {
 	cleanup_free char *e_str = NULL;
@@ -1664,7 +1669,7 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
 	parent = root;
 	while (1) {
 		list_for_each_entry(t, &parent->children, siblings) {
-			if (strstartswith(mi->mountpoint, t->mountpoint)) {
+			if (strstartswith(service_mountpoint(mi), service_mountpoint(t))) {
 				parent = t;
 				break;
 			}
@@ -1679,7 +1684,8 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
 	mi->parent = parent;
 	mi->parent_mnt_id = parent->mnt_id;
 	list_add(&mi->siblings, &parent->children);
-	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n", mi->mountpoint, parent->mountpoint, parent->mnt_id);
+	pr_info("Add cr-time mountpoint %s with parent %s(%u)\n", service_mountpoint(mi), service_mountpoint(parent),
+		parent->mnt_id);
 	return mi;
 
 err:
@@ -1994,23 +2000,23 @@ static char *resolve_source(struct mount_info *mi)
 
 static int restore_shared_options(struct mount_info *mi, bool private, bool shared, bool slave)
 {
-	pr_debug("%d:%s private %d shared %d slave %d\n", mi->mnt_id, mi->mountpoint, private, shared, slave);
+	pr_debug("%d:%s private %d shared %d slave %d\n", mi->mnt_id, service_mountpoint(mi), private, shared, slave);
 
 	if (mi->flags & MS_UNBINDABLE) {
 		if (shared || slave) {
-			pr_warn("%s has both unbindable and sharing, ignoring unbindable\n", mi->mountpoint);
+			pr_warn("%s has both unbindable and sharing, ignoring unbindable\n", service_mountpoint(mi));
 		} else {
 			if (!mnt_is_overmounted(mi)) {
 				/* Someone may still want to bind from us, let them do it. */
-				pr_debug("Temporary leave unbindable mount %s as private\n", mi->mountpoint);
-				if (mount(NULL, mi->mountpoint, NULL, MS_PRIVATE, NULL)) {
+				pr_debug("Temporary leave unbindable mount %s as private\n", service_mountpoint(mi));
+				if (mount(NULL, service_mountpoint(mi), NULL, MS_PRIVATE, NULL)) {
 					pr_perror("Unable to make %d private", mi->mnt_id);
 					return -1;
 				}
 				list_add(&mi->mnt_unbindable, &delayed_unbindable);
 				return 0;
 			}
-			if (mount(NULL, mi->mountpoint, NULL, MS_UNBINDABLE, NULL)) {
+			if (mount(NULL, service_mountpoint(mi), NULL, MS_UNBINDABLE, NULL)) {
 				pr_perror("Unable to make %d unbindable", mi->mnt_id);
 				return -1;
 			}
@@ -2018,15 +2024,15 @@ static int restore_shared_options(struct mount_info *mi, bool private, bool shar
 		}
 	}
 
-	if (private && mount(NULL, mi->mountpoint, NULL, MS_PRIVATE, NULL)) {
+	if (private && mount(NULL, service_mountpoint(mi), NULL, MS_PRIVATE, NULL)) {
 		pr_perror("Unable to make %d private", mi->mnt_id);
 		return -1;
 	}
-	if (slave && mount(NULL, mi->mountpoint, NULL, MS_SLAVE, NULL)) {
+	if (slave && mount(NULL, service_mountpoint(mi), NULL, MS_SLAVE, NULL)) {
 		pr_perror("Unable to make %d slave", mi->mnt_id);
 		return -1;
 	}
-	if (shared && mount(NULL, mi->mountpoint, NULL, MS_SHARED, NULL)) {
+	if (shared && mount(NULL, service_mountpoint(mi), NULL, MS_SHARED, NULL)) {
 		pr_perror("Unable to make %d shared", mi->mnt_id);
 		return -1;
 	}
@@ -2183,9 +2189,9 @@ static int fetch_rt_stat(struct mount_info *m, const char *where)
 
 static int do_simple_mount(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags)
 {
-	int ret = mount(src, mi->mountpoint, fstype, mountflags, mi->options);
+	int ret = mount(src, service_mountpoint(mi), fstype, mountflags, mi->options);
 	if (ret)
-		pr_perror("Unable to mount %s %s (id=%d)", src, mi->mountpoint, mi->mnt_id);
+		pr_perror("Unable to mount %s %s (id=%d)", src, service_mountpoint(mi), mi->mnt_id);
 	return ret;
 }
 
@@ -2250,7 +2256,7 @@ static int do_new_mount(struct mount_info *mi)
 		sflags &= ~MS_RDONLY;
 
 	if (do_mount(mi, src, mnt_fsname(mi), sflags) < 0) {
-		pr_perror("Can't mount at %s", mi->mountpoint);
+		pr_perror("Can't mount at %s", service_mountpoint(mi));
 		return -1;
 	}
 
@@ -2260,21 +2266,21 @@ static int do_new_mount(struct mount_info *mi)
 	if (remount_ro) {
 		int fd;
 
-		fd = open(mi->mountpoint, O_PATH);
+		fd = open(service_mountpoint(mi), O_PATH);
 		if (fd < 0) {
-			pr_perror("Unable to open %s", mi->mountpoint);
+			pr_perror("Unable to open %s", service_mountpoint(mi));
 			return -1;
 		}
 		sflags |= MS_RDONLY | MS_REMOUNT;
 		if (userns_call(apply_sb_flags, 0, &sflags, sizeof(sflags), fd)) {
-			pr_err("Unable to apply mount flags %d for %s\n", mi->sb_flags, mi->mountpoint);
+			pr_err("Unable to apply mount flags %d for %s\n", mi->sb_flags, service_mountpoint(mi));
 			close(fd);
 			return -1;
 		}
 		close(fd);
 	}
 
-	if (mflags && mount(NULL, mi->mountpoint, NULL, MS_REMOUNT | MS_BIND | mflags, NULL)) {
+	if (mflags && mount(NULL, service_mountpoint(mi), NULL, MS_REMOUNT | MS_BIND | mflags, NULL)) {
 		pr_perror("Unable to apply bind-mount options");
 		return -1;
 	}
@@ -2296,8 +2302,8 @@ static int restore_ext_mount(struct mount_info *mi)
 {
 	int ret;
 
-	pr_debug("Restoring external bind mount %s\n", mi->mountpoint);
-	ret = run_plugins(RESTORE_EXT_MOUNT, mi->mnt_id, mi->mountpoint, "/", NULL);
+	pr_debug("Restoring external bind mount %s\n", service_mountpoint(mi));
+	ret = run_plugins(RESTORE_EXT_MOUNT, mi->mnt_id, service_mountpoint(mi), "/", NULL);
 	if (ret)
 		pr_err("Can't restore ext mount (%d)\n", ret);
 	return ret;
@@ -2390,9 +2396,9 @@ static int do_bind_mount(struct mount_info *mi)
 	 */
 	mi->private = mi->bind->private;
 
-	mnt_path = mi->bind->mountpoint;
+	mnt_path = service_mountpoint(mi->bind);
 
-	/* Access a mount by fd if mi->bind->mountpoint is overmounted */
+	/* Access a mount by fd if service_mountpoint(mi->bind) is overmounted */
 	if (mi->bind->fd >= 0) {
 		snprintf(mnt_fd_path, sizeof(mnt_fd_path), "/proc/self/fd/%d", mi->bind->fd);
 		mnt_path = mnt_fd_path;
@@ -2405,14 +2411,14 @@ static int do_bind_mount(struct mount_info *mi)
 	 * The target path may be over-mounted by one of child mounts
 	 * and we need to create a new bind-mount to get access to the path.
 	 */
-	mp_len = strlen(mi->bind->mountpoint);
-	if (mp_len > 1) /* skip a joining / if mi->bind->mountpoint isn't "/" */
+	mp_len = strlen(service_mountpoint(mi->bind));
+	if (mp_len > 1) /* skip a joining / if service_mountpoint(mi->bind) isn't "/" */
 		mp_len++;
 
 	list_for_each_entry(c, &mi->bind->children, siblings) {
 		if (!c->mounted)
 			continue;
-		if (issubpath(cut_root, c->mountpoint + mp_len))
+		if (issubpath(cut_root, service_mountpoint(c) + mp_len))
 			break; /* a source path is overmounted */
 	}
 
@@ -2433,11 +2439,11 @@ skip_overmount_check:
 	snprintf(rpath, sizeof(rpath), "%s/%s", mnt_path, cut_root);
 	root = rpath;
 do_bind:
-	pr_info("\tBind %s to %s\n", root, mi->mountpoint);
+	pr_info("\tBind %s to %s\n", root, service_mountpoint(mi));
 
 	if (unlikely(mi->deleted)) {
-		if (stat(mi->mountpoint, &st)) {
-			pr_perror("Can't fetch stat on %s", mi->mountpoint);
+		if (stat(service_mountpoint(mi), &st)) {
+			pr_perror("Can't fetch stat on %s", service_mountpoint(mi));
 			goto err;
 		}
 
@@ -2459,15 +2465,15 @@ do_bind:
 		}
 	}
 
-	if (mount(root, mi->mountpoint, NULL, MS_BIND | (mi->flags & MS_REC), NULL) < 0) {
-		pr_perror("Can't mount at %s", mi->mountpoint);
+	if (mount(root, service_mountpoint(mi), NULL, MS_BIND | (mi->flags & MS_REC), NULL) < 0) {
+		pr_perror("Can't mount at %s", service_mountpoint(mi));
 		goto err;
 	}
 
 	mflags = mi->flags & (~MS_PROPAGATE);
 	if (!mi->bind || mflags != (mi->bind->flags & (~MS_PROPAGATE)))
-		if (mount(NULL, mi->mountpoint, NULL, MS_BIND | MS_REMOUNT | mflags, NULL)) {
-			pr_perror("Can't mount at %s", mi->mountpoint);
+		if (mount(NULL, service_mountpoint(mi), NULL, MS_BIND | MS_REMOUNT | mflags, NULL)) {
+			pr_perror("Can't mount at %s", service_mountpoint(mi));
 			goto err;
 		}
 
@@ -2649,7 +2655,7 @@ static int do_mount_root(struct mount_info *mi)
 	if (restore_shared_options(mi, !mi->shared_id && !mi->master_id, mi->shared_id, mi->master_id))
 		return -1;
 
-	return fetch_rt_stat(mi, mi->mountpoint);
+	return fetch_rt_stat(mi, service_mountpoint(mi));
 }
 
 static int do_close_one(struct mount_info *mi)
@@ -2660,7 +2666,7 @@ static int do_close_one(struct mount_info *mi)
 
 static int set_unbindable(struct mount_info *mi)
 {
-	if (mount(NULL, mi->mountpoint, NULL, MS_UNBINDABLE, NULL)) {
+	if (mount(NULL, service_mountpoint(mi), NULL, MS_UNBINDABLE, NULL)) {
 		pr_perror("Failed setting unbindable flag on %d", mi->mnt_id);
 		return -1;
 	}
@@ -2681,14 +2687,14 @@ static int do_mount_one(struct mount_info *mi)
 	}
 
 	if ((mi->parent && mi->parent != root_yard_mp) && !strcmp(mi->parent->ns_mountpoint, mi->ns_mountpoint)) {
-		mi->parent->fd = open(mi->parent->mountpoint, O_PATH);
+		mi->parent->fd = open(service_mountpoint(mi->parent), O_PATH);
 		if (mi->parent->fd < 0) {
-			pr_perror("Unable to open %s", mi->mountpoint);
+			pr_perror("Unable to open %s", service_mountpoint(mi));
 			return -1;
 		}
 	}
 
-	pr_debug("\tMounting %s @%s (%d)\n", mi->fstype->name, mi->mountpoint, mi->need_plugin);
+	pr_debug("\tMounting %s %d@%s (%d)\n", mi->fstype->name, mi->mnt_id, service_mountpoint(mi), mi->need_plugin);
 
 	if (rst_mnt_is_root(mi)) {
 		int fd;
@@ -2701,21 +2707,22 @@ static int do_mount_one(struct mount_info *mi)
 
 		/* do_mount_root() is called from populate_mnt_ns() */
 		if (root_ns_mask & CLONE_NEWUSER) {
-			fd = open(mi->mountpoint, O_PATH);
+			fd = open(service_mountpoint(mi), O_PATH);
 			if (fd < 0) {
-				pr_perror("Unable to open %s", mi->mountpoint);
+				pr_perror("Unable to open %s", service_mountpoint(mi));
 				return -1;
 			}
 
 			if (userns_call(mount_root, 0, &flags, sizeof(flags), fd)) {
-				pr_err("Unable to mount %s\n", mi->mountpoint);
+				pr_err("Unable to mount %s\n", service_mountpoint(mi));
 				close(fd);
 				return -1;
 			}
 			close(fd);
 		} else {
-			if (mount(opts.root, mi->mountpoint, NULL, flags, NULL)) {
-				pr_perror("Unable to mount %s %s (id=%d)", opts.root, mi->mountpoint, mi->mnt_id);
+			if (mount(opts.root, service_mountpoint(mi), NULL, flags, NULL)) {
+				pr_perror("Unable to mount %s %s (id=%d)", opts.root, service_mountpoint(mi),
+					  mi->mnt_id);
 				return -1;
 			}
 		}
@@ -2730,7 +2737,7 @@ static int do_mount_one(struct mount_info *mi)
 		ret = do_bind_mount(mi);
 	}
 
-	if (ret == 0 && fetch_rt_stat(mi, mi->mountpoint))
+	if (ret == 0 && fetch_rt_stat(mi, service_mountpoint(mi)))
 		return -1;
 
 	if (ret == 0 && propagate_mount(mi))
@@ -2739,8 +2746,8 @@ static int do_mount_one(struct mount_info *mi)
 	if (mi->fstype->code == FSTYPE__UNSUPPORTED) {
 		struct statfs st;
 
-		if (statfs(mi->mountpoint, &st)) {
-			pr_perror("Unable to statfs %s", mi->mountpoint);
+		if (statfs(service_mountpoint(mi), &st)) {
+			pr_perror("Unable to statfs %s", service_mountpoint(mi));
 			return -1;
 		}
 		if (st.f_type == BTRFS_SUPER_MAGIC)
@@ -2755,17 +2762,17 @@ static int do_umount_one(struct mount_info *mi)
 	if (!mi->parent)
 		return 0;
 
-	if (mount("none", mi->parent->mountpoint, "none", MS_REC | MS_PRIVATE, NULL)) {
-		pr_perror("Can't mark %s as private", mi->parent->mountpoint);
+	if (mount("none", service_mountpoint(mi->parent), "none", MS_REC | MS_PRIVATE, NULL)) {
+		pr_perror("Can't mark %s as private", service_mountpoint(mi->parent));
 		return -1;
 	}
 
-	if (umount(mi->mountpoint)) {
-		pr_perror("Can't umount at %s", mi->mountpoint);
+	if (umount(service_mountpoint(mi))) {
+		pr_perror("Can't umount at %s", service_mountpoint(mi));
 		return -1;
 	}
 
-	pr_info("Umounted at %s\n", mi->mountpoint);
+	pr_info("Umounted at %s\n", service_mountpoint(mi));
 	return 0;
 }
 
@@ -3113,7 +3120,7 @@ static int get_mp_mountpoint(char *mountpoint, struct mount_info *mi, char *root
 
 	mi->ns_mountpoint = mi->mountpoint + root_len;
 
-	pr_debug("\t\tWill mount %d @ %s\n", mi->mnt_id, mi->mountpoint);
+	pr_debug("\t\tWill mount %d @ %s %s\n", mi->mnt_id, service_mountpoint(mi), mi->ns_mountpoint);
 	return 0;
 }
 
@@ -3469,14 +3476,14 @@ static int populate_roots_yard(struct mount_info *cr_time)
 	 * contains mounts which has to be restored separately
 	 */
 	list_for_each_entry(r, &mnt_remap_list, node) {
-		if (mkdirpat(AT_FDCWD, r->mi->mountpoint, 0755)) {
-			pr_perror("Unable to create %s", r->mi->mountpoint);
+		if (mkdirpat(AT_FDCWD, service_mountpoint(r->mi), 0755)) {
+			pr_perror("Unable to create %s", service_mountpoint(r->mi));
 			return -1;
 		}
 	}
 
-	if (cr_time && mkdirpat(AT_FDCWD, cr_time->mountpoint, 0755)) {
-		pr_perror("Unable to create %s", cr_time->mountpoint);
+	if (cr_time && mkdirpat(AT_FDCWD, service_mountpoint(cr_time), 0755)) {
+		pr_perror("Unable to create %s", service_mountpoint(cr_time));
 		return -1;
 	}
 
@@ -4093,11 +4100,11 @@ int try_remount_writable(struct mount_info *mi, bool ns)
 			return -1;
 		}
 
-		pr_info("Remount %d:%s writable\n", mi->mnt_id, mi->mountpoint);
+		pr_info("Remount %d:%s writable\n", mi->mnt_id, service_mountpoint(mi));
 		if (!ns) {
-			if (mount(NULL, mi->mountpoint, NULL,
+			if (mount(NULL, service_mountpoint(mi), NULL,
 				  MS_REMOUNT | MS_BIND | (mi->flags & ~(MS_PROPAGATE | MS_RDONLY)), NULL) == -1) {
-				pr_perror("Failed to remount %d:%s writable", mi->mnt_id, mi->mountpoint);
+				pr_perror("Failed to remount %d:%s writable", mi->mnt_id, service_mountpoint(mi));
 				return -1;
 			}
 		} else {
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 774a2812b..3c71476fa 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1633,14 +1633,14 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump)
 		if (new->fstype->parse) {
 			ret = new->fstype->parse(new);
 			if (ret < 0) {
-				pr_err("Failed to parse FS specific data on %s\n", new->mountpoint);
+				pr_err("Failed to parse FS specific data on %s\n", service_mountpoint(new));
 				mnt_entry_free(new);
 				new = NULL;
 				goto end;
 			}
 
 			if (ret > 0) {
-				pr_info("\tskipping fs mounted at %s\n", new->mountpoint + 1);
+				pr_info("\tskipping fs mounted at %s\n", service_mountpoint(new) + 1);
 				mnt_entry_free(new);
 				new = NULL;
 				ret = 0;
diff --git a/criu/tty.c b/criu/tty.c
index 1462193c5..0430dbff7 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -2406,9 +2406,9 @@ int devpts_restore(struct mount_info *pm)
 	struct mount_info *bm;
 	int dfd, exit_code = -1;
 
-	dfd = open(pm->mountpoint, O_RDONLY);
+	dfd = open(service_mountpoint(pm), O_RDONLY);
 	if (dfd < 0) {
-		pr_perror("Unable to open %s", pm->mountpoint);
+		pr_perror("Unable to open %s", service_mountpoint(pm));
 		return -1;
 	}
 

From 169f95c3940d703942c01f8b263ea0b18635fd6e Mon Sep 17 00:00:00 2001
From: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Date: Mon, 11 Jul 2016 14:14:15 +0300
Subject: [PATCH 0975/1854] files-reg: split create_ghost_dentry out of
 create_ghost

Will use it to make create_ghost work with mount-v2.

Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/156fa4877
Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/069bba0ad

Changes: merge fixup.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 70 +++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 95f84a29f..b400559e1 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -355,32 +355,11 @@ err:
 	return ret;
 }
 
-static int create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, struct cr_img *img)
+static int create_ghost_dentry(char *path, GhostFileEntry *gfe, struct cr_img *img)
 {
-	struct mount_info *mi;
-	char path[PATH_MAX];
-	int ret, root_len;
+	int ret = -1;
 	char *msg;
 
-	root_len = ret = rst_get_mnt_root(gf->remap.rmnt_id, path, sizeof(path));
-	if (ret < 0) {
-		pr_err("The %d mount is not found for ghost\n", gf->remap.rmnt_id);
-		goto err;
-	}
-
-	/* Add a '/' only if we have no at the end */
-	if (path[root_len - 1] != '/') {
-		path[root_len++] = '/';
-		path[root_len] = '\0';
-	}
-
-	snprintf(path + root_len, sizeof(path) - root_len, "%s", gf->remap.rpath);
-	ret = -1;
-
-	mi = lookup_mnt_id(gf->remap.rmnt_id);
-	/* We get here while in service mntns */
-	if (mi && try_remount_writable(mi, false))
-		goto err;
 again:
 	if (S_ISFIFO(gfe->mode)) {
 		if ((ret = mknod(path, gfe->mode, 0)) < 0)
@@ -417,18 +396,49 @@ again:
 		goto err;
 	}
 
-	strcpy(gf->remap.rpath, path + root_len);
-	pr_debug("Remap rpath is %s\n", gf->remap.rpath);
-
-	ret = -1;
-	if (ghost_apply_metadata(path, gfe))
-		goto err;
-
 	ret = 0;
 err:
 	return ret;
 }
 
+static int create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, struct cr_img *img)
+{
+	struct mount_info *mi;
+	char path[PATH_MAX];
+	int ret, root_len;
+
+	root_len = ret = rst_get_mnt_root(gf->remap.rmnt_id, path, sizeof(path));
+	if (ret < 0) {
+		pr_err("The %d mount is not found for ghost\n", gf->remap.rmnt_id);
+		return -1;
+	}
+
+	/* Add a '/' only if we have no at the end */
+	if (path[root_len - 1] != '/') {
+		path[root_len++] = '/';
+		path[root_len] = '\0';
+	}
+
+	snprintf(path + root_len, sizeof(path) - root_len, "%s", gf->remap.rpath);
+	ret = -1;
+
+	mi = lookup_mnt_id(gf->remap.rmnt_id);
+	/* We get here while in service mntns */
+	if (mi && try_remount_writable(mi, false))
+		return -1;
+
+	ret = create_ghost_dentry(path, gfe, img);
+	if (ret)
+		return -1;
+
+	if (ghost_apply_metadata(path, gfe))
+		return -1;
+
+	strcpy(gf->remap.rpath, path + root_len);
+	pr_debug("Remap rpath is %s\n", gf->remap.rpath);
+	return 0;
+}
+
 static inline void ghost_path(char *path, int plen, struct reg_file_info *rfi, RemapFilePathEntry *rpe)
 {
 	snprintf(path, plen, "%s.cr.%x.ghost", rfi->path, rpe->remap_id);

From 9a0918497d8c55719d6bc4e7d8b88d12ff944c87 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 14 May 2020 14:11:47 +0300
Subject: [PATCH 0976/1854] files-reg: teach create_ghost to work with mount-v2

While mounts-v2 would mount all mounts plain without tree in service
mntns we can't just use path relative to mntns to find remap. Make it
mount related, it is also compatible with current mount engine.

Also handle no-mntns case separately in nomntns_create_ghost.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/9cdf0b3e4

Changes: make gf->remap.rpath always relative else we get:
Error (criu/files-reg.c:779): Couldn't unlink remap
/tmp/.criu.mntns.BCurDL/13-0000000000 /zdtm/static/cwd02.test:
No such file or directory

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 85 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index b400559e1..b4c1f3365 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -53,6 +53,7 @@
 
 #include "files-reg.h"
 #include "plugin.h"
+#include "string.h"
 
 int setfsuid(uid_t fsuid);
 int setfsgid(gid_t fsuid);
@@ -401,40 +402,74 @@ err:
 	return ret;
 }
 
-static int create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, struct cr_img *img)
+static int nomntns_create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, struct cr_img *img)
 {
-	struct mount_info *mi;
 	char path[PATH_MAX];
-	int ret, root_len;
 
-	root_len = ret = rst_get_mnt_root(gf->remap.rmnt_id, path, sizeof(path));
-	if (ret < 0) {
-		pr_err("The %d mount is not found for ghost\n", gf->remap.rmnt_id);
-		return -1;
-	}
+	snprintf(path, sizeof(path), "/%s", gf->remap.rpath);
 
-	/* Add a '/' only if we have no at the end */
-	if (path[root_len - 1] != '/') {
-		path[root_len++] = '/';
-		path[root_len] = '\0';
-	}
-
-	snprintf(path + root_len, sizeof(path) - root_len, "%s", gf->remap.rpath);
-	ret = -1;
-
-	mi = lookup_mnt_id(gf->remap.rmnt_id);
-	/* We get here while in service mntns */
-	if (mi && try_remount_writable(mi, false))
-		return -1;
-
-	ret = create_ghost_dentry(path, gfe, img);
-	if (ret)
+	if (create_ghost_dentry(path, gfe, img))
 		return -1;
 
 	if (ghost_apply_metadata(path, gfe))
 		return -1;
 
-	strcpy(gf->remap.rpath, path + root_len);
+	strlcpy(gf->remap.rpath, path + 1, PATH_MAX);
+	pr_debug("Remap rpath is %s\n", gf->remap.rpath);
+	return 0;
+}
+
+static int create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, struct cr_img *img)
+{
+	struct mount_info *mi;
+	char path[PATH_MAX], *rel_path, *rel_mp;
+
+	if (!(root_ns_mask & CLONE_NEWNS))
+		return nomntns_create_ghost(gf, gfe, img);
+
+	mi = lookup_mnt_id(gf->remap.rmnt_id);
+	if (!mi) {
+		pr_err("The %d mount is not found for ghost\n", gf->remap.rmnt_id);
+		return -1;
+	}
+
+	/* Get path relative to mountpoint from path relative to mntns */
+	rel_path = get_relative_path(gf->remap.rpath, mi->ns_mountpoint);
+	if (!rel_path) {
+		pr_err("Can't get path %s relative to %s\n", gf->remap.rpath, mi->ns_mountpoint);
+		return -1;
+	}
+
+	snprintf(path, sizeof(path), "%s%s%s", service_mountpoint(mi), rel_path[0] ? "/" : "", rel_path);
+	pr_debug("Trying to create ghost on path %s\n", path);
+
+	/* We get here while in service mntns */
+	if (try_remount_writable(mi, false))
+		return -1;
+
+	if (create_ghost_dentry(path, gfe, img))
+		return -1;
+
+	if (ghost_apply_metadata(path, gfe))
+		return -1;
+
+	/*
+	 * Convert the path back to mntns relative, as create_ghost_dentry
+	 * might have changed it.
+	 */
+	rel_path = get_relative_path(path, service_mountpoint(mi));
+	if (!rel_path) {
+		pr_err("Can't get path %s relative to %s\n", path, service_mountpoint(mi));
+		return -1;
+	}
+
+	rel_mp = get_relative_path(mi->ns_mountpoint, "/");
+	if (!rel_mp) {
+		pr_err("Can't get path %s relative to %s\n", mi->ns_mountpoint, "/");
+		return -1;
+	}
+
+	snprintf(gf->remap.rpath, PATH_MAX, "%s%s%s", rel_mp, (rel_mp[0] && rel_path[0]) ? "/" : "", rel_path);
 	pr_debug("Remap rpath is %s\n", gf->remap.rpath);
 	return 0;
 }

From 0ca89b99bbc601a7051618e923edefea24952cad Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 14 May 2020 16:36:57 +0300
Subject: [PATCH 0977/1854] files-reg: teach clean_one_remap to work with
 mount-v2

While mounts-v2 mounts all mounts plain without tree in service mntns we can't
just use path relative to mntns to find remap. Make it mount related, it is
also compatible with mounts-v1.

Also we don't need openat and unlinkat here as we've opened rmntns_root
just before that, lets switch to "non-at" variants.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/dc9ac0c80

Changes: rework to skip vz-specific hunks.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 60 ++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index b4c1f3365..ac8521e85 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -748,44 +748,50 @@ int prepare_remaps(void)
 static int clean_one_remap(struct remap_info *ri)
 {
 	struct file_remap *remap = ri->rfi->remap;
-	int mnt_id, ret, rmntns_root;
+	int mnt_id, ret;
 	struct mount_info *mi;
-	char path[PATH_MAX];
+	char path[PATH_MAX], *rel_path;
 
 	if (remap->rpath[0] == 0)
 		return 0;
 
+	if (!(root_ns_mask & CLONE_NEWNS)) {
+		snprintf(path, sizeof(path), "/%s", remap->rpath);
+		goto nomntns;
+	}
+
 	mnt_id = ri->rfi->rfe->mnt_id; /* rirfirfe %) */
-	ret = rst_get_mnt_root(mnt_id, path, sizeof(path));
-	if (ret < 0)
-		return -1;
-	if (ret >= sizeof(path) - 1) {
-		pr_err("The path buffer is too small\n");
-		return -1;
-	}
-
-	rmntns_root = open(path, O_RDONLY);
-	if (rmntns_root < 0) {
-		pr_perror("Unable to open %s", path);
-		return -1;
-	}
-
 	mi = lookup_mnt_id(mnt_id);
+	if (!mi) {
+		pr_err("The %d mount is not found for ghost\n", mnt_id);
+		return -1;
+	}
+
+	rel_path = get_relative_path(remap->rpath, mi->ns_mountpoint);
+	if (!rel_path) {
+		pr_err("Can't get path %s relative to %s\n", remap->rpath, mi->ns_mountpoint);
+		return -1;
+	}
+
+	snprintf(path, sizeof(path), "%s%s%s", service_mountpoint(mi), strlen(rel_path) ? "/" : "", rel_path);
+
 	/* We get here while in service mntns */
-	if (mi && try_remount_writable(mi, false)) {
-		close(rmntns_root);
+	if (try_remount_writable(mi, false))
+		return -1;
+
+nomntns:
+	pr_info("Unlink remap %s\n", path);
+
+	if (remap->is_dir)
+		ret = rmdir(path);
+	else
+		ret = unlink(path);
+
+	if (ret) {
+		pr_perror("Couldn't unlink remap %s", path);
 		return -1;
 	}
 
-	pr_info("Unlink remap %s\n", remap->rpath);
-
-	ret = unlinkat(rmntns_root, remap->rpath, remap->is_dir ? AT_REMOVEDIR : 0);
-	if (ret < 0) {
-		close(rmntns_root);
-		pr_perror("Couldn't unlink remap %s %s", path, remap->rpath);
-		return -1;
-	}
-	close(rmntns_root);
 	remap->rpath[0] = 0;
 
 	return 0;

From a946b946e85bbbcee3e1e3bfed7bf772d4a5f031 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 25 Mar 2021 13:37:55 +0300
Subject: [PATCH 0978/1854] kerndat: Check for MOVE_MOUNT_SET_GROUP
 availability

Mounts-v2 requires new kernel feature MOVE_MOUNT_SET_GROUP to be able to
restore propagation between mounts right.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/7da7f9a17

Changes: define move_mount syscall, check mainstream kernel
MOVE_MOUNT_SET_GROUP feature, use our "linux/mount.h" to overcome
possible problems of non-existing header on older kernels.

v3: coverity CID 389201: check ret of umount2 and rmdir at cleanup stage

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 criu/cr-check.c                               | 10 +++
 criu/include/kerndat.h                        |  1 +
 criu/include/mount-v2.h                       | 24 +++++++
 criu/kerndat.c                                | 69 +++++++++++++++++++
 10 files changed, 110 insertions(+)
 create mode 100644 criu/include/mount-v2.h

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index e6508ed9f..6b9cd8b8e 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -112,6 +112,7 @@ userfaultfd			282	388	(int flags)
 fallocate			47	352	(int fd, int mode, loff_t offset, loff_t len)
 cacheflush			!	983042	(void *start, void *end, int flags)
 ppoll				73	336	(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+move_mount			429	429	(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 fsopen				430	430	(char *fsname, unsigned int flags)
 fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 7a6db192c..430df1824 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -109,6 +109,7 @@ __NR_memfd_create		5314		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd		5317		sys_userfaultfd		(int flags)
 
 ##TODO for kernel
+__NR_move_mount			5429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen			5430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			5432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 1bb626bc5..138eec2af 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -108,6 +108,7 @@ __NR_gettimeofday	78		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
 __NR_preadv		320		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
 __NR_userfaultfd	364		sys_userfaultfd		(int flags)
 __NR_ppoll		281		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_move_mount		429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index 7178bf483..ae54afa17 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -108,6 +108,7 @@ __NR_userfaultfd	355		sys_userfaultfd		(int flags)
 __NR_preadv		328		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
 __NR_gettimeofday	78		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
 __NR_ppoll		302		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_move_mount		429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 7e456cdb7..e4133f8f9 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -96,6 +96,7 @@ __NR_seccomp		354		sys_seccomp		(unsigned int op, unsigned int flags, const char
 __NR_memfd_create	356		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd	374		sys_userfaultfd		(int flags)
 __NR_ppoll		309		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_move_mount		429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 2dfcc6eee..4c9461473 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -107,6 +107,7 @@ __NR_kcmp			312		sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1
 __NR_memfd_create		319		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd		323		sys_userfaultfd		(int flags)
 __NR_ppoll			271		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_move_mount			429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen			430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
diff --git a/criu/cr-check.c b/criu/cr-check.c
index ced084df2..10d433650 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1394,6 +1394,14 @@ static int check_sockopt_buf_lock(void)
 	return 0;
 }
 
+static int check_move_mount_set_group(void)
+{
+	if (!kdat.has_move_mount_set_group)
+		return -1;
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1514,6 +1522,7 @@ int cr_check(void)
 		ret |= check_network_lock_nftables();
 		ret |= check_sockopt_buf_lock();
 		ret |= check_memfd_hugetlb();
+		ret |= check_move_mount_set_group();
 	}
 
 	/*
@@ -1628,6 +1637,7 @@ static struct feature_list feature_list[] = {
 	{ "network_lock_nftables", check_network_lock_nftables },
 	{ "sockopt_buf_lock", check_sockopt_buf_lock },
 	{ "memfd_hugetlb", check_memfd_hugetlb },
+	{ "move_mount_set_group", check_move_mount_set_group },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 25825ee51..f6e3b6133 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -78,6 +78,7 @@ struct kerndat_s {
 	bool has_nftables_concat;
 	bool has_sockopt_buf_lock;
 	dev_t hugetlb_dev[HUGETLB_MAX];
+	bool has_move_mount_set_group;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/mount-v2.h b/criu/include/mount-v2.h
new file mode 100644
index 000000000..8a4e46b1a
--- /dev/null
+++ b/criu/include/mount-v2.h
@@ -0,0 +1,24 @@
+#ifndef __CR_MOUNT_V2_H__
+#define __CR_MOUNT_V2_H__
+
+#include "linux/mount.h"
+
+#include <compel/plugins/std/syscall-codes.h>
+
+#ifndef MOVE_MOUNT_SET_GROUP
+#define MOVE_MOUNT_SET_GROUP 0x00000100 /* Set sharing group instead */
+#endif
+#ifndef MOVE_MOUNT_F_EMPTY_PATH
+#define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */
+#endif
+#ifndef MOVE_MOUNT_T_EMPTY_PATH
+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */
+#endif
+
+static inline int sys_move_mount(int from_dirfd, const char *from_pathname, int to_dirfd, const char *to_pathname,
+				 unsigned int flags)
+{
+	return syscall(__NR_move_mount, from_dirfd, from_pathname, to_dirfd, to_pathname, flags);
+}
+
+#endif /* __CR_MOUNT_V2_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index da1fb5511..5e49fc116 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -14,6 +14,7 @@
 #include <sys/prctl.h>
 #include <sys/inotify.h>
 #include <sched.h>
+#include <sys/mount.h>
 
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 #include <nftables/libnftables.h>
@@ -46,6 +47,7 @@
 #include "kcmp.h"
 #include "sched.h"
 #include "memfd.h"
+#include "mount-v2.h"
 
 struct kerndat_s kdat = {};
 
@@ -932,6 +934,69 @@ err:
 	return exit_code;
 }
 
+static int kerndat_has_move_mount_set_group(void)
+{
+	char tmpdir[] = "/tmp/.criu.move_mount_set_group.XXXXXX";
+	char subdir[64];
+	int exit_code = -1;
+
+	if (mkdtemp(tmpdir) == NULL) {
+		pr_perror("Fail to make dir %s", tmpdir);
+		return -1;
+	}
+
+	if (mount("criu.move_mount_set_group", tmpdir, "tmpfs", 0, NULL)) {
+		pr_perror("Fail to mount tmfps to %s", tmpdir);
+		rmdir(tmpdir);
+		return -1;
+	}
+
+	if (mount(NULL, tmpdir, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("Fail to make %s private", tmpdir);
+		goto out;
+	}
+
+	if (snprintf(subdir, sizeof(subdir), "%s/subdir", tmpdir) >= sizeof(subdir)) {
+		pr_err("Fail to snprintf subdir\n");
+		goto out;
+	}
+
+	if (mkdir(subdir, 0700)) {
+		pr_perror("Fail to make dir %s", subdir);
+		goto out;
+	}
+
+	if (mount(subdir, subdir, NULL, MS_BIND, NULL)) {
+		pr_perror("Fail to make bind-mount %s", subdir);
+		goto out;
+	}
+
+	if (mount(NULL, tmpdir, NULL, MS_SHARED, NULL)) {
+		pr_perror("Fail to make %s private", tmpdir);
+		goto out;
+	}
+
+	if (sys_move_mount(AT_FDCWD, tmpdir, AT_FDCWD, subdir, MOVE_MOUNT_SET_GROUP)) {
+		if (errno == EINVAL || errno == ENOSYS) {
+			pr_debug("No MOVE_MOUNT_SET_GROUP kernel feature\n");
+			kdat.has_move_mount_set_group = false;
+			exit_code = 0;
+			goto out;
+		}
+		pr_perror("Fail to MOVE_MOUNT_SET_GROUP");
+		goto out;
+	}
+
+	kdat.has_move_mount_set_group = true;
+	exit_code = 0;
+out:
+	if (umount2(tmpdir, MNT_DETACH))
+		pr_warn("Fail to umount2 %s: %m\n", tmpdir);
+	if (rmdir(tmpdir))
+		pr_warn("Fail to rmdir %s: %m\n", tmpdir);
+	return exit_code;
+}
+
 #define KERNDAT_CACHE_FILE     KDAT_RUNDIR "/criu.kdat"
 #define KERNDAT_CACHE_FILE_TMP KDAT_RUNDIR "/.criu.kdat"
 
@@ -1517,6 +1582,10 @@ int kerndat_init(void)
 		pr_err("kerndat_sockopt_buf_lock failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_move_mount_set_group()) {
+		pr_err("kerndat_has_move_mount_set_group failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From 387f4652b364793eb083f9c490ca794044a741e4 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 24 Dec 2021 13:23:29 +0300
Subject: [PATCH 0979/1854] compel: add open_tree syscall

Will use this for cross mount namespace bindmounts.

Note: don't need separate kdat for mount-v2, as MOVE_MOUNT_SET_GROUP
were added much later than open_tree and all related fixups.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 criu/include/mount-v2.h                       | 24 +++++++++++++++++++
 7 files changed, 30 insertions(+)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 6b9cd8b8e..a422b4905 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -112,6 +112,7 @@ userfaultfd			282	388	(int flags)
 fallocate			47	352	(int fd, int mode, loff_t offset, loff_t len)
 cacheflush			!	983042	(void *start, void *end, int flags)
 ppoll				73	336	(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+open_tree			428	428	(int dirfd, const char *pathname, unsigned int flags)
 move_mount			429	429	(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 fsopen				430	430	(char *fsname, unsigned int flags)
 fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 430df1824..745782285 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -109,6 +109,7 @@ __NR_memfd_create		5314		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd		5317		sys_userfaultfd		(int flags)
 
 ##TODO for kernel
+__NR_open_tree			5428		sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
 __NR_move_mount			5429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen			5430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 138eec2af..0eceebe22 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -108,6 +108,7 @@ __NR_gettimeofday	78		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
 __NR_preadv		320		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
 __NR_userfaultfd	364		sys_userfaultfd		(int flags)
 __NR_ppoll		281		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_open_tree		428		sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
 __NR_move_mount		429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index ae54afa17..93a8f34d3 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -108,6 +108,7 @@ __NR_userfaultfd	355		sys_userfaultfd		(int flags)
 __NR_preadv		328		sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
 __NR_gettimeofday	78		sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
 __NR_ppoll		302		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_open_tree		428		sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
 __NR_move_mount		429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index e4133f8f9..14d2e0581 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -96,6 +96,7 @@ __NR_seccomp		354		sys_seccomp		(unsigned int op, unsigned int flags, const char
 __NR_memfd_create	356		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd	374		sys_userfaultfd		(int flags)
 __NR_ppoll		309		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_open_tree		428		sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
 __NR_move_mount		429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 4c9461473..2f690f48f 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -107,6 +107,7 @@ __NR_kcmp			312		sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1
 __NR_memfd_create		319		sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd		323		sys_userfaultfd		(int flags)
 __NR_ppoll			271		sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_open_tree			428		sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
 __NR_move_mount			429		sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
 __NR_fsopen			430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
diff --git a/criu/include/mount-v2.h b/criu/include/mount-v2.h
index 8a4e46b1a..396ed9594 100644
--- a/criu/include/mount-v2.h
+++ b/criu/include/mount-v2.h
@@ -21,4 +21,28 @@ static inline int sys_move_mount(int from_dirfd, const char *from_pathname, int
 	return syscall(__NR_move_mount, from_dirfd, from_pathname, to_dirfd, to_pathname, flags);
 }
 
+#ifndef OPEN_TREE_CLONE
+#define OPEN_TREE_CLONE 1 /* Clone the target tree and attach the clone */
+#endif
+#ifndef OPEN_TREE_CLOEXEC
+#define OPEN_TREE_CLOEXEC O_CLOEXEC /* Close the file on execve() */
+#endif
+#ifndef AT_SYMLINK_NOFOLLOW
+#define AT_SYMLINK_NOFOLLOW 0x100 /* Do not follow symbolic links. */
+#endif
+#ifndef AT_NO_AUTOMOUNT
+#define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount traversal */
+#endif
+#ifndef AT_EMPTY_PATH
+#define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */
+#endif
+#ifndef AT_RECURSIVE
+#define AT_RECURSIVE 0x8000 /* Apply to the entire subtree */
+#endif
+
+static inline int sys_open_tree(int dfd, const char *filename, unsigned int flags)
+{
+	return syscall(__NR_open_tree, dfd, filename, flags);
+}
+
 #endif /* __CR_MOUNT_V2_H__ */

From cef8366f52088c48c03bce9b89892d264e0e9d9a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 22 Dec 2021 11:07:24 +0300
Subject: [PATCH 0980/1854] kerndat: check whether the openat2 syscall is
 supported

Will use openat2 + RESOLVE_NO_XDEV to detect mountpoints.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 Makefile.config                               |  2 +-
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 .../plugins/include/uapi/std/syscall-types.h  |  1 +
 criu/cr-check.c                               | 10 ++++++++++
 criu/include/kerndat.h                        |  1 +
 criu/include/linux/openat2.h                  | 18 +++++++++++++++++
 criu/include/mount-v2.h                       | 10 ++++++++++
 criu/kerndat.c                                | 20 +++++++++++++++++++
 scripts/feature-tests.mak                     | 12 +++++++++++
 14 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 criu/include/linux/openat2.h

diff --git a/Makefile.config b/Makefile.config
index 66f1654ae..d46d84f2d 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -78,7 +78,7 @@ export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE
+	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE OPENAT2
 
 # $1 - config name
 define gen-feature-test
diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index a422b4905..c9bccc386 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -119,4 +119,5 @@ fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value
 fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
 clone3				435	435	(struct clone_args *uargs, size_t size)
 pidfd_open			434	434	(pid_t pid, unsigned int flags)
+openat2				437	437	(int dirfd, char *pathname, struct open_how *how, size_t size)
 pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 745782285..a74e694e2 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -116,4 +116,5 @@ __NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key,
 __NR_fsmount			5432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open			5434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_openat2			5437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		5438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 0eceebe22..648239182 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -115,4 +115,5 @@ __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, co
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index 93a8f34d3..169458296 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -115,4 +115,5 @@ __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, co
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 14d2e0581..4179a7f5b 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -103,4 +103,5 @@ __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, co
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 2f690f48f..9c27ab8b5 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -114,4 +114,5 @@ __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, c
 __NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open			434		sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/plugins/include/uapi/std/syscall-types.h b/compel/plugins/include/uapi/std/syscall-types.h
index cc1969c01..1eea99daa 100644
--- a/compel/plugins/include/uapi/std/syscall-types.h
+++ b/compel/plugins/include/uapi/std/syscall-types.h
@@ -40,6 +40,7 @@ struct rusage;
 struct iocb;
 struct pollfd;
 struct clone_args;
+struct open_how;
 
 typedef unsigned long aio_context_t;
 
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 10d433650..52393cc8b 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1402,6 +1402,14 @@ static int check_move_mount_set_group(void)
 	return 0;
 }
 
+static int check_openat2(void)
+{
+	if (!kdat.has_openat2)
+		return -1;
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1523,6 +1531,7 @@ int cr_check(void)
 		ret |= check_sockopt_buf_lock();
 		ret |= check_memfd_hugetlb();
 		ret |= check_move_mount_set_group();
+		ret |= check_openat2();
 	}
 
 	/*
@@ -1638,6 +1647,7 @@ static struct feature_list feature_list[] = {
 	{ "sockopt_buf_lock", check_sockopt_buf_lock },
 	{ "memfd_hugetlb", check_memfd_hugetlb },
 	{ "move_mount_set_group", check_move_mount_set_group },
+	{ "openat2", check_openat2 },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index f6e3b6133..de14028f5 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -79,6 +79,7 @@ struct kerndat_s {
 	bool has_sockopt_buf_lock;
 	dev_t hugetlb_dev[HUGETLB_MAX];
 	bool has_move_mount_set_group;
+	bool has_openat2;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/linux/openat2.h b/criu/include/linux/openat2.h
new file mode 100644
index 000000000..1e9ccff05
--- /dev/null
+++ b/criu/include/linux/openat2.h
@@ -0,0 +1,18 @@
+#ifndef _CRIU_LINUX_OPENAT2_H
+#define _CRIU_LINUX_OPENAT2_H
+
+#include <linux/types.h>
+
+#include "common/config.h"
+
+#ifdef CONFIG_HAS_OPENAT2
+#include <linux/openat2.h>
+#else
+struct open_how {
+	__u64 flags;
+	__u64 mode;
+	__u64 resolve;
+};
+#endif
+
+#endif
diff --git a/criu/include/mount-v2.h b/criu/include/mount-v2.h
index 396ed9594..a2e2fa1c8 100644
--- a/criu/include/mount-v2.h
+++ b/criu/include/mount-v2.h
@@ -2,6 +2,7 @@
 #define __CR_MOUNT_V2_H__
 
 #include "linux/mount.h"
+#include "linux/openat2.h"
 
 #include <compel/plugins/std/syscall-codes.h>
 
@@ -45,4 +46,13 @@ static inline int sys_open_tree(int dfd, const char *filename, unsigned int flag
 	return syscall(__NR_open_tree, dfd, filename, flags);
 }
 
+#ifndef RESOLVE_NO_XDEV
+#define RESOLVE_NO_XDEV 0x01 /* Block mount-point crossings (includes bind-mounts). */
+#endif
+
+static inline long sys_openat2(int dirfd, const char *pathname, struct open_how *how, size_t size)
+{
+	return syscall(__NR_openat2, dirfd, pathname, how, size);
+}
+
 #endif /* __CR_MOUNT_V2_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 5e49fc116..93617012a 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -997,6 +997,22 @@ out:
 	return exit_code;
 }
 
+static int kerndat_has_openat2(void)
+{
+	if (sys_openat2(AT_FDCWD, ".", NULL, 0) != -1) {
+		pr_err("openat2 should fail\n");
+		return -1;
+	}
+	if (errno == ENOSYS) {
+		pr_debug("No openat2 syscall support\n");
+		kdat.has_openat2 = false;
+	} else {
+		kdat.has_openat2 = true;
+	}
+
+	return 0;
+}
+
 #define KERNDAT_CACHE_FILE     KDAT_RUNDIR "/criu.kdat"
 #define KERNDAT_CACHE_FILE_TMP KDAT_RUNDIR "/.criu.kdat"
 
@@ -1586,6 +1602,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_move_mount_set_group failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_openat2()) {
+		pr_err("kerndat_has_openat2 failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index 8df20afb7..592552cb8 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -184,3 +184,15 @@ int main(void)
 	return memfd_create(NULL, 0);
 }
 endef
+
+define FEATURE_TEST_OPENAT2
+
+#include <linux/openat2.h>
+
+int main(void)
+{
+	if (RESOLVE_NO_XDEV > 0)
+		return 0;
+	return 0;
+}
+endef

From 6a25420d357e5279f1c2ed2ac63c50f9f03c8dd1 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 22 Dec 2021 19:26:32 +0300
Subject: [PATCH 0981/1854] util: add resolve_mountpoint helper

This helper would be useful to get mountpoints of source path of
external mounts without parsing host mountinfo. When we restore
mountpoint-external mount and we need to copy sharing from source via
MOVE_MOUNT_SET_GROUP, it would require from us to give it real
mountpoint of source path to be able to copy sharing group.

This uses openat2 RESOLVE_NO_XDEV feature which detects crossing
mountpoint boundary instead of potentially slow mountinfo parsing.

v3: coverity CID 389209: close fd only when it was opened

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/util.h |   3 ++
 criu/util.c         | 100 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index 0df1fe266..5ccd24722 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -403,4 +403,7 @@ extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void
  */
 extern uint64_t criu_run_id;
 extern void util_init(void);
+
+extern char *resolve_mountpoint(char *path);
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/util.c b/criu/util.c
index f14e6467f..f8da4ac5c 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -28,6 +28,7 @@
 #include <sched.h>
 #include <ftw.h>
 #include <time.h>
+#include <libgen.h>
 
 #include "linux/mount.h"
 
@@ -46,6 +47,7 @@
 #include "files.h"
 #include "pstree.h"
 #include "sched.h"
+#include "mount-v2.h"
 
 #include "cr-errno.h"
 #include "action-scripts.h"
@@ -1887,3 +1889,101 @@ bool is_same_path(char *path1, char *path2)
 
 	return true;
 }
+
+/*
+ * Checks if path is a mountpoint
+ * (path should be visible - no overmounts)
+ */
+static int path_is_mountpoint(char *path, bool *is_mountpoint)
+{
+	char *dname, *bname, *free_name;
+	struct open_how how = {
+		.flags = O_PATH,
+		.resolve = RESOLVE_NO_XDEV,
+	};
+	int exit_code = -1;
+	int dfd, fd;
+
+	dname = free_name = xstrdup(path);
+	if (!dname)
+		return -1;
+	dname = dirname(dname);
+
+	bname = get_relative_path(path, dname);
+	if (!bname || *bname == '\0') {
+		pr_err("Failed to get bname for %s\n", path);
+		goto err_free;
+	}
+
+	dfd = open(dname, O_PATH);
+	if (dfd < 0) {
+		pr_perror("Failed to open dir %s", dname);
+		goto err_free;
+	}
+
+	fd = sys_openat2(dfd, bname, &how, sizeof(how));
+	if (fd < 0) {
+		if (errno != EXDEV) {
+			pr_perror("Failed to open %s at %s", bname, dname);
+			goto err_close;
+		}
+
+		/*
+		 * EXDEV means that dfd and bname are from different
+		 * mounts, meaning that bname is a mountpoint
+		 */
+		*is_mountpoint = true;
+	} else {
+		/*
+		 * No error means that dfd and bname are from same mount,
+		 * meaning that bname is not a mountpoint
+		 */
+		*is_mountpoint = false;
+		close(fd);
+	}
+
+	exit_code = 0;
+err_close:
+	close(dfd);
+err_free:
+	xfree(free_name);
+	return exit_code;
+}
+
+/*
+ * Resolves real mountpoint path by any path on it
+ * (path should be visible - no overmountes)
+ */
+char *resolve_mountpoint(char *path)
+{
+	char *mp_path, *free_path;
+	bool is_mountpoint;
+
+	mp_path = free_path = xstrdup(path);
+	if (!mp_path)
+		return NULL;
+
+	while (1) {
+		/*
+		 * If we see "/" or "." we can't check if they are mountpoints
+		 * by openat2 RESOLVE_NO_XDEV, let's just assume they are.
+		 */
+		if (is_same_path(mp_path, "/"))
+			return mp_path;
+
+		if (path_is_mountpoint(mp_path, &is_mountpoint) == -1) {
+			xfree(free_path);
+			return NULL;
+		}
+
+		if (is_mountpoint)
+			return mp_path;
+
+		/* Try parent directory */
+		mp_path = dirname(mp_path);
+	}
+
+	/* never get here */
+	xfree(free_path);
+	return NULL;
+}

From f6b52c711e33ef57225a184bcc81e56a104227db Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 23 Dec 2021 17:19:49 +0300
Subject: [PATCH 0982/1854] crtools: move check_options after kerndat_init and
 log_init

This can be useful to check options which depend on some kernel features
listed in kdat.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/crtools.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 3c3491603..86aeb4d2b 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -185,9 +185,6 @@ int main(int argc, char *argv[], char *envp[])
 		return cr_service_work(atoi(argv[optind + 1]));
 	}
 
-	if (check_options())
-		return 1;
-
 	if (opts.imgs_dir == NULL)
 		SET_CHAR_OPTS(imgs_dir, ".");
 
@@ -264,6 +261,9 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
+	if (check_options())
+		return 1;
+
 	if (fault_injected(FI_CANNOT_MAP_VDSO))
 		kdat.can_map_vdso = 0;
 

From f2d1c7fab80e027337639f91a848c157045d75d1 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 25 May 2020 17:43:48 +0300
Subject: [PATCH 0983/1854] config/rpc: add new option --mntns-compat-mode for
 old mount engine

We plan to switch to Mounts-v2 engine for restoring mounts by default,
this options is to allow switching to old engine. This patch only adds
an option, no engine behind it yet.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/503f9ad2c

Changes: allow --mntns-compat-mode option only on restore and only if
MOVE_MOUNT_SET_GROUP is supported (this also requires change in
unittest/mock.c), change id in rpc criu_opts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/Makefile.crtools     |  1 +
 criu/config.c             | 12 ++++++++++++
 criu/cr-service.c         |  3 +++
 criu/crtools.c            |  3 +++
 criu/include/cr_options.h |  2 ++
 criu/include/mount-v2.h   |  2 ++
 criu/mount-v2.c           | 20 ++++++++++++++++++++
 criu/unittest/mock.c      |  5 +++++
 images/rpc.proto          |  1 +
 lib/c/criu.c              | 11 +++++++++++
 lib/c/criu.h              |  2 ++
 11 files changed, 62 insertions(+)
 create mode 100644 criu/mount-v2.c

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 46d7fd424..22108cce0 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -41,6 +41,7 @@ obj-y			+= lsm.o
 obj-y			+= mem.o
 obj-y			+= memfd.o
 obj-y			+= mount.o
+obj-y			+= mount-v2.o
 obj-y			+= filesystems.o
 obj-y			+= namespaces.o
 obj-y			+= netfilter.o
diff --git a/criu/config.c b/criu/config.c
index 4a8338423..8b6d105ae 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -20,6 +20,7 @@
 #include "file-lock.h"
 #include "irmap.h"
 #include "mount.h"
+#include "mount-v2.h"
 #include "namespaces.h"
 #include "net.h"
 #include "sk-inet.h"
@@ -697,6 +698,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		{ "file-validation", required_argument, 0, 1098 },
 		{ "lsm-mount-context", required_argument, 0, 1099 },
 		{ "network-lock", required_argument, 0, 1100 },
+		BOOL_OPT("mntns-compat-mode", &opts.mntns_compat_mode),
 		{},
 	};
 
@@ -1103,6 +1105,16 @@ int check_options(void)
 	}
 #endif
 
+	if (opts.mntns_compat_mode && opts.mode != CR_RESTORE) {
+		pr_err("Option --mntns-compat-mode is only valid on restore\n");
+		return 1;
+	} else if (!opts.mntns_compat_mode && opts.mode == CR_RESTORE) {
+		if (check_mount_v2()) {
+			pr_warn("Mount engine fallback to --mntns-compat-mode mode\n");
+			opts.mntns_compat_mode = true;
+		}
+	}
+
 	if (check_namespace_opts()) {
 		pr_err("Error: namespace flags conflict\n");
 		return 1;
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 59f46b320..a6eb9ebd3 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -719,6 +719,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 			goto err;
 	}
 
+	if (req->mntns_compat_mode)
+		opts.mntns_compat_mode = true;
+
 	log_set_loglevel(opts.log_level);
 	if (check_options())
 		goto err;
diff --git a/criu/crtools.c b/criu/crtools.c
index 86aeb4d2b..cc8d9179f 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -408,6 +408,9 @@ usage:
 	       "                        in lazy-pages mode: 'criu lazy-pages -D DIR'\n"
 	       "                        --lazy-pages and lazy-pages mode require userfaultfd\n"
 	       "  --stream              dump/restore images using criu-image-streamer\n"
+	       "  --mntns-compat-mode   Use mount engine in compatibility mode. By default criu\n"
+	       "                        tries to use mount-v2 mode with more reliable algorithm\n"
+	       "                        based on MOVE_MOUNT_SET_GROUP kernel feature\n"
 	       "  --network-lock METHOD\n"
 	       "                      network locking/unlocking method; argument\n"
 	       "                      can be 'nftables' or 'iptables' (default).\n"
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 85648bf1c..bf1a762cc 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -207,6 +207,8 @@ struct cr_options {
 
 	/* Shows the mode criu is running at the moment: dump/pre-dump/restore/... */
 	enum criu_mode mode;
+
+	int mntns_compat_mode;
 };
 
 extern struct cr_options opts;
diff --git a/criu/include/mount-v2.h b/criu/include/mount-v2.h
index a2e2fa1c8..61f62966d 100644
--- a/criu/include/mount-v2.h
+++ b/criu/include/mount-v2.h
@@ -55,4 +55,6 @@ static inline long sys_openat2(int dirfd, const char *pathname, struct open_how
 	return syscall(__NR_openat2, dirfd, pathname, how, size);
 }
 
+extern int check_mount_v2(void);
+
 #endif /* __CR_MOUNT_V2_H__ */
diff --git a/criu/mount-v2.c b/criu/mount-v2.c
new file mode 100644
index 000000000..801ade748
--- /dev/null
+++ b/criu/mount-v2.c
@@ -0,0 +1,20 @@
+#include "kerndat.h"
+#include "log.h"
+
+#undef LOG_PREFIX
+#define LOG_PREFIX "mnt-v2: "
+
+int check_mount_v2(void)
+{
+	if (!kdat.has_move_mount_set_group) {
+		pr_warn("Mounts-v2 requires MOVE_MOUNT_SET_GROUP support\n");
+		return -1;
+	}
+
+	if (!kdat.has_openat2) {
+		pr_warn("Mounts-v2 requires openat2 support\n");
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c
index 127cc7498..dc5b627f7 100644
--- a/criu/unittest/mock.c
+++ b/criu/unittest/mock.c
@@ -136,3 +136,8 @@ struct kerndat_s kdat = {};
 int service_fd_rlim_cur;
 
 unsigned __page_size;
+
+int check_mount_v2(void)
+{
+	return 0;
+}
diff --git a/images/rpc.proto b/images/rpc.proto
index 1d3befd23..a6cc5da48 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -137,6 +137,7 @@ message criu_opts {
 	optional int32			pidfd_store_sk		= 62;
 	optional string			lsm_mount_context	= 63;
 	optional criu_network_lock_method	network_lock		= 64 [default = IPTABLES];
+	optional bool			mntns_compat_mode	= 65;
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index dea5896f7..7807d7bc5 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1170,6 +1170,17 @@ int criu_set_page_server_address_port(const char *address, int port)
 	return criu_local_set_page_server_address_port(global_opts, address, port);
 }
 
+void criu_local_set_mntns_compat_mode(criu_opts *opts, bool val)
+{
+	opts->rpc->has_mntns_compat_mode = true;
+	opts->rpc->mntns_compat_mode = val;
+}
+
+void criu_set_mntns_compat_mode(bool val)
+{
+	criu_local_set_mntns_compat_mode(global_opts, val);
+}
+
 static CriuResp *recv_resp(int socket_fd)
 {
 	struct msghdr msg_hdr = { 0 };
diff --git a/lib/c/criu.h b/lib/c/criu.h
index aed2c3481..40e3106fc 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -112,6 +112,7 @@ int criu_set_pre_dump_mode(enum criu_pre_dump_mode mode);
 void criu_set_pidfd_store_sk(int sk);
 int criu_set_network_lock(enum criu_network_lock_method method);
 int criu_join_ns_add(const char *ns, const char *ns_file, const char *extra_opt);
+void criu_set_mntns_compat_mode(bool val);
 
 /*
  * The criu_notify_arg_t na argument is an opaque
@@ -275,6 +276,7 @@ int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode);
 void criu_local_set_pidfd_store_sk(criu_opts *opts, int sk);
 int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method);
 int criu_local_join_ns_add(criu_opts *opts, const char *ns, const char *ns_file, const char *extra_opt);
+void criu_local_set_mntns_compat_mode(criu_opts *opts, bool val);
 
 void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_notify_arg_t na));
 

From f032741cd629500d1c10c8ef48c746fce30a6c41 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 28 May 2020 11:30:16 +0300
Subject: [PATCH 0984/1854] mount: add plain mountpoints

This is a preparation of mounts-v2 new algorithm for mount restore, we
add an alternative mountpoints to each mount, so that if we mount mounts
in these mountpoints they will be "plain": each mount in separate
sub-directory of root_yard, mounts will be mounted without tree. Tree
reconstruction will be done in separate step.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/5e6de171a

Changes: improve get_plain_mountpoint().

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h |  3 +++
 criu/mount.c         | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 8eb4ddf9b..588aedf99 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -48,6 +48,7 @@ struct mount_info {
 	 */
 	char *mountpoint;
 	char *ns_mountpoint;
+	char *plain_mountpoint;
 	int fd;
 	unsigned flags;
 	unsigned sb_flags;
@@ -168,6 +169,8 @@ extern int read_mnt_ns_img(void);
 extern void cleanup_mnt_ns(void);
 extern void clean_cr_time_mounts(void);
 
+extern char *get_plain_mountpoint(int mnt_id, char *name);
+
 extern bool add_skip_mount(const char *mountpoint);
 struct ns_id;
 extern int get_sdev_from_fd(int fd, unsigned int *sdev, bool parse_mountinfo);
diff --git a/criu/mount.c b/criu/mount.c
index bddfe2e7f..64ef2f233 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -49,6 +49,10 @@ static LIST_HEAD(delayed_unbindable);
 
 char *service_mountpoint(const struct mount_info *mi)
 {
+	if (!opts.mntns_compat_mode && opts.mode == CR_RESTORE) {
+		BUG_ON(!mi->plain_mountpoint);
+		return mi->plain_mountpoint;
+	}
 	return mi->mountpoint;
 }
 
@@ -1627,6 +1631,28 @@ err:
 	return -1;
 }
 
+/*
+ * Helper for getting a path to mount's plain mountpoint
+ */
+char *get_plain_mountpoint(int mnt_id, char *name)
+{
+	static char tmp[PATH_MAX];
+	int ret;
+
+	if (!mnt_roots)
+		return NULL;
+
+	if (name)
+		ret = snprintf(tmp, sizeof(tmp), "%s/mnt-%s", mnt_roots, name);
+	else
+		ret = snprintf(tmp, sizeof(tmp), "%s/mnt-%010d", mnt_roots, mnt_id);
+
+	if (ret >= sizeof(tmp))
+		return NULL;
+
+	return xstrdup(tmp);
+}
+
 static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *root, char *fsname, const char *path,
 							   unsigned int s_dev, bool rst)
 {
@@ -1654,6 +1680,11 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
 		sprintf(mi->mountpoint, "%s%s", root->mountpoint, path);
 	else
 		sprintf(mi->mountpoint, "%s/%s", root->mountpoint, path);
+	if (rst) {
+		mi->plain_mountpoint = get_plain_mountpoint(-1, "crtime");
+		if (!mi->plain_mountpoint)
+			goto err;
+	}
 	mi->mnt_id = HELPER_MNT_ID;
 	mi->flags = mi->sb_flags = 0;
 	mi->root = xstrdup("/");
@@ -2995,6 +3026,7 @@ void mnt_entry_free(struct mount_info *mi)
 	if (mi) {
 		xfree(mi->root);
 		xfree(mi->mountpoint);
+		xfree(mi->plain_mountpoint);
 		xfree(mi->source);
 		xfree(mi->options);
 		xfree(mi->fsname);
@@ -3120,6 +3152,10 @@ static int get_mp_mountpoint(char *mountpoint, struct mount_info *mi, char *root
 
 	mi->ns_mountpoint = mi->mountpoint + root_len;
 
+	mi->plain_mountpoint = get_plain_mountpoint(mi->mnt_id, NULL);
+	if (!mi->plain_mountpoint)
+		return -1;
+
 	pr_debug("\t\tWill mount %d @ %s %s\n", mi->mnt_id, service_mountpoint(mi), mi->ns_mountpoint);
 	return 0;
 }
@@ -3293,6 +3329,9 @@ static int merge_mount_trees(void)
 		return -1;
 
 	root_yard_mp->mountpoint = mnt_roots;
+	root_yard_mp->plain_mountpoint = xstrdup(mnt_roots);
+	if (!root_yard_mp->plain_mountpoint)
+		return -1;
 	root_yard_mp->mounted = true;
 	root_yard_mp->mnt_bind_is_populated = true;
 	root_yard_mp->is_overmounted = false;

From 1f4a9a531d355b725d2693229421a383458561ac Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 21 Dec 2021 12:14:23 +0300
Subject: [PATCH 0985/1854] files-reg: export parent dirs helpers for mount-v2

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c         | 4 ++--
 criu/include/files-reg.h | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index ac8521e85..6aaa4c9aa 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1873,7 +1873,7 @@ out:
 	return ret;
 }
 
-static int rm_parent_dirs(int mntns_root, char *path, int count)
+int rm_parent_dirs(int mntns_root, char *path, int count)
 {
 	char *p, *prev = NULL;
 	int ret = -1;
@@ -1912,7 +1912,7 @@ err:
 }
 
 /* Construct parent dir name and mkdir parent/grandparents if they're not exist */
-static int make_parent_dirs_if_need(int mntns_root, char *path)
+int make_parent_dirs_if_need(int mntns_root, char *path)
 {
 	char *p, *last_delim;
 	int err, count = 0;
diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h
index 953d50288..d4934c4ae 100644
--- a/criu/include/files-reg.h
+++ b/criu/include/files-reg.h
@@ -58,4 +58,7 @@ static inline int link_strip_deleted(struct fd_link *link)
 
 extern int dead_pid_conflict(void);
 
+extern int rm_parent_dirs(int mntns_root, char *path, int count);
+extern int make_parent_dirs_if_need(int mntns_root, char *path);
+
 #endif /* __CR_FILES_REG_H__ */

From 0723d0cd9634510ca17dcc69740b23013b3e7217 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 21 Dec 2021 12:43:42 +0300
Subject: [PATCH 0986/1854] mount: remove double ns_id declaration

Fixes: d0d117986 ("mount: move functions about mounts from proc_parse.h")

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 588aedf99..562b0cd9b 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -172,7 +172,6 @@ extern void clean_cr_time_mounts(void);
 extern char *get_plain_mountpoint(int mnt_id, char *name);
 
 extern bool add_skip_mount(const char *mountpoint);
-struct ns_id;
 extern int get_sdev_from_fd(int fd, unsigned int *sdev, bool parse_mountinfo);
 extern struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid, bool for_dump);
 

From 3229e7f5821f84a143612c34b270889f9343d662 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 21 Dec 2021 12:46:57 +0300
Subject: [PATCH 0987/1854] mount: export common defines for mount-v2

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h | 14 ++++++++++++++
 criu/mount.c         | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 562b0cd9b..dfb9989c0 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -10,6 +10,20 @@ struct pstree_item;
 struct fstype;
 struct ns_id;
 
+#define MS_PROPAGATE (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
+
+/*
+ * Here are a set of flags which we know how to handle for the one mount call.
+ * All of them except MS_RDONLY are set only as mnt flags.
+ * MS_RDONLY is set for both mnt ans sb flags, so we can restore it for one
+ * mount call only if it set for both masks.
+ */
+#define MS_MNT_KNOWN_FLAGS (MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_NOATIME | MS_NODIRATIME | MS_RELATIME | MS_RDONLY)
+
+#define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc"
+
+#define HELPER_MNT_ID 0
+
 #define MOUNT_INVALID_DEV (0)
 
 #define MNT_UNREACHABLE INT_MIN
diff --git a/criu/mount.c b/criu/mount.c
index 64ef2f233..d796c9341 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -31,15 +31,9 @@
 
 #include "images/mnt.pb-c.h"
 
-#define MS_PROPAGATE (MS_SHARED | MS_PRIVATE | MS_UNBINDABLE | MS_SLAVE)
-
 #undef LOG_PREFIX
 #define LOG_PREFIX "mnt: "
 
-#define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc"
-
-#define HELPER_MNT_ID 0
-
 #define CONTEXT_OPT "context="
 
 /* A helper mount_info entry for the roots yard */
@@ -2210,14 +2204,6 @@ static int fetch_rt_stat(struct mount_info *m, const char *where)
 	return 0;
 }
 
-/*
- * Here are a set of flags which we know how to handle for the one mount call.
- * All of them except MS_RDONLY are set only as mnt flags.
- * MS_RDONLY is set for both mnt ans sb flags, so we can restore it for one
- * mount call only if it set for both masks.
- */
-#define MS_MNT_KNOWN_FLAGS (MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_NOATIME | MS_NODIRATIME | MS_RELATIME | MS_RDONLY)
-
 static int do_simple_mount(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags)
 {
 	int ret = mount(src, service_mountpoint(mi), fstype, mountflags, mi->options);

From 972a598628b1d2527848dae9403226b86a63a55e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 21 Dec 2021 13:29:52 +0300
Subject: [PATCH 0988/1854] mount: export several functions for mount-v2

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h | 14 ++++++++++++++
 criu/mount.c         | 28 ++++++++++++----------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index dfb9989c0..914024544 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -209,4 +209,18 @@ extern struct mount_info *mnt_bind_pick(struct mount_info *mi,
 extern int mnt_tree_for_each(struct mount_info *start, int (*fn)(struct mount_info *));
 
 extern char *service_mountpoint(const struct mount_info *mi);
+
+extern int validate_mounts(struct mount_info *info, bool for_dump);
+extern __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *root, char *fsname, const char *path,
+							   unsigned int s_dev, bool rst);
+extern char *resolve_source(struct mount_info *mi);
+extern int fetch_rt_stat(struct mount_info *m, const char *where);
+extern int do_simple_mount(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags);
+extern char *mnt_fsname(struct mount_info *mi);
+extern int apply_sb_flags(void *args, int fd, pid_t pid);
+extern int mount_root(void *args, int fd, pid_t pid);
+extern int restore_ext_mount(struct mount_info *mi);
+extern int cr_pivot_root(char *root);
+extern int print_ns_root(struct ns_id *ns, int remap_id, char *buf, int bs);
+
 #endif /* __CR_MOUNT_H__ */
diff --git a/criu/mount.c b/criu/mount.c
index d796c9341..7549284d9 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -693,7 +693,7 @@ static int validate_children_collision(struct mount_info *mnt)
 	return 0;
 }
 
-static int validate_mounts(struct mount_info *info, bool for_dump)
+int validate_mounts(struct mount_info *info, bool for_dump)
 {
 	struct mount_info *m, *t;
 
@@ -1647,8 +1647,8 @@ char *get_plain_mountpoint(int mnt_id, char *name)
 	return xstrdup(tmp);
 }
 
-static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *root, char *fsname, const char *path,
-							   unsigned int s_dev, bool rst)
+struct mount_info __maybe_unused *add_cr_time_mount(struct mount_info *root, char *fsname, const char *path,
+						    unsigned int s_dev, bool rst)
 {
 	struct mount_info *mi, *t, *parent;
 	bool add_slash = false;
@@ -1993,7 +1993,7 @@ static int mnt_tree_for_each_reverse(struct mount_info *m, int (*fn)(struct moun
 	return 0;
 }
 
-static char *resolve_source(struct mount_info *mi)
+char *resolve_source(struct mount_info *mi)
 {
 	if (kdev_major(mi->s_dev) == 0)
 		/*
@@ -2191,7 +2191,7 @@ skip_parent:
 	return 0;
 }
 
-static int fetch_rt_stat(struct mount_info *m, const char *where)
+int fetch_rt_stat(struct mount_info *m, const char *where)
 {
 	struct stat st;
 
@@ -2204,7 +2204,7 @@ static int fetch_rt_stat(struct mount_info *m, const char *where)
 	return 0;
 }
 
-static int do_simple_mount(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags)
+int do_simple_mount(struct mount_info *mi, const char *src, const char *fstype, unsigned long mountflags)
 {
 	int ret = mount(src, service_mountpoint(mi), fstype, mountflags, mi->options);
 	if (ret)
@@ -2212,7 +2212,7 @@ static int do_simple_mount(struct mount_info *mi, const char *src, const char *f
 	return ret;
 }
 
-static char *mnt_fsname(struct mount_info *mi)
+char *mnt_fsname(struct mount_info *mi)
 {
 	if (mi->fstype->code == FSTYPE__AUTO)
 		return mi->fsname;
@@ -2240,12 +2240,12 @@ static int userns_mount(char *src, void *args, int fd, pid_t pid)
 	return err;
 }
 
-static int apply_sb_flags(void *args, int fd, pid_t pid)
+int apply_sb_flags(void *args, int fd, pid_t pid)
 {
 	return userns_mount(NULL, args, fd, pid);
 }
 
-static int mount_root(void *args, int fd, pid_t pid)
+int mount_root(void *args, int fd, pid_t pid)
 {
 	return userns_mount(opts.root, args, fd, pid);
 }
@@ -2315,7 +2315,7 @@ static int do_new_mount(struct mount_info *mi)
 	return 0;
 }
 
-static int restore_ext_mount(struct mount_info *mi)
+int restore_ext_mount(struct mount_info *mi)
 {
 	int ret;
 
@@ -2802,10 +2802,6 @@ static int do_umount_one(struct mount_info *mi)
  * roots_yard where it will be restored. The remapped mount will be
  * moved to the right places after restoring all mounts.
  */
-
-static inline int print_ns_root(struct ns_id *ns, int remap_id, char *buf, int bs);
-static int get_mp_mountpoint(char *mountpoint, struct mount_info *mi, char *root, int root_len);
-
 static LIST_HEAD(mnt_remap_list);
 static int remap_id;
 
@@ -2904,7 +2900,7 @@ static int fixup_remap_mounts(void)
 	return 0;
 }
 
-static int cr_pivot_root(char *root)
+int cr_pivot_root(char *root)
 {
 	char tmp_dir_tmpl[] = "crtools-put-root.XXXXXX";
 	bool tmp_dir = false;
@@ -3024,7 +3020,7 @@ void mnt_entry_free(struct mount_info *mi)
  * Helper for getting a path to where the namespace's root
  * is re-constructed.
  */
-static inline int print_ns_root(struct ns_id *ns, int remap_id, char *buf, int bs)
+int print_ns_root(struct ns_id *ns, int remap_id, char *buf, int bs)
 {
 	return snprintf(buf, bs, "%s/%d-%010d", mnt_roots, ns->id, remap_id);
 }

From c29675c9a5b84b0c5280c2a109476cb088d8efed Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 21 Dec 2021 14:04:19 +0300
Subject: [PATCH 0989/1854] mount: export global variables for mount-v2

Export root_yard_mp and it's mntns_roots.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount.h | 3 +++
 criu/mount.c         | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/criu/include/mount.h b/criu/include/mount.h
index 914024544..c16a5c293 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -223,4 +223,7 @@ extern int restore_ext_mount(struct mount_info *mi);
 extern int cr_pivot_root(char *root);
 extern int print_ns_root(struct ns_id *ns, int remap_id, char *buf, int bs);
 
+extern struct mount_info *root_yard_mp;
+extern char *mnt_roots;
+
 #endif /* __CR_MOUNT_H__ */
diff --git a/criu/mount.c b/criu/mount.c
index 7549284d9..c39b44ac6 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -37,7 +37,7 @@
 #define CONTEXT_OPT "context="
 
 /* A helper mount_info entry for the roots yard */
-static struct mount_info *root_yard_mp = NULL;
+struct mount_info *root_yard_mp = NULL;
 
 static LIST_HEAD(delayed_unbindable);
 
@@ -349,7 +349,7 @@ static bool mounts_equal(struct mount_info *a, struct mount_info *b)
  * mnt_roots is a temporary directory for restoring sub-trees of
  * non-root namespaces.
  */
-static char *mnt_roots;
+char *mnt_roots;
 
 static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
 {

From b35c842d0f9778bcb13991071b97913d27fce6d2 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 25 May 2020 18:12:49 +0300
Subject: [PATCH 0990/1854] mount: add new mounts-v2 engine

Design of mounts-v2:

  As a preparation step we classify mounts in groups by (shared_id,
  master_id) in new resolve_shared_mounts_v2 (just after reading images).

  New function prepare_mnt_ns_v2 is our main entry point when switching
  from old mount engine to new one actually happens.

  First we pre-create each mount namespace nearly empty, only with root
  yard in place (pre_create_mount_namespaces).

  We walk the mount tree and mount each mount similar to old mount
  engine but not in mount tree but as a sub-directory of root yard
  (plain mountpoint) in service (criu) mount namespace. Also we
  bind this mount from service mntns to real mntns just after creation.
  (do_mount_in_right_mntns)

  Note: this way we initially have the final mount which would be
  visible to restored container user with right mnt_id for the sake of
  e.g. creating unix sockets on it (for unix socket bindmounts), and
  both have copy of the mount in service mntns so that old code which
  accesses files on mounts through service mntns still can acces them.

  New can_mount_now_v2 is now free from heuristics we had for restoring
  shared groups, we will restore them later via MOVE_MOUNT_SET_GROUP,
  for now everything is private.

  Now when all plain mount are created in real mount namespaces, we can
  move them to the tree for each namespace. Also we open fds on the
  mountpoint: one mp_fd_id before moving and another mnt_fd_id after,
  so that we can access each file later from final mntns via those fds.
  (assemble_mount_namespaces)

  New restore_mount_sharing_options walks each root sharing group and
  their descendants with dfs tree walk. It creates sharing for the first
  mount in the sharing group and then sets the same sharing on all other
  mounts in this group.

  Sharing creation for fist mount is two step:

  a) If mount has master_id we either copy shared_id from parent sharing
  group or from external source and then make mount slave thus
  converting it to right master_id.
  b) Next if mount has shared_id we just make us shared, creating right
  shared_id.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/596651d02

Changes:
- Split all "exporting" to separate preparational patches
- Rework cr_time
- Switch to MOVE_MOUNT_SET_GROUP
- Use resolve_mountpoint for external mounts (for MOVE_MOUNT_SET_GROUP)
- Mounting plain mounts both in service and in restored-final mntns
- Call MOVE_MOUNT_SET_GROUP from usernsd
- Rework can_mount_now_v2 to handle bind of both root and external.
- Use sys_move_mount for mount assembling.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/mount-v2.h |   35 ++
 criu/include/mount.h    |   10 +
 criu/mount-v2.c         | 1246 +++++++++++++++++++++++++++++++++++++++
 criu/mount.c            |   16 +
 4 files changed, 1307 insertions(+)

diff --git a/criu/include/mount-v2.h b/criu/include/mount-v2.h
index 61f62966d..2f2812221 100644
--- a/criu/include/mount-v2.h
+++ b/criu/include/mount-v2.h
@@ -4,6 +4,8 @@
 #include "linux/mount.h"
 #include "linux/openat2.h"
 
+#include "common/list.h"
+
 #include <compel/plugins/std/syscall-codes.h>
 
 #ifndef MOVE_MOUNT_SET_GROUP
@@ -57,4 +59,37 @@ static inline long sys_openat2(int dirfd, const char *pathname, struct open_how
 
 extern int check_mount_v2(void);
 
+struct sharing_group {
+	/* This pair identifies the group */
+	int shared_id;
+	int master_id;
+
+	/* List of shared groups */
+	struct list_head list;
+
+	/* List of mounts in this group */
+	struct list_head mnt_list;
+
+	/*
+	 * List of dependant shared groups:
+	 * - all siblings have equal master_id
+	 * - the parent has shared_id equal to children's master_id
+	 *
+	 * This is a bit tricky: parent pointer indicates if there is one
+	 * parent sharing_group in list or only siblings.
+	 * So for traversal if parent pointer is set we can do:
+	 *   list_for_each_entry(t, &sg->parent->children, siblings)
+	 * and overvise we can do:
+	 *   list_for_each_entry(t, &sg->siblings, siblings)
+	 */
+	struct list_head children;
+	struct list_head siblings;
+	struct sharing_group *parent;
+
+	char *source;
+};
+
+extern int resolve_shared_mounts_v2(void);
+extern int prepare_mnt_ns_v2(void);
+
 #endif /* __CR_MOUNT_V2_H__ */
diff --git a/criu/include/mount.h b/criu/include/mount.h
index c16a5c293..4d2d64470 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -62,7 +62,15 @@ struct mount_info {
 	 */
 	char *mountpoint;
 	char *ns_mountpoint;
+
+	/* Mount-v2 specific */
 	char *plain_mountpoint;
+	int is_dir;
+	int mp_fd_id;
+	int mnt_fd_id;
+	struct sharing_group *sg;
+	struct list_head mnt_sharing;
+
 	int fd;
 	unsigned flags;
 	unsigned sb_flags;
@@ -79,6 +87,8 @@ struct mount_info {
 	bool need_plugin;
 	bool is_ns_root;
 	bool deleted;
+	int deleted_level;
+	struct list_head deleted_list;
 	struct mount_info *next;
 	struct ns_id *nsid;
 
diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index 801ade748..ec3965140 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -1,9 +1,35 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mount.h>
+#include <sched.h>
+
 #include "kerndat.h"
 #include "log.h"
+#include "cr_options.h"
+#include "xmalloc.h"
+#include "util.h"
+#include "filesystems.h"
+#include "mount.h"
+#include "mount-v2.h"
+#include "namespaces.h"
+#include "fs-magic.h"
+#include "path.h"
+#include "files-reg.h"
+#include "fdstore.h"
+#include "common/list.h"
+#include "common/bug.h"
+#include "common/compiler.h"
+
+#include "images/mnt.pb-c.h"
 
 #undef LOG_PREFIX
 #define LOG_PREFIX "mnt-v2: "
 
+LIST_HEAD(sharing_groups);
+
 int check_mount_v2(void)
 {
 	if (!kdat.has_move_mount_set_group) {
@@ -18,3 +44,1223 @@ int check_mount_v2(void)
 
 	return 0;
 }
+
+static struct sharing_group *get_sharing_group(int shared_id, int master_id)
+{
+	struct sharing_group *sg;
+
+	list_for_each_entry(sg, &sharing_groups, list) {
+		if (sg->shared_id == shared_id && sg->master_id == master_id)
+			return sg;
+	}
+
+	return NULL;
+}
+
+static struct sharing_group *alloc_sharing_group(int shared_id, int master_id)
+{
+	struct sharing_group *sg;
+
+	sg = xzalloc(sizeof(struct sharing_group));
+	if (!sg)
+		return NULL;
+
+	sg->shared_id = shared_id;
+	sg->master_id = master_id;
+
+	INIT_LIST_HEAD(&sg->list);
+	INIT_LIST_HEAD(&sg->mnt_list);
+	INIT_LIST_HEAD(&sg->children);
+	INIT_LIST_HEAD(&sg->siblings);
+
+	list_add(&sg->list, &sharing_groups);
+
+	return sg;
+}
+
+int resolve_shared_mounts_v2(void)
+{
+	struct sharing_group *sg;
+	struct mount_info *mi;
+
+	/*
+	 * Create sharing groups for each unique shared_id+master_id pair and
+	 * link each mount to the corresponding sharing group.
+	 */
+	for (mi = mntinfo; mi; mi = mi->next) {
+		if (!mi->shared_id && !mi->master_id)
+			continue;
+
+		pr_debug("Inspecting sharing on %2d shared_id %d master_id %d (@%s)\n", mi->mnt_id, mi->shared_id,
+			 mi->master_id, mi->ns_mountpoint);
+
+		sg = get_sharing_group(mi->shared_id, mi->master_id);
+		if (!sg) {
+			sg = alloc_sharing_group(mi->shared_id, mi->master_id);
+			if (!sg)
+				return -1;
+		}
+
+		list_add(&mi->mnt_sharing, &sg->mnt_list);
+		mi->sg = sg;
+	}
+
+	/*
+	 * Collect sharing groups tree. Mount propagation between sharing
+	 * groups only goes down this tree, meaning that only mounts of same or
+	 * descendant sharing groups recieve mount propagation.
+	 */
+	list_for_each_entry(sg, &sharing_groups, list) {
+		if (sg->master_id) {
+			struct sharing_group *p;
+
+			/*
+			 * Lookup parent sharing group. If one sharing group
+			 * has master_id equal to shared_id of another sharing
+			 * group than the former is a child (slave) of the
+			 * latter. Also sharing groups should not have two
+			 * parents so we check this here too.
+			 */
+			list_for_each_entry(p, &sharing_groups, list) {
+				if (p->shared_id != sg->master_id)
+					continue;
+
+				if (sg->parent) {
+					pr_err("Sharing group (%d, %d) parent collision (%d, %d) (%d, %d)\n",
+					       sg->shared_id, sg->master_id, p->shared_id, p->master_id,
+					       sg->parent->shared_id, sg->parent->master_id);
+					return -1;
+				}
+				sg->parent = p;
+
+				if (!list_empty(&sg->siblings)) {
+					pr_err("External slavery sharing group (%d, %d) has parent (%d, %d)\n",
+					       sg->shared_id, sg->master_id, p->shared_id, p->master_id);
+					return -1;
+				}
+				list_add(&sg->siblings, &p->children);
+				/* Don't break to check for parent collision */
+			}
+
+			/*
+			 * If sharing group has master_id but we did't find
+			 * parent for it inside the dumped container yet, this
+			 * means that the master_id is external and a mount on
+			 * host should exist with corresponding shared_id.
+			 */
+			if (!sg->parent && list_empty(&sg->siblings)) {
+				struct mount_info *ext;
+				struct sharing_group *s;
+				char *source = NULL;
+
+				/*
+				 * Though we don't have parent sharing group
+				 * (inaccessible sharing), we can still have
+				 * siblings, sharing groups with same master_id
+				 * but different shared_id, let's collect them
+				 * to the list.
+				 */
+				list_for_each_entry(s, &sharing_groups, list) {
+					if (s->master_id != sg->master_id)
+						continue;
+
+					if (s->parent) {
+						pr_err("External slavery sharing group (%d, %d) has parent (%d, %d)\n",
+						       sg->shared_id, sg->master_id, s->parent->shared_id,
+						       s->parent->master_id);
+						return -1;
+					}
+
+					if (!list_empty(&s->siblings)) {
+						pr_err("External slavery sharing group collision (%d, %d) (%d, %d)\n",
+						       sg->shared_id, sg->master_id, s->shared_id, s->master_id);
+						return -1;
+					}
+					list_add(&s->siblings, &sg->siblings);
+				}
+
+				BUG_ON(list_empty(&sg->mnt_list));
+				mi = list_entry(sg->mnt_list.next, struct mount_info, mnt_sharing);
+
+				/*
+				 * We need to know from which mount on host we
+				 * can get this external master_id. There are
+				 * two options: mountpoint external mount or
+				 * root mount of container.
+				 */
+				if ((ext = mnt_get_external_bind_nodev(mi)))
+					source = ext->external;
+				else if (mnt_is_root_bind(mi))
+					source = opts.root;
+
+				if (!source) {
+					pr_err("Sharing group (%d, %d) "
+					       "has unreachable sharing. Try --enable-external-masters.\n",
+					       sg->shared_id, sg->master_id);
+					return -1;
+				}
+
+				sg->source = source;
+				list_for_each_entry(s, &sg->siblings, siblings)
+					s->source = sg->source;
+
+				pr_debug("Detected external slavery for shared group (%d, %d) with source %s\n",
+					 sg->shared_id, sg->master_id, source);
+			}
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * When first mount from superblock is mounted, give other mounts
+ * a hint that they can now just bindmount from the first one.
+ */
+static int propagate_mount_v2(struct mount_info *mi)
+{
+	struct mount_info *t;
+
+	list_for_each_entry(t, &mi->mnt_bind, mnt_bind) {
+		if (t->mounted)
+			continue;
+		if (t->bind)
+			continue;
+		if (!issubpath(t->root, mi->root))
+			continue;
+		pr_debug("\t\tPropagate %d to %d\n", mi->mnt_id, t->mnt_id);
+		t->bind = mi;
+		t->s_dev_rt = mi->s_dev_rt;
+	}
+
+	return 0;
+}
+
+/*
+ * Mounts first mount of superblock
+ */
+static int do_new_mount_v2(struct mount_info *mi)
+{
+	unsigned long sflags = mi->sb_flags;
+	unsigned long mflags = mi->flags & (~MS_PROPAGATE);
+	char *src;
+	struct fstype *tp = mi->fstype;
+	bool remount_ro = (tp->restore && mi->sb_flags & MS_RDONLY);
+	mount_fn_t do_mount = (tp->mount) ? tp->mount : do_simple_mount;
+
+	src = resolve_source(mi);
+	if (!src)
+		return -1;
+
+	/* Merge superblock and mount flags if it's possible */
+	if (!(mflags & ~MS_MNT_KNOWN_FLAGS) && !((sflags ^ mflags) & MS_RDONLY)) {
+		sflags |= mflags;
+		mflags = 0;
+	}
+
+	if (remount_ro)
+		sflags &= ~MS_RDONLY;
+
+	if (do_mount(mi, src, mnt_fsname(mi), sflags) < 0) {
+		pr_perror("Can't mount at %s", mi->plain_mountpoint);
+		return -1;
+	}
+
+	/*
+	 * Mount-v2 relies that before mount tree is constructed all mounts
+	 * should remain private. Newly created mounts can become non-private
+	 * initially depending on parent/source sharing, let's be as explicit
+	 * as posible here and make it obvious that mount becomes private.
+	 */
+	if (mount(NULL, mi->plain_mountpoint, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("Can't remount %s with MS_PRIVATE", mi->plain_mountpoint);
+		return -1;
+	}
+
+	if (tp->restore && tp->restore(mi))
+		return -1;
+
+	if (remount_ro) {
+		int fd;
+
+		fd = open(mi->plain_mountpoint, O_PATH);
+		if (fd < 0) {
+			pr_perror("Unable to open %s", mi->plain_mountpoint);
+			return -1;
+		}
+		sflags |= MS_RDONLY | MS_REMOUNT;
+		if (userns_call(apply_sb_flags, 0, &sflags, sizeof(sflags), fd)) {
+			pr_perror("Unable to apply mount flags %d for %s", mi->sb_flags, mi->plain_mountpoint);
+			close(fd);
+			return -1;
+		}
+		close(fd);
+	}
+
+	if (mflags && mount(NULL, mi->plain_mountpoint, NULL, MS_REMOUNT | MS_BIND | mflags, NULL)) {
+		pr_perror("Unable to apply bind-mount options");
+		return -1;
+	}
+
+	mi->mounted = true;
+	return 0;
+}
+
+/*
+ * Does simple bindmount, but via new kernel mount api,
+ * which also handles autofs and symlink without resolving.
+ */
+static int __do_bind_mount_v2(char *from, char *to)
+{
+	int detached_fd;
+
+	detached_fd = sys_open_tree(AT_FDCWD, from, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW | OPEN_TREE_CLONE);
+	if (detached_fd == -1) {
+		pr_perror("Failed to open_tree %s", from);
+		return -1;
+	}
+
+	if (sys_move_mount(detached_fd, "", AT_FDCWD, to, MOVE_MOUNT_F_EMPTY_PATH)) {
+		pr_perror("Failed to move_mount from %s to %s", from, to);
+		close(detached_fd);
+		return -1;
+	}
+	close(detached_fd);
+
+	return 0;
+}
+
+LIST_HEAD(deleted_mounts);
+
+/*
+ * Bind-mounts all later mounts of superblock from first one,
+ * also handles first mounts of mountpoint external mounts.
+ */
+static int do_bind_mount_v2(struct mount_info *mi)
+{
+	char *root = NULL, *cut_root, rpath[PATH_MAX];
+	unsigned long mflags;
+	int exit_code = -1;
+	char *mnt_path = NULL;
+	int level = 0;
+
+	if (mi->need_plugin) {
+		if (restore_ext_mount(mi))
+			return -1;
+		goto out;
+	}
+
+	if (mnt_is_nodev_external(mi)) {
+		root = mi->external;
+		goto do_bind;
+	}
+
+	cut_root = get_relative_path(mi->root, mi->bind->root);
+	if (!cut_root) {
+		pr_err("Failed to find root for %d in our supposed bind %d\n", mi->mnt_id, mi->bind->mnt_id);
+		return -1;
+	}
+
+	/*
+	 * Mount ->private can be initialized on fstype->mount() callback,
+	 * which is called for first mount of superblock in do_new_mount().
+	 * Also ->private have to be copied to all other mounts of superblock
+	 * to provide users of it with actual data.
+	 */
+	mi->private = mi->bind->private;
+
+	mnt_path = mi->bind->plain_mountpoint;
+
+	if (cut_root[0]) {
+		snprintf(rpath, sizeof(rpath), "%s/%s", mnt_path, cut_root);
+		root = rpath;
+	} else {
+		root = mnt_path;
+	}
+do_bind:
+	pr_info("\tBind %s to %s\n", root, mi->plain_mountpoint);
+
+	if (unlikely(mi->deleted)) {
+		level = make_parent_dirs_if_need(-1, root);
+		if (level < 0)
+			goto err;
+
+		if (mi->is_dir) {
+			if (mkdir(root, 0600)) {
+				pr_perror("Can't re-create deleted directory %s", root);
+				goto err;
+			}
+		} else {
+			int fd = open(root, O_WRONLY | O_CREAT | O_EXCL, 0600);
+			if (fd < 0) {
+				pr_perror("Can't re-create deleted file %s", root);
+				goto err;
+			}
+			close(fd);
+		}
+	}
+
+	if (__do_bind_mount_v2(root, mi->plain_mountpoint))
+		goto err;
+
+	/*
+	 * Mount-v2 relies that before mount tree is constructed all mounts
+	 * should remain private. Newly created mounts can become non-private
+	 * initially depending on parent/source sharing, let's be as explicit
+	 * as posible here and make it obvious that mount becomes private.
+	 */
+	if (mount(NULL, mi->plain_mountpoint, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("Can't remount %s with MS_PRIVATE", mi->plain_mountpoint);
+		goto err;
+	}
+
+	mflags = mi->flags & (~MS_PROPAGATE);
+	if (!mi->bind || mflags != (mi->bind->flags & (~MS_PROPAGATE)))
+		if (mount(NULL, mi->plain_mountpoint, NULL, MS_BIND | MS_REMOUNT | mflags, NULL)) {
+			pr_perror("Can't bind remount 0x%lx at %s", mflags, mi->plain_mountpoint);
+			goto err;
+		}
+
+	if (mi->deleted) {
+		/*
+		 * Deleted mounts can't be moved, will delete source after
+		 * moving to proper position in the mount tree FIXME.
+		 */
+		mi->deleted_level = level;
+		level = 0;
+		list_add(&mi->deleted_list, &deleted_mounts);
+	}
+out:
+	mi->mounted = true;
+	exit_code = 0;
+err:
+	if (level)
+		rm_parent_dirs(-1, root, level);
+
+	return exit_code;
+}
+
+/* Mounts root container mount. */
+static int do_mount_root_v2(struct mount_info *mi)
+{
+	unsigned long flags = MS_BIND;
+	int fd;
+
+	if (root_ns_mask & CLONE_NEWUSER) {
+		fd = open(mi->plain_mountpoint, O_PATH);
+		if (fd < 0) {
+			pr_perror("Unable to open %s", mi->plain_mountpoint);
+			return -1;
+		}
+
+		if (userns_call(mount_root, 0, &flags, sizeof(flags), fd)) {
+			pr_err("Unable to mount %s\n", mi->plain_mountpoint);
+			close(fd);
+			return -1;
+		}
+		close(fd);
+	} else {
+		if (mount(opts.root, mi->plain_mountpoint, NULL, flags, NULL)) {
+			pr_perror("Unable to mount %s %s (id=%d)", opts.root, mi->plain_mountpoint, mi->mnt_id);
+			return -1;
+		}
+	}
+
+	/*
+	 * Mount-v2 relies that before mount tree is constructed all mounts
+	 * should remain private. Newly created mounts can become non-private
+	 * initially depending on parent/source sharing, let's be as explicit
+	 * as posible here and make it obvious that mount becomes private.
+	 */
+	if (mount(NULL, mi->plain_mountpoint, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("Can't remount %s with MS_PRIVATE", mi->plain_mountpoint);
+		return -1;
+	}
+
+	mi->mounted = true;
+
+	return 0;
+}
+
+/* Check if mount is ready to be mounted. */
+static bool can_mount_now_v2(struct mount_info *mi)
+{
+	struct mount_info *root, *ext;
+
+	/* Parent should be mounted already, that's how mnt_tree_for_each works */
+	BUG_ON(mi->parent && !mi->parent->mounted);
+
+	/* Root mounts can be mounted at any moment */
+	if (rst_mnt_is_root(mi)) {
+		pr_debug("%s: true as %d is global root\n", __func__, mi->mnt_id);
+		return true;
+	}
+
+	/* External mounts can be mounted at any moment */
+	if (mi->external) {
+		pr_debug("%s: true as %d is external\n", __func__, mi->mnt_id);
+		return true;
+	}
+
+	/*
+	 * Container root and external mounts should go before
+	 * anything which should be bindmounted from them.
+	 */
+	if (!mi->bind) {
+		root = mnt_get_root_bind(mi);
+		if (root) {
+			pr_debug("%s: false as %d is bind of not mounted global root %d\n", __func__, mi->mnt_id,
+				 root->mnt_id);
+			return false;
+		}
+
+		ext = mnt_get_external_bind(mi);
+		if (ext) {
+			pr_debug("%s: false as %d is a bind of not mounted external %d\n", __func__, mi->mnt_id,
+				 ext->mnt_id);
+			return false;
+		}
+	}
+
+	/* Non fsroot mounts can not be mounted without bind-mount */
+	if (!fsroot_mounted(mi) && !mi->bind && !mi->need_plugin) {
+		pr_debug("%s: false as %d is non-root without bind or plugin\n", __func__, mi->mnt_id);
+		return false;
+	}
+
+	return true;
+}
+
+static int __set_unbindable_v2(struct mount_info *mi)
+{
+	if (mi->flags & MS_UNBINDABLE) {
+		if (mount(NULL, service_mountpoint(mi), NULL, MS_UNBINDABLE, NULL)) {
+			pr_perror("Failed to set mount %d unbindable", mi->mnt_id);
+			return -1;
+		}
+	}
+	return 0;
+}
+
+/*
+ * Setting MS_UNBINDABLE flag is slightly delayed,
+ * obviousely until we finish bind-mounting everything.
+ */
+static int set_unbindable_v2(void)
+{
+	int orig_nsfd = -1, nsfd = -1, exit_code = -1;
+	struct mount_info *mi;
+	struct ns_id *nsid;
+
+	for (nsid = ns_ids; nsid != NULL; nsid = nsid->next) {
+		bool ns_has_unbindable = false;
+
+		if (nsid->nd != &mnt_ns_desc)
+			continue;
+
+		for (mi = mntinfo; mi != NULL; mi = mi->next)
+			if (mi->nsid == nsid && mi->flags & MS_UNBINDABLE)
+				ns_has_unbindable = true;
+
+		if (!ns_has_unbindable)
+			continue;
+
+		nsfd = fdstore_get(nsid->mnt.nsfd_id);
+		if (nsfd < 0)
+			goto err;
+
+		if (switch_ns_by_fd(nsfd, &mnt_ns_desc, orig_nsfd == -1 ? &orig_nsfd : NULL))
+			goto err;
+		close_safe(&nsfd);
+
+		if (mnt_tree_for_each(nsid->mnt.mntinfo_tree, __set_unbindable_v2))
+			goto err;
+	}
+
+	exit_code = 0;
+err:
+	if (orig_nsfd >= 0 && restore_ns(orig_nsfd, &mnt_ns_desc))
+		exit_code = -1;
+	close_safe(&nsfd);
+	return exit_code;
+}
+
+/*
+ * Detects if mount is a directory mount or file mount based on stat on
+ * its mountpoint inside already mounted parent mount. This is deeply
+ * integrated in plain mount creation process because before mounting
+ * something plain we need to create right type of mountpoint for it.
+ */
+static int detect_is_dir(struct mount_info *mi)
+{
+	static char mountpoint[PATH_MAX];
+	char *rel_path;
+	struct stat st;
+
+	if (mi->is_dir != -1)
+		return 0;
+
+	if (mi->mnt_id == HELPER_MNT_ID) {
+		pr_err("Helper %s should have is_dir pre-set\n", mi->ns_mountpoint);
+		return -1;
+	}
+
+	if (!mi->parent || mi->parent == root_yard_mp) {
+		pr_err("Mount namespace root mount %d should have is_dir pre-set\n", mi->mnt_id);
+		return -1;
+	}
+
+	if (!mi->parent->mounted) {
+		pr_err("Parent mount %d of %d should be mounted\n", mi->parent->mnt_id, mi->mnt_id);
+		return -1;
+	}
+
+	rel_path = get_relative_path(mi->ns_mountpoint, mi->parent->ns_mountpoint);
+	if (!rel_path) {
+		pr_err("Child-parent mountpoint missmatch %d:%s %d:%s\n", mi->mnt_id, mi->ns_mountpoint,
+		       mi->parent->mnt_id, mi->parent->ns_mountpoint);
+		return -1;
+	}
+
+	snprintf(mountpoint, sizeof(mountpoint), "%s%s%s", mi->parent->plain_mountpoint, rel_path[0] ? "/" : "",
+		 rel_path);
+	if (stat(mountpoint, &st)) {
+		pr_perror("Can't stat mountpoint %s", mountpoint);
+		return -1;
+	}
+
+	if (S_ISDIR(st.st_mode))
+		mi->is_dir = true;
+	else
+		mi->is_dir = false;
+
+	pr_debug("Mount %d is detected as %s-mount\n", mi->mnt_id, mi->is_dir ? "dir" : "file");
+	return 0;
+}
+
+static int create_plain_mountpoint(struct mount_info *mi)
+{
+	BUG_ON(mi->is_dir == -1);
+
+	pr_debug("Create plain mountpoint %s for %d\n", mi->plain_mountpoint, mi->mnt_id);
+	if (mi->is_dir) {
+		if (mkdir(mi->plain_mountpoint, 0600)) {
+			pr_perror("Unable to mkdir mountpoint %s", mi->plain_mountpoint);
+			return -1;
+		}
+	} else {
+		int fd;
+
+		fd = creat(mi->plain_mountpoint, 0600);
+		if (fd < 0) {
+			pr_perror("Unable to create mountpoint %s", mi->plain_mountpoint);
+			return -1;
+		}
+		close(fd);
+	}
+
+	return 0;
+}
+
+/*
+ * At this point we already have a mount in service mount namespace now we
+ * bind-mount it to the final restored mount namespace via new kernel mount
+ * API.
+ */
+static int do_mount_in_right_mntns(struct mount_info *mi)
+{
+	int nsfd = -1, orig_nsfd = -1, detached_fd = -1, exit_code = -1;
+
+	if (!mi->nsid)
+		return 0;
+
+	detached_fd =
+		sys_open_tree(AT_FDCWD, mi->plain_mountpoint, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW | OPEN_TREE_CLONE);
+	if (detached_fd == -1) {
+		pr_perror("Failed to open_tree %s", mi->plain_mountpoint);
+		goto err;
+	}
+
+	nsfd = fdstore_get(mi->nsid->mnt.nsfd_id);
+	if (nsfd < 0)
+		goto err;
+
+	if (switch_ns_by_fd(nsfd, &mnt_ns_desc, &orig_nsfd))
+		goto err;
+
+	if (create_plain_mountpoint(mi))
+		goto err;
+
+	if (sys_move_mount(detached_fd, "", AT_FDCWD, mi->plain_mountpoint, MOVE_MOUNT_F_EMPTY_PATH)) {
+		pr_perror("Failed to cross-mntns move_mount plain mount %d", mi->mnt_id);
+		goto err;
+	}
+
+	exit_code = 0;
+err:
+	if (orig_nsfd >= 0 && restore_ns(orig_nsfd, &mnt_ns_desc))
+		exit_code = -1;
+	close_safe(&nsfd);
+	close_safe(&detached_fd);
+	return exit_code;
+}
+
+static int do_mount_one_v2(struct mount_info *mi)
+{
+	int ret;
+
+	if (mi->mounted)
+		return 0;
+
+	if (!can_mount_now_v2(mi)) {
+		pr_debug("Postpone mount %d\n", mi->mnt_id);
+		return 1;
+	}
+
+	if (detect_is_dir(mi))
+		return -1;
+
+	if (create_plain_mountpoint(mi))
+		return -1;
+
+	pr_debug("\tMounting %s @%d (%d)\n", mi->fstype->name, mi->mnt_id, mi->need_plugin);
+
+	if (rst_mnt_is_root(mi)) {
+		if (opts.root == NULL) {
+			pr_err("The --root option is required to restore a mount namespace\n");
+			return -1;
+		}
+		ret = do_mount_root_v2(mi);
+	} else if (!mi->bind && !mi->need_plugin && (!mi->external || !strcmp(mi->external, EXTERNAL_DEV_MOUNT))) {
+		ret = do_new_mount_v2(mi);
+	} else {
+		ret = do_bind_mount_v2(mi);
+	}
+
+	if (ret == 0 && fetch_rt_stat(mi, mi->plain_mountpoint))
+		return -1;
+
+	if (ret == 0 && propagate_mount_v2(mi))
+		return -1;
+
+	if (mi->fstype->code == FSTYPE__UNSUPPORTED) {
+		struct statfs st;
+
+		if (statfs(mi->plain_mountpoint, &st)) {
+			pr_perror("Unable to statfs %s", mi->plain_mountpoint);
+			return -1;
+		}
+		if (st.f_type == BTRFS_SUPER_MAGIC)
+			mi->fstype = find_fstype_by_name("btrfs");
+	}
+
+	if (ret == 0 && do_mount_in_right_mntns(mi))
+		return -1;
+
+	return ret;
+}
+
+static int populate_mnt_ns_v2(void)
+{
+	if (make_yard(mnt_roots))
+		return -1;
+
+	if (mnt_tree_for_each(root_yard_mp, do_mount_one_v2))
+		return -1;
+
+	return set_unbindable_v2();
+}
+
+/*
+ * This function moves plain mounts into actual mount tree.
+ *
+ * Mounts in children list are sorted the way that sibling overmount goes after
+ * all siblings which it overmounts (see __mnt_resort_children). The function
+ * mnt_tree_for_each is effectively DFS (in case we don't postpone), thus all
+ * descendants of all mounts which we sibling-overmount are mounted before us.
+ * Be carefull, we can't postpone (return >0) from this function because of it.
+ */
+static int move_mount_to_tree(struct mount_info *mi)
+{
+	int fd;
+
+	fd = open(mi->mountpoint, O_PATH);
+	if (fd < 0) {
+		pr_perror("Failed to open real mountpoint of %d", mi->mnt_id);
+		return -1;
+	}
+
+	mi->mp_fd_id = fdstore_add(fd);
+	close(fd);
+	if (mi->mp_fd_id < 0) {
+		pr_err("Can't add mountpoint of mount %d to fdstore\n", mi->mnt_id);
+		return -1;
+	}
+
+	pr_info("Move mount %d from %s to %s\n", mi->mnt_id, mi->plain_mountpoint, mi->mountpoint);
+	if (sys_move_mount(AT_FDCWD, mi->plain_mountpoint, AT_FDCWD, mi->mountpoint, 0)) {
+		pr_perror("Failed to move mount %d from %s to %s", mi->mnt_id, mi->plain_mountpoint, mi->mountpoint);
+		return -1;
+	}
+
+	fd = open(mi->mountpoint, O_PATH);
+	if (fd < 0) {
+		pr_perror("Failed to open real mountpoint of %d", mi->mnt_id);
+		return -1;
+	}
+
+	mi->mnt_fd_id = fdstore_add(fd);
+	close(fd);
+	if (mi->mnt_fd_id < 0) {
+		pr_err("Can't add mount %d fd to fdstore\n", mi->mnt_id);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int assemble_tree_from_plain_mounts(struct ns_id *nsid)
+{
+	return mnt_tree_for_each(nsid->mnt.mntinfo_tree, move_mount_to_tree);
+}
+
+/*
+ * With MOVE_MOUNT_SET_GROUP source mount should have wider root than
+ * destination, thus let's choose widest mount from group as first.
+ */
+static struct mount_info *get_first_mount(struct sharing_group *sg)
+{
+	struct mount_info *first = NULL, *tmp;
+	int min_len = 0;
+
+	list_for_each_entry(tmp, &sg->mnt_list, mnt_sharing) {
+		int len = strlen(tmp->root);
+
+		if (!first || len < min_len) {
+			first = tmp;
+			min_len = len;
+		}
+	}
+
+	return first;
+}
+
+struct set_group_arg {
+	int src_id;
+	char source[PATH_MAX];
+	int dst_id;
+};
+
+static int __move_mount_set_group(void *arg, int dfd, int pid)
+{
+	struct set_group_arg *sga = (struct set_group_arg *)arg;
+	int src_fd, dst_fd, exit_code = -1;
+
+	if (sga->src_id != -1) {
+		src_fd = fdstore_get(sga->src_id);
+		BUG_ON(src_fd < 0);
+	} else {
+		char *source_mp;
+
+		BUG_ON(sga->source[0] == '\0');
+		/*
+		 * Source path should not always be a mountpoint as we
+		 * automatically resolve it to mountpoint below.
+		 */
+		source_mp = resolve_mountpoint(sga->source);
+		if (!source_mp) {
+			pr_err("Failed to find %s mountpoint\n", sga->source);
+			return -1;
+		}
+
+		src_fd = open(source_mp, O_PATH);
+		if (src_fd < 0) {
+			pr_perror("Failed to open %s mountpoint", source_mp);
+			xfree(source_mp);
+			return -1;
+		}
+		xfree(source_mp);
+	}
+
+	dst_fd = fdstore_get(sga->dst_id);
+	BUG_ON(dst_fd < 0);
+
+	/* Copy shared_id of the source */
+	if (sys_move_mount(src_fd, "", dst_fd, "",
+			   MOVE_MOUNT_SET_GROUP | MOVE_MOUNT_F_EMPTY_PATH | MOVE_MOUNT_T_EMPTY_PATH)) {
+		pr_perror("Failed to copy sharing from %d:%s to %d", sga->src_id, sga->source ?: "<none>", sga->dst_id);
+		goto err;
+	}
+
+	exit_code = 0;
+err:
+	close(src_fd);
+	close(dst_fd);
+	return exit_code;
+}
+
+/*
+ * Copy sharing between mounts passing mountpoint fds via fdstore ids. Also it
+ * is possible (for external mounts) to pass path on mountpoint via source path,
+ * it would resolve to mountpoint automatically.
+ */
+static int move_mount_set_group(int src_id, char *source, int dst_id)
+{
+	struct set_group_arg sga = {
+		.src_id = src_id,
+		.dst_id = dst_id,
+	};
+
+	sga.source[0] = '\0';
+	if (source) {
+		if (snprintf(sga.source, sizeof(sga.source), "%s", source) >= sizeof(sga.source)) {
+			pr_err("Source %s is too long\n", source);
+			return -1;
+		}
+	}
+
+	if (userns_call(__move_mount_set_group, 0, &sga, sizeof(sga), -1))
+		return -1;
+
+	return 0;
+}
+
+static int restore_one_sharing_group(struct sharing_group *sg)
+{
+	struct mount_info *first, *other;
+	char first_path[PATH_MAX];
+	int first_fd;
+
+	first = get_first_mount(sg);
+	first_fd = fdstore_get(first->mnt_fd_id);
+	BUG_ON(first_fd < 0);
+	snprintf(first_path, sizeof(first_path), "/proc/self/fd/%d", first_fd);
+
+	/* Restore first's master_id from shared_id of the source */
+	if (sg->master_id) {
+		if (sg->parent) {
+			struct mount_info *p;
+
+			/* Get shared_id from parent sharing group */
+			p = get_first_mount(sg->parent);
+			if (move_mount_set_group(p->mnt_fd_id, NULL, first->mnt_fd_id)) {
+				pr_err("Failed to copy sharing from %d to %d\n", p->mnt_id, first->mnt_id);
+				close(first_fd);
+				return -1;
+			}
+		} else {
+			/*
+			 * External slavery. We rely on the user to give us the
+			 * right source for external mount with all proper
+			 * sharing optioins setup (it should be either shared
+			 * or non-shared slave). If source is a private mount
+			 * we would fail.
+			 */
+			if (move_mount_set_group(-1, sg->source, first->mnt_fd_id)) {
+				pr_err("Failed to copy sharing from source %s to %d\n", sg->source, first->mnt_id);
+				close(first_fd);
+				return -1;
+			}
+		}
+
+		/* Convert shared_id to master_id */
+		if (mount(NULL, first_path, NULL, MS_SLAVE, NULL)) {
+			pr_perror("Failed to make mount %d slave", first->mnt_id);
+			close(first_fd);
+			return -1;
+		}
+	}
+
+	/* Restore first's shared_id */
+	if (sg->shared_id) {
+		if (mount(NULL, first_path, NULL, MS_SHARED, NULL)) {
+			pr_perror("Failed to make mount %d shared", first->mnt_id);
+			close(first_fd);
+			return -1;
+		}
+	}
+	close(first_fd);
+
+	/* Restore sharing for other mounts from the sharing group */
+	list_for_each_entry(other, &sg->mnt_list, mnt_sharing) {
+		if (other == first)
+			continue;
+
+		if (move_mount_set_group(first->mnt_fd_id, NULL, other->mnt_fd_id)) {
+			pr_err("Failed to copy sharing from %d to %d\n", first->mnt_id, other->mnt_id);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static struct sharing_group *sharing_group_next(struct sharing_group *sg)
+{
+	if (!list_empty(&sg->children))
+		return list_entry(sg->children.next, struct sharing_group, siblings);
+
+	while (sg->parent) {
+		if (sg->siblings.next == &sg->parent->children)
+			sg = sg->parent;
+		else
+			return list_entry(sg->siblings.next, struct sharing_group, siblings);
+	}
+
+	return NULL;
+}
+
+static int restore_mount_sharing_options(void)
+{
+	struct sharing_group *sg;
+
+	list_for_each_entry(sg, &sharing_groups, list) {
+		struct sharing_group *t;
+
+		if (sg->parent)
+			continue;
+
+		/* Handle dependant sharing groups in tree order */
+		for (t = sg; t != NULL; t = sharing_group_next(t)) {
+			if (restore_one_sharing_group(t))
+				return -1;
+		}
+	}
+
+	return 0;
+}
+
+static int remove_source_of_deleted_mount(struct mount_info *mi)
+{
+	char *cut_root, path[PATH_MAX], *root;
+
+	BUG_ON(!mi->deleted || !mi->bind);
+
+	cut_root = get_relative_path(mi->root, mi->bind->root);
+	if (!cut_root) {
+		pr_err("Failed to find root for %d in our supposed bind %d\n", mi->mnt_id, mi->bind->mnt_id);
+		return -1;
+	}
+
+	if (cut_root[0]) {
+		snprintf(path, sizeof(path), "%s/%s", mi->bind->plain_mountpoint, cut_root);
+		root = path;
+	} else {
+		root = mi->bind->plain_mountpoint;
+	}
+
+	if (mi->is_dir) {
+		if (rmdir(root)) {
+			pr_perror("Can't remove deleted directory %s", root);
+			return -1;
+		}
+	} else {
+		if (unlink(root)) {
+			pr_perror("Can't unlink deleted file %s", root);
+			return -1;
+		}
+	}
+
+	if (mi->deleted_level)
+		rm_parent_dirs(-1, root, mi->deleted_level);
+
+	return 0;
+}
+
+/* Delay making mounts deleted until we've restored sharing groups */
+static int remove_sources_of_deleted_mounts(void)
+{
+	struct mount_info *mi;
+	int ret = 0;
+
+	list_for_each_entry(mi, &deleted_mounts, deleted_list) {
+		if (remove_source_of_deleted_mount(mi))
+			ret = -1;
+	}
+
+	return ret;
+}
+
+static int get_empty_mntns(void)
+{
+	int orig_nsfd, nsfd = -1;
+
+	orig_nsfd = open_proc(PROC_SELF, "ns/mnt");
+	if (orig_nsfd < 0)
+		return -1;
+
+	/* Create the new mount namespace */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("Unable to create a new mntns");
+		close(orig_nsfd);
+		return -1;
+	}
+
+	if (mount("none", "/", NULL, MS_REC | MS_PRIVATE, NULL)) {
+		pr_perror("Can't remount \"/\" with MS_PRIVATE");
+		goto err;
+	}
+
+	if (make_yard(mnt_roots))
+		goto err;
+
+	if (cr_pivot_root(mnt_roots))
+		goto err;
+
+	if (mkdirpat(AT_FDCWD, mnt_roots, 0777)) {
+		pr_err("Failed to setup root yard in empty mntns\n");
+		goto err;
+	}
+
+	nsfd = open_proc(PROC_SELF, "ns/mnt");
+err:
+	if (restore_ns(orig_nsfd, &mnt_ns_desc))
+		close_safe(&nsfd);
+	return nsfd;
+}
+
+/* Create almost empty mount namespaces only with root yard precreated */
+static int pre_create_mount_namespaces(void)
+{
+	int orig_nsfd = -1, nsfd = -1, empty_mntns, exit_code = -1;
+	char path[PATH_MAX];
+	struct ns_id *nsid;
+
+	empty_mntns = get_empty_mntns();
+	if (empty_mntns == -1) {
+		pr_err("Failed to create empty mntns\n");
+		goto err;
+	}
+
+	/* restore mount namespaces */
+	for (nsid = ns_ids; nsid != NULL; nsid = nsid->next) {
+		if (nsid->nd != &mnt_ns_desc)
+			continue;
+
+		if (switch_ns_by_fd(empty_mntns, &mnt_ns_desc, orig_nsfd == -1 ? &orig_nsfd : NULL))
+			goto err;
+
+		/* Create the new mount namespace */
+		if (unshare(CLONE_NEWNS)) {
+			pr_perror("Unable to create a new mntns");
+			goto err;
+		}
+
+		nsfd = open_proc(PROC_SELF, "ns/mnt");
+		if (nsfd < 0)
+			goto err;
+
+		/* Pin new mntns with a file descriptor */
+		nsid->mnt.nsfd_id = fdstore_add(nsfd);
+		close(nsfd);
+		if (nsid->mnt.nsfd_id < 0) {
+			pr_err("Can't add mntns fd to fdstore\n");
+			goto err;
+		}
+
+		if (make_yard(mnt_roots))
+			goto err;
+
+		print_ns_root(nsid, 0, path, sizeof(path));
+		if (mkdir(path, 0600)) {
+			pr_perror("Unable to create %s", path);
+			goto err;
+		}
+	}
+
+	exit_code = 0;
+err:
+	if (orig_nsfd >= 0 && restore_ns(orig_nsfd, &mnt_ns_desc))
+		exit_code = -1;
+	close_safe(&empty_mntns);
+	return exit_code;
+}
+
+/*
+ * Assemble the mount tree for each restored mount namespace
+ * from pre-created plain mounts.
+ */
+static int assemble_mount_namespaces(void)
+{
+	int orig_nsfd = -1, nsfd = -1, rootfd = -1, exit_code = -1;
+	char path[PATH_MAX];
+	struct ns_id *nsid;
+
+	for (nsid = ns_ids; nsid != NULL; nsid = nsid->next) {
+		if (nsid->nd != &mnt_ns_desc)
+			continue;
+
+		nsfd = fdstore_get(nsid->mnt.nsfd_id);
+		if (nsfd < 0)
+			goto err;
+
+		if (switch_ns_by_fd(nsfd, &mnt_ns_desc, orig_nsfd == -1 ? &orig_nsfd : NULL)) {
+			close(nsfd);
+			goto err;
+		}
+		close(nsfd);
+
+		if (assemble_tree_from_plain_mounts(nsid))
+			goto err;
+
+		/* Set its root */
+		print_ns_root(nsid, 0, path, sizeof(path) - 1);
+		if (cr_pivot_root(path))
+			goto err;
+
+		/* root fd is used to restore file mappings */
+		rootfd = open_proc(PROC_SELF, "root");
+		if (rootfd < 0)
+			goto err;
+		nsid->mnt.root_fd_id = fdstore_add(rootfd);
+		if (nsid->mnt.root_fd_id < 0) {
+			pr_err("Can't add root fd to fdstore\n");
+			close(rootfd);
+			goto err;
+		}
+		close(rootfd);
+	}
+
+	exit_code = 0;
+err:
+	if (orig_nsfd >= 0 && restore_ns(orig_nsfd, &mnt_ns_desc))
+		exit_code = -1;
+	return exit_code;
+}
+
+/* The main entry point of mount-v2 for creating mounts */
+int prepare_mnt_ns_v2(void)
+{
+	if (!(root_ns_mask & CLONE_NEWNS))
+		return 0;
+
+#ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
+	if (!opts.has_binfmt_misc && !list_empty(&binfmt_misc_list)) {
+		/*
+		 * Add to root yard along with other plain mounts and mntns
+		 * directories. This mount would be created and restored by
+		 * generic mount creation code, but it would never be moved to
+		 * any restored mount namespaces.
+		 */
+		if (!add_cr_time_mount(root_yard_mp, "binfmt_misc", "binfmt_misc", 0, true))
+			return -1;
+	}
+#endif
+
+	if (validate_mounts(mntinfo, false))
+		return -1;
+
+	if (pre_create_mount_namespaces())
+		return -1;
+
+	if (populate_mnt_ns_v2())
+		return -1;
+
+	if (assemble_mount_namespaces())
+		return -1;
+
+	if (restore_mount_sharing_options())
+		return -1;
+
+	return remove_sources_of_deleted_mounts();
+}
diff --git a/criu/mount.c b/criu/mount.c
index c39b44ac6..85fcb8843 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -17,6 +17,7 @@
 #include "plugin.h"
 #include "filesystems.h"
 #include "mount.h"
+#include "mount-v2.h"
 #include "pstree.h"
 #include "image.h"
 #include "namespaces.h"
@@ -1680,6 +1681,7 @@ struct mount_info __maybe_unused *add_cr_time_mount(struct mount_info *root, cha
 			goto err;
 	}
 	mi->mnt_id = HELPER_MNT_ID;
+	mi->is_dir = true;
 	mi->flags = mi->sb_flags = 0;
 	mi->root = xstrdup("/");
 	mi->fsname = xstrdup(fsname);
@@ -2987,6 +2989,9 @@ struct mount_info *mnt_entry_alloc(bool rst)
 			}
 			memset(new->rmi, 0, sizeof(struct rst_mount_info));
 		}
+		new->mp_fd_id = -1;
+		new->mnt_fd_id = -1;
+		new->is_dir = -1;
 		new->fd = -1;
 		new->is_overmounted = -1;
 		INIT_LIST_HEAD(&new->children);
@@ -2999,6 +3004,7 @@ struct mount_info *mnt_entry_alloc(bool rst)
 		INIT_LIST_HEAD(&new->mnt_notprop);
 		INIT_LIST_HEAD(&new->mnt_unbindable);
 		INIT_LIST_HEAD(&new->postpone);
+		INIT_LIST_HEAD(&new->deleted_list);
 	}
 	return new;
 }
@@ -3314,6 +3320,7 @@ static int merge_mount_trees(void)
 	root_yard_mp->plain_mountpoint = xstrdup(mnt_roots);
 	if (!root_yard_mp->plain_mountpoint)
 		return -1;
+	root_yard_mp->is_dir = true;
 	root_yard_mp->mounted = true;
 	root_yard_mp->mnt_bind_is_populated = true;
 	root_yard_mp->is_overmounted = false;
@@ -3359,6 +3366,9 @@ int read_mnt_ns_img(void)
 		if (!nsid->mnt.mntinfo_tree)
 			return -1;
 
+		/* mntns root mounts are always directories */
+		nsid->mnt.mntinfo_tree->is_dir = true;
+
 		tail->next = pms;
 		pms = head;
 	}
@@ -3368,6 +3378,9 @@ int read_mnt_ns_img(void)
 	search_bindmounts();
 	prepare_is_overmounted();
 
+	if (!opts.mntns_compat_mode && resolve_shared_mounts_v2())
+		return -1;
+
 	if (merge_mount_trees())
 		return -1;
 
@@ -3691,6 +3704,9 @@ int prepare_mnt_ns(void)
 		free_mntinfo(old);
 	}
 
+	if (!opts.mntns_compat_mode)
+		return prepare_mnt_ns_v2();
+
 	ret = populate_mnt_ns();
 	if (ret)
 		return -1;

From 8d6e2d04423858fbc003e41a5d0b5e60d68dab36 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 27 May 2020 16:11:20 +0300
Subject: [PATCH 0991/1854] zdtm: enable mounts compat mode on restore with
 --mntns-compat-mode option

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/e4a430e1f

Changes: prepend --mntns-compat-mode to r_opts in zdtm.py so that we
can disable this option with --no-mntns-compat-mode from test desc
files.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 3fbdb8a18..f15420a65 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -953,6 +953,8 @@ class criu_rpc:
                 if criu_rpc.pidfd_store_socket is None:
                     criu_rpc.pidfd_store_socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
                 criu.opts.pidfd_store_sk = criu_rpc.pidfd_store_socket.fileno()
+            elif "--mntns-compat-mode" == arg:
+                criu.opts.mntns_compat_mode = True
             else:
                 raise test_fail_exc('RPC for %s(%s) required' % (arg, args.pop(0)))
 
@@ -1046,6 +1048,7 @@ class criu:
         self.__criu_bin = opts['criu_bin']
         self.__crit_bin = opts['crit_bin']
         self.__pre_dump_mode = opts['pre_dump_mode']
+        self.__mntns_compat_mode = bool(opts['mntns_compat_mode'])
 
         if opts['rpc']:
             self.__criu = criu_rpc
@@ -1444,6 +1447,9 @@ class criu:
                                                   nowait=True)
             r_opts += ["--lazy-pages"]
 
+        if self.__mntns_compat_mode:
+            r_opts = ['--mntns-compat-mode'] + r_opts
+
         if self.__leave_stopped:
             r_opts += ['--leave-stopped']
 
@@ -2034,7 +2040,7 @@ class Launcher:
               'sat', 'script', 'rpc', 'criu_config', 'lazy_pages', 'join_ns',
               'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
-              'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode')
+              'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode', 'mntns_compat_mode')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
         if self.__use_log:
@@ -2707,6 +2713,9 @@ def get_cli_args():
                     help="Use splice or read mode of pre-dumping",
                     choices=['splice', 'read'],
                     default='splice')
+    rp.add_argument("--mntns-compat-mode",
+                    help="Use old compat mounts restore engine",
+                    action='store_true')
 
     lp = sp.add_parser("list", help="List tests")
     lp.set_defaults(action=list_tests)

From 3db949d821a4a9cd876d9fab25576d234e646ea7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 14 Jan 2022 12:12:12 +0300
Subject: [PATCH 0992/1854] ci: run tests for old mount engine

Now when we switched to mount-v2 by default to check old mount engine we
need to explicitly run with --mntns-compat-mode option.

Note that if the feature move_mount_set_group is not supported then
regular run will just fallback to old mount engine and then we don't
need separate run with --mntns-compat-mode.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 scripts/ci/run-ci-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 5ef3965db..dd7c49d63 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -201,6 +201,10 @@ fi
 
 # shellcheck disable=SC2086
 ./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
+if criu/criu check --feature move_mount_set_group; then
+	# shellcheck disable=SC2086
+	./test/zdtm.py run -a -p 2 --mntns-compat-mode --keep-going $ZDTM_OPTS
+fi
 
 # shellcheck disable=SC2086
 ./test/zdtm.py run -a -p 2 --keep-going --criu-config $ZDTM_OPTS

From 486e1fd854429630a2d3a0c1f17a1724e3aaa5ee Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 31 Dec 2019 15:56:44 +0300
Subject: [PATCH 0993/1854] zdtm: add new mnt_ext_sharing test for mount-v2

These test simply checks that sharing between two mounts in container:
1) external mount and 2) it's bind persists (case when bind has the same
mountpoint).

Note: on old mount engine mounts inside container become also shared
with mount in criu mount namespace (outside container) after c/r which
is not right.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/76a09e850

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile             |   1 +
 test/zdtm/static/mnt_ext_sharing.c    | 236 ++++++++++++++++++++++++++
 test/zdtm/static/mnt_ext_sharing.desc |   5 +
 test/zdtm/static/mnt_ext_sharing.hook |  27 +++
 4 files changed, 269 insertions(+)
 create mode 100644 test/zdtm/static/mnt_ext_sharing.c
 create mode 100644 test/zdtm/static/mnt_ext_sharing.desc
 create mode 100755 test/zdtm/static/mnt_ext_sharing.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index bf7462756..9183e7131 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -403,6 +403,7 @@ TST_DIR		=				\
 		mnt_ext_collision		\
 		mntns_pivot_root		\
 		mntns_pivot_root_ro		\
+		mnt_ext_sharing			\
 		mnt_tracefs			\
 		mntns_deleted			\
 		unlink_regular00		\
diff --git a/test/zdtm/static/mnt_ext_sharing.c b/test/zdtm/static/mnt_ext_sharing.c
new file mode 100644
index 000000000..b562b5716
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_sharing.c
@@ -0,0 +1,236 @@
+#include <sched.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check sharing vs external mounts vs mntns";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname = "mnt_ext_sharing.test";
+char *source = "zdtm_ext_sharing";
+char *internal_source = "zdtm_ext_sharing.internal";
+#define SUBDIR "subdir"
+TEST_OPTION(dirname, string, "directory name", 1);
+
+enum {
+	TEST_START,
+	TEST_STARTED,
+	TEST_EXIT,
+	TEST_EXITED,
+};
+
+struct shared {
+	futex_t fstate;
+	int ret;
+};
+
+struct shared *sh;
+
+#define BUF_SIZE 4096
+
+int pid_mntinfo_get_shid(char *pid, char *source)
+{
+	char path[PATH_MAX], line[BUF_SIZE];
+	FILE *mountinfo;
+	char *hyphen, *shared;
+	int ret = -1;
+
+	sprintf(path, "/proc/%s/mountinfo", pid);
+	mountinfo = fopen(path, "r");
+	if (!mountinfo) {
+		pr_perror("fopen");
+		return ret;
+	}
+
+	while (fgets(line, sizeof(line), mountinfo)) {
+		hyphen = strchr(line, '-');
+		if (!hyphen) {
+			pr_perror("no hyphen in mountinfo");
+			break;
+		}
+
+		if (!strstr(hyphen + 1, source))
+			continue;
+
+		shared = strstr(line, "shared:");
+		if (!shared) {
+			pr_err("no shared id\n");
+			break;
+		}
+
+		ret = atoi(shared + 7);
+		break;
+	}
+
+	fclose(mountinfo);
+	return ret;
+}
+
+int secondary_mntns_child(void)
+{
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		sh->ret = 1;
+		futex_abort_and_wake(&sh->fstate);
+		return 1;
+	}
+	futex_set_and_wake(&sh->fstate, TEST_STARTED);
+	futex_wait_until(&sh->fstate, TEST_EXIT);
+	/* These task is just holding the reference to secondary mntns */
+	futex_set_and_wake(&sh->fstate, TEST_EXITED);
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	char *root, testdir[PATH_MAX], spid[BUF_SIZE];
+	char internal_dst[PATH_MAX], internal_src[PATH_MAX], internal_nsdst[PATH_MAX];
+	int internal_shid_self = -1, internal_shid_pid = -1;
+	char *tmp = "/tmp/zdtm_ext_sharing.tmp";
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
+	int pid, status;
+
+	root = getenv("ZDTM_ROOT");
+	if (root == NULL) {
+		pr_perror("root");
+		return 1;
+	}
+
+	if (!zdtm_newns) {
+		pr_perror("ZDTM_NEWNS is not set");
+		return 1;
+	} else if (strcmp(zdtm_newns, "1")) {
+		goto test;
+	}
+
+	/* Prepare directories in test root */
+	sprintf(testdir, "%s/%s", root, dirname);
+	mkdir(testdir, 0755);
+
+	sprintf(internal_dst, "%s/%s/internal", root, dirname);
+	mkdir(internal_dst, 0755);
+
+	/* Prepare directories in criu root */
+	mkdir(tmp, 0755);
+	if (mount(source, tmp, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		return 1;
+	}
+	if (mount(NULL, tmp, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		return 1;
+	}
+
+	sprintf(internal_src, "%s/internal", tmp);
+	mkdir(internal_src, 0755);
+
+	/* Create a shared mount in criu mntns */
+	if (mount(internal_source, internal_src, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		return 1;
+	}
+	if (mount(NULL, internal_src, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		return 1;
+	}
+
+	if (mount(NULL, internal_src, NULL, MS_SHARED, NULL)) {
+		pr_perror("make shared");
+		return 1;
+	}
+
+	/*
+	 * Create temporary mntns, next mounts will not show up in criu mntns
+	 */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	/*
+	 * Populate to the tests root only a subdirectory of the internal_src
+	 * mount to ensure that it will be restored as an external mount.
+	 */
+	sprintf(internal_src, "%s/internal/%s", tmp, SUBDIR);
+	mkdir(internal_src, 0755);
+	if (mount(internal_src, internal_dst, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+
+test:
+	test_init(argc, argv);
+
+	sh = mmap(NULL, sizeof(struct shared), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (sh == MAP_FAILED) {
+		pr_perror("Failed to alloc shared region");
+		exit(1);
+	}
+
+	futex_set(&sh->fstate, TEST_START);
+	sh->ret = 0;
+
+	sprintf(internal_nsdst, "/%s/internal", dirname);
+	/* Make "external" mount to have internal sharing */
+	if (mount(NULL, internal_nsdst, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make shared");
+		return 1;
+	}
+
+	if (mount(NULL, internal_nsdst, NULL, MS_SHARED, NULL)) {
+		pr_perror("make shared");
+		return 1;
+	}
+
+	/* Create secondary mntns copying all mounts */
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("fork");
+		return 1;
+	} else if (pid == 0) {
+		exit(secondary_mntns_child());
+	}
+
+	futex_wait_until(&sh->fstate, TEST_STARTED);
+	if (sh->ret != 0) {
+		pr_err("error in child\n");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/*
+	 * Check mounts in primary and secondary
+	 * mntnses are shared to each other.
+	 */
+	sprintf(spid, "%d", pid);
+	internal_shid_pid = pid_mntinfo_get_shid(spid, internal_source);
+	internal_shid_self = pid_mntinfo_get_shid("self", internal_source);
+
+	/* Cleanup */
+	futex_set_and_wake(&sh->fstate, TEST_EXIT);
+	futex_wait_until(&sh->fstate, TEST_EXITED);
+
+	while (wait(&status) > 0) {
+		if (!WIFEXITED(status) || WEXITSTATUS(status)) {
+			fail("Wrong exit status: %d", status);
+			return 1;
+		}
+	}
+
+	if (internal_shid_pid == -1 || internal_shid_self == -1 || internal_shid_pid != internal_shid_self) {
+		fail("Shared ids does not match (internal)");
+		return 1;
+	}
+
+	/* Print shared id so that it can be checked in cleanup hook */
+	test_msg("internal_shared_id = %d\n", internal_shid_pid);
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_ext_sharing.desc b/test/zdtm/static/mnt_ext_sharing.desc
new file mode 100644
index 000000000..d72505837
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_sharing.desc
@@ -0,0 +1,5 @@
+{   'dopts': '--external mnt[/mnt_ext_sharing.test/internal]:ZDTM',
+    'feature': 'mnt_id move_mount_set_group',
+    'flavor': 'ns uns',
+    'flags': 'suid',
+    'ropts': '--external mnt[ZDTM]:/tmp/zdtm_ext_sharing.tmp/internal/subdir --no-mntns-compat-mode'}
diff --git a/test/zdtm/static/mnt_ext_sharing.hook b/test/zdtm/static/mnt_ext_sharing.hook
new file mode 100755
index 000000000..82443b632
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_sharing.hook
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+[ "$1" == "--clean" ] || exit 0
+
+function err {
+       echo "$1"
+       exit 1
+}
+
+# Check shared ids don't match in criu mntns and test mntns
+OUT="zdtm/static/mnt_ext_sharing.out"
+[ -f "$OUT" ] || err "No $OUT file"
+
+SHID=$(cat $OUT | grep internal_shared_id | awk '{print $5}')
+[ -z "$SHID" ] && err "Failed to get shared id from file"
+MATCH=$(cat /proc/self/mountinfo | grep "\<shared:$SHID\>.* - tmpfs zdtm_ext_sharing.internal")
+[ -z "$MATCH" ] || err "Can lookup internal shared id $SHID in criu mntns"
+
+TMP="/tmp/zdtm_ext_sharing.tmp"
+echo "Cleanup mnt_ext_sharing"
+umount "$TMP/internal"
+umount "$TMP"
+rm -rf $TMP
+
+rm -rf "mnt_ext_sharing.test"
+
+exit 0

From ef53df471d44666330c7a7b58aad9e0673b7ca65 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 28 Jul 2020 11:49:45 +0300
Subject: [PATCH 0994/1854] zdtm: add mount_complex_sharing test

Mounts-v2 engine should fix multiple problems of old engine relative to
sharing options, lets add a test for such problems.

Add all four types of shared groups: 1) private, 2) shared, 3) slave
and 4) slave+shared for mounts. Propagate them into sharing and after
propagation change sharing with four ways: 1) don't change, 2) make
private, 3) make slave and 4) make private + make shared.

This brings 16 cases of different sharing options for mount propagation,
lets check that they all are restored fine.

Lets create mounts from description to make it easier to improve this
test in future.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/8bcd0034d

FIXME: need to check options restored right as we don't have
--check-mounts to do this job for us.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile                   |   1 +
 test/zdtm/static/mount_complex_sharing.c    | 228 ++++++++++++++++++++
 test/zdtm/static/mount_complex_sharing.desc |   4 +
 3 files changed, 233 insertions(+)
 create mode 100644 test/zdtm/static/mount_complex_sharing.c
 create mode 100644 test/zdtm/static/mount_complex_sharing.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 9183e7131..717306dbb 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -404,6 +404,7 @@ TST_DIR		=				\
 		mntns_pivot_root		\
 		mntns_pivot_root_ro		\
 		mnt_ext_sharing			\
+		mount_complex_sharing		\
 		mnt_tracefs			\
 		mntns_deleted			\
 		unlink_regular00		\
diff --git a/test/zdtm/static/mount_complex_sharing.c b/test/zdtm/static/mount_complex_sharing.c
new file mode 100644
index 000000000..efc1b14aa
--- /dev/null
+++ b/test/zdtm/static/mount_complex_sharing.c
@@ -0,0 +1,228 @@
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check complex sharing options for mounts";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname = "mount_complex_sharing";
+TEST_OPTION(dirname, string, "directory name", 1);
+
+/*
+ * Description for creating a single file:
+ * path - path to create file in (relative to mount)
+ * dir - true if file is a directory
+ * content - if file is not a directory, this string is written into the file
+ */
+struct file {
+	char *path;
+	bool dir;
+	char *content;
+};
+
+/*
+ * Description for creating a single mount:
+ * mountpoint - path to create mount on (relative to dirname)
+ * bind - id of bind source if any or -1
+ * bind_root - root offset from bind source
+ * fstype - needed for non-binds, always tmpfs
+ * source - source for mounting
+ * shflags - array of sharing options applied after mounting (ending with -1)
+ * mounted - identifies implicitly propagated mounts
+ * files - array of files we need to create on mount (ending with zeroed file)
+ */
+struct mountinfo {
+	char *mountpoint;
+	int bind;
+	char *bind_root;
+	char *fstype;
+	char *source;
+	int shflags[3];
+	bool mounted;
+	struct file files[10];
+};
+
+/* clang-format off */
+struct mountinfo mounts[] = {
+	{"", -1, "", "tmpfs", "tmpfs-dirname", {MS_PRIVATE, -1}, false,
+		{
+			{"shared-bind-1", true},
+			{"shared-bind-2", true},
+			{"shared-bind-3", true},
+			{"shared-bind-4", true},
+			{"private-mnt", true},
+			{"shared-mnt", true},
+			{"slave-mnt", true},
+			{"slave-shared-mnt", true},
+			{"testfile", false, "TESTFILE"},
+			{NULL}
+		}
+	},
+
+	{"shared-bind-1", -1, "", "tmpfs", "tmpfs-shared-bind", {MS_SHARED, -1}, false,
+		{
+			{"prop-private", true},
+			{"prop-shared", true},
+			{"prop-slave", true},
+			{"prop-slave-shared", true},
+			{NULL}
+		}
+	},
+	{"shared-bind-2", 1, "", NULL, NULL, {-1}, false},
+	{"shared-bind-3", 1, "", NULL, NULL, {-1}, false},
+	{"shared-bind-4", 1, "", NULL, NULL, {-1}, false},
+
+	{"private-mnt", -1, "", "tmpfs", "tmpfs-mnt", {MS_PRIVATE, -1}, false,
+		{
+			{"subdir", true},
+			{NULL}
+		}
+	},
+	{"shared-mnt", 5, "", NULL, NULL, {MS_SHARED, -1}, false},
+	{"slave-mnt", 6, "", NULL, NULL, {MS_SLAVE, -1}, false},
+	{"slave-shared-mnt", 7, "", NULL, NULL, {MS_SHARED, -1}, false},
+
+	{"shared-bind-1/prop-private", 5, "subdir", NULL, NULL, {-1}, false},
+	{"shared-bind-1/prop-shared", 6, "subdir", NULL, NULL, {-1}, false},
+	{"shared-bind-1/prop-slave", 7, "subdir", NULL, NULL, {-1}, false},
+	{"shared-bind-1/prop-slave-shared", 8, "subdir", NULL, NULL, {-1}, false},
+
+	{"shared-bind-2/prop-private", -1, NULL, NULL, NULL, {MS_PRIVATE, -1}, true},
+	{"shared-bind-2/prop-shared", -1, NULL, NULL, NULL, {MS_PRIVATE, -1}, true},
+	{"shared-bind-2/prop-slave", -1, NULL, NULL, NULL, {MS_PRIVATE, -1}, true},
+	{"shared-bind-2/prop-slave-shared", -1, NULL, NULL, NULL, {MS_PRIVATE, -1}, true},
+
+	{"shared-bind-3/prop-private", -1, NULL, NULL, NULL, {MS_SLAVE, -1}, true},
+	{"shared-bind-3/prop-shared", -1, NULL, NULL, NULL, {MS_SLAVE, -1}, true},
+	{"shared-bind-3/prop-slave", -1, NULL, NULL, NULL, {MS_SLAVE, -1}, true},
+	{"shared-bind-3/prop-slave-shared", -1, NULL, NULL, NULL, {MS_SLAVE, -1}, true},
+
+	{"shared-bind-4/prop-private", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
+	{"shared-bind-4/prop-shared", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
+	{"shared-bind-4/prop-slave", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
+	{"shared-bind-4/prop-slave-shared", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
+};
+/* clang-format on */
+
+static int fill_content(struct mountinfo *mi)
+{
+	struct file *file = &mi->files[0];
+	char path[PATH_MAX];
+
+	while (file->path != NULL) {
+		snprintf(path, sizeof(path), "%s/%s/%s", dirname, mi->mountpoint, file->path);
+
+		if (file->dir) {
+			test_msg("Mkdir %s\n", path);
+			if (mkdir(path, 0700)) {
+				pr_perror("Failed to create dir %s", path);
+				return -1;
+			}
+		} else {
+			int fd, len = strlen(file->content);
+
+			test_msg("Create file %s with content %s\n", path, file->content);
+			fd = open(path, O_WRONLY | O_CREAT, 0777);
+			if (fd < 0) {
+				pr_perror("Failed to create file %s", path);
+				return -1;
+			}
+
+			if (write(fd, file->content, len) != len) {
+				pr_perror("Failed to write %s to file %s", file->content, path);
+				close(fd);
+				return -1;
+			}
+			close(fd);
+		}
+
+		file++;
+	}
+
+	return 0;
+}
+
+static int mount_one(struct mountinfo *mi)
+{
+	char source[PATH_MAX], target[PATH_MAX];
+	int *shflags = mi->shflags, mflags = 0;
+	char *fstype = NULL;
+
+	test_msg("Mounting %s %d %s %s %d\n", mi->mountpoint, mi->bind, mi->fstype, mi->source, mi->mounted);
+
+	snprintf(target, sizeof(target), "%s/%s", dirname, mi->mountpoint);
+
+	if (mi->mounted)
+		goto sharing;
+
+	if (mi->bind != -1) {
+		snprintf(source, sizeof(source), "%s/%s/%s", dirname, mounts[mi->bind].mountpoint, mi->bind_root);
+		fstype = NULL;
+		mflags = MS_BIND;
+	} else {
+		snprintf(source, sizeof(source), "%s", mi->source);
+		fstype = mi->fstype;
+	}
+
+	if (mount(source, target, fstype, mflags, NULL)) {
+		pr_perror("Failed to mount %s %s %s", source, target, fstype);
+		return -1;
+	}
+
+	if (fill_content(mi))
+		return -1;
+
+sharing:
+	while (shflags[0] != -1) {
+		test_msg("Making mount %s 0x%x\n", target, shflags[0]);
+		if (mount(NULL, target, NULL, shflags[0], NULL)) {
+			pr_perror("Failed to make mount %s 0x%x", target, shflags[0]);
+			return -1;
+		}
+		shflags++;
+	}
+
+	return 0;
+}
+
+static int mount_loop(void)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(mounts); i++) {
+		if (mount_one(&mounts[i]))
+			return 1;
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	int ret = 1;
+
+	test_init(argc, argv);
+
+	if (mkdir(dirname, 0700) && errno != EEXIST) {
+		pr_perror("Failed to create %s", dirname);
+		goto err;
+	}
+
+	if (mount_loop())
+		goto err;
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+	ret = 0;
+err:
+	if (ret)
+		fail();
+	return ret;
+}
diff --git a/test/zdtm/static/mount_complex_sharing.desc b/test/zdtm/static/mount_complex_sharing.desc
new file mode 100644
index 000000000..8910f4684
--- /dev/null
+++ b/test/zdtm/static/mount_complex_sharing.desc
@@ -0,0 +1,4 @@
+{   'flavor': 'ns uns',
+    'flags': 'suid',
+    'feature': 'move_mount_set_group',
+    'ropts': '--no-mntns-compat-mode'}

From f736d88c99925cf2d8bdac4dda680161d76bff94 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 14 Oct 2020 15:56:52 +0300
Subject: [PATCH 0995/1854] zdtm: add propagation group with mount flags to
 mount_complex_sharing

Before mounts-v2 we have seen mounts loosing their mount readonly flags
when they were in a propagation group, because CRIU "forgot" to set
them, with new mount engine it should work now as all propagations are
now created on the same path there all other normal mounts are created,
and all mount flags are restored.

This test actually mounts only one mount, other three are propagations,
lets set mount ro flag for half of them.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/22584993d

FIXME: need to check options restored right as we don't have
--check-mounts to do this job for us.

Reviewed-by: Alexander Mikhalitsyn (Virtuozzo) <alexander@mihalicyn.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mount_complex_sharing.c | 27 +++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/test/zdtm/static/mount_complex_sharing.c b/test/zdtm/static/mount_complex_sharing.c
index efc1b14aa..b4463c41a 100644
--- a/test/zdtm/static/mount_complex_sharing.c
+++ b/test/zdtm/static/mount_complex_sharing.c
@@ -32,7 +32,8 @@ struct file {
  * bind_root - root offset from bind source
  * fstype - needed for non-binds, always tmpfs
  * source - source for mounting
- * shflags - array of sharing options applied after mounting (ending with -1)
+ * flags - array of sharing options or mount flags applied after
+ *         mounting (ending with -1)
  * mounted - identifies implicitly propagated mounts
  * files - array of files we need to create on mount (ending with zeroed file)
  */
@@ -42,7 +43,7 @@ struct mountinfo {
 	char *bind_root;
 	char *fstype;
 	char *source;
-	int shflags[3];
+	int flags[3];
 	bool mounted;
 	struct file files[10];
 };
@@ -70,6 +71,7 @@ struct mountinfo mounts[] = {
 			{"prop-shared", true},
 			{"prop-slave", true},
 			{"prop-slave-shared", true},
+			{"prop-mount-flags", true},
 			{NULL}
 		}
 	},
@@ -106,6 +108,11 @@ struct mountinfo mounts[] = {
 	{"shared-bind-4/prop-shared", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
 	{"shared-bind-4/prop-slave", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
 	{"shared-bind-4/prop-slave-shared", -1, NULL, NULL, NULL, {MS_PRIVATE, MS_SHARED, -1}, true},
+
+	{"shared-bind-1/prop-mount-flags", 5, "subdir", NULL, NULL, {MS_RDONLY|MS_REMOUNT|MS_BIND, -1}, false},
+	{"shared-bind-2/prop-mount-flags", -1, NULL, NULL, NULL, {MS_RDONLY|MS_REMOUNT|MS_BIND, -1}, true},
+	{"shared-bind-3/prop-mount-flags", -1, NULL, NULL, NULL, {-1}, true},
+	{"shared-bind-4/prop-mount-flags", -1, NULL, NULL, NULL, {-1}, true},
 };
 /* clang-format on */
 
@@ -150,7 +157,7 @@ static int fill_content(struct mountinfo *mi)
 static int mount_one(struct mountinfo *mi)
 {
 	char source[PATH_MAX], target[PATH_MAX];
-	int *shflags = mi->shflags, mflags = 0;
+	int *flags = mi->flags, mflags = 0;
 	char *fstype = NULL;
 
 	test_msg("Mounting %s %d %s %s %d\n", mi->mountpoint, mi->bind, mi->fstype, mi->source, mi->mounted);
@@ -158,7 +165,7 @@ static int mount_one(struct mountinfo *mi)
 	snprintf(target, sizeof(target), "%s/%s", dirname, mi->mountpoint);
 
 	if (mi->mounted)
-		goto sharing;
+		goto apply_flags;
 
 	if (mi->bind != -1) {
 		snprintf(source, sizeof(source), "%s/%s/%s", dirname, mounts[mi->bind].mountpoint, mi->bind_root);
@@ -177,14 +184,14 @@ static int mount_one(struct mountinfo *mi)
 	if (fill_content(mi))
 		return -1;
 
-sharing:
-	while (shflags[0] != -1) {
-		test_msg("Making mount %s 0x%x\n", target, shflags[0]);
-		if (mount(NULL, target, NULL, shflags[0], NULL)) {
-			pr_perror("Failed to make mount %s 0x%x", target, shflags[0]);
+apply_flags:
+	while (flags[0] != -1) {
+		test_msg("Making mount %s 0x%x\n", target, flags[0]);
+		if (mount(NULL, target, NULL, flags[0], NULL)) {
+			pr_perror("Failed to make mount %s 0x%x", target, flags[0]);
 			return -1;
 		}
-		shflags++;
+		flags++;
 	}
 
 	return 0;

From 642abd133ec7f6acc41d34f18e8181c588a051b4 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 1 Dec 2020 16:07:16 +0300
Subject: [PATCH 0996/1854] zdtm/mount-v2: disable mnt_tracefs test

We can have tracefs separate mount from debugfs and that's why the
/sys/kernel/debug external mount now has children and this thing is not
supported to be bind in container with children, because we don't wan't
external mounts to introduce some unexpected extra external mounts so we
bind them without MS_REC in mount-v2 unlike in old mount engine.

We can either bind without MS_REC when constructing test or provide all
children mount as separate external mounts to criu, let's just disable
for now.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/87875c023

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mnt_tracefs.desc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/mnt_tracefs.desc b/test/zdtm/static/mnt_tracefs.desc
index e90ea9415..7cf98034a 100644
--- a/test/zdtm/static/mnt_tracefs.desc
+++ b/test/zdtm/static/mnt_tracefs.desc
@@ -1,3 +1,4 @@
 {   'feature': 'mnt_id',
     'flavor': 'uns',
-    'opts': '--ext-mount-map auto --enable-external-masters'}
+    'opts': '--ext-mount-map auto --enable-external-masters',
+    'ropts': '--mntns-compat-mode'}

From 3c0e99ccfad1554869124203eecc5477d7f2e24f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 14 Jan 2022 19:29:08 +0300
Subject: [PATCH 0997/1854] ci: make others/mnt_ext_dev also run for old mount
 engine

Now when we switched to mount-v2 by default to check old mount engine we
need to explicitly run with --mntns-compat-mode option.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 scripts/ci/run-ci-tests.sh     | 3 +++
 test/others/mnt-ext-dev/run.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index dd7c49d63..22420b922 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -237,6 +237,9 @@ bash -x ./test/jenkins/criu-inhfd.sh
 
 if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 	make -C test/others/mnt-ext-dev/ run
+	if criu/criu check --feature move_mount_set_group; then
+		EXTRA_OPTS=--mntns-compat-mode make -C test/others/mnt-ext-dev/ run
+	fi
 fi
 
 make -C test/others/make/ run CC="$CC"
diff --git a/test/others/mnt-ext-dev/run.sh b/test/others/mnt-ext-dev/run.sh
index 9803a8f77..5a1f44450 100755
--- a/test/others/mnt-ext-dev/run.sh
+++ b/test/others/mnt-ext-dev/run.sh
@@ -11,7 +11,7 @@ dev=`losetup --find --show zdtm.loop`
 mkdir -p ../../dev
 cp -ap $dev ../../dev
 export ZDTM_MNT_EXT_DEV=$dev
-python ../../zdtm.py run -t zdtm/static/mnt_ext_dev || ret=$?
+python ../../zdtm.py run $EXTRA_OPTS -t zdtm/static/mnt_ext_dev || ret=$?
 losetup -d $dev
 unlink zdtm.loop
 exit $ret

From c8121ed746298cecf142cf635d11c7ab81f33ed0 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 31 Jan 2022 11:02:36 +0300
Subject: [PATCH 0998/1854] test/jenkins: test for old mount engine

Let's run zdtm in jenkins with --mntns-compat-mode option and same for
device-external mount test from others.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/jenkins/criu-compat-mounts.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 test/jenkins/criu-compat-mounts.sh

diff --git a/test/jenkins/criu-compat-mounts.sh b/test/jenkins/criu-compat-mounts.sh
new file mode 100755
index 000000000..cc68035f3
--- /dev/null
+++ b/test/jenkins/criu-compat-mounts.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Make one regular C/R cycle with mount-v2 disabled
+set -e
+source `dirname $0`/criu-lib.sh
+prep
+FAIL=0
+./test/zdtm.py run --all --mntns-compat-mode --keep-going --report report --parallel 4 || FAIL=$?
+
+# Make device-external mounts test
+EXTRA_OPTS=--mntns-compat-mode make -C test/others/mnt-ext-dev/ run || FAIL=$?
+
+if [ $FAIL -ne 0 ]; then
+	fail
+fi

From 8867840c82f9909bc173923ab32f37a64fd6a237 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 14 Mar 2022 12:01:10 +0300
Subject: [PATCH 0999/1854] zdtm/mount-v2: disable pty-console test

  [root@fedora criu]# ./test/zdtm.py run -t zdtm/static/pty-console --iters 2 --keep-going --ignore-taint
  [WARNING] Option --keep-going is more useful when running multiple tests
  userns is supported
  === Run 1/1 ================ zdtm/static/pty-console
  ====================== Run zdtm/static/pty-console in uns ======================
  Start test
  Test is SUID
  ./pty-console --pidfile=pty-console.pid --outfile=pty-console.out
  Run criu dump
  Run criu restore
  Run criu dump
  =[log]=> dump/zdtm/static/pty-console/62/2/dump.log
  ------------------------ grep Error ------------------------
  b'(00.009325) 101 fdinfo 3: pos:                0 flags:           100000/0'
  b'(00.009332) Dumping path for 3 fd via self 19 [/zdtm/static]'
  b'(00.009345) 101 fdinfo 4: pos:                0 flags:           100002/0'
  b'(00.009352) tty: Dumping tty 20 with id 0xc'
  b"(00.009358) Error (criu/files-reg.c:1710): Can't lookup mount=1647 for fd=4 path=/ptmx"
  b'(00.009361) ----------------------------------------'
  b'(00.009369) Error (criu/cr-dump.c:1368): Dump files (pid: 101) failed with -1'
  b'(00.009696) Running network-unlock scripts'
  b'(00.012401) Unfreezing tasks into 1'
  b'(00.012410) \tUnseizing 86 into 1'
  b'(00.012415) \tUnseizing 101 into 1'
  b'(00.012428) Error (criu/cr-dump.c:1788): Dumping FAILED.'
  ------------------------ ERROR OVER ------------------------
  ################ Test zdtm/static/pty-console FAIL at CRIU dump ################
  Test output: ================================

   <<< ================================
  Send the 9 signal to  86
  Wait for zdtm/static/pty-console(86) to die for 0.100000
  ##################################### FAIL #####################################

Restore on second iteration with mount-v2 fails, that is because
devpts_restore which is called from do_new_mount_v2 via fstype->restore
opens ptmx file in service mntns and saves it to fdstore for later use.
So after first c/r open ptmx fd changes mnt_id in fdinfo to a detached
mount. Let's just disable mount-v2 for this test for now.

FIXME: We should create separate fstype hook to do_mount_in_right_mntns,
so that we can open files from this hook in actual restored mntns.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/pty-console.desc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/pty-console.desc b/test/zdtm/static/pty-console.desc
index fba5e8749..3b3e3f73d 100644
--- a/test/zdtm/static/pty-console.desc
+++ b/test/zdtm/static/pty-console.desc
@@ -1 +1 @@
-{'flags': 'suid', 'flavor' : 'ns uns'}
+{'flags': 'suid', 'flavor' : 'ns uns', 'ropts': '--mntns-compat-mode'}

From 165d5a2cd5de5c8bdf6770b236389fdcc004ce05 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sun, 20 Mar 2022 19:38:34 +0300
Subject: [PATCH 1000/1854] mount-v2: make mount engine fallback messages
 loglevel debug

On pre v5.15 kernel we don't have MOVE_MOUNT_SET_GROUP support and thus
all our ci logs are filled with "fallback" messages. Let's decrease log
level to debug, so that we don't see it in ci logs.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/config.c   | 2 +-
 criu/mount-v2.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 8b6d105ae..28641cf0c 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -1110,7 +1110,7 @@ int check_options(void)
 		return 1;
 	} else if (!opts.mntns_compat_mode && opts.mode == CR_RESTORE) {
 		if (check_mount_v2()) {
-			pr_warn("Mount engine fallback to --mntns-compat-mode mode\n");
+			pr_debug("Mount engine fallback to --mntns-compat-mode mode\n");
 			opts.mntns_compat_mode = true;
 		}
 	}
diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index ec3965140..6772072de 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -33,12 +33,12 @@ LIST_HEAD(sharing_groups);
 int check_mount_v2(void)
 {
 	if (!kdat.has_move_mount_set_group) {
-		pr_warn("Mounts-v2 requires MOVE_MOUNT_SET_GROUP support\n");
+		pr_debug("Mounts-v2 requires MOVE_MOUNT_SET_GROUP support\n");
 		return -1;
 	}
 
 	if (!kdat.has_openat2) {
-		pr_warn("Mounts-v2 requires openat2 support\n");
+		pr_debug("Mounts-v2 requires openat2 support\n");
 		return -1;
 	}
 

From 73a783ac17eb4c422f614525d1313266003829a4 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 21 Mar 2022 10:19:29 +0300
Subject: [PATCH 1001/1854] mount: make error messages differ in different
 places

We have three of "Can't mount at %s", let's distinguish simple mount
from bind-mount and re-mount to make log reading easier.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 85fcb8843..8b6cdaf45 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2485,14 +2485,14 @@ do_bind:
 	}
 
 	if (mount(root, service_mountpoint(mi), NULL, MS_BIND | (mi->flags & MS_REC), NULL) < 0) {
-		pr_perror("Can't mount at %s", service_mountpoint(mi));
+		pr_perror("Can't bind-mount at %s", service_mountpoint(mi));
 		goto err;
 	}
 
 	mflags = mi->flags & (~MS_PROPAGATE);
 	if (!mi->bind || mflags != (mi->bind->flags & (~MS_PROPAGATE)))
 		if (mount(NULL, service_mountpoint(mi), NULL, MS_BIND | MS_REMOUNT | mflags, NULL)) {
-			pr_perror("Can't mount at %s", service_mountpoint(mi));
+			pr_perror("Can't re-mount at %s", service_mountpoint(mi));
 			goto err;
 		}
 

From ab6191ccd3d73d983677560e07bbd4c4286fa7f8 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 20 Mar 2022 22:11:19 -0700
Subject: [PATCH 1002/1854] zdtm: use unique holder for cgroups

The idea that each zdtm.py should have own helder, so that two zdtm.py that are
running on the same host don't effect each other.

Fixes: #1774
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm.py             | 6 ++++--
 test/zdtm_mount_cgroups  | 4 +++-
 test/zdtm_umount_cgroups | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index f15420a65..a8704b3d7 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -27,6 +27,7 @@ import subprocess
 import sys
 import tempfile
 import time
+import uuid
 from builtins import input, int, open, range, str, zip
 
 import yaml
@@ -38,6 +39,7 @@ from zdtm.criu_config import criu_config
 STREAMED_IMG_FILE_NAME = "img.criu"
 
 prev_line = None
+uuid = uuid.uuid4()
 
 
 def alarm(*args):
@@ -617,12 +619,12 @@ class zdtm_test:
         if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
             subprocess.check_call(["make", "-C", "zdtm/"])
         subprocess.check_call(
-            ["flock", "zdtm_mount_cgroups.lock", "./zdtm_mount_cgroups"])
+            ["flock", "zdtm_mount_cgroups.lock", "./zdtm_mount_cgroups", str(uuid)])
 
     @staticmethod
     def cleanup():
         subprocess.check_call(
-            ["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups"])
+            ["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups", str(uuid)])
 
 
 def load_module_from_file(name, path):
diff --git a/test/zdtm_mount_cgroups b/test/zdtm_mount_cgroups
index 34e0e85ca..a99e16361 100755
--- a/test/zdtm_mount_cgroups
+++ b/test/zdtm_mount_cgroups
@@ -4,13 +4,15 @@
 # Error (cgroup.c:768): cg: Set 3 is not subset of 2
 # so lets create all test controllers before executing tests.
 
+uuid=$1
+
 cat /proc/self/cgroup | grep -q zdtmtst.defaultroot && exit
 
 tdir=`mktemp -d zdtm.XXXXXX`
 for i in "zdtmtst" "zdtmtst.defaultroot"; do
 	mount -t cgroup -o none,name=$i zdtm $tdir &&
 	# a fake group prevents destroying of a controller
-	mkdir -p $tdir/holder &&
+	mkdir -p $tdir/holder.$uuid &&
 	umount -l $tdir || exit 1
 done
 rmdir $tdir
diff --git a/test/zdtm_umount_cgroups b/test/zdtm_umount_cgroups
index 75a8ea28f..decd70ff0 100755
--- a/test/zdtm_umount_cgroups
+++ b/test/zdtm_umount_cgroups
@@ -4,12 +4,14 @@
 
 cat /proc/self/cgroup | grep -q zdtmtst.defaultroot || exit 0
 
+uuid=$1
+
 tdir=`mktemp -d zdtm.XXXXXX`
 for i in "zdtmtst" "zdtmtst.defaultroot"; do
 	mount -t cgroup -o none,name=$i zdtm $tdir || { rmdir $tdir; exit 1; }
 	# remove a fake group if exists
-	if [ -d "$tdir/holder" ]; then
-		rmdir $tdir/holder || { umount -l $tdir && rmdir $tdir; exit 1; }
+	if [ -d "$tdir/holder.$uuid" ]; then
+		rmdir $tdir/holder.$uuid || { umount -l $tdir && rmdir $tdir; exit 1; }
 	fi
 	umount -l $tdir || exit 1;
 done

From 805559c1deb6507a0c2ffbe0d4a3d18257322fbd Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 20 Mar 2022 22:13:45 -0700
Subject: [PATCH 1003/1854] scripts/ci: mount test cgroups once

zdtm.py mounts two named controllers for tests. In CI, we run zdtm.py a few
times, so we can mount (create) these controllers once to avoid any unwanted
effects.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 scripts/ci/run-ci-tests.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 22420b922..14e6b1224 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -139,6 +139,13 @@ time make unittest
 
 ulimit -c unlimited
 
+cgid=$$
+cleanup_cgroup() {
+	./test/zdtm_umount_cgroups $cgid
+}
+trap cleanup_cgroup EXIT
+./test/zdtm_mount_cgroups $cgid
+
 echo "|$(pwd)/test/abrt.sh %P %p %s %e" > /proc/sys/kernel/core_pattern
 
 if [ "${COMPAT_TEST}x" = "yx" ] ; then

From 791651f1b69b527d124282ff85d2f65d92759f1e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 20 Mar 2022 00:43:45 -0700
Subject: [PATCH 1004/1854] criu-ns: add a helper to hold a pid namespace

The init process can exit if it doesn't have any child processes and its
pidns is destroyed in this case. CRIU dump is running in the target pid
namespace and it kills dumped processes at the end. We need to create a
holder process to be sure that the pid namespace will not be destroy
before criu exits.

Fixes: #1775

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/criu-ns | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 930d20c80..9fc58b640 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -82,6 +82,27 @@ def run_criu(args):
     raise OSError(errno.ENOENT, "No such command")
 
 
+# pidns_holder creates a process that is reparented to the init.
+#
+# The init process can exit if it doesn't have any child processes and its
+# pidns is destroyed in this case. CRIU dump is running in the target pid
+# namespace and it kills dumped processes at the end. We need to create a
+# holder process to be sure that the pid namespace will not be destroy before
+# criu exits.
+def pidns_holder():
+    r, w = os.pipe()
+    pid = os.fork()
+    if pid == 0:
+        pid = os.fork()
+        if pid == 0:
+            os.close(w)
+            # The write end is owned by the parent process and it is closed by
+            # kernel when the parent process exits.
+            os.read(r, 1)
+        sys.exit(0)
+    os.waitpid(pid, 0)
+
+
 def wrap_restore():
     restore_args = sys.argv[1:]
     if '--restore-sibling' in restore_args:
@@ -200,6 +221,8 @@ def wrap_dump():
     set_pidns(pid, pid_idx)
     set_mntns(pid)
 
+    pidns_holder()
+
     criu_pid = os.fork()
     if criu_pid == 0:
         run_criu(sys.argv[1:])

From 5109fccf8c3246586bc13409164c373afe070192 Mon Sep 17 00:00:00 2001
From: Fangrui Song <maskray@google.com>
Date: Fri, 25 Mar 2022 17:18:30 -0700
Subject: [PATCH 1005/1854] apparmor: Fix -Wfortify-source for Clang

```
criu/apparmor.c:679:26: error: 'fscanf' may overflow; destination buffer in argument 3 has size 48, but the corresponding specifier may require size 49 [-Werror,-Wfortify-source]
        ret = fscanf(f, "%48s", contents);
```
The buffer size should be at least one larger than the fscanf maximum
field width.

Fixes: 8d992a680ef3 ("lsm: support checkpoint/restore of stacked apparmor profiles")
Signed-off-by: Fangrui Song <maskray@google.com>
---
 criu/apparmor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index f9ad79619..cc9e7ac2a 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -668,7 +668,7 @@ int dump_aa_namespaces(void)
 
 bool check_aa_ns_dumping(void)
 {
-	char contents[48];
+	char contents[49];
 	int major, minor, ret;
 	FILE *f;
 

From 46e4773c3b8fdc37028db121c9018c71ddb114ff Mon Sep 17 00:00:00 2001
From: jiang wei <jwcesign@gmail.com>
Date: Wed, 23 Mar 2022 21:48:16 +0800
Subject: [PATCH 1006/1854] style: delete some redundant code

There is some redundant in compel/src/main.c, making it better

Signed-off-by: jiang wei <jwcesign@gmail.com>
---
 compel/src/main.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/compel/src/main.c b/compel/src/main.c
index f461ff04d..632354582 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -94,7 +94,6 @@ static int piegen(void)
 	}
 
 	if (handle_binary(mem, st.st_size)) {
-		close(fd), fd = -1;
 		unlink(opts.output_filename);
 		goto err;
 	}
@@ -102,8 +101,7 @@ static int piegen(void)
 	ret = 0;
 
 err:
-	if (fd >= 0)
-		close(fd);
+	close(fd);
 	if (opts.fout)
 		fclose(opts.fout);
 	if (!ret)
@@ -347,11 +345,9 @@ int main(int argc, char *argv[])
 			printf("Version: %d.%d.%d\n", COMPEL_SO_VERSION_MAJOR, COMPEL_SO_VERSION_MINOR,
 			       COMPEL_SO_VERSION_SUBLEVEL);
 			exit(0);
-			break;
 		default: // '?'
 			// error message already printed by getopt_long()
 			return usage(1);
-			break;
 		}
 	}
 

From 75064b74242116ff37f726d74795fb115a486306 Mon Sep 17 00:00:00 2001
From: Fangrui Song <maskray@google.com>
Date: Fri, 25 Mar 2022 17:27:11 -0700
Subject: [PATCH 1007/1854] mount: fix -Wunused-but-set-variable for Clang 15

Since https://reviews.llvm.org/D122271, Clang -Wset-but-unused-variable
gets smarter to warn about unused post-increments.

Signed-off-by: Fangrui Song <maskray@google.com>
---
 criu/mount.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/mount.c b/criu/mount.c
index 8b6cdaf45..65e186af9 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1991,6 +1991,7 @@ static int mnt_tree_for_each_reverse(struct mount_info *m, int (*fn)(struct moun
 	int progress = 0;
 
 	MNT_TREE_WALK(m, prev, MNT_WALK_NONE, fn, (struct list_head *)NULL, progress);
+	(void)progress; // Suppress -Wused-but-unset-variable for clang>=15
 
 	return 0;
 }

From 45e048d77a6a64f11e3b91368e4c83edea3bcaf9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Thu, 31 Mar 2022 23:52:33 -0700
Subject: [PATCH 1008/1854] criu: generate unique socket names

CRIU has a few places where it creates unix sockets and their names have to be
unique for each criu run.

Fixes: #1798
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 compel/include/uapi/infect-util.h | 6 ++++++
 compel/src/lib/infect-util.c      | 2 ++
 compel/src/lib/infect.c           | 3 ++-
 criu/fdstore.c                    | 4 +++-
 criu/pidfd-store.c                | 3 ++-
 criu/unittest/mock.c              | 3 +++
 criu/util.c                       | 3 +++
 7 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/compel/include/uapi/infect-util.h b/compel/include/uapi/infect-util.h
index 4e32d13dc..ace6f6b6b 100644
--- a/compel/include/uapi/infect-util.h
+++ b/compel/include/uapi/infect-util.h
@@ -3,6 +3,12 @@
 
 #include "common/compiler.h"
 
+/*
+ * compel_run_id is a unique value of the current run. It can be used to
+ * generate resource ID-s to avoid conflicts with other processes.
+ */
+extern uint64_t compel_run_id;
+
 struct parasite_ctl;
 extern int __must_check compel_util_send_fd(struct parasite_ctl *ctl, int fd);
 extern int compel_util_recv_fd(struct parasite_ctl *ctl, int *pfd);
diff --git a/compel/src/lib/infect-util.c b/compel/src/lib/infect-util.c
index 5d6d0ddd8..00a7c83f7 100644
--- a/compel/src/lib/infect-util.c
+++ b/compel/src/lib/infect-util.c
@@ -7,6 +7,8 @@
 #include "infect-rpc.h"
 #include "infect-util.h"
 
+uint64_t compel_run_id;
+
 int compel_util_send_fd(struct parasite_ctl *ctl, int fd)
 {
 	int sk;
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 0fb9e715c..78e4d7e0e 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1,3 +1,4 @@
+#include <inttypes.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -364,7 +365,7 @@ static int gen_parasite_saddr(struct sockaddr_un *saddr, int key)
 	int sun_len;
 
 	saddr->sun_family = AF_UNIX;
-	snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d", key);
+	snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d-%" PRIx64, key, compel_run_id);
 
 	sun_len = SUN_LEN(saddr);
 	*saddr->sun_path = '\0';
diff --git a/criu/fdstore.c b/criu/fdstore.c
index 65264a511..6a7f73a59 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -12,6 +12,7 @@
 #include "xmalloc.h"
 #include "rst-malloc.h"
 #include "log.h"
+#include "util.h"
 
 /* clang-format off */
 static struct fdstore_desc {
@@ -56,7 +57,8 @@ int fdstore_init(void)
 	}
 
 	addr.sun_family = AF_UNIX;
-	addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64, st.st_ino);
+	addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64 "-%" PRIx64, st.st_ino,
+			   criu_run_id);
 	addrlen += sizeof(addr.sun_family);
 
 	addr.sun_path[0] = 0;
diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c
index 98b478b30..b15568e08 100644
--- a/criu/pidfd-store.c
+++ b/criu/pidfd-store.c
@@ -100,7 +100,8 @@ int init_pidfd_store_sk(pid_t pid, int sk)
 			goto err;
 		}
 
-		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d", pid, sk);
+		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d-%" PRIx64, pid, sk,
+				   criu_run_id);
 		addrlen += sizeof(addr.sun_family);
 
 		addr.sun_path[0] = 0;
diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c
index dc5b627f7..0151873dc 100644
--- a/criu/unittest/mock.c
+++ b/criu/unittest/mock.c
@@ -2,6 +2,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 int add_external(char *key)
@@ -141,3 +142,5 @@ int check_mount_v2(void)
 {
 	return 0;
 }
+
+uint64_t compel_run_id;
diff --git a/criu/util.c b/criu/util.c
index f8da4ac5c..dd1fd97f5 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -52,6 +52,8 @@
 #include "cr-errno.h"
 #include "action-scripts.h"
 
+#include "compel/infect-util.h"
+
 #define VMA_OPT_LEN 128
 
 static int xatol_base(const char *string, long *number, int base)
@@ -1816,6 +1818,7 @@ void util_init()
 
 	clock_gettime(CLOCK_MONOTONIC, &tp);
 	criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec;
+	compel_run_id = criu_run_id;
 }
 
 /*

From 8bb05e3bf3fe96ce93071e22330c2701e86b9a55 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 5 Apr 2022 07:05:53 +0000
Subject: [PATCH 1009/1854] ci: Switch to non overlaysfs tests

Switch to non overlaysfs tests for Podman and Docker.
https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924

Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 5 ++++-
 scripts/ci/podman-test.sh | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index d4b11bd55..f36b4e458 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,7 +21,10 @@ add-apt-repository \
 
 . /etc/lsb-release
 
-echo '{ "experimental": true }' > /etc/docker/daemon.json
+# overlayfs with current Ubuntu kernel breaks CRIU
+# https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924
+# Use devicemapper storage drive as a work-around
+echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
 
 CRIU_LOG='/criu.log'
 mkdir -p /etc/criu
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 5e5eb764d..1d851efbc 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -25,7 +25,11 @@ make install
 popd
 rm -rf "${tmp_dir}"
 
-podman info
+# overlayfs with current Ubuntu kernel breaks CRIU
+# https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924
+# Use VFS storage drive as a work-around
+export STORAGE_DRIVER=vfs
+podman --storage-driver vfs info
 
 # shellcheck disable=SC2016
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'

From 747ec75d9fbc65da9cd821e5b862627aebc19f73 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 17:35:21 -0700
Subject: [PATCH 1010/1854] criu/arch/s390/include/asm/restorer.h: fix comments

Use "Parameter" instead of "Parm" as in other places.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/arch/s390/include/asm/restorer.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/criu/arch/s390/include/asm/restorer.h b/criu/arch/s390/include/asm/restorer.h
index 668f9a413..b8472afc8 100644
--- a/criu/arch/s390/include/asm/restorer.h
+++ b/criu/arch/s390/include/asm/restorer.h
@@ -17,15 +17,15 @@
 	asm volatile(							\
 	"lgr	%%r0,%6\n"	/* Save thread_args in %r0 */		\
 	"lgr	%%r1,%5\n"	/* Save clone_restore_fn in %r1 */	\
-	"lgr	%%r2,%2\n"	/* Parm 1: new_sp (child stack) */	\
-	"lgr	%%r3,%1\n"	/* Parm 2: clone_flags */		\
-	"lgr	%%r4,%3\n"	/* Parm 3: &parent_tid */		\
-	"lgr	%%r5,%4\n"	/* Parm 4: &thread_args[i].pid */	\
-	"lghi	%%r6,0\n"	/* Parm 5: tls = 0 */			\
+	"lgr	%%r2,%2\n"	/* Parameter 1: new_sp (child stack) */	\
+	"lgr	%%r3,%1\n"	/* Parameter 2: clone_flags */		\
+	"lgr	%%r4,%3\n"	/* Parameter 3: &parent_tid */		\
+	"lgr	%%r5,%4\n"	/* Parameter 4: &thread_args[i].pid */	\
+	"lghi	%%r6,0\n"	/* Parameter 5: tls = 0 */		\
 	"svc	"__stringify(__NR_clone)"\n"				\
 	"ltgr	%0,%%r2\n"	/* Set and check "ret" */		\
 	"jnz	0f\n"		/* ret != 0: Continue caller */		\
-	"lgr	%%r2,%%r0\n"	/* Parm 1: &thread_args */		\
+	"lgr	%%r2,%%r0\n"	/* Parameter 1: &thread_args */		\
 	"aghi	%%r15,-160\n"	/* Prepare stack frame */		\
 	"xc	0(8,%%r15),0(%%r15)\n"					\
 	"basr	%%r14,%%r1\n"	/* Jump to clone_restore_fn() */	\

From 58b120b06995c266ac244388e4b92fe36fbc84cd Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 17:36:07 -0700
Subject: [PATCH 1011/1854] criu/pie/restorer.c: use param not parm

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/pie/restorer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 7aa788181..3fd0d2c54 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -382,13 +382,13 @@ static int restore_dumpable_flag(MmEntry *mme)
 
 static void restore_sched_info(struct rst_sched_param *p)
 {
-	struct sched_param parm;
+	struct sched_param param;
 
 	pr_info("Restoring scheduler params %d.%d.%d\n", p->policy, p->nice, p->prio);
 
 	sys_setpriority(PRIO_PROCESS, 0, p->nice);
-	parm.sched_priority = p->prio;
-	sys_sched_setscheduler(0, p->policy, &parm);
+	param.sched_priority = p->prio;
+	sys_sched_setscheduler(0, p->policy, &param);
 }
 
 static void restore_rlims(struct task_restore_args *ta)

From 0cb8b9c044c0d2839c267d3a160b5a9b13806d22 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 17:36:30 -0700
Subject: [PATCH 1012/1854] test/zdtm/static: use param not parm

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/sched_policy00.c |  6 +++---
 test/zdtm/static/sched_prio00.c   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/zdtm/static/sched_policy00.c b/test/zdtm/static/sched_policy00.c
index 794c11af2..dc71eed94 100644
--- a/test/zdtm/static/sched_policy00.c
+++ b/test/zdtm/static/sched_policy00.c
@@ -13,7 +13,7 @@
 const char *test_doc = "Check sched policy to be preserved";
 const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
-static const int parm = 3;
+static const int param = 3;
 
 static int do_nothing(void)
 {
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	p.sched_priority = parm;
+	p.sched_priority = param;
 	if (sched_setscheduler(pid, SCHED_RR, &p)) {
 		pr_perror("Can't set policy");
 		kill(pid, SIGKILL);
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 	}
 
 	ret = sched_getparam(pid, &p);
-	if (ret < 0 || p.sched_priority != parm) {
+	if (ret < 0 || p.sched_priority != param) {
 		fail("Broken prio");
 		err++;
 	}
diff --git a/test/zdtm/static/sched_prio00.c b/test/zdtm/static/sched_prio00.c
index 4bc878786..abdf33983 100644
--- a/test/zdtm/static/sched_prio00.c
+++ b/test/zdtm/static/sched_prio00.c
@@ -34,20 +34,20 @@ static void kill_all(int *pid, int n)
 
 int main(int argc, char **argv)
 {
-	int pid[NRTASKS], i, parm[NRTASKS], ret;
+	int pid[NRTASKS], i, param[NRTASKS], ret;
 
 	test_init(argc, argv);
 
-	parm[0] = -20;
-	parm[1] = 19;
-	parm[2] = 1;
+	param[0] = -20;
+	param[1] = 19;
+	param[2] = 1;
 
 	for (i = 0; i < NRTASKS; i++) {
 		pid[i] = fork();
 		if (!pid[i])
 			return do_nothing();
 
-		if (setpriority(PRIO_PROCESS, pid[i], parm[i])) {
+		if (setpriority(PRIO_PROCESS, pid[i], param[i])) {
 			pr_perror("Can't set prio %d", i);
 			kill_all(pid, i);
 			return -1;
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 			break;
 		}
 
-		if (ret != parm[i]) {
+		if (ret != param[i]) {
 			fail("Broken nice for %d", i);
 			break;
 		}

From 58d76cb1602114e5fca23f010dd01f440fbf9da6 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 17:42:23 -0700
Subject: [PATCH 1013/1854] test/zdtm/static/inotify_system.c: s/inot/infd/

Codespell thinks that "inot" is a misspelled "into".

Rename to infd ("inotify fd") to make it happy.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/inotify_system.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 487062cab..769825bc1 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -63,7 +63,7 @@ const char *inot_dir = "./inotify.nodel";
 #include <fcntl.h>
 
 typedef struct {
-	int inot;
+	int infd;
 	int file;
 	int link;
 	int dir;
@@ -165,8 +165,8 @@ desc init_env(const char *dir, char *file_path, char *link_path)
 		pr_perror("mkdir(%s)", dir);
 		return in_desc;
 	}
-	in_desc.inot = inotify_init();
-	if (in_desc.inot < 0) {
+	in_desc.infd = inotify_init();
+	if (in_desc.infd < 0) {
 		pr_perror("inotify_init() failed");
 		rmdir(dir);
 		return in_desc;
@@ -184,12 +184,12 @@ desc init_env(const char *dir, char *file_path, char *link_path)
 		return in_desc;
 	}
 
-	in_desc.dir = addWatcher(in_desc.inot, dir);
+	in_desc.dir = addWatcher(in_desc.infd, dir);
 	if (createFiles(file_path, filename, link_path)) {
 		return in_desc;
 	}
-	in_desc.link = addWatcher(in_desc.inot, link_path);
-	in_desc.file = addWatcher(in_desc.inot, file_path);
+	in_desc.link = addWatcher(in_desc.infd, link_path);
+	in_desc.file = addWatcher(in_desc.infd, file_path);
 
 	return in_desc;
 }
@@ -299,9 +299,9 @@ int read_set(int inot_fd, char *event_set)
 
 void common_close(desc *descr)
 {
-	if (descr->inot > 0) {
-		close(descr->inot);
-		descr->inot = -1;
+	if (descr->infd > 0) {
+		close(descr->infd);
+		descr->infd = -1;
 		descr->file = -1;
 		descr->dir = -1;
 		descr->link = -1;
@@ -316,7 +316,7 @@ int get_event_set(char *event_set, int wait)
 	desc common_desc;
 
 	common_desc = init_env(inot_dir, file_path, link_path);
-	if ((common_desc.inot < 0) || (common_desc.file < 0) || (common_desc.dir < 0) || (common_desc.link < 0)) {
+	if ((common_desc.infd < 0) || (common_desc.file < 0) || (common_desc.dir < 0) || (common_desc.link < 0)) {
 		common_close(&common_desc);
 		return -1;
 	}
@@ -327,7 +327,7 @@ int get_event_set(char *event_set, int wait)
 	if (wait) {
 		do_wait();
 	}
-	len = read_set(common_desc.inot, event_set);
+	len = read_set(common_desc.infd, event_set);
 	common_close(&common_desc);
 #ifdef NODEL
 	if (!(fDelete(file_path) == 0 && fDelete(link_path) == 0 && fRemDir(inot_dir) == 0))

From d9411c948de335bb3737a308346bbffd7e800615 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 17:45:37 -0700
Subject: [PATCH 1014/1854] test/zdtm/static: s/NODEL/NO_DEL/

Codespell thinks that NODEL is a misspelled MODEL. Indeed it looks that
way. Add an underscore.

Do the same for the file names.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm/static/Makefile         |  2 +-
 test/zdtm/static/inotify_system.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 717306dbb..1e7925ca8 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -549,7 +549,7 @@ socket_listen:		LDLIBS += -lrt -pthread
 socket_aio:		LDLIBS += -lrt -pthread
 uptime_grow:		LDLIBS += -lrt -pthread
 unlink_largefile:	CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-inotify_system_nodel:	CFLAGS += -DNODEL
+inotify_system_nodel:	CFLAGS += -DNO_DEL
 pthread00:		LDLIBS += -pthread
 pthread01:		LDLIBS += -pthread
 pthread02:		LDLIBS += -pthread
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 769825bc1..141476415 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -14,14 +14,14 @@
 #include "zdtmtst.h"
 
 const char *test_doc = "Inotify on symlink should be checked";
-#ifndef NODEL
+#ifndef NO_DEL
 char filename[] = "file";
 char linkname[] = "file.lnk";
 const char *inot_dir = "./inotify";
 #else
-char filename[] = "file.nodel";
-char linkname[] = "file.nodel.lnk";
-const char *inot_dir = "./inotify.nodel";
+char filename[] = "file.no_del";
+char linkname[] = "file.no_del.lnk";
+const char *inot_dir = "./inotify.no_del";
 #endif
 
 #ifdef __NR_inotify_init
@@ -216,7 +216,7 @@ int test_actions(const char *dir, char *file_path, char *link_path)
 {
 	if (fChmod(link_path) == 0 && fWriteClose(link_path) == 0 && fNoWriteClose(link_path) == 0 &&
 	    fMove(file_path, filename) == 0 && fMove(filename, file_path) == 0
-#ifndef NODEL
+#ifndef NO_DEL
 	    && fDelete(file_path) == 0 && fDelete(link_path) == 0 && fRemDir(dir) == 0
 #endif
 	) {
@@ -329,7 +329,7 @@ int get_event_set(char *event_set, int wait)
 	}
 	len = read_set(common_desc.infd, event_set);
 	common_close(&common_desc);
-#ifdef NODEL
+#ifdef NO_DEL
 	if (!(fDelete(file_path) == 0 && fDelete(link_path) == 0 && fRemDir(inot_dir) == 0))
 		return -1;
 #endif

From 716e56f37e67db1f2530b847341b43603958b56c Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 17:51:21 -0700
Subject: [PATCH 1015/1854] Typo: mmaped -> mmapped

It is mapped, not maped. Same applies for mmap I guess.

Found by codespell, except it wants to change it to mapped,
which will make it less specific.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/memfd.c                     | 2 +-
 criu/vdso.c                      | 2 +-
 test/zdtm/static/mtime_mmap.c    | 2 +-
 test/zdtm/static/unlink_mmap00.c | 2 +-
 test/zdtm/static/unlink_mmap01.c | 2 +-
 test/zdtm/static/unlink_mmap02.c | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 84ea00c95..da2937703 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -68,7 +68,7 @@ static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode, const char *
 	u32 shmid;
 
 	/*
-	  * shmids are chosen as the inode number of the corresponding mmaped
+	  * shmids are chosen as the inode number of the corresponding mmapped
 	  * file. See handle_vma() in proc_parse.c.
 	  * It works for memfd too, because we share the same device as the
 	  * shmem device.
diff --git a/criu/vdso.c b/criu/vdso.c
index dc70513d8..1a51f1451 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -500,7 +500,7 @@ static int vdso_fill_compat_symtable(struct vdso_maps *native, struct vdso_maps
 	}
 
 	if (vdso_fill_symtable_compat((uintptr_t)vdso_mmap, compat->sym.vdso_size, &compat->sym)) {
-		pr_err("Failed to parse mmaped compatible vdso blob\n");
+		pr_err("Failed to parse mmapped compatible vdso blob\n");
 		goto out_unmap;
 	}
 
diff --git a/test/zdtm/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
index f9a595864..faa2d6fad 100644
--- a/test/zdtm/static/mtime_mmap.c
+++ b/test/zdtm/static/mtime_mmap.c
@@ -11,7 +11,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc = "file mmaped for write and being written should change mtime\n"
+const char *test_doc = "file mmapped for write and being written should change mtime\n"
 		       "and be migrated with correct new data";
 
 char *filename;
diff --git a/test/zdtm/static/unlink_mmap00.c b/test/zdtm/static/unlink_mmap00.c
index 405157dac..37cbc6b70 100644
--- a/test/zdtm/static/unlink_mmap00.c
+++ b/test/zdtm/static/unlink_mmap00.c
@@ -9,7 +9,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc = "Test mmaped and unlinked files";
+const char *test_doc = "Test mmapped and unlinked files";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/unlink_mmap01.c b/test/zdtm/static/unlink_mmap01.c
index d43246b79..13e808cac 100644
--- a/test/zdtm/static/unlink_mmap01.c
+++ b/test/zdtm/static/unlink_mmap01.c
@@ -11,7 +11,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc = "Test mmaped and unlinked files (2, with hard links)";
+const char *test_doc = "Test mmapped and unlinked files (2, with hard links)";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);
diff --git a/test/zdtm/static/unlink_mmap02.c b/test/zdtm/static/unlink_mmap02.c
index a6b1841b3..ca2ec18ed 100644
--- a/test/zdtm/static/unlink_mmap02.c
+++ b/test/zdtm/static/unlink_mmap02.c
@@ -9,7 +9,7 @@
 
 #include "zdtmtst.h"
 
-const char *test_doc = "Test mmaped, opened and unlinked files";
+const char *test_doc = "Test mmapped, opened and unlinked files";
 
 char *filename;
 TEST_OPTION(filename, string, "file name", 1);

From 777ad1966d8281e6fa834dd055bd36c452f980e0 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:03:11 -0700
Subject: [PATCH 1016/1854] Nit: rename sie to se

Codespell thinks this is a misspelled size or sigh.
Rename to se.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/cr-restore.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ed62cc5a2..95fe96152 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3081,11 +3081,11 @@ static int prepare_rlimits(int pid, struct task_restore_args *ta, CoreEntry *cor
 	return 0;
 }
 
-static int signal_to_mem(SiginfoEntry *sie)
+static int signal_to_mem(SiginfoEntry *se)
 {
 	siginfo_t *info, *t;
 
-	info = (siginfo_t *)sie->siginfo.data;
+	info = (siginfo_t *)se->siginfo.data;
 	t = rst_mem_alloc(sizeof(siginfo_t), RM_PRIVATE);
 	if (!t)
 		return -1;
@@ -3106,24 +3106,24 @@ static int open_signal_image(int type, pid_t pid, unsigned int *nr)
 
 	*nr = 0;
 	while (1) {
-		SiginfoEntry *sie;
+		SiginfoEntry *se;
 
-		ret = pb_read_one_eof(img, &sie, PB_SIGINFO);
+		ret = pb_read_one_eof(img, &se, PB_SIGINFO);
 		if (ret <= 0)
 			break;
-		if (sie->siginfo.len != sizeof(siginfo_t)) {
+		if (se->siginfo.len != sizeof(siginfo_t)) {
 			pr_err("Unknown image format\n");
 			ret = -1;
 			break;
 		}
 
-		ret = signal_to_mem(sie);
+		ret = signal_to_mem(se);
 		if (ret)
 			break;
 
 		(*nr)++;
 
-		siginfo_entry__free_unpacked(sie, NULL);
+		siginfo_entry__free_unpacked(se, NULL);
 	}
 
 	close_image(img);

From bd3a21e0b1734f3b5cc9b858ec8bd6713b1cd9d6 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:10:38 -0700
Subject: [PATCH 1017/1854] test/javaTests: rename ser to s

Codespell thinks it is a misspelled "set", and it looks that way.

Use s.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .../org/criu/java/tests/SocketsConnectServer.java    | 12 ++++++------
 .../src/org/criu/java/tests/SocketsDataServer.java   |  6 +++---
 .../src/org/criu/java/tests/SocketsListenServer.java | 12 ++++++------
 .../org/criu/java/tests/SocketsMultipleServer.java   |  6 +++---
 .../src/org/criu/java/tests/SocketsServer.java       | 10 +++++-----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java b/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
index 1e4cf3aeb..39918cec0 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsConnectServer.java
@@ -55,14 +55,14 @@ class SocketsConnectServer {
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
 			}
 
-			ServerSocket ser = new ServerSocket(port);
+			ServerSocket s = new ServerSocket(port);
 			logger.log(Level.INFO, "Server will be listening on Port: " + port);
 
 			/*
 			 * Timeout after 7 sec if client does not connect
 			 */
 			try {
-				ser.setSoTimeout(7 * 1000);
+				s.setSoTimeout(7 * 1000);
 
 			} catch (SocketException e) {
 				logger.log(Level.SEVERE, "Cannot set timeout!");
@@ -73,14 +73,14 @@ class SocketsConnectServer {
 
 			try {
 				if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
-					ser.close();
+					s.close();
 					System.exit(1);
 				}
 				/*
 				 * Checkpoint when server is listening for connections, and no client has connected to the server.
 				 */
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
-				socket = ser.accept();
+				socket = s.accept();
 				SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
 
 			} catch (Exception e) {
@@ -88,13 +88,13 @@ class SocketsConnectServer {
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 			}
 
-			if (!ser.isBound()) {
+			if (!s.isBound()) {
 				logger.log(Level.SEVERE, "Server is not bound to a port");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
 			}
 
-			if (ser.getLocalPort() != port) {
+			if (s.getLocalPort() != port) {
 				logger.log(Level.SEVERE, "Server is not listening on correct port");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java b/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
index 65fe92a9d..d332b1a1a 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsDataServer.java
@@ -50,14 +50,14 @@ class SocketsDataServer {
 				System.exit(1);
 			}
 
-			ServerSocket ser = new ServerSocket(port);
+			ServerSocket s = new ServerSocket(port);
 			logger.log(Level.INFO, "Server will be listening on Port " + port);
 
 			/*
 			 * Wait for 7 seconds for client to connect, else throw a timeout exception
 			 */
 			try {
-				ser.setSoTimeout(7 * 1000);
+				s.setSoTimeout(7 * 1000);
 
 			} catch (SocketException e) {
 				logger.log(Level.SEVERE, "cannot set timeout");
@@ -70,7 +70,7 @@ class SocketsDataServer {
 			 * begin listening for connections.
 			 */
 			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
-			socket = ser.accept();
+			socket = s.accept();
 			BufferedReader br = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 			PrintStream outstream = new PrintStream(socket.getOutputStream());
 
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java b/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
index 46fef40ec..4384f8b05 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsListenServer.java
@@ -58,13 +58,13 @@ class SocketsListenServer {
 			}
 
 			logger.log(Level.INFO, "Server will be listening on Port " + port);
-			ServerSocket ser = new ServerSocket(port);
+			ServerSocket s = new ServerSocket(port);
 			/*
 			 * Server has bound to a port but is not listening yet!
 			 */
 			logger.log(Level.INFO, "Going to checkpoint");
 			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL || socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_END) {
-				ser.close();
+				s.close();
 				System.exit(1);
 			}
 			/*
@@ -73,13 +73,13 @@ class SocketsListenServer {
 			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
 			SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
 
-			if (!ser.isBound()) {
+			if (!s.isBound()) {
 				logger.log(Level.SEVERE, "Server is not bound to a port");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
 			}
 
-			if (ser.getLocalPort() != port) {
+			if (s.getLocalPort() != port) {
 				logger.log(Level.SEVERE, "SServer is not listening on correct port");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
@@ -88,7 +88,7 @@ class SocketsListenServer {
 			 * Timeout after 5 sec if client does not connect
 			 */
 			try {
-				ser.setSoTimeout(5 * 1000);
+				s.setSoTimeout(5 * 1000);
 
 			} catch (SocketException e) {
 				logger.log(Level.SEVERE, "cannot set timeout");
@@ -102,7 +102,7 @@ class SocketsListenServer {
 				 * will begin listening for connections.
 				 */
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
-				socket = ser.accept();
+				socket = s.accept();
 
 			} catch (Exception e) {
 				logger.log(Level.SEVERE, "Timed out while waiting for client to connect\n" + e);
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java b/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
index a7e4d3b9e..ad54e250b 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsMultipleServer.java
@@ -62,7 +62,7 @@ class SocketsMultipleServer {
 			socketMappedBuffer.putChar(7, Helper.STATE_INIT);
 			socketMappedBuffer.putChar(9, Helper.STATE_INIT);
 
-			ServerSocket ser = new ServerSocket(port);
+			ServerSocket s = new ServerSocket(port);
 			logger.log(Level.INFO, "Server will be listening on Port " + port);
 
 			Socket[] sockets = new Socket[4];
@@ -73,8 +73,8 @@ class SocketsMultipleServer {
 			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
 
 			for (int i = 1; i <= 4; i++) {
-				sockets[i - 1] = ser.accept();
-				ServerThread serverThread = new ServerThread(sockets[i - 1], "ser-socket " + i, 2 * i + 1, logger, socketMappedBuffer);
+				sockets[i - 1] = s.accept();
+				ServerThread serverThread = new ServerThread(sockets[i - 1], "s-socket " + i, 2 * i + 1, logger, socketMappedBuffer);
 				serverThread.start();
 				if (i == 3) {
 					logger.log(Level.INFO, "Connected to client: 3");
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsServer.java b/test/javaTests/src/org/criu/java/tests/SocketsServer.java
index 051233443..dc162cb7d 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsServer.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsServer.java
@@ -54,18 +54,18 @@ class SocketsServer {
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
 			}
 
-			ServerSocket ser = new ServerSocket(port);
+			ServerSocket s = new ServerSocket(port);
 			logger.log(Level.INFO, "Server will be listening on Port " + port);
 
 			/*
 			 * Timeout after 5 second if client does not connect
 			 */
-			ser.setSoTimeout(5 * 1000);
+			s.setSoTimeout(5 * 1000);
 			logger.log(Level.INFO, "Waiting for client to connect");
 			Socket socket = null;
 			try {
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, SocketHelper.STATE_LISTEN);
-				socket = ser.accept();
+				socket = s.accept();
 			} catch (Exception e) {
 				logger.log(Level.SEVERE, "Timed out while waiting for client to connect");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
@@ -90,13 +90,13 @@ class SocketsServer {
 			socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_CHECKPOINT);
 			SocketHelper.socketWaitForRestore(socketMappedBuffer, logger);
 
-			if (!ser.isBound()) {
+			if (!s.isBound()) {
 				logger.log(Level.SEVERE, "Server is not bound to a port");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
 			}
 
-			if (ser.getLocalPort() != port) {
+			if (s.getLocalPort() != port) {
 				logger.log(Level.SEVERE, "Server is not listening on correct port");
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);

From 51837a65eda72ae9fa24a6e0e8e3e7f157112ecc Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:16:21 -0700
Subject: [PATCH 1018/1854] criu/files.c: some renames

Codespell thinks that fo is misspelled of (or for),
and flem is a misspelled phlegm. Rename both.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/files.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/criu/files.c b/criu/files.c
index 93c34108f..9725b8ad1 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -596,13 +596,13 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 int dump_my_file(int lfd, u32 *id, int *type)
 {
 	struct pid me = {};
-	struct fd_opts fo = {};
+	struct fd_opts fdo = {};
 	FdinfoEntry e = FDINFO_ENTRY__INIT;
 
 	me.real = getpid();
 	me.ns[0].virt = -1; /* FIXME */
 
-	if (dump_one_file(&me, lfd, lfd, &fo, NULL, &e, NULL))
+	if (dump_one_file(&me, lfd, lfd, &fdo, NULL, &e, NULL))
 		return -1;
 
 	*id = e.id;
@@ -1127,11 +1127,11 @@ int setup_and_serve_out(struct fdinfo_list_entry *fle, int new_fd)
 static int open_fd(struct fdinfo_list_entry *fle)
 {
 	struct file_desc *d = fle->desc;
-	struct fdinfo_list_entry *flem;
+	struct fdinfo_list_entry *fle_m;
 	int new_fd = -1, ret;
 
-	flem = file_master(d);
-	if (fle != flem) {
+	fle_m = file_master(d);
+	if (fle != fle_m) {
 		BUG_ON(fle->stage != FLE_INITIALIZED);
 		ret = receive_fd(fle);
 		if (ret != 0)

From c4bdde21387ab3897cf4b3e1dd00beda7382ebbe Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:18:15 -0700
Subject: [PATCH 1019/1854] criu/mount.c: separate \t

Codespell thinks that tThe is a typo. Fix it by separating "\t"
which also includes readability (a bit).

[v2: run via make indent]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/mount.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 65e186af9..115e3d067 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -996,8 +996,9 @@ static void __search_bindmounts(struct mount_info *mi)
 		if (mounts_sb_equal(mi, t)) {
 			list_add(&t->mnt_bind, &mi->mnt_bind);
 			t->mnt_bind_is_populated = true;
-			pr_debug("\tThe mount %3d is bind for %3d (@%s -> @%s)\n", t->mnt_id, mi->mnt_id,
-				 t->ns_mountpoint, mi->ns_mountpoint);
+			pr_debug("\t"
+				 "The mount %3d is bind for %3d (@%s -> @%s)\n",
+				 t->mnt_id, mi->mnt_id, t->ns_mountpoint, mi->ns_mountpoint);
 		}
 	}
 
@@ -1056,8 +1057,9 @@ static int resolve_shared_mounts(struct mount_info *info)
 			if (t == m)
 				continue;
 			if (need_master && t->shared_id == m->master_id) {
-				pr_debug("\tThe mount %3d is slave for %3d (@%s -> @%s)\n", m->mnt_id, t->mnt_id,
-					 m->ns_mountpoint, t->ns_mountpoint);
+				pr_debug("\t"
+					 "The mount %3d is slave for %3d (@%s -> @%s)\n",
+					 m->mnt_id, t->mnt_id, m->ns_mountpoint, t->ns_mountpoint);
 				list_add(&m->mnt_slave, &t->mnt_slave_list);
 				m->mnt_master = t;
 				need_master = false;
@@ -1065,8 +1067,9 @@ static int resolve_shared_mounts(struct mount_info *info)
 
 			/* Collect all mounts from this group */
 			if (need_share && t->shared_id == m->shared_id) {
-				pr_debug("\tMount %3d is shared with %3d group %3d (@%s -> @%s)\n", m->mnt_id,
-					 t->mnt_id, m->shared_id, t->ns_mountpoint, m->ns_mountpoint);
+				pr_debug("\t"
+					 "Mount %3d is shared with %3d group %3d (@%s -> @%s)\n",
+					 m->mnt_id, t->mnt_id, m->shared_id, t->ns_mountpoint, m->ns_mountpoint);
 				list_add(&t->mnt_share, &m->mnt_share);
 			}
 		}
@@ -3295,7 +3298,9 @@ static int collect_mnt_from_image(struct mount_info **head, struct mount_info **
 		if (get_mp_mountpoint(me->mountpoint, pm, root, root_len))
 			goto err;
 
-		pr_debug("\tRead %d mp @ %s\n", pm->mnt_id, pm->ns_mountpoint);
+		pr_debug("\t"
+			 "Read %d mp @ %s\n",
+			 pm->mnt_id, pm->ns_mountpoint);
 	}
 
 	if (me)

From 2a60b4974cc2cd1d2bd567030568f5721bd5cde3 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:22:22 -0700
Subject: [PATCH 1020/1854] Rename useable to usable

I am not sure if this is going to bring any compatibility issues.
If yes, we need to remove this patch and add "useable" to the list of
ignored words instead.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 compel/arch/x86/plugins/include/asm/syscall-types.h | 2 +-
 criu/arch/x86/include/asm/dump.h                    | 2 +-
 criu/arch/x86/include/asm/restore.h                 | 2 +-
 images/core-x86.proto                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compel/arch/x86/plugins/include/asm/syscall-types.h b/compel/arch/x86/plugins/include/asm/syscall-types.h
index 101d1eb6e..6987aad16 100644
--- a/compel/arch/x86/plugins/include/asm/syscall-types.h
+++ b/compel/arch/x86/plugins/include/asm/syscall-types.h
@@ -53,7 +53,7 @@ typedef struct {
 	unsigned int read_exec_only : 1;
 	unsigned int limit_in_pages : 1;
 	unsigned int seg_not_present : 1;
-	unsigned int useable : 1;
+	unsigned int usable : 1;
 	unsigned int lm : 1;
 } user_desc_t;
 
diff --git a/criu/arch/x86/include/asm/dump.h b/criu/arch/x86/include/asm/dump.h
index 03715e003..192f6bd02 100644
--- a/criu/arch/x86/include/asm/dump.h
+++ b/criu/arch/x86/include/asm/dump.h
@@ -25,7 +25,7 @@ static inline void core_put_tls(CoreEntry *core, tls_t tls)
 		COPY_TLS(read_exec_only);
 		COPY_TLS(limit_in_pages);
 		COPY_TLS(seg_not_present);
-		COPY_TLS(useable);
+		COPY_TLS(usable);
 #undef COPY_TLS
 	}
 }
diff --git a/criu/arch/x86/include/asm/restore.h b/criu/arch/x86/include/asm/restore.h
index 7cb725d98..addf716a4 100644
--- a/criu/arch/x86/include/asm/restore.h
+++ b/criu/arch/x86/include/asm/restore.h
@@ -49,7 +49,7 @@ static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 		COPY_TLS(read_exec_only);
 		COPY_TLS(limit_in_pages);
 		COPY_TLS(seg_not_present);
-		COPY_TLS(useable);
+		COPY_TLS(usable);
 #undef COPY_TLS
 	}
 }
diff --git a/images/core-x86.proto b/images/core-x86.proto
index ee7be8ff1..77932ab42 100644
--- a/images/core-x86.proto
+++ b/images/core-x86.proto
@@ -99,7 +99,7 @@ message user_desc_t {
 	required bool			read_exec_only	=  7 [default = true];
 	required bool			limit_in_pages	=  8;
 	required bool			seg_not_present	=  9 [default = true];
-	required bool			useable		= 10;
+	required bool			usable		= 10;
 }
 
 message thread_info_x86 {

From fab46c31000499d8ba30939c33fd66dcddde8dee Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:32:18 -0700
Subject: [PATCH 1021/1854] test/exhaustive/unix.py: rename a var

Codespell thinks that froms is misspelled forms. Indeed it looks ugly.

Rename to from_set.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/exhaustive/unix.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/exhaustive/unix.py b/test/exhaustive/unix.py
index 114bf957b..3bf52ee7f 100755
--- a/test/exhaustive/unix.py
+++ b/test/exhaustive/unix.py
@@ -356,11 +356,11 @@ class sock:
                 i_dsc += sock.name_of(psk)
             dsc += '-I%s' % i_dsc
         if self.inqueue:
-            froms = set()
+            from_set = set()
             for m in self.inqueue:
-                froms.add(m[0])
+                from_set.add(m[0])
             q_dsc = ''
-            for f in froms:
+            for f in from_set:
                 fsk = st.get_socket(f, True)
                 q_dsc += sock.name_of(fsk)
             dsc += '-M%s' % q_dsc

From f16976c033c8e1561acab7dfa48c98cb444a8109 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:41:00 -0700
Subject: [PATCH 1022/1854] test/zdtm.py: rename a var

Codespell thinks that pres is a misspelled pres.

Rename to pre.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/zdtm.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index a8704b3d7..5b6b71f57 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1556,8 +1556,8 @@ def cr(cr_api, test, opts):
 
     iters = iter_parm(opts['iters'], 1)
     for i in iters[0]:
-        pres = iter_parm(opts['pre'], 0)
-        for p in pres[0]:
+        pre = iter_parm(opts['pre'], 0)
+        for p in pre[0]:
             if opts['snaps']:
                 sbs('before snap %d' % p)
                 cr_api.dump("dump", opts=["--leave-running", "--track-mem"])
@@ -1566,7 +1566,7 @@ def cr(cr_api, test, opts):
                 cr_api.dump("pre-dump")
                 try_run_hook(test, ["--post-pre-dump"])
                 test.pre_dump_notify()
-            time.sleep(pres[1])
+            time.sleep(pre[1])
 
         sbs('before dump')
 

From 3f180047783486c003609328af584b060d3c545c Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:44:33 -0700
Subject: [PATCH 1023/1854] Add .codespellrc

List words and directories to be ignored.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .codespellrc | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .codespellrc

diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 000000000..765dacfab
--- /dev/null
+++ b/.codespellrc
@@ -0,0 +1,3 @@
+[codespell]
+skip = ./.git,./test/pki
+ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng

From 0194ed392ffe4e936dca031fbecafa417d218eec Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:45:16 -0700
Subject: [PATCH 1024/1854] Fix some codespell warnings

Brought to you by

	codespell -w

(using codespell v2.1.0).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Documentation/compel.txt                           |  2 +-
 Documentation/criu.txt                             |  2 +-
 MAINTAINERS_GUIDE.md                               |  2 +-
 compel/arch/x86/src/lib/cpu.c                      |  2 +-
 compel/arch/x86/src/lib/include/uapi/asm/fpu.h     |  2 +-
 compel/arch/x86/src/lib/infect.c                   |  2 +-
 compel/include/uapi/infect.h                       |  2 +-
 compel/src/lib/handle-elf.c                        |  2 +-
 compel/src/lib/infect.c                            |  8 ++++----
 coredump/criu_coredump/coredump.py                 |  2 +-
 criu/apparmor.c                                    |  2 +-
 criu/arch/s390/crtools.c                           |  2 +-
 criu/config.c                                      |  2 +-
 criu/cr-dump.c                                     |  4 ++--
 criu/cr-restore.c                                  |  2 +-
 criu/eventpoll.c                                   |  2 +-
 criu/files-reg.c                                   | 10 +++++-----
 criu/fsnotify.c                                    |  2 +-
 criu/include/mount-v2.h                            |  4 ++--
 criu/include/mount.h                               |  2 +-
 criu/kerndat.c                                     |  6 +++---
 criu/libnetlink.c                                  |  2 +-
 criu/mount-v2.c                                    | 14 +++++++-------
 criu/namespaces.c                                  |  2 +-
 criu/net.c                                         |  2 +-
 criu/page-xfer.c                                   |  2 +-
 criu/path.c                                        |  2 +-
 criu/pie/parasite.c                                |  2 +-
 criu/pie/restorer.c                                |  6 +++---
 criu/pstree.c                                      |  2 +-
 criu/tls.c                                         |  2 +-
 criu/tty.c                                         |  2 +-
 criu/tun.c                                         |  2 +-
 criu/uffd.c                                        |  2 +-
 criu/util.c                                        |  2 +-
 images/core-ppc64.proto                            |  4 ++--
 images/core-x86.proto                              |  2 +-
 images/opts.proto                                  |  2 +-
 include/common/arch/ppc64/asm/linkage.h            |  2 +-
 include/common/lock.h                              |  2 +-
 include/common/scm-code.c                          |  2 +-
 lib/c/criu.h                                       |  2 +-
 lib/py/images/images.py                            |  2 +-
 lib/py/images/pb2dict.py                           |  2 +-
 plugins/amdgpu/README.md                           |  2 +-
 plugins/amdgpu/amdgpu_plugin_topology.c            |  2 +-
 scripts/ci/run-ci-tests.sh                         |  2 +-
 scripts/nmk/scripts/macro.mk                       |  2 +-
 scripts/nmk/scripts/msg.mk                         |  2 +-
 scripts/systemd-autofs-restart.sh                  |  4 ++--
 soccr/soccr.c                                      |  8 ++++----
 soccr/soccr.h                                      |  4 ++--
 test/exhaustive/unix.py                            |  2 +-
 .../javaTests/src/org/criu/java/tests/Sockets.java |  2 +-
 .../src/org/criu/java/tests/SocketsClient.java     |  2 +-
 .../src/org/criu/java/tests/SocketsConnect.java    |  4 ++--
 .../org/criu/java/tests/SocketsConnectClient.java  |  4 ++--
 .../src/org/criu/java/tests/SocketsData.java       |  4 ++--
 .../src/org/criu/java/tests/SocketsDataClient.java |  4 ++--
 .../src/org/criu/java/tests/SocketsListen.java     |  4 ++--
 .../org/criu/java/tests/SocketsListenClient.java   |  4 ++--
 .../src/org/criu/java/tests/SocketsMultiple.java   |  4 ++--
 .../org/criu/java/tests/SocketsMultipleClient.java |  2 +-
 test/others/app-emu/job/job.c                      |  6 +++---
 test/others/bers/bers.txt                          |  2 +-
 test/others/ns_ext/run_pidns.sh                    |  2 +-
 test/others/rpc/errno.py                           |  2 +-
 test/others/rpc/test-c.c                           |  2 +-
 test/zdtm.py                                       |  2 +-
 test/zdtm/static/conntracks                        |  6 +++---
 test/zdtm/static/file_append.c                     |  2 +-
 test/zdtm/static/mnt_ext_collision.c               |  2 +-
 test/zdtm/static/mntns_pivot_root.c                |  2 +-
 test/zdtm/static/netns_lock_iptables.hook          |  2 +-
 test/zdtm/static/pipe00.c                          |  4 ++--
 test/zdtm/static/pty03.c                           |  4 ++--
 test/zdtm/static/pty04.c                           |  2 +-
 test/zdtm/static/route_rules                       |  4 ++--
 test/zdtm/static/session01.c                       |  4 ++--
 test/zdtm/static/sigtrap.c                         |  2 +-
 test/zdtm/static/sock_opts02.c                     |  4 ++--
 test/zdtm/static/socket-tcp-reseted.c              |  2 +-
 test/zdtm/static/vdso02.c                          |  2 +-
 83 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/Documentation/compel.txt b/Documentation/compel.txt
index 6ccd20861..a44ca22c6 100644
--- a/Documentation/compel.txt
+++ b/Documentation/compel.txt
@@ -90,7 +90,7 @@ The parasitic code is compiled and converted to a header using *compel*, and inc
 
 *#include "parasite.h"*
 
-Following steps are perfomed to infect the victim process:
+Following steps are performed to infect the victim process:
 
     - stop the task: *int compel_stop_task(int pid);*
     - prepare infection handler: *struct parasite_ctl *compel_prepare(int pid);*
diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 57b791138..8b128f63e 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -106,7 +106,7 @@ be restored with *mount(src, mountpoint, flags, options)*. When used,
 *dump* is expected to always succeed if a mountpoint is to be
 auto-detected, however *restore* may fail (or do something wrong)
 if the assumption for restore logic is incorrect. This option is
-not compatable with *--external* *dev*.
+not compatible with *--external* *dev*.
 
 *--action-script* 'script'::
     Add an external action script to be executed at certain stages.
diff --git a/MAINTAINERS_GUIDE.md b/MAINTAINERS_GUIDE.md
index 2830a3caa..5de8e6cb6 100644
--- a/MAINTAINERS_GUIDE.md
+++ b/MAINTAINERS_GUIDE.md
@@ -103,7 +103,7 @@ architecture changes should be reviewed by the chief maintainer.
 Also the chief maintainer has the veto power on any change submitted
 to any branch. Naturally, a change in the criu-dev branch can be reverted
 after a chief maintainer veto, a change in the master branch must be
-carefully reviwed by the chief maintainer and vetoed in advance.
+carefully reviewed by the chief maintainer and vetoed in advance.
 
 ### How are maintainers added (and removed)?
 
diff --git a/compel/arch/x86/src/lib/cpu.c b/compel/arch/x86/src/lib/cpu.c
index 5ca794ea0..f57fb3152 100644
--- a/compel/arch/x86/src/lib/cpu.c
+++ b/compel/arch/x86/src/lib/cpu.c
@@ -140,7 +140,7 @@ static int compel_fpuid(compel_cpuinfo_t *c)
 	memset(c->xstate_comp_offsets, 0xff, sizeof(c->xstate_comp_offsets));
 	memset(c->xstate_comp_sizes, 0xff, sizeof(c->xstate_comp_sizes));
 
-	/* start at the beginnning of the "extended state" */
+	/* start at the beginning of the "extended state" */
 	last_good_offset = offsetof(struct xsave_struct, extended_state_area);
 
 	/*
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index c8ebda097..bd3b0cbd5 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -269,7 +269,7 @@ struct xsave_struct_ia32 {
 
 typedef struct {
 	/*
-	 * The FPU xsave area must be continious and FP_MIN_ALIGN_BYTES
+	 * The FPU xsave area must be continuous and FP_MIN_ALIGN_BYTES
 	 * aligned, thus make sure the compiler won't insert any hole here.
 	 */
 
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 0d3e9e9a0..d7865796e 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -360,7 +360,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 
 	/*
 	 * FPU fetched either via fxsave or via xsave,
-	 * thus decode it accrodingly.
+	 * thus decode it accordingly.
 	 */
 
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 7fa0bd8a0..1e1fa66a3 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -108,7 +108,7 @@ struct infect_ctx {
 	unsigned long syscall_ip; /* entry point of infection */
 	unsigned long flags;	  /* fine-tune (e.g. faults) */
 
-	void (*child_handler)(int, siginfo_t *, void *); /* hander for SIGCHLD deaths */
+	void (*child_handler)(int, siginfo_t *, void *); /* handler for SIGCHLD deaths */
 	struct sigaction orig_handler;
 
 	open_proc_fn open_proc;
diff --git a/compel/src/lib/handle-elf.c b/compel/src/lib/handle-elf.c
index 22c8f2978..e4b8728ce 100644
--- a/compel/src/lib/handle-elf.c
+++ b/compel/src/lib/handle-elf.c
@@ -614,7 +614,7 @@ int __handle_elf(void *mem, size_t size)
 #ifdef ELF_S390
 			/*
 			 * See also arch/s390/kernel/module.c/apply_rela():
-			 * A PLT reads the GOT (global offest table). We can handle it like
+			 * A PLT reads the GOT (global offset table). We can handle it like
 			 * R_390_PC32DBL because we have linked statically.
 			 */
 			case R_390_PLT32DBL: /* PC relative on a PLT (predure link table) */
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 78e4d7e0e..9552a7186 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -456,8 +456,8 @@ static int parasite_run(pid_t pid, int cmd, unsigned long ip, void *stack, user_
 
 	ksigfillset(&block);
 	/*
-	 * FIXME(issues/1429): SIGTRAP can't be blocked, otherwice its hanlder
-	 * will be reseted to the default one.
+	 * FIXME(issues/1429): SIGTRAP can't be blocked, otherwise its handler
+	 * will be reset to the default one.
 	 */
 	ksigdelset(&block, SIGTRAP);
 	if (ptrace(PTRACE_SETSIGMASK, pid, sizeof(k_rtsigset_t), &block)) {
@@ -956,7 +956,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 	ctl->args_size = args_size;
 	parasite_size += ctl->args_size;
 
-	/* RESTORE_STACK_SIGFRAME needs a 64 bytes alignement */
+	/* RESTORE_STACK_SIGFRAME needs a 64 bytes alignment */
 	parasite_size = round_up(parasite_size, 64);
 
 	map_exchange_size = parasite_size;
@@ -1476,7 +1476,7 @@ int compel_run_in_thread(struct parasite_thread_ctl *tctl, unsigned int cmd)
 
 /*
  * compel_unmap() is used for unmapping parasite and restorer blobs.
- * A blob can contain code for unmapping itself, so the porcess is
+ * A blob can contain code for unmapping itself, so the process is
  * trapped on the exit from the munmap syscall.
  */
 int compel_unmap(struct parasite_ctl *ctl, unsigned long addr)
diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 881c40b0a..53b143ec0 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -728,7 +728,7 @@ class coredump_generator:
 
             if page_mem is not None:
                 # Page from pages.img has higher priority
-                # than one from maped file on disk.
+                # than one from mapped file on disk.
                 page = page_mem
 
             if page is None:
diff --git a/criu/apparmor.c b/criu/apparmor.c
index cc9e7ac2a..67553c8f1 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -35,7 +35,7 @@
  * Thus, the old code that saves and restores AA profiles is still relevant, we
  * just need to add the new code in this file to walk the namespace and dump
  * any blobs in that AA namespace, and then restore these blobs on restore so
- * that the profiles the old code tries to use are actualy present.
+ * that the profiles the old code tries to use are actually present.
  */
 
 static AaNamespace **namespaces = NULL;
diff --git a/criu/arch/s390/crtools.c b/criu/arch/s390/crtools.c
index b22b64e2b..5cf160d82 100644
--- a/criu/arch/s390/crtools.c
+++ b/criu/arch/s390/crtools.c
@@ -234,7 +234,7 @@ fail_free_gs_cb:
 }
 
 /*
- * Free Guareded Storage control blocks
+ * Free Guarded Storage control blocks
  */
 static void free_gs_cb(UserS390GsCbEntry *gs_cb)
 {
diff --git a/criu/config.c b/criu/config.c
index 28641cf0c..14a11f9c3 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -1073,7 +1073,7 @@ int check_options(void)
 	if (opts.link_remap_ok)
 		pr_info("Will allow link remaps on FS\n");
 	if (opts.weak_sysctls)
-		pr_info("Will skip non-existant sysctls on restore\n");
+		pr_info("Will skip non-existent sysctls on restore\n");
 
 	if (opts.deprecated_ok)
 		pr_info("Turn deprecated stuff ON\n");
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index eb1fb5e9a..c6678b450 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1026,7 +1026,7 @@ static int dump_task_threads(struct parasite_ctl *parasite_ctl, const struct pst
  * What this routine does is just reads pid-s of dead
  * tasks in item's children list from item's ns proc.
  *
- * It does *not* find wihch real pid corresponds to
+ * It does *not* find which real pid corresponds to
  * which virtual one, but it's not required -- all we
  * need to dump for zombie can be found in the same
  * ns proc.
@@ -1472,7 +1472,7 @@ static void alarm_handler(int signo)
 	pr_err("Timeout reached. Try to interrupt: %d\n", alarm_attempts);
 	if (alarm_attempts++ < 5) {
 		alarm(1);
-		/* A curren syscall will be exited with EINTR */
+		/* A current syscall will be exited with EINTR */
 		return;
 	}
 	pr_err("FATAL: Unable to interrupt the current operation\n");
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 95fe96152..a398927ad 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2061,7 +2061,7 @@ static int finalize_restore_detach(void)
 		for (i = 0; i < item->nr_threads; i++) {
 			pid = item->threads[i].real;
 			if (pid < 0) {
-				pr_err("pstree item has unvalid pid %d\n", pid);
+				pr_err("pstree item has invalid pid %d\n", pid);
 				continue;
 			}
 
diff --git a/criu/eventpoll.c b/criu/eventpoll.c
index 978dca5be..ca5ee9c59 100644
--- a/criu/eventpoll.c
+++ b/criu/eventpoll.c
@@ -308,7 +308,7 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
 	 * files is tricky: we need to use kcmp
 	 * to find out where file came from. Until
 	 * it's implemented lets use simpler approach
-	 * just check the targets are blonging to the
+	 * just check the targets are belonging to the
 	 * pid's file set.
 	 */
 	if (p->dfds) {
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 6aaa4c9aa..0249063c2 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1400,7 +1400,7 @@ static int get_build_id_32(Elf32_Ehdr *file_header, unsigned char **build_id, co
 		return -1;
 
 	/*
-	 * If the file doesn't have atleast 1 program header entry, it definitely can't
+	 * If the file doesn't have at least 1 program header entry, it definitely can't
 	 * have a build-id.
 	 */
 	if (!file_header->e_phnum) {
@@ -1490,7 +1490,7 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id, co
 		return -1;
 
 	/*
-	 * If the file doesn't have atleast 1 program header entry, it definitely can't
+	 * If the file doesn't have at least 1 program header entry, it definitely can't
 	 * have a build-id.
 	 */
 	if (!file_header->e_phnum) {
@@ -1621,7 +1621,7 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd, const stru
 	int fd;
 
 	/*
-	 * Checks whether the file is atleast big enough to try and read the first
+	 * Checks whether the file is at least big enough to try and read the first
 	 * four (SELFMAG) bytes which should correspond to the ELF magic number
 	 * and the next byte which indicates whether the file is 32-bit or 64-bit.
 	 */
@@ -1659,7 +1659,7 @@ static int store_validation_data_build_id(RegFileEntry *rfe, int lfd, const stru
  * This routine stores metadata about the open file (File size, build-id, CRC32C checksum)
  * so that validation can be done while restoring to make sure that the right file is
  * being restored.
- * Returns true if atleast some metadata was stored, if there was an error it returns false.
+ * Returns true if at least some metadata was stored, if there was an error it returns false.
  */
 static bool store_validation_data(RegFileEntry *rfe, const struct fd_parms *p, int lfd)
 {
@@ -2008,7 +2008,7 @@ static int rfi_remap(struct reg_file_info *rfi, int *level)
 	BUG_ON(tmi->s_dev != rmi->s_dev);
 	BUG_ON(tmi->s_dev != mi->s_dev);
 
-	/* Calcalate paths on the device (root mount) */
+	/* Calculate paths on the device (root mount) */
 	convert_path_from_another_mp(rfi->path, path, sizeof(_path), mi, tmi);
 	convert_path_from_another_mp(rfi->remap->rpath, rpath, sizeof(_rpath), rmi, tmi);
 
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index fd2e8d84e..03711f0b2 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -514,7 +514,7 @@ static char *get_mark_path(const char *who, struct file_remap *remap, FhEntry *f
 	/*
 	 * fanotify/inotify open syscalls want path to attach
 	 * watch to. But the only thing we have is an FD obtained
-	 * via fhandle. Fortunatelly, when trying to attach the
+	 * via fhandle. Fortunately, when trying to attach the
 	 * /proc/pid/fd/ link, we will watch the inode the link
 	 * points to, i.e. -- just what we want.
 	 */
diff --git a/criu/include/mount-v2.h b/criu/include/mount-v2.h
index 2f2812221..096f08f3b 100644
--- a/criu/include/mount-v2.h
+++ b/criu/include/mount-v2.h
@@ -71,7 +71,7 @@ struct sharing_group {
 	struct list_head mnt_list;
 
 	/*
-	 * List of dependant shared groups:
+	 * List of dependent shared groups:
 	 * - all siblings have equal master_id
 	 * - the parent has shared_id equal to children's master_id
 	 *
@@ -79,7 +79,7 @@ struct sharing_group {
 	 * parent sharing_group in list or only siblings.
 	 * So for traversal if parent pointer is set we can do:
 	 *   list_for_each_entry(t, &sg->parent->children, siblings)
-	 * and overvise we can do:
+	 * and otherwise we can do:
 	 *   list_for_each_entry(t, &sg->siblings, siblings)
 	 */
 	struct list_head children;
diff --git a/criu/include/mount.h b/criu/include/mount.h
index 4d2d64470..6587c63b2 100644
--- a/criu/include/mount.h
+++ b/criu/include/mount.h
@@ -15,7 +15,7 @@ struct ns_id;
 /*
  * Here are a set of flags which we know how to handle for the one mount call.
  * All of them except MS_RDONLY are set only as mnt flags.
- * MS_RDONLY is set for both mnt ans sb flags, so we can restore it for one
+ * MS_RDONLY is set for both mnt and sb flags, so we can restore it for one
  * mount call only if it set for both masks.
  */
 #define MS_MNT_KNOWN_FLAGS (MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_NOATIME | MS_NODIRATIME | MS_RELATIME | MS_RDONLY)
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 93617012a..ec2d62ab0 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -756,14 +756,14 @@ static int kerndat_detect_stack_guard_gap(void)
 
 		/*
 		 * When reading /proc/$pid/[s]maps the
-		 * start/end addresses might be cutted off
+		 * start/end addresses might be cut off
 		 * with PAGE_SIZE on kernels prior 4.12
 		 * (see kernel commit 1be7107fbe18ee).
 		 *
 		 * Same time there was semi-complete
 		 * patch released which hitted a number
 		 * of repos (Ubuntu, Fedora) where instead
-		 * of PAGE_SIZE the 1M gap is cutted off.
+		 * of PAGE_SIZE the 1M gap is cut off.
 		 */
 		if (start == (unsigned long)mem) {
 			kdat.stack_guard_gap_hidden = false;
@@ -1111,7 +1111,7 @@ static int kerndat_uffd(void)
 		if (err == ENOSYS)
 			return 0;
 		if (err == EPERM) {
-			pr_info("Lazy pages are not permited\n");
+			pr_info("Lazy pages are not permitted\n");
 			return 0;
 		}
 		pr_err("Lazy pages are not available\n");
diff --git a/criu/libnetlink.c b/criu/libnetlink.c
index 6dad7551a..f0304b0db 100644
--- a/criu/libnetlink.c
+++ b/criu/libnetlink.c
@@ -45,7 +45,7 @@ static int nlmsg_receive(char *buf, int len, int (*cb)(struct nlmsghdr *, struct
 }
 
 /*
- * Default errror handler: just point our an error
+ * Default error handler: just point our an error
  * and pass up to caller.
  */
 static int rtnl_return_err(int err, struct ns_id *ns, void *arg)
diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index 6772072de..570f78570 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -108,7 +108,7 @@ int resolve_shared_mounts_v2(void)
 	/*
 	 * Collect sharing groups tree. Mount propagation between sharing
 	 * groups only goes down this tree, meaning that only mounts of same or
-	 * descendant sharing groups recieve mount propagation.
+	 * descendant sharing groups receive mount propagation.
 	 */
 	list_for_each_entry(sg, &sharing_groups, list) {
 		if (sg->master_id) {
@@ -270,7 +270,7 @@ static int do_new_mount_v2(struct mount_info *mi)
 	 * Mount-v2 relies that before mount tree is constructed all mounts
 	 * should remain private. Newly created mounts can become non-private
 	 * initially depending on parent/source sharing, let's be as explicit
-	 * as posible here and make it obvious that mount becomes private.
+	 * as possible here and make it obvious that mount becomes private.
 	 */
 	if (mount(NULL, mi->plain_mountpoint, NULL, MS_PRIVATE, NULL)) {
 		pr_perror("Can't remount %s with MS_PRIVATE", mi->plain_mountpoint);
@@ -407,7 +407,7 @@ do_bind:
 	 * Mount-v2 relies that before mount tree is constructed all mounts
 	 * should remain private. Newly created mounts can become non-private
 	 * initially depending on parent/source sharing, let's be as explicit
-	 * as posible here and make it obvious that mount becomes private.
+	 * as possible here and make it obvious that mount becomes private.
 	 */
 	if (mount(NULL, mi->plain_mountpoint, NULL, MS_PRIVATE, NULL)) {
 		pr_perror("Can't remount %s with MS_PRIVATE", mi->plain_mountpoint);
@@ -470,7 +470,7 @@ static int do_mount_root_v2(struct mount_info *mi)
 	 * Mount-v2 relies that before mount tree is constructed all mounts
 	 * should remain private. Newly created mounts can become non-private
 	 * initially depending on parent/source sharing, let's be as explicit
-	 * as posible here and make it obvious that mount becomes private.
+	 * as possible here and make it obvious that mount becomes private.
 	 */
 	if (mount(NULL, mi->plain_mountpoint, NULL, MS_PRIVATE, NULL)) {
 		pr_perror("Can't remount %s with MS_PRIVATE", mi->plain_mountpoint);
@@ -617,7 +617,7 @@ static int detect_is_dir(struct mount_info *mi)
 
 	rel_path = get_relative_path(mi->ns_mountpoint, mi->parent->ns_mountpoint);
 	if (!rel_path) {
-		pr_err("Child-parent mountpoint missmatch %d:%s %d:%s\n", mi->mnt_id, mi->ns_mountpoint,
+		pr_err("Child-parent mountpoint mismatch %d:%s %d:%s\n", mi->mnt_id, mi->ns_mountpoint,
 		       mi->parent->mnt_id, mi->parent->ns_mountpoint);
 		return -1;
 	}
@@ -952,7 +952,7 @@ static int restore_one_sharing_group(struct sharing_group *sg)
 			/*
 			 * External slavery. We rely on the user to give us the
 			 * right source for external mount with all proper
-			 * sharing optioins setup (it should be either shared
+			 * sharing options setup (it should be either shared
 			 * or non-shared slave). If source is a private mount
 			 * we would fail.
 			 */
@@ -1020,7 +1020,7 @@ static int restore_mount_sharing_options(void)
 		if (sg->parent)
 			continue;
 
-		/* Handle dependant sharing groups in tree order */
+		/* Handle dependent sharing groups in tree order */
 		for (t = sg; t != NULL; t = sharing_group_next(t)) {
 			if (restore_one_sharing_group(t))
 				return -1;
diff --git a/criu/namespaces.c b/criu/namespaces.c
index c36e631cf..7356fe8c2 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -891,7 +891,7 @@ int collect_user_ns(struct ns_id *ns, void *oarg)
 {
 	/*
 	 * User namespace is dumped before files to get uid and gid
-	 * mappings, which are used for convirting local id-s to
+	 * mappings, which are used for converting local id-s to
 	 * userns id-s (userns_uid(), userns_gid())
 	 */
 	if (dump_user_ns(root_item->pid->real, root_item->ids->user_ns_id))
diff --git a/criu/net.c b/criu/net.c
index c82054037..550f4e2ee 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2340,7 +2340,7 @@ static int prepare_xtable_lock(void)
 	}
 
 	if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL)) {
-		pr_perror("Unable to conver mounts to slave mounts");
+		pr_perror("Unable to convert mounts to slave mounts");
 		return -1;
 	}
 	/*
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 60c793009..2543a462a 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -606,7 +606,7 @@ static inline u32 ppb_xfer_flags(struct page_xfer *xfer, struct page_pipe_buf *p
  *
  *	Since, iov-C is not processed completely, we need to find
  *	"partial_read_byte" count to place out dummy-iov for
- *	remainig processing of iov-C. This function is performed by
+ *	remaining processing of iov-C. This function is performed by
  *	analyze_iov function.
  *
  *	dummy-iov will be(2): {C+3,1}. dummy-iov will be placed
diff --git a/criu/path.c b/criu/path.c
index 54f5483b9..f9ac6f5ae 100644
--- a/criu/path.c
+++ b/criu/path.c
@@ -49,7 +49,7 @@ char *mnt_get_sibling_path(struct mount_info *m, struct mount_info *p, char *buf
 
 	rpath = get_relative_path(m->ns_mountpoint, pa->ns_mountpoint);
 	if (!rpath) {
-		pr_warn("child - parent mountpoint missmatch %s - %s\n", m->ns_mountpoint, pa->ns_mountpoint);
+		pr_warn("child - parent mountpoint mismatch %s - %s\n", m->ns_mountpoint, pa->ns_mountpoint);
 		return NULL;
 	}
 
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index bc0a33cd4..f84652b8c 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -454,7 +454,7 @@ static int get_proc_fd(void)
 	ret = sys_mount("proc", proc_mountpoint, "proc", MS_MGC_VAL, NULL);
 	if (ret) {
 		if (ret == -EPERM)
-			pr_err("can't dump unpriviliged task whose /proc doesn't belong to it\n");
+			pr_err("can't dump unprivileged task whose /proc doesn't belong to it\n");
 		else
 			pr_err("mount failed (%d)\n", ret);
 		sys_rmdir(proc_mountpoint);
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 3fd0d2c54..422a12ff8 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -720,7 +720,7 @@ static unsigned long restore_mapping(VmaEntry *vma_entry)
 /*
  * This restores aio ring header, content, head and in-kernel position
  * of tail. To set tail, we write to /dev/null and use the fact this
- * operation is synchronious for the device. Also, we unmap temporary
+ * operation is synchronous for the device. Also, we unmap temporary
  * anonymous area, used to store content of ring buffer during restore
  * and mapped in premap_private_vma().
  */
@@ -1329,7 +1329,7 @@ static int cleanup_inotify_events(int inotify_fd)
 
 /*
  * When we restore inotifies we can open and close files we create a watch
- * for. So wee need to cleanup these auxiliary events which we've generated.
+ * for. So we need to cleanup these auxiliary events which we've generated.
  *
  * note: For now we don't have a way to c/r events in queue but we need to
  * at least leave the queue clean from events generated by our own.
@@ -1422,7 +1422,7 @@ long __export_restore_task(struct task_restore_args *args)
 	 * mapping them with arch_prctl().
 	 * Always preserve/map rt-vdso pair if it's possible, regardless
 	 * it's presence in original task: vdso will be used for fast
-	 * getttimeofday() in restorer's log timings.
+	 * gettimeofday() in restorer's log timings.
 	 */
 	if (!args->can_map_vdso && vdso_is_present(&args->vdso_maps_rt)) {
 		/* It's already checked in kdat, but let's check again */
diff --git a/criu/pstree.c b/criu/pstree.c
index d29de730a..0cfbfa923 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -867,7 +867,7 @@ static int prepare_pstree_kobj_ids(void)
 		if (!item->ids) {
 			if (item == root_item) {
 				pr_err("No IDS for root task.\n");
-				pr_err("Images currupted or too old criu was used for dump.\n");
+				pr_err("Images corrupted or too old criu was used for dump.\n");
 				return -1;
 			}
 
diff --git a/criu/tls.c b/criu/tls.c
index 4feaf613b..3d365e21d 100644
--- a/criu/tls.c
+++ b/criu/tls.c
@@ -8,7 +8,7 @@
 #include "cr_options.h"
 #include "xmalloc.h"
 
-/* Compatability with GnuTLS version < 3.5 */
+/* Compatibility with GnuTLS version < 3.5 */
 #ifndef GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR
 #define GNUTLS_E_CERTIFICATE_VERIFICATION_ERROR GNUTLS_E_CERTIFICATE_ERROR
 #endif
diff --git a/criu/tty.c b/criu/tty.c
index 0430dbff7..13f645f3a 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -560,7 +560,7 @@ static int do_open_tty_reg(int ns_root_fd, struct reg_file_info *rfi, void *arg)
 		 * them. So simply setup mode from image
 		 * the regular file engine will check
 		 * for this, so if we fail here it
-		 * gonna be catched anyway.
+		 * gonna be caught anyway.
 		 */
 		if (rfi->rfe->has_mode)
 			fchmod(fd, rfi->rfe->mode);
diff --git a/criu/tun.c b/criu/tun.c
index bc84604b3..573137091 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -272,7 +272,7 @@ static struct tun_link *get_tun_link_fd(char *name, unsigned ns_id, unsigned fla
 	 */
 
 	if (!(flags & IFF_PERSIST)) {
-		pr_err("No fd infor for non persistent tun device %s\n", name);
+		pr_err("No fd info for non persistent tun device %s\n", name);
 		return NULL;
 	}
 
diff --git a/criu/uffd.c b/criu/uffd.c
index b551698f8..e07b21b69 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -59,7 +59,7 @@
 #define LAZY_PAGES_RESTORE_FINISHED 0x52535446 /* ReSTore Finished */
 
 /*
- * Backround transfer parameters.
+ * Background transfer parameters.
  * The default xfer length is arbitrary set to 64Kbytes
  * The limit of 4Mbytes matches the maximal chunk size we can have in
  * a pipe in the page-server
diff --git a/criu/util.c b/criu/util.c
index dd1fd97f5..5c075cd15 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1823,7 +1823,7 @@ void util_init()
 
 /*
  * This function cuts sub_path from the path.
- * 1) It asumes all relative paths given are relative to "/":
+ * 1) It assumes all relative paths given are relative to "/":
  * 	/a/b/c is the same as a/b/c
  * 2) It can handle paths with multiple consequent slashes:
  * 	///a///b///c is the same as /a/b/c
diff --git a/images/core-ppc64.proto b/images/core-ppc64.proto
index 6a27f9012..bb07e09e0 100644
--- a/images/core-ppc64.proto
+++ b/images/core-ppc64.proto
@@ -5,7 +5,7 @@ syntax = "proto2";
 import "opts.proto";
 
 message user_ppc64_regs_entry {
-	/* Following is the list of regiters starting at r0. */
+	/* Following is the list of registers starting at r0. */
 	repeated uint64 gpr		= 1;
 	required uint64 nip		= 2;
 	required uint64 msr		= 3;
@@ -22,7 +22,7 @@ message user_ppc64_regs_entry {
 }
 
 message user_ppc64_fpstate_entry {
-	/* Following is the list of regiters starting at fpr0 */
+	/* Following is the list of registers starting at fpr0 */
 	repeated uint64 fpregs 		= 1;
 }
 
diff --git a/images/core-x86.proto b/images/core-x86.proto
index 77932ab42..815cf21ff 100644
--- a/images/core-x86.proto
+++ b/images/core-x86.proto
@@ -42,7 +42,7 @@ message user_x86_regs_entry {
 }
 
 message user_x86_xsave_entry {
-	/* standart xsave features */
+	/* standard xsave features */
 	required uint64			xstate_bv	=  1;
 
 	/* AVX components: 16x 256-bit ymm registers, hi 128 bits */
diff --git a/images/opts.proto b/images/opts.proto
index 95304a8c6..d730673a2 100644
--- a/images/opts.proto
+++ b/images/opts.proto
@@ -5,7 +5,7 @@ syntax = "proto2";
 import "google/protobuf/descriptor.proto";
 
 message CRIU_Opts {
-	optional bool hex = 1; // Idicate that CRIT should treat this field as hex.
+	optional bool hex = 1; // Indicate that CRIT should treat this field as hex.
 	optional bool ipadd = 2; // The field is IPv4/v6 address
 	optional string flags = 3;
 	optional bool dev = 4; // Device major:minor packed
diff --git a/include/common/arch/ppc64/asm/linkage.h b/include/common/arch/ppc64/asm/linkage.h
index 8e388c105..983f10071 100644
--- a/include/common/arch/ppc64/asm/linkage.h
+++ b/include/common/arch/ppc64/asm/linkage.h
@@ -43,7 +43,7 @@
  *
  * The lower case r0-r31 should be used in preference to the upper
  * case R0-R31 as they provide more error checking in the assembler.
- * Use R0-31 only when really nessesary.
+ * Use R0-31 only when really necessary.
  */
 
 /* clang-format off */
diff --git a/include/common/lock.h b/include/common/lock.h
index 4fbe42c63..ccfa468b8 100644
--- a/include/common/lock.h
+++ b/include/common/lock.h
@@ -9,7 +9,7 @@
 #include "common/asm/atomic.h"
 #include "common/compiler.h"
 
-/* scan-build complains about derefencing a NULL pointer here. */
+/* scan-build complains about dereferencing a NULL pointer here. */
 #ifndef __clang_analyzer__
 #define LOCK_BUG_ON(condition) \
 	if ((condition))       \
diff --git a/include/common/scm-code.c b/include/common/scm-code.c
index d7d732587..de581846b 100644
--- a/include/common/scm-code.c
+++ b/include/common/scm-code.c
@@ -96,7 +96,7 @@ int __recv_fds(int sock, int *fds, int nr_fds, void *data, unsigned ch_size, int
 		min_fd = (cmsg->cmsg_len - sizeof(struct cmsghdr)) / sizeof(int);
 		/*
 		 * In case if kernel screwed the recipient, most probably
-		 * the caller stack frame will be overwriten, just scream
+		 * the caller stack frame will be overwritten, just scream
 		 * and exit.
 		 *
 		 * FIXME Need to sanitize util.h to be able to include it
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 40e3106fc..7cc6a199c 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -187,7 +187,7 @@ int criu_dump_iters(int (*more)(criu_predump_info pi));
  * As this library is just forwarding all tasks to an
  * independent (of this library) CRIU binary, the actual
  * version of the CRIU binary can be different then the
- * hardcoded values in the libary (version.h).
+ * hardcoded values in the library (version.h).
  * To be able to easily check the version of the CRIU binary
  * the function criu_get_version() returns the version
  * in the following format:
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index 300b1cc69..eda030a5c 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -87,7 +87,7 @@ class entry_handler:
     def load(self, f, pretty=False, no_payload=False):
         """
         Convert criu image entries from binary format to dict(json).
-        Takes a file-like object and returnes a list with entries in
+        Takes a file-like object and returns a list with entries in
         dict(json) format.
         """
         entries = []
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index cfaff6c7d..9d581c375 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -23,7 +23,7 @@ if "encodebytes" not in dir(base64):
 # here are some of them:
 #   - both have a common bug in treating optional field with empty
 #     repeated inside.
-#   - protobuf-to-json is not avalible in pip or in any other python
+#   - protobuf-to-json is not available in pip or in any other python
 #     repo, so it is hard to distribute and we can't rely on it.
 #   - both do not treat enums in a way we would like to. They convert
 #     protobuf enum to int, but we need a string here, because it is
diff --git a/plugins/amdgpu/README.md b/plugins/amdgpu/README.md
index 030029e7a..6809ec8b9 100644
--- a/plugins/amdgpu/README.md
+++ b/plugins/amdgpu/README.md
@@ -266,7 +266,7 @@ Mesa | Open source OpenGL implementation
 GTT | Graphis Translation Table, also used to denote kernel-managed system memory for GPU access
 VRAM | Video RAM
 BO | Buffer Object
-HMM | Heterogenous Memory Management
+HMM | Heterogeneous Memory Management
 AQL | Architected Queueing Language
 EOP | End of pipe (event indicating shader dispatch completion)
 MQD | Memory Queue Descriptors
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 1a6ed059f..42689933e 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -64,7 +64,7 @@ bool kfd_capability_check = true;
 /*
  * During dump, we can use any fd value so fd_next is always -1.
  * During restore, we have to use a fd value that does not conflict with fd values in use by the target restore process.
- * fd_next is initialized as 1 greather than the highest-numbered file descriptor used by the target restore process.
+ * fd_next is initialized as 1 greater than the highest-numbered file descriptor used by the target restore process.
  */
 int fd_next = -1;
 
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 14e6b1224..0eb065143 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -19,7 +19,7 @@ if [ "$UNAME_M" != "x86_64" ]; then
 
 	# But with the introduction of baremetal aarch64 systems in
 	# Travis (arch: arm64-graviton2) we can override this using
-	# an evironment variable
+	# an environment variable
 	[ -n "$RUN_TESTS" ] || SKIP_CI_TEST=1
 fi
 
diff --git a/scripts/nmk/scripts/macro.mk b/scripts/nmk/scripts/macro.mk
index b36d5b26a..1dcbbd6ec 100644
--- a/scripts/nmk/scripts/macro.mk
+++ b/scripts/nmk/scripts/macro.mk
@@ -10,7 +10,7 @@ define include-once
 endef
 
 # Helper to build built-in target in directory.
-# $(eval $(call gen-built-in,<dir>,<prerequsite>,<phony>))
+# $(eval $(call gen-built-in,<dir>,<prerequisite>,<phony>))
 define gen-built-in
 $(1)/%: $(2)
 	$$(Q) $$(MAKE) $$(build)=$(1) $$@
diff --git a/scripts/nmk/scripts/msg.mk b/scripts/nmk/scripts/msg.mk
index d07f21607..38fd3cb7e 100644
--- a/scripts/nmk/scripts/msg.mk
+++ b/scripts/nmk/scripts/msg.mk
@@ -59,7 +59,7 @@ define newline
 
 endef
 
-# map funciton:
+# map function:
 # $1 - func to call
 # $2 - list over which map the $1 func
 # result is divided with newlines
diff --git a/scripts/systemd-autofs-restart.sh b/scripts/systemd-autofs-restart.sh
index 4d2be1c10..b35adc94f 100755
--- a/scripts/systemd-autofs-restart.sh
+++ b/scripts/systemd-autofs-restart.sh
@@ -3,11 +3,11 @@
 # This script can be used as a workaround for systemd autofs mount migration.
 # The problem is that systemd is a clever guy: before mounting of actual file
 # system on top of autofs mount, it first checks that device number of autofs
-# mount is equal to the one, stored in sytemd internals. If they do not match,
+# mount is equal to the one, stored in systemd internals. If they do not match,
 # systemd ignores kernel request.
 # The problem happens each time autofs is restored (new device number for
 # autofs superblock) and can't be properly solved without some kind of "device
-# namespaces", where device number can be preseved.
+# namespaces", where device number can be preserved.
 # But some of systemd services can be painlessly restarted. Like
 # proc-sys-fs-binfmt_misc.
 #
diff --git a/soccr/soccr.c b/soccr/soccr.c
index 8be2d28e1..fb13a0d7b 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -216,7 +216,7 @@ static int refresh_sk(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, str
 	data->unsq_len = size;
 
 	if (data->state == TCP_CLOSE) {
-		/* A connection could be reseted. In thise case a sent queue
+		/* A connection could be reset. In thise case a sent queue
 		 * may contain some data. A user can't read this data, so let's
 		 * ignore them. Otherwise we will need to add a logic whether
 		 * the send queue contains a fin packet or not and decide whether
@@ -227,7 +227,7 @@ static int refresh_sk(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, str
 		data->outq_len = 0;
 	}
 
-	/* Don't account the fin packet. It doesn't countain real data. */
+	/* Don't account the fin packet. It doesn't contain real data. */
 	if ((1 << data->state) & (SNDQ_FIRST_FIN | SNDQ_SECOND_FIN)) {
 		if (data->outq_len)
 			data->outq_len--;
@@ -441,7 +441,7 @@ union libsoccr_addr *libsoccr_get_addr(struct libsoccr_sk *sk, int self, unsigne
 	if (flags & ~GET_SA_FLAGS)
 		return NULL;
 
-	/* FIXME -- implemeted in CRIU, makes sence to have it here too */
+	/* FIXME -- implemented in CRIU, makes sence to have it here too */
 	return NULL;
 }
 
@@ -503,7 +503,7 @@ static int libsoccr_set_sk_data_noq(struct libsoccr_sk *sk, struct libsoccr_sk_d
 	if (mstate & (RCVQ_FIRST_FIN | RCVQ_SECOND_FIN))
 		data->inq_seq--;
 
-	/* outq_seq is adjusted due to not accointing the fin packet */
+	/* outq_seq is adjusted due to not accounting the fin packet */
 	if (mstate & (SNDQ_FIRST_FIN | SNDQ_SECOND_FIN))
 		data->outq_seq--;
 
diff --git a/soccr/soccr.h b/soccr/soccr.h
index e7091e591..68ddb577b 100644
--- a/soccr/soccr.h
+++ b/soccr/soccr.h
@@ -171,8 +171,8 @@ int libsoccr_save(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigne
  * Get a pointer on the contents of queues. The amount of bytes is
  * determined from the filled libsoccr_sk_data by queue_id.
  *
- * For TCP_RECV_QUEUE the lenght is .inq_len
- * For TCP_SEND_QUEUE the lenght is .outq_len
+ * For TCP_RECV_QUEUE the length is .inq_len
+ * For TCP_SEND_QUEUE the length is .outq_len
  *
  * For any other queues returns NULL.
  *
diff --git a/test/exhaustive/unix.py b/test/exhaustive/unix.py
index 3bf52ee7f..5b4c972cb 100755
--- a/test/exhaustive/unix.py
+++ b/test/exhaustive/unix.py
@@ -261,7 +261,7 @@ class sock:
         # that hasn't contributed to some new states is
         # just waste of time, so we close only connected
         # sockets or listeners that has at least one
-        # incoming connection pendig or served
+        # incoming connection pending or served
 
         if self.listen:
             if self.icons:
diff --git a/test/javaTests/src/org/criu/java/tests/Sockets.java b/test/javaTests/src/org/criu/java/tests/Sockets.java
index 94cc217c4..160bc90e6 100644
--- a/test/javaTests/src/org/criu/java/tests/Sockets.java
+++ b/test/javaTests/src/org/criu/java/tests/Sockets.java
@@ -129,7 +129,7 @@ class Sockets {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				e.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
 				logger.log(Level.FINE, writer.toString());
 			}
 			if (b != null) {
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsClient.java b/test/javaTests/src/org/criu/java/tests/SocketsClient.java
index 1c8e7b9a1..40ffe1d3f 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsClient.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsClient.java
@@ -121,7 +121,7 @@ class SocketsClient {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				exception.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
 				logger.log(Level.FINE, writer.toString());
 			}
 
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsConnect.java b/test/javaTests/src/org/criu/java/tests/SocketsConnect.java
index 164c21089..b64d2eee1 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsConnect.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsConnect.java
@@ -80,7 +80,7 @@ class SocketsConnect {
 			}
 			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
 				logger.log(Level.SEVERE, "Killing the server process and client process");
-				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				logger.log(Level.SEVERE, "Exception occurred in the client or server process: check their log for details");
 				serverProcess.destroy();
 				clientProcess.destroy();
 				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
@@ -145,7 +145,7 @@ class SocketsConnect {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				e.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
 				logger.log(Level.FINE, writer.toString());
 			}
 			if (b != null) {
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java b/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java
index ed1c7fab3..e72165413 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsConnectClient.java
@@ -68,7 +68,7 @@ class SocketsConnectClient {
 			try {
 				socket = new Socket(SocketHelper.IP_ADDRESS, port);
 			} catch (Exception e) {
-				logger.log(Level.SEVERE, "Exception occured when connecting to port: " + e);
+				logger.log(Level.SEVERE, "Exception occurred when connecting to port: " + e);
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
 			}
@@ -117,7 +117,7 @@ class SocketsConnectClient {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				exception.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
 				logger.log(Level.FINE, writer.toString());
 			}
 
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsData.java b/test/javaTests/src/org/criu/java/tests/SocketsData.java
index 67d8cef0e..bc8470cef 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsData.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsData.java
@@ -80,7 +80,7 @@ class SocketsData {
 			}
 			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
 				logger.log(Level.SEVERE, "Killing the server process and client process");
-				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				logger.log(Level.SEVERE, "Exception occurred in the client or server process: check their log for details");
 				serverProcess.destroy();
 				clientProcess.destroy();
 				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
@@ -144,7 +144,7 @@ class SocketsData {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				e.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
 				logger.log(Level.FINE, writer.toString());
 			}
 			if (b != null) {
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java b/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java
index 49885a886..fa3aa2e76 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsDataClient.java
@@ -74,7 +74,7 @@ class SocketsDataClient {
 			try {
 				socket = new Socket(SocketHelper.IP_ADDRESS, port);
 			} catch (IOException e) {
-				logger.log(Level.SEVERE, "Exception occured when connecting to port: " + e);
+				logger.log(Level.SEVERE, "Exception occurred when connecting to port: " + e);
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 				System.exit(1);
 			}
@@ -129,7 +129,7 @@ class SocketsDataClient {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				exception.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
 				logger.log(Level.FINE, writer.toString());
 			}
 			if (socketMappedBuffer != null) {
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsListen.java b/test/javaTests/src/org/criu/java/tests/SocketsListen.java
index 3fad38549..550d0b6a8 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsListen.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsListen.java
@@ -81,7 +81,7 @@ class SocketsListen {
 			}
 			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
 				logger.log(Level.SEVERE, "Killing the server process and client process");
-				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				logger.log(Level.SEVERE, "Exception occurred in the client or server process: check their log for details");
 				serverProcess.destroy();
 				clientProcess.destroy();
 				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
@@ -141,7 +141,7 @@ class SocketsListen {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				e.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
 				logger.log(Level.FINE, writer.toString());
 			}
 			if (b != null) {
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java b/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java
index efcb3d545..b615c67c8 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsListenClient.java
@@ -75,7 +75,7 @@ class SocketsListenClient {
 			try {
 				socket = new Socket(SocketHelper.IP_ADDRESS, port);
 			} catch (Exception e) {
-				logger.log(Level.SEVERE, "Exception occured when connecting to port: " + e);
+				logger.log(Level.SEVERE, "Exception occurred when connecting to port: " + e);
 				socketMappedBuffer.putChar(Helper.MAPPED_INDEX, Helper.STATE_FAIL);
 			}
 			PrintStream out = new PrintStream(socket.getOutputStream());
@@ -123,7 +123,7 @@ class SocketsListenClient {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				exception.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
 				logger.log(Level.FINE, writer.toString());
 			}
 
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java b/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java
index 5e55c4274..41423b2cb 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsMultiple.java
@@ -80,7 +80,7 @@ class SocketsMultiple {
 			}
 			if (socketMappedBuffer.getChar(Helper.MAPPED_INDEX) == Helper.STATE_FAIL) {
 				logger.log(Level.SEVERE, "Killing the server process and client process");
-				logger.log(Level.SEVERE, "Exception occured in the client or server process: check their log for details");
+				logger.log(Level.SEVERE, "Exception occurred in the client or server process: check their log for details");
 				serverProcess.destroy();
 				clientProcess.destroy();
 				b.putChar(Helper.MAPPED_INDEX, Helper.STATE_END);
@@ -140,7 +140,7 @@ class SocketsMultiple {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				e.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + e);
+				logger.log(Level.SEVERE, "Exception occurred:" + e);
 				logger.log(Level.FINE, writer.toString());
 			}
 			if (b != null) {
diff --git a/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java b/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java
index d97a946fd..b1c98b33f 100644
--- a/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java
+++ b/test/javaTests/src/org/criu/java/tests/SocketsMultipleClient.java
@@ -161,7 +161,7 @@ class SocketsMultipleClient {
 				StringWriter writer = new StringWriter();
 				PrintWriter printWriter = new PrintWriter(writer);
 				exception.printStackTrace(printWriter);
-				logger.log(Level.SEVERE, "Exception occured:" + exception);
+				logger.log(Level.SEVERE, "Exception occurred:" + exception);
 				logger.log(Level.FINE, writer.toString());
 			}
 
diff --git a/test/others/app-emu/job/job.c b/test/others/app-emu/job/job.c
index a3c6af74c..4477bb996 100644
--- a/test/others/app-emu/job/job.c
+++ b/test/others/app-emu/job/job.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
 	snprintf(buf, sizeof(buf), "/proc/%d/fd", pid);
 	fd_dir = opendir(buf);
 	if (!fd_dir) {
-		printf("cant open %s\n", buf);
+		printf("can't open %s\n", buf);
 		return -1;
 	}
 
@@ -70,13 +70,13 @@ int main(int argc, char *argv[])
 	closedir(fd_dir);
 
 	if (ioctl(fd, TIOCGSID, &tty_sid) < 0) {
-		printf("cant obtain sid on stdout\n");
+		printf("can't obtain sid on stdout\n");
 		return -1;
 	}
 	printf("stdout sid = %d\n", tty_sid);
 
 	if (ioctl(fd, TIOCGPGRP, &tty_gid) < 0) {
-		printf("cant obtain gid on stdout\n");
+		printf("can't obtain gid on stdout\n");
 		return -1;
 	}
 	printf("stdout gid = %d\n", tty_gid);
diff --git a/test/others/bers/bers.txt b/test/others/bers/bers.txt
index 17c0c0800..30ee49580 100644
--- a/test/others/bers/bers.txt
+++ b/test/others/bers/bers.txt
@@ -61,7 +61,7 @@ EXAMPLE
 
 bers -d test/bers/dump -t 256 -m 54 -c 4 -f 200 --mem-fill dirtify --mem-cycle dirtify
 
-We generate 256 tasks wit each allocating 54 megabytes of memory splitted
+We generate 256 tasks with each allocating 54 megabytes of memory split
 equally into 4 memory areas. Each task opens 200 files. On creation and
 cycling we touch every page of every memory area.
 
diff --git a/test/others/ns_ext/run_pidns.sh b/test/others/ns_ext/run_pidns.sh
index 19fb97b95..7ac855a18 100755
--- a/test/others/ns_ext/run_pidns.sh
+++ b/test/others/ns_ext/run_pidns.sh
@@ -8,7 +8,7 @@ grep NSpid /proc/self/status || exit 0
 # This test creates a process in non-host pidns and then dumps it and restores
 # it into host pidns. We use pid >100000 in non-host pidns to make sure it does
 # not intersect with some host pid on restore but it is potentially racy so
-# please run this test only in manualy.
+# please run this test only in manually.
 
 CRIU=../../../criu/criu
 
diff --git a/test/others/rpc/errno.py b/test/others/rpc/errno.py
index 01a6eee7b..f84757efd 100755
--- a/test/others/rpc/errno.py
+++ b/test/others/rpc/errno.py
@@ -42,7 +42,7 @@ class test:
 
     def check_resp(self, resp, typ, err):
         if resp.type != typ:
-            raise Exception('Unexpected responce type ' + str(resp.type))
+            raise Exception('Unexpected response type ' + str(resp.type))
 
         if resp.success:
             raise Exception('Unexpected success = True')
diff --git a/test/others/rpc/test-c.c b/test/others/rpc/test-c.c
index 06f13b20f..792dbbf9c 100644
--- a/test/others/rpc/test-c.c
+++ b/test/others/rpc/test-c.c
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 
 	ret = connect(fd, (struct sockaddr *)&addr, addr_len);
 	if (ret == -1) {
-		perror("Cant connect to socket");
+		perror("Can't connect to socket");
 		goto exit;
 	}
 
diff --git a/test/zdtm.py b/test/zdtm.py
index 5b6b71f57..878c3e9cb 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -975,7 +975,7 @@ class criu_rpc:
         if preexec:
             raise test_fail_exc('RPC and PREEXEC not supported')
 
-        ctx = {}  # Object used to keep info untill action is done
+        ctx = {}  # Object used to keep info until action is done
         criu = crpc.criu()
         criu.use_binary(criu_bin)
         criu_rpc.__set_opts(criu, args, ctx)
diff --git a/test/zdtm/static/conntracks b/test/zdtm/static/conntracks
index 26220f97c..ecd97356f 100755
--- a/test/zdtm/static/conntracks
+++ b/test/zdtm/static/conntracks
@@ -25,7 +25,7 @@ do_or_fail()
 
 do_start_ipt()
 {
-	[ -f "$statefile" ] && die "state file $statefile aleady exists"
+	[ -f "$statefile" ] && die "state file $statefile already exists"
 
 	do_or_fail "can't install a state match" \
 		iptables -A INPUT \
@@ -47,7 +47,7 @@ do_stop_ipt()
 
 do_start_nft()
 {
-	[ -f "$statefile" ] && die "state file $statefile aleady exists"
+	[ -f "$statefile" ] && die "state file $statefile already exists"
 
 	do_or_fail "can't install a state match" \
 		nft add rule filter INPUT \
@@ -83,7 +83,7 @@ tmpargs="$(../lib/parseargs.sh --name=$0 \
 	die "can't parse command line"
 eval "$tmpargs"
 
-[ -f "$outfile" ] && die "out file $outfile aleady exists"
+[ -f "$outfile" ] && die "out file $outfile already exists"
 
 # expect "start" or "stop"
 do_$1
diff --git a/test/zdtm/static/file_append.c b/test/zdtm/static/file_append.c
index aa93ae186..fff89a54b 100644
--- a/test/zdtm/static/file_append.c
+++ b/test/zdtm/static/file_append.c
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 	}
 	tmp[2] = '\0';
 	if (strcmp(tmp, "xy")) {
-		fail("Smth's wron with file contents (%s)", tmp);
+		fail("Smth's wrong with file contents (%s)", tmp);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/mnt_ext_collision.c b/test/zdtm/static/mnt_ext_collision.c
index 324a3484c..8bd085c6a 100644
--- a/test/zdtm/static/mnt_ext_collision.c
+++ b/test/zdtm/static/mnt_ext_collision.c
@@ -152,7 +152,7 @@ test:
 	}
 
 	/*
-	 * Setup futex for processes syncronization
+	 * Setup futex for processes synchronization
 	 */
 	futex = mmap(NULL, sizeof(futex), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 	if (futex == MAP_FAILED) {
diff --git a/test/zdtm/static/mntns_pivot_root.c b/test/zdtm/static/mntns_pivot_root.c
index 9826efde4..95af54cde 100644
--- a/test/zdtm/static/mntns_pivot_root.c
+++ b/test/zdtm/static/mntns_pivot_root.c
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	/*
-	 * Setup futex for processes syncronization
+	 * Setup futex for processes synchronization
 	 */
 	futex = mmap(NULL, sizeof(futex), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
 	if (futex == MAP_FAILED) {
diff --git a/test/zdtm/static/netns_lock_iptables.hook b/test/zdtm/static/netns_lock_iptables.hook
index b5508a7cb..e7daf8a65 100755
--- a/test/zdtm/static/netns_lock_iptables.hook
+++ b/test/zdtm/static/netns_lock_iptables.hook
@@ -30,7 +30,7 @@ if sys.argv[1] == "--post-start":
     nsenter() # Enter test netns
     subprocess.Popen(["ip", "link", "set", "up", "dev", "lo"]).wait()
 
-    # Lets test know that the netns is initilized successfully
+    # Lets test know that the netns is initialized successfully
     # by checking the access of SYNCFILE
     create_sync_file()
 
diff --git a/test/zdtm/static/pipe00.c b/test/zdtm/static/pipe00.c
index 492722573..2c21fbca5 100644
--- a/test/zdtm/static/pipe00.c
+++ b/test/zdtm/static/pipe00.c
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 			goto err;
 		}
 		if (strcmp(TEST_STRING, buf)) {
-			pr_perror("data curruption");
+			pr_perror("data corruption");
 			goto err;
 		}
 
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 		}
 		close(11);
 		if (strcmp(TEST_STRING, buf)) {
-			pr_perror("data curruption");
+			pr_perror("data corruption");
 			return 1;
 		}
 	}
diff --git a/test/zdtm/static/pty03.c b/test/zdtm/static/pty03.c
index 59672d697..e57f54557 100644
--- a/test/zdtm/static/pty03.c
+++ b/test/zdtm/static/pty03.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (ioctl(slave, TIOCSCTTY, 1)) {
-		pr_perror("Can't set a controll terminal");
+		pr_perror("Can't set a control terminal");
 		return 1;
 	}
 
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 
 	slave = open("/dev/tty", O_RDWR);
 	if (slave == -1) {
-		pr_perror("Can't open the controll terminal");
+		pr_perror("Can't open the control terminal");
 		return -1;
 	}
 
diff --git a/test/zdtm/static/pty04.c b/test/zdtm/static/pty04.c
index 406fbee4d..43a880fb4 100644
--- a/test/zdtm/static/pty04.c
+++ b/test/zdtm/static/pty04.c
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (ioctl(slave1, TIOCSCTTY, 1)) {
-		pr_perror("Can't set a controll terminal");
+		pr_perror("Can't set a control terminal");
 		return 1;
 	}
 
diff --git a/test/zdtm/static/route_rules b/test/zdtm/static/route_rules
index 9a735c6a9..97edf3622 100755
--- a/test/zdtm/static/route_rules
+++ b/test/zdtm/static/route_rules
@@ -31,7 +31,7 @@ do_or_fail()
 
 do_start()
 {
-	[ -f "$statefile" ] && die "state file $statefile aleady exists"
+	[ -f "$statefile" ] && die "state file $statefile already exists"
 
 	# Get default route
 	dev_name=`ip route list match 0.0.0.0/0 | sed 's/.*dev \([^ ]*\).*/\1/'`
@@ -66,7 +66,7 @@ tmpargs="$(../lib/parseargs.sh --name=$0 \
 	die "can't parse command line"
 eval "$tmpargs"
 
-[ -f "$outfile" ] && die "out file $outfile aleady exists"
+[ -f "$outfile" ] && die "out file $outfile already exists"
 
 # expect "start" or "stop"
 action=${1:?Specify action$(die 'Specify action')}
diff --git a/test/zdtm/static/session01.c b/test/zdtm/static/session01.c
index 31a617de9..f6834787e 100644
--- a/test/zdtm/static/session01.c
+++ b/test/zdtm/static/session01.c
@@ -154,7 +154,7 @@ static int child(const int c)
 			continue;
 		if (testcases[i].alive)
 			continue;
-		test_msg("Wait porcess %d (pid %d)\n", i, testcases[i].master.pid);
+		test_msg("Wait process %d (pid %d)\n", i, testcases[i].master.pid);
 		waitpid(testcases[i].master.pid, NULL, 0);
 	}
 
@@ -244,7 +244,7 @@ int main(int argc, char **argv)
 			continue;
 		if (testcases[i].alive)
 			continue;
-		test_msg("Wait porcess %d (pid %d)\n", i, testcases[i].master.pid);
+		test_msg("Wait process %d (pid %d)\n", i, testcases[i].master.pid);
 		waitpid(testcases[i].master.pid, NULL, 0);
 	}
 
diff --git a/test/zdtm/static/sigtrap.c b/test/zdtm/static/sigtrap.c
index 6bd30aad4..4df80e9c0 100644
--- a/test/zdtm/static/sigtrap.c
+++ b/test/zdtm/static/sigtrap.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (act.sa_handler != sigh) {
-		fail("unexpected sighanl hanlder");
+		fail("unexpected sighanl handler");
 		exit(1);
 	}
 
diff --git a/test/zdtm/static/sock_opts02.c b/test/zdtm/static/sock_opts02.c
index 7ea98744a..58c6d4712 100644
--- a/test/zdtm/static/sock_opts02.c
+++ b/test/zdtm/static/sock_opts02.c
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 		}
 
 		if (tmp != sk_opts[i].lock) {
-			fail("SO_BUF_LOCK missmatch %u != %u", tmp, sk_opts[i].lock);
+			fail("SO_BUF_LOCK mismatch %u != %u", tmp, sk_opts[i].lock);
 			goto err;
 		}
 	}
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
 		}
 
 		if (tmp != sk_opts[i].lock) {
-			fail("SO_BUF_LOCK missmatch %u != %u", tmp, sk_opts[i].lock);
+			fail("SO_BUF_LOCK mismatch %u != %u", tmp, sk_opts[i].lock);
 			goto err;
 		}
 	}
diff --git a/test/zdtm/static/socket-tcp-reseted.c b/test/zdtm/static/socket-tcp-reseted.c
index ad382e38e..4a328e3e0 100644
--- a/test/zdtm/static/socket-tcp-reseted.c
+++ b/test/zdtm/static/socket-tcp-reseted.c
@@ -18,7 +18,7 @@
 #define ZDTM_SRV_FAMILY AF_INET
 #endif
 
-const char *test_doc = "Check, that a reseted TCP connection can be restored\n";
+const char *test_doc = "Check, that a reset TCP connection can be restored\n";
 const char *test_author = "Andrey Vagin <avagin@parallels.com";
 
 #include <stdio.h>
diff --git a/test/zdtm/static/vdso02.c b/test/zdtm/static/vdso02.c
index ea28c4453..2050bca71 100644
--- a/test/zdtm/static/vdso02.c
+++ b/test/zdtm/static/vdso02.c
@@ -71,7 +71,7 @@ err:
 
 #ifdef __i386__
 /*
- * On i386 syscalls for speed are optimized trough vdso,
+ * On i386 syscalls for speed are optimized through vdso,
  * call raw int80 as vdso is unmapped.
  */
 #define __NR32_munmap 91

From e7b1c85791a6accbb095c34f66b16de2fb4ad76b Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:50:17 -0700
Subject: [PATCH 1025/1854] Fix remaining codespell warnings

Those that codespell have a few variants for:

./soccr/soccr.c:219: thise ==> these, this
./soccr/soccr.c:444: sence ==> sense, since
./criu/net.c:665: ot ==> to, of, or
./criu/net.c:775: ot ==> to, of, or
./criu/files.c:1244: wan't ==> want, wasn't
./criu/kerndat.c:1141: happend ==> happened, happens, happen
./criu/mount-v2.c:781: carefull ==> careful, carefully
./test/zdtm/static/socket_aio.c:54: Chiled ==> Child, chilled
./test/zdtm/static/socket_listen6.c:73: Chiled ==> Child, chilled
./test/zdtm/static/socket_listen.c:73: Chiled ==> Child, chilled
./test/zdtm/static/socket_listen4v6.c:73: Chiled ==> Child, chilled
./test/zdtm/static/sk-unix-dgram-ghost.c:201: childs ==> children, child's
./test/zdtm/static/sk-unix-dgram-ghost.c:205: childs ==> children, child's
./compel/arch/x86/src/lib/infect.c:297: automatical ==> automatically, automatic, automated

While at it, do some other minor fixes in the same lines.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 compel/arch/x86/src/lib/infect.c       | 4 ++--
 criu/files.c                           | 2 +-
 criu/kerndat.c                         | 2 +-
 criu/mount-v2.c                        | 2 +-
 criu/net.c                             | 4 ++--
 soccr/soccr.c                          | 4 ++--
 test/zdtm/static/sk-unix-dgram-ghost.c | 4 ++--
 test/zdtm/static/socket_aio.c          | 2 +-
 test/zdtm/static/socket_listen.c       | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index d7865796e..98e2512e7 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -303,9 +303,9 @@ static int corrupt_extregs(pid_t pid)
 
 	/*
 	 * Error log-level as:
-	 *  - not intended to be used outside of testing,
+	 *  - not intended to be used outside of testing;
 	 *  - zdtm.py will grep it auto-magically from logs
-	 *    (and the seed will be known from an automatical testing)
+	 *    (and the seed will be known from automatic testing).
 	 */
 	pr_err("Corrupting %s for %d, seed %u\n", use_xsave ? "xsave" : "fpuregs", pid, init_seed);
 
diff --git a/criu/files.c b/criu/files.c
index 9725b8ad1..8a2250e19 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1254,7 +1254,7 @@ int close_old_fds(void)
 	int fd, ret;
 
 	/**
-	 * Close previous /proc/self/ service fd, as we don't wan't to reuse it
+	 * Close previous /proc/self/ service fd, as we don't want to reuse it
 	 * from a different task. Also there can be some junk fd in it's place
 	 * after we've moved our service fds (e.g. from other task of parents
 	 * shared fdtable), we need to close it before opendir_proc() below.
diff --git a/criu/kerndat.c b/criu/kerndat.c
index ec2d62ab0..2c1c2f79f 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1306,7 +1306,7 @@ static int kerndat_has_pidfd_getfd(void)
 	if (val_b == val_a) {
 		kdat.has_pidfd_getfd = true;
 	} else {
-		/* If val_b != val_a then something unexpected happend. */
+		/* If val_b != val_a, something unexpected happened. */
 		pr_err("Unexpected value read from socket\n");
 		ret = -1;
 	}
diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index 570f78570..623016d42 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -778,7 +778,7 @@ static int populate_mnt_ns_v2(void)
  * all siblings which it overmounts (see __mnt_resort_children). The function
  * mnt_tree_for_each is effectively DFS (in case we don't postpone), thus all
  * descendants of all mounts which we sibling-overmount are mounted before us.
- * Be carefull, we can't postpone (return >0) from this function because of it.
+ * Be careful, we can't postpone (return >0) from this function because of it.
  */
 static int move_mount_to_tree(struct mount_info *mi)
 {
diff --git a/criu/net.c b/criu/net.c
index 550f4e2ee..2eff519c5 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -662,7 +662,7 @@ static int dump_macvlan(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nl
 
 	ret = nla_parse_nested(data, IFLA_MACVLAN_FLAGS, info[IFLA_INFO_DATA], NULL);
 	if (ret < 0) {
-		pr_err("failed ot parse macvlan data\n");
+		pr_err("failed to parse macvlan data\n");
 		return -1;
 	}
 
@@ -772,7 +772,7 @@ static int dump_sit(NetDeviceEntry *nde, struct cr_imgset *imgset, struct nlattr
 	pr_info("Some data for SIT provided\n");
 	ret = nla_parse_nested(data, IFLA_IPTUN_MAX, info[IFLA_INFO_DATA], NULL);
 	if (ret < 0) {
-		pr_err("failed ot parse sit data\n");
+		pr_err("failed to parse sit data\n");
 		return -1;
 	}
 
diff --git a/soccr/soccr.c b/soccr/soccr.c
index fb13a0d7b..abea93703 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -216,7 +216,7 @@ static int refresh_sk(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, str
 	data->unsq_len = size;
 
 	if (data->state == TCP_CLOSE) {
-		/* A connection could be reset. In thise case a sent queue
+		/* A connection could be reset. In this case a sent queue
 		 * may contain some data. A user can't read this data, so let's
 		 * ignore them. Otherwise we will need to add a logic whether
 		 * the send queue contains a fin packet or not and decide whether
@@ -441,7 +441,7 @@ union libsoccr_addr *libsoccr_get_addr(struct libsoccr_sk *sk, int self, unsigne
 	if (flags & ~GET_SA_FLAGS)
 		return NULL;
 
-	/* FIXME -- implemented in CRIU, makes sence to have it here too */
+	/* FIXME -- implemented in CRIU, makes sense to have it here too */
 	return NULL;
 }
 
diff --git a/test/zdtm/static/sk-unix-dgram-ghost.c b/test/zdtm/static/sk-unix-dgram-ghost.c
index fdf8fb18b..7c116fb19 100644
--- a/test/zdtm/static/sk-unix-dgram-ghost.c
+++ b/test/zdtm/static/sk-unix-dgram-ghost.c
@@ -198,11 +198,11 @@ int main(int argc, char **argv)
 
 	test_msg("C/R complete\n");
 
-	/* let childs to send data to server socket */
+	/* Let children send data to server socket. */
 	for (i = 0; i < PROCESSES_NUM; i++)
 		task_waiter_complete(&t[i], 2);
 
-	/* wait childs for send data */
+	/* Wait for children to send data. */
 	for (i = 0; i < PROCESSES_NUM; i++)
 		task_waiter_wait4(&t[i], 3);
 
diff --git a/test/zdtm/static/socket_aio.c b/test/zdtm/static/socket_aio.c
index a545483e1..4d228361f 100644
--- a/test/zdtm/static/socket_aio.c
+++ b/test/zdtm/static/socket_aio.c
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 
 	if (pid == 0) {
 		/*
-		 * Chiled is client of TCP connection
+		 * Child is client of TCP connection.
 		 */
 		close(fd_s);
 		fd = tcp_init_client(AF_INET, "127.0.0.1", port);
diff --git a/test/zdtm/static/socket_listen.c b/test/zdtm/static/socket_listen.c
index 519107d01..14e321439 100644
--- a/test/zdtm/static/socket_listen.c
+++ b/test/zdtm/static/socket_listen.c
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 
 	if (pid == 0) {
 		/*
-		 * Chiled is client of TCP connection
+		 * Child is client of TCP connection.
 		 */
 		close(fd_s);
 		fd = tcp_init_client(ZDTM_FAMILY, "localhost", port);

From 8ddd7f4837036160eeae1824efcf5e31a58ad459 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 18:53:05 -0700
Subject: [PATCH 1026/1854] ci: add codespell to lint target

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .github/workflows/lint.yml | 2 +-
 Makefile                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50b241e9f..c1215aeaf 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
       image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
-      run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils
+      run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils codespell
     - uses: actions/checkout@v2
     - name: Run make lint
       run: make lint
diff --git a/Makefile b/Makefile
index 9bb221796..ad70800eb 100644
--- a/Makefile
+++ b/Makefile
@@ -426,6 +426,7 @@ lint:
 	shellcheck test/others/libcriu/*.sh
 	shellcheck test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck test/others/config-file/*.sh
+	codespell
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
 	# Do not use %m with pr_perror or fail

From c71d4a54a36017f715389ebf53de99eed455960c Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 8 Apr 2022 07:17:14 +0000
Subject: [PATCH 1027/1854] cgroup: fix "unified" path

The code expected that the cgroup directory ends with a ',' and
unconditionally removes the last character. For the "unified" case this
resulted in the last 'd' being remove instead of the non existing comma.

This just adds a comma after "unified" so that the last removed
character is not the 'd'.

Suggested-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 82d9b16a2..123bd1370 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1035,7 +1035,7 @@ static int ctrl_dir_and_opt(CgControllerEntry *ctl, char *dir, int ds, char *opt
 		}
 
 		if (n[0] == 0)
-			doff += snprintf(dir + doff, ds - doff, "unified");
+			doff += snprintf(dir + doff, ds - doff, "unified,");
 		else
 			doff += snprintf(dir + doff, ds - doff, "%s,", n);
 		if (opt)

From 2b6901707c883a0d1c1ae4a3b5f70a51e2bf77f3 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 2 Apr 2022 15:57:54 +0000
Subject: [PATCH 1028/1854] cgroup: fix --manage-cgroups=ignore

Using '--manage-cgroups=ignore' fails during restore. This fixes the use
of '--manage-cgroups=ignore'.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cgroup.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 123bd1370..e05b0832e 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1217,6 +1217,9 @@ int prepare_task_cgroup(struct pstree_item *me)
 	CgSetEntry *se;
 	u32 current_cgset;
 
+	if (opts.manage_cgroups == CG_MODE_IGNORE)
+		return 0;
+
 	if (!rsti(me)->cg_set)
 		return 0;
 
@@ -1299,6 +1302,9 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *pat
 	int cg, fd, ret = -1;
 	CgroupPerms *perms = cg_prop_entry_p->perms;
 
+	if (opts.manage_cgroups == CG_MODE_IGNORE)
+		return 0;
+
 	if (!cg_prop_entry_p->value) {
 		pr_err("cg_prop_entry->value was empty when should have had a value\n");
 		return -1;

From 4adec8e8ef3682186fd21e1b04da3e309e1ddce7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 2 Apr 2022 15:58:25 +0000
Subject: [PATCH 1029/1854] cgroup: test for --manage-cgroups=ignore

Test to ensure that --manage-cgroups=ignore works correctly.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/jenkins/crit.sh                     |   2 +-
 test/jenkins/criu-dump.sh                |   2 +-
 test/zdtm/lib/zdtmtst.h                  |  26 ++++
 test/zdtm/static/Makefile                |   1 +
 test/zdtm/static/cgroup_ignore.c         | 161 +++++++++++++++++++++++
 test/zdtm/static/cgroup_ignore.checkskip |  13 ++
 test/zdtm/static/cgroup_ignore.desc      |   1 +
 7 files changed, 204 insertions(+), 2 deletions(-)
 create mode 100644 test/zdtm/static/cgroup_ignore.c
 create mode 100755 test/zdtm/static/cgroup_ignore.checkskip
 create mode 100644 test/zdtm/static/cgroup_ignore.desc

diff --git a/test/jenkins/crit.sh b/test/jenkins/crit.sh
index fcf1c58d4..cec26c2b4 100755
--- a/test/jenkins/crit.sh
+++ b/test/jenkins/crit.sh
@@ -2,6 +2,6 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run --all -f best -x maps04 -x cgroup02 --norst --keep-img always || fail
+./test/zdtm.py run --all -f best -x maps04 -x cgroup02 -x cgroup_ignore --norst --keep-img always || fail
 PYTHONPATH="$(pwd)/lib/" ./test/crit-recode.py || fail
 exit 0
diff --git a/test/jenkins/criu-dump.sh b/test/jenkins/criu-dump.sh
index 4c49532b2..761b3de0d 100755
--- a/test/jenkins/criu-dump.sh
+++ b/test/jenkins/criu-dump.sh
@@ -5,4 +5,4 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --norst -x 'maps04' -x 'cgroup02' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --norst -x 'maps04' -x 'cgroup02' -x 'cgroup_ignore' || fail
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index 803d33e3d..ed7c23ee2 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -176,4 +176,30 @@ extern dev_t get_mapping_dev(void *addr);
 		___ret;                                              \
 	})
 
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression)                     \
+	(__extension__({                                   \
+		long int __result;                         \
+		do                                         \
+			__result = (long int)(expression); \
+		while (__result < 0 && errno == EINTR);    \
+		__result;                                  \
+	}))
+#endif
+
+#define cleanup_close __attribute__((cleanup(cleanup_closep)))
+#define cleanup_free  __attribute__((cleanup(cleanup_freep)))
+static inline void cleanup_freep(void *p)
+{
+	void **pp = (void **)p;
+	free(*pp);
+}
+
+static inline void cleanup_closep(void *p)
+{
+	int *pp = (int *)p;
+	if (*pp >= 0)
+		TEMP_FAILURE_RETRY(close(*pp));
+}
+
 #endif /* _VIMITESU_H_ */
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1e7925ca8..de64dd2ed 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -377,6 +377,7 @@ TST_DIR		=				\
 		cgroup03			\
 		cgroup04			\
 		cgroup_ifpriomap		\
+		cgroup_ignore			\
 		cgroup_stray			\
 		cgroup_yard			\
 		unlink_fstat04			\
diff --git a/test/zdtm/static/cgroup_ignore.c b/test/zdtm/static/cgroup_ignore.c
new file mode 100644
index 000000000..ca2b30316
--- /dev/null
+++ b/test/zdtm/static/cgroup_ignore.c
@@ -0,0 +1,161 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that cgroups are correctly ignored";
+const char *test_author = "Adrian Reber <areber@redhat.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "cgroup directory name", 1);
+static const char *cgname = "zdtmtst";
+
+static size_t read_all(int fd, char *buf, size_t size)
+{
+	ssize_t r = 0, ret;
+
+	while (r < size) {
+		ret = read(fd, buf + r, size - r);
+		if (ret < 0) {
+			pr_perror("Read failed");
+			return -1;
+		} else if (ret == 0) {
+			return 0;
+		}
+		r += ret;
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	cleanup_free char *cgroup_procs = NULL;
+	cleanup_close int cgroup_procs_fd = -1;
+	cleanup_free char *destination = NULL;
+	cleanup_free char *buffer_old = NULL;
+	cleanup_free char *buffer_new = NULL;
+	cleanup_close int fd = -1;
+	int ret = 1;
+
+	test_init(argc, argv);
+
+	buffer_old = malloc(PAGE_SIZE);
+	if (!buffer_old) {
+		pr_err("Could not allocate memory\n");
+		return 1;
+	}
+	memset(buffer_old, 0, PAGE_SIZE);
+	buffer_new = malloc(PAGE_SIZE);
+	if (!buffer_new) {
+		pr_err("Could not allocate memory\n");
+		return 1;
+	}
+	memset(buffer_new, 0, PAGE_SIZE);
+
+	// Read /proc/self/cgroup to later compare against it
+	fd = open("/proc/self/cgroup", O_RDONLY);
+	if (fd < 0) {
+		pr_err("Could not open /proc/self/cgroup\n");
+		return 1;
+	}
+
+	if (read_all(fd, buffer_old, PAGE_SIZE)) {
+		pr_err("Could not read data from /proc/self/cgroup\n");
+		return 1;
+	}
+
+	// Create the cgroup root directory
+	if (mkdir(dirname, 0700) < 0 && errno != EEXIST) {
+		pr_err("Cannot make directory %s\n", dirname);
+		return 1;
+	}
+
+	// Mount cgroup2, skip if cgroup2 is not available
+	if (mount("none", dirname, "cgroup2", 0, 0)) {
+		if (errno == ENODEV) {
+			skip("Test relies on cgroup2 semantics which this system does not support. Skipping");
+			test_daemon();
+			test_waitsig();
+			pass();
+			return 0;
+		} else {
+			pr_err("Could not mount cgroup2 at %s\n", dirname);
+		}
+		return 1;
+	}
+
+	// Create the cgroup cgname (if it does not already exist)
+	if (asprintf(&destination, "%s/%s", dirname, cgname) == -1) {
+		pr_err("Could not allocate memory\n");
+		goto err;
+	}
+	if (mkdir(destination, 0700) < 0 && errno != EEXIST) {
+		pr_err("Failed to create temporary cgroup directory %s\n", destination);
+		goto err;
+	}
+
+	// Move this process to the newly created cgroup
+	if (asprintf(&cgroup_procs, "%s/cgroup.procs", destination) == -1) {
+		pr_err("Could not allocate memory\n");
+		goto err;
+	}
+	cgroup_procs_fd = open(cgroup_procs, O_RDWR);
+	if (cgroup_procs_fd < 0) {
+		pr_err("Could not open %s\n", cgroup_procs);
+		goto err;
+	}
+	if (write(cgroup_procs_fd, "0", 1) != 1) {
+		pr_err("Writing to %s failed\n", cgroup_procs);
+		goto err;
+	}
+
+	// Read /proc/self/cgroup (should have changed)
+	lseek(fd, 0, SEEK_SET);
+	if (read_all(fd, buffer_new, PAGE_SIZE)) {
+		pr_err("Could not read data from /proc/self/cgroup\n");
+		goto err;
+	}
+
+	// Test if /proc/self/cgroup has changed
+	if (!memcmp(buffer_new, buffer_old, PAGE_SIZE)) {
+		fail("/proc/self/cgroup should differ after move to another cgroup");
+		pr_err("original /proc/self/cgroup content %s\n", buffer_old);
+		pr_err("new /proc/self/cgroup content %s\n", buffer_new);
+		goto err;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	// Read /proc/self/cgroup. It should not be the same as after
+	// moving this process to another cgroup because of restore
+	// with '--manage-cgroups=ignore'. The process should be
+	// now in cgroup of the current session.
+	lseek(fd, 0, SEEK_SET);
+	memset(buffer_old, 0, PAGE_SIZE);
+	if (read_all(fd, buffer_old, PAGE_SIZE)) {
+		pr_err("Could not read data from /proc/self/cgroup\n");
+		goto err;
+	}
+
+	// Test if /proc/self/cgroup has changed again
+	if (!memcmp(buffer_new, buffer_old, PAGE_SIZE)) {
+		fail("/proc/self/cgroup should differ after restore");
+		pr_err("original /proc/self/cgroup content %s\n", buffer_new);
+		pr_err("new /proc/self/cgroup content %s\n", buffer_old);
+		goto err;
+	}
+
+	ret = 0;
+	pass();
+err:
+	rmdir(destination);
+	umount(dirname);
+
+	return ret;
+}
diff --git a/test/zdtm/static/cgroup_ignore.checkskip b/test/zdtm/static/cgroup_ignore.checkskip
new file mode 100755
index 000000000..7b1d7ced1
--- /dev/null
+++ b/test/zdtm/static/cgroup_ignore.checkskip
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+dest=$(mktemp -d cg_ignore.XXXXXX)
+
+trap 'rmdir "$dest"' EXIT
+
+if ! mount -t cgroup2 none "$dest"; then
+	exit 1
+fi
+
+umount "$dest"
+
+exit 0
diff --git a/test/zdtm/static/cgroup_ignore.desc b/test/zdtm/static/cgroup_ignore.desc
new file mode 100644
index 000000000..3fa9ceb76
--- /dev/null
+++ b/test/zdtm/static/cgroup_ignore.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'flags': 'suid excl', 'ropts': '--manage-cgroups=ignore'}

From de03eb435084b174ecd76772bcf5374392a86a2e Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 21 Dec 2021 17:38:25 +0300
Subject: [PATCH 1030/1854] compel: add rseq syscall into compel std plugin
 syscall tables

Add rseq syscall numbers for:
arm/aarch64, mips64, ppc64le, s390, x86_64/x86

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 compel/arch/arm/plugins/std/syscalls/syscall.def         | 1 +
 compel/arch/mips/plugins/std/syscalls/syscall_64.tbl     | 1 +
 compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl | 1 +
 compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl   | 1 +
 compel/arch/x86/plugins/std/syscalls/syscall_32.tbl      | 1 +
 compel/arch/x86/plugins/std/syscalls/syscall_64.tbl      | 1 +
 6 files changed, 6 insertions(+)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index c9bccc386..8bcc3cc50 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -121,3 +121,4 @@ clone3				435	435	(struct clone_args *uargs, size_t size)
 pidfd_open			434	434	(pid_t pid, unsigned int flags)
 openat2				437	437	(int dirfd, char *pathname, struct open_how *how, size_t size)
 pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
+rseq				293	398	(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index a74e694e2..505ec849d 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -118,3 +118,4 @@ __NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open			5434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2			5437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		5438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+__NR_rseq		        5327		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 648239182..af40d7104 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -117,3 +117,4 @@ __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+__NR_rseq       	387		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index 169458296..6a349e1cb 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -117,3 +117,4 @@ __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+__NR_rseq       	383		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index 4179a7f5b..a119a59b2 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -105,3 +105,4 @@ __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+__NR_rseq       	386		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 9c27ab8b5..16dd86e79 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -116,3 +116,4 @@ __NR_clone3			435		sys_clone3		(struct clone_args *uargs, size_t size)
 __NR_pidfd_open			434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+__NR_rseq       		334		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)

From 8b3a76b6400bf71d4156a560f1910165dafc8674 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 21 Dec 2021 18:27:52 +0300
Subject: [PATCH 1031/1854] kerndat: check for rseq syscall support

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/include/kerndat.h |  1 +
 criu/kerndat.c         | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index de14028f5..986dcdc09 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -80,6 +80,7 @@ struct kerndat_s {
 	dev_t hugetlb_dev[HUGETLB_MAX];
 	bool has_move_mount_set_group;
 	bool has_openat2;
+	bool has_rseq;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 2c1c2f79f..9d627aeec 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -905,6 +905,20 @@ static int kerndat_x86_has_ptrace_fpu_xsave_bug(void)
 	return 0;
 }
 
+static int kerndat_has_rseq(void)
+{
+	if (syscall(__NR_rseq, NULL, 0, 0, 0) != -1) {
+		pr_err("rseq should fail\n");
+		return -1;
+	}
+	if (errno == ENOSYS)
+		pr_info("rseq syscall isn't supported\n");
+	else
+		kdat.has_rseq = true;
+
+	return 0;
+}
+
 int kerndat_sockopt_buf_lock(void)
 {
 	int exit_code = -1;
@@ -1606,6 +1620,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_openat2 failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_rseq()) {
+		pr_err("kerndat_has_rseq failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From ca54dfcac9aac6306756d14fb5ee6c8320fd06a3 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 21 Dec 2021 21:17:16 +0300
Subject: [PATCH 1032/1854] util: move fork_and_ptrace_attach helper from
 cr-check

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-check.c     | 57 -------------------------------------------
 criu/include/util.h |  1 +
 criu/util.c         | 59 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 52393cc8b..381184374 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -537,63 +537,6 @@ static int check_sigqueuinfo(void)
 	return 0;
 }
 
-static pid_t fork_and_ptrace_attach(int (*child_setup)(void))
-{
-	pid_t pid;
-	int sk_pair[2], sk;
-	char c = 0;
-
-	if (socketpair(PF_LOCAL, SOCK_SEQPACKET, 0, sk_pair)) {
-		pr_perror("socketpair");
-		return -1;
-	}
-
-	pid = fork();
-	if (pid < 0) {
-		pr_perror("fork");
-		return -1;
-	} else if (pid == 0) {
-		sk = sk_pair[1];
-		close(sk_pair[0]);
-
-		if (child_setup && child_setup() != 0)
-			exit(1);
-
-		if (write(sk, &c, 1) != 1) {
-			pr_perror("write");
-			exit(1);
-		}
-
-		while (1)
-			sleep(1000);
-		exit(1);
-	}
-
-	sk = sk_pair[0];
-	close(sk_pair[1]);
-
-	if (read(sk, &c, 1) != 1) {
-		close(sk);
-		kill(pid, SIGKILL);
-		waitpid(pid, NULL, 0);
-		pr_perror("read");
-		return -1;
-	}
-
-	close(sk);
-
-	if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) {
-		pr_perror("Unable to ptrace the child");
-		kill(pid, SIGKILL);
-		waitpid(pid, NULL, 0);
-		return -1;
-	}
-
-	waitpid(pid, NULL, 0);
-
-	return pid;
-}
-
 static int check_ptrace_peeksiginfo(void)
 {
 	struct ptrace_peeksiginfo_args arg;
diff --git a/criu/include/util.h b/criu/include/util.h
index 5ccd24722..4e29c079e 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -166,6 +166,7 @@ extern int is_anon_link_type(char *link, char *type);
 
 extern int cr_system(int in, int out, int err, char *cmd, char *const argv[], unsigned flags);
 extern int cr_system_userns(int in, int out, int err, char *cmd, char *const argv[], unsigned flags, int userns_pid);
+extern pid_t fork_and_ptrace_attach(int (*child_setup)(void));
 extern int cr_daemon(int nochdir, int noclose, int close_fd);
 extern int status_ready(void);
 extern int is_root_user(void);
diff --git a/criu/util.c b/criu/util.c
index 5c075cd15..40b12bace 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -660,6 +660,65 @@ out:
 	return ret;
 }
 
+pid_t fork_and_ptrace_attach(int (*child_setup)(void))
+{
+	pid_t pid;
+	int sk_pair[2], sk;
+	char c = 0;
+
+	if (socketpair(PF_LOCAL, SOCK_SEQPACKET, 0, sk_pair)) {
+		pr_perror("socketpair");
+		return -1;
+	}
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("fork");
+		return -1;
+	}
+
+	if (pid == 0) {
+		sk = sk_pair[1];
+		close(sk_pair[0]);
+
+		if (child_setup && child_setup() != 0)
+			exit(1);
+
+		if (write(sk, &c, 1) != 1) {
+			pr_perror("write");
+			exit(1);
+		}
+
+		while (1)
+			sleep(1000);
+		exit(1);
+	}
+
+	sk = sk_pair[0];
+	close(sk_pair[1]);
+
+	if (read(sk, &c, 1) != 1) {
+		close(sk);
+		kill(pid, SIGKILL);
+		waitpid(pid, NULL, 0);
+		pr_perror("read");
+		return -1;
+	}
+
+	close(sk);
+
+	if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) {
+		pr_perror("Unable to ptrace the child");
+		kill(pid, SIGKILL);
+		waitpid(pid, NULL, 0);
+		return -1;
+	}
+
+	waitpid(pid, NULL, 0);
+
+	return pid;
+}
+
 int status_ready(void)
 {
 	char c = 0;

From bd9ee325540c5dc2db96582ef6d5cb5c0b78d065 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 21 Dec 2021 18:29:14 +0300
Subject: [PATCH 1033/1854] cr-check: Add ptrace rseq conf dump feature

Add "get_rseq_conf" feature corresponding to the
ptrace(PTRACE_GET_RSEQ_CONFIGURATION) support.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 compel/include/uapi/ptrace.h | 12 +++++++++++
 criu/cr-check.c              | 11 ++++++++++
 criu/include/kerndat.h       |  1 +
 criu/kerndat.c               | 41 ++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)

diff --git a/compel/include/uapi/ptrace.h b/compel/include/uapi/ptrace.h
index 533e0569f..63dfee97f 100644
--- a/compel/include/uapi/ptrace.h
+++ b/compel/include/uapi/ptrace.h
@@ -65,6 +65,18 @@ typedef struct {
 	uint64_t flags;	     /* Output: filter's flags */
 } seccomp_metadata_t;
 
+#ifndef PTRACE_GET_RSEQ_CONFIGURATION
+#define PTRACE_GET_RSEQ_CONFIGURATION 0x420f
+
+struct __ptrace_rseq_configuration {
+	uint64_t rseq_abi_pointer;
+	uint32_t rseq_abi_size;
+	uint32_t signature;
+	uint32_t flags;
+	uint32_t pad;
+};
+#endif
+
 #ifdef PTRACE_EVENT_STOP
 #if PTRACE_EVENT_STOP == 7 /* Bad value from Linux 3.1-3.3, fixed in 3.4 */
 #undef PTRACE_EVENT_STOP
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 381184374..a172806f5 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -798,6 +798,15 @@ static int check_ptrace_dump_seccomp_filters(void)
 	return ret;
 }
 
+static int check_ptrace_get_rseq_conf(void)
+{
+	if (!kdat.has_ptrace_get_rseq_conf) {
+		pr_warn("ptrace(PTRACE_GET_RSEQ_CONFIGURATION) isn't supported. C/R of processes which are using rseq() won't work.\n");
+		return -1;
+	}
+	return 0;
+}
+
 static int check_mem_dirty_track(void)
 {
 	if (!kdat.has_dirty_track) {
@@ -1475,6 +1484,7 @@ int cr_check(void)
 		ret |= check_memfd_hugetlb();
 		ret |= check_move_mount_set_group();
 		ret |= check_openat2();
+		ret |= check_ptrace_get_rseq_conf();
 	}
 
 	/*
@@ -1591,6 +1601,7 @@ static struct feature_list feature_list[] = {
 	{ "memfd_hugetlb", check_memfd_hugetlb },
 	{ "move_mount_set_group", check_move_mount_set_group },
 	{ "openat2", check_openat2 },
+	{ "get_rseq_conf", check_ptrace_get_rseq_conf },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 986dcdc09..83d867e75 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -81,6 +81,7 @@ struct kerndat_s {
 	bool has_move_mount_set_group;
 	bool has_openat2;
 	bool has_rseq;
+	bool has_ptrace_get_rseq_conf;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 9d627aeec..551e18bae 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -4,6 +4,8 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/ptrace.h>
+#include <sys/wait.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <sys/syscall.h>
@@ -37,6 +39,7 @@
 #include "sockets.h"
 #include "net.h"
 #include "tun.h"
+#include <compel/ptrace.h>
 #include <compel/plugins/std/syscall-codes.h>
 #include "netfilter.h"
 #include "fsnotify.h"
@@ -919,6 +922,40 @@ static int kerndat_has_rseq(void)
 	return 0;
 }
 
+static int kerndat_has_ptrace_get_rseq_conf(void)
+{
+	pid_t pid;
+	int len;
+	struct __ptrace_rseq_configuration rseq;
+
+	pid = fork_and_ptrace_attach(NULL);
+	if (pid < 0)
+		return -1;
+
+	len = ptrace(PTRACE_GET_RSEQ_CONFIGURATION, pid, sizeof(rseq), &rseq);
+	if (len != sizeof(rseq)) {
+		kdat.has_ptrace_get_rseq_conf = false;
+		pr_info("ptrace(PTRACE_GET_RSEQ_CONFIGURATION) is not supported\n");
+		goto out;
+	}
+
+	/*
+	 * flags is always zero from the kernel side, if it will be changed
+	 * we need to pay attention to that and, possibly, make changes on the CRIU side.
+	 */
+	if (rseq.flags != 0) {
+		kdat.has_ptrace_get_rseq_conf = false;
+		pr_err("ptrace(PTRACE_GET_RSEQ_CONFIGURATION): rseq.flags != 0\n");
+	} else {
+		kdat.has_ptrace_get_rseq_conf = true;
+	}
+
+out:
+	kill(pid, SIGKILL);
+	waitpid(pid, NULL, 0);
+	return 0;
+}
+
 int kerndat_sockopt_buf_lock(void)
 {
 	int exit_code = -1;
@@ -1624,6 +1661,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_rseq failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_ptrace_get_rseq_conf()) {
+		pr_err("kerndat_has_ptrace_get_rseq_conf failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From f81e3062ca6a4a0376b63b31749773f8f0c09949 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 8 Apr 2022 23:03:37 +0300
Subject: [PATCH 1034/1854] rseq: initial support

Support basic rseq C/R scenario. Assume that:
- there are no processes with IP inside the rseq critical section (CS)
- kernel has ptrace(PTRACE_GET_RSEQ_CONFIGURATION) support

On dump:
1. use ptrace(PTRACE_GET_RSEQ_CONFIGURATION) to get
struct rseq pointer, rseq size and signature from the kernel.
2. save to the image

On restore:
1. get rseq ptr, size, signature from the image
2. register it back using rseq() from the restorer parasite

Fixes: #1696

Reported-by: Radostin Stoyanov <radostin@redhat.com>
Suggested-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-dump.c            |  70 +++++++++++++++++++
 criu/cr-restore.c         |  22 ++++++
 criu/include/linux/rseq.h | 137 ++++++++++++++++++++++++++++++++++++++
 criu/include/restorer.h   |   7 ++
 criu/pie/parasite.c       |   2 +
 criu/pie/restorer.c       |  25 +++++++
 images/Makefile           |   1 +
 images/core.proto         |   2 +
 images/rseq.proto         |   9 +++
 9 files changed, 275 insertions(+)
 create mode 100644 criu/include/linux/rseq.h
 create mode 100644 images/rseq.proto

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index c6678b450..02a9ea4bb 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -45,6 +45,7 @@
 #include "proc_parse.h"
 #include "parasite.h"
 #include "parasite-syscall.h"
+#include "compel/ptrace.h"
 #include "files.h"
 #include "files-reg.h"
 #include "shmem.h"
@@ -1003,6 +1004,69 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item)
 	return 0;
 }
 
+static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep)
+{
+	struct __ptrace_rseq_configuration rseq;
+	RseqEntry *rseqe = NULL;
+	int ret;
+
+	/*
+	 * If we are here it means that rseq() syscall is supported,
+	 * but ptrace(PTRACE_GET_RSEQ_CONFIGURATION) isn't supported,
+	 * we can just fail dump here. But this is bad idea, IMHO.
+	 *
+	 * So, we will try to detect if victim process was used rseq().
+	 * See check_rseq() and check_thread_rseq() functions.
+	 */
+	if (!kdat.has_ptrace_get_rseq_conf)
+		return 0;
+
+	ret = ptrace(PTRACE_GET_RSEQ_CONFIGURATION, tid, sizeof(rseq), &rseq);
+	if (ret != sizeof(rseq)) {
+		pr_perror("ptrace(PTRACE_GET_RSEQ_CONFIGURATION, %d) = %d", tid, ret);
+		return -1;
+	}
+
+	if (rseq.flags != 0) {
+		pr_err("something wrong with ptrace(PTRACE_GET_RSEQ_CONFIGURATION, %d) flags = 0x%x\n", tid,
+		       rseq.flags);
+		return -1;
+	}
+
+	pr_info("Dump rseq of %d: ptr = 0x%lx sign = 0x%x\n", tid, (unsigned long)rseq.rseq_abi_pointer,
+		rseq.signature);
+
+	rseqe = xmalloc(sizeof(*rseqe));
+	if (!rseqe)
+		return -1;
+
+	rseq_entry__init(rseqe);
+
+	rseqe->rseq_abi_pointer = rseq.rseq_abi_pointer;
+	rseqe->rseq_abi_size = rseq.rseq_abi_size;
+	rseqe->signature = rseq.signature;
+
+	*rseqep = rseqe;
+
+	return 0;
+}
+
+static int dump_task_rseq(pid_t pid, struct pstree_item *item)
+{
+	int i;
+
+	/* if rseq() syscall isn't supported then nothing to dump */
+	if (!kdat.has_rseq)
+		return 0;
+
+	for (i = 0; i < item->nr_threads; i++) {
+		if (dump_thread_rseq(item->threads[i].real, &item->core[i]->thread_core->rseq_entry))
+			return -1;
+	}
+
+	return 0;
+}
+
 static struct proc_pid_stat pps_buf;
 
 static int dump_task_threads(struct parasite_ctl *parasite_ctl, const struct pstree_item *item)
@@ -1298,6 +1362,12 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 		goto err;
 	}
 
+	ret = dump_task_rseq(pid, item);
+	if (ret) {
+		pr_err("Dump %d rseq failed %d\n", pid, ret);
+		goto err;
+	}
+
 	parasite_ctl = parasite_infect_seized(pid, item, &vmas);
 	if (!parasite_ctl) {
 		pr_err("Can't infect (pid: %d) with parasite\n", pid);
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index a398927ad..ed576fc55 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2994,6 +2994,24 @@ static int prep_sched_info(struct rst_sched_param *sp, ThreadCoreEntry *tc)
 	return 0;
 }
 
+static int prep_rseq(struct rst_rseq_param *rseq, ThreadCoreEntry *tc)
+{
+	/* compatibility with older CRIU versions */
+	if (!tc->rseq_entry)
+		return 0;
+
+	rseq->rseq_abi_pointer = tc->rseq_entry->rseq_abi_pointer;
+	rseq->rseq_abi_size = tc->rseq_entry->rseq_abi_size;
+	rseq->signature = tc->rseq_entry->signature;
+
+	if (rseq->rseq_abi_pointer && !kdat.has_rseq) {
+		pr_err("rseq: can't restore as kernel doesn't support it\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static rlim_t decode_rlim(rlim_t ival)
 {
 	return ival == -1 ? RLIM_INFINITY : ival;
@@ -3704,6 +3722,10 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		thread_args[i].clear_tid_addr = CORE_THREAD_ARCH_INFO(tcore)->clear_tid_addr;
 		core_get_tls(tcore, &thread_args[i].tls);
 
+		ret = prep_rseq(&thread_args[i].rseq, tcore->thread_core);
+		if (ret)
+			goto err;
+
 		rst_reloc_creds(&thread_args[i], &creds_pos_next);
 
 		thread_args[i].futex_rla = tcore->thread_core->futex_rla;
diff --git a/criu/include/linux/rseq.h b/criu/include/linux/rseq.h
new file mode 100644
index 000000000..b227aefdf
--- /dev/null
+++ b/criu/include/linux/rseq.h
@@ -0,0 +1,137 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_RSEQ_H
+#define _UAPI_LINUX_RSEQ_H
+
+/*
+ * linux/rseq.h
+ *
+ * Restartable sequences system call API
+ *
+ * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+enum rseq_cpu_id_state {
+	RSEQ_CPU_ID_UNINITIALIZED = -1,
+	RSEQ_CPU_ID_REGISTRATION_FAILED = -2,
+};
+
+enum rseq_flags {
+	RSEQ_FLAG_UNREGISTER = (1 << 0),
+};
+
+enum rseq_cs_flags_bit {
+	RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0,
+	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1,
+	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2,
+};
+
+enum rseq_cs_flags {
+	RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT),
+	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT),
+	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT),
+};
+
+/*
+ * struct rseq_cs is aligned on 4 * 8 bytes to ensure it is always
+ * contained within a single cache-line. It is usually declared as
+ * link-time constant data.
+ */
+struct rseq_cs {
+	/* Version of this structure. */
+	__u32 version;
+	/* enum rseq_cs_flags */
+	__u32 flags;
+	__u64 start_ip;
+	/* Offset from start_ip. */
+	__u64 post_commit_offset;
+	__u64 abort_ip;
+} __attribute__((aligned(4 * sizeof(__u64))));
+
+/*
+ * We have to have our own copy of struct rseq definition because
+ * of breaking UAPI change:
+ * https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=bfdf4e6208051ed7165b2e92035b4bf11f43eb63
+ */
+/*
+ * struct rseq is aligned on 4 * 8 bytes to ensure it is always
+ * contained within a single cache-line.
+ *
+ * A single struct rseq per thread is allowed.
+ */
+struct criu_rseq {
+	/*
+	 * Restartable sequences cpu_id_start field. Updated by the
+	 * kernel. Read by user-space with single-copy atomicity
+	 * semantics. This field should only be read by the thread which
+	 * registered this data structure. Aligned on 32-bit. Always
+	 * contains a value in the range of possible CPUs, although the
+	 * value may not be the actual current CPU (e.g. if rseq is not
+	 * initialized). This CPU number value should always be compared
+	 * against the value of the cpu_id field before performing a rseq
+	 * commit or returning a value read from a data structure indexed
+	 * using the cpu_id_start value.
+	 */
+	__u32 cpu_id_start;
+	/*
+	 * Restartable sequences cpu_id field. Updated by the kernel.
+	 * Read by user-space with single-copy atomicity semantics. This
+	 * field should only be read by the thread which registered this
+	 * data structure. Aligned on 32-bit. Values
+	 * RSEQ_CPU_ID_UNINITIALIZED and RSEQ_CPU_ID_REGISTRATION_FAILED
+	 * have a special semantic: the former means "rseq uninitialized",
+	 * and latter means "rseq initialization failed". This value is
+	 * meant to be read within rseq critical sections and compared
+	 * with the cpu_id_start value previously read, before performing
+	 * the commit instruction, or read and compared with the
+	 * cpu_id_start value before returning a value loaded from a data
+	 * structure indexed using the cpu_id_start value.
+	 */
+	__u32 cpu_id;
+	/*
+	 * Restartable sequences rseq_cs field.
+	 *
+	 * Contains NULL when no critical section is active for the current
+	 * thread, or holds a pointer to the currently active struct rseq_cs.
+	 *
+	 * Updated by user-space, which sets the address of the currently
+	 * active rseq_cs at the beginning of assembly instruction sequence
+	 * block, and set to NULL by the kernel when it restarts an assembly
+	 * instruction sequence block, as well as when the kernel detects that
+	 * it is preempting or delivering a signal outside of the range
+	 * targeted by the rseq_cs. Also needs to be set to NULL by user-space
+	 * before reclaiming memory that contains the targeted struct rseq_cs.
+	 *
+	 * Read and set by the kernel. Set by user-space with single-copy
+	 * atomicity semantics. This field should only be updated by the
+	 * thread which registered this data structure. Aligned on 64-bit.
+	 *
+	 * 32-bit architectures should update the low order bits of the
+	 * rseq_cs field, leaving the high order bits initialized to 0.
+	 */
+	__u64 rseq_cs;
+
+	/*
+	 * Restartable sequences flags field.
+	 *
+	 * This field should only be updated by the thread which
+	 * registered this data structure. Read by the kernel.
+	 * Mainly used for single-stepping through rseq critical sections
+	 * with debuggers.
+	 *
+	 * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT
+	 *     Inhibit instruction sequence block restart on preemption
+	 *     for this thread.
+	 * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL
+	 *     Inhibit instruction sequence block restart on signal
+	 *     delivery for this thread.
+	 * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE
+	 *     Inhibit instruction sequence block restart on migration for
+	 *     this thread.
+	 */
+	__u32 flags;
+} __attribute__((aligned(4 * sizeof(__u64))));
+
+#endif /* _UAPI_LINUX_RSEQ_H */
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 308a0b79b..2e21da522 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -44,6 +44,12 @@ struct rst_sched_param {
 	int prio;
 };
 
+struct rst_rseq_param {
+	u64 rseq_abi_pointer;
+	u32 rseq_abi_size;
+	u32 signature;
+};
+
 struct restore_posix_timer {
 	struct str_posix_timer spt;
 	struct itimerspec val;
@@ -98,6 +104,7 @@ struct thread_restore_args {
 	struct task_restore_args *ta;
 
 	tls_t tls;
+	struct rst_rseq_param rseq;
 
 	siginfo_t *siginfo;
 	unsigned int siginfo_n;
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index f84652b8c..e17321894 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -8,6 +8,8 @@
 #include <sys/ioctl.h>
 #include <sys/uio.h>
 
+#include "linux/rseq.h"
+
 #include "common/config.h"
 #include "int.h"
 #include "types.h"
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 422a12ff8..376a5025d 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -425,6 +425,28 @@ static int restore_signals(siginfo_t *ptr, int nr, bool group)
 	return 0;
 }
 
+static int restore_rseq(struct rst_rseq_param *rseq)
+{
+	int ret;
+
+	if (!rseq->rseq_abi_pointer) {
+		pr_debug("rseq: nothing to restore\n");
+		return 0;
+	}
+
+	pr_debug("rseq: rseq_abi_pointer = %lx signature = %x\n", (unsigned long)rseq->rseq_abi_pointer,
+		 rseq->signature);
+
+	ret = sys_rseq(decode_pointer(rseq->rseq_abi_pointer), rseq->rseq_abi_size, 0, rseq->signature);
+	if (ret) {
+		pr_err("failed sys_rseq(%lx, %lx, %x, %x) = %d\n", (unsigned long)rseq->rseq_abi_pointer,
+		       (unsigned long)rseq->rseq_abi_size, 0, rseq->signature, ret);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int restore_seccomp_filter(pid_t tid, struct thread_restore_args *args)
 {
 	unsigned int flags = args->seccomp_force_tsync ? SECCOMP_FILTER_FLAG_TSYNC : 0;
@@ -549,6 +571,9 @@ static int restore_thread_common(struct thread_restore_args *args)
 
 	restore_tls(&args->tls);
 
+	if (restore_rseq(&args->rseq))
+		return -1;
+
 	return 0;
 }
 
diff --git a/images/Makefile b/images/Makefile
index 2eaeb7cad..004e22ec3 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -71,6 +71,7 @@ proto-obj-y	+= img-streamer.o
 proto-obj-y	+= bpfmap-file.o
 proto-obj-y	+= bpfmap-data.o
 proto-obj-y	+= apparmor.o
+proto-obj-y	+= rseq.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/core.proto b/images/core.proto
index b713119f2..35079f366 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -14,6 +14,7 @@ import "timer.proto";
 import "creds.proto";
 import "sa.proto";
 import "siginfo.proto";
+import "rseq.proto";
 
 import "opts.proto";
 
@@ -101,6 +102,7 @@ message thread_core_entry {
 
 	optional string			comm		= 13;
 	optional uint64			blk_sigset_extended	= 14;
+	optional rseq_entry		rseq_entry	= 15;
 }
 
 message task_rlimits_entry {
diff --git a/images/rseq.proto b/images/rseq.proto
new file mode 100644
index 000000000..be2800468
--- /dev/null
+++ b/images/rseq.proto
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+
+syntax = "proto2";
+
+message rseq_entry {
+	required uint64 rseq_abi_pointer	= 1;
+	required uint32 rseq_abi_size		= 2;
+	required uint32 signature		= 3;
+}

From c5162cef529807f6fa57f23130c72f28aa838aa7 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 8 Apr 2022 23:04:08 +0300
Subject: [PATCH 1035/1854] rseq: fail dump if rseq is used but host doesn't
 support get_rseq_conf feature

A lot of kernel versions lacks support for ptrace(PTRACE_GET_RSEQ_CONFIGURATION).
But the userspace may be fresh (for instance containers with fresh Fedora runs
on CentOS 7 host). Consider two scenarious:

- kernel has no ptrace(PTRACE_GET_RSEQ_CONFIGURATION) support

1. there is a process which use rseq => fail dump
2. there is no process which use rseq => we can dump without any problems

But how to determine if process use rseq or not without get_rseq_conf feature?
Let's just try to do rseq registration from the parasite. If rseq is already
registered then we'll got EBUSY error. If not we'll success in registration.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-dump.c          | 30 +++++++++++++
 criu/include/parasite.h |  7 +++
 criu/parasite-syscall.c | 11 +++++
 criu/pie/parasite.c     | 98 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 02a9ea4bb..c1df3c901 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -188,6 +188,25 @@ static int dump_sched_info(int pid, ThreadCoreEntry *tc)
 	return 0;
 }
 
+static int check_thread_rseq(pid_t tid, const struct parasite_check_rseq *ti_rseq)
+{
+	if (!kdat.has_rseq || kdat.has_ptrace_get_rseq_conf)
+		return 0;
+
+	pr_debug("%d has rseq_inited = %d\n", tid, ti_rseq->rseq_inited);
+
+	/*
+	 * We have no kdat.has_ptrace_get_rseq_conf and user
+	 * process has rseq() used, let's fail dump.
+	 */
+	if (ti_rseq->rseq_inited) {
+		pr_err("%d has rseq but kernel lacks get_rseq_conf feature\n", tid);
+		return -1;
+	}
+
+	return 0;
+}
+
 struct cr_imgset *glob_imgset;
 
 static int collect_fds(pid_t pid, struct parasite_drain_fd **dfds)
@@ -718,6 +737,17 @@ int dump_thread_core(int pid, CoreEntry *core, const struct parasite_dump_thread
 	if (!ret)
 		ret = seccomp_dump_thread(pid, tc);
 
+	/*
+	 * We are dumping rseq() in the dump_thread_rseq() function,
+	 * *before* processes gets infected (because of ptrace requests
+	 * API restriction). At this point, if the kernel lacks
+	 * kdat.has_ptrace_get_rseq_conf support we have to ensure
+	 * that dumpable processes haven't initialized rseq() or
+	 * fail dump if rseq() was used.
+	 */
+	if (!ret)
+		ret = check_thread_rseq(pid, &ti->rseq);
+
 	return ret;
 }
 
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 8107aa49d..5fde80996 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -164,10 +164,17 @@ struct parasite_dump_creds {
 	unsigned int groups[0];
 };
 
+struct parasite_check_rseq {
+	bool has_rseq;
+	bool has_ptrace_get_rseq_conf; /* no need to check if supported */
+	bool rseq_inited;
+};
+
 struct parasite_dump_thread {
 	unsigned int *tid_addr;
 	pid_t tid;
 	tls_t tls;
+	struct parasite_check_rseq rseq;
 	stack_t sas;
 	int pdeath_sig;
 	char comm[TASK_COMM_LEN];
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 7175adee1..ee4fa86f4 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -132,6 +132,13 @@ static int alloc_groups_copy_creds(CredsEntry *ce, struct parasite_dump_creds *c
 	return ce->groups ? 0 : -ENOMEM;
 }
 
+static void init_parasite_rseq_arg(struct parasite_check_rseq *rseq)
+{
+	rseq->has_rseq = kdat.has_rseq;
+	rseq->has_ptrace_get_rseq_conf = kdat.has_ptrace_get_rseq_conf;
+	rseq->rseq_inited = false;
+}
+
 int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core)
 {
 	ThreadCoreEntry *tc = core->thread_core;
@@ -144,6 +151,8 @@ int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEn
 	pc = args->creds;
 	pc->cap_last_cap = kdat.last_cap;
 
+	init_parasite_rseq_arg(&args->rseq);
+
 	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_THREAD, ctl);
 	if (ret < 0)
 		return ret;
@@ -197,6 +206,8 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, struct parasit
 
 	compel_arch_get_tls_thread(tctl, &args->tls);
 
+	init_parasite_rseq_arg(&args->rseq);
+
 	ret = compel_run_in_thread(tctl, PARASITE_CMD_DUMP_THREAD);
 	if (ret) {
 		pr_err("Can't init thread in parasite %d\n", pid);
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index e17321894..e7eb1fcb6 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -169,6 +169,7 @@ static int dump_posix_timers(struct parasite_dump_posix_timers_args *args)
 }
 
 static int dump_creds(struct parasite_dump_creds *args);
+static int check_rseq(struct parasite_check_rseq *rseq);
 
 static int dump_thread_common(struct parasite_dump_thread *ti)
 {
@@ -199,6 +200,12 @@ static int dump_thread_common(struct parasite_dump_thread *ti)
 		goto out;
 	}
 
+	ret = check_rseq(&ti->rseq);
+	if (ret) {
+		pr_err("Unable to check if rseq() is initialized: %d\n", ret);
+		goto out;
+	}
+
 	ret = dump_creds(ti->creds);
 out:
 	return ret;
@@ -315,6 +322,97 @@ grps_err:
 	return -1;
 }
 
+static int check_rseq(struct parasite_check_rseq *rseq)
+{
+	int ret;
+	unsigned long rseq_abi_pointer;
+	unsigned long rseq_abi_size;
+	uint32_t rseq_signature;
+	void *addr;
+
+	/* no need to do hacky check if we can get all info from ptrace() */
+	if (!rseq->has_rseq || rseq->has_ptrace_get_rseq_conf)
+		return 0;
+
+	/*
+	 * We need to determine if victim process has rseq()
+	 * initialized, but we have no *any* proper kernel interface
+	 * supported at this point.
+	 * Our plan:
+	 * 1. We know that if we call rseq() syscall and process already
+	 * has current->rseq filled, then we get:
+	 * -EINVAL if current->rseq != rseq || rseq_len != sizeof(*rseq),
+	 * -EPERM  if current->rseq_sig != sig),
+	 * -EBUSY  if current->rseq == rseq && rseq_len == sizeof(*rseq) &&
+	 *            current->rseq_sig != sig
+	 * if current->rseq == NULL (rseq() wasn't used) then we go to:
+	 * IS_ALIGNED(rseq ...) check, if we fail it we get -EINVAL and it
+	 * will be hard to distinguish case when rseq() was initialized or not.
+	 * Let's construct arguments payload
+	 * with:
+	 * 1. correct rseq_abi_size
+	 * 2. aligned and correct rseq_abi_pointer
+	 * And see what rseq() return to us.
+	 * If ret value is:
+	 * 0: it means that rseq *wasn't* used and we successfully registered it,
+	 * -EINVAL or : it means that rseq is already initialized,
+	 * so we *have* to dump it. But as we have has_ptrace_get_rseq_conf = false,
+	 * we should just fail dump as it's unsafe to skip rseq() dump for processes
+	 * with rseq() initialized.
+	 * -EPERM or -EBUSY: should not happen as we take a fresh memory area for rseq
+	 */
+	addr = (void *)sys_mmap(NULL, sizeof(struct criu_rseq), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1,
+				0);
+	if (addr == MAP_FAILED) {
+		pr_err("mmap() failed for struct rseq ret = %lx\n", (unsigned long)addr);
+		return -1;
+	}
+
+	memset(addr, 0, sizeof(struct criu_rseq));
+
+	/* sys_mmap returns page aligned addresses */
+	rseq_abi_pointer = (unsigned long)addr;
+	rseq_abi_size = (unsigned long)sizeof(struct criu_rseq);
+	/* it's not so important to have unique signature for us,
+	 * because rseq_abi_pointer is guaranteed to be unique
+	 */
+	rseq_signature = 0x12345612;
+
+	pr_info("\ttrying sys_rseq(%lx, %lx, %x, %x)\n", rseq_abi_pointer, rseq_abi_size, 0, rseq_signature);
+	ret = sys_rseq((void *)rseq_abi_pointer, rseq_abi_size, 0, rseq_signature);
+	if (ret) {
+		if (ret == -EINVAL) {
+			pr_info("\trseq is initialized in the victim\n");
+			rseq->rseq_inited = true;
+
+			ret = 0;
+		} else {
+			pr_err("\tunexpected failure of sys_rseq(%lx, %lx, %x, %x) = %d\n", rseq_abi_pointer,
+			       rseq_abi_size, 0, rseq_signature, ret);
+
+			ret = -1;
+		}
+	} else {
+		ret = sys_rseq((void *)rseq_abi_pointer, sizeof(struct criu_rseq), RSEQ_FLAG_UNREGISTER,
+			       rseq_signature);
+		if (ret) {
+			pr_err("\tfailed to unregister sys_rseq(%lx, %lx, %x, %x) = %d\n", rseq_abi_pointer,
+			       rseq_abi_size, RSEQ_FLAG_UNREGISTER, rseq_signature, ret);
+
+			ret = -1;
+			/* we can't do munmap() because rseq is registered and we failed to unregister it */
+			goto out_nounmap;
+		}
+
+		rseq->rseq_inited = false;
+		ret = 0;
+	}
+
+	sys_munmap(addr, sizeof(struct criu_rseq));
+out_nounmap:
+	return ret;
+}
+
 static int fill_fds_fown(int fd, struct fd_opts *p)
 {
 	int flags, ret;

From 51e0d3e29f9207e6e95eece02ba98ca1978cf945 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 21 Dec 2021 23:40:01 +0300
Subject: [PATCH 1036/1854] zdtm: add basic static/rseq00 test for rseq C/R

Here we just want to check that if rseq was registered before C/R
it remains registered after it.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/static/Makefile    |   1 +
 test/zdtm/static/rseq00.c    | 110 +++++++++++++++++++++++++++++++++++
 test/zdtm/static/rseq00.desc |   1 +
 3 files changed, 112 insertions(+)
 create mode 100644 test/zdtm/static/rseq00.c
 create mode 100644 test/zdtm/static/rseq00.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index de64dd2ed..9dc02d4a5 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -61,6 +61,7 @@ TST_NOFILE	:=				\
 		pthread02			\
 		pthread_timers			\
 		pthread_timers_h		\
+		rseq00				\
 		vdso00				\
 		vdso01				\
 		vdso02				\
diff --git a/test/zdtm/static/rseq00.c b/test/zdtm/static/rseq00.c
new file mode 100644
index 000000000..b73b1b258
--- /dev/null
+++ b/test/zdtm/static/rseq00.c
@@ -0,0 +1,110 @@
+/*
+ * test for rseq() syscall
+ * See also https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/
+ * https://github.com/torvalds/linux/commit/d7822b1e24f2df5df98c76f0e94a5416349ff759
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <syscall.h>
+
+#include "zdtmtst.h"
+
+#if defined(__x86_64__)
+
+const char *test_doc = "Check that rseq() basic C/R works";
+const char *test_author = "Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>";
+
+/* some useful definitions from kernel uapi */
+enum rseq_flags {
+	RSEQ_FLAG_UNREGISTER = (1 << 0),
+};
+
+struct rseq {
+	uint32_t cpu_id_start;
+	uint32_t cpu_id;
+	uint64_t rseq_cs;
+	uint32_t flags;
+} __attribute__((aligned(4 * sizeof(uint64_t))));
+
+#ifndef __NR_rseq
+#define __NR_rseq 334
+#endif
+/* EOF */
+
+static __thread volatile struct rseq __rseq_abi;
+
+#define RSEQ_SIG 0x53053053
+
+static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig)
+{
+	return syscall(__NR_rseq, rseq_abi, rseq_len, flags, sig);
+}
+
+static void register_thread(void)
+{
+	int rc;
+	rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG);
+	if (rc) {
+		fail("Failed to register rseq");
+		exit(1);
+	}
+}
+
+static void unregister_thread(void)
+{
+	int rc;
+	rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG);
+	if (rc) {
+		fail("Failed to unregister rseq");
+		exit(1);
+	}
+}
+
+static void check_thread(void)
+{
+	int rc;
+	rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG);
+	if (!(rc && errno == EBUSY)) {
+		fail("Failed to check rseq %d", rc);
+		exit(1);
+	}
+}
+
+int main(int argc, char *argv[])
+{
+	test_init(argc, argv);
+
+	register_thread();
+
+	test_daemon();
+	test_waitsig();
+
+	check_thread();
+
+	pass();
+	return 0;
+}
+
+#else /* #if defined(__x86_64__) */
+
+int main(int argc, char *argv[])
+{
+	test_init(argc, argv);
+	skip("Unsupported arch");
+	test_daemon();
+	test_waitsig();
+	pass();
+	return 0;
+}
+
+#endif /* #if defined(__x86_64__) */
\ No newline at end of file
diff --git a/test/zdtm/static/rseq00.desc b/test/zdtm/static/rseq00.desc
new file mode 100644
index 000000000..0324fa39c
--- /dev/null
+++ b/test/zdtm/static/rseq00.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'arch': 'x86_64', 'feature': 'get_rseq_conf'}

From 03aff7e823cd55980750c6c306dbe6b6acd28b6a Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 21 Dec 2021 23:42:26 +0300
Subject: [PATCH 1037/1854] Revert "ci: disable glibc rseq support"

Let's see how rseq() C/R feature works

This reverts commit d99def7dcfa938918368c91021f72a77f738bc61.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 scripts/build/Dockerfile.fedora.tmpl | 3 ---
 scripts/ci/run-ci-tests.sh           | 7 +------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index fd4ba4aef..9d3bb0f87 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -1,8 +1,5 @@
 ARG CC=gcc
 
-# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696
-ENV GLIBC_TUNABLES=glibc.pthread.rseq=0
-
 COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
 RUN /bin/prepare-for-fedora-rawhide.sh
 
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 0eb065143..216c84505 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -255,12 +255,7 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run
 fi
-
-# FIXME: rpc tests fail even with set glibc tunable
-# https://github.com/checkpoint-restore/criu/issues/1696
-if [ "$GLIBC_TUNABLES" != "glibc.pthread.rseq=0" ]; then
-	make -C test/others/rpc/ run
-fi
+make -C test/others/rpc/ run
 
 ./test/zdtm.py run -t zdtm/static/env00 --sibling
 

From 267c1fdadebf016e6ef5a5ea9397b0a1d72ff497 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 23 Dec 2021 14:57:43 +0300
Subject: [PATCH 1038/1854] ci: add Fedora Rawhide based test on Cirrus

We have ability to use nested virtualization on
Cirrus, and already have "Vagrant Fedora based test (no VDSO)"
test, let's do analogical for Fedora Rawhide to get fresh kernel.

Suggested-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 .cirrus.yml           | 21 +++++++++++++++++++++
 scripts/ci/Makefile   |  7 +++++--
 scripts/ci/vagrant.sh | 12 ++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 588cf3e82..2b6903ddc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -19,6 +19,27 @@ task:
   build_script: |
     make -C scripts/ci vagrant-fedora-no-vdso
 
+task:
+  name: Vagrant Fedora Rawhide based test
+  environment:
+    HOME: "/root"
+    CIRRUS_WORKING_DIR: "/tmp/criu"
+
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-kvm
+    platform: linux
+    cpu: 4
+    memory: 16G
+    nested_virtualization: true
+
+  setup_script: |
+    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
+    sudo kvm-ok
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+  build_script: |
+    make -C scripts/ci vagrant-fedora-rawhide
+
 task:
   name: CentOS 8 based test
   environment:
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 3e4d59430..eaab2f201 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -41,7 +41,7 @@ export CONTAINER_TERMINAL
 ifeq ($(UNAME),x86_64)
 	# On anything besides x86_64 Travis is running unprivileged LXD
 	# containers which do not support running docker with '--privileged'.
-	CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged -v /lib/modules:/lib/modules --tmpfs /run
+	CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged --userns=host --cgroupns=host -v /lib/modules:/lib/modules --tmpfs /run
 else
 	CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
 endif
@@ -92,7 +92,10 @@ setup-vagrant:
 vagrant-fedora-no-vdso: setup-vagrant
 	./vagrant.sh fedora-no-vdso
 
-.PHONY: setup-vagrant vagrant-fedora-no-vdso
+vagrant-fedora-rawhide: setup-vagrant
+	./vagrant.sh fedora-rawhide
+
+.PHONY: setup-vagrant vagrant-fedora-no-vdso vagrant-fedora-rawhide
 
 %:
 	$(MAKE) -C ../build $@$(target-suffix)
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 0440193bc..af0f7335a 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -56,4 +56,16 @@ fedora-no-vdso() {
 	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2'
 }
 
+fedora-rawhide() {
+	#
+	# Workaround the problem:
+	# error running container: error from /usr/bin/crun creating container for [...]: sd-bus call: Transport endpoint is not connected
+	# Let's just use runc instead of crun
+	# see also https://github.com/kata-containers/tests/issues/4283
+	#
+	ssh default 'sudo dnf remove -y crun || true'
+	ssh default sudo dnf install -y podman runc
+	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"'
+}
+
 $1

From e1799e530584e9d47acb4700ef7a7a44c4af1443 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 22 Feb 2022 14:58:10 +0300
Subject: [PATCH 1039/1854] include: add thread_pointer.h from Glibc

Let's take thread_pointer() implementation from Glibc.
It will be useful in the further because Glibc stores
struct rseq on the TLS. Absolute address can be calculated
as __criu_thread_pointer() + __rseq_offset.
__rseq_offset is an exported symbol from Glibc itself.

We need to have an ability to determine where struct
rseq is stored to unregister it in CRIU during the restore
stage.

For different libc like musl-libc we will have to handle
rseq separately depends on how struct rseq is stored.

Right now that's not a problem because musl-libc has no
rseq support, so we don't need to unregister it.

https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=8dbeb0561eeb876f557ac9eef5721912ec074ea5
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=cb976fba4c51ede7bf8cee5035888527c308dfbc

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 .../arch/aarch64/include/asm/thread_pointer.h | 27 ++++++++++++++
 criu/arch/arm/include/asm/thread_pointer.h    | 27 ++++++++++++++
 criu/arch/mips/include/asm/thread_pointer.h   | 27 ++++++++++++++
 criu/arch/ppc64/include/asm/thread_pointer.h  | 33 +++++++++++++++++
 criu/arch/s390/include/asm/thread_pointer.h   | 27 ++++++++++++++
 criu/arch/x86/include/asm/thread_pointer.h    | 37 +++++++++++++++++++
 6 files changed, 178 insertions(+)
 create mode 100644 criu/arch/aarch64/include/asm/thread_pointer.h
 create mode 100644 criu/arch/arm/include/asm/thread_pointer.h
 create mode 100644 criu/arch/mips/include/asm/thread_pointer.h
 create mode 100644 criu/arch/ppc64/include/asm/thread_pointer.h
 create mode 100644 criu/arch/s390/include/asm/thread_pointer.h
 create mode 100644 criu/arch/x86/include/asm/thread_pointer.h

diff --git a/criu/arch/aarch64/include/asm/thread_pointer.h b/criu/arch/aarch64/include/asm/thread_pointer.h
new file mode 100644
index 000000000..f7e07066a
--- /dev/null
+++ b/criu/arch/aarch64/include/asm/thread_pointer.h
@@ -0,0 +1,27 @@
+/* __thread_pointer definition.  Generic version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __builtin_thread_pointer();
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
diff --git a/criu/arch/arm/include/asm/thread_pointer.h b/criu/arch/arm/include/asm/thread_pointer.h
new file mode 100644
index 000000000..f7e07066a
--- /dev/null
+++ b/criu/arch/arm/include/asm/thread_pointer.h
@@ -0,0 +1,27 @@
+/* __thread_pointer definition.  Generic version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __builtin_thread_pointer();
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
diff --git a/criu/arch/mips/include/asm/thread_pointer.h b/criu/arch/mips/include/asm/thread_pointer.h
new file mode 100644
index 000000000..f7e07066a
--- /dev/null
+++ b/criu/arch/mips/include/asm/thread_pointer.h
@@ -0,0 +1,27 @@
+/* __thread_pointer definition.  Generic version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __builtin_thread_pointer();
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
diff --git a/criu/arch/ppc64/include/asm/thread_pointer.h b/criu/arch/ppc64/include/asm/thread_pointer.h
new file mode 100644
index 000000000..304516fbe
--- /dev/null
+++ b/criu/arch/ppc64/include/asm/thread_pointer.h
@@ -0,0 +1,33 @@
+/* __thread_pointer definition.  powerpc version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+#ifdef __powerpc64__
+register void *__thread_register asm("r13");
+#else
+register void *__thread_register asm("r2");
+#endif
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __thread_register;
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
\ No newline at end of file
diff --git a/criu/arch/s390/include/asm/thread_pointer.h b/criu/arch/s390/include/asm/thread_pointer.h
new file mode 100644
index 000000000..f7e07066a
--- /dev/null
+++ b/criu/arch/s390/include/asm/thread_pointer.h
@@ -0,0 +1,27 @@
+/* __thread_pointer definition.  Generic version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __builtin_thread_pointer();
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
diff --git a/criu/arch/x86/include/asm/thread_pointer.h b/criu/arch/x86/include/asm/thread_pointer.h
new file mode 100644
index 000000000..08603aed4
--- /dev/null
+++ b/criu/arch/x86/include/asm/thread_pointer.h
@@ -0,0 +1,37 @@
+/* __thread_pointer definition.  x86 version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+#if __GNUC_PREREQ(11, 1)
+	return __builtin_thread_pointer();
+#else
+	void *__result;
+#ifdef __x86_64__
+	__asm__("mov %%fs:0, %0" : "=r"(__result));
+#else
+	__asm__("mov %%gs:0, %0" : "=r"(__result));
+#endif
+	return __result;
+#endif /* !GCC 11 */
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
\ No newline at end of file

From f70ddab24eeb99fcbab0015c8338b673d002d5e6 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 24 Dec 2021 18:57:54 +0300
Subject: [PATCH 1040/1854] pie/restorer: unregister (g)libc rseq before memory
 restoration

Fresh glibc does rseq registration by default during start_thread().
[ see https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=95e114a0919d844d8fe07839cb6538b7f5ee920e ]

This cause process crashes during memory restore procedure, because
memory which corresponds to the struct rseq will be unmapped and overriden
in __export_restore_task.

Let's perform rseq unregistration just before unmap_old_vmas(). To achieve
that we need to determine (struct rseq) address at first while we are in Glibc
(we do that in prep_libc_rseq_info using Glibc exported symbols).

See also
("nptl: Add public rseq symbols and <sys/rseq.h>")
https://sourceware.org/git?p=glibc.git;a=commit;h=c901c3e764d7c7079f006b4e21e877d5036eb4f5
("nptl: Add <thread_pointer.h> for defining __thread_pointer")
https://sourceware.org/git?p=glibc.git;a=commit;h=8dbeb0561eeb876f557ac9eef5721912ec074ea5

TODO: do the same for musl-libc if it will start to register rseq by default

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-restore.c         | 29 +++++++++++++++++++++++++++++
 criu/include/linux/rseq.h |  9 +++++++++
 criu/include/restorer.h   |  6 ++++++
 criu/pie/restorer.c       | 18 ++++++++++++++++++
 4 files changed, 62 insertions(+)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ed576fc55..0751c5b8d 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -23,6 +23,7 @@
 #include "common/compiler.h"
 
 #include "linux/mount.h"
+#include "linux/rseq.h"
 
 #include "clone-noasan.h"
 #include "cr_options.h"
@@ -3012,6 +3013,32 @@ static int prep_rseq(struct rst_rseq_param *rseq, ThreadCoreEntry *tc)
 	return 0;
 }
 
+#if defined(__GLIBC__) && defined(RSEQ_SIG)
+static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
+{
+	if (!kdat.has_rseq) {
+		rseq->rseq_abi_pointer = 0;
+		return;
+	}
+
+	rseq->rseq_abi_pointer = encode_pointer(__criu_thread_pointer() + __rseq_offset);
+	rseq->rseq_abi_size = __rseq_size;
+	rseq->signature = RSEQ_SIG;
+}
+#else
+static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
+{
+	/*
+	 * TODO: handle built-in rseq on other libc'ies like musl
+	 * We can do that using get_rseq_conf kernel feature.
+	 *
+	 * For now we just assume that other libc libraries are
+	 * not registering rseq by default.
+	 */
+	rseq->rseq_abi_pointer = 0;
+}
+#endif
+
 static rlim_t decode_rlim(rlim_t ival)
 {
 	return ival == -1 ? RLIM_INFINITY : ival;
@@ -3665,6 +3692,8 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	strncpy(task_args->comm, core->tc->comm, TASK_COMM_LEN - 1);
 	task_args->comm[TASK_COMM_LEN - 1] = 0;
 
+	prep_libc_rseq_info(&task_args->libc_rseq);
+
 	/*
 	 * Fill up per-thread data.
 	 */
diff --git a/criu/include/linux/rseq.h b/criu/include/linux/rseq.h
index b227aefdf..a47876e66 100644
--- a/criu/include/linux/rseq.h
+++ b/criu/include/linux/rseq.h
@@ -2,6 +2,14 @@
 #ifndef _UAPI_LINUX_RSEQ_H
 #define _UAPI_LINUX_RSEQ_H
 
+#ifdef __has_include
+#if __has_include("sys/rseq.h")
+#include <sys/rseq.h>
+#include "asm/thread_pointer.h"
+#endif
+#endif
+
+#ifndef __GLIBC_HAVE_KERNEL_RSEQ
 /*
  * linux/rseq.h
  *
@@ -49,6 +57,7 @@ struct rseq_cs {
 	__u64 post_commit_offset;
 	__u64 abort_ip;
 } __attribute__((aligned(4 * sizeof(__u64))));
+#endif /* __GLIBC_HAVE_KERNEL_RSEQ */
 
 /*
  * We have to have our own copy of struct rseq definition because
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 2e21da522..325804e44 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -229,6 +229,12 @@ struct task_restore_args {
 	int lsm_type;
 	int child_subreaper;
 	bool has_clone3_set_tid;
+
+	/*
+	 * info about rseq from libc used to
+	 * unregister it before memory restoration procedure
+	 */
+	struct rst_rseq_param libc_rseq;
 } __aligned(64);
 
 /*
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 376a5025d..f80b68359 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1122,6 +1122,15 @@ void __export_unmap(void)
 	sys_munmap(bootstrap_start, bootstrap_len - vdso_rt_size);
 }
 
+static void unregister_libc_rseq(struct rst_rseq_param *rseq)
+{
+	if (!rseq->rseq_abi_pointer)
+		return;
+
+	/* can't fail if rseq is registered */
+	sys_rseq(decode_pointer(rseq->rseq_abi_pointer), rseq->rseq_abi_size, 1, rseq->signature);
+}
+
 /*
  * This function unmaps all VMAs, which don't belong to
  * the restored process or the restorer.
@@ -1461,6 +1470,15 @@ long __export_restore_task(struct task_restore_args *args)
 			goto core_restore_end;
 	}
 
+	/*
+	 * We may have rseq registered already if CRIU compiled against
+	 * a fresh Glibc with rseq support. Anyway, we need to unregister it
+	 * before doing unmap_old_vmas or we will get SIGSEGV from the kernel,
+	 * for instance once the kernel will want to update (struct rseq).cpu_id field:
+	 * https://github.com/torvalds/linux/blob/ce522ba9ef7e/kernel/rseq.c#L89
+	 */
+	unregister_libc_rseq(&args->libc_rseq);
+
 	if (unmap_old_vmas((void *)args->premmapped_addr, args->premmapped_len, bootstrap_start, bootstrap_len,
 			   args->task_size))
 		goto core_restore_end;

From 441310c2600e9f95e53a140a321981801c9941fd Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 24 Dec 2021 22:56:56 +0300
Subject: [PATCH 1041/1854] zdtm/static/rseq00: fix rseq test when linking with
 a fresh Glibc

Fresh Glibc does rseq() register by default. We need to unregister
rseq before registering our own.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/static/rseq00.c | 57 ++++++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/test/zdtm/static/rseq00.c b/test/zdtm/static/rseq00.c
index b73b1b258..471ad6a43 100644
--- a/test/zdtm/static/rseq00.c
+++ b/test/zdtm/static/rseq00.c
@@ -19,12 +19,52 @@
 
 #include "zdtmtst.h"
 
+#ifdef __has_include
+#if __has_include("sys/rseq.h")
+#include <sys/rseq.h>
+#endif
+#endif
+
 #if defined(__x86_64__)
 
+#if defined(RSEQ_SIG)
+static inline void *__criu_thread_pointer(void)
+{
+#if __GNUC_PREREQ(11, 1)
+	return __builtin_thread_pointer();
+#else
+	void *__result;
+#ifdef __x86_64__
+	__asm__("mov %%fs:0, %0" : "=r"(__result));
+#else
+	__asm__("mov %%gs:0, %0" : "=r"(__result));
+#endif /* __x86_64__ */
+	return __result;
+#endif /* !GCC 11 */
+}
+
+static inline void unregister_glibc_rseq(void)
+{
+	struct rseq *rseq = (struct rseq *)((char *)__criu_thread_pointer() + __rseq_offset);
+
+	/* hack: mark glibc rseq structure as failed to register */
+	rseq->cpu_id = RSEQ_CPU_ID_REGISTRATION_FAILED;
+
+	/* unregister rseq */
+	syscall(__NR_rseq, (void *)rseq, __rseq_size, 1, RSEQ_SIG);
+}
+#else
+static inline void unregister_glibc_rseq(void)
+{
+}
+#endif /* defined(RSEQ_SIG) */
+
 const char *test_doc = "Check that rseq() basic C/R works";
 const char *test_author = "Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>";
 
 /* some useful definitions from kernel uapi */
+#ifndef RSEQ_SIG
+
 enum rseq_flags {
 	RSEQ_FLAG_UNREGISTER = (1 << 0),
 };
@@ -36,6 +76,10 @@ struct rseq {
 	uint32_t flags;
 } __attribute__((aligned(4 * sizeof(uint64_t))));
 
+#define RSEQ_SIG 0x53053053
+
+#endif /* RSEQ_SIG */
+
 #ifndef __NR_rseq
 #define __NR_rseq 334
 #endif
@@ -43,8 +87,6 @@ struct rseq {
 
 static __thread volatile struct rseq __rseq_abi;
 
-#define RSEQ_SIG 0x53053053
-
 static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig)
 {
 	return syscall(__NR_rseq, rseq_abi, rseq_len, flags, sig);
@@ -53,6 +95,7 @@ static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags
 static void register_thread(void)
 {
 	int rc;
+	unregister_glibc_rseq();
 	rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), 0, RSEQ_SIG);
 	if (rc) {
 		fail("Failed to register rseq");
@@ -60,16 +103,6 @@ static void register_thread(void)
 	}
 }
 
-static void unregister_thread(void)
-{
-	int rc;
-	rc = sys_rseq(&__rseq_abi, sizeof(struct rseq), RSEQ_FLAG_UNREGISTER, RSEQ_SIG);
-	if (rc) {
-		fail("Failed to unregister rseq");
-		exit(1);
-	}
-}
-
 static void check_thread(void)
 {
 	int rc;

From 4c7ece0bb7e407116b8ae42fdfde94c50ed683d3 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 21 Feb 2022 15:15:52 +0300
Subject: [PATCH 1042/1854] compel: add helpers to get/set instruction pointer

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 .../src/lib/include/uapi/asm/infect-types.h   |  9 +++++----
 .../src/lib/include/uapi/asm/infect-types.h   |  9 +++++----
 .../src/lib/include/uapi/asm/infect-types.h   |  9 +++++----
 .../src/lib/include/uapi/asm/infect-types.h   |  9 +++++----
 .../src/lib/include/uapi/asm/infect-types.h   |  7 ++++---
 .../src/lib/include/uapi/asm/infect-types.h   |  9 +++++----
 compel/include/uapi/infect.h                  |  6 ++++++
 compel/src/lib/infect.c                       | 20 +++++++++++++++++++
 criu/arch/aarch64/include/asm/types.h         |  2 ++
 criu/arch/arm/include/asm/types.h             |  2 ++
 criu/arch/mips/include/asm/types.h            |  2 ++
 criu/arch/ppc64/include/asm/types.h           |  2 ++
 criu/arch/s390/include/asm/types.h            |  2 ++
 criu/arch/x86/include/asm/types.h             |  2 ++
 14 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index f91e73dc4..9d4ce7e2e 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -23,10 +23,11 @@ typedef struct user_fpsimd_state user_fpregs_struct_t;
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
-#define REG_RES(r)	  ((uint64_t)(r).regs[0])
-#define REG_IP(r)	  ((uint64_t)(r).pc)
-#define REG_SP(r)	  ((uint64_t)((r).sp))
-#define REG_SYSCALL_NR(r) ((uint64_t)(r).regs[8])
+#define REG_RES(r)	   ((uint64_t)(r).regs[0])
+#define REG_IP(r)	   ((uint64_t)(r).pc)
+#define SET_REG_IP(r, val) ((r).pc = (val))
+#define REG_SP(r)	   ((uint64_t)((r).sp))
+#define REG_SYSCALL_NR(r)  ((uint64_t)(r).regs[8])
 
 #define user_regs_native(pregs) true
 
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
index 159b6a9fb..8d328252e 100644
--- a/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/infect-types.h
@@ -56,10 +56,11 @@ struct user_vfp_exc {
 	unsigned long fpinst2;
 };
 
-#define REG_RES(regs)	     ((regs).ARM_r0)
-#define REG_IP(regs)	     ((regs).ARM_pc)
-#define REG_SP(regs)	     ((regs).ARM_sp)
-#define REG_SYSCALL_NR(regs) ((regs).ARM_r7)
+#define REG_RES(regs)	      ((regs).ARM_r0)
+#define REG_IP(regs)	      ((regs).ARM_pc)
+#define SET_REG_IP(regs, val) ((regs).ARM_pc = (val))
+#define REG_SP(regs)	      ((regs).ARM_sp)
+#define REG_SYSCALL_NR(regs)  ((regs).ARM_r7)
 
 #define user_regs_native(pregs) true
 
diff --git a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
index 70b3f85a5..481566a12 100644
--- a/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/mips/src/lib/include/uapi/asm/infect-types.h
@@ -56,10 +56,11 @@ static inline bool user_regs_native(user_regs_struct_t *pregs)
 #define compel_arch_get_tls_task(ctl, tls)
 #define compel_arch_get_tls_thread(tctl, tls)
 
-#define REG_RES(regs)	     ((regs).MIPS_v0)
-#define REG_IP(regs)	     ((regs).cp0_epc)
-#define REG_SP(regs)	     ((regs).MIPS_sp)
-#define REG_SYSCALL_NR(regs) ((regs).MIPS_v0)
+#define REG_RES(regs)	      ((regs).MIPS_v0)
+#define REG_IP(regs)	      ((regs).cp0_epc)
+#define SET_REG_IP(regs, val) ((regs).cp0_epc = (val))
+#define REG_SP(regs)	      ((regs).MIPS_sp)
+#define REG_SYSCALL_NR(regs)  ((regs).MIPS_v0)
 
 //#define __NR(syscall, compat)	((compat) ? __NR32_##syscall : __NR_##syscall)
 #define __NR(syscall, compat) __NR_##syscall
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
index 8cf8a135f..25fc747e2 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h
@@ -72,10 +72,11 @@ typedef struct {
 	} tm;
 } user_fpregs_struct_t;
 
-#define REG_RES(regs)	     ((uint64_t)(regs).gpr[3])
-#define REG_IP(regs)	     ((uint64_t)(regs).nip)
-#define REG_SP(regs)	     ((uint64_t)(regs).gpr[1])
-#define REG_SYSCALL_NR(regs) ((uint64_t)(regs).gpr[0])
+#define REG_RES(regs)	      ((uint64_t)(regs).gpr[3])
+#define REG_IP(regs)	      ((uint64_t)(regs).nip)
+#define SET_REG_IP(regs, val) ((regs).nip = (val))
+#define REG_SP(regs)	      ((uint64_t)(regs).gpr[1])
+#define REG_SYSCALL_NR(regs)  ((uint64_t)(regs).gpr[0])
 
 #define user_regs_native(pregs) true
 
diff --git a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
index 896d70ed1..87283bc6b 100644
--- a/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/s390/src/lib/include/uapi/asm/infect-types.h
@@ -62,9 +62,10 @@ typedef struct {
 	uint32_t system_call;
 } user_regs_struct_t;
 
-#define REG_RES(r) ((uint64_t)(r).prstatus.gprs[2])
-#define REG_IP(r)  ((uint64_t)(r).prstatus.psw.addr)
-#define REG_SP(r)  ((uint64_t)(r).prstatus.gprs[15])
+#define REG_RES(r)	   ((uint64_t)(r).prstatus.gprs[2])
+#define REG_IP(r)	   ((uint64_t)(r).prstatus.psw.addr)
+#define SET_REG_IP(r, val) ((r).prstatus.psw.addr = (val))
+#define REG_SP(r)	   ((uint64_t)(r).prstatus.gprs[15])
 /*
  * We assume that REG_SYSCALL_NR() is only used for pie code where we
  * always use svc 0 with opcode in %r1.
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
index 34b3ad061..b35504ff8 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
@@ -127,10 +127,11 @@ typedef struct {
 
 typedef struct xsave_struct user_fpregs_struct_t;
 
-#define REG_RES(regs)	     get_user_reg(&regs, ax)
-#define REG_IP(regs)	     get_user_reg(&regs, ip)
-#define REG_SP(regs)	     get_user_reg(&regs, sp)
-#define REG_SYSCALL_NR(regs) get_user_reg(&regs, orig_ax)
+#define REG_RES(regs)	      get_user_reg(&regs, ax)
+#define REG_IP(regs)	      get_user_reg(&regs, ip)
+#define SET_REG_IP(regs, val) set_user_reg(&regs, ip, val)
+#define REG_SP(regs)	      get_user_reg(&regs, sp)
+#define REG_SYSCALL_NR(regs)  get_user_reg(&regs, orig_ax)
 
 #define __NR(syscall, compat) ((compat) ? __NR32_##syscall : __NR_##syscall)
 
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 1e1fa66a3..3040a67a7 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -168,4 +168,10 @@ extern unsigned long compel_task_size(void);
 extern uint64_t compel_get_leader_sp(struct parasite_ctl *ctl);
 extern uint64_t compel_get_thread_sp(struct parasite_thread_ctl *tctl);
 
+extern uint64_t compel_get_leader_ip(struct parasite_ctl *ctl);
+extern uint64_t compel_get_thread_ip(struct parasite_thread_ctl *tctl);
+
+void compel_set_leader_ip(struct parasite_ctl *ctl, uint64_t v);
+void compel_set_thread_ip(struct parasite_thread_ctl *tctl, uint64_t v);
+
 #endif
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 9552a7186..c78c02a6a 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1687,3 +1687,23 @@ uint64_t compel_get_thread_sp(struct parasite_thread_ctl *tctl)
 {
 	return REG_SP(tctl->th.regs);
 }
+
+uint64_t compel_get_leader_ip(struct parasite_ctl *ctl)
+{
+	return REG_IP(ctl->orig.regs);
+}
+
+uint64_t compel_get_thread_ip(struct parasite_thread_ctl *tctl)
+{
+	return REG_IP(tctl->th.regs);
+}
+
+void compel_set_leader_ip(struct parasite_ctl *ctl, uint64_t v)
+{
+	SET_REG_IP(ctl->orig.regs, v);
+}
+
+void compel_set_thread_ip(struct parasite_thread_ctl *tctl, uint64_t v)
+{
+	SET_REG_IP(tctl->th.regs, v);
+}
diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index c860af1cf..363c1cae2 100644
--- a/criu/arch/aarch64/include/asm/types.h
+++ b/criu/arch/aarch64/include/asm/types.h
@@ -22,6 +22,8 @@ typedef UserAarch64RegsEntry UserRegsEntry;
 
 #define TI_SP(core) ((core)->ti_aarch64->gpregs->sp)
 
+#define TI_IP(core) ((core)->ti_aarch64->gpregs->pc)
+
 static inline void *decode_pointer(uint64_t v)
 {
 	return (void *)v;
diff --git a/criu/arch/arm/include/asm/types.h b/criu/arch/arm/include/asm/types.h
index cfcb8a136..93d2dc23d 100644
--- a/criu/arch/arm/include/asm/types.h
+++ b/criu/arch/arm/include/asm/types.h
@@ -21,6 +21,8 @@ typedef UserArmRegsEntry UserRegsEntry;
 
 #define TI_SP(core) ((core)->ti_arm->gpregs->sp)
 
+#define TI_IP(core) ((core)->ti_arm->gpregs->ip)
+
 static inline void *decode_pointer(u64 v)
 {
 	return (void *)(u32)v;
diff --git a/criu/arch/mips/include/asm/types.h b/criu/arch/mips/include/asm/types.h
index 237471f3c..2c75b6a92 100644
--- a/criu/arch/mips/include/asm/types.h
+++ b/criu/arch/mips/include/asm/types.h
@@ -18,6 +18,8 @@
 
 #define CORE_THREAD_ARCH_INFO(core) core->ti_mips
 
+#define TI_IP(core) ((core)->ti_mips->gpregs->cp0_epc)
+
 typedef UserMipsRegsEntry UserRegsEntry;
 
 static inline u64 encode_pointer(void *p)
diff --git a/criu/arch/ppc64/include/asm/types.h b/criu/arch/ppc64/include/asm/types.h
index fedeff22a..d60aadde5 100644
--- a/criu/arch/ppc64/include/asm/types.h
+++ b/criu/arch/ppc64/include/asm/types.h
@@ -19,6 +19,8 @@ typedef UserPpc64RegsEntry UserRegsEntry;
 
 #define CORE_THREAD_ARCH_INFO(core) core->ti_ppc64
 
+#define TI_IP(core) ((core)->ti_ppc64->gpregs->nip)
+
 static inline void *decode_pointer(uint64_t v)
 {
 	return (void *)v;
diff --git a/criu/arch/s390/include/asm/types.h b/criu/arch/s390/include/asm/types.h
index 7522cf2cd..abf12dec0 100644
--- a/criu/arch/s390/include/asm/types.h
+++ b/criu/arch/s390/include/asm/types.h
@@ -19,6 +19,8 @@ typedef UserS390RegsEntry UserRegsEntry;
 
 #define CORE_THREAD_ARCH_INFO(core) core->ti_s390
 
+#define TI_IP(core) ((core)->ti_s390->gpregs->psw_addr)
+
 static inline u64 encode_pointer(void *p)
 {
 	return (u64)p;
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index a0a8ed987..8919d0ae6 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -28,6 +28,8 @@ static inline int core_is_compat(CoreEntry *c)
 
 #define CORE_THREAD_ARCH_INFO(core) core->thread_info
 
+#define TI_IP(core) ((core)->thread_info->gpregs->ip)
+
 typedef UserX86RegsEntry UserRegsEntry;
 
 static inline u64 encode_pointer(void *p)

From 2d3354e7b63ea6f9566f0ff3b17e7cb9f282be9e Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 21 Feb 2022 15:25:21 +0300
Subject: [PATCH 1043/1854] cr-dump: fixup thread IP when inside rseq cs

If we caught the process when it's inside rseq
critical section we have to handle it properly.

From the kernel side of view, if the process
is executing inside the rseq cs and gets a signal,
rseq critical section execution will be interrupted
and after signal handler execution, we will proceed
to rseq cs abort handler instead of continuing normal
rseq cs execution (if RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL
isn't set).

When CRIU seizes processes that's the same thing as
getting signal from the rseq point of view. So we need
to fixup instruction pointer to rseq cs abort handler
address.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-dump.c          | 153 +++++++++++++++++++++++++++++++++++++++-
 criu/include/parasite.h |   2 +
 criu/include/pstree.h   |   1 +
 3 files changed, 153 insertions(+), 3 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index c1df3c901..9a7060756 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1034,11 +1034,59 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item)
 	return 0;
 }
 
-static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep)
+static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, struct rseq_cs *rseq_cs)
+{
+	int ret;
+	uint64_t addr;
+
+	/* rseq is not registered */
+	if (!rseq->rseq_abi_pointer)
+		return 0;
+
+	/*
+	 * We need to cover the case when victim process was inside rseq critical section
+	 * at the moment when CRIU comes and seized it. We need to determine the borders
+	 * of rseq critical section at first. To achieve that we need to access thread
+	 * memory and read pointer to struct rseq_cs.
+	 *
+	 * We have two ways to access thread memory: from the parasite and using ptrace().
+	 * But it this case we can't use parasite, because if victim process returns to the
+	 * execution, on the kernel side __rseq_handle_notify_resume hook will be called,
+	 * then rseq_ip_fixup() -> clear_rseq_cs() and user space memory with struct rseq
+	 * will be cleared. So, let's use ptrace(PTRACE_PEEKDATA).
+	 */
+	ret = ptrace_peek_area(tid, &addr, decode_pointer(rseq->rseq_abi_pointer + offsetof(struct criu_rseq, rseq_cs)),
+			       sizeof(uint64_t));
+	if (ret) {
+		pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs addr\n", tid, (unsigned long)&addr,
+		       (unsigned long)(rseq->rseq_abi_pointer + offsetof(struct criu_rseq, rseq_cs)),
+		       (unsigned long)sizeof(uint64_t));
+		return -1;
+	}
+
+	/* (struct rseq)->rseq_cs is NULL */
+	if (!addr)
+		return 0;
+
+	ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(addr), sizeof(struct rseq_cs));
+	if (ret) {
+		pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid,
+		       (unsigned long)rseq_cs, (unsigned long)addr, (unsigned long)sizeof(struct rseq_cs));
+		return -1;
+	}
+
+	return 0;
+}
+
+static int dump_thread_rseq(struct pstree_item *item, int i)
 {
 	struct __ptrace_rseq_configuration rseq;
 	RseqEntry *rseqe = NULL;
 	int ret;
+	CoreEntry *core = item->core[i];
+	RseqEntry **rseqep = &core->thread_core->rseq_entry;
+	struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
+	pid_t tid = item->threads[i].real;
 
 	/*
 	 * If we are here it means that rseq() syscall is supported,
@@ -1076,25 +1124,118 @@ static int dump_thread_rseq(pid_t tid, RseqEntry **rseqep)
 	rseqe->rseq_abi_size = rseq.rseq_abi_size;
 	rseqe->signature = rseq.signature;
 
+	if (read_rseq_cs(tid, &rseq, rseq_cs))
+		goto err;
+
+	/* save rseq entry to the image */
 	*rseqep = rseqe;
 
 	return 0;
+
+err:
+	xfree(rseqe);
+	return -1;
 }
 
 static int dump_task_rseq(pid_t pid, struct pstree_item *item)
 {
 	int i;
+	struct rseq_cs *thread_rseq_cs;
 
 	/* if rseq() syscall isn't supported then nothing to dump */
 	if (!kdat.has_rseq)
 		return 0;
 
+	thread_rseq_cs = xzalloc(sizeof(*thread_rseq_cs) * item->nr_threads);
+	if (!thread_rseq_cs)
+		return -1;
+
+	dmpi(item)->thread_rseq_cs = thread_rseq_cs;
+
 	for (i = 0; i < item->nr_threads; i++) {
-		if (dump_thread_rseq(item->threads[i].real, &item->core[i]->thread_core->rseq_entry))
-			return -1;
+		if (dump_thread_rseq(item, i))
+			goto free_rseq;
 	}
 
 	return 0;
+
+free_rseq:
+	xfree(thread_rseq_cs);
+	dmpi(item)->thread_rseq_cs = NULL;
+	return -1;
+}
+
+static bool task_in_rseq(struct rseq_cs *rseq_cs, uint64_t addr)
+{
+	return addr >= rseq_cs->start_ip && addr < rseq_cs->start_ip + rseq_cs->post_commit_offset;
+}
+
+static int fixup_thread_rseq(struct pstree_item *item, int i)
+{
+	CoreEntry *core = item->core[i];
+	struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
+	pid_t tid = item->threads[i].real;
+
+	/* (struct rseq)->rseq_cs is NULL */
+	if (!rseq_cs->start_ip)
+		return 0;
+
+	pr_info("fixup_thread_rseq for %d: rseq_cs start_ip = %llx abort_ip = %llx post_commit_offset = %llx flags = %x version = %x; IP = %lx\n",
+		tid, rseq_cs->start_ip, rseq_cs->abort_ip, rseq_cs->post_commit_offset, rseq_cs->flags,
+		rseq_cs->version, (unsigned long)TI_IP(core));
+
+	if (rseq_cs->version != 0) {
+		pr_err("unsupported RSEQ ABI version = %d\n", rseq_cs->version);
+		return -1;
+	}
+
+	if (task_in_rseq(rseq_cs, TI_IP(core))) {
+		struct pid *tid = &item->threads[i];
+
+		pr_info("The %d task is in rseq critical section. IP will be set to rseq abort handler addr\n",
+			tid->real);
+
+		/*
+		 * We need to fixup task instruction pointer from
+		 * the original one (which lays inside rseq critical section)
+		 * to rseq abort handler address.
+		 *
+		 * It's worth to mention that we need to fixup IP in CoreEntry
+		 * (used when full dump/restore is performed) and also in
+		 * the parasite regs storage (used if --leave-running option is used,
+		 * or if dump error occurred and process execution is resumed).
+		 */
+		TI_IP(core) = rseq_cs->abort_ip;
+
+		if (item->pid->real == tid->real) {
+			compel_set_leader_ip(dmpi(item)->parasite_ctl, rseq_cs->abort_ip);
+		} else {
+			compel_set_thread_ip(dmpi(item)->thread_ctls[i], rseq_cs->abort_ip);
+		}
+	}
+
+	return 0;
+}
+
+static int fixup_task_rseq(pid_t pid, struct pstree_item *item)
+{
+	int ret = 0;
+	int i;
+
+	if (!kdat.has_ptrace_get_rseq_conf)
+		return 0;
+
+	for (i = 0; i < item->nr_threads; i++) {
+		if (fixup_thread_rseq(item, i)) {
+			ret = -1;
+			goto exit;
+		}
+	}
+
+exit:
+	xfree(dmpi(item)->thread_rseq_cs);
+	dmpi(item)->thread_rseq_cs = NULL;
+	return ret;
 }
 
 static struct proc_pid_stat pps_buf;
@@ -1404,6 +1545,12 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 		goto err;
 	}
 
+	ret = fixup_task_rseq(pid, item);
+	if (ret) {
+		pr_err("Fixup rseq for %d failed %d\n", pid, ret);
+		goto err;
+	}
+
 	if (fault_injected(FI_DUMP_EARLY)) {
 		pr_info("fault: CRIU sudden detach\n");
 		kill(getpid(), SIGKILL);
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 5fde80996..d2a06889f 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -10,6 +10,8 @@
 #include <time.h>
 #include <signal.h>
 
+#include "linux/rseq.h"
+
 #include "image.h"
 #include "util-pie.h"
 #include "common/lock.h"
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index c1c79867b..8ae750e1a 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -63,6 +63,7 @@ struct dmp_info {
 	struct parasite_ctl *parasite_ctl;
 	struct parasite_thread_ctl **thread_ctls;
 	uint64_t *thread_sp;
+	struct rseq_cs *thread_rseq_cs;
 
 	/*
 	 * Although we don't support dumping different struct creds in general,

From 064e9925a0516737dc2ae7cc025cd667992de79d Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Mon, 21 Feb 2022 15:45:40 +0300
Subject: [PATCH 1044/1854] zdtm: add transition/rseq01 test for amd64

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/transition/Makefile    |   1 +
 test/zdtm/transition/rseq01.c    | 225 +++++++++++++++++++++++++++++++
 test/zdtm/transition/rseq01.desc |   1 +
 3 files changed, 227 insertions(+)
 create mode 100644 test/zdtm/transition/rseq01.c
 create mode 100644 test/zdtm/transition/rseq01.desc

diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index 9388157e8..fae4e27b3 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -23,6 +23,7 @@ TST_NOFILE	=	\
 		lazy-thp	\
 		pid_reuse	\
 		pidfd_store_sk \
+		rseq01		\
 
 
 TST_FILE	=	\
diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c
new file mode 100644
index 000000000..7a22854a3
--- /dev/null
+++ b/test/zdtm/transition/rseq01.c
@@ -0,0 +1,225 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <syscall.h>
+
+#include "zdtmtst.h"
+
+#ifdef __has_include
+#if __has_include("sys/rseq.h")
+#include <sys/rseq.h>
+#endif
+#endif
+
+#if defined(__x86_64__)
+
+#if defined(__x86_64__) && defined(RSEQ_SIG)
+static inline void *thread_pointer(void)
+{
+	void *result;
+	asm("mov %%fs:0, %0" : "=r"(result));
+	return result;
+}
+
+static inline void unregister_old_rseq(void)
+{
+	/* unregister rseq */
+	syscall(__NR_rseq, (void *)((char *)thread_pointer() + __rseq_offset), __rseq_size, 1, RSEQ_SIG);
+}
+#else
+static inline void unregister_old_rseq(void)
+{
+}
+#endif
+
+const char *test_doc = "rseq() transition test";
+const char *test_author = "Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>";
+/*
+ * Thanks to Mathieu Desnoyers <mathieu.desnoyers@efficios.com> (rseq author)
+ * who helped me with review and debugging the problem on the Alpine Linux.
+ *
+ * parts of code borrowed from
+ * https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/
+ */
+
+/* some useful definitions from kernel uapi */
+#ifndef RSEQ_SIG
+
+enum rseq_flags {
+	RSEQ_FLAG_UNREGISTER = (1 << 0),
+};
+
+struct rseq {
+	uint32_t cpu_id_start;
+	uint32_t cpu_id;
+	uint64_t rseq_cs;
+	uint32_t flags;
+} __attribute__((aligned(4 * sizeof(uint64_t))));
+
+#define RSEQ_SIG 0x53053053
+
+#endif
+
+#ifndef __NR_rseq
+#define __NR_rseq 334
+#endif
+/* EOF */
+
+static volatile struct rseq *rseq_ptr;
+static __thread volatile struct rseq __rseq_abi;
+
+static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig)
+{
+	return syscall(__NR_rseq, rseq_abi, rseq_len, flags, sig);
+}
+
+static void register_thread(void)
+{
+	int rc;
+	unregister_old_rseq();
+	rc = sys_rseq(rseq_ptr, sizeof(struct rseq), 0, RSEQ_SIG);
+	if (rc) {
+		fail("Failed to register rseq");
+		exit(1);
+	}
+}
+
+static void check_thread(void)
+{
+	int rc;
+	rc = sys_rseq(rseq_ptr, sizeof(struct rseq), 0, RSEQ_SIG);
+	if (!(rc && errno == EBUSY)) {
+		fail("Failed to check rseq %d", rc);
+		exit(1);
+	}
+}
+
+#define RSEQ_ACCESS_ONCE(x) (*(__volatile__ __typeof__(x) *)&(x))
+
+#define rseq_after_asm_goto() asm volatile("" : : : "memory")
+
+static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
+{
+	double a = 10000000000000000.0;
+	double b = -1;
+
+	/* clang-format off */
+	__asm__ __volatile__ goto(
+		".pushsection __rseq_table, \"aw\"\n\t"
+		".balign 32\n\t"
+		"cs_obj:\n\t"
+		/* version, flags */
+		".long 0, 0\n\t"
+		/* start_ip, post_commit_offset, abort_ip */
+		".quad 1f, (2f-1f), 4f\n\t"
+		".popsection\n\t"
+		"fldl %[x]\n\t" /* we have st clobbered */
+		"leaq cs_obj(%%rip), %%rax\n\t"
+		"1:\n\t"
+		"movq %%rax, %[rseq_cs]\n\t"
+		"cmpl %[cpu_id], %[current_cpu_id]\n\t"
+		"jnz 4f\n\t"
+		"addq %[count], %[v]\n\t"	/* final store */
+		"mov $10000000, %%rcx\n\t"
+		"5:\n\t"
+		"fsqrt\n\t" /* heavy instruction */
+		"dec %%rcx\n\t"
+		"jnz 5b\n\t"
+		"fstpl %[y]\n\t"
+		"2:\n\t"
+		".pushsection __rseq_failure, \"ax\"\n\t"
+		/* Disassembler-friendly signature: nopl <sig>(%rip). */
+		".byte 0x0f, 0xb9, 0x3d\n\t"
+		".long 0x53053053\n\t"	/* RSEQ_FLAGS */
+		"4:\n\t"
+		"fstpl %[y]\n\t"
+		"jmp %l[abort]\n\t"
+		/*"jmp 1b\n\t"*/
+		".popsection\n\t"
+		: /* gcc asm goto does not allow outputs */
+		: [cpu_id]              "r" (cpu),
+		[current_cpu_id]      "m" (rseq_ptr->cpu_id),
+		[rseq_cs]             "m" (rseq_ptr->rseq_cs),
+		/* final store input */
+		[v]                   "m" (*v),
+		[count]               "er" (count),
+		[x]			"m" (a),
+		[y]			"m" (b)
+		: "memory", "cc", "rax", "rcx", "st"
+		: abort
+	);
+	/* clang-format on */
+	rseq_after_asm_goto();
+	return 0;
+abort:
+	rseq_after_asm_goto();
+	return -1;
+}
+
+int main(int argc, char *argv[])
+{
+	int cpu = 0;
+	int ret;
+	intptr_t *cpu_data;
+	long nr_cpus;
+
+	rseq_ptr = &__rseq_abi;
+	memset((void *)rseq_ptr, 0, sizeof(struct rseq));
+
+	test_init(argc, argv);
+	nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+	cpu_data = calloc(nr_cpus, sizeof(*cpu_data));
+	if (!cpu_data) {
+		fail("calloc");
+		exit(EXIT_FAILURE);
+	}
+	register_thread();
+
+	test_daemon();
+
+	while (test_go()) {
+		cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start);
+		ret = rseq_addv(&cpu_data[cpu], 2, cpu);
+
+		/* just ignore abort */
+		ret = 0;
+
+		if (ret)
+			break;
+	}
+
+	test_waitsig();
+
+	check_thread();
+
+	if (ret)
+		fail();
+	else
+		pass();
+
+	return 0;
+}
+
+#else /* #if defined(__x86_64__) */
+
+int main(int argc, char *argv[])
+{
+	test_init(argc, argv);
+	skip("Unsupported arch");
+	test_daemon();
+	test_waitsig();
+	pass();
+	return 0;
+}
+
+#endif /* #if defined(__x86_64__) */
diff --git a/test/zdtm/transition/rseq01.desc b/test/zdtm/transition/rseq01.desc
new file mode 100644
index 000000000..0324fa39c
--- /dev/null
+++ b/test/zdtm/transition/rseq01.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'arch': 'x86_64', 'feature': 'get_rseq_conf'}

From 13338dee5c69a5f854a0111211d846143b05b86d Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 22 Feb 2022 15:25:37 +0300
Subject: [PATCH 1045/1854] Revert "test: disable rseq also on Archlinux"

This reverts commit f008f740411156b7309219c7e052cb8bc24d5aae.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 scripts/build/Dockerfile.archlinux | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index b226d5701..d226244ee 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -1,8 +1,5 @@
 FROM docker.io/library/archlinux:latest
 
-# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696
-ENV GLIBC_TUNABLES=glibc.pthread.rseq=0
-
 ARG CC=gcc
 
 RUN pacman -Syu --noconfirm \

From 1e0bed3d692b4a368924a21aa4555a27cc9ab9d6 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 22 Feb 2022 18:22:45 +0300
Subject: [PATCH 1046/1854] rseq: handle rseq/rseq_cs flags properly

Userspace may configure rseq cs abort policy by
setting RSEQ_CS_FLAG_NO_RESTART_ON_* flags.

In ("cr-dump: fixup thread IP when inside rseq cs") we have supported
the case when process was caught by CRIU during rseq cs execution by
fixing up IP to abort_ip. Thats a common case, but there is special flag
called RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL, in this case we have to leave
process IP as it was before CRIU seized it. Unfortunately, that's not
all that we need here. We also must preserve (struct rseq)->rseq_cs field.

You may ask like "why we need to preserve it by hands? CRIU is dumping
all process memory and restores it". That's true. But not so easy. The problem
here is that the kernel performs this field cleanup when it realized that
the process gets out of rseq cs. But during dump/restore procedures we are
executing parasite/restorer from the process context. It means that process
will get out of rseq cs in any case and (struct rseq)->rseq_cs will be cleared
by the kernel. So we need to restore this field by hands at the *last* stage
of restore just before releasing processes.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-dump.c          | 88 +++++++++++++++++++++++++----------------
 criu/cr-restore.c       | 65 ++++++++++++++++++++++++++++++
 criu/include/rst_info.h |  8 ++++
 criu/pstree.c           | 36 +++++++++++++++++
 images/rseq.proto       |  1 +
 5 files changed, 164 insertions(+), 34 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 9a7060756..f58701e5c 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1034,13 +1034,13 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item)
 	return 0;
 }
 
-static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, struct rseq_cs *rseq_cs)
+static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, struct rseq_cs *rseq_cs,
+			struct criu_rseq *rseq)
 {
 	int ret;
-	uint64_t addr;
 
 	/* rseq is not registered */
-	if (!rseq->rseq_abi_pointer)
+	if (!rseqc->rseq_abi_pointer)
 		return 0;
 
 	/*
@@ -1055,23 +1055,20 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, str
 	 * then rseq_ip_fixup() -> clear_rseq_cs() and user space memory with struct rseq
 	 * will be cleared. So, let's use ptrace(PTRACE_PEEKDATA).
 	 */
-	ret = ptrace_peek_area(tid, &addr, decode_pointer(rseq->rseq_abi_pointer + offsetof(struct criu_rseq, rseq_cs)),
-			       sizeof(uint64_t));
+	ret = ptrace_peek_area(tid, rseq, decode_pointer(rseqc->rseq_abi_pointer), sizeof(struct criu_rseq));
 	if (ret) {
-		pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs addr\n", tid, (unsigned long)&addr,
-		       (unsigned long)(rseq->rseq_abi_pointer + offsetof(struct criu_rseq, rseq_cs)),
-		       (unsigned long)sizeof(uint64_t));
+		pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq struct\n", tid, (unsigned long)rseq,
+		       (unsigned long)(rseqc->rseq_abi_pointer), (unsigned long)sizeof(uint64_t));
 		return -1;
 	}
 
-	/* (struct rseq)->rseq_cs is NULL */
-	if (!addr)
+	if (!rseq->rseq_cs)
 		return 0;
 
-	ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(addr), sizeof(struct rseq_cs));
+	ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(rseq->rseq_cs), sizeof(struct rseq_cs));
 	if (ret) {
 		pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid,
-		       (unsigned long)rseq_cs, (unsigned long)addr, (unsigned long)sizeof(struct rseq_cs));
+		       (unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs, (unsigned long)sizeof(struct rseq_cs));
 		return -1;
 	}
 
@@ -1080,11 +1077,12 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseq, str
 
 static int dump_thread_rseq(struct pstree_item *item, int i)
 {
-	struct __ptrace_rseq_configuration rseq;
+	struct __ptrace_rseq_configuration rseqc;
 	RseqEntry *rseqe = NULL;
 	int ret;
 	CoreEntry *core = item->core[i];
 	RseqEntry **rseqep = &core->thread_core->rseq_entry;
+	struct criu_rseq rseq = {};
 	struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
 	pid_t tid = item->threads[i].real;
 
@@ -1099,20 +1097,20 @@ static int dump_thread_rseq(struct pstree_item *item, int i)
 	if (!kdat.has_ptrace_get_rseq_conf)
 		return 0;
 
-	ret = ptrace(PTRACE_GET_RSEQ_CONFIGURATION, tid, sizeof(rseq), &rseq);
-	if (ret != sizeof(rseq)) {
+	ret = ptrace(PTRACE_GET_RSEQ_CONFIGURATION, tid, sizeof(rseqc), &rseqc);
+	if (ret != sizeof(rseqc)) {
 		pr_perror("ptrace(PTRACE_GET_RSEQ_CONFIGURATION, %d) = %d", tid, ret);
 		return -1;
 	}
 
-	if (rseq.flags != 0) {
+	if (rseqc.flags != 0) {
 		pr_err("something wrong with ptrace(PTRACE_GET_RSEQ_CONFIGURATION, %d) flags = 0x%x\n", tid,
-		       rseq.flags);
+		       rseqc.flags);
 		return -1;
 	}
 
-	pr_info("Dump rseq of %d: ptr = 0x%lx sign = 0x%x\n", tid, (unsigned long)rseq.rseq_abi_pointer,
-		rseq.signature);
+	pr_info("Dump rseq of %d: ptr = 0x%lx sign = 0x%x\n", tid, (unsigned long)rseqc.rseq_abi_pointer,
+		rseqc.signature);
 
 	rseqe = xmalloc(sizeof(*rseqe));
 	if (!rseqe)
@@ -1120,13 +1118,24 @@ static int dump_thread_rseq(struct pstree_item *item, int i)
 
 	rseq_entry__init(rseqe);
 
-	rseqe->rseq_abi_pointer = rseq.rseq_abi_pointer;
-	rseqe->rseq_abi_size = rseq.rseq_abi_size;
-	rseqe->signature = rseq.signature;
+	rseqe->rseq_abi_pointer = rseqc.rseq_abi_pointer;
+	rseqe->rseq_abi_size = rseqc.rseq_abi_size;
+	rseqe->signature = rseqc.signature;
 
-	if (read_rseq_cs(tid, &rseq, rseq_cs))
+	if (read_rseq_cs(tid, &rseqc, rseq_cs, &rseq))
 		goto err;
 
+	/* we won't save rseq_cs to the image (only pointer),
+	 * so let's combine flags from both struct rseq and struct rseq_cs
+	 * (kernel does the same when interpreting RSEQ_CS_FLAG_*)
+	 */
+	rseq_cs->flags |= rseq.flags;
+
+	if (rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL) {
+		rseqe->has_rseq_cs_pointer = true;
+		rseqe->rseq_cs_pointer = rseq.rseq_cs;
+	}
+
 	/* save rseq entry to the image */
 	*rseqep = rseqe;
 
@@ -1176,11 +1185,12 @@ static int fixup_thread_rseq(struct pstree_item *item, int i)
 	struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
 	pid_t tid = item->threads[i].real;
 
-	/* (struct rseq)->rseq_cs is NULL */
+	/* equivalent to (struct rseq)->rseq_cs is NULL */
 	if (!rseq_cs->start_ip)
 		return 0;
 
-	pr_info("fixup_thread_rseq for %d: rseq_cs start_ip = %llx abort_ip = %llx post_commit_offset = %llx flags = %x version = %x; IP = %lx\n",
+	pr_debug(
+		"fixup_thread_rseq for %d: rseq_cs start_ip = %llx abort_ip = %llx post_commit_offset = %llx flags = %x version = %x; IP = %lx\n",
 		tid, rseq_cs->start_ip, rseq_cs->abort_ip, rseq_cs->post_commit_offset, rseq_cs->flags,
 		rseq_cs->version, (unsigned long)TI_IP(core));
 
@@ -1192,25 +1202,35 @@ static int fixup_thread_rseq(struct pstree_item *item, int i)
 	if (task_in_rseq(rseq_cs, TI_IP(core))) {
 		struct pid *tid = &item->threads[i];
 
-		pr_info("The %d task is in rseq critical section. IP will be set to rseq abort handler addr\n",
-			tid->real);
-
 		/*
 		 * We need to fixup task instruction pointer from
 		 * the original one (which lays inside rseq critical section)
-		 * to rseq abort handler address.
+		 * to rseq abort handler address. But we need to look on rseq_cs->flags
+		 * (please refer to struct rseq -> flags field description).
+		 * Naive idea of flags support may be like... let's change instruction pointer (IP)
+		 * to rseq_cs->abort_ip if !(rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL).
+		 * But unfortunately, it doesn't work properly, because the kernel does
+		 * clean up of rseq_cs field in the struct rseq (modifies userspace memory).
+		 * So, we need to preserve original value of (struct rseq)->rseq_cs field in the
+		 * image and restore it's value before releasing threads (see restore_rseq_cs()).
 		 *
 		 * It's worth to mention that we need to fixup IP in CoreEntry
 		 * (used when full dump/restore is performed) and also in
 		 * the parasite regs storage (used if --leave-running option is used,
 		 * or if dump error occurred and process execution is resumed).
 		 */
-		TI_IP(core) = rseq_cs->abort_ip;
 
-		if (item->pid->real == tid->real) {
-			compel_set_leader_ip(dmpi(item)->parasite_ctl, rseq_cs->abort_ip);
-		} else {
-			compel_set_thread_ip(dmpi(item)->thread_ctls[i], rseq_cs->abort_ip);
+		if (!(rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL)) {
+			pr_warn("The %d task is in rseq critical section. IP will be set to rseq abort handler addr\n",
+				tid->real);
+
+			TI_IP(core) = rseq_cs->abort_ip;
+
+			if (item->pid->real == tid->real) {
+				compel_set_leader_ip(dmpi(item)->parasite_ctl, rseq_cs->abort_ip);
+			} else {
+				compel_set_thread_ip(dmpi(item)->thread_ctls[i], rseq_cs->abort_ip);
+			}
 		}
 	}
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 0751c5b8d..9853c0585 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -812,6 +812,23 @@ static int open_cores(int pid, CoreEntry *leader_core)
 		}
 	}
 
+	for (i = 0; i < current->nr_threads; i++) {
+		ThreadCoreEntry *tc = cores[i]->thread_core;
+		struct rst_rseq *rseqs = rsti(current)->rseqe;
+		RseqEntry *rseqe = tc->rseq_entry;
+
+		/* compatibility with older CRIU versions */
+		if (!rseqe)
+			continue;
+
+		/* rseq cs had no RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL */
+		if (!rseqe->has_rseq_cs_pointer)
+			continue;
+
+		rseqs[i].rseq_abi_pointer = rseqe->rseq_abi_pointer;
+		rseqs[i].rseq_cs_pointer = rseqe->rseq_cs_pointer;
+	}
+
 	return 0;
 err:
 	xfree(cores);
@@ -1963,6 +1980,50 @@ static int attach_to_tasks(bool root_seized)
 	return 0;
 }
 
+static int restore_rseq_cs(void)
+{
+	struct pstree_item *item;
+
+	for_each_pstree_item(item) {
+		int i;
+
+		if (!task_alive(item))
+			continue;
+
+		if (item->nr_threads == 1) {
+			item->threads[0].real = item->pid->real;
+		} else {
+			if (parse_threads(item->pid->real, &item->threads, &item->nr_threads)) {
+				pr_err("restore_rseq_cs: parse_threads failed\n");
+				return -1;
+			}
+		}
+
+		for (i = 0; i < item->nr_threads; i++) {
+			pid_t pid = item->threads[i].real;
+			struct rst_rseq *rseqe = rsti(item)->rseqe;
+
+			if (!rseqe) {
+				pr_err("restore_rseq_cs: rsti(item)->rseqe is NULL\n");
+				return -1;
+			}
+
+			if (!rseqe[i].rseq_cs_pointer || !rseqe[i].rseq_abi_pointer)
+				continue;
+
+			if (ptrace_poke_area(
+				    pid, &rseqe[i].rseq_cs_pointer,
+				    decode_pointer(rseqe[i].rseq_abi_pointer + offsetof(struct criu_rseq, rseq_cs)),
+				    sizeof(uint64_t))) {
+				pr_err("Can't restore rseq_cs pointer (pid: %d)\n", pid);
+				return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
 static int catch_tasks(bool root_seized, enum trace_flags *flag)
 {
 	struct pstree_item *item;
@@ -2420,6 +2481,10 @@ skip_ns_bouncing:
 	if (restore_freezer_state())
 		pr_err("Unable to restore freezer state\n");
 
+	/* just before releasing threads we have to restore rseq_cs */
+	if (restore_rseq_cs())
+		pr_err("Unable to restore rseq_cs state\n");
+
 	/* Detaches from processes and they continue run through sigreturn. */
 	if (finalize_restore_detach())
 		goto out_kill_network_unlocked;
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 9664e0a1c..d0a3db6c5 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -6,6 +6,7 @@
 #include "vma.h"
 #include "kerndat.h"
 #include "images/mm.pb-c.h"
+#include "images/core.pb-c.h"
 
 struct task_entries {
 	int nr_threads, nr_tasks, nr_helpers;
@@ -26,6 +27,11 @@ struct fdt {
 	futex_t fdt_lock;
 };
 
+struct rst_rseq {
+	uint64_t rseq_abi_pointer;
+	uint64_t rseq_cs_pointer;
+};
+
 struct rst_info {
 	struct list_head fds;
 
@@ -69,6 +75,8 @@ struct rst_info {
 
 	bool has_thp_enabled;
 
+	struct rst_rseq *rseqe;
+
 	void *breakpoint;
 };
 
diff --git a/criu/pstree.c b/criu/pstree.c
index 0cfbfa923..f4d77b3a4 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -954,6 +954,31 @@ static int prepare_pstree_kobj_ids(void)
 	return 0;
 }
 
+static int prepare_pstree_rseqs(void)
+{
+	struct pstree_item *item;
+
+	for_each_pstree_item(item) {
+		struct rst_rseq *rseqs;
+		size_t sz = sizeof(*rseqs) * item->nr_threads;
+
+		if (!task_alive(item))
+			continue;
+
+		rseqs = shmalloc(sz);
+		if (!rseqs) {
+			pr_err("prepare_pstree_rseqs shmalloc(%lu) failed\n", (unsigned long)sz);
+			return -1;
+		}
+
+		memset(rseqs, 0, sz);
+
+		rsti(item)->rseqe = rseqs;
+	}
+
+	return 0;
+}
+
 int prepare_pstree(void)
 {
 	int ret;
@@ -1011,6 +1036,17 @@ int prepare_pstree(void)
 		 * pstree with properly injected helper tasks.
 		 */
 		ret = prepare_pstree_ids(pid);
+	if (!ret)
+		/*
+		 * We need to alloc shared buffers for RseqEntry'es
+		 * arrays (one RseqEntry per pstree item thread).
+		 *
+		 * We need shared memory because we perform
+		 * open_core() on the late stage inside
+		 * restore_one_alive_task(), so that's the only
+		 * way to transfer that data to the main CRIU process.
+		 */
+		ret = prepare_pstree_rseqs();
 
 	return ret;
 }
diff --git a/images/rseq.proto b/images/rseq.proto
index be2800468..45cb8476d 100644
--- a/images/rseq.proto
+++ b/images/rseq.proto
@@ -6,4 +6,5 @@ message rseq_entry {
 	required uint64 rseq_abi_pointer	= 1;
 	required uint32 rseq_abi_size		= 2;
 	required uint32 signature		= 3;
+	optional uint64 rseq_cs_pointer		= 4;
 }

From db9ec13616625f98db95b00438a370f8a660bfee Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Wed, 23 Feb 2022 23:20:29 +0300
Subject: [PATCH 1047/1854] zdtm: add rseq02 transition test with NO_RESTART CS
 flag

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/transition/Makefile    |  2 ++
 test/zdtm/transition/rseq01.c    | 47 ++++++++++++++++++++++++++++++++
 test/zdtm/transition/rseq02.c    |  1 +
 test/zdtm/transition/rseq02.desc |  1 +
 4 files changed, 51 insertions(+)
 create mode 120000 test/zdtm/transition/rseq02.c
 create mode 120000 test/zdtm/transition/rseq02.desc

diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index fae4e27b3..98440f4e2 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -24,6 +24,7 @@ TST_NOFILE	=	\
 		pid_reuse	\
 		pidfd_store_sk \
 		rseq01		\
+		rseq02		\
 
 
 TST_FILE	=	\
@@ -82,6 +83,7 @@ ptrace:		LDFLAGS += -pthread
 fork2:		CFLAGS += -D FORK2
 thread-bomb.o:	CFLAGS += -pthread
 thread-bomb:	LDFLAGS += -pthread
+rseq02:		CFLAGS += -D NORESTART
 
 %: %.sh
 	cp $< $@
diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c
index 7a22854a3..b6d470785 100644
--- a/test/zdtm/transition/rseq01.c
+++ b/test/zdtm/transition/rseq01.c
@@ -58,6 +58,18 @@ enum rseq_flags {
 	RSEQ_FLAG_UNREGISTER = (1 << 0),
 };
 
+enum rseq_cs_flags_bit {
+	RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0,
+	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1,
+	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2,
+};
+
+enum rseq_cs_flags {
+	RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT),
+	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT),
+	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT),
+};
+
 struct rseq {
 	uint32_t cpu_id_start;
 	uint32_t cpu_id;
@@ -111,6 +123,7 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
 {
 	double a = 10000000000000000.0;
 	double b = -1;
+	uint64_t rseq_cs1 = 0, rseq_cs2 = 0;
 
 	/* clang-format off */
 	__asm__ __volatile__ goto(
@@ -134,6 +147,9 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
 		"fsqrt\n\t" /* heavy instruction */
 		"dec %%rcx\n\t"
 		"jnz 5b\n\t"
+		"movq %%rax, %[rseq_cs_check2]\n\t"
+		"movq %[rseq_cs], %%rax\n\t"
+		"movq %%rax, %[rseq_cs_check1]\n\t"
 		"fstpl %[y]\n\t"
 		"2:\n\t"
 		".pushsection __rseq_failure, \"ax\"\n\t"
@@ -149,6 +165,8 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
 		: [cpu_id]              "r" (cpu),
 		[current_cpu_id]      "m" (rseq_ptr->cpu_id),
 		[rseq_cs]             "m" (rseq_ptr->rseq_cs),
+		[rseq_cs_check1]       "m" (rseq_cs1),
+		[rseq_cs_check2]       "m" (rseq_cs2),
 		/* final store input */
 		[v]                   "m" (*v),
 		[count]               "er" (count),
@@ -159,9 +177,22 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
 	);
 	/* clang-format on */
 	rseq_after_asm_goto();
+	test_msg("exit %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b);
+	if (rseq_cs1 != rseq_cs2) {
+		/*
+		 * It means that we finished critical section
+		 * *normally* (haven't jumped to abort) but the kernel had cleaned up
+		 * rseq_ptr->rseq_cs before we left critical section
+		 * and CRIU didn't restore it correctly.
+		 * That's a bug picture.
+		 */
+		return -1;
+	}
+
 	return 0;
 abort:
 	rseq_after_asm_goto();
+	test_msg("abort %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b);
 	return -1;
 }
 
@@ -183,16 +214,32 @@ int main(int argc, char *argv[])
 		fail("calloc");
 		exit(EXIT_FAILURE);
 	}
+
 	register_thread();
 
+	/*
+	 * We want to test that RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL
+	 * is handled properly by CRIU, but that flag can be used
+	 * only with all another flags set.
+	 * Please, refer to
+	 * https://github.com/torvalds/linux/blob/ce522ba9/kernel/rseq.c#L192
+	 */
+#ifdef NORESTART
+	rseq_ptr->flags = RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT | RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL |
+			  RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE;
+#endif
+
 	test_daemon();
 
 	while (test_go()) {
 		cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start);
 		ret = rseq_addv(&cpu_data[cpu], 2, cpu);
 
+/* NORESTART is NOT set */
+#ifndef NORESTART
 		/* just ignore abort */
 		ret = 0;
+#endif
 
 		if (ret)
 			break;
diff --git a/test/zdtm/transition/rseq02.c b/test/zdtm/transition/rseq02.c
new file mode 120000
index 000000000..d56491719
--- /dev/null
+++ b/test/zdtm/transition/rseq02.c
@@ -0,0 +1 @@
+rseq01.c
\ No newline at end of file
diff --git a/test/zdtm/transition/rseq02.desc b/test/zdtm/transition/rseq02.desc
new file mode 120000
index 000000000..b888f0da7
--- /dev/null
+++ b/test/zdtm/transition/rseq02.desc
@@ -0,0 +1 @@
+rseq01.desc
\ No newline at end of file

From ead227994b4918422496e06d3f3802188c091a7a Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 5 Apr 2022 12:27:07 +0300
Subject: [PATCH 1048/1854] zdtm: temporary disable rseq02 test

That's strange but rseq02 test fails with:
09:06:16.222:    51: exit 555f52082120 555f52082120
09:06:16.282:    51: exit 555f52082120 555f52082120
09:06:16.340:    51: exit 555f52082120 555f52082120
09:06:16.397:    51: exit 555f52082120 555f52082120
09:06:16.503:    51: exit 0 555f52082120
09:06:16.503:    51: FAIL: rseq02.c:235: Failed to increment per-cpu counter (errno = 2 (No such file or directory))
09:06:16.503:    51: FAIL: rseq02.c:246:  (errno = 16 (Device or resource busy))

It means that rseq_cs pointer was cleaned up by the kernel despite of
NO_RESTART* flags. That's a hardly reproducible and I will investigate that.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/transition/rseq02.desc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 120000 => 100644 test/zdtm/transition/rseq02.desc

diff --git a/test/zdtm/transition/rseq02.desc b/test/zdtm/transition/rseq02.desc
deleted file mode 120000
index b888f0da7..000000000
--- a/test/zdtm/transition/rseq02.desc
+++ /dev/null
@@ -1 +0,0 @@
-rseq01.desc
\ No newline at end of file
diff --git a/test/zdtm/transition/rseq02.desc b/test/zdtm/transition/rseq02.desc
new file mode 100644
index 000000000..1ce7f240f
--- /dev/null
+++ b/test/zdtm/transition/rseq02.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'arch': 'x86_64', 'feature': 'get_rseq_conf', 'flags': 'noauto'}

From 7ac85cab86ca2ee4b6c32bb877aeaf7cdc7c9c11 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 7 Apr 2022 13:09:54 +0300
Subject: [PATCH 1049/1854] scripts/ci: fix ZDTM_OPTS variable passing

We have a separate target for alpine in script/ci/Makefile
which defines some extra opts for zdtm using ZDTM_OPTIONS
variable. But really it doesn't work. First of all, variable
should be named as ZDTM_OPTS and also we have to specify
it directly in the CONTAINER_RUNTIME cmdline to make it work.

I've also changed variable value just to make it consistent
with docker.env value which was really used.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 scripts/ci/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index eaab2f201..120f561e4 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -12,13 +12,13 @@ ifdef CLANG
 endif
 
 TARGETS := alpine fedora-rawhide centos7 centos8 archlinux
-ZDTM_OPTIONS :=
+ZDTM_OPTS :=
 UNAME := $(shell uname -m)
 export UNAME
 CONTAINER_RUNTIME := docker
 export CONTAINER_RUNTIME
 
-alpine: ZDTM_OPTIONS=-x zdtm/static/binfmt_misc -x zdtm/static/netns-nf -x zdtm/static/sched_policy00 -x zdtm/static/seccomp_strict -x zdtm/static/sigaltstack -x zdtm/static/signalfd00
+alpine: ZDTM_OPTS=-x zdtm/static/binfmt_misc -x zdtm/static/sched_policy00
 
 define DOCKER_JSON
 {
@@ -66,13 +66,15 @@ restart-docker:
 		systemctl status docker; \
 	fi
 
+export ZDTM_OPTS
+
 $(TARGETS): restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	$(CONTAINER_RUNTIME) run --env-file docker.env $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
+	$(CONTAINER_RUNTIME) run --env-file docker.env $(if $(ZDTM_OPTS),-e ZDTM_OPTS) $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
 
 fedora-asan: restart-docker
 	$(MAKE) -C ../build $@$(target-suffix)
-	$(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTIONS)
+	$(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTS)
 
 docker-test:
 	./docker-test.sh

From 5c0b4fbcda05d2c7126210de2aa730952052fcc5 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 7 Apr 2022 17:45:59 +0300
Subject: [PATCH 1050/1854] ci: criu-fault: skip inotify_irmap fault-injection
 on btrfs

It looks like we've got broken fhandles from fdinfo
for inotifies/fanotifies for btrfs. I will look into that.

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/jenkins/criu-fault.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 9f20091cc..f41073230 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -7,7 +7,13 @@ prep
 ./test/zdtm.py run -t zdtm/static/env00 --fault 1 --report report -f h || fail
 ./test/zdtm.py run -t zdtm/static/unlink_fstat00 --fault 2 --report report -f h || fail
 ./test/zdtm.py run -t zdtm/static/maps00 --fault 3 --report report -f h || fail
-./test/zdtm.py run -t zdtm/static/inotify_irmap --fault 128 --pre 2 -f uns || fail
+
+# FIXME: fhandles looks broken on btrfs
+cat /proc/self/mountinfo | grep -P "/.* / " | grep -q btrfs || NOBTRFS=$?
+if [ $NOBTRFS -eq 1 ] ; then
+	./test/zdtm.py run -t zdtm/static/inotify_irmap --fault 128 --pre 2 -f uns || fail
+fi
+
 ./test/zdtm.py run -t zdtm/static/env00 --fault 129 -f uns || fail
 ./test/zdtm.py run -t zdtm/transition/fork --fault 130 -f h || fail
 ./test/zdtm.py run -t zdtm/static/vdso01 --fault 127 || fail

From f641e0c4ba4c2321c762f08f3f9e549fc5d1ca95 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 7 Apr 2022 18:30:16 +0300
Subject: [PATCH 1051/1854] ci: print mountinfo instead of mount cmd output

mountinfo contains more info than just "mount" output

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 scripts/ci/run-ci-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 216c84505..7d88b9c20 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -88,7 +88,7 @@ print_env() {
 	print_header "uname -a"
 	uname -a || :
 	print_header "Mounted file systems"
-	mount || :
+	cat /proc/self/mountinfo || :
 	print_header "Kernel command line"
 	cat /proc/cmdline || :
 	print_header "Distribution information"

From d40b332cef9c145a7a683500d95c5dd0aa27dee8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 29 Jan 2022 22:12:00 +0000
Subject: [PATCH 1052/1854] bpf: update deprecated API

bpf_create_map_xattr() has been replaced with bpf_map_create()
https://github.com/libbpf/libbpf/commit/6cfb97c

DECLARE_LIBBPF_OPTS has been renamed to LIBBPF_OPTS
https://github.com/libbpf/libbpf/commit/ea6c242

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/bpfmap.c                | 39 +++++++++++++++++++++++++++++-------
 test/zdtm/static/bpf_array.c | 21 ++++++++++++++++---
 test/zdtm/static/bpf_hash.c  | 22 ++++++++++++++++----
 3 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/criu/bpfmap.c b/criu/bpfmap.c
index 64071d382..25098368d 100644
--- a/criu/bpfmap.c
+++ b/criu/bpfmap.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <linux/bpf.h>
 #include <bpf/bpf.h>
 
 #include "common/compiler.h"
@@ -12,6 +11,11 @@
 
 #include "protobuf.h"
 
+#ifndef LIBBPF_OPTS
+#define LIBBPF_OPTS   DECLARE_LIBBPF_OPTS
+#define LEGACY_LIBBPF /* Using libbpf < 0.7 */
+#endif
+
 int is_bpfmap_link(char *link)
 {
 	return is_anon_link_type(link, "bpf-map");
@@ -66,7 +70,7 @@ int restore_bpfmap_data(int map_fd, uint32_t map_id, struct bpfmap_data_rst **bp
 	void *keys = NULL;
 	void *values = NULL;
 	unsigned int count;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
+	LIBBPF_OPTS(bpf_map_batch_opts, opts);
 
 	for (map_data = bpf_hash_table[map_id & BPFMAP_DATA_HASH_MASK]; map_data != NULL; map_data = map_data->next) {
 		if (map_data->bde->map_id == map_id)
@@ -149,7 +153,7 @@ int dump_one_bpfmap_data(BpfmapFileEntry *bpf, int lfd, const struct fd_parms *p
 	void *keys = NULL, *values = NULL;
 	void *in_batch = NULL, *out_batch = NULL;
 	BpfmapDataEntry bde = BPFMAP_DATA_ENTRY__INIT;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
+	LIBBPF_OPTS(bpf_map_batch_opts, opts);
 	int ret;
 
 	key_size = bpf->key_size;
@@ -216,9 +220,14 @@ static int dump_one_bpfmap(int lfd, u32 id, const struct fd_parms *p)
 {
 	BpfmapFileEntry bpf = BPFMAP_FILE_ENTRY__INIT;
 	FileEntry fe = FILE_ENTRY__INIT;
-	struct bpf_map_info map_info;
-	uint32_t info_len = sizeof(struct bpf_map_info);
 	int ret;
+	/* If we are using a bigger struct than the kernel knows of,
+	 * ensure all the unknown bits are 0 - i.e. new user-space
+	 * does not rely on any unknown kernel feature extensions.
+	 * https://github.com/torvalds/linux/blob/a1994480/kernel/bpf/syscall.c#L70
+	 */
+	struct bpf_map_info map_info = {};
+	uint32_t info_len = sizeof(struct bpf_map_info);
 
 	if (parse_fdinfo(lfd, FD_TYPES__BPFMAP, &bpf))
 		return -1;
@@ -266,12 +275,19 @@ static int bpfmap_open(struct file_desc *d, int *new_fd)
 {
 	struct bpfmap_file_info *info;
 	BpfmapFileEntry *bpfe;
-	struct bpf_create_map_attr xattr;
 	int bpfmap_fd;
+#ifdef LEGACY_LIBBPF
+	struct bpf_create_map_attr xattr;
+#else
+	LIBBPF_OPTS(bpf_map_create_opts, bpfmap_opts);
+#endif
 
 	info = container_of(d, struct bpfmap_file_info, d);
 	bpfe = info->bpfe;
 
+	pr_info_bpfmap("Creating and opening ", bpfe);
+
+#ifdef LEGACY_LIBBPF
 	xattr.name = xstrdup(bpfe->map_name);
 	xattr.map_type = bpfe->map_type;
 	xattr.map_flags = bpfe->map_flags;
@@ -285,8 +301,17 @@ static int bpfmap_open(struct file_desc *d, int *new_fd)
 	xattr.map_ifindex = bpfe->ifindex;
 	xattr.inner_map_fd = 0;
 
-	pr_info_bpfmap("Creating and opening ", bpfe);
 	bpfmap_fd = bpf_create_map_xattr(&xattr);
+#else
+	bpfmap_opts.map_flags = bpfe->map_flags;
+	bpfmap_opts.map_ifindex = bpfe->ifindex;
+	if (bpfe->has_map_extra)
+		bpfmap_opts.map_extra = bpfe->map_extra;
+
+	bpfmap_fd = bpf_map_create(bpfe->map_type, bpfe->map_name, bpfe->key_size, bpfe->value_size, bpfe->max_entries,
+				   &bpfmap_opts);
+#endif
+
 	if (bpfmap_fd < 0) {
 		pr_perror("Can't create bpfmap %#08x", bpfe->id);
 		return -1;
diff --git a/test/zdtm/static/bpf_array.c b/test/zdtm/static/bpf_array.c
index ec74a3e3b..febe3e190 100644
--- a/test/zdtm/static/bpf_array.c
+++ b/test/zdtm/static/bpf_array.c
@@ -1,10 +1,14 @@
-#include <linux/bpf.h>
 #include <bpf/bpf.h>
 #include <sys/mman.h>
 
 #include "zdtmtst.h"
 #include "bpfmap_zdtm.h"
 
+#ifndef LIBBPF_OPTS
+#define LIBBPF_OPTS   DECLARE_LIBBPF_OPTS
+#define LEGACY_LIBBPF /* Using libbpf < 0.7 */
+#endif
+
 const char *test_doc = "Check that data and meta-data for BPF_MAP_TYPE_ARRAY"
 		       "is correctly restored";
 const char *test_author = "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
@@ -12,7 +16,7 @@ const char *test_author = "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
 static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
 {
 	int i, ret;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
+	LIBBPF_OPTS(bpf_map_batch_opts, opts);
 
 	for (i = 0; i < max_entries; i++) {
 		keys[i] = i;
@@ -61,6 +65,8 @@ int main(int argc, char **argv)
 	struct bpfmap_fdinfo_obj old_fdinfo = {};
 	struct bpfmap_fdinfo_obj new_fdinfo = {};
 	uint32_t info_len = sizeof(struct bpf_map_info);
+
+#ifdef LEGACY_LIBBPF
 	struct bpf_create_map_attr xattr = {
 		.name = "array_test_map",
 		.map_type = BPF_MAP_TYPE_ARRAY,
@@ -69,7 +75,10 @@ int main(int argc, char **argv)
 		.max_entries = max_entries,
 		.map_flags = BPF_F_NUMA_NODE,
 	};
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
+#else
+	LIBBPF_OPTS(bpf_map_create_opts, bpf_mapfd_opts, .map_flags = BPF_F_NUMA_NODE);
+#endif
+	LIBBPF_OPTS(bpf_map_batch_opts, opts);
 
 	keys = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	values = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
@@ -82,7 +91,13 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
+#ifdef LEGACY_LIBBPF
 	map_fd = bpf_create_map_xattr(&xattr);
+#else
+	map_fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "array_test_map", sizeof(int), sizeof(int), max_entries,
+				&bpf_mapfd_opts);
+#endif
+
 	if (map_fd == -1) {
 		pr_perror("Can't create BPF map");
 		goto err;
diff --git a/test/zdtm/static/bpf_hash.c b/test/zdtm/static/bpf_hash.c
index 612f69665..296a87325 100644
--- a/test/zdtm/static/bpf_hash.c
+++ b/test/zdtm/static/bpf_hash.c
@@ -1,10 +1,14 @@
-#include <linux/bpf.h>
-#include <bpf/bpf.h>
 #include <sys/mman.h>
+#include <bpf/bpf.h>
 
 #include "zdtmtst.h"
 #include "bpfmap_zdtm.h"
 
+#ifndef LIBBPF_OPTS
+#define LIBBPF_OPTS   DECLARE_LIBBPF_OPTS
+#define LEGACY_LIBBPF /* Using libbpf < 0.7 */
+#endif
+
 const char *test_doc = "Check that data and meta-data for BPF_MAP_TYPE_HASH"
 		       "is correctly restored";
 const char *test_author = "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
@@ -12,7 +16,7 @@ const char *test_author = "Abhishek Vijeev <abhishek.vijeev@gmail.com>";
 static int map_batch_update(int map_fd, uint32_t max_entries, int *keys, int *values)
 {
 	int ret;
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
+	LIBBPF_OPTS(bpf_map_batch_opts, opts);
 
 	for (int i = 0; i < max_entries; i++) {
 		keys[i] = i + 1;
@@ -59,6 +63,8 @@ int main(int argc, char **argv)
 	struct bpfmap_fdinfo_obj old_fdinfo = {};
 	struct bpfmap_fdinfo_obj new_fdinfo = {};
 	uint32_t info_len = sizeof(struct bpf_map_info);
+
+#ifdef LEGACY_LIBBPF
 	struct bpf_create_map_attr xattr = {
 		.name = "hash_test_map",
 		.map_type = BPF_MAP_TYPE_HASH,
@@ -67,7 +73,10 @@ int main(int argc, char **argv)
 		.max_entries = max_entries,
 		.map_flags = BPF_F_NO_PREALLOC | BPF_F_NUMA_NODE,
 	};
-	DECLARE_LIBBPF_OPTS(bpf_map_batch_opts, opts, .elem_flags = 0, .flags = 0, );
+#else
+	LIBBPF_OPTS(bpf_map_create_opts, bpf_mapfd_opts, .map_flags = BPF_F_NO_PREALLOC | BPF_F_NUMA_NODE);
+#endif
+	LIBBPF_OPTS(bpf_map_batch_opts, opts);
 
 	keys = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
 	values = mmap(NULL, max_entries * sizeof(int), PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
@@ -80,7 +89,12 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
+#ifdef LEGACY_LIBBPF
 	map_fd = bpf_create_map_xattr(&xattr);
+#else
+	map_fd = bpf_map_create(BPF_MAP_TYPE_HASH, "hash_test_map", sizeof(int), sizeof(int), max_entries,
+				&bpf_mapfd_opts);
+#endif
 	if (!map_fd) {
 		pr_perror("Can't create BPF map");
 		goto err;

From 5b872c7183b3073dd9d1ed231d4325be8a7cac50 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 13 Apr 2022 20:12:11 +0100
Subject: [PATCH 1053/1854] proc_parse: Fix parsing bpf map_extra

The map_extra field has been introduced in Linux Kernel release 5.16
and does not exist in older kernel versions. The current parsing
implementation fails when map_extra is missing.

In particular, it tries to parse the `memlock` field as `map_extra` and
fails but it does not exit with an error because map_extra is marked as
"optional". It then tries to parse the `map_id` field as `memlock` and
fails with an error because map_id is not optional:

Error (criu/proc_parse.c:2161): parse_fdinfo_pid_s: error parsing [map_type:\t2] for 19: Success'

To correctly handle this, we should try to parse again the next field
when parsing of `map_extra` fails, without reading the next line from
the bpfmap.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/proc_parse.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 3c71476fa..b3badb6e4 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1796,14 +1796,11 @@ static int parse_bpfmap(struct bfd *f, char *str, BpfmapFileEntry *bpf)
 	int i;
 
 	for (i = 0; i < n; i++) {
-		bool parsing_failed = false;
 		if (sscanf(str, map[i].fmt, map[i].value) != 1) {
-			parsing_failed = true;
-		}
-		if (map[i].optional && !parsing_failed)
-			*map[i].optional = true;
-		if (!map[i].optional && parsing_failed)
+			if (map[i].optional)
+				continue;
 			return -1;
+		}
 
 		if (i == n - 1)
 			break;

From d14dbb8c74605ab658a4f62004e5cbbce8eddb77 Mon Sep 17 00:00:00 2001
From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
Date: Mon, 28 Mar 2022 16:37:12 +0300
Subject: [PATCH 1054/1854] sk-unix: rework bind_on_deleted() return codes

bind_on_delete() return code is only used for setting errno for pr_perror()
This is mostly useless since a lot of syscalls already set it. All of
non-syscall errors already have prints in case of failure.
Fix bind_on_deleted() always returning 0 and simplify error juggling to
returning -1 in case of errors.

Fixes: #1771
Fixes: d0308e5ecc1c ("sk-unix: make criu respect existing files while restoring ghost unix socket fd")
Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com>
---
 criu/sk-unix.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index b2c2aaca0..c6021bc1f 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1472,7 +1472,7 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	char path[PATH_MAX], path_parked[PATH_MAX], *pos;
 	struct sockaddr_un addr;
 	bool renamed = false;
-	int ret;
+	int ret, exit_code = -1;
 
 	if (ui->ue->name.len >= UNIX_PATH_MAX) {
 		pr_err("ghost: Too long name for socket id %#x ino %u name %s\n", ui->ue->id, ui->ue->ino, ui->name);
@@ -1494,10 +1494,9 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 		}
 
 		if (errno != ENOENT) {
-			ret = -errno;
 			pr_perror("ghost: Can't access %s for socket id %#x ino %u name %s", path, ui->ue->id,
 				  ui->ue->ino, ui->name);
-			return ret;
+			return -1;
 		}
 	}
 
@@ -1508,9 +1507,8 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	pr_debug("ghost: socket id %#x ino %u name %s creating %s\n", ui->ue->id, ui->ue->ino, ui->name, pos);
 	ret = mkdirpat(AT_FDCWD, pos, 0755);
 	if (ret) {
-		errno = -ret;
 		pr_perror("ghost: Can't create %s", pos);
-		return ret;
+		return -1;
 	}
 
 	memset(&addr, 0, sizeof(addr));
@@ -1529,10 +1527,9 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 			pr_debug("ghost: Unlinked stale socket id %#x ino %d name %s\n", ui->ue->id, ui->ue->ino,
 				 path_parked);
 		if (rename(ui->name, path_parked)) {
-			ret = -errno;
 			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s", ui->ue->id, ui->ue->ino, ui->name,
 				  path_parked);
-			return ret;
+			return -1;
 		}
 		pr_debug("ghost: id %#x ino %d renamed %s -> %s\n", ui->ue->id, ui->ue->ino, ui->name, path_parked);
 		renamed = true;
@@ -1540,7 +1537,6 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 
 	ret = bind(sk, (struct sockaddr *)&addr, sizeof(addr.sun_family) + ui->ue->name.len);
 	if (ret < 0) {
-		ret = -errno;
 		pr_perror("ghost: Can't bind on socket id %#x ino %d addr %s", ui->ue->id, ui->ue->ino, ui->name);
 		goto out_rename;
 	}
@@ -1552,9 +1548,10 @@ static int bind_on_deleted(int sk, struct unix_sk_info *ui)
 	ret = keep_deleted(ui);
 	if (ret < 0) {
 		pr_err("ghost: Can't save socket %#x ino %u addr %s into fdstore\n", ui->ue->id, ui->ue->ino, ui->name);
-		ret = -EIO;
+		goto out;
 	}
 
+	exit_code = 0;
 out:
 	/*
 	 * Once everything is ready, just remove the socket from the
@@ -1562,14 +1559,14 @@ out:
 	 */
 	ret = unlinkat(AT_FDCWD, ui->name, 0);
 	if (ret < 0) {
-		ret = -errno;
+		exit_code = -1;
 		pr_perror("ghost: Can't unlink socket %#x ino %u addr %s", ui->ue->id, ui->ue->ino, ui->name);
 	}
 
 out_rename:
 	if (renamed) {
 		if (rename(path_parked, ui->name)) {
-			ret = -errno;
+			exit_code = -1;
 			pr_perror("ghost: Can't rename id %#x ino %u addr %s -> %s", ui->ue->id, ui->ue->ino,
 				  path_parked, ui->name);
 		} else {
@@ -1598,7 +1595,7 @@ out_rename:
 		}
 	}
 
-	return 0;
+	return exit_code;
 }
 
 static int bind_unix_sk(int sk, struct unix_sk_info *ui)
@@ -1643,8 +1640,6 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
 	if (ui->flags & USK_GHOST_FDSTORE) {
 		pr_debug("ghost: bind id %#x ino %u addr %s\n", ui->ue->id, ui->ue->ino, ui->name);
 		ret = bind_on_deleted(sk, ui);
-		if (ret)
-			errno = -ret;
 	} else {
 		pr_debug("bind id %#x ino %u addr %s\n", ui->ue->id, ui->ue->ino, ui->name);
 		ret = bind(sk, (struct sockaddr *)&addr, sizeof(addr.sun_family) + ui->ue->name.len);

From 2f0f12839673c7d82cfc18e99d7e35ed7192906b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 23 Apr 2022 05:14:33 +0100
Subject: [PATCH 1055/1854] readme: Add badge links to workflows

This commit adds a link to the workflow runs for each badge.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6b86cac9e..ff4aa1a23 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
-![X86_64 GCC Test](https://github.com/checkpoint-restore/criu/workflows/X86_64%20GCC%20Test/badge.svg)
-![Docker Test](https://github.com/checkpoint-restore/criu/actions/workflows/docker-test.yml/badge.svg)
-![Podman Test](https://github.com/checkpoint-restore/criu/actions/workflows/podman-test.yml/badge.svg)
-[![CircleCI](https://circleci.com/gh/checkpoint-restore/criu.svg?style=svg)](https://circleci.com/gh/checkpoint-restore/criu)
+[![X86_64 GCC Test](https://github.com/checkpoint-restore/criu/workflows/X86_64%20GCC%20Test/badge.svg)](
+    https://github.com/checkpoint-restore/criu/actions/workflows/x86-64-gcc-test.yml)
+[![Docker Test](https://github.com/checkpoint-restore/criu/actions/workflows/docker-test.yml/badge.svg)](
+    https://github.com/checkpoint-restore/criu/actions/workflows/docker-test.yml)
+[![Podman Test](https://github.com/checkpoint-restore/criu/actions/workflows/podman-test.yml/badge.svg)](
+    https://github.com/checkpoint-restore/criu/actions/workflows/podman-test.yml)
+[![CircleCI](https://circleci.com/gh/checkpoint-restore/criu.svg?style=svg)](
+    https://circleci.com/gh/checkpoint-restore/criu)
 
 <p align="center"><img src="https://criu.org/w/images/1/1c/CRIU.svg" width="256px"/></p>
 

From f635b61f494964a6feb74fd6ecc2ab75a7e59a10 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 2 May 2022 06:45:16 +0000
Subject: [PATCH 1056/1854] test: install criu in /usr

GitHub Actions comes with pre-installed criu in /usr. configure scripts
looking for CRIU will pickup the pre-installed version in /usr if we do
not install CI criu also in /usr.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/podman-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 1d851efbc..414004514 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -7,7 +7,7 @@ export SKIP_CI_TEST=1
 
 cd ../../
 
-make install
+make install PREFIX=/usr
 
 criu --version
 

From 550eafc5d8e387cae693c46fb2824f4ba3c4d933 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Wed, 4 May 2022 00:19:46 +0300
Subject: [PATCH 1057/1854] ci: print kernel modules list

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 scripts/ci/run-ci-tests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7d88b9c20..d63b92ae0 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -91,6 +91,8 @@ print_env() {
 	cat /proc/self/mountinfo || :
 	print_header "Kernel command line"
 	cat /proc/cmdline || :
+	print_header "Kernel modules"
+	lsmod || :
 	print_header "Distribution information"
 	[ -e /etc/lsb-release ] && cat /etc/lsb-release
 	[ -e /etc/redhat-release ] && cat /etc/redhat-release

From c1380c077aa60d5e3fe8de42cb7329a16e0ac5ae Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 5 May 2022 00:13:40 +0300
Subject: [PATCH 1058/1854] ci: workaround race between sit module loading and
 bridge test

https://github.com/checkpoint-restore/criu/issues/1866

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 scripts/ci/run-ci-tests.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index d63b92ae0..81aa07236 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -111,6 +111,9 @@ print_env() {
 	set -x
 }
 
+# FIXME: workaround for the issue https://github.com/checkpoint-restore/criu/issues/1866
+modprobe -v sit || :
+
 print_env
 
 ci_prep

From 17a19676cdf803ec985aede9f38b8deaa971ac98 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 5 May 2022 12:33:50 +0000
Subject: [PATCH 1059/1854] zdtm: handle the case when hugetlb isn't supported

Fixes: e2e02bc83e ("zdtm: Add MAP_HUGETLB memory mapping test")

Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm.py                      | 18 ++++++++++++------
 test/zdtm/static/maps09.checkskip |  4 ++++
 test/zdtm/static/maps10.checkskip |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100755 test/zdtm/static/maps09.checkskip
 create mode 120000 test/zdtm/static/maps10.checkskip

diff --git a/test/zdtm.py b/test/zdtm.py
index 878c3e9cb..c011c79c0 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2584,12 +2584,18 @@ def clean_stuff(opts):
 
 
 def set_nr_hugepages(nr):
-    orig_hugepages = 0
-    with open("/proc/sys/vm/nr_hugepages", "r") as f:
-        orig_hugepages = int(f.read())
-    with open("/proc/sys/vm/nr_hugepages", "w") as f:
-        f.write("{}\n".format(nr))
-    return orig_hugepages
+    try:
+        orig_hugepages = 0
+        with open("/proc/sys/vm/nr_hugepages", "r") as f:
+            orig_hugepages = int(f.read())
+        with open("/proc/sys/vm/nr_hugepages", "w") as f:
+            f.write("{}\n".format(nr))
+        return orig_hugepages
+    except OSError as err:
+        if err.errno != errno.EOPNOTSUPP:
+            raise
+
+    return 0
 
 
 def get_cli_args():
diff --git a/test/zdtm/static/maps09.checkskip b/test/zdtm/static/maps09.checkskip
new file mode 100755
index 000000000..df2370815
--- /dev/null
+++ b/test/zdtm/static/maps09.checkskip
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# will fail with EOPNOTSUPP
+cat /proc/sys/vm/nr_hugepages &> /dev/null
diff --git a/test/zdtm/static/maps10.checkskip b/test/zdtm/static/maps10.checkskip
new file mode 120000
index 000000000..fb42f0f44
--- /dev/null
+++ b/test/zdtm/static/maps10.checkskip
@@ -0,0 +1 @@
+maps09.checkskip
\ No newline at end of file

From 0c1f0256ff56e1816fa97f060f5c46bfa7c86a15 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 5 May 2022 12:41:48 +0000
Subject: [PATCH 1060/1854] kerndat: handle the case when hugetlb isn't
 supported

Currently we check memfd_hugetlb by doing memfd_create("", MFD_HUGETLB).
If we see EINVAL we report that it's not supported, but we can also
get ENOENT error in such case in hugetlb_file_setup() while trying
to find proper hugetlbfs mount.

Reference:
https://github.com/torvalds/linux/blob/06fb4ecfeac/fs/hugetlbfs/inode.c#L1465

Fixes: 4245e6b02fa ("check: Add a check for using memfd with hugetlb")

Reported-by: Mr. Jenkins (ppc64le)
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/kerndat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 551e18bae..b8b6bc95d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -502,7 +502,7 @@ static bool kerndat_has_memfd_hugetlb(void)
 	if (ret >= 0) {
 		kdat.has_memfd_hugetlb = true;
 		close(ret);
-	} else if (ret == -1 && errno == EINVAL) {
+	} else if (ret == -1 && (errno == EINVAL || errno == ENOENT)) {
 		kdat.has_memfd_hugetlb = false;
 	} else {
 		pr_perror("Unexpected error from memfd_create(\"\", MFD_HUGETLB)");

From 991f27c841f4db7587b0247da46c1d51fca0b8d4 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Thu, 5 May 2022 11:25:40 +0300
Subject: [PATCH 1061/1854] ci: skip new hugetlb maps09/maps10 tests for
 pre-dump

This commit has to be reverted once we fix the issue.

Issue: https://github.com/checkpoint-restore/criu/issues/1868

Reported-by: Mr. Jenkins
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/jenkins/criu-dedup.sh             | 2 +-
 test/jenkins/criu-lazy-migration.sh    | 2 +-
 test/jenkins/criu-lazy-pages.sh        | 2 +-
 test/jenkins/criu-pre-dump.sh          | 5 +++--
 test/jenkins/criu-remote-lazy-pages.sh | 2 +-
 test/jenkins/criu-snap.sh              | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh
index edb1b653d..842d218bd 100755
--- a/test/jenkins/criu-dedup.sh
+++ b/test/jenkins/criu-dedup.sh
@@ -4,7 +4,7 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run --all --keep-going --report report --parallel 4 -f h --pre 2 --dedup -x maps04 -x maps007 || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 -f h --pre 2 --dedup -x maps04 -x maps007 -x maps09 -x maps10 || fail
 
 # Additionally run these tests as they touch a lot of
 # memory and it makes sense to additionally check it
diff --git a/test/jenkins/criu-lazy-migration.sh b/test/jenkins/criu-lazy-migration.sh
index 02a212e0d..b23f31c79 100755
--- a/test/jenkins/criu-lazy-migration.sh
+++ b/test/jenkins/criu-lazy-migration.sh
@@ -15,7 +15,7 @@ LAZY_MIGRATE_EXCLUDE="-x fifo_loop -x file_locks -x ptrace_sig -x overmount_file
 	       --lazy-migrate $LAZY_EXCLUDE $LAZY_MIGRATE_EXCLUDE || fail
 
 # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
+LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10"
 
 # lazy restore from images with pre-dumps
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 -f uns \
diff --git a/test/jenkins/criu-lazy-pages.sh b/test/jenkins/criu-lazy-pages.sh
index 9ef721739..f62912090 100755
--- a/test/jenkins/criu-lazy-pages.sh
+++ b/test/jenkins/criu-lazy-pages.sh
@@ -12,7 +12,7 @@ source `dirname $0`/criu-lazy-common.sh
 	       --lazy-pages $LAZY_EXCLUDE || fail
 
 # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
+LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10"
 
 # lazy restore from images with pre-dumps
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
diff --git a/test/jenkins/criu-pre-dump.sh b/test/jenkins/criu-pre-dump.sh
index 137f7c23f..b2972d941 100755
--- a/test/jenkins/criu-pre-dump.sh
+++ b/test/jenkins/criu-pre-dump.sh
@@ -5,5 +5,6 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 -x 'maps04' || fail
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --page-server -x 'maps04' || fail
+# FIXME: https://github.com/checkpoint-restore/criu/issues/1868
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 -x 'maps04' -x 'maps09' -x 'maps10' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --page-server -x 'maps04' -x 'maps09' -x 'maps10' || fail
diff --git a/test/jenkins/criu-remote-lazy-pages.sh b/test/jenkins/criu-remote-lazy-pages.sh
index 1c677e333..48787f3f6 100755
--- a/test/jenkins/criu-remote-lazy-pages.sh
+++ b/test/jenkins/criu-remote-lazy-pages.sh
@@ -12,7 +12,7 @@ source `dirname $0`/criu-lazy-common.sh
 	       --remote-lazy-pages $LAZY_EXCLUDE -x maps04 || fail
 
 # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
+LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02  -x maps09 -x maps10"
 
 # lazy restore from "remote" dump with pre-dumps
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
diff --git a/test/jenkins/criu-snap.sh b/test/jenkins/criu-snap.sh
index b08c57f52..d8fdf02b3 100755
--- a/test/jenkins/criu-snap.sh
+++ b/test/jenkins/criu-snap.sh
@@ -5,5 +5,5 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps -x 'maps04' || fail
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps -x 'maps04' -x 'maps09' -x 'maps10' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' -x 'maps09' -x 'maps10' || fail

From 4f8f295e57e68740699479d12c1ad251e6dd859f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 1 May 2022 15:50:34 +0000
Subject: [PATCH 1062/1854] criu: Version 3.17

Amongst a huge number of fixes all over the place this release introduces:

* mount-v2 engine
* support for MAP_HUGETLB mappings
* support for Linux Restartable Sequences
* support for SOCK_SEQPACKET unix sockets
* CRIU AMD GPU plugin
* setsockopt(SO_BUF_LOCK) support for tcp sockets

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile.versions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 49ac7a138..0500ef0fc 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 16
-CRIU_VERSION_SUBLEVEL	:= 1
+CRIU_VERSION_MINOR	:= 17
+CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Petrified Puffin
+CRIU_VERSION_NAME	:= Radiant Redstart
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From f522adec4a328393c3f5f77b9864ef7030f4f705 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 8 May 2022 21:06:28 +0100
Subject: [PATCH 1063/1854] ci: Fix unsafe repository error

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/lint.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c1215aeaf..c3886c707 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,9 +10,16 @@ jobs:
     steps:
     - name: Install tools
       run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils codespell
+
     - uses: actions/checkout@v2
+
+    - name: Set git safe directory
+      # https://github.com/actions/checkout/issues/760
+      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
     - name: Run make lint
       run: make lint
+
     - name: Run make indent
       run: >
         make indent &&

From ff927316908319ef52c3991960a98d5398d8da35 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 11 May 2022 19:03:36 +0100
Subject: [PATCH 1064/1854] crit: Use same version as criu

Name collision with an abandoned project named 'crit' in pypi causes pip
to show crit (CRiu Image Tool) as outdated.  This patch updates crit to
use the same version and license as criu.

Fixes #1878

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile              |  1 +
 scripts/crit-setup.py | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ad70800eb..436ebfd0d 100644
--- a/Makefile
+++ b/Makefile
@@ -418,6 +418,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	flake8 --config=scripts/flake8.cfg scripts/criu-ns
+	flake8 --config=scripts/flake8.cfg scripts/crit-setup.py
 	flake8 --config=scripts/flake8.cfg coredump/
 	shellcheck --version
 	shellcheck scripts/*.sh
diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py
index 871e55921..13df03e3b 100644
--- a/scripts/crit-setup.py
+++ b/scripts/crit-setup.py
@@ -1,10 +1,24 @@
+import os
 from distutils.core import setup
 
+criu_version = "0.0.1"
+env = os.environ
+
+if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
+    criu_version = '{}.{}'.format(
+        env['CRIU_VERSION_MAJOR'],
+        env['CRIU_VERSION_MINOR']
+    )
+
+    if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
+        criu_version += '.' + env['CRIU_VERSION_SUBLEVEL']
+
 setup(name="crit",
-      version="0.0.1",
+      version=criu_version,
       description="CRiu Image Tool",
       author="CRIU team",
       author_email="criu@openvz.org",
+      license="GPLv2",
       url="https://github.com/checkpoint-restore/criu",
       package_dir={'pycriu': 'lib/py'},
       packages=["pycriu", "pycriu.images"],

From 51533d98ac389711a704266a1a5d7afc9b267f2d Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Apr 2022 06:51:47 +0300
Subject: [PATCH 1065/1854] page-pipe: fix limiting a pipe size

But actually, 5a92f100b88e probably has to be reverted as a whole.
PIPE_MAX_SIZE is the hard limit to avoid PAGE_ALLOC_COSTLY_ORDER
allocations in the kernel. But F_SETPIPE_SZ rounds up a requested pipe
size to a power-of-2 pages. It means that when we request PIPE_MAX_SIZE
that isn't a power-of-2 number, we actually request a pipe size greater
than PIPE_MAX_SIZE.

Fixes: 5a92f100b88e ("page-pipe: Resize up to PIPE_MAX_SIZE")

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/page-pipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index 5a7e50bc1..54dc3ccc4 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -56,7 +56,7 @@ static inline int ppb_resize_pipe(struct page_pipe_buf *ppb)
 
 	if (new_size > PIPE_MAX_SIZE) {
 		if (ppb->pipe_size < PIPE_MAX_SIZE)
-			ppb->pipe_size = PIPE_MAX_SIZE;
+			new_size = PIPE_MAX_SIZE;
 		else
 			return 1;
 	}

From 0df0a7dace5ba4bb9e4ea44794366b6d050cd2f2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Apr 2022 06:59:02 +0300
Subject: [PATCH 1066/1854] page-xfer: use negative values for error codes

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/page-xfer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 2543a462a..6599e29cf 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -736,7 +736,7 @@ static long fill_userbuf(int pid, struct page_pipe_buf *ppb, struct iovec *bufve
 				continue;
 			} else if (errno == ESRCH) {
 				pr_debug("Target process PID:%d not found\n", pid);
-				return ESRCH;
+				return -ESRCH;
 			}
 		}
 
@@ -798,7 +798,7 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 
 		bytes_read = fill_userbuf(pid, ppb, &bufvec, aux_iov, &aux_len);
 
-		if (bytes_read == ESRCH) {
+		if (bytes_read == -ESRCH) {
 			munmap(userbuf, BUFFER_SIZE);
 			return -1;
 		}

From b2bfb7745d839c6c09ea70762ed48cff3385cbf7 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Apr 2022 06:56:37 +0300
Subject: [PATCH 1067/1854] page-xfer: adjust a buffer to a pipe size

Due to side effects of F_SETPIPE_SZ, the actual pipe size can be greater
than PIPE_MAX_SIZE.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/page-xfer.h |  2 +-
 criu/page-xfer.c         | 63 +++++++++++++++++++++++++---------------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/criu/include/page-xfer.h b/criu/include/page-xfer.h
index 1bcd4ff20..36fe67092 100644
--- a/criu/include/page-xfer.h
+++ b/criu/include/page-xfer.h
@@ -10,7 +10,7 @@ struct ps_info {
 extern int cr_page_server(bool daemon_mode, bool lazy_dump, int cfd);
 
 /* User buffer for read-mode pre-dump*/
-#define BUFFER_SIZE (PIPE_MAX_SIZE << PAGE_SHIFT)
+#define PIPE_MAX_BUFFER_SIZE (PIPE_MAX_SIZE << PAGE_SHIFT)
 
 /*
  * page_xfer -- transfer pages into image file.
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 6599e29cf..3d29fbf78 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -777,31 +777,48 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 	struct page_pipe_buf *ppb;
 	unsigned int cur_hole = 0, i;
 	unsigned long ret, bytes_read;
+	unsigned long userbuf_len;
 	struct iovec bufvec;
 
-	struct iovec aux_iov[PIPE_MAX_SIZE];
+	struct iovec *aux_iov;
 	unsigned long aux_len;
+	void *userbuf;
 
-	char *userbuf = mmap(NULL, BUFFER_SIZE, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-
+	userbuf_len = PIPE_MAX_BUFFER_SIZE;
+	userbuf = mmap(NULL, userbuf_len, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 	if (userbuf == MAP_FAILED) {
 		pr_perror("Unable to mmap a buffer");
 		return -1;
 	}
+	aux_iov = xmalloc(userbuf_len / PAGE_SIZE * sizeof(aux_iov[0]));
+	if (!aux_iov)
+		goto err;
 
 	list_for_each_entry(ppb, &pp->bufs, l) {
+		if (ppb->pipe_size * PAGE_SIZE > userbuf_len) {
+			void *addr;
+
+			addr = mremap(userbuf, userbuf_len, ppb->pipe_size * PAGE_SIZE, MREMAP_MAYMOVE);
+			if (addr == MAP_FAILED) {
+				pr_perror("Unable to mmap a buffer");
+				goto err;
+			}
+			userbuf_len = ppb->pipe_size * PAGE_SIZE;
+			userbuf = addr;
+			addr = xrealloc(aux_iov, ppb->pipe_size * sizeof(aux_iov[0]));
+			if (!addr)
+				goto err;
+			aux_iov = addr;
+		}
 		timing_start(TIME_MEMDUMP);
 
 		aux_len = 0;
-		bufvec.iov_len = BUFFER_SIZE;
+		bufvec.iov_len = userbuf_len;
 		bufvec.iov_base = userbuf;
 
 		bytes_read = fill_userbuf(pid, ppb, &bufvec, aux_iov, &aux_len);
-
-		if (bytes_read == -ESRCH) {
-			munmap(userbuf, BUFFER_SIZE);
-			return -1;
-		}
+		if (bytes_read == -ESRCH)
+			goto err;
 
 		bufvec.iov_base = userbuf;
 		bufvec.iov_len = bytes_read;
@@ -809,8 +826,7 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 
 		if (ret == -1 || ret != bytes_read) {
 			pr_err("vmsplice: Failed to splice user buffer to pipe %ld\n", ret);
-			munmap(userbuf, BUFFER_SIZE);
-			return -1;
+			goto err;
 		}
 
 		timing_stop(TIME_MEMDUMP);
@@ -822,10 +838,8 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 			u32 flags;
 
 			ret = dump_holes(xfer, pp, &cur_hole, iov.iov_base);
-			if (ret) {
-				munmap(userbuf, BUFFER_SIZE);
-				return ret;
-			}
+			if (ret)
+				goto err;
 
 			BUG_ON(iov.iov_base < (void *)xfer->offset);
 			iov.iov_base -= xfer->offset;
@@ -833,24 +847,25 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 
 			flags = ppb_xfer_flags(xfer, ppb);
 
-			if (xfer->write_pagemap(xfer, &iov, flags)) {
-				munmap(userbuf, BUFFER_SIZE);
-				return -1;
-			}
+			if (xfer->write_pagemap(xfer, &iov, flags))
+				goto err;
 
-			if (xfer->write_pages(xfer, ppb->p[0], iov.iov_len)) {
-				munmap(userbuf, BUFFER_SIZE);
-				return -1;
-			}
+			if (xfer->write_pages(xfer, ppb->p[0], iov.iov_len))
+				goto err;
 		}
 
 		timing_stop(TIME_MEMWRITE);
 	}
 
-	munmap(userbuf, BUFFER_SIZE);
+	munmap(userbuf, userbuf_len);
+	xfree(aux_iov);
 	timing_start(TIME_MEMWRITE);
 
 	return dump_holes(xfer, pp, &cur_hole, NULL);
+err:
+	munmap(userbuf, userbuf_len);
+	xfree(aux_iov);
+	return -1;
 }
 
 int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp)

From efeedf3912df4a9a13d5ac719700ca06a9dad327 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Apr 2022 07:02:58 +0300
Subject: [PATCH 1068/1854] pre-dump: call vmsplice with SPLICE_F_GIFT

In this case, vmplice attaches pages without coping them.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/page-xfer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 3d29fbf78..2a9f6e2cc 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -822,7 +822,7 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 
 		bufvec.iov_base = userbuf;
 		bufvec.iov_len = bytes_read;
-		ret = vmsplice(ppb->p[1], &bufvec, 1, SPLICE_F_NONBLOCK);
+		ret = vmsplice(ppb->p[1], &bufvec, 1, SPLICE_F_NONBLOCK | SPLICE_F_GIFT);
 
 		if (ret == -1 || ret != bytes_read) {
 			pr_err("vmsplice: Failed to splice user buffer to pipe %ld\n", ret);

From f43dae720af8dd0a9cf8fc7afd2283a5adb4f248 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Apr 2022 19:09:07 +0300
Subject: [PATCH 1069/1854] page-xfer: refactoring analyze_iov and fill_userbuf

* handle unexpected errors of process_vm_readv
* adjust riovs in analyze_iov
* call handle_faulty_iov only if process_vm_readv returns EFAULT.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/page-xfer.c | 67 +++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 2a9f6e2cc..782d4cafc 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -617,31 +617,18 @@ static inline u32 ppb_xfer_flags(struct page_xfer *xfer, struct page_pipe_buf *p
  */
 
 unsigned long handle_faulty_iov(int pid, struct iovec *riov, unsigned long faulty_index, struct iovec *bufvec,
-				struct iovec *aux_iov, unsigned long *aux_len, unsigned long partial_read_bytes)
+				struct iovec *aux_iov, unsigned long *aux_len)
 {
 	struct iovec dummy;
 	ssize_t bytes_read;
-	unsigned long offset = 0;
 	unsigned long final_read_cnt = 0;
 
-	/* Handling Case 2*/
-	if (riov[faulty_index].iov_len == PAGE_SIZE) {
-		cnt_sub(CNT_PAGES_WRITTEN, 1);
-		return 0;
-	}
-
 	/* Handling Case 3-Part 3.2*/
-	offset = (partial_read_bytes) ? partial_read_bytes : PAGE_SIZE;
-
-	dummy.iov_base = riov[faulty_index].iov_base + offset;
-	dummy.iov_len = riov[faulty_index].iov_len - offset;
-
-	if (!partial_read_bytes)
-		cnt_sub(CNT_PAGES_WRITTEN, 1);
+	dummy.iov_base = riov[faulty_index].iov_base;
+	dummy.iov_len = riov[faulty_index].iov_len;
 
 	while (dummy.iov_len) {
 		bytes_read = process_vm_readv(pid, bufvec, 1, &dummy, 1, 0);
-
 		if (bytes_read == -1) {
 			/* Handling faulty page read in faulty iov */
 			cnt_sub(CNT_PAGES_WRITTEN, 1);
@@ -671,14 +658,12 @@ unsigned long handle_faulty_iov(int pid, struct iovec *riov, unsigned long fault
 
 /*
  * This function will position start pointer to the latest
- * successfully read iov in iovec. In case of partial read it
- * returns partial_read_bytes, otherwise 0.
+ * successfully read iov in iovec.
  */
 static unsigned long analyze_iov(ssize_t bytes_read, struct iovec *riov, unsigned long *index, struct iovec *aux_iov,
 				 unsigned long *aux_len)
 {
 	ssize_t processed_bytes = 0;
-	unsigned long partial_read_bytes = 0;
 
 	/* correlating iovs with read bytes */
 	while (processed_bytes < bytes_read) {
@@ -692,13 +677,17 @@ static unsigned long analyze_iov(ssize_t bytes_read, struct iovec *riov, unsigne
 
 	/* handling partially processed faulty iov*/
 	if (processed_bytes - bytes_read) {
+		unsigned long partial_read_bytes = 0;
+
 		(*index) -= 1;
 
 		partial_read_bytes = riov[*index].iov_len - (processed_bytes - bytes_read);
 		aux_iov[*aux_len - 1].iov_len = partial_read_bytes;
+		riov[*index].iov_base += partial_read_bytes;
+		riov[*index].iov_len -= partial_read_bytes;
 	}
 
-	return partial_read_bytes;
+	return 0;
 }
 
 /*
@@ -723,40 +712,36 @@ static long fill_userbuf(int pid, struct page_pipe_buf *ppb, struct iovec *bufve
 	ssize_t bytes_read;
 	unsigned long total_read = 0;
 	unsigned long start = 0;
-	unsigned long partial_read_bytes = 0;
 
 	while (start < ppb->nr_segs) {
 		bytes_read = process_vm_readv(pid, bufvec, 1, &riov[start], ppb->nr_segs - start, 0);
-
 		if (bytes_read == -1) {
+			if (errno == ESRCH) {
+				pr_debug("Target process PID:%d not found\n", pid);
+				return -ESRCH;
+			}
+			if (errno != EFAULT) {
+				pr_perror("process_vm_readv failed");
+				return -1;
+			}
 			/* Handling Case 1*/
 			if (riov[start].iov_len == PAGE_SIZE) {
 				cnt_sub(CNT_PAGES_WRITTEN, 1);
 				start += 1;
 				continue;
-			} else if (errno == ESRCH) {
-				pr_debug("Target process PID:%d not found\n", pid);
-				return -ESRCH;
 			}
+			total_read += handle_faulty_iov(pid, riov, start, bufvec, aux_iov, aux_len);
+			start += 1;
+			continue;
 		}
 
-		partial_read_bytes = 0;
-
 		if (bytes_read > 0) {
-			partial_read_bytes = analyze_iov(bytes_read, riov, &start, aux_iov, aux_len);
+			if (analyze_iov(bytes_read, riov, &start, aux_iov, aux_len) < 0)
+				return -1;
 			bufvec->iov_base += bytes_read;
 			bufvec->iov_len -= bytes_read;
 			total_read += bytes_read;
 		}
-
-		/*
-		 * If all iovs not processed in one go,
-		 * it means some iov in between has failed.
-		 */
-		if (start < ppb->nr_segs)
-			total_read += handle_faulty_iov(pid, riov, start, bufvec, aux_iov, aux_len, partial_read_bytes);
-
-		start += 1;
 	}
 
 	return total_read;
@@ -817,7 +802,13 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 		bufvec.iov_base = userbuf;
 
 		bytes_read = fill_userbuf(pid, ppb, &bufvec, aux_iov, &aux_len);
-		if (bytes_read == -ESRCH)
+		if (bytes_read == -ESRCH) {
+			timing_stop(TIME_MEMDUMP);
+			munmap(userbuf, userbuf_len);
+			xfree(aux_iov);
+			return 0;
+		}
+		if (bytes_read < 0)
 			goto err;
 
 		bufvec.iov_base = userbuf;

From 6507ae5331857249c2930611b531a4d789321d4c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Apr 2022 18:51:32 +0300
Subject: [PATCH 1070/1854] ci: test the read mode of pre-dump

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/ci/run-ci-tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 81aa07236..8d9de6e55 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -268,6 +268,7 @@ make -C test/others/rpc/ run
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --noauto-dedup
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server --dedup
+./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --pre-dump-mode read
 
 ./test/zdtm.py run -t zdtm/transition/pid_reuse --pre 2 # start time based pid reuse detection
 ./test/zdtm.py run -t zdtm/transition/pidfd_store_sk --rpc --pre 2 # pidfd based pid reuse detection

From e6f292cb3849ddcac63d5dbd40e13ad29f2b15b2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 15 May 2022 17:08:18 +0100
Subject: [PATCH 1071/1854] amdgpu/Makefile: Fix include path

When building packages for CRIU the source directory might have a
name different than 'criu'.

Fixes: #1877

Reported-by: @siris
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 84b9f8714..971b93b51 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -2,7 +2,7 @@ PLUGIN_NAME		:= amdgpu_plugin
 PLUGIN_SOBJ		:= amdgpu_plugin.so
 
 
-PLUGIN_INCLUDE  	:= -iquote../../../criu/include
+PLUGIN_INCLUDE  	:= -iquote../../include
 PLUGIN_INCLUDE  	+= -iquote../../criu/include
 PLUGIN_INCLUDE  	+= -iquote../../criu/arch/$(ARCH)/include/
 PLUGIN_INCLUDE  	+= -iquote../../

From a90a1d4827a07d68e5d4e73bb8122aa1ca38525a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 8 May 2022 11:07:25 +0100
Subject: [PATCH 1072/1854] amdgpu: Set PLUGINDIR to /usr/lib/criu

Building the criu packages for Ubuntu/Debian fails with:

	mkdir: cannot create directory '/var/lib/criu': Permission denied

This patch updates PLUGINDIR with the value /usr/lib/criu

Fixes: #1877

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile.install        | 2 +-
 criu/include/plugin.h   | 4 +++-
 plugins/amdgpu/Makefile | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile.install b/Makefile.install
index aafb95469..c798637be 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -7,7 +7,7 @@ MANDIR		?= $(PREFIX)/share/man
 INCLUDEDIR	?= $(PREFIX)/include
 LIBEXECDIR	?= $(PREFIX)/libexec
 RUNDIR		?= /run
-PLUGINDIR	?= /var/lib/criu
+PLUGINDIR	?= $(PREFIX)/lib/criu
 
 #
 # For recent Debian/Ubuntu with multiarch support.
diff --git a/criu/include/plugin.h b/criu/include/plugin.h
index a1796b641..0115e6ea0 100644
--- a/criu/include/plugin.h
+++ b/criu/include/plugin.h
@@ -5,7 +5,9 @@
 #include "common/compiler.h"
 #include "common/list.h"
 
-#define CR_PLUGIN_DEFAULT "/var/lib/criu/"
+#ifndef CR_PLUGIN_DEFAULT
+#define CR_PLUGIN_DEFAULT "/usr/lib/criu/"
+#endif
 
 void cr_plugin_fini(int stage, int err);
 int cr_plugin_init(int stage);
diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 971b93b51..367a52c99 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -15,7 +15,7 @@ DEPS_NOK 		:= ;
 include $(__nmk_dir)msg.mk
 
 CC      		:= gcc
-PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC
+PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC -DCR_PLUGIN_DEFAULT="$(PLUGINDIR)"
 PLUGIN_LDFLAGS		:= -lpthread -lrt -ldrm -ldrm_amdgpu
 
 ifeq ($(CONFIG_AMDGPU),y)
@@ -50,16 +50,16 @@ clean: amdgpu_plugin_clean amdgpu_plugin_test_clean
 mrproper: clean
 
 install:
-	$(Q) mkdir -p $(PLUGINDIR)
 ifeq ($(CONFIG_AMDGPU),y)
+	$(Q) mkdir -p $(DESTDIR)$(PLUGINDIR)
 	$(E) "  INSTALL " $(PLUGIN_NAME)
-	$(Q) install -m 644 $(PLUGIN_SOBJ) $(PLUGINDIR)
+	$(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
 endif
 .PHONY: install
 
 uninstall:
 ifeq ($(CONFIG_AMDGPU),y)
 	$(E) " UNINSTALL" $(PLUGIN_NAME)
-	$(Q) $(RM) $(PLUGINDIR)/$(PLUGIN_SOBJ)
+	$(Q) $(RM) $(DESTDIR)$(PLUGINDIR)/$(PLUGIN_SOBJ)
 endif
 .PHONY: uninstall

From f8c9e07e4f21685e31a91430da7f1fc55ad36bbb Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 18 May 2022 18:25:43 +0300
Subject: [PATCH 1073/1854] mount-v2: split out restore_one_sharing helper

This helper restores master_id and shared_id of first mount in the
sharing group. It first copies sharing from either external source or
internal parent sharing group and makes master_id from shared_id. Next
it creates new shared_id when needed.

All other mounts except first are just copied from the first one.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount-v2.c | 60 ++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index 623016d42..1d188114f 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -925,27 +925,25 @@ static int move_mount_set_group(int src_id, char *source, int dst_id)
 	return 0;
 }
 
-static int restore_one_sharing_group(struct sharing_group *sg)
+static int restore_one_sharing(struct sharing_group *sg, struct mount_info *target)
 {
-	struct mount_info *first, *other;
-	char first_path[PATH_MAX];
-	int first_fd;
+	char target_path[PATH_MAX];
+	int target_fd;
 
-	first = get_first_mount(sg);
-	first_fd = fdstore_get(first->mnt_fd_id);
-	BUG_ON(first_fd < 0);
-	snprintf(first_path, sizeof(first_path), "/proc/self/fd/%d", first_fd);
+	target_fd = fdstore_get(target->mnt_fd_id);
+	BUG_ON(target_fd < 0);
+	snprintf(target_path, sizeof(target_path), "/proc/self/fd/%d", target_fd);
 
-	/* Restore first's master_id from shared_id of the source */
+	/* Restore target's master_id from shared_id of the source */
 	if (sg->master_id) {
 		if (sg->parent) {
-			struct mount_info *p;
+			struct mount_info *first;
 
 			/* Get shared_id from parent sharing group */
-			p = get_first_mount(sg->parent);
-			if (move_mount_set_group(p->mnt_fd_id, NULL, first->mnt_fd_id)) {
-				pr_err("Failed to copy sharing from %d to %d\n", p->mnt_id, first->mnt_id);
-				close(first_fd);
+			first = get_first_mount(sg->parent);
+			if (move_mount_set_group(first->mnt_fd_id, NULL, target->mnt_fd_id)) {
+				pr_err("Failed to copy sharing from %d to %d\n", first->mnt_id, target->mnt_id);
+				close(target_fd);
 				return -1;
 			}
 		} else {
@@ -956,30 +954,42 @@ static int restore_one_sharing_group(struct sharing_group *sg)
 			 * or non-shared slave). If source is a private mount
 			 * we would fail.
 			 */
-			if (move_mount_set_group(-1, sg->source, first->mnt_fd_id)) {
-				pr_err("Failed to copy sharing from source %s to %d\n", sg->source, first->mnt_id);
-				close(first_fd);
+			if (move_mount_set_group(-1, sg->source, target->mnt_fd_id)) {
+				pr_err("Failed to copy sharing from source %s to %d\n", sg->source, target->mnt_id);
+				close(target_fd);
 				return -1;
 			}
 		}
 
 		/* Convert shared_id to master_id */
-		if (mount(NULL, first_path, NULL, MS_SLAVE, NULL)) {
-			pr_perror("Failed to make mount %d slave", first->mnt_id);
-			close(first_fd);
+		if (mount(NULL, target_path, NULL, MS_SLAVE, NULL)) {
+			pr_perror("Failed to make mount %d slave", target->mnt_id);
+			close(target_fd);
 			return -1;
 		}
 	}
 
-	/* Restore first's shared_id */
+	/* Restore target's shared_id */
 	if (sg->shared_id) {
-		if (mount(NULL, first_path, NULL, MS_SHARED, NULL)) {
-			pr_perror("Failed to make mount %d shared", first->mnt_id);
-			close(first_fd);
+		if (mount(NULL, target_path, NULL, MS_SHARED, NULL)) {
+			pr_perror("Failed to make mount %d shared", target->mnt_id);
+			close(target_fd);
 			return -1;
 		}
 	}
-	close(first_fd);
+	close(target_fd);
+
+	return 0;
+}
+
+static int restore_one_sharing_group(struct sharing_group *sg)
+{
+	struct mount_info *first, *other;
+
+	first = get_first_mount(sg);
+
+	if (restore_one_sharing(sg, first))
+		return -1;
 
 	/* Restore sharing for other mounts from the sharing group */
 	list_for_each_entry(other, &sg->mnt_list, mnt_sharing) {

From 229c5df5cefa4be44305ca08ae20befbb3d0f91d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 18 May 2022 18:25:43 +0300
Subject: [PATCH 1074/1854] mount-v2: workaround for multiple external
 bindmounts with no common root

It's a problem when while restoring sharing group we need to copy
sharing between two mounts with non-intersecting roots, because kernel
does not allow it.

We have a case https://github.com/opencontainers/runc/pull/3442, where
runc adds different devtmpfs file-bindmounts to container and there is
no fsroot mount in container for this devtmpfs, thus mount-v2 faces the
above problem.

Luckily for the case of external mounts which are in one sharing group
and which have non-intersecting roots, these mounts likely only have
external master with no sharing, so we can just copy sharing from
external source and make it slave as a workaround.

https://github.com/checkpoint-restore/criu/issues/1886

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount-v2.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index 1d188114f..5d53e9a22 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -996,9 +996,35 @@ static int restore_one_sharing_group(struct sharing_group *sg)
 		if (other == first)
 			continue;
 
-		if (move_mount_set_group(first->mnt_fd_id, NULL, other->mnt_fd_id)) {
-			pr_err("Failed to copy sharing from %d to %d\n", first->mnt_id, other->mnt_id);
-			return -1;
+		if (is_sub_path(other->root, first->root)) {
+			if (move_mount_set_group(first->mnt_fd_id, NULL, other->mnt_fd_id)) {
+				pr_err("Failed to copy sharing from %d to %d\n", first->mnt_id, other->mnt_id);
+				return -1;
+			}
+		} else {
+			/*
+			 * Case where mounts of this sharing group don't have common root.
+			 * For instance we can create two sub-directories .a and .b in some
+			 * shared mount, bindmount them separately somethere and umount the
+			 * original mount. Now we have both bindmounts shared between each
+			 * other. Kernel only allows to copy sharing between mounts when
+			 * source root contains destination root, which is not true for
+			 * these two, so we can't just copy from first to other.
+			 *
+			 * For external sharing (!sg->parent) with only master_id (shared_id
+			 * == 0) we can workaround this by copying from their external source
+			 * instead (same as we did for a first mount).
+			 *
+			 * This is a w/a runc usecase, see https://github.com/opencontainers/runc/pull/3442
+			 */
+			if (!sg->parent && !sg->shared_id) {
+				if (restore_one_sharing(sg, other))
+					return -1;
+			} else {
+				pr_err("Can't copy sharing from %d[%s] to %d[%s]\n", first->mnt_id, first->root,
+				       other->mnt_id, other->root);
+				return -1;
+			}
 		}
 	}
 

From 4cc8a18f3bd8278848f42532ff7d5fd410d79e8c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 May 2022 12:11:49 +0300
Subject: [PATCH 1075/1854] zdtm: test multiple ext bindmounts with no common
 root and same master

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile              |   1 +
 test/zdtm/static/mnt_ext_multiple.c    | 118 +++++++++++++++++++++++++
 test/zdtm/static/mnt_ext_multiple.desc |   5 ++
 3 files changed, 124 insertions(+)
 create mode 100644 test/zdtm/static/mnt_ext_multiple.c
 create mode 100644 test/zdtm/static/mnt_ext_multiple.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 9dc02d4a5..761bf0f6c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -406,6 +406,7 @@ TST_DIR		=				\
 		mntns_pivot_root		\
 		mntns_pivot_root_ro		\
 		mnt_ext_sharing			\
+		mnt_ext_multiple		\
 		mount_complex_sharing		\
 		mnt_tracefs			\
 		mntns_deleted			\
diff --git a/test/zdtm/static/mnt_ext_multiple.c b/test/zdtm/static/mnt_ext_multiple.c
new file mode 100644
index 000000000..7014927ac
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_multiple.c
@@ -0,0 +1,118 @@
+#include <sched.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check multiple non-common root external mounts with same external master";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname = "mnt_ext_multiple.test";
+char *source = "zdtm_ext_multiple";
+char *ext_source = "zdtm_ext_multiple.ext";
+TEST_OPTION(dirname, string, "directory name", 1);
+
+int main(int argc, char **argv)
+{
+	char *root, testdir[PATH_MAX];
+	char dst_a[PATH_MAX], dst_b[PATH_MAX];
+	char src[PATH_MAX], src_a[PATH_MAX], src_b[PATH_MAX];
+	char nsdst_a[PATH_MAX], nsdst_b[PATH_MAX];
+	char *tmp = "/tmp/zdtm_ext_multiple.tmp";
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
+
+	root = getenv("ZDTM_ROOT");
+	if (root == NULL) {
+		pr_perror("root");
+		return 1;
+	}
+
+	if (!zdtm_newns) {
+		pr_perror("ZDTM_NEWNS is not set");
+		return 1;
+	} else if (strcmp(zdtm_newns, "1")) {
+		goto test;
+	}
+
+	/* Prepare directories in test root */
+	sprintf(testdir, "%s/%s", root, dirname);
+	mkdir(testdir, 0755);
+	sprintf(dst_a, "%s/%s/dst_a", root, dirname);
+	mkdir(dst_a, 0755);
+	sprintf(dst_b, "%s/%s/dst_b", root, dirname);
+	mkdir(dst_b, 0755);
+
+	/* Prepare directories in criu root */
+	mkdir(tmp, 0755);
+	if (mount(source, tmp, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		return 1;
+	}
+	if (mount(NULL, tmp, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		return 1;
+	}
+	sprintf(src, "%s/src", tmp);
+	mkdir(src, 0755);
+
+	/* Create a shared mount in criu mntns */
+	if (mount(ext_source, src, "tmpfs", 0, NULL)) {
+		pr_perror("mount tmpfs");
+		return 1;
+	}
+	if (mount(NULL, src, NULL, MS_PRIVATE, NULL)) {
+		pr_perror("make private");
+		return 1;
+	}
+	if (mount(NULL, src, NULL, MS_SHARED, NULL)) {
+		pr_perror("make shared");
+		return 1;
+	}
+
+	/*
+	 * Create temporary mntns, next mounts will not show up in criu mntns
+	 */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	/*
+	 * Populate to the tests root subdirectories of the src mount
+	 */
+	sprintf(src_a, "%s/src/a", tmp);
+	mkdir(src_a, 0755);
+	if (mount(src_a, dst_a, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+	sprintf(src_b, "%s/src/b", tmp);
+	mkdir(src_b, 0755);
+	if (mount(src_b, dst_b, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+
+test:
+	test_init(argc, argv);
+
+	/* Make "external" mounts to have external master */
+	sprintf(nsdst_a, "/%s/dst_a", dirname);
+	if (mount(NULL, nsdst_a, NULL, MS_SLAVE, NULL)) {
+		pr_perror("make slave");
+		return 1;
+	}
+	sprintf(nsdst_b, "/%s/dst_b", dirname);
+	if (mount(NULL, nsdst_b, NULL, MS_SLAVE, NULL)) {
+		pr_perror("make slave");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_ext_multiple.desc b/test/zdtm/static/mnt_ext_multiple.desc
new file mode 100644
index 000000000..fd413ed15
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_multiple.desc
@@ -0,0 +1,5 @@
+{   'dopts': '--external mnt[/mnt_ext_multiple.test/dst_a]:MNT_A --external mnt[/mnt_ext_multiple.test/dst_b]:MNT_B',
+    'feature': 'mnt_id move_mount_set_group',
+    'flavor': 'ns uns',
+    'flags': 'suid',
+    'ropts': '--external mnt[MNT_A]:/tmp/zdtm_ext_multiple.tmp/src/a --external mnt[MNT_B]:/tmp/zdtm_ext_multiple.tmp/src/b --no-mntns-compat-mode'}

From 8a18faea09c9d7062baac83e00000ae8ad542ee3 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 17 Jun 2022 14:38:28 +0300
Subject: [PATCH 1076/1854] util/mount-v2: fix resolve_mountpoint() to always
 return freeable pointer

Else we have a Segmentation fault in __move_mount_set_group() on
xfree(source_mp) if resolve_mountpoint() returned statically allocated
path.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/util.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/criu/util.c b/criu/util.c
index 40b12bace..5f69465b4 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -2021,6 +2021,10 @@ char *resolve_mountpoint(char *path)
 	char *mp_path, *free_path;
 	bool is_mountpoint;
 
+	/*
+	 * The dirname() function may modify the contents of given path,
+	 * so we need a strdup here to preserve path.
+	 */
 	mp_path = free_path = xstrdup(path);
 	if (!mp_path)
 		return NULL;
@@ -2031,7 +2035,7 @@ char *resolve_mountpoint(char *path)
 		 * by openat2 RESOLVE_NO_XDEV, let's just assume they are.
 		 */
 		if (is_same_path(mp_path, "/"))
-			return mp_path;
+			goto out;
 
 		if (path_is_mountpoint(mp_path, &is_mountpoint) == -1) {
 			xfree(free_path);
@@ -2039,7 +2043,7 @@ char *resolve_mountpoint(char *path)
 		}
 
 		if (is_mountpoint)
-			return mp_path;
+			goto out;
 
 		/* Try parent directory */
 		mp_path = dirname(mp_path);
@@ -2048,4 +2052,14 @@ char *resolve_mountpoint(char *path)
 	/* never get here */
 	xfree(free_path);
 	return NULL;
+out:
+	/*
+	 * The dirname() function may or may not return statically allocated
+	 * strings, so here mp_path can be either dynamically allocated or
+	 * statically allocated. Let's strdup to make the return pointer
+	 * always freeable.
+	 */
+	mp_path = xstrdup(mp_path);
+	xfree(free_path);
+	return mp_path;
 }

From f29d51560ee5ac3fb11ab8e4034938ff21242f17 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 20 Jun 2022 12:54:29 +0300
Subject: [PATCH 1077/1854] zdtm: add mnt_root_ext test

This test has one external mount [criumntns] /zdtm_root_ext.tmp ->
[testmntns] /mnt_root_ext.test, and it specifically gives '--external
mnt[MNT]:.zdtm_root_ext.tmp' option on restore without '/' to make
dirname on it return static '.' path (see glibc dirname() code) and
reproduce a segfault in resolve_mountpoint().

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile          |  1 +
 test/zdtm/static/mnt_root_ext.c    | 79 ++++++++++++++++++++++++++++++
 test/zdtm/static/mnt_root_ext.desc |  5 ++
 test/zdtm/static/mnt_root_ext.hook |  5 ++
 4 files changed, 90 insertions(+)
 create mode 100644 test/zdtm/static/mnt_root_ext.c
 create mode 100644 test/zdtm/static/mnt_root_ext.desc
 create mode 100755 test/zdtm/static/mnt_root_ext.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 761bf0f6c..4a93659d4 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -402,6 +402,7 @@ TST_DIR		=				\
 		mnt_ext_master			\
 		mnt_ext_dev			\
 		mnt_ext_root			\
+		mnt_root_ext			\
 		mnt_ext_collision		\
 		mntns_pivot_root		\
 		mntns_pivot_root_ro		\
diff --git a/test/zdtm/static/mnt_root_ext.c b/test/zdtm/static/mnt_root_ext.c
new file mode 100644
index 000000000..6a2eb068c
--- /dev/null
+++ b/test/zdtm/static/mnt_root_ext.c
@@ -0,0 +1,79 @@
+#include <sched.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check external mount from host's rootfs";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname = "mnt_root_ext.test";
+TEST_OPTION(dirname, string, "directory name", 1);
+
+int main(int argc, char **argv)
+{
+	char *root, testdir[PATH_MAX], nstestdir[PATH_MAX];
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
+	char tmp[] = "/.zdtm_root_ext.tmp";
+
+	root = getenv("ZDTM_ROOT");
+	if (root == NULL) {
+		pr_perror("root");
+		return 1;
+	}
+
+	if (!zdtm_newns) {
+		pr_perror("ZDTM_NEWNS is not set");
+		return 1;
+	} else if (strcmp(zdtm_newns, "1")) {
+		goto test;
+	}
+
+	/* Prepare directories in test root */
+	sprintf(testdir, "%s/%s", root, dirname);
+	mkdir(testdir, 0755);
+
+	/* Prepare directories in criu root */
+	mkdir(tmp, 0755);
+
+	/* Make criu's mntns root mount shared */
+	if (mount(NULL, "/", NULL, MS_SHARED, NULL)) {
+		pr_perror("make shared");
+		return 1;
+	}
+
+	/*
+	 * Create temporary mntns, next mounts will not show up in criu mntns
+	 */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	/*
+	 * Populate to the tests root host's rootfs subdir
+	 */
+	if (mount(tmp, testdir, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+test:
+	test_init(argc, argv);
+
+	/*
+	 * Make "external" mount to be slave
+	 */
+	sprintf(nstestdir, "/%s", dirname);
+	if (mount(NULL, nstestdir, NULL, MS_SLAVE, NULL)) {
+		pr_perror("make slave");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_root_ext.desc b/test/zdtm/static/mnt_root_ext.desc
new file mode 100644
index 000000000..fee7efbae
--- /dev/null
+++ b/test/zdtm/static/mnt_root_ext.desc
@@ -0,0 +1,5 @@
+{   'dopts': '--external mnt[/mnt_root_ext.test]:MNT',
+    'feature': 'mnt_id move_mount_set_group',
+    'flavor': 'ns uns',
+    'flags': 'suid',
+    'ropts': '--external mnt[MNT]:.zdtm_root_ext.tmp --no-mntns-compat-mode'}
diff --git a/test/zdtm/static/mnt_root_ext.hook b/test/zdtm/static/mnt_root_ext.hook
new file mode 100755
index 000000000..a5286f208
--- /dev/null
+++ b/test/zdtm/static/mnt_root_ext.hook
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+[ "$1" == "--clean" ] || exit 0
+
+rmdir /.zdtm_root_ext.tmp

From 46ec6749faa91689da0de8439540607c15696b12 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 Jun 2022 09:08:21 +0100
Subject: [PATCH 1078/1854] ci: Fix code indent

This patch contains auto-generated changes from `make indent`

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/arch/x86/cpu.c               | 2 +-
 criu/arch/x86/crtools.c           | 2 +-
 criu/cr-check.c                   | 2 +-
 criu/unittest/mock.c              | 6 ++----
 plugins/amdgpu/amdgpu_plugin.c    | 4 ++--
 test/zdtm/static/inotify_system.c | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index b3a7ca636..dfa31569f 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -78,7 +78,7 @@ int cpu_dump_cpuinfo(void)
 	cpu_info.n_x86_entry = 1;
 
 	cpu_x86_info.vendor_id = (rt_cpu_info.x86_vendor == X86_VENDOR_INTEL) ? CPUINFO_X86_ENTRY__VENDOR__INTEL :
-										      CPUINFO_X86_ENTRY__VENDOR__AMD;
+										CPUINFO_X86_ENTRY__VENDOR__AMD;
 
 	cpu_x86_info.cpu_family = rt_cpu_info.x86_family;
 	cpu_x86_info.model = rt_cpu_info.x86_model;
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index f177b9e7b..d10e51e48 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -409,7 +409,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 {
 	fpu_state_t *fpu_state = core_is_compat(core) ? &sigframe->compat.fpu_state : &sigframe->native.fpu_state;
 	struct xsave_struct *x = core_is_compat(core) ? (void *)&fpu_state->fpu_state_ia32.xsave :
-							      (void *)&fpu_state->fpu_state_64.xsave;
+							(void *)&fpu_state->fpu_state_64.xsave;
 
 	/*
 	 * If no FPU information provided -- we're restoring
diff --git a/criu/cr-check.c b/criu/cr-check.c
index a172806f5..f589a91da 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1291,7 +1291,7 @@ static int check_net_diag_raw(void)
 {
 	check_sock_diag();
 	return (socket_test_collect_bit(AF_INET, IPPROTO_RAW) && socket_test_collect_bit(AF_INET6, IPPROTO_RAW)) ? 0 :
-															 -1;
+														   -1;
 }
 
 static int check_pidfd_store(void)
diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c
index 0151873dc..e517720e4 100644
--- a/criu/unittest/mock.c
+++ b/criu/unittest/mock.c
@@ -103,8 +103,7 @@ void set_cr_errno(int new_err)
 {
 }
 
-struct ns_desc {
-};
+struct ns_desc {};
 struct ns_desc user_ns_desc;
 int switch_ns(int pid, struct ns_desc *nd, int *rst)
 {
@@ -118,8 +117,7 @@ int run_scripts(enum script_actions act)
 }
 
 typedef struct VmaEntry VmaEntry;
-struct VmaEntry {
-};
+struct VmaEntry {};
 void vma_entry__init(VmaEntry *message)
 {
 }
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index e48c8988b..0a55e34a2 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -873,7 +873,7 @@ void *dump_bo_contents(void *_thread_data)
 	}
 
 	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
-									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
+								   SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id == thread_data->gpu_id &&
@@ -967,7 +967,7 @@ void *restore_bo_contents(void *_thread_data)
 	}
 
 	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
-									 SDMA_LINEAR_COPY_MAX_SIZE - 1;
+								   SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
 	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
 	bo_contents_fp = open_img_file(img_path, false, &image_size);
diff --git a/test/zdtm/static/inotify_system.c b/test/zdtm/static/inotify_system.c
index 141476415..079d4b161 100644
--- a/test/zdtm/static/inotify_system.c
+++ b/test/zdtm/static/inotify_system.c
@@ -57,7 +57,7 @@ const char *inot_dir = "./inotify.no_del";
 	(MASK == IN_UNMOUNT)	   ? "IN_UNMOUNT" :       \
 	(MASK == IN_Q_OVERFLOW)	   ? "IN_Q_OVERFLOW" :    \
 	(MASK == IN_IGNORED)	   ? "IN_IGNORED" :       \
-					   "UNKNOWN"
+				     "UNKNOWN"
 
 #include <unistd.h>
 #include <fcntl.h>

From d46f40f4ff0c724e0b9f0f8a2e8c043806897e94 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 23 Jun 2022 05:55:25 +0000
Subject: [PATCH 1079/1854] criu: Version 3.17.1

 * Fixes for pre-dump read mode
 * Fixes for mount-v2
 * amdgpu plugin build and installation fixes
 * Some minor CI related fixes

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile.versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.versions b/Makefile.versions
index 0500ef0fc..73bc2d5fa 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -2,7 +2,7 @@
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
 CRIU_VERSION_MINOR	:= 17
-CRIU_VERSION_SUBLEVEL	:=
+CRIU_VERSION_SUBLEVEL	:= 1
 CRIU_VERSION_EXTRA	:=
 CRIU_VERSION_NAME	:= Radiant Redstart
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))

From 9066f874175600048ab4caffc0931948ed7e0cba Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 27 Apr 2022 14:15:37 +0300
Subject: [PATCH 1080/1854] cr-dump: do not report success to logs if post-dump
 script failed

It can be confusing to see error from post-dump action script and non
zero return from criu though at the same time see "Dumping finished
successfully" in log. I believe it is logical to consider post-dump
action script as a part of "dump" process so fail in it means that the
whole dump failed.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index f58701e5c..60e90baed 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2049,7 +2049,7 @@ static int cr_dump_finish(int ret)
 	close_service_fd(CR_PROC_FD_OFF);
 	close_image_dir();
 
-	if (ret) {
+	if (ret || post_dump_ret) {
 		pr_err("Dumping FAILED.\n");
 	} else {
 		write_stats(DUMP_STATS);

From b26e1fdbf7bbcb98a6fe8c2f922e4aaf38c54f12 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 8 May 2022 16:04:26 +0700
Subject: [PATCH 1081/1854] mem: Skip pre-dumping on hugetlb mappings

As private hugetlb mappings are not pre-mapped, the content of them is restored
in the the restorer which cannot use page_read->read_pages. As a result, we
cannot recursively read the content of pre-dumped image in the parent directory
and use preadv to read the content from the last dumped image only. Therefore,
it may freeze while restoring when the content of mapping is in pre-dumped image
in parent directory.

We need to skip pre-dumping on hugetlb mappings to resolve the issue.

Suggested-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/mem.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/criu/mem.c b/criu/mem.c
index 136439518..ab86a1f6d 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -246,6 +246,12 @@ prep_dump_pages_args(struct parasite_ctl *ctl, struct vm_area_list *vma_area_lis
 		 */
 		if (vma_entry_is(vma->e, VMA_AREA_AIORING) && skip_non_trackable)
 			continue;
+		/*
+		 * We totally ignore MAP_HUGETLB on pre-dump.
+		 * See also generate_vma_iovs() comment.
+		 */
+		if ((vma->e->flags & MAP_HUGETLB) && skip_non_trackable)
+			continue;
 		if (vma->e->prot & PROT_READ)
 			continue;
 
@@ -402,7 +408,14 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma, str
 			has_parent = false;
 	}
 
-	if (vma_entry_is(vma->e, VMA_AREA_AIORING)) {
+	/*
+	 * We want to completely ignore these VMA types on the pre-dump:
+	 * 1. VMA_AREA_AIORING because it is not soft-dirty trackable (kernel writes)
+	 * 2. MAP_HUGETLB mappings because they are not premapped and we can't use
+	 * parent images from pre-dump stages. Instead, the content is restored from
+	 * the parasite context using full memory image.
+	 */
+	if (vma_entry_is(vma->e, VMA_AREA_AIORING) || vma->e->flags & MAP_HUGETLB) {
 		if (pre_dump)
 			return 0;
 		has_parent = false;

From c830643d86cccc8dc901f048e4aa96d8c77fc696 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 8 May 2022 16:19:45 +0700
Subject: [PATCH 1082/1854] Revert "ci: skip new hugetlb maps09/maps10 tests
 for pre-dump"

This reverts commit 37ea8c5fcfef2108800b6d53054f3a7c4f710752.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/jenkins/criu-dedup.sh             | 2 +-
 test/jenkins/criu-lazy-migration.sh    | 2 +-
 test/jenkins/criu-lazy-pages.sh        | 2 +-
 test/jenkins/criu-pre-dump.sh          | 5 ++---
 test/jenkins/criu-remote-lazy-pages.sh | 2 +-
 test/jenkins/criu-snap.sh              | 4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/jenkins/criu-dedup.sh b/test/jenkins/criu-dedup.sh
index 842d218bd..edb1b653d 100755
--- a/test/jenkins/criu-dedup.sh
+++ b/test/jenkins/criu-dedup.sh
@@ -4,7 +4,7 @@
 set -e
 source `dirname $0`/criu-lib.sh
 prep
-./test/zdtm.py run --all --keep-going --report report --parallel 4 -f h --pre 2 --dedup -x maps04 -x maps007 -x maps09 -x maps10 || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 -f h --pre 2 --dedup -x maps04 -x maps007 || fail
 
 # Additionally run these tests as they touch a lot of
 # memory and it makes sense to additionally check it
diff --git a/test/jenkins/criu-lazy-migration.sh b/test/jenkins/criu-lazy-migration.sh
index b23f31c79..02a212e0d 100755
--- a/test/jenkins/criu-lazy-migration.sh
+++ b/test/jenkins/criu-lazy-migration.sh
@@ -15,7 +15,7 @@ LAZY_MIGRATE_EXCLUDE="-x fifo_loop -x file_locks -x ptrace_sig -x overmount_file
 	       --lazy-migrate $LAZY_EXCLUDE $LAZY_MIGRATE_EXCLUDE || fail
 
 # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10"
+LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
 
 # lazy restore from images with pre-dumps
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 -f uns \
diff --git a/test/jenkins/criu-lazy-pages.sh b/test/jenkins/criu-lazy-pages.sh
index f62912090..9ef721739 100755
--- a/test/jenkins/criu-lazy-pages.sh
+++ b/test/jenkins/criu-lazy-pages.sh
@@ -12,7 +12,7 @@ source `dirname $0`/criu-lazy-common.sh
 	       --lazy-pages $LAZY_EXCLUDE || fail
 
 # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02 -x maps09 -x maps10"
+LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
 
 # lazy restore from images with pre-dumps
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
diff --git a/test/jenkins/criu-pre-dump.sh b/test/jenkins/criu-pre-dump.sh
index b2972d941..137f7c23f 100755
--- a/test/jenkins/criu-pre-dump.sh
+++ b/test/jenkins/criu-pre-dump.sh
@@ -5,6 +5,5 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-# FIXME: https://github.com/checkpoint-restore/criu/issues/1868
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 -x 'maps04' -x 'maps09' -x 'maps10' || fail
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --page-server -x 'maps04' -x 'maps09' -x 'maps10' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --page-server -x 'maps04' || fail
diff --git a/test/jenkins/criu-remote-lazy-pages.sh b/test/jenkins/criu-remote-lazy-pages.sh
index 48787f3f6..1c677e333 100755
--- a/test/jenkins/criu-remote-lazy-pages.sh
+++ b/test/jenkins/criu-remote-lazy-pages.sh
@@ -12,7 +12,7 @@ source `dirname $0`/criu-lazy-common.sh
 	       --remote-lazy-pages $LAZY_EXCLUDE -x maps04 || fail
 
 # During pre-dump + lazy-pages we leave VM_NOHUGEPAGE set
-LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02  -x maps09 -x maps10"
+LAZY_EXCLUDE="$LAZY_EXCLUDE -x maps02"
 
 # lazy restore from "remote" dump with pre-dumps
 ./test/zdtm.py run --all --keep-going --report report --parallel 4 \
diff --git a/test/jenkins/criu-snap.sh b/test/jenkins/criu-snap.sh
index d8fdf02b3..b08c57f52 100755
--- a/test/jenkins/criu-snap.sh
+++ b/test/jenkins/criu-snap.sh
@@ -5,5 +5,5 @@ set -e
 source `dirname $0`/criu-lib.sh
 prep
 mount_tmpfs_to_dump
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps -x 'maps04' -x 'maps09' -x 'maps10' || fail
-./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' -x 'maps09' -x 'maps10' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps -x 'maps04' || fail
+./test/zdtm.py run --all --keep-going --report report --parallel 4 --pre 3 --snaps --page-server -x 'maps04' || fail

From ced4ab4b0a2db401108268a2c1232a0ef479871c Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 10 May 2022 20:40:53 +0300
Subject: [PATCH 1083/1854] zdtm: skip zdtm/static/shm-hugetlb when hugetlb is
 not supported

Reported-by: Mr. Jenkins (ppc64le)
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 test/zdtm/static/shm-hugetlb.checkskip | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100755 test/zdtm/static/shm-hugetlb.checkskip

diff --git a/test/zdtm/static/shm-hugetlb.checkskip b/test/zdtm/static/shm-hugetlb.checkskip
new file mode 100755
index 000000000..df2370815
--- /dev/null
+++ b/test/zdtm/static/shm-hugetlb.checkskip
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# will fail with EOPNOTSUPP
+cat /proc/sys/vm/nr_hugepages &> /dev/null

From 295dc85ca0d8d478889a34f296a1fb4aa844f2dc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 31 May 2022 11:25:03 +0300
Subject: [PATCH 1084/1854] github: use git-clang-format instead of make indent

This allows us to only detect bad formating in PR changes but not all
the CRIU codebase.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .github/workflows/lint.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c3886c707..d32403d05 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
       image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
-      run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils codespell
+      run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils codespell git-clang-format
 
     - uses: actions/checkout@v2
 
@@ -22,7 +22,12 @@ jobs:
 
     - name: Run make indent
       run: >
-        make indent &&
+        if [ -z "${{github.base_ref}}" ]; then
+          make indent
+        else
+          git fetch origin ${{github.base_ref}} &&
+          git clang-format --style file --extensions c,h --quiet origin/${{github.base_ref}}
+        fi &&
         STATUS=$(git status --porcelain) &&
         if [ ! -z "$STATUS" ]; then
           echo "FAIL: some files are not correctly formatted.";

From 28358db13ba453d1292104e117790da076c91721 Mon Sep 17 00:00:00 2001
From: Ashutosh Mehra <asmehra@redhat.com>
Date: Mon, 30 May 2022 15:57:07 -0400
Subject: [PATCH 1085/1854] Fix the check for mnt namespace in criu-ns

criu-ns script incorrectly compares the pidns fd with mntns fd.
Also reversed the condition in is_my_namespace function to align it
with the function name.

Signed-off-by: Ashutosh Mehra <asmehra@redhat.com>
---
 scripts/criu-ns | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 9fc58b640..1217c3dcd 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -153,9 +153,9 @@ def _set_namespace(fd):
         raise OSError(_errno, errno.errorcode[_errno])
 
 
-def is_my_namespace(fd):
+def is_my_namespace(fd, ns):
     """Returns True if fd refers to current namespace"""
-    return os.stat('/proc/self/ns/pid').st_ino != os.fstat(fd).st_ino
+    return os.stat('/proc/self/ns/%s' % ns).st_ino == os.fstat(fd).st_ino
 
 
 def set_pidns(tpid, pid_idx):
@@ -165,7 +165,7 @@ def set_pidns(tpid, pid_idx):
     pid namespace.
     """
     ns_fd = os.open('/proc/%s/ns/pid' % tpid, os.O_RDONLY)
-    if is_my_namespace(ns_fd):
+    if not is_my_namespace(ns_fd, "pid"):
         for line in open('/proc/%s/status' % tpid):
             if not line.startswith('NSpid:'):
                 continue
@@ -190,7 +190,7 @@ def set_mntns(tpid):
     will be the same in target mntns.
     """
     ns_fd = os.open('/proc/%s/ns/mnt' % tpid, os.O_RDONLY)
-    if is_my_namespace(ns_fd):
+    if not is_my_namespace(ns_fd, "mnt"):
         root_st = os.stat('/')
         cwd_st = os.stat('.')
         cwd_path = os.path.realpath('.')

From 5cd7092fda7c37e46a9ad606824ca20a0bef4ae3 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 9 Jun 2022 12:17:06 +0300
Subject: [PATCH 1086/1854] sk-unix: make add_fake_unix_queuers earier and
 rework find_queuer_for

Before this patch, if we had a unixsk with incomming scm packets (with
fds) and with the sender side fd closed, we got an error:

Error (criu/sk-unix.c:1125): unix: Can't find sender for 0x1e

First part of the problem is that unix_note_scm_rights() expects to see
a "queuer" which would send scm packets to the unixsk, and there is no
as the sender side is closed.

Second part of the problem is that we already have "fake" queuers
feature so that it already creates a unix socket pair and leaves other
end open for later queuing packets. But function add_fake_unix_queuers()
is called after unix_note_scm_rights() thus there is no chance to find
queuer at the point of failure.

Third part is that when we look for a queuer in find_queuer_for() we
actually look for a socket for which we are a queuer and not for the
socket which is a queuer for us, which is opposite to the name. For
cases where both ends are alive both are queuers for each other so this
was not important, but for our closed sender case it breaks.

So let's reorder add_fake_unix_queuers() before unix_note_scm_rights()
and make find_queuer_for() actually do what it's name implies.

This situation is started to reproduce on Virtuozzo start/stop tests
with the unixsk belonging to systemd, we suppose that this state where
the sender fd side is closed happens rarely only on systemd start/stop,
so we don't see it in regular suspend resume of long-living containers.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c | 8 ++++----
 criu/sk-unix.c    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9853c0585..398faf048 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -351,6 +351,10 @@ static int root_prepare_shared(void)
 	if (ret)
 		goto err;
 
+	ret = add_fake_unix_queuers();
+	if (ret)
+		goto err;
+
 	/*
 	 * This should be called with all packets collected AND all
 	 * fdescs and fles prepared BUT post-prep-s not run.
@@ -367,10 +371,6 @@ static int root_prepare_shared(void)
 	if (ret)
 		goto err;
 
-	ret = add_fake_unix_queuers();
-	if (ret)
-		goto err;
-
 	show_saved_files();
 err:
 	return ret;
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index c6021bc1f..47e1b2962 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1021,8 +1021,8 @@ static struct unix_sk_info *find_queuer_for(int id)
 	struct unix_sk_info *ui;
 
 	list_for_each_entry(ui, &unix_sockets, list) {
-		if (ui->queuer && ui->queuer->ue->id == id)
-			return ui;
+		if (ui->queuer && ui->ue->id == id)
+			return ui->queuer;
 	}
 
 	return NULL;

From b117b211ab6b265b017c0e0189c8b1cedca1522f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 9 Jun 2022 17:48:37 +0300
Subject: [PATCH 1087/1854] zdtm/scm: add scm09 test with closed sender fd

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile | 2 ++
 test/zdtm/static/scm00.c  | 3 +++
 test/zdtm/static/scm09.c  | 1 +
 3 files changed, 6 insertions(+)
 create mode 120000 test/zdtm/static/scm09.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 4a93659d4..a3c1ccf4b 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -199,6 +199,7 @@ TST_NOFILE	:=				\
 		scm04				\
 		scm05				\
 		scm06				\
+		scm09				\
 		aio00				\
 		aio01				\
 		fd				\
@@ -593,6 +594,7 @@ vdso01:			LDLIBS += -lrt
 scm01:			CFLAGS += -DKEEP_SENT_FD
 scm02:			CFLAGS += -DSEND_BOTH
 scm04:			CFLAGS += -DSEPARATE
+scm09:			CFLAGS += -DCLOSE_SENDER_FD
 mntns_link_remap:	CFLAGS += -DZDTM_LINK_REMAP
 mntns_shared_bind02:	CFLAGS += -DSHARED_BIND02
 mntns_root_bind02:	CFLAGS += -DROOT_BIND02
diff --git a/test/zdtm/static/scm00.c b/test/zdtm/static/scm00.c
index d66975582..670e6fd6a 100644
--- a/test/zdtm/static/scm00.c
+++ b/test/zdtm/static/scm00.c
@@ -105,6 +105,9 @@ int main(int argc, char **argv)
 	p[1] = p[0];
 	p[0] = -1;
 #endif
+#endif
+#ifdef CLOSE_SENDER_FD
+	close(sk[0]);
 #endif
 
 	test_daemon();
diff --git a/test/zdtm/static/scm09.c b/test/zdtm/static/scm09.c
new file mode 120000
index 000000000..4cab0edd2
--- /dev/null
+++ b/test/zdtm/static/scm09.c
@@ -0,0 +1 @@
+scm00.c
\ No newline at end of file

From dd0217976ce0f314a2be036d267993a6279f15a2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 12 May 2022 21:44:00 +0100
Subject: [PATCH 1088/1854] amdgpu: Add gitignore

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/.gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 plugins/amdgpu/.gitignore

diff --git a/plugins/amdgpu/.gitignore b/plugins/amdgpu/.gitignore
new file mode 100644
index 000000000..4e5c8f58e
--- /dev/null
+++ b/plugins/amdgpu/.gitignore
@@ -0,0 +1,3 @@
+*.pb-c.c
+*.pb-c.h
+test_topology_remap

From 91e971c4d941547419c191b95e0afb9ac0dae11f Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 12 May 2022 22:40:54 +0700
Subject: [PATCH 1089/1854] hugetlb: don't dump anonymous private hugetlb
 mapping using memfd approach

Currently, the content of anonymous private hugetlb mapping is dumped in 2
different images: memfd approach and normal private mapping dumping. In memfd
approach, we dump the content of the backing pseudo file (/anon_hugepage). This
is incorrect and redundant since the mapping is private, the content of backing
file may differ from the content of the mapping. With this commit, we remove the
redundant memfd approach dump and only do the normal private mapping dump on
anonymous hugetlb mapping.

Run zdtm.py run -f h --keep-img always -t zdtm/static/maps09, du -h in the
dumped image directory

Before this commit
	13M     test/dump/zdtm/static/maps09/55/1
After this commit
	8.5M    test/dump/zdtm/static/maps09/55/1

The reduction in size is approximately 4MB which is the size of anonymous
private hugetlb mapping in the test.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/hugetlb.c         | 13 +++++++++++++
 criu/include/hugetlb.h |  6 ++++++
 criu/proc_parse.c      |  7 +++----
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/criu/hugetlb.c b/criu/hugetlb.c
index aa98662d8..866c4050f 100644
--- a/criu/hugetlb.c
+++ b/criu/hugetlb.c
@@ -35,6 +35,19 @@ int is_hugetlb_dev(dev_t dev, int *hugetlb_size_flag)
 	return 0;
 }
 
+int can_dump_with_memfd_hugetlb(dev_t dev, int *hugetlb_size_flag, const char *file_path, struct vma_area *vma)
+{
+	/*
+	 * Dump the hugetlb backed mapping using memfd_hugetlb when it is not
+	 * anonymous private mapping.
+	 */
+	if (kdat.has_memfd_hugetlb && is_hugetlb_dev(dev, hugetlb_size_flag) &&
+	    !((vma->e->flags & MAP_PRIVATE) && !strncmp(file_path, ANON_HUGEPAGE_PREFIX, ANON_HUGEPAGE_PREFIX_LEN)))
+		return 1;
+
+	return 0;
+}
+
 unsigned long get_size_from_hugetlb_flag(int flag)
 {
 	int i;
diff --git a/criu/include/hugetlb.h b/criu/include/hugetlb.h
index c0e83652b..9aee5bed3 100644
--- a/criu/include/hugetlb.h
+++ b/criu/include/hugetlb.h
@@ -4,6 +4,11 @@
 #include <sys/types.h>
 #include <stddef.h>
 
+#include "vma.h"
+
+#define ANON_HUGEPAGE_PREFIX	 "/anon_hugepage"
+#define ANON_HUGEPAGE_PREFIX_LEN (sizeof(ANON_HUGEPAGE_PREFIX) - 1)
+
 enum hugepage_size {
 	HUGETLB_16KB,
 	HUGETLB_64KB,
@@ -46,6 +51,7 @@ struct htlb_info {
 extern struct htlb_info hugetlb_info[HUGETLB_MAX];
 
 int is_hugetlb_dev(dev_t dev, int *hugetlb_size_flag);
+int can_dump_with_memfd_hugetlb(dev_t dev, int *hugetlb_size_flag, const char *file_path, struct vma_area *vma);
 unsigned long get_size_from_hugetlb_flag(int flag);
 
 #ifndef MFD_HUGETLB
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index b3badb6e4..6b41a81db 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -620,17 +620,16 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 			pr_info("path: %s\n", file_path);
 			vma_area->e->status |= VMA_AREA_SYSVIPC;
 		} else {
-			/* Dump shmem dev, hugetlb dev (private and share) mappings the same way as memfd
-			 * when possible.
+			/* We dump memfd backed mapping, both normal and hugepage anonymous share
+			 * mapping using memfd approach when possible.
 			 */
 			if (is_memfd(st_buf->st_dev) || is_anon_shmem_map(st_buf->st_dev) ||
-			    (kdat.has_memfd_hugetlb && is_hugetlb_dev(st_buf->st_dev, &hugetlb_flag))) {
+			    can_dump_with_memfd_hugetlb(st_buf->st_dev, &hugetlb_flag, file_path, vma_area)) {
 				vma_area->e->status |= VMA_AREA_MEMFD;
 				vma_area->e->flags |= hugetlb_flag;
 				if (fault_injected(FI_HUGE_ANON_SHMEM_ID))
 					vma_area->e->shmid += FI_HUGE_ANON_SHMEM_ID_BASE;
 			} else if (is_hugetlb_dev(st_buf->st_dev, &hugetlb_flag)) {
-				/* hugetlb mapping but memfd does not support HUGETLB */
 				vma_area->e->flags |= hugetlb_flag;
 				vma_area->e->flags |= MAP_ANONYMOUS;
 

From 49caf85b20ae0570b4ffd6e537cb0a47ac0899c5 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 21 Jun 2022 12:17:52 +0300
Subject: [PATCH 1090/1854] config: fail on --track-mem option if dirty
 tracking is not available

Else we trigger BUG in task_reset_dirty_track():
  Error (criu/mem.c:45): BUG at criu/mem.c:45

The check in kerndat_get_dirty_track() does not work right.

https://github.com/checkpoint-restore/criu/issues/1917

Reported-by: @mrc1119
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/config.c  | 5 +++++
 criu/kerndat.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 14a11f9c3..4023d807c 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -1115,6 +1115,11 @@ int check_options(void)
 		}
 	}
 
+	if (opts.track_mem && !kdat.has_dirty_track) {
+		pr_err("Tracking memory is not available. Consider omitting --track-mem option.\n");
+		return 1;
+	}
+
 	if (check_namespace_opts()) {
 		pr_err("Error: namespace flags conflict\n");
 		return 1;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index b8b6bc95d..bc5dccab1 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -420,10 +420,6 @@ static int kerndat_get_dirty_track(void)
 	} else {
 	no_dt:
 		pr_info("Dirty tracking support is OFF\n");
-		if (opts.track_mem) {
-			pr_err("Tracking memory is not available\n");
-			return -1;
-		}
 	}
 
 	return 0;

From c7858ba42bed2e072ef3842046f4a6335e70ee44 Mon Sep 17 00:00:00 2001
From: Yuriy Vasiliev <yuriy.vasiliev@openvz.org>
Date: Thu, 20 Jan 2022 17:13:59 +0100
Subject: [PATCH 1091/1854] infect: add SIGTSTP support

Add SIGTSTP signal dump and restore. Add a corresponding field
in the image, save it only if a task is in the stopped state.

Restore task state by sending desired stop signal if it is present
in the image. Fallback to SIGSTOP if it's absent.

Signed-off-by: Yuriy Vasiliev <yuriy.vasiliev@openvz.org>
---
 Documentation/compel.txt     |  5 ++-
 compel/include/uapi/infect.h |  3 ++
 compel/src/lib/infect.c      | 87 +++++++++++++++++++++++++++++-------
 criu/cr-dump.c               |  5 +++
 criu/cr-restore.c            | 11 ++++-
 criu/include/pid.h           |  4 ++
 criu/proc_parse.c            | 15 ++++++-
 criu/pstree.c                |  1 +
 criu/seize.c                 |  8 +++-
 images/core.proto            |  2 +
 10 files changed, 121 insertions(+), 20 deletions(-)

diff --git a/Documentation/compel.txt b/Documentation/compel.txt
index a44ca22c6..506228f59 100644
--- a/Documentation/compel.txt
+++ b/Documentation/compel.txt
@@ -97,7 +97,10 @@ Following steps are performed to infect the victim process:
     - execute system call: *int compel_syscall(ctl, int syscall_nr, long *ret, int arg ...);*
     - infect victim: *int compel_infect(ctl, nr_thread, size_of_args_area);*
     - cure the victim: *int compel_cure(ctl);* //ctl pointer is freed by this call
-    - Resume victim: *int compel_resume_task(pid, orig_state, state);*
+    - Resume victim: *int compel_resume_task(pid, orig_state, state)* or
+    *int compel_resume_task_sig(pid, orig_state, state, stop_signo).*
+    //compel_resume_task_sig() could be used in case when victim is in stopped state.
+    stop_signo could be read by calling compel_parse_stop_signo().
 
 *ctl* must be configured with blob information by calling *PREFIX_setup_c_header()*, with ctl as its argument.
 *PREFIX* is the argument given to *-p* when calling hgen, else it is deduced from file name.
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 3040a67a7..7073f343f 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -18,6 +18,7 @@ extern int __must_check compel_interrupt_task(int pid);
 struct seize_task_status {
 	unsigned long long sigpnd;
 	unsigned long long shdpnd;
+	unsigned long long sigblk;
 	char state;
 	int vpid;
 	int ppid;
@@ -30,7 +31,9 @@ extern int __must_check compel_wait_task(int pid, int ppid,
 					 struct seize_task_status *st, void *data);
 
 extern int __must_check compel_stop_task(int pid);
+extern int __must_check compel_parse_stop_signo(int pid);
 extern int compel_resume_task(pid_t pid, int orig_state, int state);
+extern int compel_resume_task_sig(pid_t pid, int orig_state, int state, int stop_signo);
 
 struct parasite_ctl;
 struct parasite_thread_ctl;
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index c78c02a6a..b99f23b36 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -92,6 +92,12 @@ static int parse_pid_status(int pid, struct seize_task_status *ss, void *data)
 
 			continue;
 		}
+		if (!strncmp(aux, "SigBlk:", 7)) {
+			if (sscanf(aux + 7, "%llx", &ss->sigblk) != 1)
+				goto err_parse;
+
+			continue;
+		}
 	}
 
 	fclose(f);
@@ -186,6 +192,29 @@ static int skip_sigstop(int pid, int nr_signals)
 	return 0;
 }
 
+#define SIG_MASK(sig) (1ULL << ((sig)-1))
+
+#define SIG_IN_MASK(sig, mask) ((sig) > 0 && (sig) <= SIGMAX && (SIG_MASK(sig) & (mask)))
+
+#define SUPPORTED_STOP_MASK ((1ULL << (SIGSTOP - 1)) | (1ULL << (SIGTSTP - 1)))
+
+static inline int sig_stop(int sig)
+{
+	return SIG_IN_MASK(sig, SUPPORTED_STOP_MASK);
+}
+
+int compel_parse_stop_signo(int pid)
+{
+	siginfo_t si;
+
+	if (ptrace(PTRACE_GETSIGINFO, pid, NULL, &si) < 0) {
+		pr_perror("SEIZE %d: can't parse stopped siginfo", pid);
+		return -1;
+	}
+
+	return si.si_signo;
+}
+
 /*
  * This routine seizes task putting it into a special
  * state where we can manipulate the task via ptrace
@@ -198,7 +227,7 @@ int compel_wait_task(int pid, int ppid, int (*get_status)(int pid, struct seize_
 		     void *data)
 {
 	siginfo_t si;
-	int status, nr_sigstop;
+	int status, nr_stopsig;
 	int ret = 0, ret2, wait_errno = 0;
 
 	/*
@@ -291,17 +320,32 @@ try_again:
 		goto err;
 	}
 
-	nr_sigstop = 0;
-	if (ss->sigpnd & (1 << (SIGSTOP - 1)))
-		nr_sigstop++;
-	if (ss->shdpnd & (1 << (SIGSTOP - 1)))
-		nr_sigstop++;
-	if (si.si_signo == SIGSTOP)
-		nr_sigstop++;
+	nr_stopsig = 0;
+	if (SIG_IN_MASK(SIGSTOP, ss->sigpnd))
+		nr_stopsig++;
+	if (SIG_IN_MASK(SIGSTOP, ss->shdpnd))
+		nr_stopsig++;
 
-	if (nr_sigstop) {
-		if (skip_sigstop(pid, nr_sigstop))
-			goto err_stop;
+	if (SIG_IN_MASK(SIGTSTP, ss->sigpnd) && !SIG_IN_MASK(SIGTSTP, ss->sigblk))
+		nr_stopsig++;
+	if (SIG_IN_MASK(SIGTSTP, ss->shdpnd) && !SIG_IN_MASK(SIGTSTP, ss->sigblk))
+		nr_stopsig++;
+
+	if (sig_stop(si.si_signo))
+		nr_stopsig++;
+
+	if (nr_stopsig) {
+		if (skip_sigstop(pid, nr_stopsig)) {
+			/*
+			 * Make sure that the task is stopped by a supported stop signal and
+			 * send it again to restore task state before criu intervention.
+			 */
+			if (sig_stop(si.si_signo))
+				kill(pid, si.si_signo);
+			else
+				kill(pid, SIGSTOP);
+			goto err;
+		}
 
 		return COMPEL_TASK_STOPPED;
 	}
@@ -313,8 +357,6 @@ try_again:
 		goto err;
 	}
 
-err_stop:
-	kill(pid, SIGSTOP);
 err:
 	if (ptrace(PTRACE_DETACH, pid, NULL, NULL))
 		pr_perror("Unable to detach from %d", pid);
@@ -322,6 +364,11 @@ err:
 }
 
 int compel_resume_task(pid_t pid, int orig_st, int st)
+{
+	return compel_resume_task_sig(pid, orig_st, st, SIGSTOP);
+}
+
+int compel_resume_task_sig(pid_t pid, int orig_st, int st, int stop_signo)
 {
 	int ret = 0;
 
@@ -345,8 +392,18 @@ int compel_resume_task(pid_t pid, int orig_st, int st)
 		 * task with STOP in queue that would get lost after
 		 * detach, so stop it again.
 		 */
-		if (orig_st == COMPEL_TASK_STOPPED)
-			kill(pid, SIGSTOP);
+		if (orig_st == COMPEL_TASK_STOPPED) {
+			/*
+			 * Check that stop_signo contain supported stop signal.
+			 * If it isn't, then send SIGSTOP. It makes sense in the case
+			 * when we get COMPEL_TASK_STOPPED from old image,
+			 * where stop_signo was not yet supported.
+			 */
+			if (sig_stop(stop_signo))
+				kill(pid, stop_signo);
+			else
+				kill(pid, SIGSTOP);
+		}
 	} else {
 		pr_err("Unknown final state %d\n", st);
 		ret = -1;
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 60e90baed..e60da88ed 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -781,6 +781,11 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 	core->thread_core->creds->lsm_profile = dmpi(item)->thread_lsms[0]->profile;
 	core->thread_core->creds->lsm_sockcreate = dmpi(item)->thread_lsms[0]->sockcreate;
 
+	if (core->tc->task_state == TASK_STOPPED) {
+		core->tc->has_stop_signo = true;
+		core->tc->stop_signo = item->pid->stop_signo;
+	}
+
 	ret = parasite_dump_thread_leader_seized(ctl, pid, core);
 	if (ret)
 		goto err;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 398faf048..279246c19 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1350,6 +1350,9 @@ static inline int fork_with_pid(struct pstree_item *item)
 		item->pid->state = ca.core->tc->task_state;
 		rsti(item)->cg_set = ca.core->tc->cg_set;
 
+		if (ca.core->tc->has_stop_signo)
+			item->pid->stop_signo = ca.core->tc->stop_signo;
+
 		if (item->pid->state != TASK_DEAD && !task_alive(item)) {
 			pr_err("Unknown task state %d\n", item->pid->state);
 			return -1;
@@ -2104,8 +2107,14 @@ static void finalize_restore(void)
 
 		xfree(ctl);
 
-		if ((item->pid->state == TASK_STOPPED) || (opts.final_state == TASK_STOPPED))
+		if (opts.final_state == TASK_STOPPED)
 			kill(item->pid->real, SIGSTOP);
+		else if (item->pid->state == TASK_STOPPED) {
+			if (item->pid->stop_signo > 0)
+				kill(item->pid->real, item->pid->stop_signo);
+			else
+				kill(item->pid->real, SIGSTOP);
+		}
 	}
 }
 
diff --git a/criu/include/pid.h b/criu/include/pid.h
index 49cb2d322..b2b7a361a 100644
--- a/criu/include/pid.h
+++ b/criu/include/pid.h
@@ -31,6 +31,10 @@ struct pid {
 	pid_t real;
 
 	int state; /* TASK_XXX constants */
+	/* If an item is in stopped state it has a signal number
+	 * that caused task to stop.
+	 */
+	int stop_signo;
 
 	/*
 	 * The @virt pid is one which used in the image itself and keeps
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 6b41a81db..946b0fc40 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1027,12 +1027,13 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 
 	cr->s.sigpnd = 0;
 	cr->s.shdpnd = 0;
+	cr->s.sigblk = 0;
 	cr->s.seccomp_mode = SECCOMP_MODE_DISABLED;
 
 	if (bfdopenr(&f))
 		return -1;
 
-	while (done < 13) {
+	while (done < 14) {
 		str = breadline(&f);
 		if (str == NULL)
 			break;
@@ -1143,13 +1144,23 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 				goto err_parse;
 			cr->s.sigpnd |= sigpnd;
 
+			done++;
+			continue;
+		}
+		if (!strncmp(str, "SigBlk:", 7)) {
+			unsigned long long sigblk = 0;
+
+			if (sscanf(str + 7, "%llx", &sigblk) != 1)
+				goto err_parse;
+			cr->s.sigblk |= sigblk;
+
 			done++;
 			continue;
 		}
 	}
 
 	/* seccomp and nspids are optional */
-	expected_done = (parsed_seccomp ? 11 : 10);
+	expected_done = (parsed_seccomp ? 12 : 11);
 	if (kdat.has_nspid)
 		expected_done++;
 	if (done == expected_done)
diff --git a/criu/pstree.c b/criu/pstree.c
index f4d77b3a4..72c4a3502 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -222,6 +222,7 @@ struct pstree_item *__alloc_pstree_item(bool rst)
 	item->pid->ns[0].virt = -1;
 	item->pid->real = -1;
 	item->pid->state = TASK_UNDEF;
+	item->pid->stop_signo = -1;
 	item->born_sid = -1;
 	item->pid->item = item;
 	futex_init(&item->task_st);
diff --git a/criu/seize.c b/criu/seize.c
index 58564ca74..1333d6db9 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -615,6 +615,9 @@ static int collect_children(struct pstree_item *item)
 		else
 			processes_to_wait--;
 
+		if (ret == TASK_STOPPED)
+			c->pid->stop_signo = compel_parse_stop_signo(pid);
+
 		c->pid->real = pid;
 		c->parent = item;
 		c->pid->state = ret;
@@ -646,7 +649,7 @@ static void unseize_task_and_threads(const struct pstree_item *item, int st)
 	 * the item->state is the state task was in when we seized one.
 	 */
 
-	compel_resume_task(item->pid->real, item->pid->state, st);
+	compel_resume_task_sig(item->pid->real, item->pid->state, st, item->pid->stop_signo);
 
 	if (st == TASK_DEAD)
 		return;
@@ -950,6 +953,9 @@ int collect_pstree(void)
 	else
 		processes_to_wait--;
 
+	if (ret == TASK_STOPPED)
+		root_item->pid->stop_signo = compel_parse_stop_signo(pid);
+
 	pr_info("Seized task %d, state %d\n", pid, ret);
 	root_item->pid->state = ret;
 
diff --git a/images/core.proto b/images/core.proto
index 35079f366..345bdca53 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -60,6 +60,8 @@ message task_core_entry {
 	// Reserved for container relative start time
 	//optional uint64		start_time	= 19;
 	optional uint64			blk_sigset_extended = 20[(criu).hex = true];
+
+	optional uint32			stop_signo = 21;
 }
 
 message task_kobj_ids_entry {

From 6cef6e726a6a844bb5dea6ab3841bf30b9dba122 Mon Sep 17 00:00:00 2001
From: Yuriy Vasiliev <yuriy.vasiliev@openvz.org>
Date: Tue, 18 Jan 2022 14:35:55 +0100
Subject: [PATCH 1092/1854] zdtm: add tests for SIGTSTP

stopped03 check that stopped by SIGTSTP tasks are restored correctly.
stopped04 check that stopped by SIGSTOP tasks which have blocked SIGTSTP and
have SIGTSTP pending are restored correctly.

Signed-off-by: Yuriy Vasiliev <yuriy.vasiliev@openvz.org>
---
 test/zdtm/static/Makefile    |   2 +
 test/zdtm/static/stopped03.c | 161 +++++++++++++++++++++++++++++++++++
 test/zdtm/static/stopped04.c | 135 +++++++++++++++++++++++++++++
 3 files changed, 298 insertions(+)
 create mode 100644 test/zdtm/static/stopped03.c
 create mode 100644 test/zdtm/static/stopped04.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a3c1ccf4b..5a8a5f75c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -184,6 +184,8 @@ TST_NOFILE	:=				\
 		stopped01			\
 		stopped02			\
 		stopped12			\
+		stopped03			\
+		stopped04			\
 		rtc				\
 		clean_mntns			\
 		mntns_rw_ro_rw			\
diff --git a/test/zdtm/static/stopped03.c b/test/zdtm/static/stopped03.c
new file mode 100644
index 000000000..85c7177f7
--- /dev/null
+++ b/test/zdtm/static/stopped03.c
@@ -0,0 +1,161 @@
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check, that stopped by SIGTSTP tasks are restored correctly";
+const char *test_author = "Yuriy Vasiliev <yuriy.vasiliev@openvz.org>";
+
+#define STOP_SIGNO SIGTSTP
+const char *stop_sigstr = "SIGTSTP";
+enum {
+	FUTEX_INITIALIZED = 0,
+	TEST_CRIU,
+	TEST_CHECK,
+	TEST_DONE,
+	TEST_EXIT,
+	TEST_EMERGENCY_ABORT,
+};
+
+struct shared {
+	futex_t fstate;
+	int status;
+	int code;
+} * sh;
+
+static int new_pgrp(void)
+{
+	siginfo_t infop;
+	int ret = 1;
+	pid_t pid;
+
+	/*
+	 * Set the PGID to avoid creating an orphaned process group,
+	 * which is not to be affected by terminal-generated stop signals.
+	 */
+	setpgid(0, 0);
+
+	pid = test_fork();
+	if (pid < 0)
+		goto err_cr;
+
+	if (pid == 0) {
+		/* wait for TEST_EXIT or TEST_EMERGENCY_ABORT*/
+		futex_wait_while_lt(&sh->fstate, TEST_EXIT);
+		exit(0);
+	}
+
+	if (kill(pid, STOP_SIGNO)) {
+		pr_perror("Unable to send %s", stop_sigstr);
+		goto err_cr;
+	}
+
+	if (waitid(P_PID, pid, &infop, WNOWAIT | WSTOPPED) < 0) {
+		pr_perror("Unable to waitid %d", pid);
+		goto err_cont;
+	}
+
+	sh->code = infop.si_code;
+	sh->status = infop.si_status;
+
+	/* Return the control back to MAIN worker to do C/R */
+	futex_set_and_wake(&sh->fstate, TEST_CRIU);
+	futex_wait_while_lt(&sh->fstate, TEST_CHECK);
+
+	infop.si_code = 0;
+	infop.si_status = 0;
+
+	if (waitid(P_PID, pid, &infop, WNOWAIT | WSTOPPED) < 0) {
+		pr_perror("Unable to waitid %d", pid);
+		goto err_cont;
+	}
+
+	sh->code = infop.si_code;
+	sh->status = infop.si_status;
+
+	futex_set_and_wake(&sh->fstate, TEST_DONE);
+	futex_wait_while_lt(&sh->fstate, TEST_EXIT);
+
+	ret = 0;
+err_cont:
+	kill(pid, SIGCONT);
+err_cr:
+	if (ret)
+		futex_set_and_wake(&sh->fstate, TEST_EMERGENCY_ABORT);
+	if (pid > 0)
+		wait(NULL);
+
+	return ret;
+}
+
+int main(int argc, char **argv)
+{
+	int fail = 0;
+	pid_t pid;
+
+	test_init(argc, argv);
+
+	sh = mmap(NULL, sizeof(struct shared), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (sh == MAP_FAILED) {
+		pr_perror("Failed to alloc shared region");
+		return 1;
+	}
+
+	futex_set(&sh->fstate, FUTEX_INITIALIZED);
+
+	pid = test_fork();
+	if (pid < 0) {
+		fail = 1;
+		goto out;
+	}
+
+	if (pid == 0)
+		exit(new_pgrp());
+
+	/* Wait until pgrp is ready to C/R */
+	futex_wait_while_lt(&sh->fstate, TEST_CRIU);
+	if (futex_get(&sh->fstate) == TEST_EMERGENCY_ABORT) {
+		pr_err("Fail in child worker before C/R\n");
+		fail = 1;
+		goto out;
+	}
+
+	if (sh->code != CLD_STOPPED || sh->status != STOP_SIGNO) {
+		pr_err("Process is not in correct state before C/R."
+		       " Expected stop signo: %d. Get stop signo: %d\n",
+		       STOP_SIGNO, sh->status);
+		fail = 1;
+		goto out;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	futex_set_and_wake(&sh->fstate, TEST_CHECK);
+	futex_wait_while_lt(&sh->fstate, TEST_DONE);
+	if (futex_get(&sh->fstate) == TEST_EMERGENCY_ABORT) {
+		pr_err("Fail in child worker after C/R\n");
+		goto out;
+	}
+
+	if (sh->code != CLD_STOPPED || sh->status != STOP_SIGNO) {
+		fail = 1;
+		pr_err("Process is not in correct state after C/R."
+		       " Expected stop signo: %d. Get stop signo: %d\n",
+		       STOP_SIGNO, sh->status);
+	}
+
+	if (!fail)
+		pass();
+
+	futex_set_and_wake(&sh->fstate, TEST_EXIT);
+out:
+	if (pid > 0)
+		wait(NULL);
+
+	munmap(sh, sizeof(struct shared));
+
+	return fail;
+}
diff --git a/test/zdtm/static/stopped04.c b/test/zdtm/static/stopped04.c
new file mode 100644
index 000000000..237094ca4
--- /dev/null
+++ b/test/zdtm/static/stopped04.c
@@ -0,0 +1,135 @@
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/mman.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check, that stopped by SIGTSTP tasks are restored correctly";
+const char *test_author = "Yuriy Vasiliev <yuriy.vasiliev@openvz.org>";
+
+const char *stop_sigstr = "SIGTSTP";
+enum {
+	FUTEX_INITIALIZED = 0,
+	TEST_CRIU,
+	TEST_DONE,
+	TEST_EXIT,
+	TEST_EMERGENCY_ABORT,
+};
+
+struct shared {
+	futex_t fstate;
+	int status;
+	int code;
+} * sh;
+
+static int new_pgrp(void)
+{
+	sigset_t sigset;
+	siginfo_t infop;
+	int ret = 1;
+	pid_t pid;
+
+	/*
+	 * Set the PGID to avoid creating an orphaned process group,
+	 * which is not to be affected by terminal-generated stop signals.
+	 */
+	setpgid(0, 0);
+
+	sigemptyset(&sigset);
+	sigaddset(&sigset, SIGTSTP);
+	sigprocmask(SIG_BLOCK, &sigset, NULL);
+
+	pid = test_fork();
+	if (pid < 0)
+		goto err_cr;
+
+	if (pid == 0) {
+		/* wait for TEST_EXIT or TEST_EMERGENCY_ABORT*/
+		futex_wait_while_lt(&sh->fstate, TEST_EXIT);
+		exit(0);
+	}
+
+	if (kill(pid, SIGSTOP)) {
+		pr_perror("Unable to send %s", stop_sigstr);
+		goto err_cr;
+	}
+
+	if (waitid(P_PID, pid, &infop, WNOWAIT | WSTOPPED) < 0) {
+		pr_perror("Unable to waitid %d", pid);
+		goto err_cont;
+	}
+
+	if (kill(pid, SIGTSTP)) {
+		pr_perror("Unable to send %s", stop_sigstr);
+		goto err_cr;
+	}
+
+	/* Return the control back to MAIN worker to do C/R */
+	futex_set_and_wake(&sh->fstate, TEST_CRIU);
+	futex_wait_while_lt(&sh->fstate, TEST_EXIT);
+
+	ret = 0;
+err_cont:
+	kill(pid, SIGCONT);
+err_cr:
+	if (ret)
+		futex_set_and_wake(&sh->fstate, TEST_EMERGENCY_ABORT);
+	if (pid > 0)
+		wait(NULL);
+
+	return ret;
+}
+
+int main(int argc, char **argv)
+{
+	int fail = 0;
+	pid_t pid;
+
+	test_init(argc, argv);
+
+	sh = mmap(NULL, sizeof(struct shared), PROT_WRITE | PROT_READ, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+	if (sh == MAP_FAILED) {
+		pr_perror("Failed to alloc shared region");
+		return 1;
+	}
+
+	futex_set(&sh->fstate, FUTEX_INITIALIZED);
+
+	pid = test_fork();
+	if (pid < 0) {
+		fail = 1;
+		goto out;
+	}
+
+	if (pid == 0)
+		exit(new_pgrp());
+
+	/* Wait until pgrp is ready to C/R */
+	futex_wait_while_lt(&sh->fstate, TEST_CRIU);
+	if (futex_get(&sh->fstate) == TEST_EMERGENCY_ABORT) {
+		pr_err("Fail in child worker before C/R\n");
+		fail = 1;
+		goto out;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (futex_get(&sh->fstate) == TEST_EMERGENCY_ABORT) {
+		pr_err("Fail in child worker after C/R\n");
+		goto out;
+	}
+
+	if (!fail)
+		pass();
+
+	futex_set_and_wake(&sh->fstate, TEST_EXIT);
+out:
+	if (pid > 0)
+		wait(NULL);
+
+	munmap(sh, sizeof(struct shared));
+
+	return fail;
+}

From 18fba412551df519ee41943e9e3967b039d1427b Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 30 May 2022 17:34:20 +0000
Subject: [PATCH 1093/1854] config/files-reg: Add opt to skip file r/w/x check
 on restore

A file's r/w/x changing between checkpoint and restore does
not necessarily imply that something is wrong. For example,
if a process opens a file having perms rw- for reading and
we change the perms to r--, the process can be restored and
will function as expected.

Therefore, this patch adds an option

--skip-file-rwx-check

to disable this check on restore. File validation is unaffected
and should still function as expected with respect to the content
of files.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 Documentation/criu.txt    |  3 +++
 criu/config.c             |  1 +
 criu/cr-service.c         |  3 +++
 criu/crtools.c            |  3 +++
 criu/files-reg.c          | 18 +++++++++++++++---
 criu/include/cr_options.h |  1 +
 images/rpc.proto          |  1 +
 lib/c/criu.c              | 11 +++++++++++
 lib/c/criu.h              |  2 ++
 9 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 8b128f63e..8d2e91443 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -668,6 +668,9 @@ The 'mode' may be one of the following:
                 build-ID cannot be obtained, 'chksm-first' method will be
                 used. This is the default if mode is unspecified.
 
+*--skip-file-rwx-check*::
+    Skip checking file permissions (r/w/x for u/g/o) on restore.
+
 *check*
 ~~~~~~~
 Checks whether the kernel supports the features needed by *criu* to
diff --git a/criu/config.c b/criu/config.c
index 4023d807c..24c445c8b 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -696,6 +696,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		{ "cgroup-yard", required_argument, 0, 1096 },
 		{ "pre-dump-mode", required_argument, 0, 1097 },
 		{ "file-validation", required_argument, 0, 1098 },
+		BOOL_OPT("skip-file-rwx-check", &opts.skip_file_rwx_check),
 		{ "lsm-mount-context", required_argument, 0, 1099 },
 		{ "network-lock", required_argument, 0, 1100 },
 		BOOL_OPT("mntns-compat-mode", &opts.mntns_compat_mode),
diff --git a/criu/cr-service.c b/criu/cr-service.c
index a6eb9ebd3..1d9f0aca3 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -464,6 +464,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->has_shell_job)
 		opts.shell_job = req->shell_job;
 
+	if (req->has_skip_file_rwx_check)
+		opts.skip_file_rwx_check = req->skip_file_rwx_check;
+
 	if (req->has_file_locks)
 		opts.handle_file_locks = req->file_locks;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index cc8d9179f..8bcbe8e38 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -504,6 +504,9 @@ usage:
 	       "  --file-validation METHOD\n"
 	       "			pass the validation method to be used; argument\n"
 	       "			can be 'filesize' or 'buildid' (default).\n"
+	       "  --skip-file-rwx-check\n"
+	       "			Skip checking file permissions\n"
+	       "			(r/w/x for u/g/o) on restore.\n"
 	       "\n"
 	       "Check options:\n"
 	       "  Without options, \"criu check\" checks availability of absolutely required\n"
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 0249063c2..ce8788637 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2199,9 +2199,21 @@ ext:
 		if (!validate_file(tmp, &st, rfi))
 			goto err;
 
-		if (rfi->rfe->has_mode && (st.st_mode != rfi->rfe->mode)) {
-			pr_err("File %s has bad mode 0%o (expect 0%o)\n", rfi->path, (int)st.st_mode, rfi->rfe->mode);
-			goto err;
+		if (rfi->rfe->has_mode) {
+			mode_t curr_mode = st.st_mode;
+			mode_t saved_mode = rfi->rfe->mode;
+
+			if (opts.skip_file_rwx_check) {
+				curr_mode &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
+				saved_mode &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
+			}
+
+			if (curr_mode != saved_mode) {
+				pr_err("File %s has bad mode 0%o (expect 0%o)\n"
+				       "File r/w/x checks can be skipped with the --skip-file-rwx-check option\n",
+				       rfi->path, (int)curr_mode, saved_mode);
+				goto err;
+			}
 		}
 
 		/*
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index bf1a762cc..e544a2d9a 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -179,6 +179,7 @@ struct cr_options {
 	bool lazy_pages;
 	char *work_dir;
 	int network_lock_method;
+	int skip_file_rwx_check;
 
 	/*
 	 * When we scheduler for removal some functionality we first
diff --git a/images/rpc.proto b/images/rpc.proto
index a6cc5da48..3cf431639 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -138,6 +138,7 @@ message criu_opts {
 	optional string			lsm_mount_context	= 63;
 	optional criu_network_lock_method	network_lock		= 64 [default = IPTABLES];
 	optional bool			mntns_compat_mode	= 65;
+	optional bool			skip_file_rwx_check	= 66;
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 7807d7bc5..8171f7a12 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -555,6 +555,17 @@ void criu_set_shell_job(bool shell_job)
 	criu_local_set_shell_job(global_opts, shell_job);
 }
 
+void criu_local_set_skip_file_rwx_check(criu_opts *opts, bool skip_file_rwx_check)
+{
+	opts->rpc->has_skip_file_rwx_check = true;
+	opts->rpc->skip_file_rwx_check = skip_file_rwx_check;
+}
+
+void criu_set_skip_file_rwx_check(bool skip_file_rwx_check)
+{
+	criu_local_set_skip_file_rwx_check(global_opts, skip_file_rwx_check);
+}
+
 void criu_local_set_orphan_pts_master(criu_opts *opts, bool orphan_pts_master)
 {
 	opts->rpc->has_orphan_pts_master = true;
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 7cc6a199c..c32a8a646 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -78,6 +78,7 @@ void criu_set_tcp_close(bool tcp_close);
 void criu_set_weak_sysctls(bool val);
 void criu_set_evasive_devices(bool evasive_devices);
 void criu_set_shell_job(bool shell_job);
+void criu_set_skip_file_rwx_check(bool skip_file_rwx_check);
 void criu_set_orphan_pts_master(bool orphan_pts_master);
 void criu_set_file_locks(bool file_locks);
 void criu_set_track_mem(bool track_mem);
@@ -238,6 +239,7 @@ void criu_local_set_tcp_close(criu_opts *opts, bool tcp_close);
 void criu_local_set_weak_sysctls(criu_opts *opts, bool val);
 void criu_local_set_evasive_devices(criu_opts *opts, bool evasive_devices);
 void criu_local_set_shell_job(criu_opts *opts, bool shell_job);
+void criu_local_set_skip_file_rwx_check(criu_opts *opts, bool skip_file_rwx_check);
 void criu_local_set_orphan_pts_master(criu_opts *opts, bool orphan_pts_master);
 void criu_local_set_file_locks(criu_opts *opts, bool file_locks);
 void criu_local_set_track_mem(criu_opts *opts, bool track_mem);

From ad58553d904d457110dfaaad2328479961d439ad Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Fri, 3 Jun 2022 09:47:11 -0700
Subject: [PATCH 1094/1854] Add --skip-file-rwx-check opt test

Add a simple test using tail to check that processes can't be restored
by default when the r/w/x mode of an open file changes, unless
--skip-file-rwx-check is used.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 scripts/ci/run-ci-tests.sh               |  1 +
 test/Makefile                            |  2 +-
 test/others/skip-file-rwx-check/Makefile |  7 +++++
 test/others/skip-file-rwx-check/run.sh   | 37 ++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/others/skip-file-rwx-check/Makefile
 create mode 100755 test/others/skip-file-rwx-check/run.sh

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 8d9de6e55..3760a65e3 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -260,6 +260,7 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run
 fi
+make -C test/others/skip-file-rwx-check/ run
 make -C test/others/rpc/ run
 
 ./test/zdtm.py run -t zdtm/static/env00 --sibling
diff --git a/test/Makefile b/test/Makefile
index 8416b1961..e8fcffe3f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,7 +12,7 @@ all:
 	$(MAKE) zdtm-freezer
 .PHONY: all
 
-TESTS = unix-callback mem-snap rpc libcriu mounts/ext security pipes crit socketpairs overlayfs mnt-ext-dev shell-job
+TESTS = unix-callback mem-snap rpc libcriu mounts/ext security pipes crit socketpairs overlayfs mnt-ext-dev shell-job skip-file-rwx-check
 
 other:
 	for t in $(TESTS); do				\
diff --git a/test/others/skip-file-rwx-check/Makefile b/test/others/skip-file-rwx-check/Makefile
new file mode 100644
index 000000000..419d592b7
--- /dev/null
+++ b/test/others/skip-file-rwx-check/Makefile
@@ -0,0 +1,7 @@
+.PHONY: run clean
+
+run:
+	./run.sh
+
+clean:
+	rm -rf testfile *.img dump.log restore-expected-fail.log restore.log stats-dump stats-restore
diff --git a/test/others/skip-file-rwx-check/run.sh b/test/others/skip-file-rwx-check/run.sh
new file mode 100755
index 000000000..0803d78ec
--- /dev/null
+++ b/test/others/skip-file-rwx-check/run.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+set -o xtrace
+
+source ../env.sh
+
+make clean
+touch testfile
+chmod +w testfile
+tail --follow testfile &
+tailpid=$!
+if ! "$criu" dump --tree=$tailpid --shell-job --verbosity=4 --log-file=dump.log
+then
+    kill $tailpid
+    echo "Failed to dump process as expected"
+    echo FAIL
+    exit 1
+fi
+chmod -w testfile
+if "$criu" restore --restore-detached --shell-job --verbosity=4 --log-file=restore-expected-fail.log
+then
+    kill $tailpid
+    echo "Unexpectedly restored process with reference to a file who's r/w/x perms changed when --skip-file-rwx-check option was not used"
+    echo FAIL
+    exit 1
+fi
+if ! "$criu" restore --skip-file-rwx-check --restore-detached --shell-job --verbosity=4 --log-file=restore.log
+then
+    echo "Failed to restore process with reference to a file who's r/w/x perms changed when --skip-file-rwx-check option was used"
+    echo FAIL
+    exit 1
+fi
+kill $tailpid
+echo PASS

From e30d18f435e534f210cbaa3db0d97f0f586bdf0a Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Fri, 8 Jul 2022 12:36:57 +0000
Subject: [PATCH 1095/1854] rseq: fix headers conflict on Mariner GNU/Linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. For some reason, Marier distribution headers
not correctly define __GLIBC_HAVE_KERNEL_RSEQ
compile-time constant. It remains undefined,
but in fact header files provides corresponding
rseq types declaration which leads to conflict.

2. Another issue, is that they use uint*_t types
instead of __u* types as in original rseq.h.

This leads to compile time issues like this:
format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type 'uint64_t' {aka 'long unsigned int'}

and we can't even replace %llx to %PRIx64 because it will break
compilation on other distros (like Fedora) with analogical error:

error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘__u64’ {aka ‘long long unsigned int’}

Let's use our-own struct rseq copy fully equal to the kernel one,
it's safe because this structure is a part of Linux Kernel ABI.

Fixes #1934

Reported-by: Nikola Bojanic
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 Makefile.config           |  3 ++-
 criu/cr-dump.c            | 15 ++++++++-------
 criu/include/linux/rseq.h | 20 ++++++++++++++------
 criu/include/pstree.h     |  2 +-
 scripts/feature-tests.mak | 19 +++++++++++++++++++
 5 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index d46d84f2d..d113e2246 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -78,7 +78,8 @@ export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE OPENAT2
+	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE \
+	OPENAT2 NO_LIBC_RSEQ_DEFS
 
 # $1 - config name
 define gen-feature-test
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index e60da88ed..210f66232 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1039,7 +1039,7 @@ static int dump_task_signals(pid_t pid, struct pstree_item *item)
 	return 0;
 }
 
-static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, struct rseq_cs *rseq_cs,
+static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, struct criu_rseq_cs *rseq_cs,
 			struct criu_rseq *rseq)
 {
 	int ret;
@@ -1070,10 +1070,11 @@ static int read_rseq_cs(pid_t tid, struct __ptrace_rseq_configuration *rseqc, st
 	if (!rseq->rseq_cs)
 		return 0;
 
-	ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(rseq->rseq_cs), sizeof(struct rseq_cs));
+	ret = ptrace_peek_area(tid, rseq_cs, decode_pointer(rseq->rseq_cs), sizeof(struct criu_rseq_cs));
 	if (ret) {
 		pr_err("ptrace_peek_area(%d, %lx, %lx, %lx): fail to read rseq_cs struct\n", tid,
-		       (unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs, (unsigned long)sizeof(struct rseq_cs));
+		       (unsigned long)rseq_cs, (unsigned long)rseq->rseq_cs,
+		       (unsigned long)sizeof(struct criu_rseq_cs));
 		return -1;
 	}
 
@@ -1088,7 +1089,7 @@ static int dump_thread_rseq(struct pstree_item *item, int i)
 	CoreEntry *core = item->core[i];
 	RseqEntry **rseqep = &core->thread_core->rseq_entry;
 	struct criu_rseq rseq = {};
-	struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
+	struct criu_rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
 	pid_t tid = item->threads[i].real;
 
 	/*
@@ -1154,7 +1155,7 @@ err:
 static int dump_task_rseq(pid_t pid, struct pstree_item *item)
 {
 	int i;
-	struct rseq_cs *thread_rseq_cs;
+	struct criu_rseq_cs *thread_rseq_cs;
 
 	/* if rseq() syscall isn't supported then nothing to dump */
 	if (!kdat.has_rseq)
@@ -1179,7 +1180,7 @@ free_rseq:
 	return -1;
 }
 
-static bool task_in_rseq(struct rseq_cs *rseq_cs, uint64_t addr)
+static bool task_in_rseq(struct criu_rseq_cs *rseq_cs, uint64_t addr)
 {
 	return addr >= rseq_cs->start_ip && addr < rseq_cs->start_ip + rseq_cs->post_commit_offset;
 }
@@ -1187,7 +1188,7 @@ static bool task_in_rseq(struct rseq_cs *rseq_cs, uint64_t addr)
 static int fixup_thread_rseq(struct pstree_item *item, int i)
 {
 	CoreEntry *core = item->core[i];
-	struct rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
+	struct criu_rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
 	pid_t tid = item->threads[i].real;
 
 	/* equivalent to (struct rseq)->rseq_cs is NULL */
diff --git a/criu/include/linux/rseq.h b/criu/include/linux/rseq.h
index a47876e66..5ceefbf8e 100644
--- a/criu/include/linux/rseq.h
+++ b/criu/include/linux/rseq.h
@@ -9,7 +9,12 @@
 #endif
 #endif
 
-#ifndef __GLIBC_HAVE_KERNEL_RSEQ
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+#include "common/config.h"
+
+#ifdef CONFIG_HAS_NO_LIBC_RSEQ_DEFS
 /*
  * linux/rseq.h
  *
@@ -18,9 +23,6 @@
  * Copyright (c) 2015-2018 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <linux/types.h>
-#include <asm/byteorder.h>
-
 enum rseq_cpu_id_state {
 	RSEQ_CPU_ID_UNINITIALIZED = -1,
 	RSEQ_CPU_ID_REGISTRATION_FAILED = -2,
@@ -41,13 +43,20 @@ enum rseq_cs_flags {
 	RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT),
 	RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE = (1U << RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT),
 };
+#endif /* CONFIG_HAS_NO_LIBC_RSEQ_DEFS */
 
+/*
+ * Let's use our own definition of struct rseq_cs because some distros
+ * (for example Mariner GNU/Linux) declares this structure their-own way.
+ * This makes trouble with inconsistency between printf formatters and
+ * struct rseq_cs field types.
+ */
 /*
  * struct rseq_cs is aligned on 4 * 8 bytes to ensure it is always
  * contained within a single cache-line. It is usually declared as
  * link-time constant data.
  */
-struct rseq_cs {
+struct criu_rseq_cs {
 	/* Version of this structure. */
 	__u32 version;
 	/* enum rseq_cs_flags */
@@ -57,7 +66,6 @@ struct rseq_cs {
 	__u64 post_commit_offset;
 	__u64 abort_ip;
 } __attribute__((aligned(4 * sizeof(__u64))));
-#endif /* __GLIBC_HAVE_KERNEL_RSEQ */
 
 /*
  * We have to have our own copy of struct rseq definition because
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 8ae750e1a..1137046d4 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -63,7 +63,7 @@ struct dmp_info {
 	struct parasite_ctl *parasite_ctl;
 	struct parasite_thread_ctl **thread_ctls;
 	uint64_t *thread_sp;
-	struct rseq_cs *thread_rseq_cs;
+	struct criu_rseq_cs *thread_rseq_cs;
 
 	/*
 	 * Although we don't support dumping different struct creds in general,
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index 592552cb8..014e893a8 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -196,3 +196,22 @@ int main(void)
 	return 0;
 }
 endef
+
+define FEATURE_TEST_NO_LIBC_RSEQ_DEFS
+
+#ifdef __has_include
+#if __has_include(\"sys/rseq.h\")
+#include <sys/rseq.h>
+#endif
+#endif
+
+enum rseq_cpu_id_state {
+	RSEQ_CPU_ID_UNINITIALIZED = -1,
+	RSEQ_CPU_ID_REGISTRATION_FAILED = -2,
+};
+
+int main(void)
+{
+	return 0;
+}
+endef

From c502d480f94231b4c8068ac90bbd7ab86612356e Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Tue, 10 May 2022 13:37:09 +0200
Subject: [PATCH 1096/1854] x86/compel/fault-inject: fixup mxcsr for
 PTRACE_SETFPREGS

Error from:
./test/zdtm.py run -t zdtm/static/fpu00 --fault 134 -f h --norst

(00.003111) Dumping GP/FPU registers for 56
(00.003121) Error (compel/arch/x86/src/lib/infect.c:310): Corrupting fpuregs for 56, seed 1651766595
(00.003125) Error (compel/arch/x86/src/lib/infect.c:314): Can't set FPU registers for 56: Invalid argument
(00.003129) Error (compel/src/lib/infect.c:688): Can't obtain regs for thread 56
(00.003174) Error (criu/cr-dump.c:1564): Can't infect (pid: 56) with parasite

See also:
145e9e0d8c6 ("x86/fpu: Fail ptrace() requests that try to set invalid MXCSR values")
https://github.com/torvalds/linux/commit/145e9e0d8c6fada4a40f9fc65b34658077874d9c

We decided to move from mxcsr cleaning up scheme and use mxcsr mask
(0x0000ffbf) as kernel does. Thanks to Dmitry Safonov for pointing out.

Tested-on: Intel(R) Xeon(R) CPU E3-1246 v3 @ 3.50GHz

Reported-by: Mr. Jenkins
Suggested-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 compel/arch/x86/src/lib/infect.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 98e2512e7..c0e7a544a 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -245,6 +245,19 @@ static int get_task_fpregs(pid_t pid, user_fpregs_struct_t *xsave)
 	return 0;
 }
 
+static inline void fixup_mxcsr(struct xsave_struct *xsave)
+{
+	/*
+	 * Right now xsave->i387.mxcsr filled with the random garbage,
+	 * let's make it valid by applying mask which allows all
+	 * features, except the denormals-are-zero feature bit.
+	 *
+	 * See also fpu__init_system_mxcsr function:
+	 * https://github.com/torvalds/linux/blob/8cb1ae19/arch/x86/kernel/fpu/init.c#L117
+	 */
+	xsave->i387.mxcsr &= 0x0000ffbf;
+}
+
 /* See arch/x86/kernel/fpu/xstate.c */
 static void validate_random_xstate(struct xsave_struct *xsave)
 {
@@ -272,17 +285,6 @@ static void validate_random_xstate(struct xsave_struct *xsave)
 
 	/* No reserved bits may be set */
 	memset(&hdr->reserved, 0, sizeof(hdr->reserved));
-
-	/*
-	 * While using PTRACE_SETREGSET the kernel checks that
-	 * "Reserved bits in MXCSR must be zero."
-	 * if (mxcsr[0] & ~mxcsr_feature_mask)
-	 *	return -EINVAL;
-	 *
-	 * As the mxcsr_feature_mask depends on the CPU the easiest solution for
-	 * this error injection test is to set mxcsr just to zero.
-	 */
-	xsave->i387.mxcsr = 0;
 }
 
 /*
@@ -309,6 +311,8 @@ static int corrupt_extregs(pid_t pid)
 	 */
 	pr_err("Corrupting %s for %d, seed %u\n", use_xsave ? "xsave" : "fpuregs", pid, init_seed);
 
+	fixup_mxcsr(&ext_regs);
+
 	if (!use_xsave) {
 		if (ptrace(PTRACE_SETFPREGS, pid, NULL, &ext_regs)) {
 			pr_perror("Can't set FPU registers for %d", pid);

From b30f3ee3d36ff5b2d386d7262340d9918f2199d1 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 21 Jul 2022 22:46:10 +0700
Subject: [PATCH 1097/1854] zdtm: Remove permission part check for skipping
 vsyscall vma

Normally, vsyscall vma has VM_READ, VM_EXEC permission. However, when
CONFIG_LEGACY_VSYSCALL_XONLY=y, that vma only has VM_EXEC. This commit removes
the permission part when checking to skip vsyscall vma in x32 tests.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index c011c79c0..d264c4878 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1651,6 +1651,15 @@ def get_visible_state(test):
     return files, maps, mounts
 
 
+def has_vsyscall(maps):
+    vsyscall = u"ffffffffff600000-ffffffffff601000"
+    for i in maps:
+        if vsyscall in i:
+            return i
+
+    return None
+
+
 def check_visible_state(test, state, opts):
     new = get_visible_state(test)
 
@@ -1666,9 +1675,9 @@ def check_visible_state(test, state, opts):
         new_maps = new[1][pid]
         if os.getenv("COMPAT_TEST"):
             # the vsyscall vma isn't unmapped from x32 processes
-            vsyscall = u"ffffffffff600000-ffffffffff601000 r-xp"
-            if vsyscall in new_maps and vsyscall not in old_maps:
-                new_maps.remove(vsyscall)
+            entry = has_vsyscall(new_maps)
+            if entry and has_vsyscall(old_maps) is None:
+                new_maps.remove(entry)
         if old_maps != new_maps:
             print("%s: Old maps lost: %s" % (pid, old_maps - new_maps))
             print("%s: New maps appeared: %s" % (pid, new_maps - old_maps))

From 70a9cd6fbf46d96b7bd49f38f3e013bd892a990e Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 21 Jul 2022 21:26:58 +0700
Subject: [PATCH 1098/1854] vdso-compat: Increase the reserved buffer for
 compat vdso

On Arch Linux with 5.18.3-zen1-1-zen kernel, the vdso's size is 3 pages which
exceeds the current 2-page reserved buffer. This commit simply increases the
reserved buffer size to 4 pages.

Fixes: https://github.com/checkpoint-restore/criu/issues/1916

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/vdso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/vdso.c b/criu/vdso.c
index 1a51f1451..7de2fae78 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -479,7 +479,7 @@ out_close:
 	return ret;
 }
 
-#define COMPAT_VDSO_BUF_SZ (PAGE_SIZE * 2)
+#define COMPAT_VDSO_BUF_SZ (PAGE_SIZE * 4)
 static int vdso_fill_compat_symtable(struct vdso_maps *native, struct vdso_maps *compat)
 {
 	void *vdso_mmap;

From d12e2364c412caca4c227c656a67b1b1404d6875 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 26 Jul 2022 13:20:58 +0300
Subject: [PATCH 1099/1854] zdtm: make root mount private in criu mntns

If root mount in criu mntns is slave, it would be slave of host mount
where criu is stored, so if someone mounts something in subdir of
{criu-dir}/test/ on host while tests are running this mount can
influence the test as it appears on top of root mount in criu mntns.

1) With mount-compat this mount can get into restored test mntns, which
means wrong restore, as this mount was not there on dump.
2) With mount-v2 this mount would just fail container restore, as root
container mount is mounted non-recursively to protect from unexpected
mounts appear after restore.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index d264c4878..aefcb36a4 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -267,7 +267,7 @@ class ns_flavor:
 
     def init(self, l_bins, x_bins):
         subprocess.check_call(
-            ["mount", "--make-slave", "--bind", ".", self.root])
+            ["mount", "--make-private", "--bind", ".", self.root])
         self.root_mounted = True
 
         if not os.access(self.root + "/.constructed", os.F_OK):

From 01b8d40ced03c38cb545bb83d568a5a951e0b609 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 27 Jul 2022 16:03:25 +0300
Subject: [PATCH 1100/1854] zdtm/mnt_root_ext: don't allow propagation from
 test mntns to criu mntns

This test specifically wants to create external bind-mount of "/" from
criu mntns to test mntns, and it wants "/" in criu mntns to be a shared
mount so that "external" mount in the test mntns is it's slave. This is
to triger specific dirname() resolution which happens only when sharing
restore is involved for external mounts, and only if rootfs is involved.

But initially I missed that when we create external mount in test's
temporary mntns it creates a propagation in criu mntns on top of root
mount. This mount may influence other tests restore as child mount in
root mount converts to locked child mount in criu service mntns (for uns
flavour) and when criu would restore root container mount it would fail
with EINVAL on non recursive bind with locked children.

To fix this mess we just need to prohibit propagating from tests
temporary mntns to criu mntns by making mounts slave.

Fixes: #1941

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mnt_root_ext.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/zdtm/static/mnt_root_ext.c b/test/zdtm/static/mnt_root_ext.c
index 6a2eb068c..305e87262 100644
--- a/test/zdtm/static/mnt_root_ext.c
+++ b/test/zdtm/static/mnt_root_ext.c
@@ -51,6 +51,14 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	/*
+	 * Make mounts in temporary mntns slave, to prevent propagation to criu mntns
+	 */
+	if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL)) {
+		pr_perror("make rslave");
+		return 1;
+	}
+
 	/*
 	 * Populate to the tests root host's rootfs subdir
 	 */

From fbded7978806d403727e4e19e597adb821d1ea31 Mon Sep 17 00:00:00 2001
From: Liang-Chun Chen <featherclc@gmail.com>
Date: Tue, 26 Jul 2022 23:39:33 +0800
Subject: [PATCH 1101/1854] files-reg.c: modify the check of ghost_limit to
 support large sparse files

files-reg.c checks whether the file size is larger than ghost_limit with st_size
(in dump_ghost_remap), which can not deal with large ghost sparse file, since
its actual file size is not the same as what st_size shows.

Therefore, in this commit, I replace st_size with st_blocks, which shows the
actual file size. (1 block = 512B), thus criu can deal with large ghost sparse
file.

Signed-off-by: Liang-Chun Chen <featherclc@gmail.com>
---
 criu/files-reg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index ce8788637..c3761b5ed 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -29,6 +29,7 @@
  * and checked.
  */
 #define BUILD_ID_MAP_SIZE 1048576
+#define ST_UNIT		  512
 
 #include "cr_options.h"
 #include "imgset.h"
@@ -946,8 +947,8 @@ static int dump_ghost_remap(char *path, const struct stat *st, int lfd, u32 id,
 
 	pr_info("Dumping ghost file for fd %d id %#x\n", lfd, id);
 
-	if (st->st_size > opts.ghost_limit) {
-		pr_err("Can't dump ghost file %s of %" PRIu64 " size, increase limit\n", path, st->st_size);
+	if (st->st_blocks * ST_UNIT > opts.ghost_limit) {
+		pr_err("Can't dump ghost file %s of %" PRIu64 " size, increase limit\n", path, st->st_blocks * ST_UNIT);
 		return -1;
 	}
 

From 2d34b56024c232c721a20683f5e968f107287a23 Mon Sep 17 00:00:00 2001
From: Liang-Chun Chen <featherclc@gmail.com>
Date: Wed, 27 Jul 2022 01:45:00 +0800
Subject: [PATCH 1102/1854] unlink_largefile.desc: remove crfail, since criu
 now can support unlink_largefile test

In the past, the unlink_largefile test should be fail on large ghost file.
However, it used sparse file, it will pass in current criu, since the large
ghost sparse file issue was fixed.

So the crfail flag of this test should be removed.

Signed-off-by: Liang-Chun Chen <featherclc@gmail.com>
---
 test/zdtm/static/unlink_largefile.desc | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 test/zdtm/static/unlink_largefile.desc

diff --git a/test/zdtm/static/unlink_largefile.desc b/test/zdtm/static/unlink_largefile.desc
deleted file mode 100644
index ded89879a..000000000
--- a/test/zdtm/static/unlink_largefile.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flags': 'crfail'}

From e62d541bde1ccd241f64034d28825b62a8bb2216 Mon Sep 17 00:00:00 2001
From: Liang-Chun Chen <featherclc@gmail.com>
Date: Thu, 28 Jul 2022 13:09:29 +0800
Subject: [PATCH 1103/1854] zdtm: add two tests for large ghost sparse file

ghost_holes_large00 is a test which creates a large ghost sparse file with 1GiB
hole(pwrite can only handle 2GiB maximum on 32-bit system) and 8KiB data, criu
should be able to handle this kind of situation.

ghost_holes_large01 is a test which creates a large ghost sparse file with 1GiB
hole and 2MiB data, since 2MiB is larger than the default ghost_limit(1MiB),
criu should fail on this test.

v2: fix overflow on 32-bit arch.

Signed-off-by: Liang-Chun Chen <featherclc@gmail.com>
---
 test/zdtm/static/Makefile                 |   3 +
 test/zdtm/static/ghost_holes_large00.c    | 152 ++++++++++++++++++++++
 test/zdtm/static/ghost_holes_large01.c    |   1 +
 test/zdtm/static/ghost_holes_large01.desc |   1 +
 4 files changed, 157 insertions(+)
 create mode 100644 test/zdtm/static/ghost_holes_large00.c
 create mode 120000 test/zdtm/static/ghost_holes_large01.c
 create mode 100644 test/zdtm/static/ghost_holes_large01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 5a8a5f75c..b28345400 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -306,6 +306,8 @@ TST_FILE	=				\
 		ghost_holes00			\
 		ghost_holes01			\
 		ghost_holes02			\
+		ghost_holes_large00     \
+		ghost_holes_large01     \
 		unlink_largefile		\
 		mtime_mmap			\
 		fifo				\
@@ -609,6 +611,7 @@ unlink_fstat04:		CFLAGS += -DUNLINK_FSTAT04
 unlink_fstat041:		CFLAGS += -DUNLINK_FSTAT041 -DUNLINK_FSTAT04
 ghost_holes01:		CFLAGS += -DTAIL_HOLE
 ghost_holes02:		CFLAGS += -DHEAD_HOLE
+ghost_holes_large01:		CFLAGS += -DLIMIT
 sk-freebind-false:	CFLAGS += -DZDTM_FREEBIND_FALSE
 selinux02:		CFLAGS += -DUSING_SOCKCREATE
 stopped01:		CFLAGS += -DZDTM_STOPPED_KILL
diff --git a/test/zdtm/static/ghost_holes_large00.c b/test/zdtm/static/ghost_holes_large00.c
new file mode 100644
index 000000000..1a9739f8e
--- /dev/null
+++ b/test/zdtm/static/ghost_holes_large00.c
@@ -0,0 +1,152 @@
+#include <errno.h>
+#include <stdbool.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Test ghost with one large hole(1GiB) in the middle";
+const char *test_author = "Liang-Chun Chen <featherclc@gmail.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "file name", 1);
+
+/* Buffer that is suitable for data size */
+#ifdef LIMIT
+#define BUFSIZE 1024 * 1024
+#else
+#define BUFSIZE 4096
+#endif
+static unsigned char buf[BUFSIZE];
+
+#ifndef SEEK_DATA
+#define SEEK_DATA 3
+#define SEEK_HOLE 4
+#endif
+
+#define DATA1_OFF 0
+#define HOLE_SIZE (1LL * 1 * 1024 * 1024 * 1024)
+#define DATA2_OFF (BUFSIZE + HOLE_SIZE)
+#define FILE_SIZE (2 * BUFSIZE + HOLE_SIZE)
+#define ST_UNIT	  512
+
+int main(int argc, char **argv)
+{
+	int fd;
+	struct stat st;
+	uint32_t crc;
+	bool chk_hole = true;
+
+	test_init(argc, argv);
+
+	fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0644);
+	if (fd < 0) {
+		pr_perror("can't open %s", filename);
+		exit(1);
+	}
+
+	if (unlink(filename) < 0) {
+		pr_perror("can't unlink %s", filename);
+		goto failed;
+	}
+
+	crc = ~0;
+	datagen(buf, BUFSIZE, &crc);
+	if (pwrite(fd, buf, BUFSIZE, DATA1_OFF) != BUFSIZE) {
+		pr_perror("can't write data1");
+		goto failed;
+	}
+
+	crc = ~0;
+	datagen(buf, BUFSIZE, &crc);
+	if (pwrite(fd, buf, BUFSIZE, DATA2_OFF) != BUFSIZE) {
+		pr_perror("can't write data2");
+		goto failed;
+	}
+
+	if (ftruncate(fd, FILE_SIZE)) {
+		pr_perror("Can't fixup file size");
+		goto failed;
+	}
+
+	if (lseek(fd, DATA1_OFF, SEEK_HOLE) != DATA1_OFF + BUFSIZE) {
+		test_msg("Won't check for hole\n");
+		chk_hole = false;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (fstat(fd, &st) < 0) {
+		fail("can't stat after");
+		goto failed;
+	}
+
+	if (st.st_size != FILE_SIZE) {
+		fail("file size changed to %ld", (long)st.st_size);
+		goto failed;
+	}
+
+	test_msg("file size OK\n");
+
+	if (st.st_blocks * ST_UNIT != 2 * BUFSIZE) {
+		fail("actual file size changed to %ld", (long)st.st_blocks * ST_UNIT);
+		goto failed;
+	}
+
+	test_msg("actual file size OK\n");
+
+	/* Data 1 */
+	if (pread(fd, buf, BUFSIZE, DATA1_OFF) != BUFSIZE) {
+		fail("pread1 fail");
+		goto failed;
+	}
+
+	crc = ~0;
+	if (datachk(buf, BUFSIZE, &crc)) {
+		fail("datachk1 fail");
+		goto failed;
+	}
+
+	test_msg("Data1 OK\n");
+
+	/* Data 2 */
+	if (pread(fd, buf, BUFSIZE, DATA2_OFF) != BUFSIZE) {
+		fail("pread2 fail");
+		goto failed;
+	}
+
+	crc = ~0;
+	if (datachk(buf, BUFSIZE, &crc)) {
+		fail("datachk2 fail");
+		goto failed;
+	}
+
+	test_msg("Data2 OK\n");
+
+	/* Hole */
+	if (chk_hole) {
+		if (lseek(fd, DATA1_OFF, SEEK_HOLE) != DATA1_OFF + BUFSIZE) {
+			fail("Begin of mid hole not found");
+			goto failed;
+		}
+		if (lseek(fd, DATA1_OFF + BUFSIZE, SEEK_DATA) != DATA2_OFF) {
+			fail("End of mid hole not found");
+			goto failed;
+		}
+		test_msg("Mid hole OK\n");
+	}
+
+	close(fd);
+	pass();
+	return 0;
+
+failed:
+	close(fd);
+	return 1;
+}
diff --git a/test/zdtm/static/ghost_holes_large01.c b/test/zdtm/static/ghost_holes_large01.c
new file mode 120000
index 000000000..1b90363d4
--- /dev/null
+++ b/test/zdtm/static/ghost_holes_large01.c
@@ -0,0 +1 @@
+ghost_holes_large00.c
\ No newline at end of file
diff --git a/test/zdtm/static/ghost_holes_large01.desc b/test/zdtm/static/ghost_holes_large01.desc
new file mode 100644
index 000000000..8e6a476bd
--- /dev/null
+++ b/test/zdtm/static/ghost_holes_large01.desc
@@ -0,0 +1 @@
+{'flags': 'crfail'}
\ No newline at end of file

From da4803beae6791d6430881ba6bd7aa4a5bb35524 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 4 Aug 2022 16:56:30 +0100
Subject: [PATCH 1104/1854] MAINTAINERS: Add Radostin (myself) to maintainers

I've been contributing to CRIU for sometime and I'm hoping that my
familiarity with the project would be sufficient to self-nominate as a
maintainer. I would like to help with code reviews, submitting patches,
implementing new features, and maintaining the project in general.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index bb153f1ab..7d53d0dc1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,3 +4,4 @@ Mike Rapoport <rppt@kernel.org>
 Dmitry Safonov <0x7f454c46@gmail.com>
 Adrian Reber <areber@redhat.com>
 Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
+Radostin Stoyanov <rstoyanov@fedoraproject.org>

From eb4ecb3cfd158b9c79af6f33c42c7a64137b2626 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 23 Jul 2022 18:23:34 +0100
Subject: [PATCH 1105/1854] ci: unset XDG_RUNTIME_DIR when invoking podman

We need to pass environment variables from the CI environment to
distinguish between CI environments. However, when `sudo -E` is
used to run Podman it results in the XDG_RUNTIME_DIR environment
variable being set incorrectly that prevents Podman from running.

This patch fixes the following error in the GitHub Action virtual
environment:

	error running container: error from /usr/bin/crun creating
	container for [/bin/sh -c /bin/prepare-for-fedora-rawhide.sh]:
	sd-bus call: Connection reset by peer

Fixes: #1942

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/fedora-rawhide-test.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/fedora-rawhide-test.yml b/.github/workflows/fedora-rawhide-test.yml
index 00bc3b2bd..b6d94d23e 100644
--- a/.github/workflows/fedora-rawhide-test.yml
+++ b/.github/workflows/fedora-rawhide-test.yml
@@ -9,4 +9,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run Fedora Rawhide Test
-      run: sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"
+      # We need to pass environment variables from the CI environment to
+      # distinguish between CI environments. However, we need to make sure that
+      # XDG_RUNTIME_DIR environment variable is not set due to a bug in Podman.
+      # FIXME: https://github.com/containers/podman/issues/14920
+      run: sudo -E XDG_RUNTIME_DIR= make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"

From e8a6765d1ef16935a55fd688bb49e0535922f3f1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 31 Jul 2022 16:07:30 +0000
Subject: [PATCH 1106/1854] criu: fix conflicting headers

There are several changes in glibc 2.36 that make sys/mount.h header
incompatible with kernel headers:

https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E

This patch removes conflicting includes for `<linux/mount.h>` and
updates the content of `criu/include/linux/mount.h` to match
`/usr/include/sys/mount.h`. In addition, inline definitions sys_*()
functions have been moved from "linux/mount.h" to "syscall.h" to
avoid conflicts with `uapi/compel/plugins/std/syscall.h` and
`<unistd.h>`. The include for `<linux/aio_abi.h>` has been replaced
with local include to avoid conflicts with `<sys/mount.h>`.

Fixes: #1949

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile.config              |  2 +-
 criu/cgroup.c                |  1 +
 criu/cr-check.c              |  2 +-
 criu/cr-restore.c            |  3 ++-
 criu/include/aio.h           |  2 +-
 criu/include/linux/aio_abi.h | 14 +++++++++++
 criu/include/linux/mount.h   | 48 +++++++++++++++++++-----------------
 criu/include/syscall.h       | 17 +++++++++++++
 criu/pie/parasite.c          |  2 +-
 criu/util.c                  |  1 +
 scripts/feature-tests.mak    | 13 ----------
 11 files changed, 64 insertions(+), 41 deletions(-)
 create mode 100644 criu/include/linux/aio_abi.h
 create mode 100644 criu/include/syscall.h

diff --git a/Makefile.config b/Makefile.config
index d113e2246..270ec61c0 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -78,7 +78,7 @@ export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE \
+	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW MEMFD_CREATE \
 	OPENAT2 NO_LIBC_RSEQ_DEFS
 
 # $1 - config name
diff --git a/criu/cgroup.c b/criu/cgroup.c
index e05b0832e..325df6a1d 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -27,6 +27,7 @@
 #include "images/cgroup.pb-c.h"
 #include "kerndat.h"
 #include "linux/mount.h"
+#include "syscall.h"
 
 /*
  * This structure describes set of controller groups
diff --git a/criu/cr-check.c b/criu/cr-check.c
index f589a91da..0ca80192c 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -21,7 +21,6 @@
 #include <sys/prctl.h>
 #include <sched.h>
 #include <sys/mount.h>
-#include <linux/aio_abi.h>
 
 #include "../soccr/soccr.h"
 
@@ -52,6 +51,7 @@
 #include "net.h"
 #include "restorer.h"
 #include "uffd.h"
+#include "linux/aio_abi.h"
 
 #include "images/inventory.pb-c.h"
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 279246c19..d11d28173 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -22,7 +22,6 @@
 #include <compel/ptrace.h>
 #include "common/compiler.h"
 
-#include "linux/mount.h"
 #include "linux/rseq.h"
 
 #include "clone-noasan.h"
@@ -86,6 +85,8 @@
 #include <compel/plugins/std/syscall-codes.h>
 #include "compel/include/asm/syscall.h"
 
+#include "linux/mount.h"
+
 #include "protobuf.h"
 #include "images/sa.pb-c.h"
 #include "images/timer.pb-c.h"
diff --git a/criu/include/aio.h b/criu/include/aio.h
index d1655739d..38e704020 100644
--- a/criu/include/aio.h
+++ b/criu/include/aio.h
@@ -1,7 +1,7 @@
 #ifndef __CR_AIO_H__
 #define __CR_AIO_H__
 
-#include <linux/aio_abi.h>
+#include "linux/aio_abi.h"
 #include "images/mm.pb-c.h"
 unsigned int aio_estimate_nr_reqs(unsigned int size);
 int dump_aio_ring(MmEntry *mme, struct vma_area *vma);
diff --git a/criu/include/linux/aio_abi.h b/criu/include/linux/aio_abi.h
new file mode 100644
index 000000000..d9ce78720
--- /dev/null
+++ b/criu/include/linux/aio_abi.h
@@ -0,0 +1,14 @@
+#ifndef __LINUX__AIO_ABI_H
+#define __LINUX__AIO_ABI_H
+
+typedef __kernel_ulong_t aio_context_t;
+
+/* read() from /dev/aio returns these structures. */
+struct io_event {
+	__u64 data; /* the data field from the iocb */
+	__u64 obj;  /* what iocb this event came from */
+	__s64 res;  /* result code for this event */
+	__s64 res2; /* secondary result */
+};
+
+#endif /* __LINUX__AIO_ABI_H */
diff --git a/criu/include/linux/mount.h b/criu/include/linux/mount.h
index 9a3a28b10..0d55a588c 100644
--- a/criu/include/linux/mount.h
+++ b/criu/include/linux/mount.h
@@ -4,32 +4,34 @@
 #include "common/config.h"
 #include "compel/plugins/std/syscall-codes.h"
 
-#ifdef CONFIG_HAS_FSCONFIG
-#include <linux/mount.h>
-#else
+/* Copied from /usr/include/sys/mount.h */
+
+#ifndef FSCONFIG_CMD_CREATE
+/* The type of fsconfig call made.   */
 enum fsconfig_command {
-	FSCONFIG_SET_FLAG = 0,	      /* Set parameter, supplying no value */
-	FSCONFIG_SET_STRING = 1,      /* Set parameter, supplying a string value */
-	FSCONFIG_SET_BINARY = 2,      /* Set parameter, supplying a binary blob value */
-	FSCONFIG_SET_PATH = 3,	      /* Set parameter, supplying an object by path */
-	FSCONFIG_SET_PATH_EMPTY = 4,  /* Set parameter, supplying an object by (empty) path */
-	FSCONFIG_SET_FD = 5,	      /* Set parameter, supplying an object by fd */
-	FSCONFIG_CMD_CREATE = 6,      /* Invoke superblock creation */
+	FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
+#define FSCONFIG_SET_FLAG FSCONFIG_SET_FLAG
+	FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
+#define FSCONFIG_SET_STRING FSCONFIG_SET_STRING
+	FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
+#define FSCONFIG_SET_BINARY FSCONFIG_SET_BINARY
+	FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
+#define FSCONFIG_SET_PATH FSCONFIG_SET_PATH
+	FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
+#define FSCONFIG_SET_PATH_EMPTY FSCONFIG_SET_PATH_EMPTY
+	FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
+#define FSCONFIG_SET_FD FSCONFIG_SET_FD
+	FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
+#define FSCONFIG_CMD_CREATE FSCONFIG_CMD_CREATE
 	FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
+#define FSCONFIG_CMD_RECONFIGURE FSCONFIG_CMD_RECONFIGURE
 };
+#endif // FSCONFIG_CMD_CREATE
+
+#ifndef MS_MGC_VAL
+/* Magic mount flag number. Has to be or-ed to the flag values.  */
+#define MS_MGC_VAL 0xc0ed0000 /* Magic flag number to indicate "new" flags */
+#define MS_MGC_MSK 0xffff0000 /* Magic flag number mask */
 #endif
 
-static inline int sys_fsopen(const char *fsname, unsigned int flags)
-{
-	return syscall(__NR_fsopen, fsname, flags);
-}
-static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux)
-{
-	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
-}
-static inline int sys_fsmount(int fd, unsigned int flags, unsigned int attr_flags)
-{
-	return syscall(__NR_fsmount, fd, flags, attr_flags);
-}
-
 #endif
diff --git a/criu/include/syscall.h b/criu/include/syscall.h
new file mode 100644
index 000000000..c38d6d971
--- /dev/null
+++ b/criu/include/syscall.h
@@ -0,0 +1,17 @@
+#ifndef __CR_SYSCALL_H__
+#define __CR_SYSCALL_H__
+
+static inline int sys_fsopen(const char *fsname, unsigned int flags)
+{
+	return syscall(__NR_fsopen, fsname, flags);
+}
+static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+{
+	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
+}
+static inline int sys_fsmount(int fd, unsigned int flags, unsigned int attr_flags)
+{
+	return syscall(__NR_fsmount, fd, flags, attr_flags);
+}
+
+#endif /* __CR_SYSCALL_H__ */
\ No newline at end of file
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index e7eb1fcb6..f75fe13bb 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -3,7 +3,6 @@
 #include <signal.h>
 #include <linux/limits.h>
 #include <linux/capability.h>
-#include <sys/mount.h>
 #include <stdarg.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
@@ -14,6 +13,7 @@
 #include "int.h"
 #include "types.h"
 #include <compel/plugins/std/syscall.h>
+#include "linux/mount.h"
 #include "parasite.h"
 #include "fcntl.h"
 #include "prctl.h"
diff --git a/criu/util.c b/criu/util.c
index 5f69465b4..060ca3bd4 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -40,6 +40,7 @@
 #include "mem.h"
 #include "namespaces.h"
 #include "criu-log.h"
+#include "syscall.h"
 
 #include "clone-noasan.h"
 #include "cr_options.h"
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index 014e893a8..fb5d2ef7a 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -137,19 +137,6 @@ ENTRY(main)
 END(main)
 endef
 
-define FEATURE_TEST_FSCONFIG
-
-#include <linux/mount.h>
-
-int main(void)
-{
-	if (FSCONFIG_CMD_CREATE > 0)
-		return 0;
-	return 0;
-}
-
-endef
-
 define FEATURE_TEST_NFTABLES_LIB_API_0
 
 #include <string.h>

From 750acec25fde0a21d833957f214dc1eb9eb3d107 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 5 Aug 2022 21:44:11 +0100
Subject: [PATCH 1107/1854] Revert "ci: Switch to non overlaysfs tests"

This reverts commit 8bb05e3bf3fe96ce93071e22330c2701e86b9a55.

The following bug has been fixed:
https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 5 +----
 scripts/ci/podman-test.sh | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index f36b4e458..d4b11bd55 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,10 +21,7 @@ add-apt-repository \
 
 . /etc/lsb-release
 
-# overlayfs with current Ubuntu kernel breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924
-# Use devicemapper storage drive as a work-around
-echo '{ "experimental": true, "storage-driver": "devicemapper" }' > /etc/docker/daemon.json
+echo '{ "experimental": true }' > /etc/docker/daemon.json
 
 CRIU_LOG='/criu.log'
 mkdir -p /etc/criu
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 414004514..973d2d722 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -25,11 +25,7 @@ make install
 popd
 rm -rf "${tmp_dir}"
 
-# overlayfs with current Ubuntu kernel breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux-azure/+bug/1967924
-# Use VFS storage drive as a work-around
-export STORAGE_DRIVER=vfs
-podman --storage-driver vfs info
+podman info
 
 # shellcheck disable=SC2016
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'

From f9bc0a750a48ed10c0da289111f2efafe9ef9b20 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 5 Aug 2022 22:00:16 +0100
Subject: [PATCH 1108/1854] docker-test: use containerd installed from package

In commits [1, 2] the version of containerd installed by default in the
GitHub CI virtual environment was replaced with the latest release from
GitHub as a workaround to a bug in containerd.  This bug has been fixed
sometime ago and the current default version of containerd (1.6.6) does
not require this workaround. However, with the latest release, the
containerd binaries uploaded on GitHub have been built for Ubuntu 22.04
[3]. Our tests are still running on Ubuntu 20.04 and this results in the
following error:

/usr/bin/containerd: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by /usr/bin/containerd)
/usr/bin/containerd: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by /usr/bin/containerd)

[1] https://github.com/checkpoint-restore/criu/commit/046cad8
[2] https://github.com/checkpoint-restore/criu/commit/81a68ad
[3] https://github.com/containerd/containerd/commit/6b2dc9a37

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index d4b11bd55..63941437e 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -21,24 +21,14 @@ add-apt-repository \
 
 . /etc/lsb-release
 
+# docker checkpoint and restore is an experimental feature
 echo '{ "experimental": true }' > /etc/docker/daemon.json
+service docker restart
 
 CRIU_LOG='/criu.log'
 mkdir -p /etc/criu
 echo "log-file=$CRIU_LOG" > /etc/criu/runc.conf
 
-service docker stop
-systemctl stop containerd.service
-
-# Always use the latest containerd release.
-# Restore with containerd versions after v1.2.14 and before v1.5.0-beta.0 are broken.
-# https://github.com/checkpoint-restore/criu/issues/1223
-CONTAINERD_DOWNLOAD_URL=$(curl -s https://api.github.com/repos/containerd/containerd/releases/latest | grep '"browser_download_url":.*/containerd-.*-linux-amd64.tar.gz.$' | cut -d\" -f4)
-wget -nv "$CONTAINERD_DOWNLOAD_URL" -O - | tar -xz -C /usr/
-
-systemctl restart containerd.service
-service docker restart
-
 export SKIP_CI_TEST=1
 
 ./run-ci-tests.sh

From a1262f55fbd7a5a3a4f700bd4b9ae29584517861 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 5 Aug 2022 14:11:49 +0100
Subject: [PATCH 1109/1854] cr-check: fix check for apparmor stacking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The feature check for AppArmor stacking was introduced in
commit:
	8723e3f998d1ec5f125e6600436a96f7ff9c1631
	check: add a feature test for apparmor_stacking

However, on systems that don't support AppArmour, this check always
fails. As a result, `criu check --all` shows the following message:

	Looks good but some kernel features are missing
	which, depending on your process tree, may cause
	dump or restore failure.

Reported-by: André Rösti (@andrej)
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-check.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 0ca80192c..0f09b902a 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1478,13 +1478,15 @@ int cr_check(void)
 		ret |= check_newifindex();
 		ret |= check_pidfd_store();
 		ret |= check_ns_pid();
-		ret |= check_apparmor_stacking();
 		ret |= check_network_lock_nftables();
 		ret |= check_sockopt_buf_lock();
 		ret |= check_memfd_hugetlb();
 		ret |= check_move_mount_set_group();
 		ret |= check_openat2();
 		ret |= check_ptrace_get_rseq_conf();
+
+		if (kdat.lsm == LSMTYPE__APPARMOR)
+			ret |= check_apparmor_stacking();
 	}
 
 	/*

From 1f9bd82a55e2c125831931d169add46c9df79996 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sat, 6 Aug 2022 22:03:15 +0100
Subject: [PATCH 1110/1854] cr-check: optimize check for apparmor stacking

The result of check_aa_ns_dumping() is stored in kdat. Instead of doing
the same check twice - once on kerndat_init(), and again in
check_apparmor_stacking(), we can check the stored value.

Suggested-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 0f09b902a..6c95ffb25 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -104,7 +104,7 @@ out:
 
 static int check_apparmor_stacking(void)
 {
-	if (!check_aa_ns_dumping())
+	if (!kdat.apparmor_ns_dumping_enabled)
 		return -1;
 
 	return 0;

From cacddf19dad339f963b0b01f7174091b90c49e5d Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Wed, 20 Jul 2022 14:36:28 +0300
Subject: [PATCH 1111/1854] cr-restore: rseq: dynamically handle *libc with
 rseq

Before this patch we assumed that CRIU is compiled against
the same GLibc as it runs with. But as we see from real
world examples like #1935 it's not always true.

The idea of this patch is to detect rseq configuration
for the main CRIU process and use it to unregister
rseq for all further child processes. It's correct,
because we restore pstree using clone*() syscalls,
don't use exec*() (!) syscalls, so rseq gets inherited
in the kernel and rseq configuration remains the same
for all children processes.

This will prevent issues like this:
https://github.com/checkpoint-restore/criu/issues/1935

Suggested-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-restore.c      | 16 ++++++++--------
 criu/include/kerndat.h |  2 ++
 criu/kerndat.c         | 25 +++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d11d28173..5b5b41dfc 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3103,14 +3103,14 @@ static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
 #else
 static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
 {
-	/*
-	 * TODO: handle built-in rseq on other libc'ies like musl
-	 * We can do that using get_rseq_conf kernel feature.
-	 *
-	 * For now we just assume that other libc libraries are
-	 * not registering rseq by default.
-	 */
-	rseq->rseq_abi_pointer = 0;
+	if (!kdat.has_rseq || !kdat.has_ptrace_get_rseq_conf) {
+		rseq->rseq_abi_pointer = 0;
+		return;
+	}
+
+	rseq->rseq_abi_pointer = kdat.libc_rseq_conf.rseq_abi_pointer;
+	rseq->rseq_abi_size = kdat.libc_rseq_conf.rseq_abi_size;
+	rseq->signature = kdat.libc_rseq_conf.signature;
 }
 #endif
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 83d867e75..a3959c992 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -7,6 +7,7 @@
 #include "asm/kerndat.h"
 #include "util-vdso.h"
 #include "hugetlb.h"
+#include <compel/ptrace.h>
 
 struct stat;
 
@@ -82,6 +83,7 @@ struct kerndat_s {
 	bool has_openat2;
 	bool has_rseq;
 	bool has_ptrace_get_rseq_conf;
+	struct __ptrace_rseq_configuration libc_rseq_conf;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index bc5dccab1..0f7d5fc8f 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -923,6 +923,7 @@ static int kerndat_has_ptrace_get_rseq_conf(void)
 	pid_t pid;
 	int len;
 	struct __ptrace_rseq_configuration rseq;
+	int ret = 0;
 
 	pid = fork_and_ptrace_attach(NULL);
 	if (pid < 0)
@@ -930,6 +931,9 @@ static int kerndat_has_ptrace_get_rseq_conf(void)
 
 	len = ptrace(PTRACE_GET_RSEQ_CONFIGURATION, pid, sizeof(rseq), &rseq);
 	if (len != sizeof(rseq)) {
+		if (kdat.has_ptrace_get_rseq_conf)
+			ret = 1; /* we should update kdat */
+
 		kdat.has_ptrace_get_rseq_conf = false;
 		pr_info("ptrace(PTRACE_GET_RSEQ_CONFIGURATION) is not supported\n");
 		goto out;
@@ -940,16 +944,27 @@ static int kerndat_has_ptrace_get_rseq_conf(void)
 	 * we need to pay attention to that and, possibly, make changes on the CRIU side.
 	 */
 	if (rseq.flags != 0) {
+		if (kdat.has_ptrace_get_rseq_conf)
+			ret = 1; /* we should update kdat */
+
 		kdat.has_ptrace_get_rseq_conf = false;
 		pr_err("ptrace(PTRACE_GET_RSEQ_CONFIGURATION): rseq.flags != 0\n");
 	} else {
+		if (!kdat.has_ptrace_get_rseq_conf)
+			ret = 1; /* we should update kdat */
+
 		kdat.has_ptrace_get_rseq_conf = true;
+
+		if (memcmp(&kdat.libc_rseq_conf, &rseq, sizeof(rseq)))
+			ret = 1; /* we should update kdat */
+
+		kdat.libc_rseq_conf = rseq;
 	}
 
 out:
 	kill(pid, SIGKILL);
 	waitpid(pid, NULL, 0);
-	return 0;
+	return ret;
 }
 
 int kerndat_sockopt_buf_lock(void)
@@ -1472,6 +1487,12 @@ int kerndat_try_load_new(void)
 	if (ret < 0)
 		return ret;
 
+	ret = kerndat_has_ptrace_get_rseq_conf();
+	if (ret < 0) {
+		pr_err("kerndat_has_ptrace_get_rseq_conf failed when initializing kerndat.\n");
+		return ret;
+	}
+
 	/* New information is found, we need to save to the cache */
 	if (ret)
 		kerndat_save_cache();
@@ -1657,7 +1678,7 @@ int kerndat_init(void)
 		pr_err("kerndat_has_rseq failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_has_ptrace_get_rseq_conf()) {
+	if (!ret && (kerndat_has_ptrace_get_rseq_conf() < 0)) {
 		pr_err("kerndat_has_ptrace_get_rseq_conf failed when initializing kerndat.\n");
 		ret = -1;
 	}

From f7972a3f0468e32231af6914e2e9c9e07ac53ae6 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
Date: Wed, 20 Jul 2022 15:17:35 +0300
Subject: [PATCH 1112/1854] cr-restore: rseq: use glibc-specific way to
 unregister only as fallback

Let's use dynamic approach to detect built-in *libc rseq in all cases,
and "old" static approach as a fallback path if the user kernel
lacks support of ptrace_get_rseq_conf feature.

Suggested-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
---
 criu/cr-restore.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 5b5b41dfc..919d10ab5 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3088,7 +3088,6 @@ static int prep_rseq(struct rst_rseq_param *rseq, ThreadCoreEntry *tc)
 	return 0;
 }
 
-#if defined(__GLIBC__) && defined(RSEQ_SIG)
 static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
 {
 	if (!kdat.has_rseq) {
@@ -3096,15 +3095,14 @@ static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
 		return;
 	}
 
-	rseq->rseq_abi_pointer = encode_pointer(__criu_thread_pointer() + __rseq_offset);
-	rseq->rseq_abi_size = __rseq_size;
-	rseq->signature = RSEQ_SIG;
-}
+	if (!kdat.has_ptrace_get_rseq_conf) {
+#if defined(__GLIBC__) && defined(RSEQ_SIG)
+		rseq->rseq_abi_pointer = encode_pointer(__criu_thread_pointer() + __rseq_offset);
+		rseq->rseq_abi_size = __rseq_size;
+		rseq->signature = RSEQ_SIG;
 #else
-static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
-{
-	if (!kdat.has_rseq || !kdat.has_ptrace_get_rseq_conf) {
 		rseq->rseq_abi_pointer = 0;
+#endif
 		return;
 	}
 
@@ -3112,7 +3110,6 @@ static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
 	rseq->rseq_abi_size = kdat.libc_rseq_conf.rseq_abi_size;
 	rseq->signature = kdat.libc_rseq_conf.signature;
 }
-#endif
 
 static rlim_t decode_rlim(rlim_t ival)
 {

From 49319cd579f7c1250ed71c78b756e92aae2b9d7f Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 9 Aug 2022 09:42:37 -0700
Subject: [PATCH 1113/1854] Add Alexander Mikhalitsyn to maintainers

Alex implemented a few complex features and maintain our CI system.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7d53d0dc1..8fee8e571 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5,3 +5,4 @@ Dmitry Safonov <0x7f454c46@gmail.com>
 Adrian Reber <areber@redhat.com>
 Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
 Radostin Stoyanov <rstoyanov@fedoraproject.org>
+Alexander Mikhalitsyn <alexander@mihalicyn.com>

From 2642b657da4eaffa7ed0f72094b1805581fa3ae0 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 11 Aug 2022 09:51:34 +0100
Subject: [PATCH 1114/1854] docker-test: handle race condition error

There is a race condition in docker/containerd that causes docker to
occasionally fail when starting a container from a checkpoint immediately
after the checkpoint has been created.

This problem is unrelated to criu and has been reported in
https://github.com/moby/moby/issues/42900

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 63941437e..ca93ed77c 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -75,17 +75,37 @@ checkpoint_container () {
 	docker wait cr
 }
 
-restore_container () {
-	CHECKPOINT_NAME=$1
-
-	docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log || {
+print_logs () {
 	cat "$(grep log 'log file:' | sed 's/log file:\s*//')" || true
 		docker logs cr || true
 		cat $CRIU_LOG || true
 		dmesg
 		docker ps
 		exit 1
-	}
+}
+
+declare -i max_restore_container_tries=3
+current_iteration=
+
+restore_container () {
+	CHECKPOINT_NAME=$1
+
+	docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log || {
+		# FIXME: There is a race condition in docker/containerd that causes
+		# docker to occasionally fail when starting a container from a
+		# checkpoint immediately after the checkpoint has been created.
+		# https://github.com/moby/moby/issues/42900
+		if [ "$current_iteration" -gt "$max_restore_container_tries" ]; then
+			print_logs
+		fi
+		grep -Eq '^Error response from daemon: failed to upload checkpoint to containerd: commit failed: content sha256:.*: already exists$' log && {
+			((current_iteration+=1))
+			echo "Retry container restore: $current_iteration"
+			sleep 1;
+			restore_container "$CHECKPOINT_NAME"
+		} ||
+		print_logs
+	} && current_iteration=0
 }
 
 # Scenario: Create multiple containers and checkpoint and restore them once

From a202ec271d6cc91265f717e94dd2138ce3d71c03 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 30 Mar 2022 19:27:20 -0700
Subject: [PATCH 1115/1854] ci/cirrus: add CentOS Stream 9

Mostly a copy-paste from the CentOS 8 task, with a few differences:
 - Use dnf instead of yum
 - Enable crb instead of powertools
 - Different way of installing EPEL
 - No need to switch to python3 as this is the default
 - junit_xml is now available as an rpm

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .cirrus.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 2b6903ddc..6a5d75149 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -19,6 +19,34 @@ task:
   build_script: |
     make -C scripts/ci vagrant-fedora-no-vdso
 
+task:
+  name: CentOS Stream 9 based test
+  environment:
+    HOME: "/root"
+    CIRRUS_WORKING_DIR: "/tmp/criu"
+
+  compute_engine_instance:
+    image_project: centos-cloud
+    image: family/centos-stream-9
+    platform: linux
+    cpu: 4
+    memory: 8G
+
+  setup_script: |
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+    dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
+    dnf -y install epel-release epel-next-release
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-future python-protobuf python-junit_xml python-flake8 xmlto
+    systemctl stop sssd
+    # Even with selinux in permissive mode the selinux tests will be executed.
+    # The Cirrus CI user runs as a service from selinux point of view and is
+    # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0).
+    # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode.
+    setenforce 0
+
+  build_script: |
+    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_OPTS="-x zdtm/static/socket-raw"
+
 task:
   name: Vagrant Fedora Rawhide based test
   environment:

From c089159a464ed32684a7754160eea84feca4b547 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 18:19:41 -0700
Subject: [PATCH 1116/1854] ci/cirrus: centos 8 job nits

1. Rename CentOS 8 to CentOS Stream 8 (which it is).

2. Install junit_xml from the repo rather than via pip.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .cirrus.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 6a5d75149..03ed79748 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -69,7 +69,7 @@ task:
     make -C scripts/ci vagrant-fedora-rawhide
 
 task:
-  name: CentOS 8 based test
+  name: CentOS Stream 8 based test
   environment:
     HOME: "/root"
     CIRRUS_WORKING_DIR: "/tmp/criu"
@@ -85,7 +85,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
     yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf xmlto
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf python3-junit_xml xmlto
     alternatives --set python /usr/bin/python3
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed
@@ -93,7 +93,6 @@ task:
     # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
     # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode
     setenforce 0
-    pip3 install junit_xml
 
   build_script: |
     make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_OPTS="-x zdtm/static/socket-raw"

From d7477dac03940f714b845bf39f3b57b4145bbb97 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 7 Aug 2022 16:27:22 -0700
Subject: [PATCH 1117/1854] compel: set TRACESYSGOOD to distinguish breakpoints
 from syscalls

When delivering system call traps, set bit 7 in the  signal  number  (i.e.,
deliver SIGTRAP|0x80).  This makes it easy for the tracer  to  distinguish
normal traps from those caused by a system call.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/include/ptrace.h      |  2 ++
 compel/include/uapi/infect.h |  4 ++--
 compel/src/lib/infect.c      | 27 ++++++++++++++-------------
 compel/src/lib/ptrace.c      |  2 +-
 criu/cr-restore.c            | 13 ++++++++-----
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/compel/include/ptrace.h b/compel/include/ptrace.h
index bf2701e63..00013f937 100644
--- a/compel/include/ptrace.h
+++ b/compel/include/ptrace.h
@@ -5,6 +5,8 @@
 #include <compel/asm/infect-types.h>
 #include <compel/ptrace.h>
 
+#define PTRACE_SYSCALL_TRAP 0x80
+
 #define PTRACE_SI_EVENT(_si_code) (((_si_code)&0xFFFF) >> 8)
 
 extern int ptrace_get_regs(pid_t pid, user_regs_struct_t *regs);
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 7073f343f..19d4da2b1 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -80,9 +80,9 @@ enum trace_flags {
 	TRACE_EXIT,
 };
 
-extern int __must_check compel_stop_on_syscall(int tasks, int sys_nr, int sys_nr_compat, enum trace_flags trace);
+extern int __must_check compel_stop_on_syscall(int tasks, int sys_nr, int sys_nr_compat);
 
-extern int __must_check compel_stop_pie(pid_t pid, void *addr, enum trace_flags *tf, bool no_bp);
+extern int __must_check compel_stop_pie(pid_t pid, void *addr, bool no_bp);
 
 extern int __must_check compel_unmap(struct parasite_ctl *ctl, unsigned long addr);
 
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index b99f23b36..7d7865480 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -304,6 +304,11 @@ try_again:
 		goto try_again;
 	}
 
+	if (ptrace(PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_TRACESYSGOOD)) {
+		pr_perror("Unable to set PTRACE_O_TRACESYSGOOD for %d", pid);
+		return -1;
+	}
+
 	if (ss->seccomp_mode != SECCOMP_MODE_DISABLED && ptrace_suspend_seccomp(pid) < 0)
 		goto err;
 
@@ -1366,7 +1371,6 @@ static int parasite_fini_seized(struct parasite_ctl *ctl)
 	pid_t pid = ctl->rpid;
 	user_regs_struct_t regs;
 	int status, ret = 0;
-	enum trace_flags flag;
 
 	/* stop getting chld from parasite -- we're about to step-by-step it */
 	if (restore_child_handler(ctl))
@@ -1407,11 +1411,11 @@ static int parasite_fini_seized(struct parasite_ctl *ctl)
 		return -1;
 
 	/* Go to sigreturn as closer as we can */
-	ret = compel_stop_pie(pid, ctl->sigreturn_addr, &flag, ctl->ictx.flags & INFECT_NO_BREAKPOINTS);
+	ret = compel_stop_pie(pid, ctl->sigreturn_addr, ctl->ictx.flags & INFECT_NO_BREAKPOINTS);
 	if (ret < 0)
 		return ret;
 
-	if (compel_stop_on_syscall(1, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag))
+	if (compel_stop_on_syscall(1, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1)))
 		return -1;
 
 	if (ptrace_flush_breakpoints(pid))
@@ -1546,7 +1550,7 @@ int compel_unmap(struct parasite_ctl *ctl, unsigned long addr)
 	if (ret)
 		goto err;
 
-	ret = compel_stop_on_syscall(1, __NR(munmap, 0), __NR(munmap, 1), TRACE_ENTER);
+	ret = compel_stop_on_syscall(1, __NR(munmap, 0), __NR(munmap, 1));
 
 	/*
 	 * Don't touch extended registers here: they were restored
@@ -1558,7 +1562,7 @@ err:
 	return ret;
 }
 
-int compel_stop_pie(pid_t pid, void *addr, enum trace_flags *tf, bool no_bp)
+int compel_stop_pie(pid_t pid, void *addr, bool no_bp)
 {
 	int ret;
 
@@ -1575,7 +1579,6 @@ int compel_stop_pie(pid_t pid, void *addr, enum trace_flags *tf, bool no_bp)
 		 * PIE will stop on a breakpoint, next
 		 * stop after that will be syscall enter.
 		 */
-		*tf = TRACE_EXIT;
 		return 0;
 	}
 
@@ -1588,14 +1591,12 @@ int compel_stop_pie(pid_t pid, void *addr, enum trace_flags *tf, bool no_bp)
 		pr_perror("Unable to restart the %d process", pid);
 		return -1;
 	}
-
-	*tf = TRACE_ENTER;
 	return 0;
 }
 
 static bool task_is_trapped(int status, pid_t pid)
 {
-	if (WIFSTOPPED(status) && WSTOPSIG(status) == SIGTRAP)
+	if (WIFSTOPPED(status) && (WSTOPSIG(status) & ~PTRACE_SYSCALL_TRAP) == SIGTRAP)
 		return true;
 
 	pr_err("Task %d is in unexpected state: %x\n", pid, status);
@@ -1629,15 +1630,13 @@ static inline int is_required_syscall(user_regs_struct_t *regs, pid_t pid, const
  * sys_nr - the required syscall number
  * sys_nr_compat - the required compatible syscall number
  */
-int compel_stop_on_syscall(int tasks, const int sys_nr, const int sys_nr_compat, enum trace_flags trace)
+int compel_stop_on_syscall(int tasks, const int sys_nr, const int sys_nr_compat)
 {
+	enum trace_flags trace = tasks > 1 ? TRACE_ALL : TRACE_ENTER;
 	user_regs_struct_t regs;
 	int status, ret;
 	pid_t pid;
 
-	if (tasks > 1)
-		trace = TRACE_ALL;
-
 	/* Stop all threads on the enter point in sys_rt_sigreturn */
 	while (tasks) {
 		pid = wait4(-1, &status, __WALL, NULL);
@@ -1651,6 +1650,8 @@ int compel_stop_on_syscall(int tasks, const int sys_nr, const int sys_nr_compat,
 
 		pr_debug("%d was trapped\n", pid);
 
+		if ((WSTOPSIG(status) & PTRACE_SYSCALL_TRAP) == 0)
+			goto goon;
 		if (trace == TRACE_EXIT) {
 			trace = TRACE_ENTER;
 			pr_debug("`- Expecting exit\n");
diff --git a/compel/src/lib/ptrace.c b/compel/src/lib/ptrace.c
index 49b685d70..717ee2839 100644
--- a/compel/src/lib/ptrace.c
+++ b/compel/src/lib/ptrace.c
@@ -23,7 +23,7 @@
 
 int ptrace_suspend_seccomp(pid_t pid)
 {
-	if (ptrace(PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_SUSPEND_SECCOMP) < 0) {
+	if (ptrace(PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_SUSPEND_SECCOMP | PTRACE_O_TRACESYSGOOD) < 0) {
 		pr_perror("suspending seccomp failed");
 		return -1;
 	}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 919d10ab5..9a1b23999 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1964,6 +1964,10 @@ static int attach_to_tasks(bool root_seized)
 				return -1;
 			}
 
+			if (ptrace(PTRACE_SETOPTIONS, pid, NULL, PTRACE_O_TRACESYSGOOD)) {
+				pr_perror("Unable to set PTRACE_O_TRACESYSGOOD for %d", pid);
+				return -1;
+			}
 			/*
 			 * Suspend seccomp if necessary. We need to do this because
 			 * although seccomp is restored at the very end of the
@@ -2028,7 +2032,7 @@ static int restore_rseq_cs(void)
 	return 0;
 }
 
-static int catch_tasks(bool root_seized, enum trace_flags *flag)
+static int catch_tasks(bool root_seized)
 {
 	struct pstree_item *item;
 
@@ -2058,7 +2062,7 @@ static int catch_tasks(bool root_seized, enum trace_flags *flag)
 				return -1;
 			}
 
-			ret = compel_stop_pie(pid, rsti(item)->breakpoint, flag, fault_injected(FI_NO_BREAKPOINTS));
+			ret = compel_stop_pie(pid, rsti(item)->breakpoint, fault_injected(FI_NO_BREAKPOINTS));
 			if (ret < 0)
 				return -1;
 		}
@@ -2225,7 +2229,6 @@ static void reap_zombies(void)
 
 static int restore_root_task(struct pstree_item *init)
 {
-	enum trace_flags flag = TRACE_ALL;
 	int ret, fd, mnt_ns_fd = -1;
 	int root_seized = 0;
 	struct pstree_item *item;
@@ -2440,7 +2443,7 @@ skip_ns_bouncing:
 
 	timing_stop(TIME_RESTORE);
 
-	if (catch_tasks(root_seized, &flag)) {
+	if (catch_tasks(root_seized)) {
 		pr_err("Can't catch all tasks\n");
 		goto out_kill_network_unlocked;
 	}
@@ -2450,7 +2453,7 @@ skip_ns_bouncing:
 
 	__restore_switch_stage(CR_STATE_COMPLETE);
 
-	ret = compel_stop_on_syscall(task_entries->nr_threads, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1), flag);
+	ret = compel_stop_on_syscall(task_entries->nr_threads, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1));
 	if (ret) {
 		pr_err("Can't stop all tasks on rt_sigreturn\n");
 		goto out_kill_network_unlocked;

From 719fea2fc9d4df405bc708b34d1e53f6943375ec Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 7 Aug 2022 16:36:15 -0700
Subject: [PATCH 1118/1854] compel: clear a breakpoint right after it's been
 triggered

Breakpoints are used to stop as close as possible to a target system call.

First, we don't need it after this point.
Second, PTRACE_CONT can't pass through a breakpoint on arm64.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/infect.c | 15 +++++++++++----
 criu/cr-restore.c       | 21 ---------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 7d7865480..6413a1860 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1418,9 +1418,6 @@ static int parasite_fini_seized(struct parasite_ctl *ctl)
 	if (compel_stop_on_syscall(1, __NR(rt_sigreturn, 0), __NR(rt_sigreturn, 1)))
 		return -1;
 
-	if (ptrace_flush_breakpoints(pid))
-		return -1;
-
 	/*
 	 * All signals are unblocked now. The kernel notifies about leaving
 	 * syscall before starting to deliver signals. All parasite code are
@@ -1650,8 +1647,18 @@ int compel_stop_on_syscall(int tasks, const int sys_nr, const int sys_nr_compat)
 
 		pr_debug("%d was trapped\n", pid);
 
-		if ((WSTOPSIG(status) & PTRACE_SYSCALL_TRAP) == 0)
+		if ((WSTOPSIG(status) & PTRACE_SYSCALL_TRAP) == 0) {
+			/*
+			 * On some platforms such as ARM64, it is impossible to
+			 * pass through a breakpoint, so let's clear it right
+			 * after it has been triggered.
+			*/
+			if (ptrace_flush_breakpoints(pid)) {
+				pr_err("Unable to clear breakpoints\n");
+				return -1;
+			}
 			goto goon;
+		}
 		if (trace == TRACE_EXIT) {
 			trace = TRACE_ENTER;
 			pr_debug("`- Expecting exit\n");
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9a1b23999..9c480be78 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2071,24 +2071,6 @@ static int catch_tasks(bool root_seized)
 	return 0;
 }
 
-static int clear_breakpoints(void)
-{
-	struct pstree_item *item;
-	int ret = 0, i;
-
-	if (fault_injected(FI_NO_BREAKPOINTS))
-		return 0;
-
-	for_each_pstree_item(item) {
-		if (!task_alive(item))
-			continue;
-		for (i = 0; i < item->nr_threads; i++)
-			ret |= ptrace_flush_breakpoints(item->threads[i].real);
-	}
-
-	return ret;
-}
-
 static void finalize_restore(void)
 {
 	struct pstree_item *item;
@@ -2459,9 +2441,6 @@ skip_ns_bouncing:
 		goto out_kill_network_unlocked;
 	}
 
-	if (clear_breakpoints())
-		pr_err("Unable to flush breakpoints\n");
-
 	finalize_restore();
 	/*
 	 * Some external devices such as GPUs might need a very late

From b7953c6c7f020ea4a2f4221c5dd9c8314a96f733 Mon Sep 17 00:00:00 2001
From: "fu.lin" <fulin10@huawei.com>
Date: Fri, 15 Apr 2022 13:00:04 +0800
Subject: [PATCH 1119/1854] compel: switch breakpoint functions to non-inline
 at arm64 platform

Signed-off-by: fu.lin <fulin10@huawei.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .../aarch64/src/lib/include/uapi/asm/breakpoints.h    | 11 ++---------
 compel/arch/aarch64/src/lib/infect.c                  | 10 ++++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h b/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
index 5f090490d..796aec016 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
@@ -2,14 +2,7 @@
 #define __COMPEL_BREAKPOINTS_H__
 #define ARCH_SI_TRAP TRAP_BRKPT
 
-static inline int ptrace_set_breakpoint(pid_t pid, void *addr)
-{
-	return 0;
-}
-
-static inline int ptrace_flush_breakpoints(pid_t pid)
-{
-	return 0;
-}
+int ptrace_set_breakpoint(pid_t pid, void *addr);
+int ptrace_flush_breakpoints(pid_t pid);
 
 #endif
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index bd1ed0da3..316ff73e7 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -176,3 +176,13 @@ unsigned long compel_task_size(void)
 			break;
 	return task_size;
 }
+
+int ptrace_set_breakpoint(pid_t pid, void *addr)
+{
+	return 0;
+}
+
+int ptrace_flush_breakpoints(pid_t pid)
+{
+	return 0;
+}

From bb73e1cf5ae230c9448230c3e9e21ae2850c944a Mon Sep 17 00:00:00 2001
From: "fu.lin" <fulin10@huawei.com>
Date: Sun, 7 Aug 2022 16:52:39 -0700
Subject: [PATCH 1120/1854] breakpoint: implement hw breakpoint for arm64
 platform

The x86 implement hardware breakpoint to accelerate the tracing syscall
procedure instead of `ptrace(PTRACE_SYSCALL)`. The arm64 has the same
capability according to <<Learn the architecture: Armv8-A self-hosted
debug>>[[1]].

<<Arm Architecture Reference Manual for A-profile architecture>[[2]]
illustrates the usage detailly:
- D2.8 Breakpoint Instruction exceptions
- D2.9 Breakpoint exceptions
- D13.3.2 DBGBCR<n>_EL1, Debug Breakpoint Control Registers, n

Note:
[1]: https://developer.arm.com/documentation/102120/0100
[2]: https://developer.arm.com/documentation/ddi0487/latest

Signed-off-by: fu.lin <fulin10@huawei.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .../src/lib/include/uapi/asm/breakpoints.h    | 34 +++++++
 compel/arch/aarch64/src/lib/infect.c          | 91 ++++++++++++++++++-
 2 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h b/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
index 796aec016..8a61b268f 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/breakpoints.h
@@ -2,6 +2,40 @@
 #define __COMPEL_BREAKPOINTS_H__
 #define ARCH_SI_TRAP TRAP_BRKPT
 
+#include <sys/types.h>
+#include <stdbool.h>
+
+struct hwbp_cap {
+	char arch;
+	char bp_count;
+};
+
+/* copied from `linux/arch/arm64/include/asm/hw_breakpoint.h` */
+/* Lengths */
+#define ARM_BREAKPOINT_LEN_1 0x1
+#define ARM_BREAKPOINT_LEN_2 0x3
+#define ARM_BREAKPOINT_LEN_3 0x7
+#define ARM_BREAKPOINT_LEN_4 0xf
+#define ARM_BREAKPOINT_LEN_5 0x1f
+#define ARM_BREAKPOINT_LEN_6 0x3f
+#define ARM_BREAKPOINT_LEN_7 0x7f
+#define ARM_BREAKPOINT_LEN_8 0xff
+
+/* Privilege Levels */
+#define AARCH64_BREAKPOINT_EL1 1
+#define AARCH64_BREAKPOINT_EL0 2
+
+/* Breakpoint */
+#define ARM_BREAKPOINT_EXECUTE 0
+
+/* Watchpoints */
+#define ARM_BREAKPOINT_LOAD	1
+#define ARM_BREAKPOINT_STORE	2
+#define AARCH64_ESR_ACCESS_MASK (1 << 6)
+
+#define DISABLE_HBP 0
+#define ENABLE_HBP  1
+
 int ptrace_set_breakpoint(pid_t pid, void *addr);
 int ptrace_flush_breakpoints(pid_t pid);
 
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 316ff73e7..7b75da890 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -2,7 +2,9 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <asm/ptrace.h>
 #include <linux/elf.h>
+
 #include <compel/plugins/std/syscall-codes.h>
 #include "common/page.h"
 #include "uapi/compel/asm/infect-types.h"
@@ -10,6 +12,7 @@
 #include "errno.h"
 #include "infect.h"
 #include "infect-priv.h"
+#include "asm/breakpoints.h"
 
 unsigned __page_size = 0;
 unsigned __page_shift = 0;
@@ -177,12 +180,98 @@ unsigned long compel_task_size(void)
 	return task_size;
 }
 
+static struct hwbp_cap *ptrace_get_hwbp_cap(pid_t pid)
+{
+	static struct hwbp_cap info;
+	static int available = -1;
+
+	if (available == -1) {
+		unsigned int val;
+		struct iovec iovec = {
+			.iov_base = &val,
+			.iov_len = sizeof(val),
+		};
+
+		if (ptrace(PTRACE_GETREGSET, pid, NT_ARM_HW_BREAK, &iovec) < 0)
+			available = 0;
+		else {
+			info.arch = (char)((val >> 8) & 0xff);
+			info.bp_count = (char)(val & 0xff);
+
+			available = (info.arch != 0);
+		}
+	}
+
+	return available == 1 ? &info : NULL;
+}
+
 int ptrace_set_breakpoint(pid_t pid, void *addr)
 {
-	return 0;
+	struct hwbp_cap *info = ptrace_get_hwbp_cap(pid);
+	struct user_hwdebug_state regs = {};
+	unsigned int ctrl = 0;
+	struct iovec iovec;
+
+	if (info == NULL || info->bp_count == 0)
+		return 0;
+
+	/*
+	 * The struct is copied from `arch/arm64/include/asm/hw_breakpoint.h` in
+	 * linux kernel:
+	 *  struct arch_hw_breakpoint_ctrl {
+	 *  	__u32 __reserved        : 19,
+	 *  	len             : 8,
+	 *  	type            : 2,
+	 *  	privilege       : 2,
+	 *  	enabled         : 1;
+	 *  };
+	 *
+	 * The part of `struct arch_hw_breakpoint_ctrl` bits meaning is defined
+	 * in <<ARM Architecture Reference Manual for A-profile architecture>>,
+	 * D13.3.2 DBGBCR<n>_EL1, Debug Breakpoint Control Registers.
+	 */
+	ctrl = ARM_BREAKPOINT_LEN_4;
+	ctrl = (ctrl << 2) | ARM_BREAKPOINT_EXECUTE;
+	ctrl = (ctrl << 2) | AARCH64_BREAKPOINT_EL0;
+	ctrl = (ctrl << 1) | ENABLE_HBP;
+	regs.dbg_regs[0].addr = (__u64)addr;
+	regs.dbg_regs[0].ctrl = ctrl;
+	iovec.iov_base = &regs;
+	iovec.iov_len = (offsetof(struct user_hwdebug_state, dbg_regs) + sizeof(regs.dbg_regs[0]));
+
+	if (ptrace(PTRACE_SETREGSET, pid, NT_ARM_HW_BREAK, &iovec))
+		return -1;
+
+	if (ptrace(PTRACE_CONT, pid, NULL, NULL) != 0) {
+		pr_perror("Unable to restart the  stopped tracee process %d", pid);
+		return -1;
+	}
+
+	return 1;
 }
 
 int ptrace_flush_breakpoints(pid_t pid)
 {
+	struct hwbp_cap *info = ptrace_get_hwbp_cap(pid);
+	struct user_hwdebug_state regs = {};
+	unsigned int ctrl = 0;
+	struct iovec iovec;
+
+	if (info == NULL || info->bp_count == 0)
+		return 0;
+
+	ctrl = ARM_BREAKPOINT_LEN_4;
+	ctrl = (ctrl << 2) | ARM_BREAKPOINT_EXECUTE;
+	ctrl = (ctrl << 2) | AARCH64_BREAKPOINT_EL0;
+	ctrl = (ctrl << 1) | DISABLE_HBP;
+	regs.dbg_regs[0].addr = 0ul;
+	regs.dbg_regs[0].ctrl = ctrl;
+
+	iovec.iov_base = &regs;
+	iovec.iov_len = (offsetof(struct user_hwdebug_state, dbg_regs) + sizeof(regs.dbg_regs[0]));
+
+	if (ptrace(PTRACE_SETREGSET, pid, NT_ARM_HW_BREAK, &iovec))
+		return -1;
+
 	return 0;
 }

From dfe9d006add46d0cda5baaf32f12796b7faed528 Mon Sep 17 00:00:00 2001
From: "fu.lin" <fulin10@huawei.com>
Date: Tue, 9 Aug 2022 12:18:00 -0700
Subject: [PATCH 1121/1854] breakpoint: enable breakpoints by default on amd64
 and arm64

Signed-off-by: fu.lin <fulin10@huawei.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/arch/aarch64/src/lib/infect.c | 12 ++++++++++++
 compel/arch/x86/src/lib/infect.c     | 11 +++++++++++
 criu/include/fault-injection.h       |  8 --------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 7b75da890..d0189f003 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -207,6 +207,7 @@ static struct hwbp_cap *ptrace_get_hwbp_cap(pid_t pid)
 
 int ptrace_set_breakpoint(pid_t pid, void *addr)
 {
+	k_rtsigset_t block;
 	struct hwbp_cap *info = ptrace_get_hwbp_cap(pid);
 	struct user_hwdebug_state regs = {};
 	unsigned int ctrl = 0;
@@ -242,6 +243,17 @@ int ptrace_set_breakpoint(pid_t pid, void *addr)
 	if (ptrace(PTRACE_SETREGSET, pid, NT_ARM_HW_BREAK, &iovec))
 		return -1;
 
+	/*
+	 * FIXME(issues/1429): SIGTRAP can't be blocked, otherwise its handler
+	 * will be reset to the default one.
+	 */
+	ksigfillset(&block);
+	ksigdelset(&block, SIGTRAP);
+	if (ptrace(PTRACE_SETSIGMASK, pid, sizeof(k_rtsigset_t), &block)) {
+		pr_perror("Can't block signals for %d", pid);
+		return -1;
+	}
+
 	if (ptrace(PTRACE_CONT, pid, NULL, NULL) != 0) {
 		pr_perror("Unable to restart the  stopped tracee process %d", pid);
 		return -1;
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index c0e7a544a..01959b95b 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -588,6 +588,7 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
 
 int ptrace_set_breakpoint(pid_t pid, void *addr)
 {
+	k_rtsigset_t block;
 	int ret;
 
 	/* Set a breakpoint */
@@ -603,6 +604,16 @@ int ptrace_set_breakpoint(pid_t pid, void *addr)
 		return -1;
 	}
 
+	/*
+	 * FIXME(issues/1429): SIGTRAP can't be blocked, otherwise its handler
+	 * will be reset to the default one.
+	 */
+	ksigfillset(&block);
+	ksigdelset(&block, SIGTRAP);
+	if (ptrace(PTRACE_SETSIGMASK, pid, sizeof(k_rtsigset_t), &block)) {
+		pr_perror("Can't block signals for %d", pid);
+		return -1;
+	}
 	ret = ptrace(PTRACE_CONT, pid, NULL, NULL);
 	if (ret) {
 		pr_perror("Unable to restart the  stopped tracee process %d", pid);
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index f33918de8..69d670be9 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -24,14 +24,6 @@ enum faults {
 
 static inline bool __fault_injected(enum faults f, enum faults fi_strategy)
 {
-	/*
-	 * Temporary workaround for Xen guests. Breakpoints degrade
-	 * performance linearly, so until we find out the reason,
-	 * let's disable them.
-	 */
-	if (f == FI_NO_BREAKPOINTS)
-		return true;
-
 	return fi_strategy == f;
 }
 

From dca55d281a483bcdf6e156c4b7cdf73e14067b77 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Wed, 6 Apr 2022 18:35:26 +0200
Subject: [PATCH 1122/1854] criu: fail migration if data was sent to an
 in-flight socket

Before this change, CRIU would just lose that data upon migration. So
it's better to fail migration in this case.

To reproduce the bug one can:
1. Create an AF_UNIX socket and call listen on it.
2. Create a second AF_UNIX socket and call connect to the first one.
3. Send the data to the second socket.
4. Migrate.
5. Call accept on the first socket and then read. There would be no data
   available.

It should be even possible to close the second socket before migration.
This would cause accept to hang because CRIU totally misses a closed
in-flight socket.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/sk-unix.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 47e1b2962..873360bfa 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -497,9 +497,34 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 			goto err;
 		}
 
+		if (sk->wqlen != 0) {
+			/*
+			 * There's no known way to get data out of the write
+			 * queue of an icon socket. The only good solution for
+			 * now is to fail the migration.
+			 */
+			pr_err("Non-empty write queue on an in-flight socket %#x\n", ue->ino);
+			goto err;
+		}
+
 		ue->peer = e->sk_desc->sd.ino;
 
 		pr_debug("\t\tFixed inflight socket %u peer %u)\n", ue->ino, ue->peer);
+	} else if (ue->state == TCP_LISTEN) {
+		int i;
+
+		for (i = 0; i < sk->nr_icons; i++)
+			if (sk->icons[i] == 0) {
+				/*
+				 * Inode of an icon socket equal to 0 means
+				 * it's already been closed. That means we have
+				 * no simple way to check if it sent any data.
+				 * The only good solution for now is to fail
+				 * the migration.
+				 */
+				pr_err("Found a closed in-flight socket to %#x\n", ue->ino);
+				goto err;
+			}
 	}
 dump:
 	if (dump_socket_opts(lfd, skopts))

From 83c606e023594f75d271091de1cfb49ceaa6baee Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 15 Apr 2022 15:46:34 -0700
Subject: [PATCH 1123/1854] zdtm: return 1 from pr_err, pr_perror, fail

This allows to make test code more compact:
if (ret == -1) {
	pr_perror("XXX");
	return 1;
}
vs
if (ret == -1)
	return pr_perror("XXX");

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/lib/zdtmtst.h | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index ed7c23ee2..d91886d25 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -126,11 +126,25 @@ extern int write_pidfile(int pid);
 /* message helpers */
 extern int test_log_init(const char *outfile, const char *suffix);
 extern int zdtm_seccomp;
-#define pr_err(format, arg...) test_msg("ERR: %s:%d: " format, __FILE__, __LINE__, ##arg)
-#define pr_perror(format, arg...) \
-	test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
-#define fail(format, arg...) \
-	test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
+#define pr_err(format, arg...)                                              \
+	({                                                                  \
+		test_msg("ERR: %s:%d: " format, __FILE__, __LINE__, ##arg); \
+		1;                                                          \
+	})
+
+#define pr_perror(format, arg...)                                                                        \
+	({                                                                                               \
+		test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, \
+			 strerror(errno));                                                               \
+		1;                                                                                       \
+	})
+
+#define fail(format, arg...)                                                                              \
+	({                                                                                                \
+		test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, \
+			 strerror(errno));                                                                \
+		1;                                                                                        \
+	})
 #define skip(format, arg...) test_msg("SKIP: %s:%d: " format "\n", __FILE__, __LINE__, ##arg)
 #define pass()		     test_msg("PASS\n")
 

From aeaff64452c1b30c419e782b286be7467ceea45e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 15 Apr 2022 15:41:25 -0700
Subject: [PATCH 1124/1854] test/unix: check C/R of unix listen queues

Check that CRIU handles non-empty listen queues properly.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
[mclapinski@google.com: update test_doc and test_author]
Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 test/zdtm/static/Makefile              |   8 ++
 test/zdtm/static/sk-unix-listen01.c    | 117 +++++++++++++++++++++++++
 test/zdtm/static/sk-unix-listen02.c    |   1 +
 test/zdtm/static/sk-unix-listen02.desc |   1 +
 test/zdtm/static/sk-unix-listen03.c    |   1 +
 test/zdtm/static/sk-unix-listen03.desc |   1 +
 test/zdtm/static/sk-unix-listen04.c    |   1 +
 test/zdtm/static/sk-unix-listen04.desc |   1 +
 8 files changed, 131 insertions(+)
 create mode 100644 test/zdtm/static/sk-unix-listen01.c
 create mode 120000 test/zdtm/static/sk-unix-listen02.c
 create mode 100644 test/zdtm/static/sk-unix-listen02.desc
 create mode 120000 test/zdtm/static/sk-unix-listen03.c
 create mode 100644 test/zdtm/static/sk-unix-listen03.desc
 create mode 120000 test/zdtm/static/sk-unix-listen04.c
 create mode 100644 test/zdtm/static/sk-unix-listen04.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index b28345400..0ac22731b 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -352,6 +352,10 @@ TST_FILE	=				\
 		socket_close_data01		\
 		fifo_upon_unix_socket00		\
 		fifo_upon_unix_socket01		\
+		sk-unix-listen01		\
+		sk-unix-listen02		\
+		sk-unix-listen03		\
+		sk-unix-listen04		\
 
 TST_DIR		=				\
 		cwd00				\
@@ -670,6 +674,10 @@ bpf_array:		LDLIBS += -lbpf
 
 fifo_upon_unix_socket01:	CFLAGS += -DFIFO_UPON_UNIX01
 
+sk-unix-listen02: CFLAGS += -DSK_UNIX_LISTEN02
+sk-unix-listen03: CFLAGS += -DSK_UNIX_LISTEN03
+sk-unix-listen04: CFLAGS += -DSK_UNIX_LISTEN02 -DSK_UNIX_LISTEN03
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/sk-unix-listen01.c b/test/zdtm/static/sk-unix-listen01.c
new file mode 100644
index 000000000..5c9274acb
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen01.c
@@ -0,0 +1,117 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include <limits.h>
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Test in-flight unix sockets with data in them\n";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
+
+#define SK_DATA "packet"
+
+char *filename;
+TEST_OPTION(filename, string, "socket file name", 1);
+
+#define TEST_MODE 0640
+
+#ifdef ZDTM_UNIX_SEQPACKET
+#define SOCK_TYPE SOCK_SEQPACKET
+#else
+#define SOCK_TYPE SOCK_STREAM
+#endif
+
+int main(int argc, char *argv[])
+{
+	struct sockaddr_un addr;
+	unsigned int addrlen;
+	int ssk, sk;
+
+	char path[PATH_MAX];
+	char *cwd;
+	int ret;
+
+	test_init(argc, argv);
+
+	cwd = get_current_dir_name();
+	if (!cwd)
+		return pr_perror("get_current_dir_name");
+
+	snprintf(path, sizeof(path), "%s/%s", cwd, filename);
+	unlink(path);
+
+	addr.sun_family = AF_UNIX;
+	addrlen = strlen(filename);
+	if (addrlen > sizeof(addr.sun_path))
+		return pr_err("address is too long");
+	memcpy(addr.sun_path, filename, addrlen);
+	addrlen += sizeof(addr.sun_family);
+
+	ssk = socket(AF_UNIX, SOCK_TYPE, 0);
+	if (ssk == -1)
+		return pr_perror("socket");
+
+	sk = socket(AF_UNIX, SOCK_TYPE, 0);
+	if (sk < 0)
+		return pr_perror("socket");
+
+	ret = bind(ssk, (struct sockaddr *)&addr, addrlen);
+	if (ret)
+		return pr_perror("bind");
+
+	ret = listen(ssk, 16);
+	if (ret)
+		return pr_perror("listen");
+
+	if (connect(sk, (struct sockaddr *)&addr, addrlen))
+		return pr_perror("connect");
+
+#ifdef SK_UNIX_LISTEN02
+	{
+		char buf[64];
+		memset(buf, 0, sizeof(buf));
+		write(sk, SK_DATA, sizeof(SK_DATA));
+	}
+#endif
+
+#ifdef SK_UNIX_LISTEN03
+	close(sk);
+	sk = -1;
+#endif
+
+	test_daemon();
+	test_waitsig();
+
+	if (sk != -1)
+		close(sk);
+
+	ret = accept(ssk, NULL, NULL);
+	if (ret < 0)
+		return fail("accept");
+
+#ifdef SK_UNIX_LISTEN02
+	{
+		char buf[64];
+		if (read(ret, &buf, sizeof(buf)) != sizeof(SK_DATA))
+			return pr_perror("read");
+
+		if (strcmp(buf, SK_DATA))
+			return fail("data corrupted");
+	}
+#endif
+
+	close(ssk);
+	unlink(path);
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/sk-unix-listen02.c b/test/zdtm/static/sk-unix-listen02.c
new file mode 120000
index 000000000..1211f4666
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen02.c
@@ -0,0 +1 @@
+sk-unix-listen01.c
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix-listen02.desc b/test/zdtm/static/sk-unix-listen02.desc
new file mode 100644
index 000000000..ded89879a
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen02.desc
@@ -0,0 +1 @@
+{'flags': 'crfail'}
diff --git a/test/zdtm/static/sk-unix-listen03.c b/test/zdtm/static/sk-unix-listen03.c
new file mode 120000
index 000000000..1211f4666
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen03.c
@@ -0,0 +1 @@
+sk-unix-listen01.c
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix-listen03.desc b/test/zdtm/static/sk-unix-listen03.desc
new file mode 100644
index 000000000..ded89879a
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen03.desc
@@ -0,0 +1 @@
+{'flags': 'crfail'}
diff --git a/test/zdtm/static/sk-unix-listen04.c b/test/zdtm/static/sk-unix-listen04.c
new file mode 120000
index 000000000..1211f4666
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen04.c
@@ -0,0 +1 @@
+sk-unix-listen01.c
\ No newline at end of file
diff --git a/test/zdtm/static/sk-unix-listen04.desc b/test/zdtm/static/sk-unix-listen04.desc
new file mode 100644
index 000000000..ded89879a
--- /dev/null
+++ b/test/zdtm/static/sk-unix-listen04.desc
@@ -0,0 +1 @@
+{'flags': 'crfail'}

From f78d3d821c07b91a0fdc1e371bbc36eafb56e003 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Wed, 24 Aug 2022 20:07:25 -0700
Subject: [PATCH 1125/1854] gitignore: Ignore top-evel build dir only

The entry "build/" will ignore any directory named "build" at any level
of the source tree, including our scripts/build directory. We only want
to ignore the top-level build directory created by `make install`.

As the git manpage suggests, entries with slashes at the start or in the
middle will only match at the same level as the .gitignore, hence use
build/** instead.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d5135f5f8..23894d631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,4 +42,4 @@ lib/.crit-setup.files
 compel/include/asm
 include/common/asm
 include/common/config.h
-build/
+build/**

From 39b3de60b615404c47594f5e42eacb2e31405f3f Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Wed, 24 Aug 2022 19:48:52 -0700
Subject: [PATCH 1126/1854] ci: Rename openj9 Dockerfiles to hotspot

We used to pull AdoptOpenJDK's OpenJ9 builds but switched to
Eclipse Temurin, which uses the HotSpot VM instead of OpenJ9.
Rename the corresponding Dockerfiles to hotspot.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 .../{Dockerfile.openj9-alpine => Dockerfile.hotspot-alpine}  | 5 +----
 .../{Dockerfile.openj9-ubuntu => Dockerfile.hotspot-ubuntu}  | 0
 2 files changed, 1 insertion(+), 4 deletions(-)
 rename scripts/build/{Dockerfile.openj9-alpine => Dockerfile.hotspot-alpine} (69%)
 rename scripts/build/{Dockerfile.openj9-ubuntu => Dockerfile.hotspot-ubuntu} (100%)

diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.hotspot-alpine
similarity index 69%
rename from scripts/build/Dockerfile.openj9-alpine
rename to scripts/build/Dockerfile.hotspot-alpine
index f92011283..d6e6e5130 100644
--- a/scripts/build/Dockerfile.openj9-alpine
+++ b/scripts/build/Dockerfile.hotspot-alpine
@@ -1,6 +1,4 @@
-# FIXME: Replace with eclipse-temurin once Alpine support has been added.
-# https://github.com/adoptium/containers/pull/60
-FROM adoptopenjdk/openjdk8-openj9:alpine
+FROM docker.io/library/eclipse-temurin:8-alpine
 ARG CC=gcc
 
 RUN apk update && apk add \
@@ -29,4 +27,3 @@ WORKDIR /criu
 RUN make mrproper && make -j $(nproc) CC="$CC"
 
 ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
-
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu
similarity index 100%
rename from scripts/build/Dockerfile.openj9-ubuntu
rename to scripts/build/Dockerfile.hotspot-ubuntu

From 0178f2f990e899f5e2a13447554193017cee988b Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Wed, 24 Aug 2022 20:09:50 -0700
Subject: [PATCH 1127/1854] ci: Add Dockerfile for openj9 on Ubuntu

Semeru builds (which use OpenJ9 instead of HotSpot) are the successors
of AdoptOpenJDK's OpenJ9 builds.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 scripts/build/Dockerfile.openj9-ubuntu | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 scripts/build/Dockerfile.openj9-ubuntu

diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
new file mode 100644
index 000000000..2e35358ff
--- /dev/null
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -0,0 +1,33 @@
+FROM docker.io/library/ibm-semeru-runtimes:open-8-jdk-focal
+ARG CC=gcc
+
+COPY scripts/ci/apt-install /bin/apt-install
+
+RUN apt-install protobuf-c-compiler \
+	libprotobuf-c-dev \
+	libaio-dev \
+	python3-future \
+	libprotobuf-dev \
+	protobuf-compiler \
+	libcap-dev \
+	libnl-3-dev \
+	gdb \
+	bash \
+	python3-protobuf \
+	python3-yaml \
+	libnet-dev \
+	libnl-route-3-dev \
+	libbsd-dev \
+	make \
+	git \
+	pkg-config \
+	iptables \
+	gcc \
+	maven
+
+COPY . /criu
+WORKDIR /criu
+
+RUN make mrproper && make -j $(nproc) CC="$CC"
+
+ENTRYPOINT mvn -q -f test/javaTests/pom.xml test

From 7bc24688d6759ff1b22b8629e4edfe0c6a32b16b Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Wed, 24 Aug 2022 21:17:06 -0700
Subject: [PATCH 1128/1854] ci: Clean up and improve Java testing

This patch changes top-level OpenJ9 filename and data references to Java
to make them generic and launches tests against both HotSpot and OpenJ9
JVMs.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 .../{openj9-test.yml => java-test.yml}        |  6 ++---
 scripts/ci/Makefile                           |  4 +--
 scripts/ci/java-test.sh                       | 25 +++++++++++++++++++
 scripts/ci/openj9-test.sh                     | 20 ---------------
 4 files changed, 30 insertions(+), 25 deletions(-)
 rename .github/workflows/{openj9-test.yml => java-test.yml} (54%)
 create mode 100755 scripts/ci/java-test.sh
 delete mode 100755 scripts/ci/openj9-test.sh

diff --git a/.github/workflows/openj9-test.yml b/.github/workflows/java-test.yml
similarity index 54%
rename from .github/workflows/openj9-test.yml
rename to .github/workflows/java-test.yml
index 1d7a1eb6b..211953495 100644
--- a/.github/workflows/openj9-test.yml
+++ b/.github/workflows/java-test.yml
@@ -1,4 +1,4 @@
-name: OpenJ9 Test
+name: Java Test
 
 on: [push, pull_request]
 
@@ -7,5 +7,5 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-    - name: Run OpenJ9 Test
-      run: sudo make -C scripts/ci openj9-test
+    - name: Run Java Test
+      run: sudo make -C scripts/ci java-test
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 120f561e4..3a1634fb8 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -85,8 +85,8 @@ podman-test:
 # overlayfs behaves differently on Ubuntu and breaks CRIU
 # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
 # Switch to devicemapper
-openj9-test: restart-docker
-	./openj9-test.sh
+java-test: restart-docker
+	./java-test.sh
 
 setup-vagrant:
 	./vagrant.sh setup
diff --git a/scripts/ci/java-test.sh b/scripts/ci/java-test.sh
new file mode 100755
index 000000000..7cf704f07
--- /dev/null
+++ b/scripts/ci/java-test.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+cd ../.. || exit 1
+
+failures=""
+
+docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
+if ! docker run --rm --privileged criu-openj9-ubuntu-test:latest; then
+	failures="$failures openj9-ubuntu"
+fi
+
+docker build -t criu-hotspot-alpine-test:latest -f scripts/build/Dockerfile.hotspot-alpine .
+if ! docker run --rm --privileged criu-hotspot-alpine-test:latest; then
+	failures="$failures hotspot-alpine"
+fi
+
+docker build -t criu-hotspot-ubuntu-test:latest -f scripts/build/Dockerfile.hotspot-ubuntu .
+if ! docker run --rm --privileged criu-hotspot-ubuntu-test:latest; then
+	failures="$failures hotspot-ubuntu"
+fi
+
+if [ -n "$failures" ]; then
+	echo "Tests failed on $failures"
+	exit 1
+fi
diff --git a/scripts/ci/openj9-test.sh b/scripts/ci/openj9-test.sh
deleted file mode 100755
index b8c07f180..000000000
--- a/scripts/ci/openj9-test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-cd ../.. || exit 1
-
-failures=""
-
-docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
-if ! docker run --rm --privileged criu-openj9-ubuntu-test:latest; then
-	failures="$failures ubuntu"
-fi
-
-docker build -t criu-openj9-alpine-test:latest -f scripts/build/Dockerfile.openj9-alpine .
-if ! docker run --rm --privileged criu-openj9-alpine-test:latest; then
-	failures="$failures alpine"
-fi
-
-if [ -n "$failures" ]; then
-	echo "Tests failed on $failures"
-	exit 1
-fi

From 40e1aaf5639d0e4b970914d0b435e908b070450a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 24 Aug 2022 21:20:30 +0200
Subject: [PATCH 1129/1854] mount: add definition for FSOPEN_CLOEXEC

A recent change in glibc introduced `enum fsconfig_command` [1] and as a
result the compilation of criu fails with the following errors

In file included from criu/pie/util.c:3:
/usr/include/sys/mount.h:240:6: error: redeclaration of 'enum fsconfig_command'
  240 | enum fsconfig_command
      |      ^~~~~~~~~~~~~~~~
In file included from /usr/include/sys/mount.h:32:
criu/include/linux/mount.h:11:6: note: originally defined here
   11 | enum fsconfig_command {
      |      ^~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:242:3: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG'
  242 |   FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
      |   ^~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:12:9: note: previous definition of 'FSCONFIG_SET_FLAG' with type 'enum fsconfig_command'
   12 |         FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
      |         ^~~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:244:3: error: redeclaration of enumerator 'FSCONFIG_SET_STRING'
  244 |   FSCONFIG_SET_STRING     = 1,    /* Set parameter, supplying a string value */
      |   ^~~~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:14:9: note: previous definition of 'FSCONFIG_SET_STRING' with type 'enum fsconfig_command'
   14 |         FSCONFIG_SET_STRING = 1, /* Set parameter, supplying a string value */
      |         ^~~~~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:246:3: error: redeclaration of enumerator 'FSCONFIG_SET_BINARY'
  246 |   FSCONFIG_SET_BINARY     = 2,    /* Set parameter, supplying a binary blob value */
      |   ^~~~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:16:9: note: previous definition of 'FSCONFIG_SET_BINARY' with type 'enum fsconfig_command'
   16 |         FSCONFIG_SET_BINARY = 2, /* Set parameter, supplying a binary blob value */
      |         ^~~~~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:248:3: error: redeclaration of enumerator 'FSCONFIG_SET_PATH'
  248 |   FSCONFIG_SET_PATH       = 3,    /* Set parameter, supplying an object by path */
      |   ^~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:18:9: note: previous definition of 'FSCONFIG_SET_PATH' with type 'enum fsconfig_command'
   18 |         FSCONFIG_SET_PATH = 3, /* Set parameter, supplying an object by path */
      |         ^~~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:250:3: error: redeclaration of enumerator 'FSCONFIG_SET_PATH_EMPTY'
  250 |   FSCONFIG_SET_PATH_EMPTY = 4,    /* Set parameter, supplying an object by (empty) path */
      |   ^~~~~~~~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:20:9: note: previous definition of 'FSCONFIG_SET_PATH_EMPTY' with type 'enum fsconfig_command'
   20 |         FSCONFIG_SET_PATH_EMPTY = 4, /* Set parameter, supplying an object by (empty) path */
      |         ^~~~~~~~~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:252:3: error: redeclaration of enumerator 'FSCONFIG_SET_FD'
  252 |   FSCONFIG_SET_FD         = 5,    /* Set parameter, supplying an object by fd */
      |   ^~~~~~~~~~~~~~~
criu/include/linux/mount.h:22:9: note: previous definition of 'FSCONFIG_SET_FD' with type 'enum fsconfig_command'
   22 |         FSCONFIG_SET_FD = 5, /* Set parameter, supplying an object by fd */
      |         ^~~~~~~~~~~~~~~
/usr/include/sys/mount.h:254:3: error: redeclaration of enumerator 'FSCONFIG_CMD_CREATE'
  254 |   FSCONFIG_CMD_CREATE     = 6,    /* Invoke superblock creation */
      |   ^~~~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:24:9: note: previous definition of 'FSCONFIG_CMD_CREATE' with type 'enum fsconfig_command'
   24 |         FSCONFIG_CMD_CREATE = 6, /* Invoke superblock creation */
      |         ^~~~~~~~~~~~~~~~~~~
/usr/include/sys/mount.h:256:3: error: redeclaration of enumerator 'FSCONFIG_CMD_RECONFIGURE'
  256 |   FSCONFIG_CMD_RECONFIGURE = 7,   /* Invoke superblock reconfiguration */
      |   ^~~~~~~~~~~~~~~~~~~~~~~~
criu/include/linux/mount.h:26:9: note: previous definition of 'FSCONFIG_CMD_RECONFIGURE' with type 'enum fsconfig_command'
   26 |         FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */

This patch adds definition for FSOPEN_CLOEXEC to solve this problem. In particular,
sys/mount.h includes ifndef check for FSOPEN_CLOEXEC surrounding `enum fsconfig_command`.

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=7eae6a91e9b1670330c9f15730082c91c0b1d570

Reported-by: Younes Manton (@ymanton)
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/include/linux/mount.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/criu/include/linux/mount.h b/criu/include/linux/mount.h
index 0d55a588c..fefafa89e 100644
--- a/criu/include/linux/mount.h
+++ b/criu/include/linux/mount.h
@@ -6,7 +6,7 @@
 
 /* Copied from /usr/include/sys/mount.h */
 
-#ifndef FSCONFIG_CMD_CREATE
+#ifndef FSOPEN_CLOEXEC
 /* The type of fsconfig call made.   */
 enum fsconfig_command {
 	FSCONFIG_SET_FLAG = 0, /* Set parameter, supplying no value */
@@ -26,7 +26,13 @@ enum fsconfig_command {
 	FSCONFIG_CMD_RECONFIGURE = 7, /* Invoke superblock reconfiguration */
 #define FSCONFIG_CMD_RECONFIGURE FSCONFIG_CMD_RECONFIGURE
 };
-#endif // FSCONFIG_CMD_CREATE
+
+#endif // FSOPEN_CLOEXEC
+
+/* fsopen flags. With the redundant definition, we check if the kernel,
+ * glibc value and our value still match.
+ */
+#define FSOPEN_CLOEXEC 0x00000001
 
 #ifndef MS_MGC_VAL
 /* Magic mount flag number. Has to be or-ed to the flag values.  */

From 9e91e62a7c16348793b7d402eae749a72e1f541e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 22 Jun 2022 12:12:07 +0300
Subject: [PATCH 1130/1854] criu-ns: capture controlling tty

When we are restoring in new pidns we specifically do setsid() from
criu-ns init so that sids of restored tasks are non-zero in this pidns
and on next dump CRIU would not have problems with zero sids, see [1].

But after this CRIU tries to inherit and setup a tty for the restored
process, and it fails to set it's process group via TIOCSPGRP to be a
foreground group for it's tty, because tty already is a controlling tty
for other session (which we had before setsid).

So to make it restore we need to reset tty to be a controlling tty of
criu-ns init via TIOCSCTTY before calling criu.

Else when restoring first time via criu-ns (from criu-ns dump) we get:

Error (criu/tty.c:689): tty: Failed to set group 40816 on 0: Inappropriate ioctl for device

https://github.com/checkpoint-restore/criu/issues/232 [1]

v2: add why and what comment in code, set controlling tty only for
--shell-job and fail if stdin is not a tty.

Fixes: #1893
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 scripts/criu-ns | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 1217c3dcd..d51e7772c 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -4,6 +4,8 @@ import ctypes.util
 import errno
 import sys
 import os
+import fcntl
+import termios
 
 # <sched.h> constants for unshare
 CLONE_NEWNS = 0x00020000
@@ -124,6 +126,16 @@ def wrap_restore():
     criu_pid = os.fork()
     if criu_pid == 0:
         os.setsid()
+        # Set stdin tty to be a controlling tty of our new session, this is
+        # required by --shell-job option, as for it CRIU would try to set a
+        # process group of restored root task to be a foreground group on the
+        # terminal.
+        if '--shell-job' in restore_args or '-j' in restore_args:
+            if os.isatty(sys.stdin.fileno()):
+                fcntl.ioctl(sys.stdin.fileno(), termios.TIOCSCTTY, 1)
+            else:
+                raise OSError(errno.EINVAL, 'The stdin is not a tty for a --shell-job')
+
         _mount_new_proc()
         run_criu(restore_args)
 

From 2039d73200b661432b33a8ec49c82ad2b6532cc0 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 22 Jun 2022 13:09:20 +0300
Subject: [PATCH 1131/1854] files-reg: skip failed mount lookup for shell-job's
 tty

When we restore a shell-job we would inherit tty-s, so even if we don't
have a right mount for it in container on dump, on restore it should
just be right.

Else when dumping second time via criu-ns we get:

(00.005678) Error (criu/files-reg.c:1710): Can't lookup mount=29 for fd=0 path=/dev/pts/20

Fixes: #1893
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/files-reg.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index c3761b5ed..2e3d57c5e 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -14,6 +14,8 @@
 #include <sys/mount.h>
 #include <elf.h>
 
+#include "tty.h"
+
 #ifndef SEEK_DATA
 #define SEEK_DATA 3
 #define SEEK_HOLE 4
@@ -1689,6 +1691,7 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 	int ret;
 	FileEntry fe = FILE_ENTRY__INIT;
 	RegFileEntry rfe = REG_FILE_ENTRY__INIT;
+	bool skip_for_shell_job = false;
 
 	if (!p->link) {
 		if (fill_fdlink(lfd, p, &_link))
@@ -1708,11 +1711,15 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 
 	mi = lookup_mnt_id(p->mnt_id);
 	if (mi == NULL) {
-		pr_err("Can't lookup mount=%d for fd=%d path=%s\n", p->mnt_id, p->fd, link->name + 1);
-		return -1;
+		if (opts.shell_job && is_tty(p->stat.st_rdev, p->stat.st_dev)) {
+			skip_for_shell_job = true;
+		} else {
+			pr_err("Can't lookup mount=%d for fd=%d path=%s\n", p->mnt_id, p->fd, link->name + 1);
+			return -1;
+		}
 	}
 
-	if (mnt_is_overmounted(mi)) {
+	if (!skip_for_shell_job && mnt_is_overmounted(mi)) {
 		pr_err("Open files on overmounted mounts are not supported yet\n");
 		return -1;
 	}
@@ -1732,7 +1739,7 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 		return -1;
 	}
 
-	if (check_path_remap(link, p, lfd, id, mi->nsid))
+	if (!skip_for_shell_job && check_path_remap(link, p, lfd, id, mi->nsid))
 		return -1;
 	rfe.name = &link->name[1];
 ext:

From 86ac0f05ea271a7943a69ad081b291bfa033454e Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 18:09:49 -0700
Subject: [PATCH 1132/1854] ci/gha/lint: install a recent shellcheck

Instead of using shellcheck v0.7.2 from fedora repo,
let's install the latest version (v0.8.0).

This allows to remove some "shellcheck disable=..." annotations,
and (I hope) better checking quality overall.

While at it, remove findutils from dnf install as this package is
already installed.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .github/workflows/lint.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d32403d05..3d42f3dcf 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,18 @@ jobs:
       image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
-      run: sudo dnf -y install git make python3-flake8 ShellCheck clang-tools-extra which findutils codespell git-clang-format
+      run: sudo dnf -y install git make python3-flake8 xz clang-tools-extra which codespell git-clang-format
+
+    # TODO: remove this and use ShellCheck from repo once F37 with ShellCheck 0.8.0 is out.
+    - name: install shellcheck
+      env:
+        VERSION: v0.8.0
+        BASEURL: https://github.com/koalaman/shellcheck/releases/download
+        SHA256: f4bce23c11c3919c1b20bcb0f206f6b44c44e26f2bc95f8aa708716095fa0651
+      run: |
+        curl -sSfL --retry 5 $BASEURL/$VERSION/shellcheck-$VERSION.linux.x86_64.tar.xz |
+          tar xfJ - -C /usr/local/bin --strip 1 shellcheck-$VERSION/shellcheck
+        sha256sum --strict --check - <<<"$SHA256 /usr/local/bin/shellcheck"
 
     - uses: actions/checkout@v2
 

From 968eec0d591e5a7a00078c4ce5ac1c73e29cc68a Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 16:06:18 -0700
Subject: [PATCH 1133/1854] scripts/ci/apt-install: fix (not ignore) shellcheck
 warning

It is ok to quote $@, as it expands to "$1" "$2" ...

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 scripts/ci/apt-install | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/ci/apt-install b/scripts/ci/apt-install
index 5a790901a..45aca13f4 100755
--- a/scripts/ci/apt-install
+++ b/scripts/ci/apt-install
@@ -15,8 +15,7 @@ while true; do
 	if [ "${install_retry_counter}" -gt "${max_apt_retries}" ]; then
 		exit 1
 	fi
-	# shellcheck disable=SC2068
-	apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-install-recommends $@ && break
+	apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-install-recommends "$@" && break
 
 	# In case it is a network error let's wait a bit.
 	echo "Retrying attempt ${install_retry_counter}"

From 9d2948b239263b995e61fe56a1f4294b5015115d Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 16:07:56 -0700
Subject: [PATCH 1134/1854] scripts/ci/asan.sh: fix, not ignore, shellcheck
 warning

We can use globstar bash feature instead of find in this case.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 scripts/ci/asan.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/asan.sh b/scripts/ci/asan.sh
index 8113b9b19..deeeca0b9 100755
--- a/scripts/ci/asan.sh
+++ b/scripts/ci/asan.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# shellcheck disable=2044
-
 set -x
 
 cat /proc/self/mountinfo
@@ -13,7 +11,8 @@ chmod 0777 test/zdtm/static
 ./test/zdtm.py run -a --keep-going -k always --parallel 4 -x zdtm/static/rtc "$@"
 ret=$?
 
-for i in $(find / -name 'asan.log*'); do
+shopt -s globstar nullglob
+for i in /**/asan.log*; do
 	echo "$i"
 	echo ========================================
 	cat "$i"

From b1fb9f2f0b992b777e8aeb69638bfcc99e1670e9 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 16:40:31 -0700
Subject: [PATCH 1135/1854] Fix, not ignore, shellcheck SC1091 warnings

This is easy to fix (but we have to specify -x).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Makefile                          | 8 ++++----
 scripts/ci/docker-test.sh         | 3 ++-
 test/others/config-file/run.sh    | 2 +-
 test/others/crit/test.sh          | 3 ++-
 test/others/criu-coredump/test.sh | 2 +-
 test/others/libcriu/run.sh        | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 436ebfd0d..537720339 100644
--- a/Makefile
+++ b/Makefile
@@ -423,10 +423,10 @@ lint:
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
-	shellcheck test/others/crit/*.sh
-	shellcheck test/others/libcriu/*.sh
-	shellcheck test/others/crit/*.sh test/others/criu-coredump/*.sh
-	shellcheck test/others/config-file/*.sh
+	shellcheck -x test/others/crit/*.sh
+	shellcheck -x test/others/libcriu/*.sh
+	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
+	shellcheck -x test/others/config-file/*.sh
 	codespell
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index ca93ed77c..eacfe136e 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# shellcheck disable=SC1091,SC2015
+# shellcheck disable=SC2015
 
 set -x -e -o pipefail
 
@@ -19,6 +19,7 @@ add-apt-repository \
 
 ./apt-install docker-ce
 
+# shellcheck source=/dev/null
 . /etc/lsb-release
 
 # docker checkpoint and restore is an experimental feature
diff --git a/test/others/config-file/run.sh b/test/others/config-file/run.sh
index 92195883e..26b835b45 100755
--- a/test/others/config-file/run.sh
+++ b/test/others/config-file/run.sh
@@ -11,7 +11,7 @@
 
 set -xbm
 
-#shellcheck disable=SC1091
+# shellcheck source=test/others/env.sh
 source ../env.sh
 
 if [ ! -d /etc/criu ]; then
diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 0d38043d7..7db88e0a9 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
-# shellcheck disable=SC1091,SC2002
+# shellcheck disable=SC2002
 
 set -x
 
+# shellcheck source=test/others/env.sh
 source ../env.sh
 
 images_list=""
diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index dd774e298..9b6e56475 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -x
-# shellcheck disable=SC1091
+# shellcheck source=test/others/env.sh
 source ../env.sh || exit 1
 
 function gen_imgs {
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 77bdfb87e..f7d363aab 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -9,7 +9,7 @@ TEST_LOG="${TEST_DIR}/test.log"
 DUMP_LOG="${TEST_DIR}/dump.log"
 RESTORE_LOG="${TEST_DIR}/restore.log"
 
-# shellcheck disable=1091
+# shellcheck source=test/others/env.sh
 source "${MAIN_DIR}/../env.sh" || exit 1
 
 echo "== Clean"

From aeb6961f3d58e435f546cd8c7282c83fd6849ac2 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 17:07:43 -0700
Subject: [PATCH 1136/1854] scripts/ci/run-ci-tests: use bash arrays

This is a preferred way of fixing SC2086 shellcheck warning.

Note that since ZDTM_OPTS is passed as a string (via make or docker),
we are converting it to an array using read -a.

Remove all "shellcheck disable=SC2086" annotations.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 scripts/ci/run-ci-tests.sh | 55 +++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 3760a65e3..1b761ea56 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -1,14 +1,17 @@
 #!/bin/bash
 set -x -e
 
-CI_PKGS="protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
+CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
 		libnl-route-3-dev time flake8 libbsd-dev python3-yaml
 		libperl-dev pkg-config python3-future python3-protobuf
-		python3-junit.xml"
+		python3-junit.xml)
 
-X86_64_PKGS="gcc-multilib"
+X86_64_PKGS=(gcc-multilib)
+
+# Convert from string to array.
+IFS=" " read -r -a ZDTM_OPTS <<< "$ZDTM_OPTS"
 
 UNAME_M=$(uname -m)
 
@@ -46,14 +49,14 @@ ci_prep () {
 	else
 		CC=gcc
 	fi
-	CI_PKGS="$CI_PKGS $CC"
+	CI_PKGS+=("$CC")
 
 	# Do not install x86_64 specific packages on other architectures
 	if [ "$UNAME_M" = "x86_64" ]; then
-		CI_PKGS="$CI_PKGS $X86_64_PKGS"
+		CI_PKGS+=("${X86_64_PKGS[@]}")
 	fi
 
-	scripts/ci/apt-install "$CI_PKGS"
+	scripts/ci/apt-install "${CI_PKGS[@]}"
 	chmod a+x "$HOME"
 
 	# zdtm uses an unversioned python binary to run the tests.
@@ -69,9 +72,8 @@ test_stream() {
 	# restorer and eventually close the page read. However, image-streamer expects the
 	# whole image to be read and the image is not reopened, sent twice. These MAP_HUGETLB
 	# test cases will result in EPIPE error at the moment.
-	STREAM_TEST_EXCLUDE="-x maps09 -x maps10"
-	# shellcheck disable=SC2086
-	./test/zdtm.py run --stream -p 2 --keep-going -a $STREAM_TEST_EXCLUDE $ZDTM_OPTS
+	STREAM_TEST_EXCLUDE=(-x maps09 -x maps10)
+	./test/zdtm.py run --stream -p 2 --keep-going -a "${STREAM_TEST_EXCLUDE[@]}" "${ZDTM_OPTS[@]}"
 }
 
 print_header() {
@@ -160,21 +162,20 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	# for 32-bit tests. A better way would involve launching docker..
 	# But it would require making zdtm.py aware of docker and launching
 	# tests inside the CT.
-	INCOMPATIBLE_LIBS="libaio-dev libcap-dev libnl-3-dev libnl-route-3-dev"
-	IA32_PKGS=""
+	INCOMPATIBLE_LIBS=(libaio-dev libcap-dev libnl-3-dev libnl-route-3-dev)
+	IA32_PKGS=()
 	REFUGE=64-refuge
 
 	mkdir "$REFUGE"
-	for i in $INCOMPATIBLE_LIBS ; do
+	for i in "${INCOMPATIBLE_LIBS[@]}" ; do
 		for j in $(dpkg --listfiles "$i" | grep '\.so$') ; do
 			cp "$j" "$REFUGE/"
 		done
-		IA32_PKGS="$IA32_PKGS $i:i386"
+		IA32_PKGS+=("$i:i386")
 	done
-	# shellcheck disable=SC2086
-	apt-get remove $INCOMPATIBLE_LIBS
+	apt-get remove "${INCOMPATIBLE_LIBS[@]}"
 	dpkg --add-architecture i386
-	scripts/ci/apt-install "$IA32_PKGS"
+	scripts/ci/apt-install "${IA32_PKGS[@]}"
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi
@@ -211,15 +212,12 @@ if [ "${STREAM_TEST}" = "1" ]; then
 	exit 0
 fi
 
-# shellcheck disable=SC2086
-./test/zdtm.py run -a -p 2 --keep-going $ZDTM_OPTS
+./test/zdtm.py run -a -p 2 --keep-going "${ZDTM_OPTS[@]}"
 if criu/criu check --feature move_mount_set_group; then
-	# shellcheck disable=SC2086
-	./test/zdtm.py run -a -p 2 --mntns-compat-mode --keep-going $ZDTM_OPTS
+	./test/zdtm.py run -a -p 2 --mntns-compat-mode --keep-going "${ZDTM_OPTS[@]}"
 fi
 
-# shellcheck disable=SC2086
-./test/zdtm.py run -a -p 2 --keep-going --criu-config $ZDTM_OPTS
+./test/zdtm.py run -a -p 2 --keep-going --criu-config "${ZDTM_OPTS[@]}"
 
 # Newer kernels are blocking access to userfaultfd:
 # uffd: Set unprivileged_userfaultfd sysctl knob to 1 if kernel faults must be handled without obtaining CAP_SYS_PTRACE capability
@@ -227,17 +225,14 @@ if [ -e /proc/sys/vm/unprivileged_userfaultfd ]; then
 	echo 1 > /proc/sys/vm/unprivileged_userfaultfd
 fi
 
-LAZY_EXCLUDE="-x maps04 -x cmdlinenv00 -x maps007"
+LAZY_EXCLUDE=(-x maps04 -x cmdlinenv00 -x maps007)
 
 LAZY_TESTS='.*(maps0|uffd-events|lazy-thp|futex|fork).*'
-LAZY_OPTS="-p 2 -T $LAZY_TESTS $LAZY_EXCLUDE $ZDTM_OPTS"
+LAZY_OPTS=(-p 2 -T "$LAZY_TESTS" "${LAZY_EXCLUDE[@]}" "${ZDTM_OPTS[@]}")
 
-# shellcheck disable=SC2086
-./test/zdtm.py run $LAZY_OPTS --lazy-pages
-# shellcheck disable=SC2086
-./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages
-# shellcheck disable=SC2086
-./test/zdtm.py run $LAZY_OPTS --remote-lazy-pages --tls
+./test/zdtm.py run "${LAZY_OPTS[@]}" --lazy-pages
+./test/zdtm.py run "${LAZY_OPTS[@]}" --remote-lazy-pages
+./test/zdtm.py run "${LAZY_OPTS[@]}" --remote-lazy-pages --tls
 
 bash -x ./test/jenkins/criu-fault.sh
 if [ "$UNAME_M" == "x86_64" ]; then

From 75b859f23f8646c9ac242d7ac9c90b6b65fe9745 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 17:10:27 -0700
Subject: [PATCH 1137/1854] scripts/ci: rm shellcheck disable annotations

Those are no longer needed with shellcheck 0.8.0.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 scripts/ci/docker-test.sh | 2 --
 scripts/ci/podman-test.sh | 1 -
 2 files changed, 3 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index eacfe136e..beb7da6da 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# shellcheck disable=SC2015
-
 set -x -e -o pipefail
 
 ./apt-install \
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 973d2d722..e08fdf3bc 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -27,7 +27,6 @@ rm -rf "${tmp_dir}"
 
 podman info
 
-# shellcheck disable=SC2016
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
 
 sleep 1

From 0a872ccf16e09afd89371d5c63666eba1f7859db Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 17:49:50 -0700
Subject: [PATCH 1138/1854] scripts/protobuf-gen.sh: fix (not ignore)
 shellcheck warnings

This basically replaces

	for x in $(sed ...); do

with

	sed ... | while IFS= read -r x; do

The only caveat is, sed program was amended to remove empty lines
(there was one right above the PB_AUTOGEN_STOP).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 scripts/protobuf-gen.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/protobuf-gen.sh b/scripts/protobuf-gen.sh
index 0c738f13a..25d2feaeb 100644
--- a/scripts/protobuf-gen.sh
+++ b/scripts/protobuf-gen.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
-# shellcheck disable=SC2013,SC1004
-
 TR="y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
 
-for x in $(sed -n '/PB_AUTOGEN_START/,/PB_AUTOGEN_STOP/ {
+sed -n '/PB_AUTOGEN_START/,/PB_AUTOGEN_STOP/ {
 		/PB_AUTOGEN_ST/d;
+		/^[ \t]*$/d;
 		s/,.*$//;
 		s/\tPB_//;
 		p;
-	   }' criu/include/protobuf-desc.h); do
+	   }' criu/include/protobuf-desc.h | \
+while IFS= read -r x; do
 	x_la=$(echo "$x" | sed $TR)
 	x_uf=$(echo "$x" | sed -nr 's/^./&#\\\
 /;

From 16f1c147c89f4ce584dcc80c3b80259e5fc54925 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 12 Apr 2022 18:03:29 -0700
Subject: [PATCH 1139/1854] test/others/crit/test.sh: use bash array

In fact an array (aptly named array) is already used in run_test2,
so let's just make it an array right from the start.

While at it, remove ls invocation.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 test/others/crit/test.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 7db88e0a9..5d13066e7 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -6,7 +6,7 @@ set -x
 # shellcheck source=test/others/env.sh
 source ../env.sh
 
-images_list=""
+images_list=()
 
 function gen_imgs {
 	PID=$(../loop)
@@ -17,15 +17,15 @@ function gen_imgs {
 		exit 1
 	fi
 
-	images_list=$(ls -1 ./*.img)
-	if [ -z "$images_list" ]; then
+	images_list=(./*.img)
+	if [ "${#images_list[@]}" -eq 0 ]; then
 		echo "Failed to generate images"
 		exit 1
 	fi
 }
 
 function run_test1 {
-	for x in $images_list
+	for x in "${images_list[@]}"
 	do
 		echo "=== $x"
 		if [[ $x == *pages* ]]; then
@@ -46,9 +46,7 @@ function run_test1 {
 
 
 function run_test2 {
-	mapfile -t array <<< "$images_list"
-
-	PROTO_IN=${array[0]}
+	PROTO_IN="${images_list[0]}"
 	JSON_IN=$(mktemp -p ./ tmp.XXXXXXXXXX.json)
 	OUT=$(mktemp -p ./ tmp.XXXXXXXXXX.log)
 

From debc9c16cc8ed4518bdfa99a7106677a8ee73a72 Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Wed, 14 Sep 2022 15:42:07 +0800
Subject: [PATCH 1140/1854] seize: do not overwrite exit code from failpath

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/seize.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index 1333d6db9..f2af12a0b 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -535,8 +535,10 @@ static int freeze_processes(void)
 	}
 
 err:
-	if (exit_code == 0 || origin_freezer_state == THAWED)
-		exit_code = freezer_write_state(fd, THAWED);
+	if (exit_code == 0 || origin_freezer_state == THAWED) {
+		if (freezer_write_state(fd, THAWED))
+			exit_code = -1;
+	}
 
 	if (close(fd)) {
 		pr_perror("Unable to thaw tasks");

From 461fa7271584596bcc074abdb3c087c802d992c0 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Fri, 2 Sep 2022 07:01:20 -0700
Subject: [PATCH 1141/1854] compel: Add APIs to facilitate testing

Starting the daemon is the first time we run code in the victim
using the parasite stack.

It's useful for testing to be able to infect the victim without starting
the daemon so that we can inspect the victim's state, set up stack
guards, and so on before stack-related corruption can happen.

Add compel_infect_no_daemon() to infect the victim but not start the
daemon and compel_start_daemon() to start the daemon after the victim
is infected.

Add compel_get_stack() to get the victim's main and thread parasite
stacks.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 compel/include/uapi/infect.h |  5 +++++
 compel/src/lib/infect.c      | 29 +++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 19d4da2b1..3bd36dda1 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -41,9 +41,12 @@ struct parasite_thread_ctl;
 extern struct parasite_ctl __must_check *compel_prepare(int pid);
 extern struct parasite_ctl __must_check *compel_prepare_noctx(int pid);
 extern int __must_check compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size);
+extern int __must_check compel_infect_no_daemon(struct parasite_ctl *ctl, unsigned long nr_threads,
+						unsigned long args_size);
 extern struct parasite_thread_ctl __must_check *compel_prepare_thread(struct parasite_ctl *ctl, int pid);
 extern void compel_release_thread(struct parasite_thread_ctl *);
 
+extern int __must_check compel_start_daemon(struct parasite_ctl *ctl);
 extern int __must_check compel_stop_daemon(struct parasite_ctl *ctl);
 extern int __must_check compel_cure_remote(struct parasite_ctl *ctl);
 extern int __must_check compel_cure_local(struct parasite_ctl *ctl);
@@ -177,4 +180,6 @@ extern uint64_t compel_get_thread_ip(struct parasite_thread_ctl *tctl);
 void compel_set_leader_ip(struct parasite_ctl *ctl, uint64_t v);
 void compel_set_thread_ip(struct parasite_thread_ctl *tctl, uint64_t v);
 
+extern void compel_get_stack(struct parasite_ctl *ctl, void **rstack, void **r_thread_stack);
+
 #endif
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 6413a1860..5aab7aa3e 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -967,7 +967,7 @@ static int compel_map_exchange(struct parasite_ctl *ctl, unsigned long size)
 	return ret;
 }
 
-int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size)
+int compel_infect_no_daemon(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size)
 {
 	int ret;
 	unsigned long p, map_exchange_size, parasite_size = 0;
@@ -1079,15 +1079,23 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
 		goto err;
 	}
 
-	if (parasite_start_daemon(ctl))
-		goto err;
-
 	return 0;
 
 err:
 	return -1;
 }
 
+int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned long args_size)
+{
+	if (compel_infect_no_daemon(ctl, nr_threads, args_size))
+		return -1;
+
+	if (parasite_start_daemon(ctl))
+		return -1;
+
+	return 0;
+}
+
 struct parasite_thread_ctl *compel_prepare_thread(struct parasite_ctl *ctl, int pid)
 {
 	struct parasite_thread_ctl *tctl;
@@ -1427,6 +1435,11 @@ static int parasite_fini_seized(struct parasite_ctl *ctl)
 	return 0;
 }
 
+int compel_start_daemon(struct parasite_ctl *ctl)
+{
+	return parasite_start_daemon(ctl);
+}
+
 int compel_stop_daemon(struct parasite_ctl *ctl)
 {
 	if (ctl->daemonized) {
@@ -1772,3 +1785,11 @@ void compel_set_thread_ip(struct parasite_thread_ctl *tctl, uint64_t v)
 {
 	SET_REG_IP(tctl->th.regs, v);
 }
+
+void compel_get_stack(struct parasite_ctl *ctl, void **rstack, void **r_thread_stack)
+{
+	if (rstack)
+		*rstack = ctl->rstack;
+	if (r_thread_stack)
+		*r_thread_stack = ctl->r_thread_stack;
+}

From 556ab0deaf525f3d2f881fad4c366e3bb5b5bd1f Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Tue, 27 Sep 2022 07:10:03 -0700
Subject: [PATCH 1142/1854] compel: Fix infect test to not override failures

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>

return zero on chk success

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>

Co-authored-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 compel/test/infect/spy.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index e7273b446..b10db4d47 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -94,15 +94,15 @@ static inline int chk(int fd, int val)
 	int v = 0;
 
 	if (read(fd, &v, sizeof(v)) != sizeof(v))
-		return 0;
+		return 1;
 
 	printf("%d, want %d\n", v, val);
-	return v == val;
+	return v != val;
 }
 
 int main(int argc, char **argv)
 {
-	int p_in[2], p_out[2], p_err[2], pid, i, pass = 1;
+	int p_in[2], p_out[2], p_err[2], pid, i, err = 0;
 
 	/*
 	 * Prepare IO-s and fork the victim binary
@@ -142,9 +142,11 @@ int main(int argc, char **argv)
 		return 1;
 
 	printf("Checking the victim alive\n");
-	pass = chk(p_out[0], 1);
-	pass = chk(p_out[0], 42);
-	if (!pass)
+	err = chk(p_out[0], 1);
+	if (err)
+		return 1;
+	err = chk(p_out[0], 42);
+	if (err)
 		return 1;
 
 	/*
@@ -176,14 +178,14 @@ int main(int argc, char **argv)
 	printf("Checking the result\n");
 
 	/* These two came from parasite */
-	pass = chk(p_out[0], 138);
-	pass = chk(p_out[0], 403);
+	err = chk(p_out[0], 138);
+	err |= chk(p_out[0], 403);
 
 	/* These two came from post-infect */
-	pass = chk(p_out[0], 1234);
-	pass = chk(p_out[0], 4096);
+	err |= chk(p_out[0], 1234);
+	err |= chk(p_out[0], 4096);
 
-	if (pass)
+	if (!err)
 		printf("All OK\n");
 	else
 		printf("Something went WRONG\n");

From 17ec53913254ca5fc10496ca755a8b7a186be035 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Tue, 30 Aug 2022 09:56:42 -0700
Subject: [PATCH 1143/1854] compel: Add test to check parasite stack setup

Some ABIs allow functions to store data in caller frame, which
means that we have to allocate an initial stack frame before
executing code on the parasite stack.

This test saves the contents of writable memory that follows the stack
after the victim has been infected but before we start using the
parasite stack. It later checks that the saved data matches the
current contents of the two memory areas. This is done while the
victim is halted so we expect a match unless executing parasite code
caused memory corruption. The test doesn't detect cases where we
corrupted memory by writing the same value.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 compel/test/Makefile          |   8 +-
 compel/test/stack/.gitignore  |   4 +
 compel/test/stack/Makefile    |  32 +++
 compel/test/stack/parasite.c  |  38 ++++
 compel/test/stack/spy.c       | 405 ++++++++++++++++++++++++++++++++++
 compel/test/stack/victim.c    |  16 ++
 test/zdtm/transition/Makefile |   1 +
 test/zdtm/transition/stack.c  |  16 ++
 8 files changed, 518 insertions(+), 2 deletions(-)
 create mode 100644 compel/test/stack/.gitignore
 create mode 100644 compel/test/stack/Makefile
 create mode 100644 compel/test/stack/parasite.c
 create mode 100644 compel/test/stack/spy.c
 create mode 100644 compel/test/stack/victim.c
 create mode 100644 test/zdtm/transition/stack.c

diff --git a/compel/test/Makefile b/compel/test/Makefile
index 63fb76f80..f46a821ee 100644
--- a/compel/test/Makefile
+++ b/compel/test/Makefile
@@ -1,4 +1,4 @@
-all: fdspy infect rsys
+all: fdspy infect rsys stack
 
 fdspy:
 	$(Q) $(MAKE) -C fdspy
@@ -10,8 +10,12 @@ infect:
 	$(Q) $(MAKE) -C infect run
 .PHONY: infect
 
-
 rsys:
 	$(Q) $(MAKE) -C rsys
 	$(Q) $(MAKE) -C rsys run
 .PHONY: rsys
+
+stack:
+	$(Q) $(MAKE) -C stack
+	$(Q) $(MAKE) -C stack run
+.PHONY: stack
diff --git a/compel/test/stack/.gitignore b/compel/test/stack/.gitignore
new file mode 100644
index 000000000..0a554758d
--- /dev/null
+++ b/compel/test/stack/.gitignore
@@ -0,0 +1,4 @@
+parasite.h
+parasite.po
+spy
+victim
diff --git a/compel/test/stack/Makefile b/compel/test/stack/Makefile
new file mode 100644
index 000000000..bacfad962
--- /dev/null
+++ b/compel/test/stack/Makefile
@@ -0,0 +1,32 @@
+CC	:= gcc
+CFLAGS	?= -O2 -g -Wall -Werror
+
+COMPEL		:= ../../../compel/compel-host
+
+all: victim spy
+
+run:
+	./spy
+.PHONY: run
+
+clean:
+	rm -f victim
+	rm -f spy
+	rm -f parasite.h
+	rm -f parasite.po
+	rm -f parasite.o
+
+victim: victim.c
+	$(CC) $(CFLAGS) -o $@ $^
+
+spy: spy.c parasite.h
+	$(CC) $(CFLAGS) $(shell $(COMPEL) includes) -o $@ $< $(shell $(COMPEL) --static libs)
+
+parasite.h: parasite.po
+	$(COMPEL) hgen -o $@ -f $<
+
+parasite.po: parasite.o
+	ld $(shell $(COMPEL) ldflags) -o $@ $^ $(shell $(COMPEL) plugins)
+
+parasite.o: parasite.c
+	$(CC) $(CFLAGS) -c $(shell $(COMPEL) cflags) -o $@ $^
diff --git a/compel/test/stack/parasite.c b/compel/test/stack/parasite.c
new file mode 100644
index 000000000..ad13bd25d
--- /dev/null
+++ b/compel/test/stack/parasite.c
@@ -0,0 +1,38 @@
+#include <errno.h>
+
+#include <compel/plugins/std.h>
+#include <infect-rpc.h>
+
+/*
+ * Stubs for std compel plugin.
+ */
+int parasite_trap_cmd(int cmd, void *args)
+{
+	return 0;
+}
+void parasite_cleanup(void)
+{
+}
+
+#define PARASITE_CMD_INC PARASITE_USER_CMDS
+#define PARASITE_CMD_DEC PARASITE_USER_CMDS + 1
+
+int parasite_daemon_cmd(int cmd, void *args)
+{
+	int v;
+
+	switch (cmd) {
+	case PARASITE_CMD_INC:
+		v = (*(int *)args) + 1;
+		break;
+	case PARASITE_CMD_DEC:
+		v = (*(int *)args) - 1;
+		break;
+	default:
+		v = -1;
+		break;
+	}
+
+	sys_write(1, &v, sizeof(int));
+	return 0;
+}
diff --git a/compel/test/stack/spy.c b/compel/test/stack/spy.c
new file mode 100644
index 000000000..9b7c9a7f0
--- /dev/null
+++ b/compel/test/stack/spy.c
@@ -0,0 +1,405 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/wait.h>
+#include <sys/mman.h>
+
+#include <common/page.h>
+
+#include <compel/log.h>
+#include <compel/infect-rpc.h>
+#include <errno.h>
+
+#include "parasite.h"
+
+#define PARASITE_CMD_INC PARASITE_USER_CMDS
+#define PARASITE_CMD_DEC PARASITE_USER_CMDS + 1
+
+#define err_and_ret(msg)              \
+	do {                          \
+		fprintf(stderr, msg); \
+		return -1;            \
+	} while (0)
+
+void *saved_data = NULL;
+
+#define SAVED_DATA_MAX page_size()
+
+void cleanup_saved_data(void)
+{
+	free(saved_data);
+}
+
+static void print_vmsg(unsigned int lvl, const char *fmt, va_list parms)
+{
+	printf("\tLC%u: ", lvl);
+	vprintf(fmt, parms);
+}
+
+static void *get_parasite_rstack_start(struct parasite_ctl *ctl)
+{
+	void *rstack, *r_thread_stack, *rstack_start;
+
+	compel_get_stack(ctl, &rstack, &r_thread_stack);
+
+	rstack_start = rstack;
+	if (r_thread_stack != NULL && r_thread_stack < rstack_start)
+		rstack_start = r_thread_stack;
+
+	return rstack_start;
+}
+
+static int page_writable(struct parasite_ctl *ctl, int pid, void *page)
+{
+	FILE *maps;
+	size_t maps_line_len = 0;
+	char *maps_line = NULL;
+	char victim_maps_path[6 + 11 + 5 + 1];
+	int written;
+	int ret = 0;
+
+	if (((uintptr_t)page & (page_size() - 1)) != 0) {
+		fprintf(stderr, "Page address not aligned\n");
+		ret = -1;
+		goto done;
+	}
+
+	written = snprintf(victim_maps_path, sizeof(victim_maps_path), "/proc/%d/maps", pid);
+	if (written < 0 || written >= sizeof(victim_maps_path)) {
+		fprintf(stderr, "Failed to create path string to victim's /proc/%d/maps file\n", pid);
+		ret = -1;
+		goto done;
+	}
+
+	maps = fopen(victim_maps_path, "r");
+	if (maps == NULL) {
+		perror("Can't open victim's /proc/$pid/maps");
+		ret = -1;
+		goto done;
+	}
+
+	while (getline(&maps_line, &maps_line_len, maps) != -1) {
+		unsigned long vmstart, vmend;
+		char r, w;
+
+		if (sscanf(maps_line, "%lx-%lx %c%c", &vmstart, &vmend, &r, &w) < 4) {
+			fprintf(stderr, "Can't parse victim's /proc/%d/maps; line: %s\n", pid, maps_line);
+			ret = -1;
+			goto free_linebuf;
+		}
+
+		if (page >= (void *)vmstart && page < (void *)vmend) {
+			if (w == 'w') {
+				if (r != 'r') {
+					fprintf(stderr, "Expecting writable memory to also be readable");
+					ret = -1;
+					goto free_linebuf;
+				}
+				ret = 1;
+			}
+			break;
+		}
+	}
+
+	if (errno) {
+		perror("Can't read victim's /proc/$pid/maps");
+		ret = -1;
+	}
+
+free_linebuf:
+	free(maps_line);
+	fclose(maps);
+done:
+	return ret;
+}
+
+static void *read_proc_mem(int pid, void *offset, size_t len)
+{
+	char victim_mem_path[6 + 11 + 4 + 1];
+	int written;
+	int fd;
+	void *data;
+	ssize_t mem_read;
+
+	written = snprintf(victim_mem_path, sizeof(victim_mem_path), "/proc/%d/mem", pid);
+	if (written < 0 || written >= sizeof(victim_mem_path)) {
+		fprintf(stderr, "Failed to create path string to victim's /proc/%d/mem file\n", pid);
+		return NULL;
+	}
+
+	fd = open(victim_mem_path, O_RDONLY);
+	if (fd < 0) {
+		perror("Failed to open victim's /proc/$pid/mem file");
+		return NULL;
+	}
+
+	data = malloc(len);
+	if (data == NULL) {
+		perror("Can't allocate memory to read victim's /proc/$pid/mem file");
+		return NULL;
+	}
+
+	mem_read = pread(fd, data, len, (off_t)offset);
+	if (mem_read == -1) {
+		perror("Failed to read victim's /proc/$pid/mem file");
+		goto freebuf;
+	}
+
+	return data;
+
+freebuf:
+	free(data);
+	return NULL;
+}
+
+static int save_data_near_stack(struct parasite_ctl *ctl, int pid, void *stack, void **saved_data,
+				size_t *saved_data_size)
+{
+	size_t page_mask = page_size() - 1;
+	size_t saved_size = 0;
+	size_t stack_size_last_page = (uintptr_t)stack & page_mask;
+	void *next_page = stack;
+
+	if (stack_size_last_page != 0) {
+		size_t empty_space_last_page = page_size() - stack_size_last_page;
+		saved_size = min(empty_space_last_page, (size_t)SAVED_DATA_MAX);
+		next_page += page_size() - stack_size_last_page;
+	}
+
+	while (saved_size < SAVED_DATA_MAX && next_page != NULL) {
+		switch (page_writable(ctl, pid, next_page)) {
+		case 1:
+			saved_size = min((size_t)(saved_size + page_size()), (size_t)SAVED_DATA_MAX);
+			next_page += page_size();
+			break;
+		case 0:
+			next_page = NULL;
+			break;
+		default:
+			return -1;
+		}
+	}
+
+	if (saved_size > 0) {
+		void *sd;
+
+		sd = read_proc_mem(pid, stack, saved_size);
+		if (sd == NULL)
+			return -1;
+
+		*saved_data = sd;
+	} else {
+		*saved_data = NULL;
+	}
+
+	*saved_data_size = saved_size;
+
+	return 0;
+}
+
+static int check_saved_data(struct parasite_ctl *ctl, int pid, void *stack, void *saved_data, size_t saved_data_size)
+{
+	if (saved_data != NULL) {
+		void *current_data;
+
+		current_data = read_proc_mem(pid, stack, saved_data_size);
+		if (current_data == NULL)
+			return -1;
+
+		if (memcmp(saved_data, current_data, saved_data_size) != 0)
+			return 1;
+	}
+
+	return 0;
+}
+
+static int do_infection(int pid)
+{
+	int state;
+	struct parasite_ctl *ctl;
+	struct infect_ctx *ictx;
+	int *arg;
+	void *stack;
+	size_t saved_data_size;
+	int saved_data_check;
+
+	compel_log_init(print_vmsg, COMPEL_LOG_DEBUG);
+
+	printf("Stopping task\n");
+	state = compel_stop_task(pid);
+	if (state < 0)
+		err_and_ret("Can't stop task\n");
+
+	printf("Preparing parasite ctl\n");
+	ctl = compel_prepare(pid);
+	if (!ctl)
+		err_and_ret("Can't prepare for infection\n");
+
+	printf("Configuring contexts\n");
+
+	/*
+	 * First -- the infection context. Most of the stuff
+	 * is already filled by compel_prepare(), just set the
+	 * log descriptor for parasite side, library cannot
+	 * live w/o it.
+	 */
+	ictx = compel_infect_ctx(ctl);
+	ictx->log_fd = STDERR_FILENO;
+
+	parasite_setup_c_header(ctl);
+
+	printf("Infecting\n");
+	if (compel_infect_no_daemon(ctl, 1, sizeof(int)))
+		err_and_ret("Can't infect victim\n");
+
+	if (atexit(cleanup_saved_data))
+		err_and_ret("Can't register cleanup function with atexit\n");
+
+	stack = get_parasite_rstack_start(ctl);
+	if (save_data_near_stack(ctl, pid, stack, &saved_data, &saved_data_size))
+		err_and_ret("Can't save data above stack\n");
+
+	if (compel_start_daemon(ctl))
+		err_and_ret("Can't start daemon in victim\n");
+
+	/*
+	 * Now get the area with arguments and run two
+	 * commands one by one.
+	 */
+	arg = compel_parasite_args(ctl, int);
+
+	printf("Running cmd 1\n");
+	*arg = 137;
+	if (compel_rpc_call_sync(PARASITE_CMD_INC, ctl))
+		err_and_ret("Can't run parasite command 1\n");
+
+	printf("Running cmd 2\n");
+	*arg = 404;
+	if (compel_rpc_call_sync(PARASITE_CMD_DEC, ctl))
+		err_and_ret("Can't run parasite command 2\n");
+
+	saved_data_check = check_saved_data(ctl, pid, stack, saved_data, saved_data_size);
+	if (saved_data_check == -1)
+		err_and_ret("Could not check saved data\n");
+	if (saved_data_check != 0)
+		err_and_ret("Saved data unexpectedly modified\n");
+
+	/*
+	 * Done. Cure and resume the task.
+	 */
+	printf("Curing\n");
+	if (compel_cure(ctl))
+		err_and_ret("Can't cure victim\n");
+
+	if (compel_resume_task(pid, state, state))
+		err_and_ret("Can't unseize task\n");
+
+	printf("Done\n");
+
+	return 0;
+}
+
+static inline int chk(int fd, int val)
+{
+	int v = 0;
+
+	if (read(fd, &v, sizeof(v)) != sizeof(v))
+		return 1;
+
+	printf("%d, want %d\n", v, val);
+	return v != val;
+}
+
+int main(int argc, char **argv)
+{
+	int p_in[2], p_out[2], p_err[2], pid, i, err = 0;
+
+	/*
+	 * Prepare IO-s and fork the victim binary
+	 */
+	if (pipe(p_in) || pipe(p_out) || pipe(p_err)) {
+		perror("Can't make pipe");
+		return -1;
+	}
+
+	pid = vfork();
+	if (pid == 0) {
+		close(p_in[1]);
+		dup2(p_in[0], 0);
+		close(p_in[0]);
+		close(p_out[0]);
+		dup2(p_out[1], 1);
+		close(p_out[1]);
+		close(p_err[0]);
+		dup2(p_err[1], 2);
+		close(p_err[1]);
+		execl("./victim", "victim", NULL);
+		exit(1);
+	}
+
+	close(p_in[0]);
+	close(p_out[1]);
+	close(p_err[1]);
+
+	/*
+	 * Tell the little guy some numbers
+	 */
+	i = 1;
+	if (write(p_in[1], &i, sizeof(i)) != sizeof(i))
+		return 1;
+	i = 42;
+	if (write(p_in[1], &i, sizeof(i)) != sizeof(i))
+		return 1;
+
+	printf("Checking the victim alive\n");
+	err = chk(p_out[0], 1);
+	if (err)
+		return 1;
+	err = chk(p_out[0], 42);
+	if (err)
+		return 1;
+
+	/*
+	 * Now do the infection with parasite.c
+	 */
+
+	printf("Infecting the victim\n");
+	if (do_infection(pid))
+		return 1;
+
+	/*
+	 * Tell the victim some more stuff to check it's alive
+	 */
+	i = 1234;
+	if (write(p_in[1], &i, sizeof(i)) != sizeof(i))
+		return 1;
+	i = 4096;
+	if (write(p_in[1], &i, sizeof(i)) != sizeof(i))
+		return 1;
+
+	/*
+	 * Stop the victim and check the infection went well
+	 */
+	printf("Closing victim stdin\n");
+	close(p_in[1]);
+	printf("Waiting for victim to die\n");
+	wait(NULL);
+
+	printf("Checking the result\n");
+
+	/* These two came from parasite */
+	err = chk(p_out[0], 138);
+	err |= chk(p_out[0], 403);
+
+	/* These two came from post-infect */
+	err |= chk(p_out[0], 1234);
+	err |= chk(p_out[0], 4096);
+
+	if (!err)
+		printf("All OK\n");
+	else
+		printf("Something went WRONG\n");
+
+	return 0;
+}
diff --git a/compel/test/stack/victim.c b/compel/test/stack/victim.c
new file mode 100644
index 000000000..f94613fa1
--- /dev/null
+++ b/compel/test/stack/victim.c
@@ -0,0 +1,16 @@
+#include <unistd.h>
+
+int main(int argc, char **argv)
+{
+	int i;
+
+	while (1) {
+		if (read(0, &i, sizeof(i)) != sizeof(i))
+			break;
+
+		if (write(1, &i, sizeof(i)) != sizeof(i))
+			break;
+	}
+
+	return 0;
+}
diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index 98440f4e2..ab735bdd4 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -25,6 +25,7 @@ TST_NOFILE	=	\
 		pidfd_store_sk \
 		rseq01		\
 		rseq02		\
+		stack		\
 
 
 TST_FILE	=	\
diff --git a/test/zdtm/transition/stack.c b/test/zdtm/transition/stack.c
new file mode 100644
index 000000000..9548b9182
--- /dev/null
+++ b/test/zdtm/transition/stack.c
@@ -0,0 +1,16 @@
+#include "zdtmtst.h"
+
+const char *test_doc = "Tests that parasite code does not write past the start of the stack";
+const char *test_author = "Younes Manton <ymanton@ca.ibm.com>";
+
+int main(int argc, char **argv)
+{
+	test_init(argc, argv);
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+
+	return 0;
+}

From a39d416568ffd7939c5e2aaa7649399e36cd854e Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Tue, 30 Aug 2022 08:18:21 -0700
Subject: [PATCH 1144/1854] compel: Fix ppc64le parasite stack layout

The ppc64le ABI allows functions to store data in caller frames.
When initializing the stack pointer prior to executing parasite code
we need to pre-allocating the minimum sized stack frame before
jumping to the parasite code.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h | 5 +++++
 compel/arch/ppc64/src/lib/infect.c                    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
index eb12c9f7c..8cc94ba74 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
@@ -23,6 +23,11 @@
 
 /* Copied from the Linux kernel header arch/powerpc/include/asm/ptrace.h */
 #define USER_REDZONE_SIZE 512
+#if _CALL_ELF != 2
+#error Only supporting ABIv2.
+#else
+#define STACK_FRAME_MIN_SIZE 32
+#endif
 
 /* Copied from the Linux kernel source file arch/powerpc/kernel/signal_64.c */
 #define TRAMP_SIZE 6
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index 61cd6e985..db999ce37 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -441,13 +441,13 @@ void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot,
 void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
 {
 	/*
-	 * OpenPOWER ABI requires that r12 is set to the calling function addressi
+	 * OpenPOWER ABI requires that r12 is set to the calling function address
 	 * to compute the TOC pointer.
 	 */
 	regs->gpr[12] = new_ip;
 	regs->nip = new_ip;
 	if (stack)
-		regs->gpr[1] = (unsigned long)stack;
+		regs->gpr[1] = (unsigned long)stack - STACK_FRAME_MIN_SIZE;
 	regs->trap = 0;
 }
 

From 4c7f91afffe10e0b562bb3a0be19fef55f0e7cec Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 1 Oct 2022 22:19:24 +0100
Subject: [PATCH 1145/1854] ci: enable EPEL for CentOS 7

python2-future, python2-junit_xml, python-flake8 and libbsd-devel are
now provided from EPEL.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 03ed79748..c7ed5027a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -111,6 +111,8 @@ task:
     memory: 8G
 
   setup_script: |
+    # EPEL is needed for python2-future, python2-junit_xml, python-flake8 and libbsd-devel.
+    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
     # Even with selinux in permissive mode the selinux tests will be executed

From 4b4bf0421b3a9881735a6fa7041e30f8fbefd85b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 24 Jul 2020 16:03:45 +0000
Subject: [PATCH 1146/1854] non-root: add infrastructure to run as non-root

The idea behind the rootless CRIU code is, that CRIU reads out its
effective capabilities and stores that in the global opts structure.

Different parts of CRIU can then, based on the existing capabilities,
automatically enable or disable certain code paths.

Currently at least CAP_CHECKPOINT_RESTORE is required. CRIU will not
start without this capability.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/config.c             |  3 +++
 criu/cr-restore.c         |  4 ++++
 criu/include/cr_options.h | 17 ++++++++++++++++-
 criu/include/restorer.h   |  3 +++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/criu/config.c b/criu/config.c
index 24c445c8b..c078848ec 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -705,6 +705,9 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 
 #undef BOOL_OPT
 
+	if (argv && argv[0])
+		SET_CHAR_OPTS(argv_0, argv[0]);
+
 	ret = pre_parse(argc, argv, usage_error, &no_default_config, &cfg_file);
 
 	if (ret)
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9c480be78..cd8705822 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3748,6 +3748,10 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 
 	prep_libc_rseq_info(&task_args->libc_rseq);
 
+	task_args->uid = opts.uid;
+	for (i = 0; i < CR_CAP_SIZE; i++)
+		task_args->cap_eff[i] = opts.cap_eff[i];
+
 	/*
 	 * Fill up per-thread data.
 	 */
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index e544a2d9a..6e85dff0a 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -1,10 +1,11 @@
 #ifndef __CR_OPTIONS_H__
 #define __CR_OPTIONS_H__
 
-#include <sys/types.h>
 #include <stdbool.h>
 #include "common/config.h"
 #include "common/list.h"
+#include "int.h"
+#include "image.h"
 
 /* Configuration and CLI parsing order defines */
 #define PARSING_GLOBAL_CONF  1
@@ -210,6 +211,20 @@ struct cr_options {
 	enum criu_mode mode;
 
 	int mntns_compat_mode;
+
+	/* Remember the program name passed to main() so we can use it in
+	 * error messages elsewhere.
+	 */
+	char *argv_0;
+	/*
+	 * This contains the eUID of the current CRIU user. It
+	 * will only be set to a non-zero value if CRIU has
+	 * the necessary capabilities to run as non root.
+	 * CAP_CHECKPOINT_RESTORE or CAP_SYS_ADMIN
+	 */
+	uid_t uid;
+	/* This contains the value from /proc/pid/status: CapEff */
+	u32 cap_eff[CR_CAP_SIZE];
 };
 
 extern struct cr_options opts;
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 325804e44..d642765e3 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -235,6 +235,9 @@ struct task_restore_args {
 	 * unregister it before memory restoration procedure
 	 */
 	struct rst_rseq_param libc_rseq;
+
+	uid_t uid;
+	u32 cap_eff[CR_CAP_SIZE];
 } __aligned(64);
 
 /*

From ce01f70d94daa6fe58c68407c3776ab8f7009427 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 24 Jul 2020 16:08:07 +0000
Subject: [PATCH 1147/1854] non-root: add functions to work with capabilities

This adds the function check_caps() which checks if CRIU is running
with at least CAP_CHECKPOINT_RESTORE. That is the minimum capability
CRIU needs to do a minimal checkpoint and restore from it.

In addition helper functions are added to easily query for other
capability for enhanced checkpoint/restore support.

Co-authored-by: Younes Manton <ymanton@ca.ibm.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/cr-check.c          | 46 ++++++++++++++++++++++++++++++-
 criu/include/crtools.h   |  1 +
 criu/include/util-caps.h | 58 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 criu/include/util-caps.h

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 6c95ffb25..b90e6a9bf 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -29,7 +29,7 @@
 #include "sockets.h"
 #include "crtools.h"
 #include "log.h"
-#include "util-pie.h"
+#include "util-caps.h"
 #include "prctl.h"
 #include "files.h"
 #include "sk-inet.h"
@@ -1655,3 +1655,47 @@ static char *feature_name(int (*func)(void))
 	}
 	return NULL;
 }
+
+static int pr_set_dumpable(int value)
+{
+	int ret = prctl(PR_SET_DUMPABLE, value, 0, 0, 0);
+	if (ret < 0)
+		pr_perror("Unable to set PR_SET_DUMPABLE");
+	return ret;
+}
+
+int check_caps(void)
+{
+	struct proc_status_creds creds;
+	int exit_code = -1;
+
+	if (parse_pid_status(PROC_SELF, &creds.s, NULL))
+		goto out;
+
+	memcpy(&opts.cap_eff, &creds.cap_eff, sizeof(u32) * PROC_CAP_SIZE);
+
+	if (!has_cap_checkpoint_restore(opts.cap_eff))
+		goto out;
+
+	/* For some things we need to know if we are running as root. */
+	opts.uid = geteuid();
+
+	if (opts.uid) {
+		/*
+		 * At his point we know we are running as non-root with the necessary
+		 * capabilities available. Now we have to make the process dumpable
+		 * so that /proc/self is not owned by root.
+		 */
+		if (pr_set_dumpable(1))
+			return -1;
+	}
+
+	exit_code = 0;
+out:
+	if (exit_code) {
+		pr_msg("CRIU needs to have the CAP_SYS_ADMIN or the CAP_CHECKPOINT_RESTORE capability: \n");
+		pr_msg("setcap cap_checkpoint_restore+eip %s\n", opts.argv_0);
+	}
+
+	return exit_code;
+}
diff --git a/criu/include/crtools.h b/criu/include/crtools.h
index b9309654f..b54b9d929 100644
--- a/criu/include/crtools.h
+++ b/criu/include/crtools.h
@@ -26,6 +26,7 @@ extern int cr_pre_dump_tasks(pid_t pid);
 extern int cr_restore_tasks(void);
 extern int convert_to_elf(char *elf_path, int fd_core);
 extern int cr_check(void);
+extern int check_caps(void);
 extern int cr_dedup(void);
 extern int cr_lazy_pages(bool daemon);
 
diff --git a/criu/include/util-caps.h b/criu/include/util-caps.h
new file mode 100644
index 000000000..7ccd162f5
--- /dev/null
+++ b/criu/include/util-caps.h
@@ -0,0 +1,58 @@
+#ifndef __CR_UTIL_CAPS_H__
+#define __CR_UTIL_CAPS_H__
+
+#include <sys/capability.h>
+
+#ifndef CAP_CHECKPOINT_RESTORE
+#define CAP_CHECKPOINT_RESTORE 40
+#endif
+
+static inline bool has_capability(int cap, u32 *cap_eff)
+{
+	int mask = CAP_TO_MASK(cap);
+	int index = CAP_TO_INDEX(cap);
+	u32 effective;
+
+	effective = cap_eff[index];
+
+	if (!(mask & effective)) {
+		pr_debug("Effective capability %d missing\n", cap);
+		return false;
+	}
+
+	return true;
+}
+
+static inline bool has_cap_checkpoint_restore(u32 *cap_eff)
+{
+	/*
+	 * Everything guarded by CAP_CHECKPOINT_RESTORE is also
+	 * guarded by CAP_SYS_ADMIN. Check for both capabilities.
+	 */
+	if (has_capability(CAP_CHECKPOINT_RESTORE, cap_eff) || has_capability(CAP_SYS_ADMIN, cap_eff))
+		return true;
+
+	return false;
+}
+
+static inline bool has_cap_net_admin(u32 *cap_eff)
+{
+	return has_capability(CAP_NET_ADMIN, cap_eff);
+}
+
+static inline bool has_cap_sys_chroot(u32 *cap_eff)
+{
+	return has_capability(CAP_SYS_CHROOT, cap_eff);
+}
+
+static inline bool has_cap_setuid(u32 *cap_eff)
+{
+	return has_capability(CAP_SETUID, cap_eff);
+}
+
+static inline bool has_cap_sys_resource(u32 *cap_eff)
+{
+	return has_capability(CAP_SYS_RESOURCE, cap_eff);
+}
+
+#endif /* __CR_UTIL_CAPS_H__ */

From 6a30c7d1ed5bdad67921e8e6262f839bd8c48d08 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Fri, 12 Aug 2022 11:56:53 -0700
Subject: [PATCH 1148/1854] non-root: enable non-root checkpoint/restore

This commit enables checkpointing and restoring of applications as
non-root.

First goal was to enable checkpoint and restore of the env00 and
pthread00 test case.

This uses the information from opts.unprivileged and opts.cap_eff to
skip certain code paths which do not work as non-root.

Co-authored-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/cgroup.c             |  6 ++++
 criu/config.c             |  1 +
 criu/cr-check.c           | 71 ++++++++++++++++++++++++---------------
 criu/cr-restore.c         |  3 ++
 criu/cr-service.c         |  7 ++++
 criu/crtools.c            |  5 +++
 criu/fdstore.c            | 16 +++++++--
 criu/files.c              | 46 +++++++++++++++++++++----
 criu/image.c              |  3 +-
 criu/include/cr_options.h | 11 ++++--
 criu/include/util.h       |  2 ++
 criu/namespaces.c         | 11 +++---
 criu/pie/restorer.c       | 26 ++++++++------
 criu/timens.c             |  4 +++
 criu/util.c               | 22 ++++++++++++
 images/rpc.proto          |  1 +
 lib/c/criu.c              | 11 ++++++
 lib/c/criu.h              |  1 +
 18 files changed, 194 insertions(+), 53 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 325df6a1d..d886ce9f2 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -734,6 +734,9 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
 	unsigned int n_ctls = 0;
 	struct cg_set *cs;
 
+	if (opts.unprivileged)
+		return 0;
+
 	if (item)
 		pid = item->pid->real;
 	else
@@ -989,6 +992,9 @@ int dump_cgroups(void)
 	CgroupEntry cg = CGROUP_ENTRY__INIT;
 	int ret = -1;
 
+	if (opts.unprivileged)
+		return 0;
+
 	BUG_ON(!criu_cgset || !root_cgset);
 
 	/*
diff --git a/criu/config.c b/criu/config.c
index c078848ec..9ba79c8ef 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -700,6 +700,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		{ "lsm-mount-context", required_argument, 0, 1099 },
 		{ "network-lock", required_argument, 0, 1100 },
 		BOOL_OPT("mntns-compat-mode", &opts.mntns_compat_mode),
+		BOOL_OPT("unprivileged", &opts.unprivileged),
 		{},
 	};
 
diff --git a/criu/cr-check.c b/criu/cr-check.c
index b90e6a9bf..b54c79387 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -21,6 +21,7 @@
 #include <sys/prctl.h>
 #include <sched.h>
 #include <sys/mount.h>
+#include <sys/utsname.h>
 
 #include "../soccr/soccr.h"
 
@@ -515,6 +516,14 @@ static int check_ipc(void)
 {
 	int ret;
 
+	/*
+	 * Since kernel 5.16 sem_next_id can be accessed via CAP_CHECKPOINT_RESTORE, however
+	 * for non-root users access() runs with an empty set of caps and will therefore always
+	 * fail.
+	 */
+	if (opts.uid)
+		return 0;
+
 	ret = access("/proc/sys/kernel/sem_next_id", R_OK | W_OK);
 	if (!ret)
 		return 0;
@@ -1039,10 +1048,14 @@ static int check_tcp(void)
 	}
 
 	val = 1;
-	ret = setsockopt(sk, SOL_TCP, TCP_REPAIR, &val, sizeof(val));
-	if (ret < 0) {
-		pr_perror("Can't turn TCP repair mode ON");
-		goto out;
+	if (!opts.unprivileged || has_cap_net_admin(opts.cap_eff)) {
+		ret = setsockopt(sk, SOL_TCP, TCP_REPAIR, &val, sizeof(val));
+		if (ret < 0) {
+			pr_perror("Can't turn TCP repair mode ON");
+			goto out;
+		}
+	} else {
+		pr_info("Not checking for TCP repair mode. Please set CAP_NET_ADMIN\n");
 	}
 
 	optlen = sizeof(val);
@@ -1394,9 +1407,6 @@ int cr_check(void)
 	struct ns_id *ns;
 	int ret = 0;
 
-	if (!is_root_user())
-		return -1;
-
 	root_item = alloc_pstree_item();
 	if (root_item == NULL)
 		return -1;
@@ -1666,36 +1676,43 @@ static int pr_set_dumpable(int value)
 
 int check_caps(void)
 {
-	struct proc_status_creds creds;
-	int exit_code = -1;
-
-	if (parse_pid_status(PROC_SELF, &creds.s, NULL))
+	/* Read out effective capabilities and store in opts.cap_eff. */
+	if (set_opts_cap_eff())
 		goto out;
 
-	memcpy(&opts.cap_eff, &creds.cap_eff, sizeof(u32) * PROC_CAP_SIZE);
-
+	/*
+	 * No matter if running as root or not. CRIU always needs
+	 * at least these capabilities.
+	 */
 	if (!has_cap_checkpoint_restore(opts.cap_eff))
 		goto out;
 
 	/* For some things we need to know if we are running as root. */
 	opts.uid = geteuid();
 
-	if (opts.uid) {
-		/*
-		 * At his point we know we are running as non-root with the necessary
-		 * capabilities available. Now we have to make the process dumpable
-		 * so that /proc/self is not owned by root.
-		 */
-		if (pr_set_dumpable(1))
-			return -1;
+	if (!opts.uid) {
+		/* CRIU is running as root. No further checks are necessary. */
+		return 0;
 	}
 
-	exit_code = 0;
+	if (!opts.unprivileged) {
+		pr_msg("Running as non-root requires '--unprivileged'\n");
+		pr_msg("Please consult the documentation for limitations when running as non-root\n");
+		return -1;
+	}
+
+	/*
+	 * At his point we know we are running as non-root with the necessary
+	 * capabilities available. Now we have to make the process dumpable
+	 * so that /proc/self is not owned by root.
+	 */
+	if (pr_set_dumpable(1))
+		return -1;
+
+	return 0;
 out:
-	if (exit_code) {
-		pr_msg("CRIU needs to have the CAP_SYS_ADMIN or the CAP_CHECKPOINT_RESTORE capability: \n");
-		pr_msg("setcap cap_checkpoint_restore+eip %s\n", opts.argv_0);
-	}
+	pr_msg("CRIU needs to have the CAP_SYS_ADMIN or the CAP_CHECKPOINT_RESTORE capability: \n");
+	pr_msg("setcap cap_checkpoint_restore+eip %s\n", opts.argv_0);
 
-	return exit_code;
+	return -1;
 }
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index cd8705822..d7d3d8edb 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1809,6 +1809,9 @@ static int restore_task_with_children(void *_arg)
 				goto err;
 		}
 
+		if (set_opts_cap_eff())
+			goto err;
+
 		/* Wait prepare_userns */
 		if (restore_finish_ns_stage(CR_STATE_ROOT_TASK, CR_STATE_PREPARE_NAMESPACES) < 0)
 			goto err;
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 1d9f0aca3..73c48f5a6 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -14,6 +14,7 @@
 #include <sys/stat.h>
 #include <arpa/inet.h>
 #include <sched.h>
+#include <sys/prctl.h>
 
 #include "version.h"
 #include "crtools.h"
@@ -409,6 +410,12 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		pr_debug("Would overwrite RPC settings with values from %s\n", req->config_file);
 	}
 
+	if (req->has_unprivileged)
+		opts.unprivileged = req->unprivileged;
+
+	if (check_caps())
+		return 1;
+
 	if (kerndat_init())
 		return 1;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index 8bcbe8e38..ac05bc821 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -185,6 +185,9 @@ int main(int argc, char *argv[], char *envp[])
 		return cr_service_work(atoi(argv[optind + 1]));
 	}
 
+	if (check_caps())
+		return 1;
+
 	if (opts.imgs_dir == NULL)
 		SET_CHAR_OPTS(imgs_dir, ".");
 
@@ -414,6 +417,8 @@ usage:
 	       "  --network-lock METHOD\n"
 	       "                      network locking/unlocking method; argument\n"
 	       "                      can be 'nftables' or 'iptables' (default).\n"
+	       "  --unprivileged        accept limitations when running as non-root\n"
+	       "                        consult documentation for further details\n"
 	       "\n"
 	       "* External resources support:\n"
 	       "  --external RES        dump objects from this list as external resources:\n"
diff --git a/criu/fdstore.c b/criu/fdstore.c
index 6a7f73a59..03afa9f17 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -13,6 +13,8 @@
 #include "rst-malloc.h"
 #include "log.h"
 #include "util.h"
+#include "cr_options.h"
+#include "util-caps.h"
 
 /* clang-format off */
 static struct fdstore_desc {
@@ -27,6 +29,8 @@ int fdstore_init(void)
 	uint32_t buf[2] = { INT_MAX / 2, INT_MAX / 2 };
 	struct sockaddr_un addr;
 	unsigned int addrlen;
+	int rcv_opt_name;
+	int snd_opt_name;
 	struct stat st;
 	int sk, ret;
 
@@ -49,8 +53,16 @@ int fdstore_init(void)
 		return -1;
 	}
 
-	if (setsockopt(sk, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0], sizeof(buf[0])) < 0 ||
-	    setsockopt(sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
+	if (!opts.unprivileged || has_cap_net_admin(opts.cap_eff)) {
+		rcv_opt_name = SO_RCVBUFFORCE;
+		snd_opt_name = SO_SNDBUFFORCE;
+	} else {
+		rcv_opt_name = SO_RCVBUF;
+		snd_opt_name = SO_SNDBUF;
+	}
+
+	if (setsockopt(sk, SOL_SOCKET, snd_opt_name, &buf[0], sizeof(buf[0])) < 0 ||
+	    setsockopt(sk, SOL_SOCKET, rcv_opt_name, &buf[1], sizeof(buf[1])) < 0) {
 		pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
 		close(sk);
 		return -1;
diff --git a/criu/files.c b/criu/files.c
index 8a2250e19..38dc076d2 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -21,7 +21,7 @@
 #include "image.h"
 #include "common/list.h"
 #include "rst-malloc.h"
-#include "util-pie.h"
+#include "util-caps.h"
 #include "common/lock.h"
 #include "sockets.h"
 #include "pstree.h"
@@ -1346,10 +1346,35 @@ static int fchroot(int fd)
 	return chroot(".");
 }
 
+static int need_chroot(int saved_root)
+{
+	struct stat saved_root_stat, cur_root_stat;
+	int psd;
+
+	if (fstat(saved_root, &saved_root_stat) == -1) {
+		pr_perror("Failed to stat saved root dir");
+		return -1;
+	}
+
+	psd = open_pid_proc(PROC_SELF);
+	if (psd < 0) {
+		pr_perror("Failed to open PROC_SELF");
+		return -1;
+	}
+
+	if (fstatat(psd, "root", &cur_root_stat, 0) == -1) {
+		pr_perror("Failed to stat current root dir");
+		return -1;
+	}
+
+	return saved_root_stat.st_ino != cur_root_stat.st_ino || saved_root_stat.st_dev != cur_root_stat.st_dev;
+}
+
 int restore_fs(struct pstree_item *me)
 {
 	int dd_root = -1, dd_cwd = -1, ret, err = -1;
 	struct rst_info *ri = rsti(me);
+	bool do_chroot = true;
 
 	/*
 	 * First -- open both descriptors. We will not
@@ -1368,15 +1393,24 @@ int restore_fs(struct pstree_item *me)
 		goto out;
 	}
 
+	/*
+	 * In unprivileged mode chroot() may fail if we don't have
+	 * sufficient privileges, therefore only do it if the process
+	 * is actually chrooted.
+	 */
+	if (opts.unprivileged)
+		do_chroot = need_chroot(dd_root);
+
 	/*
 	 * Now do chroot/chdir. Chroot goes first as it calls chdir into
 	 * dd_root so we'd need to fix chdir after it anyway.
 	 */
-
-	ret = fchroot(dd_root);
-	if (ret < 0) {
-		pr_perror("Can't change root");
-		goto out;
+	if (do_chroot) {
+		ret = fchroot(dd_root);
+		if (ret < 0) {
+			pr_perror("Can't change root");
+			goto out;
+		}
 	}
 
 	ret = fchdir(dd_cwd);
diff --git a/criu/image.c b/criu/image.c
index 353de48e8..3c2127ac6 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -226,7 +226,8 @@ int prepare_inventory(InventoryEntry *he)
 	if (get_task_ids(&crt.i))
 		return -1;
 
-	he->has_root_cg_set = true;
+	if (!opts.unprivileged)
+		he->has_root_cg_set = true;
 	if (dump_task_cgroup(NULL, &he->root_cg_set, NULL))
 		return -1;
 
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 6e85dff0a..eacaa03a6 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -2,6 +2,7 @@
 #define __CR_OPTIONS_H__
 
 #include <stdbool.h>
+#include <sys/capability.h>
 #include "common/config.h"
 #include "common/list.h"
 #include "int.h"
@@ -223,8 +224,14 @@ struct cr_options {
 	 * CAP_CHECKPOINT_RESTORE or CAP_SYS_ADMIN
 	 */
 	uid_t uid;
-	/* This contains the value from /proc/pid/status: CapEff */
-	u32 cap_eff[CR_CAP_SIZE];
+	/* This contains the value from capget()->effective */
+	u32 cap_eff[_LINUX_CAPABILITY_U32S_3];
+	/*
+	 * If CRIU should be running as non-root with the help of
+	 * CAP_CHECKPOINT_RESTORE or CAP_SYS_ADMIN the user should
+	 * explicitly request it as it comes with many limitations.
+	 */
+	int unprivileged;
 };
 
 extern struct cr_options opts;
diff --git a/criu/include/util.h b/criu/include/util.h
index 4e29c079e..3a0403113 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -386,6 +386,8 @@ extern int mount_detached_fs(const char *fsname);
 
 extern char *get_legacy_iptables_bin(bool ipv6);
 
+extern int set_opts_cap_eff(void);
+
 extern ssize_t read_all(int fd, void *buf, size_t size);
 extern ssize_t write_all(int fd, const void *buf, size_t size);
 
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 7356fe8c2..286073ff6 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -28,6 +28,7 @@
 #include "cgroup.h"
 #include "fdstore.h"
 #include "kerndat.h"
+#include "util-caps.h"
 
 #include "protobuf.h"
 #include "util.h"
@@ -1623,10 +1624,12 @@ int collect_namespaces(bool for_dump)
 
 int prepare_userns_creds(void)
 {
-	/* UID and GID must be set after restoring /proc/PID/{uid,gid}_maps */
-	if (setuid(0) || setgid(0) || setgroups(0, NULL)) {
-		pr_perror("Unable to initialize id-s");
-		return -1;
+	if (!opts.unprivileged || has_cap_setuid(opts.cap_eff)) {
+		/* UID and GID must be set after restoring /proc/PID/{uid,gid}_maps */
+		if (setuid(0) || setgid(0) || setgroups(0, NULL)) {
+			pr_perror("Unable to initialize id-s");
+			return -1;
+		}
 	}
 
 	/*
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index f80b68359..0e98cb3da 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -184,7 +184,7 @@ static int lsm_set_label(char *label, char *type, int procfd)
 	return 0;
 }
 
-static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_type)
+static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_type, uid_t uid)
 {
 	CredsEntry *ce = &args->creds;
 	int b, i, ret;
@@ -211,10 +211,12 @@ static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_typ
 	 * lose caps bits when changing xids.
 	 */
 
-	ret = sys_prctl(PR_SET_SECUREBITS, 1 << SECURE_NO_SETUID_FIXUP, 0, 0, 0);
-	if (ret) {
-		pr_err("Unable to set SECURE_NO_SETUID_FIXUP: %d\n", ret);
-		return -1;
+	if (!uid) {
+		ret = sys_prctl(PR_SET_SECUREBITS, 1 << SECURE_NO_SETUID_FIXUP, 0, 0, 0);
+		if (ret) {
+			pr_err("Unable to set SECURE_NO_SETUID_FIXUP: %d\n", ret);
+			return -1;
+		}
 	}
 
 	/*
@@ -252,10 +254,12 @@ static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_typ
 	 * special state any longer.
 	 */
 
-	ret = sys_prctl(PR_SET_SECUREBITS, ce->secbits, 0, 0, 0);
-	if (ret) {
-		pr_err("Unable to set PR_SET_SECUREBITS: %d\n", ret);
-		return -1;
+	if (!uid) {
+		ret = sys_prctl(PR_SET_SECUREBITS, ce->secbits, 0, 0, 0);
+		if (ret) {
+			pr_err("Unable to set PR_SET_SECUREBITS: %d\n", ret);
+			return -1;
+		}
 	}
 
 	/*
@@ -634,7 +638,7 @@ long __export_restore_thread(struct thread_restore_args *args)
 	if (restore_seccomp(args))
 		BUG();
 
-	ret = restore_creds(args->creds_args, args->ta->proc_fd, args->ta->lsm_type);
+	ret = restore_creds(args->creds_args, args->ta->proc_fd, args->ta->lsm_type, args->ta->uid);
 	ret = ret || restore_dumpable_flag(&args->ta->mm);
 	ret = ret || restore_pdeath_sig(args);
 	if (ret)
@@ -1915,7 +1919,7 @@ long __export_restore_task(struct task_restore_args *args)
 	 * turning off TCP repair is CAP_SYS_NED_ADMIN protected,
 	 * thus restore* creds _after_ all of the above.
 	 */
-	ret = restore_creds(args->t->creds_args, args->proc_fd, args->lsm_type);
+	ret = restore_creds(args->t->creds_args, args->proc_fd, args->lsm_type, args->uid);
 	ret = ret || restore_dumpable_flag(&args->mm);
 	ret = ret || restore_pdeath_sig(args->t);
 	ret = ret || restore_child_subreaper(args->child_subreaper);
diff --git a/criu/timens.c b/criu/timens.c
index 5803fc359..66c0c02a4 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -5,6 +5,7 @@
 #include "proc_parse.h"
 #include "namespaces.h"
 #include "timens.h"
+#include "cr_options.h"
 
 #include "protobuf.h"
 #include "images/timens.pb-c.h"
@@ -57,6 +58,9 @@ int prepare_timens(int id)
 	struct timespec ts;
 	struct timespec prev_moff = {}, prev_boff = {};
 
+	if (opts.unprivileged)
+		return 0;
+
 	img = open_image(CR_FD_TIMENS, O_RSTR, id);
 	if (!img)
 		return -1;
diff --git a/criu/util.c b/criu/util.c
index 060ca3bd4..b3b2b6659 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -41,6 +41,7 @@
 #include "namespaces.h"
 #include "criu-log.h"
 #include "syscall.h"
+#include "util-caps.h"
 
 #include "clone-noasan.h"
 #include "cr_options.h"
@@ -1426,6 +1427,9 @@ void rlimit_unlimit_nofile(void)
 {
 	struct rlimit new;
 
+	if (opts.unprivileged && !has_cap_sys_resource(opts.cap_eff))
+		return;
+
 	new.rlim_cur = kdat.sysctl_nr_open;
 	new.rlim_max = kdat.sysctl_nr_open;
 
@@ -2064,3 +2068,21 @@ out:
 	xfree(free_path);
 	return mp_path;
 }
+
+int set_opts_cap_eff(void)
+{
+	struct __user_cap_header_struct cap_header;
+	struct __user_cap_data_struct cap_data[_LINUX_CAPABILITY_U32S_3];
+	int i;
+
+	cap_header.version = _LINUX_CAPABILITY_VERSION_3;
+	cap_header.pid = getpid();
+
+	if (capget(&cap_header, &cap_data[0]))
+		return -1;
+
+	for (i = 0; i < _LINUX_CAPABILITY_U32S_3; i++)
+		memcpy(&opts.cap_eff[i], &cap_data[i].effective, sizeof(u32));
+
+	return 0;
+}
diff --git a/images/rpc.proto b/images/rpc.proto
index 3cf431639..afd2c7b43 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -139,6 +139,7 @@ message criu_opts {
 	optional criu_network_lock_method	network_lock		= 64 [default = IPTABLES];
 	optional bool			mntns_compat_mode	= 65;
 	optional bool			skip_file_rwx_check	= 66;
+	optional bool			unprivileged		= 67;
 /*	optional bool			check_mounts		= 128;	*/
 }
 
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 8171f7a12..fc8159999 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -566,6 +566,17 @@ void criu_set_skip_file_rwx_check(bool skip_file_rwx_check)
 	criu_local_set_skip_file_rwx_check(global_opts, skip_file_rwx_check);
 }
 
+void criu_local_set_unprivileged(criu_opts *opts, bool unprivileged)
+{
+	opts->rpc->has_unprivileged = true;
+	opts->rpc->unprivileged = unprivileged;
+}
+
+void criu_set_unprivileged(bool unprivileged)
+{
+	criu_local_set_unprivileged(global_opts, unprivileged);
+}
+
 void criu_local_set_orphan_pts_master(criu_opts *opts, bool orphan_pts_master)
 {
 	opts->rpc->has_orphan_pts_master = true;
diff --git a/lib/c/criu.h b/lib/c/criu.h
index c32a8a646..28a083d88 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -79,6 +79,7 @@ void criu_set_weak_sysctls(bool val);
 void criu_set_evasive_devices(bool evasive_devices);
 void criu_set_shell_job(bool shell_job);
 void criu_set_skip_file_rwx_check(bool skip_file_rwx_check);
+void criu_set_unprivileged(bool unprivileged);
 void criu_set_orphan_pts_master(bool orphan_pts_master);
 void criu_set_file_locks(bool file_locks);
 void criu_set_track_mem(bool track_mem);

From 47b07d0110e95ef6a4b6d2853cd483347bdcd89b Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Fri, 12 Aug 2022 11:58:01 -0700
Subject: [PATCH 1149/1854] non-root: Introduce unprivileged mode to kerndat

This patch modifies how kerndat is handled in unprivileged mode.

Initialization and functionality that can only be done as root is
made separate from common code. The kerndat file's location is
defined as $XDG_RUNTIME_DIR/criu.kdat in unprivileged mode. Since
we expect that directory to be on tmpfs we maintain the same behavior
as the root-mode kerndat which lives in /run.

Co-authored-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/kerndat.c | 186 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 142 insertions(+), 44 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 0f7d5fc8f..a209190ee 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -21,6 +21,7 @@
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 #include <nftables/libnftables.h>
 #endif
+#include <sys/utsname.h>
 
 #include "common/config.h"
 #include "int.h"
@@ -51,6 +52,7 @@
 #include "sched.h"
 #include "memfd.h"
 #include "mount-v2.h"
+#include "util-caps.h"
 
 struct kerndat_s kdat = {};
 
@@ -1075,19 +1077,66 @@ static int kerndat_has_openat2(void)
 	return 0;
 }
 
-#define KERNDAT_CACHE_FILE     KDAT_RUNDIR "/criu.kdat"
-#define KERNDAT_CACHE_FILE_TMP KDAT_RUNDIR "/.criu.kdat"
+#define KERNDAT_CACHE_NAME "criu.kdat"
+#define KERNDAT_CACHE_FILE KDAT_RUNDIR "/" KERNDAT_CACHE_NAME
 
+/*
+ * Returns:
+ * -1 if kdat_file was not written due to error
+ * 0 if kdat_file was written
+ * 1 if kdat_file was not written because cache directory undefined in env (non-root mode)
+ */
+static int get_kerndat_filename(char **kdat_file)
+{
+	int ret;
+
+	/*
+	 * Running as non-root, even with CAP_CHECKPOINT_RESTORE, does not
+	 * allow to write to KDAT_RUNDIR which usually is only writable by root.
+	 * Let's write criu.kdat file to XDG_RUNTIME_DIR for non-root cases.
+	 * Note that XDG_RUNTIME_DIR is not always defined (e.g. when executing
+	 * via su/sudo).
+	 */
+	if (opts.unprivileged) {
+		const char *cache_dir = getenv("XDG_RUNTIME_DIR");
+		if (!cache_dir) {
+			pr_warn("$XDG_RUNTIME_DIR not set. Cannot find location for kerndat file\n");
+			return 1;
+		}
+		ret = asprintf(kdat_file, "%s/%s", cache_dir, KERNDAT_CACHE_NAME);
+	} else {
+		ret = asprintf(kdat_file, "%s", KERNDAT_CACHE_FILE);
+	}
+
+	if (unlikely(ret < 0)) {
+		pr_warn("Cannot allocate memory for kerndat file name\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * Returns:
+ * -1 if error
+ * 0 if cache was loaded
+ * 1 if cache does not exist or is stale or cache directory undefined in env (non-root mode)
+ */
 static int kerndat_try_load_cache(void)
 {
+	cleanup_free char *kdat_file = NULL;
 	int fd, ret;
 
-	fd = open(KERNDAT_CACHE_FILE, O_RDONLY);
+	ret = get_kerndat_filename(&kdat_file);
+	if (ret)
+		return ret;
+
+	fd = open(kdat_file, O_RDONLY);
 	if (fd < 0) {
 		if (ENOENT == errno)
-			pr_debug("File %s does not exist\n", KERNDAT_CACHE_FILE);
+			pr_debug("File %s does not exist\n", kdat_file);
 		else
-			pr_warn("Can't load %s\n", KERNDAT_CACHE_FILE);
+			pr_warn("Can't load %s\n", kdat_file);
 		return 1;
 	}
 
@@ -1101,12 +1150,12 @@ static int kerndat_try_load_cache(void)
 	close(fd);
 
 	if (ret != sizeof(kdat) || kdat.magic1 != KDAT_MAGIC || kdat.magic2 != KDAT_MAGIC_2) {
-		pr_warn("Stale %s file\n", KERNDAT_CACHE_FILE);
-		unlink(KERNDAT_CACHE_FILE);
+		pr_warn("Stale %s file\n", kdat_file);
+		unlink(kdat_file);
 		return 1;
 	}
 
-	pr_info("Loaded kdat cache from %s\n", KERNDAT_CACHE_FILE);
+	pr_info("Loaded kdat cache from %s\n", kdat_file);
 	return 0;
 }
 
@@ -1114,8 +1163,20 @@ static void kerndat_save_cache(void)
 {
 	int fd, ret;
 	struct statfs s;
+	cleanup_free char *kdat_file = NULL;
+	cleanup_free char *kdat_file_tmp = NULL;
 
-	fd = open(KERNDAT_CACHE_FILE_TMP, O_CREAT | O_EXCL | O_WRONLY, 0600);
+	if (get_kerndat_filename(&kdat_file))
+		return;
+
+	ret = asprintf(&kdat_file_tmp, "%s.tmp", kdat_file);
+
+	if (unlikely(ret < 0)) {
+		pr_warn("Cannot allocate memory for kerndat file name\n");
+		return;
+	}
+
+	fd = open(kdat_file_tmp, O_CREAT | O_EXCL | O_WRONLY, 0600);
 	if (fd < 0)
 		/*
 		 * It can happen that we race with some other criu
@@ -1124,6 +1185,10 @@ static void kerndat_save_cache(void)
 		 */
 		return;
 
+	/*
+	 * If running as root we store the cache file on a tmpfs (/run),
+	 * because the file should be gone after reboot.
+	 */
 	if (fstatfs(fd, &s) < 0 || s.f_type != TMPFS_MAGIC) {
 		pr_warn("Can't keep kdat cache on non-tempfs\n");
 		close(fd);
@@ -1137,20 +1202,21 @@ static void kerndat_save_cache(void)
 	 */
 	kdat.magic1 = KDAT_MAGIC;
 	kdat.magic2 = KDAT_MAGIC_2;
+
 	ret = write(fd, &kdat, sizeof(kdat));
 	close(fd);
 
 	if (ret == sizeof(kdat))
-		ret = rename(KERNDAT_CACHE_FILE_TMP, KERNDAT_CACHE_FILE);
+		ret = rename(kdat_file_tmp, kdat_file);
 	else {
 		ret = -1;
 		errno = EIO;
 	}
 
 	if (ret < 0) {
-		pr_perror("Couldn't save %s", KERNDAT_CACHE_FILE);
+		pr_perror("Couldn't save %s", kdat_file);
 	unl:
-		unlink(KERNDAT_CACHE_FILE_TMP);
+		unlink(kdat_file);
 	}
 }
 
@@ -1158,6 +1224,14 @@ static int kerndat_uffd(void)
 {
 	int uffd, err = 0;
 
+	if (opts.unprivileged)
+		/*
+		 * If running as non-root uffd_open() fails with
+		 * 'Operation not permitted'. Just ignore uffd for
+		 * non-root for now.
+		 */
+		return 0;
+
 	kdat.uffd_features = 0;
 	uffd = uffd_open(0, &kdat.uffd_features, &err);
 
@@ -1499,6 +1573,45 @@ int kerndat_try_load_new(void)
 	return 0;
 }
 
+static int root_only_init(void)
+{
+	int ret = 0;
+
+	if (opts.unprivileged)
+		return 0;
+
+	if (!ret && kerndat_loginuid()) {
+		pr_err("kerndat_loginuid failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_tun_netns()) {
+		pr_err("kerndat_tun_netns failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_socket_unix_file()) {
+		pr_err("kerndat_socket_unix_file failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_link_nsid()) {
+		pr_err("kerndat_link_nsid failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_socket_netns()) {
+		pr_err("kerndat_socket_netns failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_nftables_concat()) {
+		pr_err("kerndat_has_nftables_concat failed when initializing kerndat.\n");
+		ret = -1;
+	}
+	if (!ret && kerndat_has_move_mount_set_group()) {
+		pr_err("kerndat_has_move_mount_set_group failed when initializing kerndat.\n");
+		ret = -1;
+	}
+
+	return ret;
+}
+
 int kerndat_init(void)
 {
 	int ret;
@@ -1516,7 +1629,16 @@ int kerndat_init(void)
 	memset(&kdat, 0, sizeof(kdat));
 
 	preload_socket_modules();
-	preload_netfilter_modules();
+	if (!opts.unprivileged)
+		/*
+		 * This uses 'iptables -L' to implicitly load necessary modules.
+		 * If the non nft backed iptables is used it does a
+		 * openat(AT_FDCWD, "/run/xtables.lock", O_RDONLY|O_CREAT, 0600) = -1 EACCES
+		 * which will fail as non-root. There are no capabilities to
+		 * change this. The iptables nft backend fails with
+		 * openat(AT_FDCWD, "/proc/net/ip_tables_names", O_RDONLY) = -1 EACCES
+		 */
+		preload_netfilter_modules();
 
 	if (check_pagemap()) {
 		pr_err("check_pagemap failed when initializing kerndat.\n");
@@ -1554,10 +1676,14 @@ int kerndat_init(void)
 		pr_err("get_ipv6 failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_loginuid()) {
-		pr_err("kerndat_loginuid failed when initializing kerndat.\n");
+	if (!ret && kerndat_nsid()) {
+		pr_err("kerndat_nsid failed when initializing kerndat.\n");
 		ret = -1;
 	}
+
+	if (!ret && root_only_init())
+		ret = -1;
+
 	if (!ret && kerndat_iptables_has_xtlocks()) {
 		pr_err("kerndat_iptables_has_xtlocks failed when initializing kerndat.\n");
 		ret = -1;
@@ -1570,22 +1696,6 @@ int kerndat_init(void)
 		pr_err("kerndat_compat_restore failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_tun_netns()) {
-		pr_err("kerndat_tun_netns failed when initializing kerndat.\n");
-		ret = -1;
-	}
-	if (!ret && kerndat_socket_unix_file()) {
-		pr_err("kerndat_socket_unix_file failed when initializing kerndat.\n");
-		ret = -1;
-	}
-	if (!ret && kerndat_nsid()) {
-		pr_err("kerndat_nsid failed when initializing kerndat.\n");
-		ret = -1;
-	}
-	if (!ret && kerndat_link_nsid()) {
-		pr_err("kerndat_link_nsid failed when initializing kerndat.\n");
-		ret = -1;
-	}
 	if (!ret && kerndat_has_memfd_create()) {
 		pr_err("kerndat_has_memfd_create failed when initializing kerndat.\n");
 		ret = -1;
@@ -1616,10 +1726,6 @@ int kerndat_init(void)
 		pr_err("kerndat_vdso_preserves_hint failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_socket_netns()) {
-		pr_err("kerndat_socket_netns failed when initializing kerndat.\n");
-		ret = -1;
-	}
 	if (!ret && kerndat_x86_has_ptrace_fpu_xsave_bug()) {
 		pr_err("kerndat_x86_has_ptrace_fpu_xsave_bug failed when initializing kerndat.\n");
 		ret = -1;
@@ -1644,7 +1750,7 @@ int kerndat_init(void)
 		pr_err("has_time_namespace failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_has_newifindex()) {
+	if (!ret && (!opts.unprivileged || has_cap_net_admin(opts.cap_eff)) && kerndat_has_newifindex()) {
 		pr_err("kerndat_has_newifindex failed when initializing kerndat.\n");
 		ret = -1;
 	}
@@ -1658,18 +1764,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_nspid failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_has_nftables_concat()) {
-		pr_err("kerndat_has_nftables_concat failed when initializing kerndat.\n");
-		ret = -1;
-	}
 	if (!ret && kerndat_sockopt_buf_lock()) {
 		pr_err("kerndat_sockopt_buf_lock failed when initializing kerndat.\n");
 		ret = -1;
 	}
-	if (!ret && kerndat_has_move_mount_set_group()) {
-		pr_err("kerndat_has_move_mount_set_group failed when initializing kerndat.\n");
-		ret = -1;
-	}
 	if (!ret && kerndat_has_openat2()) {
 		pr_err("kerndat_has_openat2 failed when initializing kerndat.\n");
 		ret = -1;

From 251939992a6a8d41742f10ba55d34e876c47c2d0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 3 May 2021 14:14:28 +0000
Subject: [PATCH 1150/1854] Documentation: add details about --unprivileged

This adds the non-root section and information about the parameter
--unprivileged to the man page.

Co-authored-by: Anna Singleton <annabeths111@gmail.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Anna Singleton <annabeths111@gmail.com>
---
 Documentation/criu.txt | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 8d2e91443..3b68f16a4 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -155,6 +155,12 @@ not compatible with *--external* *dev*.
             notification message contains a file descriptor for
             the master pty
 
+*--unprivileged*::
+    This option tells *criu* to accept the limitations when running
+    as non-root. Running as non-root requires *criu* at least to have
+    *CAP_SYS_ADMIN* or *CAP_CHECKPOINT_RESTORE*. For details about running
+    *criu* as non-root please consult the *NON-ROOT* section.
+
 *-V*, *--version*::
     Print program version and exit.
 
@@ -877,6 +883,32 @@ configuration file will overwrite all other configuration file settings
 or RPC options. *This can lead to undesired behavior of criu and
 should only be used carefully.*
 
+NON-ROOT
+--------
+*criu* can be used as non-root with either the *CAP_SYS_ADMIN* capability
+or with the *CAP_CHECKPOINT_RESTORE* capability introduces in Linux kernel 5.9.
+*CAP_CHECKPOINT_RESTORE* is the minimum that is required.
+
+*criu* also needs either *CAP_SYS_PTRACE* or a value of 0 in
+*/proc/sys/kernel/yama/ptrace_scope* (see *ptrace*(2)) to be able to interrupt
+the process for dumping.
+
+Running *criu* as non-root has many limitations and depending on the process
+to checkpoint and restore it may not be possible.
+
+In addition to *CAP_CHECKPOINT_RESTORE* it is possible to give *criu* additional
+capabilities to enable additional features in non-root mode.
+
+Currently *criu* can benefit from the following additional capabilities:
+
+    - *CAP_NET_ADMIN*
+    - *CAP_SYS_CHROOT*
+    - *CAP_SETUID*
+    - *CAP_SYS_RESOURCE*
+
+Independent of the capabilities it is always necessary to use "*--unprivileged*" to
+accept *criu*'s limitation in non-root mode.
+
 EXAMPLES
 --------
 To checkpoint a program with pid of *1234* and write all image files into

From 6743d608cf0854c9b90aff54e78c7c2e141034f0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 24 Jul 2020 16:18:31 +0000
Subject: [PATCH 1151/1854] non-root: extend zdtm.py to be able to run tests as
 non-root

These are the minimal changes to make zdtm.py successfully run the
env00 and pthread test case as non-root using the '--rootless' zdtm option.

Co-authored-by: Younes Manton <ymanton@ca.ibm.com>
Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 test/zdtm.py         | 56 +++++++++++++++++++++++++++++++++--------
 test/zdtm/lib/test.c | 47 ++++++++++++++++++----------------
 test/zdtm_ct.c       | 60 ++++++++++++++++++++++++--------------------
 3 files changed, 103 insertions(+), 60 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index aefcb36a4..a311610c3 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -41,6 +41,8 @@ STREAMED_IMG_FILE_NAME = "img.criu"
 prev_line = None
 uuid = uuid.uuid4()
 
+NON_ROOT_UID = 65534
+
 
 def alarm(*args):
     print("==== ALARM ====")
@@ -392,10 +394,11 @@ class test_fail_expected_exc(Exception):
 
 
 class zdtm_test:
-    def __init__(self, name, desc, flavor, freezer):
+    def __init__(self, name, desc, flavor, freezer, rootless):
         self.__name = name
         self.__desc = desc
         self.__freezer = None
+        self.__rootless = rootless
         self.__make_action('cleanout')
         self.__pid = 0
         self.__flavor = flavor
@@ -439,6 +442,8 @@ class zdtm_test:
         wait_pid_die(int(self.__pid), self.__name, self.__timeout)
 
     def __add_wperms(self):
+        if os.getuid() != 0:
+            return
         # Add write perms for .out and .pid files
         for b in self._bins:
             p = os.path.dirname(b)
@@ -457,6 +462,9 @@ class zdtm_test:
             env['ZDTM_NOTIFY_FDIN'] = "100"
             env['ZDTM_NOTIFY_FDOUT'] = "101"
 
+        if self.__rootless:
+            env['ZDTM_ROOTLESS'] = "1"
+
         if not test_flag(self.__desc, 'suid'):
             # Numbers should match those in criu
             env['ZDTM_UID'] = "18943"
@@ -618,11 +626,15 @@ class zdtm_test:
                 ["make", "zdtm_ct"], env=dict(os.environ, MAKEFLAGS=""))
         if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
             subprocess.check_call(["make", "-C", "zdtm/"])
+        if opts['rootless']:
+            return
         subprocess.check_call(
             ["flock", "zdtm_mount_cgroups.lock", "./zdtm_mount_cgroups", str(uuid)])
 
     @staticmethod
     def cleanup():
+        if opts['rootless']:
+            return
         subprocess.check_call(
             ["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups", str(uuid)])
 
@@ -640,7 +652,9 @@ def load_module_from_file(name, path):
 
 
 class inhfd_test:
-    def __init__(self, name, desc, flavor, freezer):
+    def __init__(self, name, desc, flavor, freezer, rootless):
+        if rootless:
+            raise test_fail_exc("This kind of test does not currently support rootless mode")
         self.__name = os.path.basename(name)
         print("Load %s" % name)
         self.__fdtyp = load_module_from_file(self.__name, name)
@@ -801,8 +815,8 @@ class inhfd_test:
 
 
 class groups_test(zdtm_test):
-    def __init__(self, name, desc, flavor, freezer):
-        zdtm_test.__init__(self, 'zdtm/lib/groups', desc, flavor, freezer)
+    def __init__(self, name, desc, flavor, freezer, rootless):
+        zdtm_test.__init__(self, 'zdtm/lib/groups', desc, flavor, freezer, rootless)
         if flavor.ns:
             self.__real_name = name
             with open(name) as fd:
@@ -1039,6 +1053,7 @@ class criu:
         self.__dedup = bool(opts['dedup'])
         self.__mdedup = bool(opts['noauto_dedup'])
         self.__user = bool(opts['user'])
+        self.__rootless = bool(opts['rootless'])
         self.__leave_stopped = bool(opts['stop'])
         self.__stream = bool(opts['stream'])
         self.__show_stats = bool(opts['show_stats'])
@@ -1138,6 +1153,9 @@ class criu:
 
         print("Run criu " + action)
 
+        if self.__rootless:
+            s_args += ["--unprivileged"]
+
         strace = []
         if self.__sat:
             fname = os.path.join(self.__ddir(), action + '.strace')
@@ -1156,7 +1174,10 @@ class criu:
         if action == "restore":
             preexec = None
         else:
-            preexec = self.__user and self.set_user_id or None
+            if os.getuid():
+                preexec = None
+            else:
+                preexec = self.__user and self.set_user_id or None
 
         __ddir = self.__ddir()
 
@@ -1476,10 +1497,11 @@ class criu:
             except Exception:
                 return False
 
-        return criu_cli.run(
-            "check",
-            ["--no-default-config", "--verbosity=0", "--feature", feature],
-            opts['criu_bin']) == 0
+        args = ["--no-default-config", "-verbosity=0", "--feature", feature]
+        if opts['rootless']:
+            args += ["--unprivileged"]
+
+        return criu_cli.run("check", args, opts['criu_bin']) == 0
 
     @staticmethod
     def available():
@@ -1900,7 +1922,7 @@ def do_run_test(tname, tdesc, flavs, opts):
         if opts['dry_run']:
             continue
         flav = flavors[f](opts)
-        t = tclass(tname, tdesc, flav, fcg)
+        t = tclass(tname, tdesc, flav, fcg, opts['rootless'])
         cr_api = criu(opts)
 
         try:
@@ -2051,7 +2073,8 @@ class Launcher:
               'sat', 'script', 'rpc', 'criu_config', 'lazy_pages', 'join_ns',
               'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
-              'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode', 'mntns_compat_mode')
+              'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode', 'mntns_compat_mode',
+              'rootless')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
         if self.__use_log:
@@ -2061,6 +2084,9 @@ class Launcher:
             logf = None
             log = None
 
+        if opts['rootless'] and os.getuid() == 0:
+            os.setgid(NON_ROOT_UID)
+            os.setuid(NON_ROOT_UID)
         sub = subprocess.Popen(["./zdtm_ct", "zdtm.py"],
                                env=dict(os.environ, CR_CT_TEST_INFO=arg),
                                stdout=log,
@@ -2600,6 +2626,10 @@ def set_nr_hugepages(nr):
         with open("/proc/sys/vm/nr_hugepages", "w") as f:
             f.write("{}\n".format(nr))
         return orig_hugepages
+    except PermissionError as err:
+        # EACCES is expected when running as non-root, otherwise re-raise the exception.
+        if err.errno != errno.EACCES or os.getuid() == 0:
+            raise
     except OSError as err:
         if err.errno != errno.EOPNOTSUPP:
             raise
@@ -2673,6 +2703,10 @@ def get_cli_args():
     rp.add_argument("--freezecg", help="Use freeze cgroup (path:state)")
     rp.add_argument("--user", help="Run CRIU as regular user",
                     action='store_true')
+    rp.add_argument(
+        "--rootless",
+        help="Run CRIU rootless (uid!=0) (needs CAP_CHECKPOINT_RESTORE)",
+        action='store_true')
     rp.add_argument("--rpc",
                     help="Run CRIU via RPC rather than CLI",
                     action='store_true')
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index 57eb42046..6291ea4a7 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -239,34 +239,37 @@ void test_init(int argc, char **argv)
 		exit(1);
 	}
 
-	val = getenv("ZDTM_GROUPS");
-	if (val) {
-		char *tok = NULL;
-		unsigned int size = 0, groups[NGROUPS_MAX];
+	val = getenv("ZDTM_ROOTLESS");
+	if (!val) {
+		val = getenv("ZDTM_GROUPS");
+		if (val) {
+			char *tok = NULL;
+			unsigned int size = 0, groups[NGROUPS_MAX];
 
-		tok = strtok(val, " ");
-		while (tok) {
-			size++;
-			groups[size - 1] = atoi(tok);
-			tok = strtok(NULL, " ");
+			tok = strtok(val, " ");
+			while (tok) {
+				size++;
+				groups[size - 1] = atoi(tok);
+				tok = strtok(NULL, " ");
+			}
+
+			if (setgroups(size, groups)) {
+				fprintf(stderr, "Can't set groups: %m");
+				exit(1);
+			}
 		}
 
-		if (setgroups(size, groups)) {
-			fprintf(stderr, "Can't set groups: %m");
+		val = getenv("ZDTM_GID");
+		if (val && (setgid(atoi(val)) == -1)) {
+			fprintf(stderr, "Can't set gid: %m");
 			exit(1);
 		}
-	}
 
-	val = getenv("ZDTM_GID");
-	if (val && (setgid(atoi(val)) == -1)) {
-		fprintf(stderr, "Can't set gid: %m");
-		exit(1);
-	}
-
-	val = getenv("ZDTM_UID");
-	if (val && (setuid(atoi(val)) == -1)) {
-		fprintf(stderr, "Can't set gid: %m");
-		exit(1);
+		val = getenv("ZDTM_UID");
+		if (val && (setuid(atoi(val)) == -1)) {
+			fprintf(stderr, "Can't set gid: %m");
+			exit(1);
+		}
 	}
 
 	if (prctl(PR_SET_DUMPABLE, 1)) {
diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index 0e8eeff8a..5e849b904 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -93,44 +93,50 @@ static int create_timens(void)
 
 int main(int argc, char **argv)
 {
+	uid_t uid;
 	pid_t pid;
 	int status;
 
+	uid = getuid();
+
 	/*
 	 * pidns is used to avoid conflicts
 	 * mntns is used to mount /proc
 	 * net is used to avoid conflicts of parasite sockets
 	 */
-	if (unshare(CLONE_NEWNS | CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC))
-		return 1;
+	if (!uid)
+		if (unshare(CLONE_NEWNS | CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC))
+			return 1;
 	pid = fork();
 	if (pid == 0) {
-		if (create_timens())
-			exit(1);
-		if (mount(NULL, "/", NULL, MS_REC | MS_SLAVE, NULL)) {
-			fprintf(stderr, "mount(/, S_REC | MS_SLAVE)): %m");
-			return 1;
+		if (!uid) {
+			if (create_timens())
+				exit(1);
+			if (mount(NULL, "/", NULL, MS_REC | MS_SLAVE, NULL)) {
+				fprintf(stderr, "mount(/, S_REC | MS_SLAVE)): %m");
+				return 1;
+			}
+			umount2("/proc", MNT_DETACH);
+			umount2("/dev/pts", MNT_DETACH);
+			if (mount("zdtm_proc", "/proc", "proc", 0, NULL)) {
+				fprintf(stderr, "mount(/proc): %m");
+				return 1;
+			}
+			if (mount("zdtm_devpts", "/dev/pts", "devpts", 0, "newinstance,ptmxmode=0666")) {
+				fprintf(stderr, "mount(pts): %m");
+				return 1;
+			}
+			if (mount("zdtm_binfmt", "/proc/sys/fs/binfmt_misc", "binfmt_misc", 0, NULL)) {
+				fprintf(stderr, "mount(binfmt_misc): %m");
+				return 1;
+			}
+			if (mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL)) {
+				fprintf(stderr, "mount(ptmx): %m");
+				return 1;
+			}
+			if (system("ip link set up dev lo"))
+				return 1;
 		}
-		umount2("/proc", MNT_DETACH);
-		umount2("/dev/pts", MNT_DETACH);
-		if (mount("zdtm_proc", "/proc", "proc", 0, NULL)) {
-			fprintf(stderr, "mount(/proc): %m");
-			return 1;
-		}
-		if (mount("zdtm_devpts", "/dev/pts", "devpts", 0, "newinstance,ptmxmode=0666")) {
-			fprintf(stderr, "mount(pts): %m");
-			return 1;
-		}
-		if (mount("zdtm_binfmt", "/proc/sys/fs/binfmt_misc", "binfmt_misc", 0, NULL)) {
-			fprintf(stderr, "mount(binfmt_misc): %m");
-			return 1;
-		}
-		if (mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL)) {
-			fprintf(stderr, "mount(ptmx): %m");
-			return 1;
-		}
-		if (system("ip link set up dev lo"))
-			return 1;
 		execv(argv[1], argv + 1);
 		fprintf(stderr, "execve: %m");
 		return 1;

From 1cba559da4684649bb344bb60217cef70705af0a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 24 Jul 2020 16:21:51 +0000
Subject: [PATCH 1152/1854] non-root: add non-root test case to cirrus runs

Run env00 and pthread00 test as non-root as initial proof of concept.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml           | 21 +++++++++++++++++++++
 scripts/ci/Makefile   |  5 ++++-
 scripts/ci/vagrant.sh | 12 ++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c7ed5027a..bad3a12b4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -68,6 +68,27 @@ task:
   build_script: |
     make -C scripts/ci vagrant-fedora-rawhide
 
+task:
+  name: Vagrant Fedora based test (non-root)
+  environment:
+    HOME: "/root"
+    CIRRUS_WORKING_DIR: "/tmp/criu"
+
+  compute_engine_instance:
+    image_project: cirrus-images
+    image: family/docker-kvm
+    platform: linux
+    cpu: 4
+    memory: 16G
+    nested_virtualization: true
+
+  setup_script: |
+    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
+    sudo kvm-ok
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+  build_script: |
+    make -C scripts/ci vagrant-fedora-non-root
+
 task:
   name: CentOS Stream 8 based test
   environment:
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 3a1634fb8..30dd9ebeb 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -97,7 +97,10 @@ vagrant-fedora-no-vdso: setup-vagrant
 vagrant-fedora-rawhide: setup-vagrant
 	./vagrant.sh fedora-rawhide
 
-.PHONY: setup-vagrant vagrant-fedora-no-vdso vagrant-fedora-rawhide
+vagrant-fedora-non-root: setup-vagrant
+	./vagrant.sh fedora-non-root
+
+.PHONY: setup-vagrant vagrant-fedora-no-vdso vagrant-fedora-rawhide vagrant-fedora-non-root
 
 %:
 	$(MAKE) -C ../build $@$(target-suffix)
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index af0f7335a..e23486f29 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -68,4 +68,16 @@ fedora-rawhide() {
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"'
 }
 
+fedora-non-root() {
+	ssh default uname -a
+	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
+	# Setting the capability should be the only line needed to run as non-root on Fedora
+	# In other environments either set /proc/sys/kernel/yama/ptrace_scope to 0 or grant cap_sys_ptrace to criu
+	ssh default 'sudo setcap cap_checkpoint_restore+eip /vagrant/criu/criu/criu'
+	# Run it once as non-root
+	ssh default 'cd /vagrant/criu; criu/criu check --unprivileged; ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/static/pthread00 -f h --rootless'
+	# Run it as root with '--rootless'
+	ssh default 'cd /vagrant/criu; sudo ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/static/pthread00 -f h; sudo chmod 777 test/dump/zdtm/static/{env00,pthread00}; sudo ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/static/pthread00 -f h --rootless'
+}
+
 $1

From 3db8d1a6c68556b0465f7513446f7ce97e3c29d7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 20 Oct 2022 18:25:11 +0300
Subject: [PATCH 1153/1854] cgroup: add a comment to restore_cgroup_prop about
 path argument requirements

In Virtuozzo we've faced out-of-bound access when calling this function
on short path string, which corrupted other memory and lead to
segmentation fault. So it may be useful to have this comment in code to
avoid such a missuse of this function in future.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cgroup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index d886ce9f2..6f6117c21 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1303,6 +1303,10 @@ static int restore_perms(int fd, const char *path, CgroupPerms *perms)
 	return 0;
 }
 
+/*
+ * Note: The path string can be modified in this function,
+ * the length of path string should be at least PATH_MAX.
+ */
 static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *path, int off, bool split_lines,
 			       bool skip_fails)
 {

From 840735aa08ce2a13d01ddb59112963d6c4327d7a Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 23 Oct 2022 14:16:21 +0700
Subject: [PATCH 1154/1854] ipc_sysctl: Prioritize restoring IPC variables
 using non usernsd approach

Since commit https://github.com/torvalds/linux/commit/5563cabdde, user with
enough capability can open IPC sysctl files and write to them. Therefore, we
don't need to use usernsd process in the outside user namespace to help with
that anymore. Furthermore, some later commits:
https://github.com/torvalds/linux/commit/1f5c135ee5,
https://github.com/torvalds/linux/commit/0889f44e28 bind the IPC namespace to
the opened file descriptor of IPC sysctl at the open() time, the changed value
does not depend on the IPC namespace of write() time anymore. This breaks the
current usernsd approach.

So, we prioritize opening/writing IPC sysctl files in the context of restored
process directly without usernsd help. This approach succeeds in the newer
kernel since the restored process has enough capabilities at this restore stage.
With older kernel, the open() fails and we fallback to the usernsd approach.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/include/sysctl.h |  7 ++++---
 criu/ipc_ns.c         | 11 ++++++++---
 criu/sysctl.c         | 35 +++++++++++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/criu/include/sysctl.h b/criu/include/sysctl.h
index ac7924dcd..cb3eba817 100644
--- a/criu/include/sysctl.h
+++ b/criu/include/sysctl.h
@@ -34,8 +34,9 @@ enum {
 /*
  * Some entries might be missing mark them as optional.
  */
-#define CTL_FLAGS_OPTIONAL	1
-#define CTL_FLAGS_HAS		2
-#define CTL_FLAGS_READ_EIO_SKIP 4
+#define CTL_FLAGS_OPTIONAL	  1
+#define CTL_FLAGS_HAS		  2
+#define CTL_FLAGS_READ_EIO_SKIP	  4
+#define CTL_FLAGS_IPC_EACCES_SKIP 5
 
 #endif /* __CR_SYSCTL_H__ */
diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c
index 4fe082fbb..7e95be8c5 100644
--- a/criu/ipc_ns.c
+++ b/criu/ipc_ns.c
@@ -292,6 +292,8 @@ static void pr_info_ipc_shm(const IpcShmEntry *shm)
 
 static int ipc_sysctl_req(IpcVarEntry *e, int op)
 {
+	int i;
+
 	struct sysctl_req req[] = {
 		{ "kernel/sem", e->sem_ctls, CTL_U32A(e->n_sem_ctls) },
 		{ "kernel/msgmax", &e->msg_ctlmax, CTL_U32 },
@@ -332,6 +334,9 @@ static int ipc_sysctl_req(IpcVarEntry *e, int op)
 	if (e->has_shm_next_id)
 		req[nr++] = req[16];
 
+	for (i = 0; i < nr; i++)
+		req[i].flags = CTL_FLAGS_IPC_EACCES_SKIP;
+
 	return sysctl_op(req, nr, op, CLONE_NEWIPC);
 }
 
@@ -570,7 +575,7 @@ static int prepare_ipc_sem_desc(struct cr_img *img, const IpcSemEntry *sem)
 {
 	int ret, id;
 	struct sysctl_req req[] = {
-		{ "kernel/sem_next_id", &sem->desc->id, CTL_U32 },
+		{ "kernel/sem_next_id", &sem->desc->id, CTL_U32, CTL_FLAGS_IPC_EACCES_SKIP },
 	};
 	struct semid_ds semid;
 
@@ -703,7 +708,7 @@ static int prepare_ipc_msg_queue(struct cr_img *img, const IpcMsgEntry *msq)
 {
 	int ret, id;
 	struct sysctl_req req[] = {
-		{ "kernel/msg_next_id", &msq->desc->id, CTL_U32 },
+		{ "kernel/msg_next_id", &msq->desc->id, CTL_U32, CTL_FLAGS_IPC_EACCES_SKIP },
 	};
 	struct msqid_ds msqid;
 
@@ -841,7 +846,7 @@ static int prepare_ipc_shm_seg(struct cr_img *img, const IpcShmEntry *shm)
 {
 	int ret, id, hugetlb_flag = 0;
 	struct sysctl_req req[] = {
-		{ "kernel/shm_next_id", &shm->desc->id, CTL_U32 },
+		{ "kernel/shm_next_id", &shm->desc->id, CTL_U32, CTL_FLAGS_IPC_EACCES_SKIP },
 	};
 	struct shmid_ds shmid;
 
diff --git a/criu/sysctl.c b/criu/sysctl.c
index b06688712..99026acf4 100644
--- a/criu/sysctl.c
+++ b/criu/sysctl.c
@@ -203,6 +203,17 @@ static int __userns_sysctl_op(void *arg, int proc_fd, pid_t pid)
 	 * 2. forks a task
 	 * 3. setns()es to the UTS/IPC namespace of the caller
 	 * 4. write()s to the files and exits
+	 *
+	 * For the IPC namespace, since
+	 * https://github.com/torvalds/linux/commit/5563cabdde, user with
+	 * enough capability can open IPC sysctl files and write to it. Later
+	 * commit https://github.com/torvalds/linux/commit/1f5c135ee5 and
+	 * https://github.com/torvalds/linux/commit/0889f44e28 bind the IPC
+	 * namespace at the open() time so the changed value does not depend
+	 * on the IPC namespace at the write() time. Also, the permission check
+	 * changes a little bit which makes the above approach unusable but we
+	 * can simply use nonuserns version for restoring as IPC sysctl as the
+	 * restored process currently has enough capability.
 	 */
 	dir = open("/proc/sys", O_RDONLY, O_DIRECTORY);
 	if (dir < 0) {
@@ -335,9 +346,12 @@ out:
 	return ret;
 }
 
-static int __nonuserns_sysctl_op(struct sysctl_req *req, size_t nr_req, int op)
+/* exit_code = 1 in case nonuserns failed but we want to fallback to userns approach */
+static int __nonuserns_sysctl_op(struct sysctl_req **orig_req, size_t *orig_nr_req, int op)
 {
 	int ret, exit_code = -1;
+	struct sysctl_req *req = *orig_req;
+	size_t nr_req = *orig_nr_req;
 
 	while (nr_req--) {
 		int fd;
@@ -351,6 +365,14 @@ static int __nonuserns_sysctl_op(struct sysctl_req *req, size_t nr_req, int op)
 				req++;
 				continue;
 			}
+			if (errno == EACCES && (req->flags & CTL_FLAGS_IPC_EACCES_SKIP)) {
+				/* The remaining requests are restored using userns approach */
+				*orig_req = req;
+				*orig_nr_req = nr_req + 1;
+				exit_code = 1;
+				goto out;
+			}
+
 			pr_perror("Can't open sysctl %s", req->name);
 			goto out;
 		}
@@ -404,7 +426,16 @@ int sysctl_op(struct sysctl_req *req, size_t nr_req, int op, unsigned int ns)
 	 * so we can do those in process as well.
 	 */
 	if (!ns || ns & CLONE_NEWNET || op == CTL_READ)
-		return __nonuserns_sysctl_op(req, nr_req, op);
+		return __nonuserns_sysctl_op(&req, &nr_req, op);
+
+	/* Try to use nonuserns for restoring IPC sysctl and fallback to
+	 * userns approach when the returned code is 1.
+	 */
+	if (ns & CLONE_NEWIPC && op == CTL_WRITE) {
+		ret = __nonuserns_sysctl_op(&req, &nr_req, op);
+		if (ret <= 0)
+			return ret;
+	}
 
 	/*
 	 * In order to avoid lots of opening of /proc/sys for each struct sysctl_req,

From 8a336ab22673bd8dbc838076edfc75dce809e781 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 25 Oct 2022 17:36:58 +0200
Subject: [PATCH 1155/1854] Switch aarch64 builds to Cirrus CI

It seems like drone.io no longer provides free aarch64/armhf CI runs.

This switches the aarch64 CI runs to Cirrus CI. armhf CI runs have been
dropped for now as they are not directly supported.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml | 37 ++++++++++++++++++++++++
 .drone.yml  | 82 -----------------------------------------------------
 2 files changed, 37 insertions(+), 82 deletions(-)
 delete mode 100644 .drone.yml

diff --git a/.cirrus.yml b/.cirrus.yml
index bad3a12b4..dbfb899ff 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -148,3 +148,40 @@ task:
 
   build_script: |
     make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_IGNORE_TAINT=1 ZDTM_OPTS="-x zdtm/static/socket-raw -x zdtm/static/child_subreaper_existing_child -x zdtm/static/fifo_upon_unix_socket01 -x zdtm/static/overmount_sock -x zdtm/static/tempfs_overmounted"
+
+task:
+  name: aarch64 build GCC (native)
+  arm_container:
+    image: docker.io/library/ubuntu:jammy
+    cpu: 4
+    memory: 4G
+  script: uname -a
+  build_script: |
+    scripts/ci/apt-install make
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+    make -C scripts/ci local
+
+task:
+  name: aarch64 build CLANG (native)
+  arm_container:
+    image: docker.io/library/ubuntu:jammy
+    cpu: 4
+    memory: 4G
+  script: uname -a
+  build_script: |
+    scripts/ci/apt-install make
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+    make -C scripts/ci local CLANG=1
+
+task:
+  name: aarch64 Fedora Rawhide
+  arm_container:
+    image: registry.fedoraproject.org/fedora:rawhide
+    cpu: 4
+    memory: 4G
+  script: uname -a
+  build_script: |
+    scripts/ci/prepare-for-fedora-rawhide.sh
+    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
+    make -C scripts/ci/ local CC=gcc SKIP_CI_PREP=1 SKIP_CI_TEST=1 CD_TO_TOP=1
+    make -C test/zdtm -j 4
diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 07eb8be65..000000000
--- a/.drone.yml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-kind: pipeline
-type: docker
-name: aarch64 build GCC (native)
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: build
-  image: ubuntu:focal
-  commands:
-  - scripts/ci/apt-install make
-  - make -C scripts/ci local
-
----
-kind: pipeline
-type: docker
-name: aarch64 build CLANG (native)
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: build
-  image: ubuntu:focal
-  commands:
-  - scripts/ci/apt-install make
-  - make -C scripts/ci local CLANG=1
-
----
-kind: pipeline
-type: docker
-name: armhf build GCC (native)
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  # At the time of setting up focal did not work
-  image: ubuntu:bionic
-  commands:
-  - scripts/ci/apt-install make
-  - make -C scripts/ci local
-
----
-kind: pipeline
-type: docker
-name: armhf build CLANG (native)
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  # At the time of setting up focal did not work
-  image: ubuntu:bionic
-  commands:
-  - scripts/ci/apt-install make
-  - make -C scripts/ci local CLANG=1
-
----
-kind: pipeline
-type: docker
-name: aarch64 Fedora Rawhide
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: build
-  image: registry.fedoraproject.org/fedora:rawhide
-  commands:
-  - scripts/ci/prepare-for-fedora-rawhide.sh
-  - make -C scripts/ci/ local CC=gcc SKIP_CI_PREP=1 SKIP_CI_TEST=1 CD_TO_TOP=1
-  - make -C test/zdtm -j 4

From 167cfd366edc2a10e61ae8c1ceb8e75bfe422937 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 4 Sep 2022 14:46:33 +0700
Subject: [PATCH 1156/1854] cgroup-v2: Checkpoint and restore some global
 properties

This commit supports checkpoint/restore some new global properties in cgroup-v2

	cgroup.subtree_control
	cgroup.max.descendants
	cgroup.max.depth
	cgroup.freeze
	cgroup.type

Only cgroup.subtree_control, cgroup.type need some more code to handle.
cgroup.subtree_control value needs to be set with "+", "-" prefix and
cgroup.type can only be written with value "threaded" if we want to make this
controller threaded. cgroup.type is a special property because this property
must be restored before any processes can move into this controller.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cgroup-props.c         |  17 ++++++
 criu/cgroup.c               | 108 ++++++++++++++++++++++++++++++++----
 criu/include/cgroup-props.h |   1 +
 3 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c
index 5bed7dd9d..1b85c5b5a 100644
--- a/criu/cgroup-props.c
+++ b/criu/cgroup-props.c
@@ -35,12 +35,29 @@ static const char *____criu_global_props____[] = {
 	"tasks",
 };
 
+/* cgroup2 global properties */
+// clang-format off
+static const char *____criu_global_props_v2____[] = {
+	"cgroup.subtree_control",
+	"cgroup.max.descendants",
+	"cgroup.max.depth",
+	"cgroup.freeze",
+	"cgroup.type",
+};
+// clang-format on
+
 cgp_t cgp_global = {
 	.name = "____criu_global_props____",
 	.nr_props = ARRAY_SIZE(____criu_global_props____),
 	.props = ____criu_global_props____,
 };
 
+cgp_t cgp_global_v2 = {
+	.name = "____criu_global_props_v2____",
+	.nr_props = ARRAY_SIZE(____criu_global_props_v2____),
+	.props = ____criu_global_props_v2____,
+};
+
 typedef struct {
 	struct list_head list;
 	cgp_t cgp;
diff --git a/criu/cgroup.c b/criu/cgroup.c
index 6f6117c21..4f68836be 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -441,7 +441,15 @@ static int add_cgroup_properties(const char *fpath, struct cgroup_dir *ncd, stru
 			pr_err("dumping known properties failed\n");
 			return -1;
 		}
+	}
 
+	/* cgroup v2 */
+	if (controller->controllers[0][0] == 0) {
+		if (dump_cg_props_array(fpath, ncd, &cgp_global_v2) < 0) {
+			pr_err("dumping global properties v2 failed\n");
+			return -1;
+		}
+	} else {
 		if (dump_cg_props_array(fpath, ncd, &cgp_global) < 0) {
 			pr_err("dumping global properties failed\n");
 			return -1;
@@ -1061,8 +1069,15 @@ static int ctrl_dir_and_opt(CgControllerEntry *ctl, char *dir, int ds, char *opt
  * it. We restore these properties as soon as the cgroup is created.
  */
 static const char *special_props[] = {
-	"cpuset.cpus",	     "cpuset.mems",	   "devices.list",	   "memory.kmem.limit_in_bytes",
-	"memory.swappiness", "memory.oom_control", "memory.use_hierarchy", NULL,
+	"cpuset.cpus",
+	"cpuset.mems",
+	"devices.list",
+	"memory.kmem.limit_in_bytes",
+	"memory.swappiness",
+	"memory.oom_control",
+	"memory.use_hierarchy",
+	"cgroup.type",
+	NULL,
 };
 
 bool is_special_property(const char *prop)
@@ -1303,6 +1318,65 @@ static int restore_perms(int fd, const char *path, CgroupPerms *perms)
 	return 0;
 }
 
+static int add_subtree_control_prop_prefix(char *input, char *output, char prefix)
+{
+	char *current, *next;
+	size_t len, off = 0;
+
+	current = input;
+	do {
+		next = strchrnul(current, ' ');
+		len = next - current;
+
+		output[off] = prefix;
+		off++;
+		memcpy(output + off, current, len);
+		off += len;
+		output[off] = ' ';
+		off++;
+
+		current = next + 1;
+	} while (*next != '\0');
+
+	return off;
+}
+
+static int restore_cgroup_subtree_control(const CgroupPropEntry *cg_prop_entry_p, int fd)
+{
+	char buf[1024];
+	char line[1024];
+	int ret, off = 0;
+
+	ret = read(fd, buf, sizeof(buf) - 1);
+	if (ret < 0) {
+		pr_perror("read from cgroup.subtree_control");
+		return ret;
+	}
+	/* Remove the trailing newline */
+	buf[ret] = '\0';
+
+	/* Remove all current subsys in subtree_control */
+	if (buf[0] != '\0')
+		off = add_subtree_control_prop_prefix(buf, line, '-');
+
+	/* Add subsys need to be restored in subtree_control */
+	if (cg_prop_entry_p->value[0] != '\0')
+		off += add_subtree_control_prop_prefix(cg_prop_entry_p->value, line + off, '+');
+
+	/* Remove the trailing space */
+	if (off != 0) {
+		off--;
+		line[off] = '\0';
+	}
+
+	if (write(fd, line, off) != off) {
+		pr_perror("write to cgroup.subtree_control");
+		return -1;
+	}
+
+	return 0;
+}
+
 /*
  * Note: The path string can be modified in this function,
  * the length of path string should be at least PATH_MAX.
@@ -1310,8 +1384,9 @@ static int restore_perms(int fd, const char *path, CgroupPerms *perms)
 static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *path, int off, bool split_lines,
 			       bool skip_fails)
 {
-	int cg, fd, ret = -1;
+	int cg, fd, ret = -1, flag;
 	CgroupPerms *perms = cg_prop_entry_p->perms;
+	int is_subtree_control = !strcmp(cg_prop_entry_p->name, "cgroup.subtree_control");
 
 	if (opts.manage_cgroups == CG_MODE_IGNORE)
 		return 0;
@@ -1328,8 +1403,13 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *pat
 
 	pr_info("Restoring cgroup property value [%s] to [%s]\n", cg_prop_entry_p->value, path);
 
+	if (is_subtree_control)
+		flag = O_RDWR;
+	else
+		flag = O_WRONLY;
+
 	cg = get_service_fd(CGROUP_YARD);
-	fd = openat(cg, path, O_WRONLY);
+	fd = openat(cg, path, flag);
 	if (fd < 0) {
 		pr_perror("bad cgroup path: %s", path);
 		return -1;
@@ -1344,6 +1424,17 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *pat
 		goto out;
 	}
 
+	if (is_subtree_control) {
+		ret = restore_cgroup_subtree_control(cg_prop_entry_p, fd);
+		goto out;
+	}
+
+	/* skip restoring cgroup.type if its value is not "threaded" */
+	if (!strcmp(cg_prop_entry_p->name, "cgroup.type") && strcmp(cg_prop_entry_p->value, "threaded")) {
+		ret = 0;
+		goto out;
+	}
+
 	if (split_lines) {
 		char *line = cg_prop_entry_p->value;
 		char *next_line;
@@ -1688,12 +1779,9 @@ static int prepare_cgroup_dirs(char **controllers, int n_controllers, char *paux
 				return -1;
 
 			for (j = 0; j < n_controllers; j++) {
-				if (!strcmp(controllers[j], "cpuset") || !strcmp(controllers[j], "memory") ||
-				    !strcmp(controllers[j], "devices")) {
-					if (restore_special_props(paux, off2, e) < 0) {
-						pr_err("Restoring special cpuset props failed!\n");
-						return -1;
-					}
+				if (restore_special_props(paux, off2, e) < 0) {
+					pr_err("Restoring special cpuset props failed!\n");
+					return -1;
 				}
 			}
 		} else {
diff --git a/criu/include/cgroup-props.h b/criu/include/cgroup-props.h
index 11b677548..10a7061b8 100644
--- a/criu/include/cgroup-props.h
+++ b/criu/include/cgroup-props.h
@@ -10,6 +10,7 @@ typedef struct {
 } cgp_t;
 
 extern cgp_t cgp_global;
+extern cgp_t cgp_global_v2;
 extern const cgp_t *cgp_get_props(const char *name);
 extern bool cgp_should_skip_controller(const char *name);
 extern bool cgp_add_dump_controller(const char *name);

From d7e8746598015cfeee0d114fed89cdb5531abd2c Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 13 Sep 2022 21:42:48 +0700
Subject: [PATCH 1157/1854] zdtm: Add write_value/read_value helpers into zdtm
 library

Add write_value/read_value helpers to write/read buffer to/from files into zdmt
library.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/lib/Makefile      |  2 +-
 test/zdtm/lib/file.c        | 46 +++++++++++++++++++++++++++++++++++++
 test/zdtm/lib/zdtmtst.h     |  3 +++
 test/zdtm/static/cgroup04.c | 20 ----------------
 4 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 test/zdtm/lib/file.c

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index 3ec58dfaf..949dc123a 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -4,7 +4,7 @@ CFLAGS	+= $(USERCFLAGS)
 
 LIB	:= libzdtmtst.a
 
-LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c mem.c
+LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c mem.c file.c
 
 PKG_CONFIG ?= pkg-config
 pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
diff --git a/test/zdtm/lib/file.c b/test/zdtm/lib/file.c
new file mode 100644
index 000000000..57d85421d
--- /dev/null
+++ b/test/zdtm/lib/file.c
@@ -0,0 +1,46 @@
+#include <fcntl.h>
+#include <unistd.h>
+#include "zdtmtst.h"
+
+int write_value(const char *path, const char *value)
+{
+	int fd, l;
+
+	fd = open(path, O_WRONLY);
+	if (fd < 0) {
+		pr_perror("open %s", path);
+		return -1;
+	}
+
+	l = write(fd, value, strlen(value));
+	if (l < 0) {
+		pr_perror("failed to write %s to %s", value, path);
+		close(fd);
+		return -1;
+	}
+
+	close(fd);
+	return 0;
+}
+
+int read_value(const char *path, char *value, int size)
+{
+	int fd, ret;
+
+	fd = open(path, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("open %s", path);
+		return -1;
+	}
+
+	ret = read(fd, (void *)value, size);
+	if (ret < 0) {
+		pr_perror("read %s", path);
+		close(fd);
+		return -1;
+	}
+
+	value[ret] = '\0';
+	close(fd);
+	return 0;
+}
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index d91886d25..105f3c11a 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -216,4 +216,7 @@ static inline void cleanup_closep(void *p)
 		TEMP_FAILURE_RETRY(close(*pp));
 }
 
+extern int write_value(const char *path, const char *value);
+extern int read_value(const char *path, char *value, int size);
+
 #endif /* _VIMITESU_H_ */
diff --git a/test/zdtm/static/cgroup04.c b/test/zdtm/static/cgroup04.c
index 5a424be12..8c40ffd6b 100644
--- a/test/zdtm/static/cgroup04.c
+++ b/test/zdtm/static/cgroup04.c
@@ -19,26 +19,6 @@ char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
 static const char *cgname = "zdtmtst";
 
-int write_value(const char *path, const char *value)
-{
-	int fd, l;
-
-	fd = open(path, O_WRONLY);
-	if (fd < 0) {
-		pr_perror("open %s", path);
-		return -1;
-	}
-
-	l = write(fd, value, strlen(value));
-	close(fd);
-	if (l < 0) {
-		pr_perror("failed to write %s to %s", value, path);
-		return -1;
-	}
-
-	return 0;
-}
-
 int mount_and_add(const char *controller, const char *path, const char *prop, const char *value)
 {
 	char aux[1024], paux[1024], subdir[1024];

From ad3936e81e1484d1abfbcec2c4ca1b41ae0d570b Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 4 Sep 2022 15:05:10 +0700
Subject: [PATCH 1158/1854] zdtm: Add test to check global properties of
 cgroup-v2 are preserved

Check that CRIU can checkpoint/restore global properties in cgroup-v2 properly.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile              |  1 +
 test/zdtm/static/cgroupv2_00.c         | 86 ++++++++++++++++++++++++++
 test/zdtm/static/cgroupv2_00.checkskip | 11 ++++
 test/zdtm/static/cgroupv2_00.desc      |  1 +
 test/zdtm/static/cgroupv2_00.hook      | 16 +++++
 5 files changed, 115 insertions(+)
 create mode 100644 test/zdtm/static/cgroupv2_00.c
 create mode 100755 test/zdtm/static/cgroupv2_00.checkskip
 create mode 100644 test/zdtm/static/cgroupv2_00.desc
 create mode 100755 test/zdtm/static/cgroupv2_00.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 0ac22731b..915e565bd 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -386,6 +386,7 @@ TST_DIR		=				\
 		cgroup02			\
 		cgroup03			\
 		cgroup04			\
+		cgroupv2_00			\
 		cgroup_ifpriomap		\
 		cgroup_ignore			\
 		cgroup_stray			\
diff --git a/test/zdtm/static/cgroupv2_00.c b/test/zdtm/static/cgroupv2_00.c
new file mode 100644
index 000000000..2c6780e0c
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_00.c
@@ -0,0 +1,86 @@
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that some cgroup-v2 properties in kernel controllers are preserved";
+const char *test_author = "Bui Quang Minh <minhquangbui99@gmail.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "cgroup-v2 directory name", 1);
+const char *cgname = "subcg00";
+
+int main(int argc, char **argv)
+{
+	char path[1024], aux[1024];
+	int ret = -1;
+
+	test_init(argc, argv);
+
+	if (mkdir(dirname, 0700) < 0 && errno != EEXIST) {
+		pr_perror("Can't make dir");
+		return -1;
+	}
+
+	if (mount("cgroup2", dirname, "cgroup2", 0, NULL)) {
+		pr_perror("Can't mount cgroup-v2");
+		return -1;
+	}
+
+	sprintf(path, "%s/%s", dirname, cgname);
+	if (mkdir(path, 0700) < 0 && errno != EEXIST) {
+		pr_perror("Can't make dir");
+		goto out;
+	}
+
+	/* Make cpuset controllers available in children directory */
+	sprintf(path, "%s/%s", dirname, "cgroup.subtree_control");
+	sprintf(aux, "%s", "+cpuset");
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.subtree_control");
+	sprintf(aux, "%s", "+cpuset");
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.type");
+	sprintf(aux, "%s", "threaded");
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.procs");
+	sprintf(aux, "%d", getpid());
+	if (write_value(path, aux))
+		goto out;
+
+	test_daemon();
+	test_waitsig();
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.subtree_control");
+	if (read_value(path, aux, sizeof(aux)))
+		goto out;
+
+	if (strcmp(aux, "cpuset\n")) {
+		fail("cgroup.subtree_control mismatches");
+		goto out;
+	}
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.type");
+	if (read_value(path, aux, sizeof(aux)))
+		goto out;
+
+	if (strcmp(aux, "threaded\n")) {
+		fail("cgroup.type mismatches");
+		goto out;
+	}
+
+	pass();
+
+	ret = 0;
+
+out:
+	sprintf(path, "%s", dirname);
+	umount(path);
+	return ret;
+}
diff --git a/test/zdtm/static/cgroupv2_00.checkskip b/test/zdtm/static/cgroupv2_00.checkskip
new file mode 100755
index 000000000..375ed3564
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_00.checkskip
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
+	grep -q "cpuset" /sys/fs/cgroup/cgroup.controllers && exit 0
+fi
+
+if [ -d /sys/fs/cgroup/unified ]; then
+	grep -q "cpuset" /sys/fs/cgroup/unified/cgroup.controllers && exit 0
+fi
+
+exit 1
diff --git a/test/zdtm/static/cgroupv2_00.desc b/test/zdtm/static/cgroupv2_00.desc
new file mode 100644
index 000000000..4bfd4b265
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_00.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns', 'flags': 'suid', 'opts': '--manage-cgroups=full'}
diff --git a/test/zdtm/static/cgroupv2_00.hook b/test/zdtm/static/cgroupv2_00.hook
new file mode 100755
index 000000000..1002b1ec5
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_00.hook
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+[ "$1" == "--clean" -o "$1" == "--pre-restore" ] || exit 0
+
+set -e
+cgname="subcg00"
+tname=$(mktemp -d cgclean.XXXXXX)
+mount -t cgroup2 cgroup2 $tname
+
+echo "Cleaning $tname"
+echo "-cpuset" > "$tname/$cgname/cgroup.subtree_control"
+
+set +e
+rmdir "$tname/$cgname"
+umount "$tname"
+rmdir "$tname"

From 17d1d8810e8ba7b5fa4a117a80b86a39cc98da2e Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 4 Sep 2022 15:31:13 +0700
Subject: [PATCH 1159/1854] cgroup-v2: Dump cgroup controllers of every threads
 in a process

Currently, we assume all threads in process are in the same cgroup controllers.
However, with threaded controllers, threads in a process may be in different
controllers. So we need to dump cgroup controllers of every threads in process
and fixup the procfs cgroup parsing to parse from self/task/<tid>/cgroup.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cgroup.c           | 38 ++++++++++++++++++++---------
 criu/cr-dump.c          | 53 +++++++++++++++++++++++++++++++++++++++--
 criu/image.c            |  2 +-
 criu/include/cgroup.h   |  8 +++++--
 criu/include/parasite.h |  7 +++++-
 criu/parasite-syscall.c |  1 +
 criu/pie/parasite.c     |  2 +-
 criu/proc_parse.c       |  5 ++--
 images/cgroup.proto     |  1 +
 images/core.proto       |  1 +
 10 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 4f68836be..b238b6402 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -174,6 +174,7 @@ struct cg_controller *new_controller(const char *name)
 	nc->n_controllers = 1;
 
 	nc->n_heads = 0;
+	nc->is_threaded = false;
 	INIT_LIST_HEAD(&nc->heads);
 
 	return nc;
@@ -371,7 +372,8 @@ static void free_all_cgroup_props(struct cgroup_dir *ncd)
 	ncd->n_properties = 0;
 }
 
-static int dump_cg_props_array(const char *fpath, struct cgroup_dir *ncd, const cgp_t *cgp)
+static int dump_cg_props_array(const char *fpath, struct cgroup_dir *ncd, const cgp_t *cgp,
+			       struct cg_controller *controller)
 {
 	int j;
 	char buf[PATH_MAX];
@@ -422,6 +424,13 @@ static int dump_cg_props_array(const char *fpath, struct cgroup_dir *ncd, const
 			prop->value = new;
 		}
 
+		/*
+		 * Set the is_threaded flag if cgroup.type's value is threaded,
+		 * ignore all other values.
+		 */
+		if (!strcmp("cgroup.type", prop->name) && !strcmp("threaded", prop->value))
+			controller->is_threaded = true;
+
 		pr_info("Dumping value %s from %s/%s\n", prop->value, fpath, prop->name);
 		list_add_tail(&prop->list, &ncd->properties);
 		ncd->n_properties++;
@@ -437,7 +446,7 @@ static int add_cgroup_properties(const char *fpath, struct cgroup_dir *ncd, stru
 	for (i = 0; i < controller->n_controllers; ++i) {
 		const cgp_t *cgp = cgp_get_props(controller->controllers[i]);
 
-		if (dump_cg_props_array(fpath, ncd, cgp) < 0) {
+		if (dump_cg_props_array(fpath, ncd, cgp, controller) < 0) {
 			pr_err("dumping known properties failed\n");
 			return -1;
 		}
@@ -445,12 +454,12 @@ static int add_cgroup_properties(const char *fpath, struct cgroup_dir *ncd, stru
 
 	/* cgroup v2 */
 	if (controller->controllers[0][0] == 0) {
-		if (dump_cg_props_array(fpath, ncd, &cgp_global_v2) < 0) {
+		if (dump_cg_props_array(fpath, ncd, &cgp_global_v2, controller) < 0) {
 			pr_err("dumping global properties v2 failed\n");
 			return -1;
 		}
 	} else {
-		if (dump_cg_props_array(fpath, ncd, &cgp_global) < 0) {
+		if (dump_cg_props_array(fpath, ncd, &cgp_global, controller) < 0) {
 			pr_err("dumping global properties failed\n");
 			return -1;
 		}
@@ -735,9 +744,9 @@ static int collect_cgroups(struct list_head *ctls)
 	return 0;
 }
 
-int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_cgroup_args *args)
+int dump_thread_cgroup(const struct pstree_item *item, u32 *cg_id, struct parasite_dump_cgroup_args *args, int id)
 {
-	int pid;
+	int pid, tid;
 	LIST_HEAD(ctls);
 	unsigned int n_ctls = 0;
 	struct cg_set *cs;
@@ -750,8 +759,13 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
 	else
 		pid = getpid();
 
-	pr_info("Dumping cgroups for %d\n", pid);
-	if (parse_task_cgroup(pid, args, &ctls, &n_ctls))
+	if (id < 0)
+		tid = pid;
+	else
+		tid = item->threads[id].real;
+
+	pr_info("Dumping cgroups for thread %d\n", tid);
+	if (parse_thread_cgroup(pid, tid, args, &ctls, &n_ctls))
 		return -1;
 
 	cs = get_cg_set(&ctls, n_ctls, item);
@@ -764,9 +778,10 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
 		pr_info("Set %d is criu one\n", cs->id);
 	} else {
 		if (item == root_item) {
-			BUG_ON(root_cgset);
-			root_cgset = cs;
-			pr_info("Set %d is root one\n", cs->id);
+			if (!root_cgset) {
+				root_cgset = cs;
+				pr_info("Set %d is root one\n", cs->id);
+			}
 		} else {
 			struct cg_ctl *root, *stray;
 
@@ -913,6 +928,7 @@ static int dump_controllers(CgroupEntry *cg)
 	list_for_each_entry(cur, &cgroups, l) {
 		cg_controller_entry__init(ce);
 
+		ce->is_threaded = cur->is_threaded;
 		ce->cnames = cur->controllers;
 		ce->n_cnames = cur->n_controllers;
 		ce->n_dirs = cur->n_heads;
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 210f66232..e31b2f702 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -759,6 +759,7 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 	pid_t pid = item->pid->real;
 	int ret = -1;
 	struct parasite_dump_cgroup_args cgroup_args, *info = NULL;
+	u32 *cg_set;
 
 	BUILD_BUG_ON(sizeof(cgroup_args) < PARASITE_ARG_SIZE_MIN);
 
@@ -804,13 +805,23 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 	 */
 	if (item->ids->has_cgroup_ns_id && !item->parent) {
 		info = &cgroup_args;
+		strcpy(cgroup_args.thread_cgrp, "self/cgroup");
 		ret = parasite_dump_cgroup(ctl, &cgroup_args);
 		if (ret)
 			goto err;
 	}
 
-	core->tc->has_cg_set = true;
-	ret = dump_task_cgroup(item, &core->tc->cg_set, info);
+	/*
+	 * We don't support multithreads zombie tasks so there is
+	 * no thread_core in zombie tasks, store the cg_set in
+	 * task_core in these cases.
+	 */
+	cg_set = &core->thread_core->cg_set;
+	if (item->pid->state == TASK_THREAD) {
+		core->tc->has_cg_set = true;
+		cg_set = &core->tc->cg_set;
+	}
+	ret = dump_thread_cgroup(item, cg_set, info, -1);
 	if (ret)
 		goto err;
 
@@ -1409,6 +1420,38 @@ err:
 	return ret;
 }
 
+static int dump_task_cgroup(struct parasite_ctl *parasite_ctl, const struct pstree_item *item)
+{
+	struct parasite_dump_cgroup_args cgroup_args, *info;
+	int i;
+
+	BUILD_BUG_ON(sizeof(cgroup_args) < PARASITE_ARG_SIZE_MIN);
+	for (i = 0; i < item->nr_threads; i++) {
+		CoreEntry *core = item->core[i];
+
+		/* Leader is already dumped */
+		if (item->pid->real == item->threads[i].real)
+			continue;
+
+		/* For now, we only need to dump the root task's cgroup ns, because we
+		 * know all the tasks are in the same cgroup namespace because we don't
+		 * allow nesting.
+		 */
+		info = NULL;
+		if (item->ids->has_cgroup_ns_id && !item->parent) {
+			info = &cgroup_args;
+			sprintf(cgroup_args.thread_cgrp, "self/task/%d/cgroup", item->threads[i].ns[0].virt);
+			if (parasite_dump_cgroup(parasite_ctl, &cgroup_args))
+				return -1;
+		}
+
+		if (dump_thread_cgroup(item, &core->thread_core->cg_set, info, i))
+			return -1;
+	}
+
+	return 0;
+}
+
 static int pre_dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 {
 	pid_t pid = item->pid->real;
@@ -1681,6 +1724,12 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 		goto err_cure;
 	}
 
+	ret = dump_task_cgroup(parasite_ctl, item);
+	if (ret) {
+		pr_err("Dump cgroup of threads in process (pid: %d) failed with %d\n", pid, ret);
+		goto err_cure;
+	}
+
 	ret = compel_stop_daemon(parasite_ctl);
 	if (ret) {
 		pr_err("Can't stop daemon in parasite (pid: %d)\n", pid);
diff --git a/criu/image.c b/criu/image.c
index 3c2127ac6..9fb390ab7 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -228,7 +228,7 @@ int prepare_inventory(InventoryEntry *he)
 
 	if (!opts.unprivileged)
 		he->has_root_cg_set = true;
-	if (dump_task_cgroup(NULL, &he->root_cg_set, NULL))
+	if (dump_thread_cgroup(NULL, &he->root_cg_set, NULL, -1))
 		return -1;
 
 	he->root_ids = crt.i.ids;
diff --git a/criu/include/cgroup.h b/criu/include/cgroup.h
index 2e9b8933c..5a254559d 100644
--- a/criu/include/cgroup.h
+++ b/criu/include/cgroup.h
@@ -7,7 +7,7 @@
 struct pstree_item;
 struct parasite_dump_cgroup_args;
 extern u32 root_cg_set;
-int dump_task_cgroup(struct pstree_item *, u32 *, struct parasite_dump_cgroup_args *args);
+int dump_thread_cgroup(const struct pstree_item *, u32 *, struct parasite_dump_cgroup_args *args, int id);
 int dump_cgroups(void);
 int prepare_task_cgroup(struct pstree_item *);
 int prepare_cgroup(void);
@@ -60,6 +60,9 @@ struct cg_controller {
 
 	/* for cgroup list in cgroup.c */
 	struct list_head l;
+
+	/* controller is a threaded cgroup or not */
+	int is_threaded;
 };
 struct cg_controller *new_controller(const char *name);
 
@@ -87,7 +90,8 @@ struct cg_ctl {
  */
 struct list_head;
 struct parasite_dump_cgroup_args;
-extern int parse_task_cgroup(int pid, struct parasite_dump_cgroup_args *args, struct list_head *l, unsigned int *n);
+extern int parse_thread_cgroup(int pid, int tid, struct parasite_dump_cgroup_args *args, struct list_head *l,
+			       unsigned int *n);
 extern void put_ctls(struct list_head *);
 
 int collect_controllers(struct list_head *cgroups, unsigned int *n_cgroups);
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index d2a06889f..787c927be 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -241,7 +241,12 @@ struct parasite_dump_cgroup_args {
 	 *
 	 * The string is null terminated.
 	 */
-	char contents[1 << 12];
+	char contents[(1 << 12) - 32];
+	/*
+	 * Contains the path to thread cgroup procfs.
+	 * "self/task/<tid>/cgroup"
+	 */
+	char thread_cgrp[32];
 };
 
 #endif /* !__ASSEMBLY__ */
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index ee4fa86f4..d3541d996 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -513,6 +513,7 @@ int parasite_dump_cgroup(struct parasite_ctl *ctl, struct parasite_dump_cgroup_a
 	struct parasite_dump_cgroup_args *ca;
 
 	ca = compel_parasite_args(ctl, struct parasite_dump_cgroup_args);
+	memcpy(ca->thread_cgrp, cgroup->thread_cgrp, sizeof(ca->thread_cgrp));
 	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_CGROUP, ctl);
 	if (ret) {
 		pr_err("Parasite failed to dump /proc/self/cgroup\n");
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index f75fe13bb..2303f41c3 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -745,7 +745,7 @@ static int parasite_dump_cgroup(struct parasite_dump_cgroup_args *args)
 		return -1;
 	}
 
-	cgroup = sys_openat(proc, "self/cgroup", O_RDONLY, 0);
+	cgroup = sys_openat(proc, args->thread_cgrp, O_RDONLY, 0);
 	sys_close(proc);
 	if (cgroup < 0) {
 		pr_err("can't get /proc/self/cgroup fd\n");
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 946b0fc40..abac5908b 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -2549,7 +2549,8 @@ err:
 	return -1;
 }
 
-int parse_task_cgroup(int pid, struct parasite_dump_cgroup_args *args, struct list_head *retl, unsigned int *n)
+int parse_thread_cgroup(int pid, int tid, struct parasite_dump_cgroup_args *args, struct list_head *retl,
+			unsigned int *n)
 {
 	FILE *f;
 	int ret;
@@ -2557,7 +2558,7 @@ int parse_task_cgroup(int pid, struct parasite_dump_cgroup_args *args, struct li
 	unsigned int n_internal = 0;
 	struct cg_ctl *intern, *ext;
 
-	f = fopen_proc(pid, "cgroup");
+	f = fopen_proc(pid, "task/%d/cgroup", tid);
 	if (!f)
 		return -1;
 
diff --git a/images/cgroup.proto b/images/cgroup.proto
index ee0354124..5c7d16c6d 100644
--- a/images/cgroup.proto
+++ b/images/cgroup.proto
@@ -24,6 +24,7 @@ message cgroup_dir_entry {
 message cg_controller_entry {
 	repeated string			cnames		= 1;
 	repeated cgroup_dir_entry	dirs		= 2;
+	required bool			is_threaded	= 3;
 }
 
 message cg_member_entry {
diff --git a/images/core.proto b/images/core.proto
index 345bdca53..1ee32bfda 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -105,6 +105,7 @@ message thread_core_entry {
 	optional string			comm		= 13;
 	optional uint64			blk_sigset_extended	= 14;
 	optional rseq_entry		rseq_entry	= 15;
+	required uint32			cg_set		= 16;
 }
 
 message task_rlimits_entry {

From 20ea8a064785d4900c0e9e01e83c52c88572a9a1 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 4 Sep 2022 15:41:17 +0700
Subject: [PATCH 1160/1854] cgroup-v2: Restore threads in a process into
 correct threaded controllers

As threads in a process may be in different threaded controllers, we need to
move thoses threads to the correct controllers.

Because the threads of a process are restored in later stage in restorer.c, we
need to create a cgroupd service to help to move those threads into correct
controllers when they are restored. We cannot use usernsd as the code in
restorer does not know the address of outside function to pass to userns_call.
However, this cgroupd service still reuses a lot of code from usernsd.

The main logic is that restored threads receive the cg_set number they belong to
before restorer stage in case their cg_set are different from main thread. When
these threads are restored, they send the cg_set number and their thread ids
through unix socket to cgroupd. cgroupd receives the cg_set number and thread
ids and moves those threads into correct controllers. Thread ids are sent
through SCM_CREDENTIALS of unix socket so they are translated into correct
thread ids in the receiving end.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cgroup.c             | 140 +++++++++++++++++++++++++++++++++++++-
 criu/cr-restore.c         |  19 +++++-
 criu/include/cgroup.h     |   2 +
 criu/include/namespaces.h |  17 +++++
 criu/include/restorer.h   |   2 +
 criu/include/servicefd.h  |   1 +
 criu/namespaces.c         |  65 +++++++++---------
 criu/pie/restorer.c       | 107 +++++++++++++++++++++++++++++
 8 files changed, 319 insertions(+), 34 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index b238b6402..918827d99 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -8,6 +8,7 @@
 #include <ftw.h>
 #include <libgen.h>
 #include <sched.h>
+#include <sys/wait.h>
 
 #include "common/list.h"
 #include "xmalloc.h"
@@ -55,6 +56,7 @@ static u32 cg_set_ids = 1;
 
 static LIST_HEAD(cgroups);
 static unsigned int n_cgroups;
+static pid_t cgroupd_pid;
 
 static CgSetEntry *find_rst_set_by_id(u32 id)
 {
@@ -1935,6 +1937,136 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 	return 0;
 }
 
+/*
+ * If a thread is a different cgroup set than the main thread in process,
+ * it means it is in a threaded controller. This daemon receives the cg_set
+ * number from the restored thread and move this thread to the correct
+ * cgroup controllers
+ */
+static int cgroupd(int sk)
+{
+	pr_info("cgroud: Daemon started\n");
+
+	while (1) {
+		struct unsc_msg um;
+		uns_call_t call;
+		pid_t tid;
+		int fd, cg_set, i;
+		CgSetEntry *cg_set_entry;
+		int ret;
+
+		unsc_msg_init(&um, &call, &cg_set, NULL, 0, 0, NULL);
+		ret = recvmsg(sk, &um.h, 0);
+		if (ret <= 0) {
+			pr_perror("cgroupd: recv req error");
+			return -1;
+		}
+
+		unsc_msg_pid_fd(&um, &tid, &fd);
+		pr_debug("cgroupd: move process %d into cg_set %d\n", tid, cg_set);
+
+		cg_set_entry = find_rst_set_by_id(cg_set);
+		if (!cg_set_entry) {
+			pr_err("cgroupd: No set found %d\n", cg_set);
+			return -1;
+		}
+
+		for (i = 0; i < cg_set_entry->n_ctls; i++) {
+			int j, aux_off;
+			CgMemberEntry *ce = cg_set_entry->ctls[i];
+			char aux[PATH_MAX];
+			CgControllerEntry *ctrl = NULL;
+
+			for (j = 0; j < n_controllers; j++) {
+				CgControllerEntry *cur = controllers[j];
+				if (cgroup_contains(cur->cnames, cur->n_cnames, ce->name, NULL)) {
+					ctrl = cur;
+					break;
+				}
+			}
+
+			if (!ctrl) {
+				pr_err("cgroupd: No cg_controller_entry found for %s/%s\n", ce->name, ce->path);
+				return -1;
+			}
+
+			/*
+			 * This is not a threaded controller, all threads in this
+			 * process must be in this controller. Main thread has been
+			 * restored, so this thread is in this controller already.
+			 */
+			if (!ctrl->is_threaded)
+				continue;
+
+			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);
+
+			/*
+			 * Cgroupd runs outside of the namespaces so we don't
+			 * need to use userns_call here
+			 */
+			if (userns_move(aux, 0, tid)) {
+				pr_err("cgroupd: Can't move thread %d into %s/%s\n", tid, ce->name, ce->path);
+				return -1;
+			}
+		}
+
+		/*
+		 * We only want to send the cred which contains thread id back.
+		 * The restored thread recvmsg(MSG_PEEK) until it gets its own
+		 * thread id.
+		 */
+		unsc_msg_init(&um, &call, &cg_set, NULL, 0, 0, &tid);
+		if (sendmsg(sk, &um.h, 0) <= 0) {
+			pr_perror("cgroupd: send req error");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int stop_cgroupd(void)
+{
+	if (cgroupd_pid) {
+		sigset_t blockmask, oldmask;
+
+		/*
+		 * Block the SIGCHLD signal to avoid triggering
+		 * sigchld_handler()
+		 */
+		sigemptyset(&blockmask);
+		sigaddset(&blockmask, SIGCHLD);
+		sigprocmask(SIG_BLOCK, &blockmask, &oldmask);
+
+		kill(cgroupd_pid, SIGTERM);
+		waitpid(cgroupd_pid, NULL, 0);
+
+		sigprocmask(SIG_SETMASK, &oldmask, NULL);
+	}
+
+	return 0;
+}
+
+static int prepare_cgroup_thread_sfd(void)
+{
+	int sk;
+
+	sk = start_unix_cred_daemon(&cgroupd_pid, cgroupd);
+	if (sk < 0) {
+		pr_err("failed to start cgroupd\n");
+		return -1;
+	}
+
+	if (install_service_fd(CGROUPD_SK, sk) < 0) {
+		kill(cgroupd_pid, SIGKILL);
+		waitpid(cgroupd_pid, NULL, 0);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int rewrite_cgsets(CgroupEntry *cge, char **controllers, int n_controllers, char **dir_name, char *newroot)
 {
 	size_t dirlen = strlen(*dir_name);
@@ -2089,15 +2221,19 @@ int prepare_cgroup(void)
 	n_controllers = ce->n_controllers;
 	controllers = ce->controllers;
 
-	if (n_sets)
+	if (n_sets) {
 		/*
 		 * We rely on the fact that all sets contain the same
 		 * set of controllers. This is checked during dump
 		 * with cg_set_compare(CGCMP_ISSUB) call.
 		 */
 		ret = prepare_cgroup_sfd(ce);
-	else
+		if (ret < 0)
+			return ret;
+		ret = prepare_cgroup_thread_sfd();
+	} else {
 		ret = 0;
+	}
 
 	return ret;
 }
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d7d3d8edb..78f2a9701 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1349,7 +1349,12 @@ static inline int fork_with_pid(struct pstree_item *item)
 			return -1;
 
 		item->pid->state = ca.core->tc->task_state;
-		rsti(item)->cg_set = ca.core->tc->cg_set;
+
+		/* Zombie task's cg_set is stored in task_core */
+		if (item->pid->state == TASK_DEAD)
+			rsti(item)->cg_set = ca.core->tc->cg_set;
+		else
+			rsti(item)->cg_set = ca.core->thread_core->cg_set;
 
 		if (ca.core->tc->has_stop_signo)
 			item->pid->stop_signo = ca.core->tc->stop_signo;
@@ -2376,6 +2381,10 @@ skip_ns_bouncing:
 	if (ret < 0)
 		goto out_kill;
 
+	ret = stop_cgroupd();
+	if (ret < 0)
+		goto out_kill;
+
 	ret = move_veth_to_bridge();
 	if (ret < 0)
 		goto out_kill;
@@ -3812,6 +3821,13 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		thread_args[i].clear_tid_addr = CORE_THREAD_ARCH_INFO(tcore)->clear_tid_addr;
 		core_get_tls(tcore, &thread_args[i].tls);
 
+		if (rsti(current)->cg_set != tcore->thread_core->cg_set) {
+			thread_args[i].cg_set = tcore->thread_core->cg_set;
+			thread_args[i].cgroupd_sk = dup(get_service_fd(CGROUPD_SK));
+		} else {
+			thread_args[i].cg_set = -1;
+		}
+
 		ret = prep_rseq(&thread_args[i].rseq, tcore->thread_core);
 		if (ret)
 			goto err;
@@ -3906,6 +3922,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	close_service_fd(USERNSD_SK);
 	close_service_fd(FDSTORE_SK_OFF);
 	close_service_fd(RPC_SK_OFF);
+	close_service_fd(CGROUPD_SK);
 
 	__gcov_flush();
 
diff --git a/criu/include/cgroup.h b/criu/include/cgroup.h
index 5a254559d..93f61539c 100644
--- a/criu/include/cgroup.h
+++ b/criu/include/cgroup.h
@@ -96,4 +96,6 @@ extern void put_ctls(struct list_head *);
 
 int collect_controllers(struct list_head *cgroups, unsigned int *n_cgroups);
 
+int stop_cgroupd(void);
+
 #endif /* __CR_CGROUP_H__ */
diff --git a/criu/include/namespaces.h b/criu/include/namespaces.h
index e2ea6e17f..183a3b852 100644
--- a/criu/include/namespaces.h
+++ b/criu/include/namespaces.h
@@ -1,6 +1,8 @@
 #ifndef __CR_NS_H__
 #define __CR_NS_H__
 
+#include <sys/socket.h>
+
 #include "common/compiler.h"
 #include "files.h"
 #include "common/list.h"
@@ -224,4 +226,19 @@ extern int add_ns_shared_cb(int (*actor)(void *data), void *data);
 extern struct ns_id *get_socket_ns(int lfd);
 extern struct ns_id *lookup_ns_by_kid(unsigned int kid, struct ns_desc *nd);
 
+struct unsc_msg {
+	struct msghdr h;
+	/*
+	 * 0th is the call address
+	 * 1st is the flags
+	 * 2nd is the optional (NULL in response) arguments
+	 */
+	struct iovec iov[3];
+	char c[CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int))];
+};
+
+extern void unsc_msg_init(struct unsc_msg *m, uns_call_t *c, int *x, void *arg, size_t asize, int fd, pid_t *pid);
+extern void unsc_msg_pid_fd(struct unsc_msg *um, pid_t *pid, int *fd);
+extern int start_unix_cred_daemon(pid_t *pid, int (*daemon_func)(int sk));
+
 #endif /* __CR_NS_H__ */
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index d642765e3..bc0beb5cb 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -121,6 +121,8 @@ struct thread_restore_args {
 	bool seccomp_force_tsync;
 
 	char comm[TASK_COMM_LEN];
+	int cg_set;
+	int cgroupd_sk;
 } __aligned(64);
 
 typedef long (*thread_restore_fcall_t)(struct thread_restore_args *args);
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index c6979de7f..4265d94ed 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -24,6 +24,7 @@ enum sfd_type {
 				 */
 	ROOT_FD_OFF,	/* Root of the namespace we dump/restore */
 	CGROUP_YARD,
+	CGROUPD_SK,	  /* Socket for cgroupd to fix up thread's cgroup controller */
 	USERNSD_SK,	  /* Socket for usernsd */
 	NS_FD_OFF,	  /* Node's net namespace fd */
 	TRANSPORT_FD_OFF, /* to transfer file descriptors */
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 286073ff6..0dc19d5b6 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <sys/prctl.h>
 #include <grp.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <stdarg.h>
 #include <signal.h>
@@ -1218,20 +1217,9 @@ static int write_id_map(pid_t pid, UidGidExtent **extents, int n, char *id_map)
 	return 0;
 }
 
-struct unsc_msg {
-	struct msghdr h;
-	/*
-	 * 0th is the call address
-	 * 1st is the flags
-	 * 2nd is the optional (NULL in response) arguments
-	 */
-	struct iovec iov[3];
-	char c[CMSG_SPACE(sizeof(struct ucred)) + CMSG_SPACE(sizeof(int))];
-};
-
 static int usernsd_pid;
 
-static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c, int *x, void *arg, size_t asize, int fd)
+inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c, int *x, void *arg, size_t asize, int fd, pid_t *pid)
 {
 	struct cmsghdr *ch;
 	struct ucred *ucred;
@@ -1269,7 +1257,10 @@ static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c, int *x, void
 	ch->cmsg_type = SCM_CREDENTIALS;
 
 	ucred = (struct ucred *)CMSG_DATA(ch);
-	ucred->pid = getpid();
+	if (pid)
+		ucred->pid = *pid;
+	else
+		ucred->pid = getpid();
 	ucred->uid = getuid();
 	ucred->gid = getgid();
 
@@ -1284,7 +1275,7 @@ static inline void unsc_msg_init(struct unsc_msg *m, uns_call_t *c, int *x, void
 	}
 }
 
-static void unsc_msg_pid_fd(struct unsc_msg *um, pid_t *pid, int *fd)
+void unsc_msg_pid_fd(struct unsc_msg *um, pid_t *pid, int *fd)
 {
 	struct cmsghdr *ch;
 	struct ucred *ucred;
@@ -1322,7 +1313,7 @@ static int usernsd(int sk)
 		int flags, fd, ret;
 		pid_t pid;
 
-		unsc_msg_init(&um, &call, &flags, msg, sizeof(msg), 0);
+		unsc_msg_init(&um, &call, &flags, msg, sizeof(msg), 0, NULL);
 		if (recvmsg(sk, &um.h, 0) <= 0) {
 			pr_perror("uns: recv req error");
 			return -1;
@@ -1367,7 +1358,7 @@ static int usernsd(int sk)
 		else
 			fd = -1;
 
-		unsc_msg_init(&um, &call, &ret, NULL, 0, fd);
+		unsc_msg_init(&um, &call, &ret, NULL, 0, fd, NULL);
 		if (sendmsg(sk, &um.h, 0) <= 0) {
 			pr_perror("uns: send resp error");
 			return -1;
@@ -1418,7 +1409,7 @@ int __userns_call(const char *func_name, uns_call_t call, int flags, void *arg,
 
 	/* Send the request */
 
-	unsc_msg_init(&um, &call, &flags, arg, arg_size, fd);
+	unsc_msg_init(&um, &call, &flags, arg, arg_size, fd, NULL);
 	ret = sendmsg(sk, &um.h, 0);
 	if (ret <= 0) {
 		pr_perror("uns: send req error");
@@ -1433,7 +1424,7 @@ int __userns_call(const char *func_name, uns_call_t call, int flags, void *arg,
 
 	/* Get the response back */
 
-	unsc_msg_init(&um, &call, &res, NULL, 0, 0);
+	unsc_msg_init(&um, &call, &res, NULL, 0, 0, NULL);
 	ret = recvmsg(sk, &um.h, 0);
 	if (ret <= 0) {
 		pr_perror("uns: recv resp error");
@@ -1454,14 +1445,11 @@ out:
 	return ret;
 }
 
-static int start_usernsd(void)
+int start_unix_cred_daemon(pid_t *pid, int (*daemon_func)(int sk))
 {
 	int sk[2];
 	int one = 1;
 
-	if (!(root_ns_mask & CLONE_NEWUSER))
-		return 0;
-
 	/*
 	 * Seqpacket to
 	 *
@@ -1490,24 +1478,39 @@ static int start_usernsd(void)
 		return -1;
 	}
 
-	usernsd_pid = fork();
-	if (usernsd_pid < 0) {
-		pr_perror("Can't fork usernsd");
+	*pid = fork();
+	if (*pid < 0) {
+		pr_perror("Can't unix daemon");
 		close(sk[0]);
 		close(sk[1]);
 		return -1;
 	}
 
-	if (usernsd_pid == 0) {
+	if (*pid == 0) {
 		int ret;
-
 		close(sk[0]);
-		ret = usernsd(sk[1]);
+		ret = daemon_func(sk[1]);
 		exit(ret);
 	}
-
 	close(sk[1]);
-	if (install_service_fd(USERNSD_SK, sk[0]) < 0) {
+
+	return sk[0];
+}
+
+static int start_usernsd(void)
+{
+	int sk;
+
+	if (!(root_ns_mask & CLONE_NEWUSER))
+		return 0;
+
+	sk = start_unix_cred_daemon(&usernsd_pid, usernsd);
+	if (sk < 0) {
+		pr_err("failed to start usernsd\n");
+		return -1;
+	}
+
+	if (install_service_fd(USERNSD_SK, sk) < 0) {
 		kill(usernsd_pid, SIGKILL);
 		waitpid(usernsd_pid, NULL, 0);
 		return -1;
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 0e98cb3da..99cff1f7d 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -17,6 +17,7 @@
 #include <sys/resource.h>
 #include <signal.h>
 #include <sys/inotify.h>
+#include <sys/socket.h>
 
 #include "linux/userfaultfd.h"
 
@@ -586,6 +587,103 @@ static void noinline rst_sigreturn(unsigned long new_sp, struct rt_sigframe *sig
 	ARCH_RT_SIGRETURN(new_sp, sigframe);
 }
 
+static int send_cg_set(int sk, int cg_set)
+{
+	struct cmsghdr *ch;
+	struct msghdr h;
+	/*
+	 * 0th is the dummy call address for compatibility with userns helper
+	 * 1st is the cg_set
+	 */
+	struct iovec iov[2];
+	char cmsg[CMSG_SPACE(sizeof(struct ucred))] = {};
+	int ret, *dummy = NULL;
+	struct ucred *ucred;
+
+	iov[0].iov_base = &dummy;
+	iov[0].iov_len = sizeof(dummy);
+	iov[1].iov_base = &cg_set;
+	iov[1].iov_len = sizeof(cg_set);
+
+	h.msg_iov = iov;
+	h.msg_iovlen = sizeof(iov) / sizeof(struct iovec);
+	h.msg_name = NULL;
+	h.msg_namelen = 0;
+	h.msg_flags = 0;
+
+	h.msg_control = cmsg;
+	h.msg_controllen = sizeof(cmsg);
+	ch = CMSG_FIRSTHDR(&h);
+	ch->cmsg_len = CMSG_LEN(sizeof(struct ucred));
+	ch->cmsg_level = SOL_SOCKET;
+	ch->cmsg_type = SCM_CREDENTIALS;
+
+	ucred = (struct ucred *)CMSG_DATA(ch);
+	/*
+	 * We still have privilege in this namespace so we can send
+	 * thread id instead of pid of main thread, uid, gid as 0
+	 * since these 2 are ignored in cgroupd
+	 */
+	ucred->pid = sys_gettid();
+	ucred->uid = 0;
+	ucred->gid = 0;
+
+	ret = sys_sendmsg(sk, &h, 0);
+	if (ret < 0) {
+		pr_err("Unable to send packet to cgroupd %d\n", ret);
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * As this socket is shared among threads, recvmsg(MSG_PEEK)
+ * from the socket until getting its own thread id as an
+ * acknowledge of successful threaded cgroup fixup
+ */
+static int recv_cg_set_restore_ack(int sk)
+{
+	struct cmsghdr *ch;
+	struct msghdr h = {};
+	char cmsg[CMSG_SPACE(sizeof(struct ucred))];
+	struct ucred *cred;
+	int ret;
+
+	h.msg_control = cmsg;
+	h.msg_controllen = sizeof(cmsg);
+
+	while (1) {
+		ret = sys_recvmsg(sk, &h, MSG_PEEK);
+		if (ret < 0) {
+			pr_err("Unable to peek from cgroupd %d\n", ret);
+			return -1;
+		}
+
+		if (h.msg_controllen != sizeof(cmsg)) {
+			pr_err("The message from cgroupd is truncated\n");
+			return -1;
+		}
+
+		ch = CMSG_FIRSTHDR(&h);
+		cred = (struct ucred *)CMSG_DATA(ch);
+		if (cred->pid != sys_gettid())
+			continue;
+
+		/*
+		 * Actual remove message from recv queue of socket
+		 */
+		ret = sys_recvmsg(sk, &h, 0);
+		if (ret < 0) {
+			pr_err("Unable to receive from cgroupd %d\n", ret);
+			return -1;
+		}
+
+		break;
+	}
+	return 0;
+}
+
 /*
  * Threads restoration via sigreturn. Note it's locked
  * routine and calls for unlock at the end.
@@ -613,6 +711,15 @@ long __export_restore_thread(struct thread_restore_args *args)
 
 	rt_sigframe = (void *)&args->mz->rt_sigframe;
 
+	if (args->cg_set != -1) {
+		pr_info("Restore cg_set in thread cg_set: %d\n", args->cg_set);
+		if (send_cg_set(args->cgroupd_sk, args->cg_set))
+			goto core_restore_end;
+		if (recv_cg_set_restore_ack(args->cgroupd_sk))
+			goto core_restore_end;
+		sys_close(args->cgroupd_sk);
+	}
+
 	if (restore_thread_common(args))
 		goto core_restore_end;
 

From 07d538cefcb6a72cea13ea7a2a34777f458e5b3b Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Sun, 4 Sep 2022 15:55:24 +0700
Subject: [PATCH 1161/1854] zdtm: Check threads are restored into correct
 threaded controllers

This test creates a process with 2 threads in different threaded controllers and
check if CRIU restores these threads' cgroup controllers properly.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/Makefile              |   3 +
 test/zdtm/static/cgroupv2_01.c         | 180 +++++++++++++++++++++++++
 test/zdtm/static/cgroupv2_01.checkskip |  11 ++
 test/zdtm/static/cgroupv2_01.desc      |   1 +
 test/zdtm/static/cgroupv2_01.hook      |  24 ++++
 5 files changed, 219 insertions(+)
 create mode 100644 test/zdtm/static/cgroupv2_01.c
 create mode 100755 test/zdtm/static/cgroupv2_01.checkskip
 create mode 100644 test/zdtm/static/cgroupv2_01.desc
 create mode 100755 test/zdtm/static/cgroupv2_01.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 915e565bd..edac92c83 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -387,6 +387,7 @@ TST_DIR		=				\
 		cgroup03			\
 		cgroup04			\
 		cgroupv2_00			\
+		cgroupv2_01			\
 		cgroup_ifpriomap		\
 		cgroup_ignore			\
 		cgroup_stray			\
@@ -679,6 +680,8 @@ sk-unix-listen02: CFLAGS += -DSK_UNIX_LISTEN02
 sk-unix-listen03: CFLAGS += -DSK_UNIX_LISTEN03
 sk-unix-listen04: CFLAGS += -DSK_UNIX_LISTEN02 -DSK_UNIX_LISTEN03
 
+cgroupv2_01:		LDLIBS += -pthread
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/cgroupv2_01.c b/test/zdtm/static/cgroupv2_01.c
new file mode 100644
index 000000000..f3a6d18ba
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_01.c
@@ -0,0 +1,180 @@
+#include <sys/mount.h>
+#include <sys/stat.h>
+#include <pthread.h>
+#include <syscall.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that cgroup-v2 threaded controllers";
+const char *test_author = "Bui Quang Minh <minhquangbui99@gmail.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "cgroup-v2 directory name", 1);
+const char *cgname = "subcg01";
+
+task_waiter_t t;
+
+#define gettid(code) syscall(__NR_gettid)
+
+void cleanup(void)
+{
+	char path[1024];
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "thread2");
+	rmdir(path);
+	sprintf(path, "%s/%s/%s", dirname, cgname, "thread1");
+	rmdir(path);
+	sprintf(path, "%s/%s", dirname, cgname);
+	rmdir(path);
+	sprintf(path, "%s", dirname);
+	umount(path);
+}
+
+int is_in_cgroup(char *cgname)
+{
+	FILE *cgf;
+	char buffer[1024];
+
+	sprintf(buffer, "/proc/self/task/%ld/cgroup", gettid());
+	cgf = fopen(buffer, "r");
+	if (cgf == NULL) {
+		pr_err("Fail to open thread's cgroup procfs\n");
+		return 0;
+	}
+
+	while (fgets(buffer, sizeof(buffer), cgf)) {
+		if (strstr(buffer, cgname)) {
+			fclose(cgf);
+			return 1;
+		}
+	}
+
+	fclose(cgf);
+	return 0;
+}
+
+void *thread_func(void *arg)
+{
+	char path[1024], aux[1024];
+
+	sprintf(path, "%s/%s/%s/%s", dirname, cgname, "thread2", "cgroup.threads");
+	sprintf(aux, "%ld", gettid());
+	if (write_value(path, aux)) {
+		cleanup();
+		exit(1);
+	}
+
+	read_value(path, aux, sizeof(aux));
+
+	task_waiter_complete(&t, 1);
+
+	/* Wait for restore */
+	task_waiter_wait4(&t, 2);
+
+	sprintf(path, "/%s/%s", cgname, "thread2");
+	if (!is_in_cgroup(path)) {
+		fail("Thread2's cgroup is not restored");
+		cleanup();
+		exit(1);
+	}
+
+	return NULL;
+}
+
+int main(int argc, char **argv)
+{
+	char path[1024], aux[1024];
+	pthread_t thread2;
+	int ret = 1;
+
+	test_init(argc, argv);
+	task_waiter_init(&t);
+
+	if (mkdir(dirname, 0700) < 0 && errno != EEXIST) {
+		pr_perror("Can't make dir");
+		return -1;
+	}
+
+	if (mount("cgroup2", dirname, "cgroup2", 0, NULL)) {
+		pr_perror("Can't mount cgroup-v2");
+		return -1;
+	}
+
+	sprintf(path, "%s/%s", dirname, cgname);
+	if (mkdir(path, 0700) < 0 && errno != EEXIST) {
+		pr_perror("Can't make dir");
+		goto out;
+	}
+
+	/* Make cpuset controllers available in children directory */
+	sprintf(path, "%s/%s", dirname, "cgroup.subtree_control");
+	sprintf(aux, "%s", "+cpuset");
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.subtree_control");
+	sprintf(aux, "%s", "+cpuset");
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "cgroup.procs");
+	sprintf(aux, "%d", getpid());
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "thread1");
+	if (mkdir(path, 0700) < 0 && errno != EEXIST) {
+		pr_perror("Can't make dir");
+		goto out;
+	}
+
+	sprintf(path, "%s/%s/%s/%s", dirname, cgname, "thread1", "cgroup.type");
+	sprintf(aux, "%s", "threaded");
+	if (write_value(path, aux))
+		goto out;
+
+	sprintf(path, "%s/%s/%s", dirname, cgname, "thread2");
+	if (mkdir(path, 0700) < 0 && errno != EEXIST) {
+		pr_perror("Can't make dir");
+		goto out;
+	}
+
+	sprintf(path, "%s/%s/%s/%s", dirname, cgname, "thread2", "cgroup.type");
+	sprintf(aux, "%s", "threaded");
+	if (write_value(path, aux))
+		goto out;
+
+	ret = pthread_create(&thread2, NULL, thread_func, NULL);
+	if (ret < 0) {
+		pr_err("pthread_create %s\n", strerror(ret));
+		ret = 1;
+		goto out;
+	}
+
+	sprintf(path, "%s/%s/%s/%s", dirname, cgname, "thread1", "cgroup.threads");
+	sprintf(aux, "%ld", gettid());
+	if (write_value(path, aux))
+		goto out;
+
+	task_waiter_wait4(&t, 1);
+
+	test_daemon();
+	test_waitsig();
+
+	task_waiter_complete(&t, 2);
+
+	sprintf(path, "/%s/%s", cgname, "thread1");
+	if (!is_in_cgroup(path)) {
+		fail("Main thread's cgroup is not restored");
+		cleanup();
+		exit(1);
+	}
+	pthread_join(thread2, NULL);
+	pass();
+
+	ret = 0;
+
+out:
+	cleanup();
+	return ret;
+}
diff --git a/test/zdtm/static/cgroupv2_01.checkskip b/test/zdtm/static/cgroupv2_01.checkskip
new file mode 100755
index 000000000..375ed3564
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_01.checkskip
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
+	grep -q "cpuset" /sys/fs/cgroup/cgroup.controllers && exit 0
+fi
+
+if [ -d /sys/fs/cgroup/unified ]; then
+	grep -q "cpuset" /sys/fs/cgroup/unified/cgroup.controllers && exit 0
+fi
+
+exit 1
diff --git a/test/zdtm/static/cgroupv2_01.desc b/test/zdtm/static/cgroupv2_01.desc
new file mode 100644
index 000000000..4bfd4b265
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_01.desc
@@ -0,0 +1 @@
+{'flavor': 'h ns', 'flags': 'suid', 'opts': '--manage-cgroups=full'}
diff --git a/test/zdtm/static/cgroupv2_01.hook b/test/zdtm/static/cgroupv2_01.hook
new file mode 100755
index 000000000..2263fd014
--- /dev/null
+++ b/test/zdtm/static/cgroupv2_01.hook
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+[ "$1" == "--clean" -o "$1" == "--pre-restore" ] || exit 0
+
+set -e
+cgname="subcg01"
+tname=$(mktemp -d cgclean.XXXXXX)
+mount -t cgroup2 cgroup2 $tname
+
+echo "Cleaning $tname"
+
+set +e
+rmdir "$tname/$cgname/thread1"
+
+# When the test finishes, the cleanup() function removes this directory
+# successfully because the thread in this controller exit and no other
+# threads belong to this controller
+if [ "$1" == "--pre-restore" ]; then
+	rmdir "$tname/$cgname/thread2"
+fi
+
+rmdir "$tname/$cgname"
+umount "$tname"
+rmdir "$tname"

From 2ebce92333cc6994f217575335327e4d2f0d1757 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 6 Sep 2022 22:04:08 +0700
Subject: [PATCH 1162/1854] ci: Make cpuset move to cgroup-v2 hierarchy

As cgroupv2_00, cgroupv2_01 need cpuset in cgroup-v2 hierarchy to check CRIU
handle cgroup-v2 properly, umount cpuset in cgroup-v1 to make it move to
cgroup-v2.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 scripts/ci/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 30dd9ebeb..48a1e1887 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -1,4 +1,10 @@
-local:
+# Umount cpuset in cgroupv1 to make it move to cgroupv2
+cpuset-cgroupv2:
+	if [ -d /sys/fs/cgroup/cpuset ]; then \
+		umount /sys/fs/cgroup/cpuset; \
+	fi
+
+local: cpuset-cgroupv2
 	./run-ci-tests.sh
 .PHONY: local
 

From 516ebc4f581bab37457f07b2adfd06b4c7f91cec Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 7 Nov 2022 08:55:28 +0100
Subject: [PATCH 1163/1854] ci: Do not fail if latest epel repository
 definition is already installed

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index dbfb899ff..914ceb72c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -104,7 +104,9 @@ task:
 
   setup_script: |
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
-    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
+    # Do not fail if latest epel repository definition is already installed
+    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || :
+    yum install -y dnf-plugins-core
     yum config-manager --set-enabled powertools
     yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf python3-junit_xml xmlto
     alternatives --set python /usr/bin/python3
@@ -133,7 +135,8 @@ task:
 
   setup_script: |
     # EPEL is needed for python2-future, python2-junit_xml, python-flake8 and libbsd-devel.
-    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+    # Do not fail if latest epel repository definition is already installed
+    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm || :
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
     # Even with selinux in permissive mode the selinux tests will be executed

From 153614cb1d32f47a3727222b6c1dc39a0822a047 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 7 Nov 2022 08:26:10 +0100
Subject: [PATCH 1164/1854] ci: move cgroup unmounting to run-ci-tests.sh

A previous commit added a cgroup cpuset unmounting to
scripts/ci/Makefile. We are sometimes running in a container without the
necessary privileges to unmount certain cgroups.

This commit moves the cgroup unmounting to a place in run-ci-tests.sh
which already requires privileged access and does not break unprivileged
build-only CI runs.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/Makefile        | 8 +-------
 scripts/ci/run-ci-tests.sh | 5 +++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 48a1e1887..30dd9ebeb 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -1,10 +1,4 @@
-# Umount cpuset in cgroupv1 to make it move to cgroupv2
-cpuset-cgroupv2:
-	if [ -d /sys/fs/cgroup/cpuset ]; then \
-		umount /sys/fs/cgroup/cpuset; \
-	fi
-
-local: cpuset-cgroupv2
+local:
 	./run-ci-tests.sh
 .PHONY: local
 
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 1b761ea56..7b64c6b06 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -144,6 +144,11 @@ time make unittest
 
 [ -n "$SKIP_CI_TEST" ] && exit 0
 
+# Umount cpuset in cgroupv1 to make it move to cgroupv2
+if [ -d /sys/fs/cgroup/cpuset ]; then
+	umount /sys/fs/cgroup/cpuset
+fi
+
 ulimit -c unlimited
 
 cgid=$$

From c1ae880eb4d6803367c87d4f673d8ae0aeae3a1b Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Tue, 8 Nov 2022 21:10:52 +0700
Subject: [PATCH 1165/1854] kerndat: Mark memfd_create(MFD_HUGETLB) unavailable
 when ENOSYS is returned

Some users on Raspberry Pi report that the kerndat checking for
memfd_create(MFD_HUGETLB) support returns ENOSYS even when memfd_create
syscall is available. We currently treat this error as unexpected and
return error. This commit marks the memfd_create(MFD_HUGETLB) as
unavailable when ENOSYS is returned.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/kerndat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index a209190ee..5b567e79f 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -500,7 +500,7 @@ static bool kerndat_has_memfd_hugetlb(void)
 	if (ret >= 0) {
 		kdat.has_memfd_hugetlb = true;
 		close(ret);
-	} else if (ret == -1 && (errno == EINVAL || errno == ENOENT)) {
+	} else if (ret == -1 && (errno == EINVAL || errno == ENOENT || errno == ENOSYS)) {
 		kdat.has_memfd_hugetlb = false;
 	} else {
 		pr_perror("Unexpected error from memfd_create(\"\", MFD_HUGETLB)");

From f5e0f641a8c940029d953881f00552899ba53b2e Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 3 Nov 2022 22:04:53 +0700
Subject: [PATCH 1166/1854] cgroup: Remove redundant code that handles zombie
 tasks

Zombie tasks are dumped in dump_zombies() so it is redundant to handle them
in dump_one_task().

Deprecate cg_set in task_core_entry as this field must be per thread now.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cr-dump.c    | 9 ---------
 criu/cr-restore.c | 7 +++++--
 images/core.proto | 1 +
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index e31b2f702..63eb627fc 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -811,16 +811,7 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 			goto err;
 	}
 
-	/*
-	 * We don't support multithreads zombie tasks so there is
-	 * no thread_core in zombie tasks, store the cg_set in
-	 * task_core in these cases.
-	 */
 	cg_set = &core->thread_core->cg_set;
-	if (item->pid->state == TASK_THREAD) {
-		core->tc->has_cg_set = true;
-		cg_set = &core->tc->cg_set;
-	}
 	ret = dump_thread_cgroup(item, cg_set, info, -1);
 	if (ret)
 		goto err;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 78f2a9701..974202f16 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1350,9 +1350,12 @@ static inline int fork_with_pid(struct pstree_item *item)
 
 		item->pid->state = ca.core->tc->task_state;
 
-		/* Zombie task's cg_set is stored in task_core */
+		/*
+		 * Zombie tasks' cgroup is not dumped/restored.
+		 * cg_set == 0 is skipped in prepare_task_cgroup()
+		 */
 		if (item->pid->state == TASK_DEAD)
-			rsti(item)->cg_set = ca.core->tc->cg_set;
+			rsti(item)->cg_set = 0;
 		else
 			rsti(item)->cg_set = ca.core->thread_core->cg_set;
 
diff --git a/images/core.proto b/images/core.proto
index 1ee32bfda..bc8b7a488 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -40,6 +40,7 @@ message task_core_entry {
 	optional task_timers_entry	timers		= 7;
 	optional task_rlimits_entry	rlimits		= 8;
 
+	/* This is deprecated, should be per-thread */
 	optional uint32			cg_set		= 9;
 
 	optional signal_queue_entry	signals_s	= 10;

From c7211f52dbc08f748665b6f511b971ff48079d86 Mon Sep 17 00:00:00 2001
From: Mathias Gibbens <mathias@calenhad.com>
Date: Thu, 17 Nov 2022 22:28:57 +0000
Subject: [PATCH 1167/1854] Remove execute bit from source file

Signed-off-by: Mathias Gibbens <mathias@calenhad.com>
---
 images/core-mips.proto | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 images/core-mips.proto

diff --git a/images/core-mips.proto b/images/core-mips.proto
old mode 100755
new mode 100644

From fa2c585c2267725b59813063ee999b8b1e8afde3 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 9 Nov 2022 11:01:29 +0000
Subject: [PATCH 1168/1854] amdgpu: define __nmk_dir if missing

This patch adds a missing definition for `__nmk_dir` in the Makefile
for the amdgpu plugin. This definition is required, for example, when
building the `test_topology_remap` target:

	make -C plugins/amdgpu/ test_topology_remap

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 367a52c99..64a923d38 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -12,6 +12,7 @@ LIBDRM_INC 		:= -I/usr/include/libdrm
 DEPS_OK 		:= amdgpu_plugin.so amdgpu_plugin_test
 DEPS_NOK 		:= ;
 
+__nmk_dir ?= ../../scripts/nmk/scripts/
 include $(__nmk_dir)msg.mk
 
 CC      		:= gcc

From c48b5290dc57eb26171b70078a1827fae2ba4d35 Mon Sep 17 00:00:00 2001
From: Drew Wock <ajwock@gmail.com>
Date: Mon, 21 Nov 2022 21:57:05 +0000
Subject: [PATCH 1169/1854] Fix warnings from -Wstrict-prototypes in clang
 16.0.0

While building on a machine that has a HOL clang compiler,
I ran into warnings regarding the changed line.  It appears
this warning is on by default because of anticipated changes
to the C standard.

Signed-off-by: Drew Wock <ajwock@gmail.com>
---
 criu/net.c  | 2 +-
 criu/util.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 2eff519c5..f29a166f8 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3366,7 +3366,7 @@ int collect_net_namespaces(bool for_dump)
 
 struct ns_desc net_ns_desc = NS_DESC_ENTRY(CLONE_NEWNET, "net");
 
-struct ns_id *net_get_root_ns()
+struct ns_id *net_get_root_ns(void)
 {
 	static struct ns_id *root_netns = NULL;
 
diff --git a/criu/util.c b/criu/util.c
index b3b2b6659..959e60938 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1876,7 +1876,7 @@ int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args)
 
 uint64_t criu_run_id;
 
-void util_init()
+void util_init(void)
 {
 	struct timespec tp;
 

From 095b3e84b7cd6eee677586ae772471dfce17d0f7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 23 Nov 2022 14:59:08 +0000
Subject: [PATCH 1170/1854] ci/lint: install ShellCheck with dnf

The way ShellCheck is installed was changed in commit c056f99
(ci/gha/lint: install a recent shellcheck) to use the latest version
v0.8.0 and remove some of the "shellcheck disable=..." annotations.
Since then, Fedora 37 has been released and the ShellCheck package
has been updated to v0.8.0.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/lint.yml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3d42f3dcf..4c05285e6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,18 +9,7 @@ jobs:
       image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
-      run: sudo dnf -y install git make python3-flake8 xz clang-tools-extra which codespell git-clang-format
-
-    # TODO: remove this and use ShellCheck from repo once F37 with ShellCheck 0.8.0 is out.
-    - name: install shellcheck
-      env:
-        VERSION: v0.8.0
-        BASEURL: https://github.com/koalaman/shellcheck/releases/download
-        SHA256: f4bce23c11c3919c1b20bcb0f206f6b44c44e26f2bc95f8aa708716095fa0651
-      run: |
-        curl -sSfL --retry 5 $BASEURL/$VERSION/shellcheck-$VERSION.linux.x86_64.tar.xz |
-          tar xfJ - -C /usr/local/bin --strip 1 shellcheck-$VERSION/shellcheck
-        sha256sum --strict --check - <<<"$SHA256 /usr/local/bin/shellcheck"
+      run: sudo dnf -y install git make python3-flake8 xz clang-tools-extra which codespell git-clang-format ShellCheck
 
     - uses: actions/checkout@v2
 

From d0c64b7b344e12a4cc13197bbbe4b37edb369f0a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 23 Nov 2022 15:19:02 +0000
Subject: [PATCH 1171/1854] ci/alpine: remove symlink for /usr/bin/python

The python3 package in Alpine has recently been updated to install
symbolic link for /usr/bin/python.

https://git.alpinelinux.org/aports/commit/main/python3?id=d91da210b1614eb75517d59b7f348fee01699f35

This causes the following error in CI:

  Step 10/11 : RUN ln -s /usr/bin/python3 /usr/bin/python
   ---> Running in a5a94be9dc93
  ln: failed to create symbolic link '/usr/bin/python': File exists
  The command '/bin/sh -c ln -s /usr/bin/python3 /usr/bin/python' returned a non-zero code: 1

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.alpine | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index cab72e8a1..eced46c22 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -45,7 +45,4 @@ RUN adduser -u 1000 -D test
 
 RUN pip3 install junit_xml
 
-# For zdtm we need an unversioned python binary
-RUN ln -s /usr/bin/python3 /usr/bin/python
-
 RUN make -C test/zdtm

From 14b9ec195f0acefe9497da271beb301700ecfaf5 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 24 Nov 2022 10:48:35 +0000
Subject: [PATCH 1172/1854] ci: fix make indent

This patch fixes applies the changes required by clang-format v15.0.5
for `make indent`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/stopped03.c   | 2 +-
 test/zdtm/static/stopped04.c   | 2 +-
 test/zdtm/transition/maps007.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/zdtm/static/stopped03.c b/test/zdtm/static/stopped03.c
index 85c7177f7..9a373930f 100644
--- a/test/zdtm/static/stopped03.c
+++ b/test/zdtm/static/stopped03.c
@@ -23,7 +23,7 @@ struct shared {
 	futex_t fstate;
 	int status;
 	int code;
-} * sh;
+} *sh;
 
 static int new_pgrp(void)
 {
diff --git a/test/zdtm/static/stopped04.c b/test/zdtm/static/stopped04.c
index 237094ca4..9bd968aa2 100644
--- a/test/zdtm/static/stopped04.c
+++ b/test/zdtm/static/stopped04.c
@@ -21,7 +21,7 @@ struct shared {
 	futex_t fstate;
 	int status;
 	int code;
-} * sh;
+} *sh;
 
 static int new_pgrp(void)
 {
diff --git a/test/zdtm/transition/maps007.c b/test/zdtm/transition/maps007.c
index 8a605cfe0..35c196bc4 100644
--- a/test/zdtm/transition/maps007.c
+++ b/test/zdtm/transition/maps007.c
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 	struct {
 		futex_t delta;
 		futex_t stop;
-	} * shm;
+	} *shm;
 	uint32_t v;
 	unsigned long long count = 0;
 	int i;

From f3fdce81a64b440d85611950647ad79dc6890393 Mon Sep 17 00:00:00 2001
From: Liang-Chun Chen <featherclc@gmail.com>
Date: Tue, 6 Sep 2022 18:02:06 +0800
Subject: [PATCH 1173/1854] files-reg.c: fiemap algorithm for ghost file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to reduce the frequency of using system call, based on
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/misc/create_inode.c#n519,
I created a new algorithm of dumping chunk via fiemap.(copy_file_to_chunks_fiemap)

Also, I added another BOOL_OPT for users to determine which algorithm they
want to use. Moreover, for those filesystem not supporting fiemap, criu
will fall back to the original algorithm(SEEK_HOLE/SEEK_DATA).

v2: don't call copy_chunk_from_file on outstanding extent; rearange
headers to workaround "redeclaration of ‘enum fsconfig_command’" problem

Signed-off-by: Liang-Chun Chen <featherclc@gmail.com>
---
 criu/config.c             |   2 +
 criu/files-reg.c          | 108 ++++++++++++++++++++++++++++++++++++--
 criu/include/cr_options.h |   4 ++
 3 files changed, 110 insertions(+), 4 deletions(-)

diff --git a/criu/config.c b/criu/config.c
index 9ba79c8ef..9f02ae992 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -430,6 +430,7 @@ void init_opts(void)
 	opts.pre_dump_mode = PRE_DUMP_SPLICE;
 	opts.file_validation_method = FILE_VALIDATION_DEFAULT;
 	opts.network_lock_method = NETWORK_LOCK_DEFAULT;
+	opts.ghost_fiemap = FIEMAP_DEFAULT;
 }
 
 bool deprecated_ok(char *what)
@@ -701,6 +702,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		{ "network-lock", required_argument, 0, 1100 },
 		BOOL_OPT("mntns-compat-mode", &opts.mntns_compat_mode),
 		BOOL_OPT("unprivileged", &opts.unprivileged),
+		BOOL_OPT("ghost-fiemap", &opts.ghost_fiemap),
 		{},
 	};
 
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 2e3d57c5e..13e114cea 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -11,10 +11,13 @@
 #include <sys/sendfile.h>
 #include <sched.h>
 #include <sys/capability.h>
-#include <sys/mount.h>
+#include <sys/ioctl.h>
 #include <elf.h>
+#include <linux/fiemap.h>
+#include <linux/fs.h>
 
 #include "tty.h"
+#include "stats.h"
 
 #ifndef SEEK_DATA
 #define SEEK_DATA 3
@@ -32,6 +35,7 @@
  */
 #define BUILD_ID_MAP_SIZE 1048576
 #define ST_UNIT		  512
+#define EXTENT_MAX_COUNT  512
 
 #include "cr_options.h"
 #include "imgset.h"
@@ -221,6 +225,92 @@ static int copy_file_to_chunks(int fd, struct cr_img *img, size_t file_size)
 	return 0;
 }
 
+static int skip_outstanding(struct fiemap_extent *fe, size_t file_size)
+{
+	/* Skip outstanding extent */
+	if (fe->fe_logical > file_size)
+		return 1;
+
+	/* Skip outstanding part of the extent */
+	if (fe->fe_logical + fe->fe_length > file_size)
+		fe->fe_length = file_size - fe->fe_logical;
+	return 0;
+}
+
+static int copy_file_to_chunks_fiemap(int fd, struct cr_img *img, size_t file_size)
+{
+	GhostChunkEntry ce = GHOST_CHUNK_ENTRY__INIT;
+	struct fiemap *fiemap_buf;
+	struct fiemap_extent *ext_buf;
+	int ext_buf_size, fie_buf_size;
+	off_t pos = 0;
+	unsigned int i;
+	int ret = 0;
+	int exit_code = 0;
+
+	ext_buf_size = EXTENT_MAX_COUNT * sizeof(struct fiemap_extent);
+	fie_buf_size = sizeof(struct fiemap) + ext_buf_size;
+
+	fiemap_buf = xzalloc(fie_buf_size);
+	if (!fiemap_buf) {
+		pr_perror("Out of memory when allocating fiemap");
+		return -1;
+	}
+
+	ext_buf = fiemap_buf->fm_extents;
+	fiemap_buf->fm_length = FIEMAP_MAX_OFFSET;
+	fiemap_buf->fm_flags |= FIEMAP_FLAG_SYNC;
+	fiemap_buf->fm_extent_count = EXTENT_MAX_COUNT;
+
+	do {
+		fiemap_buf->fm_start = pos;
+		memzero(ext_buf, ext_buf_size);
+		ret = ioctl(fd, FS_IOC_FIEMAP, fiemap_buf);
+		if (ret < 0) {
+			if (errno == EOPNOTSUPP) {
+				exit_code = -EOPNOTSUPP;
+			} else {
+				exit_code = -1;
+				pr_perror("fiemap ioctl() failed");
+			}
+			goto out;
+		} else if (fiemap_buf->fm_mapped_extents == 0) {
+			goto out;
+		}
+
+		for (i = 0; i < fiemap_buf->fm_mapped_extents; i++) {
+			if (skip_outstanding(&fiemap_buf->fm_extents[i], file_size))
+				continue;
+
+			ce.len = fiemap_buf->fm_extents[i].fe_length;
+			ce.off = fiemap_buf->fm_extents[i].fe_logical;
+
+			if (pb_write_one(img, &ce, PB_GHOST_CHUNK)) {
+				exit_code = -1;
+				goto out;
+			}
+
+			if (copy_chunk_from_file(fd, img_raw_fd(img), ce.off, ce.len)) {
+				exit_code = -1;
+				goto out;
+			}
+
+			if (fiemap_buf->fm_extents[i].fe_flags & FIEMAP_EXTENT_LAST) {
+				/* there are no extents left, break. */
+				goto out;
+			}
+		}
+
+		/* Record file's logical offset as pos */
+		pos = ce.len + ce.off;
+
+		/* Since there are still extents left, continue. */
+	} while (fiemap_buf->fm_mapped_extents == EXTENT_MAX_COUNT);
+out:
+	xfree(fiemap_buf);
+	return exit_code;
+}
+
 static int copy_chunk_to_file(int img, int fd, off_t off, size_t len)
 {
 	int ret;
@@ -913,10 +1003,20 @@ static int dump_ghost_file(int _fd, u32 id, const struct stat *st, dev_t phys_de
 			goto err_out;
 		}
 
-		if (gfe.chunks)
-			ret = copy_file_to_chunks(fd, img, st->st_size);
-		else
+		if (gfe.chunks) {
+			if (opts.ghost_fiemap) {
+				ret = copy_file_to_chunks_fiemap(fd, img, st->st_size);
+				if (ret == -EOPNOTSUPP) {
+					pr_debug("file system don't support fiemap\n");
+					ret = copy_file_to_chunks(fd, img, st->st_size);
+				}
+			} else {
+				ret = copy_file_to_chunks(fd, img, st->st_size);
+			}
+		} else {
 			ret = copy_file(fd, img_raw_fd(img), st->st_size);
+		}
+
 		close(fd);
 		if (ret)
 			goto err_out;
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index eacaa03a6..c7e98c756 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -95,6 +95,9 @@ enum FILE_VALIDATION_OPTIONS {
 /* This constant dictates which file validation method should be tried by default. */
 #define FILE_VALIDATION_DEFAULT FILE_VALIDATION_BUILD_ID
 
+/* This constant dictates that criu use fiemap to copy ghost file by default.*/
+#define FIEMAP_DEFAULT 1
+
 struct irmap;
 
 struct irmap_path_opt {
@@ -167,6 +170,7 @@ struct cr_options {
 	int enable_external_masters;
 	bool aufs; /* auto-detected, not via cli */
 	bool overlayfs;
+	int ghost_fiemap;
 #ifdef CONFIG_BINFMT_MISC_VIRTUALIZED
 	bool has_binfmt_misc; /* auto-detected */
 #endif

From bdbccc315a3774cfcf9f160e856b7fad0495cea8 Mon Sep 17 00:00:00 2001
From: Liang-Chun Chen <featherclc@gmail.com>
Date: Sun, 11 Sep 2022 15:26:29 +0800
Subject: [PATCH 1174/1854] zdtm: add two tests for highly sparse ghost file

ghost_multi_hole00 and ghost_multi_hole01 are tests which create a ghost file
with a lot of holes, there are 4K data and 4K hole inside every 8K length.

The only difference between them is ghost-fiemap option, 01 is a
test for the fiemap dumping algorithm, and we want to test the
behavior of EXTENT_MAX_COUNT part, so the file size should be 8M, thus there
will be 1024 chunks in the ghost file.

In some file system, such as xfs, we somehow can not easily create highly sparse
file as in ext4 or btrfs, therefore we need `fallocate` to forcibly create holes.

Signed-off-by: Liang-Chun Chen <featherclc@gmail.com>
---
 test/zdtm/static/Makefile                |   2 +
 test/zdtm/static/ghost_multi_hole00.c    | 122 +++++++++++++++++++++++
 test/zdtm/static/ghost_multi_hole00.desc |   1 +
 test/zdtm/static/ghost_multi_hole01.c    |   1 +
 test/zdtm/static/ghost_multi_hole01.desc |   1 +
 5 files changed, 127 insertions(+)
 create mode 100644 test/zdtm/static/ghost_multi_hole00.c
 create mode 100644 test/zdtm/static/ghost_multi_hole00.desc
 create mode 120000 test/zdtm/static/ghost_multi_hole01.c
 create mode 100644 test/zdtm/static/ghost_multi_hole01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index edac92c83..000488133 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -308,6 +308,8 @@ TST_FILE	=				\
 		ghost_holes02			\
 		ghost_holes_large00     \
 		ghost_holes_large01     \
+		ghost_multi_hole00      \
+		ghost_multi_hole01      \
 		unlink_largefile		\
 		mtime_mmap			\
 		fifo				\
diff --git a/test/zdtm/static/ghost_multi_hole00.c b/test/zdtm/static/ghost_multi_hole00.c
new file mode 100644
index 000000000..0f78d4f14
--- /dev/null
+++ b/test/zdtm/static/ghost_multi_hole00.c
@@ -0,0 +1,122 @@
+#include <errno.h>
+#include <stdbool.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <linux/limits.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Test ghost with a lot of holes(every 8K length contains only 4K data)";
+const char *test_author = "Liang-Chun Chen <featherclc@gmail.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "file name", 1);
+
+/* Buffer that is suitable for hole size */
+#define BUFSIZE 4096
+static unsigned char buf4k[BUFSIZE];
+
+#ifndef SEEK_DATA
+#define SEEK_DATA 3
+#define SEEK_HOLE 4
+#endif
+
+#define FILE_SIZE (1 << 23) /* 8Mb */
+
+#define FILE_INTERVAL (1 << 13) /* 8Kb */
+
+int main(int argc, char **argv)
+{
+	int fd, off;
+	struct stat st;
+	uint32_t crc;
+
+	test_init(argc, argv);
+
+	fd = open(filename, O_RDWR | O_CREAT | O_TRUNC, 0644);
+	if (fd < 0) {
+		pr_perror("can't open %s", filename);
+		exit(1);
+	}
+
+	if (unlink(filename) < 0) {
+		pr_perror("can't unlink %s", filename);
+		goto failed;
+	}
+
+	for (off = 0; off < FILE_SIZE; off += FILE_INTERVAL) {
+		crc = ~0;
+		datagen(buf4k, BUFSIZE, &crc);
+		if (pwrite(fd, &buf4k, BUFSIZE, off) != BUFSIZE) {
+			perror("pwrite");
+			goto failed;
+		}
+
+		/*
+		* In some file system, such as xfs,
+		* only pwrite might not able to create highly sparse file,
+		* so we need to forcibly allocate hole inside the file.
+		*/
+		if (fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, off + BUFSIZE, BUFSIZE)) {
+			perror("fallocate");
+			goto failed;
+		}
+	}
+
+	if (ftruncate(fd, FILE_SIZE)) {
+		pr_perror("Can't fixup file size");
+		goto failed;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (fstat(fd, &st) < 0) {
+		fail("can't stat after");
+		goto failed;
+	}
+
+	if (st.st_size != FILE_SIZE) {
+		fail("file size changed to %ld", (long)st.st_size);
+		goto failed;
+	}
+
+	test_msg("Size %u OK\n", FILE_SIZE);
+
+	/* Data*/
+	for (off = 0; off < FILE_SIZE; off += FILE_INTERVAL) {
+		if (pread(fd, buf4k, BUFSIZE, off) != BUFSIZE) {
+			fail("pread failed @ %u", off / FILE_INTERVAL);
+			goto failed;
+		}
+
+		crc = ~0;
+		if (datachk(buf4k, BUFSIZE, &crc)) {
+			fail("datachk failed @ %u", off / FILE_INTERVAL);
+			goto failed;
+		}
+
+		test_msg("Data @%du OK\n", off / FILE_INTERVAL);
+	}
+
+	/* Hole */
+	for (off = 0; off < FILE_SIZE; off += FILE_INTERVAL) {
+		if (lseek(fd, off, SEEK_HOLE) != off + BUFSIZE) {
+			fail("failed to find hole @ %u", off / FILE_SIZE);
+			goto failed;
+		}
+		test_msg("Hole @%du OK\n", off / FILE_INTERVAL);
+	}
+
+	close(fd);
+	pass();
+	return 0;
+
+failed:
+	close(fd);
+	return 1;
+}
diff --git a/test/zdtm/static/ghost_multi_hole00.desc b/test/zdtm/static/ghost_multi_hole00.desc
new file mode 100644
index 000000000..3981e8180
--- /dev/null
+++ b/test/zdtm/static/ghost_multi_hole00.desc
@@ -0,0 +1 @@
+{'dopts': '--ghost-limit 8M --no-ghost-fiemap'}
diff --git a/test/zdtm/static/ghost_multi_hole01.c b/test/zdtm/static/ghost_multi_hole01.c
new file mode 120000
index 000000000..c75006a6b
--- /dev/null
+++ b/test/zdtm/static/ghost_multi_hole01.c
@@ -0,0 +1 @@
+ghost_multi_hole00.c
\ No newline at end of file
diff --git a/test/zdtm/static/ghost_multi_hole01.desc b/test/zdtm/static/ghost_multi_hole01.desc
new file mode 100644
index 000000000..d1dc68a54
--- /dev/null
+++ b/test/zdtm/static/ghost_multi_hole01.desc
@@ -0,0 +1 @@
+{'dopts': '--ghost-limit 8M --ghost-fiemap'}

From e5ccfbb240da1638f81db5fc0fa32998c8b9fca9 Mon Sep 17 00:00:00 2001
From: Shubham Verma <shubhamv.sv@gmail.com>
Date: Fri, 2 Dec 2022 01:52:20 +0530
Subject: [PATCH 1175/1854] Fix typo in comment

Signed-off-by: Shubham Verma <shubhamv.sv@gmail.com>
---
 test/zdtm/static/s390x_regs_check.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/static/s390x_regs_check.c b/test/zdtm/static/s390x_regs_check.c
index 40c480b3f..82dca0519 100644
--- a/test/zdtm/static/s390x_regs_check.c
+++ b/test/zdtm/static/s390x_regs_check.c
@@ -40,13 +40,13 @@ const char *test_author = "Michael Holzheu <holzheu@linux.vnet.ibm.com>";
  *
  * - Verify that "criu restore" sets the correct register sets
  *   from "criu dump":
- *   $ zdtmp.py run -t zdtm/static/s390x_regs_check
+ *   $ zdtm.py run -t zdtm/static/s390x_regs_check
  *
  * - Verify that dumpee continues running with correct registers after
  *   parasite injection:
- *   $ zdtmp.py run --norst -t zdtm/static/s390x_regs_check
- *   $ zdtmp.py run --norst --pre 2 -t zdtm/static/s390x_regs_check
- *   $ zdtmp.py run --check-only -t zdtm/static/s390x_regs_check
+ *   $ zdtm.py run --norst -t zdtm/static/s390x_regs_check
+ *   $ zdtm.py run --norst --pre 2 -t zdtm/static/s390x_regs_check
+ *   $ zdtm.py run --check-only -t zdtm/static/s390x_regs_check
  */
 #define NR_THREADS     2
 #define NR_THREADS_ALL (NR_THREADS + 1)

From 2180e03b904e38dd2f246581b29373b06a7fdd58 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 14 Nov 2022 09:23:00 -0800
Subject: [PATCH 1176/1854] non-root: Rework socket bufs for unprivileged mode

SO_SNDBUFFORCE/SO_RCVBUFFORCE require root or CAP_NET_ADMIN.
We can use SO_SNDBUF/SO_RCVBUF in some cases and avoid
needing elevated privileges.

This patch renames sk_setbufs() to sk_setbufs_ns() and
makes sk_setbufs() a general helper that sets socket
send and receive buffer sizes. The helper tries to use
SO_SNDBUFFORCE/SO_RCVBUFFORCE first and falls back to
SO_SNDBUF/SO_RCVBUF if we're in unprivileged mode.

The existing sk_setbufs_ns() which takes a pid parameter
and is intended to be called via userns_call() is rewritten
to call sk_setbufs().

Existing code that sets buffer sizes via setsockopt() is
modified to call sk_setbufs() instead.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/fdstore.c         | 15 ++-------------
 criu/include/sockets.h |  1 +
 criu/pidfd-store.c     |  5 ++---
 criu/sockets.c         | 32 ++++++++++++++++++++++++--------
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/criu/fdstore.c b/criu/fdstore.c
index 03afa9f17..d615ad15d 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -15,6 +15,7 @@
 #include "util.h"
 #include "cr_options.h"
 #include "util-caps.h"
+#include "sockets.h"
 
 /* clang-format off */
 static struct fdstore_desc {
@@ -29,8 +30,6 @@ int fdstore_init(void)
 	uint32_t buf[2] = { INT_MAX / 2, INT_MAX / 2 };
 	struct sockaddr_un addr;
 	unsigned int addrlen;
-	int rcv_opt_name;
-	int snd_opt_name;
 	struct stat st;
 	int sk, ret;
 
@@ -53,17 +52,7 @@ int fdstore_init(void)
 		return -1;
 	}
 
-	if (!opts.unprivileged || has_cap_net_admin(opts.cap_eff)) {
-		rcv_opt_name = SO_RCVBUFFORCE;
-		snd_opt_name = SO_SNDBUFFORCE;
-	} else {
-		rcv_opt_name = SO_RCVBUF;
-		snd_opt_name = SO_SNDBUF;
-	}
-
-	if (setsockopt(sk, SOL_SOCKET, snd_opt_name, &buf[0], sizeof(buf[0])) < 0 ||
-	    setsockopt(sk, SOL_SOCKET, rcv_opt_name, &buf[1], sizeof(buf[1])) < 0) {
-		pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
+	if (sk_setbufs(sk, buf)) {
 		close(sk);
 		return -1;
 	}
diff --git a/criu/include/sockets.h b/criu/include/sockets.h
index 399d38664..c3e7c879a 100644
--- a/criu/include/sockets.h
+++ b/criu/include/sockets.h
@@ -27,6 +27,7 @@ struct socket_desc {
 extern int dump_socket(struct fd_parms *p, int lfd, FdinfoEntry *);
 extern int dump_socket_opts(int sk, SkOptsEntry *soe);
 extern int restore_socket_opts(int sk, SkOptsEntry *soe);
+extern int sk_setbufs(int sk, uint32_t *bufs);
 extern void release_skopts(SkOptsEntry *);
 extern int restore_prepare_socket(int sk);
 extern void preload_socket_modules(void);
diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c
index b15568e08..9fdc74cb7 100644
--- a/criu/pidfd-store.c
+++ b/criu/pidfd-store.c
@@ -13,6 +13,7 @@
 #include "log.h"
 #include "util.h"
 #include "pidfd-store.h"
+#include "sockets.h"
 
 struct pidfd_entry {
 	pid_t pid;
@@ -94,9 +95,7 @@ int init_pidfd_store_sk(pid_t pid, int sk)
 	 * This is similar to how fdstore_init() works.
 	 */
 	if (addrlen == sizeof(sa_family_t)) {
-		if (setsockopt(pidfd_store_sk, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0], sizeof(buf[0])) < 0 ||
-		    setsockopt(pidfd_store_sk, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1], sizeof(buf[1])) < 0) {
-			pr_perror("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE");
+		if (sk_setbufs(pidfd_store_sk, buf)) {
 			goto err;
 		}
 
diff --git a/criu/sockets.c b/criu/sockets.c
index db772707b..7708344d6 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -29,6 +29,7 @@
 #include "pstree.h"
 #include "util.h"
 #include "fdstore.h"
+#include "cr_options.h"
 
 #undef LOG_PREFIX
 #define LOG_PREFIX "sockets: "
@@ -465,18 +466,33 @@ int do_restore_opt(int sk, int level, int name, void *val, int len)
 	return 0;
 }
 
-static int sk_setbufs(void *arg, int fd, pid_t pid)
+int sk_setbufs(int sk, uint32_t *bufs)
 {
-	u32 *buf = (u32 *)arg;
+	uint32_t sndbuf = bufs[0], rcvbuf = bufs[1];
 
-	if (restore_opt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &buf[0]))
-		return -1;
-	if (restore_opt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &buf[1]))
-		return -1;
+	if (setsockopt(sk, SOL_SOCKET, SO_SNDBUFFORCE, &sndbuf, sizeof(sndbuf)) ||
+	    setsockopt(sk, SOL_SOCKET, SO_RCVBUFFORCE, &rcvbuf, sizeof(rcvbuf))) {
+		if (opts.unprivileged) {
+			pr_info("Unable to set SO_SNDBUFFORCE/SO_RCVBUFFORCE, falling back to SO_SNDBUF/SO_RCVBUF\n");
+			if (setsockopt(sk, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf)) ||
+			    setsockopt(sk, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf))) {
+				pr_perror("Unable to set socket SO_SNDBUF/SO_RCVBUF");
+				return -1;
+			}
+		} else {
+			pr_perror("Unable to set socket SO_SNDBUFFORCE/SO_RCVBUFFORCE");
+			return -1;
+		}
+	}
 
 	return 0;
 }
 
+static int sk_setbufs_ns(void *arg, int fd, pid_t pid)
+{
+	return sk_setbufs(fd, (uint32_t *)arg);
+}
+
 /*
  * Set sizes of buffers to maximum and prevent blocking
  * Caller of this fn should call other socket restoring
@@ -489,7 +505,7 @@ int restore_prepare_socket(int sk)
 	/* In kernel a bufsize has type int and a value is doubled. */
 	u32 maxbuf[2] = { INT_MAX / 2, INT_MAX / 2 };
 
-	if (userns_call(sk_setbufs, 0, maxbuf, sizeof(maxbuf), sk))
+	if (userns_call(sk_setbufs_ns, 0, maxbuf, sizeof(maxbuf), sk))
 		return -1;
 
 	/* Prevent blocking on restore */
@@ -517,7 +533,7 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 	pr_info("%d restore sndbuf %d rcv buf %d\n", sk, soe->so_sndbuf, soe->so_rcvbuf);
 
 	/* setsockopt() multiplies the input values by 2 */
-	ret |= userns_call(sk_setbufs, 0, bufs, sizeof(bufs), sk);
+	ret |= userns_call(sk_setbufs_ns, 0, bufs, sizeof(bufs), sk);
 
 	if (soe->has_so_buf_lock) {
 		pr_debug("\trestore buf_lock %d for socket\n", soe->so_buf_lock);

From 5a19c34322c9fe212dfd0b94bdbf19e44fd24eeb Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 21 Nov 2022 11:14:20 -0800
Subject: [PATCH 1177/1854] non-root: Don't dump socket option SO_MARK if 0

Restoring SO_MARK requires root or CAP_NET_ADMIN. If the value
is 0 we will avoid dumping it so that we don't need to do a
privileged call on restore.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/sockets.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index 7708344d6..c99fc7b50 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -647,8 +647,13 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 	ret |= dump_opt(sk, SOL_SOCKET, SO_PRIORITY, &soe->so_priority);
 	soe->has_so_rcvlowat = true;
 	ret |= dump_opt(sk, SOL_SOCKET, SO_RCVLOWAT, &soe->so_rcvlowat);
-	soe->has_so_mark = true;
+	/*
+	 * Restoring SO_MARK requires root or CAP_NET_ADMIN. Avoid saving it
+	 * in unprivileged mode if still has its default value.
+	 */
 	ret |= dump_opt(sk, SOL_SOCKET, SO_MARK, &soe->so_mark);
+	if (soe->so_mark != 0)
+		soe->has_so_mark = true;
 
 	ret |= dump_opt(sk, SOL_SOCKET, SO_SNDTIMEO, &tv);
 	soe->so_snd_tmo_sec = tv.tv_sec;

From 5c60d35be4e51bd2654e74d5bb2d09772f4ccaae Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 12 Dec 2022 09:32:58 -0800
Subject: [PATCH 1178/1854] sockets: tiny style fix

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sockets.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index c99fc7b50..d17e0a986 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -652,8 +652,7 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 	 * in unprivileged mode if still has its default value.
 	 */
 	ret |= dump_opt(sk, SOL_SOCKET, SO_MARK, &soe->so_mark);
-	if (soe->so_mark != 0)
-		soe->has_so_mark = true;
+	soe->has_so_mark = !!soe->so_mark;
 
 	ret |= dump_opt(sk, SOL_SOCKET, SO_SNDTIMEO, &tv);
 	soe->so_snd_tmo_sec = tv.tv_sec;

From 9686693aa6646254e5d8b1e0b2e9e885aad97b9c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 13 Dec 2022 09:39:49 -0800
Subject: [PATCH 1179/1854] test/javaTests: update org.testng:testng (Maven)

TestNG is vulnerable to Path Traversal

Fixes https://github.com/checkpoint-restore/criu/security/dependabot/1.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.hotspot-alpine | 2 +-
 scripts/build/Dockerfile.hotspot-ubuntu | 2 +-
 scripts/build/Dockerfile.openj9-ubuntu  | 2 +-
 test/javaTests/pom.xml                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/build/Dockerfile.hotspot-alpine b/scripts/build/Dockerfile.hotspot-alpine
index d6e6e5130..cb9332fd0 100644
--- a/scripts/build/Dockerfile.hotspot-alpine
+++ b/scripts/build/Dockerfile.hotspot-alpine
@@ -1,4 +1,4 @@
-FROM docker.io/library/eclipse-temurin:8-alpine
+FROM docker.io/library/eclipse-temurin:11-alpine
 ARG CC=gcc
 
 RUN apk update && apk add \
diff --git a/scripts/build/Dockerfile.hotspot-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu
index 8936adf81..350102818 100644
--- a/scripts/build/Dockerfile.hotspot-ubuntu
+++ b/scripts/build/Dockerfile.hotspot-ubuntu
@@ -1,4 +1,4 @@
-FROM docker.io/library/eclipse-temurin:8-focal
+FROM docker.io/library/eclipse-temurin:11-focal
 ARG CC=gcc
 
 COPY scripts/ci/apt-install /bin/apt-install
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 2e35358ff..23db14e8d 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,4 +1,4 @@
-FROM docker.io/library/ibm-semeru-runtimes:open-8-jdk-focal
+FROM docker.io/library/ibm-semeru-runtimes:open-11-jdk-focal
 ARG CC=gcc
 
 COPY scripts/ci/apt-install /bin/apt-install
diff --git a/test/javaTests/pom.xml b/test/javaTests/pom.xml
index faae44d1b..ddb6c89cf 100644
--- a/test/javaTests/pom.xml
+++ b/test/javaTests/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>org.testng</groupId>
 			<artifactId>testng</artifactId>
-			<version>6.3.1</version>
+			<version>7.7.0</version>
 		</dependency>
 	</dependencies>
 	<properties>

From 21f5be91a90a420c7e183b61f0a64ab7f0f8f137 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 1 Jan 2023 17:18:52 -0800
Subject: [PATCH 1180/1854] cgroups: ignore EOPNOTSUPP on setting
 memory.kmem.limit_in_byte

memory.kmem.limit_in_bytes has been deprecated. Look at e7c4184164f7
("memcg, kmem: further deprecate kmem.limit_in_bytes") for more details.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/cgroup.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 918827d99..0c730713a 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1402,7 +1402,7 @@ static int restore_cgroup_subtree_control(const CgroupPropEntry *cg_prop_entry_p
 static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *path, int off, bool split_lines,
 			       bool skip_fails)
 {
-	int cg, fd, ret = -1, flag;
+	int cg, fd, exit_code = -1, flag;
 	CgroupPerms *perms = cg_prop_entry_p->perms;
 	int is_subtree_control = !strcmp(cg_prop_entry_p->name, "cgroup.subtree_control");
 
@@ -1438,18 +1438,18 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *pat
 
 	/* skip these two since restoring their values doesn't make sense */
 	if (!strcmp(cg_prop_entry_p->name, "cgroup.procs") || !strcmp(cg_prop_entry_p->name, "tasks")) {
-		ret = 0;
+		exit_code = 0;
 		goto out;
 	}
 
 	if (is_subtree_control) {
-		ret = restore_cgroup_subtree_control(cg_prop_entry_p, fd);
+		exit_code = restore_cgroup_subtree_control(cg_prop_entry_p, fd);
 		goto out;
 	}
 
 	/* skip restoring cgroup.type if its value is not "threaded" */
 	if (!strcmp(cg_prop_entry_p->name, "cgroup.type") && strcmp(cg_prop_entry_p->value, "threaded")) {
-		ret = 0;
+		exit_code = 0;
 		goto out;
 	}
 
@@ -1471,21 +1471,28 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *pat
 		} while (*next_line != '\0');
 	} else {
 		size_t len = strlen(cg_prop_entry_p->value);
+		int ret;
 
-		if (write(fd, cg_prop_entry_p->value, len) != len) {
+		ret = write(fd, cg_prop_entry_p->value, len);
+		/* memory.kmem.limit_in_bytes has been deprecated. Look at
+		 * 58056f77502f3 ("memcg, kmem: further deprecate
+		 * kmem.limit_in_bytes") for more details. */
+		if (ret == -1 && errno == EOPNOTSUPP &&
+		    !strcmp(cg_prop_entry_p->name, "memory.kmem.limit_in_bytes"))
+			ret = len;
+		if (ret != len) {
 			pr_perror("Failed writing %s to %s", cg_prop_entry_p->value, path);
 			if (!skip_fails)
 				goto out;
 		}
 	}
 
-	ret = 0;
-
+	exit_code = 0;
 out:
 	if (close(fd) != 0)
 		pr_perror("Failed closing %s", path);
 
-	return ret;
+	return exit_code;
 }
 
 static CgroupPropEntry *freezer_state_entry;

From a302b369408ab9a41f27d993e1e61c25bd3c90c2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 5 Jan 2023 17:47:21 +0000
Subject: [PATCH 1181/1854] zdtm: fix 'zdtm.py list' command

The command ./zdtm.py list currently fails with

    if opts['rootless']:
       ~~~~^^^^^^^^^^^^
    KeyError: 'rootless'

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index a311610c3..33859f61e 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -626,14 +626,14 @@ class zdtm_test:
                 ["make", "zdtm_ct"], env=dict(os.environ, MAKEFLAGS=""))
         if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
             subprocess.check_call(["make", "-C", "zdtm/"])
-        if opts['rootless']:
+        if 'rootless' in opts and opts['rootless']:
             return
         subprocess.check_call(
             ["flock", "zdtm_mount_cgroups.lock", "./zdtm_mount_cgroups", str(uuid)])
 
     @staticmethod
     def cleanup():
-        if opts['rootless']:
+        if 'rootless' in opts and opts['rootless']:
             return
         subprocess.check_call(
             ["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups", str(uuid)])

From bb3f7bef66d4a951e132035ff89d44b01f65e8e5 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 4 Jan 2023 17:15:44 +0300
Subject: [PATCH 1182/1854] crtools: fix help message alignment for
 --network-lock

Fixes: 2e30db5c3 ("criu: add --network-lock option to allow nftables alternative")

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/crtools.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index ac05bc821..4258ce388 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -414,9 +414,8 @@ usage:
 	       "  --mntns-compat-mode   Use mount engine in compatibility mode. By default criu\n"
 	       "                        tries to use mount-v2 mode with more reliable algorithm\n"
 	       "                        based on MOVE_MOUNT_SET_GROUP kernel feature\n"
-	       "  --network-lock METHOD\n"
-	       "                      network locking/unlocking method; argument\n"
-	       "                      can be 'nftables' or 'iptables' (default).\n"
+	       "  --network-lock METHOD network locking/unlocking method; argument\n"
+	       "                        can be 'nftables' or 'iptables' (default).\n"
 	       "  --unprivileged        accept limitations when running as non-root\n"
 	       "                        consult documentation for further details\n"
 	       "\n"

From 7c6eb0b85c3bfca03f8e56389691ee10275055ab Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Mon, 9 Jan 2023 13:28:48 +0100
Subject: [PATCH 1183/1854] asm: fix for_each_bit macro

find_next_bit operates on a bit instead of byte positions/sizes.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 include/common/arch/ppc64/asm/bitops.h | 7 ++++---
 include/common/arch/s390/asm/bitops.h  | 7 ++++---
 include/common/arch/x86/asm/bitops.h   | 7 ++++---
 include/common/asm-generic/bitops.h    | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/include/common/arch/ppc64/asm/bitops.h b/include/common/arch/ppc64/asm/bitops.h
index dbfa6be7f..54d55da16 100644
--- a/include/common/arch/ppc64/asm/bitops.h
+++ b/include/common/arch/ppc64/asm/bitops.h
@@ -46,6 +46,7 @@
 #define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
 
 #define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
+#define BITMAP_SIZE(name)	   (sizeof(name) * CHAR_BIT)
 
 #define __stringify_in_c(...) #__VA_ARGS__
 #define stringify_in_c(...)   __stringify_in_c(__VA_ARGS__) " "
@@ -202,8 +203,8 @@ found_middle:
 	return result + __ffs(tmp);
 }
 
-#define for_each_bit(i, bitmask)                                                  \
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
-	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
+#define for_each_bit(i, bitmask)                                                            \
+	for (i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), 0); i < BITMAP_SIZE(bitmask); \
+	     i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), i + 1))
 
 #endif /* __CR_BITOPS_H__ */
diff --git a/include/common/arch/s390/asm/bitops.h b/include/common/arch/s390/asm/bitops.h
index f396721e9..22547c544 100644
--- a/include/common/arch/s390/asm/bitops.h
+++ b/include/common/arch/s390/asm/bitops.h
@@ -10,6 +10,7 @@
 #define __BITOPS_WORDS(bits) (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)
 
 #define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
+#define BITMAP_SIZE(name)	   (sizeof(name) * CHAR_BIT)
 
 static inline unsigned long *__bitops_word(unsigned long nr, volatile unsigned long *ptr)
 {
@@ -143,8 +144,8 @@ static inline unsigned long find_next_bit(const unsigned long *addr, unsigned lo
 	return _find_next_bit(addr, size, offset, 0UL);
 }
 
-#define for_each_bit(i, bitmask)                                                  \
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
-	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
+#define for_each_bit(i, bitmask)                                                            \
+	for (i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), 0); i < BITMAP_SIZE(bitmask); \
+	     i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), i + 1))
 
 #endif /* _S390_BITOPS_H */
diff --git a/include/common/arch/x86/asm/bitops.h b/include/common/arch/x86/asm/bitops.h
index c13c1eb45..f3c7dbbdf 100644
--- a/include/common/arch/x86/asm/bitops.h
+++ b/include/common/arch/x86/asm/bitops.h
@@ -10,6 +10,7 @@
 #define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
 
 #define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
+#define BITMAP_SIZE(name)	   (sizeof(name) * CHAR_BIT)
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
 /* Technically wrong, but this avoids compilation errors on some gcc
@@ -119,8 +120,8 @@ found_middle:
 	return result + __ffs(tmp);
 }
 
-#define for_each_bit(i, bitmask)                                                  \
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
-	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
+#define for_each_bit(i, bitmask)                                                            \
+	for (i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), 0); i < BITMAP_SIZE(bitmask); \
+	     i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), i + 1))
 
 #endif /* __CR_BITOPS_H__ */
diff --git a/include/common/asm-generic/bitops.h b/include/common/asm-generic/bitops.h
index 004da4c4e..d8f38091d 100644
--- a/include/common/asm-generic/bitops.h
+++ b/include/common/asm-generic/bitops.h
@@ -14,6 +14,7 @@
 #define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
 
 #define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
+#define BITMAP_SIZE(name)	   (sizeof(name) * CHAR_BIT)
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
 /* Technically wrong, but this avoids compilation errors on some gcc
@@ -103,8 +104,8 @@ found_middle:
 	return result + __ffs(tmp);
 }
 
-#define for_each_bit(i, bitmask)                                                  \
-	for (i = find_next_bit(bitmask, sizeof(bitmask), 0); i < sizeof(bitmask); \
-	     i = find_next_bit(bitmask, sizeof(bitmask), i + 1))
+#define for_each_bit(i, bitmask)                                                            \
+	for (i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), 0); i < BITMAP_SIZE(bitmask); \
+	     i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), i + 1))
 
 #endif /* __CR_GENERIC_BITOPS_H__ */

From aab709b602a142ffd72e0e00a9c575cc047e1fca Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date: Thu, 13 Dec 2018 18:15:49 +0300
Subject: [PATCH 1184/1854] log: Write more details in write_pidfile

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/log.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/criu/log.c b/criu/log.c
index c4ce90ec0..e31f24e39 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -397,15 +397,28 @@ void print_on_level(unsigned int loglevel, const char *format, ...)
 
 int write_pidfile(int pid)
 {
-	int fd;
+	int fd, ret, exit_code = -1;
 
 	fd = open(opts.pidfile, O_WRONLY | O_EXCL | O_CREAT, 0600);
 	if (fd == -1) {
-		pr_perror("Can't open %s", opts.pidfile);
+		pr_perror("pidfile: Can't open %s", opts.pidfile);
 		return -1;
 	}
 
-	dprintf(fd, "%d", pid);
+	ret = dprintf(fd, "%d", pid);
+	if (ret < 0) {
+		pr_perror("pidfile: Can't write pid %d to %s", pid, opts.pidfile);
+		goto close;
+	}
+
+	if (ret == 0) {
+		pr_err("pidfile: Can't write pid %d to %s\n", pid, opts.pidfile);
+		goto close;
+	}
+
+	pr_debug("pidfile: Wrote pid %d to %s (%d bytes)\n", pid, opts.pidfile, ret);
+	exit_code = 0;
+close:
 	close(fd);
-	return 0;
+	return exit_code;
 }

From c8b4fb9ba5aa4975c842d6b46daac41f3c6beeaf Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 12 Jan 2023 18:06:26 +0300
Subject: [PATCH 1185/1854] autofs: fix a frankenstein auto-created by
 clang-format

Fixes: 93dd984ca ("Run 'make indent' on all C files")

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/autofs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index c662bea60..6a7d8db0d 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -431,8 +431,7 @@ static int access_autofs_mount(struct mount_info *pm)
 		pr_err("failed to fork\n");
 		goto close_autofs_mnt;
 	case 0:
-		/* We don't care about results.
-			 * All we need is to "touch" */
+		/* We don't care about results, all we need is to "touch" */
 		/* coverity[check_return] */
 		openat(autofs_mnt, mnt_path, O_RDONLY | O_NONBLOCK | O_DIRECTORY);
 		_exit(0);

From abfe0b5d2469f5697a9afa0bd8089ced95d3a246 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 16 Jan 2023 18:22:07 +0300
Subject: [PATCH 1186/1854] clang-format: add for_each_bit macros to
 ForEachMacros

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .clang-format                 | 1 +
 scripts/fetch-clang-format.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.clang-format b/.clang-format
index 96ba5909f..b64ade9d9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -71,6 +71,7 @@ FixNamespaceComments: false # Unknown to clang-format-4.0
 #   | sort | uniq
 ForEachMacros:
   - 'for_each_pstree_item'
+  - 'for_each_bit'
   - 'apei_estatus_for_each_section'
   - 'ata_for_each_dev'
   - 'ata_for_each_link'
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
index 0e9545f2d..b93a804a1 100755
--- a/scripts/fetch-clang-format.sh
+++ b/scripts/fetch-clang-format.sh
@@ -10,6 +10,7 @@ curl -s "${URL}" | sed -e "
 	s,ControlStatements,ControlStatementsExceptForEachMacros,g;
 	s,ColumnLimit: 80,ColumnLimit: 120,g;
 	s,Intended for clang-format >= 4,Intended for clang-format >= 11,g;
+	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_bit',g;
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;
 	s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
 	s,AlignTrailingComments: false,AlignTrailingComments: true,g;

From 1bb84f96f53dc44c6d559ac2bdaaa58f439c5aa2 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 16 Jan 2023 18:30:32 +0300
Subject: [PATCH 1187/1854] tty: fix codding-style around for_each_bit call

Wraping "{" to next line after for-each macros is wrong.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/tty.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/tty.c b/criu/tty.c
index 13f645f3a..199984ec0 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -398,8 +398,7 @@ static int tty_verify_active_pairs(void)
 {
 	unsigned long i, unpaired_slaves = 0;
 
-	for_each_bit(i, tty_active_pairs)
-	{
+	for_each_bit(i, tty_active_pairs) {
 		if ((i % 2) == 0) {
 			if (test_bit(i + 1, tty_active_pairs)) {
 				i++;

From a918093cebd600b72d42d63aa92bcb80586c49b6 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 16 Jan 2023 16:48:26 +0000
Subject: [PATCH 1188/1854] scripts/ci: use Fedora 37 for vagrant based tests

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index e23486f29..a3e4b6937 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -7,8 +7,8 @@ set -e
 set -x
 
 VAGRANT_VERSION=2.2.19
-FEDORA_VERSION=35
-FEDORA_BOX_VERSION=35.20211026.0
+FEDORA_VERSION=37
+FEDORA_BOX_VERSION=37.20221105.0
 
 setup() {
 	if [ -n "$TRAVIS" ]; then

From be61624f4504930716c5c365f5e7a0843fb224ba Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 11 Jan 2023 11:15:37 +0300
Subject: [PATCH 1189/1854] clang-format: rework make indent to check specific
 commits

Previousely "make indent" checked all files in criu source directory for
codding style flaws. We have several problems with it:

- clang-format default format sometimes changes in new versions of the
package and we need to reformat all our code base each time it happens
- on different systems we may have different versions of clang-format
and on latest criu-dev "make indent" may be still unhappy on your system
- when we want to update clang-format rules ourselves we need to update
all our code base each time
- sometimes clang-format rules are not fitting all our cases, (e.g.: an
option IndentGotoLabels works nice for simple C code, but is a no go for
assembler and C macros) and putting "clang-format off" everywhere is a
mess
- sometimes we intentionally want to break clang-format rules (e.g.:
we want to put function arguments on a new line separating them
"logically" not "mechanically" following 120-char rule like clang-format
does).

This adds a BASE option for "make indent" where all commits in range
BASE..HEAD would be checked with git-clang-format for codding style
flaws. For instance when developing on top of criu-dev, one can use
"make BASE=origin/criu-dev indent" to check all their commits for
compliance with the clang-format rules. Default base is HEAD~1 to make
last commit checked when "make indent" is called. The closest thing to
the old behaviour would then be "make indent BASE=init", note that only
commited files would be checked.

Extra options to git-clang-format may be passed through OPTS variable.

Also reuse "make indent" in github lint workflow.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .github/workflows/lint.yml | 16 ++++++----------
 Makefile                   |  4 +++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 4c05285e6..0194c9393 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -23,16 +23,12 @@ jobs:
     - name: Run make indent
       run: >
         if [ -z "${{github.base_ref}}" ]; then
-          make indent
+          if ! make indent OPTS=--diff; then
+            exit 1
+          fi
         else
           git fetch origin ${{github.base_ref}} &&
-          git clang-format --style file --extensions c,h --quiet origin/${{github.base_ref}}
-        fi &&
-        STATUS=$(git status --porcelain) &&
-        if [ ! -z "$STATUS" ]; then
-          echo "FAIL: some files are not correctly formatted.";
-          echo "$STATUS"
-          git diff
-          echo "FAIL: please run 'make indent'";
-          exit 1;
+          if ! make indent OPTS=--diff BASE=origin/${{github.base_ref}}; then
+            exit 1
+          fi
         fi
diff --git a/Makefile b/Makefile
index 537720339..ba1f77440 100644
--- a/Makefile
+++ b/Makefile
@@ -451,8 +451,10 @@ fetch-clang-format: .FORCE
 	$(E) ".clang-format"
 	$(Q) scripts/fetch-clang-format.sh
 
+BASE ?= "HEAD~1"
+OPTS ?= "--quiet"
 indent:
-	find . -name '*.[ch]' -type f -print0 | xargs --null --max-args 128 --max-procs 4 clang-format -i
+	git clang-format --style file --extensions c,h $(OPTS) $(BASE)
 .PHONY: indent
 
 include Makefile.install

From d800ef65884841c17f134612ef5c36acefa6cdd7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 21 Feb 2022 15:27:19 +0300
Subject: [PATCH 1190/1854] zdtm/lib: copy list.h

Need it to use linux lists in zdtm.

Also copy container_of from comiler.h to zdtmtst.h like we already do
for e.g. __stack_aligned__ macro.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/list.h    | 389 ++++++++++++++++++++++++++++++++++++++++
 test/zdtm/lib/zdtmtst.h |   6 +
 2 files changed, 395 insertions(+)
 create mode 100644 test/zdtm/lib/list.h

diff --git a/test/zdtm/lib/list.h b/test/zdtm/lib/list.h
new file mode 100644
index 000000000..97d0f1e06
--- /dev/null
+++ b/test/zdtm/lib/list.h
@@ -0,0 +1,389 @@
+#ifndef __ZDTM_LIST_H__
+#define __ZDTM_LIST_H__
+
+/*
+ * Double linked lists.
+ */
+
+#include <stddef.h>
+#include "zdtmtst.h"
+
+#define POISON_POINTER_DELTA 0
+#define LIST_POISON1	     ((void *)0x00100100 + POISON_POINTER_DELTA)
+#define LIST_POISON2	     ((void *)0x00200200 + POISON_POINTER_DELTA)
+
+struct list_head {
+	struct list_head *prev, *next;
+};
+
+#define LIST_HEAD_INIT(name)     \
+	{                        \
+		&(name), &(name) \
+	}
+#define LIST_HEAD(name) struct list_head name = LIST_HEAD_INIT(name)
+
+static inline void INIT_LIST_HEAD(struct list_head *list)
+{
+	list->next = list;
+	list->prev = list;
+}
+
+static inline void __list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+static inline void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+static inline void __list_del(struct list_head *prev, struct list_head *next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+static inline void __list_del_entry(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+}
+
+static inline void list_del(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+	entry->next = LIST_POISON1;
+	entry->prev = LIST_POISON2;
+}
+
+static inline void list_replace(struct list_head *old, struct list_head *new)
+{
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
+}
+
+static inline void list_replace_init(struct list_head *old, struct list_head *new)
+{
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
+}
+
+static inline void list_del_init(struct list_head *entry)
+{
+	__list_del_entry(entry);
+	INIT_LIST_HEAD(entry);
+}
+
+static inline void list_move(struct list_head *list, struct list_head *head)
+{
+	__list_del_entry(list);
+	list_add(list, head);
+}
+
+static inline void list_move_tail(struct list_head *list, struct list_head *head)
+{
+	__list_del_entry(list);
+	list_add_tail(list, head);
+}
+
+static inline int list_is_last(const struct list_head *list, const struct list_head *head)
+{
+	return list->next == head;
+}
+
+static inline int list_is_first(const struct list_head *list, const struct list_head *head)
+{
+	return list->prev == head;
+}
+
+static inline int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+static inline int list_empty_careful(const struct list_head *head)
+{
+	struct list_head *next = head->next;
+	return (next == head) && (next == head->prev);
+}
+static inline void list_rotate_left(struct list_head *head)
+{
+	struct list_head *first;
+
+	if (!list_empty(head)) {
+		first = head->next;
+		list_move_tail(first, head);
+	}
+}
+
+static inline int list_is_singular(const struct list_head *head)
+{
+	return !list_empty(head) && (head->next == head->prev);
+}
+
+static inline void __list_cut_position(struct list_head *list, struct list_head *head, struct list_head *entry)
+{
+	struct list_head *new_first = entry->next;
+	list->next = head->next;
+	list->next->prev = list;
+	list->prev = entry;
+	entry->next = list;
+	head->next = new_first;
+	new_first->prev = head;
+}
+
+static inline void list_cut_position(struct list_head *list, struct list_head *head, struct list_head *entry)
+{
+	if (list_empty(head))
+		return;
+	if (list_is_singular(head) && (head->next != entry && head != entry))
+		return;
+	if (entry == head)
+		INIT_LIST_HEAD(list);
+	else
+		__list_cut_position(list, head, entry);
+}
+
+static inline void __list_splice(const struct list_head *list, struct list_head *prev, struct list_head *next)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+
+	first->prev = prev;
+	prev->next = first;
+
+	last->next = next;
+	next->prev = last;
+}
+
+static inline void list_splice(const struct list_head *list, struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head, head->next);
+}
+
+static inline void list_splice_tail(struct list_head *list, struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
+}
+
+static inline void list_splice_init(struct list_head *list, struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head, head->next);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+static inline void list_splice_tail_init(struct list_head *list, struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head->prev, head);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+#define list_entry(ptr, type, member) container_of(ptr, type, member)
+
+#define list_first_entry(ptr, type, member) list_entry((ptr)->next, type, member)
+
+#define list_for_each(pos, head) for (pos = (head)->next; pos != (head); pos = pos->next)
+
+#define list_for_each_prev(pos, head) for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+#define list_for_each_safe(pos, n, head) for (pos = (head)->next, n = pos->next; pos != (head); pos = n, n = pos->next)
+
+#define list_for_each_prev_safe(pos, n, head) \
+	for (pos = (head)->prev, n = pos->prev; pos != (head); pos = n, n = pos->prev)
+
+#define list_for_each_entry(pos, head, member)                                             \
+	for (pos = list_entry((head)->next, typeof(*pos), member); &pos->member != (head); \
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+#define list_for_each_entry_reverse(pos, head, member)                                     \
+	for (pos = list_entry((head)->prev, typeof(*pos), member); &pos->member != (head); \
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+#define list_prepare_entry(pos, head, member) ((pos) ?: list_entry(head, typeof(*pos), member))
+
+#define list_for_each_entry_continue(pos, head, member)                                        \
+	for (pos = list_entry(pos->member.next, typeof(*pos), member); &pos->member != (head); \
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+#define list_for_each_entry_continue_reverse(pos, head, member)                                \
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member); &pos->member != (head); \
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+#define list_for_each_entry_from(pos, head, member) \
+	for (; &pos->member != (head); pos = list_entry(pos->member.next, typeof(*pos), member))
+
+#define list_for_each_entry_safe(pos, n, head, member)              \
+	for (pos = list_entry((head)->next, typeof(*pos), member),  \
+	    n = list_entry(pos->member.next, typeof(*pos), member); \
+	     &pos->member != (head); pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+#define list_for_each_entry_safe_continue(pos, n, head, member)        \
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), \
+	    n = list_entry(pos->member.next, typeof(*pos), member);    \
+	     &pos->member != (head); pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+#define list_for_each_entry_safe_from(pos, n, head, member)                                  \
+	for (n = list_entry(pos->member.next, typeof(*pos), member); &pos->member != (head); \
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+#define list_for_each_entry_safe_reverse(pos, n, head, member)      \
+	for (pos = list_entry((head)->prev, typeof(*pos), member),  \
+	    n = list_entry(pos->member.prev, typeof(*pos), member); \
+	     &pos->member != (head); pos = n, n = list_entry(n->member.prev, typeof(*n), member))
+
+#define list_safe_reset_next(pos, n, member) n = list_entry(pos->member.next, typeof(*pos), member)
+
+/*
+ * Double linked lists with a single pointer list head.
+ */
+
+struct hlist_head {
+	struct hlist_node *first;
+};
+
+struct hlist_node {
+	struct hlist_node *next, **pprev;
+};
+
+#define HLIST_HEAD_INIT       \
+	{                     \
+		.first = NULL \
+	}
+#define HLIST_HEAD(name)     struct hlist_head name = { .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
+{
+	h->next = NULL;
+	h->pprev = NULL;
+}
+
+static inline int hlist_unhashed(const struct hlist_node *h)
+{
+	return !h->pprev;
+}
+
+static inline int hlist_empty(const struct hlist_head *h)
+{
+	return !h->first;
+}
+
+static inline void __hlist_del(struct hlist_node *n)
+{
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
+	*pprev = next;
+	if (next)
+		next->pprev = pprev;
+}
+
+static inline void hlist_del(struct hlist_node *n)
+{
+	__hlist_del(n);
+	n->next = LIST_POISON1;
+	n->pprev = LIST_POISON2;
+}
+
+static inline void hlist_del_init(struct hlist_node *n)
+{
+	if (!hlist_unhashed(n)) {
+		__hlist_del(n);
+		INIT_HLIST_NODE(n);
+	}
+}
+
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
+{
+	struct hlist_node *first = h->first;
+	n->next = first;
+	if (first)
+		first->pprev = &n->next;
+	h->first = n;
+	n->pprev = &h->first;
+}
+
+/* next must be != NULL */
+static inline void hlist_add_before(struct hlist_node *n, struct hlist_node *next)
+{
+	n->pprev = next->pprev;
+	n->next = next;
+	next->pprev = &n->next;
+	*(n->pprev) = n;
+}
+
+static inline void hlist_add_after(struct hlist_node *n, struct hlist_node *next)
+{
+	next->next = n->next;
+	n->next = next;
+	next->pprev = &n->next;
+
+	if (next->next)
+		next->next->pprev = &next->next;
+}
+
+/* after that we'll appear to be on some hlist and hlist_del will work */
+static inline void hlist_add_fake(struct hlist_node *n)
+{
+	n->pprev = &n->next;
+}
+
+/*
+ * Move a list from one list head to another. Fixup the pprev
+ * reference of the first entry if it exists.
+ */
+static inline void hlist_move_list(struct hlist_head *old, struct hlist_head *new)
+{
+	new->first = old->first;
+	if (new->first)
+		new->first->pprev = &new->first;
+	old->first = NULL;
+}
+
+#define hlist_entry(ptr, type, member) container_of(ptr, type, member)
+
+#define hlist_for_each(pos, head) for (pos = (head)->first; pos; pos = pos->next)
+
+#define hlist_for_each_safe(pos, n, head)                \
+	for (pos = (head)->first; pos && ({              \
+					  n = pos->next; \
+					  1;             \
+				  });                    \
+	     pos = n)
+
+#define hlist_entry_safe(ptr, type, member) (ptr) ? hlist_entry(ptr, type, member) : NULL
+
+#define hlist_for_each_entry(pos, head, member)                                  \
+	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member); pos; \
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+
+#define hlist_for_each_entry_continue(pos, member)                                    \
+	for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member); pos; \
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+
+#define hlist_for_each_entry_from(pos, member) \
+	for (; pos; pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+
+#define hlist_for_each_entry_safe(pos, n, head, member)                                                 \
+	for (pos = hlist_entry_safe((head)->first, typeof(*pos), member); pos && ({                     \
+										  n = pos->member.next; \
+										  1;                    \
+									  });                           \
+	     pos = hlist_entry_safe(n, typeof(*pos), member))
+
+#endif /* __ZDTM_LIST_H__ */
diff --git a/test/zdtm/lib/zdtmtst.h b/test/zdtm/lib/zdtmtst.h
index 105f3c11a..b0e25702e 100644
--- a/test/zdtm/lib/zdtmtst.h
+++ b/test/zdtm/lib/zdtmtst.h
@@ -219,4 +219,10 @@ static inline void cleanup_closep(void *p)
 extern int write_value(const char *path, const char *value);
 extern int read_value(const char *path, char *value, int size);
 
+#define container_of(ptr, type, member)                            \
+	({                                                         \
+		const typeof(((type *)0)->member) *__mptr = (ptr); \
+		(type *)((char *)__mptr - offsetof(type, member)); \
+	})
+
 #endif /* _VIMITESU_H_ */

From 543501d5f88fda1ea3e059498798d02b3418e734 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 22 Feb 2022 11:49:10 +0300
Subject: [PATCH 1191/1854] zdtm/lib: copy xmalloc.h

Need to use xzalloc in zdtm lib.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/xmalloc.h | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 test/zdtm/lib/xmalloc.h

diff --git a/test/zdtm/lib/xmalloc.h b/test/zdtm/lib/xmalloc.h
new file mode 100644
index 000000000..95e0d4043
--- /dev/null
+++ b/test/zdtm/lib/xmalloc.h
@@ -0,0 +1,68 @@
+#ifndef __ZDTM_XMALLOC_H__
+#define __ZDTM_XMALLOC_H__
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef pr_err
+#error "Macro pr_err is needed."
+#endif
+
+#define __xalloc(op, size, ...)                                                           \
+	({                                                                                \
+		void *___p = op(__VA_ARGS__);                                             \
+		if (!___p)                                                                \
+			pr_err("%s: Can't allocate %li bytes\n", __func__, (long)(size)); \
+		___p;                                                                     \
+	})
+
+#define xstrdup(str)	  __xalloc(strdup, strlen(str) + 1, str)
+#define xmalloc(size)	  __xalloc(malloc, size, size)
+#define xzalloc(size)	  __xalloc(calloc, size, 1, size)
+#define xrealloc(p, size) __xalloc(realloc, size, p, size)
+
+#define xfree(p) free(p)
+
+#define xrealloc_safe(pptr, size)                  \
+	({                                         \
+		int __ret = -1;                    \
+		void *new = xrealloc(*pptr, size); \
+		if (new) {                         \
+			*pptr = new;               \
+			__ret = 0;                 \
+		}                                  \
+		__ret;                             \
+	})
+
+#define xmemdup(ptr, size)                      \
+	({                                      \
+		void *new = xmalloc(size);      \
+		if (new)                        \
+			memcpy(new, ptr, size); \
+		new;                            \
+	})
+
+#define memzero_p(p)	 memset(p, 0, sizeof(*p))
+#define memzero(p, size) memset(p, 0, size)
+
+/*
+ * Helper for allocating trees with single xmalloc.
+ * This one advances the void *pointer on s bytes and
+ * returns the previous value. Use like this
+ *
+ * m = xmalloc(total_size);
+ * a = xptr_pull(&m, tree_root_t);
+ * a->b = xptr_pull(&m, leaf_a_t);
+ * a->c = xptr_pull(&m, leaf_c_t);
+ * ...
+ */
+static inline void *xptr_pull_s(void **m, size_t s)
+{
+	void *ret = (*m);
+	(*m) += s;
+	return ret;
+}
+
+#define xptr_pull(m, type) xptr_pull_s(m, sizeof(type))
+
+#endif /* __CR_XMALLOC_H__ */

From 2837a13ef9f279bbe34b1030d4ee6e47ca010a4f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 21 Feb 2022 15:35:41 +0300
Subject: [PATCH 1192/1854] zdtm: add mountinfo parsing to test lib

For mount testing it is nice to be able to parse mountinfo from zdtm
test itself, for instance to be able to compare mountinfo topology
before and after c/r, or for anything else. So let's add a helper
mntns_parse_mountinfo() which parses current mount namespace mountinfo.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/Makefile    |   2 +-
 test/zdtm/lib/mountinfo.c | 139 ++++++++++++++++++++++++++++++++++++++
 test/zdtm/lib/mountinfo.h |  27 ++++++++
 3 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/lib/mountinfo.c
 create mode 100644 test/zdtm/lib/mountinfo.h

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index 949dc123a..90bd28f9e 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -4,7 +4,7 @@ CFLAGS	+= $(USERCFLAGS)
 
 LIB	:= libzdtmtst.a
 
-LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c mem.c file.c
+LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c mem.c file.c mountinfo.c
 
 PKG_CONFIG ?= pkg-config
 pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
diff --git a/test/zdtm/lib/mountinfo.c b/test/zdtm/lib/mountinfo.c
new file mode 100644
index 000000000..3e9d44581
--- /dev/null
+++ b/test/zdtm/lib/mountinfo.c
@@ -0,0 +1,139 @@
+#include <stdio.h>
+#include <string.h>
+
+#include "mountinfo.h"
+#include "fs.h"
+#include "xmalloc.h"
+
+/*
+ * mountinfo contains mangled paths. space, tab and back slash were replaced
+ * with usual octal escape. This function replaces these symbols back.
+ */
+static void cure_path(char *path)
+{
+	int i, len, off = 0;
+
+	if (strchr(path, '\\') == NULL) /* fast path */
+		return;
+
+	len = strlen(path);
+	for (i = 0; i < len; i++) {
+		if (!strncmp(path + i, "\\040", 4)) {
+			path[i - off] = ' ';
+			goto replace;
+		} else if (!strncmp(path + i, "\\011", 4)) {
+			path[i - off] = '\t';
+			goto replace;
+		} else if (!strncmp(path + i, "\\134", 4)) {
+			path[i - off] = '\\';
+			goto replace;
+		}
+		if (off)
+			path[i - off] = path[i];
+		continue;
+	replace:
+		off += 3;
+		i += 3;
+	}
+	path[len - off] = 0;
+}
+
+static struct mountinfo_zdtm *mountinfo_zdtm_alloc(struct mntns_zdtm *mntns)
+{
+	struct mountinfo_zdtm *new;
+
+	new = xzalloc(sizeof(struct mountinfo_zdtm));
+	if (new)
+		list_add_tail(&new->list, &mntns->mountinfo_list);
+	return new;
+}
+
+static void mountinfo_zdtm_free(struct mountinfo_zdtm *mountinfo)
+{
+	list_del(&mountinfo->list);
+	xfree(mountinfo->mountpoint);
+	xfree(mountinfo->root);
+	xfree(mountinfo->fstype);
+	xfree(mountinfo);
+}
+
+static void mountinfo_zdtm_free_all(struct mntns_zdtm *mntns)
+{
+	struct mountinfo_zdtm *mountinfo, *tmp;
+
+	list_for_each_entry_safe(mountinfo, tmp, &mntns->mountinfo_list, list)
+		mountinfo_zdtm_free(mountinfo);
+}
+
+#define BUF_SIZE 4096
+char buf[BUF_SIZE];
+
+int mntns_parse_mountinfo(struct mntns_zdtm *mntns)
+{
+	FILE *f;
+	int ret;
+
+	INIT_LIST_HEAD(&mntns->mountinfo_list);
+
+	f = fopen("/proc/self/mountinfo", "r");
+	if (!f) {
+		pr_perror("Failed to open mountinfo");
+		return -1;
+	}
+
+	while (fgets(buf, BUF_SIZE, f)) {
+		struct mountinfo_zdtm *new;
+		unsigned int kmaj, kmin;
+		char *str, *hyphen, *shared, *master;
+		int n;
+
+		new = mountinfo_zdtm_alloc(mntns);
+		if (!new) {
+			pr_perror("Failed to alloc mountinfo_zdtm");
+			goto free;
+		}
+
+		ret = sscanf(buf, "%i %i %u:%u %ms %ms %*s %n", &new->mnt_id, &new->parent_mnt_id, &kmaj, &kmin,
+			     &new->root, &new->mountpoint, &n);
+		if (ret != 6) {
+			pr_perror("Failed to parse mountinfo line \"%s\"", buf);
+			goto free;
+		}
+		cure_path(new->root);
+		cure_path(new->mountpoint);
+		new->s_dev = MKKDEV(kmaj, kmin);
+
+		str = buf + n;
+		hyphen = strstr(buf, " - ");
+		if (!hyphen) {
+			pr_perror("Failed to find \" - \" in mountinfo line \"%s\"", buf);
+			goto free;
+		}
+		*hyphen++ = '\0';
+
+		shared = strstr(str, "shared:");
+		if (shared)
+			new->shared_id = atoi(shared + 7);
+		master = strstr(str, "master:");
+		if (master)
+			new->master_id = atoi(master + 7);
+
+		ret = sscanf(hyphen, "- %ms", &new->fstype);
+		if (ret != 1) {
+			pr_perror("Failed to parse fstype in mountinfo tail \"%s\"", hyphen);
+			goto free;
+		}
+	}
+
+	fclose(f);
+	return 0;
+free:
+	mountinfo_zdtm_free_all(mntns);
+	fclose(f);
+	return -1;
+}
+
+void mntns_free_all(struct mntns_zdtm *mntns)
+{
+	mountinfo_zdtm_free_all(mntns);
+}
diff --git a/test/zdtm/lib/mountinfo.h b/test/zdtm/lib/mountinfo.h
new file mode 100644
index 000000000..8b7459d21
--- /dev/null
+++ b/test/zdtm/lib/mountinfo.h
@@ -0,0 +1,27 @@
+#ifndef __ZDTM_MOUNTINFO__
+#define __ZDTM_MOUNTINFO__
+
+#include "list.h"
+
+struct mountinfo_zdtm {
+	int mnt_id;
+	int parent_mnt_id;
+	char *mountpoint;
+	char *root;
+	unsigned int s_dev;
+	int shared_id;
+	int master_id;
+	char *fstype;
+
+	/* list of all mounts */
+	struct list_head list;
+};
+
+struct mntns_zdtm {
+	struct list_head mountinfo_list;
+};
+
+extern int mntns_parse_mountinfo(struct mntns_zdtm *mntns);
+extern void mntns_free_all(struct mntns_zdtm *mntns);
+
+#endif

From ba09fad3914bb3e89df06c24a6398ab0b9bc656a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 22 Feb 2022 16:41:44 +0300
Subject: [PATCH 1193/1854] zdtm: add mountinfo topology compare to test lib

Now we can compare mount tree and sharing group tree topology before and
after c/r with mntns_compare() helper.

Algorithm here is:

1) build mount tree based on mnt_id and parent_mnt_id from mountinfo
2) sort mount tree children based on path comparison
3) at the same time set topology_id for mounts by DFS order and order
   mounts in list accordingly
4) build shared groups tree based on sharing_id and master_id
5) at the same time set topology_id for sharings as smallest topology_id
   of its mounts, also sharings are put in their list in order of
   their topology_id
6) walk sorted mounts lists for both namespaces simultaneously each
   pair of moutns should have matching ids and parent ids
7) walk sorted sharings lists for both namespaces simultaneously each
   pair of sharings should have matching ids and parent ids

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/mountinfo.c | 351 ++++++++++++++++++++++++++++++++++++++
 test/zdtm/lib/mountinfo.h |  35 ++++
 2 files changed, 386 insertions(+)

diff --git a/test/zdtm/lib/mountinfo.c b/test/zdtm/lib/mountinfo.c
index 3e9d44581..d6ab67a3f 100644
--- a/test/zdtm/lib/mountinfo.c
+++ b/test/zdtm/lib/mountinfo.c
@@ -133,7 +133,358 @@ free:
 	return -1;
 }
 
+static struct mountinfo_topology *mountinfo_topology_alloc(struct mntns_zdtm *mntns, struct mountinfo_zdtm *mountinfo)
+{
+	struct mountinfo_topology *new;
+
+	new = xzalloc(sizeof(struct mountinfo_topology));
+	if (new) {
+		new->mountinfo = mountinfo;
+		new->topology_id = -1;
+		INIT_LIST_HEAD(&new->children);
+		INIT_LIST_HEAD(&new->siblings);
+		list_add_tail(&new->list, &mntns->topology_list);
+		INIT_LIST_HEAD(&new->sharing_list);
+	}
+	return new;
+}
+
+static void mountinfo_topology_free(struct mountinfo_topology *topology)
+{
+	list_del(&topology->list);
+	xfree(topology);
+}
+
+static void mountinfo_topology_free_all(struct mntns_zdtm *mntns)
+{
+	struct mountinfo_topology *topology, *tmp;
+
+	list_for_each_entry_safe(topology, tmp, &mntns->topology_list, list)
+		mountinfo_topology_free(topology);
+}
+
+static struct mountinfo_topology *mountinfo_topology_lookup_parent(struct mntns_zdtm *mntns,
+								   struct mountinfo_topology *topology)
+{
+	struct mountinfo_topology *parent;
+
+	list_for_each_entry(parent, &mntns->topology_list, list) {
+		if (parent->mountinfo->mnt_id == topology->mountinfo->parent_mnt_id)
+			return parent;
+	}
+
+	return NULL;
+}
+
+static struct mountinfo_topology *mt_subtree_next(struct mountinfo_topology *mt, struct mountinfo_topology *root)
+{
+	if (!list_empty(&mt->children))
+		return list_entry(mt->children.next, struct mountinfo_topology, siblings);
+
+	while (mt->parent && mt != root) {
+		if (mt->siblings.next == &mt->parent->children)
+			mt = mt->parent;
+		else
+			return list_entry(mt->siblings.next, struct mountinfo_topology, siblings);
+	}
+
+	return NULL;
+}
+
+static void __mt_resort_siblings(struct mountinfo_topology *parent)
+{
+	LIST_HEAD(list);
+
+	while (!list_empty(&parent->children)) {
+		struct mountinfo_topology *m, *p;
+
+		m = list_first_entry(&parent->children, struct mountinfo_topology, siblings);
+		list_del(&m->siblings);
+
+		list_for_each_entry(p, &list, siblings)
+			if (strcmp(p->mountinfo->mountpoint, m->mountinfo->mountpoint) < 0)
+				break;
+
+		list_add_tail(&m->siblings, &p->siblings);
+	}
+
+	list_splice(&list, &parent->children);
+}
+
+static void mntns_mt_resort_siblings(struct mntns_zdtm *mntns)
+{
+	struct mountinfo_topology *mt = mntns->tree;
+	LIST_HEAD(mtlist);
+	int i = 0;
+
+	while (1) {
+		/* Assign topology id to mt in dfs order */
+		mt->topology_id = i++;
+		list_move_tail(&mt->list, &mtlist);
+		__mt_resort_siblings(mt);
+		mt = mt_subtree_next(mt, mntns->tree);
+		if (!mt)
+			break;
+	}
+
+	/* Update mntns->topology_list in dfs order */
+	list_splice(&mtlist, &mntns->topology_list);
+}
+
+static struct sharing_group *sharing_group_find_or_alloc(struct mntns_zdtm *mntns, int shared_id, int master_id,
+							 unsigned int s_dev)
+{
+	struct sharing_group *sg;
+
+	list_for_each_entry(sg, &mntns->sharing_groups_list, list) {
+		if ((sg->shared_id == shared_id) && (sg->master_id == master_id)) {
+			if (sg->s_dev != s_dev) {
+				pr_err("Sharing/devid inconsistency\n");
+				return NULL;
+			}
+			return sg;
+		}
+	}
+
+	sg = xzalloc(sizeof(struct sharing_group));
+	if (!sg)
+		return NULL;
+
+	sg->shared_id = shared_id;
+	sg->master_id = master_id;
+	sg->s_dev = s_dev;
+	sg->topology_id = -1;
+
+	INIT_LIST_HEAD(&sg->children);
+	INIT_LIST_HEAD(&sg->siblings);
+	INIT_LIST_HEAD(&sg->mounts_list);
+
+	list_add_tail(&sg->list, &mntns->sharing_groups_list);
+
+	return sg;
+}
+
+static void sharing_group_free(struct sharing_group *sg)
+{
+	list_del(&sg->list);
+	xfree(sg);
+}
+
+static void sharing_group_free_all(struct mntns_zdtm *mntns)
+{
+	struct sharing_group *sg, *tmp;
+
+	list_for_each_entry_safe(sg, tmp, &mntns->sharing_groups_list, list)
+		sharing_group_free(sg);
+}
+
+static struct sharing_group *sharing_group_lookup_parent(struct mntns_zdtm *mntns, struct sharing_group *sg)
+{
+	struct sharing_group *parent;
+
+	list_for_each_entry(parent, &mntns->sharing_groups_list, list) {
+		if (parent->shared_id == sg->master_id)
+			return parent;
+	}
+
+	/* Create "external" sharing */
+	parent = sharing_group_find_or_alloc(mntns, sg->master_id, 0, sg->s_dev);
+	if (parent)
+		return parent;
+
+	return NULL;
+}
+
+static int mntns_build_tree(struct mntns_zdtm *mntns)
+{
+	struct mountinfo_topology *topology, *parent, *tree = NULL;
+	struct mountinfo_zdtm *mountinfo;
+	struct sharing_group *sg, *sg_parent;
+
+	INIT_LIST_HEAD(&mntns->topology_list);
+
+	/* Prealloc mount tree */
+	list_for_each_entry(mountinfo, &mntns->mountinfo_list, list) {
+		topology = mountinfo_topology_alloc(mntns, mountinfo);
+		if (!topology)
+			goto err;
+	}
+
+	/* Build mount tree */
+	list_for_each_entry(topology, &mntns->topology_list, list) {
+		parent = mountinfo_topology_lookup_parent(mntns, topology);
+		if (!parent) {
+			if (tree) {
+				pr_err("Bad mount tree with too roots %d and %d\n", tree->mountinfo->mnt_id,
+				       parent->mountinfo->mnt_id);
+				goto err;
+			}
+			tree = topology;
+		} else {
+			topology->parent = parent;
+			list_add_tail(&topology->siblings, &parent->children);
+		}
+	}
+	mntns->tree = tree;
+
+	/* Sort mounts by mountpoint */
+	mntns_mt_resort_siblings(mntns);
+
+	INIT_LIST_HEAD(&mntns->sharing_groups_list);
+
+	/* Prealloc sharing groups */
+	list_for_each_entry(topology, &mntns->topology_list, list) {
+		if (!topology->mountinfo->shared_id && !topology->mountinfo->master_id)
+			continue;
+
+		/*
+		 * Due to mntns->topology_list is sorted in dfs order
+		 * sharing groups are also sorted the same
+		 */
+		sg = sharing_group_find_or_alloc(mntns, topology->mountinfo->shared_id, topology->mountinfo->master_id,
+						 topology->mountinfo->s_dev);
+		if (!sg)
+			goto err;
+
+		list_add_tail(&topology->sharing_list, &sg->mounts_list);
+		topology->sharing = sg;
+
+		/* Set sharing group topology id to minimal topology id of it's mounts */
+		if (sg->topology_id == -1 || topology->topology_id < sg->topology_id)
+			sg->topology_id = topology->topology_id;
+	}
+
+	/* Build sharing group trees */
+	list_for_each_entry(sg, &mntns->sharing_groups_list, list) {
+		if (sg->master_id) {
+			sg_parent = sharing_group_lookup_parent(mntns, sg);
+			sg->parent = sg_parent;
+			list_add(&sg->siblings, &sg_parent->children);
+		}
+	}
+
+	return 0;
+err:
+	mountinfo_topology_free_all(mntns);
+	sharing_group_free_all(mntns);
+	return -1;
+}
+
+static int mountinfo_topology_list_compare(struct mntns_zdtm *mntns_a, struct mntns_zdtm *mntns_b)
+{
+	struct mountinfo_topology *topology_a, *topology_b;
+
+	topology_a = list_first_entry(&mntns_a->topology_list, struct mountinfo_topology, list);
+	topology_b = list_first_entry(&mntns_b->topology_list, struct mountinfo_topology, list);
+
+	while (&topology_a->list != &mntns_a->topology_list && &topology_b->list != &mntns_b->topology_list) {
+		if (topology_a->topology_id != topology_b->topology_id) {
+			pr_err("Mounts %d and %d have different topology id %d and %d\n", topology_a->mountinfo->mnt_id,
+			       topology_b->mountinfo->mnt_id, topology_a->topology_id, topology_b->topology_id);
+			return -1;
+		}
+
+		if (topology_a->parent && topology_b->parent) {
+			if (topology_a->parent->topology_id != topology_b->parent->topology_id) {
+				pr_err("Mounts %d and %d have different parent topology id %d and %d\n",
+				       topology_a->mountinfo->mnt_id, topology_b->mountinfo->mnt_id,
+				       topology_a->parent->topology_id, topology_b->parent->topology_id);
+				return -1;
+			}
+		} else if (topology_a->parent || topology_b->parent) {
+			pr_err("One of mounts %d and %d has parent and other doesn't\n", topology_a->mountinfo->mnt_id,
+			       topology_b->mountinfo->mnt_id);
+			return -1;
+		}
+
+		if (topology_a->sharing && topology_b->sharing) {
+			if (topology_a->sharing->topology_id != topology_b->sharing->topology_id) {
+				pr_err("Mounts %d and %d have different sharing topology id %d and %d\n",
+				       topology_a->mountinfo->mnt_id, topology_b->mountinfo->mnt_id,
+				       topology_a->sharing->topology_id, topology_b->sharing->topology_id);
+				return -1;
+			}
+		} else if (topology_a->sharing || topology_b->sharing) {
+			pr_err("One of mounts %d and %d has sharing and other doesn't\n", topology_a->mountinfo->mnt_id,
+			       topology_b->mountinfo->mnt_id);
+			return -1;
+		}
+
+		topology_a = list_entry(topology_a->list.next, struct mountinfo_topology, list);
+		topology_b = list_entry(topology_b->list.next, struct mountinfo_topology, list);
+	}
+	if (&topology_a->list != &mntns_a->topology_list || &topology_b->list != &mntns_b->topology_list) {
+		pr_err("Mount tree topology length mismatch\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int sharing_group_list_compare(struct mntns_zdtm *mntns_a, struct mntns_zdtm *mntns_b)
+{
+	struct sharing_group *sg_a, *sg_b;
+
+	sg_a = list_first_entry(&mntns_a->sharing_groups_list, struct sharing_group, list);
+	sg_b = list_first_entry(&mntns_b->sharing_groups_list, struct sharing_group, list);
+
+	while (&sg_a->list != &mntns_a->sharing_groups_list && &sg_b->list != &mntns_b->sharing_groups_list) {
+		if (sg_a->topology_id != sg_b->topology_id) {
+			pr_err("Sharings (%d,%d) and (%d,%d) have different sharing topology id %d and %d\n",
+			       sg_a->shared_id, sg_a->master_id, sg_b->shared_id, sg_b->master_id, sg_a->topology_id,
+			       sg_b->topology_id);
+			return -1;
+		}
+
+		if (sg_a->parent && sg_b->parent) {
+			if (sg_a->parent->topology_id != sg_b->parent->topology_id) {
+				pr_err("Sharings (%d,%d) and (%d,%d) have different parent topology id %d and %d\n",
+				       sg_a->shared_id, sg_a->master_id, sg_b->shared_id, sg_b->master_id,
+				       sg_a->parent->topology_id, sg_b->parent->topology_id);
+				return -1;
+			}
+		} else if (sg_a->parent || sg_b->parent) {
+			pr_err("One of sharings (%d,%d) and (%d,%d) has parent and other doesn't\n", sg_a->shared_id,
+			       sg_a->master_id, sg_b->shared_id, sg_b->master_id);
+			return -1;
+		}
+
+		sg_a = list_entry(sg_a->list.next, struct sharing_group, list);
+		sg_b = list_entry(sg_b->list.next, struct sharing_group, list);
+	}
+
+	if (&sg_a->list != &mntns_a->sharing_groups_list || &sg_b->list != &mntns_b->sharing_groups_list) {
+		pr_err("Mount tree sharing topology length mismatch\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+int mntns_compare(struct mntns_zdtm *mntns_a, struct mntns_zdtm *mntns_b)
+{
+	if (mntns_build_tree(mntns_a)) {
+		pr_err("Failed to build first mountinfo topology tree\n");
+		return -1;
+	}
+
+	if (mntns_build_tree(mntns_b)) {
+		pr_err("Failed to build second mountinfo topology tree\n");
+		return -1;
+	}
+
+	if (mountinfo_topology_list_compare(mntns_a, mntns_b))
+		return -1;
+
+	if (sharing_group_list_compare(mntns_a, mntns_b))
+		return -1;
+
+	return 0;
+}
+
 void mntns_free_all(struct mntns_zdtm *mntns)
 {
 	mountinfo_zdtm_free_all(mntns);
+	mountinfo_topology_free_all(mntns);
+	sharing_group_free_all(mntns);
 }
diff --git a/test/zdtm/lib/mountinfo.h b/test/zdtm/lib/mountinfo.h
index 8b7459d21..b5a8f5bcd 100644
--- a/test/zdtm/lib/mountinfo.h
+++ b/test/zdtm/lib/mountinfo.h
@@ -19,9 +19,44 @@ struct mountinfo_zdtm {
 
 struct mntns_zdtm {
 	struct list_head mountinfo_list;
+	struct list_head topology_list;
+	struct mountinfo_topology *tree;
+	struct list_head sharing_groups_list;
+};
+
+struct sharing_group {
+	int shared_id;
+	int master_id;
+	unsigned int s_dev;
+
+	struct sharing_group *parent;
+	struct list_head children;
+	struct list_head siblings;
+
+	int topology_id;
+
+	struct list_head mounts_list;
+
+	struct list_head list;
+};
+
+struct mountinfo_topology {
+	struct mountinfo_zdtm *mountinfo;
+
+	struct mountinfo_topology *parent;
+	struct list_head children;
+	struct list_head siblings;
+
+	int topology_id;
+
+	struct sharing_group *sharing;
+	struct list_head sharing_list;
+
+	struct list_head list;
 };
 
 extern int mntns_parse_mountinfo(struct mntns_zdtm *mntns);
 extern void mntns_free_all(struct mntns_zdtm *mntns);
+extern int mntns_compare(struct mntns_zdtm *mntns_a, struct mntns_zdtm *mntns_b);
 
 #endif

From fb66727a25036b6d6244eb10234ea4a190fa9e1d Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 22 Feb 2022 11:43:59 +0300
Subject: [PATCH 1194/1854] zdtm: add mntns_compare check to
 mount_complex_sharing

This way we can check that mount tree topology (including sharing
groups) is the same before and after c/r.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/mount_complex_sharing.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/zdtm/static/mount_complex_sharing.c b/test/zdtm/static/mount_complex_sharing.c
index b4463c41a..c6402d646 100644
--- a/test/zdtm/static/mount_complex_sharing.c
+++ b/test/zdtm/static/mount_complex_sharing.c
@@ -5,6 +5,7 @@
 #include <sys/mount.h>
 #include <linux/limits.h>
 
+#include "mountinfo.h"
 #include "zdtmtst.h"
 
 const char *test_doc = "Check complex sharing options for mounts";
@@ -211,6 +212,7 @@ static int mount_loop(void)
 
 int main(int argc, char **argv)
 {
+	struct mntns_zdtm mntns_before, mntns_after;
 	int ret = 1;
 
 	test_init(argc, argv);
@@ -223,12 +225,23 @@ int main(int argc, char **argv)
 	if (mount_loop())
 		goto err;
 
+	if (mntns_parse_mountinfo(&mntns_before))
+		goto err;
+
 	test_daemon();
 	test_waitsig();
 
+	if (mntns_parse_mountinfo(&mntns_after))
+		goto err;
+
+	if (mntns_compare(&mntns_before, &mntns_after))
+		goto err;
+
 	pass();
 	ret = 0;
 err:
+	mntns_free_all(&mntns_before);
+	mntns_free_all(&mntns_after);
 	if (ret)
 		fail();
 	return ret;

From 0bddecead055e3873f2d1a7fe07499fa39000a84 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Tue, 17 Jan 2023 17:59:53 +0100
Subject: [PATCH 1195/1854] restorer: add logging on prctl PR_SET_MM_MAP
 failure

This kernel feature contained some bugs initially. Those logs are useful in identifing what the
underlaying issue is and which kernel patch to backport.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/pie/restorer.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 99cff1f7d..efab729e8 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1813,6 +1813,24 @@ long __export_restore_task(struct task_restore_args *args)
 		.exe_fd = args->fd_exe_link,
 	};
 	ret = sys_prctl(PR_SET_MM, PR_SET_MM_MAP, (long)&prctl_map, sizeof(prctl_map), 0);
+	if (ret) {
+		pr_debug("prctl PR_SET_MM_MAP failed with %d\n", (int)ret);
+		pr_debug("  .start_code = %" PRIx64 "\n", prctl_map.start_code);
+		pr_debug("  .end_code = %" PRIx64 "\n", prctl_map.end_code);
+		pr_debug("  .start_data = %" PRIx64 "\n", prctl_map.start_data);
+		pr_debug("  .end_data = %" PRIx64 "\n", prctl_map.end_data);
+		pr_debug("  .start_stack = %" PRIx64 "\n", prctl_map.start_stack);
+		pr_debug("  .start_brk = %" PRIx64 "\n", prctl_map.start_brk);
+		pr_debug("  .brk = %" PRIx64 "\n", prctl_map.brk);
+		pr_debug("  .arg_start = %" PRIx64 "\n", prctl_map.arg_start);
+		pr_debug("  .arg_end = %" PRIx64 "\n", prctl_map.arg_end);
+		pr_debug("  .env_start = %" PRIx64 "\n", prctl_map.env_start);
+		pr_debug("  .env_end = %" PRIx64 "\n", prctl_map.env_end);
+		pr_debug("  .auxv_size = %" PRIu32 "\n", prctl_map.auxv_size);
+		for (i = 0; i < prctl_map.auxv_size / sizeof(uint64_t); i++)
+			pr_debug("  .auxv[%d] = %" PRIx64 "\n", i, prctl_map.auxv[i]);
+		pr_debug("  .exe_fd = %" PRIu32 "\n", prctl_map.exe_fd);
+	}
 	if (ret == -EINVAL) {
 		ret = sys_prctl_safe(PR_SET_MM, PR_SET_MM_START_CODE, (long)args->mm.mm_start_code, 0);
 		ret |= sys_prctl_safe(PR_SET_MM, PR_SET_MM_END_CODE, (long)args->mm.mm_end_code, 0);

From f73ba77269725d3e56802a7486f06bb5533aabba Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 9 Dec 2022 15:46:20 +0100
Subject: [PATCH 1196/1854] ci: switch from lgtm to codeql

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/codeql.yml | 45 ++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..2d1039a0e
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,45 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "criu-dev", "master" ]
+  pull_request:
+    branches: [ "criu-dev" ]
+  schedule:
+    - cron: "11 6 * * 3"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ python, cpp ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Packages (cpp)
+        if: ${{ matrix.language == 'cpp' }}
+        run: |
+          sudo scripts/ci/apt-install protobuf-c-compiler libprotobuf-c-dev libprotobuf-dev build-essential libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnet-dev pkg-config libnl-3-dev libbsd0 libbsd-dev iproute2 libcap-dev libaio-dev libbsd-dev python3-yaml libnl-route-3-dev gnutls-dev
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

From 7459d0204322a379f83f73f59336d43cc150c9dc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 25 Jan 2023 10:57:18 +0300
Subject: [PATCH 1197/1854] lint: prohibit to use %m specifier in pr_*
 functions

As our pr_* functions are complex and can call different system calls
inside before actual printing (e.g. gettimeofday for timestamps) actual
errno at the time of printing may be changed.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ba1f77440..eaa8a91e0 100644
--- a/Makefile
+++ b/Makefile
@@ -431,7 +431,7 @@ lint:
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
 	# Do not use %m with pr_perror or fail
-	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*%m'
+	! git --no-pager grep -E '^\s*\<(pr_(err|perror|warn|debug|info|msg)|fail)\>.*%m'
 	# Do not use errno with pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>\(".*".*errno'
 	# End pr_(err|warn|msg|info|debug) with \n

From 8cfda2748c7b9609b595aaf9b953167ba7756427 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 25 Jan 2023 11:01:56 +0300
Subject: [PATCH 1198/1854] log: remove all uses of %m specifier in pr_*
 functions

As our pr_* functions are complex and can call different system calls
inside before actual printing (e.g. gettimeofday for timestamps) actual
errno at the time of printing may be changed.

Let's just use %s + strerror(errno) instead of %m with pr_* functions to
be explicit that errno to string transformation happens before calling
anything else.

Note: tcp_repair_off is called from pie with no pr_perror defined due to
CR_NOGLIBC set and if I use errno variable there I get "Unexpected
undefined symbol: `__errno_location'. External symbol in PIE?", so it
seems there is no way to print errno there, so let's just skip it.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 compel/include/log.h   | 5 ++++-
 criu/fsnotify.c        | 2 +-
 criu/include/sk-inet.h | 2 +-
 criu/kerndat.c         | 4 ++--
 criu/sk-unix.c         | 7 ++++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/compel/include/log.h b/compel/include/log.h
index 0e33976b1..5250622c8 100644
--- a/compel/include/log.h
+++ b/compel/include/log.h
@@ -1,6 +1,9 @@
 #ifndef COMPEL_LOG_H__
 #define COMPEL_LOG_H__
 
+#include <errno.h>
+#include <string.h>
+
 #include "uapi/compel/log.h"
 
 #ifndef LOG_PREFIX
@@ -45,6 +48,6 @@ extern void compel_print_on_level(unsigned int loglevel, const char *format, ...
 
 #define pr_debug(fmt, ...) compel_print_on_level(COMPEL_LOG_DEBUG, LOG_PREFIX fmt, ##__VA_ARGS__)
 
-#define pr_perror(fmt, ...) pr_err(fmt ": %m\n", ##__VA_ARGS__)
+#define pr_perror(fmt, ...) pr_err(fmt ": %s\n", ##__VA_ARGS__, strerror(errno))
 
 #endif /* COMPEL_LOG_H__ */
diff --git a/criu/fsnotify.c b/criu/fsnotify.c
index 03711f0b2..8572dc2f3 100644
--- a/criu/fsnotify.c
+++ b/criu/fsnotify.c
@@ -183,7 +183,7 @@ static char *alloc_openable(unsigned int s_dev, unsigned long i_ino, FhEntry *f_
 				return path;
 			}
 		} else
-			pr_debug("\t\t\tnot openable as %s (%m)\n", __path);
+			pr_debug("\t\t\tnot openable as %s (%s)\n", __path, strerror(errno));
 	}
 
 err:
diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index 5dd2a6551..961d711ee 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -76,7 +76,7 @@ static inline void tcp_repair_off(int fd)
 
 	ret = setsockopt(fd, SOL_TCP, TCP_REPAIR, &aux, sizeof(aux));
 	if (ret < 0)
-		pr_err("Failed to turn off repair mode on socket: %m\n");
+		pr_err("Failed to turn off repair mode on socket\n");
 }
 
 extern void tcp_locked_conn_add(struct inet_sk_info *);
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 5b567e79f..5d99c575b 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1055,9 +1055,9 @@ static int kerndat_has_move_mount_set_group(void)
 	exit_code = 0;
 out:
 	if (umount2(tmpdir, MNT_DETACH))
-		pr_warn("Fail to umount2 %s: %m\n", tmpdir);
+		pr_warn("Fail to umount2 %s: %s\n", tmpdir, strerror(errno));
 	if (rmdir(tmpdir))
-		pr_warn("Fail to rmdir %s: %m\n", tmpdir);
+		pr_warn("Fail to rmdir %s: %s\n", tmpdir, strerror(errno));
 	return exit_code;
 }
 
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 873360bfa..5c0f57523 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -221,7 +221,7 @@ int kerndat_socket_unix_file(void)
 	}
 	fd = ioctl(sk, SIOCUNIXFILE);
 	if (fd < 0 && errno != ENOENT) {
-		pr_warn("Unable to open a socket file: %m\n");
+		pr_warn("Unable to open a socket file: %s\n", strerror(errno));
 		kdat.sk_unix_file = false;
 		close(sk);
 		return 0;
@@ -620,7 +620,8 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 	snprintf(rpath, sizeof(rpath), ".%s", name);
 	if (fstatat(mntns_root, rpath, &st, 0)) {
 		if (errno != ENOENT) {
-			pr_warn("Can't stat socket %#" PRIx32 "(%s), skipping: %m (err %d)\n", id, rpath, errno);
+			pr_warn("Can't stat socket %#" PRIx32 "(%s), skipping: %s (err %d)\n", id, rpath,
+				strerror(errno), errno);
 			goto skip;
 		}
 
@@ -669,7 +670,7 @@ static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d, UnixS
 
 	fd = ioctl(lfd, SIOCUNIXFILE);
 	if (fd < 0) {
-		pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl: %m\n");
+		pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl: %s\n", strerror(errno));
 		goto fallback;
 	}
 

From 0a7c5fd1bd8d1e49e273b51ff39af473d6c68cbc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 18 Jan 2023 14:15:58 +0300
Subject: [PATCH 1199/1854] string: use our own __strlcpy and __strlcat to
 remove bsd headers

We see that libbsd redefines __has_include to be always true, which
breaks such checks for rseq. The idea behind this patch is remove the
use of libbsd functions and always export our replacement functions.

Using __strlcat and __strlcpy everywhere in existing code:
git grep --files-with-matches "strlcat" | xargs sed -i 's/strlcat/__strlcat/g'
git grep --files-with-matches "strlcpy" | xargs sed -i 's/strlcpy/__strlcpy/g'

Fixes: #2036
Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/apparmor.c       |  8 ++++----
 criu/cr-dump.c        |  6 +++---
 criu/cr-restore.c     |  4 ++--
 criu/files-reg.c      |  4 ++--
 criu/files.c          |  2 +-
 criu/include/string.h | 13 ++-----------
 criu/log.c            |  2 +-
 criu/net.c            |  8 ++++----
 criu/proc_parse.c     |  4 ++--
 criu/seize.c          |  4 ++--
 criu/string.c         |  8 ++------
 criu/tun.c            |  8 ++++----
 12 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index 67553c8f1..9de54ce40 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -108,7 +108,7 @@ static int collect_profile(char *path, int offset, char *dir, AaNamespace *ns)
 		return -1;
 	aa_policy__init(cur);
 
-	strlcat(path + my_offset, "name", PATH_MAX - my_offset);
+	__strlcat(path + my_offset, "name", PATH_MAX - my_offset);
 	f = fopen(path, "r");
 	if (!f) {
 		xfree(cur);
@@ -124,7 +124,7 @@ static int collect_profile(char *path, int offset, char *dir, AaNamespace *ns)
 		return -1;
 	}
 
-	strlcpy(path + my_offset, "raw_data", PATH_MAX - my_offset);
+	__strlcpy(path + my_offset, "raw_data", PATH_MAX - my_offset);
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
 		pr_perror("failed to open aa policy %s", path);
@@ -520,13 +520,13 @@ static int write_aa_policy(AaNamespace *ns, char *path, int offset, char *rewrit
 
 			tmp = *end;
 			*end = 0;
-			strlcpy(namespace, rewrite_pos + 1, sizeof(namespace));
+			__strlcpy(namespace, rewrite_pos + 1, sizeof(namespace));
 			*end = tmp;
 
 			break;
 		}
 		default:
-			strlcpy(namespace, ns->name, sizeof(namespace));
+			__strlcpy(namespace, ns->name, sizeof(namespace));
 			for (i = 0; i < ns->n_policies; i++) {
 				if (strcmp(ns->policies[i]->name, rewrite_pos))
 					pr_warn("binary rewriting of apparmor policies not supported right now, not renaming %s to %s\n",
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 63eb627fc..30713f96b 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -429,7 +429,7 @@ static int dump_filemap(struct vma_area *vma_area, int fd)
 	if (vma_area->aufs_rpath) {
 		struct fd_link aufs_link;
 
-		strlcpy(aufs_link.name, vma_area->aufs_rpath, sizeof(aufs_link.name));
+		__strlcpy(aufs_link.name, vma_area->aufs_rpath, sizeof(aufs_link.name));
 		aufs_link.len = strlen(aufs_link.name);
 		p.link = &aufs_link;
 	}
@@ -774,7 +774,7 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 	if (ret < 0)
 		goto err;
 
-	strlcpy((char *)core->tc->comm, stat->comm, TASK_COMM_LEN);
+	__strlcpy((char *)core->tc->comm, stat->comm, TASK_COMM_LEN);
 	core->tc->flags = stat->flags;
 	core->tc->task_state = item->pid->state;
 	core->tc->exit_code = 0;
@@ -919,7 +919,7 @@ static int dump_one_zombie(const struct pstree_item *item, const struct proc_pid
 	if (!core)
 		return -1;
 
-	strlcpy((char *)core->tc->comm, pps->comm, TASK_COMM_LEN);
+	__strlcpy((char *)core->tc->comm, pps->comm, TASK_COMM_LEN);
 	core->tc->task_state = TASK_DEAD;
 	core->tc->exit_code = pps->exit_code;
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 974202f16..2f9bab414 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3395,7 +3395,7 @@ static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned lo
 
 			args = rst_mem_remap_ptr(this_pos, RM_PRIVATE);
 			args->lsm_profile = lsm_profile;
-			strlcpy(args->lsm_profile, rendered, lsm_profile_len + 1);
+			__strlcpy(args->lsm_profile, rendered, lsm_profile_len + 1);
 			xfree(rendered);
 		}
 	} else {
@@ -3429,7 +3429,7 @@ static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned lo
 
 			args = rst_mem_remap_ptr(this_pos, RM_PRIVATE);
 			args->lsm_sockcreate = lsm_sockcreate;
-			strlcpy(args->lsm_sockcreate, rendered, lsm_sockcreate_len + 1);
+			__strlcpy(args->lsm_sockcreate, rendered, lsm_sockcreate_len + 1);
 			xfree(rendered);
 		}
 	} else {
diff --git a/criu/files-reg.c b/criu/files-reg.c
index 13e114cea..1bbfe44ba 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -507,7 +507,7 @@ static int nomntns_create_ghost(struct ghost_file *gf, GhostFileEntry *gfe, stru
 	if (ghost_apply_metadata(path, gfe))
 		return -1;
 
-	strlcpy(gf->remap.rpath, path + 1, PATH_MAX);
+	__strlcpy(gf->remap.rpath, path + 1, PATH_MAX);
 	pr_debug("Remap rpath is %s\n", gf->remap.rpath);
 	return 0;
 }
@@ -638,7 +638,7 @@ static int open_remap_ghost(struct reg_file_info *rfi, RemapFilePathEntry *rpe)
 	gf->remap.rmnt_id = rfi->rfe->mnt_id;
 
 	if (S_ISDIR(gfe->mode))
-		strlcpy(gf->remap.rpath, rfi->path, PATH_MAX);
+		__strlcpy(gf->remap.rpath, rfi->path, PATH_MAX);
 	else
 		ghost_path(gf->remap.rpath, PATH_MAX, rfi, rpe);
 
diff --git a/criu/files.c b/criu/files.c
index 38dc076d2..3b653e24b 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -302,7 +302,7 @@ static int fixup_overlayfs(struct fd_parms *p, struct fd_link *link)
 		char buf[PATH_MAX];
 		int n;
 
-		strlcpy(buf, link->name, PATH_MAX);
+		__strlcpy(buf, link->name, PATH_MAX);
 		n = snprintf(link->name, PATH_MAX, "%s/%s", m->ns_mountpoint, buf + 2);
 		if (n >= PATH_MAX) {
 			pr_err("Not enough space to replace %s\n", buf);
diff --git a/criu/include/string.h b/criu/include/string.h
index e11a42058..4c71d961c 100644
--- a/criu/include/string.h
+++ b/criu/include/string.h
@@ -3,18 +3,9 @@
 
 #include <sys/types.h>
 
-#ifdef CONFIG_HAS_LIBBSD
-#include <bsd/string.h>
-#endif
-
 #include "common/config.h"
 
-#ifndef CONFIG_HAS_STRLCPY
-extern size_t strlcpy(char *dest, const char *src, size_t size);
-#endif
-
-#ifndef CONFIG_HAS_STRLCAT
-extern size_t strlcat(char *dest, const char *src, size_t count);
-#endif
+extern size_t __strlcpy(char *dest, const char *src, size_t size);
+extern size_t __strlcat(char *dest, const char *src, size_t count);
 
 #endif /* __CR_STRING_H__ */
diff --git a/criu/log.c b/criu/log.c
index e31f24e39..47419313b 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -133,7 +133,7 @@ static void log_note_err(char *msg)
 		 */
 		mutex_lock(&first_err->l);
 		if (first_err->s[0] == '\0')
-			strlcpy(first_err->s, msg, sizeof(first_err->s));
+			__strlcpy(first_err->s, msg, sizeof(first_err->s));
 		mutex_unlock(&first_err->l);
 	}
 }
diff --git a/criu/net.c b/criu/net.c
index f29a166f8..755a48377 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -1398,7 +1398,7 @@ static int move_veth(const char *netdev, struct ns_id *ns, struct net_link *link
 	len_val = strlen(netdev);
 	if (len_val >= IFNAMSIZ)
 		return -1;
-	strlcpy(mvreq.ifnam, netdev, IFNAMSIZ);
+	__strlcpy(mvreq.ifnam, netdev, IFNAMSIZ);
 
 	ret = userns_call(move_veth_cb, 0, &mvreq, sizeof(mvreq), ns->net.ns_fd);
 	if (ret < 0)
@@ -1528,7 +1528,7 @@ static int changeflags(int s, char *name, short flags)
 {
 	struct ifreq ifr;
 
-	strlcpy(ifr.ifr_name, name, IFNAMSIZ);
+	__strlcpy(ifr.ifr_name, name, IFNAMSIZ);
 	ifr.ifr_flags = flags;
 
 	if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
@@ -3483,7 +3483,7 @@ static int move_to_bridge(struct external *ext, void *arg)
 			ret = -1;
 			goto out;
 		}
-		strlcpy(ifr.ifr_name, br, IFNAMSIZ);
+		__strlcpy(ifr.ifr_name, br, IFNAMSIZ);
 		ret = ioctl(s, SIOCBRADDIF, &ifr);
 		if (ret < 0) {
 			pr_perror("Can't add interface %s to bridge %s", out, br);
@@ -3495,7 +3495,7 @@ static int move_to_bridge(struct external *ext, void *arg)
 		 * $ ip link set dev <device> up
 		 */
 		ifr.ifr_ifindex = 0;
-		strlcpy(ifr.ifr_name, out, IFNAMSIZ);
+		__strlcpy(ifr.ifr_name, out, IFNAMSIZ);
 		ret = ioctl(s, SIOCGIFFLAGS, &ifr);
 		if (ret < 0) {
 			pr_perror("Can't get flags of interface %s", out);
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index abac5908b..a5f749d45 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -315,7 +315,7 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct
 
 	if (is_memfd(vfi_dev)) {
 		char tmp[PATH_MAX];
-		strlcpy(tmp, fname, PATH_MAX);
+		__strlcpy(tmp, fname, PATH_MAX);
 		strip_deleted(tmp, strlen(tmp));
 
 		/*
@@ -890,7 +890,7 @@ int parse_pid_stat(pid_t pid, struct proc_pid_stat *s)
 	*tok = '\0';
 	*p = '\0';
 
-	strlcpy(s->comm, tok + 1, sizeof(s->comm));
+	__strlcpy(s->comm, tok + 1, sizeof(s->comm));
 
 	n = sscanf(p + 1,
 		   " %c %d %d %d %d %d %u %lu %lu %lu %lu "
diff --git a/criu/seize.c b/criu/seize.c
index f2af12a0b..f8e3278ea 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -146,12 +146,12 @@ static int freezer_write_state(int fd, enum freezer_state new_state)
 	if (new_state == THAWED) {
 		if (cgroup_v2)
 			state[0] = '0';
-		else if (strlcpy(state, thawed, sizeof(state)) >= sizeof(state))
+		else if (__strlcpy(state, thawed, sizeof(state)) >= sizeof(state))
 			return -1;
 	} else if (new_state == FROZEN) {
 		if (cgroup_v2)
 			state[0] = '1';
-		else if (strlcpy(state, frozen, sizeof(state)) >= sizeof(state))
+		else if (__strlcpy(state, frozen, sizeof(state)) >= sizeof(state))
 			return -1;
 	} else {
 		return -1;
diff --git a/criu/string.c b/criu/string.c
index 7df0b3e09..7edd35363 100644
--- a/criu/string.c
+++ b/criu/string.c
@@ -6,7 +6,6 @@
 
 #include "string.h"
 
-#ifndef CONFIG_HAS_STRLCPY
 /**
  * strlcpy - Copy a %NUL terminated string into a sized buffer
  * @dest: Where to copy the string to
@@ -18,7 +17,7 @@
  * of course, the buffer size is zero). It does not pad
  * out the result like strncpy() does.
  */
-size_t strlcpy(char *dest, const char *src, size_t size)
+size_t __strlcpy(char *dest, const char *src, size_t size)
 {
 	size_t ret = strlen(src);
 
@@ -29,16 +28,14 @@ size_t strlcpy(char *dest, const char *src, size_t size)
 	}
 	return ret;
 }
-#endif
 
-#ifndef CONFIG_HAS_STRLCAT
 /**
  * strlcat - Append a length-limited, %NUL-terminated string to another
  * @dest: The string to be appended to
  * @src: The string to append to it
  * @count: The size of the destination buffer.
  */
-size_t strlcat(char *dest, const char *src, size_t count)
+size_t __strlcat(char *dest, const char *src, size_t count)
 {
 	size_t dsize = strlen(dest);
 	size_t len = strlen(src);
@@ -57,4 +54,3 @@ size_t strlcat(char *dest, const char *src, size_t count)
 	dest[len] = 0;
 	return res;
 }
-#endif
diff --git a/criu/tun.c b/criu/tun.c
index 573137091..2e2cc32bf 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -121,7 +121,7 @@ static int list_tun_link(NetDeviceEntry *nde, unsigned ns_id)
 	if (!tl)
 		return -1;
 
-	strlcpy(tl->name, nde->name, sizeof(tl->name));
+	__strlcpy(tl->name, nde->name, sizeof(tl->name));
 	/*
 	 * Keep tun-flags not only for persistency fixup (see
 	 * comment below), but also for TUNSETIFF -- we must
@@ -153,7 +153,7 @@ static struct tun_link *__dump_tun_link_fd(int fd, char *name, unsigned ns_id, u
 	tl = xmalloc(sizeof(*tl));
 	if (!tl)
 		goto err;
-	strlcpy(tl->name, name, sizeof(tl->name));
+	__strlcpy(tl->name, name, sizeof(tl->name));
 	tl->ns_id = ns_id;
 	INIT_LIST_HEAD(&tl->l);
 
@@ -241,7 +241,7 @@ static int open_tun_dev(char *name, unsigned int idx, unsigned flags)
 	}
 
 	memset(&ifr, 0, sizeof(ifr));
-	strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+	__strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
 	ifr.ifr_flags = flags;
 
 	if (ioctl(fd, TUNSETIFF, &ifr)) {
@@ -393,7 +393,7 @@ static int tunfile_open(struct file_desc *d, int *new_fd)
 	}
 
 	memset(&ifr, 0, sizeof(ifr));
-	strlcpy(ifr.ifr_name, tl->name, sizeof(ifr.ifr_name));
+	__strlcpy(ifr.ifr_name, tl->name, sizeof(ifr.ifr_name));
 	ifr.ifr_flags = tl->rst.flags;
 
 	if (ioctl(fd, TUNSETIFF, &ifr) < 0) {

From a92dfb61ffa9a4fd43220595feb4724b59834b11 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 18 Jan 2023 14:41:32 +0300
Subject: [PATCH 1200/1854] string: define wrapers __setproctitle and
 __setproctitle_init to hide bsd headers

We see that libbsd redefines __has_include to be always true, which
breaks such checks for rseq. The idea behind this patch is to put all
uses of libbsd functions to separate c files and only export wrapper
functions for them.

Using __setproctitle and __setproctitle_init everywhere in existing
code:

git grep --files-with-matches "setproctitle" | xargs sed -i 's/setproctitle/__setproctitle/g'
git grep --files-with-matches "setproctitle_init" | xargs sed -i 's/setproctitle_init/__setproctitle_init/g'

Fixes: #2036
Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/Makefile.crtools       |  1 +
 criu/cr-service.c           | 16 +++++++-------
 criu/crtools.c              |  2 +-
 criu/include/setproctitle.h | 16 ++------------
 criu/setproctitle.c         | 42 +++++++++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 criu/setproctitle.c

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 22108cce0..f58644917 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -74,6 +74,7 @@ obj-y			+= sk-unix.o
 obj-y			+= sockets.o
 obj-y			+= stats.o
 obj-y			+= string.o
+obj-y			+= setproctitle.o
 obj-y			+= sysctl.o
 obj-y			+= sysfs_parse.o
 obj-y			+= timerfd.o
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 73c48f5a6..314c309be 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -752,7 +752,7 @@ static int dump_using_req(int sk, CriuOpts *req)
 	if (setup_opts_from_req(sk, req))
 		goto exit;
 
-	setproctitle("dump --rpc -t %d -D %s", req->pid, images_dir);
+	__setproctitle("dump --rpc -t %d -D %s", req->pid, images_dir);
 
 	if (init_pidfd_store_hash())
 		goto pidfd_store_err;
@@ -795,7 +795,7 @@ static int restore_using_req(int sk, CriuOpts *req)
 	if (setup_opts_from_req(sk, req))
 		goto exit;
 
-	setproctitle("restore --rpc -D %s", images_dir);
+	__setproctitle("restore --rpc -D %s", images_dir);
 
 	if (cr_restore_tasks())
 		goto exit;
@@ -841,7 +841,7 @@ static int check(int sk, CriuOpts *req)
 	}
 
 	if (pid == 0) {
-		setproctitle("check --rpc");
+		__setproctitle("check --rpc");
 
 		opts.mode = CR_CHECK;
 		if (setup_opts_from_req(sk, req))
@@ -879,7 +879,7 @@ static int pre_dump_using_req(int sk, CriuOpts *req, bool single)
 		if (setup_opts_from_req(sk, req))
 			goto cout;
 
-		setproctitle("pre-dump --rpc -t %d -D %s", req->pid, images_dir);
+		__setproctitle("pre-dump --rpc -t %d -D %s", req->pid, images_dir);
 
 		if (init_pidfd_store_hash())
 			goto pidfd_store_err;
@@ -957,7 +957,7 @@ static int start_page_server_req(int sk, CriuOpts *req, bool daemon_mode)
 		if (setup_opts_from_req(sk, req))
 			goto out_ch;
 
-		setproctitle("page-server --rpc --address %s --port %hu", opts.addr, opts.port);
+		__setproctitle("page-server --rpc --address %s --port %hu", opts.addr, opts.port);
 
 		pr_debug("Starting page server\n");
 
@@ -1117,7 +1117,7 @@ static int handle_feature_check(int sk, CriuReq *msg)
 		if (kerndat_init())
 			exit(1);
 
-		setproctitle("feature-check --rpc");
+		__setproctitle("feature-check --rpc");
 
 		if ((msg->features->has_mem_track == 1) && (msg->features->mem_track == true))
 			feat.mem_track = kdat.has_dirty_track;
@@ -1204,8 +1204,8 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 		if (setup_opts_from_req(sk, msg->opts))
 			goto cout;
 
-		setproctitle("cpuinfo %s --rpc -D %s", msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ? "dump" : "check",
-			     images_dir);
+		__setproctitle("cpuinfo %s --rpc -D %s", msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ? "dump" : "check",
+			       images_dir);
 
 		if (msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP)
 			ret = cpuinfo_dump();
diff --git a/criu/crtools.c b/criu/crtools.c
index 4258ce388..ca9361977 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -127,7 +127,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	cr_pb_init();
-	setproctitle_init(argc, argv, envp);
+	__setproctitle_init(argc, argv, envp);
 
 	if (argc < 2)
 		goto usage;
diff --git a/criu/include/setproctitle.h b/criu/include/setproctitle.h
index bc634331b..a4873578a 100644
--- a/criu/include/setproctitle.h
+++ b/criu/include/setproctitle.h
@@ -1,19 +1,7 @@
 #ifndef __CR_SETPROCTITLE_H__
 #define __CR_SETPROCTITLE_H__
 
-#ifdef CONFIG_HAS_LIBBSD
-#include <bsd/unistd.h>
-#else
-
-/*
- * setproctitle_init is in the libbsd since v0.6.0. This macro allows to
- * compile criu with libbsd<0.6.0.
- */
-#ifndef CONFIG_HAS_SETPROCTITLE_INIT
-#define setproctitle_init(argc, argv, envp)
-#endif
-
-#define setproctitle(fmt, ...)
-#endif
+extern void __setproctitle_init(int argc, char *argv[], char *envp[]);
+extern void __setproctitle(const char *fmt, ...);
 
 #endif /* __CR_SETPROCTITLE_H__ */
diff --git a/criu/setproctitle.c b/criu/setproctitle.c
new file mode 100644
index 000000000..9e01678d2
--- /dev/null
+++ b/criu/setproctitle.c
@@ -0,0 +1,42 @@
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifdef CONFIG_HAS_LIBBSD
+#include <bsd/unistd.h>
+#else
+
+#include "setproctitle.h"
+
+/*
+ * setproctitle_init is in the libbsd since v0.6.0. This macro allows to
+ * compile criu with libbsd<0.6.0.
+ */
+#ifndef CONFIG_HAS_SETPROCTITLE_INIT
+#define setproctitle_init(argc, argv, envp)
+#endif
+
+#define setproctitle(fmt, ...)
+#endif
+
+void __setproctitle_init(int argc, char *argv[], char *envp[])
+{
+	setproctitle_init(argc, argv, envp);
+}
+
+#ifndef SPT_MAXTITLE
+#define SPT_MAXTITLE 255
+#endif
+
+void __setproctitle(const char *fmt, ...)
+{
+	char buf[SPT_MAXTITLE + 1];
+	va_list args;
+
+	va_start(args, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, args);
+	va_end(args);
+
+	setproctitle("%s", buf);
+}

From 951c56917abbd947e9ed8ac738700b723179c435 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 12 Dec 2022 09:29:26 -0800
Subject: [PATCH 1201/1854] proc_parse: Set VMA_AREA_REGULAR where needed

This patch sets VMA_AREA_REGULAR on hugetlb and anon shmem VMAs since
they can be handled the same way as other kinds of regular memory.

Co-authored-by: Ivanq <imachug@yandex.ru>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/proc_parse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index a5f749d45..345de2592 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -332,6 +332,7 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct
 	}
 
 	if (is_hugetlb_dev(vfi_dev, &hugetlb_flag) || is_anon_shmem_map(vfi_dev)) {
+		vma->e->status |= VMA_AREA_REGULAR;
 		if (!(vma->e->flags & MAP_SHARED))
 			vma->e->status |= VMA_ANON_PRIVATE;
 		else

From 95e590b51291b415ff2e0df847e12c7b903e58f2 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 12 Dec 2022 10:49:32 -0800
Subject: [PATCH 1202/1854] shmem: Fall back to /proc/$pid/mem if no map_files

If trying to open /proc/$pid/map_files/x-x for a given VMA fails with
EPERM (can happen in unprivileged mode when running in a non-init user
ns), fall back to reading the content from /proc/$pid/mem.

Co-authored-by: Ivanq <imachug@yandex.ru>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/shmem.c | 64 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/criu/shmem.c b/criu/shmem.c
index 81e701586..b92076a05 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -724,7 +724,7 @@ static int next_data_segment(int fd, unsigned long pfn, unsigned long *next_data
 	return 0;
 }
 
-static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si)
+static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si, bool seek_data_supported)
 {
 	struct page_pipe *pp;
 	struct page_xfer xfer;
@@ -750,7 +750,8 @@ static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si)
 		unsigned long pgaddr;
 		int st = -1;
 
-		if (pfn >= next_hole_pfn && next_data_segment(fd, pfn, &next_data_pnf, &next_hole_pfn))
+		if (seek_data_supported && pfn >= next_hole_pfn &&
+		    next_data_segment(fd, pfn, &next_data_pnf, &next_hole_pfn))
 			goto err_xfer;
 
 		if (si->pstate_map && is_shmem_tracking_en()) {
@@ -808,20 +809,59 @@ static int dump_one_shmem(struct shmem_info *si)
 {
 	int fd, ret = -1;
 	void *addr;
+	unsigned long cur, remaining;
+	bool seek_data_supported;
 
 	pr_info("Dumping shared memory %ld\n", si->shmid);
 
-	fd = open_proc(si->pid, "map_files/%lx-%lx", si->start, si->end);
-	if (fd < 0)
-		goto err;
+	fd = __open_proc(si->pid, EPERM, O_RDONLY, "map_files/%lx-%lx", si->start, si->end);
+	if (fd >= 0) {
+		addr = mmap(NULL, si->size, PROT_READ, MAP_SHARED, fd, 0);
+		if (addr == MAP_FAILED) {
+			pr_err("Can't map shmem 0x%lx (0x%lx-0x%lx)\n", si->shmid, si->start, si->end);
+			goto errc;
+		}
 
-	addr = mmap(NULL, si->size, PROT_READ, MAP_SHARED, fd, 0);
-	if (addr == MAP_FAILED) {
-		pr_err("Can't map shmem 0x%lx (0x%lx-0x%lx)\n", si->shmid, si->start, si->end);
-		goto errc;
+		seek_data_supported = true;
+	} else {
+		if (errno != EPERM || !opts.unprivileged) {
+			goto err;
+		}
+
+		pr_debug("Could not access map_files/ link, falling back to /proc/$pid/mem\n");
+
+		fd = open_proc(si->pid, "mem");
+		if (fd < 0) {
+			goto err;
+		}
+
+		addr = mmap(NULL, si->size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+		if (addr == MAP_FAILED) {
+			pr_err("Can't map empty space for shmem 0x%lx (0x%lx-0x%lx)\n", si->shmid, si->start, si->end);
+			goto errc;
+		}
+
+		if (lseek(fd, si->start, SEEK_SET) < 0) {
+			pr_perror("Can't seek virtual memory");
+			goto errc;
+		}
+
+		cur = 0;
+		remaining = si->size;
+		do {
+			ret = read(fd, addr + cur, remaining);
+			if (ret <= 0) {
+				pr_perror("Can't read virtual memory");
+				goto errc;
+			}
+			remaining -= ret;
+			cur += ret;
+		} while (remaining > 0);
+
+		seek_data_supported = false;
 	}
 
-	ret = do_dump_one_shmem(fd, addr, si);
+	ret = do_dump_one_shmem(fd, addr, si, seek_data_supported);
 
 	munmap(addr, si->size);
 errc:
@@ -849,7 +889,7 @@ int dump_one_memfd_shmem(int fd, unsigned long shmid, unsigned long size)
 		goto err;
 	}
 
-	ret = do_dump_one_shmem(fd, addr, &si);
+	ret = do_dump_one_shmem(fd, addr, &si, true);
 
 	munmap(addr, size);
 err:
@@ -875,7 +915,7 @@ int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shmid)
 	if (fd < 0)
 		return -1;
 
-	ret = do_dump_one_shmem(fd, addr, si);
+	ret = do_dump_one_shmem(fd, addr, si, true);
 	close(fd);
 	return ret;
 }

From 80528dbf72b85c1cb20f774dbab7969abccaed48 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 12 Dec 2022 10:53:22 -0800
Subject: [PATCH 1203/1854] proc_parse: Don't bail out on is_memfd() VMAs

Co-authored-by: Ivanq <imachug@yandex.ru>
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/proc_parse.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 345de2592..5ba3beb63 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -313,24 +313,6 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct
 
 	vfi_dev = makedev(vfi->dev_maj, vfi->dev_min);
 
-	if (is_memfd(vfi_dev)) {
-		char tmp[PATH_MAX];
-		__strlcpy(tmp, fname, PATH_MAX);
-		strip_deleted(tmp, strlen(tmp));
-
-		/*
-		 * The error EPERM will be shown in the following pr_perror().
-		 * It comes from the previous open() call.
-		 */
-		pr_perror("Can't open mapped [%s]", tmp);
-
-		/*
-		 * TODO Perhaps we could do better than failing and dump the
-		 * memory like what is being done in shmem.c
-		 */
-		return -1;
-	}
-
 	if (is_hugetlb_dev(vfi_dev, &hugetlb_flag) || is_anon_shmem_map(vfi_dev)) {
 		vma->e->status |= VMA_AREA_REGULAR;
 		if (!(vma->e->flags & MAP_SHARED))

From cec43025ac8475255668b8d5c4eca79765204447 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Fri, 16 Dec 2022 08:55:55 -0800
Subject: [PATCH 1204/1854] criu(8): Add info about unprivileged mode
 limitations

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 Documentation/criu.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 3b68f16a4..294127050 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -906,6 +906,16 @@ Currently *criu* can benefit from the following additional capabilities:
     - *CAP_SETUID*
     - *CAP_SYS_RESOURCE*
 
+Note that for some operations, having a capability in a namespace other than
+the init namespace (i.e. the default/root namespace) is not sufficient. For
+example, in order to read symlinks in proc/[pid]/map_files CRIU requires
+CAP_CHECKPOINT_RESTORE in the init namespace; having CAP_CHECKPOINT_RESTORE
+while running in another user namespace (e.g. in a container) does not allow
+CRIU to read symlinks in /proc/[pid]/map_files.
+
+Without access to /proc/[pid]/map_files checkpointing/restoring processes
+that have mapped deleted files may not be possible.
+
 Independent of the capabilities it is always necessary to use "*--unprivileged*" to
 accept *criu*'s limitation in non-root mode.
 

From 3837d31b5beb416603677af7465badede4773bca Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 26 Jan 2023 15:12:28 +0300
Subject: [PATCH 1205/1854] ci/lint: make push action have at least too commits
 depth

We see that when lint is called for push action git has only one last
commit which makes make indent with git-clang-format fail to operate.

Fix it by increasing fetch depth to one more commit.

Fixes: #2066
Fixes: d6db3333a ("clang-format: rework make indent to check specific commits")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .github/workflows/lint.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0194c9393..a501af30e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -23,6 +23,7 @@ jobs:
     - name: Run make indent
       run: >
         if [ -z "${{github.base_ref}}" ]; then
+          git fetch --deepen=1 &&
           if ! make indent OPTS=--diff; then
             exit 1
           fi

From 757a2b46ce2780a9f73444e15c7a89e64b0e4465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 26 Jan 2023 00:20:33 +0100
Subject: [PATCH 1206/1854] remap: Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: 237bd26982a1 ("remap: Rename global lock", 2017-05-18)
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/files-reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 1bbfe44ba..6f05b272c 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -86,7 +86,7 @@ static LIST_HEAD(ghost_files);
 /*
  * When opening remaps we first create a link on the remap
  * target, then open one, then unlink. In case the remap
- * source has more than one instance, these tree steps
+ * source has more than one instance, these three steps
  * should be serialized with each other.
  */
 static mutex_t *remap_open_lock;

From 43fa4e76d2a1d4ade89c3751ac38b7d78f0b626f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 26 Jan 2023 01:19:57 +0100
Subject: [PATCH 1207/1854] remap: refactor goto jumping to a while loop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make the code a bit more readable by uncovering a while loop from
a if() goto sequence.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/files-reg.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 6f05b272c..ed8b9c889 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1138,7 +1138,6 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_i
 	RegFileEntry rfe = REG_FILE_ENTRY__INIT;
 	FownEntry fwn = FOWN_ENTRY__INIT;
 	int mntns_root;
-	int ret;
 	const struct stat *ost = &parms->stat;
 
 	if (!opts.link_remap_ok) {
@@ -1177,19 +1176,18 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_i
 
 	mntns_root = mntns_get_root_fd(nsid);
 
-again:
-	ret = linkat_hard(lfd, "", mntns_root, link_name, ost->st_uid, ost->st_gid, AT_EMPTY_PATH);
-	if (ret < 0 && errno == ENOENT) {
+	while (linkat_hard(lfd, "", mntns_root, link_name, ost->st_uid, ost->st_gid, AT_EMPTY_PATH) < 0) {
+		if (errno != ENOENT) {
+			pr_perror("Can't link remap to %s", path);
+			return -1;
+		}
+
 		/* Use grand parent, if parent directory does not exist. */
 		if (trim_last_parent(link_name) < 0) {
 			pr_err("trim failed: @%s@\n", link_name);
 			check_overlayfs_fallback(path, parms, fallback);
 			return -1;
 		}
-		goto again;
-	} else if (ret < 0) {
-		pr_perror("Can't link remap to %s", path);
-		return -1;
 	}
 
 	if (note_link_remap(link_name, nsid))

From 63159c14c0e91b884e4d1c3f29a03e6f320b179b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 13 Jan 2023 19:38:07 +0300
Subject: [PATCH 1208/1854] mount: simplify code around mount_cr_time_mount

Checking errno in outer function is really strange, also saving errno of
mount syscall after calling pr_perror is completely wrong. So let's try
to simplify things.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 61 ++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index 115e3d067..3369fea34 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1723,38 +1723,49 @@ err:
 	return NULL;
 }
 
-/* Returns 1 in case of success, -errno in case of mount fail, and 0 on other errors */
+/*
+ * Returns:
+ *  0 - success
+ * -1 - error
+ *  1 - skip
+ */
 static __maybe_unused int mount_cr_time_mount(struct ns_id *ns, unsigned int *s_dev, const char *source,
 					      const char *target, const char *type)
 {
-	int mnt_fd, cwd_fd, ret, exit_code = 0;
+	int mnt_fd, cwd_fd, exit_code = -1;
 	struct stat st;
 
-	ret = switch_mnt_ns(ns->ns_pid, &mnt_fd, &cwd_fd);
-	if (ret < 0) {
+	if (switch_mnt_ns(ns->ns_pid, &mnt_fd, &cwd_fd)) {
 		pr_err("Can't switch mnt_ns\n");
-		goto out;
+		return -1;
 	}
 
-	ret = mount(source, target, type, 0, NULL);
-	if (ret < 0) {
-		pr_perror("Unable to mount %s %s", source, target);
-		exit_code = -errno;
-		goto restore_ns;
-	} else {
-		if (stat(target, &st) < 0) {
-			pr_perror("Can't stat %s", target);
-			exit_code = 0;
-		} else {
-			*s_dev = MKKDEV(major(st.st_dev), minor(st.st_dev));
+	if (mount(source, target, type, 0, NULL)) {
+		switch (errno) {
+		case EPERM:
+		case EBUSY:
+		case ENODEV:
+		case ENOENT:
+			pr_debug("Skipping %s as was unable to mount it: %s\n", type, strerror(errno));
 			exit_code = 1;
+			break;
+		default:
+			pr_perror("Unable to mount %s %s %s", type, source, target);
 		}
+		goto restore_ns;
 	}
 
+	if (stat(target, &st)) {
+		pr_perror("Can't stat %s", target);
+		goto restore_ns;
+	}
+
+	*s_dev = MKKDEV(major(st.st_dev), minor(st.st_dev));
+	exit_code = 0;
 restore_ns:
-	ret = restore_mnt_ns(mnt_fd, &cwd_fd);
-out:
-	return ret < 0 ? 0 : exit_code;
+	if (restore_mnt_ns(mnt_fd, &cwd_fd))
+		exit_code = -1;
+	return exit_code;
 }
 
 static int dump_one_fs(struct mount_info *mi)
@@ -3978,16 +3989,10 @@ int collect_mnt_namespaces(bool for_dump)
 
 		if (ns) {
 			ret = mount_cr_time_mount(ns, &s_dev, "binfmt_misc", "/" BINFMT_MISC_HOME, "binfmt_misc");
-			if (ret == -EPERM)
-				pr_info("Can't mount binfmt_misc: EPERM. Running in user_ns?\n");
-			else if (ret < 0 && ret != -EBUSY && ret != -ENODEV && ret != -ENOENT) {
-				pr_err("Can't mount binfmt_misc: %d %s\n", ret, strerror(-ret));
+			if (ret == -1) {
 				goto err;
-			} else if (ret == 0) {
-				ret = -1;
-				goto err;
-			} else if (ret > 0 && !add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc", BINFMT_MISC_HOME,
-								 s_dev, false)) {
+			} else if (ret == 0 && !add_cr_time_mount(ns->mnt.mntinfo_tree, "binfmt_misc", BINFMT_MISC_HOME,
+								  s_dev, false)) {
 				ret = -1;
 				goto err;
 			}

From fcdb753ed574700c0632afd5c6beb2baf81d77bf Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 16 Jan 2023 19:13:44 +0300
Subject: [PATCH 1209/1854] namespaces: cleanup switch_mnt_ns and
 restore_mnt_ns

Simplify code a bit: make exit codes of those functions more
transparent, rename ret to exit_code.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/namespaces.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index 0dc19d5b6..b1b5303fa 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -284,7 +284,6 @@ int restore_ns(int rst, struct ns_desc *nd)
 
 int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
 {
-	int ret;
 	int fd;
 
 	if (!cwd_fd)
@@ -293,13 +292,12 @@ int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
 	fd = open(".", O_PATH);
 	if (fd < 0) {
 		pr_perror("unable to open current directory");
-		return fd;
+		return -1;
 	}
 
-	ret = switch_ns(pid, &mnt_ns_desc, rst);
-	if (ret < 0) {
+	if (switch_ns(pid, &mnt_ns_desc, rst)) {
 		close(fd);
-		return ret;
+		return -1;
 	}
 
 	*cwd_fd = fd;
@@ -308,23 +306,22 @@ int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
 
 int restore_mnt_ns(int rst, int *cwd_fd)
 {
-	int ret = -1;
+	int exit_code = -1;
 
-	ret = restore_ns(rst, &mnt_ns_desc);
-	if (ret < 0)
+	if (restore_ns(rst, &mnt_ns_desc))
 		goto err_restore;
 
-	if (cwd_fd) {
-		ret = fchdir(*cwd_fd);
-		if (ret)
-			pr_perror("unable to restore current directory");
+	if (cwd_fd && fchdir(*cwd_fd)) {
+		pr_perror("Unable to restore current directory");
+		goto err_restore;
 	}
 
+	exit_code = 0;
 err_restore:
 	if (cwd_fd)
 		close_safe(cwd_fd);
 
-	return ret;
+	return exit_code;
 }
 
 struct ns_id *ns_ids = NULL;

From 7280e96a794f4d2ed610ac46c3b7b08a4b8523c3 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 9 Jan 2023 12:13:46 +0300
Subject: [PATCH 1210/1854] clang-format: use IndentGotoLabels to get rid of
 goto label indentation

This is done to follow 'Linux kernel coding style', same change was
added to .clang-format in linux kernel source recently:
https://github.com/torvalds/linux/commit/d7f6604341c74

We don't change it in current code base but let's follow it in all
future uses.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .clang-format                 | 1 +
 scripts/fetch-clang-format.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.clang-format b/.clang-format
index b64ade9d9..475638015 100644
--- a/.clang-format
+++ b/.clang-format
@@ -516,6 +516,7 @@ IncludeCategories:
     Priority: 1
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+IndentGotoLabels: false
 IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
 IndentWrappedFunctionNames: false
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
index b93a804a1..b80175f05 100755
--- a/scripts/fetch-clang-format.sh
+++ b/scripts/fetch-clang-format.sh
@@ -14,4 +14,5 @@ curl -s "${URL}" | sed -e "
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;
 	s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
 	s,AlignTrailingComments: false,AlignTrailingComments: true,g;
+	s,\(IndentCaseLabels: false\),\1\nIndentGotoLabels: false,g;
 "  > .clang-format

From 6d7c0d007ef2ab12d175cdb1288803c0e90f3697 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <radostin@redhat.com>
Date: Thu, 9 Feb 2023 10:32:38 +0000
Subject: [PATCH 1211/1854] compel/mips: fix parasite with GCC 12

This patch applies the '-ffreestanding' flag that was introduced
with https://github.com/checkpoint-restore/criu/pull/1726 to MIPS.

Fixes: #1725

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
---
 compel/src/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compel/src/main.c b/compel/src/main.c
index 632354582..ef05a46d0 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -56,6 +56,7 @@ static const flags_t flags = {
 	.cflags = COMPEL_CFLAGS_PIE,
 #elif defined CONFIG_MIPS
 	.arch = "mips",
+	.cflags = COMPEL_CFLAGS_PIE,
 #else
 #error "CONFIG_<ARCH> not defined, or unsupported ARCH"
 #endif

From 144b467a05113e2475a5ac39c711267d83931fa1 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Thu, 2 Feb 2023 09:00:40 -0800
Subject: [PATCH 1212/1854] shmem: pr_err -> pr_perror

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/shmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/shmem.c b/criu/shmem.c
index b92076a05..8d539d4d0 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -818,7 +818,7 @@ static int dump_one_shmem(struct shmem_info *si)
 	if (fd >= 0) {
 		addr = mmap(NULL, si->size, PROT_READ, MAP_SHARED, fd, 0);
 		if (addr == MAP_FAILED) {
-			pr_err("Can't map shmem 0x%lx (0x%lx-0x%lx)\n", si->shmid, si->start, si->end);
+			pr_perror("Can't map shmem 0x%lx (0x%lx-0x%lx)", si->shmid, si->start, si->end);
 			goto errc;
 		}
 
@@ -837,7 +837,7 @@ static int dump_one_shmem(struct shmem_info *si)
 
 		addr = mmap(NULL, si->size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 		if (addr == MAP_FAILED) {
-			pr_err("Can't map empty space for shmem 0x%lx (0x%lx-0x%lx)\n", si->shmid, si->start, si->end);
+			pr_perror("Can't map empty space for shmem 0x%lx (0x%lx-0x%lx)", si->shmid, si->start, si->end);
 			goto errc;
 		}
 

From d2abc9817ff856c2e2e66c172c5571830617e491 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Thu, 2 Feb 2023 09:07:15 -0800
Subject: [PATCH 1213/1854] shmem: Close fd when VMA is copied from
 /proc/$pid/mem

If we don't have access to map_files and instead have to get the data
from /proc/$pid/mem we can close and reset the fd before passing it to
do_dump_one_shmem() which can then check it before trying to seek past
holes, eliminating the need for a separate seek_data_supported boolean.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/shmem.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/criu/shmem.c b/criu/shmem.c
index 8d539d4d0..c13a39b66 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -724,7 +724,7 @@ static int next_data_segment(int fd, unsigned long pfn, unsigned long *next_data
 	return 0;
 }
 
-static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si, bool seek_data_supported)
+static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si)
 {
 	struct page_pipe *pp;
 	struct page_xfer xfer;
@@ -750,8 +750,7 @@ static int do_dump_one_shmem(int fd, void *addr, struct shmem_info *si, bool see
 		unsigned long pgaddr;
 		int st = -1;
 
-		if (seek_data_supported && pfn >= next_hole_pfn &&
-		    next_data_segment(fd, pfn, &next_data_pnf, &next_hole_pfn))
+		if (fd >= 0 && pfn >= next_hole_pfn && next_data_segment(fd, pfn, &next_data_pnf, &next_hole_pfn))
 			goto err_xfer;
 
 		if (si->pstate_map && is_shmem_tracking_en()) {
@@ -810,7 +809,6 @@ static int dump_one_shmem(struct shmem_info *si)
 	int fd, ret = -1;
 	void *addr;
 	unsigned long cur, remaining;
-	bool seek_data_supported;
 
 	pr_info("Dumping shared memory %ld\n", si->shmid);
 
@@ -821,8 +819,6 @@ static int dump_one_shmem(struct shmem_info *si)
 			pr_perror("Can't map shmem 0x%lx (0x%lx-0x%lx)", si->shmid, si->start, si->end);
 			goto errc;
 		}
-
-		seek_data_supported = true;
 	} else {
 		if (errno != EPERM || !opts.unprivileged) {
 			goto err;
@@ -858,14 +854,16 @@ static int dump_one_shmem(struct shmem_info *si)
 			cur += ret;
 		} while (remaining > 0);
 
-		seek_data_supported = false;
+		close(fd);
+		fd = -1;
 	}
 
-	ret = do_dump_one_shmem(fd, addr, si, seek_data_supported);
+	ret = do_dump_one_shmem(fd, addr, si);
 
 	munmap(addr, si->size);
 errc:
-	close(fd);
+	if (fd >= 0)
+		close(fd);
 err:
 	return ret;
 }
@@ -889,7 +887,7 @@ int dump_one_memfd_shmem(int fd, unsigned long shmid, unsigned long size)
 		goto err;
 	}
 
-	ret = do_dump_one_shmem(fd, addr, &si, true);
+	ret = do_dump_one_shmem(fd, addr, &si);
 
 	munmap(addr, size);
 err:
@@ -915,7 +913,7 @@ int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shmid)
 	if (fd < 0)
 		return -1;
 
-	ret = do_dump_one_shmem(fd, addr, si, true);
+	ret = do_dump_one_shmem(fd, addr, si);
 	close(fd);
 	return ret;
 }

From d7da4a69af3cbf9aea97444cee3d8718a1c8eeb9 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Thu, 2 Feb 2023 09:43:37 -0800
Subject: [PATCH 1214/1854] ci: Add maps00 test in unprivileged mode in user
 namespace

CAP_CHECKPOINT_RESTORE does not give access to /proc/$pid/map_files in
user namespaces. In order to test that CRIU in unprivileged mode can
dump and restore anonymous shared memory pages we will run the maps00
tests in a user namespace.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 scripts/build/Dockerfile.alpine |  4 +++-
 scripts/ci/run-ci-tests.sh      | 15 +++++++++++++++
 scripts/ci/vagrant.sh           |  5 +++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index eced46c22..19b08315f 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -21,7 +21,9 @@ RUN apk update && apk add \
 	py3-pip \
 	py3-protobuf \
 	python3 \
-	sudo
+	sudo \
+	libcap-utils \
+	util-linux
 
 COPY . /criu
 WORKDIR /criu
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7b64c6b06..5b9f6d929 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -289,6 +289,21 @@ ip net add test
 ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/transition/fork -t zdtm/static/ghost_holes00 -t zdtm/static/socket-tcp -t zdtm/static/msgque -k always
 ./test/crit-recode.py
 
+# Rootless tests
+# Check if cap_checkpoint_restore is supported and also if unshare -c is supported.
+if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true; then
+	make -C test/zdtm/ cleanout
+	rm -rf test/dump
+	setcap cap_checkpoint_restore,cap_sys_ptrace+eip criu/criu
+	# Run it as non-root in a user namespace. Since CAP_CHECKPOINT_RESTORE behaves differently in non-user namespaces (e.g. no access to map_files) this tests that we can dump and restore
+	# under those conditions. Note that the "... && true" part is necessary; we need at least one statement after the tests so that bash can reap zombies in the user namespace,
+	# otherwise it will exec the last statement and get replaced and nobody will be left to reap our zombies.
+	sudo --user=#65534 --group=#65534 unshare -Ucfpm --mount-proc -- bash -c "./test/zdtm.py run -t zdtm/static/maps00 -f h --rootless && true"
+	setcap -r criu/criu
+else
+	echo "Skipping unprivileged mode tests"
+fi
+
 # more crit testing
 make -C test/others/crit run
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index a3e4b6937..f0996b01d 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -78,6 +78,11 @@ fedora-non-root() {
 	ssh default 'cd /vagrant/criu; criu/criu check --unprivileged; ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/static/pthread00 -f h --rootless'
 	# Run it as root with '--rootless'
 	ssh default 'cd /vagrant/criu; sudo ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/static/pthread00 -f h; sudo chmod 777 test/dump/zdtm/static/{env00,pthread00}; sudo ./test/zdtm.py run -t zdtm/static/env00 -t zdtm/static/pthread00 -f h --rootless'
+	# Run it as non-root in a user namespace. Since CAP_CHECKPOINT_RESTORE behaves differently in non-user namespaces (e.g. no access to map_files) this tests that we can dump and restore
+	# under those conditions. Note that the "... && true" part is necessary; we need at least one statement after the tests so that bash can reap zombies in the user namespace,
+	# otherwise it will exec the last statement and get replaced and nobody will be left to reap our zombies.
+	# Note: selinux in Enforcing mode prevents us from calling clone3() or writing to ns_last_pid on restore; hence set to Permissive for the test and then set back.
+	ssh default 'cd /vagrant/criu; selinuxmode=`getenforce` && sudo setenforce Permissive && unshare -Ucfpm --mount-proc bash -c "./test/zdtm.py run -t zdtm/static/maps00 -f h --rootless && true" && sudo setenforce $selinuxmode'
 }
 
 $1

From 14e883656432f90f29450586da935ad3202cc7fb Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Mon, 13 Feb 2023 10:40:12 -0800
Subject: [PATCH 1215/1854] proc_parse: Handle btrfs files when map_files is
 not accessible

If we can't access a map_files entry directly and instead have to follow
the link and access the file via a filesystem path we need to properly
deal with files on btrfs subvolumes.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/proc_parse.c | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 5ba3beb63..bcb8256b4 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -338,22 +338,49 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct
 	fd = open(fname, O_RDONLY);
 	if (fd < 0) {
 		pr_perror("Can't open mapped [%s]", fname);
-		return -1;
+		goto returnerr;
 	}
 
 	if (vma_stat(vma, fd)) {
-		close(fd);
-		return -1;
+		goto closefd;
 	}
 
-	if (vma->vmst->st_dev != vfi_dev || vma->vmst->st_ino != vfi->ino) {
-		pr_err("Failed to resolve mapping %lx filename\n", (unsigned long)vma->e->start);
-		close(fd);
-		return -1;
+	if (vma->vmst->st_ino != vfi->ino) {
+		goto errmsg;
+	}
+
+	/*
+	 * If devices don't match it could be because file is on a btrfs subvolume,
+	 * which means that device number returned by stat will not match what is
+	 * seen in smaps and other places. To deal with that we need a more involved
+	 * check.
+	 */
+	if (vma->vmst->st_dev != vfi_dev) {
+		int mnt_id;
+		struct ns_id *ns;
+
+		if (get_fd_mntid(fd, &mnt_id))
+			goto errmsg;
+
+		ns = lookup_nsid_by_mnt_id(mnt_id);
+		if (!ns)
+			goto errmsg;
+
+		if (!phys_stat_dev_match(vma->vmst->st_dev, vfi_dev, ns, fname))
+			goto errmsg;
+
+		vma->mnt_id = mnt_id;
 	}
 
 	*vm_file_fd = fd;
 	return 0;
+
+errmsg:
+	pr_err("Failed to resolve mapping %lx filename\n", (unsigned long)vma->e->start);
+closefd:
+	close(fd);
+returnerr:
+	return -1;
 }
 
 static int vma_get_mapfile(const char *fname, struct vma_area *vma, DIR *mfd, struct vma_file_info *vfi,

From f1c8d386b402554d85e1acfb86b211616ab95356 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 2 Dec 2022 11:21:54 +0300
Subject: [PATCH 1216/1854] kerndat: check if setsockopt IPV6_FREEBIND is
 supported

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-check.c        | 10 ++++++++++
 criu/include/kerndat.h |  1 +
 criu/kerndat.c         | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index b54c79387..bcbcf3f2b 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1375,6 +1375,14 @@ static int check_openat2(void)
 	return 0;
 }
 
+static int check_ipv6_freebind(void)
+{
+	if (!kdat.has_ipv6_freebind)
+		return -1;
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1494,6 +1502,7 @@ int cr_check(void)
 		ret |= check_move_mount_set_group();
 		ret |= check_openat2();
 		ret |= check_ptrace_get_rseq_conf();
+		ret |= check_ipv6_freebind();
 
 		if (kdat.lsm == LSMTYPE__APPARMOR)
 			ret |= check_apparmor_stacking();
@@ -1614,6 +1623,7 @@ static struct feature_list feature_list[] = {
 	{ "move_mount_set_group", check_move_mount_set_group },
 	{ "openat2", check_openat2 },
 	{ "get_rseq_conf", check_ptrace_get_rseq_conf },
+	{ "ipv6_freebind", check_ipv6_freebind },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index a3959c992..0b2f715f3 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -84,6 +84,7 @@ struct kerndat_s {
 	bool has_rseq;
 	bool has_ptrace_get_rseq_conf;
 	struct __ptrace_rseq_configuration libc_rseq_conf;
+	bool has_ipv6_freebind;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 5d99c575b..bc0c7ba05 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1541,6 +1541,34 @@ static int kerndat_has_nftables_concat(void)
 #endif
 }
 
+#ifndef IPV6_FREEBIND
+#define IPV6_FREEBIND 78
+#endif
+
+static int kerndat_has_ipv6_freebind(void)
+{
+	int sk, val;
+
+	sk = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+	if (sk == -1) {
+		pr_perror("Unable to create a ipv6 dgram socket");
+		return -1;
+	}
+
+	val = 1;
+	if (setsockopt(sk, SOL_IPV6, IPV6_FREEBIND, &val, sizeof(int)) == -1) {
+		if (errno == ENOPROTOOPT) {
+			kdat.has_ipv6_freebind = false;
+			return 0;
+		}
+		pr_perror("Unable to setsockopt ipv6_freebind");
+		return -1;
+	}
+
+	kdat.has_ipv6_freebind = true;
+	return 0;
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the
@@ -1780,6 +1808,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_ptrace_get_rseq_conf failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && (kerndat_has_ipv6_freebind() < 0)) {
+		pr_err("kerndat_has_ipv6_freebind failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From 7d4d4915af687f10809ba39af1c06e3d1016e113 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 1 Dec 2022 12:08:43 +0300
Subject: [PATCH 1217/1854] sk-inet: save IP_FREEBIND option for SOCK_RAW
 sockets also

The IP_FREEBIND option is supported for RAW sockets, why not save it
while we do this for other ip sockets anyway?

One difference is that for SOCK_RAW there is no fallback between
IP_FREEBIND and IPV6_FREEBIND, see:

https://github.com/torvalds/linux/blob/ef4d3ea40565a781c25847e9cb96c1bd9f462bc6/net/ipv6/ipv6_sockglue.c#L1497

So let's have explicit IPV6_FREEBIND for ipv6.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-inet.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index e52b198c3..b14dd2ed4 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -14,6 +14,8 @@
 #include <linux/icmp.h>
 #include <linux/icmpv6.h>
 #include <poll.h>
+#include <linux/in.h>
+#include <linux/in6.h>
 
 #include "../soccr/soccr.h"
 
@@ -388,6 +390,10 @@ static int dump_ip_raw_opts(int sk, int family, int proto, IpOptsRawEntry *r)
 	return ret;
 }
 
+#ifndef IPV6_FREEBIND
+#define IPV6_FREEBIND 78
+#endif
+
 static int dump_ip_opts(int sk, int family, int type, int proto, IpOptsEntry *ioe)
 {
 	int ret = 0;
@@ -398,12 +404,19 @@ static int dump_ip_opts(int sk, int family, int type, int proto, IpOptsEntry *io
 		 * and fetch additional options.
 		 */
 		ret |= dump_ip_raw_opts(sk, family, proto, ioe->raw);
-	} else {
-		/* Due to kernel code we can use SOL_IP instead of SOL_IPV6 */
-		ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
-		ioe->has_freebind = ioe->freebind;
 	}
 
+	if (family == AF_INET6) {
+		if (kdat.has_ipv6_freebind)
+			ret |= dump_opt(sk, SOL_IPV6, IPV6_FREEBIND, &ioe->freebind);
+		else if (type != SOCK_RAW)
+			/* Due to kernel code we can use SOL_IP instead of SOL_IPV6 */
+			ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+	} else {
+		ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+	}
+	ioe->has_freebind = ioe->freebind;
+
 	return ret;
 }
 
@@ -787,8 +800,13 @@ int restore_ip_opts(int sk, int family, int proto, IpOptsEntry *ioe)
 {
 	int ret = 0;
 
-	if (ioe->has_freebind)
-		ret |= restore_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+	if (family == AF_INET6) {
+		if (ioe->has_freebind)
+			ret |= restore_opt(sk, SOL_IPV6, IPV6_FREEBIND, &ioe->freebind);
+	} else {
+		if (ioe->has_freebind)
+			ret |= restore_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+	}
 
 	if (ioe->raw)
 		ret |= restore_ip_raw_opts(sk, family, proto, ioe->raw);

From bd9b66c8c0143727124c10735e6c3688e6eec440 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 29 Nov 2022 14:47:28 +0300
Subject: [PATCH 1218/1854] sk-inet: support IP_PKTINFO and IPV6_RECVPKTINFO
 options

We see systemd-resolved relying on these options, and after migration
the options are lost and systemd-resolved stops serving dns requests.

The socket options make kernel add cmsg with destination address to
packets, see more how systemd-resolved uses them:

https://github.com/systemd/systemd/blob/00a60eaf5fcb3a0e415349aa649f2699550d26b0/src/resolve/resolved-manager.c#L826

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-inet.c       | 7 +++++++
 images/sk-inet.proto | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index b14dd2ed4..4bd5abff1 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -412,10 +412,13 @@ static int dump_ip_opts(int sk, int family, int type, int proto, IpOptsEntry *io
 		else if (type != SOCK_RAW)
 			/* Due to kernel code we can use SOL_IP instead of SOL_IPV6 */
 			ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+		ret |= dump_opt(sk, SOL_IPV6, IPV6_RECVPKTINFO, &ioe->pktinfo);
 	} else {
 		ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+		ret |= dump_opt(sk, SOL_IP, IP_PKTINFO, &ioe->pktinfo);
 	}
 	ioe->has_freebind = ioe->freebind;
+	ioe->has_pktinfo = !!ioe->pktinfo;
 
 	return ret;
 }
@@ -803,9 +806,13 @@ int restore_ip_opts(int sk, int family, int proto, IpOptsEntry *ioe)
 	if (family == AF_INET6) {
 		if (ioe->has_freebind)
 			ret |= restore_opt(sk, SOL_IPV6, IPV6_FREEBIND, &ioe->freebind);
+		if (ioe->has_pktinfo)
+			ret |= restore_opt(sk, SOL_IPV6, IPV6_RECVPKTINFO, &ioe->pktinfo);
 	} else {
 		if (ioe->has_freebind)
 			ret |= restore_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
+		if (ioe->has_pktinfo)
+			ret |= restore_opt(sk, SOL_IP, IP_PKTINFO, &ioe->pktinfo);
 	}
 
 	if (ioe->raw)
diff --git a/images/sk-inet.proto b/images/sk-inet.proto
index 594e29c66..ee1f0ae41 100644
--- a/images/sk-inet.proto
+++ b/images/sk-inet.proto
@@ -17,6 +17,8 @@ message ip_opts_entry {
 	optional bool			freebind	= 1;
 	// Fields 2 and 3 are reserved for vz7 use
 	optional ip_opts_raw_entry	raw		= 4;
+
+	optional bool			pktinfo		= 5;
 }
 
 message inet_sk_entry {

From 4a8c02d6368c5010b83cb3973ce349e7bec932cc Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 29 Nov 2022 15:42:51 +0300
Subject: [PATCH 1219/1854] zdtm: Add tests for IP_PKTINFO and IP_FREEBIND sock
 options

Just creates ipv4/ipv6 raw/dgram sockets with IP_PKTINFO and IP_FREEBIND
socket options enabled/disabled and checks that these options persist.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile            |   3 +
 test/zdtm/static/sock_ip_opts00.c    | 110 +++++++++++++++++++++++++++
 test/zdtm/static/sock_ip_opts00.desc |   1 +
 test/zdtm/static/sock_ip_opts01.c    |   1 +
 test/zdtm/static/sock_ip_opts01.desc |   1 +
 5 files changed, 116 insertions(+)
 create mode 100644 test/zdtm/static/sock_ip_opts00.c
 create mode 100644 test/zdtm/static/sock_ip_opts00.desc
 create mode 120000 test/zdtm/static/sock_ip_opts01.c
 create mode 120000 test/zdtm/static/sock_ip_opts01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 000488133..4b3d2e341 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -123,6 +123,8 @@ TST_NOFILE	:=				\
 		sock_opts00			\
 		sock_opts01			\
 		sock_opts02			\
+		sock_ip_opts00			\
+		sock_ip_opts01			\
 		sk-unix-unconn			\
 		sk-unix-unconn-seqpacket	\
 		ipc_namespace			\
@@ -598,6 +600,7 @@ socket-tcp6-closed:	CFLAGS += -D ZDTM_IPV6
 socket-tcp6-closed:	CFLAGS += -D ZDTM_IPV4V6
 socket-tcp-closed-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK
 socket-tcp-skip-in-flight:	CFLAGS += -D ZDTM_IPV4V6
+sock_ip_opts01:		CFLAGS += -DZDTM_VAL_ZERO
 tun_ns:			CFLAGS += -DTUN_NS
 mnt_ext_manual:		CFLAGS += -D ZDTM_EXTMAP_MANUAL
 mntns_pivot_root_ro:	CFLAGS += -DMNTNS_PIVOT_ROOT_RO
diff --git a/test/zdtm/static/sock_ip_opts00.c b/test/zdtm/static/sock_ip_opts00.c
new file mode 100644
index 000000000..08970c0da
--- /dev/null
+++ b/test/zdtm/static/sock_ip_opts00.c
@@ -0,0 +1,110 @@
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+
+#include <linux/in.h>
+#include <linux/in6.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that different ip socket options are restored";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+#ifdef ZDTM_VAL_ZERO
+#define IP_OPT_VAL 0
+#else
+#define IP_OPT_VAL 1
+#endif
+
+struct sk_opt {
+	int level;
+	int opt;
+};
+
+struct sk_opt sk_opts_v4[] = {
+	{ SOL_IP, IP_FREEBIND },
+	{ SOL_IP, IP_PKTINFO },
+};
+
+#ifndef IPV6_FREEBIND
+#define IPV6_FREEBIND 78
+#endif
+
+struct sk_opt sk_opts_v6[] = {
+	{ SOL_IPV6, IPV6_FREEBIND },
+	{ SOL_IPV6, IPV6_RECVPKTINFO },
+};
+
+struct sk_conf {
+	int domain;
+	int type;
+	int protocol;
+	int sk;
+} sk_confs[] = {
+	{ AF_INET, SOCK_DGRAM, IPPROTO_UDP },
+	{ AF_INET, SOCK_RAW, IPPROTO_UDP },
+	{ AF_INET6, SOCK_DGRAM, IPPROTO_UDP },
+	{ AF_INET6, SOCK_RAW, IPPROTO_UDP },
+};
+
+int main(int argc, char **argv)
+{
+	struct sk_opt *opts;
+	int exit_code = 1;
+	int i, j, val;
+	socklen_t len;
+	int n_opts;
+
+	test_init(argc, argv);
+
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++) {
+		sk_confs[i].sk = socket(sk_confs[i].domain, sk_confs[i].type, sk_confs[i].protocol);
+		if (sk_confs[i].sk == -1) {
+			pr_perror("socket(%d,%d,%d) failed", sk_confs[i].domain, sk_confs[i].type,
+				  sk_confs[i].protocol);
+			goto close;
+		}
+	}
+
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++) {
+		opts = sk_confs[i].domain == AF_INET ? sk_opts_v4 : sk_opts_v6;
+		n_opts = sk_confs[i].domain == AF_INET ? ARRAY_SIZE(sk_opts_v4) : ARRAY_SIZE(sk_opts_v6);
+
+		for (j = 0; j < n_opts; j++) {
+			val = IP_OPT_VAL;
+			if (setsockopt(sk_confs[i].sk, opts[j].level, opts[j].opt, &val, sizeof(int)) == -1) {
+				pr_perror("setsockopt(%d, %d) failed", opts[j].level, opts[j].opt);
+				goto close;
+			}
+		}
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++) {
+		opts = sk_confs[i].domain == AF_INET ? sk_opts_v4 : sk_opts_v6;
+		n_opts = sk_confs[i].domain == AF_INET ? ARRAY_SIZE(sk_opts_v4) : ARRAY_SIZE(sk_opts_v6);
+
+		for (j = 0; j < n_opts; j++) {
+			len = sizeof(int);
+			if (getsockopt(sk_confs[i].sk, opts[j].level, opts[j].opt, &val, &len) == -1) {
+				pr_perror("getsockopt(%d, %d) failed", opts[j].level, opts[j].opt);
+				goto close;
+			}
+
+			if (val != IP_OPT_VAL) {
+				fail("Unexpected value socket(%d,%d,%d) opts(%d,%d)", sk_confs[i].domain,
+				     sk_confs[i].type, sk_confs[i].protocol, opts[j].level, opts[j].opt);
+				goto close;
+			}
+		}
+	}
+
+	pass();
+	exit_code = 0;
+close:
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++)
+		close(sk_confs[i].sk);
+	return exit_code;
+}
diff --git a/test/zdtm/static/sock_ip_opts00.desc b/test/zdtm/static/sock_ip_opts00.desc
new file mode 100644
index 000000000..2201f0298
--- /dev/null
+++ b/test/zdtm/static/sock_ip_opts00.desc
@@ -0,0 +1 @@
+{'flags': 'suid', 'feature': 'ipv6_freebind'}
diff --git a/test/zdtm/static/sock_ip_opts01.c b/test/zdtm/static/sock_ip_opts01.c
new file mode 120000
index 000000000..15526f808
--- /dev/null
+++ b/test/zdtm/static/sock_ip_opts01.c
@@ -0,0 +1 @@
+sock_ip_opts00.c
\ No newline at end of file
diff --git a/test/zdtm/static/sock_ip_opts01.desc b/test/zdtm/static/sock_ip_opts01.desc
new file mode 120000
index 000000000..e2c29ca25
--- /dev/null
+++ b/test/zdtm/static/sock_ip_opts01.desc
@@ -0,0 +1 @@
+sock_ip_opts00.desc
\ No newline at end of file

From 50e42c9ddcc26e705c5059ff8d4713686f183c48 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 23 Feb 2023 12:55:01 +0000
Subject: [PATCH 1220/1854] Add documentation for --ghost-fiemap

The --ghost-fiemap option was introduced with #1963.

It enables an optimized algorithm based on fiemap ioctl that can reduce
the number of syscalls used to checkpoint highly sparse ghost files. This
option is enabled by default. It can be disabled with --no-ghost-fiemap
when using SEEK_HOLE/SEEK_DATA is preferred. In addition, an automatic
fallback to SEEK_HOLE/SEEK_DATA is used for filesystems that do not
supporting fiemap.

Co-authored-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/criu.txt | 7 +++++++
 criu/crtools.c         | 1 +
 2 files changed, 8 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 294127050..0e7d19c4c 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -384,6 +384,13 @@ mount -t cgroup -o devices,freezer none devices,freezer
     'size' may be postfixed with a *K*, *M* or *G*, which stands for kilo-,
     mega, and gigabytes, accordingly.
 
+*--ghost-fiemap*::
+    Enable an optimization based on fiemap ioctl that can reduce the
+    number of system calls used when checkpointing highly sparse ghost
+    files. This option is enabled by default, and it can be disabled
+    with *--no-ghost-fiemap*. An automatic fallback to SEEK_HOLE/SEEK_DATA
+    is used when fiemap is not supported.
+
 *-j*, *--shell-job*::
     Allow one to dump shell jobs. This implies the restored task will
     inherit session and process group ID from the *criu* itself.
diff --git a/criu/crtools.c b/criu/crtools.c
index ca9361977..94657f418 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -445,6 +445,7 @@ usage:
 	       "                        is inaccessible\n"
 	       "  --link-remap          allow one to link unlinked files back when possible\n"
 	       "  --ghost-limit size    limit max size of deleted file contents inside image\n"
+	       "  --ghost-fiemap        enable dumping of deleted files using fiemap\n"
 	       "  --action-script FILE  add an external action script\n"
 	       "  -j|--" OPT_SHELL_JOB "        allow one to dump and restore shell jobs\n"
 	       "  -l|--" OPT_FILE_LOCKS "       handle file locks, for safety, only used for container\n"

From fd7e97fcfd285b09f40df3622dd16b260e1e1de0 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 23 Feb 2023 17:12:32 +0800
Subject: [PATCH 1221/1854] lint: exclude tags file from codespell

If we build tags for our repo:

[criu]$ make tags
  GEN      tags

And then run codespell, we get an error:

[criu]$ codespell
./tags:3755: struc ==> struct

Let's exclude tags file from codespell search, this would add usability
to `make lint`.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index eaa8a91e0..aabe28a92 100644
--- a/Makefile
+++ b/Makefile
@@ -427,7 +427,7 @@ lint:
 	shellcheck -x test/others/libcriu/*.sh
 	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck -x test/others/config-file/*.sh
-	codespell
+	codespell -S tags
 	# Do not append \n to pr_perror or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
 	# Do not use %m with pr_perror or fail

From fa4af04302a5f5cfb521e1ed7b67013ac2c9fb4a Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date: Wed, 10 May 2017 16:52:03 +0300
Subject: [PATCH 1222/1854] dump: Show task comm early

When error happens on file dumping stage the only information about the
task we dumping is its PID. For debug purpose show task's @comm early.

It proves useful when trying to understand which of dumped applications
is "guilty" in brokern dump when pid is not there anymore.

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-dump.c       |  6 +++---
 criu/include/seize.h |  3 +++
 criu/seize.c         | 46 +++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 30713f96b..249c02226 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1455,7 +1455,7 @@ static int pre_dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie
 	vm_area_list_init(&vmas);
 
 	pr_info("========================================\n");
-	pr_info("Pre-dumping task (pid: %d)\n", pid);
+	pr_info("Pre-dumping task (pid: %d comm: %s)\n", pid, __task_comm_info(pid));
 	pr_info("========================================\n");
 
 	/*
@@ -1545,7 +1545,7 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 	vm_area_list_init(&vmas);
 
 	pr_info("========================================\n");
-	pr_info("Dumping task (pid: %d)\n", pid);
+	pr_info("Dumping task (pid: %d comm: %s)\n", pid, __task_comm_info(pid));
 	pr_info("========================================\n");
 
 	if (item->pid->state == TASK_DEAD)
@@ -2113,7 +2113,7 @@ int cr_dump_tasks(pid_t pid)
 	int ret = -1;
 
 	pr_info("========================================\n");
-	pr_info("Dumping processes (pid: %d)\n", pid);
+	pr_info("Dumping processes (pid: %d comm: %s)\n", pid, __task_comm_info(pid));
 	pr_info("========================================\n");
 
 	/*
diff --git a/criu/include/seize.h b/criu/include/seize.h
index cf7366cb0..4545bf262 100644
--- a/criu/include/seize.h
+++ b/criu/include/seize.h
@@ -6,4 +6,7 @@ extern void pstree_switch_state(struct pstree_item *root_item, int st);
 extern const char *get_real_freezer_state(void);
 extern bool alarm_timeouted(void);
 
+extern char *task_comm_info(pid_t pid, char *comm, size_t size);
+extern char *__task_comm_info(pid_t pid);
+
 #endif
diff --git a/criu/seize.c b/criu/seize.c
index f8e3278ea..0758410e5 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -24,6 +24,46 @@
 #include "xmalloc.h"
 #include "util.h"
 
+char *task_comm_info(pid_t pid, char *comm, size_t size)
+{
+	int ret = 0;
+
+	if (!pr_quelled(LOG_INFO)) {
+		int saved_errno = errno;
+		char path[32];
+		int fd;
+
+		snprintf(path, sizeof(path), "/proc/%d/comm", pid);
+		fd = open(path, O_RDONLY);
+		if (fd >= 0) {
+			ssize_t n = read(fd, comm, size);
+			if (n > 0)
+				comm[n - 1] = '\0';
+			else
+				ret = -1;
+			close(fd);
+		} else {
+			ret = -1;
+		}
+		errno = saved_errno;
+	}
+
+	if (ret || (pr_quelled(LOG_INFO) && comm[0]))
+		comm[0] = '\0';
+
+	return comm;
+}
+
+/*
+ * NOTE: Don't run simultaneously, it uses local static buffer!
+ */
+char *__task_comm_info(pid_t pid)
+{
+	static char comm[32];
+
+	return task_comm_info(pid, comm, sizeof(comm));
+}
+
 #define NR_ATTEMPTS 5
 
 static const char frozen[] = "FROZEN";
@@ -249,13 +289,13 @@ static int seize_cgroup_tree(char *root_path, enum freezer_state state)
 		if (ret == 0)
 			continue;
 		if (errno != ESRCH) {
-			pr_perror("Unexpected error");
+			pr_perror("Unexpected error for pid %d (comm %s)", pid, __task_comm_info(pid));
 			fclose(f);
 			return -1;
 		}
 
 		if (!compel_interrupt_task(pid)) {
-			pr_debug("SEIZE %d: success\n", pid);
+			pr_debug("SEIZE %d (comm %s): success\n", pid, __task_comm_info(pid));
 			processes_to_wait++;
 		} else if (state == FROZEN) {
 			char buf[] = "/proc/XXXXXXXXXX/exe";
@@ -272,7 +312,7 @@ static int seize_cgroup_tree(char *root_path, enum freezer_state state)
 			 * before it compete exit procedure. The caller simply
 			 * should wait a bit and try freezing again.
 			 */
-			pr_err("zombie found while seizing\n");
+			pr_err("zombie %d (comm %s) found while seizing\n", pid, __task_comm_info(pid));
 			fclose(f);
 			return -EAGAIN;
 		}

From 9b919ab748d4818636ecab50b7e52916695342e7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 23 Feb 2023 11:11:36 +0000
Subject: [PATCH 1223/1854] crit: fix empty string comparison

In Python 3 b'' == '' is False. This causes the info action to fail with

  File "/usr/lib/python3.11/site-packages/crit-3.17-py3.11.egg/pycriu/images/images.py", line 178, in count
    size, = struct.unpack('i', buf)
            ^^^^^^^^^^^^^^^^^^^^^^^
  struct.error: unpack requires a buffer of 4 bytes

Reported-by: Sankalp Acharya (@sankalp-12)
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/py/images/images.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index eda030a5c..df4f92ac9 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -98,7 +98,7 @@ class entry_handler:
             # Read payload
             pbuff = self.payload()
             buf = f.read(4)
-            if buf == b'':
+            if len(buf) == 0:
                 break
             size, = struct.unpack('i', buf)
             pbuff.ParseFromString(f.read(size))
@@ -172,7 +172,7 @@ class entry_handler:
 
         while True:
             buf = f.read(4)
-            if buf == '':
+            if len(buf) == 0:
                 break
             size, = struct.unpack('i', buf)
             f.seek(size, 1)
@@ -195,7 +195,7 @@ class pagemap_handler:
         pbuff = pb.pagemap_head()
         while True:
             buf = f.read(4)
-            if buf == b'':
+            if len(buf) == 0:
                 break
             size, = struct.unpack('i', buf)
             pbuff.ParseFromString(f.read(size))
@@ -422,7 +422,7 @@ class ipc_msg_queue_handler:
         messages = []
         for x in range(0, entry['qnum']):
             buf = f.read(4)
-            if buf == '':
+            if len(buf) == 0:
                 break
             size, = struct.unpack('i', buf)
             msg = pb.ipc_msg()
@@ -455,7 +455,7 @@ class ipc_msg_queue_handler:
         pl_len = 0
         for x in range(0, entry['qnum']):
             buf = f.read(4)
-            if buf == '':
+            if len(buf) == 0:
                 break
             size, = struct.unpack('i', buf)
             msg = pb.ipc_msg()

From 11c71656bdc5d62d5c351fa6114dac027ca9ede1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 23 Feb 2023 16:39:13 +0000
Subject: [PATCH 1224/1854] ci: add test for crit info

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/crit/test.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 5d13066e7..105aac72b 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -53,6 +53,9 @@ function run_test2 {
 	# prepare
 	${CRIT} decode -i "${PROTO_IN}" -o "${JSON_IN}"
 
+	# show info about image
+	${CRIT} info "${PROTO_IN}"
+
 	# proto in - json out decode
 	cat "${PROTO_IN}" | ${CRIT} decode || exit 1
 	cat "${PROTO_IN}" | ${CRIT} decode -o "${OUT}" || exit 1

From 1ae9bac5488adcb55c4c589e3c3892ac6e6430ca Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 27 Feb 2023 12:14:21 +0800
Subject: [PATCH 1225/1854] dump: improve error printing and readability of
 task_comm_info

This addresses Andrei comments from
https://github.com/checkpoint-restore/criu/pull/2064

- Add comment about '\n' fixing
- Replace ret with more self explainting is_read
- Print warings if we failed to print comm for some reason

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/seize.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index 0758410e5..91090ae1a 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -26,7 +26,7 @@
 
 char *task_comm_info(pid_t pid, char *comm, size_t size)
 {
-	int ret = 0;
+	bool is_read = false;
 
 	if (!pr_quelled(LOG_INFO)) {
 		int saved_errno = errno;
@@ -37,18 +37,21 @@ char *task_comm_info(pid_t pid, char *comm, size_t size)
 		fd = open(path, O_RDONLY);
 		if (fd >= 0) {
 			ssize_t n = read(fd, comm, size);
-			if (n > 0)
+			if (n > 0) {
+				is_read = true;
+				/* Replace '\n' printed by kernel with '\0' */
 				comm[n - 1] = '\0';
-			else
-				ret = -1;
+			} else {
+				pr_warn("Failed to read %s: %s\n", path, strerror(errno));
+			}
 			close(fd);
 		} else {
-			ret = -1;
+			pr_warn("Failed to open %s: %s\n", path, strerror(errno));
 		}
 		errno = saved_errno;
 	}
 
-	if (ret || (pr_quelled(LOG_INFO) && comm[0]))
+	if (!is_read)
 		comm[0] = '\0';
 
 	return comm;

From 7b80353448827763f8537bea2734ec83a7d2643a Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Tue, 28 Feb 2023 12:42:49 +0100
Subject: [PATCH 1226/1854] mailmap: update my email

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 6f046b972..8076f0bc9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,3 +6,5 @@ Andrei Vagin <avagin@gmail.com> <avagin@virtuozzo.com>
 Andrei Vagin <avagin@gmail.com> <avagin@odin.com>
 Andrei Vagin <avagin@gmail.com> <avagin@google.com>
 Cyrill Gorcunov <gorcunov@openvz.org> <gorcunov@gmail.com>
+Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
+Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

From 676b4579f957f480e74e6a49ef273db1c474334f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 28 Feb 2023 13:16:27 +0800
Subject: [PATCH 1227/1854] zdtm/transition/epoll: don't rely on errno in case
 of zero return

Checking errno in case read succeeded is undefined behaviour.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/transition/epoll.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/transition/epoll.c b/test/zdtm/transition/epoll.c
index fdd492ab2..803e50541 100644
--- a/test/zdtm/transition/epoll.c
+++ b/test/zdtm/transition/epoll.c
@@ -158,9 +158,11 @@ int main(int argc, char **argv)
 			exit(1);
 		}
 		for (i = 0; i < rv; i++) {
-			while (read(events[i].data.fd, buf, buf_size) > 0)
+			int ret;
+
+			while ((ret = read(events[i].data.fd, buf, buf_size)) > 0)
 				;
-			if (errno != EAGAIN && errno != 0 && errno) {
+			if (ret < 0 && errno != EAGAIN) {
 				pr_perror("read error");
 				killall();
 				exit(1);

From e7ab6fe635804c5d70500e242ffbe4c3fbbcb494 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 17 Oct 2019 16:00:40 +0300
Subject: [PATCH 1228/1854] restore: don't miss futex abort in
 restore_task_with_children

Fixes: 37b99ebe5 ("files: Do setup_newborn_fds() later")

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 2f9bab414..195fa5639 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1790,7 +1790,7 @@ static int restore_task_with_children(void *_arg)
 	}
 
 	if (log_init_by_pid(vpid(current)))
-		return -1;
+		goto err;
 
 	if (current->parent == NULL) {
 		/*

From 91ff24b47e9b96fcb4725434518250d0da688f80 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 25 Feb 2023 20:20:23 +0000
Subject: [PATCH 1229/1854] ci: disable c/r of cgroups with podman

This patch disables the checkpoint/restore of cgroups for
the tests using Podman as a temporary workaround for
https://github.com/checkpoint-restore/criu/issues/2091

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/podman-test.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index e08fdf3bc..5ba9d9396 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -25,6 +25,12 @@ make install
 popd
 rm -rf "${tmp_dir}"
 
+# FIXME: Disable checkpoint/restore of cgroups
+# https://github.com/checkpoint-restore/criu/issues/2091
+mkdir -p /etc/criu
+echo "manage-cgroups ignore" > /etc/criu/runc.conf
+sed -i 's/#runtime\s*=\s*.*/runtime = "runc"/' /usr/share/containers/containers.conf
+
 podman info
 
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'

From 85b5c1e4510a640629329257af7fdb4fa0ee1aa1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 26 Feb 2023 12:13:48 +0000
Subject: [PATCH 1230/1854] ci/podman-test: drop crun installation script

In a previous commit, we set the default runtime to runc and
"manage-cgroups" to ignore. We remove the installation script
for crun as it is not used with this test.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/podman-test.sh | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 5ba9d9396..687acb8ff 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -11,20 +11,6 @@ make install PREFIX=/usr
 
 criu --version
 
-# Install crun build dependencies
-scripts/ci/apt-install libyajl-dev libseccomp-dev libsystemd-dev
-
-# Install crun from source to test libcriu integration
-tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
-pushd "${tmp_dir}"
-git clone --depth=1 https://github.com/containers/crun
-cd crun
-./autogen.sh && ./configure --prefix=/usr
-make -j"$(nproc)"
-make install
-popd
-rm -rf "${tmp_dir}"
-
 # FIXME: Disable checkpoint/restore of cgroups
 # https://github.com/checkpoint-restore/criu/issues/2091
 mkdir -p /etc/criu

From a0cc95c03eff9988cf20d8e1910dc3ab3db15c5b Mon Sep 17 00:00:00 2001
From: Kouame Behouba Manasse <behouba@gmail.com>
Date: Fri, 24 Feb 2023 05:32:44 +0300
Subject: [PATCH 1231/1854] lib/py: reduce code duplication

Refactor lib/py/images/images.py to reduce code duplication
by extracting repetitive code into helper functions and
private methods. This improves code readability and maintainability,
as well as reducing the risk of bugs caused by duplicated code.
Additionally, in Makefile, lib/py/images/images.py is added to the
list of files to run by flake8 during CI.

Fixes: #340

Signed-off-by: Kouame Behouba Manasse <behouba@gmail.com>
---
 Makefile                |   1 +
 lib/py/images/images.py | 104 ++++++++++++++++++++--------------------
 2 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/Makefile b/Makefile
index aabe28a92..24318d692 100644
--- a/Makefile
+++ b/Makefile
@@ -417,6 +417,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/inhfd/*.py
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
+	flake8 --config=scripts/flake8.cfg lib/py/images/images.py
 	flake8 --config=scripts/flake8.cfg scripts/criu-ns
 	flake8 --config=scripts/flake8.cfg scripts/crit-setup.py
 	flake8 --config=scripts/flake8.cfg coredump/
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index df4f92ac9..a1d76e7cf 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -69,6 +69,22 @@ class MagicException(Exception):
         self.magic = magic
 
 
+def decode_base64_data(data):
+    """A helper function to decode base64 data."""
+    if (sys.version_info > (3, 0)):
+        return base64.decodebytes(str.encode(data))
+    else:
+        return base64.decodebytes(data)
+
+
+def write_base64_data(f, data):
+    """A helper function to write base64 encoded data to a file."""
+    if (sys.version_info > (3, 0)):
+        f.write(base64.decodebytes(str.encode(data)))
+    else:
+        f.write(base64.decodebytes(data))
+
+
 # Generic class to handle loading/dumping criu images entries from/to bin
 # format to/from dict(json).
 class entry_handler:
@@ -285,15 +301,9 @@ class ghost_file_handler:
                 size = len(pb_str)
                 f.write(struct.pack('i', size))
                 f.write(pb_str)
-                if (sys.version_info > (3, 0)):
-                    f.write(base64.decodebytes(str.encode(item['extra'])))
-                else:
-                    f.write(base64.decodebytes(item['extra']))
+                write_base64_data(f, item['extra'])
         else:
-            if (sys.version_info > (3, 0)):
-                f.write(base64.decodebytes(str.encode(item['extra'])))
-            else:
-                f.write(base64.decodebytes(item['extra']))
+            write_base64_data(f, item['extra'])
 
     def dumps(self, entries):
         f = io.BytesIO('')
@@ -314,10 +324,7 @@ class pipes_data_extra_handler:
         return base64.encodebytes(data).decode('utf-8')
 
     def dump(self, extra, f, pload):
-        if (sys.version_info > (3, 0)):
-            data = base64.decodebytes(str.encode(extra))
-        else:
-            data = base64.decodebytes(extra)
+        data = decode_base64_data(extra)
         f.write(data)
 
     def skip(self, f, pload):
@@ -332,10 +339,7 @@ class sk_queues_extra_handler:
         return base64.encodebytes(data).decode('utf-8')
 
     def dump(self, extra, f, _unused):
-        if (sys.version_info > (3, 0)):
-            data = base64.decodebytes(str.encode(extra))
-        else:
-            data = base64.decodebytes(extra)
+        data = decode_base64_data(extra)
         f.write(data)
 
     def skip(self, f, pload):
@@ -356,12 +360,8 @@ class tcp_stream_extra_handler:
         return d
 
     def dump(self, extra, f, _unused):
-        if (sys.version_info > (3, 0)):
-            inq = base64.decodebytes(str.encode(extra['inq']))
-            outq = base64.decodebytes(str.encode(extra['outq']))
-        else:
-            inq = base64.decodebytes(extra['inq'])
-            outq = base64.decodebytes(extra['outq'])
+        inq = decode_base64_data(extra['inq'])
+        outq = decode_base64_data(extra['outq'])
 
         f.write(inq)
         f.write(outq)
@@ -370,6 +370,7 @@ class tcp_stream_extra_handler:
         f.seek(0, os.SEEK_END)
         return pbuff.inq_len + pbuff.outq_len
 
+
 class bpfmap_data_extra_handler:
     def load(self, f, pload):
         size = pload.keys_bytes + pload.values_bytes
@@ -384,14 +385,13 @@ class bpfmap_data_extra_handler:
         f.seek(pload.bytes, os.SEEK_CUR)
         return pload.bytes
 
+
 class ipc_sem_set_handler:
     def load(self, f, pbuff):
         entry = pb2dict.pb2dict(pbuff)
         size = sizeof_u16 * entry['nsems']
         rounded = round_up(size, sizeof_u64)
-        s = array.array('H')
-        if s.itemsize != sizeof_u16:
-            raise Exception("Array size mismatch")
+        s = self._get_sem_array()
         s.frombytes(f.read(size))
         f.seek(rounded - size, 1)
         return s.tolist()
@@ -400,9 +400,7 @@ class ipc_sem_set_handler:
         entry = pb2dict.pb2dict(pbuff)
         size = sizeof_u16 * entry['nsems']
         rounded = round_up(size, sizeof_u64)
-        s = array.array('H')
-        if s.itemsize != sizeof_u16:
-            raise Exception("Array size mismatch")
+        s = self._get_sem_array()
         s.fromlist(extra)
         if len(s) != entry['nsems']:
             raise Exception("Number of semaphores mismatch")
@@ -415,23 +413,16 @@ class ipc_sem_set_handler:
         f.seek(round_up(size, sizeof_u64), os.SEEK_CUR)
         return size
 
+    def _get_sem_array(self):
+        s = array.array('H')
+        if s.itemsize != sizeof_u16:
+            raise Exception("Array size mismatch")
+        return s
+
 
 class ipc_msg_queue_handler:
     def load(self, f, pbuff):
-        entry = pb2dict.pb2dict(pbuff)
-        messages = []
-        for x in range(0, entry['qnum']):
-            buf = f.read(4)
-            if len(buf) == 0:
-                break
-            size, = struct.unpack('i', buf)
-            msg = pb.ipc_msg()
-            msg.ParseFromString(f.read(size))
-            rounded = round_up(msg.msize, sizeof_u64)
-            data = f.read(msg.msize)
-            f.seek(rounded - msg.msize, 1)
-            messages.append(pb2dict.pb2dict(msg))
-            messages.append(base64.encodebytes(data).decode('utf-8'))
+        messages, _ = self._read_messages(f, pbuff)
         return messages
 
     def dump(self, extra, f, pbuff):
@@ -443,15 +434,17 @@ class ipc_msg_queue_handler:
             f.write(struct.pack('i', size))
             f.write(msg_str)
             rounded = round_up(msg.msize, sizeof_u64)
-            if (sys.version_info > (3, 0)):
-                data = base64.decodebytes(str.encode(extra[i + 1]))
-            else:
-                data = base64.decodebytes(extra[i + 1])
+            data = decode_base64_data(extra[i + 1])
             f.write(data[:msg.msize])
             f.write(b'\0' * (rounded - msg.msize))
 
     def skip(self, f, pbuff):
+        _, pl_len = self._read_messages(f, pbuff, skip_data=True)
+        return pl_len
+
+    def _read_messages(self, f, pbuff, skip_data=False):
         entry = pb2dict.pb2dict(pbuff)
+        messages = []
         pl_len = 0
         for x in range(0, entry['qnum']):
             buf = f.read(4)
@@ -461,10 +454,17 @@ class ipc_msg_queue_handler:
             msg = pb.ipc_msg()
             msg.ParseFromString(f.read(size))
             rounded = round_up(msg.msize, sizeof_u64)
-            f.seek(rounded, os.SEEK_CUR)
             pl_len += size + msg.msize
 
-        return pl_len
+            if skip_data:
+                f.seek(rounded, os.SEEK_CUR)
+            else:
+                data = f.read(msg.msize)
+                f.seek(rounded - msg.msize, 1)
+                messages.append(pb2dict.pb2dict(msg))
+                messages.append(base64.encodebytes(data).decode('utf-8'))
+
+        return messages, pl_len
 
 
 class ipc_shm_handler:
@@ -560,7 +560,7 @@ handlers = {
     'MEMFD_INODE': entry_handler(pb.memfd_inode_entry),
     'BPFMAP_FILE': entry_handler(pb.bpfmap_file_entry),
     'BPFMAP_DATA': entry_handler(pb.bpfmap_data_entry,
-                                bpfmap_data_extra_handler()),
+                                 bpfmap_data_extra_handler()),
     'APPARMOR': entry_handler(pb.apparmor_entry),
 }
 
@@ -574,12 +574,12 @@ def __rhandler(f):
 
     try:
         m = magic.by_val[img_magic]
-    except:
+    except Exception:
         raise MagicException(img_magic)
 
     try:
         handler = handlers[m]
-    except:
+    except Exception:
         raise Exception("No handler found for image with magic " + m)
 
     return m, handler
@@ -641,7 +641,7 @@ def dump(img, f):
 
     try:
         handler = handlers[m]
-    except:
+    except Exception:
         raise Exception("No handler found for image with such magic")
 
     handler.dump(img['entries'], f)

From 3ca979f9a15019313efb451f72db74f01f24cb4d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 1 Mar 2023 15:47:53 +0000
Subject: [PATCH 1232/1854] coredump: handle long command-lines

This fixes errors with long command-lines:

  File "/home/criu/coredump/criu_coredump/coredump.py", line 320, in _gen_prpsinfo
    prpsinfo.pr_psargs = self._gen_cmdline(pid)
    ^^^^^^^^^^^^^^^^^^
ValueError: bytes too long (88, maximum length 80)

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 coredump/criu_coredump/coredump.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 53b143ec0..e2c56c01c 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -315,7 +315,9 @@ class coredump_generator:
         prpsinfo.pr_ppid = pstree["ppid"]
         prpsinfo.pr_pgrp = pstree["pgid"]
         prpsinfo.pr_sid = pstree["sid"]
-        prpsinfo.pr_psargs = self._gen_cmdline(pid)
+        # prpsinfo.pr_psargs has a limit of 80 characters which means it will
+        # fail here if the cmdline is longer than 80
+        prpsinfo.pr_psargs = self._gen_cmdline(pid)[:80]
         if (sys.version_info > (3, 0)):
             prpsinfo.pr_fname = core["tc"]["comm"].encode()
         else:

From edaec5d762be45fb95af3d3dd4e50b31175f3bb0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 1 Mar 2023 15:48:46 +0000
Subject: [PATCH 1233/1854] coredump: report missing files without a backtrace

New message:

 ERROR: Required file /usr/lib64/libcrypto.so.3.0.1 not found.
 Exiting

Old message:

   File "/home/criu/coredump/criu_coredump/coredump.py", line 693, in _gen_mem_chunk
     f = open(fname, 'rb')
 FileNotFoundError: [Errno 2] No such file or directory: '/usr/lib64/libcrypto.so.3.0.1'

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 coredump/coredump.py               | 8 +++++++-
 coredump/criu_coredump/coredump.py | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/coredump/coredump.py b/coredump/coredump.py
index 5e63d2138..88a1b374c 100644
--- a/coredump/coredump.py
+++ b/coredump/coredump.py
@@ -1,5 +1,6 @@
 import argparse
 import os
+import sys
 
 import criu_coredump
 
@@ -34,7 +35,12 @@ def main():
 
     opts = vars(parser.parse_args())
 
-    coredump(opts)
+    try:
+        coredump(opts)
+    except SystemExit as error:
+        print('ERROR: %s' % error)
+        print('Exiting')
+        sys.exit(1)
 
 
 if __name__ == '__main__':
diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index e2c56c01c..8ee402676 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -692,7 +692,11 @@ class coredump_generator:
             files = self.reg_files
             fname = next(filter(lambda x: x["id"] == shmid, files))["name"]
 
-            f = open(fname, 'rb')
+            try:
+                f = open(fname, 'rb')
+            except FileNotFoundError:
+                sys.exit('Required file %s not found.' % fname)
+
             f.seek(off)
 
         start = vma["start"]

From 1d4777e452e4d8776e6c8431d1c5e41ace0e46fe Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 1 Mar 2023 15:49:29 +0000
Subject: [PATCH 1234/1854] test: add long command-line to coredump test

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/criu-coredump/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index 9b6e56475..eec2b817f 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -5,7 +5,7 @@ set -x
 source ../env.sh || exit 1
 
 function gen_imgs {
-	PID=$(../loop)
+	PID=$(../loop with a very very very very very very very very very very very very long cmdline)
 	if ! $CRIU dump -v4 -o dump.log -D ./ -t "$PID"; then
 		echo "Failed to checkpoint process $PID"
 		cat dump.log

From 2982867185644e0ad5347cfad38dda8b4e0dc69b Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date: Mon, 15 Jul 2019 17:34:13 +0300
Subject: [PATCH 1235/1854] pie/restorer: Fix fd leaking on error path

Nothing serious since OS will close it anyway but still to be precise.

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pie/restorer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index efab729e8..5e78e74d4 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1960,6 +1960,7 @@ long __export_restore_task(struct task_restore_args *args)
 			}
 			if (ret != thread_args[i].pid) {
 				pr_err("Unable to create a thread: %ld\n", ret);
+				sys_close(fd);
 				mutex_unlock(&task_entries_local->last_pid_mutex);
 				goto core_restore_end;
 			}

From 42c4be2a924bfe83e27aef7da76144ad1833f785 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 3 Feb 2023 12:53:00 +0800
Subject: [PATCH 1236/1854] net: use get_legacy_iptables_bin also on restore

Without this we might try to restore iptables legacy images with
iptables nft.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-check.c     |  4 ++--
 criu/include/util.h |  2 +-
 criu/net.c          | 42 ++++++++++++++++++++++++++++++++++++++----
 criu/util.c         | 32 +++++++++++++++++---------------
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index bcbcf3f2b..e4e590c4d 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1193,7 +1193,7 @@ static int check_ipt_legacy(void)
 	char *ipt_legacy_bin;
 	char *ip6t_legacy_bin;
 
-	ipt_legacy_bin = get_legacy_iptables_bin(false);
+	ipt_legacy_bin = get_legacy_iptables_bin(false, false);
 	if (!ipt_legacy_bin) {
 		pr_warn("Couldn't find iptables version which is using iptables legacy API\n");
 		return -1;
@@ -1204,7 +1204,7 @@ static int check_ipt_legacy(void)
 	if (!kdat.ipv6)
 		return 0;
 
-	ip6t_legacy_bin = get_legacy_iptables_bin(true);
+	ip6t_legacy_bin = get_legacy_iptables_bin(true, false);
 	if (!ip6t_legacy_bin) {
 		pr_warn("Couldn't find ip6tables version which is using iptables legacy API\n");
 		return -1;
diff --git a/criu/include/util.h b/criu/include/util.h
index 3a0403113..4b4dfda95 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -384,7 +384,7 @@ static inline void print_stack_trace(pid_t pid)
 
 extern int mount_detached_fs(const char *fsname);
 
-extern char *get_legacy_iptables_bin(bool ipv6);
+extern char *get_legacy_iptables_bin(bool ipv6, bool restore);
 
 extern int set_opts_cap_eff(void);
 
diff --git a/criu/net.c b/criu/net.c
index 755a48377..230cc7433 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2039,10 +2039,10 @@ static inline int dump_iptables(struct cr_imgset *fds)
 	 * and iptables backend is nft to prevent duplicate dumps.
 	 */
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
-	iptables_cmd = get_legacy_iptables_bin(false);
+	iptables_cmd = get_legacy_iptables_bin(false, false);
 
 	if (kdat.ipv6)
-		ip6tables_cmd = get_legacy_iptables_bin(true);
+		ip6tables_cmd = get_legacy_iptables_bin(true, false);
 #endif
 
 	if (!iptables_cmd) {
@@ -2360,9 +2360,19 @@ static int prepare_xtable_lock(void)
 
 static inline int restore_iptables(int pid)
 {
+	char *iptables_cmd = "iptables-restore";
+	char *ip6tables_cmd = "ip6tables-restore";
+	char comm[32];
 	int ret = -1;
 	struct cr_img *img;
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	iptables_cmd = get_legacy_iptables_bin(false, true);
+
+	if (kdat.ipv6)
+		ip6tables_cmd = get_legacy_iptables_bin(true, true);
+#endif
+
 	img = open_image(CR_FD_IPTABLES, O_RSTR, pid);
 	if (img == NULL)
 		return -1;
@@ -2372,7 +2382,19 @@ static inline int restore_iptables(int pid)
 		goto ipt6;
 	}
 
-	ret = run_iptables_tool("iptables-restore -w", img_raw_fd(img), -1);
+	if (!iptables_cmd) {
+		pr_err("Can't restore iptables dump - no legacy version present\n");
+		close_image(img);
+		return -1;
+	}
+
+	if (snprintf(comm, sizeof(comm), "%s -w", iptables_cmd) >= sizeof(comm)) {
+		pr_err("Can't fit '%s -w' to buffer\n", iptables_cmd);
+		close_image(img);
+		return -1;
+	}
+
+	ret = run_iptables_tool(comm, img_raw_fd(img), -1);
 	close_image(img);
 	if (ret)
 		return ret;
@@ -2383,7 +2405,19 @@ ipt6:
 	if (empty_image(img))
 		goto out;
 
-	ret = run_iptables_tool("ip6tables-restore -w", img_raw_fd(img), -1);
+	if (!ip6tables_cmd) {
+		pr_err("Can't restore ip6tables dump - no legacy version present\n");
+		close_image(img);
+		return -1;
+	}
+
+	if (snprintf(comm, sizeof(comm), "%s -w", ip6tables_cmd) >= sizeof(comm)) {
+		pr_err("Can't fit '%s -w' to buffer\n", ip6tables_cmd);
+		close_image(img);
+		return -1;
+	}
+
+	ret = run_iptables_tool(comm, img_raw_fd(img), -1);
 out:
 	close_image(img);
 
diff --git a/criu/util.c b/criu/util.c
index 959e60938..db96cf938 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1594,44 +1594,46 @@ err:
 	return ret;
 }
 
-char *get_legacy_iptables_bin(bool ipv6)
+char *get_legacy_iptables_bin(bool ipv6, bool restore)
 {
-	static char iptables_bin[2][32];
+	static char iptables_bin[2][2][32];
 	/* 0  - means we don't know yet,
 	 * -1 - not present,
 	 * 1  - present.
 	 */
-	static int iptables_present[2] = { 0, 0 };
-	char bins[2][2][32] = { { "iptables-save", "iptables-legacy-save" },
-				{ "ip6tables-save", "ip6tables-legacy-save" } };
+	static int iptables_present[2][2] = { { 0, 0 }, { 0, 0 } };
+	char bins[2][2][2][32] = { { { "iptables-save", "iptables-legacy-save" },
+				     { "iptables-restore", "iptables-legacy-restore" } },
+				   { { "ip6tables-save", "ip6tables-legacy-save" },
+				     { "ip6tables-restore", "ip6tables-legacy-restore" } } };
 	int ret;
 
-	if (iptables_present[ipv6] == -1)
+	if (iptables_present[ipv6][restore] == -1)
 		return NULL;
 
-	if (iptables_present[ipv6] == 1)
-		return iptables_bin[ipv6];
+	if (iptables_present[ipv6][restore] == 1)
+		return iptables_bin[ipv6][restore];
 
-	memcpy(iptables_bin[ipv6], bins[ipv6][0], strlen(bins[ipv6][0]) + 1);
-	ret = is_iptables_nft(iptables_bin[ipv6]);
+	memcpy(iptables_bin[ipv6][restore], bins[ipv6][restore][0], strlen(bins[ipv6][restore][0]) + 1);
+	ret = is_iptables_nft(iptables_bin[ipv6][restore]);
 
 	/*
 	 * iptables on host uses nft backend (or not installed),
 	 * let's try iptables-legacy
 	 */
 	if (ret < 0 || ret == 1) {
-		memcpy(iptables_bin[ipv6], bins[ipv6][1], strlen(bins[ipv6][1]) + 1);
-		ret = is_iptables_nft(iptables_bin[ipv6]);
+		memcpy(iptables_bin[ipv6][restore], bins[ipv6][restore][1], strlen(bins[ipv6][restore][1]) + 1);
+		ret = is_iptables_nft(iptables_bin[ipv6][restore]);
 		if (ret < 0 || ret == 1) {
-			iptables_present[ipv6] = -1;
+			iptables_present[ipv6][restore] = -1;
 			return NULL;
 		}
 	}
 
 	/* we can come here with iptables-save or iptables-legacy-save */
-	iptables_present[ipv6] = 1;
+	iptables_present[ipv6][restore] = 1;
 
-	return iptables_bin[ipv6];
+	return iptables_bin[ipv6][restore];
 }
 
 /*

From 3f8e3220baccf91d8ffd98d7248132b12a3067ac Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 7 Mar 2023 11:04:15 +0000
Subject: [PATCH 1237/1854] CONTRIBUTING.md: document make lint / indent

This patch documents how do we use `make lint` and `make indent` and
adds a note about their integration with CI.

Co-authored-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 CONTRIBUTING.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 864caf93e..87da08b34 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,6 +60,36 @@ When you change the source code, please keep in mind the following code conventi
 Other conventions can be learned from the source code itself. In short, make sure your new code
 looks similar to what is already there.
 
+The following command can be used to automatically run a code linter for Python files (flake8), Shell scripts (shellcheck),
+text spelling (codespell), and a number of CRIU-specific checks (usage of print macros and EOL whitespace for C files).
+
+```
+         make lint
+```
+
+In addition, we have adopted a [clang-format configuration file](https://www.kernel.org/doc/Documentation/process/clang-format.rst)
+based on the kernel source tree. However, compliance with the clang-format autoformat rules is optional. If the automatic code formatting
+results in decreased readability, we may choose to ignore these errors.
+
+Run the following command to check if your changes are compliant with the clang-format rules:
+
+```
+         make indent
+```
+
+This command is built upon the `git-clang-format` tool and supports two options `BASE` and `OPTS`. The `BASE` option allows you to
+specify a range of commits to check for coding style issues. By default, it is set to `HEAD~1`, so that only the last commit is checked.
+If you are developing on top of the criu-dev branch and want to check all your commits for compliance with the clang-format rules, you
+can use `BASE=origin/criu-dev`. The `OPTS` option can be used to pass additional options to `git-clang-format`. For example, if you want
+to check the last *N* commits for formatting errors, without applying the changes to the codebase you can use the following command.
+
+```
+         make indent OPTS=--diff BASE=HEAD~N
+```
+
+Note that for pull requests, the "Run code linter" workflow runs these checks for all commits. If a clang-format error is detected
+we need to review the suggested changes and decide if they should be fixed before merging.
+
 ## Test your changes
 
 CRIU comes with an extensive test suite. To check whether your changes introduce any regressions, run

From 4930c98020f5f13d9e02d891c84a7cf9bd765632 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Tue, 9 Mar 2021 13:24:20 +0000
Subject: [PATCH 1238/1854] x86/xsave: Set only used XFEATURE_* in xstate_bv

Setting all supported by CPU features in xstate_bv may bring it into
dirty-upper-state as documented in specs, resulting in lower
performance. Let's not do this and set only those have been used by
dumpee.

P.S.
Off course it has to be a one-liner!

Fixes: #1171

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/arch/x86/crtools.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index d10e51e48..912a4348b 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -433,7 +433,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 #define assign_array(dst, src, e) memcpy(dst.e, (src)->e, sizeof(dst.e))
 #define assign_xsave(feature, xsave, member, area)                                                                \
 	do {                                                                                                      \
-		if (compel_fpu_has_feature(feature)) {                                                            \
+		if (compel_fpu_has_feature(feature) && (xsave->xstate_bv & (1UL << feature))) {                   \
 			uint32_t off = compel_fpu_feature_offset(feature);                                        \
 			void *to = &area[off];                                                                    \
 			void *from = xsave->member;                                                               \

From 156c8da33c53f680f7455f53e9e7d6003427ca87 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 7 Mar 2023 15:33:59 +0800
Subject: [PATCH 1239/1854] make: disable '-Wdangling-pointer' warning with gcc
 12

The patch is similar to what has been done in linux kernel, as this
warning effectively prevents us from adding list elements to local list
head. See https://github.com/torvalds/linux/commit/49beadbd47c2

Else we have:

    CC       criu/mount.o
  In file included from criu/include/cr_options.h:7,
                   from criu/mount.c:13:
  In function '__list_add',
      inlined from 'list_add' at include/common/list.h:41:2,
      inlined from 'mnt_tree_for_each' at criu/mount.c:1977:2:
  include/common/list.h:35:19: error: storing the address of local variable 'postpone' in
    '((struct list_head *)((char *)start + 8))[24].prev' [-Werror=dangling-pointer=]
     35 |         new->prev = prev;
        |         ~~~~~~~~~~^~~~~~
  criu/mount.c: In function 'mnt_tree_for_each':
  criu/mount.c:1972:19: note: 'postpone' declared here
   1972 |         LIST_HEAD(postpone);
        |                   ^~~~~~~~

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index 24318d692..7d0f2350a 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,15 @@ DEFINES			+= -D_GNU_SOURCE
 
 WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement -Wstrict-prototypes
 
+# -Wdangling-pointer results in false warning when we add a list element to
+# local list head variable. It is false positive because before leaving the
+# function we always check that local list head variable is empty, thus
+# insuring that pointer to it is not dangling anywhere, but gcc can't
+# understand it.
+# Note: There is similar problem with kernel list, where this warning is also
+# disabled: https://github.com/torvalds/linux/commit/49beadbd47c2
+WARNINGS		+= -Wno-dangling-pointer -Wno-unknown-warning-option
+
 CFLAGS-GCOV		:= --coverage -fno-exceptions -fno-inline -fprofile-update=atomic
 export CFLAGS-GCOV
 

From 6e681afb69cb2b5222d127341243fa102d3fb7a7 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Tue, 28 Feb 2023 14:01:19 +0100
Subject: [PATCH 1240/1854] net: fail restore if nftables isn't supported but
 image is present

Fixes: e1c4871 ("net: add nftables c/r")
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/net.c | 53 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 230cc7433..78a5d3daf 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2425,29 +2425,18 @@ out:
 }
 
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
-static inline int restore_nftables(int pid)
+static inline int do_restore_nftables(struct cr_img *img)
 {
-	int ret = -1;
-	struct cr_img *img;
+	int exit_code = -1;
 	struct nft_ctx *nft;
 	off_t img_data_size;
 	char *buf;
 
-	img = open_image(CR_FD_NFTABLES, O_RSTR, pid);
-	if (img == NULL)
-		return -1;
-	if (empty_image(img)) {
-		/* Backward compatibility */
-		pr_info("Skipping nft restore, no image\n");
-		ret = 0;
-		goto image_close_out;
-	}
-
 	if ((img_data_size = img_raw_size(img)) < 0)
-		goto image_close_out;
+		goto out;
 
 	if (read_img_str(img, &buf, img_data_size) < 0)
-		goto image_close_out;
+		goto out;
 
 	nft = nft_ctx_new(NFT_CTX_DEFAULT);
 	if (!nft)
@@ -2465,18 +2454,44 @@ static inline int restore_nftables(int pid)
 #endif
 		goto nft_ctx_free_out;
 
-	ret = 0;
+	exit_code = 0;
 
 nft_ctx_free_out:
 	nft_ctx_free(nft);
 buf_free_out:
 	xfree(buf);
+out:
+	return exit_code;
+}
+#endif
+
+static inline int restore_nftables(int pid)
+{
+	int exit_code = -1;
+	struct cr_img *img;
+
+	img = open_image(CR_FD_NFTABLES, O_RSTR, pid);
+	if (img == NULL)
+		return -1;
+	if (empty_image(img)) {
+		/* Backward compatibility */
+		pr_info("Skipping nft restore, no image\n");
+		exit_code = 0;
+		goto image_close_out;
+	}
+
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	if (!do_restore_nftables(img))
+		exit_code = 0;
+#else
+	pr_err("Unable to restore nftables. CRIU was built without libnftables support\n");
+#endif
+
 image_close_out:
 	close_image(img);
 
-	return ret;
+	return exit_code;
 }
-#endif
 
 int read_net_ns_img(void)
 {
@@ -2805,10 +2820,8 @@ static int prepare_net_ns_second_stage(struct ns_id *ns)
 			ret = restore_rule(nsid);
 		if (!ret)
 			ret = restore_iptables(nsid);
-#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 		if (!ret)
 			ret = restore_nftables(nsid);
-#endif
 	}
 
 	if (!ret)

From 529f29891349eadf89e7ff0c96c208b08cadb89e Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 16 Mar 2023 23:05:46 +0700
Subject: [PATCH 1241/1854] cgroup-v2: make new field is_threaded optional

The new field is_threaded is currently marked as required which causes
backward compatibility problem when using newer CRIU version to restore
dumped image from older version. This commit makes this field optional and
reworks the logic the skip fixing up threaded cgroup controllers if there
is no information in dumped image.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cgroup.c       | 3 ++-
 images/cgroup.proto | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 0c730713a..8243ac6d3 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -930,6 +930,7 @@ static int dump_controllers(CgroupEntry *cg)
 	list_for_each_entry(cur, &cgroups, l) {
 		cg_controller_entry__init(ce);
 
+		ce->has_is_threaded = true;
 		ce->is_threaded = cur->is_threaded;
 		ce->cnames = cur->controllers;
 		ce->n_cnames = cur->n_controllers;
@@ -2002,7 +2003,7 @@ static int cgroupd(int sk)
 			 * process must be in this controller. Main thread has been
 			 * restored, so this thread is in this controller already.
 			 */
-			if (!ctrl->is_threaded)
+			if (!ctrl->has_is_threaded || !ctrl->is_threaded)
 				continue;
 
 			aux_off = ctrl_dir_and_opt(ctrl, aux, sizeof(aux), NULL, 0);
diff --git a/images/cgroup.proto b/images/cgroup.proto
index 5c7d16c6d..02f226835 100644
--- a/images/cgroup.proto
+++ b/images/cgroup.proto
@@ -24,7 +24,7 @@ message cgroup_dir_entry {
 message cg_controller_entry {
 	repeated string			cnames		= 1;
 	repeated cgroup_dir_entry	dirs		= 2;
-	required bool			is_threaded	= 3;
+	optional bool			is_threaded	= 3;
 }
 
 message cg_member_entry {

From 69befdde1858cbc1235096f21955ccefa4191b00 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Thu, 16 Mar 2023 23:09:18 +0700
Subject: [PATCH 1242/1854] cgroup-v2: make new field cg_set optional

The new field cg_set is currently marked as required which causes backward
compatibility problem when using newer CRIU version to restore dumped image
from older version. This commit makes this field optional and reworks the
logic to fallback to use cg_set from task_core when it is not in
thread_core.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/cr-dump.c    |  2 ++
 criu/cr-restore.c | 12 ++++++++----
 images/core.proto |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 249c02226..1c1962e8f 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -811,6 +811,7 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 			goto err;
 	}
 
+	core->thread_core->has_cg_set = true;
 	cg_set = &core->thread_core->cg_set;
 	ret = dump_thread_cgroup(item, cg_set, info, -1);
 	if (ret)
@@ -1436,6 +1437,7 @@ static int dump_task_cgroup(struct parasite_ctl *parasite_ctl, const struct pstr
 				return -1;
 		}
 
+		core->thread_core->has_cg_set = true;
 		if (dump_thread_cgroup(item, &core->thread_core->cg_set, info, i))
 			return -1;
 	}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 195fa5639..f02e95f6d 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1354,10 +1354,14 @@ static inline int fork_with_pid(struct pstree_item *item)
 		 * Zombie tasks' cgroup is not dumped/restored.
 		 * cg_set == 0 is skipped in prepare_task_cgroup()
 		 */
-		if (item->pid->state == TASK_DEAD)
+		if (item->pid->state == TASK_DEAD) {
 			rsti(item)->cg_set = 0;
-		else
-			rsti(item)->cg_set = ca.core->thread_core->cg_set;
+		} else {
+			if (ca.core->thread_core->has_cg_set)
+				rsti(item)->cg_set = ca.core->thread_core->cg_set;
+			else
+				rsti(item)->cg_set = ca.core->tc->cg_set;
+		}
 
 		if (ca.core->tc->has_stop_signo)
 			item->pid->stop_signo = ca.core->tc->stop_signo;
@@ -3824,7 +3828,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 		thread_args[i].clear_tid_addr = CORE_THREAD_ARCH_INFO(tcore)->clear_tid_addr;
 		core_get_tls(tcore, &thread_args[i].tls);
 
-		if (rsti(current)->cg_set != tcore->thread_core->cg_set) {
+		if (tcore->thread_core->has_cg_set && rsti(current)->cg_set != tcore->thread_core->cg_set) {
 			thread_args[i].cg_set = tcore->thread_core->cg_set;
 			thread_args[i].cgroupd_sk = dup(get_service_fd(CGROUPD_SK));
 		} else {
diff --git a/images/core.proto b/images/core.proto
index bc8b7a488..eddd1dc55 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -106,7 +106,7 @@ message thread_core_entry {
 	optional string			comm		= 13;
 	optional uint64			blk_sigset_extended	= 14;
 	optional rseq_entry		rseq_entry	= 15;
-	required uint32			cg_set		= 16;
+	optional uint32			cg_set		= 16;
 }
 
 message task_rlimits_entry {

From 7cae16e971c7ba9b3c39230c168f728741156994 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 20 Jul 2020 13:32:42 +0300
Subject: [PATCH 1243/1854] mount: do collect_mntinfo of external mount
 namespace with no for_dump

When we collect external mount namespace we don't want to dump mounts in
it, so lets remove this flag. This way we can e.g. use for_dump in
->parse() callbacks to separate in-container mounts from others.

This only affects rare case of `--ext-mount-map auto` but to be
absolutely correct let's fix it anyway.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 3369fea34..db9db63b2 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -826,7 +826,7 @@ static struct ns_id *find_ext_ns_id(void)
 
 	for (ns = ns_ids; ns->next; ns = ns->next)
 		if (ns->type == NS_CRIU && ns->nd == &mnt_ns_desc) {
-			if (!ns->mnt.mntinfo_list && !collect_mntinfo(ns, true))
+			if (!ns->mnt.mntinfo_list && !collect_mntinfo(ns, false))
 				break;
 			return ns;
 		}

From 34e2b022198c08aab83d5f569221ff1b4c2203da Mon Sep 17 00:00:00 2001
From: KKrypt <sankalpacharya1211@gmail.com>
Date: Wed, 15 Mar 2023 12:32:37 +0530
Subject: [PATCH 1244/1854] Optimized shell code with <'s (instead of cat + |)

This patch optimizes shell code as reading a single file as input using a 'cat' command to a program.

It is considered to be a Useless Use of Cat (UUOC).

It's more efficient to simply use redirection.

However, in some cases, even using the redirection operator '<' seems unnecessary.

Signed-off-by: KKrypt <sankalpacharya1211@gmail.com>
---
 test/jenkins/criu-fault.sh                        | 2 +-
 test/others/mem-snap/run-predump-2.sh             | 2 +-
 test/others/mem-snap/run-predump.sh               | 2 +-
 test/others/mem-snap/run-snap-auto-dedup.sh       | 2 +-
 test/others/mem-snap/run-snap-dedup-on-restore.sh | 2 +-
 test/others/mem-snap/run-snap-dedup.sh            | 2 +-
 test/others/mem-snap/run-snap-maps04.sh           | 2 +-
 test/others/mem-snap/run-snap.sh                  | 2 +-
 test/others/mounts/mounts.sh                      | 2 +-
 test/others/mounts/run.sh                         | 4 ++--
 test/others/ns_ext/run.sh                         | 4 ++--
 test/others/ns_ext/run_pidns.sh                   | 4 ++--
 test/others/unix-callback/run.sh                  | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index f41073230..7f503e817 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -9,7 +9,7 @@ prep
 ./test/zdtm.py run -t zdtm/static/maps00 --fault 3 --report report -f h || fail
 
 # FIXME: fhandles looks broken on btrfs
-cat /proc/self/mountinfo | grep -P "/.* / " | grep -q btrfs || NOBTRFS=$?
+grep -P "/.* / " /proc/self/mountinfo | grep -q btrfs || NOBTRFS=$?
 if [ $NOBTRFS -eq 1 ] ; then
 	./test/zdtm.py run -t zdtm/static/inotify_irmap --fault 128 --pre 2 -f uns || fail
 fi
diff --git a/test/others/mem-snap/run-predump-2.sh b/test/others/mem-snap/run-predump-2.sh
index 46af8063b..5ef1422b4 100755
--- a/test/others/mem-snap/run-predump-2.sh
+++ b/test/others/mem-snap/run-predump-2.sh
@@ -28,7 +28,7 @@ function stop_test {
 	wtime=1
 	cd ../../zdtm/static/
 	make maps04.stop
-	cat maps04.out | fgrep PASS || fail "Test failed"
+	fgrep PASS maps04.out || fail "Test failed"
 	echo "OK"
 }
 
diff --git a/test/others/mem-snap/run-predump.sh b/test/others/mem-snap/run-predump.sh
index d06d2d8fc..06ba74737 100755
--- a/test/others/mem-snap/run-predump.sh
+++ b/test/others/mem-snap/run-predump.sh
@@ -72,6 +72,6 @@ ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to r
 
 cd ../../zdtm/static/
 make mem-touch.stop
-cat mem-touch.out | fgrep PASS || fail "Test failed"
+fgrep PASS mem-touch.out || fail "Test failed"
 
 echo "Test PASSED"
diff --git a/test/others/mem-snap/run-snap-auto-dedup.sh b/test/others/mem-snap/run-snap-auto-dedup.sh
index f77aa1fcb..a3801f5b4 100755
--- a/test/others/mem-snap/run-snap-auto-dedup.sh
+++ b/test/others/mem-snap/run-snap-auto-dedup.sh
@@ -84,7 +84,7 @@ ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to r
 
 cd ../../zdtm/static/
 make mem-touch.stop
-cat mem-touch.out | fgrep PASS || fail "Test failed"
+fgrep PASS mem-touch.out || fail "Test failed"
 
 if [[ $dedup_ok_2 -ne 0 || $dedup_ok_1 -ne 0 ]]; then
 	fail "Dedup test failed"
diff --git a/test/others/mem-snap/run-snap-dedup-on-restore.sh b/test/others/mem-snap/run-snap-dedup-on-restore.sh
index 6ae050bc7..5dbb5bf44 100755
--- a/test/others/mem-snap/run-snap-dedup-on-restore.sh
+++ b/test/others/mem-snap/run-snap-dedup-on-restore.sh
@@ -78,7 +78,7 @@ fi
 
 cd ../../zdtm/static/
 make mem-touch.stop
-cat mem-touch.out | fgrep PASS || fail "Test failed"
+fgrep PASS mem-touch.out || fail "Test failed"
 
 if [ $restore_dedup_ok -ne 0 ]; then
 	fail "Dedup test failed"
diff --git a/test/others/mem-snap/run-snap-dedup.sh b/test/others/mem-snap/run-snap-dedup.sh
index 27fcd55a9..40db95325 100755
--- a/test/others/mem-snap/run-snap-dedup.sh
+++ b/test/others/mem-snap/run-snap-dedup.sh
@@ -90,7 +90,7 @@ ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to r
 
 cd ../../zdtm/static/
 make mem-touch.stop
-cat mem-touch.out | fgrep PASS || fail "Test failed"
+fgrep PASS mem-touch.out || fail "Test failed"
 
 if [[ $dedup_ok_2 -ne 0 || $dedup_ok_1 -ne 0 ]]; then
 	fail "Dedup test failed"
diff --git a/test/others/mem-snap/run-snap-maps04.sh b/test/others/mem-snap/run-snap-maps04.sh
index 2def909d9..267d51deb 100755
--- a/test/others/mem-snap/run-snap-maps04.sh
+++ b/test/others/mem-snap/run-snap-maps04.sh
@@ -58,7 +58,7 @@ ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log --auto-dedup -d -v4 || fa
 make -C ../../zdtm/static/ maps04.stop
 sleep 1
 
-cat "../zdtm/static/maps04.out" | fgrep PASS || fail "Test failed"
+fgrep PASS "../zdtm/static/maps04.out" || fail "Test failed"
 
 size=$(du -sh -BK  dump/1/pages-*.img | grep -Eo '[0-9]+' | head -1)
 if [ $size -ne 0 ] ; then
diff --git a/test/others/mem-snap/run-snap.sh b/test/others/mem-snap/run-snap.sh
index b97bd295e..c91cd0098 100755
--- a/test/others/mem-snap/run-snap.sh
+++ b/test/others/mem-snap/run-snap.sh
@@ -69,6 +69,6 @@ ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to r
 
 cd ../../zdtm/static/
 make mem-touch.stop
-cat mem-touch.out | fgrep PASS || fail "Test failed"
+fgrep PASS mem-touch.out || fail "Test failed"
 
 echo "Test PASSED"
diff --git a/test/others/mounts/mounts.sh b/test/others/mounts/mounts.sh
index 19116d0cf..51ea69540 100755
--- a/test/others/mounts/mounts.sh
+++ b/test/others/mounts/mounts.sh
@@ -12,7 +12,7 @@ cd $INMNTNS
 
 mount --make-rprivate /
 
-for i in `cat /proc/self/mounts | awk '{ print $2 }'`; do
+for i in `awk '{ print $2 }' < /proc/self/mounts`; do
 	[ '/' = "$i" ] && continue
 	[ '/proc' = "$i" ] && continue
 	[ '/dev' = "$i" ] && continue
diff --git a/test/others/mounts/run.sh b/test/others/mounts/run.sh
index 35927fb5e..d665a726a 100755
--- a/test/others/mounts/run.sh
+++ b/test/others/mounts/run.sh
@@ -12,12 +12,12 @@ kill -0 $pid || exit
 cat /proc/$pid/mountinfo | sort -k 4
 echo "Suspend server"
 ${CRIU} dump -D dump -o dump.log -t $pid -v4 || {
-	cat dump/dump.log | grep Error
+	grep Error dump/dump.log
 	exit 1
 }
 echo "Resume server"
 ${CRIU} restore -d -D dump -o restore.log -v4 || {
-	cat dump/dump.log | grep Error
+	grep Error dump/dump.log 
 	exit 1
 }
 cat /proc/$pid/mountinfo | sort -k 4
diff --git a/test/others/ns_ext/run.sh b/test/others/ns_ext/run.sh
index 2e9a6fe86..e416f95e5 100755
--- a/test/others/ns_ext/run.sh
+++ b/test/others/ns_ext/run.sh
@@ -61,7 +61,7 @@ exec 33< $MNT1
 exec 34< $MNT2
 $CRIU dump -v4 -t $pid -o dump.log -D images --external $NS[$ino]:test_ns --external $NS[$ino2]:test_ns2
 RESULT=$?
-cat images/dump.log | grep -B 5 Error || echo ok
+grep -B 5 Error images/dump.log || echo ok
 [ "$RESULT" != "0" ] && {
 	echo "CRIU dump failed"
 	echo FAIL
@@ -70,7 +70,7 @@ cat images/dump.log | grep -B 5 Error || echo ok
 
 $CRIU restore -v4 -o restore.log -D images --inherit-fd fd[33]:test_ns --inherit-fd fd[34]:test_ns2 -d
 RESULT=$?
-cat images/restore.log | grep -B 5 Error || echo ok
+grep -B 5 Error images/restore.log || echo ok
 [ "$RESULT" != "0" ] && {
 	echo "CRIU restore failed"
 	echo FAIL
diff --git a/test/others/ns_ext/run_pidns.sh b/test/others/ns_ext/run_pidns.sh
index 7ac855a18..08c5bff8e 100755
--- a/test/others/ns_ext/run_pidns.sh
+++ b/test/others/ns_ext/run_pidns.sh
@@ -36,7 +36,7 @@ mkdir -p images_pidns
 echo "$CRIU dump -v4 -o dump.log -t $PID -D images_pidns --external $PIDNS:exti"
 $CRIU dump -v4 -o dump.log -t $PID -D images_pidns --external $PIDNS:exti
 RESULT=$?
-cat images_pidns/dump.log | grep -B 5 Error || echo ok
+grep -B 5 Error images_pidns/dump.log || echo ok
 [ "$RESULT" != "0" ] && {
 	echo "CRIU dump failed"
 	echo FAIL
@@ -48,7 +48,7 @@ exec {pidns_fd}< /proc/self/ns/pid
 echo "$CRIU restore -v4 -o restore.log -D images_pidns --restore-detached --inherit-fd fd[$pidns_fd]:exti"
 $CRIU restore -v4 -o restore.log -D images_pidns --restore-detached --inherit-fd fd[$pidns_fd]:exti --pidfile test.pidfile
 RESULT=$?
-cat images_pidns/restore.log | grep -B 5 Error || echo ok
+grep -B 5 Error images_pidns/restore.log || echo ok
 [ "$RESULT" != "0" ] && {
 	echo "CRIU restore failed"
 	echo FAIL
diff --git a/test/others/unix-callback/run.sh b/test/others/unix-callback/run.sh
index ec5b7f54e..b15daa289 100755
--- a/test/others/unix-callback/run.sh
+++ b/test/others/unix-callback/run.sh
@@ -40,7 +40,7 @@ done
 ${CRIU} restore -D data -o restore.log -v4 --lib `pwd`/lib -d || exit 1
 kill $pid
 while :; do
-	cat output | grep PASS && break
+	grep PASS output && break
 	sleep 1
 done
 

From 65407616e0870d8d5d34b934157be500e0dd0661 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 15 Mar 2023 12:20:47 +0000
Subject: [PATCH 1245/1854] ci/archlinux: initialize machine ID

When installing packages within Archlinux container, pacman fails with
the following errors:

(3/7) Creating temporary files...
/usr/lib/tmpfiles.d/journal-nocow.conf:26: Failed to replace specifiers in '/var/log/journal/%m': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:23: Failed to replace specifiers in '/run/log/journal/%m': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:25: Failed to replace specifiers in '/run/log/journal/%m': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:26: Failed to replace specifiers in '/run/log/journal/%m/*.journal*': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:29: Failed to replace specifiers in '/var/log/journal/%m': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:30: Failed to replace specifiers in '/var/log/journal/%m/system.journal': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:32: Failed to replace specifiers in '/var/log/journal/%m': No such file or directory
/usr/lib/tmpfiles.d/systemd.conf:33: Failed to replace specifiers in '/var/log/journal/%m/system.journal': No such file or directory

To solve this problem we need to initialize the machine ID.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.archlinux | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index d226244ee..ce2a38bd4 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -2,6 +2,9 @@ FROM docker.io/library/archlinux:latest
 
 ARG CC=gcc
 
+# Initialize machine ID
+RUN systemd-machine-id-setup
+
 RUN pacman -Syu --noconfirm \
 	$CC \
 	bash \

From 12423abdb5849c9214a4987221856820aad97f9f Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 22 Mar 2023 15:08:23 +0800
Subject: [PATCH 1246/1854] mount: allow bindmounts for external fuse mounts

Currently we only allow external fuse mount itself, let's allow
bindmount for it too. Other mount code is ready for this change and will
be able to bindmount it from corresponding external mount.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/filesystems.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/filesystems.c b/criu/filesystems.c
index 890d5d06d..093e1c492 100644
--- a/criu/filesystems.c
+++ b/criu/filesystems.c
@@ -547,7 +547,8 @@ static int fusectl_dump(struct mount_info *pm)
 		}
 
 		for (it = mntinfo; it; it = it->next) {
-			if (it->fstype->code == FSTYPE__FUSE && id == kdev_minor(it->s_dev) && !it->external) {
+			if (it->fstype->code == FSTYPE__FUSE && id == kdev_minor(it->s_dev) &&
+			    !mnt_is_external_bind(it)) {
 				pr_err("%s is a fuse mount but not external\n", it->ns_mountpoint);
 				goto out;
 			}

From a0158e6927a20a51f5ead8ecfebed9b82b1740c6 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 20 Mar 2023 11:33:37 +0800
Subject: [PATCH 1247/1854] zdtm: add MNTNS_ZDTM macro to fix initialization

With this macro we can easily declare struct mntns_zdtm variables with
all lists properly initiallized. Let's use it in mount_complex_sharing
as without it we can have segfault on error path when accessing
uninitialized list pointers.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/mountinfo.h                | 8 ++++++++
 test/zdtm/static/mount_complex_sharing.c | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/lib/mountinfo.h b/test/zdtm/lib/mountinfo.h
index b5a8f5bcd..6d90e2c10 100644
--- a/test/zdtm/lib/mountinfo.h
+++ b/test/zdtm/lib/mountinfo.h
@@ -24,6 +24,14 @@ struct mntns_zdtm {
 	struct list_head sharing_groups_list;
 };
 
+#define MNTNS_ZDTM_INIT(name)                                                    \
+	{                                                                        \
+		.mountinfo_list = LIST_HEAD_INIT(name.mountinfo_list),           \
+		.topology_list = LIST_HEAD_INIT(name.topology_list),             \
+		.sharing_groups_list = LIST_HEAD_INIT(name.sharing_groups_list), \
+	}
+#define MNTNS_ZDTM(name) struct mntns_zdtm name = MNTNS_ZDTM_INIT(name)
+
 struct sharing_group {
 	int shared_id;
 	int master_id;
diff --git a/test/zdtm/static/mount_complex_sharing.c b/test/zdtm/static/mount_complex_sharing.c
index c6402d646..5f247a8e4 100644
--- a/test/zdtm/static/mount_complex_sharing.c
+++ b/test/zdtm/static/mount_complex_sharing.c
@@ -212,7 +212,8 @@ static int mount_loop(void)
 
 int main(int argc, char **argv)
 {
-	struct mntns_zdtm mntns_before, mntns_after;
+	MNTNS_ZDTM(mntns_before);
+	MNTNS_ZDTM(mntns_after);
 	int ret = 1;
 
 	test_init(argc, argv);

From 66fd45d51d4d74453507848ee4783fb0bbce818a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 17 Aug 2020 14:27:36 +0300
Subject: [PATCH 1248/1854] sk-unix: add some missed error printing

In Virtuozzo tests we have seen uninformative errors:

(26.575039) 151187 fdinfo 6: pos: 0 flags: 2/0
(26.575076) sockets: Searching for socket 0x346d1 family 1
(666.230281 ----------------------------------------
(666.230586 Error (criu/cr-dump.c:1850): Dump files (pid: 151187) failed
with -1

So let's add some error messages to this stack.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 5c0f57523..66034df65 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -595,12 +595,14 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 	else
 		ns = lookup_ns_by_id(root_item->ids->mnt_ns_id, &mnt_ns_desc);
 	if (!ns) {
+		pr_err("Failed to lookup ns by mnt id %d\n", ue->mnt_id);
 		ret = -ENOENT;
 		goto out;
 	}
 
 	mntns_root = mntns_get_root_fd(ns);
 	if (mntns_root < 0) {
+		pr_err("Failed to lookup mntns root for ns %d\n", ns->id);
 		ret = -ENOENT;
 		goto out;
 	}

From bd0f209c2bdaa24c86544f1e71fe4ff41599b70a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Mar 2023 10:34:54 +0800
Subject: [PATCH 1249/1854] pstree: improve id intersection detection in
 prepare_pstree_for_shell_job

First, let's move lookup_create_item-s to the end so that on pgid
replacement we don't have false positive pstree_pid_by_virt check
founding item created by sid replacement. (note: we need those
lookup_create_item-s for the sake of free pid selection mechanism)

Second, let's add checks for sid/pgid in images intersecting with
current_sid/pgid, as this would also bring problems on restore.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pstree.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/criu/pstree.c b/criu/pstree.c
index 72c4a3502..8c44e7134 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -381,20 +381,26 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 		}
 
 		for_each_pstree_item(pi) {
+			if (pi->sid == current_sid) {
+				pr_err("Current sid %d intersects with sid of (%d) in images\n", current_sid, vpid(pi));
+				return -1;
+			}
 			if (pi->sid == old_sid)
 				pi->sid = current_sid;
 
+			if (pi->pgid == current_sid) {
+				pr_err("Current sid %d intersects with pgid of (%d) in images\n", current_sid,
+				       vpid(pi));
+				return -1;
+			}
 			if (pi->pgid == old_sid)
 				pi->pgid = current_sid;
 		}
-
-		if (lookup_create_item(current_sid) == NULL)
-			return -1;
 	}
 
 	/* root_item is a group leader */
 	if (root_item->pgid == vpid(root_item))
-		return 0;
+		goto add_fake_session_leader;
 
 	old_gid = root_item->pgid;
 	if (old_gid != current_gid) {
@@ -407,14 +413,21 @@ static int prepare_pstree_for_shell_job(pid_t pid)
 		}
 
 		for_each_pstree_item(pi) {
+			if (current_gid != current_sid && pi->pgid == current_gid) {
+				pr_err("Current gid %d intersects with pgid of (%d) in images\n", current_gid,
+				       vpid(pi));
+				return -1;
+			}
 			if (pi->pgid == old_gid)
 				pi->pgid = current_gid;
 		}
-
-		if (lookup_create_item(current_gid) == NULL)
-			return -1;
 	}
 
+	if (old_gid != current_gid && !lookup_create_item(current_gid))
+		return -1;
+add_fake_session_leader:
+	if (old_sid != current_sid && !lookup_create_item(current_sid))
+		return -1;
 	return 0;
 }
 

From 7f0f07599a680258092a7790fb3046856f486f2f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 4 Dec 2022 16:27:09 +0000
Subject: [PATCH 1250/1854] crit: fix compatibility with Python 3.12

Python 3.12 includes a few breaking changes, such as the removal of the
distutils module [1] and the deprecation of `setup.py install` in
favour of pip install [2]. This patch updates the installation script
for crit to reflect these changes by replacing the use of
`setup.py install` with `pip install` and `distutils` with
`setuptools`. In addition, a minimal pyproject.toml file has
been added as it is required by the new version of pip [3].

It is worth noting that with this change we are switching from the egg
packaging format to wheel [4] and add pip as a build dependency.

[1] https://www.python.org/downloads/release/python-3120a2/
[2] https://github.com/pypa/setuptools/pull/2824
[3] https://pip.pypa.io/en/stable/reference/build-system/pyproject-toml/
[4] https://packaging.python.org/en/latest/discussions/wheel-vs-egg/

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                              |  4 +-
 .gitignore                               |  1 -
 Makefile                                 |  3 +-
 crit/.gitignore                          |  2 +
 crit/pyproject.toml                      |  2 +
 crit/setup.py                            | 29 +++++++++++
 lib/Makefile                             | 12 ++---
 scripts/build/Dockerfile.alpine          |  1 +
 scripts/build/Dockerfile.archlinux       |  1 +
 scripts/ci/prepare-for-fedora-rawhide.sh |  2 +
 scripts/ci/run-ci-tests.sh               |  2 +-
 scripts/ci/vagrant.sh                    |  2 +-
 scripts/crit-setup.py                    | 25 ---------
 scripts/uninstall_module.py              | 65 ++++++++++++++++++++++++
 14 files changed, 114 insertions(+), 37 deletions(-)
 create mode 100644 crit/.gitignore
 create mode 100644 crit/pyproject.toml
 create mode 100644 crit/setup.py
 delete mode 100644 scripts/crit-setup.py
 create mode 100755 scripts/uninstall_module.py

diff --git a/.cirrus.yml b/.cirrus.yml
index 914ceb72c..bd4799fd0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -36,7 +36,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-future python-protobuf python-junit_xml python-flake8 xmlto
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-future python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed.
     # The Cirrus CI user runs as a service from selinux point of view and is
@@ -108,7 +108,7 @@ task:
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || :
     yum install -y dnf-plugins-core
     yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf python3-junit_xml xmlto
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf python3-importlib-metadata python3-junit_xml xmlto
     alternatives --set python /usr/bin/python3
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed
diff --git a/.gitignore b/.gitignore
index 23894d631..1ea828bbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@ criu/pie/parasite-blob.h
 criu/protobuf-desc-gen.h
 lib/build/
 lib/c/criu.pc
-lib/.crit-setup.files
 compel/include/asm
 include/common/asm
 include/common/config.h
diff --git a/Makefile b/Makefile
index 7d0f2350a..8061a42c4 100644
--- a/Makefile
+++ b/Makefile
@@ -428,7 +428,8 @@ lint:
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/images.py
 	flake8 --config=scripts/flake8.cfg scripts/criu-ns
-	flake8 --config=scripts/flake8.cfg scripts/crit-setup.py
+	flake8 --config=scripts/flake8.cfg crit/setup.py
+	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
 	flake8 --config=scripts/flake8.cfg coredump/
 	shellcheck --version
 	shellcheck scripts/*.sh
diff --git a/crit/.gitignore b/crit/.gitignore
new file mode 100644
index 000000000..810661179
--- /dev/null
+++ b/crit/.gitignore
@@ -0,0 +1,2 @@
+crit.egg-info/
+build/
diff --git a/crit/pyproject.toml b/crit/pyproject.toml
new file mode 100644
index 000000000..b1e1a4650
--- /dev/null
+++ b/crit/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools"]
diff --git a/crit/setup.py b/crit/setup.py
new file mode 100644
index 000000000..1aaa73a13
--- /dev/null
+++ b/crit/setup.py
@@ -0,0 +1,29 @@
+import os
+from setuptools import setup, find_packages
+
+
+def get_version():
+    version = '0.0.1'
+    env = os.environ
+    if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
+        version = '{}.{}'.format(
+            env['CRIU_VERSION_MAJOR'],
+            env['CRIU_VERSION_MINOR']
+        )
+        if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
+            version += '.' + env['CRIU_VERSION_SUBLEVEL']
+    return version
+
+
+setup(
+    name='crit',
+    version=get_version(),
+    description='CRiu Image Tool',
+    author='CRIU team',
+    author_email='criu@openvz.org',
+    license='GPLv2',
+    url='https://github.com/checkpoint-restore/criu',
+    packages=find_packages('.'),
+    scripts=['crit'],
+    install_requires=[],
+)
diff --git a/lib/Makefile b/lib/Makefile
index 575a7bad3..ff540fb75 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,10 +2,6 @@ CRIU_SO			:= libcriu.so
 CRIU_A			:= libcriu.a
 UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h
 
-#
-# File to keep track of files installed by setup.py
-CRIT_SETUP_FILES	:= lib/.crit-setup.files
-
 all-y	+= lib-c lib-a lib-py
 
 #
@@ -58,8 +54,10 @@ install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in
 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
 	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ifeq ($(PYTHON),python3)
 	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
+	$(Q) $(PYTHON) -m pip install --upgrade --force-reinstall --prefix=$(DESTDIR)$(PREFIX) ./crit
+endif
 .PHONY: install
 
 uninstall:
@@ -71,6 +69,8 @@ uninstall:
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/criu/,$(notdir $(UAPI_HEADERS)))
 	$(E) " UNINSTALL" pkgconfig/criu.pc
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBDIR)/pkgconfig/,criu.pc)
+ifeq ($(PYTHON),python3)
 	$(E) " UNINSTALL" crit
-	$(Q) while read -r file; do $(RM) "$$file"; done < $(CRIT_SETUP_FILES)
+	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+endif
 .PHONY: uninstall
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 19b08315f..af1858ab5 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -40,6 +40,7 @@ RUN apk add \
 	e2fsprogs \
 	py-yaml \
 	py3-flake8 \
+	py3-importlib-metadata \
 	asciidoctor
 
 # The rpc test cases are running as user #1000, let's add the user
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index ce2a38bd4..f2bce1e5b 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -34,6 +34,7 @@ RUN pacman -Syu --noconfirm \
 	flake8 \
 	asciidoctor \
 	python-junit-xml \
+	python-importlib-metadata \
 	diffutils
 
 COPY . /criu
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index f4d3155f9..7c62aaaa2 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -27,6 +27,8 @@ dnf install -y \
 	python3-future \
 	python3-protobuf \
 	python3-junit_xml \
+	python3-pip \
+	python3-importlib-metadata \
 	python-unversioned-command \
 	redhat-rpm-config \
 	sudo \
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 5b9f6d929..229de97c1 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -6,7 +6,7 @@ CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
 		libnl-route-3-dev time flake8 libbsd-dev python3-yaml
 		libperl-dev pkg-config python3-future python3-protobuf
-		python3-junit.xml)
+		python3-pip python3-importlib-metadata python3-junit.xml)
 
 X86_64_PKGS=(gcc-multilib)
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index f0996b01d..5cc842442 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -38,7 +38,7 @@ setup() {
 	ssh default sudo dnf upgrade -y
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
-		protobuf-devel python3-flake8 python3-future python3-protobuf \
+		protobuf-devel python3-flake8 python3-future python3-protobuf python3-importlib-metadata \
 		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel libbpf-devel
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py
deleted file mode 100644
index 13df03e3b..000000000
--- a/scripts/crit-setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import os
-from distutils.core import setup
-
-criu_version = "0.0.1"
-env = os.environ
-
-if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
-    criu_version = '{}.{}'.format(
-        env['CRIU_VERSION_MAJOR'],
-        env['CRIU_VERSION_MINOR']
-    )
-
-    if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
-        criu_version += '.' + env['CRIU_VERSION_SUBLEVEL']
-
-setup(name="crit",
-      version=criu_version,
-      description="CRiu Image Tool",
-      author="CRIU team",
-      author_email="criu@openvz.org",
-      license="GPLv2",
-      url="https://github.com/checkpoint-restore/criu",
-      package_dir={'pycriu': 'lib/py'},
-      packages=["pycriu", "pycriu.images"],
-      scripts=["crit/crit"])
diff --git a/scripts/uninstall_module.py b/scripts/uninstall_module.py
new file mode 100755
index 000000000..439fca18a
--- /dev/null
+++ b/scripts/uninstall_module.py
@@ -0,0 +1,65 @@
+#!/usr/bin/python3
+"""
+`pip uninstall` doesn't support `--prefix`.
+https://github.com/pypa/pip/issues/11213
+"""
+import argparse
+import os
+import shutil
+import site
+import subprocess
+import sys
+
+import importlib_metadata
+
+
+def add_site_dir(prefix: str):
+    """
+    Add site directory with prefix to sys.path and update PYTHONPATH.
+    """
+    # If prefix is used, we need to make sure that we
+    # do not uninstall other packages from the system paths.
+    sys.path = []
+    site.PREFIXES = [prefix]
+    pkgs = site.getsitepackages()
+    for path in pkgs:
+        site.addsitedir(path)
+        if 'dist-packages' in path:
+            # Ubuntu / Debian might use both dist- and site- packages.
+            site.addsitedir(path.replace('dist-packages', 'site-packages'))
+    os.environ['PYTHONPATH'] = os.pathsep.join(sys.path)
+
+
+def uninstall_module(package_name: str, prefix=None):
+    """
+    Enable support for '--prefix' with 'pip uninstall'.
+    """
+    dist_info_path = None
+    if prefix:
+        add_site_dir(prefix)
+        try:
+            dist_info_path = str(importlib_metadata.distribution(package_name)._path)
+        except importlib_metadata.PackageNotFoundError:
+            print(f"Skipping {package_name} as it is not installed.")
+            sys.exit(0)
+
+    command = [sys.executable, '-m', 'pip', 'uninstall', '-y', package_name]
+    try:
+        subprocess.check_call(command, env=os.environ)
+        if dist_info_path and os.path.isdir(dist_info_path):
+            # .dist-info files are not cleaned up when the package
+            # has been installed with --prefix.
+            # https://github.com/pypa/pip/issues/5573
+            shutil.rmtree(dist_info_path)
+            if 'dist-packages' in dist_info_path:
+                shutil.rmtree(dist_info_path.replace('dist-packages', 'site-packages'))
+    except subprocess.CalledProcessError as err:
+        print(f'Error uninstalling package {package_name}: {err}')
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('module_name', help='The name of the module to uninstall')
+    parser.add_argument('--prefix', help='The prefix where the module was installed')
+    args = parser.parse_args()
+    uninstall_module(args.module_name, args.prefix)

From 8e6fa9c3b9cd5575c5e907314a8dbf8afbd26a57 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Date: Thu, 21 Jun 2018 13:09:18 +0300
Subject: [PATCH 1251/1854] net: Add net log prefix

For better logging.

Signed-off-by: Cyrill Gorcunov <gorcunov@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/net.c b/criu/net.c
index 78a5d3daf..2793b18e6 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -51,6 +51,9 @@
 #include "images/netdev.pb-c.h"
 #include "images/inventory.pb-c.h"
 
+#undef LOG_PREFIX
+#define LOG_PREFIX "net: "
+
 #ifndef IFLA_NEW_IFINDEX
 #define IFLA_NEW_IFINDEX 49
 #endif

From ccc790d5404efceee387bde2ab76e18419a23516 Mon Sep 17 00:00:00 2001
From: Yuriy Vasiliev <yuriy.vasiliev@virtuozzo.com>
Date: Thu, 2 Dec 2021 11:32:01 +0100
Subject: [PATCH 1252/1854] zdtm/lib: fix cwd path freeing

Fix cwd freeing on error path in get_cwd_check_perm and
on non-error-path in unix_fill_sock_name.

v2: use cleanup_free attribute in unix_fill_sock_name

Signed-off-by: Yuriy Vasiliev <yuriy.vasiliev@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/fs.c   | 1 +
 test/zdtm/lib/unix.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/lib/fs.c b/test/zdtm/lib/fs.c
index 7b8be5f9f..bf8cd9cd3 100644
--- a/test/zdtm/lib/fs.c
+++ b/test/zdtm/lib/fs.c
@@ -108,6 +108,7 @@ int get_cwd_check_perm(char **result)
 		       "Bit 'x' should be set in all path components of "
 		       "this directory\n",
 		       cwd, getuid(), getgid(), errno, strerror(errno));
+		free(cwd);
 		return -1;
 	}
 
diff --git a/test/zdtm/lib/unix.c b/test/zdtm/lib/unix.c
index 49773dedd..288f1df24 100644
--- a/test/zdtm/lib/unix.c
+++ b/test/zdtm/lib/unix.c
@@ -5,7 +5,7 @@
 
 int unix_fill_sock_name(struct sockaddr_un *name, char *relFilename)
 {
-	char *cwd;
+	cleanup_free char *cwd = NULL;
 
 	if (get_cwd_check_perm(&cwd)) {
 		pr_err("failed to get current working directory with valid permissions.\n");

From d93409cf119c98fbc17266b5cc76647817664f1a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 28 Mar 2023 11:59:49 +0800
Subject: [PATCH 1253/1854] sk-unix: remove bogus xfree from
 unix_resolve_name_old

It is strange to free a pointer which is already in unix_sk_desc, either
on error path or on skip as we leave freed pointer in desc and it can
probably be used after free later and lead to some corruption. So I
would prefer not to free it as we don't have full controll over it here.

Fixes: 6d785e6cd ("unix: resolve a socket file when a socket descriptor is available")

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 66034df65..f1105cb75 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -646,7 +646,6 @@ postprone:
 	return 0;
 
 out:
-	xfree(name);
 	return ret;
 skip:
 	ret = 1;

From de39bd2bd10a6f1ee319ab74c9d805e4fd5308bd Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 28 Mar 2023 12:09:38 +0800
Subject: [PATCH 1254/1854] sk-unix: simplify error handling in
 unix_resolve_name_old

As we now don't have any calls to free in this function we can replace
all lables with explicit returns.

While on it: Replace useless -errno and 1 returns with -1 as from the
very first implementation of unix_resolve_name (it changed name to _old
later) in [1] any non-zero return was treated as error.

6d785e6cd ("unix: resolve a socket file when a socket descriptor is
available") [1]

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index f1105cb75..4bcc95182 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -596,15 +596,13 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 		ns = lookup_ns_by_id(root_item->ids->mnt_ns_id, &mnt_ns_desc);
 	if (!ns) {
 		pr_err("Failed to lookup ns by mnt id %d\n", ue->mnt_id);
-		ret = -ENOENT;
-		goto out;
+		return -1;
 	}
 
 	mntns_root = mntns_get_root_fd(ns);
 	if (mntns_root < 0) {
 		pr_err("Failed to lookup mntns root for ns %d\n", ns->id);
-		ret = -ENOENT;
-		goto out;
+		return -1;
 	}
 
 	if (name[0] != '/') {
@@ -615,16 +613,15 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 
 		ret = resolve_rel_name(id, d, p, &ue->name_dir);
 		if (ret < 0)
-			goto out;
-		goto postprone;
+			return -1;
+		return 0;
 	}
 
 	snprintf(rpath, sizeof(rpath), ".%s", name);
 	if (fstatat(mntns_root, rpath, &st, 0)) {
 		if (errno != ENOENT) {
-			pr_warn("Can't stat socket %#" PRIx32 "(%s), skipping: %s (err %d)\n", id, rpath,
-				strerror(errno), errno);
-			goto skip;
+			pr_perror("Can't stat socket %#" PRIx32 "(%s)", id, rpath);
+			return -1;
 		}
 
 		pr_info("unix: Dropping path %s for unlinked sk %#x\n", name, id);
@@ -642,14 +639,7 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 
 	d->deleted = deleted;
 
-postprone:
 	return 0;
-
-out:
-	return ret;
-skip:
-	ret = 1;
-	goto out;
 }
 
 static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d, UnixSkEntry *ue, const struct fd_parms *p)

From 5c8cdceec2d2c1fcf1814bcafb3fe264403c8cf3 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 28 Mar 2023 12:36:45 +0800
Subject: [PATCH 1255/1854] sk-unix: rework unix_resolve_name

- use exit_code instead of returning ret
- replace -errno return with -1
- move fallback to if (!kdat.sk_unix_file)
- fix readlinkat error checking (ret < 0 && ret >= PATH_MAX) by using
  read_fd_link helper

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-unix.c | 69 +++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 4bcc95182..841152643 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -645,78 +645,71 @@ static int unix_resolve_name_old(int lfd, uint32_t id, struct unix_sk_desc *d, U
 static int unix_resolve_name(int lfd, uint32_t id, struct unix_sk_desc *d, UnixSkEntry *ue, const struct fd_parms *p)
 {
 	char *name = d->name;
-	char path[PATH_MAX], tmp[PATH_MAX];
+	char path[PATH_MAX];
 	struct stat st;
-	int fd, proc_fd, mnt_id, ret;
+	int fd, ret;
+	int exit_code = -1;
 
 	if (d->namelen == 0 || name[0] == '\0')
 		return 0;
 
-	if (kdat.sk_unix_file && (root_ns_mask & CLONE_NEWNS)) {
-		if (get_mnt_id(lfd, &mnt_id))
+	if (!kdat.sk_unix_file) {
+		pr_warn("Trying to resolve unix socket with obsolete method\n");
+		if (unix_resolve_name_old(lfd, id, d, ue, p)) {
+			pr_err("Unable to resolve unix socket name with obsolete method. "
+			       "Try a linux kernel newer than 4.10\n");
 			return -1;
-		ue->mnt_id = mnt_id;
-		ue->has_mnt_id = true;
+		}
+		return 0;
 	}
 
 	fd = ioctl(lfd, SIOCUNIXFILE);
 	if (fd < 0) {
-		pr_warn("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl: %s\n", strerror(errno));
-		goto fallback;
+		pr_perror("Unable to get a socket file descriptor with SIOCUNIXFILE ioctl");
+		return -1;
 	}
 
-	ret = fstat(fd, &st);
-	if (ret) {
+	if (root_ns_mask & CLONE_NEWNS) {
+		struct fdinfo_common fdinfo = { .mnt_id = -1 };
+
+		if (parse_fdinfo(fd, FD_TYPES__UND, &fdinfo))
+			goto out;
+
+		ue->mnt_id = fdinfo.mnt_id;
+		ue->has_mnt_id = true;
+	}
+
+	if (fstat(fd, &st)) {
 		pr_perror("Unable to fstat socket fd");
-		return -1;
+		goto out;
 	}
 	d->mode = st.st_mode;
 	d->uid = st.st_uid;
 	d->gid = st.st_gid;
 
-	proc_fd = get_service_fd(PROC_FD_OFF);
-	if (proc_fd < 0) {
-		pr_err("Unable to get service fd for proc\n");
-		return -1;
-	}
-
-	snprintf(tmp, sizeof(tmp), "self/fd/%d", fd);
-	ret = readlinkat(proc_fd, tmp, path, PATH_MAX);
-	if (ret < 0 && ret >= PATH_MAX) {
-		pr_perror("Unable to readlink %s", tmp);
+	ret = read_fd_link(fd, path, sizeof(path));
+	if (ret < 0)
 		goto out;
-	}
-	path[ret] = 0;
 
 	d->deleted = strip_deleted(path, ret);
 
 	if (name[0] != '/') {
-		ret = cut_path_ending(path, name);
-		if (ret) {
-			pr_err("Unable too resolve %s from %s\n", name, path);
+		if (cut_path_ending(path, name)) {
+			pr_err("Unable too cut %s from %s\n", name, path);
 			goto out;
 		}
 
 		ue->name_dir = xstrdup(path);
-		if (!ue->name_dir) {
-			ret = -ENOMEM;
+		if (!ue->name_dir)
 			goto out;
-		}
 
 		pr_debug("Resolved socket relative name %s to %s/%s\n", name, ue->name_dir, name);
 	}
 
-	ret = 0;
+	exit_code = 0;
 out:
 	close(fd);
-	return ret;
-
-fallback:
-	pr_warn("Trying to resolve unix socket with obsolete method\n");
-	ret = unix_resolve_name_old(lfd, id, d, ue, p);
-	if (ret < 0)
-		pr_err("Unable to resolve unix socket name with obsolete method. Try a linux kernel newer than 4.10\n");
-	return ret;
+	return exit_code;
 }
 
 /*

From 0c52399322429d430db14061879e860471c3ab15 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 12 Mar 2023 11:56:22 +0000
Subject: [PATCH 1256/1854] ci: cancel preceding workflows run

This patch adds concurrency groups to the CI workflows to automatically
cancel any in-progress workflows when a pull request has been updated.
A `concurrency` group allows to ensure that a single job or workflow
will run at a time. For example, when a pull request is updated with
a force-push, the GiHub CI workflows currently in-progress will be
automatically cancelled, and the CI would run only with the updated
commits.

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/alpine-test.yml         | 5 +++++
 .github/workflows/archlinux-test.yml      | 5 +++++
 .github/workflows/codeql.yml              | 5 +++++
 .github/workflows/compat-test.yml         | 5 +++++
 .github/workflows/cross-compile.yml       | 5 +++++
 .github/workflows/docker-test.yml         | 5 +++++
 .github/workflows/fedora-asan-test.yml    | 5 +++++
 .github/workflows/fedora-rawhide-test.yml | 5 +++++
 .github/workflows/gcov-test.yml           | 5 +++++
 .github/workflows/java-test.yml           | 5 +++++
 .github/workflows/lint.yml                | 5 +++++
 .github/workflows/podman-test.yml         | 5 +++++
 .github/workflows/stream-test.yml         | 5 +++++
 .github/workflows/x86-64-clang-test.yml   | 5 +++++
 .github/workflows/x86-64-gcc-test.yml     | 5 +++++
 15 files changed, 75 insertions(+)

diff --git a/.github/workflows/alpine-test.yml b/.github/workflows/alpine-test.yml
index 6fc546ff5..06f466c51 100644
--- a/.github/workflows/alpine-test.yml
+++ b/.github/workflows/alpine-test.yml
@@ -2,6 +2,11 @@ name: Alpine Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: alpine-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/archlinux-test.yml b/.github/workflows/archlinux-test.yml
index bb98623a8..328cc9d0f 100644
--- a/.github/workflows/archlinux-test.yml
+++ b/.github/workflows/archlinux-test.yml
@@ -2,6 +2,11 @@ name: Arch Linux Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: archlinux-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 2d1039a0e..518d9b8ae 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -8,6 +8,11 @@ on:
   schedule:
     - cron: "11 6 * * 3"
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: codeql-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/compat-test.yml b/.github/workflows/compat-test.yml
index 5ae25fb73..79f8f0010 100644
--- a/.github/workflows/compat-test.yml
+++ b/.github/workflows/compat-test.yml
@@ -2,6 +2,11 @@ name: Compat Tests
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: compat-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index be8e7f09c..4da5d397c 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -2,6 +2,11 @@ name: Cross Compile Tests
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: cross-compile-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
 
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 564691449..fabf399fd 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -2,6 +2,11 @@ name: Docker Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: docker-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/fedora-asan-test.yml b/.github/workflows/fedora-asan-test.yml
index 44b0f16d6..8b1bfcf32 100644
--- a/.github/workflows/fedora-asan-test.yml
+++ b/.github/workflows/fedora-asan-test.yml
@@ -2,6 +2,11 @@ name: Fedora ASAN Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: fedora-asan-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/fedora-rawhide-test.yml b/.github/workflows/fedora-rawhide-test.yml
index b6d94d23e..5355aa192 100644
--- a/.github/workflows/fedora-rawhide-test.yml
+++ b/.github/workflows/fedora-rawhide-test.yml
@@ -2,6 +2,11 @@ name: Fedora Rawhide Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: fedora-rawhide-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/gcov-test.yml b/.github/workflows/gcov-test.yml
index f782c5b9d..fcab47837 100644
--- a/.github/workflows/gcov-test.yml
+++ b/.github/workflows/gcov-test.yml
@@ -2,6 +2,11 @@ name: Coverage Tests
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: gcov-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/java-test.yml b/.github/workflows/java-test.yml
index 211953495..abed793bf 100644
--- a/.github/workflows/java-test.yml
+++ b/.github/workflows/java-test.yml
@@ -2,6 +2,11 @@ name: Java Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: java-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a501af30e..e18f921f3 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -2,6 +2,11 @@ name: Run code linter
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: lint-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/podman-test.yml b/.github/workflows/podman-test.yml
index 447cbf0b6..a7013a216 100644
--- a/.github/workflows/podman-test.yml
+++ b/.github/workflows/podman-test.yml
@@ -2,6 +2,11 @@ name: Podman Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: podman-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/stream-test.yml b/.github/workflows/stream-test.yml
index ecdd81e0a..0f5b307db 100644
--- a/.github/workflows/stream-test.yml
+++ b/.github/workflows/stream-test.yml
@@ -2,6 +2,11 @@ name: CRIU Image Streamer Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: stream-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/x86-64-clang-test.yml b/.github/workflows/x86-64-clang-test.yml
index e6e84ef52..b3b50829a 100644
--- a/.github/workflows/x86-64-clang-test.yml
+++ b/.github/workflows/x86-64-clang-test.yml
@@ -2,6 +2,11 @@ name: X86_64 CLANG Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: clang-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/x86-64-gcc-test.yml b/.github/workflows/x86-64-gcc-test.yml
index b8b81ef15..ec70b61fb 100644
--- a/.github/workflows/x86-64-gcc-test.yml
+++ b/.github/workflows/x86-64-gcc-test.yml
@@ -2,6 +2,11 @@ name: X86_64 GCC Test
 
 on: [push, pull_request]
 
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: gcc-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
 jobs:
   build:
     runs-on: ubuntu-20.04

From 9683097f27b2b93c3429dea11d39dc74b8a64ffb Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Wed, 29 Mar 2023 18:27:16 +0200
Subject: [PATCH 1257/1854] zdtm: don't ignore rseq_cs mismatch in rseq01 test

Kernel shouldn't clean up rseq_cs inside a critical section.
If rseq_cs has been cleaned up, it means there is a bug in migration.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 test/zdtm/transition/rseq01.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c
index b6d470785..7247b69c1 100644
--- a/test/zdtm/transition/rseq01.c
+++ b/test/zdtm/transition/rseq01.c
@@ -119,7 +119,7 @@ static void check_thread(void)
 
 #define rseq_after_asm_goto() asm volatile("" : : : "memory")
 
-static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
+static int rseq_addv(intptr_t *v, intptr_t count, int cpu, bool ignore_abort)
 {
 	double a = 10000000000000000.0;
 	double b = -1;
@@ -193,6 +193,8 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu)
 abort:
 	rseq_after_asm_goto();
 	test_msg("abort %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b);
+	if (ignore_abort)
+		return 0;
 	return -1;
 }
 
@@ -202,6 +204,7 @@ int main(int argc, char *argv[])
 	int ret;
 	intptr_t *cpu_data;
 	long nr_cpus;
+	bool ignore_abort = true;
 
 	rseq_ptr = &__rseq_abi;
 	memset((void *)rseq_ptr, 0, sizeof(struct rseq));
@@ -225,6 +228,7 @@ int main(int argc, char *argv[])
 	 * https://github.com/torvalds/linux/blob/ce522ba9/kernel/rseq.c#L192
 	 */
 #ifdef NORESTART
+	ignore_abort = false;
 	rseq_ptr->flags = RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT | RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL |
 			  RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE;
 #endif
@@ -233,13 +237,7 @@ int main(int argc, char *argv[])
 
 	while (test_go()) {
 		cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start);
-		ret = rseq_addv(&cpu_data[cpu], 2, cpu);
-
-/* NORESTART is NOT set */
-#ifndef NORESTART
-		/* just ignore abort */
-		ret = 0;
-#endif
+		ret = rseq_addv(&cpu_data[cpu], 2, cpu, ignore_abort);
 
 		if (ret)
 			break;

From 85e46c44d6d63d94995f42ba797a0561f4077db7 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Tue, 4 Apr 2023 16:56:53 +0200
Subject: [PATCH 1258/1854] dump: extend parasite_thread_ctl lifetime to
 dump_task_thread

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/cr-dump.c          |  1 +
 criu/parasite-syscall.c | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 1c1962e8f..b7edd294f 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -906,6 +906,7 @@ static int dump_task_thread(struct parasite_ctl *parasite_ctl, const struct pstr
 
 	close_image(img);
 err:
+	compel_release_thread(tctl);
 	pr_info("----------------------------------------\n");
 	return ret;
 }
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index d3541d996..35489634d 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -195,13 +195,13 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, struct parasit
 	ret = compel_get_thread_regs(tctl, save_task_regs, core);
 	if (ret) {
 		pr_err("Can't obtain regs for thread %d\n", pid);
-		goto err_rth;
+		return -1;
 	}
 
 	ret = compel_arch_fetch_thread_area(tctl);
 	if (ret) {
 		pr_err("Can't obtain thread area of %d\n", pid);
-		goto err_rth;
+		return -1;
 	}
 
 	compel_arch_get_tls_thread(tctl, &args->tls);
@@ -211,23 +211,17 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, struct parasit
 	ret = compel_run_in_thread(tctl, PARASITE_CMD_DUMP_THREAD);
 	if (ret) {
 		pr_err("Can't init thread in parasite %d\n", pid);
-		goto err_rth;
+		return -1;
 	}
 
 	ret = alloc_groups_copy_creds(creds, pc);
 	if (ret) {
 		pr_err("Can't copy creds for thread %d\n", pid);
-		goto err_rth;
+		return -1;
 	}
 
-	compel_release_thread(tctl);
-
 	tid->ns[0].virt = args->tid;
 	return dump_thread_core(pid, core, args);
-
-err_rth:
-	compel_release_thread(tctl);
-	return -1;
 }
 
 int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *item)

From 78c4e2c0f7cd179fee1be10f3a58ba182fb58179 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Tue, 4 Apr 2023 17:04:58 +0200
Subject: [PATCH 1259/1854] cr-dump: move rseq functions before
 dump_task_thread

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/cr-dump.c | 126 ++++++++++++++++++++++++-------------------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index b7edd294f..83a44d157 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -875,6 +875,69 @@ static int collect_file_locks(void)
 	return parse_file_locks();
 }
 
+static bool task_in_rseq(struct criu_rseq_cs *rseq_cs, uint64_t addr)
+{
+	return addr >= rseq_cs->start_ip && addr < rseq_cs->start_ip + rseq_cs->post_commit_offset;
+}
+
+static int fixup_thread_rseq(struct pstree_item *item, int i)
+{
+	CoreEntry *core = item->core[i];
+	struct criu_rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
+	pid_t tid = item->threads[i].real;
+
+	/* equivalent to (struct rseq)->rseq_cs is NULL */
+	if (!rseq_cs->start_ip)
+		return 0;
+
+	pr_debug(
+		"fixup_thread_rseq for %d: rseq_cs start_ip = %llx abort_ip = %llx post_commit_offset = %llx flags = %x version = %x; IP = %lx\n",
+		tid, rseq_cs->start_ip, rseq_cs->abort_ip, rseq_cs->post_commit_offset, rseq_cs->flags,
+		rseq_cs->version, (unsigned long)TI_IP(core));
+
+	if (rseq_cs->version != 0) {
+		pr_err("unsupported RSEQ ABI version = %d\n", rseq_cs->version);
+		return -1;
+	}
+
+	if (task_in_rseq(rseq_cs, TI_IP(core))) {
+		struct pid *tid = &item->threads[i];
+
+		/*
+		 * We need to fixup task instruction pointer from
+		 * the original one (which lays inside rseq critical section)
+		 * to rseq abort handler address. But we need to look on rseq_cs->flags
+		 * (please refer to struct rseq -> flags field description).
+		 * Naive idea of flags support may be like... let's change instruction pointer (IP)
+		 * to rseq_cs->abort_ip if !(rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL).
+		 * But unfortunately, it doesn't work properly, because the kernel does
+		 * clean up of rseq_cs field in the struct rseq (modifies userspace memory).
+		 * So, we need to preserve original value of (struct rseq)->rseq_cs field in the
+		 * image and restore it's value before releasing threads (see restore_rseq_cs()).
+		 *
+		 * It's worth to mention that we need to fixup IP in CoreEntry
+		 * (used when full dump/restore is performed) and also in
+		 * the parasite regs storage (used if --leave-running option is used,
+		 * or if dump error occurred and process execution is resumed).
+		 */
+
+		if (!(rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL)) {
+			pr_warn("The %d task is in rseq critical section. IP will be set to rseq abort handler addr\n",
+				tid->real);
+
+			TI_IP(core) = rseq_cs->abort_ip;
+
+			if (item->pid->real == tid->real) {
+				compel_set_leader_ip(dmpi(item)->parasite_ctl, rseq_cs->abort_ip);
+			} else {
+				compel_set_thread_ip(dmpi(item)->thread_ctls[i], rseq_cs->abort_ip);
+			}
+		}
+	}
+
+	return 0;
+}
+
 static int dump_task_thread(struct parasite_ctl *parasite_ctl, const struct pstree_item *item, int id)
 {
 	struct parasite_thread_ctl *tctl = dmpi(item)->thread_ctls[id];
@@ -1184,69 +1247,6 @@ free_rseq:
 	return -1;
 }
 
-static bool task_in_rseq(struct criu_rseq_cs *rseq_cs, uint64_t addr)
-{
-	return addr >= rseq_cs->start_ip && addr < rseq_cs->start_ip + rseq_cs->post_commit_offset;
-}
-
-static int fixup_thread_rseq(struct pstree_item *item, int i)
-{
-	CoreEntry *core = item->core[i];
-	struct criu_rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
-	pid_t tid = item->threads[i].real;
-
-	/* equivalent to (struct rseq)->rseq_cs is NULL */
-	if (!rseq_cs->start_ip)
-		return 0;
-
-	pr_debug(
-		"fixup_thread_rseq for %d: rseq_cs start_ip = %llx abort_ip = %llx post_commit_offset = %llx flags = %x version = %x; IP = %lx\n",
-		tid, rseq_cs->start_ip, rseq_cs->abort_ip, rseq_cs->post_commit_offset, rseq_cs->flags,
-		rseq_cs->version, (unsigned long)TI_IP(core));
-
-	if (rseq_cs->version != 0) {
-		pr_err("unsupported RSEQ ABI version = %d\n", rseq_cs->version);
-		return -1;
-	}
-
-	if (task_in_rseq(rseq_cs, TI_IP(core))) {
-		struct pid *tid = &item->threads[i];
-
-		/*
-		 * We need to fixup task instruction pointer from
-		 * the original one (which lays inside rseq critical section)
-		 * to rseq abort handler address. But we need to look on rseq_cs->flags
-		 * (please refer to struct rseq -> flags field description).
-		 * Naive idea of flags support may be like... let's change instruction pointer (IP)
-		 * to rseq_cs->abort_ip if !(rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL).
-		 * But unfortunately, it doesn't work properly, because the kernel does
-		 * clean up of rseq_cs field in the struct rseq (modifies userspace memory).
-		 * So, we need to preserve original value of (struct rseq)->rseq_cs field in the
-		 * image and restore it's value before releasing threads (see restore_rseq_cs()).
-		 *
-		 * It's worth to mention that we need to fixup IP in CoreEntry
-		 * (used when full dump/restore is performed) and also in
-		 * the parasite regs storage (used if --leave-running option is used,
-		 * or if dump error occurred and process execution is resumed).
-		 */
-
-		if (!(rseq_cs->flags & RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL)) {
-			pr_warn("The %d task is in rseq critical section. IP will be set to rseq abort handler addr\n",
-				tid->real);
-
-			TI_IP(core) = rseq_cs->abort_ip;
-
-			if (item->pid->real == tid->real) {
-				compel_set_leader_ip(dmpi(item)->parasite_ctl, rseq_cs->abort_ip);
-			} else {
-				compel_set_thread_ip(dmpi(item)->thread_ctls[i], rseq_cs->abort_ip);
-			}
-		}
-	}
-
-	return 0;
-}
-
 static int fixup_task_rseq(pid_t pid, struct pstree_item *item)
 {
 	int ret = 0;

From f8da250bb35372155c42cde4a132aa309d4a07d3 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Thu, 30 Mar 2023 19:14:04 +0200
Subject: [PATCH 1260/1854] cr-dump: properly apply rseq fixup for all threads

Previously fixup was done before threads' registers were dumped so it
didn't actually work. This commit splits rseq fixup into thread leader
fixup and other threads fixup and applies them after the entities are
seized.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/cr-dump.c | 45 ++++++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 83a44d157..90d763f49 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -880,12 +880,15 @@ static bool task_in_rseq(struct criu_rseq_cs *rseq_cs, uint64_t addr)
 	return addr >= rseq_cs->start_ip && addr < rseq_cs->start_ip + rseq_cs->post_commit_offset;
 }
 
-static int fixup_thread_rseq(struct pstree_item *item, int i)
+static int fixup_thread_rseq(const struct pstree_item *item, int i)
 {
 	CoreEntry *core = item->core[i];
 	struct criu_rseq_cs *rseq_cs = &dmpi(item)->thread_rseq_cs[i];
 	pid_t tid = item->threads[i].real;
 
+	if (!kdat.has_ptrace_get_rseq_conf)
+		return 0;
+
 	/* equivalent to (struct rseq)->rseq_cs is NULL */
 	if (!rseq_cs->start_ip)
 		return 0;
@@ -961,6 +964,12 @@ static int dump_task_thread(struct parasite_ctl *parasite_ctl, const struct pstr
 	core->thread_core->creds->lsm_profile = dmpi(item)->thread_lsms[id]->profile;
 	core->thread_core->creds->lsm_sockcreate = dmpi(item)->thread_lsms[0]->sockcreate;
 
+	ret = fixup_thread_rseq(item, id);
+	if (ret) {
+		pr_err("Can't fixup rseq for pid %d\n", pid);
+		goto err;
+	}
+
 	img = open_image(CR_FD_CORE, O_DUMP, tid->ns[0].virt);
 	if (!img)
 		goto err;
@@ -1247,32 +1256,11 @@ free_rseq:
 	return -1;
 }
 
-static int fixup_task_rseq(pid_t pid, struct pstree_item *item)
-{
-	int ret = 0;
-	int i;
-
-	if (!kdat.has_ptrace_get_rseq_conf)
-		return 0;
-
-	for (i = 0; i < item->nr_threads; i++) {
-		if (fixup_thread_rseq(item, i)) {
-			ret = -1;
-			goto exit;
-		}
-	}
-
-exit:
-	xfree(dmpi(item)->thread_rseq_cs);
-	dmpi(item)->thread_rseq_cs = NULL;
-	return ret;
-}
-
 static struct proc_pid_stat pps_buf;
 
 static int dump_task_threads(struct parasite_ctl *parasite_ctl, const struct pstree_item *item)
 {
-	int i;
+	int i, ret = 0;
 
 	for (i = 0; i < item->nr_threads; i++) {
 		/* Leader is already dumped */
@@ -1280,11 +1268,14 @@ static int dump_task_threads(struct parasite_ctl *parasite_ctl, const struct pst
 			item->threads[i].ns[0].virt = vpid(item);
 			continue;
 		}
-		if (dump_task_thread(parasite_ctl, item, i))
-			return -1;
+		ret = dump_task_thread(parasite_ctl, item, i);
+		if (ret)
+			break;
 	}
 
-	return 0;
+	xfree(dmpi(item)->thread_rseq_cs);
+	dmpi(item)->thread_rseq_cs = NULL;
+	return ret;
 }
 
 /*
@@ -1608,7 +1599,7 @@ static int dump_one_task(struct pstree_item *item, InventoryEntry *parent_ie)
 		goto err;
 	}
 
-	ret = fixup_task_rseq(pid, item);
+	ret = fixup_thread_rseq(item, 0);
 	if (ret) {
 		pr_err("Fixup rseq for %d failed %d\n", pid, ret);
 		goto err;

From 6c728df1dc71e80aee580256f1e56e4d3dcb042a Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Thu, 30 Mar 2023 17:47:38 +0200
Subject: [PATCH 1261/1854] zdtm: modify rseq01 to include a thread

Testing only the thread group leader is not enough and can hide bugs.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 test/zdtm/transition/Makefile |  2 ++
 test/zdtm/transition/rseq01.c | 57 +++++++++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index ab735bdd4..ddf2faaad 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -84,7 +84,9 @@ ptrace:		LDFLAGS += -pthread
 fork2:		CFLAGS += -D FORK2
 thread-bomb.o:	CFLAGS += -pthread
 thread-bomb:	LDFLAGS += -pthread
+rseq01:		LDLIBS += -pthread
 rseq02:		CFLAGS += -D NORESTART
+rseq02:		LDLIBS += -pthread
 
 %: %.sh
 	cp $< $@
diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c
index 7247b69c1..0fbcc2dca 100644
--- a/test/zdtm/transition/rseq01.c
+++ b/test/zdtm/transition/rseq01.c
@@ -86,7 +86,7 @@ struct rseq {
 #endif
 /* EOF */
 
-static volatile struct rseq *rseq_ptr;
+static __thread volatile struct rseq *rseq_ptr;
 static __thread volatile struct rseq __rseq_abi;
 
 static int sys_rseq(volatile struct rseq *rseq_abi, uint32_t rseq_len, int flags, uint32_t sig)
@@ -119,7 +119,7 @@ static void check_thread(void)
 
 #define rseq_after_asm_goto() asm volatile("" : : : "memory")
 
-static int rseq_addv(intptr_t *v, intptr_t count, int cpu, bool ignore_abort)
+static int rseq_addv(intptr_t *v, intptr_t count, int cpu, bool ignore_abort, const char *id)
 {
 	double a = 10000000000000000.0;
 	double b = -1;
@@ -177,7 +177,7 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu, bool ignore_abort)
 	);
 	/* clang-format on */
 	rseq_after_asm_goto();
-	test_msg("exit %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b);
+	test_msg("exit %s, %lx %lx %f %f\n", id, rseq_cs1, rseq_cs2, a, b);
 	if (rseq_cs1 != rseq_cs2) {
 		/*
 		 * It means that we finished critical section
@@ -192,19 +192,45 @@ static int rseq_addv(intptr_t *v, intptr_t count, int cpu, bool ignore_abort)
 	return 0;
 abort:
 	rseq_after_asm_goto();
-	test_msg("abort %lx %lx %f %f\n", rseq_cs1, rseq_cs2, a, b);
+	test_msg("abort %s, %lx %lx %f %f\n", id, rseq_cs1, rseq_cs2, a, b);
 	if (ignore_abort)
 		return 0;
 	return -1;
 }
 
+static task_waiter_t waiter;
+static intptr_t *cpu_data;
+bool ignore_abort = true;
+int thread_ret;
+
+void *thread_routine(void *args)
+{
+	int cpu;
+
+	rseq_ptr = &__rseq_abi;
+	memset((void *)rseq_ptr, 0, sizeof(struct rseq));
+	register_thread();
+	task_waiter_complete(&waiter, 1);
+	task_waiter_wait4(&waiter, 2);
+
+	while (test_go()) {
+		cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start);
+		thread_ret = rseq_addv(&cpu_data[cpu], 2, cpu, ignore_abort, "thread");
+
+		if (thread_ret)
+			break;
+	}
+
+	check_thread();
+	return NULL;
+}
+
 int main(int argc, char *argv[])
 {
 	int cpu = 0;
 	int ret;
-	intptr_t *cpu_data;
 	long nr_cpus;
-	bool ignore_abort = true;
+	pthread_t thread;
 
 	rseq_ptr = &__rseq_abi;
 	memset((void *)rseq_ptr, 0, sizeof(struct rseq));
@@ -233,21 +259,32 @@ int main(int argc, char *argv[])
 			  RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE;
 #endif
 
+	task_waiter_init(&waiter);
+	if (pthread_create(&thread, NULL, thread_routine, NULL)) {
+		fail("pthread_create");
+		exit(EXIT_FAILURE);
+	}
+	task_waiter_wait4(&waiter, 1);
+
 	test_daemon();
+	task_waiter_complete(&waiter, 2);
 
 	while (test_go()) {
 		cpu = RSEQ_ACCESS_ONCE(rseq_ptr->cpu_id_start);
-		ret = rseq_addv(&cpu_data[cpu], 2, cpu, ignore_abort);
+		ret = rseq_addv(&cpu_data[cpu], 2, cpu, ignore_abort, "task");
 
 		if (ret)
 			break;
 	}
 
-	test_waitsig();
-
 	check_thread();
 
-	if (ret)
+	if (pthread_join(thread, NULL)) {
+		fail("pthread_join");
+		exit(EXIT_FAILURE);
+	}
+
+	if (ret || thread_ret)
 		fail();
 	else
 		pass();

From 45e4a6b27452f8f51ff12d4a8def9216ecb00200 Mon Sep 17 00:00:00 2001
From: hdzhoujie <zhoujie133@huawei.com>
Date: Thu, 30 Mar 2023 16:33:20 +0800
Subject: [PATCH 1262/1854] netlink: fix netlink fd flags dump/restore failed

During the restore process, netlink fd uses the flags in the
NetlinkSkEntry structure to restore the file state, but during
the dump process, the flags values is not saved to the structure.

Signed-off-by: zhoujie <zhoujie133@huawei.com>
Signed-off-by: hejingxian <hejingxian@huawei.com>
---
 criu/sk-netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index 754eed932..a219b69be 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -161,7 +161,7 @@ static int dump_one_netlink_fd(int lfd, u32 id, const struct fd_parms *p)
 
 		ne.protocol = val;
 	}
-
+	ne.flags = p->flags;
 	ne.fown = (FownEntry *)&p->fown;
 	ne.opts = &skopts;
 

From 94ac9ee3cc9a53c5200ffc7c79ca7444e10cd09a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 5 Apr 2023 13:58:18 +0800
Subject: [PATCH 1263/1854] proc_parse: fix while condition in parse_pid_status

In parse_pid_status there are 13 places where we do done++, so when
"done" is 13 it means that we have matched each of those 13 places and
we are ready to stop. In next lines we are not going to find anything.

So the right condition for the while loop is (done < 13).

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/proc_parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index bcb8256b4..5e96b5c96 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1043,7 +1043,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 	if (bfdopenr(&f))
 		return -1;
 
-	while (done < 14) {
+	while (done < 13) {
 		str = breadline(&f);
 		if (str == NULL)
 			break;

From 9b3496043d6df7839944e97cdf660c1633b6a4d4 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Thu, 13 Apr 2023 16:51:02 +0200
Subject: [PATCH 1264/1854] log: fix timestamp logging when tv_sec>=100

Previously when tv_sec>=100, the line would look like this:
(269.189615 Error [...]
Now the last char is overwritten with ')'.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/log.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/log.c b/criu/log.c
index 47419313b..89ae8f820 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -71,7 +71,8 @@ static void print_ts(void)
 
 	gettimeofday(&t, NULL);
 	timediff(&start, &t);
-	snprintf(buffer, TS_BUF_OFF, "(%02u.%06u)", (unsigned)t.tv_sec, (unsigned)t.tv_usec);
+	snprintf(buffer, TS_BUF_OFF, "(%02u.%06u", (unsigned)t.tv_sec, (unsigned)t.tv_usec);
+	buffer[TS_BUF_OFF - 2] = ')'; /* this will overwrite the last digit if tv_sec>=100 */
 	buffer[TS_BUF_OFF - 1] = ' '; /* kill the '\0' produced by snprintf */
 }
 

From b689bcc3548b41eb28c2f733b625751e1e189b16 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 13 Apr 2023 11:20:57 +0800
Subject: [PATCH 1265/1854] cr-check: remove excess kerndat_has_nspid from
 check_ns_pid

We do kerndat_has_nspid in kerndat_init already and save result to
kerndat cache, we don't need to recheck it each time.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-check.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index e4e590c4d..a4166f76b 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1324,9 +1324,6 @@ static int check_pidfd_store(void)
 
 static int check_ns_pid(void)
 {
-	if (kerndat_has_nspid() < 0)
-		return -1;
-
 	if (!kdat.has_nspid)
 		return -1;
 

From 4c1a2ac41bb80843c927d2fde8f2ff4186f8d278 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Wed, 19 Apr 2023 08:00:45 -0700
Subject: [PATCH 1266/1854] criu: Version 3.18 (Silver Sandpiper)

The highlight feature of this release is the ability to use CRIU for
non-root users. Adrian Reber implemented the kernel part and created the
initial version of CRIU changes. Then Younes Manton joined the effort
and pushed it to the finish line.

The full change log is here: https://criu.org/Download/criu/3.18

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.versions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 73bc2d5fa..4c645cd6c 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 17
-CRIU_VERSION_SUBLEVEL	:= 1
+CRIU_VERSION_MINOR	:= 18
+CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Radiant Redstart
+CRIU_VERSION_NAME	:= Silver Sandpiper
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From 04cdbd6106a03fba3299eb99a155c11d800a3969 Mon Sep 17 00:00:00 2001
From: Suraj Shirvankar <surajshirvankar@gmail.com>
Date: Wed, 12 Apr 2023 13:38:06 +0000
Subject: [PATCH 1267/1854] sk-inet: Add IP TOS socket option

The TOS(type of service) field in the ip header allows you specify the
priority of the socket data.

Signed-off-by: Suraj Shirvankar <surajshirvankar@gmail.com>
---
 criu/sk-inet.c       | 4 ++++
 images/sk-inet.proto | 1 +
 2 files changed, 5 insertions(+)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 4bd5abff1..24e92a852 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -416,9 +416,11 @@ static int dump_ip_opts(int sk, int family, int type, int proto, IpOptsEntry *io
 	} else {
 		ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
 		ret |= dump_opt(sk, SOL_IP, IP_PKTINFO, &ioe->pktinfo);
+		ret |= dump_opt(sk, SOL_IP, IP_TOS, &ioe->tos);
 	}
 	ioe->has_freebind = ioe->freebind;
 	ioe->has_pktinfo = !!ioe->pktinfo;
+	ioe->has_tos = !!ioe->tos;
 
 	return ret;
 }
@@ -813,6 +815,8 @@ int restore_ip_opts(int sk, int family, int proto, IpOptsEntry *ioe)
 			ret |= restore_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
 		if (ioe->has_pktinfo)
 			ret |= restore_opt(sk, SOL_IP, IP_PKTINFO, &ioe->pktinfo);
+		if (ioe->has_tos)
+			ret |= restore_opt(sk, SOL_IP, IP_TOS, &ioe->tos);
 	}
 
 	if (ioe->raw)
diff --git a/images/sk-inet.proto b/images/sk-inet.proto
index ee1f0ae41..666326fa4 100644
--- a/images/sk-inet.proto
+++ b/images/sk-inet.proto
@@ -19,6 +19,7 @@ message ip_opts_entry {
 	optional ip_opts_raw_entry	raw		= 4;
 
 	optional bool			pktinfo		= 5;
+	optional uint32			tos		= 6;
 }
 
 message inet_sk_entry {

From 1c0f8787b2621ac8f7f530556aa1c6c97e04562a Mon Sep 17 00:00:00 2001
From: Suraj Shirvankar <surajshirvankar@gmail.com>
Date: Thu, 13 Apr 2023 22:27:11 +0200
Subject: [PATCH 1268/1854] zdtm: Add tests for ip tos restore

Signed-off-by: Suraj Shirvankar <surajshirvankar@gmail.com>
---
 test/zdtm/static/sock_ip_opts00.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/zdtm/static/sock_ip_opts00.c b/test/zdtm/static/sock_ip_opts00.c
index 08970c0da..d890410d8 100644
--- a/test/zdtm/static/sock_ip_opts00.c
+++ b/test/zdtm/static/sock_ip_opts00.c
@@ -3,6 +3,7 @@
 #include <netinet/in.h>
 
 #include <linux/in.h>
+#include <linux/ip.h>
 #include <linux/in6.h>
 
 #include "zdtmtst.h"
@@ -19,11 +20,13 @@ const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
 struct sk_opt {
 	int level;
 	int opt;
+	int val;
 };
 
 struct sk_opt sk_opts_v4[] = {
-	{ SOL_IP, IP_FREEBIND },
-	{ SOL_IP, IP_PKTINFO },
+	{ SOL_IP, IP_FREEBIND, IP_OPT_VAL },
+	{ SOL_IP, IP_PKTINFO, IP_OPT_VAL },
+	{ SOL_IP, IP_TOS, IPTOS_TOS(IPTOS_THROUGHPUT) },
 };
 
 #ifndef IPV6_FREEBIND
@@ -31,8 +34,8 @@ struct sk_opt sk_opts_v4[] = {
 #endif
 
 struct sk_opt sk_opts_v6[] = {
-	{ SOL_IPV6, IPV6_FREEBIND },
-	{ SOL_IPV6, IPV6_RECVPKTINFO },
+	{ SOL_IPV6, IPV6_FREEBIND, IP_OPT_VAL },
+	{ SOL_IPV6, IPV6_RECVPKTINFO, IP_OPT_VAL },
 };
 
 struct sk_conf {
@@ -71,7 +74,7 @@ int main(int argc, char **argv)
 		n_opts = sk_confs[i].domain == AF_INET ? ARRAY_SIZE(sk_opts_v4) : ARRAY_SIZE(sk_opts_v6);
 
 		for (j = 0; j < n_opts; j++) {
-			val = IP_OPT_VAL;
+			val = opts[j].val;
 			if (setsockopt(sk_confs[i].sk, opts[j].level, opts[j].opt, &val, sizeof(int)) == -1) {
 				pr_perror("setsockopt(%d, %d) failed", opts[j].level, opts[j].opt);
 				goto close;
@@ -93,7 +96,7 @@ int main(int argc, char **argv)
 				goto close;
 			}
 
-			if (val != IP_OPT_VAL) {
+			if (val != opts[j].val) {
 				fail("Unexpected value socket(%d,%d,%d) opts(%d,%d)", sk_confs[i].domain,
 				     sk_confs[i].type, sk_confs[i].protocol, opts[j].level, opts[j].opt);
 				goto close;

From fa6af25e75353a417145d98352a4eaa2523e4854 Mon Sep 17 00:00:00 2001
From: hdzhoujie <zhoujie133@huawei.com>
Date: Tue, 18 Apr 2023 21:03:53 +0800
Subject: [PATCH 1269/1854] dump: increase fcntl call failure judgment

The pipe_size type is unsigned int, when the fcntl call fails and
return -1, it will cause a negative rollover problem.

Signed-off-by: zhoujie <zhoujie133@huawei.com>
---
 criu/page-pipe.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index 54dc3ccc4..aab6742be 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -99,6 +99,7 @@ static struct page_pipe_buf *ppb_alloc(struct page_pipe *pp, unsigned int ppb_fl
 {
 	struct page_pipe_buf *prev = pp_prev_ppb(pp, ppb_flags);
 	struct page_pipe_buf *ppb;
+	int ppb_size = 0;
 
 	ppb = xmalloc(sizeof(*ppb));
 	if (!ppb)
@@ -120,7 +121,13 @@ static struct page_pipe_buf *ppb_alloc(struct page_pipe *pp, unsigned int ppb_fl
 		cnt_add(CNT_PAGE_PIPES, 1);
 
 		ppb->pipe_off = 0;
-		ppb->pipe_size = fcntl(ppb->p[0], F_GETPIPE_SZ, 0) / PAGE_SIZE;
+		ppb_size = fcntl(ppb->p[0], F_GETPIPE_SZ, 0);
+		if (ppb_size < 0) {
+			xfree(ppb);
+			pr_perror("Can't get pipe size");
+			return NULL;
+		}
+		ppb->pipe_size = ppb_size / PAGE_SIZE;
 		pp->nr_pipes++;
 	}
 

From 727d796505df52c4a4922986cefeb22675def353 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 24 Apr 2023 09:28:19 +0200
Subject: [PATCH 1270/1854] compel: support XSAVE on newer Intel CPUs

Newer Intel CPUs (Sapphire Rapids) have a much larger xsave area than
before. Looking at older CPUs I see 2440 bytes.

    # cpuid -1 -l 0xd -s 0
    ...
        bytes required by XSAVE/XRSTOR area     = 0x00000988 (2440)

On newer CPUs (Sapphire Rapids) it grows to 11008 bytes.

    # cpuid -1 -l 0xd -s 0
    ...
        bytes required by XSAVE/XRSTOR area     = 0x00002b00 (11008)

This increase the xsave area from one page to four pages.

Without this patch the fpu03 test fails, with this patch it works again.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .../arch/x86/src/lib/include/uapi/asm/fpu.h   | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index bd3b0cbd5..8c83dd9ae 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -21,7 +21,28 @@
 #define XSTATE_YMM 0x4
 
 #define FXSAVE_SIZE 512
-#define XSAVE_SIZE  4096
+/*
+ * This used to be 4096 (one page). There is a comment below concerning
+ * this size:
+ *  "One page should be enough for the whole xsave state ;-)"
+ * Which is kind of funny as it is no longer enough ;-)
+ *
+ * Older CPUs:
+ * # cpuid -1 -l 0xd -s 0
+ * ...
+ *     bytes required by XSAVE/XRSTOR area     = 0x00000988 (2440)
+ *
+ * Newer CPUs (Sapphire Rapids):
+ * # cpuid -1 -l 0xd -s 0
+ * ...
+ *     bytes required by XSAVE/XRSTOR area     = 0x00002b00 (11008)
+ *
+ * So one page is no longer enough... But:
+ *
+ * Four pages should be enough for the whole xsave state ;-)
+ */
+
+#define XSAVE_SIZE  4*4096
 
 #define XSAVE_HDR_SIZE	 64
 #define XSAVE_HDR_OFFSET FXSAVE_SIZE
@@ -235,8 +256,11 @@ struct pkru_state {
  *
  *
  * One page should be enough for the whole xsave state ;-)
+ *
+ * Of course it was not ;-) Now using four pages...
+ *
  */
-#define EXTENDED_STATE_AREA_SIZE (4096 - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct))
+#define EXTENDED_STATE_AREA_SIZE (XSAVE_SIZE - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct))
 
 /*
  * cpu requires it to be 64 byte aligned

From df7b897a22c456796599d3766f65aace818d58ef Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 24 Apr 2023 13:53:41 +0000
Subject: [PATCH 1271/1854] ci: fix new codespell errors

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .codespellrc                                            | 2 +-
 compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 2 +-
 compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h   | 2 +-
 criu/include/image.h                                    | 2 +-
 criu/mem.c                                              | 2 +-
 criu/mount.c                                            | 2 +-
 criu/namespaces.c                                       | 2 +-
 criu/net.c                                              | 2 +-
 criu/pie/restorer.c                                     | 2 +-
 include/common/scm.h                                    | 2 +-
 plugins/amdgpu/README.md                                | 2 +-
 plugins/amdgpu/amdgpu_plugin_topology.c                 | 2 +-
 test/exhaustive/unix.py                                 | 2 +-
 test/others/app-emu/java/HelloWorld/run.sh              | 2 +-
 test/others/app-emu/make/run.sh                         | 2 +-
 test/zdtm/static/child_opened_proc.c                    | 2 +-
 test/zdtm/static/maps00.c                               | 2 +-
 test/zdtm/static/mntns_root_bind.c                      | 2 +-
 test/zdtm/static/stopped.c                              | 2 +-
 test/zdtm/transition/ipc.c                              | 4 ++--
 test/zdtm/transition/lazy-thp.c                         | 2 +-
 21 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.codespellrc b/.codespellrc
index 765dacfab..dd31dd851 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,3 +1,3 @@
 [codespell]
 skip = ./.git,./test/pki
-ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng
+ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng,inh,wronly,renderd,bui,clen
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
index f8ec55d6c..9152024fd 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
@@ -18,7 +18,7 @@ struct aux_context {
 	struct _aarch64_ctx end;
 };
 
-// XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
+// XXX: the identifier rt_sigcontext is expected to be struct by the CRIU code
 #define rt_sigcontext sigcontext
 
 #include <compel/sigframe-common.h>
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
index 8cc94ba74..0c4ccb648 100644
--- a/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
@@ -14,7 +14,7 @@
  */
 #include <signal.h>
 
-// XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
+// XXX: the identifier rt_sigcontext is expected to be struct by the CRIU code
 #define rt_sigcontext sigcontext
 
 #include <compel/sigframe-common.h>
diff --git a/criu/include/image.h b/criu/include/image.h
index 5cb01bde2..9a275565f 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -41,7 +41,7 @@
  *  	implementation and it is specific to every kernel version,
  *  	its contents should not be dumped ever
  *  - vdso,vvar
- *  	the vDSO area, it might reqire additional memory
+ *  	the vDSO area, it might require additional memory
  *  	contents modification especially when tasks are
  *  	migrating between different kernel versions
  *  - heap
diff --git a/criu/mem.c b/criu/mem.c
index ab86a1f6d..9bf7cae97 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -161,7 +161,7 @@ static bool is_stack(struct pstree_item *item, unsigned long vaddr)
  * put the memory into the page-pipe's pipe.
  *
  * "Holes" in page-pipe are regions, that should be dumped, but
- * the memory contents is present in the pagent image set.
+ * the memory contents is present in the parent image set.
  */
 
 static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct page_pipe *pp, u64 *map, u64 *off,
diff --git a/criu/mount.c b/criu/mount.c
index db9db63b2..c26aaa58d 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2823,7 +2823,7 @@ static LIST_HEAD(mnt_remap_list);
 static int remap_id;
 
 struct mnt_remap_entry {
-	struct mount_info *mi;	   /* child is remaped into the root yards */
+	struct mount_info *mi;	   /* child is remapped into the root yards */
 	struct mount_info *parent; /* the origin parent for the child*/
 	struct list_head node;
 };
diff --git a/criu/namespaces.c b/criu/namespaces.c
index b1b5303fa..b7c0ab400 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1454,7 +1454,7 @@ int start_unix_cred_daemon(pid_t *pid, int (*daemon_func)(int sk))
 	 *    each other easily. Stream socket require manual
 	 *    messages boundaries.
 	 *
-	 * b) Make callers note the damon death by seeing the
+	 * b) Make callers note the daemon death by seeing the
 	 *    disconnected socket. In case of dgram socket
 	 *    callers would just get stuck in receiving the
 	 *    response.
diff --git a/criu/net.c b/criu/net.c
index 2793b18e6..84250598c 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3433,7 +3433,7 @@ struct ns_id *net_get_root_ns(void)
 
 /*
  * socket_diag doesn't report unbound and unconnected sockets,
- * so we have to get their network namesapces explicitly
+ * so we have to get their network namespaces explicitly
  */
 struct ns_id *get_socket_ns(int lfd)
 {
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 5e78e74d4..9873fdc11 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1068,7 +1068,7 @@ static int vma_remap(VmaEntry *vma_entry, int uffd)
 		 * |G|----tgt----|       |
 		 *
 		 * 3. remap src to any other place.
-		 *    G prevents src from being remaped on tgt again
+		 *    G prevents src from being remapped on tgt again
 		 * |       |-------------| -> |+++++src+++++|
 		 * |G|---tgt-----|                          |
 		 *
diff --git a/include/common/scm.h b/include/common/scm.h
index bcb198882..5b6f78a8b 100644
--- a/include/common/scm.h
+++ b/include/common/scm.h
@@ -11,7 +11,7 @@
  * Because of kernel doing kmalloc for user data passed
  * in SCM messages, and there is kernel's SCM_MAX_FD as a limit
  * for descriptors passed at once we're trying to reduce
- * the pressue on kernel memory manager and use predefined
+ * the pressure on kernel memory manager and use predefined
  * known to work well size of the message buffer.
  */
 #define CR_SCM_MSG_SIZE (1024)
diff --git a/plugins/amdgpu/README.md b/plugins/amdgpu/README.md
index 6809ec8b9..1078eafe6 100644
--- a/plugins/amdgpu/README.md
+++ b/plugins/amdgpu/README.md
@@ -263,7 +263,7 @@ ROCm | Radeon Open Compute Platform
 Thunk | User-mode API interface  to interact with amdgpu.ko
 KFD | AMD Kernel Fusion Driver
 Mesa | Open source OpenGL implementation
-GTT | Graphis Translation Table, also used to denote kernel-managed system memory for GPU access
+GTT | Graphics Translation Table, also used to denote kernel-managed system memory for GPU access
 VRAM | Video RAM
 BO | Buffer Object
 HMM | Heterogeneous Memory Management
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 42689933e..6d004247b 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -1241,7 +1241,7 @@ static bool map_devices(struct tp_system *src_sys, struct tp_system *dest_sys, s
 				return true;
 			} else {
 				/* We could not map remaining nodes in the list. Add dest node back
-				 * to list and try to map next dest ndoe in list to current src
+				 * to list and try to map next dest node in list to current src
 				 * node.
 				 */
 				pr_debug("Nodes after [0x%04X -> 0x%04X] did not match, "
diff --git a/test/exhaustive/unix.py b/test/exhaustive/unix.py
index 5b4c972cb..6f72dd44b 100755
--- a/test/exhaustive/unix.py
+++ b/test/exhaustive/unix.py
@@ -462,7 +462,7 @@ fail_desc = {
 
 
 def chk_real_state(st):
-    # Before enything else -- check that we still have
+    # Before anything else -- check that we still have
     # all the sockets at hands
     for sk in st.sockets:
         if not sk.visible:
diff --git a/test/others/app-emu/java/HelloWorld/run.sh b/test/others/app-emu/java/HelloWorld/run.sh
index 0ed6afd14..e6dcbd9fc 100644
--- a/test/others/app-emu/java/HelloWorld/run.sh
+++ b/test/others/app-emu/java/HelloWorld/run.sh
@@ -18,7 +18,7 @@ setsid java HelloWorld &
 
 pid=${!}
 
-echo Lanuched java application with pid $pid in background
+echo Launched java application with pid $pid in background
 
 ${criu} dump -D dump -o dump.log -v4 --shell-job -t ${pid} || {
 	echo "Dump failed"
diff --git a/test/others/app-emu/make/run.sh b/test/others/app-emu/make/run.sh
index 7cb44c770..d871b7d9c 100644
--- a/test/others/app-emu/make/run.sh
+++ b/test/others/app-emu/make/run.sh
@@ -28,7 +28,7 @@ setsid make -j4 &
 
 pid=${!}
 
-echo Lanuched make in $pid background
+echo Launched make in $pid background
 sleep 2
 
 ${criu} dump --shell-job -D dump -o dump.log -v4  -t ${pid} || {
diff --git a/test/zdtm/static/child_opened_proc.c b/test/zdtm/static/child_opened_proc.c
index 2125cd264..cfe04fa4b 100644
--- a/test/zdtm/static/child_opened_proc.c
+++ b/test/zdtm/static/child_opened_proc.c
@@ -10,7 +10,7 @@
 #include "zdtmtst.h"
 
 const char *test_doc = "Check that tree prior to files opening";
-const char *test_author = "Stanislav Kinsbursky <skinsbursky@paralles.com";
+const char *test_author = "Stanislav Kinsbursky <skinsbursky@parallels.com>";
 
 int main(int argc, char **argv)
 {
diff --git a/test/zdtm/static/maps00.c b/test/zdtm/static/maps00.c
index b1e55e861..f6989f3af 100644
--- a/test/zdtm/static/maps00.c
+++ b/test/zdtm/static/maps00.c
@@ -137,7 +137,7 @@ static int check_map(struct map *map)
 			}
 		/* prot |= PROT_READ//	need barrier before this line,
 					because compiler change order commands.
-					I finded one method: look at next lines*/
+					I found one method: look at next lines*/
 	} else
 		prot &= PROT_WRITE | !PROT_READ | PROT_EXEC;
 
diff --git a/test/zdtm/static/mntns_root_bind.c b/test/zdtm/static/mntns_root_bind.c
index 9e1ba06e6..4c0347cb2 100644
--- a/test/zdtm/static/mntns_root_bind.c
+++ b/test/zdtm/static/mntns_root_bind.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 		task_waiter_wait4(&t, 2);
 
 		if (access(bspath, F_OK)) {
-			fail("%s isn't accessiable", bspath);
+			fail("%s isn't accessible", bspath);
 			return 1;
 		}
 
diff --git a/test/zdtm/static/stopped.c b/test/zdtm/static/stopped.c
index 059a2a92a..26b0174ed 100644
--- a/test/zdtm/static/stopped.c
+++ b/test/zdtm/static/stopped.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 	}
 
 	if (WIFSTOPPED(status))
-		test_msg("The procces stopped\n");
+		test_msg("The process stopped\n");
 	else {
 		fail("The process doesn't stopped");
 		goto out;
diff --git a/test/zdtm/transition/ipc.c b/test/zdtm/transition/ipc.c
index 0f16dbc68..7660f70af 100644
--- a/test/zdtm/transition/ipc.c
+++ b/test/zdtm/transition/ipc.c
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
 		pr_perror("Child 2 was killed");
 	} else if (WEXITSTATUS(ret)) {
 		fail_count++;
-		pr_perror("Child 2 couldn't inititalise");
+		pr_perror("Child 2 couldn't initialise");
 	}
 out_child:
 	kill(pid1, SIGTERM);
@@ -188,7 +188,7 @@ out_child:
 		pr_perror("Child 1 was killed");
 	} else if (WEXITSTATUS(ret)) {
 		fail_count++;
-		pr_perror("Child 1 couldn't inititalise");
+		pr_perror("Child 1 couldn't initialise");
 	}
 out_shdt:
 	shmdt(mem);
diff --git a/test/zdtm/transition/lazy-thp.c b/test/zdtm/transition/lazy-thp.c
index 2bf99dc4c..2e9722b96 100644
--- a/test/zdtm/transition/lazy-thp.c
+++ b/test/zdtm/transition/lazy-thp.c
@@ -25,7 +25,7 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	/* we presume that malloc returns not page aliged address */
+	/* we presume that malloc returns not page aligned address */
 	mem = malloc(PAGE_SIZE * N_PAGES);
 	org = malloc(PAGE_SIZE);
 	if (!mem || !org) {

From 50e17a1cf3a85d16c7249b6f3d9d750c190eb10d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 24 Apr 2023 07:49:57 +0000
Subject: [PATCH 1272/1854] scripts: make newer versions of shellcheck happy

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/install-debian-pkgs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install-debian-pkgs.sh b/scripts/install-debian-pkgs.sh
index 540c2c094..8be49c787 100755
--- a/scripts/install-debian-pkgs.sh
+++ b/scripts/install-debian-pkgs.sh
@@ -15,7 +15,7 @@ function print_help()
 function process()
 {
 	sudo apt-get update
-	sudo apt-get install -yq "$( sed 's/\#.*$//' ${REQ_PKGS} )"
+	sudo apt-get install -yq "$( sed 's/\#.*$//' "${REQ_PKGS}" )"
 }
 
 if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then

From cc607f810342ac27da03a3b64c7c872b33432f28 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 25 Apr 2023 12:40:12 +0800
Subject: [PATCH 1273/1854] criu-ns: make --pidfile option show pid in caller
 pidns

Using the fact that we know criu_pid and criu is a parent of restored
process we can create pidfile with pid on caller pidns level.

We need to move mount namespace creation to child so that criu-ns can
see caller pidns proc.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 scripts/criu-ns | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index d51e7772c..0f83ca336 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -6,6 +6,7 @@ import sys
 import os
 import fcntl
 import termios
+import time
 
 # <sched.h> constants for unshare
 CLONE_NEWNS = 0x00020000
@@ -110,8 +111,8 @@ def wrap_restore():
     if '--restore-sibling' in restore_args:
         raise OSError(errno.EINVAL, "--restore-sibling is not supported")
 
-    # Unshare pid and mount namespaces
-    if _unshare(CLONE_NEWNS | CLONE_NEWPID) != 0:
+    # Unshare pid namespace
+    if _unshare(CLONE_NEWPID) != 0:
         _errno = ctypes.get_errno()
         raise OSError(_errno, errno.errorcode[_errno])
 
@@ -123,8 +124,32 @@ def wrap_restore():
         restore_detached = True
         restore_args.remove('--restore-detached')
 
+    restore_pidfile = None
+    if '--pidfile' in restore_args:
+        try:
+            opt_index = restore_args.index('--pidfile')
+            restore_pidfile = restore_args[opt_index + 1]
+            del restore_args[opt_index:opt_index + 2]
+        except (ValueError, IndexError, FileNotFoundError):
+            raise OSError(errno.ENOENT, "--pidfile missing argument")
+
+        if not restore_pidfile.startswith('/'):
+            for base_dir_opt in ['--work-dir', '-W', '--images-dir', '-D']:
+                if base_dir_opt in restore_args:
+                    try:
+                        opt_index = restore_args.index(base_dir_opt)
+                        restore_pidfile = os.path.join(restore_args[opt_index + 1], restore_pidfile)
+                        break
+                    except (ValueError, IndexError, FileNotFoundError):
+                        raise OSError(errno.ENOENT, base_dir_opt + " missing argument")
+
     criu_pid = os.fork()
     if criu_pid == 0:
+        # Unshare mount namespace
+        if _unshare(CLONE_NEWNS) != 0:
+            _errno = ctypes.get_errno()
+            raise OSError(_errno, errno.errorcode[_errno])
+
         os.setsid()
         # Set stdin tty to be a controlling tty of our new session, this is
         # required by --shell-job option, as for it CRIU would try to set a
@@ -139,6 +164,25 @@ def wrap_restore():
         _mount_new_proc()
         run_criu(restore_args)
 
+    if restore_pidfile:
+        restored_pid = None
+        retry = 5
+
+        while not restored_pid and retry:
+            with open('/proc/%d/task/%d/children' % (criu_pid, criu_pid)) as f:
+                line = f.readline().strip()
+                if len(line):
+                    restored_pid = line
+                    break
+            retry -= 1
+            time.sleep(1)
+
+        if restored_pid:
+            with open(restore_pidfile, 'w+') as f:
+                f.write(restored_pid)
+        else:
+            print("Warn: Search of restored pid for --pidfile option timeouted")
+
     if restore_detached:
         return 0
 

From b665dce3c71d2f85ca7741c60734d803c12665eb Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 17 May 2023 09:06:15 +0100
Subject: [PATCH 1274/1854] docs: rename amdgpu_plugin.txt to
 criu-amdgpu-plugin.txt

By default, the file name 'amdgpu_plugin.txt' is used also as the name
for the corresponding man page (`man amdgpu_plugin`). However, when
this man page is installed system-wide it would be more appropriate
to have a prefix 'criu-' (e.g., `man criu-amdgpu-plugin`).

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/Makefile                                      | 2 +-
 Documentation/{amdgpu_plugin.txt => criu-amdgpu-plugin.txt} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename Documentation/{amdgpu_plugin.txt => criu-amdgpu-plugin.txt} (94%)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 508551450..72bf0e862 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -16,7 +16,7 @@ ifeq ($(PYTHON),python3)
 SRC1		+= criu-ns.txt
 endif
 SRC1		+= compel.txt
-SRC1            += amdgpu_plugin.txt
+SRC1            += criu-amdgpu-plugin.txt
 SRC8		+= criu.txt
 SRC		:= $(SRC1) $(SRC8)
 XMLS		:= $(patsubst %.txt,%.xml,$(SRC))
diff --git a/Documentation/amdgpu_plugin.txt b/Documentation/criu-amdgpu-plugin.txt
similarity index 94%
rename from Documentation/amdgpu_plugin.txt
rename to Documentation/criu-amdgpu-plugin.txt
index 0d490b429..48a8e2f6d 100644
--- a/Documentation/amdgpu_plugin.txt
+++ b/Documentation/criu-amdgpu-plugin.txt
@@ -3,7 +3,7 @@ ROCM Support(1)
 
 NAME
 ----
-amdgpu_plugin - A plugin extension to CRIU to support checkpoint/restore in
+criu-amdgpu-plugin - A plugin extension to CRIU to support checkpoint/restore in
 userspace for AMD GPUs.
 
 
@@ -22,7 +22,7 @@ Though *criu* is a great tool for checkpointing and restoring running
 applications, it has certain limitations such as it cannot handle
 applications that have device files open. In order to support *ROCm* based
 workloads with *criu* we need to augment criu's core functionality with a
-plugin based extension mechanism. *amdgpu_plugin* provides the necessary support
+plugin based extension mechanism. *criu-amdgpu-plugin* provides the necessary support
 to criu to allow Checkpoint / Restore with ROCm.
 
 

From 36709536e5556b86fd880ea846af0c40245ccc73 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 11 May 2023 16:18:31 +0000
Subject: [PATCH 1275/1854] lib/c: add empty_ns interfaces to libcriu

crun wants to set empty_ns and this interface is missing from the
library. This adds it to libcriu.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/c/criu.c | 11 +++++++++++
 lib/c/criu.h |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index fc8159999..0095bcc9b 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -2030,3 +2030,14 @@ int criu_feature_check(struct criu_feature_check *features, size_t size)
 {
 	return criu_local_feature_check(global_opts, features, size);
 }
+
+void criu_local_set_empty_ns(criu_opts *opts, int namespaces)
+{
+	opts->rpc->has_empty_ns = true;
+	opts->rpc->empty_ns = namespaces;
+}
+
+void criu_set_empty_ns(int namespaces)
+{
+	criu_local_set_empty_ns(global_opts, namespaces);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 28a083d88..3b9cedfd0 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -322,6 +322,9 @@ struct criu_feature_check {
 int criu_feature_check(struct criu_feature_check *features, size_t size);
 int criu_local_feature_check(criu_opts *opts, struct criu_feature_check *features, size_t size);
 
+void criu_local_set_empty_ns(criu_opts *opts, int namespaces);
+void criu_set_empty_ns(int namespaces);
+
 #ifdef __GNUG__
 }
 #endif

From 733f1655122bc8ae518f6c5b160f2cd346af8289 Mon Sep 17 00:00:00 2001
From: Dhanuka Warusadura <csx@tuta.io>
Date: Tue, 4 Apr 2023 13:54:11 +0530
Subject: [PATCH 1276/1854] criu-ns: Add --criu-binary argument to run_criu()

--criu-binary argument provides a way to supply the CRIU binary
location to run_criu().

Related to: #1909

Signed-off-by: Dhanuka Warusadura <csx@tuta.io>
---
 scripts/criu-ns | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 0f83ca336..d4d867b66 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -81,8 +81,21 @@ def run_criu(args):
     Spawn CRIU binary
     """
     print(sys.argv)
-    os.execlp('criu', *['criu'] + args)
-    raise OSError(errno.ENOENT, "No such command")
+
+    if "--criu-binary" in args:
+        try:
+            opt_index = args.index("--criu-binary")
+            path = args[opt_index + 1]
+            del args[opt_index:opt_index + 2]
+            args.insert(0, "criu")
+            os.execv(path, args)
+            raise OSError(errno.ENOENT, "No such command")
+        except (ValueError, IndexError, FileNotFoundError):
+            raise OSError(errno.ENOENT, "--criu-binary missing argument")
+    else:
+        args.insert(0, "criu")
+        os.execvp("criu", args)
+        raise OSError(errno.ENOENT, "No such command")
 
 
 # pidns_holder creates a process that is reparented to the init.

From e4b6fb2d1f2cc8e90c430e1055b7c91385e61c88 Mon Sep 17 00:00:00 2001
From: Dhanuka Warusadura <csx@tuta.io>
Date: Mon, 17 Apr 2023 13:00:39 +0530
Subject: [PATCH 1277/1854] criu-ns: Add support for older Python version in CI

These changes remove and update the changes introduced in
7177938e60b81752a44a8116b3e7e399c24c4fcb in favor of the
Python version in CI.

os.waitstatus_to_exitcode() function appeared in Python 3.9

Related to: #1909

Signed-off-by: Dhanuka Warusadura <csx@tuta.io>
---
 scripts/criu-ns | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index d4d867b66..4c032aa14 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -71,7 +71,19 @@ def _wait_for_process_status(criu_pid):
         try:
             (pid, status) = os.wait()
             if pid == criu_pid:
-                return os.waitstatus_to_exitcode(status)
+                # The following code block is based on
+                # os.waitstatus_to_exitcode() introduced in Python 3.9
+                # and we implement this for comparability with older
+                # versions of Python.
+                if os.WIFSIGNALED(status):
+                    return os.WTERMSIG(status)
+                elif os.WIFEXITED(status):
+                    return os.WEXITSTATUS(status)
+                elif os.WIFSTOPPED(status):
+                    return os.WSTOPSIG(status)
+                else:
+                    raise Exception("CRIU was terminated by an "
+                                    "unidentified reason")
         except OSError:
             return -251
 

From 9c9e8ea3f2e04ea89f9d2d9418177fd6180ed557 Mon Sep 17 00:00:00 2001
From: Dhanuka Warusadura <csx@tuta.io>
Date: Wed, 8 Mar 2023 18:19:17 +0530
Subject: [PATCH 1278/1854] criu-ns: Add tests for criu-ns script

These changes add test implementations for criu-ns script.

Fixes: #1909

Signed-off-by: Dhanuka Warusadura <csx@tuta.io>
---
 Makefile                     |   1 +
 scripts/ci/run-ci-tests.sh   |   1 +
 test/Makefile                |   2 +-
 test/others/criu-ns/Makefile |   3 +
 test/others/criu-ns/run.py   | 258 +++++++++++++++++++++++++++++++++++
 5 files changed, 264 insertions(+), 1 deletion(-)
 create mode 100644 test/others/criu-ns/Makefile
 create mode 100755 test/others/criu-ns/run.py

diff --git a/Makefile b/Makefile
index 8061a42c4..8efdb760d 100644
--- a/Makefile
+++ b/Makefile
@@ -428,6 +428,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
 	flake8 --config=scripts/flake8.cfg lib/py/images/images.py
 	flake8 --config=scripts/flake8.cfg scripts/criu-ns
+	flake8 --config=scripts/flake8.cfg test/others/criu-ns/run.py
 	flake8 --config=scripts/flake8.cfg crit/setup.py
 	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
 	flake8 --config=scripts/flake8.cfg coredump/
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 229de97c1..b45183a84 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -260,6 +260,7 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run
 fi
+make -C test/others/criu-ns/ run
 make -C test/others/skip-file-rwx-check/ run
 make -C test/others/rpc/ run
 
diff --git a/test/Makefile b/test/Makefile
index e8fcffe3f..5784b6a49 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,7 +12,7 @@ all:
 	$(MAKE) zdtm-freezer
 .PHONY: all
 
-TESTS = unix-callback mem-snap rpc libcriu mounts/ext security pipes crit socketpairs overlayfs mnt-ext-dev shell-job skip-file-rwx-check
+TESTS = unix-callback mem-snap rpc libcriu mounts/ext security pipes crit socketpairs overlayfs mnt-ext-dev shell-job criu-ns skip-file-rwx-check
 
 other:
 	for t in $(TESTS); do				\
diff --git a/test/others/criu-ns/Makefile b/test/others/criu-ns/Makefile
new file mode 100644
index 000000000..4d901a111
--- /dev/null
+++ b/test/others/criu-ns/Makefile
@@ -0,0 +1,3 @@
+run:
+	@make -C ../.. zdtm_ct
+	../../zdtm_ct run.py
diff --git a/test/others/criu-ns/run.py b/test/others/criu-ns/run.py
new file mode 100755
index 000000000..6967b46b2
--- /dev/null
+++ b/test/others/criu-ns/run.py
@@ -0,0 +1,258 @@
+#!/usr/bin/env python
+
+import fcntl
+import os
+import pathlib
+import pty
+import shutil
+import subprocess
+import sys
+import termios
+import time
+
+
+CRIU_BIN = "../../../criu/criu"
+CRIU_NS = "../../../scripts/criu-ns"
+IMG_DIR = "dumpdir"
+DUMP_LOG = "dump.log"
+RESTORE_LOG = "restore.log"
+PIDFILE = "pidfile"
+
+
+def check_dumpdir(path=IMG_DIR):
+    if os.path.isdir(path):
+        shutil.rmtree(path)
+    os.mkdir(path, 0o755)
+
+
+def set_blocking(fd, blocking):
+    """Implement os.set_blocking() for compatibility with Python
+    versions earlier than 3.5"""
+    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
+
+    if blocking:
+        flags &= ~os.O_NONBLOCK
+    else:
+        flags |= os.O_NONBLOCK
+
+    fcntl.fcntl(fd, fcntl.F_SETFL, flags)
+
+
+def run_task_with_own_pty(task):
+    fd_m, fd_s = pty.openpty()
+
+    pid = os.fork()
+    if pid == 0:
+        os.close(fd_m)
+        os.setsid()
+        os.dup2(fd_s, 0)
+        os.dup2(fd_s, 1)
+        os.dup2(fd_s, 2)
+        fcntl.ioctl(fd_s, termios.TIOCSCTTY, 1)
+        os.close(fd_s)
+        task()
+        exit(0)
+
+    os.close(fd_s)
+    fd_m = os.fdopen(fd_m, "rb")
+    set_blocking(fd_m.fileno(), False)
+
+    while True:
+        try:
+            data = fd_m.read()
+        except IOError:
+            break
+        if data is not None:
+            print(data.decode("utf-8"))
+
+    _, status = os.waitpid(pid, 0)
+
+    try:
+        data = fd_m.read()
+    except IOError as err:
+        print(err)
+
+    if data is not None:
+        print(data.decode("utf-8"))
+    fd_m.close()
+
+    if status != 0:
+        print("task %s exited badly: %d" % (task.__name__, status))
+        exit(1)
+
+    return 0
+
+
+def create_pty():
+    fd_m, fd_s = pty.openpty()
+    return (os.fdopen(fd_m, "wb"), os.fdopen(fd_s, "wb"))
+
+
+def create_isolated_dumpee():
+    pathlib.Path("running").touch()
+    fd_m, fd_s = create_pty()
+    pid = os.fork()
+    if pid == 0:
+        os.setsid()
+        os.dup2(fd_s.fileno(), 0)
+        os.dup2(fd_s.fileno(), 1)
+        os.dup2(fd_s.fileno(), 2)
+        fcntl.ioctl(fd_s.fileno(), termios.TIOCSCTTY, 1)
+        while True:
+            if not os.access("running", os.F_OK):
+                sys.exit(0)
+            time.sleep(1)
+    fd_m.close()
+    fd_s.close()
+    return pid
+
+
+def criu_ns_dump(pid, shell_job=False):
+    cmd = [CRIU_NS, "dump", "-D", IMG_DIR, "-v4", "-t", str(pid),
+           "--log-file", DUMP_LOG, "--criu-binary", CRIU_BIN]
+    if shell_job:
+        cmd.append("--shell-job")
+    ret = subprocess.Popen(cmd).wait()
+    return ret
+
+
+def criu_ns_restore(shell_job=False, restore_detached=False):
+    cmd = [CRIU_NS, "restore", "-D", IMG_DIR, "-v4", "--log-file",
+           RESTORE_LOG, "--criu-binary", CRIU_BIN]
+    if shell_job:
+        cmd.append("--shell-job")
+    if restore_detached:
+        cmd += ["--restore-detached", "--pidfile", PIDFILE]
+    ret = subprocess.Popen(cmd).wait()
+    return ret
+
+
+def read_log_file(filename):
+    logfile_path = os.path.join(IMG_DIR, filename)
+    with open(logfile_path) as logfile:
+        print(logfile.read())
+
+
+def test_dump_and_restore_with_shell_job():
+    print("Test criu-ns dump and restore with --shell-job option")
+    check_dumpdir()
+    pathlib.Path("running").touch()
+    pid = os.fork()
+    if pid == 0:
+        while True:
+            if not os.access("running", os.F_OK):
+                sys.exit(0)
+            time.sleep(1)
+
+    ret = criu_ns_dump(pid, shell_job=True)
+    if ret != 0:
+        read_log_file(DUMP_LOG)
+        sys.exit(ret)
+
+    os.unlink("running")
+    fd_m, fd_s = create_pty()
+    pid = os.fork()
+    if pid == 0:
+        os.setsid()
+        fd_m.close()
+        # since criu-ns takes control of the tty stdin
+        os.dup2(fd_s.fileno(), 0)
+        ret = criu_ns_restore(shell_job=True)
+        if ret != 0:
+            read_log_file(RESTORE_LOG)
+            sys.exit(ret)
+        os._exit(0)
+
+    fd_s.close()
+    os.waitpid(pid, 0)
+
+
+def test_dump_and_restore_without_shell_job(restore_detached=False):
+    print("Test criu-ns dump and restore with an isolated process"
+          "(%d)" % restore_detached)
+    check_dumpdir()
+    pid = create_isolated_dumpee()
+    ret = criu_ns_dump(pid)
+    if ret != 0:
+        read_log_file(DUMP_LOG)
+        sys.exit(ret)
+
+    if not restore_detached:
+        os.unlink("running")
+
+    pid = os.fork()
+    if pid == 0:
+        os.setsid()
+        ret = criu_ns_restore(restore_detached=restore_detached)
+        if ret != 0:
+            read_log_file(RESTORE_LOG)
+            sys.exit(ret)
+        os._exit(0)
+
+    os.waitpid(pid, 0)
+
+
+def test_dump_and_restore_in_pidns():
+    if os.system("grep NSpid /proc/self/status"):
+        return
+
+    print("Test criu-ns dump and restore in namespaces")
+
+    def _dump():
+        pid = create_isolated_dumpee()
+        ret = criu_ns_dump(pid)
+        if ret != 0:
+            read_log_file(DUMP_LOG)
+            sys.exit(ret)
+
+    def _restore():
+        ret = criu_ns_restore(restore_detached=True)
+        if ret != 0:
+            read_log_file(RESTORE_LOG)
+            sys.exit(ret)
+
+    def _get_restored_pid():
+        restored_pid = 0
+        pidfile_path = os.path.join(IMG_DIR, PIDFILE)
+        if not os.path.exists(pidfile_path):
+            raise FileNotFoundError("pidfile not found")
+        with open(pidfile_path, "r") as pidfile:
+            restored_pid = pidfile.read().strip()
+        return int(restored_pid)
+
+    def _redump():
+        global IMG_DIR
+        try:
+            restored_pid = _get_restored_pid()
+        except FileNotFoundError:
+            sys.exit(1)
+        IMG_DIR = "dumpdir2"
+        check_dumpdir(IMG_DIR)
+        ret = criu_ns_dump(restored_pid)
+        if ret != 0:
+            read_log_file(DUMP_LOG)
+            sys.exit(ret)
+
+    def _re_restore():
+        os.unlink("running")
+        ret = criu_ns_restore()
+        if ret != 0:
+            read_log_file(RESTORE_LOG)
+            sys.exit(ret)
+
+    check_dumpdir()
+    _dump()
+    _restore()
+    _redump()
+    _re_restore()
+
+
+def main():
+    test_dump_and_restore_with_shell_job()
+    test_dump_and_restore_without_shell_job()
+    test_dump_and_restore_without_shell_job(restore_detached=True)
+    test_dump_and_restore_in_pidns()
+
+
+if __name__ == "__main__":
+    run_task_with_own_pty(main)

From 9cd09f5860eefec864705107049692a25220740d Mon Sep 17 00:00:00 2001
From: Dhanuka Warusadura <csx@tuta.io>
Date: Mon, 22 May 2023 14:51:13 +0530
Subject: [PATCH 1279/1854] criu-ns: Install Python pathlib module in CentOS 7

These changes fix the `ImportError: No module named pathlib`
error when executing criu-ns tests located at criu/test/others/criu-ns

Signed-off-by: Dhanuka Warusadura <csx@tuta.io>
---
 .cirrus.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index bd4799fd0..80f3296fc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -134,11 +134,11 @@ task:
     memory: 8G
 
   setup_script: |
-    # EPEL is needed for python2-future, python2-junit_xml, python-flake8 and libbsd-devel.
+    # EPEL is needed for python2-future, python2-junit_xml, python-pathlib, python-flake8 and libbsd-devel.
     # Do not fail if latest epel repository definition is already installed
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm || :
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
-    yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
+    yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six python-pathlib sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
     # Even with selinux in permissive mode the selinux tests will be executed
     # The Cirrus CI user runs as a service from selinux point of view and is
     # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)

From fc08fa9077a87afad9f7c0f882c2743b96715705 Mon Sep 17 00:00:00 2001
From: Dhanuka Warusadura <csx@tuta.io>
Date: Mon, 22 May 2023 15:06:14 +0530
Subject: [PATCH 1280/1854] criu-ns: Update shebang line to python

CentOS 7 CI environment uses Python 2. To execute criu-ns
script in CentOS 7 changing the current shebang line to
python is required.

This reverse the changes made in a15a63fce0ad4d1a9119771577fa7ef562bbfd6b

Signed-off-by: Dhanuka Warusadura <csx@tuta.io>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 4c032aa14..3c77b8eb4 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import ctypes
 import ctypes.util
 import errno

From c6ac396aa3818e47aa82f6c36bea076f64d51c24 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 11 May 2023 22:59:28 +0800
Subject: [PATCH 1281/1854] timers: improve and fix posix timer id sequence
 checks

This is a patch proposed by Thomas here:
https://lore.kernel.org/all/87ilczc7d9.ffs@tglx/

It removes (created id > desired id) "sanity" check and adds proper
checking that ids start at zero and increment by one each time when we
create/delete a posix timer.

First purpose of it is to fix infinite looping in create_posix_timers on
old pre 3.11 kernels.

Second purpose is to allow kernel interface of creating posix timers
with desired id change from iterating with predictable next id to just
setting next id directly. And at the same time removing predictable next
id so that criu with this patch would not get to infinite loop in
create_posix_timers if this happens.

Thanks a lot to Thomas!

Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/pie/restorer.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 9873fdc11..1f08bc2a0 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1169,7 +1169,7 @@ static int timerfd_arm(struct task_restore_args *args)
 static int create_posix_timers(struct task_restore_args *args)
 {
 	int ret, i;
-	kernel_timer_t next_id;
+	kernel_timer_t next_id = 0, timer_id;
 	struct sigevent sev;
 
 	for (i = 0; i < args->posix_timers_n; i++) {
@@ -1183,25 +1183,26 @@ static int create_posix_timers(struct task_restore_args *args)
 		sev.sigev_value.sival_ptr = args->posix_timers[i].spt.sival_ptr;
 
 		while (1) {
-			ret = sys_timer_create(args->posix_timers[i].spt.clock_id, &sev, &next_id);
+			ret = sys_timer_create(args->posix_timers[i].spt.clock_id, &sev, &timer_id);
 			if (ret < 0) {
 				pr_err("Can't create posix timer - %d\n", i);
 				return ret;
 			}
 
-			if (next_id == args->posix_timers[i].spt.it_id)
-				break;
-
-			ret = sys_timer_delete(next_id);
-			if (ret < 0) {
-				pr_err("Can't remove temporaty posix timer 0x%x\n", next_id);
-				return ret;
-			}
-
-			if ((long)next_id > args->posix_timers[i].spt.it_id) {
+			if (timer_id != next_id) {
 				pr_err("Can't create timers, kernel don't give them consequently\n");
 				return -1;
 			}
+			next_id++;
+
+			if (timer_id == args->posix_timers[i].spt.it_id)
+				break;
+
+			ret = sys_timer_delete(timer_id);
+			if (ret < 0) {
+				pr_err("Can't remove temporaty posix timer 0x%x\n", timer_id);
+				return ret;
+			}
 		}
 	}
 

From 2ac15e3ad0cee63a2b49466b51de3f6219cf3d54 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 2 Apr 2023 15:45:05 +0100
Subject: [PATCH 1282/1854] action-scripts: Add pre-stream hook

This hook allows to start image streamer process from an action script.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/action-scripts.c         | 1 +
 criu/img-streamer.c           | 8 ++++++++
 criu/include/action-scripts.h | 1 +
 3 files changed, 10 insertions(+)

diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index 1ce6d9c10..ec0563e16 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -18,6 +18,7 @@
 #include "common/scm.h"
 
 static const char *action_names[ACT_MAX] = {
+	[ACT_PRE_STREAM] = "pre-stream",
 	[ACT_PRE_DUMP] = "pre-dump",
 	[ACT_POST_DUMP] = "post-dump",
 	[ACT_PRE_RESTORE] = "pre-restore",
diff --git a/criu/img-streamer.c b/criu/img-streamer.c
index 7e36eae01..305e6fae5 100644
--- a/criu/img-streamer.c
+++ b/criu/img-streamer.c
@@ -12,6 +12,7 @@
 #include "rst-malloc.h"
 #include "common/scm.h"
 #include "common/lock.h"
+#include "action-scripts.h"
 
 /*
  * We use different path names for the dump and restore sockets because:
@@ -49,10 +50,17 @@ static const char *socket_name_for_mode(int mode)
 int img_streamer_init(const char *image_dir, int mode)
 {
 	struct sockaddr_un addr;
+	int pre_stream_ret;
 	int sockfd;
 
 	img_streamer_mode = mode;
 
+	pre_stream_ret = run_scripts(ACT_PRE_STREAM);
+	if (pre_stream_ret != 0) {
+		pr_err("Pre-stream script failed with %d!\n", pre_stream_ret);
+		return -1;
+	}
+
 	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (sockfd < 0) {
 		pr_perror("Unable to instantiate UNIX socket");
diff --git a/criu/include/action-scripts.h b/criu/include/action-scripts.h
index c2e8850aa..793698c27 100644
--- a/criu/include/action-scripts.h
+++ b/criu/include/action-scripts.h
@@ -4,6 +4,7 @@
 #include "asm/int.h"
 
 enum script_actions {
+	ACT_PRE_STREAM,
 	ACT_PRE_DUMP,
 	ACT_POST_DUMP,
 	ACT_PRE_RESTORE,

From a638043a7fb35307533f16b3ed1108773a37cd37 Mon Sep 17 00:00:00 2001
From: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Date: Tue, 9 Feb 2021 16:55:48 +0300
Subject: [PATCH 1283/1854] cgroup/restore: split prepare_task_cgroup code into
 two separate functions

This does cgroup namespace creation separately from joining task
cgroups. This makes the code more logical, because creating cgroup
namespace also involves joining cgroups but these cgroups can be
different to task's cgroups as they are cgroup namespace roots
(cgns_prefix), and mixing all of them together may lead to
misunderstanding.

Another positive thing is that we consolidate !item->parent checks in
one place in restore_task_with_children.

Signed-off-by: Valeriy Vdovin <valeriy.vdovin@virtuozzo.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cgroup.c         | 54 ++++++++++++++++++++++++++++++++-----------
 criu/cr-restore.c     |  9 +++++++-
 criu/include/cgroup.h |  3 ++-
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 8243ac6d3..bcb7b405a 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1202,17 +1202,12 @@ static int prepare_cgns(CgSetEntry *se)
 	return 0;
 }
 
-static int move_in_cgroup(CgSetEntry *se, bool setup_cgns)
+static int move_in_cgroup(CgSetEntry *se)
 {
 	int i;
 
 	pr_info("Move into %d\n", se->id);
 
-	if (setup_cgns && prepare_cgns(se) < 0) {
-		pr_err("failed preparing cgns\n");
-		return -1;
-	}
-
 	for (i = 0; i < se->n_ctls; i++) {
 		char aux[PATH_MAX];
 		int fd = -1, err, j, aux_off;
@@ -1252,7 +1247,44 @@ static int move_in_cgroup(CgSetEntry *se, bool setup_cgns)
 	return 0;
 }
 
-int prepare_task_cgroup(struct pstree_item *me)
+int prepare_cgroup_namespace(struct pstree_item *root_task)
+{
+	CgSetEntry *se;
+
+	if (opts.manage_cgroups == CG_MODE_IGNORE)
+		return 0;
+
+	if (root_task->parent) {
+		pr_err("Expecting root_task to restore cgroup namespace\n");
+		return -1;
+	}
+
+	/*
+	 * If on dump all dumped tasks are in same cgset with criu we don't
+	 * dump cgsets and thus cgroup namespaces and rely that on restore
+	 * criu caller would prepare proper cgset/cgns for us. Also in case
+	 * of --unprivileged we don't even have the root cgset here.
+	 */
+	if (!rsti(root_task)->cg_set || rsti(root_task)->cg_set == root_cg_set) {
+		pr_info("Cgroup namespace inherited from parent\n");
+		return 0;
+	}
+
+	se = find_rst_set_by_id(rsti(root_task)->cg_set);
+	if (!se) {
+		pr_err("No set %d found\n", rsti(root_task)->cg_set);
+		return -1;
+	}
+
+	if (prepare_cgns(se) < 0) {
+		pr_err("failed preparing cgns\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+int restore_task_cgroup(struct pstree_item *me)
 {
 	struct pstree_item *parent = me->parent;
 	CgSetEntry *se;
@@ -1284,13 +1316,7 @@ int prepare_task_cgroup(struct pstree_item *me)
 		return -1;
 	}
 
-	/* Since don't support nesting of cgroup namespaces, let's only set up
-	 * the cgns (if it exists) in the init task. In the future, we should
-	 * just check that the cgns prefix string matches for all the entries
-	 * in the cgset, and only unshare if that's true.
-	 */
-
-	return move_in_cgroup(se, !me->parent);
+	return move_in_cgroup(se);
 }
 
 void fini_cgroup(void)
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index f02e95f6d..2b99a775d 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1827,6 +1827,13 @@ static int restore_task_with_children(void *_arg)
 		/* Wait prepare_userns */
 		if (restore_finish_ns_stage(CR_STATE_ROOT_TASK, CR_STATE_PREPARE_NAMESPACES) < 0)
 			goto err;
+
+		/*
+		 * Since we don't support nesting of cgroup namespaces, let's
+		 * only set up the cgns (if it exists) in the init task.
+		 */
+		if (prepare_cgroup_namespace(current) < 0)
+			goto err;
 	}
 
 	if (needs_prep_creds(current) && (prepare_userns_creds()))
@@ -1838,7 +1845,7 @@ static int restore_task_with_children(void *_arg)
 	 * we will only move the root one there, others will
 	 * just have it inherited.
 	 */
-	if (prepare_task_cgroup(current) < 0)
+	if (restore_task_cgroup(current) < 0)
 		goto err;
 
 	/* Restore root task */
diff --git a/criu/include/cgroup.h b/criu/include/cgroup.h
index 93f61539c..dc264032e 100644
--- a/criu/include/cgroup.h
+++ b/criu/include/cgroup.h
@@ -9,7 +9,8 @@ struct parasite_dump_cgroup_args;
 extern u32 root_cg_set;
 int dump_thread_cgroup(const struct pstree_item *, u32 *, struct parasite_dump_cgroup_args *args, int id);
 int dump_cgroups(void);
-int prepare_task_cgroup(struct pstree_item *);
+int restore_task_cgroup(struct pstree_item *);
+int prepare_cgroup_namespace(struct pstree_item *);
 int prepare_cgroup(void);
 /* Restore things like cpu_limit in known cgroups. */
 int prepare_cgroup_properties(void);

From 0218b1e8f24312e2f23ed2822b30f5361aa93998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 29 May 2023 19:28:19 +0200
Subject: [PATCH 1284/1854] Fix dumping hugetlb-based memfd on kernels < 4.16.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

4.15-based kernels don't allow F_*SEAL for memfds created with MFD_HUGETLB.
Since seals are not possible in this case, fake F_GETSEALS result as if it
was queried for a non-sealing-enabled memfd.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/memfd.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index da2937703..6a43dece6 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -93,8 +93,17 @@ static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode, const char *
 	}
 
 	mie.seals = fcntl(fd, F_GET_SEALS);
-	if (mie.seals == -1)
-		goto out;
+	if (mie.seals == -1) {
+		if (errno != EINVAL || ~mie.hugetlb_flag & MFD_HUGETLB) {
+			pr_perror("fcntl(F_GET_SEALS)");
+			goto out;
+		}
+		/* Kernels before 4.16 don't allow MFD_HUGETLB |
+		 * MFD_ALLOW_SEALING and return EINVAL for
+		 * fcntl(MFD_HUGETLB-enabled fd).
+		 */
+		mie.seals = F_SEAL_SEAL;
+	}
 
 	if (pb_write_one(img_from_set(glob_imgset, CR_FD_MEMFD_INODE), &mie, PB_MEMFD_INODE))
 		goto out;

From 9943dcde17b58cfe84b721785cb51cf9f1a769ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 31 May 2023 15:07:43 +0200
Subject: [PATCH 1285/1854] Fix mount(cgroup2) for older kernels.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Linux 4.15 doesn't like empty string for cgroup2 mount options.
Pass NULL then to satisfy the kernel check. Log the options for
easier debugging.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cgroup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index bcb7b405a..0bf7b3818 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -639,8 +639,8 @@ static int open_cgroupfs(struct cg_ctl *cc)
 		return -1;
 	}
 
-	if (mount("none", prefix, fstype, 0, mopts) < 0) {
-		pr_perror("Unable to mount %s", mopts);
+	if (mount("none", prefix, fstype, 0, mopts[0] ? mopts : NULL) < 0) {
+		pr_perror("Unable to mount %s %s", fstype, mopts);
 		rmdir(prefix);
 		return -1;
 	}

From 21ce76263b46bddacaae8d8dafe356ab047097db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 2 Jun 2023 18:02:38 +0200
Subject: [PATCH 1286/1854] Restore THP_DISABLE prctl.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The original commit added saving THP_DISABLED flag value, but missed
restoring it. There is restoring code, but used only when --lazy_pages
mode is enabled. Restore the prctl flag always. While at it, rename the
`has_thp_enabled` -> `!thp_disabled` for consistency.

Fixes: bbbd597b4124 (2017-06-28 "mem: add dump state of THP_DISABLED prctl")
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-restore.c       |  2 +-
 criu/include/restorer.h |  2 +-
 criu/include/rst_info.h |  2 --
 criu/mem.c              |  4 ----
 criu/pie/restorer.c     | 16 ++++++----------
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 2b99a775d..bff41dc56 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2971,7 +2971,7 @@ static int prepare_mm(pid_t pid, struct task_restore_args *args)
 
 	args->fd_exe_link = exe_fd;
 
-	args->has_thp_enabled = rsti(current)->has_thp_enabled;
+	args->thp_disabled = mm->has_thp_disabled && mm->thp_disabled;
 
 	ret = 0;
 out:
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index bc0beb5cb..e232f5404 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -144,7 +144,7 @@ struct task_restore_args {
 	struct timeval logstart;
 
 	int uffd;
-	bool has_thp_enabled;
+	bool thp_disabled;
 
 	/* threads restoration */
 	int nr_threads;				 /* number of threads */
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index d0a3db6c5..704b42a72 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -73,8 +73,6 @@ struct rst_info {
 	 */
 	bool has_old_seccomp_filter;
 
-	bool has_thp_enabled;
-
 	struct rst_rseq *rseqe;
 
 	void *breakpoint;
diff --git a/criu/mem.c b/criu/mem.c
index 9bf7cae97..417e0a21d 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1217,8 +1217,6 @@ err_addr:
 
 static int maybe_disable_thp(struct pstree_item *t, struct page_read *pr)
 {
-	MmEntry *mm = rsti(t)->mm;
-
 	/*
 	 * There is no need to disable it if the page read doesn't
 	 * have parent. In this case VMA will be empty until
@@ -1241,8 +1239,6 @@ static int maybe_disable_thp(struct pstree_item *t, struct page_read *pr)
 		pr_perror("Cannot disable THP");
 		return -1;
 	}
-	if (!(mm->has_thp_disabled && mm->thp_disabled))
-		rsti(t)->has_thp_enabled = true;
 
 	return 0;
 }
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 1f08bc2a0..0d1360c52 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1635,17 +1635,13 @@ long __export_restore_task(struct task_restore_args *args)
 			goto core_restore_end;
 	}
 
-	if (args->uffd > -1) {
-		/* re-enable THP if we disabled it previously */
-		if (args->has_thp_enabled) {
-			int ret;
-			ret = sys_prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0);
-			if (ret) {
-				pr_err("Cannot re-enable THP: %d\n", ret);
-				goto core_restore_end;
-			}
-		}
+	ret = sys_prctl(PR_SET_THP_DISABLE, args->thp_disabled, 0, 0, 0);
+	if (ret) {
+		pr_err("Cannot restore THP_DISABLE=%d flag: %ld\n", args->thp_disabled, ret);
+		goto core_restore_end;
+	}
 
+	if (args->uffd > -1) {
 		pr_debug("lazy-pages: closing uffd %d\n", args->uffd);
 		/*
 		 * All userfaultfd configuration has finished at this point.

From 2364c963c65c7f3640ef515dfb2046b78bc9a975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 2 Jun 2023 17:22:06 +0200
Subject: [PATCH 1287/1854] Log if prctl(SET_THP_DISABLE) doesn't work as
 expected.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If prctl(SET_THP_DISABLE) is not used due to bad semantics, log it
for easier debugging.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/kerndat.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index bc0c7ba05..d38e8898e 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1324,6 +1324,8 @@ int kerndat_has_thp_disable(void)
 
 			parse_vmflags(str, &flags, &madv, &io_pf);
 			kdat.has_thp_disable = !(madv & (1 << MADV_NOHUGEPAGE));
+			if (!kdat.has_thp_disable)
+				pr_warn("prctl PR_SET_THP_DISABLE sets MADV_NOHUGEPAGE");
 			break;
 		}
 	}

From a0c78a79020b04ddc1ad88528471892bcdd5b710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 17 May 2023 21:51:59 +0200
Subject: [PATCH 1288/1854] zdtm: thp_disable: Output a single failure message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While at it, don't carry over stale errno to the fail() message.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/thp_disable.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/static/thp_disable.c b/test/zdtm/static/thp_disable.c
index ab88120c2..58d6039f8 100644
--- a/test/zdtm/static/thp_disable.c
+++ b/test/zdtm/static/thp_disable.c
@@ -47,15 +47,14 @@ int main(int argc, char **argv)
 	if (get_smaps_bits((unsigned long)area, &new_flags, &new_madv))
 		return -1;
 
+	errno = 0;
 	if (orig_flags != new_flags) {
-		pr_err("Flags are changed %lx -> %lx\n", orig_flags, new_flags);
-		fail();
+		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
 		return -1;
 	}
 
 	if (orig_madv != new_madv) {
-		pr_err("Madvs are changed %lx -> %lx\n", orig_madv, new_madv);
-		fail();
+		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);
 		return -1;
 	}
 

From 01238d2706e4c2e7eca784baa306a309e3e5a823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 2 Jun 2023 17:11:16 +0200
Subject: [PATCH 1289/1854] zdtm: thp_disable: Verify prctl(THP_DISABLE)
 migration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/thp_disable.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/test/zdtm/static/thp_disable.c b/test/zdtm/static/thp_disable.c
index 58d6039f8..e38508778 100644
--- a/test/zdtm/static/thp_disable.c
+++ b/test/zdtm/static/thp_disable.c
@@ -17,6 +17,7 @@ int main(int argc, char **argv)
 	unsigned long orig_flags = 0, new_flags = 0;
 	unsigned long orig_madv = 0, new_madv = 0;
 	void *area;
+	int ret;
 
 	test_init(argc, argv);
 
@@ -35,9 +36,31 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+	ret = prctl(PR_GET_THP_DISABLE, 0, 0, 0, 0);
+	if (ret < 0) {
+		pr_perror("Getting THP-disabled flag failed");
+		return -1;
+	}
+	if (ret != 1) {
+		errno = 0;
+		fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
+		return -1;
+	}
+
 	test_daemon();
 	test_waitsig();
 
+	ret = prctl(PR_GET_THP_DISABLE, 0, 0, 0, 0);
+	if (ret < 0) {
+		pr_perror("Getting post-migration THP-disabled flag failed");
+		return -1;
+	}
+	if (ret != 1) {
+		errno = 0;
+		fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
+		return -1;
+	}
+
 	if (prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0)) {
 		pr_perror("Enabling THP failed");
 		return -1;

From 93ad8d40de3283130ebad5bd96e188946c018279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 2 Jun 2023 19:01:29 +0200
Subject: [PATCH 1290/1854] zdtm: thp_disable: Verify MADV_NOHUGEPAGE before
 migration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a sanity check for THP_DISABLE. This discovered a broken commit
in Google's kernel tree.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/thp_disable.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/zdtm/static/thp_disable.c b/test/zdtm/static/thp_disable.c
index e38508778..eabb45650 100644
--- a/test/zdtm/static/thp_disable.c
+++ b/test/zdtm/static/thp_disable.c
@@ -47,6 +47,21 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+	test_msg("Fetch pre-migration flags/adv\n");
+	if (get_smaps_bits((unsigned long)area, &new_flags, &new_madv))
+		return -1;
+
+	errno = 0;
+	if (orig_flags != new_flags) {
+		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
+		return -1;
+	}
+
+	if (orig_madv != new_madv) {
+		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);
+		return -1;
+	}
+
 	test_daemon();
 	test_waitsig();
 

From 4c1409b8f69f001aa5db0c0c229e9dad0ae56e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 13 Oct 2021 06:32:43 +0200
Subject: [PATCH 1291/1854] Fill FPU init state if it's not provided by kernel.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apparently Skylake uses init-optimization when saving FPU state, and ptrace()
returns XSTATE_BV[0] = 0 meaning FPU was not used by a task (in init state).
Since CRIU restore uses sigreturn to restore registers, FPU state is always
restored. Fill the state with default values on dump to make restore happy.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 compel/arch/x86/src/lib/infect.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 01959b95b..88bdb4047 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -220,6 +220,16 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigfr
 #define get_signed_user_reg(pregs, name) \
 	((user_regs_native(pregs)) ? (int64_t)((pregs)->native.name) : (int32_t)((pregs)->compat.name))
 
+static int get_task_fpregs(pid_t pid, user_fpregs_struct_t *xsave)
+{
+	if (ptrace(PTRACE_GETFPREGS, pid, NULL, xsave)) {
+		pr_perror("Can't obtain FPU registers for %d", pid);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int get_task_xsave(pid_t pid, user_fpregs_struct_t *xsave)
 {
 	struct iovec iov;
@@ -232,14 +242,15 @@ static int get_task_xsave(pid_t pid, user_fpregs_struct_t *xsave)
 		return -1;
 	}
 
-	return 0;
-}
-
-static int get_task_fpregs(pid_t pid, user_fpregs_struct_t *xsave)
-{
-	if (ptrace(PTRACE_GETFPREGS, pid, NULL, xsave)) {
-		pr_perror("Can't obtain FPU registers for %d", pid);
-		return -1;
+	if ((xsave->xsave_hdr.xstate_bv & 3) != 3) {
+		// Due to init-optimisation [1] x87 FPU or SSE state may not be filled in.
+		// Since those are restored unconditionally, make sure the init values are
+		// filled by retrying with old PTRACE_GETFPREGS.
+		//
+		// [1] Intel® 64 and IA-32 Architectures Software Developer's
+		//     Manual Volume 1: Basic Architecture
+		//     Section 13.6: Processor tracking of XSAVE-managed state
+		return get_task_fpregs(pid, xsave);
 	}
 
 	return 0;

From 4455444eebd004de2bd80d9fdb99811a1d72d90c Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Thu, 15 Jun 2023 15:13:58 -0700
Subject: [PATCH 1292/1854] compel/test: Return 0 in case of error in fdspy

This commit revises the error handling in the fdspy test. Previously,
a failure case could have been incorrectly reported as successful because
of a specific check `pass != 0`, leading to potential false positives
when `check_pipe_ends()` returned `-1` due to a read/write pipe error.

To improve this, we've adjusted the error handling to return `0` in case
of any error. As such, the final success condition remains unchanged. This
approach will help accurately differentiate between successful and failed
cases, ensuring the output "All OK" is printed for success, and "Something
went WRONG" for any failure.

Fixes: 5364ca3 ("compel/test: Fix warn_unused_result")

Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
 compel/test/fdspy/spy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compel/test/fdspy/spy.c b/compel/test/fdspy/spy.c
index 7f20ea2a7..41de99e20 100644
--- a/compel/test/fdspy/spy.c
+++ b/compel/test/fdspy/spy.c
@@ -110,11 +110,11 @@ static int check_pipe_ends(int wfd, int rfd)
 	printf("Check pipe ends are connected\n");
 	if (write(wfd, "1", 2) != 2) {
 		fprintf(stderr, "write to pipe failed\n");
-		return -1;
+		return 0;
 	}
 	if (read(rfd, aux, sizeof(aux)) != sizeof(aux)) {
 		fprintf(stderr, "read from pipe failed\n");
-		return -1;
+		return 0;
 	}
 	if (aux[0] != '1' || aux[1] != '\0') {
 		fprintf(stderr, "Pipe connectivity lost\n");

From 0e88a91ff025c11f53caa53d75b76c9c6b00dfdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 16 Sep 2022 11:01:48 +0200
Subject: [PATCH 1293/1854] Allow passing --leave_stopped by RPC.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-service.c | 3 +++
 images/rpc.proto  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 314c309be..ed4f1edef 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -428,6 +428,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->has_leave_running && req->leave_running)
 		opts.final_state = TASK_ALIVE;
 
+	if (req->has_leave_stopped && req->leave_stopped)
+		opts.final_state = TASK_STOPPED;
+
 	if (!req->has_pid) {
 		req->has_pid = true;
 		req->pid = ids.pid;
diff --git a/images/rpc.proto b/images/rpc.proto
index afd2c7b43..6451e9b73 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -140,6 +140,7 @@ message criu_opts {
 	optional bool			mntns_compat_mode	= 65;
 	optional bool			skip_file_rwx_check	= 66;
 	optional bool			unprivileged		= 67;
+	optional bool			leave_stopped		= 69;
 /*	optional bool			check_mounts		= 128;	*/
 }
 

From 1e5ebec39dbe43fa2aec23feb724b332511be886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20C=C5=82api=C5=84ski?= <mclapinski@google.com>
Date: Fri, 16 Sep 2022 11:06:28 +0200
Subject: [PATCH 1294/1854] Allow passing --display_stats via RPC.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Cłapiński <mclapinski@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-service.c | 3 +++
 images/rpc.proto  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index ed4f1edef..9aa9d5bc8 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -723,6 +723,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->orphan_pts_master)
 		opts.orphan_pts_master = true;
 
+	if (req->has_display_stats)
+		opts.display_stats = req->display_stats;
+
 	/* Evaluate additional configuration file a second time to overwrite
 	 * all RPC settings. */
 	if (req->config_file) {
diff --git a/images/rpc.proto b/images/rpc.proto
index 6451e9b73..cde162f1c 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -141,6 +141,7 @@ message criu_opts {
 	optional bool			skip_file_rwx_check	= 66;
 	optional bool			unprivileged		= 67;
 	optional bool			leave_stopped		= 69;
+	optional bool			display_stats		= 70;
 /*	optional bool			check_mounts		= 128;	*/
 }
 

From 4b764a9dcea83cc8ca96923cfc9a757e6b3020ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20C=C5=82api=C5=84ski?= <mclapinski@google.com>
Date: Fri, 16 Sep 2022 11:14:59 +0200
Subject: [PATCH 1295/1854] Allow passing --log_to_stderr via RPC.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Cłapiński <mclapinski@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-service.c | 3 +++
 images/rpc.proto  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 9aa9d5bc8..915ba3870 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -394,6 +394,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		}
 
 		SET_CHAR_OPTS(output, req->log_file);
+	} else if (req->has_log_to_stderr && req->log_to_stderr && !output_changed_by_rpc_conf) {
+		xfree(opts.output);
+		opts.output = NULL;
 	} else if (!opts.output) {
 		SET_CHAR_OPTS(output, DEFAULT_LOG_FILENAME);
 	}
diff --git a/images/rpc.proto b/images/rpc.proto
index cde162f1c..79623f9f6 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -142,6 +142,7 @@ message criu_opts {
 	optional bool			unprivileged		= 67;
 	optional bool			leave_stopped		= 69;
 	optional bool			display_stats		= 70;
+	optional bool			log_to_stderr		= 71;
 /*	optional bool			check_mounts		= 128;	*/
 }
 

From 516fade932f96a93fb29f5dae3f0e9c9b49ccf92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 21 Apr 2023 15:56:06 +0200
Subject: [PATCH 1296/1854] zdtm: Allow overriding /tmp.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use $TMPDIR for tests_root as the host's /tmp might not have enough
features or space.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 33859f61e..2a657e44d 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -79,7 +79,8 @@ def clean_tests_root():
 def make_tests_root():
     global tests_root
     if not tests_root:
-        tests_root = (os.getpid(), tempfile.mkdtemp("", "criu-root-", "/tmp"))
+        tmpdir = os.environ.get("TMPDIR", "/tmp")
+        tests_root = (os.getpid(), tempfile.mkdtemp("", "criu-root-", tmpdir))
         atexit.register(clean_tests_root)
         os.mkdir(os.path.join(tests_root[1], "root"))
     os.chmod(tests_root[1], 0o777)
@@ -404,7 +405,7 @@ class zdtm_test:
         self.__flavor = flavor
         self.__freezer = freezer
         self._bins = [name]
-        self._env = {}
+        self._env = {'TMPDIR': os.environ.get('TMPDIR', '/tmp')}
         self._deps = desc.get('deps', [])
         self.auto_reap = True
         self.__timeout = int(self.__desc.get('timeout') or 30)
@@ -828,7 +829,7 @@ class groups_test(zdtm_test):
 
         self._bins += self.__subs
         self._deps += get_test_desc('zdtm/lib/groups')['deps']
-        self._env = {'ZDTM_TESTS': self.__real_name}
+        self._env['ZDTM_TESTS'] = self.__real_name
 
     def __get_start_cmd(self, name):
         tdir = os.path.dirname(name)

From ed88e3241cd586ec545a7f78803e933b764eadcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Tue, 25 Apr 2023 21:30:20 +0200
Subject: [PATCH 1297/1854] zdtm: Add timeouts for test commands.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extend ability to limit time taken to all CRIU invocations.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 2a657e44d..b8a0c5a3b 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -399,6 +399,7 @@ class zdtm_test:
         self.__name = name
         self.__desc = desc
         self.__freezer = None
+        self.__timeout = int(self.__desc.get('timeout') or 30)
         self.__rootless = rootless
         self.__make_action('cleanout')
         self.__pid = 0
@@ -408,7 +409,6 @@ class zdtm_test:
         self._env = {'TMPDIR': os.environ.get('TMPDIR', '/tmp')}
         self._deps = desc.get('deps', [])
         self.auto_reap = True
-        self.__timeout = int(self.__desc.get('timeout') or 30)
 
     def __make_action(self, act, env=None, root=None):
         sys.stdout.flush()  # Not to let make's messages appear before ours
@@ -430,7 +430,7 @@ class zdtm_test:
             preexec_fn=self.__freezer and self.__freezer.attach or None)
         if act == "pid":
             try_run_hook(self, ["--post-start"])
-        if s.wait():
+        if s.wait(timeout=self.__timeout):
             raise test_fail_exc(str(s_args))
 
         if self.__freezer:
@@ -839,7 +839,7 @@ class groups_test(zdtm_test):
         subprocess.check_call(s_args + [tname + '.cleanout'])
         s = subprocess.Popen(s_args + ['--dry-run', tname + '.pid'],
                              stdout=subprocess.PIPE)
-        out, _ = s.communicate()
+        out, _ = s.communicate(timeout=self.__timeout)
         cmd = out.decode().splitlines()[-1].strip()
 
         return 'cd /' + tdir + ' && ' + cmd
@@ -883,7 +883,8 @@ class criu_cli:
             fault=None,
             strace=[],
             preexec=None,
-            nowait=False):
+            nowait=False,
+            timeout=60):
         env = dict(
             os.environ,
             ASAN_OPTIONS="log_path=asan.log:disable_coredump=0:detect_leaks=0")
@@ -899,7 +900,7 @@ class criu_cli:
                               preexec_fn=preexec)
         if nowait:
             return cr
-        return cr.wait()
+        return cr.wait(timeout=timeout)
 
 
 class criu_rpc_process:
@@ -982,7 +983,8 @@ class criu_rpc:
             fault=None,
             strace=[],
             preexec=None,
-            nowait=False):
+            nowait=False,
+            timeout=None):
         if fault:
             raise test_fail_exc('RPC and FAULT not supported')
         if strace:

From 1fb5c410c8d7e6992fc1ae270195815d02cee609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 22 May 2023 20:20:18 +0200
Subject: [PATCH 1298/1854] zdtm: Allow --keep-going for single test.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don't want test framework to change its behaviour on whether we
run a single or multiple tests in a run. When we shard the test suite
it can result in some shards having a single test to run and
unexpectedly change the test output format.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index b8a0c5a3b..c278fafff 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2344,11 +2344,6 @@ def run_tests(opts):
         return
 
     torun = list(torun)
-    if opts['keep_going'] and len(torun) < 2:
-        print(
-            "[WARNING] Option --keep-going is more useful when running multiple tests"
-        )
-        opts['keep_going'] = False
 
     if opts['exclude']:
         excl = re.compile(".*(" + "|".join(opts['exclude']) + ")")

From 6bc00fcb84dcb1fc55e745bac5c6939e31045efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 29 May 2023 17:16:15 +0200
Subject: [PATCH 1299/1854] zdtm: Implement test sharding.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allow to split test suite into predictable sets to parallelize runs on
multiple machines or VMs.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index c278fafff..1ef941b4e 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2231,9 +2231,21 @@ def all_tests(opts):
                 continue
             files.append(fp)
     excl = list(map(lambda x: os.path.join(desc['dir'], x), desc['exclude']))
-    tlist = list(filter(
+    tlist = list(sorted(filter(
         lambda x: not x.endswith('.checkskip') and not x.endswith('.hook') and
-        x not in excl, map(lambda x: x.strip(), files)))
+        x not in excl, map(lambda x: x.strip(), files))))
+
+    if opts.get('test_shard_count'):
+        if opts.get('test_shard_index') is None:
+            raise KeyError('--test_shard_count > 0 must come with --test_shard_index')
+        slice_idx = opts['test_shard_index']
+        slices = opts['test_shard_count']
+        if slice_idx >= slices:
+            raise IndexError('--test_shard_index not less than --test_shard_count ({} >= {})'.format(slice_idx, slices))
+        slist = list(tlist[slice_idx::slices])
+        print("We're shard #{} of {}. Running {} of {} tests.\n".format(slice_idx, slices, len(slist), len(tlist)))
+        tlist = slist
+
     return tlist
 
 
@@ -2765,6 +2777,10 @@ def get_cli_args():
     rp.add_argument("--mntns-compat-mode",
                     help="Use old compat mounts restore engine",
                     action='store_true')
+    rp.add_argument("--test-shard-index", type=int, default=None,
+                    help="Select tests for a shard <index> (0-based)")
+    rp.add_argument("--test-shard-count", type=int, default=0,
+                    help="Specify how many shards are being run (0=sharding disabled; must be the same for all shards)")
 
     lp = sp.add_parser("list", help="List tests")
     lp.set_defaults(action=list_tests)

From d0ac547b3dca04ba7b3b1d5c36d60859a4dccb8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 18 May 2023 12:15:51 +0200
Subject: [PATCH 1300/1854] zdtm: sock_opts00: Improve error messages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make it clear that the option numbers are indexes not the option
identifiers ("names"). Also show the value change that prompted test
failure.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/sock_opts00.c | 51 +++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/test/zdtm/static/sock_opts00.c b/test/zdtm/static/sock_opts00.c
index 5b4624f6d..fcf00ffed 100644
--- a/test/zdtm/static/sock_opts00.c
+++ b/test/zdtm/static/sock_opts00.c
@@ -12,21 +12,27 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 #define TEST_PORT 59687
 #define TEST_ADDR INADDR_ANY
 
-#define NOPTS 8
-
 int main(int argc, char **argv)
 {
-	int sock, ret = 0, vname[NOPTS], val[NOPTS], rval, i;
-	socklen_t len = sizeof(int);
+	#define OPT(x) { x, #x }
+	static const struct {
+		int opt;
+		const char *name;
+	} vname[] = {
+		OPT(SO_PRIORITY),
+		OPT(SO_RCVLOWAT),
+		OPT(SO_MARK),
+		OPT(SO_PASSCRED),
+		OPT(SO_PASSSEC),
+		OPT(SO_DONTROUTE),
+		OPT(SO_NO_CHECK),
+		OPT(SO_OOBINLINE),
+	};
+	static const int NOPTS = sizeof(vname) / sizeof(*vname);
+	#undef OPT
 
-	vname[0] = SO_PRIORITY;
-	vname[1] = SO_RCVLOWAT;
-	vname[2] = SO_MARK;
-	vname[3] = SO_PASSCRED;
-	vname[4] = SO_PASSSEC;
-	vname[5] = SO_DONTROUTE;
-	vname[6] = SO_NO_CHECK;
-	vname[7] = SO_OOBINLINE;
+	int sock, ret = 0, val[NOPTS], rval, i;
+	socklen_t len = sizeof(int);
 
 	test_init(argc, argv);
 
@@ -37,29 +43,29 @@ int main(int argc, char **argv)
 	}
 
 	for (i = 0; i < NOPTS; i++) {
-		ret = getsockopt(sock, SOL_SOCKET, vname[i], &val[i], &len);
+		ret = getsockopt(sock, SOL_SOCKET, vname[i].opt, &val[i], &len);
 		if (ret) {
-			pr_perror("can't get option %d", i);
+			pr_perror("can't get %s", vname[i].name);
 			return 1;
 		}
 
 		val[i]++;
 
-		ret = setsockopt(sock, SOL_SOCKET, vname[i], &val[i], len);
+		ret = setsockopt(sock, SOL_SOCKET, vname[i].opt, &val[i], len);
 		if (ret) {
-			pr_perror("can't set option %d", i);
+			pr_perror("can't set %s = %d", vname[i].name, val[i]);
 			return 1;
 		}
 
-		ret = getsockopt(sock, SOL_SOCKET, vname[i], &rval, &len);
+		ret = getsockopt(sock, SOL_SOCKET, vname[i].opt, &rval, &len);
 		if (ret) {
-			pr_perror("can't get option %d 2", i);
+			pr_perror("can't re-get %s", vname[i].name);
 			return 1;
 		}
 
 		if (rval != val[i]) {
 			if (rval + 1 == val[i]) {
-				pr_perror("can't reset option %d want %d have %d", i, val[i], rval);
+				pr_perror("failed to set %s: want %d have %d", vname[i].name, val[i], rval);
 				return 1;
 			}
 
@@ -72,14 +78,15 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	for (i = 0; i < NOPTS; i++) {
-		ret = getsockopt(sock, SOL_SOCKET, vname[i], &rval, &len);
+		ret = getsockopt(sock, SOL_SOCKET, vname[i].opt, &rval, &len);
 		if (ret) {
-			pr_perror("can't get option %d again", i);
+			pr_perror("can't verify %s", vname[i].name);
 			return 1;
 		}
 
 		if (val[i] != rval) {
-			fail("option %d changed", i);
+			errno = 0;
+			fail("%s changed: %d -> %d", vname[i].name, val[i], rval);
 			return 1;
 		}
 	}

From c97cc6a6ce9094ad78ccdaa3a174b5ff7ee07a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 12 Sep 2022 16:17:43 +0200
Subject: [PATCH 1301/1854] Allow skipping iptables/nftables invocation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make it possible to skip network lock to enable uses that break connections
anyway to work without iptables/nftables being present.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 Documentation/criu.txt    | 3 +++
 criu/config.c             | 2 ++
 criu/cr-service.c         | 3 +++
 criu/include/cr_options.h | 1 +
 criu/net.c                | 6 ++++++
 criu/sk-tcp.c             | 6 ++++++
 images/rpc.proto          | 1 +
 lib/c/criu.c              | 2 +-
 lib/c/criu.h              | 1 +
 9 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 0e7d19c4c..0c4cf8b61 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -457,6 +457,9 @@ The 'mode' may be one of the following:
 
     *nftables*::: Use nftables rules to drop the packets.
 
+    *skip*::: Don't lock the network. If *--tcp-close* is not used, the network
+    must be locked externally to allow CRIU to dump TCP connections.
+
 *restore*
 ~~~~~~~~~
 Restores previously checkpointed processes.
diff --git a/criu/config.c b/criu/config.c
index 9f02ae992..1322a490a 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -1036,6 +1036,8 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 				opts.network_lock_method = NETWORK_LOCK_IPTABLES;
 			} else if (!strcmp("nftables", optarg)) {
 				opts.network_lock_method = NETWORK_LOCK_NFTABLES;
+			} else if (!strcmp("skip", optarg) || !strcmp("none", optarg)) {
+				opts.network_lock_method = NETWORK_LOCK_SKIP;
 			} else {
 				pr_err("Invalid value for --network-lock: %s\n", optarg);
 				return 1;
diff --git a/criu/cr-service.c b/criu/cr-service.c
index 915ba3870..fa7490370 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -526,6 +526,9 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		case CRIU_NETWORK_LOCK_METHOD__NFTABLES:
 			opts.network_lock_method = NETWORK_LOCK_NFTABLES;
 			break;
+		case CRIU_NETWORK_LOCK_METHOD__SKIP:
+			opts.network_lock_method = NETWORK_LOCK_SKIP;
+			break;
 		default:
 			goto err;
 		}
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index c7e98c756..60cf9437e 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -67,6 +67,7 @@ struct cg_root_opt {
 enum NETWORK_LOCK_METHOD {
 	NETWORK_LOCK_IPTABLES,
 	NETWORK_LOCK_NFTABLES,
+	NETWORK_LOCK_SKIP,
 };
 
 #define NETWORK_LOCK_DEFAULT NETWORK_LOCK_IPTABLES
diff --git a/criu/net.c b/criu/net.c
index 84250598c..4abfc182a 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3131,6 +3131,9 @@ int network_lock_internal(void)
 {
 	int ret = 0, nsret;
 
+	if (opts.network_lock_method == NETWORK_LOCK_SKIP)
+		return 0;
+
 	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
 		return -1;
 
@@ -3193,6 +3196,9 @@ static int network_unlock_internal(void)
 {
 	int ret = 0, nsret;
 
+	if (opts.network_lock_method == NETWORK_LOCK_SKIP)
+		return 0;
+
 	if (switch_ns(root_item->pid->real, &net_ns_desc, &nsret))
 		return -1;
 
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 96d5d13bf..630a182a2 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -39,6 +39,8 @@ static int lock_connection(struct inet_sk_desc *sk)
 		return iptables_lock_connection(sk);
 	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
 		return nftables_lock_connection(sk);
+	else if (opts.network_lock_method == NETWORK_LOCK_SKIP)
+		return 0;
 
 	return -1;
 }
@@ -50,6 +52,8 @@ static int unlock_connection(struct inet_sk_desc *sk)
 	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
 		/* All connections will be unlocked in network_unlock(void) */
 		return 0;
+	else if (opts.network_lock_method == NETWORK_LOCK_SKIP)
+		return 0;
 
 	return -1;
 }
@@ -483,6 +487,8 @@ static int unlock_connection_info(struct inet_sk_info *si)
 	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
 		/* All connections will be unlocked in network_unlock(void) */
 		return 0;
+	else if (opts.network_lock_method == NETWORK_LOCK_SKIP)
+		return 0;
 
 	return -1;
 }
diff --git a/images/rpc.proto b/images/rpc.proto
index 79623f9f6..8748bdaff 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -52,6 +52,7 @@ enum criu_cg_mode {
 enum criu_network_lock_method {
 	IPTABLES = 	1;
 	NFTABLES = 	2;
+	SKIP =  	3;
 };
 
 enum criu_pre_dump_mode {
diff --git a/lib/c/criu.c b/lib/c/criu.c
index 0095bcc9b..7f766db85 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -1868,7 +1868,7 @@ void criu_set_pidfd_store_sk(int sk)
 int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method)
 {
 	opts->rpc->has_network_lock = true;
-	if (method == CRIU_NETWORK_LOCK_IPTABLES || method == CRIU_NETWORK_LOCK_NFTABLES) {
+	if (method == CRIU_NETWORK_LOCK_IPTABLES || method == CRIU_NETWORK_LOCK_NFTABLES || method == CRIU_NETWORK_LOCK_SKIP) {
 		opts->rpc->network_lock = (CriuNetworkLockMethod)method;
 		return 0;
 	}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index 3b9cedfd0..c1c607869 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -50,6 +50,7 @@ enum criu_cg_mode {
 enum criu_network_lock_method {
 	CRIU_NETWORK_LOCK_IPTABLES = 1,
 	CRIU_NETWORK_LOCK_NFTABLES = 2,
+	CRIU_NETWORK_LOCK_SKIP = 3,
 };
 
 enum criu_pre_dump_mode { CRIU_PRE_DUMP_SPLICE = 1, CRIU_PRE_DUMP_READ = 2 };

From 304a309aed9fd28f5b55d9814c6e0e1febe02f04 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 18 Jun 2023 09:53:48 +0200
Subject: [PATCH 1302/1854] test/thp_disable: fix lint

The fail() macro provides a new line character at the end of the
message. This patch fixes the following lint check that currently
fails in CI:

$ git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
test/zdtm/static/thp_disable.c:		fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
test/zdtm/static/thp_disable.c:		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
test/zdtm/static/thp_disable.c:		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);
test/zdtm/static/thp_disable.c:		fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
test/zdtm/static/thp_disable.c:		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
test/zdtm/static/thp_disable.c:		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);

Fixes: #2193

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/kerndat.c                 |  2 +-
 test/zdtm/static/thp_disable.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index d38e8898e..4565e5307 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1325,7 +1325,7 @@ int kerndat_has_thp_disable(void)
 			parse_vmflags(str, &flags, &madv, &io_pf);
 			kdat.has_thp_disable = !(madv & (1 << MADV_NOHUGEPAGE));
 			if (!kdat.has_thp_disable)
-				pr_warn("prctl PR_SET_THP_DISABLE sets MADV_NOHUGEPAGE");
+				pr_warn("prctl PR_SET_THP_DISABLE sets MADV_NOHUGEPAGE\n");
 			break;
 		}
 	}
diff --git a/test/zdtm/static/thp_disable.c b/test/zdtm/static/thp_disable.c
index eabb45650..55609f260 100644
--- a/test/zdtm/static/thp_disable.c
+++ b/test/zdtm/static/thp_disable.c
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
 	}
 	if (ret != 1) {
 		errno = 0;
-		fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
+		fail("prctl(GET_THP_DISABLE) returned unexpected value: %d != 1", ret);
 		return -1;
 	}
 
@@ -53,12 +53,12 @@ int main(int argc, char **argv)
 
 	errno = 0;
 	if (orig_flags != new_flags) {
-		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
+		fail("Flags changed %lx -> %lx", orig_flags, new_flags);
 		return -1;
 	}
 
 	if (orig_madv != new_madv) {
-		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);
+		fail("Madvs changed %lx -> %lx", orig_madv, new_madv);
 		return -1;
 	}
 
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 	}
 	if (ret != 1) {
 		errno = 0;
-		fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1\n", ret);
+		fail("post-migration prctl(GET_THP_DISABLE) returned unexpected value: %d != 1", ret);
 		return -1;
 	}
 
@@ -87,12 +87,12 @@ int main(int argc, char **argv)
 
 	errno = 0;
 	if (orig_flags != new_flags) {
-		fail("Flags changed %lx -> %lx\n", orig_flags, new_flags);
+		fail("Flags changed %lx -> %lx", orig_flags, new_flags);
 		return -1;
 	}
 
 	if (orig_madv != new_madv) {
-		fail("Madvs changed %lx -> %lx\n", orig_madv, new_madv);
+		fail("Madvs changed %lx -> %lx", orig_madv, new_madv);
 		return -1;
 	}
 

From ffa1e47fd81c13a315a095949100677505af4b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 22:40:10 +0200
Subject: [PATCH 1303/1854] sockets: Increase the size of sockets hashmap to
 16K.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During dump, CRIU stores the structs representing sockets in a statically sized
hashmap of size 32. We have some (admittedly crazy) tasks that use tens of
thousands of sockets, and seem to spend most of the dump time iterating over
the linked lists of the map.

16K is chosen arbitrarily, so that it reduces the lengths of the chains to few
elements on average, while not introducing significant memory overhead.

From: Radosław Burny <rburny@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/sockets.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/sockets.c b/criu/sockets.c
index d17e0a986..560c76517 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -38,7 +38,7 @@
 #define SOCK_DIAG_BY_FAMILY 20
 #endif
 
-#define SK_HASH_SIZE 32
+#define SK_HASH_SIZE (1 << 14)
 
 #ifndef SO_GET_FILTER
 #define SO_GET_FILTER SO_ATTACH_FILTER

From eea0d6edeea67c830ac8edb212e1ad66b4757b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 22:38:31 +0200
Subject: [PATCH 1304/1854] pipes: Plug pipe fd leak in "Unable to set a pipe
 size" error case.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Piotr Figiel <figiel@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/pipes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pipes.c b/criu/pipes.c
index 43ff06e3d..daada8830 100644
--- a/criu/pipes.c
+++ b/criu/pipes.c
@@ -434,7 +434,7 @@ int dump_one_pipe_data(struct pipe_data_dump *pd, int lfd, const struct fd_parms
 	/* steal_pipe has to be able to fit all data from a target pipe */
 	if (fcntl(steal_pipe[1], F_SETPIPE_SZ, pipe_size) < 0) {
 		pr_perror("Unable to set a pipe size");
-		goto err;
+		goto err_close;
 	}
 
 	bytes = tee(lfd, steal_pipe[1], pipe_size, SPLICE_F_NONBLOCK);

From e5c9bc4d087cdbed31fe27ef4b6adae5719e975b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 18:54:28 +0200
Subject: [PATCH 1305/1854] kerndat: Make socket feature probing work on
 IPv6-only host.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Try IPv6 if IPv4 sockets are not supported.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-check.c |  2 ++
 criu/kerndat.c  | 55 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index a4166f76b..cb083b16c 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1086,6 +1086,8 @@ static int kerndat_tcp_repair_window(void)
 	int sk, val = 1;
 
 	sk = socket(AF_INET, SOCK_STREAM, 0);
+	if (sk < 0 && errno == EAFNOSUPPORT)
+		sk = socket(AF_INET6, SOCK_STREAM, 0);
 	if (sk < 0) {
 		pr_perror("Unable to create inet socket");
 		goto errn;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 4565e5307..b2e39cb40 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -12,7 +12,7 @@
 #include <sys/sysmacros.h>
 #include <stdint.h>
 #include <sys/socket.h>
-#include <arpa/inet.h> /* for sockaddr_in and inet_ntoa() */
+#include <netinet/in.h>
 #include <sys/prctl.h>
 #include <sys/inotify.h>
 #include <sched.h>
@@ -615,29 +615,52 @@ static int kerndat_iptables_has_xtlocks(void)
 	return 0;
 }
 
-int kerndat_tcp_repair(void)
-{
-	int sock, clnt = -1, yes = 1, exit_code = -1;
-	struct sockaddr_in addr;
-	socklen_t aux;
+/*
+ * Unfortunately in C htonl() is not constexpr and cannot be used in a static
+ * initialization below.
+ */
+#define constant_htonl(x) \
+	(__BYTE_ORDER == __BIG_ENDIAN ? (x) : \
+		(((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
+		(((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	inet_pton(AF_INET, "127.0.0.1", &(addr.sin_addr));
-	addr.sin_port = 0;
+static int kerndat_tcp_repair(void)
+{
+	static const struct sockaddr_in loopback_ip4 = {
+		.sin_family = AF_INET,
+		.sin_port = 0,
+		.sin_addr = { constant_htonl(INADDR_LOOPBACK) },
+	};
+	static const struct sockaddr_in6 loopback_ip6 = {
+		.sin6_family = AF_INET6,
+		.sin6_port = 0,
+		.sin6_addr = IN6ADDR_LOOPBACK_INIT,
+	};
+	int sock, clnt = -1, yes = 1, exit_code = -1;
+	const struct sockaddr *addr;
+	struct sockaddr_storage listener_addr;
+	socklen_t addrlen;
+
+	addr = (const struct sockaddr *)&loopback_ip4;
+	addrlen = sizeof(loopback_ip4);
 	sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (sock < 0 && errno == EAFNOSUPPORT) {
+		addr = (const struct sockaddr *)&loopback_ip6;
+		addrlen = sizeof(loopback_ip6);
+		sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+	}
 	if (sock < 0) {
 		pr_perror("Unable to create a socket");
 		return -1;
 	}
 
-	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr))) {
+	if (bind(sock, addr, addrlen)) {
 		pr_perror("Unable to bind a socket");
 		goto err;
 	}
 
-	aux = sizeof(addr);
-	if (getsockname(sock, (struct sockaddr *)&addr, &aux)) {
+	addrlen = sizeof(listener_addr);
+	if (getsockname(sock, (struct sockaddr *)&listener_addr, &addrlen)) {
 		pr_perror("Unable to get a socket name");
 		goto err;
 	}
@@ -647,13 +670,13 @@ int kerndat_tcp_repair(void)
 		goto err;
 	}
 
-	clnt = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	clnt = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
 	if (clnt < 0) {
 		pr_perror("Unable to create a socket");
 		goto err;
 	}
 
-	if (connect(clnt, (struct sockaddr *)&addr, sizeof(addr))) {
+	if (connect(clnt, (const struct sockaddr *)&listener_addr, addrlen)) {
 		pr_perror("Unable to connect a socket");
 		goto err;
 	}
@@ -977,6 +1000,8 @@ int kerndat_sockopt_buf_lock(void)
 	int sock;
 
 	sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (sock < 0 && errno == EAFNOSUPPORT)
+		sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
 	if (sock < 0) {
 		pr_perror("Unable to create a socket");
 		return -1;

From 2bf10c8d279613b864cdd1844b0bba457bf2fcf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 18:23:16 +0200
Subject: [PATCH 1306/1854] restore: remove unused `secbits` field.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/include/restorer.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index e232f5404..2475ee0bc 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -72,7 +72,6 @@ struct thread_creds_args {
 	u32 cap_eff[CR_CAP_SIZE];
 	u32 cap_bnd[CR_CAP_SIZE];
 
-	unsigned int secbits;
 	char *lsm_profile;
 	unsigned int *groups;
 	char *lsm_sockcreate;

From 1a1fa439c7d141e30fec81855521e97109d8d8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 20 Jun 2022 20:36:31 +0200
Subject: [PATCH 1307/1854] build: Remove HAS_MEMFD test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The test for HAS_MEMFD is empty and noit used. Remove it.

Fixes: 5ee1ac1f28e6 ("criu: remove FEATURE_TEST_MEMFD")
Change-Id: I43b8f0cfd50ce9bdf93dafb647377318df1deae8
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 Makefile.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.config b/Makefile.config
index 270ec61c0..a13165aa7 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -78,7 +78,7 @@ export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW MEMFD_CREATE \
+	SETPROCTITLE_INIT TCP_REPAIR_WINDOW MEMFD_CREATE \
 	OPENAT2 NO_LIBC_RSEQ_DEFS
 
 # $1 - config name

From cbbe6c683d5181c572d1e9c2ed98c1fd41f3b80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 20 Jun 2022 20:36:30 +0200
Subject: [PATCH 1308/1854] build: Debug system feature tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`make` without `-s` option will normally show the commands executed. In
the case of detecting build environment features current makefile will
cause detected features to be seen as 'echo #define' commands, but not
detected ones will be silent. Change it so that all tried features can
be seen (outside of make's silent mode) regardless of detection result.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 Makefile.config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.config b/Makefile.config
index a13165aa7..8f2b5208e 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -85,7 +85,8 @@ FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
 define gen-feature-test
 ifeq ($$(call try-cc,$$(FEATURE_TEST_$(1)),$$(LIBS_FEATURES),$$(DEFINES)),true)
 	$(Q) echo '#define CONFIG_HAS_$(1)' >> $$@
-	$(Q) echo '' >> $$@
+else
+	$(Q) echo '// CONFIG_HAS_$(1) is not set' >> $$@
 endif
 endef
 

From 88f8fdda82a75d130a95a6691fc9141828a0025c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 20 Jun 2022 21:00:20 +0200
Subject: [PATCH 1309/1854] build: Fix LIBS vs LDFLAGS order.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

$LDFLAGS can contain `-Ldir`s that are required by '-lib's in $LIBS.
Reverse the order so that `-L` options make effect.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/Makefile b/criu/Makefile
index 55bdb1b7a..c6050d582 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -85,7 +85,7 @@ $(obj)/%: pie
 
 $(obj)/criu: $(PROGRAM-BUILTINS)
 	$(call msg-link, $@)
-	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) $(WRAPFLAGS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
+	$(Q) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) $(WRAPFLAGS) $(GMONLDOPT) -rdynamic -o $@
 
 UNIT-BUILTINS		+= $(obj)/util.o
 UNIT-BUILTINS		+= $(obj)/config.o
@@ -102,7 +102,7 @@ $(obj)/unittest/built-in.o: .FORCE
 
 $(obj)/unittest/unittest: $(UNIT-BUILTINS)
 	$(call msg-link, $@)
-	$(Q) $(CC) $(CFLAGS) $^ $(LIBS) $(WRAPFLAGS) $(LDFLAGS) -rdynamic -o $@
+	$(Q) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) $(WRAPFLAGS) -rdynamic -o $@
 
 unittest: $(obj)/unittest/unittest
 	$(Q) $(obj)/unittest/$@

From c5142104a2cba9684ea307901c9ce7153ae9b0e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 21 Apr 2023 15:51:41 +0200
Subject: [PATCH 1310/1854] build: Use make-provided AR for building
 libzdtmtst.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make $(AR) used also for libzdtmtst build.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index 90bd28f9e..b574e1d3e 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -34,4 +34,4 @@ clean: clean-more
 
 $(LIB):	$(LIBOBJ)
 	$(E) " AR       " $@
-	$(Q)ar rcs $@ $^
+	$(Q)$(AR) rcs $@ $^

From f043cb22af5558c339c085c21a869d46ffc35c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 20 Jun 2022 20:36:28 +0200
Subject: [PATCH 1311/1854] build: Guard against libbsd's version of
 `__aligned`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When trying to build CRIU with libbsd enabled the compilation fails due
to duplicate definition of __aligned macro. Other such definitions are
already wrapped with #ifndef make __aligned definition consistent and
make it easier in the future to use the libbsd features if needed.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 include/common/compiler.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/common/compiler.h b/include/common/compiler.h
index bd3de01df..1c9d3db8d 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -47,7 +47,9 @@
 #define noinline __attribute__((noinline))
 #endif
 
+#ifndef __aligned
 #define __aligned(x) __attribute__((aligned(x)))
+#endif
 
 /*
  * Macro to define stack alignment.

From 3e0a8ffd6dbbacf3cca4b84e4046c619d7a23c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 18:34:58 +0200
Subject: [PATCH 1312/1854] build: libnfnetlink: Remove nla_get_s32().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nla_get_s32() was added to libnl 3.2.7 in 2015. Remove CRIU's definition
as it breaks build when statically linking the binary.

From: Uros Prestor <urosp@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/libnetlink.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/criu/libnetlink.c b/criu/libnetlink.c
index f0304b0db..c7a84a44d 100644
--- a/criu/libnetlink.c
+++ b/criu/libnetlink.c
@@ -214,8 +214,3 @@ int __wrap_nlmsg_parse(struct nlmsghdr *nlh, int hdrlen, struct nlattr *tb[], in
 
 	return nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen), nlmsg_attrlen(nlh, hdrlen), policy);
 }
-
-int32_t nla_get_s32(const struct nlattr *nla)
-{
-	return *(const int32_t *)nla_data(nla);
-}

From 28d00563887de7fb4d9892bb980abc3450b01213 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 24 Jun 2023 11:39:21 +0100
Subject: [PATCH 1313/1854] action-scripts: allow shell scripts in rpc mode

Container runtimes commonly use CRIU with RPC. However, this prevents
the use of action-scripts set in a CRIU configuration file due to the
explicit scripts mode introduced with the following commit:

  ac78f13bdfaee260dd4234f054bf4c5d2a373783
  actions: Introduce explicit scripts mode

This patch enables container checkpoint/restore with action-scripts
specified via configuration file.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/action-scripts.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index ec0563e16..1c9a8f091 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -52,6 +52,9 @@ static int run_shell_scripts(const char *action)
 #define ENV_IMGDIR  0x1
 #define ENV_ROOTPID 0x2
 
+	if (list_empty(&scripts))
+		return 0;
+
 	if (setenv("CRTOOLS_SCRIPT_ACTION", action, 1)) {
 		pr_perror("Can't set CRTOOLS_SCRIPT_ACTION=%s", action);
 		return -1;
@@ -119,23 +122,24 @@ int run_scripts(enum script_actions act)
 
 	pr_debug("Running %s scripts\n", action);
 
-	if (scripts_mode == SCRIPTS_NONE)
+	switch (scripts_mode) {
+	case SCRIPTS_NONE:
 		return 0;
-
-	if (scripts_mode == SCRIPTS_RPC) {
+	case SCRIPTS_RPC:
 		ret = rpc_send_fd(act, -1);
-		goto out;
-	}
-
-	if (scripts_mode == SCRIPTS_SHELL) {
+		if (ret)
+			break;
+		/* Enable scripts from config file in RPC mode (fallthrough) */
+	case SCRIPTS_SHELL:
 		ret = run_shell_scripts(action);
-		goto out;
+		break;
+	default:
+		BUG();
 	}
 
-	BUG();
-out:
 	if (ret)
 		pr_err("One of more action scripts failed\n");
+
 	return ret;
 }
 
@@ -143,8 +147,9 @@ int add_script(char *path)
 {
 	struct script *script;
 
-	BUG_ON(scripts_mode == SCRIPTS_RPC);
-	scripts_mode = SCRIPTS_SHELL;
+	/* Set shell mode when a script is added but don't overwrite RPC mode */
+	if (scripts_mode == SCRIPTS_NONE)
+		scripts_mode = SCRIPTS_SHELL;
 
 	script = xmalloc(sizeof(struct script));
 	if (script == NULL)
@@ -170,7 +175,6 @@ int add_rpc_notify(int sk)
 		return -1;
 	}
 
-	BUG_ON(scripts_mode == SCRIPTS_SHELL);
 	scripts_mode = SCRIPTS_RPC;
 
 	if (install_service_fd(RPC_SK_OFF, fd) < 0)

From 82a0db036e3e039e5f659b6b8e56a10e4fcb4939 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 24 Jun 2023 11:58:47 +0100
Subject: [PATCH 1314/1854] docker/podman: test c/r with action-script

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 3 +++
 scripts/ci/podman-test.sh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index beb7da6da..bd46d5dd3 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -28,6 +28,9 @@ CRIU_LOG='/criu.log'
 mkdir -p /etc/criu
 echo "log-file=$CRIU_LOG" > /etc/criu/runc.conf
 
+# Test checkpoint/restore with action script
+echo "action-script /usr/bin/true" | sudo tee /etc/criu/default.conf
+
 export SKIP_CI_TEST=1
 
 ./run-ci-tests.sh
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 687acb8ff..72ad59a50 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -17,6 +17,9 @@ mkdir -p /etc/criu
 echo "manage-cgroups ignore" > /etc/criu/runc.conf
 sed -i 's/#runtime\s*=\s*.*/runtime = "runc"/' /usr/share/containers/containers.conf
 
+# Test checkpoint/restore with action script
+echo "action-script /usr/bin/true" | sudo tee /etc/criu/default.conf
+
 podman info
 
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'

From 439b522433f776e3664105270adc26472ab6db9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 31 Mar 2022 06:59:34 -0700
Subject: [PATCH 1315/1854] rpc: Support gathering external file list after
 freezing process tree.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New 'query-ext-files' action for `criu dump` is sent after
freezing the process tree. This allows to defer gathering
the external file list when the process tree is in a stable
state and avoids race with the process creating and deleting
files.

Change-Id: Iae32149dc3992dea086f513ada52cf6863beaa1f
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 Documentation/criu.txt        |  5 ++++
 criu/action-scripts.c         | 15 ++++++++++++
 criu/cr-dump.c                |  3 +++
 criu/cr-service.c             | 43 +++++++++++++++++++++++++++++++++++
 criu/include/action-scripts.h |  3 +++
 5 files changed, 69 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 0c4cf8b61..606935790 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -155,6 +155,11 @@ not compatible with *--external* *dev*.
             notification message contains a file descriptor for
             the master pty
 
+        *query-ext-files*:::
+            called after the process tree is stopped and network is locked.
+            This hook is used only in the RPC mode. The notification reply
+            contains file ids to be added to external file list (may be empty).
+
 *--unprivileged*::
     This option tells *criu* to accept the limitations when running
     as non-root. Running as non-root requires *criu* at least to have
diff --git a/criu/action-scripts.c b/criu/action-scripts.c
index 1c9a8f091..6f7900186 100644
--- a/criu/action-scripts.c
+++ b/criu/action-scripts.c
@@ -31,6 +31,7 @@ static const char *action_names[ACT_MAX] = {
 	[ACT_POST_RESUME] = "post-resume",
 	[ACT_ORPHAN_PTS_MASTER] = "orphan-pts-master",
 	[ACT_STATUS_READY] = "status-ready",
+	[ACT_QUERY_EXT_FILES] = "query-ext-files",
 };
 
 struct script {
@@ -115,6 +116,20 @@ int rpc_send_fd(enum script_actions act, int fd)
 	return send_criu_rpc_script(act, (char *)action, rpc_sk, fd);
 }
 
+int rpc_query_external_files(void)
+{
+	int rpc_sk;
+
+	if (scripts_mode != SCRIPTS_RPC)
+		return 0;
+
+	rpc_sk = get_service_fd(RPC_SK_OFF);
+	if (rpc_sk < 0)
+		return -1;
+
+	return exec_rpc_query_external_files((char *)action_names[ACT_QUERY_EXT_FILES], rpc_sk);
+}
+
 int run_scripts(enum script_actions act)
 {
 	int ret = 0;
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 90d763f49..340fb96ec 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2180,6 +2180,9 @@ int cr_dump_tasks(pid_t pid)
 	if (network_lock())
 		goto err;
 
+	if (rpc_query_external_files())
+		goto err;
+
 	if (collect_file_locks())
 		goto err;
 
diff --git a/criu/cr-service.c b/criu/cr-service.c
index fa7490370..f62245d5f 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -240,6 +240,49 @@ int send_criu_rpc_script(enum script_actions act, char *name, int sk, int fd)
 	return 0;
 }
 
+int exec_rpc_query_external_files(char *name, int sk)
+{
+	int i, ret;
+	CriuNotify cn = CRIU_NOTIFY__INIT;
+	CriuResp msg = CRIU_RESP__INIT;
+	CriuReq *req;
+
+	cn.script = name;
+
+	msg.type = CRIU_REQ_TYPE__NOTIFY;
+	msg.success = true;
+	msg.notify = &cn;
+
+	ret = send_criu_msg_with_fd(sk, &msg, -1);
+	if (ret < 0)
+		return ret;
+
+	ret = recv_criu_msg(sk, &req);
+	if (ret < 0)
+		return ret;
+
+	if (req->type != CRIU_REQ_TYPE__NOTIFY || !req->notify_success) {
+		pr_err("RPC client reported script error\n");
+		return -1;
+	}
+
+	ret = 0;
+	if (req->opts)
+		for (i = 0; i < req->opts->n_external; i++) {
+			char *key = req->opts->external[i];
+			pr_info("Adding external object: %s\n", key);
+			if (add_external(key)) {
+				pr_err("Failed to add external object: %s\n", key);
+				ret = -1;
+			}
+		}
+	else
+		pr_info("RPC NOTIFY %s: no `opts` returned.\n", name);
+
+	criu_req__free_unpacked(req, NULL);
+	return ret;
+}
+
 static char images_dir[PATH_MAX];
 
 static int setup_opts_from_req(int sk, CriuOpts *req)
diff --git a/criu/include/action-scripts.h b/criu/include/action-scripts.h
index 793698c27..6a331a32f 100644
--- a/criu/include/action-scripts.h
+++ b/criu/include/action-scripts.h
@@ -17,6 +17,7 @@ enum script_actions {
 	ACT_PRE_RESUME,
 	ACT_ORPHAN_PTS_MASTER,
 	ACT_STATUS_READY,
+	ACT_QUERY_EXT_FILES,
 
 	ACT_MAX
 };
@@ -25,6 +26,8 @@ extern int add_script(char *path);
 extern int add_rpc_notify(int sk);
 extern int run_scripts(enum script_actions);
 extern int rpc_send_fd(enum script_actions, int fd);
+extern int rpc_query_external_files(void);
+extern int exec_rpc_query_external_files(char *name, int sk);
 extern int send_criu_rpc_script(enum script_actions act, char *name, int sk, int fd);
 
 #endif /* __CR_ACTION_SCRIPTS_H__ */

From 2aa9cb933394848935c8796669eb6c6788989f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 17:38:33 +0200
Subject: [PATCH 1316/1854] rpc: Support setting images_dir by path.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Google's RPC client process is in a different pidns and has more privileges --
CRIU can't open its /proc/<pid>/fd/<fd>.  For images_dir_fd to be useful here
it would need to refer to a passed or CRIU's fd.

From: Michał Cłapiński <mclapinski@google.com>
Change-Id: Icbfb5af6844b21939a15f6fbb5b02264c12341b1
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-service.c | 8 +++++++-
 images/rpc.proto  | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index f62245d5f..61a04c5ff 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -382,8 +382,14 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	 */
 	if (imgs_changed_by_rpc_conf)
 		strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1);
-	else
+	else if (req->images_dir_fd != -1)
 		sprintf(images_dir_path, "/proc/%d/fd/%d", ids.pid, req->images_dir_fd);
+	else if (req->images_dir)
+		strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
+	else {
+		pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
+		goto err;
+	}
 
 	if (req->parent_img)
 		SET_CHAR_OPTS(img_parent, req->parent_img);
diff --git a/images/rpc.proto b/images/rpc.proto
index 8748bdaff..1a4722a9c 100644
--- a/images/rpc.proto
+++ b/images/rpc.proto
@@ -61,7 +61,8 @@ enum criu_pre_dump_mode {
 };
 
 message criu_opts {
-	required int32			images_dir_fd	= 1;
+	required int32			images_dir_fd	= 1 [default = -1];
+	optional string			images_dir	= 68; /* used only if images_dir_fd == -1 */
 	optional int32			pid		= 2; /* if not set on dump, will dump requesting process */
 
 	optional bool			leave_running	= 3;

From f2011e1c765600a0559b26c2f66b57641dd26afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 17:31:57 +0200
Subject: [PATCH 1317/1854] util: Downgrade ignored errors to warnings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the error is ignored it is not important enough - make it a warning
instead.

From: Mian Luo <mianl@google.com>
Change-Id: If2641c3d4e0a4d57fdf04e4570c49be55f526535
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 Makefile           | 12 ++++++------
 criu/include/log.h |  2 ++
 criu/util.c        |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 8efdb760d..201122a48 100644
--- a/Makefile
+++ b/Makefile
@@ -440,12 +440,12 @@ lint:
 	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck -x test/others/config-file/*.sh
 	codespell -S tags
-	# Do not append \n to pr_perror or fail
-	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>.*\\n"'
-	# Do not use %m with pr_perror or fail
-	! git --no-pager grep -E '^\s*\<(pr_(err|perror|warn|debug|info|msg)|fail)\>.*%m'
-	# Do not use errno with pr_perror or fail
-	! git --no-pager grep -E '^\s*\<(pr_perror|fail)\>\(".*".*errno'
+	# Do not append \n to pr_perror, pr_pwarn or fail
+	! git --no-pager grep -E '^\s*\<(pr_perror|pr_pwarn|fail)\>.*\\n"'
+	# Do not use %m with pr_* or fail
+	! git --no-pager grep -E '^\s*\<(pr_(err|perror|warn|pwarn|debug|info|msg)|fail)\>.*%m'
+	# Do not use errno with pr_perror, pr_pwarn or fail
+	! git --no-pager grep -E '^\s*\<(pr_perror|pr_pwarn|fail)\>\(".*".*errno'
 	# End pr_(err|warn|msg|info|debug) with \n
 	! git --no-pager grep -En '^\s*\<pr_(err|warn|msg|info|debug)\>.*);$$' | grep -v '\\n'
 	# No EOL whitespace for C files
diff --git a/criu/include/log.h b/criu/include/log.h
index 85e6dc2e7..cbed33007 100644
--- a/criu/include/log.h
+++ b/criu/include/log.h
@@ -60,6 +60,8 @@ void flush_early_log_buffer(int fd);
 
 #define pr_perror(fmt, ...) pr_err(fmt ": %s\n", ##__VA_ARGS__, strerror(errno))
 
+#define pr_pwarn(fmt, ...) pr_warn(fmt ": %s\n", ##__VA_ARGS__, strerror(errno))
+
 #endif /* CR_NOGLIBC */
 
 #endif /* __CR_LOG_H__ */
diff --git a/criu/util.c b/criu/util.c
index db96cf938..a4975b92f 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1076,14 +1076,14 @@ void tcp_cork(int sk, bool on)
 {
 	int val = on ? 1 : 0;
 	if (setsockopt(sk, SOL_TCP, TCP_CORK, &val, sizeof(val)))
-		pr_perror("Unable to restore TCP_CORK (%d)", val);
+		pr_pwarn("Unable to restore TCP_CORK (%d)", val);
 }
 
 void tcp_nodelay(int sk, bool on)
 {
 	int val = on ? 1 : 0;
 	if (setsockopt(sk, SOL_TCP, TCP_NODELAY, &val, sizeof(val)))
-		pr_perror("Unable to restore TCP_NODELAY (%d)", val);
+		pr_pwarn("Unable to restore TCP_NODELAY (%d)", val);
 }
 
 static int get_sockaddr_in(struct sockaddr_storage *addr, char *host, unsigned short port)

From bf8446ae5f7396860c6911abca75254d675e8a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 21:39:05 +0200
Subject: [PATCH 1318/1854] kerndat: unexport kerndat_nsid()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

kerndat_nsid() is not used outside kerndat.c. Make it static.

Change-Id: I52e518ecb7c627cc1866e373411b2be3f71a2c9d
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/include/net.h | 1 -
 criu/kerndat.c     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/include/net.h b/criu/include/net.h
index 0da4cad13..5e8a84862 100644
--- a/criu/include/net.h
+++ b/criu/include/net.h
@@ -50,7 +50,6 @@ extern int kerndat_has_newifindex(void);
 extern int kerndat_link_nsid(void);
 extern int net_get_nsid(int rtsk, int fd, int *nsid);
 extern struct ns_id *net_get_root_ns(void);
-extern int kerndat_nsid(void);
 extern void check_has_netns_ioc(int fd, bool *kdat_val, const char *name);
 extern int net_set_ext(struct ns_id *ns);
 extern struct ns_id *get_root_netns(void);
diff --git a/criu/kerndat.c b/criu/kerndat.c
index b2e39cb40..fbc5b99d0 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -703,7 +703,7 @@ err:
 	return exit_code;
 }
 
-int kerndat_nsid(void)
+static int kerndat_nsid(void)
 {
 	int nsid, sk;
 

From eecc53d05a64e74e4d90b9f9dab7dec20844ef8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 21:33:16 +0200
Subject: [PATCH 1319/1854] kerndat: Don't fail on NETLINK/nsid support
 missing.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If not dumping netns nor connections, nsid support is not used. Don't
fail the run as if the support is needed, the dumping process will fail
later.

Change-Id: I39a086756f6d520c73bb6b21eaf6d9fb49a18879
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/kerndat.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index fbc5b99d0..597fe5d92 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -707,16 +707,18 @@ static int kerndat_nsid(void)
 {
 	int nsid, sk;
 
+	kdat.has_nsid = false;
+
 	sk = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
 	if (sk < 0) {
-		pr_perror("Unable to create a netlink socket");
-		return -1;
+		pr_pwarn("Unable to create a netlink socket: NSID can't be used.");
+		return 0;
 	}
 
 	if (net_get_nsid(sk, getpid(), &nsid) < 0) {
-		pr_err("NSID is not supported\n");
+		pr_warn("NSID is not supported\n");
 		close(sk);
-		return -1;
+		return 0;
 	}
 
 	kdat.has_nsid = true;

From 9ad59f58ff2a3c8a3cfa2a218fba8f7d64c1d8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 9 Dec 2022 15:24:32 +0100
Subject: [PATCH 1320/1854] util: Make CRIU run_id machine-level unique.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of relying on chance of CLOCK_MONOTONIC reading being unique,
use pid namespace ID that combined with the process ID will make it
unique on the machine level.

If pidns is not enabled on a kernel we'll get ENOENT, but then CRIU's
pid will already be unique. If there is some other error, log it but
continue, as the socket clash (if it happens) will result in a failed
run anyway.

Fixes: 45e048d77a6a (2022-03-31 "criu: generate unique socket names")
Fixes: 408a7d82d644 (2022-02-12 "util: add an unique ID of the current criu run")
Change-Id: I111c006e1b5b1db8932232684c976a84f4256e49
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/util.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/criu/util.c b/criu/util.c
index a4975b92f..744ec6032 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1880,11 +1880,16 @@ uint64_t criu_run_id;
 
 void util_init(void)
 {
-	struct timespec tp;
+	struct stat statbuf;
+
+	criu_run_id = getpid();
+	if (!stat("/proc/self/ns/pid", &statbuf))
+		criu_run_id |= (uint64_t)statbuf.st_ino << 32;
+	else if (errno != ENOENT)
+		pr_perror("Can't stat /proc/self/ns/pid - CRIU run id might not be unique");
 
-	clock_gettime(CLOCK_MONOTONIC, &tp);
-	criu_run_id = ((uint64_t)getpid() << 32) + tp.tv_sec + tp.tv_nsec;
 	compel_run_id = criu_run_id;
+	pr_info("CRIU run id = %#" PRIx64 "\n", criu_run_id);
 }
 
 /*

From 7bda5e656cd891109cee67715ddae15db7bea5c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 19 Jun 2023 11:29:22 +0200
Subject: [PATCH 1321/1854] zdtm: Update netns purpose comment in zdtm_ct.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the parasite socket clash now guaranteed not to happen,
the comment becomes obsolete. netns is steel needed though, so
update the comment to point at the requirement.

Change-Id: I3cfb253cd5c53b91b955fcb001530b4aee5129f4
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm_ct.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm_ct.c b/test/zdtm_ct.c
index 5e849b904..44316893d 100644
--- a/test/zdtm_ct.c
+++ b/test/zdtm_ct.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 	/*
 	 * pidns is used to avoid conflicts
 	 * mntns is used to mount /proc
-	 * net is used to avoid conflicts of parasite sockets
+	 * net is used to avoid conflicts between network tests
 	 */
 	if (!uid)
 		if (unshare(CLONE_NEWNS | CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC))

From 94c9e478727b5ce2571c7659939e7bfbe7af17f0 Mon Sep 17 00:00:00 2001
From: Abhishek Guleri <abhishekguleri24@gmail.com>
Date: Thu, 6 Jul 2023 16:19:45 +0530
Subject: [PATCH 1322/1854] readme: refactor asciinema link for video playback

Instead of opening the image directly, the commit refactors the
asciinema image embedded link to redirect users to the corresponding
video.

Signed-off-by: Abhishek Guleri <abhishekguleri24@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ff4aa1a23..11d1c490b 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Pages worth starting with are:
 - Troubleshooting can be hard, some help can be found [here](https://criu.org/When_C/R_fails), [here](https://criu.org/What_cannot_be_checkpointed) and [here](https://criu.org/FAQ)
 
 ### Checkpoint and restore of simple loop process
-[<p align="center"><img src="https://asciinema.org/a/232445.png" width="572px" height="412px"/></p>](https://asciinema.org/a/232445)
+<p align="center"><a href="https://asciinema.org/a/232445"><img src="https://asciinema.org/a/232445.png" width="572px" height="412px"/></a></p>
 
 ## Advanced features
 

From 362d8fa5c22da1c930253cb6cf76b29bc37d4dd3 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 20 Jun 2023 07:51:26 +0100
Subject: [PATCH 1323/1854] ci: disable CentOS 7 test in Cirrus CI

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                      | 32 -----------------------
 scripts/build/Dockerfile.centos7 | 45 --------------------------------
 2 files changed, 77 deletions(-)
 delete mode 100644 scripts/build/Dockerfile.centos7

diff --git a/.cirrus.yml b/.cirrus.yml
index 80f3296fc..8b8212d69 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -120,38 +120,6 @@ task:
   build_script: |
     make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_OPTS="-x zdtm/static/socket-raw"
 
-task:
-  name: CentOS 7 based test
-  environment:
-    HOME: "/root"
-    CIRRUS_WORKING_DIR: "/tmp/criu"
-
-  compute_engine_instance:
-    image_project: centos-cloud
-    image: family/centos-7
-    platform: linux
-    cpu: 4
-    memory: 8G
-
-  setup_script: |
-    # EPEL is needed for python2-future, python2-junit_xml, python-pathlib, python-flake8 and libbsd-devel.
-    # Do not fail if latest epel repository definition is already installed
-    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm || :
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
-    yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six python-pathlib sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel
-    # Even with selinux in permissive mode the selinux tests will be executed
-    # The Cirrus CI user runs as a service from selinux point of view and is
-    # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
-    # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode
-    setenforce 0
-    # Enable user namespaces on CentOS 7
-    echo 10000 > /proc/sys/user/max_user_namespaces
-    # Adapt sudoers to our needs
-    echo 'root ALL=(ALL:ALL) ALL' | EDITOR='tee -a' visudo
-
-  build_script: |
-    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_IGNORE_TAINT=1 ZDTM_OPTS="-x zdtm/static/socket-raw -x zdtm/static/child_subreaper_existing_child -x zdtm/static/fifo_upon_unix_socket01 -x zdtm/static/overmount_sock -x zdtm/static/tempfs_overmounted"
-
 task:
   name: aarch64 build GCC (native)
   arm_container:
diff --git a/scripts/build/Dockerfile.centos7 b/scripts/build/Dockerfile.centos7
deleted file mode 100644
index 21e70ff0e..000000000
--- a/scripts/build/Dockerfile.centos7
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM centos:7
-
-ARG CC=gcc
-
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-RUN yum install -y \
-	findutils \
-	gcc \
-	git \
-	gnutls-devel \
-	iproute \
-	iptables \
-	libaio-devel \
-	libasan \
-	libcap-devel \
-	libnet-devel \
-	libnl3-devel \
-	make \
-	procps-ng \
-	protobuf-c-devel \
-	protobuf-devel \
-	protobuf-python \
-	python \
-	python-flake8 \
-	python-ipaddress \
-	python2-future \
-	python2-junit_xml \
-	python-yaml \
-	python-six \
-	sudo \
-	tar \
-	which \
-	e2fsprogs \
-	python2-pip \
-	rubygem-asciidoctor
-
-COPY . /criu
-WORKDIR /criu
-
-RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
-
-# The rpc test cases are running as user #1000, let's add the user
-RUN adduser -u 1000 test
-
-RUN make -C test/zdtm -j $(nproc)

From 05f0535de41870812dd64b9488359b655a9f809e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 20 Jun 2023 07:58:33 +0100
Subject: [PATCH 1324/1854] ci: clean up CentOS 7 related tweaks

We have disabled CentOS 7 tests in CI. This patch reverts the
changes introduced in the following commit:

24bc083653f7d2b984653194e921b1ff32292b3b
ci: disable some tests on CentOS 7

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/ns_ext/run.sh       |  2 --
 test/others/ns_ext/run_pidns.sh |  3 ---
 test/others/rpc/run.sh          | 10 +---------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/test/others/ns_ext/run.sh b/test/others/ns_ext/run.sh
index e416f95e5..4ebe3e280 100755
--- a/test/others/ns_ext/run.sh
+++ b/test/others/ns_ext/run.sh
@@ -4,8 +4,6 @@ set -x
 
 if [[ "$1" == "pid" ]]; then
 	NS=pid
-	# CentOS 7 kernels do not have NSpid -> skip this test
-	grep NSpid /proc/self/status || exit 0
 else
 	NS=net
 fi
diff --git a/test/others/ns_ext/run_pidns.sh b/test/others/ns_ext/run_pidns.sh
index 08c5bff8e..db12106e0 100755
--- a/test/others/ns_ext/run_pidns.sh
+++ b/test/others/ns_ext/run_pidns.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-# CentOS 7 kernels do not have NSpid -> skip this test
-grep NSpid /proc/self/status || exit 0
-
 # This test creates a process in non-host pidns and then dumps it and restores
 # it into host pidns. We use pid >100000 in non-host pidns to make sure it does
 # not intersect with some host pid on restore but it is potentially racy so
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index 9be577587..afd4fb5e3 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -1,14 +1,6 @@
 #!/bin/bash
 
-set -ex
-
-if [ -e /etc/os-release ]; then
-	. /etc/os-release
-	if [ "$ID" == "centos" ] && [[ "$VERSION_ID" == "7"* ]];then
-		echo "Skipping tests on CentOS 7 because they do not work in CI"
-		exit 0
-	fi
-fi
+set -e
 
 CRIU=./criu
 

From 7825f4ebfadbd23dbf456d0eacce98154c076174 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 20 Jun 2023 08:34:23 +0100
Subject: [PATCH 1325/1854] coredump: drop python 2 support

This patch reverts changes introduced for Python 2 compatibility
in commits:

  1c866db (Add new files for running criu-coredump via python 2 or 3)

  3180d35 (Add support for python3 in criu-coredump).

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile                           |  2 +-
 coredump/{coredump.py => coredump} |  1 +
 coredump/coredump-python2          |  6 ------
 coredump/coredump-python3          |  6 ------
 coredump/criu_coredump/coredump.py | 16 ++--------------
 test/others/env.sh                 |  2 +-
 6 files changed, 5 insertions(+), 28 deletions(-)
 rename coredump/{coredump.py => coredump} (98%)
 mode change 100644 => 100755
 delete mode 100755 coredump/coredump-python2
 delete mode 100755 coredump/coredump-python3

diff --git a/Makefile b/Makefile
index 201122a48..1030a5a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -431,7 +431,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/others/criu-ns/run.py
 	flake8 --config=scripts/flake8.cfg crit/setup.py
 	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
-	flake8 --config=scripts/flake8.cfg coredump/
+	flake8 --config=scripts/flake8.cfg coredump/ coredump/coredump
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
diff --git a/coredump/coredump.py b/coredump/coredump
old mode 100644
new mode 100755
similarity index 98%
rename from coredump/coredump.py
rename to coredump/coredump
index 88a1b374c..f70d37c13
--- a/coredump/coredump.py
+++ b/coredump/coredump
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import argparse
 import os
 import sys
diff --git a/coredump/coredump-python2 b/coredump/coredump-python2
deleted file mode 100755
index 564c05ce9..000000000
--- a/coredump/coredump-python2
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python2
-
-import coredump
-
-if __name__ == '__main__':
-    coredump.main()
diff --git a/coredump/coredump-python3 b/coredump/coredump-python3
deleted file mode 100755
index 3032dbadf..000000000
--- a/coredump/coredump-python3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-import coredump
-
-if __name__ == '__main__':
-    coredump.main()
diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 8ee402676..0b8a02e0a 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -35,12 +35,6 @@ import ctypes
 from pycriu import images
 from . import elf
 
-
-try:
-    from itertools import ifilter as filter
-except ImportError:
-    pass
-
 # Some memory-related constants
 PAGESIZE = 4096
 status = {
@@ -318,10 +312,7 @@ class coredump_generator:
         # prpsinfo.pr_psargs has a limit of 80 characters which means it will
         # fail here if the cmdline is longer than 80
         prpsinfo.pr_psargs = self._gen_cmdline(pid)[:80]
-        if (sys.version_info > (3, 0)):
-            prpsinfo.pr_fname = core["tc"]["comm"].encode()
-        else:
-            prpsinfo.pr_fname = core["tc"]["comm"]
+        prpsinfo.pr_fname = core["tc"]["comm"].encode()
 
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
@@ -581,10 +572,7 @@ class coredump_generator:
             setattr(data, "start" + str(i), info.start)
             setattr(data, "end" + str(i), info.end)
             setattr(data, "file_ofs" + str(i), info.file_ofs)
-            if (sys.version_info > (3, 0)):
-                setattr(data, "name" + str(i), info.name.encode())
-            else:
-                setattr(data, "name" + str(i), info.name)
+            setattr(data, "name" + str(i), info.name.encode())
 
         nhdr = elf.Elf64_Nhdr()
 
diff --git a/test/others/env.sh b/test/others/env.sh
index 45066f760..a76207360 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -13,5 +13,5 @@ fi
 #export PYTHON
 CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
 crit=$CRIT
-CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump-"${PYTHON}")
+CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump)
 criu_coredump=$CRIU_COREDUMP

From f5d06571c58e2a052863226753018c1f5d42d693 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 20 Jun 2023 08:43:34 +0100
Subject: [PATCH 1326/1854] crit: drop python 2 support

This patch reverts changes introduced with the following commits:

4feb07020dedbf845fc00268d8ca02f4645641cd
crit: enable python2 or python3 based crit

b78c4e071a42ebe34aac82fa0711df07ed375e2b
test: fix crit test and extend it

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .gitignore                  |  1 -
 Makefile                    | 16 ++++------------
 crit/Makefile               | 13 -------------
 crit/{crit-python3 => crit} |  2 +-
 crit/crit-python2           |  6 ------
 lib/Makefile                |  2 +-
 lib/py/cli.py               |  1 +
 test/others/env.sh          | 11 +----------
 8 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 crit/Makefile
 rename crit/{crit-python3 => crit} (79%)
 delete mode 100755 crit/crit-python2

diff --git a/.gitignore b/.gitignore
index 1ea828bbc..2f2ab2029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ images/google/protobuf/*.h
 .gitid
 criu/criu
 criu/unittest/unittest
-crit/crit
 criu/arch/*/sys-exec-tbl*.c
 # x86 syscalls-table is not generated
 !criu/arch/x86/sys-exec-tbl.c
diff --git a/Makefile b/Makefile
index 1030a5a4e..020ef85fc 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
 export AFLAGS CFLAGS USERCLFAGS HOSTCFLAGS
 
 # Default target
-all: criu lib crit
+all: criu lib
 .PHONY: all
 
 #
@@ -259,26 +259,19 @@ criu: $(criu-deps)
 	$(Q) $(MAKE) $(build)=criu all
 .PHONY: criu
 
-crit/Makefile: ;
-crit/%: criu .FORCE
-	$(Q) $(MAKE) $(build)=crit $@
-crit: criu
-	$(Q) $(MAKE) $(build)=crit all
-.PHONY: crit
-
 unittest: $(criu-deps)
 	$(Q) $(MAKE) $(build)=criu unittest
 .PHONY: unittest
 
 
 #
-# Libraries next once crit it ready
+# Libraries next once criu is ready
 # (we might generate headers and such
 # when building criu itself).
 lib/Makefile: ;
-lib/%: crit .FORCE
+lib/%: criu .FORCE
 	$(Q) $(MAKE) $(build)=lib $@
-lib: crit
+lib: criu
 	$(Q) $(MAKE) $(build)=lib all
 .PHONY: lib
 
@@ -290,7 +283,6 @@ clean mrproper:
 	$(Q) $(MAKE) $(build)=compel $@
 	$(Q) $(MAKE) $(build)=compel/plugins $@
 	$(Q) $(MAKE) $(build)=lib $@
-	$(Q) $(MAKE) $(build)=crit $@
 .PHONY: clean mrproper
 
 clean-amdgpu_plugin:
diff --git a/crit/Makefile b/crit/Makefile
deleted file mode 100644
index 988b481b6..000000000
--- a/crit/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-all-y	+= crit
-
-crit/crit: crit/crit-$(PYTHON)
-	$(Q) cp $^ $@
-crit: crit/crit
-.PHONY: crit
-
-clean-crit:
-	$(Q) $(RM) crit/crit
-.PHONY: clean-crit
-clean: clean-crit
-mrproper: clean
diff --git a/crit/crit-python3 b/crit/crit
similarity index 79%
rename from crit/crit-python3
rename to crit/crit
index 80467cba7..3b15ca654 100755
--- a/crit/crit-python3
+++ b/crit/crit
@@ -3,4 +3,4 @@
 from pycriu import cli
 
 if __name__ == '__main__':
-	cli.main()
+        cli.main()
diff --git a/crit/crit-python2 b/crit/crit-python2
deleted file mode 100755
index b0b7d3c3a..000000000
--- a/crit/crit-python2
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python2
-
-from pycriu import cli
-
-if __name__ == '__main__':
-	cli.main()
diff --git a/lib/Makefile b/lib/Makefile
index ff540fb75..7ed73f9ab 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,7 +41,7 @@ clean: clean-lib
 cleanup-y	+= lib/c/$(CRIU_SO) lib/c/$(CRIU_A) lib/c/criu.pc
 mrproper: clean
 
-install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in
+install: lib-c lib-a lib-py lib/c/criu.pc.in
 	$(E) "  INSTALL " lib
 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
 	$(Q) install -m 755 lib/c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
diff --git a/lib/py/cli.py b/lib/py/cli.py
index 5419384c3..82079c7f4 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 from __future__ import print_function
 import argparse
 import sys
diff --git a/test/others/env.sh b/test/others/env.sh
index a76207360..6d830fb58 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -2,16 +2,7 @@
 
 CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu/criu)
 criu=$CRIU
-if [ $(which python3) ]; then
-	PYTHON=python3
-elif [ $(which python2) ]; then
-	PYTHON=python2
-else
-	echo "FAIL: Neither python3 nor python2"
-	exit 1
-fi
-#export PYTHON
-CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
+CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit)
 crit=$CRIT
 CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump)
 criu_coredump=$CRIU_COREDUMP

From 376f3d18004fdc72d101eeb6c80f73c3d908323f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 18 Jun 2023 14:20:04 +0200
Subject: [PATCH 1327/1854] crit: add requirements.txt for pip>=20.1

When building with pip version 20.0.2 or older, the pip install
command creates a temporary directory and copies all files from
./crit. This results in the following error message:

    ModuleNotFoundError: No module named 'pycriu'

This error appears because the symlink 'pycriu' uses a relative path
that becomes invalid '../lib/py/'.

The '--no-build-isolation' option for pip install is needed to enable
the use of pre-installed dependencies (e.g., protobuf) during build.

The '--ignore-installed' option for pip is needed to avoid an error when
crit is already installed. For example, crit is installed in the GitHub
CI environment as part of the criu OBS package as a dependency for
podman.

Distributions such as Arch Linux have adopted an externally managed
python installation in compliance with PEP 668 [1] that prevents pip
from breaking the system by either installing packages to the system or
locally in the home folder. The '--break-system-packages' [2] option
allows pip to modify an externally managed Python installation.

[1] https://peps.python.org/pep-0668/
[2] https://pip.pypa.io/en/stable/cli/pip_uninstall/

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 crit/pyproject.toml   |  3 ++-
 crit/requirements.txt |  7 +++++++
 lib/Makefile          | 27 ++++++++++++++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 crit/requirements.txt

diff --git a/crit/pyproject.toml b/crit/pyproject.toml
index b1e1a4650..019b0d848 100644
--- a/crit/pyproject.toml
+++ b/crit/pyproject.toml
@@ -1,2 +1,3 @@
 [build-system]
-requires = ["setuptools"]
+# Minimum requirements for the build system to execute.
+requires = ["setuptools", "wheel"]  # PEP 508 specifications.
diff --git a/crit/requirements.txt b/crit/requirements.txt
new file mode 100644
index 000000000..c27e6d4f0
--- /dev/null
+++ b/crit/requirements.txt
@@ -0,0 +1,7 @@
+# We need pip version 20.1 or newer to correctly build with 'pycriu' symlink.
+# - Building of local directories with pip 20.1 or newer is done in place,
+#   instead of a temporary location containing a copy of the directory tree.
+#   (https://github.com/pypa/pip/issues/7555)
+pip>=20.1
+setuptools>=42.0.0
+wheel
diff --git a/lib/Makefile b/lib/Makefile
index 7ed73f9ab..32d238de4 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,6 +4,9 @@ UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/ve
 
 all-y	+= lib-c lib-a lib-py
 
+PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
+PIP_BREAK_SYSTEM_PACKAGES := 0
+
 #
 # C language bindings.
 lib/c/Makefile: ;
@@ -54,9 +57,19 @@ install: lib-c lib-a lib-py lib/c/criu.pc.in
 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
 	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
-ifeq ($(PYTHON),python3)
+ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
+ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+	$(E) "  SKIP INSTALL crit: Externally managed python environment (See PEP 668 for more information)"
+	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
+else
 	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install --upgrade --force-reinstall --prefix=$(DESTDIR)$(PREFIX) ./crit
+	$(Q) $(PYTHON) -m pip install -r ./crit/requirements.txt
+	$(Q) $(PYTHON) -m pip install --no-build-isolation --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+endif
+else
+	$(E) "  INSTALL " crit
+	$(Q) $(PYTHON) -m pip install -r ./crit/requirements.txt
+	$(Q) $(PYTHON) -m pip install --no-build-isolation --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
 endif
 .PHONY: install
 
@@ -69,7 +82,15 @@ uninstall:
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/criu/,$(notdir $(UAPI_HEADERS)))
 	$(E) " UNINSTALL" pkgconfig/criu.pc
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBDIR)/pkgconfig/,criu.pc)
-ifeq ($(PYTHON),python3)
+ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
+ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+	$(E) " SKIP UNINSTALL crit: Externally managed python environment (See PEP 668 for more information)"
+	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make uninstall"
+else
+	$(E) " UNINSTALL" crit
+	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+endif
+else
 	$(E) " UNINSTALL" crit
 	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
 endif

From 642fd99bfdaf1dfb006f800f5e048e4dcf436dac Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 21 Jun 2023 23:48:32 +0100
Subject: [PATCH 1328/1854] remove python-future dependency

This commit removes the dependency on the __future__ module, which was
used to enable Python 3 features in Python 2 code. With support for
Python 2 being dropped, it is no longer necessary to maintain backward
compatibility.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                              | 4 ++--
 .lgtm.yml                                | 1 -
 contrib/debian/dev-packages.lst          | 1 -
 criu/Makefile.packages                   | 2 --
 lib/py/cli.py                            | 1 -
 scripts/build/Dockerfile.amd-rocm        | 1 -
 scripts/build/Dockerfile.centos8         | 1 -
 scripts/build/Dockerfile.hotspot-ubuntu  | 2 --
 scripts/build/Dockerfile.linux32.tmpl    | 3 +--
 scripts/build/Dockerfile.openj9-ubuntu   | 1 -
 scripts/build/Dockerfile.tmpl            | 3 +--
 scripts/ci/prepare-for-fedora-rawhide.sh | 1 -
 scripts/ci/run-ci-tests.sh               | 4 ++--
 scripts/ci/vagrant.sh                    | 2 +-
 soccr/test/tcp-test.py                   | 3 +--
 test/zdtm.py                             | 8 +-------
 16 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 8b8212d69..e559ec772 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -36,7 +36,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-future python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed.
     # The Cirrus CI user runs as a service from selinux point of view and is
@@ -108,7 +108,7 @@ task:
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || :
     yum install -y dnf-plugins-core
     yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf python3-importlib-metadata python3-junit_xml xmlto
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-protobuf python3-importlib-metadata python3-junit_xml xmlto
     alternatives --set python /usr/bin/python3
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed
diff --git a/.lgtm.yml b/.lgtm.yml
index a884a53ef..0dd49cda4 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -22,7 +22,6 @@ extraction:
       - "libbsd-dev"
       - "python3-yaml"
       - "libnl-route-3-dev"
-      - "python-future"
       - "gnutls-dev"
     configure:
       command:
diff --git a/contrib/debian/dev-packages.lst b/contrib/debian/dev-packages.lst
index c2d1509fa..ce45f1b7c 100644
--- a/contrib/debian/dev-packages.lst
+++ b/contrib/debian/dev-packages.lst
@@ -17,4 +17,3 @@ libcap-dev
 libaio-dev
 python3-yaml
 libnl-route-3-dev
-python-future
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
index 13c346f44..f436737fd 100644
--- a/criu/Makefile.packages
+++ b/criu/Makefile.packages
@@ -6,7 +6,6 @@ REQ-RPM-PKG-NAMES	+= protobuf-devel
 REQ-RPM-PKG-NAMES	+= protobuf-python
 REQ-RPM-PKG-NAMES	+= libnl3-devel
 REQ-RPM-PKG-NAMES	+= libcap-devel
-REQ-RPM-PKG-NAMES	+= $(PYTHON)-future
 
 REQ-RPM-PKG-TEST-NAMES  += libaio-devel
 
@@ -15,7 +14,6 @@ REQ-DEB-PKG-NAMES	+= libprotobuf-c-dev
 REQ-DEB-PKG-NAMES	+= protobuf-c-compiler
 REQ-DEB-PKG-NAMES	+= protobuf-compiler
 REQ-DEB-PKG-NAMES	+= $(PYTHON)-protobuf
-REQ-DEB-PKG-NAMES	+= $(PYTHON)-future
 REQ-DEB-PKG-NAMES	+= libnl-3-dev
 REQ-DEB-PKG-NAMES	+= libcap-dev
 
diff --git a/lib/py/cli.py b/lib/py/cli.py
index 82079c7f4..221f7be0d 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import argparse
 import sys
 import json
diff --git a/scripts/build/Dockerfile.amd-rocm b/scripts/build/Dockerfile.amd-rocm
index c0d181b03..c466a73d2 100644
--- a/scripts/build/Dockerfile.amd-rocm
+++ b/scripts/build/Dockerfile.amd-rocm
@@ -55,7 +55,6 @@ RUN apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-insta
 	protobuf-compiler \
 	python-protobuf \
 	python3-minimal \
-	python3-future \
 	python-ipaddress \
 	curl \
 	wget \
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
index 488f95d65..b06524674 100644
--- a/scripts/build/Dockerfile.centos8
+++ b/scripts/build/Dockerfile.centos8
@@ -28,7 +28,6 @@ RUN yum install -y --allowerasing \
 	python3-devel \
 	python3-flake8 \
 	python3-PyYAML \
-	python3-future \
 	python3-protobuf \
 	python3-pip \
 	sudo \
diff --git a/scripts/build/Dockerfile.hotspot-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu
index 350102818..0318f650f 100644
--- a/scripts/build/Dockerfile.hotspot-ubuntu
+++ b/scripts/build/Dockerfile.hotspot-ubuntu
@@ -6,7 +6,6 @@ COPY scripts/ci/apt-install /bin/apt-install
 RUN apt-install protobuf-c-compiler \
 	libprotobuf-c-dev \
 	libaio-dev \
-	python3-future \
 	libprotobuf-dev \
 	protobuf-compiler \
 	libcap-dev \
@@ -31,4 +30,3 @@ WORKDIR /criu
 RUN make mrproper && make -j $(nproc) CC="$CC"
 
 ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
-
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index a15038631..13e992642 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -21,8 +21,7 @@ RUN apt-install \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
-	python3-minimal \
-	python3-future
+	python3-minimal
 
 COPY . /criu
 WORKDIR /criu
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 23db14e8d..c2cf20a36 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -6,7 +6,6 @@ COPY scripts/ci/apt-install /bin/apt-install
 RUN apt-install protobuf-c-compiler \
 	libprotobuf-c-dev \
 	libaio-dev \
-	python3-future \
 	libprotobuf-dev \
 	protobuf-compiler \
 	libcap-dev \
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index e0e72372d..9f6b1d096 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -30,8 +30,7 @@ RUN apt-install \
 	python-is-python3 \
 	python3-minimal \
 	python3-protobuf \
-	python3-yaml \
-	python3-future
+	python3-yaml
 
 COPY . /criu
 WORKDIR /criu
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index 7c62aaaa2..1c8a46fbf 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -24,7 +24,6 @@ dnf install -y \
 	protobuf-devel \
 	python3-flake8 \
 	python3-PyYAML \
-	python3-future \
 	python3-protobuf \
 	python3-junit_xml \
 	python3-pip \
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index b45183a84..6d837fe06 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -5,8 +5,8 @@ CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
 		libnl-route-3-dev time flake8 libbsd-dev python3-yaml
-		libperl-dev pkg-config python3-future python3-protobuf
-		python3-pip python3-importlib-metadata python3-junit.xml)
+		libperl-dev pkg-config python3-protobuf python3-pip
+		python3-importlib-metadata python3-junit.xml)
 
 X86_64_PKGS=(gcc-multilib)
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 5cc842442..ac4b5579d 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -38,7 +38,7 @@ setup() {
 	ssh default sudo dnf upgrade -y
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
-		protobuf-devel python3-flake8 python3-future python3-protobuf python3-importlib-metadata \
+		protobuf-devel python3-flake8 python3-protobuf python3-importlib-metadata \
 		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel libbpf-devel
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
diff --git a/soccr/test/tcp-test.py b/soccr/test/tcp-test.py
index ff3fe29dc..b48f532eb 100755
--- a/soccr/test/tcp-test.py
+++ b/soccr/test/tcp-test.py
@@ -1,6 +1,5 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
-from __future__ import print_function
 import sys, socket
 import hashlib
 
diff --git a/test/zdtm.py b/test/zdtm.py
index 1ef941b4e..b56f06ef1 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1,10 +1,4 @@
-#!/usr/bin/env python
-from __future__ import (
-    absolute_import,
-    division,
-    print_function,
-    unicode_literals
-)
+#!/usr/bin/env python3
 
 import argparse
 import atexit

From ede018176c2bf34749270466f6a21c32ee834005 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 22 Jun 2023 00:06:53 +0100
Subject: [PATCH 1329/1854] make: remove checks for python 2 binary

This commit removes the checks for the Python 2 binary in the makefile
and makes sure that ZDTM tests always use python3. Since support for
Python 2 has been dropped, these checks are no longer needed.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/Makefile                         | 4 +---
 criu/Makefile                                  | 2 --
 criu/Makefile.packages                         | 5 +----
 scripts/build/Dockerfile.tmpl                  | 1 -
 scripts/ci/run-ci-tests.sh                     | 4 ----
 scripts/criu-ns                                | 2 +-
 scripts/magic-gen.py                           | 2 +-
 scripts/nmk/scripts/tools.mk                   | 2 +-
 soccr/test/Makefile                            | 3 +--
 soccr/test/run.py                              | 2 +-
 test/check_actions.py                          | 2 +-
 test/crit-recode.py                            | 2 +-
 test/exhaustive/pipe.py                        | 2 +-
 test/exhaustive/unix.py                        | 2 +-
 test/inhfd/memfd.py.checkskip                  | 2 +-
 test/others/criu-ns/run.py                     | 2 +-
 test/others/ext-tty/run.py                     | 2 +-
 test/others/mnt-ext-dev/run.sh                 | 4 ++--
 test/others/mounts/mounts.sh                   | 2 +-
 test/others/rpc/Makefile                       | 2 +-
 test/others/rpc/config_file.py                 | 2 +-
 test/others/rpc/errno.py                       | 2 +-
 test/others/rpc/ps_test.py                     | 2 +-
 test/others/rpc/restore-loop.py                | 2 +-
 test/others/rpc/test.py                        | 2 +-
 test/others/rpc/version.py                     | 2 +-
 test/others/shell-job/run.py                   | 2 +-
 test/zdtm/static/cgroup_yard.hook              | 2 +-
 test/zdtm/static/file_locks06.checkskip        | 2 +-
 test/zdtm/static/net_lock_socket_iptables.hook | 2 +-
 test/zdtm/static/netns_lock_iptables.hook      | 4 ++--
 test/zdtm/static/socket-tcp-fin-wait1.hook     | 2 +-
 32 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 72bf0e862..de0cc448d 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -12,11 +12,9 @@ endif
 
 FOOTER		:= footer.txt
 SRC1		+= crit.txt
-ifeq ($(PYTHON),python3)
 SRC1		+= criu-ns.txt
-endif
 SRC1		+= compel.txt
-SRC1            += criu-amdgpu-plugin.txt
+SRC1		+= criu-amdgpu-plugin.txt
 SRC8		+= criu.txt
 SRC		:= $(SRC1) $(SRC8)
 XMLS		:= $(patsubst %.txt,%.xml,$(SRC))
diff --git a/criu/Makefile b/criu/Makefile
index c6050d582..bafdd980b 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -145,10 +145,8 @@ install: $(obj)/criu
 	$(Q) install -m 644 $(UAPI_HEADERS) $(DESTDIR)$(INCLUDEDIR)/criu/
 	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/criu/scripts
 	$(Q) install -m 755 scripts/systemd-autofs-restart.sh $(DESTDIR)$(LIBEXECDIR)/criu/scripts
-ifeq ($(PYTHON),python3)
 	$(E) "  INSTALL " scripts/criu-ns
 	$(Q) install -m 755 scripts/criu-ns $(DESTDIR)$(SBINDIR)
-endif
 .PHONY: install
 
 uninstall:
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
index f436737fd..7f6113c8f 100644
--- a/criu/Makefile.packages
+++ b/criu/Makefile.packages
@@ -20,13 +20,10 @@ REQ-DEB-PKG-NAMES	+= libcap-dev
 REQ-DEB-PKG-TEST-NAMES	+= $(PYTHON)-yaml
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 
-ifeq ($(PYTHON),python3)
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-PyYAML
-else
-REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-pyyaml
-endif
+
 
 export LIBS		+= -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet
 
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 9f6b1d096..9b53a76aa 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -27,7 +27,6 @@ RUN apt-install \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
-	python-is-python3 \
 	python3-minimal \
 	python3-protobuf \
 	python3-yaml
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 6d837fe06..79744c750 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -58,10 +58,6 @@ ci_prep () {
 
 	scripts/ci/apt-install "${CI_PKGS[@]}"
 	chmod a+x "$HOME"
-
-	# zdtm uses an unversioned python binary to run the tests.
-	# let's point python to python3
-	ln -sf /usr/bin/python3 /usr/bin/python
 }
 
 test_stream() {
diff --git a/scripts/criu-ns b/scripts/criu-ns
index 3c77b8eb4..4c032aa14 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import ctypes
 import ctypes.util
 import errno
diff --git a/scripts/magic-gen.py b/scripts/magic-gen.py
index 3b1f29fb5..38dff1424 100755
--- a/scripts/magic-gen.py
+++ b/scripts/magic-gen.py
@@ -1,4 +1,4 @@
-#!/bin/env python2
+#!/bin/env python3
 import sys
 
 
diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
index 1681d4e90..724204a03 100644
--- a/scripts/nmk/scripts/tools.mk
+++ b/scripts/nmk/scripts/tools.mk
@@ -23,7 +23,7 @@ MAKE		:= make
 MKDIR		:= mkdir -p
 AWK		:= awk
 PERL		:= perl
-FULL_PYTHON	:= $(shell which python3 2>/dev/null || which python2 2>/dev/null)
+FULL_PYTHON	:= $(shell which python3 2>/dev/null)
 PYTHON		?= $(shell basename $(FULL_PYTHON))
 FIND		:= find
 SH		:= $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
diff --git a/soccr/test/Makefile b/soccr/test/Makefile
index 458540045..499901b0c 100644
--- a/soccr/test/Makefile
+++ b/soccr/test/Makefile
@@ -21,7 +21,6 @@ tcp-conn-v6: tcp-conn-v6.c
 test: tcp-constructor tcp-conn tcp-conn-v6
 	unshare -n sh -c "ip link set up dev lo; ./tcp-conn"
 	unshare -n sh -c "ip link set up dev lo; ./tcp-conn-v6"
-	python run.py ./$(RUN)
+	python3 run.py ./$(RUN)
 
 .PHONY: test
-
diff --git a/soccr/test/run.py b/soccr/test/run.py
index 1ffe58a58..57c556e36 100644
--- a/soccr/test/run.py
+++ b/soccr/test/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys, os
 import hashlib
diff --git a/test/check_actions.py b/test/check_actions.py
index 4973e3938..84d738dbb 100755
--- a/test/check_actions.py
+++ b/test/check_actions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import os
diff --git a/test/crit-recode.py b/test/crit-recode.py
index 4135681e1..f119271d8 100755
--- a/test/crit-recode.py
+++ b/test/crit-recode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import pycriu
 import sys
 import os
diff --git a/test/exhaustive/pipe.py b/test/exhaustive/pipe.py
index 7f1c53d34..afe20846a 100755
--- a/test/exhaustive/pipe.py
+++ b/test/exhaustive/pipe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import os
diff --git a/test/exhaustive/unix.py b/test/exhaustive/unix.py
index 6f72dd44b..689b1fb3a 100755
--- a/test/exhaustive/unix.py
+++ b/test/exhaustive/unix.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import os
diff --git a/test/inhfd/memfd.py.checkskip b/test/inhfd/memfd.py.checkskip
index 252778969..27e2b7b15 100755
--- a/test/inhfd/memfd.py.checkskip
+++ b/test/inhfd/memfd.py.checkskip
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import ctypes
 libc = ctypes.CDLL(None)
diff --git a/test/others/criu-ns/run.py b/test/others/criu-ns/run.py
index 6967b46b2..9d068476f 100755
--- a/test/others/criu-ns/run.py
+++ b/test/others/criu-ns/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import fcntl
 import os
diff --git a/test/others/ext-tty/run.py b/test/others/ext-tty/run.py
index 8109033cb..2c268a2c8 100755
--- a/test/others/ext-tty/run.py
+++ b/test/others/ext-tty/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import subprocess
 import os, sys, time, signal, pty
 
diff --git a/test/others/mnt-ext-dev/run.sh b/test/others/mnt-ext-dev/run.sh
index 5a1f44450..3f6163e08 100755
--- a/test/others/mnt-ext-dev/run.sh
+++ b/test/others/mnt-ext-dev/run.sh
@@ -2,7 +2,7 @@
 set -e -x
 
 # construct root
-python ../../zdtm.py run -t zdtm/static/env00 --iter 0 -f ns
+python3 ../../zdtm.py run -t zdtm/static/env00 --iter 0 -f ns
 
 truncate -s 0 zdtm.loop
 truncate -s 50M zdtm.loop
@@ -11,7 +11,7 @@ dev=`losetup --find --show zdtm.loop`
 mkdir -p ../../dev
 cp -ap $dev ../../dev
 export ZDTM_MNT_EXT_DEV=$dev
-python ../../zdtm.py run $EXTRA_OPTS -t zdtm/static/mnt_ext_dev || ret=$?
+python3 ../../zdtm.py run $EXTRA_OPTS -t zdtm/static/mnt_ext_dev || ret=$?
 losetup -d $dev
 unlink zdtm.loop
 exit $ret
diff --git a/test/others/mounts/mounts.sh b/test/others/mounts/mounts.sh
index 51ea69540..bed156a50 100755
--- a/test/others/mounts/mounts.sh
+++ b/test/others/mounts/mounts.sh
@@ -20,7 +20,7 @@ for i in `awk '{ print $2 }' < /proc/self/mounts`; do
 	umount -l $i
 done
 
-python mounts.py
+python3 mounts.py
 kill $INMNTNS_PID
 while :; do
 	sleep 10
diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index fc64f0c97..69537bb0d 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -4,7 +4,7 @@ all: test-c rpc_pb2.py criu
 CFLAGS += -g -Werror -Wall -I.
 LDLIBS +=  -lprotobuf-c
 
-PYTHON ?= python
+PYTHON ?= python3
 
 run: all
 	@make -C .. loop
diff --git a/test/others/rpc/config_file.py b/test/others/rpc/config_file.py
index 90c80fcae..6cffe270d 100755
--- a/test/others/rpc/config_file.py
+++ b/test/others/rpc/config_file.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import argparse
 import os
diff --git a/test/others/rpc/errno.py b/test/others/rpc/errno.py
index f84757efd..b600b6d1c 100755
--- a/test/others/rpc/errno.py
+++ b/test/others/rpc/errno.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Test criu errno
 
 import socket, os, errno
diff --git a/test/others/rpc/ps_test.py b/test/others/rpc/ps_test.py
index b51357d42..daeda49bc 100755
--- a/test/others/rpc/ps_test.py
+++ b/test/others/rpc/ps_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import socket, os, sys, errno
 import rpc_pb2 as rpc
diff --git a/test/others/rpc/restore-loop.py b/test/others/rpc/restore-loop.py
index 84a2ce56d..67110c2cf 100755
--- a/test/others/rpc/restore-loop.py
+++ b/test/others/rpc/restore-loop.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import socket, os, sys
 import rpc_pb2 as rpc
diff --git a/test/others/rpc/test.py b/test/others/rpc/test.py
index 80f6338f4..ce8411bc6 100755
--- a/test/others/rpc/test.py
+++ b/test/others/rpc/test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import socket, os, sys
 import rpc_pb2 as rpc
diff --git a/test/others/rpc/version.py b/test/others/rpc/version.py
index 9d7fa745b..a18cd5b7b 100755
--- a/test/others/rpc/version.py
+++ b/test/others/rpc/version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import rpc_pb2 as rpc
diff --git a/test/others/shell-job/run.py b/test/others/shell-job/run.py
index a59945d6a..969965f00 100755
--- a/test/others/shell-job/run.py
+++ b/test/others/shell-job/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os, pty, sys, subprocess
 import termios, fcntl, time
 
diff --git a/test/zdtm/static/cgroup_yard.hook b/test/zdtm/static/cgroup_yard.hook
index d06bc45fd..b70bd59e9 100755
--- a/test/zdtm/static/cgroup_yard.hook
+++ b/test/zdtm/static/cgroup_yard.hook
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys
 import os
diff --git a/test/zdtm/static/file_locks06.checkskip b/test/zdtm/static/file_locks06.checkskip
index 06ab58521..c5039a2d2 100755
--- a/test/zdtm/static/file_locks06.checkskip
+++ b/test/zdtm/static/file_locks06.checkskip
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import fcntl
 import tempfile
 import struct
diff --git a/test/zdtm/static/net_lock_socket_iptables.hook b/test/zdtm/static/net_lock_socket_iptables.hook
index 0ee147eb2..e9fcd7350 100755
--- a/test/zdtm/static/net_lock_socket_iptables.hook
+++ b/test/zdtm/static/net_lock_socket_iptables.hook
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import time
diff --git a/test/zdtm/static/netns_lock_iptables.hook b/test/zdtm/static/netns_lock_iptables.hook
index e7daf8a65..b51d3c2cc 100755
--- a/test/zdtm/static/netns_lock_iptables.hook
+++ b/test/zdtm/static/netns_lock_iptables.hook
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import subprocess
 import socket
@@ -67,7 +67,7 @@ if sys.argv[1] == "--post-start":
             cln, addr = srv.accept()
             cln.sendall(str.encode("--post-restore"))
             cln.close()
-        
+
         # Server will be closed when zdtm sends SIGKILL
 
 if sys.argv[1] == "--pre-dump":
diff --git a/test/zdtm/static/socket-tcp-fin-wait1.hook b/test/zdtm/static/socket-tcp-fin-wait1.hook
index 9504557da..9dcd08999 100755
--- a/test/zdtm/static/socket-tcp-fin-wait1.hook
+++ b/test/zdtm/static/socket-tcp-fin-wait1.hook
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 
 sys.path.append("../crit")

From ee9983d4a949bc2385b712295285240ed61af5cf Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 22 Jun 2023 02:54:30 +0100
Subject: [PATCH 1330/1854] test/criu-ns: drop python 2 compatibility

This patch is replacing the set_blocking() function with
os.set_blocking(). This function was introduced for compatibility with
Python 2 in commit 8094df8di (criu-ns: Add tests for criu-ns script).

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/criu-ns/run.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/test/others/criu-ns/run.py b/test/others/criu-ns/run.py
index 9d068476f..0a36438e8 100755
--- a/test/others/criu-ns/run.py
+++ b/test/others/criu-ns/run.py
@@ -25,19 +25,6 @@ def check_dumpdir(path=IMG_DIR):
     os.mkdir(path, 0o755)
 
 
-def set_blocking(fd, blocking):
-    """Implement os.set_blocking() for compatibility with Python
-    versions earlier than 3.5"""
-    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
-
-    if blocking:
-        flags &= ~os.O_NONBLOCK
-    else:
-        flags |= os.O_NONBLOCK
-
-    fcntl.fcntl(fd, fcntl.F_SETFL, flags)
-
-
 def run_task_with_own_pty(task):
     fd_m, fd_s = pty.openpty()
 
@@ -55,7 +42,7 @@ def run_task_with_own_pty(task):
 
     os.close(fd_s)
     fd_m = os.fdopen(fd_m, "rb")
-    set_blocking(fd_m.fileno(), False)
+    os.set_blocking(fd_m.fileno(), False)
 
     while True:
         try:

From d388b91de27119d79dd8cafb821ec884ef9eb52a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 22 Jun 2023 03:11:20 +0100
Subject: [PATCH 1331/1854] test/others: drop setup_swrk() py2 compatibility

This patch removes the code introduced for compatibility
with Python 2 in commits:

4c1ee3e227045fc1dc07b10ac7a538a68299693b
test/other: Resolve Py3 compatibility issues

6b615ca15277fc14b52a09b4eb18314b7c6cbe75
test/others: Reuse setup_swrk()

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/rpc/setup_swrk.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/others/rpc/setup_swrk.py b/test/others/rpc/setup_swrk.py
index c7f84f952..ffaa01de4 100644
--- a/test/others/rpc/setup_swrk.py
+++ b/test/others/rpc/setup_swrk.py
@@ -5,12 +5,6 @@ import subprocess
 def setup_swrk():
     print('Connecting to CRIU in swrk mode.')
     s1, s2 = socket.socketpair(socket.AF_UNIX, socket.SOCK_SEQPACKET)
-
-    kwargs = {}
-    if sys.version_info.major == 3:
-        kwargs["pass_fds"] = [s1.fileno()]
-
-    swrk = subprocess.Popen(['./criu', "swrk", "%d" % s1.fileno()], **kwargs)
+    swrk = subprocess.Popen(['./criu', "swrk", "%d" % s1.fileno()], pass_fds=[s1.fileno()])
     s1.close()
     return swrk, s2
-

From 002f2372a9487fe03a6c4f3fe28df00b7033748f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 22 Jun 2023 03:53:03 +0100
Subject: [PATCH 1332/1854] lib/py: drop python 2 compatibility

This patch removes code introduced for compatibility with
Python 2 in commits:

  bf80fee (lib: correctly handle stdin/stdout (Python 3))

  b82f222 (lib: fix crit-recode fix for Python 2)

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/py/cli.py            |  4 ----
 lib/py/images/images.py  | 11 ++---------
 lib/py/images/pb2dict.py | 11 ++---------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index 221f7be0d..594035d27 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -11,8 +11,6 @@ def inf(opts):
     if opts['in']:
         return open(opts['in'], 'rb')
     else:
-        if (sys.version_info < (3, 0)):
-            return sys.stdin
         if sys.stdin.isatty():
             # If we are reading from a terminal (not a pipe) we want text input and not binary
             return sys.stdin
@@ -28,8 +26,6 @@ def outf(opts, decode):
             mode = 'w+'
         return open(opts['out'], mode)
     else:
-        if (sys.version_info < (3, 0)):
-            return sys.stdout
         if decode:
             return sys.stdout
         return sys.stdout.buffer
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index a1d76e7cf..9db506e1e 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -42,7 +42,6 @@ import base64
 import struct
 import os
 import array
-import sys
 
 from . import magic
 from . import pb
@@ -71,18 +70,12 @@ class MagicException(Exception):
 
 def decode_base64_data(data):
     """A helper function to decode base64 data."""
-    if (sys.version_info > (3, 0)):
-        return base64.decodebytes(str.encode(data))
-    else:
-        return base64.decodebytes(data)
+    return base64.decodebytes(str.encode(data))
 
 
 def write_base64_data(f, data):
     """A helper function to write base64 encoded data to a file."""
-    if (sys.version_info > (3, 0)):
-        f.write(base64.decodebytes(str.encode(data)))
-    else:
-        f.write(base64.decodebytes(data))
+    f.write(base64.decodebytes(str.encode(data)))
 
 
 # Generic class to handle loading/dumping criu images entries from/to bin
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index 9d581c375..c7046429e 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -3,7 +3,6 @@ import collections
 import os
 import quopri
 import socket
-import sys
 from ipaddress import IPv4Address, IPv6Address, ip_address
 
 from google.protobuf.descriptor import FieldDescriptor as FD
@@ -247,17 +246,11 @@ def encode_dev(field, value):
 
 
 def encode_base64(value):
-    if (sys.version_info > (3, 0)):
-        return base64.encodebytes(value).decode()
-    else:
-        return base64.encodebytes(value)
+    return base64.encodebytes(value).decode()
 
 
 def decode_base64(value):
-    if (sys.version_info > (3, 0)):
-        return base64.decodebytes(str.encode(value))
-    else:
-        return base64.decodebytes(value)
+    return base64.decodebytes(str.encode(value))
 
 
 def encode_unix(value):

From 056cac474e5d1e88d86285ffcb26de776d9c550e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 22 Jun 2023 04:00:39 +0100
Subject: [PATCH 1333/1854] zdtm: drop python 2 compatibility

This patch removes the code for Python 2 compatibility introduced
with commit e65c7b5 (zdtm: Replace imp module with importlib).

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index b56f06ef1..c6e852dc1 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -635,14 +635,10 @@ class zdtm_test:
 
 
 def load_module_from_file(name, path):
-    if sys.version_info[0] == 3 and sys.version_info[1] >= 5:
-        import importlib.util
-        spec = importlib.util.spec_from_file_location(name, path)
-        mod = importlib.util.module_from_spec(spec)
-        spec.loader.exec_module(mod)
-    else:
-        import imp
-        mod = imp.load_source(name, path)
+    import importlib.util
+    spec = importlib.util.spec_from_file_location(name, path)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
     return mod
 
 

From a5fe99d2c5475e932fe13979ea3af1415cacadde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 31 May 2023 14:37:40 +0200
Subject: [PATCH 1334/1854] cgroup: Propagate error on cgroup mount failure.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the error to mount cgroup hierarchy a bit less noisy:

Error (criu/cgroup.c:623): cg: Unable to mount cgroup2 : Invalid argument'

Instead of

Error (criu/cgroup.c:623): cg: Unable to mount cgroup2 : Invalid argument'
Error (criu/cgroup.c:715): cg: failed walking /proc/self/fd/-1/zdtmtst for empty cgroups: No such file or directory'

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cgroup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 0bf7b3818..267a5b6b4 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -714,6 +714,8 @@ static int collect_cgroups(struct list_head *ctls)
 			}
 		} else {
 			fd = open_cgroupfs(cc);
+			if (fd < 0)
+				return -1;
 		}
 
 		path_pref_len = snprintf(path, PATH_MAX, "/proc/self/fd/%d", fd);

From 664598dc74842143a3e486b151123d8f1be2ca6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 9 Dec 2022 16:02:03 +0100
Subject: [PATCH 1335/1854] files-reg: Debug "open file on overmounted mount"
 error.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Log the mount and file that were the cause of failing a dump.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/files-reg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index ed8b9c889..512097716 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1818,7 +1818,8 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
 	}
 
 	if (!skip_for_shell_job && mnt_is_overmounted(mi)) {
-		pr_err("Open files on overmounted mounts are not supported yet\n");
+		pr_err("Open files on overmounted mounts are not supported yet; mount=%d fd=%d path=%s\n",
+		       p->mnt_id, p->fd, link->name + 1);
 		return -1;
 	}
 

From 5a723937a2fb2a5428eaadceb69c3a71546efea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 17:31:33 +0200
Subject: [PATCH 1336/1854] compel: Log the status word with "Task is still
 running" errors.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 compel/src/lib/infect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 5aab7aa3e..022d4ebf3 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -589,7 +589,7 @@ static int parasite_trap(struct parasite_ctl *ctl, pid_t pid, user_regs_struct_t
 	}
 
 	if (!WIFSTOPPED(status)) {
-		pr_err("Task is still running (pid: %d)\n", pid);
+		pr_err("Task is still running (pid: %d, status: 0x%x)\n", pid, status);
 		goto err;
 	}
 
@@ -1398,7 +1398,7 @@ static int parasite_fini_seized(struct parasite_ctl *ctl)
 
 	pr_debug("Daemon %d exited trapping\n", pid);
 	if (!WIFSTOPPED(status)) {
-		pr_err("Task is still running (pid: %d)\n", pid);
+		pr_err("Task is still running (pid: %d, status: 0x%x)\n", pid, status);
 		return -1;
 	}
 

From 1cb7916524bcdfff3f40ebb8e8d08322472f615e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 17:28:22 +0200
Subject: [PATCH 1337/1854] sk-unix: Log both peer names when failing on an
 external stream unix socket.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make debugging dump failures resulting in "sk unix: Can't dump half
of stream unix connection" errors easier.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/sk-unix.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 841152643..fd38ee7b1 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -878,7 +878,8 @@ static int __dump_external_socket(struct unix_sk_desc *sk, struct unix_sk_desc *
 
 	if (peer->type != SOCK_DGRAM) {
 		show_one_unix("Ext stream not supported", peer);
-		pr_err("Can't dump half of stream unix connection.\n");
+		pr_err("Can't dump half of stream unix connection. name: %s; peer name: %s\n",
+		       sk->name, peer->name);
 		return -1;
 	}
 

From 4018b787784121c922a8b52fbd4fdc03f6dd1419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 17 May 2023 20:04:20 +0200
Subject: [PATCH 1338/1854] soccr: Log offset when failed to restore socket's
 queued data.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 soccr/soccr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soccr/soccr.c b/soccr/soccr.c
index abea93703..6967835c7 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -816,7 +816,7 @@ static int __send_queue(struct libsoccr_sk *sk, int queue, char *buf, __u32 len)
 				continue;
 			}
 
-			logerr("Can't restore %d queue data (%d), want (%d:%d:%d)", queue, ret, chunk, len, max_chunk);
+			logerr("Can't restore %d queue data (%d), want (%d-%d:%d:%d)", queue, ret, off, chunk, len, max_chunk);
 			goto err;
 		}
 		off += ret;

From 804c0ba820d5fbc38357da135f7489f285cd3fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 18 May 2023 00:59:04 +0200
Subject: [PATCH 1339/1854] soccr: Log name of socket queue that failed to
 restore.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 soccr/soccr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/soccr/soccr.c b/soccr/soccr.c
index 6967835c7..8e1ce1c63 100644
--- a/soccr/soccr.c
+++ b/soccr/soccr.c
@@ -781,7 +781,7 @@ int libsoccr_restore(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsi
 	return 0;
 }
 
-static int __send_queue(struct libsoccr_sk *sk, int queue, char *buf, __u32 len)
+static int __send_queue(struct libsoccr_sk *sk, const char *queue, char *buf, __u32 len)
 {
 	int ret, err = -1, max_chunk;
 	int off;
@@ -816,7 +816,7 @@ static int __send_queue(struct libsoccr_sk *sk, int queue, char *buf, __u32 len)
 				continue;
 			}
 
-			logerr("Can't restore %d queue data (%d), want (%d-%d:%d:%d)", queue, ret, off, chunk, len, max_chunk);
+			logerr("Can't restore %s queue data (%d), want (%d-%d:%d:%d)", queue, ret, off, chunk, len, max_chunk);
 			goto err;
 		}
 		off += ret;
@@ -837,7 +837,7 @@ static int send_queue(struct libsoccr_sk *sk, int queue, char *buf, __u32 len)
 		return -1;
 	}
 
-	return __send_queue(sk, queue, buf, len);
+	return __send_queue(sk, queue == TCP_RECV_QUEUE ? "recv" : "send", buf, len);
 }
 
 static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, unsigned data_size, int queue,
@@ -876,7 +876,7 @@ static int libsoccr_restore_queue(struct libsoccr_sk *sk, struct libsoccr_sk_dat
 			 * they can be restored without any tricks.
 			 */
 			tcp_repair_off(sk->fd);
-			if (__send_queue(sk, TCP_SEND_QUEUE, buf + len, ulen))
+			if (__send_queue(sk, "not-sent send", buf + len, ulen))
 				return -3;
 			if (tcp_repair_on(sk->fd))
 				return -4;

From 3e428a1de747ae50d773189d2d6e68a607579796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 22 May 2023 14:49:47 +0200
Subject: [PATCH 1340/1854] log: Remove error logs for ignored or otherwise
 logged subprocess exits.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Errors in early restore.log for status=1 from a subprocess are confusing,
esp. that they don't show what command failed. Since the result is
either ignored or logged anyway, mark the calls as "can fail".

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/netfilter.c | 4 ++--
 criu/util.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/netfilter.c b/criu/netfilter.c
index 2212fd9f2..9e78dc4b0 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -48,8 +48,8 @@ void preload_netfilter_modules(void)
 		fd = -1;
 		pr_perror("failed to open /dev/null, using log fd for net module preload");
 	}
-	cr_system(fd, fd, fd, iptable_cmd_ipv4, (char *[]){ iptable_cmd_ipv4, "-L", "-n", NULL }, 0);
-	cr_system(fd, fd, fd, iptable_cmd_ipv6, (char *[]){ iptable_cmd_ipv6, "-L", "-n", NULL }, 0);
+	cr_system(fd, fd, fd, iptable_cmd_ipv4, (char *[]){ iptable_cmd_ipv4, "-L", "-n", NULL }, CRS_CAN_FAIL);
+	cr_system(fd, fd, fd, iptable_cmd_ipv6, (char *[]){ iptable_cmd_ipv6, "-L", "-n", NULL }, CRS_CAN_FAIL);
 	close_safe(&fd);
 }
 
diff --git a/criu/util.c b/criu/util.c
index 744ec6032..aa73083bd 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -1566,7 +1566,7 @@ static int is_iptables_nft(char *bin)
 		goto err;
 	}
 
-	ret = cr_system(-1, pfd[1], -1, cmd[0], cmd, 0);
+	ret = cr_system(-1, pfd[1], -1, cmd[0], cmd, CRS_CAN_FAIL);
 	if (ret) {
 		pr_err("%s -V failed\n", cmd[0]);
 		goto err;

From 4eb6cc319084b2339edf5adf3fdef432293a6cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 22 May 2023 18:52:59 +0200
Subject: [PATCH 1341/1854] mount: Demote fsnotify logs for ignored failures.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make logs about inaccessible mounts warnings, as the failures are
normally harmless (e.g. failure to read /dev/cgroup) and don't
make the CRIU run fail. (If it happens that the fsnotify can't
find a file, then to debug, full CRIU logs will be necessary anyway.)

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/mount.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index c26aaa58d..afbd24281 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1197,8 +1197,8 @@ int __check_mountpoint_fd(struct mount_info *pm, int mnt_fd, bool parse_mountinf
 		    dev == pm->s_dev_rt)
 			return 0;
 
-		pr_err("The file system %#x %#x (%#x) %s %s is inaccessible\n", pm->s_dev, pm->s_dev_rt, dev,
-		       pm->fstype->name, pm->ns_mountpoint);
+		pr_warn("The file system %#x %#x (%#x) %s %s is inaccessible\n", pm->s_dev, pm->s_dev_rt, dev,
+		        pm->fstype->name, pm->ns_mountpoint);
 		return -1;
 	}
 
@@ -1239,12 +1239,16 @@ int __open_mountpoint(struct mount_info *pm)
 int open_mount(unsigned int s_dev)
 {
 	struct mount_info *m;
+	int mnt_fd;
 
 	m = lookup_mnt_sdev(s_dev);
 	if (!m)
 		return -ENOENT;
 
-	return __open_mountpoint(m);
+	mnt_fd = __open_mountpoint(m);
+	if (mnt_fd < 0)
+		pr_err("Can't open mount %#x\n", s_dev);
+	return mnt_fd;
 }
 
 /* Bind-mount a mount point in a temporary place without children */

From 6b8107cd1b85956852703cc4bb006cdc7932edf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 17:26:56 +0200
Subject: [PATCH 1342/1854] irmap: Reduce error log severity to warning.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These errors originate from the filesystem scanning in irmap.c and are mostly
benign. Nevertheless, if they do result in a failed irmap lookup, that failed
lookup is more interesting from an application perspective.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/irmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/irmap.c b/criu/irmap.c
index 7b9d77bc1..2cdc66071 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -101,7 +101,7 @@ static int irmap_update_stat(struct irmap *i)
 
 	pr_debug("Refresh stat for %s\n", i->path);
 	if (fstatat(mntns_root, i->path + 1, &st, AT_SYMLINK_NOFOLLOW)) {
-		pr_perror("Can't stat %s", i->path);
+		pr_pwarn("Can't stat %s", i->path);
 		return -1;
 	}
 
@@ -136,7 +136,7 @@ static int irmap_update_dir(struct irmap *t)
 	pr_debug("Refilling %s dir\n", t->path);
 	fd = openat(mntns_root, t->path + 1, O_RDONLY);
 	if (fd < 0) {
-		pr_perror("Can't open %s", t->path);
+		pr_pwarn("Can't open %s", t->path);
 		return -1;
 	}
 

From 8ee35bebb52d54dee06afef0cb27e7b3e1dd796f Mon Sep 17 00:00:00 2001
From: Yan Evzman <yalevzman@edu.hse.ru>
Date: Fri, 7 Jul 2023 00:36:41 +0300
Subject: [PATCH 1343/1854] kerndat: bind ipv6-socket only if ipv6 is enabled

Fixes: #2222
Fixes: f1c8d38 ("kerndat: check if setsockopt IPV6_FREEBIND is supported")
Signed-off-by: Yan Evzman <yevzman@gmail.com>
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/kerndat.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 597fe5d92..c74201617 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1578,6 +1578,11 @@ static int kerndat_has_ipv6_freebind(void)
 {
 	int sk, val;
 
+	if (!kdat.ipv6) {
+		kdat.has_ipv6_freebind = false;
+		return 0;
+	}
+
 	sk = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 	if (sk == -1) {
 		pr_perror("Unable to create a ipv6 dgram socket");

From b2d74fbfd43db4ef71c239c939237a32570c77b3 Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Fri, 7 Jul 2023 15:29:59 +0800
Subject: [PATCH 1344/1854] zdtm: replace NR_fstat with NR_statx

NR_fstat is a deprecated syscall, some
modern architectures such as riscv and
loongarch64 no longer support this syscall.
It is usually replaced by NR_statx.

NR_statx is supported since linux 4.10.

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 test/zdtm/static/seccomp_filter_inheritance.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/seccomp_filter_inheritance.c b/test/zdtm/static/seccomp_filter_inheritance.c
index 7a86cd85e..5afcb3f84 100644
--- a/test/zdtm/static/seccomp_filter_inheritance.c
+++ b/test/zdtm/static/seccomp_filter_inheritance.c
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
 		if (filter_syscall(__NR_ptrace) < 0)
 			_exit(1);
 
-		if (filter_syscall(__NR_fstat) < 0)
+		if (filter_syscall(__NR_statx) < 0)
 			_exit(1);
 
 		zdtm_seccomp = 1;

From 23313080aaaedf83dde3bc3724cde92de3ff17b6 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Fri, 7 Jul 2023 16:33:12 -0700
Subject: [PATCH 1345/1854] kerndat: don't leak a socket file descriptor

kerndat_has_ipv6_freebind creates a socket but doesn't close it.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/kerndat.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index c74201617..4b836b5f7 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1574,9 +1574,26 @@ static int kerndat_has_nftables_concat(void)
 #define IPV6_FREEBIND 78
 #endif
 
+static int __kerndat_has_ipv6_freebind(int sk)
+{
+	int val = 1;
+
+	if (setsockopt(sk, SOL_IPV6, IPV6_FREEBIND, &val, sizeof(int)) == -1) {
+		if (errno == ENOPROTOOPT) {
+			kdat.has_ipv6_freebind = false;
+			return 0;
+		}
+		pr_perror("Unable to setsockopt ipv6_freebind");
+		return -1;
+	}
+
+	kdat.has_ipv6_freebind = true;
+	return 0;
+}
+
 static int kerndat_has_ipv6_freebind(void)
 {
-	int sk, val;
+	int sk, ret;
 
 	if (!kdat.ipv6) {
 		kdat.has_ipv6_freebind = false;
@@ -1589,18 +1606,9 @@ static int kerndat_has_ipv6_freebind(void)
 		return -1;
 	}
 
-	val = 1;
-	if (setsockopt(sk, SOL_IPV6, IPV6_FREEBIND, &val, sizeof(int)) == -1) {
-		if (errno == ENOPROTOOPT) {
-			kdat.has_ipv6_freebind = false;
-			return 0;
-		}
-		pr_perror("Unable to setsockopt ipv6_freebind");
-		return -1;
-	}
-
-	kdat.has_ipv6_freebind = true;
-	return 0;
+	ret = __kerndat_has_ipv6_freebind(sk);
+	close(sk);
+	return ret;
 }
 
 /*

From 8a24d4872ee00ee332834d04c2c8b9d7b437f7b2 Mon Sep 17 00:00:00 2001
From: Prajwal S N <prajwalnadig21@gmail.com>
Date: Sat, 1 Jul 2023 13:15:36 +0530
Subject: [PATCH 1346/1854] ci: add workflow to ensure self-contained commits

Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
---
 .github/workflows/check-commits.yml | 30 +++++++++++++++++++++++++++++
 scripts/ci/Makefile                 |  8 ++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 .github/workflows/check-commits.yml

diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml
new file mode 100644
index 000000000..be2fbd285
--- /dev/null
+++ b/.github/workflows/check-commits.yml
@@ -0,0 +1,30 @@
+name: Verify self-contained commits
+
+on: pull_request
+
+# Cancel any preceding run on the pull request
+concurrency:
+  group: commit-test-${{ github.event.pull_request.number }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    # Check if pull request does not have label "not-selfcontained-ok"
+    if: "!contains(github.event.pull_request.labels.*.name, 'not-selfcontained-ok')"
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        # Needed to rebase against the base branch
+        fetch-depth: 0
+        # Checkout pull request HEAD commit instead of merge commit
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Install dependencies
+      run: sudo apt-get install -y libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev
+    - name: Configure git user details
+      run: |
+        git config --global user.email "checkpoint-restore@users.noreply.github.com"
+        git config --global user.name "checkpoint-restore"
+    - name: Configure base branch without switching current branch
+      run: git fetch origin ${{ github.base_ref }}:${{ github.base_ref }}
+    - name: Build each commit
+      run: git rebase ${{ github.base_ref }} -x "make -C scripts/ci check-commit"
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 30dd9ebeb..5c4579103 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -102,5 +102,13 @@ vagrant-fedora-non-root: setup-vagrant
 
 .PHONY: setup-vagrant vagrant-fedora-no-vdso vagrant-fedora-rawhide vagrant-fedora-non-root
 
+check-commit:
+	($(MAKE) -j $$(nproc) -C ../.. && \
+		echo "Commit $$(git rev-parse --short HEAD) built successfully") || \
+		(echo "Build failed for $$(git rev-list -n 1 --pretty HEAD)" && \
+		exit 1)
+
+.PHONY: check-commit
+
 %:
 	$(MAKE) -C ../build $@$(target-suffix)

From b304106e6b66f16697c4f1b99e2abb86b4aee006 Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Mon, 12 Jun 2023 11:23:38 +0800
Subject: [PATCH 1347/1854] include: add common header files for loongarch64

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 include/common/arch/loongarch64/asm/atomic.h  | 62 +++++++++++++++++++
 include/common/arch/loongarch64/asm/bitops.h  | 24 +++++++
 .../common/arch/loongarch64/asm/bitsperlong.h |  6 ++
 include/common/arch/loongarch64/asm/linkage.h | 19 ++++++
 include/common/arch/loongarch64/asm/page.h    | 39 ++++++++++++
 5 files changed, 150 insertions(+)
 create mode 100644 include/common/arch/loongarch64/asm/atomic.h
 create mode 100644 include/common/arch/loongarch64/asm/bitops.h
 create mode 100644 include/common/arch/loongarch64/asm/bitsperlong.h
 create mode 100644 include/common/arch/loongarch64/asm/linkage.h
 create mode 100644 include/common/arch/loongarch64/asm/page.h

diff --git a/include/common/arch/loongarch64/asm/atomic.h b/include/common/arch/loongarch64/asm/atomic.h
new file mode 100644
index 000000000..901725439
--- /dev/null
+++ b/include/common/arch/loongarch64/asm/atomic.h
@@ -0,0 +1,62 @@
+#ifndef __CR_ATOMIC_H__
+#define __CR_ATOMIC_H__
+
+#include <linux/types.h>
+#include "common/compiler.h"
+
+typedef struct {
+	int counter;
+} atomic_t;
+
+static inline int atomic_read(const atomic_t *v)
+{
+	return (*(volatile int *)&(v)->counter);
+}
+
+static inline void atomic_set(atomic_t *v, int i)
+{
+	v->counter = i;
+}
+
+static inline int __atomic_add(int i, atomic_t *v)
+{
+	int result;
+	asm volatile("amadd_db.w %1, %2, %0" : "+ZB"(v->counter), "=&r"(result) : "r"(i) : "memory");
+	return result + i;
+}
+
+static inline void atomic_add(int i, atomic_t *v)
+{
+	__atomic_add(i, v);
+}
+
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+	return __atomic_add(i, v);
+}
+
+#define atomic_sub(i, v)	atomic_add(-(int)i, v)
+#define atomic_sub_return(i, v) atomic_add_return(-(int)i, v)
+#define atomic_inc(v)		atomic_add(1, v)
+#define atomic_inc_return(v)	atomic_add_return(1, v)
+#define atomic_dec(v)		atomic_sub(1, v)
+#define atomic_dec_return(v)	atomic_sub_return(1, v)
+
+static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+{
+	int ret;
+	asm volatile("1:                     \n"
+		     " ll.w  %0, %1          \n"
+		     " bne   %0, %2, 2f      \n"
+		     " or    $t0, %3, $zero  \n"
+		     " sc.w  $t0, %1         \n"
+		     " beqz  $t0, 1b         \n"
+		     "2:                     \n"
+		     " dbar  0               \n"
+		     : "=&r"(ret), "+ZB"(ptr->counter)
+		     : "r"(old), "r"(new)
+		     : "t0", "memory");
+	return ret;
+}
+
+#endif /* __CR_ATOMIC_H__ */
diff --git a/include/common/arch/loongarch64/asm/bitops.h b/include/common/arch/loongarch64/asm/bitops.h
new file mode 100644
index 000000000..170e4f736
--- /dev/null
+++ b/include/common/arch/loongarch64/asm/bitops.h
@@ -0,0 +1,24 @@
+#ifndef _LINUX_BITOPS_H
+#define _LINUX_BITOPS_H
+#include "common/asm-generic/bitops.h"
+
+/**
+ * test_and_set_bit - Set a bit and return its old value
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation is atomic and cannot be reordered.
+ * It also implies a memory barrier.
+ */
+
+#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
+#define BIT_WORD(nr) ((1UL << ((nr) / BITS_PER_LONG)) - 1)
+static inline int test_and_set_bit(unsigned long nr, volatile unsigned long *addr)
+{
+	unsigned long res, mask;
+	mask = BIT_MASK(nr);
+	asm volatile("amor_db.d  %0, %2, %1" : "=&r"(res), "+ZB"(addr[BIT_WORD(nr)]) : "r"(mask) : "memory");
+	return (res & mask) != 0;
+}
+
+#endif
diff --git a/include/common/arch/loongarch64/asm/bitsperlong.h b/include/common/arch/loongarch64/asm/bitsperlong.h
new file mode 100644
index 000000000..13d06a384
--- /dev/null
+++ b/include/common/arch/loongarch64/asm/bitsperlong.h
@@ -0,0 +1,6 @@
+#ifndef __CR_BITSPERLONG_H__
+#define __CR_BITSPERLONG_H__
+
+#define BITS_PER_LONG _LOONGARCH_SZLONG
+
+#endif /* __CR_BITSPERLONG_H__ */
diff --git a/include/common/arch/loongarch64/asm/linkage.h b/include/common/arch/loongarch64/asm/linkage.h
new file mode 100644
index 000000000..448acc29f
--- /dev/null
+++ b/include/common/arch/loongarch64/asm/linkage.h
@@ -0,0 +1,19 @@
+#ifndef __CR_LINKAGE_H__
+#define __CR_LINKAGE_H__
+
+#define __ALIGN	    .align 2
+#define __ALIGN_STR ".align 2"
+
+#define GLOBAL(name) \
+	.globl name; \
+name:
+
+#define ENTRY(name)            \
+	.globl name;           \
+	__ALIGN;               \
+	.type name, @function; \
+name:
+
+#define END(sym) .size sym, .- sym
+
+#endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/loongarch64/asm/page.h b/include/common/arch/loongarch64/asm/page.h
new file mode 100644
index 000000000..25bdbc141
--- /dev/null
+++ b/include/common/arch/loongarch64/asm/page.h
@@ -0,0 +1,39 @@
+#ifndef __CR_ASM_PAGE_H__
+#define __CR_ASM_PAGE_H__
+
+#define ARCH_HAS_LONG_PAGES
+
+#ifndef CR_NOGLIBC
+#include <string.h> /* ffsl() */
+#include <unistd.h> /* _SC_PAGESIZE */
+
+static unsigned __page_size;
+static unsigned __page_shift;
+
+static inline unsigned page_size(void)
+{
+	if (!__page_size)
+		__page_size = sysconf(_SC_PAGESIZE);
+	return __page_size;
+}
+
+static inline unsigned page_shift(void)
+{
+	if (!__page_shift)
+		__page_shift = (ffsl(page_size()) - 1);
+	return __page_shift;
+}
+
+#define PAGE_SIZE  page_size()
+#define PAGE_SHIFT page_shift()
+#define PAGE_MASK  (~(PAGE_SIZE - 1))
+
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
+#else /* CR_NOGLIBC */
+
+extern unsigned page_size(void);
+#define PAGE_SIZE page_size()
+
+#endif /* CR_NOGLIBC */
+
+#endif /* __CR_ASM_PAGE_H__ */

From c9df09eeab3c0e34efd00a0c9f68668416b7f565 Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Mon, 12 Jun 2023 09:35:40 +0000
Subject: [PATCH 1348/1854] compel: add loongarch64 support

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 Makefile                                      |  10 +-
 compel/Makefile                               |   2 +-
 .../plugins/include/asm/prologue.h            |  35 +++
 .../plugins/include/asm/syscall-types.h       |  30 +++
 .../loongarch64/plugins/include/features.h    |   4 +
 .../loongarch64/plugins/std/parasite-head.S   |   9 +
 .../plugins/std/syscalls/Makefile.syscalls    | 117 ++++++++++
 .../syscalls/syscall-common-loongarch-64.S    |  44 ++++
 .../plugins/std/syscalls/syscall_64.tbl       | 121 +++++++++++
 .../loongarch64/scripts/compel-pack.lds.S     |  32 +++
 compel/arch/loongarch64/src/lib/cpu.c         |  41 ++++
 .../loongarch64/src/lib/handle-elf-host.c     |  22 ++
 compel/arch/loongarch64/src/lib/handle-elf.c  |  22 ++
 .../loongarch64/src/lib/include/handle-elf.h  |   8 +
 .../loongarch64/src/lib/include/syscall.h     |   8 +
 .../src/lib/include/uapi/asm/breakpoints.h    |   6 +
 .../src/lib/include/uapi/asm/cpu.h            |   6 +
 .../src/lib/include/uapi/asm/fpu.h            |   4 +
 .../src/lib/include/uapi/asm/infect-types.h   |  67 ++++++
 .../src/lib/include/uapi/asm/sigframe.h       |  86 ++++++++
 compel/arch/loongarch64/src/lib/infect.c      | 204 ++++++++++++++++++
 compel/src/main.c                             |   3 +
 scripts/nmk/scripts/include.mk                |   3 +-
 23 files changed, 881 insertions(+), 3 deletions(-)
 create mode 100644 compel/arch/loongarch64/plugins/include/asm/prologue.h
 create mode 100644 compel/arch/loongarch64/plugins/include/asm/syscall-types.h
 create mode 100644 compel/arch/loongarch64/plugins/include/features.h
 create mode 100644 compel/arch/loongarch64/plugins/std/parasite-head.S
 create mode 100644 compel/arch/loongarch64/plugins/std/syscalls/Makefile.syscalls
 create mode 100644 compel/arch/loongarch64/plugins/std/syscalls/syscall-common-loongarch-64.S
 create mode 100644 compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
 create mode 100644 compel/arch/loongarch64/scripts/compel-pack.lds.S
 create mode 100644 compel/arch/loongarch64/src/lib/cpu.c
 create mode 100644 compel/arch/loongarch64/src/lib/handle-elf-host.c
 create mode 100644 compel/arch/loongarch64/src/lib/handle-elf.c
 create mode 100644 compel/arch/loongarch64/src/lib/include/handle-elf.h
 create mode 100644 compel/arch/loongarch64/src/lib/include/syscall.h
 create mode 100644 compel/arch/loongarch64/src/lib/include/uapi/asm/breakpoints.h
 create mode 100644 compel/arch/loongarch64/src/lib/include/uapi/asm/cpu.h
 create mode 100644 compel/arch/loongarch64/src/lib/include/uapi/asm/fpu.h
 create mode 100644 compel/arch/loongarch64/src/lib/include/uapi/asm/infect-types.h
 create mode 100644 compel/arch/loongarch64/src/lib/include/uapi/asm/sigframe.h
 create mode 100644 compel/arch/loongarch64/src/lib/infect.c

diff --git a/Makefile b/Makefile
index 020ef85fc..2e8a866af 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 
 #
 # Supported Architectures
-ifneq ($(filter-out x86 arm aarch64 ppc64 s390 mips,$(ARCH)),)
+ifneq ($(filter-out x86 arm aarch64 ppc64 s390 mips loongarch64,$(ARCH)),)
         $(error "The architecture $(ARCH) isn't supported")
 endif
 
@@ -80,6 +80,10 @@ ifeq ($(ARCH),mips)
         DEFINES		:= -DCONFIG_MIPS
 endif
 
+ifeq ($(ARCH),loongarch64)
+        DEFINES		:= -DCONFIG_LOONGARCH64
+endif
+
 #
 # CFLAGS_PIE:
 #
@@ -122,6 +126,10 @@ ifeq ($(ARCH),mips)
 WARNINGS		:= -rdynamic
 endif
 
+ifeq ($(ARCH),loongarch64)
+WARNINGS		:= -Wno-implicit-function-declaration
+endif
+
 ifneq ($(GCOV),)
         LDFLAGS         += -lgcov
         CFLAGS          += $(CFLAGS-GCOV)
diff --git a/compel/Makefile b/compel/Makefile
index b79aee687..78ec4826a 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -33,7 +33,7 @@ lib-y			+= arch/$(ARCH)/src/lib/thread_area.o
 endif
 
 # handle_elf() has no support of ELF relocations on ARM (yet?)
-ifneq ($(filter arm aarch64,$(ARCH)),)
+ifneq ($(filter arm aarch64 loongarch64,$(ARCH)),)
 CFLAGS			+= -DNO_RELOCS
 HOSTCFLAGS		+= -DNO_RELOCS
 endif
diff --git a/compel/arch/loongarch64/plugins/include/asm/prologue.h b/compel/arch/loongarch64/plugins/include/asm/prologue.h
new file mode 100644
index 000000000..c19ce54d7
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/include/asm/prologue.h
@@ -0,0 +1,35 @@
+#ifndef __ASM_PROLOGUE_H__
+#define __ASM_PROLOGUE_H__
+
+#ifndef __ASSEMBLY__
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <errno.h>
+
+#define sys_recv(sockfd, ubuf, size, flags) sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
+
+typedef struct prologue_init_args {
+	struct sockaddr_un ctl_sock_addr;
+	unsigned int ctl_sock_addr_len;
+
+	unsigned int arg_s;
+	void *arg_p;
+
+	void *sigframe;
+} prologue_init_args_t;
+
+#endif /* __ASSEMBLY__ */
+
+/*
+ * Reserve enough space for sigframe.
+ *
+ * FIXME It is rather should be taken from sigframe header.
+ */
+#define PROLOGUE_SGFRAME_SIZE 4096
+
+#define PROLOGUE_INIT_ARGS_SIZE 1024
+
+#endif /* __ASM_PROLOGUE_H__ */
diff --git a/compel/arch/loongarch64/plugins/include/asm/syscall-types.h b/compel/arch/loongarch64/plugins/include/asm/syscall-types.h
new file mode 100644
index 000000000..b883bd8be
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/include/asm/syscall-types.h
@@ -0,0 +1,30 @@
+#ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
+#define COMPEL_ARCH_SYSCALL_TYPES_H__
+
+#include <common/asm/bitsperlong.h>
+/* Types for sigaction, sigprocmask syscalls */
+typedef void rt_signalfn_t(int, siginfo_t *, void *);
+typedef rt_signalfn_t *rt_sighandler_t;
+
+typedef void rt_restorefn_t(void);
+typedef rt_restorefn_t *rt_sigrestore_t;
+
+/* refer to arch/loongarch/include/uapi/asm/signal.h */
+#define _KNSIG	     64
+#define _NSIG_BPW    BITS_PER_LONG
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
+
+typedef struct {
+	uint64_t sig[_KNSIG_WORDS];
+} k_rtsigset_t;
+
+typedef struct {
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
+} rt_sigaction_t;
+
+#define SA_RESTORER 0x04000000
+
+#endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
diff --git a/compel/arch/loongarch64/plugins/include/features.h b/compel/arch/loongarch64/plugins/include/features.h
new file mode 100644
index 000000000..b4a3cded2
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/include/features.h
@@ -0,0 +1,4 @@
+#ifndef __COMPEL_ARCH_FEATURES_H
+#define __COMPEL_ARCH_FEATURES_H
+
+#endif /* __COMPEL_ARCH_FEATURES_H */
diff --git a/compel/arch/loongarch64/plugins/std/parasite-head.S b/compel/arch/loongarch64/plugins/std/parasite-head.S
new file mode 100644
index 000000000..3a960490e
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/std/parasite-head.S
@@ -0,0 +1,9 @@
+
+#include "common/asm/linkage.h"
+
+	.section .head.text, "ax"
+ENTRY(__export_parasite_head_start)
+	bl	parasite_service;
+	break 0;
+END(__export_parasite_head_start)
+
diff --git a/compel/arch/loongarch64/plugins/std/syscalls/Makefile.syscalls b/compel/arch/loongarch64/plugins/std/syscalls/Makefile.syscalls
new file mode 100644
index 000000000..0d08f34e1
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/std/syscalls/Makefile.syscalls
@@ -0,0 +1,117 @@
+std-lib-y		+= ./$(PLUGIN_ARCH_DIR)/std/syscalls-64.o
+sys-proto-types		:= $(obj)/include/uapi/std/syscall-types.h
+sys-proto-generic	:= $(obj)/include/uapi/std/syscall.h
+sys-codes-generic	:= $(obj)/include/uapi/std/syscall-codes.h
+sys-codes		 = $(obj)/include/uapi/std/syscall-codes-$(1).h
+sys-proto		 = $(obj)/include/uapi/std/syscall-$(1).h
+sys-def			 = $(PLUGIN_ARCH_DIR)/std/syscalls/syscall_$(1).tbl
+sys-asm			 = $(PLUGIN_ARCH_DIR)/std/syscalls-$(1).S
+sys-asm-common-name	 = std/syscalls/syscall-common-loongarch-$(1).S
+sys-asm-common		 = $(PLUGIN_ARCH_DIR)/$(sys-asm-common-name)
+sys-asm-types		:= $(obj)/include/uapi/std/asm/syscall-types.h
+sys-exec-tbl		 = $(PLUGIN_ARCH_DIR)/std/sys-exec-tbl-$(1).c
+
+sys-bits		:= 64
+
+AV			:= $$$$
+
+define gen-rule-sys-codes
+$(sys-codes): $(sys-def) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) echo "#ifndef ASM_SYSCALL_CODES_H_$(1)__"					>> $$@
+	$(Q) echo "#define ASM_SYSCALL_CODES_H_$(1)__"					>> $$@
+	$(Q) cat $$< | awk '/^__NR/{SYSN=$(AV)1;					\
+		sub("^__NR", "SYS", SYSN);						\
+		print "\n#ifndef ", $(AV)1;						\
+		print "#define", $(AV)1, $(AV)2;					\
+		print "#endif";								\
+		print "\n#ifndef ", SYSN;						\
+		print "#define ", SYSN, $(AV)1;						\
+		print "#endif";}'							>> $$@
+	$(Q) echo "#endif /* ASM_SYSCALL_CODES_H_$(1)__ */"				>> $$@
+endef
+
+define gen-rule-sys-proto
+$(sys-proto): $(sys-def) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) echo "#ifndef ASM_SYSCALL_PROTO_H_$(1)__"					>> $$@
+	$(Q) echo "#define ASM_SYSCALL_PROTO_H_$(1)__"					>> $$@
+	$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>'			>> $$@
+	$(Q) echo '#include <compel/plugins/std/syscall-types.h>'			>> $$@
+ifeq ($(1),32)
+	$(Q) echo '#include "asm/syscall32.h"'						>> $$@
+endif
+	$(Q) cat $$< | awk '/^__NR/{print "extern long", $(AV)3,			\
+			substr($(AV)0, index($(AV)0,$(AV)4)), ";"}'			>> $$@
+	$(Q) echo "#endif /* ASM_SYSCALL_PROTO_H_$(1)__ */"				>> $$@
+endef
+
+define gen-rule-sys-asm
+$(sys-asm): $(sys-def) $(sys-asm-common) $(sys-codes) $(sys-proto) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) echo '#include <compel/plugins/std/syscall-codes-$(1).h>'			>> $$@
+	$(Q) echo '#include "$(sys-asm-common-name)"'					>> $$@
+	$(Q) cat $$< | awk '/^__NR/{print "SYSCALL(", $(AV)3, ",", $(AV)2, ")"}'	>> $$@
+endef
+
+define gen-rule-sys-exec-tbl
+$(sys-exec-tbl): $(sys-def) $(sys-codes) $(sys-proto) $(sys-proto-generic) $(sys-proto-types)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"					>  $$@
+	$(Q) cat $$< | awk '/^__NR/{print						\
+		"SYSCALL(", substr($(AV)3, 5), ",", $(AV)2, ")"}'			>> $$@
+endef
+
+$(sys-codes-generic): $(sys-proto-types)
+	$(call msg-gen, $@)
+	$(Q) echo "/* Autogenerated, don't edit */"			>  $@
+	$(Q) echo "#ifndef __ASM_CR_SYSCALL_CODES_H__"			>> $@
+	$(Q) echo "#define __ASM_CR_SYSCALL_CODES_H__"			>> $@
+	$(Q) echo '#include <compel/plugins/std/syscall-codes-64.h>'	>> $@
+	$(Q) cat $< | awk '/^__NR/{NR32=$$1;				\
+		sub("^__NR", "__NR32", NR32);				\
+		print "\n#ifndef ", NR32;				\
+		print "#define ", NR32, $$2;				\
+		print "#endif";}'					>> $@
+	$(Q) echo "#endif /* __ASM_CR_SYSCALL_CODES_H__ */"		>> $@
+mrproper-y += $(sys-codes-generic)
+
+$(sys-proto-generic): $(strip $(call map,sys-proto,$(sys-bits))) $(sys-proto-types)
+	$(call msg-gen, $@)
+	$(Q) echo "/* Autogenerated, don't edit */"			>  $@
+	$(Q) echo "#ifndef __ASM_CR_SYSCALL_PROTO_H__"			>> $@
+	$(Q) echo "#define __ASM_CR_SYSCALL_PROTO_H__"			>> $@
+	$(Q) echo ""							>> $@
+	$(Q) echo '#include <compel/plugins/std/syscall-64.h>'		>> $@
+	$(Q) echo ""							>> $@
+	$(Q) echo "#endif /* __ASM_CR_SYSCALL_PROTO_H__ */"		>> $@
+mrproper-y += $(sys-proto-generic)
+
+define gen-rule-sys-exec-tbl
+$(sys-exec-tbl): $(sys-def) $(sys-codes) $(sys-proto) $(sys-proto-generic)
+	$(call msg-gen, $$@)
+	$(Q) echo "/* Autogenerated, don't edit */"			>  $$@
+	$(Q) cat $$< | awk '/^__NR/{print				\
+		"SYSCALL(", substr($(AV)3, 5), ",", $(AV)2, ")"}'	>> $$@
+endef
+
+$(eval $(call map,gen-rule-sys-codes,$(sys-bits)))
+$(eval $(call map,gen-rule-sys-proto,$(sys-bits)))
+$(eval $(call map,gen-rule-sys-asm,$(sys-bits)))
+$(eval $(call map,gen-rule-sys-exec-tbl,$(sys-bits)))
+
+$(sys-asm-types): $(PLUGIN_ARCH_DIR)/include/asm/syscall-types.h
+	$(call msg-gen, $@)
+	$(Q) ln -s ../../../../../../$(PLUGIN_ARCH_DIR)/include/asm/syscall-types.h $(sys-asm-types)
+
+std-headers-deps	+= $(call sys-codes,$(sys-bits))
+std-headers-deps	+= $(call sys-proto,$(sys-bits))
+std-headers-deps	+= $(call sys-asm,$(sys-bits))
+std-headers-deps	+= $(call sys-exec-tbl,$(sys-bits))
+std-headers-deps	+= $(sys-codes-generic)
+std-headers-deps	+= $(sys-proto-generic)
+std-headers-deps	+= $(sys-asm-types)
+mrproper-y		+= $(std-headers-deps)
diff --git a/compel/arch/loongarch64/plugins/std/syscalls/syscall-common-loongarch-64.S b/compel/arch/loongarch64/plugins/std/syscalls/syscall-common-loongarch-64.S
new file mode 100644
index 000000000..fff894466
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/std/syscalls/syscall-common-loongarch-64.S
@@ -0,0 +1,44 @@
+#include "common/asm/linkage.h"
+
+#define SYSCALL(name, opcode)		\
+ENTRY(name);					\
+	addi.d	$a7, $zero, opcode;	\
+	syscall 0;					\
+	jirl	$r0, $r1, 0;		\
+END(name)
+
+#ifndef AT_FDCWD
+#define AT_FDCWD	-100
+#endif
+
+#ifndef AT_REMOVEDIR
+#define AT_REMOVEDIR	0x200
+#endif
+
+ENTRY(sys_open)
+	or		$a3, $zero, $a2
+	or		$a2, $zero, $a1
+	or		$a1, $zero, $a0
+	addi.d	$a0, $zero, AT_FDCWD
+	b		sys_openat
+END(sys_open)
+
+ENTRY(sys_mkdir)
+	or		$a3, $zero, $a2
+	or		$a2, $zero, $a1
+	or		$a1, $zero, $a0
+	addi.d	$a0, $zero, AT_FDCWD
+	b		sys_mkdirat
+END(sys_mkdir)
+
+ENTRY(sys_rmdir)
+	addi.d	$a2, $zero, AT_REMOVEDIR
+	or		$a1, $zero, $a0
+	addi.d	$a0, $zero, AT_FDCWD
+	b		sys_unlinkat
+END(sys_rmdir)
+
+ENTRY(__cr_restore_rt)
+	addi.d	$a7, $zero, __NR_rt_sigreturn
+	syscall	0
+END(__cr_restore_rt)
diff --git a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
new file mode 100644
index 000000000..b37a22674
--- /dev/null
+++ b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
@@ -0,0 +1,121 @@
+#
+# System calls table, please make sure the table consist only the syscalls
+# really used somewhere in project.
+# from kernel/linux-3.10.84/arch/mips/include/uapi/asm/unistd.h Linux 64-bit syscalls are in the range from 5000 to 5999.
+#
+# __NR_name			code		name			arguments
+# -------------------------------------------------------------------------------------------------------------------------------------------------------------
+__NR_io_setup				0		sys_io_setup			(unsigned nr_events, aio_context_t *ctx)
+__NR_io_submit				2		sys_io_submit			(aio_context_t ctx, long nr, struct iocb **iocbpp)
+__NR_io_getevents			4		sys_io_getevents		(aio_context_t ctx, long min_nr, long nr, struct io_event *evs, struct timespec *tmo)
+__NR_fcntl					25		sys_fcntl				(int fd, int type, long arg)
+__NR_ioctl					29		sys_ioctl				(unsigned int fd, unsigned int cmd, unsigned long arg)
+__NR_flock					32		sys_flock				(int fd, unsigned long cmd)
+__NR_mkdirat				34		sys_mkdirat             (int dfd, const char *pathname, int flag)
+__NR_unlinkat				35		sys_unlinkat            (int dfd, const char *pathname, int flag)
+__NR_umount2				39		sys_umount2				(char *name, int flags)
+__NR_mount					40		sys_mount				(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
+__NR_fallocate				47		sys_fallocate			(int fd, int mode, loff_t offset, loff_t len)
+__NR_close					57		sys_close				(int fd)
+__NR_openat					56		sys_openat				(int dfd, const char *filename, int flags, int mode)
+__NR_lseek					62		sys_lseek				(int fd, unsigned long offset, unsigned long origin)
+__NR_read					63		sys_read				(int fd, void *buf, unsigned long count)
+__NR_write					64		sys_write				(int fd, const void *buf, unsigned long count)
+__NR_pread64				67		sys_pread				(unsigned int fd, char *buf, size_t count, loff_t pos)
+__NR_preadv					69		sys_preadv_raw			(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
+__NR_ppoll					73		sys_ppoll				(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_signalfd4				74		sys_signalfd			(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
+__NR_vmsplice				75		sys_vmsplice			(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
+__NR_readlinkat				78		sys_readlinkat			(int fd, const char *path, char *buf, int bufsize)
+__NR_timerfd_settime		86		sys_timerfd_settime		(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
+__NR_capget					90		sys_capget				(struct cap_header *h, struct cap_data *d)
+__NR_capset					91		sys_capset				(struct cap_header *h, struct cap_data *d)
+__NR_personality			92		sys_personality			(unsigned int personality)
+__NR_exit					93		sys_exit				(unsigned long error_code)
+__NR_exit_group				94		sys_exit_group			(int error_code)
+__NR_waitid					95		sys_waitid				(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
+__NR_set_tid_address		96		sys_set_tid_address		(int *tid_addr)
+__NR_futex					98		sys_futex				(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
+__NR_set_robust_list		99		sys_set_robust_list		(struct robust_list_head *head, size_t len)
+__NR_get_robust_list		100		sys_get_robust_list		(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
+__NR_nanosleep				101		sys_nanosleep			(struct timespec *req, struct timespec *rem)
+__NR_getitimer				102		sys_getitimer			(int which, const struct itimerval *val)
+__NR_setitimer				103		sys_setitimer			(int which, const struct itimerval *val, struct itimerval *old)
+__NR_sys_timer_create		107		sys_timer_create		(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
+__NR_sys_timer_gettime		108		sys_timer_gettime		(int timer_id, const struct itimerspec *setting)
+__NR_sys_timer_getoverrun	109		sys_timer_getoverrun	(int timer_id)
+__NR_sys_timer_settime		110		sys_timer_settime		(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
+__NR_sys_timer_delete		111		sys_timer_delete		(kernel_timer_t timer_id)
+__NR_clock_gettime			113		sys_clock_gettime		(const clockid_t which_clock, const struct timespec *tp)
+__NR_sched_setscheduler		119		sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
+__NR_restart_syscall		128		sys_restart_syscall		(void)
+__NR_kill					129		sys_kill				(long pid, int sig)
+__NR_sigaltstack			132		sys_sigaltstack			(const void *uss, void *uoss)
+__NR_rt_sigaction			134		sys_sigaction			(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
+__NR_rt_sigprocmask			135		sys_sigprocmask			(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
+__NR_rt_sigqueueinfo		138		sys_rt_sigqueueinfo		(pid_t pid, int sig, siginfo_t *info)
+__NR_rt_sigreturn			139		sys_rt_sigreturn		(void)
+__NR_setpriority			140		sys_setpriority			(int which, int who, int nice)
+__NR_setresuid				147		sys_setresuid			(int uid, int euid, int suid)
+__NR_getresuid				148		sys_getresuid			(int *uid, int *euid, int *suid)
+__NR_setresgid				149		sys_setresgid			(int gid, int egid, int sgid)
+__NR_getresgid				150		sys_getresgid			(int *gid, int *egid, int *sgid)
+__NR_getpgid				155		sys_getpgid				(pid_t pid)
+__NR_setfsuid				151		sys_setfsuid			(int fsuid)
+__NR_setfsgid				152		sys_setfsgid			(int fsgid)
+__NR_getsid					156		sys_getsid				(void)
+__NR_getgroups				158		sys_getgroups			(int gsize, unsigned int *groups)
+__NR_setgroups				159		sys_setgroups			(int gsize, unsigned int *groups)
+__NR_setrlimit				164		sys_setrlimit			(int resource, struct krlimit *rlim)
+__NR_umask					166		sys_umask				(int mask)
+__NR_prctl					167		sys_prctl				(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
+__NR_gettimeofday			169		sys_gettimeofday		(struct timeval *tv, struct timezone *tz)
+__NR_getpid					172		sys_getpid				(void)
+__NR_ptrace					177		sys_ptrace				(long request, pid_t pid, void *addr, void *data)
+__NR_gettid					178		sys_gettid				(void)
+__NR_shmat					196		sys_shmat				(int shmid, void *shmaddr, int shmflag)
+__NR_socket					198		sys_socket				(int domain, int type, int protocol)
+__NR_bind					200		sys_bind				(int sockfd, const struct sockaddr *addr, int addrlen)
+__NR_connect				203		sys_connect				(int sockfd, struct sockaddr *addr, int addrlen)
+__NR_sendto					206		sys_sendto				(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
+__NR_recvfrom				207		sys_recvfrom			(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
+__NR_setsockopt				208		sys_setsockopt			(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
+__NR_getsockopt				209		sys_getsockopt			(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
+__NR_shutdown				210		sys_shutdown			(int sockfd, int how)
+__NR_sendmsg				211		sys_sendmsg				(int sockfd, const struct msghdr *msg, int flags)
+__NR_recvmsg				212		sys_recvmsg				(int sockfd, struct msghdr *msg, int flags)
+__NR_brk					214		sys_brk					(void *addr)
+__NR_munmap					215		sys_munmap				(void *addr, unsigned long len)
+__NR_mremap					216		sys_mremap				(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr)
+__NR_clone					220		sys_clone				(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
+__NR_mmap					222		sys_mmap				(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
+__NR_mprotect				226		sys_mprotect			(const void *addr, unsigned long len, unsigned long prot)
+__NR_mincore				232		sys_mincore				(void *addr, unsigned long size, unsigned char *vec)
+__NR_madvise				233		sys_madvise				(unsigned long start, size_t len, int behavior)
+__NR_rt_tgsigqueueinfo		240		sys_rt_tgsigqueueinfo	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
+__NR_wait4					260		sys_wait4				(int pid, int *status, int options, struct rusage *ru)
+__NR_fanotify_init			262		sys_fanotify_init		(unsigned int flags, unsigned int event_f_flags)
+__NR_fanotify_mark			263		sys_fanotify_mark		(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
+__NR_open_by_handle_at		265		sys_open_by_handle_at	(int mountdirfd, struct file_handle *handle, int flags)
+__NR_setns					268		sys_setns				(int fd, int nstype)
+__NR_kcmp					272		sys_kcmp				(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
+__NR_seccomp				277		sys_seccomp				(unsigned int op, unsigned int flags, const char *uargs)
+__NR_memfd_create			279		sys_memfd_create		(const char *name, unsigned int flags)
+__NR_userfaultfd			282		sys_userfaultfd			(int flags)
+__NR_rseq					293		sys_rseq				(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_open_tree				428		sys_open_tree			(int dirfd, const char *pathname, unsigned int flags)
+__NR_move_mount				429		sys_move_mount			(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
+__NR_fsopen					430		sys_fsopen				(char *fsname, unsigned int flags)
+__NR_fsconfig				431		sys_fsconfig			(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount				432		sys_fsmount				(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_pidfd_open				434		sys_pidfd_open			(pid_t pid, unsigned int flags)
+__NR_clone3					435		sys_clone3				(struct clone_args *uargs, size_t size)
+__NR_openat2				437		sys_openat2				(int dirfd, char *pathname, struct open_how *how, size_t size)
+__NR_pidfd_getfd			438		sys_pidfd_getfd			(int pidfd, int targetfd, unsigned int flags)
+#__NR_dup2					!		sys_dup2				(int oldfd, int newfd)
+#__NR_rmdir					!		sys_rmdir				(const char *name)
+#__NR_unlink				!		sys_unlink				(char *pathname)
+#__NR_cacheflush			!		sys_cacheflush			(char *addr, int nbytes, int cache)
+#__NR_set_thread_area		!		sys_set_thread_area		(unsigned long *addr)
+#__NR_mkdir					!		sys_mkdir				(const char *name, int mode)
+#__NR_open					!		sys_open				(const char *filename, unsigned long flags, unsigned long mode)
diff --git a/compel/arch/loongarch64/scripts/compel-pack.lds.S b/compel/arch/loongarch64/scripts/compel-pack.lds.S
new file mode 100644
index 000000000..cfb7a2fb3
--- /dev/null
+++ b/compel/arch/loongarch64/scripts/compel-pack.lds.S
@@ -0,0 +1,32 @@
+OUTPUT_ARCH(loongarch)
+EXTERN(__export_parasite_head_start)
+
+SECTIONS
+{
+	.crblob 0x0 : {
+		*(.head.text)
+		ASSERT(DEFINED(__export_parasite_head_start),
+			"Symbol __export_parasite_head_start is missing");
+		*(.text*)
+		. = ALIGN(32);
+		*(.data*)
+		. = ALIGN(32);
+		*(.rodata*)
+		. = ALIGN(32);
+		*(.bss*)
+		. = ALIGN(32);
+		*(.got*)
+		. = ALIGN(32);
+		*(.toc*)
+		. = ALIGN(32);
+	} =0x00000000,
+
+	/DISCARD/ : {
+		*(.debug*)
+		*(.comment*)
+		*(.note*)
+		*(.group*)
+		*(.eh_frame*)
+		*(*)
+	}
+}
diff --git a/compel/arch/loongarch64/src/lib/cpu.c b/compel/arch/loongarch64/src/lib/cpu.c
new file mode 100644
index 000000000..172b90e27
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/cpu.c
@@ -0,0 +1,41 @@
+#include <string.h>
+#include <stdbool.h>
+
+#include "compel-cpu.h"
+#include "common/bitops.h"
+#include "common/compiler.h"
+#include "log.h"
+
+#undef LOG_PREFIX
+#define LOG_PREFIX "cpu: "
+
+static compel_cpuinfo_t rt_info;
+static bool rt_info_done = false;
+
+void compel_set_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+}
+
+void compel_clear_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+}
+
+int compel_test_cpu_cap(compel_cpuinfo_t *c, unsigned int feature)
+{
+	return 0;
+}
+
+int compel_cpuid(compel_cpuinfo_t *c)
+{
+	return 0;
+}
+
+bool compel_cpu_has_feature(unsigned int feature)
+{
+	if (!rt_info_done) {
+		compel_cpuid(&rt_info);
+		rt_info_done = true;
+	}
+
+	return compel_test_cpu_cap(&rt_info, feature);
+}
diff --git a/compel/arch/loongarch64/src/lib/handle-elf-host.c b/compel/arch/loongarch64/src/lib/handle-elf-host.c
new file mode 100644
index 000000000..a605a5a45
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/handle-elf-host.c
@@ -0,0 +1,22 @@
+#include <string.h>
+#include <errno.h>
+
+#include "handle-elf.h"
+#include "piegen.h"
+#include "log.h"
+
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+extern int __handle_elf(void *mem, size_t size);
+
+int handle_binary(void *mem, size_t size)
+{
+	if (memcmp(mem, elf_ident_64_le, sizeof(elf_ident_64_le)) == 0)
+		return __handle_elf(mem, size);
+
+	pr_err("Unsupported Elf format detected\n");
+	return -EINVAL;
+}
diff --git a/compel/arch/loongarch64/src/lib/handle-elf.c b/compel/arch/loongarch64/src/lib/handle-elf.c
new file mode 100644
index 000000000..a605a5a45
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/handle-elf.c
@@ -0,0 +1,22 @@
+#include <string.h>
+#include <errno.h>
+
+#include "handle-elf.h"
+#include "piegen.h"
+#include "log.h"
+
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+extern int __handle_elf(void *mem, size_t size);
+
+int handle_binary(void *mem, size_t size)
+{
+	if (memcmp(mem, elf_ident_64_le, sizeof(elf_ident_64_le)) == 0)
+		return __handle_elf(mem, size);
+
+	pr_err("Unsupported Elf format detected\n");
+	return -EINVAL;
+}
diff --git a/compel/arch/loongarch64/src/lib/include/handle-elf.h b/compel/arch/loongarch64/src/lib/include/handle-elf.h
new file mode 100644
index 000000000..b0a66ef87
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/handle-elf.h
@@ -0,0 +1,8 @@
+#ifndef COMPEL_HANDLE_ELF_H__
+#define COMPEL_HANDLE_ELF_H__
+
+#include "elf64-types.h"
+
+#define arch_is_machine_supported(e_machine) (e_machine == EM_LOONGARCH)
+
+#endif /* COMPEL_HANDLE_ELF_H__ */
diff --git a/compel/arch/loongarch64/src/lib/include/syscall.h b/compel/arch/loongarch64/src/lib/include/syscall.h
new file mode 100644
index 000000000..ac3e2799a
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/syscall.h
@@ -0,0 +1,8 @@
+#ifndef __COMPEL_SYSCALL_H__
+#define __COMPEL_SYSCALL_H__
+
+#ifndef SIGSTKFLT
+#define SIGSTKFLT 16
+#endif
+
+#endif
diff --git a/compel/arch/loongarch64/src/lib/include/uapi/asm/breakpoints.h b/compel/arch/loongarch64/src/lib/include/uapi/asm/breakpoints.h
new file mode 100644
index 000000000..21eb1309f
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/uapi/asm/breakpoints.h
@@ -0,0 +1,6 @@
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
+#define ARCH_SI_TRAP TRAP_BRKPT
+extern int ptrace_set_breakpoint(pid_t pid, void *addr);
+extern int ptrace_flush_breakpoints(pid_t pid);
+#endif
diff --git a/compel/arch/loongarch64/src/lib/include/uapi/asm/cpu.h b/compel/arch/loongarch64/src/lib/include/uapi/asm/cpu.h
new file mode 100644
index 000000000..e568df789
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/uapi/asm/cpu.h
@@ -0,0 +1,6 @@
+#ifndef __CR_ASM_CPU_H__
+#define __CR_ASM_CPU_H__
+
+typedef struct {
+} compel_cpuinfo_t;
+#endif /* __CR_ASM_CPU_H__ */
diff --git a/compel/arch/loongarch64/src/lib/include/uapi/asm/fpu.h b/compel/arch/loongarch64/src/lib/include/uapi/asm/fpu.h
new file mode 100644
index 000000000..7f476d541
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/uapi/asm/fpu.h
@@ -0,0 +1,4 @@
+#ifndef __CR_ASM_FPU_H__
+#define __CR_ASM_FPU_H__
+
+#endif /* __CR_ASM_FPU_H__ */
diff --git a/compel/arch/loongarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/loongarch64/src/lib/include/uapi/asm/infect-types.h
new file mode 100644
index 000000000..0b047a5b0
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/uapi/asm/infect-types.h
@@ -0,0 +1,67 @@
+#ifndef UAPI_COMPEL_ASM_TYPES_H__
+#define UAPI_COMPEL_ASM_TYPES_H__
+
+#include <stdint.h>
+
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
+
+/*
+ * From the Linux kernel header arch/loongarch/include/uapi/asm/ptrace.h
+ *
+ * A thread LoongArch CPU context
+ *
+ * struct user_fp_state {
+ *     uint64_t    fpr[32];
+ *     uint64_t    fcc;
+ *     uint32_t    fcsr;
+ * };
+ *
+ * struct user_pt_regs {
+ *     unsigned long regs[32];
+ *     unsigned long csr_era;
+ *     unsigned long csr_badv;
+ *     unsigned long reserved[11];
+ * };
+ */
+
+struct user_gp_regs {
+	uint64_t regs[32];
+	uint64_t orig_a0;
+	uint64_t pc;
+	uint64_t csr_badv;
+	uint64_t reserved[10];
+} __attribute__((aligned(8)));
+
+struct user_fp_regs {
+	uint64_t regs[32];
+	uint64_t fcc;
+	uint32_t fcsr;
+};
+
+typedef struct user_gp_regs user_regs_struct_t;
+typedef struct user_fp_regs user_fpregs_struct_t;
+
+#define user_regs_native(regs) true
+
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
+
+#define REG_RES(r)	   ((uint64_t)(r).regs[4])
+#define REG_IP(r)	   ((uint64_t)(r).pc)
+#define REG_SP(r)	   ((uint64_t)(r).regs[3])
+#define REG_SYSCALL_NR(r)  ((uint64_t)(r).regs[11])
+#define SET_REG_IP(r, val) ((r).pc = (val))
+
+#define GPR_NUM 32
+#define FPR_NUM 32
+
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
+
+#endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/loongarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/loongarch64/src/lib/include/uapi/asm/sigframe.h
new file mode 100644
index 000000000..fcb545a1d
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/include/uapi/asm/sigframe.h
@@ -0,0 +1,86 @@
+#ifndef UAPI_COMPEL_ASM_SIGFRAME_H__
+#define UAPI_COMPEL_ASM_SIGFRAME_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include <compel/asm/fpu.h>
+#include <compel/plugins/std/syscall-codes.h>
+
+#include <asm/types.h>
+
+#define rt_sigcontext sigcontext
+/* sigcontext defined in usr/include/uapi/asm/sigcontext.h*/
+#include <compel/sigframe-common.h>
+typedef __u32 u32;
+
+typedef struct sigcontext_t {
+	__u64 pc;
+	__u64 regs[32];
+	__u32 flags;
+	__u64 extcontext[0] __attribute__((__aligned__(16)));
+} sigcontext_t;
+
+typedef struct context_info_t {
+	__u32 magic;
+	__u32 size;
+	__u64 padding;
+} context_info_t;
+
+#define FPU_CTX_MAGIC 0x46505501
+#define FPU_CTX_ALIGN 8
+typedef struct fpu_context_t {
+	__u64 regs[32];
+	__u64 fcc;
+	__u64 fcsr;
+} fpu_context_t;
+
+typedef struct ucontext {
+	unsigned long uc_flags;
+	struct ucontext *uc_link;
+	stack_t uc_stack;
+	sigset_t uc_sigmask;
+	__u8 __unused[1024 / 8 - sizeof(sigset_t)];
+	sigcontext_t uc_mcontext;
+} ucontext;
+
+/* Copy from the kernel source arch/loongarch/kernel/signal.c */
+struct rt_sigframe {
+	rt_siginfo_t rs_info;
+	ucontext rs_uc;
+};
+
+#define RT_SIGFRAME_UC(rt_sigframe)	 (&(rt_sigframe->rs_uc))
+#define RT_SIGFRAME_SIGMASK(rt_sigframe) ((k_rtsigset_t *)&RT_SIGFRAME_UC(rt_sigframe)->uc_sigmask)
+#define RT_SIGFRAME_SIGCTX(rt_sigframe)	 (&(RT_SIGFRAME_UC(rt_sigframe)->uc_mcontext))
+#define RT_SIGFRAME_REGIP(rt_sigframe)	 ((long unsigned int)(RT_SIGFRAME_SIGCTX(rt_sigframe)->pc))
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe) (1)
+
+#define RT_SIGFRAME_FPU(rt_sigframe)                                                                 \
+	({                                                                                           \
+		context_info_t *ctx = (context_info_t *)RT_SIGFRAME_SIGCTX(rt_sigframe)->extcontext; \
+		ctx->magic = FPU_CTX_MAGIC;                                                          \
+		ctx->size = sizeof(context_info_t) + sizeof(fpu_context_t);                          \
+		(fpu_context_t *)((char *)ctx + sizeof(context_info_t));                             \
+	})
+
+#define RT_SIGFRAME_OFFSET(rt_sigframe) 0
+
+/* clang-format off */
+#define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)  \
+    asm volatile(                               \
+            "addi.d $sp, %0, 0 \n"              \
+            "addi.d $a7, $zero, "__stringify(__NR_rt_sigreturn)"    \n" \
+            "syscall   0"                       \
+            :                                   \
+            :"r"(new_sp)                        \
+            : "$a7", "memory")
+/* clang-format on */
+
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe);
+
+#define rt_sigframe_erase_sigset(sigframe)	memset(RT_SIGFRAME_SIGMASK(sigframe), 0, sizeof(k_rtsigset_t))
+#define rt_sigframe_copy_sigset(sigframe, from) memcpy(RT_SIGFRAME_SIGMASK(sigframe), from, sizeof(k_rtsigset_t))
+
+#endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
diff --git a/compel/arch/loongarch64/src/lib/infect.c b/compel/arch/loongarch64/src/lib/infect.c
new file mode 100644
index 000000000..8e3c19aff
--- /dev/null
+++ b/compel/arch/loongarch64/src/lib/infect.c
@@ -0,0 +1,204 @@
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/auxv.h>
+#include <sys/mman.h>
+#include <errno.h>
+
+#include <compel/asm/fpu.h>
+#include <compel/cpu.h>
+#include "errno.h"
+#include <compel/plugins/std/syscall-codes.h>
+#include <compel/plugins/std/syscall.h>
+#include "common/err.h"
+#include "common/page.h"
+#include "asm/infect-types.h"
+#include "ptrace.h"
+#include "infect.h"
+#include "infect-priv.h"
+#include "log.h"
+#include "common/bug.h"
+
+/*
+ * Injected syscall instruction
+ * loongarch64 is Little Endian
+ */
+const char code_syscall[] = {
+	0x00, 0x00, 0x2b, 0x00, /* syscall    */
+	0x00, 0x00, 0x2a, 0x00	/*  break      */
+};
+
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+{
+	sigcontext_t *sc;
+	fpu_context_t *fpu;
+
+	sc = RT_SIGFRAME_SIGCTX(sigframe);
+	memcpy(sc->regs, regs->regs, sizeof(regs->regs));
+	sc->pc = regs->pc;
+
+	fpu = RT_SIGFRAME_FPU(sigframe);
+	memcpy(fpu->regs, fpregs->regs, sizeof(fpregs->regs));
+	fpu->fcc = fpregs->fcc;
+	fpu->fcsr = fpregs->fcsr;
+	return 0;
+}
+
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
+{
+	return 0;
+}
+
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
+{
+	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
+	struct iovec iov;
+	int ret;
+
+	pr_info("Dumping GP/FPU registers for %d\n", pid);
+
+	iov.iov_base = regs;
+	iov.iov_len = sizeof(user_regs_struct_t);
+	if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov))) {
+		pr_perror("Failed to obtain CPU registers for %d", pid);
+		goto err;
+	}
+
+	/*
+	 * Refer to Linux kernel arch/loongarch/kernel/signal.c
+	 */
+	if (regs->regs[0]) {
+		switch (regs->regs[4]) {
+		case -ERESTARTNOHAND:
+		case -ERESTARTSYS:
+		case -ERESTARTNOINTR:
+			regs->regs[4] = regs->orig_a0;
+			regs->pc -= 4;
+			break;
+		case -ERESTART_RESTARTBLOCK:
+			regs->regs[4] = regs->orig_a0;
+			regs->regs[11] = __NR_restart_syscall;
+			regs->pc -= 4;
+			break;
+		}
+		regs->regs[0] = 0; /* Don't deal with this again.  */
+	}
+
+	iov.iov_base = fpregs;
+	iov.iov_len = sizeof(user_fpregs_struct_t);
+	if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &iov))) {
+		pr_perror("Failed to obtain FPU registers for %d", pid);
+		goto err;
+	}
+
+	ret = save(arg, regs, fpregs);
+err:
+	return 0;
+}
+
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	struct iovec iov;
+
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	iov.iov_base = ext_regs;
+	iov.iov_len = sizeof(*ext_regs);
+	if (ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &iov)) {
+		pr_perror("Failed to set FPU registers for %d", pid);
+		return -1;
+	}
+	return 0;
+}
+
+/*
+ * Registers $4 ~ $11 represents arguments a0 ~ a7, especially a7 is
+ * used as syscall number.
+ */
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
+{
+	int err;
+	user_regs_struct_t regs = ctl->orig.regs;
+
+	regs.regs[11] = (unsigned long)nr;
+	regs.regs[4] = arg1;
+	regs.regs[5] = arg2;
+	regs.regs[6] = arg3;
+	regs.regs[7] = arg4;
+	regs.regs[8] = arg5;
+	regs.regs[9] = arg6;
+	err = compel_execute_syscall(ctl, &regs, code_syscall);
+
+	*ret = regs.regs[4];
+
+	return err;
+}
+
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+	long map;
+	int err;
+
+	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long)addr, length, prot, flags, fd, offset >> PAGE_SHIFT);
+
+	if (err < 0 || IS_ERR_VALUE(map)) {
+		pr_err("remote mmap() failed: %s\n", strerror(-map));
+		return NULL;
+	}
+
+	return (void *)map;
+}
+
+/*
+ * regs must be inited when calling this function from original context
+ */
+void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
+{
+	regs->pc = new_ip;
+	if (stack)
+		regs->regs[4] = (unsigned long)stack;
+}
+
+bool arch_can_dump_task(struct parasite_ctl *ctl)
+{
+	return true;
+}
+
+int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
+{
+	long ret;
+	int err;
+
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->rs_uc.uc_stack, 0, 0, 0, 0);
+	return err ? err : ret;
+}
+
+/*
+ * TODO: add feature
+ */
+int ptrace_set_breakpoint(pid_t pid, void *addr)
+{
+	return 0;
+}
+
+int ptrace_flush_breakpoints(pid_t pid)
+{
+	return 0;
+}
+
+/*
+ * Refer to Linux kernel arch/loongarch/include/asm/processor.h
+ */
+#define TASK_SIZE32	(1UL) << 31
+#define TASK_SIZE64_MIN (1UL) << 40
+#define TASK_SIZE64_MAX (1UL) << 48
+
+unsigned long compel_task_size(void)
+{
+	unsigned long task_size;
+	for (task_size = TASK_SIZE64_MIN; task_size < TASK_SIZE64_MAX; task_size <<= 1)
+		if (munmap((void *)task_size, page_size()))
+			break;
+	return task_size;
+}
diff --git a/compel/src/main.c b/compel/src/main.c
index ef05a46d0..bc16c0ab4 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -57,6 +57,9 @@ static const flags_t flags = {
 #elif defined CONFIG_MIPS
 	.arch = "mips",
 	.cflags = COMPEL_CFLAGS_PIE,
+#elif defined CONFIG_LOONGARCH64
+	.arch = "loongarch64",
+	.cflags = COMPEL_CFLAGS_PIE,
 #else
 #error "CONFIG_<ARCH> not defined, or unsupported ARCH"
 #endif
diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
index c1c1e94af..55c5be307 100644
--- a/scripts/nmk/scripts/include.mk
+++ b/scripts/nmk/scripts/include.mk
@@ -20,7 +20,8 @@ ARCH	?= $(shell echo $(SUBARCH) | sed	\
                 -e s/ppc64.*/ppc64/		\
                 -e s/mips.*/mips/		\
                 -e s/sh[234].*/sh/		\
-                -e s/aarch64.*/aarch64/)
+                -e s/aarch64.*/aarch64/		\
+                -e s/loongarch64.*/loongarch64/)
 
 export SUBARCH ARCH
 

From ec6dc2d5c0de5b1459ba0b6a91b686ca1db2fdf9 Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Mon, 12 Jun 2023 15:09:22 +0800
Subject: [PATCH 1349/1854] images: add loongarch64 core image

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 images/Makefile               |  1 +
 images/core-loongarch64.proto | 23 +++++++++++++++++++++++
 images/core.proto             |  3 +++
 3 files changed, 27 insertions(+)
 create mode 100755 images/core-loongarch64.proto

diff --git a/images/Makefile b/images/Makefile
index 004e22ec3..ca85b1a21 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -2,6 +2,7 @@ proto-obj-y	+= stats.o
 proto-obj-y	+= core.o
 proto-obj-y	+= core-x86.o
 proto-obj-y	+= core-mips.o
+proto-obj-y	+= core-loongarch64.o
 proto-obj-y	+= core-arm.o
 proto-obj-y	+= core-aarch64.o
 proto-obj-y	+= core-ppc64.o
diff --git a/images/core-loongarch64.proto b/images/core-loongarch64.proto
new file mode 100755
index 000000000..8258f006e
--- /dev/null
+++ b/images/core-loongarch64.proto
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+
+syntax = "proto2";
+
+import "opts.proto";
+
+message user_loongarch64_gpregs_entry {
+	repeated uint64 regs	= 1;
+	required uint64 pc		= 2;
+}
+
+message user_loongarch64_fpregs_entry {
+	repeated uint64 regs    = 1;
+	required uint64 fcc     = 2;
+	required uint32 fcsr    = 3;
+}
+
+message thread_info_loongarch64 {
+	required uint64	clear_tid_addr	= 1[(criu).hex = true];
+	required uint64	tls				= 2;
+	required user_loongarch64_gpregs_entry	gpregs	= 3[(criu).hex = true];
+	required user_loongarch64_fpregs_entry	fpregs	= 4[(criu).hex = true];
+}
diff --git a/images/core.proto b/images/core.proto
index eddd1dc55..1882fe8e4 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -8,6 +8,7 @@ import "core-aarch64.proto";
 import "core-ppc64.proto";
 import "core-s390.proto";
 import "core-mips.proto";
+import "core-loongarch64.proto";
 
 import "rlimit.proto";
 import "timer.proto";
@@ -122,6 +123,7 @@ message core_entry {
 		PPC64		= 4;
 		S390		= 5;
 		MIPS		= 6;
+		LOONGARCH64		= 7;
 	}
 
 	required march			mtype		= 1;
@@ -131,6 +133,7 @@ message core_entry {
 	optional thread_info_ppc64	ti_ppc64	= 9;
 	optional thread_info_s390	ti_s390		= 10;
 	optional thread_info_mips	ti_mips		= 11;
+	optional thread_info_loongarch64	ti_loongarch64  = 12;
 
 	optional task_core_entry	tc		= 3;
 	optional task_kobj_ids_entry	ids		= 4;

From ae0811475783561bf5ce0ea39b9e88e9c8135ebb Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Mon, 12 Jun 2023 15:15:30 +0800
Subject: [PATCH 1350/1854] criu: add loongarch64 support to parasite and
 restorer

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 criu/arch/loongarch64/Makefile                |  14 +++
 criu/arch/loongarch64/cpu.c                   |  31 +++++
 criu/arch/loongarch64/crtools.c               | 115 ++++++++++++++++++
 criu/arch/loongarch64/include/asm/dump.h      |  15 +++
 criu/arch/loongarch64/include/asm/int.h       |   6 +
 criu/arch/loongarch64/include/asm/kerndat.h   |   7 ++
 .../include/asm/parasite-syscall.h            |   6 +
 criu/arch/loongarch64/include/asm/parasite.h  |  11 ++
 criu/arch/loongarch64/include/asm/restore.h   |  33 +++++
 criu/arch/loongarch64/include/asm/restorer.h  |  97 +++++++++++++++
 .../loongarch64/include/asm/thread_pointer.h  |  27 ++++
 criu/arch/loongarch64/include/asm/types.h     |  39 ++++++
 criu/arch/loongarch64/include/asm/vdso.h      |  27 ++++
 criu/arch/loongarch64/restorer.c              |  14 +++
 criu/arch/loongarch64/sigframe.c              |  12 ++
 criu/arch/loongarch64/vdso-pie.c              |  48 ++++++++
 16 files changed, 502 insertions(+)
 create mode 100644 criu/arch/loongarch64/Makefile
 create mode 100644 criu/arch/loongarch64/cpu.c
 create mode 100644 criu/arch/loongarch64/crtools.c
 create mode 100644 criu/arch/loongarch64/include/asm/dump.h
 create mode 100644 criu/arch/loongarch64/include/asm/int.h
 create mode 100644 criu/arch/loongarch64/include/asm/kerndat.h
 create mode 100644 criu/arch/loongarch64/include/asm/parasite-syscall.h
 create mode 100644 criu/arch/loongarch64/include/asm/parasite.h
 create mode 100644 criu/arch/loongarch64/include/asm/restore.h
 create mode 100644 criu/arch/loongarch64/include/asm/restorer.h
 create mode 100644 criu/arch/loongarch64/include/asm/thread_pointer.h
 create mode 100644 criu/arch/loongarch64/include/asm/types.h
 create mode 100644 criu/arch/loongarch64/include/asm/vdso.h
 create mode 100644 criu/arch/loongarch64/restorer.c
 create mode 100644 criu/arch/loongarch64/sigframe.c
 create mode 100644 criu/arch/loongarch64/vdso-pie.c

diff --git a/criu/arch/loongarch64/Makefile b/criu/arch/loongarch64/Makefile
new file mode 100644
index 000000000..4bd99eb7e
--- /dev/null
+++ b/criu/arch/loongarch64/Makefile
@@ -0,0 +1,14 @@
+builtin-name		:= crtools.built-in.o
+
+ccflags-y		+= -iquote $(obj)/include
+ccflags-y		+= -iquote criu/include -iquote include
+ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
+
+asflags-y		+= -Wstrict-prototypes
+asflags-y		+= -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
+asflags-y		+= -iquote $(obj)/include
+ldflags-y		+= -r -z noexecstack
+
+obj-y			+= cpu.o
+obj-y			+= crtools.o
+obj-y			+= sigframe.o
diff --git a/criu/arch/loongarch64/cpu.c b/criu/arch/loongarch64/cpu.c
new file mode 100644
index 000000000..5559c4288
--- /dev/null
+++ b/criu/arch/loongarch64/cpu.c
@@ -0,0 +1,31 @@
+#undef LOG_PREFIX
+#define LOG_PREFIX "cpu: "
+
+int cpu_init(void)
+{
+	return 0;
+}
+
+int cpu_dump_cpuinfo(void)
+{
+	return 0;
+}
+
+int cpu_validate_cpuinfo(void)
+{
+	return 0;
+}
+
+int cpuinfo_dump(void)
+{
+	if (cpu_init())
+		return -1;
+	if (cpu_dump_cpuinfo())
+		return -1;
+	return 0;
+}
+
+int cpuinfo_check(void)
+{
+	return 0;
+}
diff --git a/criu/arch/loongarch64/crtools.c b/criu/arch/loongarch64/crtools.c
new file mode 100644
index 000000000..eeb0731ca
--- /dev/null
+++ b/criu/arch/loongarch64/crtools.c
@@ -0,0 +1,115 @@
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <elf.h>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <sys/auxv.h>
+#include <sys/wait.h>
+
+#include "types.h"
+#include "log.h"
+#include "asm/restorer.h"
+#include "asm/parasite-syscall.h"
+#include <compel/asm/fpu.h>
+#include "asm/dump.h"
+#include "cr_options.h"
+#include "common/compiler.h"
+#include "restorer.h"
+#include "parasite-syscall.h"
+#include "util.h"
+#include "cpu.h"
+#include <compel/plugins/std/syscall-codes.h>
+#include "kerndat.h"
+
+#include "protobuf.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
+
+#define assign_reg(dst, src, e) (dst)->e = (__typeof__(dst->e))(src)->e
+
+int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+{
+	int i;
+	CoreEntry *core = x;
+	UserLoongarch64GpregsEntry *gprs = core->ti_loongarch64->gpregs;
+	UserLoongarch64FpregsEntry *fprs = core->ti_loongarch64->fpregs;
+	for (i = 0; i < GPR_NUM; i++)
+		assign_reg(gprs, regs, regs[i]);
+	assign_reg(gprs, regs, pc);
+
+	for (i = 0; i < FPR_NUM; i++)
+		assign_reg(fpregs, fpregs, regs[i]);
+	assign_reg(fprs, fpregs, fcc);
+	assign_reg(fprs, fpregs, fcsr);
+	return 0;
+}
+
+int arch_alloc_thread_info(CoreEntry *core)
+{
+	ThreadInfoLoongarch64 *ti_loongarch64;
+	UserLoongarch64GpregsEntry *gpregs;
+	UserLoongarch64FpregsEntry *fpregs;
+
+	ti_loongarch64 = xmalloc(sizeof(*ti_loongarch64));
+	thread_info_loongarch64__init(ti_loongarch64);
+	core->ti_loongarch64 = ti_loongarch64;
+
+	gpregs = xmalloc(sizeof(*gpregs));
+	if (!gpregs)
+		goto err;
+	user_loongarch64_gpregs_entry__init(gpregs);
+	gpregs->n_regs = GPR_NUM;
+	gpregs->regs = xmalloc(GPR_NUM * sizeof(uint64_t));
+	if (!gpregs->regs)
+		goto err;
+	ti_loongarch64->gpregs = gpregs;
+
+	fpregs = xmalloc(sizeof(*fpregs));
+	if (!fpregs)
+		goto err;
+	user_loongarch64_fpregs_entry__init(fpregs);
+	fpregs->n_regs = FPR_NUM;
+	fpregs->regs = xmalloc(FPR_NUM * sizeof(uint64_t));
+	if (!fpregs->regs)
+		goto err;
+	ti_loongarch64->fpregs = fpregs;
+
+	return 0;
+err:
+	return -1;
+}
+
+void arch_free_thread_info(CoreEntry *core)
+{
+	if (CORE_THREAD_ARCH_INFO(core)) {
+		if (CORE_THREAD_ARCH_INFO(core)->fpregs) {
+			xfree(CORE_THREAD_ARCH_INFO(core)->fpregs->regs);
+			xfree(CORE_THREAD_ARCH_INFO(core)->fpregs);
+		}
+		xfree(CORE_THREAD_ARCH_INFO(core)->gpregs->regs);
+		xfree(CORE_THREAD_ARCH_INFO(core)->gpregs);
+		xfree(CORE_THREAD_ARCH_INFO(core));
+		CORE_THREAD_ARCH_INFO(core) = NULL;
+	}
+}
+
+int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
+{
+	fpu_context_t *fpu = RT_SIGFRAME_FPU(sigframe);
+	UserLoongarch64FpregsEntry *fpregs = core->ti_loongarch64->fpregs;
+
+	memcpy(fpu->regs, fpregs->regs, sizeof(fpu->regs));
+	fpu->fcc = fpregs->fcc;
+	fpu->fcsr = fpregs->fcsr;
+	return 0;
+}
+
+int restore_gpregs(struct rt_sigframe *sigframe, UserRegsEntry *r)
+{
+	sigcontext_t *sc = RT_SIGFRAME_SIGCTX(sigframe);
+	memcpy(sc->regs, r->regs, sizeof(sc->regs));
+	sc->pc = r->pc;
+	return 0;
+}
diff --git a/criu/arch/loongarch64/include/asm/dump.h b/criu/arch/loongarch64/include/asm/dump.h
new file mode 100644
index 000000000..04347155c
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/dump.h
@@ -0,0 +1,15 @@
+#ifndef __CR_ASM_DUMP_H__
+#define __CR_ASM_DUMP_H__
+
+extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int arch_alloc_thread_info(CoreEntry *core);
+extern void arch_free_thread_info(CoreEntry *core);
+
+static inline void core_put_tls(CoreEntry *core, tls_t tls)
+{
+	core->ti_loongarch64->tls = tls;
+}
+
+#define get_task_futex_robust_list_compat(pid, info) -1
+
+#endif
diff --git a/criu/arch/loongarch64/include/asm/int.h b/criu/arch/loongarch64/include/asm/int.h
new file mode 100644
index 000000000..642804e9b
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/int.h
@@ -0,0 +1,6 @@
+#ifndef __CR_ASM_INT_H__
+#define __CR_ASM_INT_H__
+
+#include "asm-generic/int.h"
+
+#endif /* __CR_ASM_INT_H__ */
diff --git a/criu/arch/loongarch64/include/asm/kerndat.h b/criu/arch/loongarch64/include/asm/kerndat.h
new file mode 100644
index 000000000..bb70cf6cf
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/kerndat.h
@@ -0,0 +1,7 @@
+#ifndef __CR_ASM_KERNDAT_H__
+#define __CR_ASM_KERNDAT_H__
+
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
+
+#endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/loongarch64/include/asm/parasite-syscall.h b/criu/arch/loongarch64/include/asm/parasite-syscall.h
new file mode 100644
index 000000000..6008c3792
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/parasite-syscall.h
@@ -0,0 +1,6 @@
+#ifndef __CR_ASM_PARASITE_SYSCALL_H__
+#define __CR_ASM_PARASITE_SYSCALL_H__
+
+struct parasite_ctl;
+
+#endif
diff --git a/criu/arch/loongarch64/include/asm/parasite.h b/criu/arch/loongarch64/include/asm/parasite.h
new file mode 100644
index 000000000..b64cb3185
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/parasite.h
@@ -0,0 +1,11 @@
+#ifndef __ASM_PARASITE_H__
+#define __ASM_PARASITE_H__
+
+static inline void arch_get_tls(tls_t *ptls)
+{
+	tls_t tls;
+	asm volatile("or %0, $zero, $tp" : "=r"(tls));
+	*ptls = tls;
+}
+
+#endif
diff --git a/criu/arch/loongarch64/include/asm/restore.h b/criu/arch/loongarch64/include/asm/restore.h
new file mode 100644
index 000000000..d956231c8
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/restore.h
@@ -0,0 +1,33 @@
+#ifndef __CR_ASM_RESTORE_H__
+#define __CR_ASM_RESTORE_H__
+
+#include "asm/restorer.h"
+#include "images/core.pb-c.h"
+
+/* clang-format off */
+#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, task_args)	\
+({										\
+ 	uint64_t save_sp;							\
+	asm volatile("or %0, $zero, $sp" : "=r"(save_sp) : :"memory");		\
+	asm volatile(								\
+	        "or	$a0, $zero, %2	\n"					\
+	        "or	$sp, $zero, %0	\n"					\
+	        "jirl	$ra, %1, 0 	\n"					\
+	        :                               				\
+	        : "r"(new_sp & ~15),						\
+	          "r"(restore_task_exec_start), 				\
+	          "r"(task_args)						\
+	        : "$a0", "memory");						\
+	asm volatile("or $sp, $zero, %0" : : "r"(save_sp) : "memory"); 		\
+})
+
+/* clang-format on */
+
+static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
+{
+	*ptls = pcore->ti_loongarch64->tls;
+}
+
+int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
+
+#endif
diff --git a/criu/arch/loongarch64/include/asm/restorer.h b/criu/arch/loongarch64/include/asm/restorer.h
new file mode 100644
index 000000000..7a0d35c5b
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/restorer.h
@@ -0,0 +1,97 @@
+#ifndef __CR_ASM_RESTORER_H__
+#define __CR_ASM_RESTORER_H__
+
+#include "asm/types.h"
+#include <compel/asm/fpu.h>
+#include "images/core.pb-c.h"
+#include <compel/plugins/std/syscall-codes.h>
+#include <compel/asm/sigframe.h>
+
+/* clang-format off */
+#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
+			thread_args, clone_restore_fn)			\
+		asm volatile(								\
+				"clone_emul:					\n"	\
+				"ld.d		$a1, %2				\n"	\
+				"addi.d		$a1, $a1, -16 		\n"	\
+				"st.d		%5, $a1, 0			\n"	\
+				"st.d		%6, $a1, 8			\n"	\
+				"or			$a0, $zero, %1		\n"	\
+				"or			$a2, $zero, %3		\n"	\
+				"or			$a3, $zero, %4		\n"	\
+				"ori 		$a7, $zero, "__stringify(__NR_clone)"	\n"	\
+				"syscall	0					\n"	\
+												   	\
+				"beqz		$a0, thread_run     \n"	\
+												   	\
+				"or			%0, $zero, $a0		\n"	\
+				"b			clone_end			\n"	\
+												   	\
+				"thread_run:					\n"	\
+				"ld.d		$a1, $sp, 0			\n"	\
+				"ld.d		$a0, $sp, 8			\n"	\
+				"jirl		$ra, $a1, 0			\n"	\
+												   	\
+				"clone_end:						\n"	\
+				: "=r"(ret)							\
+				: "r"(clone_flags),					\
+				  "ZB"(new_sp),						\
+				  "r"(&parent_tid),					\
+				  "r"(&thread_args[i].pid),			\
+				  "r"(&clone_restore_fn),			\
+				  "r"(&thread_args[i])				\
+				: "$a0", "$a1", "$a2", "$a3", "$a7", "memory")
+
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args,	\
+			clone_restore_fn)								\
+		asm volatile(								\
+				"clone3_emul:					\n"	\
+				"or			$a0, $zero, %1		\n"	\
+				"or			$a1, $zero, %2		\n"	\
+				"or			$a2, $zero, %3		\n"	\
+				"or			$a3, $zero, %4		\n"	\
+				"ori		$a7, $zero, "__stringify(__NR_clone3)"	\n"	\
+				"syscall	0					\n"	\
+													\
+				"beqz		$a0, clone3_thread_run	\n"	\
+													\
+				"or			%0, $zero, $a0		\n"	\
+				"b			clone3_end			\n"	\
+													\
+				"clone3_thread_run:				\n"	\
+				"or			$a0, $zero, $a3		\n"	\
+				"jirl		$ra, $a2, 0			\n"	\
+				"clone3_end:					\n"	\
+				: "=r"(ret)							\
+				: "r"(&clone_args),					\
+				  "r"(size),						\
+				  "r"(clone_restore_fn),			\
+				  "r"(args)							\
+				: "$a0", "$a1", "$a2", "$a3", "$a7", "memory")
+/* clang-format on */
+
+static inline void restore_tls(tls_t *ptls)
+{
+	asm volatile("or $tp, $zero, %0" : : "r"(*ptls));
+}
+static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
+{
+	return -1;
+}
+static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
+{
+	return -1;
+}
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
+int restore_gpregs(struct rt_sigframe *f, UserLoongarch64GpregsEntry *r);
+int restore_nonsigframe_gpregs(UserLoongarch64GpregsEntry *r);
+
+#define arch_map_vdso(map, compat) -1
+
+#endif
diff --git a/criu/arch/loongarch64/include/asm/thread_pointer.h b/criu/arch/loongarch64/include/asm/thread_pointer.h
new file mode 100644
index 000000000..f7e07066a
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/thread_pointer.h
@@ -0,0 +1,27 @@
+/* __thread_pointer definition.  Generic version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __builtin_thread_pointer();
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
diff --git a/criu/arch/loongarch64/include/asm/types.h b/criu/arch/loongarch64/include/asm/types.h
new file mode 100644
index 000000000..72bca2022
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/types.h
@@ -0,0 +1,39 @@
+#ifndef __CR_ASM_TYPES_H__
+#define __CR_ASM_TYPES_H__
+
+#include <stdbool.h>
+#include <signal.h>
+
+#include "page.h"
+#include "bitops.h"
+#include "asm/int.h"
+#include "images/core.pb-c.h"
+
+#include <compel/plugins/std/asm/syscall-types.h>
+
+#define core_is_compat(core) false
+
+#define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__LOONGARCH64
+
+#define CORE_THREAD_ARCH_INFO(core) core->ti_loongarch64
+
+#define TI_SP(core) ((core)->ti_loongarch64->gpregs->regs[4])
+
+#define TI_IP(core) ((core)->ti_loongarch64->gpregs->pc)
+
+typedef UserLoongarch64GpregsEntry UserRegsEntry;
+
+static inline uint64_t encode_pointer(void *p)
+{
+	return (uint64_t)p;
+}
+static inline void *decode_pointer(uint64_t v)
+{
+	return (void *)v;
+}
+
+#define AT_VECTOR_SIZE 44
+typedef uint64_t auxv_t;
+typedef uint64_t tls_t;
+
+#endif /* __CR_ASM_TYPES_H__ */
diff --git a/criu/arch/loongarch64/include/asm/vdso.h b/criu/arch/loongarch64/include/asm/vdso.h
new file mode 100644
index 000000000..64631dee0
--- /dev/null
+++ b/criu/arch/loongarch64/include/asm/vdso.h
@@ -0,0 +1,27 @@
+#ifndef __CR_ASM_VDSO_H__
+#define __CR_ASM_VDSO_H__
+
+#include "asm/int.h"
+#include "asm-generic/vdso.h"
+
+/* This definition is used in pie/util-vdso.c to initialize the vdso symbol
+ * name string table 'vdso_symbols'
+ */
+
+/*
+ * This is a minimal amount of symbols
+ * we should support at the moment.
+ */
+#define VDSO_SYMBOL_MAX	 5
+#define VDSO_SYMBOL_GTOD 3
+
+#define ARCH_VDSO_SYMBOLS_LIST                                   \
+	const char *aarch_vdso_symbol1 = "__vdso_getcpu";        \
+	const char *aarch_vdso_symbol2 = "__vdso_clock_getres";  \
+	const char *aarch_vdso_symbol3 = "__vdso_clock_gettime"; \
+	const char *aarch_vdso_symbol4 = "__vdso_gettimeofday";  \
+	const char *aarch_vdso_symbol5 = "__vdso_rt_sigreturn";
+
+#define ARCH_VDSO_SYMBOLS \
+	aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3, aarch_vdso_symbol4, aarch_vdso_symbol5
+#endif
diff --git a/criu/arch/loongarch64/restorer.c b/criu/arch/loongarch64/restorer.c
new file mode 100644
index 000000000..730318ac1
--- /dev/null
+++ b/criu/arch/loongarch64/restorer.c
@@ -0,0 +1,14 @@
+#include <unistd.h>
+
+#include "restorer.h"
+#include "asm/restorer.h"
+#include <compel/asm/fpu.h>
+
+#include <compel/plugins/std/syscall.h>
+#include "log.h"
+#include "cpu.h"
+
+int restore_nonsigframe_gpregs(UserLoongarch64GpregsEntry *r)
+{
+	return 0;
+}
diff --git a/criu/arch/loongarch64/sigframe.c b/criu/arch/loongarch64/sigframe.c
new file mode 100644
index 000000000..18983ff13
--- /dev/null
+++ b/criu/arch/loongarch64/sigframe.c
@@ -0,0 +1,12 @@
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "asm/sigframe.h"
+#include "asm/types.h"
+
+#include "log.h"
+#include <stdio.h>
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
+{
+	return 0;
+}
diff --git a/criu/arch/loongarch64/vdso-pie.c b/criu/arch/loongarch64/vdso-pie.c
new file mode 100644
index 000000000..7a75d2741
--- /dev/null
+++ b/criu/arch/loongarch64/vdso-pie.c
@@ -0,0 +1,48 @@
+#include <unistd.h>
+#include "asm/types.h"
+
+#include <compel/plugins/std/string.h>
+#include <compel/plugins/std/syscall.h>
+#include "parasite-vdso.h"
+#include "log.h"
+#include "common/bug.h"
+
+#ifdef LOG_PREFIX
+#undef LOG_PREFIX
+#endif
+#define LOG_PREFIX "vdso: "
+static void insert_trampoline(uintptr_t from, uintptr_t to)
+{
+	struct {
+		uint32_t pcaddi;
+		uint32_t ldptr;
+		uint32_t jirl;
+		uint32_t guards;
+		uint64_t imm64;
+	} __packed jmp = {
+		.pcaddi = 0x18000095, /*  pcaddi  $x, 4        */
+		.ldptr = 0x260002b5,  /*  ldptr.d $x, $x, 0    */
+		.jirl = 0x4c0002a0,   /*  jirl    $zero, $x, 0 */
+		.guards = 0x002a0000, /*  break   0            */
+		.imm64 = to,
+	};
+	memcpy((void *)from, &jmp, sizeof(jmp));
+}
+
+int vdso_redirect_calls(unsigned long base_to, unsigned long base_from, struct vdso_symtable *sto,
+			struct vdso_symtable *sfrom, bool compat_vdso)
+{
+	unsigned int i;
+	unsigned long from, to;
+	for (i = 0; i < ARRAY_SIZE(sto->symbols); i++) {
+		if (vdso_symbol_empty(&sfrom->symbols[i]))
+			continue;
+		pr_debug("br: %lx/%lx -> %lx/%lx (index %d)\n", base_from, sfrom->symbols[i].offset, base_to,
+			 sto->symbols[i].offset, i);
+
+		from = base_from + sfrom->symbols[i].offset;
+		to = base_to + sto->symbols[i].offset;
+		insert_trampoline(from, to);
+	}
+	return 0;
+}

From 788e1e92ef092478f95d6c9f53c4417d8aa1da1e Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Mon, 12 Jun 2023 15:26:35 +0800
Subject: [PATCH 1351/1854] zdtm: add loongarch64 support

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 .../lib/arch/loongarch64/include/asm/atomic.h | 49 +++++++++++++++++++
 test/zdtm/lib/test.c                          |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 test/zdtm/lib/arch/loongarch64/include/asm/atomic.h

diff --git a/test/zdtm/lib/arch/loongarch64/include/asm/atomic.h b/test/zdtm/lib/arch/loongarch64/include/asm/atomic.h
new file mode 100644
index 000000000..1803aaeb4
--- /dev/null
+++ b/test/zdtm/lib/arch/loongarch64/include/asm/atomic.h
@@ -0,0 +1,49 @@
+#ifndef __CR_ATOMIC_H__
+#define __CR_ATOMIC_H__
+
+typedef uint32_t atomic_t;
+
+#define atomic_get(v)	 (*(volatile int *)v)
+#define atomic_set(v, i) (*(v) = (i))
+
+static inline int __atomic_add(int i, atomic_t *v)
+{
+	int result;
+	asm volatile("amadd_db.w %1, %2, %0" : "+ZB"(*v), "=&r"(result) : "r"(i) : "memory");
+	return result + i;
+}
+
+static inline void atomic_add(int i, atomic_t *v)
+{
+	__atomic_add(i, v);
+}
+
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+	return __atomic_add(i, v);
+}
+
+#define atomic_sub(i, v)	atomic_add(-(int)i, v)
+#define atomic_sub_return(i, v) atomic_add_return(-(int)i, v)
+#define atomic_inc(v)		atomic_add_return(1, v)
+#define atomic_dec(v)		atomic_sub_return(1, v)
+#define atomic_dec_return(v)	atomic_sub_return(1, v)
+
+static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+{
+	int ret;
+	asm volatile("1:                     \n"
+		     " ll.w  %0, %1          \n"
+		     " bne   %0, %2, 2f      \n"
+		     " or    $t0, %3, $zero  \n"
+		     " sc.w  $t0, %1         \n"
+		     " beqz  $t0, 1b         \n"
+		     "2:                     \n"
+		     " dbar  0               \n"
+		     : "=&r"(ret), "+ZB"(*ptr)
+		     : "r"(old), "r"(new)
+		     : "t0", "memory");
+	return ret;
+}
+
+#endif /* __CR_ATOMIC_H__ */
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index 6291ea4a7..a5ba38b2d 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -406,7 +406,7 @@ pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid
 {
 #ifdef __x86_64__
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, child_tid, newtls);
-#elif (__i386__ || __arm__ || __aarch64__ || __powerpc64__ || __mips__)
+#elif (__i386__ || __arm__ || __aarch64__ || __powerpc64__ || __mips__ || __loongarch64)
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, newtls, child_tid);
 #elif __s390x__
 	return (pid_t)syscall(__NR_clone, child_stack, flags, parent_tid, child_tid, newtls);

From e25a243b28d3a4a4ab3e1158a78214984ef476b7 Mon Sep 17 00:00:00 2001
From: znley <shanjiantao@loongson.cn>
Date: Tue, 11 Jul 2023 15:20:00 +0800
Subject: [PATCH 1352/1854] ci: add workflow for loongarch64

Signed-off-by: znley <shanjiantao@loongson.cn>
---
 .github/workflows/loongarch64-qemu-test.yml | 15 +++++
 scripts/ci/Makefile                         |  5 ++
 scripts/ci/loongarch64-qemu-test.sh         | 69 +++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 .github/workflows/loongarch64-qemu-test.yml
 create mode 100755 scripts/ci/loongarch64-qemu-test.sh

diff --git a/.github/workflows/loongarch64-qemu-test.yml b/.github/workflows/loongarch64-qemu-test.yml
new file mode 100644
index 000000000..ba22fa25f
--- /dev/null
+++ b/.github/workflows/loongarch64-qemu-test.yml
@@ -0,0 +1,15 @@
+name: LoongArch64 Qemu Test
+
+on: [push, pull_request]
+
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: loongarch64-qemu-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2 
+      - run: sudo make -C scripts/ci loongarch64-qemu-test
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 5c4579103..ce844a17c 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -110,5 +110,10 @@ check-commit:
 
 .PHONY: check-commit
 
+loongarch64-qemu-test:
+	./loongarch64-qemu-test.sh
+
+.PHONY: loongarch64-qemu-test
+
 %:
 	$(MAKE) -C ../build $@$(target-suffix)
diff --git a/scripts/ci/loongarch64-qemu-test.sh b/scripts/ci/loongarch64-qemu-test.sh
new file mode 100755
index 000000000..52e587619
--- /dev/null
+++ b/scripts/ci/loongarch64-qemu-test.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+set -x
+
+./apt-install \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    software-properties-common \
+    sshpass \
+    openssh-client
+
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+
+add-apt-repository \
+   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+   $(lsb_release -cs) \
+   stable test"
+
+./apt-install docker-ce
+
+# shellcheck source=/dev/null
+. /etc/lsb-release
+
+# docker checkpoint and restore is an experimental feature
+echo '{ "experimental": true }' > /etc/docker/daemon.json
+service docker restart
+
+docker info
+
+# run a loongarch64 vm
+
+PORT='2222'
+USER='root'
+PASSWORD='loongarch64'
+NAME='vm'
+
+docker run \
+    -d \
+    --net host \
+    --name $NAME \
+    merore/archlinux-loongarch64
+
+run() {
+    if [ -z "$1" ]; then
+        echo "Command cannot be empty."
+        exit 1
+    fi
+    sshpass -p $PASSWORD ssh -o StrictHostKeyChecking=no -p $PORT $USER@127.0.0.1 "$1"
+}
+
+# wait vm to start
+while (! run "uname -a")
+do
+    echo "Wait vm to start..."
+    sleep 1
+done
+echo "The loongarch64 vm is started!"
+
+# Tar criu and send to vm
+tar -cf criu.tar ../../../criu
+sshpass -p $PASSWORD scp -o StrictHostKeyChecking=no -P $PORT criu.tar $USER@127.0.0.1:/root
+
+# build and test
+run 'cd /root; tar -xf criu.tar'
+run 'cd /root/criu; make -j4'
+run "cd /root/criu; ./test/zdtm.py run -t zdtm/static/maps02 -t zdtm/static/maps05 -t zdtm/static/maps06 -t zdtm/static/maps10 -t zdtm/static/maps_file_prot -t zdtm/static/memfd00 -t zdtm/transition/fork -t zdtm/transition/fork2 -t zdtm/transition/shmem -f h"

From 21560270dd0a900d683bc01ce20e0c8f8050fba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 20:46:33 +0200
Subject: [PATCH 1353/1854] util: Implement fchown() and fchmod() wrappers.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add generic wrappers for fchown() and fchmod() that skip the calls if
no changes are needed. This will allow to unify places where we can
avoid errors when no-op requests are not permitted.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/include/util.h |  4 +++
 criu/util.c         | 83 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index 4b4dfda95..7e4a13a6a 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -263,6 +263,10 @@ bool is_path_prefix(const char *path, const char *prefix);
 FILE *fopenat(int dirfd, char *path, char *cflags);
 void split(char *str, char token, char ***out, int *n);
 
+int cr_fchown(int fd, uid_t new_uid, gid_t new_gid);
+int cr_fchperm(int fd, uid_t new_uid, gid_t new_gid, mode_t new_mode);
+int cr_fchpermat(int dirfd, const char *path, uid_t new_uid, gid_t new_gid, mode_t new_mode, int flags);
+
 int fd_has_data(int lfd);
 
 int make_yard(char *path);
diff --git a/criu/util.c b/criu/util.c
index aa73083bd..bca7ad88a 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -952,6 +952,89 @@ FILE *fopenat(int dirfd, char *path, char *cflags)
 	return fdopen(tmp, cflags);
 }
 
+int cr_fchown(int fd, uid_t new_uid, gid_t new_gid)
+{
+	struct stat st;
+
+	if (!fchown(fd, new_uid, new_gid))
+		return 0;
+	if (errno != EPERM)
+		return -1;
+
+	if (fstat(fd, &st) < 0) {
+		pr_perror("fstat() after fchown() for fd %d", fd);
+		goto out_eperm;
+	}
+	pr_debug("fstat(%d): uid %u gid %u\n", fd, st.st_uid, st.st_gid);
+
+	if (new_uid != st.st_uid || new_gid != st.st_gid)
+		goto out_eperm;
+
+	return 0;
+out_eperm:
+	errno = EPERM;
+	return -1;
+}
+
+int cr_fchpermat(int dirfd, const char *path, uid_t new_uid, gid_t new_gid, mode_t new_mode, int flags)
+{
+	struct stat st;
+	int ret;
+
+	if (fchownat(dirfd, path, new_uid, new_gid, flags) < 0 && errno != EPERM) {
+		int errno_cpy = errno;
+		pr_perror("Unable to change [%d]/%s ownership to (%d, %d)",
+			  dirfd, path, new_uid, new_gid);
+		errno = errno_cpy;
+		return -1;
+	}
+
+	if (fstatat(dirfd, path, &st, flags) < 0) {
+		int errno_cpy = errno;
+		pr_perror("Unable to stat [%d]/%s", dirfd, path);
+		errno = errno_cpy;
+		return -1;
+	}
+
+	if (new_uid != st.st_uid || new_gid != st.st_gid) {
+		errno = EPERM;
+		pr_perror("Unable to change [%d]/%s ownership (%d, %d) to (%d, %d)",
+			  dirfd, path, st.st_uid, st.st_gid, new_uid, new_gid);
+		errno = EPERM;
+		return -1;
+	}
+
+	if (new_mode == st.st_mode)
+		return 0;
+
+	if (S_ISLNK(st.st_mode)) {
+		/*
+		 * We have no lchmod() function, and fchmod() will fail on
+		 * O_PATH | O_NOFOLLOW fd. Yes, we have fchmodat()
+		 * function and flag AT_SYMLINK_NOFOLLOW described in
+		 * man 2 fchmodat, but it is not currently implemented. %)
+		 */
+		return 0;
+	}
+
+	if (!*path && flags & AT_EMPTY_PATH)
+		ret = fchmod(dirfd, new_mode);
+	else
+		ret = fchmodat(dirfd, path, new_mode, flags & ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH));
+	if (ret < 0) {
+		int errno_cpy = errno;
+		pr_perror("Unable to set perms %o on [%d]/%s", new_mode, dirfd, path);
+		errno = errno_cpy;
+	}
+
+	return ret;
+}
+
+int cr_fchperm(int fd, uid_t new_uid, gid_t new_gid, mode_t new_mode)
+{
+	return cr_fchpermat(fd, "", new_uid, new_gid, new_mode, AT_EMPTY_PATH);
+}
+
 void split(char *str, char token, char ***out, int *n)
 {
 	int i;

From f985d9f44b3029a384532c03a22839209550a185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 20:51:03 +0200
Subject: [PATCH 1354/1854] sk-unix: Avoid restore_file_perms() EPERM error for
 no-op changes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Note: This removes the difference in calling convention of
restore_file_perms() returning -errno that was the only call that did
this in the caller.

From: Radosław Burny <rburny@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/sk-unix.c | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index fd38ee7b1..70ca16be4 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -1431,32 +1431,22 @@ err_revert_and_exit:
 
 static int restore_file_perms(struct unix_sk_info *ui)
 {
-	if (ui->ue->file_perms) {
-		FilePermsEntry *perms = ui->ue->file_perms;
-		char fname[PATH_MAX];
+	FilePermsEntry *perms = ui->ue->file_perms;
+	char fname[PATH_MAX];
 
-		if (ui->ue->name.len >= sizeof(fname)) {
-			pr_err("The file name is too long\n");
-			return -E2BIG;
-		}
+	if (!perms)
+		return 0;
 
-		memcpy(fname, ui->name, ui->ue->name.len);
-		fname[ui->ue->name.len] = '\0';
-
-		if (fchownat(AT_FDCWD, fname, perms->uid, perms->gid, 0) < 0) {
-			int errno_cpy = errno;
-			pr_perror("Unable to change file owner and group");
-			return -errno_cpy;
-		}
-
-		if (fchmodat(AT_FDCWD, fname, perms->mode, 0) < 0) {
-			int errno_cpy = errno;
-			pr_perror("Unable to change file mode bits");
-			return -errno_cpy;
-		}
+	if (ui->ue->name.len >= sizeof(fname)) {
+		pr_err("The file name is too long\n");
+		errno = -E2BIG;
+		return -1;
 	}
 
-	return 0;
+	memcpy(fname, ui->name, ui->ue->name.len);
+	fname[ui->ue->name.len] = '\0';
+
+	return cr_fchpermat(AT_FDCWD, fname, perms->uid, perms->gid, perms->mode, 0);
 }
 
 static int keep_deleted(struct unix_sk_info *ui)

From b074f92f99271c9a45878f1ed4288759068a1564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 20:58:00 +0200
Subject: [PATCH 1355/1854] files-reg: Avoid EPERM in ghost_apply_metadata()
 for no-op changes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/files-reg.c | 48 +++++++++++++-----------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 512097716..50dcbc438 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -407,46 +407,24 @@ static int mklnk_ghost(char *path, GhostFileEntry *gfe)
 static int ghost_apply_metadata(const char *path, GhostFileEntry *gfe)
 {
 	struct timeval tv[2];
-	int ret = -1;
 
-	if (S_ISLNK(gfe->mode)) {
-		if (lchown(path, gfe->uid, gfe->gid) < 0) {
-			pr_perror("Can't reset user/group on ghost %s", path);
-			goto err;
-		}
+	if (cr_fchpermat(AT_FDCWD, path, gfe->uid, gfe->gid, gfe->mode, AT_SYMLINK_NOFOLLOW) < 0)
+		return -1;
 
-		/*
-		 * We have no lchmod() function, and fchmod() will fail on
-		 * O_PATH | O_NOFOLLOW fd. Yes, we have fchmodat()
-		 * function and flag AT_SYMLINK_NOFOLLOW described in
-		 * man 2 fchmodat, but it is not currently implemented. %)
-		 */
-	} else {
-		if (chown(path, gfe->uid, gfe->gid) < 0) {
-			pr_perror("Can't reset user/group on ghost %s", path);
-			goto err;
-		}
+	if (!gfe->atim)
+		return 0;
 
-		if (chmod(path, gfe->mode)) {
-			pr_perror("Can't set perms %o on ghost %s", gfe->mode, path);
-			goto err;
-		}
+	tv[0].tv_sec = gfe->atim->tv_sec;
+	tv[0].tv_usec = gfe->atim->tv_usec;
+	tv[1].tv_sec = gfe->mtim->tv_sec;
+	tv[1].tv_usec = gfe->mtim->tv_usec;
+
+	if (lutimes(path, tv)) {
+		pr_perror("Can't set access and modification times on ghost %s", path);
+		return -1;
 	}
 
-	if (gfe->atim) {
-		tv[0].tv_sec = gfe->atim->tv_sec;
-		tv[0].tv_usec = gfe->atim->tv_usec;
-		tv[1].tv_sec = gfe->mtim->tv_sec;
-		tv[1].tv_usec = gfe->mtim->tv_usec;
-		if (lutimes(path, tv)) {
-			pr_perror("Can't set access and modification times on ghost %s", path);
-			goto err;
-		}
-	}
-
-	ret = 0;
-err:
-	return ret;
+	return 0;
 }
 
 static int create_ghost_dentry(char *path, GhostFileEntry *gfe, struct cr_img *img)

From 96fa42b79dbbfa1b72a955c055121f15f053bc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 21:01:29 +0200
Subject: [PATCH 1356/1854] cgroup: Replace restore_perms() with cr_fchperm().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cgroup.c | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 267a5b6b4..67282f269 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1337,34 +1337,6 @@ void fini_cgroup(void)
 	cg_yard = NULL;
 }
 
-static int restore_perms(int fd, const char *path, CgroupPerms *perms)
-{
-	struct stat sb;
-
-	if (perms) {
-		if (fstat(fd, &sb) < 0) {
-			pr_perror("stat of property %s failed", path);
-			return -1;
-		}
-
-		/* only chmod/chown if the perms are actually different: we aren't
-		 * allowed to chmod some cgroup props (e.g. the read only ones), so we
-		 * don't want to try if the perms already match.
-		 */
-		if (sb.st_mode != (mode_t)perms->mode && fchmod(fd, perms->mode) < 0) {
-			pr_perror("chmod of %s failed", path);
-			return -1;
-		}
-
-		if ((sb.st_uid != perms->uid || sb.st_gid != perms->gid) && fchown(fd, perms->uid, perms->gid)) {
-			pr_perror("chown of %s failed", path);
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
 static int add_subtree_control_prop_prefix(char *input, char *output, char prefix)
 {
 	char *current, *next;
@@ -1462,7 +1434,7 @@ static int restore_cgroup_prop(const CgroupPropEntry *cg_prop_entry_p, char *pat
 		return -1;
 	}
 
-	if (restore_perms(fd, path, perms) < 0)
+	if (perms && cr_fchperm(fd, perms->uid, perms->gid, perms->mode) < 0)
 		goto out;
 
 	/* skip these two since restoring their values doesn't make sense */
@@ -1786,7 +1758,7 @@ static int restore_special_props(char *paux, size_t off, CgroupDirEntry *e)
 
 static int prepare_dir_perms(int cg, char *path, CgroupPerms *perms)
 {
-	int fd, ret;
+	int fd, ret = 0;
 
 	fd = openat(cg, path, O_DIRECTORY);
 	if (fd < 0) {
@@ -1794,7 +1766,8 @@ static int prepare_dir_perms(int cg, char *path, CgroupPerms *perms)
 		return -1;
 	}
 
-	ret = restore_perms(fd, path, perms);
+	if (perms)
+		ret = cr_fchperm(fd, perms->uid, perms->gid, perms->mode);
 	close(fd);
 	return ret;
 }

From 113957270bc1506435946e49023763019120c5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 21:02:43 +0200
Subject: [PATCH 1357/1854] memfd: Avoid EPERM for no-op chown().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/memfd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 6a43dece6..1b4278a7d 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -279,7 +279,7 @@ static int memfd_open_inode_nocache(struct memfd_restore_inode *inode)
 	if (restore_memfd_shmem_content(fd, mie->shmid, mie->size))
 		goto out;
 
-	if (fchown(fd, mie->uid, mie->gid)) {
+	if (cr_fchown(fd, mie->uid, mie->gid)) {
 		pr_perror("Can't change uid %d gid %d of memfd:%s", (int)mie->uid, (int)mie->gid, mie->name);
 		goto out;
 	}

From 99188cfbe33d091bccdc0160627bf35c2e126782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 21:03:02 +0200
Subject: [PATCH 1358/1854] tty: Avoid EPERM for no-op chown().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/tty.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/tty.c b/criu/tty.c
index 199984ec0..9faf602f2 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -22,6 +22,7 @@
 #include "rst-malloc.h"
 #include "log.h"
 #include "common/list.h"
+#include "util.h"
 #include "util-pie.h"
 #include "proc_parse.h"
 #include "file-ids.h"
@@ -867,7 +868,7 @@ static int restore_tty_params(int fd, struct tty_info *info)
 	}
 
 	if (info->tie->has_uid && info->tie->has_gid) {
-		if (fchown(fd, info->tie->uid, info->tie->gid)) {
+		if (cr_fchown(fd, info->tie->uid, info->tie->gid)) {
 			pr_perror("Can't setup uid %d gid %d on %#x", (int)info->tie->uid, (int)info->tie->gid,
 				  info->tfe->id);
 			return -1;

From 4998b724ef9df3771803c65ace4f8a071d625906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 22:42:09 +0200
Subject: [PATCH 1359/1854] restore: Avoid need for CAP_SETPCAP if not changing
 uids.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When CRIU is run with the task's credentials on restore, don't set uids
and gids. This avoids the need to modify the SECURE_NO_SETUID_FIXUP flag
which requires CAP_SETPCAP.

From: Andy Tucker <agtucker@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/pie/restorer.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 0d1360c52..9d1facf8a 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -191,10 +191,8 @@ static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_typ
 	int b, i, ret;
 	struct cap_header hdr;
 	struct cap_data data[_LINUX_CAPABILITY_U32S_3];
-
-	/*
-	 * We're still root here and thus can do it without failures.
-	 */
+	int ruid, euid, suid, fsuid;
+	int rgid, egid, sgid, fsgid;
 
 	/*
 	 * Setup supplementary group IDs early.
@@ -207,6 +205,18 @@ static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_typ
 		}
 	}
 
+	/*
+	 * Compare xids with current values. If all match then we can skip
+	 * setting them (which requires extra capabilities).
+	 */
+	fsuid = sys_setfsuid(-1);
+	fsgid = sys_setfsgid(-1);
+	if (sys_getresuid(&ruid, &euid, &suid) == 0 && sys_getresgid(&rgid, &egid, &sgid) == 0 && ruid == ce->uid &&
+	    euid == ce->euid && suid == ce->suid && rgid == ce->gid && egid == ce->egid && sgid == ce->sgid &&
+	    fsuid == ce->fsuid && fsgid == ce->fsgid) {
+		goto skip_xids;
+	}
+
 	/*
 	 * First -- set the SECURE_NO_SETUID_FIXUP bit not to
 	 * lose caps bits when changing xids.
@@ -250,12 +260,13 @@ static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_typ
 		return -1;
 	}
 
+skip_xids:
 	/*
 	 * Third -- restore securebits. We don't need them in any
 	 * special state any longer.
 	 */
 
-	if (!uid) {
+	if (sys_prctl(PR_GET_SECUREBITS, 0, 0, 0, 0) != ce->secbits) {
 		ret = sys_prctl(PR_SET_SECUREBITS, ce->secbits, 0, 0, 0);
 		if (ret) {
 			pr_err("Unable to set PR_SET_SECUREBITS: %d\n", ret);

From 7ab02639f6540920f086e9c45a99e68e391a8904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 22:42:44 +0200
Subject: [PATCH 1360/1854] restore: Skip setgroups() when already correct.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Skip calling setgroups() when the list of auxiliary groups already has
the values we want.  This allows restoring into an unprivileged user
namespace where setgroups() is disabled.

From: Ambrose Feinstein <ambrose@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/pie/restorer.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 9d1facf8a..a0f3eb90b 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -51,6 +51,11 @@
 #include "shmem.h"
 #include "restorer.h"
 
+/*
+ * sys_getgroups() buffer size. Not too much, to avoid stack overflow.
+ */
+#define MAX_GETGROUPS_CHECKED (512 / sizeof(unsigned int))
+
 #ifndef PR_SET_PDEATHSIG
 #define PR_SET_PDEATHSIG 1
 #endif
@@ -198,10 +203,19 @@ static int restore_creds(struct thread_creds_args *args, int procfd, int lsm_typ
 	 * Setup supplementary group IDs early.
 	 */
 	if (args->groups) {
-		ret = sys_setgroups(ce->n_groups, args->groups);
-		if (ret) {
-			pr_err("Can't setup supplementary group IDs: %d\n", ret);
-			return -1;
+		/*
+		 * We may be in an unprivileged user namespace where setgroups
+		 * is disabled.  If the current list of groups is already what
+		 * we want, skip the call to setgroups.
+		 */
+		unsigned int gids[MAX_GETGROUPS_CHECKED];
+		int n = sys_getgroups(MAX_GETGROUPS_CHECKED, gids);
+		if (n != ce->n_groups || memcmp(gids, args->groups, n * sizeof(*gids))) {
+			ret = sys_setgroups(ce->n_groups, args->groups);
+			if (ret) {
+				pr_err("Can't setgroups([%zu gids]): %d\n", ce->n_groups, ret);
+				return -1;
+			}
 		}
 	}
 

From 7df3f659572b428a5fac867c6abc64b08286de85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 21 Jun 2023 14:42:48 +0200
Subject: [PATCH 1361/1854] restore: Fix capability migration requirements
 between different kernels.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When restoring on a kernel that has different number of supported
capabilities than checkpoint one, check that the extra caps are unset.

There are two directions to consider:

1) dump.cap_last_cap > restore.cap_last_cap
	- restoring might reduce the processes' capabilities if restored
	  kernel doesn't support checkpointed caps. Warn.

2) dump.cap_last_cap < restore.cap_last_cap
	- restoring will fill the extra caps with zeroes. No changes.

Note: `last_cap` might change without affecting `n_words`.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/cr-restore.c | 40 ++++++++++++++++++++++++----------------
 criu/kerndat.c    |  9 ++++++++-
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index bff41dc56..9107a2322 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2940,12 +2940,6 @@ out:
 	return ret;
 }
 
-static inline int verify_cap_size(CredsEntry *ce)
-{
-	return ((ce->n_cap_inh == CR_CAP_SIZE) && (ce->n_cap_eff == CR_CAP_SIZE) && (ce->n_cap_prm == CR_CAP_SIZE) &&
-		(ce->n_cap_bnd == CR_CAP_SIZE));
-}
-
 static int prepare_mm(pid_t pid, struct task_restore_args *args)
 {
 	int exe_fd, i, ret = -1;
@@ -3360,17 +3354,31 @@ static bool groups_match(gid_t *groups, int n_groups)
 	return ret;
 }
 
+static void copy_caps(u32 *out_caps, u32 *in_caps, int n_words)
+{
+	int i, cap_end;
+
+	for (i = kdat.last_cap + 1; i < 32 * n_words; ++i) {
+		if (~in_caps[i / 32] & (1 << (i % 32)))
+			continue;
+
+		pr_warn("Dropping unsupported capability %d > %d)\n", i, kdat.last_cap);
+		/* extra caps will be cleared below */
+	}
+
+	n_words = min(n_words, (kdat.last_cap + 31) / 32);
+	cap_end = (kdat.last_cap & 31) + 1;
+	memcpy(out_caps, in_caps, sizeof(*out_caps) * n_words);
+	if ((cap_end & 31) && n_words)
+		out_caps[n_words - 1] &= (1 << cap_end) - 1;
+	memset(out_caps + n_words, 0, sizeof(*out_caps) * (CR_CAP_SIZE - n_words));
+}
+
 static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned long *prev_pos)
 {
 	unsigned long this_pos;
 	struct thread_creds_args *args;
 
-	if (!verify_cap_size(ce)) {
-		pr_err("Caps size mismatch %d %d %d %d\n", (int)ce->n_cap_inh, (int)ce->n_cap_eff, (int)ce->n_cap_prm,
-		       (int)ce->n_cap_bnd);
-		return ERR_PTR(-EINVAL);
-	}
-
 	this_pos = rst_mem_align_cpos(RM_PRIVATE);
 
 	args = rst_mem_alloc(sizeof(*args), RM_PRIVATE);
@@ -3458,10 +3466,10 @@ static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned lo
 	args->creds.groups = NULL;
 	args->creds.lsm_profile = NULL;
 
-	memcpy(args->cap_inh, ce->cap_inh, sizeof(args->cap_inh));
-	memcpy(args->cap_eff, ce->cap_eff, sizeof(args->cap_eff));
-	memcpy(args->cap_prm, ce->cap_prm, sizeof(args->cap_prm));
-	memcpy(args->cap_bnd, ce->cap_bnd, sizeof(args->cap_bnd));
+	copy_caps(args->cap_inh, ce->cap_inh, ce->n_cap_inh);
+	copy_caps(args->cap_eff, ce->cap_eff, ce->n_cap_eff);
+	copy_caps(args->cap_prm, ce->cap_prm, ce->n_cap_prm);
+	copy_caps(args->cap_bnd, ce->cap_bnd, ce->n_cap_bnd);
 
 	if (ce->n_groups && !groups_match(ce->groups, ce->n_groups)) {
 		unsigned int *groups;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 4b836b5f7..bd1ccdc7d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -465,8 +465,15 @@ static int get_last_cap(void)
 	struct sysctl_req req[] = {
 		{ "kernel/cap_last_cap", &kdat.last_cap, CTL_U32 },
 	};
+	int ret;
 
-	return sysctl_op(req, ARRAY_SIZE(req), CTL_READ, 0);
+	ret = sysctl_op(req, ARRAY_SIZE(req), CTL_READ, 0);
+	if (ret || kdat.last_cap < 32 * CR_CAP_SIZE)
+		return ret;
+
+	pr_err("Kernel reports more capabilities than this CRIU supports: %u > %u\n",
+	       kdat.last_cap, 32 * CR_CAP_SIZE - 1);
+	return -1;
 }
 
 static bool kerndat_has_memfd_create(void)

From a605cc9f36e0d3ac6fe3f7c9d5ce8090a466b067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 22 Jun 2023 18:20:24 +0200
Subject: [PATCH 1362/1854] prctl: Migrate prctl(NO_NEW_PRIVS) setting.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/include/parasite.h | 1 +
 criu/include/prctl.h    | 6 ++++++
 criu/parasite-syscall.c | 4 ++++
 criu/pie/parasite.c     | 1 +
 criu/pie/restorer.c     | 8 ++++++++
 images/creds.proto      | 1 +
 6 files changed, 21 insertions(+)

diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 787c927be..739fbf2c3 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -148,6 +148,7 @@ struct parasite_dump_creds {
 
 	int uids[4];
 	int gids[4];
+	int no_new_privs;
 	unsigned int secbits;
 	unsigned int ngroups;
 	/*
diff --git a/criu/include/prctl.h b/criu/include/prctl.h
index c843f40a7..4c2a548b1 100644
--- a/criu/include/prctl.h
+++ b/criu/include/prctl.h
@@ -30,6 +30,12 @@
 #ifndef PR_SET_DUMPABLE
 #define PR_SET_DUMPABLE 4
 #endif
+#ifndef PR_GET_NO_NEW_PRIVS
+#define PR_GET_NO_NEW_PRIVS 39
+#endif
+#ifndef PR_SET_NO_NEW_PRIVS
+#define PR_SET_NO_NEW_PRIVS 38
+#endif
 
 #ifndef PR_SET_MM
 #define PR_SET_MM	      35
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 35489634d..c08ed09b1 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -115,6 +115,10 @@ static int alloc_groups_copy_creds(CredsEntry *ce, struct parasite_dump_creds *c
 	memcpy(ce->cap_eff, c->cap_eff, sizeof(c->cap_eff[0]) * CR_CAP_SIZE);
 	memcpy(ce->cap_bnd, c->cap_bnd, sizeof(c->cap_bnd[0]) * CR_CAP_SIZE);
 
+	if (c->no_new_privs > 0) {
+		ce->no_new_privs = c->no_new_privs;
+		ce->has_no_new_privs = true;
+	}
 	ce->secbits = c->secbits;
 	ce->n_groups = c->ngroups;
 
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 2303f41c3..58ea35892 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -268,6 +268,7 @@ static int dump_creds(struct parasite_dump_creds *args)
 		}
 	}
 
+	args->no_new_privs = sys_prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);
 	args->secbits = sys_prctl(PR_GET_SECUREBITS, 0, 0, 0, 0);
 
 	ret = sys_getgroups(0, NULL);
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index a0f3eb90b..c3662b30b 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -345,6 +345,14 @@ skip_xids:
 	if (lsm_set_label(args->lsm_sockcreate, "sockcreate", procfd) < 0)
 		return -1;
 
+	if (ce->has_no_new_privs && ce->no_new_privs) {
+		ret = sys_prctl(PR_SET_NO_NEW_PRIVS, ce->no_new_privs, 0, 0, 0);
+		if (ret) {
+			pr_err("Unable to set no_new_privs=%d: %d\n", ce->no_new_privs, ret);
+			return -1;
+		}
+	}
+
 	return 0;
 }
 
diff --git a/images/creds.proto b/images/creds.proto
index 6228f7fcb..220ed3858 100644
--- a/images/creds.proto
+++ b/images/creds.proto
@@ -24,4 +24,5 @@ message creds_entry {
 	optional string lsm_profile = 15;
 	optional string lsm_sockcreate = 16;
 	optional bytes	apparmor_data	= 17;
+	optional uint32	no_new_privs	= 18;
 }

From fe4be19de432fb3ff8cd2a41f4ba788c3c4e6ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 19 Jul 2023 18:57:09 +0200
Subject: [PATCH 1363/1854] prctl: test prctl(NO_NEW_PRIVS) setting
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/Makefile               |  1 +
 test/zdtm/static/seccomp_no_new_privs.c | 42 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 test/zdtm/static/seccomp_no_new_privs.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 4b3d2e341..30429e425 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -215,6 +215,7 @@ TST_NOFILE	:=				\
 		seccomp_filter_tsync			\
 		seccomp_filter_threads			\
 		seccomp_filter_inheritance		\
+		seccomp_no_new_privs		\
 		different_creds			\
 		vsx				\
 		bridge				\
diff --git a/test/zdtm/static/seccomp_no_new_privs.c b/test/zdtm/static/seccomp_no_new_privs.c
new file mode 100644
index 000000000..95f9501ed
--- /dev/null
+++ b/test/zdtm/static/seccomp_no_new_privs.c
@@ -0,0 +1,42 @@
+#include <stdlib.h>
+#include <sys/prctl.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that NO_NEW_PRIVS attribute is restored";
+const char *test_author = "Michał Mirosław <emmir@google.com>";
+
+int main(int argc, char **argv)
+{
+	int ret;
+
+	test_init(argc, argv);
+
+	ret = prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);
+	if (ret < 0) {
+		pr_perror("Can't read NO_NEW_PRIVS attribute");
+		return 1;
+	}
+	if (ret != 0)
+		fail("initial NO_NEW_PRIVS = %d != 0", ret);
+
+	ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);
+	if (ret) {
+		pr_perror("Can't set NO_NEW_PRIVS attribute");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);
+	if (ret < 0) {
+		pr_perror("Can't read NO_NEW_PRIVS attribute");
+		return 1;
+	}
+	if (ret != 1)
+		fail("restored NO_NEW_PRIVS = %d != 1", ret);
+
+	pass();
+	return 0;
+}

From 25d0330809129222044147463172d6da0bec69fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Tue, 25 Jul 2023 17:54:26 +0200
Subject: [PATCH 1364/1854] restore: Skip dropping BSET capability if
 irrelevant.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

prctl(NO_NEW_PRIVS) when set prevents child processes gaining
capabilities not in permitted set. In this case, inability to
clear capability from BSET that is not in the permitted set is
harmless.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/pie/restorer.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index c3662b30b..d4f77bfde 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -301,10 +301,18 @@ skip_xids:
 				/* already set */
 				continue;
 			ret = sys_prctl(PR_CAPBSET_DROP, i + b * 32, 0, 0, 0);
-			if (ret) {
+			if (!ret)
+				continue;
+			if (!ce->has_no_new_privs || !ce->no_new_privs || args->cap_prm[b] & (1 << i)) {
 				pr_err("Unable to drop capability %d: %d\n", i + b * 32, ret);
 				return -1;
 			}
+			/*
+			 * If prctl(NO_NEW_PRIVS) is going to be set then it
+			 * will prevent inheriting the capabilities not in
+			 * the permitted set.
+			 */
+			pr_warn("Unable to drop capability %d from bset: %d (but NO_NEW_PRIVS will drop it)\n", i + b * 32, ret);
 		}
 	}
 

From ac1219f4eef81ed89560344f50f56ab61240519b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 22 May 2023 17:41:56 +0200
Subject: [PATCH 1365/1854] sk-inet: Extend 'TCP repair off' failure log.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Include the file descriptor and error code in the debug message to make
it more useful.

Fixes: e7ba90955ce7 (2016-03-14 "cr-check: Inspect errno on syscall failures")
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/include/sk-inet.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index 961d711ee..b3a70fb27 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -69,6 +69,7 @@ extern int inet_connect(int sk, struct inet_sk_info *);
 
 #ifdef CR_NOGLIBC
 #define setsockopt sys_setsockopt
+#define pr_perror(fmt, ...) pr_err(fmt ": errno %d\n", ##__VA_ARGS__, -ret)
 #endif
 static inline void tcp_repair_off(int fd)
 {
@@ -76,7 +77,7 @@ static inline void tcp_repair_off(int fd)
 
 	ret = setsockopt(fd, SOL_TCP, TCP_REPAIR, &aux, sizeof(aux));
 	if (ret < 0)
-		pr_err("Failed to turn off repair mode on socket\n");
+		pr_perror("Failed to turn off repair mode on socket %d", fd);
 }
 
 extern void tcp_locked_conn_add(struct inet_sk_info *);

From dfa54109512ac36ea96f61c114a952e5668665a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 27 Jul 2023 21:21:41 +0200
Subject: [PATCH 1366/1854] memfd: dump and restore permissions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

memfd is created by default with +x permissions set. This can be changed
by a process using fchmod() and expected to prevent using this fd for
exec(). Migrate the permissions.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/memfd.c       | 11 +++++++++--
 images/memfd.proto |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/criu/memfd.c b/criu/memfd.c
index 1b4278a7d..2158b6720 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -91,6 +91,8 @@ static int dump_memfd_inode(int fd, struct memfd_dump_inode *inode, const char *
 		mie.has_hugetlb_flag = true;
 		mie.hugetlb_flag = flag | MFD_HUGETLB;
 	}
+	mie.mode = st->st_mode;
+	mie.has_mode = true;
 
 	mie.seals = fcntl(fd, F_GET_SEALS);
 	if (mie.seals == -1) {
@@ -279,8 +281,13 @@ static int memfd_open_inode_nocache(struct memfd_restore_inode *inode)
 	if (restore_memfd_shmem_content(fd, mie->shmid, mie->size))
 		goto out;
 
-	if (cr_fchown(fd, mie->uid, mie->gid)) {
-		pr_perror("Can't change uid %d gid %d of memfd:%s", (int)mie->uid, (int)mie->gid, mie->name);
+	if (mie->has_mode)
+		ret = cr_fchperm(fd, mie->uid, mie->gid, mie->mode);
+	else
+		ret = cr_fchown(fd, mie->uid, mie->gid);
+	if (ret) {
+		pr_perror("Can't set permissions { uid %d gid %d mode %#o } of memfd:%s", (int)mie->uid,
+			  (int)mie->gid, mie->has_mode ? (int)mie->mode : -1, mie->name);
 		goto out;
 	}
 
diff --git a/images/memfd.proto b/images/memfd.proto
index 0e625416a..bb0be4a6f 100644
--- a/images/memfd.proto
+++ b/images/memfd.proto
@@ -22,4 +22,5 @@ message memfd_inode_entry {
 	required uint32		seals		= 6 [(criu).flags = "seals.flags"];
 	required uint64		inode_id	= 7;
 	optional uint32		hugetlb_flag	= 8;
+	optional uint32		mode		= 9;
 };

From 3628589b51c05d783fb37c05fae6d62e17347caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 27 Jul 2023 21:30:26 +0200
Subject: [PATCH 1367/1854] zdtm/memfd00: test memfd file mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/memfd00.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/zdtm/static/memfd00.c b/test/zdtm/static/memfd00.c
index d037f6969..8d77ed06e 100644
--- a/test/zdtm/static/memfd00.c
+++ b/test/zdtm/static/memfd00.c
@@ -30,8 +30,10 @@ int main(int argc, char *argv[])
 {
 	int fd, fl_flags1, fl_flags2, fd_flags1, fd_flags2;
 	struct statfs statfs1, statfs2;
+	struct stat stat;
 	off_t pos1, pos2;
 	char buf[5];
+	int fmode1, fmode2;
 
 	test_init(argc, argv);
 
@@ -58,6 +60,13 @@ int main(int argc, char *argv[])
 	if (lseek(fd, pos1, SEEK_SET) < 0)
 		err(1, "seek error");
 
+	if (fchmod(fd, 0642))
+		err(1, "Can't set permission bits");
+
+	if (fstat(fd, &stat) < 0)
+		err(1, "fstat() issue");
+	fmode1 = stat.st_mode;
+
 	test_daemon();
 	test_waitsig();
 
@@ -85,6 +94,15 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	if (fstat(fd, &stat) < 0)
+		err(1, "fstat() issue");
+	fmode2 = stat.st_mode;
+
+	if (fmode1 != fmode2) {
+		fail("stat.st_mode = %#o != %#o", fmode2, fmode1);
+		return 1;
+	}
+
 	pos2 = lseek(fd, 0, SEEK_CUR);
 	if (pos1 != pos2) {
 		fail("position differs");

From 6ed50ea49d1ed234178f4df86ca6227252350e6b Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 23:00:07 -0700
Subject: [PATCH 1368/1854] apparmor: fix incorrect usage of sizeof on char ptr

In criu/apparmor.c: write_aa_policy(), the arg path is passed as a char
pointer. The original code used sizeof(path) to get the size of it,
which is incorrect as it always return the size of the char pointer
(typically 8 or 4), not the actual capacity of the char array.

Given that this function is only invoked with path declared as `char
path[PATH_MAX]`, replacing sizeof(path) with PATH_MAX should correctly
represent the maximum size of it.

Fixes: 8723e3f ("check: add a feature test for apparmor_stacking")

Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
 criu/apparmor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index 9de54ce40..5b62759e2 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -551,8 +551,8 @@ static int write_aa_policy(AaNamespace *ns, char *path, int offset, char *rewrit
 			goto fail;
 	}
 
-	ret = snprintf(path + offset + my_offset, sizeof(path) - offset - my_offset, "/.replace");
-	if (ret < 0 || ret >= sizeof(path) - offset - my_offset) {
+	ret = snprintf(path + offset + my_offset, PATH_MAX - offset - my_offset, "/.replace");
+	if (ret < 0 || ret >= PATH_MAX - offset - my_offset) {
 		pr_err("snprintf failed\n");
 		goto fail;
 	}

From 2a131167bbc671a274f3ddeaf3b153fba6400e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 31 Jul 2023 20:49:05 +0200
Subject: [PATCH 1369/1854] page-xfer: Pull tcp_cork,nodelay().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move tcp_cork() and tcp_nodelay() to the only user: page-xfer.c. While
at it, fix error messages (as they do not refer to restoring the sockopt
values) and demote them as they are not fatal to the page transfer.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/include/util.h |  2 --
 criu/page-xfer.c    | 15 +++++++++++++++
 criu/util.c         | 15 ---------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/criu/include/util.h b/criu/include/util.h
index 7e4a13a6a..4334e69c2 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -278,8 +278,6 @@ static inline int sk_wait_data(int sk)
 }
 
 void fd_set_nonblocking(int fd, bool on);
-void tcp_nodelay(int sk, bool on);
-void tcp_cork(int sk, bool on);
 
 const char *ns_to_string(unsigned int ns);
 
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 782d4cafc..94f477414 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -2,6 +2,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <linux/falloc.h>
+#include <netinet/tcp.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -157,6 +158,20 @@ static inline int send_psi(int sk, struct page_server_iov *pi)
 	return send_psi_flags(sk, pi, 0);
 }
 
+static void tcp_cork(int sk, bool on)
+{
+	int val = on ? 1 : 0;
+	if (setsockopt(sk, SOL_TCP, TCP_CORK, &val, sizeof(val)))
+		pr_pwarn("Unable to set TCP_CORK=%d", val);
+}
+
+static void tcp_nodelay(int sk, bool on)
+{
+	int val = on ? 1 : 0;
+	if (setsockopt(sk, SOL_TCP, TCP_NODELAY, &val, sizeof(val)))
+		pr_pwarn("Unable to set TCP_NODELAY=%d", val);
+}
+
 /* page-server xfer */
 static int write_pages_to_server(struct page_xfer *xfer, int p, unsigned long len)
 {
diff --git a/criu/util.c b/criu/util.c
index bca7ad88a..993ab97bb 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -24,7 +24,6 @@
 #include <sys/resource.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <netinet/tcp.h>
 #include <sched.h>
 #include <ftw.h>
 #include <time.h>
@@ -1155,20 +1154,6 @@ const char *ns_to_string(unsigned int ns)
 	}
 }
 
-void tcp_cork(int sk, bool on)
-{
-	int val = on ? 1 : 0;
-	if (setsockopt(sk, SOL_TCP, TCP_CORK, &val, sizeof(val)))
-		pr_pwarn("Unable to restore TCP_CORK (%d)", val);
-}
-
-void tcp_nodelay(int sk, bool on)
-{
-	int val = on ? 1 : 0;
-	if (setsockopt(sk, SOL_TCP, TCP_NODELAY, &val, sizeof(val)))
-		pr_pwarn("Unable to restore TCP_NODELAY (%d)", val);
-}
-
 static int get_sockaddr_in(struct sockaddr_storage *addr, char *host, unsigned short port)
 {
 	memset(addr, 0, sizeof(*addr));

From 69200bec7608d40de127fdc3cb0977ce552f83a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Tue, 1 Aug 2023 22:39:59 +0200
Subject: [PATCH 1370/1854] irmap: scan user-provided paths in order
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make the scan use the order of paths that came from the user.

Fixes: 4f2e4ab3be01 ("irmap: add --irmap-scan-path option"; 2015-09-16)
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/irmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/irmap.c b/criu/irmap.c
index 2cdc66071..e12df5cb5 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -501,6 +501,6 @@ int irmap_scan_path_add(char *path)
 
 	o->ir->path = path;
 	o->ir->nr_kids = -1;
-	list_add(&o->node, &opts.irmap_scan_paths);
+	list_add_tail(&o->node, &opts.irmap_scan_paths);
 	return 0;
 }

From a4b49c46fe0f9d097840718e20efb54178162556 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 7 Aug 2023 19:28:07 +0100
Subject: [PATCH 1371/1854] amdgpu_plugin: remove duplicated log prefix

The log prefix "amdgpu_plugin:" is defined with `LOG_PREFIX` in
`amdgpu_plugin.c`.  However, the prefix is also included in each
log message. As a result it appears duplicated in the log messages:

(00.044324) amdgpu_plugin: amdgpu_plugin: devices:1 bos:58 objects:148 priv_data:45696
(00.045376) amdgpu_plugin: amdgpu_plugin: Thread[0x5589] started
(00.167172) amdgpu_plugin: amdgpu_plugin: img_path = amdgpu-kfd-62.img
(00.083739) amdgpu_plugin: amdgpu_plugin : amdgpu_plugin_dump_file() called for fd = 235

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c | 96 +++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 49 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 0a55e34a2..6397ecdb7 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -451,7 +451,7 @@ void getenv_bool(const char *var, bool *value)
 
 int amdgpu_plugin_init(int stage)
 {
-	pr_info("amdgpu_plugin: initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
+	pr_info("initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
 	topology_init(&src_topology);
 	topology_init(&dest_topology);
@@ -481,7 +481,7 @@ int amdgpu_plugin_init(int stage)
 
 void amdgpu_plugin_fini(int stage, int ret)
 {
-	pr_info("amdgpu_plugin: finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
+	pr_info("finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
 	if (stage == CR_PLUGIN_STAGE__RESTORE)
 		sys_close_drm_render_devices(&dest_topology);
@@ -513,7 +513,7 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 	char img_path[128];
 	int ret = 0;
 
-	pr_debug("amdgpu_plugin: Enter %s\n", __func__);
+	pr_debug("Enter %s\n", __func__);
 	ret = stat(AMDGPU_KFD_DEVICE, &st_kfd);
 	if (ret == -1) {
 		pr_perror("stat error for /dev/kfd");
@@ -539,7 +539,7 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 		return 0;
 	}
 
-	pr_perror("amdgpu_plugin: Can't handle the VMA mapping");
+	pr_perror("Can't handle the VMA mapping");
 	return -ENOTSUP;
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, amdgpu_plugin_handle_device_vma)
@@ -857,7 +857,7 @@ void *dump_bo_contents(void *_thread_data)
 	void *buffer;
 	char img_path[40];
 
-	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
+	pr_info("Thread[0x%x] started\n", thread_data->gpu_id);
 
 	ret = amdgpu_device_initialize(thread_data->drm_fd, &major, &minor, &h_dev);
 	if (ret) {
@@ -922,7 +922,7 @@ void *dump_bo_contents(void *_thread_data)
 	}
 
 exit:
-	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
+	pr_info("Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
 
 	if (bo_contents_fp)
 		fclose(bo_contents_fp);
@@ -951,7 +951,7 @@ void *restore_bo_contents(void *_thread_data)
 	int num_bos = 0;
 	int i, ret = 0;
 
-	pr_info("amdgpu_plugin: Thread[0x%x] started\n", thread_data->gpu_id);
+	pr_info("Thread[0x%x] started\n", thread_data->gpu_id);
 
 	ret = amdgpu_device_initialize(thread_data->drm_fd, &major, &minor, &h_dev);
 	if (ret) {
@@ -989,8 +989,7 @@ void *restore_bo_contents(void *_thread_data)
 	}
 
 	if (total_bo_size != image_size) {
-		pr_err("amdgpu_plugin: %s size mismatch (current:%ld:expected:%ld)\n", img_path, image_size,
-		       total_bo_size);
+		pr_err("%s size mismatch (current:%ld:expected:%ld)\n", img_path, image_size, total_bo_size);
 
 		ret = -EINVAL;
 		goto exit;
@@ -1026,7 +1025,7 @@ void *restore_bo_contents(void *_thread_data)
 	}
 
 exit:
-	pr_info("amdgpu_plugin: Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
+	pr_info("Thread[0x%x] done num_bos:%d ret:%d\n", thread_data->gpu_id, num_bos, ret);
 
 	if (bo_contents_fp)
 		fclose(bo_contents_fp);
@@ -1054,9 +1053,9 @@ int check_hsakmt_shared_mem(uint64_t *shared_mem_size, uint32_t *shared_mem_magi
 	/* First 4 bytes of shared file is the magic */
 	ret = read_file(HSAKMT_SHM_PATH, shared_mem_magic, sizeof(*shared_mem_magic));
 	if (ret)
-		pr_perror("amdgpu_plugin: Failed to read shared mem magic");
+		pr_perror("Failed to read shared mem magic");
 	else
-		plugin_log_msg("amdgpu_plugin: Shared mem magic:0x%x\n", *shared_mem_magic);
+		plugin_log_msg("Shared mem magic:0x%x\n", *shared_mem_magic);
 
 	return 0;
 }
@@ -1071,7 +1070,7 @@ int restore_hsakmt_shared_mem(const uint64_t shared_mem_size, const uint32_t sha
 		return 0;
 
 	if (!stat(HSAKMT_SHM_PATH, &st)) {
-		pr_debug("amdgpu_plugin: %s already exists\n", HSAKMT_SHM_PATH);
+		pr_debug("%s already exists\n", HSAKMT_SHM_PATH);
 	} else {
 		pr_info("Warning:%s was missing. Re-creating new file but we may lose perf counters\n",
 			HSAKMT_SHM_PATH);
@@ -1079,14 +1078,14 @@ int restore_hsakmt_shared_mem(const uint64_t shared_mem_size, const uint32_t sha
 
 		ret = ftruncate(fd, shared_mem_size);
 		if (ret < 0) {
-			pr_err("amdgpu_plugin: Failed to truncate shared mem %s\n", HSAKMT_SHM);
+			pr_err("Failed to truncate shared mem %s\n", HSAKMT_SHM);
 			close(fd);
 			return -errno;
 		}
 
 		ret = write(fd, &shared_mem_magic, sizeof(shared_mem_magic));
 		if (ret != sizeof(shared_mem_magic)) {
-			pr_perror("amdgpu_plugin: Failed to restore shared mem magic");
+			pr_perror("Failed to restore shared mem magic");
 			close(fd);
 			return -errno;
 		}
@@ -1112,7 +1111,7 @@ static int unpause_process(int fd)
 
 	ret = kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args);
 	if (ret) {
-		pr_perror("amdgpu_plugin: Failed to unpause process");
+		pr_perror("Failed to unpause process");
 		goto exit;
 	}
 
@@ -1254,7 +1253,7 @@ bool kernel_supports_criu(int fd)
 	}
 
 	if (kmtIoctl(fd, AMDKFD_IOC_GET_VERSION, &args) == -1) {
-		pr_perror("amdgpu_plugin: Failed to call get version ioctl");
+		pr_perror("Failed to call get version ioctl");
 		ret = false;
 		goto exit;
 	}
@@ -1262,8 +1261,8 @@ bool kernel_supports_criu(int fd)
 	pr_debug("Kernel IOCTL version:%d.%02d\n", args.major_version, args.minor_version);
 
 	if (args.major_version != KFD_IOCTL_MAJOR_VERSION || args.minor_version < MIN_KFD_IOCTL_MINOR_VERSION) {
-		pr_err("amdgpu_plugin: CR not supported on current kernel (current:%02d.%02d min:%02d.%02d)\n",
-		       args.major_version, args.minor_version, KFD_IOCTL_MAJOR_VERSION, MIN_KFD_IOCTL_MINOR_VERSION);
+		pr_err("CR not supported on current kernel (current:%02d.%02d min:%02d.%02d)\n", args.major_version,
+		       args.minor_version, KFD_IOCTL_MAJOR_VERSION, MIN_KFD_IOCTL_MINOR_VERSION);
 		ret = false;
 		goto exit;
 	}
@@ -1286,13 +1285,13 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	size_t len;
 
 	if (fstat(fd, &st) == -1) {
-		pr_perror("amdgpu_plugin: fstat error");
+		pr_perror("fstat error");
 		return -1;
 	}
 
 	ret = stat(AMDGPU_KFD_DEVICE, &st_kfd);
 	if (ret == -1) {
-		pr_perror("amdgpu_plugin: fstat error for /dev/kfd");
+		pr_perror("fstat error for /dev/kfd");
 		return -1;
 	}
 
@@ -1317,12 +1316,11 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		CriuRenderNode rd = CRIU_RENDER_NODE__INIT;
 		struct tp_node *tp_node;
 
-		pr_info("amdgpu_plugin: Dumper called for /dev/dri/renderD%d, FD = %d, ID = %d\n", minor(st.st_rdev),
-			fd, id);
+		pr_info("Dumper called for /dev/dri/renderD%d, FD = %d, ID = %d\n", minor(st.st_rdev), fd, id);
 
 		tp_node = sys_get_node_by_render_minor(&src_topology, minor(st.st_rdev));
 		if (!tp_node) {
-			pr_err("amdgpu_plugin: Failed to find a device with minor number = %d\n", minor(st.st_rdev));
+			pr_err("Failed to find a device with minor number = %d\n", minor(st.st_rdev));
 
 			return -ENODEV;
 		}
@@ -1350,7 +1348,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		return ret;
 	}
 
-	pr_info("amdgpu_plugin: %s : %s() called for fd = %d\n", CR_PLUGIN_DESC.name, __func__, major(st.st_rdev));
+	pr_info("%s() called for fd = %d\n", __func__, major(st.st_rdev));
 
 	/* KFD only allows ioctl calls from the same process that opened the KFD file descriptor.
 	 * The existing /dev/kfd file descriptor that is passed in is only allowed to do IOCTL calls with
@@ -1362,13 +1360,13 @@ int amdgpu_plugin_dump_file(int fd, int id)
 
 	args.op = KFD_CRIU_OP_PROCESS_INFO;
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
-		pr_perror("amdgpu_plugin: Failed to call process info ioctl");
+		pr_perror("Failed to call process info ioctl");
 		ret = -1;
 		goto exit;
 	}
 
-	pr_info("amdgpu_plugin: devices:%d bos:%d objects:%d priv_data:%lld\n", args.num_devices, args.num_bos,
-		args.num_objects, args.priv_data_size);
+	pr_info("devices:%d bos:%d objects:%d priv_data:%lld\n", args.num_devices, args.num_bos, args.num_objects,
+		args.priv_data_size);
 
 	e = xmalloc(sizeof(*e));
 	if (!e) {
@@ -1401,7 +1399,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	args.op = KFD_CRIU_OP_CHECKPOINT;
 	ret = kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args);
 	if (ret) {
-		pr_perror("amdgpu_plugin: Failed to call dumper (process) ioctl");
+		pr_perror("Failed to call dumper (process) ioctl");
 		goto exit;
 	}
 
@@ -1423,11 +1421,11 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		goto exit;
 
 	snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
-	pr_info("amdgpu_plugin: img_path = %s\n", img_path);
+	pr_info("img_path = %s\n", img_path);
 
 	len = criu_kfd__get_packed_size(e);
 
-	pr_info("amdgpu_plugin: Len = %ld\n", len);
+	pr_info("Len = %ld\n", len);
 
 	buf = xmalloc(len);
 	if (!buf) {
@@ -1453,9 +1451,9 @@ exit:
 	free_e(e);
 
 	if (ret)
-		pr_err("amdgpu_plugin: Failed to dump (ret:%d)\n", ret);
+		pr_err("Failed to dump (ret:%d)\n", ret);
 	else
-		pr_info("amdgpu_plugin: Dump successful\n");
+		pr_info("Dump successful\n");
 
 	return ret;
 }
@@ -1501,10 +1499,10 @@ static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 		device_bucket->drm_fd = node_get_drm_render_device(tp_node);
 		if (device_bucket->drm_fd < 0) {
-			pr_perror("amdgpu_plugin: Can't pass NULL drm render fd to driver");
+			pr_perror("Can't pass NULL drm render fd to driver");
 			goto exit;
 		} else {
-			pr_info("amdgpu_plugin: passing drm render fd = %d to driver\n", device_bucket->drm_fd);
+			pr_info("passing drm render fd = %d to driver\n", device_bucket->drm_fd);
 		}
 	}
 
@@ -1588,7 +1586,7 @@ static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKf
 			vma_md->new_pgoff = bo_bucket->restored_offset;
 			vma_md->fd = node_get_drm_render_device(tp_node);
 
-			plugin_log_msg("amdgpu_plugin: adding vma_entry:addr:0x%lx old-off:0x%lx "
+			plugin_log_msg("adding vma_entry:addr:0x%lx old-off:0x%lx "
 				       "new_off:0x%lx new_minor:%d\n",
 				       vma_md->vma_entry, vma_md->old_pgoff, vma_md->new_pgoff, vma_md->new_minor);
 
@@ -1669,7 +1667,7 @@ int amdgpu_plugin_restore_file(int id)
 	size_t img_size;
 	FILE *img_fp = NULL;
 
-	pr_info("amdgpu_plugin: Initialized kfd plugin restorer with ID = %d\n", id);
+	pr_info("Initialized kfd plugin restorer with ID = %d\n", id);
 
 	snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
 
@@ -1713,7 +1711,7 @@ int amdgpu_plugin_restore_file(int id)
 		}
 		fclose(img_fp);
 
-		pr_info("amdgpu_plugin: render node gpu_id = 0x%04x\n", rd->gpu_id);
+		pr_info("render node gpu_id = 0x%04x\n", rd->gpu_id);
 
 		target_gpu_id = maps_get_dest_gpu(&restore_maps, rd->gpu_id);
 		if (!target_gpu_id) {
@@ -1727,11 +1725,11 @@ int amdgpu_plugin_restore_file(int id)
 			goto fail;
 		}
 
-		pr_info("amdgpu_plugin: render node destination gpu_id = 0x%04x\n", tp_node->gpu_id);
+		pr_info("render node destination gpu_id = 0x%04x\n", tp_node->gpu_id);
 
 		fd = node_get_drm_render_device(tp_node);
 		if (fd < 0)
-			pr_err("amdgpu_plugin: Failed to open render device (minor:%d)\n", tp_node->drm_render_minor);
+			pr_err("Failed to open render device (minor:%d)\n", tp_node->drm_render_minor);
 	fail:
 		criu_render_node__free_unpacked(rd, NULL);
 		xfree(buf);
@@ -1752,7 +1750,7 @@ int amdgpu_plugin_restore_file(int id)
 		return -1;
 	}
 
-	pr_info("amdgpu_plugin: Opened kfd, fd = %d\n", fd);
+	pr_info("Opened kfd, fd = %d\n", fd);
 
 	if (!kernel_supports_criu(fd))
 		return -ENOTSUP;
@@ -1780,7 +1778,7 @@ int amdgpu_plugin_restore_file(int id)
 		return -1;
 	}
 
-	plugin_log_msg("amdgpu_plugin: read image file data\n");
+	plugin_log_msg("read image file data\n");
 
 	/*
 	 * Initialize fd_next to be 1 greater than the biggest file descriptor in use by the target restore process.
@@ -1847,10 +1845,10 @@ exit:
 	xfree(buf);
 
 	if (ret) {
-		pr_err("amdgpu_plugin: Failed to restore (ret:%d)\n", ret);
+		pr_err("Failed to restore (ret:%d)\n", ret);
 		fd = ret;
 	} else {
-		pr_info("amdgpu_plugin: Restore successful (fd:%d)\n", fd);
+		pr_info("Restore successful (fd:%d)\n", fd);
 	}
 
 	return fd;
@@ -1870,7 +1868,7 @@ int amdgpu_plugin_update_vmamap(const char *in_path, const uint64_t addr, const
 	char *p_end;
 	bool is_kfd = false, is_renderD = false;
 
-	plugin_log_msg("amdgpu_plugin: Enter %s\n", __func__);
+	plugin_log_msg("Enter %s\n", __func__);
 
 	strncpy(path, in_path, sizeof(path));
 
@@ -1908,8 +1906,8 @@ int amdgpu_plugin_update_vmamap(const char *in_path, const uint64_t addr, const
 			else
 				*updated_fd = -1;
 
-			plugin_log_msg("amdgpu_plugin: old_pgoff=0x%lx new_pgoff=0x%lx fd=%d\n", vma_md->old_pgoff,
-				       vma_md->new_pgoff, *updated_fd);
+			plugin_log_msg("old_pgoff=0x%lx new_pgoff=0x%lx fd=%d\n", vma_md->old_pgoff, vma_md->new_pgoff,
+				       *updated_fd);
 
 			return 1;
 		}
@@ -1924,7 +1922,7 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	struct kfd_ioctl_criu_args args = { 0 };
 	int fd, ret = 0;
 
-	pr_info("amdgpu_plugin: Inside %s for target pid = %d\n", __func__, target_pid);
+	pr_info("Inside %s for target pid = %d\n", __func__, target_pid);
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
 	if (fd < 0) {
@@ -1934,7 +1932,7 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 
 	args.pid = target_pid;
 	args.op = KFD_CRIU_OP_RESUME;
-	pr_info("amdgpu_plugin: Calling IOCTL to start notifiers and queues\n");
+	pr_info("Calling IOCTL to start notifiers and queues\n");
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
 		pr_perror("restore late ioctl failed");
 		ret = -1;

From 9477354defe11add445102125973cdb1ccde5c84 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 7 Aug 2023 15:45:37 -0700
Subject: [PATCH 1372/1854] scripts/apt: don't hide apt output

It is required to investigate issues.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 scripts/ci/apt-install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/apt-install b/scripts/ci/apt-install
index 45aca13f4..676e0f794 100755
--- a/scripts/ci/apt-install
+++ b/scripts/ci/apt-install
@@ -15,7 +15,7 @@ while true; do
 	if [ "${install_retry_counter}" -gt "${max_apt_retries}" ]; then
 		exit 1
 	fi
-	apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-install-recommends "$@" && break
+	apt-get update -y && apt-get install -y --no-install-recommends "$@" && break
 
 	# In case it is a network error let's wait a bit.
 	echo "Retrying attempt ${install_retry_counter}"

From d3b955e5786f07bc4e47676f07159893b919ec64 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 7 Aug 2023 16:00:39 -0700
Subject: [PATCH 1373/1854] ci/docker: install all required packages

This change fixes the issue:
```
The following packages have unmet dependencies:
 docker-ce : Depends: containerd.io (>= 1.6.4)
E: Unable to correct problems, you have held broken packages.
```

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 scripts/ci/docker-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index bd46d5dd3..22d326a37 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -15,7 +15,7 @@ add-apt-repository \
    $(lsb_release -cs) \
    stable test"
 
-./apt-install docker-ce
+./apt-install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 # shellcheck source=/dev/null
 . /etc/lsb-release

From d1096e3b31c6cd5a0eb5b0f2813ef88f23db32d8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 13 Aug 2023 12:21:35 +0100
Subject: [PATCH 1374/1854] lib/py: add VMA_AREA_MEMFD constant

The VMA_AREA_MEMFD constant was introduced with commit

29a1a88bcebaf9d83591077d2bec424da82c0e71
memfd: add memory mapping support

This patch extends the status map used in CRIT and coredump with the
value of this constant to recognize it.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 coredump/criu_coredump/coredump.py | 1 +
 lib/py/images/pb2dict.py           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 0b8a02e0a..20ec8e5dc 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -53,6 +53,7 @@ status = {
     "VMA_AREA_SOCKET": 1 << 11,
     "VMA_AREA_VVAR": 1 << 12,
     "VMA_AREA_AIORING": 1 << 13,
+    "VMA_AREA_MEMFD": 1 << 14,
     "VMA_AREA_UNSUPP": 1 << 31
 }
 
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index c7046429e..fe41642d5 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -102,6 +102,7 @@ mmap_status_map = [
     ('VMA_AREA_SOCKET', 1 << 11),
     ('VMA_AREA_VVAR', 1 << 12),
     ('VMA_AREA_AIORING', 1 << 13),
+    ('VMA_AREA_MEMFD', 1 << 14),
     ('VMA_UNSUPP', 1 << 31),
 ]
 

From 5b790aa18162d7791edf8fa6eac65ed7da0a285b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 21 Aug 2023 08:10:37 -0700
Subject: [PATCH 1375/1854] loongarch64: reformat syscall_64.tbl for 8-wide
 tabs

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .../plugins/std/syscalls/syscall_64.tbl       | 228 +++++++++---------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
index b37a22674..a0ad0cef4 100644
--- a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
@@ -5,117 +5,117 @@
 #
 # __NR_name			code		name			arguments
 # -------------------------------------------------------------------------------------------------------------------------------------------------------------
-__NR_io_setup				0		sys_io_setup			(unsigned nr_events, aio_context_t *ctx)
-__NR_io_submit				2		sys_io_submit			(aio_context_t ctx, long nr, struct iocb **iocbpp)
-__NR_io_getevents			4		sys_io_getevents		(aio_context_t ctx, long min_nr, long nr, struct io_event *evs, struct timespec *tmo)
-__NR_fcntl					25		sys_fcntl				(int fd, int type, long arg)
-__NR_ioctl					29		sys_ioctl				(unsigned int fd, unsigned int cmd, unsigned long arg)
-__NR_flock					32		sys_flock				(int fd, unsigned long cmd)
-__NR_mkdirat				34		sys_mkdirat             (int dfd, const char *pathname, int flag)
-__NR_unlinkat				35		sys_unlinkat            (int dfd, const char *pathname, int flag)
-__NR_umount2				39		sys_umount2				(char *name, int flags)
-__NR_mount					40		sys_mount				(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
-__NR_fallocate				47		sys_fallocate			(int fd, int mode, loff_t offset, loff_t len)
-__NR_close					57		sys_close				(int fd)
-__NR_openat					56		sys_openat				(int dfd, const char *filename, int flags, int mode)
-__NR_lseek					62		sys_lseek				(int fd, unsigned long offset, unsigned long origin)
-__NR_read					63		sys_read				(int fd, void *buf, unsigned long count)
-__NR_write					64		sys_write				(int fd, const void *buf, unsigned long count)
-__NR_pread64				67		sys_pread				(unsigned int fd, char *buf, size_t count, loff_t pos)
-__NR_preadv					69		sys_preadv_raw			(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
-__NR_ppoll					73		sys_ppoll				(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
-__NR_signalfd4				74		sys_signalfd			(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
-__NR_vmsplice				75		sys_vmsplice			(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
-__NR_readlinkat				78		sys_readlinkat			(int fd, const char *path, char *buf, int bufsize)
-__NR_timerfd_settime		86		sys_timerfd_settime		(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
-__NR_capget					90		sys_capget				(struct cap_header *h, struct cap_data *d)
-__NR_capset					91		sys_capset				(struct cap_header *h, struct cap_data *d)
-__NR_personality			92		sys_personality			(unsigned int personality)
-__NR_exit					93		sys_exit				(unsigned long error_code)
-__NR_exit_group				94		sys_exit_group			(int error_code)
-__NR_waitid					95		sys_waitid				(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
-__NR_set_tid_address		96		sys_set_tid_address		(int *tid_addr)
-__NR_futex					98		sys_futex				(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
-__NR_set_robust_list		99		sys_set_robust_list		(struct robust_list_head *head, size_t len)
-__NR_get_robust_list		100		sys_get_robust_list		(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
-__NR_nanosleep				101		sys_nanosleep			(struct timespec *req, struct timespec *rem)
-__NR_getitimer				102		sys_getitimer			(int which, const struct itimerval *val)
-__NR_setitimer				103		sys_setitimer			(int which, const struct itimerval *val, struct itimerval *old)
-__NR_sys_timer_create		107		sys_timer_create		(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
-__NR_sys_timer_gettime		108		sys_timer_gettime		(int timer_id, const struct itimerspec *setting)
-__NR_sys_timer_getoverrun	109		sys_timer_getoverrun	(int timer_id)
-__NR_sys_timer_settime		110		sys_timer_settime		(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
-__NR_sys_timer_delete		111		sys_timer_delete		(kernel_timer_t timer_id)
-__NR_clock_gettime			113		sys_clock_gettime		(const clockid_t which_clock, const struct timespec *tp)
-__NR_sched_setscheduler		119		sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
-__NR_restart_syscall		128		sys_restart_syscall		(void)
-__NR_kill					129		sys_kill				(long pid, int sig)
-__NR_sigaltstack			132		sys_sigaltstack			(const void *uss, void *uoss)
-__NR_rt_sigaction			134		sys_sigaction			(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
-__NR_rt_sigprocmask			135		sys_sigprocmask			(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
-__NR_rt_sigqueueinfo		138		sys_rt_sigqueueinfo		(pid_t pid, int sig, siginfo_t *info)
-__NR_rt_sigreturn			139		sys_rt_sigreturn		(void)
-__NR_setpriority			140		sys_setpriority			(int which, int who, int nice)
-__NR_setresuid				147		sys_setresuid			(int uid, int euid, int suid)
-__NR_getresuid				148		sys_getresuid			(int *uid, int *euid, int *suid)
-__NR_setresgid				149		sys_setresgid			(int gid, int egid, int sgid)
-__NR_getresgid				150		sys_getresgid			(int *gid, int *egid, int *sgid)
-__NR_getpgid				155		sys_getpgid				(pid_t pid)
-__NR_setfsuid				151		sys_setfsuid			(int fsuid)
-__NR_setfsgid				152		sys_setfsgid			(int fsgid)
-__NR_getsid					156		sys_getsid				(void)
-__NR_getgroups				158		sys_getgroups			(int gsize, unsigned int *groups)
-__NR_setgroups				159		sys_setgroups			(int gsize, unsigned int *groups)
-__NR_setrlimit				164		sys_setrlimit			(int resource, struct krlimit *rlim)
-__NR_umask					166		sys_umask				(int mask)
-__NR_prctl					167		sys_prctl				(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
-__NR_gettimeofday			169		sys_gettimeofday		(struct timeval *tv, struct timezone *tz)
-__NR_getpid					172		sys_getpid				(void)
-__NR_ptrace					177		sys_ptrace				(long request, pid_t pid, void *addr, void *data)
-__NR_gettid					178		sys_gettid				(void)
-__NR_shmat					196		sys_shmat				(int shmid, void *shmaddr, int shmflag)
-__NR_socket					198		sys_socket				(int domain, int type, int protocol)
-__NR_bind					200		sys_bind				(int sockfd, const struct sockaddr *addr, int addrlen)
-__NR_connect				203		sys_connect				(int sockfd, struct sockaddr *addr, int addrlen)
-__NR_sendto					206		sys_sendto				(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
-__NR_recvfrom				207		sys_recvfrom			(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
-__NR_setsockopt				208		sys_setsockopt			(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
-__NR_getsockopt				209		sys_getsockopt			(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
-__NR_shutdown				210		sys_shutdown			(int sockfd, int how)
-__NR_sendmsg				211		sys_sendmsg				(int sockfd, const struct msghdr *msg, int flags)
-__NR_recvmsg				212		sys_recvmsg				(int sockfd, struct msghdr *msg, int flags)
-__NR_brk					214		sys_brk					(void *addr)
-__NR_munmap					215		sys_munmap				(void *addr, unsigned long len)
-__NR_mremap					216		sys_mremap				(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr)
-__NR_clone					220		sys_clone				(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
-__NR_mmap					222		sys_mmap				(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
-__NR_mprotect				226		sys_mprotect			(const void *addr, unsigned long len, unsigned long prot)
-__NR_mincore				232		sys_mincore				(void *addr, unsigned long size, unsigned char *vec)
-__NR_madvise				233		sys_madvise				(unsigned long start, size_t len, int behavior)
-__NR_rt_tgsigqueueinfo		240		sys_rt_tgsigqueueinfo	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
-__NR_wait4					260		sys_wait4				(int pid, int *status, int options, struct rusage *ru)
-__NR_fanotify_init			262		sys_fanotify_init		(unsigned int flags, unsigned int event_f_flags)
-__NR_fanotify_mark			263		sys_fanotify_mark		(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
-__NR_open_by_handle_at		265		sys_open_by_handle_at	(int mountdirfd, struct file_handle *handle, int flags)
-__NR_setns					268		sys_setns				(int fd, int nstype)
-__NR_kcmp					272		sys_kcmp				(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
-__NR_seccomp				277		sys_seccomp				(unsigned int op, unsigned int flags, const char *uargs)
-__NR_memfd_create			279		sys_memfd_create		(const char *name, unsigned int flags)
-__NR_userfaultfd			282		sys_userfaultfd			(int flags)
-__NR_rseq					293		sys_rseq				(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
-__NR_open_tree				428		sys_open_tree			(int dirfd, const char *pathname, unsigned int flags)
-__NR_move_mount				429		sys_move_mount			(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
-__NR_fsopen					430		sys_fsopen				(char *fsname, unsigned int flags)
-__NR_fsconfig				431		sys_fsconfig			(int fd, unsigned int cmd, const char *key, const char *value, int aux)
-__NR_fsmount				432		sys_fsmount				(int fd, unsigned int flags, unsigned int attr_flags)
-__NR_pidfd_open				434		sys_pidfd_open			(pid_t pid, unsigned int flags)
-__NR_clone3					435		sys_clone3				(struct clone_args *uargs, size_t size)
-__NR_openat2				437		sys_openat2				(int dirfd, char *pathname, struct open_how *how, size_t size)
-__NR_pidfd_getfd			438		sys_pidfd_getfd			(int pidfd, int targetfd, unsigned int flags)
-#__NR_dup2					!		sys_dup2				(int oldfd, int newfd)
-#__NR_rmdir					!		sys_rmdir				(const char *name)
-#__NR_unlink				!		sys_unlink				(char *pathname)
-#__NR_cacheflush			!		sys_cacheflush			(char *addr, int nbytes, int cache)
-#__NR_set_thread_area		!		sys_set_thread_area		(unsigned long *addr)
-#__NR_mkdir					!		sys_mkdir				(const char *name, int mode)
-#__NR_open					!		sys_open				(const char *filename, unsigned long flags, unsigned long mode)
+__NR_io_setup			0	sys_io_setup		(unsigned nr_events, aio_context_t *ctx)
+__NR_io_submit			2	sys_io_submit		(aio_context_t ctx, long nr, struct iocb **iocbpp)
+__NR_io_getevents		4	sys_io_getevents	(aio_context_t ctx, long min_nr, long nr, struct io_event *evs, struct timespec *tmo)
+__NR_fcntl			2	sys_fcntl		(int fd, int type, long arg)
+__NR_ioctl			2	sys_ioctl		(unsigned int fd, unsigned int cmd, unsigned long arg)
+__NR_flock			3	sys_flock		(int fd, unsigned long cmd)
+__NR_mkdirat			3	sys_mkdirat             (int dfd, const char *pathname, int flag)
+__NR_unlinkat			3	sys_unlinkat            (int dfd, const char *pathname, int flag)
+__NR_umount2			3	sys_umount2		(char *name, int flags)
+__NR_mount			4	sys_mount		(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
+__NR_fallocate			4	sys_fallocate		(int fd, int mode, loff_t offset, loff_t len)
+__NR_close			5	sys_close		(int fd)
+__NR_openat			5	sys_openat		(int dfd, const char *filename, int flags, int mode)
+__NR_lseek			6	sys_lseek		(int fd, unsigned long offset, unsigned long origin)
+__NR_read			6	sys_read		(int fd, void *buf, unsigned long count)
+__NR_write			6	sys_write		(int fd, const void *buf, unsigned long count)
+__NR_pread64			6	sys_pread		(unsigned int fd, char *buf, size_t count, loff_t pos)
+__NR_preadv			6	sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
+__NR_ppoll			7	sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_signalfd4			7	sys_signalfd		(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
+__NR_vmsplice			7	sys_vmsplice		(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
+__NR_readlinkat			7	sys_readlinkat		(int fd, const char *path, char *buf, int bufsize)
+__NR_timerfd_settime		8	sys_timerfd_settime	(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
+__NR_capget			9	sys_capget		(struct cap_header *h, struct cap_data *d)
+__NR_capset			9	sys_capset		(struct cap_header *h, struct cap_data *d)
+__NR_personality		9	sys_personality		(unsigned int personality)
+__NR_exit			9	sys_exit		(unsigned long error_code)
+__NR_exit_group			9	sys_exit_group		(int error_code)
+__NR_waitid			9	sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
+__NR_set_tid_address		9	sys_set_tid_address	(int *tid_addr)
+__NR_futex			9	sys_futex		(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
+__NR_set_robust_list		9	sys_set_robust_list	(struct robust_list_head *head, size_t len)
+__NR_get_robust_list		1	sys_get_robust_list	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
+__NR_nanosleep			1	sys_nanosleep		(struct timespec *req, struct timespec *rem)
+__NR_getitimer			1	sys_getitimer		(int which, const struct itimerval *val)
+__NR_setitimer			1	sys_setitimer		(int which, const struct itimerval *val, struct itimerval *old)
+__NR_sys_timer_create		1	sys_timer_create	(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
+__NR_sys_timer_gettime		1	sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
+__NR_sys_timer_getoverrun	1	sys_timer_getoverrun	(int timer_id)
+__NR_sys_timer_settime		1	sys_timer_settime	(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
+__NR_sys_timer_delete		1	sys_timer_delete	(kernel_timer_t timer_id)
+__NR_clock_gettime		1	sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_sched_setscheduler		1	sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
+__NR_restart_syscall		1	sys_restart_syscall	(void)
+__NR_kill			1	sys_kill		(long pid, int sig)
+__NR_sigaltstack		1	sys_sigaltstack		(const void *uss, void *uoss)
+__NR_rt_sigaction		1	sys_sigaction		(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
+__NR_rt_sigprocmask		1	sys_sigprocmask		(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
+__NR_rt_sigqueueinfo		1	sys_rt_sigqueueinfo	(pid_t pid, int sig, siginfo_t *info)
+__NR_rt_sigreturn		1	sys_rt_sigreturn	(void)
+__NR_setpriority		1	sys_setpriority		(int which, int who, int nice)
+__NR_setresuid			1	sys_setresuid		(int uid, int euid, int suid)
+__NR_getresuid			1	sys_getresuid		(int *uid, int *euid, int *suid)
+__NR_setresgid			1	sys_setresgid		(int gid, int egid, int sgid)
+__NR_getresgid			1	sys_getresgid		(int *gid, int *egid, int *sgid)
+__NR_getpgid			1	sys_getpgid		(pid_t pid)
+__NR_setfsuid			1	sys_setfsuid		(int fsuid)
+__NR_setfsgid			1	sys_setfsgid		(int fsgid)
+__NR_getsid			1	sys_getsid		(void)
+__NR_getgroups			1	sys_getgroups		(int gsize, unsigned int *groups)
+__NR_setgroups			1	sys_setgroups		(int gsize, unsigned int *groups)
+__NR_setrlimit			1	sys_setrlimit		(int resource, struct krlimit *rlim)
+__NR_umask			1	sys_umask		(int mask)
+__NR_prctl			1	sys_prctl		(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
+__NR_gettimeofday		1	sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
+__NR_getpid			1	sys_getpid		(void)
+__NR_ptrace			1	sys_ptrace		(long request, pid_t pid, void *addr, void *data)
+__NR_gettid			1	sys_gettid		(void)
+__NR_shmat			1	sys_shmat		(int shmid, void *shmaddr, int shmflag)
+__NR_socket			1	sys_socket		(int domain, int type, int protocol)
+__NR_bind			2	sys_bind		(int sockfd, const struct sockaddr *addr, int addrlen)
+__NR_connect			2	sys_connect		(int sockfd, struct sockaddr *addr, int addrlen)
+__NR_sendto			2	sys_sendto		(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
+__NR_recvfrom			2	sys_recvfrom		(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
+__NR_setsockopt			2	sys_setsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
+__NR_getsockopt			2	sys_getsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
+__NR_shutdown			2	sys_shutdown		(int sockfd, int how)
+__NR_sendmsg			2	sys_sendmsg		(int sockfd, const struct msghdr *msg, int flags)
+__NR_recvmsg			2	sys_recvmsg		(int sockfd, struct msghdr *msg, int flags)
+__NR_brk			2	sys_brk			(void *addr)
+__NR_munmap			2	sys_munmap		(void *addr, unsigned long len)
+__NR_mremap			2	sys_mremap		(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr)
+__NR_clone			2	sys_clone		(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
+__NR_mmap			2	sys_mmap		(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
+__NR_mprotect			2	sys_mprotect		(const void *addr, unsigned long len, unsigned long prot)
+__NR_mincore			2	sys_mincore		(void *addr, unsigned long size, unsigned char *vec)
+__NR_madvise			2	sys_madvise		(unsigned long start, size_t len, int behavior)
+__NR_rt_tgsigqueueinfo		2	sys_rt_tgsigqueueinfo	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
+__NR_wait4			2	sys_wait4		(int pid, int *status, int options, struct rusage *ru)
+__NR_fanotify_init		2	sys_fanotify_init	(unsigned int flags, unsigned int event_f_flags)
+__NR_fanotify_mark		2	sys_fanotify_mark	(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
+__NR_open_by_handle_at		2	sys_open_by_handle_at	(int mountdirfd, struct file_handle *handle, int flags)
+__NR_setns			2	sys_setns		(int fd, int nstype)
+__NR_kcmp			2	sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
+__NR_seccomp			2	sys_seccomp		(unsigned int op, unsigned int flags, const char *uargs)
+__NR_memfd_create		2	sys_memfd_create	(const char *name, unsigned int flags)
+__NR_userfaultfd		2	sys_userfaultfd		(int flags)
+__NR_rseq			2	sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_open_tree			4	sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
+__NR_move_mount			4	sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
+__NR_fsopen			4	sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig			4	sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount			4	sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_pidfd_open			4	sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_clone3			4	sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_openat2			4	sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
+__NR_pidfd_getfd		4	sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+#__NR_dup2			!	sys_dup2		(int oldfd, int newfd)
+#__NR_rmdir			!	sys_rmdir		(const char *name)
+#__NR_unlink			!	sys_unlink		(char *pathname)
+#__NR_cacheflush		!	sys_cacheflush		(char *addr, int nbytes, int cache)
+#__NR_set_thread_area		!	sys_set_thread_area	(unsigned long *addr)
+#__NR_mkdir			!	sys_mkdir		(const char *name, int mode)
+#__NR_open			!	sys_open		(const char *filename, unsigned long flags, unsigned long mode)

From e07155e194c914400c5dc574820d726a4d8f9fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 6 Oct 2022 17:52:46 +0200
Subject: [PATCH 1376/1854] dump+restore: Implement membarrier() registration
 c/r.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Note: Silently drops MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED as it's
not currently detectable. This is still better than silently dropping
all membarrier() registrations.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../plugins/std/syscalls/syscall_64.tbl       |  1 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 criu/cr-dump.c                                |  5 ++
 criu/cr-restore.c                             |  3 ++
 criu/include/parasite.h                       |  1 +
 criu/include/restorer.h                       |  1 +
 criu/pie/parasite.c                           | 50 +++++++++++++++++++
 criu/pie/restorer.c                           | 27 ++++++++++
 images/core.proto                             |  2 +
 14 files changed, 96 insertions(+)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 8bcc3cc50..7489ee0c1 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -122,3 +122,4 @@ pidfd_open			434	434	(pid_t pid, unsigned int flags)
 openat2				437	437	(int dirfd, char *pathname, struct open_how *how, size_t size)
 pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
 rseq				293	398	(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+membarrier 			283	389	(int cmd, unsigned int flags, int cpu_id)
diff --git a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
index a0ad0cef4..f844d898d 100644
--- a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
@@ -102,6 +102,7 @@ __NR_kcmp			2	sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1, u
 __NR_seccomp			2	sys_seccomp		(unsigned int op, unsigned int flags, const char *uargs)
 __NR_memfd_create		2	sys_memfd_create	(const char *name, unsigned int flags)
 __NR_userfaultfd		2	sys_userfaultfd		(int flags)
+__NR_membarrier			3	sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
 __NR_rseq			2	sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
 __NR_open_tree			4	sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
 __NR_move_mount			4	sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 505ec849d..9f50d5e8a 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -119,3 +119,4 @@ __NR_pidfd_open			5434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2			5437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		5438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 __NR_rseq		        5327		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_membarrier 		5318		sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index af40d7104..4c9b75cf1 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -118,3 +118,4 @@ __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 __NR_rseq       	387		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_membarrier 	365		sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index 6a349e1cb..af7d550e2 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -118,3 +118,4 @@ __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 __NR_rseq       	383		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_membarrier 	356		sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index a119a59b2..ab36a5cd6 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -106,3 +106,4 @@ __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 __NR_rseq       	386		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_membarrier 	375		sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 16dd86e79..57681b79a 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -117,3 +117,4 @@ __NR_pidfd_open			434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 __NR_rseq       		334		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_membarrier 		324		sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 340fb96ec..ee5974acc 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -770,6 +770,11 @@ static int dump_task_core_all(struct parasite_ctl *ctl, struct pstree_item *item
 	core->tc->child_subreaper = misc->child_subreaper;
 	core->tc->has_child_subreaper = true;
 
+	if (misc->membarrier_registration_mask) {
+		core->tc->membarrier_registration_mask = misc->membarrier_registration_mask;
+		core->tc->has_membarrier_registration_mask = true;
+	}
+
 	ret = get_task_personality(pid, &core->tc->personality);
 	if (ret < 0)
 		goto err;
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9107a2322..270049721 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -863,6 +863,9 @@ static int prepare_proc_misc(pid_t pid, TaskCoreEntry *tc, struct task_restore_a
 	if (tc->has_child_subreaper)
 		args->child_subreaper = tc->child_subreaper;
 
+	if (tc->has_membarrier_registration_mask)
+		args->membarrier_registration_mask = tc->membarrier_registration_mask;
+
 	/* loginuid value is critical to restore */
 	if (kdat.luid == LUID_FULL && tc->has_loginuid && tc->loginuid != INVALID_UID) {
 		ret = prepare_loginuid(tc->loginuid);
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 739fbf2c3..5209b6da2 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -128,6 +128,7 @@ struct parasite_dump_misc {
 	int dumpable;
 	int thp_disabled;
 	int child_subreaper;
+	int membarrier_registration_mask;
 };
 
 /*
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 2475ee0bc..f398d8d8f 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -229,6 +229,7 @@ struct task_restore_args {
 #endif
 	int lsm_type;
 	int child_subreaper;
+	int membarrier_registration_mask;
 	bool has_clone3_set_tid;
 
 	/*
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 58ea35892..c0604903b 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -211,6 +211,42 @@ out:
 	return ret;
 }
 
+/*
+ * Returns a membarrier() registration command (it is a bitmask) if the process
+ * was registered for specified (as a bit index) membarrier()-issuing command;
+ * returns zero otherwise.
+ */
+static int get_membarrier_registration_mask(int cmd_bit)
+{
+	unsigned cmd = 1 << cmd_bit;
+	int ret;
+
+	/*
+	 * Issuing a barrier will be successful only if the process was registered
+	 * for this type of membarrier. All errors are a sign that the type issued
+	 * was not registered (EPERM) or not supported by kernel (EINVAL or ENOSYS).
+	 */
+	ret = sys_membarrier(cmd, 0, 0);
+	if (ret && ret != -EPERM && ret != -EINVAL && ret != -ENOSYS) {
+		pr_err("membarrier(1 << %d) returned %d\n", cmd_bit, ret);
+		return -1;
+	}
+	pr_debug("membarrier(1 << %d) returned %d\n", cmd_bit, ret);
+	/*
+	 * For supported registrations, MEMBARRIER_CMD_REGISTER_xxx = MEMBARRIER_CMD_xxx << 1.
+	 * See: enum membarrier_cmd in include/uapi/linux/membarrier.h in kernel sources.
+	 */
+	return ret ? 0 : cmd << 1;
+}
+
+/*
+ * It would be better to check the following with BUILD_BUG_ON, but we might
+ * have an old linux/membarrier.h header without necessary enum values.
+ */
+#define MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED	      3
+#define MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_SYNC_CORE 5
+#define MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_RSEQ      7
+
 static int dump_misc(struct parasite_dump_misc *args)
 {
 	int ret;
@@ -225,6 +261,20 @@ static int dump_misc(struct parasite_dump_misc *args)
 	args->dumpable = sys_prctl(PR_GET_DUMPABLE, 0, 0, 0, 0);
 	args->thp_disabled = sys_prctl(PR_GET_THP_DISABLE, 0, 0, 0, 0);
 
+	args->membarrier_registration_mask = 0;
+	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED);
+	if (ret < 0)
+		return -1;
+	args->membarrier_registration_mask |= ret;
+	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_SYNC_CORE);
+	if (ret < 0)
+		return -1;
+	args->membarrier_registration_mask |= ret;
+	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_RSEQ);
+	if (ret < 0)
+		return -1;
+	args->membarrier_registration_mask |= ret;
+
 	ret = sys_prctl(PR_GET_CHILD_SUBREAPER, (unsigned long)&args->child_subreaper, 0, 0, 0);
 	if (ret)
 		pr_err("PR_GET_CHILD_SUBREAPER failed (%d)\n", ret);
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index d4f77bfde..bbee0f6fb 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1537,6 +1537,30 @@ int cleanup_current_inotify_events(struct task_restore_args *task_args)
 	return 0;
 }
 
+/*
+ * Restore membarrier() registrations.
+ */
+static int restore_membarrier_registrations(int mask)
+{
+	unsigned long bitmap[1] = { mask };
+	int i, err, ret = 0;
+
+	if (!mask)
+		return 0;
+
+	pr_info("Restoring membarrier() registrations %x\n", mask);
+
+	for_each_bit(i, bitmap) {
+		err = sys_membarrier(1 << i, 0, 0);
+		if (!err)
+			continue;
+		pr_err("Can't restore membarrier(1 << %d) registration: %d\n", i, err);
+		ret = -1;
+	}
+
+	return ret;
+}
+
 /*
  * The main routine to restore task via sigreturn.
  * This one is very special, we never return there
@@ -2023,6 +2047,9 @@ long __export_restore_task(struct task_restore_args *args)
 		goto core_restore_end;
 	}
 
+	if (restore_membarrier_registrations(args->membarrier_registration_mask) < 0)
+		goto core_restore_end;
+
 	pr_info("%ld: Restored\n", sys_getpid());
 
 	restore_finish_stage(task_entries_local, CR_STATE_RESTORE);
diff --git a/images/core.proto b/images/core.proto
index 1882fe8e4..5b07b5c44 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -64,6 +64,8 @@ message task_core_entry {
 	optional uint64			blk_sigset_extended = 20[(criu).hex = true];
 
 	optional uint32			stop_signo = 21;
+
+	optional uint32			membarrier_registration_mask	= 22 [(criu).hex = true];
 }
 
 message task_kobj_ids_entry {

From 2547ac8ac18cc902ff7e85b271ddf66e0efeb4a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 19 Jun 2023 12:00:51 +0200
Subject: [PATCH 1377/1854] zdtm: membarrier: test migration of membarrier()
 registration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/Makefile     |   1 +
 test/zdtm/static/membarrier.c | 116 ++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 test/zdtm/static/membarrier.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 30429e425..cd53932db 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -62,6 +62,7 @@ TST_NOFILE	:=				\
 		pthread_timers			\
 		pthread_timers_h		\
 		rseq00				\
+		membarrier			\
 		vdso00				\
 		vdso01				\
 		vdso02				\
diff --git a/test/zdtm/static/membarrier.c b/test/zdtm/static/membarrier.c
new file mode 100644
index 000000000..a04b36035
--- /dev/null
+++ b/test/zdtm/static/membarrier.c
@@ -0,0 +1,116 @@
+#include <linux/membarrier.h>
+#include <sys/syscall.h>
+#include <stdbool.h>
+#include "zdtmtst.h"
+
+const char *test_doc = "Test membarrier() migration";
+const char *test_author = "Michał Mirosław <emmir@google.com>";
+
+/*
+ * Define membarrier() CMDs to avoid depending on exact kernel header version.
+ * FIXME: use MEMBARRIER_CMD_GET_REGISTRATIONS if supported by kernel.
+ */
+#define MEMBARRIER_CMD_PRIVATE_EXPEDITED		    (1 << 3)
+#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED	    (1 << 4)
+#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE	    (1 << 5)
+#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE (1 << 6)
+#define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ		    (1 << 7)
+#define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ	    (1 << 8)
+
+static int membarrier(int cmd, unsigned int flags, int cpu_id)
+{
+	return syscall(__NR_membarrier, cmd, flags, cpu_id);
+}
+
+static const struct {
+	const char *name_suffix;
+	int register_cmd;
+	int execute_cmd;
+} membarrier_cmds[] = {
+	{ "",           MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED,           MEMBARRIER_CMD_PRIVATE_EXPEDITED },
+	{ "_SYNC_CORE", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE },
+	{ "_RSEQ",      MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ,      MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ },
+};
+static const int n_membarrier_cmds = sizeof(membarrier_cmds) / sizeof(*membarrier_cmds);
+
+static int register_membarriers(void)
+{
+	int barriers_supported, barriers_registered;
+	bool all_ok = true;
+
+	barriers_supported = membarrier(MEMBARRIER_CMD_QUERY, 0, 0);
+	if (barriers_supported < 0) {
+		fail("membarrier() not supported by running kernel");
+		return -1;
+	}
+
+	barriers_registered = 0;
+	for (int i = 0; i < n_membarrier_cmds; ++i) {
+		if (~barriers_supported & membarrier_cmds[i].register_cmd)
+			continue;
+
+		barriers_registered |= membarrier_cmds[i].execute_cmd;
+
+		if (membarrier(membarrier_cmds[i].register_cmd, 0, 0) < 0) {
+			pr_perror("membarrier(REGISTER_PRIVATE_EXPEDITED%s)", membarrier_cmds[i].name_suffix);
+			all_ok = false;
+		}
+	}
+
+	if (!all_ok) {
+		fail("can't register membarrier()s - tried %#x, kernel %#x",
+		     barriers_registered, barriers_supported);
+		return -1;
+	}
+
+	if (!barriers_registered) {
+		fail("no known membarrier() cmds are supported by the kernel");
+		return -1;
+	}
+
+	return barriers_registered;
+}
+
+static bool check_membarriers(int barriers_registered)
+{
+	bool all_ok = true;
+
+	for (int i = 0; i < n_membarrier_cmds; ++i) {
+		if (~barriers_registered & membarrier_cmds[i].execute_cmd)
+			continue;
+		if (membarrier(membarrier_cmds[i].execute_cmd, 0, 0) < 0) {
+			pr_perror("membarrier(PRIVATE_EXPEDITED%s)", membarrier_cmds[i].name_suffix);
+			all_ok = false;
+		}
+	}
+
+	if (!all_ok)
+		fail("membarrier() check failed");
+
+	return all_ok;
+}
+
+int main(int argc, char **argv)
+{
+	int barriers_registered;
+
+	test_init(argc, argv);
+
+	barriers_registered = register_membarriers();
+	if (barriers_registered < 0)
+		return 1;
+
+	test_msg("Pre-migration membarriers check\n");
+	if (!check_membarriers(barriers_registered))
+		return 1;
+
+	test_daemon();
+	test_waitsig();
+
+	test_msg("Post-migration membarriers check\n");
+	if (!check_membarriers(barriers_registered))
+		return 1;
+
+	pass();
+	return 0;
+}

From 620e8c0a61ae00d90c032018b67ed65c3057251f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 9 Aug 2023 14:42:22 +0200
Subject: [PATCH 1378/1854] Put a cap on the size of single preadv in restore
 operation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While each preadv() is followed by a fallocate() that removes the data
range from image files on tmpfs, temporarily (between preadv() and
fallocate()) the same data is in two places; this increases the memory
overhead of restore operation by the size of a single preadv.
Uncapped preadv() would read up to 2 GiB of data, thus we limit that to
a smaller block size (128 MiB).

Based-on-work-by: Paweł Stradomski <pstradomski@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/pie/restorer.c | 47 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index bbee0f6fb..0de2423a1 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -56,6 +56,12 @@
  */
 #define MAX_GETGROUPS_CHECKED (512 / sizeof(unsigned int))
 
+/*
+ * Memory overhead limit for reading VMA when auto_dedup is enabled.
+ * An arbitrarily chosen trade-off point between speed and memory usage.
+ */
+#define AUTO_DEDUP_OVERHEAD_BYTES (128 << 20)
+
 #ifndef PR_SET_PDEATHSIG
 #define PR_SET_PDEATHSIG 1
 #endif
@@ -1477,6 +1483,40 @@ static int fd_poll(int inotify_fd)
 	return sys_ppoll(&pfd, 1, &tmo, NULL, sizeof(sigset_t));
 }
 
+/*
+ * Call preadv() but limit size of the read. Zero `max_to_read` skips the limit.
+ */
+static ssize_t preadv_limited(int fd, struct iovec *iovs, int nr, off_t offs, size_t max_to_read)
+{
+	size_t saved_last_iov_len = 0;
+	ssize_t ret;
+
+	if (max_to_read) {
+		for (int i = 0; i < nr; ++i) {
+			if (iovs[i].iov_len <= max_to_read) {
+				max_to_read -= iovs[i].iov_len;
+				continue;
+			}
+
+			if (!max_to_read) {
+				nr = i;
+				break;
+			}
+
+			saved_last_iov_len = iovs[i].iov_len;
+			iovs[i].iov_len = max_to_read;
+			nr = i + 1;
+			break;
+		}
+	}
+
+	ret = sys_preadv(fd, iovs, nr, offs);
+	if (saved_last_iov_len)
+		iovs[nr - 1].iov_len = saved_last_iov_len;
+
+	return ret;
+}
+
 /*
  * In the worst case buf size should be:
  *   sizeof(struct inotify_event) * 2 + PATH_MAX
@@ -1748,7 +1788,12 @@ long __export_restore_task(struct task_restore_args *args)
 
 		while (nr) {
 			pr_debug("Preadv %lx:%d... (%d iovs)\n", (unsigned long)iovs->iov_base, (int)iovs->iov_len, nr);
-			r = sys_preadv(args->vma_ios_fd, iovs, nr, rio->off);
+			/*
+			 * If we're requested to punch holes in the file after reading we do
+			 * it to save memory. Limit the reads then to an arbitrary block size.
+			 */
+			r = preadv_limited(args->vma_ios_fd, iovs, nr, rio->off,
+					   args->auto_dedup ? AUTO_DEDUP_OVERHEAD_BYTES : 0);
 			if (r < 0) {
 				pr_err("Can't read pages data (%d)\n", (int)r);
 				goto core_restore_end;

From 6ea60d6ef74604f28dd696adc11104c817250964 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 19 Aug 2023 21:56:25 -0700
Subject: [PATCH 1379/1854] github: auto-remove `changes requested` and
 `awaiting reply` labels

Labels are removed when new comments are posted.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .github/workflows/manage-labels.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/manage-labels.yml

diff --git a/.github/workflows/manage-labels.yml b/.github/workflows/manage-labels.yml
new file mode 100644
index 000000000..a2bcd8860
--- /dev/null
+++ b/.github/workflows/manage-labels.yml
@@ -0,0 +1,14 @@
+name: Remove labels
+on: [issue_comment, pull_request_review_comment]
+jobs:
+  remove-labels-on-comments:
+    name: Remove labels on comments
+    if: github.event_name == 'issue_comment'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mondeja/remove-labels-gh-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: |
+            changes requested
+            awaiting reply

From 8c17535f3f857233913b34b217419f57f5548a0b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 24 Aug 2023 13:52:21 -0700
Subject: [PATCH 1380/1854] loongarch64: fix syscall_64.tbl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 288d6a61e29d change broke all the syscall numbers.

Reported-by: Michał Mirosław <emmir@google.com>
Fixes: (288d6a61e29d "loongarch64: reformat syscall_64.tbl for 8-wide tabs")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .../plugins/std/syscalls/syscall_64.tbl       | 210 +++++++++---------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
index f844d898d..aa6ffb44d 100644
--- a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
@@ -8,111 +8,111 @@
 __NR_io_setup			0	sys_io_setup		(unsigned nr_events, aio_context_t *ctx)
 __NR_io_submit			2	sys_io_submit		(aio_context_t ctx, long nr, struct iocb **iocbpp)
 __NR_io_getevents		4	sys_io_getevents	(aio_context_t ctx, long min_nr, long nr, struct io_event *evs, struct timespec *tmo)
-__NR_fcntl			2	sys_fcntl		(int fd, int type, long arg)
-__NR_ioctl			2	sys_ioctl		(unsigned int fd, unsigned int cmd, unsigned long arg)
-__NR_flock			3	sys_flock		(int fd, unsigned long cmd)
-__NR_mkdirat			3	sys_mkdirat             (int dfd, const char *pathname, int flag)
-__NR_unlinkat			3	sys_unlinkat            (int dfd, const char *pathname, int flag)
-__NR_umount2			3	sys_umount2		(char *name, int flags)
-__NR_mount			4	sys_mount		(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
-__NR_fallocate			4	sys_fallocate		(int fd, int mode, loff_t offset, loff_t len)
-__NR_close			5	sys_close		(int fd)
-__NR_openat			5	sys_openat		(int dfd, const char *filename, int flags, int mode)
-__NR_lseek			6	sys_lseek		(int fd, unsigned long offset, unsigned long origin)
-__NR_read			6	sys_read		(int fd, void *buf, unsigned long count)
-__NR_write			6	sys_write		(int fd, const void *buf, unsigned long count)
-__NR_pread64			6	sys_pread		(unsigned int fd, char *buf, size_t count, loff_t pos)
-__NR_preadv			6	sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
-__NR_ppoll			7	sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
-__NR_signalfd4			7	sys_signalfd		(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
-__NR_vmsplice			7	sys_vmsplice		(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
-__NR_readlinkat			7	sys_readlinkat		(int fd, const char *path, char *buf, int bufsize)
-__NR_timerfd_settime		8	sys_timerfd_settime	(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
-__NR_capget			9	sys_capget		(struct cap_header *h, struct cap_data *d)
-__NR_capset			9	sys_capset		(struct cap_header *h, struct cap_data *d)
-__NR_personality		9	sys_personality		(unsigned int personality)
-__NR_exit			9	sys_exit		(unsigned long error_code)
-__NR_exit_group			9	sys_exit_group		(int error_code)
-__NR_waitid			9	sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
-__NR_set_tid_address		9	sys_set_tid_address	(int *tid_addr)
-__NR_futex			9	sys_futex		(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
-__NR_set_robust_list		9	sys_set_robust_list	(struct robust_list_head *head, size_t len)
-__NR_get_robust_list		1	sys_get_robust_list	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
-__NR_nanosleep			1	sys_nanosleep		(struct timespec *req, struct timespec *rem)
-__NR_getitimer			1	sys_getitimer		(int which, const struct itimerval *val)
-__NR_setitimer			1	sys_setitimer		(int which, const struct itimerval *val, struct itimerval *old)
-__NR_sys_timer_create		1	sys_timer_create	(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
-__NR_sys_timer_gettime		1	sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
-__NR_sys_timer_getoverrun	1	sys_timer_getoverrun	(int timer_id)
-__NR_sys_timer_settime		1	sys_timer_settime	(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
-__NR_sys_timer_delete		1	sys_timer_delete	(kernel_timer_t timer_id)
-__NR_clock_gettime		1	sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
-__NR_sched_setscheduler		1	sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
-__NR_restart_syscall		1	sys_restart_syscall	(void)
-__NR_kill			1	sys_kill		(long pid, int sig)
-__NR_sigaltstack		1	sys_sigaltstack		(const void *uss, void *uoss)
-__NR_rt_sigaction		1	sys_sigaction		(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
-__NR_rt_sigprocmask		1	sys_sigprocmask		(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
-__NR_rt_sigqueueinfo		1	sys_rt_sigqueueinfo	(pid_t pid, int sig, siginfo_t *info)
-__NR_rt_sigreturn		1	sys_rt_sigreturn	(void)
-__NR_setpriority		1	sys_setpriority		(int which, int who, int nice)
-__NR_setresuid			1	sys_setresuid		(int uid, int euid, int suid)
-__NR_getresuid			1	sys_getresuid		(int *uid, int *euid, int *suid)
-__NR_setresgid			1	sys_setresgid		(int gid, int egid, int sgid)
-__NR_getresgid			1	sys_getresgid		(int *gid, int *egid, int *sgid)
-__NR_getpgid			1	sys_getpgid		(pid_t pid)
-__NR_setfsuid			1	sys_setfsuid		(int fsuid)
-__NR_setfsgid			1	sys_setfsgid		(int fsgid)
-__NR_getsid			1	sys_getsid		(void)
-__NR_getgroups			1	sys_getgroups		(int gsize, unsigned int *groups)
-__NR_setgroups			1	sys_setgroups		(int gsize, unsigned int *groups)
-__NR_setrlimit			1	sys_setrlimit		(int resource, struct krlimit *rlim)
-__NR_umask			1	sys_umask		(int mask)
-__NR_prctl			1	sys_prctl		(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
-__NR_gettimeofday		1	sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
-__NR_getpid			1	sys_getpid		(void)
-__NR_ptrace			1	sys_ptrace		(long request, pid_t pid, void *addr, void *data)
-__NR_gettid			1	sys_gettid		(void)
-__NR_shmat			1	sys_shmat		(int shmid, void *shmaddr, int shmflag)
-__NR_socket			1	sys_socket		(int domain, int type, int protocol)
-__NR_bind			2	sys_bind		(int sockfd, const struct sockaddr *addr, int addrlen)
-__NR_connect			2	sys_connect		(int sockfd, struct sockaddr *addr, int addrlen)
-__NR_sendto			2	sys_sendto		(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
-__NR_recvfrom			2	sys_recvfrom		(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
-__NR_setsockopt			2	sys_setsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
-__NR_getsockopt			2	sys_getsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
-__NR_shutdown			2	sys_shutdown		(int sockfd, int how)
-__NR_sendmsg			2	sys_sendmsg		(int sockfd, const struct msghdr *msg, int flags)
-__NR_recvmsg			2	sys_recvmsg		(int sockfd, struct msghdr *msg, int flags)
-__NR_brk			2	sys_brk			(void *addr)
-__NR_munmap			2	sys_munmap		(void *addr, unsigned long len)
-__NR_mremap			2	sys_mremap		(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr)
-__NR_clone			2	sys_clone		(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
-__NR_mmap			2	sys_mmap		(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
-__NR_mprotect			2	sys_mprotect		(const void *addr, unsigned long len, unsigned long prot)
-__NR_mincore			2	sys_mincore		(void *addr, unsigned long size, unsigned char *vec)
-__NR_madvise			2	sys_madvise		(unsigned long start, size_t len, int behavior)
-__NR_rt_tgsigqueueinfo		2	sys_rt_tgsigqueueinfo	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
-__NR_wait4			2	sys_wait4		(int pid, int *status, int options, struct rusage *ru)
-__NR_fanotify_init		2	sys_fanotify_init	(unsigned int flags, unsigned int event_f_flags)
-__NR_fanotify_mark		2	sys_fanotify_mark	(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
-__NR_open_by_handle_at		2	sys_open_by_handle_at	(int mountdirfd, struct file_handle *handle, int flags)
-__NR_setns			2	sys_setns		(int fd, int nstype)
-__NR_kcmp			2	sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
-__NR_seccomp			2	sys_seccomp		(unsigned int op, unsigned int flags, const char *uargs)
-__NR_memfd_create		2	sys_memfd_create	(const char *name, unsigned int flags)
-__NR_userfaultfd		2	sys_userfaultfd		(int flags)
-__NR_membarrier			3	sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
-__NR_rseq			2	sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
-__NR_open_tree			4	sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
-__NR_move_mount			4	sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
-__NR_fsopen			4	sys_fsopen		(char *fsname, unsigned int flags)
-__NR_fsconfig			4	sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
-__NR_fsmount			4	sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
-__NR_pidfd_open			4	sys_pidfd_open		(pid_t pid, unsigned int flags)
-__NR_clone3			4	sys_clone3		(struct clone_args *uargs, size_t size)
-__NR_openat2			4	sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
-__NR_pidfd_getfd		4	sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
+__NR_fcntl			25	sys_fcntl		(int fd, int type, long arg)
+__NR_ioctl			29	sys_ioctl		(unsigned int fd, unsigned int cmd, unsigned long arg)
+__NR_flock			32	sys_flock		(int fd, unsigned long cmd)
+__NR_mkdirat			34	sys_mkdirat             (int dfd, const char *pathname, int flag)
+__NR_unlinkat			35	sys_unlinkat            (int dfd, const char *pathname, int flag)
+__NR_umount2			39	sys_umount2		(char *name, int flags)
+__NR_mount			40	sys_mount		(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
+__NR_fallocate			47	sys_fallocate		(int fd, int mode, loff_t offset, loff_t len)
+__NR_close			57	sys_close		(int fd)
+__NR_openat			56	sys_openat		(int dfd, const char *filename, int flags, int mode)
+__NR_lseek			62	sys_lseek		(int fd, unsigned long offset, unsigned long origin)
+__NR_read			63	sys_read		(int fd, void *buf, unsigned long count)
+__NR_write			64	sys_write		(int fd, const void *buf, unsigned long count)
+__NR_pread64			67	sys_pread		(unsigned int fd, char *buf, size_t count, loff_t pos)
+__NR_preadv			69	sys_preadv_raw		(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
+__NR_ppoll			73	sys_ppoll		(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+__NR_signalfd4			74	sys_signalfd		(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
+__NR_vmsplice			75	sys_vmsplice		(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
+__NR_readlinkat			78	sys_readlinkat		(int fd, const char *path, char *buf, int bufsize)
+__NR_timerfd_settime		86	sys_timerfd_settime	(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
+__NR_capget			90	sys_capget		(struct cap_header *h, struct cap_data *d)
+__NR_capset			91	sys_capset		(struct cap_header *h, struct cap_data *d)
+__NR_personality		92	sys_personality		(unsigned int personality)
+__NR_exit			93	sys_exit		(unsigned long error_code)
+__NR_exit_group			94	sys_exit_group		(int error_code)
+__NR_waitid			95	sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
+__NR_set_tid_address		96	sys_set_tid_address	(int *tid_addr)
+__NR_futex			98	sys_futex		(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
+__NR_set_robust_list		99	sys_set_robust_list	(struct robust_list_head *head, size_t len)
+__NR_get_robust_list		100	sys_get_robust_list	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
+__NR_nanosleep			101	sys_nanosleep		(struct timespec *req, struct timespec *rem)
+__NR_getitimer			102	sys_getitimer		(int which, const struct itimerval *val)
+__NR_setitimer			103	sys_setitimer		(int which, const struct itimerval *val, struct itimerval *old)
+__NR_sys_timer_create		107	sys_timer_create	(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
+__NR_sys_timer_gettime		108	sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
+__NR_sys_timer_getoverrun	109	sys_timer_getoverrun	(int timer_id)
+__NR_sys_timer_settime		110	sys_timer_settime	(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
+__NR_sys_timer_delete		111	sys_timer_delete	(kernel_timer_t timer_id)
+__NR_clock_gettime		113	sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_sched_setscheduler		119	sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
+__NR_restart_syscall		128	sys_restart_syscall	(void)
+__NR_kill			129	sys_kill		(long pid, int sig)
+__NR_sigaltstack		132	sys_sigaltstack		(const void *uss, void *uoss)
+__NR_rt_sigaction		134	sys_sigaction		(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
+__NR_rt_sigprocmask		135	sys_sigprocmask		(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
+__NR_rt_sigqueueinfo		138	sys_rt_sigqueueinfo	(pid_t pid, int sig, siginfo_t *info)
+__NR_rt_sigreturn		139	sys_rt_sigreturn	(void)
+__NR_setpriority		140	sys_setpriority		(int which, int who, int nice)
+__NR_setresuid			147	sys_setresuid		(int uid, int euid, int suid)
+__NR_getresuid			148	sys_getresuid		(int *uid, int *euid, int *suid)
+__NR_setresgid			149	sys_setresgid		(int gid, int egid, int sgid)
+__NR_getresgid			150	sys_getresgid		(int *gid, int *egid, int *sgid)
+__NR_getpgid			155	sys_getpgid		(pid_t pid)
+__NR_setfsuid			151	sys_setfsuid		(int fsuid)
+__NR_setfsgid			152	sys_setfsgid		(int fsgid)
+__NR_getsid			156	sys_getsid		(void)
+__NR_getgroups			158	sys_getgroups		(int gsize, unsigned int *groups)
+__NR_setgroups			159	sys_setgroups		(int gsize, unsigned int *groups)
+__NR_setrlimit			164	sys_setrlimit		(int resource, struct krlimit *rlim)
+__NR_umask			166	sys_umask		(int mask)
+__NR_prctl			167	sys_prctl		(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
+__NR_gettimeofday		169	sys_gettimeofday	(struct timeval *tv, struct timezone *tz)
+__NR_getpid			172	sys_getpid		(void)
+__NR_ptrace			177	sys_ptrace		(long request, pid_t pid, void *addr, void *data)
+__NR_gettid			178	sys_gettid		(void)
+__NR_shmat			196	sys_shmat		(int shmid, void *shmaddr, int shmflag)
+__NR_socket			198	sys_socket		(int domain, int type, int protocol)
+__NR_bind			200	sys_bind		(int sockfd, const struct sockaddr *addr, int addrlen)
+__NR_connect			203	sys_connect		(int sockfd, struct sockaddr *addr, int addrlen)
+__NR_sendto			206	sys_sendto		(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
+__NR_recvfrom			207	sys_recvfrom		(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
+__NR_setsockopt			208	sys_setsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
+__NR_getsockopt			209	sys_getsockopt		(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
+__NR_shutdown			210	sys_shutdown		(int sockfd, int how)
+__NR_sendmsg			211	sys_sendmsg		(int sockfd, const struct msghdr *msg, int flags)
+__NR_recvmsg			212	sys_recvmsg		(int sockfd, struct msghdr *msg, int flags)
+__NR_brk			214	sys_brk			(void *addr)
+__NR_munmap			215	sys_munmap		(void *addr, unsigned long len)
+__NR_mremap			216	sys_mremap		(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flags, unsigned long new_addr)
+__NR_clone			220	sys_clone		(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
+__NR_mmap			222	sys_mmap		(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
+__NR_mprotect			226	sys_mprotect		(const void *addr, unsigned long len, unsigned long prot)
+__NR_mincore			232	sys_mincore		(void *addr, unsigned long size, unsigned char *vec)
+__NR_madvise			233	sys_madvise		(unsigned long start, size_t len, int behavior)
+__NR_rt_tgsigqueueinfo		240	sys_rt_tgsigqueueinfo	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
+__NR_wait4			260	sys_wait4		(int pid, int *status, int options, struct rusage *ru)
+__NR_fanotify_init		262	sys_fanotify_init	(unsigned int flags, unsigned int event_f_flags)
+__NR_fanotify_mark		263	sys_fanotify_mark	(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
+__NR_open_by_handle_at		265	sys_open_by_handle_at	(int mountdirfd, struct file_handle *handle, int flags)
+__NR_setns			268	sys_setns		(int fd, int nstype)
+__NR_kcmp			272	sys_kcmp		(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
+__NR_seccomp			277	sys_seccomp		(unsigned int op, unsigned int flags, const char *uargs)
+__NR_memfd_create		279	sys_memfd_create	(const char *name, unsigned int flags)
+__NR_userfaultfd		282	sys_userfaultfd		(int flags)
+__NR_membarrier			283	sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
+__NR_rseq			293	sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+__NR_open_tree			428	sys_open_tree		(int dirfd, const char *pathname, unsigned int flags)
+__NR_move_mount			429	sys_move_mount		(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
+__NR_fsopen			430	sys_fsopen		(char *fsname, unsigned int flags)
+__NR_fsconfig			431	sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+__NR_fsmount			432	sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
+__NR_pidfd_open			434	sys_pidfd_open		(pid_t pid, unsigned int flags)
+__NR_clone3			435	sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_openat2			437	sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
+__NR_pidfd_getfd		438	sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 #__NR_dup2			!	sys_dup2		(int oldfd, int newfd)
 #__NR_rmdir			!	sys_rmdir		(const char *name)
 #__NR_unlink			!	sys_unlink		(char *pathname)

From 0085f992cbabd39dd74a1eeb0bedc1e0b1b86170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 24 Aug 2023 21:07:51 +0200
Subject: [PATCH 1381/1854] memfd: don't set fd attributes not needed for vma
 mapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is only one user of memfd_open() outside of memfd.c: open_filemap().
It is restoring a file-backed mapping and doesn't need nor expect to
update F_SETOWN nor the fd's position.  Check the inherited_fd() handling
in the callers to simplify the code.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/files-reg.c |  3 ++-
 criu/memfd.c     | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 50dcbc438..cf0c84b52 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2508,7 +2508,8 @@ static int open_filemap(int pid, struct vma_area *vma)
 			 */
 			ret = dup(plugin_fd);
 		} else if (vma->e->status & VMA_AREA_MEMFD) {
-			ret = memfd_open(vma->vmfd, &flags);
+			if (!inherited_fd(vma->vmfd, &ret))
+				ret = memfd_open(vma->vmfd, &flags);
 		} else {
 			ret = open_path(vma->vmfd, do_open_reg_noseek_flags, &flags);
 		}
diff --git a/criu/memfd.c b/criu/memfd.c
index 2158b6720..5fe0aeae3 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -331,14 +331,11 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	mfi = container_of(d, struct memfd_info, d);
 	mfe = mfi->mfe;
 
-	if (inherited_fd(d, &fd))
-		return fd;
-
 	pr_info("Restoring memfd id=%d\n", mfe->id);
 
 	fd = memfd_open_inode(mfi->inode);
 	if (fd < 0)
-		goto err;
+		return -1;
 
 	/* Reopen the fd with original permissions */
 	flags = fdflags ? *fdflags : mfe->flags;
@@ -348,40 +345,43 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	 * important though.
 	 */
 	_fd = __open_proc(PROC_SELF, 0, flags, "fd/%d", fd);
-	if (_fd < 0) {
+	if (_fd < 0)
 		pr_perror("Can't reopen memfd id=%d", mfe->id);
-		goto err;
-	}
+
 	close(fd);
-	fd = _fd;
+	return _fd;
+}
+
+static int memfd_open_fe_fd(struct file_desc *d, int *new_fd)
+{
+	MemfdFileEntry *mfe;
+	int fd;
+
+	if (inherited_fd(d, new_fd))
+		return 0;
+
+	fd = memfd_open(d, NULL);
+	if (fd < 0)
+		return -1;
+
+	mfe = container_of(d, struct memfd_info, d)->mfe;
 
 	if (restore_fown(fd, mfe->fown) < 0)
 		goto err;
 
 	if (lseek(fd, mfe->pos, SEEK_SET) < 0) {
-		pr_perror("Can't restore file position of memfd id=%d", mfe->id);
+		pr_perror("Can't restore file position of %d for memfd id=%d", fd, mfe->id);
 		goto err;
 	}
 
-	return fd;
+	*new_fd = fd;
+	return 0;
 
 err:
-	if (fd >= 0)
-		close(fd);
+	close(fd);
 	return -1;
 }
 
-static int memfd_open_fe_fd(struct file_desc *fd, int *new_fd)
-{
-	int tmp;
-
-	tmp = memfd_open(fd, NULL);
-	if (tmp < 0)
-		return -1;
-	*new_fd = tmp;
-	return 0;
-}
-
 static char *memfd_d_name(struct file_desc *d, char *buf, size_t s)
 {
 	MemfdInodeEntry *mie = NULL;

From 86ad52bc2def0a5ea715f1a92fbd4dc2d5ff41d1 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 24 Aug 2023 15:22:32 -0700
Subject: [PATCH 1382/1854] ci/loongarch64: compile tests before running
 zdtm.py

Otherwise tests fail by timeout.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/ci/loongarch64-qemu-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/loongarch64-qemu-test.sh b/scripts/ci/loongarch64-qemu-test.sh
index 52e587619..d5646468e 100755
--- a/scripts/ci/loongarch64-qemu-test.sh
+++ b/scripts/ci/loongarch64-qemu-test.sh
@@ -65,5 +65,5 @@ sshpass -p $PASSWORD scp -o StrictHostKeyChecking=no -P $PORT criu.tar $USER@127
 
 # build and test
 run 'cd /root; tar -xf criu.tar'
-run 'cd /root/criu; make -j4'
+run 'cd /root/criu; make -j4 && make -j4 -C test/zdtm'
 run "cd /root/criu; ./test/zdtm.py run -t zdtm/static/maps02 -t zdtm/static/maps05 -t zdtm/static/maps06 -t zdtm/static/maps10 -t zdtm/static/maps_file_prot -t zdtm/static/memfd00 -t zdtm/transition/fork -t zdtm/transition/fork2 -t zdtm/transition/shmem -f h"

From b56a9cef32bda8e4f332e94bfbdcc3b2c315a118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 24 Aug 2023 20:21:28 +0200
Subject: [PATCH 1383/1854] kerndat: Make pagemap check more robust against
 swapped out pages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix test of whether the kernel exposes page frame numbers to cope with the
possibility that the top of the stack is swapped out, which was happening
in about one 1 out of 3 million runs.  This lead to a later failure when
trying to read the PFN of the zero page, after which criu would exit with
no error message.

Original-From: Ambrose Feinstein <ambrose@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/kerndat.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index bd1ccdc7d..55a1e2bcd 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -55,10 +55,11 @@
 #include "util-caps.h"
 
 struct kerndat_s kdat = {};
+volatile int dummy_var;
 
 static int check_pagemap(void)
 {
-	int ret, fd;
+	int ret, fd, retry;
 	u64 pfn = 0;
 
 	fd = __open_proc(PROC_SELF, EPERM, O_RDONLY, "pagemap");
@@ -72,11 +73,24 @@ static int check_pagemap(void)
 		return -1;
 	}
 
-	/* Get the PFN of some present page. Stack is here, so try it :) */
-	ret = pread(fd, &pfn, sizeof(pfn), (((unsigned long)&ret) / page_size()) * sizeof(pfn));
-	if (ret != sizeof(pfn)) {
-		pr_perror("Can't read pagemap");
-		return -1;
+	retry = 3;
+	while (retry--) {
+		++dummy_var;
+		/* Get the PFN of a page likely to be present. */
+		ret = pread(fd, &pfn, sizeof(pfn), PAGE_PFN((uintptr_t)&dummy_var) * sizeof(pfn));
+		if (ret != sizeof(pfn)) {
+			pr_perror("Can't read pagemap");
+			return -1;
+		}
+		/* The page can be swapped out by the time the read occurs,
+		 * in which case the rest of the bits are a swap type + offset
+		 * (which could be zero even if not hidden).
+		 * Retry if this happens. */
+		if (pfn & PME_PRESENT)
+			break;
+		pr_warn("got non-present PFN %#lx for the dummy data page; %s\n", (unsigned long)pfn,
+			retry ? "retrying" : "giving up");
+		pfn = 0;
 	}
 
 	close(fd);

From f7d7dc9c08c256c6e7b7fde8a02fd9db35d0b4e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Tue, 22 Aug 2023 17:30:44 +0200
Subject: [PATCH 1384/1854] compel/infect: include the relevant pid in
 "no-breakpoints restore" debug message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 compel/src/lib/infect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 022d4ebf3..b9a913fa1 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1577,7 +1577,7 @@ int compel_stop_pie(pid_t pid, void *addr, bool no_bp)
 	int ret;
 
 	if (no_bp) {
-		pr_debug("Force no-breakpoints restore\n");
+		pr_debug("Force no-breakpoints restore of %d\n", pid);
 		ret = 0;
 	} else
 		ret = ptrace_set_breakpoint(pid, addr);

From ea05b06ac255e999f03e2858ed2c7119bfb153b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 25 Aug 2023 13:36:21 +0200
Subject: [PATCH 1385/1854] proc_parse: remove trivial goto from
 vma_get_mapfile_user()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/proc_parse.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 5e96b5c96..bd6c3dcbc 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -338,7 +338,7 @@ static int vma_get_mapfile_user(const char *fname, struct vma_area *vma, struct
 	fd = open(fname, O_RDONLY);
 	if (fd < 0) {
 		pr_perror("Can't open mapped [%s]", fname);
-		goto returnerr;
+		return -1;
 	}
 
 	if (vma_stat(vma, fd)) {
@@ -379,7 +379,6 @@ errmsg:
 	pr_err("Failed to resolve mapping %lx filename\n", (unsigned long)vma->e->start);
 closefd:
 	close(fd);
-returnerr:
 	return -1;
 }
 

From 1800018bc1140c7910568a642c62de26d2bcf6a1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 23 Mar 2023 20:21:04 +0000
Subject: [PATCH 1386/1854] test/other: add test for action-script

This commit is introducing a test for the action-script functionality
of CRIU to verify that pre-dump, post-dump, pre-restore, pre-resume,
post-restore, post-resume hooks are executed during dump/restore.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile                                   |  1 +
 scripts/ci/run-ci-tests.sh                 |  3 ++
 test/others/action-script/.gitignore       |  1 +
 test/others/action-script/Makefile         |  5 ++
 test/others/action-script/action-script.sh |  2 +
 test/others/action-script/run.sh           | 60 ++++++++++++++++++++++
 6 files changed, 72 insertions(+)
 create mode 100644 test/others/action-script/.gitignore
 create mode 100644 test/others/action-script/Makefile
 create mode 100755 test/others/action-script/action-script.sh
 create mode 100755 test/others/action-script/run.sh

diff --git a/Makefile b/Makefile
index 2e8a866af..85407e299 100644
--- a/Makefile
+++ b/Makefile
@@ -439,6 +439,7 @@ lint:
 	shellcheck -x test/others/libcriu/*.sh
 	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck -x test/others/config-file/*.sh
+	shellcheck -x test/others/action-script/*.sh
 	codespell -S tags
 	# Do not append \n to pr_perror, pr_pwarn or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|pr_pwarn|fail)\>.*\\n"'
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 79744c750..47749e7fa 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -316,6 +316,9 @@ make -C test/others/ns_ext run
 # config file parser and parameter testing
 make -C test/others/config-file run
 
+# action script testing
+make -C test/others/action-script run
+
 # Skip all further tests when running with GCOV=1
 # The one test which currently cannot handle GCOV testing is compel/test
 # Probably because the GCOV Makefile infrastructure does not exist in compel
diff --git a/test/others/action-script/.gitignore b/test/others/action-script/.gitignore
new file mode 100644
index 000000000..c0b6a2490
--- /dev/null
+++ b/test/others/action-script/.gitignore
@@ -0,0 +1 @@
+img-dir-*
diff --git a/test/others/action-script/Makefile b/test/others/action-script/Makefile
new file mode 100644
index 000000000..f1ce191db
--- /dev/null
+++ b/test/others/action-script/Makefile
@@ -0,0 +1,5 @@
+run:
+	@make -C .. loop
+	./run.sh
+
+.PHONY: run
diff --git a/test/others/action-script/action-script.sh b/test/others/action-script/action-script.sh
new file mode 100755
index 000000000..aba8292c0
--- /dev/null
+++ b/test/others/action-script/action-script.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+touch action-hook-"$CRTOOLS_SCRIPT_ACTION"
diff --git a/test/others/action-script/run.sh b/test/others/action-script/run.sh
new file mode 100755
index 000000000..a82fccf35
--- /dev/null
+++ b/test/others/action-script/run.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -ebm
+
+# shellcheck source=test/others/env.sh
+source ../env.sh || exit 1
+
+SELFDIR="$(dirname "$(readlink -f "$0")")"
+SCRIPT="$SELFDIR/action-script.sh"
+IMGDIR="$SELFDIR/img-dir-$$"
+
+rm -rf "$IMGDIR"
+mkdir "$IMGDIR"
+
+trap "cleanup" QUIT TERM INT HUP EXIT
+
+# shellcheck disable=SC2317
+# https://github.com/koalaman/shellcheck/issues/2660
+function cleanup()
+{
+	if [[ -n "$PID" ]]; then
+		kill -9 "$PID"
+	fi
+}
+
+PID=$(../loop)
+if ! $CRIU dump -v4 -o dump.log -t "$PID" -D "$IMGDIR" --action-script "$SCRIPT"; then
+	echo "Failed to checkpoint process $PID"
+	cat dump.log
+	kill -9 "$PID"
+	exit 1
+fi
+
+if ! $CRIU restore -v4 -o restore.log -D "$IMGDIR" -d --pidfile test.pidfile --action-script "$SCRIPT"; then
+	echo "CRIU restore failed"
+	echo FAIL
+	exit 1
+fi
+
+PID=$(cat "$IMGDIR"/test.pidfile)
+
+found_missing_file=false
+hooks=("pre-dump" "post-dump" "pre-restore" "pre-resume" "post-restore" "post-resume")
+
+for hook in "${hooks[@]}"
+do
+	if [ ! -e "$IMGDIR/action-hook-$hook" ]; then
+		echo "ERROR: action-hook-$hook does not exist"
+		found_missing_file=true
+	fi
+done
+
+if [ "$found_missing_file" = true ]; then
+	exit 1
+fi
+
+echo PASS
+
+rm -rf "$IMGDIR"
+exit 0

From badf8060c6f9b1e8212df9bfcd2a0c2ecf3fc299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 24 Aug 2023 21:20:01 +0200
Subject: [PATCH 1387/1854] proc_parse: Log smaps entry while dumping VMA.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Help debugging problems with restoring custom VMAs.

From: Michał Cłapiński <mclapinski@google.com>
Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/proc_parse.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index bd6c3dcbc..d113a21b8 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -841,6 +841,7 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t du
 			goto err;
 		}
 
+		pr_debug("Handling VMA with the following smaps entry: %s\n", str);
 		if (handle_vma(pid, vma_area, str + path_off, map_files_dir, &vfi, &prev_vfi, &vm_file_fd))
 			goto err;
 

From d5284313f581dec646b271da44709c62c058224c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 24 Aug 2023 20:54:20 +0200
Subject: [PATCH 1388/1854] kerndat: Make errors from clone3() check more
 precise.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/kerndat.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 55a1e2bcd..e9777867d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1417,17 +1417,20 @@ static bool kerndat_has_clone3_set_tid(void)
 	 */
 	pid = syscall(__NR_clone3, &args, sizeof(args));
 
-	if (pid == -1 && (errno == ENOSYS || errno == E2BIG)) {
-		kdat.has_clone3_set_tid = false;
-		return 0;
-	}
-	if (pid == -1 && errno == EINVAL) {
-		kdat.has_clone3_set_tid = true;
-	} else {
-		pr_perror("Unexpected error from clone3");
+	if (pid != -1) {
+		pr_err("Unexpected success: clone3() returned %d\n", pid);
 		return -1;
 	}
 
+	if (errno == ENOSYS || errno == E2BIG)
+		return 0;
+
+	if (errno != EINVAL) {
+		pr_pwarn("Unexpected error from clone3");
+		return 0;
+	}
+
+	kdat.has_clone3_set_tid = true;
 	return 0;
 }
 

From 48056543709b17163f24711902d6a8753fe2d7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 28 Aug 2023 14:16:54 +0200
Subject: [PATCH 1389/1854] kerndat: check_pagemap: close(fd) on error path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Plug a fd leak when returning error from check_pagemap().
(Cosmetic, as the process will exit soon anyway.)

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/kerndat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index e9777867d..37b265d8d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -80,6 +80,7 @@ static int check_pagemap(void)
 		ret = pread(fd, &pfn, sizeof(pfn), PAGE_PFN((uintptr_t)&dummy_var) * sizeof(pfn));
 		if (ret != sizeof(pfn)) {
 			pr_perror("Can't read pagemap");
+			close(fd);
 			return -1;
 		}
 		/* The page can be swapped out by the time the read occurs,

From c9b2633ca3061062379fc6f5cfbb7ff5b70b102b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 27 Jul 2023 21:56:17 +0200
Subject: [PATCH 1390/1854] memfd: return original memfd fd for execveat()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If there is only a single RW opened fd for a memfd, it can be used
to pass it to execveat() with AT_EMPTY_PATH to have its contents
executed.  This currently works only for the original fd from
memfd_create().  For now we ignore processes that reopen the memfd's
rw and expect a particular executability trait of it.  (Note: for
security purposes recent kernels have SEAL_EXEC to make memfds
non-executable.)

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 criu/memfd.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/criu/memfd.c b/criu/memfd.c
index 5fe0aeae3..a770c66a1 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -46,6 +46,7 @@ struct memfd_restore_inode {
 	int fdstore_id;
 	unsigned int pending_seals;
 	MemfdInodeEntry *mie;
+	bool was_opened_rw;
 };
 
 static LIST_HEAD(memfd_inodes);
@@ -233,6 +234,7 @@ static int collect_one_memfd_inode(void *o, ProtobufCMessage *base, struct cr_im
 	mutex_init(&inode->lock);
 	inode->fdstore_id = -1;
 	inode->pending_seals = 0;
+	inode->was_opened_rw = false;
 
 	list_add_tail(&inode->list, &memfd_inodes);
 
@@ -339,6 +341,24 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 
 	/* Reopen the fd with original permissions */
 	flags = fdflags ? *fdflags : mfe->flags;
+
+	if (!mfi->inode->was_opened_rw && (flags & O_ACCMODE) == O_RDWR) {
+		/*
+		 * If there is only a single RW-opened fd for a memfd, it can
+		 * be used to pass it to execveat() with AT_EMPTY_PATH to have
+		 * its contents executed.  This currently works only for the
+		 * original fd from memfd_create() so return the original fd
+		 * once -- in case the caller expects to be the sole opener
+		 * and does execveat() from this memfd.
+		 */
+		if (!fcntl(fd, F_SETFL, flags)) {
+			mfi->inode->was_opened_rw = true;
+			return fd;
+		}
+
+		pr_pwarn("Can't change fd flags to %#o for memfd id=%d", flags, mfe->id);
+	}
+
 	/*
 	 * Ideally we should call compat version open() to not force the
 	 * O_LARGEFILE file flag with regular open(). It doesn't seem that
@@ -347,6 +367,8 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	_fd = __open_proc(PROC_SELF, 0, flags, "fd/%d", fd);
 	if (_fd < 0)
 		pr_perror("Can't reopen memfd id=%d", mfe->id);
+	else if ((flags & O_ACCMODE) == O_RDWR)
+		pr_warn("execveat(fd=%d, ..., AT_EMPTY_PATH) might fail after restore; memfd id=%d\n", _fd, mfe->id);
 
 	close(fd);
 	return _fd;

From b7a8bb08892248b7fb1df194543bd215bf928f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Miros=C5=82aw?= <emmir@google.com>
Date: Thu, 27 Jul 2023 17:33:42 +0200
Subject: [PATCH 1391/1854] zdtm: test execveat(memfd)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/Makefile     |   1 +
 test/zdtm/static/memfd04.c    | 105 ++++++++++++++++++++++++++++++++++
 test/zdtm/static/memfd04.desc |   1 +
 3 files changed, 107 insertions(+)
 create mode 100644 test/zdtm/static/memfd04.c
 create mode 100644 test/zdtm/static/memfd04.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index cd53932db..b7fb79643 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -258,6 +258,7 @@ TST_NOFILE	:=				\
 		memfd02				\
 		memfd02-hugetlb			\
 		memfd03				\
+		memfd04				\
 		shmemfd				\
 		shmemfd-priv			\
 		time				\
diff --git a/test/zdtm/static/memfd04.c b/test/zdtm/static/memfd04.c
new file mode 100644
index 000000000..aae7864c1
--- /dev/null
+++ b/test/zdtm/static/memfd04.c
@@ -0,0 +1,105 @@
+#include <linux/memfd.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "exec(memfd)";
+const char *test_author = "Michał Mirosław <emmir@google.com>";
+
+static int _memfd_create(const char *name, unsigned int flags)
+{
+	return syscall(SYS_memfd_create, name, flags);
+}
+
+static int _execveat(int dirfd, const char *pathname, const char *const argv[], const char *const envp[], int flags)
+{
+	return syscall(SYS_execveat, dirfd, pathname, argv, envp, flags);
+}
+
+static const char *const script_argv[] = { "true", NULL };
+static const char *const script_env[] = { NULL };
+
+static bool test_exec_fd(int fd)
+{
+	int err, pid, status;
+
+	err = fcntl(fd, F_GETFD);
+	if (err < 0) {
+		fail("fcntl(F_GETFD)");
+		return false;
+	}
+	if (err) {
+		errno = 0;
+		fail("F_GETFD for the memfd returned %d but expected 0", err);
+		return false;
+	}
+
+	pid = fork();
+	if (!pid) {
+		_execveat(fd, "", script_argv, script_env, AT_EMPTY_PATH);
+		err = errno;
+		pr_perror("execveat()");
+		_exit(err);
+	}
+
+	if (pid < 0) {
+		fail("fork()");
+		return false;
+	}
+
+	while (waitpid(pid, &status, 0) != pid) {
+		if (errno == EINTR)
+			continue;
+		fail("waitpid(child=%d)", pid);
+		return false;
+	}
+
+	if (status != 0) {
+		pr_err("child exited with status=%d\n", status);
+		return false;
+	}
+
+	return true;
+}
+
+static const char script[] = "#!/bin/true";
+static const size_t script_len = sizeof(script) - 1;
+
+int main(int argc, char *argv[])
+{
+	int fd;
+
+	test_init(argc, argv);
+
+	fd = _memfd_create("somename", 0);
+	if (fd < 0) {
+		fail("memfd_create()");
+		return 1;
+	}
+
+	if (write(fd, script, script_len) != script_len) {
+		fail("write(memfd)");
+		return 1;
+	}
+
+	if (!test_exec_fd(fd))
+		return 1;
+
+	test_msg("execveat(memfd) succeeded before C/R.\n");
+
+	test_daemon();
+	test_waitsig();
+
+	if (!test_exec_fd(fd))
+		return 1;
+
+	pass();
+
+	return 0;
+}
diff --git a/test/zdtm/static/memfd04.desc b/test/zdtm/static/memfd04.desc
new file mode 100644
index 000000000..bbf136d14
--- /dev/null
+++ b/test/zdtm/static/memfd04.desc
@@ -0,0 +1 @@
+{'deps': ['/bin/true']}

From 38bf7f42e5b733951dd63980db8296e65a045897 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 29 Aug 2023 11:09:59 +0800
Subject: [PATCH 1392/1854] CONTRIBUTING.md: don't mention ctags

Ctags is mentioned in the beginning of the "Edit the source code" which
is really confusing: Do you need ctags to edit CRIU code? - No. It is
just one helpful tool to browse the code, and we do not want to enforce
it. So, what is it doing in contribution guide? People who really need
it should be able to find it in Makefile or just write oneliner of their
own to collect tags...

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 CONTRIBUTING.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 87da08b34..3cd74128e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,12 +46,6 @@ This should create the `./criu/criu` executable.
 
 ## Edit the source code
 
-If you use ctags, you can generate the ctags file by running
-
-```
-        make tags
-```
-
 When you change the source code, please keep in mind the following code conventions:
 
 * we prefer tabs and indentations to be 8 characters width

From 08f286ed96a94e8e751891b3393bda547dadfa39 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 29 Aug 2023 12:10:59 +0800
Subject: [PATCH 1393/1854] CONTRIBUTING.md: improve coding-style related
 sections

This is highlight that code readability is the real goal of all the
coding-style rules. We should not do coding-style just for coding-style,
e.g. when clang-format suggests crazy formating we should not follow it
if we feel it is bad.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 CONTRIBUTING.md | 46 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3cd74128e..a70506bfb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,11 +48,16 @@ This should create the `./criu/criu` executable.
 
 When you change the source code, please keep in mind the following code conventions:
 
+* code is written to be read, so the code readability is the most important thing you need to have in mind when preparing patches
 * we prefer tabs and indentations to be 8 characters width
-* CRIU mostly follows [Linux kernel coding style](https://www.kernel.org/doc/Documentation/process/coding-style.rst), but we are less strict than the kernel community.
+* we prefer line length of 80 characters or less, more is allowed if it helps with code readability
+* CRIU mostly follows [Linux kernel coding style](https://www.kernel.org/doc/Documentation/process/coding-style.rst), but we are less strict than the kernel community
 
-Other conventions can be learned from the source code itself. In short, make sure your new code
-looks similar to what is already there.
+Other conventions can be learned from the source code itself. In short, make sure your new code looks similar to what is already there.
+
+## Automatic tools to fix coding-style
+
+Important: These tools are there to advise you, but should not be considered as a "source of truth", as tools also make nasty mistakes from time to time which can completely break code readability.
 
 The following command can be used to automatically run a code linter for Python files (flake8), Shell scripts (shellcheck),
 text spelling (codespell), and a number of CRIU-specific checks (usage of print macros and EOL whitespace for C files).
@@ -84,6 +89,41 @@ to check the last *N* commits for formatting errors, without applying the change
 Note that for pull requests, the "Run code linter" workflow runs these checks for all commits. If a clang-format error is detected
 we need to review the suggested changes and decide if they should be fixed before merging.
 
+Here are some bad examples of clang-format-ing:
+
+* if clang-format tries to force 120 characters and breaks readability - it is wrong:
+
+```
+@@ -58,8 +59,7 @@ static int register_membarriers(void)
+         }
+ 
+         if (!all_ok) {
+-                fail("can't register membarrier()s - tried %#x, kernel %#x",
+-                     barriers_registered, barriers_supported);
++                fail("can't register membarrier()s - tried %#x, kernel %#x", barriers_registered, barriers_supported);
+                 return -1;
+         }
+```
+
+* if clang-format breaks your beautiful readability friendly alignment in structures, comments or defines - it is wrong:
+
+```
+--- a/test/zdtm/static/membarrier.c
++++ b/test/zdtm/static/membarrier.c
+@@ -27,9 +27,10 @@ static const struct {
+        int register_cmd;
+        int execute_cmd;
+ } membarrier_cmds[] = {
+-       { "",           MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED,           MEMBARRIER_CMD_PRIVATE_EXPEDITED },
+-       { "_SYNC_CORE", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE },
+-       { "_RSEQ",      MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ,      MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ },
++       { "", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED, MEMBARRIER_CMD_PRIVATE_EXPEDITED },
++       { "_SYNC_CORE", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE,
++         MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE },
++       { "_RSEQ", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ, MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ },
+ };
+```
+
 ## Test your changes
 
 CRIU comes with an extensive test suite. To check whether your changes introduce any regressions, run

From d2a0d1fa642c6eba199f9e872860f669918eb034 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 24 Aug 2023 13:34:05 +0800
Subject: [PATCH 1394/1854] lint: don't fail workflow on indent fail

There are multiple cases where good human readable code block is
converted to an unreadable mess by clang-format, so we don't want to
rely on clang-format completely. Also there is no way, as far as I can
see, to make clang-format only fix what we want it to fix without
breaking something.

So let's just display hints inline where clang-format is unhappy. When
reviewer sees such a warning it's a good sign that something is broken
in coding-style around this warning.

We add special script which parses diff generated by indent and
generates warning for each hunk.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .github/workflows/lint.yml        | 18 ++++++++---------
 Makefile                          |  1 +
 scripts/github-indent-warnings.py | 33 +++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100755 scripts/github-indent-warnings.py

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e18f921f3..f52bce812 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -26,15 +26,15 @@ jobs:
       run: make lint
 
     - name: Run make indent
-      run: >
+      continue-on-error: true
+      run: |
         if [ -z "${{github.base_ref}}" ]; then
-          git fetch --deepen=1 &&
-          if ! make indent OPTS=--diff; then
-            exit 1
-          fi
+          git fetch --deepen=1
+          make indent
         else
-          git fetch origin ${{github.base_ref}} &&
-          if ! make indent OPTS=--diff BASE=origin/${{github.base_ref}}; then
-            exit 1
-          fi
+          git fetch origin ${{github.base_ref}}
+          make indent BASE=origin/${{github.base_ref}}
         fi
+    - name: Raise in-line make indent warnings
+      run: |
+        git diff | ./scripts/github-indent-warnings.py
diff --git a/Makefile b/Makefile
index 85407e299..4b3329473 100644
--- a/Makefile
+++ b/Makefile
@@ -432,6 +432,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg crit/setup.py
 	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
 	flake8 --config=scripts/flake8.cfg coredump/ coredump/coredump
+	flake8 --config=scripts/flake8.cfg scripts/github-indent-warnings.py
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
diff --git a/scripts/github-indent-warnings.py b/scripts/github-indent-warnings.py
new file mode 100755
index 000000000..04f82d6c1
--- /dev/null
+++ b/scripts/github-indent-warnings.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python3
+import sys
+import re
+
+re_file = r'^diff --git a/(\S\S*)\s.*$'
+re_line = r'^@@ -(\d\d*)\D.*@@.*$'
+
+if __name__ == '__main__':
+    if len(sys.argv) != 1 and len(sys.argv) != 2:
+        print(f'usage: {sys.argv[0]} <path/to/file>')
+        print(f'usage: <command> | {sys.argv[0]}')
+        exit(1)
+
+    input_file = sys.stdin.fileno()
+    if len(sys.argv) == 2:
+        input_file = sys.argv[1]
+
+    with open(input_file, 'r') as fi:
+        file_name = None
+        line_number = None
+        for line in fi:
+            file_matches = re.findall(re_file, line)
+            if len(file_matches) == 1:
+                file_name = file_matches[0]
+                continue
+
+            if file_name is None:
+                continue
+
+            line_matches = re.findall(re_line, line)
+            if len(line_matches) == 1:
+                line_number = int(line_matches[0]) + 3
+                print(f'::warning file={file_name},line={line_number}::clang-format: Possible coding style problem (https://github.com/checkpoint-restore/criu/blob/criu-dev/CONTRIBUTING.md#automatic-tools-to-fix-coding-style)')

From 862cb5c1cbb68923343f28aae2d76d33f338ec1e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 20 May 2023 08:45:50 +0100
Subject: [PATCH 1395/1854] vagrant: update to version 2.3.7

This patch also updated the download URL format

from
    https://releases.hashicorp.com/vagrant/2.3.7/vagrant_2.3.7_x86_64.deb

to
    https://releases.hashicorp.com/vagrant/2.3.7/vagrant_2.3.7-1_amd64.deb

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index ac4b5579d..e26b5d786 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -6,7 +6,7 @@
 set -e
 set -x
 
-VAGRANT_VERSION=2.2.19
+VAGRANT_VERSION=2.3.7
 FEDORA_VERSION=37
 FEDORA_BOX_VERSION=37.20221105.0
 
@@ -19,7 +19,7 @@ setup() {
 	# Tar up the git checkout to have vagrant rsync it to the VM
 	tar cf criu.tar ../../../criu
 	# Cirrus has problems with the following certificate.
-	wget --no-check-certificate https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_"$(uname -m)".deb -O /tmp/vagrant.deb && \
+	wget --no-check-certificate https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_"$(dpkg --print-architecture)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
 
 	./apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu \

From 32241b00de26b06a0d3ad6ce67c34564807593cc Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 20 May 2023 08:47:04 +0100
Subject: [PATCH 1396/1854] vagrant: run tests with fedora 38

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index e26b5d786..328903f38 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -7,8 +7,8 @@ set -e
 set -x
 
 VAGRANT_VERSION=2.3.7
-FEDORA_VERSION=37
-FEDORA_BOX_VERSION=37.20221105.0
+FEDORA_VERSION=38
+FEDORA_BOX_VERSION=38.20230413.1
 
 setup() {
 	if [ -n "$TRAVIS" ]; then

From 2ba8727822df306feaa520e432a605a621c4d516 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Fri, 8 Sep 2023 23:34:53 +0200
Subject: [PATCH 1397/1854] dump: use MEMBARRIER_CMD_GET_REGISTRATIONS when
 available

MEMBARRIER_CMD_GET_REGISTRATIONS can tell us whether or not the process used
MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED unlike the old probing method.

Falls back to the old method when MEMBARRIER_CMD_GET_REGISTRATIONS is
unavailable.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/include/kerndat.h  |  1 +
 criu/include/parasite.h |  2 ++
 criu/kerndat.c          | 23 +++++++++++++++++++++
 criu/parasite-syscall.c |  1 +
 criu/pie/parasite.c     | 46 +++++++++++++++++++++++++++++------------
 5 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 0b2f715f3..f5d409acb 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -85,6 +85,7 @@ struct kerndat_s {
 	bool has_ptrace_get_rseq_conf;
 	struct __ptrace_rseq_configuration libc_rseq_conf;
 	bool has_ipv6_freebind;
+	bool has_membarrier_get_registrations;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 5209b6da2..1244220f6 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -118,6 +118,8 @@ static inline int posix_timers_dump_size(int timer_n)
  */
 
 struct parasite_dump_misc {
+	bool has_membarrier_get_registrations; /* this is sent from criu to parasite. */
+
 	unsigned long brk;
 
 	u32 pid;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 37b265d8d..fef5a46c1 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -17,6 +17,7 @@
 #include <sys/inotify.h>
 #include <sched.h>
 #include <sys/mount.h>
+#include <linux/membarrier.h>
 
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 #include <nftables/libnftables.h>
@@ -1636,6 +1637,24 @@ static int kerndat_has_ipv6_freebind(void)
 	return ret;
 }
 
+#define MEMBARRIER_CMDBIT_GET_REGISTRATIONS 9
+
+static int kerndat_has_membarrier_get_registrations(void)
+{
+	int ret = syscall(__NR_membarrier, 1 << MEMBARRIER_CMDBIT_GET_REGISTRATIONS, 0);
+	if (ret < 0) {
+		if (errno != EINVAL) {
+			return ret;
+		}
+
+		kdat.has_membarrier_get_registrations = false;
+	} else {
+		kdat.has_membarrier_get_registrations = true;
+	}
+
+	return 0;
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the
@@ -1879,6 +1898,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_ipv6_freebind failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_membarrier_get_registrations()) {
+		pr_err("kerndat_has_membarrier_get_registrations failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index c08ed09b1..295e404ec 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -433,6 +433,7 @@ int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_mis
 	struct parasite_dump_misc *ma;
 
 	ma = compel_parasite_args(ctl, struct parasite_dump_misc);
+	ma->has_membarrier_get_registrations = kdat.has_membarrier_get_registrations;
 	if (compel_rpc_call_sync(PARASITE_CMD_DUMP_MISC, ctl) < 0)
 		return -1;
 
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index c0604903b..e151ed656 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -246,6 +246,27 @@ static int get_membarrier_registration_mask(int cmd_bit)
 #define MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED	      3
 #define MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_SYNC_CORE 5
 #define MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_RSEQ      7
+#define MEMBARRIER_CMDBIT_GET_REGISTRATIONS	      9
+
+static int dump_membarrier_compat(int *membarrier_registration_mask)
+{
+	int ret;
+
+	*membarrier_registration_mask = 0;
+	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED);
+	if (ret < 0)
+		return -1;
+	*membarrier_registration_mask |= ret;
+	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_SYNC_CORE);
+	if (ret < 0)
+		return -1;
+	*membarrier_registration_mask |= ret;
+	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_RSEQ);
+	if (ret < 0)
+		return -1;
+	*membarrier_registration_mask |= ret;
+	return 0;
+}
 
 static int dump_misc(struct parasite_dump_misc *args)
 {
@@ -261,19 +282,18 @@ static int dump_misc(struct parasite_dump_misc *args)
 	args->dumpable = sys_prctl(PR_GET_DUMPABLE, 0, 0, 0, 0);
 	args->thp_disabled = sys_prctl(PR_GET_THP_DISABLE, 0, 0, 0, 0);
 
-	args->membarrier_registration_mask = 0;
-	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED);
-	if (ret < 0)
-		return -1;
-	args->membarrier_registration_mask |= ret;
-	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_SYNC_CORE);
-	if (ret < 0)
-		return -1;
-	args->membarrier_registration_mask |= ret;
-	ret = get_membarrier_registration_mask(MEMBARRIER_CMDBIT_PRIVATE_EXPEDITED_RSEQ);
-	if (ret < 0)
-		return -1;
-	args->membarrier_registration_mask |= ret;
+	if (args->has_membarrier_get_registrations) {
+		ret = sys_membarrier(1 << MEMBARRIER_CMDBIT_GET_REGISTRATIONS, 0, 0);
+		if (ret < 0) {
+			pr_err("membarrier(1 << %d) returned %d\n", MEMBARRIER_CMDBIT_GET_REGISTRATIONS, ret);
+			return -1;
+		}
+		args->membarrier_registration_mask = ret;
+	} else {
+		ret = dump_membarrier_compat(&args->membarrier_registration_mask);
+		if (ret)
+			return ret;
+	}
 
 	ret = sys_prctl(PR_GET_CHILD_SUBREAPER, (unsigned long)&args->child_subreaper, 0, 0, 0);
 	if (ret)

From 8caf460b9c03ca00a6838695be9d996480337a9f Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Wed, 13 Sep 2023 18:42:58 +0200
Subject: [PATCH 1398/1854] zdtm: test MEMBARRIER_CMD_GLOBAL_EXPEDITED
 migration

Check membarrier registration both ways:
1. By issuing membarrier commands and checking if they succeed.
2. By issuing MEMBARRIER_CMD_GET_REGISTRATIONS.

The first way is needed for older kernels. The second way is needed to test
MEMBARRIER_CMD_GLOBAL_EXPEDITED.

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 test/zdtm/static/membarrier.c | 51 ++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/test/zdtm/static/membarrier.c b/test/zdtm/static/membarrier.c
index a04b36035..85d705ba7 100644
--- a/test/zdtm/static/membarrier.c
+++ b/test/zdtm/static/membarrier.c
@@ -8,14 +8,16 @@ const char *test_author = "Michał Mirosław <emmir@google.com>";
 
 /*
  * Define membarrier() CMDs to avoid depending on exact kernel header version.
- * FIXME: use MEMBARRIER_CMD_GET_REGISTRATIONS if supported by kernel.
  */
+#define MEMBARRIER_CMD_GLOBAL_EXPEDITED			    (1 << 1)
+#define MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED	    (1 << 2)
 #define MEMBARRIER_CMD_PRIVATE_EXPEDITED		    (1 << 3)
 #define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED	    (1 << 4)
 #define MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE	    (1 << 5)
 #define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE (1 << 6)
 #define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ		    (1 << 7)
 #define MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ	    (1 << 8)
+#define MEMBARRIER_CMD_GET_REGISTRATIONS		    (1 << 9)
 
 static int membarrier(int cmd, unsigned int flags, int cpu_id)
 {
@@ -27,9 +29,14 @@ static const struct {
 	int register_cmd;
 	int execute_cmd;
 } membarrier_cmds[] = {
-	{ "",           MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED,           MEMBARRIER_CMD_PRIVATE_EXPEDITED },
-	{ "_SYNC_CORE", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE, MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE },
-	{ "_RSEQ",      MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ,      MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ },
+	{ "GLOBAL_EXPEDITED",            MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED,
+		MEMBARRIER_CMD_GLOBAL_EXPEDITED },
+	{ "PRIVATE_EXPEDITED",           MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED,
+		MEMBARRIER_CMD_PRIVATE_EXPEDITED },
+	{ "PRIVATE_EXPEDITED_SYNC_CORE", MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_SYNC_CORE,
+		MEMBARRIER_CMD_PRIVATE_EXPEDITED_SYNC_CORE },
+	{ "PRIVATE_EXPEDITED_RSEQ",      MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ,
+		MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ },
 };
 static const int n_membarrier_cmds = sizeof(membarrier_cmds) / sizeof(*membarrier_cmds);
 
@@ -49,10 +56,10 @@ static int register_membarriers(void)
 		if (~barriers_supported & membarrier_cmds[i].register_cmd)
 			continue;
 
-		barriers_registered |= membarrier_cmds[i].execute_cmd;
+		barriers_registered |= membarrier_cmds[i].register_cmd;
 
 		if (membarrier(membarrier_cmds[i].register_cmd, 0, 0) < 0) {
-			pr_perror("membarrier(REGISTER_PRIVATE_EXPEDITED%s)", membarrier_cmds[i].name_suffix);
+			pr_perror("membarrier(REGISTER_%s)", membarrier_cmds[i].name_suffix);
 			all_ok = false;
 		}
 	}
@@ -71,15 +78,15 @@ static int register_membarriers(void)
 	return barriers_registered;
 }
 
-static bool check_membarriers(int barriers_registered)
+static bool check_membarriers_compat(int barriers_registered)
 {
 	bool all_ok = true;
 
 	for (int i = 0; i < n_membarrier_cmds; ++i) {
-		if (~barriers_registered & membarrier_cmds[i].execute_cmd)
+		if (~barriers_registered & membarrier_cmds[i].register_cmd)
 			continue;
 		if (membarrier(membarrier_cmds[i].execute_cmd, 0, 0) < 0) {
-			pr_perror("membarrier(PRIVATE_EXPEDITED%s)", membarrier_cmds[i].name_suffix);
+			pr_perror("membarrier(%s)", membarrier_cmds[i].name_suffix);
 			all_ok = false;
 		}
 	}
@@ -90,6 +97,32 @@ static bool check_membarriers(int barriers_registered)
 	return all_ok;
 }
 
+static bool check_membarriers_get_registrations(int barriers_registered)
+{
+	int ret = membarrier(MEMBARRIER_CMD_GET_REGISTRATIONS, 0, 0);
+	if (ret < 0) {
+		if (errno == EINVAL) {
+			test_msg("membarrier(MEMBARRIER_CMD_GET_REGISTRATIONS) not supported by running kernel");
+			return true;
+		}
+		fail("membarrier(MEMBARRIER_CMD_GET_REGISTRATIONS)");
+		return false;
+	}
+	if (ret != barriers_registered) {
+		fail("MEMBARRIER_CMD_GET_REGISTRATIONS check failed, expected: %d, got: %d",
+		     barriers_registered, ret);
+		return false;
+	}
+
+	return true;
+}
+
+static bool check_membarriers(int barriers_registered)
+{
+	return check_membarriers_compat(barriers_registered) &&
+	       check_membarriers_get_registrations(barriers_registered);
+}
+
 int main(int argc, char **argv)
 {
 	int barriers_registered;

From d06c9b5cdaa0f4b0f5824fdd307855acb81c7ab0 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Tue, 25 Apr 2023 09:39:28 -0400
Subject: [PATCH 1399/1854] criu/plugin: Add environment variable to cap size
 of buffers.

The amdgpu plugin would create a memory buffer at the size
of the largest VRAM bo (buffer object). On some systems, VRAM
size exceeds RAM size, so the largest bo might be larger than
the available memory.

Add an environment variable KFD_MAX_BUFFER_SIZE, which caps the
size of this buffer. By default, it is set to 0, and has no
effect. When active, any bo larger than its value will be
saved to/restored from file in multiple passes.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 Documentation/criu-amdgpu-plugin.txt |   9 +
 plugins/amdgpu/amdgpu_plugin.c       | 320 ++++++++++++++++-----------
 2 files changed, 196 insertions(+), 133 deletions(-)

diff --git a/Documentation/criu-amdgpu-plugin.txt b/Documentation/criu-amdgpu-plugin.txt
index 48a8e2f6d..35321a915 100644
--- a/Documentation/criu-amdgpu-plugin.txt
+++ b/Documentation/criu-amdgpu-plugin.txt
@@ -97,6 +97,15 @@ executing criu command.
     E.g:
     KFD_CAPABILITY_CHECK=1
 
+*KFD_MAX_BUFFER_SIZE*::
+    On some systems, VRAM sizes may exceed RAM sizes, and so buffers for dumping
+    and restoring VRAM may be unable to fit. Set to a nonzero value (in bytes)
+    to set a limit on the plugin's memory usage.
+    Default:0 (Disabled)
+
+    E.g:
+    KFD_MAX_BUFFER_SIZE="2G"
+
 
 AUTHOR
 ------
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 6397ecdb7..6a79f8b19 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -107,6 +107,8 @@ extern bool kfd_vram_size_check;
 extern bool kfd_numa_check;
 extern bool kfd_capability_check;
 
+size_t kfd_max_buffer_size;
+
 /**************************************************************************************************/
 
 int write_fp(FILE *fp, const void *buf, const size_t buf_len)
@@ -449,6 +451,48 @@ void getenv_bool(const char *var, bool *value)
 	pr_info("param: %s:%s\n", var, *value ? "Y" : "N");
 }
 
+void getenv_size_t(const char *var, size_t *value)
+{
+	char *value_str = getenv(var);
+	char *endp = value_str;
+	int sh = 0;
+	size_t size;
+
+	pr_info("Value str: %s\n", value_str);
+
+	if (value_str) {
+		size = (size_t)strtoul(value_str, &endp, 0);
+		if (errno || value_str == endp) {
+			pr_err("Ignoring invalid value for %s=%s, expecting a positive integer\n", var, value_str);
+			return;
+		}
+		switch (*endp) {
+		case 'k':
+		case 'K':
+			sh = 10;
+			break;
+		case 'M':
+			sh = 20;
+			break;
+		case 'G':
+			sh = 30;
+			break;
+		case '\0':
+			sh = 0;
+			break;
+		default:
+			pr_err("Ignoring invalid size suffix for %s=%s, expecting 'K'/k', 'M', or 'G'\n", var, value_str);
+			return;
+		}
+		if (SIZE_MAX >> sh < size) {
+			pr_err("Ignoring invalid value for %s=%s, exceeds SIZE_MAX\n", var, value_str);
+			return;
+		}
+		*value = size << sh;
+	}
+	pr_info("param: %s:0x%lx\n", var, *value);
+}
+
 int amdgpu_plugin_init(int stage)
 {
 	pr_info("initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
@@ -476,6 +520,9 @@ int amdgpu_plugin_init(int stage)
 		getenv_bool("KFD_NUMA_CHECK", &kfd_numa_check);
 		getenv_bool("KFD_CAPABILITY_CHECK", &kfd_capability_check);
 	}
+	kfd_max_buffer_size = 0;
+	getenv_size_t("KFD_MAX_BUFFER_SIZE", &kfd_max_buffer_size);
+
 	return 0;
 }
 
@@ -607,16 +654,14 @@ void free_and_unmap(uint64_t size, amdgpu_bo_handle h_bo, amdgpu_va_handle h_va,
 	amdgpu_bo_free(h_bo);
 }
 
-int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, void *userptr, int i, amdgpu_device_handle h_dev,
-		 uint64_t max_copy_size, enum sdma_op_type type)
+int sdma_copy_bo(struct kfd_criu_bo_bucket bo_bucket, FILE *storage_fp, void *buffer, size_t buffer_size,
+		 amdgpu_device_handle h_dev, uint64_t max_copy_size, enum sdma_op_type type)
 {
-	uint64_t size, gpu_addr_src, gpu_addr_dest, gpu_addr_ib;
-	uint64_t gpu_addr_src_orig, gpu_addr_dest_orig;
-	amdgpu_va_handle h_va_src, h_va_dest, h_va_ib;
-	amdgpu_bo_handle h_bo_src, h_bo_dest, h_bo_ib;
+	uint64_t size, src_bo_size, dst_bo_size, buffer_bo_size, bytes_remain, buffer_space_remain;
+	uint64_t gpu_addr_src, gpu_addr_dst, gpu_addr_ib, copy_src, copy_dst, copy_size;
+	amdgpu_va_handle h_va_src, h_va_dst, h_va_ib;
+	amdgpu_bo_handle h_bo_src, h_bo_dst, h_bo_ib;
 	struct amdgpu_bo_import_result res = { 0 };
-	uint64_t copy_size, bytes_remain, j = 0;
-	uint64_t n_packets;
 	struct amdgpu_cs_ib_info ib_info;
 	amdgpu_bo_list_handle h_bo_list;
 	struct amdgpu_cs_request cs_req;
@@ -625,102 +670,100 @@ int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, void *userptr, int i, am
 	uint32_t expired;
 	amdgpu_context_handle h_ctx;
 	uint32_t *ib = NULL;
-	int err, shared_fd;
+	int j, err, shared_fd, packets_per_buffer;
 
-	shared_fd = bo_buckets[i].dmabuf_fd;
-	size = bo_buckets[i].size;
+	shared_fd = bo_bucket.dmabuf_fd;
+	size = bo_bucket.size;
+	buffer_bo_size = min(size, buffer_size);
+	packets_per_buffer = ((buffer_bo_size - 1) / max_copy_size) + 1;
+	src_bo_size = (type == SDMA_OP_VRAM_WRITE) ? buffer_bo_size : size;
+	dst_bo_size = (type == SDMA_OP_VRAM_READ) ? buffer_bo_size : size;
 
 	plugin_log_msg("Enter %s\n", __func__);
 
 	/* prepare src buffer */
 	switch (type) {
 	case SDMA_OP_VRAM_WRITE:
-		err = amdgpu_create_bo_from_user_mem(h_dev, userptr, size, &h_bo_src);
+		err = amdgpu_create_bo_from_user_mem(h_dev, buffer, src_bo_size, &h_bo_src);
 		if (err) {
 			pr_perror("failed to create userptr for sdma");
 			return -EFAULT;
 		}
-
 		break;
-
 	case SDMA_OP_VRAM_READ:
 		err = amdgpu_bo_import(h_dev, amdgpu_bo_handle_type_dma_buf_fd, shared_fd, &res);
 		if (err) {
 			pr_perror("failed to import dmabuf handle from libdrm");
 			return -EFAULT;
 		}
-
 		h_bo_src = res.buf_handle;
 		break;
-
 	default:
 		pr_perror("Invalid sdma operation");
 		return -EINVAL;
 	}
 
-	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, size, 0x1000, 0, &gpu_addr_src, &h_va_src, 0);
+	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, src_bo_size, 0x1000, 0, &gpu_addr_src,
+				    &h_va_src, 0);
 	if (err) {
 		pr_perror("failed to alloc VA for src bo");
 		goto err_src_va;
 	}
-	err = amdgpu_bo_va_op(h_bo_src, 0, size, gpu_addr_src, 0, AMDGPU_VA_OP_MAP);
+	err = amdgpu_bo_va_op(h_bo_src, 0, src_bo_size, gpu_addr_src, 0, AMDGPU_VA_OP_MAP);
 	if (err) {
 		pr_perror("failed to GPU map the src BO");
 		goto err_src_bo_map;
 	}
-	plugin_log_msg("Source BO: GPU VA: %lx, size: %lx\n", gpu_addr_src, size);
+	plugin_log_msg("Source BO: GPU VA: %lx, size: %lx\n", gpu_addr_src, src_bo_size);
+
 	/* prepare dest buffer */
 	switch (type) {
 	case SDMA_OP_VRAM_WRITE:
 		err = amdgpu_bo_import(h_dev, amdgpu_bo_handle_type_dma_buf_fd, shared_fd, &res);
 		if (err) {
 			pr_perror("failed to import dmabuf handle from libdrm");
-			goto err_dest_bo_prep;
+			goto err_dst_bo_prep;
 		}
-
-		h_bo_dest = res.buf_handle;
+		h_bo_dst = res.buf_handle;
 		break;
-
 	case SDMA_OP_VRAM_READ:
-		err = amdgpu_create_bo_from_user_mem(h_dev, userptr, size, &h_bo_dest);
+		err = amdgpu_create_bo_from_user_mem(h_dev, buffer, dst_bo_size, &h_bo_dst);
 		if (err) {
 			pr_perror("failed to create userptr for sdma");
-			goto err_dest_bo_prep;
+			goto err_dst_bo_prep;
 		}
 		break;
-
 	default:
 		pr_perror("Invalid sdma operation");
-		goto err_dest_bo_prep;
+		goto err_dst_bo_prep;
 	}
 
-	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, size, 0x1000, 0, &gpu_addr_dest, &h_va_dest, 0);
+	err = amdgpu_va_range_alloc(h_dev, amdgpu_gpu_va_range_general, dst_bo_size, 0x1000, 0, &gpu_addr_dst,
+				    &h_va_dst, 0);
 	if (err) {
 		pr_perror("failed to alloc VA for dest bo");
-		goto err_dest_va;
+		goto err_dst_va;
 	}
-	err = amdgpu_bo_va_op(h_bo_dest, 0, size, gpu_addr_dest, 0, AMDGPU_VA_OP_MAP);
+	err = amdgpu_bo_va_op(h_bo_dst, 0, dst_bo_size, gpu_addr_dst, 0, AMDGPU_VA_OP_MAP);
 	if (err) {
 		pr_perror("failed to GPU map the dest BO");
-		goto err_dest_bo_map;
+		goto err_dst_bo_map;
 	}
-	plugin_log_msg("Dest BO: GPU VA: %lx, size: %lx\n", gpu_addr_dest, size);
+	plugin_log_msg("Dest BO: GPU VA: %lx, size: %lx\n", gpu_addr_dst, dst_bo_size);
 
-	n_packets = (size + max_copy_size) / max_copy_size;
 	/* prepare ring buffer/indirect buffer for command submission
 	 * each copy packet is 7 dwords so we need to alloc 28x size for ib
 	 */
-	err = alloc_and_map(h_dev, n_packets * 28, AMDGPU_GEM_DOMAIN_GTT, &h_bo_ib, &h_va_ib, &gpu_addr_ib,
+	err = alloc_and_map(h_dev, packets_per_buffer * 28, AMDGPU_GEM_DOMAIN_GTT, &h_bo_ib, &h_va_ib, &gpu_addr_ib,
 			    (void **)&ib);
 	if (err) {
 		pr_perror("failed to allocate and map ib/rb");
 		goto err_ib_gpu_alloc;
 	}
-
-	plugin_log_msg("Indirect BO: GPU VA: %lx, size: %lx\n", gpu_addr_ib, n_packets * 28);
+	plugin_log_msg("Indirect BO: GPU VA: %lx, size: %lx\n", gpu_addr_ib, packets_per_buffer * 28);
 
 	resources[0] = h_bo_src;
-	resources[1] = h_bo_dest;
+	resources[1] = h_bo_dst;
 	resources[2] = h_bo_ib;
 	err = amdgpu_bo_list_create(h_dev, 3, resources, NULL, &h_bo_list);
 	if (err) {
@@ -728,103 +771,122 @@ int sdma_copy_bo(struct kfd_criu_bo_bucket *bo_buckets, void *userptr, int i, am
 		goto err_bo_list;
 	}
 
-	memset(&cs_req, 0, sizeof(cs_req));
-	memset(&fence, 0, sizeof(fence));
-	memset(ib, 0, n_packets * 28);
-
-	plugin_log_msg("setting up sdma packets for command submission\n");
 	bytes_remain = size;
-	gpu_addr_src_orig = gpu_addr_src;
-	gpu_addr_dest_orig = gpu_addr_dest;
+	if (type == SDMA_OP_VRAM_WRITE)
+		copy_dst = gpu_addr_dst;
+	else
+		copy_src = gpu_addr_src;
+
 	while (bytes_remain > 0) {
-		copy_size = min(bytes_remain, max_copy_size);
+		memset(&cs_req, 0, sizeof(cs_req));
+		memset(&fence, 0, sizeof(fence));
+		memset(ib, 0, packets_per_buffer * 28);
 
-		ib[j++] = SDMA_PACKET(SDMA_OPCODE_COPY, SDMA_COPY_SUB_OPCODE_LINEAR, 0);
-		ib[j++] = copy_size;
-		ib[j++] = 0;
-		ib[j++] = 0xffffffff & gpu_addr_src;
-		ib[j++] = (0xffffffff00000000 & gpu_addr_src) >> 32;
-		ib[j++] = 0xffffffff & gpu_addr_dest;
-		ib[j++] = (0xffffffff00000000 & gpu_addr_dest) >> 32;
+		if (type == SDMA_OP_VRAM_WRITE) {
+			err = read_fp(storage_fp, buffer, min(bytes_remain, buffer_bo_size));
+			if (err) {
+				pr_perror("failed to read from storage");
+				goto err_bo_list;
+			}
+		}
 
-		gpu_addr_src += copy_size;
-		gpu_addr_dest += copy_size;
-		bytes_remain -= copy_size;
-	}
+		buffer_space_remain = buffer_bo_size;
+		if (type == SDMA_OP_VRAM_WRITE)
+			copy_src = gpu_addr_src;
+		else
+			copy_dst = gpu_addr_dst;
+		j = 0;
 
-	gpu_addr_src = gpu_addr_src_orig;
-	gpu_addr_dest = gpu_addr_dest_orig;
-	plugin_log_msg("pad the IB to align on 8 dw boundary\n");
-	/* pad the IB to the required number of dw with SDMA_NOP */
-	while (j & 7)
-		ib[j++] = SDMA_NOP;
+		while (bytes_remain > 0 && buffer_space_remain > 0) {
+			copy_size = min(min(bytes_remain, max_copy_size), buffer_space_remain);
 
-	ib_info.ib_mc_address = gpu_addr_ib;
-	ib_info.size = j;
+			ib[j++] = SDMA_PACKET(SDMA_OPCODE_COPY, SDMA_COPY_SUB_OPCODE_LINEAR, 0);
+			ib[j++] = copy_size;
+			ib[j++] = 0;
+			ib[j++] = 0xffffffff & copy_src;
+			ib[j++] = (0xffffffff00000000 & copy_src) >> 32;
+			ib[j++] = 0xffffffff & copy_dst;
+			ib[j++] = (0xffffffff00000000 & copy_dst) >> 32;
 
-	cs_req.ip_type = AMDGPU_HW_IP_DMA;
-	/* possible future optimization: may use other rings, info available in
-	 * amdgpu_query_hw_ip_info()
-	 */
-	cs_req.ring = 0;
-	cs_req.number_of_ibs = 1;
-	cs_req.ibs = &ib_info;
-	cs_req.resources = h_bo_list;
-	cs_req.fence_info.handle = NULL;
+			copy_src += copy_size;
+			copy_dst += copy_size;
+			bytes_remain -= copy_size;
+			buffer_space_remain -= copy_size;
+		}
+		/* pad the IB to the required number of dw with SDMA_NOP */
+		while (j & 7)
+			ib[j++] = SDMA_NOP;
 
-	plugin_log_msg("create the context\n");
-	err = amdgpu_cs_ctx_create(h_dev, &h_ctx);
-	if (err) {
-		pr_perror("failed to create context for SDMA command submission");
-		goto err_ctx;
-	}
+		ib_info.ib_mc_address = gpu_addr_ib;
+		ib_info.size = j;
 
-	plugin_log_msg("initiate sdma command submission\n");
-	err = amdgpu_cs_submit(h_ctx, 0, &cs_req, 1);
-	if (err) {
-		pr_perror("failed to submit command for SDMA IB");
-		goto err_cs_submit_ib;
-	}
+		cs_req.ip_type = AMDGPU_HW_IP_DMA;
+		/* possible future optimization: may use other rings, info available in
+		 * amdgpu_query_hw_ip_info()
+		 */
+		cs_req.ring = 0;
+		cs_req.number_of_ibs = 1;
+		cs_req.ibs = &ib_info;
+		cs_req.resources = h_bo_list;
+		cs_req.fence_info.handle = NULL;
 
-	fence.context = h_ctx;
-	fence.ip_type = AMDGPU_HW_IP_DMA;
-	fence.ip_instance = 0;
-	fence.ring = 0;
-	fence.fence = cs_req.seq_no;
-	err = amdgpu_cs_query_fence_status(&fence, AMDGPU_TIMEOUT_INFINITE, 0, &expired);
-	if (err) {
-		pr_perror("failed to query fence status");
-		goto err_cs_submit_ib;
-	}
+		err = amdgpu_cs_ctx_create(h_dev, &h_ctx);
+		if (err) {
+			pr_perror("failed to create context for SDMA command submission");
+			goto err_ctx;
+		}
+		err = amdgpu_cs_submit(h_ctx, 0, &cs_req, 1);
+		if (err) {
+			pr_perror("failed to submit command for SDMA IB");
+			goto err_cs_submit_ib;
+		}
 
-	if (!expired) {
-		pr_err("IB execution did not complete\n");
-		err = -EBUSY;
-		goto err_cs_submit_ib;
-	}
+		fence.context = h_ctx;
+		fence.ip_type = AMDGPU_HW_IP_DMA;
+		fence.ip_instance = 0;
+		fence.ring = 0;
+		fence.fence = cs_req.seq_no;
+		err = amdgpu_cs_query_fence_status(&fence, AMDGPU_TIMEOUT_INFINITE, 0, &expired);
+		if (err) {
+			pr_perror("failed to query fence status");
+			goto err_cs_submit_ib;
+		}
+		if (!expired) {
+			pr_err("IB execution did not complete\n");
+			err = -EBUSY;
+			goto err_cs_submit_ib;
+		}
 
-	plugin_log_msg("done querying fence status\n");
+		if (type == SDMA_OP_VRAM_READ) {
+			err = write_fp(storage_fp, buffer, buffer_bo_size - buffer_space_remain);
+			if (err) {
+				pr_perror("failed to write out to storage");
+				goto err_cs_submit_ib;
+			}
+		}
 
 err_cs_submit_ib:
-	amdgpu_cs_ctx_free(h_ctx);
+		amdgpu_cs_ctx_free(h_ctx);
+		if (err)
+			break;
+	}
 err_ctx:
 	amdgpu_bo_list_destroy(h_bo_list);
 err_bo_list:
-	free_and_unmap(n_packets * 28, h_bo_ib, h_va_ib, gpu_addr_ib, ib);
+	free_and_unmap(packets_per_buffer * 28, h_bo_ib, h_va_ib, gpu_addr_ib, ib);
 err_ib_gpu_alloc:
-	err = amdgpu_bo_va_op(h_bo_dest, 0, size, gpu_addr_dest, 0, AMDGPU_VA_OP_UNMAP);
+	err = amdgpu_bo_va_op(h_bo_dst, 0, size, gpu_addr_dst, 0, AMDGPU_VA_OP_UNMAP);
 	if (err)
-		pr_perror("failed to GPU unmap the dest BO %lx, size = %lx", gpu_addr_dest, size);
-err_dest_bo_map:
-	err = amdgpu_va_range_free(h_va_dest);
+		pr_perror("failed to GPU unmap the dest BO %lx, size = %lx", gpu_addr_dst, size);
+err_dst_bo_map:
+	err = amdgpu_va_range_free(h_va_dst);
 	if (err)
 		pr_perror("dest range free failed");
-err_dest_va:
-	err = amdgpu_bo_free(h_bo_dest);
+err_dst_va:
+	err = amdgpu_bo_free(h_bo_dst);
 	if (err)
 		pr_perror("dest bo free failed");
-
-err_dest_bo_prep:
+err_dst_bo_prep:
 	err = amdgpu_bo_va_op(h_bo_src, 0, size, gpu_addr_src, 0, AMDGPU_VA_OP_UNMAP);
 	if (err)
 		pr_perror("failed to GPU unmap the src BO %lx, size = %lx", gpu_addr_src, size);
@@ -836,7 +898,6 @@ err_src_va:
 	err = amdgpu_bo_free(h_bo_src);
 	if (err)
 		pr_perror("src bo free failed");
-
 	plugin_log_msg("Leaving sdma_copy_bo, err = %d\n", err);
 	return err;
 }
@@ -845,10 +906,9 @@ void *dump_bo_contents(void *_thread_data)
 {
 	struct thread_data *thread_data = (struct thread_data *)_thread_data;
 	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
-	BoEntry **bo_info = thread_data->bo_entries;
 	struct amdgpu_gpu_info gpu_info = { 0 };
 	amdgpu_device_handle h_dev;
-	size_t max_bo_size = 0, image_size = 0;
+	size_t max_bo_size = 0, image_size = 0, buffer_size;
 	uint64_t max_copy_size;
 	uint32_t major, minor;
 	int num_bos = 0;
@@ -884,10 +944,11 @@ void *dump_bo_contents(void *_thread_data)
 		}
 	}
 
-	/* Allocate buffer to fit biggest BO */
-	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), max_bo_size);
+	buffer_size = kfd_max_buffer_size > 0 ? min(kfd_max_buffer_size, max_bo_size) : max_bo_size;
+
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), buffer_size);
 	if (!buffer) {
-		pr_perror("Failed to alloc aligned memory");
+		pr_perror("Failed to alloc aligned memory. Consider setting KFD_MAX_BUFFER_SIZE.");
 		ret = -ENOMEM;
 		goto exit;
 	}
@@ -910,15 +971,12 @@ void *dump_bo_contents(void *_thread_data)
 		num_bos++;
 
 		/* perform sDMA based vram copy */
-		ret = sdma_copy_bo(bo_buckets, buffer, i, h_dev, max_copy_size, SDMA_OP_VRAM_READ);
+		ret = sdma_copy_bo(bo_buckets[i], bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
+				   SDMA_OP_VRAM_READ);
 		if (ret) {
 			pr_err("Failed to drain the BO using sDMA: bo_buckets[%d]\n", i);
 			break;
 		}
-		plugin_log_msg("** Successfully drained the BO using sDMA: bo_buckets[%d] **\n", i);
-		ret = write_fp(bo_contents_fp, buffer, bo_info[i]->size);
-		if (ret)
-			break;
 	}
 
 exit:
@@ -939,8 +997,7 @@ void *restore_bo_contents(void *_thread_data)
 {
 	struct thread_data *thread_data = (struct thread_data *)_thread_data;
 	struct kfd_criu_bo_bucket *bo_buckets = thread_data->bo_buckets;
-	size_t image_size = 0, total_bo_size = 0, max_bo_size = 0;
-	BoEntry **bo_info = thread_data->bo_entries;
+	size_t image_size = 0, total_bo_size = 0, max_bo_size = 0, buffer_size;
 	struct amdgpu_gpu_info gpu_info = { 0 };
 	amdgpu_device_handle h_dev;
 	uint64_t max_copy_size;
@@ -977,7 +1034,6 @@ void *restore_bo_contents(void *_thread_data)
 		goto exit;
 	}
 
-	/* Allocate buffer to fit biggest BO */
 	for (i = 0; i < thread_data->num_of_bos; i++) {
 		if (bo_buckets[i].gpu_id == thread_data->gpu_id &&
 		    (bo_buckets[i].alloc_flags & (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT))) {
@@ -995,10 +1051,11 @@ void *restore_bo_contents(void *_thread_data)
 		goto exit;
 	}
 
-	/* Allocate buffer to fit biggest BO */
-	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), max_bo_size);
+	buffer_size = kfd_max_buffer_size > 0 ? min(kfd_max_buffer_size, max_bo_size) : max_bo_size;
+
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), buffer_size);
 	if (!buffer) {
-		pr_perror("Failed to alloc aligned memory");
+		pr_perror("Failed to alloc aligned memory. Consider setting KFD_MAX_BUFFER_SIZE.");
 		ret = -ENOMEM;
 		goto exit;
 	}
@@ -1012,11 +1069,8 @@ void *restore_bo_contents(void *_thread_data)
 
 		num_bos++;
 
-		ret = read_fp(bo_contents_fp, buffer, bo_info[i]->size);
-		if (ret)
-			goto exit;
-
-		ret = sdma_copy_bo(bo_buckets, buffer, i, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+		ret = sdma_copy_bo(bo_buckets[i], bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
+				   SDMA_OP_VRAM_WRITE);
 		if (ret) {
 			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
 			break;

From 59fcfa80d8d393fd19988ccc42f9c7738f787ce7 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Thu, 31 Aug 2023 14:37:49 -0400
Subject: [PATCH 1400/1854] compel: Add support for ppc64le scv syscalls

Power ISA 3.0 added a new syscall instruction. Kernel 5.9 added
corresponding support.

Add CRIU support to recognize the new instruction and kernel ABI changes
to properly dump and restore threads executing in syscalls. Without this
change threads executing in syscalls using the scv instruction will not
be restored to re-execute the syscall, they will be restored to execute
the following instruction and will return unexpected error codes
(ERESTARTSYS, etc) to user code.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 compel/arch/ppc64/src/lib/infect.c | 68 +++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index db999ce37..1603ac92e 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -11,6 +11,7 @@
 #include "log.h"
 #include "common/bug.h"
 #include "common/page.h"
+#include "common/err.h"
 #include "infect.h"
 #include "infect-priv.h"
 
@@ -303,34 +304,59 @@ out_free:
 	return -1; /* still failing the checkpoint */
 }
 
-static int __get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
-{
-	pr_info("Dumping GP/FPU registers for %d\n", pid);
+/*
+ * This is inspired by kernel function check_syscall_restart in
+ * arch/powerpc/kernel/signal.c
+ */
 
-	/*
-	 * This is inspired by kernel function check_syscall_restart in
-	 * arch/powerpc/kernel/signal.c
-	 */
 #ifndef TRAP
 #define TRAP(r) ((r).trap & ~0xF)
 #endif
 
-	if (TRAP(*regs) == 0x0C00 && regs->ccr & 0x10000000) {
-		/* Restart the system call */
-		switch (regs->gpr[3]) {
-		case ERESTARTNOHAND:
-		case ERESTARTSYS:
-		case ERESTARTNOINTR:
-			regs->gpr[3] = regs->orig_gpr3;
-			regs->nip -= 4;
-			break;
-		case ERESTART_RESTARTBLOCK:
-			pr_warn("Will restore %d with interrupted system call\n", pid);
-			regs->gpr[3] = EINTR;
-			break;
-		}
+static bool trap_is_scv(user_regs_struct_t *regs)
+{
+	return TRAP(*regs) == 0x3000;
+}
+
+static bool trap_is_syscall(user_regs_struct_t *regs)
+{
+	return trap_is_scv(regs) || TRAP(*regs) == 0x0C00;
+}
+
+static void handle_syscall(pid_t pid, user_regs_struct_t *regs)
+{
+	unsigned long ret = regs->gpr[3];
+
+	if (trap_is_scv(regs)) {
+		if (!IS_ERR_VALUE(ret))
+			return;
+		ret = -ret;
+	} else if (!(regs->ccr & 0x10000000)) {
+		return;
 	}
 
+	/* Restart or interrupt the system call */
+	switch (ret) {
+	case ERESTARTNOHAND:
+	case ERESTARTSYS:
+	case ERESTARTNOINTR:
+		regs->gpr[3] = regs->orig_gpr3;
+		regs->nip -= 4;
+		break;
+	case ERESTART_RESTARTBLOCK:
+		pr_warn("Will restore %d with interrupted system call\n", pid);
+		regs->gpr[3] = trap_is_scv(regs) ? -EINTR : EINTR;
+		break;
+	}
+}
+
+static int __get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+{
+	pr_info("Dumping GP/FPU registers for %d\n", pid);
+
+	if (trap_is_syscall(regs))
+		handle_syscall(pid, regs);
+
 	/* Resetting trap since we are now coming from user space. */
 	regs->trap = 0;
 

From 8adefc90d2d9baffc114ff6601e953d071d7c970 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 25 Apr 2023 16:20:41 +0100
Subject: [PATCH 1401/1854] lib/pycriu: generate version.py

The version of CRIU is specified in the Makefile.versions file.
This patch generates '__varion__' value for the pycriu module.
This value can be used by crit to implement `--version`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/py/.gitignore  | 1 +
 lib/py/Makefile    | 7 +++++--
 lib/py/__init__.py | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/py/.gitignore b/lib/py/.gitignore
index d3090fca3..fba7e3864 100644
--- a/lib/py/.gitignore
+++ b/lib/py/.gitignore
@@ -1,2 +1,3 @@
 *_pb2.py
 *.pyc
+version.py
diff --git a/lib/py/Makefile b/lib/py/Makefile
index 691b6bdd3..5ce9bc8f7 100644
--- a/lib/py/Makefile
+++ b/lib/py/Makefile
@@ -1,4 +1,4 @@
-all-y	+= libpy-images rpc_pb2.py
+all-y	+= libpy-images rpc_pb2.py version.py
 
 $(obj)/images/Makefile: ;
 $(obj)/images/%: .FORCE
@@ -11,7 +11,10 @@ libpy-images:
 rpc_pb2.py:
 	$(Q) protoc -I=images/ --python_out=$(obj) images/$(@:_pb2.py=.proto)
 
-cleanup-y	+= $(addprefix $(obj)/,rpc_pb2.py *.pyc)
+version.py:
+	$(Q) echo "__version__ = '${CRIU_VERSION}'" > $(obj)/$@
+
+cleanup-y	+= $(addprefix $(obj)/,rpc_pb2.py *.pyc version.py)
 
 clean-lib-py:
 	$(Q) $(MAKE) $(build)=$(obj)/images clean
diff --git a/lib/py/__init__.py b/lib/py/__init__.py
index 96b3e9526..44f66ffa4 100644
--- a/lib/py/__init__.py
+++ b/lib/py/__init__.py
@@ -1,3 +1,4 @@
 from . import rpc_pb2 as rpc
 from . import images
 from .criu import *
+from .version import __version__

From 61d9cf6f906a5da9b44bff684675d7a41f45be47 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 25 Apr 2023 16:38:44 +0100
Subject: [PATCH 1402/1854] crit/setup.py: use __version__ from pycriu

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 crit/setup.py | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/crit/setup.py b/crit/setup.py
index 1aaa73a13..2f584678f 100644
--- a/crit/setup.py
+++ b/crit/setup.py
@@ -1,23 +1,9 @@
-import os
 from setuptools import setup, find_packages
-
-
-def get_version():
-    version = '0.0.1'
-    env = os.environ
-    if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
-        version = '{}.{}'.format(
-            env['CRIU_VERSION_MAJOR'],
-            env['CRIU_VERSION_MINOR']
-        )
-        if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
-            version += '.' + env['CRIU_VERSION_SUBLEVEL']
-    return version
-
+import pycriu
 
 setup(
     name='crit',
-    version=get_version(),
+    version=pycriu.__version__,
     description='CRiu Image Tool',
     author='CRIU team',
     author_email='criu@openvz.org',

From 7a2910f89775a68acf3961151fc85e55da5fb500 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 25 Apr 2023 16:41:24 +0100
Subject: [PATCH 1403/1854] py/cli: add --version option

This patch implements the '--version' for the crit tool.

$ crit --version
3.17

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/py/cli.py            | 1 +
 test/others/crit/test.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index 594035d27..a3a0870f8 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -364,6 +364,7 @@ def main():
     desc = 'CRiu Image Tool'
     parser = argparse.ArgumentParser(
         description=desc, formatter_class=argparse.RawTextHelpFormatter)
+    parser.add_argument('--version', action='version', version=pycriu.__version__)
 
     subparsers = parser.add_subparsers(
         help='Use crit CMD --help for command-specific help')
diff --git a/test/others/crit/test.sh b/test/others/crit/test.sh
index 105aac72b..2698bbd3c 100755
--- a/test/others/crit/test.sh
+++ b/test/others/crit/test.sh
@@ -101,6 +101,8 @@ function run_test2 {
 	${CRIT} x ./ rss || exit 1
 }
 
+${CRIT} --version
+
 gen_imgs
 run_test1
 run_test2

From 5e544dc4490b6b3ecb04df8d7902061d41c6caca Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 23 Sep 2023 08:50:05 -0700
Subject: [PATCH 1404/1854] ci: stop testing ubuntu overlayfs

They break it with each kernel rebase. More details are here:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257

Last time, it was fixed a few month ago and it has been broken again in
5.15.0-1046-azure.

Let's bind-mount the CRIU directory into a test container to make it
independent of a container file system.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 scripts/ci/Makefile | 35 +++++------------------------------
 scripts/ci/asan.sh  |  3 +++
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index ce844a17c..1caa1e423 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -20,14 +20,6 @@ export CONTAINER_RUNTIME
 
 alpine: ZDTM_OPTS=-x zdtm/static/binfmt_misc -x zdtm/static/sched_policy00
 
-define DOCKER_JSON
-{
-	"storage-driver": "devicemapper"
-}
-endef
-
-export DOCKER_JSON
-
 ifeq ($(GITHUB_ACTIONS),true)
 	# GitHub Actions does not give us a real TTY and errors out with
 	# 'the input device is not a TTY' if using '-t'
@@ -47,34 +39,20 @@ else
 endif
 
 ifeq ($(CONTAINER_RUNTIME),podman)
-	# Just as Docker needs to use devicemapper Podman needs vfs
-	# as graphdriver as overlayfs does not support all test cases
-	STORAGE_DRIVER := vfs
 	# Podman limits the number of processes in a container using cgroups.
 	# Disable it as it breaks the thread-bomb test
 	CONTAINER_OPTS += --pids-limit=0
 endif
 
-export STORAGE_DRIVER
-
-restart-docker:
-	if [ "$$UNAME" = "x86_64" ] && [ "$$CONTAINER_RUNTIME" = "docker" ]; then \
-		echo "$$DOCKER_JSON" > /etc/docker/daemon.json; \
-		cat /etc/docker/daemon.json; \
-		systemctl status docker; \
-		systemctl restart docker; \
-		systemctl status docker; \
-	fi
-
 export ZDTM_OPTS
 
-$(TARGETS): restart-docker
+$(TARGETS):
 	$(MAKE) -C ../build $@$(target-suffix)
-	$(CONTAINER_RUNTIME) run --env-file docker.env $(if $(ZDTM_OPTS),-e ZDTM_OPTS) $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
+	$(CONTAINER_RUNTIME) run --env-file docker.env -v `pwd`/../../:/criu $(if $(ZDTM_OPTS),-e ZDTM_OPTS) $(CONTAINER_OPTS) criu-$@ scripts/ci/run-ci-tests.sh
 
-fedora-asan: restart-docker
+fedora-asan:
 	$(MAKE) -C ../build $@$(target-suffix)
-	$(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTS)
+	$(CONTAINER_RUNTIME) run $(CONTAINER_OPTS) -v `pwd`/../../:/criu criu-$@ ./scripts/ci/asan.sh $(ZDTM_OPTS)
 
 docker-test:
 	./docker-test.sh
@@ -82,10 +60,7 @@ docker-test:
 podman-test:
 	./podman-test.sh
 
-# overlayfs behaves differently on Ubuntu and breaks CRIU
-# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1857257
-# Switch to devicemapper
-java-test: restart-docker
+java-test:
 	./java-test.sh
 
 setup-vagrant:
diff --git a/scripts/ci/asan.sh b/scripts/ci/asan.sh
index deeeca0b9..8b72fa5f1 100755
--- a/scripts/ci/asan.sh
+++ b/scripts/ci/asan.sh
@@ -4,6 +4,9 @@ set -x
 
 cat /proc/self/mountinfo
 
+time make ASAN=1 -j 4 V=1
+time make -j4 -C test/zdtm V=1
+
 chmod 0777 test
 chmod 0777 test/zdtm/transition/
 chmod 0777 test/zdtm/static

From 785d97a61943fe425b6f82226f55c7d0114605c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Mon, 29 May 2023 17:22:16 +0200
Subject: [PATCH 1405/1854] zdtm: If ignoring kernel taint, also ignore taint
 changes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

At least in Google's VM environment, the kernel taints are unrelated to CRIU
runs.  Don't fail tests if taints change, if kernel taints are ignored.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index c6e852dc1..bc14e3f73 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2003,12 +2003,20 @@ class Launcher:
                   file=self.__file_report)
             print(u"# ", file=self.__file_report)
             print(u"1.." + str(nr_tests), file=self.__file_report)
-        with open("/proc/sys/kernel/tainted") as taintfd:
-            self.__taint = taintfd.read()
+        self.__taint = self.__read_kernel_tainted()
         if int(self.__taint, 0) != 0:
-            print("The kernel is tainted: %r" % self.__taint)
-            if not opts["ignore_taint"] and os.getenv("ZDTM_IGNORE_TAINT") != '1':
-                raise Exception("The kernel is tainted: %r" % self.__taint)
+            self.__report_kernel_taint("The kernel is tainted: %r" % self.__taint)
+
+    @staticmethod
+    def __read_kernel_tainted():
+        with open("/proc/sys/kernel/tainted") as taintfd:
+            return taintfd.read().strip()
+
+    @staticmethod
+    def __report_kernel_taint(msg):
+        print(msg)
+        if not opts["ignore_taint"] and os.getenv("ZDTM_IGNORE_TAINT") != "1":
+            raise Exception(msg)
 
     def __show_progress(self, msg):
         perc = int(self.__nr * 16 / self.__total)
@@ -2034,11 +2042,12 @@ class Launcher:
         if len(self.__subs) >= self.__max:
             self.wait()
 
-        with open("/proc/sys/kernel/tainted") as taintfd:
-            taint = taintfd.read()
+        taint = self.__read_kernel_tainted()
         if self.__taint != taint:
-            raise Exception("The kernel is tainted: %r (%r)" %
-                            (taint, self.__taint))
+            prev_taint = self.__taint
+            self.__taint = taint
+            self.__report_kernel_taint(
+                "The kernel is tainted: %r (was %r)" % (taint, prev_taint))
 
         '''
         The option --link-remap allows criu to hardlink open files back to the

From 131e464a0545fe241805b84aa8db5be2aaa06941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Tue, 30 May 2023 20:00:10 +0200
Subject: [PATCH 1406/1854] zdtm: cgroup04: Improve error messages.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make the errno values reported by cgroup04 always correct and showing
relevant parameters.
Constify constant strings, while at it.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/cgroup04.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/zdtm/static/cgroup04.c b/test/zdtm/static/cgroup04.c
index 8c40ffd6b..f586a0628 100644
--- a/test/zdtm/static/cgroup04.c
+++ b/test/zdtm/static/cgroup04.c
@@ -17,25 +17,25 @@ const char *test_author = "Tycho Andersen <tycho.andersen@canonical.com>";
 
 char *dirname;
 TEST_OPTION(dirname, string, "cgroup directory name", 1);
-static const char *cgname = "zdtmtst";
+static const char *const cgname = "zdtmtst";
 
 int mount_and_add(const char *controller, const char *path, const char *prop, const char *value)
 {
 	char aux[1024], paux[1024], subdir[1024];
 
 	if (mkdir(dirname, 0700) < 0 && errno != EEXIST) {
-		pr_perror("Can't make dir");
+		pr_perror("Can't make dir %s", dirname);
 		return -1;
 	}
 
 	sprintf(subdir, "%s/%s", dirname, controller);
 	if (mkdir(subdir, 0700) < 0) {
-		pr_perror("Can't make dir");
+		pr_perror("Can't make dir %s", subdir);
 		return -1;
 	}
 
 	if (mount("none", subdir, "cgroup", 0, controller)) {
-		pr_perror("Can't mount cgroups");
+		pr_perror("Can't mount cgroup controller %s at %s", controller, subdir);
 		goto err_rd;
 	}
 
@@ -52,7 +52,8 @@ int mount_and_add(const char *controller, const char *path, const char *prop, co
 		goto err_rs;
 
 	ssprintf(paux, "%s/%s/special_prop_check", subdir, path);
-	mkdir(paux, 0600);
+	if (mkdir(paux, 0600) < 0)
+		pr_perror("Can't make dir %s", paux);
 
 	return 0;
 err_rs:
@@ -74,11 +75,11 @@ bool checkval(char *path, char *val)
 	}
 
 	n = read(fd, buf, sizeof(buf) - 1);
+	if (n < 0)
+		pr_perror("read %s", path);
 	close(fd);
-	if (n < 0) {
-		pr_perror("read");
+	if (n < 0)
 		return false;
-	}
 	buf[n] = 0;
 
 	if (strcmp(val, buf)) {
@@ -95,7 +96,7 @@ int main(int argc, char **argv)
 	char buf[1024], path[PATH_MAX];
 	struct stat sb;
 
-	char *dev_allow[] = {
+	const char *const dev_allow[] = {
 		"c *:* m",   "b *:* m",	  "c 1:3 rwm", "c 1:5 rwm",   "c 1:7 rwm",    "c 5:0 rwm",
 		"c 5:2 rwm", "c 1:8 rwm", "c 1:9 rwm", "c 136:* rwm", "c 10:229 rwm",
 	};
@@ -126,12 +127,14 @@ int main(int argc, char **argv)
 
 	sprintf(path, "%s/devices/%s/devices.list", dirname, cgname);
 	if (!checkval(path, buf)) {
+		errno = 0;
 		fail();
 		goto out;
 	}
 
 	sprintf(path, "%s/memory/%s/memory.limit_in_bytes", dirname, cgname);
 	if (!checkval(path, "268435456\n")) {
+		errno = 0;
 		fail();
 		goto out;
 	}
@@ -143,6 +146,7 @@ int main(int argc, char **argv)
 	}
 
 	if (!S_ISDIR(sb.st_mode)) {
+		errno = 0;
 		fail("special_prop_check not a directory?");
 		goto out;
 	}

From c29c5a1df0c0ad185bc2cfc692455d1d1a674e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 31 May 2023 10:20:09 +0200
Subject: [PATCH 1407/1854] zdtm: cgroup04: Improve skip check's robustness.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cgroup04 test needs full control over mem and devices cgroup hierarchies.
Make the test's .checkskip script better at detecting if the cgroups are
available for use.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/cgroup04.checkskip | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/cgroup04.checkskip b/test/zdtm/static/cgroup04.checkskip
index 205f8fc53..1ccbada4d 100755
--- a/test/zdtm/static/cgroup04.checkskip
+++ b/test/zdtm/static/cgroup04.checkskip
@@ -1,3 +1,20 @@
 #!/bin/bash
+set -e
 
-! test -f /sys/fs/cgroup/cgroup.controllers
+test ! -f /sys/fs/cgroup/cgroup.controllers
+
+for ctl in devices memory; do
+	# Check that the controller is available.
+
+	grep -q "^${ctl}\\s" /proc/cgroups
+
+	# Check that the controller is not co-mounted with any other.
+
+	# /proc/self/cgroup may have:
+	# "1:devices:/sys"
+	if ! grep -q "^[0-9]*:${ctl}:" /proc/self/cgroup; then
+		# but not eg:
+		# "1:devices,job:/sys"
+		grep -qE "^[0-9]*:([^:]*,)?${ctl}(,[^:]*)?:" /proc/self/cgroup && exit 1
+	fi
+done

From f6e820bedb53b661b6d5350d9a15b2ce9a5a69d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Fri, 21 Apr 2023 15:57:32 +0200
Subject: [PATCH 1408/1854] zdtm: Treat ESRCH from kill() as success.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes a failure to clean up after a failed test, where CRIU didn't start properly.

```
===================== Run zdtm/transition/socket-tcp in h ======================
Start test
./socket-tcp --pidfile=socket-tcp.pid --outfile=socket-tcp.out
Traceback (most recent call last):
  File ".../zdtm_py.py", line 1906, in do_run_test
    cr(cr_api, t, opts)
  File ".../zdtm_py.py", line 1584, in cr
    cr_api.dump("dump")
  File ".../zdtm_py.py", line 1386, in dump
    self.__dump_process = self.__criu_act(action,
  File ".../zdtm_py.py", line 1224, in __criu_act
    raise test_fail_exc("CRIU %s" % action)
test_fail_exc: CRIU dump

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "<embedded module '_launcher'>", line 182, in run_filename_from_loader_as_main
  File "<embedded module '_launcher'>", line 34, in _run_code_in_main
  File ".../zdtm_py.py", line 2790, in <module>
    fork_zdtm()
  File ".../zdtm_py.py", line 2782, in fork_zdtm
    do_run_test(tinfo[0], tinfo[1], tinfo[2], tinfo[3])
  File ".../zdtm_py.py", line 1922, in do_run_test
    t.kill()
  File ".../zdtm_py.py", line 509, in kill
    os.kill(int(self.__pid), sig)
ProcessLookupError: [Errno 3] No such process
```

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index bc14e3f73..810873575 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -507,8 +507,15 @@ class zdtm_test:
         self.__freezer.thaw()
         if self.__pid:
             print("Send the %d signal to  %s" % (sig, self.__pid))
-            os.kill(int(self.__pid), sig)
-            self.gone(sig == signal.SIGKILL)
+            try:
+                os.kill(int(self.__pid), sig)
+            except ProcessLookupError:
+                if sig != signal.SIGKILL:
+                    raise
+                print("The process %s doesn't exist" % self.__pid)
+                self.gone(True)
+            else:
+                self.gone(sig == signal.SIGKILL)
 
         self.__flavor.fini()
 

From ba48ceb57553183fc3435db4dbeb1fd52306b0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 31 May 2023 15:31:10 +0200
Subject: [PATCH 1409/1854] zdtm: socket_udp_shutdown: Make the test fail
 instead of timing out.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When -- after restore -- sockets can't communicate, the test times out
while waiting on recvfrom(). Since the communication is local, send()
works instantaneously - so mark sockets with SOCK_NONBLOCK and report
failure if the message is not received immediately.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/socket_udp_shutdown.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/socket_udp_shutdown.c b/test/zdtm/static/socket_udp_shutdown.c
index 91dc8f30a..a7658b9dd 100644
--- a/test/zdtm/static/socket_udp_shutdown.c
+++ b/test/zdtm/static/socket_udp_shutdown.c
@@ -28,8 +28,8 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
-	sk1 = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
-	sk2 = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	sk1 = socket(PF_INET, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
+	sk2 = socket(PF_INET, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
 	if (sk1 < 0 || sk2 < 0) {
 		pr_perror("Can't create socket");
 		exit(1);

From 00f8a56b6e8c888f7e0883456e326a9c7ef79fe9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 26 Sep 2023 17:00:36 -0700
Subject: [PATCH 1410/1854] zdtm: check userns once

All test logs are flooded with the "userns is supported" messages...

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 810873575..7a7cdfd3b 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2404,6 +2404,7 @@ def run_tests(opts):
                 "Specify --criu-image-streamer-dir or modify PATH to provide an alternate location")
                 .format(streamer_dir))
 
+    usernsIsSupported = criu.check("userns")
     launcher = Launcher(opts, len(torun))
     try:
         for t in torun:
@@ -2473,7 +2474,7 @@ def run_tests(opts):
                 run_flavs = set(test_flavs) & set(opts_flavs)
             else:
                 run_flavs = set([test_flavs.pop()])
-            if not criu.check("userns"):
+            if not usernsIsSupported:
                 run_flavs -= set(['uns'])
             if opts['user']:
                 # FIXME -- probably uns will make sense

From 28adebefb759306959df41acbe9cb74bfebd03ea Mon Sep 17 00:00:00 2001
From: Vladislav Khmelevsky <och95@yandex.ru>
Date: Tue, 20 Jun 2023 13:23:24 +0400
Subject: [PATCH 1411/1854] Return page size as unsigned long

Currently page_size() returns unsigned int value that is after "bitwise
not" is promoted to unsigned long value e.g. in uffd.c
handle_page_fault. Since the value is unsigned promotion is done with 0
MSB that results in lost of MSB pagefault address bits. So make
page_size to return  unsigned long to avoid such situation.

Signed-off-by: Vladislav Khmelevsky <och95@yandex.ru>
---
 compel/plugins/std/infect.c                | 2 +-
 criu/pie/restorer.c                        | 2 +-
 include/common/arch/aarch64/asm/page.h     | 4 ++--
 include/common/arch/loongarch64/asm/page.h | 4 ++--
 include/common/arch/mips/asm/page.h        | 4 ++--
 include/common/arch/ppc64/asm/page.h       | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/compel/plugins/std/infect.c b/compel/plugins/std/infect.c
index abecc140f..60b21d313 100644
--- a/compel/plugins/std/infect.c
+++ b/compel/plugins/std/infect.c
@@ -27,7 +27,7 @@ static struct rt_sigframe *sigframe;
  */
 static unsigned __page_size;
 
-unsigned __attribute((weak)) page_size(void)
+unsigned long __attribute((weak)) page_size(void)
 {
 	return __page_size;
 }
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 0de2423a1..ba6f290dc 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -104,7 +104,7 @@ bool fault_injected(enum faults f)
  * Hint: compel on aarch64 shall learn relocs for that.
  */
 static unsigned __page_size;
-unsigned page_size(void)
+unsigned long page_size(void)
 {
 	return __page_size;
 }
diff --git a/include/common/arch/aarch64/asm/page.h b/include/common/arch/aarch64/asm/page.h
index 90670d126..4555debbd 100644
--- a/include/common/arch/aarch64/asm/page.h
+++ b/include/common/arch/aarch64/asm/page.h
@@ -10,7 +10,7 @@
 extern unsigned __page_size;
 extern unsigned __page_shift;
 
-static inline unsigned page_size(void)
+static inline unsigned long page_size(void)
 {
 	if (!__page_size)
 		__page_size = sysconf(_SC_PAGESIZE);
@@ -37,7 +37,7 @@ static inline unsigned page_shift(void)
 
 #else /* CR_NOGLIBC */
 
-extern unsigned page_size(void);
+extern unsigned long page_size(void);
 #define PAGE_SIZE page_size()
 
 #endif /* CR_NOGLIBC */
diff --git a/include/common/arch/loongarch64/asm/page.h b/include/common/arch/loongarch64/asm/page.h
index 25bdbc141..4fcdb64dc 100644
--- a/include/common/arch/loongarch64/asm/page.h
+++ b/include/common/arch/loongarch64/asm/page.h
@@ -10,7 +10,7 @@
 static unsigned __page_size;
 static unsigned __page_shift;
 
-static inline unsigned page_size(void)
+static inline unsigned long page_size(void)
 {
 	if (!__page_size)
 		__page_size = sysconf(_SC_PAGESIZE);
@@ -31,7 +31,7 @@ static inline unsigned page_shift(void)
 #define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
 #else /* CR_NOGLIBC */
 
-extern unsigned page_size(void);
+extern unsigned long page_size(void);
 #define PAGE_SIZE page_size()
 
 #endif /* CR_NOGLIBC */
diff --git a/include/common/arch/mips/asm/page.h b/include/common/arch/mips/asm/page.h
index 25bdbc141..4fcdb64dc 100644
--- a/include/common/arch/mips/asm/page.h
+++ b/include/common/arch/mips/asm/page.h
@@ -10,7 +10,7 @@
 static unsigned __page_size;
 static unsigned __page_shift;
 
-static inline unsigned page_size(void)
+static inline unsigned long page_size(void)
 {
 	if (!__page_size)
 		__page_size = sysconf(_SC_PAGESIZE);
@@ -31,7 +31,7 @@ static inline unsigned page_shift(void)
 #define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
 #else /* CR_NOGLIBC */
 
-extern unsigned page_size(void);
+extern unsigned long page_size(void);
 #define PAGE_SIZE page_size()
 
 #endif /* CR_NOGLIBC */
diff --git a/include/common/arch/ppc64/asm/page.h b/include/common/arch/ppc64/asm/page.h
index a1ff6718a..2b0c0e504 100644
--- a/include/common/arch/ppc64/asm/page.h
+++ b/include/common/arch/ppc64/asm/page.h
@@ -10,7 +10,7 @@
 extern unsigned __page_size;
 extern unsigned __page_shift;
 
-static inline unsigned page_size(void)
+static inline unsigned long page_size(void)
 {
 	if (!__page_size)
 		__page_size = sysconf(_SC_PAGESIZE);
@@ -37,7 +37,7 @@ static inline unsigned page_shift(void)
 
 #else /* CR_NOGLIBC */
 
-extern unsigned page_size(void);
+extern unsigned long page_size(void);
 #define PAGE_SIZE page_size()
 
 #endif /* CR_NOGLIBC */

From 9b4e8292cd8b3247260144098096e7955b3806ef Mon Sep 17 00:00:00 2001
From: Vladislav Khmelevsky <och95@yandex.ru>
Date: Tue, 20 Jun 2023 13:34:27 +0400
Subject: [PATCH 1412/1854] vma: Add !VVAR condition to vma_entry_can_be_lazy

Currently most of the times we don't have problems with VVAR segment and
lazy restore because when VDSO is parked there is an munmap call that
calls UFFDIO_UNREGISTER on the destination address.
But we don't want to enable userfaultfd for VDSO and VVAR at the first
place.

Signed-off-by: Vladislav Khmelevsky <och95@yandex.ru>
---
 criu/include/vma.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/include/vma.h b/criu/include/vma.h
index 106c56af2..4b663ee50 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -122,8 +122,8 @@ static inline struct vma_area *vma_next(struct vma_area *vma)
 static inline bool vma_entry_can_be_lazy(VmaEntry *e)
 {
 	return ((e->flags & MAP_ANONYMOUS) && (e->flags & MAP_PRIVATE) && !(e->flags & MAP_LOCKED) &&
-		!(vma_entry_is(e, VMA_AREA_VDSO)) && !(vma_entry_is(e, VMA_AREA_VSYSCALL)) &&
-		!(e->flags & MAP_HUGETLB));
+		!(vma_entry_is(e, VMA_AREA_VDSO)) && !(vma_entry_is(e, VMA_AREA_VVAR)) &&
+		!(vma_entry_is(e, VMA_AREA_VSYSCALL)) && !(e->flags & MAP_HUGETLB));
 }
 
 #endif /* __CR_VMA_H__ */

From 66f39adf12a41a7af130f5c092debfc9740b2b1f Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Sat, 30 Sep 2023 00:26:09 +0200
Subject: [PATCH 1413/1854] criu: change the comment about magic numbers

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/include/magic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/include/magic.h b/criu/include/magic.h
index 22d7218e4..0e8c37234 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -29,7 +29,7 @@
 
 /*
  * The magic-s below correspond to coordinates
- * of various Russian towns in the NNNNEEEE form.
+ * of various towns in the NNNNEEEE form.
  */
 
 #define INVENTORY_MAGIC	     0x58313116 /* Veliky Novgorod */

From a68975c06d7877a7e6751a8c70010d2cda4c9c29 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Sep 2023 21:38:45 -0700
Subject: [PATCH 1414/1854] plugins: the UPDATE_VMA_MAP callback returns fd
 with the full control

It means CRIU has to close it when it is not needed.

It looks more logically correct and matches the behaviour of
the RESTORE_EXT_FILE callback.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/files-reg.c               |  2 +-
 plugins/amdgpu/amdgpu_plugin.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index cf0c84b52..c80da1d8c 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2506,7 +2506,7 @@ static int open_filemap(int pid, struct vma_area *vma)
 			 * using dup because dup returns a reference to the same struct file inside kernel, but we
 			 * cannot open a new FD.
 			 */
-			ret = dup(plugin_fd);
+			ret = plugin_fd;
 		} else if (vma->e->status & VMA_AREA_MEMFD) {
 			if (!inherited_fd(vma->vmfd, &ret))
 				ret = memfd_open(vma->vmfd, &flags);
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 6a79f8b19..9dae8861c 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1955,10 +1955,15 @@ int amdgpu_plugin_update_vmamap(const char *in_path, const uint64_t addr, const
 		if (addr == vma_md->vma_entry && old_offset == vma_md->old_pgoff) {
 			*new_offset = vma_md->new_pgoff;
 
-			if (is_renderD)
-				*updated_fd = vma_md->fd;
-			else
-				*updated_fd = -1;
+			*updated_fd = -1;
+			if (is_renderD) {
+				int fd = dup(vma_md->fd);
+				if (fd == -1) {
+					pr_perror("unable to duplicate the render fd");
+					return -1;
+				}
+				*updated_fd = fd;
+			}
 
 			plugin_log_msg("old_pgoff=0x%lx new_pgoff=0x%lx fd=%d\n", vma_md->old_pgoff, vma_md->new_pgoff,
 				       *updated_fd);

From 940a05c0ba54faffc1f340f792f2685f3560d0fa Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Sep 2023 21:47:50 -0700
Subject: [PATCH 1415/1854] amdgpu: don't leak fd on an error path in
 open_img_file

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 plugins/amdgpu/amdgpu_plugin.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 9dae8861c..e22168d93 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -165,6 +165,7 @@ FILE *open_img_file(char *path, bool write, size_t *size)
 	fp = fdopen(fd, write ? "w" : "r");
 	if (!fp) {
 		pr_perror("%s: Failed get pointer for %s", path, write ? "write" : "read");
+		close(fd);
 		return NULL;
 	}
 

From aa38a59899f39abde844895fc36d6043de84948b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Sep 2023 21:49:39 -0700
Subject: [PATCH 1416/1854] amdgpu: print an error if the dup syscall fails

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 plugins/amdgpu/amdgpu_plugin.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index e22168d93..2ebc5e178 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1796,7 +1796,12 @@ int amdgpu_plugin_restore_file(int id)
 		 * copy of the fd. CRIU core owns the duplicated returned fd, and amdgpu_plugin owns the fd stored in
 		 * tp_node.
 		 */
-		return dup(fd);
+		fd = dup(fd);
+		if (fd == -1) {
+			pr_perror("unable to duplicate the render fd");
+			return -1;
+		}
+		return fd;
 	}
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);

From ba168ab78cb4536a7ed3813e929cbc874a7d998d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 30 Sep 2023 02:56:52 +0100
Subject: [PATCH 1417/1854] ci: enable build with amdgpu plugin

This patch adds the `libdrm-dev` package to the list of CRIU
dependencies installed in CI to build CRIU with amdgpu plugin.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                              | 4 ++--
 plugins/amdgpu/kfd_ioctl.h               | 2 +-
 scripts/build/Dockerfile.alpine          | 1 +
 scripts/build/Dockerfile.archlinux       | 1 +
 scripts/ci/prepare-for-fedora-rawhide.sh | 1 +
 scripts/ci/run-ci-tests.sh               | 7 ++++++-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index e559ec772..6a586d58b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -36,7 +36,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto libdrm-devel
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed.
     # The Cirrus CI user runs as a service from selinux point of view and is
@@ -108,7 +108,7 @@ task:
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || :
     yum install -y dnf-plugins-core
     yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-protobuf python3-importlib-metadata python3-junit_xml xmlto
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-protobuf python3-importlib-metadata python3-junit_xml xmlto libdrm-devel
     alternatives --set python /usr/bin/python3
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed
diff --git a/plugins/amdgpu/kfd_ioctl.h b/plugins/amdgpu/kfd_ioctl.h
index b88fe20cf..e1ebb75a3 100644
--- a/plugins/amdgpu/kfd_ioctl.h
+++ b/plugins/amdgpu/kfd_ioctl.h
@@ -23,7 +23,7 @@
 #ifndef KFD_IOCTL_H_INCLUDED
 #define KFD_IOCTL_H_INCLUDED
 
-#include <drm/drm.h>
+#include <libdrm/drm.h>
 #include <linux/ioctl.h>
 
 /*
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index af1858ab5..cb746757a 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -23,6 +23,7 @@ RUN apk update && apk add \
 	python3 \
 	sudo \
 	libcap-utils \
+	libdrm-dev \
 	util-linux
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index f2bce1e5b..b9968e876 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -35,6 +35,7 @@ RUN pacman -Syu --noconfirm \
 	asciidoctor \
 	python-junit-xml \
 	python-importlib-metadata \
+	libdrm \
 	diffutils
 
 COPY . /criu
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index 1c8a46fbf..e31814a95 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -35,6 +35,7 @@ dnf install -y \
 	which \
 	e2fsprogs \
 	rubygem-asciidoctor \
+	libdrm-devel \
 	kmod
 
 # /tmp is no longer 755 in the rawhide container image and breaks CI - fix it
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 47749e7fa..1aae555f7 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -6,7 +6,7 @@ CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
 		libnl-route-3-dev time flake8 libbsd-dev python3-yaml
 		libperl-dev pkg-config python3-protobuf python3-pip
-		python3-importlib-metadata python3-junit.xml)
+		python3-importlib-metadata python3-junit.xml libdrm-dev)
 
 X86_64_PKGS=(gcc-multilib)
 
@@ -326,3 +326,8 @@ make -C test/others/action-script run
 
 # compel testing
 make -C compel/test
+
+# amdgpu_plugin testing
+make amdgpu_plugin
+make -C plugins/amdgpu/ test_topology_remap
+./plugins/amdgpu/test_topology_remap

From 28e854d662e203e62c4f75140e7130b9df7863b8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 1 Oct 2023 08:58:59 +0100
Subject: [PATCH 1418/1854] amdgpu: fix clang warnings

amdgpu_plugin.c:930:6: error: variable 'buffer' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
        if (ret) {
            ^~~
amdgpu_plugin.c:988:8: note: uninitialized use occurs here
        xfree(buffer);

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 2ebc5e178..32ff8f936 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -915,7 +915,7 @@ void *dump_bo_contents(void *_thread_data)
 	int num_bos = 0;
 	int i, ret = 0;
 	FILE *bo_contents_fp = NULL;
-	void *buffer;
+	void *buffer = NULL;
 	char img_path[40];
 
 	pr_info("Thread[0x%x] started\n", thread_data->gpu_id);
@@ -1004,7 +1004,7 @@ void *restore_bo_contents(void *_thread_data)
 	uint64_t max_copy_size;
 	uint32_t major, minor;
 	FILE *bo_contents_fp = NULL;
-	void *buffer;
+	void *buffer = NULL;
 	char img_path[40];
 	int num_bos = 0;
 	int i, ret = 0;

From e86e8dac0d91eca31e219226b43fee0d600b8c89 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 22 Sep 2023 22:40:27 +0000
Subject: [PATCH 1419/1854] memfd: don't reopen file descriptors for memory
 mappings

One memfd can be shared by a few restored files. Only of these files is
restored with a file created with memfd_open. Others are restored by reopening
memfd files via /proc/self/fd/.

It seems unnecessary for restoring memfd memory mappings. We can always use the
origin file.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/files-reg.c     | 2 +-
 criu/include/memfd.h | 4 +++-
 criu/memfd.c         | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index c80da1d8c..9fbab0d42 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -2509,7 +2509,7 @@ static int open_filemap(int pid, struct vma_area *vma)
 			ret = plugin_fd;
 		} else if (vma->e->status & VMA_AREA_MEMFD) {
 			if (!inherited_fd(vma->vmfd, &ret))
-				ret = memfd_open(vma->vmfd, &flags);
+				ret = memfd_open(vma->vmfd, &flags, true);
 		} else {
 			ret = open_path(vma->vmfd, do_open_reg_noseek_flags, &flags);
 		}
diff --git a/criu/include/memfd.h b/criu/include/memfd.h
index 1b1dc79bb..78d810019 100644
--- a/criu/include/memfd.h
+++ b/criu/include/memfd.h
@@ -1,7 +1,9 @@
 #ifndef __CR_MEMFD_H__
 #define __CR_MEMFD_H__
 
+#include <stdbool.h>
 #include <sys/stat.h>
+
 #include "int.h"
 #include "common/config.h"
 
@@ -12,7 +14,7 @@ extern int is_memfd(dev_t dev);
 extern int dump_one_memfd_cond(int lfd, u32 *id, struct fd_parms *parms);
 extern const struct fdtype_ops memfd_dump_ops;
 
-extern int memfd_open(struct file_desc *d, u32 *fdflags);
+extern int memfd_open(struct file_desc *d, u32 *fdflags, bool filemap);
 extern struct collect_image_info memfd_cinfo;
 extern struct file_desc *collect_memfd(u32 id);
 extern int apply_memfd_seals(void);
diff --git a/criu/memfd.c b/criu/memfd.c
index a770c66a1..9d9f0621f 100644
--- a/criu/memfd.c
+++ b/criu/memfd.c
@@ -323,7 +323,7 @@ static int memfd_open_inode(struct memfd_restore_inode *inode)
 	return fd;
 }
 
-int memfd_open(struct file_desc *d, u32 *fdflags)
+int memfd_open(struct file_desc *d, u32 *fdflags, bool filemap)
 {
 	struct memfd_info *mfi;
 	MemfdFileEntry *mfe;
@@ -342,6 +342,9 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	/* Reopen the fd with original permissions */
 	flags = fdflags ? *fdflags : mfe->flags;
 
+	if (filemap && (flags & O_ACCMODE) == O_RDWR)
+		return fd;
+
 	if (!mfi->inode->was_opened_rw && (flags & O_ACCMODE) == O_RDWR) {
 		/*
 		 * If there is only a single RW-opened fd for a memfd, it can
@@ -367,7 +370,7 @@ int memfd_open(struct file_desc *d, u32 *fdflags)
 	_fd = __open_proc(PROC_SELF, 0, flags, "fd/%d", fd);
 	if (_fd < 0)
 		pr_perror("Can't reopen memfd id=%d", mfe->id);
-	else if ((flags & O_ACCMODE) == O_RDWR)
+	else if (!filemap && (flags & O_ACCMODE) == O_RDWR)
 		pr_warn("execveat(fd=%d, ..., AT_EMPTY_PATH) might fail after restore; memfd id=%d\n", _fd, mfe->id);
 
 	close(fd);
@@ -382,7 +385,7 @@ static int memfd_open_fe_fd(struct file_desc *d, int *new_fd)
 	if (inherited_fd(d, new_fd))
 		return 0;
 
-	fd = memfd_open(d, NULL);
+	fd = memfd_open(d, NULL, false);
 	if (fd < 0)
 		return -1;
 

From 81a30c32062b5b854343d47044a6f726d3c7203e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Sep 2023 18:07:13 +0000
Subject: [PATCH 1420/1854] zdtm/memfd04: check execveat on memfd that has
 memory mappings

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile     |  2 ++
 test/zdtm/static/memfd04.c    | 33 ++++++++++++++++++++++++++++++---
 test/zdtm/static/memfd05.c    |  1 +
 test/zdtm/static/memfd05.desc |  1 +
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 120000 test/zdtm/static/memfd05.c
 create mode 120000 test/zdtm/static/memfd05.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index b7fb79643..4c7ca72fd 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -259,6 +259,7 @@ TST_NOFILE	:=				\
 		memfd02-hugetlb			\
 		memfd03				\
 		memfd04				\
+		memfd05				\
 		shmemfd				\
 		shmemfd-priv			\
 		time				\
@@ -656,6 +657,7 @@ socket-tcp6-unconn:	CFLAGS += -D ZDTM_IPV6
 socket-tcp4v6-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK -D ZDTM_IPV4V6
 socket-tcp4v6-closing:	CFLAGS += -D ZDTM_IPV4V6
 memfd02-hugetlb:	CFLAGS += -D ZDTM_HUGETLB
+memfd05:		CFLAGS += -D ZDTM_MEMFD05
 
 sockets00-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
 sockets01-seqpacket:	CFLAGS += -D ZDTM_UNIX_SEQPACKET
diff --git a/test/zdtm/static/memfd04.c b/test/zdtm/static/memfd04.c
index aae7864c1..215e949d1 100644
--- a/test/zdtm/static/memfd04.c
+++ b/test/zdtm/static/memfd04.c
@@ -1,4 +1,5 @@
 #include <linux/memfd.h>
+#include <sys/mman.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -73,20 +74,46 @@ static const size_t script_len = sizeof(script) - 1;
 
 int main(int argc, char *argv[])
 {
+#ifdef MEMFD05
+	char path[PATH_MAX];
+	char *addr_p, *addr_s;
+	int rofd;
+#endif
 	int fd;
 
 	test_init(argc, argv);
 
 	fd = _memfd_create("somename", 0);
 	if (fd < 0) {
-		fail("memfd_create()");
+		pr_perror("memfd_create()");
+		return 1;
+	}
+	if (ftruncate(fd, script_len) == -1) {
+		pr_perror("ftruncate");
 		return 1;
 	}
-
 	if (write(fd, script, script_len) != script_len) {
-		fail("write(memfd)");
+		pr_perror("write(memfd)");
 		return 1;
 	}
+#ifdef MEMFD05
+	snprintf(path, PATH_MAX - 1, "/proc/self/fd/%d", fd);
+	rofd = open(path, O_RDONLY);
+	if (rofd < 0) {
+		pr_perror("unable to open read-only memfd");
+		return 1;
+	}
+	addr_p = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_FILE | MAP_PRIVATE, rofd, 0);
+	if (addr_p == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+	addr_s = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, fd, 0);
+	if (addr_s == MAP_FAILED) {
+		pr_perror("mmap");
+		return 1;
+	}
+#endif
 
 	if (!test_exec_fd(fd))
 		return 1;
diff --git a/test/zdtm/static/memfd05.c b/test/zdtm/static/memfd05.c
new file mode 120000
index 000000000..6caa9556f
--- /dev/null
+++ b/test/zdtm/static/memfd05.c
@@ -0,0 +1 @@
+memfd04.c
\ No newline at end of file
diff --git a/test/zdtm/static/memfd05.desc b/test/zdtm/static/memfd05.desc
new file mode 120000
index 000000000..1b4963572
--- /dev/null
+++ b/test/zdtm/static/memfd05.desc
@@ -0,0 +1 @@
+memfd04.desc
\ No newline at end of file

From 5d6c8bc58494a26e2057d2ae481b30a79b87c022 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 30 Aug 2023 11:57:40 +0800
Subject: [PATCH 1421/1854] clang-format: disable column limit constraint

The "ColumnLimit: 120" is not only allowing lines to be longer than 80
characters but it also forces line wrapping at 120 characters. If total
expression length is more than 120 characters, clang-format will try to
wrap it as close to 120 as it can, it would not even allow to wrap at 80
characters if we really want it. But as we all know 80 characters is
Linux kernel coding style default and as far as our coding style is
based on it it is really strange to prohibit wrapping lines at 80
characters...

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 .clang-format                 | 2 +-
 scripts/fetch-clang-format.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.clang-format b/.clang-format
index 475638015..fb40bc613 100644
--- a/.clang-format
+++ b/.clang-format
@@ -53,7 +53,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
-ColumnLimit: 120
+ColumnLimit: 0
 CommentPragmas: '^ IWYU pragma:'
 CompactNamespaces: false # Unknown to clang-format-4.0
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
index b80175f05..5b6037d61 100755
--- a/scripts/fetch-clang-format.sh
+++ b/scripts/fetch-clang-format.sh
@@ -8,7 +8,7 @@ URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/.c
 curl -s "${URL}" | sed -e "
 	s,^\( *\)#\([A-Z]\),\1\2,g;
 	s,ControlStatements,ControlStatementsExceptForEachMacros,g;
-	s,ColumnLimit: 80,ColumnLimit: 120,g;
+	s,ColumnLimit: 80,ColumnLimit: 0,g;
 	s,Intended for clang-format >= 4,Intended for clang-format >= 11,g;
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_bit',g;
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;

From c9fdd355f6e4695e24bdd6eb42e42cf831f09219 Mon Sep 17 00:00:00 2001
From: Dmitry Safonov <dima@arista.com>
Date: Mon, 14 Feb 2022 11:47:30 +0000
Subject: [PATCH 1422/1854] pie: Mark __export_*() functions as
 externally_visible

GCC's lto source:
> To avoid this problem the compiler must assume that it sees the
> whole program when doing link-time optimization.  Strictly
> speaking, the whole program is rarely visible even at link-time.
> Standard system libraries are usually linked dynamically or not
> provided with the link-time information.  In GCC, the whole
> program option (@option{-fwhole-program}) asserts that every
> function and variable defined in the current compilation
> unit is static, except for function @code{main} (note: at
> link time, the current unit is the union of all objects compiled
> with LTO).  Since some functions and variables need to
> be referenced externally, for example by another DSO or from an
> assembler file, GCC also provides the function and variable
> attribute @code{externally_visible} which can be used to disable
> the effect of @option{-fwhole-program} on a specific symbol.

As far as I read gcc's source, ipa_comdats() will avoid placing symbols
that are either already in a user-defined section or have
externally_visible attribute into new optimized gcc sections.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/pie/restorer.c       |  6 +++---
 include/common/compiler.h | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index ba6f290dc..02971657e 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -735,7 +735,7 @@ static int recv_cg_set_restore_ack(int sk)
  * Threads restoration via sigreturn. Note it's locked
  * routine and calls for unlock at the end.
  */
-long __export_restore_thread(struct thread_restore_args *args)
+__visible long __export_restore_thread(struct thread_restore_args *args)
 {
 	struct rt_sigframe *rt_sigframe;
 	k_rtsigset_t to_block;
@@ -1276,7 +1276,7 @@ unsigned long vdso_rt_size = 0;
 void *bootstrap_start = NULL;
 unsigned int bootstrap_len = 0;
 
-void __export_unmap(void)
+__visible void __export_unmap(void)
 {
 	sys_munmap(bootstrap_start, bootstrap_len - vdso_rt_size);
 }
@@ -1608,7 +1608,7 @@ static int restore_membarrier_registrations(int mask)
  * and jump execution to some predefined ip read from
  * core file.
  */
-long __export_restore_task(struct task_restore_args *args)
+__visible long __export_restore_task(struct task_restore_args *args)
 {
 	long ret = -1;
 	int i;
diff --git a/include/common/compiler.h b/include/common/compiler.h
index 1c9d3db8d..1347b6236 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -30,6 +30,17 @@
 #define __always_unused __attribute__((unused))
 #define __must_check	__attribute__((__warn_unused_result__))
 
+#ifndef __has_attribute
+#define __has_attribute(x) 0
+#endif
+
+/* Not supported by clang */
+#if __has_attribute(__externally_visible__)
+#define __visible __attribute__((__externally_visible__))
+#else
+#define __visible
+#endif
+
 #define __section(S) __attribute__((__section__(#S)))
 
 #ifndef __always_inline

From 4c9d23d33de0f6ed77978b145daa1a55d8a261fc Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 28 Sep 2023 21:26:41 +0000
Subject: [PATCH 1423/1854] util: allow to run criu under strace

fork_and_ptrace_attach has to fork a child with CLONE_UNTRACED,
so that strace doesn't trace it.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/util.c | 50 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/criu/util.c b/criu/util.c
index 993ab97bb..95ba0feda 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -661,40 +661,54 @@ out:
 	return ret;
 }
 
+struct child_args {
+	int *sk_pair;
+	int (*child_setup)(void);
+};
+
+static int child_func(void *_args)
+{
+	struct child_args *args = _args;
+	int sk, *sk_pair = args->sk_pair;
+	char c = 0;
+
+	sk = sk_pair[1];
+	close(sk_pair[0]);
+
+	if (args->child_setup && args->child_setup() != 0)
+		exit(1);
+
+	if (write(sk, &c, 1) != 1) {
+		pr_perror("write");
+		exit(1);
+	}
+
+	while (1)
+		sleep(1000);
+	exit(1);
+}
+
 pid_t fork_and_ptrace_attach(int (*child_setup)(void))
 {
 	pid_t pid;
 	int sk_pair[2], sk;
 	char c = 0;
+	struct child_args cargs = {
+		.sk_pair = sk_pair,
+		.child_setup = child_setup,
+	};
 
 	if (socketpair(PF_LOCAL, SOCK_SEQPACKET, 0, sk_pair)) {
 		pr_perror("socketpair");
 		return -1;
 	}
 
-	pid = fork();
+	pid = clone_noasan(child_func, CLONE_UNTRACED | SIGCHLD, &cargs);
 	if (pid < 0) {
 		pr_perror("fork");
 		return -1;
 	}
 
-	if (pid == 0) {
-		sk = sk_pair[1];
-		close(sk_pair[0]);
-
-		if (child_setup && child_setup() != 0)
-			exit(1);
-
-		if (write(sk, &c, 1) != 1) {
-			pr_perror("write");
-			exit(1);
-		}
-
-		while (1)
-			sleep(1000);
-		exit(1);
-	}
-
 	sk = sk_pair[0];
 	close(sk_pair[1]);
 

From 5e8d7dc94b365e07a4ba538a171e8ccadb1e0036 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 5 Oct 2023 15:16:36 -0700
Subject: [PATCH 1424/1854] tun: don't parse buffers that have not been filled
 with data

read_ns_sys_file() can return an error, but we are trying to parse a
buffer before checking a return code.

CID 417395 (#3 of 3): String not null terminated (STRING_NULL)
2. string_null: Passing unterminated string buf to strtol, which expects
   a null-terminated string.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/net.c |  7 +++++--
 criu/tun.c | 15 +++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 4abfc182a..e422e2f69 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -111,15 +111,18 @@ int read_ns_sys_file(char *path, char *buf, int len)
 	}
 
 	rlen = read(fd, buf, len);
+	if (rlen == -1)
+		pr_perror("Can't read ns' %s", path);
 	close(fd);
 
 	if (rlen == len) {
+		buf[0] = '\0';
 		pr_err("Too small buffer to read ns sys file %s\n", path);
 		return -1;
 	}
 
-	if (rlen > 0)
-		buf[rlen - 1] = '\0';
+	if (rlen >= 0)
+		buf[rlen] = '\0';
 
 	return rlen;
 }
diff --git a/criu/tun.c b/criu/tun.c
index 2e2cc32bf..9d66f9929 100644
--- a/criu/tun.c
+++ b/criu/tun.c
@@ -455,27 +455,26 @@ int dump_tun_link(NetDeviceEntry *nde, struct cr_imgset *fds, struct nlattr **in
 	TunLinkEntry tle = TUN_LINK_ENTRY__INIT;
 	char spath[64];
 	char buf[64];
-	int ret = 0;
 	struct tun_link *tl;
 
 	sprintf(spath, "class/net/%s/tun_flags", nde->name);
-	ret |= read_ns_sys_file(spath, buf, sizeof(buf));
+	if (read_ns_sys_file(spath, buf, sizeof(buf)) < 0)
+		return -1;
 	tle.flags = strtol(buf, NULL, 0);
 
 	sprintf(spath, "class/net/%s/owner", nde->name);
-	ret |= read_ns_sys_file(spath, buf, sizeof(buf));
+	if (read_ns_sys_file(spath, buf, sizeof(buf)) < 0)
+		return -1;
 	tle.owner = strtol(buf, NULL, 10);
 
 	sprintf(spath, "class/net/%s/group", nde->name);
-	ret |= read_ns_sys_file(spath, buf, sizeof(buf));
+	if (read_ns_sys_file(spath, buf, sizeof(buf)) < 0)
+		return -1;
 	tle.group = strtol(buf, NULL, 10);
 
-	if (ret < 0)
-		return ret;
-
 	tl = get_tun_link_fd(nde->name, nde->peer_nsid, tle.flags);
 	if (!tl)
-		return ret;
+		return -1;
 
 	tle.vnethdr = tl->dmp.vnethdr;
 	tle.sndbuf = tl->dmp.sndbuf;

From 45670b65566c9c5a95f356e417d2d7fe88f3a30f Mon Sep 17 00:00:00 2001
From: Taemin Ha <taeminha@cs.utexas.edu>
Date: Mon, 27 Mar 2023 21:07:13 -0500
Subject: [PATCH 1425/1854] apparmor: remove the redundant check

This check is redundant as line 201 checks for this condition.

Signed-off-by: Taemin Ha <taeminha@cs.utexas.edu>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/apparmor.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index 5b62759e2..e46e239f5 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -207,8 +207,6 @@ static int by_time(const struct dirent **de1, const struct dirent **de2)
 	} else {
 		if (sb1.st_mtim.tv_sec < sb2.st_mtim.tv_sec)
 			return -1;
-		if (sb1.st_mtim.tv_sec == sb2.st_mtim.tv_sec)
-			return 0;
 		return 1;
 	}
 }

From 48d6a59a22a916051422358849979224c7b1ef38 Mon Sep 17 00:00:00 2001
From: Taemin Ha <taeminha@cs.utexas.edu>
Date: Mon, 27 Mar 2023 21:08:37 -0500
Subject: [PATCH 1426/1854] arch/x86: remove the redundant check

The is_native field is a boolean. Therefore, else if() should can be
changed to a simple else{}.

Signed-off-by: Taemin Ha <taeminha@cs.utexas.edu>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/arch/x86/sigframe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/arch/x86/sigframe.c b/criu/arch/x86/sigframe.c
index 4fa7eb3dc..46612e70d 100644
--- a/criu/arch/x86/sigframe.c
+++ b/criu/arch/x86/sigframe.c
@@ -23,7 +23,7 @@ int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *r
 		}
 
 		sigframe->native.uc.uc_mcontext.fpstate = (uint64_t)addr;
-	} else if (!sigframe->is_native) {
+	} else {
 		unsigned long addr = (unsigned long)(void *)&fpu_state->fpu_state_ia32.xsave;
 		sigframe->compat.uc.uc_mcontext.fpstate = (uint32_t)(unsigned long)(void *)&fpu_state->fpu_state_ia32;
 		if ((addr % 64ul)) {

From 36a84751eddd27b86d9b64a93136040198eb3eb9 Mon Sep 17 00:00:00 2001
From: Taemin Ha <taeminha@cs.utexas.edu>
Date: Mon, 27 Mar 2023 21:18:16 -0500
Subject: [PATCH 1427/1854] zdtm/cow00: fix typo

The condition meant to check fd2 instead of fd1, which is checked in
line 24.

Signed-off-by: Taemin Ha <taeminha@cs.utexas.edu>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/cow00.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/cow00.c b/test/zdtm/static/cow00.c
index cb0c6733e..456b6a7b4 100644
--- a/test/zdtm/static/cow00.c
+++ b/test/zdtm/static/cow00.c
@@ -29,7 +29,7 @@ static int is_cow(void *addr, pid_t p1, pid_t p2)
 
 	snprintf(buf, sizeof(buf), "/proc/%d/pagemap", p2);
 	fd2 = open(buf, O_RDONLY);
-	if (fd1 < 0) {
+	if (fd2 < 0) {
 		pr_perror("Unable to open file %s", buf);
 		return -1;
 	}

From cfaacfb58208a4da3adf134a33d0946b106c163a Mon Sep 17 00:00:00 2001
From: Taemin Ha <taeminha@cs.utexas.edu>
Date: Mon, 27 Mar 2023 21:19:09 -0500
Subject: [PATCH 1428/1854] zdtm/thread_different_uid_gid: remove the redundant
 check

line 131 checks if (ret >= 0). line 133 could be replaced by a simple else statement

Signed-off-by: Taemin Ha <taeminha@cs.utexas.edu>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/thread_different_uid_gid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/thread_different_uid_gid.c b/test/zdtm/static/thread_different_uid_gid.c
index 3a0b6291b..88f99659b 100644
--- a/test/zdtm/static/thread_different_uid_gid.c
+++ b/test/zdtm/static/thread_different_uid_gid.c
@@ -130,7 +130,7 @@ int main(int argc, char **argv)
 	ret = syscall(SYS_setresgid, maingroup, maingroup, maingroup);
 	if (ret >= 0) {
 		ret = syscall(SYS_setresuid, mainuser, mainuser, mainuser);
-	} else if (ret < 0) {
+	} else {
 		pr_perror("Failed to drop privileges");
 		exit(1);
 	}

From 5d4179ddb1c569af26669d3089996f95e0510482 Mon Sep 17 00:00:00 2001
From: Taemin Ha <taeminha@cs.utexas.edu>
Date: Mon, 27 Mar 2023 21:17:38 -0500
Subject: [PATCH 1429/1854] criu/proc_parse: refactor the eventpoll parser

Eventpollentry's fields are set only when ret == 3 or ret == 6. The
remaining cases can be grouped together to an error

Signed-off-by: Taemin Ha <taemin.ha@utexas.edu>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/proc_parse.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index d113a21b8..9d43e2394 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1972,10 +1972,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 				     " pos:%lli ino:%lx sdev:%x",
 				     &e->tfd, &e->events, (long long *)&e->data, (long long *)&e->pos,
 				     (long *)&e->inode, &e->dev);
-			if (ret < 3 || ret > 6) {
-				eventpoll_tfd_entry__free_unpacked(e, NULL);
-				goto parse_err;
-			} else if (ret == 3) {
+			if (ret == 3) {
 				e->has_dev = false;
 				e->has_inode = false;
 				e->has_pos = false;
@@ -1983,7 +1980,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 				e->has_dev = true;
 				e->has_inode = true;
 				e->has_pos = true;
-			} else if (ret < 6) {
+			} else {
 				eventpoll_tfd_entry__free_unpacked(e, NULL);
 				goto parse_err;
 			}

From a77185daeea60acda31576a75a751ce5067d0a17 Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Wed, 11 Oct 2023 14:21:34 +0200
Subject: [PATCH 1430/1854] files-reg: don't change the file pos in
 get_build_id

At this point the correct position is already restored, so reading from
the fd results in the position being moved forward by 5 bytes.

Fixes: 9191f8728d62 ("criu/files-reg.c: add build-id validation functionality")
Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 criu/files-reg.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index 9fbab0d42..fc6149350 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1650,22 +1650,10 @@ static int get_build_id_64(Elf64_Ehdr *file_header, unsigned char **build_id, co
  */
 static int get_build_id(const int fd, const struct stat *fd_status, unsigned char **build_id)
 {
-	char buf[SELFMAG + 1];
-	void *start_addr;
+	char *start_addr;
 	size_t mapped_size;
 	int ret = -1;
 
-	if (read(fd, buf, SELFMAG + 1) != SELFMAG + 1)
-		return -1;
-
-	/*
-	 * The first 4 bytes contain a magic number identifying the file as an
-	 * ELF file. They should contain the characters ‘\x7f’, ‘E’, ‘L’, and
-	 * ‘F’, respectively. These characters are together defined as ELFMAG.
-	 */
-	if (strncmp(buf, ELFMAG, SELFMAG))
-		return -1;
-
 	/*
 	 * If the build-id exists, then it will most likely be present in the
 	 * beginning of the file. Therefore at most only the first 1 MB of the
@@ -1673,16 +1661,25 @@ static int get_build_id(const int fd, const struct stat *fd_status, unsigned cha
 	 */
 	mapped_size = min_t(size_t, fd_status->st_size, BUILD_ID_MAP_SIZE);
 	start_addr = mmap(0, mapped_size, PROT_READ, MAP_PRIVATE | MAP_FILE, fd, 0);
-	if (start_addr == MAP_FAILED) {
+	if ((void*)start_addr == MAP_FAILED) {
 		pr_warn("Couldn't mmap file with fd %d\n", fd);
 		return -1;
 	}
 
-	if (buf[EI_CLASS] == ELFCLASS32)
-		ret = get_build_id_32(start_addr, build_id, fd, mapped_size);
-	if (buf[EI_CLASS] == ELFCLASS64)
-		ret = get_build_id_64(start_addr, build_id, fd, mapped_size);
+	/*
+	 * The first 4 bytes contain a magic number identifying the file as an
+	 * ELF file. They should contain the characters ‘\x7f’, ‘E’, ‘L’, and
+	 * ‘F’, respectively. These characters are together defined as ELFMAG.
+	 */
+	if (memcmp(start_addr, ELFMAG, SELFMAG))
+		goto out;
 
+	if (start_addr[EI_CLASS] == ELFCLASS32)
+		ret = get_build_id_32((Elf32_Ehdr *)start_addr, build_id, fd, mapped_size);
+	if (start_addr[EI_CLASS] == ELFCLASS64)
+		ret = get_build_id_64((Elf64_Ehdr *)start_addr, build_id, fd, mapped_size);
+
+out:
 	munmap(start_addr, mapped_size);
 	return ret;
 }

From 29026496d40f6033fd7f0465c74921bd638cd83e Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Wed, 11 Oct 2023 14:26:39 +0200
Subject: [PATCH 1431/1854] zdtm/lib: add missing signal.h header

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 test/zdtm/lib/lock.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/zdtm/lib/lock.h b/test/zdtm/lib/lock.h
index 2b23550be..cc5306e06 100644
--- a/test/zdtm/lib/lock.h
+++ b/test/zdtm/lib/lock.h
@@ -7,6 +7,7 @@
 #include <sys/time.h>
 #include <limits.h>
 #include <errno.h>
+#include <signal.h>
 #include "asm/atomic.h"
 
 #define BUG_ON(condition)                                                        \

From 41938f14b62cc517eab63f5d4245255b64d99a1f Mon Sep 17 00:00:00 2001
From: Michal Clapinski <mclapinski@google.com>
Date: Wed, 11 Oct 2023 14:27:29 +0200
Subject: [PATCH 1432/1854] zdtm/static: test the offset migration of ELF files

Signed-off-by: Michal Clapinski <mclapinski@google.com>
---
 test/zdtm/static/Makefile    |  1 +
 test/zdtm/static/fd_offset.c | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 test/zdtm/static/fd_offset.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 4c7ca72fd..07d3bc6e2 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -269,6 +269,7 @@ TST_NOFILE	:=				\
 		sigtrap				\
 		sigtrap01			\
 		change_mnt_context		\
+		fd_offset			\
 #		jobctl00			\
 
 PKG_CONFIG ?= pkg-config
diff --git a/test/zdtm/static/fd_offset.c b/test/zdtm/static/fd_offset.c
new file mode 100644
index 000000000..96255a4a1
--- /dev/null
+++ b/test/zdtm/static/fd_offset.c
@@ -0,0 +1,42 @@
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check that criu properly restores offsets on ELF files";
+const char *test_author = "Michal Clapinski <mclapinski@google.com>";
+
+void check_offset(int fd)
+{
+	int offset = lseek(fd, 0, SEEK_CUR);
+	if (offset < 0) {
+		fail("lseek");
+		exit(1);
+	}
+	if (offset != 0) {
+		fail("wrong offset; expected: 0, got: %d", offset);
+		exit(1);
+	}
+}
+
+int main(int argc, char **argv)
+{
+	int fd;
+
+	test_init(argc, argv);
+
+	fd = open("/proc/self/exe", O_RDONLY);
+	if (fd < 0) {
+		fail("open");
+		exit(1);
+	}
+	check_offset(fd);
+
+	test_daemon();
+	test_waitsig();
+
+	check_offset(fd);
+
+	pass();
+	return 0;
+}

From e076c11e22a8b7c527dcc125c752cb62f77a6c3b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 21 Nov 2023 12:02:31 -0800
Subject: [PATCH 1433/1854] ci: fix codespell errors

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/net.c                              | 2 +-
 criu/pagemap-cache.c                    | 2 +-
 lib/py/images/pb2dict.py                | 2 +-
 plugins/amdgpu/amdgpu_plugin_topology.c | 2 +-
 scripts/nmk/scripts/main.mk             | 2 +-
 test/zdtm/static/mntns_open.c           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index e422e2f69..7109e6876 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3274,7 +3274,7 @@ int macvlan_ext_add(struct external *ext)
 /*
  * The setns() syscall (called by switch_ns()) can be extremely
  * slow. If we call it two or more times from the same task the
- * kernel will synchonously go on a very slow routine called
+ * kernel will synchronously go on a very slow routine called
  * synchronize_rcu() trying to put a reference on old namespaces.
  *
  * To avoid doing this more than once we pre-create all the
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 00f088ff3..09dbc6a36 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -115,7 +115,7 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 	 * fit in solid manner, iow -- either the whole vma fits
 	 * the cache window, either plain read is used.
 	 *
-	 * The benefit (apart redusing the number of read() calls)
+	 * The benefit (apart reducing the number of read() calls)
 	 * is to walk page tables less.
 	 */
 	if (!pagemap_cache_disabled && len < PMC_SIZE && (vma->e->start - low) < PMC_SIZE_GAP) {
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index fe41642d5..3f5f390e3 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -365,7 +365,7 @@ def pb2dict(pb, pretty=False, is_hex=False):
 def _dict2pb_cast(field, value):
     # Not considering TYPE_MESSAGE here, as repeated
     # and non-repeated messages need special treatment
-    # in this case, and are hadled separately.
+    # in this case, and are handled separately.
     if field.type == FD.TYPE_BYTES:
         return get_bytes_dec(field)(value)
     elif field.type == FD.TYPE_ENUM:
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 6d004247b..ef79e5ef4 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -1063,7 +1063,7 @@ static bool iolink_match(struct tp_iolink *src, struct tp_iolink *dest)
  *
  * Nodes compatibility are determined by:
  * 1. Comparing the node properties
- * 2. Making sure iolink mappings to CPUs would be compabitle with existing iolink mappings in maps
+ * 2. Making sure iolink mappings to CPUs would be compatible with existing iolink mappings in maps
  *
  * If src_node and dest_node are mappable, then map_device will push the new mapping
  * for src_node -> dest_node into new_maps.
diff --git a/scripts/nmk/scripts/main.mk b/scripts/nmk/scripts/main.mk
index 493a164f8..7f11bda23 100644
--- a/scripts/nmk/scripts/main.mk
+++ b/scripts/nmk/scripts/main.mk
@@ -1,7 +1,7 @@
 ifndef ____nmk_defined__main
 
 #
-# Genaral inclusion statement
+# General inclusion statement
 
 ifndef ____nmk_defined__include
         include $(__nmk_dir)include.mk
diff --git a/test/zdtm/static/mntns_open.c b/test/zdtm/static/mntns_open.c
index 7d8bbbaa4..0430f5b99 100644
--- a/test/zdtm/static/mntns_open.c
+++ b/test/zdtm/static/mntns_open.c
@@ -17,7 +17,7 @@
 #define CLONE_NEWNS 0x00020000
 #endif
 
-const char *test_doc = "Check that mnt_id is repsected";
+const char *test_doc = "Check that mnt_id is respected";
 const char *test_author = "Pavel Emelianov <xemul@parallels.com>";
 
 #define MPTS_FILE "F"

From 97b8b659c9497c66c7653ab226ec9bb093910795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <emmir@google.com>
Date: Wed, 31 May 2023 13:31:34 +0200
Subject: [PATCH 1434/1854] zdtm: cgroup_ifpriomap: Improve skip check's
 robustness.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cgroup_ifpriomap test needs net_prio cgroup, which might not be
available. Make the .checkskip script check it.

Signed-off-by: Michał Mirosław <emmir@google.com>
---
 test/zdtm/static/cgroup_ifpriomap.checkskip | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/cgroup_ifpriomap.checkskip b/test/zdtm/static/cgroup_ifpriomap.checkskip
index 205f8fc53..f401ad1b2 100755
--- a/test/zdtm/static/cgroup_ifpriomap.checkskip
+++ b/test/zdtm/static/cgroup_ifpriomap.checkskip
@@ -1,3 +1,6 @@
 #!/bin/bash
+set -e
 
-! test -f /sys/fs/cgroup/cgroup.controllers
+test ! -f /sys/fs/cgroup/cgroup.controllers
+
+grep -q '^net_prio\s' /proc/cgroups

From 0b62f4267a9939a192f4b88257fb19befa8b8bfb Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 9 Oct 2023 15:55:25 +0100
Subject: [PATCH 1435/1854] lib: use separate packages for pycriu and crit

Newer versions of pip use an isolated virtual environment when building
Python projects. However, when the source code of CRIT is copied into
the isolated environment, the symlink for `../lib/py` (pycriu) becomes
invalid. As a workaround, we used the `--no-build-isolation` option for
`pip install`. However, this functionality has issues in some versions
of PIP [1, 2]. To fix this problem, this patch adds separate packages
for pycriu and crit, and each package is installed independently.

[1] https://github.com/pypa/pip/pull/8221
[2] https://github.com/pypa/pip/issues/8165#issuecomment-625401463

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile                                   | 16 ++++++---
 Makefile.install                           |  7 +++-
 coredump/pycriu                            |  2 +-
 crit/.gitignore                            |  2 ++
 crit/Makefile                              | 40 ++++++++++++++++++++++
 crit/crit/__init__.py                      |  1 +
 lib/py/cli.py => crit/crit/__main__.py     | 20 +++++------
 crit/pycriu                                |  1 -
 crit/pyproject.toml                        | 23 +++++++++++--
 crit/requirements.txt                      |  7 ----
 crit/setup.cfg                             | 20 +++++++++++
 crit/setup.py                              | 19 +++-------
 lib/.gitignore                             |  1 +
 lib/Makefile                               | 32 ++++++++---------
 lib/{py => pycriu}/.gitignore              |  1 +
 lib/{py => pycriu}/Makefile                |  0
 lib/{py => pycriu}/__init__.py             |  2 +-
 lib/{py => pycriu}/criu.py                 |  0
 lib/{py => pycriu}/images/.gitignore       |  0
 lib/{py => pycriu}/images/Makefile         |  0
 lib/{py => pycriu}/images/__init__.py      |  0
 lib/{py => pycriu}/images/images.py        |  0
 lib/{py => pycriu}/images/pb2dict.py       |  0
 lib/pyproject.toml                         | 19 ++++++++++
 lib/setup.cfg                              | 16 +++++++++
 crit/crit => lib/setup.py                  |  4 +--
 test/others/env.sh                         | 11 ++++--
 test/pycriu                                |  2 +-
 test/zdtm/static/socket-tcp-fin-wait1.hook |  2 +-
 29 files changed, 182 insertions(+), 66 deletions(-)
 create mode 100644 crit/Makefile
 create mode 100644 crit/crit/__init__.py
 rename lib/py/cli.py => crit/crit/__main__.py (95%)
 delete mode 120000 crit/pycriu
 delete mode 100644 crit/requirements.txt
 create mode 100644 crit/setup.cfg
 create mode 100644 lib/.gitignore
 rename lib/{py => pycriu}/.gitignore (68%)
 rename lib/{py => pycriu}/Makefile (100%)
 rename lib/{py => pycriu}/__init__.py (67%)
 rename lib/{py => pycriu}/criu.py (100%)
 rename lib/{py => pycriu}/images/.gitignore (100%)
 rename lib/{py => pycriu}/images/Makefile (100%)
 rename lib/{py => pycriu}/images/__init__.py (100%)
 rename lib/{py => pycriu}/images/images.py (100%)
 rename lib/{py => pycriu}/images/pb2dict.py (100%)
 create mode 100644 lib/pyproject.toml
 create mode 100644 lib/setup.cfg
 rename crit/crit => lib/setup.py (55%)
 mode change 100755 => 100644

diff --git a/Makefile b/Makefile
index 4b3329473..88a23617b 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
 export AFLAGS CFLAGS USERCLFAGS HOSTCFLAGS
 
 # Default target
-all: criu lib
+all: criu lib crit
 .PHONY: all
 
 #
@@ -288,9 +288,9 @@ clean mrproper:
 	$(Q) $(MAKE) $(build)=criu $@
 	$(Q) $(MAKE) $(build)=soccr $@
 	$(Q) $(MAKE) $(build)=lib $@
+	$(Q) $(MAKE) $(build)=crit $@
 	$(Q) $(MAKE) $(build)=compel $@
 	$(Q) $(MAKE) $(build)=compel/plugins $@
-	$(Q) $(MAKE) $(build)=lib $@
 .PHONY: clean mrproper
 
 clean-amdgpu_plugin:
@@ -337,6 +337,10 @@ amdgpu_plugin: criu
 	$(Q) $(MAKE) -C plugins/amdgpu all
 .PHONY: amdgpu_plugin
 
+crit: lib
+	$(Q) $(MAKE) -C crit
+.PHONY: crit
+
 #
 # Generating tar requires tag matched CRIU_VERSION.
 # If not found then simply use GIT's describe with
@@ -402,6 +406,7 @@ help:
 	@echo '    Targets:'
 	@echo '      all             - Build all [*] targets'
 	@echo '    * criu            - Build criu'
+	@echo '    * crit            - Build crit'
 	@echo '      zdtm            - Build zdtm test-suite'
 	@echo '      docs            - Build documentation'
 	@echo '      install         - Install CRIU (see INSTALL.md)'
@@ -425,11 +430,12 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/zdtm.py
 	flake8 --config=scripts/flake8.cfg test/inhfd/*.py
 	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
-	flake8 --config=scripts/flake8.cfg lib/py/images/pb2dict.py
-	flake8 --config=scripts/flake8.cfg lib/py/images/images.py
+	flake8 --config=scripts/flake8.cfg lib/pycriu/images/pb2dict.py
+	flake8 --config=scripts/flake8.cfg lib/pycriu/images/images.py
 	flake8 --config=scripts/flake8.cfg scripts/criu-ns
 	flake8 --config=scripts/flake8.cfg test/others/criu-ns/run.py
-	flake8 --config=scripts/flake8.cfg crit/setup.py
+	flake8 --config=scripts/flake8.cfg crit/*.py
+	flake8 --config=scripts/flake8.cfg crit/crit/*.py
 	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
 	flake8 --config=scripts/flake8.cfg coredump/ coredump/coredump
 	flake8 --config=scripts/flake8.cfg scripts/github-indent-warnings.py
diff --git a/Makefile.install b/Makefile.install
index c798637be..6f5b31924 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -37,6 +37,10 @@ install-lib: lib
 	$(Q) $(MAKE) $(build)=lib install
 .PHONY: install-lib
 
+install-crit: lib
+	$(Q) $(MAKE) $(build)=crit install
+.PHONY: install-crit
+
 install-criu: criu
 	$(Q) $(MAKE) $(build)=criu install
 .PHONY: install-criu
@@ -50,12 +54,13 @@ install-compel: $(compel-install-targets)
 	$(Q) $(MAKE) $(build)=compel/plugins install
 .PHONY: install-compel
 
-install: install-man install-lib install-criu install-compel install-amdgpu_plugin ;
+install: install-man install-lib install-crit install-criu install-compel install-amdgpu_plugin ;
 .PHONY: install
 
 uninstall:
 	$(Q) $(MAKE) -C Documentation $@
 	$(Q) $(MAKE) $(build)=lib $@
+	$(Q) $(MAKE) $(build)=crit $@
 	$(Q) $(MAKE) $(build)=criu $@
 	$(Q) $(MAKE) $(build)=compel $@
 	$(Q) $(MAKE) $(build)=compel/plugins $@
diff --git a/coredump/pycriu b/coredump/pycriu
index d13a8790a..d1b6ed5c4 120000
--- a/coredump/pycriu
+++ b/coredump/pycriu
@@ -1 +1 @@
-../lib/py/
\ No newline at end of file
+../lib/pycriu
\ No newline at end of file
diff --git a/crit/.gitignore b/crit/.gitignore
index 810661179..10c8ab186 100644
--- a/crit/.gitignore
+++ b/crit/.gitignore
@@ -1,2 +1,4 @@
 crit.egg-info/
 build/
+dist/
+version.py
diff --git a/crit/Makefile b/crit/Makefile
new file mode 100644
index 000000000..9a856db6d
--- /dev/null
+++ b/crit/Makefile
@@ -0,0 +1,40 @@
+PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
+PIP_BREAK_SYSTEM_PACKAGES := 0
+
+VERSION_FILE := $(if $(obj),$(addprefix $(obj)/,crit/version.py),crit/version.py)
+
+all-y	+= ${VERSION_FILE}
+cleanup-y	+= ${VERSION_FILE}
+
+${VERSION_FILE}:
+	$(Q) echo "__version__ = '${CRIU_VERSION}'" > $@
+
+install: ${VERSION_FILE}
+ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
+ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+	$(E) "  SKIP INSTALL crit: Externally managed python environment (See PEP 668 for more information)"
+	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
+else
+	$(E) "  INSTALL " crit
+	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+endif
+else
+	$(E) "  INSTALL " crit
+	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+endif
+.PHONY: install
+
+uninstall:
+ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
+ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+	$(E) " SKIP UNINSTALL crit: Externally managed python environment (See PEP 668 for more information)"
+	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make uninstall"
+else
+	$(E) " UNINSTALL" crit
+	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+endif
+else
+	$(E) " UNINSTALL" crit
+	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+endif
+.PHONY: uninstall
diff --git a/crit/crit/__init__.py b/crit/crit/__init__.py
new file mode 100644
index 000000000..58f3ace6c
--- /dev/null
+++ b/crit/crit/__init__.py
@@ -0,0 +1 @@
+from .version import __version__
diff --git a/lib/py/cli.py b/crit/crit/__main__.py
similarity index 95%
rename from lib/py/cli.py
rename to crit/crit/__main__.py
index a3a0870f8..e15327f50 100755
--- a/lib/py/cli.py
+++ b/crit/crit/__main__.py
@@ -5,6 +5,7 @@ import json
 import os
 
 import pycriu
+from . import __version__
 
 
 def inf(opts):
@@ -41,9 +42,9 @@ def decode(opts):
     try:
         img = pycriu.images.load(inf(opts), opts['pretty'], opts['nopl'])
     except pycriu.images.MagicException as exc:
-        print("Unknown magic %#x.\n"\
-          "Maybe you are feeding me an image with "\
-          "raw data(i.e. pages.img)?" % exc.magic, file=sys.stderr)
+        print("Unknown magic %#x.\n"
+              "Maybe you are feeding me an image with "
+              "raw data(i.e. pages.img)?" % exc.magic, file=sys.stderr)
         sys.exit(1)
 
     if opts['pretty']:
@@ -59,9 +60,9 @@ def encode(opts):
     try:
         img = json.load(inf(opts))
     except UnicodeDecodeError:
-        print("Cannot read JSON.\n"\
-          "Maybe you are feeding me an image with protobuf data? "\
-          "Encode expects JSON input.", file=sys.stderr)
+        print("Cannot read JSON.\n"
+              "Maybe you are feeding me an image with protobuf data? "
+              "Encode expects JSON input.", file=sys.stderr)
         sys.exit(1)
     pycriu.images.dump(img, outf(opts, False))
 
@@ -131,7 +132,7 @@ def ftype_find_in_files(opts, ft, fid):
     if files_img is None:
         try:
             files_img = pycriu.images.load(dinf(opts, "files.img"))['entries']
-        except:
+        except Exception:
             files_img = []
 
     if len(files_img) == 0:
@@ -364,7 +365,7 @@ def main():
     desc = 'CRiu Image Tool'
     parser = argparse.ArgumentParser(
         description=desc, formatter_class=argparse.RawTextHelpFormatter)
-    parser.add_argument('--version', action='version', version=pycriu.__version__)
+    parser.add_argument('--version', action='version', version=__version__)
 
     subparsers = parser.add_subparsers(
         help='Use crit CMD --help for command-specific help')
@@ -374,8 +375,7 @@ def main():
         'decode', help='convert criu image from binary type to json')
     decode_parser.add_argument(
         '--pretty',
-        help=
-        'Multiline with indents and some numerical fields in field-specific format',
+        help='Multiline with indents and some numerical fields in field-specific format',
         action='store_true')
     decode_parser.add_argument(
         '-i',
diff --git a/crit/pycriu b/crit/pycriu
deleted file mode 120000
index d13a8790a..000000000
--- a/crit/pycriu
+++ /dev/null
@@ -1 +0,0 @@
-../lib/py/
\ No newline at end of file
diff --git a/crit/pyproject.toml b/crit/pyproject.toml
index 019b0d848..9089f0a39 100644
--- a/crit/pyproject.toml
+++ b/crit/pyproject.toml
@@ -1,3 +1,22 @@
 [build-system]
-# Minimum requirements for the build system to execute.
-requires = ["setuptools", "wheel"]  # PEP 508 specifications.
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "crit"
+description = "CRiu Image Tool"
+authors = [
+    {name = "CRIU team", email = "criu@openvz.org"},
+]
+license = {text = "GPLv2"}
+dynamic = ["version"]
+requires-python = ">=3.6"
+
+[project.scripts]
+crit = "crit.__main__:main"
+
+[tool.setuptools]
+packages = ["crit"]
+
+[tool.setuptools.dynamic]
+version = {attr = "crit.__version__"}
diff --git a/crit/requirements.txt b/crit/requirements.txt
deleted file mode 100644
index c27e6d4f0..000000000
--- a/crit/requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# We need pip version 20.1 or newer to correctly build with 'pycriu' symlink.
-# - Building of local directories with pip 20.1 or newer is done in place,
-#   instead of a temporary location containing a copy of the directory tree.
-#   (https://github.com/pypa/pip/issues/7555)
-pip>=20.1
-setuptools>=42.0.0
-wheel
diff --git a/crit/setup.cfg b/crit/setup.cfg
new file mode 100644
index 000000000..fbc9a5143
--- /dev/null
+++ b/crit/setup.cfg
@@ -0,0 +1,20 @@
+# Configuring setuptools using pyproject.toml files was introduced in setuptools 61.0.0
+# https://setuptools.pypa.io/en/latest/history.html#v61-0-0
+# For older versions of setuptools, we need to use the setup.cfg file
+# https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#declarative-config
+
+[metadata]
+name = crit
+description = CRiu Image Tool
+author = CRIU team
+author_email = criu@openvz.org
+license = GPLv2
+version = attr: crit.__version__
+
+[options]
+packages = crit
+python_requires = >=3.6
+
+[options.entry_points]
+console_scripts =
+    crit = crit.__main__:main
diff --git a/crit/setup.py b/crit/setup.py
index 2f584678f..618ac1de4 100644
--- a/crit/setup.py
+++ b/crit/setup.py
@@ -1,15 +1,6 @@
-from setuptools import setup, find_packages
-import pycriu
+#!/usr/bin/env python3
+import setuptools
 
-setup(
-    name='crit',
-    version=pycriu.__version__,
-    description='CRiu Image Tool',
-    author='CRIU team',
-    author_email='criu@openvz.org',
-    license='GPLv2',
-    url='https://github.com/checkpoint-restore/criu',
-    packages=find_packages('.'),
-    scripts=['crit'],
-    install_requires=[],
-)
+
+if __name__ == '__main__':
+    setuptools.setup()
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 000000000..a10181b80
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1 @@
+pycriu.egg-info/
diff --git a/lib/Makefile b/lib/Makefile
index 32d238de4..ae371e78e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -28,17 +28,17 @@ lib-a: lib/c/$(CRIU_A)
 
 #
 # Python bindings.
-lib/py/Makefile: ;
-lib/py/%: .FORCE
+lib/pycriu/Makefile: ;
+lib/pycriu/%: .FORCE
 	$(call msg-gen, $@)
-	$(Q) $(MAKE) $(build)=lib/py $@
+	$(Q) $(MAKE) $(build)=lib/pycriu $@
 lib-py:
-	$(Q) $(MAKE) $(build)=lib/py all
+	$(Q) $(MAKE) $(build)=lib/pycriu all
 .PHONY: lib-py
 
 clean-lib:
 	$(Q) $(MAKE) $(build)=lib/c clean
-	$(Q) $(MAKE) $(build)=lib/py clean
+	$(Q) $(MAKE) $(build)=lib/pycriu clean
 .PHONY: clean-lib
 clean: clean-lib
 cleanup-y	+= lib/c/$(CRIU_SO) lib/c/$(CRIU_A) lib/c/criu.pc
@@ -59,17 +59,15 @@ install: lib-c lib-a lib-py lib/c/criu.pc.in
 	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
 ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
 ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) "  SKIP INSTALL crit: Externally managed python environment (See PEP 668 for more information)"
+	$(E) "  SKIP INSTALL pycriu: Externally managed python environment (See PEP 668 for more information)"
 	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
 else
-	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install -r ./crit/requirements.txt
-	$(Q) $(PYTHON) -m pip install --no-build-isolation --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+	$(E) "  INSTALL " pycriu
+	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
 endif
 else
-	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install -r ./crit/requirements.txt
-	$(Q) $(PYTHON) -m pip install --no-build-isolation --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+	$(E) "  INSTALL " pycriu
+	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
 endif
 .PHONY: install
 
@@ -84,14 +82,14 @@ uninstall:
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBDIR)/pkgconfig/,criu.pc)
 ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
 ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) " SKIP UNINSTALL crit: Externally managed python environment (See PEP 668 for more information)"
+	$(E) " SKIP UNINSTALL pycriu: Externally managed python environment (See PEP 668 for more information)"
 	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make uninstall"
 else
-	$(E) " UNINSTALL" crit
-	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+	$(E) " UNINSTALL" pycriu
+	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) pycriu
 endif
 else
-	$(E) " UNINSTALL" crit
-	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+	$(E) " UNINSTALL" pycriu
+	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) pycriu
 endif
 .PHONY: uninstall
diff --git a/lib/py/.gitignore b/lib/pycriu/.gitignore
similarity index 68%
rename from lib/py/.gitignore
rename to lib/pycriu/.gitignore
index fba7e3864..111642787 100644
--- a/lib/py/.gitignore
+++ b/lib/pycriu/.gitignore
@@ -1,3 +1,4 @@
+__pycache__
 *_pb2.py
 *.pyc
 version.py
diff --git a/lib/py/Makefile b/lib/pycriu/Makefile
similarity index 100%
rename from lib/py/Makefile
rename to lib/pycriu/Makefile
diff --git a/lib/py/__init__.py b/lib/pycriu/__init__.py
similarity index 67%
rename from lib/py/__init__.py
rename to lib/pycriu/__init__.py
index 44f66ffa4..2abcf029d 100644
--- a/lib/py/__init__.py
+++ b/lib/pycriu/__init__.py
@@ -1,4 +1,4 @@
 from . import rpc_pb2 as rpc
 from . import images
 from .criu import *
-from .version import __version__
+from .version import __version__
\ No newline at end of file
diff --git a/lib/py/criu.py b/lib/pycriu/criu.py
similarity index 100%
rename from lib/py/criu.py
rename to lib/pycriu/criu.py
diff --git a/lib/py/images/.gitignore b/lib/pycriu/images/.gitignore
similarity index 100%
rename from lib/py/images/.gitignore
rename to lib/pycriu/images/.gitignore
diff --git a/lib/py/images/Makefile b/lib/pycriu/images/Makefile
similarity index 100%
rename from lib/py/images/Makefile
rename to lib/pycriu/images/Makefile
diff --git a/lib/py/images/__init__.py b/lib/pycriu/images/__init__.py
similarity index 100%
rename from lib/py/images/__init__.py
rename to lib/pycriu/images/__init__.py
diff --git a/lib/py/images/images.py b/lib/pycriu/images/images.py
similarity index 100%
rename from lib/py/images/images.py
rename to lib/pycriu/images/images.py
diff --git a/lib/py/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
similarity index 100%
rename from lib/py/images/pb2dict.py
rename to lib/pycriu/images/pb2dict.py
diff --git a/lib/pyproject.toml b/lib/pyproject.toml
new file mode 100644
index 000000000..8eb4b7084
--- /dev/null
+++ b/lib/pyproject.toml
@@ -0,0 +1,19 @@
+[build-system]
+requires = ["setuptools", "protobuf<4.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pycriu"
+description = "Python bindings for CRIU"
+authors = [
+    {name = "CRIU team", email = "criu@openvz.org"},
+]
+license = {text = "GPLv2"}
+dynamic = ["version"]
+requires-python = ">=3.6"
+
+[tool.setuptools]
+packages = ["pycriu", "pycriu.images"]
+
+[tool.setuptools.dynamic]
+version = {attr = "pycriu.__version__"}
diff --git a/lib/setup.cfg b/lib/setup.cfg
new file mode 100644
index 000000000..23ee48dd5
--- /dev/null
+++ b/lib/setup.cfg
@@ -0,0 +1,16 @@
+# Configuring setuptools using pyproject.toml files was introduced in setuptools 61.0.0
+# https://setuptools.pypa.io/en/latest/history.html#v61-0-0
+# For older versions of setuptools, we need to use the setup.cfg file
+# https://setuptools.pypa.io/en/latest/userguide/declarative_config.html#declarative-config
+
+[metadata]
+name = pycriu
+description = Python bindings for CRIU
+author = CRIU team
+author_email = criu@openvz.org
+license = GPLv2
+version = attr: pycriu.__version__
+
+[options]
+packages = find:
+python_requires = >=3.6
diff --git a/crit/crit b/lib/setup.py
old mode 100755
new mode 100644
similarity index 55%
rename from crit/crit
rename to lib/setup.py
index 3b15ca654..618ac1de4
--- a/crit/crit
+++ b/lib/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
+import setuptools
 
-from pycriu import cli
 
 if __name__ == '__main__':
-        cli.main()
+    setuptools.setup()
diff --git a/test/others/env.sh b/test/others/env.sh
index 6d830fb58..6fa2c9691 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -1,8 +1,13 @@
 #!/bin/sh
 
-CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu/criu)
+BASE_DIR="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/../../")"
+
+CRIU="${BASE_DIR}/criu/criu"
 criu=$CRIU
-CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit)
+
+export PYTHONPATH="${BASE_DIR}/lib:${BASE_DIR}/crit:${PYTHONPATH-}"
+CRIT="python3 -m crit"
 crit=$CRIT
-CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump)
+
+CRIU_COREDUMP="${BASE_DIR}/coredump/coredump"
 criu_coredump=$CRIU_COREDUMP
diff --git a/test/pycriu b/test/pycriu
index d13a8790a..d1b6ed5c4 120000
--- a/test/pycriu
+++ b/test/pycriu
@@ -1 +1 @@
-../lib/py/
\ No newline at end of file
+../lib/pycriu
\ No newline at end of file
diff --git a/test/zdtm/static/socket-tcp-fin-wait1.hook b/test/zdtm/static/socket-tcp-fin-wait1.hook
index 9dcd08999..30f8ce071 100755
--- a/test/zdtm/static/socket-tcp-fin-wait1.hook
+++ b/test/zdtm/static/socket-tcp-fin-wait1.hook
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys
 
-sys.path.append("../crit")
+sys.path.append("../lib")
 
 import pycriu
 import os, os.path

From f104b3d6d7c12447ce457a518825b7966c6ef53b Mon Sep 17 00:00:00 2001
From: Marcus Folkesson <marcus.folkesson@gmail.com>
Date: Fri, 20 Oct 2023 08:10:35 +0200
Subject: [PATCH 1436/1854] Makefile: introduce ARCHCFLAGS for arch specific
 cflags

Do not use $(USERCFLAGS) for anything other than what the user provide.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 Makefile               | 8 ++++----
 test/zdtm/Makefile.inc | 8 ++++----
 test/zdtm/lib/Makefile | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 88a23617b..9f0928b01 100644
--- a/Makefile
+++ b/Makefile
@@ -35,18 +35,18 @@ ifeq ($(ARCH),arm)
         ARMV		:= $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 
         ifeq ($(ARMV),6)
-                USERCFLAGS += -march=armv6
+                ARCHCFLAGS += -march=armv6
         endif
 
         ifeq ($(ARMV),7)
-                USERCFLAGS += -march=armv7-a+fp
+                ARCHCFLAGS += -march=armv7-a+fp
         endif
 
         ifeq ($(ARMV),8)
                 # Running 'setarch linux32 uname -m' returns armv8l on travis aarch64.
                 # This tells CRIU to handle armv8l just as armv7hf. Right now this is
                 # only used for compile testing. No further verification of armv8l exists.
-                USERCFLAGS += -march=armv7-a
+                ARCHCFLAGS += -march=armv7-a
                 ARMV := 7
         endif
 
@@ -159,7 +159,7 @@ export GMON GMONLDOPT
 endif
 
 AFLAGS			+= -D__ASSEMBLY__
-CFLAGS			+= $(USERCFLAGS) $(WARNINGS) $(DEFINES) -iquote include/
+CFLAGS			+= $(USERCFLAGS) $(ARCHCFLAGS) $(WARNINGS) $(DEFINES) -iquote include/
 HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
 export AFLAGS CFLAGS USERCLFAGS HOSTCFLAGS
 
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index d34523315..2456260e6 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -23,12 +23,12 @@ ifeq ($(ARCH),arm)
         ARMV := $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
 
         ifeq ($(ARMV),6)
-                USERCFLAGS += -march=armv6
+                ARCHCFLAGS += -march=armv6
         else ifeq ($(ARMV),7)
-                USERCFLAGS += -march=armv7-a+fp
+                ARCHCFLAGS += -march=armv7-a+fp
         else ifeq ($(ARMV),8)
                 # To build aarch32 on armv8 Travis-CI (see criu Makefile)
-                USERCFLAGS += -march=armv7-a
+                ARCHCFLAGS += -march=armv7-a
                 ARMV := 7
         endif
 endif
@@ -40,7 +40,7 @@ endif
 PKG_CONFIG ?= pkg-config
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= -Wdeclaration-after-statement -Wstrict-prototypes
-CFLAGS	+= $(USERCFLAGS)
+CFLAGS	+= $(USERCFLAGS) $(ARCHCFLAGS)
 CFLAGS	+= -D_GNU_SOURCE
 CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
 
diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index b574e1d3e..428d726d6 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -1,6 +1,6 @@
 LIBDIR	:= .
 
-CFLAGS	+= $(USERCFLAGS)
+CFLAGS	+= $(USERCFLAGS) $(ARCHCFLAGS)
 
 LIB	:= libzdtmtst.a
 

From f8b14286b092853a4485813e1efd564109df9123 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 16 Nov 2023 12:52:16 -0800
Subject: [PATCH 1437/1854] criu: Version 3.19 (Bronze Peacock)

Two major highlights of this release:
* LoongArch64 support
* A lot of fixes and improvments form the Google backlog.

The full changelog can be found here: https://criu.org/Download/criu/3.19.

This marks the final release of the 3.x series. The upcoming version
will be 4.0! Additionally, the naming pattern will be changed. Any ideas
are welcome.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 4c645cd6c..5f21c11c2 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 18
+CRIU_VERSION_MINOR	:= 19
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Silver Sandpiper
+CRIU_VERSION_NAME	:= Bronze Peacock
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From 9f9737c800fd19ebc133e654d69cc8b81aeb2e5e Mon Sep 17 00:00:00 2001
From: sally kang <snapekang@gmail.com>
Date: Mon, 27 Nov 2023 22:23:55 +0800
Subject: [PATCH 1438/1854] comple: correct the syscall number of bind on ARM64

In the compel/arch/arm/plugins/std/syscalls/syscall.def, the syscall number of bind on ARM64 should be 200 instead of 235

Signed-off-by: Sally Kang <snapekang@gmail.com>
---
 compel/arch/arm/plugins/std/syscalls/syscall.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 7489ee0c1..217e346a3 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -39,7 +39,7 @@ recvfrom			207	292	(int sockfd, void *ubuf, size_t size, unsigned int flags, str
 sendmsg				211	296	(int sockfd, const struct msghdr *msg, int flags)
 recvmsg				212	297	(int sockfd, struct msghdr *msg, int flags)
 shutdown			210	293	(int sockfd, int how)
-bind				235	282	(int sockfd, const struct sockaddr *addr, int addrlen)
+bind				200	282	(int sockfd, const struct sockaddr *addr, int addrlen)
 setsockopt			208	294	(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
 getsockopt			209	295	(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
 clone				220	120	(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)

From fc94b2d158961611d39b7e692c019487da43e01b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 29 Nov 2023 08:27:29 +0000
Subject: [PATCH 1439/1854] ci: fix rawhide netlink error

The rawhide netlink errors are fixed with a newer kernel than the
default 6.2 available in Fedora 38.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 328903f38..c0c8e88c1 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -57,6 +57,11 @@ fedora-no-vdso() {
 }
 
 fedora-rawhide() {
+	# The 6.2 kernel of Fedora 38 in combination with rawhide userspace breaks
+	# zdtm/static/socket-tcp-nfconntrack. To activate the new kernel previously
+	# installed this reboots the VM.
+	vagrant reload
+	ssh default uname -a
 	#
 	# Workaround the problem:
 	# error running container: error from /usr/bin/crun creating container for [...]: sd-bus call: Transport endpoint is not connected

From 900909d95e0bf13dba0ba93488bcebbdcdebc86b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 29 Nov 2023 12:30:42 +0000
Subject: [PATCH 1440/1854] test: check for btrfs in the current directory

The old test was checking if '/' is btrfs but we should check if the
current directory is btrfs.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/jenkins/criu-fault.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 7f503e817..4a6d55e6b 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -9,7 +9,7 @@ prep
 ./test/zdtm.py run -t zdtm/static/maps00 --fault 3 --report report -f h || fail
 
 # FIXME: fhandles looks broken on btrfs
-grep -P "/.* / " /proc/self/mountinfo | grep -q btrfs || NOBTRFS=$?
+findmnt --noheadings --target . | grep -q btrfs || NOBTRFS=$?
 if [ $NOBTRFS -eq 1 ] ; then
 	./test/zdtm.py run -t zdtm/static/inotify_irmap --fault 128 --pre 2 -f uns || fail
 fi

From 088390ea89b86ea2cca89ebcecd4e4046b52ace3 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 29 Nov 2023 14:56:41 +0000
Subject: [PATCH 1441/1854] ci: switch to permissive selinux mode during test

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/run-ci-tests.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 1aae555f7..e05ead668 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -292,10 +292,18 @@ if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true; then
 	make -C test/zdtm/ cleanout
 	rm -rf test/dump
 	setcap cap_checkpoint_restore,cap_sys_ptrace+eip criu/criu
+	if [ -d /sys/fs/selinux ]; then
+		# Note: selinux in Enforcing mode prevents us from calling clone3() or writing to ns_last_pid on restore; hence set to Permissive for the test and then set back.
+		selinuxmode=$(getenforce)
+		setenforce Permissive
+	fi
 	# Run it as non-root in a user namespace. Since CAP_CHECKPOINT_RESTORE behaves differently in non-user namespaces (e.g. no access to map_files) this tests that we can dump and restore
 	# under those conditions. Note that the "... && true" part is necessary; we need at least one statement after the tests so that bash can reap zombies in the user namespace,
 	# otherwise it will exec the last statement and get replaced and nobody will be left to reap our zombies.
 	sudo --user=#65534 --group=#65534 unshare -Ucfpm --mount-proc -- bash -c "./test/zdtm.py run -t zdtm/static/maps00 -f h --rootless && true"
+	if [ -d /sys/fs/selinux ]; then
+		setenforce "$selinuxmode"
+	fi
 	setcap -r criu/criu
 else
 	echo "Skipping unprivileged mode tests"

From 1004625facde4f2b747321ed7ef7260763d3650d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 28 Nov 2023 13:18:23 +0000
Subject: [PATCH 1442/1854] docker-test: fix condition for max tries

Replace a recursive call with a loop.

Reported-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 22d326a37..174c2e109 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -87,27 +87,25 @@ print_logs () {
 }
 
 declare -i max_restore_container_tries=3
-current_iteration=
 
 restore_container () {
 	CHECKPOINT_NAME=$1
 
-	docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log || {
+	for i in $(seq $max_restore_container_tries); do
+		docker start --checkpoint "$CHECKPOINT_NAME" cr 2>&1 | tee log && break
+
 		# FIXME: There is a race condition in docker/containerd that causes
 		# docker to occasionally fail when starting a container from a
 		# checkpoint immediately after the checkpoint has been created.
 		# https://github.com/moby/moby/issues/42900
-		if [ "$current_iteration" -gt "$max_restore_container_tries" ]; then
+		if grep -Eq '^Error response from daemon: failed to upload checkpoint to containerd: commit failed: content sha256:.*: already exists$' log; then
+			echo "Retry container restore: $i/$max_restore_container_tries"
+			sleep 1;
+		else
 			print_logs
 		fi
-		grep -Eq '^Error response from daemon: failed to upload checkpoint to containerd: commit failed: content sha256:.*: already exists$' log && {
-			((current_iteration+=1))
-			echo "Retry container restore: $current_iteration"
-			sleep 1;
-			restore_container "$CHECKPOINT_NAME"
-		} ||
-		print_logs
-	} && current_iteration=0
+
+	done
 }
 
 # Scenario: Create multiple containers and checkpoint and restore them once

From 37d62fa47552b1c70cd8cb8ea5564660d67c69ef Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 29 Nov 2023 11:46:08 +0000
Subject: [PATCH 1443/1854] docker-test: downgrade docker to v24.0.7

Checkpoint/restore with version 25.0.0-beta.1 fails
with the following error:

$ docker start --checkpoint=c1 cr
Error response from daemon: failed to create task for container: content digest fdb1054b00a8c07f08574ce52198c5501d1f552b6a5fb46105c688c70a9acb45: not found: unknown

Release notes:
https://github.com/moby/moby/discussions/46816

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/docker-test.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 174c2e109..7e7ef7197 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -15,10 +15,11 @@ add-apt-repository \
    $(lsb_release -cs) \
    stable test"
 
-./apt-install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-
-# shellcheck source=/dev/null
-. /etc/lsb-release
+# checkpoint/restore is broken in Docker Engine (Community) version 25.0.0-beta.1
+# https://github.com/moby/moby/discussions/46816
+# Downgrade to the latest stable version.
+VERSION_STRING=5:24.0.7-1~ubuntu.20.04~focal
+./apt-install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
 
 # docker checkpoint and restore is an experimental feature
 echo '{ "experimental": true }' > /etc/docker/daemon.json

From 8a51639e3d5b5cda0cc81c19ce0645a9f2f46019 Mon Sep 17 00:00:00 2001
From: "Ivan A. Melnikov" <iv@altlinux.org>
Date: Wed, 6 Dec 2023 18:01:08 +0400
Subject: [PATCH 1444/1854] Makefile: Use common warnings settings for
 loongarch64

WARNINGS variable should be amended, not redefined.
We still need, e.g.,  `-Wno-dangling-pointer` to build
criu on loongarch64 with gcc13.

Signed-off-by: Ivan A. Melnikov <iv@altlinux.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9f0928b01..05f1964a2 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,7 @@ WARNINGS		:= -rdynamic
 endif
 
 ifeq ($(ARCH),loongarch64)
-WARNINGS		:= -Wno-implicit-function-declaration
+WARNINGS		+= -Wno-implicit-function-declaration
 endif
 
 ifneq ($(GCOV),)

From f86f1b84911784ffd45db05204cea01a2a82afb3 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Fri, 8 Dec 2023 17:36:32 +0100
Subject: [PATCH 1445/1854] tty: skip ioctl(TIOCSLCKTRMIOS) if possible

If ioctl(TIOCSLCKTRMIOS) fails with EPERM it means that a CRIU
process lacks of CAP_SYS_ADMIN capability. But we can use
ioctl(TIOCGLCKTRMIOS) to *read* current ->termios_locked
value from the kernel and if it's the same as we already have
we can skip failing ioctl(TIOCSLCKTRMIOS) safely.

Adrian has recently posted [1] a very good patch to allow ioctl(TIOCSLCKTRMIOS)
for processes that have CAP_CHECKPOINT_RESTORE (right now it requires CAP_SYS_ADMIN).

[1] https://lore.kernel.org/all/20231206134340.7093-1-areber@redhat.com/

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/tty.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/criu/tty.c b/criu/tty.c
index 9faf602f2..ae23094b7 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -817,8 +817,26 @@ static int do_restore_tty_parms(void *arg, int fd, pid_t pid)
 	 * on termios too. Just to be on the safe side.
 	 */
 
-	if ((p->has & HAS_TERMIOS_L) && ioctl(fd, TIOCSLCKTRMIOS, &p->tl) < 0)
-		goto err;
+	if ((p->has & HAS_TERMIOS_L) && ioctl(fd, TIOCSLCKTRMIOS, &p->tl) < 0) {
+		struct termios t;
+
+		if (errno != EPERM)
+			goto err;
+
+		memzero(&t, sizeof(t));
+		if (ioctl(fd, TIOCGLCKTRMIOS, &t) < 0) {
+			pr_perror("Can't get tty locked params on %#x", p->tty_id);
+			goto err;
+		}
+
+		/*
+		 * The ioctl(TIOCSLCKTRMIOS) requires a CRIU process to be privileged
+		 * in the init_user_ns, but if the current "termios_locked" value equal
+		 * to the "termios_locked" value from the image, we can safely skip setting it.
+		 */
+		if (memcmp(&t, &p->tl, sizeof(struct termios)) != 0)
+			goto err;
+	}
 
 	if ((p->has & HAS_TERMIOS) && ioctl(fd, TCSETS, &p->t) < 0)
 		goto err;

From 6679d60ffd2da0282340a501ccfa1b439d452116 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 30 Nov 2023 13:29:56 +0000
Subject: [PATCH 1446/1854] ci: do not use 'tail' for skip-file-rwx-check test

Newer versions of 'tail' rely on inotify and after a restore 'tail' is
unhappy with the state of inotify and just stops.

This replaces 'tail' with a minimal shell based test (thanks Andrei).

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/skip-file-rwx-check/run.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/others/skip-file-rwx-check/run.sh b/test/others/skip-file-rwx-check/run.sh
index 0803d78ec..0776ebf61 100755
--- a/test/others/skip-file-rwx-check/run.sh
+++ b/test/others/skip-file-rwx-check/run.sh
@@ -10,11 +10,11 @@ source ../env.sh
 make clean
 touch testfile
 chmod +w testfile
-tail --follow testfile &
-tailpid=$!
-if ! "$criu" dump --tree=$tailpid --shell-job --verbosity=4 --log-file=dump.log
+bash -c 'exec 3<testfile; while :; do sleep 1; done' &
+testpid=$!
+if ! "$criu" dump --tree=$testpid --shell-job --verbosity=4 --log-file=dump.log
 then
-    kill $tailpid
+    kill $testpid
     echo "Failed to dump process as expected"
     echo FAIL
     exit 1
@@ -22,7 +22,7 @@ fi
 chmod -w testfile
 if "$criu" restore --restore-detached --shell-job --verbosity=4 --log-file=restore-expected-fail.log
 then
-    kill $tailpid
+    kill $testpid
     echo "Unexpectedly restored process with reference to a file who's r/w/x perms changed when --skip-file-rwx-check option was not used"
     echo FAIL
     exit 1
@@ -33,5 +33,5 @@ then
     echo FAIL
     exit 1
 fi
-kill $tailpid
+kill $testpid
 echo PASS

From fe8f5130c2a96254dbbd5ae9d4601502817bef46 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 30 Nov 2023 14:13:37 +0000
Subject: [PATCH 1447/1854] ci: fix centos-stream 9 ci errors

The image has a too old version of nettle which does not work with gnutls.
Just upgrade to the latest to make the error go away.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 6a586d58b..adaa9be33 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -37,6 +37,9 @@ task:
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
     dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto libdrm-devel
+    # The image has a too old version of nettle which does not work with gnutls.
+    # Just upgrade to the latest to make the error go away.
+    dnf -y upgrade nettle nettle-devel
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed.
     # The Cirrus CI user runs as a service from selinux point of view and is

From 2d1f4ec719b8bcdf60ffa57d7954965c41e61ad7 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 30 Nov 2023 15:10:23 +0000
Subject: [PATCH 1448/1854] ci: disable non-root in user namespace test in
 container

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/prepare-for-fedora-rawhide.sh |  1 +
 scripts/ci/run-ci-tests.sh               | 11 ++++++++---
 scripts/ci/vagrant.sh                    |  4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index e31814a95..d812c5faa 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -18,6 +18,7 @@ dnf install -y \
 	libnet-devel \
 	libnl3-devel \
 	libbsd-devel \
+	libselinux-utils \
 	make \
 	procps-ng \
 	protobuf-c-devel \
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index e05ead668..ef7e869e0 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -288,11 +288,16 @@ ip net add test
 
 # Rootless tests
 # Check if cap_checkpoint_restore is supported and also if unshare -c is supported.
-if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true; then
+#
+# Do not run this test in a container (see https://github.com/checkpoint-restore/criu/issues/2312).
+# This is a temporary workaround until fixed in the kernel.
+# The kernel currently does not show correct device and inode numbers in /proc/pid/maps
+# for stackable file systems.
+if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true && [ ! -e /run/.containerenv ]; then
 	make -C test/zdtm/ cleanout
 	rm -rf test/dump
 	setcap cap_checkpoint_restore,cap_sys_ptrace+eip criu/criu
-	if [ -d /sys/fs/selinux ]; then
+	if [ -d /sys/fs/selinux ] && command -v getenforce &>/dev/null; then
 		# Note: selinux in Enforcing mode prevents us from calling clone3() or writing to ns_last_pid on restore; hence set to Permissive for the test and then set back.
 		selinuxmode=$(getenforce)
 		setenforce Permissive
@@ -301,7 +306,7 @@ if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true; then
 	# under those conditions. Note that the "... && true" part is necessary; we need at least one statement after the tests so that bash can reap zombies in the user namespace,
 	# otherwise it will exec the last statement and get replaced and nobody will be left to reap our zombies.
 	sudo --user=#65534 --group=#65534 unshare -Ucfpm --mount-proc -- bash -c "./test/zdtm.py run -t zdtm/static/maps00 -f h --rootless && true"
-	if [ -d /sys/fs/selinux ]; then
+	if [ -d /sys/fs/selinux ] && command -v getenforce &>/dev/null; then
 		setenforce "$selinuxmode"
 	fi
 	setcap -r criu/criu
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index c0c8e88c1..c8cf0be74 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -70,6 +70,10 @@ fedora-rawhide() {
 	#
 	ssh default 'sudo dnf remove -y crun || true'
 	ssh default sudo dnf install -y podman runc
+	# Some tests in the container need selinux to be disabled.
+	# In the container it is not possible to change the state of selinux.
+	# Let's just disable it for this test run completely.
+	ssh default 'sudo setenforce Permissive'
 	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"'
 }
 

From 7b689b7a423e16864b7cd99cc1a216a4464f9591 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 20 Oct 2023 10:59:19 +0100
Subject: [PATCH 1449/1854] gitignore: remove historical left-over files

In commit [1] was introduced a mechanism to auto-generate the files:
sys-exec-tbl*.c, syscalls*.S, syscall-codes*.h, and syscall*.h.
This commit also updated the gitignore rules to ignore auto-generated
files. However, after commit [2], the path for these files has changed
and the patterns specified in gitignore are no longer needed.

[1] bbc2f133 (x86/build: generate syscalls-{64,32}.built-in.o)
[2] 19fadee9 (compel: plugins,std -- Implement syscalls in std plugin)

Reported-by: @felicitia
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .gitignore | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f2ab2029..854657d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,12 +25,6 @@ images/google/protobuf/*.h
 .gitid
 criu/criu
 criu/unittest/unittest
-criu/arch/*/sys-exec-tbl*.c
-# x86 syscalls-table is not generated
-!criu/arch/x86/sys-exec-tbl.c
-criu/arch/*/syscalls*.S
-criu/include/syscall-codes*.h
-criu/include/syscall*.h
 criu/include/version.h
 criu/pie/restorer-blob.h
 criu/pie/parasite-blob.h

From b419f3dfdc7f8b8caa2af44e4af93d01c7bd34d1 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 27 Dec 2023 20:33:30 -0800
Subject: [PATCH 1450/1854] make: fix compilation on alpine

Starting with the musl v1.2.4~69, _GNU_SOURCE doesn't set _LARGEFILE64_SOURCE.

Fixes #2313
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile                        | 1 +
 scripts/build/Dockerfile.alpine | 2 +-
 test/zdtm/Makefile.inc          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 05f1964a2..31dbe202f 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,7 @@ export PROTOUFIX DEFINES
 #
 # Independent options for all tools.
 DEFINES			+= -D_FILE_OFFSET_BITS=64
+DEFINES			+= -D_LARGEFILE64_SOURCE
 DEFINES			+= -D_GNU_SOURCE
 
 WARNINGS		:= -Wall -Wformat-security -Wdeclaration-after-statement -Wstrict-prototypes
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index cb746757a..593e19031 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -47,6 +47,6 @@ RUN apk add \
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
 
-RUN pip3 install junit_xml
+RUN pip3 install junit_xml --break-system-packages
 
 RUN make -C test/zdtm
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 2456260e6..24f32c606 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -41,7 +41,7 @@ PKG_CONFIG ?= pkg-config
 CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS	+= -Wdeclaration-after-statement -Wstrict-prototypes
 CFLAGS	+= $(USERCFLAGS) $(ARCHCFLAGS)
-CFLAGS	+= -D_GNU_SOURCE
+CFLAGS	+= -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
 CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
 
 ifeq ($(strip $(V)),)

From d9c427d70c03e62b23c3e9491bebdbd5c60ef16f Mon Sep 17 00:00:00 2001
From: robert <robert.ayrapetyan@gmail.com>
Date: Sun, 7 Jan 2024 15:32:00 -0800
Subject: [PATCH 1451/1854] irmap: hardcode some more interesting paths

Signed-off-by: robert <robert.ayrapetyan@gmail.com>
---
 criu/irmap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/irmap.c b/criu/irmap.c
index e12df5cb5..37d098db1 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -67,6 +67,7 @@ static struct irmap hints[] = {
 		.path = "/var/log",
 		.nr_kids = -1,
 	},
+	{ .path = "/usr/share/dbus-1/services", .nr_kids = -1 },
 	{ .path = "/usr/share/dbus-1/system-services", .nr_kids = -1 },
 	{ .path = "/var/lib/polkit-1/localauthority", .nr_kids = -1 },
 	{ .path = "/usr/share/polkit-1/actions", .nr_kids = -1 },

From 0ab2f9e976952679239f937642dc8ac020bbdca9 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 5 Jan 2024 14:40:25 +0000
Subject: [PATCH 1452/1854] net: fix network unlock with iptables-nft

When iptables-nft is used as backend for iptables, the rules for
network locking are translated into the following nft rules:

```
$ iptables-restore-translate -f lock.txt
add table ip filter
add chain ip filter CRIU
insert rule ip filter INPUT counter jump CRIU
insert rule ip filter OUTPUT counter jump CRIU
add rule ip filter CRIU mark 0xc114 counter accept
add rule ip filter CRIU counter drop
```

These rules create the following chains:

```
table ip filter { # handle 1
	chain CRIU { # handle 1
		meta mark 0x0000c114 counter packets 16 bytes 890 accept # handle 6
		counter packets 1 bytes 60 drop # handle 7
		meta mark 0x0000c114 counter packets 0 bytes 0 accept # handle 8
		counter packets 0 bytes 0 drop # handle 9
	}

	chain INPUT { # handle 2
		type filter hook input priority filter; policy accept;
		counter packets 8 bytes 445 jump CRIU # handle 3
		counter packets 0 bytes 0 jump CRIU # handle 10
	}

	chain OUTPUT { # handle 4
		type filter hook output priority filter; policy accept;
		counter packets 9 bytes 505 jump CRIU # handle 5
		counter packets 0 bytes 0 jump CRIU # handle 11
	}
}
```

In order to delete the CRIU chain, we need to first delete all four
jump targets. Otherwise, `-X CRIU` would fail with the following error:

iptables-restore v1.8.10 (nf_tables):
line 5: CHAIN_DEL failed (Resource busy): chain CRIU

Reported-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/net.c | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 7109e6876..b34c379ba 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3178,19 +3178,53 @@ static inline int nftables_network_unlock(void)
 #endif
 }
 
+static int iptables_has_criu_jump_target(void)
+{
+	int fd, ret;
+	char *argv[4] = { "sh", "-c", "iptables -C INPUT -j CRIU", NULL };
+
+	fd = open("/dev/null", O_RDWR);
+	if (fd < 0) {
+		fd = -1;
+		pr_perror("failed to open /dev/null, using log fd");
+	}
+
+	ret = cr_system(fd, fd, fd, "sh", argv, CRS_CAN_FAIL);
+	close_safe(&fd);
+	return ret;
+}
+
 static int iptables_network_unlock_internal(void)
 {
-	char conf[] = "*filter\n"
-		      ":CRIU - [0:0]\n"
-		      "-D INPUT -j CRIU\n"
-		      "-D OUTPUT -j CRIU\n"
-		      "-X CRIU\n"
-		      "COMMIT\n";
+	char delete_jump_targets[] = "*filter\n"
+				     ":CRIU - [0:0]\n"
+				     "-D INPUT -j CRIU\n"
+				     "-D OUTPUT -j CRIU\n"
+				     "COMMIT\n";
+
+	char delete_criu_chain[] = "*filter\n"
+				   ":CRIU - [0:0]\n"
+				   "-X CRIU\n"
+				   "COMMIT\n";
+
 	int ret = 0;
 
-	ret |= iptables_restore(false, conf, sizeof(conf) - 1);
+	ret |= iptables_restore(false, delete_jump_targets, sizeof(delete_jump_targets) - 1);
 	if (kdat.ipv6)
-		ret |= iptables_restore(true, conf, sizeof(conf) - 1);
+		ret |= iptables_restore(true, delete_jump_targets, sizeof(delete_jump_targets) - 1);
+
+	/* For compatibility with iptables-nft backend, we need to make sure that all jump
+	 * targets have been removed before deleting the CRIU chain.
+	 */
+	if (!iptables_has_criu_jump_target()) {
+		ret |= iptables_restore(false, delete_jump_targets, sizeof(delete_jump_targets) - 1);
+		if (kdat.ipv6)
+			ret |= iptables_restore(true, delete_jump_targets, sizeof(delete_jump_targets) - 1);
+	}
+
+	ret |= iptables_restore(false, delete_criu_chain, sizeof(delete_criu_chain) - 1);
+	if (kdat.ipv6)
+		ret |= iptables_restore(true, delete_criu_chain, sizeof(delete_criu_chain) - 1);
 
 	return ret;
 }

From d94251df755b5fa5751b2f6cc56e45bde7703938 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 5 Jan 2024 18:07:59 +0000
Subject: [PATCH 1453/1854] test/nfconntrack: use nft or iptables-legacy

nft does not support xtables compat expressions
https://git.netfilter.org/nftables/commit/?id=79195a8cc9e9d9cf2d17165bf07ac4cc9d55539f

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.alpine               |  1 +
 test/zdtm/static/Makefile                     |  8 +++---
 ...nntrack.c => socket-tcp-ipt-nfconntrack.c} |  0
 .../static/socket-tcp-ipt-nfconntrack.desc    |  6 +++++
 test/zdtm/static/socket-tcp-nfconntrack.desc  |  1 -
 test/zdtm/static/socket-tcp-nft-nfconntrack.c |  1 +
 .../static/socket-tcp-nft-nfconntrack.desc    |  7 +++++
 test/zdtm/static/socket-tcp.c                 | 27 ++++++++++++++++---
 8 files changed, 44 insertions(+), 7 deletions(-)
 rename test/zdtm/static/{socket-tcp-nfconntrack.c => socket-tcp-ipt-nfconntrack.c} (100%)
 create mode 100644 test/zdtm/static/socket-tcp-ipt-nfconntrack.desc
 delete mode 100644 test/zdtm/static/socket-tcp-nfconntrack.desc
 create mode 120000 test/zdtm/static/socket-tcp-nft-nfconntrack.c
 create mode 100644 test/zdtm/static/socket-tcp-nft-nfconntrack.desc

diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 593e19031..2c58c910e 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -33,6 +33,7 @@ RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 RUN apk add \
 	ip6tables \
 	iptables \
+	iptables-legacy \
 	nftables \
 	iproute2 \
 	tar \
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 07d3bc6e2..fb856d55b 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -85,7 +85,8 @@ TST_NOFILE	:=				\
 		socket-tcp4v6			\
 		socket-tcp-local		\
 		socket-tcp-reuseport		\
-		socket-tcp-nfconntrack		\
+		socket-tcp-ipt-nfconntrack	\
+		socket-tcp-nft-nfconntrack	\
 		socket-tcp6-local		\
 		socket-tcp4v6-local		\
 		socket-tcpbuf			\
@@ -277,7 +278,7 @@ pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
 ifeq ($(call pkg-config-check,libbpf),y)
 TST_NOFILE	+=				\
 		bpf_hash			\
-		bpf_array			
+		bpf_array
 endif
 
 ifneq ($(ARCH),arm)
@@ -598,7 +599,8 @@ socket-tcpbuf6-local:	CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6
 socket-tcp6-local:	CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6
 socket-tcp4v6-local:	CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV4V6
 socket-tcp-local:	CFLAGS += -D ZDTM_TCP_LOCAL
-socket-tcp-nfconntrack: CFLAGS += -D ZDTM_TCP_LOCAL -DZDTM_CONNTRACK
+socket-tcp-ipt-nfconntrack: CFLAGS += -D ZDTM_TCP_LOCAL -DZDTM_IPT_CONNTRACK
+socket-tcp-nft-nfconntrack: CFLAGS += -D ZDTM_TCP_LOCAL -DZDTM_NFT_CONNTRACK
 socket_listen6:		CFLAGS += -D ZDTM_IPV6
 socket_listen4v6:	CFLAGS += -D ZDTM_IPV4V6
 socket-tcp6-closed:	CFLAGS += -D ZDTM_IPV6
diff --git a/test/zdtm/static/socket-tcp-nfconntrack.c b/test/zdtm/static/socket-tcp-ipt-nfconntrack.c
similarity index 100%
rename from test/zdtm/static/socket-tcp-nfconntrack.c
rename to test/zdtm/static/socket-tcp-ipt-nfconntrack.c
diff --git a/test/zdtm/static/socket-tcp-ipt-nfconntrack.desc b/test/zdtm/static/socket-tcp-ipt-nfconntrack.desc
new file mode 100644
index 000000000..53dd82285
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-ipt-nfconntrack.desc
@@ -0,0 +1,6 @@
+{
+    'feature': 'has_ipt_legacy',
+    'flavor': 'h',
+    'opts': '--tcp-established',
+    'flags': 'suid'
+}
diff --git a/test/zdtm/static/socket-tcp-nfconntrack.desc b/test/zdtm/static/socket-tcp-nfconntrack.desc
deleted file mode 100644
index add2513f8..000000000
--- a/test/zdtm/static/socket-tcp-nfconntrack.desc
+++ /dev/null
@@ -1 +0,0 @@
-{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'suid'}
diff --git a/test/zdtm/static/socket-tcp-nft-nfconntrack.c b/test/zdtm/static/socket-tcp-nft-nfconntrack.c
new file mode 120000
index 000000000..8cb60dd03
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-nft-nfconntrack.c
@@ -0,0 +1 @@
+socket-tcp.c
\ No newline at end of file
diff --git a/test/zdtm/static/socket-tcp-nft-nfconntrack.desc b/test/zdtm/static/socket-tcp-nft-nfconntrack.desc
new file mode 100644
index 000000000..38a4eb389
--- /dev/null
+++ b/test/zdtm/static/socket-tcp-nft-nfconntrack.desc
@@ -0,0 +1,7 @@
+{
+    'flavor': 'h',
+    'feature': 'network_lock_nftables',
+    'opts': '--tcp-established',
+    'dopts': '--network-lock nftables',
+    'flags': 'suid'
+}
diff --git a/test/zdtm/static/socket-tcp.c b/test/zdtm/static/socket-tcp.c
index f6ef47385..9830c7860 100644
--- a/test/zdtm/static/socket-tcp.c
+++ b/test/zdtm/static/socket-tcp.c
@@ -67,17 +67,38 @@ int main(int argc, char **argv)
 	int val;
 	socklen_t optlen;
 
-#ifdef ZDTM_CONNTRACK
+#ifdef ZDTM_IPT_CONNTRACK
 	if (unshare(CLONE_NEWNET)) {
 		pr_perror("unshare");
 		return 1;
 	}
 	if (system("ip link set up dev lo"))
 		return 1;
-	if (system("iptables -w -A INPUT -i lo -p tcp -m state --state NEW,ESTABLISHED -j ACCEPT"))
+
+	if (system("iptables-legacy -w -A INPUT -i lo -p tcp -m state --state NEW,ESTABLISHED -j ACCEPT"))
 		return 1;
-	if (system("iptables -w -A INPUT -j DROP"))
+	if (system("iptables-legacy -w -A INPUT -j DROP"))
 		return 1;
+
+#endif
+
+#ifdef ZDTM_NFT_CONNTRACK
+	if (unshare(CLONE_NEWNET)) {
+		pr_perror("unshare");
+		return 1;
+	}
+	if (system("ip link set up dev lo"))
+		return 1;
+
+	if (system("nft add table ip filter"))
+		return 1;
+	if (system("nft add chain ip filter INPUT"))
+		return 1;
+	if (system("nft add rule ip filter INPUT iifname \"lo\" ip protocol tcp ct state new,established counter accept"))
+		return 1;
+	if (system("nft add rule ip filter INPUT counter drop"))
+		return 1;
+
 #endif
 
 #ifdef ZDTM_TCP_LOCAL

From 842289c7ebb303f9dd42f2e20ea6787218123bde Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 7 Jan 2024 18:09:28 +0000
Subject: [PATCH 1454/1854] net: add error messages for restore of nftables

Show appropriate error messages when restore of nftables fails.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/net.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index b34c379ba..0f7280bb5 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2438,27 +2438,39 @@ static inline int do_restore_nftables(struct cr_img *img)
 	off_t img_data_size;
 	char *buf;
 
-	if ((img_data_size = img_raw_size(img)) < 0)
+	if ((img_data_size = img_raw_size(img)) < 0) {
+		pr_err("image size mismatch\n");
 		goto out;
+	}
 
-	if (read_img_str(img, &buf, img_data_size) < 0)
+	if (read_img_str(img, &buf, img_data_size) < 0) {
+		pr_err("Failed to read nftables data\n");
 		goto out;
+	}
 
 	nft = nft_ctx_new(NFT_CTX_DEFAULT);
-	if (!nft)
+	if (!nft) {
+		pr_err("Failed to create nft context object\n");
 		goto buf_free_out;
-
-	if (nft_ctx_buffer_output(nft) || nft_ctx_buffer_error(nft) ||
-#if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
-	    nft_run_cmd_from_buffer(nft, buf, strlen(buf)))
-#elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
-	    nft_run_cmd_from_buffer(nft, buf))
-#else
-	{
-		BUILD_BUG_ON(1);
 	}
-#endif
+
+	if (nft_ctx_buffer_output(nft) || nft_ctx_buffer_error(nft)) {
+		pr_err("Failed to enable std/err output buffering\n");
 		goto nft_ctx_free_out;
+	}
+
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0)
+	if (nft_run_cmd_from_buffer(nft, buf, strlen(buf)))
+#elif defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	if (nft_run_cmd_from_buffer(nft, buf))
+#else
+	BUILD_BUG_ON(1);
+#endif
+	{
+		pr_err("nft command error:\n%s\n%s\n",
+		       nft_ctx_get_error_buffer(nft), buf);
+		goto nft_ctx_free_out;
+	}
 
 	exit_code = 0;
 

From 20628bc8a1f04b5f975373dd5bccff778e908f5c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 25 Oct 2023 01:07:27 +0000
Subject: [PATCH 1455/1854] kerndat: check the PAGEMAP_SCAN ioctl

PAGEMAP_SCAN is a new ioctl that allows to get page attributes in a more
effeciant way than reading pagemap files.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-check.c             | 10 ++++++
 criu/include/kerndat.h      |  1 +
 criu/include/pagemap_scan.h | 68 +++++++++++++++++++++++++++++++++++++
 criu/kerndat.c              | 20 +++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 criu/include/pagemap_scan.h

diff --git a/criu/cr-check.c b/criu/cr-check.c
index cb083b16c..fea1ce674 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1382,6 +1382,14 @@ static int check_ipv6_freebind(void)
 	return 0;
 }
 
+static int check_pagemap_scan(void)
+{
+	if (!kdat.has_pagemap_scan)
+		return -1;
+
+	return 0;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1502,6 +1510,7 @@ int cr_check(void)
 		ret |= check_openat2();
 		ret |= check_ptrace_get_rseq_conf();
 		ret |= check_ipv6_freebind();
+		ret |= check_pagemap_scan();
 
 		if (kdat.lsm == LSMTYPE__APPARMOR)
 			ret |= check_apparmor_stacking();
@@ -1623,6 +1632,7 @@ static struct feature_list feature_list[] = {
 	{ "openat2", check_openat2 },
 	{ "get_rseq_conf", check_ptrace_get_rseq_conf },
 	{ "ipv6_freebind", check_ipv6_freebind },
+	{ "pagemap_scan", check_pagemap_scan },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index f5d409acb..91dbd494b 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -86,6 +86,7 @@ struct kerndat_s {
 	struct __ptrace_rseq_configuration libc_rseq_conf;
 	bool has_ipv6_freebind;
 	bool has_membarrier_get_registrations;
+	bool has_pagemap_scan;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/pagemap_scan.h b/criu/include/pagemap_scan.h
new file mode 100644
index 000000000..0ad4c9bc0
--- /dev/null
+++ b/criu/include/pagemap_scan.h
@@ -0,0 +1,68 @@
+#ifndef __CR_PAGEMAP_SCAN_H__
+#define __CR_PAGEMAP_SCAN_H__
+
+#ifndef PAGEMAP_SCAN
+#include <sys/types.h>
+#include "int.h"
+
+/* Bitmasks provided in pm_scan_args masks and reported in page_region.categories. */
+#define PAGE_IS_WPALLOWED  (1 << 0)
+#define PAGE_IS_WRITTEN	   (1 << 1)
+#define PAGE_IS_FILE	   (1 << 2)
+#define PAGE_IS_PRESENT	   (1 << 3)
+#define PAGE_IS_SWAPPED	   (1 << 4)
+#define PAGE_IS_PFNZERO	   (1 << 5)
+#define PAGE_IS_HUGE	   (1 << 6)
+#define PAGE_IS_SOFT_DIRTY (1 << 7)
+
+/*
+ * struct page_region - Page region with flags
+ * @start:      Start of the region
+ * @end:        End of the region (exclusive)
+ * @categories: PAGE_IS_* category bitmask for the region
+ */
+struct page_region {
+	u64 start;
+	u64 end;
+	u64 categories;
+};
+
+#define PAGEMAP_SCAN _IOWR('f', 16, struct pm_scan_arg)
+
+/* Flags for PAGEMAP_SCAN ioctl */
+#define PM_SCAN_WP_MATCHING   (1 << 0) /* Write protect the pages matched. */
+#define PM_SCAN_CHECK_WPASYNC (1 << 1) /* Abort the scan when a non-WP-enabled page is found. */
+
+/*
+ * struct pm_scan_arg - Pagemap ioctl argument
+ * @size:               Size of the structure
+ * @flags:              Flags for the IOCTL
+ * @start:              Starting address of the region
+ * @end:                Ending address of the region
+ * @walk_end            Address where the scan stopped (written by kernel).
+ *                      walk_end == end (address tags cleared) informs that the scan completed on entire range.
+ * @vec:                Address of page_region struct array for output
+ * @vec_len:            Length of the page_region struct array
+ * @max_pages:          Optional limit for number of returned pages (0 = disabled)
+ * @category_inverted:  PAGE_IS_* categories which values match if 0 instead of 1
+ * @category_mask:      Skip pages for which any category doesn't match
+ * @category_anyof_mask: Skip pages for which no category matches
+ * @return_mask:        PAGE_IS_* categories that are to be reported in `page_region`s returned
+ */
+struct pm_scan_arg {
+	u64 size;
+	u64 flags;
+	u64 start;
+	u64 end;
+	u64 walk_end;
+	u64 vec;
+	u64 vec_len;
+	u64 max_pages;
+	u64 category_inverted;
+	u64 category_mask;
+	u64 category_anyof_mask;
+	u64 return_mask;
+};
+#endif /* PAGEMAP_SCAN */
+
+#endif /* __CR_PAGEMAP_SCAN_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index fef5a46c1..95e7226b2 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -54,6 +54,7 @@
 #include "memfd.h"
 #include "mount-v2.h"
 #include "util-caps.h"
+#include "pagemap_scan.h"
 
 struct kerndat_s kdat = {};
 volatile int dummy_var;
@@ -74,6 +75,25 @@ static int check_pagemap(void)
 		return -1;
 	}
 
+	if (ioctl(fd, PAGEMAP_SCAN, NULL) == 0) {
+		pr_err("PAGEMAP_SCAN succeeded unexpectedly\n");
+		return -1;
+	} else {
+		switch (errno) {
+		case EFAULT:
+			pr_debug("PAGEMAP_SCAN is supported\n");
+			kdat.has_pagemap_scan = true;
+			break;
+		case EINVAL:
+		case ENOTTY:
+			pr_debug("PAGEMAP_SCAN isn't supported\n");
+			break;
+		default:
+			pr_perror("PAGEMAP_SCAN failed with unexpected errno");
+			return -1;
+		}
+	}
+
 	retry = 3;
 	while (retry--) {
 		++dummy_var;

From cb64d73adadf63c49a0fd6d458f5fe05a90daf1e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 23 Oct 2023 18:52:13 +0000
Subject: [PATCH 1456/1854] page-cache: use the PAGEMAP_SCAN ioctl when it is
 available

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/mem.h           |   4 +-
 criu/include/pagemap-cache.h |  13 +++-
 criu/include/shmem.h         |   3 +-
 criu/mem.c                   | 112 +++++++++++++++++++++++------------
 criu/pagemap-cache.c         |  88 +++++++++++++++++++++------
 criu/shmem.c                 |  23 ++++---
 6 files changed, 172 insertions(+), 71 deletions(-)

diff --git a/criu/include/mem.h b/criu/include/mem.h
index 03574ea3d..3618c9cc3 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -7,6 +7,7 @@
 #include "pid.h"
 #include "proc_parse.h"
 #include "inventory.pb-c.h"
+#include "pagemap-cache.h"
 
 struct parasite_ctl;
 struct vm_area_list;
@@ -47,5 +48,6 @@ int open_vmas(struct pstree_item *t);
 int prepare_vmas(struct pstree_item *t, struct task_restore_args *ta);
 int unmap_guard_pages(struct pstree_item *t);
 int prepare_mappings(struct pstree_item *t);
-bool should_dump_page(VmaEntry *vmae, u64 pme);
+
+u64 should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, bool *softdirty);
 #endif /* __CR_MEM_H__ */
diff --git a/criu/include/pagemap-cache.h b/criu/include/pagemap-cache.h
index 1d8bbffaf..875e69e56 100644
--- a/criu/include/pagemap-cache.h
+++ b/criu/include/pagemap-cache.h
@@ -1,10 +1,12 @@
 #ifndef __CR_PAGEMAP_H__
 #define __CR_PAGEMAP_H__
 
+#include <stdbool.h>
 #include <sys/types.h>
 #include "int.h"
 
 #include "common/list.h"
+#include "pagemap_scan.h"
 
 struct vma_area;
 
@@ -15,9 +17,15 @@ typedef struct {
 	unsigned long start;		  /* start of area */
 	unsigned long end;		  /* end of area */
 	const struct list_head *vma_head; /* list head of VMAs we're serving */
+	int fd;				  /* file to read PMs from */
+
 	u64 *map;			  /* local buffer */
 	size_t map_len;			  /* length of a buffer */
-	int fd;				  /* file to read PMs from */
+
+	struct page_region *regs; /* buffer for the PAGEMAP_SCAN ioctl */
+	size_t regs_len;	  /* actual length of regs */
+	size_t regs_max_len;	  /* maximum length of regs */
+	size_t regs_idx;	  /* current index in the regs array */
 } pmc_t;
 
 #define PMC_INIT \
@@ -26,7 +34,8 @@ typedef struct {
 	}
 
 extern int pmc_init(pmc_t *pmc, pid_t pid, const struct list_head *vma_head, size_t size);
-extern u64 *pmc_get_map(pmc_t *pmc, const struct vma_area *vma);
+extern int pmc_get_map(pmc_t *pmc, const struct vma_area *vma);
 extern void pmc_fini(pmc_t *pmc);
+extern int pmc_fill(pmc_t *pmc, u64 start, u64 end);
 
 #endif /* __CR_PAGEMAP_H__ */
diff --git a/criu/include/shmem.h b/criu/include/shmem.h
index 813ef630e..15cab1146 100644
--- a/criu/include/shmem.h
+++ b/criu/include/shmem.h
@@ -4,13 +4,14 @@
 #include "int.h"
 #include "common/lock.h"
 #include "images/vma.pb-c.h"
+#include "pagemap-cache.h"
 
 struct vma_area;
 
 extern int collect_shmem(int pid, struct vma_area *vma);
 extern int collect_sysv_shmem(unsigned long shmid, unsigned long size);
 extern int cr_dump_shmem(void);
-extern int add_shmem_area(pid_t pid, VmaEntry *vma, u64 *map);
+extern int add_shmem_area(pid_t pid, VmaEntry *vma, pmc_t *pmc);
 extern int fixup_sysv_shmems(void);
 extern int dump_one_memfd_shmem(int fd, unsigned long shmid, unsigned long size);
 extern int dump_one_sysv_shmem(void *addr, unsigned long size, unsigned long shmid);
diff --git a/criu/mem.c b/criu/mem.c
index 417e0a21d..f56ed826b 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -99,7 +99,7 @@ static inline bool __page_in_parent(bool dirty)
 	return opts.track_mem && opts.img_parent && !dirty;
 }
 
-bool should_dump_page(VmaEntry *vmae, u64 pme)
+static bool should_dump_entire_vma(VmaEntry *vmae)
 {
 	/*
 	 * vDSO area must be always dumped because on restore
@@ -107,30 +107,53 @@ bool should_dump_page(VmaEntry *vmae, u64 pme)
 	 */
 	if (vma_entry_is(vmae, VMA_AREA_VDSO))
 		return true;
-	/*
-	 * In turn VVAR area is special and referenced from
-	 * vDSO area by IP addressing (at least on x86) thus
-	 * never ever dump its content but always use one provided
-	 * by the kernel on restore, ie runtime VVAR area must
-	 * be remapped into proper place..
-	 */
-	if (vma_entry_is(vmae, VMA_AREA_VVAR))
-		return false;
-
-	/*
-	 * Optimisation for private mapping pages, that haven't
-	 * yet being COW-ed
-	 */
-	if (vma_entry_is(vmae, VMA_FILE_PRIVATE) && (pme & PME_FILE))
-		return false;
 	if (vma_entry_is(vmae, VMA_AREA_AIORING))
 		return true;
-	if ((pme & (PME_PRESENT | PME_SWAP)) && !__page_is_zero(pme))
-		return true;
 
 	return false;
 }
 
+/*
+ * should_dump_page returns vaddr if an addressed page has to be dumped.
+ * Otherwise, it returns an address that has to be inspected next.
+ */
+u64 should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, bool *softdirty)
+{
+	if (vaddr >= pmc->end && pmc_fill(pmc, vaddr, vmae->end))
+		return -1;
+
+	if (pmc->regs) {
+		while (1) {
+			if (pmc->regs_idx == pmc->regs_len)
+				return pmc->end;
+			if (vaddr < pmc->regs[pmc->regs_idx].end)
+				break;
+			pmc->regs_idx++;
+		}
+		if (vaddr < pmc->regs[pmc->regs_idx].start)
+			return pmc->regs[pmc->regs_idx].start;
+		if (softdirty)
+			*softdirty = pmc->regs[pmc->regs_idx].categories & PAGE_IS_SOFT_DIRTY;
+		return vaddr;
+	} else {
+		u64 pme = pmc->map[PAGE_PFN(vaddr - pmc->start)];
+
+		/*
+		 * Optimisation for private mapping pages, that haven't
+		 * yet being COW-ed
+		 */
+		if (vma_entry_is(vmae, VMA_FILE_PRIVATE) && (pme & PME_FILE))
+			return vaddr + PAGE_SIZE;
+		if ((pme & (PME_PRESENT | PME_SWAP)) && !__page_is_zero(pme)) {
+			if (softdirty)
+				*softdirty = pme & PME_SOFT_DIRTY;
+			return vaddr;
+		}
+
+		return vaddr + PAGE_SIZE;
+	}
+}
+
 bool page_is_zero(u64 pme)
 {
 	return __page_is_zero(pme);
@@ -164,25 +187,30 @@ static bool is_stack(struct pstree_item *item, unsigned long vaddr)
  * the memory contents is present in the parent image set.
  */
 
-static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct page_pipe *pp, u64 *map, u64 *off,
+static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct page_pipe *pp, pmc_t *pmc, u64 *pvaddr,
 			 bool has_parent)
 {
-	u64 *at = &map[PAGE_PFN(*off)];
-	unsigned long pfn, nr_to_scan;
+	unsigned long nr_scanned;
 	unsigned long pages[3] = {};
+	unsigned long vaddr;
+	bool dump_all_pages;
 	int ret = 0;
 
-	nr_to_scan = (vma_area_len(vma) - *off) / PAGE_SIZE;
+	dump_all_pages = should_dump_entire_vma(vma->e);
 
-	for (pfn = 0; pfn < nr_to_scan; pfn++) {
-		unsigned long vaddr;
+	nr_scanned = 0;
+	for (vaddr = *pvaddr; vaddr < vma->e->end; vaddr += PAGE_SIZE, nr_scanned++) {
 		unsigned int ppb_flags = 0;
+		bool softdirty = false;
+		u64 next;
 		int st;
 
-		if (!should_dump_page(vma->e, at[pfn]))
+		/* If dump_all_pages is true, should_dump_page is called to get pme. */
+		next = should_dump_page(pmc, vma->e, vaddr, &softdirty);
+		if (!dump_all_pages && next != vaddr) {
+			vaddr = next - PAGE_SIZE;
 			continue;
-
-		vaddr = vma->e->start + *off + pfn * PAGE_SIZE;
+		}
 
 		if (vma_entry_can_be_lazy(vma->e) && !is_stack(item, vaddr))
 			ppb_flags |= PPB_LAZY;
@@ -194,7 +222,7 @@ static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct
 		 * page. The latter would be checked in page-xfer.
 		 */
 
-		if (has_parent && page_in_parent(at[pfn] & PME_SOFT_DIRTY)) {
+		if (has_parent && page_in_parent(softdirty)) {
 			ret = page_pipe_add_hole(pp, vaddr, PP_HOLE_PARENT);
 			st = 0;
 		} else {
@@ -214,9 +242,8 @@ static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct
 		pages[st]++;
 	}
 
-	*off += pfn * PAGE_SIZE;
-
-	cnt_add(CNT_PAGES_SCANNED, nr_to_scan);
+	*pvaddr = vaddr;
+	cnt_add(CNT_PAGES_SCANNED, nr_scanned);
 	cnt_add(CNT_PAGES_SKIPPED_PARENT, pages[0]);
 	cnt_add(CNT_PAGES_LAZY, pages[1]);
 	cnt_add(CNT_PAGES_WRITTEN, pages[2]);
@@ -356,12 +383,20 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma, str
 			     struct page_xfer *xfer, struct parasite_dump_pages_args *args, struct parasite_ctl *ctl,
 			     pmc_t *pmc, bool has_parent, bool pre_dump, int parent_predump_mode)
 {
-	u64 off = 0;
-	u64 *map;
+	u64 vaddr;
 	int ret;
 
 	if (!vma_area_is_private(vma, kdat.task_size) && !vma_area_is(vma, VMA_ANON_SHARED))
 		return 0;
+	/*
+	 * In turn VVAR area is special and referenced from
+	 * vDSO area by IP addressing (at least on x86) thus
+	 * never ever dump its content but always use one provided
+	 * by the kernel on restore, ie runtime VVAR area must
+	 * be remapped into proper place..
+	 */
+	if (vma_entry_is(vma->e, VMA_AREA_VVAR))
+		return 0;
 
 	/*
 	 * To facilitate any combination of pre-dump modes to run after
@@ -421,15 +456,14 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma, str
 		has_parent = false;
 	}
 
-	map = pmc_get_map(pmc, vma);
-	if (!map)
+	if (pmc_get_map(pmc, vma))
 		return -1;
 
 	if (vma_area_is(vma, VMA_ANON_SHARED))
-		return add_shmem_area(item->pid->real, vma->e, map);
-
+		return add_shmem_area(item->pid->real, vma->e, pmc);
+	vaddr = vma->e->start;
 again:
-	ret = generate_iovs(item, vma, pp, map, &off, has_parent);
+	ret = generate_iovs(item, vma, pp, pmc, &vaddr, has_parent);
 	if (ret == -EAGAIN) {
 		BUG_ON(!(pp->flags & PP_CHUNK_MODE));
 
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 09dbc6a36..d9bd1bc86 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -1,5 +1,6 @@
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
 
 #include "page.h"
 #include "pagemap-cache.h"
@@ -22,6 +23,8 @@
 
 #define PAGEMAP_LEN(addr) (PAGE_PFN(addr) * sizeof(u64))
 
+#define PAGE_REGIONS_MAX_NR 32768
+
 /*
  * It's a workaround for a kernel bug. In the 3.19 kernel when pagemap are read
  * for a few vma-s for one read call, it returns incorrect data.
@@ -50,10 +53,23 @@ int pmc_init(pmc_t *pmc, pid_t pid, const struct list_head *vma_head, size_t siz
 	pmc->pid = pid;
 	pmc->map_len = PAGEMAP_LEN(map_size);
 	pmc->vma_head = vma_head;
+	pmc->regs_max_len = PAGE_PFN(map_size);
+	if (pmc->regs_max_len > PAGE_REGIONS_MAX_NR)
+		pmc->regs_max_len = PAGE_REGIONS_MAX_NR;
+	pmc->regs_len = 0;
+	pmc->regs_idx = 0;
+	pmc->regs = NULL;
+	pmc->map = NULL;
 
-	pmc->map = xmalloc(pmc->map_len);
-	if (!pmc->map)
-		goto err;
+	if (kdat.has_pagemap_scan) {
+		pmc->regs = xmalloc(pmc->regs_max_len * sizeof(struct page_region));
+		if (!pmc->regs)
+			goto err;
+	} else {
+		pmc->map = xmalloc(pmc->map_len);
+		if (!pmc->map)
+			goto err;
+	}
 
 	if (pagemap_cache_disabled)
 		pr_warn_once("The pagemap cache is disabled\n");
@@ -87,17 +103,11 @@ err:
 	return -1;
 }
 
-static inline u64 *__pmc_get_map(pmc_t *pmc, unsigned long addr)
-{
-	return &pmc->map[PAGE_PFN(addr - pmc->start)];
-}
-
 static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 {
 	unsigned long low = vma->e->start & PMC_MASK;
 	unsigned long high = low + PMC_SIZE;
 	size_t len = vma_area_len(vma);
-	size_t size_map;
 
 	if (high > kdat.task_size)
 		high = kdat.task_size;
@@ -149,39 +159,79 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 			pr_debug("\t%d: simple mode [l:%lx h:%lx]\n", pmc->pid, pmc->start, pmc->end);
 	}
 
+	return pmc_fill(pmc, pmc->start, pmc->end);
+}
+
+int pmc_fill(pmc_t *pmc, u64 start, u64 end)
+{
+	size_t size_map;
+
+	pmc->start = start;
+	pmc->end = end;
+
 	size_map = PAGEMAP_LEN(pmc->end - pmc->start);
 	BUG_ON(pmc->map_len < size_map);
 	BUG_ON(pmc->fd < 0);
 
-	if (pread(pmc->fd, pmc->map, size_map, PAGEMAP_PFN_OFF(pmc->start)) != size_map) {
-		pmc_zap(pmc);
-		pr_perror("Can't read %d's pagemap file", pmc->pid);
-		return -1;
+	if (pmc->regs) {
+		struct pm_scan_arg args = {
+			.size = sizeof(struct pm_scan_arg),
+			.flags = 0,
+			.start = pmc->start,
+			.end = pmc->end,
+			.vec = (long)pmc->regs,
+			.vec_len = pmc->regs_max_len,
+			.max_pages = 0,
+			/*
+			 * Request pages that are in  RAM or swap, excluding
+			 * zero-filled and file-backed pages.
+			 */
+			.category_inverted = PAGE_IS_PFNZERO | PAGE_IS_FILE,
+			.category_mask = PAGE_IS_PFNZERO | PAGE_IS_FILE,
+			.category_anyof_mask = PAGE_IS_PRESENT | PAGE_IS_SWAPPED,
+			.return_mask = PAGE_IS_PRESENT | PAGE_IS_SWAPPED | PAGE_IS_SOFT_DIRTY,
+		};
+		long ret;
+
+		ret = ioctl(pmc->fd, PAGEMAP_SCAN, &args);
+		if (ret == -1) {
+			pr_perror("PAGEMAP_SCAN");
+			pmc_zap(pmc);
+			return -1;
+		}
+		pmc->regs_len = ret;
+		pmc->regs_idx = 0;
+		pmc->end = args.walk_end;
+	} else {
+		if (pread(pmc->fd, pmc->map, size_map, PAGEMAP_PFN_OFF(pmc->start)) != size_map) {
+			pmc_zap(pmc);
+			pr_perror("Can't read %d's pagemap file", pmc->pid);
+			return -1;
+		}
 	}
 
 	return 0;
 }
 
-u64 *pmc_get_map(pmc_t *pmc, const struct vma_area *vma)
+int pmc_get_map(pmc_t *pmc, const struct vma_area *vma)
 {
 	/* Hit */
 	if (likely(pmc->start <= vma->e->start && pmc->end >= vma->e->end))
-		return __pmc_get_map(pmc, vma->e->start);
+		return 0;
 
 	/* Miss, refill the cache */
 	if (pmc_fill_cache(pmc, vma)) {
 		pr_err("Failed to fill cache for %d (%lx-%lx)\n", pmc->pid, (long)vma->e->start, (long)vma->e->end);
-		return NULL;
+		return -1;
 	}
-
-	/* Hit for sure */
-	return __pmc_get_map(pmc, vma->e->start);
+	return 0;
 }
 
 void pmc_fini(pmc_t *pmc)
 {
 	close_safe(&pmc->fd);
 	xfree(pmc->map);
+	xfree(pmc->regs);
 	pmc_reset(pmc);
 }
 
diff --git a/criu/shmem.c b/criu/shmem.c
index c13a39b66..9e3178352 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -206,23 +206,28 @@ static int expand_shmem(struct shmem_info *si, unsigned long new_size)
 	return 0;
 }
 
-static void update_shmem_pmaps(struct shmem_info *si, u64 *map, VmaEntry *vma)
+static void update_shmem_pmaps(struct shmem_info *si, pmc_t *pmc, VmaEntry *vma)
 {
 	unsigned long shmem_pfn, vma_pfn, vma_pgcnt;
+	u64 vaddr;
 
 	if (!is_shmem_tracking_en())
 		return;
 
 	vma_pgcnt = DIV_ROUND_UP(si->size - vma->pgoff, PAGE_SIZE);
-	for (vma_pfn = 0; vma_pfn < vma_pgcnt; ++vma_pfn) {
-		if (!should_dump_page(vma, map[vma_pfn]))
+	for (vma_pfn = 0, vaddr = vma->start; vma_pfn < vma_pgcnt; ++vma_pfn, vaddr += PAGE_SIZE) {
+		bool softdirty = false;
+		u64 next;
+
+		next = should_dump_page(pmc, vma, vaddr, &softdirty);
+		if (next != vaddr) {
+			vaddr = next - PAGE_SIZE;
 			continue;
+		}
 
 		shmem_pfn = vma_pfn + DIV_ROUND_UP(vma->pgoff, PAGE_SIZE);
-		if (map[vma_pfn] & PME_SOFT_DIRTY)
+		if (softdirty)
 			set_pstate(si->pstate_map, shmem_pfn, PST_DIRTY);
-		else if (page_is_zero(map[vma_pfn]))
-			set_pstate(si->pstate_map, shmem_pfn, PST_ZERO);
 		else
 			set_pstate(si->pstate_map, shmem_pfn, PST_DUMP);
 	}
@@ -648,7 +653,7 @@ err:
 	return -1;
 }
 
-int add_shmem_area(pid_t pid, VmaEntry *vma, u64 *map)
+int add_shmem_area(pid_t pid, VmaEntry *vma, pmc_t *pmc)
 {
 	struct shmem_info *si;
 	unsigned long size = vma->pgoff + (vma->end - vma->start);
@@ -662,7 +667,7 @@ int add_shmem_area(pid_t pid, VmaEntry *vma, u64 *map)
 			if (expand_shmem(si, size))
 				return -1;
 		}
-		update_shmem_pmaps(si, map, vma);
+		update_shmem_pmaps(si, pmc, vma);
 
 		return 0;
 	}
@@ -679,7 +684,7 @@ int add_shmem_area(pid_t pid, VmaEntry *vma, u64 *map)
 
 	if (expand_shmem(si, size))
 		return -1;
-	update_shmem_pmaps(si, map, vma);
+	update_shmem_pmaps(si, pmc, vma);
 
 	return 0;
 }

From afc0efcf78d922daf058ea49c083db38f85d2933 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 29 Nov 2023 23:25:44 +0000
Subject: [PATCH 1457/1854] pagemap-cache: add an ability to run tests without
 PAGEMAP_SCAN

This change adds a new injectable fault (135) to disable PAGEMAP_SCAN and fault
back to read pagemap files.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/fault-injection.h | 1 +
 criu/pagemap-cache.c           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 69d670be9..fe75dfe86 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -19,6 +19,7 @@ enum faults {
 	FI_HUGE_ANON_SHMEM_ID = 132,
 	FI_CANNOT_MAP_VDSO = 133,
 	FI_CORRUPT_EXTREGS = 134,
+	FI_DONT_USE_PAGEMAP_SCAN = 135,
 	FI_MAX,
 };
 
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index d9bd1bc86..978a6b1ac 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -11,6 +11,7 @@
 #include "vma.h"
 #include "mem.h"
 #include "kerndat.h"
+#include "fault-injection.h"
 
 #undef LOG_PREFIX
 #define LOG_PREFIX "pagemap-cache: "
@@ -61,7 +62,7 @@ int pmc_init(pmc_t *pmc, pid_t pid, const struct list_head *vma_head, size_t siz
 	pmc->regs = NULL;
 	pmc->map = NULL;
 
-	if (kdat.has_pagemap_scan) {
+	if (kdat.has_pagemap_scan && !fault_injected(FI_DONT_USE_PAGEMAP_SCAN)) {
 		pmc->regs = xmalloc(pmc->regs_max_len * sizeof(struct page_region));
 		if (!pmc->regs)
 			goto err;

From d2511707fa29fc0ccb588bfb83196ff5c613166c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 22 Jan 2024 17:50:39 +0800
Subject: [PATCH 1458/1854] zdtm: socket-tcp-nft-nfconntrack: add a hook to the
 chain in nft case

Let's use hooked nft chain which actually affects packets.

Fixes: e5f4d8c6f ("test/nfconntrack: use nft or iptables-legacy")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/socket-tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/socket-tcp.c b/test/zdtm/static/socket-tcp.c
index 9830c7860..bc2075496 100644
--- a/test/zdtm/static/socket-tcp.c
+++ b/test/zdtm/static/socket-tcp.c
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 
 	if (system("nft add table ip filter"))
 		return 1;
-	if (system("nft add chain ip filter INPUT"))
+	if (system("nft 'add chain ip filter INPUT { type filter hook input priority 0 ; }'"))
 		return 1;
 	if (system("nft add rule ip filter INPUT iifname \"lo\" ip protocol tcp ct state new,established counter accept"))
 		return 1;

From a62f827302655efb12d0594e7766fe0a6af78ff6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 24 Jan 2024 10:39:00 +0000
Subject: [PATCH 1459/1854] criu-log: remove unused declaration

This patch removes a leftover declaration for log_closedir()
which has been removed in the following commit:

dc80d6f125e1e919363a0b8f938b8679ff0dbc2b
log: get rid of LOG_DIR_FD_OFF and opening cwd in log_init()

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/include/criu-log.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/criu/include/criu-log.h b/criu/include/criu-log.h
index ae2f38489..9d52fbdb1 100644
--- a/criu/include/criu-log.h
+++ b/criu/include/criu-log.h
@@ -26,7 +26,6 @@
 extern int log_init(const char *output);
 extern void log_fini(void);
 extern int log_init_by_pid(pid_t pid);
-extern void log_closedir(void);
 extern int log_keep_err(void);
 extern char *log_first_err(void);
 

From 92e8f9293bd796d7d06c91dea29116b945a0aaa4 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 23 Jan 2024 07:28:40 +0000
Subject: [PATCH 1460/1854] net: return bool with iptable_has_criu_jump_target

To improve readability, this patch changes the return type of
iptables_has_criu_jump_target() to a boolean, where 'true' indicates
that iptables has CRIU jump target and 'false' indicates otherwise.

Suggested-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/net.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index 0f7280bb5..b5c4a6ee3 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3190,7 +3190,7 @@ static inline int nftables_network_unlock(void)
 #endif
 }
 
-static int iptables_has_criu_jump_target(void)
+static bool iptables_has_criu_jump_target(void)
 {
 	int fd, ret;
 	char *argv[4] = { "sh", "-c", "iptables -C INPUT -j CRIU", NULL };
@@ -3203,7 +3203,7 @@ static int iptables_has_criu_jump_target(void)
 
 	ret = cr_system(fd, fd, fd, "sh", argv, CRS_CAN_FAIL);
 	close_safe(&fd);
-	return ret;
+	return !ret;
 }
 
 static int iptables_network_unlock_internal(void)
@@ -3228,7 +3228,7 @@ static int iptables_network_unlock_internal(void)
 	/* For compatibility with iptables-nft backend, we need to make sure that all jump
 	 * targets have been removed before deleting the CRIU chain.
 	 */
-	if (!iptables_has_criu_jump_target()) {
+	if (iptables_has_criu_jump_target()) {
 		ret |= iptables_restore(false, delete_jump_targets, sizeof(delete_jump_targets) - 1);
 		if (kdat.ipv6)
 			ret |= iptables_restore(true, delete_jump_targets, sizeof(delete_jump_targets) - 1);

From 59599dacdd5fe91262125927ce0b3e42e3aaecd0 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Tue, 30 Jan 2024 14:59:48 -0500
Subject: [PATCH 1461/1854] plugin/amdgpu: Don't print error for "No such
 process" during resume

During the late stages of restore, each process being resumed gets
an ioctl call to KFD_CRIU_OP_RESUME. If the process has no kfd
process info, this call with fail with -ESRCH. This is normal
behaviour, so we shouldn't print an error message for it.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 plugins/amdgpu/amdgpu_plugin.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 32ff8f936..3675353a7 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1999,7 +1999,10 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	args.op = KFD_CRIU_OP_RESUME;
 	pr_info("Calling IOCTL to start notifiers and queues\n");
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
-		pr_perror("restore late ioctl failed");
+		if (errno == ESRCH)
+			pr_info("Pid %d has no kfd process info\n", target_pid);
+		else
+			pr_perror("restore late ioctl failed");
 		ret = -1;
 	}
 

From b689a6710cb8bfc2a0784cbce2b77c8aa157fad9 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 5 Feb 2024 11:17:40 +0800
Subject: [PATCH 1462/1854] plugin/amdgpu: Also don't print 'plugin failed' in
 criu

We already don't treat it as error in the plugin itself, but after
returning -1 from RESUME_DEVICES_LATE hook we print debug message in
criu about failed plugin, let's return 0 instead.

While on it let's replace ret to exit_code.

Fixes: a9cbdad76 ("plugin/amdgpu: Don't print error for "No such process" during resume")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 plugins/amdgpu/amdgpu_plugin.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 3675353a7..23253632d 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1985,7 +1985,7 @@ CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, amdgpu_plugin_update_vma
 int amdgpu_plugin_resume_devices_late(int target_pid)
 {
 	struct kfd_ioctl_criu_args args = { 0 };
-	int fd, ret = 0;
+	int fd, exit_code = 0;
 
 	pr_info("Inside %s for target pid = %d\n", __func__, target_pid);
 
@@ -1999,15 +1999,16 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	args.op = KFD_CRIU_OP_RESUME;
 	pr_info("Calling IOCTL to start notifiers and queues\n");
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
-		if (errno == ESRCH)
+		if (errno == ESRCH) {
 			pr_info("Pid %d has no kfd process info\n", target_pid);
-		else
+		} else {
 			pr_perror("restore late ioctl failed");
-		ret = -1;
+			exit_code = -1;
+		}
 	}
 
 	close(fd);
-	return ret;
+	return exit_code;
 }
 
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)

From 733ef9631570cecd94efe72d98e7255ca0e05956 Mon Sep 17 00:00:00 2001
From: Ramesh Errabolu <Ramesh.Errabolu@amd.com>
Date: Fri, 10 Nov 2023 11:36:34 -0600
Subject: [PATCH 1463/1854] amdgpu_plugin: Refactor code in preparation to
 support C&R for DRM devices

Add a new compilation unit to host symbols and methods that will be
needed to C&R DRM devices. Refactor code that indicates support for
C&R and checkpoints KFD and DRM devices

Signed-off-by: Ramesh Errabolu <Ramesh.Errabolu@amd.com>
---
 plugins/amdgpu/Makefile                 |   2 +-
 plugins/amdgpu/amdgpu_plugin.c          | 245 ++++--------------------
 plugins/amdgpu/amdgpu_plugin_drm.c      |  63 ++++++
 plugins/amdgpu/amdgpu_plugin_drm.h      |  22 +++
 plugins/amdgpu/amdgpu_plugin_topology.c |  41 ++--
 plugins/amdgpu/amdgpu_plugin_topology.h |   2 +
 plugins/amdgpu/amdgpu_plugin_util.c     | 208 ++++++++++++++++++++
 plugins/amdgpu/amdgpu_plugin_util.h     | 106 ++++++++++
 plugins/amdgpu/criu-amdgpu.proto        |  18 +-
 9 files changed, 460 insertions(+), 247 deletions(-)
 create mode 100644 plugins/amdgpu/amdgpu_plugin_drm.c
 create mode 100644 plugins/amdgpu/amdgpu_plugin_drm.h
 create mode 100755 plugins/amdgpu/amdgpu_plugin_util.c
 create mode 100755 plugins/amdgpu/amdgpu_plugin_util.h

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 64a923d38..5efa8fb0b 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -28,7 +28,7 @@ endif
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
 
-amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_topology.c criu-amdgpu.pb-c.c
+amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c
 	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 23253632d..60e04f973 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -30,55 +30,14 @@
 #include "files.h"
 
 #include "common/list.h"
+#include "amdgpu_plugin_drm.h"
+#include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
 
 #include "img-streamer.h"
 #include "image.h"
 #include "cr_options.h"
 
-#define AMDGPU_KFD_DEVICE "/dev/kfd"
-#define PROCPIDMEM	  "/proc/%d/mem"
-#define HSAKMT_SHM_PATH	  "/dev/shm/hsakmt_shared_mem"
-#define HSAKMT_SHM	  "/hsakmt_shared_mem"
-#define HSAKMT_SEM_PATH	  "/dev/shm/sem.hsakmt_semaphore"
-#define HSAKMT_SEM	  "hsakmt_semaphore"
-
-#define KFD_IOCTL_MAJOR_VERSION	    1
-#define MIN_KFD_IOCTL_MINOR_VERSION 8
-
-#define IMG_KFD_FILE	 "amdgpu-kfd-%d.img"
-#define IMG_RENDERD_FILE "amdgpu-renderD-%d.img"
-#define IMG_PAGES_FILE	 "amdgpu-pages-%d-%04x.img"
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
-#ifdef LOG_PREFIX
-#undef LOG_PREFIX
-#endif
-#define LOG_PREFIX "amdgpu_plugin: "
-
-#ifdef DEBUG
-#define plugin_log_msg(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define plugin_log_msg(fmt, ...) \
-	{                        \
-	}
-#endif
-
-#define SDMA_PACKET(op, sub_op, e) ((((e)&0xFFFF) << 16) | (((sub_op)&0xFF) << 8) | (((op)&0xFF) << 0))
-
-#define SDMA_OPCODE_COPY	    1
-#define SDMA_COPY_SUB_OPCODE_LINEAR 0
-#define SDMA_NOP		    0
-#define SDMA_LINEAR_COPY_MAX_SIZE   (1ULL << 21)
-
-enum sdma_op_type {
-	SDMA_OP_VRAM_READ,
-	SDMA_OP_VRAM_WRITE,
-};
-
 struct vma_metadata {
 	struct list_head list;
 	uint64_t old_pgoff;
@@ -89,143 +48,13 @@ struct vma_metadata {
 };
 
 /************************************ Global Variables ********************************************/
-struct tp_system src_topology;
-struct tp_system dest_topology;
-
-struct device_maps checkpoint_maps;
-struct device_maps restore_maps;
-
-extern int fd_next;
 
 static LIST_HEAD(update_vma_info_list);
 
-extern bool kfd_fw_version_check;
-extern bool kfd_sdma_fw_version_check;
-extern bool kfd_caches_count_check;
-extern bool kfd_num_gws_check;
-extern bool kfd_vram_size_check;
-extern bool kfd_numa_check;
-extern bool kfd_capability_check;
-
 size_t kfd_max_buffer_size;
 
 /**************************************************************************************************/
 
-int write_fp(FILE *fp, const void *buf, const size_t buf_len)
-{
-	size_t len_write;
-
-	len_write = fwrite(buf, 1, buf_len, fp);
-	if (len_write != buf_len) {
-		pr_perror("Unable to write file (wrote:%ld buf_len:%ld)", len_write, buf_len);
-		return -EIO;
-	}
-	return 0;
-}
-
-int read_fp(FILE *fp, void *buf, const size_t buf_len)
-{
-	size_t len_read;
-
-	len_read = fread(buf, 1, buf_len, fp);
-	if (len_read != buf_len) {
-		pr_perror("Unable to read file (read:%ld buf_len:%ld)", len_read, buf_len);
-		return -EIO;
-	}
-	return 0;
-}
-
-/**
- * @brief Open an image file
- *
- * We store the size of the actual contents in the first 8-bytes of the file. This allows us to
- * determine the file size when using criu_image_streamer when fseek and fstat are not available.
- * The FILE * returned is already at the location of the first actual contents.
- *
- * @param path The file path
- * @param write False for read, true for write
- * @param size Size of actual contents
- * @return FILE *if successful, NULL if failed
- */
-FILE *open_img_file(char *path, bool write, size_t *size)
-{
-	FILE *fp = NULL;
-	int fd, ret;
-
-	if (opts.stream)
-		fd = img_streamer_open(path, write ? O_DUMP : O_RSTR);
-	else
-		fd = openat(criu_get_image_dir(), path, write ? (O_WRONLY | O_CREAT) : O_RDONLY, 0600);
-
-	if (fd < 0) {
-		pr_perror("%s: Failed to open for %s", path, write ? "write" : "read");
-		return NULL;
-	}
-
-	fp = fdopen(fd, write ? "w" : "r");
-	if (!fp) {
-		pr_perror("%s: Failed get pointer for %s", path, write ? "write" : "read");
-		close(fd);
-		return NULL;
-	}
-
-	if (write)
-		ret = write_fp(fp, size, sizeof(*size));
-	else
-		ret = read_fp(fp, size, sizeof(*size));
-
-	if (ret) {
-		pr_perror("%s:Failed to access file size", path);
-		fclose(fp);
-		return NULL;
-	}
-
-	pr_debug("%s:Opened file for %s with size:%ld\n", path, write ? "write" : "read", *size);
-	return fp;
-}
-
-/**
- * @brief Write an image file
- *
- * We store the size of the actual contents in the first 8-bytes of the file. This allows us to
- * determine the file size when using criu_image_streamer when fseek and fstat are not available.
- *
- * @param path The file path
- * @param buf pointer to data to be written
- * @param buf_len size of buf
- * @return 0 if successful. -errno on failure
- */
-int write_img_file(char *path, const void *buf, const size_t buf_len)
-{
-	int ret;
-	FILE *fp;
-	size_t len = buf_len;
-
-	fp = open_img_file(path, true, &len);
-	if (!fp)
-		return -errno;
-
-	ret = write_fp(fp, buf, buf_len);
-	fclose(fp); /* this will also close fd */
-	return ret;
-}
-
-int read_file(const char *file_path, void *buf, const size_t buf_len)
-{
-	int ret;
-	FILE *fp;
-
-	fp = fopen(file_path, "r");
-	if (!fp) {
-		pr_perror("Cannot fopen %s", file_path);
-		return -errno;
-	}
-
-	ret = read_fp(fp, buf, buf_len);
-	fclose(fp); /* this will also close fd */
-	return ret;
-}
-
 /* Call ioctl, restarting if it is interrupted */
 int kmtIoctl(int fd, unsigned long request, void *arg)
 {
@@ -263,21 +92,21 @@ static void free_e(CriuKfd *e)
 
 static int allocate_device_entries(CriuKfd *e, int num_of_devices)
 {
-	e->device_entries = xmalloc(sizeof(DeviceEntry *) * num_of_devices);
+	e->device_entries = xmalloc(sizeof(KfdDeviceEntry *) * num_of_devices);
 	if (!e->device_entries) {
 		pr_err("Failed to allocate device_entries\n");
 		return -ENOMEM;
 	}
 
 	for (int i = 0; i < num_of_devices; i++) {
-		DeviceEntry *entry = xzalloc(sizeof(*entry));
+		KfdDeviceEntry *entry = xzalloc(sizeof(*entry));
 
 		if (!entry) {
 			pr_err("Failed to allocate entry\n");
 			return -ENOMEM;
 		}
 
-		device_entry__init(entry);
+		kfd_device_entry__init(entry);
 
 		e->device_entries[i] = entry;
 		e->n_device_entries++;
@@ -287,21 +116,21 @@ static int allocate_device_entries(CriuKfd *e, int num_of_devices)
 
 static int allocate_bo_entries(CriuKfd *e, int num_bos, struct kfd_criu_bo_bucket *bo_bucket_ptr)
 {
-	e->bo_entries = xmalloc(sizeof(BoEntry *) * num_bos);
+	e->bo_entries = xmalloc(sizeof(KfdBoEntry *) * num_bos);
 	if (!e->bo_entries) {
 		pr_err("Failed to allocate bo_info\n");
 		return -ENOMEM;
 	}
 
 	for (int i = 0; i < num_bos; i++) {
-		BoEntry *entry = xzalloc(sizeof(*entry));
+		KfdBoEntry *entry = xzalloc(sizeof(*entry));
 
 		if (!entry) {
 			pr_err("Failed to allocate botest\n");
 			return -ENOMEM;
 		}
 
-		bo_entry__init(entry);
+		kfd_bo_entry__init(entry);
 
 		e->bo_entries[i] = entry;
 		e->n_bo_entries++;
@@ -309,13 +138,13 @@ static int allocate_bo_entries(CriuKfd *e, int num_bos, struct kfd_criu_bo_bucke
 	return 0;
 }
 
-int topology_to_devinfo(struct tp_system *sys, struct device_maps *maps, DeviceEntry **deviceEntries)
+int topology_to_devinfo(struct tp_system *sys, struct device_maps *maps, KfdDeviceEntry **deviceEntries)
 {
 	uint32_t devinfo_index = 0;
 	struct tp_node *node;
 
 	list_for_each_entry(node, &sys->nodes, listm_system) {
-		DeviceEntry *devinfo = deviceEntries[devinfo_index++];
+		KfdDeviceEntry *devinfo = deviceEntries[devinfo_index++];
 
 		devinfo->node_id = node->id;
 
@@ -383,11 +212,11 @@ int topology_to_devinfo(struct tp_system *sys, struct device_maps *maps, DeviceE
 	return 0;
 }
 
-int devinfo_to_topology(DeviceEntry *devinfos[], uint32_t num_devices, struct tp_system *sys)
+int devinfo_to_topology(KfdDeviceEntry *devinfos[], uint32_t num_devices, struct tp_system *sys)
 {
 	for (int i = 0; i < num_devices; i++) {
 		struct tp_node *node;
-		DeviceEntry *devinfo = devinfos[i];
+		KfdDeviceEntry *devinfo = devinfos[i];
 
 		node = sys_add_node(sys, devinfo->node_id, devinfo->gpu_id);
 		if (!node)
@@ -549,7 +378,7 @@ struct thread_data {
 	uint32_t gpu_id;
 	pid_t pid;
 	struct kfd_criu_bo_bucket *bo_buckets;
-	BoEntry **bo_entries;
+	KfdBoEntry **bo_entries;
 	int drm_fd;
 	int ret;
 	int id; /* File ID used by CRIU to identify KFD image for this process */
@@ -557,8 +386,7 @@ struct thread_data {
 
 int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 {
-	struct stat st_kfd, st_dri_min;
-	char img_path[128];
+	struct stat st_kfd;
 	int ret = 0;
 
 	pr_debug("Enter %s\n", __func__);
@@ -568,27 +396,18 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 		return ret;
 	}
 
-	snprintf(img_path, sizeof(img_path), "/dev/dri/renderD%d", DRM_FIRST_RENDER_NODE);
-
-	ret = stat(img_path, &st_dri_min);
-	if (ret == -1) {
-		pr_perror("stat error for %s", img_path);
-		return ret;
-	}
-
-	if (major(st_buf->st_rdev) == major(st_kfd.st_rdev) || ((major(st_buf->st_rdev) == major(st_dri_min.st_rdev)) &&
-								(minor(st_buf->st_rdev) >= minor(st_dri_min.st_rdev) &&
-								 minor(st_buf->st_rdev) >= DRM_FIRST_RENDER_NODE))) {
+	/* If input device is KFD return device as supported */
+	if (major(st_buf->st_rdev) == major(st_kfd.st_rdev)) {
 		pr_debug("Known non-regular mapping, kfd-renderD%d -> OK\n", minor(st_buf->st_rdev));
-		pr_debug("AMD KFD(maj) = %d, DRI(maj,min) = %d:%d VMA Device fd(maj,min) = %d:%d\n",
-			 major(st_kfd.st_rdev), major(st_dri_min.st_rdev), minor(st_dri_min.st_rdev),
-			 major(st_buf->st_rdev), minor(st_buf->st_rdev));
-		/* VMA belongs to kfd */
 		return 0;
 	}
 
-	pr_perror("Can't handle the VMA mapping");
-	return -ENOTSUP;
+	/* Determine if input is a DRM device and therefore is supported */
+	ret = amdgpu_plugin_drm_handle_device_vma(fd, st_buf);
+	if (ret)
+		pr_perror("%s(), Can't handle VMAs of input device\n", __func__);
+
+	return ret;
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, amdgpu_plugin_handle_device_vma)
 
@@ -655,8 +474,9 @@ void free_and_unmap(uint64_t size, amdgpu_bo_handle h_bo, amdgpu_va_handle h_va,
 	amdgpu_bo_free(h_bo);
 }
 
-int sdma_copy_bo(struct kfd_criu_bo_bucket bo_bucket, FILE *storage_fp, void *buffer, size_t buffer_size,
-		 amdgpu_device_handle h_dev, uint64_t max_copy_size, enum sdma_op_type type)
+static int sdma_copy_bo(struct kfd_criu_bo_bucket bo_bucket, FILE *storage_fp,
+						void *buffer, size_t buffer_size, amdgpu_device_handle h_dev,
+						uint64_t max_copy_size, enum sdma_op_type type)
 {
 	uint64_t size, src_bo_size, dst_bo_size, buffer_bo_size, bytes_remain, buffer_space_remain;
 	uint64_t gpu_addr_src, gpu_addr_dst, gpu_addr_ib, copy_src, copy_dst, copy_size;
@@ -954,7 +774,7 @@ void *dump_bo_contents(void *_thread_data)
 		goto exit;
 	}
 
-	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
+	snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, thread_data->id, thread_data->gpu_id);
 	bo_contents_fp = open_img_file(img_path, true, &image_size);
 	if (!bo_contents_fp) {
 		pr_perror("Cannot fopen %s", img_path);
@@ -1027,7 +847,7 @@ void *restore_bo_contents(void *_thread_data)
 	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
 								   SDMA_LINEAR_COPY_MAX_SIZE - 1;
 
-	snprintf(img_path, sizeof(img_path), IMG_PAGES_FILE, thread_data->id, thread_data->gpu_id);
+	snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, thread_data->id, thread_data->gpu_id);
 	bo_contents_fp = open_img_file(img_path, false, &image_size);
 	if (!bo_contents_fp) {
 		pr_perror("Cannot fopen %s", img_path);
@@ -1234,7 +1054,7 @@ static int save_bos(int id, int fd, struct kfd_ioctl_criu_args *args, struct kfd
 
 	for (i = 0; i < e->num_of_bos; i++) {
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
-		BoEntry *boinfo = e->bo_entries[i];
+		KfdBoEntry *boinfo = e->bo_entries[i];
 
 		boinfo->gpu_id = bo_bucket->gpu_id;
 		boinfo->addr = bo_bucket->addr;
@@ -1391,7 +1211,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 
 		criu_render_node__pack(&rd, buf);
 
-		snprintf(img_path, sizeof(img_path), IMG_RENDERD_FILE, id);
+		snprintf(img_path, sizeof(img_path), IMG_DRM_FILE, id);
 		ret = write_img_file(img_path, buf, len);
 		if (ret) {
 			xfree(buf);
@@ -1399,6 +1219,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		}
 
 		xfree(buf);
+
 		/* Need to return success here so that criu can call plugins for renderD nodes */
 		return ret;
 	}
@@ -1531,7 +1352,7 @@ static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 	for (int entries_i = 0; entries_i < e->num_of_cpus + e->num_of_gpus; entries_i++) {
 		struct kfd_criu_device_bucket *device_bucket;
-		DeviceEntry *devinfo = e->device_entries[entries_i];
+		KfdDeviceEntry *devinfo = e->device_entries[entries_i];
 		struct tp_node *tp_node;
 
 		if (!devinfo->gpu_id)
@@ -1581,7 +1402,7 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 	for (int i = 0; i < args->num_bos; i++) {
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
-		BoEntry *bo_entry = e->bo_entries[i];
+		KfdBoEntry *bo_entry = e->bo_entries[i];
 
 		bo_bucket->gpu_id = bo_entry->gpu_id;
 		bo_bucket->addr = bo_entry->addr;
@@ -1736,7 +1557,7 @@ int amdgpu_plugin_restore_file(int id)
 		 * TODO: Currently, this code will only work if this function is called for /dev/kfd
 		 * first as we assume restore_maps is already filled. Need to fix this later.
 		 */
-		snprintf(img_path, sizeof(img_path), IMG_RENDERD_FILE, id);
+		snprintf(img_path, sizeof(img_path), IMG_DRM_FILE, id);
 		pr_info("Restoring RenderD %s\n", img_path);
 
 		img_fp = open_img_file(img_path, false, &img_size);
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
new file mode 100644
index 000000000..a48dc68f0
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -0,0 +1,63 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <semaphore.h>
+
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/syscall.h>
+#include <sys/sysmacros.h>
+#include <linux/limits.h>
+
+#include <dirent.h>
+#include "common/list.h"
+
+#include "criu-amdgpu.pb-c.h"
+
+#include <xf86drm.h>
+#include <libdrm/amdgpu.h>
+
+#include "xmalloc.h"
+#include "criu-log.h"
+#include "kfd_ioctl.h"
+#include "amdgpu_plugin_drm.h"
+#include "amdgpu_plugin_util.h"
+#include "amdgpu_plugin_topology.h"
+
+
+int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *st)
+{
+	char path[PATH_MAX];
+	struct stat drm;
+	int ret = 0;
+
+	snprintf(path, sizeof(path), AMDGPU_DRM_DEVICE, DRM_FIRST_RENDER_NODE);
+	ret = stat(path, &drm);
+	if (ret == -1) {
+		pr_err("Error in getting stat for: %s", path);
+		return ret;
+	}
+
+	if ((major(st->st_rdev) != major(drm.st_rdev)) ||
+		(minor(st->st_rdev) < minor(drm.st_rdev)) ||
+		(minor(st->st_rdev) > DRM_LAST_RENDER_NODE)) {
+		pr_err("Can't handle VMA mapping of input device\n");
+		return -ENOTSUP;
+	}
+
+	pr_debug("AMD DRI(maj,min) = %d:%d VMA Device FD(maj,min) = %d:%d\n",
+			 major(drm.st_rdev), minor(drm.st_rdev),
+			 major(st->st_rdev), minor(st->st_rdev));
+
+	return 0;
+}
+
+
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.h b/plugins/amdgpu/amdgpu_plugin_drm.h
new file mode 100644
index 000000000..37009c8ba
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_drm.h
@@ -0,0 +1,22 @@
+#ifndef __AMDGPU_PLUGIN_DRM_H__
+#define __AMDGPU_PLUGIN_DRM_H__
+
+#include <dirent.h>
+#include "common/list.h"
+
+#include "xmalloc.h"
+#include "criu-log.h"
+#include "kfd_ioctl.h"
+#include "amdgpu_plugin_util.h"
+#include "amdgpu_plugin_topology.h"
+
+
+/**
+ * Determines if VMA's of input file descriptor belong to amdgpu's
+ * DRM device and are therefore supported
+ */
+int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *drm);
+
+
+#endif		/* __AMDGPU_PLUGIN_DRM_H__ */
+
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index ef79e5ef4..c5fa51fda 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -16,35 +16,11 @@
 
 #include "xmalloc.h"
 #include "kfd_ioctl.h"
+#include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
 
 #define TOPOLOGY_PATH "/sys/class/kfd/kfd/topology/nodes/"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
-#ifdef COMPILE_TESTS
-#undef pr_err
-#define pr_err(format, arg...) fprintf(stdout, "%s:%d ERROR:" format, __FILE__, __LINE__, ##arg)
-#undef pr_info
-#define pr_info(format, arg...) fprintf(stdout, "%s:%d INFO:" format, __FILE__, __LINE__, ##arg)
-#undef pr_debug
-#define pr_debug(format, arg...) fprintf(stdout, "%s:%d DBG:" format, __FILE__, __LINE__, ##arg)
-
-#undef pr_perror
-#define pr_perror(format, arg...) \
-	fprintf(stdout, "%s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
-#endif
-
-#ifdef DEBUG
-#define plugin_log_msg(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define plugin_log_msg(fmt, ...) \
-	{                        \
-	}
-#endif
-
 /* User override options */
 /* Skip firmware version check */
 bool kfd_fw_version_check = true;
@@ -840,6 +816,9 @@ void topology_free(struct tp_system *sys)
 		list_del(&p2pgroup->listm_system);
 		xfree(p2pgroup);
 	}
+
+	/* Update Topology as being freed */
+	sys->parsed = false;
 }
 
 /**
@@ -1461,3 +1440,15 @@ int set_restore_gpu_maps(struct tp_system *src_sys, struct tp_system *dest_sys,
 
 	return ret;
 }
+
+int topology_gpu_count(struct tp_system *sys)
+{
+	struct tp_node *node;
+	int count = 0;
+
+	list_for_each_entry(node, &sys->nodes, listm_system)
+		if (NODE_IS_GPU(node))
+			count++;
+	return count;
+}
+
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
index 9d99cda1c..c890e3dda 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.h
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -107,6 +107,8 @@ int topology_parse(struct tp_system *topology, const char *msg);
 int topology_determine_iolinks(struct tp_system *sys);
 void topology_print(const struct tp_system *sys, const char *msg);
 
+int topology_gpu_count(struct tp_system *topology);
+
 struct id_map *maps_add_gpu_entry(struct device_maps *maps, const uint32_t src_id, const uint32_t dest_id);
 
 struct tp_node *sys_add_node(struct tp_system *sys, uint32_t id, uint32_t gpu_id);
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
new file mode 100755
index 000000000..48ff70555
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -0,0 +1,208 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <semaphore.h>
+
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/syscall.h>
+#include <sys/sysmacros.h>
+#include <linux/limits.h>
+
+#include <dirent.h>
+#include "common/list.h"
+
+#include <xf86drm.h>
+#include <libdrm/amdgpu.h>
+
+#include "criu-plugin.h"
+#include "plugin.h"
+#include "criu-amdgpu.pb-c.h"
+
+#include "img-streamer.h"
+#include "image.h"
+#include "cr_options.h"
+
+#include "xmalloc.h"
+#include "criu-log.h"
+#include "kfd_ioctl.h"
+#include "amdgpu_drm.h"
+#include "amdgpu_plugin_util.h"
+#include "amdgpu_plugin_topology.h"
+
+/* Tracks number of device files that need to be checkpointed */
+static int dev_file_cnt = 0;
+
+/* Helper structures to encode device topology of SRC and DEST platforms */
+struct tp_system src_topology;
+struct tp_system dest_topology;
+
+/* Helper structures to encode device maps during Checkpoint and Restore operations */
+struct device_maps checkpoint_maps;
+struct device_maps restore_maps;
+
+bool checkpoint_is_complete()
+{
+	return (dev_file_cnt == 0);
+}
+
+void decrement_checkpoint_count()
+{
+	dev_file_cnt--;
+}
+
+void init_gpu_count(struct tp_system *topo)
+{
+	if (dev_file_cnt != 0)
+		return;
+
+	/* We add ONE to include checkpointing of KFD device */
+	dev_file_cnt = 1 + topology_gpu_count(topo); 
+}
+
+int read_fp(FILE *fp, void *buf, const size_t buf_len)
+{
+	size_t len_read;
+
+	len_read = fread(buf, 1, buf_len, fp);
+	if (len_read != buf_len) {
+		pr_err("Unable to read file (read:%ld buf_len:%ld)", len_read, buf_len);
+		return -EIO;
+	}
+	return 0;
+}
+
+int write_fp(FILE *fp, const void *buf, const size_t buf_len)
+{
+	size_t len_write;
+
+	len_write = fwrite(buf, 1, buf_len, fp);
+	if (len_write != buf_len) {
+		pr_err("Unable to write file (wrote:%ld buf_len:%ld)", len_write, buf_len);
+		return -EIO;
+	}
+	return 0;
+}
+
+/**
+ * @brief Open an image file
+ *
+ * We store the size of the actual contents in the first 8-bytes of
+ * the file. This allows us to determine the file size when using
+ * criu_image_streamer when fseek and fstat are not available. The
+ * FILE * returned is already at the location of the first actual
+ * contents.
+ *
+ * @param path The file path
+ * @param write False for read, true for write
+ * @param size Size of actual contents
+ * @return FILE *if successful, NULL if failed
+ */
+FILE *open_img_file(char *path, bool write, size_t *size)
+{
+	FILE *fp = NULL;
+	int fd, ret;
+
+	if (opts.stream)
+		fd = img_streamer_open(path, write ? O_DUMP : O_RSTR);
+	else
+		fd = openat(criu_get_image_dir(), path, write ? (O_WRONLY | O_CREAT) : O_RDONLY, 0600);
+
+	if (fd < 0) {
+		pr_err("%s: Failed to open for %s", path, write ? "write" : "read");
+		return NULL;
+	}
+
+	fp = fdopen(fd, write ? "w" : "r");
+	if (!fp) {
+		pr_err("%s: Failed get pointer for %s", path, write ? "write" : "read");
+		return NULL;
+	}
+
+	if (write)
+		ret = write_fp(fp, size, sizeof(*size));
+	else
+		ret = read_fp(fp, size, sizeof(*size));
+
+	if (ret) {
+		pr_err("%s:Failed to access file size", path);
+		fclose(fp);
+		return NULL;
+	}
+
+	pr_debug("%s:Opened file for %s with size:%ld\n", path, write ? "write" : "read", *size);
+	return fp;
+}
+
+int read_file(const char *file_path, void *buf, const size_t buf_len)
+{
+	int ret;
+	FILE *fp;
+
+	fp = fopen(file_path, "r");
+	if (!fp) {
+		pr_err("Cannot fopen %s", file_path);
+		return -errno;
+	}
+
+	ret = read_fp(fp, buf, buf_len);
+	fclose(fp); /* this will also close fd */
+	return ret;
+}
+
+
+/**
+ * @brief Write an image file
+ *
+ * We store the size of the actual contents in the first 8-bytes of the file. This allows us to
+ * determine the file size when using criu_image_streamer when fseek and fstat are not available.
+ *
+ * @param path The file path
+ * @param buf pointer to data to be written
+ * @param buf_len size of buf
+ * @return 0 if successful. -errno on failure
+ */
+int write_img_file(char *path, const void *buf, const size_t buf_len)
+{
+	int ret;
+	FILE *fp;
+	size_t len = buf_len;
+
+	fp = open_img_file(path, true, &len);
+	if (!fp)
+		return -errno;
+
+	ret = write_fp(fp, buf, buf_len);
+	fclose(fp); /* this will also close fd */
+	return ret;
+}
+
+void print_kfd_bo_stat(int bo_cnt, struct kfd_criu_bo_bucket *bo_list)
+{
+	struct kfd_criu_bo_bucket *bo;
+
+	pr_info("\n");
+	for (int idx = 0; idx < bo_cnt; idx++) {
+		bo = &bo_list[idx];
+		pr_info("\n");
+		pr_info("%s(), %d. KFD BO Addr: %llx \n", __func__, idx, bo->addr);
+		pr_info("%s(), %d. KFD BO Size: %llx \n", __func__, idx, bo->size);
+		pr_info("%s(), %d. KFD BO Offset: %llx \n", __func__, idx, bo->offset);
+		pr_info("%s(), %d. KFD BO Restored Offset: %llx \n", __func__, idx, bo->restored_offset);
+		pr_info("%s(), %d. KFD BO Alloc Flags: %x \n", __func__, idx, bo->alloc_flags);
+		pr_info("%s(), %d. KFD BO Gpu ID: %x \n", __func__, idx, bo->gpu_id);
+		pr_info("%s(), %d. KFD BO Dmabuf FD: %x \n", __func__, idx, bo->dmabuf_fd);
+		pr_info("\n");
+	}
+	pr_info("\n");
+}
+
+
diff --git a/plugins/amdgpu/amdgpu_plugin_util.h b/plugins/amdgpu/amdgpu_plugin_util.h
new file mode 100755
index 000000000..aacca3a28
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_util.h
@@ -0,0 +1,106 @@
+#ifndef __AMDGPU_PLUGIN_UTIL_H__
+#define __AMDGPU_PLUGIN_UTIL_H__
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
+
+#ifdef COMPILE_TESTS
+#undef pr_err
+#define pr_err(format, arg...) fprintf(stdout, "%s:%d ERROR:" format, __FILE__, __LINE__, ##arg)
+#undef pr_info
+#define pr_info(format, arg...) fprintf(stdout, "%s:%d INFO:" format, __FILE__, __LINE__, ##arg)
+#undef pr_debug
+#define pr_debug(format, arg...) fprintf(stdout, "%s:%d DBG:" format, __FILE__, __LINE__, ##arg)
+
+#undef pr_perror
+#define pr_perror(format, arg...) \
+	fprintf(stdout, "%s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, strerror(errno))
+#endif
+
+#ifdef LOG_PREFIX
+#undef LOG_PREFIX
+#endif
+#define LOG_PREFIX "amdgpu_plugin: "
+
+#ifdef DEBUG
+#define plugin_log_msg(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
+#else
+#define plugin_log_msg(fmt, ...) \
+	{                        \
+	}
+#endif
+
+
+/* Path where KFD device is surfaced */
+#define AMDGPU_KFD_DEVICE		"/dev/kfd"
+
+/* Path where DRM devices are surfaced */
+#define AMDGPU_DRM_DEVICE		"/dev/dri/renderD%d"
+
+/* Minimum version of KFD IOCTL's that supports C&R */
+#define KFD_IOCTL_MAJOR_VERSION			1
+#define MIN_KFD_IOCTL_MINOR_VERSION		8
+
+/* Name of file having serialized data of KFD device */
+#define IMG_KFD_FILE			"amdgpu-kfd-%d.img"
+
+/* Name of file having serialized data of KFD buffer objects (BOs) */
+#define IMG_KFD_PAGES_FILE		"amdgpu-pages-%d-%04x.img"
+
+/* Name of file having serialized data of DRM device */
+#define IMG_DRM_FILE			"amdgpu-renderD-%d.img"
+
+/* Name of file having serialized data of DRM device buffer objects (BOs) */
+#define IMG_DRM_PAGES_FILE		"amdgpu-drm-pages-%d-%04x.img"
+
+/* Helper macros to Checkpoint and Restore a ROCm file */
+#define HSAKMT_SHM_PATH			"/dev/shm/hsakmt_shared_mem"
+#define HSAKMT_SHM				"/hsakmt_shared_mem"
+#define HSAKMT_SEM_PATH			"/dev/shm/sem.hsakmt_semaphore"
+#define HSAKMT_SEM				"hsakmt_semaphore"
+
+/* Help macros to build sDMA command packets */
+#define SDMA_PACKET(op, sub_op, e) ((((e)&0xFFFF) << 16) | (((sub_op)&0xFF) << 8) | (((op)&0xFF) << 0))
+
+#define SDMA_OPCODE_COPY	    1
+#define SDMA_COPY_SUB_OPCODE_LINEAR 0
+#define SDMA_NOP		    0
+#define SDMA_LINEAR_COPY_MAX_SIZE   (1ULL << 21)
+
+enum sdma_op_type {
+	SDMA_OP_VRAM_READ,
+	SDMA_OP_VRAM_WRITE,
+};
+
+/* Helper structures to encode device topology of SRC and DEST platforms */
+extern struct tp_system src_topology;
+extern struct tp_system dest_topology;
+
+/* Helper structures to encode device maps during Checkpoint and Restore operations */
+extern struct device_maps checkpoint_maps;
+extern struct device_maps restore_maps;
+
+extern int fd_next;
+
+extern bool kfd_fw_version_check;
+extern bool kfd_sdma_fw_version_check;
+extern bool kfd_caches_count_check;
+extern bool kfd_num_gws_check;
+extern bool kfd_vram_size_check;
+extern bool kfd_numa_check;
+extern bool kfd_capability_check;
+
+int read_fp(FILE *fp, void *buf, const size_t buf_len);
+int write_fp(FILE *fp, const void *buf, const size_t buf_len);
+int read_file(const char *file_path, void *buf, const size_t buf_len);
+int write_img_file(char *path, const void *buf, const size_t buf_len);
+FILE *open_img_file(char *path, bool write, size_t *size);
+
+bool checkpoint_is_complete();
+void decrement_checkpoint_count();
+void init_gpu_count(struct tp_system *topology);
+
+void print_kfd_bo_stat(int bo_cnt, struct kfd_criu_bo_bucket *bo_list);
+
+#endif		/* __AMDGPU_PLUGIN_UTIL_H__ */
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index 81d00d3ff..078b67650 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -5,7 +5,7 @@ message dev_iolink {
 	required uint32 node_to_id = 2;
 }
 
-message device_entry {
+message kfd_device_entry {
 	required uint32 node_id = 1;
 	required uint32 gpu_id = 2;
 	required uint32 cpu_cores_count = 3;
@@ -40,10 +40,10 @@ message device_entry {
 	repeated dev_iolink iolinks = 32;
 }
 
-message bo_entry {
-	required uint64	addr = 1;
-	required uint64	size = 2;
-	required uint64	offset = 3;
+message kfd_bo_entry {
+	required uint64 addr = 1;
+	required uint64 size = 2;
+	required uint64 offset = 3;
 	required uint32 alloc_flags = 4;
 	required uint32 gpu_id = 5;
 }
@@ -52,10 +52,10 @@ message criu_kfd {
 	required uint32 pid = 1;
 	required uint32 num_of_gpus = 2;
 	required uint32 num_of_cpus = 3;
-	repeated device_entry device_entries = 4;
-	required uint64	num_of_bos = 5;
-	repeated bo_entry bo_entries = 6;
-	required uint32	num_of_objects = 7;
+	repeated kfd_device_entry device_entries = 4;
+	required uint64 num_of_bos = 5;
+	repeated kfd_bo_entry bo_entries = 6;
+	required uint32 num_of_objects = 7;
 	required uint64 shared_mem_size = 8;
 	required uint32 shared_mem_magic = 9;
 	required bytes priv_data = 10;

From 0d5923c95ef703da0a59dd03e8526af0c152b2a0 Mon Sep 17 00:00:00 2001
From: Ramesh Errabolu <Ramesh.Errabolu@amd.com>
Date: Fri, 10 Nov 2023 13:02:49 -0600
Subject: [PATCH 1464/1854] amdgpu_plugin: Refactor code used to implement
 Checkpoint

Refactor code used to Checkpoint DRM devices. Code is moved
into amdgpu_plugin_drm.c file which hosts various methods to
checkpoint and restore a workload.

Signed-off-by: Ramesh Errabolu <Ramesh.Errabolu@amd.com>
---
 plugins/amdgpu/amdgpu_plugin.c     | 64 ++++++++++++++----------------
 plugins/amdgpu/amdgpu_plugin_drm.c | 38 ++++++++++++++++++
 plugins/amdgpu/amdgpu_plugin_drm.h |  6 +++
 3 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 60e04f973..a579158d0 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -49,6 +49,13 @@ struct vma_metadata {
 
 /************************************ Global Variables ********************************************/
 
+/**
+ * FD of KFD device used to checkpoint. On a multi-process
+ * tree the order of checkpointing goes from parent to child
+ * and so on - so saving the FD will not be overwritten
+ */
+static int kfd_checkpoint_fd;
+
 static LIST_HEAD(update_vma_info_list);
 
 size_t kfd_max_buffer_size;
@@ -990,6 +997,10 @@ static int unpause_process(int fd)
 		goto exit;
 	}
 
+	// Reset the KFD FD
+	kfd_checkpoint_fd = -1;
+	sys_close_drm_render_devices(&src_topology);
+
 exit:
 	pr_info("Process unpaused %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
 
@@ -1181,44 +1192,25 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		return -1;
 	}
 
+	/* Initialize number of device files that will be checkpointed */
+	init_gpu_count(&src_topology);
+
 	/* Check whether this plugin was called for kfd or render nodes */
 	if (major(st.st_rdev) != major(st_kfd.st_rdev) || minor(st.st_rdev) != 0) {
+
 		/* This is RenderD dumper plugin, for now just save renderD
 		 * minor number to be used during restore. In later phases this
 		 * needs to save more data for video decode etc.
 		 */
-
-		CriuRenderNode rd = CRIU_RENDER_NODE__INIT;
-		struct tp_node *tp_node;
-
-		pr_info("Dumper called for /dev/dri/renderD%d, FD = %d, ID = %d\n", minor(st.st_rdev), fd, id);
-
-		tp_node = sys_get_node_by_render_minor(&src_topology, minor(st.st_rdev));
-		if (!tp_node) {
-			pr_err("Failed to find a device with minor number = %d\n", minor(st.st_rdev));
-
-			return -ENODEV;
-		}
-
-		rd.gpu_id = maps_get_dest_gpu(&checkpoint_maps, tp_node->gpu_id);
-		if (!rd.gpu_id)
-			return -ENODEV;
-
-		len = criu_render_node__get_packed_size(&rd);
-		buf = xmalloc(len);
-		if (!buf)
-			return -ENOMEM;
-
-		criu_render_node__pack(&rd, buf);
-
-		snprintf(img_path, sizeof(img_path), IMG_DRM_FILE, id);
-		ret = write_img_file(img_path, buf, len);
-		if (ret) {
-			xfree(buf);
+		ret = amdgpu_plugin_drm_dump_file(fd, id, &st);
+		if (ret)
 			return ret;
-		}
 
-		xfree(buf);
+		/* Invoke unpause process if needed */
+		decrement_checkpoint_count();
+		if (checkpoint_is_complete()) {
+			ret = unpause_process(kfd_checkpoint_fd);
+		}
 
 		/* Need to return success here so that criu can call plugins for renderD nodes */
 		return ret;
@@ -1315,11 +1307,15 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	ret = write_img_file(img_path, buf, len);
 
 	xfree(buf);
-exit:
-	/* Restore all queues */
-	unpause_process(fd);
 
-	sys_close_drm_render_devices(&src_topology);
+exit:
+	/* Restore all queues if conditions permit */
+	kfd_checkpoint_fd = fd;
+	decrement_checkpoint_count();
+	if (checkpoint_is_complete()) {
+		ret = unpause_process(fd);
+	}
+
 	xfree((void *)args.devices);
 	xfree((void *)args.bos);
 	xfree((void *)args.priv_data);
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index a48dc68f0..689d62072 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -61,3 +61,41 @@ int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *st)
 }
 
 
+int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
+{
+	CriuRenderNode rd = CRIU_RENDER_NODE__INIT;
+	struct tp_node *tp_node;
+	char path[PATH_MAX];
+	unsigned char *buf;
+	int minor;
+	int len;
+	int ret;
+
+	/* Get the topology node of the DRM device */
+	minor = minor(drm->st_rdev);
+	tp_node = sys_get_node_by_render_minor(&src_topology, minor);
+	if (!tp_node) {
+		pr_err("Failed to find a device with minor number = %d\n", minor);
+		return -ENODEV;
+	}
+
+	/* Get the GPU_ID of the DRM device */
+	rd.gpu_id = maps_get_dest_gpu(&checkpoint_maps, tp_node->gpu_id);
+	if (!rd.gpu_id) {
+		pr_err("Failed to find valid gpu_id for the device = %d\n", rd.gpu_id);
+		return -ENODEV;
+	}
+
+	len = criu_render_node__get_packed_size(&rd);
+	buf = xmalloc(len);
+	if (!buf)
+		return -ENOMEM;
+
+	criu_render_node__pack(&rd, buf);
+
+	snprintf(path, sizeof(path), IMG_DRM_FILE, id);
+	ret = write_img_file(path, buf, len);
+	xfree(buf);
+	return ret;
+}
+
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.h b/plugins/amdgpu/amdgpu_plugin_drm.h
index 37009c8ba..6f0c1a9a6 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.h
+++ b/plugins/amdgpu/amdgpu_plugin_drm.h
@@ -17,6 +17,12 @@
  */
 int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *drm);
 
+/**
+ * Serialize meta-data about a particular DRM device, its number of BOs,
+ * etc into a file. The serialized filename has in it the value ID that
+ * is passed in as a parameter
+ */
+int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm);
 
 #endif		/* __AMDGPU_PLUGIN_DRM_H__ */
 

From 71102e7f7399ad9297d14ebcae6bcbb8b30a8787 Mon Sep 17 00:00:00 2001
From: rahulk789 <rahul.u.india@gmail.com>
Date: Sun, 26 Nov 2023 14:31:42 +0530
Subject: [PATCH 1465/1854] sk-inet: Added IP_TTL socket option

Signed-off-by: rahulk789 <rahul.u.india@gmail.com>
---
 criu/sk-inet.c       | 7 ++++++-
 images/sk-inet.proto | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 24e92a852..b8154e860 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -417,10 +417,12 @@ static int dump_ip_opts(int sk, int family, int type, int proto, IpOptsEntry *io
 		ret |= dump_opt(sk, SOL_IP, IP_FREEBIND, &ioe->freebind);
 		ret |= dump_opt(sk, SOL_IP, IP_PKTINFO, &ioe->pktinfo);
 		ret |= dump_opt(sk, SOL_IP, IP_TOS, &ioe->tos);
+		ret |= dump_opt(sk, SOL_IP, IP_TTL, &ioe->ttl);
 	}
 	ioe->has_freebind = ioe->freebind;
 	ioe->has_pktinfo = !!ioe->pktinfo;
 	ioe->has_tos = !!ioe->tos;
+	ioe->has_ttl = !!ioe->ttl;
 
 	return ret;
 }
@@ -817,7 +819,10 @@ int restore_ip_opts(int sk, int family, int proto, IpOptsEntry *ioe)
 			ret |= restore_opt(sk, SOL_IP, IP_PKTINFO, &ioe->pktinfo);
 		if (ioe->has_tos)
 			ret |= restore_opt(sk, SOL_IP, IP_TOS, &ioe->tos);
-	}
+		if (ioe->has_ttl)
+			ret |= restore_opt(sk, SOL_IP, IP_TTL, &ioe->ttl);
+
+    }
 
 	if (ioe->raw)
 		ret |= restore_ip_raw_opts(sk, family, proto, ioe->raw);
diff --git a/images/sk-inet.proto b/images/sk-inet.proto
index 666326fa4..03a679e7f 100644
--- a/images/sk-inet.proto
+++ b/images/sk-inet.proto
@@ -20,6 +20,7 @@ message ip_opts_entry {
 
 	optional bool			pktinfo		= 5;
 	optional uint32			tos		= 6;
+	optional uint32			ttl		= 7;
 }
 
 message inet_sk_entry {

From 895a16c13c4b155b6ca03b8ce4a323dc9acf1104 Mon Sep 17 00:00:00 2001
From: rahulk789 <rahul.u.india@gmail.com>
Date: Sun, 26 Nov 2023 14:35:47 +0530
Subject: [PATCH 1466/1854] zdtm: Added tests for IP_TTL restore

Signed-off-by: rahulk789 <rahul.u.india@gmail.com>
---
 test/zdtm/static/sock_ip_opts00.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/zdtm/static/sock_ip_opts00.c b/test/zdtm/static/sock_ip_opts00.c
index d890410d8..cb464365d 100644
--- a/test/zdtm/static/sock_ip_opts00.c
+++ b/test/zdtm/static/sock_ip_opts00.c
@@ -26,6 +26,7 @@ struct sk_opt {
 struct sk_opt sk_opts_v4[] = {
 	{ SOL_IP, IP_FREEBIND, IP_OPT_VAL },
 	{ SOL_IP, IP_PKTINFO, IP_OPT_VAL },
+	{ SOL_IP, IP_TTL, 32 },
 	{ SOL_IP, IP_TOS, IPTOS_TOS(IPTOS_THROUGHPUT) },
 };
 

From bd17bd43e39f9bc3e5d07f665d8e3c878b0c0a2b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 6 Feb 2024 12:04:07 +0800
Subject: [PATCH 1467/1854] sk-inet: fix codding style in restore_ip_opts

Commit [1] introduced codding-style breackage, let's fix it.

Fixes: 66cab1f49 ("sk-inet: Added IP_TTL socket option") [1]
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-inet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index b8154e860..a6a767c73 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -821,8 +821,7 @@ int restore_ip_opts(int sk, int family, int proto, IpOptsEntry *ioe)
 			ret |= restore_opt(sk, SOL_IP, IP_TOS, &ioe->tos);
 		if (ioe->has_ttl)
 			ret |= restore_opt(sk, SOL_IP, IP_TTL, &ioe->ttl);
-
-    }
+	}
 
 	if (ioe->raw)
 		ret |= restore_ip_raw_opts(sk, family, proto, ioe->raw);

From a808f09bea416e9b8bf8415497f4c1481b2a10c5 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 9 Feb 2024 14:14:10 +0000
Subject: [PATCH 1468/1854] amdgpu_plugin: fix lint errors

$ make lint
 ...
 # Do not append \n to pr_perror, pr_pwarn or fail
 ! git --no-pager grep -E '^\s*\<(pr_perror|pr_pwarn|fail)\>.*\\n"'
 plugins/amdgpu/amdgpu_plugin.c:		pr_perror("%s(), Can't handle VMAs of input device\n", __func__);

 ! git --no-pager grep -En '^\s*\<pr_(err|warn|msg|info|debug)\>.*);$' | grep -v '\\n'
 plugins/amdgpu/amdgpu_plugin_drm.c:45:		pr_err("Error in getting stat for: %s", path);
 plugins/amdgpu/amdgpu_plugin_util.c:77:		pr_err("Unable to read file (read:%ld buf_len:%ld)", len_read, buf_len);
 plugins/amdgpu/amdgpu_plugin_util.c:89:		pr_err("Unable to write file (wrote:%ld buf_len:%ld)", len_write, buf_len);
 plugins/amdgpu/amdgpu_plugin_util.c:120:		pr_err("%s: Failed to open for %s", path, write ? "write" : "read");
 plugins/amdgpu/amdgpu_plugin_util.c:126:		pr_err("%s: Failed get pointer for %s", path, write ? "write" : "read");
 plugins/amdgpu/amdgpu_plugin_util.c:136:		pr_err("%s:Failed to access file size", path);
 plugins/amdgpu/amdgpu_plugin_util.c:152:		pr_err("Cannot fopen %s", file_path);

 make: *** [Makefile:470: lint] Error 1

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c      |  2 +-
 plugins/amdgpu/amdgpu_plugin_drm.c  |  3 +--
 plugins/amdgpu/amdgpu_plugin_util.c | 16 +++++++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index a579158d0..a41469a50 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -412,7 +412,7 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 	/* Determine if input is a DRM device and therefore is supported */
 	ret = amdgpu_plugin_drm_handle_device_vma(fd, st_buf);
 	if (ret)
-		pr_perror("%s(), Can't handle VMAs of input device\n", __func__);
+		pr_perror("%s(), Can't handle VMAs of input device", __func__);
 
 	return ret;
 }
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index 689d62072..d54cd937d 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -42,7 +42,7 @@ int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *st)
 	snprintf(path, sizeof(path), AMDGPU_DRM_DEVICE, DRM_FIRST_RENDER_NODE);
 	ret = stat(path, &drm);
 	if (ret == -1) {
-		pr_err("Error in getting stat for: %s", path);
+		pr_err("Error in getting stat for: %s\n", path);
 		return ret;
 	}
 
@@ -98,4 +98,3 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
 	xfree(buf);
 	return ret;
 }
-
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
index 48ff70555..62e569fc8 100755
--- a/plugins/amdgpu/amdgpu_plugin_util.c
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -65,7 +65,7 @@ void init_gpu_count(struct tp_system *topo)
 		return;
 
 	/* We add ONE to include checkpointing of KFD device */
-	dev_file_cnt = 1 + topology_gpu_count(topo); 
+	dev_file_cnt = 1 + topology_gpu_count(topo);
 }
 
 int read_fp(FILE *fp, void *buf, const size_t buf_len)
@@ -74,7 +74,7 @@ int read_fp(FILE *fp, void *buf, const size_t buf_len)
 
 	len_read = fread(buf, 1, buf_len, fp);
 	if (len_read != buf_len) {
-		pr_err("Unable to read file (read:%ld buf_len:%ld)", len_read, buf_len);
+		pr_err("Unable to read file (read:%ld buf_len:%ld)\n", len_read, buf_len);
 		return -EIO;
 	}
 	return 0;
@@ -86,7 +86,7 @@ int write_fp(FILE *fp, const void *buf, const size_t buf_len)
 
 	len_write = fwrite(buf, 1, buf_len, fp);
 	if (len_write != buf_len) {
-		pr_err("Unable to write file (wrote:%ld buf_len:%ld)", len_write, buf_len);
+		pr_err("Unable to write file (wrote:%ld buf_len:%ld)\n", len_write, buf_len);
 		return -EIO;
 	}
 	return 0;
@@ -117,13 +117,13 @@ FILE *open_img_file(char *path, bool write, size_t *size)
 		fd = openat(criu_get_image_dir(), path, write ? (O_WRONLY | O_CREAT) : O_RDONLY, 0600);
 
 	if (fd < 0) {
-		pr_err("%s: Failed to open for %s", path, write ? "write" : "read");
+		pr_err("%s: Failed to open for %s\n", path, write ? "write" : "read");
 		return NULL;
 	}
 
 	fp = fdopen(fd, write ? "w" : "r");
 	if (!fp) {
-		pr_err("%s: Failed get pointer for %s", path, write ? "write" : "read");
+		pr_err("%s: Failed get pointer for %s\n", path, write ? "write" : "read");
 		return NULL;
 	}
 
@@ -133,7 +133,7 @@ FILE *open_img_file(char *path, bool write, size_t *size)
 		ret = read_fp(fp, size, sizeof(*size));
 
 	if (ret) {
-		pr_err("%s:Failed to access file size", path);
+		pr_err("%s:Failed to access file size\n", path);
 		fclose(fp);
 		return NULL;
 	}
@@ -149,7 +149,7 @@ int read_file(const char *file_path, void *buf, const size_t buf_len)
 
 	fp = fopen(file_path, "r");
 	if (!fp) {
-		pr_err("Cannot fopen %s", file_path);
+		pr_err("Cannot fopen %s\n", file_path);
 		return -errno;
 	}
 
@@ -204,5 +204,3 @@ void print_kfd_bo_stat(int bo_cnt, struct kfd_criu_bo_bucket *bo_list)
 	}
 	pr_info("\n");
 }
-
-

From e0f91e66ee7d4b5e52ae52cc6b891d1ffc0a0f7c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 12 Feb 2024 11:52:41 +0000
Subject: [PATCH 1469/1854] kerndat: check support for PAGE_IS_SOFT_DIRTY

The commit introducing PAGE_IS_SOFT_DIRTY has not been merged
in kernel v6.7.x.

fs/proc/task_mmu: report SOFT_DIRTY bits through the PAGEMAP_SCAN ioctl
https://github.com/torvalds/linux/commit/e6a9a2cbc13bf

As a result, CRIU fails with the following error:

Error (criu/pagemap-cache.c:199): pagemap-cache: PAGEMAP_SCAN: Invalid argument'
Error (criu/pagemap-cache.c:225): pagemap-cache: Failed to fill cache for 63 (400000-402000)'

This patch updates check_pagemap() in kerndat to check if PAGE_IS_SOFT_DIRTY is supported.
Fixes: #2334

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/kerndat.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 95e7226b2..e3b378a9c 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -63,6 +63,14 @@ static int check_pagemap(void)
 {
 	int ret, fd, retry;
 	u64 pfn = 0;
+	struct pm_scan_arg args = {
+		.size = sizeof(struct pm_scan_arg),
+		.flags = 0,
+		.category_inverted = PAGE_IS_PFNZERO | PAGE_IS_FILE,
+		.category_mask = PAGE_IS_PFNZERO | PAGE_IS_FILE,
+		.category_anyof_mask = PAGE_IS_PRESENT | PAGE_IS_SWAPPED,
+		.return_mask = PAGE_IS_PRESENT | PAGE_IS_SWAPPED | PAGE_IS_SOFT_DIRTY,
+	};
 
 	fd = __open_proc(PROC_SELF, EPERM, O_RDONLY, "pagemap");
 	if (fd < 0) {
@@ -75,15 +83,11 @@ static int check_pagemap(void)
 		return -1;
 	}
 
-	if (ioctl(fd, PAGEMAP_SCAN, NULL) == 0) {
-		pr_err("PAGEMAP_SCAN succeeded unexpectedly\n");
-		return -1;
+	if (ioctl(fd, PAGEMAP_SCAN, &args) == 0) {
+		pr_debug("PAGEMAP_SCAN is supported\n");
+		kdat.has_pagemap_scan = true;
 	} else {
 		switch (errno) {
-		case EFAULT:
-			pr_debug("PAGEMAP_SCAN is supported\n");
-			kdat.has_pagemap_scan = true;
-			break;
 		case EINVAL:
 		case ENOTTY:
 			pr_debug("PAGEMAP_SCAN isn't supported\n");

From 7fd4a15e68f1af91adf4ce6ebd5a40cd57e35661 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 18 Jan 2024 14:26:33 +0000
Subject: [PATCH 1470/1854] pb2dict: fix flake8 error

This patch fixes the following flake8 error:
python3 -m flake8 --config=scripts/flake8.cfg lib/pycriu/images/pb2dict.py
lib/pycriu/images/pb2dict.py:361:43: E721 do not compare types, for exact checks use `is` / `is not`, for instance checks use `isinstance()`

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/pycriu/images/pb2dict.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index 3f5f390e3..d29fdf66c 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -358,7 +358,10 @@ def pb2dict(pb, pretty=False, is_hex=False):
         else:
             d_val = _pb2dict_cast(field, value, pretty, is_hex)
 
-        d[field.name] = d_val.decode() if type(d_val) == bytes else d_val
+        try:
+            d[field.name] = d_val.decode()
+        except (UnicodeDecodeError, AttributeError):
+            d[field.name] = d_val
     return d
 
 

From e0b74f558b3e32d8d512836307ab3ea26ed41659 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 9 Feb 2024 13:04:58 +0000
Subject: [PATCH 1471/1854] make: replace flake8 with ruff

Ruff (https://github.com/astral-sh/ruff) is a Python linter
written in Rust, designed to replace Flake8. It is significantly
faster and actively maintained.

In addition to replacing flake8 with ruff, this patch also
creates separate makefile targets for ruff, shellcheck and
codespell, so that they can be tested independently.

RUFF_FLAGS can be used to specify options such as '--fix'.
Example:
	make lint
	make ruff RUFF_FLAGS=--fix

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                              |  4 +--
 .github/workflows/lint.yml               |  2 +-
 CONTRIBUTING.md                          |  2 +-
 Makefile                                 | 37 ++++++++++++++----------
 scripts/build/Dockerfile.alpine          |  1 -
 scripts/build/Dockerfile.archlinux       |  1 -
 scripts/build/Dockerfile.centos8         |  1 -
 scripts/ci/prepare-for-fedora-rawhide.sh |  1 -
 scripts/ci/run-ci-tests.sh               |  2 +-
 scripts/ci/vagrant.sh                    |  4 +--
 scripts/ruff.toml                        |  4 +++
 11 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 scripts/ruff.toml

diff --git a/.cirrus.yml b/.cirrus.yml
index adaa9be33..72135590d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -36,7 +36,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata python-flake8 xmlto libdrm-devel
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata xmlto libdrm-devel
     # The image has a too old version of nettle which does not work with gnutls.
     # Just upgrade to the latest to make the error go away.
     dnf -y upgrade nettle nettle-devel
@@ -111,7 +111,7 @@ task:
     yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || :
     yum install -y dnf-plugins-core
     yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-protobuf python3-importlib-metadata python3-junit_xml xmlto libdrm-devel
+    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-PyYAML python3-protobuf python3-importlib-metadata python3-junit_xml xmlto libdrm-devel
     alternatives --set python /usr/bin/python3
     systemctl stop sssd
     # Even with selinux in permissive mode the selinux tests will be executed
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f52bce812..489259474 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
-      run: sudo dnf -y install git make python3-flake8 xz clang-tools-extra which codespell git-clang-format ShellCheck
+      run: sudo dnf -y install git make ruff xz clang-tools-extra which codespell git-clang-format ShellCheck
 
     - uses: actions/checkout@v2
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a70506bfb..37965e5fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -59,7 +59,7 @@ Other conventions can be learned from the source code itself. In short, make sur
 
 Important: These tools are there to advise you, but should not be considered as a "source of truth", as tools also make nasty mistakes from time to time which can completely break code readability.
 
-The following command can be used to automatically run a code linter for Python files (flake8), Shell scripts (shellcheck),
+The following command can be used to automatically run a code linter for Python files (ruff), Shell scripts (shellcheck),
 text spelling (codespell), and a number of CRIU-specific checks (usage of print macros and EOL whitespace for C files).
 
 ```
diff --git a/Makefile b/Makefile
index 31dbe202f..e49dace7a 100644
--- a/Makefile
+++ b/Makefile
@@ -426,20 +426,23 @@ help:
 	@echo '      amdgpu_plugin   - Make AMD GPU plugin'
 .PHONY: help
 
-lint:
-	flake8 --version
-	flake8 --config=scripts/flake8.cfg test/zdtm.py
-	flake8 --config=scripts/flake8.cfg test/inhfd/*.py
-	flake8 --config=scripts/flake8.cfg test/others/rpc/config_file.py
-	flake8 --config=scripts/flake8.cfg lib/pycriu/images/pb2dict.py
-	flake8 --config=scripts/flake8.cfg lib/pycriu/images/images.py
-	flake8 --config=scripts/flake8.cfg scripts/criu-ns
-	flake8 --config=scripts/flake8.cfg test/others/criu-ns/run.py
-	flake8 --config=scripts/flake8.cfg crit/*.py
-	flake8 --config=scripts/flake8.cfg crit/crit/*.py
-	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
-	flake8 --config=scripts/flake8.cfg coredump/ coredump/coredump
-	flake8 --config=scripts/flake8.cfg scripts/github-indent-warnings.py
+ruff:
+	@ruff --version
+	ruff ${RUFF_FLAGS} --config=scripts/ruff.toml \
+		test/zdtm.py \
+		test/inhfd/*.py \
+		test/others/rpc/config_file.py \
+		lib/pycriu/images/pb2dict.py \
+		lib/pycriu/images/images.py \
+		scripts/criu-ns \
+		test/others/criu-ns/run.py \
+		crit/*.py \
+		crit/crit/*.py \
+		scripts/uninstall_module.py \
+		coredump/ coredump/coredump \
+		scripts/github-indent-warnings.py
+
+shellcheck:
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install
@@ -448,7 +451,11 @@ lint:
 	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
 	shellcheck -x test/others/config-file/*.sh
 	shellcheck -x test/others/action-script/*.sh
+
+codespell:
 	codespell -S tags
+
+lint: ruff shellcheck codespell
 	# Do not append \n to pr_perror, pr_pwarn or fail
 	! git --no-pager grep -E '^\s*\<(pr_perror|pr_pwarn|fail)\>.*\\n"'
 	# Do not use %m with pr_* or fail
@@ -459,7 +466,7 @@ lint:
 	! git --no-pager grep -En '^\s*\<pr_(err|warn|msg|info|debug)\>.*);$$' | grep -v '\\n'
 	# No EOL whitespace for C files
 	! git --no-pager grep -E '\s+$$' \*.c \*.h
-.PHONY: lint
+.PHONY: lint ruff shellcheck codespell
 
 codecov: SHELL := $(shell which bash)
 codecov:
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 2c58c910e..329d7791d 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -41,7 +41,6 @@ RUN apk add \
 	go \
 	e2fsprogs \
 	py-yaml \
-	py3-flake8 \
 	py3-importlib-metadata \
 	asciidoctor
 
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index b9968e876..405651489 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -31,7 +31,6 @@ RUN pacman -Syu --noconfirm \
 	bash \
 	go \
 	python-yaml \
-	flake8 \
 	asciidoctor \
 	python-junit-xml \
 	python-importlib-metadata \
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
index b06524674..a67212344 100644
--- a/scripts/build/Dockerfile.centos8
+++ b/scripts/build/Dockerfile.centos8
@@ -26,7 +26,6 @@ RUN yum install -y --allowerasing \
 	protobuf-c-devel \
 	protobuf-devel \
 	python3-devel \
-	python3-flake8 \
 	python3-PyYAML \
 	python3-protobuf \
 	python3-pip \
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index d812c5faa..09085c403 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -23,7 +23,6 @@ dnf install -y \
 	procps-ng \
 	protobuf-c-devel \
 	protobuf-devel \
-	python3-flake8 \
 	python3-PyYAML \
 	python3-protobuf \
 	python3-junit_xml \
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index ef7e869e0..2fdecbc97 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -4,7 +4,7 @@ set -x -e
 CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
-		libnl-route-3-dev time flake8 libbsd-dev python3-yaml
+		libnl-route-3-dev time libbsd-dev python3-yaml
 		libperl-dev pkg-config python3-protobuf python3-pip
 		python3-importlib-metadata python3-junit.xml libdrm-dev)
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index c8cf0be74..4c1be3544 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -38,8 +38,8 @@ setup() {
 	ssh default sudo dnf upgrade -y
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
-		protobuf-devel python3-flake8 python3-protobuf python3-importlib-metadata \
-		python3-junit_xml rubygem-asciidoctor iptables libselinux-devel libbpf-devel
+		protobuf-devel python3-protobuf python3-importlib-metadata python3-junit_xml \
+		rubygem-asciidoctor iptables libselinux-devel libbpf-devel
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
 	ssh default cat /proc/cmdline
diff --git a/scripts/ruff.toml b/scripts/ruff.toml
new file mode 100644
index 000000000..2b0385976
--- /dev/null
+++ b/scripts/ruff.toml
@@ -0,0 +1,4 @@
+# Ignore `E401` (import violations) in all `__init__.py` files
+[lint.per-file-ignores]
+"__init__.py" = ["F401"]
+

From 835afb1b88b1dd05e0628143ec48263b0edd2e16 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 9 Feb 2024 13:47:55 +0000
Subject: [PATCH 1472/1854] criu-ns: fix lint error

This patch fixes the following lint error:
scripts/criu-ns:219:16: E713 [*] Test for membership should be `not in`

The change in this patch is auto-generated with `ruff --fix`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/criu-ns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/criu-ns b/scripts/criu-ns
index 4c032aa14..5950d7c50 100755
--- a/scripts/criu-ns
+++ b/scripts/criu-ns
@@ -216,7 +216,7 @@ def wrap_restore():
 
 def get_varg(args):
     for i in range(1, len(sys.argv)):
-        if not sys.argv[i] in args:
+        if sys.argv[i] not in args:
             continue
 
         if i + 1 >= len(sys.argv):

From a0a6ec3dc078262c28673ebb00eb91c6064820df Mon Sep 17 00:00:00 2001
From: Stepan Pieshkin <stepanpieshkin@google.com>
Date: Fri, 2 Feb 2024 07:03:05 +0000
Subject: [PATCH 1473/1854] cgroup: Add support for restoring a thread in a
 correct v1 cgroup

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>
---
 criu/cgroup.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 67282f269..6d1f74457 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -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,
-		 * ignore all other values.
+		 * Set the is_threaded flag if cgroup.type's value is threaded
+		 * 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;
 
 		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)
 				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)) {
 				pr_perror("\tCan't make controller dir %s", paux);
 				return -1;
@@ -1985,6 +1986,7 @@ static int cgroupd(int sk)
 			CgMemberEntry *ce = cg_set_entry->ctls[i];
 			char aux[PATH_MAX];
 			CgControllerEntry *ctrl = NULL;
+			const char *format;
 
 			for (j = 0; j < n_controllers; j++) {
 				CgControllerEntry *cur = controllers[j];
@@ -2008,7 +2010,8 @@ static int cgroupd(int sk)
 				continue;
 
 			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

From f590c2b638cd83bd3ce3c1af2759ce0393e77bca Mon Sep 17 00:00:00 2001
From: Stepan Pieshkin <stepanpieshkin@google.com>
Date: Fri, 2 Feb 2024 07:05:51 +0000
Subject: [PATCH 1474/1854] zdtm/static: check that cgroup layout of threads is
 preserved

Co-developed-by: Stepan Pieshkin <stepanpieshkin@google.com>
Signed-off-by: Stepan Pieshkin <stepanpieshkin@google.com>
Signed-off-by: Michal Clapinski <mclapinski@google.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/Makefile            |   3 +
 test/zdtm/static/cgroup_threads.c    | 184 +++++++++++++++++++++++++++
 test/zdtm/static/cgroup_threads.desc |   1 +
 test/zdtm/static/cgroup_threads.hook |  19 +++
 4 files changed, 207 insertions(+)
 create mode 100644 test/zdtm/static/cgroup_threads.c
 create mode 100644 test/zdtm/static/cgroup_threads.desc
 create mode 100755 test/zdtm/static/cgroup_threads.hook

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index fb856d55b..548cefac2 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -402,6 +402,7 @@ TST_DIR		=				\
 		cgroup_ignore			\
 		cgroup_stray			\
 		cgroup_yard			\
+		cgroup_threads			\
 		unlink_fstat04			\
 		unlink_fstat041			\
 		mntns_remap			\
@@ -684,6 +685,8 @@ s390x_gs_threads:	LDFLAGS += -pthread
 
 thread_different_uid_gid:	LDLIBS += -pthread -lcap
 
+cgroup_threads:		LDFLAGS += -pthread
+
 bpf_hash:		LDLIBS += -lbpf
 bpf_array:		LDLIBS += -lbpf
 
diff --git a/test/zdtm/static/cgroup_threads.c b/test/zdtm/static/cgroup_threads.c
new file mode 100644
index 000000000..2c17e13a7
--- /dev/null
+++ b/test/zdtm/static/cgroup_threads.c
@@ -0,0 +1,184 @@
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mount.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that cgroup layout of threads is preserved";
+const char *test_author = "Michał Cłapiński <mclapinski@google.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "cgroup directory name", 1);
+static const char *cgname = "zdtmtst";
+#define SUBNAME	 "subcg_threads"
+#define SUBNAME2 SUBNAME "/subsubcg"
+
+#define exit_group(code) syscall(__NR_exit_group, code)
+
+static int cg_move(char *name)
+{
+	int cgfd, l;
+	char paux[256];
+
+	sprintf(paux, "%s/%s", dirname, name);
+	if (mkdir(paux, 0600)) {
+		pr_perror("Can't create %s", paux);
+		return -1;
+	}
+
+	sprintf(paux, "%s/%s/tasks", dirname, name);
+
+	cgfd = open(paux, O_WRONLY);
+	if (cgfd < 0) {
+		pr_perror("Can't open tasks");
+		return -1;
+	}
+
+	l = write(cgfd, "0", 2);
+	close(cgfd);
+
+	if (l < 0) {
+		pr_perror("Can't move self to subcg");
+		return -1;
+	}
+
+	return 0;
+}
+
+static int cg_check(char *name)
+{
+	int found = 0;
+	FILE *cgf;
+	char paux[256], aux[128];
+
+	cgf = fopen("/proc/thread-self/cgroup", "r");
+	if (cgf == NULL)
+		return -1;
+
+	sprintf(aux, "name=%s:/%s", cgname, name);
+	while (fgets(paux, sizeof(paux), cgf)) {
+		char *s;
+
+		s = strchr(paux, ':') + 1;
+		s[strlen(s) - 1] = '\0';
+		test_msg("CMP [%s] vs [%s]\n", s, aux);
+		if (!strcmp(s, aux)) {
+			found = 1;
+			break;
+		}
+	}
+
+	fclose(cgf);
+
+	return found ? 0 : -1;
+}
+
+int th_sync[2], rst_sync[2];
+
+void *thread_fn(void *args)
+{
+	int status = cg_move(SUBNAME2);
+
+	if (write(th_sync[1], &status, sizeof(status)) != sizeof(status)) {
+		pr_perror("write");
+		exit_group(1);
+	}
+
+	if (status == 0) {
+		if (read(rst_sync[0], &status, sizeof(status)) < 0) {
+			pr_perror("read");
+			exit_group(1);
+		}
+
+		status = cg_check(SUBNAME2);
+		if (write(th_sync[1], &status, sizeof(status)) != sizeof(status)) {
+			pr_perror("write");
+			exit_group(1);
+		}
+	}
+
+	pthread_exit(0);
+}
+
+int main(int argc, char **argv)
+{
+	int status, exit_code = 1;
+	pthread_t thread;
+	char aux[64];
+
+	test_init(argc, argv);
+
+	/*
+	 * Pipe to talk to the kid.
+	 * First, it reports that it's ready (int),
+	 * then it reports the restore status (int).
+	 */
+
+	if (pipe(th_sync)) {
+		pr_perror("pipe");
+		return 1;
+	}
+
+	/* "Restore happened" pipe */
+	if (pipe(rst_sync)) {
+		pr_perror("pipe");
+		return 1;
+	}
+
+	if (mkdir(dirname, 0700) < 0) {
+		pr_perror("Can't make dir");
+		goto out;
+	}
+
+	sprintf(aux, "none,name=%s", cgname);
+	if (mount("none", dirname, "cgroup", 0, aux)) {
+		pr_perror("Can't mount cgroups");
+		goto out_rd;
+	}
+
+	if (cg_move(SUBNAME))
+		goto out_rs;
+
+	if (pthread_create(&thread, NULL, thread_fn, NULL)) {
+		pr_perror("Can't create a new thread");
+		goto out_rs;
+	}
+
+	status = -1;
+	read(th_sync[0], &status, sizeof(status));
+	if (status != 0) {
+		pr_perror("Error moving into cgroups");
+		close(rst_sync[0]);
+		goto out_rs;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	close(rst_sync[1]);
+
+	status = -1;
+	if (read(th_sync[0], &status, sizeof(status)) < 0) {
+		pr_perror("read");
+		goto out_rs;
+	}
+	if (status != 0) {
+		fail("child cg changed");
+		goto out_rs;
+	}
+
+	pass();
+	exit_code = 0;
+
+out_rs:
+	umount(dirname);
+out_rd:
+	rmdir(dirname);
+out:
+	return exit_code;
+}
diff --git a/test/zdtm/static/cgroup_threads.desc b/test/zdtm/static/cgroup_threads.desc
new file mode 100644
index 000000000..3c6c4a7e2
--- /dev/null
+++ b/test/zdtm/static/cgroup_threads.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cgroup_threads.hook b/test/zdtm/static/cgroup_threads.hook
new file mode 100755
index 000000000..f4b553d34
--- /dev/null
+++ b/test/zdtm/static/cgroup_threads.hook
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+[ "$1" == "--clean" -o "$1" == "--pre-restore" ] || exit 0
+
+tname=$(mktemp -d cgclean.XXXXXX)
+trap 'rmdir "${tname}"' EXIT
+
+mount -t cgroup none $tname -o "none,name=zdtmtst"
+trap 'umount "${tname}"; rmdir "${tname}"' EXIT
+
+echo "Cleaning $tname"
+
+rmdir "$tname/subcg_threads/subsubcg/" || true
+rmdir "$tname/subcg_threads/" || true
+
+echo "Left there is:"
+ls "$tname"

From 0b8c51eaad9d3293aa77cf64cf56742fb2ccf1ed Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Wed, 25 May 2022 20:04:59 +0300
Subject: [PATCH 1475/1854] compiler: add ALIGN_DOWN macro

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 include/common/compiler.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/common/compiler.h b/include/common/compiler.h
index 1347b6236..3e66709f9 100644
--- a/include/common/compiler.h
+++ b/include/common/compiler.h
@@ -89,6 +89,7 @@
 #define round_down(x, y)   ((x) & ~__round_mask(x, y))
 #define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
 #define ALIGN(x, a)	   (((x) + (a)-1) & ~((a)-1))
+#define ALIGN_DOWN(x, a)   ALIGN((x) - ((a) - 1), (a))
 
 #define min(x, y)                              \
 	({                                     \

From 17f4dd09593e7b5a42648985f8fa72905349271d Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Sun, 15 May 2022 10:04:16 +0300
Subject: [PATCH 1476/1854] compel: always pass user_fpregs_struct_t to
 compel_get_task_regs()

All architectures create on-stack structure for floating point save area
in compel_get_task_regs() if the caller passes NULL rather than a valid
pointer.

The only place that calls compel_get_task_regs() with NULL for floating
point save area is parasite_start_daemon() and it is simpler to define
this strucuture on stack of parasite_start_daemon().

The availability of floating point save data is required in
parasite_start_daemon() to detect shadow stack presence early during
parasite infection and will be used in later patches.

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 compel/arch/aarch64/src/lib/infect.c | 3 +--
 compel/arch/arm/src/lib/infect.c     | 3 +--
 compel/arch/mips/src/lib/infect.c    | 3 +--
 compel/arch/ppc64/src/lib/infect.c   | 3 +--
 compel/arch/s390/src/lib/infect.c    | 3 +--
 compel/arch/x86/src/lib/infect.c     | 3 +--
 compel/src/lib/infect.c              | 3 ++-
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index d0189f003..812ba34a3 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -59,10 +59,9 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigfr
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd, save_regs_t save,
 			 void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t tmp, *fpsimd = ext_regs ? ext_regs : &tmp;
 	struct iovec iov;
 	int ret;
 
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index 7700f52ca..8b810a88f 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -65,10 +65,9 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigfr
 }
 
 #define PTRACE_GETVFPREGS 27
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *vfp, save_regs_t save,
 			 void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t tmp, *vfp = ext_regs ? ext_regs : &tmp;
 	int ret = -1;
 
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index afa0f5ed5..0e98aaee3 100644
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -119,10 +119,9 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigfr
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *xs, save_regs_t save,
 			 void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t xsave = {}, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
 	pr_info("Dumping GP/FPU registers for %d\n", pid);
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index 1603ac92e..84c2b1d7c 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -391,10 +391,9 @@ static int __get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_stru
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs, save_regs_t save,
 			 void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
 	int ret;
 
 	ret = __get_task_regs(pid, regs, fpregs);
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 3cd25e71d..85dfc3a4d 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -293,10 +293,9 @@ static int s390_disable_ri_bit(pid_t pid, user_regs_struct_t *regs)
 /*
  * Prepare task registers for restart
  */
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs, save_regs_t save,
 			 void *arg, __maybe_unused unsigned long flags)
 {
-	user_fpregs_struct_t tmp, *fpregs = ext_regs ? ext_regs : &tmp;
 	struct iovec iov;
 	int rewind;
 
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 88bdb4047..2febbf3f7 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -345,10 +345,9 @@ static int corrupt_extregs(pid_t pid)
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *xs, save_regs_t save,
 			 void *arg, unsigned long flags)
 {
-	user_fpregs_struct_t xsave = {}, *xs = ext_regs ? ext_regs : &xsave;
 	int ret = -1;
 
 	pr_info("Dumping general registers for %d in %s mode\n", pid, user_regs_native(regs) ? "native" : "compat");
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index b9a913fa1..696daa7f1 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -739,6 +739,7 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 {
 	pid_t pid = ctl->rpid;
 	struct infect_ctx *ictx = &ctl->ictx;
+	user_fpregs_struct_t ext_regs;
 
 	/*
 	 * Get task registers before going daemon, since the
@@ -746,7 +747,7 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 	 * while in daemon it is not such.
 	 */
 
-	if (compel_get_task_regs(pid, &ctl->orig.regs, NULL, ictx->save_regs, ictx->regs_arg, ictx->flags)) {
+	if (compel_get_task_regs(pid, &ctl->orig.regs, &ext_regs, ictx->save_regs, ictx->regs_arg, ictx->flags)) {
 		pr_err("Can't obtain regs for thread %d\n", pid);
 		return -1;
 	}

From 6e491a19a33496abc93ba3ce59a53c01d03a1ca6 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Mon, 21 Mar 2022 09:34:41 +0200
Subject: [PATCH 1477/1854] compel: shstk: save CET state when CPU supports it

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 .../arch/x86/src/lib/include/uapi/asm/cpu.h   |  1 +
 .../arch/x86/src/lib/include/uapi/asm/fpu.h   | 11 +++-
 .../src/lib/include/uapi/asm/infect-types.h   |  3 +
 compel/arch/x86/src/lib/infect.c              | 65 ++++++++++++++++++-
 compel/include/uapi/infect.h                  |  8 +++
 criu/arch/x86/crtools.c                       | 17 +++++
 images/core-x86.proto                         |  8 +++
 7 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/cpu.h b/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
index 63ff83dbe..11c50e0e5 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/cpu.h
@@ -244,6 +244,7 @@ enum cpuid_leafs {
 #define X86_FEATURE_PKU		     (11 * 32 + 3)  /* Protection Keys for Userspace */
 #define X86_FEATURE_OSPKE	     (11 * 32 + 4)  /* OS Protection Keys Enable */
 #define X86_FEATURE_AVX512_VBMI2     (11 * 32 + 6)  /* Additional AVX512 Vector Bit Manipulation Instructions */
+#define X86_FEATURE_SHSTK            (11 * 32 + 7)  /* Shadow Stack */
 #define X86_FEATURE_GFNI	     (11 * 32 + 8)  /* Galois Field New Instructions */
 #define X86_FEATURE_VAES	     (11 * 32 + 9)  /* Vector AES */
 #define X86_FEATURE_VPCLMULQDQ	     (11 * 32 + 10) /* Carry-Less Multiplication Double Quadword */
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
index 8c83dd9ae..d595a68fc 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
@@ -245,6 +245,14 @@ struct pkru_state {
 	uint32_t pad;
 } __packed;
 
+/*
+ * State component 11 is Control-flow Enforcement user states
+ */
+struct cet_user_state {
+	uint64_t cet;			/* user control-flow settings */
+	uint64_t ssp;			/* user shadow stack pointer */
+};
+
 /*
  * This is our most modern FPU state format, as saved by the XSAVE
  * and restored by the XRSTOR instructions.
@@ -260,7 +268,7 @@ struct pkru_state {
  * Of course it was not ;-) Now using four pages...
  *
  */
-#define EXTENDED_STATE_AREA_SIZE (XSAVE_SIZE - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct))
+#define EXTENDED_STATE_AREA_SIZE (XSAVE_SIZE - sizeof(struct i387_fxsave_struct) - sizeof(struct xsave_hdr_struct) - sizeof(struct cet_user_state))
 
 /*
  * cpu requires it to be 64 byte aligned
@@ -276,6 +284,7 @@ struct xsave_struct {
 		struct ymmh_struct ymmh;
 		uint8_t extended_state_area[EXTENDED_STATE_AREA_SIZE];
 	};
+	struct cet_user_state cet;
 } __aligned(FP_MIN_ALIGN_BYTES) __packed;
 
 struct xsave_struct_ia32 {
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
index b35504ff8..2619fe64a 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
@@ -143,4 +143,7 @@ typedef struct xsave_struct user_fpregs_struct_t;
  */
 #define __NR32_mmap __NR32_mmap2
 
+extern bool __compel_shstk_enabled(user_fpregs_struct_t *ext_regs);
+#define compel_shstk_enabled __compel_shstk_enabled
+
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 2febbf3f7..aabb4f371 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -26,6 +26,16 @@
 #ifndef NT_X86_XSTATE
 #define NT_X86_XSTATE 0x202 /* x86 extended state using xsave */
 #endif
+
+#ifndef NT_X86_SHSTK
+#define NT_X86_SHSTK 0x204	/* x86 shstk state */
+#endif
+
+#ifndef ARCH_SHSTK_STATUS
+#define ARCH_SHSTK_STATUS	0x5005
+#define ARCH_SHSTK_SHSTK	(1ULL << 0)
+#endif
+
 #ifndef NT_PRSTATUS
 #define NT_PRSTATUS 1 /* Contains copy of prstatus struct */
 #endif
@@ -250,7 +260,49 @@ static int get_task_xsave(pid_t pid, user_fpregs_struct_t *xsave)
 		// [1] Intel® 64 and IA-32 Architectures Software Developer's
 		//     Manual Volume 1: Basic Architecture
 		//     Section 13.6: Processor tracking of XSAVE-managed state
-		return get_task_fpregs(pid, xsave);
+		if (get_task_fpregs(pid, xsave))
+			return -1;
+	}
+
+	/*
+	 * xsave may be on stack, if we don't clear it explicitly we get
+	 * funky shadow stack state
+	 */
+	memset(&xsave->cet, 0, sizeof(xsave->cet));
+	if (compel_cpu_has_feature(X86_FEATURE_SHSTK)) {
+		unsigned long ssp = 0;
+		unsigned long features = 0;
+
+		if (ptrace(PTRACE_ARCH_PRCTL, pid, (unsigned long)&features, ARCH_SHSTK_STATUS)) {
+			/*
+			 * kernels that don't support shadow stack return
+			 * -EINVAL
+			 */
+			if (errno == EINVAL)
+				return 0;
+
+			pr_perror("shstk: can't get shadow stack status for %d", pid);
+			return -1;
+		}
+
+		if (!(features & ARCH_SHSTK_SHSTK))
+			return 0;
+
+		iov.iov_base = &ssp;
+		iov.iov_len = sizeof(ssp);
+
+		if (ptrace(PTRACE_GETREGSET, pid, (unsigned int)NT_X86_SHSTK, &iov) < 0) {
+			/* ENODEV means CET is not supported by the CPU  */
+			if (errno != ENODEV) {
+				pr_perror("shstk: can't get SSP for %d", pid);
+				return -1;
+			}
+		}
+
+		xsave->cet.cet = features;
+		xsave->cet.ssp = ssp;
+
+		pr_debug("%d: shstk: cet: %lx ssp: %lx\n", pid, xsave->cet.cet, xsave->cet.ssp);
 	}
 
 	return 0;
@@ -697,3 +749,14 @@ unsigned long compel_task_size(void)
 {
 	return TASK_SIZE;
 }
+
+bool __compel_shstk_enabled(user_fpregs_struct_t *ext_regs)
+{
+	if (!compel_cpu_has_feature(X86_FEATURE_SHSTK))
+		return false;
+
+	if (ext_regs->cet.cet & ARCH_SHSTK_SHSTK)
+		return true;
+
+	return false;
+}
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 3bd36dda1..848d36c57 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -182,4 +182,12 @@ void compel_set_thread_ip(struct parasite_thread_ctl *tctl, uint64_t v);
 
 extern void compel_get_stack(struct parasite_ctl *ctl, void **rstack, void **r_thread_stack);
 
+#ifndef compel_shstk_enabled
+static inline bool compel_shstk_enabled(user_fpregs_struct_t *ext_regs)
+{
+	return false;
+}
+#define compel_shstk_enabled
+#endif
+
 #endif
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 912a4348b..e068a9a02 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -133,6 +133,14 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpre
 #undef assign_array
 #undef assign_xsave
 
+	if (compel_cpu_has_feature(X86_FEATURE_SHSTK)) {
+		UserX86CetEntry *cet = core->thread_info->fpregs->xsave->cet;
+		struct cet_user_state *regs = &fpregs->cet;
+
+		cet->cet = regs->cet;
+		cet->ssp = regs->ssp;
+	}
+
 	return 0;
 }
 
@@ -199,6 +207,13 @@ static int alloc_xsave_extends(UserX86XsaveEntry *xsave)
 			goto err;
 	}
 
+	if (compel_cpu_has_feature(X86_FEATURE_SHSTK)) {
+		xsave->cet = xzalloc(sizeof(UserX86CetEntry));
+		if (!xsave->cet)
+			goto err;
+		user_x86_cet_entry__init(xsave->cet);
+	}
+
 	return 0;
 err:
 	return -1;
@@ -220,6 +235,8 @@ int arch_alloc_thread_info(CoreEntry *core)
 		with_xsave = compel_cpu_has_feature(X86_FEATURE_OSXSAVE);
 		if (with_xsave)
 			sz += sizeof(UserX86XsaveEntry);
+		if (compel_cpu_has_feature(X86_FEATURE_SHSTK))
+			sz += sizeof(UserX86CetEntry);
 	}
 
 	m = xmalloc(sz);
diff --git a/images/core-x86.proto b/images/core-x86.proto
index 815cf21ff..762418d73 100644
--- a/images/core-x86.proto
+++ b/images/core-x86.proto
@@ -41,6 +41,11 @@ message user_x86_regs_entry {
 	optional user_x86_regs_mode	mode		= 28 [default = NATIVE];
 }
 
+message user_x86_cet_entry {
+	required uint64			cet		=  1[(criu).hex = true];
+	required uint64			ssp		=  2[(criu).hex = true];
+}
+
 message user_x86_xsave_entry {
 	/* standard xsave features */
 	required uint64			xstate_bv	=  1;
@@ -60,6 +65,9 @@ message user_x86_xsave_entry {
 	/* Protected keys */
 	repeated uint32			pkru		=  8;
 
+	/* CET */
+	optional user_x86_cet_entry	cet		=  9;
+
 	/*
 	 * Processor trace (PT) and hardware duty cycling (HDC)
 	 * are supervisor state components and only managed by

From 63a45e1c8aac0e46149ad82637de0d22227c9663 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Sun, 15 May 2022 19:58:04 +0300
Subject: [PATCH 1478/1854] compel: infect: prepare parasite_service() for
 addition of CET support

To support sigreturn with CET enabled parasite must rewind its stack
before calling sigreturn so that shadow stack will be compatible with
actual calling sequence.

In addition, calling sigreturn from top level routine
(__export_parasite_head_start) will significantly simplify the shadow
stack manipulations required to execute sigreturn.

For x86 make fini_sigreturn() return the stack pointer for the signal
frame that will be used by sigreturn and propagate that return value up
to __export_parasite_head_start.

In non-daemon mode parasite_trap_cmd() returns non-positive value
which allows to distinguish daemon and non-daemon mode and properly stop
at int3 in non-daemon mode.

Architectures other than x86 remain unchanged and will still call
sigreturn from fini_sigreturn().

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 compel/arch/x86/plugins/std/parasite-head.S   | 14 +++++++++
 .../x86/src/lib/include/uapi/asm/sigframe.h   | 10 ++++++-
 compel/plugins/include/uapi/std/infect.h      |  2 +-
 compel/plugins/std/infect.c                   | 30 +++++++++----------
 criu/pie/restorer.c                           |  6 +++-
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/compel/arch/x86/plugins/std/parasite-head.S b/compel/arch/x86/plugins/std/parasite-head.S
index 4fb38d1f1..42cad4808 100644
--- a/compel/arch/x86/plugins/std/parasite-head.S
+++ b/compel/arch/x86/plugins/std/parasite-head.S
@@ -34,7 +34,21 @@ END(__export_parasite_head_start_compat)
 .code64
 #endif
 
+/*
+ * When parasite_service() runs in the daemon mode it will return the stack
+ * pointer for the sigreturn frame in %rax and we call sigreturn directly
+ * from here.
+ * Since a valid stack pointer is positive, it is safe to presume that
+ * return value <= 0 means that parasite_service() called parasite_trap_cmd()
+ * in non-daemon mode, and the parasite should stop at int3.
+ */
 ENTRY(__export_parasite_head_start)
 	call	parasite_service
+	cmp	$0, %rax
+	jle	1f
+	movq	%rax, %rsp
+	movq	$15, %rax
+	syscall
+1:
 	int	$0x03
 END(__export_parasite_head_start)
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
index ec8c156fa..9a540694b 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
@@ -203,13 +203,21 @@ static inline void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
 		: "rdi"(new_sp)						\
 		: "eax", "r8", "r9", "r10", "r11", "memory")
 
-#define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)				\
+#define ARCH_RT_SIGRETURN_RST(new_sp, rt_sigframe)			\
 do {									\
 	if ((rt_sigframe)->is_native)					\
 		ARCH_RT_SIGRETURN_NATIVE(new_sp);			\
 	else								\
 		ARCH_RT_SIGRETURN_COMPAT(new_sp);			\
 } while (0)
+
+#define ARCH_RT_SIGRETURN_DUMP(new_sp, rt_sigframe)			\
+do {									\
+	if ((rt_sigframe)->is_native)					\
+		return new_sp;						\
+	else								\
+		ARCH_RT_SIGRETURN_COMPAT(new_sp);			\
+} while (0)
 /* clang-format off */
 
 int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe,
diff --git a/compel/plugins/include/uapi/std/infect.h b/compel/plugins/include/uapi/std/infect.h
index 08a5a7a80..a729abbd2 100644
--- a/compel/plugins/include/uapi/std/infect.h
+++ b/compel/plugins/include/uapi/std/infect.h
@@ -7,7 +7,7 @@ extern int parasite_get_rpc_sock(void);
 
 extern unsigned int __export_parasite_service_cmd;
 extern void *__export_parasite_service_args_ptr;
-extern int __must_check parasite_service(void);
+extern unsigned long __must_check parasite_service(void);
 
 /*
  * Must be supplied by user plugins.
diff --git a/compel/plugins/std/infect.c b/compel/plugins/std/infect.c
index 60b21d313..034201320 100644
--- a/compel/plugins/std/infect.c
+++ b/compel/plugins/std/infect.c
@@ -16,6 +16,10 @@
 
 #include "rpc-pie-priv.h"
 
+#ifndef ARCH_RT_SIGRETURN_DUMP
+#define ARCH_RT_SIGRETURN_DUMP ARCH_RT_SIGRETURN
+#endif
+
 static int tsock = -1;
 
 static struct rt_sigframe *sigframe;
@@ -79,12 +83,13 @@ static int __parasite_daemon_wait_msg(struct ctl_msg *m)
 
 /* Core infect code */
 
-static noinline void fini_sigreturn(unsigned long new_sp)
+static noinline unsigned long fini_sigreturn(unsigned long new_sp)
 {
-	ARCH_RT_SIGRETURN(new_sp, sigframe);
+	ARCH_RT_SIGRETURN_DUMP(new_sp, sigframe);
+	return new_sp;
 }
 
-static int fini(void)
+static unsigned long fini(void)
 {
 	unsigned long new_sp;
 
@@ -96,14 +101,14 @@ static int fini(void)
 	sys_close(tsock);
 	std_log_set_fd(-1);
 
-	fini_sigreturn(new_sp);
+	return fini_sigreturn(new_sp);
 
 	BUG();
 
 	return -1;
 }
 
-static noinline __used int noinline parasite_daemon(void *args)
+static noinline __used unsigned long parasite_daemon(void *args)
 {
 	struct ctl_msg m;
 	int ret = -1;
@@ -140,12 +145,10 @@ static noinline __used int noinline parasite_daemon(void *args)
 	}
 
 out:
-	fini();
-
-	return 0;
+	return fini();
 }
 
-static noinline __used int parasite_init_daemon(void *data)
+static noinline __used unsigned long parasite_init_daemon(void *data)
 {
 	struct parasite_init_args *args = data;
 	int ret;
@@ -178,14 +181,11 @@ static noinline __used int parasite_init_daemon(void *data)
 	} else
 		goto err;
 
-	parasite_daemon(data);
+	return parasite_daemon(data);
 
 err:
 	futex_set_and_wake(&args->daemon_connected, ret);
-	fini();
-	BUG();
-
-	return -1;
+	return fini();
 }
 
 #ifndef __parasite_entry
@@ -203,7 +203,7 @@ err:
 unsigned int __export_parasite_service_cmd = 0;
 void *__export_parasite_service_args_ptr = NULL;
 
-int __used __parasite_entry parasite_service(void)
+unsigned long __used __parasite_entry parasite_service(void)
 {
 	unsigned int cmd = __export_parasite_service_cmd;
 	void *args = __export_parasite_service_args_ptr;
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 02971657e..20c6801c5 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -78,6 +78,10 @@
 #define FALLOC_FL_PUNCH_HOLE 0x02
 #endif
 
+#ifndef ARCH_RT_SIGRETURN_RST
+#define ARCH_RT_SIGRETURN_RST ARCH_RT_SIGRETURN
+#endif
+
 #define sys_prctl_safe(opcode, val1, val2, val3)                                \
 	({                                                                      \
 		long __ret = sys_prctl(opcode, val1, val2, val3, 0);            \
@@ -631,7 +635,7 @@ static int restore_thread_common(struct thread_restore_args *args)
 
 static void noinline rst_sigreturn(unsigned long new_sp, struct rt_sigframe *sigframe)
 {
-	ARCH_RT_SIGRETURN(new_sp, sigframe);
+	ARCH_RT_SIGRETURN_RST(new_sp, sigframe);
 }
 
 static int send_cg_set(int sk, int cg_set)

From 0aba3dcfa17929dbee316a398c6207d4cdf14f58 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Sun, 15 May 2022 21:06:50 +0300
Subject: [PATCH 1479/1854] compel: shstk: prepare shadow stack signal frame

When calling sigreturn with CET enabled, the kernel verifies that the
shadow stack has proper address of sa_restorer and a "restore token".
Normally, they pushed to the shadow stack when signal processing is
started.

Since compel calls sigreturn directly, the shadow stack should be
updated to match the kernel expectations for sigreturn invocation.

Add parasite_setup_shstk() that sets up the shadow stack with the
address of __export_parasite_head_start as sa_restorer and with the
required restore token.

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 .../src/lib/include/uapi/asm/infect-types.h   |  4 ++
 compel/arch/x86/src/lib/infect.c              | 45 +++++++++++++++++++
 compel/include/uapi/infect.h                  |  9 ++++
 compel/src/lib/infect.c                       |  3 ++
 4 files changed, 61 insertions(+)

diff --git a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
index 2619fe64a..b998c488c 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/infect-types.h
@@ -146,4 +146,8 @@ typedef struct xsave_struct user_fpregs_struct_t;
 extern bool __compel_shstk_enabled(user_fpregs_struct_t *ext_regs);
 #define compel_shstk_enabled __compel_shstk_enabled
 
+extern int __parasite_setup_shstk(struct parasite_ctl *ctl,
+				user_fpregs_struct_t *ext_regs);
+#define parasite_setup_shstk __parasite_setup_shstk
+
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index aabb4f371..a07b1c9f3 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -760,3 +760,48 @@ bool __compel_shstk_enabled(user_fpregs_struct_t *ext_regs)
 
 	return false;
 }
+
+int parasite_setup_shstk(struct parasite_ctl *ctl, user_fpregs_struct_t *ext_regs)
+{
+	pid_t pid = ctl->rpid;
+	unsigned long sa_restorer = ctl->parasite_ip;
+	unsigned long long ssp;
+	unsigned long token;
+	struct iovec iov;
+
+	if (!compel_shstk_enabled(ext_regs))
+		return 0;
+
+	iov.iov_base = &ssp;
+	iov.iov_len = sizeof(ssp);
+	if (ptrace(PTRACE_GETREGSET, pid, (unsigned int)NT_X86_SHSTK, &iov) < 0) {
+		/* ENODEV means CET is not supported by the CPU  */
+		if (errno != ENODEV) {
+			pr_perror("shstk: %d: cannot get SSP", pid);
+			return -1;
+		}
+	}
+
+	/* The token is for 64-bit */
+	token = ALIGN_DOWN(ssp, 8);
+	token |= (1UL << 63);
+	ssp = ALIGN_DOWN(ssp, 8) - 8;
+	if (ptrace(PTRACE_POKEDATA, pid, (void *)ssp, token)) {
+		pr_perror("shstk: %d: failed to inject shadow stack token", pid);
+		return -1;
+	}
+
+	ssp = ssp - sizeof(uint64_t);
+	if (ptrace(PTRACE_POKEDATA, pid, (void *)ssp, sa_restorer)) {
+		pr_perror("shstk: %d: failed to inject restorer address", pid);
+		return -1;
+	}
+
+	ssp = ssp + sizeof(uint64_t);
+	if (ptrace(PTRACE_SETREGSET, pid, (unsigned int)NT_X86_SHSTK, &iov) < 0) {
+		pr_perror("shstk: %d: cannot write SSP", pid);
+		return -1;
+	}
+
+	return 0;
+}
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 848d36c57..cd6255909 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -190,4 +190,13 @@ static inline bool compel_shstk_enabled(user_fpregs_struct_t *ext_regs)
 #define compel_shstk_enabled
 #endif
 
+#ifndef parasite_setup_shstk
+static inline int parasite_setup_shstk(struct parasite_ctl *ctl,
+				       user_fpregs_struct_t *ext_regs)
+{
+	return 0;
+}
+#define parasite_setup_shstk parasite_setup_shstk
+#endif
+
 #endif
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 696daa7f1..79d00c9a1 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -760,6 +760,9 @@ static int parasite_start_daemon(struct parasite_ctl *ctl)
 	if (ictx->make_sigframe(ictx->regs_arg, ctl->sigframe, ctl->rsigframe, &ctl->orig.sigmask))
 		return -1;
 
+	if (parasite_setup_shstk(ctl, &ext_regs))
+		return -1;
+
 	if (parasite_init_daemon(ctl))
 		return -1;
 

From 17eda3ce57e41117771a0f52c6f54cca3a62db88 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Sun, 15 May 2022 21:19:58 +0300
Subject: [PATCH 1480/1854] criu: shstk: add VMA_AREA_SHSTK flag

The shadow stack VMAs require special care because they can only be
created and populated using special system calls.

Add VMA_AREA_SHSTK flag and set it for VMAs that are marked as "ss" in
/proc/pid/smaps

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 criu/include/image.h         |  3 +++
 criu/proc_parse.c            | 17 ++++++++++++++---
 lib/pycriu/images/pb2dict.py |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/criu/include/image.h b/criu/include/image.h
index 9a275565f..a17aae35c 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -35,6 +35,8 @@
  *  - stack
  *  	the memory area is used in application stack so we
  *  	should be careful about guard page here
+ *  - shadow stack
+ *      the memory area is used by shadow stack
  *  - vsyscall
  *  	special memory area injected into the task memory
  *  	space by the kernel itself, represent virtual syscall
@@ -84,6 +86,7 @@
 #define VMA_AREA_VVAR	 (1 << 12)
 #define VMA_AREA_AIORING (1 << 13)
 #define VMA_AREA_MEMFD	 (1 << 14)
+#define VMA_AREA_SHSTK	 (1 << 15)
 
 #define VMA_EXT_PLUGIN	  (1 << 27)
 #define VMA_CLOSE	  (1 << 28)
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 9d43e2394..92655a484 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -118,7 +118,8 @@ bool handle_vma_plugin(int *fd, struct stat *stat)
 	return true;
 }
 
-static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf)
+static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf,
+			    int *shstk)
 {
 	char *tok;
 
@@ -162,6 +163,9 @@ static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf)
 		if (_vmflag_match(tok, "io") || _vmflag_match(tok, "pf"))
 			*io_pf = 1;
 
+		if (_vmflag_match(tok, "ss"))
+			*shstk = 1;
+
 		/*
 		 * Anything else is just ignored.
 		 */
@@ -172,14 +176,21 @@ static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf)
 
 void parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf)
 {
-	__parse_vmflags(buf, flags, madv, io_pf);
+	int shstk = 0;
+
+	__parse_vmflags(buf, flags, madv, io_pf, &shstk);
 }
 
 static void parse_vma_vmflags(char *buf, struct vma_area *vma_area)
 {
 	int io_pf = 0;
+	int shstk = 0;
 
-	__parse_vmflags(buf, &vma_area->e->flags, &vma_area->e->madv, &io_pf);
+	__parse_vmflags(buf, &vma_area->e->flags, &vma_area->e->madv, &io_pf,
+			&shstk);
+
+	if (shstk)
+		vma_area->e->status |= VMA_AREA_SHSTK;
 
 	/*
 	 * vmsplice doesn't work for VM_IO and VM_PFNMAP mappings, the
diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index d29fdf66c..0d1a24692 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -103,6 +103,7 @@ mmap_status_map = [
     ('VMA_AREA_VVAR', 1 << 12),
     ('VMA_AREA_AIORING', 1 << 13),
     ('VMA_AREA_MEMFD', 1 << 14),
+    ('VMA_AREA_SHSTK', 1 << 15),
     ('VMA_UNSUPP', 1 << 31),
 ]
 

From 4b6dda7ec077d516939544d12900ded231dcb248 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Tue, 24 May 2022 21:25:14 +0300
Subject: [PATCH 1481/1854] criu: shstk: premap and prepopulate shadow stack
 VMAs

Shadow stack VMAs cannot be mmap()ed, they must be created using
map_shadow_stack() system call and populated using special wrss
instruction available only when shadow stack is enabled.

Premap them to reserve virtual address space and populate it to have
there contents available for later copying after enabling shadow stack.

Along with the space required by shadow stack VMAs also reserve an extra
page that will be later used as a temporary shadow stack.

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 criu/include/vma.h |  1 +
 criu/mem.c         | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/criu/include/vma.h b/criu/include/vma.h
index 4b663ee50..b8ddfc142 100644
--- a/criu/include/vma.h
+++ b/criu/include/vma.h
@@ -106,6 +106,7 @@ static inline bool vma_entry_is_private(VmaEntry *entry, unsigned long task_size
 	return (vma_entry_is(entry, VMA_AREA_REGULAR) &&
 		(vma_entry_is(entry, VMA_ANON_PRIVATE) || vma_entry_is(entry, VMA_FILE_PRIVATE)) &&
 		(entry->end <= task_size)) ||
+	       vma_entry_is(entry, VMA_AREA_SHSTK) ||
 	       vma_entry_is(entry, VMA_AREA_AIORING);
 }
 
diff --git a/criu/mem.c b/criu/mem.c
index f56ed826b..0236c5e1e 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -741,6 +741,8 @@ int prepare_mm_pid(struct pstree_item *i)
 			ri->vmas.rst_priv_size += vma_area_len(vma);
 			if (vma_has_guard_gap_hidden(vma))
 				ri->vmas.rst_priv_size += PAGE_SIZE;
+			if (vma_area_is(vma, VMA_AREA_SHSTK))
+				ri->vmas.rst_priv_size += PAGE_SIZE;
 		}
 
 		pr_info("vma 0x%" PRIx64 " 0x%" PRIx64 "\n", vma->e->start, vma->e->end);
@@ -882,6 +884,14 @@ static int premap_private_vma(struct pstree_item *t, struct vma_area *vma, void
 		vma->e->start -= PAGE_SIZE;
 
 	size = vma_entry_len(vma->e);
+
+	/*
+	 * map an extra page for shadow stack VMAs, it will be used as a
+	 * temporary shadow stack
+	 */
+	if (vma_area_is(vma, VMA_AREA_SHSTK))
+		size += PAGE_SIZE;
+
 	if (!vma_inherited(vma)) {
 		int flag = 0;
 		/*
@@ -957,6 +967,15 @@ static int premap_private_vma(struct pstree_item *t, struct vma_area *vma, void
 
 static inline bool vma_force_premap(struct vma_area *vma, struct list_head *head)
 {
+	/*
+	 * Shadow stack VMAs cannot be mmap()ed, they must be created using
+	 * map_shadow_stack() system call.
+	 * Premap them to reserve virtual address space and populate them
+	 * to have there contents available for later copying.
+	 */
+	if (vma_area_is(vma, VMA_AREA_SHSTK))
+		return true;
+
 	/*
 	 * On kernels with 4K guard pages, growsdown VMAs
 	 * always have one guard page at the

From 2ebd1a4f0b6e1c4e35f044a65549356388e4d1df Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Wed, 25 May 2022 10:30:06 +0300
Subject: [PATCH 1482/1854] criu: shstk: prepare shadow stack parameters for
 restorer blob

Shadow stacks must be populated using special WRSS instruction. This
instruction is only available when shadow stack is enabled, calling it
with disabled shadow stack causes #UD.

Moreover, shadow stack VMAs cannot be mremap()ed and they must be
created using map_shadow_stack() system call. This requires delaying the
restore of shadow stacks to restorer blob after the CRIU mappings are
cleared.

Introduce rst_shstk_info structure to hold shadow stack parameters
required in the restorer blob and populate this structure in
arch_prepare_shstk() method.

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/arch/x86/Makefile               |  1 +
 criu/arch/x86/include/asm/restorer.h |  1 +
 criu/arch/x86/include/asm/shstk.h    | 69 +++++++++++++++++++++
 criu/arch/x86/shstk.c                | 90 ++++++++++++++++++++++++++++
 criu/cr-restore.c                    |  3 +
 criu/include/restore.h               | 13 ++++
 criu/include/restorer.h              |  8 +++
 7 files changed, 185 insertions(+)
 create mode 100644 criu/arch/x86/include/asm/shstk.h
 create mode 100644 criu/arch/x86/shstk.c

diff --git a/criu/arch/x86/Makefile b/criu/arch/x86/Makefile
index 618e85bb3..46f00e9e9 100644
--- a/criu/arch/x86/Makefile
+++ b/criu/arch/x86/Makefile
@@ -9,6 +9,7 @@ obj-y			+= cpu.o
 obj-y			+= crtools.o
 obj-y			+= kerndat.o
 obj-y			+= sigframe.o
+obj-y			+= shstk.o
 ifeq ($(CONFIG_COMPAT),y)
         obj-y		+= sigaction_compat.o
 endif
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index f7a6d5058..3a673958d 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -8,6 +8,7 @@
 #include <compel/plugins/std/syscall-codes.h>
 #include <compel/asm/sigframe.h>
 #include "asm/compat.h"
+#include "asm/shstk.h"
 
 #ifdef CONFIG_COMPAT
 extern void restore_tls(tls_t *ptls);
diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
new file mode 100644
index 000000000..a81062010
--- /dev/null
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -0,0 +1,69 @@
+#ifndef __CR_ASM_SHSTK_H__
+#define __CR_ASM_SHSTK_H__
+
+/*
+ * Shadow stack constants from Linux
+ */
+/* arch/x86/include/uapi/asm/mman.h */
+#ifndef SHADOW_STACK_SET_TOKEN
+#define SHADOW_STACK_SET_TOKEN 0x1     /* Set up a restore token in the shadow stack */
+#endif
+
+/* arch/x86/include/uapi/asm/prctl.h */
+#define ARCH_SHSTK_ENABLE		0x5001
+#define ARCH_SHSTK_DISABLE	0x5002
+#define ARCH_SHSTK_LOCK		0x5003
+#define ARCH_SHSTK_UNLOCK		0x5004
+#define ARCH_SHSTK_STATUS		0x5005
+
+#define ARCH_SHSTK_SHSTK	(1ULL << 0)
+#define ARCH_SHSTK_WRSS		(1ULL << 1)
+
+#define ARCH_HAS_SHSTK
+
+/* from arch/x86/kernel/shstk.c */
+#define SHSTK_DATA_BIT (1UL << 63)	/* BIT(63) */
+
+/*
+ * Shadow stack memory cannot be restored with memcpy/pread but only using
+ * a special instruction that can write to shadow stack.
+ * That instruction is only available when shadow stack is enabled,
+ * otherwise it causes #UD.
+ *
+ * Also, shadow stack VMAs cannot be mmap()ed or mrepmap()ed, they must be
+ * created using map_shadow_stack() system call. This pushes creation of
+ * shadow stack VMAs to the restorer blob after CRIU mappings are freed.
+ *
+ * And there is an additional jungling with shadow stacks to ensure that we
+ * don't unmap an active shadow stack
+ *
+ * The overall sequence of restoring shadow stack is
+ * - Enable shadow stack early after clone()ing the task
+ * - Unlock shadow stack features using ptrace
+ * - In the restorer blob:
+ *   - switch to a temporary shadow stack to be able to unmap shadow stack
+ *     with the CRIU mappings
+ *   - after memory mappigns are restored, recreate shadow stack VMAs,
+ *     populate them using wrss instruction and switch to the task shadow
+ *     stack
+ *   - lock shadow stack features
+ */
+struct rst_shstk_info {
+	unsigned long vma_start;	/* start of shadow stack VMA */
+	unsigned long vma_size;		/* size of shadow stack VMA */
+	unsigned long premmaped_addr;	/* address of shadow stack copy in
+					   the premmaped area */
+	unsigned long tmp_shstk;	/* address of temporary shadow stack */
+	u64 ssp;			/* shadow stack pointer */
+	u64 cet;			/* CET conrtol state */
+};
+#define rst_shstk_info rst_shstk_info
+
+struct task_restore_args;
+struct pstree_item;
+
+int arch_shstk_prepare(struct pstree_item *item, CoreEntry *core,
+		       struct task_restore_args *ta);
+#define arch_shstk_prepare arch_shstk_prepare
+
+#endif /* __CR_ASM_SHSTK_H__ */
diff --git a/criu/arch/x86/shstk.c b/criu/arch/x86/shstk.c
new file mode 100644
index 000000000..f6bc81dc6
--- /dev/null
+++ b/criu/arch/x86/shstk.c
@@ -0,0 +1,90 @@
+#include <common/list.h>
+
+#include <compel/cpu.h>
+
+#include "pstree.h"
+#include "restorer.h"
+#include "rst-malloc.h"
+#include "vma.h"
+
+static bool task_needs_shstk(struct pstree_item *item, CoreEntry *core)
+{
+	UserX86FpregsEntry *fpregs;
+
+	if (!task_alive(item))
+		return false;
+
+	fpregs = core->thread_info->fpregs;
+	if (fpregs->xsave && fpregs->xsave->cet) {
+		if (!compel_cpu_has_feature(X86_FEATURE_SHSTK)) {
+			pr_warn_once("Restoring task with shadow stack on non-CET machine\n");
+			return false;
+		}
+
+		if (fpregs->xsave->cet->cet & ARCH_SHSTK_SHSTK)
+			return true;
+	}
+
+	return false;
+}
+
+static int shstk_prepare_task(struct vm_area_list *vmas,
+			      struct rst_shstk_info *shstk)
+{
+	struct vma_area *vma;
+
+	list_for_each_entry(vma, &vmas->h, list) {
+		if (vma_area_is(vma, VMA_AREA_SHSTK) &&
+		    in_vma_area(vma, shstk->ssp)) {
+			unsigned long premmaped_addr = vma->premmaped_addr;
+			unsigned long size = vma_area_len(vma);
+
+			shstk->vma_start = vma->e->start;
+			shstk->vma_size = size;
+			shstk->premmaped_addr = premmaped_addr;
+			shstk->tmp_shstk = premmaped_addr + size;
+
+			break;
+		}
+	}
+
+	return 0;
+}
+
+int arch_shstk_prepare(struct pstree_item *item, CoreEntry *core,
+		       struct task_restore_args *ta)
+{
+	struct thread_restore_args *args_array = (struct thread_restore_args *)(&ta[1]);
+	UserX86FpregsEntry *fpregs = core->thread_info->fpregs;
+	struct vm_area_list *vmas = &rsti(item)->vmas;
+	struct rst_shstk_info *shstk = &ta->shstk;
+	int i;
+
+	if (!task_needs_shstk(item, core))
+		return 0;
+
+	shstk->cet = fpregs->xsave->cet->cet;
+	shstk->ssp = fpregs->xsave->cet->ssp;
+
+	if (shstk_prepare_task(vmas, shstk)) {
+		pr_err("Failed to prepare shadow stack memory\n");
+		return -1;
+	}
+
+	for (i = 0; i < item->nr_threads; i++) {
+		struct thread_restore_args *thread_args = &args_array[i];
+
+		core = item->core[i];
+		fpregs = core->thread_info->fpregs;
+		shstk = &thread_args->shstk;
+
+		shstk->cet = fpregs->xsave->cet->cet;
+		shstk->ssp = fpregs->xsave->cet->ssp;
+		if (shstk_prepare_task(vmas, shstk)) {
+			pr_err("Failed to prepare shadow stack memory\n");
+			return -1;
+		}
+	}
+
+	return 0;
+}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 270049721..e43cc1742 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -975,6 +975,9 @@ static int restore_one_alive_task(int pid, CoreEntry *core)
 	if (setup_uffd(pid, ta))
 		return -1;
 
+	if (arch_shstk_prepare(current, core, ta))
+		return -1;
+
 	return sigreturn_restore(pid, ta, args_len, core);
 }
 
diff --git a/criu/include/restore.h b/criu/include/restore.h
index 8ef0dbddf..7d29496f2 100644
--- a/criu/include/restore.h
+++ b/criu/include/restore.h
@@ -7,4 +7,17 @@
 
 extern int arch_set_thread_regs_nosigrt(struct pid *pid);
 
+struct task_restore_args;
+struct pstree_item;
+
+#ifndef arch_shstk_prepare
+static inline int arch_shstk_prepare(struct pstree_item *item,
+				     CoreEntry *core,
+				     struct task_restore_args *ta)
+{
+	return 0;
+}
+#define arch_shstk_prepare arch_shstk_prepare
+#endif
+
 #endif
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index f398d8d8f..73565d1de 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -56,6 +56,10 @@ struct restore_posix_timer {
 	int overrun;
 };
 
+#ifndef rst_shstk_info
+struct rst_shstk_info {};
+#endif
+
 /*
  * We should be able to construct fpu sigframe in sigreturn_prep_fpu_frame,
  * so the mem_zone.rt_sigframe should be 64-bytes aligned. To make things
@@ -119,6 +123,8 @@ struct thread_restore_args {
 	unsigned int seccomp_filters_n;
 	bool seccomp_force_tsync;
 
+	struct rst_shstk_info shstk;
+
 	char comm[TASK_COMM_LEN];
 	int cg_set;
 	int cgroupd_sk;
@@ -240,6 +246,8 @@ struct task_restore_args {
 
 	uid_t uid;
 	u32 cap_eff[CR_CAP_SIZE];
+
+	struct rst_shstk_info shstk;
 } __aligned(64);
 
 /*

From f47899c9ef7e01cb18acb669cfec4b48f71e0683 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Wed, 29 Nov 2023 18:55:35 +0200
Subject: [PATCH 1483/1854] criu: kerndat: add kdat_has_shstk()

Detect if CRIU runs with shadow stack enabled and store the result in
kerndat.

Unlike most kerndat knobs, kdat_has_shstk() does not check for
availability of the shadow stack in the kernel, but rather checks if
criu runs with shadow stack enabled.

This depends on hardware availabilty, kernel and glibc support, compiler
options and glibc tunables, so kdat_has_shstk() must be called every
time CRIU starts and its result cannot be cached.

The result will be used by the code that controls shadow stack
enablement in the next commit.

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 criu/arch/x86/include/asm/kerndat.h |  1 +
 criu/arch/x86/kerndat.c             | 27 +++++++++++++++++++++++++++
 criu/include/kerndat.h              |  1 +
 criu/kerndat.c                      | 28 ++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+)

diff --git a/criu/arch/x86/include/asm/kerndat.h b/criu/arch/x86/include/asm/kerndat.h
index 903bc80f7..5c3717230 100644
--- a/criu/arch/x86/include/asm/kerndat.h
+++ b/criu/arch/x86/include/asm/kerndat.h
@@ -4,5 +4,6 @@
 extern int kdat_compatible_cr(void);
 extern int kdat_can_map_vdso(void);
 extern int kdat_x86_has_ptrace_fpu_xsave_bug(void);
+extern int kdat_has_shstk(void);
 
 #endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/x86/kerndat.c b/criu/arch/x86/kerndat.c
index a98797d39..3a58bbea7 100644
--- a/criu/arch/x86/kerndat.c
+++ b/criu/arch/x86/kerndat.c
@@ -17,6 +17,7 @@
 
 #include "asm/compat.h"
 #include "asm/dump.h"
+#include "asm/shstk.h"
 
 int kdat_can_map_vdso(void)
 {
@@ -251,3 +252,29 @@ out_kill:
 
 	return ret;
 }
+
+/*
+ * Unlike most kerndat knobs, this does not check for availability of the
+ * shadow stack in the kernel, but rather checks if criu runs with shadow
+ * stack enabled.
+ *
+ * This depends on hardware availability, kernel and glibc support, compiler
+ * options and glibc tunables.
+ */
+int kdat_has_shstk(void)
+{
+	unsigned long features;
+
+	if (!compel_cpu_has_feature(X86_FEATURE_SHSTK))
+		return 0;
+
+	if (syscall(__NR_arch_prctl, ARCH_SHSTK_STATUS, &features)) {
+		/* kernels that don't support shadow stack return -EINVAL */
+		if (errno == EINVAL)
+			return 0;
+		pr_perror("Cannot get shadow stack status");
+		return 1;
+	}
+
+	return !!(features & ARCH_SHSTK_SHSTK);
+}
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 91dbd494b..41524ed66 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -87,6 +87,7 @@ struct kerndat_s {
 	bool has_ipv6_freebind;
 	bool has_membarrier_get_registrations;
 	bool has_pagemap_scan;
+	bool has_shstk;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index e3b378a9c..6f4fea46b 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1151,6 +1151,24 @@ static int kerndat_has_openat2(void)
 	return 0;
 }
 
+int __attribute__((weak)) kdat_has_shstk(void)
+{
+	return 0;
+}
+
+static int kerndat_has_shstk(void)
+{
+	int ret = kdat_has_shstk();
+
+	if (ret < 0) {
+		pr_err("kdat_has_shstk failed\n");
+		return ret;
+	}
+
+	kdat.has_shstk = !!ret;
+	return 0;
+}
+
 #define KERNDAT_CACHE_NAME "criu.kdat"
 #define KERNDAT_CACHE_FILE KDAT_RUNDIR "/" KERNDAT_CACHE_NAME
 
@@ -1705,6 +1723,12 @@ int kerndat_try_load_new(void)
 		return ret;
 	}
 
+	ret = kerndat_has_shstk();
+	if (ret < 0) {
+		pr_err("kerndat_has_shstk failed when initializing kerndat.\n");
+		return ret;
+	}
+
 	/* New information is found, we need to save to the cache */
 	if (ret)
 		kerndat_save_cache();
@@ -1926,6 +1950,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_membarrier_get_registrations failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_shstk()) {
+		pr_err("kerndat_has_shstk failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From 7dd583002368acedec40d90757a4d47672c6180b Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Tue, 31 May 2022 12:45:09 +0300
Subject: [PATCH 1484/1854] restore: add infrastructure to enable shadow stack

There are several gotachs when restoring a task with shadow stack:
* depending on the compiler options, glibc version and glibc tunables
  CRIU can run with or without shadow stack.
* shadow stack VMAs are special, they must be created using a dedicated
  map_shadow_stack() system call and can be modified only by a special
  instruction (wrss) that is only available when shadow stack is
  enabled.
* once shadow stack is enabled, it is not writable even with wrss;
  writes to shadow stack can be only enabled with ptrace() and only when
  shadow stack is enabled in the tracee.
* if the shadow stack is enabled during restore rather than by glibc,
  calling retq after arch_prctl() that enables the shadow stack causes
  #CP, so the function that enables shadow stack can never return.

Add the infrastructure required to cope with all of those:

* modify the restore code to allow trampoline (arch_shstk_trampoline)
  that will enable shadow stack and call restore_task_with_children().
* add call to arch_shstk_unlock() right after the tasks are clone()ed;
  this will allow unlocking shadow stack features and making shadow
  stack writable.
* add stubs for architectures that do not support shadow stacks
* add implementation of arch_shstk_trampoline() and arch_shstk_unlock()
  for x86, but keep it disabled; it will be enabled along with addtion
  of the code that will restore shadow stack in the restorer blob

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 criu/arch/x86/include/asm/shstk.h |   9 ++
 criu/arch/x86/shstk.c             | 133 ++++++++++++++++++++++++++++++
 criu/cr-restore.c                 |  14 +++-
 criu/include/restore.h            |  18 ++++
 criu/include/rst_info.h           |   3 +
 5 files changed, 176 insertions(+), 1 deletion(-)

diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
index a81062010..7849dd7a6 100644
--- a/criu/arch/x86/include/asm/shstk.h
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -66,4 +66,13 @@ int arch_shstk_prepare(struct pstree_item *item, CoreEntry *core,
 		       struct task_restore_args *ta);
 #define arch_shstk_prepare arch_shstk_prepare
 
+#if 0
+int arch_shstk_unlock(struct pstree_item *item, CoreEntry *core, pid_t pid);
+#define arch_shstk_unlock arch_shstk_unlock
+
+int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
+		      int (*func)(void *arg), void *arg);
+#define arch_shstk_trampoline arch_shstk_trampoline
+#endif
+
 #endif /* __CR_ASM_SHSTK_H__ */
diff --git a/criu/arch/x86/shstk.c b/criu/arch/x86/shstk.c
index f6bc81dc6..b752f114a 100644
--- a/criu/arch/x86/shstk.c
+++ b/criu/arch/x86/shstk.c
@@ -1,3 +1,6 @@
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+
 #include <common/list.h>
 
 #include <compel/cpu.h>
@@ -88,3 +91,133 @@ int arch_shstk_prepare(struct pstree_item *item, CoreEntry *core,
 
 	return 0;
 }
+
+int arch_shstk_unlock(struct pstree_item *item, CoreEntry *core, pid_t pid)
+{
+	unsigned long features;
+	int status;
+	int ret = -1;
+
+	/*
+	 * CRIU runs with no shadow stack and the task does not need one,
+	 * nothing to do.
+	 */
+	if (!kdat.has_shstk && !task_needs_shstk(item, core))
+		return 0;
+
+	futex_wait_until(&rsti(item)->shstk_enable, 1);
+
+	if (ptrace(PTRACE_SEIZE, pid, 0, 0)) {
+		pr_perror("Cannot attach to %d", pid);
+		goto futex_wake;
+	}
+
+	if (ptrace(PTRACE_INTERRUPT, pid, 0, 0)) {
+		pr_perror("Cannot interrupt the %d task", pid);
+		goto detach;
+	}
+
+	if (wait4(pid, &status, __WALL, NULL) != pid) {
+		pr_perror("waitpid(%d) failed", pid);
+		goto detach;
+	}
+
+	features = ARCH_SHSTK_SHSTK | ARCH_SHSTK_WRSS;
+	if (ptrace(PTRACE_ARCH_PRCTL, pid, features, ARCH_SHSTK_UNLOCK)) {
+		pr_perror("Cannot unlock CET for %d task", pid);
+		goto detach;
+	}
+
+detach:
+	if (ptrace(PTRACE_DETACH, pid, NULL, 0)) {
+		pr_perror("Unable to detach %d", pid);
+		goto futex_wake;
+	}
+
+	ret = 0;
+
+futex_wake:
+	futex_set_and_wake(&rsti(item)->shstk_unlock, 1);
+
+	return ret;
+}
+
+static void shstk_sync_unlock(struct pstree_item *item)
+{
+	/* notify parent that shadow stack is enabled ... */
+	futex_set_and_wake(&rsti(item)->shstk_enable, 1);
+
+	/* ... and wait until it unlocks its features with ptrace */
+	futex_wait_until(&rsti(item)->shstk_unlock, 1);
+}
+
+static void __arch_shstk_enable(struct pstree_item *item,
+				int (*func)(void *arg), void *arg)
+{
+	int ret;
+
+	shstk_sync_unlock(item);
+
+	/* return here would cause #CP, use exit() instead */
+	ret = func(arg);
+	exit(ret);
+}
+
+static int shstk_disable(struct pstree_item *item)
+{
+	shstk_sync_unlock(item);
+
+	/* disable shadow stack, implicitly clears ARCH_SHSTK_WRSS */
+	if (syscall(__NR_arch_prctl, ARCH_SHSTK_DISABLE, ARCH_SHSTK_SHSTK)) {
+		pr_perror("Failed to disable shadow stack");
+		return -1;
+	}
+
+	if (syscall(__NR_arch_prctl, ARCH_SHSTK_LOCK,
+		    ARCH_SHSTK_SHSTK | ARCH_SHSTK_WRSS)) {
+		pr_perror("Failed to lock shadow stack controls");
+		return -1;
+	}
+
+	return 0;
+}
+
+int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
+		      int (*func)(void *arg), void *arg)
+{
+	unsigned long features = ARCH_SHSTK_SHSTK;
+	int code = ARCH_SHSTK_ENABLE;
+
+	/*
+	 * If task does not need shadow stack but CRIU runs with shadow
+	 * stack enabled, we should disable it before continuing with
+	 * restore
+	 */
+	if (!task_needs_shstk(item, core)) {
+		if (kdat.has_shstk && shstk_disable(item))
+			return -1;
+		return func(arg);
+	}
+
+	/*
+	 * Calling sys_arch_prctl() means there will be use of retq
+	 * instruction after shadow stack is enabled and this will cause
+	 * Control Protectiond fault. Open code sys_arch_prctl() in
+	 * assembly.
+	 *
+	 * code and addr should be in %rdi and %rsi and will be passed to
+	 * the system call as is.
+	 */
+	asm volatile("movq $"__stringify(__NR_arch_prctl)", %%rax	\n"
+		     "syscall						\n"
+		     "cmpq $0, %%rax					\n"
+		     "je 1f						\n"
+		     "retq						\n"
+		     "1:						\n"
+		     :: "D"(code), "S"(features));
+
+	__arch_shstk_enable(item, func, arg);
+
+	/* never reached */
+	return -1;
+}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index e43cc1742..318d34c48 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1498,6 +1498,8 @@ static inline int fork_with_pid(struct pstree_item *item)
 		pr_debug("PID: real %d virt %d\n", item->pid->real, vpid(item));
 	}
 
+	arch_shstk_unlock(item, ca.core, pid);
+
 err_unlock:
 	if (!(ca.clone_flags & CLONE_NEWPID))
 		unlock_last_pid();
@@ -1764,7 +1766,7 @@ static int create_children_and_session(void)
 	return 0;
 }
 
-static int restore_task_with_children(void *_arg)
+static int __restore_task_with_children(void *_arg)
 {
 	struct cr_clone_arg *ca = _arg;
 	pid_t pid;
@@ -1956,6 +1958,16 @@ err:
 	exit(1);
 }
 
+static int restore_task_with_children(void *_arg)
+{
+	struct cr_clone_arg *arg = _arg;
+	struct pstree_item *item = arg->item;
+	CoreEntry *core = arg->core;
+
+	return arch_shstk_trampoline(item, core, __restore_task_with_children,
+				     arg);
+}
+
 static int attach_to_tasks(bool root_seized)
 {
 	struct pstree_item *item;
diff --git a/criu/include/restore.h b/criu/include/restore.h
index 7d29496f2..04d006505 100644
--- a/criu/include/restore.h
+++ b/criu/include/restore.h
@@ -20,4 +20,22 @@ static inline int arch_shstk_prepare(struct pstree_item *item,
 #define arch_shstk_prepare arch_shstk_prepare
 #endif
 
+#ifndef arch_shstk_unlock
+static inline int arch_shstk_unlock(struct pstree_item *item,
+				    CoreEntry *core, pid_t pid)
+{
+	return 0;
+}
+#define arch_shstk_unlock arch_shstk_unlock
+#endif
+
+#ifndef arch_shstk_trampoline
+static inline int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
+				    int (*func)(void *arg), void *arg)
+{
+	return func(arg);
+}
+#define arch_shstk_trampoline arch_shstk_trampoline
+#endif
+
 #endif
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 704b42a72..59b891fa2 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -75,6 +75,9 @@ struct rst_info {
 
 	struct rst_rseq *rseqe;
 
+	futex_t shstk_enable;
+	futex_t shstk_unlock;
+
 	void *breakpoint;
 };
 

From a48aa33eaa9c4b84793424b15b9d1480f01efab6 Mon Sep 17 00:00:00 2001
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Date: Wed, 25 May 2022 12:30:04 +0300
Subject: [PATCH 1485/1854] restorer: shstk: implement shadow stack restore

The restore of a task with shadow stack enabled adds these steps:

* switch from the default shadow stack to a temporary shadow stack
  allocated in the premmaped area
* unmap CRIU mappings; nothing changed here, but it's important that
  CRIU mappings can be removed only after switching to a temporary
  shadow stack
* create shadow stack VMA with map_shadow_stack()
* restore shadow stack contents with wrss
* switch to "real" shadow stack
* lock shadow stack features

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
 .../x86/plugins/std/syscalls/syscall_64.tbl   |   1 +
 .../x86/src/lib/include/uapi/asm/sigframe.h   |  23 +-
 criu/arch/x86/include/asm/shstk.h             | 204 +++++++++++++++++-
 criu/include/restorer.h                       |  16 ++
 criu/pie/Makefile                             |   5 +
 criu/pie/restorer.c                           |  29 +++
 6 files changed, 271 insertions(+), 7 deletions(-)

diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 57681b79a..4e843bee9 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -118,3 +118,4 @@ __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how
 __NR_pidfd_getfd		438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
 __NR_rseq       		334		sys_rseq		(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
 __NR_membarrier 		324		sys_membarrier		(int cmd, unsigned int flags, int cpu_id)
+__NR_map_shadow_stack		453		sys_map_shadow_stack	(unsigned long addr, unsigned long size, unsigned int flags)
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
index 9a540694b..4a2e67559 100644
--- a/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
@@ -177,6 +177,24 @@ static inline void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
 #define USER32_CS 0x23
 
 /* clang-format off */
+/*
+ * rst_sigreturn in resorer is noninline call which adds an entry to the
+ * shadow stack above the sigframe token;
+ * if shadow stack is enabled, increment the shadow stack pointer to remove
+ * that entry
+ */
+#define ARCH_SHSTK_POP()						\
+	asm volatile(							\
+		     "xor %%rax, %%rax\n"				\
+		     "rdsspq %%rax\n"					\
+		     "cmpq $0, %%rax\n"					\
+		     "jz 1f\n"						\
+		     "movq $1, %%rax\n"					\
+		     "incsspq %%rax\n"					\
+		     "1:\n"						\
+		     : :						\
+		     : "rax")
+
 #define ARCH_RT_SIGRETURN_NATIVE(new_sp)				\
 	asm volatile(							\
 		     "movq %0, %%rax				    \n"	\
@@ -205,9 +223,10 @@ static inline void rt_sigframe_erase_sigset(struct rt_sigframe *sigframe)
 
 #define ARCH_RT_SIGRETURN_RST(new_sp, rt_sigframe)			\
 do {									\
-	if ((rt_sigframe)->is_native)					\
+	if ((rt_sigframe)->is_native) {					\
+		ARCH_SHSTK_POP();					\
 		ARCH_RT_SIGRETURN_NATIVE(new_sp);			\
-	else								\
+	} else								\
 		ARCH_RT_SIGRETURN_COMPAT(new_sp);			\
 } while (0)
 
diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
index 7849dd7a6..7814c351d 100644
--- a/criu/arch/x86/include/asm/shstk.h
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -10,11 +10,11 @@
 #endif
 
 /* arch/x86/include/uapi/asm/prctl.h */
-#define ARCH_SHSTK_ENABLE		0x5001
+#define ARCH_SHSTK_ENABLE	0x5001
 #define ARCH_SHSTK_DISABLE	0x5002
 #define ARCH_SHSTK_LOCK		0x5003
-#define ARCH_SHSTK_UNLOCK		0x5004
-#define ARCH_SHSTK_STATUS		0x5005
+#define ARCH_SHSTK_UNLOCK	0x5004
+#define ARCH_SHSTK_STATUS	0x5005
 
 #define ARCH_SHSTK_SHSTK	(1ULL << 0)
 #define ARCH_SHSTK_WRSS		(1ULL << 1)
@@ -66,13 +66,207 @@ int arch_shstk_prepare(struct pstree_item *item, CoreEntry *core,
 		       struct task_restore_args *ta);
 #define arch_shstk_prepare arch_shstk_prepare
 
-#if 0
 int arch_shstk_unlock(struct pstree_item *item, CoreEntry *core, pid_t pid);
 #define arch_shstk_unlock arch_shstk_unlock
 
 int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
 		      int (*func)(void *arg), void *arg);
 #define arch_shstk_trampoline arch_shstk_trampoline
-#endif
+
+#ifdef CR_NOGLIBC
+
+#include <compel/plugins/std/syscall.h>
+#include <compel/cpu.h>
+#include "vma.h"
+
+#define SHSTK_BUSY_BIT (1UL << 0)	/* BIT(0) */
+
+static inline int shstk_map(unsigned long addr, unsigned long size)
+{
+	long shstk = sys_map_shadow_stack(addr, size, SHADOW_STACK_SET_TOKEN);
+
+	if (shstk < 0) {
+		pr_err("Failed to map shadow stack at %lx: %ld\n", addr, shstk);
+		return -1;
+	}
+
+	if (shstk != addr) {
+		pr_err("Shadow stack address mismatch: need %lx, got %lx\n", addr, shstk);
+		return -1;
+	}
+
+	pr_info("Created shadow stack at %lx\n", shstk);
+
+	return 0;
+}
+
+/* clang-format off */
+static inline unsigned long get_ssp(void)
+{
+	unsigned long ssp;
+
+	asm volatile("rdsspq %0" : "=r"(ssp) :: );
+
+	return ssp;
+}
+
+static inline void wrssq(unsigned long addr, unsigned long val)
+{
+	asm volatile("wrssq %1, (%0)" :: "r"(addr), "r"(val) : "memory");
+}
+/* clang-format off */
+
+static always_inline void shstk_switch_ssp(unsigned long new_ssp)
+{
+	unsigned long old_ssp = get_ssp();
+
+	asm volatile("rstorssp (%0)\n" :: "r"(new_ssp));
+	asm volatile("saveprevssp");
+
+	pr_debug("changed ssp from %lx to %lx\n", old_ssp, new_ssp);
+}
+
+/*
+ * Disable writes to the shadow stack and lock it's disable/enable control
+ */
+static inline int shstk_finalize(void)
+{
+	int ret = 0;
+
+	ret = sys_arch_prctl(ARCH_SHSTK_DISABLE, ARCH_SHSTK_WRSS);
+	if (ret) {
+		pr_err("Failed to disable writes to shadow stack\n");
+		return ret;
+	}
+
+	ret = sys_arch_prctl(ARCH_SHSTK_LOCK, ARCH_SHSTK_SHSTK);
+	if (ret)
+		pr_err("Failed to lock shadow stack controls\n");
+
+	return ret;
+}
+
+/*
+ * Restore contents of the shadow stack and set shadow stack pointer
+ */
+static always_inline int shstk_restore(struct rst_shstk_info *cet)
+{
+	unsigned long *shstk_data = (unsigned long *)cet->premmaped_addr;
+	unsigned long ssp = cet->vma_start + cet->vma_size - 8;
+	unsigned long shstk_top = cet->vma_size / 8 - 1;
+	unsigned long val;
+	long ret;
+
+	if (!(cet->cet & ARCH_SHSTK_SHSTK))
+		return 0;
+
+	if (shstk_map(cet->vma_start, cet->vma_size))
+		return -1;
+
+	/*
+	 * Switch shadow stack from temporary location to the actual task's
+	 * shadow stack VMA
+	 */
+	shstk_switch_ssp(ssp);
+
+	/* restore shadow stack contents */
+	for (; ssp >= cet->ssp; ssp -= 8, shstk_top--)
+		wrssq(ssp, shstk_data[shstk_top]);
+
+	/*
+	 * Add tokens for sigreturn frame and for switch of the shadow stack.
+	 * The sigreturn token will be checked by the kernel during
+	 * processing of sigreturn
+	 * The token for stack switch is required by rstorssp and
+	 * saveprevssp semantics
+	 */
+
+	/* token for sigreturn frame */
+	val = ALIGN_DOWN(cet->ssp, 8) | SHSTK_DATA_BIT;
+	wrssq(ssp, val);
+
+	/* shadow stack switch token */
+	val = ssp | SHSTK_BUSY_BIT;
+	ssp -= 8;
+	wrssq(ssp, val);
+
+	/* reset shadow stack pointer to the proper location */
+	shstk_switch_ssp(ssp);
+
+	ret = sys_munmap(shstk_data, cet->vma_size + PAGE_SIZE);
+	if (ret < 0) {
+		pr_err("Failed to unmap premmaped shadow stack\n");
+		return ret;
+	}
+
+	return shstk_finalize();
+}
+#define arch_shstk_restore shstk_restore
+
+/*
+ * Disable shadow stack
+ */
+static inline int shstk_disable(void)
+{
+	int ret;
+
+	ret = sys_arch_prctl(ARCH_SHSTK_DISABLE, ARCH_SHSTK_WRSS);
+	if (ret) {
+		pr_err("Failed to disable writes to shadow stack\n");
+		return ret;
+	}
+
+	ret = sys_arch_prctl(ARCH_SHSTK_DISABLE, ARCH_SHSTK_SHSTK);
+	if (ret) {
+		pr_err("Failed to disable shadow stack\n");
+		return ret;
+	}
+
+	ret = sys_arch_prctl(ARCH_SHSTK_LOCK, ARCH_SHSTK_SHSTK);
+	if (ret)
+		pr_err("Failed to lock shadow stack controls\n");
+
+	return 0;
+}
+
+/*
+ * Switch to temporary shadow stack
+ */
+static always_inline int shstk_switch_to_restorer(struct rst_shstk_info *cet)
+{
+	unsigned long ssp;
+	long ret;
+
+	if (!(cet->cet & ARCH_SHSTK_SHSTK))
+		return 0;
+
+	ret = sys_munmap((void *)cet->tmp_shstk, PAGE_SIZE);
+	if (ret < 0) {
+		pr_err("Failed to unmap area for temporary shadow stack\n");
+		return -1;
+	}
+
+	ret = shstk_map(cet->tmp_shstk, PAGE_SIZE);
+	if (ret < 0)
+		return -1;
+
+	/*
+	 * Switch shadow stack from the default created by the kernel to a
+	 * temporary shadow stack allocated in the premmaped area
+	 */
+	ssp = cet->tmp_shstk + PAGE_SIZE - 8;
+	shstk_switch_ssp(ssp);
+
+	ret = sys_arch_prctl(ARCH_SHSTK_ENABLE, ARCH_SHSTK_WRSS);
+	if (ret) {
+		pr_err("Failed to enable writes to shadow stack\n");
+		return ret;
+	}
+
+	return 0;
+}
+#define arch_shstk_switch_to_restorer shstk_switch_to_restorer
+
+#endif /* CR_NOGLIBC */
 
 #endif /* __CR_ASM_SHSTK_H__ */
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 73565d1de..3fb5322a4 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -339,4 +339,20 @@ enum {
 #define __r_sym(name)		  restorer_sym##name
 #define restorer_sym(rblob, name) (void *)(rblob + __r_sym(name))
 
+#ifndef arch_shstk_switch_to_restorer
+static inline int arch_shstk_switch_to_restorer(struct rst_shstk_info *shstk)
+{
+	return 0;
+}
+#define arch_shstk_switch_to_restorer arch_shstk_switch_to_restorer
+#endif
+
+#ifndef arch_shstk_restore
+static inline int arch_shstk_restore(struct rst_shstk_info *shstk)
+{
+	return 0;
+}
+#define arch_shstk_restore arch_shstk_restore
+#endif
+
 #endif /* __CR_RESTORER_H__ */
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 265dcf82b..912fab24b 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -18,6 +18,11 @@ ifeq ($(ARCH),mips)
 	ccflags-y	+= -mno-abicalls -fno-pic
 endif
 
+# -mshstk required for CET instructions
+ifeq ($(ARCH),x86)
+	ccflags-y	+= -mshstk
+endif
+
 LDS		:= compel/arch/$(ARCH)/scripts/compel-pack.lds.S
 
 restorer-obj-y	+= parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 20c6801c5..7c34c06d4 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -752,6 +752,10 @@ __visible long __export_restore_thread(struct thread_restore_args *args)
 		goto core_restore_end;
 	}
 
+	/* restore original shadow stack */
+	if (arch_shstk_restore(&args->shstk))
+		goto core_restore_end;
+
 	/* All signals must be handled by thread leader */
 	ksigfillset(&to_block);
 	ret = sys_sigprocmask(SIG_SETMASK, &to_block, NULL, sizeof(k_rtsigset_t));
@@ -1672,6 +1676,9 @@ __visible long __export_restore_task(struct task_restore_args *args)
 		pr_debug("lazy-pages: uffd %d\n", args->uffd);
 	}
 
+	if (arch_shstk_switch_to_restorer(&args->shstk))
+		goto core_restore_end;
+
 	/*
 	 * Park vdso/vvar in a safe place if architecture doesn't support
 	 * mapping them with arch_prctl().
@@ -1723,6 +1730,13 @@ __visible long __export_restore_task(struct task_restore_args *args)
 		if (vma_entry->start > vma_entry->shmid)
 			break;
 
+		/*
+		 * shadow stack VMAs cannot be remapped, they must be
+		 * recreated with map_shadow_stack system call
+		 */
+		if (vma_entry_is(vma_entry, VMA_AREA_SHSTK))
+			continue;
+
 		if (vma_remap(vma_entry, args->uffd))
 			goto core_restore_end;
 	}
@@ -1740,6 +1754,13 @@ __visible long __export_restore_task(struct task_restore_args *args)
 		if (vma_entry->start < vma_entry->shmid)
 			break;
 
+		/*
+		 * shadow stack VMAs cannot be remapped, they must be
+		 * recreated with map_shadow_stack system call
+		 */
+		if (vma_entry_is(vma_entry, VMA_AREA_SHSTK))
+			continue;
+
 		if (vma_remap(vma_entry, args->uffd))
 			goto core_restore_end;
 	}
@@ -2166,6 +2187,14 @@ __visible long __export_restore_task(struct task_restore_args *args)
 
 	futex_set_and_wake(&thread_inprogress, args->nr_threads);
 
+	/*
+	 * Shadow stack of the leader can be locked only after all other
+	 * threads were cloned, otherwise they may start with read-only
+	 * shadow stack.
+	 */
+	if (arch_shstk_restore(&args->shstk))
+		goto core_restore_end;
+
 	restore_finish_stage(task_entries_local, CR_STATE_RESTORE_CREDS);
 
 	if (ret)

From a2b018a188c5fe5cd91785eae35b269c3b9bad40 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 24 Mar 2024 11:07:07 +0000
Subject: [PATCH 1486/1854] ci: try to fix broken docker test

Upgrade to 22.04 base image and use the existing version of docker.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/docker-test.yml |  2 +-
 scripts/ci/docker-test.sh         | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index fabf399fd..11d67432b 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
     steps:
     - uses: actions/checkout@v2
     - name: Run Docker Test (${{ matrix.os }})
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index 7e7ef7197..aaf443afd 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -2,25 +2,6 @@
 
 set -x -e -o pipefail
 
-./apt-install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    software-properties-common
-
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-
-add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable test"
-
-# checkpoint/restore is broken in Docker Engine (Community) version 25.0.0-beta.1
-# https://github.com/moby/moby/discussions/46816
-# Downgrade to the latest stable version.
-VERSION_STRING=5:24.0.7-1~ubuntu.20.04~focal
-./apt-install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
-
 # docker checkpoint and restore is an experimental feature
 echo '{ "experimental": true }' > /etc/docker/daemon.json
 service docker restart

From 8f0e200e666440d0377382b3632e76fa5e2d220b Mon Sep 17 00:00:00 2001
From: Artem Trushkin <at.120@ya.ru>
Date: Sun, 24 Mar 2024 17:16:58 +0700
Subject: [PATCH 1487/1854] mem: fix some VMAs being incorrectly mapped wtih
 PROT_WRITE

A memory interval is a half-open interval, so the condition
when pr->pe->vaddr == vma->e->end should not be interpreted
as an intersection and should cause vma to be marked with VMA_NO_PROT_WRITE.

Fixes: #2364

Signed-off-by: Artem Trushkin <at.120@ya.ru>
---
 criu/mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mem.c b/criu/mem.c
index 0236c5e1e..5f0d57eb6 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1057,7 +1057,7 @@ static int premap_priv_vmas(struct pstree_item *t, struct vm_area_list *vmas, vo
 			do {
 				if (pr->pe->vaddr + pr->pe->nr_pages * PAGE_SIZE <= vma->e->start)
 					continue;
-				if (pr->pe->vaddr > vma->e->end)
+				if (pr->pe->vaddr >= vma->e->end)
 					vma->e->status |= VMA_NO_PROT_WRITE;
 				break;
 			} while (pr->advance(pr));

From 75fed59ef67504920174f14bbd39f628c5e75bef Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 4 Mar 2024 15:10:31 +0000
Subject: [PATCH 1488/1854] Add support for reset-on-fork scheduling flag

This patch extends CRIU with support for SCHED_RESET_ON_FORK.
When the SCHED_RESET_ON_FORK flag is set, the following rules
apply for subsequently created children:

- If the calling thread has a scheduling policy of SCHED_FIFO or
SCHED_RR, the policy is reset to SCHED_OTHER in child processes.

- If the calling process has a negative nice value, the nice value
is reset to zero in child processes.

(See 'man 7 sched')

Fixes: #2359

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-dump.c    | 5 +++++
 criu/cr-restore.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index ee5974acc..fe5e73798 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -157,6 +157,11 @@ static int dump_sched_info(int pid, ThreadCoreEntry *tc)
 	tc->has_sched_policy = true;
 	tc->sched_policy = ret;
 
+	/* The reset-on-fork flag might be used in combination
+	 * with SCHED_FIFO or SCHED_RR to reset the scheduling
+	 * policy/priority in child processes.
+	 */
+	ret &= ~SCHED_RESET_ON_FORK;
 	if ((ret == SCHED_RR) || (ret == SCHED_FIFO)) {
 		ret = syscall(__NR_sched_getparam, pid, &sp);
 		if (ret < 0) {
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 318d34c48..874986ca0 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3057,7 +3057,7 @@ static int validate_sched_parm(struct rst_sched_param *sp)
 	if ((sp->nice < -20) || (sp->nice > 19))
 		return 0;
 
-	switch (sp->policy) {
+	switch (sp->policy & ~SCHED_RESET_ON_FORK) {
 	case SCHED_RR:
 	case SCHED_FIFO:
 		return ((sp->prio > 0) && (sp->prio < 100));

From 231ba0cd29c221d6112f83adb4ccd255247f9f29 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 5 Mar 2024 08:53:56 +0000
Subject: [PATCH 1489/1854] zdtm/sched_policy00: use reset-on-fork flag

This patch extends the sched_policy00 test case to verify that
the SCHED_RESET_ON_FORK flag is restored correctly.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/sched_policy00.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/static/sched_policy00.c b/test/zdtm/static/sched_policy00.c
index dc71eed94..a35135050 100644
--- a/test/zdtm/static/sched_policy00.c
+++ b/test/zdtm/static/sched_policy00.c
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 	}
 
 	p.sched_priority = param;
-	if (sched_setscheduler(pid, SCHED_RR, &p)) {
+	if (sched_setscheduler(pid, SCHED_RR | SCHED_RESET_ON_FORK, &p)) {
 		pr_perror("Can't set policy");
 		kill(pid, SIGKILL);
 		return -1;
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	ret = sched_getscheduler(pid);
-	if (ret != SCHED_RR) {
+	if (ret != (SCHED_RR | SCHED_RESET_ON_FORK)) {
 		fail("Broken/No policy");
 		err++;
 	}

From 52623cca167abf848e7369ae77e7c3030602a646 Mon Sep 17 00:00:00 2001
From: ccccrrrr <zcr1006@gmail.com>
Date: Thu, 29 Feb 2024 16:02:06 +0800
Subject: [PATCH 1490/1854] criu: move timers dump/restore code into separate
 file

Fixes: #335

Signed-off-by: ccccrrrr <zcr1006@gmail.com>
---
 criu/Makefile.crtools           |   1 +
 criu/cr-dump.c                  |   1 +
 criu/cr-restore.c               | 242 +------------------
 criu/include/parasite-syscall.h |   5 -
 criu/include/timer.h            |  17 ++
 criu/parasite-syscall.c         | 150 ------------
 criu/timer.c                    | 399 ++++++++++++++++++++++++++++++++
 7 files changed, 419 insertions(+), 396 deletions(-)
 create mode 100644 criu/include/timer.h
 create mode 100644 criu/timer.c

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index f58644917..bf17f1ec9 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -92,6 +92,7 @@ obj-y			+= servicefd.o
 obj-y			+= pie-util-vdso.o
 obj-y			+= vdso.o
 obj-y			+= timens.o
+obj-y			+= timer.o
 obj-$(CONFIG_HAS_LIBBPF)	+= bpfmap.o
 obj-$(CONFIG_COMPAT)	+= pie-util-vdso-elf32.o
 CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index fe5e73798..a29ec82ef 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -86,6 +86,7 @@
 #include "pidfd-store.h"
 #include "apparmor.h"
 #include "asm/dump.h"
+#include "timer.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 874986ca0..c19a20b46 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -98,6 +98,7 @@
 #include "restore.h"
 
 #include "cr-errno.h"
+#include "timer.h"
 
 #ifndef arch_export_restore_thread
 #define arch_export_restore_thread __export_restore_thread
@@ -118,7 +119,6 @@ static int restore_task_with_children(void *);
 static int sigreturn_restore(pid_t pid, struct task_restore_args *ta, unsigned long alen, CoreEntry *core);
 static int prepare_restorer_blob(void);
 static int prepare_rlimits(int pid, struct task_restore_args *, CoreEntry *core);
-static int prepare_posix_timers(int pid, struct task_restore_args *ta, CoreEntry *core);
 static int prepare_signals(int pid, struct task_restore_args *, CoreEntry *core);
 
 /*
@@ -882,7 +882,6 @@ static int prepare_proc_misc(pid_t pid, TaskCoreEntry *tc, struct task_restore_a
 	return 0;
 }
 
-static int prepare_itimers(int pid, struct task_restore_args *args, CoreEntry *core);
 static int prepare_mm(pid_t pid, struct task_restore_args *args);
 
 static int restore_one_alive_task(int pid, CoreEntry *core)
@@ -2719,245 +2718,6 @@ static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_he
 	return -1;
 }
 
-static inline int timeval_valid(struct timeval *tv)
-{
-	return (tv->tv_sec >= 0) && ((unsigned long)tv->tv_usec < USEC_PER_SEC);
-}
-
-static inline int decode_itimer(char *n, ItimerEntry *ie, struct itimerval *val)
-{
-	if (ie->isec == 0 && ie->iusec == 0) {
-		memzero_p(val);
-		return 0;
-	}
-
-	val->it_interval.tv_sec = ie->isec;
-	val->it_interval.tv_usec = ie->iusec;
-
-	if (!timeval_valid(&val->it_interval)) {
-		pr_err("Invalid timer interval\n");
-		return -1;
-	}
-
-	if (ie->vsec == 0 && ie->vusec == 0) {
-		/*
-		 * Remaining time was too short. Set it to
-		 * interval to make the timer armed and work.
-		 */
-		val->it_value.tv_sec = ie->isec;
-		val->it_value.tv_usec = ie->iusec;
-	} else {
-		val->it_value.tv_sec = ie->vsec;
-		val->it_value.tv_usec = ie->vusec;
-	}
-
-	if (!timeval_valid(&val->it_value)) {
-		pr_err("Invalid timer value\n");
-		return -1;
-	}
-
-	pr_info("Restored %s timer to %ld.%ld -> %ld.%ld\n", n, val->it_value.tv_sec, val->it_value.tv_usec,
-		val->it_interval.tv_sec, val->it_interval.tv_usec);
-
-	return 0;
-}
-
-/*
- * Legacy itimers restore from CR_FD_ITIMERS
- */
-
-static int prepare_itimers_from_fd(int pid, struct task_restore_args *args)
-{
-	int ret = -1;
-	struct cr_img *img;
-	ItimerEntry *ie;
-
-	if (!deprecated_ok("Itimers"))
-		return -1;
-
-	img = open_image(CR_FD_ITIMERS, O_RSTR, pid);
-	if (!img)
-		return -1;
-
-	ret = pb_read_one(img, &ie, PB_ITIMER);
-	if (ret < 0)
-		goto out;
-	ret = decode_itimer("real", ie, &args->itimers[0]);
-	itimer_entry__free_unpacked(ie, NULL);
-	if (ret < 0)
-		goto out;
-
-	ret = pb_read_one(img, &ie, PB_ITIMER);
-	if (ret < 0)
-		goto out;
-	ret = decode_itimer("virt", ie, &args->itimers[1]);
-	itimer_entry__free_unpacked(ie, NULL);
-	if (ret < 0)
-		goto out;
-
-	ret = pb_read_one(img, &ie, PB_ITIMER);
-	if (ret < 0)
-		goto out;
-	ret = decode_itimer("prof", ie, &args->itimers[2]);
-	itimer_entry__free_unpacked(ie, NULL);
-	if (ret < 0)
-		goto out;
-out:
-	close_image(img);
-	return ret;
-}
-
-static int prepare_itimers(int pid, struct task_restore_args *args, CoreEntry *core)
-{
-	int ret = 0;
-	TaskTimersEntry *tte = core->tc->timers;
-
-	if (!tte)
-		return prepare_itimers_from_fd(pid, args);
-
-	ret |= decode_itimer("real", tte->real, &args->itimers[0]);
-	ret |= decode_itimer("virt", tte->virt, &args->itimers[1]);
-	ret |= decode_itimer("prof", tte->prof, &args->itimers[2]);
-
-	return ret;
-}
-
-static inline int timespec_valid(struct timespec *ts)
-{
-	return (ts->tv_sec >= 0) && ((unsigned long)ts->tv_nsec < NSEC_PER_SEC);
-}
-
-static inline int decode_posix_timer(PosixTimerEntry *pte, struct restore_posix_timer *pt)
-{
-	pt->val.it_interval.tv_sec = pte->isec;
-	pt->val.it_interval.tv_nsec = pte->insec;
-
-	if (!timespec_valid(&pt->val.it_interval)) {
-		pr_err("Invalid timer interval(posix)\n");
-		return -1;
-	}
-
-	if (pte->vsec == 0 && pte->vnsec == 0) {
-		/*
-		 * Remaining time was too short. Set it to
-		 * interval to make the timer armed and work.
-		 */
-		pt->val.it_value.tv_sec = pte->isec;
-		pt->val.it_value.tv_nsec = pte->insec;
-	} else {
-		pt->val.it_value.tv_sec = pte->vsec;
-		pt->val.it_value.tv_nsec = pte->vnsec;
-	}
-
-	if (!timespec_valid(&pt->val.it_value)) {
-		pr_err("Invalid timer value(posix)\n");
-		return -1;
-	}
-
-	pt->spt.it_id = pte->it_id;
-	pt->spt.clock_id = pte->clock_id;
-	pt->spt.si_signo = pte->si_signo;
-	pt->spt.it_sigev_notify = pte->it_sigev_notify;
-	pt->spt.sival_ptr = decode_pointer(pte->sival_ptr);
-	pt->spt.notify_thread_id = pte->notify_thread_id;
-	pt->overrun = pte->overrun;
-
-	return 0;
-}
-
-static int cmp_posix_timer_proc_id(const void *p1, const void *p2)
-{
-	return ((struct restore_posix_timer *)p1)->spt.it_id - ((struct restore_posix_timer *)p2)->spt.it_id;
-}
-
-static void sort_posix_timers(struct task_restore_args *ta)
-{
-	void *tmem;
-
-	/*
-	 * This is required for restorer's create_posix_timers(),
-	 * it will probe them one-by-one for the desired ID, since
-	 * kernel doesn't provide another API for timer creation
-	 * with given ID.
-	 */
-
-	if (ta->posix_timers_n > 0) {
-		tmem = rst_mem_remap_ptr((unsigned long)ta->posix_timers, RM_PRIVATE);
-		qsort(tmem, ta->posix_timers_n, sizeof(struct restore_posix_timer), cmp_posix_timer_proc_id);
-	}
-}
-
-/*
- * Legacy posix timers restoration from CR_FD_POSIX_TIMERS
- */
-
-static int prepare_posix_timers_from_fd(int pid, struct task_restore_args *ta)
-{
-	struct cr_img *img;
-	int ret = -1;
-	struct restore_posix_timer *t;
-
-	if (!deprecated_ok("Posix timers"))
-		return -1;
-
-	img = open_image(CR_FD_POSIX_TIMERS, O_RSTR, pid);
-	if (!img)
-		return -1;
-
-	ta->posix_timers_n = 0;
-	while (1) {
-		PosixTimerEntry *pte;
-
-		ret = pb_read_one_eof(img, &pte, PB_POSIX_TIMER);
-		if (ret <= 0)
-			break;
-
-		t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE);
-		if (!t)
-			break;
-
-		ret = decode_posix_timer(pte, t);
-		if (ret < 0)
-			break;
-
-		posix_timer_entry__free_unpacked(pte, NULL);
-		ta->posix_timers_n++;
-	}
-
-	close_image(img);
-	if (!ret)
-		sort_posix_timers(ta);
-
-	return ret;
-}
-
-static int prepare_posix_timers(int pid, struct task_restore_args *ta, CoreEntry *core)
-{
-	int i, ret = -1;
-	TaskTimersEntry *tte = core->tc->timers;
-	struct restore_posix_timer *t;
-
-	ta->posix_timers = (struct restore_posix_timer *)rst_mem_align_cpos(RM_PRIVATE);
-
-	if (!tte)
-		return prepare_posix_timers_from_fd(pid, ta);
-
-	ta->posix_timers_n = tte->n_posix;
-	for (i = 0; i < ta->posix_timers_n; i++) {
-		t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE);
-		if (!t)
-			goto out;
-
-		if (decode_posix_timer(tte->posix[i], t))
-			goto out;
-	}
-
-	ret = 0;
-	sort_posix_timers(ta);
-out:
-	return ret;
-}
-
 static int prepare_mm(pid_t pid, struct task_restore_args *args)
 {
 	int exe_fd, i, ret = -1;
diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h
index 4540e11ee..70ecbb720 100644
--- a/criu/include/parasite-syscall.h
+++ b/criu/include/parasite-syscall.h
@@ -22,11 +22,6 @@ struct parasite_ctl;
 struct parasite_thread_ctl;
 
 extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *);
-extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *);
-
-struct proc_posix_timers_stat;
-extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
-					     struct pstree_item *);
 
 extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
 extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce);
diff --git a/criu/include/timer.h b/criu/include/timer.h
new file mode 100644
index 000000000..09583a901
--- /dev/null
+++ b/criu/include/timer.h
@@ -0,0 +1,17 @@
+#ifndef __CR_TIMER_H__
+#define __CR_TIMER_H__
+
+#include "images/core.pb-c.h"
+
+struct task_restore_args;
+struct pstree_item;
+struct parasite_ctl;
+struct proc_posix_timers_stat;
+
+extern int prepare_itimers(int pid, struct task_restore_args *args, CoreEntry *core);
+extern int prepare_posix_timers(int pid, struct task_restore_args *ta, CoreEntry *core);
+
+extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *item);
+extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
+				      struct pstree_item *item);
+#endif
\ No newline at end of file
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 295e404ec..6d2aa9c88 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -278,156 +278,6 @@ int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *i
 	return 0;
 }
 
-static void encode_itimer(struct itimerval *v, ItimerEntry *ie)
-{
-	ie->isec = v->it_interval.tv_sec;
-	ie->iusec = v->it_interval.tv_usec;
-	ie->vsec = v->it_value.tv_sec;
-	ie->vusec = v->it_value.tv_usec;
-}
-
-int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *item)
-{
-	CoreEntry *core = item->core[0];
-	struct parasite_dump_itimers_args *args;
-	int ret;
-
-	args = compel_parasite_args(ctl, struct parasite_dump_itimers_args);
-
-	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_ITIMERS, ctl);
-	if (ret < 0)
-		return ret;
-
-	encode_itimer((&args->real), (core->tc->timers->real));
-	encode_itimer((&args->virt), (core->tc->timers->virt));
-	encode_itimer((&args->prof), (core->tc->timers->prof));
-
-	return 0;
-}
-
-static int core_alloc_posix_timers(TaskTimersEntry *tte, int n, PosixTimerEntry **pte)
-{
-	int sz;
-
-	/*
-	 * Will be free()-ed in core_entry_free()
-	 */
-
-	sz = n * (sizeof(PosixTimerEntry *) + sizeof(PosixTimerEntry));
-	tte->posix = xmalloc(sz);
-	if (!tte->posix)
-		return -1;
-
-	tte->n_posix = n;
-	*pte = (PosixTimerEntry *)(tte->posix + n);
-	return 0;
-}
-
-static int encode_notify_thread_id(pid_t rtid, struct pstree_item *item, PosixTimerEntry *pte)
-{
-	pid_t vtid = 0;
-	int i;
-
-	if (rtid == 0)
-		return 0;
-
-	if (!(root_ns_mask & CLONE_NEWPID)) {
-		/* Non-pid-namespace case */
-		pte->notify_thread_id = rtid;
-		pte->has_notify_thread_id = true;
-		return 0;
-	}
-
-	/* Pid-namespace case */
-	if (!kdat.has_nspid) {
-		pr_err("Have no NSpid support to dump notify thread id in pid namespace\n");
-		return -1;
-	}
-
-	for (i = 0; i < item->nr_threads; i++) {
-		if (item->threads[i].real != rtid)
-			continue;
-
-		vtid = item->threads[i].ns[0].virt;
-		break;
-	}
-
-	if (vtid == 0) {
-		pr_err("Unable to convert the notify thread id %d\n", rtid);
-		return -1;
-	}
-
-	pte->notify_thread_id = vtid;
-	pte->has_notify_thread_id = true;
-	return 0;
-}
-
-static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v, struct proc_posix_timer *vp,
-			      PosixTimerEntry *pte)
-{
-	pte->it_id = vp->spt.it_id;
-	pte->clock_id = vp->spt.clock_id;
-	pte->si_signo = vp->spt.si_signo;
-	pte->it_sigev_notify = vp->spt.it_sigev_notify;
-	pte->sival_ptr = encode_pointer(vp->spt.sival_ptr);
-
-	pte->overrun = v->overrun;
-
-	pte->isec = v->val.it_interval.tv_sec;
-	pte->insec = v->val.it_interval.tv_nsec;
-	pte->vsec = v->val.it_value.tv_sec;
-	pte->vnsec = v->val.it_value.tv_nsec;
-
-	if (encode_notify_thread_id(vp->spt.notify_thread_id, item, pte))
-		return -1;
-
-	return 0;
-}
-
-int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
-				      struct pstree_item *item)
-{
-	CoreEntry *core = item->core[0];
-	TaskTimersEntry *tte = core->tc->timers;
-	PosixTimerEntry *pte;
-	struct proc_posix_timer *temp;
-	struct parasite_dump_posix_timers_args *args;
-	int ret, exit_code = -1;
-	int args_size;
-	int i;
-
-	if (core_alloc_posix_timers(tte, proc_args->timer_n, &pte))
-		return -1;
-
-	args_size = posix_timers_dump_size(proc_args->timer_n);
-	args = compel_parasite_args_s(ctl, args_size);
-	args->timer_n = proc_args->timer_n;
-
-	i = 0;
-	list_for_each_entry(temp, &proc_args->timers, list) {
-		args->timer[i].it_id = temp->spt.it_id;
-		i++;
-	}
-
-	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_POSIX_TIMERS, ctl);
-	if (ret < 0)
-		goto end_posix;
-
-	i = 0;
-	list_for_each_entry(temp, &proc_args->timers, list) {
-		posix_timer_entry__init(&pte[i]);
-		if (encode_posix_timer(item, &args->timer[i], temp, &pte[i]))
-			goto end_posix;
-		tte->posix[i] = &pte[i];
-		i++;
-	}
-
-	exit_code = 0;
-end_posix:
-	free_posix_timers(proc_args);
-	return exit_code;
-}
-
 int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc)
 {
 	struct parasite_dump_misc *ma;
diff --git a/criu/timer.c b/criu/timer.c
new file mode 100644
index 000000000..bdcb059cc
--- /dev/null
+++ b/criu/timer.c
@@ -0,0 +1,399 @@
+#include "types.h"
+#include "crtools.h"
+#include "infect.h"
+#include "protobuf.h"
+#include "pstree.h"
+#include "posix-timer.h"
+#include "parasite.h"
+#include "namespaces.h"
+#include "rst-malloc.h"
+#include "restorer.h"
+
+static inline int timeval_valid(struct timeval *tv)
+{
+	return (tv->tv_sec >= 0) && ((unsigned long)tv->tv_usec < USEC_PER_SEC);
+}
+
+static inline int decode_itimer(char *n, ItimerEntry *ie, struct itimerval *val)
+{
+	if (ie->isec == 0 && ie->iusec == 0) {
+		memzero_p(val);
+		return 0;
+	}
+
+	val->it_interval.tv_sec = ie->isec;
+	val->it_interval.tv_usec = ie->iusec;
+
+	if (!timeval_valid(&val->it_interval)) {
+		pr_err("Invalid timer interval\n");
+		return -1;
+	}
+
+	if (ie->vsec == 0 && ie->vusec == 0) {
+		/*
+		 * Remaining time was too short. Set it to
+		 * interval to make the timer armed and work.
+		 */
+		val->it_value.tv_sec = ie->isec;
+		val->it_value.tv_usec = ie->iusec;
+	} else {
+		val->it_value.tv_sec = ie->vsec;
+		val->it_value.tv_usec = ie->vusec;
+	}
+
+	if (!timeval_valid(&val->it_value)) {
+		pr_err("Invalid timer value\n");
+		return -1;
+	}
+
+	pr_info("Restored %s timer to %ld.%ld -> %ld.%ld\n", n, val->it_value.tv_sec, val->it_value.tv_usec,
+		val->it_interval.tv_sec, val->it_interval.tv_usec);
+
+	return 0;
+}
+
+/*
+ * Legacy itimers restore from CR_FD_ITIMERS
+ */
+
+int prepare_itimers_from_fd(int pid, struct task_restore_args *args)
+{
+	int ret = -1;
+	struct cr_img *img;
+	ItimerEntry *ie;
+
+	if (!deprecated_ok("Itimers"))
+		return -1;
+
+	img = open_image(CR_FD_ITIMERS, O_RSTR, pid);
+	if (!img)
+		return -1;
+
+	ret = pb_read_one(img, &ie, PB_ITIMER);
+	if (ret < 0)
+		goto out;
+	ret = decode_itimer("real", ie, &args->itimers[0]);
+	itimer_entry__free_unpacked(ie, NULL);
+	if (ret < 0)
+		goto out;
+
+	ret = pb_read_one(img, &ie, PB_ITIMER);
+	if (ret < 0)
+		goto out;
+	ret = decode_itimer("virt", ie, &args->itimers[1]);
+	itimer_entry__free_unpacked(ie, NULL);
+	if (ret < 0)
+		goto out;
+
+	ret = pb_read_one(img, &ie, PB_ITIMER);
+	if (ret < 0)
+		goto out;
+	ret = decode_itimer("prof", ie, &args->itimers[2]);
+	itimer_entry__free_unpacked(ie, NULL);
+	if (ret < 0)
+		goto out;
+out:
+	close_image(img);
+	return ret;
+}
+
+int prepare_itimers(int pid, struct task_restore_args *args, CoreEntry *core)
+{
+	int ret = 0;
+	TaskTimersEntry *tte = core->tc->timers;
+
+	if (!tte)
+		return prepare_itimers_from_fd(pid, args);
+
+	ret |= decode_itimer("real", tte->real, &args->itimers[0]);
+	ret |= decode_itimer("virt", tte->virt, &args->itimers[1]);
+	ret |= decode_itimer("prof", tte->prof, &args->itimers[2]);
+
+	return ret;
+}
+
+static inline int timespec_valid(struct timespec *ts)
+{
+	return (ts->tv_sec >= 0) && ((unsigned long)ts->tv_nsec < NSEC_PER_SEC);
+}
+
+static inline int decode_posix_timer(PosixTimerEntry *pte, struct restore_posix_timer *pt)
+{
+	pt->val.it_interval.tv_sec = pte->isec;
+	pt->val.it_interval.tv_nsec = pte->insec;
+
+	if (!timespec_valid(&pt->val.it_interval)) {
+		pr_err("Invalid timer interval(posix)\n");
+		return -1;
+	}
+
+	if (pte->vsec == 0 && pte->vnsec == 0) {
+		/*
+		 * Remaining time was too short. Set it to
+		 * interval to make the timer armed and work.
+		 */
+		pt->val.it_value.tv_sec = pte->isec;
+		pt->val.it_value.tv_nsec = pte->insec;
+	} else {
+		pt->val.it_value.tv_sec = pte->vsec;
+		pt->val.it_value.tv_nsec = pte->vnsec;
+	}
+
+	if (!timespec_valid(&pt->val.it_value)) {
+		pr_err("Invalid timer value(posix)\n");
+		return -1;
+	}
+
+	pt->spt.it_id = pte->it_id;
+	pt->spt.clock_id = pte->clock_id;
+	pt->spt.si_signo = pte->si_signo;
+	pt->spt.it_sigev_notify = pte->it_sigev_notify;
+	pt->spt.sival_ptr = decode_pointer(pte->sival_ptr);
+	pt->spt.notify_thread_id = pte->notify_thread_id;
+	pt->overrun = pte->overrun;
+
+	return 0;
+}
+
+static int cmp_posix_timer_proc_id(const void *p1, const void *p2)
+{
+	return ((struct restore_posix_timer *)p1)->spt.it_id - ((struct restore_posix_timer *)p2)->spt.it_id;
+}
+
+static void sort_posix_timers(struct task_restore_args *ta)
+{
+	void *tmem;
+
+	/*
+	 * This is required for restorer's create_posix_timers(),
+	 * it will probe them one-by-one for the desired ID, since
+	 * kernel doesn't provide another API for timer creation
+	 * with given ID.
+	 */
+
+	if (ta->posix_timers_n > 0) {
+		tmem = rst_mem_remap_ptr((unsigned long)ta->posix_timers, RM_PRIVATE);
+		qsort(tmem, ta->posix_timers_n, sizeof(struct restore_posix_timer), cmp_posix_timer_proc_id);
+	}
+}
+
+/*
+ * Legacy posix timers restoration from CR_FD_POSIX_TIMERS
+ */
+
+int prepare_posix_timers_from_fd(int pid, struct task_restore_args *ta)
+{
+	struct cr_img *img;
+	int ret = -1;
+	struct restore_posix_timer *t;
+
+	if (!deprecated_ok("Posix timers"))
+		return -1;
+
+	img = open_image(CR_FD_POSIX_TIMERS, O_RSTR, pid);
+	if (!img)
+		return -1;
+
+	ta->posix_timers_n = 0;
+	while (1) {
+		PosixTimerEntry *pte;
+
+		ret = pb_read_one_eof(img, &pte, PB_POSIX_TIMER);
+		if (ret <= 0)
+			break;
+
+		t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE);
+		if (!t)
+			break;
+
+		ret = decode_posix_timer(pte, t);
+		if (ret < 0)
+			break;
+
+		posix_timer_entry__free_unpacked(pte, NULL);
+		ta->posix_timers_n++;
+	}
+
+	close_image(img);
+	if (!ret)
+		sort_posix_timers(ta);
+
+	return ret;
+}
+
+int prepare_posix_timers(int pid, struct task_restore_args *ta, CoreEntry *core)
+{
+	int i, ret = -1;
+	TaskTimersEntry *tte = core->tc->timers;
+	struct restore_posix_timer *t;
+
+	ta->posix_timers = (struct restore_posix_timer *)rst_mem_align_cpos(RM_PRIVATE);
+
+	if (!tte)
+		return prepare_posix_timers_from_fd(pid, ta);
+
+	ta->posix_timers_n = tte->n_posix;
+	for (i = 0; i < ta->posix_timers_n; i++) {
+		t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE);
+		if (!t)
+			goto out;
+
+		if (decode_posix_timer(tte->posix[i], t))
+			goto out;
+	}
+
+	ret = 0;
+	sort_posix_timers(ta);
+out:
+	return ret;
+}
+
+static void encode_itimer(struct itimerval *v, ItimerEntry *ie)
+{
+	ie->isec = v->it_interval.tv_sec;
+	ie->iusec = v->it_interval.tv_usec;
+	ie->vsec = v->it_value.tv_sec;
+	ie->vusec = v->it_value.tv_usec;
+}
+
+int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *item)
+{
+	CoreEntry *core = item->core[0];
+	struct parasite_dump_itimers_args *args;
+	int ret;
+
+	args = compel_parasite_args(ctl, struct parasite_dump_itimers_args);
+
+	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_ITIMERS, ctl);
+	if (ret < 0)
+		return ret;
+
+	encode_itimer((&args->real), (core->tc->timers->real));
+	encode_itimer((&args->virt), (core->tc->timers->virt));
+	encode_itimer((&args->prof), (core->tc->timers->prof));
+
+	return 0;
+}
+
+static int core_alloc_posix_timers(TaskTimersEntry *tte, int n, PosixTimerEntry **pte)
+{
+	int sz;
+
+	/*
+	 * Will be free()-ed in core_entry_free()
+	 */
+
+	sz = n * (sizeof(PosixTimerEntry *) + sizeof(PosixTimerEntry));
+	tte->posix = xmalloc(sz);
+	if (!tte->posix)
+		return -1;
+
+	tte->n_posix = n;
+	*pte = (PosixTimerEntry *)(tte->posix + n);
+	return 0;
+}
+
+static int encode_notify_thread_id(pid_t rtid, struct pstree_item *item, PosixTimerEntry *pte)
+{
+	pid_t vtid = 0;
+	int i;
+
+	if (rtid == 0)
+		return 0;
+
+	if (!(root_ns_mask & CLONE_NEWPID)) {
+		/* Non-pid-namespace case */
+		pte->notify_thread_id = rtid;
+		pte->has_notify_thread_id = true;
+		return 0;
+	}
+
+	/* Pid-namespace case */
+	if (!kdat.has_nspid) {
+		pr_err("Have no NSpid support to dump notify thread id in pid namespace\n");
+		return -1;
+	}
+
+	for (i = 0; i < item->nr_threads; i++) {
+		if (item->threads[i].real != rtid)
+			continue;
+
+		vtid = item->threads[i].ns[0].virt;
+		break;
+	}
+
+	if (vtid == 0) {
+		pr_err("Unable to convert the notify thread id %d\n", rtid);
+		return -1;
+	}
+
+	pte->notify_thread_id = vtid;
+	pte->has_notify_thread_id = true;
+	return 0;
+}
+
+static int encode_posix_timer(struct pstree_item *item, struct posix_timer *v, struct proc_posix_timer *vp,
+			      PosixTimerEntry *pte)
+{
+	pte->it_id = vp->spt.it_id;
+	pte->clock_id = vp->spt.clock_id;
+	pte->si_signo = vp->spt.si_signo;
+	pte->it_sigev_notify = vp->spt.it_sigev_notify;
+	pte->sival_ptr = encode_pointer(vp->spt.sival_ptr);
+
+	pte->overrun = v->overrun;
+
+	pte->isec = v->val.it_interval.tv_sec;
+	pte->insec = v->val.it_interval.tv_nsec;
+	pte->vsec = v->val.it_value.tv_sec;
+	pte->vnsec = v->val.it_value.tv_nsec;
+
+	if (encode_notify_thread_id(vp->spt.notify_thread_id, item, pte))
+		return -1;
+
+	return 0;
+}
+
+int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
+				      struct pstree_item *item)
+{
+	CoreEntry *core = item->core[0];
+	TaskTimersEntry *tte = core->tc->timers;
+	PosixTimerEntry *pte;
+	struct proc_posix_timer *temp;
+	struct parasite_dump_posix_timers_args *args;
+	int ret, exit_code = -1;
+	int args_size;
+	int i;
+
+	if (core_alloc_posix_timers(tte, proc_args->timer_n, &pte))
+		return -1;
+
+	args_size = posix_timers_dump_size(proc_args->timer_n);
+	args = compel_parasite_args_s(ctl, args_size);
+	args->timer_n = proc_args->timer_n;
+
+	i = 0;
+	list_for_each_entry(temp, &proc_args->timers, list) {
+		args->timer[i].it_id = temp->spt.it_id;
+		i++;
+	}
+
+	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_POSIX_TIMERS, ctl);
+	if (ret < 0)
+		goto end_posix;
+
+	i = 0;
+	list_for_each_entry(temp, &proc_args->timers, list) {
+		posix_timer_entry__init(&pte[i]);
+		if (encode_posix_timer(item, &args->timer[i], temp, &pte[i]))
+			goto end_posix;
+		tte->posix[i] = &pte[i];
+		i++;
+	}
+
+	exit_code = 0;
+end_posix:
+	free_posix_timers(proc_args);
+	return exit_code;
+}

From 0fc83a79b1efda538ed1d0a83969f62e6e375f19 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 24 Mar 2024 14:26:41 +0000
Subject: [PATCH 1491/1854] ci: silence CircleCI warning about deprecated image

CircleCI currently prints out the following warning:

   This job is using a deprecated image 'ubuntu-2004:202010-01', please update to a newer image

According to https://discuss.circleci.com/t/linux-image-deprecations-and-eol-for-2024/
the recommended image name is: "image: default"

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47f7ad9b1..785b383e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   test-local-gcc:
     machine:
-      image: ubuntu-2004:202010-01
+      image: default
     working_directory: ~/criu
     steps:
       - checkout
@@ -11,7 +11,7 @@ jobs:
           command: sudo -E make -C scripts/ci local
   test-local-clang:
     machine:
-      image: ubuntu-2004:202010-01
+      image: default
     working_directory: ~/criu
     steps:
       - checkout

From af4058871e49459c7fbe3f6f1963a36c028f2aa7 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 27 Mar 2024 13:34:26 +0800
Subject: [PATCH 1492/1854] timer: fix wrapping allignment in function
 declaration

Currently we have tabs + spaces on the wrapped line but the wrapped part
is not alligned to the opening bracket.

Fixes: bbe26d1b7 ("timer: fix allignment in function definition")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/timer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/include/timer.h b/criu/include/timer.h
index 09583a901..d1deb6051 100644
--- a/criu/include/timer.h
+++ b/criu/include/timer.h
@@ -13,5 +13,5 @@ extern int prepare_posix_timers(int pid, struct task_restore_args *ta, CoreEntry
 
 extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct pstree_item *item);
 extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc_args, struct parasite_ctl *ctl,
-				      struct pstree_item *item);
-#endif
\ No newline at end of file
+					     struct pstree_item *item);
+#endif

From e07ffa04b0d58299317afd8abaeebb6f071061a6 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 5 Apr 2024 14:19:28 -0700
Subject: [PATCH 1493/1854] Makefile.config: fix/improve feature warnings.

1. Tell which RPMs or DEBs are required in all cases.

2. Use $(info ...) everywhere.

3. Drop extra nested $(info), instead use (a document) a simpler kludge.

4. Simplify and unify the language, add missing periods.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 Makefile.config | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index 8f2b5208e..52c250b21 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -2,12 +2,15 @@ include $(__nmk_dir)utils.mk
 include $(__nmk_dir)msg.mk
 include scripts/feature-tests.mak
 
+# This is a kludge for $(info ...) to not eat spaces.
+S :=
+
 ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
         LIBS_FEATURES	+= -lbsd
         FEATURE_DEFINES	+= -DCONFIG_HAS_LIBBSD
 else
         $(info Note: Building without setproctitle() and strlcpy() support.)
-        $(info $(info)      To enable these features, please install libbsd-devel (RPM) / libbsd-dev (DEB).)
+        $(info $S      Install libbsd-devel (RPM) / libbsd-dev (DEB) to fix.)
 endif
 
 ifeq ($(call pkg-config-check,libselinux),y)
@@ -23,10 +26,10 @@ endif
 
 ifeq ($(call pkg-config-check,libdrm),y)
         export CONFIG_AMDGPU := y
-        $(info Note: Building criu with amdgpu_plugin.)
+        $(info Note: Building with amdgpu_plugin.)
 else
-        $(info Note: Building criu without amdgpu_plugin.)
-        $(info Note: libdrm and libdrm_amdgpu are required to build amdgpu_plugin.)
+        $(info Note: Building without amdgpu_plugin.)
+        $(info $S      Install libdrm-devel (RPM) or libdrm-dev (DEB) to fix.)
 endif
 
 ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
@@ -34,7 +37,8 @@ ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
         export CONFIG_GNUTLS := y
         FEATURE_DEFINES	+= -DCONFIG_GNUTLS
 else
-        $(info Note: Building without GnuTLS support)
+        $(info Note: Building without GnuTLS support.)
+        $(info $S      Install gnutls-devel (RPM) or gnutls-dev (DEB) to fix.)
 endif
 
 ifeq ($(call pkg-config-check,libnftables),y)
@@ -46,12 +50,11 @@ ifeq ($(call pkg-config-check,libnftables),y)
                 LIBS_FEATURES	+= $(LIB_NFTABLES)
                 FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_1
         else
-                $(warning Warn: you have libnftables installed but it has incompatible API)
-                $(warning Warn: Building without nftables support)
+                $(info Warn: Building without nftables support (incompatible API version).)
         endif
 else
-        $(warning Warn: you have no libnftables installed)
-        $(warning Warn: Building without nftables support)
+        $(info Warn: Building without nftables support.)
+        $(info $S      Install nftables-devel (RPM) or libnftables-dev (DEB) to fix.)
 endif
 
 export LIBS += $(LIBS_FEATURES)
@@ -67,10 +70,10 @@ ifeq ($(call try-asm,$(FEATURE_TEST_X86_COMPAT)),true)
         export CONFIG_COMPAT := y
         FEATURE_DEFINES	+= -DCONFIG_COMPAT
 else
-        $(info Note: Building without ia32 C/R, missed ia32 support in gcc)
-        $(info $(info)      That may be related to missing gcc-multilib in your)
-        $(info $(info)      distribution or you may have Debian with buggy toolchain)
-        $(info $(info)      (issue https://github.com/checkpoint-restore/criu/issues/315))
+        $(info Note: Building without ia32 C/R, missing ia32 support in gcc.)
+        $(info $S      It may be related to missing gcc-multilib in your)
+        $(info $S      distribution, or you may have Debian with buggy toolchain.)
+        $(info $S      See https://github.com/checkpoint-restore/criu/issues/315.)
 endif
 endif
 

From 1c2a3d7faa16b1583fd2514205c38894f68dd487 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 20 Dec 2023 15:22:48 -0800
Subject: [PATCH 1494/1854] check: verify ino and dev of overlayfs files in
 /proc/pid/maps

Check that the file device and inode shown in /proc/pid/maps match
values returned by stat(2).

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-check.c            | 194 +++++++++++++++++++++++++++++++++++++
 scripts/ci/run-ci-tests.sh |  14 ++-
 2 files changed, 204 insertions(+), 4 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index fea1ce674..507f9915c 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -22,6 +22,7 @@
 #include <sched.h>
 #include <sys/mount.h>
 #include <sys/utsname.h>
+#include <sys/stat.h>
 
 #include "../soccr/soccr.h"
 
@@ -53,6 +54,8 @@
 #include "restorer.h"
 #include "uffd.h"
 #include "linux/aio_abi.h"
+#include "syscall.h"
+#include "mount-v2.h"
 
 #include "images/inventory.pb-c.h"
 
@@ -1390,6 +1393,195 @@ static int check_pagemap_scan(void)
 	return 0;
 }
 
+/* musl doesn't have a statx wrapper... */
+struct staty {
+	__u32 stx_dev_major;
+	__u32 stx_dev_minor;
+	__u64 stx_ino;
+};
+
+static long get_file_dev_and_inode(void *addr, struct staty *stx)
+{
+	char buf[4096];
+	FILE *mapf;
+
+	mapf = fopen("/proc/self/maps", "r");
+	if (mapf == NULL) {
+		pr_perror("fopen(/proc/self/maps)");
+		return -1;
+	}
+
+	while (fgets(buf, sizeof(buf), mapf)) {
+		unsigned long start, end;
+		uint32_t maj, min;
+		__u64 ino;
+
+		if (sscanf(buf, "%lx-%lx %*s %*s %x:%x %llu",
+			   &start, &end, &maj, &min, &ino) != 5) {
+			pr_perror("Unable to parse: %s", buf);
+			return -1;
+		}
+		if (start == (unsigned long)addr) {
+			stx->stx_dev_major = maj;
+			stx->stx_dev_minor = min;
+			stx->stx_ino = ino;
+			return 0;
+		}
+	}
+
+	pr_err("Unable to find the mapping\n");
+	return -1;
+}
+
+static int ovl_mount(void)
+{
+	int tmpfs, fsfd, ovl;
+
+	fsfd = sys_fsopen("tmpfs", 0);
+	if (fsfd == -1) {
+		pr_perror("Unable to fsopen tmpfs");
+		return -1;
+	}
+
+	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) == -1) {
+		pr_perror("Unable to create tmpfs mount");
+		return -1;
+	}
+
+	tmpfs = sys_fsmount(fsfd, 0, 0);
+	if (tmpfs == -1) {
+		pr_perror("Unable to mount tmpfs");
+		return -1;
+	}
+
+	close(fsfd);
+
+	/* overlayfs can't be constructed on top of a detached mount. */
+	if (sys_move_mount(tmpfs, "", AT_FDCWD, "/tmp", MOVE_MOUNT_F_EMPTY_PATH)) {
+		pr_perror("Unable to attach tmpfs mount");
+		return -1;
+	}
+	close(tmpfs);
+
+	if (chdir("/tmp")) {
+		pr_perror("Unable to change working directory");
+		return -1;
+	}
+
+	if (mkdir("/tmp/w", 0755) == -1 ||
+	    mkdir("/tmp/u", 0755) == -1 ||
+	    mkdir("/tmp/l", 0755) == -1) {
+		pr_perror("mkdir");
+		return -1;
+	}
+
+	fsfd = sys_fsopen("overlay", 0);
+	if (fsfd == -1) {
+		pr_perror("Unable to fsopen overlayfs");
+		return -1;
+	}
+	if (sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0) == -1 ||
+	    sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "lowerdir", "/tmp/l", 0) == -1 ||
+	    sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "upperdir", "/tmp/u", 0) == -1 ||
+	    sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "workdir", "/tmp/w", 0) == -1) {
+		pr_perror("Unable to configure overlayfs");
+		return -1;
+	}
+	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) == -1) {
+		pr_perror("Unable to create overlayfs");
+		return -1;
+	}
+	ovl = sys_fsmount(fsfd, 0, 0);
+	if (ovl == -1) {
+		pr_perror("Unable to mount overlayfs");
+		return -1;
+	}
+
+	return ovl;
+}
+
+/*
+ * Check that the file device and inode shown in /proc/pid/maps match values
+ * returned by stat(2).
+ */
+static int do_check_overlayfs_maps(void)
+{
+	struct staty stx, mstx;
+	struct stat st;
+	int ovl, fd;
+	void *addr;
+
+	/* Create a new mount namespace to not care about cleaning test mounts. */
+	if (unshare(CLONE_NEWNS) == -1) {
+		pr_warn("Unable to create a new mount namespace\n");
+		return 0;
+	}
+
+	if (mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL) == -1) {
+		pr_perror("Unable to remount / with MS_SLAVE");
+		return -1;
+	}
+
+	ovl = ovl_mount();
+	if (ovl == -1)
+		return -1;
+
+	fd = openat(ovl, "test", O_RDWR | O_CREAT, 0644);
+	if (fd == -1) {
+		pr_perror("Unable to open a test file");
+		return -1;
+	}
+
+	addr = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, fd, 0);
+	if (addr == MAP_FAILED) {
+		pr_perror("Unable to map the test file");
+		return -1;
+	}
+
+	if (get_file_dev_and_inode(addr, &mstx))
+		return -1;
+	if (fstat(fd, &st)) {
+		pr_perror("stat");
+		return -1;
+	}
+	stx.stx_dev_major = major(st.st_dev);
+	stx.stx_dev_minor = minor(st.st_dev);
+	stx.stx_ino = st.st_ino;
+
+	if (stx.stx_dev_major != mstx.stx_dev_major ||
+	    stx.stx_dev_minor != mstx.stx_dev_minor ||
+	    stx.stx_ino != mstx.stx_ino) {
+		pr_err("unmatched dev:ino %x:%x:%llx (expected %x:%x:%llx)\n",
+		       mstx.stx_dev_major, mstx.stx_dev_minor, mstx.stx_ino,
+		       stx.stx_dev_major, stx.stx_dev_minor, stx.stx_ino);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int check_overlayfs_maps(void)
+{
+	pid_t pid;
+	int status;
+
+	pid = fork();
+	if (pid == -1) {
+		pr_perror("Unable to fork a child");
+		return -1;
+	}
+	if (pid == 0) {
+		if (do_check_overlayfs_maps())
+			exit(1);
+		exit(0);
+	}
+	if (waitpid(pid, &status, 0) == -1) {
+		pr_perror("waitpid");
+		return -1;
+	}
+	return status == 0 ? 0 : -1;
+}
+
 static int (*chk_feature)(void);
 
 /*
@@ -1511,6 +1703,7 @@ int cr_check(void)
 		ret |= check_ptrace_get_rseq_conf();
 		ret |= check_ipv6_freebind();
 		ret |= check_pagemap_scan();
+		ret |= check_overlayfs_maps();
 
 		if (kdat.lsm == LSMTYPE__APPARMOR)
 			ret |= check_apparmor_stacking();
@@ -1633,6 +1826,7 @@ static struct feature_list feature_list[] = {
 	{ "get_rseq_conf", check_ptrace_get_rseq_conf },
 	{ "ipv6_freebind", check_ipv6_freebind },
 	{ "pagemap_scan", check_pagemap_scan },
+	{ "overlayfs_maps", check_overlayfs_maps },
 	{ NULL, NULL },
 };
 
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 2fdecbc97..c50dc4174 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -290,10 +290,16 @@ ip net add test
 # Check if cap_checkpoint_restore is supported and also if unshare -c is supported.
 #
 # Do not run this test in a container (see https://github.com/checkpoint-restore/criu/issues/2312).
-# This is a temporary workaround until fixed in the kernel.
-# The kernel currently does not show correct device and inode numbers in /proc/pid/maps
-# for stackable file systems.
-if capsh --supports=cap_checkpoint_restore && unshare -c /bin/true && [ ! -e /run/.containerenv ]; then
+# Before v6.8-rc1~215^2~6, the kernel currently did not show correct device and
+# inode numbers in /proc/pid/maps for stackable file systems.
+skip=0
+findmnt -no FSTYPE / | grep overlay && {
+	./criu/criu check --feature overlayfs_maps || skip=1
+}
+unshare -c /bin/true || skip=1
+capsh --supports=cap_checkpoint_restore || skip=1
+
+if [ "$skip" == 0 ]; then
 	make -C test/zdtm/ cleanout
 	rm -rf test/dump
 	setcap cap_checkpoint_restore,cap_sys_ptrace+eip criu/criu

From 5aaf45021362006827b70718f64cf61a62fd959e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 26 Mar 2024 10:16:40 +0000
Subject: [PATCH 1495/1854] ci: update base OS to ubuntu 22.04

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/alpine-test.yml         | 2 +-
 .github/workflows/archlinux-test.yml      | 2 +-
 .github/workflows/compat-test.yml         | 2 +-
 .github/workflows/fedora-asan-test.yml    | 2 +-
 .github/workflows/fedora-rawhide-test.yml | 2 +-
 .github/workflows/gcov-test.yml           | 2 +-
 .github/workflows/java-test.yml           | 2 +-
 .github/workflows/podman-test.yml         | 2 +-
 .github/workflows/stream-test.yml         | 2 +-
 .github/workflows/x86-64-clang-test.yml   | 2 +-
 .github/workflows/x86-64-gcc-test.yml     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/alpine-test.yml b/.github/workflows/alpine-test.yml
index 06f466c51..5757fa82b 100644
--- a/.github/workflows/alpine-test.yml
+++ b/.github/workflows/alpine-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target: [GCC=1, CLANG=1]
diff --git a/.github/workflows/archlinux-test.yml b/.github/workflows/archlinux-test.yml
index 328cc9d0f..9e8b60136 100644
--- a/.github/workflows/archlinux-test.yml
+++ b/.github/workflows/archlinux-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Run Arch Linux Test
diff --git a/.github/workflows/compat-test.yml b/.github/workflows/compat-test.yml
index 79f8f0010..e8b5a897b 100644
--- a/.github/workflows/compat-test.yml
+++ b/.github/workflows/compat-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target: [GCC, CLANG]
diff --git a/.github/workflows/fedora-asan-test.yml b/.github/workflows/fedora-asan-test.yml
index 8b1bfcf32..11233f457 100644
--- a/.github/workflows/fedora-asan-test.yml
+++ b/.github/workflows/fedora-asan-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/fedora-rawhide-test.yml b/.github/workflows/fedora-rawhide-test.yml
index 5355aa192..fae544900 100644
--- a/.github/workflows/fedora-rawhide-test.yml
+++ b/.github/workflows/fedora-rawhide-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/gcov-test.yml b/.github/workflows/gcov-test.yml
index fcab47837..f221fabb5 100644
--- a/.github/workflows/gcov-test.yml
+++ b/.github/workflows/gcov-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/java-test.yml b/.github/workflows/java-test.yml
index abed793bf..af1f71046 100644
--- a/.github/workflows/java-test.yml
+++ b/.github/workflows/java-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Run Java Test
diff --git a/.github/workflows/podman-test.yml b/.github/workflows/podman-test.yml
index a7013a216..077cf63e2 100644
--- a/.github/workflows/podman-test.yml
+++ b/.github/workflows/podman-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Run Podman Test
diff --git a/.github/workflows/stream-test.yml b/.github/workflows/stream-test.yml
index 0f5b307db..efb217e16 100644
--- a/.github/workflows/stream-test.yml
+++ b/.github/workflows/stream-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/x86-64-clang-test.yml b/.github/workflows/x86-64-clang-test.yml
index b3b50829a..c9a1d3151 100644
--- a/.github/workflows/x86-64-clang-test.yml
+++ b/.github/workflows/x86-64-clang-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Run X86_64 CLANG Test
diff --git a/.github/workflows/x86-64-gcc-test.yml b/.github/workflows/x86-64-gcc-test.yml
index ec70b61fb..8d1815d57 100644
--- a/.github/workflows/x86-64-gcc-test.yml
+++ b/.github/workflows/x86-64-gcc-test.yml
@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Run X86_64 GCC Test

From e68a06cfd10ea4d9e07a6a7909e07570f7f89a29 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 26 Mar 2024 10:17:44 +0000
Subject: [PATCH 1496/1854] ci: update actions/checkout to v4

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/alpine-test.yml           | 2 +-
 .github/workflows/archlinux-test.yml        | 2 +-
 .github/workflows/compat-test.yml           | 2 +-
 .github/workflows/cross-compile-daily.yml   | 2 +-
 .github/workflows/cross-compile.yml         | 2 +-
 .github/workflows/docker-test.yml           | 2 +-
 .github/workflows/fedora-asan-test.yml      | 2 +-
 .github/workflows/fedora-rawhide-test.yml   | 2 +-
 .github/workflows/gcov-test.yml             | 2 +-
 .github/workflows/java-test.yml             | 2 +-
 .github/workflows/lint.yml                  | 2 +-
 .github/workflows/loongarch64-qemu-test.yml | 2 +-
 .github/workflows/podman-test.yml           | 2 +-
 .github/workflows/stream-test.yml           | 2 +-
 .github/workflows/x86-64-clang-test.yml     | 2 +-
 .github/workflows/x86-64-gcc-test.yml       | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/alpine-test.yml b/.github/workflows/alpine-test.yml
index 5757fa82b..73530d79a 100644
--- a/.github/workflows/alpine-test.yml
+++ b/.github/workflows/alpine-test.yml
@@ -15,6 +15,6 @@ jobs:
         target: [GCC=1, CLANG=1]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Alpine ${{ matrix.target }} Test
       run: sudo -E make -C scripts/ci alpine ${{ matrix.target }}
diff --git a/.github/workflows/archlinux-test.yml b/.github/workflows/archlinux-test.yml
index 9e8b60136..425f0662b 100644
--- a/.github/workflows/archlinux-test.yml
+++ b/.github/workflows/archlinux-test.yml
@@ -11,6 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Arch Linux Test
       run: sudo -E make -C scripts/ci archlinux
diff --git a/.github/workflows/compat-test.yml b/.github/workflows/compat-test.yml
index e8b5a897b..8a64ce185 100644
--- a/.github/workflows/compat-test.yml
+++ b/.github/workflows/compat-test.yml
@@ -16,6 +16,6 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Compat Tests (${{ matrix.target }})
       run: sudo -E make -C scripts/ci local COMPAT_TEST=y ${{ matrix.target }}=1
diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
index 927ddced2..b8c8c86d4 100644
--- a/.github/workflows/cross-compile-daily.yml
+++ b/.github/workflows/cross-compile-daily.yml
@@ -14,7 +14,7 @@ jobs:
         branches: [criu-dev, master]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         ref: ${{ matrix.branches }}
     - name: Run Cross Compilation Targets
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 4da5d397c..06b812823 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -33,7 +33,7 @@ jobs:
             target: mips64el-unstable-cross
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Cross Compilation Targets
       run: >
         sudo make -C scripts/ci ${{ matrix.target }}
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index 11d67432b..23696905a 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -14,6 +14,6 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Docker Test (${{ matrix.os }})
       run: sudo make -C scripts/ci docker-test
diff --git a/.github/workflows/fedora-asan-test.yml b/.github/workflows/fedora-asan-test.yml
index 11233f457..02dc9a1b3 100644
--- a/.github/workflows/fedora-asan-test.yml
+++ b/.github/workflows/fedora-asan-test.yml
@@ -12,6 +12,6 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Fedora ASAN Test
       run: sudo -E make -C scripts/ci fedora-asan
diff --git a/.github/workflows/fedora-rawhide-test.yml b/.github/workflows/fedora-rawhide-test.yml
index fae544900..83e2ead82 100644
--- a/.github/workflows/fedora-rawhide-test.yml
+++ b/.github/workflows/fedora-rawhide-test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Fedora Rawhide Test
       # We need to pass environment variables from the CI environment to
       # distinguish between CI environments. However, we need to make sure that
diff --git a/.github/workflows/gcov-test.yml b/.github/workflows/gcov-test.yml
index f221fabb5..cc4e1d44a 100644
--- a/.github/workflows/gcov-test.yml
+++ b/.github/workflows/gcov-test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Coverage Tests
       run: sudo -E make -C scripts/ci local GCOV=1
     - name: Run gcov
diff --git a/.github/workflows/java-test.yml b/.github/workflows/java-test.yml
index af1f71046..cbd3c1f23 100644
--- a/.github/workflows/java-test.yml
+++ b/.github/workflows/java-test.yml
@@ -11,6 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Java Test
       run: sudo make -C scripts/ci java-test
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 489259474..862d68245 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install tools
       run: sudo dnf -y install git make ruff xz clang-tools-extra which codespell git-clang-format ShellCheck
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set git safe directory
       # https://github.com/actions/checkout/issues/760
diff --git a/.github/workflows/loongarch64-qemu-test.yml b/.github/workflows/loongarch64-qemu-test.yml
index ba22fa25f..d7c554c87 100644
--- a/.github/workflows/loongarch64-qemu-test.yml
+++ b/.github/workflows/loongarch64-qemu-test.yml
@@ -11,5 +11,5 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2 
+      - uses: actions/checkout@v4
       - run: sudo make -C scripts/ci loongarch64-qemu-test
diff --git a/.github/workflows/podman-test.yml b/.github/workflows/podman-test.yml
index 077cf63e2..a07edbe5b 100644
--- a/.github/workflows/podman-test.yml
+++ b/.github/workflows/podman-test.yml
@@ -11,6 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run Podman Test
       run: sudo make -C scripts/ci podman-test
diff --git a/.github/workflows/stream-test.yml b/.github/workflows/stream-test.yml
index efb217e16..76bd96edf 100644
--- a/.github/workflows/stream-test.yml
+++ b/.github/workflows/stream-test.yml
@@ -12,6 +12,6 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run CRIU Image Streamer Test
       run: sudo -E make -C scripts/ci local STREAM_TEST=1
diff --git a/.github/workflows/x86-64-clang-test.yml b/.github/workflows/x86-64-clang-test.yml
index c9a1d3151..1f0a469bd 100644
--- a/.github/workflows/x86-64-clang-test.yml
+++ b/.github/workflows/x86-64-clang-test.yml
@@ -11,6 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run X86_64 CLANG Test
       run: sudo make -C scripts/ci x86_64 CLANG=1
diff --git a/.github/workflows/x86-64-gcc-test.yml b/.github/workflows/x86-64-gcc-test.yml
index 8d1815d57..15e84a0df 100644
--- a/.github/workflows/x86-64-gcc-test.yml
+++ b/.github/workflows/x86-64-gcc-test.yml
@@ -11,6 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Run X86_64 GCC Test
       run: sudo make -C scripts/ci x86_64

From f4290868bb2cb325df6326d36e7e0edf3d532a53 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 26 Mar 2024 13:01:16 +0000
Subject: [PATCH 1497/1854] ci/vdso01: fix typo

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/vdso01.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/vdso01.c b/test/zdtm/static/vdso01.c
index d8d64155a..4e33d30a8 100644
--- a/test/zdtm/static/vdso01.c
+++ b/test/zdtm/static/vdso01.c
@@ -372,7 +372,7 @@ static int vdso_time_handler(void *func)
 	t1 = time(NULL);
 	t2 = vdso_time(NULL);
 
-	test_msg("time: %li vdso_time: %li\n", (long)t1, (long)t1);
+	test_msg("time: %li vdso_time: %li\n", (long)t1, (long)t2);
 
 	if (labs(t1 - t2) > TIME_DELTA_SEC) {
 		pr_perror("Delta is too big");

From 4607b535664cf898ccbc319236ced37bda5c141f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 16 Apr 2024 12:40:20 +0100
Subject: [PATCH 1498/1854] mem: optimize debug logging of enqueued pages

During restore, CRIU prints "Enqueue page-read" messages for
each page-read request [1]. However, this message does not
provide useful information, increases performance overhead
during restore and the size of log file.

$ ./zdtm.py run -t zdtm/static/maps06 -f h -k always
$ grep 'Enqueue page-read' dump/zdtm/static/maps06/56/1/restore.log | wc -l
20493

This commit replaces these log messages with a single message
that shows the number of enqueued page-read requests.

$ grep 'enqueued' dump/zdtm/static/maps06/56/1/restore.log
(00.061449)     56: nr_enqueued:   20493

[1] https://github.com/checkpoint-restore/criu/commit/91388fc

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/mem.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/criu/mem.c b/criu/mem.c
index 5f0d57eb6..c9578ef44 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1087,6 +1087,7 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr)
 	unsigned int nr_shared = 0;
 	unsigned int nr_dropped = 0;
 	unsigned int nr_compared = 0;
+	unsigned int nr_enqueued = 0;
 	unsigned int nr_lazy = 0;
 	unsigned long va;
 
@@ -1162,7 +1163,8 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr)
 				len >>= PAGE_SHIFT;
 				nr_restored += len;
 				i += len - 1;
-				pr_debug("Enqueue page-read\n");
+
+				nr_enqueued++;
 				continue;
 			}
 
@@ -1258,7 +1260,8 @@ err_read:
 
 	pr_info("nr_restored_pages: %d\n", nr_restored);
 	pr_info("nr_shared_pages:   %d\n", nr_shared);
-	pr_info("nr_dropped_pages:   %d\n", nr_dropped);
+	pr_info("nr_dropped_pages:  %d\n", nr_dropped);
+	pr_info("nr_enqueued:       %d\n", nr_enqueued);
 	pr_info("nr_lazy:           %d\n", nr_lazy);
 
 	return 0;

From df178c7e534c0637b5215318cdaddc6d85097c17 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 16 Apr 2024 14:37:01 +0800
Subject: [PATCH 1499/1854] sk-tcp: cleanup dump_tcp_conn_state error handling

1) In dump_tcp_conn_state, if return from libsoccr_save is >=0, we check
that sizeof(struct libsoccr_sk_data) returned from libsoccr_save is
equal to sizeof(struct libsoccr_sk_data) we see in dump_tcp_conn_state
(probably to check if we use the right library version). And if sizes
are different we go to err_r, which just returns ret, which can
teoretically be 0 (if size in library is zero) and that would lead
dump_one_tcp treat this as success though it is obvious error.

2) In case of dump_opt or open_image fails we don't explicitly set ret
and rely that sizeof(struct libsoccr_sk_data) previously set to ret is
not 0, I don't really like it, it makes reading code too complex.

3) We have a lot of err_* labels which do exactly the same thing, there
is no point in having all of them, also it is better to choose the name
of the label based on what it really does.

So let's refactor error handling to avoid these inconsistencies.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/sk-tcp.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 630a182a2..b8d9ba46e 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -135,6 +135,7 @@ void cpt_unlock_tcp_connections(void)
 static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 {
 	struct libsoccr_sk *socr = sk->priv;
+	int exit_code = -1;
 	int ret, aux;
 	struct cr_img *img;
 	TcpStreamEntry tse = TCP_STREAM_ENTRY__INIT;
@@ -144,11 +145,11 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 	ret = libsoccr_save(socr, &data, sizeof(data));
 	if (ret < 0) {
 		pr_err("libsoccr_save() failed with %d\n", ret);
-		goto err_r;
+		goto err;
 	}
 	if (ret != sizeof(data)) {
 		pr_err("This libsocr is not supported (%d vs %d)\n", ret, (int)sizeof(data));
-		goto err_r;
+		goto err;
 	}
 
 	sk->state = data.state;
@@ -190,7 +191,7 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 	 */
 
 	if (dump_opt(sk->rfd, SOL_TCP, TCP_NODELAY, &aux))
-		goto err_opt;
+		goto err;
 
 	if (aux) {
 		tse.has_nodelay = true;
@@ -198,7 +199,7 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 	}
 
 	if (dump_opt(sk->rfd, SOL_TCP, TCP_CORK, &aux))
-		goto err_opt;
+		goto err;
 
 	if (aux) {
 		tse.has_cork = true;
@@ -208,20 +209,19 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 	/*
 	 * Push the stuff to image
 	 */
-
 	img = open_image(CR_FD_TCP_STREAM, O_DUMP, sk->sd.ino);
 	if (!img)
-		goto err_img;
+		goto err;
 
 	ret = pb_write_one(img, &tse, PB_TCP_STREAM);
 	if (ret < 0)
-		goto err_iw;
+		goto err_close;
 
 	buf = libsoccr_get_queue_bytes(socr, TCP_RECV_QUEUE, SOCCR_MEM_EXCL);
 	if (buf) {
 		ret = write_img_buf(img, buf, tse.inq_len);
 		if (ret < 0)
-			goto err_iw;
+			goto err_close;
 
 		xfree(buf);
 	}
@@ -230,18 +230,17 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 	if (buf) {
 		ret = write_img_buf(img, buf, tse.outq_len);
 		if (ret < 0)
-			goto err_iw;
+			goto err_close;
 
 		xfree(buf);
 	}
 
 	pr_info("Done\n");
-err_iw:
+	exit_code = 0;
+err_close:
 	close_image(img);
-err_img:
-err_opt:
-err_r:
-	return ret;
+err:
+	return exit_code;
 }
 
 int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)

From 13854a988ca6ab3263a377f02b174944cd7e7a0e Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 9 May 2024 16:16:50 -0700
Subject: [PATCH 1500/1854] criu: fix a fatal failure if nft doesn't work

On some systems, nft binary might not be installed, or some kernel
options might be unconfigured, resulting in something like this:

	sudo unshare -n nft create table inet CRIU
	Error: Could not process rule: Operation not supported
	create table inet CRIU
	^^^^^^^^^^^^^^^^^^^^^^^

This is similar to what kerndat_has_nftables_concat() does, and if the
outcome is the same, it returns an error to kerndat_init(), and an error
from kerndat_init() is considered fatal.

Let's relax the check, returning mere "feature not working" instead of
a fatal error.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/kerndat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 6f4fea46b..f899ef642 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1602,7 +1602,9 @@ static int __has_nftables_concat(void *arg)
 		return 1;
 
 	if (NFT_RUN_CMD(nft, "create table inet CRIU")) {
-		pr_err("Can't create nftables table\n");
+		pr_warn("Can't create nftables table\n");
+		*has = false; /* kdat.has_nftables_concat = false */
+		ret = 0;
 		goto nft_ctx_free_out;
 	}
 

From 1cb75c0b1ead6f9ec415ea3c0372e77b4fa6c7c6 Mon Sep 17 00:00:00 2001
From: Juntong Deng <juntong.deng@outlook.com>
Date: Sun, 19 May 2024 12:49:18 +0100
Subject: [PATCH 1501/1854] sk-tcp: Move TCP socket options from TcpStreamEntry
 to TcpOptsEntry

Currently some of the TCP socket option information is stored in the
TcpStreamEntry, but the information in the TcpStreamEntry is only
restored after the TCP socket has established connection, which
results in these TCP socket options not being restored for
unconnected TCP sockets.

In this commit move the TCP socket options from TcpStreamEntry to
TcpOptsEntry and add dump_tcp_opts() and restore_tcp_opts() for TCP
socket options dump and restore.

Signed-off-by: Juntong Deng <juntong.deng@outlook.com>
---
 criu/include/sk-inet.h  |  3 +++
 criu/sk-inet.c          | 18 +++++++++++++-
 criu/sk-tcp.c           | 55 +++++++++++++++++++++++++----------------
 images/sk-inet.proto    |  2 ++
 images/tcp-stream.proto |  6 +++++
 5 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/criu/include/sk-inet.h b/criu/include/sk-inet.h
index b3a70fb27..69ee8589e 100644
--- a/criu/include/sk-inet.h
+++ b/criu/include/sk-inet.h
@@ -87,6 +87,9 @@ extern void cpt_unlock_tcp_connections(void);
 extern int dump_one_tcp(int sk, struct inet_sk_desc *sd, SkOptsEntry *soe);
 extern int restore_one_tcp(int sk, struct inet_sk_info *si);
 
+extern int dump_tcp_opts(int sk, TcpOptsEntry *toe);
+extern int restore_tcp_opts(int sk, TcpOptsEntry *toe);
+
 #define SK_EST_PARAM	  "tcp-established"
 #define SK_INFLIGHT_PARAM "skip-in-flight"
 #define SK_CLOSE_PARAM	  "tcp-close"
diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index a6a767c73..92f53e569 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -454,6 +454,7 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 	IpOptsEntry ipopts = IP_OPTS_ENTRY__INIT;
 	IpOptsRawEntry ipopts_raw = IP_OPTS_RAW_ENTRY__INIT;
 	SkOptsEntry skopts = SK_OPTS_ENTRY__INIT;
+	TcpOptsEntry tcpopts = TCP_OPTS_ENTRY__INIT;
 	int ret = -1, err = -1, proto, aux, type;
 
 	ret = do_dump_opt(lfd, SOL_SOCKET, SO_PROTOCOL, &proto, sizeof(proto));
@@ -521,6 +522,7 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 	ie.opts = &skopts;
 	ie.ip_opts = &ipopts;
 	ie.ip_opts->raw = &ipopts_raw;
+	ie.tcp_opts = &tcpopts;
 
 	ie.n_src_addr = PB_ALEN_INET;
 	ie.n_dst_addr = PB_ALEN_INET;
@@ -581,9 +583,20 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 
 	switch (proto) {
 	case IPPROTO_TCP:
-		err = (type != SOCK_RAW) ? dump_one_tcp(lfd, sk, &skopts) : 0;
 		if (sk->shutdown)
 			sk_encode_shutdown(&ie, sk->shutdown);
+
+		if (type == SOCK_RAW) {
+			err = 0;
+		} else {
+			err = dump_tcp_opts(lfd, &tcpopts);
+			if (err < 0)
+				goto err;
+
+			err = dump_one_tcp(lfd, sk, &skopts);
+			if (err < 0)
+				goto err;
+		}
 		break;
 	case IPPROTO_UDP:
 	case IPPROTO_UDPLITE:
@@ -939,6 +952,9 @@ done:
 	if (restore_socket_opts(sk, ie->opts))
 		goto err;
 
+	if (ie->proto == IPPROTO_TCP && restore_tcp_opts(sk, ie->tcp_opts))
+		goto err;
+
 	if (ie->has_shutdown &&
 	    (ie->proto == IPPROTO_UDP || ie->proto == IPPROTO_UDPLITE || ie->proto == IPPROTO_TCP)) {
 		if (shutdown(sk, sk_decode_shutdown(ie->shutdown))) {
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index b8d9ba46e..f80a4cb9c 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -136,7 +136,7 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 {
 	struct libsoccr_sk *socr = sk->priv;
 	int exit_code = -1;
-	int ret, aux;
+	int ret;
 	struct cr_img *img;
 	TcpStreamEntry tse = TCP_STREAM_ENTRY__INIT;
 	char *buf;
@@ -186,26 +186,6 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk)
 		tse.rcv_wup = data.rcv_wup;
 	}
 
-	/*
-	 * TCP socket options
-	 */
-
-	if (dump_opt(sk->rfd, SOL_TCP, TCP_NODELAY, &aux))
-		goto err;
-
-	if (aux) {
-		tse.has_nodelay = true;
-		tse.nodelay = true;
-	}
-
-	if (dump_opt(sk->rfd, SOL_TCP, TCP_CORK, &aux))
-		goto err;
-
-	if (aux) {
-		tse.has_cork = true;
-		tse.cork = true;
-	}
-
 	/*
 	 * Push the stuff to image
 	 */
@@ -243,6 +223,19 @@ err:
 	return exit_code;
 }
 
+int dump_tcp_opts(int fd, TcpOptsEntry *toe)
+{
+	int ret = 0;
+
+	ret |= dump_opt(fd, SOL_TCP, TCP_NODELAY, &toe->nodelay);
+	ret |= dump_opt(fd, SOL_TCP, TCP_CORK, &toe->cork);
+
+	toe->has_nodelay = !!toe->nodelay;
+	toe->has_cork = !!toe->cork;
+
+	return ret;
+}
+
 int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)
 {
 	soe->has_tcp_keepcnt = true;
@@ -396,6 +389,11 @@ static int restore_tcp_conn_state(int sk, struct libsoccr_sk *socr, struct inet_
 	if (libsoccr_restore(socr, &data, sizeof(data)))
 		goto err_c;
 
+	/*
+	 * Restoring TCP socket options in TcpStreamEntry is
+	 * for backward compatibility only, newer versions
+	 * of CRIU use TcpOptsEntry.
+	 */
 	if (tse->has_nodelay && tse->nodelay) {
 		aux = 1;
 		if (restore_opt(sk, SOL_TCP, TCP_NODELAY, &aux))
@@ -448,6 +446,21 @@ int prepare_tcp_socks(struct task_restore_args *ta)
 	return 0;
 }
 
+int restore_tcp_opts(int sk, TcpOptsEntry *toe)
+{
+	int ret = 0;
+
+	if(!toe)
+		return ret;
+
+	if (toe->has_nodelay)
+		ret |= restore_opt(sk, SOL_TCP, TCP_NODELAY, &toe->nodelay);
+	if (toe->has_cork)
+		ret |= restore_opt(sk, SOL_TCP, TCP_CORK, &toe->cork);
+
+	return ret;
+}
+
 int restore_one_tcp(int fd, struct inet_sk_info *ii)
 {
 	struct libsoccr_sk *sk;
diff --git a/images/sk-inet.proto b/images/sk-inet.proto
index 03a679e7f..2c709e018 100644
--- a/images/sk-inet.proto
+++ b/images/sk-inet.proto
@@ -5,6 +5,7 @@ syntax = "proto2";
 import "opts.proto";
 import "fown.proto";
 import "sk-opts.proto";
+import "tcp-stream.proto";
 
 message ip_opts_raw_entry {
 	optional bool			hdrincl		= 1;
@@ -56,4 +57,5 @@ message inet_sk_entry {
 	optional string			ifname		= 17;
 	optional uint32			ns_id		= 18;
 	optional sk_shutdown		shutdown	= 19;
+	optional tcp_opts_entry		tcp_opts	= 20;
 }
diff --git a/images/tcp-stream.proto b/images/tcp-stream.proto
index c2244ba3b..4f85282e2 100644
--- a/images/tcp-stream.proto
+++ b/images/tcp-stream.proto
@@ -4,6 +4,11 @@ syntax = "proto2";
 
 import "opts.proto";
 
+message tcp_opts_entry {
+	optional bool		cork		= 1;
+	optional bool		nodelay		= 2;
+}
+
 message tcp_stream_entry {
 	required uint32		inq_len		= 1;
 	required uint32		inq_seq		= 2;
@@ -16,6 +21,7 @@ message tcp_stream_entry {
 	optional uint32		rcv_wscale	= 8;
 	optional uint32		timestamp	= 9;
 
+	/* These two are deprecated, use tcp_opts_entry instead */
 	optional bool		cork		= 10;
 	optional bool		nodelay		= 11;
 

From 9ba9aff77f07777a7525da4206b63a72649d3268 Mon Sep 17 00:00:00 2001
From: Juntong Deng <juntong.deng@outlook.com>
Date: Sun, 19 May 2024 12:55:02 +0100
Subject: [PATCH 1502/1854] sk-tcp: Move TCP socket options from SkOptsEntry to
 TcpOptsEntry

Currently some TCP socket option information is stored in SkOptsEntry,
which is a little confusing.

SkOptsEntry should only contain socket options that are common to
all sockets.

In this commit move the TCP-specific socket options from SkOptsEntry
to TcpOptsEntry.

Signed-off-by: Juntong Deng <juntong.deng@outlook.com>
---
 criu/sk-tcp.c           | 30 ++++++++++++------------------
 criu/sockets.c          |  6 ++++++
 images/sk-opts.proto    |  3 +++
 images/tcp-stream.proto |  3 +++
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index f80a4cb9c..9c8bad1c3 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -229,33 +229,21 @@ int dump_tcp_opts(int fd, TcpOptsEntry *toe)
 
 	ret |= dump_opt(fd, SOL_TCP, TCP_NODELAY, &toe->nodelay);
 	ret |= dump_opt(fd, SOL_TCP, TCP_CORK, &toe->cork);
+	ret |= dump_opt(fd, SOL_TCP, TCP_KEEPCNT, &toe->keepcnt);
+	ret |= dump_opt(fd, SOL_TCP, TCP_KEEPIDLE, &toe->keepidle);
+	ret |= dump_opt(fd, SOL_TCP, TCP_KEEPINTVL, &toe->keepintvl);
 
 	toe->has_nodelay = !!toe->nodelay;
 	toe->has_cork = !!toe->cork;
+	toe->has_keepcnt = !!toe->keepcnt;
+	toe->has_keepidle = !!toe->keepidle;
+	toe->has_keepintvl = !!toe->keepintvl;
 
 	return ret;
 }
 
 int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)
 {
-	soe->has_tcp_keepcnt = true;
-	if (dump_opt(fd, SOL_TCP, TCP_KEEPCNT, &soe->tcp_keepcnt)) {
-		pr_perror("Can't read TCP_KEEPCNT");
-		return -1;
-	}
-
-	soe->has_tcp_keepidle = true;
-	if (dump_opt(fd, SOL_TCP, TCP_KEEPIDLE, &soe->tcp_keepidle)) {
-		pr_perror("Can't read TCP_KEEPIDLE");
-		return -1;
-	}
-
-	soe->has_tcp_keepintvl = true;
-	if (dump_opt(fd, SOL_TCP, TCP_KEEPINTVL, &soe->tcp_keepintvl)) {
-		pr_perror("Can't read TCP_KEEPINTVL");
-		return -1;
-	}
-
 	if (sk->dst_port == 0)
 		return 0;
 
@@ -457,6 +445,12 @@ int restore_tcp_opts(int sk, TcpOptsEntry *toe)
 		ret |= restore_opt(sk, SOL_TCP, TCP_NODELAY, &toe->nodelay);
 	if (toe->has_cork)
 		ret |= restore_opt(sk, SOL_TCP, TCP_CORK, &toe->cork);
+	if (toe->has_keepcnt)
+		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPCNT, &toe->keepcnt);
+	if (toe->has_keepidle)
+		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPIDLE, &toe->keepidle);
+	if (toe->has_keepintvl)
+		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPINTVL, &toe->keepintvl);
 
 	return ret;
 }
diff --git a/criu/sockets.c b/criu/sockets.c
index 560c76517..f9ce999be 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -585,6 +585,12 @@ int restore_socket_opts(int sk, SkOptsEntry *soe)
 		pr_debug("\tset keepalive for socket\n");
 		ret |= restore_opt(sk, SOL_SOCKET, SO_KEEPALIVE, &val);
 	}
+
+	/*
+	 * Restoring TCP socket options in SkOptsEntry is
+	 * for backward compatibility only, newer versions
+	 * of CRIU use TcpOptsEntry.
+	 */
 	if (soe->has_tcp_keepcnt) {
 		pr_debug("\tset keepcnt for socket\n");
 		ret |= restore_opt(sk, SOL_TCP, TCP_KEEPCNT, &soe->tcp_keepcnt);
diff --git a/images/sk-opts.proto b/images/sk-opts.proto
index 1d24d47cc..2f9d4e5c3 100644
--- a/images/sk-opts.proto
+++ b/images/sk-opts.proto
@@ -26,9 +26,12 @@ message sk_opts_entry {
 	optional bool		so_reuseport	= 17;
 	optional bool		so_broadcast	= 18;
 	optional bool		so_keepalive	= 19;
+
+	/* These three are deprecated, use tcp_opts_entry instead */
 	optional uint32		tcp_keepcnt	= 20;
 	optional uint32		tcp_keepidle	= 21;
 	optional uint32		tcp_keepintvl	= 22;
+
 	optional uint32		so_oobinline	= 23;
 	optional uint32		so_linger	= 24;
 
diff --git a/images/tcp-stream.proto b/images/tcp-stream.proto
index 4f85282e2..3d834159f 100644
--- a/images/tcp-stream.proto
+++ b/images/tcp-stream.proto
@@ -7,6 +7,9 @@ import "opts.proto";
 message tcp_opts_entry {
 	optional bool		cork		= 1;
 	optional bool		nodelay		= 2;
+	optional uint32		keepcnt		= 3;
+	optional uint32		keepidle	= 4;
+	optional uint32		keepintvl	= 5;
 }
 
 message tcp_stream_entry {

From 708f872a6d8f9ec2ac5a94596983ce273482dc01 Mon Sep 17 00:00:00 2001
From: Juntong Deng <juntong.deng@outlook.com>
Date: Sun, 19 May 2024 12:57:17 +0100
Subject: [PATCH 1503/1854] sk-tcp: Add test cases for TCP_CORK and TCP_NODELAY
 socket options

Currently there are no socket option test cases for TCP_CORK and
TCP_NODELAY, this commit adds related test cases.

The socket option test cases for TCP_KEEPCNT, TCP_KEEPIDLE, and
TCP_KEEPINTVL already exist in socket-tcp_keepalive.c, so they are
not included in this test case.

Signed-off-by: Juntong Deng <juntong.deng@outlook.com>
---
 test/zdtm/static/Makefile             |  3 +
 test/zdtm/static/sock_tcp_opts00.c    | 96 +++++++++++++++++++++++++++
 test/zdtm/static/sock_tcp_opts00.desc |  1 +
 test/zdtm/static/sock_tcp_opts01.c    |  1 +
 test/zdtm/static/sock_tcp_opts01.desc |  1 +
 5 files changed, 102 insertions(+)
 create mode 100644 test/zdtm/static/sock_tcp_opts00.c
 create mode 100644 test/zdtm/static/sock_tcp_opts00.desc
 create mode 120000 test/zdtm/static/sock_tcp_opts01.c
 create mode 120000 test/zdtm/static/sock_tcp_opts01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 548cefac2..1e891f0ba 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -127,6 +127,8 @@ TST_NOFILE	:=				\
 		sock_opts02			\
 		sock_ip_opts00			\
 		sock_ip_opts01			\
+		sock_tcp_opts00			\
+		sock_tcp_opts01			\
 		sk-unix-unconn			\
 		sk-unix-unconn-seqpacket	\
 		ipc_namespace			\
@@ -609,6 +611,7 @@ socket-tcp6-closed:	CFLAGS += -D ZDTM_IPV4V6
 socket-tcp-closed-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK
 socket-tcp-skip-in-flight:	CFLAGS += -D ZDTM_IPV4V6
 sock_ip_opts01:		CFLAGS += -DZDTM_VAL_ZERO
+sock_tcp_opts01:	CFLAGS += -DZDTM_VAL_ZERO
 tun_ns:			CFLAGS += -DTUN_NS
 mnt_ext_manual:		CFLAGS += -D ZDTM_EXTMAP_MANUAL
 mntns_pivot_root_ro:	CFLAGS += -DMNTNS_PIVOT_ROOT_RO
diff --git a/test/zdtm/static/sock_tcp_opts00.c b/test/zdtm/static/sock_tcp_opts00.c
new file mode 100644
index 000000000..8061bc9ea
--- /dev/null
+++ b/test/zdtm/static/sock_tcp_opts00.c
@@ -0,0 +1,96 @@
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that different tcp socket options are restored";
+const char *test_author = "Juntong Deng <juntong.deng@outlook.com>";
+
+#ifdef ZDTM_VAL_ZERO
+#define TCP_OPT_VAL 0
+#else
+#define TCP_OPT_VAL 1
+#endif
+
+#ifndef SOL_TCP
+#define SOL_TCP 6
+#endif
+
+struct sk_opt {
+	int level;
+	int opt;
+	int val;
+};
+
+struct sk_opt tcp_sk_opts[] = {
+	{ SOL_TCP, TCP_CORK, TCP_OPT_VAL },
+	{ SOL_TCP, TCP_NODELAY, TCP_OPT_VAL },
+};
+
+struct sk_conf {
+	int domain;
+	int type;
+	int protocol;
+	int sk;
+} sk_confs[] = {
+	{ AF_INET, SOCK_STREAM, IPPROTO_TCP },
+	{ AF_INET6, SOCK_STREAM, IPPROTO_TCP },
+};
+
+int main(int argc, char **argv)
+{
+	struct sk_opt *opts = tcp_sk_opts;
+	int n_opts = ARRAY_SIZE(tcp_sk_opts);
+	int exit_code = 1;
+	int i, j, val;
+	socklen_t len;
+
+	test_init(argc, argv);
+
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++) {
+		sk_confs[i].sk = socket(sk_confs[i].domain, sk_confs[i].type, sk_confs[i].protocol);
+		if (sk_confs[i].sk == -1) {
+			pr_perror("socket(%d,%d,%d) failed", sk_confs[i].domain, sk_confs[i].type,
+				  sk_confs[i].protocol);
+			goto close;
+		}
+	}
+
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++) {
+		for (j = 0; j < n_opts; j++) {
+			val = opts[j].val;
+			if (setsockopt(sk_confs[i].sk, opts[j].level, opts[j].opt, &val, sizeof(int)) == -1) {
+				pr_perror("setsockopt(%d, %d) failed", opts[j].level, opts[j].opt);
+				goto close;
+			}
+		}
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++) {
+		for (j = 0; j < n_opts; j++) {
+			len = sizeof(int);
+			if (getsockopt(sk_confs[i].sk, opts[j].level, opts[j].opt, &val, &len) == -1) {
+				pr_perror("getsockopt(%d, %d) failed", opts[j].level, opts[j].opt);
+				goto close;
+			}
+
+			if (val != opts[j].val) {
+				fail("Unexpected value socket(%d,%d,%d) opts(%d,%d)", sk_confs[i].domain,
+				     sk_confs[i].type, sk_confs[i].protocol, opts[j].level, opts[j].opt);
+				goto close;
+			}
+		}
+	}
+
+	pass();
+	exit_code = 0;
+close:
+	for (i = 0; i < ARRAY_SIZE(sk_confs); i++)
+		close(sk_confs[i].sk);
+	return exit_code;
+}
diff --git a/test/zdtm/static/sock_tcp_opts00.desc b/test/zdtm/static/sock_tcp_opts00.desc
new file mode 100644
index 000000000..2eac7e654
--- /dev/null
+++ b/test/zdtm/static/sock_tcp_opts00.desc
@@ -0,0 +1 @@
+{'flags': 'suid'}
diff --git a/test/zdtm/static/sock_tcp_opts01.c b/test/zdtm/static/sock_tcp_opts01.c
new file mode 120000
index 000000000..5219c2e98
--- /dev/null
+++ b/test/zdtm/static/sock_tcp_opts01.c
@@ -0,0 +1 @@
+./sock_tcp_opts00.c
\ No newline at end of file
diff --git a/test/zdtm/static/sock_tcp_opts01.desc b/test/zdtm/static/sock_tcp_opts01.desc
new file mode 120000
index 000000000..fb1dfdcd1
--- /dev/null
+++ b/test/zdtm/static/sock_tcp_opts01.desc
@@ -0,0 +1 @@
+./sock_tcp_opts00.desc
\ No newline at end of file

From 30aa8dbe4d49624aeea9f906fccae002aab158f2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 23 May 2024 17:17:03 +0100
Subject: [PATCH 1504/1854] mount: fix unbounded write

Replace sprintf() with snprintf() and specify maximum length of
characters to avoid potential overflow.

Reported-by: GitHub CodeQL (https://codeql.github.com/)
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index afbd24281..82bbd52d6 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -98,7 +98,7 @@ static char *ext_mount_lookup(char *key)
 	int len = strlen(key);
 	char mkey[len + 6];
 
-	sprintf(mkey, "mnt[%s]", key);
+	snprintf(mkey, sizeof(mkey), "mnt[%s]", key);
 	v = external_lookup_by_key(mkey);
 	if (IS_ERR(v))
 		v = NULL;

From b3c3422cd99840b95f4c488472d6fc8ad3c96bf6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 May 2024 19:13:01 +0100
Subject: [PATCH 1505/1854] test/make: remove unused target

A fault-injection test was introduced in commit [1] and later removed in
commit [2]. This patch removes the obsolete Makefile target.

[1] b95407e264fcf58f4f73f78abef6dac60436e7dd
    test: check, that parasite can rollback itself (v2)

[2] 2cb4532e266d0c9f8e87839d5b5eb728a3e4d10d
    tests: remove zdtm.sh (v2)

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 5784b6a49..0bfdab680 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -45,10 +45,6 @@ zdtm-freezer:
 	./zdtm.py run --test zdtm/transition/thread-bomb --pre 3 --freezecg zdtm:f
 .PHONY: zdtm-freezer
 
-fault-injection:
-	$(MAKE) -C fault-injection
-.PHONY: fault-injection
-
 override CFLAGS += -D_GNU_SOURCE
 
 clean_root:

From 9c8a6927aa2bc96e0a33149d84a9244cd348f32a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 21 May 2024 09:25:30 +0100
Subject: [PATCH 1506/1854] ci: update check for SELinux

The rawhide tests runs in a container. Containers always have SELinux
disabled from the inside. Somehow /sys/fs/selinux is now mounted. We
used the existence of that directory if SELinux is available. This seems
to be no longer true.

Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index c50dc4174..8ee734fbc 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -306,14 +306,19 @@ if [ "$skip" == 0 ]; then
 	if [ -d /sys/fs/selinux ] && command -v getenforce &>/dev/null; then
 		# Note: selinux in Enforcing mode prevents us from calling clone3() or writing to ns_last_pid on restore; hence set to Permissive for the test and then set back.
 		selinuxmode=$(getenforce)
-		setenforce Permissive
+		if [ "$selinuxmode" != "Disabled" ]; then
+			setenforce Permissive
+		fi
+
 	fi
 	# Run it as non-root in a user namespace. Since CAP_CHECKPOINT_RESTORE behaves differently in non-user namespaces (e.g. no access to map_files) this tests that we can dump and restore
 	# under those conditions. Note that the "... && true" part is necessary; we need at least one statement after the tests so that bash can reap zombies in the user namespace,
 	# otherwise it will exec the last statement and get replaced and nobody will be left to reap our zombies.
 	sudo --user=#65534 --group=#65534 unshare -Ucfpm --mount-proc -- bash -c "./test/zdtm.py run -t zdtm/static/maps00 -f h --rootless && true"
 	if [ -d /sys/fs/selinux ] && command -v getenforce &>/dev/null; then
-		setenforce "$selinuxmode"
+		if [ "$selinuxmode" != "Disabled" ]; then
+			setenforce "$selinuxmode"
+		fi
 	fi
 	setcap -r criu/criu
 else

From 95f66d13db7119625da9ccb4eee9db5fa6aaf3e4 Mon Sep 17 00:00:00 2001
From: Arnav Bhatt <arnav@ghativega.in>
Date: Sun, 10 Mar 2024 13:13:12 +0530
Subject: [PATCH 1507/1854] criu: move sigact dump/restore code into sigact.c

Seperate sigact dump/restore code from cr-restore.c and parasite-syscall.c into sigact.c

Signed-off-by: Arnav Bhatt <arnav@ghativega.in>
---
 criu/Makefile.crtools           |   1 +
 criu/cr-dump.c                  |   1 +
 criu/cr-restore.c               | 263 +-------------------------
 criu/include/parasite-syscall.h |   2 -
 criu/include/sigact.h           |  14 ++
 criu/parasite-syscall.c         |  51 -----
 criu/sigact.c                   | 319 ++++++++++++++++++++++++++++++++
 7 files changed, 336 insertions(+), 315 deletions(-)
 create mode 100644 criu/include/sigact.h
 create mode 100644 criu/sigact.c

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index bf17f1ec9..3ddf45cd7 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -93,6 +93,7 @@ obj-y			+= pie-util-vdso.o
 obj-y			+= vdso.o
 obj-y			+= timens.o
 obj-y			+= timer.o
+obj-y			+= sigact.o
 obj-$(CONFIG_HAS_LIBBPF)	+= bpfmap.o
 obj-$(CONFIG_COMPAT)	+= pie-util-vdso-elf32.o
 CFLAGS_pie-util-vdso-elf32.o	+= -DCONFIG_VDSO_32
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index a29ec82ef..199ff2e32 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -87,6 +87,7 @@
 #include "apparmor.h"
 #include "asm/dump.h"
 #include "timer.h"
+#include "sigact.h"
 
 /*
  * Architectures can overwrite this function to restore register sets that
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index c19a20b46..deecb1294 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -99,6 +99,7 @@
 
 #include "cr-errno.h"
 #include "timer.h"
+#include "sigact.h"
 
 #ifndef arch_export_restore_thread
 #define arch_export_restore_thread __export_restore_thread
@@ -407,268 +408,6 @@ static int populate_pid_proc(void)
 	return 0;
 }
 
-static rt_sigaction_t sigchld_act;
-/*
- * If parent's sigaction has blocked SIGKILL (which is non-sense),
- * this parent action is non-valid and shouldn't be inherited.
- * Used to mark parent_act* no more valid.
- */
-static rt_sigaction_t parent_act[SIGMAX];
-#ifdef CONFIG_COMPAT
-static rt_sigaction_t_compat parent_act_compat[SIGMAX];
-#endif
-
-static bool sa_inherited(int sig, rt_sigaction_t *sa)
-{
-	rt_sigaction_t *pa;
-	int i;
-
-	if (current == root_item)
-		return false; /* XXX -- inherit from CRIU? */
-
-	pa = &parent_act[sig];
-
-	/* Omitting non-valid sigaction */
-	if (pa->rt_sa_mask.sig[0] & (1 << SIGKILL))
-		return false;
-
-	for (i = 0; i < _KNSIG_WORDS; i++)
-		if (pa->rt_sa_mask.sig[i] != sa->rt_sa_mask.sig[i])
-			return false;
-
-	return pa->rt_sa_handler == sa->rt_sa_handler && pa->rt_sa_flags == sa->rt_sa_flags &&
-	       pa->rt_sa_restorer == sa->rt_sa_restorer;
-}
-
-static int restore_native_sigaction(int sig, SaEntry *e)
-{
-	rt_sigaction_t act;
-	int ret;
-
-	ASSIGN_TYPED(act.rt_sa_handler, decode_pointer(e->sigaction));
-	ASSIGN_TYPED(act.rt_sa_flags, e->flags);
-	ASSIGN_TYPED(act.rt_sa_restorer, decode_pointer(e->restorer));
-#ifdef CONFIG_MIPS
-	e->has_mask_extended = 1;
-	BUILD_BUG_ON(sizeof(e->mask) * 2 != sizeof(act.rt_sa_mask.sig));
-
-	memcpy(&(act.rt_sa_mask.sig[0]), &e->mask, sizeof(act.rt_sa_mask.sig[0]));
-	memcpy(&(act.rt_sa_mask.sig[1]), &e->mask_extended, sizeof(act.rt_sa_mask.sig[1]));
-#else
-	BUILD_BUG_ON(sizeof(e->mask) != sizeof(act.rt_sa_mask.sig));
-	memcpy(act.rt_sa_mask.sig, &e->mask, sizeof(act.rt_sa_mask.sig));
-#endif
-	if (sig == SIGCHLD) {
-		sigchld_act = act;
-		return 0;
-	}
-
-	if (sa_inherited(sig - 1, &act))
-		return 1;
-
-	/*
-	 * A pure syscall is used, because glibc
-	 * sigaction overwrites se_restorer.
-	 */
-	ret = syscall(SYS_rt_sigaction, sig, &act, NULL, sizeof(k_rtsigset_t));
-	if (ret < 0) {
-		pr_perror("Can't restore sigaction");
-		return ret;
-	}
-
-	parent_act[sig - 1] = act;
-	/* Mark SIGKILL blocked which makes compat sigaction non-valid */
-#ifdef CONFIG_COMPAT
-	parent_act_compat[sig - 1].rt_sa_mask.sig[0] |= 1 << SIGKILL;
-#endif
-
-	return 1;
-}
-
-static void *stack32;
-
-#ifdef CONFIG_COMPAT
-static bool sa_compat_inherited(int sig, rt_sigaction_t_compat *sa)
-{
-	rt_sigaction_t_compat *pa;
-	int i;
-
-	if (current == root_item)
-		return false;
-
-	pa = &parent_act_compat[sig];
-
-	/* Omitting non-valid sigaction */
-	if (pa->rt_sa_mask.sig[0] & (1 << SIGKILL))
-		return false;
-
-	for (i = 0; i < _KNSIG_WORDS; i++)
-		if (pa->rt_sa_mask.sig[i] != sa->rt_sa_mask.sig[i])
-			return false;
-
-	return pa->rt_sa_handler == sa->rt_sa_handler && pa->rt_sa_flags == sa->rt_sa_flags &&
-	       pa->rt_sa_restorer == sa->rt_sa_restorer;
-}
-
-static int restore_compat_sigaction(int sig, SaEntry *e)
-{
-	rt_sigaction_t_compat act;
-	int ret;
-
-	ASSIGN_TYPED(act.rt_sa_handler, (u32)e->sigaction);
-	ASSIGN_TYPED(act.rt_sa_flags, e->flags);
-	ASSIGN_TYPED(act.rt_sa_restorer, (u32)e->restorer);
-	BUILD_BUG_ON(sizeof(e->mask) != sizeof(act.rt_sa_mask.sig));
-	memcpy(act.rt_sa_mask.sig, &e->mask, sizeof(act.rt_sa_mask.sig));
-
-	if (sig == SIGCHLD) {
-		memcpy(&sigchld_act, &act, sizeof(rt_sigaction_t_compat));
-		return 0;
-	}
-
-	if (sa_compat_inherited(sig - 1, &act))
-		return 1;
-
-	if (!stack32) {
-		stack32 = alloc_compat_syscall_stack();
-		if (!stack32)
-			return -1;
-	}
-
-	ret = arch_compat_rt_sigaction(stack32, sig, &act);
-	if (ret < 0) {
-		pr_err("Can't restore compat sigaction: %d\n", ret);
-		return ret;
-	}
-
-	parent_act_compat[sig - 1] = act;
-	/* Mark SIGKILL blocked which makes native sigaction non-valid */
-	parent_act[sig - 1].rt_sa_mask.sig[0] |= 1 << SIGKILL;
-
-	return 1;
-}
-#else
-static int restore_compat_sigaction(int sig, SaEntry *e)
-{
-	return -1;
-}
-#endif
-
-static int prepare_sigactions_from_core(TaskCoreEntry *tc)
-{
-	int sig, i;
-
-	if (tc->n_sigactions != SIGMAX - 2) {
-		pr_err("Bad number of sigactions in the image (%d, want %d)\n", (int)tc->n_sigactions, SIGMAX - 2);
-		return -1;
-	}
-
-	pr_info("Restore on-core sigactions for %d\n", vpid(current));
-
-	for (sig = 1, i = 0; sig <= SIGMAX; sig++) {
-		int ret;
-		SaEntry *e;
-		bool sigaction_is_compat;
-
-		if (sig == SIGKILL || sig == SIGSTOP)
-			continue;
-
-		e = tc->sigactions[i++];
-		sigaction_is_compat = e->has_compat_sigaction && e->compat_sigaction;
-		if (sigaction_is_compat)
-			ret = restore_compat_sigaction(sig, e);
-		else
-			ret = restore_native_sigaction(sig, e);
-
-		if (ret < 0)
-			return ret;
-	}
-
-	return 0;
-}
-
-/* Returns number of restored signals, -1 or negative errno on fail */
-static int restore_one_sigaction(int sig, struct cr_img *img, int pid)
-{
-	bool sigaction_is_compat;
-	SaEntry *e;
-	int ret = 0;
-
-	BUG_ON(sig == SIGKILL || sig == SIGSTOP);
-
-	ret = pb_read_one_eof(img, &e, PB_SIGACT);
-	if (ret == 0) {
-		if (sig != SIGMAX_OLD + 1) { /* backward compatibility */
-			pr_err("Unexpected EOF %d\n", sig);
-			return -1;
-		}
-		pr_warn("This format of sigacts-%d.img is deprecated\n", pid);
-		return -1;
-	}
-	if (ret < 0)
-		return ret;
-
-	sigaction_is_compat = e->has_compat_sigaction && e->compat_sigaction;
-	if (sigaction_is_compat)
-		ret = restore_compat_sigaction(sig, e);
-	else
-		ret = restore_native_sigaction(sig, e);
-
-	sa_entry__free_unpacked(e, NULL);
-
-	return ret;
-}
-
-static int prepare_sigactions_from_image(void)
-{
-	int pid = vpid(current);
-	struct cr_img *img;
-	int sig, rst = 0;
-	int ret = 0;
-
-	pr_info("Restore sigacts for %d\n", pid);
-
-	img = open_image(CR_FD_SIGACT, O_RSTR, pid);
-	if (!img)
-		return -1;
-
-	for (sig = 1; sig <= SIGMAX; sig++) {
-		if (sig == SIGKILL || sig == SIGSTOP)
-			continue;
-
-		ret = restore_one_sigaction(sig, img, pid);
-		if (ret < 0)
-			break;
-		if (ret)
-			rst++;
-	}
-
-	pr_info("Restored %d/%d sigacts\n", rst, SIGMAX - 3 /* KILL, STOP and CHLD */);
-
-	close_image(img);
-	return ret;
-}
-
-static int prepare_sigactions(CoreEntry *core)
-{
-	int ret;
-
-	if (!task_alive(current))
-		return 0;
-
-	if (core->tc->n_sigactions != 0)
-		ret = prepare_sigactions_from_core(core->tc);
-	else
-		ret = prepare_sigactions_from_image();
-
-	if (stack32) {
-		free_compat_syscall_stack(stack32);
-		stack32 = NULL;
-	}
-
-	return ret;
-}
-
 static int __collect_child_pids(struct pstree_item *p, int state, unsigned int *n)
 {
 	struct pstree_item *pi;
diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h
index 70ecbb720..4a8ec2fee 100644
--- a/criu/include/parasite-syscall.h
+++ b/criu/include/parasite-syscall.h
@@ -21,8 +21,6 @@ struct rt_sigframe;
 struct parasite_ctl;
 struct parasite_thread_ctl;
 
-extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *);
-
 extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc);
 extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce);
 extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core);
diff --git a/criu/include/sigact.h b/criu/include/sigact.h
new file mode 100644
index 000000000..4df011f96
--- /dev/null
+++ b/criu/include/sigact.h
@@ -0,0 +1,14 @@
+#ifndef __CR_SIGACT_H__
+#define __CR_SIGACT_H__
+
+#include "images/core.pb-c.h"
+
+extern rt_sigaction_t sigchld_act;
+
+struct parasite_ctl;
+struct pstree_item;
+
+extern int prepare_sigactions(CoreEntry *core);
+extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *);
+
+#endif
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 6d2aa9c88..a88f8a66f 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -9,7 +9,6 @@
 #include "common/compiler.h"
 #include "types.h"
 #include "protobuf.h"
-#include "images/sa.pb-c.h"
 #include "images/timer.pb-c.h"
 #include "images/creds.pb-c.h"
 #include "images/core.pb-c.h"
@@ -228,56 +227,6 @@ int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, struct parasit
 	return dump_thread_core(pid, core, args);
 }
 
-int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *item)
-{
-	TaskCoreEntry *tc = item->core[0]->tc;
-	struct parasite_dump_sa_args *args;
-	int ret, sig;
-	SaEntry *sa, **psa;
-
-	args = compel_parasite_args(ctl, struct parasite_dump_sa_args);
-
-	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_SIGACTS, ctl);
-	if (ret < 0)
-		return ret;
-
-	psa = xmalloc((SIGMAX - 2) * (sizeof(SaEntry *) + sizeof(SaEntry)));
-	if (!psa)
-		return -1;
-
-	sa = (SaEntry *)(psa + SIGMAX - 2);
-
-	tc->n_sigactions = SIGMAX - 2;
-	tc->sigactions = psa;
-
-	for (sig = 1; sig <= SIGMAX; sig++) {
-		int i = sig - 1;
-
-		if (sig == SIGSTOP || sig == SIGKILL)
-			continue;
-
-		sa_entry__init(sa);
-		ASSIGN_TYPED(sa->sigaction, encode_pointer(args->sas[i].rt_sa_handler));
-		ASSIGN_TYPED(sa->flags, args->sas[i].rt_sa_flags);
-		ASSIGN_TYPED(sa->restorer, encode_pointer(args->sas[i].rt_sa_restorer));
-#ifdef CONFIG_MIPS
-		sa->has_mask_extended = 1;
-		BUILD_BUG_ON(sizeof(sa->mask) * 2 != sizeof(args->sas[0].rt_sa_mask.sig));
-		memcpy(&sa->mask, &(args->sas[i].rt_sa_mask.sig[0]), sizeof(sa->mask));
-		memcpy(&sa->mask_extended, &(args->sas[i].rt_sa_mask.sig[1]), sizeof(sa->mask));
-#else
-		BUILD_BUG_ON(sizeof(sa->mask) != sizeof(args->sas[0].rt_sa_mask.sig));
-		memcpy(&sa->mask, args->sas[i].rt_sa_mask.sig, sizeof(sa->mask));
-#endif
-		sa->has_compat_sigaction = true;
-		sa->compat_sigaction = !compel_mode_native(ctl);
-
-		*(psa++) = sa++;
-	}
-
-	return 0;
-}
-
 int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc)
 {
 	struct parasite_dump_misc *ma;
diff --git a/criu/sigact.c b/criu/sigact.c
new file mode 100644
index 000000000..5174644d2
--- /dev/null
+++ b/criu/sigact.c
@@ -0,0 +1,319 @@
+#include "types.h"
+#include "infect.h"
+#include "protobuf.h"
+#include "pstree.h"
+#include "parasite.h"
+#include "restorer.h"
+#include "sigact.h"
+
+/*
+ * If parent's sigaction has blocked SIGKILL (which is non-sense),
+ * this parent action is non-valid and shouldn't be inherited.
+ * Used to mark parent_act* no more valid.
+ */
+static rt_sigaction_t parent_act[SIGMAX];
+#ifdef CONFIG_COMPAT
+static rt_sigaction_t_compat parent_act_compat[SIGMAX];
+#endif
+
+static bool sa_inherited(int sig, rt_sigaction_t *sa)
+{
+	rt_sigaction_t *pa;
+	int i;
+
+	if (current == root_item)
+		return false; /* XXX -- inherit from CRIU? */
+
+	pa = &parent_act[sig];
+
+	/* Omitting non-valid sigaction */
+	if (pa->rt_sa_mask.sig[0] & (1 << SIGKILL))
+		return false;
+
+	for (i = 0; i < _KNSIG_WORDS; i++)
+		if (pa->rt_sa_mask.sig[i] != sa->rt_sa_mask.sig[i])
+			return false;
+
+	return pa->rt_sa_handler == sa->rt_sa_handler && pa->rt_sa_flags == sa->rt_sa_flags &&
+	       pa->rt_sa_restorer == sa->rt_sa_restorer;
+}
+
+static void *stack32;
+rt_sigaction_t sigchld_act;
+
+#ifdef CONFIG_COMPAT
+static bool sa_compat_inherited(int sig, rt_sigaction_t_compat *sa)
+{
+	rt_sigaction_t_compat *pa;
+	int i;
+
+	if (current == root_item)
+		return false;
+
+	pa = &parent_act_compat[sig];
+
+	/* Omitting non-valid sigaction */
+	if (pa->rt_sa_mask.sig[0] & (1 << SIGKILL))
+		return false;
+
+	for (i = 0; i < _KNSIG_WORDS; i++)
+		if (pa->rt_sa_mask.sig[i] != sa->rt_sa_mask.sig[i])
+			return false;
+
+	return pa->rt_sa_handler == sa->rt_sa_handler && pa->rt_sa_flags == sa->rt_sa_flags &&
+	       pa->rt_sa_restorer == sa->rt_sa_restorer;
+}
+
+static int restore_compat_sigaction(int sig, SaEntry *e)
+{
+	rt_sigaction_t_compat act;
+	int ret;
+
+	ASSIGN_TYPED(act.rt_sa_handler, (u32)e->sigaction);
+	ASSIGN_TYPED(act.rt_sa_flags, e->flags);
+	ASSIGN_TYPED(act.rt_sa_restorer, (u32)e->restorer);
+	BUILD_BUG_ON(sizeof(e->mask) != sizeof(act.rt_sa_mask.sig));
+	memcpy(act.rt_sa_mask.sig, &e->mask, sizeof(act.rt_sa_mask.sig));
+
+	if (sig == SIGCHLD) {
+		memcpy(&sigchld_act, &act, sizeof(rt_sigaction_t_compat));
+		return 0;
+	}
+
+	if (sa_compat_inherited(sig - 1, &act))
+		return 1;
+
+	if (!stack32) {
+		stack32 = alloc_compat_syscall_stack();
+		if (!stack32)
+			return -1;
+	}
+
+	ret = arch_compat_rt_sigaction(stack32, sig, &act);
+	if (ret < 0) {
+		pr_err("Can't restore compat sigaction: %d\n", ret);
+		return ret;
+	}
+
+	parent_act_compat[sig - 1] = act;
+	/* Mark SIGKILL blocked which makes native sigaction non-valid */
+	parent_act[sig - 1].rt_sa_mask.sig[0] |= 1 << SIGKILL;
+
+	return 1;
+}
+#else
+static int restore_compat_sigaction(int sig, SaEntry *e)
+{
+	return -1;
+}
+#endif
+
+static int restore_native_sigaction(int sig, SaEntry *e)
+{
+	rt_sigaction_t act;
+	int ret;
+
+	ASSIGN_TYPED(act.rt_sa_handler, decode_pointer(e->sigaction));
+	ASSIGN_TYPED(act.rt_sa_flags, e->flags);
+	ASSIGN_TYPED(act.rt_sa_restorer, decode_pointer(e->restorer));
+#ifdef CONFIG_MIPS
+	e->has_mask_extended = 1;
+	BUILD_BUG_ON(sizeof(e->mask) * 2 != sizeof(act.rt_sa_mask.sig));
+
+	memcpy(&(act.rt_sa_mask.sig[0]), &e->mask, sizeof(act.rt_sa_mask.sig[0]));
+	memcpy(&(act.rt_sa_mask.sig[1]), &e->mask_extended, sizeof(act.rt_sa_mask.sig[1]));
+#else
+	BUILD_BUG_ON(sizeof(e->mask) != sizeof(act.rt_sa_mask.sig));
+	memcpy(act.rt_sa_mask.sig, &e->mask, sizeof(act.rt_sa_mask.sig));
+#endif
+	if (sig == SIGCHLD) {
+		sigchld_act = act;
+		return 0;
+	}
+
+	if (sa_inherited(sig - 1, &act))
+		return 1;
+
+	/*
+	 * A pure syscall is used, because glibc
+	 * sigaction overwrites se_restorer.
+	 */
+	ret = syscall(SYS_rt_sigaction, sig, &act, NULL, sizeof(k_rtsigset_t));
+	if (ret < 0) {
+		pr_perror("Can't restore sigaction");
+		return ret;
+	}
+
+	parent_act[sig - 1] = act;
+	/* Mark SIGKILL blocked which makes compat sigaction non-valid */
+#ifdef CONFIG_COMPAT
+	parent_act_compat[sig - 1].rt_sa_mask.sig[0] |= 1 << SIGKILL;
+#endif
+
+	return 1;
+}
+
+static int prepare_sigactions_from_core(TaskCoreEntry *tc)
+{
+	int sig, i;
+
+	if (tc->n_sigactions != SIGMAX - 2) {
+		pr_err("Bad number of sigactions in the image (%d, want %d)\n", (int)tc->n_sigactions, SIGMAX - 2);
+		return -1;
+	}
+
+	pr_info("Restore on-core sigactions for %d\n", vpid(current));
+
+	for (sig = 1, i = 0; sig <= SIGMAX; sig++) {
+		int ret;
+		SaEntry *e;
+		bool sigaction_is_compat;
+
+		if (sig == SIGKILL || sig == SIGSTOP)
+			continue;
+
+		e = tc->sigactions[i++];
+		sigaction_is_compat = e->has_compat_sigaction && e->compat_sigaction;
+		if (sigaction_is_compat)
+			ret = restore_compat_sigaction(sig, e);
+		else
+			ret = restore_native_sigaction(sig, e);
+
+		if (ret < 0)
+			return ret;
+	}
+
+	return 0;
+}
+
+/* Returns number of restored signals, -1 or negative errno on fail */
+static int restore_one_sigaction(int sig, struct cr_img *img, int pid)
+{
+	bool sigaction_is_compat;
+	SaEntry *e;
+	int ret = 0;
+
+	BUG_ON(sig == SIGKILL || sig == SIGSTOP);
+
+	ret = pb_read_one_eof(img, &e, PB_SIGACT);
+	if (ret == 0) {
+		if (sig != SIGMAX_OLD + 1) { /* backward compatibility */
+			pr_err("Unexpected EOF %d\n", sig);
+			return -1;
+		}
+		pr_warn("This format of sigacts-%d.img is deprecated\n", pid);
+		return -1;
+	}
+	if (ret < 0)
+		return ret;
+
+	sigaction_is_compat = e->has_compat_sigaction && e->compat_sigaction;
+	if (sigaction_is_compat)
+		ret = restore_compat_sigaction(sig, e);
+	else
+		ret = restore_native_sigaction(sig, e);
+
+	sa_entry__free_unpacked(e, NULL);
+
+	return ret;
+}
+
+static int prepare_sigactions_from_image(void)
+{
+	int pid = vpid(current);
+	struct cr_img *img;
+	int sig, rst = 0;
+	int ret = 0;
+
+	pr_info("Restore sigacts for %d\n", pid);
+
+	img = open_image(CR_FD_SIGACT, O_RSTR, pid);
+	if (!img)
+		return -1;
+
+	for (sig = 1; sig <= SIGMAX; sig++) {
+		if (sig == SIGKILL || sig == SIGSTOP)
+			continue;
+
+		ret = restore_one_sigaction(sig, img, pid);
+		if (ret < 0)
+			break;
+		if (ret)
+			rst++;
+	}
+
+	pr_info("Restored %d/%d sigacts\n", rst, SIGMAX - 3 /* KILL, STOP and CHLD */);
+
+	close_image(img);
+	return ret;
+}
+
+int prepare_sigactions(CoreEntry *core)
+{
+	int ret;
+
+	if (!task_alive(current))
+		return 0;
+
+	if (core->tc->n_sigactions != 0)
+		ret = prepare_sigactions_from_core(core->tc);
+	else
+		ret = prepare_sigactions_from_image();
+
+	if (stack32) {
+		free_compat_syscall_stack(stack32);
+		stack32 = NULL;
+	}
+
+	return ret;
+}
+
+int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct pstree_item *item)
+{
+	TaskCoreEntry *tc = item->core[0]->tc;
+	struct parasite_dump_sa_args *args;
+	int ret, sig;
+	SaEntry *sa, **psa;
+
+	args = compel_parasite_args(ctl, struct parasite_dump_sa_args);
+
+	ret = compel_rpc_call_sync(PARASITE_CMD_DUMP_SIGACTS, ctl);
+	if (ret < 0)
+		return ret;
+
+	psa = xmalloc((SIGMAX - 2) * (sizeof(SaEntry *) + sizeof(SaEntry)));
+	if (!psa)
+		return -1;
+
+	sa = (SaEntry *)(psa + SIGMAX - 2);
+
+	tc->n_sigactions = SIGMAX - 2;
+	tc->sigactions = psa;
+
+	for (sig = 1; sig <= SIGMAX; sig++) {
+		int i = sig - 1;
+
+		if (sig == SIGSTOP || sig == SIGKILL)
+			continue;
+
+		sa_entry__init(sa);
+		ASSIGN_TYPED(sa->sigaction, encode_pointer(args->sas[i].rt_sa_handler));
+		ASSIGN_TYPED(sa->flags, args->sas[i].rt_sa_flags);
+		ASSIGN_TYPED(sa->restorer, encode_pointer(args->sas[i].rt_sa_restorer));
+#ifdef CONFIG_MIPS
+		sa->has_mask_extended = 1;
+		BUILD_BUG_ON(sizeof(sa->mask) * 2 != sizeof(args->sas[0].rt_sa_mask.sig));
+		memcpy(&sa->mask, &(args->sas[i].rt_sa_mask.sig[0]), sizeof(sa->mask));
+		memcpy(&sa->mask_extended, &(args->sas[i].rt_sa_mask.sig[1]), sizeof(sa->mask));
+#else
+		BUILD_BUG_ON(sizeof(sa->mask) != sizeof(args->sas[0].rt_sa_mask.sig));
+		memcpy(&sa->mask, args->sas[i].rt_sa_mask.sig, sizeof(sa->mask));
+#endif
+		sa->has_compat_sigaction = true;
+		sa->compat_sigaction = !compel_mode_native(ctl);
+
+		*(psa++) = sa++;
+	}
+
+	return 0;
+}

From 457bc6a8ff1008284662a8fa5b5bfeb33a10e39a Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 26 May 2024 14:44:14 +0200
Subject: [PATCH 1508/1854] criu: use proper format-specified to accommodate
 time_t 64-bit change

See also:
https://wiki.debian.org/ReleaseGoals/64bit-time

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/autofs.c | 4 ++--
 criu/timens.c | 8 ++++----
 criu/timer.c  | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/criu/autofs.c b/criu/autofs.c
index 6a7d8db0d..a1775cbc9 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -658,7 +658,7 @@ static int autofs_mnt_make_catatonic(const char *mnt_path, int mnt_fd)
 
 static int autofs_mnt_set_timeout(time_t timeout, const char *mnt_path, int mnt_fd)
 {
-	pr_info("%s: set timeout %ld for %s\n", __func__, timeout, mnt_path);
+	pr_info("%s: set timeout %" PRId64 " for %s\n", __func__, (int64_t)timeout, mnt_path);
 	return autofs_ioctl(mnt_path, mnt_fd, AUTOFS_IOC_SETTIMEOUT, &timeout);
 }
 
@@ -770,7 +770,7 @@ static int autofs_post_mount(const char *mnt_path, dev_t mnt_dev, time_t timeout
 	}
 
 	if (autofs_mnt_set_timeout(timeout, mnt_path, mnt_fd)) {
-		pr_err("Failed to set timeout %ld for %s\n", timeout, mnt_path);
+		pr_err("Failed to set timeout %" PRId64 " for %s\n", (int64_t)timeout, mnt_path);
 		return -1;
 	}
 
diff --git a/criu/timens.c b/criu/timens.c
index 66c0c02a4..257782e5a 100644
--- a/criu/timens.c
+++ b/criu/timens.c
@@ -96,8 +96,8 @@ int prepare_timens(int id)
 	ts.tv_nsec = te->monotonic->tv_nsec - ts.tv_nsec;
 	normalize_timespec(&ts);
 
-	pr_debug("timens: monotonic %ld %ld\n", ts.tv_sec, ts.tv_nsec);
-	if (dprintf(fd, "%d %ld %ld\n", CLOCK_MONOTONIC, ts.tv_sec, ts.tv_nsec) < 0) {
+	pr_debug("timens: monotonic %" PRId64 " %ld\n", (int64_t)ts.tv_sec, ts.tv_nsec);
+	if (dprintf(fd, "%d %" PRId64 " %ld\n", CLOCK_MONOTONIC, (int64_t)ts.tv_sec, ts.tv_nsec) < 0) {
 		pr_perror("Unable to set a monotonic clock offset");
 		goto err;
 	}
@@ -111,8 +111,8 @@ int prepare_timens(int id)
 	ts.tv_nsec = te->boottime->tv_nsec - ts.tv_nsec;
 	normalize_timespec(&ts);
 
-	pr_debug("timens: boottime %ld %ld\n", ts.tv_sec, ts.tv_nsec);
-	if (dprintf(fd, "%d %ld %ld\n", CLOCK_BOOTTIME, ts.tv_sec, ts.tv_nsec) < 0) {
+	pr_debug("timens: boottime %" PRId64 " %ld\n", (int64_t)ts.tv_sec, ts.tv_nsec);
+	if (dprintf(fd, "%d %" PRId64 " %ld\n", CLOCK_BOOTTIME, (int64_t)ts.tv_sec, ts.tv_nsec) < 0) {
 		pr_perror("Unable to set a boottime clock offset");
 		goto err;
 	}
diff --git a/criu/timer.c b/criu/timer.c
index bdcb059cc..4b286635d 100644
--- a/criu/timer.c
+++ b/criu/timer.c
@@ -46,8 +46,9 @@ static inline int decode_itimer(char *n, ItimerEntry *ie, struct itimerval *val)
 		return -1;
 	}
 
-	pr_info("Restored %s timer to %ld.%ld -> %ld.%ld\n", n, val->it_value.tv_sec, val->it_value.tv_usec,
-		val->it_interval.tv_sec, val->it_interval.tv_usec);
+	pr_info("Restored %s timer to %" PRId64 ".%ld -> %" PRId64 ".%ld\n", n,
+		(int64_t)val->it_value.tv_sec, val->it_value.tv_usec,
+		(int64_t)val->it_interval.tv_sec, val->it_interval.tv_usec);
 
 	return 0;
 }

From cc88b1e1ffbadc325f0919b49ba27db048164512 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sat, 25 May 2024 05:11:21 +0000
Subject: [PATCH 1509/1854] net: Fix TOCTOU race condition in unix_conf_op

The unix_conf_op function reads the size of the sysctl entry array
twice. gcc thinks that it can lead to a time-of-check to time-of-use
(TOCTOU) race condition if the array size changes between the two reads.

Fixes #2398

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/net.c                          | 15 ++++++++-------
 scripts/build/Dockerfile.x86_64.hdr |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index b5c4a6ee3..eee331108 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -359,22 +359,23 @@ static int ipv6_conf_op(char *tgt, SysctlEntry **conf, int n, int op, SysctlEntr
 	return net_conf_op(tgt, conf, n, op, "ipv6", req, path, ARRAY_SIZE(devconfs6), devconfs6, def_conf);
 }
 
-static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
+static int unix_conf_op(SysctlEntry ***rconf, size_t *pn, int op)
 {
 	int i, ret = -1, flags = 0;
 	char path[ARRAY_SIZE(unix_conf_entries)][MAX_CONF_UNIX_PATH] = {};
 	struct sysctl_req req[ARRAY_SIZE(unix_conf_entries)] = {};
 	SysctlEntry **conf = *rconf;
+	size_t n = *pn;
 
-	if (*n != ARRAY_SIZE(unix_conf_entries)) {
-		pr_err("unix: Unexpected entries in config (%zu %zu)\n", *n, ARRAY_SIZE(unix_conf_entries));
+	if (n != ARRAY_SIZE(unix_conf_entries)) {
+		pr_err("unix: Unexpected entries in config (%zu %zu)\n", n, ARRAY_SIZE(unix_conf_entries));
 		return -EINVAL;
 	}
 
 	if (opts.weak_sysctls || op == CTL_READ)
 		flags = CTL_FLAGS_OPTIONAL;
 
-	for (i = 0; i < *n; i++) {
+	for (i = 0; i < n; i++) {
 		snprintf(path[i], MAX_CONF_UNIX_PATH, CONF_UNIX_FMT, unix_conf_entries[i]);
 		req[i].name = path[i];
 		req[i].flags = flags;
@@ -390,7 +391,7 @@ static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
 		}
 	}
 
-	ret = sysctl_op(req, *n, op, CLONE_NEWNET);
+	ret = sysctl_op(req, n, op, CLONE_NEWNET);
 	if (ret < 0) {
 		pr_err("unix: Failed to %s %s/<confs>\n", (op == CTL_READ) ? "read" : "write", CONF_UNIX_BASE);
 		return -1;
@@ -399,7 +400,7 @@ static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
 	if (op == CTL_READ) {
 		bool has_entries = false;
 
-		for (i = 0; i < *n; i++) {
+		for (i = 0; i < n; i++) {
 			if (req[i].flags & CTL_FLAGS_HAS) {
 				conf[i]->has_iarg = true;
 				if (!has_entries)
@@ -412,7 +413,7 @@ static int unix_conf_op(SysctlEntry ***rconf, size_t *n, int op)
 		 * Unix conf is optional.
 		 */
 		if (!has_entries) {
-			*n = 0;
+			*pn = 0;
 			*rconf = NULL;
 		}
 	}
diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index 32fc2978a..566b4c916 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:24.04
 
 COPY scripts/ci/apt-install /bin/apt-install
 

From e7276cf63b5d531eaeefdeebd02d6da0898caafa Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 23 May 2024 14:21:17 +0100
Subject: [PATCH 1510/1854] pagemap-cache: handle short reads

It is possible for pread() to return fewer number of bytes than
requested. In such case, we need to repeat the read operation
with appropriate offset.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/pagemap-cache.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 978a6b1ac..f04a517de 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -165,7 +165,7 @@ static int pmc_fill_cache(pmc_t *pmc, const struct vma_area *vma)
 
 int pmc_fill(pmc_t *pmc, u64 start, u64 end)
 {
-	size_t size_map;
+	size_t size_map, off;
 
 	pmc->start = start;
 	pmc->end = end;
@@ -204,10 +204,17 @@ int pmc_fill(pmc_t *pmc, u64 start, u64 end)
 		pmc->regs_idx = 0;
 		pmc->end = args.walk_end;
 	} else {
-		if (pread(pmc->fd, pmc->map, size_map, PAGEMAP_PFN_OFF(pmc->start)) != size_map) {
-			pmc_zap(pmc);
-			pr_perror("Can't read %d's pagemap file", pmc->pid);
-			return -1;
+		for (off = 0; off != size_map;) {
+			ssize_t ret;
+			char *ptr = (char *)pmc->map;
+
+			ret = pread(pmc->fd, ptr + off, size_map - off, PAGEMAP_PFN_OFF(pmc->start) + off);
+			if (ret == -1) {
+				pmc_zap(pmc);
+				pr_perror("Can't read %d's pagemap file", pmc->pid);
+				return -1;
+			}
+			off += ret;
 		}
 	}
 

From 1da29f27f6e0f2f91336f200ea3791e96edafcb3 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 23 May 2024 07:57:14 +0100
Subject: [PATCH 1511/1854] zdtm: add support for LD_PRELOAD tests

This commit adds a `--preload-libfault` option to ZDTM's run command.
This option runs CRIU with LD_PRELOAD to intercept libc functions
such as pread(). This method allows to simulate special cases,
for example, when a successful call to pread() transfers fewer
bytes than requested.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh |  3 +++
 test/libfault/Makefile     | 21 +++++++++++++++++++++
 test/libfault/libfault.c   | 31 +++++++++++++++++++++++++++++++
 test/zdtm.py               | 23 +++++++++++++++++++++--
 test/zdtm/criu_config.py   |  1 +
 5 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 test/libfault/Makefile
 create mode 100644 test/libfault/libfault.c

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 8ee734fbc..ef2dffb1a 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -262,6 +262,9 @@ make -C test/others/rpc/ run
 
 ./test/zdtm.py run -t zdtm/static/env00 --sibling
 
+./test/zdtm.py run -t zdtm/static/maps00 --preload-libfault
+./test/zdtm.py run -t zdtm/static/maps02 --preload-libfault
+
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --dedup
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --noauto-dedup
 ./test/zdtm.py run -t zdtm/transition/maps007 --pre 2 --page-server
diff --git a/test/libfault/Makefile b/test/libfault/Makefile
new file mode 100644
index 000000000..cbe47fdf2
--- /dev/null
+++ b/test/libfault/Makefile
@@ -0,0 +1,21 @@
+CC = gcc
+CFLAGS = -c -fPIC -ldl
+
+SRC = libfault.c
+OBJ = $(SRC:.c=.o)
+
+LIB = libfault.so
+
+.PHONY: all clean run
+
+all: $(LIB)
+
+$(LIB): $(OBJ)
+	$(CC) -shared -o $(LIB) $(OBJ)
+
+$(OBJ): $(SRC)
+	$(CC) $(CFLAGS) $<
+
+clean:
+	rm -f $(OBJ) $(LIB)
+
diff --git a/test/libfault/libfault.c b/test/libfault/libfault.c
new file mode 100644
index 000000000..650bf08ca
--- /dev/null
+++ b/test/libfault/libfault.c
@@ -0,0 +1,31 @@
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <dlfcn.h>
+#include <errno.h>
+
+ssize_t (*original_pread)(int fd, void *buf, size_t count, off_t offset) = NULL;
+
+/**
+ * This function is a wrapper around pread() that is used for testing CRIU's
+ * handling of cases where pread() returns less data than requested.
+ *
+ * pmc_fill() in criu/pagemap.c is a good example of where this can happen.
+ */
+ssize_t pread64(int fd, void *buf, size_t count, off_t offset)
+{
+	if (!original_pread) {
+		original_pread = dlsym(RTLD_NEXT, "pread");
+		if (!original_pread) {
+			errno = EIO;
+			return -1;
+		}
+	}
+
+	/* The following aims to simulate the case when pread() returns less
+	 * data than requested. We need to ensure that CRIU handles such cases. */
+	if (count > 2048) {
+		count -= 1024;
+	}
+
+	return original_pread(fd, buf, count, offset);
+}
diff --git a/test/zdtm.py b/test/zdtm.py
index 7a7cdfd3b..fbb3400c4 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -32,6 +32,14 @@ from zdtm.criu_config import criu_config
 # File to store content of streamed images
 STREAMED_IMG_FILE_NAME = "img.criu"
 
+# A library used to preload C functions to simulate
+# cases such as partial read with pread().
+LIBFAULT_PATH = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)),
+    "libfault",
+    "libfault.so"
+)
+
 prev_line = None
 uuid = uuid.uuid4()
 
@@ -628,6 +636,8 @@ class zdtm_test:
                 ["make", "zdtm_ct"], env=dict(os.environ, MAKEFLAGS=""))
         if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
             subprocess.check_call(["make", "-C", "zdtm/"])
+        if 'preload_libfault' in opts and opts['preload_libfault']:
+            subprocess.check_call(["make", "-C", "libfault/"])
         if 'rootless' in opts and opts['rootless']:
             return
         subprocess.check_call(
@@ -880,6 +890,7 @@ class criu_cli:
             fault=None,
             strace=[],
             preexec=None,
+            preload_libfault=False,
             nowait=False,
             timeout=60):
         env = dict(
@@ -890,6 +901,9 @@ class criu_cli:
             print("Forcing %s fault" % fault)
             env['CRIU_FAULT'] = fault
 
+        if preload_libfault:
+            env['LD_PRELOAD'] = LIBFAULT_PATH
+
         cr = subprocess.Popen(strace +
                               [criu_bin, action, "--no-default-config"] + args,
                               env=env,
@@ -980,6 +994,7 @@ class criu_rpc:
             fault=None,
             strace=[],
             preexec=None,
+            preload_libfault=False,
             nowait=False,
             timeout=None):
         if fault:
@@ -1065,6 +1080,7 @@ class criu:
         self.__criu_bin = opts['criu_bin']
         self.__crit_bin = opts['crit_bin']
         self.__pre_dump_mode = opts['pre_dump_mode']
+        self.__preload_libfault = bool(opts['preload_libfault'])
         self.__mntns_compat_mode = bool(opts['mntns_compat_mode'])
 
         if opts['rpc']:
@@ -1192,8 +1208,10 @@ class criu:
         with open("/proc/sys/kernel/ns_last_pid") as ns_last_pid_fd:
             ns_last_pid = ns_last_pid_fd.read()
 
+        preload_libfault = self.__preload_libfault and action in ['dump', 'pre-dump', 'restore']
+
         ret = self.__criu.run(action, s_args, self.__criu_bin, self.__fault,
-                              strace, preexec, nowait)
+                              strace, preexec, preload_libfault, nowait)
 
         if nowait:
             os.close(status_fds[1])
@@ -2083,7 +2101,7 @@ class Launcher:
               'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
               'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode', 'mntns_compat_mode',
-              'rootless')
+              'rootless', 'preload_libfault')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
         if self.__use_log:
@@ -2788,6 +2806,7 @@ def get_cli_args():
                     help="Select tests for a shard <index> (0-based)")
     rp.add_argument("--test-shard-count", type=int, default=0,
                     help="Specify how many shards are being run (0=sharding disabled; must be the same for all shards)")
+    rp.add_argument("--preload-libfault", action="store_true", help="Run criu with library preload to simulate special cases")
 
     lp = sp.add_parser("list", help="List tests")
     lp.set_defaults(action=list_tests)
diff --git a/test/zdtm/criu_config.py b/test/zdtm/criu_config.py
index 487becfb4..221c23292 100644
--- a/test/zdtm/criu_config.py
+++ b/test/zdtm/criu_config.py
@@ -11,6 +11,7 @@ class criu_config:
             fault=None,
             strace=[],
             preexec=None,
+            preload=False,
             nowait=False):
 
         config_path = tempfile.mktemp(".conf", "criu-%s-" % action)

From 6feb57a8406df708ba952f3e340381ed4c1494d5 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Jun 2024 08:14:51 +0200
Subject: [PATCH 1512/1854] ci: remove CentOS Stream 8 test (EOL)

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 72135590d..5e30ca2c2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -92,37 +92,6 @@ task:
   build_script: |
     make -C scripts/ci vagrant-fedora-non-root
 
-task:
-  name: CentOS Stream 8 based test
-  environment:
-    HOME: "/root"
-    CIRRUS_WORKING_DIR: "/tmp/criu"
-
-  compute_engine_instance:
-    image_project: centos-cloud
-    image: family/centos-stream-8
-    platform: linux
-    cpu: 4
-    memory: 8G
-
-  setup_script: |
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
-    # Do not fail if latest epel repository definition is already installed
-    yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm || :
-    yum install -y dnf-plugins-core
-    yum config-manager --set-enabled powertools
-    yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-PyYAML python3-protobuf python3-importlib-metadata python3-junit_xml xmlto libdrm-devel
-    alternatives --set python /usr/bin/python3
-    systemctl stop sssd
-    # Even with selinux in permissive mode the selinux tests will be executed
-    # The Cirrus CI user runs as a service from selinux point of view and is
-    # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0)
-    # The test case above (vagrant-fedora-no-vdso) should run selinux tests in enforcing mode
-    setenforce 0
-
-  build_script: |
-    make -C scripts/ci local SKIP_CI_PREP=1 CC=gcc CD_TO_TOP=1 ZDTM_OPTS="-x zdtm/static/socket-raw"
-
 task:
   name: aarch64 build GCC (native)
   arm_container:

From a252a240c33c154f3d12a3a73561192b6be1e7f8 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Fri, 29 Mar 2024 00:06:58 +0530
Subject: [PATCH 1513/1854] zdtm: Distinguish between fail and crash of dump

Adds a exit_signal static method to criu_cli, criu_config and criu_rpc
used to detect a crash.

Fixes: #350

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm.py             | 19 +++++++++++++++----
 test/zdtm/criu_config.py |  4 ++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index fbb3400c4..df23ea03d 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -913,6 +913,10 @@ class criu_cli:
             return cr
         return cr.wait(timeout=timeout)
 
+    @staticmethod
+    def exit_signal(ret):
+        return ret < 0
+
 
 class criu_rpc_process:
     def wait(self):
@@ -1033,8 +1037,11 @@ class criu_rpc:
             else:
                 raise test_fail_exc('RPC for %s required' % action)
         except crpc.CRIUExceptionExternal as e:
-            print("Fail", e)
-            ret = -1
+            if e.typ != e.resp_typ:
+                ret = -2
+            else:
+                print("Fail", e)
+                ret = -1
         else:
             ret = 0
 
@@ -1047,6 +1054,10 @@ class criu_rpc:
 
         return ret
 
+    @staticmethod
+    def exit_signal(ret):
+        return ret == -2
+
 
 class criu:
     def __init__(self, opts):
@@ -1251,8 +1262,8 @@ class criu:
                     return
             rst_succeeded = os.access(
                 os.path.join(__ddir, "restore-succeeded"), os.F_OK)
-            if self.__test.blocking() or (self.__sat and action == 'restore' and
-                                          rst_succeeded):
+            if (self.__test.blocking() and not self.__criu.exit_signal(ret)) or \
+               (self.__sat and action == 'restore' and rst_succeeded):
                 raise test_fail_expected_exc(action)
             else:
                 raise test_fail_exc("CRIU %s" % action)
diff --git a/test/zdtm/criu_config.py b/test/zdtm/criu_config.py
index 221c23292..9fd292747 100644
--- a/test/zdtm/criu_config.py
+++ b/test/zdtm/criu_config.py
@@ -41,3 +41,7 @@ class criu_config:
         if nowait:
             return cr
         return cr.wait()
+
+    @staticmethod
+    def exit_signal(ret):
+        return ret < 0

From f1716492648be6aaacdd41d8c00942a516a889f5 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Sat, 20 Apr 2024 00:24:27 +0530
Subject: [PATCH 1514/1854] test/dump-crash: check code path when dump crashes

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 criu/cr-dump.c                 | 4 ++++
 criu/include/fault-injection.h | 1 +
 test/jenkins/criu-fault.sh     | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 199ff2e32..ef3b5480f 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2102,6 +2102,10 @@ static int cr_dump_finish(int ret)
 	close_image_dir();
 
 	if (ret || post_dump_ret) {
+		if (fault_injected(FI_DUMP_CRASH)) {
+			pr_info("fault: CRIU dump crashed!\n");
+			abort();
+		}
 		pr_err("Dumping FAILED.\n");
 	} else {
 		write_stats(DUMP_STATS);
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index fe75dfe86..552ee4338 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -20,6 +20,7 @@ enum faults {
 	FI_CANNOT_MAP_VDSO = 133,
 	FI_CORRUPT_EXTREGS = 134,
 	FI_DONT_USE_PAGEMAP_SCAN = 135,
+	FI_DUMP_CRASH = 136,
 	FI_MAX,
 };
 
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 4a6d55e6b..1fda40a96 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -39,3 +39,7 @@ fi
 ./test/zdtm.py run -t zdtm/static/fpu03 --fault 134 -f h --norst || fail
 # also check for the main thread corruption
 ./test/zdtm.py run -t zdtm/static/fpu00 --fault 134 -f h --norst || fail
+
+if ./test/zdtm.py run -t zdtm/static/vfork00 --fault 136 --report report -f h ; then
+	fail
+fi

From fdf546dbd500141752b16b4706b39291a5c786ad Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sun, 9 Jun 2024 18:25:28 +0200
Subject: [PATCH 1515/1854] ci: upgrade to Fedora 40 Vagrant images (38 is EOL)

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/vagrant.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 4c1be3544..3904c51d2 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -6,9 +6,9 @@
 set -e
 set -x
 
-VAGRANT_VERSION=2.3.7
-FEDORA_VERSION=38
-FEDORA_BOX_VERSION=38.20230413.1
+VAGRANT_VERSION=2.4.1
+FEDORA_VERSION=40
+FEDORA_BOX_VERSION=40.20240414.0
 
 setup() {
 	if [ -n "$TRAVIS" ]; then
@@ -39,7 +39,7 @@ setup() {
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
 		protobuf-devel python3-protobuf python3-importlib-metadata python3-junit_xml \
-		rubygem-asciidoctor iptables libselinux-devel libbpf-devel
+		rubygem-asciidoctor iptables libselinux-devel libbpf-devel python3-yaml
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
 	ssh default cat /proc/cmdline

From 4f15fe8c5910d9c495b6a0c672790b3a49d02dc7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 May 2024 09:48:34 +0100
Subject: [PATCH 1516/1854] make: improve check for externally managed Python

Move PYTHON_EXTERNALLY_MANAGED and PIP_BREAK_SYSTEM_PACKAGES
into Makefile.install to avoid code duplication. In addition, add
PIPFLAGS variable to enable specifying pip options during installation.
This is particularly useful for packaging, where it is common for `pip install`
to run in an environment with pre-installed dependencies and without internet
access. In such environment, we need to specify the following options:

    --no-build-isolation --no-index --no-deps

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile.install | 23 +++++++++++++++++++++++
 crit/Makefile    | 25 +++++--------------------
 lib/Makefile     | 25 +++++--------------------
 3 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/Makefile.install b/Makefile.install
index 6f5b31924..680b26c62 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -29,6 +29,29 @@ LIBDIR ?= $(PREFIX)/lib
 export PREFIX BINDIR SBINDIR MANDIR RUNDIR
 export LIBDIR INCLUDEDIR LIBEXECDIR PLUGINDIR
 
+# Detect externally managed Python environment (PEP 668).
+PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
+PIP_BREAK_SYSTEM_PACKAGES ?= 0
+
+# If Python environment is externally managed and PIP_BREAK_SYSTEM_PACKAGES is not set, skip pip install.
+SKIP_PIP_INSTALL := 0
+ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
+ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
+
+SKIP_PIP_INSTALL := 1
+$(info Warn: Externally managed python environment)
+$(info Consider using PIP_BREAK_SYSTEM_PACKAGES=1)
+
+endif
+endif
+
+# Default flags for pip install:
+# --upgrade: Upgrade crit/pycriu packages
+# --ignore-installed: Ignore existing packages and reinstall them
+PIPFLAGS ?= --upgrade --ignore-installed
+
+export SKIP_PIP_INSTALL PIPFLAGS
+
 install-man:
 	$(Q) $(MAKE) -C Documentation install
 .PHONY: install-man
diff --git a/crit/Makefile b/crit/Makefile
index 9a856db6d..33bd68eed 100644
--- a/crit/Makefile
+++ b/crit/Makefile
@@ -1,6 +1,3 @@
-PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
-PIP_BREAK_SYSTEM_PACKAGES := 0
-
 VERSION_FILE := $(if $(obj),$(addprefix $(obj)/,crit/version.py),crit/version.py)
 
 all-y	+= ${VERSION_FILE}
@@ -10,31 +7,19 @@ ${VERSION_FILE}:
 	$(Q) echo "__version__ = '${CRIU_VERSION}'" > $@
 
 install: ${VERSION_FILE}
-ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
-ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) "  SKIP INSTALL crit: Externally managed python environment (See PEP 668 for more information)"
-	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
-else
+ifeq ($(SKIP_PIP_INSTALL),0)
 	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
-endif
+	$(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./crit
 else
-	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+	$(E) " SKIP INSTALL crit"
 endif
 .PHONY: install
 
 uninstall:
-ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
-ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) " SKIP UNINSTALL crit: Externally managed python environment (See PEP 668 for more information)"
-	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make uninstall"
-else
+ifeq ($(SKIP_PIP_INSTALL),0)
 	$(E) " UNINSTALL" crit
 	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
-endif
 else
-	$(E) " UNINSTALL" crit
-	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) crit
+	$(E) " SKIP UNINSTALL crit"
 endif
 .PHONY: uninstall
diff --git a/lib/Makefile b/lib/Makefile
index ae371e78e..4b8a6cbb8 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,9 +4,6 @@ UAPI_HEADERS		:= lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/ve
 
 all-y	+= lib-c lib-a lib-py
 
-PYTHON_EXTERNALLY_MANAGED := $(shell $(PYTHON) -c 'import os, sysconfig; print(int(os.path.isfile(os.path.join(sysconfig.get_path("stdlib"), "EXTERNALLY-MANAGED"))))')
-PIP_BREAK_SYSTEM_PACKAGES := 0
-
 #
 # C language bindings.
 lib/c/Makefile: ;
@@ -57,17 +54,11 @@ install: lib-c lib-a lib-py lib/c/criu.pc.in
 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
 	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
-ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
-ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) "  SKIP INSTALL pycriu: Externally managed python environment (See PEP 668 for more information)"
-	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
-else
+ifeq ($(SKIP_PIP_INSTALL),0)
 	$(E) "  INSTALL " pycriu
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
-endif
+	$(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./lib
 else
-	$(E) "  INSTALL " pycriu
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
+	$(E) " SKIP INSTALL pycriu"
 endif
 .PHONY: install
 
@@ -80,16 +71,10 @@ uninstall:
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/criu/,$(notdir $(UAPI_HEADERS)))
 	$(E) " UNINSTALL" pkgconfig/criu.pc
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBDIR)/pkgconfig/,criu.pc)
-ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
-ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) " SKIP UNINSTALL pycriu: Externally managed python environment (See PEP 668 for more information)"
-	$(E) " Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make uninstall"
-else
+ifeq ($(SKIP_PIP_INSTALL),0)
 	$(E) " UNINSTALL" pycriu
 	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) pycriu
-endif
 else
-	$(E) " UNINSTALL" pycriu
-	$(Q) $(PYTHON) ./scripts/uninstall_module.py --prefix=$(DESTDIR)$(PREFIX) pycriu
+	$(E) " SKIP UNINSTALL pycriu"
 endif
 .PHONY: uninstall

From 7ac45370698ed8c28312cfe6ebc30b423eb8bb4a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 22 Jun 2024 18:34:47 +0100
Subject: [PATCH 1517/1854] readme: update link to FAQ page

The current link opens a page with the following text:

    The MediaWiki FAQ can be found at:
    https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 11d1c490b..f578e745c 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Pages worth starting with are:
 - [Installation instructions](http://criu.org/Installation)
 - [A simple example of usage](http://criu.org/Simple_loop)
 - [Examples of more advanced usage](https://criu.org/Category:HOWTO)
-- Troubleshooting can be hard, some help can be found [here](https://criu.org/When_C/R_fails), [here](https://criu.org/What_cannot_be_checkpointed) and [here](https://criu.org/FAQ)
+- Troubleshooting can be hard, some help can be found [here](https://criu.org/When_C/R_fails), [here](https://criu.org/What_cannot_be_checkpointed) and [here](https://criu.org/index.php?title=FAQ)
 
 ### Checkpoint and restore of simple loop process
 <p align="center"><a href="https://asciinema.org/a/232445"><img src="https://asciinema.org/a/232445.png" width="572px" height="412px"/></a></p>

From 1012e542e5e0132c7d7ad04c6b126e465f397968 Mon Sep 17 00:00:00 2001
From: Jesus Ramos <jeramos@nvidia.com>
Date: Thu, 6 Jun 2024 11:12:39 -0700
Subject: [PATCH 1518/1854] criu: Restore rseq_cs state slightly earlier in the
 restore sequence and run the plugin finalizer later in the dump sequence

Restore rseq_cs state before calling RESUME_DEVICES_LATE as the CUDA plugin will
temporarily unfreeze a thread during the plugin hook to assist with device
restore

Run the plugin finalizer later in the dump sequence since the finalizer is used
by the CUDA plugin to handle some process cleanup

Signed-off-by: Jesus Ramos <jeramos@nvidia.com>
---
 criu/cr-dump.c    | 4 +++-
 criu/cr-restore.c | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index ef3b5480f..1bc5d934f 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2035,7 +2035,6 @@ static int cr_dump_finish(int ret)
 	if (bfd_flush_images())
 		ret = -1;
 
-	cr_plugin_fini(CR_PLUGIN_STAGE__DUMP, ret);
 	cgp_fini();
 
 	if (!ret) {
@@ -2089,6 +2088,9 @@ static int cr_dump_finish(int ret)
 
 	if (arch_set_thread_regs(root_item, true) < 0)
 		return -1;
+
+	cr_plugin_fini(CR_PLUGIN_STAGE__DUMP, ret);
+
 	pstree_switch_state(root_item, (ret || post_dump_ret) ? TASK_ALIVE : opts.final_state);
 	timing_stop(TIME_FROZEN);
 	free_pstree(root_item);
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index deecb1294..4db2f4ecf 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2224,6 +2224,11 @@ skip_ns_bouncing:
 	}
 
 	finalize_restore();
+
+	/* just before releasing threads we have to restore rseq_cs */
+	if (restore_rseq_cs())
+		pr_err("Unable to restore rseq_cs state\n");
+
 	/*
 	 * Some external devices such as GPUs might need a very late
 	 * trigger to kick-off some events, memory notifiers and for
@@ -2255,10 +2260,6 @@ skip_ns_bouncing:
 	if (restore_freezer_state())
 		pr_err("Unable to restore freezer state\n");
 
-	/* just before releasing threads we have to restore rseq_cs */
-	if (restore_rseq_cs())
-		pr_err("Unable to restore rseq_cs state\n");
-
 	/* Detaches from processes and they continue run through sigreturn. */
 	if (finalize_restore_detach())
 		goto out_kill_network_unlocked;

From 5f486d5aeee6539bb0d666f0a97572fc52072c3a Mon Sep 17 00:00:00 2001
From: Jesus Ramos <jeramos@nvidia.com>
Date: Thu, 6 Jun 2024 11:16:07 -0700
Subject: [PATCH 1519/1854] criu/plugin: Introduce new plugin hooks
 PAUSE_DEVICES and CHECKPOINT_DEVICES to be used during pstree collection

PAUSE_DEVICES is called before a process is frozen and is used by the CUDA
plugin to place the process in a state that's ready to be checkpointed and
quiesce any pending work

CHECKPOINT_DEVICES is called after all processes in the tree have been frozen
and PAUSE'd and performs the actual checkpointing operation for CUDA
applications

Signed-off-by: Jesus Ramos <jeramos@nvidia.com>
---
 criu/include/criu-plugin.h |  6 ++++++
 criu/plugin.c              |  2 ++
 criu/seize.c               | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index 886832eaa..392ea9f53 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -56,6 +56,10 @@ enum {
 
 	CR_PLUGIN_HOOK__RESUME_DEVICES_LATE = 9,
 
+	CR_PLUGIN_HOOK__PAUSE_DEVICES = 10,
+
+	CR_PLUGIN_HOOK__CHECKPOINT_DEVICES = 11,
+
 	CR_PLUGIN_HOOK__MAX
 };
 
@@ -72,6 +76,8 @@ DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, int fd, const struct
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, const char *path, const uint64_t addr,
 			 const uint64_t old_pgoff, uint64_t *new_pgoff, int *plugin_fd);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, int pid);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__PAUSE_DEVICES, int pid);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, int pid);
 
 enum {
 	CR_PLUGIN_STAGE__DUMP,
diff --git a/criu/plugin.c b/criu/plugin.c
index f3fea2856..58b5ea5bf 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -57,6 +57,8 @@ static cr_plugin_desc_t *cr_gen_plugin_desc(void *h, char *path)
 	__assign_hook(HANDLE_DEVICE_VMA, "cr_plugin_handle_device_vma");
 	__assign_hook(UPDATE_VMA_MAP, "cr_plugin_update_vma_map");
 	__assign_hook(RESUME_DEVICES_LATE, "cr_plugin_resume_devices_late");
+	__assign_hook(PAUSE_DEVICES, "cr_plugin_pause_devices");
+	__assign_hook(CHECKPOINT_DEVICES, "cr_plugin_checkpoint_devices");
 
 #undef __assign_hook
 
diff --git a/criu/seize.c b/criu/seize.c
index 91090ae1a..d392259bc 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -16,6 +16,7 @@
 #include "pstree.h"
 #include "criu-log.h"
 #include <compel/ptrace.h>
+#include "plugin.h"
 #include "proc_parse.h"
 #include "seccomp.h"
 #include "seize.h"
@@ -637,6 +638,11 @@ static int collect_children(struct pstree_item *item)
 			goto free;
 		}
 
+		ret = run_plugins(PAUSE_DEVICES, pid);
+		if (ret < 0 && ret != -ENOTSUP) {
+			goto free;
+		}
+
 		if (!opts.freeze_cgroup)
 			/* fails when meets a zombie */
 			__ignore_value(compel_interrupt_task(pid));
@@ -966,6 +972,7 @@ int collect_pstree(void)
 	pid_t pid = root_item->pid->real;
 	int ret = -1;
 	struct proc_status_creds creds;
+	struct pstree_item *iter;
 
 	timing_start(TIME_FREEZING);
 
@@ -984,6 +991,11 @@ int collect_pstree(void)
 	if (opts.freeze_cgroup && freeze_processes())
 		goto err;
 
+	ret = run_plugins(PAUSE_DEVICES, pid);
+	if (ret < 0 && ret != -ENOTSUP) {
+		goto err;
+	}
+
 	if (!opts.freeze_cgroup && compel_interrupt_task(pid)) {
 		set_cr_errno(ESRCH);
 		goto err;
@@ -1017,6 +1029,12 @@ int collect_pstree(void)
 		goto err;
 	}
 
+	for_each_pstree_item(iter) {
+		ret = run_plugins(CHECKPOINT_DEVICES, iter->pid->real);
+		if (ret < 0 && ret != -ENOTSUP)
+			goto err;
+	}
+
 	ret = 0;
 	timing_stop(TIME_FREEZING);
 	timing_start(TIME_FROZEN);

From bf417dd0509a66afd43558122d535034e528df09 Mon Sep 17 00:00:00 2001
From: Jesus Ramos <jeramos@nvidia.com>
Date: Fri, 31 May 2024 13:38:54 -0700
Subject: [PATCH 1520/1854] criu/plugin: Add NVIDIA CUDA plugin

Adding support for the NVIDIA cuda-checkpoint utility, requires the use of an
r555 or higher driver along with the cuda-checkpoint binary.

Signed-off-by: Jesus Ramos <jeramos@nvidia.com>
---
 Makefile                   |  15 +-
 Makefile.install           |   7 +-
 plugins/cuda/Makefile      |  42 ++++
 plugins/cuda/README.md     |  59 +++++
 plugins/cuda/cuda_plugin.c | 459 +++++++++++++++++++++++++++++++++++++
 5 files changed, 578 insertions(+), 4 deletions(-)
 create mode 100644 plugins/cuda/Makefile
 create mode 100644 plugins/cuda/README.md
 create mode 100644 plugins/cuda/cuda_plugin.c

diff --git a/Makefile b/Makefile
index e49dace7a..97b4dc211 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ HOSTCFLAGS		+= $(WARNINGS) $(DEFINES) -iquote include/
 export AFLAGS CFLAGS USERCLFAGS HOSTCFLAGS
 
 # Default target
-all: criu lib crit
+all: criu lib crit cuda_plugin
 .PHONY: all
 
 #
@@ -298,15 +298,19 @@ clean-amdgpu_plugin:
 	$(Q) $(MAKE) -C plugins/amdgpu clean
 .PHONY: clean-amdgpu_plugin
 
+clean-cuda_plugin:
+	$(Q) $(MAKE) -C plugins/cuda clean
+.PHONY: clean-cuda_plugin
+
 clean-top:
 	$(Q) $(MAKE) -C Documentation clean
 	$(Q) $(MAKE) $(build)=test/compel clean
 	$(Q) $(RM) .gitid
 .PHONY: clean-top
 
-clean: clean-top clean-amdgpu_plugin
+clean: clean-top clean-amdgpu_plugin clean-cuda_plugin
 
-mrproper-top: clean-top clean-amdgpu_plugin
+mrproper-top: clean-top clean-amdgpu_plugin clean-cuda_plugin
 	$(Q) $(RM) $(CONFIG_HEADER)
 	$(Q) $(RM) $(VERSION_HEADER)
 	$(Q) $(RM) $(COMPEL_VERSION_HEADER)
@@ -338,6 +342,10 @@ amdgpu_plugin: criu
 	$(Q) $(MAKE) -C plugins/amdgpu all
 .PHONY: amdgpu_plugin
 
+cuda_plugin: criu
+	$(Q) $(MAKE) -C plugins/cuda all
+.PHONY: cuda_plugin
+
 crit: lib
 	$(Q) $(MAKE) -C crit
 .PHONY: crit
@@ -424,6 +432,7 @@ help:
 	@echo '      lint            - Run code linters'
 	@echo '      indent          - Indent C code'
 	@echo '      amdgpu_plugin   - Make AMD GPU plugin'
+	@echo '      cuda_plugin     - Make NVIDIA CUDA plugin'
 .PHONY: help
 
 ruff:
diff --git a/Makefile.install b/Makefile.install
index 680b26c62..455735f3b 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -72,12 +72,16 @@ install-amdgpu_plugin: amdgpu_plugin
 	$(Q) $(MAKE) -C plugins/amdgpu install
 .PHONY: install-amdgpu_plugin
 
+install-cuda_plugin: cuda_plugin
+	$(Q) $(MAKE) -C plugins/cuda install
+.PHONY: install-cuda_plugin
+
 install-compel: $(compel-install-targets)
 	$(Q) $(MAKE) $(build)=compel install
 	$(Q) $(MAKE) $(build)=compel/plugins install
 .PHONY: install-compel
 
-install: install-man install-lib install-crit install-criu install-compel install-amdgpu_plugin ;
+install: install-man install-lib install-crit install-criu install-compel install-amdgpu_plugin install-cuda_plugin ;
 .PHONY: install
 
 uninstall:
@@ -88,4 +92,5 @@ uninstall:
 	$(Q) $(MAKE) $(build)=compel $@
 	$(Q) $(MAKE) $(build)=compel/plugins $@
 	$(Q) $(MAKE) -C plugins/amdgpu $@
+	$(Q) $(MAKE) -C plugins/cuda $@
 .PHONY: uninstall
diff --git a/plugins/cuda/Makefile b/plugins/cuda/Makefile
new file mode 100644
index 000000000..2eabc0e31
--- /dev/null
+++ b/plugins/cuda/Makefile
@@ -0,0 +1,42 @@
+PLUGIN_NAME := cuda_plugin
+PLUGIN_SOBJ := cuda_plugin.so
+
+DEPS_CUDA := $(PLUGIN_SOBJ)
+
+PLUGIN_INCLUDE  	:= -iquote../../include
+PLUGIN_INCLUDE  	+= -iquote../../criu/include
+PLUGIN_INCLUDE  	+= -iquote../../criu/arch/$(ARCH)/include/
+PLUGIN_INCLUDE  	+= -iquote../../
+
+COMPEL := ../../compel/compel-host
+
+CC := gcc
+PLUGIN_CFLAGS := -g -Wall -Werror -shared -nostartfiles -fPIC
+
+__nmk_dir ?= ../../scripts/nmk/scripts/
+include $(__nmk_dir)msg.mk
+
+all: $(DEPS_CUDA)
+
+cuda_plugin.so: cuda_plugin.c
+	$(call msg-gen, $@)
+	$(Q) $(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
+
+clean:
+	$(call msg-clean, $@)
+	$(Q) $(RM) $(PLUGIN_SOBJ)
+.PHONY: clean
+
+mrproper: clean
+
+install:
+	$(Q) mkdir -p $(DESTDIR)$(PLUGINDIR)
+	$(E) "  INSTALL " $(PLUGIN_NAME)
+	$(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
+.PHONY: install
+
+uninstall:
+	$(E) " UNINSTALL" $(PLUGIN_NAME)
+	$(Q) $(RM) $(DESTDIR)$(PLUGINDIR)/$(PLUGIN_SOBJ)
+.PHONY: uninstall
+
diff --git a/plugins/cuda/README.md b/plugins/cuda/README.md
new file mode 100644
index 000000000..7b91f6998
--- /dev/null
+++ b/plugins/cuda/README.md
@@ -0,0 +1,59 @@
+Checkpoint and Restore for CUDA applications with CRIU
+======================================================
+
+# Requirements
+The cuda-checkpoint utility should be placed somewhere in your $PATH and an r555
+or higher GPU driver is required for CUDA CRIU integration support.
+
+## cuda-checkpoint
+The cuda-checkpoint utility can be found at:
+https://github.com/NVIDIA/cuda-checkpoint
+
+cuda-checkpoint is a binary utility used to issue checkpointing commands to CUDA
+applications. Updating the cuda-checkpoint utility between driver releases
+should not be necessary as the utility simply exposes some extra driver behavior
+so driver updates are all that's needed to get access to newer features.
+
+# Checkpointing Procedure
+cuda-checkpoint exposes 4 actions used in the checkpointing process: lock,
+checkpoint, restore, unlock.
+
+* lock - Used with the PAUSE_DEVICES hook while a process is still running to
+  quiesce the application into a state where it can be checkpointed
+* checkpoint - Used with the CHECKPOINT_DEVICES hook once a process has been
+  seized/frozen to perform the actual checkpointing operation
+* restore/unlock - Used with the RESUME_DEVICES_LATE hook to restore the CUDA
+  state and release the process back to it's running state
+
+These actions are facilitated by a CUDA checkpoint+restore thread that the CUDA
+plugin will re-wake when needed.
+
+# Known Limitations
+* Currently GPU memory contents are brought into main system memory and CRIU
+  then checkpoints that as part of the normal procedure. On systems with many
+  GPU's with high GPU memory usage this can cause memory thrashing. A future
+  CUDA release will add support for dumping the memory contents to files to
+  alleviate this as well as support in the CRIU plugin.
+* There's currently a small race between when a PAUSE_DEVICES hook is called on
+  a running process and a process calls cuInit() and finishes initializing CUDA
+  after the PAUSE is issued but before the process is frozen to checkpoint. This
+  will cause cuda-checkpoint to report that the process is in an illegal state
+  for checkpointing and it's recommended to just attempt the CRIU procedure
+  again, this should be very rare.
+* Applications that use NVML will leave some leftover device references as NVML
+  is not currently supported for checkpointing. There will be support for this
+  in later drivers. A possible temporary workaround is to have the
+  {DUMP,RESTORE}_EXT_FILE hook just ignore /dev/nvidiactl and /dev/nvidia{0..N}
+  remaining references for these applications as in most cases NVML is used to
+  get info such as gpu count and some capabilities and these values are never
+  accessed again and unlikely to change.
+* CUDA applications that fork() but don't call exec() but also don't issue any
+  CUDA API calls will have some leftover references to /dev/nvidia* and fail to
+  checkpoint as a result. This can be worked around in a similar fashion to the
+  NVML case where the leftover references can be ignored as CUDA is not fork()
+  safe anyway.
+* Restore currently requires that you restore on a system with similar GPU's and
+  same GPU count.
+* NVIDIA UVM Managed Memory, MIG (Multi Instance GPU), and MPS (Multi-Process
+  Service) are currently not supported for checkpointing. Future CUDA releases
+  will add support for these.
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
new file mode 100644
index 000000000..b3f2fc8df
--- /dev/null
+++ b/plugins/cuda/cuda_plugin.c
@@ -0,0 +1,459 @@
+#include "criu-log.h"
+#include "plugin.h"
+#include "util.h"
+#include "cr_options.h"
+#include "pid.h"
+#include "proc_parse.h"
+
+#include <common/list.h>
+#include <compel/infect.h>
+
+#include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+
+/* cuda-checkpoint binary should live in your PATH */
+#define CUDA_CHECKPOINT "cuda-checkpoint"
+
+/* cuda-checkpoint --action flags */
+#define ACTION_LOCK	  "lock"
+#define ACTION_CHECKPOINT "checkpoint"
+#define ACTION_RESTORE	  "restore"
+#define ACTION_UNLOCK	  "unlock"
+
+#define CUDA_CKPT_BUF_SIZE (128)
+
+#ifdef LOG_PREFIX
+#undef LOG_PREFIX
+#endif
+#define LOG_PREFIX "cuda_plugin: "
+
+/* Disable plugin functionality if cuda-checkpoint is not in $PATH or driver
+ * version doesn't support --action flag
+ */
+bool plugin_disabled = false;
+
+struct pid_info {
+	int pid;
+	char checkpointed;
+	struct list_head list;
+};
+
+/* Used to track which PID's we've paused CUDA operations on so far so we can
+ * release them after we're done with the DUMP
+ */
+struct list_head cuda_pids;
+
+static void dealloc_pid_buffer(struct list_head *pid_buf)
+{
+	struct pid_info *info;
+	struct pid_info *n;
+
+	list_for_each_entry_safe(info, n, pid_buf, list) {
+		list_del(&info->list);
+		xfree(info);
+	}
+}
+
+static int add_pid_to_buf(struct list_head *pid_buf, int pid)
+{
+	struct pid_info *new = xmalloc(sizeof(*new));
+
+	if (new == NULL) {
+		return -1;
+	}
+
+	new->pid = pid;
+	new->checkpointed = 0;
+	list_add_tail(&new->list, pid_buf);
+
+	return 0;
+}
+
+static int update_checkpointed_pid(struct list_head *pid_buf, int pid)
+{
+	struct pid_info *info;
+
+	list_for_each_entry(info, pid_buf, list) {
+		if (info->pid == pid) {
+			info->checkpointed = 1;
+			return 0;
+		}
+	}
+
+	return -1;
+}
+
+static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
+{
+#define READ  0
+#define WRITE 1
+	int fd[2];
+
+	if (pipe(fd) != 0) {
+		pr_err("Couldn't create pipes for reading cuda-checkpoint output\n");
+		return -1;
+	}
+
+	buf[0] = '\0';
+
+	int child_pid = fork();
+	if (child_pid == -1) {
+		pr_err("Failed to fork to exec cuda-checkpoint\n");
+		close(fd[READ]);
+		close(fd[WRITE]);
+		return -1;
+	}
+
+	if (child_pid == 0) { // child
+		if (dup2(fd[WRITE], STDOUT_FILENO) == -1) {
+			return -1;
+		}
+		if (dup2(fd[WRITE], STDERR_FILENO) == -1) {
+			return -1;
+		}
+		close(fd[READ]);
+		return execvp(args[0], (char **)args);
+	} else { // parent
+		close(fd[WRITE]);
+
+		int bytes_read = read(fd[READ], buf, buf_size);
+		if (bytes_read > 0) {
+			buf[bytes_read - 1] = '\0';
+		}
+
+		// Clear out any of the remaining output in the pipe in case the buffer wasn't large enough
+		struct pollfd read_poll = { .fd = fd[READ], .events = POLLIN | POLLHUP };
+		while (true) {
+			int poll_status = poll(&read_poll, 1, -1);
+			if (poll_status == -1) {
+				close(fd[READ]);
+				pr_err("Unexpected error when clearing cuda-checkpoint output buffer\n");
+				return -1;
+			}
+			if (read_poll.revents & POLLHUP) {
+				break;
+			}
+			// POLLIN, read into scratch buffer to flush things out
+			char scratch[64];
+			bytes_read = read(fd[READ], scratch, sizeof(scratch));
+		}
+
+		int status;
+		if (waitpid(child_pid, &status, 0) == -1 || !WIFEXITED(status)) {
+			pr_err("cuda-checkpoint exited improperly, couldn't complete operation\n");
+			close(fd[READ]);
+			return -1;
+		}
+
+		close(fd[READ]);
+
+		return WEXITSTATUS(status);
+	}
+}
+
+static bool cuda_checkpoint_supports_flag(const char *flag)
+{
+	char msg_buf[2048];
+	const char *args[] = { CUDA_CHECKPOINT, "-h", NULL };
+	int ret = launch_cuda_checkpoint(args, msg_buf, sizeof(msg_buf));
+	if (ret != 0) {
+		pr_err("Failed to launch cuda-checkpoint utility, check that the utility is present in your $PATH\n");
+		return false;
+	}
+
+	if (strstr(msg_buf, flag) == NULL) {
+		return false;
+	}
+
+	return true;
+}
+
+/* Retrieve the cuda restore thread TID from the root pid */
+static int get_cuda_restore_tid(int root_pid)
+{
+	char pid_buf[16];
+	char pid_out[CUDA_CKPT_BUF_SIZE];
+
+	snprintf(pid_buf, sizeof(pid_buf), "%d", root_pid);
+
+	const char *args[] = { CUDA_CHECKPOINT, "--get-restore-tid", "--pid", pid_buf, NULL };
+	int ret = launch_cuda_checkpoint(args, pid_out, sizeof(pid_out));
+	if (ret != 0) {
+		pr_err("Failed to launch cuda-checkpoint to retrieve restore tid: %s\n", pid_out);
+		return -1;
+	}
+
+	return atoi(pid_out);
+}
+
+static int cuda_process_checkpoint_action(int pid, const char *action, unsigned int timeout, char *msg_buf,
+					  int buf_size)
+{
+	char pid_buf[16];
+	char timeout_buf[16];
+
+	snprintf(pid_buf, sizeof(pid_buf), "%d", pid);
+
+	const char *args[] = { CUDA_CHECKPOINT, "--action", action, "--pid", pid_buf, NULL /* --timeout */,
+			       NULL /* timeout_val */, NULL };
+	if (timeout > 0) {
+		snprintf(timeout_buf, sizeof(timeout_buf), "%d", timeout);
+		args[5] = "--timeout";
+		args[6] = timeout_buf;
+	}
+
+	return launch_cuda_checkpoint(args, msg_buf, buf_size);
+}
+
+static int interrupt_restore_thread(int restore_tid, k_rtsigset_t *restore_sigset)
+{
+	/* Since we resumed a thread that CRIU previously already froze we need to
+	 * INTERRUPT it once again, task was already SEIZE'd so we don't need to do
+	 * a compel_interrupt_task()
+	 */
+	if (ptrace(PTRACE_INTERRUPT, restore_tid, NULL, 0)) {
+		pr_err("Could not interrupt cuda restore tid %d after checkpoint, process may be in strange state\n",
+		       restore_tid);
+		return -1;
+	}
+
+	struct proc_status_creds creds;
+	if (compel_wait_task(restore_tid, -1, parse_pid_status, NULL, &creds.s, NULL) != COMPEL_TASK_ALIVE) {
+		pr_err("compel_wait_task failed after interrupt\n");
+		return -1;
+	}
+
+	if (ptrace(PTRACE_SETOPTIONS, restore_tid, NULL, PTRACE_O_SUSPEND_SECCOMP | PTRACE_O_TRACESYSGOOD)) {
+		pr_err("Failed to set ptrace options on interrupt for restore tid %d\n", restore_tid);
+		return -1;
+	}
+
+	if (ptrace(PTRACE_SETSIGMASK, restore_tid, sizeof(*restore_sigset), restore_sigset)) {
+		pr_err("Unable to restore original sigmask to restore tid %d\n", restore_tid);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int resume_restore_thread(int restore_tid, k_rtsigset_t *save_sigset)
+{
+	k_rtsigset_t block;
+
+	if (ptrace(PTRACE_GETSIGMASK, restore_tid, sizeof(*save_sigset), save_sigset)) {
+		pr_err("Failed to get current sigmask for restore tid %d\n", restore_tid);
+		return -1;
+	}
+
+	ksigfillset(&block);
+	ksigdelset(&block, SIGTRAP);
+
+	if (ptrace(PTRACE_SETSIGMASK, restore_tid, sizeof(block), &block)) {
+		pr_err("Failed to block signals on restore tid %d\n", restore_tid);
+		return -1;
+	}
+
+	// Clear out PTRACE_O_SUSPEND_SECCOMP when we resume the restore thread
+	if (ptrace(PTRACE_SETOPTIONS, restore_tid, NULL, 0)) {
+		pr_err("Could not clear ptrace options on restore tid %d\n", restore_tid);
+		return -1;
+	}
+
+	if (ptrace(PTRACE_CONT, restore_tid, NULL, 0)) {
+		pr_err("Could not resume cuda restore tid %d\n", restore_tid);
+		return -1;
+	}
+
+	return 0;
+}
+
+int cuda_plugin_checkpoint_devices(int pid)
+{
+	int restore_tid;
+	char msg_buf[CUDA_CKPT_BUF_SIZE];
+	int int_ret;
+	int status;
+	k_rtsigset_t save_sigset;
+
+	if (plugin_disabled) {
+		return 0;
+	}
+
+	restore_tid = get_cuda_restore_tid(pid);
+
+	/* We can possibly hit a race with cuInit() where we are past the point of
+	 * locking the process but at lock time cuInit() hadn't completed in which
+	 * case cuda-checkpoint will report that we're in an invalid state to
+	 * checkpoint
+	 */
+	if (restore_tid == -1) {
+		pr_info("No need to checkpoint devices on pid %d\n", pid);
+		return 0;
+	}
+
+	pr_info("Checkpointing CUDA devices on pid %d restore_tid %d\n", pid, restore_tid);
+	/* We need to resume the checkpoint thread to prepare the mappings for
+	 * checkpointing
+	 */
+	if (resume_restore_thread(restore_tid, &save_sigset)) {
+		return -1;
+	}
+	status = cuda_process_checkpoint_action(pid, ACTION_CHECKPOINT, 0, msg_buf, sizeof(msg_buf));
+	if (status) {
+		pr_err("CHECKPOINT_DEVICES failed with %s\n", msg_buf);
+		goto interrupt;
+	}
+	status = update_checkpointed_pid(&cuda_pids, pid);
+	if (status) {
+		pr_err("Failed to track checkpointed pid %d\n", pid);
+		status = cuda_process_checkpoint_action(pid, ACTION_RESTORE, 0, msg_buf, sizeof(msg_buf));
+		if (status) {
+			pr_err("Failed to restore process after error %s on pid %d\n", msg_buf, pid);
+		}
+	}
+interrupt:
+	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
+
+	return status != 0 ? status : int_ret;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, cuda_plugin_checkpoint_devices);
+
+int cuda_plugin_pause_devices(int pid)
+{
+	int restore_tid;
+	char msg_buf[CUDA_CKPT_BUF_SIZE];
+
+	if (plugin_disabled) {
+		return 0;
+	}
+
+	restore_tid = get_cuda_restore_tid(pid);
+
+	if (restore_tid == -1) {
+		pr_info("no need to pause devices on pid %d\n", pid);
+		return 0;
+	}
+
+	pr_info("pausing devices on pid %d\n", pid);
+	int status = cuda_process_checkpoint_action(pid, ACTION_LOCK, opts.timeout * 1000, msg_buf, sizeof(msg_buf));
+	if (status) {
+		pr_err("PAUSE_DEVICES failed with %s\n", msg_buf);
+		return -1;
+	}
+	if (add_pid_to_buf(&cuda_pids, pid)) {
+		pr_err("unable to track paused pid %d\n", pid);
+		status = cuda_process_checkpoint_action(pid, ACTION_UNLOCK, 0, msg_buf, sizeof(msg_buf));
+		if (status) {
+			pr_err("Failed to unlock process status %s, pid %d may hang\n", msg_buf, pid);
+		}
+		return -1;
+	}
+
+	return 0;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__PAUSE_DEVICES, cuda_plugin_pause_devices)
+
+int resume_device(int pid, int checkpointed)
+{
+	char msg_buf[CUDA_CKPT_BUF_SIZE];
+	int status;
+	int ret = 0;
+	int int_ret;
+	k_rtsigset_t save_sigset;
+
+	int restore_tid = get_cuda_restore_tid(pid);
+	if (restore_tid == -1) {
+		pr_info("No need to resume devices on pid %d\n", pid);
+		return 0;
+	}
+
+	pr_info("resuming devices on pid %d\n", pid);
+	/* The resuming process has to stay frozen during this time otherwise
+	 * attempting to access a UVM pointer will crash if we haven't restored the
+	 * underlying mappings yet
+	 */
+	pr_debug("Restore thread pid %d found for real pid %d\n", restore_tid, pid);
+	/* wakeup the restore thread so we can handle the restore for this pid,
+	 * rseq_cs has to be restored before execution
+	 */
+	if (resume_restore_thread(restore_tid, &save_sigset)) {
+		return -1;
+	}
+
+	if (checkpointed) {
+		status = cuda_process_checkpoint_action(pid, ACTION_RESTORE, 0, msg_buf, sizeof(msg_buf));
+		if (status) {
+			pr_err("RESUME_DEVICES RESTORE failed with %s\n", msg_buf);
+			ret = -1;
+			goto interrupt;
+		}
+	}
+
+	status = cuda_process_checkpoint_action(pid, ACTION_UNLOCK, 0, msg_buf, sizeof(msg_buf));
+	if (status) {
+		pr_err("RESUME_DEVICES UNLOCK failed with %s\n", msg_buf);
+		ret = -1;
+	}
+
+interrupt:
+	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
+
+	return ret != 0 ? ret : int_ret;
+}
+
+int cuda_plugin_resume_devices_late(int pid)
+{
+	if (plugin_disabled) {
+		return 0;
+	}
+
+	return resume_device(pid, 1);
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, cuda_plugin_resume_devices_late)
+
+int cuda_plugin_init(int stage)
+{
+	if (!cuda_checkpoint_supports_flag("--action")) {
+		pr_warn("cuda-checkpoint --action flag not supported, an r555 or higher version driver is required. Disabling CUDA plugin\n");
+		plugin_disabled = true;
+		return 0;
+	}
+
+	pr_info("initialized: %s stage %d\n", CR_PLUGIN_DESC.name, stage);
+
+	/* In the DUMP stage track all the PID's we've paused CUDA operations on to
+	 * release them when we're done if the user requested the leave-running option
+	 */
+	if (stage == CR_PLUGIN_STAGE__DUMP) {
+		INIT_LIST_HEAD(&cuda_pids);
+	}
+
+	return 0;
+}
+
+void cuda_plugin_fini(int stage, int ret)
+{
+	if (plugin_disabled) {
+		return;
+	}
+
+	pr_info("finished %s stage %d err %d\n", CR_PLUGIN_DESC.name, stage, ret);
+
+	/* Release all the paused PID's at the end of the DUMP stage in case the
+	 * user provides the -R (leave-running) flag or an error occurred
+	 */
+	if (stage == CR_PLUGIN_STAGE__DUMP && (opts.final_state == TASK_ALIVE || ret != 0)) {
+		struct pid_info *info;
+		list_for_each_entry(info, &cuda_pids, list) {
+			resume_device(info->pid, info->checkpointed);
+		}
+	}
+	if (stage == CR_PLUGIN_STAGE__DUMP) {
+		dealloc_pid_buffer(&cuda_pids);
+	}
+}
+CR_PLUGIN_REGISTER("cuda_plugin", cuda_plugin_init, cuda_plugin_fini)

From ca971b7f8b8c6db802127a82b53fab0b97b33bcd Mon Sep 17 00:00:00 2001
From: Pratyush Yadav <ptyadav@amazon.de>
Date: Tue, 25 Jun 2024 14:56:25 +0200
Subject: [PATCH 1521/1854] compel: fix build on Amazon Linux 2 due to missing
 PTRACE_ARCH_PRCTL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit fc683cb01 ("compel: shstk: save CET state when CPU supports it")
started using PTRACE_ARCH_PRCTL to query shadow stack status. While
PTRACE_ARCH_PRCTL has existed in the kernel for a long time, it was only
added to glibc in version 2.27. Amazon Linux 2 (AL2) has glibc 2.26,
which does not have this definition. As a result, build on AL2 fails
with the below error:

    compel/arch/x86/src/lib/infect.c: In function ‘get_task_xsave’:
    compel/arch/x86/src/lib/infect.c:276:14: error: ‘PTRACE_ARCH_PRCTL’ undeclared (first use in this function)
    276 |   if (ptrace(PTRACE_ARCH_PRCTL, pid, (unsigned long)&features, ARCH_SHSTK_STATUS)) {
        |              ^~~~~~~~~~~~~~~~~

While the definition is present on the system via the kernel headers (in
asm/ptrace-abi.h) which can be reached by including linux/ptrace.h, the
comment in compel/include/uapi/ptrace.h says:

    We'd want to include both sys/ptrace.h and linux/ptrace.h, hoping
    that most definitions come from either one or another. Alas, on
    Alpine/musl both files declare struct ptrace_peeksiginfo_args, so
    there is no way they can be used together. Let's rely on libc one.

Since including linux/ptrace.h is not an option, define
PTRACE_ARCH_PRCTL if it doesn't already exist. An interesting point to
note is that in sys/ptrace.h, PTRACE_ARCH_PRCTL is an enum value so the
preprocessor doesn't know about it. PT_ARCH_PRCTL is the preprocessor
symbol that matches the value of PTRACE_ARCH_PRCTL. So look for
PT_ARCH_PRCTL to decide if PTRACE_ARCH_PRCTL is available or not.

Another interesting point to note is that AL2 ships with GCC 7 by
default, which does not support the -mshstk option, causing other build
failures. Luckily, it also ships GCC 10 which does have the option.
Using GCC 10 lets the build succeed.

Fixes: fc683cb01 ("compel: shstk: save CET state when CPU supports it")
Signed-off-by: Pratyush Yadav <ptyadav@amazon.de>
---
 compel/include/uapi/ptrace.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/compel/include/uapi/ptrace.h b/compel/include/uapi/ptrace.h
index 63dfee97f..558124fbd 100644
--- a/compel/include/uapi/ptrace.h
+++ b/compel/include/uapi/ptrace.h
@@ -86,6 +86,19 @@ struct __ptrace_rseq_configuration {
 #define PTRACE_EVENT_STOP 128
 #endif
 
+/*
+ * Amazon Linux 2 uses glibc 2.26. PTRACE_ARCH_PRCTL was added in glibc 2.27.
+ * This allows CRIU to build on Amazon Linux 2.
+ *
+ * Note that in sys/ptrace.h, PTRACE_ARCH_PRCTL is an enum value so the
+ * preprocessor doesn't know about it. PT_ARCH_PRCTL is the preprocessor symbol
+ * that matches the value of PTRACE_ARCH_PRCTL. So look for PT_ARCH_PRCTL to
+ * decide if PTRACE_ARCH_PRCTL is available or not.
+ */
+#if defined(__x86_64__) && !defined(PT_ARCH_PRCTL)
+#define PTRACE_ARCH_PRCTL 30 /* From asm/ptrace-abi.h. */
+#endif
+
 extern int ptrace_suspend_seccomp(pid_t pid);
 
 extern int __must_check ptrace_peek_area(pid_t pid, void *dst, void *addr, long bytes);

From b169e3b63d36770d6ce887d5f2a0d5ec6cfd4256 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 2 Jul 2024 00:39:53 -0700
Subject: [PATCH 1522/1854] plugins/cuda: fix crosscompilation

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 plugins/cuda/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/cuda/Makefile b/plugins/cuda/Makefile
index 2eabc0e31..e337056dc 100644
--- a/plugins/cuda/Makefile
+++ b/plugins/cuda/Makefile
@@ -10,7 +10,6 @@ PLUGIN_INCLUDE  	+= -iquote../../
 
 COMPEL := ../../compel/compel-host
 
-CC := gcc
 PLUGIN_CFLAGS := -g -Wall -Werror -shared -nostartfiles -fPIC
 
 __nmk_dir ?= ../../scripts/nmk/scripts/

From daed6c3535d969eea388d9c924aba9b5fe2cecc8 Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Thu, 30 May 2024 19:52:54 +0800
Subject: [PATCH 1523/1854] irmap: duplicate string in irmap_scan_path_add

Duplicate string in irmap_scan_path_add, otherwise it will free before
parsing next configuration input.

[ avagin: handle errors of xstrdup ]

Signed-off-by: Liu Hua <weldonliu@tencent.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/irmap.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/criu/irmap.c b/criu/irmap.c
index 37d098db1..d2c5d588a 100644
--- a/criu/irmap.c
+++ b/criu/irmap.c
@@ -500,7 +500,12 @@ int irmap_scan_path_add(char *path)
 		return -1;
 	}
 
-	o->ir->path = path;
+	o->ir->path = xstrdup(path);
+	if (!o->ir->path) {
+		xfree(o->ir);
+		xfree(o);
+		return -1;
+	}
 	o->ir->nr_kids = -1;
 	list_add_tail(&o->node, &opts.irmap_scan_paths);
 	return 0;

From 71999d8883fe1508453496ac12094f66ca2cda0b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 2 Jul 2024 11:56:41 +0800
Subject: [PATCH 1524/1854] cgroupd: unblock SIGTERM to make stop_cgroupd
 actually work

Sometimes due to sigblockmask inheritance cgroupd can inherit SIGTERM
blocked. That will lead cgroupd ignoring SIGTERM from stop_cgroupd() and
CRIU will get stuck due to waiting for never-stopping cgroupd.

I see this happening in lxc-checkpoint, also saw this in OpenVZ jenkins
on cgroup_inotify00 test.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cgroup.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index 6d1f74457..d90b70bb7 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -1947,6 +1947,21 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
 	return 0;
 }
 
+static int cgroupd_unblock_sigterm(void)
+{
+	sigset_t unblockmask;
+
+	sigemptyset(&unblockmask);
+	sigaddset(&unblockmask, SIGTERM);
+
+	if (sigprocmask(SIG_UNBLOCK, &unblockmask, NULL)) {
+		pr_perror("cgroupd: can't unblock SIGTERM");
+		return -1;
+	}
+
+	return 0;
+}
+
 /*
  * If a thread is a different cgroup set than the main thread in process,
  * it means it is in a threaded controller. This daemon receives the cg_set
@@ -1955,6 +1970,14 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
  */
 static int cgroupd(int sk)
 {
+	/*
+	 * This pairs with SIGTERM in stop_cgroupd(), and ensures that cgroupd
+	 * will receive termination signal, regardless of which signal block
+	 * mask was inherited.
+	 */
+	if (cgroupd_unblock_sigterm())
+		return -1;
+
 	pr_info("cgroud: Daemon started\n");
 
 	while (1) {

From ac22aaf5760ae670ae0a741c22173dfa22ef3baf Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 2 Jul 2024 23:30:31 -0700
Subject: [PATCH 1525/1854] apparmor: get_suspend_policy must return NULL in
 error cases

Before this fix, it could return MAP_FAILED which is ((void *) -1).

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/apparmor.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/apparmor.c b/criu/apparmor.c
index e46e239f5..48b639216 100644
--- a/criu/apparmor.c
+++ b/criu/apparmor.c
@@ -469,6 +469,7 @@ static void *get_suspend_policy(char *name, off_t *len)
 	ret = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (ret == MAP_FAILED) {
 		pr_perror("mmap of %s failed", file);
+		ret = NULL;
 		goto out;
 	}
 

From 18158381914031b8e72a7fd142ab4383c682f2f9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 3 Jul 2024 09:26:28 -0700
Subject: [PATCH 1526/1854] vdso: proxify the __vdso_clock_gettime64 function

It was added in v5.3-rc1~211^2~4^2~10.

Fixes #2390

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/arch/x86/include/asm/vdso.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/criu/arch/x86/include/asm/vdso.h b/criu/arch/x86/include/asm/vdso.h
index 3b3f292bd..ca46374a5 100644
--- a/criu/arch/x86/include/asm/vdso.h
+++ b/criu/arch/x86/include/asm/vdso.h
@@ -12,7 +12,7 @@
  * This is a minimal amount of symbols
  * we should support at the moment.
  */
-#define VDSO_SYMBOL_MAX	 6
+#define VDSO_SYMBOL_MAX	 7
 #define VDSO_SYMBOL_GTOD 2
 
 /*
@@ -42,11 +42,12 @@
 	const char *aarch_vdso_symbol3 = "__vdso_gettimeofday";  \
 	const char *aarch_vdso_symbol4 = "__vdso_time";          \
 	const char *aarch_vdso_symbol5 = "__kernel_sigreturn";   \
-	const char *aarch_vdso_symbol6 = "__kernel_rt_sigreturn";
+	const char *aarch_vdso_symbol6 = "__kernel_rt_sigreturn"; \
+	const char *aarch_vdso_symbol7 = "__vdso_clock_gettime64"; \
 
 #define ARCH_VDSO_SYMBOLS                                                                                   \
 	aarch_vdso_symbol1, aarch_vdso_symbol2, aarch_vdso_symbol3, aarch_vdso_symbol4, aarch_vdso_symbol5, \
-		aarch_vdso_symbol6
+		aarch_vdso_symbol6, aarch_vdso_symbol7
 
 /*	"__kernel_vsyscall",			*/
 

From 42b177da62838fefd0ea75d92e396636ce040fff Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 7 Jul 2024 13:24:19 +0100
Subject: [PATCH 1527/1854] scripts/build: drop centos 7 targets

The CI tests with CentOS 7 have been disabled and removed [1,2].
This patch removes the obsolete Makefile targets for these tests.

[1] https://github.com/checkpoint-restore/criu/commit/24bc083653f7d2b984653194e921b1ff32292b3b
[2] https://github.com/checkpoint-restore/criu/commit/f8466ca798acd124eebbba2655894ebd2f777879

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Makefile | 2 +-
 scripts/ci/Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 2c006ad87..bc4a59db1 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,4 +1,4 @@
-ARCHES := x86_64 fedora-asan fedora-rawhide centos7 armv7hf centos8
+ARCHES := x86_64 fedora-asan fedora-rawhide armv7hf centos8
 STABLE_CROSS_ARCHES := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross
 UNSTABLE_CROSS_ARCHES := armv7-unstable-cross aarch64-unstable-cross ppc64-unstable-cross mips64el-unstable-cross
 NON_CLANG := $(UNSTABLE_CROSS_ARCHES) $(STABLE_CROSS_ARCHES)
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 1caa1e423..9dc0190b3 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -11,7 +11,7 @@ ifdef CLANG
 	target-suffix = -clang
 endif
 
-TARGETS := alpine fedora-rawhide centos7 centos8 archlinux
+TARGETS := alpine fedora-rawhide centos8 archlinux
 ZDTM_OPTS :=
 UNAME := $(shell uname -m)
 export UNAME

From 4f45572fde61c12b54c73a12d4c584f57dd6492c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 8 Jul 2024 19:31:38 -0700
Subject: [PATCH 1528/1854] util: use close_range when it's supported

close_range is faster than reading /proc/self/fd and closing descriptors
one by one.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .../arch/arm/plugins/std/syscalls/syscall.def |  1 +
 .../mips/plugins/std/syscalls/syscall_64.tbl  |  1 +
 .../plugins/std/syscalls/syscall-ppc64.tbl    |  1 +
 .../plugins/std/syscalls/syscall-s390.tbl     |  1 +
 .../x86/plugins/std/syscalls/syscall_32.tbl   |  1 +
 .../x86/plugins/std/syscalls/syscall_64.tbl   |  1 +
 criu/include/kerndat.h                        |  1 +
 criu/include/util.h                           |  2 ++
 criu/kerndat.c                                | 25 +++++++++++++++++++
 criu/util.c                                   | 14 +++++++++++
 10 files changed, 48 insertions(+)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 217e346a3..9a33009eb 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -118,6 +118,7 @@ fsopen				430	430	(char *fsname, unsigned int flags)
 fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
 clone3				435	435	(struct clone_args *uargs, size_t size)
+close_range			436	436	(unsigned int fd, unsigned int max_fd, unsigned int flags)
 pidfd_open			434	434	(pid_t pid, unsigned int flags)
 openat2				437	437	(int dirfd, char *pathname, struct open_how *how, size_t size)
 pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 9f50d5e8a..85faca5a9 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -115,6 +115,7 @@ __NR_fsopen			5430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			5431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			5432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			5435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_close_range		5436		sys_close_range		(unsigned int fd, unsigned int max_fd, unsigned int flags)
 __NR_pidfd_open			5434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2			5437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		5438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index 4c9b75cf1..c56b4e6de 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -114,6 +114,7 @@ __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_close_range	436		sys_close_range		(unsigned int fd, unsigned int max_fd, unsigned int flags)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index af7d550e2..018d58a59 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -114,6 +114,7 @@ __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_close_range	436		sys_close_range		(unsigned int fd, unsigned int max_fd, unsigned int flags)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
index ab36a5cd6..cc23dc3f3 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_32.tbl
@@ -102,6 +102,7 @@ __NR_fsopen		430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig		431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount		432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3		435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_close_range	436		sys_close_range		(unsigned int fd, unsigned int max_fd, unsigned int flags)
 __NR_pidfd_open		434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd	438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 4e843bee9..7fbfd69ad 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -113,6 +113,7 @@ __NR_fsopen			430		sys_fsopen		(char *fsname, unsigned int flags)
 __NR_fsconfig			431		sys_fsconfig		(int fd, unsigned int cmd, const char *key, const char *value, int aux)
 __NR_fsmount			432		sys_fsmount		(int fd, unsigned int flags, unsigned int attr_flags)
 __NR_clone3			435		sys_clone3		(struct clone_args *uargs, size_t size)
+__NR_close_range		436		sys_close_range		(unsigned int fd, unsigned int max_fd, unsigned int flags)
 __NR_pidfd_open			434		sys_pidfd_open		(pid_t pid, unsigned int flags)
 __NR_openat2		437		sys_openat2		(int dirfd, char *pathname, struct open_how *how, size_t size)
 __NR_pidfd_getfd		438		sys_pidfd_getfd		(int pidfd, int targetfd, unsigned int flags)
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 41524ed66..e03a57341 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -88,6 +88,7 @@ struct kerndat_s {
 	bool has_membarrier_get_registrations;
 	bool has_pagemap_scan;
 	bool has_shstk;
+	bool has_close_range;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/util.h b/criu/include/util.h
index 4334e69c2..9037dc9e6 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -411,4 +411,6 @@ extern void util_init(void);
 
 extern char *resolve_mountpoint(char *path);
 
+extern int cr_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/kerndat.c b/criu/kerndat.c
index f899ef642..1a584fe92 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1699,6 +1699,27 @@ static int kerndat_has_membarrier_get_registrations(void)
 	return 0;
 }
 
+static int kerndat_has_close_range(void)
+{
+	/* fd is greater than max_fd, so close_range should return EINVAL. */
+	if (cr_close_range(2, 1, 0) == 0) {
+		pr_err("close_range succeeded unexpectedly\n");
+		return -1;
+	}
+
+	if (errno == ENOSYS) {
+		pr_debug("close_range isn't supported\n");
+		return 0;
+	}
+	if (errno != EINVAL) {
+		pr_perror("close_range returned unexpected error code");
+		return -1;
+	}
+
+	kdat.has_close_range = true;
+	return 0;
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the
@@ -1956,6 +1977,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_shstk failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_close_range()) {
+		pr_err("kerndat_has_close_range has failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/util.c b/criu/util.c
index 95ba0feda..d74c2aeef 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -54,6 +54,7 @@
 #include "action-scripts.h"
 
 #include "compel/infect-util.h"
+#include <compel/plugins/std/syscall-codes.h>
 
 #define VMA_OPT_LEN 128
 
@@ -518,12 +519,25 @@ int cr_system(int in, int out, int err, char *cmd, char *const argv[], unsigned
 	return cr_system_userns(in, out, err, cmd, argv, flags, -1);
 }
 
+int cr_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
+{
+	return syscall(__NR_close_range, fd, max_fd, flags);
+}
+
 static int close_fds(int minfd)
 {
 	DIR *dir;
 	struct dirent *de;
 	int fd, ret, dfd;
 
+	if (kdat.has_close_range) {
+		if (cr_close_range(minfd, ~0, 0)) {
+			pr_perror("close_range failed");
+			return -1;
+		}
+		return 0;
+	}
+
 	dir = opendir("/proc/self/fd");
 	if (dir == NULL) {
 		pr_perror("Can't open /proc/self/fd");

From b9081ca56bd7b56f59231fcc962c64fedca4d4ee Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Fri, 12 Jul 2024 23:30:35 +0700
Subject: [PATCH 1529/1854] zdtm: make cgroup testcases run non-parallel

cgroup testcases live in the same cgroup root zdtmtst and
zdtmtst.defaultroot controller then create child subgroup for testing. This
can cause problems when cgroup testcases run in parallel. For example,
testcase A dumps the child subgroup of testcase B since it's in the cgroup
root but in the middle of restoring of testcase A, testcase B completes and
cleans up the subgroup directory. This causes error in testcase A restore.
This commit adds excl flag to all cgroup testcases description so that
these don't run parallel.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 test/zdtm/static/cgroup00.desc       | 2 +-
 test/zdtm/static/cgroup01.desc       | 2 +-
 test/zdtm/static/cgroup02.desc       | 2 +-
 test/zdtm/static/cgroup_threads.desc | 2 +-
 test/zdtm/static/cgroup_yard.desc    | 2 +-
 test/zdtm/static/cgroupns.desc       | 2 +-
 test/zdtm/static/cgroupv2_00.desc    | 2 +-
 test/zdtm/static/cgroupv2_01.desc    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/zdtm/static/cgroup00.desc b/test/zdtm/static/cgroup00.desc
index 3c6c4a7e2..42a3f2b73 100644
--- a/test/zdtm/static/cgroup00.desc
+++ b/test/zdtm/static/cgroup00.desc
@@ -1 +1 @@
-{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
+{'flavor': 'h', 'flags': 'suid excl', 'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cgroup01.desc b/test/zdtm/static/cgroup01.desc
index 3c6c4a7e2..42a3f2b73 100644
--- a/test/zdtm/static/cgroup01.desc
+++ b/test/zdtm/static/cgroup01.desc
@@ -1 +1 @@
-{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
+{'flavor': 'h', 'flags': 'suid excl', 'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cgroup02.desc b/test/zdtm/static/cgroup02.desc
index df17a5789..eb5a9dd37 100644
--- a/test/zdtm/static/cgroup02.desc
+++ b/test/zdtm/static/cgroup02.desc
@@ -1,4 +1,4 @@
 {   'dopts': '--manage-cgroups --cgroup-root name=zdtmtst:/prefix',
-    'flags': 'suid',
+    'flags': 'suid excl',
     'flavor': 'h',
     'ropts': '--manage-cgroups --cgroup-root /newroot --cgroup-root name=zdtmtst:/prefix'}
diff --git a/test/zdtm/static/cgroup_threads.desc b/test/zdtm/static/cgroup_threads.desc
index 3c6c4a7e2..42a3f2b73 100644
--- a/test/zdtm/static/cgroup_threads.desc
+++ b/test/zdtm/static/cgroup_threads.desc
@@ -1 +1 @@
-{'flavor': 'h', 'flags': 'suid', 'opts': '--manage-cgroups'}
+{'flavor': 'h', 'flags': 'suid excl', 'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cgroup_yard.desc b/test/zdtm/static/cgroup_yard.desc
index 8736d6780..9ad4a9b57 100644
--- a/test/zdtm/static/cgroup_yard.desc
+++ b/test/zdtm/static/cgroup_yard.desc
@@ -1,6 +1,6 @@
 {
 'flavor': 'h',
-'flags': 'suid',
+'flags': 'suid excl',
 # We create the external cgroup yard in working directory during --pre-dump
 # hook. We have to go up a few directories to find the yard.
 'opts': '--manage-cgroups --cgroup-yard ../../../../../../external_yard'
diff --git a/test/zdtm/static/cgroupns.desc b/test/zdtm/static/cgroupns.desc
index 80dd710e1..dc61e36cf 100644
--- a/test/zdtm/static/cgroupns.desc
+++ b/test/zdtm/static/cgroupns.desc
@@ -1,4 +1,4 @@
 {   'feature': 'cgroupns',
-    'flags': 'suid',
+    'flags': 'suid excl',
     'flavor': 'h',
     'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cgroupv2_00.desc b/test/zdtm/static/cgroupv2_00.desc
index 4bfd4b265..e70c84df8 100644
--- a/test/zdtm/static/cgroupv2_00.desc
+++ b/test/zdtm/static/cgroupv2_00.desc
@@ -1 +1 @@
-{'flavor': 'h ns', 'flags': 'suid', 'opts': '--manage-cgroups=full'}
+{'flavor': 'h ns', 'flags': 'suid excl', 'opts': '--manage-cgroups=full'}
diff --git a/test/zdtm/static/cgroupv2_01.desc b/test/zdtm/static/cgroupv2_01.desc
index 4bfd4b265..e70c84df8 100644
--- a/test/zdtm/static/cgroupv2_01.desc
+++ b/test/zdtm/static/cgroupv2_01.desc
@@ -1 +1 @@
-{'flavor': 'h ns', 'flags': 'suid', 'opts': '--manage-cgroups=full'}
+{'flavor': 'h ns', 'flags': 'suid excl', 'opts': '--manage-cgroups=full'}

From 089345f77a34d1bc7ef146d650636afcd3cdda21 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 10 Jul 2024 18:34:50 +0200
Subject: [PATCH 1530/1854] Adjust to glibc __rseq_size semantic change

In commit 2e456ccf0c34a056e3ccafac4a0c7effef14d918 ("Linux: Make
__rseq_size useful for feature detection (bug 31965)") glibc 2.40
changed the meaning of __rseq_size slightly: it is now the size
of the active/feature area (20 bytes initially), and not the size
of the entire initially defined struct (32 bytes including padding).
The reason for the change is that the size including padding does not
allow detection of newly added features while previously unused
padding is consumed.

The prep_libc_rseq_info change in criu/cr-restore.c is not necessary
on kernels which have full ptrace support for obtaining rseq
information because the code is not used.  On older kernels, it is
a correctness fix because with size 20 (the new value), rseq
registeration would fail.

The two other changes are required to make rseq unregistration work
in tests.

Signed-off-by: Florian Weimer <fweimer@redhat.com>
---
 criu/cr-restore.c             | 8 ++++++++
 test/zdtm/static/rseq00.c     | 5 ++++-
 test/zdtm/transition/rseq01.c | 5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 4db2f4ecf..b95d4f134 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2618,7 +2618,15 @@ static void prep_libc_rseq_info(struct rst_rseq_param *rseq)
 	if (!kdat.has_ptrace_get_rseq_conf) {
 #if defined(__GLIBC__) && defined(RSEQ_SIG)
 		rseq->rseq_abi_pointer = encode_pointer(__criu_thread_pointer() + __rseq_offset);
+		/*
+		 * Current glibc reports the feature/active size in
+		 * __rseq_size, not the size passed to the kernel.
+		 * This could be 20, but older kernels expect 32 for
+		 * the size argument even if only 20 bytes are used.
+		 */
 		rseq->rseq_abi_size = __rseq_size;
+		if (rseq->rseq_abi_size < 32)
+			rseq->rseq_abi_size = 32;
 		rseq->signature = RSEQ_SIG;
 #else
 		rseq->rseq_abi_pointer = 0;
diff --git a/test/zdtm/static/rseq00.c b/test/zdtm/static/rseq00.c
index 471ad6a43..7add7801e 100644
--- a/test/zdtm/static/rseq00.c
+++ b/test/zdtm/static/rseq00.c
@@ -46,12 +46,15 @@ static inline void *__criu_thread_pointer(void)
 static inline void unregister_glibc_rseq(void)
 {
 	struct rseq *rseq = (struct rseq *)((char *)__criu_thread_pointer() + __rseq_offset);
+	unsigned int size = __rseq_size;
 
 	/* hack: mark glibc rseq structure as failed to register */
 	rseq->cpu_id = RSEQ_CPU_ID_REGISTRATION_FAILED;
 
 	/* unregister rseq */
-	syscall(__NR_rseq, (void *)rseq, __rseq_size, 1, RSEQ_SIG);
+	if (__rseq_size < 32)
+		size = 32;
+	syscall(__NR_rseq, (void *)rseq, size, 1, RSEQ_SIG);
 }
 #else
 static inline void unregister_glibc_rseq(void)
diff --git a/test/zdtm/transition/rseq01.c b/test/zdtm/transition/rseq01.c
index 0fbcc2dca..08a7a8e1a 100644
--- a/test/zdtm/transition/rseq01.c
+++ b/test/zdtm/transition/rseq01.c
@@ -33,7 +33,10 @@ static inline void *thread_pointer(void)
 static inline void unregister_old_rseq(void)
 {
 	/* unregister rseq */
-	syscall(__NR_rseq, (void *)((char *)thread_pointer() + __rseq_offset), __rseq_size, 1, RSEQ_SIG);
+	unsigned int size = __rseq_size;
+	if (__rseq_size < 32)
+		size = 32;
+	syscall(__NR_rseq, (void *)((char *)thread_pointer() + __rseq_offset), size, 1, RSEQ_SIG);
 }
 #else
 static inline void unregister_old_rseq(void)

From 5783706d57cb2121cd96c378eaa9b448d9ee38aa Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 9 Jul 2024 12:22:25 +0100
Subject: [PATCH 1531/1854] docs: update amdgpu-plugin man page

This patch updates the dependencies section of the AMDGPU plugin man
page to reflect that the plugin has been merged upstream and to fix a
formatting issue.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/criu-amdgpu-plugin.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Documentation/criu-amdgpu-plugin.txt b/Documentation/criu-amdgpu-plugin.txt
index 35321a915..68803f3db 100644
--- a/Documentation/criu-amdgpu-plugin.txt
+++ b/Documentation/criu-amdgpu-plugin.txt
@@ -27,14 +27,10 @@ to criu to allow Checkpoint / Restore with ROCm.
 
 
 Dependencies
-~~~~~~~~~~~~~~
+------------
 *amdkfd support*::
     In order to snapshot the *VRAM* and other *GPU* device states, we require
-    an updated version of amdkfd(amdgpu) driver. The kernel patches are under
-    review currently.
-
-*criu 3.16*::
-    This work is rebased on latest criu release available at this time.
+    an updated version of amdkfd(amdgpu) driver.
 
 OPTIONS
 -------

From fcbadfbdbf3ffcefeae7c7b92d96761c23fdc8e5 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 10 Jul 2024 03:30:34 +0100
Subject: [PATCH 1532/1854] plugins: set executable bit on .so files

For historical reasons, some tools like rpm [1] or ldd [2,3]
may expect the executable bit to be present for the correct
identification of shared libraries. The executable bit on .so
files is set by default by compilers (e.g., GCC). It is not
strictly necessary but primarily a convention.

[1] https://docs.fedoraproject.org/en-US/package-maintainers/CommonRpmlintIssues/#unstripped_binary_or_object
[2] https://sourceware.org/git/?p=glibc.git;a=blob;f=elf/ldd.bash.in;h=d6b640df;hb=HEAD#l154

[3] $ sudo ldd /usr/lib/criu/*.so
/usr/lib/criu/amdgpu_plugin.so:
ldd: warning: you do not have execution permission for `/usr/lib/criu/amdgpu_plugin.so'
	linux-vdso.so.1 (0x00007fd0a2a3e000)
	libdrm.so.2 => /lib64/libdrm.so.2 (0x00007fd0a29eb000)
	libdrm_amdgpu.so.1 => /lib64/libdrm_amdgpu.so.1 (0x00007fd0a29de000)
	libc.so.6 => /lib64/libc.so.6 (0x00007fd0a27fc000)
	/lib64/ld-linux-x86-64.so.2 (0x00007fd0a2a40000)
/usr/lib/criu/cuda_plugin.so:
ldd: warning: you do not have execution permission for `/usr/lib/criu/cuda_plugin.so'
	linux-vdso.so.1 (0x00007f1806e13000)
	libc.so.6 => /lib64/libc.so.6 (0x00007f1806c08000)
	/lib64/ld-linux-x86-64.so.2 (0x00007f1806e15000)

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/Makefile | 2 +-
 plugins/cuda/Makefile   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 5efa8fb0b..6dad00122 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -54,7 +54,7 @@ install:
 ifeq ($(CONFIG_AMDGPU),y)
 	$(Q) mkdir -p $(DESTDIR)$(PLUGINDIR)
 	$(E) "  INSTALL " $(PLUGIN_NAME)
-	$(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
+	$(Q) install -m 755 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
 endif
 .PHONY: install
 
diff --git a/plugins/cuda/Makefile b/plugins/cuda/Makefile
index e337056dc..cc3d98ac9 100644
--- a/plugins/cuda/Makefile
+++ b/plugins/cuda/Makefile
@@ -31,11 +31,10 @@ mrproper: clean
 install:
 	$(Q) mkdir -p $(DESTDIR)$(PLUGINDIR)
 	$(E) "  INSTALL " $(PLUGIN_NAME)
-	$(Q) install -m 644 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
+	$(Q) install -m 755 $(PLUGIN_SOBJ) $(DESTDIR)$(PLUGINDIR)
 .PHONY: install
 
 uninstall:
 	$(E) " UNINSTALL" $(PLUGIN_NAME)
 	$(Q) $(RM) $(DESTDIR)$(PLUGINDIR)/$(PLUGIN_SOBJ)
 .PHONY: uninstall
-

From 21108b40de1f0ba62c13dca693897c6ef6ac3c62 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sat, 20 Jul 2024 21:14:23 -0700
Subject: [PATCH 1533/1854] test/zdtm: mount a new tmpfs to the zdtm root /dev

The current file system can be mounted with nodev.

Fixes #2441

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/others/mnt-ext-dev/run.sh |  2 --
 test/zdtm.py                   | 62 ++++++++++++++++++++++++++--------
 test/zdtm/lib/ns.c             | 15 +++++++-
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/test/others/mnt-ext-dev/run.sh b/test/others/mnt-ext-dev/run.sh
index 3f6163e08..5cdbc45a8 100755
--- a/test/others/mnt-ext-dev/run.sh
+++ b/test/others/mnt-ext-dev/run.sh
@@ -8,8 +8,6 @@ truncate -s 0 zdtm.loop
 truncate -s 50M zdtm.loop
 mkfs.ext4 -F zdtm.loop
 dev=`losetup --find --show zdtm.loop`
-mkdir -p ../../dev
-cp -ap $dev ../../dev
 export ZDTM_MNT_EXT_DEV=$dev
 python3 ../../zdtm.py run $EXTRA_OPTS -t zdtm/static/mnt_ext_dev || ret=$?
 losetup -d $dev
diff --git a/test/zdtm.py b/test/zdtm.py
index df23ea03d..102f384c0 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -74,7 +74,10 @@ tests_root = None
 def clean_tests_root():
     global tests_root
     if tests_root and tests_root[0] == os.getpid():
+        subprocess.call(["./umount2", os.path.join(tests_root[1], "dev")])
+        os.rmdir(os.path.join(tests_root[1], "root/root"))
         os.rmdir(os.path.join(tests_root[1], "root"))
+        os.rmdir(os.path.join(tests_root[1], "dev"))
         os.rmdir(tests_root[1])
 
 
@@ -85,8 +88,18 @@ def make_tests_root():
         tests_root = (os.getpid(), tempfile.mkdtemp("", "criu-root-", tmpdir))
         atexit.register(clean_tests_root)
         os.mkdir(os.path.join(tests_root[1], "root"))
-    os.chmod(tests_root[1], 0o777)
-    return os.path.join(tests_root[1], "root")
+        os.mkdir(os.path.join(tests_root[1], "root", "root"))
+        # The current file system can be mounted with nodev, so let's create a
+        # new tmpfs mount for /dev.
+        devpath = os.path.join(tests_root[1], "dev")
+        os.mkdir(devpath)
+        # zdtm wants to create files on this mount. User namespace tests are
+        # running with custom user and group mappings.
+        subprocess.check_call(["mount", "-t", "tmpfs", "criu-test-dev", devpath])
+        os.chmod(devpath, 0o777)
+    os.chmod(tests_root[1], 0o755)
+    os.chmod(os.path.join(tests_root[1], "root"), 0o755)
+    return os.path.join(tests_root[1], "root", "root"), os.path.join(tests_root[1], "dev")
 
 
 # Report generation
@@ -182,15 +195,16 @@ class host_flavor:
 
 class ns_flavor:
     __root_dirs = [
-        "/bin", "/sbin", "/etc", "/lib", "/lib64", "/dev", "/dev/pts",
-        "/dev/net", "/tmp", "/usr", "/proc", "/run"
+        "/bin", "/sbin", "/etc", "/lib", "/lib64", "/dev",
+        "/tmp", "/usr", "/proc", "/run"
     ]
+    __dev_dirs = ["pts", "net"]
 
     def __init__(self, opts):
         self.name = "ns"
         self.ns = True
         self.uns = False
-        self.root = make_tests_root()
+        self.root, self.devpath = make_tests_root()
         self.root_mounted = False
 
     def __copy_one(self, fname):
@@ -236,16 +250,19 @@ class ns_flavor:
             self.__copy_one(lib)
 
     def __mknod(self, name, rdev=None):
-        name = "/dev/" + name
+        tdev = stat.S_IFCHR
         if not rdev:
-            if not os.access(name, os.F_OK):
+            if not os.access(os.path.join("/dev", name), os.F_OK):
                 print("Skipping %s at root" % name)
                 return
             else:
-                rdev = os.stat(name).st_rdev
+                s = os.stat(os.path.join("/dev", name))
+                rdev = s.st_rdev
+                if stat.S_ISBLK(s.st_mode):
+                    tdev = stat.S_IFBLK
 
-        name = self.root + name
-        os.mknod(name, stat.S_IFCHR, rdev)
+        name = os.path.join(self.devpath, name)
+        os.mknod(name, tdev, rdev)
         os.chmod(name, 0o666)
 
     def __construct_root(self):
@@ -256,11 +273,18 @@ class ns_flavor:
         for ldir in ["/bin", "/sbin", "/lib", "/lib64"]:
             os.symlink(".." + ldir, self.root + "/usr" + ldir)
 
+    def __construct_dev(self):
+        for dir in self.__dev_dirs:
+            os.mkdir(os.path.join(self.devpath, dir))
+            os.chmod(os.path.join(self.devpath, dir), 0o755)
         self.__mknod("tty", os.makedev(5, 0))
         self.__mknod("null", os.makedev(1, 3))
         self.__mknod("net/tun")
         self.__mknod("rtc")
         self.__mknod("autofs", os.makedev(10, 235))
+        ext_dev = os.getenv("ZDTM_MNT_EXT_DEV")
+        if ext_dev:
+            self.__mknod(os.path.basename(ext_dev))
 
     def __copy_deps(self, deps):
         for d in deps.split('|'):
@@ -283,6 +307,9 @@ class ns_flavor:
                     self.__construct_root()
                     os.mknod(self.root + "/.constructed", stat.S_IFREG | 0o600)
 
+        if not os.access(self.devpath + "/.constructed", os.F_OK):
+            self.__construct_dev()
+            os.mknod(self.devpath + "/.constructed", stat.S_IFREG | 0o600)
         for b in l_bins:
             self.__copy_libs(b)
         for b in x_bins:
@@ -480,6 +507,7 @@ class zdtm_test:
         if self.__flavor.ns:
             env['ZDTM_NEWNS'] = "1"
             env['ZDTM_ROOT'] = self.__flavor.root
+            env['ZDTM_DEV'] = self.__flavor.devpath
             env['PATH'] = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
             if self.__flavor.uns:
@@ -587,12 +615,18 @@ class zdtm_test:
         return opts
 
     def getdopts(self):
-        return self.__getcropts() + self.__freezer.getdopts(
-        ) + self.__desc.get('dopts', '').split()
+        opts = self.__getcropts() + self.__freezer.getdopts() + \
+            self.__desc.get('dopts', '').split()
+        if self.__flavor.ns:
+            opts += ["--external", "mnt[/dev]:ZDTM_DEV"]
+        return opts
 
     def getropts(self):
-        return self.__getcropts() + self.__freezer.getropts(
-        ) + self.__desc.get('ropts', '').split()
+        opts = self.__getcropts() + self.__freezer.getropts() + \
+            self.__desc.get('ropts', '').split()
+        if self.__flavor.ns:
+            opts += ["--external", "mnt[ZDTM_DEV]:%s" % self.__flavor.devpath]
+        return opts
 
     def unlink_pidfile(self):
         self.__pid = 0
diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 6f6cccc99..205938d20 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -27,7 +27,7 @@ extern int pivot_root(const char *new_root, const char *put_old);
 static int prepare_mntns(void)
 {
 	int dfd, ret;
-	char *root, *criu_path;
+	char *root, *criu_path, *dev_path;
 	char path[PATH_MAX];
 
 	root = getenv("ZDTM_ROOT");
@@ -51,6 +51,19 @@ static int prepare_mntns(void)
 		return -1;
 	}
 
+	dev_path = getenv("ZDTM_DEV");
+	if (dev_path) {
+		snprintf(path, sizeof(path), "%s/dev", root);
+		if (mount(dev_path, path, NULL, MS_BIND, NULL)) {
+			pr_perror("Unable to mount %s",  path);
+			return -1;
+		}
+		if (mount(NULL, path, NULL, MS_PRIVATE, NULL)) {
+			pr_perror("Unable to mount %s",  path);
+			return -1;
+		}
+	}
+
 	criu_path = getenv("ZDTM_CRIU");
 	if (criu_path) {
 		snprintf(path, sizeof(path), "%s%s", root, criu_path);

From 85050be66b4ea78f46a069dbd7981384728d0456 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 31 Jul 2024 23:32:30 +0200
Subject: [PATCH 1534/1854] seize: fix pause-devices plugin hook

The plugin hook "PAUSE_DEVICES" was recently introduced in the following
commit. This hook was intended to execute the cuda-checkpoint tool
before the process tree is frozen. However, the run_plugins() call has
been placed immediately *after* freeze_processes(). This causes the
cuda-checkpoint tool to hang indefinitely during the checkpointing
of CUDA applications running in containers, eventually leading to its
termination by the timeout alarm.

a85f488595e0a3a6e6cc6ca7c94d4a00b1341aaf
criu/plugin: Introduce new plugin hooks PAUSE_DEVICES and CHECKPOINT_DEVICES to be used during pstree collection

This problem can be reproduced with the following example:

sudo podman run -d --rm \
        --device nvidia.com/gpu=all --security-opt=label=disable \
        quay.io/radostin/cuda-counter

sudo podman container checkpoint -l -e /tmp/checkpoint.tar

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/seize.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index d392259bc..ae270022f 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -983,6 +983,11 @@ int collect_pstree(void)
 	 */
 	alarm(opts.timeout);
 
+	ret = run_plugins(PAUSE_DEVICES, pid);
+	if (ret < 0 && ret != -ENOTSUP) {
+		goto err;
+	}
+
 	if (opts.freeze_cgroup && cgroup_version())
 		goto err;
 
@@ -991,11 +996,6 @@ int collect_pstree(void)
 	if (opts.freeze_cgroup && freeze_processes())
 		goto err;
 
-	ret = run_plugins(PAUSE_DEVICES, pid);
-	if (ret < 0 && ret != -ENOTSUP) {
-		goto err;
-	}
-
 	if (!opts.freeze_cgroup && compel_interrupt_task(pid)) {
 		set_cr_errno(ESRCH);
 		goto err;

From c42b58f4fb2e05feaf0228f63d0fcf828cc2875c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 24 Jul 2024 11:30:59 +0100
Subject: [PATCH 1535/1854] plugin: enable multiple plugins for the same hook

CRIU provides two plugins for checkpoint/restore of GPU applications:
amdgpu and cuda. Both plugins use the `RESUME_DEVICES_LATE` hook to
enable restore:

    CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)
    CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, cuda_plugin_resume_devices_late)

However, CRIU currently does not support running more than one plugin
for the same hook. As a result, when both plugins are installed, the
resume function for CUDA applications is not executed. To fix this,
we need to make sure that both `plugin_resume_devices_late()` functions
return `-ENOTSUP` when restore is not supported.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c | 3 ++-
 plugins/cuda/cuda_plugin.c     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index a41469a50..b73b5101d 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1809,7 +1809,7 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
 	if (fd < 0) {
 		pr_perror("failed to open kfd in plugin");
-		return -1;
+		return -ENOTSUP;
 	}
 
 	args.pid = target_pid;
@@ -1818,6 +1818,7 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
 		if (errno == ESRCH) {
 			pr_info("Pid %d has no kfd process info\n", target_pid);
+			exit_code = -ENOTSUP;
 		} else {
 			pr_perror("restore late ioctl failed");
 			exit_code = -1;
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index b3f2fc8df..f16c4c505 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -408,7 +408,7 @@ interrupt:
 int cuda_plugin_resume_devices_late(int pid)
 {
 	if (plugin_disabled) {
-		return 0;
+		return -ENOTSUP;
 	}
 
 	return resume_device(pid, 1);

From 8437663cc644af6dde39e371a24c45ea6b681c3c Mon Sep 17 00:00:00 2001
From: liuchao173 <liuchao173@huawei.com>
Date: Thu, 8 Aug 2024 20:55:42 +0800
Subject: [PATCH 1536/1854] delete redundant include header files

restorer.h has been included in line 43.

Fixes: 22963d282729 ("Hide asm/restorer.h from sources")

Signed-off-by: liuchao173 <liuchao173@huawei.com>
---
 criu/pie/restorer.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 7c34c06d4..51ed6ed4c 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -49,7 +49,6 @@
 #include "images/inventory.pb-c.h"
 
 #include "shmem.h"
-#include "restorer.h"
 
 /*
  * sys_getgroups() buffer size. Not too much, to avoid stack overflow.

From 9a85fb6382acb219eed7f72745ad136425ba60a5 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 7 Jul 2024 16:04:36 +0100
Subject: [PATCH 1537/1854] ci/podman: show criu logs in case of error

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/podman-test.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 72ad59a50..3198589f5 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -24,6 +24,9 @@ podman info
 
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
 
+# Show criu logs in case of error
+trap 'cat /var/lib/containers/storage/overlay-containers/*/userdata/*.log' EXIT
+
 sleep 1
 for i in $(seq 20); do
 	echo "Test $i for podman container checkpoint"
@@ -64,3 +67,5 @@ for i in $(seq 20); do
 	podman ps -a
 	rm -f /tmp/chkpt.tar.gz
 done
+
+trap 'echo PASS' EXIT
\ No newline at end of file

From 4dde52a308057a7e392173d6f0c73141b0536989 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 7 Jul 2024 16:07:59 +0100
Subject: [PATCH 1538/1854] ci/podman: show mounts

Show information about mounts available on the host filesystem.
This is useful for debugging.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/podman-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index 3198589f5..185783011 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -20,6 +20,7 @@ sed -i 's/#runtime\s*=\s*.*/runtime = "runc"/' /usr/share/containers/containers.
 # Test checkpoint/restore with action script
 echo "action-script /usr/bin/true" | sudo tee /etc/criu/default.conf
 
+cat /proc/self/mountinfo
 podman info
 
 podman run --name cr -d docker.io/library/alpine /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'

From fde0b7ac69c5b604fc8745341d16d2a494674cbc Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 8 Jul 2024 16:53:39 +0100
Subject: [PATCH 1539/1854] cuda: don't leak fds to cuda-checkpoint

Leaking open file descriptors to third-party tools can lead
to security risks.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/include/util.h        | 1 +
 criu/util.c                | 2 +-
 plugins/cuda/cuda_plugin.c | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/criu/include/util.h b/criu/include/util.h
index 9037dc9e6..435469e1e 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -170,6 +170,7 @@ extern pid_t fork_and_ptrace_attach(int (*child_setup)(void));
 extern int cr_daemon(int nochdir, int noclose, int close_fd);
 extern int status_ready(void);
 extern int is_root_user(void);
+extern int close_fds(int minfd);
 
 extern int set_proc_self_fd(int fd);
 
diff --git a/criu/util.c b/criu/util.c
index d74c2aeef..7dfa1fe42 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -524,7 +524,7 @@ int cr_close_range(unsigned int fd, unsigned int max_fd, unsigned int flags)
 	return syscall(__NR_close_range, fd, max_fd, flags);
 }
 
-static int close_fds(int minfd)
+int close_fds(int minfd)
 {
 	DIR *dir;
 	struct dirent *de;
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index f16c4c505..e44b4d007 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -115,7 +115,9 @@ static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 		if (dup2(fd[WRITE], STDERR_FILENO) == -1) {
 			return -1;
 		}
-		close(fd[READ]);
+
+		close_fds(STDERR_FILENO + 1);
+
 		return execvp(args[0], (char **)args);
 	} else { // parent
 		close(fd[WRITE]);

From ad66c27a113b9a37610f8aba686387f5734f5366 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 7 Jul 2024 18:48:30 +0100
Subject: [PATCH 1540/1854] cuda: fix launch cuda-checkpoint

When the cuda-checkpoint tool is not installed, execvp() is expected to
fail and return -1. In this case, we need to call exit() to terminate
the child process that was created earlier with fork().

Since CRIU can be used with applications that do not use CUDA, even
when the CUDA plugin is installed, this patch also updates the log
messages to show debug and warning (instead of error) when the
cuda-checkpoint tool is not found in $PATH.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 plugins/cuda/cuda_plugin.c | 141 ++++++++++++++++++++++++-------------
 1 file changed, 92 insertions(+), 49 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index e44b4d007..39c78e370 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -45,7 +45,7 @@ struct pid_info {
 /* Used to track which PID's we've paused CUDA operations on so far so we can
  * release them after we're done with the DUMP
  */
-struct list_head cuda_pids;
+static LIST_HEAD(cuda_pids);
 
 static void dealloc_pid_buffer(struct list_head *pid_buf)
 {
@@ -91,7 +91,7 @@ static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 {
 #define READ  0
 #define WRITE 1
-	int fd[2];
+	int fd[2], buf_off;
 
 	if (pipe(fd) != 0) {
 		pr_err("Couldn't create pipes for reading cuda-checkpoint output\n");
@@ -110,68 +110,103 @@ static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 
 	if (child_pid == 0) { // child
 		if (dup2(fd[WRITE], STDOUT_FILENO) == -1) {
-			return -1;
+			pr_perror("unable to clone fd %d->%d", fd[WRITE], STDOUT_FILENO);
+			_exit(EXIT_FAILURE);
 		}
 		if (dup2(fd[WRITE], STDERR_FILENO) == -1) {
-			return -1;
+			pr_perror("unable to clone fd %d->%d", fd[WRITE], STDERR_FILENO);
+			_exit(EXIT_FAILURE);
 		}
+		close(fd[READ]);
 
 		close_fds(STDERR_FILENO + 1);
 
-		return execvp(args[0], (char **)args);
-	} else { // parent
-		close(fd[WRITE]);
+		execvp(args[0], (char **)args);
 
-		int bytes_read = read(fd[READ], buf, buf_size);
-		if (bytes_read > 0) {
-			buf[bytes_read - 1] = '\0';
-		}
+		/* We can't use pr_error() as log file fd is closed. */
+		fprintf(stderr, "execvp(\"%s\") failed: %s\n", args[0], strerror(errno));
 
-		// Clear out any of the remaining output in the pipe in case the buffer wasn't large enough
-		struct pollfd read_poll = { .fd = fd[READ], .events = POLLIN | POLLHUP };
-		while (true) {
-			int poll_status = poll(&read_poll, 1, -1);
-			if (poll_status == -1) {
-				close(fd[READ]);
-				pr_err("Unexpected error when clearing cuda-checkpoint output buffer\n");
-				return -1;
-			}
-			if (read_poll.revents & POLLHUP) {
-				break;
-			}
-			// POLLIN, read into scratch buffer to flush things out
-			char scratch[64];
-			bytes_read = read(fd[READ], scratch, sizeof(scratch));
-		}
-
-		int status;
-		if (waitpid(child_pid, &status, 0) == -1 || !WIFEXITED(status)) {
-			pr_err("cuda-checkpoint exited improperly, couldn't complete operation\n");
-			close(fd[READ]);
-			return -1;
-		}
-
-		close(fd[READ]);
-
-		return WEXITSTATUS(status);
+		_exit(EXIT_FAILURE);
 	}
+
+	close(fd[WRITE]);
+	buf_off = 0;
+	/* Reserve one byte for the null charracter. */
+	buf_size--;
+	while (buf_off < buf_size) {
+		int bytes_read;
+		bytes_read = read(fd[READ], buf + buf_off, buf_size - buf_off);
+		if (bytes_read == -1) {
+			pr_perror("Unable to read output of cuda-checkpoint");
+			goto err;
+		}
+		if (bytes_read == 0)
+			break;
+		buf_off += bytes_read;
+	}
+	buf[buf_off] = '\0';
+
+	/* Clear out any of the remaining output in the pipe in case the buffer wasn't large enough */
+	while (true) {
+		char scratch[1024];
+		int bytes_read;
+		bytes_read = read(fd[READ], scratch, sizeof(scratch));
+		if (bytes_read == -1) {
+			pr_perror("Unable to read output of cuda-checkpoint");
+			goto err;
+		}
+		if (bytes_read == 0)
+			break;
+	}
+	close(fd[READ]);
+
+	int status, exit_code = -1;
+	if (waitpid(child_pid, &status, 0) == -1) {
+		pr_perror("Unable to wait for the cuda-checkpoint process %d", child_pid);
+		goto err;
+	}
+	if (WIFSIGNALED(status)) {
+		int sig = WTERMSIG(status);
+
+		pr_err("cuda-checkpoint unexpectedly signaled with %d: %s\n", sig, strsignal(sig));
+	} else if (WIFEXITED(status)) {
+		exit_code = WEXITSTATUS(status);
+	} else {
+		pr_err("cuda-checkpoint exited improperly: %u\n", status);
+	}
+
+	if (exit_code != EXIT_SUCCESS)
+		pr_debug("cuda-checkpoint output ===>\n%s\n"
+			 "<=== cuda-checkpoint output\n",
+			 buf);
+
+	return exit_code;
+err:
+	kill(child_pid, SIGKILL);
+	waitpid(child_pid, NULL, 0);
+	return -1;
 }
 
-static bool cuda_checkpoint_supports_flag(const char *flag)
+/**
+ * Checks if a given flag is supported by the cuda-checkpoint utility
+ *
+ * Returns:
+ *  1 if the flag is supported,
+ *  0 if the flag is not supported,
+ *  -1 if there was an error launching the cuda-checkpoint utility.
+ */
+static int cuda_checkpoint_supports_flag(const char *flag)
 {
 	char msg_buf[2048];
 	const char *args[] = { CUDA_CHECKPOINT, "-h", NULL };
-	int ret = launch_cuda_checkpoint(args, msg_buf, sizeof(msg_buf));
-	if (ret != 0) {
-		pr_err("Failed to launch cuda-checkpoint utility, check that the utility is present in your $PATH\n");
-		return false;
-	}
 
-	if (strstr(msg_buf, flag) == NULL) {
-		return false;
-	}
+	if (launch_cuda_checkpoint(args, msg_buf, sizeof(msg_buf)) != 0)
+		return -1;
 
-	return true;
+	if (strstr(msg_buf, flag) == NULL)
+		return 0;
+
+	return 1;
 }
 
 /* Retrieve the cuda restore thread TID from the root pid */
@@ -419,7 +454,15 @@ CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, cuda_plugin_resume_
 
 int cuda_plugin_init(int stage)
 {
-	if (!cuda_checkpoint_supports_flag("--action")) {
+	int ret = cuda_checkpoint_supports_flag("--action");
+
+	if (ret == -1) {
+		pr_warn("check that %s is present in $PATH\n", CUDA_CHECKPOINT);
+		plugin_disabled = true;
+		return 0;
+	}
+
+	if (ret == 0) {
 		pr_warn("cuda-checkpoint --action flag not supported, an r555 or higher version driver is required. Disabling CUDA plugin\n");
 		plugin_disabled = true;
 		return 0;

From 2453ed69a2fd01290200b861fb230b670ca4e19c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 7 Jul 2024 23:52:42 +0100
Subject: [PATCH 1541/1854] zdtm: add option to run tests with criu plugins

By default, if the "CRIU_LIBS_DIR" environment variable is not set,
CRIU will load all plugins installed in `/usr/lib/criu`. This may
result in running the ZDTM tests with plugins for a different version
of CRIU (e.g., installed from a package).

This patch updates ZDTM to always set the "CRIU_LIBS_DIR" environment
variable and use a local "plugins" directory. This directory contains
copies of the plugin files built from source. In addition, this patch
adds the `--criu-plugin` option to the `zdtm.py run` command, allowing
tests to be run with specified CRIU plugins.

Example:

  - Run test only with AMDGPU plugin
    ./zdtm.py run -t zdtm/static/busyloop00 --criu-plugin amdgpu

  - Run test only with CUDA plugin
    ./zdtm.py run -t zdtm/static/busyloop00 --criu-plugin cuda

  - Run test with both AMDGPU and CUDA plugins
    ./zdtm.py run -t zdtm/static/busyloop00 --criu-plugin amdgpu cuda

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/plugins/.gitignore |  1 +
 test/plugins/Makefile   | 18 ++++++++++++++++++
 test/zdtm.py            | 21 ++++++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 test/plugins/.gitignore
 create mode 100644 test/plugins/Makefile

diff --git a/test/plugins/.gitignore b/test/plugins/.gitignore
new file mode 100644
index 000000000..140f8cf80
--- /dev/null
+++ b/test/plugins/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/test/plugins/Makefile b/test/plugins/Makefile
new file mode 100644
index 000000000..7827b655c
--- /dev/null
+++ b/test/plugins/Makefile
@@ -0,0 +1,18 @@
+SRC_DIR := ../../plugins
+PLUGIN_TARGETS := amdgpu_plugin.so cuda_plugin.so
+
+# Silent make rules.
+Q := @
+
+all: $(PLUGIN_TARGETS)
+
+amdgpu_plugin.so: $(SRC_DIR)/amdgpu/amdgpu_plugin.so
+	$(Q) cp $< $@
+
+cuda_plugin.so: $(SRC_DIR)/cuda/cuda_plugin.so
+	$(Q) cp $< $@
+
+clean:
+	$(Q) $(RM) $(PLUGIN_TARGETS)
+
+.PHONY: all clean
diff --git a/test/zdtm.py b/test/zdtm.py
index 102f384c0..87914f740 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -40,6 +40,12 @@ LIBFAULT_PATH = os.path.join(
     "libfault.so"
 )
 
+# A directory that contains the CRIU plugins.
+PLUGINS_DIR = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)),
+    "plugins"
+)
+
 prev_line = None
 uuid = uuid.uuid4()
 
@@ -672,6 +678,12 @@ class zdtm_test:
             subprocess.check_call(["make", "-C", "zdtm/"])
         if 'preload_libfault' in opts and opts['preload_libfault']:
             subprocess.check_call(["make", "-C", "libfault/"])
+
+        subprocess.check_call(["make", '--no-print-directory', "-C", "plugins/", "clean"])
+        if 'criu_plugin' in opts and opts['criu_plugin']:
+            for name in opts['criu_plugin']:
+                subprocess.check_call(["make", '--no-print-directory', "-C", "plugins/", f"{name}_plugin.so"])
+
         if 'rootless' in opts and opts['rootless']:
             return
         subprocess.check_call(
@@ -929,7 +941,9 @@ class criu_cli:
             timeout=60):
         env = dict(
             os.environ,
-            ASAN_OPTIONS="log_path=asan.log:disable_coredump=0:detect_leaks=0")
+            ASAN_OPTIONS="log_path=asan.log:disable_coredump=0:detect_leaks=0",
+            CRIU_LIBS_DIR=PLUGINS_DIR
+        )
 
         if fault:
             print("Forcing %s fault" % fault)
@@ -2852,6 +2866,11 @@ def get_cli_args():
     rp.add_argument("--test-shard-count", type=int, default=0,
                     help="Specify how many shards are being run (0=sharding disabled; must be the same for all shards)")
     rp.add_argument("--preload-libfault", action="store_true", help="Run criu with library preload to simulate special cases")
+    rp.add_argument("--criu-plugin",
+                    help="Run tests with CRIU plugin",
+                    choices=['amdgpu', 'cuda'],
+                    nargs='+',
+                    default=None)
 
     lp = sp.add_parser("list", help="List tests")
     lp.set_defaults(action=list_tests)

From a045c874cb4b2c1d3ec7be76cd22e5f675035831 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 20 Jul 2024 13:17:09 +0100
Subject: [PATCH 1542/1854] ci: run tests with amdgpu and cuda plugins

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index ef2dffb1a..950453c0d 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -354,7 +354,15 @@ make -C test/others/action-script run
 # compel testing
 make -C compel/test
 
-# amdgpu_plugin testing
+# amdgpu and cuda plugin testing
 make amdgpu_plugin
 make -C plugins/amdgpu/ test_topology_remap
 ./plugins/amdgpu/test_topology_remap
+
+./test/zdtm.py run -t zdtm/static/maps00 --criu-plugin cuda
+./test/zdtm.py run -t zdtm/static/maps00 --criu-plugin amdgpu
+./test/zdtm.py run -t zdtm/static/maps00 --criu-plugin amdgpu cuda
+
+./test/zdtm.py run -t zdtm/static/maps02 --criu-plugin cuda
+./test/zdtm.py run -t zdtm/static/maps02 --criu-plugin amdgpu
+./test/zdtm.py run -t zdtm/static/maps02 --criu-plugin amdgpu cuda

From 551cd924476021a9e69175b679c4a1db276fc64d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 25 Jul 2024 09:50:10 +0100
Subject: [PATCH 1543/1854] timer: fix printf specifiers for __suseconds64_t

New internal glibc types __timeval64 [1] and __suseconds64_t [2] have
been introduced as a solution for the Y2038 problem [3]. These 64-bit
types are used across all architectures. However, this change causes
the following build errors when cross-compiling on ARMv7 (armhf):

criu/timer.c:49:17: error: format '%ld' expects argument of type 'long int', but argument 5 has type '__suseconds64_t' {aka 'long long int'} [-Werror=format=]
   49 |         pr_info("Restored %s timer to %" PRId64 ".%ld -> %" PRId64 ".%ld\n", n,
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
   50 |                 (int64_t)val->it_value.tv_sec, val->it_value.tv_usec,
      |                                                ~~~~~~~~~~~~~~~~~~~~~
      |                                                             |
      |                                                             __suseconds64_t {aka long long int}

criu/timer.c:49:17: error: format '%ld' expects argument of type 'long int', but argument 7 has type '__suseconds64_t' {aka 'long long int'} [-Werror=format=]
   49 |         pr_info("Restored %s timer to %" PRId64 ".%ld -> %" PRId64 ".%ld\n", n,
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~
   50 |                 (int64_t)val->it_value.tv_sec, val->it_value.tv_usec,
   51 |                 (int64_t)val->it_interval.tv_sec, val->it_interval.tv_usec);
      |                                                   ~~~~~~~~~~~~~~~~~~~~~~~~
      |                                                                   |
      |                                                                   __suseconds64_t {aka long long int}

ns.c:234:48: error: format '%ld' expects argument of type 'long int', but argument 5 has type 'time_t' {aka 'long long int'} [-Werror=format=]
  234 |         len = snprintf(buf, sizeof(buf), "%d %ld 0", clk_id, offset);
      |                                              ~~^             ~~~~~~
      |                                                |             |
      |                                                long int      time_t {aka long long int}
      |                                              %lld

msg.c:58:41: error: format '%ld' expects argument of type 'long int', but argument 3 has type '__suseconds64_t' {aka 'long long int'} [-Werror=format=]
   58 |         off += sprintf(buf + off, ".%.3ld: ", tv.tv_usec / 1000);
      |                                     ~~~~^     ~~~~~~~~~~~~~~~~~
      |                                         |                |
      |                                         long int         __suseconds64_t {aka long long int}
      |                                     %.3lld

../lib/zdtmtst.h:137:26: error: format '%ld' expects argument of type 'long int', but argument 4 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
  137 |                 test_msg("ERR: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, \
      |                          ^~~~~~~~~~~~~~
pthread_timers_h.c:72:17: note: in expansion of macro 'pr_perror'
   72 |                 pr_perror("wrong interval: %ld:%ld", itimerspec.it_interval.tv_sec, itimerspec.it_interval.tv_nsec);
      |                 ^~~~~~~~~

vdso00.c:22:32: error: format '%li' expects argument of type 'long int', but argument 3 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
   22 |         test_msg("%d time: %10li\n", getpid(), tv.tv_sec);
      |                            ~~~~^               ~~~~~~~~~
      |                                |                 |
      |                                long int          __time64_t {aka long long int}
      |                            %10lli

vdso00.c:29:32: error: format '%li' expects argument of type 'long int', but argument 3 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
   29 |         test_msg("%d time: %10li\n", getpid(), tv.tv_sec);
      |                            ~~~~^               ~~~~~~~~~
      |                                |                 |
      |                                long int          __time64_t {aka long long int}
      |                            %10lli

vdso01.c:357:42: error: format '%li' expects argument of type 'long int', but argument 2 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
  357 |         test_msg("gettimeofday: tv_sec %li vdso_gettimeofday: tv_sec %li\n", tv1.tv_sec, tv2.tv_sec);
      |                                        ~~^                                   ~~~~~~~~~~
      |                                          |                                      |
      |                                          long int                               __time64_t {aka long long int}
      |                                        %lli

vdso01.c:357:72: error: format '%li' expects argument of type 'long int', but argument 3 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
  357 |         test_msg("gettimeofday: tv_sec %li vdso_gettimeofday: tv_sec %li\n", tv1.tv_sec, tv2.tv_sec);
      |                                                                      ~~^                 ~~~~~~~~~~
      |                                                                        |                    |
      |                                                                        long int             __time64_t {aka long long int}
      |

vdso01.c:328:43: error: format '%li' expects argument of type 'long int', but argument 2 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
  328 |         test_msg("clock_gettime: tv_sec %li vdso_clock_gettime: tv_sec %li\n", ts1.tv_sec, ts2.tv_sec);
      |                                         ~~^                                    ~~~~~~~~~~
      |                                           |                                       |
      |                                           long int                                __time64_t {aka long long int}
      |                                         %lli

vdso01.c:328:74: error: format '%li' expects argument of type 'long int', but argument 3 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
  328 |         test_msg("clock_gettime: tv_sec %li vdso_clock_gettime: tv_sec %li\n", ts1.tv_sec, ts2.tv_sec);
      |                                                                        ~~^                 ~~~~~~~~~~
      |                                                                          |                    |
      |                                                                          long int             __time64_t {aka long long int}
      |

../lib/zdtmtst.h:144:26: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]
  144 |                 test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, \
      |                          ^~~~~~~~~~~~~~~
mtime_mmap.c:80:17: note: in expansion of macro 'fail'
   80 |                 fail("mtime %ld wasn't updated on mmapped %s file", mtime_new, filename);
      |                 ^~~~

../lib/zdtmtst.h:144:26: error: format '%ld' expects argument of type 'long int', but argument 4 has type '__time64_t' {aka 'long long int'} [-Werror=format=]
  144 |                 test_msg("FAIL: %s:%d: " format " (errno = %d (%s))\n", __FILE__, __LINE__, ##arg, errno, \
      |                          ^~~~~~~~~~~~~~~
mtime_mmap.c:101:17: note: in expansion of macro 'fail'
  101 |                 fail("After migration, mtime changed to %ld", fst.st_mtime);
      |                 ^~~~

[1] https://sourceware.org/git/?p=glibc.git;h=504c98717062cb9bcbd4b3e59e932d04331ddca5
[2] https://sourceware.org/git/?p=glibc.git;h=3fced064f23562ec24f8312ffbc14950993969e6
[3] https://en.wikipedia.org/wiki/Year_2038_problem

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/timer.c                      | 6 +++---
 test/zdtm/lib/msg.c               | 3 ++-
 test/zdtm/lib/ns.c                | 3 ++-
 test/zdtm/static/mtime_mmap.c     | 5 +++--
 test/zdtm/static/pthread_timers.c | 4 +++-
 test/zdtm/static/vdso00.c         | 6 +++---
 test/zdtm/static/vdso01.c         | 7 +++++--
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/criu/timer.c b/criu/timer.c
index 4b286635d..e94cf0280 100644
--- a/criu/timer.c
+++ b/criu/timer.c
@@ -46,9 +46,9 @@ static inline int decode_itimer(char *n, ItimerEntry *ie, struct itimerval *val)
 		return -1;
 	}
 
-	pr_info("Restored %s timer to %" PRId64 ".%ld -> %" PRId64 ".%ld\n", n,
-		(int64_t)val->it_value.tv_sec, val->it_value.tv_usec,
-		(int64_t)val->it_interval.tv_sec, val->it_interval.tv_usec);
+	pr_info("Restored %s timer to %" PRId64 ".%" PRId64 " -> %" PRId64 ".%" PRId64 "\n", n,
+		(int64_t)val->it_value.tv_sec, (int64_t)val->it_value.tv_usec,
+		(int64_t)val->it_interval.tv_sec, (int64_t)val->it_interval.tv_usec);
 
 	return 0;
 }
diff --git a/test/zdtm/lib/msg.c b/test/zdtm/lib/msg.c
index 1cf92e3e0..9ba1c47a4 100644
--- a/test/zdtm/lib/msg.c
+++ b/test/zdtm/lib/msg.c
@@ -1,4 +1,5 @@
 #include <stdarg.h>
+#include <inttypes.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -55,7 +56,7 @@ void test_msg(const char *format, ...)
 		off += strftime(buf, sizeof(buf), "%H:%M:%S", tm);
 	}
 
-	off += sprintf(buf + off, ".%.3ld: ", tv.tv_usec / 1000);
+	off += sprintf(buf + off, ".%.3" PRId64 ": ", (int64_t)(tv.tv_usec / 1000));
 	off += sprintf(buf + off, "%5d: ", getpid());
 
 skip:
diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 205938d20..3c0dbdeb8 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include <grp.h>
 #include <string.h>
 #include <errno.h>
@@ -231,7 +232,7 @@ static inline int _settime(clockid_t clk_id, time_t offset)
 	if (clk_id == CLOCK_MONOTONIC_COARSE || clk_id == CLOCK_MONOTONIC_RAW)
 		clk_id = CLOCK_MONOTONIC;
 
-	len = snprintf(buf, sizeof(buf), "%d %ld 0", clk_id, offset);
+	len = snprintf(buf, sizeof(buf), "%d %" PRId64 " 0", clk_id, (int64_t)offset);
 
 	fd = open("/proc/self/timens_offsets", O_WRONLY);
 	if (fd < 0) {
diff --git a/test/zdtm/static/mtime_mmap.c b/test/zdtm/static/mtime_mmap.c
index faa2d6fad..4de8438ee 100644
--- a/test/zdtm/static/mtime_mmap.c
+++ b/test/zdtm/static/mtime_mmap.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <inttypes.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -77,7 +78,7 @@ int main(int argc, char **argv)
 	mtime_new = fst.st_mtime;
 	/* time of last modification */
 	if (mtime_new <= mtime_old) {
-		fail("mtime %ld wasn't updated on mmapped %s file", mtime_new, filename);
+		fail("mtime %" PRId64 " wasn't updated on mmapped %s file", (int64_t)mtime_new, filename);
 		goto failed;
 	}
 
@@ -98,7 +99,7 @@ int main(int argc, char **argv)
 
 	/* time of last modification */
 	if (fst.st_mtime != mtime_new) {
-		fail("After migration, mtime changed to %ld", fst.st_mtime);
+		fail("After migration, mtime changed to %" PRId64, (int64_t)fst.st_mtime);
 		goto failed;
 	}
 
diff --git a/test/zdtm/static/pthread_timers.c b/test/zdtm/static/pthread_timers.c
index 5246a985f..b1b2a9a23 100644
--- a/test/zdtm/static/pthread_timers.c
+++ b/test/zdtm/static/pthread_timers.c
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <string.h>
 #include <signal.h>
 #include <time.h>
@@ -69,7 +70,8 @@ int main(int argc, char **argv)
 	}
 
 	if (itimerspec.it_interval.tv_nsec != TEST_INTERVAL_NSEC || itimerspec.it_interval.tv_sec) {
-		pr_perror("wrong interval: %ld:%ld", itimerspec.it_interval.tv_sec, itimerspec.it_interval.tv_nsec);
+		pr_perror("wrong interval: %" PRId64 ":%" PRId64,
+			  (int64_t)itimerspec.it_interval.tv_sec, (int64_t)itimerspec.it_interval.tv_nsec);
 		return 1;
 	}
 
diff --git a/test/zdtm/static/vdso00.c b/test/zdtm/static/vdso00.c
index a9bef4dbd..69123a203 100644
--- a/test/zdtm/static/vdso00.c
+++ b/test/zdtm/static/vdso00.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <inttypes.h>
 #include <unistd.h>
 
 #include <sys/time.h>
@@ -19,14 +19,14 @@ int main(int argc, char *argv[])
 	test_msg("%s pid %d\n", argv[0], getpid());
 
 	gettimeofday(&tv, &tz);
-	test_msg("%d time: %10li\n", getpid(), tv.tv_sec);
+	test_msg("%d time: %10" PRId64 "\n", getpid(), (int64_t)tv.tv_sec);
 
 	test_daemon();
 	test_waitsig();
 
 	/* this call will fail if vDSO is corrupted */
 	gettimeofday(&tv, &tz);
-	test_msg("%d time: %10li\n", getpid(), tv.tv_sec);
+	test_msg("%d time: %10" PRId64 "\n", getpid(), (int64_t)tv.tv_sec);
 
 	pass();
 
diff --git a/test/zdtm/static/vdso01.c b/test/zdtm/static/vdso01.c
index 4e33d30a8..d8b3c94d5 100644
--- a/test/zdtm/static/vdso01.c
+++ b/test/zdtm/static/vdso01.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <string.h>
@@ -324,7 +325,8 @@ static int vdso_clock_gettime_handler(void *func)
 	clock_gettime(CLOCK_REALTIME, &ts1);
 	vdso_clock_gettime(CLOCK_REALTIME, &ts2);
 
-	test_msg("clock_gettime: tv_sec %li vdso_clock_gettime: tv_sec %li\n", ts1.tv_sec, ts2.tv_sec);
+	test_msg("clock_gettime: tv_sec %" PRId64 " vdso_clock_gettime: tv_sec %" PRId64 "\n",
+		 (int64_t)ts1.tv_sec, (int64_t)ts2.tv_sec);
 
 	if (labs(ts1.tv_sec - ts2.tv_sec) > TIME_DELTA_SEC) {
 		pr_perror("Delta is too big");
@@ -354,7 +356,8 @@ static int vdso_gettimeofday_handler(void *func)
 	gettimeofday(&tv1, &tz);
 	vdso_gettimeofday(&tv2, &tz);
 
-	test_msg("gettimeofday: tv_sec %li vdso_gettimeofday: tv_sec %li\n", tv1.tv_sec, tv2.tv_sec);
+	test_msg("gettimeofday: tv_sec %" PRId64 " vdso_gettimeofday: tv_sec %" PRId64 "\n",
+		 (int64_t)tv1.tv_sec, (int64_t)tv2.tv_sec);
 
 	if (labs(tv1.tv_sec - tv2.tv_sec) > TIME_DELTA_SEC) {
 		pr_perror("Delta is too big");

From 67fe44e981e8ec3e351b180cd9d9b95c0c153131 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Tue, 6 Aug 2024 10:57:21 +0800
Subject: [PATCH 1544/1854] support user set remote mmap vma address

1. os auto assignment vma addr maybe conflict with vma in gpu living migrate scene;
2. so, we should give choice to user;

Signed-off-by: haozi007 <liuhao27@huawei.com>
---
 compel/include/uapi/infect.h | 1 +
 compel/src/lib/infect.c      | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index cd6255909..7e6134f4b 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -120,6 +120,7 @@ struct infect_ctx {
 	open_proc_fn open_proc;
 
 	int log_fd; /* fd for parasite code to send messages to */
+	unsigned long remote_map_addr; /* User-specified address where to mmap parasitic code, default not set */
 };
 
 extern struct infect_ctx *compel_infect_ctx(struct parasite_ctl *);
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 79d00c9a1..1e3ffb967 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -816,7 +816,7 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size,
 	uint8_t orig_code[MEMFD_FNAME_SZ] = MEMFD_FNAME;
 	pid_t pid = ctl->rpid;
 	long sret = -ENOSYS;
-	int ret, fd, lfd;
+	int ret, fd, lfd, remote_flags;
 
 	if (ctl->ictx.flags & INFECT_NO_MEMFD)
 		return 1;
@@ -860,7 +860,11 @@ static int parasite_memfd_exchange(struct parasite_ctl *ctl, unsigned long size,
 		goto err_cure;
 	}
 
-	ctl->remote_map = remote_mmap(ctl, NULL, size, remote_prot, MAP_FILE | MAP_SHARED, fd, 0);
+	remote_flags = MAP_FILE | MAP_SHARED;
+	if (ctl->ictx.remote_map_addr){
+		remote_flags |= MAP_FIXED_NOREPLACE;
+	}
+	ctl->remote_map = remote_mmap(ctl, (void *)ctl->ictx.remote_map_addr, size, remote_prot, remote_flags, fd, 0);
 	if (!ctl->remote_map) {
 		pr_err("Can't rmap memfd for parasite blob\n");
 		goto err_curef;

From dea63059143e7b72b9af846ca969f1ba2abb3c8e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Fri, 16 Aug 2024 07:49:32 -0700
Subject: [PATCH 1545/1854] test/zdtm: allow to run tests with the mocked
 cuda-checkpoint tool

Here is an example how to run one test:
$ python test/zdtm.py run -t zdtm/static/env00 --ignore-taint --mocked-cuda-checkpoint

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/cuda-checkpoint/.gitignore        |  1 +
 test/cuda-checkpoint/Makefile          | 17 +++++++++
 test/cuda-checkpoint/cuda-checkpoint.c | 53 ++++++++++++++++++++++++++
 test/zdtm.py                           | 16 +++++++-
 4 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 test/cuda-checkpoint/.gitignore
 create mode 100644 test/cuda-checkpoint/Makefile
 create mode 100644 test/cuda-checkpoint/cuda-checkpoint.c

diff --git a/test/cuda-checkpoint/.gitignore b/test/cuda-checkpoint/.gitignore
new file mode 100644
index 000000000..717fb7028
--- /dev/null
+++ b/test/cuda-checkpoint/.gitignore
@@ -0,0 +1 @@
+cuda-checkpoint
diff --git a/test/cuda-checkpoint/Makefile b/test/cuda-checkpoint/Makefile
new file mode 100644
index 000000000..c59dadddc
--- /dev/null
+++ b/test/cuda-checkpoint/Makefile
@@ -0,0 +1,17 @@
+CFLAGS	+= $(USERCFLAGS) $(ARCHCFLAGS)
+
+BIN := cuda-checkpoint
+SRC := cuda-checkpoint.c
+DEP	:= $(SRC:%.c=%.d)
+OBJ	:= $(SRC:%.c=%.o)
+TARGETS	:= $(BIN)
+
+include ../zdtm/Makefile.inc
+
+all:	$(TARGETS)
+.PHONY: all
+
+clean-more:
+	$(RM) $(TARGETS)
+.PHONY: clean-more
+clean: clean-more
diff --git a/test/cuda-checkpoint/cuda-checkpoint.c b/test/cuda-checkpoint/cuda-checkpoint.c
new file mode 100644
index 000000000..f35a4b41d
--- /dev/null
+++ b/test/cuda-checkpoint/cuda-checkpoint.c
@@ -0,0 +1,53 @@
+/* The mocked version of cuda-checkpoint. */
+#include <getopt.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char *argv[])
+{
+	int c;
+
+	while (1) {
+		int option_index = 0;
+		static struct option long_options[] = {
+			{ "pid", required_argument, 0, 'p' },
+			{ "get-restore-tid", no_argument, 0, 'g' },
+			{ "action", required_argument, 0, 'a' },
+			{ "timeout", required_argument, 0, 't' },
+			{ "help", no_argument, 0, 'h' },
+			{ 0, 0, 0, 0 }
+		};
+
+		c = getopt_long(argc, argv, "p:ga:ht:",
+				long_options, &option_index);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'p':
+			printf("%s\n", optarg);
+			break;
+		case 'g':
+		case 'a':
+		case 't':
+			break;
+		case 'h':
+			printf("--action - execute an action");
+			break;
+
+		default:
+			fprintf(stderr, "getopt returned character code 0%o ??\n", c);
+			return 1;
+		}
+	}
+
+	if (optind < argc) {
+		fprintf(stderr, "non-option ARGV-elements: ");
+		while (optind < argc)
+			fprintf(stderr, "%s ", argv[optind++]);
+		fprintf(stderr, "\n");
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/test/zdtm.py b/test/zdtm.py
index 87914f740..6b2132cc3 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -684,6 +684,8 @@ class zdtm_test:
             for name in opts['criu_plugin']:
                 subprocess.check_call(["make", '--no-print-directory', "-C", "plugins/", f"{name}_plugin.so"])
 
+        if 'mocked_cuda_checkpoint' in opts and opts['mocked_cuda_checkpoint']:
+            subprocess.check_call(["make", "-C", "cuda-checkpoint/"])
         if 'rootless' in opts and opts['rootless']:
             return
         subprocess.check_call(
@@ -1141,6 +1143,7 @@ class criu:
         self.__pre_dump_mode = opts['pre_dump_mode']
         self.__preload_libfault = bool(opts['preload_libfault'])
         self.__mntns_compat_mode = bool(opts['mntns_compat_mode'])
+        self.__cuda_checkpoint = bool(opts['mocked_cuda_checkpoint'])
 
         if opts['rpc']:
             self.__criu = criu_rpc
@@ -1223,6 +1226,9 @@ class criu:
         s_args = ["--log-file", log, "--images-dir", self.__ddir(),
                   "--verbosity=4"] + opts
 
+        if self.__cuda_checkpoint:
+            s_args += [ "--libdir" , os.path.join(os.getcwd(), "..", "plugins", "cuda") ]
+
         with open(os.path.join(self.__ddir(), action + '.cropt'), 'w') as f:
             f.write(' '.join(s_args) + '\n')
 
@@ -2160,7 +2166,7 @@ class Launcher:
               'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
               'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode', 'mntns_compat_mode',
-              'rootless', 'preload_libfault')
+              'rootless', 'preload_libfault', 'mocked_cuda_checkpoint')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
         if self.__use_log:
@@ -2173,8 +2179,11 @@ class Launcher:
         if opts['rootless'] and os.getuid() == 0:
             os.setgid(NON_ROOT_UID)
             os.setuid(NON_ROOT_UID)
+        env = dict(os.environ, CR_CT_TEST_INFO=arg)
+        if opts['mocked_cuda_checkpoint']:
+            env['PATH'] = os.path.join(os.getcwd(), "cuda-checkpoint") + ":" + env["PATH"]
         sub = subprocess.Popen(["./zdtm_ct", "zdtm.py"],
-                               env=dict(os.environ, CR_CT_TEST_INFO=arg),
+                               env=env,
                                stdout=log,
                                stderr=subprocess.STDOUT,
                                close_fds=True)
@@ -2871,6 +2880,9 @@ def get_cli_args():
                     choices=['amdgpu', 'cuda'],
                     nargs='+',
                     default=None)
+    rp.add_argument("--mocked-cuda-checkpoint",
+                    action="store_true",
+                    help="Run criu with the cuda plugin and the mocked cuda-checkpoint tool")
 
     lp = sp.add_parser("list", help="List tests")
     lp.set_defaults(action=list_tests)

From de31abb9700931383da4dd820b0c5881586949ea Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 12 Aug 2024 07:56:28 -0700
Subject: [PATCH 1546/1854] criu/plugin: don't call plugin device hooks for
 non-alive tasks

Dead tasks don't hold any resources.

Fixes: 2465
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/cr-restore.c | 4 +++-
 criu/seize.c      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index b95d4f134..4d4dfbe6f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2238,8 +2238,10 @@ skip_ns_bouncing:
 	 * mapped memory) could be done sanely once the pie code hands
 	 * over the control to master process.
 	 */
+	pr_info("Run late stage hook from criu master for external devices\n");
 	for_each_pstree_item(item) {
-		pr_info("Run late stage hook from criu master for external devices\n");
+		if (!task_alive(item))
+			continue;
 		ret = run_plugins(RESUME_DEVICES_LATE, item->pid->real);
 		/*
 		 * This may not really be an error. Only certain plugin hooks
diff --git a/criu/seize.c b/criu/seize.c
index ae270022f..ba26072e6 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -1030,6 +1030,8 @@ int collect_pstree(void)
 	}
 
 	for_each_pstree_item(iter) {
+		if (!task_alive(iter))
+			continue;
 		ret = run_plugins(CHECKPOINT_DEVICES, iter->pid->real);
 		if (ret < 0 && ret != -ENOTSUP)
 			goto err;

From 9a19cf34de764e2ca77b8d5944a0ee26af79cd13 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 12 Aug 2024 08:08:10 -0700
Subject: [PATCH 1547/1854] scripts/ci: run tests with the mocked
 cuda-checkpoint tool

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 scripts/ci/run-ci-tests.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 950453c0d..26ea00c53 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -359,10 +359,8 @@ make amdgpu_plugin
 make -C plugins/amdgpu/ test_topology_remap
 ./plugins/amdgpu/test_topology_remap
 
-./test/zdtm.py run -t zdtm/static/maps00 --criu-plugin cuda
-./test/zdtm.py run -t zdtm/static/maps00 --criu-plugin amdgpu
-./test/zdtm.py run -t zdtm/static/maps00 --criu-plugin amdgpu cuda
+./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin cuda
+./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin amdgpu
+./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin amdgpu cuda
 
-./test/zdtm.py run -t zdtm/static/maps02 --criu-plugin cuda
-./test/zdtm.py run -t zdtm/static/maps02 --criu-plugin amdgpu
-./test/zdtm.py run -t zdtm/static/maps02 --criu-plugin amdgpu cuda
+./test/zdtm.py run -t zdtm/static/sigpending -t zdtm/static/pthread00 --mocked-cuda-checkpoint

From 2ee58444117f2c992d446594b10d6fca7029d3af Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 9 Jul 2024 13:07:03 +0100
Subject: [PATCH 1548/1854] plugins/amdgpu: fix cross-compilation

To enable cross-compile we need to use the CC definition from
criu/scripts/nmk/scripts/tools.mk:

CC := $(CROSS_COMPILE)$(HOSTCC)

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 6dad00122..7d3388b80 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -15,7 +15,6 @@ DEPS_NOK 		:= ;
 __nmk_dir ?= ../../scripts/nmk/scripts/
 include $(__nmk_dir)msg.mk
 
-CC      		:= gcc
 PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC -DCR_PLUGIN_DEFAULT="$(PLUGINDIR)"
 PLUGIN_LDFLAGS		:= -lpthread -lrt -ldrm -ldrm_amdgpu
 

From d68205e919fe84c2121ee508059dcf910020a1f6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 9 Jul 2024 13:15:10 +0100
Subject: [PATCH 1549/1854] ci: enable cross compile testing for amdgpu-plugin

Skip cross-compilation on armv7 because, among many other errors,
it fails with the following:

	In file included from ../../include/common/lock.h:9,
			 from ../../criu/include/files.h:9,
			 from amdgpu_plugin.c:30:
	../../include/common/asm/atomic.h:60:2: error: #error ARM architecture version (CONFIG_ARMV*) not set or unsupported.
	   60 | #error ARM architecture version (CONFIG_ARMV*) not set or unsupported.
	      |  ^~~~~
	../../include/common/asm/atomic.h: In function 'atomic_add_return':
	../../include/common/asm/atomic.h:81:9: error: implicit declaration of function 'smp_mb' [-Werror=implicit-function-declaration]
	   81 |         smp_mb();
	      |         ^~~~~~

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/build/Dockerfile.stable-cross.tmpl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/build/Dockerfile.stable-cross.tmpl b/scripts/build/Dockerfile.stable-cross.tmpl
index 6a68cd1ca..078372c38 100644
--- a/scripts/build/Dockerfile.stable-cross.tmpl
+++ b/scripts/build/Dockerfile.stable-cross.tmpl
@@ -21,7 +21,8 @@ RUN apt-install \
 	libprotobuf-c-dev:${DEBIAN_ARCH}	\
 	libcap-dev:${DEBIAN_ARCH}		\
 	libaio-dev:${DEBIAN_ARCH}		\
-	libnl-route-3-dev:${DEBIAN_ARCH}
+	libnl-route-3-dev:${DEBIAN_ARCH} \
+	libdrm-dev:${DEBIAN_ARCH}
 
 ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
 	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
@@ -39,4 +40,10 @@ ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
 COPY . /criu
 WORKDIR /criu
 
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
+# amdgpu_plugin with armv7 is not supported
+RUN	make mrproper && date && \
+	make -j $(nproc) && \
+	if [ "$SUBARCH" != "armv7" ]; then \
+		make -j $(nproc) amdgpu_plugin; \
+	fi && \
+	make -j $(nproc) zdtm && date

From 3e2ed18790c0d5812f9bdedbfe94812947894f6f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 21 Jul 2024 12:02:40 +0100
Subject: [PATCH 1550/1854] plugins/amdgpu: use C99-standard types

Co-developed-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/kfd_ioctl.h | 350 ++++++++++++++++++-------------------
 1 file changed, 175 insertions(+), 175 deletions(-)

diff --git a/plugins/amdgpu/kfd_ioctl.h b/plugins/amdgpu/kfd_ioctl.h
index e1ebb75a3..1a3bcea95 100644
--- a/plugins/amdgpu/kfd_ioctl.h
+++ b/plugins/amdgpu/kfd_ioctl.h
@@ -39,8 +39,8 @@
 #define KFD_IOCTL_MINOR_VERSION 8
 
 struct kfd_ioctl_get_version_args {
-	__u32 major_version; /* from KFD */
-	__u32 minor_version; /* from KFD */
+	uint32_t major_version; /* from KFD */
+	uint32_t minor_version; /* from KFD */
 };
 
 /* For kfd_ioctl_create_queue_args.queue_type. */
@@ -53,51 +53,51 @@ struct kfd_ioctl_get_version_args {
 #define KFD_MAX_QUEUE_PRIORITY	 15
 
 struct kfd_ioctl_create_queue_args {
-	__u64 ring_base_address;     /* to KFD */
-	__u64 write_pointer_address; /* from KFD */
-	__u64 read_pointer_address;  /* from KFD */
-	__u64 doorbell_offset;	     /* from KFD */
+	uint64_t ring_base_address;	/* to KFD */
+	uint64_t write_pointer_address; /* from KFD */
+	uint64_t read_pointer_address;	/* from KFD */
+	uint64_t doorbell_offset;	/* from KFD */
 
-	__u32 ring_size;	/* to KFD */
-	__u32 gpu_id;		/* to KFD */
-	__u32 queue_type;	/* to KFD */
-	__u32 queue_percentage; /* to KFD */
-	__u32 queue_priority;	/* to KFD */
-	__u32 queue_id;		/* from KFD */
+	uint32_t ring_size;	   /* to KFD */
+	uint32_t gpu_id;	   /* to KFD */
+	uint32_t queue_type;	   /* to KFD */
+	uint32_t queue_percentage; /* to KFD */
+	uint32_t queue_priority;   /* to KFD */
+	uint32_t queue_id;	   /* from KFD */
 
-	__u64 eop_buffer_address;	/* to KFD */
-	__u64 eop_buffer_size;		/* to KFD */
-	__u64 ctx_save_restore_address; /* to KFD */
-	__u32 ctx_save_restore_size;	/* to KFD */
-	__u32 ctl_stack_size;		/* to KFD */
+	uint64_t eop_buffer_address;	   /* to KFD */
+	uint64_t eop_buffer_size;	   /* to KFD */
+	uint64_t ctx_save_restore_address; /* to KFD */
+	uint32_t ctx_save_restore_size;	   /* to KFD */
+	uint32_t ctl_stack_size;	   /* to KFD */
 };
 
 struct kfd_ioctl_destroy_queue_args {
-	__u32 queue_id; /* to KFD */
-	__u32 pad;
+	uint32_t queue_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_update_queue_args {
-	__u64 ring_base_address; /* to KFD */
+	uint64_t ring_base_address; /* to KFD */
 
-	__u32 queue_id;		/* to KFD */
-	__u32 ring_size;	/* to KFD */
-	__u32 queue_percentage; /* to KFD */
-	__u32 queue_priority;	/* to KFD */
+	uint32_t queue_id;	   /* to KFD */
+	uint32_t ring_size;	   /* to KFD */
+	uint32_t queue_percentage; /* to KFD */
+	uint32_t queue_priority;   /* to KFD */
 };
 
 struct kfd_ioctl_set_cu_mask_args {
-	__u32 queue_id;	   /* to KFD */
-	__u32 num_cu_mask; /* to KFD */
-	__u64 cu_mask_ptr; /* to KFD */
+	uint32_t queue_id;    /* to KFD */
+	uint32_t num_cu_mask; /* to KFD */
+	uint64_t cu_mask_ptr; /* to KFD */
 };
 
 struct kfd_ioctl_get_queue_wave_state_args {
-	__u64 ctl_stack_address;   /* to KFD */
-	__u32 ctl_stack_used_size; /* from KFD */
-	__u32 save_area_used_size; /* from KFD */
-	__u32 queue_id;		   /* to KFD */
-	__u32 pad;
+	uint64_t ctl_stack_address;   /* to KFD */
+	uint32_t ctl_stack_used_size; /* from KFD */
+	uint32_t save_area_used_size; /* from KFD */
+	uint32_t queue_id;	      /* to KFD */
+	uint32_t pad;
 };
 
 /* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
@@ -105,13 +105,13 @@ struct kfd_ioctl_get_queue_wave_state_args {
 #define KFD_IOC_CACHE_POLICY_NONCOHERENT 1
 
 struct kfd_ioctl_set_memory_policy_args {
-	__u64 alternate_aperture_base; /* to KFD */
-	__u64 alternate_aperture_size; /* to KFD */
+	uint64_t alternate_aperture_base; /* to KFD */
+	uint64_t alternate_aperture_size; /* to KFD */
 
-	__u32 gpu_id;		/* to KFD */
-	__u32 default_policy;	/* to KFD */
-	__u32 alternate_policy; /* to KFD */
-	__u32 pad;
+	uint32_t gpu_id;	   /* to KFD */
+	uint32_t default_policy;   /* to KFD */
+	uint32_t alternate_policy; /* to KFD */
+	uint32_t pad;
 };
 
 /*
@@ -122,24 +122,24 @@ struct kfd_ioctl_set_memory_policy_args {
  */
 
 struct kfd_ioctl_get_clock_counters_args {
-	__u64 gpu_clock_counter;    /* from KFD */
-	__u64 cpu_clock_counter;    /* from KFD */
-	__u64 system_clock_counter; /* from KFD */
-	__u64 system_clock_freq;    /* from KFD */
+	uint64_t gpu_clock_counter;    /* from KFD */
+	uint64_t cpu_clock_counter;    /* from KFD */
+	uint64_t system_clock_counter; /* from KFD */
+	uint64_t system_clock_freq;    /* from KFD */
 
-	__u32 gpu_id; /* to KFD */
-	__u32 pad;
+	uint32_t gpu_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_process_device_apertures {
-	__u64 lds_base;	     /* from KFD */
-	__u64 lds_limit;     /* from KFD */
-	__u64 scratch_base;  /* from KFD */
-	__u64 scratch_limit; /* from KFD */
-	__u64 gpuvm_base;    /* from KFD */
-	__u64 gpuvm_limit;   /* from KFD */
-	__u32 gpu_id;	     /* from KFD */
-	__u32 pad;
+	uint64_t lds_base;	/* from KFD */
+	uint64_t lds_limit;	/* from KFD */
+	uint64_t scratch_base;	/* from KFD */
+	uint64_t scratch_limit; /* from KFD */
+	uint64_t gpuvm_base;	/* from KFD */
+	uint64_t gpuvm_limit;	/* from KFD */
+	uint32_t gpu_id;	/* from KFD */
+	uint32_t pad;
 };
 
 /*
@@ -152,20 +152,20 @@ struct kfd_ioctl_get_process_apertures_args {
 	struct kfd_process_device_apertures process_apertures[NUM_OF_SUPPORTED_GPUS]; /* from KFD */
 
 	/* from KFD, should be in the range [1 - NUM_OF_SUPPORTED_GPUS] */
-	__u32 num_of_nodes;
-	__u32 pad;
+	uint32_t num_of_nodes;
+	uint32_t pad;
 };
 
 struct kfd_ioctl_get_process_apertures_new_args {
 	/* User allocated. Pointer to struct kfd_process_device_apertures
 	 * filled in by Kernel
 	 */
-	__u64 kfd_process_device_apertures_ptr;
+	uint64_t kfd_process_device_apertures_ptr;
 	/* to KFD - indicates amount of memory present in kfd_process_device_apertures_ptr
 	 * from KFD - Number of entries filled by KFD.
 	 */
-	__u32 num_of_nodes;
-	__u32 pad;
+	uint32_t num_of_nodes;
+	uint32_t pad;
 };
 
 #define MAX_ALLOWED_NUM_POINTS	  100
@@ -173,25 +173,25 @@ struct kfd_ioctl_get_process_apertures_new_args {
 #define MAX_ALLOWED_WAC_BUFF_SIZE 128
 
 struct kfd_ioctl_dbg_register_args {
-	__u32 gpu_id; /* to KFD */
-	__u32 pad;
+	uint32_t gpu_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_dbg_unregister_args {
-	__u32 gpu_id; /* to KFD */
-	__u32 pad;
+	uint32_t gpu_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_dbg_address_watch_args {
-	__u64 content_ptr;	 /* a pointer to the actual content */
-	__u32 gpu_id;		 /* to KFD */
-	__u32 buf_size_in_bytes; /*including gpu_id and buf_size */
+	uint64_t content_ptr;	    /* a pointer to the actual content */
+	uint32_t gpu_id;	    /* to KFD */
+	uint32_t buf_size_in_bytes; /*including gpu_id and buf_size */
 };
 
 struct kfd_ioctl_dbg_wave_control_args {
-	__u64 content_ptr;	 /* a pointer to the actual content */
-	__u32 gpu_id;		 /* to KFD */
-	__u32 buf_size_in_bytes; /*including gpu_id and buf_size */
+	uint64_t content_ptr;	    /* a pointer to the actual content */
+	uint32_t gpu_id;	    /* to KFD */
+	uint32_t buf_size_in_bytes; /*including gpu_id and buf_size */
 };
 
 #define KFD_INVALID_FD 0xffffffff
@@ -228,43 +228,43 @@ struct kfd_ioctl_dbg_wave_control_args {
 #define KFD_MEM_ERR_GPU_HANG	    3
 
 struct kfd_ioctl_create_event_args {
-	__u64 event_page_offset;  /* from KFD */
-	__u32 event_trigger_data; /* from KFD - signal events only */
-	__u32 event_type;	  /* to KFD */
-	__u32 auto_reset;	  /* to KFD */
-	__u32 node_id;		  /* to KFD - only valid for certain event types */
-	__u32 event_id;		  /* from KFD */
-	__u32 event_slot_index;	  /* from KFD */
+	uint64_t event_page_offset;  /* from KFD */
+	uint32_t event_trigger_data; /* from KFD - signal events only */
+	uint32_t event_type;	     /* to KFD */
+	uint32_t auto_reset;	     /* to KFD */
+	uint32_t node_id;	     /* to KFD - only valid for certain event types */
+	uint32_t event_id;	     /* from KFD */
+	uint32_t event_slot_index;   /* from KFD */
 };
 
 struct kfd_ioctl_destroy_event_args {
-	__u32 event_id; /* to KFD */
-	__u32 pad;
+	uint32_t event_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_set_event_args {
-	__u32 event_id; /* to KFD */
-	__u32 pad;
+	uint32_t event_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_reset_event_args {
-	__u32 event_id; /* to KFD */
-	__u32 pad;
+	uint32_t event_id; /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_memory_exception_failure {
-	__u32 NotPresent; /* Page not present or supervisor privilege */
-	__u32 ReadOnly;	  /* Write access to a read-only page */
-	__u32 NoExecute;  /* Execute access to a page marked NX */
-	__u32 imprecise;  /* Can't determine the exact fault address */
+	uint32_t NotPresent; /* Page not present or supervisor privilege */
+	uint32_t ReadOnly;   /* Write access to a read-only page */
+	uint32_t NoExecute;  /* Execute access to a page marked NX */
+	uint32_t imprecise;  /* Can't determine the exact fault address */
 };
 
 /* memory exception data */
 struct kfd_hsa_memory_exception_data {
 	struct kfd_memory_exception_failure failure;
-	__u64 va;
-	__u32 gpu_id;
-	__u32 ErrorType; /* 0 = no RAS error,
+	uint64_t va;
+	uint32_t gpu_id;
+	uint32_t ErrorType; /* 0 = no RAS error,
 			  * 1 = ECC_SRAM,
 			  * 2 = Link_SYNFLOOD (poison),
 			  * 3 = GPU hang (not attributable to a specific cause),
@@ -274,10 +274,10 @@ struct kfd_hsa_memory_exception_data {
 
 /* hw exception data */
 struct kfd_hsa_hw_exception_data {
-	__u32 reset_type;
-	__u32 reset_cause;
-	__u32 memory_lost;
-	__u32 gpu_id;
+	uint32_t reset_type;
+	uint32_t reset_cause;
+	uint32_t memory_lost;
+	uint32_t gpu_id;
 };
 
 /* Event data */
@@ -286,57 +286,57 @@ struct kfd_event_data {
 		struct kfd_hsa_memory_exception_data memory_exception_data;
 		struct kfd_hsa_hw_exception_data hw_exception_data;
 	};			  /* From KFD */
-	__u64 kfd_event_data_ext; /* pointer to an extension structure for future exception types */
-	__u32 event_id;		  /* to KFD */
-	__u32 pad;
+	uint64_t kfd_event_data_ext; /* pointer to an extension structure for future exception types */
+	uint32_t event_id;	     /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_wait_events_args {
-	__u64 events_ptr;   /* pointed to struct kfd_event_data array, to KFD */
-	__u32 num_events;   /* to KFD */
-	__u32 wait_for_all; /* to KFD */
-	__u32 timeout;	    /* to KFD */
-	__u32 wait_result;  /* from KFD */
+	uint64_t events_ptr;   /* pointed to struct kfd_event_data array, to KFD */
+	uint32_t num_events;   /* to KFD */
+	uint32_t wait_for_all; /* to KFD */
+	uint32_t timeout;      /* to KFD */
+	uint32_t wait_result;  /* from KFD */
 };
 
 struct kfd_ioctl_set_scratch_backing_va_args {
-	__u64 va_addr; /* to KFD */
-	__u32 gpu_id;  /* to KFD */
-	__u32 pad;
+	uint64_t va_addr; /* to KFD */
+	uint32_t gpu_id;  /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_get_tile_config_args {
 	/* to KFD: pointer to tile array */
-	__u64 tile_config_ptr;
+	uint64_t tile_config_ptr;
 	/* to KFD: pointer to macro tile array */
-	__u64 macro_tile_config_ptr;
+	uint64_t macro_tile_config_ptr;
 	/* to KFD: array size allocated by user mode
 	 * from KFD: array size filled by kernel
 	 */
-	__u32 num_tile_configs;
+	uint32_t num_tile_configs;
 	/* to KFD: array size allocated by user mode
 	 * from KFD: array size filled by kernel
 	 */
-	__u32 num_macro_tile_configs;
+	uint32_t num_macro_tile_configs;
 
-	__u32 gpu_id;	      /* to KFD */
-	__u32 gb_addr_config; /* from KFD */
-	__u32 num_banks;      /* from KFD */
-	__u32 num_ranks;      /* from KFD */
+	uint32_t gpu_id;	 /* to KFD */
+	uint32_t gb_addr_config; /* from KFD */
+	uint32_t num_banks;	 /* from KFD */
+	uint32_t num_ranks;	 /* from KFD */
 
 	/* struct size can be extended later if needed without breaking ABI compatibility */
 };
 
 struct kfd_ioctl_set_trap_handler_args {
-	__u64 tba_addr; /* to KFD */
-	__u64 tma_addr; /* to KFD */
-	__u32 gpu_id;	/* to KFD */
-	__u32 pad;
+	uint64_t tba_addr; /* to KFD */
+	uint64_t tma_addr; /* to KFD */
+	uint32_t gpu_id;   /* to KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_acquire_vm_args {
-	__u32 drm_fd; /* to KFD */
-	__u32 gpu_id; /* to KFD */
+	uint32_t drm_fd; /* to KFD */
+	uint32_t gpu_id; /* to KFD */
 };
 
 /* Allocation flags: memory types */
@@ -367,12 +367,12 @@ struct kfd_ioctl_acquire_vm_args {
  * @flags:       memory type and attributes. See KFD_IOC_ALLOC_MEM_FLAGS above
  */
 struct kfd_ioctl_alloc_memory_of_gpu_args {
-	__u64 va_addr;	   /* to KFD */
-	__u64 size;	   /* to KFD */
-	__u64 handle;	   /* from KFD */
-	__u64 mmap_offset; /* to KFD (userptr), from KFD (mmap offset) */
-	__u32 gpu_id;	   /* to KFD */
-	__u32 flags;
+	uint64_t va_addr;     /* to KFD */
+	uint64_t size;	      /* to KFD */
+	uint64_t handle;      /* from KFD */
+	uint64_t mmap_offset; /* to KFD (userptr), from KFD (mmap offset) */
+	uint32_t gpu_id;      /* to KFD */
+	uint32_t flags;
 };
 
 /* Free memory allocated with kfd_ioctl_alloc_memory_of_gpu
@@ -380,13 +380,13 @@ struct kfd_ioctl_alloc_memory_of_gpu_args {
  * @handle: memory handle returned by alloc
  */
 struct kfd_ioctl_free_memory_of_gpu_args {
-	__u64 handle; /* to KFD */
+	uint64_t handle; /* to KFD */
 };
 
 /* Map memory to one or more GPUs
  *
  * @handle:                memory handle returned by alloc
- * @device_ids_array_ptr:  array of gpu_ids (__u32 per device)
+ * @device_ids_array_ptr:  array of gpu_ids (uint32_t per device)
  * @n_devices:             number of devices in the array
  * @n_success:             number of devices mapped successfully
  *
@@ -399,10 +399,10 @@ struct kfd_ioctl_free_memory_of_gpu_args {
  * n_devices.
  */
 struct kfd_ioctl_map_memory_to_gpu_args {
-	__u64 handle;		    /* to KFD */
-	__u64 device_ids_array_ptr; /* to KFD */
-	__u32 n_devices;	    /* to KFD */
-	__u32 n_success;	    /* to/from KFD */
+	uint64_t handle;	       /* to KFD */
+	uint64_t device_ids_array_ptr; /* to KFD */
+	uint32_t n_devices;	       /* to KFD */
+	uint32_t n_success;	       /* to/from KFD */
 };
 
 /* Unmap memory from one or more GPUs
@@ -410,10 +410,10 @@ struct kfd_ioctl_map_memory_to_gpu_args {
  * same arguments as for mapping
  */
 struct kfd_ioctl_unmap_memory_from_gpu_args {
-	__u64 handle;		    /* to KFD */
-	__u64 device_ids_array_ptr; /* to KFD */
-	__u32 n_devices;	    /* to KFD */
-	__u32 n_success;	    /* to/from KFD */
+	uint64_t handle;	       /* to KFD */
+	uint64_t device_ids_array_ptr; /* to KFD */
+	uint32_t n_devices;	       /* to KFD */
+	uint32_t n_success;	       /* to/from KFD */
 };
 
 /* Allocate GWS for specific queue
@@ -424,28 +424,28 @@ struct kfd_ioctl_unmap_memory_from_gpu_args {
  *               only support contiguous GWS allocation
  */
 struct kfd_ioctl_alloc_queue_gws_args {
-	__u32 queue_id;	 /* to KFD */
-	__u32 num_gws;	 /* to KFD */
-	__u32 first_gws; /* from KFD */
-	__u32 pad;
+	uint32_t queue_id;  /* to KFD */
+	uint32_t num_gws;   /* to KFD */
+	uint32_t first_gws; /* from KFD */
+	uint32_t pad;
 };
 
 struct kfd_ioctl_get_dmabuf_info_args {
-	__u64 size;	     /* from KFD */
-	__u64 metadata_ptr;  /* to KFD */
-	__u32 metadata_size; /* to KFD (space allocated by user)
+	uint64_t size;		/* from KFD */
+	uint64_t metadata_ptr;	/* to KFD */
+	uint32_t metadata_size; /* to KFD (space allocated by user)
 			      * from KFD (actual metadata size)
 			      */
-	__u32 gpu_id;	     /* from KFD */
-	__u32 flags;	     /* from KFD (KFD_IOC_ALLOC_MEM_FLAGS) */
-	__u32 dmabuf_fd;     /* to KFD */
+	uint32_t gpu_id;	/* from KFD */
+	uint32_t flags;		/* from KFD (KFD_IOC_ALLOC_MEM_FLAGS) */
+	uint32_t dmabuf_fd;	/* to KFD */
 };
 
 struct kfd_ioctl_import_dmabuf_args {
-	__u64 va_addr;	 /* to KFD */
-	__u64 handle;	 /* from KFD */
-	__u32 gpu_id;	 /* to KFD */
-	__u32 dmabuf_fd; /* to KFD */
+	uint64_t va_addr;   /* to KFD */
+	uint64_t handle;    /* from KFD */
+	uint32_t gpu_id;    /* to KFD */
+	uint32_t dmabuf_fd; /* to KFD */
 };
 
 /*
@@ -463,8 +463,8 @@ enum kfd_smi_event {
 #define KFD_SMI_EVENT_MSG_SIZE		 96
 
 struct kfd_ioctl_smi_events_args {
-	__u32 gpuid;   /* to KFD */
-	__u32 anon_fd; /* from KFD */
+	uint32_t gpuid;	  /* to KFD */
+	uint32_t anon_fd; /* from KFD */
 };
 
 /**************************************************************************************************
@@ -510,33 +510,33 @@ enum kfd_criu_op {
  * Return: 0 on success, -errno on failure
  */
 struct kfd_ioctl_criu_args {
-	__u64 devices;	      /* Used during ops: CHECKPOINT, RESTORE */
-	__u64 bos;	      /* Used during ops: CHECKPOINT, RESTORE */
-	__u64 priv_data;      /* Used during ops: CHECKPOINT, RESTORE */
-	__u64 priv_data_size; /* Used during ops: PROCESS_INFO, RESTORE */
-	__u32 num_devices;    /* Used during ops: PROCESS_INFO, RESTORE */
-	__u32 num_bos;	      /* Used during ops: PROCESS_INFO, RESTORE */
-	__u32 num_objects;    /* Used during ops: PROCESS_INFO, RESTORE */
-	__u32 pid;	      /* Used during ops: PROCESS_INFO, RESUME */
-	__u32 op;
+	uint64_t devices;	 /* Used during ops: CHECKPOINT, RESTORE */
+	uint64_t bos;		 /* Used during ops: CHECKPOINT, RESTORE */
+	uint64_t priv_data;	 /* Used during ops: CHECKPOINT, RESTORE */
+	uint64_t priv_data_size; /* Used during ops: PROCESS_INFO, RESTORE */
+	uint32_t num_devices;	 /* Used during ops: PROCESS_INFO, RESTORE */
+	uint32_t num_bos;	 /* Used during ops: PROCESS_INFO, RESTORE */
+	uint32_t num_objects;	 /* Used during ops: PROCESS_INFO, RESTORE */
+	uint32_t pid;		 /* Used during ops: PROCESS_INFO, RESUME */
+	uint32_t op;
 };
 
 struct kfd_criu_device_bucket {
-	__u32 user_gpu_id;
-	__u32 actual_gpu_id;
-	__u32 drm_fd;
-	__u32 pad;
+	uint32_t user_gpu_id;
+	uint32_t actual_gpu_id;
+	uint32_t drm_fd;
+	uint32_t pad;
 };
 
 struct kfd_criu_bo_bucket {
-	__u64 addr;
-	__u64 size;
-	__u64 offset;
-	__u64 restored_offset; /* During restore, updated offset for BO */
-	__u32 gpu_id;	       /* This is the user_gpu_id */
-	__u32 alloc_flags;
-	__u32 dmabuf_fd;
-	__u32 pad;
+	uint64_t addr;
+	uint64_t size;
+	uint64_t offset;
+	uint64_t restored_offset; /* During restore, updated offset for BO */
+	uint32_t gpu_id;	  /* This is the user_gpu_id */
+	uint32_t alloc_flags;
+	uint32_t dmabuf_fd;
+	uint32_t pad;
 };
 
 /* CRIU IOCTLs - END */
@@ -616,8 +616,8 @@ enum kfd_ioctl_svm_attr_type {
  * @value: attribute value
  */
 struct kfd_ioctl_svm_attribute {
-	__u32 type;
-	__u32 value;
+	uint32_t type;
+	uint32_t value;
 };
 
 /**
@@ -659,10 +659,10 @@ struct kfd_ioctl_svm_attribute {
  * attribute type to indicate the access for the specified GPU.
  */
 struct kfd_ioctl_svm_args {
-	__u64 start_addr;
-	__u64 size;
-	__u32 op;
-	__u32 nattr;
+	uint64_t start_addr;
+	uint64_t size;
+	uint32_t op;
+	uint32_t nattr;
 	/* Variable length array of attributes */
 	struct kfd_ioctl_svm_attribute attrs[0];
 };

From 21ea718f9ffe70fa5fe2089a8fa5b39f101d740a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 10 Jul 2024 04:36:18 +0100
Subject: [PATCH 1551/1854] plugins/amdgpu: fix printf format specifiers

Errors on aarch64:

	In file included from amdgpu_plugin_drm.h:10,
			 from amdgpu_plugin.c:33:
	amdgpu_plugin.c: In function 'amdgpu_plugin_dump_file':
	amdgpu_plugin_util.h:24:20: error: format '%lld' expects argument of type 'long long int', but argument 6 has type '__u64' {aka 'long unsigned int'} [-Werror=format=]
	   24 | #define LOG_PREFIX "amdgpu_plugin: "
	      |                    ^~~~~~~~~~~~~~~~~
	../../criu/include/log.h:47:52: note: in expansion of macro 'LOG_PREFIX'
	   47 | #define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
	      |                                                    ^~~~~~~~~~
	amdgpu_plugin.c:1236:9: note: in expansion of macro 'pr_info'
	 1236 |         pr_info("devices:%d bos:%d objects:%d priv_data:%lld\n", args.num_devices, args.num_bos, args.num_objects,
	      |         ^~~~~~~
	cc1: all warnings being treated as errors

Errors on ppc64:

	In file included from amdgpu_plugin_drm.h:10,
			 from amdgpu_plugin.c:33:
	amdgpu_plugin.c: In function 'amdgpu_plugin_dump_file':
	amdgpu_plugin_util.h:24:20: error: format '%llu' expects argument of type 'long long unsigned int', but argument 6 has type '__u64' {aka 'long unsigned int'} [-Werror=format=]
	   24 | #define LOG_PREFIX "amdgpu_plugin: "
	      |                    ^~~~~~~~~~~~~~~~~
	../../criu/include/log.h:47:52: note: in expansion of macro 'LOG_PREFIX'
	   47 | #define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
	      |                                                    ^~~~~~~~~~
	amdgpu_plugin.c:1236:9: note: in expansion of macro 'pr_info'
	 1236 |         pr_info("devices:%u bos:%u objects:%u priv_data:%llu\n",
	      |         ^~~~~~~
	cc1: all warnings being treated as errors
	In file included from amdgpu_plugin_util.c:38:
	amdgpu_plugin_util.c: In function 'print_kfd_bo_stat':
	amdgpu_plugin_util.h:24:20: error: format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type '__u64' {aka 'long unsigned int'} [-Werror=format=]
	   24 | #define LOG_PREFIX "amdgpu_plugin: "
	      |                    ^~~~~~~~~~~~~~~~~
	../../criu/include/log.h:47:52: note: in expansion of macro 'LOG_PREFIX'
	   47 | #define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
	      |                                                    ^~~~~~~~~~
	amdgpu_plugin_util.c:196:17: note: in expansion of macro 'pr_info'
	  196 |                 pr_info("%s(), %d. KFD BO Addr: %llx \n", __func__, idx, bo->addr);
	      |                 ^~~~~~~
	amdgpu_plugin_util.h:24:20: error: format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type '__u64' {aka 'long unsigned int'} [-Werror=format=]
	   24 | #define LOG_PREFIX "amdgpu_plugin: "
	      |                    ^~~~~~~~~~~~~~~~~
	../../criu/include/log.h:47:52: note: in expansion of macro 'LOG_PREFIX'
	   47 | #define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
	      |                                                    ^~~~~~~~~~
	amdgpu_plugin_util.c:197:17: note: in expansion of macro 'pr_info'
	  197 |                 pr_info("%s(), %d. KFD BO Size: %llx \n", __func__, idx, bo->size);
	      |                 ^~~~~~~
	amdgpu_plugin_util.h:24:20: error: format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type '__u64' {aka 'long unsigned int'} [-Werror=format=]
	   24 | #define LOG_PREFIX "amdgpu_plugin: "
	      |                    ^~~~~~~~~~~~~~~~~
	../../criu/include/log.h:47:52: note: in expansion of macro 'LOG_PREFIX'
	   47 | #define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
	      |                                                    ^~~~~~~~~~
	amdgpu_plugin_util.c:198:17: note: in expansion of macro 'pr_info'
	  198 |                 pr_info("%s(), %d. KFD BO Offset: %llx \n", __func__, idx, bo->offset);
	      |                 ^~~~~~~
	amdgpu_plugin_util.h:24:20: error: format '%llx' expects argument of type 'long long unsigned int', but argument 5 has type '__u64' {aka 'long unsigned int'} [-Werror=format=]
	   24 | #define LOG_PREFIX "amdgpu_plugin: "
	      |                    ^~~~~~~~~~~~~~~~~
	../../criu/include/log.h:47:52: note: in expansion of macro 'LOG_PREFIX'
	   47 | #define pr_info(fmt, ...) print_on_level(LOG_INFO, LOG_PREFIX fmt, ##__VA_ARGS__)
	      |                                                    ^~~~~~~~~~
	amdgpu_plugin_util.c:199:17: note: in expansion of macro 'pr_info'
	  199 |                 pr_info("%s(), %d. KFD BO Restored Offset: %llx \n", __func__, idx, bo->restored_offset);
	      |                 ^~~~~~~
	cc1: all warnings being treated as errors

Co-developed-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c      | 4 ++--
 plugins/amdgpu/amdgpu_plugin_util.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index b73b5101d..707aea5a9 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1233,8 +1233,8 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		goto exit;
 	}
 
-	pr_info("devices:%d bos:%d objects:%d priv_data:%lld\n", args.num_devices, args.num_bos, args.num_objects,
-		args.priv_data_size);
+	pr_info("devices:%" PRIu32 " bos:%" PRIu32 " objects:%" PRIu32 " priv_data:%" PRIu64 "\n",
+		args.num_devices, args.num_bos, args.num_objects, args.priv_data_size);
 
 	e = xmalloc(sizeof(*e));
 	if (!e) {
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
index 62e569fc8..a165fc9cd 100755
--- a/plugins/amdgpu/amdgpu_plugin_util.c
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -193,10 +193,10 @@ void print_kfd_bo_stat(int bo_cnt, struct kfd_criu_bo_bucket *bo_list)
 	for (int idx = 0; idx < bo_cnt; idx++) {
 		bo = &bo_list[idx];
 		pr_info("\n");
-		pr_info("%s(), %d. KFD BO Addr: %llx \n", __func__, idx, bo->addr);
-		pr_info("%s(), %d. KFD BO Size: %llx \n", __func__, idx, bo->size);
-		pr_info("%s(), %d. KFD BO Offset: %llx \n", __func__, idx, bo->offset);
-		pr_info("%s(), %d. KFD BO Restored Offset: %llx \n", __func__, idx, bo->restored_offset);
+		pr_info("%s(), %d. KFD BO Addr: %" PRIx64 " \n", __func__, idx, bo->addr);
+		pr_info("%s(), %d. KFD BO Size: %" PRIx64 " \n", __func__, idx, bo->size);
+		pr_info("%s(), %d. KFD BO Offset: %" PRIx64 " \n", __func__, idx, bo->offset);
+		pr_info("%s(), %d. KFD BO Restored Offset: %" PRIx64 " \n", __func__, idx, bo->restored_offset);
 		pr_info("%s(), %d. KFD BO Alloc Flags: %x \n", __func__, idx, bo->alloc_flags);
 		pr_info("%s(), %d. KFD BO Gpu ID: %x \n", __func__, idx, bo->gpu_id);
 		pr_info("%s(), %d. KFD BO Dmabuf FD: %x \n", __func__, idx, bo->dmabuf_fd);

From 615ccf98cf82f649851a37d37eb5e58d6d17bb53 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 5 Jul 2024 08:22:55 +0000
Subject: [PATCH 1552/1854] crit: do not crash on aarch64 doing 'crit x ./ rss'

Running 'crit x ./ rss' on aarch64 crashes with:

    File "/home/criu/crit/crit/__main__.py", line 331, in explore_rss
      while vmas[vmi]['start'] < pme:
            ~~~~^^^^^
  IndexError: list index out of range

This adds an additional check to the while loop to do access indexes out
of range.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 crit/crit/__main__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crit/crit/__main__.py b/crit/crit/__main__.py
index e15327f50..bce523445 100755
--- a/crit/crit/__main__.py
+++ b/crit/crit/__main__.py
@@ -323,12 +323,12 @@ def explore_rss(opts):
         pvmi = -1
         for pm in pms[1:]:
             pstr = '\t%lx / %-8d' % (pm['vaddr'], pm['nr_pages'])
-            while vmas[vmi]['end'] <= pm['vaddr']:
+            while vmi < len(vmas) and vmas[vmi]['end'] <= pm['vaddr']:
                 vmi += 1
 
             pme = pm['vaddr'] + (pm['nr_pages'] << 12)
             vstr = ''
-            while vmas[vmi]['start'] < pme:
+            while vmi < len(vmas) and vmas[vmi]['start'] < pme:
                 vma = vmas[vmi]
                 if vmi == pvmi:
                     vstr += ' ~'

From 01c65732b631fa0c61dff8d59d56bb13ab252e3d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 8 Jul 2024 16:50:23 +0000
Subject: [PATCH 1553/1854] test: better test for SELinux tools

Previously the check was just if /sys/fs/selinux is mounted. This
extends the check to see if all necessary tools are installed.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/selinux00.checkskip | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/zdtm/static/selinux00.checkskip b/test/zdtm/static/selinux00.checkskip
index 8d946a75e..4c85647d1 100755
--- a/test/zdtm/static/selinux00.checkskip
+++ b/test/zdtm/static/selinux00.checkskip
@@ -2,6 +2,19 @@
 
 test -d /sys/fs/selinux || exit 1
 
+# check if necessary commands are installed
+if ! command -v setenforce &>/dev/null; then
+	exit 1
+fi
+
+if ! command -v setsebool &>/dev/null; then
+	exit 1
+fi
+
+if ! command -v getsebool &>/dev/null; then
+	exit 1
+fi
+
 # See selinux00.hook for details
 
 getsebool unconfined_dyntrans_all > /dev/null 2>&1

From d44fc0de5a314629e305507d3d09a17d372c47d8 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 8 Jul 2024 16:51:28 +0000
Subject: [PATCH 1554/1854] test: only run macvlan tests if macvlan devices can
 be created

Some test environments (Actuated runners for example) do not support
maclvan devices. Skip tests depending on it automatically.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/ns_ext/run.sh          |  5 ++++
 test/zdtm/static/macvlan.checkskip | 38 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100755 test/zdtm/static/macvlan.checkskip

diff --git a/test/others/ns_ext/run.sh b/test/others/ns_ext/run.sh
index 4ebe3e280..5d1e139d7 100755
--- a/test/others/ns_ext/run.sh
+++ b/test/others/ns_ext/run.sh
@@ -2,6 +2,11 @@
 
 set -x
 
+if ! ../../zdtm/static/macvlan.checkskip; then
+	echo "No macvlan support. Skipping"
+	exit 0
+fi
+
 if [[ "$1" == "pid" ]]; then
 	NS=pid
 else
diff --git a/test/zdtm/static/macvlan.checkskip b/test/zdtm/static/macvlan.checkskip
new file mode 100755
index 000000000..f4e060953
--- /dev/null
+++ b/test/zdtm/static/macvlan.checkskip
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+FAIL=0
+
+create_macvlan_device() {
+	if ! ip link add test_mvlan1 type veth >/dev/null 2>&1; then
+		FAIL=1
+	fi
+	if ! ip link add mymacvlan1 link test_mvlan1 type macvlan >/dev/null 2>&1; then
+		FAIL=1
+	fi
+
+	return "${FAIL}"
+}
+
+cleanup() {
+	ip link del test_mvlan1 >/dev/null 2>&1
+	ip link del mymacvlan1 >/dev/null 2>&1
+}
+
+trap "cleanup" QUIT TERM INT HUP EXIT
+
+# Test once without loading the module
+if create_macvlan_device; then
+	exit 0
+fi
+
+# Test once more with explicitly loading the module
+if ! modprobe macvlan >/dev/null 2>&1; then
+	exit 1
+fi
+create_macvlan_device
+
+if [ "${FAIL}" == "1" ]; then
+	exit 1
+fi
+
+exit 0

From 8beac656fccac38d779d672ed9510d57c6fc73e2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 8 Jul 2024 17:02:09 +0000
Subject: [PATCH 1555/1854] coredump: fail on unsupported architectures early

Currently coredump only works on x86_64. Fail early on any other
architecture.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 coredump/coredump                 | 5 +++++
 test/others/criu-coredump/test.sh | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/coredump/coredump b/coredump/coredump
index f70d37c13..3fbdafe81 100755
--- a/coredump/coredump
+++ b/coredump/coredump
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import platform
 import argparse
 import os
 import sys
@@ -36,6 +37,10 @@ def main():
 
     opts = vars(parser.parse_args())
 
+    if platform.machine() != 'x86_64':
+        print('ERROR: %s only supported on x86_64' % sys.argv[0])
+        sys.exit(1)
+
     try:
         coredump(opts)
     except SystemExit as error:
diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index eec2b817f..4399044d7 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -43,5 +43,13 @@ function run_test {
 	echo "= done"
 }
 
+UNAME_M=$(uname -m)
+
+if [ "$UNAME_M" != "x86_64" ]; then
+	# the criu-coredump script is only x86_64 aware
+	echo "criu-coredump only support x86_64. skipping."
+	exit 0
+fi
+
 gen_imgs
 run_test

From dbfa450246dd39f3b80aa1a5ef15c077809abe68 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 4 Jul 2024 12:09:06 +0000
Subject: [PATCH 1556/1854] ci: run aarch64 tests native via actuated

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/actuated-aarch64-test.yaml | 52 ++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/actuated-aarch64-test.yaml

diff --git a/.github/workflows/actuated-aarch64-test.yaml b/.github/workflows/actuated-aarch64-test.yaml
new file mode 100644
index 000000000..8b0a63fc7
--- /dev/null
+++ b/.github/workflows/actuated-aarch64-test.yaml
@@ -0,0 +1,52 @@
+name: Actuated aarch64 test
+
+on: [push, pull_request]
+
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: actuated-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
+jobs:
+  build:
+    # Actuated runners are not available in all repositories.
+    if: ${{ github.repository == 'checkpoint-restore/criu' }}
+    # The memory size and the number of CPUs can be freely selected.
+    # 3GB and 4 CPUs seems to be enough according to the result from 'vmmeter'.
+    runs-on: actuated-arm64-4cpu-3gb
+    strategy:
+      matrix:
+        target: [GCC=1, CLANG=1]
+
+    steps:
+    # https://gist.github.com/alexellis/1f33e581c75e11e161fe613c46180771#file-metering-gha-md
+    # vmmeter start
+    - name: Prepare arkade
+      uses: alexellis/arkade-get@master
+      with:
+        crane: latest
+        print-summary: false
+
+    - name: Install vmmeter
+      run: |
+        crane export --platform linux/arm64 ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
+
+    - name: Run vmmeter
+      uses: self-actuated/vmmeter-action@master
+    # vmmeter end
+
+    - uses: actions/checkout@v4
+    - name: Run Tests ${{ matrix.target }}
+      # Following tests are failing on the actuated VMs:
+      #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
+      #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))
+      #
+      # In combination with '--remote-lazy-pages' following error occurs:
+      #  138: FAIL: maps05.c:84: Data corrupted at page 1639 (errno = 11 (Resource temporarily unavailable))
+      run: |
+        # The 'sched_policy00' needs the following:
+        sudo sysctl -w kernel.sched_rt_runtime_us=-1
+        # etc/hosts entry is needed for netns_lock_iptables
+        echo "127.0.0.1   localhost" | sudo tee -a /etc/hosts
+        sudo -E make -C scripts/ci local ${{ matrix.target }} RUN_TESTS=1 \
+          ZDTM_OPTS="-x zdtm/static/change_mnt_context -x zdtm/static/maps05"

From b1b3c14b179053a7c56b7d3449fc104ea7cca274 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 16 Aug 2024 22:15:20 +0100
Subject: [PATCH 1557/1854] cuda: unlock on timeout error

When attempting to checkpoint a container with CUDA processes,
CRIU could fail with the following error:

	Error (criu/cr-dump.c:1791): Timeout reached. Try to interrupt: 1
	Error (cuda_plugin.c:143): cuda_plugin: Unable to read output of cuda-checkpoint: Interrupted system call
	Error (cuda_plugin.c:384): cuda_plugin: PAUSE_DEVICES failed with

In this situation, the target process is locked, but CRIU fails due to
a timeout and exits with an error. We need to make sure that the target
PID is unlocked in such case.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 39c78e370..174545476 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -4,6 +4,7 @@
 #include "cr_options.h"
 #include "pid.h"
 #include "proc_parse.h"
+#include "seize.h"
 
 #include <common/list.h>
 #include <compel/infect.h>
@@ -379,18 +380,23 @@ int cuda_plugin_pause_devices(int pid)
 	int status = cuda_process_checkpoint_action(pid, ACTION_LOCK, opts.timeout * 1000, msg_buf, sizeof(msg_buf));
 	if (status) {
 		pr_err("PAUSE_DEVICES failed with %s\n", msg_buf);
-		return -1;
-	}
-	if (add_pid_to_buf(&cuda_pids, pid)) {
-		pr_err("unable to track paused pid %d\n", pid);
-		status = cuda_process_checkpoint_action(pid, ACTION_UNLOCK, 0, msg_buf, sizeof(msg_buf));
-		if (status) {
-			pr_err("Failed to unlock process status %s, pid %d may hang\n", msg_buf, pid);
-		}
+		if (alarm_timeouted())
+			goto unlock;
 		return -1;
 	}
 
+	if (add_pid_to_buf(&cuda_pids, pid)) {
+		pr_err("unable to track paused pid %d\n", pid);
+		goto unlock;
+	}
+
 	return 0;
+unlock:
+	status = cuda_process_checkpoint_action(pid, ACTION_UNLOCK, 0, msg_buf, sizeof(msg_buf));
+	if (status) {
+		pr_err("Failed to unlock process status %s, pid %d may hang\n", msg_buf, pid);
+	}
+	return -1;
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__PAUSE_DEVICES, cuda_plugin_pause_devices)
 

From edb6fbb820ca1afcf6264edeacd3207dfc2d721c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 17 Aug 2024 14:30:21 +0100
Subject: [PATCH 1558/1854] scripts/uninstall_module: fix package discovery

The `uninstall_module.py` script is a wrapper for the `pip uninstall`
command that enables support for specifying installation prefix
(i.e., `--prefix`). When this functionality is used, we intentionally
set `sys.path` to include only search paths for the specified prefix
to avoid unintentional uninstallation of packages in system paths.

Since `importlib_metadata` version 8.1.0, the `Distribution.from_name()`
method has been modified [1] to perform additional pre-processing of
Distribution objects [2] that requires loading distribution metadata
and results in the following error:

  File "/usr/local/lib/python3.12/site-packages/importlib_metadata/__init__.py", line 422, in <lambda>
    buckets = bucket(dists, lambda dist: bool(dist.metadata))
                                              ^^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/site-packages/importlib_metadata/__init__.py", line 454, in metadata
    from . import _adapters
  File "/usr/local/lib/python3.12/site-packages/importlib_metadata/_adapters.py", line 3, in <module>
    import email.message
  File "/usr/lib64/python3.12/email/message.py", line 11, in <module>
    import quopri
  ModuleNotFoundError: No module named 'quopri'

This error occurs because we have excluded system paths from the list
of search paths (`sys.path`).

However, this pre-processing is not required for our use case, as we
only use the discovery mechanism of importlib_metadata to resolve the
metadata directory path of the module being uninstalled.

To fix this problem, this patch updates `uninstall_module` to avoid the
`from_name()` method and use `discover(name=package_name)` directly.

[1] https://github.com/python/importlib_metadata/commit/a65c29adc027b3615154cab73aaedd58a6aa23da
[2] https://github.com/python/importlib_metadata/blob/a65c29ad/importlib_metadata/__init__.py#L391

Fixes: #2468

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/uninstall_module.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/uninstall_module.py b/scripts/uninstall_module.py
index 439fca18a..8a9b70892 100755
--- a/scripts/uninstall_module.py
+++ b/scripts/uninstall_module.py
@@ -38,8 +38,9 @@ def uninstall_module(package_name: str, prefix=None):
     if prefix:
         add_site_dir(prefix)
         try:
-            dist_info_path = str(importlib_metadata.distribution(package_name)._path)
-        except importlib_metadata.PackageNotFoundError:
+            distribution = next(importlib_metadata.Distribution.discover(name=package_name))
+            dist_info_path = str(distribution._path)
+        except StopIteration:
             print(f"Skipping {package_name} as it is not installed.")
             sys.exit(0)
 

From 59f49c6276090ff7b8de19b2fcabbd968fc77f0d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 12 Sep 2024 14:30:30 +0100
Subject: [PATCH 1559/1854] codespell: fix typos

This patch fixes the following typos reported by codespell:

./test/others/bers/bers.c:394: dependin ==> depending, depend in
./criu/kerndat.c:837: hitted ==> hit

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/kerndat.c          | 2 +-
 test/others/bers/bers.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 1a584fe92..fa1ed21fa 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -834,7 +834,7 @@ static int kerndat_detect_stack_guard_gap(void)
 		 * (see kernel commit 1be7107fbe18ee).
 		 *
 		 * Same time there was semi-complete
-		 * patch released which hitted a number
+		 * patch released which hit a number
 		 * of repos (Ubuntu, Fedora) where instead
 		 * of PAGE_SIZE the 1M gap is cut off.
 		 */
diff --git a/test/others/bers/bers.c b/test/others/bers/bers.c
index 37cf84dd3..b291e3bcb 100644
--- a/test/others/bers/bers.c
+++ b/test/others/bers/bers.c
@@ -391,7 +391,7 @@ usage:
 	pr_msg("    -f|--files <num>         create <num> files for each task\n");
 	pr_msg("    -m|--memory <num>        allocate <num> megabytes for each task\n");
 	pr_msg("    --memory-chunks <num>    split memory to <num> equal parts\n");
-	pr_msg("    --mem-fill <mode>        fill memory with data dependin on <mode>:\n");
+	pr_msg("    --mem-fill <mode>        fill memory with data depending on <mode>:\n");
 	pr_msg("                all          fill every byte of memory\n");
 	pr_msg("                light        fill first bytes of every page\n");
 	pr_msg("                dirtify      fill every page\n");

From 651df375bd3cbacd27bde44546f19f29546db576 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Wed, 11 Sep 2024 17:37:45 -0700
Subject: [PATCH 1560/1854] criu: Allow disabling freeze cgroups

Some plugins (e.g., CUDA) may not function correctly when processes are
frozen using cgroups. This change introduces a mechanism to disable the
use of freeze cgroups during process seizing, even if explicitly
requested via the --freeze-cgroup option.

The CUDA plugin is updated to utilize this new mechanism to ensure
compatibility.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/include/seize.h       |  1 +
 criu/seize.c               | 66 +++++++++++++++++++++++++++++++-------
 plugins/cuda/cuda_plugin.c |  2 ++
 3 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/criu/include/seize.h b/criu/include/seize.h
index 4545bf262..3225029dd 100644
--- a/criu/include/seize.h
+++ b/criu/include/seize.h
@@ -8,5 +8,6 @@ extern bool alarm_timeouted(void);
 
 extern char *task_comm_info(pid_t pid, char *comm, size_t size);
 extern char *__task_comm_info(pid_t pid);
+extern void dont_use_freeze_cgroup(void);
 
 #endif
diff --git a/criu/seize.c b/criu/seize.c
index ba26072e6..edeb57cc8 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -25,6 +25,19 @@
 #include "xmalloc.h"
 #include "util.h"
 
+static bool freeze_cgroup_disabled;
+
+/*
+ * Disables the use of freeze cgroups for process seizing, even if explicitly
+ * requested via the --freeze-cgroup option. This is necessary for plugins
+ * (e.g., CUDA) that do not function correctly when processes are frozen using
+ * cgroups.
+ */
+void __attribute__((used)) dont_use_freeze_cgroup(void)
+{
+	freeze_cgroup_disabled = true;
+}
+
 char *task_comm_info(pid_t pid, char *comm, size_t size)
 {
 	bool is_read = false;
@@ -397,7 +410,7 @@ static int freezer_detach(void)
 {
 	int i;
 
-	if (!opts.freeze_cgroup)
+	if (!opts.freeze_cgroup || freeze_cgroup_disabled)
 		return 0;
 
 	for (i = 0; i < processes_to_wait && processes_to_wait_pids; i++) {
@@ -492,6 +505,31 @@ static int log_unfrozen_stacks(char *root)
 	return 0;
 }
 
+static int check_freezer_cgroup(void)
+{
+	enum freezer_state state = THAWED;
+	int fd;
+
+	BUG_ON(!freeze_cgroup_disabled);
+
+	fd = freezer_open();
+	if (fd < 0)
+		return -1;
+
+	state = get_freezer_state(fd);
+	close(fd);
+	if (state == FREEZER_ERROR) {
+		return -1;
+	}
+
+	if (state != THAWED) {
+		pr_err("One or more plugins are incompatible with the freezer cgroup in the FROZEN state.\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int freeze_processes(void)
 {
 	int fd, exit_code = -1;
@@ -643,7 +681,7 @@ static int collect_children(struct pstree_item *item)
 			goto free;
 		}
 
-		if (!opts.freeze_cgroup)
+		if (!opts.freeze_cgroup || freeze_cgroup_disabled)
 			/* fails when meets a zombie */
 			__ignore_value(compel_interrupt_task(pid));
 
@@ -831,7 +869,8 @@ static int collect_threads(struct pstree_item *item)
 
 		pr_info("\tSeizing %d's %d thread\n", item->pid->real, pid);
 
-		if (!opts.freeze_cgroup && compel_interrupt_task(pid))
+		if ((!opts.freeze_cgroup || freeze_cgroup_disabled) &&
+		    compel_interrupt_task(pid))
 			continue;
 
 		ret = compel_wait_task(pid, item_ppid(item), parse_pid_status, NULL, &t_creds.s, NULL);
@@ -887,7 +926,7 @@ static int collect_loop(struct pstree_item *item, int (*collect)(struct pstree_i
 {
 	int attempts = NR_ATTEMPTS, nr_inprogress = 1;
 
-	if (opts.freeze_cgroup)
+	if (opts.freeze_cgroup && !freeze_cgroup_disabled)
 		attempts = 1;
 
 	/*
@@ -993,12 +1032,16 @@ int collect_pstree(void)
 
 	pr_debug("Detected cgroup V%d freezer\n", cgroup_v2 ? 2 : 1);
 
-	if (opts.freeze_cgroup && freeze_processes())
-		goto err;
-
-	if (!opts.freeze_cgroup && compel_interrupt_task(pid)) {
-		set_cr_errno(ESRCH);
-		goto err;
+	if (opts.freeze_cgroup && !freeze_cgroup_disabled) {
+		if (freeze_processes())
+			goto err;
+	} else {
+		if (opts.freeze_cgroup && check_freezer_cgroup())
+			goto err;
+		if (compel_interrupt_task(pid)) {
+			set_cr_errno(ESRCH);
+			goto err;
+		}
 	}
 
 	ret = compel_wait_task(pid, -1, parse_pid_status, NULL, &creds.s, NULL);
@@ -1024,7 +1067,8 @@ int collect_pstree(void)
 	if (ret < 0)
 		goto err;
 
-	if (opts.freeze_cgroup && freezer_wait_processes()) {
+	if (opts.freeze_cgroup && !freeze_cgroup_disabled &&
+	    freezer_wait_processes()) {
 		ret = -1;
 		goto err;
 	}
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 174545476..04d70b114 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -483,6 +483,8 @@ int cuda_plugin_init(int stage)
 		INIT_LIST_HEAD(&cuda_pids);
 	}
 
+	dont_use_freeze_cgroup();
+
 	return 0;
 }
 

From e1331a4b60e49d0b70895d3d57350825ad2026d1 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Thu, 12 Sep 2024 11:17:56 -0700
Subject: [PATCH 1561/1854] fault: allow to check dont_use_freeze_cgroup

Adds a new "fault" to call dont_use_freeze_cgroup.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/fault-injection.c         | 9 +++++++++
 criu/include/fault-injection.h | 1 +
 criu/include/seize.h           | 1 +
 test/jenkins/criu-fault.sh     | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/criu/fault-injection.c b/criu/fault-injection.c
index 83dc1fc8d..2272e6d84 100644
--- a/criu/fault-injection.c
+++ b/criu/fault-injection.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "criu-log.h"
 #include "fault-injection.h"
+#include "seize.h"
 
 enum faults fi_strategy;
 
@@ -21,5 +22,13 @@ int fault_injection_init(void)
 	}
 
 	fi_strategy = start;
+
+	switch (fi_strategy) {
+	case FI_DISABLE_FREEZE_CGROUP:
+		dont_use_freeze_cgroup();
+		break;
+	default:
+		break;
+	};
 	return 0;
 }
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 552ee4338..82c3a1f7f 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -21,6 +21,7 @@ enum faults {
 	FI_CORRUPT_EXTREGS = 134,
 	FI_DONT_USE_PAGEMAP_SCAN = 135,
 	FI_DUMP_CRASH = 136,
+	FI_DISABLE_FREEZE_CGROUP = 137,
 	FI_MAX,
 };
 
diff --git a/criu/include/seize.h b/criu/include/seize.h
index 3225029dd..f5ea76b16 100644
--- a/criu/include/seize.h
+++ b/criu/include/seize.h
@@ -2,6 +2,7 @@
 #define __CR_SEIZE_H__
 
 extern int collect_pstree(void);
+struct pstree_item;
 extern void pstree_switch_state(struct pstree_item *root_item, int st);
 extern const char *get_real_freezer_state(void);
 extern bool alarm_timeouted(void);
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 1fda40a96..fc0eddc2b 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -40,6 +40,10 @@ fi
 # also check for the main thread corruption
 ./test/zdtm.py run -t zdtm/static/fpu00 --fault 134 -f h --norst || fail
 
+# check dont_use_freeze_cgroup
+./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:t --fault 137
+./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:t --fault 137 --norst
+
 if ./test/zdtm.py run -t zdtm/static/vfork00 --fault 136 --report report -f h ; then
 	fail
 fi

From 6918998897f1c75cd82e042df6c113c42e30c57e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sat, 14 Sep 2024 09:08:12 -0700
Subject: [PATCH 1562/1854] plugin/cuda: disable CUDA plugin if /dev/nvidiactl
 isn't present

The presence of /dev/nvidiactl indicates that the system has a
compatible NVIDIA GPU driver installed and that the GPU is accessible to
the operating system.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/include/fault-injection.h |  1 +
 plugins/cuda/cuda_plugin.c     | 10 +++++++++-
 scripts/ci/run-ci-tests.sh     |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 82c3a1f7f..59adf05b9 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -22,6 +22,7 @@ enum faults {
 	FI_DONT_USE_PAGEMAP_SCAN = 135,
 	FI_DUMP_CRASH = 136,
 	FI_DISABLE_FREEZE_CGROUP = 137,
+	FI_PLUGIN_CUDA_FORCE_ENABLE = 138,
 	FI_MAX,
 };
 
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 04d70b114..23c3f4b1a 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -5,6 +5,7 @@
 #include "pid.h"
 #include "proc_parse.h"
 #include "seize.h"
+#include "fault-injection.h"
 
 #include <common/list.h>
 #include <compel/infect.h>
@@ -460,8 +461,15 @@ CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, cuda_plugin_resume_
 
 int cuda_plugin_init(int stage)
 {
-	int ret = cuda_checkpoint_supports_flag("--action");
+	int ret;
 
+	if (!fault_injected(FI_PLUGIN_CUDA_FORCE_ENABLE) && access("/dev/nvidiactl", F_OK)) {
+		pr_info("/dev/nvidiactl doesn't exist. The CUDA plugin is disabled.\n");
+		plugin_disabled = true;
+		return 0;
+	}
+
+	ret = cuda_checkpoint_supports_flag("--action");
 	if (ret == -1) {
 		pr_warn("check that %s is present in $PATH\n", CUDA_CHECKPOINT);
 		plugin_disabled = true;
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 26ea00c53..38b7b5097 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -363,4 +363,4 @@ make -C plugins/amdgpu/ test_topology_remap
 ./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin amdgpu
 ./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin amdgpu cuda
 
-./test/zdtm.py run -t zdtm/static/sigpending -t zdtm/static/pthread00 --mocked-cuda-checkpoint
+./test/zdtm.py run -t zdtm/static/sigpending -t zdtm/static/pthread00 --mocked-cuda-checkpoint --fault 138

From 60ee5ebd9d20ca87ad102449676d0230b8217173 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Mon, 16 Sep 2024 09:36:25 -0400
Subject: [PATCH 1563/1854] plugins/amdgpu: Zero ib_info on initialization

This struct was being used un-initialized, meaning it
was filled with random garbage.

Mea culpa.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 plugins/amdgpu/amdgpu_plugin.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 707aea5a9..b56ba6d14 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -608,6 +608,7 @@ static int sdma_copy_bo(struct kfd_criu_bo_bucket bo_bucket, FILE *storage_fp,
 	while (bytes_remain > 0) {
 		memset(&cs_req, 0, sizeof(cs_req));
 		memset(&fence, 0, sizeof(fence));
+		memset(&ib_info, 0, sizeof(ib_info));
 		memset(ib, 0, packets_per_buffer * 28);
 
 		if (type == SDMA_OP_VRAM_WRITE) {

From 096c1f7a4dee8bbf6fbcd82726961e1ea0249086 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Mon, 16 Sep 2024 09:43:12 -0400
Subject: [PATCH 1564/1854] plugins/amdgpu - Increase maximum parameter length

The topology parsing assumed that all parameter names were
30 characters or fewer, but

recommended_sdma_engine_id_mask

is 31 characters.

Make the maximum length a macro, and set it to 64.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 plugins/amdgpu/amdgpu_plugin_topology.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index c5fa51fda..5b4396a0c 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -20,6 +20,7 @@
 #include "amdgpu_plugin_topology.h"
 
 #define TOPOLOGY_PATH "/sys/class/kfd/kfd/topology/nodes/"
+#define MAX_PARAMETER_LEN 64
 
 /* User override options */
 /* Skip firmware version check */
@@ -417,7 +418,9 @@ struct tp_node *sys_add_node(struct tp_system *sys, uint32_t id, uint32_t gpu_id
 
 static bool get_prop(char *line, char *name, uint64_t *value)
 {
-	if (sscanf(line, " %29s %lu", name, value) != 2)
+	char format[16];
+	sprintf(format, " %%%ds %%lu", MAX_PARAMETER_LEN);
+	if (sscanf(line, format, name, value) != 2)
 		return false;
 	return true;
 }
@@ -437,7 +440,7 @@ static int parse_topo_node_properties(struct tp_node *dev, const char *dir_path)
 	}
 
 	while (fgets(line, sizeof(line), file)) {
-		char name[30];
+		char name[MAX_PARAMETER_LEN + 1];
 		uint64_t value;
 
 		memset(name, 0, sizeof(name));
@@ -565,7 +568,7 @@ static int parse_topo_node_mem_banks(struct tp_node *node, const char *dir_path)
 			}
 
 			while (fgets(line, sizeof(line), file)) {
-				char name[30];
+				char name[MAX_PARAMETER_LEN + 1];
 				uint64_t value;
 
 				memset(name, 0, sizeof(name));
@@ -654,7 +657,7 @@ static int parse_topo_node_iolinks(struct tp_node *node, const char *dir_path)
 			}
 
 			while (fgets(line, sizeof(line), file)) {
-				char name[30];
+				char name[MAX_PARAMETER_LEN + 1];
 				uint64_t value;
 
 				memset(name, 0, sizeof(name));

From a8cbe76d4f230273bb3cd51174d87b73bb5c1c26 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Thu, 12 Sep 2024 11:19:35 -0700
Subject: [PATCH 1565/1854] util: dump fsfd log messages

It should help to investigate errors of fsconfig, fsmount and etc.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/cgroup.c          | 18 +++++++-----
 criu/cr-check.c        | 21 +++++++-------
 criu/include/syscall.h | 17 ------------
 criu/include/util.h    |  5 ++++
 criu/util.c            | 62 +++++++++++++++++++++++++++++++++++++++---
 5 files changed, 84 insertions(+), 39 deletions(-)
 delete mode 100644 criu/include/syscall.h

diff --git a/criu/cgroup.c b/criu/cgroup.c
index d90b70bb7..fcaed0708 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -28,7 +28,6 @@
 #include "images/cgroup.pb-c.h"
 #include "kerndat.h"
 #include "linux/mount.h"
-#include "syscall.h"
 
 /*
  * This structure describes set of controller groups
@@ -581,14 +580,15 @@ static int __new_open_cgroupfs(struct cg_ctl *cc)
 	int fsfd, fd;
 	char *name;
 
-	fsfd = sys_fsopen(fstype, 0);
+	fsfd = cr_fsopen(fstype, 0);
 	if (fsfd < 0) {
 		pr_perror("Unable to open the cgroup file system");
 		return -1;
 	}
 
 	if (strstartswith(cc->name, namestr)) {
-		if (sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "name", cc->name + strlen(namestr), 0)) {
+		if (cr_fsconfig(fsfd, FSCONFIG_SET_STRING, "name", cc->name + strlen(namestr), 0)) {
+			fsfd_dump_messages(fsfd);
 			pr_perror("Unable to configure the cgroup (%s) file system", cc->name);
 			goto err;
 		}
@@ -596,7 +596,8 @@ static int __new_open_cgroupfs(struct cg_ctl *cc)
 		char *saveptr = NULL, *buf = strdupa(cc->name);
 		name = strtok_r(buf, ",", &saveptr);
 		while (name) {
-			if (sys_fsconfig(fsfd, FSCONFIG_SET_FLAG, name, NULL, 0)) {
+			if (cr_fsconfig(fsfd, FSCONFIG_SET_FLAG, name, NULL, 0)) {
+				fsfd_dump_messages(fsfd);
 				pr_perror("Unable to configure the cgroup (%s) file system", name);
 				goto err;
 			}
@@ -604,14 +605,17 @@ static int __new_open_cgroupfs(struct cg_ctl *cc)
 		}
 	}
 
-	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0)) {
+	if (cr_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0)) {
+		fsfd_dump_messages(fsfd);
 		pr_perror("Unable to create the cgroup (%s) file system", cc->name);
 		goto err;
 	}
 
-	fd = sys_fsmount(fsfd, 0, 0);
-	if (fd < 0)
+	fd = cr_fsmount(fsfd, 0, 0);
+	if (fd < 0) {
+		fsfd_dump_messages(fsfd);
 		pr_perror("Unable to mount the cgroup (%s) file system", cc->name);
+	}
 	close(fsfd);
 
 	return fd;
diff --git a/criu/cr-check.c b/criu/cr-check.c
index 507f9915c..0388cbe7f 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -54,7 +54,6 @@
 #include "restorer.h"
 #include "uffd.h"
 #include "linux/aio_abi.h"
-#include "syscall.h"
 #include "mount-v2.h"
 
 #include "images/inventory.pb-c.h"
@@ -1437,18 +1436,18 @@ static int ovl_mount(void)
 {
 	int tmpfs, fsfd, ovl;
 
-	fsfd = sys_fsopen("tmpfs", 0);
+	fsfd = cr_fsopen("tmpfs", 0);
 	if (fsfd == -1) {
 		pr_perror("Unable to fsopen tmpfs");
 		return -1;
 	}
 
-	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) == -1) {
+	if (cr_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) == -1) {
 		pr_perror("Unable to create tmpfs mount");
 		return -1;
 	}
 
-	tmpfs = sys_fsmount(fsfd, 0, 0);
+	tmpfs = cr_fsmount(fsfd, 0, 0);
 	if (tmpfs == -1) {
 		pr_perror("Unable to mount tmpfs");
 		return -1;
@@ -1475,23 +1474,23 @@ static int ovl_mount(void)
 		return -1;
 	}
 
-	fsfd = sys_fsopen("overlay", 0);
+	fsfd = cr_fsopen("overlay", 0);
 	if (fsfd == -1) {
 		pr_perror("Unable to fsopen overlayfs");
 		return -1;
 	}
-	if (sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0) == -1 ||
-	    sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "lowerdir", "/tmp/l", 0) == -1 ||
-	    sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "upperdir", "/tmp/u", 0) == -1 ||
-	    sys_fsconfig(fsfd, FSCONFIG_SET_STRING, "workdir", "/tmp/w", 0) == -1) {
+	if (cr_fsconfig(fsfd, FSCONFIG_SET_STRING, "source", "test", 0) == -1 ||
+	    cr_fsconfig(fsfd, FSCONFIG_SET_STRING, "lowerdir", "/tmp/l", 0) == -1 ||
+	    cr_fsconfig(fsfd, FSCONFIG_SET_STRING, "upperdir", "/tmp/u", 0) == -1 ||
+	    cr_fsconfig(fsfd, FSCONFIG_SET_STRING, "workdir", "/tmp/w", 0) == -1) {
 		pr_perror("Unable to configure overlayfs");
 		return -1;
 	}
-	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) == -1) {
+	if (cr_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) == -1) {
 		pr_perror("Unable to create overlayfs");
 		return -1;
 	}
-	ovl = sys_fsmount(fsfd, 0, 0);
+	ovl = cr_fsmount(fsfd, 0, 0);
 	if (ovl == -1) {
 		pr_perror("Unable to mount overlayfs");
 		return -1;
diff --git a/criu/include/syscall.h b/criu/include/syscall.h
deleted file mode 100644
index c38d6d971..000000000
--- a/criu/include/syscall.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __CR_SYSCALL_H__
-#define __CR_SYSCALL_H__
-
-static inline int sys_fsopen(const char *fsname, unsigned int flags)
-{
-	return syscall(__NR_fsopen, fsname, flags);
-}
-static inline int sys_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux)
-{
-	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
-}
-static inline int sys_fsmount(int fd, unsigned int flags, unsigned int attr_flags)
-{
-	return syscall(__NR_fsmount, fd, flags, attr_flags);
-}
-
-#endif /* __CR_SYSCALL_H__ */
\ No newline at end of file
diff --git a/criu/include/util.h b/criu/include/util.h
index 435469e1e..ae293a68c 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -387,6 +387,11 @@ static inline void print_stack_trace(pid_t pid)
 
 extern int mount_detached_fs(const char *fsname);
 
+extern int cr_fsopen(const char *fsname, unsigned int flags);
+extern int cr_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux);
+extern int cr_fsmount(int fd, unsigned int flags, unsigned int attr_flags);
+extern void fsfd_dump_messages(int fd);
+
 extern char *get_legacy_iptables_bin(bool ipv6, bool restore);
 
 extern int set_opts_cap_eff(void);
diff --git a/criu/util.c b/criu/util.c
index 7dfa1fe42..d2bc9a865 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -39,7 +39,6 @@
 #include "mem.h"
 #include "namespaces.h"
 #include "criu-log.h"
-#include "syscall.h"
 #include "util-caps.h"
 
 #include "clone-noasan.h"
@@ -1556,23 +1555,78 @@ void print_stack_trace(pid_t pid)
 }
 #endif
 
+int cr_fsopen(const char *fsname, unsigned int flags)
+{
+	return syscall(__NR_fsopen, fsname, flags);
+}
+
+int cr_fsconfig(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+{
+	int ret = syscall(__NR_fsconfig, fd, cmd, key, value, aux);
+	if (ret)
+		fsfd_dump_messages(fd);
+	return ret;
+}
+
+int cr_fsmount(int fd, unsigned int flags, unsigned int attr_flags)
+{
+	int ret = syscall(__NR_fsmount, fd, flags, attr_flags);
+	if (ret)
+		fsfd_dump_messages(fd);
+	return ret;
+}
+
+void fsfd_dump_messages(int fd)
+{
+        char buf[4096];
+        int err, n;
+
+        err = errno;
+
+        for (;;) {
+                n = read(fd, buf, sizeof(buf) - 1);
+                if (n < 0) {
+			if (errno != ENODATA)
+				pr_perror("Unable to read from fs descriptor");
+                        break;
+		}
+		buf[n] = 0;
+
+                switch (buf[0]) {
+                case 'w':
+                        pr_warn("%s\n", buf);
+                        break;
+                case 'i':
+                        pr_info("%s\n", buf);
+                        break;
+                case 'e':
+			/* fallthrough */
+		default:
+                        pr_err("%s\n", buf);
+                        break;
+                }
+        }
+
+        errno = err;
+}
+
 int mount_detached_fs(const char *fsname)
 {
 	int fsfd, fd;
 
-	fsfd = sys_fsopen(fsname, 0);
+	fsfd = cr_fsopen(fsname, 0);
 	if (fsfd < 0) {
 		pr_perror("Unable to open the %s file system", fsname);
 		return -1;
 	}
 
-	if (sys_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) < 0) {
+	if (cr_fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0) < 0) {
 		pr_perror("Unable to create the %s file system", fsname);
 		close(fsfd);
 		return -1;
 	}
 
-	fd = sys_fsmount(fsfd, 0, 0);
+	fd = cr_fsmount(fsfd, 0, 0);
 	if (fd < 0)
 		pr_perror("Unable to mount the %s file system", fsname);
 	close(fsfd);

From c2b48ff423aa663b3534a5ba96907366e4c1b408 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 20 Sep 2024 21:40:17 -0700
Subject: [PATCH 1566/1854] criu: Version 4.0 (CRIUDA)

Major changes:
* CUDA plugin to support checkpointing and restoring NVIDIA CUDA applications.
* Shadow stack support
* Pagemap cache: Added support for PAGEMAP_SCAN ioctl

The full changelog can be found here: https://criu.org/Download/criu/4.0.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.versions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 5f21c11c2..c5859801a 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
-CRIU_VERSION_MAJOR	:= 3
-CRIU_VERSION_MINOR	:= 19
+CRIU_VERSION_MAJOR	:= 4
+CRIU_VERSION_MINOR	:= 0
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= Bronze Peacock
+CRIU_VERSION_NAME	:= CRIUDA
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From f1d465448fa3d464da6f8bc31500f5ce005b72da Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 26 Sep 2024 12:24:52 +0100
Subject: [PATCH 1567/1854] amdgpu: remove exec permissions on source files

This patch fixes the following warnings that appear
when building an RPM package:

+ /usr/lib/rpm/redhat/brp-mangle-shebangs
*** WARNING: ./usr/src/debug/criu-4.0-1.fc42.x86_64/plugins/amdgpu/amdgpu_plugin_util.c is executable but has no shebang, removing executable bit
*** WARNING: ./usr/src/debug/criu-4.0-1.fc42.x86_64/plugins/amdgpu/amdgpu_plugin_util.h is executable but has no shebang, removing executable bit

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin_util.c | 0
 plugins/amdgpu/amdgpu_plugin_util.h | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/amdgpu/amdgpu_plugin_util.c
 mode change 100755 => 100644 plugins/amdgpu/amdgpu_plugin_util.h

diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
old mode 100755
new mode 100644
diff --git a/plugins/amdgpu/amdgpu_plugin_util.h b/plugins/amdgpu/amdgpu_plugin_util.h
old mode 100755
new mode 100644

From 4f8f6f2883689546c4f0f793ac5d5dc6bd5a937e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 26 Sep 2024 10:59:32 +0100
Subject: [PATCH 1568/1854] Makefile.config: set CR_PLUGIN_DEFAULT variable

By default, CRIU uses the path "/usr/lib/criu" to install and load
plugins at runtime. This path is defined by the `PLUGINDIR` variable
in Makefile.install and `CR_PLUGIN_DEFAULT` in `criu/include/plugin.h`.
However, some distribution packages might install the CRIU plugins at
"/usr/lib64/criu" instead. This patch updates the makefile to align
the path defined by `CR_PLUGIN_DEFAULT` with the value of `PLUGINDIR`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile.config         | 4 ++++
 plugins/amdgpu/Makefile | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.config b/Makefile.config
index 52c250b21..5ab689d41 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -59,6 +59,10 @@ endif
 
 export LIBS += $(LIBS_FEATURES)
 
+ifneq ($(PLUGINDIR),)
+                FEATURE_DEFINES	+= -DCR_PLUGIN_DEFAULT="\"$(PLUGINDIR)\""
+endif
+
 CONFIG_FILE = .config
 
 $(CONFIG_FILE):
diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 7d3388b80..a20d1d163 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -15,7 +15,7 @@ DEPS_NOK 		:= ;
 __nmk_dir ?= ../../scripts/nmk/scripts/
 include $(__nmk_dir)msg.mk
 
-PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC -DCR_PLUGIN_DEFAULT="$(PLUGINDIR)"
+PLUGIN_CFLAGS  		:= -g -Wall -Werror -D _GNU_SOURCE -shared -nostartfiles -fPIC
 PLUGIN_LDFLAGS		:= -lpthread -lrt -ldrm -ldrm_amdgpu
 
 ifeq ($(CONFIG_AMDGPU),y)

From 3322d1e94c8a91d795a1f341de07a1c130dce254 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Thu, 13 Jun 2024 20:00:09 +0530
Subject: [PATCH 1569/1854] images: Add protobuf definition for pidfd

We only use the last pid from the list in NSpid entry (from
/proc/<pid>/fdinfo/<pidfd>) while restoring pidfds.
The last pid refers to the pid of the process in the most deeply nested
pid namespace. Since CRIU does not currently support nested pid
namespaces, this entry is the one we want.

After Linux 6.9, inode numbers can be used to compare pidfds. pidfds
referring to the same process will have the same inode numbers. We use
inode numbers to restore pidfds that point to dead processes.

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 images/Makefile     |  1 +
 images/fdinfo.proto |  3 +++
 images/pidfd.proto  | 13 +++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 images/pidfd.proto

diff --git a/images/Makefile b/images/Makefile
index ca85b1a21..855d894da 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -73,6 +73,7 @@ proto-obj-y	+= bpfmap-file.o
 proto-obj-y	+= bpfmap-data.o
 proto-obj-y	+= apparmor.o
 proto-obj-y	+= rseq.o
+proto-obj-y	+= pidfd.o
 
 CFLAGS		+= -iquote $(obj)/
 
diff --git a/images/fdinfo.proto b/images/fdinfo.proto
index 88f1c1186..32ec13cf4 100644
--- a/images/fdinfo.proto
+++ b/images/fdinfo.proto
@@ -17,6 +17,7 @@ import "ext-file.proto";
 import "sk-unix.proto";
 import "fifo.proto";
 import "pipe.proto";
+import "pidfd.proto";
 import "tty.proto";
 import "memfd.proto";
 import "bpfmap-file.proto";
@@ -42,6 +43,7 @@ enum fd_types {
 	TIMERFD		= 17;
 	MEMFD		= 18;
 	BPFMAP		= 19;
+	PIDFD           = 20;
 
 	/* Any number above the real used. Not stored to image */
 	CTL_TTY		= 65534;
@@ -78,4 +80,5 @@ message file_entry {
 	optional tty_file_entry		tty	= 19;
 	optional memfd_file_entry	memfd	= 20;
 	optional bpfmap_file_entry	bpf	= 21;
+	optional pidfd_entry		pidfd   = 22;
 }
diff --git a/images/pidfd.proto b/images/pidfd.proto
new file mode 100644
index 000000000..a9da3e454
--- /dev/null
+++ b/images/pidfd.proto
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+
+syntax = "proto2";
+
+import "fown.proto";
+
+message pidfd_entry {
+	required uint32		id		= 1;
+	required uint32		ino		= 2;
+	required uint32		flags		= 3;
+	required int32		nspid		= 4;
+	required fown_entry	fown		= 5;
+}

From 1ce408ffa4a723e7110cbc0d68c68bfc5871b287 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Thu, 13 Jun 2024 21:18:51 +0530
Subject: [PATCH 1570/1854] criu: Support C/R of pidfds

Process file descriptors (pidfds) were introduced to provide a stable
handle on a process. They solve the problem of pid recycling.

For a detailed explanation, see https://lwn.net/Articles/801319/ and
http://www.corsix.org/content/what-is-a-pidfd

Before Linux 6.9, anonymous inodes were used for the implementation of
pidfds. So, we detect them in a fashion similiar to other fd types that
use anonymous inodes by calling `readlink()`.
After 6.9, pidfs (a file system for pidfds) was introduced.
In 6.9 `S_ISREG()` returned true for pidfds, but this again changed with
6.10.
(https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/pidfs.c?h=v6.11-rc2#n285)
After this change, pidfs inodes have no file type in st_mode in
userspace.
We use `PID_FS_MAGIC` to detect pidfds for kernel >= 6.9
Hence, check for pidfds occurs before the check for regular files.

For pidfds that refer to dead processes, we lose the pid of the process
as the Pid and NSpid fields in /proc/<pid>/fdinfo/<pidfd> change to -1.
So, we create a temporary process for each unique inode and open pidfds
that refer to this process. After all pidfds have been opened we kill
this temporary process.

This commit does not include support for pidfds that point to a specific
thread, i.e pidfds opened with `PIDFD_THREAD` flag.

Fixes: #2258

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 criu/Makefile.crtools        |   1 +
 criu/cr-restore.c            |   3 +-
 criu/files.c                 |  17 +++
 criu/image-desc.c            |   1 +
 criu/include/fs-magic.h      |   4 +
 criu/include/image-desc.h    |   1 +
 criu/include/magic.h         |   1 +
 criu/include/pidfd.h         |  16 ++
 criu/include/protobuf-desc.h |   1 +
 criu/pidfd.c                 | 287 +++++++++++++++++++++++++++++++++++
 criu/proc_parse.c            |  29 ++++
 criu/protobuf-desc.c         |   1 +
 12 files changed, 361 insertions(+), 1 deletion(-)
 create mode 100644 criu/include/pidfd.h
 create mode 100644 criu/pidfd.c

diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 3ddf45cd7..ba6132d2f 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -101,6 +101,7 @@ obj-$(CONFIG_COMPAT)	+= vdso-compat.o
 CFLAGS_REMOVE_vdso-compat.o	+= $(CFLAGS-ASAN) $(CFLAGS-GCOV)
 obj-y			+= pidfd-store.o
 obj-y			+= hugetlb.o
+obj-y			+= pidfd.o
 
 PROTOBUF_GEN := scripts/protobuf-gen.sh
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 4d4dfbe6f..d5b6c8037 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -79,6 +79,7 @@
 #include "timens.h"
 #include "bpfmap.h"
 #include "apparmor.h"
+#include "pidfd.h"
 
 #include "parasite-syscall.h"
 #include "files-reg.h"
@@ -280,7 +281,7 @@ static struct collect_image_info *cinfos_files[] = {
 	&unix_sk_cinfo,	      &fifo_cinfo,     &pipe_cinfo,    &nsfile_cinfo,	    &packet_sk_cinfo,
 	&netlink_sk_cinfo,    &eventfd_cinfo,  &epoll_cinfo,   &epoll_tfd_cinfo,    &signalfd_cinfo,
 	&tunfile_cinfo,	      &timerfd_cinfo,  &inotify_cinfo, &inotify_mark_cinfo, &fanotify_cinfo,
-	&fanotify_mark_cinfo, &ext_file_cinfo, &memfd_cinfo,
+	&fanotify_mark_cinfo, &ext_file_cinfo, &memfd_cinfo, &pidfd_cinfo
 };
 
 /* These images are required to restore namespaces */
diff --git a/criu/files.c b/criu/files.c
index 3b653e24b..a57fb860f 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -49,6 +49,7 @@
 #include "kerndat.h"
 #include "fdstore.h"
 #include "bpfmap.h"
+#include "pidfd.h"
 
 #include "protobuf.h"
 #include "util.h"
@@ -544,6 +545,8 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 			ops = &signalfd_dump_ops;
 		else if (is_timerfd_link(link))
 			ops = &timerfd_dump_ops;
+		else if (is_pidfd_link(link))
+			ops = &pidfd_dump_ops;
 #ifdef CONFIG_HAS_LIBBPF
 		else if (is_bpfmap_link(link))
 			ops = &bpfmap_dump_ops;
@@ -554,6 +557,11 @@ static int dump_one_file(struct pid *pid, int fd, int lfd, struct fd_opts *opts,
 		return do_dump_gen_file(&p, lfd, ops, e);
 	}
 
+	if (p.fs_type == PID_FS_MAGIC) {
+		ops = &pidfd_dump_ops;
+		return do_dump_gen_file(&p, lfd, ops, e);
+	}
+
 	if (S_ISREG(p.stat.st_mode) || S_ISDIR(p.stat.st_mode) || S_ISLNK(p.stat.st_mode)) {
 		if (fill_fdlink(lfd, &p, &link))
 			return -1;
@@ -1778,6 +1786,9 @@ static int collect_one_file(void *o, ProtobufCMessage *base, struct cr_img *i)
 	case FD_TYPES__MEMFD:
 		ret = collect_one_file_entry(fe, fe->memfd->id, &fe->memfd->base, &memfd_cinfo);
 		break;
+	case FD_TYPES__PIDFD:
+		ret = collect_one_file_entry(fe, fe->pidfd->id, &fe->pidfd->base, &pidfd_cinfo);
+		break;
 #ifdef CONFIG_HAS_LIBBPF
 	case FD_TYPES__BPFMAP:
 		ret = collect_one_file_entry(fe, fe->bpf->id, &fe->bpf->base, &bpfmap_cinfo);
@@ -1800,5 +1811,11 @@ int prepare_files(void)
 {
 	init_fdesc_hash();
 	init_sk_info_hash();
+
+	if (init_dead_pidfd_hash()) {
+		pr_err("Could not initialise hash map for dead pidfds\n");
+		return -1;
+	}
+
 	return collect_image(&files_cinfo);
 }
diff --git a/criu/image-desc.c b/criu/image-desc.c
index d65d9c098..2d87c7381 100644
--- a/criu/image-desc.c
+++ b/criu/image-desc.c
@@ -107,6 +107,7 @@ struct cr_fd_desc_tmpl imgset_template[CR_FD_MAX] = {
 	FD_ENTRY_F(BPFMAP_FILE,	"bpfmap-file", O_NOBUF),
 	FD_ENTRY_F(BPFMAP_DATA,	"bpfmap-data", O_NOBUF),
 	FD_ENTRY(APPARMOR,	"apparmor"),
+	FD_ENTRY(PIDFD,		"pidfd"),
 
 	[CR_FD_STATS] = {
 		.fmt	= "stats-%s",
diff --git a/criu/include/fs-magic.h b/criu/include/fs-magic.h
index ad34f4891..ffc0455d5 100644
--- a/criu/include/fs-magic.h
+++ b/criu/include/fs-magic.h
@@ -57,4 +57,8 @@
 #define OVERLAYFS_SUPER_MAGIC 0x794c7630
 #endif
 
+#ifndef PID_FS_MAGIC
+#define PID_FS_MAGIC 0x50494446
+#endif
+
 #endif /* __CR_FS_MAGIC_H__ */
diff --git a/criu/include/image-desc.h b/criu/include/image-desc.h
index 9f369be64..79e1ac111 100644
--- a/criu/include/image-desc.h
+++ b/criu/include/image-desc.h
@@ -113,6 +113,7 @@ enum {
 	CR_FD_PIPES,
 	CR_FD_TTY_FILES,
 	CR_FD_MEMFD_FILE,
+	CR_FD_PIDFD,
 
 	CR_FD_AUTOFS,
 
diff --git a/criu/include/magic.h b/criu/include/magic.h
index 0e8c37234..6f0aff26d 100644
--- a/criu/include/magic.h
+++ b/criu/include/magic.h
@@ -100,6 +100,7 @@
 #define BPFMAP_FILE_MAGIC    0x57506142 /* Alapayevsk */
 #define BPFMAP_DATA_MAGIC    0x64324033 /* Arkhangelsk */
 #define APPARMOR_MAGIC	     0x59423047 /* Nikolskoye */
+#define PIDFD_MAGIC	     0x54435556 /* Ufa */
 
 #define IFADDR_MAGIC	RAW_IMAGE_MAGIC
 #define ROUTE_MAGIC	RAW_IMAGE_MAGIC
diff --git a/criu/include/pidfd.h b/criu/include/pidfd.h
new file mode 100644
index 000000000..4d2d71700
--- /dev/null
+++ b/criu/include/pidfd.h
@@ -0,0 +1,16 @@
+#ifndef __CR_PIDFD_H__
+#define __CR_PIDFD_H__
+
+#include "files.h"
+#include "pidfd.pb-c.h"
+
+extern const struct fdtype_ops pidfd_dump_ops;
+extern struct collect_image_info pidfd_cinfo;
+extern int is_pidfd_link(char *link);
+extern int init_dead_pidfd_hash(void);
+struct pidfd_dump_info {
+	PidfdEntry pidfe;
+	pid_t pid;
+};
+
+#endif /* __CR_PIDFD_H__ */
diff --git a/criu/include/protobuf-desc.h b/criu/include/protobuf-desc.h
index 3824de101..c4241be55 100644
--- a/criu/include/protobuf-desc.h
+++ b/criu/include/protobuf-desc.h
@@ -70,6 +70,7 @@ enum {
 	PB_BPFMAP_FILE,
 	PB_BPFMAP_DATA,
 	PB_APPARMOR,
+	PB_PIDFD,
 
 	/* PB_AUTOGEN_STOP */
 
diff --git a/criu/pidfd.c b/criu/pidfd.c
new file mode 100644
index 000000000..fdf5dec60
--- /dev/null
+++ b/criu/pidfd.c
@@ -0,0 +1,287 @@
+#include "common/lock.h"
+#include "imgset.h"
+#include "pidfd.h"
+#include "fdinfo.h"
+#include "pidfd.pb-c.h"
+#include "protobuf.h"
+#include "pstree.h"
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include "common/bug.h"
+#include "rst-malloc.h"
+
+#undef LOG_PREFIX
+#define LOG_PREFIX "pidfd: "
+
+#ifndef PIDFD_THREAD
+#define PIDFD_THREAD O_EXCL
+#endif
+
+struct pidfd_info {
+	PidfdEntry *pidfe;
+	struct file_desc d;
+};
+
+struct dead_pidfd {
+	unsigned int ino;
+	int pid;
+	size_t count;
+	mutex_t pidfd_lock;
+	struct hlist_node hash;
+};
+
+#define DEAD_PIDFD_HASH_SIZE 32
+static struct hlist_head dead_pidfd_hash[DEAD_PIDFD_HASH_SIZE];
+static mutex_t *dead_pidfd_hash_lock;
+
+int init_dead_pidfd_hash(void)
+{
+	for (int i = 0; i < DEAD_PIDFD_HASH_SIZE; i++)
+		INIT_HLIST_HEAD(&dead_pidfd_hash[i]);
+
+	dead_pidfd_hash_lock = shmalloc(sizeof(*dead_pidfd_hash_lock));
+	if (!dead_pidfd_hash_lock)
+		return -1;
+
+	mutex_init(dead_pidfd_hash_lock);
+
+	return 0;
+}
+
+static struct dead_pidfd *lookup_dead_pidfd(unsigned int ino)
+{
+	struct dead_pidfd *dead;
+	struct hlist_head *chain;
+
+	mutex_lock(dead_pidfd_hash_lock);
+	chain = &dead_pidfd_hash[ino % DEAD_PIDFD_HASH_SIZE];
+	hlist_for_each_entry(dead, chain, hash) {
+		if (dead->ino == ino) {
+			mutex_unlock(dead_pidfd_hash_lock);
+			return dead;
+		}
+	}
+	mutex_unlock(dead_pidfd_hash_lock);
+
+	return NULL;
+}
+
+int is_pidfd_link(char *link)
+{
+	/*
+	* pidfs was introduced in Linux 6.9
+	* before which anonymous-inodes were used
+	*/
+	return is_anon_link_type(link, "[pidfd]");
+}
+
+static void pr_info_pidfd(char *action, PidfdEntry *pidfe)
+{
+	pr_info("%s: id %#08x flags %u NSpid %d ino %u\n",
+		action, pidfe->id, pidfe->flags, pidfe->nspid, pidfe->ino
+	);
+}
+
+static int dump_one_pidfd(int pidfd, u32 id, const struct fd_parms *p)
+{
+	struct pidfd_dump_info pidfd_info = {.pidfe = PIDFD_ENTRY__INIT};
+	FileEntry fe = FILE_ENTRY__INIT;
+
+	if (parse_fdinfo(pidfd, FD_TYPES__PIDFD, &pidfd_info))
+		return -1;
+
+	if (p->flags & PIDFD_THREAD) {
+		pr_err("PIDFD_THREAD flag is currently not supported\n");
+		return -1;
+	}
+
+	/*
+	* Check if the pid pidfd refers to is part of process tree
+	* This ensures the process will exist on restore.
+	*/
+	if (pidfd_info.pid != -1 && !pstree_item_by_real(pidfd_info.pid)) {
+		pr_err("pidfd pid %d is not a part of process tree..\n",
+			pidfd_info.pid);
+		return -1;
+	}
+
+	pidfd_info.pidfe.id = id;
+	pidfd_info.pidfe.flags = (p->flags & ~O_RDWR);
+	pidfd_info.pidfe.fown = (FownEntry *)&p->fown;
+
+	fe.type = FD_TYPES__PIDFD;
+	fe.id = pidfd_info.pidfe.id;
+	fe.pidfd = &pidfd_info.pidfe;
+
+	pr_info_pidfd("Dumping", &pidfd_info.pidfe);
+	return pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
+}
+
+const struct fdtype_ops pidfd_dump_ops = {
+	.type = FD_TYPES__PIDFD,
+	.dump = dump_one_pidfd,
+};
+
+static int pidfd_open(pid_t pid, int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int create_tmp_process(void)
+{
+	int tmp_process;
+	tmp_process = fork();
+	if (tmp_process < 0) {
+		pr_perror("Could not fork");
+		return -1;
+	} else if (tmp_process == 0) {
+		while(1)
+			sleep(1);
+	}
+	return tmp_process;
+}
+
+static int free_dead_pidfd(struct dead_pidfd *dead)
+{
+	int status;
+
+	if (kill(dead->pid, SIGKILL) < 0) {
+		pr_perror("Could not kill temporary process with pid: %d",
+		dead->pid);
+		goto err;
+	}
+
+	if (waitpid(dead->pid, &status, 0) != dead->pid) {
+		pr_perror("Could not wait on temporary process with pid: %d",
+		dead->pid);
+		goto err;
+	}
+
+	if (!WIFSIGNALED(status)) {
+		pr_err("Expected temporary process to be terminated by a signal\n");
+		goto err;
+	}
+
+	if (WTERMSIG(status) != SIGKILL) {
+		pr_err("Expected temporary process to be terminated by SIGKILL\n");
+		goto err;
+	}
+
+	mutex_lock(dead_pidfd_hash_lock);
+	hlist_del(&dead->hash);
+	mutex_unlock(dead_pidfd_hash_lock);
+	return 0;
+err:
+	return -1;
+}
+
+static int open_one_pidfd(struct file_desc *d, int *new_fd)
+{
+	struct pidfd_info *info;
+	struct dead_pidfd *dead = NULL;
+	int pidfd;
+
+	info = container_of(d, struct pidfd_info, d);
+	if (info->pidfe->nspid != -1) {
+		pidfd = pidfd_open(info->pidfe->nspid, info->pidfe->flags);
+		if (pidfd < 0) {
+			pr_perror("Could not open pidfd for %d", info->pidfe->nspid);
+			goto err_close;
+		}
+		goto out;
+	}
+
+	dead = lookup_dead_pidfd(info->pidfe->ino);
+	BUG_ON(!dead);
+
+	mutex_lock(&dead->pidfd_lock);
+	BUG_ON(dead->count == 0);
+	dead->count--;
+	if (dead->pid == -1) {
+		dead->pid = create_tmp_process();
+		if (dead->pid < 0) {
+			mutex_unlock(&dead->pidfd_lock);
+			goto err_close;
+		}
+	}
+
+	pidfd = pidfd_open(dead->pid, info->pidfe->flags);
+	if (pidfd < 0) {
+		pr_perror("Could not open pidfd for %d", info->pidfe->nspid);
+		mutex_unlock(&dead->pidfd_lock);
+		goto err_close;
+	}
+
+	if (dead->count == 0) {
+		if (free_dead_pidfd(dead)) {
+			pr_err("Failed to delete dead_pidfd struct\n");
+			mutex_unlock(&dead->pidfd_lock);
+			close(pidfd);
+			goto err_close;
+		}
+	}
+	mutex_unlock(&dead->pidfd_lock);
+
+out:
+	if (rst_file_params(pidfd, info->pidfe->fown, info->pidfe->flags)) {
+		goto err_close;
+	}
+
+	*new_fd = pidfd;
+	return 0;
+err_close:
+	pr_err("Can't create pidfd %#08x NSpid: %d flags: %u\n",
+	   info->pidfe->id, info->pidfe->nspid, info->pidfe->flags);
+	return -1;
+}
+
+static struct file_desc_ops pidfd_desc_ops = {
+	.type = FD_TYPES__PIDFD,
+	.open = open_one_pidfd
+};
+
+static int collect_one_pidfd(void *obj, ProtobufCMessage *msg, struct cr_img *i)
+{
+	struct dead_pidfd *dead;
+	struct pidfd_info *info = obj;
+
+	info->pidfe = pb_msg(msg, PidfdEntry);
+	pr_info_pidfd("Collected ", info->pidfe);
+
+	if (info->pidfe->nspid != -1)
+		goto out;
+
+	dead = lookup_dead_pidfd(info->pidfe->ino);
+	if (dead) {
+		mutex_lock(&dead->pidfd_lock);
+		dead->count++;
+		mutex_unlock(&dead->pidfd_lock);
+		goto out;
+	}
+
+	dead = shmalloc(sizeof(*dead));
+	if (!dead) {
+		pr_err("Could not allocate shared memory..\n");
+		return -1;
+	}
+
+	INIT_HLIST_NODE(&dead->hash);
+	dead->ino = info->pidfe->ino;
+	dead->count = 1;
+	dead->pid = -1;
+	mutex_init(&dead->pidfd_lock);
+
+	mutex_lock(dead_pidfd_hash_lock);
+	hlist_add_head(&dead->hash, &dead_pidfd_hash[dead->ino % DEAD_PIDFD_HASH_SIZE]);
+	mutex_unlock(dead_pidfd_hash_lock);
+out:
+	return file_desc_add(&info->d, info->pidfe->id, &pidfd_desc_ops);
+}
+
+struct collect_image_info pidfd_cinfo = {
+	.fd_type = CR_FD_PIDFD,
+	.pb_type = PB_PIDFD,
+	.priv_size = sizeof(struct pidfd_info),
+	.collect = collect_one_pidfd,
+};
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 92655a484..eb869dbbd 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -42,10 +42,12 @@
 #include "fault-injection.h"
 #include "memfd.h"
 #include "hugetlb.h"
+#include "pidfd.h"
 
 #include "protobuf.h"
 #include "images/fdinfo.pb-c.h"
 #include "images/mnt.pb-c.h"
+#include "pidfd.pb-c.h"
 #include "plugin.h"
 
 #include <stdlib.h>
@@ -2165,6 +2167,33 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
 			if (ret)
 				goto parse_err;
 
+			entry_met = true;
+			continue;
+		}
+		if (fdinfo_field(str, "ino") || fdinfo_field(str, "NSpid") || fdinfo_field(str, "Pid")) {
+			struct pidfd_dump_info *pidfd_info = arg;
+
+			if (type != FD_TYPES__PIDFD)
+				continue;
+
+			if (fdinfo_field(str, "ino")) {
+				ret = sscanf(str, "%*s %u", &pidfd_info->pidfe.ino);
+				if (ret != 1)
+					goto parse_err;
+			} else if (fdinfo_field(str, "Pid")) {
+				ret = sscanf(str, "%*s %d", &pidfd_info->pid);
+				if (ret != 1)
+					goto parse_err;
+			} else if (fdinfo_field(str, "NSpid")) {
+				char *last;
+
+				last = strrchr(str, '\t');
+				if (!last || sscanf(last, "%d", &pidfd_info->pidfe.nspid) != 1) {
+					pr_err("Unable to parse: %s\n", str);
+					goto parse_err;
+				}
+			}
+
 			entry_met = true;
 			continue;
 		}
diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c
index ff16b9f5b..e0dbfccc2 100644
--- a/criu/protobuf-desc.c
+++ b/criu/protobuf-desc.c
@@ -68,6 +68,7 @@
 #include "images/bpfmap-file.pb-c.h"
 #include "images/bpfmap-data.pb-c.h"
 #include "images/apparmor.pb-c.h"
+#include "images/pidfd.pb-c.h"
 
 struct cr_pb_message_desc cr_pb_descs[PB_MAX];
 

From 3096df9ea3cfd494905bf0497a31c77688a49cf6 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Tue, 9 Jul 2024 19:58:29 +0530
Subject: [PATCH 1571/1854] zdtm: Check pidfd fdinfo entry is consistent

Ensures that entries in /proc/<pid>/fdinfo/<pidfd> are same.

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile     |   1 +
 test/zdtm/static/pidfd_self.c | 140 ++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 test/zdtm/static/pidfd_self.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1e891f0ba..a2e852d73 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -53,6 +53,7 @@ TST_NOFILE	:=				\
 		shm				\
 		shm-mp				\
 		ptrace_sig			\
+		pidfd_self			\
 		pipe00				\
 		pipe01				\
 		pipe02				\
diff --git a/test/zdtm/static/pidfd_self.c b/test/zdtm/static/pidfd_self.c
new file mode 100644
index 000000000..2730ee123
--- /dev/null
+++ b/test/zdtm/static/pidfd_self.c
@@ -0,0 +1,140 @@
+#include <sys/syscall.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check pidfd /proc/self/fdinfo/<pidfd> entry remains consistent after checkpoint/restore\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+struct pidfd_status {
+	unsigned int flags;
+	pid_t pid;
+};
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+static void show_pidfd(char *prefix, struct pidfd_status *s)
+{
+	test_msg("\n\t%s\n\tflags: 0%o\n\tpid: %d\n", prefix, s->flags, s->pid);
+}
+
+static int parse_self_fdinfo(int pidfd, struct pidfd_status *s)
+{
+	char buf[256];
+	int ret = -1;
+	FILE *f;
+
+	sprintf(buf, "/proc/self/fdinfo/%d", pidfd);
+	f = fopen(buf, "r");
+	if (!f) {
+		perror("Can't open /proc/self/fdinfo/ to parse");
+		return -1;
+	}
+
+	memset(s, 0, sizeof(*s));
+
+	/*
+	* flags:  file access mode (octal) 02000002 => [O_RDWR | O_CLOEXEC]
+	* pid:    the pid to which we have pidfd open
+	*/
+	while (fgets(buf, sizeof(buf), f)) {
+		if (!fgets(buf, sizeof(buf), f))
+			goto parse_err;
+
+		if (sscanf(buf, "flags: 0%o", &s->flags) != 1) {
+			goto parse_err;
+		}
+
+		if (!fgets(buf, sizeof(buf), f))
+			goto parse_err;
+		if (!fgets(buf, sizeof(buf), f))
+			goto parse_err;
+
+		if (!fgets(buf, sizeof(buf), f))
+			goto parse_err;
+
+		if (sscanf(buf, "Pid: %d", &s->pid) != 1)
+			goto parse_err;
+		ret = 0;
+		break;
+	}
+
+	if (ret)
+		goto parse_err;
+err:
+	fclose(f);
+	return ret;
+
+parse_err:
+	pr_perror("Format error");
+	goto err;
+}
+
+static int check_pidfd(int fd, struct pidfd_status *old)
+{
+	struct pidfd_status new;
+
+	if (parse_self_fdinfo(fd, &new))
+		return -1;
+
+	show_pidfd("restored", &new);
+
+	if (old->flags != new.flags || old->pid != new.pid)
+		return -1;
+
+	return 0;
+}
+
+int main(int argc, char* argv[])
+{
+	struct pidfd_status old;
+	int pidfd, ret;
+
+	test_init(argc, argv);
+
+	pidfd = pidfd_open(getpid(), 0);
+	if (pidfd < 0) {
+		pr_perror("pidfd_open failed");
+		return 1;
+	}
+
+	parse_self_fdinfo(pidfd, &old);
+
+	show_pidfd("old", &old);
+
+	if (pidfd_send_signal(pidfd, 0, NULL, 0)) {
+		pr_perror("Could not send signal");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = check_pidfd(pidfd, &old);
+	if (ret) {
+		fail();
+		goto err;
+	}
+
+	if (pidfd_send_signal(pidfd, 0, NULL, 0)) {
+		pr_perror("Could not send signal");
+		fail();
+		goto err;
+	}
+
+	pass();
+	close(pidfd);
+	return 0;
+err:
+	close(pidfd);
+	return 1;
+}

From 2899d46000be4ee85af7000068b2414400ed66be Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Tue, 9 Jul 2024 20:01:00 +0530
Subject: [PATCH 1572/1854] zdtm: Check pidfd can send signal after C/R

Ensure `pidfd_send_signal()` syscall works as expected after C/R.

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile      |  1 +
 test/zdtm/static/pidfd_child.c | 66 ++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 test/zdtm/static/pidfd_child.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a2e852d73..0268ae492 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -54,6 +54,7 @@ TST_NOFILE	:=				\
 		shm-mp				\
 		ptrace_sig			\
 		pidfd_self			\
+		pidfd_child			\
 		pipe00				\
 		pipe01				\
 		pipe02				\
diff --git a/test/zdtm/static/pidfd_child.c b/test/zdtm/static/pidfd_child.c
new file mode 100644
index 000000000..ec559605d
--- /dev/null
+++ b/test/zdtm/static/pidfd_child.c
@@ -0,0 +1,66 @@
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Checks pidfd sends signal to child process after restore\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+int main(int argc, char* argv[])
+{
+	int pidfd, status;
+	pid_t child;
+
+	test_init(argc, argv);
+
+	child = fork();
+	if (child < 0) {
+		pr_perror("Unable to fork a new process");
+		return 1;
+	} else if (child == 0) {
+		test_waitsig();
+		return 0;
+	}
+
+	pidfd = pidfd_open(child, 0);
+	if (pidfd < 0) {
+		pr_perror("pidfd_open failed");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (pidfd_send_signal(pidfd, SIGTERM, NULL, 0)) {
+		fail("Could not send signal");
+		goto err_close;
+	}
+
+	if (waitpid(child, &status, 0) != child) {
+		pr_perror("waitpid()");
+		goto err_close;
+	}
+
+	if (status != 0) {
+		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
+		goto err_close;
+	}
+
+	pass();
+	close(pidfd);
+	return 0;
+err_close:
+	close(pidfd);
+	return 1;
+}

From 3f30ec0eda1a98ec18c8b102c49a0b7988c92c6d Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Mon, 8 Jul 2024 22:25:00 +0530
Subject: [PATCH 1573/1854] zdtm: Check pidfd can kill descendant processes

Validate that pidfds can been used to send signals to different
processes after C/R using the `pidfd_send_signal()` syscall.

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile     |   1 +
 test/zdtm/static/pidfd_kill.c | 128 ++++++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 test/zdtm/static/pidfd_kill.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 0268ae492..ab45b580a 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -55,6 +55,7 @@ TST_NOFILE	:=				\
 		ptrace_sig			\
 		pidfd_self			\
 		pidfd_child			\
+		pidfd_kill			\
 		pipe00				\
 		pipe01				\
 		pipe02				\
diff --git a/test/zdtm/static/pidfd_kill.c b/test/zdtm/static/pidfd_kill.c
new file mode 100644
index 000000000..6232d033a
--- /dev/null
+++ b/test/zdtm/static/pidfd_kill.c
@@ -0,0 +1,128 @@
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Kill child and grandchild process using pidfds\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+static int wait_for_child(int child)
+{
+	int status;
+	if (waitpid(child, &status, 0) != child) {
+		pr_perror("waitpid()");
+		return 1;
+	}
+
+	if (status != 0) {
+		test_msg("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status),
+			WIFSIGNALED(status), WTERMSIG(status));
+	}
+
+	return 0;
+}
+
+int main(int argc, char* argv[])
+{
+	#define READ 0
+	#define WRITE 1
+
+	int child, gchild, cpidfd, gpidfd, gchild_pid, ret;
+	int p[2];
+
+	if (pipe(p)) {
+		pr_perror("pipe");
+		return 1;
+	}
+
+	test_init(argc, argv);
+
+	child = fork();
+	if (child < 0) {
+		pr_perror("fork");
+		return 1;
+	}
+
+	if (child == 0) {
+		gchild = fork();
+		if (gchild < 0) {
+			pr_perror("fork");
+			return 1;
+		}
+
+		if (gchild == 0) {
+			test_waitsig();
+			return 0;
+		}
+
+		close(p[READ]);
+		if (write(p[WRITE], &gchild, sizeof(gchild))
+			!= sizeof(gchild)) {
+			pr_perror("write");
+			return 1;
+		}
+		close(p[WRITE]);
+
+		test_waitsig();
+		return wait_for_child(gchild);
+	}
+
+	cpidfd = pidfd_open(child, 0);
+	if (cpidfd < 0) {
+		pr_perror("pidfd_open");
+		return 1;
+	}
+
+	close(p[WRITE]);
+	if (read(p[READ], &gchild_pid, sizeof(gchild_pid))
+		!= sizeof(gchild_pid)) {
+		pr_perror("read");
+		return 1;
+	}
+	close(p[READ]);
+
+	gpidfd = pidfd_open(gchild_pid, 0);
+	if (gpidfd < 0) {
+		pr_perror("pidfd_open");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (pidfd_send_signal(gpidfd, SIGKILL, NULL, 0)) {
+		pr_perror("Could not send signal");
+		goto fail_close;
+	}
+
+	if (pidfd_send_signal(cpidfd, SIGKILL, NULL, 0)) {
+		pr_perror("Could not send signal");
+		goto fail_close;
+	}
+
+	ret = wait_for_child(child);
+	if (ret)
+		goto fail_close;
+
+	pass();
+	close(cpidfd);
+	close(gpidfd);
+	return 0;
+
+fail_close:
+	fail();
+	close(cpidfd);
+	close(gpidfd);
+	return 1;
+}

From 2e6f348458b83a5228693d31dd53611df56fd8f3 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Thu, 25 Jul 2024 01:12:36 +0530
Subject: [PATCH 1574/1854] zdtm: Check dead pidfd is restored correctly

After, C/R of pidfds that point to dead processes their inodes might
change. But if two pidfds point to same dead process they should
continue to do so after C/R.

This test ensures that this happens by calling `statx()` on pidfds after
C/R and then comparing their inode numbers.

Support for comparing pidfds by using `statx()` and inode numbers was
introduced alongside pidfs. So if `f_type` of pidfd is not equal to
`PID_FS_MAGIC` then we skip this test.

signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile     |   1 +
 test/zdtm/static/pidfd_dead.c | 244 ++++++++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+)
 create mode 100644 test/zdtm/static/pidfd_dead.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ab45b580a..20e4bc272 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -54,6 +54,7 @@ TST_NOFILE	:=				\
 		shm-mp				\
 		ptrace_sig			\
 		pidfd_self			\
+		pidfd_dead			\
 		pidfd_child			\
 		pidfd_kill			\
 		pipe00				\
diff --git a/test/zdtm/static/pidfd_dead.c b/test/zdtm/static/pidfd_dead.c
new file mode 100644
index 000000000..9c825899d
--- /dev/null
+++ b/test/zdtm/static/pidfd_dead.c
@@ -0,0 +1,244 @@
+#include <sys/statfs.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check C/R of pidfds that point to dead processes\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+#ifndef PID_FS_MAGIC
+#define PID_FS_MAGIC 0x50494446
+#endif
+
+/*
+ * main
+ *	`- child
+ *		`- grandchild
+ *
+ * main opens a pidfd for both child and grandchild.
+ * Before C/R we kill both child and grandchild.
+ * We end up with two unique dead pidfds.
+ */
+
+static long get_fs_type(int lfd)
+{
+	struct statfs fst;
+
+	if (fstatfs(lfd, &fst)) {
+		return -1;
+	}
+	return fst.f_type;
+}
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+static int open_pidfd_pair(int pidfd[2], int pid)
+{
+	pidfd[0] = pidfd_open(pid, 0);
+	if (pidfd[0] < 0) {
+		pr_perror("pidfd_open() failed");
+		return 1;
+	}
+
+	pidfd[1] = pidfd_open(pid, 0);
+	if (pidfd[1] < 0) {
+		close(pidfd[0]);
+		pr_perror("pidfd_open() failed");
+		return 1;
+	}
+	return 0;
+}
+
+static int compare_pidfds(int pidfd[2])
+{
+	/*
+	* After linux 6.9 we can compare inode numbers
+	* to determine if two pidfds point to the same process.
+	* While the inode number may change before and after C/R
+	* pidfds pointing to the same pid should have the same inode number.
+	*/
+	struct statx stats[2];
+	statx(pidfd[0], "", AT_EMPTY_PATH, STATX_ALL, &stats[0]);
+	statx(pidfd[1], "", AT_EMPTY_PATH, STATX_ALL, &stats[1]);
+	if (stats[0].stx_ino != stats[1].stx_ino)
+		return 1;
+	return 0;
+}
+
+static int check_for_pidfs(void)
+{
+	long type;
+	int pidfd = pidfd_open(getpid(), 0);
+	if (pidfd < 0) {
+		pr_perror("pidfd open() failed");
+		return -1;
+	}
+	type = get_fs_type(pidfd);
+	close(pidfd);
+	return type == PID_FS_MAGIC;
+}
+
+int main(int argc, char* argv[])
+{
+	#define READ 0
+	#define WRITE 1
+
+	int child, ret, gchild, p[2], status;
+	int cpidfd[2], gpidfd[2];
+	struct statx stats[2];
+
+	test_init(argc, argv);
+
+	ret = check_for_pidfs();
+	if (ret < 0)
+		return 1;
+
+	if (ret == 0) {
+		test_daemon();
+		test_waitsig();
+		skip("Test requires pidfs. skipping...");
+		pass();
+		return 0;
+	}
+
+	if (pipe(p)) {
+		pr_perror("pipe");
+		return 1;
+	}
+
+	child = test_fork();
+	if (child < 0) {
+		pr_perror("fork");
+		return 1;
+	} else if (child == 0) {
+		int gchild = test_fork();
+		close(p[READ]);
+		if (gchild < 0) {
+			pr_perror("fork");
+			return 1;
+		} else if (gchild == 0) {
+			close(p[WRITE]);
+			while(1)
+				sleep(1000);
+		} else {
+			if (write(p[WRITE], &gchild, sizeof(int)) != sizeof(int)) {
+				pr_perror("write");
+				return 1;
+			}
+			close(p[WRITE]);
+			if (waitpid(gchild, &status, 0) != gchild) {
+				pr_perror("waitpid");
+				return 1;
+			}
+
+			if (!WIFSIGNALED(status)) {
+				fail("Expected grandchild to be terminated by a signal");
+				return 1;
+			}
+
+			if (WTERMSIG(status) != SIGKILL) {
+				fail("Expected grandchild to be terminated by SIGKILL");
+				return 1;
+			}
+
+			return 0;
+		}
+	}
+
+	ret = open_pidfd_pair(cpidfd, child);
+	if (ret)
+		return 1;
+
+	close(p[WRITE]);
+	if (read(p[READ], &gchild, sizeof(int)) != sizeof(int)) {
+		pr_perror("write");
+		return 1;
+	}
+	close(p[READ]);
+
+	ret = open_pidfd_pair(gpidfd, gchild);
+	if (ret)
+		return 1;
+
+	/*
+	* We kill grandchild and child processes only after opening pidfds.
+	*/
+	if (pidfd_send_signal(gpidfd[0], SIGKILL, NULL, 0)) {
+		pr_perror("pidfd_send_signal");
+		goto fail_close;
+	}
+
+	if (waitpid(child, &status, 0) != child) {
+		pr_perror("waitpid");
+		goto fail_close;
+	}
+
+	if (!WIFEXITED(status)) {
+		fail("Expected child to exit normally");
+		goto fail_close;
+	}
+
+	if (WEXITSTATUS(status) != 0) {
+		fail("Expected child to exit with 0");
+		goto fail_close;
+	}
+	usleep(1000);
+
+	if (kill(gchild, 0) != -1 && errno != ESRCH) {
+		fail("Expected grand child to not exist");
+		goto fail_close;
+	}
+
+	if (kill(child, 0) != -1 && errno != ESRCH) {
+		fail("Expected child to not exist");
+		goto fail_close;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = compare_pidfds(cpidfd);
+	if (ret) {
+		fail("inodes not same for same pid");
+		goto fail_close;
+	}
+
+	ret = compare_pidfds(gpidfd);
+	if (ret) {
+		fail("inodes not same for same pid");
+		goto fail_close;
+	}
+
+	statx(cpidfd[0], "", AT_EMPTY_PATH, STATX_ALL, &stats[0]);
+	statx(gpidfd[0], "", AT_EMPTY_PATH, STATX_ALL, &stats[1]);
+	if (stats[0].stx_ino == stats[1].stx_ino) {
+		fail("pidfds pointing to diff pids should have diff inodes");
+		goto fail_close;
+	}
+
+	pass();
+	close(cpidfd[0]);
+	close(cpidfd[1]);
+	close(gpidfd[0]);
+	close(gpidfd[1]);
+	return 0;
+
+fail_close:
+	close(cpidfd[0]);
+	close(cpidfd[1]);
+	close(gpidfd[0]);
+	close(gpidfd[1]);
+	return 1;
+}

From 7a64004dc81d6d8fe8e5dbb8e31c787b54c96982 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Fri, 16 Aug 2024 21:20:57 +0530
Subject: [PATCH 1575/1854] zdtm: Check fd from pidfd_getfd is C/Red correctly

We get the read end of a pipe using `pidfd_getfd` and check if we can
read from it after C/R.

signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile        |   1 +
 test/zdtm/static/fd_from_pidfd.c | 108 +++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 test/zdtm/static/fd_from_pidfd.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 20e4bc272..f4dbb1d96 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -57,6 +57,7 @@ TST_NOFILE	:=				\
 		pidfd_dead			\
 		pidfd_child			\
 		pidfd_kill			\
+		fd_from_pidfd			\
 		pipe00				\
 		pipe01				\
 		pipe02				\
diff --git a/test/zdtm/static/fd_from_pidfd.c b/test/zdtm/static/fd_from_pidfd.c
new file mode 100644
index 000000000..1f863d6c0
--- /dev/null
+++ b/test/zdtm/static/fd_from_pidfd.c
@@ -0,0 +1,108 @@
+#include <sys/syscall.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check if fd obtained from pidfd_get_fd is C/R correctly\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_getfd(int pidfd, int targetfd, unsigned int flags)
+{
+	return syscall(__NR_pidfd_getfd, pidfd, targetfd, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+int main(int argc, char* argv[])
+{
+	#define READ 0
+	#define WRITE 1
+
+	int pidfd, child, p[2], child_read, read_data, status;
+	int data = 42;
+
+	test_init(argc, argv);
+
+	if (pipe(p)) {
+		pr_perror("pipe");
+		return 1;
+	}
+
+	child = fork();
+	if (child < 0) {
+		pr_perror("fork");
+		return 1;
+	}
+
+	if (child == 0) {
+		close(p[WRITE]);
+		test_waitsig();
+		return 0;
+	}
+
+	pidfd = pidfd_open(child, 0);
+	if (pidfd < 0) {
+		pr_perror("pidfd_open failed");
+		return 1;
+	}
+
+	close(p[READ]);
+	if (write(p[WRITE], &data, sizeof(data)) != sizeof(data)) {
+		pr_perror("write");
+		return 1;
+	}
+	close(p[WRITE]);
+
+	child_read = pidfd_getfd(pidfd, p[READ], 0);
+	if (child_read < 0) {
+		pr_perror("pidfd_getfd");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (read(child_read, &read_data, sizeof(read_data)) != sizeof(read_data)) {
+		pr_perror("read");
+		goto err_close;
+	}
+
+	if (read_data != data) {
+		fail("data from fd obtained using pidfd_getfd incorrect");
+		goto err_close;
+	}
+
+	if (pidfd_send_signal(pidfd, SIGTERM, NULL, 0)) {
+		pr_perror("Could not send signal");
+		goto err_close;
+	}
+
+	if (waitpid(child, &status, 0) != child) {
+		pr_perror("waitpid()");
+		return 1;
+	}
+
+	if (status != 0) {
+		fail("%d:%d:%d:%d", WIFEXITED(status), WEXITSTATUS(status), WIFSIGNALED(status), WTERMSIG(status));
+		return 1;
+	}
+
+	pass();
+	close(child_read);
+	close(pidfd);
+	return 0;
+err_close:
+	close(child_read);
+	close(pidfd);
+	return 1;
+}

From f29e655df9d5320c8bcab1ec26bac2b0315af4a5 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Mon, 26 Aug 2024 20:56:14 +0530
Subject: [PATCH 1576/1854] zdtm: Check pidfd for thread is valid after C/R

We open a pidfd to a thread using `PIDFD_THREAD` flag and after C/R
ensure that we can send signals using it with `PIDFD_SIGNAL_THREAD`.

signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile             |   1 +
 test/zdtm/static/pidfd_of_thread.c    | 114 ++++++++++++++++++++++++++
 test/zdtm/static/pidfd_of_thread.desc |   1 +
 3 files changed, 116 insertions(+)
 create mode 100644 test/zdtm/static/pidfd_of_thread.c
 create mode 100644 test/zdtm/static/pidfd_of_thread.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index f4dbb1d96..44ac64fe5 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -54,6 +54,7 @@ TST_NOFILE	:=				\
 		shm-mp				\
 		ptrace_sig			\
 		pidfd_self			\
+		pidfd_of_thread			\
 		pidfd_dead			\
 		pidfd_child			\
 		pidfd_kill			\
diff --git a/test/zdtm/static/pidfd_of_thread.c b/test/zdtm/static/pidfd_of_thread.c
new file mode 100644
index 000000000..d232c7ac1
--- /dev/null
+++ b/test/zdtm/static/pidfd_of_thread.c
@@ -0,0 +1,114 @@
+#include <sched.h>
+#include <sys/stat.h>
+#include <sys/statfs.h>
+#include <fcntl.h>
+
+#include "zdtmtst.h"
+#include "lock.h"
+
+const char *test_doc = "Check C/R of pidfds that point to threads\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+/* see also: https://codebrowser.dev/glibc/glibc/sysdeps/unix/sysv/linux/tst-clone3.c.html */
+
+#ifndef PIDFD_THREAD
+#define PIDFD_THREAD	O_EXCL
+#endif
+
+#ifndef PIDFD_SIGNAL_THREAD
+#define PIDFD_SIGNAL_THREAD		(1UL << 0)
+#endif
+
+#ifndef PID_FS_MAGIC
+#define PID_FS_MAGIC 0x50494446
+#endif
+
+static long get_fs_type(int lfd)
+{
+	struct statfs fst;
+
+	if (fstatfs(lfd, &fst)) {
+		return -1;
+	}
+	return fst.f_type;
+}
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t* info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+static int thread_func(void *a)
+{
+	test_waitsig();
+	return 0;
+}
+
+#define CTID_INIT_VAL 1
+
+int main(int argc, char* argv[])
+{
+	char st[64 * 1024] __attribute__ ((aligned));
+	pid_t tid;
+	int pidfd, test_pidfd;
+	futex_t exited;
+
+	int clone_flags = CLONE_THREAD;
+	clone_flags |= CLONE_VM | CLONE_SIGHAND;
+	clone_flags |= CLONE_CHILD_CLEARTID;
+
+	test_init(argc, argv);
+
+	test_pidfd = pidfd_open(getpid(), 0);
+	if (test_pidfd < 0) {
+		pr_perror("pidfd_open() failed");
+		return 1;
+	}
+
+	/* PIDFD_THREAD, PIDFD_SIGNAL_THREAD are supported only with pidfs */
+	if (get_fs_type(test_pidfd) != PID_FS_MAGIC) {
+		test_daemon();
+		test_waitsig();
+		skip("pidfs not supported.");
+		close(test_pidfd);
+		return 0;
+	}
+	close(test_pidfd);
+
+	futex_set(&exited, CTID_INIT_VAL);
+
+	tid = clone(thread_func, st + sizeof(st), clone_flags, NULL, NULL, NULL, &(exited.raw));
+	if (tid == -1) {
+	    pr_perror("clone() failed");
+	    return 1;
+	}
+
+	test_msg("Successfully created a thread with tid: %d\n", tid);
+	pidfd = pidfd_open(tid, PIDFD_THREAD);
+	if (pidfd < 0) {
+	    pr_perror("pidfd_open() failed");
+	    return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	if (pidfd_send_signal(pidfd, SIGTERM, NULL, PIDFD_SIGNAL_THREAD)) {
+	    pr_perror("pidfd_send_signal() failed");
+	    fail();
+	    close(pidfd);
+	    return 1;
+	}
+
+	test_msg("Waiting for thread to exit\n");
+	futex_wait_until(&exited, 0);
+
+	pass();
+	close(pidfd);
+	return 0;
+}
diff --git a/test/zdtm/static/pidfd_of_thread.desc b/test/zdtm/static/pidfd_of_thread.desc
new file mode 100644
index 000000000..802caed65
--- /dev/null
+++ b/test/zdtm/static/pidfd_of_thread.desc
@@ -0,0 +1 @@
+{'flags': 'noauto crfail'}

From 88aa7e2c10a83a61226447cfe41d9e50ce001178 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 14 Oct 2024 12:39:18 +0100
Subject: [PATCH 1577/1854] make/lint: use 'ruff check <path>'

The command `ruff <path>` has been deprecated and removed:
https://astral.sh/blog/ruff-v0.5.0#removed-deprecated-features

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 97b4dc211..46d9adef3 100644
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,7 @@ help:
 
 ruff:
 	@ruff --version
-	ruff ${RUFF_FLAGS} --config=scripts/ruff.toml \
+	ruff check ${RUFF_FLAGS} --config=scripts/ruff.toml \
 		test/zdtm.py \
 		test/inhfd/*.py \
 		test/others/rpc/config_file.py \

From b524dab32f03f15a66b637057233ac28ef7b0091 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 14 Oct 2024 13:58:41 +0100
Subject: [PATCH 1578/1854] pycriu: fix lint errors

This patch fixes the following errors reported by ruff:

lib/pycriu/images/pb2dict.py:307:24: E721 Use `is` and `is not` for type comparisons, or `isinstance()` for isinstance checks
    |
305 |     elif field.type in _basic_cast:
306 |         cast = _basic_cast[field.type]
307 |         if pretty and (cast == int):
    |                        ^^^^^^^^^^^ E721
308 |             if is_hex:
309 |                 # Fields that have (criu).hex = true option set
    |

lib/pycriu/images/pb2dict.py:379:13: E721 Use `is` and `is not` for type comparisons, or `isinstance()` for isinstance checks
    |
377 |     elif field.type in _basic_cast:
378 |         cast = _basic_cast[field.type]
379 |         if (cast == int) and is_string(value):
    |             ^^^^^^^^^^^ E721
380 |             if _marked_as_dev(field):
381 |                 return encode_dev(field, value)
    |

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/pycriu/images/pb2dict.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index 0d1a24692..e3dd95ac0 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -304,7 +304,7 @@ def _pb2dict_cast(field, value, pretty=False, is_hex=False):
         return field.enum_type.values_by_number.get(value, None).name
     elif field.type in _basic_cast:
         cast = _basic_cast[field.type]
-        if pretty and (cast == int):
+        if pretty and cast is int:
             if is_hex:
                 # Fields that have (criu).hex = true option set
                 # should be stored in hex string format.
@@ -376,7 +376,7 @@ def _dict2pb_cast(field, value):
         return field.enum_type.values_by_name.get(value, None).number
     elif field.type in _basic_cast:
         cast = _basic_cast[field.type]
-        if (cast == int) and is_string(value):
+        if cast is int and is_string(value):
             if _marked_as_dev(field):
                 return encode_dev(field, value)
 

From 5335b35f72da90a62ad3d771ca175d59ab1bd8b1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 4 Oct 2024 12:14:29 +0100
Subject: [PATCH 1579/1854] images/inventory: add field for enabled plugins

This patch extends the inventory image with a `plugins` field that
contains an array of plugins which were used during checkpoint,
for example, to save GPU state. In particular, the CUDA and AMDGPU
plugins are added to this field only when the checkpoint contains
GPU state. This allows to disable unnecessary plugins during restore,
show appropriate error messages if required CRIU plugin are missing,
and migrate a process that does not use GPU from a GPU-enabled system
to CPU-only environment.

We use the `optional plugins_entry` for backwards compatibility. This
entry allows us to distinguish between *unset* and *missing* field:

- When the field is missing, it indicates that the checkpoint was
  created with a previous version of CRIU, and all plugins should be
  *enabled* during restore.

- When the field is empty, it indicates that no plugins were used during
  checkpointing. Thus, all plugins can be *disabled* during restore.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-restore.c              |   6 +-
 criu/image.c                   | 124 +++++++++++++++++++++++++++++++++
 criu/include/image.h           |   4 ++
 criu/plugin.c                  |   3 +
 images/inventory.proto         |   8 +++
 plugins/amdgpu/amdgpu_plugin.c |  31 +++++++++
 plugins/cuda/cuda_plugin.c     |  22 +++++-
 7 files changed, 193 insertions(+), 5 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index d5b6c8037..646300bdb 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2354,12 +2354,12 @@ int cr_restore_tasks(void)
 	if (init_service_fd())
 		return 1;
 
-	if (cr_plugin_init(CR_PLUGIN_STAGE__RESTORE))
-		return -1;
-
 	if (check_img_inventory(/* restore = */ true) < 0)
 		goto err;
 
+	if (cr_plugin_init(CR_PLUGIN_STAGE__RESTORE))
+		return -1;
+
 	if (init_stats(RESTORE_STATS))
 		goto err;
 
diff --git a/criu/image.c b/criu/image.c
index 9fb390ab7..9589167fb 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -26,6 +26,14 @@ TaskKobjIdsEntry *root_ids;
 u32 root_cg_set;
 Lsmtype image_lsm;
 
+struct inventory_plugin {
+	struct list_head node;
+	char *name;
+};
+
+struct list_head inventory_plugins_list = LIST_HEAD_INIT(inventory_plugins_list);
+static int n_inventory_plugins;
+
 int check_img_inventory(bool restore)
 {
 	int ret = -1;
@@ -99,6 +107,19 @@ int check_img_inventory(bool restore)
 		} else {
 			opts.network_lock_method = he->network_lock_method;
 		}
+
+		if (!he->plugins_entry) {
+			/* backwards compatibility: if the 'plugins_entry' field is missing,
+			 * all plugins should be enabled during restore.
+			 */
+			n_inventory_plugins = -1;
+		} else {
+			PluginsEntry *pe = he->plugins_entry;
+			for (int i = 0; i < pe->n_plugins; i++) {
+				if (add_inventory_plugin(pe->plugins[i]))
+					goto out_err;
+			}
+		}
 	}
 
 	ret = 0;
@@ -110,8 +131,92 @@ out_close:
 	return ret;
 }
 
+/**
+ * Check if the 'plugins' field in the inventory image contains
+ * the specified plugin name. If found, the plugin is removed
+ * from the linked list.
+ */
+bool check_and_remove_inventory_plugin(const char *name, size_t n)
+{
+	if (n_inventory_plugins == -1)
+		return true; /* backwards compatibility */
+
+	if (n_inventory_plugins > 0) {
+		struct inventory_plugin *p, *tmp;
+
+		list_for_each_entry_safe(p, tmp, &inventory_plugins_list, node) {
+			if (!strncmp(name, p->name, n)) {
+				xfree(p->name);
+				list_del(&p->node);
+				xfree(p);
+				n_inventory_plugins--;
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * We expect during restore all loaded plugins to be removed from
+ * the inventory_plugins_list. If the list is not empty, show an
+ * error message for each missing plugin.
+ */
+int check_inventory_plugins(void)
+{
+	struct inventory_plugin *p;
+
+	if (n_inventory_plugins <= 0)
+		return 0;
+
+	list_for_each_entry(p, &inventory_plugins_list, node) {
+		pr_err("Missing required plugin: %s\n", p->name);
+	}
+
+	return -1;
+}
+
+/**
+ * Add plugin name to the inventory image. These values
+ * can be used to identify required plugins during restore.
+ */
+int add_inventory_plugin(const char *name)
+{
+	struct inventory_plugin *p;
+
+	p = xmalloc(sizeof(struct inventory_plugin));
+	if (p == NULL)
+		return -1;
+
+	p->name = xstrdup(name);
+	if (!p->name) {
+		xfree(p);
+		return -1;
+	}
+	list_add(&p->node, &inventory_plugins_list);
+	n_inventory_plugins++;
+
+	return 0;
+}
+
+void free_inventory_plugins_list(void)
+{
+	struct inventory_plugin *p, *tmp;
+
+	if (!list_empty(&inventory_plugins_list)) {
+		list_for_each_entry_safe(p, tmp, &inventory_plugins_list, node) {
+			xfree(p->name);
+			list_del(&p->node);
+			xfree(p);
+		}
+	}
+	n_inventory_plugins = 0;
+}
+
 int write_img_inventory(InventoryEntry *he)
 {
+	PluginsEntry pe = PLUGINS_ENTRY__INIT;
 	struct cr_img *img;
 	int ret;
 
@@ -121,8 +226,27 @@ int write_img_inventory(InventoryEntry *he)
 	if (!img)
 		return -1;
 
+	if (!list_empty(&inventory_plugins_list)) {
+		struct inventory_plugin *p;
+		int i = 0;
+
+		pe.n_plugins = n_inventory_plugins;
+		pe.plugins = xmalloc(n_inventory_plugins * sizeof(char *));
+		if (!pe.plugins)
+			return -1;
+
+		list_for_each_entry(p, &inventory_plugins_list, node) {
+			pe.plugins[i] = p->name;
+			i++;
+		}
+	}
+	he->plugins_entry = &pe;
+
 	ret = pb_write_one(img, he, PB_INVENTORY);
 
+	free_inventory_plugins_list();
+	xfree(pe.plugins);
+
 	xfree(he->root_ids);
 	close_image(img);
 	if (ret < 0)
diff --git a/criu/include/image.h b/criu/include/image.h
index a17aae35c..afa7d5e12 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -177,4 +177,8 @@ extern int read_img_str(struct cr_img *, char **pstr, int size);
 
 extern void close_image(struct cr_img *);
 
+extern int add_inventory_plugin(const char *name);
+extern int check_inventory_plugins(void);
+extern bool check_and_remove_inventory_plugin(const char *name, size_t n);
+
 #endif /* __CR_IMAGE_H__ */
diff --git a/criu/plugin.c b/criu/plugin.c
index 58b5ea5bf..65e79a069 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -256,6 +256,9 @@ int cr_plugin_init(int stage)
 			goto err;
 	}
 
+	if (stage == CR_PLUGIN_STAGE__RESTORE && check_inventory_plugins())
+		goto err;
+
 	exit_code = 0;
 err:
 	closedir(d);
diff --git a/images/inventory.proto b/images/inventory.proto
index a735bad1d..7f655031b 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -10,6 +10,13 @@ enum lsmtype {
 	APPARMOR	= 2;
 }
 
+// It is not possible to distinguish between an empty repeated field
+// and unset repeated field. To solve this problem and provide backwards
+// compabibility, we use the 'plugins_entry' message.
+message plugins_entry {
+	repeated string			plugins = 12;
+};
+
 message inventory_entry {
 	required uint32			img_version	= 1;
 	optional bool			fdinfo_per_id	= 2;
@@ -21,4 +28,5 @@ message inventory_entry {
 	optional uint32			pre_dump_mode	= 9;
 	optional bool			tcp_close	= 10;
 	optional uint32			network_lock_method	= 11;
+	optional plugins_entry		plugins_entry = 12;
 }
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index b56ba6d14..96c086162 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -60,6 +60,10 @@ static LIST_HEAD(update_vma_info_list);
 
 size_t kfd_max_buffer_size;
 
+bool plugin_added_to_inventory = false;
+
+bool plugin_disabled = false;
+
 /**************************************************************************************************/
 
 /* Call ioctl, restarting if it is interrupted */
@@ -332,6 +336,13 @@ void getenv_size_t(const char *var, size_t *value)
 
 int amdgpu_plugin_init(int stage)
 {
+	if (stage == CR_PLUGIN_STAGE__RESTORE) {
+		if (!check_and_remove_inventory_plugin(CR_PLUGIN_DESC.name, strlen(CR_PLUGIN_DESC.name))) {
+			plugin_disabled = true;
+			return 0;
+		}
+	}
+
 	pr_info("initialized:  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
 	topology_init(&src_topology);
@@ -365,6 +376,9 @@ int amdgpu_plugin_init(int stage)
 
 void amdgpu_plugin_fini(int stage, int ret)
 {
+	if (plugin_disabled)
+		return;
+
 	pr_info("finished  %s (AMDGPU/KFD)\n", CR_PLUGIN_DESC.name);
 
 	if (stage == CR_PLUGIN_STAGE__RESTORE)
@@ -414,6 +428,14 @@ int amdgpu_plugin_handle_device_vma(int fd, const struct stat *st_buf)
 	if (ret)
 		pr_perror("%s(), Can't handle VMAs of input device", __func__);
 
+	if (!ret && !plugin_added_to_inventory) {
+		ret = add_inventory_plugin(CR_PLUGIN_DESC.name);
+		if (ret)
+			pr_err("Failed to add AMDGPU plugin to inventory image\n");
+		else
+			plugin_added_to_inventory = true;
+	}
+
 	return ret;
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__HANDLE_DEVICE_VMA, amdgpu_plugin_handle_device_vma)
@@ -1540,6 +1562,9 @@ int amdgpu_plugin_restore_file(int id)
 	size_t img_size;
 	FILE *img_fp = NULL;
 
+	if (plugin_disabled)
+		return -ENOTSUP;
+
 	pr_info("Initialized kfd plugin restorer with ID = %d\n", id);
 
 	snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
@@ -1746,6 +1771,9 @@ int amdgpu_plugin_update_vmamap(const char *in_path, const uint64_t addr, const
 	char *p_end;
 	bool is_kfd = false, is_renderD = false;
 
+	if (plugin_disabled)
+		return -ENOTSUP;
+
 	plugin_log_msg("Enter %s\n", __func__);
 
 	strncpy(path, in_path, sizeof(path));
@@ -1805,6 +1833,9 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	struct kfd_ioctl_criu_args args = { 0 };
 	int fd, exit_code = 0;
 
+	if (plugin_disabled)
+		return -ENOTSUP;
+
 	pr_info("Inside %s for target pid = %d\n", __func__, target_pid);
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 23c3f4b1a..c4fc67fa9 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -38,6 +38,8 @@
  */
 bool plugin_disabled = false;
 
+bool plugin_added_to_inventory = false;
+
 struct pid_info {
 	int pid;
 	char checkpointed;
@@ -319,7 +321,7 @@ int cuda_plugin_checkpoint_devices(int pid)
 	k_rtsigset_t save_sigset;
 
 	if (plugin_disabled) {
-		return 0;
+		return -ENOTSUP;
 	}
 
 	restore_tid = get_cuda_restore_tid(pid);
@@ -354,6 +356,15 @@ int cuda_plugin_checkpoint_devices(int pid)
 			pr_err("Failed to restore process after error %s on pid %d\n", msg_buf, pid);
 		}
 	}
+
+	if (!status && !plugin_added_to_inventory) {
+		status = add_inventory_plugin(CR_PLUGIN_DESC.name);
+		if (status)
+			pr_err("Failed to add CUDA plugin to inventory image\n");
+		else
+			plugin_added_to_inventory = true;
+	}
+
 interrupt:
 	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
 
@@ -367,7 +378,7 @@ int cuda_plugin_pause_devices(int pid)
 	char msg_buf[CUDA_CKPT_BUF_SIZE];
 
 	if (plugin_disabled) {
-		return 0;
+		return -ENOTSUP;
 	}
 
 	restore_tid = get_cuda_restore_tid(pid);
@@ -463,6 +474,13 @@ int cuda_plugin_init(int stage)
 {
 	int ret;
 
+	if (stage == CR_PLUGIN_STAGE__RESTORE) {
+		if (!check_and_remove_inventory_plugin(CR_PLUGIN_DESC.name, strlen(CR_PLUGIN_DESC.name))) {
+			plugin_disabled = true;
+			return 0;
+		}
+	}
+
 	if (!fault_injected(FI_PLUGIN_CUDA_FORCE_ENABLE) && access("/dev/nvidiactl", F_OK)) {
 		pr_info("/dev/nvidiactl doesn't exist. The CUDA plugin is disabled.\n");
 		plugin_disabled = true;

From 5ca4400699cc50fcd6de7d994358136b502d1374 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 14 Oct 2024 13:36:22 +0100
Subject: [PATCH 1580/1854] zdtm: add inventory test plugins

This patch adds two test plugins to verify that CRIU plugins listed
in the inventory image are enabled, while those that are not listed
can be disabled.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/run-ci-tests.sh                    |  1 +
 test/plugins/Makefile                         | 16 +++++++++++++++-
 test/plugins/inventory_test_disabled_plugin.c | 17 +++++++++++++++++
 test/plugins/inventory_test_enabled_plugin.c  | 17 +++++++++++++++++
 test/zdtm.py                                  |  2 +-
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 test/plugins/inventory_test_disabled_plugin.c
 create mode 100644 test/plugins/inventory_test_enabled_plugin.c

diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 38b7b5097..b472e954c 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -362,5 +362,6 @@ make -C plugins/amdgpu/ test_topology_remap
 ./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin cuda
 ./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin amdgpu
 ./test/zdtm.py run -t zdtm/static/maps00 -t zdtm/static/maps02 --criu-plugin amdgpu cuda
+./test/zdtm.py run -t zdtm/static/busyloop00 --criu-plugin inventory_test_enabled inventory_test_disabled
 
 ./test/zdtm.py run -t zdtm/static/sigpending -t zdtm/static/pthread00 --mocked-cuda-checkpoint --fault 138
diff --git a/test/plugins/Makefile b/test/plugins/Makefile
index 7827b655c..4f620ad50 100644
--- a/test/plugins/Makefile
+++ b/test/plugins/Makefile
@@ -1,5 +1,13 @@
 SRC_DIR := ../../plugins
-PLUGIN_TARGETS := amdgpu_plugin.so cuda_plugin.so
+PLUGIN_TARGETS := inventory_test_enabled_plugin.so inventory_test_disabled_plugin.so amdgpu_plugin.so cuda_plugin.so
+
+ARCH	:= x86
+
+PLUGIN_INCLUDE	:= -iquote../../include
+PLUGIN_INCLUDE	+= -iquote../../criu/include
+PLUGIN_INCLUDE	+= -iquote../../criu/arch/$(ARCH)/include/
+PLUGIN_INCLUDE	+= -iquote../../
+PLUGIN_CFLAGS	:= -g -Wall -Werror -shared -nostartfiles -fPIC
 
 # Silent make rules.
 Q := @
@@ -12,6 +20,12 @@ amdgpu_plugin.so: $(SRC_DIR)/amdgpu/amdgpu_plugin.so
 cuda_plugin.so: $(SRC_DIR)/cuda/cuda_plugin.so
 	$(Q) cp $< $@
 
+inventory_test_enabled_plugin.so: inventory_test_enabled_plugin.c
+	$(Q) $(CC) $(PLUGIN_CFLAGS) $< -o $@ $(PLUGIN_INCLUDE)
+
+inventory_test_disabled_plugin.so: inventory_test_disabled_plugin.c
+	$(Q) $(CC) $(PLUGIN_CFLAGS) $< -o $@ $(PLUGIN_INCLUDE)
+
 clean:
 	$(Q) $(RM) $(PLUGIN_TARGETS)
 
diff --git a/test/plugins/inventory_test_disabled_plugin.c b/test/plugins/inventory_test_disabled_plugin.c
new file mode 100644
index 000000000..468fe924b
--- /dev/null
+++ b/test/plugins/inventory_test_disabled_plugin.c
@@ -0,0 +1,17 @@
+#include "criu-plugin.h"
+#include "image.h"
+
+int inventory_test_disabled_plugin_init(int stage)
+{
+	if (stage == CR_PLUGIN_STAGE__RESTORE)
+		return check_and_remove_inventory_plugin(CR_PLUGIN_DESC.name, strlen(CR_PLUGIN_DESC.name));
+
+	return 0;
+}
+
+void inventory_test_disabled_plugin_fini(int stage, int ret)
+{
+	return;
+}
+
+CR_PLUGIN_REGISTER("inventory_test_disabled_plugin", inventory_test_disabled_plugin_init, inventory_test_disabled_plugin_fini)
\ No newline at end of file
diff --git a/test/plugins/inventory_test_enabled_plugin.c b/test/plugins/inventory_test_enabled_plugin.c
new file mode 100644
index 000000000..89e684e2a
--- /dev/null
+++ b/test/plugins/inventory_test_enabled_plugin.c
@@ -0,0 +1,17 @@
+#include "criu-plugin.h"
+#include "image.h"
+
+int inventory_test_enabled_plugin_init(int stage)
+{
+	if (stage == CR_PLUGIN_STAGE__RESTORE)
+		return !check_and_remove_inventory_plugin(CR_PLUGIN_DESC.name, strlen(CR_PLUGIN_DESC.name));
+
+	return add_inventory_plugin(CR_PLUGIN_DESC.name);
+}
+
+void inventory_test_enabled_plugin_fini(int stage, int ret)
+{
+	return;
+}
+
+CR_PLUGIN_REGISTER("inventory_test_enabled_plugin", inventory_test_enabled_plugin_init, inventory_test_enabled_plugin_fini)
\ No newline at end of file
diff --git a/test/zdtm.py b/test/zdtm.py
index 6b2132cc3..37ebe63b7 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2877,7 +2877,7 @@ def get_cli_args():
     rp.add_argument("--preload-libfault", action="store_true", help="Run criu with library preload to simulate special cases")
     rp.add_argument("--criu-plugin",
                     help="Run tests with CRIU plugin",
-                    choices=['amdgpu', 'cuda'],
+                    choices=['amdgpu', 'cuda', 'inventory_test_enabled', 'inventory_test_disabled'],
                     nargs='+',
                     default=None)
     rp.add_argument("--mocked-cuda-checkpoint",

From c49eb18f9f00d18162684f840a1bed4dce9c1d13 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Wed, 9 Oct 2024 09:50:28 +0100
Subject: [PATCH 1581/1854] pidfd: block SIGCHLD during tmp process creation

This patch blocks SIGCHLD during temporary process creation to prevent a
race condition between kill() and waitpid() where sigchld_handler()
causes `criu restore` to fail with an error.

Fixes: #2490

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/pidfd.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/criu/pidfd.c b/criu/pidfd.c
index fdf5dec60..3ea3c9309 100644
--- a/criu/pidfd.c
+++ b/criu/pidfd.c
@@ -145,6 +145,20 @@ static int create_tmp_process(void)
 static int free_dead_pidfd(struct dead_pidfd *dead)
 {
 	int status;
+	sigset_t blockmask, oldmask;
+
+	/*
+	 * Block SIGCHLD to prevent interfering from sigchld_handler()
+	 * and to properly handle the tmp process termination without
+	 * a race condition. A similar approach is used in cr_system().
+	 */
+	sigemptyset(&oldmask);
+	sigemptyset(&blockmask);
+	sigaddset(&blockmask, SIGCHLD);
+	if (sigprocmask(SIG_BLOCK, &blockmask, &oldmask) == -1) {
+		pr_perror("Cannot set mask of blocked signals");
+		goto err;
+	}
 
 	if (kill(dead->pid, SIGKILL) < 0) {
 		pr_perror("Could not kill temporary process with pid: %d",
@@ -158,6 +172,12 @@ static int free_dead_pidfd(struct dead_pidfd *dead)
 		goto err;
 	}
 
+	/* Restore the original signal mask after tmp process has terminated */
+	if (sigprocmask(SIG_SETMASK, &oldmask, NULL) == -1) {
+		pr_perror("Cannot clear blocked signals");
+		goto err;
+	}
+
 	if (!WIFSIGNALED(status)) {
 		pr_err("Expected temporary process to be terminated by a signal\n");
 		goto err;

From d8f93e7baccb299e2f056beeab8c110654af9325 Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 11:49:50 -0700
Subject: [PATCH 1582/1854] include: add common header files for riscv64

Co-authored-by: Yixue Zhao <felicitia2010@gmail.com>
Co-authored-by: stove <stove@rivosinc.com>
Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
- rebased
- imported a page_size() type fix (authored by Cryolitia PukNgae)
Signed-off-by: PukNgae Cryolitia <Cryolitia@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 include/common/arch/riscv64/asm/atomic.h      | 109 ++++++++++++++++++
 include/common/arch/riscv64/asm/bitops.h      |  50 ++++++++
 include/common/arch/riscv64/asm/bitsperlong.h |   6 +
 include/common/arch/riscv64/asm/linkage.h     |  23 ++++
 include/common/arch/riscv64/asm/page.h        |  44 +++++++
 5 files changed, 232 insertions(+)
 create mode 100644 include/common/arch/riscv64/asm/atomic.h
 create mode 100644 include/common/arch/riscv64/asm/bitops.h
 create mode 100644 include/common/arch/riscv64/asm/bitsperlong.h
 create mode 100644 include/common/arch/riscv64/asm/linkage.h
 create mode 100644 include/common/arch/riscv64/asm/page.h

diff --git a/include/common/arch/riscv64/asm/atomic.h b/include/common/arch/riscv64/asm/atomic.h
new file mode 100644
index 000000000..4b08bd9fd
--- /dev/null
+++ b/include/common/arch/riscv64/asm/atomic.h
@@ -0,0 +1,109 @@
+#ifndef __CR_ATOMIC_H__
+#define __CR_ATOMIC_H__
+
+typedef struct {
+	int counter;
+} atomic_t;
+
+/* Copied from the Linux header arch/riscv/include/asm/barrier.h */
+
+#define nop() __asm__ __volatile__("nop")
+
+#define RISCV_FENCE(p, s) __asm__ __volatile__("fence " #p "," #s : : : "memory")
+
+/* These barriers need to enforce ordering on both devices or memory. */
+#define mb()  RISCV_FENCE(iorw, iorw)
+#define rmb() RISCV_FENCE(ir, ir)
+#define wmb() RISCV_FENCE(ow, ow)
+
+/* These barriers do not need to enforce ordering on devices, just memory. */
+#define __smp_mb()  RISCV_FENCE(rw, rw)
+#define __smp_rmb() RISCV_FENCE(r, r)
+#define __smp_wmb() RISCV_FENCE(w, w)
+
+#define __smp_store_release(p, v)                   \
+	do {                                        \
+		compiletime_assert_atomic_type(*p); \
+		RISCV_FENCE(rw, w);                 \
+		WRITE_ONCE(*p, v);                  \
+	} while (0)
+
+#define __smp_load_acquire(p)                       \
+	({                                          \
+		typeof(*p) ___p1 = READ_ONCE(*p);   \
+		compiletime_assert_atomic_type(*p); \
+		RISCV_FENCE(r, rw);                 \
+		___p1;                              \
+	})
+
+/* Copied from the Linux kernel header arch/riscv/include/asm/atomic.h */
+
+static inline int atomic_read(const atomic_t *v)
+{
+	return (*(volatile int *)&(v)->counter);
+}
+
+static inline void atomic_set(atomic_t *v, int i)
+{
+	v->counter = i;
+}
+
+#define atomic_get atomic_read
+
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+	int result;
+
+	asm volatile("amoadd.w.aqrl %1, %2, %0" : "+A"(v->counter), "=r"(result) : "r"(i) : "memory");
+	__smp_mb();
+	return result + i;
+}
+
+static inline int atomic_sub_return(int i, atomic_t *v)
+{
+	return atomic_add_return(-i, v);
+}
+
+static inline int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
+
+static inline int atomic_add(int val, atomic_t *v)
+{
+	return atomic_add_return(val, v) - val;
+}
+
+static inline int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
+
+/* true if the result is 0, or false for all other cases. */
+#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
+#define atomic_dec_return(v)   (atomic_sub_return(1, v))
+
+#define atomic_inc_return(v) (atomic_add_return(1, v))
+
+static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+{
+	unsigned long tmp;
+	int oldval;
+
+	__smp_mb();
+
+	asm volatile("1:\n"
+		     "  lr.w %1, %2\n"
+		     "  bne %1, %3, 2f\n"
+		     "  sc.w %0, %4, %2\n"
+		     "  bnez %0, 1b\n"
+		     "2:"
+		     : "=&r"(tmp), "=&r"(oldval), "+A"(ptr->counter)
+		     : "r"(old), "r"(new)
+		     : "memory");
+
+	__smp_mb();
+	return oldval;
+}
+
+#endif /* __CR_ATOMIC_H__ */
diff --git a/include/common/arch/riscv64/asm/bitops.h b/include/common/arch/riscv64/asm/bitops.h
new file mode 100644
index 000000000..400cc3e15
--- /dev/null
+++ b/include/common/arch/riscv64/asm/bitops.h
@@ -0,0 +1,50 @@
+#ifndef __CR_ASM_BITOPS_H__
+#define __CR_ASM_BITOPS_H__
+
+#include "common/compiler.h"
+#include "common/asm-generic/bitops.h"
+
+#define BITS_PER_LONG 64
+
+#define BIT_MASK(nr) ((1##UL) << ((nr) % BITS_PER_LONG))
+#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
+
+#define __AMO(op) "amo" #op ".d"
+
+#define __test_and_op_bit_ord(op, mod, nr, addr, ord)                        \
+	({                                                                   \
+		unsigned long __res, __mask;                                 \
+		__mask = BIT_MASK(nr);                                       \
+		__asm__ __volatile__(__AMO(op) #ord " %0, %2, %1"            \
+				     : "=r"(__res), "+A"(addr[BIT_WORD(nr)]) \
+				     : "r"(mod(__mask))                      \
+				     : "memory");                            \
+		((__res & __mask) != 0);                                     \
+	})
+
+#define __op_bit_ord(op, mod, nr, addr, ord)                \
+	__asm__ __volatile__(__AMO(op) #ord " zero, %1, %0" \
+			     : "+A"(addr[BIT_WORD(nr)])     \
+			     : "r"(mod(BIT_MASK(nr)))       \
+			     : "memory");
+
+#define __test_and_op_bit(op, mod, nr, addr) __test_and_op_bit_ord(op, mod, nr, addr, .aqrl)
+#define __op_bit(op, mod, nr, addr)	     __op_bit_ord(op, mod, nr, addr, )
+
+/* Bitmask modifiers */
+#define __NOP(x) (x)
+#define __NOT(x) (~(x))
+
+/**
+ * test_and_set_bit - Set a bit and return its old value
+ * @nr: Bit to set
+ * @addr: Address to count from
+ *
+ * This operation may be reordered on other architectures than x86.
+ */
+static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
+{
+	return __test_and_op_bit(or, __NOP, nr, addr);
+}
+
+#endif /* __CR_ASM_BITOPS_H__ */
diff --git a/include/common/arch/riscv64/asm/bitsperlong.h b/include/common/arch/riscv64/asm/bitsperlong.h
new file mode 100644
index 000000000..d95727d19
--- /dev/null
+++ b/include/common/arch/riscv64/asm/bitsperlong.h
@@ -0,0 +1,6 @@
+#ifndef __CR_BITSPERLONG_H__
+#define __CR_BITSPERLONG_H__
+
+#define BITS_PER_LONG 64
+
+#endif /* __CR_BITSPERLONG_H__ */
diff --git a/include/common/arch/riscv64/asm/linkage.h b/include/common/arch/riscv64/asm/linkage.h
new file mode 100644
index 000000000..c6d40f750
--- /dev/null
+++ b/include/common/arch/riscv64/asm/linkage.h
@@ -0,0 +1,23 @@
+#ifndef __CR_LINKAGE_H__
+#define __CR_LINKAGE_H__
+
+#ifdef __ASSEMBLY__
+
+#define __ALIGN	    .align 4, 0x00
+#define __ALIGN_STR ".align 4, 0x00"
+
+#define GLOBAL(name) \
+	.globl name; \
+name:
+
+#define ENTRY(name)            \
+	.globl name;           \
+	.type name, @function; \
+	__ALIGN;               \
+name:
+
+#define END(sym) .size sym, .- sym
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __CR_LINKAGE_H__ */
diff --git a/include/common/arch/riscv64/asm/page.h b/include/common/arch/riscv64/asm/page.h
new file mode 100644
index 000000000..5113cb6db
--- /dev/null
+++ b/include/common/arch/riscv64/asm/page.h
@@ -0,0 +1,44 @@
+#ifndef __CR_ASM_PAGE_H__
+#define __CR_ASM_PAGE_H__
+
+#define ARCH_HAS_LONG_PAGES
+
+#ifndef CR_NOGLIBC
+#include <string.h> /* ffsl() */
+#include <unistd.h> /* _SC_PAGESIZE */
+
+extern unsigned __page_size;
+extern unsigned __page_shift;
+
+static inline unsigned page_size(void)
+{
+	if (!__page_size)
+		__page_size = sysconf(_SC_PAGESIZE);
+	return __page_size;
+}
+
+static inline unsigned page_shift(void)
+{
+	if (!__page_shift)
+		__page_shift = (ffsl(page_size()) - 1);
+	return __page_shift;
+}
+
+/*
+ * Don't add ifdefs for PAGE_SIZE: if any header defines it as a constant
+ * on aarch64, then we need refrain using PAGE_SIZE in criu and use
+ * page_size() across sources (as it may differ on aarch64).
+ */
+#define PAGE_SIZE  page_size()
+#define PAGE_MASK  (~(PAGE_SIZE - 1))
+#define PAGE_SHIFT page_shift()
+
+#define PAGE_PFN(addr) ((addr) / PAGE_SIZE)
+
+#else /* CR_NOGLIBC */
+
+extern unsigned long page_size(void);
+#define PAGE_SIZE page_size()
+
+#endif /* CR_NOGLIBC */
+#endif /* __CR_ASM_PAGE_H__ */

From 95359a62aa4dfb613d2a2cf8f7491b3ec766d348 Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 11:58:26 -0700
Subject: [PATCH 1583/1854] compel: add riscv64 support

Co-authored-by: Yixue Zhao <felicitia2010@gmail.com>
Co-authored-by: stove <stove@rivosinc.com>
Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
- rebased
- added a membarrier() to syscall table (fix authored by Cryolitia PukNgae)
Signed-off-by: PukNgae Cryolitia <Cryolitia@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 Makefile                                      |   6 +-
 compel/Makefile                               |   4 +-
 .../riscv64/plugins/include/asm/prologue.h    |  35 +++
 .../plugins/include/asm/syscall-types.h       |  28 +++
 .../arch/riscv64/plugins/include/features.h   |   4 +
 .../arch/riscv64/plugins/std/parasite-head.S  |   7 +
 .../plugins/std/syscalls/Makefile.syscalls    |  59 +++++
 .../plugins/std/syscalls/gen-sys-exec-tbl.pl  |  43 ++++
 .../plugins/std/syscalls/gen-syscalls.pl      |  99 ++++++++
 .../plugins/std/syscalls/syscall-aux.S        |  37 +++
 .../plugins/std/syscalls/syscall-aux.h        |   3 +
 .../plugins/std/syscalls/syscall-common.S     |  17 ++
 .../riscv64/plugins/std/syscalls/syscall.def  | 125 ++++++++++
 .../riscv64/plugins/std/syscalls/syscalls.S   | 112 +++++++++
 compel/arch/riscv64/scripts/compel-pack.lds.S |  32 +++
 compel/arch/riscv64/src/lib/cpu.c             |  78 ++++++
 compel/arch/riscv64/src/lib/handle-elf-host.c |   1 +
 compel/arch/riscv64/src/lib/handle-elf.c      |  32 +++
 compel/arch/riscv64/src/lib/include/cpu.h     |   0
 .../arch/riscv64/src/lib/include/handle-elf.h |  12 +
 compel/arch/riscv64/src/lib/include/syscall.h |   8 +
 .../src/lib/include/uapi/asm/breakpoints.h    |  15 ++
 .../riscv64/src/lib/include/uapi/asm/cpu.h    |   7 +
 .../riscv64/src/lib/include/uapi/asm/fpu.h    |   4 +
 .../src/lib/include/uapi/asm/infect-types.h   |  52 ++++
 .../include/uapi/asm/instruction_formats.h    |  26 ++
 .../lib/include/uapi/asm/processor-flags.h    |   4 +
 .../src/lib/include/uapi/asm/sigframe.h       |  68 ++++++
 compel/arch/riscv64/src/lib/infect.c          | 222 ++++++++++++++++++
 compel/src/main.c                             |   3 +
 scripts/nmk/scripts/include.mk                |   1 +
 31 files changed, 1141 insertions(+), 3 deletions(-)
 create mode 100644 compel/arch/riscv64/plugins/include/asm/prologue.h
 create mode 100644 compel/arch/riscv64/plugins/include/asm/syscall-types.h
 create mode 100644 compel/arch/riscv64/plugins/include/features.h
 create mode 100644 compel/arch/riscv64/plugins/std/parasite-head.S
 create mode 100644 compel/arch/riscv64/plugins/std/syscalls/Makefile.syscalls
 create mode 100755 compel/arch/riscv64/plugins/std/syscalls/gen-sys-exec-tbl.pl
 create mode 100755 compel/arch/riscv64/plugins/std/syscalls/gen-syscalls.pl
 create mode 100644 compel/arch/riscv64/plugins/std/syscalls/syscall-aux.S
 create mode 100644 compel/arch/riscv64/plugins/std/syscalls/syscall-aux.h
 create mode 100644 compel/arch/riscv64/plugins/std/syscalls/syscall-common.S
 create mode 100644 compel/arch/riscv64/plugins/std/syscalls/syscall.def
 create mode 100644 compel/arch/riscv64/plugins/std/syscalls/syscalls.S
 create mode 100644 compel/arch/riscv64/scripts/compel-pack.lds.S
 create mode 100644 compel/arch/riscv64/src/lib/cpu.c
 create mode 120000 compel/arch/riscv64/src/lib/handle-elf-host.c
 create mode 100644 compel/arch/riscv64/src/lib/handle-elf.c
 create mode 100644 compel/arch/riscv64/src/lib/include/cpu.h
 create mode 100644 compel/arch/riscv64/src/lib/include/handle-elf.h
 create mode 100644 compel/arch/riscv64/src/lib/include/syscall.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/breakpoints.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/cpu.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/fpu.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/infect-types.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/instruction_formats.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/processor-flags.h
 create mode 100644 compel/arch/riscv64/src/lib/include/uapi/asm/sigframe.h
 create mode 100644 compel/arch/riscv64/src/lib/infect.c

diff --git a/Makefile b/Makefile
index 46d9adef3..60b78a074 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ endif
 
 #
 # Supported Architectures
-ifneq ($(filter-out x86 arm aarch64 ppc64 s390 mips loongarch64,$(ARCH)),)
+ifneq ($(filter-out x86 arm aarch64 ppc64 s390 mips loongarch64 riscv64,$(ARCH)),)
         $(error "The architecture $(ARCH) isn't supported")
 endif
 
@@ -84,6 +84,10 @@ ifeq ($(ARCH),loongarch64)
         DEFINES		:= -DCONFIG_LOONGARCH64
 endif
 
+ifeq ($(ARCH),riscv64)
+        DEFINES		:= -DCONFIG_RISCV64
+endif
+
 #
 # CFLAGS_PIE:
 #
diff --git a/compel/Makefile b/compel/Makefile
index 78ec4826a..c0b8a82a0 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -32,8 +32,8 @@ ifeq ($(ARCH),x86)
 lib-y			+= arch/$(ARCH)/src/lib/thread_area.o
 endif
 
-# handle_elf() has no support of ELF relocations on ARM (yet?)
-ifneq ($(filter arm aarch64 loongarch64,$(ARCH)),)
+# handle_elf() has no support of ELF relocations on ARM and RISCV64 (yet?)
+ifneq ($(filter arm aarch64 loongarch64 riscv64,$(ARCH)),)
 CFLAGS			+= -DNO_RELOCS
 HOSTCFLAGS		+= -DNO_RELOCS
 endif
diff --git a/compel/arch/riscv64/plugins/include/asm/prologue.h b/compel/arch/riscv64/plugins/include/asm/prologue.h
new file mode 100644
index 000000000..5c22b7b06
--- /dev/null
+++ b/compel/arch/riscv64/plugins/include/asm/prologue.h
@@ -0,0 +1,35 @@
+#ifndef __ASM_PROLOGUE_H__
+#define __ASM_PROLOGUE_H__
+
+#ifndef __ASSEMBLY__
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <errno.h>
+
+#define sys_recv(sockfd, ubuf, size, flags) sys_recvfrom(sockfd, ubuf, size, flags, NULL, NULL)
+
+typedef struct prologue_init_args {
+	struct sockaddr_un ctl_sock_addr;
+	unsigned int ctl_sock_addr_len;
+
+	unsigned int arg_s;
+	void *arg_p;
+
+	void *sigframe;
+} prologue_init_args_t;
+
+#endif /* __ASSEMBLY__ */
+
+/*
+ * Reserve enough space for sigframe.
+ *
+ * FIXME It is rather should be taken from sigframe header.
+ */
+#define PROLOGUE_SGFRAME_SIZE 4096
+
+#define PROLOGUE_INIT_ARGS_SIZE 1024
+
+#endif /* __ASM_PROLOGUE_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/include/asm/syscall-types.h b/compel/arch/riscv64/plugins/include/asm/syscall-types.h
new file mode 100644
index 000000000..b9740a9ee
--- /dev/null
+++ b/compel/arch/riscv64/plugins/include/asm/syscall-types.h
@@ -0,0 +1,28 @@
+#ifndef COMPEL_ARCH_SYSCALL_TYPES_H__
+#define COMPEL_ARCH_SYSCALL_TYPES_H__
+
+#define SA_RESTORER 0x04000000
+
+typedef void rt_signalfn_t(int, siginfo_t *, void *);
+typedef rt_signalfn_t *rt_sighandler_t;
+
+typedef void rt_restorefn_t(void);
+typedef rt_restorefn_t *rt_sigrestore_t;
+
+#define _KNSIG	  64 // number of signals
+#define _NSIG_BPW 64 // number of signals per word
+
+#define _KNSIG_WORDS (_KNSIG / _NSIG_BPW)
+
+typedef struct {
+	unsigned long sig[_KNSIG_WORDS];
+} k_rtsigset_t;
+
+typedef struct {
+	rt_sighandler_t rt_sa_handler;
+	unsigned long rt_sa_flags;
+	rt_sigrestore_t rt_sa_restorer;
+	k_rtsigset_t rt_sa_mask;
+} rt_sigaction_t;
+
+#endif /* COMPEL_ARCH_SYSCALL_TYPES_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/include/features.h b/compel/arch/riscv64/plugins/include/features.h
new file mode 100644
index 000000000..274cee52a
--- /dev/null
+++ b/compel/arch/riscv64/plugins/include/features.h
@@ -0,0 +1,4 @@
+#ifndef __COMPEL_ARCH_FEATURES_H
+#define __COMPEL_ARCH_FEATURES_H
+
+#endif /* __COMPEL_ARCH_FEATURES_H */
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/parasite-head.S b/compel/arch/riscv64/plugins/std/parasite-head.S
new file mode 100644
index 000000000..3e9d272e3
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/parasite-head.S
@@ -0,0 +1,7 @@
+#include "common/asm/linkage.h"
+
+	.section .head.text, "ax"
+ENTRY(__export_parasite_head_start)
+	jal parasite_service
+	ebreak
+END(__export_parasite_head_start)
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/Makefile.syscalls b/compel/arch/riscv64/plugins/std/syscalls/Makefile.syscalls
new file mode 100644
index 000000000..5af35bcb4
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/Makefile.syscalls
@@ -0,0 +1,59 @@
+ccflags-y		+= -iquote $(PLUGIN_ARCH_DIR)/std/syscalls/
+asflags-y		+= -iquote $(PLUGIN_ARCH_DIR)/std/syscalls/
+
+sys-types		:= $(obj)/include/uapi/std/syscall-types.h
+sys-codes		:= $(obj)/include/uapi/std/syscall-codes.h
+sys-proto		:= $(obj)/include/uapi/std/syscall.h
+
+sys-def			:= $(PLUGIN_ARCH_DIR)/std/syscalls/syscall.def
+sys-asm-common-name	:= std/syscalls/syscall-common.S
+sys-asm-common		:= $(PLUGIN_ARCH_DIR)/$(sys-asm-common-name)
+sys-asm-types		:= $(obj)/include/uapi/std/asm/syscall-types.h
+sys-exec-tbl		 = $(PLUGIN_ARCH_DIR)/std/sys-exec-tbl.c
+
+sys-gen			:= $(PLUGIN_ARCH_DIR)/std/syscalls/gen-syscalls.pl
+sys-gen-tbl		:= $(PLUGIN_ARCH_DIR)/std/syscalls/gen-sys-exec-tbl.pl
+
+sys-asm			:= ./$(PLUGIN_ARCH_DIR)/std/syscalls/syscalls.S
+std-lib-y		+= $(sys-asm:.S=).o
+
+ifeq ($(ARCH),arm)
+arch_bits		:= 32
+else
+arch_bits		:= 64
+endif
+
+sys-exec-tbl		:= sys-exec-tbl.c
+
+$(sys-asm) $(sys-types) $(sys-codes) $(sys-proto): $(sys-gen) $(sys-def) $(sys-asm-common) $(sys-asm-types)
+	$(E) "  GEN     " $@
+	$(Q) perl				\
+		$(sys-gen)			\
+		$(sys-def)			\
+		$(sys-codes)			\
+		$(sys-proto)			\
+		$(sys-asm)			\
+		$(sys-asm-common-name)		\
+		$(sys-types)			\
+		$(arch_bits)
+
+$(sys-asm:.S=).o: $(sys-asm)
+
+$(sys-exec-tbl): $(sys-gen-tbl) $(sys-def)
+	$(E) "  GEN     " $@
+	$(Q) perl				\
+		$(sys-gen-tbl)			\
+		$(sys-def)			\
+		$(sys-exec-tbl)			\
+		$(arch_bits)
+
+$(sys-asm-types): $(PLUGIN_ARCH_DIR)/include/asm/syscall-types.h
+	$(call msg-gen, $@)
+	$(Q) ln -s ../../../../../../$(PLUGIN_ARCH_DIR)/include/asm/syscall-types.h $(sys-asm-types)
+	$(Q) ln -s ../../../../../$(PLUGIN_ARCH_DIR)/std/syscalls/syscall-aux.S $(obj)/include/uapi/std/syscall-aux.S
+	$(Q) ln -s ../../../../../$(PLUGIN_ARCH_DIR)/std/syscalls/syscall-aux.h $(obj)/include/uapi/std/syscall-aux.h
+
+std-headers-deps	+= $(sys-asm) $(sys-codes) $(sys-proto) $(sys-asm-types) $(sys-codes)
+mrproper-y		+= $(std-headers-deps)
+mrproper-y		+= $(obj)/include/uapi/std/syscall-aux.S
+mrproper-y		+= $(obj)/include/uapi/std/syscall-aux.h
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/gen-sys-exec-tbl.pl b/compel/arch/riscv64/plugins/std/syscalls/gen-sys-exec-tbl.pl
new file mode 100755
index 000000000..61a807eb6
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/gen-sys-exec-tbl.pl
@@ -0,0 +1,43 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my $in		= $ARGV[0];
+my $tblout	= $ARGV[1];
+my $bits	= $ARGV[2];
+
+my $code	= "code$bits";
+
+open TBLOUT,	">", $tblout	or die $!;
+open IN,		"<", $in		or die $!;
+
+print TBLOUT "/* Autogenerated, don't edit */\n";
+print TBLOUT "static struct syscall_exec_desc sc_exec_table[] = {\n";
+
+for (<IN>) {
+	if ($_ =~ /\#/) {
+		next;
+	}
+
+	my $sys_name;
+	my $sys_num;
+
+	if (/(?<name>\S+)\s+(?<alias>\S+)\s+(?<code64>\d+|\!)\s+(?<code32>(?:\d+|\!))\s+\((?<args>.+)\)/) {
+		$sys_name = $+{alias};
+	} elsif (/(?<name>\S+)\s+(?<code64>\d+|\!)\s+(?<code32>(?:\d+|\!))\s+\((?<args>.+)\)/) {
+		$sys_name = $+{name};
+	} else {
+		unlink $tblout;
+		die "Invalid syscall definition file: invalid entry $_\n";
+	}
+
+	$sys_num = $+{$code};
+
+	if ($sys_num ne "!") {
+		print TBLOUT "SYSCALL($sys_name, $sys_num)\n";
+	}
+}
+
+print TBLOUT " 	{ }, /* terminator */";
+print TBLOUT "};"
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/gen-syscalls.pl b/compel/arch/riscv64/plugins/std/syscalls/gen-syscalls.pl
new file mode 100755
index 000000000..a53f1962f
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/gen-syscalls.pl
@@ -0,0 +1,99 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my $in         = $ARGV[0];
+my $codesout   = $ARGV[1];
+my $codes      = $ARGV[1];
+$codes         =~ s/.*include\/uapi\//compel\/plugins\//g;
+my $protosout  = $ARGV[2];
+my $protos     = $ARGV[2];
+$protos        =~ s/.*include\/uapi\//compel\/plugins\//g;
+my $asmout     = $ARGV[3];
+my $asmcommon  = $ARGV[4];
+my $prototypes = $ARGV[5];
+$prototypes    =~ s/.*include\/uapi\//compel\/plugins\//g;
+my $bits       = $ARGV[6];
+
+my $codesdef   = $codes;
+$codesdef      =~ tr/.\-\//_/;
+my $protosdef  = $protos;
+$protosdef     =~ tr/.\-\//_/;
+my $code       = "code$bits";
+my $need_aux   = 0;
+
+unlink $codesout;
+unlink $protosout;
+unlink $asmout;
+
+open CODESOUT,	">", $codesout	or die $!;
+open PROTOSOUT, ">", $protosout or die $!;
+open ASMOUT,	">", $asmout	or die $!;
+open IN,	"<", $in	or die $!;
+
+print CODESOUT <<"END";
+/* Autogenerated, don't edit */
+#ifndef $codesdef
+#define $codesdef
+END
+
+print PROTOSOUT <<"END";
+/* Autogenerated, don't edit */
+#ifndef $protosdef
+#define $protosdef
+#include <$prototypes>
+#include <$codes>
+END
+
+print ASMOUT <<"END";
+/* Autogenerated, don't edit */
+#include <$codes>
+#include "$asmcommon"
+END
+
+
+for (<IN>) {
+	if ($_ =~ /\#/) {
+		next;
+	}
+
+	my $code_macro;
+	my $sys_macro;
+	my $sys_name;
+
+	if (/(?<name>\S+)\s+(?<alias>\S+)\s+(?<code64>\d+|\!)\s+(?<code32>(?:\d+|\!))\s+\((?<args>.+)\)/) {
+		$code_macro = "__NR_$+{name}";
+		$sys_macro  = "SYS_$+{name}";
+		$sys_name   = "sys_$+{alias}";
+	} elsif (/(?<name>\S+)\s+(?<code64>\d+|\!)\s+(?<code32>(?:\d+|\!))\s+\((?<args>.+)\)/) {
+		$code_macro = "__NR_$+{name}";
+		$sys_macro  = "SYS_$+{name}";
+		$sys_name   = "sys_$+{name}";
+	} else {
+		unlink $codesout;
+		unlink $protosout;
+		unlink $asmout;
+
+		die "Invalid syscall definition file: invalid entry $_\n";
+	}
+
+	if ($+{$code} ne "!") {
+		print CODESOUT "#ifndef $code_macro\n#define $code_macro $+{$code}\n#endif\n";
+		print CODESOUT "#ifndef $sys_macro\n#define $sys_macro $code_macro\n#endif\n";
+		print ASMOUT "syscall $sys_name, $code_macro\n";
+
+	} else {
+		$need_aux = 1;
+	}
+
+	print PROTOSOUT "extern long $sys_name($+{args});\n";
+}
+
+if ($need_aux == 1) {
+	print ASMOUT   "#include <compel/plugins/std/syscall-aux.S>\n";
+	print CODESOUT "#include <compel/plugins/std/syscall-aux.h>\n";
+}
+
+print CODESOUT  "#endif /* $codesdef */";
+print PROTOSOUT "#endif /* $protosdef */";
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscall-aux.S b/compel/arch/riscv64/plugins/std/syscalls/syscall-aux.S
new file mode 100644
index 000000000..04160b7ac
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/syscall-aux.S
@@ -0,0 +1,37 @@
+/**
+ * This source contains emulation of syscalls
+ * that are not implemented in the riscv64 Linux kernel
+ */
+
+ENTRY(sys_open)
+	add a3, x0, a2
+	add a2, x0, a1
+	add a1, x0, a0
+	addi a0, x0, -100
+	j   sys_openat
+END(sys_open)
+
+
+ENTRY(sys_mkdir)
+	add a3,x0, a2
+	add a2, x0, a1
+	add a1, x0, a0
+	addi a0, x0, -100
+	j   sys_mkdirat
+END(sys_mkdir)
+
+
+ENTRY(sys_rmdir)
+	addi a2, x0, 0x200		// flags = AT_REMOVEDIR
+	add a1, x0, a0
+	addi a0, x0, -100
+	j   sys_unlinkat
+END(sys_rmdir)
+
+
+ENTRY(sys_unlink)
+	addi a2, x0, 0		// flags = 0
+	add a1, x0, a0
+	addi a0, x0, -100
+	j   sys_unlinkat
+END(sys_unlink)
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscall-aux.h b/compel/arch/riscv64/plugins/std/syscalls/syscall-aux.h
new file mode 100644
index 000000000..881765bbb
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/syscall-aux.h
@@ -0,0 +1,3 @@
+#ifndef __NR_openat
+#define __NR_openat 56
+#endif
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscall-common.S b/compel/arch/riscv64/plugins/std/syscalls/syscall-common.S
new file mode 100644
index 000000000..fdef3b47a
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/syscall-common.S
@@ -0,0 +1,17 @@
+#include "common/asm/linkage.h"
+
+syscall_common:
+	ecall
+	ret
+
+.macro syscall name, nr
+	ENTRY(\name)
+		li	a7, \nr
+		j	syscall_common
+	END(\name)
+.endm
+
+ENTRY(__cr_restore_rt)
+	li	a7, __NR_rt_sigreturn
+	ecall
+END(__cr_restore_rt)
\ No newline at end of file
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscall.def b/compel/arch/riscv64/plugins/std/syscalls/syscall.def
new file mode 100644
index 000000000..17f763e90
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/syscall.def
@@ -0,0 +1,125 @@
+#
+# System calls table, please make sure the table consists of only the syscalls
+# really used somewhere in the project.
+#
+# The template is (name and arguments are optional if you need only __NR_x
+# defined, but no real entry point in syscalls lib).
+#
+# name/alias			code64	code32	arguments
+# -----------------------------------------------------------------------
+#
+read				63	3	(int fd, void *buf, unsigned long count)
+write				64	4	(int fd, const void *buf, unsigned long count)
+open				!	5	(const char *filename, unsigned long flags, unsigned long mode)
+close				57	6	(int fd)
+lseek				62	19	(int fd, unsigned long offset, unsigned long origin)
+mmap				222	!	(void *addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset)
+mprotect			226	125	(const void *addr, unsigned long len, unsigned long prot)
+munmap				215	91	(void *addr, unsigned long len)
+brk				214	45	(void *addr)
+rt_sigaction	sigaction	134	174	(int signum, const rt_sigaction_t *act, rt_sigaction_t *oldact, size_t sigsetsize)
+rt_sigprocmask	sigprocmask	135	175	(int how, k_rtsigset_t *set, k_rtsigset_t *old, size_t sigsetsize)
+rt_sigreturn			139	173	(void)
+ioctl				29	54	(unsigned int fd, unsigned int cmd, unsigned long arg)
+pread64				67	180	(unsigned int fd, char *buf, size_t count, loff_t pos)
+ptrace				117	26	(long request, pid_t pid, void *addr, void *data)
+mremap				216	163	(unsigned long addr, unsigned long old_len, unsigned long new_len, unsigned long flag, unsigned long new_addr)
+mincore				232	219	(void *addr, unsigned long size, unsigned char *vec)
+madvise				233	220	(unsigned long start, size_t len, int behavior)
+shmat				196	305	(int shmid, void *shmaddr, int shmflag)
+pause				1061	29	(void)
+nanosleep			101	162	(struct timespec *req, struct timespec *rem)
+getitimer			102	105	(int which, const struct itimerval *val)
+setitimer			103	104	(int which, const struct itimerval *val, struct itimerval *old)
+getpid				172	20	(void)
+socket				198	281	(int domain, int type, int protocol)
+connect				203	283	(int sockfd, struct sockaddr *addr, int addrlen)
+sendto				206	290	(int sockfd, void *buff, size_t len, unsigned int flags, struct sockaddr *addr, int addr_len)
+recvfrom			207	292	(int sockfd, void *ubuf, size_t size, unsigned int flags, struct sockaddr *addr, int *addr_len)
+sendmsg				211	296	(int sockfd, const struct msghdr *msg, int flags)
+recvmsg				212	297	(int sockfd, struct msghdr *msg, int flags)
+shutdown			210	293	(int sockfd, int how)
+bind				235	282	(int sockfd, const struct sockaddr *addr, int addrlen)
+setsockopt			208	294	(int sockfd, int level, int optname, const void *optval, socklen_t optlen)
+getsockopt			209	295	(int sockfd, int level, int optname, const void *optval, socklen_t *optlen)
+clone				220	120	(unsigned long flags, void *child_stack, void *parent_tid, unsigned long newtls, void *child_tid)
+exit				93	1	(unsigned long error_code)
+wait4				260	114	(int pid, int *status, int options, struct rusage *ru)
+waitid				95	280	(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
+kill				129	37	(long pid, int sig)
+fcntl				25	55	(int fd, int type, long arg)
+flock				32	143	(int fd, unsigned long cmd)
+mkdir				!	39	(const char *name, int mode)
+rmdir				!	40	(const char *name)
+unlink				!	10	(char *pathname)
+readlinkat			78	332	(int fd, const char *path, char *buf, int bufsize)
+umask				166	60	(int mask)
+getgroups			158	205	(int gsize, unsigned int *groups)
+setgroups			159	206	(int gsize, unsigned int *groups)
+setresuid			147	164	(int uid, int euid, int suid)
+getresuid			148	165	(int *uid, int *euid, int *suid)
+setresgid			149	170	(int gid, int egid, int sgid)
+getresgid			150	171	(int *gid, int *egid, int *sgid)
+getpgid				155	132	(pid_t pid)
+setfsuid			151	138	(int fsuid)
+setfsgid			152	139	(int fsgid)
+getsid				156	147	(void)
+capget				90	184	(struct cap_header *h, struct cap_data *d)
+capset				91	185	(struct cap_header *h, struct cap_data *d)
+rt_sigqueueinfo			138	178	(pid_t pid, int sig, siginfo_t *info)
+setpriority			140	97	(int which, int who, int nice)
+sched_setscheduler		119	156	(int pid, int policy, struct sched_param *p)
+sigaltstack			132	186	(const void *uss, void *uoss)
+personality			92	136	(unsigned int personality)
+prctl				167	172	(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5)
+arch_prctl			!	17	(int option, unsigned long addr)
+setrlimit			164	75	(int resource, struct krlimit *rlim)
+mount				40	21	(char *dev_nmae, char *dir_name, char *type, unsigned long flags, void *data)
+umount2				39	52	(char *name, int flags)
+gettid				178	224	(void)
+futex				98	240	(uint32_t *uaddr, int op, uint32_t val, struct timespec *utime, uint32_t *uaddr2, uint32_t val3)
+set_tid_address			96	256	(int *tid_addr)
+restart_syscall			128	0	(void)
+timer_create			107	257	(clockid_t which_clock, struct sigevent *timer_event_spec, kernel_timer_t *created_timer_id)
+timer_settime			110	258	(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
+timer_gettime			108	259	(int timer_id, const struct itimerspec *setting)
+timer_getoverrun		109	260	(int timer_id)
+timer_delete			111	261	(kernel_timer_t timer_id)
+clock_gettime			113	263	(const clockid_t which_clock, const struct timespec *tp)
+exit_group			94	248	(int error_code)
+set_robust_list			99	338	(struct robust_list_head *head, size_t len)
+get_robust_list			100	339	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
+signalfd4			74	355	(int fd, k_rtsigset_t *mask, size_t sizemask, int flags)
+rt_tgsigqueueinfo		240	363	(pid_t tgid, pid_t pid, int sig, siginfo_t *info)
+vmsplice			75	343	(int fd, const struct iovec *iov, unsigned long nr_segs, unsigned int flags)
+timerfd_settime			86	353	(int ufd, int flags, const struct itimerspec *utmr, struct itimerspec *otmr)
+fanotify_init			262	367	(unsigned int flags, unsigned int event_f_flags)
+fanotify_mark			263	368	(int fanotify_fd, unsigned int flags, uint64_t mask, int dfd, const char *pathname)
+open_by_handle_at		265	371	(int mountdirfd, struct file_handle *handle, int flags)
+setns				268	375	(int fd, int nstype)
+kcmp				272	378	(pid_t pid1, pid_t pid2, int type, unsigned long idx1, unsigned long idx2)
+openat				56	322	(int dirfd, const char *pathname, int flags, mode_t mode)
+mkdirat				34	323	(int dirfd, const char *pathname, mode_t mode)
+unlinkat			35	328	(int dirfd, const char *pathname, int flags)
+memfd_create			279	385	(const char *name, unsigned int flags)
+io_setup			0	243	(unsigned nr_events, aio_context_t *ctx)
+io_submit			2	246	(aio_context_t ctx_id, long nr, struct iocb **iocbpp)
+io_getevents			4	245	(aio_context_t ctx, long min_nr, long nr, struct io_event *evs, struct timespec *tmo)
+seccomp				277	383	(unsigned int op, unsigned int flags, const char *uargs)
+gettimeofday			169	78	(struct timeval *tv, struct timezone *tz)
+preadv_raw			69	361	(int fd, struct iovec *iov, unsigned long nr, unsigned long pos_l, unsigned long pos_h)
+userfaultfd			282	388	(int flags)
+fallocate			47	352	(int fd, int mode, loff_t offset, loff_t len)
+cacheflush			!	983042	(void *start, void *end, int flags)
+ppoll				73	336	(struct pollfd *fds, unsigned int nfds, const struct timespec *tmo, const sigset_t *sigmask, size_t sigsetsize)
+fsopen				430	430	(char *fsname, unsigned int flags)
+fsconfig			431	431	(int fd, unsigned int cmd, const char *key, const char *value, int aux)
+fsmount				432	432	(int fd, unsigned int flags, unsigned int attr_flags)
+clone3				435	435	(struct clone_args *uargs, size_t size)
+pidfd_open			434	434	(pid_t pid, unsigned int flags)
+pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
+rseq				293 	293 	(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
+move_mount          		429	429	(int from_dfd, const char *from_pathname, int to_dfd, const char *to_pathname, int flags)
+open_tree			428	428	(int dirfd, const char *pathname, unsigned int flags)
+openat2				437	437	(int dirfd, char *pathname, struct open_how *how, size_t size)
+membarrier 			283	283	(int cmd, unsigned int flags, int cpu_id)
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscalls.S b/compel/arch/riscv64/plugins/std/syscalls/syscalls.S
new file mode 100644
index 000000000..715da4612
--- /dev/null
+++ b/compel/arch/riscv64/plugins/std/syscalls/syscalls.S
@@ -0,0 +1,112 @@
+/* Autogenerated, don't edit */
+#include <compel/plugins/std/syscall-codes.h>
+#include "std/syscalls/syscall-common.S"
+syscall sys_read, __NR_read
+syscall sys_write, __NR_write
+syscall sys_close, __NR_close
+syscall sys_lseek, __NR_lseek
+syscall sys_mmap, __NR_mmap
+syscall sys_mprotect, __NR_mprotect
+syscall sys_munmap, __NR_munmap
+syscall sys_brk, __NR_brk
+syscall sys_sigaction, __NR_rt_sigaction
+syscall sys_sigprocmask, __NR_rt_sigprocmask
+syscall sys_rt_sigreturn, __NR_rt_sigreturn
+syscall sys_ioctl, __NR_ioctl
+syscall sys_pread64, __NR_pread64
+syscall sys_ptrace, __NR_ptrace
+syscall sys_mremap, __NR_mremap
+syscall sys_mincore, __NR_mincore
+syscall sys_madvise, __NR_madvise
+syscall sys_shmat, __NR_shmat
+syscall sys_pause, __NR_pause
+syscall sys_nanosleep, __NR_nanosleep
+syscall sys_getitimer, __NR_getitimer
+syscall sys_setitimer, __NR_setitimer
+syscall sys_getpid, __NR_getpid
+syscall sys_socket, __NR_socket
+syscall sys_connect, __NR_connect
+syscall sys_sendto, __NR_sendto
+syscall sys_recvfrom, __NR_recvfrom
+syscall sys_sendmsg, __NR_sendmsg
+syscall sys_recvmsg, __NR_recvmsg
+syscall sys_shutdown, __NR_shutdown
+syscall sys_bind, __NR_bind
+syscall sys_setsockopt, __NR_setsockopt
+syscall sys_getsockopt, __NR_getsockopt
+syscall sys_clone, __NR_clone
+syscall sys_exit, __NR_exit
+syscall sys_wait4, __NR_wait4
+syscall sys_waitid, __NR_waitid
+syscall sys_kill, __NR_kill
+syscall sys_fcntl, __NR_fcntl
+syscall sys_flock, __NR_flock
+syscall sys_readlinkat, __NR_readlinkat
+syscall sys_umask, __NR_umask
+syscall sys_getgroups, __NR_getgroups
+syscall sys_setgroups, __NR_setgroups
+syscall sys_setresuid, __NR_setresuid
+syscall sys_getresuid, __NR_getresuid
+syscall sys_setresgid, __NR_setresgid
+syscall sys_getresgid, __NR_getresgid
+syscall sys_getpgid, __NR_getpgid
+syscall sys_setfsuid, __NR_setfsuid
+syscall sys_setfsgid, __NR_setfsgid
+syscall sys_getsid, __NR_getsid
+syscall sys_capget, __NR_capget
+syscall sys_capset, __NR_capset
+syscall sys_rt_sigqueueinfo, __NR_rt_sigqueueinfo
+syscall sys_setpriority, __NR_setpriority
+syscall sys_sched_setscheduler, __NR_sched_setscheduler
+syscall sys_sigaltstack, __NR_sigaltstack
+syscall sys_personality, __NR_personality
+syscall sys_prctl, __NR_prctl
+syscall sys_setrlimit, __NR_setrlimit
+syscall sys_mount, __NR_mount
+syscall sys_umount2, __NR_umount2
+syscall sys_gettid, __NR_gettid
+syscall sys_futex, __NR_futex
+syscall sys_set_tid_address, __NR_set_tid_address
+syscall sys_restart_syscall, __NR_restart_syscall
+syscall sys_timer_create, __NR_timer_create
+syscall sys_timer_settime, __NR_timer_settime
+syscall sys_timer_gettime, __NR_timer_gettime
+syscall sys_timer_getoverrun, __NR_timer_getoverrun
+syscall sys_timer_delete, __NR_timer_delete
+syscall sys_clock_gettime, __NR_clock_gettime
+syscall sys_exit_group, __NR_exit_group
+syscall sys_set_robust_list, __NR_set_robust_list
+syscall sys_get_robust_list, __NR_get_robust_list
+syscall sys_signalfd4, __NR_signalfd4
+syscall sys_rt_tgsigqueueinfo, __NR_rt_tgsigqueueinfo
+syscall sys_vmsplice, __NR_vmsplice
+syscall sys_timerfd_settime, __NR_timerfd_settime
+syscall sys_fanotify_init, __NR_fanotify_init
+syscall sys_fanotify_mark, __NR_fanotify_mark
+syscall sys_open_by_handle_at, __NR_open_by_handle_at
+syscall sys_setns, __NR_setns
+syscall sys_kcmp, __NR_kcmp
+syscall sys_openat, __NR_openat
+syscall sys_mkdirat, __NR_mkdirat
+syscall sys_unlinkat, __NR_unlinkat
+syscall sys_memfd_create, __NR_memfd_create
+syscall sys_io_setup, __NR_io_setup
+syscall sys_io_submit, __NR_io_submit
+syscall sys_io_getevents, __NR_io_getevents
+syscall sys_seccomp, __NR_seccomp
+syscall sys_gettimeofday, __NR_gettimeofday
+syscall sys_preadv_raw, __NR_preadv_raw
+syscall sys_userfaultfd, __NR_userfaultfd
+syscall sys_fallocate, __NR_fallocate
+syscall sys_ppoll, __NR_ppoll
+syscall sys_fsopen, __NR_fsopen
+syscall sys_fsconfig, __NR_fsconfig
+syscall sys_fsmount, __NR_fsmount
+syscall sys_clone3, __NR_clone3
+syscall sys_pidfd_open, __NR_pidfd_open
+syscall sys_pidfd_getfd, __NR_pidfd_getfd
+syscall sys_rseq, __NR_rseq
+syscall sys_move_mount, __NR_move_mount
+syscall sys_open_tree, __NR_open_tree
+syscall sys_openat2, __NR_openat2
+#include <compel/plugins/std/syscall-aux.S>
diff --git a/compel/arch/riscv64/scripts/compel-pack.lds.S b/compel/arch/riscv64/scripts/compel-pack.lds.S
new file mode 100644
index 000000000..a61235b44
--- /dev/null
+++ b/compel/arch/riscv64/scripts/compel-pack.lds.S
@@ -0,0 +1,32 @@
+OUTPUT_ARCH(riscv)
+EXTERN(__export_parasite_head_start)
+
+SECTIONS
+{
+	.crblob 0x0 : {
+		*(.head.text)
+		ASSERT(DEFINED(__export_parasite_head_start),
+			"Symbol __export_parasite_head_start is missing");
+		*(.text*)
+		. = ALIGN(32);
+		*(.data*)
+		. = ALIGN(32);
+		*(.rodata*)
+		. = ALIGN(32);
+		*(.bss*)
+		. = ALIGN(32);
+		*(.got*)
+		. = ALIGN(32);
+		*(.toc*)
+		. = ALIGN(32);
+	} =0x00000000,
+
+	/DISCARD/ : {
+		*(.debug*)
+		*(.comment*)
+		*(.note*)
+		*(.group*)
+		*(.eh_frame*)
+		*(*)
+	}
+}
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/cpu.c b/compel/arch/riscv64/src/lib/cpu.c
new file mode 100644
index 000000000..9a0291f70
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/cpu.c
@@ -0,0 +1,78 @@
+#include <string.h>
+#include <stdbool.h>
+
+#include "compel-cpu.h"
+
+#include "common/bitops.h"
+
+#include "log.h"
+
+#undef LOG_PREFIX
+#define LOG_PREFIX "cpu: "
+
+static compel_cpuinfo_t rt_info;
+
+static void fetch_rt_cpuinfo(void)
+{
+	static bool rt_info_done = false;
+
+	if (!rt_info_done) {
+		compel_cpuid(&rt_info);
+		rt_info_done = true;
+	}
+}
+
+void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+}
+void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+}
+int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
+int compel_test_fpu_cap(compel_cpuinfo_t *info, unsigned int feature)
+{
+	return 0;
+}
+int compel_cpuid(compel_cpuinfo_t *info)
+{
+	return 0;
+}
+
+bool compel_cpu_has_feature(unsigned int feature)
+{
+	fetch_rt_cpuinfo();
+	return compel_test_cpu_cap(&rt_info, feature);
+}
+
+bool compel_fpu_has_feature(unsigned int feature)
+{
+	fetch_rt_cpuinfo();
+	return compel_test_fpu_cap(&rt_info, feature);
+}
+
+uint32_t compel_fpu_feature_size(unsigned int feature)
+{
+	fetch_rt_cpuinfo();
+	return 0;
+}
+
+uint32_t compel_fpu_feature_offset(unsigned int feature)
+{
+	fetch_rt_cpuinfo();
+	return 0;
+}
+
+void compel_cpu_clear_feature(unsigned int feature)
+{
+	fetch_rt_cpuinfo();
+	return compel_clear_cpu_cap(&rt_info, feature);
+}
+
+void compel_cpu_copy_cpuinfo(compel_cpuinfo_t *c)
+{
+	fetch_rt_cpuinfo();
+	memcpy(c, &rt_info, sizeof(rt_info));
+}
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/handle-elf-host.c b/compel/arch/riscv64/src/lib/handle-elf-host.c
new file mode 120000
index 000000000..fe4611886
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/handle-elf-host.c
@@ -0,0 +1 @@
+handle-elf.c
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/handle-elf.c b/compel/arch/riscv64/src/lib/handle-elf.c
new file mode 100644
index 000000000..22420bc78
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/handle-elf.c
@@ -0,0 +1,32 @@
+#include <string.h>
+#include <errno.h>
+
+#include "handle-elf.h"
+#include "piegen.h"
+#include "log.h"
+
+static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const unsigned char __maybe_unused elf_ident_64_be[EI_NIDENT] = {
+	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x02, 0x01, 0x00, /* clang-format */
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+int handle_binary(void *mem, size_t size)
+{
+	const unsigned char *elf_ident =
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+		elf_ident_64_le;
+#else
+		elf_ident_64_be;
+#endif
+
+	if (memcmp(mem, elf_ident, sizeof(elf_ident_64_le)) == 0)
+		return handle_elf_riscv64(mem, size);
+
+	pr_err("Unsupported Elf format detected\n");
+	return -EINVAL;
+}
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/cpu.h b/compel/arch/riscv64/src/lib/include/cpu.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/compel/arch/riscv64/src/lib/include/handle-elf.h b/compel/arch/riscv64/src/lib/include/handle-elf.h
new file mode 100644
index 000000000..582770583
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/handle-elf.h
@@ -0,0 +1,12 @@
+#ifndef COMPEL_HANDLE_ELF_H__
+#define COMPEL_HANDLE_ELF_H__
+
+#include "elf64-types.h"
+
+#define __handle_elf handle_elf_riscv64
+#define ELF_RISCV
+#define arch_is_machine_supported(e_machine) (e_machine == EM_RISCV)
+
+extern int handle_elf_riscv64(void *mem, size_t size);
+
+#endif /* COMPEL_HANDLE_ELF_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/syscall.h b/compel/arch/riscv64/src/lib/include/syscall.h
new file mode 100644
index 000000000..53f10525d
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/syscall.h
@@ -0,0 +1,8 @@
+#ifndef __COMPEL_SYSCALL_H__
+#define __COMPEL_SYSCALL_H__
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
+#endif
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/breakpoints.h b/compel/arch/riscv64/src/lib/include/uapi/asm/breakpoints.h
new file mode 100644
index 000000000..f2ba799cb
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/breakpoints.h
@@ -0,0 +1,15 @@
+#ifndef __COMPEL_BREAKPOINTS_H__
+#define __COMPEL_BREAKPOINTS_H__
+#define ARCH_SI_TRAP TRAP_BRKPT
+
+static inline int ptrace_set_breakpoint(pid_t pid, void *addr)
+{
+	return 0;
+}
+
+static inline int ptrace_flush_breakpoints(pid_t pid)
+{
+	return 0;
+}
+
+#endif
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/cpu.h b/compel/arch/riscv64/src/lib/include/uapi/asm/cpu.h
new file mode 100644
index 000000000..ac58567e3
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/cpu.h
@@ -0,0 +1,7 @@
+#ifndef UAPI_COMPEL_ASM_CPU_H__
+#define UAPI_COMPEL_ASM_CPU_H__
+
+typedef struct {
+} compel_cpuinfo_t;
+
+#endif /* UAPI_COMPEL_ASM_CPU_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/fpu.h b/compel/arch/riscv64/src/lib/include/uapi/asm/fpu.h
new file mode 100644
index 000000000..a74decc23
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/fpu.h
@@ -0,0 +1,4 @@
+#ifndef __CR_ASM_FPU_H__
+#define __CR_ASM_FPU_H__
+
+#endif /* __CR_ASM_FPU_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/riscv64/src/lib/include/uapi/asm/infect-types.h
new file mode 100644
index 000000000..192810cac
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/infect-types.h
@@ -0,0 +1,52 @@
+#ifndef UAPI_COMPEL_ASM_TYPES_H__
+#define UAPI_COMPEL_ASM_TYPES_H__
+
+#include <stdint.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <asm/ptrace.h>
+
+#define SIGMAX	   64
+#define SIGMAX_OLD 31
+
+/*
+ * Copied from the Linux kernel header arch/riscv/include/uapi/asm/ptrace.h
+ *
+ * A thread RISC-V CPU context
+ */
+typedef struct user_regs_struct user_regs_struct_t;
+typedef struct __riscv_d_ext_state user_fpregs_struct_t;
+
+#define __compel_arch_fetch_thread_area(tid, th) 0
+#define compel_arch_fetch_thread_area(tctl)	 0
+#define compel_arch_get_tls_task(ctl, tls)
+#define compel_arch_get_tls_thread(tctl, tls)
+
+#define REG_RES(registers)	   ((uint64_t)(registers).a0)
+#define REG_IP(registers)	   ((uint64_t)(registers).pc)
+#define SET_REG_IP(registers, val) ((registers).pc = (val))
+
+/*
+ * REG_SP is also defined in riscv64-linux-gnu/include/sys/ucontext.h
+ * with a different meaning, and it's not used in CRIU. So we have to
+ * undefine it here.
+ */
+#ifdef REG_SP
+#undef REG_SP
+#endif
+
+#define REG_SP(registers) ((uint64_t)((registers).sp))
+
+#define REG_SYSCALL_NR(registers) ((uint64_t)(registers).a7)
+
+#define user_regs_native(pregs) true
+
+#define ARCH_SI_TRAP TRAP_BRKPT
+
+#define __NR(syscall, compat)   \
+	({                      \
+		(void)compat;   \
+		__NR_##syscall; \
+	})
+
+#endif /* UAPI_COMPEL_ASM_TYPES_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/instruction_formats.h b/compel/arch/riscv64/src/lib/include/uapi/asm/instruction_formats.h
new file mode 100644
index 000000000..e231d0465
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/instruction_formats.h
@@ -0,0 +1,26 @@
+#ifndef COMPEL_RELOCATIONS_H__
+#define COMPEL_RELOCATIONS_H__
+
+#include <stdint.h>
+
+static inline uint32_t riscv_b_imm(uint32_t val)
+{
+	return (val & 0x00001000) << 19 | (val & 0x000007e0) << 20 | (val & 0x0000001e) << 7 | (val & 0x00000800) >> 4;
+}
+
+static inline uint32_t riscv_i_imm(uint32_t val)
+{
+	return val << 20;
+}
+
+static inline uint32_t riscv_u_imm(uint32_t val)
+{
+	return val & 0xfffff000;
+}
+
+static inline uint32_t riscv_j_imm(uint32_t val)
+{
+	return (val & 0x00100000) << 11 | (val & 0x000007fe) << 20 | (val & 0x00000800) << 9 | (val & 0x000ff000);
+}
+
+#endif /* COMPEL_RELOCATIONS_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/processor-flags.h b/compel/arch/riscv64/src/lib/include/uapi/asm/processor-flags.h
new file mode 100644
index 000000000..e40fb6fce
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/processor-flags.h
@@ -0,0 +1,4 @@
+#ifndef UAPI_COMPEL_ASM_PROCESSOR_FLAGS_H__
+#define UAPI_COMPEL_ASM_PROCESSOR_FLAGS_H__
+
+#endif /* UAPI_COMPEL_ASM_PROCESSOR_FLAGS_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/riscv64/src/lib/include/uapi/asm/sigframe.h
new file mode 100644
index 000000000..761a08f62
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/include/uapi/asm/sigframe.h
@@ -0,0 +1,68 @@
+#ifndef UAPI_COMPEL_ASM_SIGFRAME_H__
+#define UAPI_COMPEL_ASM_SIGFRAME_H__
+
+#include <sys/ucontext.h>
+
+#include <stdint.h>
+
+#include <signal.h>
+
+/* Copied from the kernel header arch/riscv/include/uapi/asm/sigcontext.h */
+/*
+ * Signal context structure
+ *
+ * This contains the context saved before a signal handler is invoked;
+ * it is restored by sys_sigreturn / sys_rt_sigreturn.
+ */
+// struct sigcontext {
+// 	struct user_regs_struct sc_regs;
+// 	union __riscv_fp_state sc_fpregs;
+// 	/*
+// 	 * 4K + 128 reserved for vector state and future expansion.
+// 	 * This space is enough to store the vector context whose VLENB
+// 	 * is less or equal to 128.
+// 	 * (The size of the vector context is 4144 byte as VLENB is 128)
+// 	 */
+// 	__u8 __reserved[4224] __attribute__((__aligned__(16)));
+// };
+
+#define rt_sigcontext sigcontext
+
+#include <compel/sigframe-common.h>
+
+/* Copied from the kernel source arch/riscv/kernel/signal.c */
+struct rt_sigframe {
+	siginfo_t info;
+	ucontext_t uc; //ucontext_t structure holds the user context, e.g., the signal mask, GP regs
+};
+
+/*
+	generates inline assembly code for triggering the rt_sigreturn system call.
+	used to return from a signal handler back to the normal execution flow of the process.
+*/
+/* clang-format off */
+#define ARCH_RT_SIGRETURN(new_sp, rt_sigframe)					\
+	asm volatile(								\
+			"mv sp, %0\n"	\
+			"li a7,  "__stringify(__NR_rt_sigreturn)" \n"     \
+			"ecall\n"	\
+			:							\
+			: "r"(new_sp)						\
+			: "a7", "memory")
+/* clang-format on */
+
+#define RT_SIGFRAME_UC(rt_sigframe)	 (&rt_sigframe->uc)
+#define RT_SIGFRAME_REGIP(rt_sigframe)	 ((long unsigned int)(rt_sigframe)->uc.uc_mcontext.__gregs[REG_PC])
+#define RT_SIGFRAME_HAS_FPU(rt_sigframe) 1
+#define RT_SIGFRAME_OFFSET(rt_sigframe)	 0
+
+// #define RT_SIGFRAME_SIGCONTEXT(rt_sigframe)  ((struct cr_sigcontext *)&(rt_sigframe)->uc.uc_mcontext)
+// #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct sigcontext *)&(RT_SIGFRAME_SIGCONTEXT(rt_sigframe)->__reserved))
+// #define RT_SIGFRAME_FPU(rt_sigframe)	     (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
+
+#define rt_sigframe_erase_sigset(sigframe) \
+	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t)) // erase the signal mask
+#define rt_sigframe_copy_sigset(sigframe, from) \
+	memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t)) // copy the signal mask
+
+#endif /* UAPI_COMPEL_ASM_SIGFRAME_H__ */
\ No newline at end of file
diff --git a/compel/arch/riscv64/src/lib/infect.c b/compel/arch/riscv64/src/lib/infect.c
new file mode 100644
index 000000000..01395a205
--- /dev/null
+++ b/compel/arch/riscv64/src/lib/infect.c
@@ -0,0 +1,222 @@
+#include <stdlib.h>
+#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <linux/elf.h>
+#include <compel/plugins/std/syscall-codes.h>
+#include "common/page.h"
+#include "uapi/compel/asm/infect-types.h"
+#include "log.h"
+#include "errno.h"
+#include "infect.h"
+#include "infect-priv.h"
+
+unsigned __page_size = 0;
+unsigned __page_shift = 0;
+
+/*
+ * Injected syscall instruction
+ */
+const char code_syscall[] = {
+	0x73, 0x00, 0x00, 0x00, /* ecall */
+	0x73, 0x00, 0x10, 0x00	/* ebreak */
+};
+
+static const int code_syscall_aligned = round_up(sizeof(code_syscall), sizeof(long));
+
+static inline void __always_unused __check_code_syscall(void)
+{
+	BUILD_BUG_ON(code_syscall_aligned != BUILTIN_SYSCALL_SIZE);
+	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
+}
+
+int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+{
+	sigframe->uc.uc_mcontext.__gregs[0] = regs->pc;
+	sigframe->uc.uc_mcontext.__gregs[1] = regs->ra;
+	sigframe->uc.uc_mcontext.__gregs[2] = regs->sp;
+	sigframe->uc.uc_mcontext.__gregs[3] = regs->gp;
+	sigframe->uc.uc_mcontext.__gregs[4] = regs->tp;
+	sigframe->uc.uc_mcontext.__gregs[5] = regs->t0;
+	sigframe->uc.uc_mcontext.__gregs[6] = regs->t1;
+	sigframe->uc.uc_mcontext.__gregs[7] = regs->t2;
+	sigframe->uc.uc_mcontext.__gregs[8] = regs->s0;
+	sigframe->uc.uc_mcontext.__gregs[9] = regs->s1;
+	sigframe->uc.uc_mcontext.__gregs[10] = regs->a0;
+	sigframe->uc.uc_mcontext.__gregs[11] = regs->a1;
+	sigframe->uc.uc_mcontext.__gregs[12] = regs->a2;
+	sigframe->uc.uc_mcontext.__gregs[13] = regs->a3;
+	sigframe->uc.uc_mcontext.__gregs[14] = regs->a4;
+	sigframe->uc.uc_mcontext.__gregs[15] = regs->a5;
+	sigframe->uc.uc_mcontext.__gregs[16] = regs->a6;
+	sigframe->uc.uc_mcontext.__gregs[17] = regs->a7;
+	sigframe->uc.uc_mcontext.__gregs[18] = regs->s2;
+	sigframe->uc.uc_mcontext.__gregs[19] = regs->s3;
+	sigframe->uc.uc_mcontext.__gregs[20] = regs->s4;
+	sigframe->uc.uc_mcontext.__gregs[21] = regs->s5;
+	sigframe->uc.uc_mcontext.__gregs[22] = regs->s6;
+	sigframe->uc.uc_mcontext.__gregs[23] = regs->s7;
+	sigframe->uc.uc_mcontext.__gregs[24] = regs->s8;
+	sigframe->uc.uc_mcontext.__gregs[25] = regs->s9;
+	sigframe->uc.uc_mcontext.__gregs[26] = regs->s10;
+	sigframe->uc.uc_mcontext.__gregs[27] = regs->s11;
+	sigframe->uc.uc_mcontext.__gregs[28] = regs->t3;
+	sigframe->uc.uc_mcontext.__gregs[29] = regs->t4;
+	sigframe->uc.uc_mcontext.__gregs[30] = regs->t5;
+	sigframe->uc.uc_mcontext.__gregs[31] = regs->t6;
+
+	memcpy(sigframe->uc.uc_mcontext.__fpregs.__d.__f, fpregs->f, sizeof(fpregs->f));
+	sigframe->uc.uc_mcontext.__fpregs.__d.__fcsr = fpregs->fcsr;
+
+	return 0;
+}
+
+int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
+{
+	return 0;
+}
+
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
+			 void *arg, __maybe_unused unsigned long flags)
+{
+	user_fpregs_struct_t tmp, *fpsimd = ext_regs ? ext_regs : &tmp;
+	struct iovec iov;
+	int ret = -1;
+
+	pr_info("Dumping FPU registers for %d\n", pid);
+
+	iov.iov_base = fpsimd;
+	iov.iov_len = sizeof(*fpsimd);
+	if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &iov))) {
+		pr_perror("Failed to obtain FPU registers for %d", pid);
+		return -1;
+	}
+
+	ret = save(arg, regs, fpsimd);
+	return ret;
+}
+
+int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	struct iovec iov;
+
+	pr_info("Restoring GP/FPU registers for %d\n", pid);
+
+	iov.iov_base = ext_regs;
+	iov.iov_len = sizeof(*ext_regs);
+	if (ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &iov)) {
+		pr_perror("Failed to set FPU registers for %d", pid);
+		return -1;
+	}
+	return 0;
+}
+
+int compel_syscall(struct parasite_ctl *ctl, int nr, long *ret, unsigned long arg1, unsigned long arg2,
+		   unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6)
+{
+	user_regs_struct_t regs = ctl->orig.regs;
+	int err;
+
+	regs.a7 = (unsigned long)nr;
+	regs.a0 = arg1;
+	regs.a1 = arg2;
+	regs.a2 = arg3;
+	regs.a3 = arg4;
+	regs.a4 = arg5;
+	regs.a5 = arg6;
+	regs.a6 = 0;
+
+	err = compel_execute_syscall(ctl, &regs, code_syscall);
+
+	*ret = regs.a0;
+	return err;
+}
+
+/*
+ * Calling the mmap system call in the context of the target (victim) process using the compel_syscall function.
+ * Used during the infection process to allocate memory for the parasite code.
+*/
+void *remote_mmap(struct parasite_ctl *ctl, void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+	long map;
+	int err;
+
+	err = compel_syscall(ctl, __NR_mmap, &map, (unsigned long)addr, length, prot, flags, fd, offset);
+	if (err < 0 || (long)map < 0)
+		map = 0;
+
+	return (void *)map;
+}
+
+void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
+{
+	regs->pc = new_ip;
+	if (stack)
+		regs->sp = (unsigned long)stack;
+}
+
+bool arch_can_dump_task(struct parasite_ctl *ctl)
+{
+	/*
+	 * TODO: Add proper check here.
+	 */
+	return true;
+}
+
+/*
+ * Fetch the signal alternate stack (sigaltstack),
+ * sas is a separate memory area for the signal handler to run on,
+ * avoiding potential issues with the main process stack
+*/
+int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
+{
+	long ret;
+	int err;
+
+	err = compel_syscall(ctl, __NR_sigaltstack, &ret, 0, (unsigned long)&s->uc.uc_stack, 0, 0, 0, 0);
+	return err ? err : ret;
+}
+
+/*
+ * Task size is the maximum virtual address space size that a process can occupy in the memory
+ * Refer to linux kernel arch/riscv/include/asm/pgtable.h,
+ * task size is:
+ * -     0x9fc00000 (~2.5GB) for RV32.
+ * -   0x4000000000 ( 256GB) for RV64 using SV39 mmu
+ * - 0x800000000000 ( 128TB) for RV64 using SV48 mmu
+ *
+ * Note that PGDIR_SIZE must evenly divide TASK_SIZE since "RISC-V
+ * Instruction Set Manual Volume II: Privileged Architecture" states that
+ * "load and store effective addresses, which are 64bits, must have bits
+ * 63–48 all equal to bit 47, or else a page-fault exception will occur."
+*/
+#define TASK_SIZE 0x800000000000UL // hardcoded for SV48 MMU
+
+unsigned long compel_task_size(void)
+{
+	return TASK_SIZE;
+}
+
+/*
+ * Get task registers (overwrites weak function)
+ */
+int ptrace_get_regs(int pid, user_regs_struct_t *regs)
+{
+	struct iovec iov;
+
+	iov.iov_base = regs;
+	iov.iov_len = sizeof(user_regs_struct_t);
+	return ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov);
+}
+
+/*
+ * Set task registers (overwrites weak function)
+ */
+int ptrace_set_regs(int pid, user_regs_struct_t *regs)
+{
+	struct iovec iov;
+
+	iov.iov_base = regs;
+	iov.iov_len = sizeof(user_regs_struct_t);
+	return ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &iov);
+}
diff --git a/compel/src/main.c b/compel/src/main.c
index bc16c0ab4..21e06d7dd 100644
--- a/compel/src/main.c
+++ b/compel/src/main.c
@@ -60,6 +60,9 @@ static const flags_t flags = {
 #elif defined CONFIG_LOONGARCH64
 	.arch = "loongarch64",
 	.cflags = COMPEL_CFLAGS_PIE,
+#elif defined CONFIG_RISCV64
+	.arch = "riscv64",
+	.cflags = COMPEL_CFLAGS_PIE,
 #else
 #error "CONFIG_<ARCH> not defined, or unsupported ARCH"
 #endif
diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
index 55c5be307..603c322cf 100644
--- a/scripts/nmk/scripts/include.mk
+++ b/scripts/nmk/scripts/include.mk
@@ -21,6 +21,7 @@ ARCH	?= $(shell echo $(SUBARCH) | sed	\
                 -e s/mips.*/mips/		\
                 -e s/sh[234].*/sh/		\
                 -e s/aarch64.*/aarch64/		\
+                -e s/riscv64.*/riscv64/		\
                 -e s/loongarch64.*/loongarch64/)
 
 export SUBARCH ARCH

From 1d028ef44e9de6f8ec9c86eb43753f9156edd1f2 Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 11:59:13 -0700
Subject: [PATCH 1584/1854] images: add riscv64 core image

Co-authored-by: Yixue Zhao <felicitia2010@gmail.com>
Co-authored-by: stove <stove@rivosinc.com>
Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
 images/Makefile           |  1 +
 images/core-riscv64.proto | 53 +++++++++++++++++++++++++++++++++++++++
 images/core.proto         |  3 +++
 3 files changed, 57 insertions(+)
 create mode 100644 images/core-riscv64.proto

diff --git a/images/Makefile b/images/Makefile
index 855d894da..1e40b8a8f 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -7,6 +7,7 @@ proto-obj-y	+= core-arm.o
 proto-obj-y	+= core-aarch64.o
 proto-obj-y	+= core-ppc64.o
 proto-obj-y	+= core-s390.o
+proto-obj-y	+= core-riscv64.o
 proto-obj-y	+= cpuinfo.o
 proto-obj-y	+= inventory.o
 proto-obj-y	+= fdinfo.o
diff --git a/images/core-riscv64.proto b/images/core-riscv64.proto
new file mode 100644
index 000000000..1ddfdd8bd
--- /dev/null
+++ b/images/core-riscv64.proto
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: MIT
+
+syntax = "proto2";
+
+import "opts.proto";
+
+// Refer to riscv-gnu-toolchain/linux-headers/include/asm/ptrace.h
+message user_riscv64_regs_entry {
+    required uint64 pc = 1;
+    required uint64 ra = 2;
+    required uint64 sp = 3;
+    required uint64 gp = 4;
+    required uint64 tp = 5;
+    required uint64 t0 = 6;
+    required uint64 t1 = 7;
+    required uint64 t2 = 8;
+    required uint64 s0 = 9;
+    required uint64 s1 = 10;
+    required uint64 a0 = 11;
+    required uint64 a1 = 12;
+    required uint64 a2 = 13;
+    required uint64 a3 = 14;
+    required uint64 a4 = 15;
+    required uint64 a5 = 16;
+    required uint64 a6 = 17;
+    required uint64 a7 = 18;
+    required uint64 s2 = 19;
+    required uint64 s3 = 20;
+    required uint64 s4 = 21;
+    required uint64 s5 = 22;
+    required uint64 s6 = 23;
+    required uint64 s7 = 24;
+    required uint64 s8 = 25;
+    required uint64 s9 = 26;
+    required uint64 s10 = 27;
+    required uint64 s11 = 28;
+    required uint64 t3 = 29;
+    required uint64 t4 = 30;
+    required uint64 t5 = 31;
+    required uint64 t6 = 32;    
+}
+
+message user_riscv64_d_ext_entry {
+    repeated uint64 f = 1;
+    required uint32 fcsr = 2;
+}
+
+message thread_info_riscv64 {
+	required uint64				clear_tid_addr	= 1[(criu).hex = true];
+	required uint64				tls		= 2;
+	required user_riscv64_regs_entry	gpregs		= 3[(criu).hex = true];
+	required user_riscv64_d_ext_entry	fpsimd		= 4;
+}
diff --git a/images/core.proto b/images/core.proto
index 5b07b5c44..1fa23868b 100644
--- a/images/core.proto
+++ b/images/core.proto
@@ -9,6 +9,7 @@ import "core-ppc64.proto";
 import "core-s390.proto";
 import "core-mips.proto";
 import "core-loongarch64.proto";
+import "core-riscv64.proto";
 
 import "rlimit.proto";
 import "timer.proto";
@@ -126,6 +127,7 @@ message core_entry {
 		S390		= 5;
 		MIPS		= 6;
 		LOONGARCH64		= 7;
+		RISCV64		= 8;
 	}
 
 	required march			mtype		= 1;
@@ -136,6 +138,7 @@ message core_entry {
 	optional thread_info_s390	ti_s390		= 10;
 	optional thread_info_mips	ti_mips		= 11;
 	optional thread_info_loongarch64	ti_loongarch64  = 12;
+	optional thread_info_riscv64	ti_riscv64	= 13;
 
 	optional task_core_entry	tc		= 3;
 	optional task_kobj_ids_entry	ids		= 4;

From 6d970ed047592a2dacb51d81338ca7e9ecc21005 Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 12:06:00 -0700
Subject: [PATCH 1585/1854] criu: add riscv64 support to parasite and restorer

Co-authored-by: Yixue Zhao <felicitia2010@gmail.com>
Co-authored-by: stove <stove@rivosinc.com>
Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
 criu/arch/riscv64/Makefile                    |   8 +
 criu/arch/riscv64/cpu.c                       |  40 ++++
 criu/arch/riscv64/crtools.c                   | 171 ++++++++++++++++++
 criu/arch/riscv64/include/asm/dump.h          |  15 ++
 criu/arch/riscv64/include/asm/int.h           |   6 +
 criu/arch/riscv64/include/asm/kerndat.h       |   7 +
 .../riscv64/include/asm/parasite-syscall.h    |   6 +
 criu/arch/riscv64/include/asm/parasite.h      |  16 ++
 criu/arch/riscv64/include/asm/restore.h       |  29 +++
 criu/arch/riscv64/include/asm/restorer.h      | 150 +++++++++++++++
 .../arch/riscv64/include/asm/thread_pointer.h |  27 +++
 criu/arch/riscv64/include/asm/types.h         |  40 ++++
 criu/arch/riscv64/include/asm/vdso.h          |  28 +++
 criu/arch/riscv64/restorer.c                  |  14 ++
 criu/arch/riscv64/sigframe.c                  |   8 +
 criu/arch/riscv64/vdso-lookup.S               |  15 ++
 criu/arch/riscv64/vdso-pie.c                  | 159 ++++++++++++++++
 criu/pie/Makefile                             |   8 +
 criu/pie/Makefile.library                     |   4 +
 19 files changed, 751 insertions(+)
 create mode 100644 criu/arch/riscv64/Makefile
 create mode 100644 criu/arch/riscv64/cpu.c
 create mode 100644 criu/arch/riscv64/crtools.c
 create mode 100644 criu/arch/riscv64/include/asm/dump.h
 create mode 100644 criu/arch/riscv64/include/asm/int.h
 create mode 100644 criu/arch/riscv64/include/asm/kerndat.h
 create mode 100644 criu/arch/riscv64/include/asm/parasite-syscall.h
 create mode 100644 criu/arch/riscv64/include/asm/parasite.h
 create mode 100644 criu/arch/riscv64/include/asm/restore.h
 create mode 100644 criu/arch/riscv64/include/asm/restorer.h
 create mode 100644 criu/arch/riscv64/include/asm/thread_pointer.h
 create mode 100644 criu/arch/riscv64/include/asm/types.h
 create mode 100644 criu/arch/riscv64/include/asm/vdso.h
 create mode 100644 criu/arch/riscv64/restorer.c
 create mode 100644 criu/arch/riscv64/sigframe.c
 create mode 100644 criu/arch/riscv64/vdso-lookup.S
 create mode 100644 criu/arch/riscv64/vdso-pie.c

diff --git a/criu/arch/riscv64/Makefile b/criu/arch/riscv64/Makefile
new file mode 100644
index 000000000..d19895471
--- /dev/null
+++ b/criu/arch/riscv64/Makefile
@@ -0,0 +1,8 @@
+builtin-name		:= crtools.built-in.o
+
+ldflags-y		+= -r
+
+obj-y			+= cpu.o
+obj-y			+= crtools.o
+obj-y			+= sigframe.o
+obj-y			+= vdso-lookup.o
\ No newline at end of file
diff --git a/criu/arch/riscv64/cpu.c b/criu/arch/riscv64/cpu.c
new file mode 100644
index 000000000..97a883b8c
--- /dev/null
+++ b/criu/arch/riscv64/cpu.c
@@ -0,0 +1,40 @@
+#undef LOG_PREFIX
+#define LOG_PREFIX "cpu: "
+
+#include <errno.h>
+#include "cpu.h"
+
+int cpu_init(void)
+{
+	return 0;
+}
+
+int cpu_dump_cpuinfo(void)
+{
+	return 0;
+}
+
+int cpu_validate_cpuinfo(void)
+{
+	return 0;
+}
+
+int cpu_dump_cpuinfo_single(void)
+{
+	return -ENOTSUP;
+}
+
+int cpu_validate_image_cpuinfo_single(void)
+{
+	return -ENOTSUP;
+}
+
+int cpuinfo_dump(void)
+{
+	return -ENOTSUP;
+}
+
+int cpuinfo_check(void)
+{
+	return -ENOTSUP;
+}
diff --git a/criu/arch/riscv64/crtools.c b/criu/arch/riscv64/crtools.c
new file mode 100644
index 000000000..b2d6d2951
--- /dev/null
+++ b/criu/arch/riscv64/crtools.c
@@ -0,0 +1,171 @@
+#include <string.h>
+#include <unistd.h>
+
+#include <linux/elf.h>
+
+#include "types.h"
+#include <compel/asm/processor-flags.h>
+
+#include <compel/asm/infect-types.h>
+#include "asm/restorer.h"
+#include "common/compiler.h"
+#include <compel/ptrace.h>
+#include "asm/dump.h"
+#include "protobuf.h"
+#include "images/core.pb-c.h"
+#include "images/creds.pb-c.h"
+#include "parasite-syscall.h"
+#include "log.h"
+#include "util.h"
+#include "cpu.h"
+#include "restorer.h"
+#include "compel/infect.h"
+
+#define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))(src)->e
+
+int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
+{
+	int i;
+	CoreEntry *core = x;
+
+	// Save riscv64 gprs
+	assign_reg(core->ti_riscv64->gpregs, regs, pc);
+	assign_reg(core->ti_riscv64->gpregs, regs, ra);
+	assign_reg(core->ti_riscv64->gpregs, regs, sp);
+	assign_reg(core->ti_riscv64->gpregs, regs, gp);
+	assign_reg(core->ti_riscv64->gpregs, regs, tp);
+	assign_reg(core->ti_riscv64->gpregs, regs, t0);
+	assign_reg(core->ti_riscv64->gpregs, regs, t1);
+	assign_reg(core->ti_riscv64->gpregs, regs, t2);
+	assign_reg(core->ti_riscv64->gpregs, regs, s0);
+	assign_reg(core->ti_riscv64->gpregs, regs, s1);
+	assign_reg(core->ti_riscv64->gpregs, regs, a0);
+	assign_reg(core->ti_riscv64->gpregs, regs, a1);
+	assign_reg(core->ti_riscv64->gpregs, regs, a2);
+	assign_reg(core->ti_riscv64->gpregs, regs, a3);
+	assign_reg(core->ti_riscv64->gpregs, regs, a4);
+	assign_reg(core->ti_riscv64->gpregs, regs, a5);
+	assign_reg(core->ti_riscv64->gpregs, regs, a6);
+	assign_reg(core->ti_riscv64->gpregs, regs, a7);
+	assign_reg(core->ti_riscv64->gpregs, regs, s2);
+	assign_reg(core->ti_riscv64->gpregs, regs, s3);
+	assign_reg(core->ti_riscv64->gpregs, regs, s4);
+	assign_reg(core->ti_riscv64->gpregs, regs, s5);
+	assign_reg(core->ti_riscv64->gpregs, regs, s6);
+	assign_reg(core->ti_riscv64->gpregs, regs, s7);
+	assign_reg(core->ti_riscv64->gpregs, regs, s8);
+	assign_reg(core->ti_riscv64->gpregs, regs, s9);
+	assign_reg(core->ti_riscv64->gpregs, regs, s10);
+	assign_reg(core->ti_riscv64->gpregs, regs, s11);
+	assign_reg(core->ti_riscv64->gpregs, regs, t3);
+	assign_reg(core->ti_riscv64->gpregs, regs, t4);
+	assign_reg(core->ti_riscv64->gpregs, regs, t5);
+	assign_reg(core->ti_riscv64->gpregs, regs, t6);
+
+	// Save riscv64 fprs
+	for (i = 0; i < 32; ++i)
+		assign_reg(core->ti_riscv64->fpsimd, fpsimd, f[i]);
+	assign_reg(core->ti_riscv64->fpsimd, fpsimd, fcsr);
+
+	return 0;
+}
+
+int arch_alloc_thread_info(CoreEntry *core)
+{
+	ThreadInfoRiscv64 *ti_riscv64;
+	UserRiscv64RegsEntry *gpregs;
+	UserRiscv64DExtEntry *fpsimd;
+
+	ti_riscv64 = xmalloc(sizeof(*ti_riscv64));
+	if (!ti_riscv64)
+		goto err;
+	thread_info_riscv64__init(ti_riscv64);
+	core->ti_riscv64 = ti_riscv64;
+
+	gpregs = xmalloc(sizeof(*gpregs));
+	if (!gpregs)
+		goto err;
+	user_riscv64_regs_entry__init(gpregs);
+
+	ti_riscv64->gpregs = gpregs;
+
+	fpsimd = xmalloc(sizeof(*fpsimd));
+	if (!fpsimd)
+		goto err;
+	user_riscv64_d_ext_entry__init(fpsimd);
+	ti_riscv64->fpsimd = fpsimd;
+	fpsimd->f = xmalloc(32 * sizeof(fpsimd->f[0]));
+	fpsimd->n_f = 32;
+	if (!fpsimd->f)
+		goto err;
+
+	return 0;
+err:
+	return -1;
+}
+
+void arch_free_thread_info(CoreEntry *core)
+{
+	if (core->ti_riscv64) {
+		if (core->ti_riscv64->fpsimd) {
+			xfree(core->ti_riscv64->fpsimd->f);
+			xfree(core->ti_riscv64->fpsimd);
+		}
+		xfree(core->ti_riscv64->gpregs);
+		xfree(core->ti_riscv64);
+		core->ti_riscv64 = NULL;
+	}
+}
+
+int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
+{
+	int i;
+	UserRiscv64DExtEntry *fpsimd = core->ti_riscv64->fpsimd;
+
+	if (fpsimd->n_f != 32)
+		return 1;
+
+	for (i = 0; i < 32; ++i)
+		sigframe->uc.uc_mcontext.__fpregs.__d.__f[i] = fpsimd->f[i];
+	sigframe->uc.uc_mcontext.__fpregs.__d.__fcsr = fpsimd->fcsr;
+
+	return 0;
+}
+
+int restore_gpregs(struct rt_sigframe *f, UserRiscv64RegsEntry *r)
+{
+	f->uc.uc_mcontext.__gregs[0] = r->pc;
+	f->uc.uc_mcontext.__gregs[1] = r->ra;
+	f->uc.uc_mcontext.__gregs[2] = r->sp;
+	f->uc.uc_mcontext.__gregs[3] = r->gp;
+	f->uc.uc_mcontext.__gregs[4] = r->tp;
+	f->uc.uc_mcontext.__gregs[5] = r->t0;
+	f->uc.uc_mcontext.__gregs[6] = r->t1;
+	f->uc.uc_mcontext.__gregs[7] = r->t2;
+	f->uc.uc_mcontext.__gregs[8] = r->s0;
+	f->uc.uc_mcontext.__gregs[9] = r->s1;
+	f->uc.uc_mcontext.__gregs[10] = r->a0;
+	f->uc.uc_mcontext.__gregs[11] = r->a1;
+	f->uc.uc_mcontext.__gregs[12] = r->a2;
+	f->uc.uc_mcontext.__gregs[13] = r->a3;
+	f->uc.uc_mcontext.__gregs[14] = r->a4;
+	f->uc.uc_mcontext.__gregs[15] = r->a5;
+	f->uc.uc_mcontext.__gregs[16] = r->a6;
+	f->uc.uc_mcontext.__gregs[17] = r->a7;
+	f->uc.uc_mcontext.__gregs[18] = r->s2;
+	f->uc.uc_mcontext.__gregs[19] = r->s3;
+	f->uc.uc_mcontext.__gregs[20] = r->s4;
+	f->uc.uc_mcontext.__gregs[21] = r->s5;
+	f->uc.uc_mcontext.__gregs[22] = r->s6;
+	f->uc.uc_mcontext.__gregs[23] = r->s7;
+	f->uc.uc_mcontext.__gregs[24] = r->s8;
+	f->uc.uc_mcontext.__gregs[25] = r->s9;
+	f->uc.uc_mcontext.__gregs[26] = r->s10;
+	f->uc.uc_mcontext.__gregs[27] = r->s11;
+	f->uc.uc_mcontext.__gregs[28] = r->t3;
+	f->uc.uc_mcontext.__gregs[29] = r->t4;
+	f->uc.uc_mcontext.__gregs[30] = r->t5;
+	f->uc.uc_mcontext.__gregs[31] = r->t6;
+
+	return 0;
+}
diff --git a/criu/arch/riscv64/include/asm/dump.h b/criu/arch/riscv64/include/asm/dump.h
new file mode 100644
index 000000000..c2988f9bf
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/dump.h
@@ -0,0 +1,15 @@
+#ifndef __CR_ASM_DUMP_H__
+#define __CR_ASM_DUMP_H__
+
+extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int arch_alloc_thread_info(CoreEntry *core);
+extern void arch_free_thread_info(CoreEntry *core);
+
+static inline void core_put_tls(CoreEntry *core, tls_t tls)
+{
+	core->ti_riscv64->tls = tls;
+}
+
+#define get_task_futex_robust_list_compat(pid, info) -1
+
+#endif
diff --git a/criu/arch/riscv64/include/asm/int.h b/criu/arch/riscv64/include/asm/int.h
new file mode 100644
index 000000000..642804e9b
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/int.h
@@ -0,0 +1,6 @@
+#ifndef __CR_ASM_INT_H__
+#define __CR_ASM_INT_H__
+
+#include "asm-generic/int.h"
+
+#endif /* __CR_ASM_INT_H__ */
diff --git a/criu/arch/riscv64/include/asm/kerndat.h b/criu/arch/riscv64/include/asm/kerndat.h
new file mode 100644
index 000000000..bb70cf6cf
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/kerndat.h
@@ -0,0 +1,7 @@
+#ifndef __CR_ASM_KERNDAT_H__
+#define __CR_ASM_KERNDAT_H__
+
+#define kdat_compatible_cr() 0
+#define kdat_can_map_vdso()  0
+
+#endif /* __CR_ASM_KERNDAT_H__ */
diff --git a/criu/arch/riscv64/include/asm/parasite-syscall.h b/criu/arch/riscv64/include/asm/parasite-syscall.h
new file mode 100644
index 000000000..6008c3792
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/parasite-syscall.h
@@ -0,0 +1,6 @@
+#ifndef __CR_ASM_PARASITE_SYSCALL_H__
+#define __CR_ASM_PARASITE_SYSCALL_H__
+
+struct parasite_ctl;
+
+#endif
diff --git a/criu/arch/riscv64/include/asm/parasite.h b/criu/arch/riscv64/include/asm/parasite.h
new file mode 100644
index 000000000..4798cfd8a
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/parasite.h
@@ -0,0 +1,16 @@
+#ifndef __ASM_PARASITE_H__
+#define __ASM_PARASITE_H__
+
+/*
+ * This function is used to retrieve the value of the thread pointer (tp)
+ * in RISC-V architecture, which is typically used for thread-local storage (TLS).
+ * The value is then stored in the provided tls_t pointer.
+ */
+static inline void arch_get_tls(tls_t *ptls)
+{
+	tls_t tls;
+	asm("mv %0, tp" : "=r"(tls));
+	*ptls = tls;
+}
+
+#endif
diff --git a/criu/arch/riscv64/include/asm/restore.h b/criu/arch/riscv64/include/asm/restore.h
new file mode 100644
index 000000000..e4f25a57b
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/restore.h
@@ -0,0 +1,29 @@
+#ifndef __CR_ASM_RESTORE_H__
+#define __CR_ASM_RESTORE_H__
+
+#include "asm/restorer.h"
+
+#include "images/core.pb-c.h"
+
+/* clang-format off */
+#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start,	\
+			      task_args)			\
+	asm volatile(						\
+			"and  sp, %0, ~15		\n"	\
+			"mv  a0, %2			\n"	\
+			"jr   %1 			\n"	\
+			:					\
+			: "r"(new_sp),				\
+			  "r"(restore_task_exec_start),		\
+			  "r"(task_args)			\
+			: "a0", "memory")
+/* clang-format on */
+
+static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
+{
+	*ptls = pcore->ti_riscv64->tls;
+}
+
+int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
+
+#endif
diff --git a/criu/arch/riscv64/include/asm/restorer.h b/criu/arch/riscv64/include/asm/restorer.h
new file mode 100644
index 000000000..45fe847a9
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/restorer.h
@@ -0,0 +1,150 @@
+#ifndef __CR_ASM_RESTORER_H__
+#define __CR_ASM_RESTORER_H__
+
+#include <sys/ucontext.h>
+
+#include "asm/types.h"
+#include "images/core.pb-c.h"
+
+#include <compel/asm/sigframe.h>
+
+// kernel arg order for clone
+// unsigned long clone_flags,
+// unsigned long newsp,
+// int __user * parent_tidptr,
+// unsigned long tls,
+// int __user * child_tidptr
+/* clang-format off */
+#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,		\
+			     thread_args, clone_restore_fn)			\
+	asm volatile(								\
+			"clone_emul:					\n"	\
+			"ld a1, %2					\n"	\
+			"andi a1, a1, ~15				\n"	\
+			"addi a1, a1, -16				\n"	\
+			"sd %5, 0(a1)					\n"	\
+			"sd %6, 8(a1)					\n"	\
+			"mv a0, %1					\n"	\
+			"mv a2, %3					\n"	\
+			"mv a3, %4					\n"	\
+			"li a7, "__stringify(__NR_clone)"		\n"	\
+			"ecall						\n"	\
+										\
+			"beqz a0, thread_run				\n"	\
+										\
+			"mv %0, a0					\n"	\
+			"j   clone_end					\n"	\
+										\
+			"thread_run:					\n"	\
+			"ld a1, 0(sp)					\n"	\
+			"ld a0, 8(sp)					\n"	\
+			"jr  a1						\n"	\
+										\
+			"clone_end:					\n"	\
+			: "=r"(ret)						\
+			: "r"(clone_flags),					\
+			  "m"(new_sp),						\
+			  "r"(&parent_tid),					\
+			  "r"(&thread_args[i].pid),				\
+			  "r"(clone_restore_fn),				\
+			  "r"(&thread_args[i])					\
+			: "a0", "a1", "a2", "a3", "a7", "memory")
+
+/*
+ * Based on sysdeps/unix/sysv/linux/riscv/clone.S
+ *
+ * int clone(int (*fn)(void *arg),            x0
+ *	     void *child_stack,               x1
+ *	     int flags,                       x2
+ *	     void *arg,                       x3
+ *	     pid_t *ptid,                     x4
+ *	     struct user_desc *tls,           x5
+ *	     pid_t *ctid);                    x6
+ *
+ * int clone3(struct clone_args *args,        x0
+ *	      size_t size);                   x1
+ *
+ * Always consult the CLONE3 wrappers for other architectures
+ * for additional details.
+ *
+ */
+#define RUN_CLONE3_RESTORE_FN(ret, clone_args, size, args,			\
+			      clone_restore_fn)					\
+	asm volatile(								\
+	/* In contrast to the clone() wrapper above this does not put
+	 * the thread function and its arguments on the child stack,
+	 * but uses registers to pass these parameters to the child process.
+	 * Based on the glibc clone() wrapper at
+	 * sysdeps/unix/sysv/linux/riscv/clone.S.
+	 */									\
+			"clone3_emul:					\n"	\
+	/*
+	 * Based on the glibc clone() wrapper, which uses x10 and x11
+	 * to save the arguments for the child process, this does the same.
+	 * x10 for the thread function and x11 for the thread arguments.
+	 */									\
+			"mv t0, %3	/* clone_restore_fn */		\n"	\
+			"mv t1, %4	/* args */			\n"	\
+			"mv a0, %1	/* &clone_args */		\n"	\
+			"mv a1, %2	/* size */			\n"	\
+	/* Load syscall number */						\
+			"li a7, "__stringify(__NR_clone3)"		\n"	\
+	/* Do the syscall */							\
+			"ecall						\n"	\
+										\
+			"beqz a0, clone3_thread_run			\n"	\
+										\
+			"mv %0, a0					\n"	\
+			"j   clone3_end					\n"	\
+										\
+			"clone3_thread_run:				\n"	\
+	/* Move args to a0 */							\
+			"mv a0, t1					\n"	\
+	/* Jump to clone_restore_fn */						\
+			"jr  t0						\n"	\
+										\
+			"clone3_end:					\n"	\
+			: "=r"(ret)						\
+			: "r"(&clone_args),					\
+			  "r"(size),						\
+			  "r"(clone_restore_fn),				\
+			  "r"(args)						\
+			: "a0", "a1", "a7", "t0", "t1", "memory")
+
+#define ARCH_FAIL_CORE_RESTORE					\
+	asm volatile(						\
+			"mv sp, %0			\n"	\
+			"li a0, 0			\n"	\
+			"jr   x0			\n"	\
+			:					\
+			: "r"(ret)				\
+			: "sp", "a0", "memory")
+/* clang-format on */
+
+#define arch_map_vdso(map, compat) -1
+
+int restore_gpregs(struct rt_sigframe *f, UserRiscv64RegsEntry *r);
+int restore_nonsigframe_gpregs(UserRiscv64RegsEntry *r);
+
+static inline void restore_tls(tls_t *ptls)
+{
+	asm("mv tp, %0" : : "r"(*ptls));
+}
+
+static inline void *alloc_compat_syscall_stack(void)
+{
+	return NULL;
+}
+static inline void free_compat_syscall_stack(void *stack32)
+{
+}
+static inline int arch_compat_rt_sigaction(void *stack, int sig, void *act)
+{
+	return -1;
+}
+static inline int set_compat_robust_list(uint32_t head_ptr, uint32_t len)
+{
+	return -1;
+}
+
+#endif
\ No newline at end of file
diff --git a/criu/arch/riscv64/include/asm/thread_pointer.h b/criu/arch/riscv64/include/asm/thread_pointer.h
new file mode 100644
index 000000000..f7e07066a
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/thread_pointer.h
@@ -0,0 +1,27 @@
+/* __thread_pointer definition.  Generic version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library.  If not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#ifndef _SYS_THREAD_POINTER_H
+#define _SYS_THREAD_POINTER_H
+
+static inline void *__criu_thread_pointer(void)
+{
+	return __builtin_thread_pointer();
+}
+
+#endif /* _SYS_THREAD_POINTER_H */
diff --git a/criu/arch/riscv64/include/asm/types.h b/criu/arch/riscv64/include/asm/types.h
new file mode 100644
index 000000000..83bb5f65f
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/types.h
@@ -0,0 +1,40 @@
+#ifndef __CR_ASM_TYPES_H__
+#define __CR_ASM_TYPES_H__
+
+#include <stdbool.h>
+#include <signal.h>
+#include <asm/ptrace.h>
+#include "images/core.pb-c.h"
+
+#include "page.h"
+#include "bitops.h"
+#include "asm/int.h"
+
+#include <compel/plugins/std/asm/syscall-types.h>
+
+#define core_is_compat(core) false
+
+typedef UserRiscv64RegsEntry UserRegsEntry;
+
+#define CORE_ENTRY__MARCH CORE_ENTRY__MARCH__RISCV64
+
+#define CORE_THREAD_ARCH_INFO(core) core->ti_riscv64
+
+#define TI_SP(core) ((core)->ti_riscv64->gpregs->sp)
+
+#define TI_IP(core) ((core)->ti_riscv64->gpregs->pc)
+
+static inline void *decode_pointer(uint64_t v)
+{
+	return (void *)v;
+}
+static inline uint64_t encode_pointer(void *p)
+{
+	return (uint64_t)p;
+}
+
+#define AT_VECTOR_SIZE 64
+typedef uint64_t auxv_t;
+typedef uint64_t tls_t;
+
+#endif /* __CR_ASM_TYPES_H__ */
diff --git a/criu/arch/riscv64/include/asm/vdso.h b/criu/arch/riscv64/include/asm/vdso.h
new file mode 100644
index 000000000..322149c6e
--- /dev/null
+++ b/criu/arch/riscv64/include/asm/vdso.h
@@ -0,0 +1,28 @@
+#ifndef __CR_ASM_VDSO_H__
+#define __CR_ASM_VDSO_H__
+
+#include "asm/int.h"
+#include "common/compiler.h"
+#include "asm-generic/vdso.h"
+
+/*
+ * This is a minimal amount of symbols
+ * we should support at the moment.
+ */
+#define VDSO_SYMBOL_MAX	 6
+#define VDSO_SYMBOL_GTOD 2
+
+#define ARCH_VDSO_SYMBOLS_LIST                                  \
+	const char *rv64_vdso_symbol1 = "__vdso_clock_getres";  \
+	const char *rv64_vdso_symbol2 = "__vdso_clock_gettime"; \
+	const char *rv64_vdso_symbol3 = "__vdso_gettimeofday";  \
+	const char *rv64_vdso_symbol4 = "__vdso_getcpu";        \
+	const char *rv64_vdso_symbol5 = "__vdso_flush_icache";  \
+	const char *rv64_vdso_symbol6 = "__vdso_rt_sigreturn";
+
+#define ARCH_VDSO_SYMBOLS \
+	rv64_vdso_symbol1, rv64_vdso_symbol2, rv64_vdso_symbol3, rv64_vdso_symbol4, rv64_vdso_symbol5, rv64_vdso_symbol6
+
+extern void write_intraprocedure_branch(unsigned long to, unsigned long from);
+
+#endif /* __CR_ASM_VDSO_H__ */
\ No newline at end of file
diff --git a/criu/arch/riscv64/restorer.c b/criu/arch/riscv64/restorer.c
new file mode 100644
index 000000000..d605f048d
--- /dev/null
+++ b/criu/arch/riscv64/restorer.c
@@ -0,0 +1,14 @@
+#include <unistd.h>
+
+#include "restorer.h"
+#include "asm/restorer.h"
+
+#include <compel/plugins/std/syscall.h>
+#include "log.h"
+#include <compel/asm/fpu.h>
+#include "cpu.h"
+
+int restore_nonsigframe_gpregs(UserRiscv64RegsEntry *r)
+{
+	return 0;
+}
diff --git a/criu/arch/riscv64/sigframe.c b/criu/arch/riscv64/sigframe.c
new file mode 100644
index 000000000..8096fab66
--- /dev/null
+++ b/criu/arch/riscv64/sigframe.c
@@ -0,0 +1,8 @@
+#include "asm/types.h"
+#include <compel/asm/infect-types.h>
+#include "asm/sigframe.h"
+
+int sigreturn_prep_fpu_frame(struct rt_sigframe *sigframe, struct rt_sigframe *rsigframe)
+{
+	return 0;
+}
diff --git a/criu/arch/riscv64/vdso-lookup.S b/criu/arch/riscv64/vdso-lookup.S
new file mode 100644
index 000000000..50d4ecf08
--- /dev/null
+++ b/criu/arch/riscv64/vdso-lookup.S
@@ -0,0 +1,15 @@
+#include "common/asm/linkage.h"
+
+.section	.text
+
+/* Expects t0 to hold the index into the lookup table. */
+GLOBAL(riscv_vdso_lookup)
+	/* Get the beginning of the lookup table */
+	la t1, riscv_vdso_lookup_end
+	/* Scale the index */
+	slli t0, t0, 3
+	add t1, t0, t1
+	ld t2, 0(t1)
+	jr t2
+
+GLOBAL(riscv_vdso_lookup_end)
\ No newline at end of file
diff --git a/criu/arch/riscv64/vdso-pie.c b/criu/arch/riscv64/vdso-pie.c
new file mode 100644
index 000000000..aa9272fb5
--- /dev/null
+++ b/criu/arch/riscv64/vdso-pie.c
@@ -0,0 +1,159 @@
+#include <unistd.h>
+
+#include "asm/types.h"
+
+#include <compel/asm/instruction_formats.h>
+#include <compel/plugins/std/string.h>
+#include <compel/plugins/std/syscall.h>
+#include <compel/plugins/std/syscall-codes.h>
+#include "atomic.h"
+#include "parasite-vdso.h"
+#include "log.h"
+#include "common/bug.h"
+
+#ifdef LOG_PREFIX
+#undef LOG_PREFIX
+#endif
+#define LOG_PREFIX "vdso: "
+
+/* These symbols are defined in vdso-lookup.S */
+extern char *riscv_vdso_lookup, *riscv_vdso_lookup_end;
+
+/*
+ *  li t0, INDEX
+ *  jal x0, riscv_vdso_lookup
+ */
+#define TRAMP_CALL_SIZE (2 * sizeof(uint32_t))
+
+static inline void invalidate_caches(void)
+{
+	// We're supposed to use the VDSO as the officially sanctioned ABI. But oh well.
+	int ret;
+	__smp_mb();
+	asm volatile("li a0, 0\n"
+		     "li a1, 0\n"
+		     "li a2, 1\n"   /* SYS_RISCV_FLUSH_ICACHE_ALL */
+		     "li a7, 259\n" /* __NR_arch_specific_syscall */
+		     "ecall\n"
+		     : "=r"(ret)
+		     :
+		     : "a7");
+}
+
+static inline size_t vdso_trampoline_size(void)
+{
+	return (size_t)&riscv_vdso_lookup_end - (size_t)&riscv_vdso_lookup;
+}
+
+static uint64_t put_trampoline(uint64_t at, struct vdso_symtable *sym)
+{
+	int i, j;
+	uint64_t total_size, trampoline_size;
+	uint64_t trampoline = 0;
+
+	/* First of all we have to find a place where to put the trampoline
+	 * code.
+	 */
+	trampoline_size = vdso_trampoline_size();
+	total_size = trampoline_size + VDSO_SYMBOL_MAX * sizeof(uint64_t);
+
+	for (i = 0; i < ARRAY_SIZE(sym->symbols); i++) {
+		if (vdso_symbol_empty(&sym->symbols[i]))
+			continue;
+
+		pr_debug("Checking '%s' at %lx\n", sym->symbols[i].name, sym->symbols[i].offset);
+
+		/* find the nearest following symbol we are interested in */
+		for (j = 0; j < ARRAY_SIZE(sym->symbols); j++) {
+			if (i == j || vdso_symbol_empty(&sym->symbols[j]))
+				continue;
+
+			if (sym->symbols[j].offset <= sym->symbols[i].offset)
+				/* this symbol is above the current one */
+				continue;
+
+			if ((sym->symbols[i].offset + TRAMP_CALL_SIZE) > sym->symbols[j].offset) {
+				/* we have a major issue here since we cannot
+				 * even put the trampoline call for this symbol
+				 */
+				pr_err("Can't handle small vDSO symbol %s\n", sym->symbols[i].name);
+				return 0;
+			}
+
+			if (trampoline)
+				/* no need to put it twice */
+				continue;
+
+			if ((sym->symbols[j].offset - (sym->symbols[i].offset + TRAMP_CALL_SIZE)) <= total_size)
+				/* not enough place */
+				continue;
+
+			/* We can put the trampoline there */
+			trampoline = at + sym->symbols[i].offset;
+			trampoline += TRAMP_CALL_SIZE;
+
+			pr_debug("Putting vDSO trampoline in %s at %lx\n", sym->symbols[i].name, trampoline);
+			memcpy((void *)trampoline, &riscv_vdso_lookup, trampoline_size);
+			invalidate_caches();
+			return trampoline;
+		}
+	}
+
+	return 0;
+}
+
+static inline void put_trampoline_call(uint64_t from, uint64_t to, uint64_t trampoline, unsigned int idx)
+{
+	size_t trampoline_size = vdso_trampoline_size();
+	uint64_t *lookup_table = NULL;
+	/*
+	 *  li t0, INDEX
+	 *  addi t0, x0 INDEX
+	 *  jal x0, riscv_vdso_lookup
+	 */
+	uint32_t trampoline_call[2] = {
+		0x00000293,
+		0x0000006f,
+	};
+	const size_t insts_len = ARRAY_SIZE(trampoline_call);
+	uint32_t *call_addr = (uint32_t *)from;
+	// Offset from the jal instruction to the lookup trampoline.
+	ssize_t trampoline_offset = trampoline - (from + sizeof(uint32_t));
+
+	trampoline_call[0] = trampoline_call[0] | (idx << 24);
+	trampoline_call[1] = trampoline_call[1] | riscv_j_imm(trampoline_offset);
+
+	for (unsigned int i = 0; i < insts_len; i++) {
+		call_addr[i] = trampoline_call[i];
+	}
+
+	// Set the lookup table pointer for this vdso symbol.
+	lookup_table = (uint64_t *)(trampoline + trampoline_size);
+	lookup_table[idx] = to;
+}
+
+int vdso_redirect_calls(uint64_t base_to, uint64_t base_from, struct vdso_symtable *to, struct vdso_symtable *from,
+			bool __always_unused compat_vdso)
+{
+	unsigned int i, valid_idx = 0;
+
+	uint64_t trampoline = (uint64_t)put_trampoline(base_from, from);
+	if (!trampoline)
+		return 1;
+
+	for (i = 0; i < ARRAY_SIZE(to->symbols); i++) {
+		if (vdso_symbol_empty(&from->symbols[i]))
+			continue;
+
+		pr_debug("br: %lx/%lx -> %lx/%lx (index %d) '%s'\n", base_from, from->symbols[i].offset, base_to,
+			 to->symbols[i].offset, i, from->symbols[i].name);
+
+		put_trampoline_call(base_from + from->symbols[i].offset, base_to + to->symbols[i].offset, trampoline,
+				    valid_idx);
+		valid_idx++;
+	}
+
+	invalidate_caches();
+
+	return 0;
+}
\ No newline at end of file
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 912fab24b..60c7f1e94 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -23,6 +23,10 @@ ifeq ($(ARCH),x86)
 	ccflags-y	+= -mshstk
 endif
 
+ifeq ($(ARCH),riscv64)
+	ccflags-y	+= -fno-stack-protector
+endif
+
 LDS		:= compel/arch/$(ARCH)/scripts/compel-pack.lds.S
 
 restorer-obj-y	+= parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
@@ -43,6 +47,10 @@ ifeq ($(ARCH),ppc64)
         restorer-obj-y	+= ./$(ARCH_DIR)/vdso-trampoline.o
 endif
 
+ifeq ($(ARCH),riscv64)
+        restorer-obj-y	+= ./$(ARCH_DIR)/vdso-lookup.o
+endif
+
 define gen-pie-rules
 $(1)-obj-y	+= $(1).o
 $(1)-obj-e	+= pie.lib.a
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index da2a2fab3..d96a7ac32 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -27,3 +27,7 @@ CFLAGS		+= $(CFLAGS_PIE)
 ifeq ($(ARCH),mips)
 CFLAGS			+= -fno-stack-protector -DCR_NOGLIBC -mno-abicalls -fno-pic
 endif
+
+ifeq ($(ARCH),riscv64)
+	ccflags-y	+= -fno-stack-protector
+endif
\ No newline at end of file

From bb29067de9ee853fd132f88b4b3e62dbd87aa915 Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 12:09:16 -0700
Subject: [PATCH 1586/1854] zdtm: add riscv64 support

Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
 .../lib/arch/riscv64/include/asm/atomic.h     | 107 ++++++++++++++++++
 test/zdtm/lib/test.c                          |   2 +-
 test/zdtm/static/fanotify00.c                 |   2 +-
 test/zdtm/static/netns-nf.desc                |   2 +-
 test/zdtm/static/netns-nft-ipt.desc           |   2 +-
 .../static/socket-tcp-closed-last-ack.desc    |   4 +-
 test/zdtm/static/socket-tcp-reseted.desc      |   6 +-
 test/zdtm/static/socket-tcp-syn-sent.desc     |   4 +-
 8 files changed, 118 insertions(+), 11 deletions(-)
 create mode 100644 test/zdtm/lib/arch/riscv64/include/asm/atomic.h

diff --git a/test/zdtm/lib/arch/riscv64/include/asm/atomic.h b/test/zdtm/lib/arch/riscv64/include/asm/atomic.h
new file mode 100644
index 000000000..a4faf1322
--- /dev/null
+++ b/test/zdtm/lib/arch/riscv64/include/asm/atomic.h
@@ -0,0 +1,107 @@
+#ifndef __CR_ATOMIC_H__
+#define __CR_ATOMIC_H__
+
+typedef uint32_t atomic_t;
+
+/* Copied from the Linux header arch/riscv/include/asm/barrier.h */
+
+#define nop() __asm__ __volatile__("nop")
+
+#define RISCV_FENCE(p, s) __asm__ __volatile__("fence " #p "," #s : : : "memory")
+
+/* These barriers need to enforce ordering on both devices or memory. */
+#define mb()  RISCV_FENCE(iorw, iorw)
+#define rmb() RISCV_FENCE(ir, ir)
+#define wmb() RISCV_FENCE(ow, ow)
+
+/* These barriers do not need to enforce ordering on devices, just memory. */
+#define __smp_mb()  RISCV_FENCE(rw, rw)
+#define __smp_rmb() RISCV_FENCE(r, r)
+#define __smp_wmb() RISCV_FENCE(w, w)
+
+#define __smp_store_release(p, v)                   \
+	do {                                        \
+		compiletime_assert_atomic_type(*p); \
+		RISCV_FENCE(rw, w);                 \
+		WRITE_ONCE(*p, v);                  \
+	} while (0)
+
+#define __smp_load_acquire(p)                       \
+	({                                          \
+		typeof(*p) ___p1 = READ_ONCE(*p);   \
+		compiletime_assert_atomic_type(*p); \
+		RISCV_FENCE(r, rw);                 \
+		___p1;                              \
+	})
+
+/* Copied from the Linux kernel header arch/riscv/include/asm/atomic.h */
+
+static inline int atomic_read(const atomic_t *v)
+{
+	return (*(volatile int *)v);
+}
+
+static inline void atomic_set(atomic_t *v, int i)
+{
+	*v = i;
+}
+
+#define atomic_get atomic_read
+
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+	int result;
+
+	asm volatile("amoadd.w.aqrl %1, %2, %0" : "+A"(*v), "=r"(result) : "r"(i) : "memory");
+	__smp_mb();
+	return result + i;
+}
+
+static inline int atomic_sub_return(int i, atomic_t *v)
+{
+	return atomic_add_return(-i, v);
+}
+
+static inline int atomic_inc(atomic_t *v)
+{
+	return atomic_add_return(1, v) - 1;
+}
+
+static inline int atomic_add(int val, atomic_t *v)
+{
+	return atomic_add_return(val, v) - val;
+}
+
+static inline int atomic_dec(atomic_t *v)
+{
+	return atomic_sub_return(1, v) + 1;
+}
+
+/* true if the result is 0, or false for all other cases. */
+#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
+#define atomic_dec_return(v)   (atomic_sub_return(1, v))
+
+#define atomic_inc_return(v) (atomic_add_return(1, v))
+
+static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
+{
+	unsigned long tmp;
+	int oldval;
+
+	__smp_mb();
+
+	asm volatile("1:\n"
+		     "  lr.w %1, %2\n"
+		     "  bne %1, %3, 2f\n"
+		     "  sc.w %0, %4, %2\n"
+		     "  bnez %0, 1b\n"
+		     "2:"
+		     : "=&r"(tmp), "=&r"(oldval), "+A"(*ptr)
+		     : "r"(old), "r"(new)
+		     : "memory");
+
+	__smp_mb();
+	return oldval;
+}
+
+#endif /* __CR_ATOMIC_H__ */
diff --git a/test/zdtm/lib/test.c b/test/zdtm/lib/test.c
index a5ba38b2d..95017e42e 100644
--- a/test/zdtm/lib/test.c
+++ b/test/zdtm/lib/test.c
@@ -406,7 +406,7 @@ pid_t sys_clone_unified(unsigned long flags, void *child_stack, void *parent_tid
 {
 #ifdef __x86_64__
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, child_tid, newtls);
-#elif (__i386__ || __arm__ || __aarch64__ || __powerpc64__ || __mips__ || __loongarch64)
+#elif (__i386__ || __arm__ || __aarch64__ || __powerpc64__ || __mips__ || __loongarch64 || __riscv)
 	return (pid_t)syscall(__NR_clone, flags, child_stack, parent_tid, newtls, child_tid);
 #elif __s390x__
 	return (pid_t)syscall(__NR_clone, child_stack, flags, parent_tid, child_tid, newtls);
diff --git a/test/zdtm/static/fanotify00.c b/test/zdtm/static/fanotify00.c
index 69ead43e7..0400cc74b 100644
--- a/test/zdtm/static/fanotify00.c
+++ b/test/zdtm/static/fanotify00.c
@@ -22,7 +22,7 @@
 #elif defined(__PPC64__)
 #define __NR_fanotify_init 323
 #define __NR_fanotify_mark 324
-#elif __aarch64__
+#elif (__aarch64__ || __riscv)
 #define __NR_fanotify_init 262
 #define __NR_fanotify_mark 263
 #elif __s390x__
diff --git a/test/zdtm/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index e7e73b1ae..c99696d1c 100644
--- a/test/zdtm/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
@@ -1,6 +1,6 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
                 '/usr/bin/diff'],
     'flags': 'suid',
     'flavor': 'ns uns'}
diff --git a/test/zdtm/static/netns-nft-ipt.desc b/test/zdtm/static/netns-nft-ipt.desc
index 4120f74d6..6d04589b3 100644
--- a/test/zdtm/static/netns-nft-ipt.desc
+++ b/test/zdtm/static/netns-nft-ipt.desc
@@ -2,7 +2,7 @@
    'deps': [   '/bin/sh',
                '/usr/sbin/nft',
                '/sbin/iptables|/usr/sbin/iptables',
-               '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+               '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
                '/usr/bin/diff'],
     'flags': 'suid',
     'flavor': 'ns uns'}
diff --git a/test/zdtm/static/socket-tcp-closed-last-ack.desc b/test/zdtm/static/socket-tcp-closed-last-ack.desc
index d4cfe5064..309854fa5 100644
--- a/test/zdtm/static/socket-tcp-closed-last-ack.desc
+++ b/test/zdtm/static/socket-tcp-closed-last-ack.desc
@@ -1,7 +1,7 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
-                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_tcp.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',
diff --git a/test/zdtm/static/socket-tcp-reseted.desc b/test/zdtm/static/socket-tcp-reseted.desc
index 3ebdfeef8..4aa48ad87 100644
--- a/test/zdtm/static/socket-tcp-reseted.desc
+++ b/test/zdtm/static/socket-tcp-reseted.desc
@@ -1,8 +1,8 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
-                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
-		  '/lib/xtables/libipt_REJECT.so|/usr/lib64/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/aarch64-linux-gnu/xtables/libipt_REJECT.so',
+                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_tcp.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
+		  '/lib/xtables/libipt_REJECT.so|/usr/lib64/xtables/libipt_REJECT.so|/usr/lib/powerpc64le-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/x86_64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/xtables/libipt_REJECT.so|/usr/lib/s390x-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/aarch64-linux-gnu/xtables/libipt_REJECT.so|/usr/lib/riscv64-linux-gnu/xtables/libipt_REJECT.so',
        ],
        'opts': '--tcp-established',
        'flags': 'suid nouser samens',
diff --git a/test/zdtm/static/socket-tcp-syn-sent.desc b/test/zdtm/static/socket-tcp-syn-sent.desc
index 4cc23c8fc..71cd26d72 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.desc
+++ b/test/zdtm/static/socket-tcp-syn-sent.desc
@@ -1,7 +1,7 @@
 {   'deps': [   '/bin/sh',
                 '/sbin/iptables|/usr/sbin/iptables',
-                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so',
-                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so',
+                '/lib/xtables/libxt_tcp.so|/usr/lib64/xtables/libxt_tcp.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_tcp.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/xtables/libxt_tcp.so|/usr/lib/s390x-linux-gnu/xtables/libxt_tcp.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_tcp.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_tcp.so',
+                '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',

From da6b1807ef76fee6b744f0d3f8f50af26c492baa Mon Sep 17 00:00:00 2001
From: Haorong Lu <ancientmodern4@gmail.com>
Date: Tue, 1 Aug 2023 12:10:46 -0700
Subject: [PATCH 1587/1854] ci: add workflow for riscv64

Signed-off-by: Haorong Lu <ancientmodern4@gmail.com>
---
 .github/workflows/cross-compile-daily.yml     |  2 +-
 .github/workflows/cross-compile.yml           |  1 +
 .../build/Dockerfile.riscv64-stable-cross.hdr |  5 ++
 .../Dockerfile.riscv64-stable-cross.tmpl      | 57 +++++++++++++++++++
 scripts/build/Makefile                        |  2 +-
 scripts/ci/riscv64-cross/amd64-sources.list   | 10 ++++
 scripts/ci/riscv64-cross/riscv64-sources.list | 42 ++++++++++++++
 7 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 scripts/build/Dockerfile.riscv64-stable-cross.hdr
 create mode 100644 scripts/build/Dockerfile.riscv64-stable-cross.tmpl
 create mode 100644 scripts/ci/riscv64-cross/amd64-sources.list
 create mode 100644 scripts/ci/riscv64-cross/riscv64-sources.list

diff --git a/.github/workflows/cross-compile-daily.yml b/.github/workflows/cross-compile-daily.yml
index b8c8c86d4..c709cca00 100644
--- a/.github/workflows/cross-compile-daily.yml
+++ b/.github/workflows/cross-compile-daily.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [armv7-stable-cross, aarch64-stable-cross, ppc64-stable-cross, mips64el-stable-cross]
+        target: [armv7-stable-cross, aarch64-stable-cross, ppc64-stable-cross, mips64el-stable-cross, riscv64-stable-cross]
         branches: [criu-dev, master]
 
     steps:
diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml
index 06b812823..96672b294 100644
--- a/.github/workflows/cross-compile.yml
+++ b/.github/workflows/cross-compile.yml
@@ -21,6 +21,7 @@ jobs:
           aarch64-stable-cross,
           ppc64-stable-cross,
           mips64el-stable-cross,
+          riscv64-stable-cross,
         ]
         include:
           - experimental: true
diff --git a/scripts/build/Dockerfile.riscv64-stable-cross.hdr b/scripts/build/Dockerfile.riscv64-stable-cross.hdr
new file mode 100644
index 000000000..d4c414023
--- /dev/null
+++ b/scripts/build/Dockerfile.riscv64-stable-cross.hdr
@@ -0,0 +1,5 @@
+FROM ubuntu:jammy
+
+ENV ARCH=riscv64
+ENV DEBIAN_ARCH=riscv64
+ENV CROSS_TRIPLET=riscv64-linux-gnu
diff --git a/scripts/build/Dockerfile.riscv64-stable-cross.tmpl b/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
new file mode 100644
index 000000000..39a0c33c6
--- /dev/null
+++ b/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
@@ -0,0 +1,57 @@
+COPY scripts/ci/apt-install /bin/apt-install
+
+# Add the cross compiler sources
+RUN apt-get clean -y && apt-get update -y && apt-get install -y --no-install-recommends gnupg2
+
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 871920D1991BC93C 8D69674688B6CB36 B523E5F3FC4E5F2C
+
+COPY scripts/ci/riscv64-cross/amd64-sources.list /etc/apt/sources.list
+
+COPY scripts/ci/riscv64-cross/riscv64-sources.list /etc/apt/sources.list.d/
+
+RUN dpkg --add-architecture ${DEBIAN_ARCH} && \
+	apt-get update -y
+
+# Install required packages
+RUN apt-get install -y --no-install-recommends \
+	build-essential \
+	pkg-config \
+	git \
+	crossbuild-essential-${DEBIAN_ARCH}	\
+	libc6-dev-${DEBIAN_ARCH}-cross		\
+	libc6-${DEBIAN_ARCH}-cross		\
+	libbz2-dev:${DEBIAN_ARCH}		\
+	libexpat1-dev:${DEBIAN_ARCH}		\
+	ncurses-dev:${DEBIAN_ARCH}		\
+	libssl-dev:${DEBIAN_ARCH}		\
+	protobuf-c-compiler			\
+	protobuf-compiler			\
+	python3-protobuf			\
+	libnl-3-dev:${DEBIAN_ARCH}		\
+	libprotobuf-dev:${DEBIAN_ARCH}		\
+	libnet-dev:${DEBIAN_ARCH}		\
+	libprotobuf-c-dev:${DEBIAN_ARCH}	\
+	libcap-dev:${DEBIAN_ARCH}		\
+	libaio-dev:${DEBIAN_ARCH}		\
+	libnl-route-3-dev:${DEBIAN_ARCH}	\
+	libnftables-dev:${DEBIAN_ARCH}	\
+	libgnutls28-dev:${DEBIAN_ARCH}	\
+	iproute2:${DEBIAN_ARCH}
+
+ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
+	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
+	AS=/usr/bin/${CROSS_TRIPLET}-as				\
+	AR=/usr/bin/${CROSS_TRIPLET}-ar				\
+	CC=/usr/bin/${CROSS_TRIPLET}-gcc			\
+	CPP=/usr/bin/${CROSS_TRIPLET}-cpp			\
+	CXX=/usr/bin/${CROSS_TRIPLET}-g++			\
+	LD=/usr/bin/${CROSS_TRIPLET}-ld				\
+	FC=/usr/bin/${CROSS_TRIPLET}-gfortran
+
+ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
+	PKG_CONFIG_PATH=/usr/lib/${CROSS_TRIPLET}/pkgconfig
+
+COPY . /criu
+WORKDIR /criu
+
+RUN	make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index bc4a59db1..389315227 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,5 +1,5 @@
 ARCHES := x86_64 fedora-asan fedora-rawhide armv7hf centos8
-STABLE_CROSS_ARCHES := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross
+STABLE_CROSS_ARCHES := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross riscv64-stable-cross
 UNSTABLE_CROSS_ARCHES := armv7-unstable-cross aarch64-unstable-cross ppc64-unstable-cross mips64el-unstable-cross
 NON_CLANG := $(UNSTABLE_CROSS_ARCHES) $(STABLE_CROSS_ARCHES)
 CREATE_DOCKERFILES := $(ARCHES) $(NON_CLANG)
diff --git a/scripts/ci/riscv64-cross/amd64-sources.list b/scripts/ci/riscv64-cross/amd64-sources.list
new file mode 100644
index 000000000..72dad920c
--- /dev/null
+++ b/scripts/ci/riscv64-cross/amd64-sources.list
@@ -0,0 +1,10 @@
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy universe
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates universe
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy multiverse
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates multiverse
+deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse
+deb [arch=amd64] http://security.ubuntu.com/ubuntu/ jammy-security main restricted
+deb [arch=amd64] http://security.ubuntu.com/ubuntu/ jammy-security universe
+deb [arch=amd64] http://security.ubuntu.com/ubuntu/ jammy-security multiverse
\ No newline at end of file
diff --git a/scripts/ci/riscv64-cross/riscv64-sources.list b/scripts/ci/riscv64-cross/riscv64-sources.list
new file mode 100644
index 000000000..67b8067b6
--- /dev/null
+++ b/scripts/ci/riscv64-cross/riscv64-sources.list
@@ -0,0 +1,42 @@
+# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
+# newer versions of the distribution.
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy universe
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy universe
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates universe
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team, and may not be under a free licence. Please satisfy yourself as to
+## your rights to use the software. Also, please note that software in
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy multiverse
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse
+
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security universe
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security universe
+deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security multiverse
+# deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security multiverse
\ No newline at end of file

From 2be958d22ea4d78f5ba718688025ff0509a47ac2 Mon Sep 17 00:00:00 2001
From: Cryolitia PukNgae <cryolitia@gmail.com>
Date: Mon, 14 Oct 2024 01:35:44 +0800
Subject: [PATCH 1588/1854] include: don't use GCC's __builtin_ffs on riscv64

Link: https://github.com/SerenityOS/serenity/commit/e300da4db42e2484d98f4982d03150d83436304e

Signed-off-by: PukNgae Cryolitia <Cryolitia@gmail.com>
---
- cherry-picked
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 include/common/arch/riscv64/asm/bitops.h | 111 ++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 1 deletion(-)

diff --git a/include/common/arch/riscv64/asm/bitops.h b/include/common/arch/riscv64/asm/bitops.h
index 400cc3e15..eabab27c7 100644
--- a/include/common/arch/riscv64/asm/bitops.h
+++ b/include/common/arch/riscv64/asm/bitops.h
@@ -2,7 +2,116 @@
 #define __CR_ASM_BITOPS_H__
 
 #include "common/compiler.h"
-#include "common/asm-generic/bitops.h"
+#include "common/asm/bitsperlong.h"
+
+#define DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
+#define BITS_TO_LONGS(nr)  DIV_ROUND_UP(nr, BITS_PER_LONG)
+
+#define DECLARE_BITMAP(name, bits) unsigned long name[BITS_TO_LONGS(bits)]
+#define BITMAP_SIZE(name)	   (sizeof(name) * CHAR_BIT)
+
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)
+/* Technically wrong, but this avoids compilation errors on some gcc
+   versions. */
+#define BITOP_ADDR(x) "=m"(*(volatile long *)(x))
+#else
+#define BITOP_ADDR(x) "+m"(*(volatile long *)(x))
+#endif
+
+#define ADDR BITOP_ADDR(addr)
+
+static inline void set_bit(int nr, volatile unsigned long *addr)
+{
+	addr += nr / BITS_PER_LONG;
+	*addr |= (1UL << (nr % BITS_PER_LONG));
+}
+
+static inline void change_bit(int nr, volatile unsigned long *addr)
+{
+	addr += nr / BITS_PER_LONG;
+	*addr ^= (1UL << (nr % BITS_PER_LONG));
+}
+
+static inline int test_bit(int nr, volatile const unsigned long *addr)
+{
+	addr += nr / BITS_PER_LONG;
+	return (*addr & (1UL << (nr % BITS_PER_LONG))) ? -1 : 0;
+}
+
+static inline void clear_bit(int nr, volatile unsigned long *addr)
+{
+	addr += nr / BITS_PER_LONG;
+	*addr &= ~(1UL << (nr % BITS_PER_LONG));
+}
+
+/**
+ * __ffs - find first set bit in word
+ * @word: The word to search
+ *
+ * Undefined if no bit exists, so code should check against 0 first.
+ */
+static inline unsigned long __ffs(unsigned long word)
+{
+	int p = 0;
+
+	for (; p < 8*sizeof(word); ++p) {
+		if (word & 1) {
+			break;
+		}
+
+		word >>= 1;
+	}
+
+	return p;
+}
+
+#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
+
+/*
+ * Find the next set bit in a memory region.
+ */
+static inline unsigned long find_next_bit(const unsigned long *addr, unsigned long size, unsigned long offset)
+{
+	const unsigned long *p = addr + BITOP_WORD(offset);
+	unsigned long result = offset & ~(BITS_PER_LONG - 1);
+	unsigned long tmp;
+
+	if (offset >= size)
+		return size;
+	size -= result;
+	offset %= BITS_PER_LONG;
+	if (offset) {
+		tmp = *(p++);
+		tmp &= (~0UL << offset);
+		if (size < BITS_PER_LONG)
+			goto found_first;
+		if (tmp)
+			goto found_middle;
+		size -= BITS_PER_LONG;
+		result += BITS_PER_LONG;
+	}
+	while (size & ~(BITS_PER_LONG - 1)) {
+		if ((tmp = *(p++)))
+			goto found_middle;
+		result += BITS_PER_LONG;
+		size -= BITS_PER_LONG;
+	}
+	if (!size)
+		return result;
+	tmp = *p;
+
+found_first:
+	tmp &= (~0UL >> (BITS_PER_LONG - size));
+	if (tmp == 0UL)		      /* Are any bits set? */
+		return result + size; /* Nope. */
+found_middle:
+	return result + __ffs(tmp);
+}
+
+#define for_each_bit(i, bitmask)                                                            \
+	for (i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), 0); i < BITMAP_SIZE(bitmask); \
+	     i = find_next_bit(bitmask, BITMAP_SIZE(bitmask), i + 1))
+
 
 #define BITS_PER_LONG 64
 

From 9052ef93c79f92634eb163080292d79af496617a Mon Sep 17 00:00:00 2001
From: Liu Hua <weldonliu@tencent.com>
Date: Sat, 12 Oct 2024 15:29:40 +0800
Subject: [PATCH 1589/1854] uffd: Disable image deduplication after fork

After a fork, both the child and parent processes may trigger a page fault (#PF)
at the same virtual address, referencing the same position in the page image.
If deduplication is enabled, the last process to trigger the page fault will fail.

Therefore, deduplication should be disabled after a fork to prevent this issue.

Signed-off-by: Liu Hua <weldonliu@tencent.com>
---
 criu/include/pagemap.h |  5 +++++
 criu/pagemap.c         | 11 ++++++++++-
 criu/uffd.c            |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index 8c7180559..3ae15deb9 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -58,6 +58,9 @@ struct page_read {
 	/* Whether or not pages can be read in PIE code */
 	bool pieok;
 
+	/* Whether or not disable image deduplication*/
+	bool disable_dedup;
+
 	/* Private data of reader */
 	struct cr_img *pmi;
 	struct cr_img *pi;
@@ -112,6 +115,8 @@ int pagemap_render_iovec(struct list_head *from, struct task_restore_args *ta);
  */
 extern void dup_page_read(struct page_read *src, struct page_read *dst);
 
+extern void page_read_disable_dedup(struct page_read *pr);
+
 extern int dedup_one_iovec(struct page_read *pr, unsigned long base, unsigned long len);
 
 static inline unsigned long pagemap_len(PagemapEntry *pe)
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 83f69bba3..85bb92259 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -261,7 +261,7 @@ static int read_local_page(struct page_read *pr, unsigned long vaddr, unsigned l
 			break;
 	}
 
-	if (opts.auto_dedup) {
+	if (opts.auto_dedup && !pr->disable_dedup) {
 		ret = punch_hole(pr, pr->pi_off, len, false);
 		if (ret == -1)
 			return -1;
@@ -792,6 +792,7 @@ int open_page_read_at(int dfd, unsigned long img_id, struct page_read *pr, int p
 	pr->bunch.iov_base = NULL;
 	pr->pmes = NULL;
 	pr->pieok = false;
+	pr->disable_dedup = false;
 
 	pr->pmi = open_image_at(dfd, i_typ, O_RSTR, img_id);
 	if (!pr->pmi)
@@ -852,6 +853,14 @@ int open_page_read(unsigned long img_id, struct page_read *pr, int pr_flags)
 
 #define DUP_IDS_BASE 1000
 
+void page_read_disable_dedup(struct page_read *pr)
+{
+	pr_debug("disable dedup, id: %d\n", pr->id);
+	pr->disable_dedup = true;
+	if (pr->parent)
+		page_read_disable_dedup(pr->parent);
+}
+
 void dup_page_read(struct page_read *src, struct page_read *dst)
 {
 	static int dup_ids = 1;
diff --git a/criu/uffd.c b/criu/uffd.c
index e07b21b69..98c2b7e07 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -1098,6 +1098,8 @@ static int handle_fork(struct lazy_pages_info *parent_lpi, struct uffd_msg *msg)
 
 	lpi_get(lpi->parent);
 
+	page_read_disable_dedup(&parent_lpi->pr);
+	page_read_disable_dedup(&lpi->pr);
 	return 1;
 
 out:

From 622b43392fcb330343243a0f2842dd2919f977cc Mon Sep 17 00:00:00 2001
From: Lorenzo Fontana <fontanalorenz@gmail.com>
Date: Fri, 18 Oct 2024 18:51:18 +0200
Subject: [PATCH 1590/1854] criu: Initialize util before service worker starts

When restoring dumps in new mount + pid namespaces where multiple dumps
share the same network namespace, CRIU may fail due to conflicting
unix socket names. This happens because the service worker creates
sockets using a pattern that includes criu_run_id, but util_init()
is called after cr_service_work() starts.

The socket naming pattern "crtools-fd-%d-%d" uses the restore PID
and criu_run_id, however criu_run_id is always 0 when not initialized,
leading to conflicts when multiple restores run simultaneously either
in the same CRIU process or because of multiple CRIU processes
doing the same operation in different PID namespaces.

Fix this by:

- Moving util_init() before cr_service_work() starts
- Adding a second util_init() call in the service worker fork
to ensure unique IDs across multiple worker runs
- Making sure that dump and restore operations have util_init() called
early to generate unique socket names

With this fix, socket names always include the namespace ID, preventing
conflicts when multiple processes with the same pid share a network
namespace.

Fixes #2499

[ avagin: minore code changes ]

Signed-off-by: Lorenzo Fontana <fontanalorenz@gmail.com>
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/cr-service.c |  8 ++++++++
 criu/crtools.c    | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 61a04c5ff..b9d11ced2 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -1310,6 +1310,14 @@ int cr_service_work(int sk)
 	int ret = -1;
 	CriuReq *msg = 0;
 
+	/*
+	 * util_init initializes criu_run_id and compel_run_id so that sockets
+	 * are generated with an unique name identifying the specific process
+	 * even in cases where multiple processes with the same pid in
+	 * different pid namespaces are sharing the same network namespace.
+	 */
+	util_init();
+
 more:
 	opts.mode = CR_SWRK;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index 94657f418..6f493850b 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -169,7 +169,13 @@ int main(int argc, char *argv[], char *envp[])
 		pr_err("unknown command: %s\n", argv[optind]);
 		goto usage;
 	}
-
+	/*
+	 * util_init initializes criu_run_id and compel_run_id so that sockets
+	 * are generated with an unique name identifying the specific process
+	 * even in cases where multiple processes with the same pid in
+	 * different pid namespaces are sharing the same network namespace.
+	 */
+	util_init();
 	if (opts.mode == CR_SWRK) {
 		if (argc != optind + 2) {
 			fprintf(stderr, "Usage: criu swrk <fd>\n");
@@ -254,8 +260,6 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	util_init();
-
 	if (log_init(opts.output))
 		return 1;
 

From ff9dbef902361bfdda8e30e46c8f6b0df710de9f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 4 Nov 2024 19:30:26 +0000
Subject: [PATCH 1591/1854] seize: fix error handling for check_freezer_cgroup

When `check_freezer_cgroup()` has non-zero return value, `goto err` calls
`return ret`. However, the value of `ret` has been set to `0` in the lines
above and CRIU does not handle the error properly.

This problem is related to https://github.com/checkpoint-restore/criu/issues/2508

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/seize.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index edeb57cc8..ab394f9ca 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -1009,7 +1009,7 @@ static int cgroup_version(void)
 int collect_pstree(void)
 {
 	pid_t pid = root_item->pid->real;
-	int ret = -1;
+	int ret, exit_code = -1;
 	struct proc_status_creds creds;
 	struct pstree_item *iter;
 
@@ -1069,7 +1069,6 @@ int collect_pstree(void)
 
 	if (opts.freeze_cgroup && !freeze_cgroup_disabled &&
 	    freezer_wait_processes()) {
-		ret = -1;
 		goto err;
 	}
 
@@ -1081,12 +1080,12 @@ int collect_pstree(void)
 			goto err;
 	}
 
-	ret = 0;
+	exit_code = 0;
 	timing_stop(TIME_FREEZING);
 	timing_start(TIME_FROZEN);
 
 err:
 	/* Freezing stage finished in time - disable timer. */
 	alarm(0);
-	return ret;
+	return exit_code;
 }

From 4196268eef099833cd77c0fb93d367bcd8ce1463 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 4 Nov 2024 19:57:30 +0000
Subject: [PATCH 1592/1854] seize: enable support for frozen containers

Container runtimes like CRI-O and containerd utilize the freezer cgroup
to create a consistent snapshot of container root filesystem (rootfs)
changes. In this case, the container is frozen before invoking CRIU.
After CRIU successfully completes, a copy of the container rootfs diff
is saved, and the container is then unfrozen.

However, the `cuda-checkpoint` tool is not able to perform a 'lock'
action on frozen threads.  To support GPU checkpointing with these
container runtimes, we need to unfreeze the cgroup and return it to its
original state once the checkpointing is complete.

To reflect this new behavior, the following changes are applied:
 - `dont_use_freeze_cgroup(void)` -> `set_compel_interrupt_only_mode(void)`
 - `bool freeze_cgroup_disabled` -> `bool compel_interrupt_only_mode`
 - `check_freezer_cgroup(void)` -> `prepare_freezer_for_interrupt_only_mode(void)`

Note that when `compel_interrupt_only_mode` is set to `true`,
`compel_interrupt_task()` is used instead of `freeze_processes()`
to prevent tasks from running during `criu dump`.

Fixes: #2508

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/fault-injection.c         |  4 +--
 criu/include/fault-injection.h |  2 +-
 criu/include/seize.h           |  2 +-
 criu/seize.c                   | 46 +++++++++++++++++++---------------
 plugins/cuda/cuda_plugin.c     |  2 +-
 test/jenkins/criu-fault.sh     |  2 +-
 6 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/criu/fault-injection.c b/criu/fault-injection.c
index 2272e6d84..5dd9acf60 100644
--- a/criu/fault-injection.c
+++ b/criu/fault-injection.c
@@ -24,8 +24,8 @@ int fault_injection_init(void)
 	fi_strategy = start;
 
 	switch (fi_strategy) {
-	case FI_DISABLE_FREEZE_CGROUP:
-		dont_use_freeze_cgroup();
+	case FI_COMPEL_INTERRUPT_ONLY_MODE:
+		set_compel_interrupt_only_mode();
 		break;
 	default:
 		break;
diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
index 59adf05b9..e987c18ce 100644
--- a/criu/include/fault-injection.h
+++ b/criu/include/fault-injection.h
@@ -21,7 +21,7 @@ enum faults {
 	FI_CORRUPT_EXTREGS = 134,
 	FI_DONT_USE_PAGEMAP_SCAN = 135,
 	FI_DUMP_CRASH = 136,
-	FI_DISABLE_FREEZE_CGROUP = 137,
+	FI_COMPEL_INTERRUPT_ONLY_MODE = 137,
 	FI_PLUGIN_CUDA_FORCE_ENABLE = 138,
 	FI_MAX,
 };
diff --git a/criu/include/seize.h b/criu/include/seize.h
index f5ea76b16..64e8d2d12 100644
--- a/criu/include/seize.h
+++ b/criu/include/seize.h
@@ -9,6 +9,6 @@ extern bool alarm_timeouted(void);
 
 extern char *task_comm_info(pid_t pid, char *comm, size_t size);
 extern char *__task_comm_info(pid_t pid);
-extern void dont_use_freeze_cgroup(void);
+extern void set_compel_interrupt_only_mode(void);
 
 #endif
diff --git a/criu/seize.c b/criu/seize.c
index ab394f9ca..9bd1832d9 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -25,17 +25,17 @@
 #include "xmalloc.h"
 #include "util.h"
 
-static bool freeze_cgroup_disabled;
+static bool compel_interrupt_only_mode;
 
 /*
  * Disables the use of freeze cgroups for process seizing, even if explicitly
- * requested via the --freeze-cgroup option. This is necessary for plugins
- * (e.g., CUDA) that do not function correctly when processes are frozen using
- * cgroups.
+ * requested via the --freeze-cgroup option or already set in a frozen state.
+ * This is necessary for plugins (e.g., CUDA) that do not function correctly
+ * when processes are frozen using cgroups.
  */
-void __attribute__((used)) dont_use_freeze_cgroup(void)
+void __attribute__((used)) set_compel_interrupt_only_mode(void)
 {
-	freeze_cgroup_disabled = true;
+	compel_interrupt_only_mode = true;
 }
 
 char *task_comm_info(pid_t pid, char *comm, size_t size)
@@ -410,7 +410,7 @@ static int freezer_detach(void)
 {
 	int i;
 
-	if (!opts.freeze_cgroup || freeze_cgroup_disabled)
+	if (!opts.freeze_cgroup || compel_interrupt_only_mode)
 		return 0;
 
 	for (i = 0; i < processes_to_wait && processes_to_wait_pids; i++) {
@@ -505,29 +505,35 @@ static int log_unfrozen_stacks(char *root)
 	return 0;
 }
 
-static int check_freezer_cgroup(void)
+static int prepare_freezer_for_interrupt_only_mode(void)
 {
 	enum freezer_state state = THAWED;
 	int fd;
+	int exit_code = -1;
 
-	BUG_ON(!freeze_cgroup_disabled);
+	BUG_ON(!compel_interrupt_only_mode);
 
 	fd = freezer_open();
 	if (fd < 0)
 		return -1;
 
 	state = get_freezer_state(fd);
-	close(fd);
 	if (state == FREEZER_ERROR) {
-		return -1;
+		goto err;
 	}
 
+	origin_freezer_state = state == FREEZING ? FROZEN : state;
+
 	if (state != THAWED) {
-		pr_err("One or more plugins are incompatible with the freezer cgroup in the FROZEN state.\n");
-		return -1;
+		pr_warn("unfreezing cgroup for plugin compatibility\n");
+		if (freezer_write_state(fd, THAWED))
+			goto err;
 	}
 
-	return 0;
+	exit_code = 0;
+err:
+	close(fd);
+	return exit_code;
 }
 
 static int freeze_processes(void)
@@ -681,7 +687,7 @@ static int collect_children(struct pstree_item *item)
 			goto free;
 		}
 
-		if (!opts.freeze_cgroup || freeze_cgroup_disabled)
+		if (!opts.freeze_cgroup || compel_interrupt_only_mode)
 			/* fails when meets a zombie */
 			__ignore_value(compel_interrupt_task(pid));
 
@@ -869,7 +875,7 @@ static int collect_threads(struct pstree_item *item)
 
 		pr_info("\tSeizing %d's %d thread\n", item->pid->real, pid);
 
-		if ((!opts.freeze_cgroup || freeze_cgroup_disabled) &&
+		if ((!opts.freeze_cgroup || compel_interrupt_only_mode) &&
 		    compel_interrupt_task(pid))
 			continue;
 
@@ -926,7 +932,7 @@ static int collect_loop(struct pstree_item *item, int (*collect)(struct pstree_i
 {
 	int attempts = NR_ATTEMPTS, nr_inprogress = 1;
 
-	if (opts.freeze_cgroup && !freeze_cgroup_disabled)
+	if (opts.freeze_cgroup && !compel_interrupt_only_mode)
 		attempts = 1;
 
 	/*
@@ -1032,11 +1038,11 @@ int collect_pstree(void)
 
 	pr_debug("Detected cgroup V%d freezer\n", cgroup_v2 ? 2 : 1);
 
-	if (opts.freeze_cgroup && !freeze_cgroup_disabled) {
+	if (opts.freeze_cgroup && !compel_interrupt_only_mode) {
 		if (freeze_processes())
 			goto err;
 	} else {
-		if (opts.freeze_cgroup && check_freezer_cgroup())
+		if (opts.freeze_cgroup && prepare_freezer_for_interrupt_only_mode())
 			goto err;
 		if (compel_interrupt_task(pid)) {
 			set_cr_errno(ESRCH);
@@ -1067,7 +1073,7 @@ int collect_pstree(void)
 	if (ret < 0)
 		goto err;
 
-	if (opts.freeze_cgroup && !freeze_cgroup_disabled &&
+	if (opts.freeze_cgroup && !compel_interrupt_only_mode &&
 	    freezer_wait_processes()) {
 		goto err;
 	}
diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index c4fc67fa9..3d624750e 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -509,7 +509,7 @@ int cuda_plugin_init(int stage)
 		INIT_LIST_HEAD(&cuda_pids);
 	}
 
-	dont_use_freeze_cgroup();
+	set_compel_interrupt_only_mode();
 
 	return 0;
 }
diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index fc0eddc2b..8cb71d8ca 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -40,7 +40,7 @@ fi
 # also check for the main thread corruption
 ./test/zdtm.py run -t zdtm/static/fpu00 --fault 134 -f h --norst || fail
 
-# check dont_use_freeze_cgroup
+# check set_compel_interrupt_only_mode
 ./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:t --fault 137
 ./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:t --fault 137 --norst
 

From 36a53fe23c4092ee1ad68144e4e216ab8979b3ab Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 8 Nov 2024 13:41:20 +0000
Subject: [PATCH 1593/1854] ci: test interrupt-only mode with frozen cgroup

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/jenkins/criu-fault.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/jenkins/criu-fault.sh b/test/jenkins/criu-fault.sh
index 8cb71d8ca..6ee7ce33a 100755
--- a/test/jenkins/criu-fault.sh
+++ b/test/jenkins/criu-fault.sh
@@ -43,6 +43,8 @@ fi
 # check set_compel_interrupt_only_mode
 ./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:t --fault 137
 ./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:t --fault 137 --norst
+# check set_compel_interrupt_only_mode when test cgroup is frozen
+./test/zdtm.py run -t zdtm/static/env00 --freezecg zdtm:f --fault 137
 
 if ./test/zdtm.py run -t zdtm/static/vfork00 --fault 136 --report report -f h ; then
 	fail

From b1cac7a8e580bb023d84d07a9c6f738f9eaf602d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 2 Nov 2024 08:29:43 +0000
Subject: [PATCH 1594/1854] cuda: fix check for GPU device availability

The check for `/dev/nvidiactl` to determine if the CUDA plugin can be
used is unreliable because in some cases the default path for driver
installation is different [1]. This patch changes the logic to check
if a GPU device is available in `/proc/driver/nvidia/gpus/`. This
approach is similar to `torch.cuda.is_available()` and it is a more
accurate indicator.

The subsequent check for support of the `cuda-checkpoint --action`
option would confirm if the driver supports checkpoint/restore.

[1] https://github.com/NVIDIA/gpu-operator

Fixes: #2509

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 3d624750e..718db3025 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -470,6 +470,20 @@ int cuda_plugin_resume_devices_late(int pid)
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, cuda_plugin_resume_devices_late)
 
+/**
+ * Check if a CUDA device is available on the system
+ */
+static bool is_cuda_device_available(void)
+{
+	const char *gpu_path = "/proc/driver/nvidia/gpus/";
+	struct stat sb;
+
+	if (stat(gpu_path, &sb) != 0)
+		return false;
+
+	return S_ISDIR(sb.st_mode);
+}
+
 int cuda_plugin_init(int stage)
 {
 	int ret;
@@ -481,8 +495,8 @@ int cuda_plugin_init(int stage)
 		}
 	}
 
-	if (!fault_injected(FI_PLUGIN_CUDA_FORCE_ENABLE) && access("/dev/nvidiactl", F_OK)) {
-		pr_info("/dev/nvidiactl doesn't exist. The CUDA plugin is disabled.\n");
+	if (!fault_injected(FI_PLUGIN_CUDA_FORCE_ENABLE) && !is_cuda_device_available()) {
+		pr_info("No GPU device found; CUDA plugin is disabled\n");
 		plugin_disabled = true;
 		return 0;
 	}

From 7125bfc69579a93e2df9720a615b7ad29d79120b Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 6 Nov 2024 22:08:24 +0530
Subject: [PATCH 1595/1854] pidfd: one process creates a helper and opens all
 fds to it

Currently, the `waitpid()` call on the tmp process can be made by a
process which is not its parent. This causes restore to fail.

This patch instead selects one process to create the tmp process and
open all the fds that point to it. These fds are sent to the correct
process(es).

Fixes: #2496

Signed-off-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 criu/files.c         |   7 +--
 criu/include/pidfd.h |   2 +-
 criu/pidfd.c         | 128 +++++++++++++++++++++----------------------
 3 files changed, 64 insertions(+), 73 deletions(-)

diff --git a/criu/files.c b/criu/files.c
index a57fb860f..31e705bcc 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1811,11 +1811,6 @@ int prepare_files(void)
 {
 	init_fdesc_hash();
 	init_sk_info_hash();
-
-	if (init_dead_pidfd_hash()) {
-		pr_err("Could not initialise hash map for dead pidfds\n");
-		return -1;
-	}
-
+	init_dead_pidfd_hash();
 	return collect_image(&files_cinfo);
 }
diff --git a/criu/include/pidfd.h b/criu/include/pidfd.h
index 4d2d71700..bcc0fb45a 100644
--- a/criu/include/pidfd.h
+++ b/criu/include/pidfd.h
@@ -7,7 +7,7 @@
 extern const struct fdtype_ops pidfd_dump_ops;
 extern struct collect_image_info pidfd_cinfo;
 extern int is_pidfd_link(char *link);
-extern int init_dead_pidfd_hash(void);
+extern void init_dead_pidfd_hash(void);
 struct pidfd_dump_info {
 	PidfdEntry pidfe;
 	pid_t pid;
diff --git a/criu/pidfd.c b/criu/pidfd.c
index 3ea3c9309..53b9bcf71 100644
--- a/criu/pidfd.c
+++ b/criu/pidfd.c
@@ -21,32 +21,26 @@
 struct pidfd_info {
 	PidfdEntry *pidfe;
 	struct file_desc d;
+
+	struct dead_pidfd *dead;
+	struct pidfd_info *next;
 };
 
 struct dead_pidfd {
 	unsigned int ino;
-	int pid;
-	size_t count;
-	mutex_t pidfd_lock;
+	int creator_id;
+
 	struct hlist_node hash;
+	struct pidfd_info *list;
 };
 
 #define DEAD_PIDFD_HASH_SIZE 32
 static struct hlist_head dead_pidfd_hash[DEAD_PIDFD_HASH_SIZE];
-static mutex_t *dead_pidfd_hash_lock;
 
-int init_dead_pidfd_hash(void)
+void init_dead_pidfd_hash(void)
 {
 	for (int i = 0; i < DEAD_PIDFD_HASH_SIZE; i++)
 		INIT_HLIST_HEAD(&dead_pidfd_hash[i]);
-
-	dead_pidfd_hash_lock = shmalloc(sizeof(*dead_pidfd_hash_lock));
-	if (!dead_pidfd_hash_lock)
-		return -1;
-
-	mutex_init(dead_pidfd_hash_lock);
-
-	return 0;
 }
 
 static struct dead_pidfd *lookup_dead_pidfd(unsigned int ino)
@@ -54,15 +48,12 @@ static struct dead_pidfd *lookup_dead_pidfd(unsigned int ino)
 	struct dead_pidfd *dead;
 	struct hlist_head *chain;
 
-	mutex_lock(dead_pidfd_hash_lock);
 	chain = &dead_pidfd_hash[ino % DEAD_PIDFD_HASH_SIZE];
 	hlist_for_each_entry(dead, chain, hash) {
 		if (dead->ino == ino) {
-			mutex_unlock(dead_pidfd_hash_lock);
 			return dead;
 		}
 	}
-	mutex_unlock(dead_pidfd_hash_lock);
 
 	return NULL;
 }
@@ -142,7 +133,7 @@ static int create_tmp_process(void)
 	return tmp_process;
 }
 
-static int free_dead_pidfd(struct dead_pidfd *dead)
+static int kill_helper(pid_t pid)
 {
 	int status;
 	sigset_t blockmask, oldmask;
@@ -160,15 +151,13 @@ static int free_dead_pidfd(struct dead_pidfd *dead)
 		goto err;
 	}
 
-	if (kill(dead->pid, SIGKILL) < 0) {
-		pr_perror("Could not kill temporary process with pid: %d",
-		dead->pid);
+	if (kill(pid, SIGKILL) < 0) {
+		pr_perror("Could not kill temporary process with pid: %d", pid);
 		goto err;
 	}
 
-	if (waitpid(dead->pid, &status, 0) != dead->pid) {
-		pr_perror("Could not wait on temporary process with pid: %d",
-		dead->pid);
+	if (waitpid(pid, &status, 0) != pid) {
+		pr_perror("Could not wait on temporary process with pid: %d", pid);
 		goto err;
 	}
 
@@ -188,9 +177,6 @@ static int free_dead_pidfd(struct dead_pidfd *dead)
 		goto err;
 	}
 
-	mutex_lock(dead_pidfd_hash_lock);
-	hlist_del(&dead->hash);
-	mutex_unlock(dead_pidfd_hash_lock);
 	return 0;
 err:
 	return -1;
@@ -198,8 +184,9 @@ err:
 
 static int open_one_pidfd(struct file_desc *d, int *new_fd)
 {
-	struct pidfd_info *info;
+	struct pidfd_info *info, *child;
 	struct dead_pidfd *dead = NULL;
+	pid_t pid;
 	int pidfd;
 
 	info = container_of(d, struct pidfd_info, d);
@@ -215,34 +202,44 @@ static int open_one_pidfd(struct file_desc *d, int *new_fd)
 	dead = lookup_dead_pidfd(info->pidfe->ino);
 	BUG_ON(!dead);
 
-	mutex_lock(&dead->pidfd_lock);
-	BUG_ON(dead->count == 0);
-	dead->count--;
-	if (dead->pid == -1) {
-		dead->pid = create_tmp_process();
-		if (dead->pid < 0) {
-			mutex_unlock(&dead->pidfd_lock);
-			goto err_close;
+	if (info->dead && info->dead->creator_id != info->pidfe->id) {
+		int ret = recv_desc_from_peer(&info->d, &pidfd);
+		if (ret != 0) {
+			if (ret != 1)
+				pr_err("Can't get fd\n");
+			return ret;
 		}
+		goto out;
 	}
 
-	pidfd = pidfd_open(dead->pid, info->pidfe->flags);
+	pid = create_tmp_process();
+	if (pid < 0)
+		goto err_close;
+
+	for (child = dead->list; child; child = child->next) {
+		if (child == info)
+			continue;
+		pidfd = pidfd_open(pid, child->pidfe->flags);
+		if (pidfd < 0) {
+			pr_perror("Could not open pidfd for %d", child->pidfe->nspid);
+			goto err_close;
+		}
+
+		if (send_desc_to_peer(pidfd, &child->d)) {
+			pr_perror("Can't send file descriptor");
+			close(pidfd);
+			return -1;
+		}
+		close(pidfd);
+	}
+
+	pidfd = pidfd_open(pid, info->pidfe->flags);
 	if (pidfd < 0) {
 		pr_perror("Could not open pidfd for %d", info->pidfe->nspid);
-		mutex_unlock(&dead->pidfd_lock);
 		goto err_close;
 	}
-
-	if (dead->count == 0) {
-		if (free_dead_pidfd(dead)) {
-			pr_err("Failed to delete dead_pidfd struct\n");
-			mutex_unlock(&dead->pidfd_lock);
-			close(pidfd);
-			goto err_close;
-		}
-	}
-	mutex_unlock(&dead->pidfd_lock);
-
+	if (kill_helper(pid))
+		goto err_close;
 out:
 	if (rst_file_params(pidfd, info->pidfe->fown, info->pidfe->flags)) {
 		goto err_close;
@@ -269,32 +266,31 @@ static int collect_one_pidfd(void *obj, ProtobufCMessage *msg, struct cr_img *i)
 	info->pidfe = pb_msg(msg, PidfdEntry);
 	pr_info_pidfd("Collected ", info->pidfe);
 
+	info->dead = NULL;
 	if (info->pidfe->nspid != -1)
 		goto out;
 
 	dead = lookup_dead_pidfd(info->pidfe->ino);
-	if (dead) {
-		mutex_lock(&dead->pidfd_lock);
-		dead->count++;
-		mutex_unlock(&dead->pidfd_lock);
-		goto out;
-	}
-
-	dead = shmalloc(sizeof(*dead));
 	if (!dead) {
-		pr_err("Could not allocate shared memory..\n");
-		return -1;
+		dead = xmalloc(sizeof(*dead));
+		if (!dead) {
+			pr_err("Could not allocate memory..\n");
+			return -1;
+		}
+
+		INIT_HLIST_NODE(&dead->hash);
+		dead->list = NULL;
+		dead->ino = info->pidfe->ino;
+		dead->creator_id = info->pidfe->id;
+		hlist_add_head(&dead->hash, &dead_pidfd_hash[dead->ino % DEAD_PIDFD_HASH_SIZE]);
 	}
 
-	INIT_HLIST_NODE(&dead->hash);
-	dead->ino = info->pidfe->ino;
-	dead->count = 1;
-	dead->pid = -1;
-	mutex_init(&dead->pidfd_lock);
+	info->dead = dead;
+	info->next = dead->list;
+	dead->list = info;
+	if (dead->creator_id > info->pidfe->id)
+		dead->creator_id = info->pidfe->id;
 
-	mutex_lock(dead_pidfd_hash_lock);
-	hlist_add_head(&dead->hash, &dead_pidfd_hash[dead->ino % DEAD_PIDFD_HASH_SIZE]);
-	mutex_unlock(dead_pidfd_hash_lock);
 out:
 	return file_desc_add(&info->d, info->pidfe->id, &pidfd_desc_ops);
 }

From 498bcf28067624b1fca1b939000f8314574a5e80 Mon Sep 17 00:00:00 2001
From: Bhavik Sachdev <b.sachdev1904@gmail.com>
Date: Wed, 6 Nov 2024 22:10:08 +0530
Subject: [PATCH 1596/1854] zdtm: Check many processes with common dead pidfd

We have multiple processes open a pidfd to a common dead process.
After C/R we check that the inode numbers for these pidfds are equal or
not.

Signed-off-by: Bhavik Sachdev <b.sachdev1904@gmail.com>
---
 test/zdtm/static/Makefile         |   1 +
 test/zdtm/static/pidfd_diffdead.c | 228 ++++++++++++++++++++++++++++++
 2 files changed, 229 insertions(+)
 create mode 100644 test/zdtm/static/pidfd_diffdead.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 44ac64fe5..71a1b6a53 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -56,6 +56,7 @@ TST_NOFILE	:=				\
 		pidfd_self			\
 		pidfd_of_thread			\
 		pidfd_dead			\
+		pidfd_diffdead			\
 		pidfd_child			\
 		pidfd_kill			\
 		fd_from_pidfd			\
diff --git a/test/zdtm/static/pidfd_diffdead.c b/test/zdtm/static/pidfd_diffdead.c
new file mode 100644
index 000000000..5bc1911a5
--- /dev/null
+++ b/test/zdtm/static/pidfd_diffdead.c
@@ -0,0 +1,228 @@
+#include <sys/statfs.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check C/R of processes that point to a common dead pidfd\n";
+const char *test_author = "Bhavik Sachdev <b.sachdev1904@gmail.com>";
+
+#ifndef PID_FS_MAGIC
+#define PID_FS_MAGIC 0x50494446
+#endif
+
+/*
+ * main
+ *	`- child
+ *		`- grandchild
+ *
+ * main and child open a pidfd for grandchild.
+ * Before C/R we kill grandchild.
+ * We end up with two pidfds in two diff processes that point to the same dead process.
+ */
+
+static long get_fs_type(int lfd)
+{
+	struct statfs fst;
+
+	if (fstatfs(lfd, &fst)) {
+		return -1;
+	}
+	return fst.f_type;
+}
+
+static int pidfd_open(pid_t pid, unsigned int flags)
+{
+	return syscall(__NR_pidfd_open, pid, flags);
+}
+
+static int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, unsigned int flags)
+{
+	return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags);
+}
+
+static int check_for_pidfs(void)
+{
+	long type;
+	int pidfd = pidfd_open(getpid(), 0);
+	if (pidfd < 0) {
+		pr_perror("pidfd open() failed");
+		return -1;
+	}
+	type = get_fs_type(pidfd);
+	close(pidfd);
+	return type == PID_FS_MAGIC;
+}
+
+int main(int argc, char *argv[])
+{
+#define READ  0
+#define WRITE 1
+
+	int child, ret, gchild, status;
+	struct statx stat;
+	task_waiter_t t;
+	unsigned long long ino;
+
+	/*
+	 * We use the inop pipe to send the inode number of the
+	 * pidfd opened in the child to the main process for
+	 * comparison.
+	 */
+	int p[2];
+	int pidfd;
+
+	test_init(argc, argv);
+	task_waiter_init(&t);
+
+	ret = check_for_pidfs();
+	if (ret < 0)
+		return 1;
+
+	if (ret == 0) {
+		test_daemon();
+		test_waitsig();
+		skip("Test requires pidfs. skipping...");
+		pass();
+		return 0;
+	}
+
+	if (pipe(p)) {
+		pr_perror("pipe");
+		return 1;
+	}
+
+	child = test_fork();
+	if (child < 0) {
+		pr_perror("fork");
+		return 1;
+	} else if (child == 0) {
+		int gchild;
+		gchild = test_fork();
+		if (gchild < 0) {
+			pr_perror("fork");
+			return 1;
+		} else if (gchild == 0) {
+			close(p[READ]);
+			close(p[WRITE]);
+			while (1)
+				sleep(1000);
+		} else {
+			if (write(p[WRITE], &gchild, sizeof(int)) != sizeof(int)) {
+				pr_perror("write");
+				return 1;
+			}
+
+			pidfd = pidfd_open(gchild, 0);
+			if (pidfd < 0) {
+				pr_perror("pidfd_open");
+				return 1;
+			}
+
+			if (waitpid(gchild, &status, 0) != gchild) {
+				pr_perror("waitpid");
+				return 1;
+			}
+
+			if (!WIFSIGNALED(status)) {
+				fail("Expected grandchild to be terminated by a signal");
+				return 1;
+			}
+
+			if (WTERMSIG(status) != SIGKILL) {
+				fail("Expected grandchild to be terminated by SIGKILL");
+				return 1;
+			}
+			task_waiter_complete(&t, 1);
+
+			test_waitsig();
+
+			if (statx(pidfd, "", AT_EMPTY_PATH, STATX_ALL, &stat) < 0) {
+				pr_perror("statx");
+				return 1;
+			}
+
+			close(p[WRITE]);
+			if (read(p[READ], &ino, sizeof(ino)) != sizeof(ino)) {
+				pr_perror("read");
+				return 1;
+			}
+			close(p[READ]);
+			close(pidfd);
+
+			/* ino number should be same because both pidfds were for the same process */
+			if (ino != stat.stx_ino) {
+				exit(1);
+			}
+			exit(0);
+		}
+	}
+
+	if (read(p[READ], &gchild, sizeof(int)) != sizeof(int)) {
+		pr_perror("write");
+		return 1;
+	}
+
+	pidfd = pidfd_open(gchild, 0);
+	if (pidfd < 0) {
+		pr_perror("pidfd_open");
+		return 1;
+	}
+
+	/*
+	* We kill grandchild process only after opening pidfd.
+	*/
+	if (pidfd_send_signal(pidfd, SIGKILL, NULL, 0)) {
+		pr_perror("pidfd_send_signal");
+		return 1;
+	}
+
+	/* Wait for child to waitpid on gchild */
+	task_waiter_wait4(&t, 1);
+
+	test_daemon();
+	test_waitsig();
+
+	close(p[READ]);
+	if (statx(pidfd, "", AT_EMPTY_PATH, STATX_ALL, &stat) < 0) {
+		pr_perror("statx");
+		goto err;
+	}
+
+	/* Send inode number of pidfd to child for comparison */
+	if (write(p[WRITE], &stat.stx_ino, sizeof(stat.stx_ino)) != sizeof(stat.stx_ino)) {
+		pr_perror("write");
+		goto err;
+	}
+	close(p[WRITE]);
+
+	if (kill(child, SIGTERM)) {
+		pr_perror("kill");
+		goto err;
+	}
+
+	if (waitpid(child, &status, 0) != child) {
+		pr_perror("waitpid");
+		goto err;
+	}
+
+	if (!WIFEXITED(status)) {
+		fail("Expected child to terminate normally");
+		goto err;
+	}
+
+	if (WEXITSTATUS(status) != 0) {
+		fail("Child failed");
+		goto err;
+	}
+
+	pass();
+	close(pidfd);
+	return 0;
+err:
+	close(pidfd);
+	return 1;
+}

From 28c2cb3fd6121f3280484665915d1ef5d8b9df14 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 12 Nov 2024 13:04:31 +0000
Subject: [PATCH 1597/1854] cuda: enable checkpoint support for paused tasks

If a CUDA process is already in a "locked" or "checkpointed" state
during criu dump, the CUDA plugin currently fails with an error because
it attempts an unnecessary "lock" action using the cuda-checkpoint tool.

This patch extends the CUDA plugin to handle such cases by first
verifying the initial state of the CUDA processes and skipping
unnecessary "lock" and "checkpoint" actions when a process has been
locked or checkpointed before CRIU is invoked.

In particular, CUDA tasks may already be in a "locked" or "checkpointed"
state to ensure consistent checkpoint/restore for distributed workloads,
such as model training, where multiple containers run across different
cluster nodes.

Another use case for this functionality is optimizing resource
utilization, where CUDA tasks with low-priority are preempted
immediately to release GPU resources needed by high-priority
tasks, and the paused workloads are later resumed or migrated
to another node.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 155 +++++++++++++++++++++++++++----------
 1 file changed, 116 insertions(+), 39 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 718db3025..7764cf3c7 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -26,6 +26,13 @@
 #define ACTION_RESTORE	  "restore"
 #define ACTION_UNLOCK	  "unlock"
 
+typedef enum {
+	CUDA_TASK_RUNNING = 0,
+	CUDA_TASK_LOCKED,
+	CUDA_TASK_CHECKPOINTED,
+	CUDA_TASK_UNKNOWN = -1
+} cuda_task_state_t;
+
 #define CUDA_CKPT_BUF_SIZE (128)
 
 #ifdef LOG_PREFIX
@@ -43,6 +50,7 @@ bool plugin_added_to_inventory = false;
 struct pid_info {
 	int pid;
 	char checkpointed;
+	cuda_task_state_t initial_task_state;
 	struct list_head list;
 };
 
@@ -62,7 +70,7 @@ static void dealloc_pid_buffer(struct list_head *pid_buf)
 	}
 }
 
-static int add_pid_to_buf(struct list_head *pid_buf, int pid)
+static int add_pid_to_buf(struct list_head *pid_buf, int pid, cuda_task_state_t state)
 {
 	struct pid_info *new = xmalloc(sizeof(*new));
 
@@ -72,25 +80,12 @@ static int add_pid_to_buf(struct list_head *pid_buf, int pid)
 
 	new->pid = pid;
 	new->checkpointed = 0;
+	new->initial_task_state = state;
 	list_add_tail(&new->list, pid_buf);
 
 	return 0;
 }
 
-static int update_checkpointed_pid(struct list_head *pid_buf, int pid)
-{
-	struct pid_info *info;
-
-	list_for_each_entry(info, pid_buf, list) {
-		if (info->pid == pid) {
-			info->checkpointed = 1;
-			return 0;
-		}
-	}
-
-	return -1;
-}
-
 static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 {
 #define READ  0
@@ -231,6 +226,37 @@ static int get_cuda_restore_tid(int root_pid)
 	return atoi(pid_out);
 }
 
+static cuda_task_state_t get_task_state_enum(const char *state_str)
+{
+	if (strncmp(state_str, "running", 7) == 0)
+		return CUDA_TASK_RUNNING;
+
+	if (strncmp(state_str, "locked", 6) == 0)
+		return CUDA_TASK_LOCKED;
+
+	if (strncmp(state_str, "checkpointed", 12) == 0)
+		return CUDA_TASK_CHECKPOINTED;
+
+	pr_err("Unknown CUDA state: %s\n", state_str);
+	return CUDA_TASK_UNKNOWN;
+}
+
+static cuda_task_state_t get_cuda_state(pid_t pid)
+{
+	char pid_buf[16];
+	char state_str[CUDA_CKPT_BUF_SIZE];
+	const char *args[] = { CUDA_CHECKPOINT, "--get-state", "--pid", pid_buf, NULL };
+
+	snprintf(pid_buf, sizeof(pid_buf), "%d", pid);
+
+	if (launch_cuda_checkpoint(args, state_str, sizeof(state_str))) {
+		pr_err("Failed to launch cuda-checkpoint to retrieve state: %s\n", state_str);
+		return CUDA_TASK_UNKNOWN;
+	}
+
+	return get_task_state_enum(state_str);
+}
+
 static int cuda_process_checkpoint_action(int pid, const char *action, unsigned int timeout, char *msg_buf,
 					  int buf_size)
 {
@@ -319,6 +345,8 @@ int cuda_plugin_checkpoint_devices(int pid)
 	int int_ret;
 	int status;
 	k_rtsigset_t save_sigset;
+	struct pid_info *task_info;
+	bool pid_found = false;
 
 	if (plugin_disabled) {
 		return -ENOTSUP;
@@ -336,6 +364,26 @@ int cuda_plugin_checkpoint_devices(int pid)
 		return 0;
 	}
 
+	/* Check if the process is already in a checkpointed state */
+	list_for_each_entry(task_info, &cuda_pids, list) {
+		if (task_info->pid == pid) {
+			if (task_info->initial_task_state == CUDA_TASK_CHECKPOINTED) {
+				pr_info("pid %d already in a checkpointed state\n", pid);
+				return 0;
+			}
+			pid_found = true;
+			break;
+		}
+	}
+
+	if (pid_found == false) {
+		/* We return an error here. The task should be restored
+		 * to its original state at cuda_plugin_fini().
+		 */
+		pr_err("Failed to track pid %d\n", pid);
+		return -1;
+	}
+
 	pr_info("Checkpointing CUDA devices on pid %d restore_tid %d\n", pid, restore_tid);
 	/* We need to resume the checkpoint thread to prepare the mappings for
 	 * checkpointing
@@ -348,22 +396,8 @@ int cuda_plugin_checkpoint_devices(int pid)
 		pr_err("CHECKPOINT_DEVICES failed with %s\n", msg_buf);
 		goto interrupt;
 	}
-	status = update_checkpointed_pid(&cuda_pids, pid);
-	if (status) {
-		pr_err("Failed to track checkpointed pid %d\n", pid);
-		status = cuda_process_checkpoint_action(pid, ACTION_RESTORE, 0, msg_buf, sizeof(msg_buf));
-		if (status) {
-			pr_err("Failed to restore process after error %s on pid %d\n", msg_buf, pid);
-		}
-	}
 
-	if (!status && !plugin_added_to_inventory) {
-		status = add_inventory_plugin(CR_PLUGIN_DESC.name);
-		if (status)
-			pr_err("Failed to add CUDA plugin to inventory image\n");
-		else
-			plugin_added_to_inventory = true;
-	}
+	task_info->checkpointed = 1;
 
 interrupt:
 	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
@@ -376,6 +410,7 @@ int cuda_plugin_pause_devices(int pid)
 {
 	int restore_tid;
 	char msg_buf[CUDA_CKPT_BUF_SIZE];
+	cuda_task_state_t task_state;
 
 	if (plugin_disabled) {
 		return -ENOTSUP;
@@ -388,6 +423,34 @@ int cuda_plugin_pause_devices(int pid)
 		return 0;
 	}
 
+	task_state = get_cuda_state(restore_tid);
+	if (task_state == CUDA_TASK_UNKNOWN) {
+		pr_err("Failed to get CUDA state for PID %d\n", restore_tid);
+		return -1;
+	}
+
+	if (!plugin_added_to_inventory) {
+		if (add_inventory_plugin(CR_PLUGIN_DESC.name)) {
+			pr_err("Failed to add CUDA plugin to inventory image\n");
+			return -1;
+		}
+		plugin_added_to_inventory = true;
+	}
+
+	if (task_state == CUDA_TASK_LOCKED) {
+		pr_info("pid %d already in a locked state\n", pid);
+		/* Leave this PID in a "locked" state at resume_device() */
+		add_pid_to_buf(&cuda_pids, pid, CUDA_TASK_LOCKED);
+		return 0;
+	}
+
+	if (task_state == CUDA_TASK_CHECKPOINTED) {
+		/* We need to skip this PID in cuda_plugin_checkpoint_devices(),
+		 * and leave it in a "checkpoined" state at resume_device(). */
+		add_pid_to_buf(&cuda_pids, pid, CUDA_TASK_CHECKPOINTED);
+		return 0;
+	}
+
 	pr_info("pausing devices on pid %d\n", pid);
 	int status = cuda_process_checkpoint_action(pid, ACTION_LOCK, opts.timeout * 1000, msg_buf, sizeof(msg_buf));
 	if (status) {
@@ -397,7 +460,7 @@ int cuda_plugin_pause_devices(int pid)
 		return -1;
 	}
 
-	if (add_pid_to_buf(&cuda_pids, pid)) {
+	if (add_pid_to_buf(&cuda_pids, pid, CUDA_TASK_RUNNING)) {
 		pr_err("unable to track paused pid %d\n", pid);
 		goto unlock;
 	}
@@ -412,7 +475,7 @@ unlock:
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__PAUSE_DEVICES, cuda_plugin_pause_devices)
 
-int resume_device(int pid, int checkpointed)
+int resume_device(int pid, int checkpointed, cuda_task_state_t initial_task_state)
 {
 	char msg_buf[CUDA_CKPT_BUF_SIZE];
 	int status;
@@ -420,6 +483,11 @@ int resume_device(int pid, int checkpointed)
 	int int_ret;
 	k_rtsigset_t save_sigset;
 
+	if (initial_task_state == CUDA_TASK_UNKNOWN) {
+		pr_info("skip resume for PID %d (unknown state)\n", pid);
+		return 0;
+	}
+
 	int restore_tid = get_cuda_restore_tid(pid);
 	if (restore_tid == -1) {
 		pr_info("No need to resume devices on pid %d\n", pid);
@@ -439,7 +507,8 @@ int resume_device(int pid, int checkpointed)
 		return -1;
 	}
 
-	if (checkpointed) {
+	if (checkpointed && (initial_task_state == CUDA_TASK_RUNNING || initial_task_state == CUDA_TASK_LOCKED)) {
+		/* If the process was "locked" or "running" before checkpointing it, we need to restore it */
 		status = cuda_process_checkpoint_action(pid, ACTION_RESTORE, 0, msg_buf, sizeof(msg_buf));
 		if (status) {
 			pr_err("RESUME_DEVICES RESTORE failed with %s\n", msg_buf);
@@ -448,10 +517,13 @@ int resume_device(int pid, int checkpointed)
 		}
 	}
 
-	status = cuda_process_checkpoint_action(pid, ACTION_UNLOCK, 0, msg_buf, sizeof(msg_buf));
-	if (status) {
-		pr_err("RESUME_DEVICES UNLOCK failed with %s\n", msg_buf);
-		ret = -1;
+	if (initial_task_state == CUDA_TASK_RUNNING) {
+		/* If the process was "running" before we paused it, we need to unlock it */
+		status = cuda_process_checkpoint_action(pid, ACTION_UNLOCK, 0, msg_buf, sizeof(msg_buf));
+		if (status) {
+			pr_err("RESUME_DEVICES UNLOCK failed with %s\n", msg_buf);
+			ret = -1;
+		}
 	}
 
 interrupt:
@@ -466,7 +538,12 @@ int cuda_plugin_resume_devices_late(int pid)
 		return -ENOTSUP;
 	}
 
-	return resume_device(pid, 1);
+	/* RESUME_DEVICES_LATE is used during `criu restore`.
+	 * Here, we assume that users expect the target process
+	 * to be in a "running" state after restore, even if it was
+	 * in a "locked" or "checkpointed" state during `criu dump`.
+	 */
+	return resume_device(pid, 1, CUDA_TASK_RUNNING);
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, cuda_plugin_resume_devices_late)
 
@@ -542,7 +619,7 @@ void cuda_plugin_fini(int stage, int ret)
 	if (stage == CR_PLUGIN_STAGE__DUMP && (opts.final_state == TASK_ALIVE || ret != 0)) {
 		struct pid_info *info;
 		list_for_each_entry(info, &cuda_pids, list) {
-			resume_device(info->pid, info->checkpointed);
+			resume_device(info->pid, info->checkpointed, info->initial_task_state);
 		}
 	}
 	if (stage == CR_PLUGIN_STAGE__DUMP) {

From 21e5f4cfd55b8d6837d0f01441d9772c3f09f707 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 12 Nov 2024 15:14:51 +0000
Subject: [PATCH 1598/1854] test: add get-state to mocked cuda-checkpoint tool

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/cuda-checkpoint/cuda-checkpoint.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/cuda-checkpoint/cuda-checkpoint.c b/test/cuda-checkpoint/cuda-checkpoint.c
index f35a4b41d..3b7ce8b9f 100644
--- a/test/cuda-checkpoint/cuda-checkpoint.c
+++ b/test/cuda-checkpoint/cuda-checkpoint.c
@@ -11,6 +11,7 @@ int main(int argc, char *argv[])
 		int option_index = 0;
 		static struct option long_options[] = {
 			{ "pid", required_argument, 0, 'p' },
+			{ "get-state", no_argument, 0, 's' },
 			{ "get-restore-tid", no_argument, 0, 'g' },
 			{ "action", required_argument, 0, 'a' },
 			{ "timeout", required_argument, 0, 't' },
@@ -31,6 +32,9 @@ int main(int argc, char *argv[])
 		case 'a':
 		case 't':
 			break;
+		case 's':
+			printf("running\n");
+			break;
 		case 'h':
 			printf("--action - execute an action");
 			break;

From 399d7bdcbb94bdcbbca2ec7bef881cdfd6c9f404 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 17 Nov 2024 16:10:20 +0000
Subject: [PATCH 1599/1854] compel: fix gitignore and remove autogenerated code

We don't need to have compel/arch/riscv64/plugins/std/syscalls/syscalls.S
tracked in git. It is autogenerated. We also need to update our .gitignore
to ignore autogenerated files with syscall tables.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 compel/.gitignore                             |   3 +
 .../riscv64/plugins/std/syscalls/syscalls.S   | 112 ------------------
 2 files changed, 3 insertions(+), 112 deletions(-)
 delete mode 100644 compel/arch/riscv64/plugins/std/syscalls/syscalls.S

diff --git a/compel/.gitignore b/compel/.gitignore
index eab3337d6..5e770a86c 100644
--- a/compel/.gitignore
+++ b/compel/.gitignore
@@ -4,6 +4,9 @@ arch/arm/plugins/std/syscalls/syscalls.S
 arch/aarch64/plugins/std/syscalls/syscalls.S
 arch/s390/plugins/std/syscalls/syscalls.S
 arch/ppc64/plugins/std/syscalls/syscalls.S
+arch/mips/plugins/std/syscalls/syscalls-64.S
+arch/loongarch64/plugins/std/syscalls/syscalls-64.S
+arch/riscv64/plugins/std/syscalls/syscalls.S
 include/version.h
 plugins/include/uapi/std/asm/syscall-types.h
 plugins/include/uapi/std/syscall-64.h
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscalls.S b/compel/arch/riscv64/plugins/std/syscalls/syscalls.S
deleted file mode 100644
index 715da4612..000000000
--- a/compel/arch/riscv64/plugins/std/syscalls/syscalls.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Autogenerated, don't edit */
-#include <compel/plugins/std/syscall-codes.h>
-#include "std/syscalls/syscall-common.S"
-syscall sys_read, __NR_read
-syscall sys_write, __NR_write
-syscall sys_close, __NR_close
-syscall sys_lseek, __NR_lseek
-syscall sys_mmap, __NR_mmap
-syscall sys_mprotect, __NR_mprotect
-syscall sys_munmap, __NR_munmap
-syscall sys_brk, __NR_brk
-syscall sys_sigaction, __NR_rt_sigaction
-syscall sys_sigprocmask, __NR_rt_sigprocmask
-syscall sys_rt_sigreturn, __NR_rt_sigreturn
-syscall sys_ioctl, __NR_ioctl
-syscall sys_pread64, __NR_pread64
-syscall sys_ptrace, __NR_ptrace
-syscall sys_mremap, __NR_mremap
-syscall sys_mincore, __NR_mincore
-syscall sys_madvise, __NR_madvise
-syscall sys_shmat, __NR_shmat
-syscall sys_pause, __NR_pause
-syscall sys_nanosleep, __NR_nanosleep
-syscall sys_getitimer, __NR_getitimer
-syscall sys_setitimer, __NR_setitimer
-syscall sys_getpid, __NR_getpid
-syscall sys_socket, __NR_socket
-syscall sys_connect, __NR_connect
-syscall sys_sendto, __NR_sendto
-syscall sys_recvfrom, __NR_recvfrom
-syscall sys_sendmsg, __NR_sendmsg
-syscall sys_recvmsg, __NR_recvmsg
-syscall sys_shutdown, __NR_shutdown
-syscall sys_bind, __NR_bind
-syscall sys_setsockopt, __NR_setsockopt
-syscall sys_getsockopt, __NR_getsockopt
-syscall sys_clone, __NR_clone
-syscall sys_exit, __NR_exit
-syscall sys_wait4, __NR_wait4
-syscall sys_waitid, __NR_waitid
-syscall sys_kill, __NR_kill
-syscall sys_fcntl, __NR_fcntl
-syscall sys_flock, __NR_flock
-syscall sys_readlinkat, __NR_readlinkat
-syscall sys_umask, __NR_umask
-syscall sys_getgroups, __NR_getgroups
-syscall sys_setgroups, __NR_setgroups
-syscall sys_setresuid, __NR_setresuid
-syscall sys_getresuid, __NR_getresuid
-syscall sys_setresgid, __NR_setresgid
-syscall sys_getresgid, __NR_getresgid
-syscall sys_getpgid, __NR_getpgid
-syscall sys_setfsuid, __NR_setfsuid
-syscall sys_setfsgid, __NR_setfsgid
-syscall sys_getsid, __NR_getsid
-syscall sys_capget, __NR_capget
-syscall sys_capset, __NR_capset
-syscall sys_rt_sigqueueinfo, __NR_rt_sigqueueinfo
-syscall sys_setpriority, __NR_setpriority
-syscall sys_sched_setscheduler, __NR_sched_setscheduler
-syscall sys_sigaltstack, __NR_sigaltstack
-syscall sys_personality, __NR_personality
-syscall sys_prctl, __NR_prctl
-syscall sys_setrlimit, __NR_setrlimit
-syscall sys_mount, __NR_mount
-syscall sys_umount2, __NR_umount2
-syscall sys_gettid, __NR_gettid
-syscall sys_futex, __NR_futex
-syscall sys_set_tid_address, __NR_set_tid_address
-syscall sys_restart_syscall, __NR_restart_syscall
-syscall sys_timer_create, __NR_timer_create
-syscall sys_timer_settime, __NR_timer_settime
-syscall sys_timer_gettime, __NR_timer_gettime
-syscall sys_timer_getoverrun, __NR_timer_getoverrun
-syscall sys_timer_delete, __NR_timer_delete
-syscall sys_clock_gettime, __NR_clock_gettime
-syscall sys_exit_group, __NR_exit_group
-syscall sys_set_robust_list, __NR_set_robust_list
-syscall sys_get_robust_list, __NR_get_robust_list
-syscall sys_signalfd4, __NR_signalfd4
-syscall sys_rt_tgsigqueueinfo, __NR_rt_tgsigqueueinfo
-syscall sys_vmsplice, __NR_vmsplice
-syscall sys_timerfd_settime, __NR_timerfd_settime
-syscall sys_fanotify_init, __NR_fanotify_init
-syscall sys_fanotify_mark, __NR_fanotify_mark
-syscall sys_open_by_handle_at, __NR_open_by_handle_at
-syscall sys_setns, __NR_setns
-syscall sys_kcmp, __NR_kcmp
-syscall sys_openat, __NR_openat
-syscall sys_mkdirat, __NR_mkdirat
-syscall sys_unlinkat, __NR_unlinkat
-syscall sys_memfd_create, __NR_memfd_create
-syscall sys_io_setup, __NR_io_setup
-syscall sys_io_submit, __NR_io_submit
-syscall sys_io_getevents, __NR_io_getevents
-syscall sys_seccomp, __NR_seccomp
-syscall sys_gettimeofday, __NR_gettimeofday
-syscall sys_preadv_raw, __NR_preadv_raw
-syscall sys_userfaultfd, __NR_userfaultfd
-syscall sys_fallocate, __NR_fallocate
-syscall sys_ppoll, __NR_ppoll
-syscall sys_fsopen, __NR_fsopen
-syscall sys_fsconfig, __NR_fsconfig
-syscall sys_fsmount, __NR_fsmount
-syscall sys_clone3, __NR_clone3
-syscall sys_pidfd_open, __NR_pidfd_open
-syscall sys_pidfd_getfd, __NR_pidfd_getfd
-syscall sys_rseq, __NR_rseq
-syscall sys_move_mount, __NR_move_mount
-syscall sys_open_tree, __NR_open_tree
-syscall sys_openat2, __NR_openat2
-#include <compel/plugins/std/syscall-aux.S>

From 40b7f04b7c0475813d3e4809cfee2b918715f9c9 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 17 Nov 2024 18:32:03 +0000
Subject: [PATCH 1600/1854] compel/arch/riscv64: properly implement
 compel_task_size()

We need to dynamically calculate TASK_SIZE depending
on the MMU on RISC-V system. [We are using analogical
approach on aarch64/ppc64le.]

This change was tested on physical machine:
StarFive VisionFive 2
isa		: rv64imafdc_zicntr_zicsr_zifencei_zihpm_zca_zcd_zba_zbb
mmu		: sv39
uarch		: sifive,u74-mc
mvendorid	: 0x489
marchid		: 0x8000000000000007
mimpid		: 0x4210427
hart isa	: rv64imafdc_zicntr_zicsr_zifencei_zihpm_zca_zcd_zba_zbb

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 compel/arch/riscv64/src/lib/infect.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/compel/arch/riscv64/src/lib/infect.c b/compel/arch/riscv64/src/lib/infect.c
index 01395a205..861fe3b2f 100644
--- a/compel/arch/riscv64/src/lib/infect.c
+++ b/compel/arch/riscv64/src/lib/infect.c
@@ -181,20 +181,22 @@ int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s)
  * Task size is the maximum virtual address space size that a process can occupy in the memory
  * Refer to linux kernel arch/riscv/include/asm/pgtable.h,
  * task size is:
- * -     0x9fc00000 (~2.5GB) for RV32.
- * -   0x4000000000 ( 256GB) for RV64 using SV39 mmu
- * - 0x800000000000 ( 128TB) for RV64 using SV48 mmu
- *
- * Note that PGDIR_SIZE must evenly divide TASK_SIZE since "RISC-V
- * Instruction Set Manual Volume II: Privileged Architecture" states that
- * "load and store effective addresses, which are 64bits, must have bits
- * 63–48 all equal to bit 47, or else a page-fault exception will occur."
-*/
-#define TASK_SIZE 0x800000000000UL // hardcoded for SV48 MMU
+ * -        0x9fc00000	(~2.5GB) for RV32.
+ * -      0x4000000000	( 256GB) for RV64 using SV39 mmu
+ * -    0x800000000000	( 128TB) for RV64 using SV48 mmu
+ * - 0x100000000000000	(  64PB) for RV64 using SV57 mmu
+ */
+#define TASK_SIZE_MIN (1UL << 38)
+#define TASK_SIZE_MAX (1UL << 56)
 
 unsigned long compel_task_size(void)
 {
-	return TASK_SIZE;
+	unsigned long task_size;
+
+	for (task_size = TASK_SIZE_MIN; task_size < TASK_SIZE_MAX; task_size <<= 1)
+		if (munmap((void *)task_size, page_size()))
+			break;
+	return task_size;
 }
 
 /*

From ed560a3491079157b9044d3e14aa522159e9450b Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 23 Nov 2024 22:29:45 +0000
Subject: [PATCH 1601/1854] pidfd: add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix for the following error when building CRIU on Rocky Linux 8

criu/pidfd.c: In function ‘pidfd_open’:
criu/pidfd.c:119:17: error: ‘__NR_pidfd_open’ undeclared (first use in this function); did you mean ‘pidfd_open’?
  return syscall(__NR_pidfd_open, pid, flags);
                 ^~~~~~~~~~~~~~~
                 pidfd_open
criu/pidfd.c:119:17: note: each undeclared identifier is reported only once for each function it appears in
criu/pidfd.c:120:1: error: control reaches end of non-void function [-Werror=return-type]
 }
 ^
criu/pidfd.c: At top level:
cc1: error: unrecognized command line option ‘-Wno-unknown-warning-option’ [-Werror]
cc1: error: unrecognized command line option ‘-Wno-dangling-pointer’ [-Werror]
cc1: all warnings being treated as errors

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/pidfd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/pidfd.c b/criu/pidfd.c
index 53b9bcf71..ae32025b0 100644
--- a/criu/pidfd.c
+++ b/criu/pidfd.c
@@ -11,6 +11,8 @@
 #include "common/bug.h"
 #include "rst-malloc.h"
 
+#include "compel/plugins/std/syscall-codes.h"
+
 #undef LOG_PREFIX
 #define LOG_PREFIX "pidfd: "
 

From 8ee2eba47c0c540026311b24af7a74784e370750 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Thu, 5 Dec 2024 22:17:38 +0000
Subject: [PATCH 1602/1854] vdso: handle vvar_vclock vma-s

The vvar_vclock was introduced by [1]. Basically, the old vvar vma has
been splited on two parts. In term of C/R, these two vma-s can be still
treated as one.

[1] e93d2521b27f ("x86/vdso: Split virtual clock pages into dedicated mapping")

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/include/util-vdso.h |  1 +
 criu/pie/parasite-vdso.c | 19 ++++++++++++++++++-
 criu/proc_parse.c        | 23 +++++++++++++++++++----
 criu/vdso.c              | 28 +++++++++++++++++++++-------
 4 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/criu/include/util-vdso.h b/criu/include/util-vdso.h
index c4386cf8e..9fd9a6de4 100644
--- a/criu/include/util-vdso.h
+++ b/criu/include/util-vdso.h
@@ -30,6 +30,7 @@ struct vdso_symbol {
 struct vdso_symtable {
 	unsigned long vdso_size;
 	unsigned long vvar_size;
+	unsigned long vvar_vclock_size;
 	struct vdso_symbol symbols[VDSO_SYMBOL_MAX];
 	bool vdso_before_vvar; /* order of vdso/vvar pair */
 };
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index 355007fa9..f3ad3107f 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -45,6 +45,7 @@ static int remap_one(char *who, unsigned long *from, unsigned long to, size_t si
 static int park_at(struct vdso_maps *rt, unsigned long vdso, unsigned long vvar)
 {
 	unsigned long vvar_size = rt->sym.vvar_size;
+	unsigned long vvar_vclock_size = rt->sym.vvar_vclock_size;
 	unsigned long vdso_size = rt->sym.vdso_size;
 	int ret;
 
@@ -54,8 +55,24 @@ static int park_at(struct vdso_maps *rt, unsigned long vdso, unsigned long vvar)
 
 	std_log_set_gettimeofday(NULL); /* stop using vdso for timings */
 
-	if (vvar)
+	if (vvar) {
+		/*
+		 * v6.13-rc1~172^2~9 splits the vvar vma in two parts vvar and
+		 * vvar_clock. The last one is mapped right after the first
+		 * one.
+		 */
+		if (vvar_vclock_size) {
+			unsigned long from;
+
+			vvar_size -= vvar_vclock_size;
+			from = rt->vvar_start + vvar_size;
+
+			ret = remap_one("rt-vvar", &from, vvar + vvar_size, vvar_vclock_size);
+			if (ret)
+				return ret;
+		}
 		ret = remap_one("rt-vvar", &rt->vvar_start, vvar, vvar_size);
+	}
 
 	if (!ret)
 		vdso_update_gtod_addr(rt);
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index eb869dbbd..be0c3d531 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -579,7 +579,8 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 	} else if (!strcmp(file_path, "[vdso]")) {
 		if (handle_vdso_vma(vma_area))
 			goto err;
-	} else if (!strcmp(file_path, "[vvar]")) {
+	} else if (!strcmp(file_path, "[vvar]") ||
+		   !strcmp(file_path, "[vvar_vclock]")) {
 		if (handle_vvar_vma(vma_area))
 			goto err;
 	} else if (!strcmp(file_path, "[heap]")) {
@@ -771,7 +772,7 @@ static int task_size_check(pid_t pid, VmaEntry *entry)
 
 int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t dump_filemap)
 {
-	struct vma_area *vma_area = NULL;
+	struct vma_area *vma_area = NULL, *prev_vma_area = NULL;
 	unsigned long start, end, pgoff, prev_end = 0;
 	char r, w, x, s;
 	int ret = -1, vm_file_fd = -1;
@@ -813,8 +814,22 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap_t du
 				continue;
 		}
 
-		if (vma_area && vma_list_add(vma_area, vma_area_list, &prev_end, &vfi, &prev_vfi))
-			goto err;
+		if (vma_area && vma_area_is(vma_area, VMA_AREA_VVAR) &&
+		    prev_vma_area && vma_area_is(prev_vma_area, VMA_AREA_VVAR)) {
+			if (prev_vma_area->e->end != vma_area->e->start) {
+				pr_err("two nonconsecutive vvar vma-s: "
+				       "%" PRIx64 "-%" PRIx64 " %" PRIx64 "-%" PRIx64 "\n",
+				       prev_vma_area->e->start, prev_vma_area->e->end,
+				       vma_area->e->start, vma_area->e->end);
+				goto err;
+			}
+			/* Merge all vvar vma-s into one. */
+			prev_vma_area->e->end = vma_area->e->end;
+		} else {
+			if (vma_area && vma_list_add(vma_area, vma_area_list, &prev_end, &vfi, &prev_vfi))
+				goto err;
+			prev_vma_area = vma_area;
+		}
 
 		if (eof)
 			break;
diff --git a/criu/vdso.c b/criu/vdso.c
index 7de2fae78..d4d351131 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -310,7 +310,7 @@ static int vdso_parse_maps(pid_t pid, struct vdso_maps *s)
 
 	while (1) {
 		unsigned long start, end;
-		char *has_vdso, *has_vvar;
+		char *has_vdso, *has_vvar, *has_vvar_vclock;
 
 		buf = breadline(&f);
 		if (buf == NULL)
@@ -318,13 +318,19 @@ static int vdso_parse_maps(pid_t pid, struct vdso_maps *s)
 		if (IS_ERR(buf))
 			goto err;
 
-		has_vdso = strstr(buf, "[vdso]");
-		if (!has_vdso)
+		has_vvar = NULL;
+		has_vvar_vclock = NULL;
+		do {
+			has_vdso = strstr(buf, "[vdso]");
+			if (has_vdso)
+				break;
 			has_vvar = strstr(buf, "[vvar]");
-		else
-			has_vvar = NULL;
+			if (has_vvar)
+				break;
+			has_vvar_vclock = strstr(buf, "[vvar_vclock]");
+		} while (0);
 
-		if (!has_vdso && !has_vvar)
+		if (!has_vdso && !has_vvar && !has_vvar_vclock)
 			continue;
 
 		if (sscanf(buf, "%lx-%lx", &start, &end) != 2) {
@@ -339,13 +345,21 @@ static int vdso_parse_maps(pid_t pid, struct vdso_maps *s)
 			}
 			s->vdso_start = start;
 			s->sym.vdso_size = end - start;
-		} else {
+		} else if (has_vvar) {
 			if (s->vvar_start != VVAR_BAD_ADDR) {
 				pr_err("Got second VVAR entry\n");
 				goto err;
 			}
 			s->vvar_start = start;
 			s->sym.vvar_size = end - start;
+		} else {
+			if (s->vvar_start == VDSO_BAD_ADDR ||
+			    s->vvar_start + s->sym.vvar_size != start) {
+				pr_err("VVAR and VVAR_VCLOCK entries are not subsequent\n");
+				goto err;
+			}
+			s->sym.vvar_vclock_size = end - start;
+			s->sym.vvar_size += s->sym.vvar_vclock_size;
 		}
 	}
 

From dc6cef0b4cb1c2de60ee0300fa9705835dff0f45 Mon Sep 17 00:00:00 2001
From: Jesus Ramos <jeramos@nvidia.com>
Date: Tue, 10 Dec 2024 12:11:57 -0800
Subject: [PATCH 1603/1854] cuda: Fix return value from CHECKPOINT_DEVICES hook
 so that dump's fail properly

cuda-checkpoint returns the positive CUDA error code when it runs into an issue
and passing that along as the return value would cause errors to get ignored

Signed-off-by: Jesus Ramos <jeramos@nvidia.com>
---
 plugins/cuda/cuda_plugin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 7764cf3c7..e78828b18 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -402,7 +402,7 @@ int cuda_plugin_checkpoint_devices(int pid)
 interrupt:
 	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
 
-	return status != 0 ? status : int_ret;
+	return status != 0 ? -1 : int_ret;
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, cuda_plugin_checkpoint_devices);
 

From 15c81c12629c516a1e58097de0cee157515e2401 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sat, 7 Dec 2024 00:08:59 +0000
Subject: [PATCH 1604/1854] test/java: increate the ghost file limit

Right now, this test fails with this error:
Error (criu/files-reg.c:1031): Can't dump ghost file
  /criu/test/javaTests/omrvmem_000000626_Mlm48x of 2097152 size,
  increase limit

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 scripts/build/Dockerfile.openj9-ubuntu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index c2cf20a36..e190c2792 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -24,9 +24,10 @@ RUN apt-install protobuf-c-compiler \
 	gcc \
 	maven
 
+RUN mkdir -p /etc/criu && echo 'ghost-limit 16777216' > /etc/criu/default.conf
 COPY . /criu
 WORKDIR /criu
 
 RUN make mrproper && make -j $(nproc) CC="$CC"
 
-ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
+ENTRYPOINT mvn -f test/javaTests/pom.xml test

From a8754905c05a08f560194d90bb53ba86b27577d2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Fri, 13 Dec 2024 09:03:42 -0800
Subject: [PATCH 1605/1854] test: run scm06 in the ns and uns flavors

The kernel releases a test socket asynchronously, so the restore can
fail if it is executed before the kernel actually destroys the socket.

Fixes #2537

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/static/scm06.desc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/scm06.desc b/test/zdtm/static/scm06.desc
index 2eac7e654..38cc3be51 100644
--- a/test/zdtm/static/scm06.desc
+++ b/test/zdtm/static/scm06.desc
@@ -1 +1,4 @@
-{'flags': 'suid'}
+# This test isn't executed in the host flavor (in the same network namespace,
+# because the kernel releases a test socket asynchronously, so the restore
+# can fail if it is executed before the kernel actually destroys the socket.
+{'flags': 'suid', 'flavor': 'ns uns'}

From 99e1fbd8a2cfd6eaf3193062c2925ac80a9893b6 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Mon, 16 Dec 2024 16:38:31 -0800
Subject: [PATCH 1606/1854] criu/seize.c: clang-format it

Done using clang-format 19.1.5 with .clang-format obtained via
scripts/fetch-clang-format.sh.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/seize.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/criu/seize.c b/criu/seize.c
index 9bd1832d9..529fff562 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -87,7 +87,10 @@ static const char frozen[] = "FROZEN";
 static const char freezing[] = "FREEZING";
 static const char thawed[] = "THAWED";
 
-enum freezer_state { FREEZER_ERROR = -1, THAWED, FROZEN, FREEZING };
+enum freezer_state { FREEZER_ERROR = -1,
+		     THAWED,
+		     FROZEN,
+		     FREEZING };
 
 /* Track if we are running on cgroup v2 system. */
 static bool cgroup_v2 = false;

From 82f4ecda6922020346a6a544b53476e0d527d366 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 12 Dec 2024 17:29:34 -0800
Subject: [PATCH 1607/1854] freeze_processes: fix logic

There are a few issues with the freeze_processes logic:

1. Commit 9fae23fbe2 grossly (by 1000x) miscalculated the number of
   attempts required, as a result, we are seeing something like this:

> (00.000340) freezing processes: 100000 attempts with 100 ms steps
> (00.000351) freezer.state=THAWED
> (00.000358) freezer.state=FREEZING
> (00.100446) freezer.state=FREEZING
> ...close to 100 lines skipped...
> (09.915110) freezer.state=FREEZING
> (10.000432) Error (criu/cr-dump.c:1467): Timeout reached. Try to interrupt: 0
> (10.000563) freezer.state=FREEZING

   For 10s with 100ms steps we only need 100 attempts, not 100000.

2. When the timeout is hit, the "failed to freeze cgroup" error is not
   printed, and the log_unfrozen_stacks is not called either.

3. The nanosleep at the last iteration is useless (this was hidden by
   issue 1 above, as the timeout was hit first).

Fix all these.

While at it,

4. Amend the error message with the number of attempts, sleep duration,
   and timeout.

5. Modify the "freezing cgroup" debug message to be in sync with the
   above error.

   Was:

   > freezing processes: 100000 attempts with 100 ms steps

   Now:

   > freezing cgroup some/name: 100 x 100ms attempts, timeout: 10s

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/seize.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index 529fff562..6701446ae 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -545,7 +545,8 @@ static int freeze_processes(void)
 	enum freezer_state state = THAWED;
 
 	static const unsigned long step_ms = 100;
-	unsigned long nr_attempts = (opts.timeout * 1000000) / step_ms;
+	/* Since opts.timeout is in seconds, multiply it by 1000 to convert to milliseconds. */
+	unsigned long nr_attempts = (opts.timeout * 1000) / step_ms;
 	unsigned long i = 0;
 
 	const struct timespec req = {
@@ -554,14 +555,12 @@ static int freeze_processes(void)
 	};
 
 	if (unlikely(!nr_attempts)) {
-		/*
-		 * If timeout is turned off, lets
-		 * wait for at least 10 seconds.
-		 */
-		nr_attempts = (10 * 1000000) / step_ms;
+		/* If the timeout is 0, wait for at least 10 seconds. */
+		nr_attempts = (10 * 1000) / step_ms;
 	}
 
-	pr_debug("freezing processes: %lu attempts with %lu ms steps\n", nr_attempts, step_ms);
+	pr_debug("freezing cgroup %s: %lu x %lums attempts, timeout: %us\n",
+		 opts.freeze_cgroup, nr_attempts, step_ms, opts.timeout);
 
 	fd = freezer_open();
 	if (fd < 0)
@@ -588,22 +587,22 @@ static int freeze_processes(void)
 		 * not read @tasks pids while freezer in
 		 * transition stage.
 		 */
-		for (; i <= nr_attempts; i++) {
+		while (1) {
 			state = get_freezer_state(fd);
 			if (state == FREEZER_ERROR) {
 				close(fd);
 				return -1;
 			}
 
-			if (state == FROZEN)
+			if (state == FROZEN || i++ == nr_attempts || alarm_timeouted())
 				break;
-			if (alarm_timeouted())
-				goto err;
+
 			nanosleep(&req, NULL);
 		}
 
-		if (i > nr_attempts) {
-			pr_err("Unable to freeze cgroup %s\n", opts.freeze_cgroup);
+		if (state != FROZEN) {
+			pr_err("Unable to freeze cgroup %s (%lu x %lums attempts, timeout: %us)\n",
+			       opts.freeze_cgroup, i, step_ms, opts.timeout);
 			if (!pr_quelled(LOG_DEBUG))
 				log_unfrozen_stacks(opts.freeze_cgroup);
 			goto err;

From 94b9b3c5daf1237493f75d2e538d72d81013c2a2 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 12 Dec 2024 17:34:17 -0800
Subject: [PATCH 1608/1854] freeze_processes: implement kludges for cgroup v1

Cgroup v1 freezer has always been problematic, failing to freeze a
cgroup.

In runc, we have implemented a few kludges to increase the chance of
succeeding, but those are used when runc freezes a cgroup for its own
purposes (for "runc pause" and to modify device properties for cgroup
v1).

When criu is used, it fails to freeze a cgroup from time to time
(see [1], [2]). Let's try adding kludges similar to ones in runc.

Alas, I have absolutely no way to test this, so please review carefully.

[1]: https://github.com/opencontainers/runc/issues/4273
[2]: https://github.com/opencontainers/runc/issues/4457

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 criu/seize.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/criu/seize.c b/criu/seize.c
index 6701446ae..829d7c278 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -539,6 +539,34 @@ err:
 	return exit_code;
 }
 
+static void cgroupv1_freezer_kludges(int fd, int iter, const struct timespec *req) {
+	/* As per older kernel docs (freezer-subsystem.txt before
+	 * the kernel commit ef9fe980c6fcc1821), if FREEZING is seen,
+	 * userspace should either retry or thaw. While current
+	 * kernel cgroup v1 docs no longer mention a need to retry,
+	 * even recent kernels can't reliably freeze a cgroup v1.
+	 *
+	 * Let's keep asking the kernel to freeze from time to time.
+	 * In addition, do occasional thaw/sleep/freeze.
+	 *
+	 * This is still a game of chances (the real fix belongs to the kernel)
+	 * but these kludges might improve the probability of success.
+	 *
+	 * Cgroup v2 does not have this problem.
+	 */
+	switch (iter % 32) {
+		case 9:
+		case 20:
+			freezer_write_state(fd, FROZEN);
+			break;
+		case 31:
+			freezer_write_state(fd, THAWED);
+			nanosleep(req, NULL);
+			freezer_write_state(fd, FROZEN);
+			break;
+	}
+}
+
 static int freeze_processes(void)
 {
 	int fd, exit_code = -1;
@@ -597,6 +625,9 @@ static int freeze_processes(void)
 			if (state == FROZEN || i++ == nr_attempts || alarm_timeouted())
 				break;
 
+			if (!cgroup_v2)
+				cgroupv1_freezer_kludges(fd, i, &req);
+
 			nanosleep(&req, NULL);
 		}
 

From 6f8efad304a4a65bc5b45ec5985fc7ac3763b5ff Mon Sep 17 00:00:00 2001
From: Liu Chao <liuchao173@huawei.com>
Date: Thu, 19 Dec 2024 08:16:36 +0000
Subject: [PATCH 1609/1854] cr: Task CapAmb support

Signed-off-by: Liu Chao <liuchao173@huawei.com>
---
 criu/cr-restore.c         |  2 ++
 criu/include/parasite.h   |  1 +
 criu/include/prctl.h      |  9 +++++++++
 criu/include/proc_parse.h |  1 +
 criu/include/restorer.h   |  1 +
 criu/parasite-syscall.c   |  3 +++
 criu/pie/parasite.c       | 13 +++++++++++++
 criu/pie/restorer.c       | 16 ++++++++++++++++
 criu/proc_parse.c         | 11 +++++++++--
 criu/pstree.c             |  3 +++
 images/creds.proto        |  2 ++
 11 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 646300bdb..ddca6b8ec 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2992,6 +2992,7 @@ static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned lo
 	args->creds.cap_eff = NULL;
 	args->creds.cap_prm = NULL;
 	args->creds.cap_bnd = NULL;
+	args->creds.cap_amb = NULL;
 	args->creds.groups = NULL;
 	args->creds.lsm_profile = NULL;
 
@@ -2999,6 +3000,7 @@ static struct thread_creds_args *rst_prep_creds_args(CredsEntry *ce, unsigned lo
 	copy_caps(args->cap_eff, ce->cap_eff, ce->n_cap_eff);
 	copy_caps(args->cap_prm, ce->cap_prm, ce->n_cap_prm);
 	copy_caps(args->cap_bnd, ce->cap_bnd, ce->n_cap_bnd);
+	copy_caps(args->cap_amb, ce->cap_amb, ce->n_cap_amb);
 
 	if (ce->n_groups && !groups_match(ce->groups, ce->n_groups)) {
 		unsigned int *groups;
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index 1244220f6..b33d6710f 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -148,6 +148,7 @@ struct parasite_dump_creds {
 	u32 cap_prm[CR_CAP_SIZE];
 	u32 cap_eff[CR_CAP_SIZE];
 	u32 cap_bnd[CR_CAP_SIZE];
+	u32 cap_amb[CR_CAP_SIZE];
 
 	int uids[4];
 	int gids[4];
diff --git a/criu/include/prctl.h b/criu/include/prctl.h
index 4c2a548b1..f5f23c969 100644
--- a/criu/include/prctl.h
+++ b/criu/include/prctl.h
@@ -36,6 +36,15 @@
 #ifndef PR_SET_NO_NEW_PRIVS
 #define PR_SET_NO_NEW_PRIVS 38
 #endif
+#ifndef PR_CAP_AMBIENT
+#define PR_CAP_AMBIENT 47
+#endif
+#ifndef PR_CAP_AMBIENT_IS_SET
+#define PR_CAP_AMBIENT_IS_SET 1
+#endif
+#ifndef PR_CAP_AMBIENT_RAISE
+#define PR_CAP_AMBIENT_RAISE 2
+#endif
 
 #ifndef PR_SET_MM
 #define PR_SET_MM	      35
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 0c334a190..0bd79bf55 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -81,6 +81,7 @@ struct proc_status_creds {
 	u32 cap_prm[PROC_CAP_SIZE];
 	u32 cap_eff[PROC_CAP_SIZE];
 	u32 cap_bnd[PROC_CAP_SIZE];
+	u32 cap_amb[PROC_CAP_SIZE];
 };
 
 #define INVALID_UID ((uid_t)-1)
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 3fb5322a4..a4fb7ea79 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -75,6 +75,7 @@ struct thread_creds_args {
 	u32 cap_prm[CR_CAP_SIZE];
 	u32 cap_eff[CR_CAP_SIZE];
 	u32 cap_bnd[CR_CAP_SIZE];
+	u32 cap_amb[CR_CAP_SIZE];
 
 	char *lsm_profile;
 	unsigned int *groups;
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index a88f8a66f..6db9d21fe 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -103,16 +103,19 @@ static int alloc_groups_copy_creds(CredsEntry *ce, struct parasite_dump_creds *c
 	BUILD_BUG_ON(sizeof(ce->cap_prm[0]) != sizeof(c->cap_prm[0]));
 	BUILD_BUG_ON(sizeof(ce->cap_eff[0]) != sizeof(c->cap_eff[0]));
 	BUILD_BUG_ON(sizeof(ce->cap_bnd[0]) != sizeof(c->cap_bnd[0]));
+	BUILD_BUG_ON(sizeof(ce->cap_amb[0]) != sizeof(c->cap_amb[0]));
 
 	BUG_ON(ce->n_cap_inh != CR_CAP_SIZE);
 	BUG_ON(ce->n_cap_prm != CR_CAP_SIZE);
 	BUG_ON(ce->n_cap_eff != CR_CAP_SIZE);
 	BUG_ON(ce->n_cap_bnd != CR_CAP_SIZE);
+	BUG_ON(ce->n_cap_amb != CR_CAP_SIZE);
 
 	memcpy(ce->cap_inh, c->cap_inh, sizeof(c->cap_inh[0]) * CR_CAP_SIZE);
 	memcpy(ce->cap_prm, c->cap_prm, sizeof(c->cap_prm[0]) * CR_CAP_SIZE);
 	memcpy(ce->cap_eff, c->cap_eff, sizeof(c->cap_eff[0]) * CR_CAP_SIZE);
 	memcpy(ce->cap_bnd, c->cap_bnd, sizeof(c->cap_bnd[0]) * CR_CAP_SIZE);
+	memcpy(ce->cap_amb, c->cap_amb, sizeof(c->cap_amb[0]) * CR_CAP_SIZE);
 
 	if (c->no_new_privs > 0) {
 		ce->no_new_privs = c->no_new_privs;
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index e151ed656..1bc03dc2a 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -324,6 +324,7 @@ static int dump_creds(struct parasite_dump_creds *args)
 		args->cap_prm[i] = data[i].prm;
 		args->cap_inh[i] = data[i].inh;
 		args->cap_bnd[i] = 0;
+		args->cap_amb[i] = 0;
 
 		for (j = 0; j < 32; j++) {
 			if (j + i * 32 > args->cap_last_cap)
@@ -336,6 +337,18 @@ static int dump_creds(struct parasite_dump_creds *args)
 			if (ret)
 				args->cap_bnd[i] |= (1 << j);
 		}
+
+		for (j = 0; j < 32; j++) {
+			if (j + i * 32 > args->cap_last_cap)
+				break;
+			ret = sys_prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, j + i * 32, 0, 0);
+			if (ret < 0) {
+				pr_err("Unable to read ambient capability %d: %d\n", j + i * 32, ret);
+				return -1;
+			}
+			if (ret)
+				args->cap_amb[i] |= (1 << j);
+		}
 	}
 
 	args->no_new_privs = sys_prctl(PR_GET_NO_NEW_PRIVS, 0, 0, 0, 0);
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 51ed6ed4c..0a6a7977c 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -347,6 +347,22 @@ skip_xids:
 		return -1;
 	}
 
+	for (b = 0; b < CR_CAP_SIZE; b++) {
+		for (i = 0; i < 32; i++) {
+			if (b * 32 + i > args->cap_last_cap)
+				break;
+			if ((args->cap_amb[b] & (1 << i)) == 0)
+				/* don't set */
+				continue;
+			ret = sys_prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i + b * 32, 0, 0);
+			if (!ret)
+				continue;
+			pr_err("Unable to raise ambient capability %d: %d\n", i + b * 32, ret);
+			return -1;
+		}
+	}
+
+
 	if (lsm_type != LSMTYPE__SELINUX) {
 		/*
 		 * SELinux does not support setting the process context for
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index be0c3d531..99dc518a5 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1071,7 +1071,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 	if (bfdopenr(&f))
 		return -1;
 
-	while (done < 13) {
+	while (done < 14) {
 		str = breadline(&f);
 		if (str == NULL)
 			break;
@@ -1155,6 +1155,13 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 			continue;
 		}
 
+		if (!strncmp(str, "CapAmb:", 7)) {
+			if (cap_parse(str + 8, cr->cap_amb))
+				goto err_parse;
+			done++;
+			continue;
+		}
+
 		if (!strncmp(str, "Seccomp:", 8)) {
 			if (sscanf(str + 9, "%d", &cr->s.seccomp_mode) != 1) {
 				goto err_parse;
@@ -1198,7 +1205,7 @@ int parse_pid_status(pid_t pid, struct seize_task_status *ss, void *data)
 	}
 
 	/* seccomp and nspids are optional */
-	expected_done = (parsed_seccomp ? 12 : 11);
+	expected_done = (parsed_seccomp ? 13 : 12);
 	if (kdat.has_nspid)
 		expected_done++;
 	if (done == expected_done)
diff --git a/criu/pstree.c b/criu/pstree.c
index 8c44e7134..41df846ed 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -63,6 +63,7 @@ CoreEntry *core_entry_alloc(int th, int tsk)
 		sz += CR_CAP_SIZE * sizeof(ce->cap_prm[0]);
 		sz += CR_CAP_SIZE * sizeof(ce->cap_eff[0]);
 		sz += CR_CAP_SIZE * sizeof(ce->cap_bnd[0]);
+		sz += CR_CAP_SIZE * sizeof(ce->cap_amb[0]);
 		/*
 		 * @groups are dynamic and allocated
 		 * on demand.
@@ -122,10 +123,12 @@ CoreEntry *core_entry_alloc(int th, int tsk)
 			ce->n_cap_prm = CR_CAP_SIZE;
 			ce->n_cap_eff = CR_CAP_SIZE;
 			ce->n_cap_bnd = CR_CAP_SIZE;
+			ce->n_cap_amb = CR_CAP_SIZE;
 			ce->cap_inh = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_inh[0]));
 			ce->cap_prm = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_prm[0]));
 			ce->cap_eff = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_eff[0]));
 			ce->cap_bnd = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_bnd[0]));
+			ce->cap_amb = xptr_pull_s(&m, CR_CAP_SIZE * sizeof(ce->cap_amb[0]));
 
 			if (arch_alloc_thread_info(core)) {
 				xfree(core);
diff --git a/images/creds.proto b/images/creds.proto
index 220ed3858..932a40ccf 100644
--- a/images/creds.proto
+++ b/images/creds.proto
@@ -25,4 +25,6 @@ message creds_entry {
 	optional string lsm_sockcreate = 16;
 	optional bytes	apparmor_data	= 17;
 	optional uint32	no_new_privs	= 18;
+
+	repeated uint32 cap_amb = 19;
 }

From 260c08418bf5540477b55b485ddcf9c86652cb62 Mon Sep 17 00:00:00 2001
From: Liu Chao <liuchao173@huawei.com>
Date: Fri, 3 Jan 2025 03:33:27 +0000
Subject: [PATCH 1610/1854] zdtm: Check CapAmb is restored correctly after C/R

This test sets CapAmb according to CapPrm and CapInh and check CapAmb
after C/R.

Signed-off-by: Liu Chao <liuchao173@huawei.com>
---
 test/zdtm/static/Makefile    |   1 +
 test/zdtm/static/caps01.c    | 168 +++++++++++++++++++++++++++++++++++
 test/zdtm/static/caps01.desc |   1 +
 3 files changed, 170 insertions(+)
 create mode 100644 test/zdtm/static/caps01.c
 create mode 100644 test/zdtm/static/caps01.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 71a1b6a53..78f96430e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -8,6 +8,7 @@ TST_NOFILE	:=				\
 		sleeping00			\
 		pid00				\
 		caps00				\
+		caps01				\
 		wait00				\
 		zombie00			\
 		zombie01			\
diff --git a/test/zdtm/static/caps01.c b/test/zdtm/static/caps01.c
new file mode 100644
index 000000000..0f8a7101e
--- /dev/null
+++ b/test/zdtm/static/caps01.c
@@ -0,0 +1,168 @@
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/prctl.h>
+#include <linux/capability.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check that CapAmb are preserved";
+const char *test_author = "Liu Chao <liuchao173@huawei.com>";
+
+struct cap_hdr {
+	unsigned int version;
+	int pid;
+};
+
+struct cap_data {
+	unsigned int eff;
+	unsigned int prm;
+	unsigned int inh;
+};
+
+#define _LINUX_CAPABILITY_VERSION_3 0x20080522
+#define _LINUX_CAPABILITY_U32S_3    2
+#define CAP_DAC_OVERRIDE	    1
+#define PR_CAP_AMBIENT		    47
+#define PR_CAP_AMBIENT_IS_SET	    1
+#define PR_CAP_AMBIENT_RAISE	    2
+#define PR_CAP_AMBIENT_LOWER	    3
+
+int capget(struct cap_hdr *hdrp, struct cap_data *datap);
+int capset(struct cap_hdr *hdrp, const struct cap_data *datap);
+
+static int cap_last_cap = 63;
+
+int main(int argc, char **argv)
+{
+	task_waiter_t t;
+	int pid, result_pipe[2];
+	unsigned int amb[_LINUX_CAPABILITY_U32S_3];
+	unsigned int amb_2[_LINUX_CAPABILITY_U32S_3];
+	char res = 'x';
+	FILE *f;
+
+	test_init(argc, argv);
+	task_waiter_init(&t);
+
+	f = fopen("/proc/sys/kernel/cap_last_cap", "r");
+	if (f) {
+		if (fscanf(f, "%d", &cap_last_cap) != 1) {
+			pr_perror("Unable to read cal_last_cap");
+			fclose(f);
+			return 1;
+		}
+		fclose(f);
+	} else
+		test_msg("/proc/sys/kernel/cap_last_cap is not available\n");
+
+	if (pipe(result_pipe)) {
+		pr_perror("Can't create pipe");
+		return 1;
+	}
+
+	pid = test_fork();
+	if (pid == 0) {
+		int b, i, ret;
+		struct cap_hdr hdr;
+		struct cap_data data[_LINUX_CAPABILITY_U32S_3];
+
+		hdr.version = _LINUX_CAPABILITY_VERSION_3;
+		hdr.pid = 0;
+
+		if (capget(&hdr, data) < 0) {
+			pr_perror("capget");
+			return -1;
+		}
+
+		hdr.version = _LINUX_CAPABILITY_VERSION_3;
+		hdr.pid = 0;
+
+		data[0].eff &= ~((1 << CAP_CHOWN) | (1 << CAP_DAC_OVERRIDE));
+		data[0].prm &= ~(1 << CAP_DAC_OVERRIDE);
+		data[0].inh = data[0].prm;
+		data[1].inh = data[1].prm;
+
+		if (capset(&hdr, data) < 0) {
+			pr_perror("capset");
+			return -1;
+		}
+
+		for (b = 0; b < _LINUX_CAPABILITY_U32S_3; b++) {
+			amb[b] = data[b].prm;
+			for (i = 0; i < 32; i++) {
+				if (b * 32 + i > cap_last_cap)
+					break;
+				if ((amb[b] & (1 << i)) > 0)
+					ret = prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i + b * 32, 0, 0);
+				else
+					ret = prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, i + b * 32, 0, 0);
+				if (ret) {
+					pr_perror("Unable to set ambient capability %d to %d: %d", i + b * 32, amb[b] & (1 << i), ret);
+					return -1;
+				}
+			}
+		}
+
+		task_waiter_complete_current(&t);
+		task_waiter_wait4(&t, getppid());
+
+		for (b = 0; b < _LINUX_CAPABILITY_U32S_3; b++) {
+			amb_2[b] = 0;
+			for (i = 0; i < 32; i++) {
+				if (b * 32 + i > cap_last_cap)
+					break;
+				ret = prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_IS_SET, i + b * 32, 0, 0);
+				if (ret < 0) {
+					pr_perror("Unable to read ambient capability %d: %d", i + b * 32, ret);
+					goto bad;
+				}
+
+				amb_2[b] |= (ret << i);
+			}
+		}
+
+		for (b = 0; b < _LINUX_CAPABILITY_U32S_3; b++) {
+			if (amb[b] != amb_2[b]) {
+				res = '1';
+				goto bad;
+			}
+		}
+
+		res = '0';
+	bad:
+		write(result_pipe[1], &res, 1);
+
+		if (res != '0') {
+			write(result_pipe[1], amb, sizeof(amb));
+			write(result_pipe[1], amb_2, sizeof(amb_2));
+		}
+
+		close(result_pipe[0]);
+		close(result_pipe[1]);
+		_exit(0);
+	}
+
+	task_waiter_wait4(&t, pid);
+
+	test_daemon();
+	test_waitsig();
+
+	task_waiter_complete_current(&t);
+
+	read(result_pipe[0], &res, 1);
+
+	if (res == '0')
+		pass();
+	else {
+		read(result_pipe[0], amb, sizeof(amb));
+		read(result_pipe[0], amb_2, sizeof(amb_2));
+		test_msg("amb[]=%08x, %08x\n", amb[0], amb[1]);
+		test_msg("amb[]=%08x, %08x\n", amb_2[0], amb_2[1]);
+		fail("Fail: %c", res);
+	}
+	close(result_pipe[0]);
+	close(result_pipe[1]);
+
+	return 0;
+}
diff --git a/test/zdtm/static/caps01.desc b/test/zdtm/static/caps01.desc
new file mode 100644
index 000000000..2eac7e654
--- /dev/null
+++ b/test/zdtm/static/caps01.desc
@@ -0,0 +1 @@
+{'flags': 'suid'}

From 6dce80c533df445c7926e952387edd59209ff3ee Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 16 Jan 2025 07:52:42 +0000
Subject: [PATCH 1611/1854] util: added cleanup_file attribute.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/include/util.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/criu/include/util.h b/criu/include/util.h
index ae293a68c..4793f7f20 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -406,6 +406,14 @@ static inline void cleanup_freep(void *p)
 	free(*pp);
 }
 
+#define cleanup_file __attribute__((cleanup(cleanup_filep)))
+static inline void cleanup_filep(FILE **f)
+{
+	FILE *file = *f;
+	if (file)
+		(void)fclose(file);
+}
+
 extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args);
 
 /*

From 97398068b16fd24e244deeb6f8b0b52061b46bbd Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 17 Dec 2024 08:52:46 +0100
Subject: [PATCH 1612/1854] net: redirect nftables stdout and stderr to CRIU's
 log file

When using the nftables network locking backend and restoring a process
a second time the network locking has already been deleted by the first
restore. The second restore will print out to the console text like:

Error: Could not process rule: No such file or directory
delete table inet CRIU-202621

With this change CRIU's log FD is used by libnftables stdout and stderr.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/net.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/criu/net.c b/criu/net.c
index eee331108..efd52db32 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3066,9 +3066,43 @@ err:
 	return ret;
 }
 
+#if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+static inline FILE *redirect_nftables_output(struct nft_ctx *nft)
+{
+	FILE *fp;
+	int fd;
+
+	fd = dup(log_get_fd());
+	if (fd < 0) {
+		pr_perror("dup() to redirect nftables output failed");
+		return NULL;
+	}
+
+	fp = fdopen(fd, "w");
+	if (!fp) {
+		pr_perror("fdopen() to redirect nftables output failed");
+		return NULL;
+	}
+
+	/**
+	 * Without setvbuf() the output from libnftables will be
+	 * somewhere in the log file, probably at the end.
+	 * With setvbuf() potential output will be at the correct
+	 * position.
+	 */
+	setvbuf(fp, NULL, _IONBF, 0);
+
+	nft_ctx_set_output(nft, fp);
+	nft_ctx_set_error(nft, fp);
+
+	return fp;
+}
+#endif
+
 static inline int nftables_lock_network_internal(void)
 {
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
+	cleanup_file FILE *fp = NULL;
 	struct nft_ctx *nft;
 	int ret = 0;
 	char table[32];
@@ -3081,6 +3115,10 @@ static inline int nftables_lock_network_internal(void)
 	if (!nft)
 		return -1;
 
+	fp = redirect_nftables_output(nft);
+	if (!fp)
+		goto out;
+
 	snprintf(buf, sizeof(buf), "create table %s", table);
 	if (NFT_RUN_CMD(nft, buf))
 		goto err2;
@@ -3168,6 +3206,7 @@ static inline int nftables_network_unlock(void)
 {
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 	int ret = 0;
+	cleanup_file FILE *fp = NULL;
 	struct nft_ctx *nft;
 	char table[32];
 	char buf[128];
@@ -3179,6 +3218,10 @@ static inline int nftables_network_unlock(void)
 	if (!nft)
 		return -1;
 
+	fp = redirect_nftables_output(nft);
+	if (!fp)
+		return -1;
+
 	snprintf(buf, sizeof(buf), "delete table %s", table);
 	if (NFT_RUN_CMD(nft, buf))
 		ret = -1;

From 6fdac508186fd645cc0a05a8bf82ea17e4662eb9 Mon Sep 17 00:00:00 2001
From: Yuanhong Peng <yummypeng@linux.alibaba.com>
Date: Thu, 19 Dec 2024 14:30:41 +0800
Subject: [PATCH 1613/1854] seize: Adjust the position of the log message

Based on the code, the `ret` variable at this point does not
represent the task state, so this log message should be
moved to a position after the `compel_wait_task()` function.

Signed-off-by: Yuanhong Peng <yummypeng@linux.alibaba.com>
---
 criu/seize.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index 829d7c278..007e8e580 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -707,8 +707,6 @@ static int collect_children(struct pstree_item *item)
 			goto free;
 		}
 
-		pr_info("Seized task %d, state %d\n", pid, ret);
-
 		c = alloc_pstree_item();
 		if (c == NULL) {
 			ret = -1;
@@ -746,6 +744,8 @@ static int collect_children(struct pstree_item *item)
 		if (ret == TASK_STOPPED)
 			c->pid->stop_signo = compel_parse_stop_signo(pid);
 
+		pr_info("Seized task %d, state %d\n", pid, ret);
+
 		c->pid->real = pid;
 		c->parent = item;
 		c->pid->state = ret;

From 2b74924805730c10d4fea7f6e332c3f09167c628 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 21 Jan 2025 15:05:42 +0100
Subject: [PATCH 1614/1854] files-reg: fix buffer overflow on aarch64

Running the zdtm/static/unlink_regular00 test on Ubuntu 24.04 on aarch64
results in following error:

    # ./zdtm.py run -t zdtm/static/unlink_regular00 -k always
    userns is supported
    === Run 1/1 ================ zdtm/static/unlink_regular00
    ==================== Run zdtm/static/unlink_regular00 in ns ====================
    Skipping rtc at root
    Start test
    Test is SUID
    ./unlink_regular00 --pidfile=unlink_regular00.pid --outfile=unlink_regular00.out --dirname=unlink_regular00.test
    Run criu dump
    *** buffer overflow detected ***: terminated
    ############# Test zdtm/static/unlink_regular00 FAIL at CRIU dump ##############
    Test output: ================================

     <<< ================================
    Send the 9 signal to  47
    Wait for zdtm/static/unlink_regular00(47) to die for 0.100000
    ##################################### FAIL #####################################

According to the backtrace:

    #0  __pthread_kill_implementation (threadid=281473158467616, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44
    #1  0x0000ffff93477690 in __pthread_kill_internal (signo=6, threadid=<optimized out>) at ./nptl/pthread_kill.c:78
    #2  0x0000ffff9342cb3c in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26
    #3  0x0000ffff93417e00 in __GI_abort () at ./stdlib/abort.c:79
    #4  0x0000ffff9346abf0 in __libc_message_impl (fmt=fmt@entry=0xffff93552a78 "*** %s ***: terminated\n") at ../sysdeps/posix/libc_fatal.c:132
    #5  0x0000ffff934e81a8 in __GI___fortify_fail (msg=msg@entry=0xffff93552a28 "buffer overflow detected") at ./debug/fortify_fail.c:24
    #6  0x0000ffff934e79e4 in __GI___chk_fail () at ./debug/chk_fail.c:28
    #7  0x0000ffff934e9070 in ___snprintf_chk (s=s@entry=0xffffc6ed04a3 "testfile", maxlen=maxlen@entry=4056, flag=flag@entry=2, slen=slen@entry=4053,
        format=format@entry=0xaaaacffe3888 "link_remap.%d") at ./debug/snprintf_chk.c:29
    #8  0x0000aaaacff4b8b8 in snprintf (__fmt=0xaaaacffe3888 "link_remap.%d", __n=4056, __s=0xffffc6ed04a3 "testfile")
        at /usr/include/aarch64-linux-gnu/bits/stdio2.h:54
    #9  create_link_remap (path=path@entry=0xffffc6ed2901 "/zdtm/static/unlink_regular00.test/subdir/testfile", len=len@entry=60, lfd=lfd@entry=20,
        idp=idp@entry=0xffffc6ed14ec, nsid=nsid@entry=0xaaaada2bac00, parms=parms@entry=0xffffc6ed2808, fallback=0xaaaacff4c6c0 <dump_linked_remap+96>,
        fallback@entry=0xffffc6ed2797) at criu/files-reg.c:1164
    #10 0x0000aaaacff4c6c0 in dump_linked_remap (path=path@entry=0xffffc6ed2901 "/zdtm/static/unlink_regular00.test/subdir/testfile", len=len@entry=60,
        parms=parms@entry=0xffffc6ed2808, lfd=lfd@entry=20, id=id@entry=12, nsid=nsid@entry=0xaaaada2bac00, fallback=fallback@entry=0xffffc6ed2797)
        at criu/files-reg.c:1198
    #11 0x0000aaaacff4d8b0 in check_path_remap (nsid=0xaaaada2bac00, id=12, lfd=20, parms=0xffffc6ed2808, link=<optimized out>) at criu/files-reg.c:1426
    #12 dump_one_reg_file (lfd=20, id=12, p=0xffffc6ed2808) at criu/files-reg.c:1827
    #13 0x0000aaaacff51078 in dump_one_file (pid=<optimized out>, fd=4, lfd=20, opts=opts@entry=0xaaaada2ba2c0, ctl=ctl@entry=0xaaaada2c4d50,
        e=e@entry=0xffffc6ed39c8, dfds=dfds@entry=0xaaaada2c3d40) at criu/files.c:581
    #14 0x0000aaaacff5176c in dump_task_files_seized (ctl=ctl@entry=0xaaaada2c4d50, item=item@entry=0xaaaada2b8f80, dfds=dfds@entry=0xaaaada2c3d40)
        at criu/files.c:657
    #15 0x0000aaaacff3d3c0 in dump_one_task (parent_ie=0x0, item=0xaaaada2b8f80) at criu/cr-dump.c:1679
    #16 cr_dump_tasks (pid=<optimized out>) at criu/cr-dump.c:2224
    #17 0x0000aaaacff163a0 in main (argc=<optimized out>, argv=0xffffc6ed40e8, envp=<optimized out>) at criu/crtools.c:293

This line is the problem:

    snprintf(tmp + 1, sizeof(link_name) - (size_t)(tmp - link_name - 1), "link_remap.%d", rfe.id);

The problem was that the `-1` was on the inside of the braces and not on
the outside. This way the destination size was increase by 1 instead of
being decreased by 1 which triggered the buffer overflow detection.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/files-reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/files-reg.c b/criu/files-reg.c
index fc6149350..66c0e6cda 100644
--- a/criu/files-reg.c
+++ b/criu/files-reg.c
@@ -1150,7 +1150,7 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp, struct ns_i
 	rfe.name = link_name + 1;
 
 	/* Any 'unique' name works here actually. Remap works by reg-file ids. */
-	snprintf(tmp + 1, sizeof(link_name) - (size_t)(tmp - link_name - 1), "link_remap.%d", rfe.id);
+	snprintf(tmp + 1, sizeof(link_name) - (size_t)(tmp - link_name) - 1, "link_remap.%d", rfe.id);
 
 	mntns_root = mntns_get_root_fd(nsid);
 

From aad66a4f7c7affb59d4d59823c35849e1b3421f5 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 20 Jan 2025 19:00:16 +0100
Subject: [PATCH 1615/1854] test: fix cmdlinenv00 on aarch64

On aarch64 the test cmdlinenv00 was failing with:

  FAIL: cmdlinenv00.c:120: auxv corrupted on restore (errno = 11 (Resource temporarily unavailable))

Starting with Linux kernel version 6.3 the size of AUXV was changed:

    commit 28c8e088427ad30b4260953f3b6f908972b77c2d
    Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Date:   Wed Jan 4 14:20:54 2023 -0500

        rseq: Increase AT_VECTOR_SIZE_BASE to match rseq auxvec entries

        Two new auxiliary vector entries are introduced for rseq without
        matching increment of the AT_VECTOR_SIZE_BASE, which causes failures
        with CONFIG_HARDENED_USERCOPY=y.

        Fixes: 317c8194e6ae ("rseq: Introduce feature size and alignment ELF auxiliary vector entries")

With this change AT_VECTOR_SIZE increases from 40 to 50 on aarch64. CRIU
uses AT_VECTOR_SIZE to read the content of /proc/PID/auxv

        auxv_t mm_saved_auxv[AT_VECTOR_SIZE];
        ret = read(fd, mm_saved_auxv, sizeof(mm_saved_auxv));

Now the tests works again on aarch64.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/aarch64/include/asm/types.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index 363c1cae2..db118cafd 100644
--- a/criu/arch/aarch64/include/asm/types.h
+++ b/criu/arch/aarch64/include/asm/types.h
@@ -33,7 +33,16 @@ static inline uint64_t encode_pointer(void *p)
 	return (uint64_t)p;
 }
 
-#define AT_VECTOR_SIZE 40
+/**
+ * See also:
+ *   * arch/arm64/include/uapi/asm/auxvec.h
+ *   * include/linux/auxvec.h
+ *   * include/linux/mm_types.h
+ */
+#define AT_VECTOR_SIZE_BASE 22
+#define AT_VECTOR_SIZE_ARCH 2
+#define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
+
 typedef uint64_t auxv_t;
 typedef uint64_t tls_t;
 

From 09dc2e9584b70e345fd12402dc3467a806ceb9e8 Mon Sep 17 00:00:00 2001
From: Austin Kuo <104871462+hckuo@users.noreply.github.com>
Date: Tue, 7 Jan 2025 04:31:05 +0000
Subject: [PATCH 1616/1854] timer: Refine itimer_armed logic and improve timer
 value handling

Right now, CRIU skips timers non-periodic timers. This change addresses
this issue.

Signed-off-by: Austin Kuo <hsuanchikuo@gmail.com>
---
 criu/pie/restorer.c | 2 +-
 criu/timer.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 0a6a7977c..6d048c3f1 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -2226,7 +2226,7 @@ __visible long __export_restore_task(struct task_restore_args *args)
 	 * code below doesn't fail due to bad timing values.
 	 */
 
-#define itimer_armed(args, i) (args->itimers[i].it_interval.tv_sec || args->itimers[i].it_interval.tv_usec)
+#define itimer_armed(args, i) (args->itimers[i].it_value.tv_sec || args->itimers[i].it_value.tv_usec)
 
 	if (itimer_armed(args, 0))
 		sys_setitimer(ITIMER_REAL, &args->itimers[0], NULL);
diff --git a/criu/timer.c b/criu/timer.c
index e94cf0280..0413e2a72 100644
--- a/criu/timer.c
+++ b/criu/timer.c
@@ -16,7 +16,7 @@ static inline int timeval_valid(struct timeval *tv)
 
 static inline int decode_itimer(char *n, ItimerEntry *ie, struct itimerval *val)
 {
-	if (ie->isec == 0 && ie->iusec == 0) {
+	if (ie->isec == 0 && ie->iusec == 0 && ie->vsec == 0 && ie->vusec == 0) {
 		memzero_p(val);
 		return 0;
 	}

From 061f4266e80dbfc00e5ac58d3f1432e8d833b000 Mon Sep 17 00:00:00 2001
From: Austin Kuo <hsuanchikuo@gmail.com>
Date: Tue, 21 Jan 2025 12:04:33 -0800
Subject: [PATCH 1617/1854] test/zdtm: add a new test to check non-periodic
 timers

It creates a few timers with log expiration intervals, waites for C/R
and check that timers are armed and their intervals have been restored.

Signed-off-by: Austin Kuo <hsuanchikuo@gmail.com>
---
 test/zdtm/static/Makefile   |  1 +
 test/zdtm/static/timers01.c | 74 +++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 test/zdtm/static/timers01.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 78f96430e..f72fb2a77 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -24,6 +24,7 @@ TST_NOFILE	:=				\
 		sse20				\
 		mprotect00			\
 		timers				\
+		timers01			\
 		timerfd				\
 		unbound_sock			\
 		sched_prio00			\
diff --git a/test/zdtm/static/timers01.c b/test/zdtm/static/timers01.c
new file mode 100644
index 000000000..10ecc3481
--- /dev/null
+++ b/test/zdtm/static/timers01.c
@@ -0,0 +1,74 @@
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/time.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Checks non-periodic timers\n";
+const char *test_author = "Andrei Vagin <avagin@gmail.com>";
+
+static struct {
+	const int timer_type;
+	const int signal;
+	volatile sig_atomic_t count;
+} timer_tests[] = {
+	/* from slowest to fastest */
+	{ ITIMER_VIRTUAL, SIGVTALRM },
+	{ ITIMER_PROF, SIGPROF },
+	{ ITIMER_REAL, SIGALRM },
+};
+
+#define NUM_TIMERS (sizeof(timer_tests) / sizeof(timer_tests[0]))
+#define TIMER_TIMEOUT 3600
+#define TIMER_ALLOWED_DELTA 300
+
+static void setup_timers(void)
+{
+	int i;
+	struct itimerval tv = {
+		.it_interval = { .tv_sec = 0, .tv_usec = 0 },
+		.it_value = { .tv_sec = TIMER_TIMEOUT, .tv_usec = 0 },
+	};
+
+	for (i = 0; i < NUM_TIMERS; i++) {
+		if (setitimer(timer_tests[i].timer_type, &tv, NULL) < 0) {
+			pr_perror("can't set timer %d", i);
+			exit(1);
+		}
+	}
+}
+
+static void check_timers(void)
+{
+	int i;
+
+	for (i = 0; i < NUM_TIMERS; i++) {
+		struct itimerval tv = {};
+
+		if (getitimer(timer_tests[i].timer_type, &tv)) {
+			pr_perror("gettimer");
+			exit(1);
+		}
+		if (tv.it_value.tv_sec > TIMER_TIMEOUT ||
+		    tv.it_value.tv_sec < TIMER_TIMEOUT - TIMER_ALLOWED_DELTA) {
+			fail("%ld isn't in [%d, %d]", (long)tv.it_value.tv_sec,
+					TIMER_TIMEOUT,
+					TIMER_TIMEOUT - TIMER_ALLOWED_DELTA);
+			exit(1);
+		}
+	}
+	pass();
+}
+
+int main(int argc, char **argv)
+{
+	test_init(argc, argv);
+
+	setup_timers();
+
+	test_daemon();
+	test_waitsig();
+
+	check_timers();
+	return 0;
+}

From 815ef68848ad79642273026e68761e6680c047a1 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 24 Jan 2025 09:27:16 +0100
Subject: [PATCH 1618/1854] ci: two check-commits.yml changes

 * Switch to v4 actions/checkout (from v3)
 * Use our apt wrapper to gracefully handle temporary repository errors

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/check-commits.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml
index be2fbd285..94861ab52 100644
--- a/.github/workflows/check-commits.yml
+++ b/.github/workflows/check-commits.yml
@@ -12,14 +12,14 @@ jobs:
     # Check if pull request does not have label "not-selfcontained-ok"
     if: "!contains(github.event.pull_request.labels.*.name, 'not-selfcontained-ok')"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         # Needed to rebase against the base branch
         fetch-depth: 0
         # Checkout pull request HEAD commit instead of merge commit
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Install dependencies
-      run: sudo apt-get install -y libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev
+      run: sudo scripts/ci/apt-install libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev
     - name: Configure git user details
       run: |
         git config --global user.email "checkpoint-restore@users.noreply.github.com"

From 54795f174b606cbe2c134e7be2094ea53be3559d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 23 Jan 2025 09:26:15 +0000
Subject: [PATCH 1619/1854] criu: use libuuid for criu_run_id generation

criu_run_id will be used in upcoming changes to create and remove
network rules for network locking. Instead of trying to come up with
a way to create unique IDs, just use an existing library.

libuuid should be installed on most systems as it is indirectly required
by systemd (via libmount).

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .cirrus.yml                                     |  2 +-
 .github/workflows/check-commits.yml             |  2 +-
 compel/include/uapi/infect-util.h               | 11 ++++++++++-
 compel/src/lib/infect-util.c                    |  2 +-
 compel/src/lib/infect.c                         |  2 +-
 criu/Makefile.packages                          |  4 +++-
 criu/fdstore.c                                  |  2 +-
 criu/files.c                                    |  2 +-
 criu/include/util.h                             |  4 +++-
 criu/pidfd-store.c                              |  2 +-
 criu/unittest/mock.c                            |  4 +++-
 criu/util.c                                     | 17 +++++++----------
 scripts/build/Dockerfile.alpine                 |  3 ++-
 scripts/build/Dockerfile.amd-rocm               |  1 +
 scripts/build/Dockerfile.archlinux              |  1 +
 scripts/build/Dockerfile.hotspot-alpine         |  1 +
 scripts/build/Dockerfile.hotspot-ubuntu         |  1 +
 scripts/build/Dockerfile.linux32.tmpl           |  1 +
 scripts/build/Dockerfile.openj9-ubuntu          |  1 +
 .../build/Dockerfile.riscv64-stable-cross.tmpl  |  1 +
 scripts/build/Dockerfile.stable-cross.tmpl      |  1 +
 scripts/build/Dockerfile.tmpl                   |  1 +
 scripts/build/Dockerfile.unstable-cross.tmpl    |  1 +
 scripts/ci/prepare-for-fedora-rawhide.sh        |  1 +
 scripts/ci/run-ci-tests.sh                      |  2 +-
 scripts/ci/vagrant.sh                           |  2 +-
 26 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 5e30ca2c2..a4b53a54b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -36,7 +36,7 @@ task:
     ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata xmlto libdrm-devel
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata xmlto libdrm-devel libuuid-devel
     # The image has a too old version of nettle which does not work with gnutls.
     # Just upgrade to the latest to make the error go away.
     dnf -y upgrade nettle nettle-devel
diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml
index 94861ab52..354873909 100644
--- a/.github/workflows/check-commits.yml
+++ b/.github/workflows/check-commits.yml
@@ -19,7 +19,7 @@ jobs:
         # Checkout pull request HEAD commit instead of merge commit
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Install dependencies
-      run: sudo scripts/ci/apt-install libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev
+      run: sudo scripts/ci/apt-install libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev uuid-dev
     - name: Configure git user details
       run: |
         git config --global user.email "checkpoint-restore@users.noreply.github.com"
diff --git a/compel/include/uapi/infect-util.h b/compel/include/uapi/infect-util.h
index ace6f6b6b..658df9393 100644
--- a/compel/include/uapi/infect-util.h
+++ b/compel/include/uapi/infect-util.h
@@ -3,11 +3,20 @@
 
 #include "common/compiler.h"
 
+/**
+ * The length of the hash is based on what libuuid provides.
+ * According to the manpage this is:
+ *
+ * The uuid_unparse() function converts the supplied UUID uu from the binary
+ * representation into a 36-byte string (plus trailing '\0')
+ */
+#define RUN_ID_HASH_LENGTH 37
+
 /*
  * compel_run_id is a unique value of the current run. It can be used to
  * generate resource ID-s to avoid conflicts with other processes.
  */
-extern uint64_t compel_run_id;
+extern char compel_run_id[RUN_ID_HASH_LENGTH];
 
 struct parasite_ctl;
 extern int __must_check compel_util_send_fd(struct parasite_ctl *ctl, int fd);
diff --git a/compel/src/lib/infect-util.c b/compel/src/lib/infect-util.c
index 00a7c83f7..dc57e28f7 100644
--- a/compel/src/lib/infect-util.c
+++ b/compel/src/lib/infect-util.c
@@ -7,7 +7,7 @@
 #include "infect-rpc.h"
 #include "infect-util.h"
 
-uint64_t compel_run_id;
+char compel_run_id[RUN_ID_HASH_LENGTH];
 
 int compel_util_send_fd(struct parasite_ctl *ctl, int fd)
 {
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 1e3ffb967..caf54e03f 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -427,7 +427,7 @@ static int gen_parasite_saddr(struct sockaddr_un *saddr, int key)
 	int sun_len;
 
 	saddr->sun_family = AF_UNIX;
-	snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d-%" PRIx64, key, compel_run_id);
+	snprintf(saddr->sun_path, UNIX_PATH_MAX, "X/crtools-pr-%d-%s", key, compel_run_id);
 
 	sun_len = SUN_LEN(saddr);
 	*saddr->sun_path = '\0';
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
index 7f6113c8f..3e2e6efd1 100644
--- a/criu/Makefile.packages
+++ b/criu/Makefile.packages
@@ -6,6 +6,7 @@ REQ-RPM-PKG-NAMES	+= protobuf-devel
 REQ-RPM-PKG-NAMES	+= protobuf-python
 REQ-RPM-PKG-NAMES	+= libnl3-devel
 REQ-RPM-PKG-NAMES	+= libcap-devel
+REQ-RPM-PKG-NAMES	+= libuuid-devel
 
 REQ-RPM-PKG-TEST-NAMES  += libaio-devel
 
@@ -16,6 +17,7 @@ REQ-DEB-PKG-NAMES	+= protobuf-compiler
 REQ-DEB-PKG-NAMES	+= $(PYTHON)-protobuf
 REQ-DEB-PKG-NAMES	+= libnl-3-dev
 REQ-DEB-PKG-NAMES	+= libcap-dev
+REQ-DEB-PKG-NAMES	+= uuid-dev
 
 REQ-DEB-PKG-TEST-NAMES	+= $(PYTHON)-yaml
 REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
@@ -25,7 +27,7 @@ REQ-DEB-PKG-TEST-NAMES	+= libaio-dev
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-PyYAML
 
 
-export LIBS		+= -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet
+export LIBS		+= -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet -luuid
 
 check-packages-failed:
 	$(warning Can not find some of the required libraries)
diff --git a/criu/fdstore.c b/criu/fdstore.c
index d615ad15d..6ac639c55 100644
--- a/criu/fdstore.c
+++ b/criu/fdstore.c
@@ -58,7 +58,7 @@ int fdstore_init(void)
 	}
 
 	addr.sun_family = AF_UNIX;
-	addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64 "-%" PRIx64, st.st_ino,
+	addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-fdstore-%" PRIx64 "-%s", st.st_ino,
 			   criu_run_id);
 	addrlen += sizeof(addr.sun_family);
 
diff --git a/criu/files.c b/criu/files.c
index 31e705bcc..f16ec32a2 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -978,7 +978,7 @@ static int receive_fd(struct fdinfo_list_entry *fle);
 static void transport_name_gen(struct sockaddr_un *addr, int *len, int pid)
 {
 	addr->sun_family = AF_UNIX;
-	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/crtools-fd-%d-%" PRIx64, pid, criu_run_id);
+	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/crtools-fd-%d-%s", pid, criu_run_id);
 	*len = SUN_LEN(addr);
 	*addr->sun_path = '\0';
 }
diff --git a/criu/include/util.h b/criu/include/util.h
index 4793f7f20..194e94dee 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -21,6 +21,8 @@
 #include "log.h"
 #include "common/err.h"
 
+#include "compel/infect-util.h"
+
 #define PREF_SHIFT_OP(pref, op, size) ((size)op(pref##BYTES_SHIFT))
 #define KBYTES_SHIFT		      10
 #define MBYTES_SHIFT		      20
@@ -420,7 +422,7 @@ extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void
  * criu_run_id is a unique value of the current run. It can be used to
  * generate resource ID-s to avoid conflicts with other CRIU processes.
  */
-extern uint64_t criu_run_id;
+extern char criu_run_id[RUN_ID_HASH_LENGTH];
 extern void util_init(void);
 
 extern char *resolve_mountpoint(char *path);
diff --git a/criu/pidfd-store.c b/criu/pidfd-store.c
index 9fdc74cb7..110f7802a 100644
--- a/criu/pidfd-store.c
+++ b/criu/pidfd-store.c
@@ -99,7 +99,7 @@ int init_pidfd_store_sk(pid_t pid, int sk)
 			goto err;
 		}
 
-		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d-%" PRIx64, pid, sk,
+		addrlen = snprintf(addr.sun_path, sizeof(addr.sun_path), "X/criu-pidfd-store-%d-%d-%s", pid, sk,
 				   criu_run_id);
 		addrlen += sizeof(addr.sun_family);
 
diff --git a/criu/unittest/mock.c b/criu/unittest/mock.c
index e517720e4..b2d507278 100644
--- a/criu/unittest/mock.c
+++ b/criu/unittest/mock.c
@@ -5,6 +5,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#include "compel/infect-util.h"
+
 int add_external(char *key)
 {
 	return 0;
@@ -141,4 +143,4 @@ int check_mount_v2(void)
 	return 0;
 }
 
-uint64_t compel_run_id;
+char compel_run_id[RUN_ID_HASH_LENGTH];
diff --git a/criu/util.c b/criu/util.c
index d2bc9a865..58c18e20b 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -28,6 +28,7 @@
 #include <ftw.h>
 #include <time.h>
 #include <libgen.h>
+#include <uuid/uuid.h>
 
 #include "linux/mount.h"
 
@@ -2026,20 +2027,16 @@ int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void *args)
 	return fret;
 }
 
-uint64_t criu_run_id;
+char criu_run_id[RUN_ID_HASH_LENGTH];
 
 void util_init(void)
 {
-	struct stat statbuf;
+	uuid_t uuid;
 
-	criu_run_id = getpid();
-	if (!stat("/proc/self/ns/pid", &statbuf))
-		criu_run_id |= (uint64_t)statbuf.st_ino << 32;
-	else if (errno != ENOENT)
-		pr_perror("Can't stat /proc/self/ns/pid - CRIU run id might not be unique");
-
-	compel_run_id = criu_run_id;
-	pr_info("CRIU run id = %#" PRIx64 "\n", criu_run_id);
+	uuid_generate(uuid);
+	uuid_unparse(uuid, criu_run_id);
+	pr_info("CRIU run id = %s\n", criu_run_id);
+	memcpy(compel_run_id, criu_run_id, sizeof(criu_run_id));
 }
 
 /*
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 329d7791d..d843793ea 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -24,7 +24,8 @@ RUN apk update && apk add \
 	sudo \
 	libcap-utils \
 	libdrm-dev \
-	util-linux
+	util-linux \
+	util-linux-dev
 
 COPY . /criu
 WORKDIR /criu
diff --git a/scripts/build/Dockerfile.amd-rocm b/scripts/build/Dockerfile.amd-rocm
index c466a73d2..ed66ae4fe 100644
--- a/scripts/build/Dockerfile.amd-rocm
+++ b/scripts/build/Dockerfile.amd-rocm
@@ -56,6 +56,7 @@ RUN apt-get clean -qqy && apt-get update -qqy && apt-get install -qqy --no-insta
 	python-protobuf \
 	python3-minimal \
 	python-ipaddress \
+	uuid-dev \
 	curl \
 	wget \
 	vim \
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index 405651489..9d11194bb 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -35,6 +35,7 @@ RUN pacman -Syu --noconfirm \
 	python-junit-xml \
 	python-importlib-metadata \
 	libdrm \
+	util-linux-libs \
 	diffutils
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.hotspot-alpine b/scripts/build/Dockerfile.hotspot-alpine
index cb9332fd0..6caf9d0b1 100644
--- a/scripts/build/Dockerfile.hotspot-alpine
+++ b/scripts/build/Dockerfile.hotspot-alpine
@@ -19,6 +19,7 @@ RUN apk update && apk add \
 	maven \
 	ip6tables \
 	iptables \
+	util-linux-dev \
 	bash
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.hotspot-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu
index 0318f650f..67de916ac 100644
--- a/scripts/build/Dockerfile.hotspot-ubuntu
+++ b/scripts/build/Dockerfile.hotspot-ubuntu
@@ -22,6 +22,7 @@ RUN apt-install protobuf-c-compiler \
 	pkg-config \
 	iptables \
 	gcc \
+	uuid-dev \
 	maven
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index 13e992642..d218e0641 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -21,6 +21,7 @@ RUN apt-install \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
+	uuid-dev \
 	python3-minimal
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index e190c2792..0ae4727d2 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -22,6 +22,7 @@ RUN apt-install protobuf-c-compiler \
 	pkg-config \
 	iptables \
 	gcc \
+	uuid-dev \
 	maven
 
 RUN mkdir -p /etc/criu && echo 'ghost-limit 16777216' > /etc/criu/default.conf
diff --git a/scripts/build/Dockerfile.riscv64-stable-cross.tmpl b/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
index 39a0c33c6..e95a43306 100644
--- a/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
+++ b/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
@@ -33,6 +33,7 @@ RUN apt-get install -y --no-install-recommends \
 	libprotobuf-c-dev:${DEBIAN_ARCH}	\
 	libcap-dev:${DEBIAN_ARCH}		\
 	libaio-dev:${DEBIAN_ARCH}		\
+	uuid-dev:${DEBIAN_ARCH}			\
 	libnl-route-3-dev:${DEBIAN_ARCH}	\
 	libnftables-dev:${DEBIAN_ARCH}	\
 	libgnutls28-dev:${DEBIAN_ARCH}	\
diff --git a/scripts/build/Dockerfile.stable-cross.tmpl b/scripts/build/Dockerfile.stable-cross.tmpl
index 078372c38..65ae55833 100644
--- a/scripts/build/Dockerfile.stable-cross.tmpl
+++ b/scripts/build/Dockerfile.stable-cross.tmpl
@@ -18,6 +18,7 @@ RUN apt-install \
 	libnl-3-dev:${DEBIAN_ARCH}		\
 	libprotobuf-dev:${DEBIAN_ARCH}		\
 	libnet-dev:${DEBIAN_ARCH}		\
+	uuid-dev:${DEBIAN_ARCH}			\
 	libprotobuf-c-dev:${DEBIAN_ARCH}	\
 	libcap-dev:${DEBIAN_ARCH}		\
 	libaio-dev:${DEBIAN_ARCH}		\
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 9b53a76aa..3d6de1044 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -29,6 +29,7 @@ RUN apt-install \
 	protobuf-compiler \
 	python3-minimal \
 	python3-protobuf \
+	uuid-dev \
 	python3-yaml
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.unstable-cross.tmpl b/scripts/build/Dockerfile.unstable-cross.tmpl
index dacfd96ef..3504b0433 100644
--- a/scripts/build/Dockerfile.unstable-cross.tmpl
+++ b/scripts/build/Dockerfile.unstable-cross.tmpl
@@ -17,6 +17,7 @@ RUN apt-install \
 	python3-protobuf			\
 	libnl-3-dev:${DEBIAN_ARCH}		\
 	libprotobuf-dev:${DEBIAN_ARCH}		\
+	uuid-dev:${DEBIAN_ARCH}			\
 	libnet-dev:${DEBIAN_ARCH}		\
 	libprotobuf-c-dev:${DEBIAN_ARCH}	\
 	libcap-dev:${DEBIAN_ARCH}		\
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index 09085c403..42252c93c 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -36,6 +36,7 @@ dnf install -y \
 	e2fsprogs \
 	rubygem-asciidoctor \
 	libdrm-devel \
+	libuuid-devel \
 	kmod
 
 # /tmp is no longer 755 in the rawhide container image and breaks CI - fix it
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index b472e954c..611ff7803 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -4,7 +4,7 @@ set -x -e
 CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
-		libnl-route-3-dev time libbsd-dev python3-yaml
+		libnl-route-3-dev time libbsd-dev python3-yaml uuid-dev
 		libperl-dev pkg-config python3-protobuf python3-pip
 		python3-importlib-metadata python3-junit.xml libdrm-dev)
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 3904c51d2..ed5a01178 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -39,7 +39,7 @@ setup() {
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
 		protobuf-devel python3-protobuf python3-importlib-metadata python3-junit_xml \
-		rubygem-asciidoctor iptables libselinux-devel libbpf-devel python3-yaml
+		rubygem-asciidoctor iptables libselinux-devel libbpf-devel python3-yaml libuuid-devel
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
 	ssh default cat /proc/cmdline

From f83931542afc3eff5bc02344a522bb8662425d4f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 23 Jan 2025 17:42:45 +0000
Subject: [PATCH 1620/1854] net: remember the name of the lock chain (nftables)

Using libnftables the chain to lock the network is composed of
("CRIU-%d", real_pid). This leads to around 40 zdtm tests failing
with errors like this:

Error: No such file or directory; did you mean table 'CRIU-62' in family inet?
delete table inet CRIU-86

The reason is that as soon as a process is running in a namespace the
real PID can be anything and only the PID in the namespace is restored
correctly. Relying on the real PID does not work for the chain name.

Using the PID of the innermost namespace would lead to the chain be
called 'CRIU-1' most of the time which is also not really unique.

With this commit the change is now named using the already existing CRIU
run ID. To be able to correctly restore the process and delete the
locking table, the CRIU run id during checkpointing is now stored in the
inventory as dump_criu_run_id.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/image.c           | 30 ++++++++++++++++++++++++++++++
 criu/include/util.h    |  2 ++
 criu/netfilter.c       | 20 +++++++++++++++++++-
 images/inventory.proto |  4 ++++
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/criu/image.c b/criu/image.c
index 9589167fb..f3747d6ff 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -25,6 +25,7 @@ bool img_common_magic = true;
 TaskKobjIdsEntry *root_ids;
 u32 root_cg_set;
 Lsmtype image_lsm;
+char dump_criu_run_id[RUN_ID_HASH_LENGTH];
 
 struct inventory_plugin {
 	struct list_head node;
@@ -120,6 +121,24 @@ int check_img_inventory(bool restore)
 					goto out_err;
 			}
 		}
+
+		/**
+		 * This contains the criu_run_id during dumping of the process.
+		 * For things like removing network locking (nftables) this
+		 * information is needed to identify the name of the network
+		 * locking table.
+		 */
+		if (he->dump_criu_run_id) {
+			strncpy(dump_criu_run_id, he->dump_criu_run_id, sizeof(dump_criu_run_id) - 1);
+			pr_info("Dump CRIU run id = %s\n", dump_criu_run_id);
+		} else {
+			/**
+			 * If restoring from an old image this is a marker
+			 * that no dump_criu_run_id exists.
+			 */
+			dump_criu_run_id[0] = NO_DUMP_CRIU_RUN_ID;
+		}
+
 	}
 
 	ret = 0;
@@ -367,6 +386,17 @@ int prepare_inventory(InventoryEntry *he)
 	he->has_network_lock_method = true;
 	he->network_lock_method = opts.network_lock_method;
 
+	/**
+	 * This contains the criu_run_id during dumping of the process.
+	 * For things like removing network locking (nftables) this
+	 * information is needed to identify the name of the network
+	 * locking table.
+	 */
+	he->dump_criu_run_id = xstrdup(criu_run_id);
+
+	if (!he->dump_criu_run_id)
+		return -1;
+
 	return 0;
 }
 
diff --git a/criu/include/util.h b/criu/include/util.h
index 194e94dee..55ad5b63c 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -424,6 +424,8 @@ extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *), void
  */
 extern char criu_run_id[RUN_ID_HASH_LENGTH];
 extern void util_init(void);
+#define NO_DUMP_CRIU_RUN_ID 0x7f
+extern char dump_criu_run_id[RUN_ID_HASH_LENGTH];
 
 extern char *resolve_mountpoint(char *path);
 
diff --git a/criu/netfilter.c b/criu/netfilter.c
index 9e78dc4b0..e2c82764f 100644
--- a/criu/netfilter.c
+++ b/criu/netfilter.c
@@ -299,7 +299,25 @@ int nftables_lock_connection(struct inet_sk_desc *sk)
 
 int nftables_get_table(char *table, int n)
 {
-	if (snprintf(table, n, "inet CRIU-%d", root_item->pid->real) < 0) {
+	int ret;
+
+	switch(dump_criu_run_id[0]) {
+	case 0:
+		/* This is not a restore.*/
+		ret = snprintf(table, n, "inet CRIU-%s", criu_run_id);
+		break;
+	case NO_DUMP_CRIU_RUN_ID:
+		/**
+		 * This is a restore from an older image with no
+		 * dump_criu_run_id available. Let's use the old ID.
+		 */
+		ret = snprintf(table, n, "inet CRIU-%d", root_item->pid->real);
+		break;
+	default:
+		ret = snprintf(table, n, "inet CRIU-%s", dump_criu_run_id);
+	}
+
+	if (ret < 0) {
 		pr_err("Cannot generate CRIU's nftables table name\n");
 		return -1;
 	}
diff --git a/images/inventory.proto b/images/inventory.proto
index 7f655031b..1e18815bb 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -29,4 +29,8 @@ message inventory_entry {
 	optional bool			tcp_close	= 10;
 	optional uint32			network_lock_method	= 11;
 	optional plugins_entry		plugins_entry = 12;
+	// Remember the criu_run_id when CRIU dumped the process.
+	// This is currently used to delete the correct nftables
+	// network locking rule.
+	optional string                 dump_criu_run_id        = 13;
 }

From 02056bf41aaef1522a6d9fae18cd45c3f119ca83 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 14 Dec 2024 21:14:58 +0000
Subject: [PATCH 1621/1854] cuda: prevent task lockup on timeout error

When creating a checkpoint of large models, the `checkpoint` action of
`cuda-checkpoint` can exceed the CRIU timeout. This causes CRIU to fail
with the following error, leaving the CUDA task in a locked state:

	cuda_plugin: Checkpointing CUDA devices on pid 84145 restore_tid 84202
	Error (criu/cr-dump.c:1791): Timeout reached. Try to interrupt: 0
	Error (cuda_plugin.c:139): cuda_plugin: Unable to read output of cuda-checkpoint: Interrupted system call
	Error (cuda_plugin.c:396): cuda_plugin: CHECKPOINT_DEVICES failed with
	net: Unlock network
	cuda_plugin: finished cuda_plugin stage 0 err -1
	cuda_plugin: resuming devices on pid 84145
	cuda_plugin: Restore thread pid 84202 found for real pid 84145
	Unfreezing tasks into 1
		Unseizing 84145 into 1
	Error (criu/cr-dump.c:2111): Dumping FAILED.

To fix this, we set `task_info->checkpointed` before invoking
the `checkpoint` action to ensure that the CUDA task is resumed
even if CRIU times out.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index e78828b18..976ce824c 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -391,14 +391,14 @@ int cuda_plugin_checkpoint_devices(int pid)
 	if (resume_restore_thread(restore_tid, &save_sigset)) {
 		return -1;
 	}
+
+	task_info->checkpointed = 1;
 	status = cuda_process_checkpoint_action(pid, ACTION_CHECKPOINT, 0, msg_buf, sizeof(msg_buf));
 	if (status) {
 		pr_err("CHECKPOINT_DEVICES failed with %s\n", msg_buf);
 		goto interrupt;
 	}
 
-	task_info->checkpointed = 1;
-
 interrupt:
 	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
 

From 7f0d107fe576e7e0b521c2df6e96fe1501a8e1f6 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 21 Dec 2024 14:17:35 +0000
Subject: [PATCH 1622/1854] seize: use separate checkpoint_devices function

Move `run_plugins(CHECKPOINT_DEVICES)` out of `collect_pstree()` to
ensure that the function's sole responsibility is to use the cgroup
freezer for the process tree. This allows us to avoid a time-out
error when checkpointing applications with large GPU state.

v2: This patch calls `checkpoint_devices()` only for `criu dump`.
Support for GPU checkpointing with `pre-dump` will be introduced in
a separate patch.

Suggested-by: Andrei Vagin <avagin@google.com>
Suggested-by: Jesus Ramos <jeramos@nvidia.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-dump.c       |  3 +++
 criu/include/seize.h |  1 +
 criu/seize.c         | 27 ++++++++++++++++++---------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 1bc5d934f..302078caa 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2192,6 +2192,9 @@ int cr_dump_tasks(pid_t pid)
 	if (collect_pstree())
 		goto err;
 
+	if (checkpoint_devices())
+		goto err;
+
 	if (collect_pstree_ids())
 		goto err;
 
diff --git a/criu/include/seize.h b/criu/include/seize.h
index 64e8d2d12..fc7facad3 100644
--- a/criu/include/seize.h
+++ b/criu/include/seize.h
@@ -2,6 +2,7 @@
 #define __CR_SEIZE_H__
 
 extern int collect_pstree(void);
+extern int checkpoint_devices(void);
 struct pstree_item;
 extern void pstree_switch_state(struct pstree_item *root_item, int st);
 extern const char *get_real_freezer_state(void);
diff --git a/criu/seize.c b/criu/seize.c
index 007e8e580..f56357ac7 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -1050,7 +1050,6 @@ int collect_pstree(void)
 	pid_t pid = root_item->pid->real;
 	int ret, exit_code = -1;
 	struct proc_status_creds creds;
-	struct pstree_item *iter;
 
 	timing_start(TIME_FREEZING);
 
@@ -1111,14 +1110,6 @@ int collect_pstree(void)
 		goto err;
 	}
 
-	for_each_pstree_item(iter) {
-		if (!task_alive(iter))
-			continue;
-		ret = run_plugins(CHECKPOINT_DEVICES, iter->pid->real);
-		if (ret < 0 && ret != -ENOTSUP)
-			goto err;
-	}
-
 	exit_code = 0;
 	timing_stop(TIME_FREEZING);
 	timing_start(TIME_FROZEN);
@@ -1128,3 +1119,21 @@ err:
 	alarm(0);
 	return exit_code;
 }
+
+int checkpoint_devices(void)
+{
+	struct pstree_item *iter;
+	int ret, exit_code = -1;
+
+	for_each_pstree_item(iter) {
+		if (!task_alive(iter))
+			continue;
+		ret = run_plugins(CHECKPOINT_DEVICES, iter->pid->real);
+		if (ret < 0 && ret != -ENOTSUP)
+			goto err;
+	}
+
+	exit_code = 0;
+err:
+	return exit_code;
+}
\ No newline at end of file

From 82b03429b71d2334f7444cec80a827b2604cd981 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 15 Jan 2025 20:54:10 +0000
Subject: [PATCH 1623/1854] cuda: disable CUDA plugin for pre-dump

Temporarily disable CUDA plugin for `criu pre-dump`.

pre-dump currently fails with the following error:

Handling VMA with the following smaps entry: 1822c000-18da5000 rw-p 00000000 00:00 0                                  [heap]
Handling VMA with the following smaps entry: 200000000-200200000 ---p 00000000 00:00 0
Handling VMA with the following smaps entry: 200200000-200400000 rw-s 00000000 00:06 895                              /dev/nvidia0
Error (criu/proc_parse.c:116): handle_device_vma plugin failed: No such file or directory
Error (criu/proc_parse.c:632): Can't handle non-regular mapping on 705693's map 200200000
Error (criu/cr-dump.c:1486): Collect mappings (pid: 705693) failed with -1

We plan to enable support for pre-dump by skipping nvidia mappings
in a separate patch.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 976ce824c..99e4caf74 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -565,6 +565,12 @@ int cuda_plugin_init(int stage)
 {
 	int ret;
 
+	/* Disable CUDA checkpointing with pre-dump */
+	if (stage == CR_PLUGIN_STAGE__PRE_DUMP) {
+		plugin_disabled = true;
+		return 0;
+	}
+
 	if (stage == CR_PLUGIN_STAGE__RESTORE) {
 		if (!check_and_remove_inventory_plugin(CR_PLUGIN_DESC.name, strlen(CR_PLUGIN_DESC.name))) {
 			plugin_disabled = true;

From e2dffcbc8e717c8a837f476c8b9f552821a58753 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 19 Dec 2024 10:33:54 +0000
Subject: [PATCH 1624/1854] lib: do not set protobuf has_* field too early

For two cases libcriu was setting the RPC protobuf field `has_*` before
checking if the given parameter is valid. This can lead to situations,
if the caller doesn't check the return value, that we pass as RPC struct
to CRIU which has the `has_*` protobuf field set to true, but does not
have a verified value (or non at all) set for the actual RPC entry.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 lib/c/criu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index 7f766db85..c16fe5dcd 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -352,8 +352,8 @@ int criu_set_parent_images(const char *path)
 
 int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode)
 {
-	opts->rpc->has_pre_dump_mode = true;
 	if (mode == CRIU_PRE_DUMP_SPLICE || mode == CRIU_PRE_DUMP_READ) {
+		opts->rpc->has_pre_dump_mode = true;
 		opts->rpc->pre_dump_mode = (CriuPreDumpMode)mode;
 		return 0;
 	}
@@ -1867,8 +1867,8 @@ void criu_set_pidfd_store_sk(int sk)
 
 int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method)
 {
-	opts->rpc->has_network_lock = true;
 	if (method == CRIU_NETWORK_LOCK_IPTABLES || method == CRIU_NETWORK_LOCK_NFTABLES || method == CRIU_NETWORK_LOCK_SKIP) {
+		opts->rpc->has_network_lock = true;
 		opts->rpc->network_lock = (CriuNetworkLockMethod)method;
 		return 0;
 	}

From d226bd4f670b6a001d1b6809c90495e8710e387a Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 29 Jan 2025 15:19:16 +0000
Subject: [PATCH 1625/1854] ci: handle results from latest codespell

CI pulls in a newer version of codespell. This fixes complaints from
that codespell version.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .codespellrc                   | 2 +-
 criu/include/rbtree.h          | 2 +-
 criu/include/rst_info.h        | 2 +-
 criu/page-xfer.c               | 4 ++--
 test/zdtm/static/packet_sock.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.codespellrc b/.codespellrc
index dd31dd851..15e6fc7bc 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,3 +1,3 @@
 [codespell]
 skip = ./.git,./test/pki
-ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng,inh,wronly,renderd,bui,clen
+ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng,inh,wronly,renderd,bui,clen,sems
diff --git a/criu/include/rbtree.h b/criu/include/rbtree.h
index ba0a8100e..6981aa8f9 100644
--- a/criu/include/rbtree.h
+++ b/criu/include/rbtree.h
@@ -14,7 +14,7 @@
 #define RB_MASK	 3
 
 struct rb_node {
-	unsigned long rb_parent_color; /* Keeps both parent anc color */
+	unsigned long rb_parent_color; /* Keeps both parent and color */
 	struct rb_node *rb_right;
 	struct rb_node *rb_left;
 } __aligned(sizeof(long));
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 59b891fa2..df9f9de01 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -22,7 +22,7 @@ struct fdt {
 	pid_t pid; /* Who should restore this fd table */
 	/*
 	 * The fd table is ready for restoing, if fdt_lock is equal to nr
-	 * The fdt table was restrored, if fdt_lock is equal to nr + 1
+	 * The fdt table was restored, if fdt_lock is equal to nr + 1
 	 */
 	futex_t fdt_lock;
 };
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 94f477414..0314963e6 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -1421,7 +1421,7 @@ int cr_page_server(bool daemon_mode, bool lazy_dump, int cfd)
 
 	if (opts.ps_socket != -1) {
 		ask = opts.ps_socket;
-		pr_info("Re-using ps socket %d\n", ask);
+		pr_info("Reusing ps socket %d\n", ask);
 		goto no_server;
 	}
 
@@ -1467,7 +1467,7 @@ static int connect_to_page_server(void)
 
 	if (opts.ps_socket != -1) {
 		page_server_sk = opts.ps_socket;
-		pr_info("Re-using ps socket %d\n", page_server_sk);
+		pr_info("Reusing ps socket %d\n", page_server_sk);
 		goto out;
 	}
 
diff --git a/test/zdtm/static/packet_sock.c b/test/zdtm/static/packet_sock.c
index 4a9078f81..c1c94ac21 100644
--- a/test/zdtm/static/packet_sock.c
+++ b/test/zdtm/static/packet_sock.c
@@ -5,7 +5,7 @@ const char *test_author = "Pavel Emelyanov <xemul@parallels.com>";
 
 /*
  * Description:
- *  Create and bind several packet sockets, check thet getname
+ *  Create and bind several packet sockets, check that getname
  *  reports same result before and after c/r cycle. This is enough
  *  for _basic_ packet functionality only, but still.
  */

From 9c40781c2674ff99fb56b339fabe62301a0f6ea4 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Jan 2025 10:25:24 +0800
Subject: [PATCH 1626/1854] net/sysctl: put common multiplier outside the
 brackets

Also add an explanation of the logic behind this calculation.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index efd52db32..97c53f84f 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2149,10 +2149,16 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	list_for_each_entry(p, &ns->net.ids, node)
 		i++;
 
+	/*
+	 * Here we allocate one single big buffer for storing multiple arrays
+	 * of protobuf entries and pointers to entries in it and we later use
+	 * xptr_pull_s to claim a part of this buffer of proper size for each
+	 * particular array. Next we read data from sysctl files to those
+	 * arrays and then finally save them into images.
+	 */
 	o_buf = buf = xmalloc(i * (sizeof(NetnsId *) + sizeof(NetnsId)) +
-			      size4 * (sizeof(SysctlEntry *) + sizeof(SysctlEntry)) * 2 +
-			      size6 * (sizeof(SysctlEntry *) + sizeof(SysctlEntry)) * 2 +
-			      sizex * (sizeof(SysctlEntry *) + sizeof(SysctlEntry)));
+			      (size4 * 2 + size6 * 2 + sizex) *
+			      (sizeof(SysctlEntry *) + sizeof(SysctlEntry)));
 	if (!buf)
 		goto out;
 

From 4ca74b9aff301b1db3696077b5bea7e32d466152 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Jan 2025 11:00:28 +0800
Subject: [PATCH 1627/1854] net/sysctl: c/r ipv4/ping_group_range value

It is per net namespace, we need it to allow creation of unprivileged
ICMP sockets.

Note: in case this sysctl was disabled after unprivileged ICMP
socket was created we still need to somehow handle it on restore.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c          | 103 +++++++++++++++++++++++++++++++++++++++++++-
 images/netdev.proto |   1 +
 2 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index 97c53f84f..ee46f1c49 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2128,6 +2128,79 @@ nft_ctx_free_out:
 }
 #endif
 
+static const char *ipv4_sysctl_entries[] = {
+	"ping_group_range",
+};
+
+#define IPV4_SYSCTL_BASE "net/ipv4"
+#define IPV4_SYSCTL_FMT IPV4_SYSCTL_BASE"/%s"
+#define MAX_IPV4_SYSCTL_OPT 32
+#define MAX_IPV4_SYSCTL_PATH (sizeof(IPV4_SYSCTL_FMT) + MAX_IPV4_SYSCTL_OPT - 2)
+#define MAX_STR_IPV4_SYSCTL_LEN 200
+
+static int ipv4_sysctls_op(SysctlEntry ***rsysctl, size_t *pn, int op)
+{
+	int i, ret = -1, flags = 0;
+	char path[ARRAY_SIZE(ipv4_sysctl_entries)][MAX_IPV4_SYSCTL_PATH] = {};
+	struct sysctl_req req[ARRAY_SIZE(ipv4_sysctl_entries)] = {};
+	SysctlEntry **sysctl = *rsysctl;
+	size_t n = *pn;
+
+	if (n != ARRAY_SIZE(ipv4_sysctl_entries)) {
+		pr_err("unix: Unexpected entries in sysctlig (%zu %zu)\n", n, ARRAY_SIZE(ipv4_sysctl_entries));
+		return -EINVAL;
+	}
+
+	if (opts.weak_sysctls || op == CTL_READ)
+		flags = CTL_FLAGS_OPTIONAL;
+
+	for (i = 0; i < n; i++) {
+		snprintf(path[i], MAX_IPV4_SYSCTL_PATH, IPV4_SYSCTL_FMT, ipv4_sysctl_entries[i]);
+		req[i].name = path[i];
+		req[i].flags = flags;
+
+		switch (sysctl[i]->type) {
+		case SYSCTL_TYPE__CTL_STR:
+			req[i].type = CTL_STR(MAX_STR_IPV4_SYSCTL_LEN);
+
+			/* skip write if have no value */
+			if (op == CTL_WRITE && !sysctl[i]->sarg)
+				continue;
+
+			req[i].arg = sysctl[i]->sarg;
+			break;
+		default:
+			pr_err("ipv4: Unknown sysctl type %d\n", sysctl[i]->type);
+			return -1;
+		}
+	}
+
+	ret = sysctl_op(req, n, op, CLONE_NEWNET);
+	if (ret < 0) {
+		pr_err("unix: Failed to %s %s/<sysctls>\n", (op == CTL_READ) ? "read" : "write", IPV4_SYSCTL_BASE);
+		return -1;
+	}
+
+	if (op == CTL_READ) {
+		bool has_entries = false;
+
+		for (i = 0; i < n; i++) {
+			if (req[i].flags & CTL_FLAGS_HAS) {
+				sysctl[i]->has_iarg = true;
+				if (!has_entries)
+					has_entries = true;
+			}
+		}
+
+		if (!has_entries) {
+			*pn = 0;
+			*rsysctl = NULL;
+		}
+	}
+
+	return 0;
+}
+
 static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 {
 	void *buf, *o_buf;
@@ -2142,6 +2215,9 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	int size6 = ARRAY_SIZE(devconfs6);
 	char def_stable_secret[MAX_STR_CONF_LEN + 1] = {};
 	char all_stable_secret[MAX_STR_CONF_LEN + 1] = {};
+	SysctlEntry *ipv4_sysctls = NULL;
+	size_t ipv4_sysctl_size = ARRAY_SIZE(ipv4_sysctl_entries);
+	char ping_group_range[MAX_STR_IPV4_SYSCTL_LEN + 1] = {};
 	NetnsId *ids;
 	struct netns_id *p;
 
@@ -2157,7 +2233,7 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	 * arrays and then finally save them into images.
 	 */
 	o_buf = buf = xmalloc(i * (sizeof(NetnsId *) + sizeof(NetnsId)) +
-			      (size4 * 2 + size6 * 2 + sizex) *
+			      (2 * size4 + 2 * size6 + sizex + ipv4_sysctl_size) *
 			      (sizeof(SysctlEntry *) + sizeof(SysctlEntry)));
 	if (!buf)
 		goto out;
@@ -2223,6 +2299,21 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 		netns.unix_conf[i]->type = SYSCTL_TYPE__CTL_32;
 	}
 
+	netns.n_ipv4_sysctl = ipv4_sysctl_size;
+	netns.ipv4_sysctl = xptr_pull_s(&buf, ipv4_sysctl_size * sizeof(SysctlEntry *));
+	ipv4_sysctls = xptr_pull_s(&buf, ipv4_sysctl_size * sizeof(SysctlEntry));
+	for (i = 0; i < ipv4_sysctl_size; i++) {
+		sysctl_entry__init(&ipv4_sysctls[i]);
+		netns.ipv4_sysctl[i] = &ipv4_sysctls[i];
+		if (!strcmp(ipv4_sysctl_entries[i], "ping_group_range")) {
+			netns.ipv4_sysctl[i]->type = SYSCTL_TYPE__CTL_STR;
+			netns.ipv4_sysctl[i]->sarg = ping_group_range;
+		} else {
+			/* Need to handle this case when we have more sysctls */
+			BUG();
+		}
+	}
+
 	ret = ipv4_conf_op("default", netns.def_conf4, size4, CTL_READ, NULL);
 	if (ret < 0)
 		goto err_free;
@@ -2241,6 +2332,10 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	if (ret < 0)
 		goto err_free;
 
+	ret = ipv4_sysctls_op(&netns.ipv4_sysctl, &netns.n_ipv4_sysctl, CTL_READ);
+	if (ret < 0)
+		goto err_free;
+
 	ret = pb_write_one(img_from_set(fds, CR_FD_NETNS), &netns, PB_NETNS);
 err_free:
 	xfree(o_buf);
@@ -2593,6 +2688,12 @@ static int restore_netns_conf(struct ns_id *ns)
 			goto out;
 	}
 
+	if ((netns)->ipv4_sysctl) {
+		ret = ipv4_sysctls_op(&(netns)->ipv4_sysctl, &(netns)->n_ipv4_sysctl, CTL_WRITE);
+		if (ret)
+			goto out;
+	}
+
 	ns->net.netns = netns;
 out:
 	return ret;
diff --git a/images/netdev.proto b/images/netdev.proto
index 748fd0200..42e2bc7d7 100644
--- a/images/netdev.proto
+++ b/images/netdev.proto
@@ -74,4 +74,5 @@ message netns_entry {
 	repeated netns_id nsids		= 7;
 	optional string	ext_key		= 8;
 	repeated sysctl_entry unix_conf	= 9;
+	repeated sysctl_entry ipv4_sysctl = 10;
 }

From 6710cfce10d32a4ebabae61420fa495e42385966 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Thu, 16 Jan 2025 11:56:00 +0800
Subject: [PATCH 1628/1854] zdtm/netns_sub_sysctl: add ipv4/ping_group_range
 sysctl check

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/sysctl.c              | 43 +++++++++++++++++++++
 test/zdtm/lib/sysctl.h              |  2 +
 test/zdtm/static/netns_sub_sysctl.c | 58 +++++++++++++++++++++++------
 3 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/test/zdtm/lib/sysctl.c b/test/zdtm/lib/sysctl.c
index 9583ec3df..3b1ebc168 100644
--- a/test/zdtm/lib/sysctl.c
+++ b/test/zdtm/lib/sysctl.c
@@ -3,6 +3,49 @@
 #include "zdtmtst.h"
 #include "sysctl.h"
 
+int sysctl_read_str(const char *name, char *data, size_t size)
+{
+	int fd, ret;
+
+	fd = open(name, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("Can't open %s", name);
+		return -1;
+	}
+
+	ret = read(fd, data, size - 1);
+	if (ret < 0) {
+		pr_perror("Can't read %s", name);
+		close(fd);
+		return -1;
+	}
+	data[ret] = '\0';
+	close(fd);
+
+	return 0;
+}
+
+int sysctl_write_str(const char *name, char *data)
+{
+	int fd, ret;
+
+	fd = open(name, O_WRONLY);
+	if (fd < 0) {
+		pr_perror("Can't open %s", name);
+		return -1;
+	}
+
+	ret = write(fd, data, strlen(data));
+	if (ret < 0) {
+		pr_perror("Can't write %s into %s", data, name);
+		close(fd);
+		return -1;
+	}
+	close(fd);
+
+	return 0;
+}
+
 int sysctl_read_int(const char *name, int *data)
 {
 	int fd;
diff --git a/test/zdtm/lib/sysctl.h b/test/zdtm/lib/sysctl.h
index 67129102f..d435bd7e9 100644
--- a/test/zdtm/lib/sysctl.h
+++ b/test/zdtm/lib/sysctl.h
@@ -3,5 +3,7 @@
 
 extern int sysctl_read_int(const char *name, int *data);
 extern int sysctl_write_int(const char *name, int val);
+extern int sysctl_read_str(const char *name, char *data, size_t size);
+extern int sysctl_write_str(const char *name, char *data);
 
 #endif
diff --git a/test/zdtm/static/netns_sub_sysctl.c b/test/zdtm/static/netns_sub_sysctl.c
index 545a17308..0f94c40a7 100644
--- a/test/zdtm/static/netns_sub_sysctl.c
+++ b/test/zdtm/static/netns_sub_sysctl.c
@@ -3,18 +3,33 @@
 #include "zdtmtst.h"
 #include "sysctl.h"
 
-const char *test_doc = "Check dump and restore a net.unix.max_dgram_qlen sysctl parameter in subns";
+const char *test_doc = "Check dump and restore of sysctls in subns";
 const char *test_author = "Alexander Mikhalitsyn <alexander@mihalicyn.com>";
 
+#define MAX_STR_SYSCTL_LEN 200
+
+enum {
+	SYSCTL_INT,
+	SYSCTL_STR,
+};
+
 typedef struct {
 	const char *path;
+	int type;
 	int old;
 	int new;
+	char s_old[MAX_STR_SYSCTL_LEN];
+	char s_new[MAX_STR_SYSCTL_LEN];
 } sysctl_opt_t;
 
 #define CONF_UNIX_BASE "/proc/sys/net/unix"
+#define IPV4_SYSCTL_BASE "/proc/sys/net/ipv4"
 
-static sysctl_opt_t net_unix_params[] = { { CONF_UNIX_BASE "/max_dgram_qlen", 0, 0 }, { NULL, 0, 0 } };
+static sysctl_opt_t net_unix_params[] = {
+	{CONF_UNIX_BASE "/max_dgram_qlen", SYSCTL_INT},
+	{IPV4_SYSCTL_BASE "/ping_group_range", SYSCTL_STR, 0, 0, "40000\t50000\n"},
+	{NULL, 0, 0}
+};
 
 int main(int argc, char **argv)
 {
@@ -23,10 +38,17 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	for (p = net_unix_params; p->path != NULL; p++) {
-		p->old = (((unsigned)lrand48()) % 1023) + 1;
-		if (sysctl_write_int(p->path, p->old)) {
-			pr_perror("Can't change %s", p->path);
-			return -1;
+		if (p->type == SYSCTL_INT) {
+			p->old = (((unsigned)lrand48()) % 1023) + 1;
+			if (sysctl_write_int(p->path, p->old)) {
+				pr_perror("Can't change %s", p->path);
+				return -1;
+			}
+		} else if (p->type == SYSCTL_STR) {
+			if (sysctl_write_str(p->path, p->s_old)) {
+				pr_perror("Can't change %s", p->path);
+				return -1;
+			}
 		}
 	}
 
@@ -34,13 +56,25 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	for (p = net_unix_params; p->path != NULL; p++) {
-		if (sysctl_read_int(p->path, &p->new))
-			ret = 1;
+		if (p->type == SYSCTL_INT) {
+			if (sysctl_read_int(p->path, &p->new))
+				ret = 1;
 
-		if (p->old != p->new) {
-			errno = EINVAL;
-			pr_perror("%s changed: %d ---> %d", p->path, p->old, p->new);
-			ret = 1;
+			if (p->old != p->new) {
+				errno = EINVAL;
+				pr_perror("%s changed: %d ---> %d", p->path, p->old, p->new);
+				ret = 1;
+			}
+		} else if (p->type == SYSCTL_STR) {
+			if (sysctl_read_str(p->path, p->s_new, MAX_STR_SYSCTL_LEN)) {
+				ret = 1;
+			} else {
+				if (strcmp(p->s_old, p->s_new)) {
+					errno = EINVAL;
+					pr_perror("%s changed: %s ---> %s", p->path, p->s_old, p->s_new);
+					ret = 1;
+				}
+			}
 		}
 	}
 

From 8a06ca27cc9ac711faf818b8ac4d061be4d810a8 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 22 Jan 2025 14:35:26 +0100
Subject: [PATCH 1629/1854] vdso: switch from DT_HASH to DT_GNU_HASH (aarch64)

Trying to run latest CRIU on CentOS Stream 10 or Ubuntu 24.04 (aarch64)
fails like this:

    # criu/criu check -v4
    [...]
    (00.096460) vdso: Parsing at ffffb2e2a000 ffffb2e2c000
    (00.096539) vdso: PT_LOAD p_vaddr: 0
    (00.096567) vdso: DT_STRTAB: 1d0
    (00.096592) vdso: DT_SYMTAB: 128
    (00.096616) vdso: DT_STRSZ: 8a
    (00.096640) vdso: DT_SYMENT: 18
    (00.096663) Error (criu/pie-util-vdso.c:193): vdso: Not all dynamic entries are present
    (00.096688) Error (criu/vdso.c:627): vdso: Failed to fill self vdso symtable
    (00.096713) Error (criu/kerndat.c:1906): kerndat_vdso_fill_symtable failed when initializing kerndat.
    (00.096812) Found mmap_min_addr 0x10000
    (00.096881) files stat: fs/nr_open 1073741816
    (00.096908) Error (criu/crtools.c:267): Could not initialize kernel features detection.

This seems to be related to the kernel (6.12.0-41.el10.aarch64). The
Ubuntu user-space is running in a container on the same kernel.

Looking at the kernel this seems to be related to:

    commit 48f6430505c0b0498ee9020ce3cf9558b1caaaeb
    Author: Fangrui Song <i@maskray.me>
    Date:   Thu Jul 18 10:34:23 2024 -0700

        arm64/vdso: Remove --hash-style=sysv

        glibc added support for .gnu.hash in 2006 and .hash has been obsoleted
        for more than one decade in many Linux distributions.  Using
        --hash-style=sysv might imply unaddressed issues and confuse readers.

        Just drop the option and rely on the linker default, which is likely
        "both", or "gnu" when the distribution really wants to eliminate sysv
        hash overhead.

        Similar to commit 6b7e26547fad ("x86/vdso: Emit a GNU hash").

The commit basically does:

    -ldflags-y := -shared -soname=linux-vdso.so.1 --hash-style=sysv \
    +ldflags-y := -shared -soname=linux-vdso.so.1 \

Which results in only a GNU hash being added to the ELF header. This
change has been merged with 6.11.

Looking at the referenced x86 commit:

    commit 6b7e26547fad7ace3dcb27a5babd2317fb9d1e12
    Author: Andy Lutomirski <luto@amacapital.net>
    Date:   Thu Aug 6 14:45:45 2015 -0700

        x86/vdso: Emit a GNU hash

        Some dynamic loaders may be slightly faster if a GNU hash is
        available.  Strangely, this seems to have no effect at all on
        the vdso size.

        This is unlikely to have any measurable effect on the time it
        takes to resolve vdso symbols (since there are so few of them).
        In some contexts, it can be a win for a different reason: if
        every DSO has a GNU hash section, then libc can avoid
        calculating SysV hashes at all.  Both musl and glibc appear to
        have this optimization.

        It's plausible that this breaks some ancient glibc version.  If
        so, then, depending on what glibc versions break, we could
        either require COMPAT_VDSO for them or consider reverting.

Which is also a really simple change:

    -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
    +VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \

The big difference here is that for x86 both hash sections are
generated. For aarch64 only the newer GNU hash is generated. That is why
we only see this error on kernel >= 6.11 and aarch64.

Changing from DT_HASH to DT_GNU_HASH seems to work on aarch64.  The test
suite runs without any errors.

Unfortunately I am not aware of all implication of this change and if a
successful test suite run means that it still works.

Looking at the kernel I see following hash styles for the VDSO:

aarch64: not specified (only GNU hash style)
arm: --hash-style=sysv
loongarch: --hash-style=sysv
mips: --hash-style=sysv
powerpc: --hash-style=both
riscv: --hash-style=both
s390: --hash-style=both
x86: --hash-style=both

Only aarch64 on kernels >= 6.11 is a problem right now, because all
other platforms provide the old style hashing.

Signed-off-by: Adrian Reber <areber@redhat.com>
Co-developed-by: Dmitry Safonov <dima@arista.com>
Co-authored-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 criu/pie/util-vdso.c | 243 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 197 insertions(+), 46 deletions(-)

diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index f1e3239ff..9819335d8 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <stdint.h>
+#include <stdbool.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -48,10 +49,25 @@ static bool __ptr_struct_oob(uintptr_t ptr, size_t struct_size, uintptr_t start,
 	return __ptr_oob(ptr, start, size) || __ptr_struct_end_oob(ptr, struct_size, start, size);
 }
 
+/* Local strlen implementation */
+static size_t __strlen(const char *str)
+{
+	const char *ptr;
+
+	if (!str)
+		return 0;
+
+	ptr = str;
+	while (*ptr != '\0')
+		ptr++;
+
+	return ptr - str;
+}
+
 /*
  * Elf hash, see format specification.
  */
-static unsigned long elf_hash(const unsigned char *name)
+static unsigned long elf_sysv_hash(const unsigned char *name)
 {
 	unsigned long h = 0, g;
 
@@ -65,6 +81,15 @@ static unsigned long elf_hash(const unsigned char *name)
 	return h;
 }
 
+/* * The GNU hash format. Taken from glibc.  */
+static unsigned long elf_gnu_hash(const unsigned char *name)
+{
+	unsigned long h = 5381;
+	for (unsigned char c = *name; c != '\0'; c = *++name)
+		h = h * 33 + c;
+	return h;
+}
+
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #define BORD ELFDATA2MSB /* 0x02 */
 #else
@@ -149,11 +174,14 @@ err_oob:
  * Output parameters are:
  *   @dyn_strtab - address of the symbol table
  *   @dyn_symtab - address of the string table section
- *   @dyn_hash   - address of the symbol hash table
+ *   @dyn_hash     - address of the symbol hash table
+ *   @use_gnu_hash - the format of hash DT_HASH or DT_GNU_HASH
  */
-static int parse_elf_dynamic(uintptr_t mem, size_t size, Phdr_t *dynamic, Dyn_t **dyn_strtab, Dyn_t **dyn_symtab,
-			     Dyn_t **dyn_hash)
+static int parse_elf_dynamic(uintptr_t mem, size_t size, Phdr_t *dynamic,
+			     Dyn_t **dyn_strtab, Dyn_t **dyn_symtab,
+			     Dyn_t **dyn_hash, bool *use_gnu_hash)
 {
+	Dyn_t *dyn_gnu_hash = NULL, *dyn_sysv_hash = NULL;
 	Dyn_t *dyn_syment = NULL;
 	Dyn_t *dyn_strsz = NULL;
 	uintptr_t addr;
@@ -184,16 +212,52 @@ static int parse_elf_dynamic(uintptr_t mem, size_t size, Phdr_t *dynamic, Dyn_t
 			dyn_syment = d;
 			pr_debug("DT_SYMENT: %lx\n", (unsigned long)d->d_un.d_val);
 		} else if (d->d_tag == DT_HASH) {
-			*dyn_hash = d;
+			dyn_sysv_hash = d;
 			pr_debug("DT_HASH: %lx\n", (unsigned long)d->d_un.d_ptr);
+		} else if (d->d_tag == DT_GNU_HASH) {
+			/*
+			 * This is complicated.
+			 *
+			 * Looking at the Linux kernel source, the following can be seen
+			 * regarding which hashing style the VDSO uses on each arch:
+			 *
+			 *     aarch64: not specified (depends on linker, can be
+			 *                             only GNU hash style)
+			 *     arm: --hash-style=sysv
+			 *     loongarch: --hash-style=sysv
+			 *     mips: --hash-style=sysv
+			 *     powerpc: --hash-style=both
+			 *     riscv: --hash-style=both
+			 *     s390: --hash-style=both
+			 *     x86: --hash-style=both
+			 *
+			 * Some architectures are using both hash-styles, that
+			 * is the easiest for CRIU. Some architectures are only
+			 * using the old style (sysv), that is what CRIU supports.
+			 *
+			 * Starting with Linux 6.11, aarch64 unfortunately decided
+			 * to switch from '--hash-style=sysv' to ''. Specifying
+			 * nothing unfortunately may mean GNU hash style only and not
+			 * 'both' (depending on the linker).
+			 */
+			dyn_gnu_hash = d;
+			pr_debug("DT_GNU_HASH: %lx\n", (unsigned long)d->d_un.d_ptr);
 		}
 	}
 
-	if (!*dyn_strtab || !*dyn_symtab || !dyn_strsz || !dyn_syment || !*dyn_hash) {
+	if (!*dyn_strtab || !*dyn_symtab || !dyn_strsz || !dyn_syment ||
+	    (!dyn_gnu_hash && !dyn_sysv_hash)) {
 		pr_err("Not all dynamic entries are present\n");
 		return -EINVAL;
 	}
 
+	/*
+	 * Prefer DT_HASH over DT_GNU_HASH as it's been more tested and
+	 * as a result more stable.
+	 */
+	*use_gnu_hash = !dyn_sysv_hash;
+	*dyn_hash = dyn_sysv_hash ?: dyn_gnu_hash;
+
 	return 0;
 
 err_oob:
@@ -208,60 +272,141 @@ typedef unsigned long Hash_t;
 typedef Word_t Hash_t;
 #endif
 
-static void parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load, struct vdso_symtable *t,
-			      uintptr_t dynsymbol_names, Hash_t *hash, Dyn_t *dyn_symtab)
+static bool elf_symbol_match(uintptr_t mem, size_t size,
+		uintptr_t dynsymbol_names, Sym_t *sym,
+		const char *symbol, const size_t vdso_symbol_length)
+{
+	uintptr_t addr = (uintptr_t)sym;
+	char *name;
+
+	if (__ptr_struct_oob(addr, sizeof(Sym_t), mem, size))
+		return false;
+
+	if (ELF_ST_TYPE(sym->st_info) != STT_FUNC && ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
+		return false;
+
+	addr = dynsymbol_names + sym->st_name;
+	if (__ptr_struct_oob(addr, vdso_symbol_length, mem, size))
+		return false;
+	name = (void *)addr;
+
+	return !std_strncmp(name, symbol, vdso_symbol_length);
+}
+
+
+static unsigned long elf_symbol_lookup(uintptr_t mem, size_t size,
+		const char *symbol, uint32_t symbol_hash, unsigned int sym_off,
+		uintptr_t dynsymbol_names, Dyn_t *dyn_symtab, Phdr_t *load,
+		Hash_t nbucket, Hash_t nchain, Hash_t *bucket, Hash_t *chain,
+		const size_t vdso_symbol_length, bool use_gnu_hash)
+{
+	unsigned int j;
+	uintptr_t addr;
+
+	j = bucket[symbol_hash % nbucket];
+	if (j == STN_UNDEF)
+		return 0;
+
+	addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
+
+	if (use_gnu_hash) {
+		uint32_t *h = bucket + nbucket + (j - sym_off);
+		uint32_t hash_val;
+
+		symbol_hash |= 1;
+		do {
+			Sym_t *sym = (void *)addr + sizeof(Sym_t) * j;
+
+			hash_val = *h++;
+			if ((hash_val | 1) == symbol_hash &&
+			    elf_symbol_match(mem, size, dynsymbol_names, sym,
+					     symbol, vdso_symbol_length))
+				return sym->st_value;
+			j++;
+		} while (!(hash_val & 1));
+	} else {
+		for (; j < nchain && j != STN_UNDEF; j = chain[j]) {
+			Sym_t *sym = (void *)addr + sizeof(Sym_t) * j;
+
+			if (elf_symbol_match(mem, size, dynsymbol_names, sym,
+					     symbol, vdso_symbol_length))
+				return sym->st_value;
+		}
+	}
+	return 0;
+}
+
+static int parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
+			     struct vdso_symtable *t, uintptr_t dynsymbol_names,
+			     Hash_t *hash, Dyn_t *dyn_symtab, bool use_gnu_hash)
 {
 	ARCH_VDSO_SYMBOLS_LIST
 
 	const char *vdso_symbols[VDSO_SYMBOL_MAX] = { ARCH_VDSO_SYMBOLS };
 	const size_t vdso_symbol_length = sizeof(t->symbols[0].name) - 1;
 
-	Hash_t nbucket, nchain;
-	Hash_t *bucket, *chain;
+	Hash_t *bucket = NULL;
+	Hash_t *chain = NULL;
+	Hash_t nbucket = 0;
+	Hash_t nchain = 0;
 
-	unsigned int i, j, k;
-	uintptr_t addr;
+	unsigned int sym_off = 0;
+	unsigned int i = 0;
 
-	nbucket = hash[0];
-	nchain = hash[1];
-	bucket = &hash[2];
-	chain = &hash[nbucket + 2];
+	unsigned long (*elf_hash)(const unsigned char *);
+
+	if (use_gnu_hash) {
+		uint32_t *gnu_hash = (uint32_t *)hash;
+		uint32_t bloom_sz;
+		size_t *bloom;
+
+		nbucket = gnu_hash[0];
+		sym_off = gnu_hash[1];
+		bloom_sz = gnu_hash[2];
+		bloom = (size_t *)&gnu_hash[4];
+		bucket = (Hash_t *)(&bloom[bloom_sz]);
+		elf_hash = &elf_gnu_hash;
+		pr_debug("nbucket %lx sym_off %lx bloom_sz %lx bloom %lx bucket %lx\n",
+			 (unsigned long)nbucket, (unsigned long)sym_off,
+			 (unsigned long)bloom_sz, (unsigned long)bloom,
+			 (unsigned long)bucket);
+	} else {
+		nbucket = hash[0];
+		nchain = hash[1];
+		bucket = &hash[2];
+		chain = &hash[nbucket + 2];
+		elf_hash = &elf_sysv_hash;
+		pr_debug("nbucket %lx nchain %lx bucket %lx chain %lx\n",
+			 (unsigned long)nbucket, (unsigned long)nchain,
+			 (unsigned long)bucket, (unsigned long)chain);
+	}
 
-	pr_debug("nbucket %lx nchain %lx bucket %lx chain %lx\n", (long)nbucket, (long)nchain, (unsigned long)bucket,
-		 (unsigned long)chain);
 
 	for (i = 0; i < VDSO_SYMBOL_MAX; i++) {
 		const char *symbol = vdso_symbols[i];
-		k = elf_hash((const unsigned char *)symbol);
+		unsigned long addr, symbol_hash;
+		const size_t symbol_length = __strlen(symbol);
 
-		for (j = bucket[k % nbucket]; j < nchain && j != STN_UNDEF; j = chain[j]) {
-			Sym_t *sym;
-			char *name;
+		symbol_hash = elf_hash((const unsigned char *)symbol);
+		addr = elf_symbol_lookup(mem, size, symbol, symbol_hash,
+				sym_off, dynsymbol_names, dyn_symtab, load,
+				nbucket, nchain, bucket, chain,
+				vdso_symbol_length, use_gnu_hash);
+		pr_debug("symbol %s at address %lx\n", symbol, addr);
+		if (!addr)
+			continue;
 
-			addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
-
-			addr += sizeof(Sym_t) * j;
-			if (__ptr_struct_oob(addr, sizeof(Sym_t), mem, size))
-				continue;
-			sym = (void *)addr;
-
-			if (ELF_ST_TYPE(sym->st_info) != STT_FUNC && ELF_ST_BIND(sym->st_info) != STB_GLOBAL)
-				continue;
-
-			addr = dynsymbol_names + sym->st_name;
-			if (__ptr_struct_oob(addr, vdso_symbol_length, mem, size))
-				continue;
-			name = (void *)addr;
-
-			if (std_strncmp(name, symbol, vdso_symbol_length))
-				continue;
-
-			/* XXX: provide strncpy() implementation for PIE */
-			memcpy(t->symbols[i].name, name, vdso_symbol_length);
-			t->symbols[i].offset = (unsigned long)sym->st_value - load->p_vaddr;
-			break;
+		/* XXX: provide strncpy() implementation for PIE */
+		if (symbol_length > vdso_symbol_length) {
+			pr_err("strlen(%s) %zd, only %zd bytes available\n",
+				symbol, symbol_length, vdso_symbol_length);
+			return -EINVAL;
 		}
+		memcpy(t->symbols[i].name, symbol, symbol_length);
+		t->symbols[i].offset = addr - load->p_vaddr;
 	}
+
+	return 0;
 }
 
 int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
@@ -271,6 +416,7 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 	Dyn_t *dyn_symtab = NULL;
 	Dyn_t *dyn_hash = NULL;
 	Hash_t *hash = NULL;
+	bool use_gnu_hash;
 
 	uintptr_t dynsymbol_names;
 	uintptr_t addr;
@@ -296,7 +442,8 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 	 * needed. Note that we're interested in a small set of tags.
 	 */
 
-	ret = parse_elf_dynamic(mem, size, dynamic, &dyn_strtab, &dyn_symtab, &dyn_hash);
+	ret = parse_elf_dynamic(mem, size, dynamic, &dyn_strtab, &dyn_symtab,
+				&dyn_hash, &use_gnu_hash);
 	if (ret < 0)
 		return ret;
 
@@ -310,7 +457,11 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 		goto err_oob;
 	hash = (void *)addr;
 
-	parse_elf_symbols(mem, size, load, t, dynsymbol_names, hash, dyn_symtab);
+	ret = parse_elf_symbols(mem, size, load, t, dynsymbol_names, hash, dyn_symtab,
+				use_gnu_hash);
+
+	if (ret <0)
+		return ret;
 
 	return 0;
 

From d66bc349957137113cdeab0ca679898f0b379395 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Fri, 31 Jan 2025 14:45:03 -0800
Subject: [PATCH 1630/1854] Makefile: move codespell options to .codespellrc

This way,
 - Makefile is less cluttered;
 - one can run codespell from the command line.

Fixes: fd7e97fcf ("lint: exclude tags file from codespell")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .codespellrc | 2 +-
 Makefile     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.codespellrc b/.codespellrc
index 15e6fc7bc..e91a6d2eb 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,3 +1,3 @@
 [codespell]
-skip = ./.git,./test/pki
+skip = ./.git,./test/pki,./tags
 ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng,inh,wronly,renderd,bui,clen,sems
diff --git a/Makefile b/Makefile
index 60b78a074..90908de83 100644
--- a/Makefile
+++ b/Makefile
@@ -466,7 +466,7 @@ shellcheck:
 	shellcheck -x test/others/action-script/*.sh
 
 codespell:
-	codespell -S tags
+	codespell
 
 lint: ruff shellcheck codespell
 	# Do not append \n to pr_perror, pr_pwarn or fail

From 528c94c48b3d25b27a22bd672e700ccf413b5945 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 6 Feb 2025 17:32:48 +0100
Subject: [PATCH 1631/1854] ci: install gawk for Fedora based tests

Currently Fedora rawhide based CI runs fail with:

 /bin/sh: line 1: awk: command not found

Let's install it.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/prepare-for-fedora-rawhide.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index 42252c93c..f8ad9cf97 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -4,6 +4,7 @@ set -e -x
 dnf install -y \
 	diffutils \
 	findutils \
+	gawk \
 	gcc \
 	git \
 	gnutls-devel \

From b7fa7d304c12860405f1aacb012bdc5fc23f7636 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Thu, 20 Feb 2025 04:31:12 +0000
Subject: [PATCH 1632/1854] kerndat: run iptables with -n to not resolve
 service names

Resolving service names can be slow and it isn't needed here.

Fixes #2032

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/kerndat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index fa1ed21fa..5939005a4 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -646,7 +646,7 @@ static int kerndat_loginuid(void)
 static int kerndat_iptables_has_xtlocks(void)
 {
 	int fd;
-	char *argv[4] = { "sh", "-c", "iptables -w -L", NULL };
+	char *argv[4] = { "sh", "-c", "iptables -n -w -L", NULL };
 
 	fd = open("/dev/null", O_RDWR);
 	if (fd < 0) {

From 030fa4affda75402bf9c2819c7050de27da1a3b0 Mon Sep 17 00:00:00 2001
From: dschervov <dschervov1@yandex.ru>
Date: Wed, 5 Feb 2025 20:04:37 +0300
Subject: [PATCH 1633/1854] criu: fix internal representation of cgroups
 hierarchical structure

strstartswith() function is incorrect choice for finding parent
directory so i change it to issubpath() function

Signed-off-by: Dmitrii Chervov <dschervov1@yandex.ru>
---
 criu/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cgroup.c b/criu/cgroup.c
index fcaed0708..9246be639 100644
--- a/criu/cgroup.c
+++ b/criu/cgroup.c
@@ -248,7 +248,7 @@ static int find_dir(const char *path, struct list_head *dirs, struct cgroup_dir
 			return EXACT_MATCH;
 		}
 
-		if (strstartswith(path, d->path)) {
+		if (issubpath(path, d->path)) {
 			int ret = find_dir(path, &d->children, rdir);
 			if (ret == NO_MATCH) {
 				*rdir = d;

From da90b33a42a071ee1702a84e076a03d733037632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=AE=E0=A5=80=E0=A4=B0=20=E0=A4=B8=E0=A4=BF?=
 =?UTF-8?q?=E0=A4=82=E0=A4=B9=20Sameer=20Singh?= <lumarzeli30@gmail.com>
Date: Thu, 23 Jan 2025 04:07:42 +0530
Subject: [PATCH 1634/1854] coredump: enable coredump generation on aarch64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add relevant elf header constants and notes for the aarch64 platform
to enable coredump generation.

Signed-off-by: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
---
 coredump/coredump                  |   6 +-
 coredump/criu_coredump/coredump.py | 164 +++++++++++++++++++++--------
 coredump/criu_coredump/elf.py      |  55 +++++++++-
 test/others/criu-coredump/test.sh  |   5 +-
 4 files changed, 178 insertions(+), 52 deletions(-)

diff --git a/coredump/coredump b/coredump/coredump
index 3fbdafe81..f1027773d 100755
--- a/coredump/coredump
+++ b/coredump/coredump
@@ -6,6 +6,8 @@ import sys
 
 import criu_coredump
 
+PLATFORMS = ["aarch64", "x86_64"]
+
 
 def coredump(opts):
     generator = criu_coredump.coredump_generator()
@@ -37,8 +39,8 @@ def main():
 
     opts = vars(parser.parse_args())
 
-    if platform.machine() != 'x86_64':
-        print('ERROR: %s only supported on x86_64' % sys.argv[0])
+    if platform.machine() not in PLATFORMS:
+        print("ERROR: %s is only supported on: %s" % (sys.argv[0], ', '.join(PLATFORMS)))
         sys.exit(1)
 
     try:
diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 20ec8e5dc..6bfc462f2 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -31,6 +31,7 @@
 import io
 import sys
 import ctypes
+import platform
 
 from pycriu import images
 from . import elf
@@ -130,6 +131,11 @@ class coredump_generator:
     reg_files = None  # reg-files;
     pagemaps = {}  # pagemap by pid;
 
+    # thread info key based on the current arch
+    thread_info_key = {"aarch64": "ti_aarch64", "x86_64": "thread_info"}
+
+    machine = platform.machine()  # current arch
+
     def _img_open_and_strip(self, name, single=False, pid=None):
         """
         Load criu image and strip it from magic and redundant list.
@@ -213,7 +219,7 @@ class coredump_generator:
         ehdr.e_ident[elf.EI_VERSION] = elf.EV_CURRENT
 
         ehdr.e_type = elf.ET_CORE
-        ehdr.e_machine = elf.EM_X86_64
+        ehdr.e_machine = self._get_e_machine()
         ehdr.e_version = elf.EV_CURRENT
         ehdr.e_phoff = ctypes.sizeof(elf.Elf64_Ehdr())
         ehdr.e_ehsize = ctypes.sizeof(elf.Elf64_Ehdr())
@@ -224,6 +230,13 @@ class coredump_generator:
 
         return ehdr
 
+    def _get_e_machine(self):
+        """
+        Get the e_machine field based on the current architecture.
+        """
+        e_machine_dict = {"aarch64": elf.EM_AARCH64, "x86_64": elf.EM_X86_64}
+        return e_machine_dict[self.machine]
+
     def _gen_phdrs(self, pid, notes, vmas):
         """
         Generate program headers for process pid.
@@ -332,7 +345,7 @@ class coredump_generator:
         Generate NT_PRSTATUS note for thread tid of process pid.
         """
         core = self.cores[tid]
-        regs = core["thread_info"]["gpregs"]
+        regs = self._get_gpregs(core)
         pstree = self.pstree[pid]
 
         prstatus = elf.elf_prstatus()
@@ -345,33 +358,7 @@ class coredump_generator:
         prstatus.pr_pgrp = pstree["pgid"]
         prstatus.pr_sid = pstree["sid"]
 
-        prstatus.pr_reg.r15 = regs["r15"]
-        prstatus.pr_reg.r14 = regs["r14"]
-        prstatus.pr_reg.r13 = regs["r13"]
-        prstatus.pr_reg.r12 = regs["r12"]
-        prstatus.pr_reg.rbp = regs["bp"]
-        prstatus.pr_reg.rbx = regs["bx"]
-        prstatus.pr_reg.r11 = regs["r11"]
-        prstatus.pr_reg.r10 = regs["r10"]
-        prstatus.pr_reg.r9 = regs["r9"]
-        prstatus.pr_reg.r8 = regs["r8"]
-        prstatus.pr_reg.rax = regs["ax"]
-        prstatus.pr_reg.rcx = regs["cx"]
-        prstatus.pr_reg.rdx = regs["dx"]
-        prstatus.pr_reg.rsi = regs["si"]
-        prstatus.pr_reg.rdi = regs["di"]
-        prstatus.pr_reg.orig_rax = regs["orig_ax"]
-        prstatus.pr_reg.rip = regs["ip"]
-        prstatus.pr_reg.cs = regs["cs"]
-        prstatus.pr_reg.eflags = regs["flags"]
-        prstatus.pr_reg.rsp = regs["sp"]
-        prstatus.pr_reg.ss = regs["ss"]
-        prstatus.pr_reg.fs_base = regs["fs_base"]
-        prstatus.pr_reg.gs_base = regs["gs_base"]
-        prstatus.pr_reg.ds = regs["ds"]
-        prstatus.pr_reg.es = regs["es"]
-        prstatus.pr_reg.fs = regs["fs"]
-        prstatus.pr_reg.gs = regs["gs"]
+        self._set_pr_regset(prstatus.pr_reg, regs)
 
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
@@ -385,28 +372,64 @@ class coredump_generator:
 
         return note
 
+    def _get_gpregs(self, core):
+        """
+        Get the general purpose registers based on the current architecture.
+        """
+        thread_info_key = self.thread_info_key[self.machine]
+        thread_info = core[thread_info_key]
+
+        return thread_info["gpregs"]
+
+    def _set_pr_regset(self, pr_reg, regs):
+        """
+        Set the pr_reg struct based on the current architecture.
+        """
+        if self.machine == "aarch64":
+            pr_reg.regs = (ctypes.c_ulonglong * len(regs["regs"]))(*regs["regs"])
+            pr_reg.sp = regs["sp"]
+            pr_reg.pc = regs["pc"]
+            pr_reg.pstate = regs["pstate"]
+        elif self.machine == "x86_64":
+            pr_reg.r15 = regs["r15"]
+            pr_reg.r14 = regs["r14"]
+            pr_reg.r13 = regs["r13"]
+            pr_reg.r12 = regs["r12"]
+            pr_reg.rbp = regs["bp"]
+            pr_reg.rbx = regs["bx"]
+            pr_reg.r11 = regs["r11"]
+            pr_reg.r10 = regs["r10"]
+            pr_reg.r9 = regs["r9"]
+            pr_reg.r8 = regs["r8"]
+            pr_reg.rax = regs["ax"]
+            pr_reg.rcx = regs["cx"]
+            pr_reg.rdx = regs["dx"]
+            pr_reg.rsi = regs["si"]
+            pr_reg.rdi = regs["di"]
+            pr_reg.orig_rax = regs["orig_ax"]
+            pr_reg.rip = regs["ip"]
+            pr_reg.cs = regs["cs"]
+            pr_reg.eflags = regs["flags"]
+            pr_reg.rsp = regs["sp"]
+            pr_reg.ss = regs["ss"]
+            pr_reg.fs_base = regs["fs_base"]
+            pr_reg.gs_base = regs["gs_base"]
+            pr_reg.ds = regs["ds"]
+            pr_reg.es = regs["es"]
+            pr_reg.fs = regs["fs"]
+            pr_reg.gs = regs["gs"]
+
     def _gen_fpregset(self, pid, tid):
         """
         Generate NT_FPREGSET note for thread tid of process pid.
         """
         core = self.cores[tid]
-        regs = core["thread_info"]["fpregs"]
+        regs = self._get_fpregs(core)
 
         fpregset = elf.elf_fpregset_t()
         ctypes.memset(ctypes.addressof(fpregset), 0, ctypes.sizeof(fpregset))
 
-        fpregset.cwd = regs["cwd"]
-        fpregset.swd = regs["swd"]
-        fpregset.ftw = regs["twd"]
-        fpregset.fop = regs["fop"]
-        fpregset.rip = regs["rip"]
-        fpregset.rdp = regs["rdp"]
-        fpregset.mxcsr = regs["mxcsr"]
-        fpregset.mxcr_mask = regs["mxcsr_mask"]
-        fpregset.st_space = (ctypes.c_uint * len(regs["st_space"]))(
-            *regs["st_space"])
-        fpregset.xmm_space = (ctypes.c_uint * len(regs["xmm_space"]))(
-            *regs["xmm_space"])
+        self._set_fpregset(fpregset, regs)
 
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
@@ -420,6 +443,58 @@ class coredump_generator:
 
         return note
 
+    def _get_fpregs(self, core):
+        """
+        Get the floating point register dictionary based on the current architecture.
+        """
+        fpregs_key_dict = {"aarch64": "fpsimd", "x86_64": "fpregs"}
+        fpregs_key = fpregs_key_dict[self.machine]
+
+        thread_info_key = self.thread_info_key[self.machine]
+
+        return core[thread_info_key][fpregs_key]
+
+    def _set_fpregset(self, fpregset, regs):
+        """
+        Set the fpregset struct based on the current architecture.
+        """
+        if self.machine == "aarch64":
+            fpregset.vregs = (ctypes.c_ulonglong * len(regs["vregs"]))(*regs["vregs"])
+            fpregset.fpsr = regs["fpsr"]
+            fpregset.fpcr = regs["fpcr"]
+        elif self.machine == "x86_64":
+            fpregset.cwd = regs["cwd"]
+            fpregset.swd = regs["swd"]
+            fpregset.ftw = regs["twd"]
+            fpregset.fop = regs["fop"]
+            fpregset.rip = regs["rip"]
+            fpregset.rdp = regs["rdp"]
+            fpregset.mxcsr = regs["mxcsr"]
+            fpregset.mxcr_mask = regs["mxcsr_mask"]
+            fpregset.st_space = (ctypes.c_uint * len(regs["st_space"]))(
+                *regs["st_space"])
+            fpregset.xmm_space = (ctypes.c_uint * len(regs["xmm_space"]))(
+                *regs["xmm_space"])
+
+    def _gen_arm_tls(self, tid):
+        """
+        Generate NT_ARM_TLS note for thread tid of process pid.
+        """
+        core = self.cores[tid]
+        tls = ctypes.c_ulonglong(core["ti_aarch64"]["tls"])
+
+        nhdr = elf.Elf64_Nhdr()
+        nhdr.n_namesz = 6
+        nhdr.n_descsz = ctypes.sizeof(ctypes.c_ulonglong)
+        nhdr.n_type = elf.NT_ARM_TLS
+
+        note = elf_note()
+        note.data = tls
+        note.owner = b"LINUX"
+        note.nhdr = nhdr
+
+        return note
+
     def _gen_x86_xstate(self, pid, tid):
         """
         Generate NT_X86_XSTATE note for thread tid of process pid.
@@ -593,8 +668,11 @@ class coredump_generator:
 
         notes.append(self._gen_prstatus(pid, tid))
         notes.append(self._gen_fpregset(pid, tid))
-        notes.append(self._gen_x86_xstate(pid, tid))
         notes.append(self._gen_siginfo(pid, tid))
+        if self.machine == "aarch64":
+            notes.append(self._gen_arm_tls(tid))
+        elif self.machine == "x86_64":
+            notes.append(self._gen_x86_xstate(pid, tid))
 
         return notes
 
diff --git a/coredump/criu_coredump/elf.py b/coredump/criu_coredump/elf.py
index 092b47857..2697fad07 100644
--- a/coredump/criu_coredump/elf.py
+++ b/coredump/criu_coredump/elf.py
@@ -1,5 +1,8 @@
 # Define structures and constants for generating elf file.
 import ctypes
+import platform
+
+MACHINE = platform.machine()
 
 Elf64_Half = ctypes.c_uint16  # typedef uint16_t Elf64_Half;
 Elf64_Word = ctypes.c_uint32  # typedef uint32_t Elf64_Word;
@@ -39,6 +42,7 @@ ET_CORE = 4  # #define ET_CORE         4               /* Core file */
 
 # Legal values for e_machine (architecture).
 EM_X86_64 = 62  # #define EM_X86_64       62              /* AMD x86-64 architecture */
+EM_AARCH64 = 183  # #define EM_AARCH64	183	/* ARM AARCH64 */
 
 # Legal values for e_version (version).
 EV_CURRENT = 1  # #define EV_CURRENT      1               /* Current version */
@@ -119,6 +123,7 @@ NT_AUXV = 6  # #define NT_AUXV  6  /* Contains copy of auxv array */
 NT_SIGINFO = 0x53494749  # #define NT_SIGINFO  0x53494749  /* Contains copy of siginfo_t, size might increase */
 NT_FILE = 0x46494c45  # #define NT_FILE  0x46494c45  /* Contains information about mapped files */
 NT_X86_XSTATE = 0x202  # #define NT_X86_XSTATE  0x202  /* x86 extended state using xsave */
+NT_ARM_TLS = 0x401  # #define NT_ARM_TLS	0x401 /* ARM TLS register */
 
 
 class Elf64_Nhdr(ctypes.Structure):  # typedef struct
@@ -218,7 +223,7 @@ class timeval(ctypes.Structure):  # struct timeval
     ]
 
 
-class user_regs_struct(ctypes.Structure):  # struct user_regs_struct
+class x86_64_user_regs_struct(ctypes.Structure):  # struct x86_64_user_regs_struct
     _fields_ = [
         ("r15",
          ctypes.c_ulonglong),  # __extension__ unsigned long long int r15;
@@ -277,10 +282,31 @@ class user_regs_struct(ctypes.Structure):  # struct user_regs_struct
     ]
 
 
+class aarch64_user_regs_struct(ctypes.Structure):  # struct aarch64_user_regs_struct
+    _fields_ = [
+        ("regs",
+         ctypes.c_ulonglong * 31),  # unsigned long long int regs[31];
+        ("sp",
+         ctypes.c_ulonglong),  # unsigned long long int sp;
+        ("pc",
+         ctypes.c_ulonglong),  # unsigned long long int pc;
+        ("pstate",
+         ctypes.c_ulonglong),  # unsigned long long int pstate;
+    ]
+
+
 # elf_greg_t    = ctypes.c_ulonglong
 # ELF_NGREG = ctypes.sizeof(user_regs_struct)/ctypes.sizeof(elf_greg_t)
 # elf_gregset_t = elf_greg_t*ELF_NGREG
-elf_gregset_t = user_regs_struct
+user_regs_dict = {
+        "aarch64": aarch64_user_regs_struct,
+        "x86_64": x86_64_user_regs_struct,
+}
+
+try:
+    elf_gregset_t = user_regs_dict[MACHINE]
+except KeyError:
+    raise ValueError("Current architecture %s is not supported." % MACHINE)
 
 
 class elf_prstatus(ctypes.Structure):  # struct elf_prstatus
@@ -420,7 +446,7 @@ class elf_prpsinfo(ctypes.Structure):  # struct elf_prpsinfo
     ]
 
 
-class user_fpregs_struct(ctypes.Structure):  # struct user_fpregs_struct
+class x86_64_user_fpregs_struct(ctypes.Structure):  # struct x86_64_user_fpregs_struct
     _fields_ = [
         # unsigned short int cwd;
         ("cwd", ctypes.c_ushort),
@@ -447,7 +473,28 @@ class user_fpregs_struct(ctypes.Structure):  # struct user_fpregs_struct
     ]
 
 
-elf_fpregset_t = user_fpregs_struct
+class aarch64_user_fpregs_struct(ctypes.Structure):  # struct aarch64_user_fpregs_struct
+    _fields_ = [
+        # unsigned long long int vregs[64];
+        ("vregs", ctypes.c_ulonglong * 64),
+        # unsigned int fpsr;
+        ("fpsr", ctypes.c_uint),
+        # unsigned int fpcr;
+        ("fpcr", ctypes.c_uint),
+        # unsigned int padding[2];
+        ("padding", ctypes.c_uint * 2),
+    ]
+
+
+user_fpregs_dict = {
+        "aarch64": aarch64_user_fpregs_struct,
+        "x86_64": x86_64_user_fpregs_struct,
+}
+
+try:
+    elf_fpregset_t = user_fpregs_dict[MACHINE]
+except KeyError:
+    raise ValueError("Current architecture %s is not supported." % MACHINE)
 
 # siginfo_t related constants.
 
diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index 4399044d7..e0ddce58d 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -45,9 +45,8 @@ function run_test {
 
 UNAME_M=$(uname -m)
 
-if [ "$UNAME_M" != "x86_64" ]; then
-	# the criu-coredump script is only x86_64 aware
-	echo "criu-coredump only support x86_64. skipping."
+if [[ "$UNAME_M" != "aarch64" && "$UNAME_M" != "x86_64" ]]; then
+	echo "criu-coredump only supports aarch64 and x86_64. skipping."
 	exit 0
 fi
 

From 38b9807cd5ef74fa1cd5359b32861e7d94c1897c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=AE=E0=A5=80=E0=A4=B0=20=E0=A4=B8=E0=A4=BF?=
 =?UTF-8?q?=E0=A4=82=E0=A4=B9=20Sameer=20Singh?= <lumarzeli30@gmail.com>
Date: Mon, 17 Feb 2025 18:06:10 +0530
Subject: [PATCH 1635/1854] coredump: enable coredump generation on arm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add relevant elf header constants and notes for the arm platform
to enable coredump generation.

Signed-off-by: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
---
 coredump/coredump                  |   2 +-
 coredump/criu_coredump/coredump.py | 124 +++++++++++++++----
 coredump/criu_coredump/elf.py      | 188 ++++++++++++++++++++++++++++-
 test/others/criu-coredump/test.sh  |   4 +-
 4 files changed, 288 insertions(+), 30 deletions(-)

diff --git a/coredump/coredump b/coredump/coredump
index f1027773d..5b3e6f366 100755
--- a/coredump/coredump
+++ b/coredump/coredump
@@ -6,7 +6,7 @@ import sys
 
 import criu_coredump
 
-PLATFORMS = ["aarch64", "x86_64"]
+PLATFORMS = ["aarch64", "armv7l", "x86_64"]
 
 
 def coredump(opts):
diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 6bfc462f2..c6a758c8a 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -95,8 +95,13 @@ class coredump:
             buf.write(b"\0" * (8 - len(note.owner)))
             buf.write(note.data)
 
-        offset = ctypes.sizeof(elf.Elf64_Ehdr())
-        offset += (len(self.vmas) + 1) * ctypes.sizeof(elf.Elf64_Phdr())
+        bits = platform.architecture()[0]  # 32 or 64 bits
+
+        ehdr = {"32bit": elf.Elf32_Ehdr, "64bit": elf.Elf64_Ehdr}
+        phdr = {"32bit": elf.Elf32_Phdr, "64bit": elf.Elf64_Phdr}
+
+        offset = ctypes.sizeof(ehdr[bits]())
+        offset += (len(self.vmas) + 1) * ctypes.sizeof(phdr[bits]())
 
         filesz = 0
         for note in self.notes:
@@ -132,9 +137,18 @@ class coredump_generator:
     pagemaps = {}  # pagemap by pid;
 
     # thread info key based on the current arch
-    thread_info_key = {"aarch64": "ti_aarch64", "x86_64": "thread_info"}
+    thread_info_key = {
+        "aarch64": "ti_aarch64",
+        "armv7l": "ti_arm",
+        "x86_64": "thread_info",
+    }
 
     machine = platform.machine()  # current arch
+    bits = platform.architecture()[0]  # 32 or 64 bits
+
+    ehdr = {"32bit": elf.Elf32_Ehdr, "64bit": elf.Elf64_Ehdr}  # 32 or 64 bits Ehdr
+    nhdr = {"32bit": elf.Elf32_Nhdr, "64bit": elf.Elf64_Nhdr}  # 32 or 64 bits Nhdr
+    phdr = {"32bit": elf.Elf32_Phdr, "64bit": elf.Elf64_Phdr}  # 32 or 64 bits Phdr
 
     def _img_open_and_strip(self, name, single=False, pid=None):
         """
@@ -207,23 +221,30 @@ class coredump_generator:
         """
         Generate elf header for process pid with program headers phdrs.
         """
-        ehdr = elf.Elf64_Ehdr()
+        ei_class = {"32bit": elf.ELFCLASS32, "64bit": elf.ELFCLASS64}
+
+        ehdr = self.ehdr[self.bits]()
 
         ctypes.memset(ctypes.addressof(ehdr), 0, ctypes.sizeof(ehdr))
         ehdr.e_ident[elf.EI_MAG0] = elf.ELFMAG0
         ehdr.e_ident[elf.EI_MAG1] = elf.ELFMAG1
         ehdr.e_ident[elf.EI_MAG2] = elf.ELFMAG2
         ehdr.e_ident[elf.EI_MAG3] = elf.ELFMAG3
-        ehdr.e_ident[elf.EI_CLASS] = elf.ELFCLASS64
+        ehdr.e_ident[elf.EI_CLASS] = ei_class[self.bits]
         ehdr.e_ident[elf.EI_DATA] = elf.ELFDATA2LSB
         ehdr.e_ident[elf.EI_VERSION] = elf.EV_CURRENT
 
+        if self.machine == "armv7l":
+            ehdr.e_ident[elf.EI_OSABI] = elf.ELFOSABI_ARM
+        else:
+            ehdr.e_ident[elf.EI_OSABI] = elf.ELFOSABI_NONE
+
         ehdr.e_type = elf.ET_CORE
         ehdr.e_machine = self._get_e_machine()
         ehdr.e_version = elf.EV_CURRENT
-        ehdr.e_phoff = ctypes.sizeof(elf.Elf64_Ehdr())
-        ehdr.e_ehsize = ctypes.sizeof(elf.Elf64_Ehdr())
-        ehdr.e_phentsize = ctypes.sizeof(elf.Elf64_Phdr())
+        ehdr.e_phoff = ctypes.sizeof(self.ehdr[self.bits]())
+        ehdr.e_ehsize = ctypes.sizeof(self.ehdr[self.bits]())
+        ehdr.e_phentsize = ctypes.sizeof(self.phdr[self.bits]())
         # FIXME Case len(phdrs) > PN_XNUM should be handled properly.
         # See fs/binfmt_elf.c from linux kernel.
         ehdr.e_phnum = len(phdrs)
@@ -234,7 +255,11 @@ class coredump_generator:
         """
         Get the e_machine field based on the current architecture.
         """
-        e_machine_dict = {"aarch64": elf.EM_AARCH64, "x86_64": elf.EM_X86_64}
+        e_machine_dict = {
+            "aarch64": elf.EM_AARCH64,
+            "armv7l": elf.EM_ARM,
+            "x86_64": elf.EM_X86_64,
+        }
         return e_machine_dict[self.machine]
 
     def _gen_phdrs(self, pid, notes, vmas):
@@ -243,15 +268,15 @@ class coredump_generator:
         """
         phdrs = []
 
-        offset = ctypes.sizeof(elf.Elf64_Ehdr())
-        offset += (len(vmas) + 1) * ctypes.sizeof(elf.Elf64_Phdr())
+        offset = ctypes.sizeof(self.ehdr[self.bits]())
+        offset += (len(vmas) + 1) * ctypes.sizeof(self.phdr[self.bits]())
 
         filesz = 0
         for note in notes:
             filesz += ctypes.sizeof(note.nhdr) + ctypes.sizeof(note.data) + 8
 
         # PT_NOTE
-        phdr = elf.Elf64_Phdr()
+        phdr = self.phdr[self.bits]()
         ctypes.memset(ctypes.addressof(phdr), 0, ctypes.sizeof(phdr))
         phdr.p_type = elf.PT_NOTE
         phdr.p_offset = offset
@@ -271,7 +296,7 @@ class coredump_generator:
         for vma in vmas:
             offset += filesz
             filesz = vma.filesz
-            phdr = elf.Elf64_Phdr()
+            phdr = self.phdr[self.bits]()
             ctypes.memset(ctypes.addressof(phdr), 0, ctypes.sizeof(phdr))
             phdr.p_type = elf.PT_LOAD
             phdr.p_align = PAGESIZE
@@ -328,7 +353,7 @@ class coredump_generator:
         prpsinfo.pr_psargs = self._gen_cmdline(pid)[:80]
         prpsinfo.pr_fname = core["tc"]["comm"].encode()
 
-        nhdr = elf.Elf64_Nhdr()
+        nhdr = self.nhdr[self.bits]()
         nhdr.n_namesz = 5
         nhdr.n_descsz = ctypes.sizeof(elf.elf_prpsinfo())
         nhdr.n_type = elf.NT_PRPSINFO
@@ -360,7 +385,7 @@ class coredump_generator:
 
         self._set_pr_regset(prstatus.pr_reg, regs)
 
-        nhdr = elf.Elf64_Nhdr()
+        nhdr = self.nhdr[self.bits]()
         nhdr.n_namesz = 5
         nhdr.n_descsz = ctypes.sizeof(elf.elf_prstatus())
         nhdr.n_type = elf.NT_PRSTATUS
@@ -390,6 +415,25 @@ class coredump_generator:
             pr_reg.sp = regs["sp"]
             pr_reg.pc = regs["pc"]
             pr_reg.pstate = regs["pstate"]
+        elif self.machine == "armv7l":
+            pr_reg.r0 = regs["r0"]
+            pr_reg.r1 = regs["r1"]
+            pr_reg.r2 = regs["r2"]
+            pr_reg.r3 = regs["r3"]
+            pr_reg.r4 = regs["r4"]
+            pr_reg.r5 = regs["r5"]
+            pr_reg.r6 = regs["r6"]
+            pr_reg.r7 = regs["r7"]
+            pr_reg.r8 = regs["r8"]
+            pr_reg.r9 = regs["r9"]
+            pr_reg.r10 = regs["r10"]
+            pr_reg.fp = regs["fp"]
+            pr_reg.ip = regs["ip"]
+            pr_reg.sp = regs["sp"]
+            pr_reg.lr = regs["lr"]
+            pr_reg.pc = regs["pc"]
+            pr_reg.cpsr = regs["cpsr"]
+            pr_reg.orig_r0 = regs["orig_r0"]
         elif self.machine == "x86_64":
             pr_reg.r15 = regs["r15"]
             pr_reg.r14 = regs["r14"]
@@ -495,6 +539,34 @@ class coredump_generator:
 
         return note
 
+    def _gen_arm_vfp(self, tid):
+        """
+        Generate NT_ARM_VFP note for thread tid of process pid.
+        """
+        core = self.cores[tid]
+        fpstate = core["ti_arm"]["fpstate"]
+
+        data = elf.vfp_hard_struct()
+        ctypes.memset(ctypes.addressof(data), 0, ctypes.sizeof(data))
+
+        data.vfp_regs = (ctypes.c_uint64 * len(fpstate["vfp_regs"]))(*fpstate["vfp_regs"])
+        data.fpexc = fpstate["fpexc"]
+        data.fpscr = fpstate["fpscr"]
+        data.fpinst = fpstate["fpinst"]
+        data.fpinst2 = fpstate["fpinst2"]
+
+        nhdr = elf.Elf32_Nhdr()
+        nhdr.n_namesz = 6
+        nhdr.n_descsz = ctypes.sizeof(data)
+        nhdr.n_type = elf.NT_ARM_VFP
+
+        note = elf_note()
+        note.data = data
+        note.owner = b"LINUX"
+        note.nhdr = nhdr
+
+        return note
+
     def _gen_x86_xstate(self, pid, tid):
         """
         Generate NT_X86_XSTATE note for thread tid of process pid.
@@ -544,7 +616,7 @@ class coredump_generator:
         # FIXME zeroify everything for now
         ctypes.memset(ctypes.addressof(siginfo), 0, ctypes.sizeof(siginfo))
 
-        nhdr = elf.Elf64_Nhdr()
+        nhdr = self.nhdr[self.bits]()
         nhdr.n_namesz = 5
         nhdr.n_descsz = ctypes.sizeof(elf.siginfo_t())
         nhdr.n_type = elf.NT_SIGINFO
@@ -563,17 +635,22 @@ class coredump_generator:
         mm = self.mms[pid]
         num_auxv = len(mm["mm_saved_auxv"]) // 2
 
-        class elf_auxv(ctypes.Structure):
+        class elf32_auxv(ctypes.Structure):
+            _fields_ = [("auxv", elf.Elf32_auxv_t * num_auxv)]
+
+        class elf64_auxv(ctypes.Structure):
             _fields_ = [("auxv", elf.Elf64_auxv_t * num_auxv)]
 
-        auxv = elf_auxv()
+        elf_auxv = {"32bit": elf32_auxv(), "64bit": elf64_auxv()}
+
+        auxv = elf_auxv[self.bits]
         for i in range(num_auxv):
             auxv.auxv[i].a_type = mm["mm_saved_auxv"][i]
             auxv.auxv[i].a_val = mm["mm_saved_auxv"][i + 1]
 
-        nhdr = elf.Elf64_Nhdr()
+        nhdr = self.nhdr[self.bits]()
         nhdr.n_namesz = 5
-        nhdr.n_descsz = ctypes.sizeof(elf_auxv())
+        nhdr.n_descsz = ctypes.sizeof(elf_auxv[self.bits])
         nhdr.n_type = elf.NT_AUXV
 
         note = elf_note()
@@ -650,7 +727,7 @@ class coredump_generator:
             setattr(data, "file_ofs" + str(i), info.file_ofs)
             setattr(data, "name" + str(i), info.name.encode())
 
-        nhdr = elf.Elf64_Nhdr()
+        nhdr = self.nhdr[self.bits]()
 
         nhdr.n_namesz = 5  # strlen + 1
         nhdr.n_descsz = ctypes.sizeof(elf_files())
@@ -667,10 +744,13 @@ class coredump_generator:
         notes = []
 
         notes.append(self._gen_prstatus(pid, tid))
-        notes.append(self._gen_fpregset(pid, tid))
+        if self.machine != "armv7l":
+            notes.append(self._gen_fpregset(pid, tid))
         notes.append(self._gen_siginfo(pid, tid))
         if self.machine == "aarch64":
             notes.append(self._gen_arm_tls(tid))
+        elif self.machine == "armv7l":
+            notes.append(self._gen_arm_vfp(tid))
         elif self.machine == "x86_64":
             notes.append(self._gen_x86_xstate(pid, tid))
 
diff --git a/coredump/criu_coredump/elf.py b/coredump/criu_coredump/elf.py
index 2697fad07..2911f491e 100644
--- a/coredump/criu_coredump/elf.py
+++ b/coredump/criu_coredump/elf.py
@@ -4,13 +4,19 @@ import platform
 
 MACHINE = platform.machine()
 
+Elf32_Half = ctypes.c_uint16  # typedef uint16_t Elf32_Half;
+Elf32_Word = ctypes.c_uint32  # typedef uint32_t Elf32_Word;
+Elf32_Addr = ctypes.c_uint32  # typedef uint32_t Elf32_Addr;
+Elf32_Off = ctypes.c_uint32  # typedef uint32_t Elf32_Off;
+Elf32_Xword = ctypes.c_uint64  # typedef uint64_t Elf32_Xword;
+
 Elf64_Half = ctypes.c_uint16  # typedef uint16_t Elf64_Half;
 Elf64_Word = ctypes.c_uint32  # typedef uint32_t Elf64_Word;
 Elf64_Addr = ctypes.c_uint64  # typedef uint64_t Elf64_Addr;
 Elf64_Off = ctypes.c_uint64  # typedef uint64_t Elf64_Off;
 Elf64_Xword = ctypes.c_uint64  # typedef uint64_t Elf64_Xword;
 
-# Elf64_Ehdr related constants.
+# Elf_Ehdr related constants.
 
 # e_ident size.
 EI_NIDENT = 16  # #define EI_NIDENT (16)
@@ -31,22 +37,50 @@ EI_CLASS = 4  # #define EI_CLASS        4               /* File class byte index
 
 EI_DATA = 5  # #define EI_DATA         5               /* Data encoding byte index */
 
+EI_OSABI = 7  # #define EI_OSABI	7		/* OS ABI identification */
+
 EI_VERSION = 6  # #define EI_VERSION      6               /* File version byte index */
 
 ELFDATA2LSB = 1  # #define ELFDATA2LSB     1               /* 2's complement, little endian */
 
+ELFCLASS32 = 1  # #define ELFCLASS32	1		/* 32-bit objects */
 ELFCLASS64 = 2  # #define ELFCLASS64      2               /* 64-bit objects */
 
 # Legal values for e_type (object file type).
 ET_CORE = 4  # #define ET_CORE         4               /* Core file */
 
 # Legal values for e_machine (architecture).
+EM_ARM = 40  # #define EM_ARM		40	/* ARM */
 EM_X86_64 = 62  # #define EM_X86_64       62              /* AMD x86-64 architecture */
 EM_AARCH64 = 183  # #define EM_AARCH64	183	/* ARM AARCH64 */
 
 # Legal values for e_version (version).
 EV_CURRENT = 1  # #define EV_CURRENT      1               /* Current version */
 
+# Legal values for e_osabi
+ELFOSABI_NONE = 0  # #define ELFOSABI_NONE		0	/* UNIX System V ABI */
+ELFOSABI_ARM = 97  # #define ELFOSABI_ARM		97	/* ARM */
+
+
+class Elf32_Ehdr(ctypes.Structure):  # typedef struct
+    _fields_ = [
+        ("e_ident",
+         ctypes.c_ubyte * EI_NIDENT),  # unsigned char e_ident[EI_NIDENT];
+        ("e_type", Elf32_Half),  # Elf32_Half e_type;
+        ("e_machine", Elf32_Half),  # Elf32_Half e_machine;
+        ("e_version", Elf32_Word),  # Elf32_Word e_version;
+        ("e_entry", Elf32_Addr),  # Elf32_Addr e_entry;
+        ("e_phoff", Elf32_Off),  # Elf32_Off e_phoff;
+        ("e_shoff", Elf32_Off),  # Elf32_Off e_shoff;
+        ("e_flags", Elf32_Word),  # Elf32_Word e_flags;
+        ("e_ehsize", Elf32_Half),  # Elf32_Half e_ehsize;
+        ("e_phentsize", Elf32_Half),  # Elf32_Half e_phentsize;
+        ("e_phnum", Elf32_Half),  # Elf32_Half e_phnum;
+        ("e_shentsize", Elf32_Half),  # Elf32_Half e_shentsize;
+        ("e_shnum", Elf32_Half),  # Elf32_Half e_shnum;
+        ("e_shstrndx", Elf32_Half)  # Elf32_Half e_shstrndx;
+    ]  # } Elf32_Ehdr;
+
 
 class Elf64_Ehdr(ctypes.Structure):  # typedef struct
     _fields_ = [
@@ -68,7 +102,7 @@ class Elf64_Ehdr(ctypes.Structure):  # typedef struct
     ]  # } Elf64_Ehdr;
 
 
-# Elf64_Phdr related constants.
+# Elf_Phdr related constants.
 
 # Legal values for p_type (segment type).
 PT_LOAD = 1  # #define PT_LOAD         1               /* Loadable program segment */
@@ -80,6 +114,19 @@ PF_W = 1 << 1  # #define PF_W            (1 << 1)        /* Segment is writable
 PF_R = 1 << 2  # #define PF_R            (1 << 2)        /* Segment is readable */
 
 
+class Elf32_Phdr(ctypes.Structure):  # typedef struct
+    _fields_ = [
+        ("p_type", Elf32_Word),  # Elf32_Word p_type;
+        ("p_offset", Elf32_Off),  # Elf32_Off p_offset;
+        ("p_vaddr", Elf32_Addr),  # Elf32_Addr p_vaddr;
+        ("p_paddr", Elf32_Addr),  # Elf32_Addr p_paddr;
+        ("p_filesz", Elf32_Word),  # Elf32_Word p_filesz;
+        ("p_memsz", Elf32_Word),  # Elf32_Word p_memsz;
+        ("p_flags", Elf32_Word),  # Elf32_Word p_flags;
+        ("p_align", Elf32_Word),  # Elf32_Word p_align;
+    ]  # } Elf32_Phdr;
+
+
 class Elf64_Phdr(ctypes.Structure):  # typedef struct
     _fields_ = [
         ("p_type", Elf64_Word),  # Elf64_Word p_type;
@@ -93,7 +140,25 @@ class Elf64_Phdr(ctypes.Structure):  # typedef struct
     ]  # } Elf64_Phdr;
 
 
-# Elf64_auxv_t related constants.
+# Elf_auxv_t related constants.
+
+
+class _Elf32_auxv_t_U(ctypes.Union):
+    _fields_ = [("a_val", ctypes.c_uint32)]
+
+
+class Elf32_auxv_t(ctypes.Structure):  # typedef struct
+    _fields_ = [
+        ("a_type",
+         ctypes.c_uint32),   # uint32_t a_type;		/* Entry type */
+        ("a_un", _Elf32_auxv_t_U)  # union
+
+        # uint32_t a_val;		/* Integer value */
+        # /* We use to have pointer elements added here.  We cannot do that,
+        # though, since it does not work when using 32-bit definitions
+        # on 64-bit platforms and vice versa.  */
+        # } a_un;
+    ]  # } Elf32_auxv_t;
 
 
 class _Elf64_auxv_t_U(ctypes.Union):
@@ -114,7 +179,7 @@ class Elf64_auxv_t(ctypes.Structure):  # typedef struct
     ]  # } Elf64_auxv_t;
 
 
-# Elf64_Nhdr related constants.
+# Elf_Nhdr related constants.
 
 NT_PRSTATUS = 1  # #define NT_PRSTATUS  1  /* Contains copy of prstatus struct */
 NT_FPREGSET = 2  # #define NT_FPREGSET  2  /* Contains copy of fpregset struct */
@@ -123,9 +188,24 @@ NT_AUXV = 6  # #define NT_AUXV  6  /* Contains copy of auxv array */
 NT_SIGINFO = 0x53494749  # #define NT_SIGINFO  0x53494749  /* Contains copy of siginfo_t, size might increase */
 NT_FILE = 0x46494c45  # #define NT_FILE  0x46494c45  /* Contains information about mapped files */
 NT_X86_XSTATE = 0x202  # #define NT_X86_XSTATE  0x202  /* x86 extended state using xsave */
+NT_ARM_VFP = 0x400  # #define NT_ARM_VFP	0x400		/* ARM VFP/NEON registers */
 NT_ARM_TLS = 0x401  # #define NT_ARM_TLS	0x401 /* ARM TLS register */
 
 
+class Elf32_Nhdr(ctypes.Structure):  # typedef struct
+    _fields_ = [
+        (
+            "n_namesz", Elf32_Word
+        ),  # Elf32_Word n_namesz;  /* Length of the note's name.  */
+        (
+            "n_descsz", Elf32_Word
+        ),  # Elf32_Word n_descsz;  /* Length of the note's descriptor.  */
+        (
+            "n_type", Elf32_Word
+        ),  # Elf32_Word n_type;  /* Type of the note.  */
+    ]  # } Elf32_Nhdr;
+
+
 class Elf64_Nhdr(ctypes.Structure):  # typedef struct
     _fields_ = [
         (
@@ -139,7 +219,52 @@ class Elf64_Nhdr(ctypes.Structure):  # typedef struct
     ]  # } Elf64_Nhdr;
 
 
-# Elf64_Shdr related constants.
+# Elf_Shdr related constants.
+
+
+class Elf32_Shdr(ctypes.Structure):
+    _fields_ = [
+        (
+            # Section name (string tbl index)
+            "sh_name", Elf32_Word
+        ),
+        (
+            # Section type
+            "sh_type", Elf32_Word
+        ),
+        (
+            # Section flags
+            "sh_flags", Elf32_Word
+        ),
+        (
+            # Section virtual addr at execution
+            "sh_addr", Elf32_Addr
+        ),
+        (
+            # Section file offset
+            "sh_offset", Elf32_Off
+        ),
+        (
+            # Section size in bytes
+            "sh_size", Elf32_Word
+        ),
+        (
+            # Link to another section
+            "sh_link", Elf32_Word
+        ),
+        (
+            # Additional section information
+            "sh_info", Elf32_Word
+        ),
+        (
+            # Section alignment
+            "sh_addralign", Elf32_Word
+        ),
+        (
+            # Entry size if section holds table
+            "sh_entsize", Elf32_Word
+        )
+    ]
 
 
 class Elf64_Shdr(ctypes.Structure):
@@ -295,11 +420,53 @@ class aarch64_user_regs_struct(ctypes.Structure):  # struct aarch64_user_regs_st
     ]
 
 
+class arm_user_regs_struct(ctypes.Structure):  # struct arm_user_regs_struct
+    _fields_ = [
+        ("r0",
+         ctypes.c_ulong),  # unsigned ulong int r0;
+        ("r1",
+         ctypes.c_ulong),  # unsigned ulong int r1;
+        ("r2",
+         ctypes.c_ulong),  # unsigned ulong int r2;
+        ("r3",
+         ctypes.c_ulong),  # unsigned ulong int r3;
+        ("r4",
+         ctypes.c_ulong),  # unsigned ulong int r4;
+        ("r5",
+         ctypes.c_ulong),  # unsigned ulong int r5;
+        ("r6",
+         ctypes.c_ulong),  # unsigned ulong int r6;
+        ("r7",
+         ctypes.c_ulong),  # unsigned ulong int r7;
+        ("r8",
+         ctypes.c_ulong),  # unsigned ulong int r8;
+        ("r9",
+         ctypes.c_ulong),  # unsigned ulong int r9;
+        ("r10",
+         ctypes.c_ulong),  # unsigned ulong int r10;
+        ("fp",
+         ctypes.c_ulong),  # unsigned ulong int fp;
+        ("ip",
+         ctypes.c_ulong),  # unsigned ulong int ip;
+        ("sp",
+         ctypes.c_ulong),  # unsigned ulong int sp;
+        ("lr",
+         ctypes.c_ulong),  # unsigned ulong int lr;
+        ("pc",
+         ctypes.c_ulong),  # unsigned ulong int pc;
+        ("cpsr",
+         ctypes.c_ulong),  # unsigned ulong int cpsr;
+        ("orig_r0",
+         ctypes.c_ulong),  # unsigned ulong int orig_r0;
+    ]
+
+
 # elf_greg_t    = ctypes.c_ulonglong
 # ELF_NGREG = ctypes.sizeof(user_regs_struct)/ctypes.sizeof(elf_greg_t)
 # elf_gregset_t = elf_greg_t*ELF_NGREG
 user_regs_dict = {
         "aarch64": aarch64_user_regs_struct,
+        "armv7l": arm_user_regs_struct,
         "x86_64": x86_64_user_regs_struct,
 }
 
@@ -488,6 +655,7 @@ class aarch64_user_fpregs_struct(ctypes.Structure):  # struct aarch64_user_fpreg
 
 user_fpregs_dict = {
         "aarch64": aarch64_user_fpregs_struct,
+        "armv7l": None,
         "x86_64": x86_64_user_fpregs_struct,
 }
 
@@ -889,3 +1057,13 @@ class elf_xsave_struct(ctypes.Structure):  # struct xsave_struct {
         # struct ymmh_struct              ymmh;
         ("ymmh", ymmh_struct)
     ]  # } __aligned(FP_MIN_ALIGN_BYTES) __packed;
+
+
+class vfp_hard_struct(ctypes.Structure):  # struct vfp_hard_struct {
+    _fields_ = [
+        ("vfp_regs", ctypes.c_ulonglong * 32),  # __u64 fpregs[32];
+        ("fpexc", ctypes.c_ulong),  # __u32 fpexc;
+        ("fpscr", ctypes.c_ulong),  # __u32 fpscr;
+        ("fpinst", ctypes.c_ulong),  # __u32 fpinst;
+        ("fpinst2", ctypes.c_ulong),  # __u32 fpinst2;
+    ]  # };
diff --git a/test/others/criu-coredump/test.sh b/test/others/criu-coredump/test.sh
index e0ddce58d..2be82e64c 100755
--- a/test/others/criu-coredump/test.sh
+++ b/test/others/criu-coredump/test.sh
@@ -45,8 +45,8 @@ function run_test {
 
 UNAME_M=$(uname -m)
 
-if [[ "$UNAME_M" != "aarch64" && "$UNAME_M" != "x86_64" ]]; then
-	echo "criu-coredump only supports aarch64 and x86_64. skipping."
+if [[ "$UNAME_M" != "aarch64" && "$UNAME_M" != "armv7l" &&"$UNAME_M" != "x86_64" ]]; then
+	echo "criu-coredump only supports aarch64 armv7l, and x86_64. skipping."
 	exit 0
 fi
 

From c298b51a6989a26611fe3cbccd1f3da64a23eb50 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 3 Mar 2025 15:03:51 +0000
Subject: [PATCH 1636/1854] scripts/uninstall_module: import signal module

With Python 3.13, the `subprocess` module now uses the
`posix_spawn()` function [1], which requires the `signal`
module to be imported.

Fixes: #2607

[1] https://docs.python.org/3/whatsnew/3.13.html#subprocess

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/uninstall_module.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/uninstall_module.py b/scripts/uninstall_module.py
index 8a9b70892..2da63c800 100755
--- a/scripts/uninstall_module.py
+++ b/scripts/uninstall_module.py
@@ -10,6 +10,16 @@ import site
 import subprocess
 import sys
 
+# With Python 3.13 the subprocess module now uses the `posix_spawn()`
+# function which requires loading the `signal` module:
+#     https://docs.python.org/3/whatsnew/3.13.html#subprocess
+#
+# We need to load this module here, before PYTHONPATH and sys.path
+# have been modified to use the path specified with `--prefix`.
+#
+# flake8: noqa: F401
+import signal
+
 import importlib_metadata
 
 

From d35808f5eec67810df70e34b99ec9064c40cbc13 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 6 Feb 2025 16:38:33 +0100
Subject: [PATCH 1637/1854] ci: update to latest actions for codeql CI job

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/codeql.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 518d9b8ae..88e21d3d1 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -29,22 +29,22 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Packages (cpp)
         if: ${{ matrix.language == 'cpp' }}
         run: |
           sudo scripts/ci/apt-install protobuf-c-compiler libprotobuf-c-dev libprotobuf-dev build-essential libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnet-dev pkg-config libnl-3-dev libbsd0 libbsd-dev iproute2 libcap-dev libaio-dev libbsd-dev python3-yaml libnl-route-3-dev gnutls-dev
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

From ed6374b48c5923bca53d760ac6f04a2817236407 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 6 Feb 2025 11:07:17 +0100
Subject: [PATCH 1638/1854] lsm: use the user provided lsm label

Currently CRIU has the possibility to specify a LSM label during
restore. Unfortunately the information is completely ignored in the case
of SELinux.

This change selects the lsm label from the user if it is provided and
else the label from the checkpoint image is used.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/lsm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/lsm.c b/criu/lsm.c
index d1b73cc79..70b66d42e 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -370,7 +370,7 @@ int render_lsm_profile(char *profile, char **val)
 	case LSMTYPE__APPARMOR:
 		return render_aa_profile(val, profile);
 	case LSMTYPE__SELINUX:
-		if (asprintf(val, "%s", profile) < 0) {
+		if (asprintf(val, "%s", opts.lsm_supplied ? opts.lsm_profile : profile) < 0) {
 			*val = NULL;
 			return -1;
 		}

From d8555015759724c1e90462105ec21c77f89127ec Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 7 Feb 2025 09:24:19 +0100
Subject: [PATCH 1639/1854] vdso: Fixes in DT_GNU_HASH handling

* Hash buckets is an array of 32-bit words. While DT_HASH is 32-bit on
  most platforms except s390 (where it's 64-bit).
* The bloom filter word size differs between 32-bit and 64-bit ELF
  files. This commit adjusts the code to handle both cases.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/pie/util-vdso.c | 57 +++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index 9819335d8..af3c08985 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -121,7 +121,8 @@ static int has_elf_identity(Ehdr_t *ehdr)
 	return true;
 }
 
-static int parse_elf_phdr(uintptr_t mem, size_t size, Phdr_t **dynamic, Phdr_t **load)
+static int parse_elf_phdr(uintptr_t mem, size_t size,
+			  Phdr_t **dynamic, Phdr_t **load, bool *is_32bit)
 {
 	Ehdr_t *ehdr = (void *)mem;
 	uintptr_t addr;
@@ -136,6 +137,8 @@ static int parse_elf_phdr(uintptr_t mem, size_t size, Phdr_t **dynamic, Phdr_t *
 	if (!has_elf_identity(ehdr))
 		return -EINVAL;
 
+	*is_32bit = ehdr->e_ident[EI_CLASS] != ELFCLASS64;
+
 	addr = mem + ehdr->e_phoff;
 	if (__ptr_oob(addr, mem, size))
 		goto err_oob;
@@ -272,6 +275,8 @@ typedef unsigned long Hash_t;
 typedef Word_t Hash_t;
 #endif
 
+typedef uint32_t Hash32_t;
+
 static bool elf_symbol_match(uintptr_t mem, size_t size,
 		uintptr_t dynsymbol_names, Sym_t *sym,
 		const char *symbol, const size_t vdso_symbol_length)
@@ -297,21 +302,22 @@ static bool elf_symbol_match(uintptr_t mem, size_t size,
 static unsigned long elf_symbol_lookup(uintptr_t mem, size_t size,
 		const char *symbol, uint32_t symbol_hash, unsigned int sym_off,
 		uintptr_t dynsymbol_names, Dyn_t *dyn_symtab, Phdr_t *load,
-		Hash_t nbucket, Hash_t nchain, Hash_t *bucket, Hash_t *chain,
+		uint64_t nbucket, uint64_t nchain, void *_bucket, Hash_t *chain,
 		const size_t vdso_symbol_length, bool use_gnu_hash)
 {
 	unsigned int j;
 	uintptr_t addr;
 
-	j = bucket[symbol_hash % nbucket];
-	if (j == STN_UNDEF)
-		return 0;
-
 	addr = mem + dyn_symtab->d_un.d_ptr - load->p_vaddr;
 
 	if (use_gnu_hash) {
-		uint32_t *h = bucket + nbucket + (j - sym_off);
-		uint32_t hash_val;
+		Hash32_t *h, hash_val, *bucket = _bucket;
+
+		j = bucket[symbol_hash % nbucket];
+		if (j == STN_UNDEF)
+			return 0;
+
+		h = bucket + nbucket + (j - sym_off);
 
 		symbol_hash |= 1;
 		do {
@@ -325,6 +331,12 @@ static unsigned long elf_symbol_lookup(uintptr_t mem, size_t size,
 			j++;
 		} while (!(hash_val & 1));
 	} else {
+		Hash_t *bucket = _bucket;
+
+		j = bucket[symbol_hash % nbucket];
+		if (j == STN_UNDEF)
+			return 0;
+
 		for (; j < nchain && j != STN_UNDEF; j = chain[j]) {
 			Sym_t *sym = (void *)addr + sizeof(Sym_t) * j;
 
@@ -338,17 +350,17 @@ static unsigned long elf_symbol_lookup(uintptr_t mem, size_t size,
 
 static int parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 			     struct vdso_symtable *t, uintptr_t dynsymbol_names,
-			     Hash_t *hash, Dyn_t *dyn_symtab, bool use_gnu_hash)
+			     Hash_t *hash, Dyn_t *dyn_symtab, bool use_gnu_hash,
+			     bool is_32bit)
 {
 	ARCH_VDSO_SYMBOLS_LIST
 
 	const char *vdso_symbols[VDSO_SYMBOL_MAX] = { ARCH_VDSO_SYMBOLS };
 	const size_t vdso_symbol_length = sizeof(t->symbols[0].name) - 1;
 
-	Hash_t *bucket = NULL;
+	void *bucket = NULL;
 	Hash_t *chain = NULL;
-	Hash_t nbucket = 0;
-	Hash_t nchain = 0;
+	uint64_t nbucket, nchain = 0;
 
 	unsigned int sym_off = 0;
 	unsigned int i = 0;
@@ -358,17 +370,23 @@ static int parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 	if (use_gnu_hash) {
 		uint32_t *gnu_hash = (uint32_t *)hash;
 		uint32_t bloom_sz;
-		size_t *bloom;
 
 		nbucket = gnu_hash[0];
 		sym_off = gnu_hash[1];
 		bloom_sz = gnu_hash[2];
-		bloom = (size_t *)&gnu_hash[4];
-		bucket = (Hash_t *)(&bloom[bloom_sz]);
+		if (is_32bit) {
+			uint32_t *bloom;
+			bloom = (uint32_t *)&gnu_hash[4];
+			bucket = (Hash_t *)(&bloom[bloom_sz]);
+		} else {
+			uint64_t *bloom;
+			bloom = (uint64_t *)&gnu_hash[4];
+			bucket = (Hash_t *)(&bloom[bloom_sz]);
+		}
 		elf_hash = &elf_gnu_hash;
-		pr_debug("nbucket %lx sym_off %lx bloom_sz %lx bloom %lx bucket %lx\n",
+		pr_debug("nbucket %lx sym_off %lx bloom_sz %lx bucket %lx\n",
 			 (unsigned long)nbucket, (unsigned long)sym_off,
-			 (unsigned long)bloom_sz, (unsigned long)bloom,
+			 (unsigned long)bloom_sz,
 			 (unsigned long)bucket);
 	} else {
 		nbucket = hash[0];
@@ -417,6 +435,7 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 	Dyn_t *dyn_hash = NULL;
 	Hash_t *hash = NULL;
 	bool use_gnu_hash;
+	bool is_32bit;
 
 	uintptr_t dynsymbol_names;
 	uintptr_t addr;
@@ -427,7 +446,7 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 	/*
 	 * We need PT_LOAD and PT_DYNAMIC here. Each once.
 	 */
-	ret = parse_elf_phdr(mem, size, &dynamic, &load);
+	ret = parse_elf_phdr(mem, size, &dynamic, &load, &is_32bit);
 	if (ret < 0)
 		return ret;
 	if (!load || !dynamic) {
@@ -458,7 +477,7 @@ int vdso_fill_symtable(uintptr_t mem, size_t size, struct vdso_symtable *t)
 	hash = (void *)addr;
 
 	ret = parse_elf_symbols(mem, size, load, t, dynsymbol_names, hash, dyn_symtab,
-				use_gnu_hash);
+				use_gnu_hash, is_32bit);
 
 	if (ret <0)
 		return ret;

From 7748b3fe7326f6f987fc9fd0d3fa267800420264 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@engflow.com>
Date: Mon, 10 Mar 2025 14:43:24 +0100
Subject: [PATCH 1640/1854] pstree: print clone flags in error message

Signed-off-by: Han-Wen Nienhuys <hanwen@engflow.com>
---
 criu/pstree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/pstree.c b/criu/pstree.c
index 41df846ed..660f1b9d9 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -962,7 +962,7 @@ static int prepare_pstree_kobj_ids(void)
 			 * this namespace is either inherited from the
 			 * criu or is created for the init task (only)
 			 */
-			pr_err("Can't restore sub-task in NS\n");
+			pr_err("Can't restore sub-task in NS (cflags %lx)\n", cflags);
 			return -1;
 		}
 	}

From c5d46d86a8b07b063bca7e2de762f3c3b1f7b364 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@engflow.com>
Date: Thu, 13 Mar 2025 08:46:16 +0100
Subject: [PATCH 1641/1854] restorer: Add a lock around cgroupd communication.

Threads are put into cgroups through the cgroupd thread, which
communicates with other threads using a socketpair.

Previously, each thread received a dup'd copy of the socket, and did
the following

    sendmsg(socket_dup_fd, my_cgroup_set);

    // wait for ack.
    while (1) {
        recvmsg(socket_dup_fd, &h, MSG_PEEK);
        if (h.pid != my_pid) continue;
        recvmsg(socket_dup_fd, &h, 0);
    }
    close(socket_dup_fd);

When restoring many threads, many threads would be spinning in the
above loop waiting for their PID to appear.

In my test-case, restoring a process with a 11.5G heap and 491 threads
could take anywhere between 10 seconds and 60 seconds to complete.

To avoid the spinning, we drop the loop and MSG_PEEK, and add a lock
around the above code. This does not decrease parallelism, as the
cgroupd daemon uses a single thread anyway.

With the lock in place, the same restore consistently takes around 10
seconds on my machine (Thinkpad P14s, AMD Ryzen 8840HS).

There is a similar "daemon" thread for user namespaces. That already
is protected with a similar userns_sync_lock in __userns_call().

Fixes #2614

Signed-off-by: Han-Wen Nienhuys <hanwen@engflow.com>
---
 criu/cr-restore.c       |  1 +
 criu/include/rst_info.h |  1 +
 criu/pie/restorer.c     | 61 ++++++++++++++++++++---------------------
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index ddca6b8ec..e906da0ce 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2329,6 +2329,7 @@ int prepare_task_entries(void)
 	task_entries->nr_helpers = 0;
 	futex_set(&task_entries->start, CR_STATE_FAIL);
 	mutex_init(&task_entries->userns_sync_lock);
+	mutex_init(&task_entries->cgroupd_sync_lock);
 	mutex_init(&task_entries->last_pid_mutex);
 
 	return 0;
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index df9f9de01..4c9335a73 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -14,6 +14,7 @@ struct task_entries {
 	futex_t start;
 	atomic_t cr_err;
 	mutex_t userns_sync_lock;
+	mutex_t cgroupd_sync_lock;
 	mutex_t last_pid_mutex;
 };
 
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 6d048c3f1..348ce6659 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -704,9 +704,8 @@ static int send_cg_set(int sk, int cg_set)
 }
 
 /*
- * As this socket is shared among threads, recvmsg(MSG_PEEK)
- * from the socket until getting its own thread id as an
- * acknowledge of successful threaded cgroup fixup
+ * As the cgroupd socket is shared among threads and processes, this
+ * should be called with task_entries->cgroupd_sync_lock held.
  */
 static int recv_cg_set_restore_ack(int sk)
 {
@@ -719,33 +718,22 @@ static int recv_cg_set_restore_ack(int sk)
 	h.msg_control = cmsg;
 	h.msg_controllen = sizeof(cmsg);
 
-	while (1) {
-		ret = sys_recvmsg(sk, &h, MSG_PEEK);
-		if (ret < 0) {
-			pr_err("Unable to peek from cgroupd %d\n", ret);
-			return -1;
-		}
+	ret = sys_recvmsg(sk, &h, 0);
+	if (ret < 0) {
+		pr_err("Unable to receive from cgroupd %d\n", ret);
+		return -1;
+	}
 
-		if (h.msg_controllen != sizeof(cmsg)) {
-			pr_err("The message from cgroupd is truncated\n");
-			return -1;
-		}
+	if (h.msg_controllen != sizeof(cmsg)) {
+		pr_err("The message from cgroupd is truncated\n");
+		return -1;
+	}
 
-		ch = CMSG_FIRSTHDR(&h);
-		cred = (struct ucred *)CMSG_DATA(ch);
-		if (cred->pid != sys_gettid())
-			continue;
-
-		/*
-		 * Actual remove message from recv queue of socket
-		 */
-		ret = sys_recvmsg(sk, &h, 0);
-		if (ret < 0) {
-			pr_err("Unable to receive from cgroupd %d\n", ret);
-			return -1;
-		}
-
-		break;
+	ch = CMSG_FIRSTHDR(&h);
+	cred = (struct ucred *)CMSG_DATA(ch);
+	if (cred->pid != sys_gettid()) {
+		pr_err("cred pid %d != gettid\n", cred->pid);
+		return -1;
 	}
 	return 0;
 }
@@ -782,12 +770,21 @@ __visible long __export_restore_thread(struct thread_restore_args *args)
 	rt_sigframe = (void *)&args->mz->rt_sigframe;
 
 	if (args->cg_set != -1) {
+		int err = 0;
+
+		mutex_lock(&task_entries_local->cgroupd_sync_lock);
+
 		pr_info("Restore cg_set in thread cg_set: %d\n", args->cg_set);
-		if (send_cg_set(args->cgroupd_sk, args->cg_set))
-			goto core_restore_end;
-		if (recv_cg_set_restore_ack(args->cgroupd_sk))
-			goto core_restore_end;
+
+		err = send_cg_set(args->cgroupd_sk, args->cg_set);
+		if (!err)
+			err = recv_cg_set_restore_ack(args->cgroupd_sk);
+
+		mutex_unlock(&task_entries_local->cgroupd_sync_lock);
 		sys_close(args->cgroupd_sk);
+
+		if (err)
+			goto core_restore_end;
 	}
 
 	if (restore_thread_common(args))

From 8ae5db37bb01f405ece0a08160a35cd92034e26a Mon Sep 17 00:00:00 2001
From: AV <avagin@gmail.com>
Date: Mon, 3 Mar 2025 19:14:54 +0000
Subject: [PATCH 1642/1854] arm64: C/R PAC keys

PAC stands for Pointer Authentication Code. Each process has 5 PAC keys
and a mask of enabled keys. All this properties have to be C/R-ed.

As they are per-process protperties, we can save/restore them just for
one thread.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 compel/arch/aarch64/src/lib/infect.c     |   2 +-
 compel/arch/arm/src/lib/infect.c         |   2 +-
 compel/arch/loongarch64/src/lib/infect.c |   2 +-
 compel/arch/mips/src/lib/infect.c        |   2 +-
 compel/arch/ppc64/src/lib/infect.c       |   2 +-
 compel/arch/riscv64/src/lib/infect.c     |   2 +-
 compel/arch/s390/src/lib/infect.c        |   2 +-
 compel/arch/x86/src/lib/infect.c         |   2 +-
 compel/include/uapi/infect.h             |   2 +-
 compel/src/lib/infect.c                  |   2 +-
 criu/arch/aarch64/crtools.c              | 167 ++++++++++++++++++++++-
 criu/arch/aarch64/include/asm/dump.h     |   2 +-
 criu/arch/aarch64/include/asm/restore.h  |  10 ++
 criu/arch/arm/crtools.c                  |   2 +-
 criu/arch/arm/include/asm/dump.h         |   2 +-
 criu/arch/loongarch64/crtools.c          |   2 +-
 criu/arch/loongarch64/include/asm/dump.h |   2 +-
 criu/arch/mips/crtools.c                 |   2 +-
 criu/arch/mips/include/asm/dump.h        |   2 +-
 criu/arch/ppc64/crtools.c                |   2 +-
 criu/arch/ppc64/include/asm/dump.h       |   2 +-
 criu/arch/riscv64/crtools.c              |   2 +-
 criu/arch/riscv64/include/asm/dump.h     |   2 +-
 criu/arch/s390/crtools.c                 |   2 +-
 criu/arch/s390/include/asm/dump.h        |   2 +-
 criu/arch/x86/crtools.c                  |   2 +-
 criu/arch/x86/include/asm/compat.h       |   2 +
 criu/arch/x86/include/asm/dump.h         |   2 +-
 criu/cr-restore.c                        |  10 ++
 criu/include/rst_info.h                  |   8 ++
 images/core-aarch64.proto                |  23 ++++
 31 files changed, 244 insertions(+), 26 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 812ba34a3..ec1d0d59e 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -81,7 +81,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		goto err;
 	}
 
-	ret = save(arg, regs, fpsimd);
+	ret = save(pid, arg, regs, fpsimd);
 err:
 	return ret;
 }
diff --git a/compel/arch/arm/src/lib/infect.c b/compel/arch/arm/src/lib/infect.c
index 8b810a88f..a9fb639e2 100644
--- a/compel/arch/arm/src/lib/infect.c
+++ b/compel/arch/arm/src/lib/infect.c
@@ -94,7 +94,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		}
 	}
 
-	ret = save(arg, regs, vfp);
+	ret = save(pid, arg, regs, vfp);
 err:
 	return ret;
 }
diff --git a/compel/arch/loongarch64/src/lib/infect.c b/compel/arch/loongarch64/src/lib/infect.c
index 8e3c19aff..190c39227 100644
--- a/compel/arch/loongarch64/src/lib/infect.c
+++ b/compel/arch/loongarch64/src/lib/infect.c
@@ -91,7 +91,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		goto err;
 	}
 
-	ret = save(arg, regs, fpregs);
+	ret = save(pid, arg, regs, fpregs);
 err:
 	return 0;
 }
diff --git a/compel/arch/mips/src/lib/infect.c b/compel/arch/mips/src/lib/infect.c
index 0e98aaee3..a1d4865cc 100644
--- a/compel/arch/mips/src/lib/infect.c
+++ b/compel/arch/mips/src/lib/infect.c
@@ -149,7 +149,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		regs->regs[0] = 0;
 	}
 
-	ret = save(arg, regs, xs);
+	ret = save(pid, arg, regs, xs);
 	return ret;
 }
 
diff --git a/compel/arch/ppc64/src/lib/infect.c b/compel/arch/ppc64/src/lib/infect.c
index 84c2b1d7c..54abd48a4 100644
--- a/compel/arch/ppc64/src/lib/infect.c
+++ b/compel/arch/ppc64/src/lib/infect.c
@@ -400,7 +400,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 	if (ret)
 		return ret;
 
-	return save(arg, regs, fpregs);
+	return save(pid, arg, regs, fpregs);
 }
 
 int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
diff --git a/compel/arch/riscv64/src/lib/infect.c b/compel/arch/riscv64/src/lib/infect.c
index 861fe3b2f..3f3a4b7ec 100644
--- a/compel/arch/riscv64/src/lib/infect.c
+++ b/compel/arch/riscv64/src/lib/infect.c
@@ -92,7 +92,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		return -1;
 	}
 
-	ret = save(arg, regs, fpsimd);
+	ret = save(pid, arg, regs, fpsimd);
 	return ret;
 }
 
diff --git a/compel/arch/s390/src/lib/infect.c b/compel/arch/s390/src/lib/infect.c
index 85dfc3a4d..a77b38917 100644
--- a/compel/arch/s390/src/lib/infect.c
+++ b/compel/arch/s390/src/lib/infect.c
@@ -348,7 +348,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		}
 	}
 	/* Call save_task_regs() */
-	return save(arg, regs, fpregs);
+	return save(pid, arg, regs, fpregs);
 }
 
 int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index a07b1c9f3..644c483b4 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -453,7 +453,7 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		goto err;
 
 out:
-	ret = save(arg, regs, xs);
+	ret = save(pid, arg, regs, xs);
 err:
 	return ret;
 }
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 7e6134f4b..ed97d64dd 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -97,7 +97,7 @@ extern k_rtsigset_t *compel_thread_sigmask(struct parasite_thread_ctl *tctl);
 struct rt_sigframe;
 
 typedef int (*open_proc_fn)(int pid, int mode, const char *fmt, ...) __attribute__((__format__(__printf__, 3, 4)));
-typedef int (*save_regs_t)(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+typedef int (*save_regs_t)(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 typedef int (*make_sigframe_t)(void *, struct rt_sigframe *, struct rt_sigframe *, k_rtsigset_t *);
 
 struct infect_ctx {
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index caf54e03f..a9bbd6400 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1300,7 +1300,7 @@ struct plain_regs_struct {
 	user_fpregs_struct_t fpregs;
 };
 
-static int save_regs_plain(void *to, user_regs_struct_t *r, user_fpregs_struct_t *f)
+static int save_regs_plain(pid_t pid, void *to, user_regs_struct_t *r, user_fpregs_struct_t *f)
 {
 	struct plain_regs_struct *prs = to;
 
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index e87b8629a..6cde03ee3 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -1,5 +1,6 @@
 #include <string.h>
 #include <unistd.h>
+#include <linux/auxvec.h>
 
 #include <linux/elf.h>
 
@@ -20,10 +21,86 @@
 #include "cpu.h"
 #include "restorer.h"
 #include "compel/infect.h"
+#include "pstree.h"
+
+extern unsigned long getauxval(unsigned long type);
 
 #define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))(src)->e
 
-int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
+static int save_pac_keys(int pid, CoreEntry *core)
+{
+	struct user_pac_address_keys paca;
+	struct user_pac_generic_keys pacg;
+	PacKeys *pac_entry;
+	long pac_enabled_key;
+	struct iovec iov;
+	int ret;
+
+	unsigned long hwcaps = getauxval(AT_HWCAP);
+
+	pac_entry = xmalloc(sizeof(PacKeys));
+	if (!pac_entry)
+		return -1;
+	core->ti_aarch64->pac_keys = pac_entry;
+	pac_keys__init(pac_entry);
+
+	if (hwcaps & HWCAP_PACA) {
+		PacAddressKeys *pac_address_keys;
+
+		pr_debug("%d: Dumping address authentication keys\n", pid);
+		iov.iov_base = &paca;
+		iov.iov_len = sizeof(paca);
+		if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PACA_KEYS, &iov))) {
+			pr_perror("Failed to get address authentication key for %d", pid);
+			return -1;
+		}
+		pac_address_keys = xmalloc(sizeof(PacAddressKeys));
+		if (!pac_address_keys)
+			return -1;
+		pac_address_keys__init(pac_address_keys);
+		pac_entry->pac_address_keys = pac_address_keys;
+		pac_address_keys->apiakey_lo = paca.apiakey;
+		pac_address_keys->apiakey_hi = paca.apiakey >> 64;
+		pac_address_keys->apibkey_lo = paca.apibkey;
+		pac_address_keys->apibkey_hi = paca.apibkey >> 64;
+		pac_address_keys->apdakey_lo = paca.apdakey;
+		pac_address_keys->apdakey_hi = paca.apdakey >> 64;
+		pac_address_keys->apdbkey_lo = paca.apdbkey;
+		pac_address_keys->apdbkey_hi = paca.apdbkey >> 64;
+
+		iov.iov_base = &pac_enabled_key;
+		iov.iov_len = sizeof(pac_enabled_key);
+		ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PAC_ENABLED_KEYS, &iov);
+		if (ret) {
+			pr_perror("Failed to get authentication key mask for %d", pid);
+			return -1;
+		}
+
+		pac_address_keys->pac_enabled_key = pac_enabled_key;
+
+	}
+	if (hwcaps & HWCAP_PACG) {
+		PacGenericKeys *pac_generic_keys;
+
+		pr_debug("%d: Dumping generic authentication keys\n", pid);
+		iov.iov_base = &pacg;
+		iov.iov_len = sizeof(pacg);
+		if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PACG_KEYS, &iov))) {
+			pr_perror("Failed to get a generic authantication key for %d", pid);
+			return -1;
+		}
+		pac_generic_keys = xmalloc(sizeof(PacGenericKeys));
+		if (!pac_generic_keys)
+			return -1;
+		pac_generic_keys__init(pac_generic_keys);
+		pac_entry->pac_generic_keys = pac_generic_keys;
+		pac_generic_keys->apgakey_lo = pacg.apgakey;
+		pac_generic_keys->apgakey_hi = pacg.apgakey >> 64;
+	}
+	return 0;
+}
+
+int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
 {
 	int i;
 	CoreEntry *core = x;
@@ -43,6 +120,8 @@ int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsi
 	assign_reg(core->ti_aarch64->fpsimd, fpsimd, fpsr);
 	assign_reg(core->ti_aarch64->fpsimd, fpsimd, fpcr);
 
+	if (save_pac_keys(pid, core))
+		return -1;
 	return 0;
 }
 
@@ -92,6 +171,12 @@ void arch_free_thread_info(CoreEntry *core)
 			xfree(CORE_THREAD_ARCH_INFO(core)->fpsimd->vregs);
 			xfree(CORE_THREAD_ARCH_INFO(core)->fpsimd);
 		}
+		if (CORE_THREAD_ARCH_INFO(core)->pac_keys) {
+			PacKeys *pac_entry = CORE_THREAD_ARCH_INFO(core)->pac_keys;
+			xfree(pac_entry->pac_address_keys);
+			xfree(pac_entry->pac_generic_keys);
+			xfree(pac_entry);
+		}
 		xfree(CORE_THREAD_ARCH_INFO(core)->gpregs->regs);
 		xfree(CORE_THREAD_ARCH_INFO(core)->gpregs);
 		xfree(CORE_THREAD_ARCH_INFO(core));
@@ -135,3 +220,83 @@ int restore_gpregs(struct rt_sigframe *f, UserRegsEntry *r)
 
 	return 0;
 }
+
+int arch_ptrace_restore(int pid, struct pstree_item *item)
+{
+	unsigned long hwcaps = getauxval(AT_HWCAP);
+	struct user_pac_address_keys upaca;
+	struct user_pac_generic_keys upacg;
+	PacAddressKeys *paca;
+	PacGenericKeys *pacg;
+	long pac_enabled_keys;
+	struct iovec iov;
+	int ret;
+
+
+	pr_debug("%d: Restoring PAC keys\n", pid);
+
+	paca = &rsti(item)->arch_info.pac_address_keys;
+	pacg = &rsti(item)->arch_info.pac_generic_keys;
+	if (rsti(item)->arch_info.has_paca) {
+		if (!(hwcaps & HWCAP_PACA)) {
+			pr_err("PACG support is required from the source system.\n");
+			return 1;
+		}
+		pac_enabled_keys = rsti(item)->arch_info.pac_address_keys.pac_enabled_key;
+
+		upaca.apiakey = paca->apiakey_lo + ((__uint128_t)paca->apiakey_hi << 64);
+		upaca.apibkey = paca->apibkey_lo + ((__uint128_t)paca->apibkey_hi << 64);
+		upaca.apdakey = paca->apdakey_lo + ((__uint128_t)paca->apdakey_hi << 64);
+		upaca.apdbkey = paca->apdbkey_lo + ((__uint128_t)paca->apdbkey_hi << 64);
+
+		iov.iov_base = &upaca;
+		iov.iov_len = sizeof(upaca);
+
+		if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PACA_KEYS, &iov))) {
+			pr_perror("Failed to set address authentication keys for %d", pid);
+			return 1;
+		}
+		iov.iov_base = &pac_enabled_keys;
+		iov.iov_len = sizeof(pac_enabled_keys);
+		if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PAC_ENABLED_KEYS, &iov))) {
+			pr_perror("Failed to set enabled key mask for %d", pid);
+			return 1;
+		}
+	}
+
+	if (rsti(item)->arch_info.has_pacg) {
+		if (!(hwcaps & HWCAP_PACG)) {
+			pr_err("PACG support is required from the source system.\n");
+			return 1;
+		}
+		upacg.apgakey = pacg->apgakey_lo + ((__uint128_t)pacg->apgakey_hi << 64);
+		iov.iov_base = &upacg;
+		iov.iov_len = sizeof(upacg);
+		if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PACG_KEYS, &iov))) {
+			pr_perror("Failed to set the generic authentication key for %d", pid);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+void arch_rsti_init(struct pstree_item *p)
+{
+	PacKeys *pac_keys = p->core[0]->ti_aarch64->pac_keys;
+
+	rsti(p)->arch_info.has_paca = false;
+	rsti(p)->arch_info.has_pacg = false;
+
+	if (!pac_keys)
+		return;
+
+	if (pac_keys->pac_address_keys) {
+		rsti(p)->arch_info.has_paca = true;
+		rsti(p)->arch_info.pac_address_keys = *pac_keys->pac_address_keys;
+	}
+	if (pac_keys->pac_generic_keys) {
+		rsti(p)->arch_info.has_pacg = true;
+		rsti(p)->arch_info.pac_generic_keys = *pac_keys->pac_generic_keys;
+	}
+}
diff --git a/criu/arch/aarch64/include/asm/dump.h b/criu/arch/aarch64/include/asm/dump.h
index 90cd8bca8..ecab061c3 100644
--- a/criu/arch/aarch64/include/asm/dump.h
+++ b/criu/arch/aarch64/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
diff --git a/criu/arch/aarch64/include/asm/restore.h b/criu/arch/aarch64/include/asm/restore.h
index 75e87996a..c79605c40 100644
--- a/criu/arch/aarch64/include/asm/restore.h
+++ b/criu/arch/aarch64/include/asm/restore.h
@@ -26,4 +26,14 @@ static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls)
 
 int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core);
 
+#define ARCH_RST_INFO y
+struct rst_arch_info {
+	bool has_paca, has_pacg;
+	PacAddressKeys pac_address_keys;
+	PacGenericKeys pac_generic_keys;
+};
+
+int arch_ptrace_restore(int pid, struct pstree_item *item);
+void arch_rsti_init(struct pstree_item *current);
+
 #endif
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 26b94e157..6a5e4c89a 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -22,7 +22,7 @@
 
 #define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))((src)->ARM_##e)
 
-int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	CoreEntry *core = x;
 
diff --git a/criu/arch/arm/include/asm/dump.h b/criu/arch/arm/include/asm/dump.h
index 485986065..b0ac5715d 100644
--- a/criu/arch/arm/include/asm/dump.h
+++ b/criu/arch/arm/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
diff --git a/criu/arch/loongarch64/crtools.c b/criu/arch/loongarch64/crtools.c
index eeb0731ca..783951b5b 100644
--- a/criu/arch/loongarch64/crtools.c
+++ b/criu/arch/loongarch64/crtools.c
@@ -29,7 +29,7 @@
 
 #define assign_reg(dst, src, e) (dst)->e = (__typeof__(dst->e))(src)->e
 
-int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	int i;
 	CoreEntry *core = x;
diff --git a/criu/arch/loongarch64/include/asm/dump.h b/criu/arch/loongarch64/include/asm/dump.h
index 04347155c..a1c0c4c58 100644
--- a/criu/arch/loongarch64/include/asm/dump.h
+++ b/criu/arch/loongarch64/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
diff --git a/criu/arch/mips/crtools.c b/criu/arch/mips/crtools.c
index ed4da9b7e..eabbd85f4 100644
--- a/criu/arch/mips/crtools.c
+++ b/criu/arch/mips/crtools.c
@@ -27,7 +27,7 @@
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
 
-int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	CoreEntry *core = x;
 
diff --git a/criu/arch/mips/include/asm/dump.h b/criu/arch/mips/include/asm/dump.h
index 58015833d..ec59b051b 100644
--- a/criu/arch/mips/include/asm/dump.h
+++ b/criu/arch/mips/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 extern int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info);
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index a08a2ca5b..d57040008 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -404,7 +404,7 @@ static int __copy_task_regs(user_regs_struct_t *regs, user_fpregs_struct_t *fpre
 	return 0;
 }
 
-int save_task_regs(void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f)
+int save_task_regs(pid_t pid, void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f)
 {
 	return __copy_task_regs(u, f, (CoreEntry *)arg);
 }
diff --git a/criu/arch/ppc64/include/asm/dump.h b/criu/arch/ppc64/include/asm/dump.h
index eb488900a..7393654fa 100644
--- a/criu/arch/ppc64/include/asm/dump.h
+++ b/criu/arch/ppc64/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
diff --git a/criu/arch/riscv64/crtools.c b/criu/arch/riscv64/crtools.c
index b2d6d2951..eea98d6de 100644
--- a/criu/arch/riscv64/crtools.c
+++ b/criu/arch/riscv64/crtools.c
@@ -23,7 +23,7 @@
 
 #define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))(src)->e
 
-int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
+int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
 {
 	int i;
 	CoreEntry *core = x;
diff --git a/criu/arch/riscv64/include/asm/dump.h b/criu/arch/riscv64/include/asm/dump.h
index c2988f9bf..4f0a2d209 100644
--- a/criu/arch/riscv64/include/asm/dump.h
+++ b/criu/arch/riscv64/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 
diff --git a/criu/arch/s390/crtools.c b/criu/arch/s390/crtools.c
index 5cf160d82..96cef819e 100644
--- a/criu/arch/s390/crtools.c
+++ b/criu/arch/s390/crtools.c
@@ -282,7 +282,7 @@ static void free_ri_cb(UserS390RiEntry *ri_cb)
 /*
  * Copy internal structures into Google Protocol Buffers
  */
-int save_task_regs(void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f)
+int save_task_regs(pid_t pid, void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f)
 {
 	UserS390VxrsHighEntry *vxrs_high = NULL;
 	UserS390VxrsLowEntry *vxrs_low = NULL;
diff --git a/criu/arch/s390/include/asm/dump.h b/criu/arch/s390/include/asm/dump.h
index c200724d7..5a24c5b3d 100644
--- a/criu/arch/s390/include/asm/dump.h
+++ b/criu/arch/s390/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-int save_task_regs(void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f);
+int save_task_regs(pid_t pid, void *arg, user_regs_struct_t *u, user_fpregs_struct_t *f);
 int arch_alloc_thread_info(CoreEntry *core);
 void arch_free_thread_info(CoreEntry *core);
 
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index e068a9a02..1f4d0736b 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -15,7 +15,7 @@
 
 #define XSAVE_PB_NELEMS(__s, __obj, __member) (sizeof(__s) / sizeof(*(__obj)->__member))
 
-int save_task_regs(void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
+int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	CoreEntry *core = x;
 	UserX86RegsEntry *gpregs = core->thread_info->gpregs;
diff --git a/criu/arch/x86/include/asm/compat.h b/criu/arch/x86/include/asm/compat.h
index 867357fa2..4ca704fd7 100644
--- a/criu/arch/x86/include/asm/compat.h
+++ b/criu/arch/x86/include/asm/compat.h
@@ -11,6 +11,8 @@
 
 #include <sys/mman.h>
 
+#include "log.h"
+
 static inline void *alloc_compat_syscall_stack(void)
 {
 	void *mem = (void *)sys_mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE,
diff --git a/criu/arch/x86/include/asm/dump.h b/criu/arch/x86/include/asm/dump.h
index 192f6bd02..925ea91ff 100644
--- a/criu/arch/x86/include/asm/dump.h
+++ b/criu/arch/x86/include/asm/dump.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_DUMP_H__
 #define __CR_ASM_DUMP_H__
 
-extern int save_task_regs(void *, user_regs_struct_t *, user_fpregs_struct_t *);
+extern int save_task_regs(pid_t pid, void *, user_regs_struct_t *, user_fpregs_struct_t *);
 extern int arch_alloc_thread_info(CoreEntry *core);
 extern void arch_free_thread_info(CoreEntry *core);
 extern int get_task_futex_robust_list_compat(pid_t pid, ThreadCoreEntry *info);
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index e906da0ce..1f4881dab 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -17,6 +17,7 @@
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sched.h>
+#include <linux/elf.h>
 
 #include "types.h"
 #include <compel/ptrace.h>
@@ -1707,6 +1708,9 @@ static int restore_task_with_children(void *_arg)
 				     arg);
 }
 
+int __attribute((weak)) arch_ptrace_restore(int pid, struct pstree_item *item);
+int arch_ptrace_restore(int pid, struct pstree_item *item) { return 0; }
+
 static int attach_to_tasks(bool root_seized)
 {
 	struct pstree_item *item;
@@ -1747,6 +1751,8 @@ static int attach_to_tasks(bool root_seized)
 				pr_perror("Unable to set PTRACE_O_TRACESYSGOOD for %d", pid);
 				return -1;
 			}
+			if (arch_ptrace_restore(pid, item))
+				return -1;
 			/*
 			 * Suspend seccomp if necessary. We need to do this because
 			 * although seccomp is restored at the very end of the
@@ -3104,6 +3110,9 @@ static void *restorer_munmap_addr(CoreEntry *core, void *restorer_blob)
 	return restorer_sym(restorer_blob, arch_export_unmap);
 }
 
+void arch_rsti_init(struct pstree_item *p) __attribute__((weak));
+void arch_rsti_init(struct pstree_item *p) {}
+
 static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, unsigned long alen, CoreEntry *core)
 {
 	void *mem = MAP_FAILED;
@@ -3323,6 +3332,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	 */
 	creds_pos_next = creds_pos;
 	siginfo_n = task_args->siginfo_n;
+	arch_rsti_init(current);
 	for (i = 0; i < current->nr_threads; i++) {
 		CoreEntry *tcore;
 		struct rt_sigframe *sigframe;
diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h
index 4c9335a73..deb297e5f 100644
--- a/criu/include/rst_info.h
+++ b/criu/include/rst_info.h
@@ -1,6 +1,7 @@
 #ifndef __CR_RST_INFO_H__
 #define __CR_RST_INFO_H__
 
+#include "asm/restore.h"
 #include "common/lock.h"
 #include "common/list.h"
 #include "vma.h"
@@ -33,6 +34,11 @@ struct rst_rseq {
 	uint64_t rseq_cs_pointer;
 };
 
+#ifndef ARCH_RST_INFO
+struct rst_arch_info {
+};
+#endif
+
 struct rst_info {
 	struct list_head fds;
 
@@ -80,6 +86,8 @@ struct rst_info {
 	futex_t shstk_unlock;
 
 	void *breakpoint;
+
+	struct rst_arch_info arch_info;
 };
 
 extern struct task_entries *task_entries;
diff --git a/images/core-aarch64.proto b/images/core-aarch64.proto
index 3356e6b75..64b0ee9fb 100644
--- a/images/core-aarch64.proto
+++ b/images/core-aarch64.proto
@@ -17,9 +17,32 @@ message user_aarch64_fpsimd_context_entry {
 	required uint32 fpcr	= 3;
 }
 
+message pac_address_keys {
+	required uint64 apiakey_lo = 1;
+	required uint64 apiakey_hi = 2;
+	required uint64 apibkey_lo = 3;
+	required uint64 apibkey_hi = 4;
+	required uint64 apdakey_lo = 5;
+	required uint64 apdakey_hi = 6;
+	required uint64 apdbkey_lo = 7;
+	required uint64 apdbkey_hi = 8;
+	required uint64 pac_enabled_key = 9;
+}
+
+message pac_generic_keys {
+	required uint64 apgakey_lo = 1;
+	required uint64 apgakey_hi = 2;
+}
+
+message pac_keys {
+	optional pac_address_keys pac_address_keys = 6;
+	optional pac_generic_keys pac_generic_keys = 7;
+}
+
 message thread_info_aarch64 {
 	required uint64			 		clear_tid_addr	= 1[(criu).hex = true];
 	required uint64					tls		= 2;
 	required user_aarch64_regs_entry		gpregs		= 3[(criu).hex = true];
 	required user_aarch64_fpsimd_context_entry	fpsimd		= 4;
+	optional pac_keys				pac_keys = 5;
 }

From b8553d19edc1d5278c619420844b24aad2bdd415 Mon Sep 17 00:00:00 2001
From: AV <avagin@gmail.com>
Date: Mon, 3 Mar 2025 20:09:05 +0000
Subject: [PATCH 1643/1854] test/zdtm: check that PAC keys are C/R-ed

Add another variation of ptrhead00 compiled with enabled branch-protection.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/static/Makefile        | 9 +++++++++
 test/zdtm/static/pthread00-pac.c | 1 +
 2 files changed, 10 insertions(+)
 create mode 120000 test/zdtm/static/pthread00-pac.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index f72fb2a77..6a19cad3c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -66,6 +66,7 @@ TST_NOFILE	:=				\
 		pipe01				\
 		pipe02				\
 		pthread00			\
+		pthread00-pac			\
 		pthread01			\
 		pthread02			\
 		pthread_timers			\
@@ -497,6 +498,12 @@ STATE_OUT	= $(TST_STATE:%=%.out)
 
 include ../Makefile.inc
 
+ifeq ($(ARCH),aarch64)
+	PAC_CFLAGS := -mbranch-protection=standard
+else
+	PAC_CFLAGS :=
+endif
+
 all:	$(TST) criu-rtc.so
 install: all
 .PHONY: all install
@@ -588,6 +595,8 @@ uptime_grow:		LDLIBS += -lrt -pthread
 unlink_largefile:	CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 inotify_system_nodel:	CFLAGS += -DNO_DEL
 pthread00:		LDLIBS += -pthread
+pthread00-pac:		CFLAGS += ${PAC_CFLAGS}
+pthread00-pac:		LDLIBS += -pthread
 pthread01:		LDLIBS += -pthread
 pthread02:		LDLIBS += -pthread
 pthread_timers:		LDLIBS += -lrt -pthread
diff --git a/test/zdtm/static/pthread00-pac.c b/test/zdtm/static/pthread00-pac.c
new file mode 120000
index 000000000..3ee8dc1f1
--- /dev/null
+++ b/test/zdtm/static/pthread00-pac.c
@@ -0,0 +1 @@
+pthread00.c
\ No newline at end of file

From 62a4a5874b4b0bd462f28d659b93c73c5c06a900 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Wed, 12 Mar 2025 23:46:05 +0000
Subject: [PATCH 1644/1854] vdso: correct data types for ELF hash table sizes

Let's change the data types of `nbucket` and `nchain` to uint32.

This should fix the following compile-time error on arm32:
/criu/criu/pie/util-vdso.c:336: undefined reference to `__aeabi_uldivmod'

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/pie/util-vdso.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index af3c08985..8daf5c71f 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -302,7 +302,7 @@ static bool elf_symbol_match(uintptr_t mem, size_t size,
 static unsigned long elf_symbol_lookup(uintptr_t mem, size_t size,
 		const char *symbol, uint32_t symbol_hash, unsigned int sym_off,
 		uintptr_t dynsymbol_names, Dyn_t *dyn_symtab, Phdr_t *load,
-		uint64_t nbucket, uint64_t nchain, void *_bucket, Hash_t *chain,
+		uint32_t nbucket, uint32_t nchain, void *_bucket, Hash_t *chain,
 		const size_t vdso_symbol_length, bool use_gnu_hash)
 {
 	unsigned int j;
@@ -360,7 +360,7 @@ static int parse_elf_symbols(uintptr_t mem, size_t size, Phdr_t *load,
 
 	void *bucket = NULL;
 	Hash_t *chain = NULL;
-	uint64_t nbucket, nchain = 0;
+	uint32_t nbucket, nchain = 0;
 
 	unsigned int sym_off = 0;
 	unsigned int i = 0;

From 720bf67e065525133f4b0209baa7142192fbb667 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 16 Mar 2025 22:23:14 +0000
Subject: [PATCH 1645/1854] zdtm/vdso02: unmap vvar_vclock mappings

It is a part of vvar and this test intends to unmap vdso and all vvar
mappings.

Fixes #2622

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/static/vdso02.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/test/zdtm/static/vdso02.c b/test/zdtm/static/vdso02.c
index 2050bca71..5779b7fd6 100644
--- a/test/zdtm/static/vdso02.c
+++ b/test/zdtm/static/vdso02.c
@@ -29,7 +29,8 @@ static int parse_vm_area(char *buf, struct vm_area *vma)
 	return -1;
 }
 
-static int find_blobs(pid_t pid, struct vm_area *vdso, struct vm_area *vvar)
+static int find_blobs(pid_t pid, struct vm_area *vdso,
+		      struct vm_area *vvar, struct vm_area *vvar_vclock)
 {
 	char buf[BUF_SZ];
 	int ret = -1;
@@ -39,6 +40,8 @@ static int find_blobs(pid_t pid, struct vm_area *vdso, struct vm_area *vvar)
 	vdso->end = VDSO_BAD_ADDR;
 	vvar->start = VVAR_BAD_ADDR;
 	vvar->end = VVAR_BAD_ADDR;
+	vvar_vclock->start = VVAR_BAD_ADDR;
+	vvar_vclock->end = VVAR_BAD_ADDR;
 
 	if (snprintf(buf, BUF_SZ, "/proc/%d/maps", pid) < 0) {
 		pr_perror("snprintf() failure for path");
@@ -57,12 +60,18 @@ static int find_blobs(pid_t pid, struct vm_area *vdso, struct vm_area *vvar)
 
 		if (strstr(buf, "[vvar]") && parse_vm_area(buf, vvar))
 			goto err;
+		if (strstr(buf, "[vvar_vclock]") &&
+		    parse_vm_area(buf, vvar_vclock))
+			goto err;
 	}
 
 	if (vdso->start != VDSO_BAD_ADDR)
 		test_msg("[vdso] %lx-%lx\n", vdso->start, vdso->end);
 	if (vvar->start != VVAR_BAD_ADDR)
 		test_msg("[vvar] %lx-%lx\n", vvar->start, vvar->end);
+	if (vvar_vclock->start != VVAR_BAD_ADDR)
+		test_msg("[vvar_vclock] %lx-%lx\n",
+			 vvar_vclock->start, vvar_vclock->end);
 	ret = 0;
 err:
 	fclose(maps);
@@ -143,10 +152,10 @@ void sys_exit(int status)
 
 static int unmap_blobs(void)
 {
-	struct vm_area vdso, vvar;
+	struct vm_area vdso, vvar, vvar_vclock;
 	int ret;
 
-	if (find_blobs(getpid(), &vdso, &vvar))
+	if (find_blobs(getpid(), &vdso, &vvar, &vvar_vclock))
 		return -1;
 
 	if (vdso.start != VDSO_BAD_ADDR) {
@@ -159,13 +168,19 @@ static int unmap_blobs(void)
 		if (ret)
 			return ret;
 	}
+	if (vvar_vclock.start != VVAR_BAD_ADDR) {
+		ret = sys_munmap((void *)vvar_vclock.start,
+				 vvar_vclock.end - vvar_vclock.start);
+		if (ret)
+			return ret;
+	}
 
 	return 0;
 }
 
 int main(int argc, char *argv[])
 {
-	struct vm_area vdso, vvar;
+	struct vm_area vdso, vvar, vvar_vclock;
 	pid_t child;
 	int status, ret = -1;
 
@@ -201,9 +216,11 @@ int main(int argc, char *argv[])
 		goto out_kill;
 	}
 
-	if (find_blobs(child, &vdso, &vvar))
+	if (find_blobs(child, &vdso, &vvar, &vvar_vclock))
 		goto out_kill;
-	if (vdso.start != VDSO_BAD_ADDR || vvar.start != VVAR_BAD_ADDR) {
+	if (vdso.start != VDSO_BAD_ADDR ||
+	    vvar.start != VVAR_BAD_ADDR ||
+	    vvar_vclock.start != VVAR_BAD_ADDR) {
 		pr_err("Found vvar or vdso blob(s) in child, which should have unmapped them\n");
 		goto out_kill;
 	}
@@ -211,7 +228,7 @@ int main(int argc, char *argv[])
 	test_daemon();
 	test_waitsig();
 
-	if (find_blobs(child, &vdso, &vvar))
+	if (find_blobs(child, &vdso, &vvar, &vvar_vclock))
 		goto out_kill;
 	if (vdso.start != VDSO_BAD_ADDR || vvar.start != VVAR_BAD_ADDR) {
 		pr_err("Child without vdso got it after C/R\n");

From 867c773031aef74e66cd15b55418141bcc538b95 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2025 15:50:02 +0000
Subject: [PATCH 1646/1854] make: allow setting the default network locking
 backend

As different Linux distributions are switching away from iptables
to nftables, this makes it easier to compile CRIU with a different
default network locking backend. Instead of changing the source
code it is now possible to select the nft backend like this:

    make NETWORK_LOCK_DEFAULT=NETWORK_LOCK_NFTABLES

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 Makefile                  | 4 ++++
 criu/include/cr_options.h | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/Makefile b/Makefile
index 90908de83..5d8e89ac1 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,10 @@ ifneq ($(GCOV),)
         CFLAGS          += $(CFLAGS-GCOV)
 endif
 
+ifneq ($(NETWORK_LOCK_DEFAULT),)
+	CFLAGS		+= -DNETWORK_LOCK_DEFAULT=$(NETWORK_LOCK_DEFAULT)
+endif
+
 ifeq ($(ASAN),1)
 	CFLAGS-ASAN	:= -fsanitize=address
 	export		CFLAGS-ASAN
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 60cf9437e..ab0bd8fa3 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -70,7 +70,15 @@ enum NETWORK_LOCK_METHOD {
 	NETWORK_LOCK_SKIP,
 };
 
+/**
+ * CRIU currently defaults to the iptables locking backend.
+ *
+ * It is, however, possible to change this by defining
+ * NETWORK_LOCK_DEFAULT to a different value on the command-line.
+ */
+#ifndef NETWORK_LOCK_DEFAULT
 #define NETWORK_LOCK_DEFAULT NETWORK_LOCK_IPTABLES
+#endif
 
 /*
  * Ghost file size we allow to carry by default.

From 2cd9d5ded86204e1a43f57102b86cc06e9ecf0eb Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2025 15:56:27 +0000
Subject: [PATCH 1647/1854] docs: update INSTALL.md with a section about
 building CRIU

The building section also contains the information how to change the
network locking backend without source code changes.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 INSTALL.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/INSTALL.md b/INSTALL.md
index d786d06eb..76ace5b02 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,3 +1,23 @@
+## Building CRIU from source code
+
+First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info.
+
+To compile CRIU, run:
+```
+make
+```
+This should create the `./criu/criu` executable.
+
+To change the default behaviour of CRIU, the following variables can be passed
+to the make command:
+
+ * **NETWORK_LOCK_DEFAULT**, can be set to one of the following
+   values: `NETWORK_LOCK_IPTABLES`, `NETWORK_LOCK_NFTABLES`,
+   `NETWORK_LOCK_SKIP`. CRIU defaults to `NETWORK_LOCK_IPTABLES`
+   if nothing is specified. If another network locking backend is
+   needed, `make` can be called like this:
+   `make NETWORK_LOCK_DEFAULT=NETWORK_LOCK_NFTABLES`
+
 ## Installing CRIU from source code
 
 Once CRIU is built one can easily setup the complete CRIU package

From 95729ec328a02a81824ce2b8c3ecd5eb90a170d4 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2025 15:57:47 +0000
Subject: [PATCH 1648/1854] docs: mark make commands with same format as
 elsewhere

This uses the same formatting for the make command examples as seen in
README.md.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 INSTALL.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 76ace5b02..af0702518 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -23,9 +23,9 @@ to the make command:
 Once CRIU is built one can easily setup the complete CRIU package
 (which includes executable itself, CRIT tool, libraries, manual
 and etc) simply typing
-
-    make install
-
+```
+make install
+```
 this command accepts the following variables:
 
  * **DESTDIR**, to specify global root where all components will be placed under (empty by default);
@@ -36,17 +36,17 @@ this command accepts the following variables:
  * **LIBDIR**, to specify directory where to put libraries (guess the correct path  by default).
 
 Thus one can type
-
-    make DESTDIR=/some/new/place install
-
+```
+make DESTDIR=/some/new/place install
+```
 and get everything installed under `/some/new/place`.
 
 ## Uninstalling CRIU
 
 To clean up previously installed CRIU instance one can type
-
-    make uninstall
-
+```
+make uninstall
+```
 and everything should be removed. Note though that if some variable (**DESTDIR**, **BINDIR**
 and such) has been used during installation procedure, the same *must* be passed with
 uninstall action.

From 29ccb5b625a5cf915f87d1d85952dde6b9b572ee Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 6 Feb 2025 07:34:26 +0000
Subject: [PATCH 1649/1854] test: others/rpc do not use nftables locking
 backend

The tests in others/rpc are running as non-root and
fail silently if the nftables network locking backend is used.

This switches those tests to skip the network locking.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/rpc/errno.py   | 2 ++
 test/others/rpc/ps_test.py | 1 +
 test/others/rpc/run.sh     | 2 +-
 test/others/rpc/test-c.c   | 2 ++
 test/others/rpc/test.py    | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/others/rpc/errno.py b/test/others/rpc/errno.py
index b600b6d1c..4ea6c9d44 100755
--- a/test/others/rpc/errno.py
+++ b/test/others/rpc/errno.py
@@ -67,6 +67,7 @@ class test:
         req = self.get_base_req()
         req.type = rpc.DUMP
         req.opts.pid = pid
+        req.opts.network_lock = rpc.SKIP
 
         self.send_req(req)
         resp = self.recv_resp()
@@ -84,6 +85,7 @@ class test:
         req = self.get_base_req()
         req.type = rpc.DUMP
         req.opts.leave_running = True
+        req.opts.network_lock = rpc.SKIP
 
         self.send_req(req)
         resp = self.recv_resp()
diff --git a/test/others/rpc/ps_test.py b/test/others/rpc/ps_test.py
index daeda49bc..259f22e77 100755
--- a/test/others/rpc/ps_test.py
+++ b/test/others/rpc/ps_test.py
@@ -23,6 +23,7 @@ req.type = rpc.PAGE_SERVER
 req.opts.log_file = 'page-server.log'
 req.opts.log_level = 4
 req.opts.images_dir_fd = os.open(args['dir'], os.O_DIRECTORY)
+req.opts.network_lock = rpc.SKIP
 
 s.send(req.SerializeToString())
 
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index afd4fb5e3..3d5a53ae6 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -51,7 +51,7 @@ function test_restore_loop {
 	title_print "Dump loop process"
 	# So theoretically '-j' (--shell-job) should not be necessary, but on alpine
 	# this test fails without it.
-	${CRIU} dump -j -v4 -o dump-loop.log -D build/imgs_loop -t ${P}
+	${CRIU} dump -j -v4 -o dump-loop.log --network-lock skip -D build/imgs_loop -t ${P}
 
 	title_print "Run restore-loop"
 	./restore-loop.py build/criu_service.socket build/imgs_loop
diff --git a/test/others/rpc/test-c.c b/test/others/rpc/test-c.c
index 792dbbf9c..b3507975f 100644
--- a/test/others/rpc/test-c.c
+++ b/test/others/rpc/test-c.c
@@ -99,6 +99,8 @@ int main(int argc, char *argv[])
 	req.opts->images_dir_fd = dir_fd;
 	req.opts->has_log_level = true;
 	req.opts->log_level = 4;
+	req.opts->has_network_lock = true;
+	req.opts->network_lock = CRIU_NETWORK_LOCK_METHOD__SKIP;
 
 	/*
 	 * Connect to service socket
diff --git a/test/others/rpc/test.py b/test/others/rpc/test.py
index ce8411bc6..6f692f755 100755
--- a/test/others/rpc/test.py
+++ b/test/others/rpc/test.py
@@ -24,6 +24,7 @@ req.type = rpc.DUMP
 req.opts.leave_running = True
 req.opts.log_level = 4
 req.opts.images_dir_fd = os.open(args['dir'], os.O_DIRECTORY)
+req.opts.network_lock = rpc.SKIP
 
 # Send request
 s.send(req.SerializeToString())

From f22330ff07354fd8007a42247fb1e29bcc346033 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Thu, 6 Feb 2025 09:57:52 +0000
Subject: [PATCH 1650/1854] test: print out logs if tests fail

If the tests in others/rpc are failing no information about that error
can be seen in a CI run. This change displays the log files if the test
fails.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/others/rpc/Makefile | 10 +++++++++-
 test/others/rpc/run.sh   | 10 ++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index 69537bb0d..b2f907abe 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -8,9 +8,17 @@ PYTHON ?= python3
 
 run: all
 	@make -C .. loop
-	mkdir -p build
+	mkdir -p build/{imgs_errno,imgs_ps,imgs_c,imgs_loop,imgs_py}
 	chmod a+rwx build
+	chmod a+rwx build/{imgs_errno,imgs_ps,imgs_c,imgs_loop,imgs_py}
 	rm -f build/status
+	@# Create all log files to be accessible for anybody
+	@# so that they can be displayed by any user.
+	for i in imgs_errno/criu.log imgs_ps/page-server.log imgs_ps/dump.log \
+		imgs_c/restore-c.log imgs_loop/criu.log imgs_loop/dump-loop.log \
+		imgs_py/criu.log imgs_py/restore-py.log imgs_c/criu.log service.log; do \
+		touch build/$$i; chmod 666 build/$$i; \
+	done
 	sudo -g '#1000' -u '#1000' mkfifo build/status
 	@# Need to start the criu daemon here to access the pidfile.
 	@# The script read.py is used to wait until 'criu service'
diff --git a/test/others/rpc/run.sh b/test/others/rpc/run.sh
index 3d5a53ae6..b6158dfea 100755
--- a/test/others/rpc/run.sh
+++ b/test/others/rpc/run.sh
@@ -3,6 +3,7 @@
 set -e
 
 CRIU=./criu
+FAIL=1
 
 export PROTODIR=`readlink -f "${PWD}/../../protobuf"`
 
@@ -19,6 +20,13 @@ function stop_server {
 	title_print "Shutdown service server"
 	kill -SIGTERM $(cat build/pidfile)
 	unlink build/pidfile
+	if [ "${FAIL}" == "1" ]; then
+		for i in build/output*; do
+			echo "File: $i"
+			cat $i
+		done
+		find . -name "*.log" -print -exec cat {} \; || true
+	fi
 }
 
 function test_c {
@@ -80,6 +88,8 @@ test_restore_loop
 test_ps
 test_errno
 
+FAIL=0
+
 stop_server
 
 trap 'echo "Success"' EXIT

From 700a8c4b5ebeef536612a95f4d697f8ff0bf9b34 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 5 Feb 2025 07:51:38 +0000
Subject: [PATCH 1651/1854] ci: do not run tests requiring iptables if it is
 missing

There are a couple of tests that require the iptables binary.

Instead of adding a checkskip script, which could also handle this,
this change now uses CRIU's feature detection to see if the CRIU
feature 'has_ipt_legacy' exists.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/net_lock_socket_iptables.desc   | 1 +
 test/zdtm/static/net_lock_socket_iptables6.desc  | 1 +
 test/zdtm/static/netns-nf.desc                   | 1 +
 test/zdtm/static/netns_lock_iptables.desc        | 1 +
 test/zdtm/static/socket-tcp-closed-last-ack.desc | 2 +-
 test/zdtm/static/socket-tcp-reseted.desc         | 2 +-
 test/zdtm/static/socket-tcp-syn-sent.desc        | 2 +-
 7 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/zdtm/static/net_lock_socket_iptables.desc b/test/zdtm/static/net_lock_socket_iptables.desc
index 936ff8702..cb622536f 100644
--- a/test/zdtm/static/net_lock_socket_iptables.desc
+++ b/test/zdtm/static/net_lock_socket_iptables.desc
@@ -1,5 +1,6 @@
 {
     'flavor': 'h',
+    'feature': 'has_ipt_legacy',
     'flags': 'suid excl reqrst',
     'dopts': '--tcp-established --network-lock iptables',
     'ropts': '--tcp-established',
diff --git a/test/zdtm/static/net_lock_socket_iptables6.desc b/test/zdtm/static/net_lock_socket_iptables6.desc
index 936ff8702..cb622536f 100644
--- a/test/zdtm/static/net_lock_socket_iptables6.desc
+++ b/test/zdtm/static/net_lock_socket_iptables6.desc
@@ -1,5 +1,6 @@
 {
     'flavor': 'h',
+    'feature': 'has_ipt_legacy',
     'flags': 'suid excl reqrst',
     'dopts': '--tcp-established --network-lock iptables',
     'ropts': '--tcp-established',
diff --git a/test/zdtm/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index c99696d1c..58c23e8ba 100644
--- a/test/zdtm/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
@@ -3,4 +3,5 @@
                 '/lib/xtables/libxt_standard.so|/usr/lib64/xtables/libxt_standard.so|/usr/lib/iptables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so|/usr/lib/x86_64-linux-gnu/xtables/libxt_standard.so|/usr/lib/s390x-linux-gnu/xtables/libxt_standard.so|/usr/lib/xtables/libxt_standard.so|/usr/lib/aarch64-linux-gnu/xtables/libxt_standard.so|/usr/lib/riscv64-linux-gnu/xtables/libxt_standard.so',
                 '/usr/bin/diff'],
     'flags': 'suid',
+    'feature': 'has_ipt_legacy',
     'flavor': 'ns uns'}
diff --git a/test/zdtm/static/netns_lock_iptables.desc b/test/zdtm/static/netns_lock_iptables.desc
index 69020f34e..b465706b8 100644
--- a/test/zdtm/static/netns_lock_iptables.desc
+++ b/test/zdtm/static/netns_lock_iptables.desc
@@ -1,6 +1,7 @@
 {
     'flavor': 'h',
     'flags': 'suid excl reqrst',
+    'feature': 'has_ipt_legacy',
     'opts': '--tcp-established',
     'dopts': '--network-lock iptables',
     'ropts': '--join-ns net:/var/run/netns/criu-net-lock-test'
diff --git a/test/zdtm/static/socket-tcp-closed-last-ack.desc b/test/zdtm/static/socket-tcp-closed-last-ack.desc
index 309854fa5..c77d58477 100644
--- a/test/zdtm/static/socket-tcp-closed-last-ack.desc
+++ b/test/zdtm/static/socket-tcp-closed-last-ack.desc
@@ -5,6 +5,6 @@
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',
-	'feature' : 'tcp_half_closed',
+	'feature' : 'tcp_half_closed has_ipt_legacy',
 	'flavor': 'ns uns',
 }
diff --git a/test/zdtm/static/socket-tcp-reseted.desc b/test/zdtm/static/socket-tcp-reseted.desc
index 4aa48ad87..ff92e9f9f 100644
--- a/test/zdtm/static/socket-tcp-reseted.desc
+++ b/test/zdtm/static/socket-tcp-reseted.desc
@@ -6,5 +6,5 @@
        ],
        'opts': '--tcp-established',
        'flags': 'suid nouser samens',
-       'feature' : 'tcp_half_closed'
+       'feature' : 'tcp_half_closed has_ipt_legacy'
 }
diff --git a/test/zdtm/static/socket-tcp-syn-sent.desc b/test/zdtm/static/socket-tcp-syn-sent.desc
index 71cd26d72..52382414b 100644
--- a/test/zdtm/static/socket-tcp-syn-sent.desc
+++ b/test/zdtm/static/socket-tcp-syn-sent.desc
@@ -5,5 +5,5 @@
 	],
 	'opts': '--tcp-established',
 	'flags': 'suid nouser samens',
-	'feature' : 'tcp_half_closed'
+	'feature' : 'tcp_half_closed has_ipt_legacy'
 }

From 6826ac58ce842393a8a7d8cf73cd0478d4456330 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Tue, 4 Feb 2025 16:10:02 +0000
Subject: [PATCH 1652/1854] ci: run tests on a nftables only system

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/nftables-test.yml | 24 ++++++++++++++++++++++++
 scripts/ci/run-ci-tests.sh          | 13 ++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/nftables-test.yml

diff --git a/.github/workflows/nftables-test.yml b/.github/workflows/nftables-test.yml
new file mode 100644
index 000000000..eb3d8e814
--- /dev/null
+++ b/.github/workflows/nftables-test.yml
@@ -0,0 +1,24 @@
+name: Nftables bases testing
+
+on: [push, pull_request]
+
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: nftables-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Remove iptables
+      run: sudo apt remove -y iptables
+    - name: Install libnftables-dev
+      run: sudo scripts/ci/apt-install libnftables-dev
+    - name: chmod 755 /home/runner
+      # CRIU's tests are sometimes running as some random user and need
+      # to be able to access the test files.
+      run: sudo chmod 755 /home/runner
+    - name: Build with nftables network locking backend
+      run: sudo make -C scripts/ci local COMPILE_FLAGS="NETWORK_LOCK_DEFAULT=NETWORK_LOCK_NFTABLES"
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 611ff7803..0c4a08975 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -39,6 +39,10 @@ ci_prep () {
 	# This can fail on aarch64 travis
 	service apport stop || :
 
+	# Ubuntu has set up AppArmor in 24.04 so that it blocks use of user
+	# namespaces by unprivileged users. We need this for some of our tests.
+	sysctl kernel.apparmor_restrict_unprivileged_userns=0 || :
+
 	if [ "$CLANG" = "1" ]; then
 		# clang support
 		CC=clang
@@ -121,8 +125,14 @@ if [ "${CD_TO_TOP}" = "1" ]; then
 fi
 
 export GCOV CC
+if [ -z "$COMPILE_FLAGS" ]; then
+	LOCAL_COMPILE_FLAGS=("V=1")
+else
+	IFS=" " read -r -a LOCAL_COMPILE_FLAGS <<< "$COMPILE_FLAGS"
+	LOCAL_COMPILE_FLAGS=("V=1" "${LOCAL_COMPILE_FLAGS[@]}")
+fi
 $CC --version
-time make CC="$CC" -j4 V=1
+time make CC="$CC" -j4 "${LOCAL_COMPILE_FLAGS[@]}"
 
 ./criu/criu -v4 cpuinfo dump || :
 ./criu/criu -v4 cpuinfo check || :
@@ -150,6 +160,7 @@ ulimit -c unlimited
 cgid=$$
 cleanup_cgroup() {
 	./test/zdtm_umount_cgroups $cgid
+	dmesg
 }
 trap cleanup_cgroup EXIT
 ./test/zdtm_mount_cgroups $cgid

From 0f647094424811aaa83839ea10f49d94596a3d15 Mon Sep 17 00:00:00 2001
From: Bui Quang Minh <minhquangbui99@gmail.com>
Date: Wed, 19 Mar 2025 23:19:31 +0700
Subject: [PATCH 1653/1854] namespace: skip cleaning up the uid/gid map in
 error cases

free_userns_maps is called to clean up uid/gid map when the dump
finishes. If we try to clean up these maps in error cases, it can lead
to double free panic. So just skip cleaning up these maps and let
free_userns_maps do its job.

Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
---
 criu/namespaces.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/criu/namespaces.c b/criu/namespaces.c
index b7c0ab400..0c9b16a87 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -1009,36 +1009,31 @@ int dump_user_ns(pid_t pid, int ns_id)
 
 	ret = parse_id_map(pid, "uid_map", &e->uid_map);
 	if (ret < 0)
-		goto err;
+		/*
+		 * The uid_map and gid_map is clean up in free_userns_maps
+		 * later, so we don't need to clean these up in error cases.
+		 */
+		return -1;
+
 	e->n_uid_map = ret;
 
 	ret = parse_id_map(pid, "gid_map", &e->gid_map);
 	if (ret < 0)
-		goto err;
+		return -1;
 	e->n_gid_map = ret;
 
 	if (check_user_ns(pid))
-		goto err;
+		return -1;
 
 	img = open_image(CR_FD_USERNS, O_DUMP, ns_id);
 	if (!img)
-		goto err;
+		return -1;
 	ret = pb_write_one(img, e, PB_USERNS);
 	close_image(img);
 	if (ret < 0)
-		goto err;
+		return -1;
 
 	return 0;
-err:
-	if (e->uid_map) {
-		xfree(e->uid_map[0]);
-		xfree(e->uid_map);
-	}
-	if (e->gid_map) {
-		xfree(e->gid_map[0]);
-		xfree(e->gid_map);
-	}
-	return -1;
 }
 
 void free_userns_maps(void)

From bc1415317379c45b08ac6f8eb98698ca2df9b78c Mon Sep 17 00:00:00 2001
From: Ivan Pravdin <ipravdin.official@gmail.com>
Date: Sat, 22 Mar 2025 19:31:02 -0400
Subject: [PATCH 1654/1854] criu: fix log_keep_err signal deadlock

When using pr_err in signal handler, locking is used
in an unsafe manner. If another signal happens while holding the
lock, deadlock can happen.

To fix this, we can introduce mutex_trylock similar to
pthread_mutex_trylock that returns immediately. Due to the fact
that lock is used only for writing first_err, this change garantees
that deadlock cannot happen.

Fixes: #358

Signed-off-by: Ivan Pravdin <ipravdin.official@gmail.com>
---
 criu/log.c            | 9 +++++----
 include/common/lock.h | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/criu/log.c b/criu/log.c
index 89ae8f820..70e267fd6 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -132,10 +132,11 @@ static void log_note_err(char *msg)
 		 * anyway, so it doesn't make much sense to try hard
 		 * and optimize this out.
 		 */
-		mutex_lock(&first_err->l);
-		if (first_err->s[0] == '\0')
-			__strlcpy(first_err->s, msg, sizeof(first_err->s));
-		mutex_unlock(&first_err->l);
+		if (mutex_trylock(&first_err->l)) {
+			if (first_err->s[0] == '\0')
+				__strlcpy(first_err->s, msg, sizeof(first_err->s));
+			mutex_unlock(&first_err->l);
+		}
 	}
 }
 
diff --git a/include/common/lock.h b/include/common/lock.h
index ccfa468b8..4733d7287 100644
--- a/include/common/lock.h
+++ b/include/common/lock.h
@@ -2,6 +2,7 @@
 #define __CR_COMMON_LOCK_H__
 
 #include <stdint.h>
+#include <stdbool.h>
 #include <linux/futex.h>
 #include <sys/time.h>
 #include <limits.h>
@@ -162,6 +163,11 @@ static inline void mutex_lock(mutex_t *m)
 	}
 }
 
+static inline bool mutex_trylock(mutex_t *m)
+{
+	return atomic_inc_return(&m->raw) == 1;
+}
+
 static inline void mutex_unlock(mutex_t *m)
 {
 	uint32_t c = 0;

From b6059ff193a9b0dff98e997134d662c3ccfd1600 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 24 Mar 2025 15:23:34 -0700
Subject: [PATCH 1655/1854] criu: Version 4.1 (CRISC-V)

Major changes:
* RISC-V Support
* PIDFD Support
* CUDA Enhancements
* Fixes here and there

The full changelog can be found here: https://criu.org/Download/criu/4.1.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 Makefile.versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index c5859801a..85653c217 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 4
-CRIU_VERSION_MINOR	:= 0
+CRIU_VERSION_MINOR	:= 1
 CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= CRIUDA
+CRIU_VERSION_NAME	:= CRISCV
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From 570621a48a81664a37a97f38d0ed65c1c0f56110 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 25 Jul 2025 00:05:06 +0000
Subject: [PATCH 1656/1854] mount-v2: enter the mount namesapce to propagation
 properties

A kernel change (commit 12f147ddd6de, "do_change_type(): refuse to
operate on unmounted/not ours mounts") modified how mount propagation
properties can be changed. Previously, these properties could be changed
from any mount namespace. Now, they can only be modified from the
specific mount namespace where the target mount is actually mounted

This commit addresses this new restriction by ensuring that CRIU enters the
correct mount namespace before attempting to restore mount propagation
properties (MS_SLAVE or MS_SHARED) for a mount.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/mount-v2.c | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index 5d53e9a22..cdebc8318 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -927,8 +927,12 @@ static int move_mount_set_group(int src_id, char *source, int dst_id)
 
 static int restore_one_sharing(struct sharing_group *sg, struct mount_info *target)
 {
+	int nsfd = -1, orig_nsfd = -1, exit_code = -1;
 	char target_path[PATH_MAX];
-	int target_fd;
+	int target_fd = -1;
+
+	if (!sg->master_id && !sg->shared_id)
+		return 0;
 
 	target_fd = fdstore_get(target->mnt_fd_id);
 	BUG_ON(target_fd < 0);
@@ -943,8 +947,7 @@ static int restore_one_sharing(struct sharing_group *sg, struct mount_info *targ
 			first = get_first_mount(sg->parent);
 			if (move_mount_set_group(first->mnt_fd_id, NULL, target->mnt_fd_id)) {
 				pr_err("Failed to copy sharing from %d to %d\n", first->mnt_id, target->mnt_id);
-				close(target_fd);
-				return -1;
+				goto err;
 			}
 		} else {
 			/*
@@ -956,16 +959,23 @@ static int restore_one_sharing(struct sharing_group *sg, struct mount_info *targ
 			 */
 			if (move_mount_set_group(-1, sg->source, target->mnt_fd_id)) {
 				pr_err("Failed to copy sharing from source %s to %d\n", sg->source, target->mnt_id);
-				close(target_fd);
-				return -1;
+				goto err;
 			}
 		}
+	}
 
+	nsfd = fdstore_get(target->nsid->mnt.nsfd_id);
+	if (nsfd < 0)
+		goto err;
+
+	if (switch_ns_by_fd(nsfd, &mnt_ns_desc, &orig_nsfd))
+		goto err;
+
+	if (sg->master_id) {
 		/* Convert shared_id to master_id */
 		if (mount(NULL, target_path, NULL, MS_SLAVE, NULL)) {
 			pr_perror("Failed to make mount %d slave", target->mnt_id);
-			close(target_fd);
-			return -1;
+			goto err;
 		}
 	}
 
@@ -973,13 +983,16 @@ static int restore_one_sharing(struct sharing_group *sg, struct mount_info *targ
 	if (sg->shared_id) {
 		if (mount(NULL, target_path, NULL, MS_SHARED, NULL)) {
 			pr_perror("Failed to make mount %d shared", target->mnt_id);
-			close(target_fd);
-			return -1;
+			goto err;
 		}
 	}
-	close(target_fd);
-
-	return 0;
+	exit_code = 0;
+err:
+	close_safe(&target_fd);
+	close_safe(&nsfd);
+	if (orig_nsfd >= 0 && restore_ns(orig_nsfd, &mnt_ns_desc))
+		exit_code = -1;
+	return exit_code;
 }
 
 static int restore_one_sharing_group(struct sharing_group *sg)

From ced15c302b3f5f11f529e335d4b54ad88b45075e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 8 Jun 2025 17:19:52 -0700
Subject: [PATCH 1657/1854] test/zdtm: remove unused compiler argument

Fixes a clang compile-time error:
"argument unused during compilation: '-c'".

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/Makefile.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 24f32c606..c19888da3 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -76,7 +76,7 @@ endef
 
 %.d: %.c
 	$(E) " DEP      " $@
-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -MM -MP -c $< -o $@
+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -MM -MP $< -o $@
 
 %.o: %.c | %.d
 	$(E) " CC       " $@

From a44aa6d985472d995d04fef7eae22d63c7500f8c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 28 Jul 2025 21:32:02 +0000
Subject: [PATCH 1658/1854] criu: Version 4.1.1

This release of CRIU (4.1.1) addresses a critical compatibility issue
introduced in the Linux kernel and back-ported to all stable releases.

The kernel commit (12f147ddd6de "do_change_type(): refuse to operate on
unmounted/not ours mounts") addressed the security issue introduced
almost 20 years ago. Unfortunately, this change inadvertently broke the
restore functionality of mount namespaces within CRIU. Users attempting
to restore a container on updated kernels would encounter the error:
"mnt-v2: Failed to make mount 476 slave: Invalid argument."

This release contains the necessary adjustments to CRIU, allowing it to
work seamlessly with kernels incorporating this security change.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.versions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.versions b/Makefile.versions
index 85653c217..0b1a46a16 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -2,7 +2,7 @@
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 4
 CRIU_VERSION_MINOR	:= 1
-CRIU_VERSION_SUBLEVEL	:=
+CRIU_VERSION_SUBLEVEL	:= 1
 CRIU_VERSION_EXTRA	:=
 CRIU_VERSION_NAME	:= CRISCV
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))

From 34226fd243b599b8c02dad3ef1530cef2016dabe Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Sat, 18 Jan 2025 13:43:15 +0000
Subject: [PATCH 1659/1854] ci: try GitHub arm runners

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 .github/workflows/actuated-aarch64-test.yaml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/actuated-aarch64-test.yaml b/.github/workflows/actuated-aarch64-test.yaml
index 8b0a63fc7..567746a5f 100644
--- a/.github/workflows/actuated-aarch64-test.yaml
+++ b/.github/workflows/actuated-aarch64-test.yaml
@@ -1,4 +1,4 @@
-name: Actuated aarch64 test
+name: aarch64 test
 
 on: [push, pull_request]
 
@@ -11,32 +11,38 @@ jobs:
   build:
     # Actuated runners are not available in all repositories.
     if: ${{ github.repository == 'checkpoint-restore/criu' }}
-    # The memory size and the number of CPUs can be freely selected.
-    # 3GB and 4 CPUs seems to be enough according to the result from 'vmmeter'.
-    runs-on: actuated-arm64-4cpu-3gb
+    # The memory size and the number of CPUs can be freely selected for
+    # the actuated runners. 3GB and 4 CPUs seems to be enough according to the
+    # result from 'vmmeter'.
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
+        os: [actuated-arm64-4cpu-3gb, ubuntu-24.04-arm]
         target: [GCC=1, CLANG=1]
 
     steps:
     # https://gist.github.com/alexellis/1f33e581c75e11e161fe613c46180771#file-metering-gha-md
     # vmmeter start
     - name: Prepare arkade
+      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
       uses: alexellis/arkade-get@master
       with:
         crane: latest
         print-summary: false
 
     - name: Install vmmeter
+      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
       run: |
         crane export --platform linux/arm64 ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
 
     - name: Run vmmeter
+      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
       uses: self-actuated/vmmeter-action@master
     # vmmeter end
 
     - uses: actions/checkout@v4
-    - name: Run Tests ${{ matrix.target }}
+    - name: Run Tests ${{ matrix.target }}/${{ matrix.os }}
       # Following tests are failing on the actuated VMs:
       #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
       #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))

From daa548bbfb189beb3c2b632a39081f8713b5222f Mon Sep 17 00:00:00 2001
From: Yuanhong Peng <yummypeng@linux.alibaba.com>
Date: Wed, 2 Apr 2025 18:48:12 +0800
Subject: [PATCH 1660/1854] criu: Do not print failed message when there is no
 late stage hook

This is highly confusing, and it seems that the ret variable
is not handled in the subsequent process.

Signed-off-by: Yuanhong Peng <yummypeng@linux.alibaba.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 1f4881dab..583b446e0 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2258,7 +2258,7 @@ skip_ns_bouncing:
 		 * might actually be a true error code but that would be also
 		 * captured in the plugin so no need to print the error here.
 		 */
-		if (ret < 0)
+		if (ret < 0 && ret != -ENOTSUP)
 			pr_debug("restore late stage hook for external plugin failed\n");
 	}
 

From 9a1e979666275f2b94aa42f83bb4bd86ef00b7ea Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 2 Apr 2025 21:13:16 +0000
Subject: [PATCH 1661/1854] compel: fix the stack test

The stack test incorrectly assumed the page immediately
following the stack pointer could never be changed. This doesn't work,
because this page can be a part of another mapping.

This commit introduces a dedicated "stack redzone," a small guard region
directly after the stack. The stack test is modified to specifically
check for corruption within this redzone.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/include/uapi/infect.h |   9 +++
 compel/src/lib/infect.c      |   6 +-
 compel/test/stack/spy.c      | 113 +----------------------------------
 3 files changed, 12 insertions(+), 116 deletions(-)

diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index ed97d64dd..1f61876ff 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -13,6 +13,15 @@
 
 #define PARASITE_START_AREA_MIN (4096)
 
+#define PARASITE_STACK_SIZE (16 << 10)
+/*
+ * A stack redzone is a small, protected region of memory located immediately
+ * after a parasite stack. It is intended to remain unchanged. While it can be
+ * implemented as a guard page, we want to avoid the overhead of additional
+ * remote system calls.
+ */
+#define PARASITE_STACK_REDZONE 128
+
 extern int __must_check compel_interrupt_task(int pid);
 
 struct seize_task_status {
diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index a9bbd6400..4ea27bc63 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -38,8 +38,6 @@
 #define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - (size_t)((struct sockaddr_un *)0)->sun_path)
 #endif
 
-#define PARASITE_STACK_SIZE (16 << 10)
-
 #ifndef SECCOMP_MODE_DISABLED
 #define SECCOMP_MODE_DISABLED 0
 #endif
@@ -1064,7 +1062,7 @@ int compel_infect_no_daemon(struct parasite_ctl *ctl, unsigned long nr_threads,
 
 	p += RESTORE_STACK_SIGFRAME;
 	p += PARASITE_STACK_SIZE;
-	ctl->rstack = ctl->remote_map + p;
+	ctl->rstack = ctl->remote_map + p - PARASITE_STACK_REDZONE;
 
 	/*
 	 * x86-64 ABI requires a 16 bytes aligned stack.
@@ -1078,7 +1076,7 @@ int compel_infect_no_daemon(struct parasite_ctl *ctl, unsigned long nr_threads,
 
 	if (nr_threads > 1) {
 		p += PARASITE_STACK_SIZE;
-		ctl->r_thread_stack = ctl->remote_map + p;
+		ctl->r_thread_stack = ctl->remote_map + p - PARASITE_STACK_REDZONE;
 	}
 
 	ret = arch_fetch_sas(ctl, ctl->rsigframe);
diff --git a/compel/test/stack/spy.c b/compel/test/stack/spy.c
index 9b7c9a7f0..184c8ab31 100644
--- a/compel/test/stack/spy.c
+++ b/compel/test/stack/spy.c
@@ -50,70 +50,6 @@ static void *get_parasite_rstack_start(struct parasite_ctl *ctl)
 	return rstack_start;
 }
 
-static int page_writable(struct parasite_ctl *ctl, int pid, void *page)
-{
-	FILE *maps;
-	size_t maps_line_len = 0;
-	char *maps_line = NULL;
-	char victim_maps_path[6 + 11 + 5 + 1];
-	int written;
-	int ret = 0;
-
-	if (((uintptr_t)page & (page_size() - 1)) != 0) {
-		fprintf(stderr, "Page address not aligned\n");
-		ret = -1;
-		goto done;
-	}
-
-	written = snprintf(victim_maps_path, sizeof(victim_maps_path), "/proc/%d/maps", pid);
-	if (written < 0 || written >= sizeof(victim_maps_path)) {
-		fprintf(stderr, "Failed to create path string to victim's /proc/%d/maps file\n", pid);
-		ret = -1;
-		goto done;
-	}
-
-	maps = fopen(victim_maps_path, "r");
-	if (maps == NULL) {
-		perror("Can't open victim's /proc/$pid/maps");
-		ret = -1;
-		goto done;
-	}
-
-	while (getline(&maps_line, &maps_line_len, maps) != -1) {
-		unsigned long vmstart, vmend;
-		char r, w;
-
-		if (sscanf(maps_line, "%lx-%lx %c%c", &vmstart, &vmend, &r, &w) < 4) {
-			fprintf(stderr, "Can't parse victim's /proc/%d/maps; line: %s\n", pid, maps_line);
-			ret = -1;
-			goto free_linebuf;
-		}
-
-		if (page >= (void *)vmstart && page < (void *)vmend) {
-			if (w == 'w') {
-				if (r != 'r') {
-					fprintf(stderr, "Expecting writable memory to also be readable");
-					ret = -1;
-					goto free_linebuf;
-				}
-				ret = 1;
-			}
-			break;
-		}
-	}
-
-	if (errno) {
-		perror("Can't read victim's /proc/$pid/maps");
-		ret = -1;
-	}
-
-free_linebuf:
-	free(maps_line);
-	fclose(maps);
-done:
-	return ret;
-}
-
 static void *read_proc_mem(int pid, void *offset, size_t len)
 {
 	char victim_mem_path[6 + 11 + 4 + 1];
@@ -153,51 +89,6 @@ freebuf:
 	return NULL;
 }
 
-static int save_data_near_stack(struct parasite_ctl *ctl, int pid, void *stack, void **saved_data,
-				size_t *saved_data_size)
-{
-	size_t page_mask = page_size() - 1;
-	size_t saved_size = 0;
-	size_t stack_size_last_page = (uintptr_t)stack & page_mask;
-	void *next_page = stack;
-
-	if (stack_size_last_page != 0) {
-		size_t empty_space_last_page = page_size() - stack_size_last_page;
-		saved_size = min(empty_space_last_page, (size_t)SAVED_DATA_MAX);
-		next_page += page_size() - stack_size_last_page;
-	}
-
-	while (saved_size < SAVED_DATA_MAX && next_page != NULL) {
-		switch (page_writable(ctl, pid, next_page)) {
-		case 1:
-			saved_size = min((size_t)(saved_size + page_size()), (size_t)SAVED_DATA_MAX);
-			next_page += page_size();
-			break;
-		case 0:
-			next_page = NULL;
-			break;
-		default:
-			return -1;
-		}
-	}
-
-	if (saved_size > 0) {
-		void *sd;
-
-		sd = read_proc_mem(pid, stack, saved_size);
-		if (sd == NULL)
-			return -1;
-
-		*saved_data = sd;
-	} else {
-		*saved_data = NULL;
-	}
-
-	*saved_data_size = saved_size;
-
-	return 0;
-}
-
 static int check_saved_data(struct parasite_ctl *ctl, int pid, void *stack, void *saved_data, size_t saved_data_size)
 {
 	if (saved_data != NULL) {
@@ -221,7 +112,7 @@ static int do_infection(int pid)
 	struct infect_ctx *ictx;
 	int *arg;
 	void *stack;
-	size_t saved_data_size;
+	size_t saved_data_size = PARASITE_STACK_REDZONE;
 	int saved_data_check;
 
 	compel_log_init(print_vmsg, COMPEL_LOG_DEBUG);
@@ -257,8 +148,6 @@ static int do_infection(int pid)
 		err_and_ret("Can't register cleanup function with atexit\n");
 
 	stack = get_parasite_rstack_start(ctl);
-	if (save_data_near_stack(ctl, pid, stack, &saved_data, &saved_data_size))
-		err_and_ret("Can't save data above stack\n");
 
 	if (compel_start_daemon(ctl))
 		err_and_ret("Can't start daemon in victim\n");

From 5ff52326e15b90dc59ed8ae317735201277a2377 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 27 Mar 2025 14:21:03 +0000
Subject: [PATCH 1662/1854] restore: use the new kernel interface to restore
 timers

Thomas Gleixner introduced the new interface to create posix timers
with specifed timer IDs:
https://github.com/torvalds/linux/commit/ec2d0c04624b3c8a7eb1682e006717fa20cfbe24

Previously, CRIU recreated timers by repeatedly creating and deleting
them until the desired ID was reached. This approach isn't fast,
especially for timers with large IDs. For example, restoring two timers
with IDs 1000000 and 2000000 took approximately 1.5 seconds.

The new `prctl()` based interface allows direct creation of timers with
specified IDs, reducing the restoration time to around 3 microseconds
for the same example.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-check.c         | 10 ++++++++
 criu/include/kerndat.h  |  1 +
 criu/include/prctl.h    |  7 ++++++
 criu/include/restorer.h |  1 +
 criu/kerndat.c          | 20 +++++++++++++++
 criu/pie/restorer.c     | 54 +++++++++++++++++++++++++++++++++++++----
 criu/timer.c            |  2 ++
 7 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 0388cbe7f..7b4a6415a 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1392,6 +1392,14 @@ static int check_pagemap_scan(void)
 	return 0;
 }
 
+static int check_timer_cr_ids(void)
+{
+	if (!kdat.has_timer_cr_ids)
+		return -1;
+
+	return 0;
+}
+
 /* musl doesn't have a statx wrapper... */
 struct staty {
 	__u32 stx_dev_major;
@@ -1703,6 +1711,7 @@ int cr_check(void)
 		ret |= check_ipv6_freebind();
 		ret |= check_pagemap_scan();
 		ret |= check_overlayfs_maps();
+		ret |= check_timer_cr_ids();
 
 		if (kdat.lsm == LSMTYPE__APPARMOR)
 			ret |= check_apparmor_stacking();
@@ -1825,6 +1834,7 @@ static struct feature_list feature_list[] = {
 	{ "get_rseq_conf", check_ptrace_get_rseq_conf },
 	{ "ipv6_freebind", check_ipv6_freebind },
 	{ "pagemap_scan", check_pagemap_scan },
+	{ "timer_cr_ids", check_timer_cr_ids },
 	{ "overlayfs_maps", check_overlayfs_maps },
 	{ NULL, NULL },
 };
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index e03a57341..bd8744d62 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -89,6 +89,7 @@ struct kerndat_s {
 	bool has_pagemap_scan;
 	bool has_shstk;
 	bool has_close_range;
+	bool has_timer_cr_ids;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/include/prctl.h b/criu/include/prctl.h
index f5f23c969..2966659da 100644
--- a/criu/include/prctl.h
+++ b/criu/include/prctl.h
@@ -97,4 +97,11 @@ struct prctl_mm_map {
 #define PR_GET_THP_DISABLE 42
 #endif
 
+#ifndef PR_TIMER_CREATE_RESTORE_IDS
+#define PR_TIMER_CREATE_RESTORE_IDS             77
+# define PR_TIMER_CREATE_RESTORE_IDS_OFF        0
+# define PR_TIMER_CREATE_RESTORE_IDS_ON         1
+# define PR_TIMER_CREATE_RESTORE_IDS_GET        2
+#endif
+
 #endif /* __CR_PRCTL_H__ */
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index a4fb7ea79..56bea0fcc 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -170,6 +170,7 @@ struct task_restore_args {
 
 	struct restore_posix_timer *posix_timers;
 	unsigned int posix_timers_n;
+	bool posix_timer_cr_ids;
 
 	struct restore_timerfd *timerfd;
 	unsigned int timerfd_n;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 5939005a4..930117b0a 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1720,6 +1720,22 @@ static int kerndat_has_close_range(void)
 	return 0;
 }
 
+static int kerndat_has_timer_cr_ids(void)
+{
+	if (prctl(PR_TIMER_CREATE_RESTORE_IDS,
+		  PR_TIMER_CREATE_RESTORE_IDS_GET, 0, 0, 0) == -1) {
+		if (errno == EINVAL) {
+			pr_debug("PR_TIMER_CREATE_RESTORE_IDS isn't supported\n");
+			return 0;
+		}
+		pr_perror("prctl returned unexpected error code");
+		return -1;
+	}
+
+	kdat.has_timer_cr_ids = true;
+	return 0;
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the
@@ -1981,6 +1997,10 @@ int kerndat_init(void)
 		pr_err("kerndat_has_close_range has failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_timer_cr_ids()) {
+		pr_err("kerndat_has_timer_cr_ids has failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 348ce6659..9867a3ddd 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1235,9 +1235,23 @@ static int timerfd_arm(struct task_restore_args *args)
 
 static int create_posix_timers(struct task_restore_args *args)
 {
-	int ret, i;
+	int ret, i, exit_code = -1;
 	kernel_timer_t next_id = 0, timer_id;
 	struct sigevent sev;
+	bool create_restore_ids = false;
+
+	if (!args->posix_timers_n)
+		return 0;
+
+	/* prctl returns EINVAL if PR_TIMER_CREATE_RESTORE_IDS isn't supported. */
+	ret = sys_prctl(PR_TIMER_CREATE_RESTORE_IDS,
+			PR_TIMER_CREATE_RESTORE_IDS_ON, 0, 0, 0);
+	if (ret == 0) {
+		create_restore_ids = true;
+	} else if (ret != -EINVAL) {
+		pr_err("Can't enabled PR_TIMER_CREATE_RESTORE_IDS: %d\n", ret);
+		return -1;
+	}
 
 	for (i = 0; i < args->posix_timers_n; i++) {
 		sev.sigev_notify = args->posix_timers[i].spt.it_sigev_notify;
@@ -1249,16 +1263,36 @@ static int create_posix_timers(struct task_restore_args *args)
 #endif
 		sev.sigev_value.sival_ptr = args->posix_timers[i].spt.sival_ptr;
 
+		if (create_restore_ids) {
+			/*
+			 * With enabled PR_TIMER_CREATE_RESTORE_IDS, the
+			 * timer_create syscall creates a new timer with the
+			 * specified ID.
+			 */
+			timer_id = args->posix_timers[i].spt.it_id;
+			ret = sys_timer_create(args->posix_timers[i].spt.clock_id, &sev, &timer_id);
+			if (ret < 0) {
+				pr_err("Can't create posix timer - %d: %d\n", i, ret);
+				goto out;
+			}
+			if (timer_id != args->posix_timers[i].spt.it_id) {
+				pr_err("Unexpected timer id %u (expected %lu)\n",
+				       timer_id, args->posix_timers[i].spt.it_id);
+				goto out;
+			}
+			continue;
+		}
+
 		while (1) {
 			ret = sys_timer_create(args->posix_timers[i].spt.clock_id, &sev, &timer_id);
 			if (ret < 0) {
 				pr_err("Can't create posix timer - %d\n", i);
-				return ret;
+				goto out;
 			}
 
 			if (timer_id != next_id) {
 				pr_err("Can't create timers, kernel don't give them consequently\n");
-				return -1;
+				goto out;
 			}
 			next_id++;
 
@@ -1268,12 +1302,22 @@ static int create_posix_timers(struct task_restore_args *args)
 			ret = sys_timer_delete(timer_id);
 			if (ret < 0) {
 				pr_err("Can't remove temporaty posix timer 0x%x\n", timer_id);
-				return ret;
+				goto out;
 			}
 		}
 	}
 
-	return 0;
+	exit_code = 0;
+out:
+	if (create_restore_ids) {
+		ret = sys_prctl(PR_TIMER_CREATE_RESTORE_IDS,
+				PR_TIMER_CREATE_RESTORE_IDS_OFF, 0, 0, 0);
+		if (ret != 0) {
+			pr_err("Can't disable PR_TIMER_CREATE_RESTORE_IDS: %d\n", ret);
+			exit_code = -1;
+		}
+	}
+	return exit_code;
 }
 
 static void restore_posix_timers(struct task_restore_args *args)
diff --git a/criu/timer.c b/criu/timer.c
index 0413e2a72..856501be6 100644
--- a/criu/timer.c
+++ b/criu/timer.c
@@ -195,6 +195,7 @@ int prepare_posix_timers_from_fd(int pid, struct task_restore_args *ta)
 	if (!img)
 		return -1;
 
+	ta->posix_timer_cr_ids = kdat.has_timer_cr_ids;
 	ta->posix_timers_n = 0;
 	while (1) {
 		PosixTimerEntry *pte;
@@ -234,6 +235,7 @@ int prepare_posix_timers(int pid, struct task_restore_args *ta, CoreEntry *core)
 		return prepare_posix_timers_from_fd(pid, ta);
 
 	ta->posix_timers_n = tte->n_posix;
+	ta->posix_timer_cr_ids = kdat.has_timer_cr_ids;
 	for (i = 0; i < ta->posix_timers_n; i++) {
 		t = rst_mem_alloc(sizeof(struct restore_posix_timer), RM_PRIVATE);
 		if (!t)

From e7aee3c5c723e95e1c0e787f4c57919c2fc58c60 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 10 Apr 2025 20:56:23 +0100
Subject: [PATCH 1663/1854] cuda: use pr_perror for libc function errors

When handing errors for functions such as `ptrace()`, `pipe()`, and
`fork()` it would be better to use `pr_perror` instead of `pr_err`
as it would include a message describing the encountered error.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 99e4caf74..1aaad6842 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -93,7 +93,7 @@ static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 	int fd[2], buf_off;
 
 	if (pipe(fd) != 0) {
-		pr_err("Couldn't create pipes for reading cuda-checkpoint output\n");
+		pr_perror("Couldn't create pipes for reading cuda-checkpoint output");
 		return -1;
 	}
 
@@ -101,7 +101,7 @@ static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 
 	int child_pid = fork();
 	if (child_pid == -1) {
-		pr_err("Failed to fork to exec cuda-checkpoint\n");
+		pr_perror("Failed to fork to exec cuda-checkpoint");
 		close(fd[READ]);
 		close(fd[WRITE]);
 		return -1;
@@ -166,7 +166,6 @@ static int launch_cuda_checkpoint(const char **args, char *buf, int buf_size)
 	}
 	if (WIFSIGNALED(status)) {
 		int sig = WTERMSIG(status);
-
 		pr_err("cuda-checkpoint unexpectedly signaled with %d: %s\n", sig, strsignal(sig));
 	} else if (WIFEXITED(status)) {
 		exit_code = WEXITSTATUS(status);
@@ -283,8 +282,8 @@ static int interrupt_restore_thread(int restore_tid, k_rtsigset_t *restore_sigse
 	 * a compel_interrupt_task()
 	 */
 	if (ptrace(PTRACE_INTERRUPT, restore_tid, NULL, 0)) {
-		pr_err("Could not interrupt cuda restore tid %d after checkpoint, process may be in strange state\n",
-		       restore_tid);
+		pr_perror("Could not interrupt cuda restore tid %d after checkpoint, process may be in strange state",
+			  restore_tid);
 		return -1;
 	}
 
@@ -295,12 +294,12 @@ static int interrupt_restore_thread(int restore_tid, k_rtsigset_t *restore_sigse
 	}
 
 	if (ptrace(PTRACE_SETOPTIONS, restore_tid, NULL, PTRACE_O_SUSPEND_SECCOMP | PTRACE_O_TRACESYSGOOD)) {
-		pr_err("Failed to set ptrace options on interrupt for restore tid %d\n", restore_tid);
+		pr_perror("Failed to set ptrace options on interrupt for restore tid %d", restore_tid);
 		return -1;
 	}
 
 	if (ptrace(PTRACE_SETSIGMASK, restore_tid, sizeof(*restore_sigset), restore_sigset)) {
-		pr_err("Unable to restore original sigmask to restore tid %d\n", restore_tid);
+		pr_perror("Unable to restore original sigmask to restore tid %d", restore_tid);
 		return -1;
 	}
 
@@ -312,7 +311,7 @@ static int resume_restore_thread(int restore_tid, k_rtsigset_t *save_sigset)
 	k_rtsigset_t block;
 
 	if (ptrace(PTRACE_GETSIGMASK, restore_tid, sizeof(*save_sigset), save_sigset)) {
-		pr_err("Failed to get current sigmask for restore tid %d\n", restore_tid);
+		pr_perror("Failed to get current sigmask for restore tid %d", restore_tid);
 		return -1;
 	}
 
@@ -320,18 +319,18 @@ static int resume_restore_thread(int restore_tid, k_rtsigset_t *save_sigset)
 	ksigdelset(&block, SIGTRAP);
 
 	if (ptrace(PTRACE_SETSIGMASK, restore_tid, sizeof(block), &block)) {
-		pr_err("Failed to block signals on restore tid %d\n", restore_tid);
+		pr_perror("Failed to block signals on restore tid %d", restore_tid);
 		return -1;
 	}
 
 	// Clear out PTRACE_O_SUSPEND_SECCOMP when we resume the restore thread
 	if (ptrace(PTRACE_SETOPTIONS, restore_tid, NULL, 0)) {
-		pr_err("Could not clear ptrace options on restore tid %d\n", restore_tid);
+		pr_perror("Could not clear ptrace options on restore tid %d", restore_tid);
 		return -1;
 	}
 
 	if (ptrace(PTRACE_CONT, restore_tid, NULL, 0)) {
-		pr_err("Could not resume cuda restore tid %d\n", restore_tid);
+		pr_perror("Could not resume cuda restore tid %d", restore_tid);
 		return -1;
 	}
 

From 6805841660e741eda203ef8339a895281f2095e9 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 10 Apr 2025 21:14:05 +0100
Subject: [PATCH 1664/1854] cuda: remove redundant goto label

The `goto interrupt` label is unnecessary as the code directly
returns after `cuda_process_checkpoint_action()`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/cuda/cuda_plugin.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/cuda/cuda_plugin.c b/plugins/cuda/cuda_plugin.c
index 1aaad6842..9ccb04224 100644
--- a/plugins/cuda/cuda_plugin.c
+++ b/plugins/cuda/cuda_plugin.c
@@ -395,12 +395,9 @@ int cuda_plugin_checkpoint_devices(int pid)
 	status = cuda_process_checkpoint_action(pid, ACTION_CHECKPOINT, 0, msg_buf, sizeof(msg_buf));
 	if (status) {
 		pr_err("CHECKPOINT_DEVICES failed with %s\n", msg_buf);
-		goto interrupt;
 	}
 
-interrupt:
 	int_ret = interrupt_restore_thread(restore_tid, &save_sigset);
-
 	return status != 0 ? -1 : int_ret;
 }
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, cuda_plugin_checkpoint_devices);

From 74799ae023f82d99efac8d67974705087f208567 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 9 Apr 2025 13:25:44 +0000
Subject: [PATCH 1665/1854] aarch64: fix build with missing
 NT_ARM_PAC_ENABLED_KEYS

On a RHEL 8 based system building CRIU fails with:

criu/arch/aarch64/crtools.c: In function 'save_pac_keys':
criu/arch/aarch64/crtools.c:73:39: error: 'NT_ARM_PAC_ENABLED_KEYS' undeclared (first use in this function); did you mean 'NT_ARM_PACA_KEYS'?
   ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PAC_ENABLED_KEYS, &iov);
                                       ^~~~~~~~~~~~~~~~~~~~~~~
                                       NT_ARM_PACA_KEYS
criu/arch/aarch64/crtools.c:73:39: note: each undeclared identifier is reported only once for each function it appears in
criu/arch/aarch64/crtools.c: In function 'arch_ptrace_restore':
criu/arch/aarch64/crtools.c:261:44: error: 'NT_ARM_PAC_ENABLED_KEYS' undeclared (first use in this function); did you mean 'NT_ARM_PACA_KEYS'?
   if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PAC_ENABLED_KEYS, &iov))) {
                                            ^~~~~~~~~~~~~~~~~~~~~~~
                                            NT_ARM_PACA_KEYS

This adds the missing define if it is undefined.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/arch/aarch64/crtools.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 6cde03ee3..c077dd06b 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -23,6 +23,10 @@
 #include "compel/infect.h"
 #include "pstree.h"
 
+#ifndef NT_ARM_PAC_ENABLED_KEYS
+#define NT_ARM_PAC_ENABLED_KEYS	0x40a	/* AArch64 pointer authentication enabled keys. */
+#endif
+
 extern unsigned long getauxval(unsigned long type);
 
 #define assign_reg(dst, src, e) dst->e = (__typeof__(dst->e))(src)->e

From b9da95b0b2c5f42b24725d673bf287b3c00bbc40 Mon Sep 17 00:00:00 2001
From: Younes Manton <ymanton@ca.ibm.com>
Date: Tue, 23 Jan 2024 08:22:07 -0800
Subject: [PATCH 1666/1854] s390: Fix FP reg restore after parasite code runs

Currently we save FP regs before parasite code runs, and restore after
for --leave-running, --check-only, and in case of errors. In case of
errors the error may have happened before FP regs were saved, so we
should only restore them if they were actually saved.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
---
 criu/arch/s390/crtools.c | 90 +++++++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 38 deletions(-)

diff --git a/criu/arch/s390/crtools.c b/criu/arch/s390/crtools.c
index 96cef819e..e08c83878 100644
--- a/criu/arch/s390/crtools.c
+++ b/criu/arch/s390/crtools.c
@@ -142,6 +142,29 @@ static void print_core_fp_regs(const char *msg, CoreEntry *core)
 	print_core_ri_cb(core);
 }
 
+/*
+ * Allocate floating point registers
+ */
+static UserS390FpregsEntry *allocate_fp_regs(void)
+{
+	UserS390FpregsEntry *fpregs;
+
+	fpregs = xmalloc(sizeof(*fpregs));
+	if (!fpregs)
+		return NULL;
+	user_s390_fpregs_entry__init(fpregs);
+
+	fpregs->n_fprs = 16;
+	fpregs->fprs = xzalloc(16 * sizeof(uint64_t));
+	if (!fpregs->fprs)
+		goto fail_free_fpregs;
+	return fpregs;
+
+fail_free_fpregs:
+	xfree(fpregs);
+	return NULL;
+}
+
 /*
  * Allocate VxrsLow registers
  */
@@ -294,7 +317,13 @@ int save_task_regs(pid_t pid, void *arg, user_regs_struct_t *u, user_fpregs_stru
 	CoreEntry *core = arg;
 
 	gpregs = CORE_THREAD_ARCH_INFO(core)->gpregs;
-	fpregs = CORE_THREAD_ARCH_INFO(core)->fpregs;
+	/*
+	 * We delay allocating this until now because checkpointing can fail earlier.
+	 * When it fails we need to know if we reached here or not so that the cleanup
+	 * code doesn't restore FPRs that were never saved in the first place.
+	 */
+	fpregs = allocate_fp_regs();
+	CORE_THREAD_ARCH_INFO(core)->fpregs = fpregs;
 
 	/* Vector registers */
 	if (f->flags & USER_FPREGS_VXRS) {
@@ -399,36 +428,15 @@ int restore_fpu(struct rt_sigframe *f, CoreEntry *core)
 	return 0;
 }
 
-/*
- * Allocate floating point registers
- */
-static UserS390FpregsEntry *allocate_fp_regs(void)
-{
-	UserS390FpregsEntry *fpregs;
-
-	fpregs = xmalloc(sizeof(*fpregs));
-	if (!fpregs)
-		return NULL;
-	user_s390_fpregs_entry__init(fpregs);
-
-	fpregs->n_fprs = 16;
-	fpregs->fprs = xzalloc(16 * sizeof(uint64_t));
-	if (!fpregs->fprs)
-		goto fail_free_fpregs;
-	return fpregs;
-
-fail_free_fpregs:
-	xfree(fpregs);
-	return NULL;
-}
-
 /*
  * Free floating point registers
  */
 static void free_fp_regs(UserS390FpregsEntry *fpregs)
 {
-	xfree(fpregs->fprs);
-	xfree(fpregs);
+	if (fpregs) {
+		xfree(fpregs->fprs);
+		xfree(fpregs);
+	}
 }
 
 /*
@@ -487,15 +495,17 @@ int arch_alloc_thread_info(CoreEntry *core)
 	ti_s390->gpregs = allocate_gp_regs();
 	if (!ti_s390->gpregs)
 		goto fail_free_ti_s390;
-	ti_s390->fpregs = allocate_fp_regs();
-	if (!ti_s390->fpregs)
-		goto fail_free_gp_regs;
+
+	/*
+	 * Delay allocating space until needed. Checkpointing can fail before that
+	 * and the cleanup code needs to be able to tell if FPRs were saved or not
+	 * before trying to restore the register state.
+	 */
+	ti_s390->fpregs = NULL;
 
 	CORE_THREAD_ARCH_INFO(core) = ti_s390;
 	return 0;
 
-fail_free_gp_regs:
-	free_gp_regs(ti_s390->gpregs);
 fail_free_ti_s390:
 	xfree(ti_s390);
 	return -1;
@@ -678,14 +688,18 @@ static int set_task_regs(pid_t pid, CoreEntry *core)
 	user_fpregs_struct_t fpregs;
 
 	memset(&fpregs, 0, sizeof(fpregs));
-	/* Floating point registers */
+	/*
+	 * Floating point registers
+	 * Optional on checkpoint; checkpoint may have failed and we may reach here as part of cleanup
+	 * so there's no guarantee that we saved FPRs for this thread.
+	 */
 	cfpregs = CORE_THREAD_ARCH_INFO(core)->fpregs;
-	if (!cfpregs)
-		return -1;
-	fpregs.prfpreg.fpc = cfpregs->fpc;
-	memcpy(fpregs.prfpreg.fprs, cfpregs->fprs, sizeof(fpregs.prfpreg.fprs));
-	if (set_fp_regs(pid, &fpregs) < 0)
-		return -1;
+	if (cfpregs) {
+		fpregs.prfpreg.fpc = cfpregs->fpc;
+		memcpy(fpregs.prfpreg.fprs, cfpregs->fprs, sizeof(fpregs.prfpreg.fprs));
+		if (set_fp_regs(pid, &fpregs) < 0)
+			return -1;
+	}
 	/* Vector registers (optional) */
 	cvxrs_low = CORE_THREAD_ARCH_INFO(core)->vxrs_low;
 	if (cvxrs_low != NULL) {

From 5de61a721fbc56de68094f19ac34466d66f7374f Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 21 Apr 2025 06:33:41 +0000
Subject: [PATCH 1667/1854] net: nftables: avoid restore failure if the CRIU
 nft table already exist

CRIU locks the network during restore in an "empty" network namespace.
However, "empty" in this context means CRIU isn't restoring the
namespace. This network namespace can be the same namespace where
processes have been dumped and so the network is already locked in it.

Fixes #2650

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c  |  2 +-
 criu/include/net.h |  2 +-
 criu/net.c         | 30 +++++++++++++++++-------------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 583b446e0..30932f60a 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2119,7 +2119,7 @@ static int restore_root_task(struct pstree_item *init)
 		 * the '--empty-ns net' mode no iptables C/R is done and we
 		 * need to return these rules by hands.
 		 */
-		ret = network_lock_internal();
+		ret = network_lock_internal(/* restore = */ true);
 		if (ret)
 			goto out_kill;
 	}
diff --git a/criu/include/net.h b/criu/include/net.h
index 5e8a84862..7c5ede21e 100644
--- a/criu/include/net.h
+++ b/criu/include/net.h
@@ -31,7 +31,7 @@ extern int collect_net_namespaces(bool for_dump);
 
 extern int network_lock(void);
 extern void network_unlock(void);
-extern int network_lock_internal(void);
+extern int network_lock_internal(bool restore);
 
 extern struct ns_desc net_ns_desc;
 
diff --git a/criu/net.c b/criu/net.c
index ee46f1c49..300df480b 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -3206,12 +3206,12 @@ static inline FILE *redirect_nftables_output(struct nft_ctx *nft)
 }
 #endif
 
-static inline int nftables_lock_network_internal(void)
+static inline int nftables_lock_network_internal(bool restore)
 {
 #if defined(CONFIG_HAS_NFTABLES_LIB_API_0) || defined(CONFIG_HAS_NFTABLES_LIB_API_1)
 	cleanup_file FILE *fp = NULL;
 	struct nft_ctx *nft;
-	int ret = 0;
+	int ret = 0, exit_code = -1;
 	char table[32];
 	char buf[128];
 
@@ -3224,11 +3224,16 @@ static inline int nftables_lock_network_internal(void)
 
 	fp = redirect_nftables_output(nft);
 	if (!fp)
-		goto out;
+		goto err2;
 
 	snprintf(buf, sizeof(buf), "create table %s", table);
-	if (NFT_RUN_CMD(nft, buf))
+	ret = NFT_RUN_CMD(nft, buf);
+	if (ret) {
+		/* The network has been locked on dump. */
+		if (restore && errno == EEXIST)
+			return 0;
 		goto err2;
+	}
 
 	snprintf(buf, sizeof(buf), "add chain %s output { type filter hook output priority 0; policy drop; }", table);
 	if (NFT_RUN_CMD(nft, buf))
@@ -3246,17 +3251,16 @@ static inline int nftables_lock_network_internal(void)
 	if (NFT_RUN_CMD(nft, buf))
 		goto err1;
 
-	goto out;
-
+	exit_code = 0;
+out:
+	nft_ctx_free(nft);
+	return exit_code;
 err1:
 	snprintf(buf, sizeof(buf), "delete table %s", table);
 	NFT_RUN_CMD(nft, buf);
 err2:
-	ret = -1;
 	pr_err("Locking network failed using nftables\n");
-out:
-	nft_ctx_free(nft);
-	return ret;
+	goto out;
 #else
 	pr_err("CRIU was built without libnftables support\n");
 	return -1;
@@ -3288,7 +3292,7 @@ static int iptables_network_lock_internal(void)
 	return ret;
 }
 
-int network_lock_internal(void)
+int network_lock_internal(bool restore)
 {
 	int ret = 0, nsret;
 
@@ -3301,7 +3305,7 @@ int network_lock_internal(void)
 	if (opts.network_lock_method == NETWORK_LOCK_IPTABLES)
 		ret = iptables_network_lock_internal();
 	else if (opts.network_lock_method == NETWORK_LOCK_NFTABLES)
-		ret = nftables_lock_network_internal();
+		ret = nftables_lock_network_internal(restore);
 
 	if (restore_ns(nsret, &net_ns_desc))
 		ret = -1;
@@ -3427,7 +3431,7 @@ int network_lock(void)
 	if (run_scripts(ACT_NET_LOCK))
 		return -1;
 
-	return network_lock_internal();
+	return network_lock_internal(false);
 }
 
 void network_unlock(void)

From b6dca31162562385cb0657af3443666990a28c01 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 14 Apr 2025 14:12:31 +0100
Subject: [PATCH 1668/1854] aarch64/crtools: fix define for missing constants

Building CRIU package on Debian 11 aarch64 fails with

criu/arch/aarch64/crtools.c: In function 'save_pac_keys':
criu/arch/aarch64/crtools.c:32:31: error: storage size of 'paca' isn't known
  struct user_pac_address_keys paca;
                               ^~~~
criu/arch/aarch64/crtools.c:33:31: error: storage size of 'pacg' isn't known
  struct user_pac_generic_keys pacg;
                               ^~~~
criu/arch/aarch64/crtools.c:47:15: error: 'HWCAP_PACA' undeclared (first use in this function); did you mean 'HWCAP_FCMA'?
  if (hwcaps & HWCAP_PACA) {
               ^~~~~~~~~~
               HWCAP_FCMA
criu/arch/aarch64/crtools.c:47:15: note: each undeclared identifier is reported only once for each function it appears in
criu/arch/aarch64/crtools.c:53:44: error: 'NT_ARM_PACA_KEYS' undeclared (first use in this function); did you mean 'NT_ARM_SVE'?
   if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PACA_KEYS, &iov))) {
                                            ^~~~~~~~~~~~~~~~
                                            NT_ARM_SVE
criu/arch/aarch64/crtools.c:73:39: error: 'NT_ARM_PAC_ENABLED_KEYS' undeclared (first use in this function)
   ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PAC_ENABLED_KEYS, &iov);
                                       ^~~~~~~~~~~~~~~~~~~~~~~
criu/arch/aarch64/crtools.c:82:15: error: 'HWCAP_PACG' undeclared (first use in this function); did you mean 'HWCAP_AES'?
  if (hwcaps & HWCAP_PACG) {
               ^~~~~~~~~~
               HWCAP_AES
criu/arch/aarch64/crtools.c:88:44: error: 'NT_ARM_PACG_KEYS' undeclared (first use in this function); did you mean 'NT_ARM_SVE'?
   if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_ARM_PACG_KEYS, &iov))) {
                                            ^~~~~~~~~~~~~~~~
                                            NT_ARM_SVE
criu/arch/aarch64/crtools.c:33:31: error: unused variable 'pacg' [-Werror=unused-variable]
  struct user_pac_generic_keys pacg;
                               ^~~~
criu/arch/aarch64/crtools.c:32:31: error: unused variable 'paca' [-Werror=unused-variable]
  struct user_pac_address_keys paca;
                               ^~~~
criu/arch/aarch64/crtools.c: In function 'arch_ptrace_restore':
criu/arch/aarch64/crtools.c:227:31: error: storage size of 'upaca' isn't known
  struct user_pac_address_keys upaca;
                               ^~~~~
criu/arch/aarch64/crtools.c:228:31: error: storage size of 'upacg' isn't known
  struct user_pac_generic_keys upacg;
                               ^~~~~
criu/arch/aarch64/crtools.c:241:18: error: 'HWCAP_PACA' undeclared (first use in this function); did you mean 'HWCAP_FCMA'?
   if (!(hwcaps & HWCAP_PACA)) {
                  ^~~~~~~~~~
                  HWCAP_FCMA
criu/arch/aarch64/crtools.c:255:44: error: 'NT_ARM_PACA_KEYS' undeclared (first use in this function); did you mean 'NT_ARM_SVE'?
   if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PACA_KEYS, &iov))) {
                                            ^~~~~~~~~~~~~~~~
                                            NT_ARM_SVE
criu/arch/aarch64/crtools.c:261:44: error: 'NT_ARM_PAC_ENABLED_KEYS' undeclared (first use in this function)
   if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PAC_ENABLED_KEYS, &iov))) {
                                            ^~~~~~~~~~~~~~~~~~~~~~~
criu/arch/aarch64/crtools.c:268:18: error: 'HWCAP_PACG' undeclared (first use in this function); did you mean 'HWCAP_AES'?
   if (!(hwcaps & HWCAP_PACG)) {
                  ^~~~~~~~~~
                  HWCAP_AES
criu/arch/aarch64/crtools.c:275:44: error: 'NT_ARM_PACG_KEYS' undeclared (first use in this function); did you mean 'NT_ARM_SVE'?
   if ((ret = ptrace(PTRACE_SETREGSET, pid, NT_ARM_PACG_KEYS, &iov))) {
                                            ^~~~~~~~~~~~~~~~
                                            NT_ARM_SVE
criu/arch/aarch64/crtools.c:233:6: error: variable 'ret' set but not used [-Werror=unused-but-set-variable]
  int ret;
      ^~~
criu/arch/aarch64/crtools.c:228:31: error: unused variable 'upacg' [-Werror=unused-variable]
  struct user_pac_generic_keys upacg;
                               ^~~~~
criu/arch/aarch64/crtools.c:227:31: error: unused variable 'upaca' [-Werror=unused-variable]
  struct user_pac_address_keys upaca;
                               ^~~~~
This patch adds the missing constants and structs if undefined.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/arch/aarch64/crtools.c | 47 +++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index c077dd06b..3ed5c9d63 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -23,6 +23,45 @@
 #include "compel/infect.h"
 #include "pstree.h"
 
+/*
+ * cr_user_pac_* are a copy of the corresponding uapi structs
+ * in arch/arm64/include/uapi/asm/ptrace.h
+ */
+struct cr_user_pac_address_keys {
+	__uint128_t apiakey;
+	__uint128_t apibkey;
+	__uint128_t apdakey;
+	__uint128_t apdbkey;
+};
+
+struct cr_user_pac_generic_keys {
+	__uint128_t apgakey;
+};
+
+/*
+ * The following HWCAP constants are copied from
+ * arch/arm64/include/uapi/asm/hwcap.h
+ */
+#ifndef HWCAP_PACA
+#define HWCAP_PACA (1 << 30)
+#endif
+
+#ifndef HWCAP_PACG
+#define HWCAP_PACG (1UL << 31)
+#endif
+
+/*
+ * The following NT_ARM_PAC constants are copied from
+ * include/uapi/linux/elf.h
+ */
+#ifndef NT_ARM_PACA_KEYS
+#define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication address keys */
+#endif
+
+#ifndef NT_ARM_PACG_KEYS
+#define NT_ARM_PACG_KEYS 0x408
+#endif
+
 #ifndef NT_ARM_PAC_ENABLED_KEYS
 #define NT_ARM_PAC_ENABLED_KEYS	0x40a	/* AArch64 pointer authentication enabled keys. */
 #endif
@@ -33,8 +72,8 @@ extern unsigned long getauxval(unsigned long type);
 
 static int save_pac_keys(int pid, CoreEntry *core)
 {
-	struct user_pac_address_keys paca;
-	struct user_pac_generic_keys pacg;
+	struct cr_user_pac_address_keys paca;
+	struct cr_user_pac_generic_keys pacg;
 	PacKeys *pac_entry;
 	long pac_enabled_key;
 	struct iovec iov;
@@ -228,8 +267,8 @@ int restore_gpregs(struct rt_sigframe *f, UserRegsEntry *r)
 int arch_ptrace_restore(int pid, struct pstree_item *item)
 {
 	unsigned long hwcaps = getauxval(AT_HWCAP);
-	struct user_pac_address_keys upaca;
-	struct user_pac_generic_keys upacg;
+	struct cr_user_pac_address_keys upaca;
+	struct cr_user_pac_generic_keys upacg;
 	PacAddressKeys *paca;
 	PacGenericKeys *pacg;
 	long pac_enabled_keys;

From 88cb552f692353983aeab6478d1779566afd154e Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 2 Apr 2025 12:02:46 +0800
Subject: [PATCH 1669/1854] mount: restore root mount flags

Mount flags belong to mount and mount namespace of the Container, so we
should preserve them, as Container user will not expect mounts switching
between ro and rw over c/r.

Fixes: #2632

v5: fix both mount-v1 and mount-v2

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount-v2.c | 6 ++++++
 criu/mount.c    | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/criu/mount-v2.c b/criu/mount-v2.c
index cdebc8318..1e33ac12a 100644
--- a/criu/mount-v2.c
+++ b/criu/mount-v2.c
@@ -443,6 +443,7 @@ err:
 /* Mounts root container mount. */
 static int do_mount_root_v2(struct mount_info *mi)
 {
+	unsigned long mflags = mi->flags & (~MS_PROPAGATE);
 	unsigned long flags = MS_BIND;
 	int fd;
 
@@ -477,6 +478,11 @@ static int do_mount_root_v2(struct mount_info *mi)
 		return -1;
 	}
 
+	if (mflags && mount(NULL, mi->plain_mountpoint, NULL, MS_REMOUNT | MS_BIND | mflags, NULL)) {
+		pr_perror("Unable to apply root mount options");
+		return -1;
+	}
+
 	mi->mounted = true;
 
 	return 0;
diff --git a/criu/mount.c b/criu/mount.c
index 82bbd52d6..06b959542 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2690,9 +2690,16 @@ shared:
 
 static int do_mount_root(struct mount_info *mi)
 {
+	unsigned long mflags = mi->flags & (~MS_PROPAGATE);
+
 	if (restore_shared_options(mi, !mi->shared_id && !mi->master_id, mi->shared_id, mi->master_id))
 		return -1;
 
+	if (mflags && mount(NULL, service_mountpoint(mi), NULL, MS_REMOUNT | MS_BIND | mflags, NULL)) {
+		pr_perror("Unable to apply root mount options");
+		return -1;
+	}
+
 	return fetch_rt_stat(mi, service_mountpoint(mi));
 }
 

From 6b3826a6fb384632dfbd6e4b90c43b15842f09f8 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 2 Apr 2025 12:47:46 +0800
Subject: [PATCH 1670/1854] zdtm/lib: add "bind" desc option

Add {'bind': 'path/to/bindmount'} zdtm descriptor option, so that in
test mount namespace a directory bindmount can be created before running
the test.

This is useful to leave test directory writable (e.g. for logs) while
the test makes root mount readonly. note: We create this bindmount early
so that all test files are opened on it initially and not on the below
mount. Will be used in mnt_ro_root test.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py       |  3 +++
 test/zdtm/lib/ns.c | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 37ebe63b7..e3ddc762a 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -443,6 +443,7 @@ class zdtm_test:
         self._bins = [name]
         self._env = {'TMPDIR': os.environ.get('TMPDIR', '/tmp')}
         self._deps = desc.get('deps', [])
+        self._bind = desc.get('bind')
         self.auto_reap = True
 
     def __make_action(self, act, env=None, root=None):
@@ -513,6 +514,8 @@ class zdtm_test:
         if self.__flavor.ns:
             env['ZDTM_NEWNS'] = "1"
             env['ZDTM_ROOT'] = self.__flavor.root
+            if self._bind:
+                env['ZDTM_BIND'] = self._bind
             env['ZDTM_DEV'] = self.__flavor.devpath
             env['PATH'] = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 3c0dbdeb8..5fe81561f 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -28,8 +28,9 @@ extern int pivot_root(const char *new_root, const char *put_old);
 static int prepare_mntns(void)
 {
 	int dfd, ret;
-	char *root, *criu_path, *dev_path;
+	char *root, *criu_path, *dev_path, *zdtm_bind;
 	char path[PATH_MAX];
+	char bind_path[PATH_MAX];
 
 	root = getenv("ZDTM_ROOT");
 	if (!root) {
@@ -52,6 +53,18 @@ static int prepare_mntns(void)
 		return -1;
 	}
 
+	zdtm_bind = getenv("ZDTM_BIND");
+	if (zdtm_bind) {
+		/*
+		 * Bindmount the directory to itself.
+		 */
+		snprintf(bind_path, sizeof(bind_path),  "%s/%s", root, zdtm_bind);
+		if (mount(bind_path, bind_path, NULL, MS_BIND, NULL)) {
+			fprintf(stderr, "Can't bind-mount ZDTM_BIND: %m\n");
+			return -1;
+		}
+	}
+
 	dev_path = getenv("ZDTM_DEV");
 	if (dev_path) {
 		snprintf(path, sizeof(path), "%s/dev", root);

From 5a725266ac83ab4dedbd11cc76c29a257c018fef Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 2 Apr 2025 12:47:46 +0800
Subject: [PATCH 1671/1854] zdtm: add mnt_ro_root test

It makes root mount readonly and checks that it is still readonly after
migration.

Make zdtm/static writable for logs via "bind" desc option.

v2: explain why we don't have explicit rw/ro flag check
v3: use new zdtm "bind" desc option

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/lib/ns.c                |  3 +++
 test/zdtm/static/Makefile         |  1 +
 test/zdtm/static/mnt_ro_root.c    | 32 +++++++++++++++++++++++++++++++
 test/zdtm/static/mnt_ro_root.desc |  6 ++++++
 4 files changed, 42 insertions(+)
 create mode 100644 test/zdtm/static/mnt_ro_root.c
 create mode 100644 test/zdtm/static/mnt_ro_root.desc

diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 5fe81561f..822e09c92 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -57,6 +57,9 @@ static int prepare_mntns(void)
 	if (zdtm_bind) {
 		/*
 		 * Bindmount the directory to itself.
+		 * e.g.: The mnt_ro_root test makes "/" mount readonly, but we
+		 * still want to write logs to /zdtm/static/ so let's make it
+		 * separate writable bind mount.
 		 */
 		snprintf(bind_path, sizeof(bind_path),  "%s/%s", root, zdtm_bind);
 		if (mount(bind_path, bind_path, NULL, MS_BIND, NULL)) {
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 6a19cad3c..81e44de22 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -423,6 +423,7 @@ TST_DIR		=				\
 		mntns_ghost			\
 		mntns_ghost01			\
 		mntns_ro_root			\
+		mnt_ro_root			\
 		mntns_link_ghost		\
 		mntns_shared_bind		\
 		mntns_shared_bind02		\
diff --git a/test/zdtm/static/mnt_ro_root.c b/test/zdtm/static/mnt_ro_root.c
new file mode 100644
index 000000000..2d8370150
--- /dev/null
+++ b/test/zdtm/static/mnt_ro_root.c
@@ -0,0 +1,32 @@
+#include <sys/mount.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check if root mount remains read-only after c/r";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *dirname;
+TEST_OPTION(dirname, string, "directory name", 1);
+
+int main(int argc, char **argv)
+{
+	test_init(argc, argv);
+
+	if (mount(NULL, "/", NULL, MS_REMOUNT | MS_RDONLY | MS_BIND, NULL)) {
+		pr_perror("mount");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/*
+	 * Note: In zdtm.py:check_visible_state() we already check for all
+	 * tests, that all mounts in the test's mount namespace remain the
+	 * same, by comparing mountinfo before and after c/r. So rw/ro mount
+	 * option inconsistency will be detected there and we don't need to
+	 * check it in the test itself.
+	 */
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_ro_root.desc b/test/zdtm/static/mnt_ro_root.desc
new file mode 100644
index 000000000..c9a8e4f18
--- /dev/null
+++ b/test/zdtm/static/mnt_ro_root.desc
@@ -0,0 +1,6 @@
+{
+	'flavor': 'ns uns',
+	'flags': 'suid',
+	'feature': 'mnt_id',
+	'bind': 'zdtm/static',
+}

From b458a5c1ad71b1081b3e1fdbc51b4581faabc4cf Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 7 May 2025 14:06:55 +0100
Subject: [PATCH 1672/1854] sk-inet: add message how to disable MPTCP in Go

With Go version 1.24, ListenConfig now uses MPTCP by default [1].
Checkpoint/restore for this protocol is not currently supported
and adding support requires kernel changes that are not trivial
to implement. As a result, checkpointing of many containers that
run Go programs is likely to fail with the following error [2]:

(00.026522) Error (criu/sk-inet.c:130): inet: Unsupported proto 262 for socket 2f9bc5

This patch adds a message with suggested workaround for this problem.

[1] https://go.dev/doc/go1.24#netpkgnet
[2] https://github.com/checkpoint-restore/criu/issues/2655

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/sk-inet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 92f53e569..a191e78c4 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -128,6 +128,8 @@ static int can_dump_ipproto(unsigned int ino, int proto, int type)
 		break;
 	default:
 		pr_err("Unsupported proto %d for socket %x\n", proto, ino);
+		if (proto == IPPROTO_MPTCP)
+			pr_err("For Go programs, consider using \"GODEBUG=multipathtcp=0\" to disable MPTCP\n");
 		return 0;
 	}
 

From 1eaa870ccebba1e067862e45b6f8887e07d61a5c Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 6 May 2025 15:38:26 +0000
Subject: [PATCH 1673/1854] kerndat: check that hardware breakpoints work

In some cases, they might not work in virtual machines if the hypervisor
doesn't virtualize them. For example, they don't work in AMD SEV virtual
machines if the Debug Virtualization extension isn't supported or isn't
enabled in SEV_FEATURES.

Fixes #2658

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-check.c         | 17 +++++++++
 criu/cr-restore.c       |  3 +-
 criu/include/kerndat.h  |  1 +
 criu/kerndat.c          | 80 +++++++++++++++++++++++++++++++++++++++++
 criu/parasite-syscall.c |  2 +-
 5 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 7b4a6415a..9c4778490 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1589,6 +1589,17 @@ static int check_overlayfs_maps(void)
 	return status == 0 ? 0 : -1;
 }
 
+static int check_breakpoints(void)
+{
+	if (!kdat.has_breakpoints) {
+		pr_warn("Hardware breakpoints don't seem to work\n");
+		return -1;
+	}
+
+	return 0;
+}
+
+
 static int (*chk_feature)(void);
 
 /*
@@ -1616,6 +1627,7 @@ static int (*chk_feature)(void);
 			return ret;                 \
 		}                                   \
 	} while (0)
+
 int cr_check(void)
 {
 	struct ns_id *ns;
@@ -1724,6 +1736,10 @@ int cr_check(void)
 		ret |= check_autofs();
 		ret |= check_compat_cr();
 	}
+	/*
+	 * Category 4 - optional.
+	 */
+	check_breakpoints();
 
 	pr_msg("%s\n", ret ? CHECK_MAYBE : CHECK_GOOD);
 	return ret;
@@ -1836,6 +1852,7 @@ static struct feature_list feature_list[] = {
 	{ "pagemap_scan", check_pagemap_scan },
 	{ "timer_cr_ids", check_timer_cr_ids },
 	{ "overlayfs_maps", check_overlayfs_maps },
+	{ "breakpoints", check_breakpoints },
 	{ NULL, NULL },
 };
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 30932f60a..cabe2f464 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1820,6 +1820,7 @@ static int restore_rseq_cs(void)
 static int catch_tasks(bool root_seized)
 {
 	struct pstree_item *item;
+	bool nobp = fault_injected(FI_NO_BREAKPOINTS) || !kdat.has_breakpoints;
 
 	for_each_pstree_item(item) {
 		int status, i, ret;
@@ -1847,7 +1848,7 @@ static int catch_tasks(bool root_seized)
 				return -1;
 			}
 
-			ret = compel_stop_pie(pid, rsti(item)->breakpoint, fault_injected(FI_NO_BREAKPOINTS));
+			ret = compel_stop_pie(pid, rsti(item)->breakpoint, nobp);
 			if (ret < 0)
 				return -1;
 		}
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index bd8744d62..c5deb3283 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -90,6 +90,7 @@ struct kerndat_s {
 	bool has_shstk;
 	bool has_close_range;
 	bool has_timer_cr_ids;
+	bool has_breakpoints;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 930117b0a..fa43f7d3f 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -1736,6 +1736,83 @@ static int kerndat_has_timer_cr_ids(void)
 	return 0;
 }
 
+static void breakpoint_func(void)
+{
+	if (raise(SIGSTOP))
+		pr_perror("Unable to kill itself with SIGSTOP");
+	exit(1);
+}
+
+/*
+ * kerndat_breakpoints checks that hardware breakpoints work as they should.
+ * In some cases, they might not work in virtual machines if the hypervisor
+ * doesn't virtualize them. For example, they don't work in AMD SEV virtual
+ * machines if the Debug Virtualization extension isn't supported or isn't
+ * enabled in SEV_FEATURES.
+ */
+static int kerndat_breakpoints(void)
+{
+	int status, ret, exit_code = -1;
+	pid_t pid;
+
+	pid = fork();
+	if (pid == -1) {
+		pr_perror("fork");
+		return -1;
+	}
+	if (pid == 0) {
+		if (ptrace(PTRACE_TRACEME, 0, 0, 0)) {
+			pr_perror("ptrace(PTRACE_TRACEME)");
+			exit(1);
+		}
+		raise(SIGSTOP);
+		breakpoint_func();
+		exit(1);
+	}
+	if (waitpid(pid, &status, 0) == -1) {
+		pr_perror("waitpid for initial stop");
+		goto err;
+	}
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGSTOP) {
+		pr_err("Child didn't stop as expected: status=%x\n", status);
+		goto err;
+	}
+	ret = ptrace_set_breakpoint(pid, &breakpoint_func);
+	if (ret < 0) {
+		pr_err("Failed to set breakpoint\n");
+		goto err;
+	}
+	if (ret == 0) {
+		pr_debug("Hardware breakpoints appear to be disabled\n");
+		goto out;
+	}
+	if (waitpid(pid, &status, 0) == -1) {
+		pr_perror("waitpid for breakpoint trigger");
+		goto err;
+	}
+	if (!WIFSTOPPED(status) || WSTOPSIG(status) != SIGTRAP) {
+		pr_warn("Hardware breakpoints don't seem to work (status=%x)\n", status);
+		goto out;
+	}
+	kdat.has_breakpoints = true;
+out:
+	exit_code = 0;
+err:
+	if (kill(pid, SIGKILL)) {
+		pr_perror("Failed to kill the child process");
+		exit_code = -1;
+	}
+	if (waitpid(pid, &status, 0) == -1) {
+		pr_perror("Failed to wait for the child process");
+		exit_code = -1;
+	}
+	if (!WIFSIGNALED(status) || WTERMSIG(status) != SIGKILL) {
+		pr_err("The child exited with unexpected code: %x\n", status);
+		exit_code = -1;
+	}
+	return exit_code;
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the
@@ -1999,6 +2076,9 @@ int kerndat_init(void)
 	}
 	if (!ret && kerndat_has_timer_cr_ids()) {
 		pr_err("kerndat_has_timer_cr_ids has failed when initializing kerndat.\n");
+	}
+	if (!ret && kerndat_breakpoints()) {
+		pr_err("kerndat_breakpoints has failed when initializing kerndat.\n");
 		ret = -1;
 	}
 
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 6db9d21fe..e19847b37 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -421,7 +421,7 @@ struct parasite_ctl *parasite_infect_seized(pid_t pid, struct pstree_item *item,
 		ictx->flags |= INFECT_NO_MEMFD;
 	if (fault_injected(FI_PARASITE_CONNECT))
 		ictx->flags |= INFECT_FAIL_CONNECT;
-	if (fault_injected(FI_NO_BREAKPOINTS))
+	if (fault_injected(FI_NO_BREAKPOINTS) || !kdat.has_breakpoints)
 		ictx->flags |= INFECT_NO_BREAKPOINTS;
 	if (kdat.compat_cr)
 		ictx->flags |= INFECT_COMPATIBLE;

From 366d73a4c29033665d59a23d5e0f89323b5fc2b2 Mon Sep 17 00:00:00 2001
From: Lorenzo Fontana <fontanalorenz@gmail.com>
Date: Wed, 14 May 2025 19:02:06 +0200
Subject: [PATCH 1674/1854] make: remove checks and warnings for bsd strlcat
 and strlcpy

In 0a7c5fd1bd8d1e49e273b51ff39af473d6c68cbc we swapped the BSD
implementation of strlcat and strlcpy in favor of our own replacement.

The checks and the predefined macros are not needed anymore.

Signed-off-by: Lorenzo Fontana <fontanalorenz@gmail.com>
---
 Makefile.config           |  4 ++--
 scripts/feature-tests.mak | 28 ----------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/Makefile.config b/Makefile.config
index 5ab689d41..5cf4b8216 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,7 +9,7 @@ ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
         LIBS_FEATURES	+= -lbsd
         FEATURE_DEFINES	+= -DCONFIG_HAS_LIBBSD
 else
-        $(info Note: Building without setproctitle() and strlcpy() support.)
+        $(info Note: Building without setproctitle() support.)
         $(info $S      Install libbsd-devel (RPM) / libbsd-dev (DEB) to fix.)
 endif
 
@@ -84,7 +84,7 @@ endif
 export DEFINES += $(FEATURE_DEFINES)
 export CFLAGS += $(FEATURE_DEFINES)
 
-FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
+FEATURES_LIST	:= TCP_REPAIR PTRACE_PEEKSIGINFO \
 	SETPROCTITLE_INIT TCP_REPAIR_WINDOW MEMFD_CREATE \
 	OPENAT2 NO_LIBC_RSEQ_DEFS
 
diff --git a/scripts/feature-tests.mak b/scripts/feature-tests.mak
index fb5d2ef7a..727e9689e 100644
--- a/scripts/feature-tests.mak
+++ b/scripts/feature-tests.mak
@@ -35,34 +35,6 @@ int main(void)
 }
 endef
 
-define FEATURE_TEST_STRLCPY
-
-#include <string.h>
-
-#ifdef CONFIG_HAS_LIBBSD
-# include <bsd/string.h>
-#endif
-
-int main(void)
-{
-	return strlcpy(NULL, NULL, 0);
-}
-endef
-
-define FEATURE_TEST_STRLCAT
-
-#include <string.h>
-
-#ifdef CONFIG_HAS_LIBBSD
-# include <bsd/string.h>
-#endif
-
-int main(void)
-{
-	return strlcat(NULL, NULL, 0);
-}
-endef
-
 define FEATURE_TEST_PTRACE_PEEKSIGINFO
 
 #include <sys/ptrace.h>

From fddca67cc633b28a73bbb1bb272018f5a3a7ea74 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 11 May 2025 11:33:29 +0100
Subject: [PATCH 1675/1854] seize: fix pause devices for frozen containers

The container checkpointing procedure in Kubernetes freezes running
containers to create a consistent snapshot of both the runtime state
and the rootfs of the container. However, when checkpointing a GPU
container, the container must be unfrozen before invoking the
cuda-checkpoint tool.

This is achieved in prepare_freezer_for_interrupt_only_mode(), which
needs to be called before the PAUSE_DEVICES hook. The patch introducing
this functionality fixes this problem for containers with multiple
processes. However, if the container has a single process,
prepare_freezer_for_interrupt_only_mode() must be invoked immediately
before the PAUSE_DEVICES hook.

Fixes: #2514

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/seize.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/criu/seize.c b/criu/seize.c
index f56357ac7..23f192d46 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -1060,22 +1060,32 @@ int collect_pstree(void)
 	 */
 	alarm(opts.timeout);
 
-	ret = run_plugins(PAUSE_DEVICES, pid);
-	if (ret < 0 && ret != -ENOTSUP) {
-		goto err;
-	}
-
 	if (opts.freeze_cgroup && cgroup_version())
 		goto err;
 
 	pr_debug("Detected cgroup V%d freezer\n", cgroup_v2 ? 2 : 1);
 
 	if (opts.freeze_cgroup && !compel_interrupt_only_mode) {
+		ret = run_plugins(PAUSE_DEVICES, pid);
+		if (ret < 0 && ret != -ENOTSUP) {
+			goto err;
+		}
+
 		if (freeze_processes())
 			goto err;
 	} else {
 		if (opts.freeze_cgroup && prepare_freezer_for_interrupt_only_mode())
 			goto err;
+
+		/*
+		 * Call PAUSE_DEVICES after prepare_freezer_for_interrupt_only_mode()
+		 * to be able to checkpoint containers in a frozen state.
+		 */
+		ret = run_plugins(PAUSE_DEVICES, pid);
+		if (ret < 0 && ret != -ENOTSUP) {
+			goto err;
+		}
+
 		if (compel_interrupt_task(pid)) {
 			set_cr_errno(ESRCH);
 			goto err;
@@ -1136,4 +1146,4 @@ int checkpoint_devices(void)
 	exit_code = 0;
 err:
 	return exit_code;
-}
\ No newline at end of file
+}

From d57d40a5ad76eec0e6d09e3ad44e35922cb98ff2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 16 May 2025 12:43:14 +0100
Subject: [PATCH 1676/1854] sk-inet: add MPTCP definition

Building CRIU on Ubuntu 20.04 fails with the following error:

criu/sk-inet.c: In function 'can_dump_ipproto':
criu/sk-inet.c:131:16: error: 'IPPROTO_MPTCP' undeclared (first use in this function); did you mean 'IPPROTO_MTP'?
  131 |   if (proto == IPPROTO_MPTCP)
      |                ^~~~~~~~~~~~~
      |                IPPROTO_MTP

Add definition for MPTCP to fix this error.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/sk-inet.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index a191e78c4..1238b03dc 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -44,6 +44,11 @@
 #define PB_ALEN_INET  1
 #define PB_ALEN_INET6 4
 
+/* Definition for older kernels without MPTCP support (e.g. Ubuntu 20.04) */
+#ifndef IPPROTO_MPTCP
+#define IPPROTO_MPTCP 262
+#endif
+
 static LIST_HEAD(inet_ports);
 
 struct inet_port {

From 427c0dc27b473ead1367c417bee8aac2b39a2844 Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Fri, 29 Nov 2024 02:07:38 +0000
Subject: [PATCH 1677/1854] criu: Introduce a new device plugin hook for
 restore

Currently, in the target process, device-related restore operations and
other restore operations almost run sequentially. When the target
process executes the corresponding CRIU hook functions, it can't perform
other restore operations.  However, for GPU applications, some device
restore operations have no logical dependencies on other common restore
operations and can be parallelized with other operations to speed up the
process.

Instead of launching a thread in child processes for parallelization,
this patch chooses to add a new hook, `POST_FORKING`, in the main CRIU
process to handle these restore operations. This is because the
restoration of memory state in the restore blob is one of the most
time-consuming parts of all restore logic. The main CRIU process can
easily parallelize these operations, whereas parallelizing in threads
within child processes is challenging.

- POST_FORKING

*POST_FORKING: Hook to enable the main CRIU process to perform some
restore operations of plugins.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 criu/cr-restore.c          | 3 +++
 criu/include/criu-plugin.h | 4 ++++
 criu/plugin.c              | 1 +
 3 files changed, 8 insertions(+)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index cabe2f464..9cc77b21f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2132,6 +2132,9 @@ static int restore_root_task(struct pstree_item *init)
 	__restore_switch_stage(CR_STATE_FORKING);
 
 skip_ns_bouncing:
+	ret = run_plugins(POST_FORKING);
+	if (ret < 0 && ret != -ENOTSUP)
+		goto out_kill;
 
 	ret = restore_wait_inprogress_tasks();
 	if (ret < 0)
diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index 392ea9f53..9fb21a449 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -60,6 +60,8 @@ enum {
 
 	CR_PLUGIN_HOOK__CHECKPOINT_DEVICES = 11,
 
+	CR_PLUGIN_HOOK__POST_FORKING = 12,
+
 	CR_PLUGIN_HOOK__MAX
 };
 
@@ -78,6 +80,7 @@ DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__UPDATE_VMA_MAP, const char *path, const
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__PAUSE_DEVICES, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, int pid);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__POST_FORKING, void);
 
 enum {
 	CR_PLUGIN_STAGE__DUMP,
@@ -152,5 +155,6 @@ typedef int(cr_plugin_handle_device_vma_t)(int fd, const struct stat *stat);
 typedef int(cr_plugin_update_vma_map_t)(const char *path, const uint64_t addr, const uint64_t old_pgoff,
 					uint64_t *new_pgoff, int *plugin_fd);
 typedef int(cr_plugin_resume_devices_late_t)(int pid);
+typedef int(cr_plugin_post_forking_t)(void);
 
 #endif /* __CRIU_PLUGIN_H__ */
diff --git a/criu/plugin.c b/criu/plugin.c
index 65e79a069..18da0499d 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -59,6 +59,7 @@ static cr_plugin_desc_t *cr_gen_plugin_desc(void *h, char *path)
 	__assign_hook(RESUME_DEVICES_LATE, "cr_plugin_resume_devices_late");
 	__assign_hook(PAUSE_DEVICES, "cr_plugin_pause_devices");
 	__assign_hook(CHECKPOINT_DEVICES, "cr_plugin_checkpoint_devices");
+	__assign_hook(POST_FORKING, "cr_plugin_post_forking");
 
 #undef __assign_hook
 

From 497109eb4e68caeb478dd3664b3ee1186c3baafd Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Fri, 29 Nov 2024 02:13:28 +0000
Subject: [PATCH 1678/1854] cr-restore: Move `cr_plugin_init` after
 `fdstore_init`

Currently, when CRIU calls `cr_plugin_init`, `fdstore` is not
initialized. However, during the plugin restore procedure, there may be
some common file operations used in multiple hooks. This patch moves
`cr_plugin_init` after `fdstore_init`, allowing `cr_plugin_init` to use
`fdstore` to place these file operations.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 criu/cr-restore.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9cc77b21f..c1d1f4b9d 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2366,41 +2366,47 @@ int cr_restore_tasks(void)
 		return 1;
 
 	if (check_img_inventory(/* restore = */ true) < 0)
-		goto err;
-
-	if (cr_plugin_init(CR_PLUGIN_STAGE__RESTORE))
 		return -1;
 
 	if (init_stats(RESTORE_STATS))
-		goto err;
+		return -1;
 
 	if (lsm_check_opts())
-		goto err;
+		return -1;
 
 	timing_start(TIME_RESTORE);
 
 	if (cpu_init() < 0)
-		goto err;
+		return -1;
 
 	if (vdso_init_restore())
-		goto err;
+		return -1;
 
 	if (tty_init_restore())
-		goto err;
+		return -1;
 
 	if (opts.cpu_cap & CPU_CAP_IMAGE) {
 		if (cpu_validate_cpuinfo())
-			goto err;
+			return -1;
 	}
 
 	if (prepare_task_entries() < 0)
-		goto err;
+		return -1;
 
 	if (prepare_pstree() < 0)
-		goto err;
+		return -1;
 
 	if (fdstore_init())
-		goto err;
+		return -1;
+
+	/*
+	 * For the AMDGPU plugin, its parallel restore feature needs to use fdstore to store
+	 * its socket file descriptor. This allows the main process and the target process to
+	 * communicate with each other through this file descriptor. Therefore, cr_plugin_init
+	 * must be initialized after fdstore_init.
+	 */
+	if (cr_plugin_init(CR_PLUGIN_STAGE__RESTORE))
+		return -1;
 
 	if (inherit_fd_move_to_fdstore())
 		goto err;

From e257d04974d7945e6e3fad52b6dae39e1e711cfc Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:34:14 +0000
Subject: [PATCH 1679/1854] pstree: Add `has_children` function

Currently, parallel restore only focuses on the single-process
situation. Therefore, it needs an interface to know if there is only one
process to restore. This patch adds a `has_children` function in
`pstree.h` and replaces some existing implementations with this
function.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 criu/cr-dump.c        | 2 +-
 criu/include/pstree.h | 1 +
 criu/pstree.c         | 9 +++++++--
 criu/seize.c          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 302078caa..b8cf7d64d 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -1396,7 +1396,7 @@ static int dump_zombies(void)
 		item->sid = pps_buf.sid;
 		item->pgid = pps_buf.pgid;
 
-		BUG_ON(!list_empty(&item->children));
+		BUG_ON(has_children(item));
 
 		if (!item->sid) {
 			pr_err("A session leader of zombie process %d(%d) is outside of its pid namespace\n",
diff --git a/criu/include/pstree.h b/criu/include/pstree.h
index 1137046d4..b750a919e 100644
--- a/criu/include/pstree.h
+++ b/criu/include/pstree.h
@@ -104,6 +104,7 @@ extern void pstree_insert_pid(struct pid *pid_node);
 extern struct pid *pstree_pid_by_virt(pid_t pid);
 
 extern struct pstree_item *root_item;
+extern bool has_children(struct pstree_item *item);
 extern struct pstree_item *pstree_item_next(struct pstree_item *item);
 #define for_each_pstree_item(pi) for (pi = root_item; pi != NULL; pi = pstree_item_next(pi))
 
diff --git a/criu/pstree.c b/criu/pstree.c
index 660f1b9d9..75c2fc8d0 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -182,7 +182,7 @@ void free_pstree(struct pstree_item *root_item)
 	struct pstree_item *item = root_item, *parent;
 
 	while (item) {
-		if (!list_empty(&item->children)) {
+		if (has_children(item)) {
 			item = list_first_entry(&item->children, struct pstree_item, sibling);
 			continue;
 		}
@@ -244,10 +244,15 @@ int init_pstree_helper(struct pstree_item *ret)
 	return 0;
 }
 
+bool has_children(struct pstree_item *item)
+{
+	return !list_empty(&item->children);
+}
+
 /* Deep first search on children */
 struct pstree_item *pstree_item_next(struct pstree_item *item)
 {
-	if (!list_empty(&item->children))
+	if (has_children(item))
 		return list_first_entry(&item->children, struct pstree_item, sibling);
 
 	while (item->parent) {
diff --git a/criu/seize.c b/criu/seize.c
index 23f192d46..d0cf7b36c 100644
--- a/criu/seize.c
+++ b/criu/seize.c
@@ -1008,7 +1008,7 @@ static int collect_task(struct pstree_item *item)
 	if (ret < 0)
 		goto err_close;
 
-	if ((item->pid->state == TASK_DEAD) && !list_empty(&item->children)) {
+	if ((item->pid->state == TASK_DEAD) && has_children(item)) {
 		pr_err("Zombie with children?! O_o Run, run, run!\n");
 		goto err_close;
 	}

From 1fd1b670c4c536e908abfbc01ebb76377555c2e1 Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:36:33 +0000
Subject: [PATCH 1680/1854] plugins/amdgpu: Add socket operations

When enabling parallel restore, the target process and the main CRIU
process need an IPC interface to communicate and transfer restore
commands. This patch adds a Unix domain TCP socket and stores this
socket in `fdstore`.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 plugins/amdgpu/amdgpu_socket_utils.c | 59 ++++++++++++++++++++++++++++
 plugins/amdgpu/amdgpu_socket_utils.h |  6 +++
 2 files changed, 65 insertions(+)
 create mode 100644 plugins/amdgpu/amdgpu_socket_utils.c
 create mode 100644 plugins/amdgpu/amdgpu_socket_utils.h

diff --git a/plugins/amdgpu/amdgpu_socket_utils.c b/plugins/amdgpu/amdgpu_socket_utils.c
new file mode 100644
index 000000000..9e957ae54
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_socket_utils.c
@@ -0,0 +1,59 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "amdgpu_socket_utils.h"
+#include "criu-log.h"
+#include "common/scm.h"
+#include "fdstore.h"
+#include "util-pie.h"
+#include "util.h"
+
+int parallel_socket_addr_len;
+struct sockaddr_un parallel_socket_addr;
+int parallel_socket_id = 0;
+
+static void amdgpu_socket_name_gen(struct sockaddr_un *addr, int *len)
+{
+	addr->sun_family = AF_UNIX;
+	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/criu-amdgpu-parallel-%s", criu_run_id);
+	*len = SUN_LEN(addr);
+	*addr->sun_path = '\0';
+}
+
+int install_parallel_sock(void)
+{
+	int ret = 0;
+	int sock_fd;
+
+	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock_fd < 0) {
+		pr_perror("socket creation failed");
+		return -1;
+	}
+
+	amdgpu_socket_name_gen(&parallel_socket_addr, &parallel_socket_addr_len);
+	ret = bind(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
+	if (ret < 0) {
+		pr_perror("bind failed");
+		goto err;
+	}
+
+	ret = listen(sock_fd, SOMAXCONN);
+	if (ret < 0) {
+		pr_perror("listen failed");
+		goto err;
+	}
+
+	parallel_socket_id = fdstore_add(sock_fd);
+	if (parallel_socket_id < 0) {
+		ret = -1;
+		goto err;
+	}
+err:
+	close(sock_fd);
+	return ret;
+}
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_socket_utils.h b/plugins/amdgpu/amdgpu_socket_utils.h
new file mode 100644
index 000000000..4e7aa2aa4
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_socket_utils.h
@@ -0,0 +1,6 @@
+#ifndef __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
+#define __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
+
+int install_parallel_sock(void);
+
+#endif
\ No newline at end of file

From e8ba7c103a02c49bbb1435b9d54d1fee33e31a0c Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:38:48 +0000
Subject: [PATCH 1681/1854] plugins/amdgpu: Add parallel restore command

Currently the restore of buffer object comsumes a significant amount of
time. However, this part has no logical dependencies with other restore
operations. This patch introduce some structures and some helper
functions for the target process to offload this task to the main CRIU
process.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 plugins/amdgpu/amdgpu_socket_utils.c | 261 +++++++++++++++++++++++++++
 plugins/amdgpu/amdgpu_socket_utils.h |  48 +++++
 2 files changed, 309 insertions(+)

diff --git a/plugins/amdgpu/amdgpu_socket_utils.c b/plugins/amdgpu/amdgpu_socket_utils.c
index 9e957ae54..c8bf6d1ba 100644
--- a/plugins/amdgpu/amdgpu_socket_utils.c
+++ b/plugins/amdgpu/amdgpu_socket_utils.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #include "amdgpu_socket_utils.h"
 #include "criu-log.h"
@@ -53,6 +54,266 @@ int install_parallel_sock(void)
 		ret = -1;
 		goto err;
 	}
+err:
+	close(sock_fd);
+	return ret;
+}
+
+void parallel_restore_bo_add(int dmabuf_fd, int gpu_id, uint64_t size, uint64_t offset,
+			     parallel_restore_cmd *restore_cmd)
+{
+	parallel_restore_entry *restore_entry = &restore_cmd->entries[restore_cmd->cmd_head.entry_num];
+	restore_entry->gpu_id = gpu_id;
+	restore_entry->write_id = restore_cmd->cmd_head.fd_write_num;
+	restore_entry->write_offset = 0;
+	restore_entry->read_offset = offset;
+	restore_entry->size = size;
+
+	restore_cmd->fds_write[restore_cmd->cmd_head.fd_write_num] = dmabuf_fd;
+
+	restore_cmd->cmd_head.entry_num += 1;
+	restore_cmd->cmd_head.fd_write_num += 1;
+}
+
+void parallel_restore_gpu_id_add(int gpu_id, int minor, parallel_restore_cmd *restore_cmd)
+{
+	restore_cmd->gpu_ids[restore_cmd->cmd_head.gpu_num] = (parallel_gpu_info){ gpu_id, minor };
+	restore_cmd->cmd_head.gpu_num += 1;
+}
+
+static int send_metadata(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send(sock_fd, &restore_cmd->cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
+		pr_perror("Send parallel restore command head fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int send_gpu_ids(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send(sock_fd, restore_cmd->gpu_ids, restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info), 0) < 0) {
+		pr_perror("Send GPU ids of parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int send_cmds(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send(sock_fd, restore_cmd->entries, restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry), 0) < 0) {
+		pr_perror("Send parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int send_dmabuf_fds(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send_fds(sock_fd, NULL, 0, restore_cmd->fds_write, restore_cmd->cmd_head.fd_write_num, 0, 0) < 0) {
+		pr_perror("Send dmabuf fds fail");
+		return -1;
+	}
+	return 0;
+}
+
+int send_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
+{
+	int sock_fd;
+	int ret = 0;
+
+	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock_fd < 0) {
+		pr_perror("Socket creation failed");
+		return -1;
+	}
+
+	ret = connect(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
+	if (ret < 0) {
+		pr_perror("Connect failed");
+		goto err;
+	}
+
+	ret = send_metadata(sock_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = send_gpu_ids(sock_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = send_cmds(sock_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = send_dmabuf_fds(sock_fd, restore_cmd);
+
+err:
+	close(sock_fd);
+	return ret;
+}
+
+int init_parallel_restore_cmd(int num, int id, int gpu_num, parallel_restore_cmd *restore_cmd)
+{
+	restore_cmd->cmd_head.id = id;
+	restore_cmd->cmd_head.fd_write_num = 0;
+	restore_cmd->cmd_head.entry_num = 0;
+	restore_cmd->cmd_head.gpu_num = 0;
+
+	restore_cmd->gpu_ids = xzalloc(gpu_num * sizeof(parallel_gpu_info));
+	if (!restore_cmd->gpu_ids)
+		return -ENOMEM;
+	restore_cmd->fds_write = xzalloc(num * sizeof(int));
+	if (!restore_cmd->fds_write)
+		return -ENOMEM;
+	restore_cmd->entries = xzalloc(num * sizeof(parallel_restore_entry));
+	if (!restore_cmd->entries)
+		return -ENOMEM;
+	return 0;
+}
+
+void free_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
+{
+	if (restore_cmd->gpu_ids)
+		xfree(restore_cmd->gpu_ids);
+	if (restore_cmd->fds_write)
+		xfree(restore_cmd->fds_write);
+	if (restore_cmd->entries)
+		xfree(restore_cmd->entries);
+}
+
+static int init_parallel_restore_cmd_by_head(parallel_restore_cmd *restore_cmd)
+{
+	restore_cmd->gpu_ids = xzalloc(restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info));
+	if (!restore_cmd->gpu_ids)
+		return -ENOMEM;
+	restore_cmd->fds_write = xzalloc(restore_cmd->cmd_head.fd_write_num * sizeof(int));
+	if (!restore_cmd->fds_write)
+		return -ENOMEM;
+	restore_cmd->entries = xzalloc(restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry));
+	if (!restore_cmd->entries)
+		return -ENOMEM;
+	return 0;
+}
+
+static int check_quit_cmd(parallel_restore_cmd *restore_cmd)
+{
+	return restore_cmd->cmd_head.fd_write_num == 0;
+}
+
+static int recv_metadata(int client_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv(client_fd, &restore_cmd->cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
+		pr_perror("Recv parallel restore command head fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int recv_cmds(int client_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv(client_fd, restore_cmd->entries, restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry), 0) < 0) {
+		pr_perror("Recv parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int recv_gpu_ids(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv(sock_fd, restore_cmd->gpu_ids, restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info), 0) < 0) {
+		pr_perror("Send GPU ids of parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int recv_dmabuf_fds(int client_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv_fds(client_fd, restore_cmd->fds_write, restore_cmd->cmd_head.fd_write_num, 0, 0) < 0) {
+		pr_perror("Recv dmabuf fds fail");
+		return -1;
+	}
+	return 0;
+}
+
+int recv_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
+{
+	int sock_fd, client_fd;
+	int ret = 0;
+
+	sock_fd = fdstore_get(parallel_socket_id);
+	if (sock_fd < 0)
+		return -1;
+
+	client_fd = accept(sock_fd, NULL, NULL);
+	if (client_fd < 0) {
+		ret = client_fd;
+		goto err_accept;
+	}
+
+	ret = recv_metadata(client_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	// Return 1 to quit
+	if (check_quit_cmd(restore_cmd)) {
+		ret = 1;
+		goto err;
+	}
+
+	ret = init_parallel_restore_cmd_by_head(restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = recv_gpu_ids(client_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = recv_cmds(client_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = recv_dmabuf_fds(client_fd, restore_cmd);
+
+err:
+	close(client_fd);
+err_accept:
+	close(sock_fd);
+	return ret;
+}
+
+int close_parallel_restore_server(void)
+{
+	int sock_fd;
+	int ret = 0;
+	parallel_restore_cmd_head cmd_head;
+
+	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock_fd < 0) {
+		pr_perror("Socket creation failed");
+		return -1;
+	}
+
+	ret = connect(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
+	if (ret < 0) {
+		pr_perror("Connect failed");
+		goto err;
+	}
+
+	memset(&cmd_head, 0, sizeof(parallel_restore_cmd_head));
+	if (send(sock_fd, &cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
+		pr_perror("Send parallel restore command head fail");
+		return -1;
+	}
+
 err:
 	close(sock_fd);
 	return ret;
diff --git a/plugins/amdgpu/amdgpu_socket_utils.h b/plugins/amdgpu/amdgpu_socket_utils.h
index 4e7aa2aa4..d7200c6bd 100644
--- a/plugins/amdgpu/amdgpu_socket_utils.h
+++ b/plugins/amdgpu/amdgpu_socket_utils.h
@@ -1,6 +1,54 @@
 #ifndef __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
 #define __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
 
+typedef struct {
+	int id;
+	int fd_write_num; /* The number of buffer objects to be restored. */
+	int entry_num;	  /* The number of restore commands.*/
+	int gpu_num;
+} parallel_restore_cmd_head;
+
+typedef struct {
+	int gpu_id;
+	int minor;
+} parallel_gpu_info;
+
+typedef struct {
+	int gpu_id;
+	int write_id;
+	uint64_t read_offset;
+	uint64_t write_offset;
+	uint64_t size;
+} parallel_restore_entry;
+
+typedef struct {
+	parallel_restore_cmd_head cmd_head;
+	int *fds_write;
+	parallel_gpu_info *gpu_ids;
+	parallel_restore_entry *entries;
+} parallel_restore_cmd;
+
+/*
+ * For parallel_restore, a background thread in the main CRIU process is used to restore the GPU
+ * buffer object. However, initially, the ownership of these buffer objects and the metadata for
+ * restoration are all with the target process. Therefore, we introduce a series of functions to
+ * help the target process send these tasks to the main CRIU process.
+ */
+int init_parallel_restore_cmd(int num, int id, int gpu_num, parallel_restore_cmd *restore_cmd);
+
+void free_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
+
 int install_parallel_sock(void);
 
+int send_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
+
+int recv_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
+
+void parallel_restore_bo_add(int dmabuf_fd, int gpu_id, uint64_t size, uint64_t offset,
+			     parallel_restore_cmd *restore_cmd);
+
+void parallel_restore_gpu_id_add(int gpu_id, int minor, parallel_restore_cmd *restore_cmd);
+
+int close_parallel_restore_server(void);
+
 #endif
\ No newline at end of file

From a61116fd934868fbefb4db4edc565d117389e511 Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Wed, 15 Jan 2025 06:38:27 +0000
Subject: [PATCH 1682/1854] plugins/amdgpu: Implement parallel restore

This patch implements the entire logic to enable the offloading of
buffer object content restoration.

The goal of this patch is to offload the buffer object content
restoration to the main CRIU process so that this restoration can occur
in parallel with other restoration logic (mainly the restoration of
memory state in the restore blob, which is time-consuming) to speed up
the restore phase. The restoration of buffer object content usually
takes a significant amount of time for GPU applications, so
parallelizing it with other operations can reduce the overall restore
time.

It has three parts: the first replaces the restoration of buffer objects
in the target process by sending a parallel restore command to the main
CRIU process; the second implements the POST_FORKING hook in the amdgpu
plugin to enable buffer object content restoration in the main CRIU
process; the third stops the parallel thread in the RESUME_DEVICES_LATE
hook.

This optimization only focuses on the single-process situation (common
case). In other scenarios, it will turn to the original method. This is
achieved with the new `parallel_disabled` flag.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 plugins/amdgpu/Makefile                 |   2 +-
 plugins/amdgpu/amdgpu_plugin.c          | 420 +++++++++++++++++++++---
 plugins/amdgpu/amdgpu_plugin_topology.c |   2 +-
 plugins/amdgpu/amdgpu_plugin_topology.h |   1 +
 4 files changed, 374 insertions(+), 51 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index a20d1d163..4bf5e499f 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -27,7 +27,7 @@ endif
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
 
-amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c
+amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
 	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 96c086162..69194fbc7 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -28,11 +28,13 @@
 #include "xmalloc.h"
 #include "criu-log.h"
 #include "files.h"
+#include "pstree.h"
 
 #include "common/list.h"
 #include "amdgpu_plugin_drm.h"
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
+#include "amdgpu_socket_utils.h"
 
 #include "img-streamer.h"
 #include "image.h"
@@ -64,6 +66,18 @@ bool plugin_added_to_inventory = false;
 
 bool plugin_disabled = false;
 
+/*
+ * In the case of a single process (common case), this optimization can effectively
+ * reduce the restore latency with parallel restore. In the case of multiple processes,
+ * states are already restored in parallel within different processes. Therefore, this
+ * optimization does not introduce further improvement and will be disabled by default
+ * in this case. The flag, parallel_disabled, is used to control whether the
+ * optimization is enabled or disabled.
+ */
+bool parallel_disabled = false;
+
+pthread_t parallel_thread = 0;
+int parallel_thread_result = 0;
 /**************************************************************************************************/
 
 /* Call ioctl, restarting if it is interrupted */
@@ -351,6 +365,15 @@ int amdgpu_plugin_init(int stage)
 	maps_init(&restore_maps);
 
 	if (stage == CR_PLUGIN_STAGE__RESTORE) {
+		if (has_children(root_item)) {
+			pr_info("Parallel restore disabled\n");
+			parallel_disabled = true;
+		} else {
+			if (install_parallel_sock() < 0) {
+				pr_err("Failed to install parallel socket\n");
+				return -1;
+			}
+		}
 		/* Default Values */
 		kfd_fw_version_check = true;
 		kfd_sdma_fw_version_check = true;
@@ -1439,14 +1462,9 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
-	struct thread_data *thread_datas;
+	struct thread_data *thread_datas = NULL;
 	int thread_i, ret = 0;
-
-	thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
-	if (!thread_datas) {
-		ret = -ENOMEM;
-		goto exit;
-	}
+	int offset = 0;
 
 	for (int i = 0; i < e->num_of_bos; i++) {
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
@@ -1489,56 +1507,101 @@ static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKf
 		}
 	}
 
-	thread_i = 0;
-	for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
-		struct tp_node *dev;
-		int ret_thread = 0;
-		uint32_t target_gpu_id;
+	if (!parallel_disabled) {
+		parallel_restore_cmd restore_cmd;
+		pr_info("Begin to send parallel restore cmd\n");
+		ret = init_parallel_restore_cmd(e->num_of_bos, id, e->num_of_gpus, &restore_cmd);
+		if (ret)
+			goto exit_parallel;
 
-		if (!e->device_entries[i]->gpu_id)
-			continue;
+		for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
+			uint32_t target_gpu_id;
+			struct tp_node *dev;
 
-		/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
-		target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+			if (!e->device_entries[i]->gpu_id)
+				continue;
 
-		/* We need the fd for actual_gpu_id */
-		dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
-		if (!dev) {
-			pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
-			ret = -ENODEV;
+			target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+			dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+			if (!dev) {
+				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+				ret = -ENODEV;
+				goto exit_parallel;
+			}
+			parallel_restore_gpu_id_add(e->device_entries[i]->gpu_id, dev->drm_render_minor, &restore_cmd);
+
+			for (int j = 0; j < e->num_of_bos; j++) {
+				if (bo_buckets[j].gpu_id != e->device_entries[i]->gpu_id)
+					continue;
+				if (bo_buckets[j].alloc_flags &
+				    (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) {
+					parallel_restore_bo_add(bo_buckets[j].dmabuf_fd, bo_buckets[j].gpu_id,
+								bo_buckets[j].size, offset, &restore_cmd);
+					offset += bo_buckets[j].size;
+				}
+			}
+		}
+		ret = send_parallel_restore_cmd(&restore_cmd);
+exit_parallel:
+		free_parallel_restore_cmd(&restore_cmd);
+	} else {
+		thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
+		if (!thread_datas) {
+			ret = -ENOMEM;
 			goto exit;
 		}
 
-		thread_datas[thread_i].id = id;
-		thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
-		thread_datas[thread_i].bo_buckets = bo_buckets;
-		thread_datas[thread_i].bo_entries = e->bo_entries;
-		thread_datas[thread_i].pid = e->pid;
-		thread_datas[thread_i].num_of_bos = e->num_of_bos;
+		thread_i = 0;
+		for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
+			struct tp_node *dev;
+			int ret_thread = 0;
+			uint32_t target_gpu_id;
 
-		thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
-		if (thread_datas[thread_i].drm_fd < 0) {
-			ret = -thread_datas[thread_i].drm_fd;
-			goto exit;
+			if (!e->device_entries[i]->gpu_id)
+				continue;
+
+			/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
+			target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+
+			/* We need the fd for actual_gpu_id */
+			dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+			if (!dev) {
+				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+				ret = -ENODEV;
+				goto exit;
+			}
+
+			thread_datas[thread_i].id = id;
+			thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
+			thread_datas[thread_i].bo_buckets = bo_buckets;
+			thread_datas[thread_i].bo_entries = e->bo_entries;
+			thread_datas[thread_i].pid = e->pid;
+			thread_datas[thread_i].num_of_bos = e->num_of_bos;
+
+			thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
+			if (thread_datas[thread_i].drm_fd < 0) {
+				ret = -thread_datas[thread_i].drm_fd;
+				goto exit;
+			}
+
+			ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
+						    (void *)&thread_datas[thread_i]);
+			if (ret_thread) {
+				pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
+				ret = -ret_thread;
+				goto exit;
+			}
+			thread_i++;
 		}
 
-		ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
-					    (void *)&thread_datas[thread_i]);
-		if (ret_thread) {
-			pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
-			ret = -ret_thread;
-			goto exit;
-		}
-		thread_i++;
-	}
+		for (int i = 0; i < e->num_of_gpus; i++) {
+			pthread_join(thread_datas[i].thread, NULL);
+			pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
 
-	for (int i = 0; i < e->num_of_gpus; i++) {
-		pthread_join(thread_datas[i].thread, NULL);
-		pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
-
-		if (thread_datas[i].ret) {
-			ret = thread_datas[i].ret;
-			goto exit;
+			if (thread_datas[i].ret) {
+				ret = thread_datas[i].ret;
+				goto exit;
+			}
 		}
 	}
 exit:
@@ -1546,8 +1609,8 @@ exit:
 		if (bo_buckets[i].dmabuf_fd != KFD_INVALID_FD)
 			close(bo_buckets[i].dmabuf_fd);
 	}
-
-	xfree(thread_datas);
+	if (thread_datas)
+		xfree(thread_datas);
 	return ret;
 }
 
@@ -1836,6 +1899,24 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	if (plugin_disabled)
 		return -ENOTSUP;
 
+	if (!parallel_disabled) {
+		pr_info("Close parallel restore server\n");
+		if (close_parallel_restore_server()) {
+			pr_err("Close parallel restore server fail\n");
+			return -1;
+		}
+
+		exit_code = pthread_join(parallel_thread, NULL);
+		if (exit_code) {
+			pr_err("Failed to join parallel thread ret:%d\n", exit_code);
+			return -1;
+		}
+		if (parallel_thread_result) {
+			pr_err("Parallel restore fail\n");
+			return parallel_thread_result;
+		}
+	}
+
 	pr_info("Inside %s for target pid = %d\n", __func__, target_pid);
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
@@ -1862,3 +1943,244 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 }
 
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)
+
+int sdma_copy_bo_helper(uint64_t size, int fd, FILE *storage_fp, void *buffer, size_t buffer_size,
+			amdgpu_device_handle h_dev, uint64_t max_copy_size, enum sdma_op_type type)
+{
+	return sdma_copy_bo((struct kfd_criu_bo_bucket){ 0, size, 0, 0, 0, 0, fd, 0 }, storage_fp, buffer,
+			    buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+}
+
+int init_dev(int dev_minor, amdgpu_device_handle *h_dev, uint64_t *max_copy_size)
+{
+	int ret = 0;
+	int drm_fd = -1;
+	uint32_t major, minor;
+
+	struct amdgpu_gpu_info gpu_info = { 0 };
+
+	drm_fd = open_drm_render_device(dev_minor);
+	if (drm_fd < 0) {
+		return drm_fd;
+	}
+
+	ret = amdgpu_device_initialize(drm_fd, &major, &minor, h_dev);
+	if (ret) {
+		pr_perror("Failed to initialize device");
+		goto err;
+	}
+
+	ret = amdgpu_query_gpu_info(*h_dev, &gpu_info);
+	if (ret) {
+		pr_perror("failed to query gpuinfo via libdrm");
+		goto err;
+	}
+	*max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
+								    SDMA_LINEAR_COPY_MAX_SIZE - 1;
+	return 0;
+err:
+	amdgpu_device_deinitialize(*h_dev);
+	return ret;
+}
+
+FILE *get_bo_contents_fp(int id, int gpu_id, size_t tot_size)
+{
+	char img_path[PATH_MAX];
+	size_t image_size = 0;
+	FILE *bo_contents_fp = NULL;
+
+	snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, id, gpu_id);
+	bo_contents_fp = open_img_file(img_path, false, &image_size);
+	if (!bo_contents_fp) {
+		pr_perror("Cannot fopen %s", img_path);
+		return NULL;
+	}
+
+	if (tot_size != image_size) {
+		pr_err("%s size mismatch (current:%ld:expected:%ld)\n", img_path, image_size, tot_size);
+		fclose(bo_contents_fp);
+		return NULL;
+	}
+	return bo_contents_fp;
+}
+
+struct parallel_thread_data {
+	pthread_t thread;
+	uint32_t gpu_id;
+	int minor;
+	parallel_restore_cmd *restore_cmd;
+	int ret;
+};
+
+void *parallel_restore_bo_contents(void *_thread_data)
+{
+	struct parallel_thread_data *thread_data = (struct parallel_thread_data *)_thread_data;
+	amdgpu_device_handle h_dev;
+	uint64_t max_copy_size;
+	size_t total_bo_size = 0, max_bo_size = 0, buffer_size = 0;
+	FILE *bo_contents_fp = NULL;
+	parallel_restore_entry *entry;
+	parallel_restore_cmd *restore_cmd = thread_data->restore_cmd;
+	int ret = 0;
+	int offset = 0;
+	void *buffer = NULL;
+
+	ret = init_dev(thread_data->minor, &h_dev, &max_copy_size);
+	if (ret) {
+		goto err;
+	}
+
+	for (int i = 0; i < restore_cmd->cmd_head.entry_num; i++) {
+		if (restore_cmd->entries[i].gpu_id == thread_data->gpu_id) {
+			total_bo_size += restore_cmd->entries[i].size;
+			max_bo_size = max(restore_cmd->entries[i].size, max_bo_size);
+		}
+	}
+
+	buffer_size = kfd_max_buffer_size > 0 ? min(kfd_max_buffer_size, max_bo_size) : max_bo_size;
+
+	bo_contents_fp = get_bo_contents_fp(restore_cmd->cmd_head.id, thread_data->gpu_id, total_bo_size);
+	if (bo_contents_fp == NULL) {
+		ret = -1;
+		goto err_sdma;
+	}
+	offset = ftell(bo_contents_fp);
+
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), buffer_size);
+	if (!buffer) {
+		pr_perror("Failed to alloc aligned memory. Consider setting KFD_MAX_BUFFER_SIZE.");
+		ret = -ENOMEM;
+		goto err_sdma;
+	}
+
+	for (int i = 0; i < restore_cmd->cmd_head.entry_num; i++) {
+		if (restore_cmd->entries[i].gpu_id != thread_data->gpu_id)
+			continue;
+
+		entry = &restore_cmd->entries[i];
+		fseek(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
+		ret = sdma_copy_bo_helper(entry->size, restore_cmd->fds_write[entry->write_id], bo_contents_fp, buffer,
+					  buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+		if (ret) {
+			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
+			goto err_sdma;
+		}
+	}
+
+err_sdma:
+	if (bo_contents_fp)
+		fclose(bo_contents_fp);
+	if (buffer)
+		xfree(buffer);
+	amdgpu_device_deinitialize(h_dev);
+err:
+	thread_data->ret = ret;
+	return NULL;
+}
+
+void *restore_device_parallel_worker(void *arg)
+{
+	while (1) {
+		parallel_restore_cmd restore_cmd = { 0 };
+		struct parallel_thread_data *thread_datas = NULL;
+		int ret;
+		int error_occurred = 0, join_ret = 0, created_threads = 0;
+
+		ret = recv_parallel_restore_cmd(&restore_cmd);
+		if (ret) {
+			if (ret == 1) {
+				*(int *)arg = 0;
+				goto exit;
+			}
+			goto err;
+		}
+
+		thread_datas = xzalloc(sizeof(*thread_datas) * restore_cmd.cmd_head.gpu_num);
+		if (!thread_datas) {
+			ret = -ENOMEM;
+			goto err;
+		}
+
+		for (; created_threads < restore_cmd.cmd_head.gpu_num; created_threads++) {
+			thread_datas[created_threads].gpu_id = restore_cmd.gpu_ids[created_threads].gpu_id;
+			thread_datas[created_threads].minor = restore_cmd.gpu_ids[created_threads].minor;
+			thread_datas[created_threads].restore_cmd = &restore_cmd;
+
+			ret = pthread_create(&thread_datas[created_threads].thread, NULL, parallel_restore_bo_contents,
+					     (void *)&thread_datas[created_threads]);
+			if (ret) {
+				pr_err("Failed to create thread[0x%x] ret:%d\n", thread_datas[created_threads].gpu_id, ret);
+				error_occurred = 1;
+				break;
+			}
+		}
+
+		for (int i = 0; i < created_threads; i++) {
+			join_ret = pthread_join(thread_datas[i].thread, NULL);
+			if (join_ret != 0) {
+				pr_err("pthread_join failed for Thread[0x%x] ret:%d\n",
+				       thread_datas[i].gpu_id, join_ret);
+				if (!error_occurred) {
+					ret = join_ret;
+					error_occurred = 1;
+				}
+			}
+
+			pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
+
+			/* Check thread return value */
+			if (thread_datas[i].ret && !error_occurred) {
+				ret = thread_datas[i].ret;
+				error_occurred = 1;
+			}
+		}
+
+		if (thread_datas)
+			xfree(thread_datas);
+err:
+		free_parallel_restore_cmd(&restore_cmd);
+
+		if (ret) {
+			*(int *)arg = ret;
+			return NULL;
+		}
+	}
+exit:
+	return NULL;
+}
+
+/*
+ * While the background thread is running, some processing functions (e.g., stop_cgroupd)
+ * in the main thread need to block SIGCHLD. To prevent interference from this background
+ * thread, SIGCHLD is blocked in this thread.
+ */
+static int back_thread_create(pthread_t *newthread, void *(*f)(void *), void *arg)
+{
+	int ret = 0;
+	sigset_t blockmask, oldmask;
+
+	sigemptyset(&blockmask);
+	sigaddset(&blockmask, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &blockmask, &oldmask);
+
+	ret = pthread_create(newthread, NULL, f, arg);
+	if (ret) {
+		pr_err("Create worker thread fail: %d\n", ret);
+		return -1;
+	}
+
+	sigprocmask(SIG_SETMASK, &oldmask, NULL);
+	return 0;
+}
+
+int amdgpu_plugin_post_forking(void)
+{
+	if (plugin_disabled)
+		return -ENOTSUP;
+
+	if (parallel_disabled)
+		return 0;
+
+	return back_thread_create(&parallel_thread, restore_device_parallel_worker, &parallel_thread_result);
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__POST_FORKING, amdgpu_plugin_post_forking)
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 5b4396a0c..730f2e028 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -45,7 +45,7 @@ bool kfd_capability_check = true;
  */
 int fd_next = -1;
 
-static int open_drm_render_device(int minor)
+int open_drm_render_device(int minor)
 {
 	char path[128];
 	int fd, ret_fd;
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
index c890e3dda..e19f8e7ce 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.h
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -118,6 +118,7 @@ struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32
 struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor);
 struct tp_node *sys_get_node_by_index(const struct tp_system *sys, uint32_t index);
 
+int open_drm_render_device(int minor);
 int node_get_drm_render_device(struct tp_node *node);
 void sys_close_drm_render_devices(struct tp_system *sys);
 

From 7a5b3d1f41cdc1f1f8960bf8037c1f646aada229 Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:44:35 +0000
Subject: [PATCH 1683/1854] plugins/amdgpu: Update `README.md` and
 `criu-amdgpu-plugin.txt`

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 Documentation/criu-amdgpu-plugin.txt |  1 +
 plugins/amdgpu/README.md             | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Documentation/criu-amdgpu-plugin.txt b/Documentation/criu-amdgpu-plugin.txt
index 68803f3db..fe76fc3bc 100644
--- a/Documentation/criu-amdgpu-plugin.txt
+++ b/Documentation/criu-amdgpu-plugin.txt
@@ -15,6 +15,7 @@ Checkpoint / Restore inside a docker container
 Pytorch
 Tensorflow
 Using CRIU Image Streamer
+Parallel Restore
 
 DESCRIPTION
 -----------
diff --git a/plugins/amdgpu/README.md b/plugins/amdgpu/README.md
index 1078eafe6..b808fbc4f 100644
--- a/plugins/amdgpu/README.md
+++ b/plugins/amdgpu/README.md
@@ -3,7 +3,8 @@ Supporting ROCm with CRIU
 
 _Felix Kuehling <Felix.Kuehling@amd.com>_<br>
 _Rajneesh Bardwaj <Rajneesh.Bhardwaj@amd.com>_<br>
-_David Yat Sin <David.YatSin@amd.com>_
+_David Yat Sin <David.YatSin@amd.com>_<br>
+_Yanning Yang <yangyanning@sjtu.edu.cn>_
 
 # Introduction
 
@@ -224,6 +225,26 @@ to resume execution on the GPUs.
 *This new plugin is enabled by the new hook `__RESUME_DEVICES_LATE` in our RFC
 patch series.*
 
+## Restoring BO content in parallel
+
+Restoring the BO content is an important part in the restore of GPU state and
+usually takes a significant amount of time. A possible location for this
+procedure is the `cr_plugin_restore_file` hook. However, restoring in this hook
+blocks the target process from performing other restore operations, which
+hinders further optimization of the restore process.
+
+Therefore, a new plugin hook that runs in the master restore process is
+introduced, and it interacts with the `cr_plugin_restore_file` hook to complete
+the restore of BO content. Specifically, the target process only needs to send
+the relevant BOs to the master restore process, while this new hook handles all
+the restore of buffer objects. Through this method, during the restore of the BO
+content, the target process can perform other restore operations, thus
+accelerating the restore procedure. This is an implementation of the gCROP
+method proposed in the ACM SoCC'24 paper: [On-demand and Parallel
+Checkpoint/Restore for GPU Applications](https://dl.acm.org/doi/10.1145/3698038.3698510).
+
+*This optimization technique is enabled by the `__POST_FORKING` hook.*
+
 ## Other CRIU changes
 
 In addition to the new plugins, we need to make some changes to CRIU itself to

From ae1395de184976250b4ddd9f7213fd129b6f2e74 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Wed, 30 Apr 2025 11:39:18 +0800
Subject: [PATCH 1684/1854] zdtm.py: add an option to change pycriu import path

By default zdtm expects that criu is built from source first and only
then you can run zdtm tests against it. But what if you really want to
run tests against a criu version installed on the system? Yes there is
already a nice option for zdtm to change the criu binary it uses
"--criu-bin", but it would still end up using the pycriu module from
source and you would still have to build everything beforehand.

Let's add an option to change the path where zdtm searches for pycriu
module "--pycriu-search-path". This way we can run zdtm tests on the
criu installed on the system directly without building criu from source,
e.g. on Fedora it works like:

test/zdtm.py run --criu-bin /usr/sbin/criu \
  --pycriu-search-path /usr/lib/python3.13/site-packages \
  -t zdtm/static/env00

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index e3ddc762a..d5514af71 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -22,11 +22,11 @@ import sys
 import tempfile
 import time
 import uuid
+import site
 from builtins import input, int, open, range, str, zip
 
 import yaml
 
-import pycriu as crpc
 from zdtm.criu_config import criu_config
 
 # File to store content of streamed images
@@ -1142,6 +1142,24 @@ class criu:
         self.__img_streamer_process = None
         self.__tls = self.__tls_options() if opts['tls'] else []
         self.__criu_bin = opts['criu_bin']
+
+        global crpc
+        pycriu_search_path = opts.get('pycriu_search_path')
+        if pycriu_search_path:
+            sys.path.insert(0, pycriu_search_path)
+
+        try:
+            import pycriu as crpc
+            if pycriu_search_path:
+                print(f"pycriu loaded from: {crpc.__file__}")
+        except ImportError:
+            if not pycriu_search_path:
+                print("Consider building CRIU or using '--pycriu-search-path' option.")
+            raise
+        finally:
+            if pycriu_search_path:
+                sys.path.pop(0)
+
         self.__crit_bin = opts['crit_bin']
         self.__pre_dump_mode = opts['pre_dump_mode']
         self.__preload_libfault = bool(opts['preload_libfault'])
@@ -2169,7 +2187,8 @@ class Launcher:
               'dedup', 'sbs', 'freezecg', 'user', 'dry_run', 'noauto_dedup',
               'remote_lazy_pages', 'show_stats', 'lazy_migrate', 'stream',
               'tls', 'criu_bin', 'crit_bin', 'pre_dump_mode', 'mntns_compat_mode',
-              'rootless', 'preload_libfault', 'mocked_cuda_checkpoint')
+              'rootless', 'preload_libfault', 'mocked_cuda_checkpoint',
+              'pycriu_search_path')
         arg = repr((name, desc, flavor, {d: self.__opts[d] for d in nd}))
 
         if self.__use_log:
@@ -2860,6 +2879,9 @@ def get_cli_args():
     rp.add_argument("--criu-bin",
                     help="Path to criu binary",
                     default='../criu/criu')
+    rp.add_argument("--pycriu-search-path",
+                    help=f"Path to search for pycriu module first (e.g., {site.getsitepackages()[0]})",
+                    default=None)
     rp.add_argument("--crit-bin",
                     help="Path to crit binary",
                     default='../crit/crit')

From 1fdff7c7a6f12627212b2704db48929204f6a397 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Mon, 19 May 2025 11:53:18 +0800
Subject: [PATCH 1685/1854] zdtm: fix check for criu binary

The opts['action'] contains actor function and not the action name, so
we should compare it with a function.

While on it let's also add a comment about --criu-bin option if CRIU
binary is missing.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index d5514af71..3339dd816 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1611,6 +1611,7 @@ class criu:
     def available():
         if not os.access(opts['criu_bin'], os.X_OK):
             print("CRIU binary not found at %s" % opts['criu_bin'])
+            print("Consider building CRIU or using '--criu-bin' option.")
             sys.exit(1)
 
     def kill(self):
@@ -2972,7 +2973,7 @@ if __name__ == '__main__':
     if opts['debug']:
         sys.settrace(traceit)
 
-    if opts['action'] == 'run':
+    if opts['action'] == run_tests:
         criu.available()
     for tst in test_classes.values():
         tst.available()

From 2b8951a9cf22c587d3ba397f9f2adc1863bd5dd3 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 16 May 2025 19:26:01 +0000
Subject: [PATCH 1686/1854] image: use `protoc` instead of `protoc-c`

The new protoc 1.5.2 reports warnings:
`protoc-c` is deprecated. Please use `protoc` instead!

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 images/Makefile                    | 4 ++--
 plugins/amdgpu/Makefile            | 2 +-
 test/others/rpc/Makefile           | 2 +-
 test/others/unix-callback/Makefile | 2 +-
 test/zdtm/static/Makefile          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/images/Makefile b/images/Makefile
index 1e40b8a8f..d966fbfca 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -58,7 +58,7 @@ proto-obj-y	+= ext-file.o
 proto-obj-y	+= cgroup.o
 proto-obj-y	+= userns.o
 proto-obj-y	+= pidns.o
-proto-obj-y	+= google/protobuf/descriptor.o # To make protoc-c happy and compile opts.proto
+proto-obj-y	+= google/protobuf/descriptor.o # To make protoc happy and compile opts.proto
 proto-obj-y	+= opts.o
 proto-obj-y	+= seccomp.o
 proto-obj-y	+= binfmt-misc.o
@@ -96,7 +96,7 @@ makefile-deps := Makefile $(obj)/Makefile
 define gen-proto-rules
 $(obj)/$(1).pb-c.c $(obj)/$(1).pb-c.h: $(obj)/$(1).proto $(addsuffix .pb-c.c,$(addprefix $(obj)/,$(2))) $(makefile-deps)
 	$$(E) "  PBCC    " $$@
-	$$(Q) protoc-c --proto_path=$(obj)/ --c_out=$(obj)/ $$<
+	$$(Q) protoc --proto_path=$(obj)/ --c_out=$(obj)/ $$<
 ifeq ($(PROTOUFIX),y)
 	$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$@
 	$$(Q) sed -i -e 's/4294967295/0xFFFFFFFF/g' $$(patsubst %.c,%.h,$$@)
diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 4bf5e499f..870a039cd 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -25,7 +25,7 @@ else
 endif
 
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
-		protoc-c --proto_path=. --c_out=. criu-amdgpu.proto
+		protoc --proto_path=. --c_out=. criu-amdgpu.proto
 
 amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
 	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index b2f907abe..384eb0539 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -47,7 +47,7 @@ rpc_pb2.py: rpc.proto
 	protoc --proto_path=. --python_out=. rpc.proto
 
 rpc.pb-c.c: rpc.proto
-	protoc-c --proto_path=. --c_out=. rpc.proto
+	protoc --proto_path=. --c_out=. rpc.proto
 
 clean:
 	rm -rf build rpc.pb-c.o test-c.o test-c rpc.pb-c.c rpc.pb-c.h rpc_pb2.py rpc_pb2.pyc criu
diff --git a/test/others/unix-callback/Makefile b/test/others/unix-callback/Makefile
index 25bcf228b..984044077 100644
--- a/test/others/unix-callback/Makefile
+++ b/test/others/unix-callback/Makefile
@@ -4,7 +4,7 @@ run: all
 	./run.sh
 
 unix.pb-c.c: unix.proto
-	protoc-c --proto_path=. --c_out=. unix.proto
+	protoc --proto_path=. --c_out=. unix.proto
 
 unix-lib.so: unix-lib.c unix.pb-c.c
 	gcc -g -Werror -Wall -shared -nostartfiles unix-lib.c unix.pb-c.c -o unix-lib.so -iquote ../../../criu/include -fPIC
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 81e44de22..61cacbb4e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -734,7 +734,7 @@ criu-rtc.pb-c.c: criu-rtc.proto
 	$(Q)echo $@ >> .gitignore
 	$(Q)echo $(@:%.c=%.h) >> .gitignore
 	$(E) " PBCC     " $@
-	$(Q)protoc-c --proto_path=. --c_out=. criu-rtc.proto
+	$(Q)protoc --proto_path=. --c_out=. criu-rtc.proto
 
 criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c
 	$(E) " LD       " $@

From af5412a433c6456071b45d7753132b84a942891b Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 4 May 2025 16:27:32 +0200
Subject: [PATCH 1687/1854] criu/proc_parse: support
 MADV_WIPEONFORK/VM_WIPEONFORK

Support VM_WIPEONFORK [1] by detecting it from /proc/<pid>/smaps
and setting a corresponding MADV_WIPEONFORK flag on vma.

[1] https://github.com/torvalds/linux/commit/d2cd9ede6e193dd7d88b6d27399e96229a551b19

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/mman.h | 3 +++
 criu/proc_parse.c   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/criu/include/mman.h b/criu/include/mman.h
index 8ca71fadf..a55356490 100644
--- a/criu/include/mman.h
+++ b/criu/include/mman.h
@@ -13,5 +13,8 @@
 #ifndef MADV_DONTDUMP
 #define MADV_DONTDUMP 16
 #endif
+#ifndef MADV_WIPEONFORK
+#define MADV_WIPEONFORK 18
+#endif
 
 #endif /* __CR_MMAN_H__ */
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 99dc518a5..a97ee11d1 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -160,6 +160,8 @@ static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf,
 			*madv |= (1ul << MADV_HUGEPAGE);
 		else if (_vmflag_match(tok, "nh"))
 			*madv |= (1ul << MADV_NOHUGEPAGE);
+		else if (_vmflag_match(tok, "wf"))
+			*madv |= (1ul << MADV_WIPEONFORK);
 
 		/* vmsplice doesn't work for VM_IO and VM_PFNMAP mappings. */
 		if (_vmflag_match(tok, "io") || _vmflag_match(tok, "pf"))

From 6476488a510264f922568d94e1f2be2208c8b2be Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 4 May 2025 16:32:01 +0200
Subject: [PATCH 1688/1854] test/zdtm/static/maps02: add MADV_WIPEONFORK
 testcase

In addition to that I did small non-functional corrections.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 test/zdtm/static/get_smaps_bits.c |  6 ++++++
 test/zdtm/static/maps02.c         | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/test/zdtm/static/get_smaps_bits.c b/test/zdtm/static/get_smaps_bits.c
index 31d0d92b2..d9ac8b1ce 100644
--- a/test/zdtm/static/get_smaps_bits.c
+++ b/test/zdtm/static/get_smaps_bits.c
@@ -18,6 +18,10 @@
 #define MADV_DONTDUMP 16
 #endif
 
+#ifndef MADV_WIPEONFORK
+#define MADV_WIPEONFORK 18
+#endif
+
 static void parse_vmflags(char *buf, unsigned long *flags, unsigned long *madv)
 {
 	char *tok;
@@ -57,6 +61,8 @@ static void parse_vmflags(char *buf, unsigned long *flags, unsigned long *madv)
 			*madv |= (1ul << MADV_HUGEPAGE);
 		else if (_vmflag_match(tok, "nh"))
 			*madv |= (1ul << MADV_NOHUGEPAGE);
+		else if (_vmflag_match(tok, "wf"))
+			*madv |= (1ul << MADV_WIPEONFORK);
 
 		/*
 		 * Anything else is just ignored.
diff --git a/test/zdtm/static/maps02.c b/test/zdtm/static/maps02.c
index 29f1372c9..37c09dc71 100644
--- a/test/zdtm/static/maps02.c
+++ b/test/zdtm/static/maps02.c
@@ -6,7 +6,11 @@
 #define MADV_DONTDUMP 16
 #endif
 
-const char *test_doc = "Test shared memory with advises";
+#ifndef MADV_WIPEONFORK
+#define MADV_WIPEONFORK 18
+#endif
+
+const char *test_doc = "Test private memory with advises";
 const char *test_author = "Cyrill Gorcunov <gorcunov@openvz.org>";
 
 struct mmap_data {
@@ -43,12 +47,12 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 
 int main(int argc, char **argv)
 {
-	struct mmap_data m[5] = {};
+	struct mmap_data m[6] = {};
 	size_t i;
 
 	test_init(argc, argv);
 
-	test_msg("Alloc growsdown\n");
+	test_msg("Alloc dontfork\n");
 	if (alloc_anon_mmap(&m[0], MAP_PRIVATE | MAP_ANONYMOUS, MADV_DONTFORK))
 		return -1;
 
@@ -64,10 +68,14 @@ int main(int argc, char **argv)
 	if (alloc_anon_mmap(&m[3], MAP_PRIVATE | MAP_ANONYMOUS, MADV_HUGEPAGE))
 		return -1;
 
-	test_msg("Alloc dontfork/random|mergeable\n");
+	test_msg("Alloc mergeable\n");
 	if (alloc_anon_mmap(&m[4], MAP_PRIVATE | MAP_ANONYMOUS, MADV_MERGEABLE))
 		return -1;
 
+	test_msg("Alloc wipeonfork\n");
+	if (alloc_anon_mmap(&m[5], MAP_PRIVATE | MAP_ANONYMOUS, MADV_WIPEONFORK))
+		return -1;
+
 	test_msg("Fetch existing flags/adv\n");
 	for (i = 0; i < sizeof(m) / sizeof(m[0]); i++) {
 		if (get_smaps_bits((unsigned long)m[i].start, &m[i].orig_flags, &m[i].orig_madv))

From b90cfc1a80f69ff1fc7595c349c81d73e7f7ccc0 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 4 May 2025 17:11:28 +0200
Subject: [PATCH 1689/1854] criu/proc_parse: support MAP_DROPPABLE mappings

Support MAP_DROPPABLE [1] by detecting it from /proc/<pid>/smaps
and restoring it as a normal private mapping flag on vma with only
difference that instead of MAP_PRIVATE we should use MAP_DROPPABLE.

[1] https://github.com/torvalds/linux/commit/9651fcedf7b92d3f7f1ab179e8ab55b85ee10fc1

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/mman.h |  3 +++
 criu/mem.c          | 12 ++++++++++++
 criu/proc_parse.c   | 16 ++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/criu/include/mman.h b/criu/include/mman.h
index a55356490..086753bcf 100644
--- a/criu/include/mman.h
+++ b/criu/include/mman.h
@@ -4,6 +4,9 @@
 #ifndef MAP_HUGETLB
 #define MAP_HUGETLB 0x40000
 #endif
+#ifndef MAP_DROPPABLE
+#define MAP_DROPPABLE 0x08
+#endif
 #ifndef MADV_HUGEPAGE
 #define MADV_HUGEPAGE 14
 #endif
diff --git a/criu/mem.c b/criu/mem.c
index c9578ef44..803cb545b 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -10,6 +10,7 @@
 #include "cr_options.h"
 #include "servicefd.h"
 #include "mem.h"
+#include "mman.h"
 #include "parasite-syscall.h"
 #include "parasite.h"
 #include "page-pipe.h"
@@ -398,6 +399,17 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma, str
 	if (vma_entry_is(vma->e, VMA_AREA_VVAR))
 		return 0;
 
+	/*
+	 * 9651fcedf7b9 ("mm: add MAP_DROPPABLE for designating always lazily freeable mappings")
+	 * tells us that:
+	 * Under memory pressure, mm can just drop the pages (so that they're
+	 * zero when read back again).
+	 *
+	 * Let's just skip MAP_DROPPABLE mappings pages dump logic.
+	 */
+	if (vma->e->flags & MAP_DROPPABLE)
+		return 0;
+
 	/*
 	 * To facilitate any combination of pre-dump modes to run after
 	 * one another, we need to take extra care as discussed below.
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index a97ee11d1..d7eb25662 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -144,6 +144,8 @@ static void __parse_vmflags(char *buf, u32 *flags, u64 *madv, int *io_pf,
 			*flags |= MAP_NORESERVE;
 		else if (_vmflag_match(tok, "ht"))
 			*flags |= MAP_HUGETLB;
+		else if (_vmflag_match(tok, "dp"))
+			*flags |= MAP_DROPPABLE;
 
 		/* madvise() block */
 		if (_vmflag_match(tok, "sr"))
@@ -206,6 +208,20 @@ static void parse_vma_vmflags(char *buf, struct vma_area *vma_area)
 
 	if (vma_area->e->madv)
 		vma_area->e->has_madv = true;
+
+	/*
+	 * We set MAP_PRIVATE flag on vma_area->e->flags right after parsing
+	 * a first line of VMA entry in /proc/<pid>/smaps file:
+	 * 7fa84fa70000-7fa84fa95000 rw-p 00000000 00:00 0
+	 * but it's too early and we can't distinguish between MAP_DROPPABLE
+	 * and MAP_PRIVATE mappings yet, as they both private mappings in nature
+	 * and at this point we haven't yet read "VmFlags:" line in smaps.
+	 *
+	 * Let's detect this situation and drop MAP_PRIVATE flag while keep
+	 * MAP_DROPPABLE, otherwise restorer's restore_mapping() helper will fail.
+	 */
+	if ((vma_area->e->flags & MAP_PRIVATE) && (vma_area->e->flags & MAP_DROPPABLE))
+		vma_area->e->flags &= ~MAP_PRIVATE;
 }
 
 static inline int is_anon_shmem_map(dev_t dev)

From 4f9dcfb9c8dc1d2c6bb07ffc63722c70b8b50796 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 4 May 2025 18:55:46 +0200
Subject: [PATCH 1690/1854] pycriu/images/pb2dict: add MAP_DROPPABLE flag

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 lib/pycriu/images/pb2dict.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index e3dd95ac0..6c4f68889 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -83,6 +83,7 @@ mmap_prot_map = [
 mmap_flags_map = [
     ('MAP_SHARED', 0x1),
     ('MAP_PRIVATE', 0x2),
+    ('MAP_DROPPABLE', 0x08),
     ('MAP_ANON', 0x20),
     ('MAP_GROWSDOWN', 0x0100),
 ]

From dfa0ce1808fb1e3a1439392a6aec8071643ad2c0 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 4 May 2025 17:21:23 +0200
Subject: [PATCH 1691/1854] test/zdtm/static/maps02: add MAP_DROPPABLE testcase

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 test/zdtm/static/get_smaps_bits.c |  6 ++++++
 test/zdtm/static/maps02.c         | 20 +++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/test/zdtm/static/get_smaps_bits.c b/test/zdtm/static/get_smaps_bits.c
index d9ac8b1ce..3d952ac95 100644
--- a/test/zdtm/static/get_smaps_bits.c
+++ b/test/zdtm/static/get_smaps_bits.c
@@ -6,6 +6,10 @@
 #define MAP_HUGETLB 0x40000
 #endif
 
+#ifndef MAP_DROPPABLE
+#define MAP_DROPPABLE 0x08
+#endif
+
 #ifndef MADV_HUGEPAGE
 #define MADV_HUGEPAGE 14
 #endif
@@ -45,6 +49,8 @@ static void parse_vmflags(char *buf, unsigned long *flags, unsigned long *madv)
 			*flags |= MAP_NORESERVE;
 		else if (_vmflag_match(tok, "ht"))
 			*flags |= MAP_HUGETLB;
+		else if (_vmflag_match(tok, "dp"))
+			*flags |= MAP_DROPPABLE;
 
 		/* madvise() block */
 		if (_vmflag_match(tok, "sr"))
diff --git a/test/zdtm/static/maps02.c b/test/zdtm/static/maps02.c
index 37c09dc71..38244f020 100644
--- a/test/zdtm/static/maps02.c
+++ b/test/zdtm/static/maps02.c
@@ -2,6 +2,10 @@
 #include "zdtmtst.h"
 #include "get_smaps_bits.h"
 
+#ifndef MAP_DROPPABLE
+#define MAP_DROPPABLE 0x08
+#endif
+
 #ifndef MADV_DONTDUMP
 #define MADV_DONTDUMP 16
 #endif
@@ -27,8 +31,14 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 {
 	m->start = mmap(NULL, MEM_SIZE, PROT_READ | PROT_WRITE, flags, -1, 0);
 	if (m->start == MAP_FAILED) {
-		pr_perror("mmap failed");
-		return -1;
+		if (errno == EINVAL) {
+			test_msg("mmap failed, no kernel support\n");
+			*m = (struct mmap_data){};
+			return 0;
+		} else {
+			pr_perror("mmap failed");
+			return -1;
+		}
 	}
 
 	if (madvise(m->start, MEM_SIZE, adv)) {
@@ -47,7 +57,7 @@ static int alloc_anon_mmap(struct mmap_data *m, int flags, int adv)
 
 int main(int argc, char **argv)
 {
-	struct mmap_data m[6] = {};
+	struct mmap_data m[7] = {};
 	size_t i;
 
 	test_init(argc, argv);
@@ -76,6 +86,10 @@ int main(int argc, char **argv)
 	if (alloc_anon_mmap(&m[5], MAP_PRIVATE | MAP_ANONYMOUS, MADV_WIPEONFORK))
 		return -1;
 
+	test_msg("Alloc droppable\n");
+	if (alloc_anon_mmap(&m[6], MAP_DROPPABLE | MAP_ANONYMOUS, MADV_NORMAL))
+		return -1;
+
 	test_msg("Fetch existing flags/adv\n");
 	for (i = 0; i < sizeof(m) / sizeof(m[0]); i++) {
 		if (get_smaps_bits((unsigned long)m[i].start, &m[i].orig_flags, &m[i].orig_madv))

From 5f18ca1bbe34a287af4dc4b0e7900253c3c71d51 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 4 May 2025 21:11:29 +0200
Subject: [PATCH 1692/1854] test/zdtm/static: add maps11 test for
 MAP_DROPPABLE/MADV_WIPEONFORK

In this test we want to ensure that contents of droppable mappings
and mappings with MADV_WIPEONFORK is properly restored in
parent/child processes.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 test/zdtm/static/Makefile |   1 +
 test/zdtm/static/maps11.c | 205 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 test/zdtm/static/maps11.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 61cacbb4e..34fc90513 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -150,6 +150,7 @@ TST_NOFILE	:=				\
 		maps05				\
 		maps09				\
 		maps10				\
+		maps11				\
 		mlock_setuid			\
 		xids00				\
 		groups				\
diff --git a/test/zdtm/static/maps11.c b/test/zdtm/static/maps11.c
new file mode 100644
index 000000000..df309714b
--- /dev/null
+++ b/test/zdtm/static/maps11.c
@@ -0,0 +1,205 @@
+#include <stdint.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include "zdtmtst.h"
+
+#ifndef MAP_DROPPABLE
+#define MAP_DROPPABLE 0x08
+#endif
+
+#ifndef MADV_WIPEONFORK
+#define MADV_WIPEONFORK 18
+#endif
+
+const char *test_doc = "Test MAP_DROPPABLE/MADV_WIPEONFORK mappings with 2 processes";
+const char *test_author = "Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>";
+
+bool mem_is_zero(const uint8_t *buffer, size_t length)
+{
+	size_t i;
+
+	for (i = 0; i < length; i++)
+		if (buffer[i] != 0)
+			return false;
+
+	return true;
+}
+
+int main(int argc, char **argv)
+{
+	uint8_t *p1, *p2;
+	pid_t pid;
+	int status;
+	const char data[] = "MADV_WIPEONFORK vma data";
+	bool criu_was_there = false;
+	struct stat st1, st2;
+
+	test_init(argc, argv);
+
+	p1 = mmap(NULL, sizeof(data), PROT_READ | PROT_WRITE,
+		  MAP_DROPPABLE | MAP_ANONYMOUS, 0, 0);
+	if (p1 == MAP_FAILED) {
+		if (errno == EINVAL) {
+			skip("mmap failed, no kernel support for MAP_DROPPABLE\n");
+			goto skip;
+		} else {
+			pr_perror("mmap failed");
+			return -1;
+		}
+	}
+
+	p2 = mmap(NULL, sizeof(data), PROT_READ | PROT_WRITE,
+		  MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	if (p2 == MAP_FAILED) {
+		pr_perror("mmap failed");
+		return 1;
+	}
+
+	if (madvise(p2, sizeof(data), MADV_WIPEONFORK)) {
+		pr_perror("madvise failed");
+		return -1;
+	}
+
+	/* contents of this mapping is supposed to be dropped after C/R */
+	memcpy(p1, data, sizeof(data));
+
+	/* contents of this mapping is supposed to be dropped after fork() */
+	memcpy(p2, data, sizeof(data));
+
+	/*
+	 * Let's spawn a process before C/R so our mappings get inherited
+	 * then, after C/R we need to ensure that CRIU memory premapping
+	 * machinery works properly.
+	 *
+	 * It is important, because we restore MADV_WIPEONFORK on a later
+	 * stages (after vma premapping happens) and we need to ensure that
+	 * CRIU handles everything in a right way.
+	 */
+	pid = test_fork();
+	if (pid < 0) {
+		pr_perror("fork failed");
+		return 1;
+	}
+
+	if (pid == 0) {
+		test_waitsig();
+
+		/*
+		 * Both mappings have VM_WIPEONFORK flag set,
+		 * so we expect to have it null-ified after fork().
+		 */
+		if (!mem_is_zero(p1, sizeof(data)) ||
+		    !mem_is_zero(p2, sizeof(data))) {
+			pr_err("1st child: memory check failed\n");
+			return 1;
+		}
+
+		return 0;
+	}
+
+	/*
+	 * A simple way to detect if C/R happened is to compare st_ino
+	 * fields of stat() on the procfs files of the current task.
+	 *
+	 * Hopefully, this terrible hack is never used in real-world
+	 * applications ;-) Here, we only need this to make test
+	 * to pass with/without --nocr option.
+	 */
+	if (stat("/proc/self/status", &st1)) {
+		pr_perror("stat");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/* signal a child process to continue */
+	if (kill(pid, SIGTERM)) {
+		pr_perror("kill");
+		goto err;
+	}
+
+	if (waitpid(pid, &status, 0) != pid) {
+		pr_perror("1st waitpid");
+		goto err;
+	}
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		fail("1st process didn't exit cleanly: status=%d", status);
+		goto err;
+	}
+
+	if (stat("/proc/self/status", &st2)) {
+		pr_perror("stat");
+		return 1;
+	}
+
+	/* detect CRIU */
+	criu_was_there = st1.st_ino != st2.st_ino;
+
+	/*
+	 * We should mark failure if one of the following happens:
+	 * 1. MAP_DROPPABLE memory is not zero after C/R
+	 * 2. MAP_DROPPABLE memory somehow changed without C/R
+	 *    (kernel issue? memory pressure?)
+	 * 3. MADV_WIPEONFORK memory is not preserved
+	 *
+	 * We care about 2nd case only because we would like test
+	 * to pass even with --nocr zdtm.py option.
+	 */
+	if ((criu_was_there && !mem_is_zero(p1, sizeof(data))) ||
+	    (!criu_was_there && memcmp(p1, data, sizeof(data))) ||
+	    memcmp(p2, data, sizeof(data))) {
+		fail("Data mismatch");
+		return 1;
+	}
+
+	/* contents of these mappings is supposed to be dropped after fork() */
+	memcpy(p1, data, sizeof(data));
+	memcpy(p2, data, sizeof(data));
+
+	pid = test_fork();
+	if (pid < 0) {
+		pr_perror("fork failed");
+		return 1;
+	}
+
+	if (pid == 0) {
+		if (!mem_is_zero(p1, sizeof(data)) ||
+		    !mem_is_zero(p2, sizeof(data))) {
+			pr_err("2nd child: memory check failed\n");
+			return 1;
+		}
+
+		return 0;
+	}
+
+	if (waitpid(pid, &status, 0) != pid) {
+		pr_perror("2nd waitpid");
+		goto err;
+	}
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		fail("2nd process didn't exit cleanly: status=%d", status);
+		goto err;
+	}
+
+	pass();
+
+	return 0;
+err:
+	if (waitpid(-1, NULL, WNOHANG) == 0) {
+		kill(pid, SIGTERM);
+		wait(NULL);
+	}
+	return 1;
+
+skip:
+	test_daemon();
+	test_waitsig();
+	pass();
+	return 0;
+}

From fbfed312e086b79bcddd30dbc368c16f2ca43310 Mon Sep 17 00:00:00 2001
From: Prajwal S N <prajwalnadig21@gmail.com>
Date: Mon, 14 Apr 2025 14:06:40 +0530
Subject: [PATCH 1693/1854] feat: introduce Nix flake

CRIU currently requires a number of dependencies in order to build from
source. The package names vary across distributions and package
managers. A Nix flake allows developers to spin up a dev environment
with `nix develop`, eliminating the hassle of manual dependency
management. It also prevents polluting the global package set on the
machine.

Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
---
 CONTRIBUTING.md |  2 +-
 flake.lock      | 61 +++++++++++++++++++++++++++++++++++++++
 flake.nix       | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 37965e5fb..712e7b813 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ To clone CRIU repo and switch to the proper branch, run:
 
 ### Compile
 
-First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info.
+First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info. Alternatively, you can use the Nix flake to set up a development environment by running `nix develop`.
 
 To compile CRIU, run:
 
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 000000000..90c914452
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 000000000..dc2429ffc
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,77 @@
+{
+  description = "CRIU development environment";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+
+        # Dependencies for CRIU
+        criuDeps = with pkgs; [
+          # Compiler and build essentials
+          gcc
+          gnumake
+          pkg-config
+
+          # Protocol Buffers
+          protobuf
+          protobufc
+          python3Packages.protobuf
+
+          # Other required libraries
+          libuuid
+          libbsd
+          iproute2
+          nftables
+          libcap
+          libnet
+          libnl
+          libaio
+          gnutls
+          libdrm
+
+          # ZDTM
+          python3Packages.pyyaml
+        ];
+
+        # Multilib support for 32-bit compatibility
+        # criuDeps32bit = with pkgs; [
+        #   glibc.dev
+        #   glibc
+        #   gcc-unwrapped
+        # ];
+
+        devShell = pkgs.mkShell {
+          buildInputs = criuDeps; # ++ (if pkgs.stdenv.isx86_64 then criuDeps32bit else []);
+
+          shellHook = ''
+            echo "CRIU development environment"
+            echo "=============================="
+            echo ""
+            echo "Useful commands:"
+            echo "  make - Build CRIU"
+            echo "  make test - Run tests (requires ZDTM dependencies)"
+            echo ""
+          '';
+
+          # Add proper flags for multilib support
+          # NIX_CFLAGS_COMPILE = pkgs.lib.optional pkgs.stdenv.isx86_64 "-m32";
+
+          # Make sure the shell can find headers for multilib
+          # PKG_CONFIG_PATH = pkgs.lib.makeSearchPath "lib/pkgconfig" criuDeps;
+        };
+      in
+      {
+        # Export the development shell
+        devShells.default = devShell;
+
+        # Build CRIU package as well
+        packages.default = pkgs.criu;
+      }
+    );
+}

From fcbaac0598e5be2cb87bf19341a0705fcae98259 Mon Sep 17 00:00:00 2001
From: Liana Koleva <43767763+lianakoleva@users.noreply.github.com>
Date: Wed, 26 Mar 2025 17:41:51 +0000
Subject: [PATCH 1694/1854] crtools: simplify check for cpuinfo subcommands

The cpuinfo command requires a "dump" or "check" subcommand. Thus, we
replace `CR_CPUINFO` with `CR_CPUINFO_DUMP` and `CR_CPUINFO_CHECK`.
This allows us to remove unnecessary subcommand check in
`image_dir_mode()` and perform all parsing in `parse_criu_mode()`.

With this change the check for validating the cpuinfo subcommand is
now done only once with `CR_CPUINFO_DUMP` or `CR_CPUINFO_CHECK` enum.

Signed-off-by: Liana Koleva <43767763+lianakoleva@users.noreply.github.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c         |  2 +-
 criu/crtools.c            | 57 ++++++++++++++++++++-------------------
 criu/include/cr_options.h |  3 ++-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index b9d11ced2..d8c5967bc 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -1261,7 +1261,7 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 	if (pid == 0) {
 		int ret = 1;
 
-		opts.mode = CR_CPUINFO;
+		opts.mode = (msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP) ? CR_CPUINFO_DUMP : CR_CPUINFO_CHECK;
 		if (setup_opts_from_req(sk, msg->opts))
 			goto cout;
 
diff --git a/criu/crtools.c b/criu/crtools.c
index 6f493850b..4734c90f2 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -54,19 +54,17 @@ void flush_early_log_to_stderr(void)
 	flush_early_log_buffer(STDERR_FILENO);
 }
 
-static int image_dir_mode(char *argv[], int optind)
+static int image_dir_mode(void)
 {
 	switch (opts.mode) {
 	case CR_DUMP:
 		/* fallthrough */
+	case CR_CPUINFO_DUMP:
+		/* fallthrough */
 	case CR_PRE_DUMP:
 		return O_DUMP;
 	case CR_RESTORE:
 		return O_RSTR;
-	case CR_CPUINFO:
-		if (!strcmp(argv[optind + 1], "dump"))
-			return O_DUMP;
-		/* fallthrough */
 	default:
 		return -1;
 	}
@@ -76,7 +74,7 @@ static int image_dir_mode(char *argv[], int optind)
 	return -1;
 }
 
-static int parse_criu_mode(char *mode)
+static int parse_criu_mode(char *mode, char *subcommand)
 {
 	if (!strcmp(mode, "dump"))
 		opts.mode = CR_DUMP;
@@ -96,8 +94,12 @@ static int parse_criu_mode(char *mode)
 		opts.mode = CR_SWRK;
 	else if (!strcmp(mode, "dedup"))
 		opts.mode = CR_DEDUP;
-	else if (!strcmp(mode, "cpuinfo"))
-		opts.mode = CR_CPUINFO;
+	else if (!strcmp(mode, "cpuinfo") && subcommand == NULL)
+		return -2;
+	else if (!strcmp(mode, "cpuinfo") && !strcmp(subcommand, "dump"))
+		opts.mode = CR_CPUINFO_DUMP;
+	else if (!strcmp(mode, "cpuinfo") && !strcmp(subcommand, "check"))
+		opts.mode = CR_CPUINFO_CHECK;
 	else if (!strcmp(mode, "exec"))
 		opts.mode = CR_EXEC_DEPRECATED;
 	else if (!strcmp(mode, "show"))
@@ -115,6 +117,7 @@ int main(int argc, char *argv[], char *envp[])
 	bool has_exec_cmd = false;
 	bool has_sub_command;
 	int state = PARSING_GLOBAL_CONF;
+	char *subcommand;
 
 	BUILD_BUG_ON(CTL_32 != SYSCTL_TYPE__CTL_32);
 	BUILD_BUG_ON(__CTL_STR != SYSCTL_TYPE__CTL_STR);
@@ -165,9 +168,15 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	if (parse_criu_mode(argv[optind])) {
+	has_sub_command = (argc - optind) > 1;
+	subcommand = has_sub_command ? argv[optind + 1] : NULL;
+	ret = parse_criu_mode(argv[optind], subcommand);
+	if (ret == -1) {
 		pr_err("unknown command: %s\n", argv[optind]);
 		goto usage;
+	} else if (ret == -2) {
+		pr_err("cpuinfo requires an action: dump or check\n");
+		goto usage;
 	}
 	/*
 	 * util_init initializes criu_run_id and compel_run_id so that sockets
@@ -223,25 +232,20 @@ int main(int argc, char *argv[], char *envp[])
 			return 1;
 		memcpy(opts.exec_cmd, &argv[optind + 1], (argc - optind - 1) * sizeof(char *));
 		opts.exec_cmd[argc - optind - 1] = NULL;
-	} else {
+	} else if (opts.mode != CR_CPUINFO_DUMP && opts.mode != CR_CPUINFO_CHECK && has_sub_command) {
 		/* No subcommands except for cpuinfo and restore --exec-cmd */
-		if (opts.mode != CR_CPUINFO && has_sub_command) {
-			pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", argv[optind]);
-			goto usage;
-		} else if (opts.mode == CR_CPUINFO && !has_sub_command) {
-			pr_err("cpuinfo requires an action: dump or check\n");
-			goto usage;
-		}
+		pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", argv[optind]);
+		goto usage;
 	}
 
-	if (opts.stream && image_dir_mode(argv, optind) == -1) {
+	if (opts.stream && image_dir_mode() == -1) {
 		pr_err("--stream cannot be used with the %s command\n", argv[optind]);
 		goto usage;
 	}
 
 	/* We must not open imgs dir, if service is called */
 	if (opts.mode != CR_SERVICE) {
-		ret = open_image_dir(opts.imgs_dir, image_dir_mode(argv, optind));
+		ret = open_image_dir(opts.imgs_dir, image_dir_mode());
 		if (ret < 0) {
 			pr_err("Couldn't open image dir %s\n", opts.imgs_dir);
 			return 1;
@@ -335,15 +339,12 @@ int main(int argc, char *argv[], char *envp[])
 	if (opts.mode == CR_DEDUP)
 		return cr_dedup() != 0;
 
-	if (opts.mode == CR_CPUINFO) {
-		if (!argv[optind + 1]) {
-			pr_err("cpuinfo requires an action: dump or check\n");
-			goto usage;
-		}
-		if (!strcmp(argv[optind + 1], "dump"))
-			return cpuinfo_dump();
-		else if (!strcmp(argv[optind + 1], "check"))
-			return cpuinfo_check();
+	if (opts.mode == CR_CPUINFO_DUMP) {
+		return cpuinfo_dump();
+	}
+
+	if (opts.mode == CR_CPUINFO_CHECK) {
+		return cpuinfo_check();
 	}
 
 	if (opts.mode == CR_EXEC_DEPRECATED) {
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index ab0bd8fa3..4df8056b7 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -125,7 +125,8 @@ enum criu_mode {
 	CR_SERVICE,
 	CR_SWRK,
 	CR_DEDUP,
-	CR_CPUINFO,
+	CR_CPUINFO_DUMP,
+	CR_CPUINFO_CHECK,
 	CR_EXEC_DEPRECATED,
 	CR_SHOW_DEPRECATED,
 };

From 99ba6db89b288b81beff3bfeace72552dedf5579 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Tue, 20 May 2025 14:47:55 +0000
Subject: [PATCH 1695/1854] crtools: do a few minor cleanups

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/crtools.c | 142 +++++++++++++++++++++++++------------------------
 1 file changed, 73 insertions(+), 69 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 4734c90f2..509e73d74 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -74,40 +74,55 @@ static int image_dir_mode(void)
 	return -1;
 }
 
-static int parse_criu_mode(char *mode, char *subcommand)
-{
-	if (!strcmp(mode, "dump"))
-		opts.mode = CR_DUMP;
-	else if (!strcmp(mode, "pre-dump"))
-		opts.mode = CR_PRE_DUMP;
-	else if (!strcmp(mode, "restore"))
-		opts.mode = CR_RESTORE;
-	else if (!strcmp(mode, "lazy-pages"))
-		opts.mode = CR_LAZY_PAGES;
-	else if (!strcmp(mode, "check"))
-		opts.mode = CR_CHECK;
-	else if (!strcmp(mode, "page-server"))
-		opts.mode = CR_PAGE_SERVER;
-	else if (!strcmp(mode, "service"))
-		opts.mode = CR_SERVICE;
-	else if (!strcmp(mode, "swrk"))
-		opts.mode = CR_SWRK;
-	else if (!strcmp(mode, "dedup"))
-		opts.mode = CR_DEDUP;
-	else if (!strcmp(mode, "cpuinfo") && subcommand == NULL)
-		return -2;
-	else if (!strcmp(mode, "cpuinfo") && !strcmp(subcommand, "dump"))
-		opts.mode = CR_CPUINFO_DUMP;
-	else if (!strcmp(mode, "cpuinfo") && !strcmp(subcommand, "check"))
-		opts.mode = CR_CPUINFO_CHECK;
-	else if (!strcmp(mode, "exec"))
-		opts.mode = CR_EXEC_DEPRECATED;
-	else if (!strcmp(mode, "show"))
-		opts.mode = CR_SHOW_DEPRECATED;
-	else
-		return -1;
+struct {
+	char *cmd;
+	int mode;
+} commands[] = {
+	{ "dump", CR_DUMP },
+	{ "pre-dump", CR_PRE_DUMP },
+	{ "restore", CR_RESTORE },
+	{ "lazy-pages", CR_LAZY_PAGES },
+	{ "check", CR_CHECK },
+	{ "page-server", CR_PAGE_SERVER },
+	{ "service", CR_SERVICE },
+	{ "swrk", CR_SWRK },
+	{ "dedup", CR_DEDUP },
+	{ "exec", CR_EXEC_DEPRECATED },
+	{ "show", CR_SHOW_DEPRECATED },
+};
 
-	return 0;
+static int parse_criu_mode(int argc, char **argv, int *optind)
+{
+	char *cmd = argv[*optind];
+	bool has_sub_command = (argc - *optind) > 1;
+	char *subcommand = has_sub_command ? argv[*optind + 1] : NULL;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(commands); i++) {
+		if (strcmp(cmd, commands[i].cmd))
+			continue;
+		opts.mode = commands[i].mode;
+		return 0;
+	}
+
+	if (!strcmp(cmd, "cpuinfo")) {
+		if (subcommand == NULL) {
+			pr_err("cpuinfo requires an action: dump or check\n");
+			return -1;
+		}
+		if (!strcmp(subcommand, "dump"))
+			opts.mode = CR_CPUINFO_DUMP;
+		else if (!strcmp(subcommand, "check"))
+			opts.mode = CR_CPUINFO_CHECK;
+		else {
+			pr_err("unknown cpuinfo sub-command: %s\n", subcommand);
+			return -1;
+		}
+		(*optind)++;
+		return 0;
+	}
+	pr_err("unknown command: %s\n", argv[*optind]);
+	return -1;
 }
 
 int main(int argc, char *argv[], char *envp[])
@@ -117,7 +132,7 @@ int main(int argc, char *argv[], char *envp[])
 	bool has_exec_cmd = false;
 	bool has_sub_command;
 	int state = PARSING_GLOBAL_CONF;
-	char *subcommand;
+	char *cmd;
 
 	BUILD_BUG_ON(CTL_32 != SYSCTL_TYPE__CTL_32);
 	BUILD_BUG_ON(__CTL_STR != SYSCTL_TYPE__CTL_STR);
@@ -168,16 +183,11 @@ int main(int argc, char *argv[], char *envp[])
 		return 1;
 	}
 
-	has_sub_command = (argc - optind) > 1;
-	subcommand = has_sub_command ? argv[optind + 1] : NULL;
-	ret = parse_criu_mode(argv[optind], subcommand);
-	if (ret == -1) {
-		pr_err("unknown command: %s\n", argv[optind]);
+	cmd = argv[optind];
+	ret = parse_criu_mode(argc, argv, &optind);
+	if (ret)
 		goto usage;
-	} else if (ret == -2) {
-		pr_err("cpuinfo requires an action: dump or check\n");
-		goto usage;
-	}
+
 	/*
 	 * util_init initializes criu_run_id and compel_run_id so that sockets
 	 * are generated with an unique name identifying the specific process
@@ -232,14 +242,13 @@ int main(int argc, char *argv[], char *envp[])
 			return 1;
 		memcpy(opts.exec_cmd, &argv[optind + 1], (argc - optind - 1) * sizeof(char *));
 		opts.exec_cmd[argc - optind - 1] = NULL;
-	} else if (opts.mode != CR_CPUINFO_DUMP && opts.mode != CR_CPUINFO_CHECK && has_sub_command) {
-		/* No subcommands except for cpuinfo and restore --exec-cmd */
-		pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", argv[optind]);
+	} else if (has_sub_command) {
+		pr_err("excessive parameter%s for command %s\n", (argc - optind) > 2 ? "s" : "", cmd);
 		goto usage;
 	}
 
 	if (opts.stream && image_dir_mode() == -1) {
-		pr_err("--stream cannot be used with the %s command\n", argv[optind]);
+		pr_err("--stream cannot be used with the %s command\n", cmd);
 		goto usage;
 	}
 
@@ -290,14 +299,13 @@ int main(int argc, char *argv[], char *envp[])
 	if (opts.img_parent)
 		pr_info("Will do snapshot from %s\n", opts.img_parent);
 
-	if (opts.mode == CR_DUMP) {
+	switch (opts.mode) {
+	case CR_DUMP:
 		if (!opts.tree_id)
 			goto opt_pid_missing;
 
 		return cr_dump_tasks(opts.tree_id);
-	}
-
-	if (opts.mode == CR_PRE_DUMP) {
+	case CR_PRE_DUMP:
 		if (!opts.tree_id)
 			goto opt_pid_missing;
 
@@ -307,9 +315,7 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		return cr_pre_dump_tasks(opts.tree_id) != 0;
-	}
-
-	if (opts.mode == CR_RESTORE) {
+	case CR_RESTORE:
 		if (opts.tree_id)
 			pr_warn("Using -t with criu restore is obsoleted\n");
 
@@ -322,43 +328,41 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		return ret != 0;
-	}
 
-	if (opts.mode == CR_LAZY_PAGES)
+	case CR_LAZY_PAGES:
 		return cr_lazy_pages(opts.daemon_mode) != 0;
 
-	if (opts.mode == CR_CHECK)
+	case CR_CHECK:
 		return cr_check() != 0;
 
-	if (opts.mode == CR_PAGE_SERVER)
+	case CR_PAGE_SERVER:
 		return cr_page_server(opts.daemon_mode, false, -1) != 0;
 
-	if (opts.mode == CR_SERVICE)
+	case CR_SERVICE:
 		return cr_service(opts.daemon_mode);
 
-	if (opts.mode == CR_DEDUP)
+	case CR_DEDUP:
 		return cr_dedup() != 0;
 
-	if (opts.mode == CR_CPUINFO_DUMP) {
+	case CR_CPUINFO_DUMP:
 		return cpuinfo_dump();
-	}
 
-	if (opts.mode == CR_CPUINFO_CHECK) {
+	case CR_CPUINFO_CHECK:
 		return cpuinfo_check();
-	}
 
-	if (opts.mode == CR_EXEC_DEPRECATED) {
+	case CR_EXEC_DEPRECATED:
 		pr_err("The \"exec\" action is deprecated by the Compel library.\n");
 		return -1;
-	}
 
-	if (opts.mode == CR_SHOW_DEPRECATED) {
+	case CR_SHOW_DEPRECATED:
 		pr_err("The \"show\" action is deprecated by the CRIT utility.\n");
 		pr_err("To view an image use the \"crit decode -i $name --pretty\" command.\n");
 		return -1;
-	}
 
-	pr_err("unknown command: %s\n", argv[optind]);
+	case CR_UNSET:
+	default:
+		pr_err("unknown command: %s\n", cmd);
+	}
 usage:
 	pr_msg("\n"
 	       "Usage:\n"

From a79b33d0c5f5a56c58cb1201f2b5dfa9aed159bc Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 23 May 2025 08:33:20 +0100
Subject: [PATCH 1696/1854] cpuinfo: show error when image is missing

The `criu cpuinfo check` command calls cpu_validate_cpuinfo(), which
attempts to open the cpuinfo.img file using `open_image()`. If the
image file is not found, `open_image()` returns an "empty image"
object. As a result, `cpu_validate_cpuinfo()` tries to read from it
and fails with the following error:

(00.002473) Error (criu/protobuf.c:72): Unexpected EOF on (empty-image)

This patch adds a check for an empty image and appropriate error message.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/arch/ppc64/cpu.c | 6 ++++++
 criu/arch/s390/cpu.c  | 6 ++++++
 criu/arch/x86/cpu.c   | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/criu/arch/ppc64/cpu.c b/criu/arch/ppc64/cpu.c
index bb5b7256e..b87230f40 100644
--- a/criu/arch/ppc64/cpu.c
+++ b/criu/arch/ppc64/cpu.c
@@ -64,6 +64,12 @@ int cpu_validate_cpuinfo(void)
 	if (!img)
 		return -1;
 
+	if (empty_image(img)) {
+		pr_err("No cpuinfo image\n");
+		close_image(img);
+		return -1;
+	}
+
 	if (pb_read_one(img, &cpu_info, PB_CPUINFO) < 0)
 		goto error;
 
diff --git a/criu/arch/s390/cpu.c b/criu/arch/s390/cpu.c
index 3f430f455..e227fad5e 100644
--- a/criu/arch/s390/cpu.c
+++ b/criu/arch/s390/cpu.c
@@ -87,6 +87,12 @@ int cpu_validate_cpuinfo(void)
 	if (!img)
 		return -1;
 
+	if (empty_image(img)) {
+		pr_err("No cpuinfo image\n");
+		close_image(img);
+		return -1;
+	}
+
 	ret = 0;
 	if (pb_read_one(img, &cpu_info, PB_CPUINFO) < 0)
 		goto error;
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index dfa31569f..2e1f2de9a 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -407,6 +407,12 @@ int cpu_validate_cpuinfo(void)
 	if (!img)
 		return -1;
 
+	if (empty_image(img)) {
+		pr_err("No cpuinfo image\n");
+		close_image(img);
+		return -1;
+	}
+
 	if (pb_read_one(img, &img_cpu_info, PB_CPUINFO) < 0)
 		goto err;
 

From 922754dffd9efd99b051215c477e0bf6d70562aa Mon Sep 17 00:00:00 2001
From: Ivan Pravdin <ipravdin.official@gmail.com>
Date: Tue, 6 May 2025 22:40:25 -0400
Subject: [PATCH 1697/1854] rpc/log: return first error always

Use shared first error buffer to return correct
first error in rpc.

Fixes: #338

Signed-off-by: Ivan Pravdin <ipravdin.official@gmail.com>
---
 criu/cr-service.c        | 24 +++++++++++++++++++++++-
 criu/log.c               |  4 ++++
 test/others/rpc/errno.py | 22 +++++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index d8c5967bc..a1089ad5c 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -895,6 +895,11 @@ static int check(int sk, CriuOpts *req)
 
 	resp.type = CRIU_REQ_TYPE__CHECK;
 
+	if (log_keep_err()) {
+		pr_perror("Can't tune log");
+		goto out;
+	}
+
 	pid = fork();
 	if (pid < 0) {
 		pr_perror("Can't fork");
@@ -919,6 +924,7 @@ static int check(int sk, CriuOpts *req)
 
 	resp.success = true;
 out:
+	set_resp_err(&resp);
 	return send_criu_msg(sk, &resp);
 }
 
@@ -927,6 +933,11 @@ static int pre_dump_using_req(int sk, CriuOpts *req, bool single)
 	int pid, status;
 	bool success = false;
 
+	if (log_keep_err()) {
+		pr_perror("Can't tune log");
+		goto out;
+	}
+
 	pid = fork();
 	if (pid < 0) {
 		pr_perror("Can't fork");
@@ -1005,6 +1016,11 @@ static int start_page_server_req(int sk, CriuOpts *req, bool daemon_mode)
 	CriuPageServerInfo ps = CRIU_PAGE_SERVER_INFO__INIT;
 	struct ps_info info;
 
+	if (log_keep_err()) {
+		pr_perror("Can't tune log");
+		goto out;
+	}
+
 	if (pipe(start_pipe)) {
 		pr_perror("No start pipe");
 		goto out;
@@ -1078,6 +1094,7 @@ static int start_page_server_req(int sk, CriuOpts *req, bool daemon_mode)
 out:
 	resp.type = CRIU_REQ_TYPE__PAGE_SERVER;
 	resp.success = success;
+	set_resp_err(&resp);
 	return send_criu_msg(sk, &resp);
 }
 
@@ -1252,6 +1269,11 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 	bool success = false;
 	int pid, status;
 
+	if (log_keep_err()) {
+		pr_perror("Can't tune log");
+		goto out;
+	}
+
 	pid = fork();
 	if (pid < 0) {
 		pr_perror("Can't fork");
@@ -1301,7 +1323,7 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 out:
 	resp.type = msg->type;
 	resp.success = success;
-
+	set_resp_err(&resp);
 	return send_criu_msg(sk, &resp);
 }
 
diff --git a/criu/log.c b/criu/log.c
index 70e267fd6..a02a8df20 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -10,6 +10,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
+#include <sys/mman.h>
 
 #include <fcntl.h>
 
@@ -114,6 +115,9 @@ static struct str_and_lock *first_err;
 
 int log_keep_err(void)
 {
+	if (first_err)
+		return 0;
+
 	first_err = shmalloc(sizeof(struct str_and_lock));
 	if (first_err == NULL)
 		return -1;
diff --git a/test/others/rpc/errno.py b/test/others/rpc/errno.py
index 4ea6c9d44..a5a3eb54d 100755
--- a/test/others/rpc/errno.py
+++ b/test/others/rpc/errno.py
@@ -40,7 +40,7 @@ class test:
         resp.ParseFromString(self.s.recv(self._MAX_MSG_SIZE))
         return resp
 
-    def check_resp(self, resp, typ, err):
+    def check_resp(self, resp, typ, err, errmsg = None):
         if resp.type != typ:
             raise Exception('Unexpected response type ' + str(resp.type))
 
@@ -49,6 +49,9 @@ class test:
 
         if err and resp.cr_errno != err:
             raise Exception('Unexpected cr_errno ' + str(resp.cr_errno))
+        
+        if errmsg and errmsg not in resp.cr_errmsg:
+            raise Exception('Unexpected cr_msg \'' + str(resp.cr_errmsg) + '\'')
 
     def no_process(self):
         print('Try to dump unexisting process')
@@ -131,12 +134,29 @@ class test:
         self.check_resp(resp, rpc.EMPTY, None)
 
         print('Success')
+        
+    def child_first_err(self):
+        print('Receive correct first error message')
+
+        req = self.get_base_req()
+        req.type = rpc.CHECK
+        
+        # mntns_compat_mode options is only allowed on restore
+        req.opts.mntns_compat_mode = True
+
+        self.send_req(req)
+        resp = self.recv_resp()
+
+        self.check_resp(resp, rpc.CHECK, None, "Option --mntns-compat-mode is only valid on restore\n")
+
+        print('Success')
 
     def run(self):
         self.no_process()
         self.process_exists()
         self.bad_options()
         self.bad_request()
+        self.child_first_err()
 
 
 t = test()

From 4c7d42f67a0da8fbd60b811c58f2d18950d88d1a Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sun, 8 Jun 2025 13:24:11 +0800
Subject: [PATCH 1698/1854] ipc/sysctl: fix CTL_FLAGS_IPC_EACCES_SKIP by making
 it a flag

Having CTL_FLAGS_IPC_EACCES_SKIP == (CTL_FLAGS_OPTIONAL |
CTL_FLAGS_READ_EIO_SKIP) is probably not what we want. So let's make it
a real distinct flag.

Fixes: 840735aa0 ("ipc_sysctl: Prioritize restoring IPC variables using non usernsd approach")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/include/sysctl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/include/sysctl.h b/criu/include/sysctl.h
index cb3eba817..2d689a9a0 100644
--- a/criu/include/sysctl.h
+++ b/criu/include/sysctl.h
@@ -37,6 +37,6 @@ enum {
 #define CTL_FLAGS_OPTIONAL	  1
 #define CTL_FLAGS_HAS		  2
 #define CTL_FLAGS_READ_EIO_SKIP	  4
-#define CTL_FLAGS_IPC_EACCES_SKIP 5
+#define CTL_FLAGS_IPC_EACCES_SKIP 8
 
 #endif /* __CR_SYSCTL_H__ */

From 4f057a6aeb6ced50ec412e425cd214975ceea42b Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sun, 8 Jun 2025 13:34:19 +0800
Subject: [PATCH 1699/1854] net/sysctl: fix missprint in an error message

Fixes: f38e58836 ("net/sysctl: c/r ipv4/ping_group_range value")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index 300df480b..e5d2f1c4d 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2147,7 +2147,7 @@ static int ipv4_sysctls_op(SysctlEntry ***rsysctl, size_t *pn, int op)
 	size_t n = *pn;
 
 	if (n != ARRAY_SIZE(ipv4_sysctl_entries)) {
-		pr_err("unix: Unexpected entries in sysctlig (%zu %zu)\n", n, ARRAY_SIZE(ipv4_sysctl_entries));
+		pr_err("unix: Unexpected entries in sysctl (%zu %zu)\n", n, ARRAY_SIZE(ipv4_sysctl_entries));
 		return -EINVAL;
 	}
 

From 45d09ae17e9524250e31750abdc34e9a34710e94 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Tue, 10 Jun 2025 11:33:59 +0800
Subject: [PATCH 1700/1854] net/sysctl: fix broken ipv4_sysctls_op

We have ability to skip sysctl if there is no value, but we still give
n requests to sysctl_op, that is not correct and probably can segfault
on nullptr access. Fix it by adding ri to count non skipped requests.

To be on the safe side, let's add a check that ri == n on read, as we
should not do any skips there.

While on it lets fix bad error message prefix: s/unix/ipv4/.

Remove excess has_iarg set, and add sarg reset to NULL for the case
sysctl_op skipped it.

Signed-off-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/criu/net.c b/criu/net.c
index e5d2f1c4d..2c018ef7b 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2144,51 +2144,53 @@ static int ipv4_sysctls_op(SysctlEntry ***rsysctl, size_t *pn, int op)
 	char path[ARRAY_SIZE(ipv4_sysctl_entries)][MAX_IPV4_SYSCTL_PATH] = {};
 	struct sysctl_req req[ARRAY_SIZE(ipv4_sysctl_entries)] = {};
 	SysctlEntry **sysctl = *rsysctl;
-	size_t n = *pn;
+	size_t n = *pn, ri;
 
 	if (n != ARRAY_SIZE(ipv4_sysctl_entries)) {
-		pr_err("unix: Unexpected entries in sysctl (%zu %zu)\n", n, ARRAY_SIZE(ipv4_sysctl_entries));
+		pr_err("ipv4: Unexpected entries in sysctl (%zu %zu)\n", n, ARRAY_SIZE(ipv4_sysctl_entries));
 		return -EINVAL;
 	}
 
 	if (opts.weak_sysctls || op == CTL_READ)
 		flags = CTL_FLAGS_OPTIONAL;
 
-	for (i = 0; i < n; i++) {
-		snprintf(path[i], MAX_IPV4_SYSCTL_PATH, IPV4_SYSCTL_FMT, ipv4_sysctl_entries[i]);
-		req[i].name = path[i];
-		req[i].flags = flags;
+	for (i = 0, ri = 0; i < n; i++) {
+		snprintf(path[ri], MAX_IPV4_SYSCTL_PATH, IPV4_SYSCTL_FMT, ipv4_sysctl_entries[i]);
+		req[ri].name = path[ri];
+		req[ri].flags = flags;
 
 		switch (sysctl[i]->type) {
 		case SYSCTL_TYPE__CTL_STR:
-			req[i].type = CTL_STR(MAX_STR_IPV4_SYSCTL_LEN);
+			req[ri].type = CTL_STR(MAX_STR_IPV4_SYSCTL_LEN);
 
 			/* skip write if have no value */
 			if (op == CTL_WRITE && !sysctl[i]->sarg)
 				continue;
 
-			req[i].arg = sysctl[i]->sarg;
+			req[ri].arg = sysctl[i]->sarg;
 			break;
 		default:
 			pr_err("ipv4: Unknown sysctl type %d\n", sysctl[i]->type);
 			return -1;
 		}
+		ri++;
 	}
 
-	ret = sysctl_op(req, n, op, CLONE_NEWNET);
+	ret = sysctl_op(req, ri, op, CLONE_NEWNET);
 	if (ret < 0) {
-		pr_err("unix: Failed to %s %s/<sysctls>\n", (op == CTL_READ) ? "read" : "write", IPV4_SYSCTL_BASE);
+		pr_err("ipv4: Failed to %s %s/<sysctls>\n", (op == CTL_READ) ? "read" : "write", IPV4_SYSCTL_BASE);
 		return -1;
 	}
 
 	if (op == CTL_READ) {
 		bool has_entries = false;
 
+		BUG_ON(ri != n);
 		for (i = 0; i < n; i++) {
 			if (req[i].flags & CTL_FLAGS_HAS) {
-				sysctl[i]->has_iarg = true;
-				if (!has_entries)
-					has_entries = true;
+				has_entries = true;
+			} else {
+				sysctl[i]->sarg = NULL;
 			}
 		}
 

From 87bd09a0d18b1388dde831ee2ff6bef7bc9f0845 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Sun, 8 Jun 2025 14:07:13 +0800
Subject: [PATCH 1701/1854] net/sysctl: make ipv4/ping_group_range work in user
 namespaces

We dump sysctls from criu user namespace, but restore from restored user
namespace. So group id values should be mapped to the restored user
namespace gid space to restore correctly.

Signed-off-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/net.c                             | 44 ++++++++++++++++++++++++++
 test/zdtm/static/netns_sub_sysctl.desc |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/criu/net.c b/criu/net.c
index 2c018ef7b..e5775a328 100644
--- a/criu/net.c
+++ b/criu/net.c
@@ -2203,6 +2203,42 @@ static int ipv4_sysctls_op(SysctlEntry ***rsysctl, size_t *pn, int op)
 	return 0;
 }
 
+static int ipv4_sysctls_ping_group_range_map_gid(SysctlEntry *ent, size_t size)
+{
+	int start, end, ustart, uend, ret;
+
+	if (sscanf(ent->sarg, "%d %d", &start, &end) != 2) {
+		pr_err("Failed to parse ping_group_range: %s\n", ent->sarg);
+		return -1;
+	}
+
+	/*
+	 * The default is "1 0", which means no group
+	 * is allowed to create ICMP Echo sockets.
+	 */
+	if (start == 1 && end == 0) {
+		pr_debug("The ping_group_range is set to default, skipping it.\n");
+		ent->sarg = NULL;
+		return 0;
+	}
+
+	if (!(root_ns_mask & CLONE_NEWUSER))
+		return 0;
+
+	ustart = userns_gid(start);
+	uend = userns_gid(end);
+	pr_debug("Mapping ping_group_range %d %d to userns -> %d %d\n",
+		 start, end, ustart, uend);
+
+	ret = snprintf(ent->sarg, size, "%d\t%d\n", ustart, uend);
+	if (ret < 0 || ret >= size) {
+		pr_err("Failed to map ping_group_range: %d\t%d\n", ustart, uend);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 {
 	void *buf, *o_buf;
@@ -2220,6 +2256,7 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	SysctlEntry *ipv4_sysctls = NULL;
 	size_t ipv4_sysctl_size = ARRAY_SIZE(ipv4_sysctl_entries);
 	char ping_group_range[MAX_STR_IPV4_SYSCTL_LEN + 1] = {};
+	int ping_group_range_id = -1;
 	NetnsId *ids;
 	struct netns_id *p;
 
@@ -2310,6 +2347,7 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 		if (!strcmp(ipv4_sysctl_entries[i], "ping_group_range")) {
 			netns.ipv4_sysctl[i]->type = SYSCTL_TYPE__CTL_STR;
 			netns.ipv4_sysctl[i]->sarg = ping_group_range;
+			ping_group_range_id = i;
 		} else {
 			/* Need to handle this case when we have more sysctls */
 			BUG();
@@ -2338,6 +2376,12 @@ static int dump_netns_conf(struct ns_id *ns, struct cr_imgset *fds)
 	if (ret < 0)
 		goto err_free;
 
+	BUG_ON(ping_group_range_id == -1);
+	ret = ipv4_sysctls_ping_group_range_map_gid(netns.ipv4_sysctl[ping_group_range_id],
+						    MAX_STR_IPV4_SYSCTL_LEN + 1);
+	if (ret < 0)
+		goto err_free;
+
 	ret = pb_write_one(img_from_set(fds, CR_FD_NETNS), &netns, PB_NETNS);
 err_free:
 	xfree(o_buf);
diff --git a/test/zdtm/static/netns_sub_sysctl.desc b/test/zdtm/static/netns_sub_sysctl.desc
index 535842668..0c357aefe 100644
--- a/test/zdtm/static/netns_sub_sysctl.desc
+++ b/test/zdtm/static/netns_sub_sysctl.desc
@@ -1,4 +1,4 @@
 {
-    'flavor': 'ns',
+    'flavor': 'ns uns',
     'flags': 'suid'
 }

From 677a56891917b873dc30278be0063730d901717d Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 9 Jun 2025 21:17:57 -0700
Subject: [PATCH 1702/1854] zdtm/netns_sub_sysctl: skip unsupported sysctls

net/unix/max_dgram_qlen can't be tuned from non-root userns before:
v5.17-rc1~170^2~215 ("net: Enable max_dgram_qlen unix sysctl to be
configurable by non-init user namespaces")

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/static/netns_sub_sysctl.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/zdtm/static/netns_sub_sysctl.c b/test/zdtm/static/netns_sub_sysctl.c
index 0f94c40a7..03b478b7d 100644
--- a/test/zdtm/static/netns_sub_sysctl.c
+++ b/test/zdtm/static/netns_sub_sysctl.c
@@ -1,4 +1,6 @@
 #include <sched.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "zdtmtst.h"
 #include "sysctl.h"
@@ -20,6 +22,7 @@ typedef struct {
 	int new;
 	char s_old[MAX_STR_SYSCTL_LEN];
 	char s_new[MAX_STR_SYSCTL_LEN];
+	bool set;
 } sysctl_opt_t;
 
 #define CONF_UNIX_BASE "/proc/sys/net/unix"
@@ -38,6 +41,11 @@ int main(int argc, char **argv)
 	test_init(argc, argv);
 
 	for (p = net_unix_params; p->path != NULL; p++) {
+		if (access(p->path, W_OK) != 0) {
+			test_msg("%s doesn't exist\n", p->path);
+			continue;
+		}
+		p->set = true;
 		if (p->type == SYSCTL_INT) {
 			p->old = (((unsigned)lrand48()) % 1023) + 1;
 			if (sysctl_write_int(p->path, p->old)) {
@@ -56,6 +64,8 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	for (p = net_unix_params; p->path != NULL; p++) {
+		if (!p->set)
+			continue;
 		if (p->type == SYSCTL_INT) {
 			if (sysctl_read_int(p->path, &p->new))
 				ret = 1;

From a80c54484559a8bf7670f246db897b2710bb8688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=AE=E0=A5=80=E0=A4=B0=20=E0=A4=B8=E0=A4=BF?=
 =?UTF-8?q?=E0=A4=82=E0=A4=B9=20Sameer=20Singh?= <lumarzeli30@gmail.com>
Date: Fri, 27 Dec 2024 03:47:35 +0530
Subject: [PATCH 1703/1854] sk-inet: Add support for checkpoint/restore of ICMP
 sockets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently there is no option to checkpoint/restore programs that use
ICMP sockets, such as `ping`. This patch adds support for the same.

Fixes #2557

Signed-off-by: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
---
 criu/sk-inet.c |  7 +++++--
 criu/sockets.c | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 1238b03dc..6e0acf2ce 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -130,6 +130,8 @@ static int can_dump_ipproto(unsigned int ino, int proto, int type)
 	case IPPROTO_TCP:
 	case IPPROTO_UDP:
 	case IPPROTO_UDPLITE:
+	case IPPROTO_ICMP:
+	case IPPROTO_ICMPV6:
 		break;
 	default:
 		pr_err("Unsupported proto %d for socket %x\n", proto, ino);
@@ -922,8 +924,9 @@ static int open_inet_sk(struct file_desc *d, int *new_fd)
 	}
 
 	if (ie->src_port) {
-		if (inet_bind(sk, ii))
-			goto err;
+		if (ie->proto != IPPROTO_ICMP && ie->proto != IPPROTO_ICMPV6)
+			if (inet_bind(sk, ii))
+				goto err;
 	}
 
 	/*
diff --git a/criu/sockets.c b/criu/sockets.c
index f9ce999be..0affccad0 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -65,7 +65,7 @@ const char *socket_proto_name(unsigned int proto, char *nm, size_t size)
 		[IPPROTO_IPV6] = __stringify_1(IPPROTO_IPV6), [IPPROTO_RSVP] = __stringify_1(IPPROTO_RSVP),
 		[IPPROTO_GRE] = __stringify_1(IPPROTO_GRE),   [IPPROTO_ESP] = __stringify_1(IPPROTO_ESP),
 		[IPPROTO_AH] = __stringify_1(IPPROTO_AH),     [IPPROTO_UDPLITE] = __stringify_1(IPPROTO_UDPLITE),
-		[IPPROTO_RAW] = __stringify_1(IPPROTO_RAW),
+		[IPPROTO_RAW] = __stringify_1(IPPROTO_RAW),   [IPPROTO_ICMPV6] = __stringify_1(IPPROTO_ICMPV6),
 	};
 	return __socket_const_name(nm, size, protos, ARRAY_SIZE(protos), proto);
 }
@@ -131,10 +131,12 @@ enum socket_cl_bits {
 	INET_UDP_CL_BIT,
 	INET_UDPLITE_CL_BIT,
 	INET_RAW_CL_BIT,
+	INET_ICMP_CL_BIT,
 	INET6_TCP_CL_BIT,
 	INET6_UDP_CL_BIT,
 	INET6_UDPLITE_CL_BIT,
 	INET6_RAW_CL_BIT,
+	INET6_ICMP_CL_BIT,
 	UNIX_CL_BIT,
 	PACKET_CL_BIT,
 	_MAX_CL_BIT,
@@ -161,6 +163,8 @@ static inline enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsign
 			return INET_UDPLITE_CL_BIT;
 		if (proto == IPPROTO_RAW)
 			return INET_RAW_CL_BIT;
+		if (proto == IPPROTO_ICMP)
+			return INET_ICMP_CL_BIT;
 	}
 	if (family == AF_INET6) {
 		if (proto == IPPROTO_TCP)
@@ -171,6 +175,8 @@ static inline enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsign
 			return INET6_UDPLITE_CL_BIT;
 		if (proto == IPPROTO_RAW)
 			return INET6_RAW_CL_BIT;
+		if (proto == IPPROTO_ICMPV6)
+			return INET6_ICMP_CL_BIT;
 	}
 
 	pr_err("Unknown pair family %d proto %d\n", family, proto);
@@ -282,6 +288,12 @@ void preload_socket_modules(void)
 	req.r.i.sdiag_protocol = IPPROTO_RAW;
 	probe_diag(nl, &req, -ENOENT);
 
+	req.r.i.sdiag_protocol = IPPROTO_ICMP;
+	probe_diag(nl, &req, -ENOENT);
+
+	req.r.i.sdiag_protocol = IPPROTO_ICMPV6;
+	probe_diag(nl, &req, -ENOENT);
+
 	close(nl);
 	pr_info("Done probing\n");
 }
@@ -773,6 +785,10 @@ static int inet_receive_one(struct nlmsghdr *h, struct ns_id *ns, void *arg)
 	case IPPROTO_RAW:
 		type = SOCK_RAW;
 		break;
+	case IPPROTO_ICMP:
+	case IPPROTO_ICMPV6:
+		type = SOCK_DGRAM;
+		break;
 	default:
 		BUG_ON(1);
 		return -1;
@@ -797,7 +813,7 @@ static int collect_err(int err, struct ns_id *ns, void *arg)
 	char family[32], proto[32];
 	char msg[256];
 
-	snprintf(msg, sizeof(msg), "Sockects collect procedure family %s proto %s",
+	snprintf(msg, sizeof(msg), "Sockets collect procedure family %s proto %s",
 		 socket_family_name(gr->family, family, sizeof(family)),
 		 socket_proto_name(gr->protocol, proto, sizeof(proto)));
 
@@ -905,6 +921,13 @@ int collect_sockets(struct ns_id *ns)
 	if (tmp)
 		err = tmp;
 
+	/* Collect IPv4 ICMP sockets */
+	req.r.i.sdiag_family = AF_INET;
+	req.r.i.sdiag_protocol = IPPROTO_ICMP;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
+	set_collect_bit(req.r.n.sdiag_family, req.r.n.sdiag_protocol);
+
 	/* Collect IPv6 TCP sockets */
 	req.r.i.sdiag_family = AF_INET6;
 	req.r.i.sdiag_protocol = IPPROTO_TCP;
@@ -944,6 +967,13 @@ int collect_sockets(struct ns_id *ns)
 	if (tmp)
 		err = tmp;
 
+	/* Collect IPv6 ICMP sockets */
+	req.r.i.sdiag_family = AF_INET6;
+	req.r.i.sdiag_protocol = IPPROTO_ICMPV6;
+	req.r.i.idiag_ext = 0;
+	req.r.i.idiag_states = -1; /* All */
+	set_collect_bit(req.r.n.sdiag_family, req.r.n.sdiag_protocol);
+
 	req.r.p.sdiag_family = AF_PACKET;
 	req.r.p.sdiag_protocol = 0;
 	req.r.p.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MCLIST | PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG;

From 3dc865bc80a4dfa5378bed9fe0434433d65379e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=B8=E0=A4=AE=E0=A5=80=E0=A4=B0=20=E0=A4=B8=E0=A4=BF?=
 =?UTF-8?q?=E0=A4=82=E0=A4=B9=20Sameer=20Singh?= <lumarzeli30@gmail.com>
Date: Sat, 28 Dec 2024 09:35:11 +0530
Subject: [PATCH 1704/1854] test: add static tests for ICMP socket
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add ZDTM static tests for IP4/ICMP and IP6/ICMP
socket feature.

Signed-off-by: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/static/Makefile       |   3 +
 test/zdtm/static/socket6_icmp.c |   1 +
 test/zdtm/static/socket_icmp.c  | 128 ++++++++++++++++++++++++++++++++
 3 files changed, 132 insertions(+)
 create mode 120000 test/zdtm/static/socket6_icmp.c
 create mode 100644 test/zdtm/static/socket_icmp.c

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 34fc90513..d427659e0 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -37,6 +37,8 @@ TST_NOFILE	:=				\
 		socket_udp-corked		\
 		socket6_udp			\
 		socket_udp_shutdown		\
+		socket_icmp			\
+		socket6_icmp			\
 		sk-freebind			\
 		sk-freebind-false		\
 		socket_udplite			\
@@ -630,6 +632,7 @@ socket-tcp6-closed:	CFLAGS += -D ZDTM_IPV6
 socket-tcp6-closed:	CFLAGS += -D ZDTM_IPV4V6
 socket-tcp-closed-last-ack:	CFLAGS += -D ZDTM_TCP_LAST_ACK
 socket-tcp-skip-in-flight:	CFLAGS += -D ZDTM_IPV4V6
+socket6-icmp:		CFLAGS += -DZDTM_IPV6
 sock_ip_opts01:		CFLAGS += -DZDTM_VAL_ZERO
 sock_tcp_opts01:	CFLAGS += -DZDTM_VAL_ZERO
 tun_ns:			CFLAGS += -DTUN_NS
diff --git a/test/zdtm/static/socket6_icmp.c b/test/zdtm/static/socket6_icmp.c
new file mode 120000
index 000000000..24d8fd806
--- /dev/null
+++ b/test/zdtm/static/socket6_icmp.c
@@ -0,0 +1 @@
+socket_icmp.c
\ No newline at end of file
diff --git a/test/zdtm/static/socket_icmp.c b/test/zdtm/static/socket_icmp.c
new file mode 100644
index 000000000..f72e348bf
--- /dev/null
+++ b/test/zdtm/static/socket_icmp.c
@@ -0,0 +1,128 @@
+#include "zdtmtst.h"
+
+const char *test_doc = "static test for ICMP socket\n";
+const char *test_author = "समीर सिंह Sameer Singh <lumarzeli30@gmail.com>\n";
+
+/* Description:
+ * Send a ping to localhost using ICMP socket
+ */
+
+#include <string.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#if defined(ZDTM_IPV6)
+#include <netinet/icmp6.h>
+#else
+#include <netinet/ip_icmp.h>
+#endif
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <netdb.h>
+
+#include "sysctl.h"
+
+#define PACKET_SIZE  64
+#define RECV_TIMEOUT 1
+
+static int echo_id = 1234;
+
+#if defined(ZDTM_IPV6)
+#define TEST_ICMP_ECHOREPLY ICMP6_ECHOREPLY
+#else
+#define TEST_ICMP_ECHOREPLY ICMP_ECHOREPLY
+#endif
+int main(int argc, char **argv)
+{
+	int ret, sock, seq = 0;
+	char packet[PACKET_SIZE], recv_packet[PACKET_SIZE];
+
+	struct timeval tv;
+#if defined(ZDTM_IPV6)
+	struct sockaddr_in6 addr, recv_addr;
+#else
+	struct icmphdr icmp_header, *icmp_reply;
+#endif
+	struct sockaddr_in addr, recv_addr;
+	socklen_t addr_len;
+
+	// Allow GIDs 0-58468 to open an unprivileged ICMP socket
+	if (sysctl_write_str("/proc/sys/net/ipv4/ping_group_range", "0 58468"))
+		return -1;
+
+	test_init(argc, argv);
+
+#if defined(ZDTM_IPV6)
+	sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_ICMPV6);
+#else
+	sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP);
+#endif
+	if (sock < 0) {
+		pr_perror("Can't create socket");
+		return 1;
+	}
+
+	tv.tv_sec = RECV_TIMEOUT;
+	tv.tv_usec = 0;
+	if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
+		pr_perror("Can't set socket option");
+		return 1;
+	}
+
+	memset(&addr, 0, sizeof(addr));
+	memset(&icmp_header, 0, sizeof(icmp_header));
+#if defined(ZDTM_IPV6)
+	addr.sin6_family = AF_INET6;
+	inet_pton(AF_INET6, "::1", &addr.sin6_addr);
+
+	icmp_header.icmp6_type = ICMP6_ECHO_REQUEST;
+	icmp_header.icmp6_code = 0;
+	icmp_header.icmp6_id = echo_id;
+	icmp_header.icmp6_seq = seq;
+#else
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+	icmp_header.type = ICMP_ECHO;
+	icmp_header.code = 0;
+	icmp_header.un.echo.id = echo_id;
+	icmp_header.un.echo.sequence = seq;
+#endif
+
+	memcpy(packet, &icmp_header, sizeof(icmp_header));
+	memset(packet + sizeof(icmp_header), 0xa5,
+	       PACKET_SIZE - sizeof(icmp_header));
+
+	test_daemon();
+	test_waitsig();
+
+	ret = sendto(sock, packet, PACKET_SIZE, 0,
+		     (struct sockaddr *)&addr, sizeof(addr));
+
+	if (ret < 0) {
+		fail("Can't send");
+		return 1;
+	}
+
+	addr_len = sizeof(recv_addr);
+
+	ret = recvfrom(sock, recv_packet, sizeof(recv_packet), 0,
+		       (struct sockaddr *)&recv_addr, &addr_len);
+
+	if (ret < 0) {
+		fail("Can't recv");
+		return 1;
+	}
+
+	icmp_reply = (struct icmphdr *)recv_packet;
+
+	if (icmp_reply->type != ICMP_ECHOREPLY) {
+		fail("Got no ICMP_ECHO_REPLY");
+		return 1;
+	}
+
+	close(sock);
+
+	pass();
+	return 0;
+}

From e31828ed8ce4fc7cbac4d412f7e33911f3a63b17 Mon Sep 17 00:00:00 2001
From: Chuan Qiu <qiuc12@gmail.com>
Date: Thu, 12 Jun 2025 22:49:26 -0700
Subject: [PATCH 1705/1854] mount: Fix trailing / when a file is bind-mounted

E.g. I have a /etc/hosts in workspace mounted from the host, and get the following message.

(00.141008)      1: mnt-v2: Create plain mountpoint /tmp/.criu.mntns.K1biY1/mnt-0000000938 for 938
(00.141546)      1: mnt-v2:     Mounting unsupported @938 (0)
(00.141887)      1: mnt-v2:     Bind /tmp/agent/1-d8c746c6fda3a8b2/workspace/etc/hosts/ to /tmp/.criu.mntns.K1biY1/mnt-0000000938
(00.142179)      1: Error (criu/mount-v2.c:319): mnt-v2: Failed to open_tree /tmp/agent/1-d8c746c6fda3a8b2/workspace/etc/hosts/: Not a directory
(00.143774) Error (criu/cr-restore.c:2320): Restoring FAILED.

Signed-off-by: Chuan Qiu <qiuc12@gmail.com>
---
 criu/mount.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/criu/mount.c b/criu/mount.c
index 06b959542..b643a7f26 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -888,7 +888,11 @@ static int resolve_external_mounts(struct mount_info *info)
 
 		cut_root = cut_root_for_bind(m->root, match->root);
 
-		p = xsprintf("%s/%s", match->ns_mountpoint + 1, cut_root);
+		if (cut_root[0] == '\0') {
+			p = xstrdup(match->ns_mountpoint + 1);
+		} else {
+			p = xsprintf("%s/%s", match->ns_mountpoint + 1, cut_root);
+		}
 		if (!p)
 			return -1;
 

From 455c67739914a6d504733605e6d70538204aa3cf Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 20 Jun 2025 13:44:32 +0800
Subject: [PATCH 1706/1854] zdtm: Add ztatic/mnt_ext_file_bind_auto test

The test creates a file bindmount in criu mntns and binds it into test
mntns, this external file bindmount is autodetected and restored via
"--external mnt[]" criu option.

Note: In previous patch we fix the problem on this code path where file
bindmount restore fails as there is excess "/" in source path.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 test/zdtm/static/Makefile                    |   1 +
 test/zdtm/static/mnt_ext_file_bind_auto.c    | 104 +++++++++++++++++++
 test/zdtm/static/mnt_ext_file_bind_auto.desc |   4 +
 3 files changed, 109 insertions(+)
 create mode 100644 test/zdtm/static/mnt_ext_file_bind_auto.c
 create mode 100644 test/zdtm/static/mnt_ext_file_bind_auto.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index d427659e0..ab69f389e 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -381,6 +381,7 @@ TST_FILE	=				\
 		sk-unix-listen02		\
 		sk-unix-listen03		\
 		sk-unix-listen04		\
+		mnt_ext_file_bind_auto		\
 
 TST_DIR		=				\
 		cwd00				\
diff --git a/test/zdtm/static/mnt_ext_file_bind_auto.c b/test/zdtm/static/mnt_ext_file_bind_auto.c
new file mode 100644
index 000000000..0c3b9f5fb
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_file_bind_auto.c
@@ -0,0 +1,104 @@
+#include <sys/mount.h>
+#include <linux/limits.h>
+#include <sys/stat.h>
+#include <sched.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Check if external file mount works";
+const char *test_author = "Pavel Tikhomirov <ptikhomirov@virtuozzo.com>";
+
+char *filename = "mnt_ext_file_bind_auto_bind_auto.file";
+TEST_OPTION(filename, string, "file name", 1);
+
+char *source = "mnt_ext_file_bind_auto_bind_auto.source";
+
+int create_file(const char *path)
+{
+	int fd;
+
+	fd = open(path, O_CREAT | O_RDWR, 0644);
+	if (fd < 0) {
+		pr_perror("open");
+		return -1;
+	}
+
+	close(fd);
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	char *zdtm_newns = getenv("ZDTM_NEWNS");
+	char *tmp = "/tmp/zdtm_ext_file_bind_auto.tmp";
+	char *sourcefile = "/tmp/zdtm_ext_file_bind_auto.file";
+	char *root, tmpfile[PATH_MAX], testfile[PATH_MAX];
+
+	root = getenv("ZDTM_ROOT");
+	if (root == NULL) {
+		pr_perror("root");
+		return 1;
+	}
+
+	if (!zdtm_newns) {
+		pr_perror("ZDTM_NEWNS is not set");
+		return 1;
+	} else if (strcmp(zdtm_newns, "1")) {
+		goto test;
+	}
+
+	/* Prepare file bindmount in criu root (source for external file bindmount) */
+        mkdir(tmp, 0755);
+        if (mount(source, tmp, "tmpfs", 0, NULL)) {
+                pr_perror("mount tmpfs");
+                return 1;
+        }
+        if (mount(NULL, tmp, NULL, MS_PRIVATE, NULL)) {
+                pr_perror("make private");
+                return 1;
+        }
+
+	sprintf(tmpfile, "%s/%s", tmp, filename);
+	if (create_file(tmpfile))
+		return 1;
+
+	if (create_file(sourcefile))
+		return 1;
+
+	if (mount(tmpfile, sourcefile, NULL, MS_BIND, NULL)) {
+		pr_perror("bind");
+		return 1;
+	}
+
+	umount2(tmp, MNT_DETACH);
+
+	/* Prepare file in test root (mount point for external file bindmount) */
+	sprintf(testfile, "%s/%s", root, filename);
+	if (create_file(testfile))
+		return 1;
+
+	/*
+	 * Create temporary mntns, next mounts will not show up in criu mntns
+	 * and will be inherited into test mntns
+	 */
+	if (unshare(CLONE_NEWNS)) {
+		pr_perror("unshare");
+		return 1;
+	}
+
+	if (mount(sourcefile, testfile, NULL, MS_BIND, NULL)) {
+                pr_perror("bind");
+                return 1;
+        }
+test:
+	test_init(argc, argv);
+
+	test_daemon();
+	test_waitsig();
+
+	pass();
+	return 0;
+}
diff --git a/test/zdtm/static/mnt_ext_file_bind_auto.desc b/test/zdtm/static/mnt_ext_file_bind_auto.desc
new file mode 100644
index 000000000..825b08127
--- /dev/null
+++ b/test/zdtm/static/mnt_ext_file_bind_auto.desc
@@ -0,0 +1,4 @@
+{   'opts': '--external mnt[]',
+    'feature': 'mnt_id',
+    'flavor': 'ns uns',
+    'flags': 'suid'}

From 7fbf7b2be4afd5768599cf104b8e05e52c671479 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 11 Jul 2025 22:16:49 +0100
Subject: [PATCH 1707/1854] images: remove symlink for descriptor.proto

Currently the build scripts create the following symlink:

  criu-4.1/images/google/protobuf/descriptor.proto -> /usr/include/google/protobuf/descriptor.proto

This symlink points to a system-wide absolute-path target. Also,
this symlink ends up in the release tarball. The tarball may later be
downloaded and unpacked by e.g. OS distributions. If unpacking is
done using Python 3.14+, it will fail.

This happens because Python 3.14 will switch the default behavior of
extractall() from "fully trusting the content of archive" to
"disallow common attack vectors while extracting the archive".
With this new behavior, extractall() raises an exception when at
least one file in the archive extracts or points to outside of the
extraction directory (these are called path traversal attacks and
zip slip attacks).

Reported-by: Dmitrii Kuvaiskii <dimakuv@amazon.de>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                             |  7 -------
 .lgtm.yml                               |  5 -----
 images/Makefile                         | 17 ++++++++++++++++-
 images/google/protobuf/descriptor.proto |  1 -
 4 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 120000 images/google/protobuf/descriptor.proto

diff --git a/.cirrus.yml b/.cirrus.yml
index a4b53a54b..bddd5a3f1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -15,7 +15,6 @@ task:
   setup_script: |
     scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
   build_script: |
     make -C scripts/ci vagrant-fedora-no-vdso
 
@@ -33,7 +32,6 @@ task:
     memory: 8G
 
   setup_script: |
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
     dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata xmlto libdrm-devel libuuid-devel
@@ -67,7 +65,6 @@ task:
   setup_script: |
     scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
   build_script: |
     make -C scripts/ci vagrant-fedora-rawhide
 
@@ -88,7 +85,6 @@ task:
   setup_script: |
     scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
   build_script: |
     make -C scripts/ci vagrant-fedora-non-root
 
@@ -101,7 +97,6 @@ task:
   script: uname -a
   build_script: |
     scripts/ci/apt-install make
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     make -C scripts/ci local
 
 task:
@@ -113,7 +108,6 @@ task:
   script: uname -a
   build_script: |
     scripts/ci/apt-install make
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     make -C scripts/ci local CLANG=1
 
 task:
@@ -125,6 +119,5 @@ task:
   script: uname -a
   build_script: |
     scripts/ci/prepare-for-fedora-rawhide.sh
-    ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto
     make -C scripts/ci/ local CC=gcc SKIP_CI_PREP=1 SKIP_CI_TEST=1 CD_TO_TOP=1
     make -C test/zdtm -j 4
diff --git a/.lgtm.yml b/.lgtm.yml
index 0dd49cda4..4beadcc63 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -23,8 +23,3 @@ extraction:
       - "python3-yaml"
       - "libnl-route-3-dev"
       - "gnutls-dev"
-    configure:
-      command:
-      - "ls -laR images/google"
-      - "ln -s /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto"
-      - "ls -laR images/google"
diff --git a/images/Makefile b/images/Makefile
index d966fbfca..e94346eee 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -58,7 +58,6 @@ proto-obj-y	+= ext-file.o
 proto-obj-y	+= cgroup.o
 proto-obj-y	+= userns.o
 proto-obj-y	+= pidns.o
-proto-obj-y	+= google/protobuf/descriptor.o # To make protoc happy and compile opts.proto
 proto-obj-y	+= opts.o
 proto-obj-y	+= seccomp.o
 proto-obj-y	+= binfmt-misc.o
@@ -91,6 +90,22 @@ endef
 
 makefile-deps := Makefile $(obj)/Makefile
 
+#
+# Generate descriptor.pb-c.c and descriptor.pb-c.h to compile opts.proto.
+PROTOBUF_DIR := images/google
+DESCRIPTOR_DIR := $(PROTOBUF_DIR)/protobuf
+GOOGLE_INCLUDE=$(shell pkg-config protobuf --variable=includedir)/google/protobuf
+$(DESCRIPTOR_DIR)/descriptor.pb-c.c: $(GOOGLE_INCLUDE)/descriptor.proto
+	$$(Q) echo "Generating descriptor.pb-c.c"
+	$$(Q) protoc --proto_path=/usr/include --proto_path=$(obj)/ --c_out=$(obj)/ $<
+
+cleanup-y += $(DESCRIPTOR_DIR)/descriptor.pb-c.d
+
+submrproper:
+	$$(Q) rm -rf $(PROTOBUF_DIR)
+.PHONY: submrproper
+mrproper: submrproper
+
 #
 # Generates rules needed to compile protobuf files.
 define gen-proto-rules
diff --git a/images/google/protobuf/descriptor.proto b/images/google/protobuf/descriptor.proto
deleted file mode 120000
index 07a4c9add..000000000
--- a/images/google/protobuf/descriptor.proto
+++ /dev/null
@@ -1 +0,0 @@
-/usr/include/google/protobuf/descriptor.proto
\ No newline at end of file

From 21c3b9c005d64db9bb6f998951384919f28d957f Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 22 Jul 2025 20:14:45 -0700
Subject: [PATCH 1708/1854] images/Makefile: fix using $(Q)

Commit 68f92b551 used `$$(Q)` instead of `$(Q)` in the Makefile target,
which resulted in the following error:

$(Q) echo "Generating descriptor.pb-c.c"
/bin/sh: 1: Q: not found
Generating descriptor.pb-c.c
$(Q) protoc --proto_path=/usr/include --proto_path=images/ --c_out=images/ /usr/include/google/protobuf/descriptor.proto
/bin/sh: 1: Q: not found

as well as:

$(Q) rm -rf images/google
/bin/sh: line 1: Q: command not found

Fix it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 images/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/Makefile b/images/Makefile
index e94346eee..cb30a5126 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -96,13 +96,13 @@ PROTOBUF_DIR := images/google
 DESCRIPTOR_DIR := $(PROTOBUF_DIR)/protobuf
 GOOGLE_INCLUDE=$(shell pkg-config protobuf --variable=includedir)/google/protobuf
 $(DESCRIPTOR_DIR)/descriptor.pb-c.c: $(GOOGLE_INCLUDE)/descriptor.proto
-	$$(Q) echo "Generating descriptor.pb-c.c"
-	$$(Q) protoc --proto_path=/usr/include --proto_path=$(obj)/ --c_out=$(obj)/ $<
+	$(Q) echo "Generating descriptor.pb-c.c"
+	$(Q) protoc --proto_path=/usr/include --proto_path=$(obj)/ --c_out=$(obj)/ $<
 
 cleanup-y += $(DESCRIPTOR_DIR)/descriptor.pb-c.d
 
 submrproper:
-	$$(Q) rm -rf $(PROTOBUF_DIR)
+	$(Q) rm -rf $(PROTOBUF_DIR)
 .PHONY: submrproper
 mrproper: submrproper
 

From 066bf7bf3c68c899644aab9ecfa9d7c8d551ea8f Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 22 Jul 2025 22:44:50 -0700
Subject: [PATCH 1709/1854] Keep images/google/protobuf directory

Commit 68f92b551 removed images/google/protobuf directory, so it is
re-created each time during the build process.

This resulted in a weird behavior change. Previously, one could do
something like this:

	git clone $CRURL criu
	(cd criu && sudo make install-criu)
	rm -rf criu

This worked fine, including running rm -rf as a non-root user, since no
new directories were created under criu -- all directories were still
owned by the original user.

Since commit 68f92b551 the same sequence fails:

	rm: cannot remove '/home/runner/criu/images/google/protobuf/descriptor.pb-c.c': Permission denied
	rm: cannot remove '/home/runner/criu/images/google/protobuf/descriptor.pb-c.d': Permission denied
	rm: cannot remove '/home/runner/criu/images/google/protobuf/descriptor.pb-c.h': Permission denied

A workaround is to keep empty images/google/protobuf directory,
which is what this commit does.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .gitignore                        | 2 --
 images/Makefile                   | 5 ++---
 images/google/protobuf/.gitignore | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 images/google/protobuf/.gitignore

diff --git a/.gitignore b/.gitignore
index 854657d1c..94daa13ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,8 +20,6 @@ compel/compel
 compel/compel-host-bin
 images/*.c
 images/*.h
-images/google/protobuf/*.c
-images/google/protobuf/*.h
 .gitid
 criu/criu
 criu/unittest/unittest
diff --git a/images/Makefile b/images/Makefile
index cb30a5126..6f310e553 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -92,8 +92,7 @@ makefile-deps := Makefile $(obj)/Makefile
 
 #
 # Generate descriptor.pb-c.c and descriptor.pb-c.h to compile opts.proto.
-PROTOBUF_DIR := images/google
-DESCRIPTOR_DIR := $(PROTOBUF_DIR)/protobuf
+DESCRIPTOR_DIR := images/google/protobuf
 GOOGLE_INCLUDE=$(shell pkg-config protobuf --variable=includedir)/google/protobuf
 $(DESCRIPTOR_DIR)/descriptor.pb-c.c: $(GOOGLE_INCLUDE)/descriptor.proto
 	$(Q) echo "Generating descriptor.pb-c.c"
@@ -102,7 +101,7 @@ $(DESCRIPTOR_DIR)/descriptor.pb-c.c: $(GOOGLE_INCLUDE)/descriptor.proto
 cleanup-y += $(DESCRIPTOR_DIR)/descriptor.pb-c.d
 
 submrproper:
-	$(Q) rm -rf $(PROTOBUF_DIR)
+	$(Q) rm -f $(DESCRIPTOR_DIR)/*
 .PHONY: submrproper
 mrproper: submrproper
 
diff --git a/images/google/protobuf/.gitignore b/images/google/protobuf/.gitignore
new file mode 100644
index 000000000..68359a786
--- /dev/null
+++ b/images/google/protobuf/.gitignore
@@ -0,0 +1,2 @@
+*.c
+*.h

From 22c83e3eba403c1402826dc9edd770d74965879c Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Tue, 22 Jul 2025 23:07:37 -0700
Subject: [PATCH 1710/1854] images/Makefile: use msg-gen

In general, we use "$(E)" instead of "$(Q) echo", but we also have
a msg-gen macro which can be used here.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 images/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/Makefile b/images/Makefile
index 6f310e553..2c33152e9 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -95,7 +95,7 @@ makefile-deps := Makefile $(obj)/Makefile
 DESCRIPTOR_DIR := images/google/protobuf
 GOOGLE_INCLUDE=$(shell pkg-config protobuf --variable=includedir)/google/protobuf
 $(DESCRIPTOR_DIR)/descriptor.pb-c.c: $(GOOGLE_INCLUDE)/descriptor.proto
-	$(Q) echo "Generating descriptor.pb-c.c"
+	$(call msg-gen, $@)
 	$(Q) protoc --proto_path=/usr/include --proto_path=$(obj)/ --c_out=$(obj)/ $<
 
 cleanup-y += $(DESCRIPTOR_DIR)/descriptor.pb-c.d

From 95d5e2e59b1b83ba5400e7eea6db57f77424fb80 Mon Sep 17 00:00:00 2001
From: Ignacio Moreno Gonzalez <Ignacio.MorenoGonzalez@kuka.com>
Date: Wed, 16 Jul 2025 16:32:25 +0200
Subject: [PATCH 1711/1854] compel: flush caches after parasite injection

After the CRIU process saves the parasite code for the target thread in
the shared mmap, it is necessary to call __clear_cache before the target
thread executes the code.

Without this step, the target thread may not see the correct code to
execute, which can result in a SIGILL signal.

For the specific arm64 case. this is important so that the newly copied
code is flushed from d-cache to RAM, so that the target thread sees the
new code.

The change is based on commit 6be10a2 by @fu.lin and on input received
from @adrianreber.

[ avagin: tweak code comment ]

Signed-off-by: Ignacio Moreno Gonzalez <Ignacio.MorenoGonzalez@kuka.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 compel/src/lib/infect.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/compel/src/lib/infect.c b/compel/src/lib/infect.c
index 4ea27bc63..22fcf24fa 100644
--- a/compel/src/lib/infect.c
+++ b/compel/src/lib/infect.c
@@ -1054,6 +1054,16 @@ int compel_infect_no_daemon(struct parasite_ctl *ctl, unsigned long nr_threads,
 
 	memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
 	compel_relocs_apply(ctl->local_map, ctl->remote_map, &ctl->pblob);
+	/*
+	 * Ensure the infected thread sees the updated code.
+	 *
+	 * On architectures like ARM64, the Data Cache (D-cache) and
+	 * Instruction Cache (I-cache) are not automatically coherent.
+	 * Modifications land in the D-cache, so we must flush (clean) the
+	 * D-cache to push changes to RAM to ensure the CPU fetches the updated
+	 * instructions.
+	 */
+	__builtin___clear_cache(ctl->local_map, ctl->local_map + ctl->pblob.hdr.bsize);
 
 	p = parasite_size;
 

From 64276874d89825452baee6c756046e1277a41c48 Mon Sep 17 00:00:00 2001
From: Ignacio Moreno Gonzalez <Ignacio.MorenoGonzalez@kuka.com>
Date: Wed, 16 Jul 2025 16:38:13 +0200
Subject: [PATCH 1712/1854] restore: flush caches during restore

See the previous commit for rationale and architecture-specific details.

[ avagin: tweak code comment ]

Signed-off-by: Ignacio Moreno Gonzalez <Ignacio.MorenoGonzalez@kuka.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-restore.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index c1d1f4b9d..b37603563 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2569,6 +2569,17 @@ static int remap_restorer_blob(void *addr)
 	restorer_setup_c_header_desc(&pbd, true);
 	compel_relocs_apply(addr, addr, &pbd);
 
+	/*
+	 * Ensure the infected thread sees the updated code.
+	 *
+	 * On architectures like ARM64, the Data Cache (D-cache) and
+	 * Instruction Cache (I-cache) are not automatically coherent.
+	 * Modifications land in the D-cache, so we must flush (clean) the
+	 * D-cache to push changes to RAM to ensure the CPU fetches the updated
+	 * instructions.
+	 */
+	__builtin___clear_cache(addr, addr + pbd.hdr.bsize);
+
 	return 0;
 }
 

From 0d1e280d09d1a7422f9706cadb332586d520c352 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 25 Jul 2025 07:53:55 +0100
Subject: [PATCH 1713/1854] vagrant: fix 'qemu' install

Installing this package currently fails with the following message:

  Package qemu is not available, but is referred to by another package.
  This may mean that the package is missing, has been obsoleted, or
  is only available from another source

  E: Package 'qemu' has no installation candidate

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index ed5a01178..c3e15007c 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -22,7 +22,7 @@ setup() {
 	wget --no-check-certificate https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_"$(dpkg --print-architecture)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
 
-	./apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu \
+	./apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu-system \
 		ruby build-essential libxml2-dev qemu-kvm rsync ebtables dnsmasq-base \
 		openssh-client
 	systemctl restart libvirtd

From 2762b21e4a529f14b845f5bfe5153864d59b3e02 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 25 Jul 2025 08:34:31 +0100
Subject: [PATCH 1714/1854] vagrant: update image to fedora 42

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index c3e15007c..81af5d2e5 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -6,9 +6,9 @@
 set -e
 set -x
 
-VAGRANT_VERSION=2.4.1
-FEDORA_VERSION=40
-FEDORA_BOX_VERSION=40.20240414.0
+VAGRANT_VERSION=2.4.7
+FEDORA_VERSION=42
+FEDORA_BOX_VERSION=1.1.0
 
 setup() {
 	if [ -n "$TRAVIS" ]; then
@@ -27,7 +27,7 @@ setup() {
 		openssh-client
 	systemctl restart libvirtd
 	vagrant plugin install vagrant-libvirt
-	vagrant init fedora/${FEDORA_VERSION}-cloud-base --box-version ${FEDORA_BOX_VERSION}
+	vagrant init cloud-image/fedora-${FEDORA_VERSION} --box-version ${FEDORA_BOX_VERSION}
 	# The default libvirt Vagrant VM uses 512MB.
 	# Travis VMs should have around 7.5GB.
 	# Increasing it to 4GB should work.

From d586b30c6bede3767f86ef40217d462085b734e7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 25 Jul 2025 08:50:29 +0100
Subject: [PATCH 1715/1854] vagrant: fix tar including archive in itself

The tar command was failing with the following message:

  $ tar cf criu.tar ../../../criu
  tar: Removing leading `../../../' from member names
  tar: ../../../criu/scripts/ci/criu.tar: archive cannot contain itself; not dumped

In addition, the /vagrant no-longer exist in the new Fedora images.

  bash: line 1: cd: /vagrant: No such file or directory

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 scripts/ci/vagrant.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 81af5d2e5..008a01fb3 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -17,7 +17,7 @@ setup() {
 	fi
 
 	# Tar up the git checkout to have vagrant rsync it to the VM
-	tar cf criu.tar ../../../criu
+	tar cf /tmp/criu.tar -C ../../../ criu
 	# Cirrus has problems with the following certificate.
 	wget --no-check-certificate https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_"$(dpkg --print-architecture)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
@@ -28,10 +28,16 @@ setup() {
 	systemctl restart libvirtd
 	vagrant plugin install vagrant-libvirt
 	vagrant init cloud-image/fedora-${FEDORA_VERSION} --box-version ${FEDORA_BOX_VERSION}
+
 	# The default libvirt Vagrant VM uses 512MB.
 	# Travis VMs should have around 7.5GB.
 	# Increasing it to 4GB should work.
 	sed -i Vagrantfile -e 's,^end$,  config.vm.provider :libvirt do |libvirt|'"\n"'    libvirt.memory = 4096;end'"\n"'end,g'
+	# Sync /tmp/criu.tar into the VM
+	# We want to use $HOME without expansion
+	# shellcheck disable=SC2016
+	sed -i Vagrantfile -e 's|^end$|  config.vm.provision "file", source: "/tmp/criu.tar", destination: "$HOME/criu.tar"'"\n"'end|g'
+
 	vagrant up --provider=libvirt --no-tty
 	mkdir -p /root/.ssh
 	vagrant ssh-config >> /root/.ssh/config
@@ -40,8 +46,11 @@ setup() {
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
 		protobuf-devel python3-protobuf python3-importlib-metadata python3-junit_xml \
 		rubygem-asciidoctor iptables libselinux-devel libbpf-devel python3-yaml libuuid-devel
+
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
+
+	ssh default 'sudo mkdir -p --mode=777 /vagrant && mv $HOME/criu.tar /vagrant && cd /vagrant && tar xf criu.tar'
 	ssh default cat /proc/cmdline
 }
 
@@ -49,7 +58,7 @@ fedora-no-vdso() {
 	ssh default sudo grubby --update-kernel ALL --args="vdso=0"
 	vagrant reload
 	ssh default cat /proc/cmdline
-	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
+	ssh default 'cd /vagrant/criu; make -j'
 	ssh default 'cd /vagrant/criu/test; sudo ./zdtm.py run -a --keep-going'
 	# This test (pidfd_store_sk) requires pidfd_getfd syscall which is guaranteed in Fedora 33.
 	# It is also skipped from -a because it runs in RPC mode only
@@ -74,12 +83,12 @@ fedora-rawhide() {
 	# In the container it is not possible to change the state of selinux.
 	# Let's just disable it for this test run completely.
 	ssh default 'sudo setenforce Permissive'
-	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"'
+	ssh default 'cd /vagrant/criu; sudo -E make -C scripts/ci fedora-rawhide CONTAINER_RUNTIME=podman BUILD_OPTIONS="--security-opt seccomp=unconfined"'
 }
 
 fedora-non-root() {
 	ssh default uname -a
-	ssh default 'cd /vagrant; tar xf criu.tar; cd criu; make -j 4'
+	ssh default 'cd /vagrant/criu; make -j'
 	# Setting the capability should be the only line needed to run as non-root on Fedora
 	# In other environments either set /proc/sys/kernel/yama/ptrace_scope to 0 or grant cap_sys_ptrace to criu
 	ssh default 'sudo setcap cap_checkpoint_restore+eip /vagrant/criu/criu/criu'

From c6c6f6f231c8142ea8ee562e92c0bd4b6984f113 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 10 Aug 2025 21:46:39 +0000
Subject: [PATCH 1716/1854] zdtm/socket-tcp-closing: fill socket buffers
 effectivly

Send large chunks to fill socket buffers.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm/static/socket-tcp-closing.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/socket-tcp-closing.c b/test/zdtm/static/socket-tcp-closing.c
index 87e1d7533..df291d446 100644
--- a/test/zdtm/static/socket-tcp-closing.c
+++ b/test/zdtm/static/socket-tcp-closing.c
@@ -31,10 +31,13 @@ static int port = 8880;
 
 int fill_sock_buf(int fd)
 {
+	char zdtm[512];
 	int flags;
 	int size;
 	int ret;
 
+	memset(zdtm, 5, sizeof(zdtm));
+
 	flags = fcntl(fd, F_GETFL, 0);
 	if (flags == -1) {
 		pr_perror("Can't get flags");
@@ -47,7 +50,6 @@ int fill_sock_buf(int fd)
 
 	size = 0;
 	while (1) {
-		char zdtm[] = "zdtm test packet";
 		ret = write(fd, zdtm, sizeof(zdtm));
 		if (ret == -1) {
 			if (errno == EAGAIN)

From 5f94dd71e7fc59f31633faab57d59b924c3f0273 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 10 Aug 2025 21:50:41 +0000
Subject: [PATCH 1717/1854] CI: Consolidate arm64 tests on GitHub runners

The arm64 tests are currently being executed on both actuated and GitHub
runners. This change removes the actuated runner to avoid redundancy and
streamline our CI process.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .github/workflows/aarch64-test.yaml          | 32 +++++++++++
 .github/workflows/actuated-aarch64-test.yaml | 58 --------------------
 2 files changed, 32 insertions(+), 58 deletions(-)
 create mode 100644 .github/workflows/aarch64-test.yaml
 delete mode 100644 .github/workflows/actuated-aarch64-test.yaml

diff --git a/.github/workflows/aarch64-test.yaml b/.github/workflows/aarch64-test.yaml
new file mode 100644
index 000000000..32b19e176
--- /dev/null
+++ b/.github/workflows/aarch64-test.yaml
@@ -0,0 +1,32 @@
+name: aarch64 test
+
+on: [push, pull_request]
+
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: aarch64-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        target: [GCC=1, CLANG=1]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Run Tests ${{ matrix.target }}
+      # Following tests are failing on the VMs:
+      #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
+      #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))
+      #
+      # In combination with '--remote-lazy-pages' following error occurs:
+      #  138: FAIL: maps05.c:84: Data corrupted at page 1639 (errno = 11 (Resource temporarily unavailable))
+      run: |
+        # The 'sched_policy00' needs the following:
+        sudo sysctl -w kernel.sched_rt_runtime_us=-1
+        # etc/hosts entry is needed for netns_lock_iptables
+        echo "127.0.0.1   localhost" | sudo tee -a /etc/hosts
+        sudo -E make -C scripts/ci local ${{ matrix.target }} RUN_TESTS=1 \
+          ZDTM_OPTS="-x zdtm/static/change_mnt_context -x zdtm/static/maps05"
diff --git a/.github/workflows/actuated-aarch64-test.yaml b/.github/workflows/actuated-aarch64-test.yaml
deleted file mode 100644
index 567746a5f..000000000
--- a/.github/workflows/actuated-aarch64-test.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: aarch64 test
-
-on: [push, pull_request]
-
-# Cancel any preceding run on the pull request.
-concurrency:
-  group: actuated-test-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
-
-jobs:
-  build:
-    # Actuated runners are not available in all repositories.
-    if: ${{ github.repository == 'checkpoint-restore/criu' }}
-    # The memory size and the number of CPUs can be freely selected for
-    # the actuated runners. 3GB and 4 CPUs seems to be enough according to the
-    # result from 'vmmeter'.
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [actuated-arm64-4cpu-3gb, ubuntu-24.04-arm]
-        target: [GCC=1, CLANG=1]
-
-    steps:
-    # https://gist.github.com/alexellis/1f33e581c75e11e161fe613c46180771#file-metering-gha-md
-    # vmmeter start
-    - name: Prepare arkade
-      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
-      uses: alexellis/arkade-get@master
-      with:
-        crane: latest
-        print-summary: false
-
-    - name: Install vmmeter
-      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
-      run: |
-        crane export --platform linux/arm64 ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
-
-    - name: Run vmmeter
-      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
-      uses: self-actuated/vmmeter-action@master
-    # vmmeter end
-
-    - uses: actions/checkout@v4
-    - name: Run Tests ${{ matrix.target }}/${{ matrix.os }}
-      # Following tests are failing on the actuated VMs:
-      #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
-      #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))
-      #
-      # In combination with '--remote-lazy-pages' following error occurs:
-      #  138: FAIL: maps05.c:84: Data corrupted at page 1639 (errno = 11 (Resource temporarily unavailable))
-      run: |
-        # The 'sched_policy00' needs the following:
-        sudo sysctl -w kernel.sched_rt_runtime_us=-1
-        # etc/hosts entry is needed for netns_lock_iptables
-        echo "127.0.0.1   localhost" | sudo tee -a /etc/hosts
-        sudo -E make -C scripts/ci local ${{ matrix.target }} RUN_TESTS=1 \
-          ZDTM_OPTS="-x zdtm/static/change_mnt_context -x zdtm/static/maps05"

From fce491113bcb5bfe95e078ba92e2601b7f671c23 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 6 Apr 2025 20:22:57 +0200
Subject: [PATCH 1718/1854] criu/include/mman: define MADV_GUARD_INSTALL

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/mman.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/include/mman.h b/criu/include/mman.h
index 086753bcf..43e0b6cc7 100644
--- a/criu/include/mman.h
+++ b/criu/include/mman.h
@@ -19,5 +19,8 @@
 #ifndef MADV_WIPEONFORK
 #define MADV_WIPEONFORK 18
 #endif
+#ifndef MADV_GUARD_INSTALL
+#define MADV_GUARD_INSTALL 102
+#endif
 
 #endif /* __CR_MMAN_H__ */

From 2bb77daa92d26266d32e08ac21c0ed91f438a945 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sat, 19 Apr 2025 20:37:48 +0200
Subject: [PATCH 1719/1854] kerndat: add madvise(MADV_GUARD_INSTALL)
 feature-detection

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/kerndat.h |  1 +
 criu/kerndat.c         | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index c5deb3283..66db75649 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -91,6 +91,7 @@ struct kerndat_s {
 	bool has_close_range;
 	bool has_timer_cr_ids;
 	bool has_breakpoints;
+	bool has_madv_guard;
 };
 
 extern struct kerndat_s kdat;
diff --git a/criu/kerndat.c b/criu/kerndat.c
index fa43f7d3f..7e2edb72d 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -31,6 +31,7 @@
 #include "kerndat.h"
 #include "fs-magic.h"
 #include "mem.h"
+#include "mman.h"
 #include "common/compiler.h"
 #include "sysctl.h"
 #include "cr_options.h"
@@ -1813,6 +1814,33 @@ err:
 	return exit_code;
 }
 
+static int kerndat_has_madv_guard(void)
+{
+	void *map;
+
+	map = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+	if (map == MAP_FAILED) {
+		pr_perror("Can't mmap a page for has_madv_guard feature test");
+		return -1;
+	}
+
+	if (madvise(map, PAGE_SIZE, MADV_GUARD_INSTALL)) {
+		if (errno != EINVAL) {
+			pr_perror("madvise failed (has_madv_guard check)");
+			goto mmap_cleanup;
+		}
+	} else {
+		kdat.has_madv_guard = true;
+	}
+
+	munmap(map, PAGE_SIZE);
+	return 0;
+
+mmap_cleanup:
+	munmap(map, PAGE_SIZE);
+	return -1;
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the
@@ -2081,6 +2109,10 @@ int kerndat_init(void)
 		pr_err("kerndat_breakpoints has failed when initializing kerndat.\n");
 		ret = -1;
 	}
+	if (!ret && kerndat_has_madv_guard()) {
+		pr_err("kerndat_has_madv_guard has failed when initializing kerndat.\n");
+		ret = -1;
+	}
 
 	kerndat_lsm();
 	kerndat_mmap_min_addr();

From 4fc07a8a41f468b72e912fe38c96be18d37518d6 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sat, 19 Apr 2025 20:36:45 +0200
Subject: [PATCH 1720/1854] kerndat: add pagemap_scan_guard_pages feature check
 logic

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/cr-check.c             |  8 ++++++++
 criu/include/kerndat.h      |  3 +++
 criu/include/pagemap_scan.h |  1 +
 criu/kerndat.c              | 12 ++++++++++++
 4 files changed, 24 insertions(+)

diff --git a/criu/cr-check.c b/criu/cr-check.c
index 9c4778490..7c3dc76dd 100644
--- a/criu/cr-check.c
+++ b/criu/cr-check.c
@@ -1599,6 +1599,12 @@ static int check_breakpoints(void)
 	return 0;
 }
 
+static int check_pagemap_scan_guard_pages(void)
+{
+	kerndat_warn_about_madv_guards();
+
+	return kdat.has_pagemap_scan_guard_pages ? 0 : -1;
+}
 
 static int (*chk_feature)(void);
 
@@ -1724,6 +1730,7 @@ int cr_check(void)
 		ret |= check_pagemap_scan();
 		ret |= check_overlayfs_maps();
 		ret |= check_timer_cr_ids();
+		ret |= check_pagemap_scan_guard_pages();
 
 		if (kdat.lsm == LSMTYPE__APPARMOR)
 			ret |= check_apparmor_stacking();
@@ -1853,6 +1860,7 @@ static struct feature_list feature_list[] = {
 	{ "timer_cr_ids", check_timer_cr_ids },
 	{ "overlayfs_maps", check_overlayfs_maps },
 	{ "breakpoints", check_breakpoints },
+	{ "pagemap_scan_guard_pages", check_pagemap_scan_guard_pages },
 	{ NULL, NULL },
 };
 
diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h
index 66db75649..e4922f401 100644
--- a/criu/include/kerndat.h
+++ b/criu/include/kerndat.h
@@ -92,6 +92,7 @@ struct kerndat_s {
 	bool has_timer_cr_ids;
 	bool has_breakpoints;
 	bool has_madv_guard;
+	bool has_pagemap_scan_guard_pages;
 };
 
 extern struct kerndat_s kdat;
@@ -114,4 +115,6 @@ extern int kerndat_fs_virtualized(unsigned int which, u32 kdev);
 
 extern int kerndat_has_nspid(void);
 
+extern void kerndat_warn_about_madv_guards(void);
+
 #endif /* __CR_KERNDAT_H__ */
diff --git a/criu/include/pagemap_scan.h b/criu/include/pagemap_scan.h
index 0ad4c9bc0..9046e01ed 100644
--- a/criu/include/pagemap_scan.h
+++ b/criu/include/pagemap_scan.h
@@ -14,6 +14,7 @@
 #define PAGE_IS_PFNZERO	   (1 << 5)
 #define PAGE_IS_HUGE	   (1 << 6)
 #define PAGE_IS_SOFT_DIRTY (1 << 7)
+#define PAGE_IS_GUARD	   (1 << 8)
 
 /*
  * struct page_region - Page region with flags
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 7e2edb72d..997181ce7 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -87,6 +87,10 @@ static int check_pagemap(void)
 	if (ioctl(fd, PAGEMAP_SCAN, &args) == 0) {
 		pr_debug("PAGEMAP_SCAN is supported\n");
 		kdat.has_pagemap_scan = true;
+
+		args.return_mask |= PAGE_IS_GUARD;
+		if (ioctl(fd, PAGEMAP_SCAN, &args) == 0)
+			kdat.has_pagemap_scan_guard_pages = true;
 	} else {
 		switch (errno) {
 		case EINVAL:
@@ -1841,6 +1845,14 @@ mmap_cleanup:
 	return -1;
 }
 
+void kerndat_warn_about_madv_guards(void)
+{
+	if (kdat.has_madv_guard && !kdat.has_pagemap_scan_guard_pages)
+		pr_warn("ioctl(PAGEMAP_SCAN) doesn't support PAGE_IS_GUARD flag. "
+			"CRIU dump will fail if dumped processes use madvise(MADV_GUARD_INSTALL). "
+			"Please, consider updating your kernel.\n");
+}
+
 /*
  * Some features depend on resource that can be dynamically changed
  * at the OS runtime. There are cases that we cannot determine the

From 1873e8f502f2495d8792716df277664f6e3c4852 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sat, 19 Apr 2025 20:42:43 +0200
Subject: [PATCH 1721/1854] cr-dump: warn if MADV_GUARD is supported but isn't
 shown in pagemap

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/cr-dump.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index b8cf7d64d..f02db1a57 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2124,6 +2124,8 @@ int cr_dump_tasks(pid_t pid)
 	int pre_dump_ret = 0;
 	int ret = -1;
 
+	kerndat_warn_about_madv_guards();
+
 	pr_info("========================================\n");
 	pr_info("Dumping processes (pid: %d comm: %s)\n", pid, __task_comm_info(pid));
 	pr_info("========================================\n");

From 42580fcb1614a002c54ab0115e81a77a81871418 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 6 Apr 2025 20:51:24 +0200
Subject: [PATCH 1722/1854] criu/pagemap-cache: pagescan: look for
 PAGE_IS_GUARD pages

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/pagemap-cache.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index f04a517de..457c0d649 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -194,6 +194,9 @@ int pmc_fill(pmc_t *pmc, u64 start, u64 end)
 		};
 		long ret;
 
+		if (kdat.has_pagemap_scan_guard_pages)
+			args.return_mask |= PAGE_IS_GUARD;
+
 		ret = ioctl(pmc->fd, PAGEMAP_SCAN, &args);
 		if (ret == -1) {
 			pr_perror("PAGEMAP_SCAN");

From 5843cbf97552f8ddb794931a8daf179aae71d78d Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Thu, 1 May 2025 20:02:37 +0200
Subject: [PATCH 1723/1854] criu/mem: refactor should_dump_page helper

Make should_dump_page to return int to indicate failure, also
return useful data back through the struct page_info structure
passed as a pointer.

Also, correspondingly convert all call sites.

No functional changes intended, except fixing a bug in
should_dump_page() as it could return (-1) when pmc_fill()
fails, while caller didn't expect that before.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/mem.h |  8 +++++-
 criu/mem.c         | 69 ++++++++++++++++++++++++++++++----------------
 criu/shmem.c       | 27 +++++++++++-------
 3 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/criu/include/mem.h b/criu/include/mem.h
index 3618c9cc3..0ce97822b 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -49,5 +49,11 @@ int prepare_vmas(struct pstree_item *t, struct task_restore_args *ta);
 int unmap_guard_pages(struct pstree_item *t);
 int prepare_mappings(struct pstree_item *t);
 
-u64 should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, bool *softdirty);
+struct page_info {
+	u64 next;
+	bool softdirty;
+};
+
+int should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, struct page_info *page_info);
+
 #endif /* __CR_MEM_H__ */
diff --git a/criu/mem.c b/criu/mem.c
index 803cb545b..9fcf7a44c 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -115,27 +115,37 @@ static bool should_dump_entire_vma(VmaEntry *vmae)
 }
 
 /*
- * should_dump_page returns vaddr if an addressed page has to be dumped.
- * Otherwise, it returns an address that has to be inspected next.
+ * should_dump_page writes vaddr in page_info->next if an addressed page has to be dumped.
+ * Otherwise, it writes an address that has to be inspected next.
  */
-u64 should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, bool *softdirty)
+int should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, struct page_info *page_info)
 {
+	if (!page_info)
+		goto err;
+
 	if (vaddr >= pmc->end && pmc_fill(pmc, vaddr, vmae->end))
-		return -1;
+		goto err;
 
 	if (pmc->regs) {
 		while (1) {
-			if (pmc->regs_idx == pmc->regs_len)
-				return pmc->end;
+			if (pmc->regs_idx == pmc->regs_len) {
+				page_info->next = pmc->end;
+				return 0;
+			}
+
 			if (vaddr < pmc->regs[pmc->regs_idx].end)
 				break;
 			pmc->regs_idx++;
 		}
-		if (vaddr < pmc->regs[pmc->regs_idx].start)
-			return pmc->regs[pmc->regs_idx].start;
-		if (softdirty)
-			*softdirty = pmc->regs[pmc->regs_idx].categories & PAGE_IS_SOFT_DIRTY;
-		return vaddr;
+
+		if (vaddr < pmc->regs[pmc->regs_idx].start) {
+			page_info->next = pmc->regs[pmc->regs_idx].start;
+			return 0;
+		}
+
+		page_info->softdirty = pmc->regs[pmc->regs_idx].categories & PAGE_IS_SOFT_DIRTY;
+		page_info->next = vaddr;
+		return 0;
 	} else {
 		u64 pme = pmc->map[PAGE_PFN(vaddr - pmc->start)];
 
@@ -143,16 +153,26 @@ u64 should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, bool *softdirty)
 		 * Optimisation for private mapping pages, that haven't
 		 * yet being COW-ed
 		 */
-		if (vma_entry_is(vmae, VMA_FILE_PRIVATE) && (pme & PME_FILE))
-			return vaddr + PAGE_SIZE;
-		if ((pme & (PME_PRESENT | PME_SWAP)) && !__page_is_zero(pme)) {
-			if (softdirty)
-				*softdirty = pme & PME_SOFT_DIRTY;
-			return vaddr;
+		if (vma_entry_is(vmae, VMA_FILE_PRIVATE) && (pme & PME_FILE)) {
+			page_info->next = vaddr + PAGE_SIZE;
+			return 0;
 		}
 
-		return vaddr + PAGE_SIZE;
+		if ((pme & (PME_PRESENT | PME_SWAP)) && !__page_is_zero(pme)) {
+			page_info->softdirty = pme & PME_SOFT_DIRTY;
+			page_info->next = vaddr;
+			return 0;
+		}
+
+		page_info->next = vaddr + PAGE_SIZE;
+		return 0;
 	}
+
+err:
+	pr_err("should_dump_page failed on vma "
+	       "%#016" PRIx64 "-%#016" PRIx64 " vaddr=%#016" PRIx64 "\n",
+	       vmae->start, vmae->end, vaddr);
+	return -1;
 }
 
 bool page_is_zero(u64 pme)
@@ -202,14 +222,15 @@ static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct
 	nr_scanned = 0;
 	for (vaddr = *pvaddr; vaddr < vma->e->end; vaddr += PAGE_SIZE, nr_scanned++) {
 		unsigned int ppb_flags = 0;
-		bool softdirty = false;
-		u64 next;
+		struct page_info page_info = {};
 		int st;
 
 		/* If dump_all_pages is true, should_dump_page is called to get pme. */
-		next = should_dump_page(pmc, vma->e, vaddr, &softdirty);
-		if (!dump_all_pages && next != vaddr) {
-			vaddr = next - PAGE_SIZE;
+		if (should_dump_page(pmc, vma->e, vaddr, &page_info))
+			return -1;
+
+		if (!dump_all_pages && page_info.next != vaddr) {
+			vaddr = page_info.next - PAGE_SIZE;
 			continue;
 		}
 
@@ -223,7 +244,7 @@ static int generate_iovs(struct pstree_item *item, struct vma_area *vma, struct
 		 * page. The latter would be checked in page-xfer.
 		 */
 
-		if (has_parent && page_in_parent(softdirty)) {
+		if (has_parent && page_in_parent(page_info.softdirty)) {
 			ret = page_pipe_add_hole(pp, vaddr, PP_HOLE_PARENT);
 			st = 0;
 		} else {
diff --git a/criu/shmem.c b/criu/shmem.c
index 9e3178352..bc7aa3669 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -206,31 +206,34 @@ static int expand_shmem(struct shmem_info *si, unsigned long new_size)
 	return 0;
 }
 
-static void update_shmem_pmaps(struct shmem_info *si, pmc_t *pmc, VmaEntry *vma)
+static int update_shmem_pmaps(struct shmem_info *si, pmc_t *pmc, VmaEntry *vma)
 {
 	unsigned long shmem_pfn, vma_pfn, vma_pgcnt;
 	u64 vaddr;
 
 	if (!is_shmem_tracking_en())
-		return;
+		return 0;
 
 	vma_pgcnt = DIV_ROUND_UP(si->size - vma->pgoff, PAGE_SIZE);
 	for (vma_pfn = 0, vaddr = vma->start; vma_pfn < vma_pgcnt; ++vma_pfn, vaddr += PAGE_SIZE) {
-		bool softdirty = false;
-		u64 next;
+		struct page_info page_info = {};
 
-		next = should_dump_page(pmc, vma, vaddr, &softdirty);
-		if (next != vaddr) {
-			vaddr = next - PAGE_SIZE;
+		if (should_dump_page(pmc, vma, vaddr, &page_info))
+			return -1;
+
+		if (page_info.next != vaddr) {
+			vaddr = page_info.next - PAGE_SIZE;
 			continue;
 		}
 
 		shmem_pfn = vma_pfn + DIV_ROUND_UP(vma->pgoff, PAGE_SIZE);
-		if (softdirty)
+		if (page_info.softdirty)
 			set_pstate(si->pstate_map, shmem_pfn, PST_DIRTY);
 		else
 			set_pstate(si->pstate_map, shmem_pfn, PST_DUMP);
 	}
+
+	return 0;
 }
 
 int collect_sysv_shmem(unsigned long shmid, unsigned long size)
@@ -667,7 +670,9 @@ int add_shmem_area(pid_t pid, VmaEntry *vma, pmc_t *pmc)
 			if (expand_shmem(si, size))
 				return -1;
 		}
-		update_shmem_pmaps(si, pmc, vma);
+
+		if (update_shmem_pmaps(si, pmc, vma))
+			return -1;
 
 		return 0;
 	}
@@ -684,7 +689,9 @@ int add_shmem_area(pid_t pid, VmaEntry *vma, pmc_t *pmc)
 
 	if (expand_shmem(si, size))
 		return -1;
-	update_shmem_pmaps(si, pmc, vma);
+
+	if (update_shmem_pmaps(si, pmc, vma))
+		return -1;
 
 	return 0;
 }

From cc047d595f742e416220d2d7740334500eb96a85 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 6 Apr 2025 20:42:26 +0200
Subject: [PATCH 1724/1854] criu/mem: dump: skip MADV_GUARD pages content dump

1. get info about MADV_GUARD_INSTALL-protected pages with
help of pagemap by looking for PME_GUARD_REGION flag if /proc/<pid>/pagemap
is used or by looking for PAGE_IS_GUARD flag if ioctl(PAGEMAP_SCAN) is used
2. skip those pages

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/mem.h |  1 +
 criu/mem.c         | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/criu/include/mem.h b/criu/include/mem.h
index 0ce97822b..b2cbd4b64 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -35,6 +35,7 @@ extern int parasite_dump_pages_seized(struct pstree_item *item, struct vm_area_l
 #define PME_PRESENT	  (1ULL << 63)
 #define PME_SWAP	  (1ULL << 62)
 #define PME_FILE	  (1ULL << 61)
+#define PME_GUARD_REGION  (1ULL << 58)
 #define PME_SOFT_DIRTY	  (1ULL << 55)
 #define PME_PSHIFT_BITS	  (6)
 #define PME_STATUS_BITS	  (3)
diff --git a/criu/mem.c b/criu/mem.c
index 9fcf7a44c..58c4130c6 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -143,12 +143,18 @@ int should_dump_page(pmc_t *pmc, VmaEntry *vmae, u64 vaddr, struct page_info *pa
 			return 0;
 		}
 
+		if (pmc->regs[pmc->regs_idx].categories & PAGE_IS_GUARD)
+			goto skip_guard_page;
+
 		page_info->softdirty = pmc->regs[pmc->regs_idx].categories & PAGE_IS_SOFT_DIRTY;
 		page_info->next = vaddr;
 		return 0;
 	} else {
 		u64 pme = pmc->map[PAGE_PFN(vaddr - pmc->start)];
 
+		if (pme & PME_GUARD_REGION)
+			goto skip_guard_page;
+
 		/*
 		 * Optimisation for private mapping pages, that haven't
 		 * yet being COW-ed
@@ -173,6 +179,10 @@ err:
 	       "%#016" PRIx64 "-%#016" PRIx64 " vaddr=%#016" PRIx64 "\n",
 	       vmae->start, vmae->end, vaddr);
 	return -1;
+
+skip_guard_page:
+	page_info->next = vaddr + PAGE_SIZE;
+	return 0;
 }
 
 bool page_is_zero(u64 pme)

From 63c7029686ea90c649b2909f37ae93c111f11418 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Mon, 4 Aug 2025 09:42:10 +0200
Subject: [PATCH 1725/1854] criu/{mem, vdso, cr-restore}: introduce
 VMA_AREA_GUARD fake VMAs

Introduce a new kind of VMA - VMA_AREA_GUARD. In fact, it is not
a real VMA as it is not represented as struct vm_area_struct in
the kernel.

We want to reuse an existing vma infrastructure in CRIU to dump
an information about MADV_GUARD_INSTALL-covered address space
ranges as VMAs. Then, on restore, we need to carefully skip
those fake VMAs everywhere we expect a normal VMAs to be processed.
And only in restorer we use these VMAs to get an information about
where to call MADV_GUARD_INSTALL.

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/cr-restore.c    |  6 ++++--
 criu/include/image.h |  7 +++++++
 criu/mem.c           | 13 +++++++++++--
 criu/vdso.c          |  6 ++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index b37603563..1c3b36451 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2447,7 +2447,8 @@ static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_he
 
 	while (1) {
 		if (prev_vma_end + vma_len > s_vma->e->start) {
-			if (s_vma->list.next == self_vma_list) {
+			if ((s_vma->list.next == self_vma_list) ||
+			    vma_area_is(vma_next(s_vma), VMA_AREA_GUARD)) {
 				s_vma = &end_vma;
 				continue;
 			}
@@ -2460,7 +2461,8 @@ static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_he
 		}
 
 		if (prev_vma_end + vma_len > t_vma->e->start) {
-			if (t_vma->list.next == tgt_vma_list) {
+			if ((t_vma->list.next == tgt_vma_list) ||
+			    vma_area_is(vma_next(t_vma), VMA_AREA_GUARD)) {
 				t_vma = &end_vma;
 				continue;
 			}
diff --git a/criu/include/image.h b/criu/include/image.h
index afa7d5e12..934f7d4e9 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -68,6 +68,12 @@
  *  	processing exiting with error; while the rest of bits
  *  	are part of image ABI, this particular one must never
  *  	be used in image.
+ *  - guard
+ *  	stands for a fake VMA (not represented in the kernel
+ *  	by a struct vm_area_struct). Used to keep an information
+ *  	about virtual address space ranges covered by
+ *  	MADV_GUARD_INSTALL guards. These ones must be always at
+ *  	the end of the vma_area_list and properly skipped a.e.
  */
 #define VMA_AREA_NONE	  (0 << 0)
 #define VMA_AREA_REGULAR  (1 << 0)
@@ -87,6 +93,7 @@
 #define VMA_AREA_AIORING (1 << 13)
 #define VMA_AREA_MEMFD	 (1 << 14)
 #define VMA_AREA_SHSTK	 (1 << 15)
+#define VMA_AREA_GUARD	 (1 << 16)
 
 #define VMA_EXT_PLUGIN	  (1 << 27)
 #define VMA_CLOSE	  (1 << 28)
diff --git a/criu/mem.c b/criu/mem.c
index 58c4130c6..ee841aca2 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -599,6 +599,9 @@ static int __parasite_dump_pages_seized(struct pstree_item *item, struct parasit
 		parent_predump_mode = mdc->parent_ie->pre_dump_mode;
 
 	list_for_each_entry(vma_area, &vma_area_list->h, list) {
+		if (vma_area_is(vma_area, VMA_AREA_GUARD))
+			continue;
+
 		ret = generate_vma_iovs(item, vma_area, pp, &xfer, args, ctl, &pmc, has_parent, mdc->pre_dump,
 					parent_predump_mode);
 		if (ret < 0)
@@ -861,14 +864,14 @@ static void prepare_cow_vmas_for(struct vm_area_list *vmas, struct vm_area_list
 		/* <= here to shift from matching VMAs and ... */
 		while (vma->e->start <= pvma->e->start) {
 			vma = vma_next(vma);
-			if (&vma->list == &vmas->h)
+			if ((&vma->list == &vmas->h) || vma_area_is(vma, VMA_AREA_GUARD))
 				return;
 		}
 
 		/* ... no == here since we must stop on matching pair */
 		while (pvma->e->start < vma->e->start) {
 			pvma = vma_next(pvma);
-			if (&pvma->list == &pvmas->h)
+			if ((&pvma->list == &pvmas->h) || vma_area_is(pvma, VMA_AREA_GUARD))
 				return;
 		}
 	}
@@ -1069,6 +1072,9 @@ static int premap_priv_vmas(struct pstree_item *t, struct vm_area_list *vmas, vo
 	filemap_ctx_init(true);
 
 	list_for_each_entry(vma, &vmas->h, list) {
+		if (vma_area_is(vma, VMA_AREA_GUARD))
+			continue;
+
 		if (task_size_check(vpid(t), vma->e)) {
 			ret = -1;
 			break;
@@ -1276,6 +1282,9 @@ err_read:
 		unsigned long size, i = 0;
 		void *addr = decode_pointer(vma->premmaped_addr);
 
+		if (vma_area_is(vma, VMA_AREA_GUARD))
+			continue;
+
 		if (!vma_inherited(vma))
 			continue;
 
diff --git a/criu/vdso.c b/criu/vdso.c
index d4d351131..2d9e57c4d 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -145,6 +145,9 @@ static void drop_rt_vdso(struct vm_area_list *vma_area_list, struct vdso_quarter
 	 * Also BTW search for rt-vvar to remove it later.
 	 */
 	list_for_each_entry(vma, &vma_area_list->h, list) {
+		if (vma_area_is(vma, VMA_AREA_GUARD))
+			continue;
+
 		if (vma->e->start == addr->orig_vdso) {
 			vma->e->status |= VMA_AREA_REGULAR | VMA_AREA_VDSO;
 			pr_debug("vdso: Restore orig vDSO status at %lx\n", (long)vma->e->start);
@@ -276,6 +279,9 @@ int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid, struct vm_area_list
 	}
 
 	list_for_each_entry(vma, &vma_area_list->h, list) {
+		if (vma_area_is(vma, VMA_AREA_GUARD))
+			continue;
+
 		/*
 		 * Defer handling marked vdso until we walked over
 		 * all vmas and restore potentially remapped vDSO

From 59b4d662ae8fd704dfc16f47628a676852f4c886 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 6 Apr 2025 20:10:10 +0200
Subject: [PATCH 1726/1854] criu/pie/restorer: add madvise(MADV_GUARD_INSTALL)
 restore logic

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/pie/restorer.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 9867a3ddd..394d3dea0 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -28,6 +28,7 @@
 #include <compel/plugins/std/syscall.h>
 #include <compel/plugins/std/log.h>
 #include <compel/ksigset.h>
+#include "mman.h"
 #include "signal.h"
 #include "prctl.h"
 #include "criu-log.h"
@@ -1665,6 +1666,30 @@ static int restore_membarrier_registrations(int mask)
 	return ret;
 }
 
+static int restore_madv_guard_regions(struct task_restore_args *args)
+{
+	int i, ret;
+
+	for (i = 0; i < args->vmas_n; i++) {
+		VmaEntry *vma_entry = args->vmas + i;
+		size_t len;
+
+		if (!vma_entry_is(vma_entry, VMA_AREA_GUARD))
+			continue;
+
+		len = vma_entry->end - vma_entry->start;
+		ret = sys_madvise(vma_entry->start, len, MADV_GUARD_INSTALL);
+		if (ret) {
+			pr_err("madvise(%" PRIx64 ", %zu, MADV_GUARD_INSTALL) "
+			       "failed with %d\n",
+			       vma_entry->start, len, ret);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 /*
  * The main routine to restore task via sigreturn.
  * This one is very special, we never return there
@@ -1972,6 +1997,13 @@ __visible long __export_restore_task(struct task_restore_args *args)
 		}
 	}
 
+	/*
+	 * Restore madvise(MADV_GUARD_INSTALL)
+	 */
+	ret = restore_madv_guard_regions(args);
+	if (ret)
+		goto core_restore_end;
+
 	/*
 	 * Tune up the task fields.
 	 */

From 9c0f725a625126063e09d01ebc087d1e36a0dcc5 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Mon, 4 Aug 2025 10:48:47 +0200
Subject: [PATCH 1727/1854] criu/mem: dump: note MADV_GUARD pages as
 VMA_AREA_GUARD VMAs

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/cr-dump.c     | 17 ++++++++++++
 criu/include/mem.h |  1 +
 criu/mem.c         | 69 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index f02db1a57..10c485cbe 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -130,6 +130,23 @@ int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list, dump_filemap
 	if (ret < 0)
 		goto err;
 
+	/*
+	 * In addition to real process VMAs we should keep an info about
+	 * madvise(MADV_GUARD_INSTALL) pages. While these are not represented
+	 * as a struct vm_area_struct in the kernel, it is convenient to treat
+	 * them as mappings in CRIU and reuse the same VMA images but with only
+	 * VMA_AREA_GUARD flag set.
+	 *
+	 * Also, we don't need to dump them during pre-dump.
+	 */
+	if (dump_file) {
+		ret = collect_madv_guards(pid, vma_area_list);
+		if (ret < 0) {
+			pr_err("Collect MADV_GUARD_INSTALL pages (pid: %d) failed with %d\n", pid, ret);
+			goto err;
+		}
+	}
+
 	pr_info("Collected, longest area occupies %lu pages\n", vma_area_list->nr_priv_pages_longest);
 	pr_info_vma_list(&vma_area_list->h);
 
diff --git a/criu/include/mem.h b/criu/include/mem.h
index b2cbd4b64..e9ce3518a 100644
--- a/criu/include/mem.h
+++ b/criu/include/mem.h
@@ -31,6 +31,7 @@ extern int do_task_reset_dirty_track(int pid);
 extern unsigned long dump_pages_args_size(struct vm_area_list *vmas);
 extern int parasite_dump_pages_seized(struct pstree_item *item, struct vm_area_list *vma_area_list,
 				      struct mem_dump_ctl *mdc, struct parasite_ctl *ctl);
+extern int collect_madv_guards(pid_t pid, struct vm_area_list *vma_area_list);
 
 #define PME_PRESENT	  (1ULL << 63)
 #define PME_SWAP	  (1ULL << 62)
diff --git a/criu/mem.c b/criu/mem.c
index ee841aca2..0636273cb 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -1548,3 +1548,72 @@ int prepare_vmas(struct pstree_item *t, struct task_restore_args *ta)
 
 	return prepare_vma_ios(t, ta);
 }
+
+int collect_madv_guards(pid_t pid, struct vm_area_list *vma_area_list)
+{
+	int pagemap_fd = -1;
+	struct page_region *regs = NULL;
+	long regs_len = 0;
+	int i, ret = -1;
+
+	struct pm_scan_arg args = {
+		.size = sizeof(struct pm_scan_arg),
+		.flags = 0,
+		.start = 0,
+		.end = kdat.task_size,
+		.walk_end = 0,
+		.vec_len = 1000, /* this should be enough for most cases */
+		.max_pages = 0,
+		.category_mask = PAGE_IS_GUARD,
+		.return_mask = PAGE_IS_GUARD,
+	};
+
+	if (!kdat.has_pagemap_scan_guard_pages) {
+		ret = 0;
+		goto out;
+	}
+
+	pagemap_fd = open_proc(pid, "pagemap");
+	if (pagemap_fd < 0)
+		goto out;
+
+	regs = xmalloc(args.vec_len * sizeof(struct page_region));
+	if (!regs)
+		goto out;
+	args.vec = (long)regs;
+
+	do {
+		/* start from where we finished the last time */
+		args.start = args.walk_end;
+		regs_len = ioctl(pagemap_fd, PAGEMAP_SCAN, &args);
+		if (regs_len == -1) {
+			pr_perror("PAGEMAP_SCAN");
+			goto out;
+		}
+
+		for (i = 0; i < regs_len; i++) {
+			struct vma_area *vma;
+
+			BUG_ON(!(regs[i].categories & PAGE_IS_GUARD));
+
+			vma = alloc_vma_area();
+			if (!vma)
+				goto out;
+
+			vma->e->start = regs[i].start;
+			vma->e->end = regs[i].end;
+			vma->e->status = VMA_AREA_GUARD;
+
+			list_add_tail(&vma->list, &vma_area_list->h);
+			vma_area_list->nr++;
+		}
+	} while (args.walk_end != kdat.task_size);
+
+	ret = 0;
+
+out:
+	xfree(regs);
+	if (pagemap_fd >= 0)
+		close(pagemap_fd);
+	return ret;
+}

From 01265cfc69e178ca5cb1ae691e1b615c2ddc7eb1 Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 20 Apr 2025 20:20:20 +0200
Subject: [PATCH 1728/1854] test/zdtm/static/maps12: add madv guards test

Test for madvise(MADV_GUARD_INSTALL).

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 test/zdtm/static/Makefile    |   1 +
 test/zdtm/static/maps12.c    | 350 +++++++++++++++++++++++++++++++++++
 test/zdtm/static/maps12.desc |   1 +
 3 files changed, 352 insertions(+)
 create mode 100644 test/zdtm/static/maps12.c
 create mode 100644 test/zdtm/static/maps12.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ab69f389e..e73f964be 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -315,6 +315,7 @@ TST_FILE	=				\
 		write_read02			\
 		write_read10			\
 		maps00				\
+		maps12				\
 		link10				\
 		file_attr			\
 		deleted_unix_sock		\
diff --git a/test/zdtm/static/maps12.c b/test/zdtm/static/maps12.c
new file mode 100644
index 000000000..b645595be
--- /dev/null
+++ b/test/zdtm/static/maps12.c
@@ -0,0 +1,350 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <setjmp.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <linux/limits.h>
+#include "zdtmtst.h"
+
+const char *test_doc = "Test madvise(MADV_GUARD_INSTALL)";
+const char *test_author = "Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>";
+/* some parts of code were taken from Linux kernel's kselftest guard-pages.c
+   written by Lorenzo Stoakes <lorenzo.stoakes@oracle.com> */
+
+char *filename;
+int fd;
+TEST_OPTION(filename, string, "file name", 1);
+
+#ifndef MADV_GUARD_INSTALL
+#define MADV_GUARD_INSTALL 102
+#endif
+
+uint8_t *map_base;
+
+struct {
+	unsigned int pages_num;
+	bool filemap;
+} vmas[] = {
+	{ 2, false },
+	{ 2, false },
+	{ 2, false },
+	{ 2, true },
+	{ 2, true },
+	{ 2, true },
+};
+
+struct {
+	bool guarded;
+	bool wipeonfork;
+} pages[] = {
+	{ false, false }, /* vmas[0] */
+	{ true, false },
+	{ true, false }, /* vmas[1] */
+	{ false, false },
+	{ false, false }, /* vmas[2] */
+	{ true, true },
+	{ true, false }, /* vmas[3] */
+	{ false, false },
+	{ true, false }, /* vmas[4] */
+	{ true, false },
+	{ false, false }, /* vmas[5] */
+	{ true, false },
+};
+
+static volatile sig_atomic_t signal_jump_set;
+static sigjmp_buf signal_jmp_buf;
+
+static void handle_sigsegv(int signo)
+{
+	if (!signal_jump_set)
+		return;
+
+	siglongjmp(signal_jmp_buf, 1);
+}
+
+static bool try_write_to_addr(uint8_t *ptr)
+{
+	bool failed;
+
+	/* Tell signal handler to jump back here on fatal signal. */
+	signal_jump_set = true;
+	/* If a fatal signal arose, we will jump back here and failed is set. */
+	failed = sigsetjmp(signal_jmp_buf, 1) != 0;
+
+	if (!failed)
+		*ptr = 'x';
+
+	signal_jump_set = false;
+	return !failed;
+}
+
+static int setup_sigsegv_handler(void)
+{
+	uint8_t write_me;
+
+	if (signal(SIGSEGV, handle_sigsegv) == SIG_ERR) {
+		pr_perror("setting SIGSEGV handler failed");
+		return 1;
+	}
+
+	/* ensure that try_write_to_addr() works properly */
+	if (!try_write_to_addr(&write_me)) {
+		pr_err("Failed to write at valid addr. Buggy try_write_to_addr()?\n");
+		return 1;
+	}
+
+	if (try_write_to_addr(NULL)) {
+		pr_err("Failed to detect an invalid write. Buggy try_write_to_addr()?\n");
+		return 1;
+	}
+
+	return 0;
+}
+
+static inline void *mmap_pages(void *addr_hint, unsigned int count, bool filemap)
+{
+	char *map;
+
+	map = mmap(addr_hint, count * PAGE_SIZE, PROT_WRITE | PROT_READ,
+		   MAP_PRIVATE | (filemap ? 0 : MAP_ANONYMOUS) | (addr_hint ? MAP_FIXED : 0),
+		   filemap ? fd : -1, filemap ? ((off_t)addr_hint - (off_t)map_base) : 0);
+	if (map == MAP_FAILED || (addr_hint && (map != addr_hint)))
+		return MAP_FAILED;
+
+	return map;
+}
+
+static int __check_guards(const char *when, bool in_child)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(pages); i++) {
+		/*
+		 * Skip pages that were never guarded, and also those
+		 * that were, but have MADV_WIPEONFORK which means that
+		 * guards were removed on fork.
+		 */
+		if (!pages[i].guarded || (in_child && pages[i].wipeonfork))
+			continue;
+
+		if (try_write_to_addr(&map_base[i * PAGE_SIZE])) {
+			pr_err("successful write to a guarded area %d %s C/R\n",
+			       i, when);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+static int check_guards(const char *when)
+{
+	int status;
+	pid_t pid;
+
+	/*
+	 * First of all, check that guards are on their places
+	 * in a main test process.
+	 */
+	if (__check_guards(when, false)) {
+		return 1;
+	}
+
+	/*
+	 * Now, check that guards are on their places
+	 * after fork(). This allows to ensure that
+	 * combo MADV_WIPEONFORK + MADV_GUARD_INSTALL
+	 * is restored properly too.
+	 */
+
+	pid = test_fork();
+	if (pid < 0) {
+		pr_perror("check_guards: fork failed");
+		return 1;
+	}
+
+	if (pid == 0) {
+		if (__check_guards(when, true)) {
+			pr_err("check_guards(\"%s\") failed in child\n", when);
+			exit(1);
+		}
+
+		exit(0);
+	}
+
+	if (waitpid(pid, &status, 0) != pid) {
+		pr_perror("check_guards: waitpid");
+		return 1;
+	}
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		pr_err("check_guards: process didn't exit cleanly: status=%d\n", status);
+		return 1;
+	}
+
+	return 0;
+}
+
+static void gen_pages_data(void)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(pages); i++) {
+		uint32_t crc;
+
+		if (pages[i].guarded)
+			continue;
+
+		crc = ~0;
+		datagen(&map_base[i * PAGE_SIZE], PAGE_SIZE, &crc);
+	}
+}
+
+static int set_pages_madvs(void)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(pages); i++) {
+		if (pages[i].guarded) {
+			if (madvise(&map_base[i * PAGE_SIZE], PAGE_SIZE,
+				    MADV_GUARD_INSTALL)) {
+				pr_perror("MADV_GUARD_INSTALL failed on page %d", i);
+				return 1;
+			}
+		}
+
+		if (pages[i].wipeonfork) {
+			if (madvise(&map_base[i * PAGE_SIZE], PAGE_SIZE,
+				    MADV_WIPEONFORK)) {
+				pr_perror("MADV_WIPEONFORK failed on page %d", i);
+				return 1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+static int check_pages_data(void)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(pages); i++) {
+		uint32_t crc;
+
+		if (pages[i].guarded)
+			continue;
+
+		crc = ~0;
+		if (datachk(&map_base[i * PAGE_SIZE], PAGE_SIZE, &crc)) {
+			pr_err("Page %d is corrupted\n", i);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+static int prepare_vmas(void)
+{
+	char *map;
+	int i, shift;
+
+	shift = 0;
+	for (i = 0; i < ARRAY_SIZE(vmas); i++) {
+		map = mmap_pages(&map_base[shift * PAGE_SIZE],
+				 vmas[i].pages_num, vmas[i].filemap);
+		if (map == MAP_FAILED) {
+			pr_err("mmap of [%d,%d] pages failed\n",
+			       shift, shift + vmas[i].pages_num);
+			return 1;
+		}
+
+		shift += vmas[i].pages_num;
+	}
+
+	if (shift != ARRAY_SIZE(pages)) {
+		pr_err("Different number of pages in vmas and pages arrays.\n");
+		return 1;
+	}
+
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	unsigned int pages_num = ARRAY_SIZE(pages);
+
+	test_init(argc, argv);
+
+	fd = open(filename, O_TRUNC | O_CREAT | O_RDWR, 0600);
+	if (fd < 0) {
+		pr_perror("Unable to create a test file");
+		return -1;
+	}
+
+	if (ftruncate(fd, pages_num * PAGE_SIZE)) {
+		pr_perror("Unable to ftruncate a test file");
+		return -1;
+	}
+
+	if (setup_sigsegv_handler()) {
+		pr_err("setup_sigsegv_handler() failed\n");
+		return 1;
+	}
+
+	/* let's find a large enough area in address space */
+	map_base = mmap_pages(NULL, pages_num, false);
+	if (map_base == MAP_FAILED) {
+		pr_err("mmap of %d pages failed\n", pages_num);
+		return 1;
+	}
+
+	/*
+	 * Now we know that we have a free vm address space area
+	 * [map_base, map_base + pages_num * PAGE_SIZE).
+	 * We can use (map_base) as a hint for our further mmaps.
+	 */
+	if (prepare_vmas()) {
+		pr_err("prepare_vmas() failed\n");
+		return 1;
+	}
+
+	/* fill non-guarded pages with data and preserve checksums */
+	gen_pages_data();
+
+	if (set_pages_madvs()) {
+		pr_err("set_pages_madvs() failed\n");
+		return 1;
+	}
+
+	/* ensure that madvise(MADV_GUARD_INSTALL) works like expected */
+	if (check_guards("before")) {
+		pr_err("check_guards(\"before\") failed\n");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/* ensure that guards are at their places */
+	if (check_guards("after")) {
+		fail("check_guards(\"after\") failed");
+		return 1;
+	}
+
+	/* check that non-guarded pages still contain original data */
+	if (check_pages_data()) {
+		fail("check_pages_data() failed");
+		return 1;
+	}
+
+	pass();
+	munmap(map_base, pages_num * PAGE_SIZE);
+	close(fd);
+	return 0;
+}
diff --git a/test/zdtm/static/maps12.desc b/test/zdtm/static/maps12.desc
new file mode 100644
index 000000000..3f7627ff3
--- /dev/null
+++ b/test/zdtm/static/maps12.desc
@@ -0,0 +1 @@
+{'flavor': 'h', 'feature': 'pagemap_scan_guard_pages'}

From 98f2bd525a5eb6db84bdabf4566b18aeaacf32af Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Sun, 10 Aug 2025 18:22:23 +0200
Subject: [PATCH 1729/1854] ci/vagrant: install vanilla kernel for Fedora
 Rawhide test

We need at least 6.16 to test MADV_GUARD_INSTALL support, but
our current Fedora Rawhide test uses only Rawhide's user space,
while using Fedora 42 kernel. Let's start using a vanilla kernel.

Suggested-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 scripts/ci/vagrant.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 008a01fb3..98942e756 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -66,6 +66,10 @@ fedora-no-vdso() {
 }
 
 fedora-rawhide() {
+	# Upgrade the kernel to the latest vanilla one
+	ssh default sudo dnf -y copr enable @kernel-vanilla/stable
+	ssh default sudo dnf upgrade -y
+
 	# The 6.2 kernel of Fedora 38 in combination with rawhide userspace breaks
 	# zdtm/static/socket-tcp-nfconntrack. To activate the new kernel previously
 	# installed this reboots the VM.

From dcee5bd6ff2d632bd4e1d4d09d2ffb2bf683d6a2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 15 Aug 2025 01:44:01 +0000
Subject: [PATCH 1730/1854] make: Disable branch-protection for PIE code on
 ARM64

Branch protection uses PAC. It cryptographically "signs" a function's
return address before it is stored on the stack. Upon return, the address
is authenticated using a secret key. If the signature is invalid, the
program will fault.

The PIE code is used for the parasite and the restorer. In both cases, it
runs in a foreign process. The case of the restorer is even trickier
because it needs to restore the original PAC keys, which invalidates
all previously "signed" pointers within the restorer itself.

Fixes #2709

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 5d8e89ac1..7272cfce1 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,8 @@ endif
 
 ifeq ($(ARCH),aarch64)
         DEFINES		:= -DCONFIG_AARCH64
+        CC_MBRANCH_PROT := $(shell $(CC) -c -x c /dev/null -mbranch-protection=none -o /dev/null >/dev/null 2>&1 && echo "-mbranch-protection=none")
+        CFLAGS_PIE	:= $(CC_MBRANCH_PROT)
 endif
 
 ifeq ($(ARCH),ppc64)

From 2ba343010663f12979ca29fa22c54e511f2d6473 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 16 Aug 2025 15:45:05 +0100
Subject: [PATCH 1731/1854] test/zdtm/static/maps12: fix pointer-to-int cast

The `offset` argument to `mmap()` was computed with a direct cast from
pointer to `off_t`:

`(off_t)addr_hint - (off_t)map_base`

This causes a build failure when compiling since pointers and `off_t`
may differ in size on some platforms.

maps12.c: In function 'mmap_pages':
maps12.c:114:50: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  114 |                    filemap ? fd : -1, filemap ? ((off_t)addr_hint - (off_t)map_base) : 0);
      |                                                  ^
maps12.c:114:69: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
  114 |                    filemap ? fd : -1, filemap ? ((off_t)addr_hint - (off_t)map_base) : 0);

The fix in this patch is to cast both pointers to `intptr_t`,
perform the subtraction in that type, and then cast the result
back to `off_t`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/maps12.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/static/maps12.c b/test/zdtm/static/maps12.c
index b645595be..f0d6c2381 100644
--- a/test/zdtm/static/maps12.c
+++ b/test/zdtm/static/maps12.c
@@ -111,7 +111,8 @@ static inline void *mmap_pages(void *addr_hint, unsigned int count, bool filemap
 
 	map = mmap(addr_hint, count * PAGE_SIZE, PROT_WRITE | PROT_READ,
 		   MAP_PRIVATE | (filemap ? 0 : MAP_ANONYMOUS) | (addr_hint ? MAP_FIXED : 0),
-		   filemap ? fd : -1, filemap ? ((off_t)addr_hint - (off_t)map_base) : 0);
+		   filemap ? fd : -1,
+		   filemap ? (off_t)((intptr_t)addr_hint - (intptr_t)map_base) : 0);
 	if (map == MAP_FAILED || (addr_hint && (map != addr_hint)))
 		return MAP_FAILED;
 

From fa1b399064575be2aff7d3c6486f0503b0098038 Mon Sep 17 00:00:00 2001
From: Dong Sunchao <dongsunchao@gmail.com>
Date: Wed, 20 Aug 2025 12:38:18 +0000
Subject: [PATCH 1732/1854] zdtm/static/sock_opts00: use unix socket to test
 SO_PASSCRED and SO_PASSSEC

SO_PASSCRED and SO_PASSSEC are only valid for AF_UNIX and AF_NETLINK
This patch updates the test logic to use a unix socket for these options,
while preserving the original value consistency check

Fixes: #2705
Signed-off-by: Dong Sunchao <dongsunchao@gmail.com>
---
 test/zdtm/static/sock_opts00.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/zdtm/static/sock_opts00.c b/test/zdtm/static/sock_opts00.c
index fcf00ffed..854aaa591 100644
--- a/test/zdtm/static/sock_opts00.c
+++ b/test/zdtm/static/sock_opts00.c
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
 	static const int NOPTS = sizeof(vname) / sizeof(*vname);
 	#undef OPT
 
-	int sock, ret = 0, val[NOPTS], rval, i;
+	int sock, usock, sk, ret = 0, val[NOPTS], rval, i;
 	socklen_t len = sizeof(int);
 
 	test_init(argc, argv);
@@ -42,8 +42,15 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	usock = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (usock < 0) {
+		pr_perror("can't create unix socket");
+		return 1;
+	}
+
 	for (i = 0; i < NOPTS; i++) {
-		ret = getsockopt(sock, SOL_SOCKET, vname[i].opt, &val[i], &len);
+		sk = vname[i].opt == SO_PASSCRED || vname[i].opt == SO_PASSSEC ? usock : sock;
+		ret = getsockopt(sk, SOL_SOCKET, vname[i].opt, &val[i], &len);
 		if (ret) {
 			pr_perror("can't get %s", vname[i].name);
 			return 1;
@@ -51,13 +58,13 @@ int main(int argc, char **argv)
 
 		val[i]++;
 
-		ret = setsockopt(sock, SOL_SOCKET, vname[i].opt, &val[i], len);
+		ret = setsockopt(sk, SOL_SOCKET, vname[i].opt, &val[i], len);
 		if (ret) {
 			pr_perror("can't set %s = %d", vname[i].name, val[i]);
 			return 1;
 		}
 
-		ret = getsockopt(sock, SOL_SOCKET, vname[i].opt, &rval, &len);
+		ret = getsockopt(sk, SOL_SOCKET, vname[i].opt, &rval, &len);
 		if (ret) {
 			pr_perror("can't re-get %s", vname[i].name);
 			return 1;
@@ -78,7 +85,8 @@ int main(int argc, char **argv)
 	test_waitsig();
 
 	for (i = 0; i < NOPTS; i++) {
-		ret = getsockopt(sock, SOL_SOCKET, vname[i].opt, &rval, &len);
+		sk = vname[i].opt == SO_PASSCRED || vname[i].opt == SO_PASSSEC ? usock : sock;
+		ret = getsockopt(sk, SOL_SOCKET, vname[i].opt, &rval, &len);
 		if (ret) {
 			pr_perror("can't verify %s", vname[i].name);
 			return 1;
@@ -93,6 +101,7 @@ int main(int argc, char **argv)
 
 	pass();
 	close(sock);
+	close(usock);
 
 	return 0;
 }

From 4b73985955ecc01604d8ed1247605a5875042e4c Mon Sep 17 00:00:00 2001
From: Dong Sunchao <dongsunchao@gmail.com>
Date: Wed, 20 Aug 2025 12:38:37 +0000
Subject: [PATCH 1733/1854] criu/sockets: Restrict SO_PASSCRED and SO_PASSSEC
 to supported families

Linux 6.16+ restricts SO_PASSCRED and SO_PASSSEC to AF_UNIX, AF_NETLINK, and AF_BLUETOOTH
This patch updates CRIU to check the socket family before dumping these options

Fixes: #2705
Signed-off-by: Dong Sunchao <dongsunchao@gmail.com>
---
 criu/include/sockets.h |  2 +-
 criu/sk-inet.c         |  2 +-
 criu/sk-netlink.c      |  2 +-
 criu/sk-packet.c       |  2 +-
 criu/sk-unix.c         |  2 +-
 criu/sockets.c         | 16 +++++++++-------
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/criu/include/sockets.h b/criu/include/sockets.h
index c3e7c879a..6c81d3edd 100644
--- a/criu/include/sockets.h
+++ b/criu/include/sockets.h
@@ -25,7 +25,7 @@ struct socket_desc {
 };
 
 extern int dump_socket(struct fd_parms *p, int lfd, FdinfoEntry *);
-extern int dump_socket_opts(int sk, SkOptsEntry *soe);
+extern int dump_socket_opts(int sk, int family, SkOptsEntry *soe);
 extern int restore_socket_opts(int sk, SkOptsEntry *soe);
 extern int sk_setbufs(int sk, uint32_t *bufs);
 extern void release_skopts(SkOptsEntry *);
diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index 6e0acf2ce..422edc656 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -581,7 +581,7 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
 	if (dump_ip_opts(lfd, family, type, proto, &ipopts))
 		goto err;
 
-	if (dump_socket_opts(lfd, &skopts))
+	if (dump_socket_opts(lfd, family, &skopts))
 		goto err;
 
 	pr_info("Dumping inet socket at %d\n", p->fd);
diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index a219b69be..dc2baa1b8 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -165,7 +165,7 @@ static int dump_one_netlink_fd(int lfd, u32 id, const struct fd_parms *p)
 	ne.fown = (FownEntry *)&p->fown;
 	ne.opts = &skopts;
 
-	if (dump_socket_opts(lfd, &skopts))
+	if (dump_socket_opts(lfd, AF_NETLINK, &skopts))
 		goto err;
 
 	fe.type = FD_TYPES__NETLINKSK;
diff --git a/criu/sk-packet.c b/criu/sk-packet.c
index 1d2e23522..6530bff58 100644
--- a/criu/sk-packet.c
+++ b/criu/sk-packet.c
@@ -173,7 +173,7 @@ static int dump_one_packet_fd(int lfd, u32 id, const struct fd_parms *p)
 	psk.fown = (FownEntry *)&p->fown;
 	psk.opts = &skopts;
 
-	if (dump_socket_opts(lfd, &skopts))
+	if (dump_socket_opts(lfd, AF_PACKET, &skopts))
 		return -1;
 
 	psk.protocol = sd->proto;
diff --git a/criu/sk-unix.c b/criu/sk-unix.c
index 70ca16be4..6145fe734 100644
--- a/criu/sk-unix.c
+++ b/criu/sk-unix.c
@@ -527,7 +527,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
 			}
 	}
 dump:
-	if (dump_socket_opts(lfd, skopts))
+	if (dump_socket_opts(lfd, AF_UNIX, skopts))
 		goto err;
 
 	pr_info("Dumping unix socket at %d\n", p->fd);
diff --git a/criu/sockets.c b/criu/sockets.c
index 0affccad0..e4adae03c 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -649,7 +649,7 @@ int do_dump_opt(int sk, int level, int name, void *val, int len)
 	return 0;
 }
 
-int dump_socket_opts(int sk, SkOptsEntry *soe)
+int dump_socket_opts(int sk, int family, SkOptsEntry *soe)
 {
 	int ret = 0, val;
 	struct timeval tv;
@@ -688,13 +688,15 @@ int dump_socket_opts(int sk, SkOptsEntry *soe)
 	soe->so_reuseport = val ? true : false;
 	soe->has_so_reuseport = true;
 
-	ret |= dump_opt(sk, SOL_SOCKET, SO_PASSCRED, &val);
-	soe->has_so_passcred = true;
-	soe->so_passcred = val ? true : false;
+	if (family == AF_UNIX || family == AF_NETLINK) {
+		ret |= dump_opt(sk, SOL_SOCKET, SO_PASSCRED, &val);
+		soe->has_so_passcred = true;
+		soe->so_passcred = val ? true : false;
 
-	ret |= dump_opt(sk, SOL_SOCKET, SO_PASSSEC, &val);
-	soe->has_so_passsec = true;
-	soe->so_passsec = val ? true : false;
+		ret |= dump_opt(sk, SOL_SOCKET, SO_PASSSEC, &val);
+		soe->has_so_passsec = true;
+		soe->so_passsec = val ? true : false;
+	}
 
 	ret |= dump_opt(sk, SOL_SOCKET, SO_DONTROUTE, &val);
 	soe->has_so_dontroute = true;

From 254ba3e8cc60790eec2369e2fb9ca3702a3f7019 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 8 Sep 2025 12:48:34 -0700
Subject: [PATCH 1734/1854] ci: avoid Docker 28 due to regression

This change modifies the CI script to avoid Docker version 28, which has
a known regression that breaks Checkpoint/Restore (C/R) functionality.
The issue is tracked in the moby/moby project as
https://github.com/moby/moby/issues/50750.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 scripts/ci/docker-test.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index aaf443afd..ae7f52454 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -2,6 +2,24 @@
 
 set -x -e -o pipefail
 
+# Workaround: Docker 28.x has a known regression that breaks the checkpoint and
+# restore (C/R) feature. Let's install previous, or next major version. See
+# https://github.com/moby/moby/issues/50750 for details on the bug.
+export DEBIAN_FRONTEND=noninteractive
+apt remove -y docker-ce docker-ce-cli
+./apt-install -y ca-certificates curl
+install -m 0755 -d /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+chmod a+r /etc/apt/keyrings/docker.asc
+# shellcheck disable=SC1091
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" > /etc/apt/sources.list.d/docker.list
+apt update -y
+apt-cache madison docker-ce | awk '{ print $3 }'
+verstr="$(apt-cache madison docker-ce | awk '{ print $3 }' | sort | grep -v ':28\.'| tail -n 1)"
+./apt-install -y "docker-ce=$verstr" "docker-ce-cli=$verstr"
+
 # docker checkpoint and restore is an experimental feature
 echo '{ "experimental": true }' > /etc/docker/daemon.json
 service docker restart

From a779417a3fa59e55209c50a1a0c40f48a1c456ee Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 14 Sep 2025 19:29:16 -0700
Subject: [PATCH 1735/1854] zdtm: stop importing junit_xml

We are dropping support for generating JUnit XML reports in zdtm.py as we've
migrated testing infrastructure entirely to `GitHub Actions` and other
third-party test runners.

This package has been removed from some distribution repositories (e.g.,
Fedora), making it simpler to remove the dependency than to force installation
via pip.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 .cirrus.yml                               |  2 +-
 scripts/build/Dockerfile.alpine           |  2 --
 scripts/build/Dockerfile.archlinux        |  1 -
 scripts/build/Dockerfile.centos8          |  2 --
 scripts/ci/prepare-for-fedora-rawhide.sh  |  1 -
 scripts/ci/run-ci-tests.sh                |  2 +-
 scripts/ci/vagrant.sh                     |  2 +-
 test/jenkins/criu-lazy-migration.pipeline |  1 -
 test/zdtm.py                              | 24 +----------------------
 9 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index bddd5a3f1..848e14132 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -34,7 +34,7 @@ task:
   setup_script: |
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python-junit_xml python3-importlib-metadata xmlto libdrm-devel libuuid-devel
+    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python3-importlib-metadata xmlto libdrm-devel libuuid-devel
     # The image has a too old version of nettle which does not work with gnutls.
     # Just upgrade to the latest to make the error go away.
     dnf -y upgrade nettle nettle-devel
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index d843793ea..819fda0c3 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -48,6 +48,4 @@ RUN apk add \
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
 
-RUN pip3 install junit_xml --break-system-packages
-
 RUN make -C test/zdtm
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index 9d11194bb..d4b432f8d 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -32,7 +32,6 @@ RUN pacman -Syu --noconfirm \
 	go \
 	python-yaml \
 	asciidoctor \
-	python-junit-xml \
 	python-importlib-metadata \
 	libdrm \
 	util-linux-libs \
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
index a67212344..5ab6c9cfa 100644
--- a/scripts/build/Dockerfile.centos8
+++ b/scripts/build/Dockerfile.centos8
@@ -45,6 +45,4 @@ RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 test
 
-RUN pip3 install junit_xml
-
 RUN make -C test/zdtm -j $(nproc)
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index f8ad9cf97..f8f797c1e 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -26,7 +26,6 @@ dnf install -y \
 	protobuf-devel \
 	python3-PyYAML \
 	python3-protobuf \
-	python3-junit_xml \
 	python3-pip \
 	python3-importlib-metadata \
 	python-unversioned-command \
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 0c4a08975..617f54fc6 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -6,7 +6,7 @@ CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
 		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
 		libnl-route-3-dev time libbsd-dev python3-yaml uuid-dev
 		libperl-dev pkg-config python3-protobuf python3-pip
-		python3-importlib-metadata python3-junit.xml libdrm-dev)
+		python3-importlib-metadata libdrm-dev)
 
 X86_64_PKGS=(gcc-multilib)
 
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index 98942e756..c222e30e0 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -44,7 +44,7 @@ setup() {
 	ssh default sudo dnf upgrade -y
 	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
 		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
-		protobuf-devel python3-protobuf python3-importlib-metadata python3-junit_xml \
+		protobuf-devel python3-protobuf python3-importlib-metadata \
 		rubygem-asciidoctor iptables libselinux-devel libbpf-devel python3-yaml libuuid-devel
 
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
diff --git a/test/jenkins/criu-lazy-migration.pipeline b/test/jenkins/criu-lazy-migration.pipeline
index 2c863f170..45dc2c776 100644
--- a/test/jenkins/criu-lazy-migration.pipeline
+++ b/test/jenkins/criu-lazy-migration.pipeline
@@ -21,7 +21,6 @@ pipeline {
 		stage('Test'){
 			steps {
 				sh './test/jenkins/run_ct sh -c "mount --make-rprivate / && mount --rbind . /mnt && cd /mnt && ./test/jenkins/criu-lazy-migration.sh"'
-				junit 'test/report/criu-testreport*.xml'
 			}
 		}
 	}
diff --git a/test/zdtm.py b/test/zdtm.py
index 3339dd816..7e83aa4df 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2078,8 +2078,6 @@ class Launcher:
         self.__subs = {}
         self.__fail = False
         self.__file_report = None
-        self.__junit_file = None
-        self.__junit_test_cases = None
         self.__failed = []
         self.__nr_skip = 0
         if self.__max > 1 and self.__total > 1:
@@ -2091,22 +2089,14 @@ class Launcher:
 
         if opts['report'] and (opts['keep_going'] or self.__total == 1):
             global TestSuite, TestCase
-            from junit_xml import TestCase, TestSuite
             now = datetime.datetime.now()
             att = 0
             reportname = os.path.join(report_dir, "criu-testreport.tap")
-            junitreport = os.path.join(report_dir, "criu-testreport.xml")
-            while os.access(reportname, os.F_OK) or os.access(
-                    junitreport, os.F_OK):
+            while os.access(reportname, os.F_OK):
                 reportname = os.path.join(report_dir,
                                           "criu-testreport" + ".%d.tap" % att)
-                junitreport = os.path.join(report_dir,
-                                           "criu-testreport" + ".%d.xml" % att)
                 att += 1
 
-            self.__junit_file = open(junitreport, 'a')
-            self.__junit_test_cases = []
-
             self.__file_report = open(reportname, 'a')
             print(u"TAP version 13", file=self.__file_report)
             print(u"# Hardware architecture: " + arch, file=self.__file_report)
@@ -2141,10 +2131,6 @@ class Launcher:
         self.__runtest += 1
         self.__nr_skip += 1
 
-        if self.__junit_test_cases is not None:
-            tc = TestCase(name)
-            tc.add_skipped_info(reason)
-            self.__junit_test_cases.append(tc)
         if self.__file_report:
             testline = u"ok %d - %s # SKIP %s" % (self.__runtest, name, reason)
             print(testline, file=self.__file_report)
@@ -2247,10 +2233,6 @@ class Launcher:
             # It's useful for taming warnings in subprocess.Popen.__del__()
             sub['sub'].wait()
             tc = None
-            if self.__junit_test_cases is not None:
-                tc = TestCase(sub['name'],
-                              elapsed_sec=time.time() - sub['start'])
-                self.__junit_test_cases.append(tc)
             if status != 0:
                 self.__fail = True
                 failed_flavor = decode_flav(os.WEXITSTATUS(status))
@@ -2307,10 +2289,6 @@ class Launcher:
         if not opts['fault'] and check_core_files():
             self.__fail = True
         if self.__file_report:
-            ts = TestSuite(opts['title'], self.__junit_test_cases,
-                           os.getenv("NODE_NAME"))
-            self.__junit_file.write(TestSuite.to_xml_string([ts]))
-            self.__junit_file.close()
             self.__file_report.close()
 
         if opts['keep_going']:

From 053a22a23bf05c91223d48dc609defa641354a87 Mon Sep 17 00:00:00 2001
From: Lorenzo Fontana <fontanalorenz@gmail.com>
Date: Thu, 18 Sep 2025 10:01:48 +0200
Subject: [PATCH 1736/1854] pagemap: prevent integer overflow in pagemap_len

Fixes #2738

Original-patch-by: Andrey Vagin <avagin@google.com>
Signed-off-by: Lorenzo Fontana <fontanalorenz@gmail.com>
---
 criu/include/pagemap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index 3ae15deb9..fae110108 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -121,7 +121,7 @@ extern int dedup_one_iovec(struct page_read *pr, unsigned long base, unsigned lo
 
 static inline unsigned long pagemap_len(PagemapEntry *pe)
 {
-	return pe->nr_pages * PAGE_SIZE;
+	return (unsigned long)pe->nr_pages * PAGE_SIZE;
 }
 
 static inline bool page_read_has_parent(struct page_read *pr)

From 80c280610e43fc78e1479ad681bc22e69b4b5287 Mon Sep 17 00:00:00 2001
From: dong sunchao <dongsunchao@gmail.com>
Date: Thu, 18 Sep 2025 03:09:30 +1000
Subject: [PATCH 1737/1854] compel/mips: Relax ELF magic check to support MIPS
 libraries

On MIPS platforms, shared libraries may use EI_ABIVERSION = 5 to indicate
support for .MIPS.xhash sections. The previous ELF header check in
handle_binary() strictly compared e_ident against a hardcoded value,
causing legitimate shared objects to be rejected.

This patch replaces the memcmp-based check with a structured validation
of ELF magic and class, and allows EI_ABIVERSION values beside 0.

fixes: #2745
Signed-off-by: dong sunchao <dongsunchao@gmail.com>
---
 compel/arch/mips/src/lib/handle-elf.c | 31 +++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/compel/arch/mips/src/lib/handle-elf.c b/compel/arch/mips/src/lib/handle-elf.c
index a605a5a45..e086761c2 100644
--- a/compel/arch/mips/src/lib/handle-elf.c
+++ b/compel/arch/mips/src/lib/handle-elf.c
@@ -5,18 +5,31 @@
 #include "piegen.h"
 #include "log.h"
 
-static const unsigned char __maybe_unused elf_ident_64_le[EI_NIDENT] = {
-	0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00, /* clang-format */
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
 extern int __handle_elf(void *mem, size_t size);
 
 int handle_binary(void *mem, size_t size)
 {
-	if (memcmp(mem, elf_ident_64_le, sizeof(elf_ident_64_le)) == 0)
-		return __handle_elf(mem, size);
+	Elf64_Ehdr *ehdr = (Elf64_Ehdr *)mem;
 
-	pr_err("Unsupported Elf format detected\n");
-	return -EINVAL;
+	/* check ELF magic */
+	if (ehdr->e_ident[EI_MAG0] != ELFMAG0 ||
+	    ehdr->e_ident[EI_MAG1] != ELFMAG1 ||
+	    ehdr->e_ident[EI_MAG2] != ELFMAG2 ||
+	    ehdr->e_ident[EI_MAG3] != ELFMAG3) {
+		pr_err("Invalid ELF magic\n");
+		return -EINVAL;
+	}
+
+	/* check ELF class and data encoding */
+	if (ehdr->e_ident[EI_CLASS] != ELFCLASS64 ||
+	    ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
+		pr_err("Unsupported ELF class or data encoding\n");
+		return -EINVAL;
+	}
+
+	if (ehdr->e_ident[EI_ABIVERSION] != 0) {
+		pr_warn("Unusual ABI version: %d\n", ehdr->e_ident[EI_ABIVERSION]);
+	}
+
+	return __handle_elf(mem, size);
 }

From a8c5e11715673926f95ecaebd6e805c2d311636b Mon Sep 17 00:00:00 2001
From: Filip Hejsek <filip.hejsek@gmail.com>
Date: Sat, 13 Sep 2025 19:49:24 +0200
Subject: [PATCH 1738/1854] lsm: use attr/apparmor/current to get apparmor
 label

On some kernels, attr/current can be intercepted by BPF LSM, causing
errors (#2033). Using attr/apparmor/current is preferable, because it
is guaranteed to return the apparmor label. attr/current will still be
used as a fallback for older kernels.

Fixes: #2033

Signed-off-by: Filip Hejsek <filip.hejsek@gmail.com>
---
 criu/lsm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/criu/lsm.c b/criu/lsm.c
index 70b66d42e..5faf3e5b2 100644
--- a/criu/lsm.c
+++ b/criu/lsm.c
@@ -29,7 +29,9 @@ static int apparmor_get_label(pid_t pid, char **profile_name)
 	FILE *f;
 	char *space;
 
-	f = fopen_proc(pid, "attr/current");
+	f = fopen_proc(pid, "attr/apparmor/current");
+	if (!f)
+		f = fopen_proc(pid, "attr/current");
 	if (!f)
 		return -1;
 

From c7395f4cbedc5cf0dd86a2c7aa12e58e33ffc2f4 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 14 Sep 2025 18:44:51 -0700
Subject: [PATCH 1739/1854] files: fork helpers without CLONE_FILES | CLONE_FS

On restore, CRIU needs to change mount namespaces to properly restore
files and unix sockets. However, the kernel prevents this if a process
is sharing its file system information (fs) with other processes.

Fixes #2687

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/files.c  | 1 -
 criu/pstree.c | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/criu/files.c b/criu/files.c
index f16ec32a2..af4b8aeac 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1329,7 +1329,6 @@ int prepare_fds(struct pstree_item *me)
 		}
 	}
 
-	BUG_ON(current->pid->state == TASK_HELPER);
 	ret = open_fdinfos(me);
 
 	if (rsti(me)->fdt)
diff --git a/criu/pstree.c b/criu/pstree.c
index 75c2fc8d0..cee8b5741 100644
--- a/criu/pstree.c
+++ b/criu/pstree.c
@@ -237,9 +237,8 @@ int init_pstree_helper(struct pstree_item *ret)
 {
 	BUG_ON(!ret->parent);
 	ret->pid->state = TASK_HELPER;
-	rsti(ret)->clone_flags = CLONE_FILES | CLONE_FS;
-	if (shared_fdt_prepare(ret) < 0)
-		return -1;
+	rsti(ret)->clone_flags = 0;
+	INIT_LIST_HEAD(&rsti(ret)->fds);
 	task_entries->nr_helpers++;
 	return 0;
 }

From afb2e6c3f95dd0b15f739d9669bd7eaf120a2f31 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 18 Sep 2025 14:48:42 +0000
Subject: [PATCH 1740/1854] pagemap: change PagemapEntry.nr_pages to uint64 to
 support huge mappings

Update the nr_pages field in PagemapEntry to uint64 to prepare for
checkpointing and restoring huge memory mappings.

Backward compatibility with older pagemap images is preserved.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/pagemap.h | 2 +-
 criu/page-xfer.c       | 1 +
 criu/pagemap.c         | 5 ++++-
 images/pagemap.proto   | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index fae110108..3ae15deb9 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -121,7 +121,7 @@ extern int dedup_one_iovec(struct page_read *pr, unsigned long base, unsigned lo
 
 static inline unsigned long pagemap_len(PagemapEntry *pe)
 {
-	return (unsigned long)pe->nr_pages * PAGE_SIZE;
+	return pe->nr_pages * PAGE_SIZE;
 }
 
 static inline bool page_read_has_parent(struct page_read *pr)
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 0314963e6..b0e04d82c 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -326,6 +326,7 @@ static int write_pagemap_loc(struct page_xfer *xfer, struct iovec *iov, u32 flag
 	pe.nr_pages = iov->iov_len / PAGE_SIZE;
 	pe.has_flags = true;
 	pe.flags = flags;
+	pe.has_nr_pages = true;
 
 	if (flags & PE_PRESENT) {
 		if (opts.auto_dedup && xfer->parent != NULL) {
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 85bb92259..d9ccc03eb 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -171,7 +171,7 @@ static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
 static inline void pagemap_bound_check(PagemapEntry *pe, unsigned long vaddr, int nr)
 {
 	if (vaddr < pe->vaddr || (vaddr - pe->vaddr) / PAGE_SIZE + nr > pe->nr_pages) {
-		pr_err("Page read err %" PRIx64 ":%u vs %lx:%u\n", pe->vaddr, pe->nr_pages, vaddr, nr);
+		pr_err("Page read err %" PRIx64 ":%lu vs %lx:%u\n", pe->vaddr, pe->nr_pages, vaddr, nr);
 		BUG();
 	}
 }
@@ -682,6 +682,9 @@ static void init_compat_pagemap_entry(PagemapEntry *pe)
 		pe->flags |= PE_PARENT;
 	else if (!pe->has_flags)
 		pe->flags = PE_PRESENT;
+
+	if (!pe->has_nr_pages)
+		pe->nr_pages = pe->compat_nr_pages;
 }
 
 /*
diff --git a/images/pagemap.proto b/images/pagemap.proto
index e6d341b0f..f2436a51a 100644
--- a/images/pagemap.proto
+++ b/images/pagemap.proto
@@ -10,7 +10,8 @@ message pagemap_head {
 
 message pagemap_entry {
 	required uint64 vaddr		= 1 [(criu).hex = true];
-	required uint32 nr_pages	= 2;
+	required uint32 compat_nr_pages	= 2;
 	optional bool	in_parent	= 3;
 	optional uint32	flags		= 4 [(criu).flags = "pmap.flags" ];
+	optional uint64 nr_pages = 5;
 }

From 7e0da4d9757e67d8bd0ee8441a581483ad97b12e Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Thu, 18 Sep 2025 15:20:32 +0000
Subject: [PATCH 1741/1854] pagemap: use unsigned long for page counts

Variables storing page counts were previously `unsigned int`, limiting
them to a maximum of 2^32 pages. With a 4k page size, this corresponds
to a 16TB memory mapping, which is insufficient for larger mappings.

This commit changes the type for these variables to `unsigned long` to
support larger memory mappings.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/include/page-pipe.h |  6 +++---
 criu/include/page-xfer.h |  6 +++---
 criu/include/pagemap.h   |  6 +++---
 criu/include/parasite.h  |  2 +-
 criu/mem.c               |  2 +-
 criu/page-pipe.c         |  6 +++---
 criu/page-xfer.c         | 20 ++++++++++----------
 criu/pagemap.c           | 22 +++++++++++-----------
 criu/pie/parasite.c      |  2 +-
 criu/uffd.c              | 25 ++++++++++++-------------
 10 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/criu/include/page-pipe.h b/criu/include/page-pipe.h
index 15178c015..65292b7ab 100644
--- a/criu/include/page-pipe.h
+++ b/criu/include/page-pipe.h
@@ -92,9 +92,9 @@ struct kernel_pipe_buffer {
 struct page_pipe_buf {
 	int p[2];		/* pipe with pages */
 	unsigned int pipe_size; /* how many pages can be fit into pipe */
-	unsigned int pipe_off;	/* where this buf is started in a pipe */
-	unsigned int pages_in;	/* how many pages are there */
 	unsigned int nr_segs;	/* how many iov-s are busy */
+	unsigned long pipe_off;	/* where this buf is started in a pipe */
+	unsigned long pages_in;	/* how many pages are there */
 #define PPB_LAZY (1 << 0)
 	unsigned int flags;
 	struct iovec *iov;  /* vaddr:len map */
@@ -149,7 +149,7 @@ struct pipe_read_dest {
 };
 
 extern int pipe_read_dest_init(struct pipe_read_dest *prd);
-extern int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned long addr, unsigned int *nr_pages,
+extern int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned long addr, unsigned long *nr_pages,
 			  unsigned int ppb_flags);
 
 #endif /* __CR_PAGE_PIPE_H__ */
diff --git a/criu/include/page-xfer.h b/criu/include/page-xfer.h
index 36fe67092..0d9b35019 100644
--- a/criu/include/page-xfer.h
+++ b/criu/include/page-xfer.h
@@ -69,9 +69,9 @@ extern int check_parent_page_xfer(int fd_type, unsigned long id);
  */
 
 /* async request/receive of remote pages */
-extern int request_remote_pages(unsigned long img_id, unsigned long addr, int nr_pages);
+extern int request_remote_pages(unsigned long img_id, unsigned long addr, unsigned long nr_pages);
 
-typedef int (*ps_async_read_complete)(unsigned long img_id, unsigned long vaddr, int nr_pages, void *);
-extern int page_server_start_read(void *buf, int nr_pages, ps_async_read_complete complete, void *priv, unsigned flags);
+typedef int (*ps_async_read_complete)(unsigned long img_id, unsigned long vaddr, unsigned long nr_pages, void *);
+extern int page_server_start_read(void *buf, unsigned long nr_pages, ps_async_read_complete complete, void *priv, unsigned flags);
 
 #endif /* __CR_PAGE_XFER__H__ */
diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index 3ae15deb9..4cbc87cc6 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -44,7 +44,7 @@
 
 struct page_read {
 	/* reads page from current pagemap */
-	int (*read_pages)(struct page_read *, unsigned long vaddr, int nr, void *, unsigned flags);
+	int (*read_pages)(struct page_read *, unsigned long vaddr, unsigned long nr, void *, unsigned flags);
 	/* Advance page_read to the next entry */
 	int (*advance)(struct page_read *pr);
 	void (*close)(struct page_read *);
@@ -52,8 +52,8 @@ struct page_read {
 	int (*sync)(struct page_read *pr);
 	int (*seek_pagemap)(struct page_read *pr, unsigned long vaddr);
 	void (*reset)(struct page_read *pr);
-	int (*io_complete)(struct page_read *, unsigned long vaddr, int nr);
-	int (*maybe_read_page)(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags);
+	int (*io_complete)(struct page_read *, unsigned long vaddr, unsigned long nr);
+	int (*maybe_read_page)(struct page_read *pr, unsigned long vaddr, unsigned long nr, void *buf, unsigned flags);
 
 	/* Whether or not pages can be read in PIE code */
 	bool pieok;
diff --git a/criu/include/parasite.h b/criu/include/parasite.h
index b33d6710f..176357711 100644
--- a/criu/include/parasite.h
+++ b/criu/include/parasite.h
@@ -63,7 +63,7 @@ struct parasite_dump_pages_args {
 	unsigned int add_prot;
 	unsigned int off;
 	unsigned int nr_segs;
-	unsigned int nr_pages;
+	unsigned long nr_pages;
 };
 
 static inline struct parasite_vma_entry *pargs_vmas(struct parasite_dump_pages_args *a)
diff --git a/criu/mem.c b/criu/mem.c
index 0636273cb..f8c550842 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -336,7 +336,7 @@ static int drain_pages(struct page_pipe *pp, struct parasite_ctl *ctl, struct pa
 	list_for_each_entry(ppb, &pp->bufs, l) {
 		args->nr_segs = ppb->nr_segs;
 		args->nr_pages = ppb->pages_in;
-		pr_debug("PPB: %d pages %d segs %u pipe %d off\n", args->nr_pages, args->nr_segs, ppb->pipe_size,
+		pr_debug("PPB: %ld pages %d segs %u pipe %d off\n", args->nr_pages, args->nr_segs, ppb->pipe_size,
 			 args->off);
 
 		ret = compel_rpc_call(PARASITE_CMD_DUMPPAGES, ctl);
diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index aab6742be..f8e3520f7 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -381,7 +381,7 @@ int pipe_read_dest_init(struct pipe_read_dest *prd)
 	return 0;
 }
 
-int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned long addr, unsigned int *nr_pages,
+int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned long addr, unsigned long int *nr_pages,
 		   unsigned int ppb_flags)
 {
 	struct page_pipe_buf *ppb;
@@ -406,7 +406,7 @@ int page_pipe_read(struct page_pipe *pp, struct pipe_read_dest *prd, unsigned lo
 	}
 
 	/* clamp the request if it passes the end of iovec */
-	len = min((unsigned long)iov->iov_base + iov->iov_len - addr, (unsigned long)(*nr_pages) * PAGE_SIZE);
+	len = min((unsigned long)iov->iov_base + iov->iov_len - addr, *nr_pages * PAGE_SIZE);
 	*nr_pages = len / PAGE_SIZE;
 
 	skip += ppb->pipe_off * PAGE_SIZE;
@@ -446,7 +446,7 @@ void debug_show_page_pipe(struct page_pipe *pp)
 	pr_debug("Page pipe:\n");
 	pr_debug("* %u pipes %u/%u iovs:\n", pp->nr_pipes, pp->free_iov, pp->nr_iovs);
 	list_for_each_entry(ppb, &pp->bufs, l) {
-		pr_debug("\tbuf %u pages, %u iovs, flags: %x pipe_off: %x :\n", ppb->pages_in, ppb->nr_segs, ppb->flags,
+		pr_debug("\tbuf %lu pages, %u iovs, flags: %x pipe_off: %lx :\n", ppb->pages_in, ppb->nr_segs, ppb->flags,
 			 ppb->pipe_off);
 		for (i = 0; i < ppb->nr_segs; i++) {
 			iov = &ppb->iov[i];
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index b0e04d82c..4d057163d 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -32,7 +32,7 @@ static int page_server_sk = -1;
 
 struct page_server_iov {
 	u32 cmd;
-	u32 nr_pages;
+	u64 nr_pages;
 	u64 vaddr;
 	u64 dst_id;
 };
@@ -886,7 +886,7 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp)
 	list_for_each_entry(ppb, &pp->bufs, l) {
 		unsigned int i;
 
-		pr_debug("\tbuf %d/%d\n", ppb->pages_in, ppb->nr_segs);
+		pr_debug("\tbuf %ld/%d\n", ppb->pages_in, ppb->nr_segs);
 
 		for (i = 0; i < ppb->nr_segs; i++) {
 			struct iovec iov = ppb->iov[i];
@@ -1071,7 +1071,7 @@ static int page_server_add(int sk, struct page_server_iov *pi, u32 flags)
 	struct page_xfer *lxfer = &cxfer.loc_xfer;
 	struct iovec iov;
 
-	pr_debug("Adding %" PRIx64 "/%u\n", pi->vaddr, pi->nr_pages);
+	pr_debug("Adding %" PRIx64 "/%lu\n", pi->vaddr, pi->nr_pages);
 
 	if (prep_loc_xfer(pi))
 		return -1;
@@ -1348,7 +1348,7 @@ static int fill_page_pipe(struct page_read *pr, struct page_pipe *pp)
 static int page_pipe_from_pagemap(struct page_pipe **pp, int pid)
 {
 	struct page_read pr;
-	int nr_pages = 0;
+	unsigned long nr_pages = 0;
 
 	if (open_page_read(pid, &pr, PR_TASK) <= 0) {
 		pr_err("Failed to open page read for %d\n", pid);
@@ -1551,13 +1551,13 @@ struct ps_async_read {
 
 static LIST_HEAD(async_reads);
 
-static inline void async_read_set_goal(struct ps_async_read *ar, int nr_pages)
+static inline void async_read_set_goal(struct ps_async_read *ar, unsigned long nr_pages)
 {
 	ar->goal = sizeof(ar->pi) + nr_pages * PAGE_SIZE;
 	ar->nr_pages = nr_pages;
 }
 
-static void init_ps_async_read(struct ps_async_read *ar, void *buf, int nr_pages, ps_async_read_complete complete,
+static void init_ps_async_read(struct ps_async_read *ar, void *buf, unsigned long nr_pages, ps_async_read_complete complete,
 			       void *priv)
 {
 	ar->pages = buf;
@@ -1567,7 +1567,7 @@ static void init_ps_async_read(struct ps_async_read *ar, void *buf, int nr_pages
 	async_read_set_goal(ar, nr_pages);
 }
 
-static int page_server_start_async_read(void *buf, int nr_pages, ps_async_read_complete complete, void *priv)
+static int page_server_start_async_read(void *buf, unsigned long nr_pages, ps_async_read_complete complete, void *priv)
 {
 	struct ps_async_read *ar;
 
@@ -1667,7 +1667,7 @@ int connect_to_page_server_to_recv(int epfd)
 	return epoll_add_rfd(epfd, &ps_rfd);
 }
 
-int request_remote_pages(unsigned long img_id, unsigned long addr, int nr_pages)
+int request_remote_pages(unsigned long img_id, unsigned long addr, unsigned long nr_pages)
 {
 	struct page_server_iov pi = {
 		.cmd = PS_IOV_GET,
@@ -1684,7 +1684,7 @@ int request_remote_pages(unsigned long img_id, unsigned long addr, int nr_pages)
 	return 0;
 }
 
-static int page_server_start_sync_read(void *buf, int nr, ps_async_read_complete complete, void *priv)
+static int page_server_start_sync_read(void *buf, unsigned long nr, ps_async_read_complete complete, void *priv)
 {
 	struct ps_async_read ar;
 	int ret = 1;
@@ -1695,7 +1695,7 @@ static int page_server_start_sync_read(void *buf, int nr, ps_async_read_complete
 	return ret;
 }
 
-int page_server_start_read(void *buf, int nr, ps_async_read_complete complete, void *priv, unsigned flags)
+int page_server_start_read(void *buf, unsigned long nr, ps_async_read_complete complete, void *priv, unsigned flags)
 {
 	if (flags & PR_ASYNC)
 		return page_server_start_async_read(buf, nr, complete, priv);
diff --git a/criu/pagemap.c b/criu/pagemap.c
index d9ccc03eb..16d680fdb 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -168,15 +168,15 @@ static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
 	return 0;
 }
 
-static inline void pagemap_bound_check(PagemapEntry *pe, unsigned long vaddr, int nr)
+static inline void pagemap_bound_check(PagemapEntry *pe, unsigned long vaddr, unsigned long int nr)
 {
 	if (vaddr < pe->vaddr || (vaddr - pe->vaddr) / PAGE_SIZE + nr > pe->nr_pages) {
-		pr_err("Page read err %" PRIx64 ":%lu vs %lx:%u\n", pe->vaddr, pe->nr_pages, vaddr, nr);
+		pr_err("Page read err %" PRIx64 ":%lu vs %lx:%lu\n", pe->vaddr, pe->nr_pages, vaddr, nr);
 		BUG();
 	}
 }
 
-static int read_parent_page(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
+static int read_parent_page(struct page_read *pr, unsigned long vaddr, unsigned long int nr, void *buf, unsigned flags)
 {
 	struct page_read *ppr = pr->parent;
 	int ret;
@@ -195,7 +195,7 @@ static int read_parent_page(struct page_read *pr, unsigned long vaddr, int nr, v
 	 */
 
 	do {
-		int p_nr;
+		unsigned long int p_nr;
 
 		pr_debug("\tpr%lu-%u Read from parent\n", pr->img_id, pr->id);
 		ret = ppr->seek_pagemap(ppr, vaddr);
@@ -210,7 +210,7 @@ static int read_parent_page(struct page_read *pr, unsigned long vaddr, int nr, v
 		 * read as much as we can.
 		 */
 		p_nr = ppr->pe->nr_pages - (vaddr - ppr->pe->vaddr) / PAGE_SIZE;
-		pr_info("\tparent has %u pages in\n", p_nr);
+		pr_info("\tparent has %lu pages in\n", p_nr);
 		if (p_nr > nr)
 			p_nr = nr;
 
@@ -374,7 +374,7 @@ int pagemap_enqueue_iovec(struct page_read *pr, void *buf, unsigned long len, st
 	return 0;
 }
 
-static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
+static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr, unsigned long nr, void *buf, unsigned flags)
 {
 	int ret;
 	unsigned long len = nr * PAGE_SIZE;
@@ -402,7 +402,7 @@ static int maybe_read_page_local(struct page_read *pr, unsigned long vaddr, int
  * We cannot use maybe_read_page_local() for streaming images as it uses
  * pread(), seeking in the file. Instead, we use this custom page reader.
  */
-static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
+static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vaddr, unsigned long nr, void *buf, unsigned flags)
 {
 	unsigned long len = nr * PAGE_SIZE;
 	int fd;
@@ -445,7 +445,7 @@ static int maybe_read_page_img_streamer(struct page_read *pr, unsigned long vadd
 	return ret;
 }
 
-static int read_page_complete(unsigned long img_id, unsigned long vaddr, int nr_pages, void *priv)
+static int read_page_complete(unsigned long img_id, unsigned long vaddr, unsigned long int nr_pages, void *priv)
 {
 	int ret = 0;
 	struct page_read *pr = priv;
@@ -463,7 +463,7 @@ static int read_page_complete(unsigned long img_id, unsigned long vaddr, int nr_
 	return ret;
 }
 
-static int maybe_read_page_remote(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
+static int maybe_read_page_remote(struct page_read *pr, unsigned long vaddr, unsigned long nr, void *buf, unsigned flags)
 {
 	int ret;
 
@@ -474,9 +474,9 @@ static int maybe_read_page_remote(struct page_read *pr, unsigned long vaddr, int
 	return ret;
 }
 
-static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, int nr, void *buf, unsigned flags)
+static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, unsigned long nr, void *buf, unsigned flags)
 {
-	pr_info("pr%lu-%u Read %lx %u pages\n", pr->img_id, pr->id, vaddr, nr);
+	pr_info("pr%lu-%u Read %lx %lu pages\n", pr->img_id, pr->id, vaddr, nr);
 	pagemap_bound_check(pr->pe, vaddr, nr);
 
 	if (pagemap_in_parent(pr->pe)) {
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 1bc03dc2a..c966e9e62 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -101,7 +101,7 @@ static int dump_pages(struct parasite_dump_pages_args *args)
 	}
 	if (spliced_bytes != args->nr_pages * PAGE_SIZE) {
 		sys_close(p);
-		pr_err("Can't splice all pages to pipe (%ld/%d)\n", spliced_bytes, args->nr_pages);
+		pr_err("Can't splice all pages to pipe (%ld/%ld)\n", spliced_bytes, args->nr_pages);
 		return -1;
 	}
 
diff --git a/criu/uffd.c b/criu/uffd.c
index 98c2b7e07..8e12dcd63 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -668,12 +668,11 @@ static int remap_iovs(struct lazy_pages_info *lpi, unsigned long from, unsigned
  */
 static int collect_iovs(struct lazy_pages_info *lpi)
 {
+	unsigned long start, end, len, nr_pages = 0;
+	int n_vma = 0, max_iov_len = 0, ret = -1;
 	struct page_read *pr = &lpi->pr;
 	struct lazy_iov *iov;
 	MmEntry *mm;
-	int nr_pages = 0, n_vma = 0, max_iov_len = 0;
-	int ret = -1;
-	unsigned long start, end, len;
 
 	mm = init_mm_entry(lpi);
 	if (!mm)
@@ -728,7 +727,7 @@ free_mm:
 	return ret;
 }
 
-static int uffd_io_complete(struct page_read *pr, unsigned long vaddr, int nr);
+static int uffd_io_complete(struct page_read *pr, unsigned long vaddr, unsigned long nr);
 
 static int ud_open(int client, struct lazy_pages_info **_lpi)
 {
@@ -822,7 +821,7 @@ static bool uffd_recoverable_error(int mcopy_rc)
 	return false;
 }
 
-static int uffd_check_op_error(struct lazy_pages_info *lpi, const char *op, int *nr_pages, long mcopy_rc)
+static int uffd_check_op_error(struct lazy_pages_info *lpi, const char *op, unsigned long *nr_pages, long mcopy_rc)
 {
 	if (errno == ENOSPC || errno == ESRCH) {
 		handle_exit(lpi);
@@ -844,7 +843,7 @@ static int uffd_check_op_error(struct lazy_pages_info *lpi, const char *op, int
 	return 0;
 }
 
-static int uffd_copy(struct lazy_pages_info *lpi, __u64 address, int *nr_pages)
+static int uffd_copy(struct lazy_pages_info *lpi, __u64 address, unsigned long *nr_pages)
 {
 	struct uffdio_copy uffdio_copy;
 	unsigned long len = *nr_pages * page_size();
@@ -865,12 +864,12 @@ static int uffd_copy(struct lazy_pages_info *lpi, __u64 address, int *nr_pages)
 	return 0;
 }
 
-static int uffd_io_complete(struct page_read *pr, unsigned long img_addr, int nr)
+static int uffd_io_complete(struct page_read *pr, unsigned long img_addr, unsigned long nr)
 {
 	struct lazy_pages_info *lpi;
-	unsigned long addr = 0;
-	int req_pages, ret;
+	unsigned long addr = 0, req_pages;
 	struct lazy_iov *req;
+	int ret;
 
 	lpi = container_of(pr, struct lazy_pages_info, pr);
 
@@ -920,7 +919,7 @@ static int uffd_io_complete(struct page_read *pr, unsigned long img_addr, int nr
 	return drop_iovs(lpi, addr, nr * PAGE_SIZE);
 }
 
-static int uffd_zero(struct lazy_pages_info *lpi, __u64 address, int nr_pages)
+static int uffd_zero(struct lazy_pages_info *lpi, __u64 address, unsigned long nr_pages)
 {
 	struct uffdio_zeropage uffdio_zeropage;
 	unsigned long len = page_size() * nr_pages;
@@ -946,7 +945,7 @@ static int uffd_zero(struct lazy_pages_info *lpi, __u64 address, int nr_pages)
  * Returns 0 for zero pages, 1 for "real" pages and negative value on
  * error
  */
-static int uffd_seek_pages(struct lazy_pages_info *lpi, __u64 address, int nr)
+static int uffd_seek_pages(struct lazy_pages_info *lpi, __u64 address, unsigned long nr)
 {
 	int ret;
 
@@ -961,7 +960,7 @@ static int uffd_seek_pages(struct lazy_pages_info *lpi, __u64 address, int nr)
 	return 0;
 }
 
-static int uffd_handle_pages(struct lazy_pages_info *lpi, __u64 address, int nr, unsigned flags)
+static int uffd_handle_pages(struct lazy_pages_info *lpi, __u64 address, unsigned long nr, unsigned flags)
 {
 	int ret;
 
@@ -1003,7 +1002,7 @@ static void update_xfer_len(struct lazy_pages_info *lpi, bool pf)
 static int xfer_pages(struct lazy_pages_info *lpi)
 {
 	struct lazy_iov *iov;
-	unsigned int nr_pages;
+	unsigned long nr_pages;
 	unsigned long len;
 	int err;
 

From 2e26b36d44e9ccee7d9b6978a36cbaa308f9a119 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 19 Sep 2025 15:10:25 +0000
Subject: [PATCH 1742/1854] pagemap: print page regions in the format `start -
 end`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During investigations, it’s much easier to read logs when regions are
printed in the start - end format rather than `start/size`.

In addition, all page counters and memory sizes are now printed in
hexadecimal, as they are hard to read in decimal form.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/cr-dedup.c  |  3 ++-
 criu/page-pipe.c |  6 +++---
 criu/page-xfer.c | 23 +++++++++++++----------
 criu/pagemap.c   |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/criu/cr-dedup.c b/criu/cr-dedup.c
index c0c21f53e..feeb9ebb0 100644
--- a/criu/cr-dedup.c
+++ b/criu/cr-dedup.c
@@ -87,7 +87,8 @@ static int cr_dedup_one_pagemap(unsigned long img_id, int flags)
 		if (ret <= 0)
 			goto exit;
 
-		pr_debug("dedup iovec base=%" PRIx64 ", len=%lu\n", pr.pe->vaddr, pagemap_len(pr.pe));
+		pr_debug("dedup iovec %" PRIx64 " - %" PRIx64 "\n",
+			 pr.pe->vaddr, pr.pe->vaddr + pagemap_len(pr.pe));
 		if (!pagemap_in_parent(pr.pe)) {
 			ret = dedup_one_iovec(prp, pr.pe->vaddr, pagemap_len(pr.pe));
 			if (ret)
diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index f8e3520f7..4601d8f9c 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -446,17 +446,17 @@ void debug_show_page_pipe(struct page_pipe *pp)
 	pr_debug("Page pipe:\n");
 	pr_debug("* %u pipes %u/%u iovs:\n", pp->nr_pipes, pp->free_iov, pp->nr_iovs);
 	list_for_each_entry(ppb, &pp->bufs, l) {
-		pr_debug("\tbuf %lu pages, %u iovs, flags: %x pipe_off: %lx :\n", ppb->pages_in, ppb->nr_segs, ppb->flags,
+		pr_debug("\tbuf %lx pages, %u iovs, flags: %x pipe_off: %lx :\n", ppb->pages_in, ppb->nr_segs, ppb->flags,
 			 ppb->pipe_off);
 		for (i = 0; i < ppb->nr_segs; i++) {
 			iov = &ppb->iov[i];
-			pr_debug("\t\t%p %lu\n", iov->iov_base, iov->iov_len / PAGE_SIZE);
+			pr_debug("\t\t%p - %p\n", iov->iov_base, iov->iov_base + iov->iov_len);
 		}
 	}
 
 	pr_debug("* %u holes:\n", pp->free_hole);
 	for (i = 0; i < pp->free_hole; i++) {
 		iov = &pp->holes[i];
-		pr_debug("\t%p %lu\n", iov->iov_base, iov->iov_len / PAGE_SIZE);
+		pr_debug("\t%p - %p\n", iov->iov_base, iov->iov_base + iov->iov_len);
 	}
 }
diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index 4d057163d..e2913b924 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -178,12 +178,12 @@ static int write_pages_to_server(struct page_xfer *xfer, int p, unsigned long le
 	ssize_t ret, left = len;
 
 	if (opts.tls) {
-		pr_debug("Sending %lu bytes / %lu pages\n", len, len / PAGE_SIZE);
+		pr_debug("Sending %lx bytes\n", len);
 
 		if (tls_send_data_from_fd(p, len))
 			return -1;
 	} else {
-		pr_debug("Splicing %lu bytes / %lu pages into socket\n", len, len / PAGE_SIZE);
+		pr_debug("Splicing %lx bytes into socket\n", len);
 
 		while (left > 0) {
 			ret = splice(p, NULL, xfer->sk, NULL, left, SPLICE_F_MOVE);
@@ -192,7 +192,7 @@ static int write_pages_to_server(struct page_xfer *xfer, int p, unsigned long le
 				return -1;
 			}
 
-			pr_debug("\tSpliced: %lu bytes sent\n", (unsigned long)ret);
+			pr_debug("\tSpliced: %lx bytes sent\n", (unsigned long)ret);
 			left -= ret;
 		}
 	}
@@ -288,7 +288,7 @@ static int check_pagehole_in_parent(struct page_read *p, struct iovec *iov)
 	 * read_pagemap_page routine.
 	 */
 
-	pr_debug("Checking %p/%zu hole\n", iov->iov_base, iov->iov_len);
+	pr_debug("Checking %p - %p hole\n", iov->iov_base, iov->iov_base + iov->iov_len);
 	off = (unsigned long)iov->iov_base;
 	end = off + iov->iov_len;
 	while (1) {
@@ -300,7 +300,8 @@ static int check_pagehole_in_parent(struct page_read *p, struct iovec *iov)
 			return -1;
 		}
 
-		pr_debug("\tFound %" PRIx64 "/%lu\n", p->pe->vaddr, pagemap_len(p->pe));
+		pr_debug("\tFound %" PRIx64 " - %" PRIx64 "\n",
+			 p->pe->vaddr, p->pe->vaddr + pagemap_len(p->pe));
 
 		/*
 		 * The pagemap entry in parent may happen to be
@@ -340,7 +341,8 @@ static int write_pagemap_loc(struct page_xfer *xfer, struct iovec *iov, u32 flag
 		if (xfer->parent != NULL) {
 			ret = check_pagehole_in_parent(xfer->parent, iov);
 			if (ret) {
-				pr_err("Hole %p/%zu not found in parent\n", iov->iov_base, iov->iov_len);
+				pr_err("Hole %p - %p not found in parent\n",
+				       iov->iov_base, iov->iov_base + iov->iov_len);
 				return -1;
 			}
 		}
@@ -850,7 +852,7 @@ int page_xfer_predump_pages(int pid, struct page_xfer *xfer, struct page_pipe *p
 
 			BUG_ON(iov.iov_base < (void *)xfer->offset);
 			iov.iov_base -= xfer->offset;
-			pr_debug("\t p %p [%u]\n", iov.iov_base, (unsigned int)(iov.iov_len / PAGE_SIZE));
+			pr_debug("\t p %p - %p\n", iov.iov_base, iov.iov_base + iov.iov_len);
 
 			flags = ppb_xfer_flags(xfer, ppb);
 
@@ -886,7 +888,7 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp)
 	list_for_each_entry(ppb, &pp->bufs, l) {
 		unsigned int i;
 
-		pr_debug("\tbuf %ld/%d\n", ppb->pages_in, ppb->nr_segs);
+		pr_debug("\tbuf %lx/%d\n", ppb->pages_in, ppb->nr_segs);
 
 		for (i = 0; i < ppb->nr_segs; i++) {
 			struct iovec iov = ppb->iov[i];
@@ -898,7 +900,7 @@ int page_xfer_dump_pages(struct page_xfer *xfer, struct page_pipe *pp)
 
 			BUG_ON(iov.iov_base < (void *)xfer->offset);
 			iov.iov_base -= xfer->offset;
-			pr_debug("\tp %p [%u]\n", iov.iov_base, (unsigned int)(iov.iov_len / PAGE_SIZE));
+			pr_debug("\tp %p - %p\n", iov.iov_base, iov.iov_base + iov.iov_len);
 
 			flags = ppb_xfer_flags(xfer, ppb);
 
@@ -1071,7 +1073,8 @@ static int page_server_add(int sk, struct page_server_iov *pi, u32 flags)
 	struct page_xfer *lxfer = &cxfer.loc_xfer;
 	struct iovec iov;
 
-	pr_debug("Adding %" PRIx64 "/%lu\n", pi->vaddr, pi->nr_pages);
+	pr_debug("Adding %" PRIx64 " - %" PRIx64 "\n",
+		 pi->vaddr, pi->vaddr + pi->nr_pages * PAGE_SIZE);
 
 	if (prep_loc_xfer(pi))
 		return -1;
diff --git a/criu/pagemap.c b/criu/pagemap.c
index 16d680fdb..b6ec3e333 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -171,7 +171,7 @@ static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
 static inline void pagemap_bound_check(PagemapEntry *pe, unsigned long vaddr, unsigned long int nr)
 {
 	if (vaddr < pe->vaddr || (vaddr - pe->vaddr) / PAGE_SIZE + nr > pe->nr_pages) {
-		pr_err("Page read err %" PRIx64 ":%lu vs %lx:%lu\n", pe->vaddr, pe->nr_pages, vaddr, nr);
+		pr_err("Page read err %" PRIx64 ":%lx vs %lx:%lx\n", pe->vaddr, pe->nr_pages, vaddr, nr);
 		BUG();
 	}
 }

From 2d2168fc9c142a2eaf18f319b0d21825775d5660 Mon Sep 17 00:00:00 2001
From: dong sunchao <dongsunchao@gmail.com>
Date: Tue, 23 Sep 2025 01:00:12 +1000
Subject: [PATCH 1743/1854] vdso: relax EI_OSABI check to support linux in ELF
 header

On some ARM/aarch64 systems, the VDSO ELF header sets EI_OSABI to 3 (Linux),
while CRIU expects 0 (System V). This strict check causes restore to fail
with "ELF header magic mismatch"

This patch relaxes the check to accept both values, improving compatibility
with modern toolchains and kernels (e.g. Linux 6.12+)

Fixes: #2751
Signed-off-by: dong sunchao <dongsunchao@gmail.com>
---
 criu/pie/util-vdso.c | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index 8daf5c71f..45fb6a648 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -98,25 +98,45 @@ static unsigned long elf_gnu_hash(const unsigned char *name)
 
 static int has_elf_identity(Ehdr_t *ehdr)
 {
-	/*
-	 * See Elf specification for this magic values.
-	 */
+	/* check ELF magic */
+
+	if (ehdr->e_ident[EI_MAG0] != ELFMAG0 ||
+	    ehdr->e_ident[EI_MAG1] != ELFMAG1 ||
+	    ehdr->e_ident[EI_MAG2] != ELFMAG2 ||
+	    ehdr->e_ident[EI_MAG3] != ELFMAG3) {
+		pr_err("Invalid ELF magic\n");
+		return false;
+	};
+
+	/* check ELF class */
 #if defined(CONFIG_VDSO_32)
-	static const char elf_ident[] = {
-		0x7f, 0x45, 0x4c, 0x46, 0x01, BORD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	if (ehdr->e_ident[EI_CLASS] != ELFCLASS32) {
+		pr_err("Unsupported ELF class: %d\n", ehdr->e_ident[EI_CLASS]);
+		return false;
 	};
 #else
-	static const char elf_ident[] = {
-		0x7f, 0x45, 0x4c, 0x46, 0x02, BORD, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	if (ehdr->e_ident[EI_CLASS] != ELFCLASS64) {
+		pr_err("Unsupported ELF class: %d\n", ehdr->e_ident[EI_CLASS]);
+		return false;
 	};
 #endif
 
-	BUILD_BUG_ON(sizeof(elf_ident) != sizeof(ehdr->e_ident));
-
-	if (memcmp(ehdr->e_ident, elf_ident, sizeof(elf_ident))) {
-		pr_err("ELF header magic mismatch\n");
+	/* check ELF data encoding */
+	if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
+		pr_err("Unsupported ELF data encoding: %d\n", ehdr->e_ident[EI_DATA]);
 		return false;
-	}
+	};
+	/* check ELF version */
+	if (ehdr->e_ident[EI_VERSION] != EV_CURRENT) {
+		pr_err("Unsupported ELF version: %d\n", ehdr->e_ident[EI_VERSION]);
+		return false;
+	};
+	/* check ELF OSABI */
+	if (ehdr->e_ident[EI_OSABI] != ELFOSABI_NONE &&
+	    ehdr->e_ident[EI_OSABI] != ELFOSABI_LINUX) {
+		pr_err("Unsupported OSABI version: %d\n", ehdr->e_ident[EI_OSABI]);
+		return false;
+	};
 
 	return true;
 }

From 91758a68e929f1bf9fb2e682aa53e924806ac475 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 22 Sep 2025 17:59:29 +0000
Subject: [PATCH 1744/1854] zdtm: Remove junit_xml leftovers

The previous commit 4cd4a6b1ac15 ("zdtm: stop importing junit_xml")
removed the junit_xml library, but some variables related to it were
left in the code. This commit removes the unused `tc` variable and a
call to its `add_error_info` method.

Fixes: 4cd4a6b1ac15 ("zdtm: stop importing junit_xml")
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 test/zdtm.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 7e83aa4df..e21356c30 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -2232,7 +2232,6 @@ class Launcher:
             # The following wait() is not useful for our domain logic.
             # It's useful for taming warnings in subprocess.Popen.__del__()
             sub['sub'].wait()
-            tc = None
             if status != 0:
                 self.__fail = True
                 failed_flavor = decode_flav(os.WEXITSTATUS(status))
@@ -2243,7 +2242,6 @@ class Launcher:
                     with open(sub['log']) as sublog:
                         output = sublog.read()
                     details = {'output': output}
-                    tc.add_error_info(output=output)
                     print(testline, file=self.__file_report)
                     print("%s" % yaml.safe_dump(details,
                                                 explicit_start=True,

From 67751bc11b2906a3bc6e7bf65fce19717c272356 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Fri, 19 Sep 2025 00:34:56 +0000
Subject: [PATCH 1745/1854] docs: add developer overviews for AI assistants

This commit adds the document to provide high-level overviews of the
CRIU project for AI assistants like Claude and Gemini.

These documents are intended to be used as context for AI-powered
developer assistants to help them understand the project's goals,
architecture, and development process. This will allow them to provide
more accurate and helpful responses to developer questions.

The documents include:
- A brief introduction to CRIU
- A quick start guide for checkpointing and restoring a simple process
- An overview of the dump and restore process
- A description of the Compel subproject
- Information about the project's coding style, code layout, and tests

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 CLAUDE.md |   1 +
 GEMINI.md | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)
 create mode 120000 CLAUDE.md
 create mode 100644 GEMINI.md

diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 120000
index 000000000..e3c5a92d9
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1 @@
+GEMINI.md
\ No newline at end of file
diff --git a/GEMINI.md b/GEMINI.md
new file mode 100644
index 000000000..e56c1de12
--- /dev/null
+++ b/GEMINI.md
@@ -0,0 +1,136 @@
+# CRIU (Checkpoint/Restore In User-space)
+
+CRIU is a tool for saving the state of a running application to a set of files
+(checkpointing) and restoring it back to a live state. It is primarily used for
+live migration of containers, in-place updates, and fast application startup.
+
+It is implemented as a command-line tool called `criu`. The two primary commands
+are `dump` and `restore`.
+
+- `dump`: Saves a process tree and all its related resources (file
+  descriptors, IPC, sockets, namespaces, etc.) into a collection of image
+  files.
+- `restore`: Restores processes from image files to the same state they were
+  in before the dump.
+
+## Quick Start
+
+To get a feel for `criu`, you can try checkpointing and restoring a simple
+process.
+
+1.  **Run a simple process:**
+    Open a terminal and run a command that will run for a while. Find its PID.
+    ```bash
+    sleep 1000 &
+    [1] 12345
+    ```
+
+2.  **Dump the process:**
+    As root, use `criu dump` with the process ID (`-t`) and a directory for the
+    image files (`-D`).
+    ```bash
+    sudo criu dump -t 12345 -D /tmp/sleep_images -v4 --shell-job
+    ```
+    The `sleep` process will no longer be running.
+
+3.  **Restore the process:**
+    Use `criu restore` to bring the process back to life from the images.
+    ```bash
+    sudo criu restore -D /tmp/sleep_images -v4 --shell-job
+    ```
+    The `sleep` process will be running again as if nothing happened.
+
+# For Developers and Contributors
+
+This section contains more technical details about CRIU's internals and
+development process.
+
+## Dump Process
+
+On dump, CRIU uses available kernel interfaces to collect information about
+processes. For properties that can only be retrieved from within the process
+itself, CRIU injects a binary blob (called a "parasite") into the process's
+address space and executes it in the context of one of the process's threads.
+This injection is handled by a subproject called **Compel**.
+
+## Restore Process
+
+On restore, CRIU reads the image files to reconstruct the processes. The goal is
+to restore them to the exact state they were in before the dump. The restore
+process is divided into several stages (defined as `CR_STATE_*` in
+`./criu/include/restorer.h`).
+
+The main `criu` process acts as a coordinator. It first restores resources with
+inter-process dependencies (file descriptors, sockets, shared memory,
+namespaces, etc.). It then forks the process tree and sets up namespaces.
+Finally, it restores process-specific resources like file descriptors and memory
+mappings.
+
+A key step involves a small, self-contained binary called the "restorer". All
+restored processes switch to executing this code, which unmaps the CRIU-specific
+memory and restores the application's original memory mappings. On the final
+step, the restorer calls `sigreturn` on a prepared signal frame to resume the
+process with the state it had at the moment of the dump.
+
+## Compel
+
+Compel is a subproject responsible for generating the binary blobs used for the
+parasite code (for dumping) and the restorer code (for restoring). It provides a
+library for injecting and executing this code within the target process's
+address space. It is a separate project because the logic for generating and
+injecting Position-Independent Executable (PIE) code is complex and
+self-contained.
+
+## Coding Style
+
+The C code in the CRIU project follows the
+[Linux Kernel Coding Style](https://www.kernel.org/doc/html/latest/process/coding-style.html).
+Here are some of the main points:
+
+-   **Indentation**: Use tabs, which are set to 8 characters.
+-   **Line Length**: The preferred line limit is 80 characters, but it can be
+    extended to 120 if it improves code readability.
+-   **Braces**:
+    -   The opening brace for a function goes on a new line.
+    -   The opening brace for a block (like `if`, `for`, `while`, `switch`) goes
+        on the same line.
+-   **Spaces**: Use spaces around operators (`+`, `-`, `*`, `/`, `%`, `<`, `>`,
+    `=`, etc.).
+-   **Naming**: Use descriptive names for functions and variables.
+-   **Comments**: Use C-style comments (`/* ... */`). For multi-line comments,
+    the preferred format is:
+    ```c
+    /*
+     * This is a multi-line
+     * comment.
+     */
+    ```
+
+## Code Layout
+
+The code is organized into the following directories:
+
+-   `./compel`: The Compel sub-project.
+-   `./criu`: The main `criu` tool source code.
+-   `./images`: Protobuf descriptions for the image files.
+-   `./test`: All tests.
+-   `./test/zdtm`: The Zero-Downtime Migration (ZDTM) test suite.
+-   `./test/zdtm.py`: The executor script for ZDTM tests.
+-   `./scripts`: Helper scripts.
+-   `./scripts/build`: Docker image files used for CI and cross-compilation
+    checks.
+-   `./crit`: A tool to inspect and manipulate CRIU image files.
+-   `./soccr`: A library for TCP socket checkpoint/restore.
+
+## Tests
+
+The main test suite is ZDTM. Here is an example of how to run a single test:
+
+```bash
+sudo ./test/zdtm.py run -t zdtm/static/env00
+```
+
+Each ZDTM test has three stages: preparation, C/R, and results checks. During
+the test, a process calls `test_daemon()` to signal it is ready for C/R, then
+calls `test_waitsig()` to wait for the C/R stage to complete. After being
+restored, the test checks that all its resources are still in a valid state.

From 25f8be0f6016bd6ef0e0a1222cd3fbfca8e0b6fd Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Wed, 17 Sep 2025 19:14:36 +0900
Subject: [PATCH 1746/1854] ci: use package-manager dependency install scripts

Currently, adding a package which is required either for development or testing
requires it to be added in multiple places due to many duplicated Dockerfiles
and installation scripts. This makes it difficult to ensure that all scripts
are updated appropriately and can lead to some places being missed.

This patch consolidates the list of dependencies and adds installation
scripts for each package-manager used in our CI (apk, apt, dnf, pacman).

This change also replaces the `debian/dev-packages.lst` as this subfolder
conflicts with the Ubuntu/Debian packing scripts used for CRIU:
https://github.com/rst0git/criu-deb-packages

This patch also removes the CentOS 8 build scripts as it is EOL
and the container registry is no longer available.

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                                   | 12 +--
 .github/workflows/check-commits.yml           |  2 +-
 .github/workflows/codeql.yml                  |  2 +-
 .github/workflows/nftables-test.yml           |  2 +-
 CONTRIBUTING.md                               | 84 ++++++++++++-------
 Makefile                                      |  3 +-
 {scripts/ci => contrib}/apt-install           |  0
 contrib/debian/dev-packages.lst               | 19 -----
 contrib/dependencies/apk-packages.sh          | 38 +++++++++
 contrib/dependencies/apt-cross-packages.sh    | 34 ++++++++
 contrib/dependencies/apt-packages.sh          | 40 +++++++++
 contrib/dependencies/dnf-packages.sh          | 35 ++++++++
 contrib/dependencies/pacman-packages.sh       | 31 +++++++
 scripts/build/Dockerfile.alpine               | 43 +---------
 scripts/build/Dockerfile.archlinux            | 35 +-------
 scripts/build/Dockerfile.centos8              | 48 -----------
 scripts/build/Dockerfile.fedora.tmpl          |  5 +-
 scripts/build/Dockerfile.hotspot-alpine       | 25 +-----
 scripts/build/Dockerfile.hotspot-ubuntu       | 28 +------
 scripts/build/Dockerfile.linux32.tmpl         | 26 +-----
 scripts/build/Dockerfile.openj9-ubuntu        | 28 +------
 .../Dockerfile.riscv64-stable-cross.tmpl      | 33 +-------
 scripts/build/Dockerfile.stable-cross.tmpl    | 25 +-----
 scripts/build/Dockerfile.tmpl                 | 36 +-------
 scripts/build/Dockerfile.unstable-cross.tmpl  | 26 +-----
 scripts/build/Dockerfile.x86_64.hdr           |  2 +-
 scripts/build/Makefile                        |  2 +-
 scripts/ci/Makefile                           |  2 +-
 scripts/ci/docker-test.sh                     |  4 +-
 scripts/ci/java-test.sh                       |  2 +
 scripts/ci/loongarch64-qemu-test.sh           |  4 +-
 scripts/ci/prepare-for-fedora-rawhide.sh      | 29 +------
 scripts/ci/run-ci-tests.sh                    | 12 +--
 scripts/ci/vagrant.sh                         | 12 +--
 scripts/install-debian-pkgs.sh                | 25 ------
 35 files changed, 295 insertions(+), 459 deletions(-)
 rename {scripts/ci => contrib}/apt-install (100%)
 delete mode 100644 contrib/debian/dev-packages.lst
 create mode 100755 contrib/dependencies/apk-packages.sh
 create mode 100755 contrib/dependencies/apt-cross-packages.sh
 create mode 100755 contrib/dependencies/apt-packages.sh
 create mode 100755 contrib/dependencies/dnf-packages.sh
 create mode 100755 contrib/dependencies/pacman-packages.sh
 delete mode 100644 scripts/build/Dockerfile.centos8
 delete mode 100755 scripts/install-debian-pkgs.sh

diff --git a/.cirrus.yml b/.cirrus.yml
index 848e14132..99dd70d63 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,7 +13,7 @@ task:
     nested_virtualization: true
 
   setup_script: |
-    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
+    contrib/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
   build_script: |
     make -C scripts/ci vagrant-fedora-no-vdso
@@ -34,7 +34,7 @@ task:
   setup_script: |
     dnf config-manager --set-enabled crb # Same as CentOS 8 powertools
     dnf -y install epel-release epel-next-release
-    dnf -y install --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python-devel python-PyYAML python-protobuf python3-importlib-metadata xmlto libdrm-devel libuuid-devel
+    contrib/dependencies/dnf-packages.sh
     # The image has a too old version of nettle which does not work with gnutls.
     # Just upgrade to the latest to make the error go away.
     dnf -y upgrade nettle nettle-devel
@@ -63,7 +63,7 @@ task:
     nested_virtualization: true
 
   setup_script: |
-    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
+    contrib/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
   build_script: |
     make -C scripts/ci vagrant-fedora-rawhide
@@ -83,7 +83,7 @@ task:
     nested_virtualization: true
 
   setup_script: |
-    scripts/ci/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
+    contrib/apt-install make gcc pkg-config git perl-modules iproute2 kmod wget cpu-checker
     sudo kvm-ok
   build_script: |
     make -C scripts/ci vagrant-fedora-non-root
@@ -96,7 +96,7 @@ task:
     memory: 4G
   script: uname -a
   build_script: |
-    scripts/ci/apt-install make
+    contrib/apt-install make
     make -C scripts/ci local
 
 task:
@@ -107,7 +107,7 @@ task:
     memory: 4G
   script: uname -a
   build_script: |
-    scripts/ci/apt-install make
+    contrib/apt-install make
     make -C scripts/ci local CLANG=1
 
 task:
diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml
index 354873909..bf7d06697 100644
--- a/.github/workflows/check-commits.yml
+++ b/.github/workflows/check-commits.yml
@@ -19,7 +19,7 @@ jobs:
         # Checkout pull request HEAD commit instead of merge commit
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Install dependencies
-      run: sudo scripts/ci/apt-install libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev uuid-dev
+      run: sudo contrib/apt-install libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnl-3-dev libnet-dev libcap-dev uuid-dev
     - name: Configure git user details
       run: |
         git config --global user.email "checkpoint-restore@users.noreply.github.com"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 88e21d3d1..9c9e46c1b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install Packages (cpp)
         if: ${{ matrix.language == 'cpp' }}
         run: |
-          sudo scripts/ci/apt-install protobuf-c-compiler libprotobuf-c-dev libprotobuf-dev build-essential libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnet-dev pkg-config libnl-3-dev libbsd0 libbsd-dev iproute2 libcap-dev libaio-dev libbsd-dev python3-yaml libnl-route-3-dev gnutls-dev
+          sudo contrib/apt-install protobuf-c-compiler libprotobuf-c-dev libprotobuf-dev build-essential libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler protobuf-compiler python3-protobuf libnet-dev pkg-config libnl-3-dev libbsd0 libbsd-dev iproute2 libcap-dev libaio-dev libbsd-dev python3-yaml libnl-route-3-dev gnutls-dev
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
diff --git a/.github/workflows/nftables-test.yml b/.github/workflows/nftables-test.yml
index eb3d8e814..7a7d8bd30 100644
--- a/.github/workflows/nftables-test.yml
+++ b/.github/workflows/nftables-test.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Remove iptables
       run: sudo apt remove -y iptables
     - name: Install libnftables-dev
-      run: sudo scripts/ci/apt-install libnftables-dev
+      run: sudo contrib/apt-install libnftables-dev
     - name: chmod 755 /home/runner
       # CRIU's tests are sometimes running as some random user and need
       # to be able to access the test files.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 712e7b813..3ad4aa101 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,19 +27,43 @@ The repository may contain multiple branches. Development happens in the **criu-
 To clone CRIU repo and switch to the proper branch, run:
 
 ```
-        git clone https://github.com/checkpoint-restore/criu criu
-        cd criu
-        git checkout criu-dev
+git clone https://github.com/checkpoint-restore/criu criu
+cd criu
+git checkout criu-dev
 ```
 
-### Compile
+### Building from source
 
-First, you need to install compile-time dependencies. Check [Installation dependencies](https://criu.org/Installation#Dependencies) for more info. Alternatively, you can use the Nix flake to set up a development environment by running `nix develop`.
+Follow these steps to compile CRIU from source code.
 
-To compile CRIU, run:
+#### Installing build dependencies
+
+First, you need to install the required build dependencies. We provide scripts to simplify this process for several Linux distributions in [contrib/dependencies](contrib/dependencies). For a complete list of dependencies, please refer to the [installation guide](https://criu.org/Installation).
+
+##### On Ubuntu/Debian-based systems:
 
 ```
-        make
+./contrib/dependencies/apt-packages.sh
+```
+
+##### On Fedora/CentOS-based systems:
+
+```
+./contrib/dependencies/dnf-packages.sh
+```
+
+##### Using Nix:
+
+```
+nix develop
+```
+
+#### Compiling CRIU
+
+Once the dependencies are installed, you can compile CRIU by running the `make` command from the root of the source directory:
+
+```
+make
 ```
 
 This should create the `./criu/criu` executable.
@@ -63,7 +87,7 @@ The following command can be used to automatically run a code linter for Python
 text spelling (codespell), and a number of CRIU-specific checks (usage of print macros and EOL whitespace for C files).
 
 ```
-         make lint
+make lint
 ```
 
 In addition, we have adopted a [clang-format configuration file](https://www.kernel.org/doc/Documentation/process/clang-format.rst)
@@ -73,7 +97,7 @@ results in decreased readability, we may choose to ignore these errors.
 Run the following command to check if your changes are compliant with the clang-format rules:
 
 ```
-         make indent
+make indent
 ```
 
 This command is built upon the `git-clang-format` tool and supports two options `BASE` and `OPTS`. The `BASE` option allows you to
@@ -83,7 +107,7 @@ can use `BASE=origin/criu-dev`. The `OPTS` option can be used to pass additional
 to check the last *N* commits for formatting errors, without applying the changes to the codebase you can use the following command.
 
 ```
-         make indent OPTS=--diff BASE=HEAD~N
+make indent OPTS=--diff BASE=HEAD~N
 ```
 
 Note that for pull requests, the "Run code linter" workflow runs these checks for all commits. If a clang-format error is detected
@@ -96,7 +120,7 @@ Here are some bad examples of clang-format-ing:
 ```
 @@ -58,8 +59,7 @@ static int register_membarriers(void)
          }
- 
+
          if (!all_ok) {
 -                fail("can't register membarrier()s - tried %#x, kernel %#x",
 -                     barriers_registered, barriers_supported);
@@ -129,7 +153,7 @@ Here are some bad examples of clang-format-ing:
 CRIU comes with an extensive test suite. To check whether your changes introduce any regressions, run
 
 ```
-         make test
+make test
 ```
 
 The command runs [ZDTM Test Suite](https://criu.org/ZDTM_Test_Suite). Check for any error messages produced by it.
@@ -166,21 +190,21 @@ If your change fixes a bug in a specific commit, e.g. you found an issue using
 the SHA-1 ID, and the one line summary. For example:
 
 ```
-	Fixes: 9433b7b9db3e ("make: use cflags/ldflags for config.h detection mechanism")
+Fixes: 9433b7b9db3e ("make: use cflags/ldflags for config.h detection mechanism")
 ```
 
 The following `git config` settings can be used to add a pretty format for
 outputting the above style in the `git log` or `git show` commands:
 
 ```
-	[pretty]
-		fixes = Fixes: %h (\"%s\")
+[pretty]
+    fixes = Fixes: %h (\"%s\")
 ```
 
 If your change address an issue listed in GitHub, please use `Fixes:` tag with the number of the issue. For instance:
 
 ```
-	Fixes: #339
+Fixes: #339
 ```
 
 The `Fixes:` tags should be put at the end of the detailed description.
@@ -263,7 +287,7 @@ can certify the below:
 then you just add a line saying
 
 ```
-        Signed-off-by: Random J Developer <random at developer.example.org>
+Signed-off-by: Random J Developer <random at developer.example.org>
 ```
 
 using your real name (please, no pseudonyms or anonymous contributions if
@@ -275,14 +299,14 @@ commit message. To append such line to a commit you already made, use
 
 ```
  From: Random J Developer <random at developer.example.org>
- Subject: [PATCH] component: Short patch description
+Subject: [PATCH] component: Short patch description
 
- Long patch description (could be skipped if patch
- is trivial enough)
+Long patch description (could be skipped if patch
+is trivial enough)
 
- Signed-off-by: Random J Developer <random at developer.example.org>
- ---
- Patch body here
+Signed-off-by: Random J Developer <random at developer.example.org>
+---
+Patch body here
 ```
 
 ## Submit your work upstream
@@ -316,8 +340,8 @@ contains the following:
   revisions should be listed. For example:
 
 ```
-	v3: rebase on the current criu-dev
-	v2: add commit to foo() and update bar() coding style
+v3: rebase on the current criu-dev
+v2: add commit to foo() and update bar() coding style
 ```
 
 If there are only minor updates to the commits in a pull request, it is
@@ -335,7 +359,7 @@ Historically, CRIU worked with mailing lists and patches so if you still prefer
 To create a patch, run
 
 ```
-    git format-patch --signoff origin/criu-dev
+git format-patch --signoff origin/criu-dev
 ```
 
 You might need to read GIT documentation on how to prepare patches
@@ -346,8 +370,8 @@ at all.
 We recommend to post patches using `git send-email`
 
 ```
-  git send-email --cover-letter --no-chain-reply-to --annotate \
-                 --confirm=always --to=criu@openvz.org criu-dev
+git send-email --cover-letter --no-chain-reply-to --annotate \
+               --confirm=always --to=criu@openvz.org criu-dev
 ```
 
 Note that the `git send-email` subcommand may not be in
@@ -359,14 +383,14 @@ If this is your first time using git send-email, you might need to
 configure it to point it to your SMTP server with something like:
 
 ```
-    git config --global sendemail.smtpServer stmp.example.net
+git config --global sendemail.smtpServer stmp.example.net
 ```
 
 If you get tired of typing `--to=criu@openvz.org` all the time,
 you can configure that to be automatically handled as well:
 
 ```
-    git config sendemail.to criu@openvz.org
+git config sendemail.to criu@openvz.org
 ```
 
 If a developer is sending another version of the patch (e.g. to address
diff --git a/Makefile b/Makefile
index 7272cfce1..3e5d62726 100644
--- a/Makefile
+++ b/Makefile
@@ -464,7 +464,8 @@ ruff:
 shellcheck:
 	shellcheck --version
 	shellcheck scripts/*.sh
-	shellcheck scripts/ci/*.sh scripts/ci/apt-install
+	shellcheck scripts/ci/*.sh
+	shellcheck contrib/apt-install contrib/dependencies/*.sh
 	shellcheck -x test/others/crit/*.sh
 	shellcheck -x test/others/libcriu/*.sh
 	shellcheck -x test/others/crit/*.sh test/others/criu-coredump/*.sh
diff --git a/scripts/ci/apt-install b/contrib/apt-install
similarity index 100%
rename from scripts/ci/apt-install
rename to contrib/apt-install
diff --git a/contrib/debian/dev-packages.lst b/contrib/debian/dev-packages.lst
deleted file mode 100644
index ce45f1b7c..000000000
--- a/contrib/debian/dev-packages.lst
+++ /dev/null
@@ -1,19 +0,0 @@
-# Required packages for development in Debian
-build-essential
-libprotobuf-dev
-libprotobuf-c-dev
-protobuf-c-compiler
-protobuf-compiler
-python3-protobuf
-libnet-dev
-
-# Extra packages, required for testing and building other tools
-pkg-config
-libnl-3-dev
-libbsd0
-libbsd-dev
-iproute2
-libcap-dev
-libaio-dev
-python3-yaml
-libnl-route-3-dev
diff --git a/contrib/dependencies/apk-packages.sh b/contrib/dependencies/apk-packages.sh
new file mode 100755
index 000000000..0084dea3a
--- /dev/null
+++ b/contrib/dependencies/apk-packages.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env sh
+
+apk add --no-cache \
+	asciidoctor \
+	bash \
+	build-base \
+	coreutils \
+	e2fsprogs \
+	git \
+	gnutls-dev \
+	go \
+	ip6tables \
+	iproute2 \
+	iptables \
+	iptables-legacy \
+	libaio-dev \
+	libbsd-dev \
+	libcap-dev \
+	libcap-utils \
+	libdrm-dev \
+	libnet-dev \
+	libnl3-dev \
+	nftables \
+	nftables-dev \
+	pkgconfig \
+	procps \
+	protobuf-c-compiler \
+	protobuf-c-dev \
+	protobuf-dev \
+	py3-importlib-metadata \
+	py3-pip \
+	py3-protobuf \
+	py3-yaml \
+	python3 \
+	sudo \
+	tar \
+	util-linux \
+	util-linux-dev
diff --git a/contrib/dependencies/apt-cross-packages.sh b/contrib/dependencies/apt-cross-packages.sh
new file mode 100755
index 000000000..588be40d0
--- /dev/null
+++ b/contrib/dependencies/apt-cross-packages.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+APT_INSTALL="$(cd "$(dirname "$0")/.." >/dev/null 2>&1 && pwd)/apt-install"
+if [ ! -x "$APT_INSTALL" ]; then
+	echo "Error: apt-install not found or not executable"
+	exit 1
+fi
+
+"$APT_INSTALL" \
+	crossbuild-essential-"${DEBIAN_ARCH}" \
+	iproute2:"${DEBIAN_ARCH}" \
+	libaio-dev:"${DEBIAN_ARCH}" \
+	libbz2-dev:"${DEBIAN_ARCH}" \
+	libc6-"${DEBIAN_ARCH}"-cross \
+	libc6-dev-"${DEBIAN_ARCH}"-cross \
+	libcap-dev:"${DEBIAN_ARCH}" \
+	libexpat1-dev:"${DEBIAN_ARCH}" \
+	libgnutls28-dev:"${DEBIAN_ARCH}" \
+	libnet-dev:"${DEBIAN_ARCH}" \
+	libnftables-dev:"${DEBIAN_ARCH}" \
+	libnl-3-dev:"${DEBIAN_ARCH}" \
+	libnl-route-3-dev:"${DEBIAN_ARCH}" \
+	libprotobuf-c-dev:"${DEBIAN_ARCH}" \
+	libprotobuf-dev:"${DEBIAN_ARCH}" \
+	libssl-dev:"${DEBIAN_ARCH}" \
+	ncurses-dev:"${DEBIAN_ARCH}" \
+	uuid-dev:"${DEBIAN_ARCH}" \
+	libdrm-dev:"${DEBIAN_ARCH}" \
+	build-essential \
+	pkg-config \
+	git \
+	protobuf-c-compiler \
+	protobuf-compiler \
+	python3-protobuf
diff --git a/contrib/dependencies/apt-packages.sh b/contrib/dependencies/apt-packages.sh
new file mode 100755
index 000000000..c60ba9041
--- /dev/null
+++ b/contrib/dependencies/apt-packages.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env sh
+
+APT_INSTALL="$(cd "$(dirname "$0")/.." >/dev/null 2>&1 && pwd)/apt-install"
+if [ ! -x "$APT_INSTALL" ]; then
+	echo "Error: apt-install not found or not executable"
+	exit 1
+fi
+
+"$APT_INSTALL" \
+	asciidoctor \
+	bash \
+	bsdmainutils \
+	build-essential \
+	gdb \
+	git-core \
+	iptables \
+	kmod \
+	libaio-dev \
+	libbsd-dev \
+	libcap-dev \
+	libdrm-dev \
+	libgnutls28-dev \
+	libgnutls30 \
+	libnet-dev \
+	libnl-3-dev \
+	libnl-route-3-dev \
+	libperl-dev \
+	libprotobuf-c-dev \
+	libprotobuf-dev \
+	libselinux-dev \
+	pkg-config \
+	protobuf-c-compiler \
+	protobuf-compiler \
+	python3-importlib-metadata \
+	python3-pip \
+	python3-protobuf \
+	python3-yaml \
+	time \
+	util-linux \
+	uuid-dev
diff --git a/contrib/dependencies/dnf-packages.sh b/contrib/dependencies/dnf-packages.sh
new file mode 100755
index 000000000..efbb659c5
--- /dev/null
+++ b/contrib/dependencies/dnf-packages.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+dnf install -y \
+	asciidoc \
+	binutils \
+	gcc \
+	git \
+	glibc-devel \
+	gnutls-devel \
+	iproute \
+	iptables \
+	libaio-devel \
+	libasan \
+	libbpf-devel \
+	libbsd-devel \
+	libcap-devel \
+	libdrm-devel \
+	libnet-devel \
+	libnl3-devel \
+	libselinux-devel \
+	libuuid-devel \
+	make \
+	nftables \
+	pkg-config \
+	protobuf \
+	protobuf-c \
+	protobuf-c-devel \
+	protobuf-compiler \
+	protobuf-devel \
+	python-devel \
+	python3-importlib-metadata \
+	python3-protobuf \
+	python3-pyyaml \
+	rubygem-asciidoctor \
+	xmlto
diff --git a/contrib/dependencies/pacman-packages.sh b/contrib/dependencies/pacman-packages.sh
new file mode 100755
index 000000000..5fe6995fb
--- /dev/null
+++ b/contrib/dependencies/pacman-packages.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env sh
+
+pacman -Syu --noconfirm \
+	asciidoctor \
+	base-devel \
+	bash \
+	coreutils \
+	diffutils \
+	git \
+	gnutls \
+	go \
+	iproute2 \
+	iptables \
+	libaio \
+	libbsd \
+	libcap \
+	libdrm \
+	libnet \
+	libnl \
+	nftables \
+	pkg-config \
+	protobuf \
+	protobuf-c \
+	python-importlib-metadata \
+	python-pip \
+	python-protobuf \
+	python-yaml \
+	sudo \
+	tar \
+	util-linux \
+	util-linux-libs
diff --git a/scripts/build/Dockerfile.alpine b/scripts/build/Dockerfile.alpine
index 819fda0c3..ed883f300 100644
--- a/scripts/build/Dockerfile.alpine
+++ b/scripts/build/Dockerfile.alpine
@@ -1,49 +1,12 @@
 FROM alpine
 ARG CC=gcc
 
-RUN apk update && apk add \
-	$CC \
-	bash \
-	build-base \
-	coreutils \
-	procps \
-	git \
-	gnutls-dev \
-	libaio-dev \
-	libcap-dev \
-	libnet-dev \
-	libnl3-dev \
-	nftables \
-	nftables-dev \
-	pkgconfig \
-	protobuf-c-dev \
-	protobuf-dev \
-	py3-pip \
-	py3-protobuf \
-	python3 \
-	sudo \
-	libcap-utils \
-	libdrm-dev \
-	util-linux \
-	util-linux-dev
-
 COPY . /criu
 WORKDIR /criu
-RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
-RUN apk add \
-	ip6tables \
-	iptables \
-	iptables-legacy \
-	nftables \
-	iproute2 \
-	tar \
-	bash \
-	go \
-	e2fsprogs \
-	py-yaml \
-	py3-importlib-metadata \
-	asciidoctor
+RUN apk add --no-cache "$CC" && /criu/contrib/dependencies/apk-packages.sh
+
+RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
 RUN adduser -u 1000 -D test
diff --git a/scripts/build/Dockerfile.archlinux b/scripts/build/Dockerfile.archlinux
index d4b432f8d..261bd2d79 100644
--- a/scripts/build/Dockerfile.archlinux
+++ b/scripts/build/Dockerfile.archlinux
@@ -5,40 +5,11 @@ ARG CC=gcc
 # Initialize machine ID
 RUN systemd-machine-id-setup
 
-RUN pacman -Syu --noconfirm \
-	$CC \
-	bash \
-	make \
-	coreutils \
-	git \
-	gnutls \
-	libaio \
-	libcap \
-	libnet \
-	libnl \
-	nftables \
-	pkgconfig \
-	protobuf-c \
-	protobuf \
-	python-pip \
-	python-protobuf \
-	which \
-	sudo \
-	iptables \
-	nftables \
-	iproute2 \
-	tar \
-	bash \
-	go \
-	python-yaml \
-	asciidoctor \
-	python-importlib-metadata \
-	libdrm \
-	util-linux-libs \
-	diffutils
-
 COPY . /criu
 WORKDIR /criu
+
+RUN pacman -Syu --noconfirm "$CC" && contrib/dependencies/pacman-packages.sh
+
 RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
diff --git a/scripts/build/Dockerfile.centos8 b/scripts/build/Dockerfile.centos8
deleted file mode 100644
index 5ab6c9cfa..000000000
--- a/scripts/build/Dockerfile.centos8
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM registry.centos.org/centos/centos:8
-
-ARG CC=gcc
-
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core
-RUN yum config-manager --set-enabled powertools
-RUN yum install -y --allowerasing \
-	asciidoc \
-	coreutils \
-	chkconfig \
-	diffutils \
-	findutils \
-	gcc \
-	git \
-	gnutls-devel \
-	iproute \
-	iptables \
-	libaio-devel \
-	libasan \
-	libcap-devel \
-	libnet-devel \
-	libnl3-devel \
-	libselinux-devel \
-	make \
-	procps-ng \
-	protobuf-c-devel \
-	protobuf-devel \
-	python3-devel \
-	python3-PyYAML \
-	python3-protobuf \
-	python3-pip \
-	sudo \
-	tar \
-	which \
-	xmlto
-
-RUN alternatives --set python /usr/bin/python3
-ENV PYTHON=python3
-
-COPY . /criu
-WORKDIR /criu
-
-RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
-
-# The rpc test cases are running as user #1000, let's add the user
-RUN adduser -u 1000 test
-
-RUN make -C test/zdtm -j $(nproc)
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl
index 9d3bb0f87..c26a5fd57 100644
--- a/scripts/build/Dockerfile.fedora.tmpl
+++ b/scripts/build/Dockerfile.fedora.tmpl
@@ -1,11 +1,10 @@
 ARG CC=gcc
 
-COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh
-RUN /bin/prepare-for-fedora-rawhide.sh
-
 COPY . /criu
 WORKDIR /criu
 
+RUN dnf install -y "$CC" && scripts/ci/prepare-for-fedora-rawhide.sh
+
 RUN make mrproper && date && make -j $(nproc) CC="$CC" && date
 
 # The rpc test cases are running as user #1000, let's add the user
diff --git a/scripts/build/Dockerfile.hotspot-alpine b/scripts/build/Dockerfile.hotspot-alpine
index 6caf9d0b1..cd632dddf 100644
--- a/scripts/build/Dockerfile.hotspot-alpine
+++ b/scripts/build/Dockerfile.hotspot-alpine
@@ -1,30 +1,11 @@
 FROM docker.io/library/eclipse-temurin:11-alpine
 ARG CC=gcc
 
-RUN apk update && apk add \
-	bash \
-	build-base \
-	coreutils \
-	git \
-	gnutls-dev \
-	libaio-dev \
-	libcap-dev \
-	libnet-dev \
-	libnl3-dev \
-	pkgconfig \
-	protobuf-c-dev \
-	protobuf-dev \
-	python3 \
-	sudo \
-	maven \
-	ip6tables \
-	iptables \
-	util-linux-dev \
-	bash
-
 COPY . /criu
 WORKDIR /criu
 
+RUN apk add --no-cache maven "$CC" && contrib/dependencies/apk-packages.sh
+
 RUN make mrproper && make -j $(nproc) CC="$CC"
 
-ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
+ENTRYPOINT ["mvn", "-q", "-f", "test/javaTests/pom.xml", "test"]
diff --git a/scripts/build/Dockerfile.hotspot-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu
index 67de916ac..76aa571fa 100644
--- a/scripts/build/Dockerfile.hotspot-ubuntu
+++ b/scripts/build/Dockerfile.hotspot-ubuntu
@@ -1,33 +1,11 @@
 FROM docker.io/library/eclipse-temurin:11-focal
 ARG CC=gcc
 
-COPY scripts/ci/apt-install /bin/apt-install
-
-RUN apt-install protobuf-c-compiler \
-	libprotobuf-c-dev \
-	libaio-dev \
-	libprotobuf-dev \
-	protobuf-compiler \
-	libcap-dev \
-	libnl-3-dev \
-	gdb \
-	bash \
-	python3-protobuf \
-	python3-yaml \
-	libnet-dev \
-	libnl-route-3-dev \
-	libbsd-dev \
-	make \
-	git \
-	pkg-config \
-	iptables \
-	gcc \
-	uuid-dev \
-	maven
-
 COPY . /criu
 WORKDIR /criu
 
+RUN contrib/apt-install maven "$CC" && contrib/dependencies/apt-packages.sh
+
 RUN make mrproper && make -j $(nproc) CC="$CC"
 
-ENTRYPOINT mvn -q -f test/javaTests/pom.xml test
+ENTRYPOINT ["mvn", "-q", "-f", "test/javaTests/pom.xml", "test"]
diff --git a/scripts/build/Dockerfile.linux32.tmpl b/scripts/build/Dockerfile.linux32.tmpl
index d218e0641..a37f16e49 100644
--- a/scripts/build/Dockerfile.linux32.tmpl
+++ b/scripts/build/Dockerfile.linux32.tmpl
@@ -1,32 +1,10 @@
 ARG CC=gcc
 
-COPY scripts/ci/apt-install /bin/apt-install
-
-RUN apt-install \
-	libnet-dev \
-	libnl-route-3-dev \
-	$CC \
-	bsdmainutils \
-	build-essential \
-	git-core \
-	iptables \
-	libaio-dev \
-	libcap-dev \
-	libgnutls28-dev \
-	libgnutls30 \
-	libnl-3-dev \
-	libprotobuf-c-dev \
-	libprotobuf-dev \
-	libselinux-dev \
-	pkg-config \
-	protobuf-c-compiler \
-	protobuf-compiler \
-	uuid-dev \
-	python3-minimal
-
 COPY . /criu
 WORKDIR /criu
 
+RUN contrib/apt-install "$CC" && contrib/dependencies/apt-packages.sh
+
 RUN uname -m && setarch linux32 uname -m && setarch --list
 
 RUN make mrproper && date && \
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 0ae4727d2..825495659 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,34 +1,12 @@
 FROM docker.io/library/ibm-semeru-runtimes:open-11-jdk-focal
 ARG CC=gcc
 
-COPY scripts/ci/apt-install /bin/apt-install
-
-RUN apt-install protobuf-c-compiler \
-	libprotobuf-c-dev \
-	libaio-dev \
-	libprotobuf-dev \
-	protobuf-compiler \
-	libcap-dev \
-	libnl-3-dev \
-	gdb \
-	bash \
-	python3-protobuf \
-	python3-yaml \
-	libnet-dev \
-	libnl-route-3-dev \
-	libbsd-dev \
-	make \
-	git \
-	pkg-config \
-	iptables \
-	gcc \
-	uuid-dev \
-	maven
-
 RUN mkdir -p /etc/criu && echo 'ghost-limit 16777216' > /etc/criu/default.conf
 COPY . /criu
 WORKDIR /criu
 
+RUN contrib/apt-install maven "$CC" && contrib/dependencies/apt-packages.sh
+
 RUN make mrproper && make -j $(nproc) CC="$CC"
 
-ENTRYPOINT mvn -f test/javaTests/pom.xml test
+ENTRYPOINT ["mvn", "-f", "test/javaTests/pom.xml", "test"]
diff --git a/scripts/build/Dockerfile.riscv64-stable-cross.tmpl b/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
index e95a43306..8933a6c82 100644
--- a/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
+++ b/scripts/build/Dockerfile.riscv64-stable-cross.tmpl
@@ -1,5 +1,3 @@
-COPY scripts/ci/apt-install /bin/apt-install
-
 # Add the cross compiler sources
 RUN apt-get clean -y && apt-get update -y && apt-get install -y --no-install-recommends gnupg2
 
@@ -12,33 +10,6 @@ COPY scripts/ci/riscv64-cross/riscv64-sources.list /etc/apt/sources.list.d/
 RUN dpkg --add-architecture ${DEBIAN_ARCH} && \
 	apt-get update -y
 
-# Install required packages
-RUN apt-get install -y --no-install-recommends \
-	build-essential \
-	pkg-config \
-	git \
-	crossbuild-essential-${DEBIAN_ARCH}	\
-	libc6-dev-${DEBIAN_ARCH}-cross		\
-	libc6-${DEBIAN_ARCH}-cross		\
-	libbz2-dev:${DEBIAN_ARCH}		\
-	libexpat1-dev:${DEBIAN_ARCH}		\
-	ncurses-dev:${DEBIAN_ARCH}		\
-	libssl-dev:${DEBIAN_ARCH}		\
-	protobuf-c-compiler			\
-	protobuf-compiler			\
-	python3-protobuf			\
-	libnl-3-dev:${DEBIAN_ARCH}		\
-	libprotobuf-dev:${DEBIAN_ARCH}		\
-	libnet-dev:${DEBIAN_ARCH}		\
-	libprotobuf-c-dev:${DEBIAN_ARCH}	\
-	libcap-dev:${DEBIAN_ARCH}		\
-	libaio-dev:${DEBIAN_ARCH}		\
-	uuid-dev:${DEBIAN_ARCH}			\
-	libnl-route-3-dev:${DEBIAN_ARCH}	\
-	libnftables-dev:${DEBIAN_ARCH}	\
-	libgnutls28-dev:${DEBIAN_ARCH}	\
-	iproute2:${DEBIAN_ARCH}
-
 ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
 	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
 	AS=/usr/bin/${CROSS_TRIPLET}-as				\
@@ -55,4 +26,6 @@ ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
 COPY . /criu
 WORKDIR /criu
 
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
+RUN contrib/dependencies/apt-cross-packages.sh
+
+RUN make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.stable-cross.tmpl b/scripts/build/Dockerfile.stable-cross.tmpl
index 65ae55833..56104081f 100644
--- a/scripts/build/Dockerfile.stable-cross.tmpl
+++ b/scripts/build/Dockerfile.stable-cross.tmpl
@@ -1,30 +1,7 @@
-COPY scripts/ci/apt-install /bin/apt-install
-
 # Add the cross compiler sources
 RUN echo "deb http://deb.debian.org/debian/ stable main" >> /etc/apt/sources.list && \
   dpkg --add-architecture ${DEBIAN_ARCH}
 
-RUN apt-install \
-	crossbuild-essential-${DEBIAN_ARCH}	\
-	libc6-dev-${DEBIAN_ARCH}-cross		\
-	libc6-${DEBIAN_ARCH}-cross		\
-	libbz2-dev:${DEBIAN_ARCH}		\
-	libexpat1-dev:${DEBIAN_ARCH}		\
-	ncurses-dev:${DEBIAN_ARCH}		\
-	libssl-dev:${DEBIAN_ARCH}		\
-	protobuf-c-compiler			\
-	protobuf-compiler			\
-	python3-protobuf			\
-	libnl-3-dev:${DEBIAN_ARCH}		\
-	libprotobuf-dev:${DEBIAN_ARCH}		\
-	libnet-dev:${DEBIAN_ARCH}		\
-	uuid-dev:${DEBIAN_ARCH}			\
-	libprotobuf-c-dev:${DEBIAN_ARCH}	\
-	libcap-dev:${DEBIAN_ARCH}		\
-	libaio-dev:${DEBIAN_ARCH}		\
-	libnl-route-3-dev:${DEBIAN_ARCH} \
-	libdrm-dev:${DEBIAN_ARCH}
-
 ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
 	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
 	AS=/usr/bin/${CROSS_TRIPLET}-as				\
@@ -41,6 +18,8 @@ ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
 COPY . /criu
 WORKDIR /criu
 
+RUN contrib/dependencies/apt-cross-packages.sh
+
 # amdgpu_plugin with armv7 is not supported
 RUN	make mrproper && date && \
 	make -j $(nproc) && \
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 3d6de1044..498b99be9 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -1,40 +1,12 @@
 ARG CC=gcc
 
-COPY scripts/ci/apt-install /bin/apt-install
-
-# On Ubuntu, kernel modules such as ip_tables and xt_mark may not be loaded by default
-# We need to install kmod to enable iptables to load these modules for us.
-RUN apt-install \
-	libnet-dev \
-	libnl-route-3-dev \
-	$CC \
-	bsdmainutils \
-	build-essential \
-	git-core \
-	iptables \
-	libaio-dev \
-	libbsd-dev \
-	libcap-dev \
-	libgnutls28-dev \
-	libgnutls30 \
-	libnftables-dev \
-	libnl-3-dev \
-	libprotobuf-c-dev \
-	libprotobuf-dev \
-	libselinux-dev \
-	iproute2 \
-	kmod \
-	pkg-config \
-	protobuf-c-compiler \
-	protobuf-compiler \
-	python3-minimal \
-	python3-protobuf \
-	uuid-dev \
-	python3-yaml
-
 COPY . /criu
 WORKDIR /criu
 
+# On Ubuntu, kernel modules such as ip_tables and xt_mark may not be loaded by default
+# We need to install kmod to enable iptables to load these modules for us.
+RUN contrib/apt-install "$CC" && contrib/dependencies/apt-packages.sh
+
 RUN git clean -dfx && date && \
 # Check single object build
 	make -j $(nproc) CC="$CC" criu/parasite-syscall.o && \
diff --git a/scripts/build/Dockerfile.unstable-cross.tmpl b/scripts/build/Dockerfile.unstable-cross.tmpl
index 3504b0433..7edb289b6 100644
--- a/scripts/build/Dockerfile.unstable-cross.tmpl
+++ b/scripts/build/Dockerfile.unstable-cross.tmpl
@@ -1,29 +1,7 @@
-COPY scripts/ci/apt-install /bin/apt-install
-
 # Add the cross compiler sources
 RUN echo "deb http://deb.debian.org/debian/ unstable main" >> /etc/apt/sources.list && \
   dpkg --add-architecture ${DEBIAN_ARCH}
 
-RUN apt-install \
-	crossbuild-essential-${DEBIAN_ARCH}	\
-	libc6-dev-${DEBIAN_ARCH}-cross		\
-	libc6-${DEBIAN_ARCH}-cross		\
-	libbz2-dev:${DEBIAN_ARCH}		\
-	libexpat1-dev:${DEBIAN_ARCH}		\
-	ncurses-dev:${DEBIAN_ARCH}		\
-	libssl-dev:${DEBIAN_ARCH}		\
-	protobuf-c-compiler			\
-	protobuf-compiler			\
-	python3-protobuf			\
-	libnl-3-dev:${DEBIAN_ARCH}		\
-	libprotobuf-dev:${DEBIAN_ARCH}		\
-	uuid-dev:${DEBIAN_ARCH}			\
-	libnet-dev:${DEBIAN_ARCH}		\
-	libprotobuf-c-dev:${DEBIAN_ARCH}	\
-	libcap-dev:${DEBIAN_ARCH}		\
-	libaio-dev:${DEBIAN_ARCH}		\
-	libnl-route-3-dev:${DEBIAN_ARCH}
-
 ENV CROSS_COMPILE=${CROSS_TRIPLET}-				\
 	CROSS_ROOT=/usr/${CROSS_TRIPLET}			\
 	AS=/usr/bin/${CROSS_TRIPLET}-as				\
@@ -40,4 +18,6 @@ ENV PATH="${PATH}:${CROSS_ROOT}/bin"				\
 COPY . /criu
 WORKDIR /criu
 
-RUN	make mrproper && date && make -j $(nproc) zdtm && date
+RUN contrib/dependencies/apt-cross-packages.sh
+
+RUN make mrproper && date && make -j $(nproc) zdtm && date
diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index 566b4c916..a666f6c26 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1,5 +1,5 @@
 FROM ubuntu:24.04
 
-COPY scripts/ci/apt-install /bin/apt-install
+COPY contrib/apt-install /bin/apt-install
 
 RUN apt-install gcc-multilib
diff --git a/scripts/build/Makefile b/scripts/build/Makefile
index 389315227..a420cea94 100644
--- a/scripts/build/Makefile
+++ b/scripts/build/Makefile
@@ -1,4 +1,4 @@
-ARCHES := x86_64 fedora-asan fedora-rawhide armv7hf centos8
+ARCHES := x86_64 fedora-asan fedora-rawhide armv7hf
 STABLE_CROSS_ARCHES := armv7-stable-cross aarch64-stable-cross ppc64-stable-cross mips64el-stable-cross riscv64-stable-cross
 UNSTABLE_CROSS_ARCHES := armv7-unstable-cross aarch64-unstable-cross ppc64-unstable-cross mips64el-unstable-cross
 NON_CLANG := $(UNSTABLE_CROSS_ARCHES) $(STABLE_CROSS_ARCHES)
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index 9dc0190b3..ed30e4268 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -11,7 +11,7 @@ ifdef CLANG
 	target-suffix = -clang
 endif
 
-TARGETS := alpine fedora-rawhide centos8 archlinux
+TARGETS := alpine fedora-rawhide archlinux
 ZDTM_OPTS :=
 UNAME := $(shell uname -m)
 export UNAME
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index ae7f52454..bc5a74667 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -7,7 +7,7 @@ set -x -e -o pipefail
 # https://github.com/moby/moby/issues/50750 for details on the bug.
 export DEBIAN_FRONTEND=noninteractive
 apt remove -y docker-ce docker-ce-cli
-./apt-install -y ca-certificates curl
+../../contrib/apt-install -y ca-certificates curl
 install -m 0755 -d /etc/apt/keyrings
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
 chmod a+r /etc/apt/keyrings/docker.asc
@@ -18,7 +18,7 @@ echo \
 apt update -y
 apt-cache madison docker-ce | awk '{ print $3 }'
 verstr="$(apt-cache madison docker-ce | awk '{ print $3 }' | sort | grep -v ':28\.'| tail -n 1)"
-./apt-install -y "docker-ce=$verstr" "docker-ce-cli=$verstr"
+../../contrib/apt-install -y "docker-ce=$verstr" "docker-ce-cli=$verstr"
 
 # docker checkpoint and restore is an experimental feature
 echo '{ "experimental": true }' > /etc/docker/daemon.json
diff --git a/scripts/ci/java-test.sh b/scripts/ci/java-test.sh
index 7cf704f07..a5b13a107 100755
--- a/scripts/ci/java-test.sh
+++ b/scripts/ci/java-test.sh
@@ -2,6 +2,8 @@
 
 cd ../.. || exit 1
 
+sudo modprobe iptable_filter
+
 failures=""
 
 docker build -t criu-openj9-ubuntu-test:latest -f scripts/build/Dockerfile.openj9-ubuntu .
diff --git a/scripts/ci/loongarch64-qemu-test.sh b/scripts/ci/loongarch64-qemu-test.sh
index d5646468e..7e00ab65a 100755
--- a/scripts/ci/loongarch64-qemu-test.sh
+++ b/scripts/ci/loongarch64-qemu-test.sh
@@ -4,7 +4,7 @@ set -o nounset
 set -o errexit
 set -x
 
-./apt-install \
+../../contrib/apt-install \
     apt-transport-https \
     ca-certificates \
     curl \
@@ -19,7 +19,7 @@ add-apt-repository \
    $(lsb_release -cs) \
    stable test"
 
-./apt-install docker-ce
+../../contrib/apt-install docker-ce
 
 # shellcheck source=/dev/null
 . /etc/lsb-release
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index f8f797c1e..ff75717c5 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -1,43 +1,22 @@
 #!/bin/bash
 set -e -x
 
+contrib/dependencies/dnf-packages.sh
 dnf install -y \
 	diffutils \
+	e2fsprogs \
 	findutils \
 	gawk \
-	gcc \
-	git \
-	gnutls-devel \
 	gzip \
-	iproute \
-	iptables \
-	nftables \
-	nftables-devel \
-	libaio-devel \
-	libasan \
-	libcap-devel \
-	libnet-devel \
-	libnl3-devel \
-	libbsd-devel \
+	kmod \
 	libselinux-utils \
-	make \
 	procps-ng \
-	protobuf-c-devel \
-	protobuf-devel \
-	python3-PyYAML \
-	python3-protobuf \
 	python3-pip \
-	python3-importlib-metadata \
 	python-unversioned-command \
 	redhat-rpm-config \
 	sudo \
 	tar \
-	which \
-	e2fsprogs \
-	rubygem-asciidoctor \
-	libdrm-devel \
-	libuuid-devel \
-	kmod
+	which
 
 # /tmp is no longer 755 in the rawhide container image and breaks CI - fix it
 chmod 1777 /tmp
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 617f54fc6..9fbdd8e30 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 set -x -e
 
-CI_PKGS=(protobuf-c-compiler libprotobuf-c-dev libaio-dev libgnutls28-dev
-		libgnutls30 libprotobuf-dev protobuf-compiler libcap-dev
-		libnl-3-dev gdb bash libnet-dev util-linux asciidoctor
-		libnl-route-3-dev time libbsd-dev python3-yaml uuid-dev
-		libperl-dev pkg-config python3-protobuf python3-pip
-		python3-importlib-metadata libdrm-dev)
+CI_PKGS=()
 
 X86_64_PKGS=(gcc-multilib)
 
@@ -60,7 +55,8 @@ ci_prep () {
 		CI_PKGS+=("${X86_64_PKGS[@]}")
 	fi
 
-	scripts/ci/apt-install "${CI_PKGS[@]}"
+	contrib/dependencies/apt-packages.sh
+	contrib/apt-install "${CI_PKGS[@]}"
 	chmod a+x "$HOME"
 }
 
@@ -187,7 +183,7 @@ if [ "${COMPAT_TEST}x" = "yx" ] ; then
 	done
 	apt-get remove "${INCOMPATIBLE_LIBS[@]}"
 	dpkg --add-architecture i386
-	scripts/ci/apt-install "${IA32_PKGS[@]}"
+	contrib/apt-install "${IA32_PKGS[@]}"
 	mkdir -p /usr/lib/x86_64-linux-gnu/
 	mv "$REFUGE"/* /usr/lib/x86_64-linux-gnu/
 fi
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index c222e30e0..f69b11352 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -22,9 +22,8 @@ setup() {
 	wget --no-check-certificate https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_"$(dpkg --print-architecture)".deb -O /tmp/vagrant.deb && \
 		dpkg -i /tmp/vagrant.deb
 
-	./apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu-system \
-		ruby build-essential libxml2-dev qemu-kvm rsync ebtables dnsmasq-base \
-		openssh-client
+	../../contrib/apt-install libvirt-clients libvirt-daemon-system libvirt-dev qemu-utils qemu-system \
+		ruby build-essential libxml2-dev qemu-kvm rsync ebtables dnsmasq-base openssh-client
 	systemctl restart libvirtd
 	vagrant plugin install vagrant-libvirt
 	vagrant init cloud-image/fedora-${FEDORA_VERSION} --box-version ${FEDORA_BOX_VERSION}
@@ -41,16 +40,13 @@ setup() {
 	vagrant up --provider=libvirt --no-tty
 	mkdir -p /root/.ssh
 	vagrant ssh-config >> /root/.ssh/config
-	ssh default sudo dnf upgrade -y
-	ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \
-		libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \
-		protobuf-devel python3-protobuf python3-importlib-metadata \
-		rubygem-asciidoctor iptables libselinux-devel libbpf-devel python3-yaml libuuid-devel
 
 	# Disable sssd to avoid zdtm test failures in pty04 due to sssd socket
 	ssh default sudo systemctl mask sssd
 
 	ssh default 'sudo mkdir -p --mode=777 /vagrant && mv $HOME/criu.tar /vagrant && cd /vagrant && tar xf criu.tar'
+	ssh default sudo dnf upgrade -y
+	ssh default sudo /vagrant/criu/contrib/dependencies/dnf-packages.sh
 	ssh default cat /proc/cmdline
 }
 
diff --git a/scripts/install-debian-pkgs.sh b/scripts/install-debian-pkgs.sh
deleted file mode 100755
index 8be49c787..000000000
--- a/scripts/install-debian-pkgs.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Install required packages for development environment in Debian Distro
-
-REQ_PKGS=${REQ_PKGS:=contrib/debian/dev-packages.lst}
-
-help_msg="Install required packages for development environment in Debian Distro
-Usage:
-	scripts/install-debian-pkgs.sh"
-
-function print_help()
-{
-	exec echo -e "$help_msg"
-}
-
-function process()
-{
-	sudo apt-get update
-	sudo apt-get install -yq "$( sed 's/\#.*$//' "${REQ_PKGS}" )"
-}
-
-if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
-	print_help
-else
-	process
-fi

From b25ff1d3363ce9ccfc0854009ac0f96431439848 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 26 Sep 2025 16:54:49 +0100
Subject: [PATCH 1747/1854] Remove travis-ci leftovers

Travis CI stopped providing CI minutes for open-source projects
some time ago and we have migrated to GitHub actions.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .travis.yml                   | 35 -----------------------------------
 CONTRIBUTING.md               |  7 -------
 Makefile                      |  2 +-
 Makefile.compel               |  4 ++--
 scripts/ci/Makefile           |  4 ++--
 scripts/ci/run-ci-tests.sh    | 16 +++++++---------
 scripts/ci/vagrant.sh         |  7 +------
 test/inhfd/memfd.py.checkskip |  2 +-
 test/zdtm/Makefile.inc        |  2 +-
 9 files changed, 15 insertions(+), 64 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 94841b3f3..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-language: c
-os: linux
-dist: bionic
-services:
-  - docker
-jobs:
-  include:
-    - os: linux
-      arch: ppc64le
-      env: TR_ARCH=local
-      dist: bionic
-    - os: linux
-      arch: ppc64le
-      env: TR_ARCH=local CLANG=1
-      dist: bionic
-    - os: linux
-      arch: s390x
-      env: TR_ARCH=local
-      dist: bionic
-    - os: linux
-      arch: arm64-graviton2
-      env: TR_ARCH=local RUN_TESTS=1
-      dist: focal
-      group: edge
-      virt: vm
-    - os: linux
-      arch: arm64-graviton2
-      env: TR_ARCH=local CLANG=1 RUN_TESTS=1
-      group: edge
-      virt: vm
-      dist: bionic
-script:
-  - sudo make -C scripts/ci $TR_ARCH
-after_success:
-  - make -C scripts/ci after_success
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3ad4aa101..2d1dc8227 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -158,11 +158,6 @@ make test
 
 The command runs [ZDTM Test Suite](https://criu.org/ZDTM_Test_Suite). Check for any error messages produced by it.
 
-In case you'd rather have someone else run the tests, you can use travis-ci for your
-own GitHub fork of CRIU. It will check the compilation for various supported platforms,
-as well as run most of the tests from the suite. See https://travis-ci.org/checkpoint-restore/criu
-for more details.
-
 ## Describe your changes
 
 Describe your problem.  Whether your change is a one-line bug fix or
@@ -420,5 +415,3 @@ sometimes a patch may fly around a week before it gets reviewed.
 Wiki article: [Continuous integration](https://criu.org/Continuous_integration)
 
 CRIU tests are run for each series sent to the mailing list. If you get a message from our patchwork that patches failed to pass the tests, you have to investigate what is wrong.
-
-We also recommend you to [enable Travis CI for your repo](https://criu.org/Continuous_integration#Enable_Travis_CI_for_your_repo) to check patches in your git branch, before sending them to the mailing list.
diff --git a/Makefile b/Makefile
index 3e5d62726..611bcdd5a 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ ifeq ($(ARCH),arm)
         endif
 
         ifeq ($(ARMV),8)
-                # Running 'setarch linux32 uname -m' returns armv8l on travis aarch64.
+                # Running 'setarch linux32 uname -m' returns armv8l on aarch64.
                 # This tells CRIU to handle armv8l just as armv7hf. Right now this is
                 # only used for compile testing. No further verification of armv8l exists.
                 ARCHCFLAGS += -march=armv7-a
diff --git a/Makefile.compel b/Makefile.compel
index 764afadc8..a4209edc5 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -50,8 +50,8 @@ compel/plugins/%: $(compel-deps) .FORCE
 
 #
 # GNU make 4.x supports targets matching via wide
-# match targeting, where GNU make 3.x series (used on
-# Travis) is not, so we have to write them here explicitly.
+# match targeting, where GNU make 3.x series is not,
+# so we have to write them here explicitly.
 compel/plugins/std.lib.a: $(compel-deps) .FORCE
 	$(Q) $(MAKE) $(build)=compel/plugins $@
 
diff --git a/scripts/ci/Makefile b/scripts/ci/Makefile
index ed30e4268..bad8065f2 100644
--- a/scripts/ci/Makefile
+++ b/scripts/ci/Makefile
@@ -30,9 +30,9 @@ endif
 
 export CONTAINER_TERMINAL
 
+# Here we assume that any CPU architecture besides x86_64 is running in containers
+# that may not support running docker with '--privileged'.
 ifeq ($(UNAME),x86_64)
-	# On anything besides x86_64 Travis is running unprivileged LXD
-	# containers which do not support running docker with '--privileged'.
 	CONTAINER_OPTS := --rm $(CONTAINER_TERMINAL) --privileged --userns=host --cgroupns=host -v /lib/modules:/lib/modules --tmpfs /run
 else
 	CONTAINER_OPTS := --rm -v /lib/modules:/lib/modules --tmpfs /run
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 9fbdd8e30..7a8345b7c 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -11,13 +11,11 @@ IFS=" " read -r -a ZDTM_OPTS <<< "$ZDTM_OPTS"
 UNAME_M=$(uname -m)
 
 if [ "$UNAME_M" != "x86_64" ]; then
-	# For Travis only x86_64 seems to be baremetal. Other
-	# architectures are running in unprivileged LXD containers.
-	# That seems to block most of CRIU's interfaces.
-
-	# But with the introduction of baremetal aarch64 systems in
-	# Travis (arch: arm64-graviton2) we can override this using
-	# an environment variable
+	# Some tests rely on kernel features that may not be availble
+	# when running in a container. Here we assume that x86_64
+	# systems are baremetal, and skip the tests for all other
+	# CPU architectures. We can override this using the RUN_TESTS
+	# environment variable (e.g., for aarch64).
 	[ -n "$RUN_TESTS" ] || SKIP_CI_TEST=1
 fi
 
@@ -31,7 +29,7 @@ ci_prep () {
 	# not run anymore with 'sudo -u \#1000' if the UID does not exist.
 	adduser -u 1000 --disabled-password --gecos "criutest" criutest || :
 
-	# This can fail on aarch64 travis
+	# This can fail on aarch64
 	service apport stop || :
 
 	# Ubuntu has set up AppArmor in 24.04 so that it blocks use of user
@@ -258,7 +256,7 @@ if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 fi
 
 make -C test/others/make/ run CC="$CC"
-if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
+if [ -n "$CIRCLECI" ]; then
        # GitHub Actions (and Cirrus CI) does not provide a real TTY and CRIU will fail with:
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run
diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh
index f69b11352..5f2de32b8 100755
--- a/scripts/ci/vagrant.sh
+++ b/scripts/ci/vagrant.sh
@@ -11,11 +11,6 @@ FEDORA_VERSION=42
 FEDORA_BOX_VERSION=1.1.0
 
 setup() {
-	if [ -n "$TRAVIS" ]; then
-		# Load the kvm modules for vagrant to use qemu
-		modprobe kvm kvm_intel
-	fi
-
 	# Tar up the git checkout to have vagrant rsync it to the VM
 	tar cf /tmp/criu.tar -C ../../../ criu
 	# Cirrus has problems with the following certificate.
@@ -29,7 +24,7 @@ setup() {
 	vagrant init cloud-image/fedora-${FEDORA_VERSION} --box-version ${FEDORA_BOX_VERSION}
 
 	# The default libvirt Vagrant VM uses 512MB.
-	# Travis VMs should have around 7.5GB.
+	# VMs in our CI typically have around 16GB.
 	# Increasing it to 4GB should work.
 	sed -i Vagrantfile -e 's,^end$,  config.vm.provider :libvirt do |libvirt|'"\n"'    libvirt.memory = 4096;end'"\n"'end,g'
 	# Sync /tmp/criu.tar into the VM
diff --git a/test/inhfd/memfd.py.checkskip b/test/inhfd/memfd.py.checkskip
index 27e2b7b15..32c57d929 100755
--- a/test/inhfd/memfd.py.checkskip
+++ b/test/inhfd/memfd.py.checkskip
@@ -3,5 +3,5 @@
 import ctypes
 libc = ctypes.CDLL(None)
 
-# libc may not have memfd_create (e.g., centos on travis)
+# libc may not have memfd_create (e.g., centos)
 libc.memfd_create("test".encode('utf8'), 0)
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index c19888da3..3b349ed4d 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -27,7 +27,7 @@ ifeq ($(ARCH),arm)
         else ifeq ($(ARMV),7)
                 ARCHCFLAGS += -march=armv7-a+fp
         else ifeq ($(ARMV),8)
-                # To build aarch32 on armv8 Travis-CI (see criu Makefile)
+                # To build aarch32 on armv8 (see criu Makefile)
                 ARCHCFLAGS += -march=armv7-a
                 ARMV := 7
         endif

From 0a81dc8bbe9aa4acadc5a47f7a0e276940f9edb5 Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Fri, 26 Sep 2025 23:38:08 +0900
Subject: [PATCH 1748/1854] ci/java: update base image from focal to jammy

Ubuntu Focal Fossa (20.04) reached its end-of-life on 31 May 2025. So, move
over to using Ubuntu Jammy (22.04) base images.

Also, focal repos do not have libtracefs, which the uprobes zdtm test needs.

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 scripts/build/Dockerfile.hotspot-ubuntu | 2 +-
 scripts/build/Dockerfile.openj9-ubuntu  | 2 +-
 scripts/ci/run-ci-tests.sh              | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/build/Dockerfile.hotspot-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu
index 76aa571fa..a459e1ec7 100644
--- a/scripts/build/Dockerfile.hotspot-ubuntu
+++ b/scripts/build/Dockerfile.hotspot-ubuntu
@@ -1,4 +1,4 @@
-FROM docker.io/library/eclipse-temurin:11-focal
+FROM docker.io/library/eclipse-temurin:11-jammy
 ARG CC=gcc
 
 COPY . /criu
diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.openj9-ubuntu
index 825495659..18664f100 100644
--- a/scripts/build/Dockerfile.openj9-ubuntu
+++ b/scripts/build/Dockerfile.openj9-ubuntu
@@ -1,4 +1,4 @@
-FROM docker.io/library/ibm-semeru-runtimes:open-11-jdk-focal
+FROM docker.io/library/ibm-semeru-runtimes:open-11-jdk-jammy
 ARG CC=gcc
 
 RUN mkdir -p /etc/criu && echo 'ghost-limit 16777216' > /etc/criu/default.conf
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 7a8345b7c..05a3b71e8 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -11,11 +11,10 @@ IFS=" " read -r -a ZDTM_OPTS <<< "$ZDTM_OPTS"
 UNAME_M=$(uname -m)
 
 if [ "$UNAME_M" != "x86_64" ]; then
-	# Some tests rely on kernel features that may not be availble
-	# when running in a container. Here we assume that x86_64
-	# systems are baremetal, and skip the tests for all other
-	# CPU architectures. We can override this using the RUN_TESTS
-	# environment variable (e.g., for aarch64).
+	# Some tests rely on kernel features that may not be available
+	# when running in a container. Here we assume that x86_64 systems
+	# are baremetal, and skip the tests for all other  CPU architectures.
+	# The RUN_TESTS environment variable can override this, e.g., for aarch64.
 	[ -n "$RUN_TESTS" ] || SKIP_CI_TEST=1
 fi
 

From 76394e93a818af92a682946a0dcb97fdabb71099 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 27 Sep 2025 09:21:26 +0100
Subject: [PATCH 1749/1854] ci: consolidate aarch64 tests on GitHub runners

Currently we run aarch64 tests on both Cirrus CI and GitHub runners.
However, Cirrus CI fails with "Monthly compute limit exceeded!". This
change removes the redundant tests to streamline our CI process.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .cirrus.yml                         | 22 ----------------------
 .github/workflows/aarch64-test.yaml |  6 ++++--
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 99dd70d63..72dbb3898 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -88,28 +88,6 @@ task:
   build_script: |
     make -C scripts/ci vagrant-fedora-non-root
 
-task:
-  name: aarch64 build GCC (native)
-  arm_container:
-    image: docker.io/library/ubuntu:jammy
-    cpu: 4
-    memory: 4G
-  script: uname -a
-  build_script: |
-    contrib/apt-install make
-    make -C scripts/ci local
-
-task:
-  name: aarch64 build CLANG (native)
-  arm_container:
-    image: docker.io/library/ubuntu:jammy
-    cpu: 4
-    memory: 4G
-  script: uname -a
-  build_script: |
-    contrib/apt-install make
-    make -C scripts/ci local CLANG=1
-
 task:
   name: aarch64 Fedora Rawhide
   arm_container:
diff --git a/.github/workflows/aarch64-test.yaml b/.github/workflows/aarch64-test.yaml
index 32b19e176..ebbecadb3 100644
--- a/.github/workflows/aarch64-test.yaml
+++ b/.github/workflows/aarch64-test.yaml
@@ -9,14 +9,16 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04-arm
     strategy:
       matrix:
+        os: [ubuntu-24.04-arm, ubuntu-22.04-arm]
         target: [GCC=1, CLANG=1]
 
+    runs-on: ${{ matrix.os }}
+
     steps:
     - uses: actions/checkout@v4
-    - name: Run Tests ${{ matrix.target }}
+    - name: Run Tests ${{ matrix.target }} on ${{ matrix.os }}
       # Following tests are failing on the VMs:
       #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
       #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))

From 7a4b35a91032d36be3469ac4c142ea2d0c399313 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 1 Oct 2025 11:20:13 +0100
Subject: [PATCH 1750/1854] contributing: update links to mailing list

Our previous mailing list had some technical issues and we created
a new one that is hopefully more reliable.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 CONTRIBUTING.md     | 12 ++++++------
 crit/pyproject.toml |  2 +-
 crit/setup.cfg      |  2 +-
 lib/pyproject.toml  |  2 +-
 lib/setup.cfg       |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d1dc8227..03875639d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,8 +8,8 @@ Here are some useful hints to get involved.
 * We have both -- [very simple](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) and [more sophisticated](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+feature%22) coding tasks;
 * CRIU does need [extensive testing](https://github.com/checkpoint-restore/criu/issues?q=is%3Aissue+is%3Aopen+label%3Atesting);
 * Documentation is always hard, we have [some information](https://criu.org/Category:Empty_articles) that is to be extracted from people's heads into wiki pages as well as [some texts](https://criu.org/Category:Editor_help_needed) that all need to be converted into useful articles;
-* Feedback is expected on the GitHub issues page and on the [mailing list](https://lists.openvz.org/mailman/listinfo/criu);
-* We accept GitHub pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [CRIU development mailing list](https://lists.openvz.org/mailman/listinfo/criu).
+* Feedback is expected on the GitHub issues page and on the [mailing list](https://lore.kernel.org/criu);
+* We accept GitHub pull requests and this is the preferred way to contribute to CRIU. If you prefer to send patches by email, you are welcome to send them to [CRIU development mailing list](https://lore.kernel.org/criu).
 Below we describe in more detail recommend practices for CRIU development.
 * Spread the word about CRIU in [social networks](http://criu.org/Contacts);
 * If you're giving a talk about CRIU -- let us know, we'll mention it on the [wiki main page](https://criu.org/News/events);
@@ -366,7 +366,7 @@ We recommend to post patches using `git send-email`
 
 ```
 git send-email --cover-letter --no-chain-reply-to --annotate \
-               --confirm=always --to=criu@openvz.org criu-dev
+               --confirm=always --to=criu@lists.linux.dev criu-dev
 ```
 
 Note that the `git send-email` subcommand may not be in
@@ -381,11 +381,11 @@ configure it to point it to your SMTP server with something like:
 git config --global sendemail.smtpServer stmp.example.net
 ```
 
-If you get tired of typing `--to=criu@openvz.org` all the time,
+If you get tired of typing `--to=criu@lists.linux.dev` all the time,
 you can configure that to be automatically handled as well:
 
 ```
-git config sendemail.to criu@openvz.org
+git config sendemail.to criu@lists.linux.dev
 ```
 
 If a developer is sending another version of the patch (e.g. to address
@@ -398,7 +398,7 @@ version if needed though).
 
 ### Mail patches
 
-The patches should be sent to CRIU development mailing list, `criu AT openvz.org`. Note that you need to be subscribed first in order to post. The list web interface is available at https://openvz.org/mailman/listinfo/criu; you can also use standard mailman aliases to work with it.
+The patches should be sent to CRIU development mailing list, `criu AT lists.linux.dev`. Note that you need to be subscribed first in order to post. The list web interface is available at https://lore.kernel.org/criu; you can also use standard mailman aliases to work with it.
 
 Please make sure the email client you're using doesn't screw your patch (line wrapping and so on).
 
diff --git a/crit/pyproject.toml b/crit/pyproject.toml
index 9089f0a39..f0b185eb7 100644
--- a/crit/pyproject.toml
+++ b/crit/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "crit"
 description = "CRiu Image Tool"
 authors = [
-    {name = "CRIU team", email = "criu@openvz.org"},
+    {name = "CRIU team", email = "criu@lists.linux.dev"},
 ]
 license = {text = "GPLv2"}
 dynamic = ["version"]
diff --git a/crit/setup.cfg b/crit/setup.cfg
index fbc9a5143..37895923f 100644
--- a/crit/setup.cfg
+++ b/crit/setup.cfg
@@ -7,7 +7,7 @@
 name = crit
 description = CRiu Image Tool
 author = CRIU team
-author_email = criu@openvz.org
+author_email = criu@lists.linux.dev
 license = GPLv2
 version = attr: crit.__version__
 
diff --git a/lib/pyproject.toml b/lib/pyproject.toml
index 8eb4b7084..c9e11551b 100644
--- a/lib/pyproject.toml
+++ b/lib/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "pycriu"
 description = "Python bindings for CRIU"
 authors = [
-    {name = "CRIU team", email = "criu@openvz.org"},
+    {name = "CRIU team", email = "criu@lists.linux.dev"},
 ]
 license = {text = "GPLv2"}
 dynamic = ["version"]
diff --git a/lib/setup.cfg b/lib/setup.cfg
index 23ee48dd5..5d75719ca 100644
--- a/lib/setup.cfg
+++ b/lib/setup.cfg
@@ -7,7 +7,7 @@
 name = pycriu
 description = Python bindings for CRIU
 author = CRIU team
-author_email = criu@openvz.org
+author_email = criu@lists.linux.dev
 license = GPLv2
 version = attr: pycriu.__version__
 

From 3379c122e53524a47a31867fa96d5809253c7c4a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 2 Oct 2025 08:39:30 +0100
Subject: [PATCH 1751/1854] page-xfer: fix incompatible pointer type on armv7

page_pipe_read() expects an 'unsigned long *', but pi->nr_pages is u64.
On 32-bit platforms (e.g., armv7), passing &pi->nr_pages directly causes
a compiler error. To fix this we introduce a temporary variable and copy
the result back to pi->nr_pages.

Fixes: #2756

Suggested-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/page-xfer.c | 9 +++++++--
 criu/pagemap.c   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/criu/page-xfer.c b/criu/page-xfer.c
index e2913b924..463d4c506 100644
--- a/criu/page-xfer.c
+++ b/criu/page-xfer.c
@@ -1139,13 +1139,17 @@ static int page_server_get_pages(int sk, struct page_server_iov *pi)
 {
 	struct pstree_item *item;
 	struct page_pipe *pp;
-	unsigned long len;
+	unsigned long len, nr_pages;
 	int ret;
 
 	item = pstree_item_by_virt(pi->dst_id);
 	pp = dmpi(item)->mem_pp;
 
-	ret = page_pipe_read(pp, &pipe_read_dest, pi->vaddr, &pi->nr_pages, PPB_LAZY);
+	/* page_pipe_read() uses 'unsigned long *' but pi->nr_pages is u64.
+	 * Use a temporary variable to fix the incompatible pointer type
+	 * on 32-bit platforms (e.g. armv7). */
+	nr_pages = pi->nr_pages;
+	ret = page_pipe_read(pp, &pipe_read_dest, pi->vaddr, &nr_pages, PPB_LAZY);
 	if (ret)
 		return ret;
 
@@ -1154,6 +1158,7 @@ static int page_server_get_pages(int sk, struct page_server_iov *pi)
 	 * .dst_id all remain intact.
 	 */
 
+	pi->nr_pages = nr_pages;
 	if (pi->nr_pages == 0) {
 		pr_debug("no iovs found, zero pages\n");
 		return -1;
diff --git a/criu/pagemap.c b/criu/pagemap.c
index b6ec3e333..6c9c4f7fe 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -171,7 +171,7 @@ static int seek_pagemap(struct page_read *pr, unsigned long vaddr)
 static inline void pagemap_bound_check(PagemapEntry *pe, unsigned long vaddr, unsigned long int nr)
 {
 	if (vaddr < pe->vaddr || (vaddr - pe->vaddr) / PAGE_SIZE + nr > pe->nr_pages) {
-		pr_err("Page read err %" PRIx64 ":%lx vs %lx:%lx\n", pe->vaddr, pe->nr_pages, vaddr, nr);
+		pr_err("Page read err %" PRIx64 ":%" PRIx64 " vs %lx:%lx\n", pe->vaddr, pe->nr_pages, vaddr, nr);
 		BUG();
 	}
 }

From 77553f07d3057dec544ed243cb6a20d933bdd7b5 Mon Sep 17 00:00:00 2001
From: Pepper Gray <hello@peppergray.xyz>
Date: Tue, 30 Sep 2025 22:58:29 +0200
Subject: [PATCH 1752/1854] make: prevent redefinition of 'struct sigcontext'

Compilation on gentoo/arm64 (llvm+musl) fails with:

In file included from compel/include/uapi/compel/asm/sigframe.h:4,
                 from compel/plugins/std/infect.c:14:
/usr/include/asm/sigcontext.h:28:8: error: redefinition of 'struct sigcontext'
   28 | struct sigcontext {
      |        ^~~~~~~~~~

In file included from criu/arch/aarch64/include/asm/restorer.h:4,
                 from criu/arch/aarch64/crtools.c:11:
/usr/include/asm/sigcontext.h:28:8: error: redefinition of 'struct sigcontext'
   28 | struct sigcontext {
      |        ^~~~~~~~~~

This is happening because <asm/sigcontext.h> and <signal.h> are
mutually incompatible on Linux.

To fix, use  <signal.h> instead of <asm/sigcontext.h> for arm64
(like all others arches do).

Fixes: #2766
Signed-off-by: Pepper Gray <hello@peppergray.xyz>
---
 compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 3 ++-
 criu/arch/aarch64/include/asm/restorer.h                | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
index 9152024fd..a3528500d 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
@@ -1,10 +1,11 @@
 #ifndef UAPI_COMPEL_ASM_SIGFRAME_H__
 #define UAPI_COMPEL_ASM_SIGFRAME_H__
 
-#include <asm/sigcontext.h>
+#include <signal.h>
 #include <sys/ucontext.h>
 
 #include <stdint.h>
+#include <asm/types.h>
 
 /* Copied from the kernel header arch/arm64/include/uapi/asm/sigcontext.h */
 
diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index 64a9c24eb..2174df4fa 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -1,7 +1,7 @@
 #ifndef __CR_ASM_RESTORER_H__
 #define __CR_ASM_RESTORER_H__
 
-#include <asm/sigcontext.h>
+#include <signal.h>
 #include <sys/ucontext.h>
 
 #include "asm/types.h"

From 790b3cf425400cdea794466f3f11c55ca42e8552 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Thu, 2 Oct 2025 12:03:57 -0700
Subject: [PATCH 1753/1854] ci: run alpine tests on arm64

These tests reveal the following build error:

In file included from compel/include/uapi/compel/asm/sigframe.h:4,
                 from compel/plugins/std/infect.c:14:
/usr/include/asm/sigcontext.h:28:8: error: redefinition of 'struct sigcontext'
   28 | struct sigcontext {
      |        ^~~~~~~~~~

In file included from criu/arch/aarch64/include/asm/restorer.h:4,
                 from criu/arch/aarch64/crtools.c:11:
/usr/include/asm/sigcontext.h:28:8: error: redefinition of 'struct sigcontext'
   28 | struct sigcontext {
      |        ^~~~~~~~~~

Inspired by #2766 / #2767.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .github/workflows/alpine-test.yml    | 3 ++-
 contrib/dependencies/apk-packages.sh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/alpine-test.yml b/.github/workflows/alpine-test.yml
index 73530d79a..0f5c20f48 100644
--- a/.github/workflows/alpine-test.yml
+++ b/.github/workflows/alpine-test.yml
@@ -9,10 +9,11 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
     strategy:
       matrix:
+        os: [ubuntu-22.04, ubuntu-22.04-arm]
         target: [GCC=1, CLANG=1]
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v4
diff --git a/contrib/dependencies/apk-packages.sh b/contrib/dependencies/apk-packages.sh
index 0084dea3a..d02704b15 100755
--- a/contrib/dependencies/apk-packages.sh
+++ b/contrib/dependencies/apk-packages.sh
@@ -22,6 +22,7 @@ apk add --no-cache \
 	libnl3-dev \
 	nftables \
 	nftables-dev \
+	perl \
 	pkgconfig \
 	procps \
 	protobuf-c-compiler \

From 520266d8959b48bac345985874f6008f70755af2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 3 Oct 2025 17:02:25 +0100
Subject: [PATCH 1754/1854] zdtm: add sk-unix-restore-fs-share test

Add a ZDTM test case where CRIU uses a helper process to restore
a non-empty process group with a terminated leader and a Unix
domain socket. This reproduces a corner case in which mount
namespace switching can fail during restore:

https://github.com/checkpoint-restore/criu/issues/2687

Signed-off-by: Qiao Ma <mqaio@linux.alibaba.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/Makefile                     |   1 +
 test/zdtm/static/sk-unix-restore-fs-share.c   | 196 ++++++++++++++++++
 .../zdtm/static/sk-unix-restore-fs-share.desc |   1 +
 3 files changed, 198 insertions(+)
 create mode 100644 test/zdtm/static/sk-unix-restore-fs-share.c
 create mode 100644 test/zdtm/static/sk-unix-restore-fs-share.desc

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index e73f964be..6b262c443 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -382,6 +382,7 @@ TST_FILE	=				\
 		sk-unix-listen02		\
 		sk-unix-listen03		\
 		sk-unix-listen04		\
+		sk-unix-restore-fs-share	\
 		mnt_ext_file_bind_auto		\
 
 TST_DIR		=				\
diff --git a/test/zdtm/static/sk-unix-restore-fs-share.c b/test/zdtm/static/sk-unix-restore-fs-share.c
new file mode 100644
index 000000000..d4f6dde75
--- /dev/null
+++ b/test/zdtm/static/sk-unix-restore-fs-share.c
@@ -0,0 +1,196 @@
+#include <stdio.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Test non-empty process group with terminated parent and unix socket";
+const char *test_author = "Qiao Ma <mqaio@linux.alibaba.com>";
+
+char *filename;
+TEST_OPTION(filename, string, "socket file name", 1);
+
+static int create_and_connect(void)
+{
+	struct sockaddr_un addr;
+	int client_fd;
+
+	client_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (client_fd == -1) {
+		pr_perror("socket");
+		return -1;
+	}
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	if (snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", filename) >= (int)sizeof(addr.sun_path)) {
+		pr_err("Socket path too long\n");
+		close(client_fd);
+		return -1;
+	}
+
+	if (connect(client_fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+		pr_perror("connect");
+		close(client_fd);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int child(int ready_fd)
+{
+	int listen_fd;
+	struct sockaddr_un addr;
+	int ret = EXIT_FAILURE;
+
+	listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (listen_fd == -1) {
+		pr_perror("socket");
+		return EXIT_FAILURE;
+	}
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	if (strlen(filename) >= sizeof(addr.sun_path)) {
+		pr_err("Socket path too long\n");
+		goto cleanup;
+	}
+	strncpy(addr.sun_path, filename, sizeof(addr.sun_path));
+
+	unlink(filename); /* Ignore error if file doesn't exist */
+
+	if (bind(listen_fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+		pr_perror("bind");
+		goto cleanup;
+	}
+
+	if (listen(listen_fd, 5) == -1) {
+		pr_perror("listen");
+		goto cleanup;
+	}
+
+	if (create_and_connect() != 0) {
+		pr_err("Failed to create and connect\n");
+		goto cleanup;
+	}
+
+	/* Signal parent that socket is ready */
+	if (write(ready_fd, "1", 1) != 1) {
+		pr_perror("write ready_fd");
+		goto cleanup;
+	}
+
+	/* Wait indefinitely */
+	pause();
+
+	ret = EXIT_SUCCESS;
+cleanup:
+	if (listen_fd != -1)
+		close(listen_fd);
+	unlink(filename);
+
+	return ret;
+}
+
+static int zombie_leader(int *cpid)
+{
+	char buf;
+	pid_t pid;
+	int pipefd[2];
+
+	if (pipe(pipefd) == -1) {
+		pr_perror("pipe");
+		return EXIT_FAILURE;
+	}
+
+	if (setpgid(0, 0) == -1) {
+		pr_perror("setpgid");
+		return EXIT_FAILURE;
+	}
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("Failed to fork child");
+		return EXIT_FAILURE;
+	}
+
+	if (pid == 0) {
+		/* Close read end */
+		close(pipefd[0]);
+		exit(child(pipefd[1]));
+	}
+
+	/* Close write end in parent */
+	close(pipefd[1]);
+
+	/* Wait for child to set up socket */
+	if (read(pipefd[0], &buf, 1) != 1) {
+		pr_err("Failed to receive readiness signal from child\n");
+		close(pipefd[0]);
+		return EXIT_FAILURE;
+	}
+	close(pipefd[0]);
+
+	*cpid = pid;
+	return EXIT_SUCCESS;
+}
+
+int main(int argc, char **argv)
+{
+	int ret = EXIT_FAILURE, status;
+	pid_t pid;
+	int *cpid;
+
+	test_init(argc, argv);
+
+	cpid = mmap(NULL, sizeof(int), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+	if (cpid == MAP_FAILED) {
+		pr_perror("mmap");
+		return EXIT_FAILURE;
+	}
+	*cpid = 0;
+
+	pid = fork();
+	if (pid < 0) {
+		pr_perror("Failed to fork zombie");
+		goto out;
+	}
+
+	if (pid == 0)
+		exit(zombie_leader(cpid));
+
+	if (waitpid(pid, &status, 0) < 0) {
+		pr_perror("Failed to waitpid zombie");
+		goto out;
+	}
+
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS) {
+		pr_err("Unexpected exit code: %d\n", WEXITSTATUS(status));
+		goto out;
+	}
+
+	if (!*cpid) {
+		pr_err("Don't know grandchild's pid\n");
+		goto out;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = EXIT_SUCCESS;
+	pass();
+out:
+	/* Clean up */
+	if (*cpid)
+		kill(*cpid, SIGKILL);
+
+	munmap(cpid, sizeof(int));
+
+	return ret;
+}
diff --git a/test/zdtm/static/sk-unix-restore-fs-share.desc b/test/zdtm/static/sk-unix-restore-fs-share.desc
new file mode 100644
index 000000000..6c4afe5f0
--- /dev/null
+++ b/test/zdtm/static/sk-unix-restore-fs-share.desc
@@ -0,0 +1 @@
+{'flavor': 'ns uns'}

From 7bf402f6b3f117e9e464c39fcebf23b2a1af3644 Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Mon, 18 Aug 2025 11:00:07 +0900
Subject: [PATCH 1755/1854] vma: introduce VMA_AREA_UPROBES flag

This flag will be used for a "[uprobes]" vma.

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 criu/include/image.h | 7 +++++++
 criu/util.c          | 1 +
 2 files changed, 8 insertions(+)

diff --git a/criu/include/image.h b/criu/include/image.h
index 934f7d4e9..b5951d3d4 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -74,6 +74,12 @@
  *  	about virtual address space ranges covered by
  *  	MADV_GUARD_INSTALL guards. These ones must be always at
  *  	the end of the vma_area_list and properly skipped a.e.
+ *  - uprobes
+ *   	stands for a "[uprobes]" vma that's automatically mapped by
+ *   	the kernel when an active uprobe is hit. Contents of this vma
+ *   	are not dumped and neither are its madvise bits restored,
+ *   	because the kernel is in complete control of this vma. This is
+ *   	just used to track the existence of the uprobes vma.
  */
 #define VMA_AREA_NONE	  (0 << 0)
 #define VMA_AREA_REGULAR  (1 << 0)
@@ -94,6 +100,7 @@
 #define VMA_AREA_MEMFD	 (1 << 14)
 #define VMA_AREA_SHSTK	 (1 << 15)
 #define VMA_AREA_GUARD	 (1 << 16)
+#define VMA_AREA_UPROBES	(1 << 17)
 
 #define VMA_EXT_PLUGIN	  (1 << 27)
 #define VMA_CLOSE	  (1 << 28)
diff --git a/criu/util.c b/criu/util.c
index 58c18e20b..e2f80e4c6 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -195,6 +195,7 @@ static void vma_opt_str(const struct vma_area *v, char *opt)
 	opt2s(VMA_ANON_PRIVATE, "ap");
 	opt2s(VMA_AREA_SYSVIPC, "sysv");
 	opt2s(VMA_AREA_SOCKET, "sk");
+	opt2s(VMA_AREA_UPROBES, "uprobes");
 
 #undef opt2s
 }

From 0ff2e0a66e49c0ad0f8b8997ea773a0fc94b1223 Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Mon, 18 Aug 2025 10:53:18 +0900
Subject: [PATCH 1756/1854] criu-coredump: add VMA_AREA_UPROBES flag

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 coredump/criu_coredump/coredump.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index c6a758c8a..9454d8f0b 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -55,6 +55,7 @@ status = {
     "VMA_AREA_VVAR": 1 << 12,
     "VMA_AREA_AIORING": 1 << 13,
     "VMA_AREA_MEMFD": 1 << 14,
+    "VMA_AREA_UPROBES": 1 << 17,
     "VMA_AREA_UNSUPP": 1 << 31
 }
 

From 74bf40feeb683a668a9f1b192da627bb2d16fa67 Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Mon, 18 Aug 2025 10:54:28 +0900
Subject: [PATCH 1757/1854] crit: add VMA_AREA_UPROBES flag

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 lib/pycriu/images/pb2dict.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index 6c4f68889..a35dd3c3f 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -105,6 +105,7 @@ mmap_status_map = [
     ('VMA_AREA_AIORING', 1 << 13),
     ('VMA_AREA_MEMFD', 1 << 14),
     ('VMA_AREA_SHSTK', 1 << 15),
+    ('VMA_AREA_UPROBES', 1 << 17),
     ('VMA_UNSUPP', 1 << 31),
 ]
 

From bab72af9a5d5d9f715c351cdc5de51eabc3f7727 Mon Sep 17 00:00:00 2001
From: "Mahadasyam, Shashank (SGC)" <shashank.mahadasyam@sony.com>
Date: Mon, 18 Aug 2025 01:03:39 +0900
Subject: [PATCH 1758/1854] vma: introduce --allow-uprobes option

This commit teaches criu to deal with processes which have a "[uprobes]" vma.

This vma is mapped by the kernel when execution hits a uprobe location. This
is done so as to execute the uprobe'd instruciton out-of-line in the special
vma. The uprobe'd location is replaced by a software breakpoint instruction,
which is int3 on x86. When execution reaches that location, control is
transferred over to the kernel, which then executes whatever handler code
it has to, for the uprobe, and then executed the replaced instruction out-of-line
in the special vma. For more details, refer to this commit:
https://github.com/torvalds/linux/commit/d4b3b6384f98f8692ad0209891ccdbc7e78bbefe

Reason for adding a new option
------------------------------

A new option is added instead of making the uprobes vma handling transparent
to the user, so that when a dump is attempted on a process tree in which a
process has the uprobes vma, criu will error, asking the user to use this option.
This gives the user a chance to check what uprobes are attached to the processes
being dumped, and try to ensure that those uprobes are active on restore as well.

Again, the same reason for requiring this option on restore as well. Because
if a process is dumped with an active uprobe, and on restore if the uprobe
is not active, then if execution reaches the uprobe location, then the process
will be sent a SIGTRAP, whose default behaviour will terminate and core dump
the process. This is because the code pages are dumped with the software
breakpoint instruction replacement at the uprobe'd locations. On restore, if
execution reaches these locations and the kernel sees no associated active
uprobes, then it'll send a SIGTRAP.

So, using this option is on dump and restore is an implicit guarantee on the
user's behalf that they'll take care of the active uprobes and that any future
SIGTRAPs because of this are not on us! :)

Handling uprobes vma on dump
----------------------------

We don't need to store any information about the uprobes vma because it's
completely handled by the kernel, transparent to userspace. So, when a uprobes
vma is detected, we check if the --allow-uprobes option was specified or not.
If so, then the allow_uprobes boolean in the inventory image is set (this is
used on restore). The uprobes vma is skipped from being added to the vma list.

Handling uprobes vma on restore
-------------------------------

If allow_uprobes is set in the inventory image, then check if --allow-uprobes
is specified or not. Restoring the vma is not required.

Fixes: checkpoint-restore#1961
Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 criu/config.c             |  2 ++
 criu/cr-dump.c            |  4 ++++
 criu/crtools.c            |  2 ++
 criu/image.c              |  5 +++++
 criu/include/cr_options.h |  1 +
 criu/include/image.h      |  2 ++
 criu/include/proc_parse.h |  2 ++
 criu/proc_parse.c         | 24 +++++++++++++++++++++++-
 images/inventory.proto    |  1 +
 9 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/criu/config.c b/criu/config.c
index 1322a490a..d7ef3f8e8 100644
--- a/criu/config.c
+++ b/criu/config.c
@@ -18,6 +18,7 @@
 #include "cr_options.h"
 #include "filesystems.h"
 #include "file-lock.h"
+#include "image.h"
 #include "irmap.h"
 #include "mount.h"
 #include "mount-v2.h"
@@ -703,6 +704,7 @@ int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd,
 		BOOL_OPT("mntns-compat-mode", &opts.mntns_compat_mode),
 		BOOL_OPT("unprivileged", &opts.unprivileged),
 		BOOL_OPT("ghost-fiemap", &opts.ghost_fiemap),
+		BOOL_OPT(OPT_ALLOW_UPROBES, &opts.allow_uprobes),
 		{},
 	};
 
diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 10c485cbe..60b8e793c 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2319,6 +2319,10 @@ int cr_dump_tasks(pid_t pid)
 		goto err;
 
 	he.has_pre_dump_mode = false;
+	if (found_uprobes_vma()) {
+		he.has_allow_uprobes = true;
+		he.allow_uprobes = true;
+	}
 
 	ret = write_img_inventory(&he);
 	if (ret)
diff --git a/criu/crtools.c b/criu/crtools.c
index 509e73d74..203bded81 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -427,6 +427,8 @@ usage:
 	       "                        can be 'nftables' or 'iptables' (default).\n"
 	       "  --unprivileged        accept limitations when running as non-root\n"
 	       "                        consult documentation for further details\n"
+	       "  --allow-uprobes       allow dump/restore with uprobes vma\n"
+	       "                        consult documentation for further details\n"
 	       "\n"
 	       "* External resources support:\n"
 	       "  --external RES        dump objects from this list as external resources:\n"
diff --git a/criu/image.c b/criu/image.c
index f3747d6ff..c4f05e159 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -95,6 +95,11 @@ int check_img_inventory(bool restore)
 		goto out_err;
 	}
 
+	if (restore && he->allow_uprobes && !opts.allow_uprobes) {
+		pr_err("Dumped with --" OPT_ALLOW_UPROBES ". Need to set it on restore as well.\n");
+		goto out_err;
+	}
+
 	if (restore) {
 		if (!he->has_network_lock_method) {
 			/*
diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
index 4df8056b7..8c5707b41 100644
--- a/criu/include/cr_options.h
+++ b/criu/include/cr_options.h
@@ -196,6 +196,7 @@ struct cr_options {
 	char *work_dir;
 	int network_lock_method;
 	int skip_file_rwx_check;
+	int allow_uprobes;
 
 	/*
 	 * When we scheduler for removal some functionality we first
diff --git a/criu/include/image.h b/criu/include/image.h
index b5951d3d4..b06dbf706 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -114,6 +114,8 @@
 
 #define CR_PARENT_LINK "parent"
 
+#define OPT_ALLOW_UPROBES "allow-uprobes"
+
 extern bool ns_per_id;
 extern bool img_common_magic;
 
diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h
index 0bd79bf55..76d3242d2 100644
--- a/criu/include/proc_parse.h
+++ b/criu/include/proc_parse.h
@@ -105,4 +105,6 @@ extern int parse_uptime(uint64_t *upt);
 
 extern int parse_timens_offsets(struct timespec *boff, struct timespec *moff);
 
+extern bool found_uprobes_vma(void);
+
 #endif /* __CR_PROC_PARSE_H__ */
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index d7eb25662..0d3b5b23f 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -74,6 +74,8 @@ struct buffer {
 
 static struct buffer __buf;
 static char *buf = __buf.buf;
+/* only ever goes from false to true, if at all */
+static bool uprobes_vma_exists = false;
 
 /*
  * This is how AIO ring buffers look like in proc
@@ -202,8 +204,11 @@ static void parse_vma_vmflags(char *buf, struct vma_area *vma_area)
 	 * vmsplice doesn't work for VM_IO and VM_PFNMAP mappings, the
 	 * only exception is VVAR area that mapped by the kernel as
 	 * VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP
+	 *
+	 * The uprobes vma is also mapped by the kernel with VM_IO, among other flags
 	 */
-	if (io_pf && !vma_area_is(vma_area, VMA_AREA_VVAR) && !vma_entry_is(vma_area->e, VMA_FILE_SHARED))
+	if (io_pf && !vma_area_is(vma_area, VMA_AREA_VVAR) && !vma_entry_is(vma_area->e, VMA_FILE_SHARED)
+		  && !vma_area_is(vma_area, VMA_AREA_UPROBES))
 		vma_area->e->status |= VMA_UNSUPP;
 
 	if (vma_area->e->madv)
@@ -603,6 +608,14 @@ static int handle_vma(pid_t pid, struct vma_area *vma_area, const char *file_pat
 			goto err;
 	} else if (!strcmp(file_path, "[heap]")) {
 		vma_area->e->status |= VMA_AREA_REGULAR | VMA_AREA_HEAP;
+	} else if (!strcmp(file_path, "[uprobes]")) {
+		uprobes_vma_exists = true;
+		if (!opts.allow_uprobes) {
+			pr_err("PID %d has uprobes vma. Consider using --" OPT_ALLOW_UPROBES ".\n",
+				pid);
+			goto err;
+		}
+		vma_area->e->status |= VMA_AREA_UPROBES;
 	} else {
 		vma_area->e->status = VMA_AREA_REGULAR;
 	}
@@ -739,6 +752,10 @@ static int vma_list_add(struct vma_area *vma_area, struct vm_area_list *vma_area
 		 */
 		pr_debug("Device file mapping %016" PRIx64 "-%016" PRIx64 " supported via device plugins\n",
 			 vma_area->e->start, vma_area->e->end);
+	} else if (vma_area->e->status & VMA_AREA_UPROBES) {
+		pr_debug("Skipping uprobes vma %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
+		         vma_area->e->end);
+		return 0;
 	} else if (vma_area->e->status & VMA_UNSUPP) {
 		pr_err("Unsupported mapping found %016" PRIx64 "-%016" PRIx64 "\n", vma_area->e->start,
 		       vma_area->e->end);
@@ -2929,3 +2946,8 @@ int parse_uptime(uint64_t *upt)
 	fclose(f);
 	return 0;
 }
+
+bool found_uprobes_vma(void)
+{
+	return uprobes_vma_exists;
+}
diff --git a/images/inventory.proto b/images/inventory.proto
index 1e18815bb..feed5b850 100644
--- a/images/inventory.proto
+++ b/images/inventory.proto
@@ -33,4 +33,5 @@ message inventory_entry {
 	// This is currently used to delete the correct nftables
 	// network locking rule.
 	optional string                 dump_criu_run_id        = 13;
+	optional bool			allow_uprobes	= 14;
 }

From aeec40bf026df5218be0a8c381f33bc47de94203 Mon Sep 17 00:00:00 2001
From: "Mahadasyam, Shashank (SGC)" <shashank.mahadasyam@sony.com>
Date: Mon, 18 Aug 2025 01:04:10 +0900
Subject: [PATCH 1759/1854] docs: add documentation for --allow-uprobes

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 Documentation/criu.txt | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 606935790..40ede84e2 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -465,6 +465,30 @@ The 'mode' may be one of the following:
     *skip*::: Don't lock the network. If *--tcp-close* is not used, the network
     must be locked externally to allow CRIU to dump TCP connections.
 
+*--allow-uprobes*::
+    Allow dumping when uprobes vma is present. When used on dump, this option is
+    required on restore as well.
+
+    A uprobes vma is automatically created by the kernel once a uprobe is
+    triggered. This mapping is not removed even once the uprobe is deleted. So,
+    even if a process once had uprobes attached to it, and they're removed by
+    the time the process is dumped, this option is still required because criu
+    has no way of knowing whether there are active uprobes or not.
+
+    When using this option on restore, make sure the uprobes (if any) active on
+    the dumped processes are still active. Otherwise, when execution reaches
+    a uprobe'd location in any of the restored processes, that process will be
+    sent a SIGTRAP.
+
+    As an example, say a uprobe is set at function foo in the executable of the
+    process p_bar. Whenever execution in p_bar reaches function foo, the uprobe
+    is triggered. If the uprobe has been triggered at least once, then the kernel
+    will have created the uprobes vma. To dump p_bar, this option is
+    necessary. After dumping, say the uprobe is deleted. Now, on restoring with
+    this option, once execution reaches function foo, SIGTRAP will be sent to
+    the restored p_bar. Unless it has a signal handler installed for SIGTRAP,
+    it will be terminated and core dumped.
+
 *restore*
 ~~~~~~~~~
 Restores previously checkpointed processes.
@@ -692,6 +716,10 @@ The 'mode' may be one of the following:
 *--skip-file-rwx-check*::
     Skip checking file permissions (r/w/x for u/g/o) on restore.
 
+*--allow-uprobes*::
+    Required when dumped with this option. Refer to this option in the section
+    on dumping for more details.
+
 *check*
 ~~~~~~~
 Checks whether the kernel supports the features needed by *criu* to

From f548d3af4a8fd2d71dcb0592dec7d66e54786f26 Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Wed, 20 Aug 2025 22:05:03 +0900
Subject: [PATCH 1760/1854] crtools: remove "consult documentation"

Most people know this, don't they? :)

Suggested-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 criu/crtools.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/crtools.c b/criu/crtools.c
index 203bded81..e207133ac 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -426,9 +426,7 @@ usage:
 	       "  --network-lock METHOD network locking/unlocking method; argument\n"
 	       "                        can be 'nftables' or 'iptables' (default).\n"
 	       "  --unprivileged        accept limitations when running as non-root\n"
-	       "                        consult documentation for further details\n"
 	       "  --allow-uprobes       allow dump/restore with uprobes vma\n"
-	       "                        consult documentation for further details\n"
 	       "\n"
 	       "* External resources support:\n"
 	       "  --external RES        dump objects from this list as external resources:\n"

From dcce9bd0e2fb330cf2dc124c6ea2ee09af5133e1 Mon Sep 17 00:00:00 2001
From: Shashank Balaji <shashank.mahadasyam@sony.com>
Date: Fri, 22 Aug 2025 12:47:16 +0900
Subject: [PATCH 1761/1854] zdtm: add a test for --allow-uprobes option

Program flow:
- Parse the test's own executable to calculate the file offset of the uprobe
target function symbol
- Enable the uprobe at the target function
- Call the target function to trigger the uprobe, and hence the uprobes vma
creation
- C/R
- Call the target function again to check that no SIGTRAP is sent, since the
uprobe is still active

At least v1.7 of libtracefs is required because that's when
tracefs_instance_reset was introduced. The uprobes API was introduced in v1.4,
and the dynamic events API was introduced in v1.3.

Ubuntu Focal doesn't have libtracefs. Jammy has v1.2.5, and Noble has v1.7.

Signed-off-by: Shashank Balaji <shashank.mahadasyam@sony.com>
---
 contrib/dependencies/apk-packages.sh       |   3 +
 contrib/dependencies/apt-cross-packages.sh |   5 +-
 contrib/dependencies/apt-packages.sh       |   3 +
 contrib/dependencies/dnf-packages.sh       |   5 +-
 contrib/dependencies/pacman-packages.sh    |   3 +
 test/zdtm/static/Makefile                  |   9 +-
 test/zdtm/static/uprobes.c                 | 295 +++++++++++++++++++++
 test/zdtm/static/uprobes.desc              |   6 +
 8 files changed, 326 insertions(+), 3 deletions(-)
 create mode 100644 test/zdtm/static/uprobes.c
 create mode 100644 test/zdtm/static/uprobes.desc

diff --git a/contrib/dependencies/apk-packages.sh b/contrib/dependencies/apk-packages.sh
index d02704b15..c47fb9fe0 100755
--- a/contrib/dependencies/apk-packages.sh
+++ b/contrib/dependencies/apk-packages.sh
@@ -6,6 +6,7 @@ apk add --no-cache \
 	build-base \
 	coreutils \
 	e2fsprogs \
+	elfutils-dev \
 	git \
 	gnutls-dev \
 	go \
@@ -20,6 +21,8 @@ apk add --no-cache \
 	libdrm-dev \
 	libnet-dev \
 	libnl3-dev \
+	libtraceevent-dev \
+	libtracefs-dev \
 	nftables \
 	nftables-dev \
 	perl \
diff --git a/contrib/dependencies/apt-cross-packages.sh b/contrib/dependencies/apt-cross-packages.sh
index 588be40d0..30ce6874c 100755
--- a/contrib/dependencies/apt-cross-packages.sh
+++ b/contrib/dependencies/apt-cross-packages.sh
@@ -14,6 +14,8 @@ fi
 	libc6-"${DEBIAN_ARCH}"-cross \
 	libc6-dev-"${DEBIAN_ARCH}"-cross \
 	libcap-dev:"${DEBIAN_ARCH}" \
+	libdrm-dev:"${DEBIAN_ARCH}" \
+	libelf-dev:"${DEBIAN_ARCH}" \
 	libexpat1-dev:"${DEBIAN_ARCH}" \
 	libgnutls28-dev:"${DEBIAN_ARCH}" \
 	libnet-dev:"${DEBIAN_ARCH}" \
@@ -23,9 +25,10 @@ fi
 	libprotobuf-c-dev:"${DEBIAN_ARCH}" \
 	libprotobuf-dev:"${DEBIAN_ARCH}" \
 	libssl-dev:"${DEBIAN_ARCH}" \
+	libtraceevent-dev:"${DEBIAN_ARCH}" \
+	libtracefs-dev:"${DEBIAN_ARCH}" \
 	ncurses-dev:"${DEBIAN_ARCH}" \
 	uuid-dev:"${DEBIAN_ARCH}" \
-	libdrm-dev:"${DEBIAN_ARCH}" \
 	build-essential \
 	pkg-config \
 	git \
diff --git a/contrib/dependencies/apt-packages.sh b/contrib/dependencies/apt-packages.sh
index c60ba9041..1fd42d4e6 100755
--- a/contrib/dependencies/apt-packages.sh
+++ b/contrib/dependencies/apt-packages.sh
@@ -19,6 +19,7 @@ fi
 	libbsd-dev \
 	libcap-dev \
 	libdrm-dev \
+	libelf-dev \
 	libgnutls28-dev \
 	libgnutls30 \
 	libnet-dev \
@@ -28,6 +29,8 @@ fi
 	libprotobuf-c-dev \
 	libprotobuf-dev \
 	libselinux-dev \
+	libtraceevent-dev \
+	libtracefs-dev \
 	pkg-config \
 	protobuf-c-compiler \
 	protobuf-compiler \
diff --git a/contrib/dependencies/dnf-packages.sh b/contrib/dependencies/dnf-packages.sh
index efbb659c5..00dc91a2e 100755
--- a/contrib/dependencies/dnf-packages.sh
+++ b/contrib/dependencies/dnf-packages.sh
@@ -3,6 +3,7 @@
 dnf install -y \
 	asciidoc \
 	binutils \
+	elfutils-libelf-devel \
 	gcc \
 	git \
 	glibc-devel \
@@ -18,6 +19,8 @@ dnf install -y \
 	libnet-devel \
 	libnl3-devel \
 	libselinux-devel \
+	libtraceevent-devel \
+	libtracefs-devel \
 	libuuid-devel \
 	make \
 	nftables \
@@ -27,9 +30,9 @@ dnf install -y \
 	protobuf-c-devel \
 	protobuf-compiler \
 	protobuf-devel \
-	python-devel \
 	python3-importlib-metadata \
 	python3-protobuf \
 	python3-pyyaml \
+	python-devel \
 	rubygem-asciidoctor \
 	xmlto
diff --git a/contrib/dependencies/pacman-packages.sh b/contrib/dependencies/pacman-packages.sh
index 5fe6995fb..260797606 100755
--- a/contrib/dependencies/pacman-packages.sh
+++ b/contrib/dependencies/pacman-packages.sh
@@ -15,8 +15,11 @@ pacman -Syu --noconfirm \
 	libbsd \
 	libcap \
 	libdrm \
+	libelf \
 	libnet \
 	libnl \
+	libtraceevent \
+	libtracefs \
 	nftables \
 	pkg-config \
 	protobuf \
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 6b262c443..ea901a805 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -290,6 +290,7 @@ TST_NOFILE	:=				\
 
 PKG_CONFIG ?= pkg-config
 pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
+pkg-config-atleast-version = $(shell sh -c '$(PKG_CONFIG) --atleast-version=$(2) $(1) && echo y')
 ifeq ($(call pkg-config-check,libbpf),y)
 TST_NOFILE	+=				\
 		bpf_hash			\
@@ -298,7 +299,10 @@ endif
 
 ifneq ($(ARCH),arm)
 ifneq ($(COMPAT_TEST),y)
-        TST_NOFILE += maps03
+	TST_NOFILE += maps03
+ifeq ($(call pkg-config-atleast-version,libtracefs,1.7),y)
+	TST_NOFILE += uprobes
+endif
 endif
 endif
 
@@ -727,6 +731,9 @@ sk-unix-listen04: CFLAGS += -DSK_UNIX_LISTEN02 -DSK_UNIX_LISTEN03
 
 cgroupv2_01:		LDLIBS += -pthread
 
+uprobes:		CFLAGS += $(call pkg-cflags, libtracefs libtraceevent)
+uprobes:		LDLIBS += $(call pkg-libs, libtracefs libelf)
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/uprobes.c b/test/zdtm/static/uprobes.c
new file mode 100644
index 000000000..4164375b7
--- /dev/null
+++ b/test/zdtm/static/uprobes.c
@@ -0,0 +1,295 @@
+#include <fcntl.h>
+#include <gelf.h>
+#include <libelf.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <tracefs.h>
+#include <unistd.h>
+
+#include "zdtmtst.h"
+
+const char *test_doc = "Test the --allow-uprobes option";
+const char *test_author = "Shashank Balaji <shashank.mahadasyam@sony.com>";
+
+#define UPROBE_GROUP_NAME	"zdtm"
+#define UPROBE_EVENT_NAME	"uprobes_test"
+#define UPROBED_FUNCTION	uprobe_target
+
+/*
+ * A uprobe can be set at the start of a function, but not all instructions
+ * will trigger the creation of a uprobes vma.
+ *
+ * Examples:
+ * - aarch64: if the function is a single `ret`, then no vma creation
+ * - x64: if the function is `nop; ret`, then no vma creation
+ *
+ * So to guarantee vma creation, create a volatile dummy variable (to prevent
+ * compiler optimization) and use it (to prevent "unused variable" warning)
+ */
+void UPROBED_FUNCTION(void) {
+	volatile int dummy = 0;
+	dummy += 1;
+}
+/* Calling via volatile function pointer ensures noinline at callsite */
+typedef void (*func_ptr)(void);
+volatile func_ptr uprobe_target_alias = UPROBED_FUNCTION;
+
+struct uprobe_context {
+	struct tracefs_instance *instance;
+	struct tracefs_dynevent *uprobe;
+};
+
+volatile bool got_sigtrap = false;
+
+/*
+ * Returns the file offset of a symbol in the executable of this program
+ * Returns 0 on failure
+*/
+uint64_t calc_sym_offset(const char *sym_name)
+{
+	GElf_Shdr section_header;
+	Elf_Scn *section = NULL;
+	Elf_Data *symtab_data;
+	uint64_t offset = 0;
+	char buf[PATH_MAX];
+	GElf_Sym symbol;
+	ssize_t n_bytes;
+	int n_entries;
+	Elf *elf;
+	int fd;
+	int i;
+
+	if (elf_version(EV_CURRENT) == EV_NONE) {
+		pr_err("ELF version of libelf is lower than that of the program\n");
+		return 0;
+	}
+
+	n_bytes = readlink("/proc/self/exe", buf, sizeof(buf));
+	if (n_bytes < 0) {
+		pr_perror("Failed to readlink /proc/self/exe");
+		return 0;
+	}
+	buf[n_bytes] = '\0';
+
+	fd = open(buf, O_RDONLY);
+	if (fd < 0) {
+		pr_perror("Failed to open self-executable");
+		return 0;
+	}
+
+	elf = elf_begin(fd, ELF_C_READ, NULL);
+	if (!elf) {
+		pr_err("%s\n", elf_errmsg(elf_errno()));
+		goto out_fd;
+	}
+
+	/* Look for the symbol table section and its header */
+	while ((section = elf_nextscn(elf, section)) != NULL) {
+		gelf_getshdr(section, &section_header);
+		if (section_header.sh_type == SHT_SYMTAB)
+			break;
+	}
+	if (!section) {
+		pr_err("Failed to find symbol table\n");
+		goto out_elf;
+	}
+	symtab_data = elf_getdata(section, NULL);
+	n_entries = section_header.sh_size / section_header.sh_entsize;
+
+	/* Look for a symbol with the required name */
+	for (i = 0; i < n_entries; i++) {
+		gelf_getsym(symtab_data, i, &symbol);
+		/* Symbol table's sh_link is the index of the string table section header */
+		if (!strcmp(sym_name,
+			    elf_strptr(elf, section_header.sh_link, symbol.st_name)))
+			break;
+	}
+	if (i == n_entries) {
+		pr_err("Failed to find symbol \"%s\"\n", sym_name);
+		goto out_elf;
+	}
+
+	/* Get the section the symbol belongs to (mostly .text) */
+	section = elf_getscn(elf, symbol.st_shndx);
+	gelf_getshdr(section, &section_header);
+	offset = symbol.st_value - section_header.sh_addr + section_header.sh_offset;
+
+out_elf:
+	elf_end(elf);
+out_fd:
+	close(fd);
+	return offset;
+}
+
+/*
+ * Set and enable a uprobe on the file at the given offset
+ * Returns struct uprobe_context with members set to NULL on failure
+*/
+struct uprobe_context enable_uprobe(const char *file, uint64_t offset)
+{
+	struct tracefs_instance *trace_instance;
+	struct tracefs_dynevent *uprobe;
+	struct uprobe_context context = {};
+
+	trace_instance = tracefs_instance_create("zdtm_uprobes_test");
+	if (!trace_instance) {
+		pr_perror("Failed to create tracefs instance");
+		return context;
+	}
+	tracefs_instance_reset(trace_instance);
+
+	uprobe = tracefs_uprobe_alloc(UPROBE_GROUP_NAME, UPROBE_EVENT_NAME, file, offset, NULL);
+	if (!uprobe) {
+		pr_perror("Failed to allocate uprobe");
+		goto instance_destroy;
+	}
+
+	if (tracefs_dynevent_create(uprobe)) {
+		pr_perror("Failed to create uprobe");
+		goto uprobe_free;
+	}
+
+	if (tracefs_event_enable(trace_instance, UPROBE_GROUP_NAME, UPROBE_EVENT_NAME)) {
+		pr_perror("Failed to enable uprobe");
+		goto uprobe_destroy;
+	}
+
+	context.instance = trace_instance;
+	context.uprobe   = uprobe;
+	return context;
+
+uprobe_destroy:
+	tracefs_dynevent_destroy(uprobe, false);
+uprobe_free:
+	tracefs_dynevent_free(uprobe);
+instance_destroy:
+	tracefs_instance_destroy(trace_instance);
+	tracefs_instance_free(trace_instance);
+	return context;
+}
+
+void destroy_uprobe(struct uprobe_context context)
+{
+	tracefs_dynevent_destroy(context.uprobe, true);
+	tracefs_dynevent_free(context.uprobe);
+	tracefs_instance_destroy(context.instance);
+	tracefs_instance_free(context.instance);
+}
+
+/*
+ * Check for the existence of the "[uprobes]" vma in /proc/self/maps
+ * Returns -1 on failure, 0 if not found, 1 if found
+*/
+int uprobes_vma_exists(void)
+{
+	FILE *f;
+	char buf[LINE_MAX];
+	int ret = 0;
+
+	f = fopen("/proc/self/maps", "r");
+	if (!f) {
+		pr_perror("Failed to open /proc/self/maps");
+		return -1;
+	}
+
+	while (fgets(buf, sizeof(buf), f)) {
+		if (strstr(buf, "[uprobes]")) {
+			ret = 1;
+			break;
+		}
+	}
+	if (ret == 0 && !feof(f)) {
+		pr_err("Failed to finish reading /proc/self/maps\n");
+		ret = -1;
+	}
+
+	fclose(f);
+	return ret;
+}
+
+/*
+ * SIGTRAP is sent if execution reaches a previously set uprobed location, and
+ * the corresponding uprobe is not active. We don't want this to happen on restore
+*/
+void sigtrap_handler(int signo, siginfo_t *info, void* context)
+{
+	if (info->si_code == SI_KERNEL) {
+		got_sigtrap = true;
+		fail("SIGTRAP on attempting to call uprobed function");
+	}
+}
+
+int main(int argc, char **argv)
+{
+	struct uprobe_context context;
+	struct sigaction sa;
+	char buf[PATH_MAX];
+	uint64_t offset;
+	int n_bytes;
+	int ret = 1;
+
+	test_init(argc, argv);
+
+	offset = calc_sym_offset(__stringify(UPROBED_FUNCTION));
+	if (!offset)
+		return 1;
+
+	n_bytes = readlink("/proc/self/exe", buf, sizeof(buf));
+	if (n_bytes < 0) {
+		pr_perror("Failed to readlink /proc/self/exe");
+		return 1;
+	}
+	buf[n_bytes] = '\0';
+
+	sa.sa_flags = SA_SIGINFO;
+	sa.sa_sigaction = sigtrap_handler;
+	sigemptyset(&sa.sa_mask);
+	if (sigaction(SIGTRAP, &sa, NULL)) {
+		pr_perror("Failed to set SIGTRAP handler");
+		return 1;
+	}
+
+	context = enable_uprobe(buf, offset);
+	if (!context.instance)
+		return 1;
+
+	/*
+	 * Execution must reach the uprobed location at least once
+	 * for the kernel to create the uprobes vma
+	*/
+	uprobe_target_alias();
+
+	switch (uprobes_vma_exists()) {
+	case -1:
+		goto out_uprobe;
+		break;
+	case 0:
+		pr_err("uprobes vma does not exist\n");
+		goto out_uprobe;
+		break;
+	case 1:
+		test_msg("Found uprobes vma\n");
+		break;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	/*
+	 * Calling the uprobed function after restore should not cause
+	 * a SIGTRAP, since the uprobe is still active
+	*/
+	uprobe_target_alias();
+	if (!got_sigtrap) {
+		pass();
+		ret = 0;
+	}
+
+out_uprobe:
+	destroy_uprobe(context);
+	return ret;
+}
diff --git a/test/zdtm/static/uprobes.desc b/test/zdtm/static/uprobes.desc
new file mode 100644
index 000000000..6eab1f498
--- /dev/null
+++ b/test/zdtm/static/uprobes.desc
@@ -0,0 +1,6 @@
+{
+	'feature': 'cgroupns',
+	'flags': 'suid nouser',
+	'flavor': 'h',
+	'opts': '--allow-uprobes'
+}

From c03c08d1bca96132a34833c0233ddd48b016f2d7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 10 Sep 2025 10:50:46 +0100
Subject: [PATCH 1762/1854] cr-service: refactor rpc config parsing

When an additional configuration file is specified via RPC, this file is
parsed twice: first at an early stage to load options such as --log-file,
--work-dir, and --images-dir; and again after all RPC options and
configuration files have been evaluated.

This allows users to overwrite options specified via RPC by the
container runtime (e.g., --tcp-established). However, processing
the RPC config file twice leads to silently duplicating the values
of repeatable options such as `--action-script`.

To address this problem, we adjust the order of options parsing so
that the RPC config file is evaluated only once. This change should
not introduce any functional changes. Note that this change does
not affect the logging functionality, as early log messages are
temporarily buffered and only written to the log file once it has
been initialized (see commit 1ff2333 "Printout early log messages").

Fixes #2727

Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c | 299 +++++++++++++++++++++-------------------------
 1 file changed, 138 insertions(+), 161 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index a1089ad5c..e6aac232e 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -312,156 +312,6 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	BUG_ON(st.st_ino == -1);
 	service_sk_ino = st.st_ino;
 
-	/*
-	 * Evaluate an additional configuration file if specified.
-	 * This needs to happen twice, because it is needed early to detect
-	 * things like work_dir, imgs_dir and logfile. The second parsing
-	 * of the optional RPC configuration file happens at the end and
-	 * overwrites all options set via RPC.
-	 */
-	if (req->config_file) {
-		char *tmp_output = opts.output;
-		char *tmp_work = opts.work_dir;
-		char *tmp_imgs = opts.imgs_dir;
-
-		opts.output = NULL;
-		opts.work_dir = NULL;
-		opts.imgs_dir = NULL;
-
-		rpc_cfg_file = req->config_file;
-		i = parse_options(0, NULL, &dummy, &dummy, PARSING_RPC_CONF);
-		if (i) {
-			xfree(tmp_output);
-			xfree(tmp_work);
-			xfree(tmp_imgs);
-			goto err;
-		}
-		/* If this is non-NULL, the RPC configuration file had a value, use it.*/
-		if (opts.output)
-			output_changed_by_rpc_conf = true;
-		/* If this is NULL, use the old value if it was set. */
-		if (!opts.output && tmp_output) {
-			opts.output = tmp_output;
-			tmp_output = NULL;
-		}
-
-		if (opts.work_dir)
-			work_changed_by_rpc_conf = true;
-		if (!opts.work_dir && tmp_work) {
-			opts.work_dir = tmp_work;
-			tmp_work = NULL;
-		}
-
-		if (opts.imgs_dir)
-			imgs_changed_by_rpc_conf = true;
-		/*
-		 * As the images directory is a required RPC setting, it is not
-		 * necessary to use the value from other configuration files.
-		 * Either it is set in the RPC configuration file or it is set
-		 * via RPC.
-		 */
-		xfree(tmp_output);
-		xfree(tmp_work);
-		xfree(tmp_imgs);
-	}
-
-	/*
-	 * open images_dir - images_dir_fd is a required RPC parameter
-	 *
-	 * This assumes that if opts.imgs_dir is set we have a value
-	 * from the configuration file parser. The test to see that
-	 * imgs_changed_by_rpc_conf is true is used to make sure the value
-	 * is from the RPC configuration file.
-	 * The idea is that only the RPC configuration file is able to
-	 * overwrite RPC settings:
-	 *  * apply_config(global_conf)
-	 *  * apply_config(user_conf)
-	 *  * apply_config(environment variable)
-	 *  * apply_rpc_options()
-	 *  * apply_config(rpc_conf)
-	 */
-	if (imgs_changed_by_rpc_conf)
-		strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1);
-	else if (req->images_dir_fd != -1)
-		sprintf(images_dir_path, "/proc/%d/fd/%d", ids.pid, req->images_dir_fd);
-	else if (req->images_dir)
-		strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
-	else {
-		pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
-		goto err;
-	}
-
-	if (req->parent_img)
-		SET_CHAR_OPTS(img_parent, req->parent_img);
-
-	/*
-	 * Image streaming is not supported with CRIU's service feature as
-	 * the streamer must be started for each dump/restore operation.
-	 * It is unclear how to do that with RPC, so we punt for now.
-	 * This explains why we provide the argument mode=-1 instead of
-	 * O_RSTR or O_DUMP.
-	 */
-	if (open_image_dir(images_dir_path, -1) < 0) {
-		pr_perror("Can't open images directory");
-		goto err;
-	}
-
-	/* get full path to images_dir to use in process title */
-	if (readlink(images_dir_path, images_dir, PATH_MAX) == -1) {
-		pr_perror("Can't readlink %s", images_dir_path);
-		goto err;
-	}
-
-	/* chdir to work dir */
-	if (work_changed_by_rpc_conf)
-		/* Use the value from the RPC configuration file first. */
-		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
-	else if (req->has_work_dir_fd)
-		/* Use the value set via RPC. */
-		sprintf(work_dir_path, "/proc/%d/fd/%d", ids.pid, req->work_dir_fd);
-	else if (opts.work_dir)
-		/* Use the value from one of the other configuration files. */
-		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
-	else
-		/* Use the images directory a work directory. */
-		strcpy(work_dir_path, images_dir_path);
-
-	if (chdir(work_dir_path)) {
-		pr_perror("Can't chdir to work_dir");
-		goto err;
-	}
-
-	/* initiate log file in work dir */
-	if (req->log_file && !output_changed_by_rpc_conf) {
-		/*
-		 * If RPC sets a log file and if there nothing from the
-		 * RPC configuration file, use the RPC value.
-		 */
-		if (strchr(req->log_file, '/')) {
-			pr_perror("No subdirs are allowed in log_file name");
-			goto err;
-		}
-
-		SET_CHAR_OPTS(output, req->log_file);
-	} else if (req->has_log_to_stderr && req->log_to_stderr && !output_changed_by_rpc_conf) {
-		xfree(opts.output);
-		opts.output = NULL;
-	} else if (!opts.output) {
-		SET_CHAR_OPTS(output, DEFAULT_LOG_FILENAME);
-	}
-
-	/* This is needed later to correctly set the log_level */
-	opts.log_level = req->log_level;
-	log_set_loglevel(req->log_level);
-	if (log_init(opts.output) == -1) {
-		pr_perror("Can't initiate log");
-		goto err;
-	}
-
-	if (req->config_file) {
-		pr_debug("Would overwrite RPC settings with values from %s\n", req->config_file);
-	}
-
 	if (req->has_unprivileged)
 		opts.unprivileged = req->unprivileged;
 
@@ -753,14 +603,6 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		if (req->empty_ns & ~(CLONE_NEWNET))
 			goto err;
 	}
-
-	if (req->n_irmap_scan_paths) {
-		for (i = 0; i < req->n_irmap_scan_paths; i++) {
-			if (irmap_scan_path_add(req->irmap_scan_paths[i]))
-				goto err;
-		}
-	}
-
 	if (req->has_status_fd) {
 		pr_warn("status_fd is obsoleted; use status-ready notification instead\n");
 
@@ -781,13 +623,148 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->has_display_stats)
 		opts.display_stats = req->display_stats;
 
-	/* Evaluate additional configuration file a second time to overwrite
-	 * all RPC settings. */
+	/* Evaluate additional configuration file (e.g., runc.conf) to overwrite all RPC settings. */
 	if (req->config_file) {
+		char *tmp_output = opts.output;
+		char *tmp_work = opts.work_dir;
+
+		opts.output = NULL;
+		opts.work_dir = NULL;
+
+		/*
+		 * As the images directory is a required RPC setting, it is not
+		 * necessary to use the value from other configuration files.
+		 * Either it is set in the RPC configuration file or it is set
+		 * via RPC.
+		 */
+		xfree(opts.imgs_dir);
+		opts.imgs_dir = NULL;
+
+		pr_debug("Would overwrite RPC settings with values from %s\n", req->config_file);
+
 		rpc_cfg_file = req->config_file;
 		i = parse_options(0, NULL, &dummy, &dummy, PARSING_RPC_CONF);
-		if (i)
+		if (i) {
+			xfree(tmp_output);
+			xfree(tmp_work);
 			goto err;
+		}
+
+		/* If opts.{output,work_dir} is non-NULL, the RPC configuration file had a value, use it.*/
+		/* If opts.{output,work_dir} is NULL, use the old value if it was set. */
+		if (opts.output) {
+			output_changed_by_rpc_conf = true;
+		} else {
+			opts.output = tmp_output;
+			tmp_output = NULL;
+		}
+
+		if (opts.work_dir) {
+			work_changed_by_rpc_conf = true;
+		} else {
+			opts.work_dir = tmp_work;
+			tmp_work = NULL;
+		}
+
+		if (opts.imgs_dir)
+			imgs_changed_by_rpc_conf = true;
+
+		xfree(tmp_output);
+		xfree(tmp_work);
+	}
+
+	/*
+	 * open images_dir - images_dir_fd is a required RPC parameter
+	 *
+	 * This assumes that if opts.imgs_dir is set we have a value
+	 * from the configuration file parser. The test to see that
+	 * imgs_changed_by_rpc_conf is true is used to make sure the value
+	 * is from the RPC configuration file. The idea is that only the
+	 * RPC configuration file is able to overwrite RPC settings:
+	 *  * apply_config(global_conf)
+	 *  * apply_config(user_conf)
+	 *  * apply_config(environment variable)
+	 *  * apply_rpc_options()
+	 *  * apply_config(rpc_conf)
+	 */
+	if (imgs_changed_by_rpc_conf) {
+		strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1);
+	} else if (req->images_dir_fd != -1) {
+		sprintf(images_dir_path, "/proc/%d/fd/%d", ids.pid, req->images_dir_fd);
+	} else if (req->images_dir) {
+		strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
+	} else {
+		pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
+		goto err;
+	}
+
+	if (req->parent_img)
+		SET_CHAR_OPTS(img_parent, req->parent_img);
+
+	/*
+	 * Image streaming is not supported with CRIU's service feature as
+	 * the streamer must be started for each dump/restore operation.
+	 * It is unclear how to do that with RPC, so we punt for now.
+	 * This explains why we provide the argument mode=-1 instead of
+	 * O_RSTR or O_DUMP.
+	 */
+	if (open_image_dir(images_dir_path, -1) < 0) {
+		pr_perror("Can't open images directory");
+		goto err;
+	}
+
+	/* get full path to images_dir to use in process title */
+	if (readlink(images_dir_path, images_dir, PATH_MAX) == -1) {
+		pr_perror("Can't readlink %s", images_dir_path);
+		goto err;
+	}
+
+	if (work_changed_by_rpc_conf)
+		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
+	else if (req->has_work_dir_fd)
+		sprintf(work_dir_path, "/proc/%d/fd/%d", ids.pid, req->work_dir_fd);
+	else if (opts.work_dir)
+		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
+	else
+		strcpy(work_dir_path, images_dir_path);
+
+	if (chdir(work_dir_path)) {
+		pr_perror("Can't chdir to work_dir");
+		goto err;
+	}
+
+	if (req->n_irmap_scan_paths) {
+		for (i = 0; i < req->n_irmap_scan_paths; i++) {
+			if (irmap_scan_path_add(req->irmap_scan_paths[i]))
+				goto err;
+		}
+	}
+
+	/* initiate log file in work dir */
+	if (req->log_file && !output_changed_by_rpc_conf) {
+		/*
+		 * If RPC sets a log file and if there nothing from the
+		 * RPC configuration file, use the RPC value.
+		 */
+		if (strchr(req->log_file, '/')) {
+			pr_perror("No subdirs are allowed in log_file name");
+			goto err;
+		}
+
+		SET_CHAR_OPTS(output, req->log_file);
+	} else if (req->has_log_to_stderr && req->log_to_stderr && !output_changed_by_rpc_conf) {
+		xfree(opts.output);
+		opts.output = NULL;
+	} else if (!opts.output) {
+		SET_CHAR_OPTS(output, DEFAULT_LOG_FILENAME);
+	}
+
+	/* This is needed later to correctly set the log_level */
+	opts.log_level = req->log_level;
+	log_set_loglevel(req->log_level);
+	if (log_init(opts.output) == -1) {
+		pr_perror("Can't initiate log");
+		goto err;
 	}
 
 	if (req->mntns_compat_mode)

From 9d072222ef7a895c644ffe5be30ed4821dc9e30c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 3 Sep 2025 18:29:34 +0100
Subject: [PATCH 1763/1854] test/others/rpc: parse action-script via config

Extend the test for overwriting config options via RPC with
repeatable option (--action-script) and verify that the value
will not be silently duplicated.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/rpc/Makefile         |  1 +
 test/others/rpc/action-script.sh | 17 +++++++++++++++++
 test/others/rpc/config_file.py   | 11 +++++++++++
 3 files changed, 29 insertions(+)
 create mode 100755 test/others/rpc/action-script.sh

diff --git a/test/others/rpc/Makefile b/test/others/rpc/Makefile
index 384eb0539..c0e56d528 100644
--- a/test/others/rpc/Makefile
+++ b/test/others/rpc/Makefile
@@ -12,6 +12,7 @@ run: all
 	chmod a+rwx build
 	chmod a+rwx build/{imgs_errno,imgs_ps,imgs_c,imgs_loop,imgs_py}
 	rm -f build/status
+	rm -f build/_marker_*
 	@# Create all log files to be accessible for anybody
 	@# so that they can be displayed by any user.
 	for i in imgs_errno/criu.log imgs_ps/page-server.log imgs_ps/dump.log \
diff --git a/test/others/rpc/action-script.sh b/test/others/rpc/action-script.sh
new file mode 100755
index 000000000..991e315de
--- /dev/null
+++ b/test/others/rpc/action-script.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+MARKER_FILE="_marker_${CRTOOLS_SCRIPT_ACTION}"
+
+if [ -z "$CRTOOLS_SCRIPT_ACTION" ]; then
+	echo "Error: CRTOOLS_SCRIPT_ACTION is not set."
+	exit 2
+fi
+
+if [ ! -f "$MARKER_FILE" ]; then
+	touch "$MARKER_FILE"
+else
+	echo "Error: Running the same action hook for the second time"
+	exit 1
+fi
+
+exit 0
diff --git a/test/others/rpc/config_file.py b/test/others/rpc/config_file.py
index 6cffe270d..f5ec40818 100755
--- a/test/others/rpc/config_file.py
+++ b/test/others/rpc/config_file.py
@@ -13,6 +13,9 @@ from setup_swrk import setup_swrk
 log_file = 'config_file_test.log'
 does_not_exist = 'does-not.exist'
 
+script_path = os.path.dirname(os.path.abspath(__file__))
+action_script_file = os.path.join(script_path, 'action-script.sh')
+
 
 def setup_config_file(content):
     # Creating a temporary file which will be used as configuration file.
@@ -156,6 +159,7 @@ def test_rpc_with_configuration_file_overwriting_rpc():
     # file settings in the default configuration.
     log = does_not_exist
     content = 'log-file ' + log + '\n'
+    content += 'action-script ' + action_script_file + '\n'
     content += 'no-tcp-established\nno-shell-job'
     path = setup_config_file(content)
     # Only set the configuration file via RPC;
@@ -180,11 +184,18 @@ args = vars(parser.parse_args())
 
 cleanup_output(args['dir'])
 
+print("*** Test broken config file ***")
 test_broken_configuration_file()
 cleanup_output(args['dir'])
+
+print("*** Test RPC without config file ***")
 test_rpc_without_configuration_file()
 cleanup_output(args['dir'])
+
+print("*** Test RPC with config file ***")
 test_rpc_with_configuration_file()
 cleanup_output(args['dir'])
+
+print("*** Test configuration file overwriting RPC ***")
 test_rpc_with_configuration_file_overwriting_rpc()
 cleanup_output(args['dir'])

From bb9a7202a7a7965495456d3bd5f7aa07e9d06af3 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 3 Sep 2025 21:40:02 +0100
Subject: [PATCH 1764/1854] test/others/rpc: show logs on error

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/rpc/config_file.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/test/others/rpc/config_file.py b/test/others/rpc/config_file.py
index f5ec40818..c1a8276d8 100755
--- a/test/others/rpc/config_file.py
+++ b/test/others/rpc/config_file.py
@@ -92,29 +92,37 @@ def test_broken_configuration_file():
         sys.exit(-1)
 
 
-def search_in_log_file(log, message):
-    with open(os.path.join(args['dir'], log)) as f:
+def search_in_log_file(log_path, message):
+    with open(log_path) as f:
         if message not in f.read():
-            print(
-                'FAIL: Missing the expected error message (%s) in the log file'
-                % message)
+            print('FAIL: Missing the expected error message (%s) in the log file' % message)
             sys.exit(-1)
 
 
+def print_log_file(log_path):
+    print("\n--- Begin log file: %s ---" % log_path)
+    with open(log_path, 'r') as f:
+        print(f.read())
+    print("--- End log file ---\n")
+
+
 def check_results(resp, log):
     # Check if the specified log file exists
-    if not os.path.isfile(os.path.join(args['dir'], log)):
+    log_path = os.path.join(args['dir'], log)
+    if not os.path.isfile(log_path):
         print('FAIL: Expected log file %s does not exist' % log)
         sys.exit(-1)
     # Dump should have failed with: 'The criu itself is within dumped tree'
     if resp.type != rpc.DUMP:
         print('FAIL: Unexpected msg type %r' % resp.type)
+        print_log_file(log_path)
         sys.exit(-1)
     if 'The criu itself is within dumped tree' not in resp.cr_errmsg:
         print('FAIL: Missing the expected error message in RPC response')
+        print_log_file(log_path)
         sys.exit(-1)
     # Look into the log file for the same message
-    search_in_log_file(log, 'The criu itself is within dumped tree')
+    search_in_log_file(log_path, 'The criu itself is within dumped tree')
 
 
 def test_rpc_without_configuration_file():

From 3365c7c02583b6e6cdab976d484b47b1fae5f19d Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Thu, 4 Sep 2025 21:35:37 +0200
Subject: [PATCH 1765/1854] restorer: shstk: add restorer shadow stack stubs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* shstk_restorer_stack_size() – restorer shadow stack size
* shstk_set_restorer_stack() – set restorer shadow stack start

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Co-Authored-By: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/include/restore.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/criu/include/restore.h b/criu/include/restore.h
index 04d006505..2c4e4e267 100644
--- a/criu/include/restore.h
+++ b/criu/include/restore.h
@@ -9,6 +9,7 @@ extern int arch_set_thread_regs_nosigrt(struct pid *pid);
 
 struct task_restore_args;
 struct pstree_item;
+struct rst_shstk_info;
 
 #ifndef arch_shstk_prepare
 static inline int arch_shstk_prepare(struct pstree_item *item,
@@ -38,4 +39,18 @@ static inline int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *cor
 #define arch_shstk_trampoline arch_shstk_trampoline
 #endif
 
+#ifndef shstk_restorer_stack_size
+static always_inline long shstk_restorer_stack_size(void)
+{
+	return 0;
+}
+#endif
+
+#ifndef shstk_set_restorer_stack
+static always_inline long shstk_set_restorer_stack(struct rst_shstk_info *info, void *ptr)
+{
+	return 0;
+}
+#endif
+
 #endif

From f29cb750dbf292249126402b5f4d40e03d6cefd7 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Thu, 4 Sep 2025 21:45:19 +0200
Subject: [PATCH 1766/1854] x86/criu: shstk restorer memory accounting
 functions

* shstk_restorer_stack_size(): PAGE_SIZE
* shstk_set_restorer_stack(): set restorer temporary shadow stack start

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Co-Authored-By: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/arch/x86/include/asm/shstk.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
index 7814c351d..2b9a303b8 100644
--- a/criu/arch/x86/include/asm/shstk.h
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -73,6 +73,17 @@ int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
 		      int (*func)(void *arg), void *arg);
 #define arch_shstk_trampoline arch_shstk_trampoline
 
+static always_inline long shstk_restorer_stack_size(void)
+{
+	return PAGE_SIZE;
+}
+#define shstk_restorer_stack_size shstk_restorer_stack_size
+static always_inline void shstk_set_restorer_stack(struct rst_shstk_info *info, void *ptr)
+{
+	info->tmp_shstk = (unsigned long)ptr;
+}
+#define shstk_set_restorer_stack shstk_set_restorer_stack
+
 #ifdef CR_NOGLIBC
 
 #include <compel/plugins/std/syscall.h>

From b18c07d8a856bce56387e30c851858ee4745b5fa Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Fri, 17 Oct 2025 18:53:01 +0200
Subject: [PATCH 1767/1854] restorer: shstk: add shstk_min_mmap_addr()

* default: return whatever passed in
  eg. to be used as
     shtk_min_mmap_addr(kdat.mmap_min_addr)
* x86: ignore def and return 4G

On x86, CET shadow stack is required to be mapped above 4GiB
On the other hand forcing 4GiB globally would break 32-bit restores.

Co-Authored-By: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/arch/x86/include/asm/shstk.h | 6 ++++++
 criu/cr-restore.c                 | 9 +++++----
 criu/include/restore.h            | 7 +++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
index 2b9a303b8..f62b8c3e9 100644
--- a/criu/arch/x86/include/asm/shstk.h
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -84,6 +84,12 @@ static always_inline void shstk_set_restorer_stack(struct rst_shstk_info *info,
 }
 #define shstk_set_restorer_stack shstk_set_restorer_stack
 
+static always_inline long shstk_min_mmap_addr(struct rst_shstk_info *info, unsigned long __maybe_unused def)
+{
+	return !(info->cet & ARCH_SHSTK_SHSTK) ? def : (4UL << 30);
+}
+#define shstk_min_mmap_addr shstk_min_mmap_addr
+
 #ifdef CR_NOGLIBC
 
 #include <compel/plugins/std/syscall.h>
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 1c3b36451..9781dbfa0 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2431,16 +2431,15 @@ err:
 	return ret;
 }
 
-static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_head *self_vma_list, long vma_len)
+static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_head *self_vma_list, long min_addr, long vma_len)
 {
 	struct vma_area *t_vma, *s_vma;
-	long prev_vma_end = 0;
+	long prev_vma_end = min_addr;
 	struct vma_area end_vma;
 	VmaEntry end_e;
 
 	end_vma.e = &end_e;
 	end_e.start = end_e.end = kdat.task_size;
-	prev_vma_end = kdat.mmap_min_addr;
 
 	s_vma = list_first_entry(self_vma_list, struct vma_area, list);
 	t_vma = list_first_entry(tgt_vma_list, struct vma_area, list);
@@ -3226,7 +3225,9 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	 * or inited from scratch).
 	 */
 
-	mem = (void *)restorer_get_vma_hint(&vmas->h, &self_vmas.h, task_args->bootstrap_len);
+	mem = (void *)restorer_get_vma_hint(&vmas->h, &self_vmas.h,
+					    shstk_min_mmap_addr(&task_args->shstk, kdat.mmap_min_addr),
+					    task_args->bootstrap_len);
 	if (mem == (void *)-1) {
 		pr_err("No suitable area for task_restore bootstrap (%ldK)\n", task_args->bootstrap_len);
 		goto err;
diff --git a/criu/include/restore.h b/criu/include/restore.h
index 2c4e4e267..189051826 100644
--- a/criu/include/restore.h
+++ b/criu/include/restore.h
@@ -53,4 +53,11 @@ static always_inline long shstk_set_restorer_stack(struct rst_shstk_info *info,
 }
 #endif
 
+#ifndef shstk_min_mmap_addr
+static always_inline long shstk_min_mmap_addr(struct rst_shstk_info *info, unsigned long def)
+{
+	return def;
+}
+#endif
+
 #endif

From 02462c19c443e18ee6cdd54d849086eb22815b7d Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Sat, 6 Sep 2025 17:25:06 +0200
Subject: [PATCH 1768/1854] restorer: shstk: allocate restorer shadow stack

* reserve space for restorer shadow stack
* set tmp_shstk at mem, advance mem by PAGE_SIZE
* forget the extra PAGE_SIZE (shstk) for premapped VMAs

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Co-Authored-By: Andrei Vagin <avagin@gmail.com>
[ alex: small code cleanups ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/arch/x86/shstk.c | 1 -
 criu/cr-restore.c     | 6 +++++-
 criu/mem.c            | 9 ---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/criu/arch/x86/shstk.c b/criu/arch/x86/shstk.c
index b752f114a..0810efac5 100644
--- a/criu/arch/x86/shstk.c
+++ b/criu/arch/x86/shstk.c
@@ -45,7 +45,6 @@ static int shstk_prepare_task(struct vm_area_list *vmas,
 			shstk->vma_start = vma->e->start;
 			shstk->vma_size = size;
 			shstk->premmaped_addr = premmaped_addr;
-			shstk->tmp_shstk = premmaped_addr + size;
 
 			break;
 		}
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9781dbfa0..057ec0e93 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3195,7 +3195,7 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 
 	rst_mem_size = rst_mem_lock();
 	memzone_size = round_up(sizeof(struct restore_mem_zone) * current->nr_threads, page_size());
-	task_args->bootstrap_len = restorer_len + memzone_size + alen + rst_mem_size;
+	task_args->bootstrap_len = restorer_len + memzone_size + alen + rst_mem_size + shstk_restorer_stack_size();
 	BUG_ON(task_args->bootstrap_len & (PAGE_SIZE - 1));
 	pr_info("%d threads require %ldK of memory\n", current->nr_threads, KBYTES(task_args->bootstrap_len));
 
@@ -3466,6 +3466,10 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 	 * self-vmas are unmaped.
 	 */
 	mem += rst_mem_size;
+
+	shstk_set_restorer_stack(&task_args->shstk, mem);
+	mem += shstk_restorer_stack_size();
+
 	task_args->vdso_rt_parked_at = (unsigned long)mem;
 	task_args->vdso_maps_rt = vdso_maps_rt;
 	task_args->vdso_rt_size = vdso_rt_size;
diff --git a/criu/mem.c b/criu/mem.c
index f8c550842..9e8740c07 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -787,8 +787,6 @@ int prepare_mm_pid(struct pstree_item *i)
 			ri->vmas.rst_priv_size += vma_area_len(vma);
 			if (vma_has_guard_gap_hidden(vma))
 				ri->vmas.rst_priv_size += PAGE_SIZE;
-			if (vma_area_is(vma, VMA_AREA_SHSTK))
-				ri->vmas.rst_priv_size += PAGE_SIZE;
 		}
 
 		pr_info("vma 0x%" PRIx64 " 0x%" PRIx64 "\n", vma->e->start, vma->e->end);
@@ -931,13 +929,6 @@ static int premap_private_vma(struct pstree_item *t, struct vma_area *vma, void
 
 	size = vma_entry_len(vma->e);
 
-	/*
-	 * map an extra page for shadow stack VMAs, it will be used as a
-	 * temporary shadow stack
-	 */
-	if (vma_area_is(vma, VMA_AREA_SHSTK))
-		size += PAGE_SIZE;
-
 	if (!vma_inherited(vma)) {
 		int flag = 0;
 		/*

From abf4a71d9945cb841fe8d5406cd32c3b46e9e2a0 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Sat, 6 Sep 2025 18:02:37 +0200
Subject: [PATCH 1769/1854] x86/criu: shstk: add shstk_vma_restore()

1. create shadow stack vma during vma_remap cycle
2. copy contents from a premapped non-shstk VMA into it
3. unmap premapped non-shstk VMA
4. Mark shstk VMA for remap into the final destination

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Co-Authored-By: Andrei Vagin <avagin@gmail.com>
Co-Authored-By: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
[ alex: debugging, rework together with Andrei and code cleanup ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/arch/x86/include/asm/shstk.h | 37 +++++++++++++++++++++++++++++++
 criu/include/restorer.h           |  7 ++++++
 2 files changed, 44 insertions(+)

diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
index f62b8c3e9..da4fb80cd 100644
--- a/criu/arch/x86/include/asm/shstk.h
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -163,6 +163,43 @@ static inline int shstk_finalize(void)
 	return ret;
 }
 
+/*
+ * Create shadow stack vma and restore its content from premmapped anonymous (non-shstk) vma
+ */
+static always_inline int shstk_vma_restore(VmaEntry *vma_entry)
+{
+	long shstk, i;
+	unsigned long *shstk_data = (void *)vma_premmaped_start(vma_entry);
+	unsigned long vma_size = vma_entry_len(vma_entry);
+	long ret;
+
+	shstk = sys_map_shadow_stack(0, vma_size, SHADOW_STACK_SET_TOKEN);
+	if (shstk < 0) {
+		pr_err("Failed to map shadow stack: %ld\n", shstk);
+		return -1;
+	}
+
+	/* restore shadow stack contents */
+	for (i = 0; i < vma_size / 8; i++)
+		wrssq(shstk + i * 8, shstk_data[i]);
+
+	ret = sys_munmap(shstk_data, vma_size);
+	if (ret < 0) {
+		pr_err("Failed to unmap premmaped shadow stack\n");
+		return ret;
+	}
+
+	/*
+	 * From that point premapped vma is (shstk) and we need
+	 * to mremap() it to the final location. Originally premapped
+	 * (shstk_data) has been unmapped already.
+	 */
+	vma_premmaped_start(vma_entry) = shstk;
+
+	return 0;
+}
+#define shstk_vma_restore shstk_vma_restore
+
 /*
  * Restore contents of the shadow stack and set shadow stack pointer
  */
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 56bea0fcc..14c0a3768 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -357,4 +357,11 @@ static inline int arch_shstk_restore(struct rst_shstk_info *shstk)
 #define arch_shstk_restore arch_shstk_restore
 #endif
 
+#ifndef shstk_vma_restore
+static always_inline int shstk_vma_restore(VmaEntry *vma_entry)
+{
+	return -1;
+}
+#endif
+
 #endif /* __CR_RESTORER_H__ */

From 6fd71b9ee9775f7b275051d0cd028397235f86e8 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Sat, 6 Sep 2025 18:13:37 +0200
Subject: [PATCH 1770/1854] x86/criu: shstk: restore SHSTK via premap loops

* call shstk_vma_restore() for VMA_AREA_SHSTK in vma_remap()
* delete map/copy/unmap from shstk_restore() and keep token setup + finalize
* before the loop naturally stopped at cet->ssp-8, so a -8 nudge is required here

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Co-Authored-By: Andrei Vagin <avagin@gmail.com>
[ alex: small code cleanups ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 criu/arch/x86/include/asm/shstk.h | 26 ++------------------------
 criu/pie/restorer.c               | 31 +++++++++++++++++--------------
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/criu/arch/x86/include/asm/shstk.h b/criu/arch/x86/include/asm/shstk.h
index da4fb80cd..d113fd8ab 100644
--- a/criu/arch/x86/include/asm/shstk.h
+++ b/criu/arch/x86/include/asm/shstk.h
@@ -205,28 +205,11 @@ static always_inline int shstk_vma_restore(VmaEntry *vma_entry)
  */
 static always_inline int shstk_restore(struct rst_shstk_info *cet)
 {
-	unsigned long *shstk_data = (unsigned long *)cet->premmaped_addr;
-	unsigned long ssp = cet->vma_start + cet->vma_size - 8;
-	unsigned long shstk_top = cet->vma_size / 8 - 1;
-	unsigned long val;
-	long ret;
+	unsigned long ssp, val;
 
 	if (!(cet->cet & ARCH_SHSTK_SHSTK))
 		return 0;
 
-	if (shstk_map(cet->vma_start, cet->vma_size))
-		return -1;
-
-	/*
-	 * Switch shadow stack from temporary location to the actual task's
-	 * shadow stack VMA
-	 */
-	shstk_switch_ssp(ssp);
-
-	/* restore shadow stack contents */
-	for (; ssp >= cet->ssp; ssp -= 8, shstk_top--)
-		wrssq(ssp, shstk_data[shstk_top]);
-
 	/*
 	 * Add tokens for sigreturn frame and for switch of the shadow stack.
 	 * The sigreturn token will be checked by the kernel during
@@ -236,6 +219,7 @@ static always_inline int shstk_restore(struct rst_shstk_info *cet)
 	 */
 
 	/* token for sigreturn frame */
+	ssp = cet->ssp - 8;
 	val = ALIGN_DOWN(cet->ssp, 8) | SHSTK_DATA_BIT;
 	wrssq(ssp, val);
 
@@ -247,12 +231,6 @@ static always_inline int shstk_restore(struct rst_shstk_info *cet)
 	/* reset shadow stack pointer to the proper location */
 	shstk_switch_ssp(ssp);
 
-	ret = sys_munmap(shstk_data, cet->vma_size + PAGE_SIZE);
-	if (ret < 0) {
-		pr_err("Failed to unmap premmaped shadow stack\n");
-		return ret;
-	}
-
 	return shstk_finalize();
 }
 #define arch_shstk_restore shstk_restore
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 394d3dea0..5c40b0e93 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1112,6 +1112,23 @@ static int vma_remap(VmaEntry *vma_entry, int uffd)
 
 	pr_info("Remap %lx->%lx len %lx\n", src, dst, len);
 
+	/*
+	 * SHSTK VMAs are a bit special, in fact we create shstk vma right in the
+	 * shstk_vma_restore() and populate it with contents from a premapped VMA
+	 * (which in turns is just a normal anonymous VMA!). Then, we munmap() this
+	 * premapped VMA. After, we need to adjust vma_premmaped_start(vma_entry)
+	 * to point to a created shstk vma and treat it as a premmaped one in vma_remap().
+	 */
+	if (vma_entry_is(vma_entry, VMA_AREA_SHSTK)) {
+		if (shstk_vma_restore(vma_entry)) {
+			pr_err("Unable to prepare shadow stack vma for remap %lx -> %lx\n", src, dst);
+			return -1;
+		}
+
+		/* shstk_vma_restore() modifies vma premapped address */
+		src = vma_premmaped_start(vma_entry);
+	}
+
 	if (src - dst < len)
 		guard = dst;
 	else if (dst - src < len)
@@ -1811,13 +1828,6 @@ __visible long __export_restore_task(struct task_restore_args *args)
 		if (vma_entry->start > vma_entry->shmid)
 			break;
 
-		/*
-		 * shadow stack VMAs cannot be remapped, they must be
-		 * recreated with map_shadow_stack system call
-		 */
-		if (vma_entry_is(vma_entry, VMA_AREA_SHSTK))
-			continue;
-
 		if (vma_remap(vma_entry, args->uffd))
 			goto core_restore_end;
 	}
@@ -1835,13 +1845,6 @@ __visible long __export_restore_task(struct task_restore_args *args)
 		if (vma_entry->start < vma_entry->shmid)
 			break;
 
-		/*
-		 * shadow stack VMAs cannot be remapped, they must be
-		 * recreated with map_shadow_stack system call
-		 */
-		if (vma_entry_is(vma_entry, VMA_AREA_SHSTK))
-			continue;
-
 		if (vma_remap(vma_entry, args->uffd))
 			goto core_restore_end;
 	}

From 697c31abe442c3fe5e783994312ccfdbe5b4d265 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Sat, 6 Sep 2025 19:40:35 +0200
Subject: [PATCH 1771/1854] zdtm: shstk: add SHSTK_ENABLE test build option

* add SHSTK_ENABLE=1 toggle
* passes -mshstk to compiler and -z shstk to linker

Example:
  $ make -C test/zdtm/static clean
  $ make -C test/zdtm/static V=1 SHSTK_ENABLE=1 env00

  $ readelf --notes test/zdtm/static/env00 | grep SHSTK
      Properties: x86 feature: SHSTK

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Co-Authored-By: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
---
 test/zdtm/Makefile.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 3b349ed4d..465285f08 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -66,6 +66,11 @@ endif
         export PKG_CONFIG_PATH
 endif
 
+ifeq ($(SHSTK_ENABLE),1)
+        CFLAGS  += -mshstk
+        LDFLAGS += -Wl,-z,shstk
+endif
+
 define pkg-libs
         $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --libs $(1))
 endef

From a5ae3c184be47ca76b3c09f47406bcc234480966 Mon Sep 17 00:00:00 2001
From: Andrii Herheliuk <andrii@herheliuk.com>
Date: Sat, 18 Oct 2025 06:39:17 +0100
Subject: [PATCH 1772/1854] pycriu: set licence to LGPLv2.1

We use LGPL-v2.1 license for the libcriu and pycriu as they are
intended to be usable by both proprietary and open-source applications.

Signed-off-by: Andrii Herheliuk <andrii@herheliuk.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/pyproject.toml | 2 +-
 lib/setup.cfg      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pyproject.toml b/lib/pyproject.toml
index c9e11551b..63d9b5f47 100644
--- a/lib/pyproject.toml
+++ b/lib/pyproject.toml
@@ -8,7 +8,7 @@ description = "Python bindings for CRIU"
 authors = [
     {name = "CRIU team", email = "criu@lists.linux.dev"},
 ]
-license = {text = "GPLv2"}
+license = {text = "LGPLv2.1"}
 dynamic = ["version"]
 requires-python = ">=3.6"
 
diff --git a/lib/setup.cfg b/lib/setup.cfg
index 5d75719ca..902fed9ee 100644
--- a/lib/setup.cfg
+++ b/lib/setup.cfg
@@ -8,7 +8,7 @@ name = pycriu
 description = Python bindings for CRIU
 author = CRIU team
 author_email = criu@lists.linux.dev
-license = GPLv2
+license = LGPLv2.1
 version = attr: pycriu.__version__
 
 [options]

From 540c631dd006b071cc5f46968ec3a01757d7e66b Mon Sep 17 00:00:00 2001
From: Andrii Herheliuk <andrii@herheliuk.com>
Date: Fri, 17 Oct 2025 06:05:14 +0100
Subject: [PATCH 1773/1854] pycriu: add missing protobuf dependency

pycriu depends on protobuf to function correctly. Currently,
it raises an error if protobuf is not installed. Adding
protobuf to the dependencies ensures it is available after
installing pycriu.

Signed-off-by: Andrii Herheliuk <andrii@herheliuk.com>
---
 lib/pyproject.toml | 1 +
 lib/setup.cfg      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/pyproject.toml b/lib/pyproject.toml
index 63d9b5f47..ea9f88dcc 100644
--- a/lib/pyproject.toml
+++ b/lib/pyproject.toml
@@ -11,6 +11,7 @@ authors = [
 license = {text = "LGPLv2.1"}
 dynamic = ["version"]
 requires-python = ">=3.6"
+dependencies = ["protobuf"]
 
 [tool.setuptools]
 packages = ["pycriu", "pycriu.images"]
diff --git a/lib/setup.cfg b/lib/setup.cfg
index 902fed9ee..28c9e49c3 100644
--- a/lib/setup.cfg
+++ b/lib/setup.cfg
@@ -14,3 +14,5 @@ version = attr: pycriu.__version__
 [options]
 packages = find:
 python_requires = >=3.6
+install_requires =
+    protobuf

From d5c81f810816ae69d83d71ecd09c562f5bd50167 Mon Sep 17 00:00:00 2001
From: Andrii Herheliuk <andrii@herheliuk.com>
Date: Sat, 18 Oct 2025 04:00:08 +0100
Subject: [PATCH 1774/1854] pycriu: prevent always appending "Unknown" to error
 messages

Regardless of the actual error message, "Unknown" was always appended
to the end of the string, resulting in messages like:
"DUMP failed: Error(3): No process with such pidUnknown".

Fixed by changing standalone if statements to else-if blocks so
"Unknown" is only added when no specific error condition matches.

Signed-off-by: Andrii Herheliuk <andrii@herheliuk.com>
---
 lib/pycriu/criu.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/pycriu/criu.py b/lib/pycriu/criu.py
index f3e018095..5bd7ffecd 100644
--- a/lib/pycriu/criu.py
+++ b/lib/pycriu/criu.py
@@ -181,15 +181,14 @@ class CRIUExceptionExternal(CRIUException):
         if self.errno == errno.EBADRQC:
             s += "Bad options"
 
-        if self.typ == rpc.DUMP:
-            if self.errno == errno.ESRCH:
-                s += "No process with such pid"
+        elif self.typ == rpc.DUMP and self.errno == errno.ESRCH:
+            s += "No process with such pid"
 
-        if self.typ == rpc.RESTORE:
-            if self.errno == errno.EEXIST:
-                s += "Process with requested pid already exists"
+        elif self.typ == rpc.RESTORE and self.errno == errno.EEXIST:
+            s += "Process with requested pid already exists"
 
-        s += "Unknown"
+        else:
+            s += "Unknown"
 
         return s
 

From f824dc735bb905d2a3c7adc70a7abd68cdea8a99 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 Oct 2025 12:06:56 +0100
Subject: [PATCH 1775/1854] ci: consolidate action-script tests

This patch consolidates the action-script tests into
`test/others/action-script` to ensure all tests are executed
consistently and reduce duplication. Since we had two tests that appear
to do the same thing, we can remove the one that doesn't use zdtm.py.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile                                      |  1 +
 test/jenkins/actions.sh                       |  8 ---
 test/others/action-script/.gitignore          |  2 +-
 test/others/action-script/Makefile            |  2 -
 test/others/action-script/action-script.sh    |  2 -
 .../action-script}/check_actions.py           |  0
 test/others/action-script/run.sh              | 59 ++-----------------
 .../{ => others/action-script}/show_action.sh |  3 +-
 8 files changed, 9 insertions(+), 68 deletions(-)
 delete mode 100755 test/jenkins/actions.sh
 delete mode 100755 test/others/action-script/action-script.sh
 rename test/{ => others/action-script}/check_actions.py (100%)
 rename test/{ => others/action-script}/show_action.sh (66%)

diff --git a/Makefile b/Makefile
index 611bcdd5a..e6653bd6c 100644
--- a/Makefile
+++ b/Makefile
@@ -451,6 +451,7 @@ ruff:
 		test/zdtm.py \
 		test/inhfd/*.py \
 		test/others/rpc/config_file.py \
+		test/others/action-script/check_actions.py \
 		lib/pycriu/images/pb2dict.py \
 		lib/pycriu/images/images.py \
 		scripts/criu-ns \
diff --git a/test/jenkins/actions.sh b/test/jenkins/actions.sh
deleted file mode 100755
index 801904500..000000000
--- a/test/jenkins/actions.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Check how crit de/encodes images
-set -e
-source `dirname $0`/criu-lib.sh
-# prep
-rm -f actions_called.txt
-./test/zdtm.py run -t zdtm/static/env00 --script "$(pwd)/test/show_action.sh" || fail
-./test/check_actions.py || fail
-exit 0
diff --git a/test/others/action-script/.gitignore b/test/others/action-script/.gitignore
index c0b6a2490..ca9a0b541 100644
--- a/test/others/action-script/.gitignore
+++ b/test/others/action-script/.gitignore
@@ -1 +1 @@
-img-dir-*
+actions_called.txt
diff --git a/test/others/action-script/Makefile b/test/others/action-script/Makefile
index f1ce191db..594edc070 100644
--- a/test/others/action-script/Makefile
+++ b/test/others/action-script/Makefile
@@ -1,5 +1,3 @@
 run:
-	@make -C .. loop
 	./run.sh
-
 .PHONY: run
diff --git a/test/others/action-script/action-script.sh b/test/others/action-script/action-script.sh
deleted file mode 100755
index aba8292c0..000000000
--- a/test/others/action-script/action-script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-touch action-hook-"$CRTOOLS_SCRIPT_ACTION"
diff --git a/test/check_actions.py b/test/others/action-script/check_actions.py
similarity index 100%
rename from test/check_actions.py
rename to test/others/action-script/check_actions.py
diff --git a/test/others/action-script/run.sh b/test/others/action-script/run.sh
index a82fccf35..f18301502 100755
--- a/test/others/action-script/run.sh
+++ b/test/others/action-script/run.sh
@@ -1,60 +1,11 @@
 #!/bin/bash
 
-set -ebm
+set -e
 
-# shellcheck source=test/others/env.sh
-source ../env.sh || exit 1
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-SELFDIR="$(dirname "$(readlink -f "$0")")"
-SCRIPT="$SELFDIR/action-script.sh"
-IMGDIR="$SELFDIR/img-dir-$$"
+rm -f "${SCRIPT_DIR}"/actions_called.txt
+"${SCRIPT_DIR}"/../../zdtm.py run -t zdtm/static/env00 --script "$SCRIPT_DIR/show_action.sh" || exit 1
+"${SCRIPT_DIR}"/check_actions.py || exit 1
 
-rm -rf "$IMGDIR"
-mkdir "$IMGDIR"
-
-trap "cleanup" QUIT TERM INT HUP EXIT
-
-# shellcheck disable=SC2317
-# https://github.com/koalaman/shellcheck/issues/2660
-function cleanup()
-{
-	if [[ -n "$PID" ]]; then
-		kill -9 "$PID"
-	fi
-}
-
-PID=$(../loop)
-if ! $CRIU dump -v4 -o dump.log -t "$PID" -D "$IMGDIR" --action-script "$SCRIPT"; then
-	echo "Failed to checkpoint process $PID"
-	cat dump.log
-	kill -9 "$PID"
-	exit 1
-fi
-
-if ! $CRIU restore -v4 -o restore.log -D "$IMGDIR" -d --pidfile test.pidfile --action-script "$SCRIPT"; then
-	echo "CRIU restore failed"
-	echo FAIL
-	exit 1
-fi
-
-PID=$(cat "$IMGDIR"/test.pidfile)
-
-found_missing_file=false
-hooks=("pre-dump" "post-dump" "pre-restore" "pre-resume" "post-restore" "post-resume")
-
-for hook in "${hooks[@]}"
-do
-	if [ ! -e "$IMGDIR/action-hook-$hook" ]; then
-		echo "ERROR: action-hook-$hook does not exist"
-		found_missing_file=true
-	fi
-done
-
-if [ "$found_missing_file" = true ]; then
-	exit 1
-fi
-
-echo PASS
-
-rm -rf "$IMGDIR"
 exit 0
diff --git a/test/show_action.sh b/test/others/action-script/show_action.sh
similarity index 66%
rename from test/show_action.sh
rename to test/others/action-script/show_action.sh
index 86468b67a..afbfc3f27 100755
--- a/test/show_action.sh
+++ b/test/others/action-script/show_action.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
+
 echo "${CRTOOLS_SCRIPT_ACTION} ${CRTOOLS_IMAGE_DIR} ${CRTOOLS_INIT_PID}" \
-	     >> "$(dirname $0)/actions_called.txt"
+	>> "$(dirname "$0")/actions_called.txt"

From f74e68daf90aa2401024b1f106d84677e6354e47 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 Oct 2025 12:11:45 +0100
Subject: [PATCH 1776/1854] ci: verify call order of action-script hooks

The existing test collects all action-script hooks triggered during
`h`, `ns`, and `uns` runs with ZDTM into `actions_called.txt`, then
verifies that each hook appears at least once. However, the test does
not verify that hooks are invoked *exactly once* or in *correct order*.

This change updates the test to run ZDTM only with ns flavour as this
seems to cover all action-script hooks, and checks that all hooks are
called correctly.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/action-script/check_actions.py | 65 +++++++++++++---------
 test/others/action-script/run.sh           |  2 +-
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/test/others/action-script/check_actions.py b/test/others/action-script/check_actions.py
index 84d738dbb..0140d8762 100755
--- a/test/others/action-script/check_actions.py
+++ b/test/others/action-script/check_actions.py
@@ -1,41 +1,54 @@
 #!/usr/bin/env python3
 
-import sys
 import os
+import sys
+
+EXPECTED_ACTIONS = [
+    'pre-dump',
+    'network-lock',
+    'post-dump',
+    'pre-restore',
+    'setup-namespaces',
+    'post-setup-namespaces',
+    'post-restore',
+    'network-unlock',
+    'pre-resume',
+    'post-resume',
+]
 
-actions = set(['pre-dump', 'pre-restore', 'post-dump', 'setup-namespaces', \
-  'post-setup-namespaces', 'post-restore', 'post-resume', \
-  'network-lock', 'network-unlock' ])
 errors = []
-af = os.path.dirname(os.path.abspath(__file__)) + '/actions_called.txt'
+actions_called = []
+actions_called_file = os.path.join(os.path.dirname(__file__), 'actions_called.txt')
 
-for act in open(af):
-    act = act.strip().split()
-    act.append('EMPTY')
-    act.append('EMPTY')
+with open(actions_called_file) as f:
+    for index, line in enumerate(f):
+        parts = line.strip().split()
+        parts += ['EMPTY'] * (3 - len(parts))
+        action_hook, image_dir, pid = parts
 
-    if act[0] == 'EMPTY':
-        raise Exception("Error in test, bogus actions line")
+        if action_hook == 'EMPTY':
+            raise ValueError("Error in test: bogus actions line")
 
-    if act[1] == 'EMPTY':
-        errors.append('Action %s misses CRTOOLS_IMAGE_DIR' % act[0])
+        expected_action = EXPECTED_ACTIONS[index] if index < len(EXPECTED_ACTIONS) else None
+        if action_hook != expected_action:
+            raise ValueError(f"Invalid action: {action_hook} != {expected_action}")
 
-    if act[0] in ('post-dump', 'setup-namespaces', 'post-setup-namespaces', \
-      'post-restore', 'post-resume', 'network-lock', 'network-unlock'):
-        if act[2] == 'EMPTY':
-            errors.append('Action %s misses CRTOOLS_INIT_PID' % act[0])
-        elif not act[2].isdigit() or int(act[2]) == 0:
-            errors.append('Action %s PID is not number (%s)' %
-                          (act[0], act[2]))
+        if image_dir == 'EMPTY':
+            errors.append(f'Action {action_hook} misses CRTOOLS_IMAGE_DIR')
 
-    actions -= set([act[0]])
+        if action_hook != 'pre-restore':
+            if pid == 'EMPTY':
+                errors.append(f'Action {action_hook} misses CRTOOLS_INIT_PID')
+            elif not pid.isdigit() or int(pid) == 0:
+                errors.append(f'Action {action_hook} PID is not a valid number ({pid})')
 
-if actions:
-    errors.append('Not all actions called: %r' % actions)
+        actions_called.append(action_hook)
+
+if actions_called != EXPECTED_ACTIONS:
+    errors.append(f'Not all actions called: {actions_called!r}')
 
 if errors:
-    for x in errors:
-        print(x)
+    print('\n'.join(errors))
     sys.exit(1)
 
-print('PASS')
+print('Check Actions PASS')
diff --git a/test/others/action-script/run.sh b/test/others/action-script/run.sh
index f18301502..574f6fc86 100755
--- a/test/others/action-script/run.sh
+++ b/test/others/action-script/run.sh
@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 rm -f "${SCRIPT_DIR}"/actions_called.txt
-"${SCRIPT_DIR}"/../../zdtm.py run -t zdtm/static/env00 --script "$SCRIPT_DIR/show_action.sh" || exit 1
+"${SCRIPT_DIR}"/../../zdtm.py run -t zdtm/static/env00 -f ns --script "$SCRIPT_DIR/show_action.sh" || exit 1
 "${SCRIPT_DIR}"/check_actions.py || exit 1
 
 exit 0

From d3dfb663b1022ec89431a0e61113f55a771bc73c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 Oct 2025 10:51:46 +0100
Subject: [PATCH 1777/1854] make: don't install external dependencies

Don't install external pip dependencies when running `make install`.
As we are not really into developing a Python project, we should
not install additional packages. CRIU does that nowhere else.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile.install | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.install b/Makefile.install
index 455735f3b..70c607ec6 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -46,9 +46,13 @@ endif
 endif
 
 # Default flags for pip install:
-# --upgrade: Upgrade crit/pycriu packages
-# --ignore-installed: Ignore existing packages and reinstall them
-PIPFLAGS ?= --upgrade --ignore-installed
+# --ignore-installed: Overwrite already installed pycriu/crit packages
+# --no-build-isolation: Use current Python environment to build pycriu/crit packages
+# --no-deps: Don't install any dependencies
+# --no-index: Don't use PyPI index to find packages
+# --progress-bar: Cleaner output
+# --upgrade: Treat the install as an upgrade when replacing the installed version
+PIPFLAGS ?= --ignore-installed --no-build-isolation --no-deps --no-index --progress-bar off --upgrade
 
 export SKIP_PIP_INSTALL PIPFLAGS
 

From 68601814747470bc0ef28b3ce42f5b8d61f230e8 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 Oct 2025 11:43:17 +0100
Subject: [PATCH 1778/1854] ci: add wheel and setuptools in dnf packages

These dependencies are required to for `pip install`.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 contrib/dependencies/dnf-packages.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/dependencies/dnf-packages.sh b/contrib/dependencies/dnf-packages.sh
index 00dc91a2e..793f267a5 100755
--- a/contrib/dependencies/dnf-packages.sh
+++ b/contrib/dependencies/dnf-packages.sh
@@ -30,9 +30,11 @@ dnf install -y \
 	protobuf-c-devel \
 	protobuf-compiler \
 	protobuf-devel \
+	python-devel \
 	python3-importlib-metadata \
 	python3-protobuf \
 	python3-pyyaml \
-	python-devel \
+	python3-setuptools \
+	python3-wheel \
 	rubygem-asciidoctor \
 	xmlto

From afcfcd3bf68bb0e1c45c1951b0469fe9588512b4 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 21 Oct 2025 12:49:00 +0100
Subject: [PATCH 1779/1854] ci: add which dependency in dnf packages

which is used in Makefiles to check for dependencies:

Example:
export USE_ASCIIDOCTOR ?= $(shell which asciidoctor 2>/dev/null)

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 contrib/dependencies/dnf-packages.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/dependencies/dnf-packages.sh b/contrib/dependencies/dnf-packages.sh
index 793f267a5..60f21db6d 100755
--- a/contrib/dependencies/dnf-packages.sh
+++ b/contrib/dependencies/dnf-packages.sh
@@ -37,4 +37,5 @@ dnf install -y \
 	python3-setuptools \
 	python3-wheel \
 	rubygem-asciidoctor \
+	which \
 	xmlto

From 07ad2473f27a2afd09e0379d18cf046782752d6c Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Sun, 26 Oct 2025 17:14:03 -0700
Subject: [PATCH 1780/1854] Use command -v instead of which

Unlike "which", which is a separate executable not always installed by
default, "command -v" is a shell built-in available at least for bash,
dash, and busybox shell.

Unlike "which", "command -v" is also easier to grep for, and it is
already used in a few places here.

Inspired by commit 57251d811.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .github/workflows/lint.yml               | 2 +-
 Makefile                                 | 2 +-
 contrib/dependencies/dnf-packages.sh     | 1 -
 contrib/docker_cr.sh                     | 4 ++--
 scripts/ci/prepare-for-fedora-rawhide.sh | 3 +--
 scripts/nmk/scripts/tools.mk             | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 862d68245..f7da4f6f6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       image: registry.fedoraproject.org/fedora:latest
     steps:
     - name: Install tools
-      run: sudo dnf -y install git make ruff xz clang-tools-extra which codespell git-clang-format ShellCheck
+      run: sudo dnf -y install git make ruff xz clang-tools-extra codespell git-clang-format ShellCheck
 
     - uses: actions/checkout@v4
 
diff --git a/Makefile b/Makefile
index e6653bd6c..1824ea180 100644
--- a/Makefile
+++ b/Makefile
@@ -489,7 +489,7 @@ lint: ruff shellcheck codespell
 	! git --no-pager grep -E '\s+$$' \*.c \*.h
 .PHONY: lint ruff shellcheck codespell
 
-codecov: SHELL := $(shell which bash)
+codecov: SHELL := $(shell command -v bash)
 codecov:
 	curl -Os https://uploader.codecov.io/latest/linux/codecov
 	chmod +x codecov
diff --git a/contrib/dependencies/dnf-packages.sh b/contrib/dependencies/dnf-packages.sh
index 60f21db6d..793f267a5 100755
--- a/contrib/dependencies/dnf-packages.sh
+++ b/contrib/dependencies/dnf-packages.sh
@@ -37,5 +37,4 @@ dnf install -y \
 	python3-setuptools \
 	python3-wheel \
 	rubygem-asciidoctor \
-	which \
 	xmlto
diff --git a/contrib/docker_cr.sh b/contrib/docker_cr.sh
index 9b43d8ba1..04ef676cd 100755
--- a/contrib/docker_cr.sh
+++ b/contrib/docker_cr.sh
@@ -418,7 +418,7 @@ resolve_path() {
 	local p
 
 	p="${2}"
-	if which realpath > /dev/null; then
+	if command -v realpath > /dev/null; then
 		p=$(realpath "${p}")
 	fi
 	${ECHO} "${1}: ${p}"
@@ -427,7 +427,7 @@ resolve_path() {
 resolve_cmd() {
 	local cpath
 
-	cpath=$(which "${2}")
+	cpath=$(command -v "${2}")
 	resolve_path "${1}" "${cpath}"
 }
 
diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh
index ff75717c5..b0b45fcc3 100755
--- a/scripts/ci/prepare-for-fedora-rawhide.sh
+++ b/scripts/ci/prepare-for-fedora-rawhide.sh
@@ -15,8 +15,7 @@ dnf install -y \
 	python-unversioned-command \
 	redhat-rpm-config \
 	sudo \
-	tar \
-	which
+	tar
 
 # /tmp is no longer 755 in the rawhide container image and breaks CI - fix it
 chmod 1777 /tmp
diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
index 724204a03..de5782c13 100644
--- a/scripts/nmk/scripts/tools.mk
+++ b/scripts/nmk/scripts/tools.mk
@@ -23,7 +23,7 @@ MAKE		:= make
 MKDIR		:= mkdir -p
 AWK		:= awk
 PERL		:= perl
-FULL_PYTHON	:= $(shell which python3 2>/dev/null)
+FULL_PYTHON	:= $(shell command -v python3 2>/dev/null)
 PYTHON		?= $(shell basename $(FULL_PYTHON))
 FIND		:= find
 SH		:= $(shell if [ -x "$$BASH" ]; then echo $$BASH;        \
@@ -36,7 +36,7 @@ CTAGS		:= ctags
 export RM HOSTLD LD HOSTCC CC CPP AS AR STRIP OBJCOPY OBJDUMP
 export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE
 
-export USE_ASCIIDOCTOR ?= $(shell which asciidoctor 2>/dev/null)
+export USE_ASCIIDOCTOR ?= $(shell command -v asciidoctor 2>/dev/null)
 
 #
 # Footer.

From 2878faa74c96c0b816453d0a0c86e219e4e33fed Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 7 Oct 2025 16:31:17 +0100
Subject: [PATCH 1781/1854] libcriu: enable setting of RPC config file

Container runtimes that use libcriu (e.g., crun) need to specify a CRIU
configuration file that allows to overwrite default options set via RPC.
This is particularly useful to set options such as `--tcp-established`
via `/etc/criu/runc.conf` in Kubernetes.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/c/criu.c | 19 +++++++++++++++++++
 lib/c/criu.h |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/lib/c/criu.c b/lib/c/criu.c
index c16fe5dcd..485c8b178 100644
--- a/lib/c/criu.c
+++ b/lib/c/criu.c
@@ -2041,3 +2041,22 @@ void criu_set_empty_ns(int namespaces)
 {
 	criu_local_set_empty_ns(global_opts, namespaces);
 }
+
+int criu_local_set_config_file(criu_opts *opts, const char *path)
+{
+	char *new;
+
+	new = strdup(path);
+	if (!new)
+		return -ENOMEM;
+
+	free(opts->rpc->config_file);
+	opts->rpc->config_file = new;
+
+	return 0;
+}
+
+int criu_set_config_file(const char *path)
+{
+	return criu_local_set_config_file(global_opts, path);
+}
diff --git a/lib/c/criu.h b/lib/c/criu.h
index c1c607869..44446f664 100644
--- a/lib/c/criu.h
+++ b/lib/c/criu.h
@@ -116,6 +116,7 @@ void criu_set_pidfd_store_sk(int sk);
 int criu_set_network_lock(enum criu_network_lock_method method);
 int criu_join_ns_add(const char *ns, const char *ns_file, const char *extra_opt);
 void criu_set_mntns_compat_mode(bool val);
+int criu_set_config_file(const char *path);
 
 /*
  * The criu_notify_arg_t na argument is an opaque
@@ -281,6 +282,7 @@ void criu_local_set_pidfd_store_sk(criu_opts *opts, int sk);
 int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method);
 int criu_local_join_ns_add(criu_opts *opts, const char *ns, const char *ns_file, const char *extra_opt);
 void criu_local_set_mntns_compat_mode(criu_opts *opts, bool val);
+int criu_local_set_config_file(criu_opts *opts, const char *path);
 
 void criu_local_set_notify_cb(criu_opts *opts, int (*cb)(char *action, criu_notify_arg_t na));
 

From 3f97cfe876b4e54be42c19263796de61633402ac Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 9 Oct 2025 11:21:35 +0100
Subject: [PATCH 1782/1854] test/libcriu: check setting of RPC config file

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/libcriu/.gitignore        |   1 +
 test/others/libcriu/Makefile          |   1 +
 test/others/libcriu/run.sh            |   1 +
 test/others/libcriu/test_rpc_config.c | 223 ++++++++++++++++++++++++++
 4 files changed, 226 insertions(+)
 create mode 100644 test/others/libcriu/test_rpc_config.c

diff --git a/test/others/libcriu/.gitignore b/test/others/libcriu/.gitignore
index 0f6e52bb4..30a56999c 100644
--- a/test/others/libcriu/.gitignore
+++ b/test/others/libcriu/.gitignore
@@ -8,3 +8,4 @@ test_pre_dump
 test_feature_check
 output/
 libcriu.so.*
+test_rpc_config
diff --git a/test/others/libcriu/Makefile b/test/others/libcriu/Makefile
index ae7330533..e0ee5b2ab 100644
--- a/test/others/libcriu/Makefile
+++ b/test/others/libcriu/Makefile
@@ -3,6 +3,7 @@ include ../../../../criu/Makefile.versions
 TESTS += test_sub
 TESTS += test_self
 TESTS += test_notify
+TESTS += test_rpc_config
 TESTS += test_iters
 TESTS += test_errno
 TESTS += test_join_ns
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index f7d363aab..804af9b83 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -55,6 +55,7 @@ run_test() {
 run_test test_sub
 run_test test_self
 run_test test_notify
+run_test test_rpc_config
 if [ "$(uname -m)" = "x86_64" ]; then
 	# Skip this on aarch64 as aarch64 has no dirty page tracking
 	run_test test_iters
diff --git a/test/others/libcriu/test_rpc_config.c b/test/others/libcriu/test_rpc_config.c
new file mode 100644
index 000000000..529f13637
--- /dev/null
+++ b/test/others/libcriu/test_rpc_config.c
@@ -0,0 +1,223 @@
+#include "criu.h"
+#include "lib.h"
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <string.h>
+#include <time.h>
+
+#define RANDOM_NAME_LEN 6
+#define PATH_BUF_SIZE	128
+
+static volatile sig_atomic_t stop = 0;
+static char base_name[RANDOM_NAME_LEN + 1];
+static char log_file[PATH_BUF_SIZE];
+static char conf_file[PATH_BUF_SIZE];
+
+static void handle_signal(int sig)
+{
+	(void)sig;
+	stop = 1;
+}
+
+static void generate_random_base_name(void)
+{
+	const char charset[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+	size_t charset_len;
+	int i;
+
+	charset_len = sizeof(charset) - 1;
+
+	for (i = 0; i < RANDOM_NAME_LEN; i++) {
+		base_name[i] = charset[rand() % charset_len];
+	}
+	base_name[i] = '\0';
+
+	snprintf(log_file, sizeof(log_file), "/tmp/criu-%s.log", base_name);
+	snprintf(conf_file, sizeof(conf_file), "/tmp/criu-%s.conf", base_name);
+}
+
+static int create_criu_config_file(void)
+{
+	int fd;
+	FILE *fp;
+
+	srand(time(NULL));
+	generate_random_base_name();
+
+	fd = open(conf_file, O_CREAT | O_EXCL | O_WRONLY, 0600);
+	if (fd < 0) {
+		perror("Failed to create config file");
+		return -1;
+	}
+
+	fp = fdopen(fd, "w");
+	if (!fp) {
+		perror("fdopen failed");
+		close(fd);
+		unlink(conf_file);
+		return -1;
+	}
+
+	fprintf(fp, "log-file=%s\n", log_file);
+	fflush(fp);
+	fclose(fp);
+
+	return 0;
+}
+
+static int check_log_file(void)
+{
+	struct stat st;
+
+	if (stat(log_file, &st) < 0) {
+		perror("Config file does not exist");
+		return -1;
+	}
+
+	if (st.st_size == 0) {
+		fprintf(stderr, "Config file is empty\n");
+		return -1;
+	}
+
+	unlink(log_file);
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	int pipe_fd[2];
+	pid_t pid;
+	int ret;
+	int child_ret;
+
+	int img_fd = open(argv[2], O_DIRECTORY);
+	if (img_fd < 0) {
+		perror("Failed to open images directory");
+		goto cleanup;
+	}
+
+	if (create_criu_config_file() < 0) {
+		printf("Failed to create config file\n");
+		return EXIT_FAILURE;
+	}
+
+	if (pipe(pipe_fd) < 0) {
+		perror("pipe");
+		return EXIT_FAILURE;
+	}
+
+	pid = fork();
+	if (pid < 0) {
+		perror("fork failed");
+		return EXIT_FAILURE;
+	}
+
+	if (pid == 0) {
+		/** child process **/
+		printf("   `- loop: initializing\n");
+
+		if (setsid() < 0 || signal(SIGUSR1, handle_signal) == SIG_ERR) {
+			_exit(EXIT_FAILURE);
+		}
+
+		close(STDIN_FILENO);
+		close(STDOUT_FILENO);
+		close(STDERR_FILENO);
+		close(pipe_fd[0]);
+
+		child_ret = SUCC_ECODE;
+		write(pipe_fd[1], &child_ret, sizeof(child_ret));
+		close(pipe_fd[1]);
+
+		while (!stop) {
+			sleep(1);
+		}
+
+		_exit(SUCC_ECODE);
+	}
+
+	/** parent process **/
+	close(pipe_fd[1]);
+
+	ret = -1;
+	if (read(pipe_fd[0], &ret, sizeof(ret)) != sizeof(ret) || ret != SUCC_ECODE) {
+		printf("Error starting loop\n");
+		goto cleanup;
+	}
+
+	read(pipe_fd[0], &ret, 1);
+	close(pipe_fd[0]);
+
+	printf("--- Loop process started (pid: %d) ---\n", pid);
+
+	printf("--- Checkpoint ---\n");
+	criu_init_opts();
+	criu_set_service_binary(argv[1]);
+	criu_set_images_dir_fd(img_fd);
+	criu_set_pid(pid);
+	criu_set_log_level(CRIU_LOG_DEBUG);
+
+	/* The RPC config file should overwrite the log-file set below */
+	printf("Setting dump RPC config file: %s\n", conf_file);
+	criu_set_config_file(conf_file);
+	criu_set_log_file("dump.log");
+
+	ret = criu_dump();
+	if (ret < 0) {
+		what_err_ret_mean(ret);
+		kill(pid, SIGKILL);
+		printf("criu dump failed\n");
+		goto cleanup;
+	}
+
+	printf("   `- Dump succeeded\n");
+	waitpid(pid, NULL, 0);
+
+	if (check_log_file()) {
+		printf("Error: log file not overwritten by RPC config file\n");
+		goto cleanup;
+	}
+
+	printf("--- Restore loop ---\n");
+	criu_init_opts();
+	criu_set_images_dir_fd(img_fd);
+	criu_set_log_level(CRIU_LOG_DEBUG);
+
+	/* The RPC config file should overwrite the log-file set below */
+	printf("Setting restore RPC config file: %s\n", conf_file);
+	criu_set_config_file(conf_file);
+	criu_set_log_file("restore.log");
+
+	pid = criu_restore_child();
+	if (pid <= 0) {
+		what_err_ret_mean(pid);
+		ret = EXIT_FAILURE;
+		goto cleanup;
+	}
+
+	printf("   `- Restore returned pid %d\n", pid);
+	kill(pid, SIGUSR1);
+
+	if (check_log_file()) {
+		printf("Error: log file not overwritten by RPC config file\n");
+		goto cleanup;
+	}
+
+cleanup:
+	if (waitpid(pid, &ret, 0) < 0) {
+		perror("waitpid failed");
+		return EXIT_FAILURE;
+	}
+
+	printf("Remove RPC config file: %s\n", conf_file);
+	unlink(conf_file);
+	return chk_exit(ret, SUCC_ECODE);
+}

From 7aad7317b407925519d2b9137f87b1a0f53fc879 Mon Sep 17 00:00:00 2001
From: Andrii Herheliuk <andrii@herheliuk.com>
Date: Wed, 22 Oct 2025 21:51:28 +0100
Subject: [PATCH 1783/1854] lib/pycriu: changing the default behavior to use
 the system binary

Use system-installed CRIU binary instead of a local file

Thanks to @avagin for suggesting this solution.

Co-authored-by: Andrei Vagin <avagin@gmail.com>
Signed-off-by: Andrii Herheliuk <andrii@herheliuk.com>
---
 lib/pycriu/criu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pycriu/criu.py b/lib/pycriu/criu.py
index 5bd7ffecd..5973b4b91 100644
--- a/lib/pycriu/criu.py
+++ b/lib/pycriu/criu.py
@@ -103,7 +103,7 @@ class _criu_comm_bin(_criu_comm):
                 os.close(2)
 
                 css[0].send(struct.pack('i', os.getpid()))
-                os.execv(self.comm,
+                os.execvp(self.comm,
                          [self.comm, 'swrk',
                           "%d" % css[0].fileno()])
                 os._exit(1)

From d2c46b92b0d394e04b7da5d16909ed7f88e84271 Mon Sep 17 00:00:00 2001
From: Andrii Herheliuk <andrii@herheliuk.com>
Date: Thu, 23 Oct 2025 10:50:40 +0100
Subject: [PATCH 1784/1854] pycriu: better socket error handling

[Errno 2] No such file or directory -> Socket file not found.
[Errno 111] Connection refused -> Service not running.

Signed-off-by: Andrii Herheliuk <andrii@herheliuk.com>
---
 lib/pycriu/criu.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/pycriu/criu.py b/lib/pycriu/criu.py
index 5973b4b91..43550c3ca 100644
--- a/lib/pycriu/criu.py
+++ b/lib/pycriu/criu.py
@@ -45,7 +45,14 @@ class _criu_comm_sk(_criu_comm):
 
     def connect(self, daemon):
         self.sk = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
-        self.sk.connect(self.comm)
+        try:
+            self.sk.connect(self.comm)
+            
+        except FileNotFoundError:
+            raise FileNotFoundError("Socket file not found.")
+        
+        except ConnectionRefusedError:
+            raise ConnectionRefusedError("Service not running.")
 
         return self.sk
 

From 71a637923f420dd50cef02912519b44722338ae4 Mon Sep 17 00:00:00 2001
From: Andrii Herheliuk <andrii@herheliuk.com>
Date: Mon, 27 Oct 2025 21:57:41 +0000
Subject: [PATCH 1785/1854] pycriu: set default value for sk_name

This change allows users to call criu.use_sk() without any
parameters to use the default socket name.

Co-authored-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Signed-off-by: Andrii Herheliuk <andrii@herheliuk.com>
---
 lib/pycriu/criu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pycriu/criu.py b/lib/pycriu/criu.py
index 43550c3ca..05a85c58d 100644
--- a/lib/pycriu/criu.py
+++ b/lib/pycriu/criu.py
@@ -8,6 +8,7 @@ import struct
 
 import pycriu.rpc_pb2 as rpc
 
+CR_DEFAULT_SERVICE_ADDRESS = "./criu_service.socket"
 
 class _criu_comm:
     """
@@ -213,7 +214,7 @@ class criu:
         self.opts = rpc.criu_opts()
         self.sk = None
 
-    def use_sk(self, sk_name):
+    def use_sk(self, sk_name=CR_DEFAULT_SERVICE_ADDRESS):
         """
         Access criu using unix socket which that belongs to criu service daemon.
         """

From ee4100c09f7de7ef9e9db59288118646f28cd4b4 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 24 Oct 2025 06:42:53 +0100
Subject: [PATCH 1786/1854] cr-service: refactor images/workdir setup

Move the code that opens the images directory, resolves its absolute
path via readlink(), selects the work_dir, and chdir()s into it into a
new function: setup_images_and_workdir(). This reduces the size of
`setup_opts_from_req()`, improves its readability, and allows this
functionality to be reused.

While at it, change open_image_dir() to take a const char *dir
parameter, reflecting that the path is not modified by the function and
allowing callers to pass string literals without casts.

No functional changes are intended.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c    | 74 +++++++++++++++++++++++++-------------------
 criu/image.c         |  2 +-
 criu/include/image.h |  2 +-
 3 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index e6aac232e..36ef8d72b 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -285,13 +285,54 @@ int exec_rpc_query_external_files(char *name, int sk)
 
 static char images_dir[PATH_MAX];
 
+static int setup_images_and_workdir(const char *images_dir_path,
+				    bool work_changed_by_rpc_conf,
+				    CriuOpts *req,
+				    pid_t peer_pid)
+{
+	char work_dir_path[PATH_MAX];
+
+	/*
+	 * Image streaming is not supported with CRIU's service feature as
+	 * the streamer must be started for each dump/restore operation.
+	 * It is unclear how to do that with RPC, so we punt for now.
+	 * This explains why we provide the argument mode=-1 instead of
+	 * O_RSTR or O_DUMP.
+	 */
+	if (open_image_dir(images_dir_path, -1) < 0) {
+		pr_perror("Can't open images directory");
+		return -1;
+	}
+
+	/* get full path to images_dir to use in process title */
+	if (readlink(images_dir_path, images_dir, PATH_MAX) == -1) {
+		pr_perror("Can't readlink %s", images_dir_path);
+		return -1;
+	}
+
+	if (work_changed_by_rpc_conf)
+		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
+	else if (req->has_work_dir_fd)
+		sprintf(work_dir_path, "/proc/%d/fd/%d", peer_pid, req->work_dir_fd);
+	else if (opts.work_dir)
+		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
+	else
+		strcpy(work_dir_path, images_dir_path);
+
+	if (chdir(work_dir_path)) {
+		pr_perror("Can't chdir to work_dir");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int setup_opts_from_req(int sk, CriuOpts *req)
 {
 	struct ucred ids;
 	struct stat st;
 	socklen_t ids_len = sizeof(struct ucred);
 	char images_dir_path[PATH_MAX];
-	char work_dir_path[PATH_MAX];
 	char status_fd[PATH_MAX];
 	bool output_changed_by_rpc_conf = false;
 	bool work_changed_by_rpc_conf = false;
@@ -701,37 +742,8 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->parent_img)
 		SET_CHAR_OPTS(img_parent, req->parent_img);
 
-	/*
-	 * Image streaming is not supported with CRIU's service feature as
-	 * the streamer must be started for each dump/restore operation.
-	 * It is unclear how to do that with RPC, so we punt for now.
-	 * This explains why we provide the argument mode=-1 instead of
-	 * O_RSTR or O_DUMP.
-	 */
-	if (open_image_dir(images_dir_path, -1) < 0) {
-		pr_perror("Can't open images directory");
+	if (setup_images_and_workdir(images_dir_path, work_changed_by_rpc_conf, req, ids.pid))
 		goto err;
-	}
-
-	/* get full path to images_dir to use in process title */
-	if (readlink(images_dir_path, images_dir, PATH_MAX) == -1) {
-		pr_perror("Can't readlink %s", images_dir_path);
-		goto err;
-	}
-
-	if (work_changed_by_rpc_conf)
-		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
-	else if (req->has_work_dir_fd)
-		sprintf(work_dir_path, "/proc/%d/fd/%d", ids.pid, req->work_dir_fd);
-	else if (opts.work_dir)
-		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
-	else
-		strcpy(work_dir_path, images_dir_path);
-
-	if (chdir(work_dir_path)) {
-		pr_perror("Can't chdir to work_dir");
-		goto err;
-	}
 
 	if (req->n_irmap_scan_paths) {
 		for (i = 0; i < req->n_irmap_scan_paths; i++) {
diff --git a/criu/image.c b/criu/image.c
index c4f05e159..91101c3eb 100644
--- a/criu/image.c
+++ b/criu/image.c
@@ -717,7 +717,7 @@ struct cr_img *img_from_fd(int fd)
  * This is used when opts.stream is enabled for picking the right streamer
  * socket name. `mode` is ignored when opts.stream is not enabled.
  */
-int open_image_dir(char *dir, int mode)
+int open_image_dir(const char *dir, int mode)
 {
 	int fd, ret;
 
diff --git a/criu/include/image.h b/criu/include/image.h
index b06dbf706..30e32323d 100644
--- a/criu/include/image.h
+++ b/criu/include/image.h
@@ -165,7 +165,7 @@ static inline int img_raw_fd(struct cr_img *img)
 
 extern off_t img_raw_size(struct cr_img *img);
 
-extern int open_image_dir(char *dir, int mode);
+extern int open_image_dir(const char *dir, int mode);
 extern void close_image_dir(void);
 /*
  * Return -1 -- parent symlink points to invalid target

From 60a731ab38d53c69fbf0fc8bf7bb02701930424c Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 24 Oct 2025 11:04:35 +0100
Subject: [PATCH 1787/1854] cr-service: drop images_dir from setproctitle

Commit 9089ce8 ("service: use setproctitle") extended cr-service to
get the full path of images_dir using readlink(). However, the RPC
API was later extended to allow setting a custom path (folder) to
be set instead of passing a file descriptor, which causes readlink()
to fail as the path is not a symbolic link.

It would be better to drop the code setting the images-dir path as a
string in the proctitle.

Fixes: #2794

Suggested-by: Andrei Vagin <avagin@google.com>
Co-authored-by: Andrii Herheliuk <andrii@herheliuk.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 36ef8d72b..0808be3e7 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -283,8 +283,6 @@ int exec_rpc_query_external_files(char *name, int sk)
 	return ret;
 }
 
-static char images_dir[PATH_MAX];
-
 static int setup_images_and_workdir(const char *images_dir_path,
 				    bool work_changed_by_rpc_conf,
 				    CriuOpts *req,
@@ -304,12 +302,6 @@ static int setup_images_and_workdir(const char *images_dir_path,
 		return -1;
 	}
 
-	/* get full path to images_dir to use in process title */
-	if (readlink(images_dir_path, images_dir, PATH_MAX) == -1) {
-		pr_perror("Can't readlink %s", images_dir_path);
-		return -1;
-	}
-
 	if (work_changed_by_rpc_conf)
 		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
 	else if (req->has_work_dir_fd)
@@ -802,7 +794,7 @@ static int dump_using_req(int sk, CriuOpts *req)
 	if (setup_opts_from_req(sk, req))
 		goto exit;
 
-	__setproctitle("dump --rpc -t %d -D %s", req->pid, images_dir);
+	__setproctitle("dump --rpc -t %d", req->pid);
 
 	if (init_pidfd_store_hash())
 		goto pidfd_store_err;
@@ -845,7 +837,7 @@ static int restore_using_req(int sk, CriuOpts *req)
 	if (setup_opts_from_req(sk, req))
 		goto exit;
 
-	__setproctitle("restore --rpc -D %s", images_dir);
+	__setproctitle("restore --rpc");
 
 	if (cr_restore_tasks())
 		goto exit;
@@ -940,7 +932,7 @@ static int pre_dump_using_req(int sk, CriuOpts *req, bool single)
 		if (setup_opts_from_req(sk, req))
 			goto cout;
 
-		__setproctitle("pre-dump --rpc -t %d -D %s", req->pid, images_dir);
+		__setproctitle("pre-dump --rpc -t %d", req->pid);
 
 		if (init_pidfd_store_hash())
 			goto pidfd_store_err;
@@ -1276,8 +1268,7 @@ static int handle_cpuinfo(int sk, CriuReq *msg)
 		if (setup_opts_from_req(sk, msg->opts))
 			goto cout;
 
-		__setproctitle("cpuinfo %s --rpc -D %s", msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ? "dump" : "check",
-			       images_dir);
+		__setproctitle("cpuinfo %s --rpc", msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP ? "dump" : "check");
 
 		if (msg->type == CRIU_REQ_TYPE__CPUINFO_DUMP)
 			ret = cpuinfo_dump();

From 5966ffe8a7fa452a8c8256962436dceb4479237e Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 24 Oct 2025 06:50:31 +0100
Subject: [PATCH 1788/1854] cr-service: refactor images_dir path resolution

Move the images_dir selection logic from setup_opts_from_req() into a
new function: resolve_images_dir_path(). This improves readability and
allows the code to be reused. While at it, use snprintf() instead of
sprintf() for the /proc path and ensure NULL termination after strncpy().

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c | 59 +++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 0808be3e7..7d17a63e0 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -283,6 +283,41 @@ int exec_rpc_query_external_files(char *name, int sk)
 	return ret;
 }
 
+static int resolve_images_dir_path(char *images_dir_path,
+				   bool imgs_changed_by_rpc_conf,
+				   const CriuOpts *req,
+				   pid_t peer_pid)
+{
+	/*
+	 * images_dir_fd is a required RPC parameter with -1 as default value.
+	 *
+	 * This assumes that if opts.imgs_dir is set, we have a value
+	 * from the configuration file parser. The test to see that
+	 * imgs_changed_by_rpc_conf is true is used to make sure the value
+	 * is from the RPC configuration file. The idea is that only the
+	 * RPC configuration file is able to overwrite RPC settings:
+	 *  * apply_config(global_conf)
+	 *  * apply_config(user_conf)
+	 *  * apply_config(environment variable)
+	 *  * apply_rpc_options()
+	 *  * apply_config(rpc_conf)
+	 */
+	if (imgs_changed_by_rpc_conf) {
+		strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1);
+		images_dir_path[PATH_MAX - 1] = '\0';
+	} else if (req->images_dir_fd != -1) {
+		snprintf(images_dir_path, PATH_MAX, "/proc/%d/fd/%d", peer_pid, req->images_dir_fd);
+	} else if (req->images_dir) {
+		strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
+		images_dir_path[PATH_MAX - 1] = '\0';
+	} else {
+		pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int setup_images_and_workdir(const char *images_dir_path,
 				    bool work_changed_by_rpc_conf,
 				    CriuOpts *req,
@@ -706,30 +741,8 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		xfree(tmp_work);
 	}
 
-	/*
-	 * open images_dir - images_dir_fd is a required RPC parameter
-	 *
-	 * This assumes that if opts.imgs_dir is set we have a value
-	 * from the configuration file parser. The test to see that
-	 * imgs_changed_by_rpc_conf is true is used to make sure the value
-	 * is from the RPC configuration file. The idea is that only the
-	 * RPC configuration file is able to overwrite RPC settings:
-	 *  * apply_config(global_conf)
-	 *  * apply_config(user_conf)
-	 *  * apply_config(environment variable)
-	 *  * apply_rpc_options()
-	 *  * apply_config(rpc_conf)
-	 */
-	if (imgs_changed_by_rpc_conf) {
-		strncpy(images_dir_path, opts.imgs_dir, PATH_MAX - 1);
-	} else if (req->images_dir_fd != -1) {
-		sprintf(images_dir_path, "/proc/%d/fd/%d", ids.pid, req->images_dir_fd);
-	} else if (req->images_dir) {
-		strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
-	} else {
-		pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
+	if (resolve_images_dir_path(images_dir_path, imgs_changed_by_rpc_conf, req, ids.pid) < 0)
 		goto err;
-	}
 
 	if (req->parent_img)
 		SET_CHAR_OPTS(img_parent, req->parent_img);

From 72ca94db4de93105f89c9411b87a70e8f2353745 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 28 Oct 2025 18:37:31 +0000
Subject: [PATCH 1789/1854] cr-service: refactor logging setup

Move the logging initialization into a helper function that
can be reused.

No functional change intended.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c | 51 ++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index 7d17a63e0..b4e8629c9 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -354,6 +354,31 @@ static int setup_images_and_workdir(const char *images_dir_path,
 	return 0;
 }
 
+static int setup_logging_from_req(CriuOpts *req, bool output_changed_by_rpc_conf)
+{
+	if (req->log_file && !output_changed_by_rpc_conf) {
+		if (strchr(req->log_file, '/')) {
+			pr_perror("No subdirs are allowed in log_file name");
+			return -1;
+		}
+		SET_CHAR_OPTS(output, req->log_file);
+	} else if (req->has_log_to_stderr && req->log_to_stderr && !output_changed_by_rpc_conf) {
+		xfree(opts.output);
+		opts.output = NULL; /* log_init(NULL) writes to stderr */
+	} else if (!opts.output) {
+		SET_CHAR_OPTS(output, DEFAULT_LOG_FILENAME);
+	}
+
+	opts.log_level = req->log_level;
+	log_set_loglevel(opts.log_level);
+	if (log_init(opts.output)) {
+		pr_perror("Can't initiate log");
+		return -1;
+	}
+
+	return 0;
+}
+
 static int setup_opts_from_req(int sk, CriuOpts *req)
 {
 	struct ucred ids;
@@ -758,36 +783,12 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	}
 
 	/* initiate log file in work dir */
-	if (req->log_file && !output_changed_by_rpc_conf) {
-		/*
-		 * If RPC sets a log file and if there nothing from the
-		 * RPC configuration file, use the RPC value.
-		 */
-		if (strchr(req->log_file, '/')) {
-			pr_perror("No subdirs are allowed in log_file name");
-			goto err;
-		}
-
-		SET_CHAR_OPTS(output, req->log_file);
-	} else if (req->has_log_to_stderr && req->log_to_stderr && !output_changed_by_rpc_conf) {
-		xfree(opts.output);
-		opts.output = NULL;
-	} else if (!opts.output) {
-		SET_CHAR_OPTS(output, DEFAULT_LOG_FILENAME);
-	}
-
-	/* This is needed later to correctly set the log_level */
-	opts.log_level = req->log_level;
-	log_set_loglevel(req->log_level);
-	if (log_init(opts.output) == -1) {
-		pr_perror("Can't initiate log");
+	if (setup_logging_from_req(req, output_changed_by_rpc_conf))
 		goto err;
-	}
 
 	if (req->mntns_compat_mode)
 		opts.mntns_compat_mode = true;
 
-	log_set_loglevel(opts.log_level);
 	if (check_options())
 		goto err;
 

From 9371c4a789889f26d11ca04a4c7c9847a2abbbcc Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 24 Oct 2025 07:12:03 +0100
Subject: [PATCH 1790/1854] cr-service: refactor RPC opts parsing for check()

The check() functionality is very different from dump, pre-dump,
and restore. It is used only to check if the kernel supports required
features, and does not need the majority of options set via RPC.

In particular, we don't need to open `image_dir` when running `check()`
because this functionality doesn't create or process image files. In
this case, `image_dir` is used as `work_dir`, only when the latter is
not specified and a log file is used.

This patch updates the RPC options parser so that it only handles the
logging options when check() is used. Logging to a file is required when
log_file is explicitly set or no log_to_stderr is used. In such case, we
also resolve images_dir and work_dir where the log file will be created.

Fixes: #2758

Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-service.c | 57 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index b4e8629c9..b4718dde2 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -311,6 +311,12 @@ static int resolve_images_dir_path(char *images_dir_path,
 		strncpy(images_dir_path, req->images_dir, PATH_MAX - 1);
 		images_dir_path[PATH_MAX - 1] = '\0';
 	} else {
+		/*
+		 * Since images dir is not required in CHECK mode, we need to
+		 * check for work_dir_fd in setup_images_and_workdir()
+		 */
+		if (opts.mode == CR_CHECK)
+			return 0;
 		pr_err("Neither images_dir_fd nor images_dir was passed by RPC client.\n");
 		return -1;
 	}
@@ -323,18 +329,21 @@ static int setup_images_and_workdir(const char *images_dir_path,
 				    CriuOpts *req,
 				    pid_t peer_pid)
 {
-	char work_dir_path[PATH_MAX];
+	char work_dir_path[PATH_MAX] = "";
 
-	/*
-	 * Image streaming is not supported with CRIU's service feature as
-	 * the streamer must be started for each dump/restore operation.
-	 * It is unclear how to do that with RPC, so we punt for now.
-	 * This explains why we provide the argument mode=-1 instead of
-	 * O_RSTR or O_DUMP.
-	 */
-	if (open_image_dir(images_dir_path, -1) < 0) {
-		pr_perror("Can't open images directory");
-		return -1;
+	/* We don't need to open images dir in CHECK mode. */
+	if (opts.mode != CR_CHECK) {
+		/*
+		 * Image streaming is not supported with CRIU's service feature as
+		 * the streamer must be started for each dump/restore operation.
+		 * It is unclear how to do that with RPC, so we punt for now.
+		 * This explains why we provide the argument mode=-1 instead of
+		 * O_RSTR or O_DUMP.
+		 */
+		if (open_image_dir(images_dir_path, -1) < 0) {
+			pr_perror("Can't open images directory");
+			return -1;
+		}
 	}
 
 	if (work_changed_by_rpc_conf)
@@ -343,9 +352,14 @@ static int setup_images_and_workdir(const char *images_dir_path,
 		sprintf(work_dir_path, "/proc/%d/fd/%d", peer_pid, req->work_dir_fd);
 	else if (opts.work_dir)
 		strncpy(work_dir_path, opts.work_dir, PATH_MAX - 1);
-	else
+	else if (images_dir_path[0] != '\0')
 		strcpy(work_dir_path, images_dir_path);
 
+	if (work_dir_path[0] == '\0') {
+		pr_err("images-dir or work-dir is required when using log file\n");
+		return -1;
+	}
+
 	if (chdir(work_dir_path)) {
 		pr_perror("Can't chdir to work_dir");
 		return -1;
@@ -384,7 +398,7 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	struct ucred ids;
 	struct stat st;
 	socklen_t ids_len = sizeof(struct ucred);
-	char images_dir_path[PATH_MAX];
+	char images_dir_path[PATH_MAX] = "";
 	char status_fd[PATH_MAX];
 	bool output_changed_by_rpc_conf = false;
 	bool work_changed_by_rpc_conf = false;
@@ -397,6 +411,23 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		goto err;
 	}
 
+	/*
+	 * The options relevant in CHECK mode are: log_file, log_to_stderr, and log_level.
+	 * When logging to a file, we also need to resolve images_dir and work_dir.
+	 */
+	if (opts.mode == CR_CHECK) {
+		if (!req)
+			return 0; /* nothing to do */
+
+		/*
+		 * A log file is needed only if:
+		 *   - log_file is explicitly set, or
+		 *   - log_to_stderr is NOT requested (i.e., using DEFAULT_LOG_FILENAME)
+		 */
+		if (!req->log_file || (req->has_log_to_stderr && req->log_to_stderr))
+			return 0; /* no log file, don't require images_dir or work_dir */
+	}
+
 	if (fstat(sk, &st)) {
 		pr_perror("Can't get socket stat");
 		goto err;

From f7ccb63bdd496409d968390aa15a3a8c4b877110 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 24 Oct 2025 09:28:28 +0100
Subject: [PATCH 1791/1854] pycriu: set RPC opts for CHECK

This allows users to specify RPC options when
using the check() functionality.

Co-authored-by: Andrii Herheliuk <andrii@herheliuk.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/pycriu/criu.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pycriu/criu.py b/lib/pycriu/criu.py
index 05a85c58d..760d2be78 100644
--- a/lib/pycriu/criu.py
+++ b/lib/pycriu/criu.py
@@ -211,7 +211,8 @@ class criu:
 
     def __init__(self):
         self.use_binary('criu')
-        self.opts = rpc.criu_opts()
+        # images_dir_fd is required field with default value of -1
+        self.opts = rpc.criu_opts(images_dir_fd=-1)
         self.sk = None
 
     def use_sk(self, sk_name=CR_DEFAULT_SERVICE_ADDRESS):
@@ -273,6 +274,7 @@ class criu:
         """
         req = rpc.criu_req()
         req.type = rpc.CHECK
+        req.opts.MergeFrom(self.opts)
 
         resp = self._send_req_and_recv_resp(req)
 

From 3c841af2cf1f1769c2fa1527bf2706b705da1202 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sat, 25 Oct 2025 12:35:19 +0100
Subject: [PATCH 1792/1854] pycriu: use explicit imports for __init__

_init__.py defines the public API for pycriu. It is important to use
explicit imports to avoid leaking every symbol from criu.py into the
pycriu namespace. This avoids import-time side effects, prevents name
collisions, and circular-import traps.

Fixes the following lint error:
  F403 `from .criu import *` used; unable to detect undefined names

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile               |  2 ++
 lib/pycriu/__init__.py | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1824ea180..05834d682 100644
--- a/Makefile
+++ b/Makefile
@@ -452,6 +452,8 @@ ruff:
 		test/inhfd/*.py \
 		test/others/rpc/config_file.py \
 		test/others/action-script/check_actions.py \
+		lib/pycriu/criu.py \
+		lib/pycriu/__init__.py \
 		lib/pycriu/images/pb2dict.py \
 		lib/pycriu/images/images.py \
 		scripts/criu-ns \
diff --git a/lib/pycriu/__init__.py b/lib/pycriu/__init__.py
index 2abcf029d..28f1e9424 100644
--- a/lib/pycriu/__init__.py
+++ b/lib/pycriu/__init__.py
@@ -1,4 +1,15 @@
 from . import rpc_pb2 as rpc
 from . import images
-from .criu import *
-from .version import __version__
\ No newline at end of file
+from .criu import criu, CRIUExceptionExternal, CRIUException
+from .criu import CR_DEFAULT_SERVICE_ADDRESS
+from .version import __version__
+
+__all__ = (
+    "rpc",
+    "images",
+    "criu",
+    "CRIUExceptionExternal",
+    "CRIUException",
+    "CR_DEFAULT_SERVICE_ADDRESS",
+    "__version__",
+)
\ No newline at end of file

From a1dc885027f6866f01df38c9f14e71a9102e298a Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Fri, 24 Oct 2025 19:32:23 +0100
Subject: [PATCH 1793/1854] test/rpc: update errno check

The --mntns-compat-mode option is no longer parsed with CHECK.
Use --log-file instead to test the error message.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/rpc/errno.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/others/rpc/errno.py b/test/others/rpc/errno.py
index a5a3eb54d..ea841199f 100755
--- a/test/others/rpc/errno.py
+++ b/test/others/rpc/errno.py
@@ -49,8 +49,8 @@ class test:
 
         if err and resp.cr_errno != err:
             raise Exception('Unexpected cr_errno ' + str(resp.cr_errno))
-        
-        if errmsg and errmsg not in resp.cr_errmsg:
+
+        if errmsg and errmsg not in str(resp.cr_errmsg):
             raise Exception('Unexpected cr_msg \'' + str(resp.cr_errmsg) + '\'')
 
     def no_process(self):
@@ -134,20 +134,19 @@ class test:
         self.check_resp(resp, rpc.EMPTY, None)
 
         print('Success')
-        
+
     def child_first_err(self):
         print('Receive correct first error message')
 
         req = self.get_base_req()
         req.type = rpc.CHECK
-        
-        # mntns_compat_mode options is only allowed on restore
-        req.opts.mntns_compat_mode = True
+        # Log file must not have subdirectory
+        req.opts.log_file = "/foo/bar.log"
 
         self.send_req(req)
         resp = self.recv_resp()
 
-        self.check_resp(resp, rpc.CHECK, None, "Option --mntns-compat-mode is only valid on restore\n")
+        self.check_resp(resp, rpc.CHECK, None, "No subdirs are allowed in log_file name")
 
         print('Success')
 

From 567f70ce191326c56cd223ce94a079dceb7c71fd Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 20 Oct 2025 10:24:49 +0100
Subject: [PATCH 1794/1854] test/others: add test for check() with libcriu

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/others/libcriu/Makefile     |  1 +
 test/others/libcriu/run.sh       |  1 +
 test/others/libcriu/test_check.c | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 test/others/libcriu/test_check.c

diff --git a/test/others/libcriu/Makefile b/test/others/libcriu/Makefile
index e0ee5b2ab..927f17c23 100644
--- a/test/others/libcriu/Makefile
+++ b/test/others/libcriu/Makefile
@@ -8,6 +8,7 @@ TESTS += test_iters
 TESTS += test_errno
 TESTS += test_join_ns
 TESTS += test_pre_dump
+TESTS += test_check
 TESTS += test_feature_check
 
 all: $(TESTS)
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index 804af9b83..6b36d4496 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -63,6 +63,7 @@ if [ "$(uname -m)" = "x86_64" ]; then
 fi
 run_test test_errno
 run_test test_join_ns
+run_test test_check
 if criu check --feature mem_dirty_track > /dev/null; then
 	export CRIU_FEATURE_MEM_TRACK=1
 fi
diff --git a/test/others/libcriu/test_check.c b/test/others/libcriu/test_check.c
new file mode 100644
index 000000000..4af3b3630
--- /dev/null
+++ b/test/others/libcriu/test_check.c
@@ -0,0 +1,17 @@
+#include <stdio.h>
+#include "criu.h"
+#include "lib.h"
+
+int main(int argc, char **argv)
+{
+	int ret;
+
+	printf("--- Start check ---\n");
+	criu_init_opts();
+	criu_set_service_binary(argv[1]);
+
+	if (criu_check())
+		return -1;
+
+	return 0;
+}

From 0fa6ff3d188245091dce1516fa7804ebfa6be337 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 26 Oct 2025 10:00:39 +0000
Subject: [PATCH 1795/1854] test/others: add tests for check() with pycriu

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Makefile                                     |  1 +
 test/others/pycriu/.gitignore                |  1 +
 test/others/pycriu/Makefile                  | 63 ++++++++++++++++++++
 test/others/pycriu/read.py                   |  1 +
 test/others/pycriu/test_check.py             | 29 +++++++++
 test/others/pycriu/test_check_fail.py        | 32 ++++++++++
 test/others/pycriu/test_check_images_dir.py  | 44 ++++++++++++++
 test/others/pycriu/test_check_work_dir_fd.py | 44 ++++++++++++++
 test/others/rpc/read.py                      |  0
 9 files changed, 215 insertions(+)
 create mode 100644 test/others/pycriu/.gitignore
 create mode 100644 test/others/pycriu/Makefile
 create mode 120000 test/others/pycriu/read.py
 create mode 100755 test/others/pycriu/test_check.py
 create mode 100755 test/others/pycriu/test_check_fail.py
 create mode 100755 test/others/pycriu/test_check_images_dir.py
 create mode 100755 test/others/pycriu/test_check_work_dir_fd.py
 mode change 100644 => 100755 test/others/rpc/read.py

diff --git a/Makefile b/Makefile
index 05834d682..e26807158 100644
--- a/Makefile
+++ b/Makefile
@@ -452,6 +452,7 @@ ruff:
 		test/inhfd/*.py \
 		test/others/rpc/config_file.py \
 		test/others/action-script/check_actions.py \
+		test/others/pycriu/*.py \
 		lib/pycriu/criu.py \
 		lib/pycriu/__init__.py \
 		lib/pycriu/images/pb2dict.py \
diff --git a/test/others/pycriu/.gitignore b/test/others/pycriu/.gitignore
new file mode 100644
index 000000000..567609b12
--- /dev/null
+++ b/test/others/pycriu/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/test/others/pycriu/Makefile b/test/others/pycriu/Makefile
new file mode 100644
index 000000000..b6e3b4814
--- /dev/null
+++ b/test/others/pycriu/Makefile
@@ -0,0 +1,63 @@
+.SHELLFLAGS := -eu -o pipefail -c
+.ONESHELL:
+
+CRIU ?= ../../../criu/criu
+BUILD_DIR ?= build
+SOCKET_NAME ?= criu_service.socket
+PIDFILE_NAME ?= pidfile
+SERVICE_LOG ?= service.log
+PYTHON ?= python3
+
+PIDFILE := $(BUILD_DIR)/$(PIDFILE_NAME)
+CRIU_SOCKET := $(BUILD_DIR)/$(SOCKET_NAME)
+STATUS_FIFO := $(BUILD_DIR)/startup.status
+STATUS_FD := 200
+
+run: start
+	cleanup() { $(MAKE) --no-print-directory stop || true; }
+	trap cleanup EXIT INT TERM
+	"$(PYTHON)" test_check.py
+	"$(PYTHON)" test_check_fail.py
+	"$(PYTHON)" test_check_images_dir.py
+	"$(PYTHON)" test_check_work_dir_fd.py
+
+start:
+	mkdir -p "$(BUILD_DIR)"
+	if [ -s "$(PIDFILE)" ] && kill -0 "$$(cat "$(PIDFILE)")" 2>/dev/null; then
+		echo "Service running (PID $$(cat "$(PIDFILE)"))."
+		exit 0
+	fi
+	if ! command -v "$(CRIU)" >/dev/null 2>&1; then
+		echo "CRIU not found at $(CRIU)"
+		exit 1
+	fi
+	mkfifo "$(STATUS_FIFO)"
+	exec $(STATUS_FD)<>"$(STATUS_FIFO)"
+	"$(CRIU)" service \
+		-v4 \
+		-W "$(BUILD_DIR)" \
+		--address "$(SOCKET_NAME)" \
+		-d \
+		--pidfile "$(PIDFILE_NAME)" \
+		-o "$(SERVICE_LOG)" \
+		--status-fd "$(STATUS_FD)"
+	"$(PYTHON)" read.py "$(STATUS_FIFO)"
+
+stop:
+	if [ ! -s "$(PIDFILE)" ]; then
+		echo "pidfile missing or empty"
+		exit 1
+	fi
+	pid=$$(cat "$(PIDFILE)")
+	if kill -0 "$$pid" 2>/dev/null; then
+		kill -9 "$$pid" || true
+	fi
+	rm -f "$(PIDFILE)" "$(CRIU_SOCKET)" "$(STATUS_FIFO)"
+
+clean:
+	if [ -s "$(PIDFILE)" ] && kill -0 "$$(cat "$(PIDFILE)")" 2>/dev/null; then
+		kill -9 "$$(cat "$(PIDFILE)")" || true
+	fi
+	rm -rf "$(BUILD_DIR)"
+
+.PHONY: start stop clean run
\ No newline at end of file
diff --git a/test/others/pycriu/read.py b/test/others/pycriu/read.py
new file mode 120000
index 000000000..c2c1e1365
--- /dev/null
+++ b/test/others/pycriu/read.py
@@ -0,0 +1 @@
+../rpc/read.py
\ No newline at end of file
diff --git a/test/others/pycriu/test_check.py b/test/others/pycriu/test_check.py
new file mode 100755
index 000000000..9888158db
--- /dev/null
+++ b/test/others/pycriu/test_check.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+# Add ../../../lib so we can import pycriu
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+LIB_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "../../../lib"))
+if LIB_DIR not in sys.path:
+    sys.path.insert(0, LIB_DIR)
+
+import pycriu  # noqa: E402
+
+def main():
+    socket_path = os.path.join(SCRIPT_DIR, "build", "criu_service.socket")
+
+    criu = pycriu.criu()
+    criu.use_sk(socket_path)
+
+    try:
+        criu.check()
+    except Exception as e:
+        print(f"FAIL: {e}")
+        return 1
+
+    print("PASS")
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/test/others/pycriu/test_check_fail.py b/test/others/pycriu/test_check_fail.py
new file mode 100755
index 000000000..b5634c60b
--- /dev/null
+++ b/test/others/pycriu/test_check_fail.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+# Add ../../../lib so we can import pycriu
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+LIB_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "../../../lib"))
+if LIB_DIR not in sys.path:
+    sys.path.insert(0, LIB_DIR)
+
+import pycriu  # noqa: E402
+
+def main():
+    socket_path = os.path.join(SCRIPT_DIR, "build", "criu_service.socket")
+
+    criu = pycriu.criu()
+    criu.use_sk(socket_path)
+
+    # Intentionally set only log_file (no images/work dir) to ensure check() fails
+    criu.opts.log_file = "check.log"
+
+    try:
+        criu.check()
+    except Exception:
+        print("PASS")
+        return 0
+
+    print("FAIL: check() did not fail when log_file is set without images/work dir")
+    return 1
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/test/others/pycriu/test_check_images_dir.py b/test/others/pycriu/test_check_images_dir.py
new file mode 100755
index 000000000..f479c2a88
--- /dev/null
+++ b/test/others/pycriu/test_check_images_dir.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+# Add ../../../lib so we can import pycriu
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+LIB_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "../../../lib"))
+if LIB_DIR not in sys.path:
+    sys.path.insert(0, LIB_DIR)
+
+import pycriu  # noqa: E402
+
+def _log_path(images_dir, log_file):
+    return log_file if os.path.isabs(log_file) else os.path.join(images_dir, log_file)
+
+def main():
+    build_dir = os.path.join(SCRIPT_DIR, "build")
+    socket_path = os.path.join(build_dir, "criu_service.socket")
+
+    criu = pycriu.criu()
+    criu.use_sk(socket_path)
+
+    criu.opts.images_dir = build_dir
+    criu.opts.log_file = "check.log"
+    criu.opts.log_level = 4
+
+    try:
+        criu.check()
+    except Exception as e:
+        lp = _log_path(build_dir, criu.opts.log_file)
+        msg = f"FAIL: {e} ({'see log: ' + lp if os.path.exists(lp) else 'no log found'})"
+        print(msg)
+        return 1
+
+    lp = _log_path(build_dir, criu.opts.log_file)
+    if not (os.path.isfile(lp) and os.path.getsize(lp) > 0):
+        print(f"FAIL: log file missing or empty: {lp}")
+        return 1
+
+    print("PASS")
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/test/others/pycriu/test_check_work_dir_fd.py b/test/others/pycriu/test_check_work_dir_fd.py
new file mode 100755
index 000000000..e20a83097
--- /dev/null
+++ b/test/others/pycriu/test_check_work_dir_fd.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+# Add ../../../lib so we can import pycriu
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+LIB_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "../../../lib"))
+if LIB_DIR not in sys.path:
+    sys.path.insert(0, LIB_DIR)
+
+import pycriu  # noqa: E402
+
+def main():
+    build_dir = os.path.join(SCRIPT_DIR, "build")
+    socket_path = os.path.join(build_dir, "criu_service.socket")
+    os.makedirs(build_dir, exist_ok=True)
+
+    # Open a directory FD to use as work_dir_fd (prefer O_PATH if available)
+    flags = getattr(os, "O_PATH", 0) or os.O_RDONLY
+    fd = os.open(build_dir, flags)
+
+    criu = pycriu.criu()
+    criu.use_sk(socket_path)
+
+    criu.opts.work_dir_fd = fd
+    criu.opts.log_file = "check.log"
+    criu.opts.log_level = 4
+
+    try:
+        criu.check()
+    except Exception as e:
+        print(f"FAIL: {e}")
+        return 1
+    finally:
+        try:
+            os.close(fd)
+        except Exception:
+            pass
+
+    print("PASS")
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/test/others/rpc/read.py b/test/others/rpc/read.py
old mode 100644
new mode 100755

From cb8e1da3f483f53fcacb642b574866625f7dbb0a Mon Sep 17 00:00:00 2001
From: alam0rt <sam@samlockart.com>
Date: Fri, 31 Oct 2025 14:32:17 +1100
Subject: [PATCH 1796/1854] coredump: use compat_nr_pages as fallback

Use nr_pages when available, falling back to compat_nr_pages
for compatibility.

Signed-off-by: alam0rt <sam@samlockart.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 coredump/criu_coredump/coredump.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 9454d8f0b..3c9cd45aa 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -794,7 +794,8 @@ class coredump_generator:
         off = 0  # in pages
         for m in pagemap[1:]:
             found = False
-            for i in range(m["nr_pages"]):
+            num_pages = m.get("nr_pages", m.compat_nr_pages)
+            for i in range(num_pages):
                 if m["vaddr"] + i * PAGESIZE == page_no * PAGESIZE:
                     found = True
                     break

From 1d08ff8ca7b2a8bee5238e80bddd52a627c637cf Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 9 Nov 2025 16:24:48 +0000
Subject: [PATCH 1797/1854] coredump: fix handling of num_pages

This patch fixes the following error:

$ sudo make -C test/others/criu-coredump run
...
Traceback (most recent call last):
  File "/home/circleci/criu/coredump/coredump", line 55, in <module>
    main()
  File "/home/circleci/criu/coredump/coredump", line 47, in main
    coredump(opts)
  File "/home/circleci/criu/coredump/coredump", line 14, in coredump
    cores = generator(os.path.realpath(opts['in']))
  File "/home/circleci/criu/coredump/criu_coredump/coredump.py", line 192, in __call__
    self.coredumps[pid] = self._gen_coredump(pid)
  File "/home/circleci/criu/coredump/criu_coredump/coredump.py", line 214, in _gen_coredump
    cd.vmas = self._gen_vmas(pid)
  File "/home/circleci/criu/coredump/criu_coredump/coredump.py", line 992, in _gen_vmas
    v.data = self._gen_mem_chunk(pid, vma, v.filesz)
  File "/home/circleci/criu/coredump/criu_coredump/coredump.py", line 879, in _gen_mem_chunk
    page_mem = self._get_page(pid, page_no)
  File "/home/circleci/criu/coredump/criu_coredump/coredump.py", line 797, in _get_page
    num_pages = m.get("nr_pages", m.compat_nr_pages)
AttributeError: 'dict' object has no attribute 'compat_nr_pages'
+ exit 1
make[1]: *** [Makefile:3: run] Error 1

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 coredump/criu_coredump/coredump.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/coredump/criu_coredump/coredump.py b/coredump/criu_coredump/coredump.py
index 3c9cd45aa..acb806ace 100644
--- a/coredump/criu_coredump/coredump.py
+++ b/coredump/criu_coredump/coredump.py
@@ -794,7 +794,8 @@ class coredump_generator:
         off = 0  # in pages
         for m in pagemap[1:]:
             found = False
-            num_pages = m.get("nr_pages", m.compat_nr_pages)
+            num_pages = m.get("nr_pages", m["compat_nr_pages"])
+
             for i in range(num_pages):
                 if m["vaddr"] + i * PAGESIZE == page_no * PAGESIZE:
                     found = True

From ce680fc6c71ddac19fec25669dffe123c36595e7 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 8 Nov 2025 15:57:22 +0000
Subject: [PATCH 1798/1854] Revert "plugins/amdgpu: Implement parallel restore"

This functionality (#2527) is being reverted and excluded from this
release due to issue #2812.

It will be included in a subsequent release once all associated issues
are resolved.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 Documentation/criu-amdgpu-plugin.txt    |   1 -
 plugins/amdgpu/Makefile                 |   2 +-
 plugins/amdgpu/README.md                |  23 +-
 plugins/amdgpu/amdgpu_plugin.c          | 420 +++---------------------
 plugins/amdgpu/amdgpu_plugin_topology.c |   2 +-
 plugins/amdgpu/amdgpu_plugin_topology.h |   1 -
 plugins/amdgpu/amdgpu_socket_utils.c    | 320 ------------------
 plugins/amdgpu/amdgpu_socket_utils.h    |  54 ---
 8 files changed, 52 insertions(+), 771 deletions(-)
 delete mode 100644 plugins/amdgpu/amdgpu_socket_utils.c
 delete mode 100644 plugins/amdgpu/amdgpu_socket_utils.h

diff --git a/Documentation/criu-amdgpu-plugin.txt b/Documentation/criu-amdgpu-plugin.txt
index fe76fc3bc..68803f3db 100644
--- a/Documentation/criu-amdgpu-plugin.txt
+++ b/Documentation/criu-amdgpu-plugin.txt
@@ -15,7 +15,6 @@ Checkpoint / Restore inside a docker container
 Pytorch
 Tensorflow
 Using CRIU Image Streamer
-Parallel Restore
 
 DESCRIPTION
 -----------
diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 870a039cd..3d55f8bb4 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -27,7 +27,7 @@ endif
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc --proto_path=. --c_out=. criu-amdgpu.proto
 
-amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
+amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c
 	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
diff --git a/plugins/amdgpu/README.md b/plugins/amdgpu/README.md
index b808fbc4f..1078eafe6 100644
--- a/plugins/amdgpu/README.md
+++ b/plugins/amdgpu/README.md
@@ -3,8 +3,7 @@ Supporting ROCm with CRIU
 
 _Felix Kuehling <Felix.Kuehling@amd.com>_<br>
 _Rajneesh Bardwaj <Rajneesh.Bhardwaj@amd.com>_<br>
-_David Yat Sin <David.YatSin@amd.com>_<br>
-_Yanning Yang <yangyanning@sjtu.edu.cn>_
+_David Yat Sin <David.YatSin@amd.com>_
 
 # Introduction
 
@@ -225,26 +224,6 @@ to resume execution on the GPUs.
 *This new plugin is enabled by the new hook `__RESUME_DEVICES_LATE` in our RFC
 patch series.*
 
-## Restoring BO content in parallel
-
-Restoring the BO content is an important part in the restore of GPU state and
-usually takes a significant amount of time. A possible location for this
-procedure is the `cr_plugin_restore_file` hook. However, restoring in this hook
-blocks the target process from performing other restore operations, which
-hinders further optimization of the restore process.
-
-Therefore, a new plugin hook that runs in the master restore process is
-introduced, and it interacts with the `cr_plugin_restore_file` hook to complete
-the restore of BO content. Specifically, the target process only needs to send
-the relevant BOs to the master restore process, while this new hook handles all
-the restore of buffer objects. Through this method, during the restore of the BO
-content, the target process can perform other restore operations, thus
-accelerating the restore procedure. This is an implementation of the gCROP
-method proposed in the ACM SoCC'24 paper: [On-demand and Parallel
-Checkpoint/Restore for GPU Applications](https://dl.acm.org/doi/10.1145/3698038.3698510).
-
-*This optimization technique is enabled by the `__POST_FORKING` hook.*
-
 ## Other CRIU changes
 
 In addition to the new plugins, we need to make some changes to CRIU itself to
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 69194fbc7..96c086162 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -28,13 +28,11 @@
 #include "xmalloc.h"
 #include "criu-log.h"
 #include "files.h"
-#include "pstree.h"
 
 #include "common/list.h"
 #include "amdgpu_plugin_drm.h"
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
-#include "amdgpu_socket_utils.h"
 
 #include "img-streamer.h"
 #include "image.h"
@@ -66,18 +64,6 @@ bool plugin_added_to_inventory = false;
 
 bool plugin_disabled = false;
 
-/*
- * In the case of a single process (common case), this optimization can effectively
- * reduce the restore latency with parallel restore. In the case of multiple processes,
- * states are already restored in parallel within different processes. Therefore, this
- * optimization does not introduce further improvement and will be disabled by default
- * in this case. The flag, parallel_disabled, is used to control whether the
- * optimization is enabled or disabled.
- */
-bool parallel_disabled = false;
-
-pthread_t parallel_thread = 0;
-int parallel_thread_result = 0;
 /**************************************************************************************************/
 
 /* Call ioctl, restarting if it is interrupted */
@@ -365,15 +351,6 @@ int amdgpu_plugin_init(int stage)
 	maps_init(&restore_maps);
 
 	if (stage == CR_PLUGIN_STAGE__RESTORE) {
-		if (has_children(root_item)) {
-			pr_info("Parallel restore disabled\n");
-			parallel_disabled = true;
-		} else {
-			if (install_parallel_sock() < 0) {
-				pr_err("Failed to install parallel socket\n");
-				return -1;
-			}
-		}
 		/* Default Values */
 		kfd_fw_version_check = true;
 		kfd_sdma_fw_version_check = true;
@@ -1462,9 +1439,14 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
-	struct thread_data *thread_datas = NULL;
+	struct thread_data *thread_datas;
 	int thread_i, ret = 0;
-	int offset = 0;
+
+	thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
+	if (!thread_datas) {
+		ret = -ENOMEM;
+		goto exit;
+	}
 
 	for (int i = 0; i < e->num_of_bos; i++) {
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
@@ -1507,101 +1489,56 @@ static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKf
 		}
 	}
 
-	if (!parallel_disabled) {
-		parallel_restore_cmd restore_cmd;
-		pr_info("Begin to send parallel restore cmd\n");
-		ret = init_parallel_restore_cmd(e->num_of_bos, id, e->num_of_gpus, &restore_cmd);
-		if (ret)
-			goto exit_parallel;
+	thread_i = 0;
+	for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
+		struct tp_node *dev;
+		int ret_thread = 0;
+		uint32_t target_gpu_id;
 
-		for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
-			uint32_t target_gpu_id;
-			struct tp_node *dev;
+		if (!e->device_entries[i]->gpu_id)
+			continue;
 
-			if (!e->device_entries[i]->gpu_id)
-				continue;
+		/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
+		target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
 
-			target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
-			dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
-			if (!dev) {
-				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
-				ret = -ENODEV;
-				goto exit_parallel;
-			}
-			parallel_restore_gpu_id_add(e->device_entries[i]->gpu_id, dev->drm_render_minor, &restore_cmd);
-
-			for (int j = 0; j < e->num_of_bos; j++) {
-				if (bo_buckets[j].gpu_id != e->device_entries[i]->gpu_id)
-					continue;
-				if (bo_buckets[j].alloc_flags &
-				    (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) {
-					parallel_restore_bo_add(bo_buckets[j].dmabuf_fd, bo_buckets[j].gpu_id,
-								bo_buckets[j].size, offset, &restore_cmd);
-					offset += bo_buckets[j].size;
-				}
-			}
-		}
-		ret = send_parallel_restore_cmd(&restore_cmd);
-exit_parallel:
-		free_parallel_restore_cmd(&restore_cmd);
-	} else {
-		thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
-		if (!thread_datas) {
-			ret = -ENOMEM;
+		/* We need the fd for actual_gpu_id */
+		dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+		if (!dev) {
+			pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+			ret = -ENODEV;
 			goto exit;
 		}
 
-		thread_i = 0;
-		for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
-			struct tp_node *dev;
-			int ret_thread = 0;
-			uint32_t target_gpu_id;
+		thread_datas[thread_i].id = id;
+		thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
+		thread_datas[thread_i].bo_buckets = bo_buckets;
+		thread_datas[thread_i].bo_entries = e->bo_entries;
+		thread_datas[thread_i].pid = e->pid;
+		thread_datas[thread_i].num_of_bos = e->num_of_bos;
 
-			if (!e->device_entries[i]->gpu_id)
-				continue;
-
-			/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
-			target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
-
-			/* We need the fd for actual_gpu_id */
-			dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
-			if (!dev) {
-				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
-				ret = -ENODEV;
-				goto exit;
-			}
-
-			thread_datas[thread_i].id = id;
-			thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
-			thread_datas[thread_i].bo_buckets = bo_buckets;
-			thread_datas[thread_i].bo_entries = e->bo_entries;
-			thread_datas[thread_i].pid = e->pid;
-			thread_datas[thread_i].num_of_bos = e->num_of_bos;
-
-			thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
-			if (thread_datas[thread_i].drm_fd < 0) {
-				ret = -thread_datas[thread_i].drm_fd;
-				goto exit;
-			}
-
-			ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
-						    (void *)&thread_datas[thread_i]);
-			if (ret_thread) {
-				pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
-				ret = -ret_thread;
-				goto exit;
-			}
-			thread_i++;
+		thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
+		if (thread_datas[thread_i].drm_fd < 0) {
+			ret = -thread_datas[thread_i].drm_fd;
+			goto exit;
 		}
 
-		for (int i = 0; i < e->num_of_gpus; i++) {
-			pthread_join(thread_datas[i].thread, NULL);
-			pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
+		ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
+					    (void *)&thread_datas[thread_i]);
+		if (ret_thread) {
+			pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
+			ret = -ret_thread;
+			goto exit;
+		}
+		thread_i++;
+	}
 
-			if (thread_datas[i].ret) {
-				ret = thread_datas[i].ret;
-				goto exit;
-			}
+	for (int i = 0; i < e->num_of_gpus; i++) {
+		pthread_join(thread_datas[i].thread, NULL);
+		pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
+
+		if (thread_datas[i].ret) {
+			ret = thread_datas[i].ret;
+			goto exit;
 		}
 	}
 exit:
@@ -1609,8 +1546,8 @@ exit:
 		if (bo_buckets[i].dmabuf_fd != KFD_INVALID_FD)
 			close(bo_buckets[i].dmabuf_fd);
 	}
-	if (thread_datas)
-		xfree(thread_datas);
+
+	xfree(thread_datas);
 	return ret;
 }
 
@@ -1899,24 +1836,6 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	if (plugin_disabled)
 		return -ENOTSUP;
 
-	if (!parallel_disabled) {
-		pr_info("Close parallel restore server\n");
-		if (close_parallel_restore_server()) {
-			pr_err("Close parallel restore server fail\n");
-			return -1;
-		}
-
-		exit_code = pthread_join(parallel_thread, NULL);
-		if (exit_code) {
-			pr_err("Failed to join parallel thread ret:%d\n", exit_code);
-			return -1;
-		}
-		if (parallel_thread_result) {
-			pr_err("Parallel restore fail\n");
-			return parallel_thread_result;
-		}
-	}
-
 	pr_info("Inside %s for target pid = %d\n", __func__, target_pid);
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
@@ -1943,244 +1862,3 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 }
 
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)
-
-int sdma_copy_bo_helper(uint64_t size, int fd, FILE *storage_fp, void *buffer, size_t buffer_size,
-			amdgpu_device_handle h_dev, uint64_t max_copy_size, enum sdma_op_type type)
-{
-	return sdma_copy_bo((struct kfd_criu_bo_bucket){ 0, size, 0, 0, 0, 0, fd, 0 }, storage_fp, buffer,
-			    buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
-}
-
-int init_dev(int dev_minor, amdgpu_device_handle *h_dev, uint64_t *max_copy_size)
-{
-	int ret = 0;
-	int drm_fd = -1;
-	uint32_t major, minor;
-
-	struct amdgpu_gpu_info gpu_info = { 0 };
-
-	drm_fd = open_drm_render_device(dev_minor);
-	if (drm_fd < 0) {
-		return drm_fd;
-	}
-
-	ret = amdgpu_device_initialize(drm_fd, &major, &minor, h_dev);
-	if (ret) {
-		pr_perror("Failed to initialize device");
-		goto err;
-	}
-
-	ret = amdgpu_query_gpu_info(*h_dev, &gpu_info);
-	if (ret) {
-		pr_perror("failed to query gpuinfo via libdrm");
-		goto err;
-	}
-	*max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
-								    SDMA_LINEAR_COPY_MAX_SIZE - 1;
-	return 0;
-err:
-	amdgpu_device_deinitialize(*h_dev);
-	return ret;
-}
-
-FILE *get_bo_contents_fp(int id, int gpu_id, size_t tot_size)
-{
-	char img_path[PATH_MAX];
-	size_t image_size = 0;
-	FILE *bo_contents_fp = NULL;
-
-	snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, id, gpu_id);
-	bo_contents_fp = open_img_file(img_path, false, &image_size);
-	if (!bo_contents_fp) {
-		pr_perror("Cannot fopen %s", img_path);
-		return NULL;
-	}
-
-	if (tot_size != image_size) {
-		pr_err("%s size mismatch (current:%ld:expected:%ld)\n", img_path, image_size, tot_size);
-		fclose(bo_contents_fp);
-		return NULL;
-	}
-	return bo_contents_fp;
-}
-
-struct parallel_thread_data {
-	pthread_t thread;
-	uint32_t gpu_id;
-	int minor;
-	parallel_restore_cmd *restore_cmd;
-	int ret;
-};
-
-void *parallel_restore_bo_contents(void *_thread_data)
-{
-	struct parallel_thread_data *thread_data = (struct parallel_thread_data *)_thread_data;
-	amdgpu_device_handle h_dev;
-	uint64_t max_copy_size;
-	size_t total_bo_size = 0, max_bo_size = 0, buffer_size = 0;
-	FILE *bo_contents_fp = NULL;
-	parallel_restore_entry *entry;
-	parallel_restore_cmd *restore_cmd = thread_data->restore_cmd;
-	int ret = 0;
-	int offset = 0;
-	void *buffer = NULL;
-
-	ret = init_dev(thread_data->minor, &h_dev, &max_copy_size);
-	if (ret) {
-		goto err;
-	}
-
-	for (int i = 0; i < restore_cmd->cmd_head.entry_num; i++) {
-		if (restore_cmd->entries[i].gpu_id == thread_data->gpu_id) {
-			total_bo_size += restore_cmd->entries[i].size;
-			max_bo_size = max(restore_cmd->entries[i].size, max_bo_size);
-		}
-	}
-
-	buffer_size = kfd_max_buffer_size > 0 ? min(kfd_max_buffer_size, max_bo_size) : max_bo_size;
-
-	bo_contents_fp = get_bo_contents_fp(restore_cmd->cmd_head.id, thread_data->gpu_id, total_bo_size);
-	if (bo_contents_fp == NULL) {
-		ret = -1;
-		goto err_sdma;
-	}
-	offset = ftell(bo_contents_fp);
-
-	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), buffer_size);
-	if (!buffer) {
-		pr_perror("Failed to alloc aligned memory. Consider setting KFD_MAX_BUFFER_SIZE.");
-		ret = -ENOMEM;
-		goto err_sdma;
-	}
-
-	for (int i = 0; i < restore_cmd->cmd_head.entry_num; i++) {
-		if (restore_cmd->entries[i].gpu_id != thread_data->gpu_id)
-			continue;
-
-		entry = &restore_cmd->entries[i];
-		fseek(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
-		ret = sdma_copy_bo_helper(entry->size, restore_cmd->fds_write[entry->write_id], bo_contents_fp, buffer,
-					  buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
-		if (ret) {
-			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
-			goto err_sdma;
-		}
-	}
-
-err_sdma:
-	if (bo_contents_fp)
-		fclose(bo_contents_fp);
-	if (buffer)
-		xfree(buffer);
-	amdgpu_device_deinitialize(h_dev);
-err:
-	thread_data->ret = ret;
-	return NULL;
-}
-
-void *restore_device_parallel_worker(void *arg)
-{
-	while (1) {
-		parallel_restore_cmd restore_cmd = { 0 };
-		struct parallel_thread_data *thread_datas = NULL;
-		int ret;
-		int error_occurred = 0, join_ret = 0, created_threads = 0;
-
-		ret = recv_parallel_restore_cmd(&restore_cmd);
-		if (ret) {
-			if (ret == 1) {
-				*(int *)arg = 0;
-				goto exit;
-			}
-			goto err;
-		}
-
-		thread_datas = xzalloc(sizeof(*thread_datas) * restore_cmd.cmd_head.gpu_num);
-		if (!thread_datas) {
-			ret = -ENOMEM;
-			goto err;
-		}
-
-		for (; created_threads < restore_cmd.cmd_head.gpu_num; created_threads++) {
-			thread_datas[created_threads].gpu_id = restore_cmd.gpu_ids[created_threads].gpu_id;
-			thread_datas[created_threads].minor = restore_cmd.gpu_ids[created_threads].minor;
-			thread_datas[created_threads].restore_cmd = &restore_cmd;
-
-			ret = pthread_create(&thread_datas[created_threads].thread, NULL, parallel_restore_bo_contents,
-					     (void *)&thread_datas[created_threads]);
-			if (ret) {
-				pr_err("Failed to create thread[0x%x] ret:%d\n", thread_datas[created_threads].gpu_id, ret);
-				error_occurred = 1;
-				break;
-			}
-		}
-
-		for (int i = 0; i < created_threads; i++) {
-			join_ret = pthread_join(thread_datas[i].thread, NULL);
-			if (join_ret != 0) {
-				pr_err("pthread_join failed for Thread[0x%x] ret:%d\n",
-				       thread_datas[i].gpu_id, join_ret);
-				if (!error_occurred) {
-					ret = join_ret;
-					error_occurred = 1;
-				}
-			}
-
-			pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
-
-			/* Check thread return value */
-			if (thread_datas[i].ret && !error_occurred) {
-				ret = thread_datas[i].ret;
-				error_occurred = 1;
-			}
-		}
-
-		if (thread_datas)
-			xfree(thread_datas);
-err:
-		free_parallel_restore_cmd(&restore_cmd);
-
-		if (ret) {
-			*(int *)arg = ret;
-			return NULL;
-		}
-	}
-exit:
-	return NULL;
-}
-
-/*
- * While the background thread is running, some processing functions (e.g., stop_cgroupd)
- * in the main thread need to block SIGCHLD. To prevent interference from this background
- * thread, SIGCHLD is blocked in this thread.
- */
-static int back_thread_create(pthread_t *newthread, void *(*f)(void *), void *arg)
-{
-	int ret = 0;
-	sigset_t blockmask, oldmask;
-
-	sigemptyset(&blockmask);
-	sigaddset(&blockmask, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &blockmask, &oldmask);
-
-	ret = pthread_create(newthread, NULL, f, arg);
-	if (ret) {
-		pr_err("Create worker thread fail: %d\n", ret);
-		return -1;
-	}
-
-	sigprocmask(SIG_SETMASK, &oldmask, NULL);
-	return 0;
-}
-
-int amdgpu_plugin_post_forking(void)
-{
-	if (plugin_disabled)
-		return -ENOTSUP;
-
-	if (parallel_disabled)
-		return 0;
-
-	return back_thread_create(&parallel_thread, restore_device_parallel_worker, &parallel_thread_result);
-}
-CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__POST_FORKING, amdgpu_plugin_post_forking)
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 730f2e028..5b4396a0c 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -45,7 +45,7 @@ bool kfd_capability_check = true;
  */
 int fd_next = -1;
 
-int open_drm_render_device(int minor)
+static int open_drm_render_device(int minor)
 {
 	char path[128];
 	int fd, ret_fd;
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
index e19f8e7ce..c890e3dda 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.h
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -118,7 +118,6 @@ struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32
 struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor);
 struct tp_node *sys_get_node_by_index(const struct tp_system *sys, uint32_t index);
 
-int open_drm_render_device(int minor);
 int node_get_drm_render_device(struct tp_node *node);
 void sys_close_drm_render_devices(struct tp_system *sys);
 
diff --git a/plugins/amdgpu/amdgpu_socket_utils.c b/plugins/amdgpu/amdgpu_socket_utils.c
deleted file mode 100644
index c8bf6d1ba..000000000
--- a/plugins/amdgpu/amdgpu_socket_utils.c
+++ /dev/null
@@ -1,320 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdint.h>
-
-#include "amdgpu_socket_utils.h"
-#include "criu-log.h"
-#include "common/scm.h"
-#include "fdstore.h"
-#include "util-pie.h"
-#include "util.h"
-
-int parallel_socket_addr_len;
-struct sockaddr_un parallel_socket_addr;
-int parallel_socket_id = 0;
-
-static void amdgpu_socket_name_gen(struct sockaddr_un *addr, int *len)
-{
-	addr->sun_family = AF_UNIX;
-	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/criu-amdgpu-parallel-%s", criu_run_id);
-	*len = SUN_LEN(addr);
-	*addr->sun_path = '\0';
-}
-
-int install_parallel_sock(void)
-{
-	int ret = 0;
-	int sock_fd;
-
-	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-	if (sock_fd < 0) {
-		pr_perror("socket creation failed");
-		return -1;
-	}
-
-	amdgpu_socket_name_gen(&parallel_socket_addr, &parallel_socket_addr_len);
-	ret = bind(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
-	if (ret < 0) {
-		pr_perror("bind failed");
-		goto err;
-	}
-
-	ret = listen(sock_fd, SOMAXCONN);
-	if (ret < 0) {
-		pr_perror("listen failed");
-		goto err;
-	}
-
-	parallel_socket_id = fdstore_add(sock_fd);
-	if (parallel_socket_id < 0) {
-		ret = -1;
-		goto err;
-	}
-err:
-	close(sock_fd);
-	return ret;
-}
-
-void parallel_restore_bo_add(int dmabuf_fd, int gpu_id, uint64_t size, uint64_t offset,
-			     parallel_restore_cmd *restore_cmd)
-{
-	parallel_restore_entry *restore_entry = &restore_cmd->entries[restore_cmd->cmd_head.entry_num];
-	restore_entry->gpu_id = gpu_id;
-	restore_entry->write_id = restore_cmd->cmd_head.fd_write_num;
-	restore_entry->write_offset = 0;
-	restore_entry->read_offset = offset;
-	restore_entry->size = size;
-
-	restore_cmd->fds_write[restore_cmd->cmd_head.fd_write_num] = dmabuf_fd;
-
-	restore_cmd->cmd_head.entry_num += 1;
-	restore_cmd->cmd_head.fd_write_num += 1;
-}
-
-void parallel_restore_gpu_id_add(int gpu_id, int minor, parallel_restore_cmd *restore_cmd)
-{
-	restore_cmd->gpu_ids[restore_cmd->cmd_head.gpu_num] = (parallel_gpu_info){ gpu_id, minor };
-	restore_cmd->cmd_head.gpu_num += 1;
-}
-
-static int send_metadata(int sock_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (send(sock_fd, &restore_cmd->cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
-		pr_perror("Send parallel restore command head fail");
-		return -1;
-	}
-	return 0;
-}
-
-static int send_gpu_ids(int sock_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (send(sock_fd, restore_cmd->gpu_ids, restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info), 0) < 0) {
-		pr_perror("Send GPU ids of parallel restore command fail");
-		return -1;
-	}
-	return 0;
-}
-
-static int send_cmds(int sock_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (send(sock_fd, restore_cmd->entries, restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry), 0) < 0) {
-		pr_perror("Send parallel restore command fail");
-		return -1;
-	}
-	return 0;
-}
-
-static int send_dmabuf_fds(int sock_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (send_fds(sock_fd, NULL, 0, restore_cmd->fds_write, restore_cmd->cmd_head.fd_write_num, 0, 0) < 0) {
-		pr_perror("Send dmabuf fds fail");
-		return -1;
-	}
-	return 0;
-}
-
-int send_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
-{
-	int sock_fd;
-	int ret = 0;
-
-	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-	if (sock_fd < 0) {
-		pr_perror("Socket creation failed");
-		return -1;
-	}
-
-	ret = connect(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
-	if (ret < 0) {
-		pr_perror("Connect failed");
-		goto err;
-	}
-
-	ret = send_metadata(sock_fd, restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	ret = send_gpu_ids(sock_fd, restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	ret = send_cmds(sock_fd, restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	ret = send_dmabuf_fds(sock_fd, restore_cmd);
-
-err:
-	close(sock_fd);
-	return ret;
-}
-
-int init_parallel_restore_cmd(int num, int id, int gpu_num, parallel_restore_cmd *restore_cmd)
-{
-	restore_cmd->cmd_head.id = id;
-	restore_cmd->cmd_head.fd_write_num = 0;
-	restore_cmd->cmd_head.entry_num = 0;
-	restore_cmd->cmd_head.gpu_num = 0;
-
-	restore_cmd->gpu_ids = xzalloc(gpu_num * sizeof(parallel_gpu_info));
-	if (!restore_cmd->gpu_ids)
-		return -ENOMEM;
-	restore_cmd->fds_write = xzalloc(num * sizeof(int));
-	if (!restore_cmd->fds_write)
-		return -ENOMEM;
-	restore_cmd->entries = xzalloc(num * sizeof(parallel_restore_entry));
-	if (!restore_cmd->entries)
-		return -ENOMEM;
-	return 0;
-}
-
-void free_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
-{
-	if (restore_cmd->gpu_ids)
-		xfree(restore_cmd->gpu_ids);
-	if (restore_cmd->fds_write)
-		xfree(restore_cmd->fds_write);
-	if (restore_cmd->entries)
-		xfree(restore_cmd->entries);
-}
-
-static int init_parallel_restore_cmd_by_head(parallel_restore_cmd *restore_cmd)
-{
-	restore_cmd->gpu_ids = xzalloc(restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info));
-	if (!restore_cmd->gpu_ids)
-		return -ENOMEM;
-	restore_cmd->fds_write = xzalloc(restore_cmd->cmd_head.fd_write_num * sizeof(int));
-	if (!restore_cmd->fds_write)
-		return -ENOMEM;
-	restore_cmd->entries = xzalloc(restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry));
-	if (!restore_cmd->entries)
-		return -ENOMEM;
-	return 0;
-}
-
-static int check_quit_cmd(parallel_restore_cmd *restore_cmd)
-{
-	return restore_cmd->cmd_head.fd_write_num == 0;
-}
-
-static int recv_metadata(int client_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (recv(client_fd, &restore_cmd->cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
-		pr_perror("Recv parallel restore command head fail");
-		return -1;
-	}
-	return 0;
-}
-
-static int recv_cmds(int client_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (recv(client_fd, restore_cmd->entries, restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry), 0) < 0) {
-		pr_perror("Recv parallel restore command fail");
-		return -1;
-	}
-	return 0;
-}
-
-static int recv_gpu_ids(int sock_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (recv(sock_fd, restore_cmd->gpu_ids, restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info), 0) < 0) {
-		pr_perror("Send GPU ids of parallel restore command fail");
-		return -1;
-	}
-	return 0;
-}
-
-static int recv_dmabuf_fds(int client_fd, parallel_restore_cmd *restore_cmd)
-{
-	if (recv_fds(client_fd, restore_cmd->fds_write, restore_cmd->cmd_head.fd_write_num, 0, 0) < 0) {
-		pr_perror("Recv dmabuf fds fail");
-		return -1;
-	}
-	return 0;
-}
-
-int recv_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
-{
-	int sock_fd, client_fd;
-	int ret = 0;
-
-	sock_fd = fdstore_get(parallel_socket_id);
-	if (sock_fd < 0)
-		return -1;
-
-	client_fd = accept(sock_fd, NULL, NULL);
-	if (client_fd < 0) {
-		ret = client_fd;
-		goto err_accept;
-	}
-
-	ret = recv_metadata(client_fd, restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	// Return 1 to quit
-	if (check_quit_cmd(restore_cmd)) {
-		ret = 1;
-		goto err;
-	}
-
-	ret = init_parallel_restore_cmd_by_head(restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	ret = recv_gpu_ids(client_fd, restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	ret = recv_cmds(client_fd, restore_cmd);
-	if (ret) {
-		goto err;
-	}
-
-	ret = recv_dmabuf_fds(client_fd, restore_cmd);
-
-err:
-	close(client_fd);
-err_accept:
-	close(sock_fd);
-	return ret;
-}
-
-int close_parallel_restore_server(void)
-{
-	int sock_fd;
-	int ret = 0;
-	parallel_restore_cmd_head cmd_head;
-
-	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
-	if (sock_fd < 0) {
-		pr_perror("Socket creation failed");
-		return -1;
-	}
-
-	ret = connect(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
-	if (ret < 0) {
-		pr_perror("Connect failed");
-		goto err;
-	}
-
-	memset(&cmd_head, 0, sizeof(parallel_restore_cmd_head));
-	if (send(sock_fd, &cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
-		pr_perror("Send parallel restore command head fail");
-		return -1;
-	}
-
-err:
-	close(sock_fd);
-	return ret;
-}
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_socket_utils.h b/plugins/amdgpu/amdgpu_socket_utils.h
deleted file mode 100644
index d7200c6bd..000000000
--- a/plugins/amdgpu/amdgpu_socket_utils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
-#define __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
-
-typedef struct {
-	int id;
-	int fd_write_num; /* The number of buffer objects to be restored. */
-	int entry_num;	  /* The number of restore commands.*/
-	int gpu_num;
-} parallel_restore_cmd_head;
-
-typedef struct {
-	int gpu_id;
-	int minor;
-} parallel_gpu_info;
-
-typedef struct {
-	int gpu_id;
-	int write_id;
-	uint64_t read_offset;
-	uint64_t write_offset;
-	uint64_t size;
-} parallel_restore_entry;
-
-typedef struct {
-	parallel_restore_cmd_head cmd_head;
-	int *fds_write;
-	parallel_gpu_info *gpu_ids;
-	parallel_restore_entry *entries;
-} parallel_restore_cmd;
-
-/*
- * For parallel_restore, a background thread in the main CRIU process is used to restore the GPU
- * buffer object. However, initially, the ownership of these buffer objects and the metadata for
- * restoration are all with the target process. Therefore, we introduce a series of functions to
- * help the target process send these tasks to the main CRIU process.
- */
-int init_parallel_restore_cmd(int num, int id, int gpu_num, parallel_restore_cmd *restore_cmd);
-
-void free_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
-
-int install_parallel_sock(void);
-
-int send_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
-
-int recv_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
-
-void parallel_restore_bo_add(int dmabuf_fd, int gpu_id, uint64_t size, uint64_t offset,
-			     parallel_restore_cmd *restore_cmd);
-
-void parallel_restore_gpu_id_add(int gpu_id, int minor, parallel_restore_cmd *restore_cmd);
-
-int close_parallel_restore_server(void);
-
-#endif
\ No newline at end of file

From a525b3c32ea0a4b8bff66ad31941fc574914d18d Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Sun, 9 Nov 2025 20:26:50 -0800
Subject: [PATCH 1799/1854] test/vdso-proxy: handle merged vma-s

When we compare two list of vma-s, we need to take into account that
some of them could be merged.

Fixes #12286

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 test/zdtm/static/vdso-proxy.c | 51 +++++++++++++++--------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/test/zdtm/static/vdso-proxy.c b/test/zdtm/static/vdso-proxy.c
index 43334974f..a53e6cdc0 100644
--- a/test/zdtm/static/vdso-proxy.c
+++ b/test/zdtm/static/vdso-proxy.c
@@ -70,6 +70,7 @@ static int parse_maps(struct vm_area *vmas)
 #endif
 		v->is_vvar_or_vdso |= strstr(buf, "[vdso]") != NULL;
 		v->is_vvar_or_vdso |= strstr(buf, "[vvar]") != NULL;
+		v->is_vvar_or_vdso |= strstr(buf, "[vvar_vclock]") != NULL;
 		test_msg("[NOTE]\tVMA: [%#" PRIx64 ", %#" PRIx64 "]\n", v->start, v->end);
 	}
 
@@ -86,42 +87,35 @@ static int parse_maps(struct vm_area *vmas)
 	return i;
 }
 
-int compare_vmas(struct vm_area *vmax, struct vm_area *vmay)
-{
-	if (vmax->start > vmay->start)
-		return 1;
-	if (vmax->start < vmay->start)
-		return -1;
-	if (vmax->end > vmay->end)
-		return 1;
-	if (vmax->end < vmay->end)
-		return -1;
-
-	return 0;
-}
-
-static int check_vvar_vdso(struct vm_area *before, struct vm_area *after)
+static int check_vvar_vdso(struct vm_area *before, int nr_before, struct vm_area *after, int nr_after)
 {
 	int i, j = 0;
 
-	for (i = 0; i < MAX_VMAS && j < MAX_VMAS; i++, j++) {
-		int cmp = compare_vmas(&before[i], &after[j]);
-
-		if (cmp == 0)
-			continue;
-
-		if (cmp < 0) { /* Lost mapping */
+	for (i = 0, j = 0; i < nr_before || j < nr_after;) {
+		if (j == nr_after || before[i].start < after[j].start) {
 			test_msg("[NOTE]\tLost mapping: %#" PRIx64 "-%#" PRIx64 "\n", before[i].start, before[i].end);
-			j--;
 			if (before[i].is_vvar_or_vdso) {
 				fail("Lost vvar/vdso mapping");
 				return -1;
 			}
+			i++;
 			continue;
 		}
-
-		test_msg("[NOTE]\tNew mapping appeared: %#" PRIx64 "-%#" PRIx64 "\n", after[j].start, after[j].end);
-		i--;
+		if (i == nr_before || before[i].start > after[j].start) {
+			test_msg("[NOTE]\tNew mapping appeared: %#" PRIx64 "-%#" PRIx64 "\n", after[j].start, after[j].end);
+			j++;
+			continue;
+		}
+		if (before[i].end == after[j].end) {
+			i++;
+			j++;
+		} else if (before[i].end > after[j].end) {
+			before[i].start = after[j].end;
+			j++;
+		} else {
+			after[j].start = before[i].end;
+			i++;
+		}
 	}
 
 	return 0;
@@ -129,11 +123,10 @@ static int check_vvar_vdso(struct vm_area *before, struct vm_area *after)
 
 static struct vm_area vmas_before[MAX_VMAS];
 static struct vm_area vmas_after[MAX_VMAS];
+static int nr_before, nr_after;
 
 int main(int argc, char *argv[])
 {
-	int nr_before, nr_after;
-
 	test_init(argc, argv);
 
 	test_msg("[NOTE]\tMappings before:\n");
@@ -154,7 +147,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* After restore vDSO/VVAR blobs must remain in the old place. */
-	if (check_vvar_vdso(vmas_before, vmas_after))
+	if (check_vvar_vdso(vmas_before, nr_before, vmas_after, nr_after))
 		return -1;
 
 	if (nr_before + 2 < nr_after) {

From 6344e8d71c57d44600fca0c34ec64827688c737d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 11 Nov 2025 22:10:36 +0000
Subject: [PATCH 1800/1854] cr-servce: move kerndat_init after log_init

kerndat_init() can generate a significant volume of logs. If called
before log_init(), all these messages will be saved in the
early_log_buffer, which has a limited capacity. Additionally, saving to
the early_log_buffer can introduce a performance penalty, especially
when verbose mode is not enabled.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/cr-service.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/criu/cr-service.c b/criu/cr-service.c
index b4718dde2..dccf4ef38 100644
--- a/criu/cr-service.c
+++ b/criu/cr-service.c
@@ -439,12 +439,6 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (req->has_unprivileged)
 		opts.unprivileged = req->unprivileged;
 
-	if (check_caps())
-		return 1;
-
-	if (kerndat_init())
-		return 1;
-
 	if (log_keep_err()) {
 		pr_perror("Can't tune log");
 		goto err;
@@ -738,9 +732,6 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 		}
 	}
 
-	if (req->has_pidfd_store_sk && init_pidfd_store_sk(ids.pid, req->pidfd_store_sk))
-		goto err;
-
 	if (req->orphan_pts_master)
 		opts.orphan_pts_master = true;
 
@@ -817,6 +808,16 @@ static int setup_opts_from_req(int sk, CriuOpts *req)
 	if (setup_logging_from_req(req, output_changed_by_rpc_conf))
 		goto err;
 
+	if (check_caps())
+		goto err;
+
+	if (kerndat_init())
+		goto err;
+
+	/* init_pidfd_store_sk must be called after kerndat_init. */
+	if (req->has_pidfd_store_sk && init_pidfd_store_sk(ids.pid, req->pidfd_store_sk))
+		goto err;
+
 	if (req->mntns_compat_mode)
 		opts.mntns_compat_mode = true;
 

From e689d902b3d5dabcad8107c00a463a607ef49ebb Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Tue, 11 Nov 2025 15:21:09 -0800
Subject: [PATCH 1801/1854] criu/log: properly handle truncated length from
 vsnprintf

vsnprintf does not always return the number of bytes actually written to
the buffer.

If the output was truncated due to the buffer limit, the return value is
the total number of bytes which WOULD have been written to the final
string if enough space had been available.

This means we must cap the return value to the buffer size excluding the
terminating null byte to correctly calculate the log entry size.

Signed-off-by: Andrei Vagin <avagin@google.com>
---
 criu/log.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/criu/log.c b/criu/log.c
index a02a8df20..fe7077702 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -202,7 +202,7 @@ void flush_early_log_buffer(int fd)
 		}
 		pos += hdr->len;
 	}
-	if (early_log_buf_off == EARLY_LOG_BUF_LEN)
+	if ((early_log_buf_off + sizeof(struct early_log_hdr)) >= EARLY_LOG_BUF_LEN)
 		pr_warn("The early log buffer is full, some messages may have been lost\n");
 	early_log_buf_off = 0;
 }
@@ -320,7 +320,7 @@ unsigned int log_get_loglevel(void)
 
 static void early_vprint(const char *format, unsigned int loglevel, va_list params)
 {
-	unsigned int log_size = 0;
+	int log_size = 0, log_space;
 	struct early_log_hdr *hdr;
 
 	if ((early_log_buf_off + sizeof(hdr)) >= EARLY_LOG_BUF_LEN)
@@ -332,6 +332,7 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 	hdr->level = loglevel;
 	/* Skip the log entry size */
 	early_log_buf_off += sizeof(hdr);
+	log_space = EARLY_LOG_BUF_LEN - early_log_buf_off;
 	if (loglevel >= LOG_TIMESTAMP) {
 		/*
 		 * If logging is not yet setup we just write zeros
@@ -339,12 +340,17 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 		 * keep the same format as the other messages on
 		 * log levels with timestamps (>=LOG_TIMESTAMP).
 		 */
-		log_size = snprintf(early_log_buffer + early_log_buf_off, sizeof(early_log_buffer) - early_log_buf_off,
+		log_size = snprintf(early_log_buffer + early_log_buf_off, log_space,
 				    "(00.000000) ");
 	}
 
-	log_size += vsnprintf(early_log_buffer + early_log_buf_off + log_size,
-			      sizeof(early_log_buffer) - early_log_buf_off - log_size, format, params);
+	if (log_size < log_space)
+		log_size += vsnprintf(early_log_buffer + early_log_buf_off + log_size,
+				      log_space - log_size, format, params);
+	if (log_size > log_space) {
+		/* vsnprintf always add the terminating null byte. */
+		log_size = log_space - 1;
+	}
 
 	/* Save log entry size */
 	hdr->len = log_size;

From 0a7e7d09dd91354277e697495bd8fb05626987a9 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 12 Nov 2025 05:50:23 +0000
Subject: [PATCH 1802/1854] log: use sizeof(*hdr) instead of sizeof(hdr)

Using sizeof(hdr) where hdr is a pointer gives the size of the pointer,
not the size of the structure it points to.

Reported-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/log.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/criu/log.c b/criu/log.c
index fe7077702..bf6f657f2 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -190,7 +190,7 @@ void flush_early_log_buffer(int fd)
 		 * with reading the log_level.
 		 */
 		struct early_log_hdr *hdr = (void *)early_log_buffer + pos;
-		pos += sizeof(hdr);
+		pos += sizeof(*hdr);
 		if (hdr->level <= current_loglevel) {
 			size_t size = 0;
 			while (size < hdr->len) {
@@ -323,7 +323,7 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 	int log_size = 0, log_space;
 	struct early_log_hdr *hdr;
 
-	if ((early_log_buf_off + sizeof(hdr)) >= EARLY_LOG_BUF_LEN)
+	if ((early_log_buf_off + sizeof(*hdr)) >= EARLY_LOG_BUF_LEN)
 		return;
 
 	/* Save loglevel */
@@ -331,7 +331,7 @@ static void early_vprint(const char *format, unsigned int loglevel, va_list para
 	hdr = (void *)early_log_buffer + early_log_buf_off;
 	hdr->level = loglevel;
 	/* Skip the log entry size */
-	early_log_buf_off += sizeof(hdr);
+	early_log_buf_off += sizeof(*hdr);
 	log_space = EARLY_LOG_BUF_LEN - early_log_buf_off;
 	if (loglevel >= LOG_TIMESTAMP) {
 		/*

From 3c7d4fa013297b431da48eff821db7f2e8b90c27 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sat, 8 Nov 2025 06:53:19 +0000
Subject: [PATCH 1803/1854] criu: Version 4.2 (CRIUTIBILITY)

Major changes:
* plugins/amdgpu: Implement parallel restore
* Handle processes with uprobes vma
* Fix: getsockopt usage for SO_PASSCRED/SO_PASSSEC on Linux 6.16
* Relax ELF magic check to support MIPS libraries
* pagemap: prevent integer overflow in pagemap_len

This release's name is a nod to the growing challenge we face in
maintaining compatibility across the rapidly evolving Linux kernel
ecosystem.

The full changelog can be found here: https://criu.org/Download/criu/4.2.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 Makefile.versions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.versions b/Makefile.versions
index 0b1a46a16..3e6c9ed22 100644
--- a/Makefile.versions
+++ b/Makefile.versions
@@ -1,10 +1,10 @@
 #
 # CRIU version.
 CRIU_VERSION_MAJOR	:= 4
-CRIU_VERSION_MINOR	:= 1
-CRIU_VERSION_SUBLEVEL	:= 1
+CRIU_VERSION_MINOR	:= 2
+CRIU_VERSION_SUBLEVEL	:=
 CRIU_VERSION_EXTRA	:=
-CRIU_VERSION_NAME	:= CRISCV
+CRIU_VERSION_NAME	:= CRIUTIBILITY
 CRIU_VERSION		:= $(CRIU_VERSION_MAJOR)$(if $(CRIU_VERSION_MINOR),.$(CRIU_VERSION_MINOR))$(if $(CRIU_VERSION_SUBLEVEL),.$(CRIU_VERSION_SUBLEVEL))$(if $(CRIU_VERSION_EXTRA),.$(CRIU_VERSION_EXTRA))
 
 export CRIU_VERSION_MAJOR CRIU_VERSION_MINOR CRIU_VERSION_SUBLEVEL

From ddbb3dbd8d84a785ad211be42d2ba0d034c0291f Mon Sep 17 00:00:00 2001
From: Pengda Yang <daz-3ux@proton.me>
Date: Wed, 15 Mar 2023 16:58:31 +0800
Subject: [PATCH 1804/1854] limit the field width of 'scanf'

Fixes: #2121

Signed-off-by: Pengda Yang <daz-3ux@proton.me>
---
 criu/proc_parse.c                     | 6 +++---
 test/zdtm/lib/fs.c                    | 2 +-
 test/zdtm/static/apparmor.c           | 2 +-
 test/zdtm/static/apparmor_stacking.c  | 2 +-
 test/zdtm/static/cgroup01.c           | 2 +-
 test/zdtm/static/cgroup02.c           | 2 +-
 test/zdtm/static/change_mnt_context.c | 2 +-
 test/zdtm/static/file_locks01.c       | 2 +-
 test/zdtm/static/file_locks02.c       | 2 +-
 test/zdtm/static/file_locks03.c       | 2 +-
 test/zdtm/static/file_locks04.c       | 2 +-
 test/zdtm/static/netns-dev.c          | 2 +-
 test/zdtm/static/ofd_file_locks.c     | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 0d3b5b23f..f51f2e801 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -1477,7 +1477,7 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 		goto err;
 
 	new->mountpoint[0] = '.';
-	ret = sscanf(str, "%i %i %u:%u %ms %s %ms %n", &new->mnt_id, &new->parent_mnt_id, &kmaj, &kmin, &new->root,
+	ret = sscanf(str, "%i %i %u:%u %ms %4094s %ms %n", &new->mnt_id, &new->parent_mnt_id, &kmaj, &kmin, &new->root,
 		     new->mountpoint + 1, &opt, &n);
 	if (ret != 7)
 		goto err;
@@ -2302,10 +2302,10 @@ static int parse_file_lock_buf(char *buf, struct file_lock *fl, bool is_blocked)
 	char fl_flag[10], fl_type[15], fl_option[10];
 
 	if (is_blocked) {
-		num = sscanf(buf, "%lld: -> %s %s %s %d %x:%x:%ld %lld %s", &fl->fl_id, fl_flag, fl_type, fl_option,
+		num = sscanf(buf, "%lld: -> %9s %14s %9s %d %x:%x:%ld %lld %31s", &fl->fl_id, fl_flag, fl_type, fl_option,
 			     &fl->fl_owner, &fl->maj, &fl->min, &fl->i_no, &fl->start, fl->end);
 	} else {
-		num = sscanf(buf, "%lld:%s %s %s %d %x:%x:%ld %lld %s", &fl->fl_id, fl_flag, fl_type, fl_option,
+		num = sscanf(buf, "%lld:%9s %14s %9s %d %x:%x:%ld %lld %31s", &fl->fl_id, fl_flag, fl_type, fl_option,
 			     &fl->fl_owner, &fl->maj, &fl->min, &fl->i_no, &fl->start, fl->end);
 	}
 
diff --git a/test/zdtm/lib/fs.c b/test/zdtm/lib/fs.c
index bf8cd9cd3..efcc7a1d0 100644
--- a/test/zdtm/lib/fs.c
+++ b/test/zdtm/lib/fs.c
@@ -54,7 +54,7 @@ mnt_info_t *get_cwd_mnt_info(void)
 
 	while (fgets(str, sizeof(str), f)) {
 		char *hyphen = strchr(str, '-');
-		ret = sscanf(str, "%i %i %u:%u %s %s", &mnt_id, &parent_mnt_id, &kmaj, &kmin, root, mountpoint);
+		ret = sscanf(str, "%i %i %u:%u %4095s %4095s", &mnt_id, &parent_mnt_id, &kmaj, &kmin, root, mountpoint);
 		if (ret != 6 || !hyphen)
 			goto err;
 		ret = sscanf(hyphen + 1, " %ms", &fsname);
diff --git a/test/zdtm/static/apparmor.c b/test/zdtm/static/apparmor.c
index 713ffaa46..dc1636821 100644
--- a/test/zdtm/static/apparmor.c
+++ b/test/zdtm/static/apparmor.c
@@ -59,7 +59,7 @@ int checkprofile(void)
 		return -1;
 	}
 
-	len = fscanf(f, "%[^ \n]s", profile);
+	len = fscanf(f, "%1023[^ \n]s", profile);
 	fclose(f);
 	if (len != 1) {
 		fail("wrong number of items scanned %d", len);
diff --git a/test/zdtm/static/apparmor_stacking.c b/test/zdtm/static/apparmor_stacking.c
index 76de8b8b4..0bc36048c 100644
--- a/test/zdtm/static/apparmor_stacking.c
+++ b/test/zdtm/static/apparmor_stacking.c
@@ -56,7 +56,7 @@ static int checkprofile(pid_t pid, char *expected)
 		return -1;
 	}
 
-	len = fscanf(f, "%[^ \n]s", profile);
+	len = fscanf(f, "%1023[^ \n]s", profile);
 	fclose(f);
 	if (len != 1) {
 		fail("wrong number of items scanned %d", len);
diff --git a/test/zdtm/static/cgroup01.c b/test/zdtm/static/cgroup01.c
index bc8515264..7bfb67762 100644
--- a/test/zdtm/static/cgroup01.c
+++ b/test/zdtm/static/cgroup01.c
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 		if (!s)
 			continue;
 
-		sscanf(paux, "%*d %*d %*d:%*d %*s %s", aux);
+		sscanf(paux, "%*d %*d %*d:%*d %*s %1023s", aux);
 		test_msg("found cgroup at %s\n", aux);
 
 		for (i = 0; i < 2; i++) {
diff --git a/test/zdtm/static/cgroup02.c b/test/zdtm/static/cgroup02.c
index 6229a8a08..8a925c0a4 100644
--- a/test/zdtm/static/cgroup02.c
+++ b/test/zdtm/static/cgroup02.c
@@ -75,7 +75,7 @@ bool test_exists(char *mountinfo_line, char *path)
 	char aux[1024], paux[1024];
 	struct stat st;
 
-	sscanf(mountinfo_line, "%*d %*d %*d:%*d %*s %s", aux);
+	sscanf(mountinfo_line, "%*d %*d %*d:%*d %*s %1023s", aux);
 	test_msg("found cgroup at %s\n", aux);
 
 	ssprintf(paux, "%s/%s", aux, path);
diff --git a/test/zdtm/static/change_mnt_context.c b/test/zdtm/static/change_mnt_context.c
index 6d436014b..8787ae5cf 100644
--- a/test/zdtm/static/change_mnt_context.c
+++ b/test/zdtm/static/change_mnt_context.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 		if (!pos)
 			continue;
 
-		result = sscanf(pos, " - %*s %*s %s", opts);
+		result = sscanf(pos, " - %*s %*s %1023s", opts);
 		if (result != 1) {
 			fail("Not able to sscanf line from mountinfo");
 			goto out;
diff --git a/test/zdtm/static/file_locks01.c b/test/zdtm/static/file_locks01.c
index beea171f5..bfdca51d9 100644
--- a/test/zdtm/static/file_locks01.c
+++ b/test/zdtm/static/file_locks01.c
@@ -107,7 +107,7 @@ static int check_file_lock(int fd, char *expected_type, char *expected_option, u
 		memset(fl_type, 0, sizeof(fl_type));
 		memset(fl_option, 0, sizeof(fl_option));
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d %x:%x:%ld %*d %*s", fl_flag, fl_type, fl_option, &fl_owner, &maj,
+		num = sscanf(buf, "%*s %*d:%15s %15s %15s %d %x:%x:%ld %*d %*s", fl_flag, fl_type, fl_option, &fl_owner, &maj,
 			     &min, &i_no);
 		if (num < 7) {
 			pr_err("Invalid lock info\n");
diff --git a/test/zdtm/static/file_locks02.c b/test/zdtm/static/file_locks02.c
index d2049ebaa..ae4827de9 100644
--- a/test/zdtm/static/file_locks02.c
+++ b/test/zdtm/static/file_locks02.c
@@ -41,7 +41,7 @@ static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type,
 		memset(fl_type, 0, sizeof(fl_type));
 		memset(fl_option, 0, sizeof(fl_option));
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d", fl_flag, fl_type, fl_option, &fl_owner);
+		num = sscanf(buf, "%*s %*d:%15s %15s %15s %d", fl_flag, fl_type, fl_option, &fl_owner);
 		if (num < 4) {
 			pr_perror("Invalid lock info.");
 			break;
diff --git a/test/zdtm/static/file_locks03.c b/test/zdtm/static/file_locks03.c
index 35ef41a21..228e66892 100644
--- a/test/zdtm/static/file_locks03.c
+++ b/test/zdtm/static/file_locks03.c
@@ -41,7 +41,7 @@ static int check_file_lock(pid_t pid, pid_t child, int fd, char *expected_type,
 		memset(fl_type, 0, sizeof(fl_type));
 		memset(fl_option, 0, sizeof(fl_option));
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d", fl_flag, fl_type, fl_option, &fl_owner);
+		num = sscanf(buf, "%*s %*d:%15s %15s %15s %d", fl_flag, fl_type, fl_option, &fl_owner);
 		if (num < 4) {
 			pr_perror("Invalid lock info.");
 			break;
diff --git a/test/zdtm/static/file_locks04.c b/test/zdtm/static/file_locks04.c
index 11d224fa7..7e0d2654e 100644
--- a/test/zdtm/static/file_locks04.c
+++ b/test/zdtm/static/file_locks04.c
@@ -34,7 +34,7 @@ static int check_file_locks(pid_t child_pid, int fd, int child_fd)
 			continue;
 		test_msg("c: %s", buf);
 
-		num = sscanf(buf, "%*s %*d:%s %s %s %d %*02x:%*02x:%*d %*d %*s", fl_flag, fl_type, fl_option,
+		num = sscanf(buf, "%*s %*d:%15s %15s %15s %d %*02x:%*02x:%*d %*d %*s", fl_flag, fl_type, fl_option,
 			     &fl_owner);
 
 		if (num < 4) {
diff --git a/test/zdtm/static/netns-dev.c b/test/zdtm/static/netns-dev.c
index 1e6ee1dea..f268f2fec 100644
--- a/test/zdtm/static/netns-dev.c
+++ b/test/zdtm/static/netns-dev.c
@@ -414,7 +414,7 @@ static int check_stable_secret(struct test_conf *tc)
 		return -1;
 	}
 
-	ret = fscanf(fp, "%s", val);
+	ret = fscanf(fp, "%200s", val);
 	if (ret != 1) {
 		pr_perror("fscanf");
 		fclose(fp);
diff --git a/test/zdtm/static/ofd_file_locks.c b/test/zdtm/static/ofd_file_locks.c
index 68b6f22f5..a68fa38ee 100644
--- a/test/zdtm/static/ofd_file_locks.c
+++ b/test/zdtm/static/ofd_file_locks.c
@@ -16,7 +16,7 @@ static int parse_ofd_lock(char *buf, struct flock *lck)
 	if (strncmp(buf, "lock:\t", 6) != 0)
 		return 1; /* isn't lock, skip record */
 
-	num = sscanf(buf, "%*s %*d: %s %s %s %*d %*x:%*x:%*d %lld %s", fl_flag, fl_type, fl_option, &start, fl_end);
+	num = sscanf(buf, "%*s %*d: %9s %14s %9s %*d %*x:%*x:%*d %lld %31s", fl_flag, fl_type, fl_option, &start, fl_end);
 
 	if (num < 4) {
 		pr_err("Invalid lock info %s\n", buf);

From 63861407544172a04c8b03d3387ea6a8b23d9be2 Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:36:33 +0000
Subject: [PATCH 1805/1854] plugins/amdgpu: Add socket operations

When enabling parallel restore, the target process and the main CRIU
process need an IPC interface to communicate and transfer restore
commands. This patch adds a Unix domain TCP socket and stores this
socket in `fdstore`.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 plugins/amdgpu/amdgpu_socket_utils.c | 59 ++++++++++++++++++++++++++++
 plugins/amdgpu/amdgpu_socket_utils.h |  6 +++
 2 files changed, 65 insertions(+)
 create mode 100644 plugins/amdgpu/amdgpu_socket_utils.c
 create mode 100644 plugins/amdgpu/amdgpu_socket_utils.h

diff --git a/plugins/amdgpu/amdgpu_socket_utils.c b/plugins/amdgpu/amdgpu_socket_utils.c
new file mode 100644
index 000000000..9e957ae54
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_socket_utils.c
@@ -0,0 +1,59 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "amdgpu_socket_utils.h"
+#include "criu-log.h"
+#include "common/scm.h"
+#include "fdstore.h"
+#include "util-pie.h"
+#include "util.h"
+
+int parallel_socket_addr_len;
+struct sockaddr_un parallel_socket_addr;
+int parallel_socket_id = 0;
+
+static void amdgpu_socket_name_gen(struct sockaddr_un *addr, int *len)
+{
+	addr->sun_family = AF_UNIX;
+	snprintf(addr->sun_path, UNIX_PATH_MAX, "x/criu-amdgpu-parallel-%s", criu_run_id);
+	*len = SUN_LEN(addr);
+	*addr->sun_path = '\0';
+}
+
+int install_parallel_sock(void)
+{
+	int ret = 0;
+	int sock_fd;
+
+	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock_fd < 0) {
+		pr_perror("socket creation failed");
+		return -1;
+	}
+
+	amdgpu_socket_name_gen(&parallel_socket_addr, &parallel_socket_addr_len);
+	ret = bind(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
+	if (ret < 0) {
+		pr_perror("bind failed");
+		goto err;
+	}
+
+	ret = listen(sock_fd, SOMAXCONN);
+	if (ret < 0) {
+		pr_perror("listen failed");
+		goto err;
+	}
+
+	parallel_socket_id = fdstore_add(sock_fd);
+	if (parallel_socket_id < 0) {
+		ret = -1;
+		goto err;
+	}
+err:
+	close(sock_fd);
+	return ret;
+}
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_socket_utils.h b/plugins/amdgpu/amdgpu_socket_utils.h
new file mode 100644
index 000000000..4e7aa2aa4
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_socket_utils.h
@@ -0,0 +1,6 @@
+#ifndef __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
+#define __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
+
+int install_parallel_sock(void);
+
+#endif
\ No newline at end of file

From 33ed774c8dd13fc48955557434bad9908031379e Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:38:48 +0000
Subject: [PATCH 1806/1854] plugins/amdgpu: Add parallel restore command

Currently the restore of buffer object comsumes a significant amount of
time. However, this part has no logical dependencies with other restore
operations. This patch introduce some structures and some helper
functions for the target process to offload this task to the main CRIU
process.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 plugins/amdgpu/amdgpu_socket_utils.c | 261 +++++++++++++++++++++++++++
 plugins/amdgpu/amdgpu_socket_utils.h |  48 +++++
 2 files changed, 309 insertions(+)

diff --git a/plugins/amdgpu/amdgpu_socket_utils.c b/plugins/amdgpu/amdgpu_socket_utils.c
index 9e957ae54..c8bf6d1ba 100644
--- a/plugins/amdgpu/amdgpu_socket_utils.c
+++ b/plugins/amdgpu/amdgpu_socket_utils.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #include "amdgpu_socket_utils.h"
 #include "criu-log.h"
@@ -53,6 +54,266 @@ int install_parallel_sock(void)
 		ret = -1;
 		goto err;
 	}
+err:
+	close(sock_fd);
+	return ret;
+}
+
+void parallel_restore_bo_add(int dmabuf_fd, int gpu_id, uint64_t size, uint64_t offset,
+			     parallel_restore_cmd *restore_cmd)
+{
+	parallel_restore_entry *restore_entry = &restore_cmd->entries[restore_cmd->cmd_head.entry_num];
+	restore_entry->gpu_id = gpu_id;
+	restore_entry->write_id = restore_cmd->cmd_head.fd_write_num;
+	restore_entry->write_offset = 0;
+	restore_entry->read_offset = offset;
+	restore_entry->size = size;
+
+	restore_cmd->fds_write[restore_cmd->cmd_head.fd_write_num] = dmabuf_fd;
+
+	restore_cmd->cmd_head.entry_num += 1;
+	restore_cmd->cmd_head.fd_write_num += 1;
+}
+
+void parallel_restore_gpu_id_add(int gpu_id, int minor, parallel_restore_cmd *restore_cmd)
+{
+	restore_cmd->gpu_ids[restore_cmd->cmd_head.gpu_num] = (parallel_gpu_info){ gpu_id, minor };
+	restore_cmd->cmd_head.gpu_num += 1;
+}
+
+static int send_metadata(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send(sock_fd, &restore_cmd->cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
+		pr_perror("Send parallel restore command head fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int send_gpu_ids(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send(sock_fd, restore_cmd->gpu_ids, restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info), 0) < 0) {
+		pr_perror("Send GPU ids of parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int send_cmds(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send(sock_fd, restore_cmd->entries, restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry), 0) < 0) {
+		pr_perror("Send parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int send_dmabuf_fds(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (send_fds(sock_fd, NULL, 0, restore_cmd->fds_write, restore_cmd->cmd_head.fd_write_num, 0, 0) < 0) {
+		pr_perror("Send dmabuf fds fail");
+		return -1;
+	}
+	return 0;
+}
+
+int send_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
+{
+	int sock_fd;
+	int ret = 0;
+
+	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock_fd < 0) {
+		pr_perror("Socket creation failed");
+		return -1;
+	}
+
+	ret = connect(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
+	if (ret < 0) {
+		pr_perror("Connect failed");
+		goto err;
+	}
+
+	ret = send_metadata(sock_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = send_gpu_ids(sock_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = send_cmds(sock_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = send_dmabuf_fds(sock_fd, restore_cmd);
+
+err:
+	close(sock_fd);
+	return ret;
+}
+
+int init_parallel_restore_cmd(int num, int id, int gpu_num, parallel_restore_cmd *restore_cmd)
+{
+	restore_cmd->cmd_head.id = id;
+	restore_cmd->cmd_head.fd_write_num = 0;
+	restore_cmd->cmd_head.entry_num = 0;
+	restore_cmd->cmd_head.gpu_num = 0;
+
+	restore_cmd->gpu_ids = xzalloc(gpu_num * sizeof(parallel_gpu_info));
+	if (!restore_cmd->gpu_ids)
+		return -ENOMEM;
+	restore_cmd->fds_write = xzalloc(num * sizeof(int));
+	if (!restore_cmd->fds_write)
+		return -ENOMEM;
+	restore_cmd->entries = xzalloc(num * sizeof(parallel_restore_entry));
+	if (!restore_cmd->entries)
+		return -ENOMEM;
+	return 0;
+}
+
+void free_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
+{
+	if (restore_cmd->gpu_ids)
+		xfree(restore_cmd->gpu_ids);
+	if (restore_cmd->fds_write)
+		xfree(restore_cmd->fds_write);
+	if (restore_cmd->entries)
+		xfree(restore_cmd->entries);
+}
+
+static int init_parallel_restore_cmd_by_head(parallel_restore_cmd *restore_cmd)
+{
+	restore_cmd->gpu_ids = xzalloc(restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info));
+	if (!restore_cmd->gpu_ids)
+		return -ENOMEM;
+	restore_cmd->fds_write = xzalloc(restore_cmd->cmd_head.fd_write_num * sizeof(int));
+	if (!restore_cmd->fds_write)
+		return -ENOMEM;
+	restore_cmd->entries = xzalloc(restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry));
+	if (!restore_cmd->entries)
+		return -ENOMEM;
+	return 0;
+}
+
+static int check_quit_cmd(parallel_restore_cmd *restore_cmd)
+{
+	return restore_cmd->cmd_head.fd_write_num == 0;
+}
+
+static int recv_metadata(int client_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv(client_fd, &restore_cmd->cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
+		pr_perror("Recv parallel restore command head fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int recv_cmds(int client_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv(client_fd, restore_cmd->entries, restore_cmd->cmd_head.entry_num * sizeof(parallel_restore_entry), 0) < 0) {
+		pr_perror("Recv parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int recv_gpu_ids(int sock_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv(sock_fd, restore_cmd->gpu_ids, restore_cmd->cmd_head.gpu_num * sizeof(parallel_gpu_info), 0) < 0) {
+		pr_perror("Send GPU ids of parallel restore command fail");
+		return -1;
+	}
+	return 0;
+}
+
+static int recv_dmabuf_fds(int client_fd, parallel_restore_cmd *restore_cmd)
+{
+	if (recv_fds(client_fd, restore_cmd->fds_write, restore_cmd->cmd_head.fd_write_num, 0, 0) < 0) {
+		pr_perror("Recv dmabuf fds fail");
+		return -1;
+	}
+	return 0;
+}
+
+int recv_parallel_restore_cmd(parallel_restore_cmd *restore_cmd)
+{
+	int sock_fd, client_fd;
+	int ret = 0;
+
+	sock_fd = fdstore_get(parallel_socket_id);
+	if (sock_fd < 0)
+		return -1;
+
+	client_fd = accept(sock_fd, NULL, NULL);
+	if (client_fd < 0) {
+		ret = client_fd;
+		goto err_accept;
+	}
+
+	ret = recv_metadata(client_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	// Return 1 to quit
+	if (check_quit_cmd(restore_cmd)) {
+		ret = 1;
+		goto err;
+	}
+
+	ret = init_parallel_restore_cmd_by_head(restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = recv_gpu_ids(client_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = recv_cmds(client_fd, restore_cmd);
+	if (ret) {
+		goto err;
+	}
+
+	ret = recv_dmabuf_fds(client_fd, restore_cmd);
+
+err:
+	close(client_fd);
+err_accept:
+	close(sock_fd);
+	return ret;
+}
+
+int close_parallel_restore_server(void)
+{
+	int sock_fd;
+	int ret = 0;
+	parallel_restore_cmd_head cmd_head;
+
+	sock_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+	if (sock_fd < 0) {
+		pr_perror("Socket creation failed");
+		return -1;
+	}
+
+	ret = connect(sock_fd, (struct sockaddr *)&parallel_socket_addr, parallel_socket_addr_len);
+	if (ret < 0) {
+		pr_perror("Connect failed");
+		goto err;
+	}
+
+	memset(&cmd_head, 0, sizeof(parallel_restore_cmd_head));
+	if (send(sock_fd, &cmd_head, sizeof(parallel_restore_cmd_head), 0) < 0) {
+		pr_perror("Send parallel restore command head fail");
+		return -1;
+	}
+
 err:
 	close(sock_fd);
 	return ret;
diff --git a/plugins/amdgpu/amdgpu_socket_utils.h b/plugins/amdgpu/amdgpu_socket_utils.h
index 4e7aa2aa4..d7200c6bd 100644
--- a/plugins/amdgpu/amdgpu_socket_utils.h
+++ b/plugins/amdgpu/amdgpu_socket_utils.h
@@ -1,6 +1,54 @@
 #ifndef __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
 #define __KFD_PLUGIN_AMDGPU_SOCKET_UTILS_H__
 
+typedef struct {
+	int id;
+	int fd_write_num; /* The number of buffer objects to be restored. */
+	int entry_num;	  /* The number of restore commands.*/
+	int gpu_num;
+} parallel_restore_cmd_head;
+
+typedef struct {
+	int gpu_id;
+	int minor;
+} parallel_gpu_info;
+
+typedef struct {
+	int gpu_id;
+	int write_id;
+	uint64_t read_offset;
+	uint64_t write_offset;
+	uint64_t size;
+} parallel_restore_entry;
+
+typedef struct {
+	parallel_restore_cmd_head cmd_head;
+	int *fds_write;
+	parallel_gpu_info *gpu_ids;
+	parallel_restore_entry *entries;
+} parallel_restore_cmd;
+
+/*
+ * For parallel_restore, a background thread in the main CRIU process is used to restore the GPU
+ * buffer object. However, initially, the ownership of these buffer objects and the metadata for
+ * restoration are all with the target process. Therefore, we introduce a series of functions to
+ * help the target process send these tasks to the main CRIU process.
+ */
+int init_parallel_restore_cmd(int num, int id, int gpu_num, parallel_restore_cmd *restore_cmd);
+
+void free_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
+
 int install_parallel_sock(void);
 
+int send_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
+
+int recv_parallel_restore_cmd(parallel_restore_cmd *restore_cmd);
+
+void parallel_restore_bo_add(int dmabuf_fd, int gpu_id, uint64_t size, uint64_t offset,
+			     parallel_restore_cmd *restore_cmd);
+
+void parallel_restore_gpu_id_add(int gpu_id, int minor, parallel_restore_cmd *restore_cmd);
+
+int close_parallel_restore_server(void);
+
 #endif
\ No newline at end of file

From 4a3a695dfb9da7338174549b0cadcc4279cbf51a Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Wed, 15 Jan 2025 06:38:27 +0000
Subject: [PATCH 1807/1854] plugins/amdgpu: Implement parallel restore

This patch implements the entire logic to enable the offloading of
buffer object content restoration.

The goal of this patch is to offload the buffer object content
restoration to the main CRIU process so that this restoration can occur
in parallel with other restoration logic (mainly the restoration of
memory state in the restore blob, which is time-consuming) to speed up
the restore phase. The restoration of buffer object content usually
takes a significant amount of time for GPU applications, so
parallelizing it with other operations can reduce the overall restore
time.

It has three parts: the first replaces the restoration of buffer objects
in the target process by sending a parallel restore command to the main
CRIU process; the second implements the POST_FORKING hook in the amdgpu
plugin to enable buffer object content restoration in the main CRIU
process; the third stops the parallel thread in the RESUME_DEVICES_LATE
hook.

This optimization only focuses on the single-process situation (common
case). In other scenarios, it will turn to the original method. This is
achieved with the new `parallel_disabled` flag.

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 plugins/amdgpu/Makefile                 |   2 +-
 plugins/amdgpu/amdgpu_plugin.c          | 420 +++++++++++++++++++++---
 plugins/amdgpu/amdgpu_plugin_topology.c |   2 +-
 plugins/amdgpu/amdgpu_plugin_topology.h |   1 +
 4 files changed, 374 insertions(+), 51 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 3d55f8bb4..870a039cd 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -27,7 +27,7 @@ endif
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc --proto_path=. --c_out=. criu-amdgpu.proto
 
-amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c
+amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
 	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 96c086162..69194fbc7 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -28,11 +28,13 @@
 #include "xmalloc.h"
 #include "criu-log.h"
 #include "files.h"
+#include "pstree.h"
 
 #include "common/list.h"
 #include "amdgpu_plugin_drm.h"
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
+#include "amdgpu_socket_utils.h"
 
 #include "img-streamer.h"
 #include "image.h"
@@ -64,6 +66,18 @@ bool plugin_added_to_inventory = false;
 
 bool plugin_disabled = false;
 
+/*
+ * In the case of a single process (common case), this optimization can effectively
+ * reduce the restore latency with parallel restore. In the case of multiple processes,
+ * states are already restored in parallel within different processes. Therefore, this
+ * optimization does not introduce further improvement and will be disabled by default
+ * in this case. The flag, parallel_disabled, is used to control whether the
+ * optimization is enabled or disabled.
+ */
+bool parallel_disabled = false;
+
+pthread_t parallel_thread = 0;
+int parallel_thread_result = 0;
 /**************************************************************************************************/
 
 /* Call ioctl, restarting if it is interrupted */
@@ -351,6 +365,15 @@ int amdgpu_plugin_init(int stage)
 	maps_init(&restore_maps);
 
 	if (stage == CR_PLUGIN_STAGE__RESTORE) {
+		if (has_children(root_item)) {
+			pr_info("Parallel restore disabled\n");
+			parallel_disabled = true;
+		} else {
+			if (install_parallel_sock() < 0) {
+				pr_err("Failed to install parallel socket\n");
+				return -1;
+			}
+		}
 		/* Default Values */
 		kfd_fw_version_check = true;
 		kfd_sdma_fw_version_check = true;
@@ -1439,14 +1462,9 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 
 static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKfd *e)
 {
-	struct thread_data *thread_datas;
+	struct thread_data *thread_datas = NULL;
 	int thread_i, ret = 0;
-
-	thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
-	if (!thread_datas) {
-		ret = -ENOMEM;
-		goto exit;
-	}
+	int offset = 0;
 
 	for (int i = 0; i < e->num_of_bos; i++) {
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
@@ -1489,56 +1507,101 @@ static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKf
 		}
 	}
 
-	thread_i = 0;
-	for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
-		struct tp_node *dev;
-		int ret_thread = 0;
-		uint32_t target_gpu_id;
+	if (!parallel_disabled) {
+		parallel_restore_cmd restore_cmd;
+		pr_info("Begin to send parallel restore cmd\n");
+		ret = init_parallel_restore_cmd(e->num_of_bos, id, e->num_of_gpus, &restore_cmd);
+		if (ret)
+			goto exit_parallel;
 
-		if (!e->device_entries[i]->gpu_id)
-			continue;
+		for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
+			uint32_t target_gpu_id;
+			struct tp_node *dev;
 
-		/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
-		target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+			if (!e->device_entries[i]->gpu_id)
+				continue;
 
-		/* We need the fd for actual_gpu_id */
-		dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
-		if (!dev) {
-			pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
-			ret = -ENODEV;
+			target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+			dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+			if (!dev) {
+				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+				ret = -ENODEV;
+				goto exit_parallel;
+			}
+			parallel_restore_gpu_id_add(e->device_entries[i]->gpu_id, dev->drm_render_minor, &restore_cmd);
+
+			for (int j = 0; j < e->num_of_bos; j++) {
+				if (bo_buckets[j].gpu_id != e->device_entries[i]->gpu_id)
+					continue;
+				if (bo_buckets[j].alloc_flags &
+				    (KFD_IOC_ALLOC_MEM_FLAGS_VRAM | KFD_IOC_ALLOC_MEM_FLAGS_GTT)) {
+					parallel_restore_bo_add(bo_buckets[j].dmabuf_fd, bo_buckets[j].gpu_id,
+								bo_buckets[j].size, offset, &restore_cmd);
+					offset += bo_buckets[j].size;
+				}
+			}
+		}
+		ret = send_parallel_restore_cmd(&restore_cmd);
+exit_parallel:
+		free_parallel_restore_cmd(&restore_cmd);
+	} else {
+		thread_datas = xzalloc(sizeof(*thread_datas) * e->num_of_gpus);
+		if (!thread_datas) {
+			ret = -ENOMEM;
 			goto exit;
 		}
 
-		thread_datas[thread_i].id = id;
-		thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
-		thread_datas[thread_i].bo_buckets = bo_buckets;
-		thread_datas[thread_i].bo_entries = e->bo_entries;
-		thread_datas[thread_i].pid = e->pid;
-		thread_datas[thread_i].num_of_bos = e->num_of_bos;
+		thread_i = 0;
+		for (int i = 0; i < e->num_of_gpus + e->num_of_cpus; i++) {
+			struct tp_node *dev;
+			int ret_thread = 0;
+			uint32_t target_gpu_id;
 
-		thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
-		if (thread_datas[thread_i].drm_fd < 0) {
-			ret = -thread_datas[thread_i].drm_fd;
-			goto exit;
+			if (!e->device_entries[i]->gpu_id)
+				continue;
+
+			/* e->device_entries[i]->gpu_id is user_gpu_id, target_gpu_id is actual_gpu_id */
+			target_gpu_id = maps_get_dest_gpu(&restore_maps, e->device_entries[i]->gpu_id);
+
+			/* We need the fd for actual_gpu_id */
+			dev = sys_get_node_by_gpu_id(&dest_topology, target_gpu_id);
+			if (!dev) {
+				pr_err("Failed to find node with gpu_id:0x%04x\n", target_gpu_id);
+				ret = -ENODEV;
+				goto exit;
+			}
+
+			thread_datas[thread_i].id = id;
+			thread_datas[thread_i].gpu_id = e->device_entries[i]->gpu_id;
+			thread_datas[thread_i].bo_buckets = bo_buckets;
+			thread_datas[thread_i].bo_entries = e->bo_entries;
+			thread_datas[thread_i].pid = e->pid;
+			thread_datas[thread_i].num_of_bos = e->num_of_bos;
+
+			thread_datas[thread_i].drm_fd = node_get_drm_render_device(dev);
+			if (thread_datas[thread_i].drm_fd < 0) {
+				ret = -thread_datas[thread_i].drm_fd;
+				goto exit;
+			}
+
+			ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
+						    (void *)&thread_datas[thread_i]);
+			if (ret_thread) {
+				pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
+				ret = -ret_thread;
+				goto exit;
+			}
+			thread_i++;
 		}
 
-		ret_thread = pthread_create(&thread_datas[thread_i].thread, NULL, restore_bo_contents,
-					    (void *)&thread_datas[thread_i]);
-		if (ret_thread) {
-			pr_err("Failed to create thread[%i] ret:%d\n", thread_i, ret_thread);
-			ret = -ret_thread;
-			goto exit;
-		}
-		thread_i++;
-	}
+		for (int i = 0; i < e->num_of_gpus; i++) {
+			pthread_join(thread_datas[i].thread, NULL);
+			pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
 
-	for (int i = 0; i < e->num_of_gpus; i++) {
-		pthread_join(thread_datas[i].thread, NULL);
-		pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
-
-		if (thread_datas[i].ret) {
-			ret = thread_datas[i].ret;
-			goto exit;
+			if (thread_datas[i].ret) {
+				ret = thread_datas[i].ret;
+				goto exit;
+			}
 		}
 	}
 exit:
@@ -1546,8 +1609,8 @@ exit:
 		if (bo_buckets[i].dmabuf_fd != KFD_INVALID_FD)
 			close(bo_buckets[i].dmabuf_fd);
 	}
-
-	xfree(thread_datas);
+	if (thread_datas)
+		xfree(thread_datas);
 	return ret;
 }
 
@@ -1836,6 +1899,24 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 	if (plugin_disabled)
 		return -ENOTSUP;
 
+	if (!parallel_disabled) {
+		pr_info("Close parallel restore server\n");
+		if (close_parallel_restore_server()) {
+			pr_err("Close parallel restore server fail\n");
+			return -1;
+		}
+
+		exit_code = pthread_join(parallel_thread, NULL);
+		if (exit_code) {
+			pr_err("Failed to join parallel thread ret:%d\n", exit_code);
+			return -1;
+		}
+		if (parallel_thread_result) {
+			pr_err("Parallel restore fail\n");
+			return parallel_thread_result;
+		}
+	}
+
 	pr_info("Inside %s for target pid = %d\n", __func__, target_pid);
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
@@ -1862,3 +1943,244 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 }
 
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)
+
+int sdma_copy_bo_helper(uint64_t size, int fd, FILE *storage_fp, void *buffer, size_t buffer_size,
+			amdgpu_device_handle h_dev, uint64_t max_copy_size, enum sdma_op_type type)
+{
+	return sdma_copy_bo((struct kfd_criu_bo_bucket){ 0, size, 0, 0, 0, 0, fd, 0 }, storage_fp, buffer,
+			    buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+}
+
+int init_dev(int dev_minor, amdgpu_device_handle *h_dev, uint64_t *max_copy_size)
+{
+	int ret = 0;
+	int drm_fd = -1;
+	uint32_t major, minor;
+
+	struct amdgpu_gpu_info gpu_info = { 0 };
+
+	drm_fd = open_drm_render_device(dev_minor);
+	if (drm_fd < 0) {
+		return drm_fd;
+	}
+
+	ret = amdgpu_device_initialize(drm_fd, &major, &minor, h_dev);
+	if (ret) {
+		pr_perror("Failed to initialize device");
+		goto err;
+	}
+
+	ret = amdgpu_query_gpu_info(*h_dev, &gpu_info);
+	if (ret) {
+		pr_perror("failed to query gpuinfo via libdrm");
+		goto err;
+	}
+	*max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
+								    SDMA_LINEAR_COPY_MAX_SIZE - 1;
+	return 0;
+err:
+	amdgpu_device_deinitialize(*h_dev);
+	return ret;
+}
+
+FILE *get_bo_contents_fp(int id, int gpu_id, size_t tot_size)
+{
+	char img_path[PATH_MAX];
+	size_t image_size = 0;
+	FILE *bo_contents_fp = NULL;
+
+	snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, id, gpu_id);
+	bo_contents_fp = open_img_file(img_path, false, &image_size);
+	if (!bo_contents_fp) {
+		pr_perror("Cannot fopen %s", img_path);
+		return NULL;
+	}
+
+	if (tot_size != image_size) {
+		pr_err("%s size mismatch (current:%ld:expected:%ld)\n", img_path, image_size, tot_size);
+		fclose(bo_contents_fp);
+		return NULL;
+	}
+	return bo_contents_fp;
+}
+
+struct parallel_thread_data {
+	pthread_t thread;
+	uint32_t gpu_id;
+	int minor;
+	parallel_restore_cmd *restore_cmd;
+	int ret;
+};
+
+void *parallel_restore_bo_contents(void *_thread_data)
+{
+	struct parallel_thread_data *thread_data = (struct parallel_thread_data *)_thread_data;
+	amdgpu_device_handle h_dev;
+	uint64_t max_copy_size;
+	size_t total_bo_size = 0, max_bo_size = 0, buffer_size = 0;
+	FILE *bo_contents_fp = NULL;
+	parallel_restore_entry *entry;
+	parallel_restore_cmd *restore_cmd = thread_data->restore_cmd;
+	int ret = 0;
+	int offset = 0;
+	void *buffer = NULL;
+
+	ret = init_dev(thread_data->minor, &h_dev, &max_copy_size);
+	if (ret) {
+		goto err;
+	}
+
+	for (int i = 0; i < restore_cmd->cmd_head.entry_num; i++) {
+		if (restore_cmd->entries[i].gpu_id == thread_data->gpu_id) {
+			total_bo_size += restore_cmd->entries[i].size;
+			max_bo_size = max(restore_cmd->entries[i].size, max_bo_size);
+		}
+	}
+
+	buffer_size = kfd_max_buffer_size > 0 ? min(kfd_max_buffer_size, max_bo_size) : max_bo_size;
+
+	bo_contents_fp = get_bo_contents_fp(restore_cmd->cmd_head.id, thread_data->gpu_id, total_bo_size);
+	if (bo_contents_fp == NULL) {
+		ret = -1;
+		goto err_sdma;
+	}
+	offset = ftell(bo_contents_fp);
+
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), buffer_size);
+	if (!buffer) {
+		pr_perror("Failed to alloc aligned memory. Consider setting KFD_MAX_BUFFER_SIZE.");
+		ret = -ENOMEM;
+		goto err_sdma;
+	}
+
+	for (int i = 0; i < restore_cmd->cmd_head.entry_num; i++) {
+		if (restore_cmd->entries[i].gpu_id != thread_data->gpu_id)
+			continue;
+
+		entry = &restore_cmd->entries[i];
+		fseek(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
+		ret = sdma_copy_bo_helper(entry->size, restore_cmd->fds_write[entry->write_id], bo_contents_fp, buffer,
+					  buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+		if (ret) {
+			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
+			goto err_sdma;
+		}
+	}
+
+err_sdma:
+	if (bo_contents_fp)
+		fclose(bo_contents_fp);
+	if (buffer)
+		xfree(buffer);
+	amdgpu_device_deinitialize(h_dev);
+err:
+	thread_data->ret = ret;
+	return NULL;
+}
+
+void *restore_device_parallel_worker(void *arg)
+{
+	while (1) {
+		parallel_restore_cmd restore_cmd = { 0 };
+		struct parallel_thread_data *thread_datas = NULL;
+		int ret;
+		int error_occurred = 0, join_ret = 0, created_threads = 0;
+
+		ret = recv_parallel_restore_cmd(&restore_cmd);
+		if (ret) {
+			if (ret == 1) {
+				*(int *)arg = 0;
+				goto exit;
+			}
+			goto err;
+		}
+
+		thread_datas = xzalloc(sizeof(*thread_datas) * restore_cmd.cmd_head.gpu_num);
+		if (!thread_datas) {
+			ret = -ENOMEM;
+			goto err;
+		}
+
+		for (; created_threads < restore_cmd.cmd_head.gpu_num; created_threads++) {
+			thread_datas[created_threads].gpu_id = restore_cmd.gpu_ids[created_threads].gpu_id;
+			thread_datas[created_threads].minor = restore_cmd.gpu_ids[created_threads].minor;
+			thread_datas[created_threads].restore_cmd = &restore_cmd;
+
+			ret = pthread_create(&thread_datas[created_threads].thread, NULL, parallel_restore_bo_contents,
+					     (void *)&thread_datas[created_threads]);
+			if (ret) {
+				pr_err("Failed to create thread[0x%x] ret:%d\n", thread_datas[created_threads].gpu_id, ret);
+				error_occurred = 1;
+				break;
+			}
+		}
+
+		for (int i = 0; i < created_threads; i++) {
+			join_ret = pthread_join(thread_datas[i].thread, NULL);
+			if (join_ret != 0) {
+				pr_err("pthread_join failed for Thread[0x%x] ret:%d\n",
+				       thread_datas[i].gpu_id, join_ret);
+				if (!error_occurred) {
+					ret = join_ret;
+					error_occurred = 1;
+				}
+			}
+
+			pr_info("Thread[0x%x] finished ret:%d\n", thread_datas[i].gpu_id, thread_datas[i].ret);
+
+			/* Check thread return value */
+			if (thread_datas[i].ret && !error_occurred) {
+				ret = thread_datas[i].ret;
+				error_occurred = 1;
+			}
+		}
+
+		if (thread_datas)
+			xfree(thread_datas);
+err:
+		free_parallel_restore_cmd(&restore_cmd);
+
+		if (ret) {
+			*(int *)arg = ret;
+			return NULL;
+		}
+	}
+exit:
+	return NULL;
+}
+
+/*
+ * While the background thread is running, some processing functions (e.g., stop_cgroupd)
+ * in the main thread need to block SIGCHLD. To prevent interference from this background
+ * thread, SIGCHLD is blocked in this thread.
+ */
+static int back_thread_create(pthread_t *newthread, void *(*f)(void *), void *arg)
+{
+	int ret = 0;
+	sigset_t blockmask, oldmask;
+
+	sigemptyset(&blockmask);
+	sigaddset(&blockmask, SIGCHLD);
+	sigprocmask(SIG_BLOCK, &blockmask, &oldmask);
+
+	ret = pthread_create(newthread, NULL, f, arg);
+	if (ret) {
+		pr_err("Create worker thread fail: %d\n", ret);
+		return -1;
+	}
+
+	sigprocmask(SIG_SETMASK, &oldmask, NULL);
+	return 0;
+}
+
+int amdgpu_plugin_post_forking(void)
+{
+	if (plugin_disabled)
+		return -ENOTSUP;
+
+	if (parallel_disabled)
+		return 0;
+
+	return back_thread_create(&parallel_thread, restore_device_parallel_worker, &parallel_thread_result);
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__POST_FORKING, amdgpu_plugin_post_forking)
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.c b/plugins/amdgpu/amdgpu_plugin_topology.c
index 5b4396a0c..730f2e028 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.c
+++ b/plugins/amdgpu/amdgpu_plugin_topology.c
@@ -45,7 +45,7 @@ bool kfd_capability_check = true;
  */
 int fd_next = -1;
 
-static int open_drm_render_device(int minor)
+int open_drm_render_device(int minor)
 {
 	char path[128];
 	int fd, ret_fd;
diff --git a/plugins/amdgpu/amdgpu_plugin_topology.h b/plugins/amdgpu/amdgpu_plugin_topology.h
index c890e3dda..e19f8e7ce 100644
--- a/plugins/amdgpu/amdgpu_plugin_topology.h
+++ b/plugins/amdgpu/amdgpu_plugin_topology.h
@@ -118,6 +118,7 @@ struct tp_node *sys_get_node_by_gpu_id(const struct tp_system *sys, const uint32
 struct tp_node *sys_get_node_by_render_minor(const struct tp_system *sys, const int drm_render_minor);
 struct tp_node *sys_get_node_by_index(const struct tp_system *sys, uint32_t index);
 
+int open_drm_render_device(int minor);
 int node_get_drm_render_device(struct tp_node *node);
 void sys_close_drm_render_devices(struct tp_system *sys);
 

From 920437205c4f5359e4c54765c9e23d2d57c2f4ec Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Tue, 10 Dec 2024 12:44:35 +0000
Subject: [PATCH 1808/1854] plugins/amdgpu: Update `README.md` and
 `criu-amdgpu-plugin.txt`

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
---
 Documentation/criu-amdgpu-plugin.txt |  1 +
 plugins/amdgpu/README.md             | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Documentation/criu-amdgpu-plugin.txt b/Documentation/criu-amdgpu-plugin.txt
index 68803f3db..fe76fc3bc 100644
--- a/Documentation/criu-amdgpu-plugin.txt
+++ b/Documentation/criu-amdgpu-plugin.txt
@@ -15,6 +15,7 @@ Checkpoint / Restore inside a docker container
 Pytorch
 Tensorflow
 Using CRIU Image Streamer
+Parallel Restore
 
 DESCRIPTION
 -----------
diff --git a/plugins/amdgpu/README.md b/plugins/amdgpu/README.md
index 1078eafe6..b808fbc4f 100644
--- a/plugins/amdgpu/README.md
+++ b/plugins/amdgpu/README.md
@@ -3,7 +3,8 @@ Supporting ROCm with CRIU
 
 _Felix Kuehling <Felix.Kuehling@amd.com>_<br>
 _Rajneesh Bardwaj <Rajneesh.Bhardwaj@amd.com>_<br>
-_David Yat Sin <David.YatSin@amd.com>_
+_David Yat Sin <David.YatSin@amd.com>_<br>
+_Yanning Yang <yangyanning@sjtu.edu.cn>_
 
 # Introduction
 
@@ -224,6 +225,26 @@ to resume execution on the GPUs.
 *This new plugin is enabled by the new hook `__RESUME_DEVICES_LATE` in our RFC
 patch series.*
 
+## Restoring BO content in parallel
+
+Restoring the BO content is an important part in the restore of GPU state and
+usually takes a significant amount of time. A possible location for this
+procedure is the `cr_plugin_restore_file` hook. However, restoring in this hook
+blocks the target process from performing other restore operations, which
+hinders further optimization of the restore process.
+
+Therefore, a new plugin hook that runs in the master restore process is
+introduced, and it interacts with the `cr_plugin_restore_file` hook to complete
+the restore of BO content. Specifically, the target process only needs to send
+the relevant BOs to the master restore process, while this new hook handles all
+the restore of buffer objects. Through this method, during the restore of the BO
+content, the target process can perform other restore operations, thus
+accelerating the restore procedure. This is an implementation of the gCROP
+method proposed in the ACM SoCC'24 paper: [On-demand and Parallel
+Checkpoint/Restore for GPU Applications](https://dl.acm.org/doi/10.1145/3698038.3698510).
+
+*This optimization technique is enabled by the `__POST_FORKING` hook.*
+
 ## Other CRIU changes
 
 In addition to the new plugins, we need to make some changes to CRIU itself to

From 7a4ee0ae8effdbf475804b72995912b0911ad28a Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Wed, 12 Feb 2025 09:26:21 -0500
Subject: [PATCH 1809/1854] restorer: Skip non-regular VMAs

amdgpu represents allocated device memory as a memory mapping
of the device file. This is a non-standard VMA that must
be handled by the plugin, not the normal VMA code.

Ignore all VMAs on device files.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 criu/pie/restorer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 5c40b0e93..008e1398d 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1989,6 +1989,9 @@ __visible long __export_restore_task(struct task_restore_args *args)
 
 		for (m = 0; m < sizeof(vma_entry->madv) * 8; m++) {
 			if (vma_entry->madv & (1ul << m)) {
+				if (!(vma_entry_is(vma_entry, VMA_AREA_REGULAR)))
+					continue;
+
 				ret = sys_madvise(vma_entry->start, vma_entry_len(vma_entry), m);
 				if (ret) {
 					pr_err("madvise(%" PRIx64 ", %" PRIu64 ", %ld) "

From fb02dbf68582c6589724d7aa3bb06ce3d588cc71 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Wed, 12 Feb 2025 09:45:37 -0500
Subject: [PATCH 1810/1854] files-ext: Allow plugin files to retry

amdgpu dmabuf CRIU requires the ability of the amdgpu plugin
to retry.

Change files_ext.c to read a response of 1 from a plugin restore
function to mean retry.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 criu/files-ext.c               | 10 +++++++---
 criu/include/criu-plugin.h     |  2 +-
 plugins/amdgpu/amdgpu_plugin.c |  4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/criu/files-ext.c b/criu/files-ext.c
index 95ec8e37c..4cc99d921 100644
--- a/criu/files-ext.c
+++ b/criu/files-ext.c
@@ -45,10 +45,11 @@ static int open_fd(struct file_desc *d, int *new_fd)
 {
 	struct ext_file_info *xfi;
 	int fd;
+	bool retry_needed;
 
 	xfi = container_of(d, struct ext_file_info, d);
 
-	fd = run_plugins(RESTORE_EXT_FILE, xfi->xfe->id);
+	fd = run_plugins(RESTORE_EXT_FILE, xfi->xfe->id, &retry_needed);
 	if (fd < 0) {
 		pr_err("Unable to restore %#x\n", xfi->xfe->id);
 		return -1;
@@ -57,8 +58,11 @@ static int open_fd(struct file_desc *d, int *new_fd)
 	if (restore_fown(fd, xfi->xfe->fown))
 		return -1;
 
-	*new_fd = fd;
-	return 0;
+	if (!retry_needed)
+		*new_fd = fd;
+	else
+		*new_fd = -1;
+	return retry_needed;
 }
 
 static struct file_desc_ops ext_desc_ops = {
diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index 9fb21a449..ee84ccdf6 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -70,7 +70,7 @@ enum {
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_UNIX_SK, int fd, int id);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_UNIX_SK, int id);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_FILE, int fd, int id);
-DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_EXT_FILE, int id);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_EXT_FILE, int id, bool *retry_needed);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_MOUNT, char *mountpoint, int id);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_EXT_MOUNT, int id, char *mountpoint, char *old_root, int *is_file);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_EXT_LINK, int index, int type, char *kind);
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 69194fbc7..e3b4ead3f 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1614,7 +1614,7 @@ exit:
 	return ret;
 }
 
-int amdgpu_plugin_restore_file(int id)
+int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 {
 	int ret = 0, fd;
 	char img_path[PATH_MAX];
@@ -1625,6 +1625,8 @@ int amdgpu_plugin_restore_file(int id)
 	size_t img_size;
 	FILE *img_fp = NULL;
 
+	*retry_needed = false;
+
 	if (plugin_disabled)
 		return -ENOTSUP;
 

From 0b7ca29c1944a8021c22a8e7041f047facb52e48 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Wed, 19 Feb 2025 14:30:07 -0500
Subject: [PATCH 1811/1854] plugin/amdgpu: Add amdgpu drm header

For amdgpu plugin to call the new amdgpu drm CRIU ioctls, it needs
the amdgpu drm header file, copied from the kernel's includes.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 plugins/amdgpu/amdgpu_drm.h | 1688 +++++++++++++++++++++++++++++++++++
 1 file changed, 1688 insertions(+)
 create mode 100644 plugins/amdgpu/amdgpu_drm.h

diff --git a/plugins/amdgpu/amdgpu_drm.h b/plugins/amdgpu/amdgpu_drm.h
new file mode 100644
index 000000000..9cebd072a
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_drm.h
@@ -0,0 +1,1688 @@
+/* amdgpu_drm.h -- Public header for the amdgpu driver -*- linux-c -*-
+ *
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
+ * Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2014 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kevin E. Martin <martin@valinux.com>
+ *    Gareth Hughes <gareth@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
+ */
+
+#ifndef __AMDGPU_DRM_H__
+#define __AMDGPU_DRM_H__
+
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#define DRM_AMDGPU_GEM_CREATE		0x00
+#define DRM_AMDGPU_GEM_MMAP		0x01
+#define DRM_AMDGPU_CTX			0x02
+#define DRM_AMDGPU_BO_LIST		0x03
+#define DRM_AMDGPU_CS			0x04
+#define DRM_AMDGPU_INFO			0x05
+#define DRM_AMDGPU_GEM_METADATA		0x06
+#define DRM_AMDGPU_GEM_WAIT_IDLE	0x07
+#define DRM_AMDGPU_GEM_VA		0x08
+#define DRM_AMDGPU_WAIT_CS		0x09
+#define DRM_AMDGPU_GEM_OP		0x10
+#define DRM_AMDGPU_GEM_USERPTR		0x11
+#define DRM_AMDGPU_WAIT_FENCES		0x12
+#define DRM_AMDGPU_VM			0x13
+#define DRM_AMDGPU_FENCE_TO_HANDLE	0x14
+#define DRM_AMDGPU_SCHED		0x15
+#define DRM_AMDGPU_USERQ		0x16
+#define DRM_AMDGPU_USERQ_SIGNAL		0x17
+#define DRM_AMDGPU_USERQ_WAIT		0x18
+#define DRM_AMDGPU_GEM_LIST_HANDLES	0x19
+
+#define DRM_IOCTL_AMDGPU_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)
+#define DRM_IOCTL_AMDGPU_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
+#define DRM_IOCTL_AMDGPU_CTX		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_CTX, union drm_amdgpu_ctx)
+#define DRM_IOCTL_AMDGPU_BO_LIST	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_BO_LIST, union drm_amdgpu_bo_list)
+#define DRM_IOCTL_AMDGPU_CS		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_CS, union drm_amdgpu_cs)
+#define DRM_IOCTL_AMDGPU_INFO		DRM_IOW(DRM_COMMAND_BASE + DRM_AMDGPU_INFO, struct drm_amdgpu_info)
+#define DRM_IOCTL_AMDGPU_GEM_METADATA	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_METADATA, struct drm_amdgpu_gem_metadata)
+#define DRM_IOCTL_AMDGPU_GEM_WAIT_IDLE	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_WAIT_IDLE, union drm_amdgpu_gem_wait_idle)
+#define DRM_IOCTL_AMDGPU_GEM_VA		DRM_IOW(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_VA, struct drm_amdgpu_gem_va)
+#define DRM_IOCTL_AMDGPU_WAIT_CS	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_WAIT_CS, union drm_amdgpu_wait_cs)
+#define DRM_IOCTL_AMDGPU_GEM_OP		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_OP, struct drm_amdgpu_gem_op)
+#define DRM_IOCTL_AMDGPU_GEM_USERPTR	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_USERPTR, struct drm_amdgpu_gem_userptr)
+#define DRM_IOCTL_AMDGPU_WAIT_FENCES	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_WAIT_FENCES, union drm_amdgpu_wait_fences)
+#define DRM_IOCTL_AMDGPU_VM		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_VM, union drm_amdgpu_vm)
+#define DRM_IOCTL_AMDGPU_FENCE_TO_HANDLE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_FENCE_TO_HANDLE, union drm_amdgpu_fence_to_handle)
+#define DRM_IOCTL_AMDGPU_SCHED		DRM_IOW(DRM_COMMAND_BASE + DRM_AMDGPU_SCHED, union drm_amdgpu_sched)
+#define DRM_IOCTL_AMDGPU_USERQ		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ, union drm_amdgpu_userq)
+#define DRM_IOCTL_AMDGPU_USERQ_SIGNAL	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_SIGNAL, struct drm_amdgpu_userq_signal)
+#define DRM_IOCTL_AMDGPU_USERQ_WAIT	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_WAIT, struct drm_amdgpu_userq_wait)
+#define DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_LIST_HANDLES, struct drm_amdgpu_gem_list_handles)
+
+/**
+ * DOC: memory domains
+ *
+ * %AMDGPU_GEM_DOMAIN_CPU	System memory that is not GPU accessible.
+ * Memory in this pool could be swapped out to disk if there is pressure.
+ *
+ * %AMDGPU_GEM_DOMAIN_GTT	GPU accessible system memory, mapped into the
+ * GPU's virtual address space via gart. Gart memory linearizes non-contiguous
+ * pages of system memory, allows GPU access system memory in a linearized
+ * fashion.
+ *
+ * %AMDGPU_GEM_DOMAIN_VRAM	Local video memory. For APUs, it is memory
+ * carved out by the BIOS.
+ *
+ * %AMDGPU_GEM_DOMAIN_GDS	Global on-chip data storage used to share data
+ * across shader threads.
+ *
+ * %AMDGPU_GEM_DOMAIN_GWS	Global wave sync, used to synchronize the
+ * execution of all the waves on a device.
+ *
+ * %AMDGPU_GEM_DOMAIN_OA	Ordered append, used by 3D or Compute engines
+ * for appending data.
+ *
+ * %AMDGPU_GEM_DOMAIN_DOORBELL	Doorbell. It is an MMIO region for
+ * signalling user mode queues.
+ */
+#define AMDGPU_GEM_DOMAIN_CPU		0x1
+#define AMDGPU_GEM_DOMAIN_GTT		0x2
+#define AMDGPU_GEM_DOMAIN_VRAM		0x4
+#define AMDGPU_GEM_DOMAIN_GDS		0x8
+#define AMDGPU_GEM_DOMAIN_GWS		0x10
+#define AMDGPU_GEM_DOMAIN_OA		0x20
+#define AMDGPU_GEM_DOMAIN_DOORBELL	0x40
+#define AMDGPU_GEM_DOMAIN_MASK		(AMDGPU_GEM_DOMAIN_CPU | \
+					 AMDGPU_GEM_DOMAIN_GTT | \
+					 AMDGPU_GEM_DOMAIN_VRAM | \
+					 AMDGPU_GEM_DOMAIN_GDS | \
+					 AMDGPU_GEM_DOMAIN_GWS | \
+					 AMDGPU_GEM_DOMAIN_OA | \
+					 AMDGPU_GEM_DOMAIN_DOORBELL)
+
+/* Flag that CPU access will be required for the case of VRAM domain */
+#define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED	(1 << 0)
+/* Flag that CPU access will not work, this VRAM domain is invisible */
+#define AMDGPU_GEM_CREATE_NO_CPU_ACCESS		(1 << 1)
+/* Flag that USWC attributes should be used for GTT */
+#define AMDGPU_GEM_CREATE_CPU_GTT_USWC		(1 << 2)
+/* Flag that the memory should be in VRAM and cleared */
+#define AMDGPU_GEM_CREATE_VRAM_CLEARED		(1 << 3)
+/* Flag that allocating the BO should use linear VRAM */
+#define AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS	(1 << 5)
+/* Flag that BO is always valid in this VM */
+#define AMDGPU_GEM_CREATE_VM_ALWAYS_VALID	(1 << 6)
+/* Flag that BO sharing will be explicitly synchronized */
+#define AMDGPU_GEM_CREATE_EXPLICIT_SYNC		(1 << 7)
+/* Flag that indicates allocating MQD gart on GFX9, where the mtype
+ * for the second page onward should be set to NC. It should never
+ * be used by user space applications.
+ */
+#define AMDGPU_GEM_CREATE_CP_MQD_GFX9		(1 << 8)
+/* Flag that BO may contain sensitive data that must be wiped before
+ * releasing the memory
+ */
+#define AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE	(1 << 9)
+/* Flag that BO will be encrypted and that the TMZ bit should be
+ * set in the PTEs when mapping this buffer via GPUVM or
+ * accessing it with various hw blocks
+ */
+#define AMDGPU_GEM_CREATE_ENCRYPTED		(1 << 10)
+/* Flag that BO will be used only in preemptible context, which does
+ * not require GTT memory accounting
+ */
+#define AMDGPU_GEM_CREATE_PREEMPTIBLE		(1 << 11)
+/* Flag that BO can be discarded under memory pressure without keeping the
+ * content.
+ */
+#define AMDGPU_GEM_CREATE_DISCARDABLE		(1 << 12)
+/* Flag that BO is shared coherently between multiple devices or CPU threads.
+ * May depend on GPU instructions to flush caches to system scope explicitly.
+ *
+ * This influences the choice of MTYPE in the PTEs on GFXv9 and later GPUs and
+ * may override the MTYPE selected in AMDGPU_VA_OP_MAP.
+ */
+#define AMDGPU_GEM_CREATE_COHERENT		(1 << 13)
+/* Flag that BO should not be cached by GPU. Coherent without having to flush
+ * GPU caches explicitly
+ *
+ * This influences the choice of MTYPE in the PTEs on GFXv9 and later GPUs and
+ * may override the MTYPE selected in AMDGPU_VA_OP_MAP.
+ */
+#define AMDGPU_GEM_CREATE_UNCACHED		(1 << 14)
+/* Flag that BO should be coherent across devices when using device-level
+ * atomics. May depend on GPU instructions to flush caches to device scope
+ * explicitly, promoting them to system scope automatically.
+ *
+ * This influences the choice of MTYPE in the PTEs on GFXv9 and later GPUs and
+ * may override the MTYPE selected in AMDGPU_VA_OP_MAP.
+ */
+#define AMDGPU_GEM_CREATE_EXT_COHERENT		(1 << 15)
+/* Set PTE.D and recompress during GTT->VRAM moves according to TILING flags. */
+#define AMDGPU_GEM_CREATE_GFX12_DCC		(1 << 16)
+
+struct drm_amdgpu_gem_create_in  {
+	/** the requested memory size */
+	__u64 bo_size;
+	/** physical start_addr alignment in bytes for some HW requirements */
+	__u64 alignment;
+	/** the requested memory domains */
+	__u64 domains;
+	/** allocation flags */
+	__u64 domain_flags;
+};
+
+struct drm_amdgpu_gem_create_out  {
+	/** returned GEM object handle */
+	__u32 handle;
+	__u32 _pad;
+};
+
+union drm_amdgpu_gem_create {
+	struct drm_amdgpu_gem_create_in		in;
+	struct drm_amdgpu_gem_create_out	out;
+};
+
+/** Opcode to create new residency list.  */
+#define AMDGPU_BO_LIST_OP_CREATE	0
+/** Opcode to destroy previously created residency list */
+#define AMDGPU_BO_LIST_OP_DESTROY	1
+/** Opcode to update resource information in the list */
+#define AMDGPU_BO_LIST_OP_UPDATE	2
+
+struct drm_amdgpu_bo_list_in {
+	/** Type of operation */
+	__u32 operation;
+	/** Handle of list or 0 if we want to create one */
+	__u32 list_handle;
+	/** Number of BOs in list  */
+	__u32 bo_number;
+	/** Size of each element describing BO */
+	__u32 bo_info_size;
+	/** Pointer to array describing BOs */
+	__u64 bo_info_ptr;
+};
+
+struct drm_amdgpu_bo_list_entry {
+	/** Handle of BO */
+	__u32 bo_handle;
+	/** New (if specified) BO priority to be used during migration */
+	__u32 bo_priority;
+};
+
+struct drm_amdgpu_bo_list_out {
+	/** Handle of resource list  */
+	__u32 list_handle;
+	__u32 _pad;
+};
+
+union drm_amdgpu_bo_list {
+	struct drm_amdgpu_bo_list_in in;
+	struct drm_amdgpu_bo_list_out out;
+};
+
+/* context related */
+#define AMDGPU_CTX_OP_ALLOC_CTX	1
+#define AMDGPU_CTX_OP_FREE_CTX	2
+#define AMDGPU_CTX_OP_QUERY_STATE	3
+#define AMDGPU_CTX_OP_QUERY_STATE2	4
+#define AMDGPU_CTX_OP_GET_STABLE_PSTATE	5
+#define AMDGPU_CTX_OP_SET_STABLE_PSTATE	6
+
+/* GPU reset status */
+#define AMDGPU_CTX_NO_RESET		0
+/* this the context caused it */
+#define AMDGPU_CTX_GUILTY_RESET		1
+/* some other context caused it */
+#define AMDGPU_CTX_INNOCENT_RESET	2
+/* unknown cause */
+#define AMDGPU_CTX_UNKNOWN_RESET	3
+
+/* indicate gpu reset occurred after ctx created */
+#define AMDGPU_CTX_QUERY2_FLAGS_RESET    (1<<0)
+/* indicate vram lost occurred after ctx created */
+#define AMDGPU_CTX_QUERY2_FLAGS_VRAMLOST (1<<1)
+/* indicate some job from this context once cause gpu hang */
+#define AMDGPU_CTX_QUERY2_FLAGS_GUILTY   (1<<2)
+/* indicate some errors are detected by RAS */
+#define AMDGPU_CTX_QUERY2_FLAGS_RAS_CE   (1<<3)
+#define AMDGPU_CTX_QUERY2_FLAGS_RAS_UE   (1<<4)
+/* indicate that the reset hasn't completed yet */
+#define AMDGPU_CTX_QUERY2_FLAGS_RESET_IN_PROGRESS (1<<5)
+
+/* Context priority level */
+#define AMDGPU_CTX_PRIORITY_UNSET       -2048
+#define AMDGPU_CTX_PRIORITY_VERY_LOW    -1023
+#define AMDGPU_CTX_PRIORITY_LOW         -512
+#define AMDGPU_CTX_PRIORITY_NORMAL      0
+/*
+ * When used in struct drm_amdgpu_ctx_in, a priority above NORMAL requires
+ * CAP_SYS_NICE or DRM_MASTER
+*/
+#define AMDGPU_CTX_PRIORITY_HIGH        512
+#define AMDGPU_CTX_PRIORITY_VERY_HIGH   1023
+
+/* select a stable profiling pstate for perfmon tools */
+#define AMDGPU_CTX_STABLE_PSTATE_FLAGS_MASK  0xf
+#define AMDGPU_CTX_STABLE_PSTATE_NONE  0
+#define AMDGPU_CTX_STABLE_PSTATE_STANDARD  1
+#define AMDGPU_CTX_STABLE_PSTATE_MIN_SCLK  2
+#define AMDGPU_CTX_STABLE_PSTATE_MIN_MCLK  3
+#define AMDGPU_CTX_STABLE_PSTATE_PEAK  4
+
+struct drm_amdgpu_ctx_in {
+	/** AMDGPU_CTX_OP_* */
+	__u32	op;
+	/** Flags */
+	__u32	flags;
+	__u32	ctx_id;
+	/** AMDGPU_CTX_PRIORITY_* */
+	__s32	priority;
+};
+
+union drm_amdgpu_ctx_out {
+		struct {
+			__u32	ctx_id;
+			__u32	_pad;
+		} alloc;
+
+		struct {
+			/** For future use, no flags defined so far */
+			__u64	flags;
+			/** Number of resets caused by this context so far. */
+			__u32	hangs;
+			/** Reset status since the last call of the ioctl. */
+			__u32	reset_status;
+		} state;
+
+		struct {
+			__u32	flags;
+			__u32	_pad;
+		} pstate;
+};
+
+union drm_amdgpu_ctx {
+	struct drm_amdgpu_ctx_in in;
+	union drm_amdgpu_ctx_out out;
+};
+
+/* user queue IOCTL operations */
+#define AMDGPU_USERQ_OP_CREATE	1
+#define AMDGPU_USERQ_OP_FREE	2
+
+/* queue priority levels */
+/* low < normal low < normal high < high */
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_MASK  0x3
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_SHIFT 0
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_NORMAL_LOW 0
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_LOW 1
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_NORMAL_HIGH 2
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_PRIORITY_HIGH 3 /* admin only */
+/* for queues that need access to protected content */
+#define AMDGPU_USERQ_CREATE_FLAGS_QUEUE_SECURE  (1 << 2)
+
+/*
+ * This structure is a container to pass input configuration
+ * info for all supported userqueue related operations.
+ * For operation AMDGPU_USERQ_OP_CREATE: user is expected
+ *  to set all fields, excep the parameter 'queue_id'.
+ * For operation AMDGPU_USERQ_OP_FREE: the only input parameter expected
+ *  to be set is 'queue_id', eveything else is ignored.
+ */
+struct drm_amdgpu_userq_in {
+	/** AMDGPU_USERQ_OP_* */
+	__u32	op;
+	/** Queue id passed for operation USERQ_OP_FREE */
+	__u32	queue_id;
+	/** the target GPU engine to execute workload (AMDGPU_HW_IP_*) */
+	__u32   ip_type;
+	/**
+	 * @doorbell_handle: the handle of doorbell GEM object
+	 * associated with this userqueue client.
+	 */
+	__u32   doorbell_handle;
+	/**
+	 * @doorbell_offset: 32-bit offset of the doorbell in the doorbell bo.
+	 * Kernel will generate absolute doorbell offset using doorbell_handle
+	 * and doorbell_offset in the doorbell bo.
+	 */
+	__u32   doorbell_offset;
+	/**
+	 * @flags: flags used for queue parameters
+	 */
+	__u32 flags;
+	/**
+	 * @queue_va: Virtual address of the GPU memory which holds the queue
+	 * object. The queue holds the workload packets.
+	 */
+	__u64   queue_va;
+	/**
+	 * @queue_size: Size of the queue in bytes, this needs to be 256-byte
+	 * aligned.
+	 */
+	__u64   queue_size;
+	/**
+	 * @rptr_va : Virtual address of the GPU memory which holds the ring RPTR.
+	 * This object must be at least 8 byte in size and aligned to 8-byte offset.
+	 */
+	__u64   rptr_va;
+	/**
+	 * @wptr_va : Virtual address of the GPU memory which holds the ring WPTR.
+	 * This object must be at least 8 byte in size and aligned to 8-byte offset.
+	 *
+	 * Queue, RPTR and WPTR can come from the same object, as long as the size
+	 * and alignment related requirements are met.
+	 */
+	__u64   wptr_va;
+	/**
+	 * @mqd: MQD (memory queue descriptor) is a set of parameters which allow
+	 * the GPU to uniquely define and identify a usermode queue.
+	 *
+	 * MQD data can be of different size for different GPU IP/engine and
+	 * their respective versions/revisions, so this points to a __u64 *
+	 * which holds IP specific MQD of this usermode queue.
+	 */
+	__u64 mqd;
+	/**
+	 * @size: size of MQD data in bytes, it must match the MQD structure
+	 * size of the respective engine/revision defined in UAPI for ex, for
+	 * gfx11 workloads, size = sizeof(drm_amdgpu_userq_mqd_gfx11).
+	 */
+	__u64 mqd_size;
+};
+
+/* The structure to carry output of userqueue ops */
+struct drm_amdgpu_userq_out {
+	/**
+	 * For operation AMDGPU_USERQ_OP_CREATE: This field contains a unique
+	 * queue ID to represent the newly created userqueue in the system, otherwise
+	 * it should be ignored.
+	 */
+	__u32	queue_id;
+	__u32 _pad;
+};
+
+union drm_amdgpu_userq {
+	struct drm_amdgpu_userq_in in;
+	struct drm_amdgpu_userq_out out;
+};
+
+/* GFX V11 IP specific MQD parameters */
+struct drm_amdgpu_userq_mqd_gfx11 {
+	/**
+	 * @shadow_va: Virtual address of the GPU memory to hold the shadow buffer.
+	 * Use AMDGPU_INFO_IOCTL to find the exact size of the object.
+	 */
+	__u64   shadow_va;
+	/**
+	 * @csa_va: Virtual address of the GPU memory to hold the CSA buffer.
+	 * Use AMDGPU_INFO_IOCTL to find the exact size of the object.
+	 */
+	__u64   csa_va;
+};
+
+/* GFX V11 SDMA IP specific MQD parameters */
+struct drm_amdgpu_userq_mqd_sdma_gfx11 {
+	/**
+	 * @csa_va: Virtual address of the GPU memory to hold the CSA buffer.
+	 * This must be a from a separate GPU object, and use AMDGPU_INFO IOCTL
+	 * to get the size.
+	 */
+	__u64   csa_va;
+};
+
+/* GFX V11 Compute IP specific MQD parameters */
+struct drm_amdgpu_userq_mqd_compute_gfx11 {
+	/**
+	 * @eop_va: Virtual address of the GPU memory to hold the EOP buffer.
+	 * This must be a from a separate GPU object, and use AMDGPU_INFO IOCTL
+	 * to get the size.
+	 */
+	__u64   eop_va;
+};
+
+/* userq signal/wait ioctl */
+struct drm_amdgpu_userq_signal {
+	/**
+	 * @queue_id: Queue handle used by the userq fence creation function
+	 * to retrieve the WPTR.
+	 */
+	__u32	queue_id;
+	__u32	pad;
+	/**
+	 * @syncobj_handles: The list of syncobj handles submitted by the user queue
+	 * job to be signaled.
+	 */
+	__u64	syncobj_handles;
+	/**
+	 * @num_syncobj_handles: A count that represents the number of syncobj handles in
+	 * @syncobj_handles.
+	 */
+	__u64	num_syncobj_handles;
+	/**
+	 * @bo_read_handles: The list of BO handles that the submitted user queue job
+	 * is using for read only. This will update BO fences in the kernel.
+	 */
+	__u64	bo_read_handles;
+	/**
+	 * @bo_write_handles: The list of BO handles that the submitted user queue job
+	 * is using for write only. This will update BO fences in the kernel.
+	 */
+	__u64	bo_write_handles;
+	/**
+	 * @num_bo_read_handles: A count that represents the number of read BO handles in
+	 * @bo_read_handles.
+	 */
+	__u32	num_bo_read_handles;
+	/**
+	 * @num_bo_write_handles: A count that represents the number of write BO handles in
+	 * @bo_write_handles.
+	 */
+	__u32	num_bo_write_handles;
+};
+
+struct drm_amdgpu_userq_fence_info {
+	/**
+	 * @va: A gpu address allocated for each queue which stores the
+	 * read pointer (RPTR) value.
+	 */
+	__u64	va;
+	/**
+	 * @value: A 64 bit value represents the write pointer (WPTR) of the
+	 * queue commands which compared with the RPTR value to signal the
+	 * fences.
+	 */
+	__u64	value;
+};
+
+struct drm_amdgpu_userq_wait {
+	/**
+	 * @waitq_id: Queue handle used by the userq wait IOCTL to retrieve the
+	 * wait queue and maintain the fence driver references in it.
+	 */
+	__u32	waitq_id;
+	__u32	pad;
+	/**
+	 * @syncobj_handles: The list of syncobj handles submitted by the user queue
+	 * job to get the va/value pairs.
+	 */
+	__u64	syncobj_handles;
+	/**
+	 * @syncobj_timeline_handles: The list of timeline syncobj handles submitted by
+	 * the user queue job to get the va/value pairs at given @syncobj_timeline_points.
+	 */
+	__u64	syncobj_timeline_handles;
+	/**
+	 * @syncobj_timeline_points: The list of timeline syncobj points submitted by the
+	 * user queue job for the corresponding @syncobj_timeline_handles.
+	 */
+	__u64	syncobj_timeline_points;
+	/**
+	 * @bo_read_handles: The list of read BO handles submitted by the user queue
+	 * job to get the va/value pairs.
+	 */
+	__u64	bo_read_handles;
+	/**
+	 * @bo_write_handles: The list of write BO handles submitted by the user queue
+	 * job to get the va/value pairs.
+	 */
+	__u64	bo_write_handles;
+	/**
+	 * @num_syncobj_timeline_handles: A count that represents the number of timeline
+	 * syncobj handles in @syncobj_timeline_handles.
+	 */
+	__u16	num_syncobj_timeline_handles;
+	/**
+	 * @num_fences: This field can be used both as input and output. As input it defines
+	 * the maximum number of fences that can be returned and as output it will specify
+	 * how many fences were actually returned from the ioctl.
+	 */
+	__u16	num_fences;
+	/**
+	 * @num_syncobj_handles: A count that represents the number of syncobj handles in
+	 * @syncobj_handles.
+	 */
+	__u32	num_syncobj_handles;
+	/**
+	 * @num_bo_read_handles: A count that represents the number of read BO handles in
+	 * @bo_read_handles.
+	 */
+	__u32	num_bo_read_handles;
+	/**
+	 * @num_bo_write_handles: A count that represents the number of write BO handles in
+	 * @bo_write_handles.
+	 */
+	__u32	num_bo_write_handles;
+	/**
+	 * @out_fences: The field is a return value from the ioctl containing the list of
+	 * address/value pairs to wait for.
+	 */
+	__u64	out_fences;
+};
+
+/* vm ioctl */
+#define AMDGPU_VM_OP_RESERVE_VMID	1
+#define AMDGPU_VM_OP_UNRESERVE_VMID	2
+
+struct drm_amdgpu_vm_in {
+	/** AMDGPU_VM_OP_* */
+	__u32	op;
+	__u32	flags;
+};
+
+struct drm_amdgpu_vm_out {
+	/** For future use, no flags defined so far */
+	__u64	flags;
+};
+
+union drm_amdgpu_vm {
+	struct drm_amdgpu_vm_in in;
+	struct drm_amdgpu_vm_out out;
+};
+
+/* sched ioctl */
+#define AMDGPU_SCHED_OP_PROCESS_PRIORITY_OVERRIDE	1
+#define AMDGPU_SCHED_OP_CONTEXT_PRIORITY_OVERRIDE	2
+
+struct drm_amdgpu_sched_in {
+	/* AMDGPU_SCHED_OP_* */
+	__u32	op;
+	__u32	fd;
+	/** AMDGPU_CTX_PRIORITY_* */
+	__s32	priority;
+	__u32   ctx_id;
+};
+
+union drm_amdgpu_sched {
+	struct drm_amdgpu_sched_in in;
+};
+
+/*
+ * This is not a reliable API and you should expect it to fail for any
+ * number of reasons and have fallback path that do not use userptr to
+ * perform any operation.
+ */
+#define AMDGPU_GEM_USERPTR_READONLY	(1 << 0)
+#define AMDGPU_GEM_USERPTR_ANONONLY	(1 << 1)
+#define AMDGPU_GEM_USERPTR_VALIDATE	(1 << 2)
+#define AMDGPU_GEM_USERPTR_REGISTER	(1 << 3)
+
+struct drm_amdgpu_gem_userptr {
+	__u64		addr;
+	__u64		size;
+	/* AMDGPU_GEM_USERPTR_* */
+	__u32		flags;
+	/* Resulting GEM handle */
+	__u32		handle;
+};
+
+/* SI-CI-VI: */
+/* same meaning as the GB_TILE_MODE and GL_MACRO_TILE_MODE fields */
+#define AMDGPU_TILING_ARRAY_MODE_SHIFT			0
+#define AMDGPU_TILING_ARRAY_MODE_MASK			0xf
+#define AMDGPU_TILING_PIPE_CONFIG_SHIFT			4
+#define AMDGPU_TILING_PIPE_CONFIG_MASK			0x1f
+#define AMDGPU_TILING_TILE_SPLIT_SHIFT			9
+#define AMDGPU_TILING_TILE_SPLIT_MASK			0x7
+#define AMDGPU_TILING_MICRO_TILE_MODE_SHIFT		12
+#define AMDGPU_TILING_MICRO_TILE_MODE_MASK		0x7
+#define AMDGPU_TILING_BANK_WIDTH_SHIFT			15
+#define AMDGPU_TILING_BANK_WIDTH_MASK			0x3
+#define AMDGPU_TILING_BANK_HEIGHT_SHIFT			17
+#define AMDGPU_TILING_BANK_HEIGHT_MASK			0x3
+#define AMDGPU_TILING_MACRO_TILE_ASPECT_SHIFT		19
+#define AMDGPU_TILING_MACRO_TILE_ASPECT_MASK		0x3
+#define AMDGPU_TILING_NUM_BANKS_SHIFT			21
+#define AMDGPU_TILING_NUM_BANKS_MASK			0x3
+
+/* GFX9 - GFX11: */
+#define AMDGPU_TILING_SWIZZLE_MODE_SHIFT		0
+#define AMDGPU_TILING_SWIZZLE_MODE_MASK			0x1f
+#define AMDGPU_TILING_DCC_OFFSET_256B_SHIFT		5
+#define AMDGPU_TILING_DCC_OFFSET_256B_MASK		0xFFFFFF
+#define AMDGPU_TILING_DCC_PITCH_MAX_SHIFT		29
+#define AMDGPU_TILING_DCC_PITCH_MAX_MASK		0x3FFF
+#define AMDGPU_TILING_DCC_INDEPENDENT_64B_SHIFT		43
+#define AMDGPU_TILING_DCC_INDEPENDENT_64B_MASK		0x1
+#define AMDGPU_TILING_DCC_INDEPENDENT_128B_SHIFT	44
+#define AMDGPU_TILING_DCC_INDEPENDENT_128B_MASK		0x1
+#define AMDGPU_TILING_SCANOUT_SHIFT			63
+#define AMDGPU_TILING_SCANOUT_MASK			0x1
+
+/* GFX12 and later: */
+#define AMDGPU_TILING_GFX12_SWIZZLE_MODE_SHIFT			0
+#define AMDGPU_TILING_GFX12_SWIZZLE_MODE_MASK			0x7
+/* These are DCC recompression settings for memory management: */
+#define AMDGPU_TILING_GFX12_DCC_MAX_COMPRESSED_BLOCK_SHIFT	3
+#define AMDGPU_TILING_GFX12_DCC_MAX_COMPRESSED_BLOCK_MASK	0x3 /* 0:64B, 1:128B, 2:256B */
+#define AMDGPU_TILING_GFX12_DCC_NUMBER_TYPE_SHIFT		5
+#define AMDGPU_TILING_GFX12_DCC_NUMBER_TYPE_MASK		0x7 /* CB_COLOR0_INFO.NUMBER_TYPE */
+#define AMDGPU_TILING_GFX12_DCC_DATA_FORMAT_SHIFT		8
+#define AMDGPU_TILING_GFX12_DCC_DATA_FORMAT_MASK		0x3f /* [0:4]:CB_COLOR0_INFO.FORMAT, [5]:MM */
+/* When clearing the buffer or moving it from VRAM to GTT, don't compress and set DCC metadata
+ * to uncompressed. Set when parts of an allocation bypass DCC and read raw data. */
+#define AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE_SHIFT	14
+#define AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE_MASK	0x1
+/* bit gap */
+#define AMDGPU_TILING_GFX12_SCANOUT_SHIFT			63
+#define AMDGPU_TILING_GFX12_SCANOUT_MASK			0x1
+
+/* Set/Get helpers for tiling flags. */
+#define AMDGPU_TILING_SET(field, value) \
+	(((__u64)(value) & AMDGPU_TILING_##field##_MASK) << AMDGPU_TILING_##field##_SHIFT)
+#define AMDGPU_TILING_GET(value, field) \
+	(((__u64)(value) >> AMDGPU_TILING_##field##_SHIFT) & AMDGPU_TILING_##field##_MASK)
+
+#define AMDGPU_GEM_METADATA_OP_SET_METADATA                  1
+#define AMDGPU_GEM_METADATA_OP_GET_METADATA                  2
+
+/** The same structure is shared for input/output */
+struct drm_amdgpu_gem_metadata {
+	/** GEM Object handle */
+	__u32	handle;
+	/** Do we want get or set metadata */
+	__u32	op;
+	struct {
+		/** For future use, no flags defined so far */
+		__u64	flags;
+		/** family specific tiling info */
+		__u64	tiling_info;
+		__u32	data_size_bytes;
+		__u32	data[64];
+	} data;
+};
+
+struct drm_amdgpu_gem_mmap_in {
+	/** the GEM object handle */
+	__u32 handle;
+	__u32 _pad;
+};
+
+struct drm_amdgpu_gem_mmap_out {
+	/** mmap offset from the vma offset manager */
+	__u64 addr_ptr;
+};
+
+union drm_amdgpu_gem_mmap {
+	struct drm_amdgpu_gem_mmap_in   in;
+	struct drm_amdgpu_gem_mmap_out out;
+};
+
+struct drm_amdgpu_gem_wait_idle_in {
+	/** GEM object handle */
+	__u32 handle;
+	/** For future use, no flags defined so far */
+	__u32 flags;
+	/** Absolute timeout to wait */
+	__u64 timeout;
+};
+
+struct drm_amdgpu_gem_wait_idle_out {
+	/** BO status:  0 - BO is idle, 1 - BO is busy */
+	__u32 status;
+	/** Returned current memory domain */
+	__u32 domain;
+};
+
+union drm_amdgpu_gem_wait_idle {
+	struct drm_amdgpu_gem_wait_idle_in  in;
+	struct drm_amdgpu_gem_wait_idle_out out;
+};
+
+struct drm_amdgpu_wait_cs_in {
+	/* Command submission handle
+         * handle equals 0 means none to wait for
+         * handle equals ~0ull means wait for the latest sequence number
+         */
+	__u64 handle;
+	/** Absolute timeout to wait */
+	__u64 timeout;
+	__u32 ip_type;
+	__u32 ip_instance;
+	__u32 ring;
+	__u32 ctx_id;
+};
+
+struct drm_amdgpu_wait_cs_out {
+	/** CS status:  0 - CS completed, 1 - CS still busy */
+	__u64 status;
+};
+
+union drm_amdgpu_wait_cs {
+	struct drm_amdgpu_wait_cs_in in;
+	struct drm_amdgpu_wait_cs_out out;
+};
+
+struct drm_amdgpu_fence {
+	__u32 ctx_id;
+	__u32 ip_type;
+	__u32 ip_instance;
+	__u32 ring;
+	__u64 seq_no;
+};
+
+struct drm_amdgpu_wait_fences_in {
+	/** This points to uint64_t * which points to fences */
+	__u64 fences;
+	__u32 fence_count;
+	__u32 wait_all;
+	__u64 timeout_ns;
+};
+
+struct drm_amdgpu_wait_fences_out {
+	__u32 status;
+	__u32 first_signaled;
+};
+
+union drm_amdgpu_wait_fences {
+	struct drm_amdgpu_wait_fences_in in;
+	struct drm_amdgpu_wait_fences_out out;
+};
+
+#define AMDGPU_GEM_OP_GET_GEM_CREATE_INFO	0
+#define AMDGPU_GEM_OP_SET_PLACEMENT		1
+#define AMDGPU_GEM_OP_GET_MAPPING_INFO		2
+
+struct drm_amdgpu_gem_vm_entry {
+	/* Start of mapping (in bytes) */
+	__u64 addr;
+
+	/* Size of mapping (in bytes) */
+	__u64 size;
+
+	/* Mapping offset */
+	__u64 offset;
+
+	/* flags needed to recreate mapping */
+	__u64 flags;
+};
+
+/* Sets or returns a value associated with a buffer. */
+struct drm_amdgpu_gem_op {
+	/** GEM object handle */
+	__u32	handle;
+	/** AMDGPU_GEM_OP_* */
+	__u32	op;
+	/** Input or return value. For MAPPING_INFO op: pointer to array of struct drm_amdgpu_gem_vm_entry */
+	__u64	value;
+	/** For MAPPING_INFO op: number of mappings (in/out) */
+	__u32	num_entries;
+
+	__u32	padding;
+};
+
+#define AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT	(1 << 0)
+
+struct drm_amdgpu_gem_list_handles {
+	/* User pointer to array of drm_amdgpu_gem_bo_info_entry */
+	__u64   entries;
+
+	/* Size of entries buffer / Number of handles in process (if larger than size of buffer, must retry) */
+	__u32   num_entries;
+
+	__u32 padding;
+};
+
+struct drm_amdgpu_gem_list_handles_entry {
+	/* gem handle of buffer object */
+	__u32 gem_handle;
+
+	/* Currently just one flag: IS_IMPORT */
+	__u32 flags;
+
+	/* Size of bo */
+	__u64 size;
+
+	/* Preferred domains for GEM_CREATE */
+	__u64 preferred_domains;
+
+	/* GEM_CREATE flags for re-creation of buffer */
+	__u64 alloc_flags;
+
+	/* physical start_addr alignment in bytes for some HW requirements */
+	__u64 alignment;
+};
+
+#define AMDGPU_VA_OP_MAP			1
+#define AMDGPU_VA_OP_UNMAP			2
+#define AMDGPU_VA_OP_CLEAR			3
+#define AMDGPU_VA_OP_REPLACE			4
+
+/* Delay the page table update till the next CS */
+#define AMDGPU_VM_DELAY_UPDATE		(1 << 0)
+
+/* Mapping flags */
+/* readable mapping */
+#define AMDGPU_VM_PAGE_READABLE		(1 << 1)
+/* writable mapping */
+#define AMDGPU_VM_PAGE_WRITEABLE	(1 << 2)
+/* executable mapping, new for VI */
+#define AMDGPU_VM_PAGE_EXECUTABLE	(1 << 3)
+/* partially resident texture */
+#define AMDGPU_VM_PAGE_PRT		(1 << 4)
+/* MTYPE flags use bit 5 to 8 */
+#define AMDGPU_VM_MTYPE_MASK		(0xf << 5)
+/* Default MTYPE. Pre-AI must use this.  Recommended for newer ASICs. */
+#define AMDGPU_VM_MTYPE_DEFAULT		(0 << 5)
+/* Use Non Coherent MTYPE instead of default MTYPE */
+#define AMDGPU_VM_MTYPE_NC		(1 << 5)
+/* Use Write Combine MTYPE instead of default MTYPE */
+#define AMDGPU_VM_MTYPE_WC		(2 << 5)
+/* Use Cache Coherent MTYPE instead of default MTYPE */
+#define AMDGPU_VM_MTYPE_CC		(3 << 5)
+/* Use UnCached MTYPE instead of default MTYPE */
+#define AMDGPU_VM_MTYPE_UC		(4 << 5)
+/* Use Read Write MTYPE instead of default MTYPE */
+#define AMDGPU_VM_MTYPE_RW		(5 << 5)
+/* don't allocate MALL */
+#define AMDGPU_VM_PAGE_NOALLOC		(1 << 9)
+
+struct drm_amdgpu_gem_va {
+	/** GEM object handle */
+	__u32 handle;
+	__u32 _pad;
+	/** AMDGPU_VA_OP_* */
+	__u32 operation;
+	/** AMDGPU_VM_PAGE_* */
+	__u32 flags;
+	/** va address to assign . Must be correctly aligned.*/
+	__u64 va_address;
+	/** Specify offset inside of BO to assign. Must be correctly aligned.*/
+	__u64 offset_in_bo;
+	/** Specify mapping size. Must be correctly aligned. */
+	__u64 map_size;
+	/**
+	 * vm_timeline_point is a sequence number used to add new timeline point.
+	 */
+	__u64 vm_timeline_point;
+	/**
+	 * The vm page table update fence is installed in given vm_timeline_syncobj_out
+	 * at vm_timeline_point.
+	 */
+	__u32 vm_timeline_syncobj_out;
+	/** the number of syncobj handles in @input_fence_syncobj_handles */
+	__u32 num_syncobj_handles;
+	/** Array of sync object handle to wait for given input fences */
+	__u64 input_fence_syncobj_handles;
+};
+
+#define AMDGPU_HW_IP_GFX          0
+#define AMDGPU_HW_IP_COMPUTE      1
+#define AMDGPU_HW_IP_DMA          2
+#define AMDGPU_HW_IP_UVD          3
+#define AMDGPU_HW_IP_VCE          4
+#define AMDGPU_HW_IP_UVD_ENC      5
+#define AMDGPU_HW_IP_VCN_DEC      6
+/*
+ * From VCN4, AMDGPU_HW_IP_VCN_ENC is re-used to support
+ * both encoding and decoding jobs.
+ */
+#define AMDGPU_HW_IP_VCN_ENC      7
+#define AMDGPU_HW_IP_VCN_JPEG     8
+#define AMDGPU_HW_IP_VPE          9
+#define AMDGPU_HW_IP_NUM          10
+
+#define AMDGPU_HW_IP_INSTANCE_MAX_COUNT 1
+
+#define AMDGPU_CHUNK_ID_IB		0x01
+#define AMDGPU_CHUNK_ID_FENCE		0x02
+#define AMDGPU_CHUNK_ID_DEPENDENCIES	0x03
+#define AMDGPU_CHUNK_ID_SYNCOBJ_IN      0x04
+#define AMDGPU_CHUNK_ID_SYNCOBJ_OUT     0x05
+#define AMDGPU_CHUNK_ID_BO_HANDLES      0x06
+#define AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES	0x07
+#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT    0x08
+#define AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL  0x09
+#define AMDGPU_CHUNK_ID_CP_GFX_SHADOW   0x0a
+
+struct drm_amdgpu_cs_chunk {
+	__u32		chunk_id;
+	__u32		length_dw;
+	__u64		chunk_data;
+};
+
+struct drm_amdgpu_cs_in {
+	/** Rendering context id */
+	__u32		ctx_id;
+	/**  Handle of resource list associated with CS */
+	__u32		bo_list_handle;
+	__u32		num_chunks;
+	__u32		flags;
+	/** this points to __u64 * which point to cs chunks */
+	__u64		chunks;
+};
+
+struct drm_amdgpu_cs_out {
+	__u64 handle;
+};
+
+union drm_amdgpu_cs {
+	struct drm_amdgpu_cs_in in;
+	struct drm_amdgpu_cs_out out;
+};
+
+/* Specify flags to be used for IB */
+
+/* This IB should be submitted to CE */
+#define AMDGPU_IB_FLAG_CE	(1<<0)
+
+/* Preamble flag, which means the IB could be dropped if no context switch */
+#define AMDGPU_IB_FLAG_PREAMBLE (1<<1)
+
+/* Preempt flag, IB should set Pre_enb bit if PREEMPT flag detected */
+#define AMDGPU_IB_FLAG_PREEMPT (1<<2)
+
+/* The IB fence should do the L2 writeback but not invalidate any shader
+ * caches (L2/vL1/sL1/I$). */
+#define AMDGPU_IB_FLAG_TC_WB_NOT_INVALIDATE (1 << 3)
+
+/* Set GDS_COMPUTE_MAX_WAVE_ID = DEFAULT before PACKET3_INDIRECT_BUFFER.
+ * This will reset wave ID counters for the IB.
+ */
+#define AMDGPU_IB_FLAG_RESET_GDS_MAX_WAVE_ID (1 << 4)
+
+/* Flag the IB as secure (TMZ)
+ */
+#define AMDGPU_IB_FLAGS_SECURE  (1 << 5)
+
+/* Tell KMD to flush and invalidate caches
+ */
+#define AMDGPU_IB_FLAG_EMIT_MEM_SYNC  (1 << 6)
+
+struct drm_amdgpu_cs_chunk_ib {
+	__u32 _pad;
+	/** AMDGPU_IB_FLAG_* */
+	__u32 flags;
+	/** Virtual address to begin IB execution */
+	__u64 va_start;
+	/** Size of submission */
+	__u32 ib_bytes;
+	/** HW IP to submit to */
+	__u32 ip_type;
+	/** HW IP index of the same type to submit to  */
+	__u32 ip_instance;
+	/** Ring index to submit to */
+	__u32 ring;
+};
+
+struct drm_amdgpu_cs_chunk_dep {
+	__u32 ip_type;
+	__u32 ip_instance;
+	__u32 ring;
+	__u32 ctx_id;
+	__u64 handle;
+};
+
+struct drm_amdgpu_cs_chunk_fence {
+	__u32 handle;
+	__u32 offset;
+};
+
+struct drm_amdgpu_cs_chunk_sem {
+	__u32 handle;
+};
+
+struct drm_amdgpu_cs_chunk_syncobj {
+       __u32 handle;
+       __u32 flags;
+       __u64 point;
+};
+
+#define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ	0
+#define AMDGPU_FENCE_TO_HANDLE_GET_SYNCOBJ_FD	1
+#define AMDGPU_FENCE_TO_HANDLE_GET_SYNC_FILE_FD	2
+
+union drm_amdgpu_fence_to_handle {
+	struct {
+		struct drm_amdgpu_fence fence;
+		__u32 what;
+		__u32 pad;
+	} in;
+	struct {
+		__u32 handle;
+	} out;
+};
+
+struct drm_amdgpu_cs_chunk_data {
+	union {
+		struct drm_amdgpu_cs_chunk_ib		ib_data;
+		struct drm_amdgpu_cs_chunk_fence	fence_data;
+	};
+};
+
+#define AMDGPU_CS_CHUNK_CP_GFX_SHADOW_FLAGS_INIT_SHADOW         0x1
+
+struct drm_amdgpu_cs_chunk_cp_gfx_shadow {
+	__u64 shadow_va;
+	__u64 csa_va;
+	__u64 gds_va;
+	__u64 flags;
+};
+
+/*
+ *  Query h/w info: Flag that this is integrated (a.h.a. fusion) GPU
+ *
+ */
+#define AMDGPU_IDS_FLAGS_FUSION         0x1
+#define AMDGPU_IDS_FLAGS_PREEMPTION     0x2
+#define AMDGPU_IDS_FLAGS_TMZ            0x4
+#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD 0x8
+
+/*
+ *  Query h/w info: Flag identifying VF/PF/PT mode
+ *
+ */
+#define AMDGPU_IDS_FLAGS_MODE_MASK      0x300
+#define AMDGPU_IDS_FLAGS_MODE_SHIFT     0x8
+#define AMDGPU_IDS_FLAGS_MODE_PF        0x0
+#define AMDGPU_IDS_FLAGS_MODE_VF        0x1
+#define AMDGPU_IDS_FLAGS_MODE_PT        0x2
+
+/* indicate if acceleration can be working */
+#define AMDGPU_INFO_ACCEL_WORKING		0x00
+/* get the crtc_id from the mode object id? */
+#define AMDGPU_INFO_CRTC_FROM_ID		0x01
+/* query hw IP info */
+#define AMDGPU_INFO_HW_IP_INFO			0x02
+/* query hw IP instance count for the specified type */
+#define AMDGPU_INFO_HW_IP_COUNT			0x03
+/* timestamp for GL_ARB_timer_query */
+#define AMDGPU_INFO_TIMESTAMP			0x05
+/* Query the firmware version */
+#define AMDGPU_INFO_FW_VERSION			0x0e
+	/* Subquery id: Query VCE firmware version */
+	#define AMDGPU_INFO_FW_VCE		0x1
+	/* Subquery id: Query UVD firmware version */
+	#define AMDGPU_INFO_FW_UVD		0x2
+	/* Subquery id: Query GMC firmware version */
+	#define AMDGPU_INFO_FW_GMC		0x03
+	/* Subquery id: Query GFX ME firmware version */
+	#define AMDGPU_INFO_FW_GFX_ME		0x04
+	/* Subquery id: Query GFX PFP firmware version */
+	#define AMDGPU_INFO_FW_GFX_PFP		0x05
+	/* Subquery id: Query GFX CE firmware version */
+	#define AMDGPU_INFO_FW_GFX_CE		0x06
+	/* Subquery id: Query GFX RLC firmware version */
+	#define AMDGPU_INFO_FW_GFX_RLC		0x07
+	/* Subquery id: Query GFX MEC firmware version */
+	#define AMDGPU_INFO_FW_GFX_MEC		0x08
+	/* Subquery id: Query SMC firmware version */
+	#define AMDGPU_INFO_FW_SMC		0x0a
+	/* Subquery id: Query SDMA firmware version */
+	#define AMDGPU_INFO_FW_SDMA		0x0b
+	/* Subquery id: Query PSP SOS firmware version */
+	#define AMDGPU_INFO_FW_SOS		0x0c
+	/* Subquery id: Query PSP ASD firmware version */
+	#define AMDGPU_INFO_FW_ASD		0x0d
+	/* Subquery id: Query VCN firmware version */
+	#define AMDGPU_INFO_FW_VCN		0x0e
+	/* Subquery id: Query GFX RLC SRLC firmware version */
+	#define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_CNTL 0x0f
+	/* Subquery id: Query GFX RLC SRLG firmware version */
+	#define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_GPM_MEM 0x10
+	/* Subquery id: Query GFX RLC SRLS firmware version */
+	#define AMDGPU_INFO_FW_GFX_RLC_RESTORE_LIST_SRM_MEM 0x11
+	/* Subquery id: Query DMCU firmware version */
+	#define AMDGPU_INFO_FW_DMCU		0x12
+	#define AMDGPU_INFO_FW_TA		0x13
+	/* Subquery id: Query DMCUB firmware version */
+	#define AMDGPU_INFO_FW_DMCUB		0x14
+	/* Subquery id: Query TOC firmware version */
+	#define AMDGPU_INFO_FW_TOC		0x15
+	/* Subquery id: Query CAP firmware version */
+	#define AMDGPU_INFO_FW_CAP		0x16
+	/* Subquery id: Query GFX RLCP firmware version */
+	#define AMDGPU_INFO_FW_GFX_RLCP		0x17
+	/* Subquery id: Query GFX RLCV firmware version */
+	#define AMDGPU_INFO_FW_GFX_RLCV		0x18
+	/* Subquery id: Query MES_KIQ firmware version */
+	#define AMDGPU_INFO_FW_MES_KIQ		0x19
+	/* Subquery id: Query MES firmware version */
+	#define AMDGPU_INFO_FW_MES		0x1a
+	/* Subquery id: Query IMU firmware version */
+	#define AMDGPU_INFO_FW_IMU		0x1b
+	/* Subquery id: Query VPE firmware version */
+	#define AMDGPU_INFO_FW_VPE		0x1c
+
+/* number of bytes moved for TTM migration */
+#define AMDGPU_INFO_NUM_BYTES_MOVED		0x0f
+/* the used VRAM size */
+#define AMDGPU_INFO_VRAM_USAGE			0x10
+/* the used GTT size */
+#define AMDGPU_INFO_GTT_USAGE			0x11
+/* Information about GDS, etc. resource configuration */
+#define AMDGPU_INFO_GDS_CONFIG			0x13
+/* Query information about VRAM and GTT domains */
+#define AMDGPU_INFO_VRAM_GTT			0x14
+/* Query information about register in MMR address space*/
+#define AMDGPU_INFO_READ_MMR_REG		0x15
+/* Query information about device: rev id, family, etc. */
+#define AMDGPU_INFO_DEV_INFO			0x16
+/* visible vram usage */
+#define AMDGPU_INFO_VIS_VRAM_USAGE		0x17
+/* number of TTM buffer evictions */
+#define AMDGPU_INFO_NUM_EVICTIONS		0x18
+/* Query memory about VRAM and GTT domains */
+#define AMDGPU_INFO_MEMORY			0x19
+/* Query vce clock table */
+#define AMDGPU_INFO_VCE_CLOCK_TABLE		0x1A
+/* Query vbios related information */
+#define AMDGPU_INFO_VBIOS			0x1B
+	/* Subquery id: Query vbios size */
+	#define AMDGPU_INFO_VBIOS_SIZE		0x1
+	/* Subquery id: Query vbios image */
+	#define AMDGPU_INFO_VBIOS_IMAGE		0x2
+	/* Subquery id: Query vbios info */
+	#define AMDGPU_INFO_VBIOS_INFO		0x3
+/* Query UVD handles */
+#define AMDGPU_INFO_NUM_HANDLES			0x1C
+/* Query sensor related information */
+#define AMDGPU_INFO_SENSOR			0x1D
+	/* Subquery id: Query GPU shader clock */
+	#define AMDGPU_INFO_SENSOR_GFX_SCLK		0x1
+	/* Subquery id: Query GPU memory clock */
+	#define AMDGPU_INFO_SENSOR_GFX_MCLK		0x2
+	/* Subquery id: Query GPU temperature */
+	#define AMDGPU_INFO_SENSOR_GPU_TEMP		0x3
+	/* Subquery id: Query GPU load */
+	#define AMDGPU_INFO_SENSOR_GPU_LOAD		0x4
+	/* Subquery id: Query average GPU power	*/
+	#define AMDGPU_INFO_SENSOR_GPU_AVG_POWER	0x5
+	/* Subquery id: Query northbridge voltage */
+	#define AMDGPU_INFO_SENSOR_VDDNB		0x6
+	/* Subquery id: Query graphics voltage */
+	#define AMDGPU_INFO_SENSOR_VDDGFX		0x7
+	/* Subquery id: Query GPU stable pstate shader clock */
+	#define AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_SCLK		0x8
+	/* Subquery id: Query GPU stable pstate memory clock */
+	#define AMDGPU_INFO_SENSOR_STABLE_PSTATE_GFX_MCLK		0x9
+	/* Subquery id: Query GPU peak pstate shader clock */
+	#define AMDGPU_INFO_SENSOR_PEAK_PSTATE_GFX_SCLK			0xa
+	/* Subquery id: Query GPU peak pstate memory clock */
+	#define AMDGPU_INFO_SENSOR_PEAK_PSTATE_GFX_MCLK			0xb
+	/* Subquery id: Query input GPU power	*/
+	#define AMDGPU_INFO_SENSOR_GPU_INPUT_POWER	0xc
+/* Number of VRAM page faults on CPU access. */
+#define AMDGPU_INFO_NUM_VRAM_CPU_PAGE_FAULTS	0x1E
+#define AMDGPU_INFO_VRAM_LOST_COUNTER		0x1F
+/* query ras mask of enabled features*/
+#define AMDGPU_INFO_RAS_ENABLED_FEATURES	0x20
+/* RAS MASK: UMC (VRAM) */
+#define AMDGPU_INFO_RAS_ENABLED_UMC			(1 << 0)
+/* RAS MASK: SDMA */
+#define AMDGPU_INFO_RAS_ENABLED_SDMA			(1 << 1)
+/* RAS MASK: GFX */
+#define AMDGPU_INFO_RAS_ENABLED_GFX			(1 << 2)
+/* RAS MASK: MMHUB */
+#define AMDGPU_INFO_RAS_ENABLED_MMHUB			(1 << 3)
+/* RAS MASK: ATHUB */
+#define AMDGPU_INFO_RAS_ENABLED_ATHUB			(1 << 4)
+/* RAS MASK: PCIE */
+#define AMDGPU_INFO_RAS_ENABLED_PCIE			(1 << 5)
+/* RAS MASK: HDP */
+#define AMDGPU_INFO_RAS_ENABLED_HDP			(1 << 6)
+/* RAS MASK: XGMI */
+#define AMDGPU_INFO_RAS_ENABLED_XGMI			(1 << 7)
+/* RAS MASK: DF */
+#define AMDGPU_INFO_RAS_ENABLED_DF			(1 << 8)
+/* RAS MASK: SMN */
+#define AMDGPU_INFO_RAS_ENABLED_SMN			(1 << 9)
+/* RAS MASK: SEM */
+#define AMDGPU_INFO_RAS_ENABLED_SEM			(1 << 10)
+/* RAS MASK: MP0 */
+#define AMDGPU_INFO_RAS_ENABLED_MP0			(1 << 11)
+/* RAS MASK: MP1 */
+#define AMDGPU_INFO_RAS_ENABLED_MP1			(1 << 12)
+/* RAS MASK: FUSE */
+#define AMDGPU_INFO_RAS_ENABLED_FUSE			(1 << 13)
+/* query video encode/decode caps */
+#define AMDGPU_INFO_VIDEO_CAPS			0x21
+	/* Subquery id: Decode */
+	#define AMDGPU_INFO_VIDEO_CAPS_DECODE		0
+	/* Subquery id: Encode */
+	#define AMDGPU_INFO_VIDEO_CAPS_ENCODE		1
+/* Query the max number of IBs per gang per submission */
+#define AMDGPU_INFO_MAX_IBS			0x22
+/* query last page fault info */
+#define AMDGPU_INFO_GPUVM_FAULT			0x23
+/* query FW object size and alignment */
+#define AMDGPU_INFO_UQ_FW_AREAS			0x24
+
+#define AMDGPU_INFO_MMR_SE_INDEX_SHIFT	0
+#define AMDGPU_INFO_MMR_SE_INDEX_MASK	0xff
+#define AMDGPU_INFO_MMR_SH_INDEX_SHIFT	8
+#define AMDGPU_INFO_MMR_SH_INDEX_MASK	0xff
+
+struct drm_amdgpu_query_fw {
+	/** AMDGPU_INFO_FW_* */
+	__u32 fw_type;
+	/**
+	 * Index of the IP if there are more IPs of
+	 * the same type.
+	 */
+	__u32 ip_instance;
+	/**
+	 * Index of the engine. Whether this is used depends
+	 * on the firmware type. (e.g. MEC, SDMA)
+	 */
+	__u32 index;
+	__u32 _pad;
+};
+
+/* Input structure for the INFO ioctl */
+struct drm_amdgpu_info {
+	/* Where the return value will be stored */
+	__u64 return_pointer;
+	/* The size of the return value. Just like "size" in "snprintf",
+	 * it limits how many bytes the kernel can write. */
+	__u32 return_size;
+	/* The query request id. */
+	__u32 query;
+
+	union {
+		struct {
+			__u32 id;
+			__u32 _pad;
+		} mode_crtc;
+
+		struct {
+			/** AMDGPU_HW_IP_* */
+			__u32 type;
+			/**
+			 * Index of the IP if there are more IPs of the same
+			 * type. Ignored by AMDGPU_INFO_HW_IP_COUNT.
+			 */
+			__u32 ip_instance;
+		} query_hw_ip;
+
+		struct {
+			__u32 dword_offset;
+			/** number of registers to read */
+			__u32 count;
+			__u32 instance;
+			/** For future use, no flags defined so far */
+			__u32 flags;
+		} read_mmr_reg;
+
+		struct drm_amdgpu_query_fw query_fw;
+
+		struct {
+			__u32 type;
+			__u32 offset;
+		} vbios_info;
+
+		struct {
+			__u32 type;
+		} sensor_info;
+
+		struct {
+			__u32 type;
+		} video_cap;
+	};
+};
+
+struct drm_amdgpu_info_gds {
+	/** GDS GFX partition size */
+	__u32 gds_gfx_partition_size;
+	/** GDS compute partition size */
+	__u32 compute_partition_size;
+	/** total GDS memory size */
+	__u32 gds_total_size;
+	/** GWS size per GFX partition */
+	__u32 gws_per_gfx_partition;
+	/** GSW size per compute partition */
+	__u32 gws_per_compute_partition;
+	/** OA size per GFX partition */
+	__u32 oa_per_gfx_partition;
+	/** OA size per compute partition */
+	__u32 oa_per_compute_partition;
+	__u32 _pad;
+};
+
+struct drm_amdgpu_info_vram_gtt {
+	__u64 vram_size;
+	__u64 vram_cpu_accessible_size;
+	__u64 gtt_size;
+};
+
+struct drm_amdgpu_heap_info {
+	/** max. physical memory */
+	__u64 total_heap_size;
+
+	/** Theoretical max. available memory in the given heap */
+	__u64 usable_heap_size;
+
+	/**
+	 * Number of bytes allocated in the heap. This includes all processes
+	 * and private allocations in the kernel. It changes when new buffers
+	 * are allocated, freed, and moved. It cannot be larger than
+	 * heap_size.
+	 */
+	__u64 heap_usage;
+
+	/**
+	 * Theoretical possible max. size of buffer which
+	 * could be allocated in the given heap
+	 */
+	__u64 max_allocation;
+};
+
+struct drm_amdgpu_memory_info {
+	struct drm_amdgpu_heap_info vram;
+	struct drm_amdgpu_heap_info cpu_accessible_vram;
+	struct drm_amdgpu_heap_info gtt;
+};
+
+struct drm_amdgpu_info_firmware {
+	__u32 ver;
+	__u32 feature;
+};
+
+struct drm_amdgpu_info_vbios {
+	__u8 name[64];
+	__u8 vbios_pn[64];
+	__u32 version;
+	__u32 pad;
+	__u8 vbios_ver_str[32];
+	__u8 date[32];
+};
+
+#define AMDGPU_VRAM_TYPE_UNKNOWN 0
+#define AMDGPU_VRAM_TYPE_GDDR1 1
+#define AMDGPU_VRAM_TYPE_DDR2  2
+#define AMDGPU_VRAM_TYPE_GDDR3 3
+#define AMDGPU_VRAM_TYPE_GDDR4 4
+#define AMDGPU_VRAM_TYPE_GDDR5 5
+#define AMDGPU_VRAM_TYPE_HBM   6
+#define AMDGPU_VRAM_TYPE_DDR3  7
+#define AMDGPU_VRAM_TYPE_DDR4  8
+#define AMDGPU_VRAM_TYPE_GDDR6 9
+#define AMDGPU_VRAM_TYPE_DDR5  10
+#define AMDGPU_VRAM_TYPE_LPDDR4 11
+#define AMDGPU_VRAM_TYPE_LPDDR5 12
+#define AMDGPU_VRAM_TYPE_HBM3E 13
+
+struct drm_amdgpu_info_device {
+	/** PCI Device ID */
+	__u32 device_id;
+	/** Internal chip revision: A0, A1, etc.) */
+	__u32 chip_rev;
+	__u32 external_rev;
+	/** Revision id in PCI Config space */
+	__u32 pci_rev;
+	__u32 family;
+	__u32 num_shader_engines;
+	__u32 num_shader_arrays_per_engine;
+	/* in KHz */
+	__u32 gpu_counter_freq;
+	__u64 max_engine_clock;
+	__u64 max_memory_clock;
+	/* cu information */
+	__u32 cu_active_number;
+	/* NOTE: cu_ao_mask is INVALID, DON'T use it */
+	__u32 cu_ao_mask;
+	__u32 cu_bitmap[4][4];
+	/** Render backend pipe mask. One render backend is CB+DB. */
+	__u32 enabled_rb_pipes_mask;
+	__u32 num_rb_pipes;
+	__u32 num_hw_gfx_contexts;
+	/* PCIe version (the smaller of the GPU and the CPU/motherboard) */
+	__u32 pcie_gen;
+	__u64 ids_flags;
+	/** Starting virtual address for UMDs. */
+	__u64 virtual_address_offset;
+	/** The maximum virtual address */
+	__u64 virtual_address_max;
+	/** Required alignment of virtual addresses. */
+	__u32 virtual_address_alignment;
+	/** Page table entry - fragment size */
+	__u32 pte_fragment_size;
+	__u32 gart_page_size;
+	/** constant engine ram size*/
+	__u32 ce_ram_size;
+	/** video memory type info*/
+	__u32 vram_type;
+	/** video memory bit width*/
+	__u32 vram_bit_width;
+	/* vce harvesting instance */
+	__u32 vce_harvest_config;
+	/* gfx double offchip LDS buffers */
+	__u32 gc_double_offchip_lds_buf;
+	/* NGG Primitive Buffer */
+	__u64 prim_buf_gpu_addr;
+	/* NGG Position Buffer */
+	__u64 pos_buf_gpu_addr;
+	/* NGG Control Sideband */
+	__u64 cntl_sb_buf_gpu_addr;
+	/* NGG Parameter Cache */
+	__u64 param_buf_gpu_addr;
+	__u32 prim_buf_size;
+	__u32 pos_buf_size;
+	__u32 cntl_sb_buf_size;
+	__u32 param_buf_size;
+	/* wavefront size*/
+	__u32 wave_front_size;
+	/* shader visible vgprs*/
+	__u32 num_shader_visible_vgprs;
+	/* CU per shader array*/
+	__u32 num_cu_per_sh;
+	/* number of tcc blocks*/
+	__u32 num_tcc_blocks;
+	/* gs vgt table depth*/
+	__u32 gs_vgt_table_depth;
+	/* gs primitive buffer depth*/
+	__u32 gs_prim_buffer_depth;
+	/* max gs wavefront per vgt*/
+	__u32 max_gs_waves_per_vgt;
+	/* PCIe number of lanes (the smaller of the GPU and the CPU/motherboard) */
+	__u32 pcie_num_lanes;
+	/* always on cu bitmap */
+	__u32 cu_ao_bitmap[4][4];
+	/** Starting high virtual address for UMDs. */
+	__u64 high_va_offset;
+	/** The maximum high virtual address */
+	__u64 high_va_max;
+	/* gfx10 pa_sc_tile_steering_override */
+	__u32 pa_sc_tile_steering_override;
+	/* disabled TCCs */
+	__u64 tcc_disabled_mask;
+	__u64 min_engine_clock;
+	__u64 min_memory_clock;
+	/* The following fields are only set on gfx11+, older chips set 0. */
+	__u32 tcp_cache_size;       /* AKA GL0, VMEM cache */
+	__u32 num_sqc_per_wgp;
+	__u32 sqc_data_cache_size;  /* AKA SMEM cache */
+	__u32 sqc_inst_cache_size;
+	__u32 gl1c_cache_size;
+	__u32 gl2c_cache_size;
+	__u64 mall_size;            /* AKA infinity cache */
+	/* high 32 bits of the rb pipes mask */
+	__u32 enabled_rb_pipes_mask_hi;
+	/* shadow area size for gfx11 */
+	__u32 shadow_size;
+	/* shadow area base virtual alignment for gfx11 */
+	__u32 shadow_alignment;
+	/* context save area size for gfx11 */
+	__u32 csa_size;
+	/* context save area base virtual alignment for gfx11 */
+	__u32 csa_alignment;
+	/* Userq IP mask (1 << AMDGPU_HW_IP_*) */
+	__u32 userq_ip_mask;
+	__u32 pad;
+};
+
+struct drm_amdgpu_info_hw_ip {
+	/** Version of h/w IP */
+	__u32  hw_ip_version_major;
+	__u32  hw_ip_version_minor;
+	/** Capabilities */
+	__u64  capabilities_flags;
+	/** command buffer address start alignment*/
+	__u32  ib_start_alignment;
+	/** command buffer size alignment*/
+	__u32  ib_size_alignment;
+	/** Bitmask of available rings. Bit 0 means ring 0, etc. */
+	__u32  available_rings;
+	/** version info: bits 23:16 major, 15:8 minor, 7:0 revision */
+	__u32  ip_discovery_version;
+	/* Userq available slots */
+	__u32  userq_num_slots;
+};
+
+/* GFX metadata BO sizes and alignment info (in bytes) */
+struct drm_amdgpu_info_uq_fw_areas_gfx {
+	/* shadow area size */
+	__u32 shadow_size;
+	/* shadow area base virtual mem alignment */
+	__u32 shadow_alignment;
+	/* context save area size */
+	__u32 csa_size;
+	/* context save area base virtual mem alignment */
+	__u32 csa_alignment;
+};
+
+/* IP specific fw related information used in the
+ * subquery AMDGPU_INFO_UQ_FW_AREAS
+ */
+struct drm_amdgpu_info_uq_fw_areas {
+	union {
+		struct drm_amdgpu_info_uq_fw_areas_gfx gfx;
+	};
+};
+
+struct drm_amdgpu_info_num_handles {
+	/** Max handles as supported by firmware for UVD */
+	__u32  uvd_max_handles;
+	/** Handles currently in use for UVD */
+	__u32  uvd_used_handles;
+};
+
+#define AMDGPU_VCE_CLOCK_TABLE_ENTRIES		6
+
+struct drm_amdgpu_info_vce_clock_table_entry {
+	/** System clock */
+	__u32 sclk;
+	/** Memory clock */
+	__u32 mclk;
+	/** VCE clock */
+	__u32 eclk;
+	__u32 pad;
+};
+
+struct drm_amdgpu_info_vce_clock_table {
+	struct drm_amdgpu_info_vce_clock_table_entry entries[AMDGPU_VCE_CLOCK_TABLE_ENTRIES];
+	__u32 num_valid_entries;
+	__u32 pad;
+};
+
+/* query video encode/decode caps */
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2			0
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4			1
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1			2
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC		3
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC			4
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG			5
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9			6
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1			7
+#define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_COUNT			8
+
+struct drm_amdgpu_info_video_codec_info {
+	__u32 valid;
+	__u32 max_width;
+	__u32 max_height;
+	__u32 max_pixels_per_frame;
+	__u32 max_level;
+	__u32 pad;
+};
+
+struct drm_amdgpu_info_video_caps {
+	struct drm_amdgpu_info_video_codec_info codec_info[AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_COUNT];
+};
+
+#define AMDGPU_VMHUB_TYPE_MASK			0xff
+#define AMDGPU_VMHUB_TYPE_SHIFT			0
+#define AMDGPU_VMHUB_TYPE_GFX			0
+#define AMDGPU_VMHUB_TYPE_MM0			1
+#define AMDGPU_VMHUB_TYPE_MM1			2
+#define AMDGPU_VMHUB_IDX_MASK			0xff00
+#define AMDGPU_VMHUB_IDX_SHIFT			8
+
+struct drm_amdgpu_info_gpuvm_fault {
+	__u64 addr;
+	__u32 status;
+	__u32 vmhub;
+};
+
+struct drm_amdgpu_info_uq_metadata_gfx {
+	/* shadow area size for gfx11 */
+	__u32 shadow_size;
+	/* shadow area base virtual alignment for gfx11 */
+	__u32 shadow_alignment;
+	/* context save area size for gfx11 */
+	__u32 csa_size;
+	/* context save area base virtual alignment for gfx11 */
+	__u32 csa_alignment;
+};
+
+struct drm_amdgpu_info_uq_metadata {
+	union {
+		struct drm_amdgpu_info_uq_metadata_gfx gfx;
+	};
+};
+
+/*
+ * Supported GPU families
+ */
+#define AMDGPU_FAMILY_UNKNOWN			0
+#define AMDGPU_FAMILY_SI			110 /* Hainan, Oland, Verde, Pitcairn, Tahiti */
+#define AMDGPU_FAMILY_CI			120 /* Bonaire, Hawaii */
+#define AMDGPU_FAMILY_KV			125 /* Kaveri, Kabini, Mullins */
+#define AMDGPU_FAMILY_VI			130 /* Iceland, Tonga */
+#define AMDGPU_FAMILY_CZ			135 /* Carrizo, Stoney */
+#define AMDGPU_FAMILY_AI			141 /* Vega10 */
+#define AMDGPU_FAMILY_RV			142 /* Raven */
+#define AMDGPU_FAMILY_NV			143 /* Navi10 */
+#define AMDGPU_FAMILY_VGH			144 /* Van Gogh */
+#define AMDGPU_FAMILY_GC_11_0_0			145 /* GC 11.0.0 */
+#define AMDGPU_FAMILY_YC			146 /* Yellow Carp */
+#define AMDGPU_FAMILY_GC_11_0_1			148 /* GC 11.0.1 */
+#define AMDGPU_FAMILY_GC_10_3_6			149 /* GC 10.3.6 */
+#define AMDGPU_FAMILY_GC_10_3_7			151 /* GC 10.3.7 */
+#define AMDGPU_FAMILY_GC_11_5_0			150 /* GC 11.5.0 */
+#define AMDGPU_FAMILY_GC_12_0_0			152 /* GC 12.0.0 */
+
+/* FIXME wrong namespace! */
+struct drm_color_ctm_3x4 {
+	/*
+	 * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude
+	 * (not two's complement!) format.
+	 */
+	__u64 matrix[12];
+};
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif

From 5eb61e1b14959acb858fea69d45bf5c8f7f53ee5 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Thu, 15 May 2025 09:49:24 -0400
Subject: [PATCH 1812/1854] plugin/amdgpu: Add drm header

The amdgpu plugin usually calls drm ioctls through the libdrm
wrappers. However, amdgpu restore requires dealing with dmabufs
and gem handles directly, which means drm ioctls must be
called directly.

Add the drm.h header (from the kernel's uapi).

Signed-off-by: David Francis <David.Francis@amd.com>
---
 plugins/amdgpu/drm.h | 1450 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1450 insertions(+)
 create mode 100644 plugins/amdgpu/drm.h

diff --git a/plugins/amdgpu/drm.h b/plugins/amdgpu/drm.h
new file mode 100644
index 000000000..84c819c17
--- /dev/null
+++ b/plugins/amdgpu/drm.h
@@ -0,0 +1,1450 @@
+/*
+ * Header for the Direct Rendering Manager
+ *
+ * Author: Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ * Acknowledgments:
+ * Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
+ */
+
+/*
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _DRM_H_
+#define _DRM_H_
+
+#if defined(__KERNEL__)
+
+#include <linux/types.h>
+#include <asm/ioctl.h>
+typedef unsigned int drm_handle_t;
+
+#elif defined(__linux__)
+
+#include <linux/types.h>
+#include <asm/ioctl.h>
+typedef unsigned int drm_handle_t;
+
+#else /* One of the BSDs */
+
+#include <stdint.h>
+#include <sys/ioccom.h>
+#include <sys/types.h>
+typedef int8_t   __s8;
+typedef uint8_t  __u8;
+typedef int16_t  __s16;
+typedef uint16_t __u16;
+typedef int32_t  __s32;
+typedef uint32_t __u32;
+typedef int64_t  __s64;
+typedef uint64_t __u64;
+typedef size_t   __kernel_size_t;
+typedef unsigned long drm_handle_t;
+
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#define DRM_NAME	"drm"	  /**< Name in kernel, /dev, and /proc */
+#define DRM_MIN_ORDER	5	  /**< At least 2^5 bytes = 32 bytes */
+#define DRM_MAX_ORDER	22	  /**< Up to 2^22 bytes = 4MB */
+#define DRM_RAM_PERCENT 10	  /**< How much system ram can we lock? */
+
+#define _DRM_LOCK_HELD	0x80000000U /**< Hardware lock is held */
+#define _DRM_LOCK_CONT	0x40000000U /**< Hardware lock is contended */
+#define _DRM_LOCK_IS_HELD(lock)	   ((lock) & _DRM_LOCK_HELD)
+#define _DRM_LOCK_IS_CONT(lock)	   ((lock) & _DRM_LOCK_CONT)
+#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT))
+
+typedef unsigned int drm_context_t;
+typedef unsigned int drm_drawable_t;
+typedef unsigned int drm_magic_t;
+
+/*
+ * Cliprect.
+ *
+ * \warning: If you change this structure, make sure you change
+ * XF86DRIClipRectRec in the server as well
+ *
+ * \note KW: Actually it's illegal to change either for
+ * backwards-compatibility reasons.
+ */
+struct drm_clip_rect {
+	unsigned short x1;
+	unsigned short y1;
+	unsigned short x2;
+	unsigned short y2;
+};
+
+/*
+ * Drawable information.
+ */
+struct drm_drawable_info {
+	unsigned int num_rects;
+	struct drm_clip_rect *rects;
+};
+
+/*
+ * Texture region,
+ */
+struct drm_tex_region {
+	unsigned char next;
+	unsigned char prev;
+	unsigned char in_use;
+	unsigned char padding;
+	unsigned int age;
+};
+
+/*
+ * Hardware lock.
+ *
+ * The lock structure is a simple cache-line aligned integer.  To avoid
+ * processor bus contention on a multiprocessor system, there should not be any
+ * other data stored in the same cache line.
+ */
+struct drm_hw_lock {
+	__volatile__ unsigned int lock;		/**< lock variable */
+	char padding[60];			/**< Pad to cache line */
+};
+
+/*
+ * DRM_IOCTL_VERSION ioctl argument type.
+ *
+ * \sa drmGetVersion().
+ */
+struct drm_version {
+	int version_major;	  /**< Major version */
+	int version_minor;	  /**< Minor version */
+	int version_patchlevel;	  /**< Patch level */
+	__kernel_size_t name_len;	  /**< Length of name buffer */
+	char __user *name;	  /**< Name of driver */
+	__kernel_size_t date_len;	  /**< Length of date buffer */
+	char __user *date;	  /**< User-space buffer to hold date */
+	__kernel_size_t desc_len;	  /**< Length of desc buffer */
+	char __user *desc;	  /**< User-space buffer to hold desc */
+};
+
+/*
+ * DRM_IOCTL_GET_UNIQUE ioctl argument type.
+ *
+ * \sa drmGetBusid() and drmSetBusId().
+ */
+struct drm_unique {
+	__kernel_size_t unique_len;	  /**< Length of unique */
+	char __user *unique;	  /**< Unique name for driver instantiation */
+};
+
+struct drm_list {
+	int count;		  /**< Length of user-space structures */
+	struct drm_version __user *version;
+};
+
+struct drm_block {
+	int unused;
+};
+
+/*
+ * DRM_IOCTL_CONTROL ioctl argument type.
+ *
+ * \sa drmCtlInstHandler() and drmCtlUninstHandler().
+ */
+struct drm_control {
+	enum {
+		DRM_ADD_COMMAND,
+		DRM_RM_COMMAND,
+		DRM_INST_HANDLER,
+		DRM_UNINST_HANDLER
+	} func;
+	int irq;
+};
+
+/*
+ * Type of memory to map.
+ */
+enum drm_map_type {
+	_DRM_FRAME_BUFFER = 0,	  /**< WC (no caching), no core dump */
+	_DRM_REGISTERS = 1,	  /**< no caching, no core dump */
+	_DRM_SHM = 2,		  /**< shared, cached */
+	_DRM_AGP = 3,		  /**< AGP/GART */
+	_DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
+	_DRM_CONSISTENT = 5	  /**< Consistent memory for PCI DMA */
+};
+
+/*
+ * Memory mapping flags.
+ */
+enum drm_map_flags {
+	_DRM_RESTRICTED = 0x01,	     /**< Cannot be mapped to user-virtual */
+	_DRM_READ_ONLY = 0x02,
+	_DRM_LOCKED = 0x04,	     /**< shared, cached, locked */
+	_DRM_KERNEL = 0x08,	     /**< kernel requires access */
+	_DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */
+	_DRM_CONTAINS_LOCK = 0x20,   /**< SHM page that contains lock */
+	_DRM_REMOVABLE = 0x40,	     /**< Removable mapping */
+	_DRM_DRIVER = 0x80	     /**< Managed by driver */
+};
+
+struct drm_ctx_priv_map {
+	unsigned int ctx_id;	 /**< Context requesting private mapping */
+	void *handle;		 /**< Handle of map */
+};
+
+/*
+ * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls
+ * argument type.
+ *
+ * \sa drmAddMap().
+ */
+struct drm_map {
+	unsigned long offset;	 /**< Requested physical address (0 for SAREA)*/
+	unsigned long size;	 /**< Requested physical size (bytes) */
+	enum drm_map_type type;	 /**< Type of memory to map */
+	enum drm_map_flags flags;	 /**< Flags */
+	void *handle;		 /**< User-space: "Handle" to pass to mmap() */
+				 /**< Kernel-space: kernel-virtual address */
+	int mtrr;		 /**< MTRR slot used */
+	/*   Private data */
+};
+
+/*
+ * DRM_IOCTL_GET_CLIENT ioctl argument type.
+ */
+struct drm_client {
+	int idx;		/**< Which client desired? */
+	int auth;		/**< Is client authenticated? */
+	unsigned long pid;	/**< Process ID */
+	unsigned long uid;	/**< User ID */
+	unsigned long magic;	/**< Magic */
+	unsigned long iocs;	/**< Ioctl count */
+};
+
+enum drm_stat_type {
+	_DRM_STAT_LOCK,
+	_DRM_STAT_OPENS,
+	_DRM_STAT_CLOSES,
+	_DRM_STAT_IOCTLS,
+	_DRM_STAT_LOCKS,
+	_DRM_STAT_UNLOCKS,
+	_DRM_STAT_VALUE,	/**< Generic value */
+	_DRM_STAT_BYTE,		/**< Generic byte counter (1024bytes/K) */
+	_DRM_STAT_COUNT,	/**< Generic non-byte counter (1000/k) */
+
+	_DRM_STAT_IRQ,		/**< IRQ */
+	_DRM_STAT_PRIMARY,	/**< Primary DMA bytes */
+	_DRM_STAT_SECONDARY,	/**< Secondary DMA bytes */
+	_DRM_STAT_DMA,		/**< DMA */
+	_DRM_STAT_SPECIAL,	/**< Special DMA (e.g., priority or polled) */
+	_DRM_STAT_MISSED	/**< Missed DMA opportunity */
+	    /* Add to the *END* of the list */
+};
+
+/*
+ * DRM_IOCTL_GET_STATS ioctl argument type.
+ */
+struct drm_stats {
+	unsigned long count;
+	struct {
+		unsigned long value;
+		enum drm_stat_type type;
+	} data[15];
+};
+
+/*
+ * Hardware locking flags.
+ */
+enum drm_lock_flags {
+	_DRM_LOCK_READY = 0x01,	     /**< Wait until hardware is ready for DMA */
+	_DRM_LOCK_QUIESCENT = 0x02,  /**< Wait until hardware quiescent */
+	_DRM_LOCK_FLUSH = 0x04,	     /**< Flush this context's DMA queue first */
+	_DRM_LOCK_FLUSH_ALL = 0x08,  /**< Flush all DMA queues first */
+	/* These *HALT* flags aren't supported yet
+	   -- they will be used to support the
+	   full-screen DGA-like mode. */
+	_DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */
+	_DRM_HALT_CUR_QUEUES = 0x20  /**< Halt all current queues */
+};
+
+/*
+ * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type.
+ *
+ * \sa drmGetLock() and drmUnlock().
+ */
+struct drm_lock {
+	int context;
+	enum drm_lock_flags flags;
+};
+
+/*
+ * DMA flags
+ *
+ * \warning
+ * These values \e must match xf86drm.h.
+ *
+ * \sa drm_dma.
+ */
+enum drm_dma_flags {
+	/* Flags for DMA buffer dispatch */
+	_DRM_DMA_BLOCK = 0x01,	      /**<
+				       * Block until buffer dispatched.
+				       *
+				       * \note The buffer may not yet have
+				       * been processed by the hardware --
+				       * getting a hardware lock with the
+				       * hardware quiescent will ensure
+				       * that the buffer has been
+				       * processed.
+				       */
+	_DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */
+	_DRM_DMA_PRIORITY = 0x04,     /**< High priority dispatch */
+
+	/* Flags for DMA buffer request */
+	_DRM_DMA_WAIT = 0x10,	      /**< Wait for free buffers */
+	_DRM_DMA_SMALLER_OK = 0x20,   /**< Smaller-than-requested buffers OK */
+	_DRM_DMA_LARGER_OK = 0x40     /**< Larger-than-requested buffers OK */
+};
+
+/*
+ * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type.
+ *
+ * \sa drmAddBufs().
+ */
+struct drm_buf_desc {
+	int count;		 /**< Number of buffers of this size */
+	int size;		 /**< Size in bytes */
+	int low_mark;		 /**< Low water mark */
+	int high_mark;		 /**< High water mark */
+	enum {
+		_DRM_PAGE_ALIGN = 0x01,	/**< Align on page boundaries for DMA */
+		_DRM_AGP_BUFFER = 0x02,	/**< Buffer is in AGP space */
+		_DRM_SG_BUFFER = 0x04,	/**< Scatter/gather memory buffer */
+		_DRM_FB_BUFFER = 0x08,	/**< Buffer is in frame buffer */
+		_DRM_PCI_BUFFER_RO = 0x10 /**< Map PCI DMA buffer read-only */
+	} flags;
+	unsigned long agp_start; /**<
+				  * Start address of where the AGP buffers are
+				  * in the AGP aperture
+				  */
+};
+
+/*
+ * DRM_IOCTL_INFO_BUFS ioctl argument type.
+ */
+struct drm_buf_info {
+	int count;		/**< Entries in list */
+	struct drm_buf_desc __user *list;
+};
+
+/*
+ * DRM_IOCTL_FREE_BUFS ioctl argument type.
+ */
+struct drm_buf_free {
+	int count;
+	int __user *list;
+};
+
+/*
+ * Buffer information
+ *
+ * \sa drm_buf_map.
+ */
+struct drm_buf_pub {
+	int idx;		       /**< Index into the master buffer list */
+	int total;		       /**< Buffer size */
+	int used;		       /**< Amount of buffer in use (for DMA) */
+	void __user *address;	       /**< Address of buffer */
+};
+
+/*
+ * DRM_IOCTL_MAP_BUFS ioctl argument type.
+ */
+struct drm_buf_map {
+	int count;		/**< Length of the buffer list */
+#ifdef __cplusplus
+	void __user *virt;
+#else
+	void __user *virtual;		/**< Mmap'd area in user-virtual */
+#endif
+	struct drm_buf_pub __user *list;	/**< Buffer information */
+};
+
+/*
+ * DRM_IOCTL_DMA ioctl argument type.
+ *
+ * Indices here refer to the offset into the buffer list in drm_buf_get.
+ *
+ * \sa drmDMA().
+ */
+struct drm_dma {
+	int context;			  /**< Context handle */
+	int send_count;			  /**< Number of buffers to send */
+	int __user *send_indices;	  /**< List of handles to buffers */
+	int __user *send_sizes;		  /**< Lengths of data to send */
+	enum drm_dma_flags flags;	  /**< Flags */
+	int request_count;		  /**< Number of buffers requested */
+	int request_size;		  /**< Desired size for buffers */
+	int __user *request_indices;	  /**< Buffer information */
+	int __user *request_sizes;
+	int granted_count;		  /**< Number of buffers granted */
+};
+
+enum drm_ctx_flags {
+	_DRM_CONTEXT_PRESERVED = 0x01,
+	_DRM_CONTEXT_2DONLY = 0x02
+};
+
+/*
+ * DRM_IOCTL_ADD_CTX ioctl argument type.
+ *
+ * \sa drmCreateContext() and drmDestroyContext().
+ */
+struct drm_ctx {
+	drm_context_t handle;
+	enum drm_ctx_flags flags;
+};
+
+/*
+ * DRM_IOCTL_RES_CTX ioctl argument type.
+ */
+struct drm_ctx_res {
+	int count;
+	struct drm_ctx __user *contexts;
+};
+
+/*
+ * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type.
+ */
+struct drm_draw {
+	drm_drawable_t handle;
+};
+
+/*
+ * DRM_IOCTL_UPDATE_DRAW ioctl argument type.
+ */
+typedef enum {
+	DRM_DRAWABLE_CLIPRECTS
+} drm_drawable_info_type_t;
+
+struct drm_update_draw {
+	drm_drawable_t handle;
+	unsigned int type;
+	unsigned int num;
+	unsigned long long data;
+};
+
+/*
+ * DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type.
+ */
+struct drm_auth {
+	drm_magic_t magic;
+};
+
+/*
+ * DRM_IOCTL_IRQ_BUSID ioctl argument type.
+ *
+ * \sa drmGetInterruptFromBusID().
+ */
+struct drm_irq_busid {
+	int irq;	/**< IRQ number */
+	int busnum;	/**< bus number */
+	int devnum;	/**< device number */
+	int funcnum;	/**< function number */
+};
+
+enum drm_vblank_seq_type {
+	_DRM_VBLANK_ABSOLUTE = 0x0,	/**< Wait for specific vblank sequence number */
+	_DRM_VBLANK_RELATIVE = 0x1,	/**< Wait for given number of vblanks */
+	/* bits 1-6 are reserved for high crtcs */
+	_DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e,
+	_DRM_VBLANK_EVENT = 0x4000000,   /**< Send event instead of blocking */
+	_DRM_VBLANK_FLIP = 0x8000000,   /**< Scheduled buffer swap should flip */
+	_DRM_VBLANK_NEXTONMISS = 0x10000000,	/**< If missed, wait for next vblank */
+	_DRM_VBLANK_SECONDARY = 0x20000000,	/**< Secondary display controller */
+	_DRM_VBLANK_SIGNAL = 0x40000000	/**< Send signal instead of blocking, unsupported */
+};
+#define _DRM_VBLANK_HIGH_CRTC_SHIFT 1
+
+#define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE)
+#define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_EVENT | _DRM_VBLANK_SIGNAL | \
+				_DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS)
+
+struct drm_wait_vblank_request {
+	enum drm_vblank_seq_type type;
+	unsigned int sequence;
+	unsigned long signal;
+};
+
+struct drm_wait_vblank_reply {
+	enum drm_vblank_seq_type type;
+	unsigned int sequence;
+	long tval_sec;
+	long tval_usec;
+};
+
+/*
+ * DRM_IOCTL_WAIT_VBLANK ioctl argument type.
+ *
+ * \sa drmWaitVBlank().
+ */
+union drm_wait_vblank {
+	struct drm_wait_vblank_request request;
+	struct drm_wait_vblank_reply reply;
+};
+
+#define _DRM_PRE_MODESET 1
+#define _DRM_POST_MODESET 2
+
+/*
+ * DRM_IOCTL_MODESET_CTL ioctl argument type
+ *
+ * \sa drmModesetCtl().
+ */
+struct drm_modeset_ctl {
+	__u32 crtc;
+	__u32 cmd;
+};
+
+/*
+ * DRM_IOCTL_AGP_ENABLE ioctl argument type.
+ *
+ * \sa drmAgpEnable().
+ */
+struct drm_agp_mode {
+	unsigned long mode;	/**< AGP mode */
+};
+
+/*
+ * DRM_IOCTL_AGP_ALLOC and DRM_IOCTL_AGP_FREE ioctls argument type.
+ *
+ * \sa drmAgpAlloc() and drmAgpFree().
+ */
+struct drm_agp_buffer {
+	unsigned long size;	/**< In bytes -- will round to page boundary */
+	unsigned long handle;	/**< Used for binding / unbinding */
+	unsigned long type;	/**< Type of memory to allocate */
+	unsigned long physical;	/**< Physical used by i810 */
+};
+
+/*
+ * DRM_IOCTL_AGP_BIND and DRM_IOCTL_AGP_UNBIND ioctls argument type.
+ *
+ * \sa drmAgpBind() and drmAgpUnbind().
+ */
+struct drm_agp_binding {
+	unsigned long handle;	/**< From drm_agp_buffer */
+	unsigned long offset;	/**< In bytes -- will round to page boundary */
+};
+
+/*
+ * DRM_IOCTL_AGP_INFO ioctl argument type.
+ *
+ * \sa drmAgpVersionMajor(), drmAgpVersionMinor(), drmAgpGetMode(),
+ * drmAgpBase(), drmAgpSize(), drmAgpMemoryUsed(), drmAgpMemoryAvail(),
+ * drmAgpVendorId() and drmAgpDeviceId().
+ */
+struct drm_agp_info {
+	int agp_version_major;
+	int agp_version_minor;
+	unsigned long mode;
+	unsigned long aperture_base;	/* physical address */
+	unsigned long aperture_size;	/* bytes */
+	unsigned long memory_allowed;	/* bytes */
+	unsigned long memory_used;
+
+	/* PCI information */
+	unsigned short id_vendor;
+	unsigned short id_device;
+};
+
+/*
+ * DRM_IOCTL_SG_ALLOC ioctl argument type.
+ */
+struct drm_scatter_gather {
+	unsigned long size;	/**< In bytes -- will round to page boundary */
+	unsigned long handle;	/**< Used for mapping / unmapping */
+};
+
+/*
+ * DRM_IOCTL_SET_VERSION ioctl argument type.
+ */
+struct drm_set_version {
+	int drm_di_major;
+	int drm_di_minor;
+	int drm_dd_major;
+	int drm_dd_minor;
+};
+
+/* DRM_IOCTL_GEM_CLOSE ioctl argument type */
+struct drm_gem_close {
+	/** Handle of the object to be closed. */
+	__u32 handle;
+	__u32 pad;
+};
+
+/* DRM_IOCTL_GEM_FLINK ioctl argument type */
+struct drm_gem_flink {
+	/** Handle for the object being named */
+	__u32 handle;
+
+	/** Returned global name */
+	__u32 name;
+};
+
+/* DRM_IOCTL_GEM_OPEN ioctl argument type */
+struct drm_gem_open {
+	/** Name of object being opened */
+	__u32 name;
+
+	/** Returned handle for the object */
+	__u32 handle;
+
+	/** Returned size of the object */
+	__u64 size;
+};
+
+/* DRM_IOCTL_GEM_CHANGE_HANDLE ioctl argument type */
+struct drm_gem_change_handle {
+	/** Current handle of object */
+	__u32 handle;
+
+	/** Handle to change that object to */
+	__u32 new_handle;
+};
+
+/**
+ * DRM_CAP_DUMB_BUFFER
+ *
+ * If set to 1, the driver supports creating dumb buffers via the
+ * &DRM_IOCTL_MODE_CREATE_DUMB ioctl.
+ */
+#define DRM_CAP_DUMB_BUFFER		0x1
+/**
+ * DRM_CAP_VBLANK_HIGH_CRTC
+ *
+ * If set to 1, the kernel supports specifying a :ref:`CRTC index<crtc_index>`
+ * in the high bits of &drm_wait_vblank_request.type.
+ *
+ * Starting kernel version 2.6.39, this capability is always set to 1.
+ */
+#define DRM_CAP_VBLANK_HIGH_CRTC	0x2
+/**
+ * DRM_CAP_DUMB_PREFERRED_DEPTH
+ *
+ * The preferred bit depth for dumb buffers.
+ *
+ * The bit depth is the number of bits used to indicate the color of a single
+ * pixel excluding any padding. This is different from the number of bits per
+ * pixel. For instance, XRGB8888 has a bit depth of 24 but has 32 bits per
+ * pixel.
+ *
+ * Note that this preference only applies to dumb buffers, it's irrelevant for
+ * other types of buffers.
+ */
+#define DRM_CAP_DUMB_PREFERRED_DEPTH	0x3
+/**
+ * DRM_CAP_DUMB_PREFER_SHADOW
+ *
+ * If set to 1, the driver prefers userspace to render to a shadow buffer
+ * instead of directly rendering to a dumb buffer. For best speed, userspace
+ * should do streaming ordered memory copies into the dumb buffer and never
+ * read from it.
+ *
+ * Note that this preference only applies to dumb buffers, it's irrelevant for
+ * other types of buffers.
+ */
+#define DRM_CAP_DUMB_PREFER_SHADOW	0x4
+/**
+ * DRM_CAP_PRIME
+ *
+ * Bitfield of supported PRIME sharing capabilities. See &DRM_PRIME_CAP_IMPORT
+ * and &DRM_PRIME_CAP_EXPORT.
+ *
+ * Starting from kernel version 6.6, both &DRM_PRIME_CAP_IMPORT and
+ * &DRM_PRIME_CAP_EXPORT are always advertised.
+ *
+ * PRIME buffers are exposed as dma-buf file descriptors.
+ * See :ref:`prime_buffer_sharing`.
+ */
+#define DRM_CAP_PRIME			0x5
+/**
+ * DRM_PRIME_CAP_IMPORT
+ *
+ * If this bit is set in &DRM_CAP_PRIME, the driver supports importing PRIME
+ * buffers via the &DRM_IOCTL_PRIME_FD_TO_HANDLE ioctl.
+ *
+ * Starting from kernel version 6.6, this bit is always set in &DRM_CAP_PRIME.
+ */
+#define  DRM_PRIME_CAP_IMPORT		0x1
+/**
+ * DRM_PRIME_CAP_EXPORT
+ *
+ * If this bit is set in &DRM_CAP_PRIME, the driver supports exporting PRIME
+ * buffers via the &DRM_IOCTL_PRIME_HANDLE_TO_FD ioctl.
+ *
+ * Starting from kernel version 6.6, this bit is always set in &DRM_CAP_PRIME.
+ */
+#define  DRM_PRIME_CAP_EXPORT		0x2
+/**
+ * DRM_CAP_TIMESTAMP_MONOTONIC
+ *
+ * If set to 0, the kernel will report timestamps with ``CLOCK_REALTIME`` in
+ * struct drm_event_vblank. If set to 1, the kernel will report timestamps with
+ * ``CLOCK_MONOTONIC``. See ``clock_gettime(2)`` for the definition of these
+ * clocks.
+ *
+ * Starting from kernel version 2.6.39, the default value for this capability
+ * is 1. Starting kernel version 4.15, this capability is always set to 1.
+ */
+#define DRM_CAP_TIMESTAMP_MONOTONIC	0x6
+/**
+ * DRM_CAP_ASYNC_PAGE_FLIP
+ *
+ * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for legacy
+ * page-flips.
+ */
+#define DRM_CAP_ASYNC_PAGE_FLIP		0x7
+/**
+ * DRM_CAP_CURSOR_WIDTH
+ *
+ * The ``CURSOR_WIDTH`` and ``CURSOR_HEIGHT`` capabilities return a valid
+ * width x height combination for the hardware cursor. The intention is that a
+ * hardware agnostic userspace can query a cursor plane size to use.
+ *
+ * Note that the cross-driver contract is to merely return a valid size;
+ * drivers are free to attach another meaning on top, eg. i915 returns the
+ * maximum plane size.
+ */
+#define DRM_CAP_CURSOR_WIDTH		0x8
+/**
+ * DRM_CAP_CURSOR_HEIGHT
+ *
+ * See &DRM_CAP_CURSOR_WIDTH.
+ */
+#define DRM_CAP_CURSOR_HEIGHT		0x9
+/**
+ * DRM_CAP_ADDFB2_MODIFIERS
+ *
+ * If set to 1, the driver supports supplying modifiers in the
+ * &DRM_IOCTL_MODE_ADDFB2 ioctl.
+ */
+#define DRM_CAP_ADDFB2_MODIFIERS	0x10
+/**
+ * DRM_CAP_PAGE_FLIP_TARGET
+ *
+ * If set to 1, the driver supports the &DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE and
+ * &DRM_MODE_PAGE_FLIP_TARGET_RELATIVE flags in
+ * &drm_mode_crtc_page_flip_target.flags for the &DRM_IOCTL_MODE_PAGE_FLIP
+ * ioctl.
+ */
+#define DRM_CAP_PAGE_FLIP_TARGET	0x11
+/**
+ * DRM_CAP_CRTC_IN_VBLANK_EVENT
+ *
+ * If set to 1, the kernel supports reporting the CRTC ID in
+ * &drm_event_vblank.crtc_id for the &DRM_EVENT_VBLANK and
+ * &DRM_EVENT_FLIP_COMPLETE events.
+ *
+ * Starting kernel version 4.12, this capability is always set to 1.
+ */
+#define DRM_CAP_CRTC_IN_VBLANK_EVENT	0x12
+/**
+ * DRM_CAP_SYNCOBJ
+ *
+ * If set to 1, the driver supports sync objects. See :ref:`drm_sync_objects`.
+ */
+#define DRM_CAP_SYNCOBJ		0x13
+/**
+ * DRM_CAP_SYNCOBJ_TIMELINE
+ *
+ * If set to 1, the driver supports timeline operations on sync objects. See
+ * :ref:`drm_sync_objects`.
+ */
+#define DRM_CAP_SYNCOBJ_TIMELINE	0x14
+/**
+ * DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP
+ *
+ * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC for atomic
+ * commits.
+ */
+#define DRM_CAP_ATOMIC_ASYNC_PAGE_FLIP	0x15
+
+/* DRM_IOCTL_GET_CAP ioctl argument type */
+struct drm_get_cap {
+	__u64 capability;
+	__u64 value;
+};
+
+/**
+ * DRM_CLIENT_CAP_STEREO_3D
+ *
+ * If set to 1, the DRM core will expose the stereo 3D capabilities of the
+ * monitor by advertising the supported 3D layouts in the flags of struct
+ * drm_mode_modeinfo. See ``DRM_MODE_FLAG_3D_*``.
+ *
+ * This capability is always supported for all drivers starting from kernel
+ * version 3.13.
+ */
+#define DRM_CLIENT_CAP_STEREO_3D	1
+
+/**
+ * DRM_CLIENT_CAP_UNIVERSAL_PLANES
+ *
+ * If set to 1, the DRM core will expose all planes (overlay, primary, and
+ * cursor) to userspace.
+ *
+ * This capability has been introduced in kernel version 3.15. Starting from
+ * kernel version 3.17, this capability is always supported for all drivers.
+ */
+#define DRM_CLIENT_CAP_UNIVERSAL_PLANES  2
+
+/**
+ * DRM_CLIENT_CAP_ATOMIC
+ *
+ * If set to 1, the DRM core will expose atomic properties to userspace. This
+ * implicitly enables &DRM_CLIENT_CAP_UNIVERSAL_PLANES and
+ * &DRM_CLIENT_CAP_ASPECT_RATIO.
+ *
+ * If the driver doesn't support atomic mode-setting, enabling this capability
+ * will fail with -EOPNOTSUPP.
+ *
+ * This capability has been introduced in kernel version 4.0. Starting from
+ * kernel version 4.2, this capability is always supported for atomic-capable
+ * drivers.
+ */
+#define DRM_CLIENT_CAP_ATOMIC	3
+
+/**
+ * DRM_CLIENT_CAP_ASPECT_RATIO
+ *
+ * If set to 1, the DRM core will provide aspect ratio information in modes.
+ * See ``DRM_MODE_FLAG_PIC_AR_*``.
+ *
+ * This capability is always supported for all drivers starting from kernel
+ * version 4.18.
+ */
+#define DRM_CLIENT_CAP_ASPECT_RATIO    4
+
+/**
+ * DRM_CLIENT_CAP_WRITEBACK_CONNECTORS
+ *
+ * If set to 1, the DRM core will expose special connectors to be used for
+ * writing back to memory the scene setup in the commit. The client must enable
+ * &DRM_CLIENT_CAP_ATOMIC first.
+ *
+ * This capability is always supported for atomic-capable drivers starting from
+ * kernel version 4.19.
+ */
+#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS	5
+
+/**
+ * DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT
+ *
+ * Drivers for para-virtualized hardware (e.g. vmwgfx, qxl, virtio and
+ * virtualbox) have additional restrictions for cursor planes (thus
+ * making cursor planes on those drivers not truly universal,) e.g.
+ * they need cursor planes to act like one would expect from a mouse
+ * cursor and have correctly set hotspot properties.
+ * If this client cap is not set the DRM core will hide cursor plane on
+ * those virtualized drivers because not setting it implies that the
+ * client is not capable of dealing with those extra restictions.
+ * Clients which do set cursor hotspot and treat the cursor plane
+ * like a mouse cursor should set this property.
+ * The client must enable &DRM_CLIENT_CAP_ATOMIC first.
+ *
+ * Setting this property on drivers which do not special case
+ * cursor planes (i.e. non-virtualized drivers) will return
+ * EOPNOTSUPP, which can be used by userspace to gauge
+ * requirements of the hardware/drivers they're running on.
+ *
+ * This capability is always supported for atomic-capable virtualized
+ * drivers starting from kernel version 6.6.
+ */
+#define DRM_CLIENT_CAP_CURSOR_PLANE_HOTSPOT	6
+
+/* DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */
+struct drm_set_client_cap {
+	__u64 capability;
+	__u64 value;
+};
+
+#define DRM_RDWR O_RDWR
+#define DRM_CLOEXEC O_CLOEXEC
+struct drm_prime_handle {
+	__u32 handle;
+
+	/** Flags.. only applicable for handle->fd */
+	__u32 flags;
+
+	/** Returned dmabuf file descriptor */
+	__s32 fd;
+};
+
+struct drm_syncobj_create {
+	__u32 handle;
+#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)
+	__u32 flags;
+};
+
+struct drm_syncobj_destroy {
+	__u32 handle;
+	__u32 pad;
+};
+
+#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0)
+#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0)
+struct drm_syncobj_handle {
+	__u32 handle;
+	__u32 flags;
+
+	__s32 fd;
+	__u32 pad;
+};
+
+struct drm_syncobj_transfer {
+	__u32 src_handle;
+	__u32 dst_handle;
+	__u64 src_point;
+	__u64 dst_point;
+	__u32 flags;
+	__u32 pad;
+};
+
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) /* wait for time point to become available */
+#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE (1 << 3) /* set fence deadline to deadline_nsec */
+struct drm_syncobj_wait {
+	__u64 handles;
+	/* absolute timeout */
+	__s64 timeout_nsec;
+	__u32 count_handles;
+	__u32 flags;
+	__u32 first_signaled; /* only valid when not waiting all */
+	__u32 pad;
+	/**
+	 * @deadline_nsec - fence deadline hint
+	 *
+	 * Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing
+	 * fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is
+	 * set.
+	 */
+	__u64 deadline_nsec;
+};
+
+struct drm_syncobj_timeline_wait {
+	__u64 handles;
+	/* wait on specific timeline point for every handles*/
+	__u64 points;
+	/* absolute timeout */
+	__s64 timeout_nsec;
+	__u32 count_handles;
+	__u32 flags;
+	__u32 first_signaled; /* only valid when not waiting all */
+	__u32 pad;
+	/**
+	 * @deadline_nsec - fence deadline hint
+	 *
+	 * Deadline hint, in absolute CLOCK_MONOTONIC, to set on backing
+	 * fence(s) if the DRM_SYNCOBJ_WAIT_FLAGS_WAIT_DEADLINE flag is
+	 * set.
+	 */
+	__u64 deadline_nsec;
+};
+
+/**
+ * struct drm_syncobj_eventfd
+ * @handle: syncobj handle.
+ * @flags: Zero to wait for the point to be signalled, or
+ *         &DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE to wait for a fence to be
+ *         available for the point.
+ * @point: syncobj timeline point (set to zero for binary syncobjs).
+ * @fd: Existing eventfd to sent events to.
+ * @pad: Must be zero.
+ *
+ * Register an eventfd to be signalled by a syncobj. The eventfd counter will
+ * be incremented by one.
+ */
+struct drm_syncobj_eventfd {
+	__u32 handle;
+	__u32 flags;
+	__u64 point;
+	__s32 fd;
+	__u32 pad;
+};
+
+
+struct drm_syncobj_array {
+	__u64 handles;
+	__u32 count_handles;
+	__u32 pad;
+};
+
+#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0) /* last available point on timeline syncobj */
+struct drm_syncobj_timeline_array {
+	__u64 handles;
+	__u64 points;
+	__u32 count_handles;
+	__u32 flags;
+};
+
+
+/* Query current scanout sequence number */
+struct drm_crtc_get_sequence {
+	__u32 crtc_id;		/* requested crtc_id */
+	__u32 active;		/* return: crtc output is active */
+	__u64 sequence;		/* return: most recent vblank sequence */
+	__s64 sequence_ns;	/* return: most recent time of first pixel out */
+};
+
+/* Queue event to be delivered at specified sequence. Time stamp marks
+ * when the first pixel of the refresh cycle leaves the display engine
+ * for the display
+ */
+#define DRM_CRTC_SEQUENCE_RELATIVE		0x00000001	/* sequence is relative to current */
+#define DRM_CRTC_SEQUENCE_NEXT_ON_MISS		0x00000002	/* Use next sequence if we've missed */
+
+struct drm_crtc_queue_sequence {
+	__u32 crtc_id;
+	__u32 flags;
+	__u64 sequence;		/* on input, target sequence. on output, actual sequence */
+	__u64 user_data;	/* user data passed to event */
+};
+
+#define DRM_CLIENT_NAME_MAX_LEN		64
+struct drm_set_client_name {
+	__u64 name_len;
+	__u64 name;
+};
+
+
+#if defined(__cplusplus)
+}
+#endif
+
+#include "drm_mode.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#define DRM_IOCTL_BASE			'd'
+#define DRM_IO(nr)			_IO(DRM_IOCTL_BASE,nr)
+#define DRM_IOR(nr,type)		_IOR(DRM_IOCTL_BASE,nr,type)
+#define DRM_IOW(nr,type)		_IOW(DRM_IOCTL_BASE,nr,type)
+#define DRM_IOWR(nr,type)		_IOWR(DRM_IOCTL_BASE,nr,type)
+
+#define DRM_IOCTL_VERSION		DRM_IOWR(0x00, struct drm_version)
+#define DRM_IOCTL_GET_UNIQUE		DRM_IOWR(0x01, struct drm_unique)
+#define DRM_IOCTL_GET_MAGIC		DRM_IOR( 0x02, struct drm_auth)
+#define DRM_IOCTL_IRQ_BUSID		DRM_IOWR(0x03, struct drm_irq_busid)
+#define DRM_IOCTL_GET_MAP               DRM_IOWR(0x04, struct drm_map)
+#define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
+#define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
+#define DRM_IOCTL_SET_VERSION		DRM_IOWR(0x07, struct drm_set_version)
+#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08, struct drm_modeset_ctl)
+/**
+ * DRM_IOCTL_GEM_CLOSE - Close a GEM handle.
+ *
+ * GEM handles are not reference-counted by the kernel. User-space is
+ * responsible for managing their lifetime. For example, if user-space imports
+ * the same memory object twice on the same DRM file description, the same GEM
+ * handle is returned by both imports, and user-space needs to ensure
+ * &DRM_IOCTL_GEM_CLOSE is performed once only. The same situation can happen
+ * when a memory object is allocated, then exported and imported again on the
+ * same DRM file description. The &DRM_IOCTL_MODE_GETFB2 IOCTL is an exception
+ * and always returns fresh new GEM handles even if an existing GEM handle
+ * already refers to the same memory object before the IOCTL is performed.
+ */
+#define DRM_IOCTL_GEM_CLOSE		DRM_IOW (0x09, struct drm_gem_close)
+#define DRM_IOCTL_GEM_FLINK		DRM_IOWR(0x0a, struct drm_gem_flink)
+#define DRM_IOCTL_GEM_OPEN		DRM_IOWR(0x0b, struct drm_gem_open)
+#define DRM_IOCTL_GET_CAP		DRM_IOWR(0x0c, struct drm_get_cap)
+#define DRM_IOCTL_SET_CLIENT_CAP	DRM_IOW( 0x0d, struct drm_set_client_cap)
+
+#define DRM_IOCTL_SET_UNIQUE		DRM_IOW( 0x10, struct drm_unique)
+#define DRM_IOCTL_AUTH_MAGIC		DRM_IOW( 0x11, struct drm_auth)
+#define DRM_IOCTL_BLOCK			DRM_IOWR(0x12, struct drm_block)
+#define DRM_IOCTL_UNBLOCK		DRM_IOWR(0x13, struct drm_block)
+#define DRM_IOCTL_CONTROL		DRM_IOW( 0x14, struct drm_control)
+#define DRM_IOCTL_ADD_MAP		DRM_IOWR(0x15, struct drm_map)
+#define DRM_IOCTL_ADD_BUFS		DRM_IOWR(0x16, struct drm_buf_desc)
+#define DRM_IOCTL_MARK_BUFS		DRM_IOW( 0x17, struct drm_buf_desc)
+#define DRM_IOCTL_INFO_BUFS		DRM_IOWR(0x18, struct drm_buf_info)
+#define DRM_IOCTL_MAP_BUFS		DRM_IOWR(0x19, struct drm_buf_map)
+#define DRM_IOCTL_FREE_BUFS		DRM_IOW( 0x1a, struct drm_buf_free)
+
+#define DRM_IOCTL_RM_MAP		DRM_IOW( 0x1b, struct drm_map)
+
+#define DRM_IOCTL_SET_SAREA_CTX		DRM_IOW( 0x1c, struct drm_ctx_priv_map)
+#define DRM_IOCTL_GET_SAREA_CTX 	DRM_IOWR(0x1d, struct drm_ctx_priv_map)
+
+#define DRM_IOCTL_SET_MASTER            DRM_IO(0x1e)
+#define DRM_IOCTL_DROP_MASTER           DRM_IO(0x1f)
+
+#define DRM_IOCTL_ADD_CTX		DRM_IOWR(0x20, struct drm_ctx)
+#define DRM_IOCTL_RM_CTX		DRM_IOWR(0x21, struct drm_ctx)
+#define DRM_IOCTL_MOD_CTX		DRM_IOW( 0x22, struct drm_ctx)
+#define DRM_IOCTL_GET_CTX		DRM_IOWR(0x23, struct drm_ctx)
+#define DRM_IOCTL_SWITCH_CTX		DRM_IOW( 0x24, struct drm_ctx)
+#define DRM_IOCTL_NEW_CTX		DRM_IOW( 0x25, struct drm_ctx)
+#define DRM_IOCTL_RES_CTX		DRM_IOWR(0x26, struct drm_ctx_res)
+#define DRM_IOCTL_ADD_DRAW		DRM_IOWR(0x27, struct drm_draw)
+#define DRM_IOCTL_RM_DRAW		DRM_IOWR(0x28, struct drm_draw)
+#define DRM_IOCTL_DMA			DRM_IOWR(0x29, struct drm_dma)
+#define DRM_IOCTL_LOCK			DRM_IOW( 0x2a, struct drm_lock)
+#define DRM_IOCTL_UNLOCK		DRM_IOW( 0x2b, struct drm_lock)
+#define DRM_IOCTL_FINISH		DRM_IOW( 0x2c, struct drm_lock)
+
+/**
+ * DRM_IOCTL_PRIME_HANDLE_TO_FD - Convert a GEM handle to a DMA-BUF FD.
+ *
+ * User-space sets &drm_prime_handle.handle with the GEM handle to export and
+ * &drm_prime_handle.flags, and gets back a DMA-BUF file descriptor in
+ * &drm_prime_handle.fd.
+ *
+ * The export can fail for any driver-specific reason, e.g. because export is
+ * not supported for this specific GEM handle (but might be for others).
+ *
+ * Support for exporting DMA-BUFs is advertised via &DRM_PRIME_CAP_EXPORT.
+ */
+#define DRM_IOCTL_PRIME_HANDLE_TO_FD    DRM_IOWR(0x2d, struct drm_prime_handle)
+/**
+ * DRM_IOCTL_PRIME_FD_TO_HANDLE - Convert a DMA-BUF FD to a GEM handle.
+ *
+ * User-space sets &drm_prime_handle.fd with a DMA-BUF file descriptor to
+ * import, and gets back a GEM handle in &drm_prime_handle.handle.
+ * &drm_prime_handle.flags is unused.
+ *
+ * If an existing GEM handle refers to the memory object backing the DMA-BUF,
+ * that GEM handle is returned. Therefore user-space which needs to handle
+ * arbitrary DMA-BUFs must have a user-space lookup data structure to manually
+ * reference-count duplicated GEM handles. For more information see
+ * &DRM_IOCTL_GEM_CLOSE.
+ *
+ * The import can fail for any driver-specific reason, e.g. because import is
+ * only supported for DMA-BUFs allocated on this DRM device.
+ *
+ * Support for importing DMA-BUFs is advertised via &DRM_PRIME_CAP_IMPORT.
+ */
+#define DRM_IOCTL_PRIME_FD_TO_HANDLE    DRM_IOWR(0x2e, struct drm_prime_handle)
+
+#define DRM_IOCTL_AGP_ACQUIRE		DRM_IO(  0x30)
+#define DRM_IOCTL_AGP_RELEASE		DRM_IO(  0x31)
+#define DRM_IOCTL_AGP_ENABLE		DRM_IOW( 0x32, struct drm_agp_mode)
+#define DRM_IOCTL_AGP_INFO		DRM_IOR( 0x33, struct drm_agp_info)
+#define DRM_IOCTL_AGP_ALLOC		DRM_IOWR(0x34, struct drm_agp_buffer)
+#define DRM_IOCTL_AGP_FREE		DRM_IOW( 0x35, struct drm_agp_buffer)
+#define DRM_IOCTL_AGP_BIND		DRM_IOW( 0x36, struct drm_agp_binding)
+#define DRM_IOCTL_AGP_UNBIND		DRM_IOW( 0x37, struct drm_agp_binding)
+
+#define DRM_IOCTL_SG_ALLOC		DRM_IOWR(0x38, struct drm_scatter_gather)
+#define DRM_IOCTL_SG_FREE		DRM_IOW( 0x39, struct drm_scatter_gather)
+
+#define DRM_IOCTL_WAIT_VBLANK		DRM_IOWR(0x3a, union drm_wait_vblank)
+
+#define DRM_IOCTL_CRTC_GET_SEQUENCE	DRM_IOWR(0x3b, struct drm_crtc_get_sequence)
+#define DRM_IOCTL_CRTC_QUEUE_SEQUENCE	DRM_IOWR(0x3c, struct drm_crtc_queue_sequence)
+
+#define DRM_IOCTL_UPDATE_DRAW		DRM_IOW(0x3f, struct drm_update_draw)
+
+#define DRM_IOCTL_MODE_GETRESOURCES	DRM_IOWR(0xA0, struct drm_mode_card_res)
+#define DRM_IOCTL_MODE_GETCRTC		DRM_IOWR(0xA1, struct drm_mode_crtc)
+#define DRM_IOCTL_MODE_SETCRTC		DRM_IOWR(0xA2, struct drm_mode_crtc)
+#define DRM_IOCTL_MODE_CURSOR		DRM_IOWR(0xA3, struct drm_mode_cursor)
+#define DRM_IOCTL_MODE_GETGAMMA		DRM_IOWR(0xA4, struct drm_mode_crtc_lut)
+#define DRM_IOCTL_MODE_SETGAMMA		DRM_IOWR(0xA5, struct drm_mode_crtc_lut)
+#define DRM_IOCTL_MODE_GETENCODER	DRM_IOWR(0xA6, struct drm_mode_get_encoder)
+#define DRM_IOCTL_MODE_GETCONNECTOR	DRM_IOWR(0xA7, struct drm_mode_get_connector)
+#define DRM_IOCTL_MODE_ATTACHMODE	DRM_IOWR(0xA8, struct drm_mode_mode_cmd) /* deprecated (never worked) */
+#define DRM_IOCTL_MODE_DETACHMODE	DRM_IOWR(0xA9, struct drm_mode_mode_cmd) /* deprecated (never worked) */
+
+#define DRM_IOCTL_MODE_GETPROPERTY	DRM_IOWR(0xAA, struct drm_mode_get_property)
+#define DRM_IOCTL_MODE_SETPROPERTY	DRM_IOWR(0xAB, struct drm_mode_connector_set_property)
+#define DRM_IOCTL_MODE_GETPROPBLOB	DRM_IOWR(0xAC, struct drm_mode_get_blob)
+#define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
+#define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
+/**
+ * DRM_IOCTL_MODE_RMFB - Remove a framebuffer.
+ *
+ * This removes a framebuffer previously added via ADDFB/ADDFB2. The IOCTL
+ * argument is a framebuffer object ID.
+ *
+ * Warning: removing a framebuffer currently in-use on an enabled plane will
+ * disable that plane. The CRTC the plane is linked to may also be disabled
+ * (depending on driver capabilities).
+ */
+#define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)
+#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
+#define DRM_IOCTL_MODE_DIRTYFB		DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)
+
+/**
+ * DRM_IOCTL_MODE_CREATE_DUMB - Create a new dumb buffer object.
+ *
+ * KMS dumb buffers provide a very primitive way to allocate a buffer object
+ * suitable for scanout and map it for software rendering. KMS dumb buffers are
+ * not suitable for hardware-accelerated rendering nor video decoding. KMS dumb
+ * buffers are not suitable to be displayed on any other device than the KMS
+ * device where they were allocated from. Also see
+ * :ref:`kms_dumb_buffer_objects`.
+ *
+ * The IOCTL argument is a struct drm_mode_create_dumb.
+ *
+ * User-space is expected to create a KMS dumb buffer via this IOCTL, then add
+ * it as a KMS framebuffer via &DRM_IOCTL_MODE_ADDFB and map it via
+ * &DRM_IOCTL_MODE_MAP_DUMB.
+ *
+ * &DRM_CAP_DUMB_BUFFER indicates whether this IOCTL is supported.
+ * &DRM_CAP_DUMB_PREFERRED_DEPTH and &DRM_CAP_DUMB_PREFER_SHADOW indicate
+ * driver preferences for dumb buffers.
+ */
+#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb)
+#define DRM_IOCTL_MODE_MAP_DUMB    DRM_IOWR(0xB3, struct drm_mode_map_dumb)
+#define DRM_IOCTL_MODE_DESTROY_DUMB    DRM_IOWR(0xB4, struct drm_mode_destroy_dumb)
+#define DRM_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xB5, struct drm_mode_get_plane_res)
+#define DRM_IOCTL_MODE_GETPLANE	DRM_IOWR(0xB6, struct drm_mode_get_plane)
+#define DRM_IOCTL_MODE_SETPLANE	DRM_IOWR(0xB7, struct drm_mode_set_plane)
+#define DRM_IOCTL_MODE_ADDFB2		DRM_IOWR(0xB8, struct drm_mode_fb_cmd2)
+#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES	DRM_IOWR(0xB9, struct drm_mode_obj_get_properties)
+#define DRM_IOCTL_MODE_OBJ_SETPROPERTY	DRM_IOWR(0xBA, struct drm_mode_obj_set_property)
+#define DRM_IOCTL_MODE_CURSOR2		DRM_IOWR(0xBB, struct drm_mode_cursor2)
+#define DRM_IOCTL_MODE_ATOMIC		DRM_IOWR(0xBC, struct drm_mode_atomic)
+#define DRM_IOCTL_MODE_CREATEPROPBLOB	DRM_IOWR(0xBD, struct drm_mode_create_blob)
+#define DRM_IOCTL_MODE_DESTROYPROPBLOB	DRM_IOWR(0xBE, struct drm_mode_destroy_blob)
+
+#define DRM_IOCTL_SYNCOBJ_CREATE	DRM_IOWR(0xBF, struct drm_syncobj_create)
+#define DRM_IOCTL_SYNCOBJ_DESTROY	DRM_IOWR(0xC0, struct drm_syncobj_destroy)
+#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD	DRM_IOWR(0xC1, struct drm_syncobj_handle)
+#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE	DRM_IOWR(0xC2, struct drm_syncobj_handle)
+#define DRM_IOCTL_SYNCOBJ_WAIT		DRM_IOWR(0xC3, struct drm_syncobj_wait)
+#define DRM_IOCTL_SYNCOBJ_RESET		DRM_IOWR(0xC4, struct drm_syncobj_array)
+#define DRM_IOCTL_SYNCOBJ_SIGNAL	DRM_IOWR(0xC5, struct drm_syncobj_array)
+
+#define DRM_IOCTL_MODE_CREATE_LEASE	DRM_IOWR(0xC6, struct drm_mode_create_lease)
+#define DRM_IOCTL_MODE_LIST_LESSEES	DRM_IOWR(0xC7, struct drm_mode_list_lessees)
+#define DRM_IOCTL_MODE_GET_LEASE	DRM_IOWR(0xC8, struct drm_mode_get_lease)
+#define DRM_IOCTL_MODE_REVOKE_LEASE	DRM_IOWR(0xC9, struct drm_mode_revoke_lease)
+
+#define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT	DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait)
+#define DRM_IOCTL_SYNCOBJ_QUERY		DRM_IOWR(0xCB, struct drm_syncobj_timeline_array)
+#define DRM_IOCTL_SYNCOBJ_TRANSFER	DRM_IOWR(0xCC, struct drm_syncobj_transfer)
+#define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL	DRM_IOWR(0xCD, struct drm_syncobj_timeline_array)
+
+/**
+ * DRM_IOCTL_MODE_GETFB2 - Get framebuffer metadata.
+ *
+ * This queries metadata about a framebuffer. User-space fills
+ * &drm_mode_fb_cmd2.fb_id as the input, and the kernels fills the rest of the
+ * struct as the output.
+ *
+ * If the client is DRM master or has &CAP_SYS_ADMIN, &drm_mode_fb_cmd2.handles
+ * will be filled with GEM buffer handles. Fresh new GEM handles are always
+ * returned, even if another GEM handle referring to the same memory object
+ * already exists on the DRM file description. The caller is responsible for
+ * removing the new handles, e.g. via the &DRM_IOCTL_GEM_CLOSE IOCTL. The same
+ * new handle will be returned for multiple planes in case they use the same
+ * memory object. Planes are valid until one has a zero handle -- this can be
+ * used to compute the number of planes.
+ *
+ * Otherwise, &drm_mode_fb_cmd2.handles will be zeroed and planes are valid
+ * until one has a zero &drm_mode_fb_cmd2.pitches.
+ *
+ * If the framebuffer has a format modifier, &DRM_MODE_FB_MODIFIERS will be set
+ * in &drm_mode_fb_cmd2.flags and &drm_mode_fb_cmd2.modifier will contain the
+ * modifier. Otherwise, user-space must ignore &drm_mode_fb_cmd2.modifier.
+ *
+ * To obtain DMA-BUF FDs for each plane without leaking GEM handles, user-space
+ * can export each handle via &DRM_IOCTL_PRIME_HANDLE_TO_FD, then immediately
+ * close each unique handle via &DRM_IOCTL_GEM_CLOSE, making sure to not
+ * double-close handles which are specified multiple times in the array.
+ */
+#define DRM_IOCTL_MODE_GETFB2		DRM_IOWR(0xCE, struct drm_mode_fb_cmd2)
+
+#define DRM_IOCTL_SYNCOBJ_EVENTFD	DRM_IOWR(0xCF, struct drm_syncobj_eventfd)
+
+/**
+ * DRM_IOCTL_MODE_CLOSEFB - Close a framebuffer.
+ *
+ * This closes a framebuffer previously added via ADDFB/ADDFB2. The IOCTL
+ * argument is a framebuffer object ID.
+ *
+ * This IOCTL is similar to &DRM_IOCTL_MODE_RMFB, except it doesn't disable
+ * planes and CRTCs. As long as the framebuffer is used by a plane, it's kept
+ * alive. When the plane no longer uses the framebuffer (because the
+ * framebuffer is replaced with another one, or the plane is disabled), the
+ * framebuffer is cleaned up.
+ *
+ * This is useful to implement flicker-free transitions between two processes.
+ *
+ * Depending on the threat model, user-space may want to ensure that the
+ * framebuffer doesn't expose any sensitive user information: closed
+ * framebuffers attached to a plane can be read back by the next DRM master.
+ */
+#define DRM_IOCTL_MODE_CLOSEFB		DRM_IOWR(0xD0, struct drm_mode_closefb)
+
+/**
+ * DRM_IOCTL_SET_CLIENT_NAME - Attach a name to a drm_file
+ *
+ * Having a name allows for easier tracking and debugging.
+ * The length of the name (without null ending char) must be
+ * <= DRM_CLIENT_NAME_MAX_LEN.
+ * The call will fail if the name contains whitespaces or non-printable chars.
+ */
+#define DRM_IOCTL_SET_CLIENT_NAME	DRM_IOWR(0xD1, struct drm_set_client_name)
+
+/**
+ * DRM_IOCTL_GEM_CHANGE_HANDLE - Move an object to a different handle
+ *
+ * Some applications (notably CRIU) need objects to have specific gem handles.
+ * This ioctl changes the object at one gem handle to use a new gem handle.
+ */
+#define DRM_IOCTL_GEM_CHANGE_HANDLE    DRM_IOWR(0xD2, struct drm_gem_change_handle)
+
+/*
+ * Device specific ioctls should only be in their respective headers
+ * The device specific ioctl range is from 0x40 to 0x9f.
+ * Generic IOCTLS restart at 0xA0.
+ *
+ * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and
+ * drmCommandReadWrite().
+ */
+#define DRM_COMMAND_BASE                0x40
+#define DRM_COMMAND_END			0xA0
+
+/**
+ * struct drm_event - Header for DRM events
+ * @type: event type.
+ * @length: total number of payload bytes (including header).
+ *
+ * This struct is a header for events written back to user-space on the DRM FD.
+ * A read on the DRM FD will always only return complete events: e.g. if the
+ * read buffer is 100 bytes large and there are two 64 byte events pending,
+ * only one will be returned.
+ *
+ * Event types 0 - 0x7fffffff are generic DRM events, 0x80000000 and
+ * up are chipset specific. Generic DRM events include &DRM_EVENT_VBLANK,
+ * &DRM_EVENT_FLIP_COMPLETE and &DRM_EVENT_CRTC_SEQUENCE.
+ */
+struct drm_event {
+	__u32 type;
+	__u32 length;
+};
+
+/**
+ * DRM_EVENT_VBLANK - vertical blanking event
+ *
+ * This event is sent in response to &DRM_IOCTL_WAIT_VBLANK with the
+ * &_DRM_VBLANK_EVENT flag set.
+ *
+ * The event payload is a struct drm_event_vblank.
+ */
+#define DRM_EVENT_VBLANK 0x01
+/**
+ * DRM_EVENT_FLIP_COMPLETE - page-flip completion event
+ *
+ * This event is sent in response to an atomic commit or legacy page-flip with
+ * the &DRM_MODE_PAGE_FLIP_EVENT flag set.
+ *
+ * The event payload is a struct drm_event_vblank.
+ */
+#define DRM_EVENT_FLIP_COMPLETE 0x02
+/**
+ * DRM_EVENT_CRTC_SEQUENCE - CRTC sequence event
+ *
+ * This event is sent in response to &DRM_IOCTL_CRTC_QUEUE_SEQUENCE.
+ *
+ * The event payload is a struct drm_event_crtc_sequence.
+ */
+#define DRM_EVENT_CRTC_SEQUENCE	0x03
+
+struct drm_event_vblank {
+	struct drm_event base;
+	__u64 user_data;
+	__u32 tv_sec;
+	__u32 tv_usec;
+	__u32 sequence;
+	__u32 crtc_id; /* 0 on older kernels that do not support this */
+};
+
+/* Event delivered at sequence. Time stamp marks when the first pixel
+ * of the refresh cycle leaves the display engine for the display
+ */
+struct drm_event_crtc_sequence {
+	struct drm_event	base;
+	__u64			user_data;
+	__s64			time_ns;
+	__u64			sequence;
+};
+
+/* typedef area */
+#ifndef __KERNEL__
+typedef struct drm_clip_rect drm_clip_rect_t;
+typedef struct drm_drawable_info drm_drawable_info_t;
+typedef struct drm_tex_region drm_tex_region_t;
+typedef struct drm_hw_lock drm_hw_lock_t;
+typedef struct drm_version drm_version_t;
+typedef struct drm_unique drm_unique_t;
+typedef struct drm_list drm_list_t;
+typedef struct drm_block drm_block_t;
+typedef struct drm_control drm_control_t;
+typedef enum drm_map_type drm_map_type_t;
+typedef enum drm_map_flags drm_map_flags_t;
+typedef struct drm_ctx_priv_map drm_ctx_priv_map_t;
+typedef struct drm_map drm_map_t;
+typedef struct drm_client drm_client_t;
+typedef enum drm_stat_type drm_stat_type_t;
+typedef struct drm_stats drm_stats_t;
+typedef enum drm_lock_flags drm_lock_flags_t;
+typedef struct drm_lock drm_lock_t;
+typedef enum drm_dma_flags drm_dma_flags_t;
+typedef struct drm_buf_desc drm_buf_desc_t;
+typedef struct drm_buf_info drm_buf_info_t;
+typedef struct drm_buf_free drm_buf_free_t;
+typedef struct drm_buf_pub drm_buf_pub_t;
+typedef struct drm_buf_map drm_buf_map_t;
+typedef struct drm_dma drm_dma_t;
+typedef union drm_wait_vblank drm_wait_vblank_t;
+typedef struct drm_agp_mode drm_agp_mode_t;
+typedef enum drm_ctx_flags drm_ctx_flags_t;
+typedef struct drm_ctx drm_ctx_t;
+typedef struct drm_ctx_res drm_ctx_res_t;
+typedef struct drm_draw drm_draw_t;
+typedef struct drm_update_draw drm_update_draw_t;
+typedef struct drm_auth drm_auth_t;
+typedef struct drm_irq_busid drm_irq_busid_t;
+typedef enum drm_vblank_seq_type drm_vblank_seq_type_t;
+
+typedef struct drm_agp_buffer drm_agp_buffer_t;
+typedef struct drm_agp_binding drm_agp_binding_t;
+typedef struct drm_agp_info drm_agp_info_t;
+typedef struct drm_scatter_gather drm_scatter_gather_t;
+typedef struct drm_set_version drm_set_version_t;
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif

From db0ec806d12d1435fbf2ccbcac05ec878fe0f401 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Wed, 12 Feb 2025 09:29:21 -0500
Subject: [PATCH 1813/1854] plugin/amdgpu: Add handling for amdgpu drm buffer
 objects

Buffer objects held by the amdgpu drm driver are checkpointed with
the new BO_INFO and MAPPING_INFO ioctls/ioctl options. Handling
is in amdgpu_plugin_drm.h

Handling of imported buffer objects may require dmabuf fds to be
transferred between processes. These occur over fdstore, with the
handle-fstore id relationships kept in shread memory. There is a
new plugin callback: RESTORE_INIT to create the shared memory.

During checkpoint, track shared buffer objects, so that buffer objects
that are shared across processes can be identified.

During restore, track which buffer objects have been restored. Retry
restore of a drm file if a buffer object is imported and the
original has not been exported yet. Skip buffer objects that have
already been completed or cannot be completed in the current restore.

So drm code can use sdma_copy_bo, that function no longer requires
kfd bo structs

Update the protobuf messages with new amdgpu drm information.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 criu/include/criu-plugin.h          |   3 +
 criu/plugin.c                       |  13 +-
 criu/servicefd.c                    |   2 +-
 plugins/amdgpu/amdgpu_plugin.c      | 281 ++++++++++++++--
 plugins/amdgpu/amdgpu_plugin_drm.c  | 487 +++++++++++++++++++++++++++-
 plugins/amdgpu/amdgpu_plugin_drm.h  |  12 +
 plugins/amdgpu/amdgpu_plugin_util.c |  84 +++++
 plugins/amdgpu/amdgpu_plugin_util.h |  39 ++-
 plugins/amdgpu/criu-amdgpu.proto    |  25 ++
 9 files changed, 900 insertions(+), 46 deletions(-)

diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index ee84ccdf6..977dad655 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -62,6 +62,8 @@ enum {
 
 	CR_PLUGIN_HOOK__POST_FORKING = 12,
 
+	CR_PLUGIN_HOOK__RESTORE_INIT = 13,
+
 	CR_PLUGIN_HOOK__MAX
 };
 
@@ -81,6 +83,7 @@ DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__PAUSE_DEVICES, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__POST_FORKING, void);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_INIT, void);
 
 enum {
 	CR_PLUGIN_STAGE__DUMP,
diff --git a/criu/plugin.c b/criu/plugin.c
index 18da0499d..a2057e9c1 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -60,6 +60,7 @@ static cr_plugin_desc_t *cr_gen_plugin_desc(void *h, char *path)
 	__assign_hook(PAUSE_DEVICES, "cr_plugin_pause_devices");
 	__assign_hook(CHECKPOINT_DEVICES, "cr_plugin_checkpoint_devices");
 	__assign_hook(POST_FORKING, "cr_plugin_post_forking");
+	__assign_hook(RESTORE_INIT, "cr_plugin_restore_init");
 
 #undef __assign_hook
 
@@ -257,8 +258,16 @@ int cr_plugin_init(int stage)
 			goto err;
 	}
 
-	if (stage == CR_PLUGIN_STAGE__RESTORE && check_inventory_plugins())
-		goto err;
+	if (stage == CR_PLUGIN_STAGE__RESTORE) {
+		int ret;
+
+		if (check_inventory_plugins())
+			goto err;
+
+		ret = run_plugins(RESTORE_INIT);
+		if (ret < 0 && ret != -ENOTSUP)
+			goto err;
+	}
 
 	exit_code = 0;
 err:
diff --git a/criu/servicefd.c b/criu/servicefd.c
index 06a8d3eba..dfb019066 100644
--- a/criu/servicefd.c
+++ b/criu/servicefd.c
@@ -313,4 +313,4 @@ int clone_service_fd(struct pstree_item *me)
 	ret = 0;
 
 	return ret;
-}
+}
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index e3b4ead3f..4be8421a0 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -12,6 +12,8 @@
 #include <sys/sysmacros.h>
 #include <sys/mman.h>
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 #include <stdint.h>
 #include <pthread.h>
 #include <semaphore.h>
@@ -23,12 +25,17 @@
 #include "criu-plugin.h"
 #include "plugin.h"
 #include "criu-amdgpu.pb-c.h"
+#include "util.h"
+#include "util-pie.h"
+#include "fdstore.h"
 
 #include "kfd_ioctl.h"
 #include "xmalloc.h"
 #include "criu-log.h"
 #include "files.h"
 #include "pstree.h"
+#include "sockets.h"
+#include "rst-malloc.h"
 
 #include "common/list.h"
 #include "amdgpu_plugin_drm.h"
@@ -66,6 +73,19 @@ bool plugin_added_to_inventory = false;
 
 bool plugin_disabled = false;
 
+struct handle_id {
+	int handle;
+	int fdstore_id;
+};
+struct shared_handle_ids {
+	int num_handles;
+	struct handle_id *handles;
+};
+struct shared_handle_ids *shared_memory = NULL;
+
+static mutex_t *shared_memory_mutex;
+
+int current_pid;
 /*
  * In the case of a single process (common case), this optimization can effectively
  * reduce the restore latency with parallel restore. In the case of multiple processes,
@@ -526,11 +546,11 @@ void free_and_unmap(uint64_t size, amdgpu_bo_handle h_bo, amdgpu_va_handle h_va,
 	amdgpu_bo_free(h_bo);
 }
 
-static int sdma_copy_bo(struct kfd_criu_bo_bucket bo_bucket, FILE *storage_fp,
-						void *buffer, size_t buffer_size, amdgpu_device_handle h_dev,
-						uint64_t max_copy_size, enum sdma_op_type type)
+int sdma_copy_bo(int shared_fd, uint64_t size, FILE *storage_fp,
+		 void *buffer, size_t buffer_size, amdgpu_device_handle h_dev,
+		 uint64_t max_copy_size, enum sdma_op_type type, bool do_not_free)
 {
-	uint64_t size, src_bo_size, dst_bo_size, buffer_bo_size, bytes_remain, buffer_space_remain;
+	uint64_t src_bo_size, dst_bo_size, buffer_bo_size, bytes_remain, buffer_space_remain;
 	uint64_t gpu_addr_src, gpu_addr_dst, gpu_addr_ib, copy_src, copy_dst, copy_size;
 	amdgpu_va_handle h_va_src, h_va_dst, h_va_ib;
 	amdgpu_bo_handle h_bo_src, h_bo_dst, h_bo_ib;
@@ -543,10 +563,8 @@ static int sdma_copy_bo(struct kfd_criu_bo_bucket bo_bucket, FILE *storage_fp,
 	uint32_t expired;
 	amdgpu_context_handle h_ctx;
 	uint32_t *ib = NULL;
-	int j, err, shared_fd, packets_per_buffer;
+	int j, err, packets_per_buffer;
 
-	shared_fd = bo_bucket.dmabuf_fd;
-	size = bo_bucket.size;
 	buffer_bo_size = min(size, buffer_size);
 	packets_per_buffer = ((buffer_bo_size - 1) / max_copy_size) + 1;
 	src_bo_size = (type == SDMA_OP_VRAM_WRITE) ? buffer_bo_size : size;
@@ -757,7 +775,8 @@ err_dst_bo_map:
 	if (err)
 		pr_perror("dest range free failed");
 err_dst_va:
-	err = amdgpu_bo_free(h_bo_dst);
+	if (!do_not_free)
+		err = amdgpu_bo_free(h_bo_dst);
 	if (err)
 		pr_perror("dest bo free failed");
 err_dst_bo_prep:
@@ -845,8 +864,9 @@ void *dump_bo_contents(void *_thread_data)
 		num_bos++;
 
 		/* perform sDMA based vram copy */
-		ret = sdma_copy_bo(bo_buckets[i], bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
-				   SDMA_OP_VRAM_READ);
+		ret = sdma_copy_bo(bo_buckets[i].dmabuf_fd, bo_buckets[i].size, bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
+				   SDMA_OP_VRAM_READ, false);
+
 		if (ret) {
 			pr_err("Failed to drain the BO using sDMA: bo_buckets[%d]\n", i);
 			break;
@@ -943,8 +963,8 @@ void *restore_bo_contents(void *_thread_data)
 
 		num_bos++;
 
-		ret = sdma_copy_bo(bo_buckets[i], bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
-				   SDMA_OP_VRAM_WRITE);
+		ret = sdma_copy_bo(bo_buckets[i].dmabuf_fd, bo_buckets[i].size, bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
+				   SDMA_OP_VRAM_WRITE, false);
 		if (ret) {
 			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
 			break;
@@ -1053,6 +1073,134 @@ exit:
 	return ret;
 }
 
+int store_dmabuf_fd(int handle, int fd)
+{
+	int id;
+
+	id = fdstore_add(fd);
+	mutex_lock(shared_memory_mutex);
+	for (int i = 0; i < shared_memory->num_handles; i++) {
+		if (shared_memory->handles[i].handle == handle) {
+			mutex_unlock(shared_memory_mutex);
+			return 0;
+		}
+		if (shared_memory->handles[i].handle == -1) {
+			shared_memory->handles[i].handle = handle;
+			shared_memory->handles[i].fdstore_id = id;
+			mutex_unlock(shared_memory_mutex);
+			return 0;
+		}
+	}
+	mutex_unlock(shared_memory_mutex);
+
+	return -1;
+}
+
+int amdgpu_id_for_handle(int handle)
+{
+	mutex_lock(shared_memory_mutex);
+	for (int i = 0; i < shared_memory->num_handles; i++) {
+		if (shared_memory->handles[i].handle == handle) {
+			mutex_unlock(shared_memory_mutex);
+			return shared_memory->handles[i].fdstore_id;
+		}
+	}
+	mutex_unlock(shared_memory_mutex);
+	return -1;
+}
+
+int amdgpu_restore_init(void)
+{
+	if (!shared_memory) {
+		int protection = PROT_READ | PROT_WRITE;
+		int visibility = MAP_SHARED | MAP_ANONYMOUS;
+		size_t img_size;
+		FILE *img_fp = NULL;
+		int ret;
+		unsigned char *buf;
+		int num_handles = 0;
+		char img_path[PATH_MAX];
+		CriuRenderNode *rd = NULL;
+		CriuKfd *e = NULL;
+
+		DIR *d;
+		struct dirent *dir;
+		d = opendir(".");
+		if (d) {
+			while ((dir = readdir(d)) != NULL) {
+				if (strncmp("amdgpu-kfd-", dir->d_name, strlen("amdgpu-kfd-")) == 0) {
+					pr_info("CC3: Found kfd file\n");
+					img_fp = open_img_file(dir->d_name, false, &img_size);
+					buf = xmalloc(img_size);
+					if (!buf) {
+						fclose(img_fp);
+						return -ENOMEM;
+					}
+
+					ret = read_fp(img_fp, buf, img_size);
+					if (ret) {
+						pr_perror("Unable to read from %s", img_path);
+						fclose(img_fp);
+						xfree(buf);
+						return ret;
+					}
+
+					fclose(img_fp);
+					e = criu_kfd__unpack(NULL, img_size, buf);
+					num_handles += e->num_of_bos;
+					criu_kfd__free_unpacked(e, NULL);
+					xfree(buf);
+				}
+				if (strncmp("amdgpu-renderD-", dir->d_name, strlen("amdgpu-renderD-")) == 0) {
+					pr_info("CC3: Found drm file\n");
+					img_fp = open_img_file(dir->d_name, false, &img_size);
+					buf = xmalloc(img_size);
+					if (!buf) {
+						fclose(img_fp);
+						return -ENOMEM;
+					}
+
+					ret = read_fp(img_fp, buf, img_size);
+					if (ret) {
+						pr_perror("Unable to read from %s", img_path);
+						fclose(img_fp);
+						xfree(buf);
+						return ret;
+					}
+
+					fclose(img_fp);
+					rd = criu_render_node__unpack(NULL, img_size, buf);
+					num_handles += rd->num_of_bos;
+					criu_render_node__free_unpacked(rd, NULL);
+					xfree(buf);
+				}
+			}
+			closedir(d);
+		}
+
+		if (num_handles > 0) {
+			shared_memory = mmap(NULL, sizeof(shared_memory), protection, visibility, -1, 0);
+			shared_memory->num_handles = num_handles;
+			shared_memory->handles = mmap(NULL, sizeof(struct handle_id) * num_handles, protection, visibility, -1, 0);
+
+			for (int i = 0; i < num_handles; i++) {
+				shared_memory->handles[i].handle = -1;
+				shared_memory->handles[i].fdstore_id = -1;
+			}
+
+			shared_memory_mutex = shmalloc(sizeof(*shared_memory_mutex));
+			if (!shared_memory_mutex) {
+				pr_err("Can't create amdgpu mutex\n");
+				return -1;
+			}
+			mutex_init(shared_memory_mutex);
+		}
+	}
+
+	return 0;
+}
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESTORE_INIT, amdgpu_restore_init)
+
 static int save_devices(int fd, struct kfd_ioctl_criu_args *args, struct kfd_criu_device_bucket *device_buckets,
 			CriuKfd *e)
 {
@@ -1095,6 +1243,8 @@ static int save_bos(int id, int fd, struct kfd_ioctl_criu_args *args, struct kfd
 {
 	struct thread_data *thread_datas;
 	int ret = 0, i;
+	amdgpu_device_handle h_dev;
+	uint32_t major, minor;
 
 	pr_debug("Dumping %d BOs\n", args->num_bos);
 
@@ -1118,6 +1268,19 @@ static int save_bos(int id, int fd, struct kfd_ioctl_criu_args *args, struct kfd
 		boinfo->size = bo_bucket->size;
 		boinfo->offset = bo_bucket->offset;
 		boinfo->alloc_flags = bo_bucket->alloc_flags;
+
+		ret = amdgpu_device_initialize(node_get_drm_render_device(sys_get_node_by_gpu_id(&src_topology, bo_bucket->gpu_id)), &major, &minor, &h_dev);
+
+		boinfo->handle = get_gem_handle(h_dev, bo_bucket->dmabuf_fd);
+
+		amdgpu_device_deinitialize(h_dev);
+	}
+	for (i = 0; i < e->num_of_bos; i++) {
+		KfdBoEntry *boinfo = e->bo_entries[i];
+
+		ret = record_shared_bo(boinfo->handle, false);
+		if (ret)
+			goto exit;
 	}
 
 	for (int i = 0; i < e->num_of_gpus; i++) {
@@ -1457,6 +1620,29 @@ static int restore_bos(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 	}
 
 	pr_info("Restore BOs Ok\n");
+
+	return 0;
+}
+
+int save_vma_updates(uint64_t offset, uint64_t addr, uint64_t restored_offset, int fd)
+{
+	struct vma_metadata *vma_md;
+
+	vma_md = xmalloc(sizeof(*vma_md));
+	if (!vma_md) {
+		return -ENOMEM;
+	}
+
+	memset(vma_md, 0, sizeof(*vma_md));
+
+	vma_md->old_pgoff = offset;
+	vma_md->vma_entry = addr;
+
+	vma_md->new_pgoff = restored_offset;
+	vma_md->fd = fd;
+
+	list_add_tail(&vma_md->list, &update_vma_info_list);
+
 	return 0;
 }
 
@@ -1691,8 +1877,18 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 		pr_info("render node destination gpu_id = 0x%04x\n", tp_node->gpu_id);
 
 		fd = node_get_drm_render_device(tp_node);
-		if (fd < 0)
+		if (fd < 0) {
 			pr_err("Failed to open render device (minor:%d)\n", tp_node->drm_render_minor);
+			return -1;
+		}
+
+		ret = amdgpu_plugin_drm_restore_file(fd, rd);
+		if (ret == 1)
+			*retry_needed = true;
+		if (ret < 0) {
+			fd = ret;
+			goto fail;
+		}
 	fail:
 		criu_render_node__free_unpacked(rd, NULL);
 		xfree(buf);
@@ -1704,12 +1900,20 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 		 * copy of the fd. CRIU core owns the duplicated returned fd, and amdgpu_plugin owns the fd stored in
 		 * tp_node.
 		 */
-		fd = dup(fd);
-		if (fd == -1) {
-			pr_perror("unable to duplicate the render fd");
-			return -1;
+
+		if (fd < 0)
+			return fd;
+
+		if (!(*retry_needed)) {
+			fd = dup(fd);
+			if (fd == -1) {
+				pr_perror("unable to duplicate the render fd");
+				return -1;
+			}
+			return fd;
 		}
-		return fd;
+
+		return 0;
 	}
 
 	fd = open(AMDGPU_KFD_DEVICE, O_RDWR | O_CLOEXEC);
@@ -1753,11 +1957,13 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 	 * This way, we know that the file descriptors we store will not conflict with file descriptors inside core
 	 * CRIU.
 	 */
-	fd_next = find_unused_fd_pid(e->pid);
-	if (fd_next <= 0) {
-		pr_err("Failed to find unused fd (fd:%d)\n", fd_next);
-		ret = -EINVAL;
-		goto exit;
+	if (fd_next == -1) {
+		fd_next = find_unused_fd_pid(e->pid);
+		if (fd_next <= 0) {
+			pr_err("Failed to find unused fd (fd:%d)\n", fd_next);
+			ret = -EINVAL;
+			goto exit;
+		}
 	}
 
 	ret = devinfo_to_topology(e->device_entries, e->num_of_gpus + e->num_of_cpus, &src_topology);
@@ -1790,14 +1996,26 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 	args.num_objects = e->num_of_objects;
 	args.priv_data_size = e->priv_data.len;
 	args.priv_data = (uintptr_t)e->priv_data.data;
-
 	args.op = KFD_CRIU_OP_RESTORE;
+
 	if (kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args) == -1) {
 		pr_perror("Restore ioctl failed");
 		ret = -1;
 		goto exit;
 	}
 
+	if (ret < 0)
+		goto exit;
+
+	for (int i = 0; i < args.num_bos; i++) {
+		struct kfd_criu_bo_bucket *bo_bucket = &((struct kfd_criu_bo_bucket *)args.bos)[i];
+		KfdBoEntry *bo_entry = e->bo_entries[i];
+
+		if (bo_entry->handle != -1) {
+			store_dmabuf_fd(bo_entry->handle, bo_bucket->dmabuf_fd);
+		}
+	}
+
 	ret = restore_bo_data(id, (struct kfd_criu_bo_bucket *)args.bos, e);
 	if (ret)
 		goto exit;
@@ -1940,19 +2158,14 @@ int amdgpu_plugin_resume_devices_late(int target_pid)
 		}
 	}
 
+	clear_restore_state();
+
 	close(fd);
 	return exit_code;
 }
 
 CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resume_devices_late)
 
-int sdma_copy_bo_helper(uint64_t size, int fd, FILE *storage_fp, void *buffer, size_t buffer_size,
-			amdgpu_device_handle h_dev, uint64_t max_copy_size, enum sdma_op_type type)
-{
-	return sdma_copy_bo((struct kfd_criu_bo_bucket){ 0, size, 0, 0, 0, 0, fd, 0 }, storage_fp, buffer,
-			    buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
-}
-
 int init_dev(int dev_minor, amdgpu_device_handle *h_dev, uint64_t *max_copy_size)
 {
 	int ret = 0;
@@ -2061,8 +2274,10 @@ void *parallel_restore_bo_contents(void *_thread_data)
 
 		entry = &restore_cmd->entries[i];
 		fseek(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
-		ret = sdma_copy_bo_helper(entry->size, restore_cmd->fds_write[entry->write_id], bo_contents_fp, buffer,
-					  buffer_size, h_dev, max_copy_size, SDMA_OP_VRAM_WRITE);
+		ret = sdma_copy_bo(restore_cmd->fds_write[entry->write_id], entry->size, bo_contents_fp,
+				   buffer, buffer_size, h_dev,
+				   max_copy_size, SDMA_OP_VRAM_WRITE, false);
+
 		if (ret) {
 			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
 			goto err_sdma;
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index d54cd937d..199dad21e 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -19,19 +19,112 @@
 
 #include <dirent.h>
 #include "common/list.h"
+#include "files.h"
+#include "fdstore.h"
 
 #include "criu-amdgpu.pb-c.h"
+#define __user
+#include "drm.h"
 
 #include <xf86drm.h>
 #include <libdrm/amdgpu.h>
 
 #include "xmalloc.h"
-#include "criu-log.h"
-#include "kfd_ioctl.h"
+#include "amdgpu_drm.h"
 #include "amdgpu_plugin_drm.h"
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
 
+#include "util.h"
+#include "common/scm.h"
+
+int get_gem_handle(amdgpu_device_handle h_dev, int dmabuf_fd)
+{
+	uint32_t handle;
+	int fd = amdgpu_device_get_fd(h_dev);
+
+	if (dmabuf_fd == -1) {
+		return -1;
+	}
+
+	drmPrimeFDToHandle(fd, dmabuf_fd, &handle);
+
+	return handle;
+}
+
+int drmIoctl(int fd, unsigned long request, void *arg)
+{
+	int ret, max_retries = 200;
+
+	do {
+		ret = ioctl(fd, request, arg);
+	} while (ret == -1 && max_retries-- > 0 && (errno == EINTR || errno == EAGAIN));
+
+	if (ret == -1 && errno == EBADF)
+		/* In case pthread_atfork didn't catch it, this will
+		 * make any subsequent hsaKmt calls fail in CHECK_KFD_OPEN.
+		 */
+		pr_perror("KFD file descriptor not valid in this process");
+	return ret;
+}
+
+static int allocate_bo_entries(CriuRenderNode *e, int num_bos)
+{
+	e->bo_entries = xmalloc(sizeof(DrmBoEntry *) * num_bos);
+	if (!e->bo_entries) {
+		pr_err("Failed to allocate bo_info\n");
+		return -ENOMEM;
+	}
+
+	for (int i = 0; i < num_bos; i++) {
+		DrmBoEntry *entry = xzalloc(sizeof(*entry));
+
+		if (!entry) {
+			pr_err("Failed to allocate botest\n");
+			return -ENOMEM;
+		}
+
+		drm_bo_entry__init(entry);
+
+		e->bo_entries[i] = entry;
+		e->n_bo_entries++;
+	}
+	return 0;
+}
+
+static int allocate_vm_entries(DrmBoEntry *e, int num_vms)
+{
+	e->vm_entries = xmalloc(sizeof(DrmVmEntry *) * num_vms);
+	if (!e->vm_entries) {
+		pr_err("Failed to allocate bo_info\n");
+		return -ENOMEM;
+	}
+
+	for (int i = 0; i < num_vms; i++) {
+		DrmVmEntry *entry = xzalloc(sizeof(*entry));
+
+		if (!entry) {
+			pr_err("Failed to allocate botest\n");
+			return -ENOMEM;
+		}
+
+		drm_vm_entry__init(entry);
+
+		e->vm_entries[i] = entry;
+		e->n_vm_entries++;
+	}
+	return 0;
+}
+
+static void free_e(CriuRenderNode *e)
+{
+	for (int i = 0; i < e->n_bo_entries; i++) {
+		if (e->bo_entries[i])
+			xfree(e->bo_entries[i]);
+	}
+
+	xfree(e);
+}
 
 int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *st)
 {
@@ -60,19 +153,260 @@ int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *st)
 	return 0;
 }
 
+static int restore_bo_contents_drm(int drm_render_minor, CriuRenderNode *rd, int drm_fd, int *dmabufs)
+{
+	size_t image_size = 0, max_bo_size = 0, buffer_size;
+	struct amdgpu_gpu_info gpu_info = { 0 };
+	amdgpu_device_handle h_dev;
+	uint64_t max_copy_size;
+	uint32_t major, minor;
+	FILE *bo_contents_fp = NULL;
+	void *buffer = NULL;
+	char img_path[40];
+	int num_bos = 0;
+	int i, ret = 0;
+
+	ret = amdgpu_device_initialize(drm_fd, &major, &minor, &h_dev);
+	if (ret) {
+		pr_perror("failed to initialize device");
+		goto exit;
+	}
+	plugin_log_msg("libdrm initialized successfully\n");
+
+	ret = amdgpu_query_gpu_info(h_dev, &gpu_info);
+	if (ret) {
+		pr_perror("failed to query gpuinfo via libdrm");
+		goto exit;
+	}
+
+	max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
+								   SDMA_LINEAR_COPY_MAX_SIZE - 1;
+
+	for (i = 0; i < rd->num_of_bos; i++) {
+		if (rd->bo_entries[i]->preferred_domains & (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)) {
+			if (rd->bo_entries[i]->size > max_bo_size)
+				max_bo_size = rd->bo_entries[i]->size;
+		}
+	}
+
+	buffer_size = max_bo_size;
+
+	posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), buffer_size);
+	if (!buffer) {
+		pr_perror("Failed to alloc aligned memory. Consider setting KFD_MAX_BUFFER_SIZE.");
+		ret = -ENOMEM;
+		goto exit;
+	}
+
+	for (i = 0; i < rd->num_of_bos; i++) {
+		if (!(rd->bo_entries[i]->preferred_domains & (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT)))
+			continue;
+
+		if (rd->bo_entries[i]->num_of_vms == 0)
+			continue;
+
+		num_bos++;
+
+		snprintf(img_path, sizeof(img_path), IMG_DRM_PAGES_FILE, rd->id, drm_render_minor, i);
+
+		bo_contents_fp = open_img_file(img_path, false, &image_size);
+
+		ret = sdma_copy_bo(dmabufs[i], rd->bo_entries[i]->size, bo_contents_fp, buffer, buffer_size, h_dev, max_copy_size,
+				   SDMA_OP_VRAM_WRITE, true);
+		if (ret) {
+			pr_err("Failed to fill the BO using sDMA: bo_buckets[%d]\n", i);
+			break;
+		}
+		plugin_log_msg("** Successfully filled the BO using sDMA: bo_buckets[%d] **\n", i);
+
+		if (bo_contents_fp)
+			fclose(bo_contents_fp);
+	}
+
+exit:
+	for (int i = 0; i < rd->num_of_bos; i++) {
+		if (dmabufs[i] != KFD_INVALID_FD)
+			close(dmabufs[i]);
+	}
+
+	xfree(buffer);
+
+	amdgpu_device_deinitialize(h_dev);
+	return ret;
+}
 
 int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
 {
-	CriuRenderNode rd = CRIU_RENDER_NODE__INIT;
-	struct tp_node *tp_node;
+	CriuRenderNode *rd = NULL;
 	char path[PATH_MAX];
 	unsigned char *buf;
 	int minor;
 	int len;
 	int ret;
+	size_t image_size;
+	struct tp_node *tp_node;
+	struct drm_amdgpu_gem_list_handles list_handles_args = { 0 };
+	struct drm_amdgpu_gem_list_handles_entry *list_handles_entries;
+	int num_bos;
+
+	rd = xmalloc(sizeof(*rd));
+	if (!rd) {
+		ret = -ENOMEM;
+		goto exit;
+	}
+	criu_render_node__init(rd);
 
 	/* Get the topology node of the DRM device */
 	minor = minor(drm->st_rdev);
+	rd->drm_render_minor = minor;
+	rd->id = id;
+
+	num_bos = 8;
+	list_handles_entries = xzalloc(sizeof(struct drm_amdgpu_gem_list_handles_entry) * num_bos);
+	list_handles_args.num_entries = num_bos;
+	list_handles_args.entries = (uintptr_t)list_handles_entries;
+
+	ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES, &list_handles_args);
+	if (ret && errno == EINVAL) {
+		pr_info("This kernel appears not to have AMDGPU_GEM_LIST_HANDLES ioctl. Consider disabling Dmabuf IPC or updating your kernel.\n");
+		list_handles_args.num_entries = 0;
+	} else if (ret) {
+		pr_perror("Failed to call bo info ioctl");
+		goto exit;
+	}
+
+	if (list_handles_args.num_entries > num_bos) {
+		num_bos = list_handles_args.num_entries;
+		xfree(list_handles_entries);
+		list_handles_entries = xzalloc(sizeof(struct drm_amdgpu_gem_list_handles_entry) * num_bos);
+		list_handles_args.num_entries = num_bos;
+		list_handles_args.entries = (uintptr_t)list_handles_entries;
+		ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES, &list_handles_args);
+		if (ret) {
+			pr_perror("Failed to call bo info ioctl");
+			goto exit;
+		}
+	} else {
+		num_bos = list_handles_args.num_entries;
+	}
+
+	rd->num_of_bos = num_bos;
+	ret = allocate_bo_entries(rd, num_bos);
+	if (ret)
+		goto exit;
+
+	for (int i = 0; i < num_bos; i++) {
+		int num_vm_entries = 8;
+		struct drm_amdgpu_gem_vm_entry *vm_info_entries;
+		struct drm_amdgpu_gem_op vm_info_args = { 0 };
+		DrmBoEntry *boinfo = rd->bo_entries[i];
+		struct drm_amdgpu_gem_list_handles_entry handle_entry = list_handles_entries[i];
+		union drm_amdgpu_gem_mmap mmap_args = { 0 };
+		int dmabuf_fd;
+		uint32_t major, minor;
+		amdgpu_device_handle h_dev;
+		void *buffer = NULL;
+		char img_path[40];
+		FILE *bo_contents_fp = NULL;
+		int device_fd;
+
+		boinfo->size = handle_entry.size;
+
+		boinfo->alloc_flags = handle_entry.alloc_flags;
+		boinfo->preferred_domains = handle_entry.preferred_domains;
+		boinfo->alignment = handle_entry.alignment;
+		boinfo->handle = handle_entry.gem_handle;
+		boinfo->is_import = (handle_entry.flags & AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT) || shared_bo_has_exporter(boinfo->handle);
+
+		mmap_args.in.handle = boinfo->handle;
+
+		if (drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_MMAP, &mmap_args) == -1) {
+			pr_perror("Error Failed to call mmap ioctl");
+			ret = -1;
+			goto exit;
+		}
+
+		boinfo->offset = mmap_args.out.addr_ptr;
+
+		vm_info_entries = xzalloc(sizeof(struct drm_amdgpu_gem_vm_entry) * num_vm_entries);
+		vm_info_args.handle = handle_entry.gem_handle;
+		vm_info_args.num_entries = num_vm_entries;
+		vm_info_args.value = (uintptr_t)vm_info_entries;
+		vm_info_args.op = AMDGPU_GEM_OP_GET_MAPPING_INFO;
+		ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_OP, &vm_info_args);
+		if (ret) {
+			pr_perror("Failed to call vm info ioctl");
+			goto exit;
+		}
+
+		if (vm_info_args.num_entries > num_vm_entries) {
+			num_vm_entries = vm_info_args.num_entries;
+			xfree(vm_info_entries);
+			vm_info_entries = xzalloc(sizeof(struct drm_amdgpu_gem_vm_entry) * num_vm_entries);
+			vm_info_args.handle = handle_entry.gem_handle;
+			vm_info_args.num_entries = num_vm_entries;
+			vm_info_args.value = (uintptr_t)vm_info_entries;
+			vm_info_args.op = AMDGPU_GEM_OP_GET_MAPPING_INFO;
+			ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_OP, &vm_info_args);
+			if (ret) {
+				pr_perror("Failed to call vm info ioctl");
+				goto exit;
+			}
+		} else {
+			num_vm_entries = vm_info_args.num_entries;
+		}
+
+		boinfo->num_of_vms = num_vm_entries;
+		ret = allocate_vm_entries(boinfo, num_vm_entries);
+		if (ret)
+			goto exit;
+
+		for (int j = 0; j < num_vm_entries; j++) {
+			DrmVmEntry *vminfo = boinfo->vm_entries[j];
+
+			boinfo->addr = vm_info_entries[j].addr;
+			vminfo->addr = vm_info_entries[j].addr;
+			vminfo->size = vm_info_entries[j].size;
+			vminfo->offset = vm_info_entries[j].offset;
+			vminfo->flags = vm_info_entries[j].flags;
+		}
+
+		ret = amdgpu_device_initialize(fd, &major, &minor, &h_dev);
+
+		device_fd = amdgpu_device_get_fd(h_dev);
+
+		drmPrimeHandleToFD(device_fd, boinfo->handle, 0, &dmabuf_fd);
+
+		snprintf(img_path, sizeof(img_path), IMG_DRM_PAGES_FILE, rd->id, rd->drm_render_minor, i);
+		bo_contents_fp = open_img_file(img_path, true, &image_size);
+
+		posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), handle_entry.size);
+
+		ret = sdma_copy_bo(dmabuf_fd, handle_entry.size, bo_contents_fp, buffer, handle_entry.size, h_dev, 0x1000,
+				   SDMA_OP_VRAM_READ, false);
+
+		if (dmabuf_fd != KFD_INVALID_FD)
+			close(dmabuf_fd);
+
+		if (bo_contents_fp)
+			fclose(bo_contents_fp);
+
+		ret = amdgpu_device_deinitialize(h_dev);
+		if (ret)
+			goto exit;
+
+		xfree(vm_info_entries);
+	}
+	xfree(list_handles_entries);
+
+	for (int i = 0; i < num_bos; i++) {
+		DrmBoEntry *boinfo = rd->bo_entries[i];
+
+		ret = record_shared_bo(boinfo->handle, boinfo->is_import);
+		if (ret)
+			goto exit;
+	}
+
 	tp_node = sys_get_node_by_render_minor(&src_topology, minor);
 	if (!tp_node) {
 		pr_err("Failed to find a device with minor number = %d\n", minor);
@@ -80,21 +414,156 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
 	}
 
 	/* Get the GPU_ID of the DRM device */
-	rd.gpu_id = maps_get_dest_gpu(&checkpoint_maps, tp_node->gpu_id);
-	if (!rd.gpu_id) {
-		pr_err("Failed to find valid gpu_id for the device = %d\n", rd.gpu_id);
+	rd->gpu_id = maps_get_dest_gpu(&checkpoint_maps, tp_node->gpu_id);
+	if (!rd->gpu_id) {
+		pr_err("Failed to find valid gpu_id for the device = %d\n", rd->gpu_id);
 		return -ENODEV;
 	}
 
-	len = criu_render_node__get_packed_size(&rd);
+	len = criu_render_node__get_packed_size(rd);
 	buf = xmalloc(len);
 	if (!buf)
 		return -ENOMEM;
 
-	criu_render_node__pack(&rd, buf);
+	criu_render_node__pack(rd, buf);
 
 	snprintf(path, sizeof(path), IMG_DRM_FILE, id);
 	ret = write_img_file(path, buf, len);
+
 	xfree(buf);
+exit:
+	free_e(rd);
 	return ret;
 }
+
+int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
+{
+	int ret = 0;
+	bool retry_needed = false;
+	uint32_t major, minor;
+	amdgpu_device_handle h_dev;
+	int device_fd;
+	int *dmabufs = xzalloc(sizeof(int) * rd->num_of_bos);
+
+	ret = amdgpu_device_initialize(fd, &major, &minor, &h_dev);
+	if (ret) {
+		pr_info("Error in init amdgpu device\n");
+		goto exit;
+	}
+
+	device_fd = amdgpu_device_get_fd(h_dev);
+
+	for (int i = 0; i < rd->num_of_bos; i++) {
+		DrmBoEntry *boinfo = rd->bo_entries[i];
+		int dmabuf_fd = -1;
+		uint32_t handle;
+		struct drm_gem_change_handle change_args = { 0 };
+		union drm_amdgpu_gem_mmap mmap_args = { 0 };
+		struct drm_amdgpu_gem_va va_args = { 0 };
+		int fd_id;
+
+		if (work_already_completed(boinfo->handle, rd->drm_render_minor)) {
+			continue;
+		} else if (boinfo->handle != -1) {
+			if (boinfo->is_import) {
+				fd_id = amdgpu_id_for_handle(boinfo->handle);
+				if (fd_id == -1) {
+					retry_needed = true;
+					continue;
+				}
+				dmabuf_fd = fdstore_get(fd_id);
+			}
+		}
+
+		if (boinfo->is_import) {
+			drmPrimeFDToHandle(device_fd, dmabuf_fd, &handle);
+		} else {
+			union drm_amdgpu_gem_create create_args = { 0 };
+
+			create_args.in.bo_size = boinfo->size;
+			create_args.in.alignment = boinfo->alignment;
+			create_args.in.domains = boinfo->preferred_domains;
+			create_args.in.domain_flags = boinfo->alloc_flags;
+
+			if (drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_CREATE, &create_args) == -1) {
+				pr_perror("Error Failed to call create ioctl");
+				ret = -1;
+				goto exit;
+			}
+			handle = create_args.out.handle;
+
+			drmPrimeHandleToFD(device_fd, handle, 0, &dmabuf_fd);
+		}
+
+		change_args.handle = handle;
+		change_args.new_handle = boinfo->handle;
+
+		if (drmIoctl(fd, DRM_IOCTL_GEM_CHANGE_HANDLE, &change_args) == -1) {
+			pr_perror("Error Failed to call change ioctl; check if the kernel has DRM_IOCTL_GEM_CHANGE_HANDLE support");
+			ret = -1;
+			goto exit;
+		}
+
+		if (!boinfo->is_import)
+			store_dmabuf_fd(boinfo->handle, dmabuf_fd);
+
+		dmabufs[i] = dmabuf_fd;
+
+		ret = record_completed_work(boinfo->handle, rd->drm_render_minor);
+		if (ret)
+			goto exit;
+
+		mmap_args.in.handle = boinfo->handle;
+
+		if (drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_MMAP, &mmap_args) == -1) {
+			pr_perror("Error Failed to call mmap ioctl");
+			ret = -1;
+			goto exit;
+		}
+
+		for (int j = 0; j < boinfo->num_of_vms; j++) {
+			DrmVmEntry *vminfo = boinfo->vm_entries[j];
+
+			va_args.handle = boinfo->handle;
+			va_args.operation = AMDGPU_VA_OP_MAP;
+			va_args.flags = vminfo->flags;
+			va_args.va_address = vminfo->addr;
+			va_args.offset_in_bo = vminfo->offset;
+			va_args.map_size = vminfo->size;
+
+			if (drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_VA, &va_args) == -1) {
+				pr_perror("Error Failed to call gem va ioctl");
+				ret = -1;
+				goto exit;
+			}
+		}
+
+		ret = save_vma_updates(boinfo->offset, boinfo->addr, mmap_args.out.addr_ptr, fd);
+		if (ret < 0)
+			goto exit;
+	}
+
+	if (ret) {
+		pr_info("Error in deinit amdgpu device\n");
+		goto exit;
+	}
+
+	ret = record_completed_work(-1, rd->drm_render_minor);
+	if (ret)
+		goto exit;
+
+	ret = amdgpu_device_deinitialize(h_dev);
+
+	if (rd->num_of_bos > 0) {
+		ret = restore_bo_contents_drm(rd->drm_render_minor, rd, fd, dmabufs);
+		if (ret)
+			goto exit;
+	}
+
+exit:
+	if (ret < 0)
+		return ret;
+	xfree(dmabufs);
+
+	return retry_needed;
+}
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.h b/plugins/amdgpu/amdgpu_plugin_drm.h
index 6f0c1a9a6..c766def56 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.h
+++ b/plugins/amdgpu/amdgpu_plugin_drm.h
@@ -24,5 +24,17 @@ int amdgpu_plugin_drm_handle_device_vma(int fd, const struct stat *drm);
  */
 int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm);
 
+int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd);
+
+int amdgpu_plugin_drm_unpause_file(int fd);
+
+int amdgpu_id_for_handle(int handle);
+
+int store_dmabuf_fd(int handle, int fd);
+
+int get_gem_handle(amdgpu_device_handle h_dev, int dmabuf_fd);
+
+int save_vma_updates(uint64_t offset, uint64_t addr, uint64_t restored_offset, int gpu_id);
+
 #endif		/* __AMDGPU_PLUGIN_DRM_H__ */
 
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
index a165fc9cd..491e7fc74 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.c
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -41,6 +41,9 @@
 /* Tracks number of device files that need to be checkpointed */
 static int dev_file_cnt = 0;
 
+static LIST_HEAD(shared_bos);
+static LIST_HEAD(completed_work);
+
 /* Helper structures to encode device topology of SRC and DEST platforms */
 struct tp_system src_topology;
 struct tp_system dest_topology;
@@ -68,6 +71,87 @@ void init_gpu_count(struct tp_system *topo)
 	dev_file_cnt = 1 + topology_gpu_count(topo);
 }
 
+bool shared_bo_has_exporter(int handle)
+{
+	struct shared_bo *bo;
+
+	if (handle == -1)
+		return false;
+
+	list_for_each_entry(bo, &shared_bos, l) {
+		if (bo->handle == handle) {
+			return bo->has_exporter;
+		}
+	}
+
+	return false;
+}
+
+int record_shared_bo(int handle, bool is_imported)
+{
+	struct shared_bo *bo;
+
+	if (handle == -1)
+		return 0;
+
+	list_for_each_entry(bo, &shared_bos, l) {
+		if (bo->handle == handle) {
+			return 0;
+		}
+	}
+	bo = malloc(sizeof(struct shared_bo));
+	if (!bo)
+		return -1;
+	bo->handle = handle;
+	bo->has_exporter = !is_imported;
+	list_add(&bo->l, &shared_bos);
+
+	return 0;
+}
+
+int record_completed_work(int handle, int id)
+{
+	struct restore_completed_work *work;
+
+	work = malloc(sizeof(struct restore_completed_work));
+	if (!work)
+		return -1;
+	work->handle = handle;
+	work->id = id;
+	list_add(&work->l, &completed_work);
+
+	return 0;
+}
+
+bool work_already_completed(int handle, int id)
+{
+	struct restore_completed_work *work;
+
+	list_for_each_entry(work, &completed_work, l) {
+		if (work->handle == handle && work->id == id) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void clear_restore_state()
+{
+	while (!list_empty(&shared_dmabuf_fds)) {
+		struct shared_dmabuf *st = list_first_entry(&shared_dmabuf_fds, struct shared_dmabuf, l);
+		list_del(&st->l);
+		close(st->dmabuf_fd);
+		free(st);
+	}
+
+	while (!list_empty(&completed_work)) {
+		struct restore_completed_work *st = list_first_entry(&completed_work, struct restore_completed_work, l);
+		list_del(&st->l);
+		free(st);
+	}
+}
+
 int read_fp(FILE *fp, void *buf, const size_t buf_len)
 {
 	size_t len_read;
diff --git a/plugins/amdgpu/amdgpu_plugin_util.h b/plugins/amdgpu/amdgpu_plugin_util.h
index aacca3a28..046a82fb0 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.h
+++ b/plugins/amdgpu/amdgpu_plugin_util.h
@@ -1,6 +1,8 @@
 #ifndef __AMDGPU_PLUGIN_UTIL_H__
 #define __AMDGPU_PLUGIN_UTIL_H__
 
+#include <libdrm/amdgpu.h>
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
@@ -52,7 +54,7 @@
 #define IMG_DRM_FILE			"amdgpu-renderD-%d.img"
 
 /* Name of file having serialized data of DRM device buffer objects (BOs) */
-#define IMG_DRM_PAGES_FILE		"amdgpu-drm-pages-%d-%04x.img"
+#define IMG_DRM_PAGES_FILE "amdgpu-drm-pages-%d-%d-%04x.img"
 
 /* Helper macros to Checkpoint and Restore a ROCm file */
 #define HSAKMT_SHM_PATH			"/dev/shm/hsakmt_shared_mem"
@@ -73,6 +75,24 @@ enum sdma_op_type {
 	SDMA_OP_VRAM_WRITE,
 };
 
+struct dumped_fd {
+	struct list_head l;
+	int fd;
+	bool is_drm;
+};
+
+struct shared_bo {
+	struct list_head l;
+	int handle;
+	bool has_exporter;
+};
+
+struct restore_completed_work {
+	struct list_head l;
+	int handle;
+	int id;
+};
+
 /* Helper structures to encode device topology of SRC and DEST platforms */
 extern struct tp_system src_topology;
 extern struct tp_system dest_topology;
@@ -101,6 +121,23 @@ bool checkpoint_is_complete();
 void decrement_checkpoint_count();
 void init_gpu_count(struct tp_system *topology);
 
+bool shared_bo_has_exporter(int handle);
+int record_shared_bo(int handle, bool is_imported);
+
+int record_shared_dmabuf_fd(int handle, int dmabuf_fd);
+int dmabuf_fd_for_handle(int handle);
+
+int record_completed_work(int handle, int id);
+bool work_already_completed(int handle, int id);
+
+void clear_restore_state();
+
 void print_kfd_bo_stat(int bo_cnt, struct kfd_criu_bo_bucket *bo_list);
 
+int sdma_copy_bo(int shared_fd, uint64_t size, FILE *storage_fp,
+		 void *buffer, size_t buffer_size, amdgpu_device_handle h_dev,
+		 uint64_t max_copy_size, enum sdma_op_type type, bool do_not_free);
+
+int serve_out_dmabuf_fd(int handle, int fd);
+
 #endif		/* __AMDGPU_PLUGIN_UTIL_H__ */
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index 078b67650..565413c34 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -46,6 +46,7 @@ message kfd_bo_entry {
 	required uint64 offset = 3;
 	required uint32 alloc_flags = 4;
 	required uint32 gpu_id = 5;
+	required uint32 handle = 6;
 }
 
 message criu_kfd {
@@ -61,6 +62,30 @@ message criu_kfd {
 	required bytes priv_data = 10;
 }
 
+message drm_bo_entry {
+	required uint64 addr = 1;
+	required uint64 size = 2;
+	required uint64 offset = 3;
+	required uint64 alloc_flags = 4;
+	required uint64 alignment = 5;
+	required uint32 preferred_domains = 6;
+	required uint32 handle = 7;
+	required uint32 is_import = 8;
+	required uint32 num_of_vms = 9;
+	repeated drm_vm_entry vm_entries = 10;
+}
+
+message drm_vm_entry {
+	required uint64 addr = 1;
+	required uint64 size = 2;
+	required uint64 offset = 3;
+	required uint64 flags = 4;
+}
+
 message criu_render_node {
 	required uint32 gpu_id = 1;
+	required uint32 id = 2;
+	required uint32 drm_render_minor = 3;
+	required uint64 num_of_bos = 4;
+	repeated drm_bo_entry bo_entries = 5;
 }

From d43217dadb9764e0342306da84f45f7a85c78bbf Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Thu, 30 Oct 2025 22:56:37 -0700
Subject: [PATCH 1814/1854] plugin: Add DUMP_DEVICES_LATE callback

The amdgpu plugin was counting how many files were checkpointed
to determine when it should close the device files.

The number of device files is not consistent; a process may
have multiple copies of the drm device files open.

Instead of doing this counting, add a new callback after all
files are checkpointed, so plugins can clean up their
resources at an appropriate time.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 criu/cr-dump.c                      |  4 +++
 criu/include/criu-plugin.h          |  3 ++
 criu/plugin.c                       |  1 +
 plugins/amdgpu/amdgpu_plugin.c      | 55 ++++++++++++-----------------
 plugins/amdgpu/amdgpu_plugin_util.c | 42 +++++++++++++---------
 plugins/amdgpu/amdgpu_plugin_util.h |  6 ++--
 6 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 60b8e793c..4df40e9b6 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2247,6 +2247,10 @@ int cr_dump_tasks(pid_t pid)
 			goto err;
 	}
 
+	ret = run_plugins(DUMP_DEVICES_LATE, pid);
+	if (ret && ret != -ENOTSUP)
+		goto err;
+
 	if (parent_ie) {
 		inventory_entry__free_unpacked(parent_ie, NULL);
 		parent_ie = NULL;
diff --git a/criu/include/criu-plugin.h b/criu/include/criu-plugin.h
index 977dad655..c3bea1385 100644
--- a/criu/include/criu-plugin.h
+++ b/criu/include/criu-plugin.h
@@ -64,6 +64,8 @@ enum {
 
 	CR_PLUGIN_HOOK__RESTORE_INIT = 13,
 
+	CR_PLUGIN_HOOK__DUMP_DEVICES_LATE = 14,
+
 	CR_PLUGIN_HOOK__MAX
 };
 
@@ -84,6 +86,7 @@ DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__PAUSE_DEVICES, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__CHECKPOINT_DEVICES, int pid);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__POST_FORKING, void);
 DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__RESTORE_INIT, void);
+DECLARE_PLUGIN_HOOK_ARGS(CR_PLUGIN_HOOK__DUMP_DEVICES_LATE, int id);
 
 enum {
 	CR_PLUGIN_STAGE__DUMP,
diff --git a/criu/plugin.c b/criu/plugin.c
index a2057e9c1..f9322a3c2 100644
--- a/criu/plugin.c
+++ b/criu/plugin.c
@@ -61,6 +61,7 @@ static cr_plugin_desc_t *cr_gen_plugin_desc(void *h, char *path)
 	__assign_hook(CHECKPOINT_DEVICES, "cr_plugin_checkpoint_devices");
 	__assign_hook(POST_FORKING, "cr_plugin_post_forking");
 	__assign_hook(RESTORE_INIT, "cr_plugin_restore_init");
+	__assign_hook(DUMP_DEVICES_LATE, "cr_plugin_dump_devices_late");
 
 #undef __assign_hook
 
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 4be8421a0..11e410c31 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -58,13 +58,6 @@ struct vma_metadata {
 
 /************************************ Global Variables ********************************************/
 
-/**
- * FD of KFD device used to checkpoint. On a multi-process
- * tree the order of checkpointing goes from parent to child
- * and so on - so saving the FD will not be overwritten
- */
-static int kfd_checkpoint_fd;
-
 static LIST_HEAD(update_vma_info_list);
 
 size_t kfd_max_buffer_size;
@@ -1050,28 +1043,34 @@ int restore_hsakmt_shared_mem(const uint64_t shared_mem_size, const uint32_t sha
 	return 0;
 }
 
-static int unpause_process(int fd)
+int amdgpu_unpause_processes(int pid)
 {
 	int ret = 0;
 	struct kfd_ioctl_criu_args args = { 0 };
+	struct list_head *l = get_dumped_fds();
+	struct dumped_fd *st;
 
-	args.op = KFD_CRIU_OP_UNPAUSE;
+	list_for_each_entry(st, l, l) {
+		if (st->is_drm) {
+			close(st->fd);
+		} else {
+			args.op = KFD_CRIU_OP_UNPAUSE;
 
-	ret = kmtIoctl(fd, AMDKFD_IOC_CRIU_OP, &args);
-	if (ret) {
-		pr_perror("Failed to unpause process");
-		goto exit;
+			ret = kmtIoctl(st->fd, AMDKFD_IOC_CRIU_OP, &args);
+			if (ret) {
+				pr_perror("Failed to unpause process");
+				goto exit;
+			}
+		}
 	}
 
-	// Reset the KFD FD
-	kfd_checkpoint_fd = -1;
-	sys_close_drm_render_devices(&src_topology);
-
 exit:
 	pr_info("Process unpaused %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
+	clear_dumped_fds();
 
 	return ret;
 }
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__DUMP_DEVICES_LATE, amdgpu_unpause_processes)
 
 int store_dmabuf_fd(int handle, int fd)
 {
@@ -1401,9 +1400,6 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		return -1;
 	}
 
-	/* Initialize number of device files that will be checkpointed */
-	init_gpu_count(&src_topology);
-
 	/* Check whether this plugin was called for kfd or render nodes */
 	if (major(st.st_rdev) != major(st_kfd.st_rdev) || minor(st.st_rdev) != 0) {
 
@@ -1415,11 +1411,9 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		if (ret)
 			return ret;
 
-		/* Invoke unpause process if needed */
-		decrement_checkpoint_count();
-		if (checkpoint_is_complete()) {
-			ret = unpause_process(kfd_checkpoint_fd);
-		}
+		ret = record_dumped_fd(fd, true);
+		if (ret)
+			return ret;
 
 		/* Need to return success here so that criu can call plugins for renderD nodes */
 		return ret;
@@ -1517,14 +1511,11 @@ int amdgpu_plugin_dump_file(int fd, int id)
 
 	xfree(buf);
 
-exit:
-	/* Restore all queues if conditions permit */
-	kfd_checkpoint_fd = fd;
-	decrement_checkpoint_count();
-	if (checkpoint_is_complete()) {
-		ret = unpause_process(fd);
-	}
+	ret = record_dumped_fd(fd, false);
+	if (ret)
+		goto exit;
 
+exit:
 	xfree((void *)args.devices);
 	xfree((void *)args.bos);
 	xfree((void *)args.priv_data);
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
index 491e7fc74..fd59c06ad 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.c
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -38,9 +38,7 @@
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
 
-/* Tracks number of device files that need to be checkpointed */
-static int dev_file_cnt = 0;
-
+static LIST_HEAD(dumped_fds);
 static LIST_HEAD(shared_bos);
 static LIST_HEAD(completed_work);
 
@@ -52,23 +50,25 @@ struct tp_system dest_topology;
 struct device_maps checkpoint_maps;
 struct device_maps restore_maps;
 
-bool checkpoint_is_complete()
+int record_dumped_fd(int fd, bool is_drm)
 {
-	return (dev_file_cnt == 0);
+	int newfd = dup(fd);
+
+	if (newfd < 0)
+		return newfd;
+	struct dumped_fd *st = malloc(sizeof(struct dumped_fd));
+	if (!st)
+		return -1;
+	st->fd = newfd;
+	st->is_drm = is_drm;
+	list_add(&st->l, &dumped_fds);
+
+	return 0;
 }
 
-void decrement_checkpoint_count()
+struct list_head *get_dumped_fds()
 {
-	dev_file_cnt--;
-}
-
-void init_gpu_count(struct tp_system *topo)
-{
-	if (dev_file_cnt != 0)
-		return;
-
-	/* We add ONE to include checkpointing of KFD device */
-	dev_file_cnt = 1 + topology_gpu_count(topo);
+	return &dumped_fds;
 }
 
 bool shared_bo_has_exporter(int handle)
@@ -152,6 +152,16 @@ void clear_restore_state()
 	}
 }
 
+void clear_dumped_fds()
+{
+	while (!list_empty(&dumped_fds)) {
+		struct dumped_fd *st = list_first_entry(&dumped_fds, struct dumped_fd, l);
+		list_del(&st->l);
+		close(st->fd);
+		free(st);
+	}
+}
+
 int read_fp(FILE *fp, void *buf, const size_t buf_len)
 {
 	size_t len_read;
diff --git a/plugins/amdgpu/amdgpu_plugin_util.h b/plugins/amdgpu/amdgpu_plugin_util.h
index 046a82fb0..f20388efa 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.h
+++ b/plugins/amdgpu/amdgpu_plugin_util.h
@@ -117,9 +117,9 @@ int read_file(const char *file_path, void *buf, const size_t buf_len);
 int write_img_file(char *path, const void *buf, const size_t buf_len);
 FILE *open_img_file(char *path, bool write, size_t *size);
 
-bool checkpoint_is_complete();
-void decrement_checkpoint_count();
-void init_gpu_count(struct tp_system *topology);
+int record_dumped_fd(int fd, bool is_drm);
+struct list_head *get_dumped_fds();
+void clear_dumped_fds();
 
 bool shared_bo_has_exporter(int handle);
 int record_shared_bo(int handle, bool is_imported);

From 9e404e2083913cde0bad2d0396e6cc7c311a8ba4 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Thu, 30 Oct 2025 22:57:04 -0700
Subject: [PATCH 1815/1854] plugin/amdgpu: Support for checkpoint of dmabuf fds

amdgpu libraries that use dmabuf fd to share GPU memory between
processes close the dmabuf fds immediately after using them.
However, it is possible that checkpoint of a process catches one
of the dmabuf fds open. In that case, the amdgpu plugin needs
to handle it.

The checkpoint of the dmabuf fd does require the device file
it was exported from to have already been dumped

To identify which device this dmabuf fd was exprted from, attempt
to import it on each device, then record the dmabuf handle
it imports as. This handle can be used to restore it.

Signed-off-by: David Francis <David.Francis@amd.com>
---
 plugins/amdgpu/Makefile               |   2 +-
 plugins/amdgpu/amdgpu_plugin.c        |  34 ++++-
 plugins/amdgpu/amdgpu_plugin_dmabuf.c | 207 ++++++++++++++++++++++++++
 plugins/amdgpu/amdgpu_plugin_dmabuf.h |  16 ++
 plugins/amdgpu/amdgpu_plugin_drm.c    |   7 +-
 plugins/amdgpu/amdgpu_plugin_util.c   |  48 +++++-
 plugins/amdgpu/amdgpu_plugin_util.h   |   8 +-
 plugins/amdgpu/criu-amdgpu.proto      |   4 +
 8 files changed, 306 insertions(+), 20 deletions(-)
 create mode 100644 plugins/amdgpu/amdgpu_plugin_dmabuf.c
 create mode 100644 plugins/amdgpu/amdgpu_plugin_dmabuf.h

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 870a039cd..31e177e4a 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -27,7 +27,7 @@ endif
 criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc --proto_path=. --c_out=. criu-amdgpu.proto
 
-amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
+amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_dmabuf.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
 	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 11e410c31..125aaef9a 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -38,6 +38,7 @@
 #include "rst-malloc.h"
 
 #include "common/list.h"
+#include "amdgpu_plugin_dmabuf.h"
 #include "amdgpu_plugin_drm.h"
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
@@ -46,7 +47,7 @@
 #include "img-streamer.h"
 #include "image.h"
 #include "cr_options.h"
-
+#include "util.h"
 struct vma_metadata {
 	struct list_head list;
 	uint64_t old_pgoff;
@@ -1064,6 +1065,9 @@ int amdgpu_unpause_processes(int pid)
 		}
 	}
 
+	if (post_dump_dmabuf_check() < 0)
+		ret = -1;
+
 exit:
 	pr_info("Process unpaused %s (ret:%d)\n", ret ? "Failed" : "Ok", ret);
 	clear_dumped_fds();
@@ -1400,7 +1404,17 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		return -1;
 	}
 
-	/* Check whether this plugin was called for kfd or render nodes */
+	/* Check whether this plugin was called for kfd, dmabuf or render nodes */
+	ret = get_dmabuf_info(fd, &st);
+	if (ret < 0) {
+		pr_perror("Failed to get dmabuf info");
+		return -1;
+	} else if (ret == 0) {
+		pr_info("Dumping dmabuf fd = %d\n", fd);
+		ret = amdgpu_plugin_dmabuf_dump(fd, id);
+		return ret;
+	}
+
 	if (major(st.st_rdev) != major(st_kfd.st_rdev) || minor(st.st_rdev) != 0) {
 
 		/* This is RenderD dumper plugin, for now just save renderD
@@ -1414,7 +1428,7 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		ret = record_dumped_fd(fd, true);
 		if (ret)
 			return ret;
-
+		ret = try_dump_dmabuf_list();
 		/* Need to return success here so that criu can call plugins for renderD nodes */
 		return ret;
 	}
@@ -1538,7 +1552,6 @@ static int restore_devices(struct kfd_ioctl_criu_args *args, CriuKfd *e)
 	int ret = 0, bucket_index = 0;
 
 	pr_debug("Restoring %d devices\n", e->num_of_gpus);
-
 	args->num_devices = e->num_of_gpus;
 	device_buckets = xzalloc(sizeof(*device_buckets) * args->num_devices);
 	if (!device_buckets)
@@ -1822,12 +1835,17 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 		 * first as we assume restore_maps is already filled. Need to fix this later.
 		 */
 		snprintf(img_path, sizeof(img_path), IMG_DRM_FILE, id);
-		pr_info("Restoring RenderD %s\n", img_path);
 
 		img_fp = open_img_file(img_path, false, &img_size);
-		if (!img_fp)
-			return -EINVAL;
-
+		if (!img_fp) {
+			ret = amdgpu_plugin_dmabuf_restore(id);
+			if (ret == 1) {
+				*retry_needed = true;
+				return 0;
+			}
+			return ret;
+		}
+		pr_info("Restoring RenderD %s\n", img_path);
 		pr_debug("RenderD Image file size:%ld\n", img_size);
 		buf = xmalloc(img_size);
 		if (!buf) {
diff --git a/plugins/amdgpu/amdgpu_plugin_dmabuf.c b/plugins/amdgpu/amdgpu_plugin_dmabuf.c
new file mode 100644
index 000000000..74b5f9038
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_dmabuf.c
@@ -0,0 +1,207 @@
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <linux/limits.h>
+
+#include "common/list.h"
+#include "criu-amdgpu.pb-c.h"
+
+#include "xmalloc.h"
+#include "criu-log.h"
+#include "amdgpu_plugin_drm.h"
+#include "amdgpu_plugin_util.h"
+#include "amdgpu_plugin_dmabuf.h"
+#include "fdstore.h"
+
+#include "util.h"
+#include "common/scm.h"
+
+struct dmabuf {
+	int id;
+	int dmabuf_fd;
+	struct list_head node;
+};
+
+static LIST_HEAD(dmabuf_list);
+
+/* Return < 0 for error, > 0 for "not a dmabuf" and 0 "is a dmabuf" */
+int get_dmabuf_info(int fd, struct stat *st)
+{
+	char path[PATH_MAX];
+
+	if (read_fd_link(fd, path, sizeof(path)) < 0)
+		return -1;
+
+	if (strncmp(path, DMABUF_LINK, strlen(DMABUF_LINK)) != 0)
+		return 1;
+
+	return 0;
+}
+
+int __amdgpu_plugin_dmabuf_dump(int dmabuf_fd, int id)
+{
+	int ret = 0;
+	char path[PATH_MAX];
+	size_t len = 0;
+	unsigned char *buf = NULL;
+	int gem_handle;
+
+	pr_info("TWI: Dumping dmabuf fd = %d\n", dmabuf_fd);
+
+	gem_handle = handle_for_shared_bo_fd(dmabuf_fd);
+	if (gem_handle < 0) {
+		pr_err("Failed to get handle for dmabuf_fd = %d\n", dmabuf_fd);
+		return -EAGAIN; /* Retry needed */
+	}
+
+	CriuDmabufNode *node = xmalloc(sizeof(*node));
+	if (!node) {
+		pr_err("Failed to allocate memory for dmabuf node\n");
+		return -ENOMEM;
+	}
+	criu_dmabuf_node__init(node);
+
+	node->gem_handle = gem_handle;
+
+	if (node->gem_handle < 0) {
+		pr_err("Failed to get handle for dmabuf_fd\n");
+		xfree(node);
+		return -EINVAL;
+	}
+
+	/* Serialize metadata to a file */
+	snprintf(path, sizeof(path), IMG_DMABUF_FILE, id);
+	len = criu_dmabuf_node__get_packed_size(node);
+	buf = xmalloc(len);
+	if (!buf) {
+		pr_err("Failed to allocate buffer for dmabuf metadata\n");
+		xfree(node);
+		return -ENOMEM;
+	}
+	criu_dmabuf_node__pack(node, buf);
+	ret = write_img_file(path, buf, len);
+
+	xfree(buf);
+	xfree(node);
+	return ret;
+}
+
+int amdgpu_plugin_dmabuf_restore(int id)
+{
+	char path[PATH_MAX];
+	size_t img_size;
+	FILE *img_fp = NULL;
+	int ret = 0;
+	CriuDmabufNode *rd = NULL;
+	unsigned char *buf = NULL;
+	int fd_id;
+
+	snprintf(path, sizeof(path), IMG_DMABUF_FILE, id);
+
+	pr_info("TWI: Restoring dmabuf fd, id = %d\n", id);
+
+	/* Read serialized metadata */
+	img_fp = open_img_file(path, false, &img_size);
+	if (!img_fp) {
+		pr_err("Failed to open dmabuf metadata file: %s\n", path);
+		return -EINVAL;
+	}
+
+	pr_debug("dmabuf Image file size:%ld\n", img_size);
+	buf = xmalloc(img_size);
+	if (!buf) {
+		pr_perror("Failed to allocate memory");
+		return -ENOMEM;
+	}
+
+	ret = read_fp(img_fp, buf, img_size);
+	if (ret) {
+		pr_perror("Unable to read from %s", path);
+		xfree(buf);
+		return ret;
+	}
+
+	rd = criu_dmabuf_node__unpack(NULL, img_size, buf);
+	if (rd == NULL) {
+		pr_perror("Unable to parse the dmabuf message %d", id);
+		xfree(buf);
+		fclose(img_fp);
+		return -1;
+	}
+	fclose(img_fp);
+
+	pr_info("TWI: dmabuf node gem_handle = %d\n", rd->gem_handle);
+
+	/* Match GEM handle with shared_dmabuf list */
+	fd_id = amdgpu_id_for_handle(rd->gem_handle);
+	if (fd_id == -1) {
+		pr_err("Failed to find dmabuf_fd for GEM handle = %d\n",
+		       rd->gem_handle);
+		return 1;
+	}
+	int dmabuf_fd = fdstore_get(fd_id);
+	pr_info("TWI: dmabuf node fd_id = %d, dmabuf_fd = %d\n", fd_id, dmabuf_fd);
+	if (dmabuf_fd == -1) {
+		pr_err("Failed to find dmabuf_fd for GEM handle = %d\n",
+		       rd->gem_handle);
+		return 1; /* Retry needed */
+	} else {
+		pr_info("Restored dmabuf_fd = %d for GEM handle = %d\n",
+			dmabuf_fd, rd->gem_handle);
+	}
+	ret = dmabuf_fd;
+
+	pr_info("Successfully restored dmabuf_fd %d\n",
+		dmabuf_fd);
+	criu_dmabuf_node__free_unpacked(rd, NULL);
+	xfree(buf);
+	return ret;
+}
+
+int amdgpu_plugin_dmabuf_dump(int dmabuf_fd, int id)
+{
+	int ret;
+
+	ret = __amdgpu_plugin_dmabuf_dump(dmabuf_fd, id);
+	if (ret == -EAGAIN) {
+		struct dmabuf *b = xmalloc(sizeof(*b));
+		b->id = id;
+		b->dmabuf_fd = dmabuf_fd;
+		list_add(&b->node, &dmabuf_list);
+		return 0;
+	}
+	return ret;
+}
+
+int try_dump_dmabuf_list()
+{
+	struct dmabuf *b, *t;
+	list_for_each_entry_safe(b, t, &dmabuf_list, node) {
+		int ret = __amdgpu_plugin_dmabuf_dump(b->dmabuf_fd, b->id);
+		if (ret == -EAGAIN)
+			continue;
+		else if (ret)
+			return ret;
+		list_del(&b->node);
+		xfree(b);
+	}
+	return 0;
+}
+
+int post_dump_dmabuf_check()
+{
+	if (!list_empty(&dmabuf_list)) {
+		pr_err("Not all dma buffers have been dumped\n");
+		return -1;
+	}
+	return 1;
+}
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin_dmabuf.h b/plugins/amdgpu/amdgpu_plugin_dmabuf.h
new file mode 100644
index 000000000..f07af7ee0
--- /dev/null
+++ b/plugins/amdgpu/amdgpu_plugin_dmabuf.h
@@ -0,0 +1,16 @@
+
+#ifndef __AMDGPU_PLUGIN_DMABUF_H__
+#define __AMDGPU_PLUGIN_DMABUF_H__
+
+#include "amdgpu_plugin_util.h"
+#include "criu-amdgpu.pb-c.h"
+
+int amdgpu_plugin_dmabuf_dump(int fd, int id);
+int amdgpu_plugin_dmabuf_restore(int id);
+
+int try_dump_dmabuf_list();
+int post_dump_dmabuf_check();
+
+int get_dmabuf_info(int fd, struct stat *st);
+
+#endif /* __AMDGPU_PLUGIN_DMABUF_H__ */
\ No newline at end of file
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index 199dad21e..8466ca40d 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -47,7 +47,8 @@ int get_gem_handle(amdgpu_device_handle h_dev, int dmabuf_fd)
 		return -1;
 	}
 
-	drmPrimeFDToHandle(fd, dmabuf_fd, &handle);
+	if (drmPrimeFDToHandle(fd, dmabuf_fd, &handle))
+		return -1;
 
 	return handle;
 }
@@ -465,6 +466,7 @@ int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
 		if (work_already_completed(boinfo->handle, rd->drm_render_minor)) {
 			continue;
 		} else if (boinfo->handle != -1) {
+			pr_info("TWI: restore bo %d\n", boinfo->handle);
 			if (boinfo->is_import) {
 				fd_id = amdgpu_id_for_handle(boinfo->handle);
 				if (fd_id == -1) {
@@ -472,11 +474,13 @@ int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
 					continue;
 				}
 				dmabuf_fd = fdstore_get(fd_id);
+				pr_info("TWI: restore bo %d: fd_id %d, dmabuf_fd %d\n", boinfo->handle, fd_id, dmabuf_fd);
 			}
 		}
 
 		if (boinfo->is_import) {
 			drmPrimeFDToHandle(device_fd, dmabuf_fd, &handle);
+			pr_info("TWI: restore bo imported to handle %d\n", handle);
 		} else {
 			union drm_amdgpu_gem_create create_args = { 0 };
 
@@ -493,6 +497,7 @@ int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
 			handle = create_args.out.handle;
 
 			drmPrimeHandleToFD(device_fd, handle, 0, &dmabuf_fd);
+			pr_info("TWI: restore bo created at handle %d and exported to fd %d\n", handle, dmabuf_fd);
 		}
 
 		change_args.handle = handle;
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
index fd59c06ad..a2cafa4a3 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.c
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -37,6 +37,7 @@
 #include "amdgpu_drm.h"
 #include "amdgpu_plugin_util.h"
 #include "amdgpu_plugin_topology.h"
+#include "amdgpu_plugin_drm.h"
 
 static LIST_HEAD(dumped_fds);
 static LIST_HEAD(shared_bos);
@@ -109,6 +110,46 @@ int record_shared_bo(int handle, bool is_imported)
 	return 0;
 }
 
+int handle_for_shared_bo_fd(int fd)
+{
+	struct dumped_fd *df;
+	int trial_handle;
+	amdgpu_device_handle h_dev;
+	uint32_t major, minor;
+	struct shared_bo *bo;
+
+	list_for_each_entry(df, &dumped_fds, l) {
+		/* see if the gem handle for fd using the hdev for df->fd is the
+		   same as bo->handle. */
+
+		if (!df->is_drm) {
+			continue;
+		}
+
+		if (amdgpu_device_initialize(df->fd, &major, &minor, &h_dev)) {
+			pr_err("Failed to initialize amdgpu device\n");
+			continue;
+		}
+
+		trial_handle = get_gem_handle(h_dev, fd);
+		if (trial_handle < 0)
+			continue;
+
+		pr_info("TWI: Check device %d, got handle %d\n", df->fd, trial_handle);
+
+		list_for_each_entry(bo, &shared_bos, l) {
+			if (bo->handle == trial_handle) {
+				pr_info("TWI: And that handle exists\n");
+				return trial_handle;
+			}
+		}
+
+		amdgpu_device_deinitialize(h_dev);
+	}
+
+	return -1;
+}
+
 int record_completed_work(int handle, int id)
 {
 	struct restore_completed_work *work;
@@ -138,13 +179,6 @@ bool work_already_completed(int handle, int id)
 
 void clear_restore_state()
 {
-	while (!list_empty(&shared_dmabuf_fds)) {
-		struct shared_dmabuf *st = list_first_entry(&shared_dmabuf_fds, struct shared_dmabuf, l);
-		list_del(&st->l);
-		close(st->dmabuf_fd);
-		free(st);
-	}
-
 	while (!list_empty(&completed_work)) {
 		struct restore_completed_work *st = list_first_entry(&completed_work, struct restore_completed_work, l);
 		list_del(&st->l);
diff --git a/plugins/amdgpu/amdgpu_plugin_util.h b/plugins/amdgpu/amdgpu_plugin_util.h
index f20388efa..f5f752d0b 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.h
+++ b/plugins/amdgpu/amdgpu_plugin_util.h
@@ -53,6 +53,9 @@
 /* Name of file having serialized data of DRM device */
 #define IMG_DRM_FILE			"amdgpu-renderD-%d.img"
 
+/* Name of file having serialized data of dmabuf meta */
+#define IMG_DMABUF_FILE "amdgpu-dmabuf_%d.img"
+
 /* Name of file having serialized data of DRM device buffer objects (BOs) */
 #define IMG_DRM_PAGES_FILE "amdgpu-drm-pages-%d-%d-%04x.img"
 
@@ -61,6 +64,7 @@
 #define HSAKMT_SHM				"/hsakmt_shared_mem"
 #define HSAKMT_SEM_PATH			"/dev/shm/sem.hsakmt_semaphore"
 #define HSAKMT_SEM				"hsakmt_semaphore"
+#define DMABUF_LINK				"/dmabuf"
 
 /* Help macros to build sDMA command packets */
 #define SDMA_PACKET(op, sub_op, e) ((((e)&0xFFFF) << 16) | (((sub_op)&0xFF) << 8) | (((op)&0xFF) << 0))
@@ -123,9 +127,7 @@ void clear_dumped_fds();
 
 bool shared_bo_has_exporter(int handle);
 int record_shared_bo(int handle, bool is_imported);
-
-int record_shared_dmabuf_fd(int handle, int dmabuf_fd);
-int dmabuf_fd_for_handle(int handle);
+int handle_for_shared_bo_fd(int dmabuf_fd);
 
 int record_completed_work(int handle, int id);
 bool work_already_completed(int handle, int id);
diff --git a/plugins/amdgpu/criu-amdgpu.proto b/plugins/amdgpu/criu-amdgpu.proto
index 565413c34..7682a8f21 100644
--- a/plugins/amdgpu/criu-amdgpu.proto
+++ b/plugins/amdgpu/criu-amdgpu.proto
@@ -89,3 +89,7 @@ message criu_render_node {
 	required uint64 num_of_bos = 4;
 	repeated drm_bo_entry bo_entries = 5;
 }
+
+message criu_dmabuf_node {
+	required uint32 gem_handle = 1;
+}

From ff35a9126e3a2d4e6f5f9f2ca89b032f9ae5bc22 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Sun, 2 Nov 2025 07:26:44 -0800
Subject: [PATCH 1816/1854] plugins/amdgpu: remove excessive debug messages

These pr_info lines begin with "CC3" and "TWI" were not meant to be
included in the patch.

Co-authored-by: Andrei Vagin <avagin@google.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c        |  5 +----
 plugins/amdgpu/amdgpu_plugin_dmabuf.c | 22 ++++++----------------
 plugins/amdgpu/amdgpu_plugin_drm.c    |  4 ----
 plugins/amdgpu/amdgpu_plugin_util.c   |  6 +-----
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 125aaef9a..4640ccf88 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -48,6 +48,7 @@
 #include "image.h"
 #include "cr_options.h"
 #include "util.h"
+
 struct vma_metadata {
 	struct list_head list;
 	uint64_t old_pgoff;
@@ -327,8 +328,6 @@ void getenv_size_t(const char *var, size_t *value)
 	int sh = 0;
 	size_t size;
 
-	pr_info("Value str: %s\n", value_str);
-
 	if (value_str) {
 		size = (size_t)strtoul(value_str, &endp, 0);
 		if (errno || value_str == endp) {
@@ -1132,7 +1131,6 @@ int amdgpu_restore_init(void)
 		if (d) {
 			while ((dir = readdir(d)) != NULL) {
 				if (strncmp("amdgpu-kfd-", dir->d_name, strlen("amdgpu-kfd-")) == 0) {
-					pr_info("CC3: Found kfd file\n");
 					img_fp = open_img_file(dir->d_name, false, &img_size);
 					buf = xmalloc(img_size);
 					if (!buf) {
@@ -1155,7 +1153,6 @@ int amdgpu_restore_init(void)
 					xfree(buf);
 				}
 				if (strncmp("amdgpu-renderD-", dir->d_name, strlen("amdgpu-renderD-")) == 0) {
-					pr_info("CC3: Found drm file\n");
 					img_fp = open_img_file(dir->d_name, false, &img_size);
 					buf = xmalloc(img_size);
 					if (!buf) {
diff --git a/plugins/amdgpu/amdgpu_plugin_dmabuf.c b/plugins/amdgpu/amdgpu_plugin_dmabuf.c
index 74b5f9038..bdc107f64 100644
--- a/plugins/amdgpu/amdgpu_plugin_dmabuf.c
+++ b/plugins/amdgpu/amdgpu_plugin_dmabuf.c
@@ -55,8 +55,6 @@ int __amdgpu_plugin_dmabuf_dump(int dmabuf_fd, int id)
 	unsigned char *buf = NULL;
 	int gem_handle;
 
-	pr_info("TWI: Dumping dmabuf fd = %d\n", dmabuf_fd);
-
 	gem_handle = handle_for_shared_bo_fd(dmabuf_fd);
 	if (gem_handle < 0) {
 		pr_err("Failed to get handle for dmabuf_fd = %d\n", dmabuf_fd);
@@ -107,8 +105,6 @@ int amdgpu_plugin_dmabuf_restore(int id)
 
 	snprintf(path, sizeof(path), IMG_DMABUF_FILE, id);
 
-	pr_info("TWI: Restoring dmabuf fd, id = %d\n", id);
-
 	/* Read serialized metadata */
 	img_fp = open_img_file(path, false, &img_size);
 	if (!img_fp) {
@@ -139,29 +135,23 @@ int amdgpu_plugin_dmabuf_restore(int id)
 	}
 	fclose(img_fp);
 
-	pr_info("TWI: dmabuf node gem_handle = %d\n", rd->gem_handle);
-
 	/* Match GEM handle with shared_dmabuf list */
 	fd_id = amdgpu_id_for_handle(rd->gem_handle);
 	if (fd_id == -1) {
-		pr_err("Failed to find dmabuf_fd for GEM handle = %d\n",
-		       rd->gem_handle);
+		pr_err("Failed to find dmabuf_fd for GEM handle = %d\n", rd->gem_handle);
 		return 1;
 	}
+
 	int dmabuf_fd = fdstore_get(fd_id);
-	pr_info("TWI: dmabuf node fd_id = %d, dmabuf_fd = %d\n", fd_id, dmabuf_fd);
 	if (dmabuf_fd == -1) {
-		pr_err("Failed to find dmabuf_fd for GEM handle = %d\n",
-		       rd->gem_handle);
+		pr_err("Failed to find dmabuf_fd for GEM handle = %d\n", rd->gem_handle);
 		return 1; /* Retry needed */
-	} else {
-		pr_info("Restored dmabuf_fd = %d for GEM handle = %d\n",
-			dmabuf_fd, rd->gem_handle);
 	}
+
+	pr_info("Restored dmabuf_fd = %d for GEM handle = %d\n", dmabuf_fd, rd->gem_handle);
 	ret = dmabuf_fd;
 
-	pr_info("Successfully restored dmabuf_fd %d\n",
-		dmabuf_fd);
+	pr_info("Successfully restored dmabuf_fd %d\n", dmabuf_fd);
 	criu_dmabuf_node__free_unpacked(rd, NULL);
 	xfree(buf);
 	return ret;
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index 8466ca40d..00bcb7a29 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -466,7 +466,6 @@ int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
 		if (work_already_completed(boinfo->handle, rd->drm_render_minor)) {
 			continue;
 		} else if (boinfo->handle != -1) {
-			pr_info("TWI: restore bo %d\n", boinfo->handle);
 			if (boinfo->is_import) {
 				fd_id = amdgpu_id_for_handle(boinfo->handle);
 				if (fd_id == -1) {
@@ -474,13 +473,11 @@ int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
 					continue;
 				}
 				dmabuf_fd = fdstore_get(fd_id);
-				pr_info("TWI: restore bo %d: fd_id %d, dmabuf_fd %d\n", boinfo->handle, fd_id, dmabuf_fd);
 			}
 		}
 
 		if (boinfo->is_import) {
 			drmPrimeFDToHandle(device_fd, dmabuf_fd, &handle);
-			pr_info("TWI: restore bo imported to handle %d\n", handle);
 		} else {
 			union drm_amdgpu_gem_create create_args = { 0 };
 
@@ -497,7 +494,6 @@ int amdgpu_plugin_drm_restore_file(int fd, CriuRenderNode *rd)
 			handle = create_args.out.handle;
 
 			drmPrimeHandleToFD(device_fd, handle, 0, &dmabuf_fd);
-			pr_info("TWI: restore bo created at handle %d and exported to fd %d\n", handle, dmabuf_fd);
 		}
 
 		change_args.handle = handle;
diff --git a/plugins/amdgpu/amdgpu_plugin_util.c b/plugins/amdgpu/amdgpu_plugin_util.c
index a2cafa4a3..592562474 100644
--- a/plugins/amdgpu/amdgpu_plugin_util.c
+++ b/plugins/amdgpu/amdgpu_plugin_util.c
@@ -135,13 +135,9 @@ int handle_for_shared_bo_fd(int fd)
 		if (trial_handle < 0)
 			continue;
 
-		pr_info("TWI: Check device %d, got handle %d\n", df->fd, trial_handle);
-
 		list_for_each_entry(bo, &shared_bos, l) {
-			if (bo->handle == trial_handle) {
-				pr_info("TWI: And that handle exists\n");
+			if (bo->handle == trial_handle)
 				return trial_handle;
-			}
 		}
 
 		amdgpu_device_deinitialize(h_dev);

From 690b6104321dc64dd2ff0c9f6aa6f7c093b24f65 Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Sun, 2 Nov 2025 07:29:35 -0800
Subject: [PATCH 1817/1854] plugins/amdgpu: return 0 in post_dump_dmabuf_check

Use `return 0` on success in `post_dump_dmabuf_check()` for consistency
with other functions.

Co-authored-by: Andrei Vagin <avagin@google.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin_dmabuf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin_dmabuf.c b/plugins/amdgpu/amdgpu_plugin_dmabuf.c
index bdc107f64..11c9792e3 100644
--- a/plugins/amdgpu/amdgpu_plugin_dmabuf.c
+++ b/plugins/amdgpu/amdgpu_plugin_dmabuf.c
@@ -179,7 +179,7 @@ int try_dump_dmabuf_list()
 		int ret = __amdgpu_plugin_dmabuf_dump(b->dmabuf_fd, b->id);
 		if (ret == -EAGAIN)
 			continue;
-		else if (ret)
+		if (ret)
 			return ret;
 		list_del(&b->node);
 		xfree(b);
@@ -193,5 +193,5 @@ int post_dump_dmabuf_check()
 		pr_err("Not all dma buffers have been dumped\n");
 		return -1;
 	}
-	return 1;
-}
\ No newline at end of file
+	return 0;
+}

From 77e6558ddb134e0e8cfbeb6ce3341bf9b3116ccd Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Sun, 2 Nov 2025 07:32:03 -0800
Subject: [PATCH 1818/1854] plugins/amdgpu: apply code-style fixes

Co-authored-by: Andrei Vagin <avagin@google.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 4640ccf88..83fa41724 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1406,10 +1406,10 @@ int amdgpu_plugin_dump_file(int fd, int id)
 	if (ret < 0) {
 		pr_perror("Failed to get dmabuf info");
 		return -1;
-	} else if (ret == 0) {
+	}
+	if (ret == 0) {
 		pr_info("Dumping dmabuf fd = %d\n", fd);
-		ret = amdgpu_plugin_dmabuf_dump(fd, id);
-		return ret;
+		return amdgpu_plugin_dmabuf_dump(fd, id);
 	}
 
 	if (major(st.st_rdev) != major(st_kfd.st_rdev) || minor(st.st_rdev) != 0) {
@@ -1425,9 +1425,9 @@ int amdgpu_plugin_dump_file(int fd, int id)
 		ret = record_dumped_fd(fd, true);
 		if (ret)
 			return ret;
-		ret = try_dump_dmabuf_list();
+
 		/* Need to return success here so that criu can call plugins for renderD nodes */
-		return ret;
+		return try_dump_dmabuf_list();
 	}
 
 	pr_info("%s() called for fd = %d\n", __func__, major(st.st_rdev));

From 6ed49894c5da4466cc89d2fc69afce29dedd6f2e Mon Sep 17 00:00:00 2001
From: David Francis <David.Francis@amd.com>
Date: Sun, 2 Nov 2025 07:32:44 -0800
Subject: [PATCH 1819/1854] plugins/amdgpu: add a comment for retry_needed

Add a comment that explains the purpose of `retry_needed`.

Co-authored-by: Andrei Vagin <avagin@google.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 83fa41724..36dc0b6b0 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1837,6 +1837,10 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
 		if (!img_fp) {
 			ret = amdgpu_plugin_dmabuf_restore(id);
 			if (ret == 1) {
+				/* This is a dmabuf fd, but the corresponding buffer object that was
+				 * exported to make it has not yet been restored. Need to try again
+				 * later when the buffer object exists, so it can be re-exported.
+				 */
 				*retry_needed = true;
 				return 0;
 			}

From f56ccfd2d6815b499f321abf2c95a6c7cb3a1c40 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 2 Nov 2025 17:01:31 +0000
Subject: [PATCH 1820/1854] plugins/amdgpu: remove unused variable

amdgpu_plugin_drm.c:167:6: error: variable 'num_bos' set but not used [-Werror,-Wunused-but-set-variable]
  167 |         int num_bos = 0;
      |

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin_drm.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index 00bcb7a29..923bfcdd1 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -164,7 +164,6 @@ static int restore_bo_contents_drm(int drm_render_minor, CriuRenderNode *rd, int
 	FILE *bo_contents_fp = NULL;
 	void *buffer = NULL;
 	char img_path[40];
-	int num_bos = 0;
 	int i, ret = 0;
 
 	ret = amdgpu_device_initialize(drm_fd, &major, &minor, &h_dev);
@@ -206,8 +205,6 @@ static int restore_bo_contents_drm(int drm_render_minor, CriuRenderNode *rd, int
 		if (rd->bo_entries[i]->num_of_vms == 0)
 			continue;
 
-		num_bos++;
-
 		snprintf(img_path, sizeof(img_path), IMG_DRM_PAGES_FILE, rd->id, drm_render_minor, i);
 
 		bo_contents_fp = open_img_file(img_path, false, &image_size);

From e4a5e164b4ccad7e82cef638f9510f932daea00f Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 5 Nov 2025 15:12:06 +0000
Subject: [PATCH 1821/1854] plugins/amdgpu: update kernel headers

This patch updates drm.h and amdgpu_drm.h kernel headers,
and adds drm_mode.h (included by drm.h) from the rocm-7.1.0
release tag.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_drm.h |  125 +++-
 plugins/amdgpu/drm.h        |   58 +-
 plugins/amdgpu/drm_mode.h   | 1362 +++++++++++++++++++++++++++++++++++
 3 files changed, 1523 insertions(+), 22 deletions(-)
 create mode 100644 plugins/amdgpu/drm_mode.h

diff --git a/plugins/amdgpu/amdgpu_drm.h b/plugins/amdgpu/amdgpu_drm.h
index 9cebd072a..69227a12b 100644
--- a/plugins/amdgpu/amdgpu_drm.h
+++ b/plugins/amdgpu/amdgpu_drm.h
@@ -58,6 +58,11 @@ extern "C" {
 #define DRM_AMDGPU_USERQ_SIGNAL		0x17
 #define DRM_AMDGPU_USERQ_WAIT		0x18
 #define DRM_AMDGPU_GEM_LIST_HANDLES	0x19
+/* not upstream */
+#define DRM_AMDGPU_GEM_DGMA		0x5c
+
+/* hybrid specific ioctls */
+#define DRM_AMDGPU_SEM			0x5b
 
 #define DRM_IOCTL_AMDGPU_GEM_CREATE	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)
 #define DRM_IOCTL_AMDGPU_GEM_MMAP	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
@@ -80,6 +85,8 @@ extern "C" {
 #define DRM_IOCTL_AMDGPU_USERQ_WAIT	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_WAIT, struct drm_amdgpu_userq_wait)
 #define DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_LIST_HANDLES, struct drm_amdgpu_gem_list_handles)
 
+#define DRM_IOCTL_AMDGPU_GEM_DGMA	DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_DGMA, struct drm_amdgpu_gem_dgma)
+
 /**
  * DOC: memory domains
  *
@@ -105,7 +112,12 @@ extern "C" {
  *
  * %AMDGPU_GEM_DOMAIN_DOORBELL	Doorbell. It is an MMIO region for
  * signalling user mode queues.
+ *
+ * %AMDGPU_GEM_DOMAIN_MMIO_REMAP	MMIO remap page (special mapping for HDP flushing).
  */
+/* hybrid specific ioctls */
+#define DRM_IOCTL_AMDGPU_SEM		DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_SEM, union drm_amdgpu_sem)
+
 #define AMDGPU_GEM_DOMAIN_CPU		0x1
 #define AMDGPU_GEM_DOMAIN_GTT		0x2
 #define AMDGPU_GEM_DOMAIN_VRAM		0x4
@@ -113,13 +125,20 @@ extern "C" {
 #define AMDGPU_GEM_DOMAIN_GWS		0x10
 #define AMDGPU_GEM_DOMAIN_OA		0x20
 #define AMDGPU_GEM_DOMAIN_DOORBELL	0x40
+#define AMDGPU_GEM_DOMAIN_MMIO_REMAP	0x80
+#define AMDGPU_GEM_DOMAIN_DGMA		0x400
+#define AMDGPU_GEM_DOMAIN_DGMA_IMPORT	0x800
+
 #define AMDGPU_GEM_DOMAIN_MASK		(AMDGPU_GEM_DOMAIN_CPU | \
 					 AMDGPU_GEM_DOMAIN_GTT | \
 					 AMDGPU_GEM_DOMAIN_VRAM | \
 					 AMDGPU_GEM_DOMAIN_GDS | \
 					 AMDGPU_GEM_DOMAIN_GWS | \
-					 AMDGPU_GEM_DOMAIN_OA | \
-					 AMDGPU_GEM_DOMAIN_DOORBELL)
+					 AMDGPU_GEM_DOMAIN_OA |\
+					 AMDGPU_GEM_DOMAIN_DOORBELL |\
+					 AMDGPU_GEM_DOMAIN_MMIO_REMAP |\
+					 AMDGPU_GEM_DOMAIN_DGMA |\
+					 AMDGPU_GEM_DOMAIN_DGMA_IMPORT)
 
 /* Flag that CPU access will be required for the case of VRAM domain */
 #define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED	(1 << 0)
@@ -182,6 +201,14 @@ extern "C" {
 /* Set PTE.D and recompress during GTT->VRAM moves according to TILING flags. */
 #define AMDGPU_GEM_CREATE_GFX12_DCC		(1 << 16)
 
+/* hybrid specific */
+/* Flag that the memory should be in SPARSE resource */
+#define AMDGPU_GEM_CREATE_SPARSE		(1ULL << 29)
+/* Flag that the memory allocation should be from top of domain */
+#define AMDGPU_GEM_CREATE_TOP_DOWN		(1ULL << 30)
+/* Flag that the memory allocation should be pinned */
+#define AMDGPU_GEM_CREATE_NO_EVICT		(1ULL << 31)
+
 struct drm_amdgpu_gem_create_in  {
 	/** the requested memory size */
 	__u64 bo_size;
@@ -581,6 +608,35 @@ struct drm_amdgpu_userq_wait {
 	__u64	out_fences;
 };
 
+/* sem related */
+#define AMDGPU_SEM_OP_CREATE_SEM        1
+#define AMDGPU_SEM_OP_WAIT_SEM	        2
+#define AMDGPU_SEM_OP_SIGNAL_SEM        3
+#define AMDGPU_SEM_OP_DESTROY_SEM       4
+#define AMDGPU_SEM_OP_IMPORT_SEM	5
+#define AMDGPU_SEM_OP_EXPORT_SEM	6
+
+struct drm_amdgpu_sem_in {
+	/** AMDGPU_SEM_OP_* */
+	uint32_t	op;
+	uint32_t        handle;
+	uint32_t	ctx_id;
+	uint32_t        ip_type;
+	uint32_t        ip_instance;
+	uint32_t        ring;
+	uint64_t        seq;
+};
+
+union drm_amdgpu_sem_out {
+	int32_t         fd;
+	uint32_t	handle;
+};
+
+union drm_amdgpu_sem {
+	struct drm_amdgpu_sem_in in;
+	union drm_amdgpu_sem_out out;
+};
+
 /* vm ioctl */
 #define AMDGPU_VM_OP_RESERVE_VMID	1
 #define AMDGPU_VM_OP_UNRESERVE_VMID	2
@@ -637,6 +693,15 @@ struct drm_amdgpu_gem_userptr {
 	__u32		handle;
 };
 
+#define AMDGPU_GEM_DGMA_IMPORT			0
+#define AMDGPU_GEM_DGMA_QUERY_PHYS_ADDR		1
+struct drm_amdgpu_gem_dgma {
+	__u64		addr;
+	__u64		size;
+	__u32		op;
+	__u32		handle;
+};
+
 /* SI-CI-VI: */
 /* same meaning as the GB_TILE_MODE and GL_MACRO_TILE_MODE fields */
 #define AMDGPU_TILING_ARRAY_MODE_SHIFT			0
@@ -1084,10 +1149,11 @@ struct drm_amdgpu_cs_chunk_cp_gfx_shadow {
  *  Query h/w info: Flag that this is integrated (a.h.a. fusion) GPU
  *
  */
-#define AMDGPU_IDS_FLAGS_FUSION         0x1
-#define AMDGPU_IDS_FLAGS_PREEMPTION     0x2
-#define AMDGPU_IDS_FLAGS_TMZ            0x4
-#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD 0x8
+#define AMDGPU_IDS_FLAGS_FUSION			0x01
+#define AMDGPU_IDS_FLAGS_PREEMPTION		0x02
+#define AMDGPU_IDS_FLAGS_TMZ			0x04
+#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD	0x08
+#define AMDGPU_IDS_FLAGS_GANG_SUBMIT		0x10
 
 /*
  *  Query h/w info: Flag identifying VF/PF/PT mode
@@ -1269,6 +1335,16 @@ struct drm_amdgpu_cs_chunk_cp_gfx_shadow {
 /* query FW object size and alignment */
 #define AMDGPU_INFO_UQ_FW_AREAS			0x24
 
+/* Hybrid Stack Specific Defs*/
+/* gpu capability */
+#define AMDGPU_INFO_CAPABILITY			0x50
+/* virtual range */
+#define AMDGPU_INFO_VIRTUAL_RANGE		0x51
+/* query pin memory capability */
+#define AMDGPU_CAPABILITY_PIN_MEM_FLAG  (1 << 0)
+/* query direct gma capability */
+#define AMDGPU_CAPABILITY_DIRECT_GMA_FLAG	(1 << 1)
+
 #define AMDGPU_INFO_MMR_SE_INDEX_SHIFT	0
 #define AMDGPU_INFO_MMR_SE_INDEX_MASK	0xff
 #define AMDGPU_INFO_MMR_SH_INDEX_SHIFT	8
@@ -1325,6 +1401,11 @@ struct drm_amdgpu_info {
 			__u32 flags;
 		} read_mmr_reg;
 
+		struct {
+			uint32_t aperture;
+			uint32_t _pad;
+		} virtual_range;
+
 		struct drm_amdgpu_query_fw query_fw;
 
 		struct {
@@ -1423,6 +1504,8 @@ struct drm_amdgpu_info_vbios {
 #define AMDGPU_VRAM_TYPE_LPDDR5 12
 #define AMDGPU_VRAM_TYPE_HBM3E 13
 
+#define AMDGPU_VRAM_TYPE_HBM_WIDTH 4096
+
 struct drm_amdgpu_info_device {
 	/** PCI Device ID */
 	__u32 device_id;
@@ -1672,6 +1755,7 @@ struct drm_amdgpu_info_uq_metadata {
 #define AMDGPU_FAMILY_GC_11_5_0			150 /* GC 11.5.0 */
 #define AMDGPU_FAMILY_GC_12_0_0			152 /* GC 12.0.0 */
 
+#ifndef HAVE_DRM_COLOR_CTM_3X4
 /* FIXME wrong namespace! */
 struct drm_color_ctm_3x4 {
 	/*
@@ -1680,6 +1764,35 @@ struct drm_color_ctm_3x4 {
 	 */
 	__u64 matrix[12];
 };
+#endif
+
+/**
+ *  Definition of System Unified Address (SUA) apertures
+ */
+#define AMDGPU_SUA_APERTURE_PRIVATE    1
+#define AMDGPU_SUA_APERTURE_SHARED     2
+struct drm_amdgpu_virtual_range {
+	uint64_t start;
+	uint64_t end;
+};
+
+struct drm_amdgpu_capability {
+	__u32 flag;
+	__u32 direct_gma_size;
+};
+
+/*
+ * Definition of free sync enter and exit signals
+ * We may have more options in the future
+ */
+#define AMDGPU_FREESYNC_FULLSCREEN_ENTER                1
+#define AMDGPU_FREESYNC_FULLSCREEN_EXIT                 2
+
+struct drm_amdgpu_freesync {
+        __u32 op;                       /* AMDGPU_FREESYNC_FULLSCREEN_ENTER or */
+                                        /* AMDGPU_FREESYNC_FULLSCREEN_ENTER */
+        __u32 spare[7];
+};
 
 #if defined(__cplusplus)
 }
diff --git a/plugins/amdgpu/drm.h b/plugins/amdgpu/drm.h
index 84c819c17..3cd5cf15e 100644
--- a/plugins/amdgpu/drm.h
+++ b/plugins/amdgpu/drm.h
@@ -597,40 +597,62 @@ struct drm_set_version {
 	int drm_dd_minor;
 };
 
-/* DRM_IOCTL_GEM_CLOSE ioctl argument type */
+/**
+ * struct drm_gem_close - Argument for &DRM_IOCTL_GEM_CLOSE ioctl.
+ * @handle: Handle of the object to be closed.
+ * @pad: Padding.
+ *
+ * Releases the handle to an mm object.
+ */
 struct drm_gem_close {
-	/** Handle of the object to be closed. */
 	__u32 handle;
 	__u32 pad;
 };
 
-/* DRM_IOCTL_GEM_FLINK ioctl argument type */
+/**
+ * struct drm_gem_flink - Argument for &DRM_IOCTL_GEM_FLINK ioctl.
+ * @handle: Handle for the object being named.
+ * @name: Returned global name.
+ *
+ * Create a global name for an object, returning the name.
+ *
+ * Note that the name does not hold a reference; when the object
+ * is freed, the name goes away.
+ */
 struct drm_gem_flink {
-	/** Handle for the object being named */
 	__u32 handle;
-
-	/** Returned global name */
 	__u32 name;
 };
 
-/* DRM_IOCTL_GEM_OPEN ioctl argument type */
+/**
+ * struct drm_gem_open - Argument for &DRM_IOCTL_GEM_OPEN ioctl.
+ * @name: Name of object being opened.
+ * @handle: Returned handle for the object.
+ * @size: Returned size of the object
+ *
+ * Open an object using the global name, returning a handle and the size.
+ *
+ * This handle (of course) holds a reference to the object, so the object
+ * will not go away until the handle is deleted.
+ */
 struct drm_gem_open {
-	/** Name of object being opened */
 	__u32 name;
-
-	/** Returned handle for the object */
 	__u32 handle;
-
-	/** Returned size of the object */
 	__u64 size;
 };
 
-/* DRM_IOCTL_GEM_CHANGE_HANDLE ioctl argument type */
+/**
+ * struct drm_gem_change_handle - Argument for &DRM_IOCTL_GEM_CHANGE_HANDLE ioctl.
+ * @handle: The handle of a gem object.
+ * @new_handle: An available gem handle.
+ *
+ * This ioctl changes the handle of a GEM object to the specified one.
+ * The new handle must be unused. On success the old handle is closed
+ * and all further IOCTL should refer to the new handle only.
+ * Calls to DRM_IOCTL_PRIME_FD_TO_HANDLE will return the new handle.
+ */
 struct drm_gem_change_handle {
-	/** Current handle of object */
 	__u32 handle;
-
-	/** Handle to change that object to */
 	__u32 new_handle;
 };
 
@@ -914,13 +936,17 @@ struct drm_syncobj_destroy {
 };
 
 #define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0)
+#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_TIMELINE         (1 << 1)
 #define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0)
+#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_TIMELINE         (1 << 1)
 struct drm_syncobj_handle {
 	__u32 handle;
 	__u32 flags;
 
 	__s32 fd;
 	__u32 pad;
+
+	__u64 point;
 };
 
 struct drm_syncobj_transfer {
diff --git a/plugins/amdgpu/drm_mode.h b/plugins/amdgpu/drm_mode.h
new file mode 100644
index 000000000..c082810c0
--- /dev/null
+++ b/plugins/amdgpu/drm_mode.h
@@ -0,0 +1,1362 @@
+/*
+ * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ * Copyright (c) 2007 Jakob Bornecrantz <wallbraker@gmail.com>
+ * Copyright (c) 2008 Red Hat Inc.
+ * Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA
+ * Copyright (c) 2007-2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef _DRM_MODE_H
+#define _DRM_MODE_H
+
+#include "drm.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/**
+ * DOC: overview
+ *
+ * DRM exposes many UAPI and structure definitions to have a consistent
+ * and standardized interface with users.
+ * Userspace can refer to these structure definitions and UAPI formats
+ * to communicate to drivers.
+ */
+
+#define DRM_CONNECTOR_NAME_LEN	32
+#define DRM_DISPLAY_MODE_LEN	32
+#define DRM_PROP_NAME_LEN	32
+
+#define DRM_MODE_TYPE_BUILTIN	(1<<0) /* deprecated */
+#define DRM_MODE_TYPE_CLOCK_C	((1<<1) | DRM_MODE_TYPE_BUILTIN) /* deprecated */
+#define DRM_MODE_TYPE_CRTC_C	((1<<2) | DRM_MODE_TYPE_BUILTIN) /* deprecated */
+#define DRM_MODE_TYPE_PREFERRED	(1<<3)
+#define DRM_MODE_TYPE_DEFAULT	(1<<4) /* deprecated */
+#define DRM_MODE_TYPE_USERDEF	(1<<5)
+#define DRM_MODE_TYPE_DRIVER	(1<<6)
+
+#define DRM_MODE_TYPE_ALL	(DRM_MODE_TYPE_PREFERRED |	\
+				 DRM_MODE_TYPE_USERDEF |	\
+				 DRM_MODE_TYPE_DRIVER)
+
+/* Video mode flags */
+/* bit compatible with the xrandr RR_ definitions (bits 0-13)
+ *
+ * ABI warning: Existing userspace really expects
+ * the mode flags to match the xrandr definitions. Any
+ * changes that don't match the xrandr definitions will
+ * likely need a new client cap or some other mechanism
+ * to avoid breaking existing userspace. This includes
+ * allocating new flags in the previously unused bits!
+ */
+#define DRM_MODE_FLAG_PHSYNC			(1<<0)
+#define DRM_MODE_FLAG_NHSYNC			(1<<1)
+#define DRM_MODE_FLAG_PVSYNC			(1<<2)
+#define DRM_MODE_FLAG_NVSYNC			(1<<3)
+#define DRM_MODE_FLAG_INTERLACE			(1<<4)
+#define DRM_MODE_FLAG_DBLSCAN			(1<<5)
+#define DRM_MODE_FLAG_CSYNC			(1<<6)
+#define DRM_MODE_FLAG_PCSYNC			(1<<7)
+#define DRM_MODE_FLAG_NCSYNC			(1<<8)
+#define DRM_MODE_FLAG_HSKEW			(1<<9) /* hskew provided */
+#define DRM_MODE_FLAG_BCAST			(1<<10) /* deprecated */
+#define DRM_MODE_FLAG_PIXMUX			(1<<11) /* deprecated */
+#define DRM_MODE_FLAG_DBLCLK			(1<<12)
+#define DRM_MODE_FLAG_CLKDIV2			(1<<13)
+ /*
+  * When adding a new stereo mode don't forget to adjust DRM_MODE_FLAGS_3D_MAX
+  * (define not exposed to user space).
+  */
+#define DRM_MODE_FLAG_3D_MASK			(0x1f<<14)
+#define  DRM_MODE_FLAG_3D_NONE		(0<<14)
+#define  DRM_MODE_FLAG_3D_FRAME_PACKING		(1<<14)
+#define  DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE	(2<<14)
+#define  DRM_MODE_FLAG_3D_LINE_ALTERNATIVE	(3<<14)
+#define  DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL	(4<<14)
+#define  DRM_MODE_FLAG_3D_L_DEPTH		(5<<14)
+#define  DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH	(6<<14)
+#define  DRM_MODE_FLAG_3D_TOP_AND_BOTTOM	(7<<14)
+#define  DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF	(8<<14)
+
+/* Picture aspect ratio options */
+#define DRM_MODE_PICTURE_ASPECT_NONE		0
+#define DRM_MODE_PICTURE_ASPECT_4_3		1
+#define DRM_MODE_PICTURE_ASPECT_16_9		2
+#define DRM_MODE_PICTURE_ASPECT_64_27		3
+#define DRM_MODE_PICTURE_ASPECT_256_135		4
+
+/* Content type options */
+#define DRM_MODE_CONTENT_TYPE_NO_DATA		0
+#define DRM_MODE_CONTENT_TYPE_GRAPHICS		1
+#define DRM_MODE_CONTENT_TYPE_PHOTO		2
+#define DRM_MODE_CONTENT_TYPE_CINEMA		3
+#define DRM_MODE_CONTENT_TYPE_GAME		4
+
+/* Aspect ratio flag bitmask (4 bits 22:19) */
+#define DRM_MODE_FLAG_PIC_AR_MASK		(0x0F<<19)
+#define  DRM_MODE_FLAG_PIC_AR_NONE \
+			(DRM_MODE_PICTURE_ASPECT_NONE<<19)
+#define  DRM_MODE_FLAG_PIC_AR_4_3 \
+			(DRM_MODE_PICTURE_ASPECT_4_3<<19)
+#define  DRM_MODE_FLAG_PIC_AR_16_9 \
+			(DRM_MODE_PICTURE_ASPECT_16_9<<19)
+#define  DRM_MODE_FLAG_PIC_AR_64_27 \
+			(DRM_MODE_PICTURE_ASPECT_64_27<<19)
+#define  DRM_MODE_FLAG_PIC_AR_256_135 \
+			(DRM_MODE_PICTURE_ASPECT_256_135<<19)
+
+#define  DRM_MODE_FLAG_ALL	(DRM_MODE_FLAG_PHSYNC |		\
+				 DRM_MODE_FLAG_NHSYNC |		\
+				 DRM_MODE_FLAG_PVSYNC |		\
+				 DRM_MODE_FLAG_NVSYNC |		\
+				 DRM_MODE_FLAG_INTERLACE |	\
+				 DRM_MODE_FLAG_DBLSCAN |	\
+				 DRM_MODE_FLAG_CSYNC |		\
+				 DRM_MODE_FLAG_PCSYNC |		\
+				 DRM_MODE_FLAG_NCSYNC |		\
+				 DRM_MODE_FLAG_HSKEW |		\
+				 DRM_MODE_FLAG_DBLCLK |		\
+				 DRM_MODE_FLAG_CLKDIV2 |	\
+				 DRM_MODE_FLAG_3D_MASK)
+
+/* DPMS flags */
+/* bit compatible with the xorg definitions. */
+#define DRM_MODE_DPMS_ON	0
+#define DRM_MODE_DPMS_STANDBY	1
+#define DRM_MODE_DPMS_SUSPEND	2
+#define DRM_MODE_DPMS_OFF	3
+
+/* Scaling mode options */
+#define DRM_MODE_SCALE_NONE		0 /* Unmodified timing (display or
+					     software can still scale) */
+#define DRM_MODE_SCALE_FULLSCREEN	1 /* Full screen, ignore aspect */
+#define DRM_MODE_SCALE_CENTER		2 /* Centered, no scaling */
+#define DRM_MODE_SCALE_ASPECT		3 /* Full screen, preserve aspect */
+
+/* Dithering mode options */
+#define DRM_MODE_DITHERING_OFF	0
+#define DRM_MODE_DITHERING_ON	1
+#define DRM_MODE_DITHERING_AUTO 2
+
+/* Dirty info options */
+#define DRM_MODE_DIRTY_OFF      0
+#define DRM_MODE_DIRTY_ON       1
+#define DRM_MODE_DIRTY_ANNOTATE 2
+
+/* Link Status options */
+#define DRM_MODE_LINK_STATUS_GOOD	0
+#define DRM_MODE_LINK_STATUS_BAD	1
+
+/*
+ * DRM_MODE_ROTATE_<degrees>
+ *
+ * Signals that a drm plane is been rotated <degrees> degrees in counter
+ * clockwise direction.
+ *
+ * This define is provided as a convenience, looking up the property id
+ * using the name->prop id lookup is the preferred method.
+ */
+#define DRM_MODE_ROTATE_0       (1<<0)
+#define DRM_MODE_ROTATE_90      (1<<1)
+#define DRM_MODE_ROTATE_180     (1<<2)
+#define DRM_MODE_ROTATE_270     (1<<3)
+
+/*
+ * DRM_MODE_ROTATE_MASK
+ *
+ * Bitmask used to look for drm plane rotations.
+ */
+#define DRM_MODE_ROTATE_MASK (\
+		DRM_MODE_ROTATE_0  | \
+		DRM_MODE_ROTATE_90  | \
+		DRM_MODE_ROTATE_180 | \
+		DRM_MODE_ROTATE_270)
+
+/*
+ * DRM_MODE_REFLECT_<axis>
+ *
+ * Signals that the contents of a drm plane is reflected along the <axis> axis,
+ * in the same way as mirroring.
+ * See kerneldoc chapter "Plane Composition Properties" for more details.
+ *
+ * This define is provided as a convenience, looking up the property id
+ * using the name->prop id lookup is the preferred method.
+ */
+#define DRM_MODE_REFLECT_X      (1<<4)
+#define DRM_MODE_REFLECT_Y      (1<<5)
+
+/*
+ * DRM_MODE_REFLECT_MASK
+ *
+ * Bitmask used to look for drm plane reflections.
+ */
+#define DRM_MODE_REFLECT_MASK (\
+		DRM_MODE_REFLECT_X | \
+		DRM_MODE_REFLECT_Y)
+
+/* Content Protection Flags */
+#define DRM_MODE_CONTENT_PROTECTION_UNDESIRED	0
+#define DRM_MODE_CONTENT_PROTECTION_DESIRED     1
+#define DRM_MODE_CONTENT_PROTECTION_ENABLED     2
+
+/**
+ * struct drm_mode_modeinfo - Display mode information.
+ * @clock: pixel clock in kHz
+ * @hdisplay: horizontal display size
+ * @hsync_start: horizontal sync start
+ * @hsync_end: horizontal sync end
+ * @htotal: horizontal total size
+ * @hskew: horizontal skew
+ * @vdisplay: vertical display size
+ * @vsync_start: vertical sync start
+ * @vsync_end: vertical sync end
+ * @vtotal: vertical total size
+ * @vscan: vertical scan
+ * @vrefresh: approximate vertical refresh rate in Hz
+ * @flags: bitmask of misc. flags, see DRM_MODE_FLAG_* defines
+ * @type: bitmask of type flags, see DRM_MODE_TYPE_* defines
+ * @name: string describing the mode resolution
+ *
+ * This is the user-space API display mode information structure. For the
+ * kernel version see struct drm_display_mode.
+ */
+struct drm_mode_modeinfo {
+	__u32 clock;
+	__u16 hdisplay;
+	__u16 hsync_start;
+	__u16 hsync_end;
+	__u16 htotal;
+	__u16 hskew;
+	__u16 vdisplay;
+	__u16 vsync_start;
+	__u16 vsync_end;
+	__u16 vtotal;
+	__u16 vscan;
+
+	__u32 vrefresh;
+
+	__u32 flags;
+	__u32 type;
+	char name[DRM_DISPLAY_MODE_LEN];
+};
+
+struct drm_mode_card_res {
+	__u64 fb_id_ptr;
+	__u64 crtc_id_ptr;
+	__u64 connector_id_ptr;
+	__u64 encoder_id_ptr;
+	__u32 count_fbs;
+	__u32 count_crtcs;
+	__u32 count_connectors;
+	__u32 count_encoders;
+	__u32 min_width;
+	__u32 max_width;
+	__u32 min_height;
+	__u32 max_height;
+};
+
+struct drm_mode_crtc {
+	__u64 set_connectors_ptr;
+	__u32 count_connectors;
+
+	__u32 crtc_id; /**< Id */
+	__u32 fb_id; /**< Id of framebuffer */
+
+	__u32 x; /**< x Position on the framebuffer */
+	__u32 y; /**< y Position on the framebuffer */
+
+	__u32 gamma_size;
+	__u32 mode_valid;
+	struct drm_mode_modeinfo mode;
+};
+
+#define DRM_MODE_PRESENT_TOP_FIELD	(1<<0)
+#define DRM_MODE_PRESENT_BOTTOM_FIELD	(1<<1)
+
+/* Planes blend with or override other bits on the CRTC */
+struct drm_mode_set_plane {
+	__u32 plane_id;
+	__u32 crtc_id;
+	__u32 fb_id; /* fb object contains surface format type */
+	__u32 flags; /* see above flags */
+
+	/* Signed dest location allows it to be partially off screen */
+	__s32 crtc_x;
+	__s32 crtc_y;
+	__u32 crtc_w;
+	__u32 crtc_h;
+
+	/* Source values are 16.16 fixed point */
+	__u32 src_x;
+	__u32 src_y;
+	__u32 src_h;
+	__u32 src_w;
+};
+
+/**
+ * struct drm_mode_get_plane - Get plane metadata.
+ *
+ * Userspace can perform a GETPLANE ioctl to retrieve information about a
+ * plane.
+ *
+ * To retrieve the number of formats supported, set @count_format_types to zero
+ * and call the ioctl. @count_format_types will be updated with the value.
+ *
+ * To retrieve these formats, allocate an array with the memory needed to store
+ * @count_format_types formats. Point @format_type_ptr to this array and call
+ * the ioctl again (with @count_format_types still set to the value returned in
+ * the first ioctl call).
+ */
+struct drm_mode_get_plane {
+	/**
+	 * @plane_id: Object ID of the plane whose information should be
+	 * retrieved. Set by caller.
+	 */
+	__u32 plane_id;
+
+	/** @crtc_id: Object ID of the current CRTC. */
+	__u32 crtc_id;
+	/** @fb_id: Object ID of the current fb. */
+	__u32 fb_id;
+
+	/**
+	 * @possible_crtcs: Bitmask of CRTC's compatible with the plane. CRTC's
+	 * are created and they receive an index, which corresponds to their
+	 * position in the bitmask. Bit N corresponds to
+	 * :ref:`CRTC index<crtc_index>` N.
+	 */
+	__u32 possible_crtcs;
+	/** @gamma_size: Never used. */
+	__u32 gamma_size;
+
+	/** @count_format_types: Number of formats. */
+	__u32 count_format_types;
+	/**
+	 * @format_type_ptr: Pointer to ``__u32`` array of formats that are
+	 * supported by the plane. These formats do not require modifiers.
+	 */
+	__u64 format_type_ptr;
+};
+
+struct drm_mode_get_plane_res {
+	__u64 plane_id_ptr;
+	__u32 count_planes;
+};
+
+#define DRM_MODE_ENCODER_NONE	0
+#define DRM_MODE_ENCODER_DAC	1
+#define DRM_MODE_ENCODER_TMDS	2
+#define DRM_MODE_ENCODER_LVDS	3
+#define DRM_MODE_ENCODER_TVDAC	4
+#define DRM_MODE_ENCODER_VIRTUAL 5
+#define DRM_MODE_ENCODER_DSI	6
+#define DRM_MODE_ENCODER_DPMST	7
+#define DRM_MODE_ENCODER_DPI	8
+
+struct drm_mode_get_encoder {
+	__u32 encoder_id;
+	__u32 encoder_type;
+
+	__u32 crtc_id; /**< Id of crtc */
+
+	__u32 possible_crtcs;
+	__u32 possible_clones;
+};
+
+/* This is for connectors with multiple signal types. */
+/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
+enum drm_mode_subconnector {
+	DRM_MODE_SUBCONNECTOR_Automatic   = 0,  /* DVI-I, TV     */
+	DRM_MODE_SUBCONNECTOR_Unknown     = 0,  /* DVI-I, TV, DP */
+	DRM_MODE_SUBCONNECTOR_VGA	  = 1,  /*            DP */
+	DRM_MODE_SUBCONNECTOR_DVID	  = 3,  /* DVI-I      DP */
+	DRM_MODE_SUBCONNECTOR_DVIA	  = 4,  /* DVI-I         */
+	DRM_MODE_SUBCONNECTOR_Composite   = 5,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SVIDEO	  = 6,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_Component   = 8,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_SCART	  = 9,  /*        TV     */
+	DRM_MODE_SUBCONNECTOR_DisplayPort = 10, /*            DP */
+	DRM_MODE_SUBCONNECTOR_HDMIA       = 11, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Native      = 15, /*            DP */
+	DRM_MODE_SUBCONNECTOR_Wireless    = 18, /*            DP */
+};
+
+#define DRM_MODE_CONNECTOR_Unknown	0
+#define DRM_MODE_CONNECTOR_VGA		1
+#define DRM_MODE_CONNECTOR_DVII		2
+#define DRM_MODE_CONNECTOR_DVID		3
+#define DRM_MODE_CONNECTOR_DVIA		4
+#define DRM_MODE_CONNECTOR_Composite	5
+#define DRM_MODE_CONNECTOR_SVIDEO	6
+#define DRM_MODE_CONNECTOR_LVDS		7
+#define DRM_MODE_CONNECTOR_Component	8
+#define DRM_MODE_CONNECTOR_9PinDIN	9
+#define DRM_MODE_CONNECTOR_DisplayPort	10
+#define DRM_MODE_CONNECTOR_HDMIA	11
+#define DRM_MODE_CONNECTOR_HDMIB	12
+#define DRM_MODE_CONNECTOR_TV		13
+#define DRM_MODE_CONNECTOR_eDP		14
+#define DRM_MODE_CONNECTOR_VIRTUAL      15
+#define DRM_MODE_CONNECTOR_DSI		16
+#define DRM_MODE_CONNECTOR_DPI		17
+#define DRM_MODE_CONNECTOR_WRITEBACK	18
+#define DRM_MODE_CONNECTOR_SPI		19
+#define DRM_MODE_CONNECTOR_USB		20
+
+/**
+ * struct drm_mode_get_connector - Get connector metadata.
+ *
+ * User-space can perform a GETCONNECTOR ioctl to retrieve information about a
+ * connector. User-space is expected to retrieve encoders, modes and properties
+ * by performing this ioctl at least twice: the first time to retrieve the
+ * number of elements, the second time to retrieve the elements themselves.
+ *
+ * To retrieve the number of elements, set @count_props and @count_encoders to
+ * zero, set @count_modes to 1, and set @modes_ptr to a temporary struct
+ * drm_mode_modeinfo element.
+ *
+ * To retrieve the elements, allocate arrays for @encoders_ptr, @modes_ptr,
+ * @props_ptr and @prop_values_ptr, then set @count_modes, @count_props and
+ * @count_encoders to their capacity.
+ *
+ * Performing the ioctl only twice may be racy: the number of elements may have
+ * changed with a hotplug event in-between the two ioctls. User-space is
+ * expected to retry the last ioctl until the number of elements stabilizes.
+ * The kernel won't fill any array which doesn't have the expected length.
+ *
+ * **Force-probing a connector**
+ *
+ * If the @count_modes field is set to zero and the DRM client is the current
+ * DRM master, the kernel will perform a forced probe on the connector to
+ * refresh the connector status, modes and EDID. A forced-probe can be slow,
+ * might cause flickering and the ioctl will block.
+ *
+ * User-space needs to force-probe connectors to ensure their metadata is
+ * up-to-date at startup and after receiving a hot-plug event. User-space
+ * may perform a forced-probe when the user explicitly requests it. User-space
+ * shouldn't perform a forced-probe in other situations.
+ */
+struct drm_mode_get_connector {
+	/** @encoders_ptr: Pointer to ``__u32`` array of object IDs. */
+	__u64 encoders_ptr;
+	/** @modes_ptr: Pointer to struct drm_mode_modeinfo array. */
+	__u64 modes_ptr;
+	/** @props_ptr: Pointer to ``__u32`` array of property IDs. */
+	__u64 props_ptr;
+	/** @prop_values_ptr: Pointer to ``__u64`` array of property values. */
+	__u64 prop_values_ptr;
+
+	/** @count_modes: Number of modes. */
+	__u32 count_modes;
+	/** @count_props: Number of properties. */
+	__u32 count_props;
+	/** @count_encoders: Number of encoders. */
+	__u32 count_encoders;
+
+	/** @encoder_id: Object ID of the current encoder. */
+	__u32 encoder_id;
+	/** @connector_id: Object ID of the connector. */
+	__u32 connector_id;
+	/**
+	 * @connector_type: Type of the connector.
+	 *
+	 * See DRM_MODE_CONNECTOR_* defines.
+	 */
+	__u32 connector_type;
+	/**
+	 * @connector_type_id: Type-specific connector number.
+	 *
+	 * This is not an object ID. This is a per-type connector number. Each
+	 * (type, type_id) combination is unique across all connectors of a DRM
+	 * device.
+	 *
+	 * The (type, type_id) combination is not a stable identifier: the
+	 * type_id can change depending on the driver probe order.
+	 */
+	__u32 connector_type_id;
+
+	/**
+	 * @connection: Status of the connector.
+	 *
+	 * See enum drm_connector_status.
+	 */
+	__u32 connection;
+	/** @mm_width: Width of the connected sink in millimeters. */
+	__u32 mm_width;
+	/** @mm_height: Height of the connected sink in millimeters. */
+	__u32 mm_height;
+	/**
+	 * @subpixel: Subpixel order of the connected sink.
+	 *
+	 * See enum subpixel_order.
+	 */
+	__u32 subpixel;
+
+	/** @pad: Padding, must be zero. */
+	__u32 pad;
+};
+
+#define DRM_MODE_PROP_PENDING	(1<<0) /* deprecated, do not use */
+#define DRM_MODE_PROP_RANGE	(1<<1)
+#define DRM_MODE_PROP_IMMUTABLE	(1<<2)
+#define DRM_MODE_PROP_ENUM	(1<<3) /* enumerated type with text strings */
+#define DRM_MODE_PROP_BLOB	(1<<4)
+#define DRM_MODE_PROP_BITMASK	(1<<5) /* bitmask of enumerated types */
+
+/* non-extended types: legacy bitmask, one bit per type: */
+#define DRM_MODE_PROP_LEGACY_TYPE  ( \
+		DRM_MODE_PROP_RANGE | \
+		DRM_MODE_PROP_ENUM | \
+		DRM_MODE_PROP_BLOB | \
+		DRM_MODE_PROP_BITMASK)
+
+/* extended-types: rather than continue to consume a bit per type,
+ * grab a chunk of the bits to use as integer type id.
+ */
+#define DRM_MODE_PROP_EXTENDED_TYPE	0x0000ffc0
+#define DRM_MODE_PROP_TYPE(n)		((n) << 6)
+#define DRM_MODE_PROP_OBJECT		DRM_MODE_PROP_TYPE(1)
+#define DRM_MODE_PROP_SIGNED_RANGE	DRM_MODE_PROP_TYPE(2)
+
+/* the PROP_ATOMIC flag is used to hide properties from userspace that
+ * is not aware of atomic properties.  This is mostly to work around
+ * older userspace (DDX drivers) that read/write each prop they find,
+ * without being aware that this could be triggering a lengthy modeset.
+ */
+#define DRM_MODE_PROP_ATOMIC        0x80000000
+
+/**
+ * struct drm_mode_property_enum - Description for an enum/bitfield entry.
+ * @value: numeric value for this enum entry.
+ * @name: symbolic name for this enum entry.
+ *
+ * See struct drm_property_enum for details.
+ */
+struct drm_mode_property_enum {
+	__u64 value;
+	char name[DRM_PROP_NAME_LEN];
+};
+
+/**
+ * struct drm_mode_get_property - Get property metadata.
+ *
+ * User-space can perform a GETPROPERTY ioctl to retrieve information about a
+ * property. The same property may be attached to multiple objects, see
+ * "Modeset Base Object Abstraction".
+ *
+ * The meaning of the @values_ptr field changes depending on the property type.
+ * See &drm_property.flags for more details.
+ *
+ * The @enum_blob_ptr and @count_enum_blobs fields are only meaningful when the
+ * property has the type &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK. For
+ * backwards compatibility, the kernel will always set @count_enum_blobs to
+ * zero when the property has the type &DRM_MODE_PROP_BLOB. User-space must
+ * ignore these two fields if the property has a different type.
+ *
+ * User-space is expected to retrieve values and enums by performing this ioctl
+ * at least twice: the first time to retrieve the number of elements, the
+ * second time to retrieve the elements themselves.
+ *
+ * To retrieve the number of elements, set @count_values and @count_enum_blobs
+ * to zero, then call the ioctl. @count_values will be updated with the number
+ * of elements. If the property has the type &DRM_MODE_PROP_ENUM or
+ * &DRM_MODE_PROP_BITMASK, @count_enum_blobs will be updated as well.
+ *
+ * To retrieve the elements themselves, allocate an array for @values_ptr and
+ * set @count_values to its capacity. If the property has the type
+ * &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK, allocate an array for
+ * @enum_blob_ptr and set @count_enum_blobs to its capacity. Calling the ioctl
+ * again will fill the arrays.
+ */
+struct drm_mode_get_property {
+	/** @values_ptr: Pointer to a ``__u64`` array. */
+	__u64 values_ptr;
+	/** @enum_blob_ptr: Pointer to a struct drm_mode_property_enum array. */
+	__u64 enum_blob_ptr;
+
+	/**
+	 * @prop_id: Object ID of the property which should be retrieved. Set
+	 * by the caller.
+	 */
+	__u32 prop_id;
+	/**
+	 * @flags: ``DRM_MODE_PROP_*`` bitfield. See &drm_property.flags for
+	 * a definition of the flags.
+	 */
+	__u32 flags;
+	/**
+	 * @name: Symbolic property name. User-space should use this field to
+	 * recognize properties.
+	 */
+	char name[DRM_PROP_NAME_LEN];
+
+	/** @count_values: Number of elements in @values_ptr. */
+	__u32 count_values;
+	/** @count_enum_blobs: Number of elements in @enum_blob_ptr. */
+	__u32 count_enum_blobs;
+};
+
+struct drm_mode_connector_set_property {
+	__u64 value;
+	__u32 prop_id;
+	__u32 connector_id;
+};
+
+#define DRM_MODE_OBJECT_CRTC 0xcccccccc
+#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0
+#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0
+#define DRM_MODE_OBJECT_MODE 0xdededede
+#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0
+#define DRM_MODE_OBJECT_FB 0xfbfbfbfb
+#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb
+#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee
+#define DRM_MODE_OBJECT_ANY 0
+
+struct drm_mode_obj_get_properties {
+	__u64 props_ptr;
+	__u64 prop_values_ptr;
+	__u32 count_props;
+	__u32 obj_id;
+	__u32 obj_type;
+};
+
+struct drm_mode_obj_set_property {
+	__u64 value;
+	__u32 prop_id;
+	__u32 obj_id;
+	__u32 obj_type;
+};
+
+struct drm_mode_get_blob {
+	__u32 blob_id;
+	__u32 length;
+	__u64 data;
+};
+
+struct drm_mode_fb_cmd {
+	__u32 fb_id;
+	__u32 width;
+	__u32 height;
+	__u32 pitch;
+	__u32 bpp;
+	__u32 depth;
+	/* driver specific handle */
+	__u32 handle;
+};
+
+#define DRM_MODE_FB_INTERLACED	(1<<0) /* for interlaced framebuffers */
+#define DRM_MODE_FB_MODIFIERS	(1<<1) /* enables ->modifier[] */
+
+/**
+ * struct drm_mode_fb_cmd2 - Frame-buffer metadata.
+ *
+ * This struct holds frame-buffer metadata. There are two ways to use it:
+ *
+ * - User-space can fill this struct and perform a &DRM_IOCTL_MODE_ADDFB2
+ *   ioctl to register a new frame-buffer. The new frame-buffer object ID will
+ *   be set by the kernel in @fb_id.
+ * - User-space can set @fb_id and perform a &DRM_IOCTL_MODE_GETFB2 ioctl to
+ *   fetch metadata about an existing frame-buffer.
+ *
+ * In case of planar formats, this struct allows up to 4 buffer objects with
+ * offsets and pitches per plane. The pitch and offset order are dictated by
+ * the format FourCC as defined by ``drm_fourcc.h``, e.g. NV12 is described as:
+ *
+ *     YUV 4:2:0 image with a plane of 8-bit Y samples followed by an
+ *     interleaved U/V plane containing 8-bit 2x2 subsampled colour difference
+ *     samples.
+ *
+ * So it would consist of a Y plane at ``offsets[0]`` and a UV plane at
+ * ``offsets[1]``.
+ *
+ * To accommodate tiled, compressed, etc formats, a modifier can be specified.
+ * For more information see the "Format Modifiers" section. Note that even
+ * though it looks like we have a modifier per-plane, we in fact do not. The
+ * modifier for each plane must be identical. Thus all combinations of
+ * different data layouts for multi-plane formats must be enumerated as
+ * separate modifiers.
+ *
+ * All of the entries in @handles, @pitches, @offsets and @modifier must be
+ * zero when unused. Warning, for @offsets and @modifier zero can't be used to
+ * figure out whether the entry is used or not since it's a valid value (a zero
+ * offset is common, and a zero modifier is &DRM_FORMAT_MOD_LINEAR).
+ */
+struct drm_mode_fb_cmd2 {
+	/** @fb_id: Object ID of the frame-buffer. */
+	__u32 fb_id;
+	/** @width: Width of the frame-buffer. */
+	__u32 width;
+	/** @height: Height of the frame-buffer. */
+	__u32 height;
+	/**
+	 * @pixel_format: FourCC format code, see ``DRM_FORMAT_*`` constants in
+	 * ``drm_fourcc.h``.
+	 */
+	__u32 pixel_format;
+	/**
+	 * @flags: Frame-buffer flags (see &DRM_MODE_FB_INTERLACED and
+	 * &DRM_MODE_FB_MODIFIERS).
+	 */
+	__u32 flags;
+
+	/**
+	 * @handles: GEM buffer handle, one per plane. Set to 0 if the plane is
+	 * unused. The same handle can be used for multiple planes.
+	 */
+	__u32 handles[4];
+	/** @pitches: Pitch (aka. stride) in bytes, one per plane. */
+	__u32 pitches[4];
+	/** @offsets: Offset into the buffer in bytes, one per plane. */
+	__u32 offsets[4];
+	/**
+	 * @modifier: Format modifier, one per plane. See ``DRM_FORMAT_MOD_*``
+	 * constants in ``drm_fourcc.h``. All planes must use the same
+	 * modifier. Ignored unless &DRM_MODE_FB_MODIFIERS is set in @flags.
+	 */
+	__u64 modifier[4];
+};
+
+#define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01
+#define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02
+#define DRM_MODE_FB_DIRTY_FLAGS         0x03
+
+#define DRM_MODE_FB_DIRTY_MAX_CLIPS     256
+
+/*
+ * Mark a region of a framebuffer as dirty.
+ *
+ * Some hardware does not automatically update display contents
+ * as a hardware or software draw to a framebuffer. This ioctl
+ * allows userspace to tell the kernel and the hardware what
+ * regions of the framebuffer have changed.
+ *
+ * The kernel or hardware is free to update more then just the
+ * region specified by the clip rects. The kernel or hardware
+ * may also delay and/or coalesce several calls to dirty into a
+ * single update.
+ *
+ * Userspace may annotate the updates, the annotates are a
+ * promise made by the caller that the change is either a copy
+ * of pixels or a fill of a single color in the region specified.
+ *
+ * If the DRM_MODE_FB_DIRTY_ANNOTATE_COPY flag is given then
+ * the number of updated regions are half of num_clips given,
+ * where the clip rects are paired in src and dst. The width and
+ * height of each one of the pairs must match.
+ *
+ * If the DRM_MODE_FB_DIRTY_ANNOTATE_FILL flag is given the caller
+ * promises that the region specified of the clip rects is filled
+ * completely with a single color as given in the color argument.
+ */
+
+struct drm_mode_fb_dirty_cmd {
+	__u32 fb_id;
+	__u32 flags;
+	__u32 color;
+	__u32 num_clips;
+	__u64 clips_ptr;
+};
+
+struct drm_mode_mode_cmd {
+	__u32 connector_id;
+	struct drm_mode_modeinfo mode;
+};
+
+#define DRM_MODE_CURSOR_BO	0x01
+#define DRM_MODE_CURSOR_MOVE	0x02
+#define DRM_MODE_CURSOR_FLAGS	0x03
+
+/*
+ * depending on the value in flags different members are used.
+ *
+ * CURSOR_BO uses
+ *    crtc_id
+ *    width
+ *    height
+ *    handle - if 0 turns the cursor off
+ *
+ * CURSOR_MOVE uses
+ *    crtc_id
+ *    x
+ *    y
+ */
+struct drm_mode_cursor {
+	__u32 flags;
+	__u32 crtc_id;
+	__s32 x;
+	__s32 y;
+	__u32 width;
+	__u32 height;
+	/* driver specific handle */
+	__u32 handle;
+};
+
+struct drm_mode_cursor2 {
+	__u32 flags;
+	__u32 crtc_id;
+	__s32 x;
+	__s32 y;
+	__u32 width;
+	__u32 height;
+	/* driver specific handle */
+	__u32 handle;
+	__s32 hot_x;
+	__s32 hot_y;
+};
+
+struct drm_mode_crtc_lut {
+	__u32 crtc_id;
+	__u32 gamma_size;
+
+	/* pointers to arrays */
+	__u64 red;
+	__u64 green;
+	__u64 blue;
+};
+
+struct drm_color_ctm {
+	/*
+	 * Conversion matrix in S31.32 sign-magnitude
+	 * (not two's complement!) format.
+	 *
+	 * out   matrix    in
+	 * |R|   |0 1 2|   |R|
+	 * |G| = |3 4 5| x |G|
+	 * |B|   |6 7 8|   |B|
+	 */
+	__u64 matrix[9];
+};
+
+struct drm_color_lut {
+	/*
+	 * Values are mapped linearly to 0.0 - 1.0 range, with 0x0 == 0.0 and
+	 * 0xffff == 1.0.
+	 */
+	__u16 red;
+	__u16 green;
+	__u16 blue;
+	__u16 reserved;
+};
+
+/**
+ * struct drm_plane_size_hint - Plane size hints
+ * @width: The width of the plane in pixel
+ * @height: The height of the plane in pixel
+ *
+ * The plane SIZE_HINTS property blob contains an
+ * array of struct drm_plane_size_hint.
+ */
+struct drm_plane_size_hint {
+	__u16 width;
+	__u16 height;
+};
+
+/**
+ * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data.
+ *
+ * HDR Metadata Infoframe as per CTA 861.G spec. This is expected
+ * to match exactly with the spec.
+ *
+ * Userspace is expected to pass the metadata information as per
+ * the format described in this structure.
+ */
+struct hdr_metadata_infoframe {
+	/**
+	 * @eotf: Electro-Optical Transfer Function (EOTF)
+	 * used in the stream.
+	 */
+	__u8 eotf;
+	/**
+	 * @metadata_type: Static_Metadata_Descriptor_ID.
+	 */
+	__u8 metadata_type;
+	/**
+	 * @display_primaries: Color Primaries of the Data.
+	 * These are coded as unsigned 16-bit values in units of
+	 * 0.00002, where 0x0000 represents zero and 0xC350
+	 * represents 1.0000.
+	 * @display_primaries.x: X coordinate of color primary.
+	 * @display_primaries.y: Y coordinate of color primary.
+	 */
+	struct {
+		__u16 x, y;
+	} display_primaries[3];
+	/**
+	 * @white_point: White Point of Colorspace Data.
+	 * These are coded as unsigned 16-bit values in units of
+	 * 0.00002, where 0x0000 represents zero and 0xC350
+	 * represents 1.0000.
+	 * @white_point.x: X coordinate of whitepoint of color primary.
+	 * @white_point.y: Y coordinate of whitepoint of color primary.
+	 */
+	struct {
+		__u16 x, y;
+	} white_point;
+	/**
+	 * @max_display_mastering_luminance: Max Mastering Display Luminance.
+	 * This value is coded as an unsigned 16-bit value in units of 1 cd/m2,
+	 * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2.
+	 */
+	__u16 max_display_mastering_luminance;
+	/**
+	 * @min_display_mastering_luminance: Min Mastering Display Luminance.
+	 * This value is coded as an unsigned 16-bit value in units of
+	 * 0.0001 cd/m2, where 0x0001 represents 0.0001 cd/m2 and 0xFFFF
+	 * represents 6.5535 cd/m2.
+	 */
+	__u16 min_display_mastering_luminance;
+	/**
+	 * @max_cll: Max Content Light Level.
+	 * This value is coded as an unsigned 16-bit value in units of 1 cd/m2,
+	 * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2.
+	 */
+	__u16 max_cll;
+	/**
+	 * @max_fall: Max Frame Average Light Level.
+	 * This value is coded as an unsigned 16-bit value in units of 1 cd/m2,
+	 * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2.
+	 */
+	__u16 max_fall;
+};
+
+/**
+ * struct hdr_output_metadata - HDR output metadata
+ *
+ * Metadata Information to be passed from userspace
+ */
+struct hdr_output_metadata {
+	/**
+	 * @metadata_type: Static_Metadata_Descriptor_ID.
+	 */
+	__u32 metadata_type;
+	/**
+	 * @hdmi_metadata_type1: HDR Metadata Infoframe.
+	 */
+	union {
+		struct hdr_metadata_infoframe hdmi_metadata_type1;
+	};
+};
+
+/**
+ * DRM_MODE_PAGE_FLIP_EVENT
+ *
+ * Request that the kernel sends back a vblank event (see
+ * struct drm_event_vblank) with the &DRM_EVENT_FLIP_COMPLETE type when the
+ * page-flip is done.
+ */
+#define DRM_MODE_PAGE_FLIP_EVENT 0x01
+/**
+ * DRM_MODE_PAGE_FLIP_ASYNC
+ *
+ * Request that the page-flip is performed as soon as possible, ie. with no
+ * delay due to waiting for vblank. This may cause tearing to be visible on
+ * the screen.
+ *
+ * When used with atomic uAPI, the driver will return an error if the hardware
+ * doesn't support performing an asynchronous page-flip for this update.
+ * User-space should handle this, e.g. by falling back to a regular page-flip.
+ *
+ * Note, some hardware might need to perform one last synchronous page-flip
+ * before being able to switch to asynchronous page-flips. As an exception,
+ * the driver will return success even though that first page-flip is not
+ * asynchronous.
+ */
+#define DRM_MODE_PAGE_FLIP_ASYNC 0x02
+#define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4
+#define DRM_MODE_PAGE_FLIP_TARGET_RELATIVE 0x8
+#define DRM_MODE_PAGE_FLIP_TARGET (DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE | \
+				   DRM_MODE_PAGE_FLIP_TARGET_RELATIVE)
+/**
+ * DRM_MODE_PAGE_FLIP_FLAGS
+ *
+ * Bitmask of flags suitable for &drm_mode_crtc_page_flip_target.flags.
+ */
+#define DRM_MODE_PAGE_FLIP_FLAGS (DRM_MODE_PAGE_FLIP_EVENT | \
+				  DRM_MODE_PAGE_FLIP_ASYNC | \
+				  DRM_MODE_PAGE_FLIP_TARGET)
+
+/*
+ * Request a page flip on the specified crtc.
+ *
+ * This ioctl will ask KMS to schedule a page flip for the specified
+ * crtc.  Once any pending rendering targeting the specified fb (as of
+ * ioctl time) has completed, the crtc will be reprogrammed to display
+ * that fb after the next vertical refresh.  The ioctl returns
+ * immediately, but subsequent rendering to the current fb will block
+ * in the execbuffer ioctl until the page flip happens.  If a page
+ * flip is already pending as the ioctl is called, EBUSY will be
+ * returned.
+ *
+ * Flag DRM_MODE_PAGE_FLIP_EVENT requests that drm sends back a vblank
+ * event (see drm.h: struct drm_event_vblank) when the page flip is
+ * done.  The user_data field passed in with this ioctl will be
+ * returned as the user_data field in the vblank event struct.
+ *
+ * Flag DRM_MODE_PAGE_FLIP_ASYNC requests that the flip happen
+ * 'as soon as possible', meaning that it not delay waiting for vblank.
+ * This may cause tearing on the screen.
+ *
+ * The reserved field must be zero.
+ */
+
+struct drm_mode_crtc_page_flip {
+	__u32 crtc_id;
+	__u32 fb_id;
+	__u32 flags;
+	__u32 reserved;
+	__u64 user_data;
+};
+
+/*
+ * Request a page flip on the specified crtc.
+ *
+ * Same as struct drm_mode_crtc_page_flip, but supports new flags and
+ * re-purposes the reserved field:
+ *
+ * The sequence field must be zero unless either of the
+ * DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags is specified. When
+ * the ABSOLUTE flag is specified, the sequence field denotes the absolute
+ * vblank sequence when the flip should take effect. When the RELATIVE
+ * flag is specified, the sequence field denotes the relative (to the
+ * current one when the ioctl is called) vblank sequence when the flip
+ * should take effect. NOTE: DRM_IOCTL_WAIT_VBLANK must still be used to
+ * make sure the vblank sequence before the target one has passed before
+ * calling this ioctl. The purpose of the
+ * DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags is merely to clarify
+ * the target for when code dealing with a page flip runs during a
+ * vertical blank period.
+ */
+
+struct drm_mode_crtc_page_flip_target {
+	__u32 crtc_id;
+	__u32 fb_id;
+	__u32 flags;
+	__u32 sequence;
+	__u64 user_data;
+};
+
+/**
+ * struct drm_mode_create_dumb - Create a KMS dumb buffer for scanout.
+ * @height: buffer height in pixels
+ * @width: buffer width in pixels
+ * @bpp: bits per pixel
+ * @flags: must be zero
+ * @handle: buffer object handle
+ * @pitch: number of bytes between two consecutive lines
+ * @size: size of the whole buffer in bytes
+ *
+ * User-space fills @height, @width, @bpp and @flags. If the IOCTL succeeds,
+ * the kernel fills @handle, @pitch and @size.
+ */
+struct drm_mode_create_dumb {
+	__u32 height;
+	__u32 width;
+	__u32 bpp;
+	__u32 flags;
+
+	__u32 handle;
+	__u32 pitch;
+	__u64 size;
+};
+
+/* set up for mmap of a dumb scanout buffer */
+struct drm_mode_map_dumb {
+	/** Handle for the object being mapped. */
+	__u32 handle;
+	__u32 pad;
+	/**
+	 * Fake offset to use for subsequent mmap call
+	 *
+	 * This is a fixed-size type for 32/64 compatibility.
+	 */
+	__u64 offset;
+};
+
+struct drm_mode_destroy_dumb {
+	__u32 handle;
+};
+
+/**
+ * DRM_MODE_ATOMIC_TEST_ONLY
+ *
+ * Do not apply the atomic commit, instead check whether the hardware supports
+ * this configuration.
+ *
+ * See &drm_mode_config_funcs.atomic_check for more details on test-only
+ * commits.
+ */
+#define DRM_MODE_ATOMIC_TEST_ONLY 0x0100
+/**
+ * DRM_MODE_ATOMIC_NONBLOCK
+ *
+ * Do not block while applying the atomic commit. The &DRM_IOCTL_MODE_ATOMIC
+ * IOCTL returns immediately instead of waiting for the changes to be applied
+ * in hardware. Note, the driver will still check that the update can be
+ * applied before retuning.
+ */
+#define DRM_MODE_ATOMIC_NONBLOCK  0x0200
+/**
+ * DRM_MODE_ATOMIC_ALLOW_MODESET
+ *
+ * Allow the update to result in temporary or transient visible artifacts while
+ * the update is being applied. Applying the update may also take significantly
+ * more time than a page flip. All visual artifacts will disappear by the time
+ * the update is completed, as signalled through the vblank event's timestamp
+ * (see struct drm_event_vblank).
+ *
+ * This flag must be set when the KMS update might cause visible artifacts.
+ * Without this flag such KMS update will return a EINVAL error. What kind of
+ * update may cause visible artifacts depends on the driver and the hardware.
+ * User-space that needs to know beforehand if an update might cause visible
+ * artifacts can use &DRM_MODE_ATOMIC_TEST_ONLY without
+ * &DRM_MODE_ATOMIC_ALLOW_MODESET to see if it fails.
+ *
+ * To the best of the driver's knowledge, visual artifacts are guaranteed to
+ * not appear when this flag is not set. Some sinks might display visual
+ * artifacts outside of the driver's control.
+ */
+#define DRM_MODE_ATOMIC_ALLOW_MODESET 0x0400
+
+/**
+ * DRM_MODE_ATOMIC_FLAGS
+ *
+ * Bitfield of flags accepted by the &DRM_IOCTL_MODE_ATOMIC IOCTL in
+ * &drm_mode_atomic.flags.
+ */
+#define DRM_MODE_ATOMIC_FLAGS (\
+		DRM_MODE_PAGE_FLIP_EVENT |\
+		DRM_MODE_PAGE_FLIP_ASYNC |\
+		DRM_MODE_ATOMIC_TEST_ONLY |\
+		DRM_MODE_ATOMIC_NONBLOCK |\
+		DRM_MODE_ATOMIC_ALLOW_MODESET)
+
+struct drm_mode_atomic {
+	__u32 flags;
+	__u32 count_objs;
+	__u64 objs_ptr;
+	__u64 count_props_ptr;
+	__u64 props_ptr;
+	__u64 prop_values_ptr;
+	__u64 reserved;
+	__u64 user_data;
+};
+
+struct drm_format_modifier_blob {
+#define FORMAT_BLOB_CURRENT 1
+	/* Version of this blob format */
+	__u32 version;
+
+	/* Flags */
+	__u32 flags;
+
+	/* Number of fourcc formats supported */
+	__u32 count_formats;
+
+	/* Where in this blob the formats exist (in bytes) */
+	__u32 formats_offset;
+
+	/* Number of drm_format_modifiers */
+	__u32 count_modifiers;
+
+	/* Where in this blob the modifiers exist (in bytes) */
+	__u32 modifiers_offset;
+
+	/* __u32 formats[] */
+	/* struct drm_format_modifier modifiers[] */
+};
+
+struct drm_format_modifier {
+	/* Bitmask of formats in get_plane format list this info applies to. The
+	 * offset allows a sliding window of which 64 formats (bits).
+	 *
+	 * Some examples:
+	 * In today's world with < 65 formats, and formats 0, and 2 are
+	 * supported
+	 * 0x0000000000000005
+	 *		  ^-offset = 0, formats = 5
+	 *
+	 * If the number formats grew to 128, and formats 98-102 are
+	 * supported with the modifier:
+	 *
+	 * 0x0000007c00000000 0000000000000000
+	 *		  ^
+	 *		  |__offset = 64, formats = 0x7c00000000
+	 *
+	 */
+	__u64 formats;
+	__u32 offset;
+	__u32 pad;
+
+	/* The modifier that applies to the >get_plane format list bitmask. */
+	__u64 modifier;
+};
+
+/**
+ * struct drm_mode_create_blob - Create New blob property
+ *
+ * Create a new 'blob' data property, copying length bytes from data pointer,
+ * and returning new blob ID.
+ */
+struct drm_mode_create_blob {
+	/** @data: Pointer to data to copy. */
+	__u64 data;
+	/** @length: Length of data to copy. */
+	__u32 length;
+	/** @blob_id: Return: new property ID. */
+	__u32 blob_id;
+};
+
+/**
+ * struct drm_mode_destroy_blob - Destroy user blob
+ * @blob_id: blob_id to destroy
+ *
+ * Destroy a user-created blob property.
+ *
+ * User-space can release blobs as soon as they do not need to refer to them by
+ * their blob object ID.  For instance, if you are using a MODE_ID blob in an
+ * atomic commit and you will not make another commit re-using the same ID, you
+ * can destroy the blob as soon as the commit has been issued, without waiting
+ * for it to complete.
+ */
+struct drm_mode_destroy_blob {
+	__u32 blob_id;
+};
+
+/**
+ * struct drm_mode_create_lease - Create lease
+ *
+ * Lease mode resources, creating another drm_master.
+ *
+ * The @object_ids array must reference at least one CRTC, one connector and
+ * one plane if &DRM_CLIENT_CAP_UNIVERSAL_PLANES is enabled. Alternatively,
+ * the lease can be completely empty.
+ */
+struct drm_mode_create_lease {
+	/** @object_ids: Pointer to array of object ids (__u32) */
+	__u64 object_ids;
+	/** @object_count: Number of object ids */
+	__u32 object_count;
+	/** @flags: flags for new FD (O_CLOEXEC, etc) */
+	__u32 flags;
+
+	/** @lessee_id: Return: unique identifier for lessee. */
+	__u32 lessee_id;
+	/** @fd: Return: file descriptor to new drm_master file */
+	__u32 fd;
+};
+
+/**
+ * struct drm_mode_list_lessees - List lessees
+ *
+ * List lesses from a drm_master.
+ */
+struct drm_mode_list_lessees {
+	/**
+	 * @count_lessees: Number of lessees.
+	 *
+	 * On input, provides length of the array.
+	 * On output, provides total number. No
+	 * more than the input number will be written
+	 * back, so two calls can be used to get
+	 * the size and then the data.
+	 */
+	__u32 count_lessees;
+	/** @pad: Padding. */
+	__u32 pad;
+
+	/**
+	 * @lessees_ptr: Pointer to lessees.
+	 *
+	 * Pointer to __u64 array of lessee ids
+	 */
+	__u64 lessees_ptr;
+};
+
+/**
+ * struct drm_mode_get_lease - Get Lease
+ *
+ * Get leased objects.
+ */
+struct drm_mode_get_lease {
+	/**
+	 * @count_objects: Number of leased objects.
+	 *
+	 * On input, provides length of the array.
+	 * On output, provides total number. No
+	 * more than the input number will be written
+	 * back, so two calls can be used to get
+	 * the size and then the data.
+	 */
+	__u32 count_objects;
+	/** @pad: Padding. */
+	__u32 pad;
+
+	/**
+	 * @objects_ptr: Pointer to objects.
+	 *
+	 * Pointer to __u32 array of object ids.
+	 */
+	__u64 objects_ptr;
+};
+
+/**
+ * struct drm_mode_revoke_lease - Revoke lease
+ */
+struct drm_mode_revoke_lease {
+	/** @lessee_id: Unique ID of lessee */
+	__u32 lessee_id;
+};
+
+/**
+ * struct drm_mode_rect - Two dimensional rectangle.
+ * @x1: Horizontal starting coordinate (inclusive).
+ * @y1: Vertical starting coordinate (inclusive).
+ * @x2: Horizontal ending coordinate (exclusive).
+ * @y2: Vertical ending coordinate (exclusive).
+ *
+ * With drm subsystem using struct drm_rect to manage rectangular area this
+ * export it to user-space.
+ *
+ * Currently used by drm_mode_atomic blob property FB_DAMAGE_CLIPS.
+ */
+struct drm_mode_rect {
+	__s32 x1;
+	__s32 y1;
+	__s32 x2;
+	__s32 y2;
+};
+
+/**
+ * struct drm_mode_closefb
+ * @fb_id: Framebuffer ID.
+ * @pad: Must be zero.
+ */
+struct drm_mode_closefb {
+	__u32 fb_id;
+	__u32 pad;
+};
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif

From 29525f8cb3fa244b3b5ecf9fc92e42b9587fd9ef Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 4 Nov 2025 14:34:12 +0000
Subject: [PATCH 1822/1854] codespell: skip amdgpu kernel headers

These header files are copied directly from the Linux kernel and contain
typos. We skip these files in codespell to simplify maintenance.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .codespellrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codespellrc b/.codespellrc
index e91a6d2eb..5def594b2 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,3 +1,3 @@
 [codespell]
-skip = ./.git,./test/pki,./tags
+skip = ./.git,./test/pki,./tags,./plugins/amdgpu/amdgpu_drm.h,./plugins/amdgpu/drm.h,./plugins/amdgpu/drm_mode.h
 ignore-words-list = creat,fpr,fle,ue,bord,parms,nd,te,testng,inh,wronly,renderd,bui,clen,sems

From 1db7eed69fa974563abc6d7348ee93b679c06cc3 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 4 Nov 2025 14:41:52 +0000
Subject: [PATCH 1823/1854] amdgpu: use local kernel headers instead of libdrm

Use local copies of amdgpu and DRM headers for consistency.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c     | 2 +-
 plugins/amdgpu/amdgpu_plugin_drm.c | 2 ++
 plugins/amdgpu/kfd_ioctl.h         | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 36dc0b6b0..713ffed6e 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -20,7 +20,6 @@
 
 #include <xf86drm.h>
 #include <libdrm/amdgpu.h>
-#include <libdrm/amdgpu_drm.h>
 
 #include "criu-plugin.h"
 #include "plugin.h"
@@ -38,6 +37,7 @@
 #include "rst-malloc.h"
 
 #include "common/list.h"
+#include "amdgpu_drm.h"
 #include "amdgpu_plugin_dmabuf.h"
 #include "amdgpu_plugin_drm.h"
 #include "amdgpu_plugin_util.h"
diff --git a/plugins/amdgpu/amdgpu_plugin_drm.c b/plugins/amdgpu/amdgpu_plugin_drm.c
index 923bfcdd1..3520bca7a 100644
--- a/plugins/amdgpu/amdgpu_plugin_drm.c
+++ b/plugins/amdgpu/amdgpu_plugin_drm.c
@@ -23,6 +23,8 @@
 #include "fdstore.h"
 
 #include "criu-amdgpu.pb-c.h"
+
+/* Define __user as empty for kernel headers in user-space */
 #define __user
 #include "drm.h"
 
diff --git a/plugins/amdgpu/kfd_ioctl.h b/plugins/amdgpu/kfd_ioctl.h
index 1a3bcea95..a63d453f0 100644
--- a/plugins/amdgpu/kfd_ioctl.h
+++ b/plugins/amdgpu/kfd_ioctl.h
@@ -23,9 +23,12 @@
 #ifndef KFD_IOCTL_H_INCLUDED
 #define KFD_IOCTL_H_INCLUDED
 
-#include <libdrm/drm.h>
 #include <linux/ioctl.h>
 
+/* Define __user as empty for kernel headers in user-space */
+#define __user
+#include "drm.h"
+
 /*
  * - 1.1 - initial version
  * - 1.3 - Add SMI events support

From 62aadb22ab1efeccef7fb322f525bd1b2cb6969c Mon Sep 17 00:00:00 2001
From: Yanning Yang <yangyanning@sjtu.edu.cn>
Date: Fri, 14 Nov 2025 23:08:16 +0000
Subject: [PATCH 1824/1854] amdgpu: use 64-bit offsets for parallel restore

On AMD Instinct MI300 systems, restoring a large GPU application can
fail because the checkpoint size is too large and the maximum value of
an offset (with integer type) is insufficient. This problem occurs when
the total size of all buffer objects exceeds int max, not because any
single buffer is too large, but it can also happen with a large number
of small buffers.

Fixes: #2812

Signed-off-by: Yanning Yang <yangyanning@sjtu.edu.cn>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/amdgpu_plugin.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 713ffed6e..574d7b829 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -1651,7 +1651,7 @@ static int restore_bo_data(int id, struct kfd_criu_bo_bucket *bo_buckets, CriuKf
 {
 	struct thread_data *thread_datas = NULL;
 	int thread_i, ret = 0;
-	int offset = 0;
+	uint64_t offset = 0;
 
 	for (int i = 0; i < e->num_of_bos; i++) {
 		struct kfd_criu_bo_bucket *bo_bucket = &bo_buckets[i];
@@ -2283,7 +2283,7 @@ void *parallel_restore_bo_contents(void *_thread_data)
 			continue;
 
 		entry = &restore_cmd->entries[i];
-		fseek(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
+		fseeko64(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
 		ret = sdma_copy_bo(restore_cmd->fds_write[entry->write_id], entry->size, bo_contents_fp,
 				   buffer, buffer_size, h_dev,
 				   max_copy_size, SDMA_OP_VRAM_WRITE, false);
@@ -2410,4 +2410,4 @@ int amdgpu_plugin_post_forking(void)
 
 	return back_thread_create(&parallel_thread, restore_device_parallel_worker, &parallel_thread_result);
 }
-CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__POST_FORKING, amdgpu_plugin_post_forking)
\ No newline at end of file
+CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__POST_FORKING, amdgpu_plugin_post_forking)

From 2cf8f13ca1f11a0491977e438b262e646137256c Mon Sep 17 00:00:00 2001
From: Mark Polyakov <mark@thundercompute.com>
Date: Tue, 11 Nov 2025 15:48:42 -0800
Subject: [PATCH 1825/1854] doc: update pipe/socket examples for --inherit-fd

The syntax of the inherit-fd functionality for unix socket and pipe
includes a colon.

Fixes: 0df3f79fc023 ("criu(8): fix --inherit-fd description")
Fixes: c37324b6d0bc ("crtools: describe the inherit-fd option")
Signed-off-by: Mark Polyakov <mark@thundercompute.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/criu.txt | 4 ++--
 criu/crtools.c         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/criu.txt b/Documentation/criu.txt
index 40ede84e2..0c9a9e527 100644
--- a/Documentation/criu.txt
+++ b/Documentation/criu.txt
@@ -502,8 +502,8 @@ Restores previously checkpointed processes.
 The 'resource' argument can be one of the following:
 +
     - **tty[**__rdev__**:**__dev__**]**
-    - **pipe[**__inode__**]**
-    - **socket[**__inode__*]*
+    - **pipe:[**__inode__**]**
+    - **socket:[**__inode__*]*
     - **file[**__mnt_id__**:**__inode__**]**
     - 'path/to/file'
 
diff --git a/criu/crtools.c b/criu/crtools.c
index e207133ac..4dc55a065 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -503,8 +503,8 @@ usage:
 	       "                        Inherit file descriptors, treating fd NUM as being\n"
 	       "                        already opened via an existing RES, which can be:\n"
 	       "                            tty[rdev:dev]\n"
-	       "                            pipe[inode]\n"
-	       "                            socket[inode]\n"
+	       "                            pipe:[inode]\n"
+	       "                            socket:[inode]\n"
 	       "                            file[mnt_id:inode]\n"
 	       "                            /memfd:name\n"
 	       "                            path/to/file\n"

From bf82389de36ef940be3640229f5a68d0e9211b71 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 26 Nov 2025 07:48:02 +0000
Subject: [PATCH 1826/1854] dump: fix "Defect type: IDENTICAL_BRANCHES"

Static code analysis reported:

 criu/cr-dump.c:2328:2: identical_branches: The same code is executed
 when the condition "ret" is true or false, because the code in the
 if-then branch and after the if statement is identical. Should the if
 statement be removed?

This is a fix for the warning.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-dump.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 4df40e9b6..98b4223ba 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2329,8 +2329,6 @@ int cr_dump_tasks(pid_t pid)
 	}
 
 	ret = write_img_inventory(&he);
-	if (ret)
-		goto err;
 err:
 	if (parent_ie)
 		inventory_entry__free_unpacked(parent_ie, NULL);

From 09bb3626646f285a3c00c9d424df3028dba9a10b Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 26 Nov 2025 07:49:05 +0000
Subject: [PATCH 1827/1854] restore: fix "Defect type: UNINIT"

Static code analysis reported:

  1. criu/cr-restore.c:2438:2: var_decl: Declaring variable "end_vma"
     without initializer.
  4. criu/cr-restore.c:2451:5: assign: Assigning: "s_vma" = "&end_vma",
     which points to uninitialized data.
  7. criu/cr-restore.c:2449:4: uninit_use: Using uninitialized value
     "s_vma->list.next".

This tries to fix it by initializing the variable.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/cr-restore.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 057ec0e93..a5eda8d60 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2440,6 +2440,7 @@ static long restorer_get_vma_hint(struct list_head *tgt_vma_list, struct list_he
 
 	end_vma.e = &end_e;
 	end_e.start = end_e.end = kdat.task_size;
+	INIT_LIST_HEAD(&end_vma.list);
 
 	s_vma = list_first_entry(self_vma_list, struct vma_area, list);
 	t_vma = list_first_entry(tgt_vma_list, struct vma_area, list);

From 90300748effc1cf0fe56e35d3d1cc2ddfedab246 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 26 Nov 2025 13:21:07 +0000
Subject: [PATCH 1828/1854] tty: fix compiler error

At least on tests running on Fedora rawhide following error could be
seen:

```
  criu/tty.c: In function 'pts_fd_get_index':
  criu/tty.c:262:21: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
    262 |         char *pos = strrchr(link->name, '/');
        |
```

This fixes it.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu/tty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/tty.c b/criu/tty.c
index ae23094b7..9a4520d53 100644
--- a/criu/tty.c
+++ b/criu/tty.c
@@ -259,7 +259,7 @@ static int pts_fd_get_index(int fd, const struct fd_parms *p)
 {
 	int index;
 	const struct fd_link *link = p->link;
-	char *pos = strrchr(link->name, '/');
+	const char *pos = strrchr(link->name, '/');
 
 	if (!pos || pos == (link->name + link->len - 1)) {
 		pr_err("Unexpected format on path %s\n", link->name + 1);

From 501b714f76b121e66a6f91ffbd707a29bc9edd39 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Tue, 12 Aug 2025 14:22:14 +0200
Subject: [PATCH 1829/1854] compel/aarch64: refactor fpregs handling

Refactor user_fpregs_struct_t to wrap user_fpsimd_state in a
dedicated struct, preparing for future extending by just
adding new members

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
[ alex: fixes ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Reviewed-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Acked-by: Mike Rapoport <rppt@kernel.org>
---
 .../src/lib/include/uapi/asm/infect-types.h    |  6 +++++-
 compel/arch/aarch64/src/lib/infect.c           | 18 +++++++++---------
 criu/arch/aarch64/crtools.c                    |  8 ++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index 9d4ce7e2e..39aed4ac5 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -16,7 +16,11 @@
  */
 
 typedef struct user_pt_regs user_regs_struct_t;
-typedef struct user_fpsimd_state user_fpregs_struct_t;
+
+struct user_fpregs_struct {
+	struct user_fpsimd_state fpstate;
+};
+typedef struct user_fpregs_struct user_fpregs_struct_t;
 
 #define __compel_arch_fetch_thread_area(tid, th) 0
 #define compel_arch_fetch_thread_area(tctl)	 0
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index ec1d0d59e..503616df7 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -43,10 +43,10 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *
 	sigframe->uc.uc_mcontext.pc = regs->pc;
 	sigframe->uc.uc_mcontext.pstate = regs->pstate;
 
-	memcpy(fpsimd->vregs, fpregs->vregs, 32 * sizeof(__uint128_t));
+	memcpy(fpsimd->vregs, fpregs->fpstate.vregs, 32 * sizeof(__uint128_t));
 
-	fpsimd->fpsr = fpregs->fpsr;
-	fpsimd->fpcr = fpregs->fpcr;
+	fpsimd->fpsr = fpregs->fpstate.fpsr;
+	fpsimd->fpcr = fpregs->fpstate.fpcr;
 
 	fpsimd->head.magic = FPSIMD_MAGIC;
 	fpsimd->head.size = sizeof(*fpsimd);
@@ -59,7 +59,7 @@ int sigreturn_prep_fpu_frame_plain(struct rt_sigframe *sigframe, struct rt_sigfr
 	return 0;
 }
 
-int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd, save_regs_t save,
+int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
 			 void *arg, __maybe_unused unsigned long flags)
 {
 	struct iovec iov;
@@ -74,14 +74,14 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		goto err;
 	}
 
-	iov.iov_base = fpsimd;
-	iov.iov_len = sizeof(*fpsimd);
+	iov.iov_base = &ext_regs->fpstate;
+	iov.iov_len = sizeof(ext_regs->fpstate);
 	if ((ret = ptrace(PTRACE_GETREGSET, pid, NT_PRFPREG, &iov))) {
 		pr_perror("Failed to obtain FPU registers for %d", pid);
 		goto err;
 	}
 
-	ret = save(pid, arg, regs, fpsimd);
+	ret = save(pid, arg, regs, ext_regs);
 err:
 	return ret;
 }
@@ -92,8 +92,8 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 
 	pr_info("Restoring GP/FPU registers for %d\n", pid);
 
-	iov.iov_base = ext_regs;
-	iov.iov_len = sizeof(*ext_regs);
+	iov.iov_base = &ext_regs->fpstate;
+	iov.iov_len = sizeof(ext_regs->fpstate);
 	if (ptrace(PTRACE_SETREGSET, pid, NT_PRFPREG, &iov)) {
 		pr_perror("Failed to set FPU registers for %d", pid);
 		return -1;
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 3ed5c9d63..3cd082a34 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -157,11 +157,11 @@ int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_str
 
 	// Save the FP/SIMD state
 	for (i = 0; i < 32; ++i) {
-		core->ti_aarch64->fpsimd->vregs[2 * i] = fpsimd->vregs[i];
-		core->ti_aarch64->fpsimd->vregs[2 * i + 1] = fpsimd->vregs[i] >> 64;
+		core->ti_aarch64->fpsimd->vregs[2 * i] = fpsimd->fpstate.vregs[i];
+		core->ti_aarch64->fpsimd->vregs[2 * i + 1] = fpsimd->fpstate.vregs[i] >> 64;
 	}
-	assign_reg(core->ti_aarch64->fpsimd, fpsimd, fpsr);
-	assign_reg(core->ti_aarch64->fpsimd, fpsimd, fpcr);
+	assign_reg(core->ti_aarch64->fpsimd, &fpsimd->fpstate, fpsr);
+	assign_reg(core->ti_aarch64->fpsimd, &fpsimd->fpstate, fpcr);
 
 	if (save_pac_keys(pid, core))
 		return -1;

From 73ca07148398c58e344cd2be71933836f55d93f4 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Wed, 13 Aug 2025 17:48:56 +0200
Subject: [PATCH 1830/1854] gcs: add GCS constants and helper macros

Introduce ARM64 Guarded Control Stack (GCS) constants and macros
in a new uapi header for use in both CRIU and compel.

Includes:
 - NT_ARM_GCS type
 - prctl(2) constants for GCS enable/write/push modes
 - Capability token helpers (GCS_CAP, GCS_SIGNAL_CAP)
 - HWCAP_GCS definition

These are based on upstream Linux definitions

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Reviewed-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Acked-by: Mike Rapoport <rppt@kernel.org>
---
 .../src/lib/include/uapi/asm/gcs-types.h      | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 compel/arch/aarch64/src/lib/include/uapi/asm/gcs-types.h

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/gcs-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/gcs-types.h
new file mode 100644
index 000000000..9f9655e3b
--- /dev/null
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/gcs-types.h
@@ -0,0 +1,47 @@
+#ifndef __UAPI_ASM_GCS_TYPES_H__
+#define __UAPI_ASM_GCS_TYPES_H__
+
+#ifndef NT_ARM_GCS
+#define NT_ARM_GCS 0x410 /* ARM GCS state */
+#endif
+
+/* Shadow Stack/Guarded Control Stack interface */
+#define PR_GET_SHADOW_STACK_STATUS	74
+#define PR_SET_SHADOW_STACK_STATUS	75
+#define PR_LOCK_SHADOW_STACK_STATUS	76
+
+/* When set PR_SHADOW_STACK_ENABLE flag allocates a Guarded Control Stack */
+#ifndef PR_SHADOW_STACK_ENABLE
+#define PR_SHADOW_STACK_ENABLE		(1UL << 0)
+#endif
+
+/* Allows explicit GCS stores (eg. using GCSSTR) */
+#ifndef PR_SHADOW_STACK_WRITE
+#define PR_SHADOW_STACK_WRITE		(1UL << 1)
+#endif
+
+/* Allows explicit GCS pushes (eg. using GCSPUSHM) */
+#ifndef PR_SHADOW_STACK_PUSH
+#define PR_SHADOW_STACK_PUSH		(1UL << 2)
+#endif
+
+#ifndef SHADOW_STACK_SET_TOKEN
+#define SHADOW_STACK_SET_TOKEN 0x1     /* Set up a restore token in the shadow stack */
+#endif
+
+#define PR_SHADOW_STACK_ALL_MODES \
+	PR_SHADOW_STACK_ENABLE | PR_SHADOW_STACK_WRITE | PR_SHADOW_STACK_PUSH
+
+/* copied from: arch/arm64/include/asm/sysreg.h */
+#define GCS_CAP_VALID_TOKEN 0x1
+#define GCS_CAP_ADDR_MASK 0xFFFFFFFFFFFFF000ULL
+#define GCS_CAP(x) ((((unsigned long)x) & GCS_CAP_ADDR_MASK) | GCS_CAP_VALID_TOKEN)
+#define GCS_SIGNAL_CAP(addr) (((unsigned long)addr) & GCS_CAP_ADDR_MASK)
+
+#include <asm/hwcap.h>
+
+#ifndef HWCAP_GCS
+#define HWCAP_GCS (1UL << 32)
+#endif
+
+#endif /* __UAPI_ASM_GCS_TYPES_H__ */
\ No newline at end of file

From 6bb856b0af85fc6c1a90f2a6f28afd9f3b0db493 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Fri, 1 Aug 2025 12:09:57 +0200
Subject: [PATCH 1831/1854] compel: gcs: initial GCS support for signal frames
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add basic prerequisites for Guarded Control Stack (GCS) state on AArch64.

This adds a gcs_context to the signal frame and extends user_fpregs_struct_t to
carry GCS metadata, preparing the groundwork for GCS in the parasite.

For now, the GCS fields are zeroed during compel_get_task_regs(), technically
ignoring GCS since it does not reach the control logic yet; that will be
introduced in the next commit.

The code path is gated and does not affect normal tests. Can be explicitly
enabled and tested via:

    make -C infect GCS_ENABLE=1 && make -C infect run

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
[ alex: clean up fixes ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Acked-by: Mike Rapoport <rppt@kernel.org>
---
 .../src/lib/include/uapi/asm/infect-types.h   | 14 +++++++
 .../src/lib/include/uapi/asm/sigframe.h       | 10 +++++
 compel/arch/aarch64/src/lib/infect.c          | 39 ++++++++++++++++++-
 compel/include/uapi/infect.h                  |  8 ++++
 4 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index 39aed4ac5..e11f2910f 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -2,6 +2,7 @@
 #define UAPI_COMPEL_ASM_TYPES_H__
 
 #include <stdint.h>
+#include <stdbool.h>
 #include <signal.h>
 #include <sys/mman.h>
 #include <asm/ptrace.h>
@@ -17,8 +18,18 @@
 
 typedef struct user_pt_regs user_regs_struct_t;
 
+/*
+ * GCS (Guarded Control Stack)
+ */
+struct user_gcs {
+	__u64 features_enabled;
+	__u64 features_locked;
+	__u64 gcspr_el0;
+};
+
 struct user_fpregs_struct {
 	struct user_fpsimd_state fpstate;
+	struct user_gcs gcs;
 };
 typedef struct user_fpregs_struct user_fpregs_struct_t;
 
@@ -43,4 +54,7 @@ typedef struct user_fpregs_struct user_fpregs_struct_t;
 		__NR_##syscall; \
 	})
 
+extern bool __compel_host_supports_gcs(void);
+#define compel_host_supports_gcs __compel_host_supports_gcs
+
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
index a3528500d..7efee528f 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
@@ -10,11 +10,20 @@
 /* Copied from the kernel header arch/arm64/include/uapi/asm/sigcontext.h */
 
 #define FPSIMD_MAGIC 0x46508001
+#define GCS_MAGIC    0x47435300
 
 typedef struct fpsimd_context fpu_state_t;
 
+struct gcs_context {
+	struct _aarch64_ctx head;
+	__u64 gcspr;
+	__u64 features_enabled;
+	__u64 reserved;
+};
+
 struct aux_context {
 	struct fpsimd_context fpsimd;
+	struct gcs_context gcs;
 	/* additional context to be added before "end" */
 	struct _aarch64_ctx end;
 };
@@ -63,6 +72,7 @@ struct cr_sigcontext {
 #define RT_SIGFRAME_AUX_CONTEXT(rt_sigframe) ((struct aux_context *)&(RT_SIGFRAME_SIGCONTEXT(rt_sigframe)->__reserved))
 #define RT_SIGFRAME_FPU(rt_sigframe)	     (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->fpsimd)
 #define RT_SIGFRAME_OFFSET(rt_sigframe)	     0
+#define RT_SIGFRAME_GCS(rt_sigframe)	     (&RT_SIGFRAME_AUX_CONTEXT(rt_sigframe)->gcs)
 
 #define rt_sigframe_erase_sigset(sigframe)	memset(&sigframe->uc.uc_sigmask, 0, sizeof(k_rtsigset_t))
 #define rt_sigframe_copy_sigset(sigframe, from) memcpy(&sigframe->uc.uc_sigmask, from, sizeof(k_rtsigset_t))
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 503616df7..0f74a023a 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -2,8 +2,8 @@
 #include <sys/ptrace.h>
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <sys/auxv.h>
 #include <asm/ptrace.h>
-#include <linux/elf.h>
 
 #include <compel/plugins/std/syscall-codes.h>
 #include "common/page.h"
@@ -13,6 +13,8 @@
 #include "infect.h"
 #include "infect-priv.h"
 #include "asm/breakpoints.h"
+#include "asm/gcs-types.h"
+#include <linux/prctl.h>
 
 unsigned __page_size = 0;
 unsigned __page_shift = 0;
@@ -33,12 +35,32 @@ static inline void __always_unused __check_code_syscall(void)
 	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
 }
 
+bool __compel_host_supports_gcs(void)
+{
+	unsigned long hwcap = getauxval(AT_HWCAP);
+	return (hwcap & HWCAP_GCS) != 0;
+}
+
+static bool __compel_gcs_enabled(struct user_gcs *gcs)
+{
+	if (!compel_host_supports_gcs())
+		return false;
+
+	if (gcs->features_enabled & PR_SHADOW_STACK_ENABLE)
+		return true;
+
+	return false;
+}
+
 int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
 {
 	struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
+	struct gcs_context *gcs = RT_SIGFRAME_GCS(sigframe);
 
 	memcpy(sigframe->uc.uc_mcontext.regs, regs->regs, sizeof(regs->regs));
 
+	pr_debug("sigreturn_prep_regs_plain: sp %lx pc %lx\n", (long)regs->sp, (long)regs->pc);
+
 	sigframe->uc.uc_mcontext.sp = regs->sp;
 	sigframe->uc.uc_mcontext.pc = regs->pc;
 	sigframe->uc.uc_mcontext.pstate = regs->pstate;
@@ -51,6 +73,19 @@ int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *
 	fpsimd->head.magic = FPSIMD_MAGIC;
 	fpsimd->head.size = sizeof(*fpsimd);
 
+	if (__compel_gcs_enabled(&fpregs->gcs)) {
+		gcs->head.magic = GCS_MAGIC;
+		gcs->head.size = sizeof(*gcs);
+		gcs->reserved = 0;
+		gcs->gcspr = fpregs->gcs.gcspr_el0 - 8;
+		gcs->features_enabled = fpregs->gcs.features_enabled;
+
+		pr_debug("sigframe gcspr=%llx features_enabled=%llx\n", fpregs->gcs.gcspr_el0 - 8, fpregs->gcs.features_enabled);
+	} else {
+		pr_debug("sigframe gcspr=[disabled]\n");
+		memset(gcs, 0, sizeof(*gcs));
+	}
+
 	return 0;
 }
 
@@ -81,6 +116,8 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 		goto err;
 	}
 
+	memset(&ext_regs->gcs, 0, sizeof(ext_regs->gcs));
+
 	ret = save(pid, arg, regs, ext_regs);
 err:
 	return ret;
diff --git a/compel/include/uapi/infect.h b/compel/include/uapi/infect.h
index 1f61876ff..d21c261b7 100644
--- a/compel/include/uapi/infect.h
+++ b/compel/include/uapi/infect.h
@@ -192,6 +192,14 @@ void compel_set_thread_ip(struct parasite_thread_ctl *tctl, uint64_t v);
 
 extern void compel_get_stack(struct parasite_ctl *ctl, void **rstack, void **r_thread_stack);
 
+#ifndef compel_host_supports_gcs
+static inline bool compel_host_supports_gcs(void)
+{
+	return false;
+}
+#define compel_host_supports_gcs
+#endif
+
 #ifndef compel_shstk_enabled
 static inline bool compel_shstk_enabled(user_fpregs_struct_t *ext_regs)
 {

From 2f676d20e41337568403e9f8ac79f5cd3af620e3 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Tue, 12 Aug 2025 18:32:55 +0200
Subject: [PATCH 1832/1854] compel: gcs: set up GCS token/restorer for
 rt_sigreturn
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When GCS is enabled, the kernel expects a capability token at GCSPR_EL0-8
and sa_restorer at GCSPR_EL0-16 on rt_sigreturn. The sigframe must be
consistent with the kernel’s expectations, with GCSPR_EL0 advanced by -8
having it point to the token on signal entry. On rt_sigreturn, the kernel
verifies the cap at GCSPR_EL0, invalidates it and increments GCSPR_EL0 by 8
at the end of gcs_restore_signal() .

Implement parasite_setup_gcs() to:
- read NT_ARM_GCS via ptrace(PTRACE_GETREGSET)
- write (via ptrace) the computed capability token and restorer address
- update GCSPR_EL0 to point to the token's location

Call parasite_setup_gcs() into parasite_start_daemon() so the sigreturn
frame satisfies kernel's expectation

Tests with GCS remain opt‑in:
	make -C compel/test/infect GCS_ENABLE=1 && make -C compel/test/infect run

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
[ alex: cleanup fixes ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Acked-by: Mike Rapoport <rppt@kernel.org>
---
 .../src/lib/include/uapi/asm/infect-types.h   |  5 ++
 compel/arch/aarch64/src/lib/infect.c          | 82 ++++++++++++++++++-
 compel/arch/x86/src/lib/infect.c              |  2 +-
 3 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index e11f2910f..3a34ab4f6 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -57,4 +57,9 @@ typedef struct user_fpregs_struct user_fpregs_struct_t;
 extern bool __compel_host_supports_gcs(void);
 #define compel_host_supports_gcs __compel_host_supports_gcs
 
+struct parasite_ctl;
+extern int __parasite_setup_shstk(struct parasite_ctl *ctl,
+				  user_fpregs_struct_t *ext_regs);
+#define parasite_setup_shstk __parasite_setup_shstk
+
 #endif /* UAPI_COMPEL_ASM_TYPES_H__ */
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 0f74a023a..39be558ea 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -46,10 +46,7 @@ static bool __compel_gcs_enabled(struct user_gcs *gcs)
 	if (!compel_host_supports_gcs())
 		return false;
 
-	if (gcs->features_enabled & PR_SHADOW_STACK_ENABLE)
-		return true;
-
-	return false;
+	return gcs && (gcs->features_enabled & PR_SHADOW_STACK_ENABLE) != 0;
 }
 
 int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs)
@@ -118,6 +115,18 @@ int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct
 
 	memset(&ext_regs->gcs, 0, sizeof(ext_regs->gcs));
 
+	iov.iov_base = &ext_regs->gcs;
+	iov.iov_len = sizeof(ext_regs->gcs);
+	if (ptrace(PTRACE_GETREGSET, pid, NT_ARM_GCS, &iov) == 0) {
+		pr_info("gcs: GCSPR_EL0 for %d: 0x%llx, features: 0x%llx\n",
+			pid, ext_regs->gcs.gcspr_el0, ext_regs->gcs.features_enabled);
+
+		if (!__compel_gcs_enabled(&ext_regs->gcs))
+			pr_info("gcs: GCS is NOT enabled\n");
+	} else {
+		pr_info("gcs: GCS state not available for %d\n", pid);
+	}
+
 	ret = save(pid, arg, regs, ext_regs);
 err:
 	return ret;
@@ -323,3 +332,68 @@ int ptrace_flush_breakpoints(pid_t pid)
 
 	return 0;
 }
+
+int inject_gcs_cap_token(struct parasite_ctl *ctl, pid_t pid, struct user_gcs *gcs)
+{
+	struct iovec gcs_iov = { .iov_base = gcs, .iov_len = sizeof(*gcs) };
+
+	uint64_t token_addr = gcs->gcspr_el0 - 8;
+	uint64_t sigtramp_addr = gcs->gcspr_el0 - 16;
+
+	uint64_t cap_token = ALIGN_DOWN(GCS_SIGNAL_CAP(token_addr), 8);
+	unsigned long restorer_addr;
+
+	pr_info("gcs: (setup) CAP token: 0x%lx at addr: 0x%lx\n", cap_token, token_addr);
+
+	/* Inject capability token at gcspr_el0 - 8 */
+	if (ptrace(PTRACE_POKEDATA, pid, (void *)token_addr, cap_token)) {
+		pr_perror("gcs: (setup) Inject GCS cap token failed");
+		return -1;
+	}
+
+	/* Inject restorer trampoline address (gcspr_el0 - 16) */
+	restorer_addr = ctl->parasite_ip;
+	if (ptrace(PTRACE_POKEDATA, pid, (void *)sigtramp_addr, restorer_addr)) {
+		pr_perror("gcs: (setup) Inject GCS restorer failed");
+		return -1;
+	}
+
+	/* Update GCSPR_EL0 */
+	gcs->gcspr_el0 = token_addr;
+	if (ptrace(PTRACE_SETREGSET, pid, NT_ARM_GCS, &gcs_iov)) {
+		pr_perror("gcs: PTRACE_SETREGS FAILED");
+		return -1;
+	}
+
+	pr_debug("gcs: parasite_ip=%#lx sp=%#llx gcspr_el0=%#llx\n",
+		 ctl->parasite_ip, ctl->orig.regs.sp, gcs->gcspr_el0);
+
+	return 0;
+}
+
+int parasite_setup_shstk(struct parasite_ctl *ctl, user_fpregs_struct_t *ext_regs)
+{
+	struct user_gcs gcs;
+	struct iovec gcs_iov = { .iov_base = &gcs, .iov_len = sizeof(gcs) };
+	pid_t pid = ctl->rpid;
+
+	if(!__compel_host_supports_gcs())
+		return 0;
+
+	if (ptrace(PTRACE_GETREGSET, pid, NT_ARM_GCS, &gcs_iov) != 0) {
+		pr_perror("GCS state not available for %d", pid);
+		return -1;
+	}
+
+	if (!__compel_gcs_enabled(&gcs))
+		return 0;
+
+	if (inject_gcs_cap_token(ctl, pid, &gcs)) {
+		pr_perror("Failed to inject GCS cap token for %d", pid);
+		return -1;
+	}
+
+	pr_info("gcs: GCS enabled for %d\n", pid);
+
+	return 0;
+}
diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c
index 644c483b4..afcf2c53b 100644
--- a/compel/arch/x86/src/lib/infect.c
+++ b/compel/arch/x86/src/lib/infect.c
@@ -761,7 +761,7 @@ bool __compel_shstk_enabled(user_fpregs_struct_t *ext_regs)
 	return false;
 }
 
-int parasite_setup_shstk(struct parasite_ctl *ctl, user_fpregs_struct_t *ext_regs)
+int parasite_setup_shstk(struct parasite_ctl *ctl, __maybe_unused user_fpregs_struct_t *ext_regs)
 {
 	pid_t pid = ctl->rpid;
 	unsigned long sa_restorer = ctl->parasite_ip;

From 92e6e523b51f342bdc6dbaf79d9c43e915f02af0 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Thu, 14 Aug 2025 14:39:52 +0200
Subject: [PATCH 1833/1854] compel: gcs: add opt-in GCS test support for
 AArch64

Introduce an opt-in mode for building and running compel tests
with Guarded Control Stack (GCS) enabled on AArch64.

Changes:
 - Extend compel/test/infect to support `GCS_ENABLE=1` builds,
   adding `-mbranch-protection=standard` and
   `-z experimental-gcs=check` to CFLAGS/LDFLAGS.
 - Export required GLIBC_TUNABLES at runtime via `TEST_ENV`.

Usage:
    make -C compel/test/infect GCS_ENABLE=1
    make -C compel/test/infect GCS_ENABLE=1 run

By default (`GCS_ENABLE` unset or 0), builds and runs are unchanged.

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
---
 compel/test/infect/Makefile | 7 ++++++-
 compel/test/infect/spy.c    | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/compel/test/infect/Makefile b/compel/test/infect/Makefile
index bacfad962..85efa5fd9 100644
--- a/compel/test/infect/Makefile
+++ b/compel/test/infect/Makefile
@@ -3,6 +3,11 @@ CFLAGS	?= -O2 -g -Wall -Werror
 
 COMPEL		:= ../../../compel/compel-host
 
+ifeq ($(GCS_ENABLE),1)
+CFLAGS  += -mbranch-protection=standard -DGCS_TEST_ENABLE=1
+LDFLAGS += -z experimental-gcs=check
+endif
+
 all: victim spy
 
 run:
@@ -17,7 +22,7 @@ clean:
 	rm -f parasite.o
 
 victim: victim.c
-	$(CC) $(CFLAGS) -o $@ $^
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 
 spy: spy.c parasite.h
 	$(CC) $(CFLAGS) $(shell $(COMPEL) includes) -o $@ $< $(shell $(COMPEL) --static libs)
diff --git a/compel/test/infect/spy.c b/compel/test/infect/spy.c
index b10db4d47..143946941 100644
--- a/compel/test/infect/spy.c
+++ b/compel/test/infect/spy.c
@@ -112,6 +112,9 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
+#ifdef GCS_TEST_ENABLE
+	setenv("GLIBC_TUNABLES", "glibc.cpu.aarch64_gcs=1:glibc.cpu.aarch64_gcs_policy=2", 1);
+#endif
 	pid = vfork();
 	if (pid == 0) {
 		close(p_in[1]);

From 41ecb7ac71f1396d7471467d21443d144000d6c2 Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Tue, 12 Aug 2025 18:52:36 +0200
Subject: [PATCH 1834/1854] images: aarch64: add user_aarch64_gcs_entry

  - Define user_aarch64_gcs_entry in core-aarch64.proto to store
    Guarded Control Stack state (gcspr_el0, features_enabled).
  - Extend thread_info_aarch64 with an optional gcs field

Also extend thread_info_aarch64 with an optional gcs field

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
---
 images/core-aarch64.proto | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/images/core-aarch64.proto b/images/core-aarch64.proto
index 64b0ee9fb..a94911c0b 100644
--- a/images/core-aarch64.proto
+++ b/images/core-aarch64.proto
@@ -17,6 +17,11 @@ message user_aarch64_fpsimd_context_entry {
 	required uint32 fpcr	= 3;
 }
 
+message user_aarch64_gcs_entry {
+	required uint64 gcspr_el0		= 1 [(criu).hex = true];
+	required uint64 features_enabled	= 2 [(criu).hex = true];
+}
+
 message pac_address_keys {
 	required uint64 apiakey_lo = 1;
 	required uint64 apiakey_hi = 2;
@@ -45,4 +50,5 @@ message thread_info_aarch64 {
 	required user_aarch64_regs_entry		gpregs		= 3[(criu).hex = true];
 	required user_aarch64_fpsimd_context_entry	fpsimd		= 4;
 	optional pac_keys				pac_keys = 5;
+	optional user_aarch64_gcs_entry			gcs 		= 6;
 }

From 2429d49e677377575aa72cc35e18f96d671ad72e Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Tue, 12 Aug 2025 18:56:41 +0200
Subject: [PATCH 1835/1854] criu/dump: gcs: save GCS state during dump

Add debug and info messages to log Guarded Control Stack state when
dumping AArch64 threads. This includes the following values:
  - gcspr_el0
  - features_enabled

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
[ alex: cleanup fixes ]
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Acked-by: Mike Rapoport <rppt@kernel.org>
---
 criu/arch/aarch64/crtools.c | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 3cd082a34..835a83400 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -12,6 +12,7 @@
 #include "common/compiler.h"
 #include <compel/ptrace.h>
 #include "asm/dump.h"
+#include "asm/gcs-types.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
@@ -22,6 +23,7 @@
 #include "restorer.h"
 #include "compel/infect.h"
 #include "pstree.h"
+#include <stdbool.h>
 
 /*
  * cr_user_pac_* are a copy of the corresponding uapi structs
@@ -146,6 +148,11 @@ static int save_pac_keys(int pid, CoreEntry *core)
 int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
 {
 	int i;
+	struct user_gcs gcs_live;
+	struct iovec gcs_iov = {
+		.iov_base = &gcs_live,
+		.iov_len = sizeof(gcs_live),
+	};
 	CoreEntry *core = x;
 
 	// Save the Aarch64 CPU state
@@ -165,6 +172,17 @@ int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_str
 
 	if (save_pac_keys(pid, core))
 		return -1;
+
+	/* Save the GCS state */
+	if (compel_host_supports_gcs()) {
+		if (ptrace(PTRACE_GETREGSET, pid, NT_ARM_GCS, &gcs_iov) < 0) {
+			pr_perror("Failed to get GCS for %d", pid);
+			return -1;
+		}
+		core->ti_aarch64->gcs->gcspr_el0 = gcs_live.gcspr_el0;
+		core->ti_aarch64->gcs->features_enabled = gcs_live.features_enabled;
+	}
+
 	return 0;
 }
 
@@ -173,6 +191,7 @@ int arch_alloc_thread_info(CoreEntry *core)
 	ThreadInfoAarch64 *ti_aarch64;
 	UserAarch64RegsEntry *gpregs;
 	UserAarch64FpsimdContextEntry *fpsimd;
+	UserAarch64GcsEntry *gcs;
 
 	ti_aarch64 = xmalloc(sizeof(*ti_aarch64));
 	if (!ti_aarch64)
@@ -202,6 +221,15 @@ int arch_alloc_thread_info(CoreEntry *core)
 	if (!fpsimd->vregs)
 		goto err;
 
+	/* Allocate & init GCS */
+	if (compel_host_supports_gcs()) {
+		gcs = xmalloc(sizeof(*gcs));
+		if (!gcs)
+			goto err;
+		user_aarch64_gcs_entry__init(gcs);
+		ti_aarch64->gcs = gcs;
+	}
+
 	return 0;
 err:
 	return -1;
@@ -231,6 +259,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 {
 	int i;
 	struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe);
+	struct gcs_context *gcs;
 
 	if (core->ti_aarch64->fpsimd->n_vregs != 64)
 		return 1;
@@ -244,6 +273,18 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core)
 	fpsimd->head.magic = FPSIMD_MAGIC;
 	fpsimd->head.size = sizeof(*fpsimd);
 
+	if (compel_host_supports_gcs()) {
+		gcs = RT_SIGFRAME_GCS(sigframe);
+
+		pr_debug("sigframe gcspr %llx enabled %llx\n", gcs->gcspr, gcs->features_enabled);
+
+		gcs->head.magic = GCS_MAGIC;
+		gcs->head.size = sizeof(*gcs);
+		gcs->reserved = 0;
+		gcs->gcspr = core->ti_aarch64->gcs->gcspr_el0 - 8;
+		gcs->features_enabled = core->ti_aarch64->gcs->features_enabled;
+	}
+
 	return 0;
 }
 

From d591e320e0ef3dd816a2c61a46a074e21f2b769f Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Tue, 12 Aug 2025 20:13:28 +0200
Subject: [PATCH 1836/1854] criu/restore: gcs: adds restore implementation for
 Guarded Control Stack
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit finalizes AArch64 Guarded Control Stack (GCS)
support by wiring the full dump and restore flow.

The restore path adds the following steps:

 - Define shared AArch64 GCS types and constants in a dedicated header
   for both compel and CRIU inclusion
 - compel: add get/set NT_ARM_GCS via ptrace, enabling user-space
   GCS state save and restore.
 - During restore switch to the new GCS (via GCSSTR) to place capability
   token sa_restorer address
 - arch_shstk_trampoline() — We enable GCS in a trampoline that using
   prctl(PR_SET_SHADOW_STACK_STATUS, ...) via inline SVC. The trampoline
   ineeded because we can’t RET without a valid GCS.
 - restorer: map the recorded GCS VMA, populate contents top-down with
   GCSSTR, write the signal capability at GCSPR_EL0 and the valid token at
   GCSPR_EL0-8, then switch to the rebuilt GCS (GCSSS1)
 - Save and restore registers via ptrace
 - Extend restorer argument structures to carry GCS state
   into post-restore execution
 - Add shstk_set_restorer_stack(): sets tmp_gcs to temporary restorer
   shadow stack start
 - Add gcs_vma_restore implementation (required for mremap of the GCS VMA)

Tested with:
    GCS_ENABLE=1 ./zdtm.py run -t zdtm/static/env00

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
---
 compel/arch/aarch64/src/lib/infect.c          |  30 +++
 .../arch/arm/plugins/std/syscalls/syscall.def |   1 +
 compel/include/infect-priv.h                  |   1 +
 criu/arch/aarch64/Makefile                    |   1 +
 criu/arch/aarch64/gcs.c                       | 157 ++++++++++++++
 criu/arch/aarch64/include/asm/gcs.h           | 196 ++++++++++++++++++
 criu/arch/aarch64/include/asm/restorer.h      |   1 +
 7 files changed, 387 insertions(+)
 create mode 100644 criu/arch/aarch64/gcs.c
 create mode 100644 criu/arch/aarch64/include/asm/gcs.h

diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 39be558ea..7450ac026 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -136,6 +136,9 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 {
 	struct iovec iov;
 
+	struct user_gcs gcs;
+	struct iovec gcs_iov = { .iov_base = &gcs, .iov_len = sizeof(gcs) };
+
 	pr_info("Restoring GP/FPU registers for %d\n", pid);
 
 	iov.iov_base = &ext_regs->fpstate;
@@ -144,6 +147,33 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 		pr_perror("Failed to set FPU registers for %d", pid);
 		return -1;
 	}
+
+	if (ptrace(PTRACE_GETREGSET, pid, NT_ARM_GCS, &gcs_iov) < 0) {
+		pr_warn("gcs: Failed to get GCS for %d\n", pid);
+	} else {
+		ext_regs->gcs = gcs;
+		compel_set_task_gcs_regs(pid, ext_regs);
+	}
+
+	return 0;
+}
+
+int compel_set_task_gcs_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
+{
+	struct iovec iov;
+
+	pr_info("gcs: restoring GCS registers for %d\n", pid);
+	pr_info("gcs: restoring GCS: gcspr=%llx features=%llx\n",
+		ext_regs->gcs.gcspr_el0, ext_regs->gcs.features_enabled);
+
+	iov.iov_base = &ext_regs->gcs;
+	iov.iov_len = sizeof(ext_regs->gcs);
+
+	if (ptrace(PTRACE_SETREGSET, pid, NT_ARM_GCS, &iov)) {
+		pr_perror("gcs: Failed to set GCS registers for %d", pid);
+		return -1;
+	}
+
 	return 0;
 }
 
diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 9a33009eb..819678566 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -124,3 +124,4 @@ openat2				437	437	(int dirfd, char *pathname, struct open_how *how, size_t size
 pidfd_getfd			438	438	(int pidfd, int targetfd, unsigned int flags)
 rseq				293	398	(void *rseq, uint32_t rseq_len, int flags, uint32_t sig)
 membarrier 			283	389	(int cmd, unsigned int flags, int cpu_id)
+map_shadow_stack		453	!	(unsigned long addr, unsigned long size, unsigned int flags)
\ No newline at end of file
diff --git a/compel/include/infect-priv.h b/compel/include/infect-priv.h
index 9d3442839..8e78a7f6c 100644
--- a/compel/include/infect-priv.h
+++ b/compel/include/infect-priv.h
@@ -72,6 +72,7 @@ extern bool arch_can_dump_task(struct parasite_ctl *ctl);
 extern int compel_get_task_regs(pid_t pid, user_regs_struct_t *regs, user_fpregs_struct_t *ext_regs, save_regs_t save,
 				void *arg, unsigned long flags);
 extern int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs);
+extern int compel_set_task_gcs_regs(pid_t pid, user_fpregs_struct_t *ext_regs);
 extern int arch_fetch_sas(struct parasite_ctl *ctl, struct rt_sigframe *s);
 extern int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs,
 				     user_fpregs_struct_t *fpregs);
diff --git a/criu/arch/aarch64/Makefile b/criu/arch/aarch64/Makefile
index b26487367..b87fcaa5b 100644
--- a/criu/arch/aarch64/Makefile
+++ b/criu/arch/aarch64/Makefile
@@ -6,3 +6,4 @@ obj-y			+= cpu.o
 obj-y			+= crtools.o
 obj-y			+= sigframe.o
 obj-y			+= bitops.o
+obj-y			+= gcs.o
\ No newline at end of file
diff --git a/criu/arch/aarch64/gcs.c b/criu/arch/aarch64/gcs.c
new file mode 100644
index 000000000..4bdb9d2e4
--- /dev/null
+++ b/criu/arch/aarch64/gcs.c
@@ -0,0 +1,157 @@
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+
+#include <common/list.h>
+#include <compel/cpu.h>
+
+#include "asm/gcs-types.h"
+#include "pstree.h"
+#include "restorer.h"
+#include "rst-malloc.h"
+#include "vma.h"
+
+#include <sys/auxv.h>
+#include <stdbool.h>
+
+static bool task_has_gcs_enabled(UserAarch64GcsEntry *gcs)
+{
+	return gcs && (gcs->features_enabled & PR_SHADOW_STACK_ENABLE) != 0;
+}
+
+static bool host_supports_gcs(void)
+{
+	unsigned long hwcap = getauxval(AT_HWCAP);
+	return (hwcap & HWCAP_GCS) != 0;
+}
+
+static bool task_needs_gcs(struct pstree_item *item, CoreEntry *core)
+{
+	UserAarch64GcsEntry *gcs;
+
+	if (!task_alive(item))
+		return false;
+
+	gcs = core->ti_aarch64->gcs;
+
+	if (task_has_gcs_enabled(gcs)) {
+		if (!host_supports_gcs()) {
+			pr_warn_once("Restoring task with GCS on non-GCS host\n");
+			return false;
+		}
+
+		pr_info("Restoring task with GCS\n");
+		return true;
+	}
+
+	pr_info("Restoring a task without GCS\n");
+	return false;
+}
+
+static int gcs_prepare_task(struct vm_area_list *vmas,
+			    struct rst_shstk_info *gcs)
+{
+	struct vma_area *vma;
+
+	list_for_each_entry(vma, &vmas->h, list) {
+		if (vma_area_is(vma, VMA_AREA_SHSTK) &&
+		    in_vma_area(vma, gcs->gcspr_el0)) {
+			unsigned long premapped_addr = vma->premmaped_addr;
+			unsigned long size = vma_area_len(vma);
+
+			gcs->vma_start = vma->e->start;
+			gcs->vma_size = size;
+			gcs->premapped_addr = premapped_addr;
+
+			return 0;
+		}
+	}
+
+	pr_err("Unable to find a shadow stack vma: %lx\n", gcs->gcspr_el0);
+	return -1;
+}
+
+int arch_gcs_prepare(struct pstree_item *item, CoreEntry *core,
+		     struct task_restore_args *ta)
+{
+	int i;
+	struct thread_restore_args *args_array = (struct thread_restore_args *)(&ta[1]);
+	struct vm_area_list *vmas = &rsti(item)->vmas;
+	struct rst_shstk_info *gcs = &ta->shstk;
+
+	if (!task_needs_gcs(item, core))
+		return 0;
+
+	gcs->gcspr_el0 = core->ti_aarch64->gcs->gcspr_el0;
+	gcs->features_enabled = core->ti_aarch64->gcs->features_enabled;
+
+	if (gcs_prepare_task(vmas, gcs)) {
+		pr_err("gcs: failed to prepare shadow stack memory\n");
+		return -1;
+	}
+
+	for (i = 0; i < item->nr_threads; i++) {
+		struct thread_restore_args *thread_args = &args_array[i];
+
+		core = item->core[i];
+		gcs = &thread_args->shstk;
+
+		gcs->gcspr_el0 = core->ti_aarch64->gcs->gcspr_el0;
+		gcs->features_enabled = core->ti_aarch64->gcs->features_enabled;
+
+		if (gcs_prepare_task(vmas, gcs)) {
+			pr_err("gcs: failed to prepare GCS memory\n");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
+			  int (*func)(void *arg), void *arg)
+{
+	int fret;
+	unsigned long flags = PR_SHADOW_STACK_ENABLE |
+			      PR_SHADOW_STACK_PUSH |
+			      PR_SHADOW_STACK_WRITE;
+
+	long ret, x1_after, x8_after;
+
+	/* If task doesn't need GCS, just call func */
+	if (!task_needs_gcs(item, core)) {
+		return func(arg);
+	}
+
+	pr_debug("gcs: GCS enable SVC about to fire: x8=%d x0=%d x1=0x%lx\n",
+		 __NR_prctl, PR_SET_SHADOW_STACK_STATUS, flags);
+
+	asm volatile(
+		"mov x0, %3\n"	// x0 = PR_SET_SHADOW_STACK_STATUS (75)
+		"mov x1, %4\n"	// x1 = flags
+		"mov x2, xzr\n" // x2 = 0
+		"mov x3, xzr\n" // x3 = 0
+		"mov x4, xzr\n" // x4 = 0
+		"mov x8, %5\n"	// x8 = __NR_prctl (167)
+		"svc #0\n"	// Invoke syscall
+		"mov %0, x0\n"	// Capture return value
+		"mov %1, x1\n"	// Capture x1 after
+		"mov %2, x8\n"	// Capture x8 after
+		: "=r"(ret), "=r"(x1_after), "=r"(x8_after)
+		: "i"(PR_SET_SHADOW_STACK_STATUS), // x0 - %3rd
+		  "r"(flags),			   // x1 - %4th
+		  "i"(__NR_prctl)		   // x8 - %5th
+		: "x0", "x1", "x2", "x3", "x4", "x8", "memory", "cc");
+
+	pr_info("gcs: after SVC: ret=%ld x1=%ld x8=%ld\n", ret, x1_after, x8_after);
+
+	if (ret != 0) {
+		int err = errno;
+		pr_err("gcs: failed to enable GCS: ret=%ld errno=%d (%s)\n", ret, err, strerror(err));
+		return -1;
+	}
+
+	fret = func(arg);
+	exit(fret);
+
+	return -1;
+}
diff --git a/criu/arch/aarch64/include/asm/gcs.h b/criu/arch/aarch64/include/asm/gcs.h
new file mode 100644
index 000000000..28faa23b7
--- /dev/null
+++ b/criu/arch/aarch64/include/asm/gcs.h
@@ -0,0 +1,196 @@
+#ifndef __CR_ASM_GCS_H__
+#define __CR_ASM_GCS_H__
+
+#include <asm/gcs-types.h>
+
+struct rst_shstk_info {
+	unsigned long vma_start;      /* start of GCS VMA */
+	unsigned long vma_size;	      /* size of GCS VMA */
+	unsigned long premapped_addr; /* premapped buffer */
+	unsigned long tmp_gcs;	      /* temp area for GCS if needed */
+	u64 gcspr_el0;		      /* GCS pointer */
+	u64 features_enabled;	      /* GCS flags */
+};
+
+#define rst_shstk_info rst_shstk_info
+
+struct task_restore_args;
+struct pstree_item;
+
+int arch_gcs_prepare(struct pstree_item *item, CoreEntry *core,
+		     struct task_restore_args *ta);
+#define arch_shstk_prepare arch_gcs_prepare
+
+int arch_shstk_trampoline(struct pstree_item *item, CoreEntry *core,
+			  int (*func)(void *arg), void *arg);
+#define arch_shstk_trampoline arch_shstk_trampoline
+
+static always_inline void shstk_set_restorer_stack(struct rst_shstk_info *gcs, void *ptr)
+{
+	gcs->tmp_gcs = (long unsigned)ptr;
+}
+#define shstk_set_restorer_stack shstk_set_restorer_stack
+
+static always_inline long shstk_restorer_stack_size(void)
+{
+	return PAGE_SIZE;
+}
+#define shstk_restorer_stack_size shstk_restorer_stack_size
+
+#ifdef CR_NOGLIBC
+#include <compel/plugins/std/syscall.h>
+#include <compel/cpu.h>
+#include "vma.h"
+
+static inline unsigned long gcs_map(unsigned long addr, unsigned long size, unsigned int flags)
+{
+	long gcspr = sys_map_shadow_stack(addr, size, flags);
+	pr_info("gcs: syscall: map_shadow_stack at=%lx size=%ld\n", addr, size);
+
+	if (gcspr < 0) {
+		pr_err("gcs: failed to map GCS at %lx: %ld\n", addr, gcspr);
+		return -1;
+	}
+
+	if (addr && gcspr != addr) {
+		pr_err("gcs: address mismatch: need %lx, got %lx\n", addr, gcspr);
+		return -1;
+	}
+
+	pr_info("gcs: mmapped GCS at %lx\n", gcspr);
+
+	return gcspr;
+}
+
+/* clang-format off */
+static always_inline void gcsss1(unsigned long *Xt)
+{
+	asm volatile (
+		"sys #3, C7, C7, #2, %0\n"
+		:
+		: "rZ" (Xt)
+		: "memory");
+}
+
+static always_inline unsigned long *gcsss2(void)
+{
+	unsigned long *Xt;
+
+	asm volatile (
+		"SYSL %0, #3, C7, C7, #3\n"
+		: "=r" (Xt)
+		:
+		: "memory");
+
+	return Xt;
+}
+
+static inline void gcsstr(unsigned long addr, unsigned long val)
+{
+	asm volatile(
+		"mov x0, %0\n"
+		"mov x1, %1\n"
+		".inst 0xd91f1c01\n"  // GCSSTR x1, [x0]
+		"mov x0, #0\n"
+		:
+		: "r"(addr), "r"(val)
+		: "x0", "x1", "memory");
+}
+/* clang-format on */
+
+static always_inline int gcs_restore(struct rst_shstk_info *gcs)
+{
+	unsigned long gcspr, val;
+
+	if (!(gcs && gcs->features_enabled & PR_SHADOW_STACK_ENABLE)) {
+		return 0;
+	}
+
+	gcspr = gcs->gcspr_el0 - 8;
+
+	val = ALIGN_DOWN(GCS_SIGNAL_CAP(gcspr), 8);
+	pr_debug("gcs: [0] GCSSTR VAL=%lx write at GCSPR=%lx\n", val, gcspr);
+	gcsstr(gcspr, val);
+
+	val = ALIGN_DOWN(GCS_SIGNAL_CAP(gcspr), 8) | GCS_CAP_VALID_TOKEN;
+	gcspr -= 8;
+	pr_debug("gcs: [1] GCSSTR VAL=%lx write at GCSPR=%lx\n", val, gcspr);
+	gcsstr(gcspr, val);
+
+	pr_debug("gcs: about to switch stacks via GCSSS1 to: %lx\n", gcspr);
+	gcsss1((unsigned long *)gcspr);
+	return 0;
+}
+#define arch_shstk_restore gcs_restore
+
+static always_inline int gcs_vma_restore(VmaEntry *vma_entry)
+{
+	unsigned long shstk, i, ret;
+	unsigned long *gcs_data = (void *)vma_premmaped_start(vma_entry);
+	unsigned long vma_size = vma_entry_len(vma_entry);
+
+	shstk = gcs_map(0, vma_size, SHADOW_STACK_SET_TOKEN);
+	if (shstk < 0) {
+		pr_err("Failed to map shadow stack at %lx: %ld\n", shstk, shstk);
+	}
+
+	/* restore shadow stack contents */
+	for (i = 0; i < vma_size / 8; i++)
+		gcsstr(shstk + i * 8, gcs_data[i]);
+
+	pr_debug("unmap %lx %ld\n", (unsigned long)gcs_data, vma_size);
+	ret = sys_munmap(gcs_data, vma_size);
+	if (ret < 0) {
+		pr_err("Failed to unmap premmaped shadow stack\n");
+		return ret;
+	}
+
+	vma_premmaped_start(vma_entry) = shstk;
+
+	return 0;
+}
+#define shstk_vma_restore gcs_vma_restore
+
+static always_inline int gcs_switch_to_restorer(struct rst_shstk_info *gcs)
+{
+	int ret;
+	unsigned long *ssp;
+	unsigned long addr;
+	unsigned long gcspr;
+
+	if (!(gcs && gcs->features_enabled & PR_SHADOW_STACK_ENABLE)) {
+		return 0;
+	}
+
+	pr_debug("gcs->premapped_addr + gcs->vma_size = %lx\n", gcs->premapped_addr + gcs->vma_size);
+	pr_debug("gcs->tmp_gcs = %lx\n", gcs->tmp_gcs);
+	addr = gcs->tmp_gcs;
+
+	if (addr % PAGE_SIZE != 0) {
+		pr_err("gcs: 0x%lx not page-aligned to size 0x%lx\n", addr, PAGE_SIZE);
+		return -1;
+	}
+
+	ret = sys_munmap((void *)addr, PAGE_SIZE);
+	if (ret < 0) {
+		pr_err("gcs: Failed to unmap aarea for dumpee GCS VMAs\n");
+		return -1;
+	}
+
+	gcspr = gcs_map(addr, PAGE_SIZE, SHADOW_STACK_SET_TOKEN);
+
+	if (gcspr == -1) {
+		pr_err("gcs: failed to gcs_map(%lx, %lx)\n", (unsigned long)addr, PAGE_SIZE);
+		return -1;
+	}
+
+	ssp = (unsigned long *)(addr + PAGE_SIZE - 8);
+	gcsss1(ssp);
+
+	return 0;
+}
+#define arch_shstk_switch_to_restorer gcs_switch_to_restorer
+
+#endif /* CR_NOGLIBC */
+
+#endif /* __CR_ASM_GCS_H__ */
diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index 2174df4fa..8f3edc257 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -5,6 +5,7 @@
 #include <sys/ucontext.h>
 
 #include "asm/types.h"
+#include "asm/gcs.h"
 #include "images/core.pb-c.h"
 
 #include <compel/asm/sigframe.h>

From f78bea8d34cb54a53ae976f5abb2091f0a45a90a Mon Sep 17 00:00:00 2001
From: Igor Svilenkov Bozic <svilenkov@gmail.com>
Date: Sun, 23 Nov 2025 17:27:49 +0100
Subject: [PATCH 1837/1854] zdtm: gcs: add opt-in GCS test support for AArch64

Introduce an opt-in mode for building and running ZDTM static tests
with Guarded Control Stack (GCS) enabled on AArch64.

Changes:
 - Support `GCS_ENABLE=1` builds, adding `-mbranch-protection=standard`
   and `-z experimental-gcs=check` to CFLAGS/LDFLAGS.
 - Export required GLIBC_TUNABLES at runtime via `TEST_ENV`.
 - %.pid rules to prefix test binaries with `$(TEST_ENV)`
   so the tunables are set when running tests.
 - Makefile rules for selectively enabling GCS in tests

Usage:
    # Build and run with GCS enabled
    make -C zdtm/static GCS_ENABLE=1 posix_timers
    GCS_ENABLE=1 ./zdtm.py run --keep-img=always \
        -t zdtm/static/posix_timers

By default (`GCS_ENABLE` unset or 0), test builds and runs are
unchanged.

NOTE: This assumes that the test victim was compiled also using
      GCS_ENABLE=1 so that the proper GCS AArch64 ELF headers are present

Signed-off-by: Igor Svilenkov Bozic <svilenkov@gmail.com>
Reviewed-by: Alexander Mikhalitsyn aleksandr.mikhalitsyn@canonical.com
---
 test/zdtm/Makefile.inc    |  8 ++++++++
 test/zdtm/static/Makefile | 18 +++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 465285f08..c95b4ef6a 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -79,6 +79,14 @@ define pkg-cflags
         $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --cflags $(1))
 endef
 
+ifeq ($(GCS_ENABLE),1)
+        CFLAGS  += -mbranch-protection=standard
+        LDFLAGS += -z experimental-gcs=check
+        TEST_ENV = GLIBC_TUNABLES=glibc.cpu.aarch64_gcs=1:glibc.cpu.aarch64_gcs_policy=2
+else
+        TEST_ENV =
+endif
+
 %.d: %.c
 	$(E) " DEP      " $@
 	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -MM -MP $< -o $@
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index ea901a805..e1df2e5fa 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -520,30 +520,30 @@ install: all
 .PHONY: all install
 
 $(TST_NOFILE:%=%.pid):	%.pid:	%
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out
 
 $(TST_FILE:%=%.pid):	%.pid:	%
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --filename=$<.test
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --filename=$<.test
 
 $(TST_DIR:%=%.pid):	%.pid:	%
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --dirname=$<.test
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --dirname=$<.test
 
 $(TST_DIR_FILE:%=%.pid):	%.pid:	%
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --dirname=$<.dir.test --filename=$<.test
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --dirname=$<.dir.test --filename=$<.test
 
 cmdlinenv00.pid: cmdlinenv00
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --arg1=arg1 --arg2=arg2 --arg3=arg3
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --arg1=arg1 --arg2=arg2 --arg3=arg3
 
 shm-unaligned.pid: shm-unaligned
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --shmem_size=5000
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --shmem_size=5000
 
 shm-hugetlb.pid: shm-hugetlb
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --shmem_size=4194304
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --shmem_size=4194304
 
 env00.pid:	env00
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --envname=ENV_00_TEST
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --envname=ENV_00_TEST
 umask00.pid:	umask00
-	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --mask=0345
+	$(TEST_ENV) $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --mask=0345
 
 fifo-rowo-pair.pid: fifo-rowo-pair
 	$(<D)/$(<F) --pidfile=$@ --outfile=$<.out --name_master=$<.master.test --name_slave=$<.slave.test

From f66e59ee5c9725820c67c61019b789c30a961a32 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Tue, 9 Dec 2025 19:26:03 +0000
Subject: [PATCH 1838/1854] cr-dump: fix error handling

Commit "plugin: Add DUMP_DEVICES_LATE callback" introduced a new plugin
callback that is invoked in cr_dump_tasks(). The return value of this
callback was assigned to the variable ret. However, this variable is later
used as the return value when goto err is triggered in subsequent
conditions. As a result, CRIU exits with "Dumping finished successfully" even
when some actions have failed and inventory.img has not been created.

To fix this, we replace ret with exit_code and use it only when it is
actually needed.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 criu/cr-dump.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/criu/cr-dump.c b/criu/cr-dump.c
index 98b4223ba..a58aaf34a 100644
--- a/criu/cr-dump.c
+++ b/criu/cr-dump.c
@@ -2138,8 +2138,8 @@ int cr_dump_tasks(pid_t pid)
 	InventoryEntry he = INVENTORY_ENTRY__INIT;
 	InventoryEntry *parent_ie = NULL;
 	struct pstree_item *item;
-	int pre_dump_ret = 0;
-	int ret = -1;
+	int ret;
+	int exit_code = -1;
 
 	kerndat_warn_about_madv_guards();
 
@@ -2159,9 +2159,9 @@ int cr_dump_tasks(pid_t pid)
 		goto err;
 	root_item->pid->real = pid;
 
-	pre_dump_ret = run_scripts(ACT_PRE_DUMP);
-	if (pre_dump_ret != 0) {
-		pr_err("Pre dump script failed with %d!\n", pre_dump_ret);
+	ret = run_scripts(ACT_PRE_DUMP);
+	if (ret != 0) {
+		pr_err("Pre dump script failed with %d!\n", ret);
 		goto err;
 	}
 	if (init_stats(DUMP_STATS))
@@ -2287,39 +2287,32 @@ int cr_dump_tasks(pid_t pid)
 	 * ipc shared memory, but an ipc namespace is dumped in a child
 	 * process.
 	 */
-	ret = cr_dump_shmem();
-	if (ret)
+	if (cr_dump_shmem())
 		goto err;
 
 	if (root_ns_mask) {
-		ret = dump_namespaces(root_item, root_ns_mask);
-		if (ret)
+		if (dump_namespaces(root_item, root_ns_mask))
 			goto err;
 	}
 
 	if ((root_ns_mask & CLONE_NEWTIME) == 0) {
-		ret = dump_time_ns(0);
-		if (ret)
+		if (dump_time_ns(0))
 			goto err;
 	}
 
 	if (dump_aa_namespaces() < 0)
 		goto err;
 
-	ret = dump_cgroups();
-	if (ret)
+	if (dump_cgroups())
 		goto err;
 
-	ret = fix_external_unix_sockets();
-	if (ret)
+	if (fix_external_unix_sockets())
 		goto err;
 
-	ret = tty_post_actions();
-	if (ret)
+	if (tty_post_actions())
 		goto err;
 
-	ret = inventory_save_uptime(&he);
-	if (ret)
+	if (inventory_save_uptime(&he))
 		goto err;
 
 	he.has_pre_dump_mode = false;
@@ -2328,10 +2321,10 @@ int cr_dump_tasks(pid_t pid)
 		he.allow_uprobes = true;
 	}
 
-	ret = write_img_inventory(&he);
+	exit_code = write_img_inventory(&he);
 err:
 	if (parent_ie)
 		inventory_entry__free_unpacked(parent_ie, NULL);
 
-	return cr_dump_finish(ret);
+	return cr_dump_finish(exit_code);
 }

From 30acbabcddbad502660f2e4b1aab9f16f99bca4f Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Wed, 26 Nov 2025 13:49:25 +0000
Subject: [PATCH 1839/1854] ci: also exclude docker version 29

Docker version 28 broke container restore in combination with network
namespaces. The workaround in the CI script was excluding Docker version
28. Now that there is also Docker version 29, which is still broken,
this also excludes Docker version 29.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 scripts/ci/docker-test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
index bc5a74667..c1c745544 100755
--- a/scripts/ci/docker-test.sh
+++ b/scripts/ci/docker-test.sh
@@ -2,7 +2,7 @@
 
 set -x -e -o pipefail
 
-# Workaround: Docker 28.x has a known regression that breaks the checkpoint and
+# Workaround: Docker 28.x and 29.x has a known regression that breaks the checkpoint and
 # restore (C/R) feature. Let's install previous, or next major version. See
 # https://github.com/moby/moby/issues/50750 for details on the bug.
 export DEBIAN_FRONTEND=noninteractive
@@ -17,7 +17,7 @@ echo \
   $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" > /etc/apt/sources.list.d/docker.list
 apt update -y
 apt-cache madison docker-ce | awk '{ print $3 }'
-verstr="$(apt-cache madison docker-ce | awk '{ print $3 }' | sort | grep -v ':28\.'| tail -n 1)"
+verstr="$(apt-cache madison docker-ce | awk '{ print $3 }' | sort | grep -Ev ':(28|29)\.'| tail -n 1)"
 ../../contrib/apt-install -y "docker-ce=$verstr" "docker-ce-cli=$verstr"
 
 # docker checkpoint and restore is an experimental feature

From d4e8114130bd97ad280f85568e9feeb93c27cd53 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Wed, 17 Dec 2025 00:53:59 +0000
Subject: [PATCH 1840/1854] readme: use a local copy of the CRIU logo

The README currently uses an external link to criu.org for the embedded
CRIU logo. Loading this URL when viewing the README on GitHub sometimes
fails with "Error Fetching Resource". Using a local copy of the logo
fixes this issue.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 Documentation/logo.svg | 136 +++++++++++++++++++++++++++++++++++++++++
 README.md              |   2 +-
 2 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/logo.svg

diff --git a/Documentation/logo.svg b/Documentation/logo.svg
new file mode 100644
index 000000000..f713e72b7
--- /dev/null
+++ b/Documentation/logo.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="560px" height="560px" viewBox="0 0 560 560" enable-background="new 0 0 560 560" xml:space="preserve">
+<path opacity="0.3" fill="#990000" d="M315.137,360.271c-18.771-7.159-41.548-8.85-68.479-8.85c-16.661,0-46.255,2.939-74.654,3.38
+	c11.209-4.884,20.734-10.265,24.842-16.87c14.531-23.346,17.645-65.893,17.645-65.893l-20.758,3.114c0,0-2.591,35.8-16.085,47.733
+	c-5.35,4.736-15.96,7.834-27.916,10.856c2.447-26.071,29.477-57.552,29.477-57.552l-14.874-3.966l-5.88-7.448
+	c0,0-3.011,1.761-7.588,5.315c-18.298,4.208-75.946,20.443-75.946,57.983c0,15.292,5.77,26.308,14.768,34.244
+	c-22.858,26.966-20.755,61.618-20.755,61.618s-8.945,16.61-8.021,31.254c2.083,32.973,34.931,25.097,44.313,26.374
+	c9.644,1.313,34.313-4.18,34.313-4.18s-16.276-2.639-15.329-18.562c0.5-8.369-0.947-27.628-21.404-37.307
+	c-1.13-10.066,2.111-18.309,6.379-28.015c18.452,45.263,92.601,53.97,92.601,53.97c0.393-0.097-10.269,20.047,0.221,35.632
+	c4.652,6.915,18.284,10.019,22.436,19.356c4.151,9.341,2.199,30.354,2.199,30.354s21.267-16.864,27.239-30.18
+	c3.334-7.432,25.989,0.926,25.989-34.047c0-14.077-12.26-26.841-13.675-29.815c-20.858-20.334-5.427-4.743,2.677-8.236
+	c12.758-5.499,35.412,11.657,35.412,11.657s-10.402-20.119-11.437-31.013c-0.795-8.335-4.537-16.816-16.624-30.042
+	c7.166-0.752,20.362,2.327,20.362,2.327s-5.202,11.251-0.879,25.515c3.588,11.84,7.193,7.193,14.736,14.737
+	c6.599,6.598,3.146,26.284,3.146,26.284s4.674-4.513,18.081-18.235c9.072-9.29,23.645-16.717,23.645-47.86
+	C355.312,365.969,334.97,360.979,315.137,360.271z M134.108,285.901c-11.5,13.048-23.667,32.329-28.23,58.293
+	c-4.821-3.519-7.613-8.1-7.613-14.043C98.265,309.699,117.078,295.016,134.108,285.901z"/>
+<path fill="#990000" d="M382.184,115.435c3.654,1.208,7.327,2.37,10.968,3.444c14.16,4.183,26.745-9.798,26.745-9.798
+	s-8.785-2.243-17.857-3.497c12.173-2.653,21.085-18.66,21.085-18.66s-17.366,4.819-27.224,5.087
+	c-2.042,0.057-4.107,0.118-6.189,0.186c2.464-0.37,4.925-0.847,7.361-1.485c14.201-3.714,21.505-23.382,21.505-23.382
+	s-15.411,6.743-24.951,9.239c-2.694,0.703-5.438,1.437-8.197,2.185c3.038-1.071,6.008-2.306,8.815-3.82
+	c12.922-6.965,12.241-29.347,12.241-29.347s-10.162,11.926-18.844,16.605c-3.557,1.916-7.199,3.904-10.846,5.911
+	c3.798-2.277,7.45-4.743,10.596-7.569c10.918-9.814,7.722-29.605,7.722-29.605s-9.801,12.54-17.135,19.131
+	c-8.939,8.037-18.775,14.104-27.014,21.81c-6.427,6.011-25.14,35.236-36.812,46.283c-11.671,11.047-18.301,12.476-19.159,14.388
+	c-0.863,1.913,1.006,30.46-14.078,39.145c-16.476-21.583-50.565-44.007-53.101-72.033c-2.079-22.959,5.209-34.055,19.149-35.316
+	c14.994-1.359,15.998,24.507,15.998,24.507s-1.379,1.064-1.708,6.391c-0.097,0.629-0.145,1.272-0.083,1.934
+	c0.004,0.031,0.008,0.06,0.011,0.091c-0.014,1.674,0.065,3.664,0.278,6.039c1.131,12.474,4.53,14.574,4.53,14.574l2.075-0.722
+	c0,0-2.24-4.079-2.554-7.529c-0.172-1.917-0.187-3.556-0.079-4.977c0.45,0.067,0.949,0.081,1.506,0.031
+	c4.398-0.399,6.049-4.141,5.65-8.539c-0.042-0.45-0.069-0.885-0.094-1.316c2.485-26.032-1.756-29.637,4.788-41.391
+	c9.032-16.218,17.279-16.015,17.279-16.015l1.402-8.155c0,0-6.817,2.462-14.819,13.652c-8.833,12.354-8.983,26.229-9.066,47.958
+	c-0.188-0.761-0.502-1.37-1.017-1.784c-2.457-11.192-9.087-32.13-24.112-30.77c-16.72,1.514-29.419,14.974-26.773,44.171
+	c3.609,39.832,26.186,52.701,29.829,80.84c-13.47-2.349-23.883-10.656-30.866-20.282c-7.803-10.749-7.297-22.949-8.324-24.779
+	c-1.027-1.829-7.761-2.662-20.367-12.627c-12.605-9.965-33.845-37.41-40.78-42.824c-8.895-6.942-19.229-12.111-28.848-19.32
+	c-7.892-5.915-18.769-17.531-18.769-17.531s-1.419,19.995,10.323,28.8c3.386,2.536,7.246,4.665,11.229,6.597
+	c-3.808-1.674-7.616-3.33-11.327-4.925c-9.062-3.887-20.246-14.861-20.246-14.861s1.31,22.353,14.803,28.143
+	c2.931,1.257,6,2.223,9.12,3.019c-2.818-0.5-5.615-0.985-8.357-1.447c-9.728-1.636-25.677-6.981-25.677-6.981
+	s9.025,18.94,23.5,21.376c2.485,0.417,4.975,0.674,7.466,0.822c-2.08,0.118-4.148,0.242-6.183,0.368
+	c-9.843,0.61-27.566-2.645-27.566-2.645S85.667,120.333,110,120c-8.922,2.057-25.678,6.008-25.678,6.008s13.778,12.806,27.508,7.38
+	c3.533-1.394,7.087-2.876,10.62-4.404c-3.726,1.804-7.424,3.581-11.005,5.273c-8.963,4.243-19.428,10.176-19.428,10.176
+	s15.069,9.759,27.305,1.497c0.558-0.378,3.121-1.76,3.678-2.143c-7.904,5.808-19.754,14.937-19.754,14.937
+	s15.802,6.027,27.092-3.354c4.663-3.875,8.104-7.185,12.238-11.618c-3.773,4.55-6.699,8.018-10.634,12.106
+	c-6.839,7.104-13.06,19.791-13.06,19.791s15.597,0.39,24.359-11.388c4.488-6.035,7.482-11.633,10.974-18.191
+	c-3.113,6.479-5.468,11.95-8.911,17.788c-5.018,8.49-7.574,22.624-7.574,22.624s15.342-3.655,21.07-17.17
+	c2.231-5.266,2.107-9.783,3.694-15.291c-1.257,5.272-0.666,9.475-2.24,14.319c-3.045,9.379,0.011,25.554,0.011,25.554
+	s9.713-5.855,10.359-20.52c0.006-0.153,0.5-8.47,0.5-8.625L171,171.496c0,9.917,6.295,23.276,6.295,23.276
+	s11.459-10.649,9.369-25.266c-0.188-1.31-0.1-2.627-0.305-3.947c0.408,1.507,0.998,3.016,1.493,4.524
+	c3.075,9.429,3.5,15.957,3.5,15.957s6.483,1.251,8.73-1.594c0.764,5.625-0.843,10.2-0.843,10.2s5.471-1.1,8.893-3.756
+	c0.705,5.331,0.155,8.789,0.155,8.789s5.106-1.603,8.419-4.323c0.611,4.642,1.764,7.542,1.764,7.542s6.398-0.88,9.021-5.393
+	c0.199,0.038,0.395,0.079,0.59,0.117c2.269,4.875,1.438,8.517,1.438,8.517s7.492-2.14,9.492-6.14c0.003,0,0.007,0,0.01,0
+	c1.798,4,2.727,6.102,2.727,6.102s4.853-2.349,7.093-6.064c0.189,0.009,0.364-0.093,0.547-0.086
+	c-4.702,19.629-23.62,29.658-42.207,42.764c-1.392,0.981-2.712,1.925-3.97,2.884c-2.891,1.512-6.788,3.495-11.311,5.724
+	c-9.829,3.363-23.7,6.057-41.038,4.084c-9.798-1.115-21.037,10.02-21.037,10.02s6.87,4.843,16.565,5.028
+	c-8.819,3.621-17.438,12.632-17.438,12.632s0.045,0.019,0.069,0.029c-27.096,11.688-51.621,29.917-47.651,57.105
+	c2.375,16.27,14.692,25.475,31.704,30.254c-17.81,14.742-32.921,36.129-30.707,60.59c0.134,1.487,0.309,2.916,0.508,4.311
+	c-2.209,5.6-3.288,17.842-2.674,24.886c0.949,10.838,13.686,8.662,18.219,6.729c14.139,12.202,32.258,10.252,32.258,10.252
+	s-17.301,1.211-30.306-11.156c5.551-2.659,6.424-3.925,6.788-11.579c0.36-7.61-9.104-20.759-20.57-21.966
+	c-1.25-20.07,9.861-43.32,30.603-60.203c0.02,0.249,0.023,0.491,0.048,0.742c4.248,46.957,30.584,54.634,81.148,63.26
+	c12.603,2.15,22.04,5.821,29.042,10.457c-3.844,5.388-5.706,21.559-2.895,32.325c3.045,11.655,12.647,14.53,19.429,14.955
+	c-3.304,16.035-11.235,29.024-11.235,29.024s10.015-11.628,15.04-29.016c0.48-0.031,0.928-0.069,1.319-0.114
+	c10.922-1.262,16.17-11.338,14.743-23.071c-1.195-9.826-13.974-24.54-28.598-25.992c-33.117-21.52-109.104-9.05-113.877-61.769
+	c-0.341-3.746-0.517-7.367-0.571-10.888c5.709,1.111,11.782,1.844,18.104,2.244c14.111,28.517,62.158,22.269,95.818,20.694
+	c1.764,3.09,7.043,7.064,13.929,9.779c11.751,4.633,14.889,3.742,18.869,1.502c1.484-0.835,2.828-1.92,3.979-3.155
+	c10.822,10.456,25.37,30.251,25.37,30.251s-12.29-22.284-22.733-33.97c2.601-4.923,2.433-10.619-2.559-13.297
+	c-6.956-3.732-31.321,1.581-36.316,4.981c-30.811,1.668-71.853,6.551-89.576-16.474c41.005,1.192,88.786-9.133,102.385-10.365
+	c21.726-1.966,47.319,1.367,64.887,8.228c-0.783,5.681,1.867,18.47,4.641,25.318c3.316,8.197,11.561,5.887,16.562,3.028
+	c-0.588,13.3-4.495,22.638-4.495,22.638s7.86-14.125,9.117-26.183c4.354-4.041,4.774-5.562,2.904-12.887
+	c-1.849-7.24-14.317-16.821-25.47-15.096c-21.855-8.906-54.594-11.087-75.74-9.175c-18.253,1.653-61.404,10.802-97.611,10.237
+	c-1.895-3.338-3.402-7.122-4.412-11.479c5.113-2.364,10.551-4.388,16.307-5.975c30.999-8.551,40.97-29.258,42.943-48.579
+	c1.127,1.303,1.938,2.069,1.938,2.069s7.087-12.679,5.522-27.275c-0.264-2.469-0.429-4.737-0.553-6.911
+	c2.499,6.741,7.778,13.001,7.778,13.001s16.438-20.208,5.846-27.268c-11.583-7.714-6.836-13.283-4.31-15.299
+	c3.354-1.984,6.973-3.94,10.859-5.817c26.561-12.817,59.903-20.002,64.443-40.039c0.265-1.172,0.388-2.34,0.443-3.507
+	c3.701,2.396,9.165,2.053,9.165,2.053s-0.367-2.88-0.601-7.556c3.747,2.081,8.874,1.758,8.874,1.758s-0.986-2.319-1.255-7.689
+	c3.846,1.998,8.434,2.278,8.434,2.278s-0.725-2.246-1.24-5.573c3.788,0.719,8.84,0.419,8.84,0.419s-3.543-7.302-1.316-16.965
+	c0.357-1.547,0.666-3.09,0.938-4.626c-0.087,1.332-0.169,2.662-0.238,3.985c-0.783,14.742,10.85,24.47,10.85,24.47
+	S337,172.178,337,162.303c0-0.021,0-0.042,0-0.061c0,0.153-0.804,0.309-0.782,0.46c1.951,14.548,13.499,20.839,13.499,20.839
+	s2.388-16.471-1.478-25.542c-1.998-4.686-3.966-9.742-5.688-14.881c2.068,5.344,4.374,10.673,7.067,15.72
+	c6.909,12.952,20.498,15.406,20.498,15.406s-1.832-14.029-7.581-22.041c-3.952-5.505-7.874-11.654-11.551-17.83
+	c4.059,6.22,8.622,12.438,13.631,18.048c9.774,10.953,25.27,9.178,25.27,9.178s-7.323-12.085-14.767-18.552
+	c-4.283-3.722-8.589-7.824-12.754-12.019c4.513,4.047,9.319,7.944,14.31,11.39c12.077,8.341,27.281,0.931,27.281,0.931
+	s-10.533-7.219-18.926-12.302c0.595,0.332,1.186,0.662,1.777,0.988c12.922,7.14,28.146-3.013,28.146-3.013
+	s-12.036-5.887-21.343-9.313C389.896,118.341,386.055,116.903,382.184,115.435z M116.917,367.418
+	c-0.172,0.131-0.344,0.268-0.516,0.398c-17.301-3.899-29.646-12.415-31.124-28.752c-2.244-24.777,21.669-42.631,47.562-54.59
+	c3.553,1,9.203,1.919,15.541,0.503c-4.694,4.817-7.998,9.859-7.998,9.859s2.076,0.564,5.3,0.733
+	C133.582,308.673,115.917,333.715,116.917,367.418z M146.295,295.598c1.834,0.062,3.979-0.014,6.326-0.386
+	c-0.141,0.365-0.274,0.72-0.401,1.069c-10.511,14.57-18.745,34.363-17.404,59.912c-4.522,2.267-9.248,5.074-13.939,8.343
+	C122.237,330.3,136.218,307.613,146.295,295.598z M121.776,368.86c4.131-2.979,8.589-5.697,13.361-8.115
+	c0.358,3.527,1.032,6.741,2.025,9.634C131.805,370.131,126.629,369.657,121.776,368.86z M150.478,350.278
+	c-3.791,0.864-8.16,2.403-12.812,4.546c-0.062-0.425-0.168-0.803-0.224-1.236c-2.557-19.875,3.873-37.276,13.005-51.347
+	c0,0.005-0.007,0.032-0.007,0.032s13.533-3.395,23.088-14.017c-1.715,7.205,0.158,14.79,0.158,14.79s9.774-5.185,16.654-15.216
+	c-0.131,5.548,2.84,10.803,5.451,14.331C193.303,321.731,182.711,342.934,150.478,350.278z M259.516,275.357
+	c0.846-4.127,1.649-8.135,2.42-12.012c2.199-4.002,5.203-6.524,9.011-7.55c3.808-1.04,7.78-1.559,11.919-1.559l1.739-17.042
+	c-5.942,0.378-11.657,1.419-17.144,3.105c-5.492,1.672-10.946,3.611-16.369,5.8c-4.526,4.131-7.915,8.875-10.169,14.237
+	c-2.262,5.359-3.755,11.051-4.655,17.055c-0.906,6.007-1.268,12.17-1.268,18.489v18.209c0,3.23,0.201,6.368,0.779,9.393
+	c0.584,3.045,1.728,5.66,3.543,7.85c3.614,2.588,7.203,3.85,10.822,3.771c3.619-0.066,7.224-0.712,10.842-1.925
+	c3.611-1.23,7.162-2.757,10.647-4.558c3.484-1.811,6.904-3.293,10.266-4.457l7.159-14.521c-2.066,0.505-4.2,1.23-6.394,2.127
+	c-2.199,0.9-4.453,1.643-6.777,2.224c-2.322,0.585-4.649,0.773-6.977,0.585c-2.322-0.189-4.649-1.2-6.976-2.994
+	c-2.063-3.626-3.355-7.475-3.87-11.541c-0.519-4.065-0.612-8.165-0.289-12.296C258.1,283.619,258.674,279.488,259.516,275.357z
+	 M367.6,320.582c-0.196-3.025-1.001-5.908-2.42-8.623c-1.031-3.608-2.649-6.588-4.846-8.905c-2.193-2.333-4.682-4.162-7.458-5.516
+	c-2.773-1.358-5.712-2.364-8.812-3.014c-3.098-0.643-6.004-1.056-8.717-1.259c-2.711-0.188-5.101-0.285-7.166-0.285
+	s-3.419-0.062-4.064-0.189c0.25-1.037,0.449-2.302,0.574-3.783c0.133-1.481,0.322-2.866,0.584-4.162
+	c0.258-1.419,0.512-2.977,0.773-4.65c6.326,0,12.073-0.581,17.242-1.749c5.165-1.148,9.688-3.059,13.558-5.705
+	c3.876-2.646,7.135-6.131,9.781-10.469c2.649-4.318,4.558-9.583,5.715-15.776c-5.684,0-11.596,0.029-17.727,0.093
+	s-12.328,0.158-18.593,0.284c-6.266,0.143-12.431,0.332-18.5,0.583c-6.066,0.27-11.812,0.584-17.236,0.979
+	c0.128,0,0.221,1.387,0.293,4.161c0.062,2.775,0.062,6.465,0,11.035c-0.072,4.588-0.2,9.788-0.386,15.589
+	c-0.199,5.819-0.49,11.73-0.875,17.734c-0.386,6.007-0.878,11.901-1.451,17.72c-0.584,5.815-1.262,10.908-2.035,15.304
+	c5.552-0.268,11.432-0.488,17.624-0.677c2.162-0.065,4.33-0.127,6.503-0.176l1.247-5.547c0.385-2.192,0.708-4.776,0.969-7.739
+	c0.259-2.979,0.513-5.754,0.773-8.338c0.259-3.093,0.386-6.196,0.386-9.286c0.646-0.127,1.677-0.206,3.103-0.206
+	c1.547,0,3.225,0.269,5.039,0.773c1.804,0.519,3.68,1.292,5.612,2.334c1.938,1.041,3.615,2.522,5.034,4.46
+	c1.42,1.925,2.45,4.352,3.104,7.252c0.638,2.914,0.638,6.495,0,10.75l0.631,5.39c1.609,0.033,3.207,0.079,4.796,0.144
+	c6.068,0.189,11.812,0.471,17.234,0.866C367.891,326.747,367.795,323.609,367.6,320.582z M327.506,263.345
+	c0.707-4.397,1.323-8.133,1.835-11.238c1.168-0.521,2.522-0.835,4.069-0.962c1.549-0.125,3.103-0.205,4.65-0.205
+	c1.677,0,3.291,0.031,4.845,0.112c1.547,0.062,2.901,0.093,4.069,0.093c0,1.151-0.041,2.586-0.103,4.256
+	c-0.066,1.688-0.189,3.42-0.389,5.232c-0.189,1.815-0.512,3.578-0.97,5.331c-0.446,1.732-1.127,3.182-2.034,4.347
+	c-0.896,0.918-2.128,1.657-3.681,2.224c-1.543,0.584-3.159,1.042-4.84,1.357c-1.677,0.33-3.291,0.55-4.838,0.677
+	c-1.555,0.141-2.78,0.207-3.682,0.207C326.439,271.542,326.798,267.727,327.506,263.345z M393.035,246.385
+	c-2.517,0.33-4.84,0.584-6.97,0.773c-2.135,0.205-3.781,0.172-4.939-0.096l3.678,2.711c0.899,5.423,1.356,11.051,1.356,16.851
+	c0,5.818-0.195,11.695-0.584,17.642c-0.385,5.941-0.872,11.805-1.45,17.624c-0.581,5.801-1,11.427-1.261,16.85
+	c-0.907,4.522-1.519,9.238-1.835,14.139c-0.331,4.901-0.843,9.713-1.554,14.425c-0.708,4.712-1.812,9.3-3.297,13.761
+	c-1.48,4.443-3.773,8.481-6.869,12.107l-2.908,1.543c0.513,0.52,1.323,0.993,2.42,1.45c1.093,0.457,1.842,0.678,2.23,0.678
+	c2.708-3.23,4.712-6.558,6.004-9.978c1.286-3.419,2.64-6.746,4.069-9.963c1.544-2.711,2.969-5.626,4.261-8.716
+	c1.286-3.107,2.774-6.008,4.455-8.719c1.671-2.708,3.681-5.045,6.008-6.984c2.322-1.938,5.285-3.15,8.903-3.67
+	c0.386-6.319,0.836-13.114,1.354-20.335c0.517-7.235,1.001-14.534,1.451-21.896c0.457-7.361,0.846-14.596,1.168-21.689
+	c0.323-7.111,0.482-13.684,0.482-19.769c-2.713,0-5.458,0.143-8.229,0.394C398.196,245.785,395.553,246.07,393.035,246.385z
+	 M483.002,245c0,4-0.061,5.618-0.188,7.038c-0.135,1.419-0.323,3.525-0.581,5.259c-0.261,1.751-0.584,4.166-0.972,6.752
+	c-0.386,2.584-0.843,6.388-1.354,11.165c-0.519,4.791-1.135,11.551-1.839,19.167c-0.715,7.612-1.519,18.619-2.427,29.619h-32.15
+	c0-15,1.065-26.686,3.192-39.535c2.138-12.847,4.101-25.911,5.911-38.695c-5.034,0.52-9.85,1.042-14.427,1.812
+	c-4.589,0.773-9.136,0.898-13.662,0.52c-0.513,13.682-1.543,27.507-3.097,41.521c-1.553,13.998-3.23,27.586-5.038,40.749
+	c4.52,0,9.396-0.166,14.631-0.496c5.224-0.316,10.292-0.479,15.2-0.479c0.649,1.152,1.285,2.776,1.942,4.838
+	c0.638,2.065,1.22,4.318,1.738,6.779c0.517,2.457,0.997,5.027,1.454,7.753c0.447,2.715,0.873,5.424,1.258,8.135
+	c0.9,6.32,1.681,13.102,2.327,20.336c2.192-6.196,4.454-12.28,6.777-18.209c1.938-5.045,4.004-10.262,6.196-15.699
+	c2.199-5.423,4.327-10.073,6.393-13.936c2.323,0.254,4.649,0.316,6.974,0.188c2.326-0.124,4.681-0.25,7.071-0.392
+	c2.386-0.127,4.775-0.127,7.163,0c2.389,0.142,4.681,0.52,6.88,1.165c-0.257-6.716-0.164-13.619,0.293-20.728
+	c0.449-7.093,1.096-14.204,1.932-21.297c0.841-7.111,1.707-15.14,2.615-22.062c0.907-6.901,1.742-13.27,2.522-21.27H483.002z"/>
+</svg>
diff --git a/README.md b/README.md
index f578e745c..6e2a0de9e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![CircleCI](https://circleci.com/gh/checkpoint-restore/criu.svg?style=svg)](
     https://circleci.com/gh/checkpoint-restore/criu)
 
-<p align="center"><img src="https://criu.org/w/images/1/1c/CRIU.svg" width="256px"/></p>
+<p align="center"><img src="Documentation/logo.svg" width="256px"/></p>
 
 ## CRIU -- A project to implement checkpoint/restore functionality for Linux
 

From 2e5f9facf92e90a81f06f3afd3fa214a9fa7bf1c Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 26 Dec 2025 12:28:45 +0800
Subject: [PATCH 1841/1854] util: Make close_safe() reset fd to -1 even on
 close() failure

The "man 2 close":"Dealing with error returns from close()" says:

  "Retrying the close() after a failure return is the wrong thing to do"

We should not leave the fd there, attempting to close it again on next
close()/close_safe() may lead to accidentally closing something else.

It confirms with the kernel code where sys_close() removes fd from
fdtable in this stack:

  +-> sys_close
    +-> file_close_fd
      +-> file_close_fd_locked
        +-> rcu_assign_pointer(fdt->fd[fd], NULL)

If there was an fd this stack is always reached and fd is always
removed.

Let's replace the fd with -1 after close no matter what.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/util.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/criu/util.c b/criu/util.c
index e2f80e4c6..2eaad35bb 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -222,10 +222,9 @@ int close_safe(int *fd)
 
 	if (*fd > -1) {
 		ret = close(*fd);
-		if (!ret)
-			*fd = -1;
-		else
-			pr_perror("Unable to close fd %d", *fd);
+		if (ret)
+			pr_perror("Failed closing fd %d", *fd);
+		*fd = -1;
 	}
 
 	return ret;

From fc1867c44d1b6b0771deb2ff317331fc30b7ac78 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 2 Jan 2026 13:15:43 +0800
Subject: [PATCH 1842/1854] kerndat: Fix error handling for
 kerndat_has_timer_cr_ids() fail

After commit [1] we accidentally stopped reporting the errors from
kerndat_has_timer_cr_ids(), let's fix that.

Fixes: 1eaa870cc ("kerndat: check that hardware breakpoints work") [1]
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/kerndat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/criu/kerndat.c b/criu/kerndat.c
index 997181ce7..2dc2f77d5 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -2116,6 +2116,7 @@ int kerndat_init(void)
 	}
 	if (!ret && kerndat_has_timer_cr_ids()) {
 		pr_err("kerndat_has_timer_cr_ids has failed when initializing kerndat.\n");
+		ret = -1;
 	}
 	if (!ret && kerndat_breakpoints()) {
 		pr_err("kerndat_breakpoints has failed when initializing kerndat.\n");

From b1a51489ddfce210ed6f64024fbd5ea823bacfd1 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 29 Dec 2025 11:00:15 +0000
Subject: [PATCH 1843/1854] compel: fix sys_clock_gettime function signature

The initialization of the struct timespec used as clockid input
parameter was removed in commit:
b4441d1bd8a56ed9ec08603e1d4acf5c779fe935 ("restorer.c: rm unneded struct init")

This causes the build to fail on Alpine with clang version 21.1.2:

  GEN      criu/pie/parasite-blob.h
  criu/pie/restorer.c:1230:39: error: variable 'ts' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
   1230 |                         if (sys_clock_gettime(t->clockid, &ts)) {
        |                                                            ^~
  1 error generated.
  make[2]: *** [/criu/scripts/nmk/scripts/build.mk:118: criu/pie/restorer.o] Error 1
  make[1]: *** [criu/Makefile:59: pie] Error 2
  make: *** [Makefile:278: criu] Error 2

To fix this, we remove the "const" from the declaration of
clock_gettime. Since the kernel writes the current time into
the struct timespec provided by the caller, the pointer must
be writable.

Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 compel/arch/arm/plugins/std/syscalls/syscall.def            | 2 +-
 compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl | 2 +-
 compel/arch/mips/plugins/std/syscalls/syscall_64.tbl        | 2 +-
 compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl    | 2 +-
 compel/arch/riscv64/plugins/std/syscalls/syscall.def        | 2 +-
 compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl      | 2 +-
 compel/arch/x86/plugins/std/syscalls/syscall_64.tbl         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compel/arch/arm/plugins/std/syscalls/syscall.def b/compel/arch/arm/plugins/std/syscalls/syscall.def
index 819678566..f4deb02b2 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall.def
+++ b/compel/arch/arm/plugins/std/syscalls/syscall.def
@@ -85,7 +85,7 @@ timer_settime			110	258	(kernel_timer_t timer_id, int flags, const struct itimer
 timer_gettime			108	259	(int timer_id, const struct itimerspec *setting)
 timer_getoverrun		109	260	(int timer_id)
 timer_delete			111	261	(kernel_timer_t timer_id)
-clock_gettime			113	263	(const clockid_t which_clock, const struct timespec *tp)
+clock_gettime			113	263	(clockid_t which_clock, struct timespec *tp)
 exit_group			94	248	(int error_code)
 set_robust_list			99	338	(struct robust_list_head *head, size_t len)
 get_robust_list			100	339	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
diff --git a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
index aa6ffb44d..83dcdab4a 100644
--- a/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/loongarch64/plugins/std/syscalls/syscall_64.tbl
@@ -46,7 +46,7 @@ __NR_sys_timer_gettime		108	sys_timer_gettime	(int timer_id, const struct itimer
 __NR_sys_timer_getoverrun	109	sys_timer_getoverrun	(int timer_id)
 __NR_sys_timer_settime		110	sys_timer_settime	(kernel_timer_t timer_id, int flags, const struct itimerspec *new_setting, struct itimerspec *old_setting)
 __NR_sys_timer_delete		111	sys_timer_delete	(kernel_timer_t timer_id)
-__NR_clock_gettime		113	sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_clock_gettime		113	sys_clock_gettime	(clockid_t which_clock, struct timespec *tp)
 __NR_sched_setscheduler		119	sys_sched_setscheduler	(int pid, int policy, struct sched_param *p)
 __NR_restart_syscall		128	sys_restart_syscall	(void)
 __NR_kill			129	sys_kill		(long pid, int sig)
diff --git a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
index 85faca5a9..ad3d44634 100644
--- a/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/mips/plugins/std/syscalls/syscall_64.tbl
@@ -84,7 +84,7 @@ __NR_sys_timer_settime		5217		sys_timer_settime	(kernel_timer_t timer_id, int fl
 __NR_sys_timer_gettime		5218		sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
 __NR_sys_timer_getoverrun	5219		sys_timer_getoverrun	(int timer_id)
 __NR_sys_timer_delete		5220		sys_timer_delete	(kernel_timer_t timer_id)
-__NR_clock_gettime		5222		sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_clock_gettime		5222		sys_clock_gettime	(clockid_t which_clock, struct timespec *tp)
 __NR_exit_group			5205		sys_exit_group		(int error_code)
 __NR_set_thread_area		5242		sys_set_thread_area	(unsigned long *addr)
 __NR_openat			5247		sys_openat		(int dfd, const char *filename, int flags, int mode)
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
index c56b4e6de..3deb41cf7 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-ppc64.tbl
@@ -82,7 +82,7 @@ __NR_sys_timer_settime	241		sys_timer_settime	(kernel_timer_t timer_id, int flag
 __NR_sys_timer_gettime	242		sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
 __NR_sys_timer_getoverrun	243		sys_timer_getoverrun	(int timer_id)
 __NR_sys_timer_delete	244		sys_timer_delete	(kernel_timer_t timer_id)
-__NR_clock_gettime	246		sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_clock_gettime	246		sys_clock_gettime	(clockid_t which_clock, struct timespec *tp)
 __NR_exit_group		234		sys_exit_group		(int error_code)
 __NR_waitid		272		sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
 __NR_set_robust_list	300		sys_set_robust_list	(struct robust_list_head *head, size_t len)
diff --git a/compel/arch/riscv64/plugins/std/syscalls/syscall.def b/compel/arch/riscv64/plugins/std/syscalls/syscall.def
index 17f763e90..967f097f9 100644
--- a/compel/arch/riscv64/plugins/std/syscalls/syscall.def
+++ b/compel/arch/riscv64/plugins/std/syscalls/syscall.def
@@ -85,7 +85,7 @@ timer_settime			110	258	(kernel_timer_t timer_id, int flags, const struct itimer
 timer_gettime			108	259	(int timer_id, const struct itimerspec *setting)
 timer_getoverrun		109	260	(int timer_id)
 timer_delete			111	261	(kernel_timer_t timer_id)
-clock_gettime			113	263	(const clockid_t which_clock, const struct timespec *tp)
+clock_gettime			113	263	(clockid_t which_clock, struct timespec *tp)
 exit_group			94	248	(int error_code)
 set_robust_list			99	338	(struct robust_list_head *head, size_t len)
 get_robust_list			100	339	(int pid, struct robust_list_head **head_ptr, size_t *len_ptr)
diff --git a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
index 018d58a59..ff2f33006 100644
--- a/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
+++ b/compel/arch/s390/plugins/std/syscalls/syscall-s390.tbl
@@ -82,7 +82,7 @@ __NR_sys_timer_settime	255		sys_timer_settime	(kernel_timer_t timer_id, int flag
 __NR_sys_timer_gettime	256		sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
 __NR_sys_timer_getoverrun	257		sys_timer_getoverrun	(int timer_id)
 __NR_sys_timer_delete	258		sys_timer_delete	(kernel_timer_t timer_id)
-__NR_clock_gettime	260		sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_clock_gettime	260		sys_clock_gettime	(clockid_t which_clock, struct timespec *tp)
 __NR_exit_group		248		sys_exit_group		(int error_code)
 __NR_waitid		281		sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)
 __NR_set_robust_list	304		sys_set_robust_list	(struct robust_list_head *head, size_t len)
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
index 7fbfd69ad..8c3620c2a 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
+++ b/compel/arch/x86/plugins/std/syscalls/syscall_64.tbl
@@ -85,7 +85,7 @@ __NR_sys_timer_settime		223		sys_timer_settime	(kernel_timer_t timer_id, int fla
 __NR_sys_timer_gettime		224		sys_timer_gettime	(int timer_id, const struct itimerspec *setting)
 __NR_sys_timer_getoverrun	225		sys_timer_getoverrun	(int timer_id)
 __NR_sys_timer_delete		226		sys_timer_delete	(kernel_timer_t timer_id)
-__NR_clock_gettime		228		sys_clock_gettime	(const clockid_t which_clock, const struct timespec *tp)
+__NR_clock_gettime		228		sys_clock_gettime	(clockid_t which_clock, struct timespec *tp)
 __NR_exit_group			231		sys_exit_group		(int error_code)
 __NR_openat			257		sys_openat		(int dfd, const char *filename, int flags, int mode)
 __NR_waitid			247		sys_waitid		(int which, pid_t pid, struct siginfo *infop, int options, struct rusage *ru)

From 974c1bc898bb4f5104a44d19029c5800ae431686 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 29 Dec 2025 14:05:20 +0000
Subject: [PATCH 1844/1854] zdtm/tempfs_subns: fix uninitialized variable

 DEP       tempfs_subns.d
 CC        tempfs_subns.o
tempfs_subns.c:50:23: error: variable 'fd' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
   50 |                         if (write(fds[1], &fd, sizeof(fd)) != sizeof(fd)) {
      |                                            ^~
1 error generated.
make[1]: *** [../Makefile.inc:96: tempfs_subns.o] Error 1

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/tempfs_subns.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/tempfs_subns.c b/test/zdtm/static/tempfs_subns.c
index ed3ef9a3a..490fdad6e 100644
--- a/test/zdtm/static/tempfs_subns.c
+++ b/test/zdtm/static/tempfs_subns.c
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
 {
 	int fds[2], i;
 	pid_t pid;
-	int fd, status;
+	int status, fd = -1;
 
 	test_init(argc, argv);
 

From 2dd66866e3e07c2cebeaa1713bc310c98d5027e7 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 29 Dec 2025 14:13:05 +0000
Subject: [PATCH 1845/1854] zdtm/cgroup_stray: fix uninitialized variable

51.04  DEP       cgroup_stray.d
51.07  CC        cgroup_stray.o
51.11 cgroup_stray.c:164:18: error: variable 'c' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
51.11   164 |                 if (write(sk, &c, 1) != 1) {
51.11       |                                ^
51.11 1 error generated.
51.12 make[1]: *** [../Makefile.inc:96: cgroup_stray.o] Error 1
51.12 make[1]: Leaving directory '/criu/test/zdtm/static'
51.12 make: *** [Makefile:7: static] Error 2

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 test/zdtm/static/cgroup_stray.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/cgroup_stray.c b/test/zdtm/static/cgroup_stray.c
index 0c0ed93cf..f5754410f 100644
--- a/test/zdtm/static/cgroup_stray.c
+++ b/test/zdtm/static/cgroup_stray.c
@@ -135,7 +135,7 @@ out:
 int main(int argc, char **argv)
 {
 	int ret = -1, sk_pair[2], sk, status;
-	char path[PATH_MAX], c;
+	char path[PATH_MAX], c = 0;
 	pid_t pid = 0;
 
 	test_init(argc, argv);

From ddf7a170ff74befbe7da2114054e4b1c85ea2d3d Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 29 Dec 2025 12:12:53 +0000
Subject: [PATCH 1846/1854] infect-types: fix user_gcs redefine error

In file included from compel/arch/aarch64/src/lib/infect.c:10:
compel/include/uapi/compel/asm/infect-types.h:24:8: error: redefinition of 'user_gcs'
   24 | struct user_gcs {
      |        ^
/usr/include/asm/ptrace.h:329:8: note: previous definition is here
  329 | struct user_gcs {
      |        ^
1 error generated.
make[1]: *** [/criu/scripts/nmk/scripts/build.mk:215: compel/arch/aarch64/src/lib/infect.o] Error 1

Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 .../arch/aarch64/src/lib/include/uapi/asm/infect-types.h  | 7 +++++--
 compel/arch/aarch64/src/lib/infect.c                      | 8 ++++----
 criu/arch/aarch64/crtools.c                               | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
index 3a34ab4f6..606c92ffe 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/infect-types.h
@@ -20,8 +20,11 @@ typedef struct user_pt_regs user_regs_struct_t;
 
 /*
  * GCS (Guarded Control Stack)
+ *
+ * This mirrors the kernel definition but renamed to cr_user_gcs
+ * to avoid conflict with kernel headers (/usr/include/asm/ptrace.h).
  */
-struct user_gcs {
+struct cr_user_gcs {
 	__u64 features_enabled;
 	__u64 features_locked;
 	__u64 gcspr_el0;
@@ -29,7 +32,7 @@ struct user_gcs {
 
 struct user_fpregs_struct {
 	struct user_fpsimd_state fpstate;
-	struct user_gcs gcs;
+	struct cr_user_gcs gcs;
 };
 typedef struct user_fpregs_struct user_fpregs_struct_t;
 
diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c
index 7450ac026..42f593c79 100644
--- a/compel/arch/aarch64/src/lib/infect.c
+++ b/compel/arch/aarch64/src/lib/infect.c
@@ -41,7 +41,7 @@ bool __compel_host_supports_gcs(void)
 	return (hwcap & HWCAP_GCS) != 0;
 }
 
-static bool __compel_gcs_enabled(struct user_gcs *gcs)
+static bool __compel_gcs_enabled(struct cr_user_gcs *gcs)
 {
 	if (!compel_host_supports_gcs())
 		return false;
@@ -136,7 +136,7 @@ int compel_set_task_ext_regs(pid_t pid, user_fpregs_struct_t *ext_regs)
 {
 	struct iovec iov;
 
-	struct user_gcs gcs;
+	struct cr_user_gcs gcs;
 	struct iovec gcs_iov = { .iov_base = &gcs, .iov_len = sizeof(gcs) };
 
 	pr_info("Restoring GP/FPU registers for %d\n", pid);
@@ -363,7 +363,7 @@ int ptrace_flush_breakpoints(pid_t pid)
 	return 0;
 }
 
-int inject_gcs_cap_token(struct parasite_ctl *ctl, pid_t pid, struct user_gcs *gcs)
+int inject_gcs_cap_token(struct parasite_ctl *ctl, pid_t pid, struct cr_user_gcs *gcs)
 {
 	struct iovec gcs_iov = { .iov_base = gcs, .iov_len = sizeof(*gcs) };
 
@@ -403,7 +403,7 @@ int inject_gcs_cap_token(struct parasite_ctl *ctl, pid_t pid, struct user_gcs *g
 
 int parasite_setup_shstk(struct parasite_ctl *ctl, user_fpregs_struct_t *ext_regs)
 {
-	struct user_gcs gcs;
+	struct cr_user_gcs gcs;
 	struct iovec gcs_iov = { .iov_base = &gcs, .iov_len = sizeof(gcs) };
 	pid_t pid = ctl->rpid;
 
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 835a83400..2e89f9ce3 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -148,7 +148,7 @@ static int save_pac_keys(int pid, CoreEntry *core)
 int save_task_regs(pid_t pid, void *x, user_regs_struct_t *regs, user_fpregs_struct_t *fpsimd)
 {
 	int i;
-	struct user_gcs gcs_live;
+	struct cr_user_gcs gcs_live;
 	struct iovec gcs_iov = {
 		.iov_base = &gcs_live,
 		.iov_len = sizeof(gcs_live),

From 36f1e9d38c3b697ca38f405df666929bcd483034 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 29 Dec 2025 15:26:22 +0000
Subject: [PATCH 1847/1854] amdgpu: use fseeko with large-file support instead
 of fseeko64

As of Alpine Linux 3.19, musl libc no longer contains separate
fopen64(), fseeko64(), or ftello64() functions. This causes building
CRIU with amdgpu plugin to fail with the following error:

amdgpu_plugin.c: In function 'parallel_restore_bo_contents':
amdgpu_plugin.c:2286:17: error: implicit declaration of function 'fseeko64'; did you mean 'fseeko'? [-Wimplicit-function-declaration]
 2286 |                 fseeko64(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
      |                 ^~~~~~~~
      |                 fseeko
make[2]: *** [Makefile:31: amdgpu_plugin.so] Error 1
make[1]: *** [Makefile:363: amdgpu_plugin] Error 2

To fix this, add the missing $(DEFINES) to plugin builds, and since we
always compile with _FILE_OFFSET_BITS=64, we don't need the 64 suffix.

Fixes: #2826

Suggested-by: Andrei Vagin <avagin@google.com>
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 plugins/amdgpu/Makefile        | 2 +-
 plugins/amdgpu/amdgpu_plugin.c | 2 +-
 plugins/cuda/Makefile          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/amdgpu/Makefile b/plugins/amdgpu/Makefile
index 31e177e4a..250e7b0e7 100644
--- a/plugins/amdgpu/Makefile
+++ b/plugins/amdgpu/Makefile
@@ -28,7 +28,7 @@ criu-amdgpu.pb-c.c: criu-amdgpu.proto
 		protoc --proto_path=. --c_out=. criu-amdgpu.proto
 
 amdgpu_plugin.so: amdgpu_plugin.c amdgpu_plugin_drm.c amdgpu_plugin_dmabuf.c amdgpu_plugin_topology.c amdgpu_plugin_util.c criu-amdgpu.pb-c.c amdgpu_socket_utils.c
-	$(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
+	$(CC) $(PLUGIN_CFLAGS) $(DEFINES) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS) $(LIBDRM_INC)
 
 amdgpu_plugin_clean:
 	$(call msg-clean, $@)
diff --git a/plugins/amdgpu/amdgpu_plugin.c b/plugins/amdgpu/amdgpu_plugin.c
index 574d7b829..ee55bde0a 100644
--- a/plugins/amdgpu/amdgpu_plugin.c
+++ b/plugins/amdgpu/amdgpu_plugin.c
@@ -2283,7 +2283,7 @@ void *parallel_restore_bo_contents(void *_thread_data)
 			continue;
 
 		entry = &restore_cmd->entries[i];
-		fseeko64(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
+		fseeko(bo_contents_fp, entry->read_offset + offset, SEEK_SET);
 		ret = sdma_copy_bo(restore_cmd->fds_write[entry->write_id], entry->size, bo_contents_fp,
 				   buffer, buffer_size, h_dev,
 				   max_copy_size, SDMA_OP_VRAM_WRITE, false);
diff --git a/plugins/cuda/Makefile b/plugins/cuda/Makefile
index cc3d98ac9..2c1944a34 100644
--- a/plugins/cuda/Makefile
+++ b/plugins/cuda/Makefile
@@ -19,7 +19,7 @@ all: $(DEPS_CUDA)
 
 cuda_plugin.so: cuda_plugin.c
 	$(call msg-gen, $@)
-	$(Q) $(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
+	$(Q) $(CC) $(PLUGIN_CFLAGS) $(DEFINES) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
 
 clean:
 	$(call msg-clean, $@)

From 71fe85ec90871ffcfb57060f28760f607e0e6d08 Mon Sep 17 00:00:00 2001
From: ImranullahKhann <imranullahkhann2004@gmail.com>
Date: Thu, 8 Jan 2026 19:55:04 +0500
Subject: [PATCH 1848/1854] ci: add iproute2 to the list of packages in
 apt-packages.sh

When running the command 'make docker-test', almost all zdtm tests fail,
logging 'ip: not found'. 'ip' command of the iproute2 package was missing.
So added the package to the list of dependencies in 'apt-packages.sh'. Now
tests run

Signed-off-by: ImranullahKhann <imranullahkhann2004@gmail.com>
---
 contrib/dependencies/apt-packages.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/dependencies/apt-packages.sh b/contrib/dependencies/apt-packages.sh
index 1fd42d4e6..7963be7b4 100755
--- a/contrib/dependencies/apt-packages.sh
+++ b/contrib/dependencies/apt-packages.sh
@@ -13,6 +13,7 @@ fi
 	build-essential \
 	gdb \
 	git-core \
+	iproute2 \
 	iptables \
 	kmod \
 	libaio-dev \

From 9885fb3c75ee6d18e554ec1ddddf6ec2c89ea848 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Sun, 11 Jan 2026 14:56:49 +0000
Subject: [PATCH 1849/1854] crit: fix incorrect task state decoding

CRIU defines the following constants for task state in compel/include/uapi/task-state.h

COMPEL_TASK_ALIVE = 0x01
COMPEL_TASK_STOPPED = 0x03
COMPEL_TASK_ZOMBIE = 0x06

Thus, we need to swap the values for "zombie" and "stopped" used in CRIT.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/pycriu/images/pb2dict.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index a35dd3c3f..b80e3475f 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -154,8 +154,8 @@ flags_maps = {
 gen_maps = {
     'task_state': {
         1: 'Alive',
-        3: 'Zombie',
-        6: 'Stopped'
+        3: 'Stopped',
+        6: 'Zombie',
     },
 }
 

From b208bec12d5bc68b47b2a1f026f527e7f3141445 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Mon, 12 Jan 2026 05:47:02 +0000
Subject: [PATCH 1850/1854] crit: show dead task_state

In some cases, CRIU can observe tasks that exit during checkpointing,
and sets the state of these tasks to COMPEL_TASK_DEAD.
This patch adds a string representation of this value that can be used
by CRIT when decoding the images.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/pycriu/images/pb2dict.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pycriu/images/pb2dict.py b/lib/pycriu/images/pb2dict.py
index b80e3475f..f22887a52 100644
--- a/lib/pycriu/images/pb2dict.py
+++ b/lib/pycriu/images/pb2dict.py
@@ -154,6 +154,7 @@ flags_maps = {
 gen_maps = {
     'task_state': {
         1: 'Alive',
+        2: 'Dead',
         3: 'Stopped',
         6: 'Zombie',
     },

From fb59ae504e90edf08c133b4d2d938f645421c396 Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Fri, 9 Jan 2026 08:15:05 +0000
Subject: [PATCH 1851/1854] test: fix GCC 16 compile error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fedora rawhide ships a pre-release of GCC 16 which produces following
error:

  uprobes.c:34:22: error: variable ‘dummy’ set but not used [-Werror=unused-but-set-variable=]
  34 |         volatile int dummy = 0;
  |                      ^~~~~

Marking this variable as "__maybe_unused" to fix the error.

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 test/zdtm/static/uprobes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm/static/uprobes.c b/test/zdtm/static/uprobes.c
index 4164375b7..6ef9a56bc 100644
--- a/test/zdtm/static/uprobes.c
+++ b/test/zdtm/static/uprobes.c
@@ -31,7 +31,7 @@ const char *test_author = "Shashank Balaji <shashank.mahadasyam@sony.com>";
  * compiler optimization) and use it (to prevent "unused variable" warning)
  */
 void UPROBED_FUNCTION(void) {
-	volatile int dummy = 0;
+	volatile int dummy __maybe_unused = 0;
 	dummy += 1;
 }
 /* Calling via volatile function pointer ensures noinline at callsite */

From 07af3304fdce72b479d8670fced93604c295461f Mon Sep 17 00:00:00 2001
From: liqiang2020 <liqiang64@huawei.com>
Date: Tue, 16 Dec 2025 18:14:13 +0800
Subject: [PATCH 1852/1854] restore/pie: check return value of sys_rseq on
 unregister

The return value of sys_rseq was previously ignored during
unregistration, under the assumption that it would not fail if the rseq
structure was properly registered.

However, if sys_rseq fails, the kernel retains the registration. If the
memory containing the rseq structure is subsequently unmapped or reused,
kernel updates to the rseq area can cause the process to crash (e.g.,
via SIGSEGV).

Check the return value of sys_rseq. If it fails, log the error code and
abort the restoration process. This makes rseq unregistration failures
fatal and explicit, aiding in debugging and preventing later obscure
crashes.

Signed-off-by: liqiang2020 <liqiang64@huawei.com>
---
 criu/pie/restorer.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 008e1398d..0a8aba41b 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -1363,13 +1363,19 @@ __visible void __export_unmap(void)
 	sys_munmap(bootstrap_start, bootstrap_len - vdso_rt_size);
 }
 
-static void unregister_libc_rseq(struct rst_rseq_param *rseq)
+static int unregister_libc_rseq(struct rst_rseq_param *rseq)
 {
-	if (!rseq->rseq_abi_pointer)
-		return;
+	long ret;
 
-	/* can't fail if rseq is registered */
-	sys_rseq(decode_pointer(rseq->rseq_abi_pointer), rseq->rseq_abi_size, 1, rseq->signature);
+	if (!rseq->rseq_abi_pointer)
+		return 0;
+
+	ret = sys_rseq(decode_pointer(rseq->rseq_abi_pointer), rseq->rseq_abi_size, 1, rseq->signature);
+	if (ret) {
+		pr_err("Failed to unregister libc rseq %ld\n", ret);
+		return -1;
+	}
+	return 0;
 }
 
 /*
@@ -1803,7 +1809,8 @@ __visible long __export_restore_task(struct task_restore_args *args)
 	 * for instance once the kernel will want to update (struct rseq).cpu_id field:
 	 * https://github.com/torvalds/linux/blob/ce522ba9ef7e/kernel/rseq.c#L89
 	 */
-	unregister_libc_rseq(&args->libc_rseq);
+	if (unregister_libc_rseq(&args->libc_rseq))
+		goto core_restore_end;
 
 	if (unmap_old_vmas((void *)args->premmapped_addr, args->premmapped_len, bootstrap_start, bootstrap_len,
 			   args->task_size))

From 21a6758268e9230ae258d3c70aa12ae1a4da6750 Mon Sep 17 00:00:00 2001
From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date: Fri, 16 Jan 2026 12:33:10 +0800
Subject: [PATCH 1853/1854] cr-restore/shstk: Make arch_shstk_unlock use
 correct pid

In a simple case where the parent process and the child one are in one
pid namespace we can safely use vpid(item) to prace the child. But, for
the cases where the child is a pid namespace init, or the child is put
into external pid namespace, the parent and the child have different pid
namespaces and using pid vpid(item) (which e.g. for init will always be
1 here) to ptrace the child process is inorrect.

Let's use the pid reported to us from clone as it's always the right pid
of the child from the parent's point of view.

Fixes: 7dd583002 ("restore: add infrastructure to enable shadow stack")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index a5eda8d60..b92b92715 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1238,7 +1238,7 @@ static inline int fork_with_pid(struct pstree_item *item)
 		pr_debug("PID: real %d virt %d\n", item->pid->real, vpid(item));
 	}
 
-	arch_shstk_unlock(item, ca.core, pid);
+	arch_shstk_unlock(item, ca.core, ret);
 
 err_unlock:
 	if (!(ca.clone_flags & CLONE_NEWPID))

From 9e5fbcd668709a79a876e4c6eff13b975b0f3631 Mon Sep 17 00:00:00 2001
From: unichronic <ishuvam.pal@gmail.com>
Date: Sun, 18 Jan 2026 00:37:44 +0530
Subject: [PATCH 1854/1854] pycriu: Fix self-dump failure with explicit PID

When `opts.pid` is explicitly set to `os.getpid()`, `pycriu` fails to
daemonize the `criu` process. This causes `criu` to run as a child of
the dumped process, leading to the error "The criu itself is within
dumped tree".

This can be fixed by modifying `_send_req_and_recv_resp` to check if the
target PID matches the current process PID. If so, it enables daemon
mode, ensuring `criu` is detached and the dump succeeds.

Signed-off-by: unichronic <ishuvam.pal@gmail.com>
---
 lib/pycriu/criu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pycriu/criu.py b/lib/pycriu/criu.py
index 760d2be78..51a5c2902 100644
--- a/lib/pycriu/criu.py
+++ b/lib/pycriu/criu.py
@@ -242,7 +242,7 @@ class criu:
         # process resources from its own if criu is located in a same
         # process tree it is trying to dump.
         daemon = False
-        if req.type == rpc.DUMP and not req.opts.HasField('pid'):
+        if req.type == rpc.DUMP and (not req.opts.HasField('pid') or req.opts.pid == os.getpid()):
             daemon = True
 
         try: